Critical fix: make tcltest behave as described

This has long been creating more problems than it solves.

.travis.yml

@@ -0,0 +1,236 @@
+dist: trusty
+sudo: false
+language: c
+matrix:
+  include:
+    - os: linux
+      compiler: clang
+      env:
+        - MATRIX_EVAL="" BUILD_DIR=unix
+    - os: linux
+      compiler: clang
+      env:
+        - MATRIX_EVAL="" BUILD_DIR=unix CFGOPT=--disable-shared
+    - os: linux
+      compiler: gcc
+      env:
+        - MATRIX_EVAL="" BUILD_DIR=unix
+    - os: linux
+      compiler: gcc
+      env:
+        - MATRIX_EVAL="" BUILD_DIR=unix CFGOPT=--disable-shared
+    - os: linux
+      compiler: gcc
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-4.9
+      env:
+        - MATRIX_EVAL="CC=gcc-4.9" BUILD_DIR=unix
+    - os: linux
+      compiler: gcc
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-5
+      env:
+        - MATRIX_EVAL="CC=gcc-5" BUILD_DIR=unix
+    - os: linux
+      compiler: gcc
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-6
+      env:
+        - MATRIX_EVAL="CC=gcc-6" BUILD_DIR=unix
+    - os: linux
+      compiler: gcc
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-7
+      env:
+        - MATRIX_EVAL="CC=gcc-7" BUILD_DIR=unix
+    - os: osx
+      osx_image: xcode8
+      env:
+        - MATRIX_EVAL="" BUILD_DIR=unix
+    - os: osx
+      osx_image: xcode8
+      env:
+        - MATRIX_EVAL="" BUILD_DIR=macosx NO_DIRECT_CONFIGURE=1
+    - os: osx
+      osx_image: xcode9
+      env:
+        - MATRIX_EVAL="" BUILD_DIR=macosx NO_DIRECT_CONFIGURE=1
+    - os: osx
+      osx_image: xcode10
+      env:
+        - MATRIX_EVAL="" BUILD_DIR=macosx NO_DIRECT_CONFIGURE=1
+### C builds not currently supported on Windows instances
+#    - os: windows
+#      env:
+#        - MATRIX_EVAL="" BUILD_DIR=win
+
+before_install:
+  - eval "${MATRIX_EVAL}"
+  - export ERROR_ON_FAILURES=1
+  - cd ${BUILD_DIR}
+install:
+  - test -n "$NO_DIRECT_CONFIGURE" || ./configure ${CFGOPT}
+script:
+  - make
+  - make test
+dist: trusty
+sudo: false
+language: c
+matrix:
+  include:
+    - os: linux
+      compiler: clang
+      env:
+        - MATRIX_EVAL=""
+        - BUILD_DIR=unix
+    - os: linux
+      compiler: clang
+      env:
+        - MATRIX_EVAL=""
+        - BUILD_DIR=unix
+        - CFGOPT=--disable-shared
+    - os: linux
+      compiler: gcc
+      env:
+        - MATRIX_EVAL=""
+        - BUILD_DIR=unix
+    - os: linux
+      compiler: gcc
+      env:
+        - MATRIX_EVAL=""
+        - BUILD_DIR=unix
+        - CFGOPT=--disable-shared
+    - os: linux
+      compiler: gcc
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-4.9
+      env:
+        - MATRIX_EVAL="CC=gcc-4.9"
+        - BUILD_DIR=unix
+    - os: linux
+      compiler: gcc
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-5
+      env:
+        - MATRIX_EVAL="CC=gcc-5"
+        - BUILD_DIR=unix
+    - os: linux
+      compiler: gcc
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-6
+      env:
+        - MATRIX_EVAL="CC=gcc-6"
+        - BUILD_DIR=unix
+    - os: linux
+      compiler: gcc
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-7
+      env:
+        - MATRIX_EVAL="CC=gcc-7"
+        - BUILD_DIR=unix
+    - os: osx
+      osx_image: xcode8
+      env:
+        - MATRIX_EVAL=""
+        - BUILD_DIR=unix
+    - os: osx
+      osx_image: xcode8
+      env:
+        - MATRIX_EVAL=""
+        - BUILD_DIR=macosx
+        - NO_DIRECT_CONFIGURE=1
+    - os: osx
+      osx_image: xcode9
+      env:
+        - MATRIX_EVAL=""
+        - BUILD_DIR=macosx
+        - NO_DIRECT_CONFIGURE=1
+    - os: osx
+      osx_image: xcode10
+      env:
+        - MATRIX_EVAL=""
+        - BUILD_DIR=macosx
+        - NO_DIRECT_CONFIGURE=1
+# Test with mingw-w64 (32 bit)
+    - os: linux
+      compiler: i686-w64-mingw32-gcc
+      addons:
+        apt:
+          packages:
+            - gcc-mingw-w64-base
+            - binutils-mingw-w64-i686
+            - gcc-mingw-w64-i686
+            - gcc-mingw-w64
+            - gcc-multilib
+            - wine
+      env:
+        - MATRIX_EVAL=""
+        - BUILD_DIR=win
+        - CFGOPT=--host=i686-w64-mingw32
+        - NO_DIRECT_TEST=1
+
+# Test with mingw-w64 (64 bit)
+    - os: linux
+      compiler: x86_64-w64-mingw32-gcc
+      addons:
+        apt:
+          packages:
+            - gcc-mingw-w64-base
+            - binutils-mingw-w64-x86-64
+            - gcc-mingw-w64-x86-64
+            - gcc-mingw-w64
+            - wine
+      env:
+        - MATRIX_EVAL=""
+        - BUILD_DIR=win
+        - CFGOPT=--host=x86_64-w64-mingw32 --enable-64bit
+        - NO_DIRECT_TEST=1
+
+### C builds not currently supported on Windows instances
+#    - os: windows
+#      env:
+#        - MATRIX_EVAL=""
+#        - BUILD_DIR=win
+
+before_install:
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then rvm get stable; fi
+  - eval "${MATRIX_EVAL}"
+  - export ERROR_ON_FAILURES=1
+  - cd ${BUILD_DIR}
+install:
+  - test -n "$NO_DIRECT_CONFIGURE" || ./configure ${CFGOPT}
+script:
+  - make
+  - test -n "$NO_DIRECT_TEST" || make test

README

@@ -1,185 +0,0 @@
-README:  Tcl
-    This is the Tcl 8.6.8 source distribution.
-	http://sourceforge.net/projects/tcl/files/Tcl/
-    You can get any source release of Tcl from the URL above.
-
-Contents
---------
-    1. Introduction
-    2. Documentation
-    3. Compiling and installing Tcl
-    4. Development tools
-    5. Tcl newsgroup
-    6. The Tcler's Wiki
-    7. Mailing lists
-    8. Support and Training
-    9. Tracking Development
-    10. Thank You
-
-1. Introduction
----------------
-Tcl provides a powerful platform for creating integration applications that
-tie together diverse applications, protocols, devices, and frameworks.
-When paired with the Tk toolkit, Tcl provides the fastest and most powerful
-way to create GUI applications that run on PCs, Unix, and Mac OS X.
-Tcl can also be used for a variety of web-related tasks and for creating
-powerful command languages for applications.
-
-Tcl is maintained, enhanced, and distributed freely by the Tcl community.
-Source code development and tracking of bug reports and feature requests
-takes place at:
-
-	http://core.tcl.tk/
-
-Tcl/Tk release and mailing list services are hosted by SourceForge:
-
-	http://sourceforge.net/projects/tcl/
-
-with the Tcl Developer Xchange hosted at:
-
-	http://www.tcl.tk/
-
-Tcl is a freely available open source package.  You can do virtually
-anything you like with it, such as modifying it, redistributing it,
-and selling it either in whole or in part.  See the file
-"license.terms" for complete information.
-
-2. Documentation
-----------------
-
-Extensive documentation is available at our website.
-The home page for this release, including new features, is
-	http://www.tcl.tk/software/tcltk/8.6.html
-
-Detailed release notes can be found at the file distributions page
-by clicking on the relevant version.
-	http://sourceforge.net/projects/tcl/files/Tcl/
-
-Information about Tcl itself can be found at
-	http://www.tcl.tk/about/
-
-There have been many Tcl books on the market.  Many are mentioned in the Wiki:
-	http://wiki.tcl.tk/_/ref?N=25206
-
-To view the complete set of reference manual entries for Tcl 8.6 online,
-visit the URL:
-	http://www.tcl.tk/man/tcl8.6/
-
-2a. Unix Documentation
-----------------------
-
-The "doc" subdirectory in this release contains a complete set of
-reference manual entries for Tcl.  Files with extension ".1" are for
-programs (for example, tclsh.1); files with extension ".3" are for C
-library procedures; and files with extension ".n" describe Tcl
-commands.  The file "doc/Tcl.n" gives a quick summary of the Tcl
-language syntax.  To print any of the man pages on Unix, cd to the
-"doc" directory and invoke your favorite variant of troff using the
-normal -man macros, for example
-
-		ditroff -man Tcl.n
-
-to print Tcl.n.  If Tcl has been installed correctly and your "man" program
-supports it, you should be able to access the Tcl manual entries using the
-normal "man" mechanisms, such as
-
-		man Tcl
-
-2b. Windows Documentation
--------------------------
-
-The "doc" subdirectory in this release contains a complete set of Windows
-help files for Tcl.  Once you install this Tcl release, a shortcut to the
-Windows help Tcl documentation will appear in the "Start" menu:
-
-	Start | Programs | Tcl | Tcl Help
-
-3. Compiling and installing Tcl
--------------------------------
-
-There are brief notes in the unix/README, win/README, and macosx/README about
-compiling on these different platforms.  There is additional information
-about building Tcl from sources at
-
-	http://www.tcl.tk/doc/howto/compile.html
-
-4. Development tools
----------------------------
-
-ActiveState produces a high quality set of commercial quality development
-tools that is available to accelerate your Tcl application development.
-Tcl Dev Kit builds on the earlier TclPro toolset and provides a debugger,
-static code checker, single-file wrapping utility, bytecode compiler and
-more.  More information can be found at
-
-	http://www.ActiveState.com/Tcl
-
-5. Tcl newsgroup
-----------------
-
-There is a USENET news group, "comp.lang.tcl", intended for the exchange of
-information about Tcl, Tk, and related applications.  The newsgroup is a
-great place to ask general information questions.  For bug reports, please
-see the "Support and bug fixes" section below.
-
-6. Tcl'ers Wiki
----------------
-
-A Wiki-based open community site covering all aspects of Tcl/Tk is at:
-
-	http://wiki.tcl.tk/
-
-It is dedicated to the Tcl programming language and its extensions.  A
-wealth of useful information can be found there.  It contains code
-snippets, references to papers, books, and FAQs, as well as pointers to
-development tools, extensions, and applications.  You can also recommend
-additional URLs by editing the wiki yourself.
-
-7. Mailing lists
-----------------
-
-Several mailing lists are hosted at SourceForge to discuss development or
-use issues (like Macintosh and Windows topics).  For more information and
-to subscribe, visit:
-
-	http://sourceforge.net/projects/tcl/
-
-and go to the Mailing Lists page.
-
-8. Support and Training
-------------------------
-
-We are very interested in receiving bug reports, patches, and suggestions
-for improvements.  We prefer that you send this information to us as
-tickets entered into our tracker at:
-
-	http://core.tcl.tk/tcl/reportlist
-
-We will log and follow-up on each bug, although we cannot promise a
-specific turn-around time.  Enhancements may take longer and may not happen
-at all unless there is widespread support for them (we're trying to
-slow the rate at which Tcl/Tk turns into a kitchen sink).  It's very
-difficult to make incompatible changes to Tcl/Tk at this point, due to
-the size of the installed base.
-
-The Tcl community is too large for us to provide much individual support
-for users.  If you need help we suggest that you post questions to
-comp.lang.tcl.  We read the newsgroup and will attempt to answer esoteric
-questions for which no one else is likely to know the answer.  In addition,
-see the following Web site for links to other organizations that offer
-Tcl/Tk training:
-
-	http://wiki.tcl.tk/training
-
-9. Tracking Development
------------------------
-
-Tcl is developed in public.  To keep an eye on how Tcl is changing, see
-	http://core.tcl.tk/
-
-10. Thank You
--------------
-
-We'd like to express our thanks to the Tcl community for all the
-helpful suggestions, bug reports, and patches we have received.
-Tcl/Tk has improved vastly and will continue to do so with your help.

compat/fixstrtod.c

@@ -1,36 +0,0 @@
-/*
- * fixstrtod.c --
- *
- *	Source code for the "fixstrtod" procedure.  This procedure is
- *	used in place of strtod under Solaris 2.4, in order to fix
- *	a bug where the "end" pointer gets set incorrectly.
- *
- * Copyright (c) 1995 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- */
-
-#include <stdio.h>
-
-#undef strtod
-
-/*
- * Declare strtod explicitly rather than including stdlib.h, since in
- * somes systems (e.g. SunOS 4.1.4) stdlib.h doesn't declare strtod.
- */
-
-extern double strtod(char *, char **);
-
-double
-fixstrtod(
-    char *string,
-    char **endPtr)
-{
-    double d;
-    d = strtod(string, endPtr);
-    if ((endPtr != NULL) && (*endPtr != string) && ((*endPtr)[-1] == 0)) {
-	*endPtr -= 1;
-    }
-    return d;
-}

compat/stdlib.h

@@ -29,7 +29,6 @@ extern char *		malloc(unsigned int numBytes);
 extern void		qsort(void *base, int n, int size, int (*compar)(
 			    const void *element1, const void *element2));
 extern char *		realloc(char *ptr, unsigned int numBytes);
-extern double		strtod(const char *string, char **endPtr);
 extern long		strtol(const char *string, char **endPtr, int base);
 extern unsigned long	strtoul(const char *string, char **endPtr, int base);
 

compat/strtod.c

@@ -1,252 +0,0 @@
-/*
- * strtod.c --
- *
- *	Source code for the "strtod" library procedure.
- *
- * Copyright (c) 1988-1993 The Regents of the University of California.
- * Copyright (c) 1994 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- */
-
-#include "tclInt.h"
-
-#ifndef TRUE
-#define TRUE 1
-#define FALSE 0
-#endif
-#ifndef NULL
-#define NULL 0
-#endif
-
-static const int maxExponent = 511;	/* Largest possible base 10 exponent.  Any
-				 * exponent larger than this will already
-				 * produce underflow or overflow, so there's
-				 * no need to worry about additional digits.
-				 */
-static const double powersOf10[] = {	/* Table giving binary powers of 10.  Entry */
-    10.,			/* is 10^2^i.  Used to convert decimal */
-    100.,			/* exponents into floating-point numbers. */
-    1.0e4,
-    1.0e8,
-    1.0e16,
-    1.0e32,
-    1.0e64,
-    1.0e128,
-    1.0e256
-};
-
-/*
- *----------------------------------------------------------------------
- *
- * strtod --
- *
- *	This procedure converts a floating-point number from an ASCII
- *	decimal representation to internal double-precision format.
- *
- * Results:
- *	The return value is the double-precision floating-point
- *	representation of the characters in string.  If endPtr isn't
- *	NULL, then *endPtr is filled in with the address of the
- *	next character after the last one that was part of the
- *	floating-point number.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-double
-strtod(
-    const char *string,		/* A decimal ASCII floating-point number,
-				 * optionally preceded by white space. Must
-				 * have form "-I.FE-X", where I is the integer
-				 * part of the mantissa, F is the fractional
-				 * part of the mantissa, and X is the
-				 * exponent. Either of the signs may be "+",
-				 * "-", or omitted. Either I or F may be
-				 * omitted, or both. The decimal point isn't
-				 * necessary unless F is present. The "E" may
-				 * actually be an "e". E and X may both be
-				 * omitted (but not just one). */
-    char **endPtr)		/* If non-NULL, store terminating character's
-				 * address here. */
-{
-    int sign, expSign = FALSE;
-    double fraction, dblExp;
-    const double *d;
-    register const char *p;
-    register int c;
-    int exp = 0;		/* Exponent read from "EX" field. */
-    int fracExp = 0;		/* Exponent that derives from the fractional
-				 * part. Under normal circumstatnces, it is
-				 * the negative of the number of digits in F.
-				 * However, if I is very long, the last digits
-				 * of I get dropped (otherwise a long I with a
-				 * large negative exponent could cause an
-				 * unnecessary overflow on I alone). In this
-				 * case, fracExp is incremented one for each
-				 * dropped digit. */
-    int mantSize;		/* Number of digits in mantissa. */
-    int decPt;			/* Number of mantissa digits BEFORE decimal
-				 * point. */
-    const char *pExp;		/* Temporarily holds location of exponent in
-				 * string. */
-
-    /*
-     * Strip off leading blanks and check for a sign.
-     */
-
-    p = string;
-    while (isspace(UCHAR(*p))) {
-	p += 1;
-    }
-    if (*p == '-') {
-	sign = TRUE;
-	p += 1;
-    } else {
-	if (*p == '+') {
-	    p += 1;
-	}
-	sign = FALSE;
-    }
-
-    /*
-     * Count the number of digits in the mantissa (including the decimal
-     * point), and also locate the decimal point.
-     */
-
-    decPt = -1;
-    for (mantSize = 0; ; mantSize += 1)
-    {
-	c = *p;
-	if (!isdigit(c)) {
-	    if ((c != '.') || (decPt >= 0)) {
-		break;
-	    }
-	    decPt = mantSize;
-	}
-	p += 1;
-    }
-
-    /*
-     * Now suck up the digits in the mantissa. Use two integers to collect 9
-     * digits each (this is faster than using floating-point). If the mantissa
-     * has more than 18 digits, ignore the extras, since they can't affect the
-     * value anyway.
-     */
-
-    pExp  = p;
-    p -= mantSize;
-    if (decPt < 0) {
-	decPt = mantSize;
-    } else {
-	mantSize -= 1;		/* One of the digits was the point. */
-    }
-    if (mantSize > 18) {
-	fracExp = decPt - 18;
-	mantSize = 18;
-    } else {
-	fracExp = decPt - mantSize;
-    }
-    if (mantSize == 0) {
-	fraction = 0.0;
-	p = string;
-	goto done;
-    } else {
-	int frac1, frac2;
-
-	frac1 = 0;
-	for ( ; mantSize > 9; mantSize -= 1) {
-	    c = *p;
-	    p += 1;
-	    if (c == '.') {
-		c = *p;
-		p += 1;
-	    }
-	    frac1 = 10*frac1 + (c - '0');
-	}
-	frac2 = 0;
-	for (; mantSize > 0; mantSize -= 1) {
-	    c = *p;
-	    p += 1;
-	    if (c == '.') {
-		c = *p;
-		p += 1;
-	    }
-	    frac2 = 10*frac2 + (c - '0');
-	}
-	fraction = (1.0e9 * frac1) + frac2;
-    }
-
-    /*
-     * Skim off the exponent.
-     */
-
-    p = pExp;
-    if ((*p == 'E') || (*p == 'e')) {
-	p += 1;
-	if (*p == '-') {
-	    expSign = TRUE;
-	    p += 1;
-	} else {
-	    if (*p == '+') {
-		p += 1;
-	    }
-	    expSign = FALSE;
-	}
-	if (!isdigit(UCHAR(*p))) {
-	    p = pExp;
-	    goto done;
-	}
-	while (isdigit(UCHAR(*p))) {
-	    exp = exp * 10 + (*p - '0');
-	    p += 1;
-	}
-    }
-    if (expSign) {
-	exp = fracExp - exp;
-    } else {
-	exp = fracExp + exp;
-    }
-
-    /*
-     * Generate a floating-point number that represents the exponent. Do this
-     * by processing the exponent one bit at a time to combine many powers of
-     * 2 of 10. Then combine the exponent with the fraction.
-     */
-
-    if (exp < 0) {
-	expSign = TRUE;
-	exp = -exp;
-    } else {
-	expSign = FALSE;
-    }
-    if (exp > maxExponent) {
-	exp = maxExponent;
-	errno = ERANGE;
-    }
-    dblExp = 1.0;
-    for (d = powersOf10; exp != 0; exp >>= 1, ++d) {
-	if (exp & 01) {
-	    dblExp *= *d;
-	}
-    }
-    if (expSign) {
-	fraction /= dblExp;
-    } else {
-	fraction *= dblExp;
-    }
-
-  done:
-    if (endPtr != NULL) {
-	*endPtr = (char *) p;
-    }
-
-    if (sign) {
-	return -fraction;
-    }
-    return fraction;
-}

doc/clock.n

@@ -453,6 +453,19 @@ If this situation occurs, the first occurrence of the time is chosen.
 (For this reason, it is wise to have the input string contain the
 time zone when converting local times.  This caveat does not apply to
 UTC times.)
+.PP
+If the interpretation of the groups yields an impossible time because
+a field is out of range, enough of that field's unit will be added to
+or subtracted from the time to bring it in range. Thus, if attempting to
+scan or format day 0 of the month, one day will be subtracted from day
+1 of the month, yielding the last day of the previous month.
+.PP
+If the interpretation of the groups yields an impossible time because
+a Daylight Saving Time change skips over that time, or an ambiguous
+time because a Daylight Saving Time change skips back so that the clock
+observes the given time twice, and no time zone specifier (\fB%z\fR
+or \fB%Z\fR) is present in the format, the time is interpreted as
+if the clock had not changed. 
 .SH "FORMAT GROUPS"
 .PP
 The following format groups are recognized by the \fBclock scan\fR and

doc/define.n

@@ -50,7 +50,7 @@ being constructed. Within the constructor, the \fBnext\fR command should be
 used to call the superclasses' constructors. If \fIbodyScript\fR is the empty
 string, the constructor will be deleted.
 .TP
-\fBdeletemethod\fI name\fR ?\fIname ...\fR
+\fBdeletemethod\fI name\fR ?\fIname ...\fR?
 .
 This deletes each of the methods called \fIname\fR from a class. The methods
 must have previously existed in that class. Does not affect the superclasses

doc/exec.n

@@ -217,6 +217,19 @@ information is instead sent to the console, if one is present, or is
 discarded.
 .RS
 .PP
+Note that the current escape resp. quoting of arguments for windows works only
+with executables using CommandLineToArgv, CRT-library or similar, as well as
+with the windows batch files (excepting the newline, see below).
+Although it is the common escape algorithm, but, in fact, the way how the
+executable parses the command-line (resp. splits it into single arguments)
+is decisive.
+.PP
+Unfortunately, there is currently no way to supply newline character within
+an argument to the batch files (\fB.cmd\fR or \fB.bat\fR) or to the command
+processor (\fBcmd.exe /c\fR), because this causes truncation of command-line
+(also the argument chain) on the first newline character.
+But it works properly with an executable (using CommandLineToArgv, etc).
+.PP
 The Tk console text widget does not provide real standard IO capabilities.
 Under Tk, when redirecting from standard input, all applications will see an
 immediate end-of-file; information redirected to standard output or standard
@@ -409,6 +422,10 @@ that sometimes pop up:
 With the file \fIcmp.bat\fR looking something like:
 .PP
 .CS
+@gcc %*
+.CE
+or like another variant using single parameters:
+.CS
 @gcc %1 %2 %3 %4 %5 %6 %7 %8 %9
 .CE
 .SS "WORKING WITH COMMAND BUILT-INS"

doc/http.n

@@ -6,14 +6,14 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\"
-.TH "http" n 2.7 http "Tcl Bundled Packages"
+.TH "http" n 2.9 http "Tcl Bundled Packages"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME
 http \- Client-side implementation of the HTTP/1.1 protocol
 .SH SYNOPSIS
-\fBpackage require http ?2.7?\fR
+\fBpackage require http ?2.8?\fR
 .\" See Also -useragent option documentation in body!
 .sp
 \fB::http::config ?\fI\-option value\fR ...?
@@ -22,6 +22,8 @@ http \- Client-side implementation of the HTTP/1.1 protocol
 .sp
 \fB::http::formatQuery\fR \fIkey value\fR ?\fIkey value\fR ...?
 .sp
+\fB::http::quoteString\fR \fIvalue\fR
+.sp
 \fB::http::reset\fR \fItoken\fR ?\fIwhy\fR?
 .sp
 \fB::http::wait \fItoken\fR
@@ -44,12 +46,14 @@ http \- Client-side implementation of the HTTP/1.1 protocol
 .sp
 \fB::http::register \fIproto port command\fR
 .sp
+\fB::http::registerError \fIport\fR ?\fImessage\fR?
+.sp
 \fB::http::unregister \fIproto\fR
 .BE
 .SH DESCRIPTION
 .PP
 The \fBhttp\fR package provides the client side of the HTTP/1.1
-protocol, as defined in RFC 2616.
+protocol, as defined in RFC 7230 to RFC 7235, which supersede RFC 2616.
 The package implements the GET, POST, and HEAD operations
 of HTTP/1.1.  It allows configuration of a proxy host to get through
 firewalls.  The package is compatible with the \fBSafesock\fR security
@@ -95,6 +99,19 @@ comma-separated list of mime type patterns that you are
 willing to receive.  For example,
 .QW "image/gif, image/jpeg, text/*" .
 .TP
+\fB\-pipeline\fR \fIboolean\fR
+.
+Specifies whether HTTP/1.1 transactions on a persistent socket will be
+pipelined.  See the \fBPERSISTENT SOCKETS\fR section for details. The default
+is 1.
+.TP
+\fB\-postfresh\fR \fIboolean\fR
+.
+Specifies whether requests that use the \fBPOST\fR method will always use a
+fresh socket, overriding the \fB-keepalive\fR option of
+command \fBhttp::geturl\fR.  See the \fBPERSISTENT SOCKETS\fR section for details.
+The default is 0.
+.TP
 \fB\-proxyhost\fR \fIhostname\fR
 .
 The name of the proxy host, if any.  If this value is the
@@ -116,20 +133,47 @@ an empty list.  The default filter returns the values of the
 \fB\-proxyhost\fR and \fB\-proxyport\fR settings if they are
 non-empty.
 .TP
+\fB\-repost\fR \fIboolean\fR
+.
+Specifies what to do if a POST request over a persistent connection fails
+because the server has half-closed the connection.  If boolean \fBtrue\fR, the
+request
+will be automatically retried; if boolean \fBfalse\fR it will not, and the
+application
+that uses \fBhttp::geturl\fR is expected to seek user confirmation before
+retrying the POST.  The value \fBtrue\fR should be used only under certain
+conditions. See the \fBPERSISTENT SOCKETS\fR section for details. The
+default is 0.
+.TP
 \fB\-urlencoding\fR \fIencoding\fR
 .
 The \fIencoding\fR used for creating the x-url-encoded URLs with
-\fB::http::formatQuery\fR.  The default is \fButf-8\fR, as specified by RFC
+\fB::http::formatQuery\fR and \fB::http::quoteString\fR.
+The default is \fButf-8\fR, as specified by RFC
 2718.  Prior to http 2.5 this was unspecified, and that behavior can be
 returned by specifying the empty string (\fB{}\fR), although
 \fIiso8859-1\fR is recommended to restore similar behavior but without the
-\fB::http::formatQuery\fR throwing an error processing non-latin-1
-characters.
+\fB::http::formatQuery\fR or \fB::http::quoteString\fR
+throwing an error processing non-latin-1 characters.
 .TP
 \fB\-useragent\fR \fIstring\fR
 .
-The value of the User-Agent header in the HTTP request.  The default is
-.QW "\fBTcl http client package 2.7\fR" .
+The value of the User-Agent header in the HTTP request.  In an unsafe
+interpreter, the default value depends upon the operating system, and
+the version numbers of \fBhttp\fR and \fBTcl\fR, and is (for example)
+.QW "\fBMozilla/5.0 (Windows; U; Windows NT 10.0) http/2.8.12 Tcl/8.6.8\fR" .
+A safe interpreter cannot determine its operating system, and so the default
+in a safe interpreter is to use a Windows 10 value with the current version
+numbers of \fBhttp\fR and \fBTcl\fR.
+.TP
+\fB\-zip\fR \fIboolean\fR
+.
+If the value is boolean \fBtrue\fR, then by default requests will send a header
+.QW "\fBAccept-Encoding: gzip,deflate,compress\fR" .
+If the value is boolean \fBfalse\fR, then by default this header will not be sent.
+In either case the default can be overridden for an individual request by
+supplying a custom \fBAccept-Encoding\fR header in the \fB-headers\fR option
+of \fBhttp::geturl\fR. The default is 1.
 .RE
 .TP
 \fB::http::geturl\fR \fIurl\fR ?\fIoptions\fR?
@@ -227,7 +271,7 @@ Pragma: no-cache
 .TP
 \fB\-keepalive\fR \fIboolean\fR
 .
-If true, attempt to keep the connection open for servicing
+If boolean \fBtrue\fR, attempt to keep the connection open for servicing
 multiple requests.  Default is 0.
 .TP
 \fB\-method\fR \fItype\fR
@@ -334,6 +378,11 @@ encodes the keys and values, and generates one string that has the
 proper & and = separators.  The result is suitable for the
 \fB\-query\fR value passed to \fB::http::geturl\fR.
 .TP
+\fB::http::quoteString\fR \fIvalue\fR
+.
+This procedure does x-url-encoding of string.  It takes a single argument and
+encodes it.
+.TP
 \fB::http::reset\fR \fItoken\fR ?\fIwhy\fR?
 .
 This command resets the HTTP transaction identified by \fItoken\fR, if any.
@@ -415,6 +464,17 @@ set token [::http::geturl https://my.secure.site/]
 .CE
 .RE
 .TP
+\fB::http::registerError\fR \fIport\fR ?\fImessage\fR?
+.
+This procedure allows a registered protocol handler to deliver an error
+message for use by \fBhttp\fR.  Calling this command does not raise an
+error. The command is useful when a registered protocol detects an problem
+(for example, an invalid TLS certificate) that will cause an error to
+propagate to \fBhttp\fR.  The command allows \fBhttp\fR to provide a
+precise error message rather than a general one.  The command returns the
+value provided by the last call with argument \fImessage\fR, or the empty
+string if no such call has been made.
+.TP
 \fB::http::unregister\fR \fIproto\fR
 .
 This procedure unregisters a protocol handler that was previously
@@ -504,6 +564,14 @@ The following elements of
 the array are supported:
 .RS
 .TP
+\fBbinary\fR
+.
+This is boolean \fBtrue\fR if (after decoding any compression specified
+by the
+.QW "Content-Encoding"
+response header) the HTTP response is binary.  It is boolean \fBfalse\fR
+if the HTTP response is text.
+.TP
 \fBbody\fR
 .
 The contents of the URL.  This will be empty if the \fB\-channel\fR
@@ -602,6 +670,106 @@ A copy of the \fBContent-Type\fR meta-data value.
 .
 The requested URL.
 .RE
+.SH "PERSISTENT CONNECTIONS"
+.PP
+.SS "BASICS"
+.PP
+See RFC 7230 Sec 6, which supersedes RFC 2616 Sec 8.1.
+.PP
+A persistent connection allows multiple HTTP/1.1 transactions to be
+carried over the same TCP connection.  Pipelining allows a
+client to make multiple requests over a persistent connection without
+waiting for each response.  The server sends responses in the same order
+that the requests were received.
+.PP
+If a POST request fails to complete, typically user confirmation is
+needed before sending the request again.  The user may wish to verify
+whether the server was modified by the failed POST request, before
+sending the same request again.
+.PP
+A HTTP request will use a persistent socket if the call to
+\fBhttp::geturl\fR has the option \fB-keepalive true\fR. It will use
+pipelining where permitted if the \fBhttp::config\fR option
+\fB-pipeline\fR is boolean \fBtrue\fR (its default value).
+.PP
+The http package maintains no more than one persistent connection to each
+server (i.e. each value of
+.QW "domain:port" ).
+If \fBhttp::geturl\fR is called to make a request over a persistent
+connection while the connection is busy with another request, the new
+request will be held in a queue until the connection is free.
+.PP
+The http package does not support HTTP/1.0 persistent connections
+controlled by the \fBKeep-Alive\fR header.
+.SS "SPECIAL CASES"
+.PP
+This subsection discusses issues related to closure of the
+persistent connection by the server, automatic retry of failed requests,
+the special treatment necessary for POST requests, and the options for
+dealing with these cases.
+.PP
+In accordance with RFC 7230, \fBhttp::geturl\fR does not pipeline
+requests that use the POST method.  If a POST uses a persistent
+connection and is not the first request on that connection,
+\fBhttp::geturl\fR waits until it has received the response for the previous
+request; or (if \fBhttp::config\fR option \fB-postfresh\fR is boolean \fBtrue\fR) it
+uses a new connection for each POST.
+.PP
+If the server is processing a number of pipelined requests, and sends a
+response header
+.QW "\fBConnection: close\fR"
+with one of the responses (other than the last), then subsequent responses
+are unfulfilled. \fBhttp::geturl\fR will send the unfulfilled requests again
+over a new connection.
+.PP
+A difficulty arises when a HTTP client sends a request over a persistent
+connection that has been idle for a while.  The HTTP server may
+half-close an apparently idle connection while the client is sending a
+request, but before the request arrives at the server: in this case (an
+.QW "asynchronous close event" )
+the request will fail.  The difficulty arises because the client cannot
+be certain whether the POST modified the state of the server.  For HEAD or
+GET requests, \fBhttp::geturl\fR opens another connection and retransmits
+the failed request. However, if the request was a POST, RFC 7230 forbids
+automatic retry by default, suggesting either user confirmation, or
+confirmation by user-agent software that has semantic understanding of
+the application.  The \fBhttp::config\fR option \fB-repost\fR allows for
+either possibility.
+.PP
+Asynchronous close events can occur only in a short interval of time.  The
+\fBhttp\fR package monitors each persistent connection for closure by the
+server.  Upon detection, the connection is also closed at the client end,
+and subsequent requests will use a fresh connection.
+.PP
+If the \fBhttp::geturl\fR command is called with option \fB-keepalive true\fR,
+then it will both try to use an existing persistent connection
+(if one is available), and it will send the server a
+.QW "\fBConnection: keep-alive\fR"
+request header asking to keep the connection open for future requests.
+.PP
+The \fBhttp::config\fR options \fB-pipeline\fR, \fB-postfresh\fR, and
+\fB-repost\fR relate to persistent connections.
+.PP
+Option \fB-pipeline\fR, if boolean \fBtrue\fR, will pipeline GET and HEAD requests
+made
+over a persistent connection.  POST requests will not be pipelined - if the
+POST is not the first transaction on the connection, its request will not
+be sent until the previous response has finished.  GET and HEAD requests
+made after a POST will not be sent until the POST response has been
+delivered, and will not be sent if the POST fails.
+.PP
+Option \fB-postfresh\fR, if boolean \fBtrue\fR, will override the \fBhttp::geturl\fR option
+\fB-keepalive\fR, and always open a fresh connection for a POST request.
+.PP
+Option \fB-repost\fR, if \fBtrue\fR, permits automatic retry of a POST request
+that fails because it uses a persistent connection that the server has
+half-closed (an
+.QW "asynchronous close event" ).
+Subsequent GET and HEAD requests in a failed pipeline will also be retried.
+\fIThe -repost option should be used only if the application understands
+that the retry is appropriate\fR - specifically, the application must know
+that if the failed POST successfully modified the state of the server, a repeat POST
+would have no adverse effect.
 .SH EXAMPLE
 .PP
 This example creates a procedure to copy a URL to a file while printing a

doc/lreplace.n

@@ -17,7 +17,7 @@ lreplace \- Replace elements in a list with new elements
 .BE
 .SH DESCRIPTION
 .PP
-\fBlreplace\fR returns a new list formed by replacing one or more elements of
+\fBlreplace\fR returns a new list formed by replacing zero or more elements of
 \fIlist\fR with the \fIelement\fR arguments.
 \fIfirst\fR and \fIlast\fR are index values specifying the first and
 last elements of the range to replace.
@@ -27,23 +27,26 @@ supporting simple index arithmetic and indices relative to the
 end of the list.
 0 refers to the first element of the
 list, and \fBend\fR refers to the last element of the list.
-If \fIlist\fR is empty, then \fIfirst\fR and \fIlast\fR are ignored.
 .PP
-If \fIfirst\fR is less than zero, it is considered to refer to before the
-first element of the list.  For non-empty lists, the element indicated
-by \fIfirst\fR must exist or \fIfirst\fR must indicate before the
-start of the list.
+If either \fIfirst\fR or \fIlast\fR is less than zero, it is considered
+to refer to before the first element of the list. This allows \fBlreplace\fR
+to prepend elements to \fIlist\fR.
+.VS TIP505
+If either \fIfirst\fR or \fIlast\fR indicates a position greater than the
+index of the last element of the list, it is treated as if it is an
+index one greater than the last element. This allows \fBlreplace\fR to
+append elements to \fIlist\fR.
+.VE TIP505
 .PP
 If \fIlast\fR is less than \fIfirst\fR, then any specified elements
-will be inserted into the list before the point specified by \fIfirst\fR
+will be inserted into the list before the element specified by \fIfirst\fR
 with no elements being deleted.
 .PP
-The \fIelement\fR arguments specify zero or more new arguments to
+The \fIelement\fR arguments specify zero or more new elements to
 be added to the list in place of those that were deleted.
 Each \fIelement\fR argument will become a separate element of
 the list.  If no \fIelement\fR arguments are specified, then the elements
-between \fIfirst\fR and \fIlast\fR are simply deleted.  If \fIlist\fR
-is empty, any \fIelement\fR arguments are added to the end of the list.
+between \fIfirst\fR and \fIlast\fR are simply deleted.
 .SH EXAMPLES
 .PP
 Replacing an element of a list with another:
@@ -78,9 +81,26 @@ proc lremove {listVariable value} {
     set var [\fBlreplace\fR $var $idx $idx]
 }
 .CE
+.PP
+.VS TIP505
+Appending elements to the list; note that \fBend+2\fR will initially
+be treated as if it is \fB6\fR here, but both that and \fB12345\fR are greater
+than the index of the final item so they behave identically:
+.PP
+.CS
+% set var {a b c d e}
+a b c d e
+% set var [\fBlreplace\fR $var 12345 end+2 f g h i]
+a b c d e f g h i
+.CE
+.VE TIP505
 .SH "SEE ALSO"
 list(n), lappend(n), lindex(n), linsert(n), llength(n), lsearch(n),
 lset(n), lrange(n), lsort(n),
 string(n)
 .SH KEYWORDS
 element, list, replace
+.\" Local variables:
+.\" mode: nroff
+.\" fill-column: 78
+.\" End:

doc/string.n

@@ -115,9 +115,7 @@ Any Unicode control character.
 Any Unicode digit character.  Note that this includes characters
 outside of the [0\-9] range.
 .IP \fBdouble\fR 12
-Any of the valid forms for a double in Tcl, with optional surrounding
-whitespace.  In case of under/overflow in the value, 0 is returned and
-the \fIvarname\fR will contain \-1.
+Any of the forms allowed to \fBTcl_GetDoubleFromObj\fR.
 .IP \fBentier\fR 12
 .VS 8.6
 Any of the valid string formats for an integer value of arbitrary size
@@ -131,7 +129,7 @@ false.
 Any Unicode printing character, except space.
 .IP \fBinteger\fR 12
 Any of the valid string formats for a 32-bit integer value in Tcl,
-with optional surrounding whitespace.  In case of under/overflow in
+with optional surrounding whitespace.  In case of overflow in
 the value, 0 is returned and the \fIvarname\fR will contain \-1.
 .IP \fBlist\fR 12
 Any proper list structure, with optional surrounding whitespace. In
@@ -156,7 +154,7 @@ true.
 Any upper case alphabet character in the Unicode character set.
 .IP \fBwideinteger\fR 12
 Any of the valid forms for a wide integer in Tcl, with optional
-surrounding whitespace.  In case of under/overflow in the value, 0 is
+surrounding whitespace.  In case of overflow in the value, 0 is
 returned and the \fIvarname\fR will contain \-1.
 .IP \fBwordchar\fR 12
 Any Unicode word character.  That is any alphanumeric character, and

doc/tcltest.n

@@ -8,7 +8,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\"
-.TH "tcltest" n 2.3 tcltest "Tcl Bundled Packages"
+.TH "tcltest" n 2.5 tcltest "Tcl Bundled Packages"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
@@ -16,7 +16,7 @@
 tcltest \- Test harness support code and utilities
 .SH SYNOPSIS
 .nf
-\fBpackage require tcltest\fR ?\fB2.3\fR?
+\fBpackage require tcltest\fR ?\fB2.5\fR?
 
 \fBtcltest::test \fIname description\fR ?\fI\-option value ...\fR?
 \fBtcltest::test \fIname description\fR ?\fIconstraints\fR? \fIbody result\fR
@@ -454,6 +454,7 @@ The valid options for \fBtest\fR are summarized:
         ?\fB\-output \fIexpectedOutput\fR?
         ?\fB\-errorOutput \fIexpectedError\fR?
         ?\fB\-returnCodes \fIcodeList\fR?
+        ?\fB\-errorCode \fIexpectedErrorCode\fR?
         ?\fB\-match \fImode\fR?
 .CE
 .PP
@@ -577,6 +578,15 @@ return codes known to \fBreturn\fR, in both numeric and symbolic
 form, including extended return codes, are acceptable elements in
 the \fIexpectedCodeList\fR.  Default value is
 .QW "\fBok return\fR" .
+.TP
+\fB\-errorCode \fIexpectedErrorCode\fR
+.
+The optional \fB\-errorCode\fR attribute supplies \fIexpectedErrorCode\fR,
+a glob pattern that should match the error code reported from evaluation of the
+\fB\-body\fR script.  If evaluation of the \fB\-body\fR script returns
+a code not matching \fIexpectedErrorCode\fR, the test fails.  Default value is
+.QW "\fB*\fR" .
+If \fB\-returnCodes\fR does not include \fBerror\fR it is set to \fBerror\fR.
 .PP
 To pass, a test must successfully evaluate its \fB\-setup\fR, \fB\-body\fR,
 and \fB\-cleanup\fR scripts.  The return code of the \fB\-body\fR script and

generic/regc_locale.c

@@ -137,8 +137,8 @@ static const crange alphaRangeTable[] = {
     {0x41, 0x5a}, {0x61, 0x7a}, {0xc0, 0xd6}, {0xd8, 0xf6},
     {0xf8, 0x2c1}, {0x2c6, 0x2d1}, {0x2e0, 0x2e4}, {0x370, 0x374},
     {0x37a, 0x37d}, {0x388, 0x38a}, {0x38e, 0x3a1}, {0x3a3, 0x3f5},
-    {0x3f7, 0x481}, {0x48a, 0x52f}, {0x531, 0x556}, {0x561, 0x587},
-    {0x5d0, 0x5ea}, {0x5f0, 0x5f2}, {0x620, 0x64a}, {0x671, 0x6d3},
+    {0x3f7, 0x481}, {0x48a, 0x52f}, {0x531, 0x556}, {0x560, 0x588},
+    {0x5d0, 0x5ea}, {0x5ef, 0x5f2}, {0x620, 0x64a}, {0x671, 0x6d3},
     {0x6fa, 0x6fc}, {0x712, 0x72f}, {0x74d, 0x7a5}, {0x7ca, 0x7ea},
     {0x800, 0x815}, {0x840, 0x858}, {0x860, 0x86a}, {0x8a0, 0x8b4},
     {0x8b6, 0x8bd}, {0x904, 0x939}, {0x958, 0x961}, {0x971, 0x980},
@@ -165,45 +165,42 @@ static const crange alphaRangeTable[] = {
     {0x1401, 0x166c}, {0x166f, 0x167f}, {0x1681, 0x169a}, {0x16a0, 0x16ea},
     {0x16f1, 0x16f8}, {0x1700, 0x170c}, {0x170e, 0x1711}, {0x1720, 0x1731},
     {0x1740, 0x1751}, {0x1760, 0x176c}, {0x176e, 0x1770}, {0x1780, 0x17b3},
-    {0x1820, 0x1877}, {0x1880, 0x1884}, {0x1887, 0x18a8}, {0x18b0, 0x18f5},
+    {0x1820, 0x1878}, {0x1880, 0x1884}, {0x1887, 0x18a8}, {0x18b0, 0x18f5},
     {0x1900, 0x191e}, {0x1950, 0x196d}, {0x1970, 0x1974}, {0x1980, 0x19ab},
     {0x19b0, 0x19c9}, {0x1a00, 0x1a16}, {0x1a20, 0x1a54}, {0x1b05, 0x1b33},
     {0x1b45, 0x1b4b}, {0x1b83, 0x1ba0}, {0x1bba, 0x1be5}, {0x1c00, 0x1c23},
-    {0x1c4d, 0x1c4f}, {0x1c5a, 0x1c7d}, {0x1c80, 0x1c88}, {0x1ce9, 0x1cec},
-    {0x1cee, 0x1cf1}, {0x1d00, 0x1dbf}, {0x1e00, 0x1f15}, {0x1f18, 0x1f1d},
-    {0x1f20, 0x1f45}, {0x1f48, 0x1f4d}, {0x1f50, 0x1f57}, {0x1f5f, 0x1f7d},
-    {0x1f80, 0x1fb4}, {0x1fb6, 0x1fbc}, {0x1fc2, 0x1fc4}, {0x1fc6, 0x1fcc},
-    {0x1fd0, 0x1fd3}, {0x1fd6, 0x1fdb}, {0x1fe0, 0x1fec}, {0x1ff2, 0x1ff4},
-    {0x1ff6, 0x1ffc}, {0x2090, 0x209c}, {0x210a, 0x2113}, {0x2119, 0x211d},
-    {0x212a, 0x212d}, {0x212f, 0x2139}, {0x213c, 0x213f}, {0x2145, 0x2149},
-    {0x2c00, 0x2c2e}, {0x2c30, 0x2c5e}, {0x2c60, 0x2ce4}, {0x2ceb, 0x2cee},
-    {0x2d00, 0x2d25}, {0x2d30, 0x2d67}, {0x2d80, 0x2d96}, {0x2da0, 0x2da6},
-    {0x2da8, 0x2dae}, {0x2db0, 0x2db6}, {0x2db8, 0x2dbe}, {0x2dc0, 0x2dc6},
-    {0x2dc8, 0x2dce}, {0x2dd0, 0x2dd6}, {0x2dd8, 0x2dde}, {0x3031, 0x3035},
-    {0x3041, 0x3096}, {0x309d, 0x309f}, {0x30a1, 0x30fa}, {0x30fc, 0x30ff},
-    {0x3105, 0x312e}, {0x3131, 0x318e}, {0x31a0, 0x31ba}, {0x31f0, 0x31ff},
-    {0x3400, 0x4db5}, {0x4e00, 0x9fea}, {0xa000, 0xa48c}, {0xa4d0, 0xa4fd},
-    {0xa500, 0xa60c}, {0xa610, 0xa61f}, {0xa640, 0xa66e}, {0xa67f, 0xa69d},
-    {0xa6a0, 0xa6e5}, {0xa717, 0xa71f}, {0xa722, 0xa788}, {0xa78b, 0xa7ae},
-    {0xa7b0, 0xa7b7}, {0xa7f7, 0xa801}, {0xa803, 0xa805}, {0xa807, 0xa80a},
-    {0xa80c, 0xa822}, {0xa840, 0xa873}, {0xa882, 0xa8b3}, {0xa8f2, 0xa8f7},
-    {0xa90a, 0xa925}, {0xa930, 0xa946}, {0xa960, 0xa97c}, {0xa984, 0xa9b2},
-    {0xa9e0, 0xa9e4}, {0xa9e6, 0xa9ef}, {0xa9fa, 0xa9fe}, {0xaa00, 0xaa28},
-    {0xaa40, 0xaa42}, {0xaa44, 0xaa4b}, {0xaa60, 0xaa76}, {0xaa7e, 0xaaaf},
-    {0xaab9, 0xaabd}, {0xaadb, 0xaadd}, {0xaae0, 0xaaea}, {0xaaf2, 0xaaf4},
-    {0xab01, 0xab06}, {0xab09, 0xab0e}, {0xab11, 0xab16}, {0xab20, 0xab26},
-    {0xab28, 0xab2e}, {0xab30, 0xab5a}, {0xab5c, 0xab65}, {0xab70, 0xabe2},
-    {0xac00, 0xd7a3}, {0xd7b0, 0xd7c6}, {0xd7cb, 0xd7fb}, {0xdc00, 0xdc3e},
-    {0xdc40, 0xdc7e}, {0xdc80, 0xdcbe}, {0xdcc0, 0xdcfe}, {0xdd00, 0xdd3e},
-    {0xdd40, 0xdd7e}, {0xdd80, 0xddbe}, {0xddc0, 0xddfe}, {0xde00, 0xde3e},
-    {0xde40, 0xde7e}, {0xde80, 0xdebe}, {0xdec0, 0xdefe}, {0xdf00, 0xdf3e},
-    {0xdf40, 0xdf7e}, {0xdf80, 0xdfbe}, {0xdfc0, 0xdffe}, {0xf900, 0xfa6d},
-    {0xfa70, 0xfad9}, {0xfb00, 0xfb06}, {0xfb13, 0xfb17}, {0xfb1f, 0xfb28},
-    {0xfb2a, 0xfb36}, {0xfb38, 0xfb3c}, {0xfb46, 0xfbb1}, {0xfbd3, 0xfd3d},
-    {0xfd50, 0xfd8f}, {0xfd92, 0xfdc7}, {0xfdf0, 0xfdfb}, {0xfe70, 0xfe74},
-    {0xfe76, 0xfefc}, {0xff21, 0xff3a}, {0xff41, 0xff5a}, {0xff66, 0xffbe},
-    {0xffc2, 0xffc7}, {0xffca, 0xffcf}, {0xffd2, 0xffd7}, {0xffda, 0xffdc}
-#if TCL_UTF_MAX > 4
+    {0x1c4d, 0x1c4f}, {0x1c5a, 0x1c7d}, {0x1c80, 0x1c88}, {0x1c90, 0x1cba},
+    {0x1cbd, 0x1cbf}, {0x1ce9, 0x1cec}, {0x1cee, 0x1cf1}, {0x1d00, 0x1dbf},
+    {0x1e00, 0x1f15}, {0x1f18, 0x1f1d}, {0x1f20, 0x1f45}, {0x1f48, 0x1f4d},
+    {0x1f50, 0x1f57}, {0x1f5f, 0x1f7d}, {0x1f80, 0x1fb4}, {0x1fb6, 0x1fbc},
+    {0x1fc2, 0x1fc4}, {0x1fc6, 0x1fcc}, {0x1fd0, 0x1fd3}, {0x1fd6, 0x1fdb},
+    {0x1fe0, 0x1fec}, {0x1ff2, 0x1ff4}, {0x1ff6, 0x1ffc}, {0x2090, 0x209c},
+    {0x210a, 0x2113}, {0x2119, 0x211d}, {0x212a, 0x212d}, {0x212f, 0x2139},
+    {0x213c, 0x213f}, {0x2145, 0x2149}, {0x2c00, 0x2c2e}, {0x2c30, 0x2c5e},
+    {0x2c60, 0x2ce4}, {0x2ceb, 0x2cee}, {0x2d00, 0x2d25}, {0x2d30, 0x2d67},
+    {0x2d80, 0x2d96}, {0x2da0, 0x2da6}, {0x2da8, 0x2dae}, {0x2db0, 0x2db6},
+    {0x2db8, 0x2dbe}, {0x2dc0, 0x2dc6}, {0x2dc8, 0x2dce}, {0x2dd0, 0x2dd6},
+    {0x2dd8, 0x2dde}, {0x3031, 0x3035}, {0x3041, 0x3096}, {0x309d, 0x309f},
+    {0x30a1, 0x30fa}, {0x30fc, 0x30ff}, {0x3105, 0x312f}, {0x3131, 0x318e},
+    {0x31a0, 0x31ba}, {0x31f0, 0x31ff}, {0x3400, 0x4db5}, {0x4e00, 0x9fef},
+    {0xa000, 0xa48c}, {0xa4d0, 0xa4fd}, {0xa500, 0xa60c}, {0xa610, 0xa61f},
+    {0xa640, 0xa66e}, {0xa67f, 0xa69d}, {0xa6a0, 0xa6e5}, {0xa717, 0xa71f},
+    {0xa722, 0xa788}, {0xa78b, 0xa7b9}, {0xa7f7, 0xa801}, {0xa803, 0xa805},
+    {0xa807, 0xa80a}, {0xa80c, 0xa822}, {0xa840, 0xa873}, {0xa882, 0xa8b3},
+    {0xa8f2, 0xa8f7}, {0xa90a, 0xa925}, {0xa930, 0xa946}, {0xa960, 0xa97c},
+    {0xa984, 0xa9b2}, {0xa9e0, 0xa9e4}, {0xa9e6, 0xa9ef}, {0xa9fa, 0xa9fe},
+    {0xaa00, 0xaa28}, {0xaa40, 0xaa42}, {0xaa44, 0xaa4b}, {0xaa60, 0xaa76},
+    {0xaa7e, 0xaaaf}, {0xaab9, 0xaabd}, {0xaadb, 0xaadd}, {0xaae0, 0xaaea},
+    {0xaaf2, 0xaaf4}, {0xab01, 0xab06}, {0xab09, 0xab0e}, {0xab11, 0xab16},
+    {0xab20, 0xab26}, {0xab28, 0xab2e}, {0xab30, 0xab5a}, {0xab5c, 0xab65},
+    {0xab70, 0xabe2}, {0xac00, 0xd7a3}, {0xd7b0, 0xd7c6}, {0xd7cb, 0xd7fb},
+    {0xf900, 0xfa6d}, {0xfa70, 0xfad9}, {0xfb00, 0xfb06}, {0xfb13, 0xfb17},
+    {0xfb1f, 0xfb28}, {0xfb2a, 0xfb36}, {0xfb38, 0xfb3c}, {0xfb46, 0xfbb1},
+    {0xfbd3, 0xfd3d}, {0xfd50, 0xfd8f}, {0xfd92, 0xfdc7}, {0xfdf0, 0xfdfb},
+    {0xfe70, 0xfe74}, {0xfe76, 0xfefc}, {0xff21, 0xff3a}, {0xff41, 0xff5a},
+    {0xff66, 0xffbe}, {0xffc2, 0xffc7}, {0xffca, 0xffcf}, {0xffd2, 0xffd7},
+    {0xffda, 0xffdc}
+#if CHRBITS > 16
     ,{0x10000, 0x1000b}, {0x1000d, 0x10026}, {0x10028, 0x1003a}, {0x1003f, 0x1004d},
     {0x10050, 0x1005d}, {0x10080, 0x100fa}, {0x10280, 0x1029c}, {0x102a0, 0x102d0},
     {0x10300, 0x1031f}, {0x1032d, 0x10340}, {0x10342, 0x10349}, {0x10350, 0x10375},
@@ -212,23 +209,25 @@ static const crange alphaRangeTable[] = {
     {0x10600, 0x10736}, {0x10740, 0x10755}, {0x10760, 0x10767}, {0x10800, 0x10805},
     {0x1080a, 0x10835}, {0x1083f, 0x10855}, {0x10860, 0x10876}, {0x10880, 0x1089e},
     {0x108e0, 0x108f2}, {0x10900, 0x10915}, {0x10920, 0x10939}, {0x10980, 0x109b7},
-    {0x10a10, 0x10a13}, {0x10a15, 0x10a17}, {0x10a19, 0x10a33}, {0x10a60, 0x10a7c},
+    {0x10a10, 0x10a13}, {0x10a15, 0x10a17}, {0x10a19, 0x10a35}, {0x10a60, 0x10a7c},
     {0x10a80, 0x10a9c}, {0x10ac0, 0x10ac7}, {0x10ac9, 0x10ae4}, {0x10b00, 0x10b35},
     {0x10b40, 0x10b55}, {0x10b60, 0x10b72}, {0x10b80, 0x10b91}, {0x10c00, 0x10c48},
-    {0x10c80, 0x10cb2}, {0x10cc0, 0x10cf2}, {0x11003, 0x11037}, {0x11083, 0x110af},
-    {0x110d0, 0x110e8}, {0x11103, 0x11126}, {0x11150, 0x11172}, {0x11183, 0x111b2},
-    {0x111c1, 0x111c4}, {0x11200, 0x11211}, {0x11213, 0x1122b}, {0x11280, 0x11286},
-    {0x1128a, 0x1128d}, {0x1128f, 0x1129d}, {0x1129f, 0x112a8}, {0x112b0, 0x112de},
-    {0x11305, 0x1130c}, {0x11313, 0x11328}, {0x1132a, 0x11330}, {0x11335, 0x11339},
-    {0x1135d, 0x11361}, {0x11400, 0x11434}, {0x11447, 0x1144a}, {0x11480, 0x114af},
-    {0x11580, 0x115ae}, {0x115d8, 0x115db}, {0x11600, 0x1162f}, {0x11680, 0x116aa},
-    {0x11700, 0x11719}, {0x118a0, 0x118df}, {0x11a0b, 0x11a32}, {0x11a5c, 0x11a83},
+    {0x10c80, 0x10cb2}, {0x10cc0, 0x10cf2}, {0x10d00, 0x10d23}, {0x10f00, 0x10f1c},
+    {0x10f30, 0x10f45}, {0x11003, 0x11037}, {0x11083, 0x110af}, {0x110d0, 0x110e8},
+    {0x11103, 0x11126}, {0x11150, 0x11172}, {0x11183, 0x111b2}, {0x111c1, 0x111c4},
+    {0x11200, 0x11211}, {0x11213, 0x1122b}, {0x11280, 0x11286}, {0x1128a, 0x1128d},
+    {0x1128f, 0x1129d}, {0x1129f, 0x112a8}, {0x112b0, 0x112de}, {0x11305, 0x1130c},
+    {0x11313, 0x11328}, {0x1132a, 0x11330}, {0x11335, 0x11339}, {0x1135d, 0x11361},
+    {0x11400, 0x11434}, {0x11447, 0x1144a}, {0x11480, 0x114af}, {0x11580, 0x115ae},
+    {0x115d8, 0x115db}, {0x11600, 0x1162f}, {0x11680, 0x116aa}, {0x11700, 0x1171a},
+    {0x11800, 0x1182b}, {0x118a0, 0x118df}, {0x11a0b, 0x11a32}, {0x11a5c, 0x11a83},
     {0x11a86, 0x11a89}, {0x11ac0, 0x11af8}, {0x11c00, 0x11c08}, {0x11c0a, 0x11c2e},
-    {0x11c72, 0x11c8f}, {0x11d00, 0x11d06}, {0x11d0b, 0x11d30}, {0x12000, 0x12399},
-    {0x12480, 0x12543}, {0x13000, 0x1342e}, {0x14400, 0x14646}, {0x16800, 0x16a38},
-    {0x16a40, 0x16a5e}, {0x16ad0, 0x16aed}, {0x16b00, 0x16b2f}, {0x16b40, 0x16b43},
-    {0x16b63, 0x16b77}, {0x16b7d, 0x16b8f}, {0x16f00, 0x16f44}, {0x16f93, 0x16f9f},
-    {0x17000, 0x187ec}, {0x18800, 0x18af2}, {0x1b000, 0x1b11e}, {0x1b170, 0x1b2fb},
+    {0x11c72, 0x11c8f}, {0x11d00, 0x11d06}, {0x11d0b, 0x11d30}, {0x11d60, 0x11d65},
+    {0x11d6a, 0x11d89}, {0x11ee0, 0x11ef2}, {0x12000, 0x12399}, {0x12480, 0x12543},
+    {0x13000, 0x1342e}, {0x14400, 0x14646}, {0x16800, 0x16a38}, {0x16a40, 0x16a5e},
+    {0x16ad0, 0x16aed}, {0x16b00, 0x16b2f}, {0x16b40, 0x16b43}, {0x16b63, 0x16b77},
+    {0x16b7d, 0x16b8f}, {0x16e40, 0x16e7f}, {0x16f00, 0x16f44}, {0x16f93, 0x16f9f},
+    {0x17000, 0x187f1}, {0x18800, 0x18af2}, {0x1b000, 0x1b11e}, {0x1b170, 0x1b2fb},
     {0x1bc00, 0x1bc6a}, {0x1bc70, 0x1bc7c}, {0x1bc80, 0x1bc88}, {0x1bc90, 0x1bc99},
     {0x1d400, 0x1d454}, {0x1d456, 0x1d49c}, {0x1d4a9, 0x1d4ac}, {0x1d4ae, 0x1d4b9},
     {0x1d4bd, 0x1d4c3}, {0x1d4c5, 0x1d505}, {0x1d507, 0x1d50a}, {0x1d50d, 0x1d514},
@@ -264,17 +263,18 @@ static const chr alphaCharTable[] = {
     0x1baf, 0x1cf5, 0x1cf6, 0x1f59, 0x1f5b, 0x1f5d, 0x1fbe, 0x2071, 0x207f,
     0x2102, 0x2107, 0x2115, 0x2124, 0x2126, 0x2128, 0x214e, 0x2183, 0x2184,
     0x2cf2, 0x2cf3, 0x2d27, 0x2d2d, 0x2d6f, 0x2e2f, 0x3005, 0x3006, 0x303b,
-    0x303c, 0xa62a, 0xa62b, 0xa8fb, 0xa8fd, 0xa9cf, 0xaa7a, 0xaab1, 0xaab5,
-    0xaab6, 0xaac0, 0xaac2, 0xfb1d, 0xfb3e, 0xfb40, 0xfb41, 0xfb43, 0xfb44
-#if TCL_UTF_MAX > 4
+    0x303c, 0xa62a, 0xa62b, 0xa8fb, 0xa8fd, 0xa8fe, 0xa9cf, 0xaa7a, 0xaab1,
+    0xaab5, 0xaab6, 0xaac0, 0xaac2, 0xfb1d, 0xfb3e, 0xfb40, 0xfb41, 0xfb43,
+    0xfb44
+#if CHRBITS > 16
     ,0x1003c, 0x1003d, 0x10808, 0x10837, 0x10838, 0x1083c, 0x108f4, 0x108f5, 0x109be,
-    0x109bf, 0x10a00, 0x11176, 0x111da, 0x111dc, 0x11288, 0x1130f, 0x11310, 0x11332,
-    0x11333, 0x1133d, 0x11350, 0x114c4, 0x114c5, 0x114c7, 0x11644, 0x118ff, 0x11a00,
-    0x11a3a, 0x11a50, 0x11c40, 0x11d08, 0x11d09, 0x11d46, 0x16f50, 0x16fe0, 0x16fe1,
-    0x1d49e, 0x1d49f, 0x1d4a2, 0x1d4a5, 0x1d4a6, 0x1d4bb, 0x1d546, 0x1ee21, 0x1ee22,
-    0x1ee24, 0x1ee27, 0x1ee39, 0x1ee3b, 0x1ee42, 0x1ee47, 0x1ee49, 0x1ee4b, 0x1ee51,
-    0x1ee52, 0x1ee54, 0x1ee57, 0x1ee59, 0x1ee5b, 0x1ee5d, 0x1ee5f, 0x1ee61, 0x1ee62,
-    0x1ee64, 0x1ee7e
+    0x109bf, 0x10a00, 0x10f27, 0x11144, 0x11176, 0x111da, 0x111dc, 0x11288, 0x1130f,
+    0x11310, 0x11332, 0x11333, 0x1133d, 0x11350, 0x114c4, 0x114c5, 0x114c7, 0x11644,
+    0x118ff, 0x11a00, 0x11a3a, 0x11a50, 0x11a9d, 0x11c40, 0x11d08, 0x11d09, 0x11d46,
+    0x11d67, 0x11d68, 0x11d98, 0x16f50, 0x16fe0, 0x16fe1, 0x1d49e, 0x1d49f, 0x1d4a2,
+    0x1d4a5, 0x1d4a6, 0x1d4bb, 0x1d546, 0x1ee21, 0x1ee22, 0x1ee24, 0x1ee27, 0x1ee39,
+    0x1ee3b, 0x1ee42, 0x1ee47, 0x1ee49, 0x1ee4b, 0x1ee51, 0x1ee52, 0x1ee54, 0x1ee57,
+    0x1ee59, 0x1ee5b, 0x1ee5d, 0x1ee5f, 0x1ee61, 0x1ee62, 0x1ee64, 0x1ee7e
 #endif
 };
 
@@ -288,7 +288,7 @@ static const crange controlRangeTable[] = {
     {0x0, 0x1f}, {0x7f, 0x9f}, {0x600, 0x605}, {0x200b, 0x200f},
     {0x202a, 0x202e}, {0x2060, 0x2064}, {0x2066, 0x206f}, {0xe000, 0xf8ff},
     {0xfff9, 0xfffb}
-#if TCL_UTF_MAX > 4
+#if CHRBITS > 16
     ,{0x1bca0, 0x1bca3}, {0x1d173, 0x1d17a}, {0xe0020, 0xe007f}, {0xf0000, 0xffffd},
     {0x100000, 0x10fffd}
 #endif
@@ -298,8 +298,8 @@ static const crange controlRangeTable[] = {
 
 static const chr controlCharTable[] = {
     0xad, 0x61c, 0x6dd, 0x70f, 0x8e2, 0x180e, 0xfeff
-#if TCL_UTF_MAX > 4
-    ,0x110bd, 0xe0001
+#if CHRBITS > 16
+    ,0x110bd, 0x110cd, 0xe0001
 #endif
 };
 
@@ -320,12 +320,12 @@ static const crange digitRangeTable[] = {
     {0x1c50, 0x1c59}, {0xa620, 0xa629}, {0xa8d0, 0xa8d9}, {0xa900, 0xa909},
     {0xa9d0, 0xa9d9}, {0xa9f0, 0xa9f9}, {0xaa50, 0xaa59}, {0xabf0, 0xabf9},
     {0xff10, 0xff19}
-#if TCL_UTF_MAX > 4
-    ,{0x104a0, 0x104a9}, {0x11066, 0x1106f}, {0x110f0, 0x110f9}, {0x11136, 0x1113f},
-    {0x111d0, 0x111d9}, {0x112f0, 0x112f9}, {0x11450, 0x11459}, {0x114d0, 0x114d9},
-    {0x11650, 0x11659}, {0x116c0, 0x116c9}, {0x11730, 0x11739}, {0x118e0, 0x118e9},
-    {0x11c50, 0x11c59}, {0x11d50, 0x11d59}, {0x16a60, 0x16a69}, {0x16b50, 0x16b59},
-    {0x1d7ce, 0x1d7ff}, {0x1e950, 0x1e959}
+#if CHRBITS > 16
+    ,{0x104a0, 0x104a9}, {0x10d30, 0x10d39}, {0x11066, 0x1106f}, {0x110f0, 0x110f9},
+    {0x11136, 0x1113f}, {0x111d0, 0x111d9}, {0x112f0, 0x112f9}, {0x11450, 0x11459},
+    {0x114d0, 0x114d9}, {0x11650, 0x11659}, {0x116c0, 0x116c9}, {0x11730, 0x11739},
+    {0x118e0, 0x118e9}, {0x11c50, 0x11c59}, {0x11d50, 0x11d59}, {0x11da0, 0x11da9},
+    {0x16a60, 0x16a69}, {0x16b50, 0x16b59}, {0x1d7ce, 0x1d7ff}, {0x1e950, 0x1e959}
 #endif
 };
 
@@ -348,19 +348,20 @@ static const crange punctRangeTable[] = {
     {0x1b5a, 0x1b60}, {0x1bfc, 0x1bff}, {0x1c3b, 0x1c3f}, {0x1cc0, 0x1cc7},
     {0x2010, 0x2027}, {0x2030, 0x2043}, {0x2045, 0x2051}, {0x2053, 0x205e},
     {0x2308, 0x230b}, {0x2768, 0x2775}, {0x27e6, 0x27ef}, {0x2983, 0x2998},
-    {0x29d8, 0x29db}, {0x2cf9, 0x2cfc}, {0x2e00, 0x2e2e}, {0x2e30, 0x2e49},
+    {0x29d8, 0x29db}, {0x2cf9, 0x2cfc}, {0x2e00, 0x2e2e}, {0x2e30, 0x2e4e},
     {0x3001, 0x3003}, {0x3008, 0x3011}, {0x3014, 0x301f}, {0xa60d, 0xa60f},
     {0xa6f2, 0xa6f7}, {0xa874, 0xa877}, {0xa8f8, 0xa8fa}, {0xa9c1, 0xa9cd},
     {0xaa5c, 0xaa5f}, {0xfe10, 0xfe19}, {0xfe30, 0xfe52}, {0xfe54, 0xfe61},
     {0xff01, 0xff03}, {0xff05, 0xff0a}, {0xff0c, 0xff0f}, {0xff3b, 0xff3d},
     {0xff5f, 0xff65}
-#if TCL_UTF_MAX > 4
+#if CHRBITS > 16
     ,{0x10100, 0x10102}, {0x10a50, 0x10a58}, {0x10af0, 0x10af6}, {0x10b39, 0x10b3f},
-    {0x10b99, 0x10b9c}, {0x11047, 0x1104d}, {0x110be, 0x110c1}, {0x11140, 0x11143},
-    {0x111c5, 0x111c9}, {0x111dd, 0x111df}, {0x11238, 0x1123d}, {0x1144b, 0x1144f},
-    {0x115c1, 0x115d7}, {0x11641, 0x11643}, {0x11660, 0x1166c}, {0x1173c, 0x1173e},
-    {0x11a3f, 0x11a46}, {0x11a9a, 0x11a9c}, {0x11a9e, 0x11aa2}, {0x11c41, 0x11c45},
-    {0x12470, 0x12474}, {0x16b37, 0x16b3b}, {0x1da87, 0x1da8b}
+    {0x10b99, 0x10b9c}, {0x10f55, 0x10f59}, {0x11047, 0x1104d}, {0x110be, 0x110c1},
+    {0x11140, 0x11143}, {0x111c5, 0x111c8}, {0x111dd, 0x111df}, {0x11238, 0x1123d},
+    {0x1144b, 0x1144f}, {0x115c1, 0x115d7}, {0x11641, 0x11643}, {0x11660, 0x1166c},
+    {0x1173c, 0x1173e}, {0x11a3f, 0x11a46}, {0x11a9a, 0x11a9c}, {0x11a9e, 0x11aa2},
+    {0x11c41, 0x11c45}, {0x12470, 0x12474}, {0x16b37, 0x16b3b}, {0x16e97, 0x16e9a},
+    {0x1da87, 0x1da8b}
 #endif
 };
 
@@ -371,18 +372,20 @@ static const chr punctCharTable[] = {
     0xab, 0xb6, 0xb7, 0xbb, 0xbf, 0x37e, 0x387, 0x589, 0x58a,
     0x5be, 0x5c0, 0x5c3, 0x5c6, 0x5f3, 0x5f4, 0x609, 0x60a, 0x60c,
     0x60d, 0x61b, 0x61e, 0x61f, 0x6d4, 0x85e, 0x964, 0x965, 0x970,
-    0x9fd, 0xaf0, 0xdf4, 0xe4f, 0xe5a, 0xe5b, 0xf14, 0xf85, 0xfd9,
-    0xfda, 0x10fb, 0x1400, 0x166d, 0x166e, 0x169b, 0x169c, 0x1735, 0x1736,
-    0x1944, 0x1945, 0x1a1e, 0x1a1f, 0x1c7e, 0x1c7f, 0x1cd3, 0x207d, 0x207e,
-    0x208d, 0x208e, 0x2329, 0x232a, 0x27c5, 0x27c6, 0x29fc, 0x29fd, 0x2cfe,
-    0x2cff, 0x2d70, 0x3030, 0x303d, 0x30a0, 0x30fb, 0xa4fe, 0xa4ff, 0xa673,
-    0xa67e, 0xa8ce, 0xa8cf, 0xa8fc, 0xa92e, 0xa92f, 0xa95f, 0xa9de, 0xa9df,
-    0xaade, 0xaadf, 0xaaf0, 0xaaf1, 0xabeb, 0xfd3e, 0xfd3f, 0xfe63, 0xfe68,
-    0xfe6a, 0xfe6b, 0xff1a, 0xff1b, 0xff1f, 0xff20, 0xff3f, 0xff5b, 0xff5d
-#if TCL_UTF_MAX > 4
+    0x9fd, 0xa76, 0xaf0, 0xc84, 0xdf4, 0xe4f, 0xe5a, 0xe5b, 0xf14,
+    0xf85, 0xfd9, 0xfda, 0x10fb, 0x1400, 0x166d, 0x166e, 0x169b, 0x169c,
+    0x1735, 0x1736, 0x1944, 0x1945, 0x1a1e, 0x1a1f, 0x1c7e, 0x1c7f, 0x1cd3,
+    0x207d, 0x207e, 0x208d, 0x208e, 0x2329, 0x232a, 0x27c5, 0x27c6, 0x29fc,
+    0x29fd, 0x2cfe, 0x2cff, 0x2d70, 0x3030, 0x303d, 0x30a0, 0x30fb, 0xa4fe,
+    0xa4ff, 0xa673, 0xa67e, 0xa8ce, 0xa8cf, 0xa8fc, 0xa92e, 0xa92f, 0xa95f,
+    0xa9de, 0xa9df, 0xaade, 0xaadf, 0xaaf0, 0xaaf1, 0xabeb, 0xfd3e, 0xfd3f,
+    0xfe63, 0xfe68, 0xfe6a, 0xfe6b, 0xff1a, 0xff1b, 0xff1f, 0xff20, 0xff3f,
+    0xff5b, 0xff5d
+#if CHRBITS > 16
     ,0x1039f, 0x103d0, 0x1056f, 0x10857, 0x1091f, 0x1093f, 0x10a7f, 0x110bb, 0x110bc,
-    0x11174, 0x11175, 0x111cd, 0x111db, 0x112a9, 0x1145b, 0x1145d, 0x114c6, 0x11c70,
-    0x11c71, 0x16a6e, 0x16a6f, 0x16af5, 0x16b44, 0x1bc9f, 0x1e95e, 0x1e95f
+    0x11174, 0x11175, 0x111cd, 0x111db, 0x112a9, 0x1145b, 0x1145d, 0x114c6, 0x1183b,
+    0x11c70, 0x11c71, 0x11ef7, 0x11ef8, 0x16a6e, 0x16a6f, 0x16af5, 0x16b44, 0x1bc9f,
+    0x1e95e, 0x1e95f
 #endif
 };
 
@@ -413,25 +416,25 @@ static const crange lowerRangeTable[] = {
     {0x61, 0x7a}, {0xdf, 0xf6}, {0xf8, 0xff}, {0x17e, 0x180},
     {0x199, 0x19b}, {0x1bd, 0x1bf}, {0x233, 0x239}, {0x24f, 0x293},
     {0x295, 0x2af}, {0x37b, 0x37d}, {0x3ac, 0x3ce}, {0x3d5, 0x3d7},
-    {0x3ef, 0x3f3}, {0x430, 0x45f}, {0x561, 0x587}, {0x13f8, 0x13fd},
-    {0x1c80, 0x1c88}, {0x1d00, 0x1d2b}, {0x1d6b, 0x1d77}, {0x1d79, 0x1d9a},
-    {0x1e95, 0x1e9d}, {0x1eff, 0x1f07}, {0x1f10, 0x1f15}, {0x1f20, 0x1f27},
-    {0x1f30, 0x1f37}, {0x1f40, 0x1f45}, {0x1f50, 0x1f57}, {0x1f60, 0x1f67},
-    {0x1f70, 0x1f7d}, {0x1f80, 0x1f87}, {0x1f90, 0x1f97}, {0x1fa0, 0x1fa7},
-    {0x1fb0, 0x1fb4}, {0x1fc2, 0x1fc4}, {0x1fd0, 0x1fd3}, {0x1fe0, 0x1fe7},
-    {0x1ff2, 0x1ff4}, {0x2146, 0x2149}, {0x2c30, 0x2c5e}, {0x2c76, 0x2c7b},
-    {0x2d00, 0x2d25}, {0xa72f, 0xa731}, {0xa771, 0xa778}, {0xa793, 0xa795},
-    {0xab30, 0xab5a}, {0xab60, 0xab65}, {0xab70, 0xabbf}, {0xfb00, 0xfb06},
-    {0xfb13, 0xfb17}, {0xff41, 0xff5a}
-#if TCL_UTF_MAX > 4
+    {0x3ef, 0x3f3}, {0x430, 0x45f}, {0x560, 0x588}, {0x10d0, 0x10fa},
+    {0x10fd, 0x10ff}, {0x13f8, 0x13fd}, {0x1c80, 0x1c88}, {0x1d00, 0x1d2b},
+    {0x1d6b, 0x1d77}, {0x1d79, 0x1d9a}, {0x1e95, 0x1e9d}, {0x1eff, 0x1f07},
+    {0x1f10, 0x1f15}, {0x1f20, 0x1f27}, {0x1f30, 0x1f37}, {0x1f40, 0x1f45},
+    {0x1f50, 0x1f57}, {0x1f60, 0x1f67}, {0x1f70, 0x1f7d}, {0x1f80, 0x1f87},
+    {0x1f90, 0x1f97}, {0x1fa0, 0x1fa7}, {0x1fb0, 0x1fb4}, {0x1fc2, 0x1fc4},
+    {0x1fd0, 0x1fd3}, {0x1fe0, 0x1fe7}, {0x1ff2, 0x1ff4}, {0x2146, 0x2149},
+    {0x2c30, 0x2c5e}, {0x2c76, 0x2c7b}, {0x2d00, 0x2d25}, {0xa72f, 0xa731},
+    {0xa771, 0xa778}, {0xa793, 0xa795}, {0xab30, 0xab5a}, {0xab60, 0xab65},
+    {0xab70, 0xabbf}, {0xfb00, 0xfb06}, {0xfb13, 0xfb17}, {0xff41, 0xff5a}
+#if CHRBITS > 16
     ,{0x10428, 0x1044f}, {0x104d8, 0x104fb}, {0x10cc0, 0x10cf2}, {0x118c0, 0x118df},
-    {0x1d41a, 0x1d433}, {0x1d44e, 0x1d454}, {0x1d456, 0x1d467}, {0x1d482, 0x1d49b},
-    {0x1d4b6, 0x1d4b9}, {0x1d4bd, 0x1d4c3}, {0x1d4c5, 0x1d4cf}, {0x1d4ea, 0x1d503},
-    {0x1d51e, 0x1d537}, {0x1d552, 0x1d56b}, {0x1d586, 0x1d59f}, {0x1d5ba, 0x1d5d3},
-    {0x1d5ee, 0x1d607}, {0x1d622, 0x1d63b}, {0x1d656, 0x1d66f}, {0x1d68a, 0x1d6a5},
-    {0x1d6c2, 0x1d6da}, {0x1d6dc, 0x1d6e1}, {0x1d6fc, 0x1d714}, {0x1d716, 0x1d71b},
-    {0x1d736, 0x1d74e}, {0x1d750, 0x1d755}, {0x1d770, 0x1d788}, {0x1d78a, 0x1d78f},
-    {0x1d7aa, 0x1d7c2}, {0x1d7c4, 0x1d7c9}, {0x1e922, 0x1e943}
+    {0x16e60, 0x16e7f}, {0x1d41a, 0x1d433}, {0x1d44e, 0x1d454}, {0x1d456, 0x1d467},
+    {0x1d482, 0x1d49b}, {0x1d4b6, 0x1d4b9}, {0x1d4bd, 0x1d4c3}, {0x1d4c5, 0x1d4cf},
+    {0x1d4ea, 0x1d503}, {0x1d51e, 0x1d537}, {0x1d552, 0x1d56b}, {0x1d586, 0x1d59f},
+    {0x1d5ba, 0x1d5d3}, {0x1d5ee, 0x1d607}, {0x1d622, 0x1d63b}, {0x1d656, 0x1d66f},
+    {0x1d68a, 0x1d6a5}, {0x1d6c2, 0x1d6da}, {0x1d6dc, 0x1d6e1}, {0x1d6fc, 0x1d714},
+    {0x1d716, 0x1d71b}, {0x1d736, 0x1d74e}, {0x1d750, 0x1d755}, {0x1d770, 0x1d788},
+    {0x1d78a, 0x1d78f}, {0x1d7aa, 0x1d7c2}, {0x1d7c4, 0x1d7c9}, {0x1e922, 0x1e943}
 #endif
 };
 
@@ -501,8 +504,8 @@ static const chr lowerCharTable[] = {
     0xa763, 0xa765, 0xa767, 0xa769, 0xa76b, 0xa76d, 0xa76f, 0xa77a, 0xa77c,
     0xa77f, 0xa781, 0xa783, 0xa785, 0xa787, 0xa78c, 0xa78e, 0xa791, 0xa797,
     0xa799, 0xa79b, 0xa79d, 0xa79f, 0xa7a1, 0xa7a3, 0xa7a5, 0xa7a7, 0xa7a9,
-    0xa7b5, 0xa7b7, 0xa7fa
-#if TCL_UTF_MAX > 4
+    0xa7af, 0xa7b5, 0xa7b7, 0xa7b9, 0xa7fa
+#if CHRBITS > 16
     ,0x1d4bb, 0x1d7cb
 #endif
 };
@@ -518,20 +521,22 @@ static const crange upperRangeTable[] = {
     {0x18e, 0x191}, {0x196, 0x198}, {0x1b1, 0x1b3}, {0x1f6, 0x1f8},
     {0x243, 0x246}, {0x388, 0x38a}, {0x391, 0x3a1}, {0x3a3, 0x3ab},
     {0x3d2, 0x3d4}, {0x3fd, 0x42f}, {0x531, 0x556}, {0x10a0, 0x10c5},
-    {0x13a0, 0x13f5}, {0x1f08, 0x1f0f}, {0x1f18, 0x1f1d}, {0x1f28, 0x1f2f},
-    {0x1f38, 0x1f3f}, {0x1f48, 0x1f4d}, {0x1f68, 0x1f6f}, {0x1fb8, 0x1fbb},
-    {0x1fc8, 0x1fcb}, {0x1fd8, 0x1fdb}, {0x1fe8, 0x1fec}, {0x1ff8, 0x1ffb},
-    {0x210b, 0x210d}, {0x2110, 0x2112}, {0x2119, 0x211d}, {0x212a, 0x212d},
-    {0x2130, 0x2133}, {0x2c00, 0x2c2e}, {0x2c62, 0x2c64}, {0x2c6d, 0x2c70},
-    {0x2c7e, 0x2c80}, {0xa7aa, 0xa7ae}, {0xa7b0, 0xa7b4}, {0xff21, 0xff3a}
-#if TCL_UTF_MAX > 4
+    {0x13a0, 0x13f5}, {0x1c90, 0x1cba}, {0x1cbd, 0x1cbf}, {0x1f08, 0x1f0f},
+    {0x1f18, 0x1f1d}, {0x1f28, 0x1f2f}, {0x1f38, 0x1f3f}, {0x1f48, 0x1f4d},
+    {0x1f68, 0x1f6f}, {0x1fb8, 0x1fbb}, {0x1fc8, 0x1fcb}, {0x1fd8, 0x1fdb},
+    {0x1fe8, 0x1fec}, {0x1ff8, 0x1ffb}, {0x210b, 0x210d}, {0x2110, 0x2112},
+    {0x2119, 0x211d}, {0x212a, 0x212d}, {0x2130, 0x2133}, {0x2c00, 0x2c2e},
+    {0x2c62, 0x2c64}, {0x2c6d, 0x2c70}, {0x2c7e, 0x2c80}, {0xa7aa, 0xa7ae},
+    {0xa7b0, 0xa7b4}, {0xff21, 0xff3a}
+#if CHRBITS > 16
     ,{0x10400, 0x10427}, {0x104b0, 0x104d3}, {0x10c80, 0x10cb2}, {0x118a0, 0x118bf},
-    {0x1d400, 0x1d419}, {0x1d434, 0x1d44d}, {0x1d468, 0x1d481}, {0x1d4a9, 0x1d4ac},
-    {0x1d4ae, 0x1d4b5}, {0x1d4d0, 0x1d4e9}, {0x1d507, 0x1d50a}, {0x1d50d, 0x1d514},
-    {0x1d516, 0x1d51c}, {0x1d53b, 0x1d53e}, {0x1d540, 0x1d544}, {0x1d54a, 0x1d550},
-    {0x1d56c, 0x1d585}, {0x1d5a0, 0x1d5b9}, {0x1d5d4, 0x1d5ed}, {0x1d608, 0x1d621},
-    {0x1d63c, 0x1d655}, {0x1d670, 0x1d689}, {0x1d6a8, 0x1d6c0}, {0x1d6e2, 0x1d6fa},
-    {0x1d71c, 0x1d734}, {0x1d756, 0x1d76e}, {0x1d790, 0x1d7a8}, {0x1e900, 0x1e921}
+    {0x16e40, 0x16e5f}, {0x1d400, 0x1d419}, {0x1d434, 0x1d44d}, {0x1d468, 0x1d481},
+    {0x1d4a9, 0x1d4ac}, {0x1d4ae, 0x1d4b5}, {0x1d4d0, 0x1d4e9}, {0x1d507, 0x1d50a},
+    {0x1d50d, 0x1d514}, {0x1d516, 0x1d51c}, {0x1d53b, 0x1d53e}, {0x1d540, 0x1d544},
+    {0x1d54a, 0x1d550}, {0x1d56c, 0x1d585}, {0x1d5a0, 0x1d5b9}, {0x1d5d4, 0x1d5ed},
+    {0x1d608, 0x1d621}, {0x1d63c, 0x1d655}, {0x1d670, 0x1d689}, {0x1d6a8, 0x1d6c0},
+    {0x1d6e2, 0x1d6fa}, {0x1d71c, 0x1d734}, {0x1d756, 0x1d76e}, {0x1d790, 0x1d7a8},
+    {0x1e900, 0x1e921}
 #endif
 };
 
@@ -600,8 +605,9 @@ static const chr upperCharTable[] = {
     0xa756, 0xa758, 0xa75a, 0xa75c, 0xa75e, 0xa760, 0xa762, 0xa764, 0xa766,
     0xa768, 0xa76a, 0xa76c, 0xa76e, 0xa779, 0xa77b, 0xa77d, 0xa77e, 0xa780,
     0xa782, 0xa784, 0xa786, 0xa78b, 0xa78d, 0xa790, 0xa792, 0xa796, 0xa798,
-    0xa79a, 0xa79c, 0xa79e, 0xa7a0, 0xa7a2, 0xa7a4, 0xa7a6, 0xa7a8, 0xa7b6
-#if TCL_UTF_MAX > 4
+    0xa79a, 0xa79c, 0xa79e, 0xa7a0, 0xa7a2, 0xa7a4, 0xa7a6, 0xa7a8, 0xa7b6,
+    0xa7b8
+#if CHRBITS > 16
     ,0x1d49c, 0x1d49e, 0x1d49f, 0x1d4a2, 0x1d4a5, 0x1d4a6, 0x1d504, 0x1d505, 0x1d538,
     0x1d539, 0x1d546, 0x1d7ca
 #endif
@@ -616,85 +622,80 @@ static const chr upperCharTable[] = {
 static const crange graphRangeTable[] = {
     {0x21, 0x7e}, {0xa1, 0xac}, {0xae, 0x377}, {0x37a, 0x37f},
     {0x384, 0x38a}, {0x38e, 0x3a1}, {0x3a3, 0x52f}, {0x531, 0x556},
-    {0x559, 0x55f}, {0x561, 0x587}, {0x58d, 0x58f}, {0x591, 0x5c7},
-    {0x5d0, 0x5ea}, {0x5f0, 0x5f4}, {0x606, 0x61b}, {0x61e, 0x6dc},
-    {0x6de, 0x70d}, {0x710, 0x74a}, {0x74d, 0x7b1}, {0x7c0, 0x7fa},
-    {0x800, 0x82d}, {0x830, 0x83e}, {0x840, 0x85b}, {0x860, 0x86a},
-    {0x8a0, 0x8b4}, {0x8b6, 0x8bd}, {0x8d4, 0x8e1}, {0x8e3, 0x983},
-    {0x985, 0x98c}, {0x993, 0x9a8}, {0x9aa, 0x9b0}, {0x9b6, 0x9b9},
-    {0x9bc, 0x9c4}, {0x9cb, 0x9ce}, {0x9df, 0x9e3}, {0x9e6, 0x9fd},
-    {0xa01, 0xa03}, {0xa05, 0xa0a}, {0xa13, 0xa28}, {0xa2a, 0xa30},
-    {0xa3e, 0xa42}, {0xa4b, 0xa4d}, {0xa59, 0xa5c}, {0xa66, 0xa75},
-    {0xa81, 0xa83}, {0xa85, 0xa8d}, {0xa8f, 0xa91}, {0xa93, 0xaa8},
-    {0xaaa, 0xab0}, {0xab5, 0xab9}, {0xabc, 0xac5}, {0xac7, 0xac9},
-    {0xacb, 0xacd}, {0xae0, 0xae3}, {0xae6, 0xaf1}, {0xaf9, 0xaff},
-    {0xb01, 0xb03}, {0xb05, 0xb0c}, {0xb13, 0xb28}, {0xb2a, 0xb30},
-    {0xb35, 0xb39}, {0xb3c, 0xb44}, {0xb4b, 0xb4d}, {0xb5f, 0xb63},
-    {0xb66, 0xb77}, {0xb85, 0xb8a}, {0xb8e, 0xb90}, {0xb92, 0xb95},
-    {0xba8, 0xbaa}, {0xbae, 0xbb9}, {0xbbe, 0xbc2}, {0xbc6, 0xbc8},
-    {0xbca, 0xbcd}, {0xbe6, 0xbfa}, {0xc00, 0xc03}, {0xc05, 0xc0c},
-    {0xc0e, 0xc10}, {0xc12, 0xc28}, {0xc2a, 0xc39}, {0xc3d, 0xc44},
-    {0xc46, 0xc48}, {0xc4a, 0xc4d}, {0xc58, 0xc5a}, {0xc60, 0xc63},
-    {0xc66, 0xc6f}, {0xc78, 0xc83}, {0xc85, 0xc8c}, {0xc8e, 0xc90},
-    {0xc92, 0xca8}, {0xcaa, 0xcb3}, {0xcb5, 0xcb9}, {0xcbc, 0xcc4},
-    {0xcc6, 0xcc8}, {0xcca, 0xccd}, {0xce0, 0xce3}, {0xce6, 0xcef},
-    {0xd00, 0xd03}, {0xd05, 0xd0c}, {0xd0e, 0xd10}, {0xd12, 0xd44},
-    {0xd46, 0xd48}, {0xd4a, 0xd4f}, {0xd54, 0xd63}, {0xd66, 0xd7f},
-    {0xd85, 0xd96}, {0xd9a, 0xdb1}, {0xdb3, 0xdbb}, {0xdc0, 0xdc6},
-    {0xdcf, 0xdd4}, {0xdd8, 0xddf}, {0xde6, 0xdef}, {0xdf2, 0xdf4},
-    {0xe01, 0xe3a}, {0xe3f, 0xe5b}, {0xe94, 0xe97}, {0xe99, 0xe9f},
-    {0xea1, 0xea3}, {0xead, 0xeb9}, {0xebb, 0xebd}, {0xec0, 0xec4},
-    {0xec8, 0xecd}, {0xed0, 0xed9}, {0xedc, 0xedf}, {0xf00, 0xf47},
-    {0xf49, 0xf6c}, {0xf71, 0xf97}, {0xf99, 0xfbc}, {0xfbe, 0xfcc},
-    {0xfce, 0xfda}, {0x1000, 0x10c5}, {0x10d0, 0x1248}, {0x124a, 0x124d},
-    {0x1250, 0x1256}, {0x125a, 0x125d}, {0x1260, 0x1288}, {0x128a, 0x128d},
-    {0x1290, 0x12b0}, {0x12b2, 0x12b5}, {0x12b8, 0x12be}, {0x12c2, 0x12c5},
-    {0x12c8, 0x12d6}, {0x12d8, 0x1310}, {0x1312, 0x1315}, {0x1318, 0x135a},
-    {0x135d, 0x137c}, {0x1380, 0x1399}, {0x13a0, 0x13f5}, {0x13f8, 0x13fd},
-    {0x1400, 0x167f}, {0x1681, 0x169c}, {0x16a0, 0x16f8}, {0x1700, 0x170c},
-    {0x170e, 0x1714}, {0x1720, 0x1736}, {0x1740, 0x1753}, {0x1760, 0x176c},
-    {0x176e, 0x1770}, {0x1780, 0x17dd}, {0x17e0, 0x17e9}, {0x17f0, 0x17f9},
-    {0x1800, 0x180d}, {0x1810, 0x1819}, {0x1820, 0x1877}, {0x1880, 0x18aa},
-    {0x18b0, 0x18f5}, {0x1900, 0x191e}, {0x1920, 0x192b}, {0x1930, 0x193b},
-    {0x1944, 0x196d}, {0x1970, 0x1974}, {0x1980, 0x19ab}, {0x19b0, 0x19c9},
-    {0x19d0, 0x19da}, {0x19de, 0x1a1b}, {0x1a1e, 0x1a5e}, {0x1a60, 0x1a7c},
-    {0x1a7f, 0x1a89}, {0x1a90, 0x1a99}, {0x1aa0, 0x1aad}, {0x1ab0, 0x1abe},
-    {0x1b00, 0x1b4b}, {0x1b50, 0x1b7c}, {0x1b80, 0x1bf3}, {0x1bfc, 0x1c37},
-    {0x1c3b, 0x1c49}, {0x1c4d, 0x1c88}, {0x1cc0, 0x1cc7}, {0x1cd0, 0x1cf9},
-    {0x1d00, 0x1df9}, {0x1dfb, 0x1f15}, {0x1f18, 0x1f1d}, {0x1f20, 0x1f45},
-    {0x1f48, 0x1f4d}, {0x1f50, 0x1f57}, {0x1f5f, 0x1f7d}, {0x1f80, 0x1fb4},
-    {0x1fb6, 0x1fc4}, {0x1fc6, 0x1fd3}, {0x1fd6, 0x1fdb}, {0x1fdd, 0x1fef},
-    {0x1ff2, 0x1ff4}, {0x1ff6, 0x1ffe}, {0x2010, 0x2027}, {0x2030, 0x205e},
-    {0x2074, 0x208e}, {0x2090, 0x209c}, {0x20a0, 0x20bf}, {0x20d0, 0x20f0},
-    {0x2100, 0x218b}, {0x2190, 0x2426}, {0x2440, 0x244a}, {0x2460, 0x2b73},
-    {0x2b76, 0x2b95}, {0x2b98, 0x2bb9}, {0x2bbd, 0x2bc8}, {0x2bca, 0x2bd2},
-    {0x2bec, 0x2bef}, {0x2c00, 0x2c2e}, {0x2c30, 0x2c5e}, {0x2c60, 0x2cf3},
+    {0x559, 0x58a}, {0x58d, 0x58f}, {0x591, 0x5c7}, {0x5d0, 0x5ea},
+    {0x5ef, 0x5f4}, {0x606, 0x61b}, {0x61e, 0x6dc}, {0x6de, 0x70d},
+    {0x710, 0x74a}, {0x74d, 0x7b1}, {0x7c0, 0x7fa}, {0x7fd, 0x82d},
+    {0x830, 0x83e}, {0x840, 0x85b}, {0x860, 0x86a}, {0x8a0, 0x8b4},
+    {0x8b6, 0x8bd}, {0x8d3, 0x8e1}, {0x8e3, 0x983}, {0x985, 0x98c},
+    {0x993, 0x9a8}, {0x9aa, 0x9b0}, {0x9b6, 0x9b9}, {0x9bc, 0x9c4},
+    {0x9cb, 0x9ce}, {0x9df, 0x9e3}, {0x9e6, 0x9fe}, {0xa01, 0xa03},
+    {0xa05, 0xa0a}, {0xa13, 0xa28}, {0xa2a, 0xa30}, {0xa3e, 0xa42},
+    {0xa4b, 0xa4d}, {0xa59, 0xa5c}, {0xa66, 0xa76}, {0xa81, 0xa83},
+    {0xa85, 0xa8d}, {0xa8f, 0xa91}, {0xa93, 0xaa8}, {0xaaa, 0xab0},
+    {0xab5, 0xab9}, {0xabc, 0xac5}, {0xac7, 0xac9}, {0xacb, 0xacd},
+    {0xae0, 0xae3}, {0xae6, 0xaf1}, {0xaf9, 0xaff}, {0xb01, 0xb03},
+    {0xb05, 0xb0c}, {0xb13, 0xb28}, {0xb2a, 0xb30}, {0xb35, 0xb39},
+    {0xb3c, 0xb44}, {0xb4b, 0xb4d}, {0xb5f, 0xb63}, {0xb66, 0xb77},
+    {0xb85, 0xb8a}, {0xb8e, 0xb90}, {0xb92, 0xb95}, {0xba8, 0xbaa},
+    {0xbae, 0xbb9}, {0xbbe, 0xbc2}, {0xbc6, 0xbc8}, {0xbca, 0xbcd},
+    {0xbe6, 0xbfa}, {0xc00, 0xc0c}, {0xc0e, 0xc10}, {0xc12, 0xc28},
+    {0xc2a, 0xc39}, {0xc3d, 0xc44}, {0xc46, 0xc48}, {0xc4a, 0xc4d},
+    {0xc58, 0xc5a}, {0xc60, 0xc63}, {0xc66, 0xc6f}, {0xc78, 0xc8c},
+    {0xc8e, 0xc90}, {0xc92, 0xca8}, {0xcaa, 0xcb3}, {0xcb5, 0xcb9},
+    {0xcbc, 0xcc4}, {0xcc6, 0xcc8}, {0xcca, 0xccd}, {0xce0, 0xce3},
+    {0xce6, 0xcef}, {0xd00, 0xd03}, {0xd05, 0xd0c}, {0xd0e, 0xd10},
+    {0xd12, 0xd44}, {0xd46, 0xd48}, {0xd4a, 0xd4f}, {0xd54, 0xd63},
+    {0xd66, 0xd7f}, {0xd85, 0xd96}, {0xd9a, 0xdb1}, {0xdb3, 0xdbb},
+    {0xdc0, 0xdc6}, {0xdcf, 0xdd4}, {0xdd8, 0xddf}, {0xde6, 0xdef},
+    {0xdf2, 0xdf4}, {0xe01, 0xe3a}, {0xe3f, 0xe5b}, {0xe94, 0xe97},
+    {0xe99, 0xe9f}, {0xea1, 0xea3}, {0xead, 0xeb9}, {0xebb, 0xebd},
+    {0xec0, 0xec4}, {0xec8, 0xecd}, {0xed0, 0xed9}, {0xedc, 0xedf},
+    {0xf00, 0xf47}, {0xf49, 0xf6c}, {0xf71, 0xf97}, {0xf99, 0xfbc},
+    {0xfbe, 0xfcc}, {0xfce, 0xfda}, {0x1000, 0x10c5}, {0x10d0, 0x1248},
+    {0x124a, 0x124d}, {0x1250, 0x1256}, {0x125a, 0x125d}, {0x1260, 0x1288},
+    {0x128a, 0x128d}, {0x1290, 0x12b0}, {0x12b2, 0x12b5}, {0x12b8, 0x12be},
+    {0x12c2, 0x12c5}, {0x12c8, 0x12d6}, {0x12d8, 0x1310}, {0x1312, 0x1315},
+    {0x1318, 0x135a}, {0x135d, 0x137c}, {0x1380, 0x1399}, {0x13a0, 0x13f5},
+    {0x13f8, 0x13fd}, {0x1400, 0x167f}, {0x1681, 0x169c}, {0x16a0, 0x16f8},
+    {0x1700, 0x170c}, {0x170e, 0x1714}, {0x1720, 0x1736}, {0x1740, 0x1753},
+    {0x1760, 0x176c}, {0x176e, 0x1770}, {0x1780, 0x17dd}, {0x17e0, 0x17e9},
+    {0x17f0, 0x17f9}, {0x1800, 0x180d}, {0x1810, 0x1819}, {0x1820, 0x1878},
+    {0x1880, 0x18aa}, {0x18b0, 0x18f5}, {0x1900, 0x191e}, {0x1920, 0x192b},
+    {0x1930, 0x193b}, {0x1944, 0x196d}, {0x1970, 0x1974}, {0x1980, 0x19ab},
+    {0x19b0, 0x19c9}, {0x19d0, 0x19da}, {0x19de, 0x1a1b}, {0x1a1e, 0x1a5e},
+    {0x1a60, 0x1a7c}, {0x1a7f, 0x1a89}, {0x1a90, 0x1a99}, {0x1aa0, 0x1aad},
+    {0x1ab0, 0x1abe}, {0x1b00, 0x1b4b}, {0x1b50, 0x1b7c}, {0x1b80, 0x1bf3},
+    {0x1bfc, 0x1c37}, {0x1c3b, 0x1c49}, {0x1c4d, 0x1c88}, {0x1c90, 0x1cba},
+    {0x1cbd, 0x1cc7}, {0x1cd0, 0x1cf9}, {0x1d00, 0x1df9}, {0x1dfb, 0x1f15},
+    {0x1f18, 0x1f1d}, {0x1f20, 0x1f45}, {0x1f48, 0x1f4d}, {0x1f50, 0x1f57},
+    {0x1f5f, 0x1f7d}, {0x1f80, 0x1fb4}, {0x1fb6, 0x1fc4}, {0x1fc6, 0x1fd3},
+    {0x1fd6, 0x1fdb}, {0x1fdd, 0x1fef}, {0x1ff2, 0x1ff4}, {0x1ff6, 0x1ffe},
+    {0x2010, 0x2027}, {0x2030, 0x205e}, {0x2074, 0x208e}, {0x2090, 0x209c},
+    {0x20a0, 0x20bf}, {0x20d0, 0x20f0}, {0x2100, 0x218b}, {0x2190, 0x2426},
+    {0x2440, 0x244a}, {0x2460, 0x2b73}, {0x2b76, 0x2b95}, {0x2b98, 0x2bc8},
+    {0x2bca, 0x2bfe}, {0x2c00, 0x2c2e}, {0x2c30, 0x2c5e}, {0x2c60, 0x2cf3},
     {0x2cf9, 0x2d25}, {0x2d30, 0x2d67}, {0x2d7f, 0x2d96}, {0x2da0, 0x2da6},
     {0x2da8, 0x2dae}, {0x2db0, 0x2db6}, {0x2db8, 0x2dbe}, {0x2dc0, 0x2dc6},
-    {0x2dc8, 0x2dce}, {0x2dd0, 0x2dd6}, {0x2dd8, 0x2dde}, {0x2de0, 0x2e49},
+    {0x2dc8, 0x2dce}, {0x2dd0, 0x2dd6}, {0x2dd8, 0x2dde}, {0x2de0, 0x2e4e},
     {0x2e80, 0x2e99}, {0x2e9b, 0x2ef3}, {0x2f00, 0x2fd5}, {0x2ff0, 0x2ffb},
-    {0x3001, 0x303f}, {0x3041, 0x3096}, {0x3099, 0x30ff}, {0x3105, 0x312e},
+    {0x3001, 0x303f}, {0x3041, 0x3096}, {0x3099, 0x30ff}, {0x3105, 0x312f},
     {0x3131, 0x318e}, {0x3190, 0x31ba}, {0x31c0, 0x31e3}, {0x31f0, 0x321e},
-    {0x3220, 0x32fe}, {0x3300, 0x4db5}, {0x4dc0, 0x9fea}, {0xa000, 0xa48c},
-    {0xa490, 0xa4c6}, {0xa4d0, 0xa62b}, {0xa640, 0xa6f7}, {0xa700, 0xa7ae},
-    {0xa7b0, 0xa7b7}, {0xa7f7, 0xa82b}, {0xa830, 0xa839}, {0xa840, 0xa877},
-    {0xa880, 0xa8c5}, {0xa8ce, 0xa8d9}, {0xa8e0, 0xa8fd}, {0xa900, 0xa953},
-    {0xa95f, 0xa97c}, {0xa980, 0xa9cd}, {0xa9cf, 0xa9d9}, {0xa9de, 0xa9fe},
-    {0xaa00, 0xaa36}, {0xaa40, 0xaa4d}, {0xaa50, 0xaa59}, {0xaa5c, 0xaac2},
-    {0xaadb, 0xaaf6}, {0xab01, 0xab06}, {0xab09, 0xab0e}, {0xab11, 0xab16},
-    {0xab20, 0xab26}, {0xab28, 0xab2e}, {0xab30, 0xab65}, {0xab70, 0xabed},
-    {0xabf0, 0xabf9}, {0xac00, 0xd7a3}, {0xd7b0, 0xd7c6}, {0xd7cb, 0xd7fb},
-    {0xdc00, 0xdc3e}, {0xdc40, 0xdc7e}, {0xdc80, 0xdcbe}, {0xdcc0, 0xdcfe},
-    {0xdd00, 0xdd3e}, {0xdd40, 0xdd7e}, {0xdd80, 0xddbe}, {0xddc0, 0xddfe},
-    {0xde00, 0xde3e}, {0xde40, 0xde7e}, {0xde80, 0xdebe}, {0xdec0, 0xdefe},
-    {0xdf00, 0xdf3e}, {0xdf40, 0xdf7e}, {0xdf80, 0xdfbe}, {0xdfc0, 0xdffe},
-    {0xf900, 0xfa6d}, {0xfa70, 0xfad9}, {0xfb00, 0xfb06}, {0xfb13, 0xfb17},
-    {0xfb1d, 0xfb36}, {0xfb38, 0xfb3c}, {0xfb46, 0xfbc1}, {0xfbd3, 0xfd3f},
-    {0xfd50, 0xfd8f}, {0xfd92, 0xfdc7}, {0xfdf0, 0xfdfd}, {0xfe00, 0xfe19},
-    {0xfe20, 0xfe52}, {0xfe54, 0xfe66}, {0xfe68, 0xfe6b}, {0xfe70, 0xfe74},
-    {0xfe76, 0xfefc}, {0xff01, 0xffbe}, {0xffc2, 0xffc7}, {0xffca, 0xffcf},
-    {0xffd2, 0xffd7}, {0xffda, 0xffdc}, {0xffe0, 0xffe6}, {0xffe8, 0xffee}
-#if TCL_UTF_MAX > 4
+    {0x3220, 0x32fe}, {0x3300, 0x4db5}, {0x4dc0, 0x9fef}, {0xa000, 0xa48c},
+    {0xa490, 0xa4c6}, {0xa4d0, 0xa62b}, {0xa640, 0xa6f7}, {0xa700, 0xa7b9},
+    {0xa7f7, 0xa82b}, {0xa830, 0xa839}, {0xa840, 0xa877}, {0xa880, 0xa8c5},
+    {0xa8ce, 0xa8d9}, {0xa8e0, 0xa953}, {0xa95f, 0xa97c}, {0xa980, 0xa9cd},
+    {0xa9cf, 0xa9d9}, {0xa9de, 0xa9fe}, {0xaa00, 0xaa36}, {0xaa40, 0xaa4d},
+    {0xaa50, 0xaa59}, {0xaa5c, 0xaac2}, {0xaadb, 0xaaf6}, {0xab01, 0xab06},
+    {0xab09, 0xab0e}, {0xab11, 0xab16}, {0xab20, 0xab26}, {0xab28, 0xab2e},
+    {0xab30, 0xab65}, {0xab70, 0xabed}, {0xabf0, 0xabf9}, {0xac00, 0xd7a3},
+    {0xd7b0, 0xd7c6}, {0xd7cb, 0xd7fb}, {0xf900, 0xfa6d}, {0xfa70, 0xfad9},
+    {0xfb00, 0xfb06}, {0xfb13, 0xfb17}, {0xfb1d, 0xfb36}, {0xfb38, 0xfb3c},
+    {0xfb46, 0xfbc1}, {0xfbd3, 0xfd3f}, {0xfd50, 0xfd8f}, {0xfd92, 0xfdc7},
+    {0xfdf0, 0xfdfd}, {0xfe00, 0xfe19}, {0xfe20, 0xfe52}, {0xfe54, 0xfe66},
+    {0xfe68, 0xfe6b}, {0xfe70, 0xfe74}, {0xfe76, 0xfefc}, {0xff01, 0xffbe},
+    {0xffc2, 0xffc7}, {0xffca, 0xffcf}, {0xffd2, 0xffd7}, {0xffda, 0xffdc},
+    {0xffe0, 0xffe6}, {0xffe8, 0xffee}
+#if CHRBITS > 16
     ,{0x10000, 0x1000b}, {0x1000d, 0x10026}, {0x10028, 0x1003a}, {0x1003f, 0x1004d},
     {0x10050, 0x1005d}, {0x10080, 0x100fa}, {0x10100, 0x10102}, {0x10107, 0x10133},
     {0x10137, 0x1018e}, {0x10190, 0x1019b}, {0x101d0, 0x101fd}, {0x10280, 0x1029c},
@@ -705,80 +706,85 @@ static const crange graphRangeTable[] = {
     {0x10760, 0x10767}, {0x10800, 0x10805}, {0x1080a, 0x10835}, {0x1083f, 0x10855},
     {0x10857, 0x1089e}, {0x108a7, 0x108af}, {0x108e0, 0x108f2}, {0x108fb, 0x1091b},
     {0x1091f, 0x10939}, {0x10980, 0x109b7}, {0x109bc, 0x109cf}, {0x109d2, 0x10a03},
-    {0x10a0c, 0x10a13}, {0x10a15, 0x10a17}, {0x10a19, 0x10a33}, {0x10a38, 0x10a3a},
-    {0x10a3f, 0x10a47}, {0x10a50, 0x10a58}, {0x10a60, 0x10a9f}, {0x10ac0, 0x10ae6},
+    {0x10a0c, 0x10a13}, {0x10a15, 0x10a17}, {0x10a19, 0x10a35}, {0x10a38, 0x10a3a},
+    {0x10a3f, 0x10a48}, {0x10a50, 0x10a58}, {0x10a60, 0x10a9f}, {0x10ac0, 0x10ae6},
     {0x10aeb, 0x10af6}, {0x10b00, 0x10b35}, {0x10b39, 0x10b55}, {0x10b58, 0x10b72},
     {0x10b78, 0x10b91}, {0x10b99, 0x10b9c}, {0x10ba9, 0x10baf}, {0x10c00, 0x10c48},
-    {0x10c80, 0x10cb2}, {0x10cc0, 0x10cf2}, {0x10cfa, 0x10cff}, {0x10e60, 0x10e7e},
-    {0x11000, 0x1104d}, {0x11052, 0x1106f}, {0x1107f, 0x110bc}, {0x110be, 0x110c1},
-    {0x110d0, 0x110e8}, {0x110f0, 0x110f9}, {0x11100, 0x11134}, {0x11136, 0x11143},
-    {0x11150, 0x11176}, {0x11180, 0x111cd}, {0x111d0, 0x111df}, {0x111e1, 0x111f4},
-    {0x11200, 0x11211}, {0x11213, 0x1123e}, {0x11280, 0x11286}, {0x1128a, 0x1128d},
-    {0x1128f, 0x1129d}, {0x1129f, 0x112a9}, {0x112b0, 0x112ea}, {0x112f0, 0x112f9},
-    {0x11300, 0x11303}, {0x11305, 0x1130c}, {0x11313, 0x11328}, {0x1132a, 0x11330},
-    {0x11335, 0x11339}, {0x1133c, 0x11344}, {0x1134b, 0x1134d}, {0x1135d, 0x11363},
-    {0x11366, 0x1136c}, {0x11370, 0x11374}, {0x11400, 0x11459}, {0x11480, 0x114c7},
-    {0x114d0, 0x114d9}, {0x11580, 0x115b5}, {0x115b8, 0x115dd}, {0x11600, 0x11644},
-    {0x11650, 0x11659}, {0x11660, 0x1166c}, {0x11680, 0x116b7}, {0x116c0, 0x116c9},
-    {0x11700, 0x11719}, {0x1171d, 0x1172b}, {0x11730, 0x1173f}, {0x118a0, 0x118f2},
-    {0x11a00, 0x11a47}, {0x11a50, 0x11a83}, {0x11a86, 0x11a9c}, {0x11a9e, 0x11aa2},
-    {0x11ac0, 0x11af8}, {0x11c00, 0x11c08}, {0x11c0a, 0x11c36}, {0x11c38, 0x11c45},
-    {0x11c50, 0x11c6c}, {0x11c70, 0x11c8f}, {0x11c92, 0x11ca7}, {0x11ca9, 0x11cb6},
-    {0x11d00, 0x11d06}, {0x11d0b, 0x11d36}, {0x11d3f, 0x11d47}, {0x11d50, 0x11d59},
+    {0x10c80, 0x10cb2}, {0x10cc0, 0x10cf2}, {0x10cfa, 0x10d27}, {0x10d30, 0x10d39},
+    {0x10e60, 0x10e7e}, {0x10f00, 0x10f27}, {0x10f30, 0x10f59}, {0x11000, 0x1104d},
+    {0x11052, 0x1106f}, {0x1107f, 0x110bc}, {0x110be, 0x110c1}, {0x110d0, 0x110e8},
+    {0x110f0, 0x110f9}, {0x11100, 0x11134}, {0x11136, 0x11146}, {0x11150, 0x11176},
+    {0x11180, 0x111cd}, {0x111d0, 0x111df}, {0x111e1, 0x111f4}, {0x11200, 0x11211},
+    {0x11213, 0x1123e}, {0x11280, 0x11286}, {0x1128a, 0x1128d}, {0x1128f, 0x1129d},
+    {0x1129f, 0x112a9}, {0x112b0, 0x112ea}, {0x112f0, 0x112f9}, {0x11300, 0x11303},
+    {0x11305, 0x1130c}, {0x11313, 0x11328}, {0x1132a, 0x11330}, {0x11335, 0x11339},
+    {0x1133b, 0x11344}, {0x1134b, 0x1134d}, {0x1135d, 0x11363}, {0x11366, 0x1136c},
+    {0x11370, 0x11374}, {0x11400, 0x11459}, {0x11480, 0x114c7}, {0x114d0, 0x114d9},
+    {0x11580, 0x115b5}, {0x115b8, 0x115dd}, {0x11600, 0x11644}, {0x11650, 0x11659},
+    {0x11660, 0x1166c}, {0x11680, 0x116b7}, {0x116c0, 0x116c9}, {0x11700, 0x1171a},
+    {0x1171d, 0x1172b}, {0x11730, 0x1173f}, {0x11800, 0x1183b}, {0x118a0, 0x118f2},
+    {0x11a00, 0x11a47}, {0x11a50, 0x11a83}, {0x11a86, 0x11aa2}, {0x11ac0, 0x11af8},
+    {0x11c00, 0x11c08}, {0x11c0a, 0x11c36}, {0x11c38, 0x11c45}, {0x11c50, 0x11c6c},
+    {0x11c70, 0x11c8f}, {0x11c92, 0x11ca7}, {0x11ca9, 0x11cb6}, {0x11d00, 0x11d06},
+    {0x11d0b, 0x11d36}, {0x11d3f, 0x11d47}, {0x11d50, 0x11d59}, {0x11d60, 0x11d65},
+    {0x11d6a, 0x11d8e}, {0x11d93, 0x11d98}, {0x11da0, 0x11da9}, {0x11ee0, 0x11ef8},
     {0x12000, 0x12399}, {0x12400, 0x1246e}, {0x12470, 0x12474}, {0x12480, 0x12543},
     {0x13000, 0x1342e}, {0x14400, 0x14646}, {0x16800, 0x16a38}, {0x16a40, 0x16a5e},
     {0x16a60, 0x16a69}, {0x16ad0, 0x16aed}, {0x16af0, 0x16af5}, {0x16b00, 0x16b45},
     {0x16b50, 0x16b59}, {0x16b5b, 0x16b61}, {0x16b63, 0x16b77}, {0x16b7d, 0x16b8f},
-    {0x16f00, 0x16f44}, {0x16f50, 0x16f7e}, {0x16f8f, 0x16f9f}, {0x17000, 0x187ec},
-    {0x18800, 0x18af2}, {0x1b000, 0x1b11e}, {0x1b170, 0x1b2fb}, {0x1bc00, 0x1bc6a},
-    {0x1bc70, 0x1bc7c}, {0x1bc80, 0x1bc88}, {0x1bc90, 0x1bc99}, {0x1bc9c, 0x1bc9f},
-    {0x1d000, 0x1d0f5}, {0x1d100, 0x1d126}, {0x1d129, 0x1d172}, {0x1d17b, 0x1d1e8},
-    {0x1d200, 0x1d245}, {0x1d300, 0x1d356}, {0x1d360, 0x1d371}, {0x1d400, 0x1d454},
-    {0x1d456, 0x1d49c}, {0x1d4a9, 0x1d4ac}, {0x1d4ae, 0x1d4b9}, {0x1d4bd, 0x1d4c3},
-    {0x1d4c5, 0x1d505}, {0x1d507, 0x1d50a}, {0x1d50d, 0x1d514}, {0x1d516, 0x1d51c},
-    {0x1d51e, 0x1d539}, {0x1d53b, 0x1d53e}, {0x1d540, 0x1d544}, {0x1d54a, 0x1d550},
-    {0x1d552, 0x1d6a5}, {0x1d6a8, 0x1d7cb}, {0x1d7ce, 0x1da8b}, {0x1da9b, 0x1da9f},
-    {0x1daa1, 0x1daaf}, {0x1e000, 0x1e006}, {0x1e008, 0x1e018}, {0x1e01b, 0x1e021},
-    {0x1e026, 0x1e02a}, {0x1e800, 0x1e8c4}, {0x1e8c7, 0x1e8d6}, {0x1e900, 0x1e94a},
-    {0x1e950, 0x1e959}, {0x1ee00, 0x1ee03}, {0x1ee05, 0x1ee1f}, {0x1ee29, 0x1ee32},
-    {0x1ee34, 0x1ee37}, {0x1ee4d, 0x1ee4f}, {0x1ee67, 0x1ee6a}, {0x1ee6c, 0x1ee72},
-    {0x1ee74, 0x1ee77}, {0x1ee79, 0x1ee7c}, {0x1ee80, 0x1ee89}, {0x1ee8b, 0x1ee9b},
-    {0x1eea1, 0x1eea3}, {0x1eea5, 0x1eea9}, {0x1eeab, 0x1eebb}, {0x1f000, 0x1f02b},
-    {0x1f030, 0x1f093}, {0x1f0a0, 0x1f0ae}, {0x1f0b1, 0x1f0bf}, {0x1f0c1, 0x1f0cf},
-    {0x1f0d1, 0x1f0f5}, {0x1f100, 0x1f10c}, {0x1f110, 0x1f12e}, {0x1f130, 0x1f16b},
-    {0x1f170, 0x1f1ac}, {0x1f1e6, 0x1f202}, {0x1f210, 0x1f23b}, {0x1f240, 0x1f248},
-    {0x1f260, 0x1f265}, {0x1f300, 0x1f6d4}, {0x1f6e0, 0x1f6ec}, {0x1f6f0, 0x1f6f8},
-    {0x1f700, 0x1f773}, {0x1f780, 0x1f7d4}, {0x1f800, 0x1f80b}, {0x1f810, 0x1f847},
-    {0x1f850, 0x1f859}, {0x1f860, 0x1f887}, {0x1f890, 0x1f8ad}, {0x1f900, 0x1f90b},
-    {0x1f910, 0x1f93e}, {0x1f940, 0x1f94c}, {0x1f950, 0x1f96b}, {0x1f980, 0x1f997},
-    {0x1f9d0, 0x1f9e6}, {0x20000, 0x2a6d6}, {0x2a700, 0x2b734}, {0x2b740, 0x2b81d},
-    {0x2b820, 0x2cea1}, {0x2ceb0, 0x2ebe0}, {0x2f800, 0x2fa1d}, {0xe0100, 0xe01ef}
+    {0x16e40, 0x16e9a}, {0x16f00, 0x16f44}, {0x16f50, 0x16f7e}, {0x16f8f, 0x16f9f},
+    {0x17000, 0x187f1}, {0x18800, 0x18af2}, {0x1b000, 0x1b11e}, {0x1b170, 0x1b2fb},
+    {0x1bc00, 0x1bc6a}, {0x1bc70, 0x1bc7c}, {0x1bc80, 0x1bc88}, {0x1bc90, 0x1bc99},
+    {0x1bc9c, 0x1bc9f}, {0x1d000, 0x1d0f5}, {0x1d100, 0x1d126}, {0x1d129, 0x1d172},
+    {0x1d17b, 0x1d1e8}, {0x1d200, 0x1d245}, {0x1d2e0, 0x1d2f3}, {0x1d300, 0x1d356},
+    {0x1d360, 0x1d378}, {0x1d400, 0x1d454}, {0x1d456, 0x1d49c}, {0x1d4a9, 0x1d4ac},
+    {0x1d4ae, 0x1d4b9}, {0x1d4bd, 0x1d4c3}, {0x1d4c5, 0x1d505}, {0x1d507, 0x1d50a},
+    {0x1d50d, 0x1d514}, {0x1d516, 0x1d51c}, {0x1d51e, 0x1d539}, {0x1d53b, 0x1d53e},
+    {0x1d540, 0x1d544}, {0x1d54a, 0x1d550}, {0x1d552, 0x1d6a5}, {0x1d6a8, 0x1d7cb},
+    {0x1d7ce, 0x1da8b}, {0x1da9b, 0x1da9f}, {0x1daa1, 0x1daaf}, {0x1e000, 0x1e006},
+    {0x1e008, 0x1e018}, {0x1e01b, 0x1e021}, {0x1e026, 0x1e02a}, {0x1e800, 0x1e8c4},
+    {0x1e8c7, 0x1e8d6}, {0x1e900, 0x1e94a}, {0x1e950, 0x1e959}, {0x1ec71, 0x1ecb4},
+    {0x1ee00, 0x1ee03}, {0x1ee05, 0x1ee1f}, {0x1ee29, 0x1ee32}, {0x1ee34, 0x1ee37},
+    {0x1ee4d, 0x1ee4f}, {0x1ee67, 0x1ee6a}, {0x1ee6c, 0x1ee72}, {0x1ee74, 0x1ee77},
+    {0x1ee79, 0x1ee7c}, {0x1ee80, 0x1ee89}, {0x1ee8b, 0x1ee9b}, {0x1eea1, 0x1eea3},
+    {0x1eea5, 0x1eea9}, {0x1eeab, 0x1eebb}, {0x1f000, 0x1f02b}, {0x1f030, 0x1f093},
+    {0x1f0a0, 0x1f0ae}, {0x1f0b1, 0x1f0bf}, {0x1f0c1, 0x1f0cf}, {0x1f0d1, 0x1f0f5},
+    {0x1f100, 0x1f10c}, {0x1f110, 0x1f16b}, {0x1f170, 0x1f1ac}, {0x1f1e6, 0x1f202},
+    {0x1f210, 0x1f23b}, {0x1f240, 0x1f248}, {0x1f260, 0x1f265}, {0x1f300, 0x1f6d4},
+    {0x1f6e0, 0x1f6ec}, {0x1f6f0, 0x1f6f9}, {0x1f700, 0x1f773}, {0x1f780, 0x1f7d8},
+    {0x1f800, 0x1f80b}, {0x1f810, 0x1f847}, {0x1f850, 0x1f859}, {0x1f860, 0x1f887},
+    {0x1f890, 0x1f8ad}, {0x1f900, 0x1f90b}, {0x1f910, 0x1f93e}, {0x1f940, 0x1f970},
+    {0x1f973, 0x1f976}, {0x1f97c, 0x1f9a2}, {0x1f9b0, 0x1f9b9}, {0x1f9c0, 0x1f9c2},
+    {0x1f9d0, 0x1f9ff}, {0x1fa60, 0x1fa6d}, {0x20000, 0x2a6d6}, {0x2a700, 0x2b734},
+    {0x2b740, 0x2b81d}, {0x2b820, 0x2cea1}, {0x2ceb0, 0x2ebe0}, {0x2f800, 0x2fa1d},
+    {0xe0100, 0xe01ef}
 #endif
 };
 
 #define NUM_GRAPH_RANGE (sizeof(graphRangeTable)/sizeof(crange))
 
 static const chr graphCharTable[] = {
-    0x38c, 0x589, 0x58a, 0x85e, 0x98f, 0x990, 0x9b2, 0x9c7, 0x9c8,
-    0x9d7, 0x9dc, 0x9dd, 0xa0f, 0xa10, 0xa32, 0xa33, 0xa35, 0xa36,
-    0xa38, 0xa39, 0xa3c, 0xa47, 0xa48, 0xa51, 0xa5e, 0xab2, 0xab3,
-    0xad0, 0xb0f, 0xb10, 0xb32, 0xb33, 0xb47, 0xb48, 0xb56, 0xb57,
-    0xb5c, 0xb5d, 0xb82, 0xb83, 0xb99, 0xb9a, 0xb9c, 0xb9e, 0xb9f,
-    0xba3, 0xba4, 0xbd0, 0xbd7, 0xc55, 0xc56, 0xcd5, 0xcd6, 0xcde,
-    0xcf1, 0xcf2, 0xd82, 0xd83, 0xdbd, 0xdca, 0xdd6, 0xe81, 0xe82,
-    0xe84, 0xe87, 0xe88, 0xe8a, 0xe8d, 0xea5, 0xea7, 0xeaa, 0xeab,
-    0xec6, 0x10c7, 0x10cd, 0x1258, 0x12c0, 0x1772, 0x1773, 0x1940, 0x1f59,
-    0x1f5b, 0x1f5d, 0x2070, 0x2071, 0x2d27, 0x2d2d, 0x2d6f, 0x2d70, 0xfb3e,
-    0xfb40, 0xfb41, 0xfb43, 0xfb44, 0xfffc, 0xfffd
-#if TCL_UTF_MAX > 4
+    0x38c, 0x85e, 0x98f, 0x990, 0x9b2, 0x9c7, 0x9c8, 0x9d7, 0x9dc,
+    0x9dd, 0xa0f, 0xa10, 0xa32, 0xa33, 0xa35, 0xa36, 0xa38, 0xa39,
+    0xa3c, 0xa47, 0xa48, 0xa51, 0xa5e, 0xab2, 0xab3, 0xad0, 0xb0f,
+    0xb10, 0xb32, 0xb33, 0xb47, 0xb48, 0xb56, 0xb57, 0xb5c, 0xb5d,
+    0xb82, 0xb83, 0xb99, 0xb9a, 0xb9c, 0xb9e, 0xb9f, 0xba3, 0xba4,
+    0xbd0, 0xbd7, 0xc55, 0xc56, 0xcd5, 0xcd6, 0xcde, 0xcf1, 0xcf2,
+    0xd82, 0xd83, 0xdbd, 0xdca, 0xdd6, 0xe81, 0xe82, 0xe84, 0xe87,
+    0xe88, 0xe8a, 0xe8d, 0xea5, 0xea7, 0xeaa, 0xeab, 0xec6, 0x10c7,
+    0x10cd, 0x1258, 0x12c0, 0x1772, 0x1773, 0x1940, 0x1f59, 0x1f5b, 0x1f5d,
+    0x2070, 0x2071, 0x2d27, 0x2d2d, 0x2d6f, 0x2d70, 0xfb3e, 0xfb40, 0xfb41,
+    0xfb43, 0xfb44, 0xfffc, 0xfffd
+#if CHRBITS > 16
     ,0x1003c, 0x1003d, 0x101a0, 0x1056f, 0x10808, 0x10837, 0x10838, 0x1083c, 0x108f4,
     0x108f5, 0x1093f, 0x10a05, 0x10a06, 0x11288, 0x1130f, 0x11310, 0x11332, 0x11333,
-    0x11347, 0x11348, 0x11350, 0x11357, 0x1145b, 0x1145d, 0x118ff, 0x11d08, 0x11d09,
-    0x11d3a, 0x11d3c, 0x11d3d, 0x16a6e, 0x16a6f, 0x16fe0, 0x16fe1, 0x1d49e, 0x1d49f,
-    0x1d4a2, 0x1d4a5, 0x1d4a6, 0x1d4bb, 0x1d546, 0x1e023, 0x1e024, 0x1e95e, 0x1e95f,
-    0x1ee21, 0x1ee22, 0x1ee24, 0x1ee27, 0x1ee39, 0x1ee3b, 0x1ee42, 0x1ee47, 0x1ee49,
-    0x1ee4b, 0x1ee51, 0x1ee52, 0x1ee54, 0x1ee57, 0x1ee59, 0x1ee5b, 0x1ee5d, 0x1ee5f,
-    0x1ee61, 0x1ee62, 0x1ee64, 0x1ee7e, 0x1eef0, 0x1eef1, 0x1f250, 0x1f251, 0x1f9c0
+    0x11347, 0x11348, 0x11350, 0x11357, 0x1145b, 0x1145d, 0x1145e, 0x118ff, 0x11d08,
+    0x11d09, 0x11d3a, 0x11d3c, 0x11d3d, 0x11d67, 0x11d68, 0x11d90, 0x11d91, 0x16a6e,
+    0x16a6f, 0x16fe0, 0x16fe1, 0x1d49e, 0x1d49f, 0x1d4a2, 0x1d4a5, 0x1d4a6, 0x1d4bb,
+    0x1d546, 0x1e023, 0x1e024, 0x1e95e, 0x1e95f, 0x1ee21, 0x1ee22, 0x1ee24, 0x1ee27,
+    0x1ee39, 0x1ee3b, 0x1ee42, 0x1ee47, 0x1ee49, 0x1ee4b, 0x1ee51, 0x1ee52, 0x1ee54,
+    0x1ee57, 0x1ee59, 0x1ee5b, 0x1ee5d, 0x1ee5f, 0x1ee61, 0x1ee62, 0x1ee64, 0x1ee7e,
+    0x1eef0, 0x1eef1, 0x1f250, 0x1f251, 0x1f97a
 #endif
 };
 

generic/tcl.decls

@@ -2369,6 +2369,10 @@ declare 1 macosx {
 export {
     void Tcl_Main(int argc, char **argv, Tcl_AppInitProc *appInitProc)
 }
+export {
+    void Tcl_MainEx(int argc, char **argv, Tcl_AppInitProc *appInitProc,
+    Tcl_Interp *interp)
+}
 export {
     const char *Tcl_InitStubs(Tcl_Interp *interp, const char *version,
 	int exact)

generic/tclAssembly.c

@@ -2248,23 +2248,24 @@ GetListIndexOperand(
     Tcl_Token* tokenPtr = *tokenPtrPtr;
 				/* INOUT: Pointer to the next token in the
 				 * source code */
-    Tcl_Obj* intObj;		/* Integer from the source code */
-    int status;			/* Tcl status return */
+    Tcl_Obj *value;
+    int status;
 
-    /*
-     * Extract the next token as a string.
-     */
-
-    if (GetNextOperand(assemEnvPtr, tokenPtrPtr, &intObj) != TCL_OK) {
+    /* General operand validity check */
+    if (GetNextOperand(assemEnvPtr, tokenPtrPtr, &value) != TCL_OK) {
 	return TCL_ERROR;
     }
-
+     
+    /* Convert to an integer, advance to the next token and return. */
     /*
-     * Convert to an integer, advance to the next token and return.
+     * NOTE: Indexing a list with an index before it yields the
+     * same result as indexing after it, and might be more easily portable
+     * when list size limits grow.
      */
+    status = TclIndexEncode(interp, value,
+	    TCL_INDEX_BEFORE,TCL_INDEX_BEFORE, result);
 
-    status = TclGetIntForIndex(interp, intObj, -2, result);
-    Tcl_DecrRefCount(intObj);
+    Tcl_DecrRefCount(value);
     *tokenPtrPtr = TokenAfter(tokenPtr);
     return status;
 }

generic/tclBasic.c

@@ -7606,7 +7606,19 @@ ExprEntierFunc(
 
     if (type == TCL_NUMBER_DOUBLE) {
 	d = *((const double *) ptr);
-	if ((d >= (double)LONG_MAX) || (d <= (double)LONG_MIN)) {
+	if ((d < (double)LONG_MAX) && (d > (double)LONG_MIN)) {
+	    long result = (long) d;
+
+	    Tcl_SetObjResult(interp, Tcl_NewLongObj(result));
+	    return TCL_OK;
+#ifndef TCL_WIDE_INT_IS_LONG
+	} else if ((d < (double)LLONG_MAX) && (d > (double)LLONG_MIN)) {
+	    Tcl_WideInt result = (Tcl_WideInt) d;
+
+	    Tcl_SetObjResult(interp, Tcl_NewWideIntObj(result));
+	    return TCL_OK;
+#endif
+	} else {
 	    mp_int big;
 
 	    if (Tcl_InitBignumFromDouble(interp, d, &big) != TCL_OK) {
@@ -7615,11 +7627,6 @@ ExprEntierFunc(
 	    }
 	    Tcl_SetObjResult(interp, Tcl_NewBignumObj(&big));
 	    return TCL_OK;
-	} else {
-	    long result = (long) d;
-
-	    Tcl_SetObjResult(interp, Tcl_NewLongObj(result));
-	    return TCL_OK;
 	}
     }
 
@@ -8402,18 +8409,12 @@ TclNRTailcallObjCmd(
     if (objc > 1) {
         Tcl_Obj *listPtr, *nsObjPtr;
         Tcl_Namespace *nsPtr = (Tcl_Namespace *) iPtr->varFramePtr->nsPtr;
-        Tcl_Namespace *ns1Ptr;
 
         /* The tailcall data is in a Tcl list: the first element is the
          * namespace, the rest the command to be tailcalled. */
 
-        listPtr = Tcl_NewListObj(objc, objv);
-
         nsObjPtr = Tcl_NewStringObj(nsPtr->fullName, -1);
-        if ((TCL_OK != TclGetNamespaceFromObj(interp, nsObjPtr, &ns1Ptr))
-                || (nsPtr != ns1Ptr)) {
-            Tcl_Panic("Tailcall failed to find the proper namespace");
-        }
+        listPtr = Tcl_NewListObj(objc, objv);
  	TclListObjSetElement(interp, listPtr, 0, nsObjPtr);
 
         iPtr->varFramePtr->tailcallPtr = listPtr;

generic/tclCmdAH.c

@@ -512,63 +512,6 @@ Tcl_ContinueObjCmd(
     return TCL_CONTINUE;
 }
 
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_EncodingObjCmd --
- *
- *	This command manipulates encodings.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_EncodingObjCmd(
-    ClientData dummy,		/* Not used. */
-    Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,			/* Number of arguments. */
-    Tcl_Obj *const objv[])	/* Argument objects. */
-{
-    int index;
-
-    static const char *const optionStrings[] = {
-	"convertfrom", "convertto", "dirs", "names", "system",
-	NULL
-    };
-    enum options {
-	ENC_CONVERTFROM, ENC_CONVERTTO, ENC_DIRS, ENC_NAMES, ENC_SYSTEM
-    };
-
-    if (objc < 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "option ?arg ...?");
-	return TCL_ERROR;
-    }
-    if (Tcl_GetIndexFromObj(interp, objv[1], optionStrings, "option", 0,
-	    &index) != TCL_OK) {
-	return TCL_ERROR;
-    }
-
-    switch ((enum options) index) {
-    case ENC_CONVERTTO:
-	return EncodingConverttoObjCmd(dummy, interp, objc, objv);
-    case ENC_CONVERTFROM:
-	return EncodingConvertfromObjCmd(dummy, interp, objc, objv);
-    case ENC_DIRS:
-	return EncodingDirsObjCmd(dummy, interp, objc, objv);
-    case ENC_NAMES:
-	return EncodingNamesObjCmd(dummy, interp, objc, objv);
-    case ENC_SYSTEM:
-	return EncodingSystemObjCmd(dummy, interp, objc, objv);
-    }
-    return TCL_OK;
-}
-
 /*
  *-----------------------------------------------------------------------------
  *

generic/tclCmdIL.c

@@ -64,8 +64,9 @@ typedef struct SortInfo {
 				 * SORTMODE_COMMAND. Pre-initialized to hold
 				 * base of command. */
     int *indexv;		/* If the -index option was specified, this
-				 * holds the indexes contained in the list
-				 * supplied as an argument to that option.
+				 * holds an encoding of the indexes contained
+				 * in the list supplied as an argument to
+				 * that option.
 				 * NULL if no indexes supplied, and points to
 				 * singleIndex field when only one
 				 * supplied. */
@@ -92,14 +93,6 @@ typedef struct SortInfo {
 #define SORTMODE_DICTIONARY	4
 #define SORTMODE_ASCII_NC	8
 
-/*
- * Magic values for the index field of the SortInfo structure. Note that the
- * index "end-1" will be translated to SORTIDX_END-1, etc.
- */
-
-#define SORTIDX_NONE	-1	/* Not indexed; use whole value. */
-#define SORTIDX_END	-2	/* Indexed from end. */
-
 /*
  * Forward declarations for procedures defined in this file:
  */
@@ -2754,21 +2747,10 @@ Tcl_LreplaceObjCmd(
     if (first < 0) {
 	first = 0;
     }
-
-    /*
-     * Complain if the user asked for a start element that is greater than the
-     * list length. This won't ever trigger for the "end-*" case as that will
-     * be properly constrained by TclGetIntForIndex because we use listLen-1
-     * (to allow for replacing the last elem).
-     */
-
-    if ((first > listLen) && (listLen > 0)) {
-	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		"list doesn't contain element %s", TclGetString(objv[2])));
-	Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LREPLACE", "BADIDX",
-		NULL);
-	return TCL_ERROR;
+    if (first > listLen) {
+	first = listLen;
     }
+
     if (last >= listLen) {
 	last = listLen - 1;
     }
@@ -2913,7 +2895,7 @@ Tcl_LsearchObjCmd(
     Tcl_Obj *const objv[])	/* Argument values. */
 {
     const char *bytes, *patternBytes;
-    int i, match, index, result, listc, length, elemLen, bisect;
+    int i, match, index, result=TCL_OK, listc, length, elemLen, bisect;
     int dataType, isIncreasing, lower, upper, offset;
     Tcl_WideInt patWide, objWide;
     int allMatches, inlineReturn, negatedMatch, returnSubindices, noCase;
@@ -3113,13 +3095,26 @@ Tcl_LsearchObjCmd(
 	     */
 
 	    for (j=0 ; j<sortInfo.indexc ; j++) {
-		if (TclGetIntForIndexM(interp, indices[j], SORTIDX_END,
-			&sortInfo.indexv[j]) != TCL_OK) {
+		int encoded = 0;
+		if (TclIndexEncode(interp, indices[j], TCL_INDEX_BEFORE,
+			TCL_INDEX_AFTER, &encoded) != TCL_OK) {
+		    result = TCL_ERROR;
+		}
+		if ((encoded == TCL_INDEX_BEFORE)
+			|| (encoded == TCL_INDEX_AFTER)) {
+		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			    "index \"%s\" cannot select an element "
+			    "from any list", Tcl_GetString(indices[j])));
+		    Tcl_SetErrorCode(interp, "TCL", "VALUE", "INDEX"
+			    "OUTOFRANGE", NULL);
+		    result = TCL_ERROR;
+		}
+		if (result == TCL_ERROR) {
 		    Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
 			    "\n    (-index option item number %d)", j));
-		    result = TCL_ERROR;
 		    goto done;
 		}
+		sortInfo.indexv[j] = encoded;
 	    }
 	    break;
 	}
@@ -3492,8 +3487,8 @@ Tcl_LsearchObjCmd(
 
 		itemPtr = Tcl_NewIntObj(i);
 		for (j=0 ; j<sortInfo.indexc ; j++) {
-		    Tcl_ListObjAppendElement(interp, itemPtr,
-			    Tcl_NewIntObj(sortInfo.indexv[j]));
+		    Tcl_ListObjAppendElement(interp, itemPtr, Tcl_NewIntObj(
+			    TclIndexDecode(sortInfo.indexv[j], listc)));
 		}
 		Tcl_ListObjAppendElement(interp, listPtr, itemPtr);
 	    } else {
@@ -3514,8 +3509,8 @@ Tcl_LsearchObjCmd(
 
 	    itemPtr = Tcl_NewIntObj(index);
 	    for (j=0 ; j<sortInfo.indexc ; j++) {
-		Tcl_ListObjAppendElement(interp, itemPtr,
-			Tcl_NewIntObj(sortInfo.indexv[j]));
+		Tcl_ListObjAppendElement(interp, itemPtr, Tcl_NewIntObj(
+			TclIndexDecode(sortInfo.indexv[j], listc)));
 	    }
 	    Tcl_SetObjResult(interp, itemPtr);
 	} else {
@@ -3732,7 +3727,7 @@ Tcl_LsortObjCmd(
 	    sortInfo.isIncreasing = 1;
 	    break;
 	case LSORT_INDEX: {
-	    int indexc, dummy;
+	    int indexc;
 	    Tcl_Obj **indexv;
 
 	    if (i == objc-2) {
@@ -3758,8 +3753,20 @@ Tcl_LsortObjCmd(
 	     */
 
 	    for (j=0 ; j<indexc ; j++) {
-		if (TclGetIntForIndexM(interp, indexv[j], SORTIDX_END,
-			&dummy) != TCL_OK) {
+		int encoded = 0;
+		int result = TclIndexEncode(interp, indexv[j],
+			TCL_INDEX_BEFORE, TCL_INDEX_AFTER, &encoded);
+
+		if ((result == TCL_OK) && ((encoded == TCL_INDEX_BEFORE)
+			|| (encoded == TCL_INDEX_AFTER))) {
+		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			    "index \"%s\" cannot select an element "
+			    "from any list", Tcl_GetString(indexv[j])));
+		    Tcl_SetErrorCode(interp, "TCL", "VALUE", "INDEX"
+			    "OUTOFRANGE", NULL);
+		    result = TCL_ERROR;
+		}
+		if (result == TCL_ERROR) {
 		    Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
 			    "\n    (-index option item number %d)", j));
 		    sortInfo.resultCode = TCL_ERROR;
@@ -3839,8 +3846,8 @@ Tcl_LsortObjCmd(
 					 * might be decreased by 1 later. */
 	}
 	for (j=0 ; j<sortInfo.indexc ; j++) {
-	    TclGetIntForIndexM(interp, indexv[j], SORTIDX_END,
-		    &sortInfo.indexv[j]);
+	    /* Prescreened values, no errors or out of range possible */
+	    TclIndexEncode(NULL, indexv[j], 0, 0, &sortInfo.indexv[j]);
 	}
     }
 
@@ -3911,10 +3918,7 @@ Tcl_LsortObjCmd(
 	     * offset of the element within each group by which to sort.
 	     */
 
-	    groupOffset = sortInfo.indexv[0];
-	    if (groupOffset <= SORTIDX_END) {
-		groupOffset = (groupOffset - SORTIDX_END) + groupSize - 1;
-	    }
+	    groupOffset = TclIndexDecode(sortInfo.indexv[0], groupSize - 1);
 	    if (groupOffset < 0 || groupOffset >= groupSize) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			"when used with \"-stride\", the leading \"-index\""
@@ -3933,6 +3937,9 @@ Tcl_LsortObjCmd(
 		/*
 		 * Do not shrink the actual memory block used; that doesn't
 		 * work with TclStackAlloc-allocated memory. [Bug 2918962]
+		 * 
+		 * TODO: Consider a pointer increment to replace this
+		 * array shift.
 		 */
 
 		for (i = 0; i < sortInfo.indexc; i++) {
@@ -4501,15 +4508,8 @@ SelectObjFromSublist(
 	    infoPtr->resultCode = TCL_ERROR;
 	    return NULL;
 	}
-	index = infoPtr->indexv[i];
 
-	/*
-	 * Adjust for end-based indexing.
-	 */
-
-	if (index < SORTIDX_NONE) {
-	    index += listLen + 1;
-	}
+	index = TclIndexDecode(infoPtr->indexv[i], listLen - 1);
 
 	if (Tcl_ListObjIndex(infoPtr->interp, objPtr, index,
 		&currentObj) != TCL_OK) {

generic/tclCmdMZ.c

@@ -1571,7 +1571,6 @@ StringIsCmd(
 	chcomp = Tcl_UniCharIsDigit;
 	break;
     case STR_IS_DOUBLE: {
-	/* TODO */
 	if ((objPtr->typePtr == &tclDoubleType) ||
 		(objPtr->typePtr == &tclIntType) ||
 #ifndef TCL_WIDE_INT_IS_LONG
@@ -2353,7 +2352,7 @@ StringRplcCmd(
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     Tcl_UniChar *ustring;
-    int first, last, length;
+    int first, last, length, end;
 
     if (objc < 4 || objc > 5) {
 	Tcl_WrongNumArgs(interp, 1, objv, "string first last ?string?");
@@ -2361,20 +2360,38 @@ StringRplcCmd(
     }
 
     ustring = Tcl_GetUnicodeFromObj(objv[1], &length);
-    length--;
+    end = length - 1;
 
-    if (TclGetIntForIndexM(interp, objv[2], length, &first) != TCL_OK ||
-	    TclGetIntForIndexM(interp, objv[3], length, &last) != TCL_OK){
+    if (TclGetIntForIndexM(interp, objv[2], end, &first) != TCL_OK ||
+	    TclGetIntForIndexM(interp, objv[3], end, &last) != TCL_OK){
 	return TCL_ERROR;
     }
 
-    if ((last < first) || (last < 0) || (first > length)) {
+    /*
+     * The following test screens out most empty substrings as
+     * candidates for replacement. When they are detected, no
+     * replacement is done, and the result is the original string,
+     */
+    if ((last < 0) ||		/* Range ends before start of string */
+	    (first > end) ||	/* Range begins after end of string */
+	    (last < first)) {	/* Range begins after it starts */
+
+	/*
+	 * BUT!!! when (end < 0) -- an empty original string -- we can
+	 * have (first <= end < 0 <= last) and an empty string is permitted
+	 * to be replaced.
+	 */
 	Tcl_SetObjResult(interp, objv[1]);
     } else {
 	Tcl_Obj *resultPtr;
 
+	/*
+	 * We are re-fetching in case the string argument is same value as 
+	 * an index argument, and shimmering cost us our ustring.
+	 */
+
 	ustring = Tcl_GetUnicodeFromObj(objv[1], &length);
-	length--;
+	end = length-1;
 
 	if (first < 0) {
 	    first = 0;
@@ -2384,9 +2401,9 @@ StringRplcCmd(
 	if (objc == 5) {
 	    Tcl_AppendObjToObj(resultPtr, objv[4]);
 	}
-	if (last < length) {
+	if (last < end) {
 	    Tcl_AppendUnicodeToObj(resultPtr, ustring + last + 1,
-		    length - last);
+		    end - last);
 	}
 	Tcl_SetObjResult(interp, resultPtr);
     }
@@ -2582,10 +2599,8 @@ StringEqualCmd(
      * the expr string comparison in INST_EQ/INST_NEQ/INST_LT/...).
      */
 
-    const char *string1, *string2;
-    int length1, length2, i, match, length, nocase = 0, reqlength = -1;
-    typedef int (*strCmpFn_t)(const char *, const char *, unsigned int);
-    strCmpFn_t strCmpFn;
+    const char *string2;
+    int length2, i, match, nocase = 0, reqlength = -1;
 
     if (objc < 3 || objc > 6) {
     str_cmp_args:
@@ -2624,78 +2639,7 @@ StringEqualCmd(
 
     objv += objc-2;
 
-    if ((reqlength == 0) || (objv[0] == objv[1])) {
-	/*
-	 * Always match at 0 chars of if it is the same obj.
-	 */
-
-	Tcl_SetObjResult(interp, Tcl_NewBooleanObj(1));
-	return TCL_OK;
-    }
-
-    if (!nocase && TclIsPureByteArray(objv[0]) &&
-	    TclIsPureByteArray(objv[1])) {
-	/*
-	 * Use binary versions of comparisons since that won't cause undue
-	 * type conversions and it is much faster. Only do this if we're
-	 * case-sensitive (which is all that really makes sense with byte
-	 * arrays anyway, and we have no memcasecmp() for some reason... :^)
-	 */
-
-	string1 = (char *) Tcl_GetByteArrayFromObj(objv[0], &length1);
-	string2 = (char *) Tcl_GetByteArrayFromObj(objv[1], &length2);
-	strCmpFn = (strCmpFn_t) memcmp;
-    } else if ((objv[0]->typePtr == &tclStringType)
-	    && (objv[1]->typePtr == &tclStringType)) {
-	/*
-	 * Do a unicode-specific comparison if both of the args are of String
-	 * type. In benchmark testing this proved the most efficient check
-	 * between the unicode and string comparison operations.
-	 */
-
-	string1 = (char *) Tcl_GetUnicodeFromObj(objv[0], &length1);
-	string2 = (char *) Tcl_GetUnicodeFromObj(objv[1], &length2);
-	strCmpFn = (strCmpFn_t)
-		(nocase ? Tcl_UniCharNcasecmp : Tcl_UniCharNcmp);
-    } else {
-	/*
-	 * As a catch-all we will work with UTF-8. We cannot use memcmp() as
-	 * that is unsafe with any string containing NUL (\xC0\x80 in Tcl's
-	 * utf rep). We can use the more efficient TclpUtfNcmp2 if we are
-	 * case-sensitive and no specific length was requested.
-	 */
-
-	string1 = (char *) TclGetStringFromObj(objv[0], &length1);
-	string2 = (char *) TclGetStringFromObj(objv[1], &length2);
-	if ((reqlength < 0) && !nocase) {
-	    strCmpFn = (strCmpFn_t) TclpUtfNcmp2;
-	} else {
-	    length1 = Tcl_NumUtfChars(string1, length1);
-	    length2 = Tcl_NumUtfChars(string2, length2);
-	    strCmpFn = (strCmpFn_t) (nocase ? Tcl_UtfNcasecmp : Tcl_UtfNcmp);
-	}
-    }
-
-    if ((reqlength < 0) && (length1 != length2)) {
-	match = 1;		/* This will be reversed below. */
-    } else {
-	length = (length1 < length2) ? length1 : length2;
-	if (reqlength > 0 && reqlength < length) {
-	    length = reqlength;
-	} else if (reqlength < 0) {
-	    /*
-	     * The requested length is negative, so we ignore it by setting it
-	     * to length + 1 so we correct the match var.
-	     */
-
-	    reqlength = length + 1;
-	}
-
-	match = strCmpFn(string1, string2, (unsigned) length);
-	if ((match == 0) && (reqlength > length)) {
-	    match = length1 - length2;
-	}
-    }
+    match = TclStringCmp (objv[0], objv[1], 0, nocase, reqlength);
 
     Tcl_SetObjResult(interp, Tcl_NewBooleanObj(match ? 0 : 1));
     return TCL_OK;
@@ -2732,11 +2676,194 @@ StringCmpCmd(
      * the expr string comparison in INST_EQ/INST_NEQ/INST_LT/...).
      */
 
-    const char *string1, *string2;
-    int length1, length2, i, match, length, nocase = 0, reqlength = -1;
-    typedef int (*strCmpFn_t)(const char *, const char *, unsigned int);
-    strCmpFn_t strCmpFn;
+    int match, nocase, reqlength, status;
 
+    if ((status = TclStringCmpOpts(interp, objc, objv, &nocase, &reqlength))
+	!= TCL_OK) {
+
+	return status;
+    }
+
+    objv += objc-2;
+    match = TclStringCmp (objv[0], objv[1], 0, nocase, reqlength);
+    Tcl_SetObjResult(interp, Tcl_NewIntObj(match));
+    return TCL_OK;
+}
+
+int TclStringCmp (
+	Tcl_Obj *value1Ptr,
+	Tcl_Obj *value2Ptr,
+	int checkEq,        /* comparison is only for equality */
+	int nocase,	    /* comparison is not case sensitive */
+	int reqlength	    /* requested length */
+) {
+    char *s1, *s2;
+    int empty, length, match, s1len, s2len;
+    memCmpFn_t memCmpFn;
+
+    if ((reqlength == 0) || (value1Ptr == value2Ptr)) {
+	/*
+	 * Always match at 0 chars of if it is the same obj.
+	 */
+	match = 0;
+    } else {
+
+	if (!nocase && TclIsPureByteArray(value1Ptr)
+		&& TclIsPureByteArray(value2Ptr)) {
+	    /*
+	     * Use binary versions of comparisons since that won't cause undue
+	     * type conversions and it is much faster. Only do this if we're
+	     * case-sensitive (which is all that really makes sense with byte
+	     * arrays anyway, and we have no memcasecmp() for some reason... :^)
+	     */
+	    s1 = (char *) Tcl_GetByteArrayFromObj(value1Ptr, &s1len);
+	    s2 = (char *) Tcl_GetByteArrayFromObj(value2Ptr, &s2len);
+	    memCmpFn = memcmp;
+	} else if ((value1Ptr->typePtr == &tclStringType)
+		&& (value2Ptr->typePtr == &tclStringType)) {
+	    /*
+	     * Do a unicode-specific comparison if both of the args are of
+	     * String type. If the char length == byte length, we can do a
+	     * memcmp. In benchmark testing this proved the most efficient
+	     * check between the unicode and string comparison operations.
+	     */
+
+	    if (nocase) {
+		s1 = (char *) Tcl_GetUnicodeFromObj(value1Ptr, &s1len);
+		s2 = (char *) Tcl_GetUnicodeFromObj(value2Ptr, &s2len);
+		memCmpFn = (memCmpFn_t)Tcl_UniCharNcasecmp;
+	    } else {
+		s1len = Tcl_GetCharLength(value1Ptr);
+		s2len = Tcl_GetCharLength(value2Ptr);
+		if ((s1len == value1Ptr->length)
+			&& (value1Ptr->bytes != NULL)
+			&& (s2len == value2Ptr->length)
+			&& (value2Ptr->bytes != NULL)) {
+		    s1 = value1Ptr->bytes;
+		    s2 = value2Ptr->bytes;
+		    memCmpFn = memcmp;
+		} else {
+		    s1 = (char *) Tcl_GetUnicode(value1Ptr);
+		    s2 = (char *) Tcl_GetUnicode(value2Ptr);
+		    if (
+#ifdef WORDS_BIGENDIAN
+			1
+#else
+			checkEq
+#endif
+			) {
+			memCmpFn = memcmp;
+			s1len *= sizeof(Tcl_UniChar);
+			s2len *= sizeof(Tcl_UniChar);
+		    } else {
+			memCmpFn = (memCmpFn_t) Tcl_UniCharNcmp;
+		    }
+		}
+	    }
+	} else {
+	    if ((empty = TclCheckEmptyString(value1Ptr)) > 0) {
+		switch (TclCheckEmptyString(value2Ptr)) {
+		    case -1:
+		    s1 = "";
+		    s1len = 0;
+		    s2 = TclGetStringFromObj(value2Ptr, &s2len);
+		    break;
+		    case 0:
+		    match = -1;
+		    goto matchdone;
+		    case 1:
+		    default: /* avoid warn: `s2` may be used uninitialized */
+		    match = 0;
+		    goto matchdone;
+		}
+	    } else if (TclCheckEmptyString(value2Ptr) > 0) {
+		switch (empty) {
+		    case -1:
+		    s2 = "";
+		    s2len = 0;
+		    s1 = TclGetStringFromObj(value1Ptr, &s1len);
+		    break;
+		    case 0:
+		    match = 1;
+		    goto matchdone;
+		    case 1:
+		    default: /* avoid warn: `s1` may be used uninitialized */
+		    match = 0;
+		    goto matchdone;
+		}
+	    } else {
+		s1 = TclGetStringFromObj(value1Ptr, &s1len);
+		s2 = TclGetStringFromObj(value2Ptr, &s2len);
+	    }
+	    if (!nocase && checkEq) {
+		/*
+		 * When we have equal-length we can check only for (in)equality.
+		 * We can use memcmp in all (n)eq cases because we
+		 * don't need to worry about lexical LE/BE variance.
+		 */
+		memCmpFn = memcmp;
+	    } else {
+
+		/*
+		 * As a catch-all we will work with UTF-8. We cannot use memcmp() as
+		 * that is unsafe with any string containing NUL (\xC0\x80 in Tcl's
+		 * utf rep). We can use the more efficient TclpUtfNcmp2 if we are
+		 * case-sensitive and no specific length was requested.
+		 */
+
+		if ((reqlength < 0) && !nocase) {
+		    memCmpFn = (memCmpFn_t) TclpUtfNcmp2;
+		} else {
+		    s1len = Tcl_NumUtfChars(s1, s1len);
+		    s2len = Tcl_NumUtfChars(s2, s2len);
+		    memCmpFn = (memCmpFn_t) (nocase ? Tcl_UtfNcasecmp : Tcl_UtfNcmp);
+		}
+	    }
+	}
+
+	length = (s1len < s2len) ? s1len : s2len;
+	if (reqlength > 0 && reqlength < length) {
+	    length = reqlength;
+	} else if (reqlength < 0) {
+	    /*
+	     * The requested length is negative, so we ignore it by setting it to
+	     * length + 1 so we correct the match var.
+	     */
+
+	    reqlength = length + 1;
+	}
+
+	if (checkEq && (s1len != s2len)) {
+	    match = 1;		/* This will be reversed below. */
+	}  else {
+	    /*
+	     * The comparison function should compare up to the minimum
+	     * byte length only.
+	     */
+	    match = memCmpFn(s1, s2, (size_t) length);
+	}
+	if ((match == 0) && (reqlength > length)) {
+	    match = s1len - s2len;
+	}
+	match = (match > 0) ? 1 : (match < 0) ? -1 : 0;
+    }
+    matchdone:
+    return match;
+}
+
+int TclStringCmpOpts (
+    Tcl_Interp *interp,		/* Current interpreter. */
+    int objc,			/* Number of arguments. */
+    Tcl_Obj *const objv[],	/* Argument objects. */
+    int *nocase,
+    int *reqlength
+)
+{
+    int i, length;
+    const char *string;
+
+    *reqlength = -1;
+    *nocase = 0;
     if (objc < 3 || objc > 6) {
     str_cmp_args:
 	Tcl_WrongNumArgs(interp, 1, objv,
@@ -2745,106 +2872,27 @@ StringCmpCmd(
     }
 
     for (i = 1; i < objc-2; i++) {
-	string2 = TclGetStringFromObj(objv[i], &length2);
-	if ((length2 > 1) && !strncmp(string2, "-nocase", (size_t)length2)) {
-	    nocase = 1;
-	} else if ((length2 > 1)
-		&& !strncmp(string2, "-length", (size_t)length2)) {
+	string = TclGetStringFromObj(objv[i], &length);
+	if ((length > 1) && !strncmp(string, "-nocase", (size_t)length)) {
+	    *nocase = 1;
+	} else if ((length > 1)
+		&& !strncmp(string, "-length", (size_t)length)) {
 	    if (i+1 >= objc-2) {
 		goto str_cmp_args;
 	    }
 	    i++;
-	    if (TclGetIntFromObj(interp, objv[i], &reqlength) != TCL_OK) {
+	    if (TclGetIntFromObj(interp, objv[i], reqlength) != TCL_OK) {
 		return TCL_ERROR;
 	    }
 	} else {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "bad option \"%s\": must be -nocase or -length",
-		    string2));
+		    string));
 	    Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "INDEX", "option",
-		    string2, NULL);
+		    string, NULL);
 	    return TCL_ERROR;
 	}
     }
-
-    /*
-     * From now on, we only access the two objects at the end of the argument
-     * array.
-     */
-
-    objv += objc-2;
-
-    if ((reqlength == 0) || (objv[0] == objv[1])) {
-	/*
-	 * Always match at 0 chars of if it is the same obj.
-	 */
-
-	Tcl_SetObjResult(interp, Tcl_NewBooleanObj(0));
-	return TCL_OK;
-    }
-
-    if (!nocase && TclIsPureByteArray(objv[0]) &&
-	    TclIsPureByteArray(objv[1])) {
-	/*
-	 * Use binary versions of comparisons since that won't cause undue
-	 * type conversions and it is much faster. Only do this if we're
-	 * case-sensitive (which is all that really makes sense with byte
-	 * arrays anyway, and we have no memcasecmp() for some reason... :^)
-	 */
-
-	string1 = (char *) Tcl_GetByteArrayFromObj(objv[0], &length1);
-	string2 = (char *) Tcl_GetByteArrayFromObj(objv[1], &length2);
-	strCmpFn = (strCmpFn_t) memcmp;
-    } else if ((objv[0]->typePtr == &tclStringType)
-	    && (objv[1]->typePtr == &tclStringType)) {
-	/*
-	 * Do a unicode-specific comparison if both of the args are of String
-	 * type. In benchmark testing this proved the most efficient check
-	 * between the unicode and string comparison operations.
-	 */
-
-	string1 = (char *) Tcl_GetUnicodeFromObj(objv[0], &length1);
-	string2 = (char *) Tcl_GetUnicodeFromObj(objv[1], &length2);
-	strCmpFn = (strCmpFn_t)
-		(nocase ? Tcl_UniCharNcasecmp : Tcl_UniCharNcmp);
-    } else {
-	/*
-	 * As a catch-all we will work with UTF-8. We cannot use memcmp() as
-	 * that is unsafe with any string containing NUL (\xC0\x80 in Tcl's
-	 * utf rep). We can use the more efficient TclpUtfNcmp2 if we are
-	 * case-sensitive and no specific length was requested.
-	 */
-
-	string1 = (char *) TclGetStringFromObj(objv[0], &length1);
-	string2 = (char *) TclGetStringFromObj(objv[1], &length2);
-	if ((reqlength < 0) && !nocase) {
-	    strCmpFn = (strCmpFn_t) TclpUtfNcmp2;
-	} else {
-	    length1 = Tcl_NumUtfChars(string1, length1);
-	    length2 = Tcl_NumUtfChars(string2, length2);
-	    strCmpFn = (strCmpFn_t) (nocase ? Tcl_UtfNcasecmp : Tcl_UtfNcmp);
-	}
-    }
-
-    length = (length1 < length2) ? length1 : length2;
-    if (reqlength > 0 && reqlength < length) {
-	length = reqlength;
-    } else if (reqlength < 0) {
-	/*
-	 * The requested length is negative, so we ignore it by setting it to
-	 * length + 1 so we correct the match var.
-	 */
-
-	reqlength = length + 1;
-    }
-
-    match = strCmpFn(string1, string2, (unsigned) length);
-    if ((match == 0) && (reqlength > length)) {
-	match = length1 - length2;
-    }
-
-    Tcl_SetObjResult(interp,
-	    Tcl_NewIntObj((match > 0) ? 1 : (match < 0) ? -1 : 0));
     return TCL_OK;
 }
 
@@ -3267,8 +3315,7 @@ StringTrimCmd(
     }
     string1 = TclGetStringFromObj(objv[1], &length1);
 
-    triml = TclTrimLeft(string1, length1, string2, length2);
-    trimr = TclTrimRight(string1 + triml, length1 - triml, string2, length2);
+    triml = TclTrim(string1, length1, string2, length2, &trimr);
 
     Tcl_SetObjResult(interp,
 	    Tcl_NewStringObj(string1 + triml, length1 - triml - trimr));

generic/tclCompCmds.c

@@ -322,11 +322,22 @@ TclCompileArraySetCmd(
      */
 
     if (isDataValid && !isDataEven) {
+	/* Abandon custom compile and let invocation raise the error */
+	code = TclCompileBasic2ArgCmd(interp, parsePtr, cmdPtr, envPtr);
+	goto done;
+
+	/*
+	 * We used to compile to the bytecode that would throw the error,
+	 * but that was wrong because it would not invoke the array trace
+	 * on the variable.
+	 *
 	PushStringLiteral(envPtr, "list must have an even number of elements");
 	PushStringLiteral(envPtr, "-errorcode {TCL ARGUMENT FORMAT}");
 	TclEmitInstInt4(INST_RETURN_IMM, TCL_ERROR,		envPtr);
 	TclEmitInt4(		0,				envPtr);
 	goto done;
+	 *
+	 */
     }
 
     /*
@@ -404,6 +415,10 @@ TclCompileArraySetCmd(
      * Start issuing instructions to write to the array.
      */
 
+    TclEmitInstInt4(INST_ARRAY_EXISTS_IMM, localIndex,	envPtr);
+    TclEmitInstInt1(INST_JUMP_TRUE1, 7,			envPtr);
+    TclEmitInstInt4(INST_ARRAY_MAKE_IMM, localIndex,	envPtr);
+
     CompileWord(envPtr, dataTokenPtr, interp, 2);
     if (!isDataLiteral || !isDataValid) {
 	/*
@@ -428,9 +443,6 @@ TclCompileArraySetCmd(
 	TclStoreInt1AtPtr(fwd, envPtr->codeStart+offsetFwd+1);
     }
 
-    TclEmitInstInt4(INST_ARRAY_EXISTS_IMM, localIndex,	envPtr);
-    TclEmitInstInt1(INST_JUMP_TRUE1, 7,			envPtr);
-    TclEmitInstInt4(INST_ARRAY_MAKE_IMM, localIndex,	envPtr);
     TclEmitInstInt4(INST_FOREACH_START, infoIndex,	envPtr);
     offsetBack = CurrentOffset(envPtr);
     Emit14Inst(	INST_LOAD_SCALAR, keyVar,		envPtr);

generic/tclCompCmdsGR.c

@@ -34,15 +34,15 @@ static int		IndexTailVarIfKnown(Tcl_Interp *interp,
  *
  * TclGetIndexFromToken --
  *
- *	Parse a token and get the encoded version of the index (as understood
- *	by TEBC), assuming it is at all knowable at compile time. Only handles
- *	indices that are integers or 'end' or 'end-integer'.
+ *	Parse a token to determine if an index value is known at
+ *	compile time. 
  *
  * Returns:
  *	TCL_OK if parsing succeeded, and TCL_ERROR if it failed.
  *
  * Side effects:
- *	Sets *index to the index value if successful.
+ *	When TCL_OK is returned, the encoded index value is written
+ *	to *index.
  *
  *----------------------------------------------------------------------
  */
@@ -50,33 +50,17 @@ static int		IndexTailVarIfKnown(Tcl_Interp *interp,
 int
 TclGetIndexFromToken(
     Tcl_Token *tokenPtr,
-    int *index)
+    int before,
+    int after,
+    int *indexPtr)
 {
     Tcl_Obj *tmpObj = Tcl_NewObj();
-    int result, idx;
+    int result = TCL_ERROR;
 
-    if (!TclWordKnownAtCompileTime(tokenPtr, tmpObj)) {
-	Tcl_DecrRefCount(tmpObj);
-	return TCL_ERROR;
-    }
-
-    result = TclGetIntFromObj(NULL, tmpObj, &idx);
-    if (result == TCL_OK) {
-	if (idx < 0) {
-	    result = TCL_ERROR;
-	}
-    } else {
-	result = TclGetIntForIndexM(NULL, tmpObj, TCL_INDEX_END, &idx);
-	if (result == TCL_OK && idx > TCL_INDEX_END) {
-	    result = TCL_ERROR;
-	}
+    if (TclWordKnownAtCompileTime(tokenPtr, tmpObj)) {
+	result = TclIndexEncode(NULL, tmpObj, before, after, indexPtr);
     }
     Tcl_DecrRefCount(tmpObj);
-
-    if (result == TCL_OK) {
-	*index = idx;
-    }
-
     return result;
 }
 
@@ -143,7 +127,7 @@ TclCompileGlobalCmd(
 	    return TCL_ERROR;
 	}
 
-	/* TODO: Consider what value can pass throug the
+	/* TODO: Consider what value can pass through the
 	 * IndexTailVarIfKnown() screen.  Full CompileWord()
 	 * likely does not apply here.  Push known value instead. */
 	CompileWord(envPtr, varTokenPtr, interp, i);
@@ -1103,14 +1087,14 @@ TclCompileLindexCmd(
     }
 
     idxTokenPtr = TokenAfter(valTokenPtr);
-    if (TclGetIndexFromToken(idxTokenPtr, &idx) == TCL_OK) {
+    if (TclGetIndexFromToken(idxTokenPtr, TCL_INDEX_BEFORE, TCL_INDEX_BEFORE,
+	    &idx) == TCL_OK) {
 	/*
-	 * All checks have been completed, and we have exactly one of these
-	 * constructs:
-	 *	 lindex <arbitraryValue> <posInt>
-	 *	 lindex <arbitraryValue> end-<posInt>
-	 * This is best compiled as a push of the arbitrary value followed by
-	 * an "immediate lindex" which is the most efficient variety.
+	 * The idxTokenPtr parsed as a valid index value and was
+	 * encoded as expected by INST_LIST_INDEX_IMM.
+	 *
+	 * NOTE: that we rely on indexing before a list producing the
+	 * same result as indexing after a list.
 	 */
 
 	CompileWord(envPtr, valTokenPtr, interp, 1);
@@ -1331,21 +1315,25 @@ TclCompileLrangeCmd(
     }
     listTokenPtr = TokenAfter(parsePtr->tokenPtr);
 
+    tokenPtr = TokenAfter(listTokenPtr);
+    if (TclGetIndexFromToken(tokenPtr, TCL_INDEX_START, TCL_INDEX_AFTER,
+	    &idx1) != TCL_OK) {
+	return TCL_ERROR;
+    }
     /*
-     * Parse the indices. Will only compile if both are constants and not an
-     * _integer_ less than zero (since we reserve negative indices here for
-     * end-relative indexing) or an end-based index greater than 'end' itself.
+     * Token was an index value, and we treat all "first" indices
+     * before the list same as the start of the list.
      */
 
-    tokenPtr = TokenAfter(listTokenPtr);
-    if (TclGetIndexFromToken(tokenPtr, &idx1) != TCL_OK) {
-	return TCL_ERROR;
-    }
-
     tokenPtr = TokenAfter(tokenPtr);
-    if (TclGetIndexFromToken(tokenPtr, &idx2) != TCL_OK) {
+    if (TclGetIndexFromToken(tokenPtr, TCL_INDEX_BEFORE, TCL_INDEX_END,
+	    &idx2) != TCL_OK) {
 	return TCL_ERROR;
     }
+    /*
+     * Token was an index value, and we treat all "last" indices
+     * after the list same as the end of the list.
+     */
 
     /*
      * Issue instructions. It's not safe to skip doing the LIST_RANGE, as
@@ -1395,7 +1383,16 @@ TclCompileLinsertCmd(
      */
 
     tokenPtr = TokenAfter(listTokenPtr);
-    if (TclGetIndexFromToken(tokenPtr, &idx) != TCL_OK) {
+
+    /*
+     * NOTE: This command treats all inserts at indices before the list
+     * the same as inserts at the start of the list, and all inserts
+     * after the list the same as inserts at the end of the list. We
+     * make that transformation here so we can use the optimized bytecode
+     * as much as possible.
+     */
+    if (TclGetIndexFromToken(tokenPtr, TCL_INDEX_START, TCL_INDEX_END,
+	    &idx) != TCL_OK) {
 	return TCL_ERROR;
     }
 
@@ -1419,10 +1416,10 @@ TclCompileLinsertCmd(
     }
     TclEmitInstInt4(		INST_LIST, i-3,			envPtr);
 
-    if (idx == 0 /*start*/) {
+    if (idx == TCL_INDEX_START) {
 	TclEmitInstInt4(	INST_REVERSE, 2,		envPtr);
 	TclEmitOpcode(		INST_LIST_CONCAT,		envPtr);
-    } else if (idx == TCL_INDEX_END /*end*/) {
+    } else if (idx == TCL_INDEX_END) {
 	TclEmitOpcode(		INST_LIST_CONCAT,		envPtr);
     } else {
 	/*
@@ -1475,250 +1472,116 @@ TclCompileLreplaceCmd(
 {
     Tcl_Token *tokenPtr, *listTokenPtr;
     DefineLineInformation;	/* TIP #280 */
-    Tcl_Obj *tmpObj;
-    int idx1, idx2, i, offset, offset2;
+    int idx1, idx2, i;
+    int emptyPrefix=1, suffixStart = 0;
 
     if (parsePtr->numWords < 4) {
 	return TCL_ERROR;
     }
     listTokenPtr = TokenAfter(parsePtr->tokenPtr);
 
-    /*
-     * Parse the indices. Will only compile if both are constants and not an
-     * _integer_ less than zero (since we reserve negative indices here for
-     * end-relative indexing) or an end-based index greater than 'end' itself.
-     */
-
     tokenPtr = TokenAfter(listTokenPtr);
-    if (TclGetIndexFromToken(tokenPtr, &idx1) != TCL_OK) {
+    if (TclGetIndexFromToken(tokenPtr, TCL_INDEX_START, TCL_INDEX_AFTER,
+	    &idx1) != TCL_OK) {
 	return TCL_ERROR;
     }
 
     tokenPtr = TokenAfter(tokenPtr);
-    if (TclGetIndexFromToken(tokenPtr, &idx2) != TCL_OK) {
+    if (TclGetIndexFromToken(tokenPtr, TCL_INDEX_BEFORE, TCL_INDEX_END,
+	    &idx2) != TCL_OK) {
 	return TCL_ERROR;
     }
 
     /*
-     * idx1, idx2 are now in canonical form:
+     * General structure of the [lreplace] result is
+     *		prefix replacement suffix
+     * In a few cases we can predict various parts will be empty and
+     * take advantage.
      *
-     *  - integer:	[0,len+1]
-     *  - end index:    TCL_INDEX_END
-     *  - -ive offset:  TCL_INDEX_END-[len-1,0]
-     *  - +ive offset:  TCL_INDEX_END+1
+     * The proper suffix begins with the greater of indices idx1 or
+     * idx2 + 1. If we cannot tell at compile time which is greater,
+     * we must defer to direct evaluation.
      */
 
-    /*
-     * Compilation fails when one index is end-based but the other isn't.
-     * Fixing this will require more bytecodes, but this is a workaround for
-     * now. [Bug 47ac84309b]
-     */
-
-    if ((idx1 <= TCL_INDEX_END) != (idx2 <= TCL_INDEX_END)) {
+    if (idx1 == TCL_INDEX_AFTER) {
+	suffixStart = idx1;
+    } else if (idx2 == TCL_INDEX_BEFORE) {
+	suffixStart = idx1;
+    } else if (idx2 == TCL_INDEX_END) {
+	suffixStart = TCL_INDEX_AFTER;
+    } else if (((idx2 < TCL_INDEX_END) && (idx1 <= TCL_INDEX_END))
+	    || ((idx2 >= TCL_INDEX_START) && (idx1 >= TCL_INDEX_START))) {
+	suffixStart = (idx1 > idx2 + 1) ? idx1 : idx2 + 1;
+    } else {
 	return TCL_ERROR;
     }
 
-    if (idx2 != TCL_INDEX_END && idx2 >= 0 && idx2 < idx1) {
-	idx2 = idx1 - 1;
-    }
-
-    /*
-     * Work out what this [lreplace] is actually doing.
-     */
-
-    tmpObj = NULL;
+    /* All paths start with computing/pushing the original value. */
     CompileWord(envPtr, listTokenPtr, interp, 1);
-    if (parsePtr->numWords == 4) {
-	if (idx1 == 0) {
-	    if (idx2 == TCL_INDEX_END) {
-		goto dropAll;
-	    }
-	    idx1 = idx2 + 1;
-	    idx2 = TCL_INDEX_END;
-	    goto dropEnd;
-	} else if (idx2 == TCL_INDEX_END) {
-	    idx2 = idx1 - 1;
-	    idx1 = 0;
-	    goto dropEnd;
-	} else {
-	    if (idx2 < idx1) {
-		idx2 = idx1 - 1;
-	    }
-	    if (idx1 > 0) {
-		tmpObj = Tcl_NewIntObj(idx1);
-		Tcl_IncrRefCount(tmpObj);
-	    }
-	    goto dropRange;
-	}
-    }
 
-    tokenPtr = TokenAfter(tokenPtr);
-    for (i=4 ; i<parsePtr->numWords ; i++) {
-	CompileWord(envPtr, tokenPtr, interp, i);
+    /*
+     * Push all the replacement values next so any errors raised in
+     * creating them get raised first.
+     */
+    if (parsePtr->numWords > 4) {
+	/* Push the replacement arguments */
 	tokenPtr = TokenAfter(tokenPtr);
+	for (i=4 ; i<parsePtr->numWords ; i++) {
+	    CompileWord(envPtr, tokenPtr, interp, i);
+	    tokenPtr = TokenAfter(tokenPtr);
+	}
+
+	/* Make a list of them... */
+	TclEmitInstInt4(	INST_LIST, i - 4,		envPtr);
+
+	emptyPrefix = 0;
     }
-    TclEmitInstInt4(		INST_LIST, i - 4,		envPtr);
-    TclEmitInstInt4(		INST_REVERSE, 2,		envPtr);
-    if (idx1 == 0) {
-	if (idx2 == TCL_INDEX_END) {
-	    goto replaceAll;
+     
+    if ((idx1 == suffixStart) && (parsePtr->numWords == 4)) {
+	/*
+	 * This is a "no-op". Example: [lreplace {a b c} 2 0]
+	 * We still do a list operation to get list-verification
+	 * and canonicalization side effects.
+	 */
+	TclEmitInstInt4(	INST_LIST_RANGE_IMM, 0,		envPtr);
+	TclEmitInt4(			TCL_INDEX_END,		envPtr);
+	return TCL_OK;
+    }
+
+    if (idx1 != TCL_INDEX_START) {
+	/* Prefix may not be empty; generate bytecode to push it */
+	if (emptyPrefix) {
+	    TclEmitOpcode(	INST_DUP,			envPtr);
+	} else {
+	    TclEmitInstInt4(	INST_OVER, 1,			envPtr);
+	}
+	TclEmitInstInt4(	INST_LIST_RANGE_IMM, 0,		envPtr);
+	TclEmitInt4(			idx1 - 1,		envPtr);
+	if (!emptyPrefix) {
+	    TclEmitInstInt4(	INST_REVERSE, 2,		envPtr);
+	    TclEmitOpcode(	INST_LIST_CONCAT,		envPtr);
+	}
+	emptyPrefix = 0;
+    }
+
+    if (!emptyPrefix) {
+	TclEmitInstInt4(	INST_REVERSE, 2,		envPtr);
+    }
+
+    if (suffixStart == TCL_INDEX_AFTER) {
+	TclEmitOpcode(		INST_POP,			envPtr);
+	if (emptyPrefix) {
+	    PushStringLiteral(envPtr, "");
 	}
-	idx1 = idx2 + 1;
-	idx2 = TCL_INDEX_END;
-	goto replaceHead;
-    } else if (idx2 == TCL_INDEX_END) {
-	idx2 = idx1 - 1;
-	idx1 = 0;
-	goto replaceTail;
     } else {
-	if (idx2 < idx1) {
-	    idx2 = idx1 - 1;
+	/* Suffix may not be empty; generate bytecode to push it */
+	TclEmitInstInt4(	INST_LIST_RANGE_IMM, suffixStart, envPtr);
+	TclEmitInt4(			TCL_INDEX_END,		envPtr);
+	if (!emptyPrefix) {
+	    TclEmitOpcode(	INST_LIST_CONCAT,		envPtr);
 	}
-	if (idx1 > 0) {
-	    tmpObj = Tcl_NewIntObj(idx1);
-	    Tcl_IncrRefCount(tmpObj);
-	}
-	goto replaceRange;
     }
 
-    /*
-     * Issue instructions to perform the operations relating to configurations
-     * that just drop. The only argument pushed on the stack is the list to
-     * operate on.
-     */
-
-  dropAll:			/* This just ensures the arg is a list. */
-    TclEmitOpcode(		INST_LIST_LENGTH,		envPtr);
-    TclEmitOpcode(		INST_POP,			envPtr);
-    PushStringLiteral(envPtr,	"");
-    goto done;
-
-  dropEnd:
-    TclEmitInstInt4(		INST_LIST_RANGE_IMM, idx1,	envPtr);
-    TclEmitInt4(			idx2,			envPtr);
-    goto done;
-
-  dropRange:
-    if (tmpObj != NULL) {
-	/*
-	 * Emit bytecode to check the list length.
-	 */
-
-	TclEmitOpcode(		INST_DUP,			envPtr);
-	TclEmitOpcode(		INST_LIST_LENGTH,		envPtr);
-	TclEmitPush(TclAddLiteralObj(envPtr, tmpObj, NULL),	envPtr);
-	TclEmitOpcode(		INST_GE,			envPtr);
-	offset = CurrentOffset(envPtr);
-	TclEmitInstInt1(	INST_JUMP_TRUE1, 0,		envPtr);
-
-	/*
-	 * Emit an error if we've been given an empty list.
-	 */
-
-	TclEmitOpcode(		INST_DUP,			envPtr);
-	TclEmitOpcode(		INST_LIST_LENGTH,		envPtr);
-	offset2 = CurrentOffset(envPtr);
-	TclEmitInstInt1(	INST_JUMP_FALSE1, 0,		envPtr);
-	TclEmitPush(TclAddLiteralObj(envPtr, Tcl_ObjPrintf(
-		"list doesn't contain element %d", idx1), NULL), envPtr);
-	CompileReturnInternal(envPtr, INST_RETURN_IMM, TCL_ERROR, 0,
-		Tcl_ObjPrintf("-errorcode {TCL OPERATION LREPLACE BADIDX}"));
-	TclStoreInt1AtPtr(CurrentOffset(envPtr) - offset,
-		envPtr->codeStart + offset + 1);
-	TclStoreInt1AtPtr(CurrentOffset(envPtr) - offset2,
-		envPtr->codeStart + offset2 + 1);
-	TclAdjustStackDepth(-1, envPtr);
-    }
-    TclEmitOpcode(		INST_DUP,			envPtr);
-    TclEmitInstInt4(		INST_LIST_RANGE_IMM, 0,		envPtr);
-    TclEmitInt4(			idx1 - 1,		envPtr);
-    TclEmitInstInt4(		INST_REVERSE, 2,		envPtr);
-    TclEmitInstInt4(		INST_LIST_RANGE_IMM, idx2 + 1,	envPtr);
-    TclEmitInt4(			TCL_INDEX_END,		envPtr);
-    TclEmitOpcode(		INST_LIST_CONCAT,		envPtr);
-    goto done;
-
-    /*
-     * Issue instructions to perform the operations relating to configurations
-     * that do real replacement. All arguments are pushed and assembled into a
-     * pair: the list of values to replace with, and the list to do the
-     * surgery on.
-     */
-
-  replaceAll:
-    TclEmitOpcode(		INST_LIST_LENGTH,		envPtr);
-    TclEmitOpcode(		INST_POP,			envPtr);
-    goto done;
-
-  replaceHead:
-    TclEmitInstInt4(		INST_LIST_RANGE_IMM, idx1,	envPtr);
-    TclEmitInt4(			idx2,			envPtr);
-    TclEmitOpcode(		INST_LIST_CONCAT,		envPtr);
-    goto done;
-
-  replaceTail:
-    TclEmitInstInt4(		INST_LIST_RANGE_IMM, idx1,	envPtr);
-    TclEmitInt4(			idx2,			envPtr);
-    TclEmitInstInt4(		INST_REVERSE, 2,		envPtr);
-    TclEmitOpcode(		INST_LIST_CONCAT,		envPtr);
-    goto done;
-
-  replaceRange:
-    if (tmpObj != NULL) {
-	/*
-	 * Emit bytecode to check the list length.
-	 */
-
-	TclEmitOpcode(		INST_DUP,			envPtr);
-	TclEmitOpcode(		INST_LIST_LENGTH,		envPtr);
-
-	/*
-	 * Check the list length vs idx1.
-	 */
-
-	TclEmitPush(TclAddLiteralObj(envPtr, tmpObj, NULL),	envPtr);
-	TclEmitOpcode(		INST_GE,			envPtr);
-	offset = CurrentOffset(envPtr);
-	TclEmitInstInt1(	INST_JUMP_TRUE1, 0,		envPtr);
-
-	/*
-	 * Emit an error if we've been given an empty list.
-	 */
-
-	TclEmitOpcode(		INST_DUP,			envPtr);
-	TclEmitOpcode(		INST_LIST_LENGTH,		envPtr);
-	offset2 = CurrentOffset(envPtr);
-	TclEmitInstInt1(	INST_JUMP_FALSE1, 0,		envPtr);
-	TclEmitPush(TclAddLiteralObj(envPtr, Tcl_ObjPrintf(
-		"list doesn't contain element %d", idx1), NULL), envPtr);
-	CompileReturnInternal(envPtr, INST_RETURN_IMM, TCL_ERROR, 0,
-		Tcl_ObjPrintf("-errorcode {TCL OPERATION LREPLACE BADIDX}"));
-	TclStoreInt1AtPtr(CurrentOffset(envPtr) - offset,
-		envPtr->codeStart + offset + 1);
-	TclStoreInt1AtPtr(CurrentOffset(envPtr) - offset2,
-		envPtr->codeStart + offset2 + 1);
-	TclAdjustStackDepth(-1, envPtr);
-    }
-    TclEmitOpcode(		INST_DUP,			envPtr);
-    TclEmitInstInt4(		INST_LIST_RANGE_IMM, 0,		envPtr);
-    TclEmitInt4(			idx1 - 1,		envPtr);
-    TclEmitInstInt4(		INST_REVERSE, 2,		envPtr);
-    TclEmitInstInt4(		INST_LIST_RANGE_IMM, idx2 + 1,	envPtr);
-    TclEmitInt4(			TCL_INDEX_END,		envPtr);
-    TclEmitInstInt4(		INST_REVERSE, 3,		envPtr);
-    TclEmitOpcode(		INST_LIST_CONCAT,		envPtr);
-    TclEmitInstInt4(		INST_REVERSE, 2,		envPtr);
-    TclEmitOpcode(		INST_LIST_CONCAT,		envPtr);
-    goto done;
-
-    /*
-     * Clean up the allocated memory.
-     */
-
-  done:
-    if (tmpObj != NULL) {
-	Tcl_DecrRefCount(tmpObj);
-    }
     return TCL_OK;
 }
 
@@ -2944,7 +2807,7 @@ TclCompileVariableCmd(
 	    return TCL_ERROR;
 	}
 
-	/* TODO: Consider what value can pass throug the
+	/* TODO: Consider what value can pass through the
 	 * IndexTailVarIfKnown() screen.  Full CompileWord()
 	 * likely does not apply here.  Push known value instead. */
 	CompileWord(envPtr, varTokenPtr, interp, i);

generic/tclCompCmdsSZ.c

@@ -930,22 +930,48 @@ TclCompileStringRangeCmd(
     fromTokenPtr = TokenAfter(stringTokenPtr);
     toTokenPtr = TokenAfter(fromTokenPtr);
 
+    /* Every path must push the string argument */
+    CompileWord(envPtr, stringTokenPtr,			interp, 1);
+
     /*
      * Parse the two indices.
      */
 
-    if (TclGetIndexFromToken(fromTokenPtr, &idx1) != TCL_OK) {
+    if (TclGetIndexFromToken(fromTokenPtr, TCL_INDEX_START, TCL_INDEX_AFTER,
+	    &idx1) != TCL_OK) {
 	goto nonConstantIndices;
     }
-    if (TclGetIndexFromToken(toTokenPtr, &idx2) != TCL_OK) {
+    /*
+     * Token parsed as an index expression. We treat all indices before
+     * the string the same as the start of the string.
+     */
+
+    if (idx1 == TCL_INDEX_AFTER) {
+	/* [string range $s end+1 $last] must be empty string */
+	OP(		POP);
+	PUSH(		"");
+	return TCL_OK;
+    }
+
+    if (TclGetIndexFromToken(toTokenPtr, TCL_INDEX_BEFORE, TCL_INDEX_END,
+	    &idx2) != TCL_OK) {
 	goto nonConstantIndices;
     }
+    /*
+     * Token parsed as an index expression. We treat all indices after
+     * the string the same as the end of the string.
+     */
+    if (idx2 == TCL_INDEX_BEFORE) {
+	/* [string range $s $first -1] must be empty string */
+	OP(		POP);
+	PUSH(		"");
+	return TCL_OK;
+    }
 
     /*
      * Push the operand onto the stack and then the substring operation.
      */
 
-    CompileWord(envPtr, stringTokenPtr,			interp, 1);
     OP44(		STR_RANGE_IMM, idx1, idx2);
     return TCL_OK;
 
@@ -954,7 +980,6 @@ TclCompileStringRangeCmd(
      */
 
   nonConstantIndices:
-    CompileWord(envPtr, stringTokenPtr,			interp, 1);
     CompileWord(envPtr, fromTokenPtr,			interp, 2);
     CompileWord(envPtr, toTokenPtr,			interp, 3);
     OP(			STR_RANGE);
@@ -970,124 +995,197 @@ TclCompileStringReplaceCmd(
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds the resulting instructions. */
 {
-    Tcl_Token *tokenPtr, *valueTokenPtr, *replacementTokenPtr = NULL;
+    Tcl_Token *tokenPtr, *valueTokenPtr;
     DefineLineInformation;	/* TIP #280 */
-    int idx1, idx2;
+    int first, last;
 
     if (parsePtr->numWords < 4 || parsePtr->numWords > 5) {
 	return TCL_ERROR;
     }
+ 
+    /* Bytecode to compute/push string argument being replaced */
     valueTokenPtr = TokenAfter(parsePtr->tokenPtr);
-    if (parsePtr->numWords == 5) {
-	tokenPtr = TokenAfter(valueTokenPtr);
-	tokenPtr = TokenAfter(tokenPtr);
-	replacementTokenPtr = TokenAfter(tokenPtr);
-    }
+    CompileWord(envPtr, valueTokenPtr, interp, 1);
 
     /*
-     * Parse the indices. Will only compile special cases if both are
-     * constants and not an _integer_ less than zero (since we reserve
-     * negative indices here for end-relative indexing) or an end-based index
-     * greater than 'end' itself.
+     * Check for first index known and useful at compile time. 
      */
-
     tokenPtr = TokenAfter(valueTokenPtr);
-    if (TclGetIndexFromToken(tokenPtr, &idx1) != TCL_OK) {
-	goto genericReplace;
-    }
-
-    tokenPtr = TokenAfter(tokenPtr);
-    if (TclGetIndexFromToken(tokenPtr, &idx2) != TCL_OK) {
+    if (TclGetIndexFromToken(tokenPtr, TCL_INDEX_BEFORE, TCL_INDEX_AFTER,
+	    &first) != TCL_OK) {
 	goto genericReplace;
     }
 
     /*
-     * We handle these replacements specially: first character (where
-     * idx1=idx2=0) and last character (where idx1=idx2=TCL_INDEX_END). Anything
-     * else and the semantics get rather screwy.
+     * Check for last index known and useful at compile time. 
+     */
+    tokenPtr = TokenAfter(tokenPtr);
+    if (TclGetIndexFromToken(tokenPtr, TCL_INDEX_BEFORE, TCL_INDEX_AFTER,
+	    &last) != TCL_OK) {
+	goto genericReplace;
+    }
+
+    /* 
+     * [string replace] is an odd bird.  For many arguments it is
+     * a conventional substring replacer.  However it also goes out
+     * of its way to become a no-op for many cases where it would be
+     * replacing an empty substring.  Precisely, it is a no-op when
+     *
+     *		(last < first)		OR
+     *		(last < 0)		OR
+     *		(end < first)
+     *
+     * For some compile-time values we can detect these cases, and
+     * compile direct to bytecode implementing the no-op.
      */
 
-    if (idx1 == 0 && idx2 == 0) {
-	int notEq, end;
+    if ((last == TCL_INDEX_BEFORE)		/* Know (last < 0) */
+	    || (first == TCL_INDEX_AFTER)	/* Know (first > end) */
 
 	/*
-	 * Just working with the first character.
+	 * Tricky to determine when runtime (last < first) can be
+	 * certainly known based on the encoded values. Consider the
+	 * cases...
+	 *
+	 * (first <= TCL_INDEX_END) &&
+	 *	(last == TCL_INDEX_AFTER) => cannot tell REJECT
+	 *	(last <= TCL_INDEX END) && (last < first) => ACCEPT
+	 *	else => cannot tell REJECT
 	 */
-
-	CompileWord(envPtr, valueTokenPtr, interp, 1);
-	if (replacementTokenPtr == NULL) {
-	    /* Drop first */
-	    OP44(	STR_RANGE_IMM, 1, TCL_INDEX_END);
-	    return TCL_OK;
-	}
-	/* Replace first */
-	CompileWord(envPtr, replacementTokenPtr, interp, 4);
-	OP4(		OVER, 1);
-	PUSH(		"");
-	OP(		STR_EQ);
-	JUMP1(		JUMP_FALSE, notEq);
-	OP(		POP);
-	JUMP1(		JUMP, end);
-	FIXJUMP1(notEq);
-	TclAdjustStackDepth(1, envPtr);
-	OP4(		REVERSE, 2);
-	OP44(		STR_RANGE_IMM, 1, TCL_INDEX_END);
-	OP1(		STR_CONCAT1, 2);
-	FIXJUMP1(end);
-	return TCL_OK;
-
-    } else if (idx1 == TCL_INDEX_END && idx2 == TCL_INDEX_END) {
-	int notEq, end;
-
+	    || ((first <= TCL_INDEX_END) && (last <= TCL_INDEX_END)
+		&& (last < first))		/* Know (last < first) */
 	/*
-	 * Just working with the last character.
+	 * (first == TCL_INDEX_BEFORE) &&
+	 *	(last == TCL_INDEX_AFTER) => (first < last) REJECT
+	 *	(last <= TCL_INDEX_END) => cannot tell REJECT
+	 *	else		=> (first < last) REJECT
+	 *
+	 * else [[first >= TCL_INDEX_START]] &&
+	 *	(last == TCL_INDEX_AFTER) => cannot tell REJECT
+	 *	(last <= TCL_INDEX_END) => cannot tell REJECT
+	 *	else [[last >= TCL_INDEX START]] && (last < first) => ACCEPT
 	 */
-
-	CompileWord(envPtr, valueTokenPtr, interp, 1);
-	if (replacementTokenPtr == NULL) {
-	    /* Drop last */
-	    OP44(	STR_RANGE_IMM, 0, TCL_INDEX_END-1);
-	    return TCL_OK;
+	    || ((first >= TCL_INDEX_START) && (last >= TCL_INDEX_START)
+		&& (last < first))) {		/* Know (last < first) */
+	if (parsePtr->numWords == 5) {
+	    tokenPtr = TokenAfter(tokenPtr);
+	    CompileWord(envPtr, tokenPtr, interp, 4);
+	    OP(		POP);		/* Pop newString */
 	}
-	/* Replace last */
-	CompileWord(envPtr, replacementTokenPtr, interp, 4);
-	OP4(		OVER, 1);
-	PUSH(		"");
-	OP(		STR_EQ);
-	JUMP1(		JUMP_FALSE, notEq);
-	OP(		POP);
-	JUMP1(		JUMP, end);
-	FIXJUMP1(notEq);
-	TclAdjustStackDepth(1, envPtr);
-	OP4(		REVERSE, 2);
-	OP44(		STR_RANGE_IMM, 0, TCL_INDEX_END-1);
-	OP4(		REVERSE, 2);
-	OP1(		STR_CONCAT1, 2);
-	FIXJUMP1(end);
+	/* Original string argument now on TOS as result */
 	return TCL_OK;
+    }
+
+    if (parsePtr->numWords == 5) {
+    /*
+     * When we have a string replacement, we have to take care about
+     * not replacing empty substrings that [string replace] promises
+     * not to replace
+     *
+     * The remaining index values might be suitable for conventional
+     * string replacement, but only if they cannot possibly meet the
+     * conditions described above at runtime. If there's a chance they
+     * might, we would have to emit bytecode to check and at that point
+     * we're paying more in bytecode execution time than would make
+     * things worthwhile. Trouble is we are very limited in
+     * how much we can detect that at compile time. After decoding,
+     * we need, first:
+     *
+     *		(first <= end)
+     *
+     * The encoded indices (first <= TCL_INDEX END) and
+     * (first == TCL_INDEX_BEFORE) always meets this condition, but
+     * any other encoded first index has some list for which it fails.
+     *
+     * We also need, second:
+     *
+     *		(last >= 0)
+     *
+     * The encoded indices (last >= TCL_INDEX_START) and
+     * (last == TCL_INDEX_AFTER) always meet this condition but any
+     * other encoded last index has some list for which it fails.
+     *
+     * Finally we need, third:
+     *
+     *		(first <= last)
+     * 
+     * Considered in combination with the constraints we already have,
+     * we see that we can proceed when (first == TCL_INDEX_BEFORE)
+     * or (last == TCL_INDEX_AFTER). These also permit simplification
+     * of the prefix|replace|suffix construction. The other constraints,
+     * though, interfere with getting a guarantee that first <= last. 
+     */
+
+    if ((first == TCL_INDEX_BEFORE) && (last >= TCL_INDEX_START)) {
+	/* empty prefix */
+	tokenPtr = TokenAfter(tokenPtr);
+	CompileWord(envPtr, tokenPtr, interp, 4);
+	OP4(		REVERSE, 2);
+	if (last == TCL_INDEX_AFTER) {
+	    OP(		POP);		/* Pop  original */
+	} else {
+	    OP44(	STR_RANGE_IMM, last + 1, TCL_INDEX_END);
+	    OP1(	STR_CONCAT1, 2);
+	}
+	return TCL_OK;
+    }
+
+    if ((last == TCL_INDEX_AFTER) && (first <= TCL_INDEX_END)) {
+	OP44(		STR_RANGE_IMM, 0, first-1);
+	tokenPtr = TokenAfter(tokenPtr);
+	CompileWord(envPtr, tokenPtr, interp, 4);
+	OP1(		STR_CONCAT1, 2);
+	return TCL_OK;
+    }
+
+	/* FLOW THROUGH TO genericReplace */
 
     } else {
-	/*
-	 * Need to process indices at runtime. This could be because the
-	 * indices are not constants, or because we need to resolve them to
-	 * absolute indices to work out if a replacement is going to happen.
-	 * In any case, to runtime it is.
+	/* 
+	 * When we have no replacement string to worry about, we may
+	 * have more luck, because the forbidden empty string replacements
+	 * are harmless when they are replaced by another empty string.
 	 */
 
+	if ((first == TCL_INDEX_BEFORE) || (first == TCL_INDEX_START)) {
+	    /* empty prefix - build suffix only */
+
+	    if ((last == TCL_INDEX_END) || (last == TCL_INDEX_AFTER)) {
+		/* empty suffix too => empty result */
+		OP(	POP);		/* Pop  original */
+		PUSH	(	"");
+		return TCL_OK;
+	    }
+	    OP44(	STR_RANGE_IMM, last + 1, TCL_INDEX_END);
+	    return TCL_OK;
+	} else {
+	    if ((last == TCL_INDEX_END) || (last == TCL_INDEX_AFTER)) {
+		/* empty suffix - build prefix only */
+		OP44(	STR_RANGE_IMM, 0, first-1);
+		return TCL_OK;
+	    }
+	    OP(		DUP);
+	    OP44(	STR_RANGE_IMM, 0, first-1);
+	    OP4(	REVERSE, 2);
+	    OP44(	STR_RANGE_IMM, last + 1, TCL_INDEX_END);
+	    OP1(	STR_CONCAT1, 2);
+	    return TCL_OK;
+	}
+    }
+
     genericReplace:
-	CompileWord(envPtr, valueTokenPtr, interp, 1);
 	tokenPtr = TokenAfter(valueTokenPtr);
 	CompileWord(envPtr, tokenPtr, interp, 2);
 	tokenPtr = TokenAfter(tokenPtr);
 	CompileWord(envPtr, tokenPtr, interp, 3);
-	if (replacementTokenPtr != NULL) {
-	    CompileWord(envPtr, replacementTokenPtr, interp, 4);
+	if (parsePtr->numWords == 5) {
+	    tokenPtr = TokenAfter(tokenPtr);
+	    CompileWord(envPtr, tokenPtr, interp, 4);
 	} else {
 	    PUSH(	"");
 	}
 	OP(		STR_REPLACE);
 	return TCL_OK;
-    }
 }
 
 int

generic/tclCompile.h

@@ -1121,7 +1121,8 @@ MODULE_SCOPE int	TclFixupForwardJump(CompileEnv *envPtr,
 			    int distThreshold);
 MODULE_SCOPE void	TclFreeCompileEnv(CompileEnv *envPtr);
 MODULE_SCOPE void	TclFreeJumpFixupArray(JumpFixupArray *fixupArrayPtr);
-MODULE_SCOPE int	TclGetIndexFromToken(Tcl_Token *tokenPtr, int *index);
+MODULE_SCOPE int	TclGetIndexFromToken(Tcl_Token *tokenPtr,
+			    int before, int after, int *indexPtr);
 MODULE_SCOPE void	TclInitByteCodeObj(Tcl_Obj *objPtr,
 			    CompileEnv *envPtr);
 MODULE_SCOPE void	TclInitCompileEnv(Tcl_Interp *interp,
@@ -1493,7 +1494,7 @@ MODULE_SCOPE int	TclPushProcCallFrame(ClientData clientData,
 #endif
 
 #define TclGetInt4AtPtr(p) \
-    (((int) TclGetInt1AtPtr(p) << 24) |				\
+    (((int) (TclGetUInt1AtPtr(p) << 24)) |				\
 		     (*((p)+1) << 16) |				\
 		     (*((p)+2) <<  8) |				\
 		     (*((p)+3)))
@@ -1684,12 +1685,6 @@ MODULE_SCOPE int	TclPushProcCallFrame(ClientData clientData,
 #define TCL_NO_LARGE_INDEX 1	/* Do not return localIndex value > 255 */
 #define TCL_NO_ELEMENT 2	/* Do not push the array element. */
 
-/*
- * Special value used by TclGetIndexFromToken to encoding the "end" index.
- */
-
-#define TCL_INDEX_END	(-2)
-
 /*
  * DTrace probe macros (NOPs if DTrace support is not enabled).
  */

generic/tclDate.c

@@ -1348,7 +1348,7 @@ yyparse (info)
 int yychar;
 
 /* The semantic value of the look-ahead symbol.  */
-YYSTYPE yylval;
+YYSTYPE yylval = {0};
 
 /* Number of syntax errors so far.  */
 int yynerrs;

generic/tclDictObj.c

@@ -153,7 +153,7 @@ typedef struct Dict {
  * must be assignable as well as readable.
  */
 
-#define DICT(dictObj)   (*((Dict **)&(dictObj)->internalRep.twoPtrValue.ptr1))
+#define DICT(dictObj)   ((dictObj)->internalRep.twoPtrValue.ptr1)
 
 /*
  * The structure below defines the dictionary object type by means of

generic/tclEncoding.c

@@ -2296,8 +2296,11 @@ UtfToUtfProc(
     const char *srcStart, *srcEnd, *srcClose;
     const char *dstStart, *dstEnd;
     int result, numChars, charLimit = INT_MAX;
-    Tcl_UniChar ch = 0;
+    Tcl_UniChar *chPtr = (Tcl_UniChar *) statePtr;
 
+    if (flags & TCL_ENCODING_START) {
+    	*statePtr = 0;
+    }
     result = TCL_OK;
 
     srcStart = src;
@@ -2349,12 +2352,19 @@ UtfToUtfProc(
 	     * incomplete char its bytes are made to represent themselves.
 	     */
 
-	    ch = (unsigned char) *src;
+	    *chPtr = (unsigned char) *src;
 	    src += 1;
-	    dst += Tcl_UniCharToUtf(ch, dst);
+	    dst += Tcl_UniCharToUtf(*chPtr, dst);
 	} else {
-	    src += TclUtfToUniChar(src, &ch);
-	    dst += Tcl_UniCharToUtf(ch, dst);
+	    int len = TclUtfToUniChar(src, chPtr);
+	    src += len;
+	    dst += Tcl_UniCharToUtf(*chPtr, dst);
+#if TCL_UTF_MAX == 4
+	    if (!len) {
+		src += TclUtfToUniChar(src, chPtr);
+		dst += Tcl_UniCharToUtf(*chPtr, dst);
+	    }
+#endif
 	}
     }
 
@@ -2410,8 +2420,11 @@ UnicodeToUtfProc(
     const char *srcStart, *srcEnd;
     const char *dstEnd, *dstStart;
     int result, numChars, charLimit = INT_MAX;
-    Tcl_UniChar ch = 0;
+    Tcl_UniChar *chPtr = (Tcl_UniChar *) statePtr;
 
+    if (flags & TCL_ENCODING_START) {
+    	*statePtr = 0;
+    }
     if (flags & TCL_ENCODING_CHAR_LIMIT) {
 	charLimit = *dstCharsPtr;
     }
@@ -2439,11 +2452,11 @@ UnicodeToUtfProc(
 	 * Tcl_UniChar-size data.
 	 */
 
-	ch = *(Tcl_UniChar *)src;
-	if (ch && ch < 0x80) {
-	    *dst++ = (ch & 0xFF);
+	*chPtr = *(Tcl_UniChar *)src;
+	if (*chPtr && *chPtr < 0x80) {
+	    *dst++ = (*chPtr & 0xFF);
 	} else {
-	    dst += Tcl_UniCharToUtf(ch, dst);
+	    dst += Tcl_UniCharToUtf(*chPtr, dst);
 	}
 	src += sizeof(Tcl_UniChar);
     }
@@ -2500,8 +2513,11 @@ UtfToUnicodeProc(
 {
     const char *srcStart, *srcEnd, *srcClose, *dstStart, *dstEnd;
     int result, numChars;
-    Tcl_UniChar ch = 0;
+    Tcl_UniChar *chPtr = (Tcl_UniChar *) statePtr;
 
+    if (flags & TCL_ENCODING_START) {
+    	*statePtr = 0;
+    }
     srcStart = src;
     srcEnd = src + srcLen;
     srcClose = srcEnd;
@@ -2527,7 +2543,7 @@ UtfToUnicodeProc(
 	    result = TCL_CONVERT_NOSPACE;
 	    break;
 	}
-	src += TclUtfToUniChar(src, &ch);
+	src += TclUtfToUniChar(src, chPtr);
 
 	/*
 	 * Need to handle this in a way that won't cause misalignment by
@@ -2536,23 +2552,23 @@ UtfToUnicodeProc(
 
 #ifdef WORDS_BIGENDIAN
 #if TCL_UTF_MAX > 4
-	*dst++ = (ch >> 24);
-	*dst++ = ((ch >> 16) & 0xFF);
-	*dst++ = ((ch >> 8) & 0xFF);
-	*dst++ = (ch & 0xFF);
+	*dst++ = (*chPtr >> 24);
+	*dst++ = ((*chPtr >> 16) & 0xFF);
+	*dst++ = ((*chPtr >> 8) & 0xFF);
+	*dst++ = (*chPtr & 0xFF);
 #else
-	*dst++ = (ch >> 8);
-	*dst++ = (ch & 0xFF);
+	*dst++ = (*chPtr >> 8);
+	*dst++ = (*chPtr & 0xFF);
 #endif
 #else
 #if TCL_UTF_MAX > 4
-	*dst++ = (ch & 0xFF);
-	*dst++ = ((ch >> 8) & 0xFF);
-	*dst++ = ((ch >> 16) & 0xFF);
-	*dst++ = (ch >> 24);
+	*dst++ = (*chPtr & 0xFF);
+	*dst++ = ((*chPtr >> 8) & 0xFF);
+	*dst++ = ((*chPtr >> 16) & 0xFF);
+	*dst++ = (*chPtr >> 24);
 #else
-	*dst++ = (ch & 0xFF);
-	*dst++ = (ch >> 8);
+	*dst++ = (*chPtr & 0xFF);
+	*dst++ = (*chPtr >> 8);
 #endif
 #endif
     }
@@ -2754,7 +2770,7 @@ TableFromUtfProc(
 	}
 	len = TclUtfToUniChar(src, &ch);
 
-#if TCL_UTF_MAX > 3
+#if TCL_UTF_MAX > 4
 	/*
 	 * This prevents a crash condition. More evaluation is required for
 	 * full support of int Tcl_UniChar. [Bug 1004065]
@@ -2763,6 +2779,10 @@ TableFromUtfProc(
 	if (ch & 0xffff0000) {
 	    word = 0;
 	} else
+#elif TCL_UTF_MAX == 4
+	if (!len) {
+	    word = 0;
+	} else
 #endif
 	    word = fromUnicode[(ch >> 8)][ch & 0xff];
 
@@ -2960,11 +2980,18 @@ Iso88591FromUtfProc(
 	 * Check for illegal characters.
 	 */
 
-	if (ch > 0xff) {
+	if (ch > 0xff
+#if TCL_UTF_MAX == 4
+		|| !len
+#endif
+		) {
 	    if (flags & TCL_ENCODING_STOPONERROR) {
 		result = TCL_CONVERT_UNKNOWN;
 		break;
 	    }
+#if TCL_UTF_MAX == 4
+	    if (!len) len = 4;
+#endif
 
 	    /*
 	     * Plunge on, using '?' as a fallback character.

generic/tclEnv.c

@@ -723,14 +723,25 @@ TclFinalizeEnvironment(void)
      * strings. This may leak more memory that strictly necessary, since some
      * of the strings may no longer be in the environment. However,
      * determining which ones are ok to delete is n-squared, and is pretty
-     * unlikely, so we don't bother.
+     * unlikely, so we don't bother.  However, in the case of DPURIFY, just
+     * free all strings in the cache.
      */
 
     if (env.cache) {
+#ifdef PURIFY
+	int i;
+	for (i = 0; i < env.cacheSize; i++) {
+	    ckfree(env.cache[i]);
+	}
+#endif
 	ckfree(env.cache);
 	env.cache = NULL;
 	env.cacheSize = 0;
 #ifndef USE_PUTENV
+	if ((env.ourEnviron != NULL)) {
+	    ckfree(env.ourEnviron);
+	    env.ourEnviron = NULL;
+	}
 	env.ourEnvironSize = 0;
 #endif
     }

generic/tclExecute.c

@@ -4169,7 +4169,8 @@ TEBCresume(
 	}
 	TRACE(("%s %u \"%.30s\" => ",
 		(flags ? "normal" : "noerr"), opnd, O2S(part2Ptr)));
-	if (TclIsVarArray(arrayPtr) && !UnsetTraced(arrayPtr)) {
+	if (TclIsVarArray(arrayPtr) && !UnsetTraced(arrayPtr)
+		&& !(arrayPtr->flags & VAR_SEARCH_ACTIVE)) {
 	    varPtr = VarHashFindVar(arrayPtr->value.tablePtr, part2Ptr);
 	    if (varPtr && TclIsVarDirectUnsettable(varPtr)) {
 		/*
@@ -4294,17 +4295,12 @@ TEBCresume(
 	varPtr = TclObjLookupVarEx(interp, part1Ptr, NULL, 0, NULL,
 		/*createPart1*/0, /*createPart2*/0, &arrayPtr);
     doArrayExists:
-	if (varPtr && (varPtr->flags & VAR_TRACED_ARRAY)
-		&& (TclIsVarArray(varPtr) || TclIsVarUndefined(varPtr))) {
-	    DECACHE_STACK_INFO();
-	    result = TclObjCallVarTraces(iPtr, arrayPtr, varPtr, part1Ptr,
-		    NULL, (TCL_LEAVE_ERR_MSG|TCL_NAMESPACE_ONLY|
-		    TCL_GLOBAL_ONLY|TCL_TRACE_ARRAY), 1, opnd);
-	    CACHE_STACK_INFO();
-	    if (result == TCL_ERROR) {
-		TRACE_ERROR(interp);
-		goto gotError;
-	    }
+	DECACHE_STACK_INFO();
+	result = TclCheckArrayTraces(interp, varPtr, arrayPtr, part1Ptr, opnd);
+	CACHE_STACK_INFO();
+	if (result == TCL_ERROR) {
+	    TRACE_ERROR(interp);
+	    goto gotError;
 	}
 	if (varPtr && TclIsVarArray(varPtr) && !TclIsVarUndefined(varPtr)) {
 	    objResultPtr = TCONST(1);
@@ -5089,16 +5085,9 @@ TEBCresume(
 	    goto gotError;
 	}
 
-	/*
-	 * Select the list item based on the index. Negative operand means
-	 * end-based indexing.
-	 */
+	/* Decode end-offset index values. */
 
-	if (opnd < -1) {
-	    index = opnd+1 + objc;
-	} else {
-	    index = opnd;
-	}
+	index = TclIndexDecode(opnd, objc - 1);
 	pcAdjustment = 5;
 
     lindexFastPath:
@@ -5246,60 +5235,64 @@ TEBCresume(
 	}
 #endif
 
-	/*
-	 * Adjust the indices for end-based handling.
-	 */
-
-	if (fromIdx < -1) {
-	    fromIdx += 1+objc;
-	    if (fromIdx < -1) {
-		fromIdx = -1;
-	    }
-	} else if (fromIdx > objc) {
-	    fromIdx = objc;
-	}
-	if (toIdx < -1) {
-	    toIdx += 1 + objc;
-	    if (toIdx < -1) {
-		toIdx = -1;
-	    }
-	} else if (toIdx > objc) {
-	    toIdx = objc;
+	/* Every range of an empty list is an empty list */
+	if (objc == 0) {
+	    TRACE_APPEND(("\n"));
+	    NEXT_INST_F(9, 0, 0);
 	}
 
-	/*
-	 * Check if we are referring to a valid, non-empty list range, and if
-	 * so, build the list of elements in that range.
+	/* Decode index value operands. */
+
+	/* 
+	assert ( toIdx != TCL_INDEX_AFTER);
+	 *
+	 * Extra safety for legacy bytecodes:
 	 */
+	if (toIdx == TCL_INDEX_AFTER) {
+	    toIdx = TCL_INDEX_END;
+	}
 
-	if (fromIdx<=toIdx && fromIdx<objc && toIdx>=0) {
-	    if (fromIdx < 0) {
-		fromIdx = 0;
-	    }
-	    if (toIdx >= objc) {
-		toIdx = objc-1;
-	    }
-	    if (fromIdx == 0 && toIdx != objc-1 && !Tcl_IsShared(valuePtr)) {
-		/*
-		 * BEWARE! This is looking inside the implementation of the
-		 * list type.
-		 */
+	if ((toIdx == TCL_INDEX_BEFORE) || (fromIdx == TCL_INDEX_AFTER)) {
+	    goto emptyList;
+	}
+	toIdx = TclIndexDecode(toIdx, objc - 1);
+	if (toIdx < 0) {
+	    goto emptyList;
+	} else if (toIdx >= objc) {
+	    toIdx = objc - 1;
+	}
 
-		List *listPtr = valuePtr->internalRep.twoPtrValue.ptr1;
+	assert ( toIdx >= 0 && toIdx < objc);
+	/*
+	assert ( fromIdx != TCL_INDEX_BEFORE );
+	 *
+	 * Extra safety for legacy bytecodes:
+	 */
+	if (fromIdx == TCL_INDEX_BEFORE) {
+	    fromIdx = TCL_INDEX_START;
+	}
 
-		if (listPtr->refCount == 1) {
-		    for (index=toIdx+1; index<objc ; index++) {
-			TclDecrRefCount(objv[index]);
-		    }
-		    listPtr->elemCount = toIdx+1;
-		    listPtr->canonicalFlag = 1;
-		    TclInvalidateStringRep(valuePtr);
-		    TRACE_APPEND(("%.30s\n", O2S(valuePtr)));
-		    NEXT_INST_F(9, 0, 0);
+	fromIdx = TclIndexDecode(fromIdx, objc - 1);
+	if (fromIdx < 0) {
+	    fromIdx = 0;
+	}
+
+	if (fromIdx <= toIdx) {
+	    /* Construct the subsquence list */
+	    /* unshared optimization */
+	    if (Tcl_IsShared(valuePtr)) {
+		objResultPtr = Tcl_NewListObj(toIdx-fromIdx+1, objv+fromIdx);
+	    } else {
+		if (toIdx != objc - 1) {
+		    Tcl_ListObjReplace(NULL, valuePtr, toIdx + 1, LIST_MAX,
+			    0, NULL);
 		}
+		Tcl_ListObjReplace(NULL, valuePtr, 0, fromIdx, 0, NULL);
+		TRACE_APPEND(("%.30s\n", O2S(valuePtr)));
+		NEXT_INST_F(9, 0, 0);
 	    }
-	    objResultPtr = Tcl_NewListObj(toIdx-fromIdx+1, objv+fromIdx);
 	} else {
+	emptyList:
 	    TclNewObj(objResultPtr);
 	}
 
@@ -5391,88 +5384,10 @@ TEBCresume(
 	value2Ptr = OBJ_AT_TOS;
 	valuePtr = OBJ_UNDER_TOS;
 
-	if (valuePtr == value2Ptr) {
-	    match = 0;
-	} else {
-	    /*
-	     * We only need to check (in)equality when we have equal length
-	     * strings.  We can use memcmp in all (n)eq cases because we
-	     * don't need to worry about lexical LE/BE variance.
-	     */
-
-	    typedef int (*memCmpFn_t)(const void*, const void*, size_t);
-	    memCmpFn_t memCmpFn;
+	{
 	    int checkEq = ((*pc == INST_EQ) || (*pc == INST_NEQ)
 		    || (*pc == INST_STR_EQ) || (*pc == INST_STR_NEQ));
-
-	    if (TclIsPureByteArray(valuePtr)
-		    && TclIsPureByteArray(value2Ptr)) {
-		s1 = (char *) Tcl_GetByteArrayFromObj(valuePtr, &s1len);
-		s2 = (char *) Tcl_GetByteArrayFromObj(value2Ptr, &s2len);
-		memCmpFn = memcmp;
-	    } else if ((valuePtr->typePtr == &tclStringType)
-		    && (value2Ptr->typePtr == &tclStringType)) {
-		/*
-		 * Do a unicode-specific comparison if both of the args are of
-		 * String type. If the char length == byte length, we can do a
-		 * memcmp. In benchmark testing this proved the most efficient
-		 * check between the unicode and string comparison operations.
-		 */
-
-		s1len = Tcl_GetCharLength(valuePtr);
-		s2len = Tcl_GetCharLength(value2Ptr);
-		if ((s1len == valuePtr->length)
-			&& (valuePtr->bytes != NULL)
-			&& (s2len == value2Ptr->length)
-			&& (value2Ptr->bytes != NULL)) {
-		    s1 = valuePtr->bytes;
-		    s2 = value2Ptr->bytes;
-		    memCmpFn = memcmp;
-		} else {
-		    s1 = (char *) Tcl_GetUnicode(valuePtr);
-		    s2 = (char *) Tcl_GetUnicode(value2Ptr);
-		    if (
-#ifdef WORDS_BIGENDIAN
-			1
-#else
-			checkEq
-#endif
-			) {
-			memCmpFn = memcmp;
-			s1len *= sizeof(Tcl_UniChar);
-			s2len *= sizeof(Tcl_UniChar);
-		    } else {
-			memCmpFn = (memCmpFn_t) Tcl_UniCharNcmp;
-		    }
-		}
-	    } else {
-		/*
-		 * strcmp can't do a simple memcmp in order to handle the
-		 * special Tcl \xC0\x80 null encoding for utf-8.
-		 */
-
-		s1 = TclGetStringFromObj(valuePtr, &s1len);
-		s2 = TclGetStringFromObj(value2Ptr, &s2len);
-		if (checkEq) {
-		    memCmpFn = memcmp;
-		} else {
-		    memCmpFn = (memCmpFn_t) TclpUtfNcmp2;
-		}
-	    }
-
-	    if (checkEq && (s1len != s2len)) {
-		match = 1;
-	    } else {
-		/*
-		 * The comparison function should compare up to the minimum
-		 * byte length only.
-		 */
-		match = memCmpFn(s1, s2,
-			(size_t) ((s1len < s2len) ? s1len : s2len));
-		if (match == 0) {
-		    match = s1len - s2len;
-		}
-	    }
+	    match = TclStringCmp(valuePtr, value2Ptr, checkEq, 0, -1);
 	}
 
 	/*
@@ -5645,31 +5560,58 @@ TEBCresume(
 	length = Tcl_GetCharLength(valuePtr);
 	TRACE(("\"%.20s\" %d %d => ", O2S(valuePtr), fromIdx, toIdx));
 
-	/*
-	 * Adjust indices for end-based indexing.
-	 */
-
-	if (fromIdx < -1) {
-	    fromIdx += 1 + length;
-	    if (fromIdx < 0) {
-		fromIdx = 0;
-	    }
-	} else if (fromIdx >= length) {
-	    fromIdx = length;
+	/* Every range of an empty value is an empty value */
+	if (length == 0) {
+	    TRACE_APPEND(("\n"));
+	    NEXT_INST_F(9, 0, 0);
 	}
-	if (toIdx < -1) {
-	    toIdx += 1 + length;
+
+	/* Decode index operands. */
+
+	/*
+	assert ( toIdx != TCL_INDEX_BEFORE );
+	assert ( toIdx != TCL_INDEX_AFTER);
+	 *
+	 * Extra safety for legacy bytecodes:
+	 */
+	if (toIdx == TCL_INDEX_BEFORE) {
+	    goto emptyRange;
+	}
+	if (toIdx == TCL_INDEX_AFTER) {
+	    toIdx = TCL_INDEX_END;
+	}
+
+	toIdx = TclIndexDecode(toIdx, length - 1);
+	if (toIdx < 0) {
+	    goto emptyRange;
 	} else if (toIdx >= length) {
 	    toIdx = length - 1;
 	}
 
+	assert ( toIdx >= 0 && toIdx < length );
+
 	/*
-	 * Check if we can do a sane substring.
+	assert ( fromIdx != TCL_INDEX_BEFORE );
+	assert ( fromIdx != TCL_INDEX_AFTER);
+	 *
+	 * Extra safety for legacy bytecodes:
 	 */
+	if (fromIdx == TCL_INDEX_BEFORE) {
+	    fromIdx = TCL_INDEX_START;
+	}
+	if (fromIdx == TCL_INDEX_AFTER) {
+	    goto emptyRange;
+	}
+
+	fromIdx = TclIndexDecode(fromIdx, length - 1);
+	if (fromIdx < 0) {
+	    fromIdx = 0;
+	}
 
 	if (fromIdx <= toIdx) {
 	    objResultPtr = Tcl_GetRange(valuePtr, fromIdx, toIdx);
 	} else {
+	emptyRange:
 	    TclNewObj(objResultPtr);
 	}
 	TRACE_APPEND(("%.30s\n", O2S(objResultPtr)));
@@ -5677,18 +5619,18 @@ TEBCresume(
 
     {
 	Tcl_UniChar *ustring1, *ustring2, *ustring3, *end, *p;
-	int length3;
+	int length3, endIdx;
 	Tcl_Obj *value3Ptr;
 
     case INST_STR_REPLACE:
 	value3Ptr = POP_OBJECT();
 	valuePtr = OBJ_AT_DEPTH(2);
-	length = Tcl_GetCharLength(valuePtr) - 1;
+	endIdx = Tcl_GetCharLength(valuePtr) - 1;
 	TRACE(("\"%.20s\" %s %s \"%.20s\" => ", O2S(valuePtr),
 		O2S(OBJ_UNDER_TOS), O2S(OBJ_AT_TOS), O2S(value3Ptr)));
-	if (TclGetIntForIndexM(interp, OBJ_UNDER_TOS, length,
+	if (TclGetIntForIndexM(interp, OBJ_UNDER_TOS, endIdx,
 		    &fromIdx) != TCL_OK
-	    || TclGetIntForIndexM(interp, OBJ_AT_TOS, length,
+	    || TclGetIntForIndexM(interp, OBJ_AT_TOS, endIdx,
 		    &toIdx) != TCL_OK) {
 	    TclDecrRefCount(value3Ptr);
 	    TRACE_ERROR(interp);
@@ -5698,21 +5640,24 @@ TEBCresume(
 	(void) POP_OBJECT();
 	TclDecrRefCount(OBJ_AT_TOS);
 	(void) POP_OBJECT();
-	if (fromIdx < 0) {
-	    fromIdx = 0;
-	}
 
-	if (fromIdx > toIdx || fromIdx > length) {
+	if ((toIdx < 0) ||
+		(fromIdx > endIdx) ||
+		(toIdx < fromIdx)) {
 	    TRACE_APPEND(("\"%.30s\"\n", O2S(valuePtr)));
 	    TclDecrRefCount(value3Ptr);
 	    NEXT_INST_F(1, 0, 0);
 	}
 
-	if (toIdx > length) {
-	    toIdx = length;
+	if (fromIdx < 0) {
+	    fromIdx = 0;
 	}
 
-	if (fromIdx == 0 && toIdx == length) {
+	if (toIdx > endIdx) {
+	    toIdx = endIdx;
+	}
+
+	if (fromIdx == 0 && toIdx == endIdx) {
 	    TclDecrRefCount(OBJ_AT_TOS);
 	    OBJ_AT_TOS = value3Ptr;
 	    TRACE_APPEND(("\"%.30s\"\n", O2S(value3Ptr)));
@@ -5995,12 +5940,7 @@ TEBCresume(
 	value2Ptr = OBJ_AT_TOS;		/* TrimSet */
 	string2 = TclGetStringFromObj(value2Ptr, &length2);
 	string1 = TclGetStringFromObj(valuePtr, &length);
-	trim1 = TclTrimLeft(string1, length, string2, length2);
-	if (trim1 < length) {
-	    trim2 = TclTrimRight(string1, length, string2, length2);
-	} else {
-	    trim2 = 0;
-	}
+	trim1 = TclTrim(string1, length, string2, length2, &trim2);
     createTrimmedString:
 	/*
 	 * Careful here; trim set often contains non-ASCII characters so we
@@ -6124,6 +6064,14 @@ TEBCresume(
 	value2Ptr = OBJ_AT_TOS;
 	valuePtr = OBJ_UNDER_TOS;
 
+	/*
+	    Try to determine, without triggering generation of a string
+	    representation, whether one value is not a number.
+	*/
+	if (TclCheckEmptyString(valuePtr) > 0 || TclCheckEmptyString(value2Ptr) > 0) {
+	    goto stringCompare;
+	}
+
 	if (GetNumberFromObj(NULL, valuePtr, &ptr1, &type1) != TCL_OK
 		|| GetNumberFromObj(NULL, value2Ptr, &ptr2, &type2) != TCL_OK) {
 	    /*

generic/tclFCmd.c

@@ -240,9 +240,13 @@ TclFileMakeDirsCmd(
 	    break;
 	}
 	for (j = 0; j < pobjc; j++) {
+	    int errCount = 2;
+
 	    target = Tcl_FSJoinPath(split, j + 1);
 	    Tcl_IncrRefCount(target);
 
+	createDir:
+
 	    /*
 	     * Call Tcl_FSStat() so that if target is a symlink that points to
 	     * a directory we will create subdirectories in that directory.
@@ -269,23 +273,25 @@ TclFileMakeDirsCmd(
 		 * subdirectory.
 		 */
 
-		if (errno != EEXIST) {
-		    errfile = target;
-		    goto done;
-		} else if ((Tcl_FSStat(target, &statBuf) == 0)
-			&& S_ISDIR(statBuf.st_mode)) {
-		    /*
-		     * It is a directory that wasn't there before, so keep
-		     * going without error.
-		     */
-
-		    Tcl_ResetResult(interp);
-		} else {
-		    errfile = target;
-		    goto done;
+		if (errno == EEXIST) {
+		    /* Be aware other workers could delete it immediately after
+		     * creation, so give this worker still one chance (repeat once),
+		     * see [270f78ca95] for description of the race-condition.
+		     * Don't repeat the create always (to avoid endless loop). */
+		    if (--errCount > 0) {
+			goto createDir;
+		    }
+		    /* Already tried, with delete in-between directly after
+		     * creation, so just continue (assume created successful). */
+		    goto nextPart;
 		}
+
+		/* return with error */
+		errfile = target;
+		goto done;
 	    }
 
+	nextPart:
 	    /*
 	     * Forget about this sub-path.
 	     */
@@ -363,14 +369,7 @@ TclFileDeleteCmd(
 	 */
 
 	if (Tcl_FSLstat(objv[i], &statBuf) != 0) {
-	    /*
-	     * Trying to delete a file that does not exist is not considered
-	     * an error, just a no-op
-	     */
-
-	    if (errno != ENOENT) {
-		result = TCL_ERROR;
-	    }
+	    result = TCL_ERROR;
 	} else if (S_ISDIR(statBuf.st_mode)) {
 	    /*
 	     * We own a reference count on errorBuffer, if it was set as a
@@ -406,13 +405,20 @@ TclFileDeleteCmd(
 	}
 
 	if (result != TCL_OK) {
-	    result = TCL_ERROR;
 
+	    /*
+	     * Avoid possible race condition (file/directory deleted after call
+	     * of lstat), so bypass ENOENT because not an error, just a no-op
+	     */
+	    if (errno == ENOENT) {
+		result = TCL_OK;
+		continue;
+	    }
 	    /*
 	     * It is important that we break on error, otherwise we might end
 	     * up owning reference counts on numerous errorBuffers.
 	     */
-
+	    result = TCL_ERROR;
 	    break;
 	}
     }

generic/tclIO.c

@@ -711,17 +711,18 @@ Tcl_SetStdChannel(
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
 
+    int init = channel ? 1 : -1;
     switch (type) {
     case TCL_STDIN:
-	tsdPtr->stdinInitialized = 1;
+	tsdPtr->stdinInitialized = init;
 	tsdPtr->stdinChannel = channel;
 	break;
     case TCL_STDOUT:
-	tsdPtr->stdoutInitialized = 1;
+	tsdPtr->stdoutInitialized = init;
 	tsdPtr->stdoutChannel = channel;
 	break;
     case TCL_STDERR:
-	tsdPtr->stderrInitialized = 1;
+	tsdPtr->stderrInitialized = init;
 	tsdPtr->stderrChannel = channel;
 	break;
     }
@@ -758,8 +759,8 @@ Tcl_GetStdChannel(
     switch (type) {
     case TCL_STDIN:
 	if (!tsdPtr->stdinInitialized) {
+	    tsdPtr->stdinInitialized = -1;
 	    tsdPtr->stdinChannel = TclpGetDefaultStdChannel(TCL_STDIN);
-	    tsdPtr->stdinInitialized = 1;
 
 	    /*
 	     * Artificially bump the refcount to ensure that the channel is
@@ -771,6 +772,7 @@ Tcl_GetStdChannel(
 	     */
 
 	    if (tsdPtr->stdinChannel != NULL) {
+		tsdPtr->stdinInitialized = 1;
 		Tcl_RegisterChannel(NULL, tsdPtr->stdinChannel);
 	    }
 	}
@@ -778,9 +780,10 @@ Tcl_GetStdChannel(
 	break;
     case TCL_STDOUT:
 	if (!tsdPtr->stdoutInitialized) {
+	    tsdPtr->stdoutInitialized = -1;
 	    tsdPtr->stdoutChannel = TclpGetDefaultStdChannel(TCL_STDOUT);
-	    tsdPtr->stdoutInitialized = 1;
 	    if (tsdPtr->stdoutChannel != NULL) {
+		tsdPtr->stdoutInitialized = 1;
 		Tcl_RegisterChannel(NULL, tsdPtr->stdoutChannel);
 	    }
 	}
@@ -788,9 +791,10 @@ Tcl_GetStdChannel(
 	break;
     case TCL_STDERR:
 	if (!tsdPtr->stderrInitialized) {
+	    tsdPtr->stderrInitialized = -1;
 	    tsdPtr->stderrChannel = TclpGetDefaultStdChannel(TCL_STDERR);
-	    tsdPtr->stderrInitialized = 1;
 	    if (tsdPtr->stderrChannel != NULL) {
+		tsdPtr->stderrInitialized = 1;
 		Tcl_RegisterChannel(NULL, tsdPtr->stderrChannel);
 	    }
 	}
@@ -1058,7 +1062,7 @@ CheckForStdChannelsBeingClosed(
     ChannelState *statePtr = ((Channel *) chan)->state;
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
 
-    if (tsdPtr->stdinInitialized
+    if (tsdPtr->stdinInitialized == 1
 	    && tsdPtr->stdinChannel != NULL
 	    && statePtr == ((Channel *)tsdPtr->stdinChannel)->state) {
 	if (statePtr->refCount < 2) {
@@ -1066,7 +1070,7 @@ CheckForStdChannelsBeingClosed(
 	    tsdPtr->stdinChannel = NULL;
 	    return;
 	}
-    } else if (tsdPtr->stdoutInitialized
+    } else if (tsdPtr->stdoutInitialized == 1
 	    && tsdPtr->stdoutChannel != NULL
 	    && statePtr == ((Channel *)tsdPtr->stdoutChannel)->state) {
 	if (statePtr->refCount < 2) {
@@ -1074,7 +1078,7 @@ CheckForStdChannelsBeingClosed(
 	    tsdPtr->stdoutChannel = NULL;
 	    return;
 	}
-    } else if (tsdPtr->stderrInitialized
+    } else if (tsdPtr->stderrInitialized == 1
 	    && tsdPtr->stderrChannel != NULL
 	    && statePtr == ((Channel *)tsdPtr->stderrChannel)->state) {
 	if (statePtr->refCount < 2) {

generic/tclIOUtil.c

@@ -139,7 +139,6 @@ Tcl_FSRenameFileProc		TclpObjRenameFile;
 Tcl_FSCreateDirectoryProc	TclpObjCreateDirectory;
 Tcl_FSCopyDirectoryProc		TclpObjCopyDirectory;
 Tcl_FSRemoveDirectoryProc	TclpObjRemoveDirectory;
-Tcl_FSUnloadFileProc		TclpUnloadFile;
 Tcl_FSLinkProc			TclpObjLink;
 Tcl_FSListVolumesProc		TclpObjListVolumes;
 
@@ -3159,8 +3158,8 @@ Tcl_FSLoadFile(
  * present and set to true (any integer > 0) then the unlink is skipped.
  */
 
-int
-TclSkipUnlink (Tcl_Obj* shlibFile)
+static int
+skipUnlink (Tcl_Obj* shlibFile)
 {
     /* Order of testing:
      * 1. On hpux we generally want to skip unlink in general
@@ -3414,7 +3413,7 @@ Tcl_LoadFile(
      */
 
     if (
-	!TclSkipUnlink (copyToPtr) &&
+	!skipUnlink (copyToPtr) &&
 	(Tcl_FSDeleteFile(copyToPtr) == TCL_OK)) {
 	Tcl_DecrRefCount(copyToPtr);
 
@@ -3683,30 +3682,10 @@ Tcl_FSUnloadFile(
 	}
 	return TCL_ERROR;
     }
-    TclpUnloadFile(handle);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpUnloadFile --
- *
- *	Unloads a library given its handle
- *
- * This function was once filesystem-specific, but has been made portable by
- * having TclpDlopen return a structure that includes procedure pointers.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpUnloadFile(
-    Tcl_LoadHandle handle)
-{
     if (handle->unloadFileProcPtr != NULL) {
 	handle->unloadFileProcPtr(handle);
     }
+    return TCL_OK;
 }
 
 /*

generic/tclInt.decls

@@ -1088,7 +1088,7 @@ declare 9 win {
 }
 # new for 8.4.20+/8.5.12+ Cygwin only
 declare 10 win {
-    Tcl_DirEntry *TclpReaddir(DIR *dir)
+    Tcl_DirEntry *TclpReaddir(TclDIR *dir)
 }
 # Removed in 8.3.1 (for Win32s only)
 #declare 10 win {
@@ -1226,7 +1226,7 @@ declare 9 unix {
 # Added in 8.4:
 
 declare 10 unix {
-    Tcl_DirEntry *TclpReaddir(DIR *dir)
+    Tcl_DirEntry *TclpReaddir(TclDIR *dir)
 }
 # Slots 11 and 12 are forwarders for functions that were promoted to
 # generic Stubs

generic/tclInt.h

@@ -2735,6 +2735,10 @@ MODULE_SCOPE long	tclObjsShared[TCL_MAX_SHARED_OBJ_STATS];
 MODULE_SCOPE char *	tclEmptyStringRep;
 MODULE_SCOPE char	tclEmptyString;
 
+enum CheckEmptyStringResult {
+	TCL_EMPTYSTRING_UNKNOWN = -1, TCL_EMPTYSTRING_NO, TCL_EMPTYSTRING_YES
+};
+
 /*
  *----------------------------------------------------------------
  * Procedures shared among Tcl modules but not used by the outside world,
@@ -2864,8 +2868,6 @@ MODULE_SCOPE void	TclArgumentBCRelease(Tcl_Interp *interp,
 			    CmdFrame *cfPtr);
 MODULE_SCOPE void	TclArgumentGet(Tcl_Interp *interp, Tcl_Obj *obj,
 			    CmdFrame **cfPtrPtr, int *wordPtr);
-MODULE_SCOPE int	TclArraySet(Tcl_Interp *interp,
-			    Tcl_Obj *arrayNameObj, Tcl_Obj *arrayElemObj);
 MODULE_SCOPE double	TclBignumToDouble(const mp_int *bignum);
 MODULE_SCOPE int	TclByteArrayMatch(const unsigned char *string,
 			    int strLen, const unsigned char *pattern,
@@ -2873,8 +2875,11 @@ MODULE_SCOPE int	TclByteArrayMatch(const unsigned char *string,
 MODULE_SCOPE double	TclCeil(const mp_int *a);
 MODULE_SCOPE void	TclChannelPreserve(Tcl_Channel chan);
 MODULE_SCOPE void	TclChannelRelease(Tcl_Channel chan);
+MODULE_SCOPE int	TclCheckArrayTraces(Tcl_Interp *interp, Var *varPtr,
+			    Var *arrayPtr, Tcl_Obj *name, int index);
 MODULE_SCOPE int	TclCheckBadOctal(Tcl_Interp *interp,
 			    const char *value);
+MODULE_SCOPE int	TclCheckEmptyString(Tcl_Obj *objPtr);
 MODULE_SCOPE int	TclChanCaughtErrorBypass(Tcl_Interp *interp,
 			    Tcl_Channel chan);
 MODULE_SCOPE Tcl_ObjCmdProc TclChannelNamesCmd;
@@ -2929,7 +2934,7 @@ MODULE_SCOPE char *	TclDStringAppendDString(Tcl_DString *dsPtr,
 MODULE_SCOPE Tcl_Obj *	TclDStringToObj(Tcl_DString *dsPtr);
 MODULE_SCOPE Tcl_Obj *const *	TclFetchEnsembleRoot(Tcl_Interp *interp,
 			    Tcl_Obj *const *objv, int objc, int *objcPtr);
-Tcl_Namespace * 	TclEnsureNamespace(
+MODULE_SCOPE Tcl_Namespace * 	TclEnsureNamespace(
 			    Tcl_Interp *interp,
 			    Tcl_Namespace *namespacePtr);
 
@@ -3150,6 +3155,12 @@ MODULE_SCOPE void	TclSpellFix(Tcl_Interp *interp,
 			    Tcl_Obj *bad, Tcl_Obj *fix);
 MODULE_SCOPE void *	TclStackRealloc(Tcl_Interp *interp, void *ptr,
 			    int numBytes);
+
+typedef int (*memCmpFn_t)(const void*, const void*, size_t);
+MODULE_SCOPE int	TclStringCmp (Tcl_Obj *value1Ptr, Tcl_Obj *value2Ptr,
+			    int checkEq, int nocase, int reqlength);
+MODULE_SCOPE int	TclStringCmpOpts (Tcl_Interp *interp, int objc, Tcl_Obj *const objv[],
+			    int *nocase, int *reqlength);
 MODULE_SCOPE int	TclStringMatch(const char *str, int strLen,
 			    const char *pattern, int ptnLen, int flags);
 MODULE_SCOPE int	TclStringMatchObj(Tcl_Obj *stringObj,
@@ -3166,6 +3177,8 @@ MODULE_SCOPE void	TclSubstParse(Tcl_Interp *interp, const char *bytes,
 MODULE_SCOPE int	TclSubstTokens(Tcl_Interp *interp, Tcl_Token *tokenPtr,
 			    int count, int *tokensLeftPtr, int line,
 			    int *clNextOuter, const char *outerScript);
+MODULE_SCOPE int	TclTrim(const char *bytes, int numBytes,
+			    const char *trim, int numTrim, int *trimRight);
 MODULE_SCOPE int	TclTrimLeft(const char *bytes, int numBytes,
 			    const char *trim, int numTrim);
 MODULE_SCOPE int	TclTrimRight(const char *bytes, int numBytes,
@@ -4010,6 +4023,21 @@ MODULE_SCOPE unsigned	TclHashObjKey(Tcl_HashTable *tablePtr, void *keyPtr);
 
 MODULE_SCOPE int	TclFullFinalizationRequested(void);
 
+/*
+ * Utility routines for encoding index values as integers. Used by both
+ * some of the command compilers and by [lsort] and [lsearch].
+ */
+
+MODULE_SCOPE int	TclIndexEncode(Tcl_Interp *interp, Tcl_Obj *objPtr,
+			    int before, int after, int *indexPtr);
+MODULE_SCOPE int	TclIndexDecode(int encoded, int endValue);
+
+/* Constants used in index value encoding routines. */
+#define TCL_INDEX_END           (-2)
+#define TCL_INDEX_BEFORE        (-1)
+#define TCL_INDEX_START         (0)
+#define TCL_INDEX_AFTER         (INT_MAX)
+
 /*
  *----------------------------------------------------------------
  * Macros used by the Tcl core to create and release Tcl objects.
@@ -4438,6 +4466,11 @@ MODULE_SCOPE void	TclDbInitNewObj(Tcl_Obj *objPtr, const char *file,
 
 #define TclIsPureByteArray(objPtr) \
 	(((objPtr)->typePtr==&tclByteArrayType) && ((objPtr)->bytes==NULL))
+#define TclIsPureDict(objPtr) \
+	(((objPtr)->bytes==NULL) && ((objPtr)->typePtr==&tclDictType))
+
+#define TclIsPureList(objPtr) \
+	(((objPtr)->bytes==NULL) && ((objPtr)->typePtr==&tclListType))
 
 /*
  *----------------------------------------------------------------

generic/tclIntPlatDecls.h

@@ -13,11 +13,6 @@
 #ifndef _TCLINTPLATDECLS
 #define _TCLINTPLATDECLS
 
-#ifdef _WIN32
-#   define Tcl_DirEntry void
-#   define DIR void
-#endif
-
 #undef TCL_STORAGE_CLASS
 #ifdef BUILD_tcl
 #   define TCL_STORAGE_CLASS DLLEXPORT
@@ -72,7 +67,7 @@ EXTERN int		TclUnixWaitForFile(int fd, int mask, int timeout);
 /* 9 */
 EXTERN TclFile		TclpCreateTempFile(const char *contents);
 /* 10 */
-EXTERN Tcl_DirEntry *	TclpReaddir(DIR *dir);
+EXTERN Tcl_DirEntry *	TclpReaddir(TclDIR *dir);
 /* 11 */
 EXTERN struct tm *	TclpLocaltime_unix(const time_t *clock);
 /* 12 */
@@ -129,7 +124,7 @@ EXTERN int		TclpGetPid(Tcl_Pid pid);
 /* 9 */
 EXTERN int		TclWinGetPlatformId(void);
 /* 10 */
-EXTERN Tcl_DirEntry *	TclpReaddir(DIR *dir);
+EXTERN Tcl_DirEntry *	TclpReaddir(TclDIR *dir);
 /* 11 */
 EXTERN void		TclGetAndDetachPids(Tcl_Interp *interp,
 				Tcl_Channel chan);
@@ -206,7 +201,7 @@ EXTERN int		TclUnixWaitForFile(int fd, int mask, int timeout);
 /* 9 */
 EXTERN TclFile		TclpCreateTempFile(const char *contents);
 /* 10 */
-EXTERN Tcl_DirEntry *	TclpReaddir(DIR *dir);
+EXTERN Tcl_DirEntry *	TclpReaddir(TclDIR *dir);
 /* 11 */
 EXTERN struct tm *	TclpLocaltime_unix(const time_t *clock);
 /* 12 */
@@ -269,7 +264,7 @@ typedef struct TclIntPlatStubs {
     TclFile (*tclpOpenFile) (const char *fname, int mode); /* 7 */
     int (*tclUnixWaitForFile) (int fd, int mask, int timeout); /* 8 */
     TclFile (*tclpCreateTempFile) (const char *contents); /* 9 */
-    Tcl_DirEntry * (*tclpReaddir) (DIR *dir); /* 10 */
+    Tcl_DirEntry * (*tclpReaddir) (TclDIR *dir); /* 10 */
     struct tm * (*tclpLocaltime_unix) (const time_t *clock); /* 11 */
     struct tm * (*tclpGmtime_unix) (const time_t *clock); /* 12 */
     char * (*tclpInetNtoa) (struct in_addr addr); /* 13 */
@@ -302,7 +297,7 @@ typedef struct TclIntPlatStubs {
     int (*tclWinSetSockOpt) (SOCKET s, int level, int optname, const char *optval, int optlen); /* 7 */
     int (*tclpGetPid) (Tcl_Pid pid); /* 8 */
     int (*tclWinGetPlatformId) (void); /* 9 */
-    Tcl_DirEntry * (*tclpReaddir) (DIR *dir); /* 10 */
+    Tcl_DirEntry * (*tclpReaddir) (TclDIR *dir); /* 10 */
     void (*tclGetAndDetachPids) (Tcl_Interp *interp, Tcl_Channel chan); /* 11 */
     int (*tclpCloseFile) (TclFile file); /* 12 */
     Tcl_Channel (*tclpCreateCommandChannel) (TclFile readFile, TclFile writeFile, TclFile errorFile, int numPids, Tcl_Pid *pidPtr); /* 13 */
@@ -335,7 +330,7 @@ typedef struct TclIntPlatStubs {
     TclFile (*tclpOpenFile) (const char *fname, int mode); /* 7 */
     int (*tclUnixWaitForFile) (int fd, int mask, int timeout); /* 8 */
     TclFile (*tclpCreateTempFile) (const char *contents); /* 9 */
-    Tcl_DirEntry * (*tclpReaddir) (DIR *dir); /* 10 */
+    Tcl_DirEntry * (*tclpReaddir) (TclDIR *dir); /* 10 */
     struct tm * (*tclpLocaltime_unix) (const time_t *clock); /* 11 */
     struct tm * (*tclpGmtime_unix) (const time_t *clock); /* 12 */
     char * (*tclpInetNtoa) (struct in_addr addr); /* 13 */

generic/tclListObj.c

@@ -1145,17 +1145,11 @@ TclLindexList(
 	return TclLindexFlat(interp, listPtr, 1, &argPtr);
     }
 
-    if (indexListCopy->typePtr == &tclListType) {
-	List *listRepPtr = ListRepPtr(indexListCopy);
+    {
+	int indexCount = -1;		/* Size of the array of list indices. */
+	Tcl_Obj **indices = NULL; 	/* Array of list indices. */
 
-	listPtr = TclLindexFlat(interp, listPtr, listRepPtr->elemCount,
-		&listRepPtr->elements);
-    } else {
-	int indexCount = -1;	/* Size of the array of list indices. */
-	Tcl_Obj **indices = NULL;
-				/* Array of list indices. */
-
-	Tcl_ListObjGetElements(NULL, indexListCopy, &indexCount, &indices);
+	TclListObjGetElements(NULL, indexListCopy, &indexCount, &indices);
 	listPtr = TclLindexFlat(interp, listPtr, indexCount, indices);
     }
     Tcl_DecrRefCount(indexListCopy);

generic/tclOO.c

@@ -56,7 +56,6 @@ static const struct {
  * Function declarations for things defined in this file.
  */
 
-static Class *		AllocClass(Tcl_Interp *interp, Object *useThisObj);
 static Object *		AllocObject(Tcl_Interp *interp, const char *nameStr,
 			    Namespace *nsPtr, const char *nsNameStr);
 static int		CloneClassMethod(Tcl_Interp *interp, Class *clsPtr,
@@ -79,8 +78,6 @@ static void		ObjectNamespaceDeleted(ClientData clientData);
 static void		ObjectRenamedTrace(ClientData clientData,
 			    Tcl_Interp *interp, const char *oldName,
 			    const char *newName, int flags);
-static void		ReleaseClassContents(Tcl_Interp *interp,Object *oPtr);
-static void		DeleteDescendants(Tcl_Interp *interp,Object *oPtr);
 static inline void	SquelchCachedName(Object *oPtr);
 
 static int		PublicObjectCmd(ClientData clientData,
@@ -392,40 +389,51 @@ InitFoundation(
 
     /* Stand up a phony class for bootstrapping. */
     fPtr->objectCls = &fakeCls;
-    /* referenced in AllocClass to increment the refCount. */
+    /* referenced in TclOOAllocClass to increment the refCount. */
     fakeCls.thisPtr = &fakeObject;
 
-    fPtr->objectCls = AllocClass(interp,
+    fPtr->objectCls = TclOOAllocClass(interp,
 	    AllocObject(interp, "object", (Namespace *)fPtr->ooNs, NULL));
-    fPtr->classCls = AllocClass(interp,
-	    AllocObject(interp, "class", (Namespace *)fPtr->ooNs, NULL));
-
-    /* Rewire bootstrapped objects. */
-    fPtr->objectCls->thisPtr->selfCls = fPtr->classCls;
-    fPtr->classCls->thisPtr->selfCls = fPtr->classCls;
-
+    /* Corresponding TclOODecrRefCount in KillFoudation */
     AddRef(fPtr->objectCls->thisPtr);
-    AddRef(fPtr->classCls->thisPtr);
-    AddRef(fPtr->classCls->thisPtr->selfCls->thisPtr);
-    AddRef(fPtr->objectCls->thisPtr->selfCls->thisPtr);
 
-    /* special initialization for the primordial objects */
-    fPtr->objectCls->thisPtr->flags |= ROOT_OBJECT;
-    fPtr->objectCls->flags |= ROOT_OBJECT;
-
-    /* This is why it is unnecessary in this routine to make up for the
-     * incremented reference count of fPtr->objectCls that was sallwed by
+    /* This is why it is unnecessary in this routine to replace the
+     * incremented reference count of fPtr->objectCls that was swallowed by
      * fakeObject. */
     fPtr->objectCls->superclasses.num = 0;
     ckfree(fPtr->objectCls->superclasses.list);
     fPtr->objectCls->superclasses.list = NULL;
 
+    /* special initialization for the primordial objects */
+    fPtr->objectCls->thisPtr->flags |= ROOT_OBJECT;
+    fPtr->objectCls->flags |= ROOT_OBJECT;
+
+    fPtr->classCls = TclOOAllocClass(interp,
+	    AllocObject(interp, "class", (Namespace *)fPtr->ooNs, NULL));
+    /* Corresponding TclOODecrRefCount in KillFoudation */
+    AddRef(fPtr->classCls->thisPtr);
+
+    /*
+     * Increment reference counts for each reference because these
+     * relationships can be dynamically changed.
+     *
+     * Corresponding TclOODecrRefCount for all incremented refcounts is in
+     * KillFoundation.
+     */
+
+    /* Rewire bootstrapped objects. */
+    fPtr->objectCls->thisPtr->selfCls = fPtr->classCls;
+    AddRef(fPtr->classCls->thisPtr);
+    TclOOAddToInstances(fPtr->objectCls->thisPtr, fPtr->classCls);
+
+    fPtr->classCls->thisPtr->selfCls = fPtr->classCls;
+    AddRef(fPtr->classCls->thisPtr);
+    TclOOAddToInstances(fPtr->classCls->thisPtr, fPtr->classCls);
+
     fPtr->classCls->thisPtr->flags |= ROOT_CLASS;
     fPtr->classCls->flags |= ROOT_CLASS;
 
     /* Standard initialization for new Objects */
-    TclOOAddToInstances(fPtr->objectCls->thisPtr, fPtr->classCls);
-    TclOOAddToInstances(fPtr->classCls->thisPtr, fPtr->classCls);
     TclOOAddToSubclasses(fPtr->classCls, fPtr->objectCls);
 
     /*
@@ -557,6 +565,9 @@ KillFoundation(
     TclDecrRefCount(fPtr->destructorName);
     TclDecrRefCount(fPtr->clonedName);
     TclDecrRefCount(fPtr->defineName);
+    TclOODecrRefCount(fPtr->objectCls->thisPtr);
+    TclOODecrRefCount(fPtr->classCls->thisPtr);
+
     ckfree(fPtr);
 }
 
@@ -640,12 +651,16 @@ AllocObject(
 	Tcl_ResetResult(interp);
     }
 
+
+  configNamespace:
+
+    ((Namespace *)oPtr->namespacePtr)->refCount++;
+
     /*
      * Make the namespace know about the helper commands. This grants access
      * to the [self] and [next] commands.
      */
 
-  configNamespace:
     if (fPtr->helpersNs != NULL) {
 	TclSetNsPath((Namespace *) oPtr->namespacePtr, 1, &fPtr->helpersNs);
     }
@@ -811,7 +826,91 @@ ObjectRenamedTrace(
 /*
  * ----------------------------------------------------------------------
  *
- * ReleaseClassContents --
+ * TclOODeleteDescendants --
+ *
+ *	Delete all descendants of a particular class.
+ *
+ * ----------------------------------------------------------------------
+ */
+
+void
+TclOODeleteDescendants(
+    Tcl_Interp *interp,		/* The interpreter containing the class. */
+    Object *oPtr)		/* The object representing the class. */
+{
+    Class *clsPtr = oPtr->classPtr, *subclassPtr, *mixinSubclassPtr;
+    Object *instancePtr;
+
+    /*
+     * Squelch classes that this class has been mixed into.
+     */
+
+    if (clsPtr->mixinSubs.num > 0) {
+	while (clsPtr->mixinSubs.num > 0) {
+	    mixinSubclassPtr = clsPtr->mixinSubs.list[clsPtr->mixinSubs.num-1];
+	    /* This condition also covers the case where mixinSubclassPtr ==
+	     * clsPtr
+	     */
+	    if (!Deleted(mixinSubclassPtr->thisPtr)
+		    && !(mixinSubclassPtr->thisPtr->flags & DONT_DELETE)) {
+		Tcl_DeleteCommandFromToken(interp,
+			mixinSubclassPtr->thisPtr->command);
+	    }
+	    TclOORemoveFromMixinSubs(mixinSubclassPtr, clsPtr);
+	}
+    }
+    if (clsPtr->mixinSubs.size > 0) {
+	ckfree(clsPtr->mixinSubs.list);
+	clsPtr->mixinSubs.size = 0;
+    }
+    /*
+     * Squelch subclasses of this class.
+     */
+
+    if (clsPtr->subclasses.num > 0) {
+	while (clsPtr->subclasses.num > 0) {
+	    subclassPtr = clsPtr->subclasses.list[clsPtr->subclasses.num-1];
+	    if (!Deleted(subclassPtr->thisPtr) && !IsRoot(subclassPtr)
+		    && !(subclassPtr->thisPtr->flags & DONT_DELETE)) {
+		Tcl_DeleteCommandFromToken(interp,
+			subclassPtr->thisPtr->command);
+	    }
+	    TclOORemoveFromSubclasses(subclassPtr, clsPtr);
+	}
+    }
+    if (clsPtr->subclasses.size > 0) {
+	ckfree(clsPtr->subclasses.list);
+	clsPtr->subclasses.list = NULL;
+	clsPtr->subclasses.size = 0;
+    }
+
+    /*
+     * Squelch instances of this class (includes objects we're mixed into).
+     */
+
+    if (clsPtr->instances.num > 0) {
+	while (clsPtr->instances.num > 0) {
+	    instancePtr = clsPtr->instances.list[clsPtr->instances.num-1];
+	    /* This condition also covers the case where instancePtr == oPtr */
+	    if (!Deleted(instancePtr) && !IsRoot(instancePtr) &&
+		    !(instancePtr->flags & DONT_DELETE)) {
+		Tcl_DeleteCommandFromToken(interp, instancePtr->command);
+	    }
+	    TclOORemoveFromInstances(instancePtr, clsPtr);
+	}
+    }
+    if (clsPtr->instances.size > 0) {
+	ckfree(clsPtr->instances.list);
+	clsPtr->instances.list = NULL;
+	clsPtr->instances.size = 0;
+    }
+}
+	
+
+/*
+ * ----------------------------------------------------------------------
+ *
+ * TclOOReleaseClassContents --
  *
  *	Tear down the special class data structure, including deleting all
  *	dependent classes and objects.
@@ -819,60 +918,8 @@ ObjectRenamedTrace(
  * ----------------------------------------------------------------------
  */
 
-static void
-DeleteDescendants(
-    Tcl_Interp *interp,		/* The interpreter containing the class. */
-    Object *oPtr)		/* The object representing the class. */
-{
-    Class *clsPtr = oPtr->classPtr, *subclassPtr, *mixinSubclassPtr;
-    Object *instancePtr;
-    int i;
-
-    /*
-     * Squelch classes that this class has been mixed into.
-     */
-
-    FOREACH(mixinSubclassPtr, clsPtr->mixinSubs) {
-	/* This condition also covers the case where mixinSubclassPtr ==
-	 * clsPtr
-	 */
-	if (!Deleted(mixinSubclassPtr->thisPtr)) {
-	    Tcl_DeleteCommandFromToken(interp,
-		    mixinSubclassPtr->thisPtr->command);
-	}
-	i -= TclOORemoveFromMixinSubs(mixinSubclassPtr, clsPtr);
-	TclOODecrRefCount(mixinSubclassPtr->thisPtr);
-    }
-    /*
-     * Squelch subclasses of this class.
-     */
-
-    FOREACH(subclassPtr, clsPtr->subclasses) {
-	if (!Deleted(subclassPtr->thisPtr) && !IsRoot(subclassPtr)) {
-	    Tcl_DeleteCommandFromToken(interp, subclassPtr->thisPtr->command);
-	}
-	i -= TclOORemoveFromSubclasses(subclassPtr, clsPtr);
-	TclOODecrRefCount(subclassPtr->thisPtr);
-    }
-
-    /*
-     * Squelch instances of this class (includes objects we're mixed into).
-     */
-
-    if (!IsRootClass(oPtr)) {
-	FOREACH(instancePtr, clsPtr->instances) {
-	    /* This condition also covers the case where instancePtr == oPtr */
-	    if (!Deleted(instancePtr) && !IsRoot(instancePtr)) {
-		Tcl_DeleteCommandFromToken(interp, instancePtr->command);
-	    }
-	    i -= TclOORemoveFromInstances(instancePtr, clsPtr);
-	}
-    }
-}
-	
-
-static void
-ReleaseClassContents(
+void
+TclOOReleaseClassContents(
     Tcl_Interp *interp,		/* The interpreter containing the class. */
     Object *oPtr)		/* The object representing the class. */
 {
@@ -894,9 +941,6 @@ ReleaseClassContents(
 	} else if (IsRootObject(oPtr)) {
 	    Tcl_Panic("deleting class structure for non-deleted %s",
 		    "::oo::object");
-	} else {
-	    Tcl_Panic("deleting class structure for non-deleted %s",
-		    "general object");
 	}
     }
 
@@ -934,6 +978,7 @@ ReleaseClassContents(
 	    TclDecrRefCount(filterObj);
 	}
 	ckfree(clsPtr->filters.list);
+	clsPtr->filters.list = NULL;
 	clsPtr->filters.num = 0;
     }
 
@@ -953,11 +998,24 @@ ReleaseClassContents(
 	clsPtr->metadataPtr = NULL;
     }
 
-    FOREACH(tmpClsPtr, clsPtr->mixins) {
-	TclOORemoveFromMixinSubs(clsPtr, tmpClsPtr);
+    if (clsPtr->mixins.num) {
+	FOREACH(tmpClsPtr, clsPtr->mixins) {
+	    TclOORemoveFromMixinSubs(clsPtr, tmpClsPtr);
+	    TclOODecrRefCount(tmpClsPtr->thisPtr);
+	}
+	ckfree(clsPtr->mixins.list);
+	clsPtr->mixins.list = NULL;
+	clsPtr->mixins.num = 0;
     }
-    FOREACH(tmpClsPtr, clsPtr->superclasses) {
-	TclOORemoveFromSubclasses(clsPtr, tmpClsPtr);
+
+    if (clsPtr->superclasses.num > 0) {
+	FOREACH(tmpClsPtr, clsPtr->superclasses) {
+	    TclOORemoveFromSubclasses(clsPtr, tmpClsPtr);
+	    TclOODecrRefCount(tmpClsPtr->thisPtr);
+	}
+	ckfree(clsPtr->superclasses.list);
+	clsPtr->superclasses.num = 0;
+	clsPtr->superclasses.list = NULL;
     }
 
     FOREACH_HASH_VALUE(mPtr, &clsPtr->classMethods) {
@@ -977,6 +1035,7 @@ ReleaseClassContents(
     if (IsRootClass(oPtr) && !Deleted(fPtr->objectCls->thisPtr)) {
 	Tcl_DeleteCommandFromToken(interp, fPtr->objectCls->thisPtr->command);
     }
+    oPtr->classPtr = NULL;
 }
 
 /*
@@ -1022,7 +1081,7 @@ ObjectNamespaceDeleted(
 
     /* Let the dominoes fall */
     if (oPtr->classPtr) {
-	DeleteDescendants(interp, oPtr);
+	TclOODeleteDescendants(interp, oPtr);
     }
 
     /*
@@ -1085,10 +1144,11 @@ ObjectNamespaceDeleted(
     /* To do: Should this be protected with a * !IsRoot() condition?  */ 
     TclOORemoveFromInstances(oPtr, oPtr->selfCls);
 
-    FOREACH(mixinPtr, oPtr->mixins) {
-	i -= TclOORemoveFromInstances(oPtr, mixinPtr);
-    }
-    if (i) {
+    if (oPtr->mixins.num > 0) {
+	FOREACH(mixinPtr, oPtr->mixins) {
+	    TclOORemoveFromInstances(oPtr, mixinPtr);
+	    TclOODecrRefCount(mixinPtr->thisPtr);
+	}
 	ckfree(oPtr->mixins.list);
     }
 
@@ -1133,34 +1193,34 @@ ObjectNamespaceDeleted(
     }
 
     /*
-     *  Because an object can be a class that is an instance of itself, the
-     *  A class object's class structure should only be cleaned after most of
-     *  the cleanup on the object is done. 
-     */
-
-
-    /*
+     * Because an object can be a class that is an instance of itself, the
+     * class object's class structure should only be cleaned after most of
+     * the cleanup on the object is done. 
+     *
      * The class of objects needs some special care; if it is deleted (and
      * we're not killing the whole interpreter) we force the delete of the
      * class of classes now as well. Due to the incestuous nature of those two
      * classes, if one goes the other must too and yet the tangle can
      * sometimes not go away automatically; we force it here. [Bug 2962664]
      */
+
     if (IsRootObject(oPtr) && !Deleted(fPtr->classCls->thisPtr)
-	&& !Tcl_InterpDeleted(interp)) {
+	    && !Tcl_InterpDeleted(interp)) {
 
 	Tcl_DeleteCommandFromToken(interp, fPtr->classCls->thisPtr->command);
     }
 
     if (oPtr->classPtr != NULL) {
-	ReleaseClassContents(interp, oPtr);
+	TclOOReleaseClassContents(interp, oPtr);
     }
 
     /*
      * Delete the object structure itself.
      */
 
+    TclNsDecrRefCount((Namespace *)oPtr->namespacePtr);
     oPtr->namespacePtr = NULL;
+    TclOODecrRefCount(oPtr->selfCls->thisPtr);
     oPtr->selfCls = NULL;
     TclOODecrRefCount(oPtr);
     return;
@@ -1179,13 +1239,7 @@ ObjectNamespaceDeleted(
  */
 int TclOODecrRefCount(Object *oPtr) {
     if (oPtr->refCount-- <= 1) {
-	Class *clsPtr = oPtr->classPtr;
 	if (oPtr->classPtr != NULL) {
-	    ckfree(clsPtr->superclasses.list);
-	    ckfree(clsPtr->subclasses.list);
-	    ckfree(clsPtr->instances.list);
-	    ckfree(clsPtr->mixinSubs.list);
-	    ckfree(clsPtr->mixins.list);
 	    ckfree(oPtr->classPtr);
 	}
 	ckfree(oPtr);
@@ -1225,9 +1279,6 @@ TclOORemoveFromInstances(
 {
     int i, res = 0;
     Object *instPtr;
-    if (Deleted(clsPtr->thisPtr)) {
-	return res;
-    }
 
     FOREACH(instPtr, clsPtr->instances) {
 	if (oPtr == instPtr) {
@@ -1271,6 +1322,37 @@ TclOOAddToInstances(
     AddRef(oPtr);
 }
 
+/*
+ * ----------------------------------------------------------------------
+ *
+ * TclOORemoveFromMixins --
+ *
+ *	Utility function to remove a class from the list of mixins within an
+ *	object.
+ *
+ * ----------------------------------------------------------------------
+ */
+
+int
+TclOORemoveFromMixins(
+    Class *mixinPtr,		/* The mixin to remove. */
+    Object *oPtr)		/* The object (possibly) containing the
+				 * reference to the mixin. */
+{
+    int i, res = 0;
+    Class *mixPtr;
+
+    FOREACH(mixPtr, oPtr->mixins) {
+	if (mixinPtr == mixPtr) {
+	    RemoveItem(Class, oPtr->mixins, i);
+	    TclOODecrRefCount(mixPtr->thisPtr);
+	    res++;
+	    break;
+	}
+    }
+    return res;
+}
+
 /*
  * ----------------------------------------------------------------------
  *
@@ -1290,9 +1372,6 @@ TclOORemoveFromSubclasses(
 {
     int i, res = 0;
     Class *subclsPtr;
-    if (Deleted(superPtr->thisPtr)) {
-	return res;
-    }
 
     FOREACH(subclsPtr, superPtr->subclasses) {
 	if (subPtr == subclsPtr) {
@@ -1330,7 +1409,8 @@ TclOOAddToSubclasses(
 	if (superPtr->subclasses.size == ALLOC_CHUNK) {
 	    superPtr->subclasses.list = ckalloc(sizeof(Class *) * ALLOC_CHUNK);
 	} else {
-	    superPtr->subclasses.list = ckrealloc(superPtr->subclasses.list, sizeof(Class *) * superPtr->subclasses.size);
+	    superPtr->subclasses.list = ckrealloc(superPtr->subclasses.list,
+		    sizeof(Class *) * superPtr->subclasses.size);
 	}
     }
     superPtr->subclasses.list[superPtr->subclasses.num++] = subPtr;
@@ -1357,10 +1437,6 @@ TclOORemoveFromMixinSubs(
     int i, res = 0;
     Class *subclsPtr;
 
-    if (Deleted(superPtr->thisPtr)) {
-	return res;
-    }
-
     FOREACH(subclsPtr, superPtr->mixinSubs) {
 	if (subPtr == subclsPtr) {
 	    RemoveItem(Class, superPtr->mixinSubs, i);
@@ -1409,16 +1485,16 @@ TclOOAddToMixinSubs(
 /*
  * ----------------------------------------------------------------------
  *
- * AllocClass --
+ * TclOOAllocClass --
  *
- *	Allocate a basic class. Does not add class to its
- *	class's instance list.
+ *	Allocate a basic class. Does not add class to its class's instance
+ *	list.
  *
  * ----------------------------------------------------------------------
  */
 
-static Class *
-AllocClass(
+Class *
+TclOOAllocClass(
     Tcl_Interp *interp,		/* Interpreter within which to allocate the
 				 * class. */
     Object *useThisObj)		/* Object that is to act as the class
@@ -1653,6 +1729,7 @@ TclNewObjectInstanceCommon(
 
     oPtr = AllocObject(interp, simpleName, nsPtr, nsNameStr);
     oPtr->selfCls = classPtr;
+    AddRef(classPtr->thisPtr);
     TclOOAddToInstances(oPtr, classPtr);
     /*
      * Check to see if we're really creating a class. If so, allocate the
@@ -1661,13 +1738,13 @@ TclNewObjectInstanceCommon(
 
     if (TclOOIsReachable(fPtr->classCls, classPtr)) {
 	/*
-	 * Is a class, so attach a class structure. Note that the AllocClass
-	 * function splices the structure into the object, so we don't have
-	 * to. Once that's done, we need to repatch the object to have the
-	 * right class since AllocClass interferes with that.
+	 * Is a class, so attach a class structure. Note that the
+	 * TclOOAllocClass function splices the structure into the object, so
+	 * we don't have to. Once that's done, we need to repatch the object
+	 * to have the right class since TclOOAllocClass interferes with that.
 	 */
 
-	AllocClass(interp, oPtr);
+	TclOOAllocClass(interp, oPtr);
 	TclOOAddToSubclasses(oPtr->classPtr, fPtr->objectCls);
     } else {
 	oPtr->classPtr = NULL;
@@ -1789,16 +1866,22 @@ Tcl_CopyObjectInstance(
      * Copy the object's mixin references to the new object.
      */
 
-    FOREACH(mixinPtr, o2Ptr->mixins) {
-	if (mixinPtr && mixinPtr != o2Ptr->selfCls) {
-	    TclOORemoveFromInstances(o2Ptr, mixinPtr);
+    if (o2Ptr->mixins.num != 0) {
+	FOREACH(mixinPtr, o2Ptr->mixins) {
+	    if (mixinPtr && mixinPtr != o2Ptr->selfCls) {
+		TclOORemoveFromInstances(o2Ptr, mixinPtr);
+	    }
+	    TclOODecrRefCount(mixinPtr->thisPtr);
 	}
+	ckfree(o2Ptr->mixins.list);
     }
     DUPLICATE(o2Ptr->mixins, oPtr->mixins, Class *);
     FOREACH(mixinPtr, o2Ptr->mixins) {
 	if (mixinPtr && mixinPtr != o2Ptr->selfCls) {
 	    TclOOAddToInstances(o2Ptr, mixinPtr);
 	}
+	/* For the reference just created in DUPLICATE */
+	AddRef(mixinPtr->thisPtr);
     }
 
     /*
@@ -1876,6 +1959,7 @@ Tcl_CopyObjectInstance(
 
 	FOREACH(superPtr, cls2Ptr->superclasses) {
 	    TclOORemoveFromSubclasses(cls2Ptr, superPtr);
+	    TclOODecrRefCount(superPtr->thisPtr);
 	}
 	if (cls2Ptr->superclasses.num) {
 	    cls2Ptr->superclasses.list = ckrealloc(cls2Ptr->superclasses.list,
@@ -1889,6 +1973,11 @@ Tcl_CopyObjectInstance(
 	cls2Ptr->superclasses.num = clsPtr->superclasses.num;
 	FOREACH(superPtr, cls2Ptr->superclasses) {
 	    TclOOAddToSubclasses(cls2Ptr, superPtr);
+
+	    /* For the new item in cls2Ptr->superclasses that memcpy just
+	     * created
+	     */
+	    AddRef(superPtr->thisPtr);
 	}
 
 	/*
@@ -1914,15 +2003,18 @@ Tcl_CopyObjectInstance(
 	 * references to the duplicate).
 	 */
 
-	FOREACH(mixinPtr, cls2Ptr->mixins) {
-	    TclOORemoveFromMixinSubs(cls2Ptr, mixinPtr);
-	}
 	if (cls2Ptr->mixins.num != 0) {
+	    FOREACH(mixinPtr, cls2Ptr->mixins) {
+		TclOORemoveFromMixinSubs(cls2Ptr, mixinPtr);
+		TclOODecrRefCount(mixinPtr->thisPtr);
+	    }
 	    ckfree(clsPtr->mixins.list);
 	}
 	DUPLICATE(cls2Ptr->mixins, clsPtr->mixins, Class *);
 	FOREACH(mixinPtr, cls2Ptr->mixins) {
 	    TclOOAddToMixinSubs(cls2Ptr, mixinPtr);
+	    /* For the copy just created in DUPLICATE */
+	    AddRef(mixinPtr->thisPtr);
 	}
 
 	/*

generic/tclOOCall.c

@@ -1444,7 +1444,6 @@ AddSimpleClassChainToCallContext(
     if (flags & CONSTRUCTOR) {
 	AddMethodToCallChain(classPtr->constructorPtr, cbPtr, doneFilters,
 		filterDecl, flags);
-
     } else if (flags & DESTRUCTOR) {
 	AddMethodToCallChain(classPtr->destructorPtr, cbPtr, doneFilters,
 		filterDecl, flags);

generic/tclOODefineCmds.c

@@ -327,6 +327,7 @@ TclOOObjectSetMixins(
 	if (oPtr->mixins.num != 0) {
 	    FOREACH(mixinPtr, oPtr->mixins) {
 		TclOORemoveFromInstances(oPtr, mixinPtr);
+		TclOODecrRefCount(mixinPtr->thisPtr);
 	    }
 	    ckfree(oPtr->mixins.list);
 	    oPtr->mixins.num = 0;
@@ -338,6 +339,7 @@ TclOOObjectSetMixins(
 		if (mixinPtr && mixinPtr != oPtr->selfCls) {
 		    TclOORemoveFromInstances(oPtr, mixinPtr);
 		}
+		TclOODecrRefCount(mixinPtr->thisPtr);
 	    }
 	    oPtr->mixins.list = ckrealloc(oPtr->mixins.list,
 		    sizeof(Class *) * numMixins);
@@ -350,10 +352,8 @@ TclOOObjectSetMixins(
 	FOREACH(mixinPtr, oPtr->mixins) {
 	    if (mixinPtr != oPtr->selfCls) {
 		TclOOAddToInstances(oPtr, mixinPtr);
-		/* Corresponding TclOODecrRefCount() is in the caller of this
-		 * function. 
-		 */
-		TclOODecrRefCount(mixinPtr->thisPtr);
+		/* For the new copy created by memcpy */
+		AddRef(mixinPtr->thisPtr);
 	    }
 	}
     }
@@ -383,6 +383,7 @@ TclOOClassSetMixins(
 	if (classPtr->mixins.num != 0) {
 	    FOREACH(mixinPtr, classPtr->mixins) {
 		TclOORemoveFromMixinSubs(classPtr, mixinPtr);
+		TclOODecrRefCount(mixinPtr->thisPtr);
 	    }
 	    ckfree(classPtr->mixins.list);
 	    classPtr->mixins.num = 0;
@@ -391,6 +392,7 @@ TclOOClassSetMixins(
 	if (classPtr->mixins.num != 0) {
 	    FOREACH(mixinPtr, classPtr->mixins) {
 		TclOORemoveFromMixinSubs(classPtr, mixinPtr);
+		TclOODecrRefCount(mixinPtr->thisPtr);
 	    }
 	    classPtr->mixins.list = ckrealloc(classPtr->mixins.list,
 		    sizeof(Class *) * numMixins);
@@ -401,10 +403,8 @@ TclOOClassSetMixins(
 	memcpy(classPtr->mixins.list, mixins, sizeof(Class *) * numMixins);
 	FOREACH(mixinPtr, classPtr->mixins) {
 	    TclOOAddToMixinSubs(classPtr, mixinPtr);
-	    /* Corresponding TclOODecrRefCount() is in the caller of this
-	     * function
-	     */
-	    TclOODecrRefCount(mixinPtr->thisPtr);
+	    /* For the new copy created by memcpy */
+	    AddRef(mixinPtr->thisPtr);
 	}
     }
     BumpGlobalEpoch(interp, classPtr);
@@ -1083,6 +1083,8 @@ TclOODefineClassObjCmd(
 {
     Object *oPtr;
     Class *clsPtr;
+    Foundation *fPtr = TclOOGetFoundation(interp);
+    int wasClass, willBeClass;
 
     /*
      * Parse the context to get the object to operate on.
@@ -1118,19 +1120,47 @@ TclOODefineClassObjCmd(
     if (clsPtr == NULL) {
 	return TCL_ERROR;
     }
-
+    if (oPtr == clsPtr->thisPtr) {
+	Tcl_SetObjResult(interp, Tcl_NewStringObj(
+		"may not change classes into an instance of themselves", -1));
+	Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
+	return TCL_ERROR;
+    }
 
     /*
      * Set the object's class.
      */
 
+    wasClass = (oPtr->classPtr != NULL);
+    willBeClass = (TclOOIsReachable(fPtr->classCls, clsPtr));
+
     if (oPtr->selfCls != clsPtr) {
 	TclOORemoveFromInstances(oPtr, oPtr->selfCls);
-
-	/* Reference count already incremented 3 lines up. */
+	TclOODecrRefCount(oPtr->selfCls->thisPtr);
 	oPtr->selfCls = clsPtr;
-
+	AddRef(oPtr->selfCls->thisPtr);
 	TclOOAddToInstances(oPtr, oPtr->selfCls);
+
+	/*
+	 * Create or delete the class guts if necessary.
+	 */
+
+	if (wasClass && !willBeClass) {
+	    /*
+	     * This is the most global of all epochs. Bump it! No cache can be
+	     * trusted!
+	     */
+
+	    TclOORemoveFromMixins(oPtr->classPtr, oPtr);
+	    oPtr->fPtr->epoch++;
+	    oPtr->flags |= DONT_DELETE;
+	    TclOODeleteDescendants(interp, oPtr);
+	    oPtr->flags &= ~DONT_DELETE;
+	    TclOOReleaseClassContents(interp, oPtr);
+	} else if (!wasClass && willBeClass) {
+	    TclOOAllocClass(interp, oPtr);
+	}
+
 	if (oPtr->classPtr != NULL) {
 	    BumpGlobalEpoch(interp, oPtr->classPtr);
 	} else {
@@ -1539,76 +1569,6 @@ TclOODefineMethodObjCmd(
     return TCL_OK;
 }
 
-/*
- * ----------------------------------------------------------------------
- *
- * TclOODefineMixinObjCmd --
- *	Implementation of the "mixin" subcommand of the "oo::define" and
- *	"oo::objdefine" commands.
- *
- * ----------------------------------------------------------------------
- */
-
-int
-TclOODefineMixinObjCmd(
-    ClientData clientData,
-    Tcl_Interp *interp,
-    const int objc,
-    Tcl_Obj *const *objv)
-{
-    int isInstanceMixin = (clientData != NULL);
-    Object *oPtr = (Object *) TclOOGetDefineCmdContext(interp);
-    Class **mixins;
-    int i;
-
-    if (oPtr == NULL) {
-	return TCL_ERROR;
-    }
-    if (!isInstanceMixin && !oPtr->classPtr) {
-	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"attempt to misuse API", -1));
-	Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
-	return TCL_ERROR;
-    }
-    mixins = TclStackAlloc(interp, sizeof(Class *) * (objc-1));
-
-    for (i=1 ; i<objc ; i++) {
-	Class *clsPtr = GetClassInOuterContext(interp, objv[i],
-		"may only mix in classes");
-
-	if (clsPtr == NULL) {
-	    goto freeAndError;
-	}
-	if (!isInstanceMixin && TclOOIsReachable(oPtr->classPtr, clsPtr)) {
-	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "may not mix a class into itself", -1));
-	    Tcl_SetErrorCode(interp, "TCL", "OO", "SELF_MIXIN", NULL);
-	    goto freeAndError;
-	}
-	mixins[i-1] = clsPtr;
-	/* Corresponding TclOODecrRefCount() is in TclOOObjectSetMixins,
-	 * TclOOClassSetMixinsk, or just below if this function fails.
-	 */
-	AddRef(mixins[i-1]->thisPtr);
-    }
-
-    if (isInstanceMixin) {
-	TclOOObjectSetMixins(oPtr, objc-1, mixins);
-    } else {
-	TclOOClassSetMixins(interp, oPtr->classPtr, objc-1, mixins);
-    }
-
-    TclStackFree(interp, mixins);
-    return TCL_OK;
-
-  freeAndError:
-    while (--i > 0) {
-	TclOODecrRefCount(mixins[i]->thisPtr);
-    }
-    TclStackFree(interp, mixins);
-    return TCL_ERROR;
-}
-
 /*
  * ----------------------------------------------------------------------
  *
@@ -2029,10 +1989,6 @@ ClassMixinSet(
 	    Tcl_SetErrorCode(interp, "TCL", "OO", "SELF_MIXIN", NULL);
 	    goto freeAndError;
 	}
-	/* Corresponding TclOODecrRefCount() is in TclOOClassSetMixins, or just
-	 * below if this function fails
-	 */
-	AddRef(mixins[i]->thisPtr);
     }
 
     TclOOClassSetMixins(interp, oPtr->classPtr, mixinc, mixins);
@@ -2040,9 +1996,6 @@ ClassMixinSet(
     return TCL_OK;
 
   freeAndError:
-    while (i-- > 0) {
-	TclOODecrRefCount(mixins[i]->thisPtr);
-    }
     TclStackFree(interp, mixins);
     return TCL_ERROR;
 }
@@ -2151,7 +2104,6 @@ ClassSuperSet(
 	    superclasses[0] = oPtr->fPtr->objectCls;
 	}
 	superc = 1;
-	/* Corresponding TclOODecrRefCount is near the end of this function */
 	AddRef(superclasses[0]->thisPtr);
     } else {
 	for (i=0 ; i<superc ; i++) {
@@ -2197,6 +2149,7 @@ ClassSuperSet(
     if (oPtr->classPtr->superclasses.num != 0) {
 	FOREACH(superPtr, oPtr->classPtr->superclasses) {
 	    TclOORemoveFromSubclasses(oPtr->classPtr, superPtr);
+	    TclOODecrRefCount(superPtr->thisPtr);
 	}
 	ckfree((char *) oPtr->classPtr->superclasses.list);
     }
@@ -2204,8 +2157,6 @@ ClassSuperSet(
     oPtr->classPtr->superclasses.num = superc;
     FOREACH(superPtr, oPtr->classPtr->superclasses) {
 	TclOOAddToSubclasses(oPtr->classPtr, superPtr);
-	/* To account for the AddRef() earlier in this function */ 
-	TclOODecrRefCount(superPtr->thisPtr);
     }
     BumpGlobalEpoch(interp, oPtr->classPtr);
 
@@ -2496,16 +2447,9 @@ ObjMixinSet(
 	mixins[i] = GetClassInOuterContext(interp, mixinv[i],
 		"may only mix in classes");
 	if (mixins[i] == NULL) {
-	    while (i-- > 0) {
-		TclOODecrRefCount(mixins[i]->thisPtr);
-	    }
 	    TclStackFree(interp, mixins);
 	    return TCL_ERROR;
 	}
-	/* Corresponding TclOODecrRefCount() is in TclOOObjectSetMixins() or
-	 * just above if this function fails.
-	 */
-	AddRef(mixins[i]->thisPtr);
     }
 
     TclOOObjectSetMixins(oPtr, mixinc, mixins);

generic/tclOOInt.h

@@ -214,6 +214,7 @@ typedef struct Object {
 				 * other spots). */
 #define FORCE_UNKNOWN 0x10000	/* States that we are *really* looking up the
 				 * unknown method handler at that point. */
+#define DONT_DELETE 0x20000	/* Inhibit deletion of this object. */
 
 /*
  * And the definition of a class. Note that every class also has an associated
@@ -484,6 +485,8 @@ MODULE_SCOPE int	TclOO_Object_VarName(ClientData clientData,
 MODULE_SCOPE void	TclOOAddToInstances(Object *oPtr, Class *clsPtr);
 MODULE_SCOPE void	TclOOAddToMixinSubs(Class *subPtr, Class *mixinPtr);
 MODULE_SCOPE void	TclOOAddToSubclasses(Class *subPtr, Class *superPtr);
+MODULE_SCOPE Class *	TclOOAllocClass(Tcl_Interp *interp,
+			    Object *useThisObj);
 MODULE_SCOPE int	TclNRNewObjectInstance(Tcl_Interp *interp,
 			    Tcl_Class cls, const char *nameStr,
 			    const char *nsNameStr, int objc,
@@ -498,6 +501,8 @@ MODULE_SCOPE int	TclOODefineSlots(Foundation *fPtr);
 MODULE_SCOPE void	TclOODeleteChain(CallChain *callPtr);
 MODULE_SCOPE void	TclOODeleteChainCache(Tcl_HashTable *tablePtr);
 MODULE_SCOPE void	TclOODeleteContext(CallContext *contextPtr);
+MODULE_SCOPE void	TclOODeleteDescendants(Tcl_Interp *interp,
+			    Object *oPtr);
 MODULE_SCOPE void	TclOODelMethodRef(Method *method);
 MODULE_SCOPE CallContext *TclOOGetCallContext(Object *oPtr,
 			    Tcl_Obj *methodNameObj, int flags,
@@ -523,7 +528,10 @@ MODULE_SCOPE int	TclNRObjectContextInvokeNext(Tcl_Interp *interp,
 MODULE_SCOPE void	TclOONewBasicMethod(Tcl_Interp *interp, Class *clsPtr,
 			    const DeclaredClassMethod *dcm);
 MODULE_SCOPE Tcl_Obj *	TclOOObjectName(Tcl_Interp *interp, Object *oPtr);
+MODULE_SCOPE void	TclOOReleaseClassContents(Tcl_Interp *interp,
+			    Object *oPtr);
 MODULE_SCOPE int	TclOORemoveFromInstances(Object *oPtr, Class *clsPtr);
+MODULE_SCOPE int	TclOORemoveFromMixins(Class *mixinPtr, Object *oPtr);
 MODULE_SCOPE int	TclOORemoveFromMixinSubs(Class *subPtr,
 			    Class *mixinPtr);
 MODULE_SCOPE int	TclOORemoveFromSubclasses(Class *subPtr,

generic/tclParse.c

@@ -991,7 +991,13 @@ TclParseBackslash(
     if (readPtr != NULL) {
 	*readPtr = count;
     }
-    return Tcl_UniCharToUtf(result, dst);
+    count = Tcl_UniCharToUtf(result, dst);
+#if TCL_UTF_MAX > 3
+    if (!count) {
+	count = Tcl_UniCharToUtf(-1, dst);
+    }
+#endif
+    return count;
 }
 
 /*

generic/tclPkg.c

@@ -1125,7 +1125,6 @@ TclNRPackageObjCmd(
 	     */
 
 	    ov = Tcl_NewStringObj(version, -1);
-	    Tcl_IncrRefCount(ov);
 	    Tcl_AppendStringsToObj(ov, "-", version, NULL);
 	    version = NULL;
 	    argv3 = TclGetString(objv[3]);

generic/tclProc.c

@@ -504,10 +504,11 @@ TclCreateProc(
 	    goto procError;
 	}
 
-	nameLength = Tcl_NumUtfChars(Tcl_GetString(fieldValues[0]), fieldValues[0]->length);
+	argname = Tcl_GetStringFromObj(fieldValues[0], &plen);
+	nameLength = Tcl_NumUtfChars(argname, plen);
 	if (fieldCount == 2) {
-	    valueLength = Tcl_NumUtfChars(Tcl_GetString(fieldValues[1]),
-		fieldValues[1]->length);
+	    const char * value = TclGetString(fieldValues[1]);
+	    valueLength = Tcl_NumUtfChars(value, fieldValues[1]->length);
 	} else {
 	    valueLength = 0;
 	}
@@ -516,7 +517,6 @@ TclCreateProc(
 	 * Check that the formal parameter name is a scalar.
 	 */
 
-	argname = Tcl_GetStringFromObj(fieldValues[0], &plen);
 	argnamei = argname;
 	argnamelast = argname[plen-1];
 	while (plen--) {
@@ -611,7 +611,7 @@ TclCreateProc(
 		procPtr->lastLocalPtr = localPtr;
 	    }
 	    localPtr->nextPtr = NULL;
-	    localPtr->nameLength = Tcl_NumUtfChars(argname, fieldValues[0]->length);
+	    localPtr->nameLength = nameLength;
 	    localPtr->frameIndex = i;
 	    localPtr->flags = VAR_ARGUMENT;
 	    localPtr->resolveInfo = NULL;
@@ -1035,7 +1035,6 @@ ProcWrongNumArgs(
 {
     CallFrame *framePtr = ((Interp *)interp)->varFramePtr;
     register Proc *procPtr = framePtr->procPtr;
-    register Var *defPtr;
     int localCt = procPtr->numCompiledLocals, numArgs, i;
     Tcl_Obj **desiredObjs;
     const char *final = NULL;
@@ -1059,23 +1058,26 @@ ProcWrongNumArgs(
     }
     Tcl_IncrRefCount(desiredObjs[0]);
 
-    defPtr = (Var *) (&framePtr->localCachePtr->varName0 + localCt);
-    for (i=1 ; i<=numArgs ; i++, defPtr++) {
-	Tcl_Obj *argObj;
-	Tcl_Obj *namePtr = localName(framePtr, i-1);
+    if (localCt > 0) {
+	register Var *defPtr = (Var *) (&framePtr->localCachePtr->varName0 + localCt);
 
-	if (defPtr->value.objPtr != NULL) {
-	    TclNewObj(argObj);
-	    Tcl_AppendStringsToObj(argObj, "?", TclGetString(namePtr), "?", NULL);
-	} else if (defPtr->flags & VAR_IS_ARGS) {
-	    numArgs--;
-	    final = "?arg ...?";
-	    break;
-	} else {
-	    argObj = namePtr;
-	    Tcl_IncrRefCount(namePtr);
+	for (i=1 ; i<=numArgs ; i++, defPtr++) {
+	    Tcl_Obj *argObj;
+	    Tcl_Obj *namePtr = localName(framePtr, i-1);
+
+	    if (defPtr->value.objPtr != NULL) {
+		TclNewObj(argObj);
+		Tcl_AppendStringsToObj(argObj, "?", TclGetString(namePtr), "?", NULL);
+	    } else if (defPtr->flags & VAR_IS_ARGS) {
+		numArgs--;
+		final = "?arg ...?";
+		break;
+	    } else {
+		argObj = namePtr;
+		Tcl_IncrRefCount(namePtr);
+	    }
+	    desiredObjs[i] = argObj;
 	}
-	desiredObjs[i] = argObj;
     }
 
     Tcl_ResetResult(interp);

generic/tclStringObj.c

@@ -434,6 +434,7 @@ Tcl_GetCharLength(
 	return length;
     }
 
+
     /*
      * OK, need to work with the object as a string.
      */
@@ -464,6 +465,50 @@ Tcl_GetCharLength(
     }
     return numChars;
 }
+
+
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * TclCheckEmptyString --
+ *
+ *	Determine whether the string value of an object is or would be the
+ *	empty string, without generating a string representation.
+ *
+ * Results:
+ *	Returns 1 if empty, 0 if not, and -1 if unknown.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+int
+TclCheckEmptyString (
+    Tcl_Obj *objPtr
+) {
+    int length = -1;
+
+    if (objPtr->bytes == tclEmptyStringRep) {
+	return TCL_EMPTYSTRING_YES;
+    }
+
+    if (TclIsPureList(objPtr)) {
+	Tcl_ListObjLength(NULL, objPtr, &length);
+	return length == 0;
+    }
+
+    if (TclIsPureDict(objPtr)) {
+	Tcl_DictObjSize(NULL, objPtr, &length);
+	return length == 0;
+    }
+    
+    if (objPtr->bytes == NULL) {
+	return TCL_EMPTYSTRING_UNKNOWN;
+    }
+    return objPtr->length == 0;
+}
 
 /*
  *----------------------------------------------------------------------
@@ -1831,6 +1876,11 @@ Tcl_AppendFormatToObj(
 	width = 0;
 	if (isdigit(UCHAR(ch))) {
 	    width = strtoul(format, &end, 10);
+	    if (width < 0) {
+		msg = overflow;
+		errCode = "OVERFLOW";
+		goto errorMsg;
+	    }
 	    format = end;
 	    step = TclUtfToUniChar(format, &ch);
 	} else if (ch == '*') {
@@ -1951,6 +2001,12 @@ Tcl_AppendFormatToObj(
 		goto error;
 	    }
 	    length = Tcl_UniCharToUtf(code, buf);
+#if TCL_UTF_MAX > 3
+	    if (!length) {
+		/* Special case for handling upper surrogates. */
+		length = Tcl_UniCharToUtf(-1, buf);
+	    }
+#endif
 	    segment = Tcl_NewStringObj(buf, length);
 	    Tcl_IncrRefCount(segment);
 	    allocSegment = 1;

generic/tclStubInit.c

@@ -12,6 +12,10 @@
 #include "tclInt.h"
 #include "tommath.h"
 
+#ifdef __CYGWIN__
+#   include <wchar.h>
+#endif
+
 #ifdef __GNUC__
 #pragma GCC dependency "tcl.decls"
 #pragma GCC dependency "tclInt.decls"
@@ -106,10 +110,6 @@ static unsigned short TclWinNToHS(unsigned short ns) {
 #   define TclWinFlushDirtyChannels doNothing
 #   define TclWinResetInterfaces doNothing
 
-#if TCL_UTF_MAX < 4
-static Tcl_Encoding winTCharEncoding;
-#endif
-
 static int
 TclpIsAtty(int fd)
 {
@@ -188,25 +188,11 @@ Tcl_WinUtfToTChar(
     int len,
     Tcl_DString *dsPtr)
 {
-#if TCL_UTF_MAX > 3
-    WCHAR *wp;
-    int size = MultiByteToWideChar(CP_UTF8, 0, string, len, 0, 0);
-
     Tcl_DStringInit(dsPtr);
-    Tcl_DStringSetLength(dsPtr, 2*size+2);
-    wp = (WCHAR *)Tcl_DStringValue(dsPtr);
-    MultiByteToWideChar(CP_UTF8, 0, string, len, wp, size+1);
-    if (len == -1) --size; /* account for 0-byte at string end */
-    Tcl_DStringSetLength(dsPtr, 2*size);
-    wp[size] = 0;
-    return (char *)wp;
-#else
-    if (!winTCharEncoding) {
-	winTCharEncoding = Tcl_GetEncoding(0, "unicode");
+    if (!string) {
+	return NULL;
     }
-    return Tcl_UtfToExternalDString(winTCharEncoding,
-	    string, len, dsPtr);
-#endif
+    return (char *)Tcl_UtfToUniCharDString(string, len, dsPtr);
 }
 
 char *
@@ -215,29 +201,16 @@ Tcl_WinTCharToUtf(
     int len,
     Tcl_DString *dsPtr)
 {
-#if TCL_UTF_MAX > 3
-    char *p;
-    int size;
-
-    if (len > 0) {
+    Tcl_DStringInit(dsPtr);
+    if (!string) {
+	return NULL;
+    }
+    if (len < 0) {
+	len = wcslen((wchar_t *)string);
+    } else {
 	len /= 2;
     }
-    size = WideCharToMultiByte(CP_UTF8, 0, string, len, 0, 0, NULL, NULL);
-    Tcl_DStringInit(dsPtr);
-    Tcl_DStringSetLength(dsPtr, size+1);
-    p = (char *)Tcl_DStringValue(dsPtr);
-    WideCharToMultiByte(CP_UTF8, 0, string, len, p, size, NULL, NULL);
-    if (len == -1) --size; /* account for 0-byte at string end */
-    Tcl_DStringSetLength(dsPtr, size);
-    p[size] = 0;
-    return p;
-#else
-    if (!winTCharEncoding) {
-	winTCharEncoding = Tcl_GetEncoding(0, "unicode");
-    }
-    return Tcl_ExternalToUtfDString(winTCharEncoding,
-	    string, len, dsPtr);
-#endif
+    return Tcl_UniCharToUtfDString((Tcl_UniChar *)string, len, dsPtr);
 }
 
 #if defined(TCL_WIDE_INT_IS_LONG)

generic/tclThreadTest.c

@@ -174,7 +174,6 @@ TclThread_Init(
     Tcl_CreateObjCommand(interp, "testthread", ThreadObjCmd, NULL, NULL);
     return TCL_OK;
 }
-
 
 /*
  *----------------------------------------------------------------------
@@ -1158,6 +1157,14 @@ ThreadExitProc(
 
     Tcl_MutexLock(&threadMutex);
 
+    if (self == errorThreadId) {
+	if (errorProcString) {	/* Extra safety */
+	    ckfree(errorProcString);
+	    errorProcString = NULL;
+	}
+	errorThreadId = 0;
+    }
+
     if (threadEvalScript) {
 	ckfree(threadEvalScript);
 	threadEvalScript = NULL;

generic/tclTrace.c

@@ -191,8 +191,10 @@ Tcl_TraceObjCmd(
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     int optionIndex;
+#ifndef TCL_REMOVE_OBSOLETE_TRACES
     const char *name;
     const char *flagOps, *p;
+#endif
     /* Main sub commands to 'trace' */
     static const char *const traceOptions[] = {
 	"add", "info", "remove",
@@ -365,12 +367,14 @@ Tcl_TraceObjCmd(
     }
     return TCL_OK;
 
+#ifndef TCL_REMOVE_OBSOLETE_TRACES
   badVarOps:
     Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 	    "bad operations \"%s\": should be one or more of rwua",
 	    flagOps));
     Tcl_SetErrorCode(interp, "TCL", "OPERATION", "TRACE", "BADOPS", NULL);
     return TCL_ERROR;
+#endif
 }
 
 /*
@@ -912,9 +916,11 @@ TraceVariableObjCmd(
 		    + 1 + length);
 
 	    ctvarPtr->traceCmdInfo.flags = flags;
+#ifndef TCL_REMOVE_OBSOLETE_TRACES
 	    if (objv[0] == NULL) {
 		ctvarPtr->traceCmdInfo.flags |= TCL_TRACE_OLD_STYLE;
 	    }
+#endif
 	    ctvarPtr->traceCmdInfo.length = length;
 	    flags |= TCL_TRACE_UNSETS | TCL_TRACE_RESULT_OBJECT;
 	    memcpy(ctvarPtr->traceCmdInfo.command, command, length+1);
@@ -939,7 +945,11 @@ TraceVariableObjCmd(
 		TraceVarInfo *tvarPtr = clientData;
 
 		if ((tvarPtr->length == length)
-			&& ((tvarPtr->flags & ~TCL_TRACE_OLD_STYLE)==flags)
+			&& ((tvarPtr->flags
+#ifndef TCL_REMOVE_OBSOLETE_TRACES
+& ~TCL_TRACE_OLD_STYLE
+#endif
+						)==flags)
 			&& (strncmp(command, tvarPtr->command,
 				(size_t) length) == 0)) {
 		    Tcl_UntraceVar2(interp, name, NULL,
@@ -2465,6 +2475,47 @@ TclVarTraceExists(
     return varPtr;
 }
 
+/*
+ *----------------------------------------------------------------------
+ *
+ * TclCheckArrayTraces --
+ *
+ *	This function is invoked to when we operate on an array variable,
+ *	to allow any array traces to fire.
+ *
+ * Results:
+ *	Returns TCL_OK to indicate normal operation. Returns TCL_ERROR if
+ *	invocation of a trace function indicated an error. When TCL_ERROR is
+ *	returned, then error information is left in interp.
+ *
+ * Side effects:
+ *	Almost anything can happen, depending on trace; this function itself
+ *	doesn't have any side effects.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int
+TclCheckArrayTraces(
+    Tcl_Interp *interp,
+    Var *varPtr,
+    Var *arrayPtr,
+    Tcl_Obj *name,
+    int index)
+{
+    int code = TCL_OK;
+
+    if (varPtr && (varPtr->flags & VAR_TRACED_ARRAY)
+	&& (TclIsVarArray(varPtr) || TclIsVarUndefined(varPtr))) {
+	Interp *iPtr = (Interp *)interp;
+
+	code = TclObjCallVarTraces(iPtr, arrayPtr, varPtr, name, NULL,
+		(TCL_NAMESPACE_ONLY|TCL_GLOBAL_ONLY| TCL_TRACE_ARRAY),
+		/* leaveErrMsg */ 1, index);
+    }
+    return code;
+}
+
 /*
  *----------------------------------------------------------------------
  *

generic/tclUtf.c

@@ -154,19 +154,26 @@ Tcl_UniCharToUtf(
 	    return 2;
 	}
 	if (ch <= 0xFFFF) {
-#if TCL_UTF_MAX == 4
+#if TCL_UTF_MAX > 3
 	    if ((ch & 0xF800) == 0xD800) {
 		if (ch & 0x0400) {
 		    /* Low surrogate */
-		    buf[3] = (char) ((ch | 0x80) & 0xBF);
-		    buf[2] |= (char) (((ch >> 6) | 0x80) & 0x8F);
-		    return 4;
+		    if (((buf[0] & 0xF8) == 0xF0) && ((buf[1] & 0xC0) == 0x80)
+			    && ((buf[2] & 0xCF) == 0)) {
+			/* Previous Tcl_UniChar was a High surrogate, so combine */
+			buf[3] = (char) ((ch & 0x3F) | 0x80);
+			buf[2] |= (char) (((ch >> 6) & 0x0F) | 0x80);
+			return 4;
+		    }
+		    /* Previous Tcl_UniChar was not a High surrogate, so just output */
 		} else {
 		    /* High surrogate */
 		    ch += 0x40;
-		    buf[2] = (char) (((ch << 4) | 0x80) & 0xB0);
-		    buf[1] = (char) (((ch >> 2) | 0x80) & 0xBF);
-		    buf[0] = (char) (((ch >> 8) | 0xF0) & 0xF7);
+		    /* Fill buffer with specific 3-byte (invalid) byte combination,
+		       so following Low surrogate can recognize it and combine */
+		    buf[2] = (char) ((ch << 4) & 0x30);
+		    buf[1] = (char) (((ch >> 2) & 0x3F) | 0x80);
+		    buf[0] = (char) (((ch >> 8) & 0x07) | 0xF0);
 		    return 0;
 		}
 	    }
@@ -182,6 +189,13 @@ Tcl_UniCharToUtf(
 	    buf[0] = (char) ((ch >> 18) | 0xF0);
 	    return 4;
 	}
+    } else if (ch == -1) {
+	if (((buf[0] & 0xF8) == 0xF0) && ((buf[1] & 0xC0) == 0x80)
+		&& ((buf[2] & 0xCF) == 0)) {
+	    ch = 0xD7C0 + ((buf[0] & 0x07) << 8) + ((buf[1] & 0x3F) << 2)
+		    + ((buf[2] & 0x30) >> 4);
+	    goto three;
+	}
 #endif
     }
 
@@ -229,7 +243,7 @@ Tcl_UniCharToUtfDString(
      */
 
     oldLength = Tcl_DStringLength(dsPtr);
-    Tcl_DStringSetLength(dsPtr, (oldLength + uniLength + 1) * TCL_UTF_MAX);
+    Tcl_DStringSetLength(dsPtr, oldLength + (uniLength + 1) * TCL_UTF_MAX);
     string = Tcl_DStringValue(dsPtr) + oldLength;
 
     p = string;
@@ -418,17 +432,27 @@ Tcl_UtfToUniCharDString(
      */
 
     oldLength = Tcl_DStringLength(dsPtr);
-/* TODO: fix overreach! */
+
     Tcl_DStringSetLength(dsPtr,
-	    (int) ((oldLength + length + 1) * sizeof(Tcl_UniChar)));
+	    oldLength + (int) ((length + 1) * sizeof(Tcl_UniChar)));
     wString = (Tcl_UniChar *) (Tcl_DStringValue(dsPtr) + oldLength);
 
     w = wString;
-    end = src + length;
-    for (p = src; p < end; ) {
+    p = src;
+    end = src + length - TCL_UTF_MAX;
+    while (p < end) {
 	p += TclUtfToUniChar(p, &ch);
 	*w++ = ch;
     }
+    end += TCL_UTF_MAX;
+    while (p < end) {
+	if (Tcl_UtfCharComplete(p, end-p)) {
+	    p += TclUtfToUniChar(p, &ch);
+	} else {
+	    ch = UCHAR(*p++);
+	}
+	*w++ = ch;
+    }
     *w = '\0';
     Tcl_DStringSetLength(dsPtr,
 	    (oldLength + ((char *) w - (char *) wString)));
@@ -755,10 +779,18 @@ Tcl_UtfAtIndex(
     register int index)		/* The position of the desired character. */
 {
     Tcl_UniChar ch = 0;
+    int len = 1;
 
     while (index-- > 0) {
+	len = TclUtfToUniChar(src, &ch);
+	src += len;
+    }
+#if TCL_UTF_MAX == 4
+     if (!len) {
+	/* Index points at character following High Surrogate */
 	src += TclUtfToUniChar(src, &ch);
     }
+#endif
     return src;
 }
 
@@ -969,7 +1001,11 @@ Tcl_UtfToTitle(
     }
     while (*src) {
 	bytes = TclUtfToUniChar(src, &ch);
-	lowChar = Tcl_UniCharToLower(ch);
+	lowChar = ch;
+	/* Special exception for Georgian Asomtavruli chars, no titlecase. */
+	if ((unsigned)(lowChar - 0x1C90) >= 0x30) {
+	    lowChar = Tcl_UniCharToLower(lowChar);
+	}
 
 	if (bytes < UtfCount(lowChar)) {
 	    memcpy(dst, src, (size_t) bytes);
@@ -1241,8 +1277,9 @@ Tcl_UniCharToLower(
     int ch)			/* Unicode character to convert. */
 {
     int info = GetUniCharInfo(ch);
+    int mode = GetCaseType(info);
 
-    if (GetCaseType(info) & 0x02) {
+    if ((mode & 0x02) && (mode != 0x7)) {
 	ch += GetDelta(info);
     }
     return (Tcl_UniChar) ch;
@@ -1276,7 +1313,9 @@ Tcl_UniCharToTitle(
 	 * Subtract or add one depending on the original case.
 	 */
 
-	ch += ((mode & 0x4) ? -1 : 1);
+	if (mode != 0x7) {
+	    ch += ((mode & 0x4) ? -1 : 1);
+	}
     } else if (mode == 0x4) {
 	ch -= GetDelta(info);
     }

generic/tclUtil.c

@@ -107,6 +107,8 @@ static Tcl_ThreadDataKey precisionKey;
 static void		ClearHash(Tcl_HashTable *tablePtr);
 static void		FreeProcessGlobalValue(ClientData clientData);
 static void		FreeThreadHash(ClientData clientData);
+static int		GetEndOffsetFromObj(Tcl_Obj *objPtr, int endValue,
+			    int *indexPtr);
 static Tcl_HashTable *	GetThreadHash(Tcl_ThreadDataKey *keyPtr);
 static int		SetEndOffsetFromAny(Tcl_Interp *interp,
 			    Tcl_Obj *objPtr);
@@ -1641,11 +1643,46 @@ Tcl_Backslash(
 /*
  *----------------------------------------------------------------------
  *
- * TclTrimRight --
+ * UtfWellFormedEnd --
+ *	Checks the end of utf string is malformed, if yes - wraps bytes
+ *	to the given buffer (as well-formed NTS string).  The buffer
+ *	argument should be initialized by the caller and ready to use.
  *
- *	Takes two counted strings in the Tcl encoding which must both be null
- *	terminated. Conceptually trims from the right side of the first string
- *	all characters found in the second string.
+ * Results:
+ *	The bytes with well-formed end of the string.
+ *
+ * Side effects:
+ *	Buffer (DString) may be allocated, so must be released.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static inline const char*
+UtfWellFormedEnd(
+    Tcl_DString *buffer,	/* Buffer used to hold well-formed string. */
+    const char *bytes,		/* Pointer to the beginning of the string. */
+    int length)			/* Length of the string. */
+{
+    const char *l = bytes + length;
+    const char *p = Tcl_UtfPrev(l, bytes);
+
+    if (Tcl_UtfCharComplete(p, l - p)) {
+	return bytes;
+    }
+    /* 
+     * Malformed utf-8 end, be sure we've NTS to safe compare of end-character,
+     * avoid segfault by access violation out of range.
+     */
+    Tcl_DStringAppend(buffer, bytes, length);
+    return Tcl_DStringValue(buffer);
+}
+/*
+ *----------------------------------------------------------------------
+ *
+ * TclTrimRight --
+ *	Takes two counted strings in the Tcl encoding.  Conceptually
+ *	finds the sub string (offset) to trim from the right side of the
+ *	first string all characters found in the second string.
  *
  * Results:
  *	The number of bytes to be removed from the end of the string.
@@ -1656,8 +1693,8 @@ Tcl_Backslash(
  *----------------------------------------------------------------------
  */
 
-int
-TclTrimRight(
+static inline int
+TrimRight(
     const char *bytes,		/* String to be trimmed... */
     int numBytes,		/* ...and its length in bytes */
     const char *trim,		/* String of trim characters... */
@@ -1666,18 +1703,6 @@ TclTrimRight(
     const char *p = bytes + numBytes;
     int pInc;
 
-    if ((bytes[numBytes] != '\0') || (trim[numTrim] != '\0')) {
-	Tcl_Panic("TclTrimRight works only on null-terminated strings");
-    }
-
-    /*
-     * Empty strings -> nothing to do.
-     */
-
-    if ((numBytes == 0) || (numTrim == 0)) {
-	return 0;
-    }
-
     /*
      * Outer loop: iterate over string to be trimmed.
      */
@@ -1718,15 +1743,46 @@ TclTrimRight(
 
     return numBytes - (p - bytes);
 }
+
+int
+TclTrimRight(
+    const char *bytes,	/* String to be trimmed... */
+    int numBytes,	/* ...and its length in bytes */
+    const char *trim,	/* String of trim characters... */
+    int numTrim)	/* ...and its length in bytes */
+{
+    int res;
+    Tcl_DString bytesBuf, trimBuf;
+
+    /* Empty strings -> nothing to do */
+    if ((numBytes == 0) || (numTrim == 0)) {
+	return 0;
+    }
+
+    Tcl_DStringInit(&bytesBuf);
+    Tcl_DStringInit(&trimBuf);
+    bytes = UtfWellFormedEnd(&bytesBuf, bytes, numBytes);
+    trim = UtfWellFormedEnd(&trimBuf, trim, numTrim);
+
+    res = TrimRight(bytes, numBytes, trim, numTrim);
+    if (res > numBytes) {
+	res = numBytes;
+    }
+
+    Tcl_DStringFree(&bytesBuf);
+    Tcl_DStringFree(&trimBuf);
+
+    return res;
+}
 
 /*
  *----------------------------------------------------------------------
  *
  * TclTrimLeft --
  *
- *	Takes two counted strings in the Tcl encoding which must both be null
- *	terminated. Conceptually trims from the left side of the first string
- *	all characters found in the second string.
+ *	Takes two counted strings in the Tcl encoding.  Conceptually
+ *	finds the sub string (offset) to trim from the left side of the
+ *	first string all characters found in the second string.
  *
  * Results:
  *	The number of bytes to be removed from the start of the string.
@@ -1737,8 +1793,8 @@ TclTrimRight(
  *----------------------------------------------------------------------
  */
 
-int
-TclTrimLeft(
+static inline int
+TrimLeft(
     const char *bytes,		/* String to be trimmed... */
     int numBytes,		/* ...and its length in bytes */
     const char *trim,		/* String of trim characters... */
@@ -1746,18 +1802,6 @@ TclTrimLeft(
 {
     const char *p = bytes;
 
-    if ((bytes[numBytes] != '\0') || (trim[numTrim] != '\0')) {
-	Tcl_Panic("TclTrimLeft works only on null-terminated strings");
-    }
-
-    /*
-     * Empty strings -> nothing to do.
-     */
-
-    if ((numBytes == 0) || (numTrim == 0)) {
-	return 0;
-    }
-
     /*
      * Outer loop: iterate over string to be trimmed.
      */
@@ -1794,10 +1838,99 @@ TclTrimLeft(
 
 	p += pInc;
 	numBytes -= pInc;
-    } while (numBytes);
+    } while (numBytes > 0);
 
     return p - bytes;
 }
+
+int
+TclTrimLeft(
+    const char *bytes,	/* String to be trimmed... */
+    int numBytes,	/* ...and its length in bytes */
+    const char *trim,	/* String of trim characters... */
+    int numTrim)	/* ...and its length in bytes */
+{
+    int res;
+    Tcl_DString bytesBuf, trimBuf;
+
+    /* Empty strings -> nothing to do */
+    if ((numBytes == 0) || (numTrim == 0)) {
+	return 0;
+    }
+
+    Tcl_DStringInit(&bytesBuf);
+    Tcl_DStringInit(&trimBuf);
+    bytes = UtfWellFormedEnd(&bytesBuf, bytes, numBytes);
+    trim = UtfWellFormedEnd(&trimBuf, trim, numTrim);
+
+    res = TrimLeft(bytes, numBytes, trim, numTrim);
+    if (res > numBytes) {
+	res = numBytes;
+    }
+
+    Tcl_DStringFree(&bytesBuf);
+    Tcl_DStringFree(&trimBuf);
+
+    return res;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * TclTrim --
+ *	Finds the sub string (offset) to trim from both sides of the
+ *	first string all characters found in the second string.
+ *
+ * Results:
+ *	The number of bytes to be removed from the start of the string
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int
+TclTrim(
+    const char *bytes,	/* String to be trimmed... */
+    int numBytes,	/* ...and its length in bytes */
+    const char *trim,	/* String of trim characters... */
+    int numTrim,	/* ...and its length in bytes */
+    int *trimRight)		/* Offset from the end of the string. */
+{
+    int trimLeft;
+    Tcl_DString bytesBuf, trimBuf;
+
+    *trimRight = 0;
+    /* Empty strings -> nothing to do */
+    if ((numBytes == 0) || (numTrim == 0)) {
+	return 0;
+    }
+
+    Tcl_DStringInit(&bytesBuf);
+    Tcl_DStringInit(&trimBuf);
+    bytes = UtfWellFormedEnd(&bytesBuf, bytes, numBytes);
+    trim = UtfWellFormedEnd(&trimBuf, trim, numTrim);
+
+    trimLeft = TrimLeft(bytes, numBytes, trim, numTrim);
+    if (trimLeft > numBytes) {
+	trimLeft = numBytes;
+    }
+    numBytes -= trimLeft;
+    /* have to trim yet (first char was already verified within TrimLeft) */
+    if (numBytes > 1) {
+	bytes += trimLeft;
+	*trimRight = TrimRight(bytes, numBytes, trim, numTrim);
+	if (*trimRight > numBytes) {
+	    *trimRight = numBytes;
+	}
+    }
+
+    Tcl_DStringFree(&bytesBuf);
+    Tcl_DStringFree(&trimBuf);
+
+    return trimLeft;
+}
 
 /*
  *----------------------------------------------------------------------
@@ -1865,30 +1998,20 @@ Tcl_Concat(
     result = ckalloc((unsigned) (bytesNeeded + argc));
 
     for (p = result, i = 0;  i < argc;  i++) {
-	int trim, elemLength;
+	int triml, trimr, elemLength;
 	const char *element;
 
 	element = argv[i];
 	elemLength = strlen(argv[i]);
 
-	/*
-	 * Trim away the leading whitespace.
-	 */
+	/* Trim away the leading/trailing whitespace. */
+	triml = TclTrim(element, elemLength, CONCAT_TRIM_SET,
+		CONCAT_WS_SIZE, &trimr);
+	element += triml;
+	elemLength -= triml + trimr;
 
-	trim = TclTrimLeft(element, elemLength, CONCAT_TRIM_SET,
-		CONCAT_WS_SIZE);
-	element += trim;
-	elemLength -= trim;
-
-	/*
-	 * Trim away the trailing whitespace. Do not permit trimming to expose
-	 * a final backslash character.
-	 */
-
-	trim = TclTrimRight(element, elemLength, CONCAT_TRIM_SET,
-		CONCAT_WS_SIZE);
-	trim -= trim && (element[elemLength - trim - 1] == '\\');
-	elemLength -= trim;
+	/* Do not permit trimming to expose a final backslash character. */
+	elemLength += trimr && (element[elemLength - 1] == '\\');
 
 	/*
 	 * If we're left with empty element after trimming, do nothing.
@@ -2008,28 +2131,18 @@ Tcl_ConcatObj(
     Tcl_SetObjLength(resPtr, 0);
 
     for (i = 0;  i < objc;  i++) {
-	int trim;
+	int triml, trimr;
 
 	element = TclGetStringFromObj(objv[i], &elemLength);
 
-	/*
-	 * Trim away the leading whitespace.
-	 */
+	/* Trim away the leading/trailing whitespace. */
+	triml = TclTrim(element, elemLength, CONCAT_TRIM_SET,
+		CONCAT_WS_SIZE, &trimr);
+	element += triml;
+	elemLength -= triml + trimr;
 
-	trim = TclTrimLeft(element, elemLength, CONCAT_TRIM_SET,
-		CONCAT_WS_SIZE);
-	element += trim;
-	elemLength -= trim;
-
-	/*
-	 * Trim away the trailing whitespace. Do not permit trimming to expose
-	 * a final backslash character.
-	 */
-
-	trim = TclTrimRight(element, elemLength, CONCAT_TRIM_SET,
-		CONCAT_WS_SIZE);
-	trim -= trim && (element[elemLength - trim - 1] == '\\');
-	elemLength -= trim;
+	/* Do not permit trimming to expose a final backslash character. */
+	elemLength += trimr && (element[elemLength - 1] == '\\');
 
 	/*
 	 * If we're left with empty element after trimming, do nothing.
@@ -3575,13 +3688,7 @@ TclGetIntForIndex(
 	return TCL_OK;
     }
 
-    if (SetEndOffsetFromAny(NULL, objPtr) == TCL_OK) {
-	/*
-	 * If the object is already an offset from the end of the list, or can
-	 * be converted to one, use it.
-	 */
-
-	*indexPtr = endValue + objPtr->internalRep.longValue;
+    if (GetEndOffsetFromObj(objPtr, endValue, indexPtr) == TCL_OK) {
 	return TCL_OK;
     }
 
@@ -3681,6 +3788,41 @@ UpdateStringOfEndOffset(
     objPtr->length = len;
 }
 
+/*
+ *----------------------------------------------------------------------
+ *
+ * GetEndOffsetFromObj --
+ *
+ *      Look for a string of the form "end[+-]offset" and convert it to an
+ *      internal representation holding the offset.
+ *
+ * Results:
+ *      Tcl return code.
+ *
+ * Side effects:
+ *      May store a Tcl_ObjType.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int
+GetEndOffsetFromObj(
+    Tcl_Obj *objPtr,            /* Pointer to the object to parse */
+    int endValue,               /* The value to be stored at "indexPtr" if
+                                 * "objPtr" holds "end". */
+    int *indexPtr)              /* Location filled in with an integer
+                                 * representing an index. */
+{
+    if (SetEndOffsetFromAny(NULL, objPtr) != TCL_OK) {
+	return TCL_ERROR;
+    }
+
+    /* TODO: Handle overflow cases sensibly */
+    *indexPtr = endValue + (int)objPtr->internalRep.longValue;
+    return TCL_OK;
+}
+
+    
 /*
  *----------------------------------------------------------------------
  *
@@ -3750,6 +3892,8 @@ SetEndOffsetFromAny(
 	    return TCL_ERROR;
 	}
 	if (bytes[3] == '-') {
+
+	    /* TODO: Review overflow concerns here! */
 	    offset = -offset;
 	}
     } else {
@@ -3778,6 +3922,143 @@ SetEndOffsetFromAny(
     return TCL_OK;
 }
 
+/*
+ *----------------------------------------------------------------------
+ *
+ * TclIndexEncode --
+ *
+ *      Parse objPtr to determine if it is an index value. Two cases
+ *	are possible.  The value objPtr might be parsed as an absolute
+ *	index value in the C signed int range.  Note that this includes
+ *	index values that are integers as presented and it includes index
+ *      arithmetic expressions. The absolute index values that can be
+ *	directly meaningful as an index into either a list or a string are
+ *	those integer values >= TCL_INDEX_START (0)
+ *	and < TCL_INDEX_AFTER (INT_MAX).
+ *      The largest string supported in Tcl 8 has bytelength INT_MAX.
+ *      This means the largest supported character length is also INT_MAX,
+ *      and the index of the last character in a string of length INT_MAX
+ *      is INT_MAX-1.
+ *
+ *      Any absolute index value parsed outside that range is encoded
+ *      using the before and after values passed in by the
+ *      caller as the encoding to use for indices that are either
+ *      less than or greater than the usable index range. TCL_INDEX_AFTER
+ *      is available as a good choice for most callers to use for
+ *      after. Likewise, the value TCL_INDEX_BEFORE is good for
+ *      most callers to use for before.  Other values are possible
+ *      when the caller knows it is helpful in producing its own behavior
+ *      for indices before and after the indexed item.
+ *
+ *      A token can also be parsed as an end-relative index expression.
+ *      All end-relative expressions that indicate an index larger
+ *      than end (end+2, end--5) point beyond the end of the indexed
+ *      collection, and can be encoded as after.  The end-relative
+ *      expressions that indicate an index less than or equal to end
+ *      are encoded relative to the value TCL_INDEX_END (-2).  The
+ *      index "end" is encoded as -2, down to the index "end-0x7ffffffe"
+ *      which is encoded as INT_MIN. Since the largest index into a
+ *      string possible in Tcl 8 is 0x7ffffffe, the interpretation of
+ *      "end-0x7ffffffe" for that largest string would be 0.  Thus,
+ *      if the tokens "end-0x7fffffff" or "end+-0x80000000" are parsed,
+ *      they can be encoded with the before value.
+ *
+ *      These details will require re-examination whenever string and
+ *      list length limits are increased, but that will likely also
+ *      mean a revised routine capable of returning Tcl_WideInt values.
+ *
+ * Returns:
+ *      TCL_OK if parsing succeeded, and TCL_ERROR if it failed.
+ *
+ * Side effects:
+ *      When TCL_OK is returned, the encoded index value is written
+ *      to *indexPtr.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int
+TclIndexEncode(
+    Tcl_Interp *interp,	/* For error reporting, may be NULL */
+    Tcl_Obj *objPtr,	/* Index value to parse */
+    int before,		/* Value to return for index before beginning */
+    int after,		/* Value to return for index after end */
+    int *indexPtr)	/* Where to write the encoded answer, not NULL */
+{
+    int idx;
+
+    if (TCL_OK == TclGetIntFromObj(NULL, objPtr, &idx)) {
+        /* We parsed a value in the range INT_MIN...INT_MAX */
+    integerEncode:
+        if (idx < TCL_INDEX_START) {
+            /* All negative absolute indices are "before the beginning" */
+            idx = before;
+        } else if (idx == INT_MAX) {
+            /* This index value is always "after the end" */
+            idx = after;
+        }
+        /* usual case, the absolute index value encodes itself */
+    } else if (TCL_OK == GetEndOffsetFromObj(objPtr, 0, &idx)) {
+        /*
+         * We parsed an end+offset index value. 
+         * idx holds the offset value in the range INT_MIN...INT_MAX.
+         */
+        if (idx > 0) {
+            /*
+             * All end+postive or end-negative expressions 
+             * always indicate "after the end".
+             */
+            idx = after;
+        } else if (idx < INT_MIN - TCL_INDEX_END) {
+            /* These indices always indicate "before the beginning */
+            idx = before;
+        } else {
+            /* Encoded end-positive (or end+negative) are offset */
+            idx += TCL_INDEX_END;
+        }
+
+    /* TODO: Consider flag to suppress repeated end-offset parse. */
+    } else if (TCL_OK == TclGetIntForIndexM(interp, objPtr, 0, &idx)) {
+        /*
+         * Only reach this case when the index value is a
+         * constant index arithmetic expression, and idx
+         * holds the result. Treat it the same as if it were
+         * parsed as an absolute integer value.
+         */
+        goto integerEncode;
+    } else {
+	return TCL_ERROR;
+    }
+    *indexPtr = idx;
+    return TCL_OK;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * TclIndexDecode --
+ *
+ *	Decodes a value previously encoded by TclIndexEncode.  The argument
+ *	endValue indicates what value of "end" should be used in the
+ *	decoding.
+ *
+ * Results:
+ *	The decoded index value.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int
+TclIndexDecode(
+    int encoded,	/* Value to decode */
+    int endValue)	/* Meaning of "end" to use, > TCL_INDEX_END */
+{
+    if (encoded <= TCL_INDEX_END) {
+	return (encoded - TCL_INDEX_END) + endValue;
+    }
+    return encoded;
+}
+
 /*
  *----------------------------------------------------------------------
  *

library/dde/pkgIndex.tcl

@@ -1,7 +1,7 @@
 if {([info commands ::tcl::pkgconfig] eq "")
 	|| ([info sharedlibextension] ne ".dll")} return
 if {[::tcl::pkgconfig get debug]} {
-    package ifneeded dde 1.4.0 [list load [file join $dir tcldde14g.dll] dde]
+    package ifneeded dde 1.4.1 [list load [file join $dir tcldde14g.dll] dde]
 } else {
-    package ifneeded dde 1.4.0 [list load [file join $dir tcldde14.dll] dde]
+    package ifneeded dde 1.4.1 [list load [file join $dir tcldde14.dll] dde]
 }

library/http/pkgIndex.tcl

@@ -1,2 +1,2 @@
 if {![package vsatisfies [package provide Tcl] 8.6-]} {return}
-package ifneeded http 2.8.12 [list tclPkgSetup $dir http 2.8.12 {{http.tcl source {::http::config ::http::formatQuery ::http::geturl ::http::reset ::http::wait ::http::register ::http::unregister ::http::mapReply}}}]
+package ifneeded http 2.9.0 [list tclPkgSetup $dir http 2.9.0 {{http.tcl source {::http::config ::http::formatQuery ::http::geturl ::http::reset ::http::wait ::http::register ::http::unregister ::http::mapReply}}}]

library/reg/pkgIndex.tcl

@@ -1,9 +1,9 @@
 if {([info commands ::tcl::pkgconfig] eq "")
 	|| ([info sharedlibextension] ne ".dll")} return
 if {[::tcl::pkgconfig get debug]} {
-    package ifneeded registry 1.3.2 \
+    package ifneeded registry 1.3.3 \
             [list load [file join $dir tclreg13g.dll] registry]
 } else {
-    package ifneeded registry 1.3.2 \
+    package ifneeded registry 1.3.3 \
             [list load [file join $dir tclreg13.dll] registry]
 }

library/tcltest/pkgIndex.tcl

@@ -8,5 +8,5 @@
 # script is sourced, the variable $dir must contain the
 # full path name of this file's directory.
 
-if {![package vsatisfies [package provide Tcl] 8.5]} {return}
-package ifneeded tcltest 2.4.1 [list source [file join $dir tcltest.tcl]]
+if {![package vsatisfies [package provide Tcl] 8.5-]} {return}
+package ifneeded tcltest 2.5.0 [list source [file join $dir tcltest.tcl]]

library/tcltest/tcltest.tcl

@@ -22,7 +22,7 @@ namespace eval tcltest {
     # When the version number changes, be sure to update the pkgIndex.tcl file,
     # and the install directory in the Makefiles.  When the minor version
     # changes (new feature) be sure to update the man page as well.
-    variable Version 2.4.1
+    variable Version 2.5.0
 
     # Compatibility support for dumb variables defined in tcltest 1
     # Do not use these.  Call [package provide Tcl] and [info patchlevel]
@@ -1841,6 +1841,9 @@ proc tcltest::SubstArguments {argList} {
 #                       is optional; default is {}.
 #   returnCodes -       Expected return codes.  This attribute is
 #                       optional; default is {0 2}.
+#   errorCode -         Expected error code.  This attribute is
+#                       optional; default is {*}. It is a glob pattern.
+#                       If given, returnCodes defaults to {1}.
 #   setup -             Code to run before $script (above).  This
 #                       attribute is optional; default is {}.
 #   cleanup -           Code to run after $script (above).  This
@@ -1882,7 +1885,7 @@ proc tcltest::test {name description args} {
     # Pre-define everything to null except output and errorOutput.  We
     # determine whether or not to trap output based on whether or not
     # these variables (output & errorOutput) are defined.
-    lassign {} constraints setup cleanup body result returnCodes match
+    lassign {} constraints setup cleanup body result returnCodes errorCode match
 
     # Set the default match mode
     set match exact
@@ -1892,6 +1895,9 @@ proc tcltest::test {name description args} {
     # 'return' being used in the test script).
     set returnCodes [list 0 2]
 
+    # Set the default error code pattern
+    set errorCode "*"
+
     # The old test format can't have a 3rd argument (constraints or
     # script) that starts with '-'.
     if {[string match -* [lindex $args 0]] || ([llength $args] <= 1)} {
@@ -1901,7 +1907,7 @@ proc tcltest::test {name description args} {
 		set testAttributes($element) $value
 	    }
 	    foreach item {constraints match setup body cleanup \
-		    result returnCodes output errorOutput} {
+		    result returnCodes errorCode output errorOutput} {
 		if {[info exists testAttributes(-$item)]} {
 		    set testAttributes(-$item) [uplevel 1 \
 			    ::concat $testAttributes(-$item)]
@@ -1912,7 +1918,7 @@ proc tcltest::test {name description args} {
 	}
 
 	set validFlags {-setup -cleanup -body -result -returnCodes \
-		-match -output -errorOutput -constraints}
+		-errorCode -match -output -errorOutput -constraints}
 
 	foreach flag [array names testAttributes] {
 	    if {$flag ni $validFlags} {
@@ -1944,6 +1950,10 @@ proc tcltest::test {name description args} {
 	foreach {strcode numcode} {ok 0 normal 0 error 1 return 2 break 3 continue 4} {
 	    set returnCodes [string map -nocase [list $strcode $numcode] $returnCodes]
 	}
+        # errorCode without returnCode 1 is meaningless
+        if {$errorCode ne "*" && 1 ni $returnCodes} {
+            set returnCodes 1
+        }
     } else {
 	# This is parsing for the old test command format; it is here
 	# for backward compatibility.
@@ -1976,7 +1986,7 @@ proc tcltest::test {name description args} {
     set code [catch {uplevel 1 $setup} setupMsg]
     if {$code == 1} {
 	set errorInfo(setup) $::errorInfo
-	set errorCode(setup) $::errorCode
+	set errorCodeRes(setup) $::errorCode
     }
     set setupFailure [expr {$code != 0}]
 
@@ -2003,7 +2013,7 @@ proc tcltest::test {name description args} {
 	lassign $testResult actualAnswer returnCode
 	if {$returnCode == 1} {
 	    set errorInfo(body) $::errorInfo
-	    set errorCode(body) $::errorCode
+	    set errorCodeRes(body) $::errorCode
 	}
     }
 
@@ -2012,6 +2022,11 @@ proc tcltest::test {name description args} {
     if {!$setupFailure && ($returnCode ni $returnCodes)} {
 	set codeFailure 1
     }
+    set errorCodeFailure 0
+    if {!$setupFailure && !$codeFailure && $returnCode == 1 && \
+                ![string match $errorCode $errorCodeRes(body)]} {
+	set errorCodeFailure 1
+    }
 
     # If expected output/error strings exist, we have to compare
     # them.  If the comparison fails, then so did the test.
@@ -2055,7 +2070,7 @@ proc tcltest::test {name description args} {
     set code [catch {uplevel 1 $cleanup} cleanupMsg]
     if {$code == 1} {
 	set errorInfo(cleanup) $::errorInfo
-	set errorCode(cleanup) $::errorCode
+	set errorCodeRes(cleanup) $::errorCode
     }
     set cleanupFailure [expr {$code != 0}]
 
@@ -2106,7 +2121,7 @@ proc tcltest::test {name description args} {
     variable numTests
     if {!($setupFailure || $cleanupFailure || $coreFailure
 	    || $outputFailure || $errorFailure || $codeFailure
-	    || $scriptFailure)} {
+	    || $errorCodeFailure || $scriptFailure)} {
 	if {$testLevel == 1} {
 	    incr numTests(Passed)
 	    if {[IsVerbose pass]} {
@@ -2159,7 +2174,7 @@ proc tcltest::test {name description args} {
 		failed:\n$setupMsg"
 	if {[info exists errorInfo(setup)]} {
 	    puts [outputChannel] "---- errorInfo(setup): $errorInfo(setup)"
-	    puts [outputChannel] "---- errorCode(setup): $errorCode(setup)"
+	    puts [outputChannel] "---- errorCode(setup): $errorCodeRes(setup)"
 	}
     }
     if {$scriptFailure} {
@@ -2171,6 +2186,10 @@ proc tcltest::test {name description args} {
 		    ($match matching):\n$result"
 	}
     }
+    if {$errorCodeFailure} {
+	puts [outputChannel] "---- Error code was: '$errorCodeRes(body)'"
+	puts [outputChannel] "---- Error code should have been: '$errorCode'"
+    }
     if {$codeFailure} {
 	switch -- $returnCode {
 	    0 { set msg "Test completed normally" }
@@ -2186,7 +2205,7 @@ proc tcltest::test {name description args} {
 	if {[IsVerbose error]} {
 	    if {[info exists errorInfo(body)] && (1 ni $returnCodes)} {
 		puts [outputChannel] "---- errorInfo: $errorInfo(body)"
-		puts [outputChannel] "---- errorCode: $errorCode(body)"
+		puts [outputChannel] "---- errorCode: $errorCodeRes(body)"
 	    }
 	}
     }
@@ -2212,7 +2231,7 @@ proc tcltest::test {name description args} {
 	puts [outputChannel] "---- Test cleanup failed:\n$cleanupMsg"
 	if {[info exists errorInfo(cleanup)]} {
 	    puts [outputChannel] "---- errorInfo(cleanup): $errorInfo(cleanup)"
-	    puts [outputChannel] "---- errorCode(cleanup): $errorCode(cleanup)"
+	    puts [outputChannel] "---- errorCode(cleanup): $errorCodeRes(cleanup)"
 	}
     }
     if {$coreFailure} {
@@ -2722,7 +2741,7 @@ proc tcltest::GetMatchingDirectories {rootdir} {
 #	shell being tested
 #
 # Results:
-#	None.
+#	Whether there were any failures.
 #
 # Side effects:
 #	None.
@@ -2733,6 +2752,7 @@ proc tcltest::runAllTests { {shell ""} } {
     variable numTests
     variable failFiles
     variable DefaultValue
+    set failFilesAccum {}
 
     FillFilesExisted
     if {[llength [info level 0]] == 1} {
@@ -2822,6 +2842,7 @@ proc tcltest::runAllTests { {shell ""} } {
 			}
 			if {$Failed > 0} {
 			    lappend failFiles $testFile
+			    lappend failFilesAccum $testFile
 			}
 		    } elseif {[regexp [join {
 			    {^Number of tests skipped }
@@ -2868,7 +2889,7 @@ proc tcltest::runAllTests { {shell ""} } {
 	puts [outputChannel] ""
 	puts [outputChannel] [string repeat ~ 44]
     }
-    return
+    return [expr {[info exists testFileFailures] || [llength $failFilesAccum]}]
 }
 
 #####################################################################

library/tzdata/Africa/Accra

@@ -2,51 +2,51 @@
 
 set TZData(:Africa/Accra) {
     {-9223372036854775808 -52 0 LMT}
-    {-1640995148 0 0 +0020}
-    {-1556841600 1200 1 +0020}
-    {-1546388400 0 0 +0020}
-    {-1525305600 1200 1 +0020}
-    {-1514852400 0 0 +0020}
-    {-1493769600 1200 1 +0020}
-    {-1483316400 0 0 +0020}
-    {-1462233600 1200 1 +0020}
-    {-1451780400 0 0 +0020}
-    {-1430611200 1200 1 +0020}
-    {-1420158000 0 0 +0020}
-    {-1399075200 1200 1 +0020}
-    {-1388622000 0 0 +0020}
-    {-1367539200 1200 1 +0020}
-    {-1357086000 0 0 +0020}
-    {-1336003200 1200 1 +0020}
-    {-1325550000 0 0 +0020}
-    {-1304380800 1200 1 +0020}
-    {-1293927600 0 0 +0020}
-    {-1272844800 1200 1 +0020}
-    {-1262391600 0 0 +0020}
-    {-1241308800 1200 1 +0020}
-    {-1230855600 0 0 +0020}
-    {-1209772800 1200 1 +0020}
-    {-1199319600 0 0 +0020}
-    {-1178150400 1200 1 +0020}
-    {-1167697200 0 0 +0020}
-    {-1146614400 1200 1 +0020}
-    {-1136161200 0 0 +0020}
-    {-1115078400 1200 1 +0020}
-    {-1104625200 0 0 +0020}
-    {-1083542400 1200 1 +0020}
-    {-1073089200 0 0 +0020}
-    {-1051920000 1200 1 +0020}
-    {-1041466800 0 0 +0020}
-    {-1020384000 1200 1 +0020}
-    {-1009930800 0 0 +0020}
-    {-988848000 1200 1 +0020}
-    {-978394800 0 0 +0020}
-    {-957312000 1200 1 +0020}
-    {-946858800 0 0 +0020}
-    {-925689600 1200 1 +0020}
-    {-915236400 0 0 +0020}
-    {-894153600 1200 1 +0020}
-    {-883700400 0 0 +0020}
-    {-862617600 1200 1 +0020}
-    {-852164400 0 0 +0020}
+    {-1640995148 0 0 GMT}
+    {-1556841600 1200 1 GMT}
+    {-1546388400 0 0 GMT}
+    {-1525305600 1200 1 GMT}
+    {-1514852400 0 0 GMT}
+    {-1493769600 1200 1 GMT}
+    {-1483316400 0 0 GMT}
+    {-1462233600 1200 1 GMT}
+    {-1451780400 0 0 GMT}
+    {-1430611200 1200 1 GMT}
+    {-1420158000 0 0 GMT}
+    {-1399075200 1200 1 GMT}
+    {-1388622000 0 0 GMT}
+    {-1367539200 1200 1 GMT}
+    {-1357086000 0 0 GMT}
+    {-1336003200 1200 1 GMT}
+    {-1325550000 0 0 GMT}
+    {-1304380800 1200 1 GMT}
+    {-1293927600 0 0 GMT}
+    {-1272844800 1200 1 GMT}
+    {-1262391600 0 0 GMT}
+    {-1241308800 1200 1 GMT}
+    {-1230855600 0 0 GMT}
+    {-1209772800 1200 1 GMT}
+    {-1199319600 0 0 GMT}
+    {-1178150400 1200 1 GMT}
+    {-1167697200 0 0 GMT}
+    {-1146614400 1200 1 GMT}
+    {-1136161200 0 0 GMT}
+    {-1115078400 1200 1 GMT}
+    {-1104625200 0 0 GMT}
+    {-1083542400 1200 1 GMT}
+    {-1073089200 0 0 GMT}
+    {-1051920000 1200 1 GMT}
+    {-1041466800 0 0 GMT}
+    {-1020384000 1200 1 GMT}
+    {-1009930800 0 0 GMT}
+    {-988848000 1200 1 GMT}
+    {-978394800 0 0 GMT}
+    {-957312000 1200 1 GMT}
+    {-946858800 0 0 GMT}
+    {-925689600 1200 1 GMT}
+    {-915236400 0 0 GMT}
+    {-894153600 1200 1 GMT}
+    {-883700400 0 0 GMT}
+    {-862617600 1200 1 GMT}
+    {-852164400 0 0 GMT}
 }

library/tzdata/Africa/Bissau

@@ -2,6 +2,6 @@
 
 set TZData(:Africa/Bissau) {
     {-9223372036854775808 -3740 0 LMT}
-    {-1830380260 -3600 0 -01}
+    {-1830380400 -3600 0 -01}
     {157770000 0 0 GMT}
 }

library/tzdata/Africa/Casablanca

@@ -2,229 +2,59 @@
 
 set TZData(:Africa/Casablanca) {
     {-9223372036854775808 -1820 0 LMT}
-    {-1773012580 0 0 WET}
-    {-956361600 3600 1 WEST}
-    {-950490000 0 0 WET}
-    {-942019200 3600 1 WEST}
-    {-761187600 0 0 WET}
-    {-617241600 3600 1 WEST}
-    {-605149200 0 0 WET}
-    {-81432000 3600 1 WEST}
-    {-71110800 0 0 WET}
-    {141264000 3600 1 WEST}
-    {147222000 0 0 WET}
-    {199756800 3600 1 WEST}
-    {207702000 0 0 WET}
-    {231292800 3600 1 WEST}
-    {244249200 0 0 WET}
-    {265507200 3600 1 WEST}
-    {271033200 0 0 WET}
-    {448243200 3600 0 CET}
-    {504918000 0 0 WET}
-    {1212278400 3600 1 WEST}
-    {1220223600 0 0 WET}
-    {1243814400 3600 1 WEST}
-    {1250809200 0 0 WET}
-    {1272758400 3600 1 WEST}
-    {1281222000 0 0 WET}
-    {1301788800 3600 1 WEST}
-    {1312066800 0 0 WET}
-    {1335664800 3600 1 WEST}
-    {1342749600 0 0 WET}
-    {1345428000 3600 1 WEST}
-    {1348970400 0 0 WET}
-    {1367114400 3600 1 WEST}
-    {1373162400 0 0 WET}
-    {1376100000 3600 1 WEST}
-    {1382839200 0 0 WET}
-    {1396144800 3600 1 WEST}
-    {1403920800 0 0 WET}
-    {1406944800 3600 1 WEST}
-    {1414288800 0 0 WET}
-    {1427594400 3600 1 WEST}
-    {1434247200 0 0 WET}
-    {1437271200 3600 1 WEST}
-    {1445738400 0 0 WET}
-    {1459044000 3600 1 WEST}
-    {1465092000 0 0 WET}
-    {1468116000 3600 1 WEST}
-    {1477792800 0 0 WET}
-    {1490493600 3600 1 WEST}
-    {1495332000 0 0 WET}
-    {1498960800 3600 1 WEST}
-    {1509242400 0 0 WET}
-    {1521943200 3600 1 WEST}
-    {1526176800 0 0 WET}
-    {1529200800 3600 1 WEST}
-    {1540692000 0 0 WET}
-    {1553997600 3600 1 WEST}
-    {1557021600 0 0 WET}
-    {1560045600 3600 1 WEST}
-    {1572141600 0 0 WET}
-    {1585447200 3600 1 WEST}
-    {1587261600 0 0 WET}
-    {1590285600 3600 1 WEST}
-    {1603591200 0 0 WET}
-    {1616896800 3600 1 WEST}
-    {1618106400 0 0 WET}
-    {1621130400 3600 1 WEST}
-    {1635645600 0 0 WET}
-    {1651975200 3600 1 WEST}
-    {1667095200 0 0 WET}
-    {1682215200 3600 1 WEST}
-    {1698544800 0 0 WET}
-    {1713060000 3600 1 WEST}
-    {1729994400 0 0 WET}
-    {1743904800 3600 1 WEST}
-    {1761444000 0 0 WET}
-    {1774749600 3600 1 WEST}
-    {1792893600 0 0 WET}
-    {1806199200 3600 1 WEST}
-    {1824948000 0 0 WET}
-    {1837648800 3600 1 WEST}
-    {1856397600 0 0 WET}
-    {1869098400 3600 1 WEST}
-    {1887847200 0 0 WET}
-    {1901152800 3600 1 WEST}
-    {1919296800 0 0 WET}
-    {1932602400 3600 1 WEST}
-    {1950746400 0 0 WET}
-    {1964052000 3600 1 WEST}
-    {1982800800 0 0 WET}
-    {1995501600 3600 1 WEST}
-    {2014250400 0 0 WET}
-    {2026951200 3600 1 WEST}
-    {2045700000 0 0 WET}
-    {2058400800 3600 1 WEST}
-    {2077149600 0 0 WET}
-    {2090455200 3600 1 WEST}
-    {2107994400 0 0 WET}
-    {2108602800 0 0 WET}
-    {2121904800 3600 1 WEST}
-    {2138234400 0 0 WET}
-    {2140052400 0 0 WET}
-    {2153354400 3600 1 WEST}
-    {2172103200 0 0 WET}
-    {2184804000 3600 1 WEST}
-    {2203552800 0 0 WET}
-    {2216253600 3600 1 WEST}
-    {2235002400 0 0 WET}
-    {2248308000 3600 1 WEST}
-    {2266452000 0 0 WET}
-    {2279757600 3600 1 WEST}
-    {2297901600 0 0 WET}
-    {2311207200 3600 1 WEST}
-    {2329351200 0 0 WET}
-    {2342656800 3600 1 WEST}
-    {2361405600 0 0 WET}
-    {2374106400 3600 1 WEST}
-    {2392855200 0 0 WET}
-    {2405556000 3600 1 WEST}
-    {2424304800 0 0 WET}
-    {2437610400 3600 1 WEST}
-    {2455754400 0 0 WET}
-    {2469060000 3600 1 WEST}
-    {2487204000 0 0 WET}
-    {2500509600 3600 1 WEST}
-    {2519258400 0 0 WET}
-    {2531959200 3600 1 WEST}
-    {2550708000 0 0 WET}
-    {2563408800 3600 1 WEST}
-    {2582157600 0 0 WET}
-    {2595463200 3600 1 WEST}
-    {2613607200 0 0 WET}
-    {2626912800 3600 1 WEST}
-    {2645056800 0 0 WET}
-    {2658362400 3600 1 WEST}
-    {2676506400 0 0 WET}
-    {2689812000 3600 1 WEST}
-    {2708560800 0 0 WET}
-    {2721261600 3600 1 WEST}
-    {2740010400 0 0 WET}
-    {2752711200 3600 1 WEST}
-    {2771460000 0 0 WET}
-    {2784765600 3600 1 WEST}
-    {2802909600 0 0 WET}
-    {2816215200 3600 1 WEST}
-    {2834359200 0 0 WET}
-    {2847664800 3600 1 WEST}
-    {2866413600 0 0 WET}
-    {2879114400 3600 1 WEST}
-    {2897863200 0 0 WET}
-    {2910564000 3600 1 WEST}
-    {2929312800 0 0 WET}
-    {2942013600 3600 1 WEST}
-    {2960762400 0 0 WET}
-    {2974068000 3600 1 WEST}
-    {2992212000 0 0 WET}
-    {3005517600 3600 1 WEST}
-    {3023661600 0 0 WET}
-    {3036967200 3600 1 WEST}
-    {3055716000 0 0 WET}
-    {3068416800 3600 1 WEST}
-    {3087165600 0 0 WET}
-    {3099866400 3600 1 WEST}
-    {3118615200 0 0 WET}
-    {3131920800 3600 1 WEST}
-    {3150064800 0 0 WET}
-    {3163370400 3600 1 WEST}
-    {3181514400 0 0 WET}
-    {3194820000 3600 1 WEST}
-    {3212964000 0 0 WET}
-    {3226269600 3600 1 WEST}
-    {3245018400 0 0 WET}
-    {3257719200 3600 1 WEST}
-    {3276468000 0 0 WET}
-    {3289168800 3600 1 WEST}
-    {3307917600 0 0 WET}
-    {3321223200 3600 1 WEST}
-    {3339367200 0 0 WET}
-    {3352672800 3600 1 WEST}
-    {3370816800 0 0 WET}
-    {3384122400 3600 1 WEST}
-    {3402871200 0 0 WET}
-    {3415572000 3600 1 WEST}
-    {3434320800 0 0 WET}
-    {3447021600 3600 1 WEST}
-    {3465770400 0 0 WET}
-    {3479076000 3600 1 WEST}
-    {3497220000 0 0 WET}
-    {3510525600 3600 1 WEST}
-    {3528669600 0 0 WET}
-    {3541975200 3600 1 WEST}
-    {3560119200 0 0 WET}
-    {3573424800 3600 1 WEST}
-    {3592173600 0 0 WET}
-    {3604874400 3600 1 WEST}
-    {3623623200 0 0 WET}
-    {3636324000 3600 1 WEST}
-    {3655072800 0 0 WET}
-    {3668378400 3600 1 WEST}
-    {3686522400 0 0 WET}
-    {3699828000 3600 1 WEST}
-    {3717972000 0 0 WET}
-    {3731277600 3600 1 WEST}
-    {3750026400 0 0 WET}
-    {3762727200 3600 1 WEST}
-    {3781476000 0 0 WET}
-    {3794176800 3600 1 WEST}
-    {3812925600 0 0 WET}
-    {3825626400 3600 1 WEST}
-    {3844375200 0 0 WET}
-    {3857680800 3600 1 WEST}
-    {3875824800 0 0 WET}
-    {3889130400 3600 1 WEST}
-    {3907274400 0 0 WET}
-    {3920580000 3600 1 WEST}
-    {3939328800 0 0 WET}
-    {3952029600 3600 1 WEST}
-    {3970778400 0 0 WET}
-    {3983479200 3600 1 WEST}
-    {4002228000 0 0 WET}
-    {4015533600 3600 1 WEST}
-    {4033677600 0 0 WET}
-    {4046983200 3600 1 WEST}
-    {4065127200 0 0 WET}
-    {4078432800 3600 1 WEST}
-    {4096576800 0 0 WET}
+    {-1773012580 0 0 +00}
+    {-956361600 3600 1 +00}
+    {-950490000 0 0 +00}
+    {-942019200 3600 1 +00}
+    {-761187600 0 0 +00}
+    {-617241600 3600 1 +00}
+    {-605149200 0 0 +00}
+    {-81432000 3600 1 +00}
+    {-71110800 0 0 +00}
+    {141264000 3600 1 +00}
+    {147222000 0 0 +00}
+    {199756800 3600 1 +00}
+    {207702000 0 0 +00}
+    {231292800 3600 1 +00}
+    {244249200 0 0 +00}
+    {265507200 3600 1 +00}
+    {271033200 0 0 +00}
+    {448243200 3600 0 +01}
+    {504918000 0 0 +00}
+    {1212278400 3600 1 +00}
+    {1220223600 0 0 +00}
+    {1243814400 3600 1 +00}
+    {1250809200 0 0 +00}
+    {1272758400 3600 1 +00}
+    {1281222000 0 0 +00}
+    {1301788800 3600 1 +00}
+    {1312066800 0 0 +00}
+    {1335664800 3600 1 +00}
+    {1342749600 0 0 +00}
+    {1345428000 3600 1 +00}
+    {1348970400 0 0 +00}
+    {1367114400 3600 1 +00}
+    {1373162400 0 0 +00}
+    {1376100000 3600 1 +00}
+    {1382839200 0 0 +00}
+    {1396144800 3600 1 +00}
+    {1403920800 0 0 +00}
+    {1406944800 3600 1 +00}
+    {1414288800 0 0 +00}
+    {1427594400 3600 1 +00}
+    {1434247200 0 0 +00}
+    {1437271200 3600 1 +00}
+    {1445738400 0 0 +00}
+    {1459044000 3600 1 +00}
+    {1465092000 0 0 +00}
+    {1468116000 3600 1 +00}
+    {1477792800 0 0 +00}
+    {1490493600 3600 1 +00}
+    {1495332000 0 0 +00}
+    {1498960800 3600 1 +00}
+    {1509242400 0 0 +00}
+    {1521943200 3600 1 +00}
+    {1526176800 0 0 +00}
+    {1529200800 3600 1 +00}
+    {1540598400 3600 0 +01}
 }

library/tzdata/Africa/Ceuta

@@ -15,6 +15,7 @@ set TZData(:Africa/Ceuta) {
     {-1316390400 3600 1 WEST}
     {-1301270400 0 0 WET}
     {-1293840000 0 0 WET}
+    {-94694400 0 0 WET}
     {-81432000 3600 1 WEST}
     {-71110800 0 0 WET}
     {141264000 3600 1 WEST}

library/tzdata/Africa/El_Aaiun

@@ -3,217 +3,47 @@
 set TZData(:Africa/El_Aaiun) {
     {-9223372036854775808 -3168 0 LMT}
     {-1136070432 -3600 0 -01}
-    {198291600 0 0 WET}
-    {199756800 3600 1 WEST}
-    {207702000 0 0 WET}
-    {231292800 3600 1 WEST}
-    {244249200 0 0 WET}
-    {265507200 3600 1 WEST}
-    {271033200 0 0 WET}
-    {1212278400 3600 1 WEST}
-    {1220223600 0 0 WET}
-    {1243814400 3600 1 WEST}
-    {1250809200 0 0 WET}
-    {1272758400 3600 1 WEST}
-    {1281222000 0 0 WET}
-    {1301788800 3600 1 WEST}
-    {1312066800 0 0 WET}
-    {1335664800 3600 1 WEST}
-    {1342749600 0 0 WET}
-    {1345428000 3600 1 WEST}
-    {1348970400 0 0 WET}
-    {1367114400 3600 1 WEST}
-    {1373162400 0 0 WET}
-    {1376100000 3600 1 WEST}
-    {1382839200 0 0 WET}
-    {1396144800 3600 1 WEST}
-    {1403920800 0 0 WET}
-    {1406944800 3600 1 WEST}
-    {1414288800 0 0 WET}
-    {1427594400 3600 1 WEST}
-    {1434247200 0 0 WET}
-    {1437271200 3600 1 WEST}
-    {1445738400 0 0 WET}
-    {1459044000 3600 1 WEST}
-    {1465092000 0 0 WET}
-    {1468116000 3600 1 WEST}
-    {1477792800 0 0 WET}
-    {1490493600 3600 1 WEST}
-    {1495332000 0 0 WET}
-    {1498960800 3600 1 WEST}
-    {1509242400 0 0 WET}
-    {1521943200 3600 1 WEST}
-    {1526176800 0 0 WET}
-    {1529200800 3600 1 WEST}
-    {1540692000 0 0 WET}
-    {1553997600 3600 1 WEST}
-    {1557021600 0 0 WET}
-    {1560045600 3600 1 WEST}
-    {1572141600 0 0 WET}
-    {1585447200 3600 1 WEST}
-    {1587261600 0 0 WET}
-    {1590285600 3600 1 WEST}
-    {1603591200 0 0 WET}
-    {1616896800 3600 1 WEST}
-    {1618106400 0 0 WET}
-    {1621130400 3600 1 WEST}
-    {1635645600 0 0 WET}
-    {1651975200 3600 1 WEST}
-    {1667095200 0 0 WET}
-    {1682215200 3600 1 WEST}
-    {1698544800 0 0 WET}
-    {1713060000 3600 1 WEST}
-    {1729994400 0 0 WET}
-    {1743904800 3600 1 WEST}
-    {1761444000 0 0 WET}
-    {1774749600 3600 1 WEST}
-    {1792893600 0 0 WET}
-    {1806199200 3600 1 WEST}
-    {1824948000 0 0 WET}
-    {1837648800 3600 1 WEST}
-    {1856397600 0 0 WET}
-    {1869098400 3600 1 WEST}
-    {1887847200 0 0 WET}
-    {1901152800 3600 1 WEST}
-    {1919296800 0 0 WET}
-    {1932602400 3600 1 WEST}
-    {1950746400 0 0 WET}
-    {1964052000 3600 1 WEST}
-    {1982800800 0 0 WET}
-    {1995501600 3600 1 WEST}
-    {2014250400 0 0 WET}
-    {2026951200 3600 1 WEST}
-    {2045700000 0 0 WET}
-    {2058400800 3600 1 WEST}
-    {2077149600 0 0 WET}
-    {2090455200 3600 1 WEST}
-    {2107994400 0 0 WET}
-    {2108602800 0 0 WET}
-    {2121904800 3600 1 WEST}
-    {2138234400 0 0 WET}
-    {2140052400 0 0 WET}
-    {2153354400 3600 1 WEST}
-    {2172103200 0 0 WET}
-    {2184804000 3600 1 WEST}
-    {2203552800 0 0 WET}
-    {2216253600 3600 1 WEST}
-    {2235002400 0 0 WET}
-    {2248308000 3600 1 WEST}
-    {2266452000 0 0 WET}
-    {2279757600 3600 1 WEST}
-    {2297901600 0 0 WET}
-    {2311207200 3600 1 WEST}
-    {2329351200 0 0 WET}
-    {2342656800 3600 1 WEST}
-    {2361405600 0 0 WET}
-    {2374106400 3600 1 WEST}
-    {2392855200 0 0 WET}
-    {2405556000 3600 1 WEST}
-    {2424304800 0 0 WET}
-    {2437610400 3600 1 WEST}
-    {2455754400 0 0 WET}
-    {2469060000 3600 1 WEST}
-    {2487204000 0 0 WET}
-    {2500509600 3600 1 WEST}
-    {2519258400 0 0 WET}
-    {2531959200 3600 1 WEST}
-    {2550708000 0 0 WET}
-    {2563408800 3600 1 WEST}
-    {2582157600 0 0 WET}
-    {2595463200 3600 1 WEST}
-    {2613607200 0 0 WET}
-    {2626912800 3600 1 WEST}
-    {2645056800 0 0 WET}
-    {2658362400 3600 1 WEST}
-    {2676506400 0 0 WET}
-    {2689812000 3600 1 WEST}
-    {2708560800 0 0 WET}
-    {2721261600 3600 1 WEST}
-    {2740010400 0 0 WET}
-    {2752711200 3600 1 WEST}
-    {2771460000 0 0 WET}
-    {2784765600 3600 1 WEST}
-    {2802909600 0 0 WET}
-    {2816215200 3600 1 WEST}
-    {2834359200 0 0 WET}
-    {2847664800 3600 1 WEST}
-    {2866413600 0 0 WET}
-    {2879114400 3600 1 WEST}
-    {2897863200 0 0 WET}
-    {2910564000 3600 1 WEST}
-    {2929312800 0 0 WET}
-    {2942013600 3600 1 WEST}
-    {2960762400 0 0 WET}
-    {2974068000 3600 1 WEST}
-    {2992212000 0 0 WET}
-    {3005517600 3600 1 WEST}
-    {3023661600 0 0 WET}
-    {3036967200 3600 1 WEST}
-    {3055716000 0 0 WET}
-    {3068416800 3600 1 WEST}
-    {3087165600 0 0 WET}
-    {3099866400 3600 1 WEST}
-    {3118615200 0 0 WET}
-    {3131920800 3600 1 WEST}
-    {3150064800 0 0 WET}
-    {3163370400 3600 1 WEST}
-    {3181514400 0 0 WET}
-    {3194820000 3600 1 WEST}
-    {3212964000 0 0 WET}
-    {3226269600 3600 1 WEST}
-    {3245018400 0 0 WET}
-    {3257719200 3600 1 WEST}
-    {3276468000 0 0 WET}
-    {3289168800 3600 1 WEST}
-    {3307917600 0 0 WET}
-    {3321223200 3600 1 WEST}
-    {3339367200 0 0 WET}
-    {3352672800 3600 1 WEST}
-    {3370816800 0 0 WET}
-    {3384122400 3600 1 WEST}
-    {3402871200 0 0 WET}
-    {3415572000 3600 1 WEST}
-    {3434320800 0 0 WET}
-    {3447021600 3600 1 WEST}
-    {3465770400 0 0 WET}
-    {3479076000 3600 1 WEST}
-    {3497220000 0 0 WET}
-    {3510525600 3600 1 WEST}
-    {3528669600 0 0 WET}
-    {3541975200 3600 1 WEST}
-    {3560119200 0 0 WET}
-    {3573424800 3600 1 WEST}
-    {3592173600 0 0 WET}
-    {3604874400 3600 1 WEST}
-    {3623623200 0 0 WET}
-    {3636324000 3600 1 WEST}
-    {3655072800 0 0 WET}
-    {3668378400 3600 1 WEST}
-    {3686522400 0 0 WET}
-    {3699828000 3600 1 WEST}
-    {3717972000 0 0 WET}
-    {3731277600 3600 1 WEST}
-    {3750026400 0 0 WET}
-    {3762727200 3600 1 WEST}
-    {3781476000 0 0 WET}
-    {3794176800 3600 1 WEST}
-    {3812925600 0 0 WET}
-    {3825626400 3600 1 WEST}
-    {3844375200 0 0 WET}
-    {3857680800 3600 1 WEST}
-    {3875824800 0 0 WET}
-    {3889130400 3600 1 WEST}
-    {3907274400 0 0 WET}
-    {3920580000 3600 1 WEST}
-    {3939328800 0 0 WET}
-    {3952029600 3600 1 WEST}
-    {3970778400 0 0 WET}
-    {3983479200 3600 1 WEST}
-    {4002228000 0 0 WET}
-    {4015533600 3600 1 WEST}
-    {4033677600 0 0 WET}
-    {4046983200 3600 1 WEST}
-    {4065127200 0 0 WET}
-    {4078432800 3600 1 WEST}
-    {4096576800 0 0 WET}
+    {198291600 0 0 +00}
+    {199756800 3600 1 +00}
+    {207702000 0 0 +00}
+    {231292800 3600 1 +00}
+    {244249200 0 0 +00}
+    {265507200 3600 1 +00}
+    {271033200 0 0 +00}
+    {1212278400 3600 1 +00}
+    {1220223600 0 0 +00}
+    {1243814400 3600 1 +00}
+    {1250809200 0 0 +00}
+    {1272758400 3600 1 +00}
+    {1281222000 0 0 +00}
+    {1301788800 3600 1 +00}
+    {1312066800 0 0 +00}
+    {1335664800 3600 1 +00}
+    {1342749600 0 0 +00}
+    {1345428000 3600 1 +00}
+    {1348970400 0 0 +00}
+    {1367114400 3600 1 +00}
+    {1373162400 0 0 +00}
+    {1376100000 3600 1 +00}
+    {1382839200 0 0 +00}
+    {1396144800 3600 1 +00}
+    {1403920800 0 0 +00}
+    {1406944800 3600 1 +00}
+    {1414288800 0 0 +00}
+    {1427594400 3600 1 +00}
+    {1434247200 0 0 +00}
+    {1437271200 3600 1 +00}
+    {1445738400 0 0 +00}
+    {1459044000 3600 1 +00}
+    {1465092000 0 0 +00}
+    {1468116000 3600 1 +00}
+    {1477792800 0 0 +00}
+    {1490493600 3600 1 +00}
+    {1495332000 0 0 +00}
+    {1498960800 3600 1 +00}
+    {1509242400 0 0 +00}
+    {1521943200 3600 1 +00}
+    {1526176800 0 0 +00}
+    {1529200800 3600 1 +00}
+    {1540598400 3600 0 +01}
 }

library/tzdata/Africa/Sao_Tome

@@ -3,6 +3,6 @@
 set TZData(:Africa/Sao_Tome) {
     {-9223372036854775808 1616 0 LMT}
     {-2713912016 -2205 0 LMT}
-    {-1830381795 0 0 GMT}
+    {-1830384000 0 0 GMT}
     {1514768400 3600 0 WAT}
 }

library/tzdata/Africa/Windhoek

@@ -7,53 +7,52 @@ set TZData(:Africa/Windhoek) {
     {-860976000 10800 1 SAST}
     {-845254800 7200 0 SAST}
     {637970400 7200 0 CAT}
-    {764200800 3600 0 WAT}
-    {764204400 3600 0 WAT}
-    {778640400 7200 1 WAST}
-    {796780800 3600 0 WAT}
-    {810090000 7200 1 WAST}
-    {828835200 3600 0 WAT}
-    {841539600 7200 1 WAST}
-    {860284800 3600 0 WAT}
-    {873594000 7200 1 WAST}
-    {891734400 3600 0 WAT}
-    {905043600 7200 1 WAST}
-    {923184000 3600 0 WAT}
-    {936493200 7200 1 WAST}
-    {954633600 3600 0 WAT}
-    {967942800 7200 1 WAST}
-    {986083200 3600 0 WAT}
-    {999392400 7200 1 WAST}
-    {1018137600 3600 0 WAT}
-    {1030842000 7200 1 WAST}
-    {1049587200 3600 0 WAT}
-    {1062896400 7200 1 WAST}
-    {1081036800 3600 0 WAT}
-    {1094346000 7200 1 WAST}
-    {1112486400 3600 0 WAT}
-    {1125795600 7200 1 WAST}
-    {1143936000 3600 0 WAT}
-    {1157245200 7200 1 WAST}
-    {1175385600 3600 0 WAT}
-    {1188694800 7200 1 WAST}
-    {1207440000 3600 0 WAT}
-    {1220749200 7200 1 WAST}
-    {1238889600 3600 0 WAT}
-    {1252198800 7200 1 WAST}
-    {1270339200 3600 0 WAT}
-    {1283648400 7200 1 WAST}
-    {1301788800 3600 0 WAT}
-    {1315098000 7200 1 WAST}
-    {1333238400 3600 0 WAT}
-    {1346547600 7200 1 WAST}
-    {1365292800 3600 0 WAT}
-    {1377997200 7200 1 WAST}
-    {1396742400 3600 0 WAT}
-    {1410051600 7200 1 WAST}
-    {1428192000 3600 0 WAT}
-    {1441501200 7200 1 WAST}
-    {1459641600 3600 0 WAT}
-    {1472950800 7200 1 WAST}
-    {1491091200 3600 0 WAT}
+    {764200800 3600 1 WAT}
+    {778640400 7200 0 CAT}
+    {796780800 3600 1 WAT}
+    {810090000 7200 0 CAT}
+    {828835200 3600 1 WAT}
+    {841539600 7200 0 CAT}
+    {860284800 3600 1 WAT}
+    {873594000 7200 0 CAT}
+    {891734400 3600 1 WAT}
+    {905043600 7200 0 CAT}
+    {923184000 3600 1 WAT}
+    {936493200 7200 0 CAT}
+    {954633600 3600 1 WAT}
+    {967942800 7200 0 CAT}
+    {986083200 3600 1 WAT}
+    {999392400 7200 0 CAT}
+    {1018137600 3600 1 WAT}
+    {1030842000 7200 0 CAT}
+    {1049587200 3600 1 WAT}
+    {1062896400 7200 0 CAT}
+    {1081036800 3600 1 WAT}
+    {1094346000 7200 0 CAT}
+    {1112486400 3600 1 WAT}
+    {1125795600 7200 0 CAT}
+    {1143936000 3600 1 WAT}
+    {1157245200 7200 0 CAT}
+    {1175385600 3600 1 WAT}
+    {1188694800 7200 0 CAT}
+    {1207440000 3600 1 WAT}
+    {1220749200 7200 0 CAT}
+    {1238889600 3600 1 WAT}
+    {1252198800 7200 0 CAT}
+    {1270339200 3600 1 WAT}
+    {1283648400 7200 0 CAT}
+    {1301788800 3600 1 WAT}
+    {1315098000 7200 0 CAT}
+    {1333238400 3600 1 WAT}
+    {1346547600 7200 0 CAT}
+    {1365292800 3600 1 WAT}
+    {1377997200 7200 0 CAT}
+    {1396742400 3600 1 WAT}
+    {1410051600 7200 0 CAT}
+    {1428192000 3600 1 WAT}
+    {1441501200 7200 0 CAT}
+    {1459641600 3600 1 WAT}
+    {1472950800 7200 0 CAT}
+    {1491091200 3600 1 WAT}
     {1504400400 7200 0 CAT}
 }

library/tzdata/America/Araguaina

@@ -3,58 +3,58 @@
 set TZData(:America/Araguaina) {
     {-9223372036854775808 -11568 0 LMT}
     {-1767214032 -10800 0 -03}
-    {-1206957600 -7200 1 -02}
+    {-1206957600 -7200 1 -03}
     {-1191362400 -10800 0 -03}
-    {-1175374800 -7200 1 -02}
+    {-1175374800 -7200 1 -03}
     {-1159826400 -10800 0 -03}
-    {-633819600 -7200 1 -02}
+    {-633819600 -7200 1 -03}
     {-622069200 -10800 0 -03}
-    {-602283600 -7200 1 -02}
+    {-602283600 -7200 1 -03}
     {-591832800 -10800 0 -03}
-    {-570747600 -7200 1 -02}
+    {-570747600 -7200 1 -03}
     {-560210400 -10800 0 -03}
-    {-539125200 -7200 1 -02}
+    {-539125200 -7200 1 -03}
     {-531352800 -10800 0 -03}
-    {-191365200 -7200 1 -02}
+    {-191365200 -7200 1 -03}
     {-184197600 -10800 0 -03}
-    {-155163600 -7200 1 -02}
+    {-155163600 -7200 1 -03}
     {-150069600 -10800 0 -03}
-    {-128898000 -7200 1 -02}
+    {-128898000 -7200 1 -03}
     {-121125600 -10800 0 -03}
-    {-99954000 -7200 1 -02}
+    {-99954000 -7200 1 -03}
     {-89589600 -10800 0 -03}
-    {-68418000 -7200 1 -02}
+    {-68418000 -7200 1 -03}
     {-57967200 -10800 0 -03}
-    {499748400 -7200 1 -02}
+    {499748400 -7200 1 -03}
     {511236000 -10800 0 -03}
-    {530593200 -7200 1 -02}
+    {530593200 -7200 1 -03}
     {540266400 -10800 0 -03}
-    {562129200 -7200 1 -02}
+    {562129200 -7200 1 -03}
     {571197600 -10800 0 -03}
-    {592974000 -7200 1 -02}
+    {592974000 -7200 1 -03}
     {602042400 -10800 0 -03}
-    {624423600 -7200 1 -02}
+    {624423600 -7200 1 -03}
     {634701600 -10800 0 -03}
     {653536800 -10800 0 -03}
     {811047600 -10800 0 -03}
-    {813726000 -7200 1 -02}
+    {813726000 -7200 1 -03}
     {824004000 -10800 0 -03}
-    {844570800 -7200 1 -02}
+    {844570800 -7200 1 -03}
     {856058400 -10800 0 -03}
-    {876106800 -7200 1 -02}
+    {876106800 -7200 1 -03}
     {888717600 -10800 0 -03}
-    {908074800 -7200 1 -02}
+    {908074800 -7200 1 -03}
     {919562400 -10800 0 -03}
-    {938919600 -7200 1 -02}
+    {938919600 -7200 1 -03}
     {951616800 -10800 0 -03}
-    {970974000 -7200 1 -02}
+    {970974000 -7200 1 -03}
     {982461600 -10800 0 -03}
-    {1003028400 -7200 1 -02}
+    {1003028400 -7200 1 -03}
     {1013911200 -10800 0 -03}
-    {1036292400 -7200 1 -02}
+    {1036292400 -7200 1 -03}
     {1045360800 -10800 0 -03}
     {1064368800 -10800 0 -03}
-    {1350788400 -7200 0 -02}
+    {1350788400 -7200 0 -03}
     {1361066400 -10800 0 -03}
     {1378000800 -10800 0 -03}
 }

library/tzdata/America/Argentina/Buenos_Aires

@@ -4,64 +4,64 @@ set TZData(:America/Argentina/Buenos_Aires) {
     {-9223372036854775808 -14028 0 LMT}
     {-2372097972 -15408 0 CMT}
     {-1567453392 -14400 0 -04}
-    {-1233432000 -10800 0 -03}
+    {-1233432000 -10800 0 -04}
     {-1222981200 -14400 0 -04}
-    {-1205956800 -10800 1 -03}
+    {-1205956800 -10800 1 -04}
     {-1194037200 -14400 0 -04}
-    {-1172865600 -10800 1 -03}
+    {-1172865600 -10800 1 -04}
     {-1162501200 -14400 0 -04}
-    {-1141329600 -10800 1 -03}
+    {-1141329600 -10800 1 -04}
     {-1130965200 -14400 0 -04}
-    {-1109793600 -10800 1 -03}
+    {-1109793600 -10800 1 -04}
     {-1099429200 -14400 0 -04}
-    {-1078257600 -10800 1 -03}
+    {-1078257600 -10800 1 -04}
     {-1067806800 -14400 0 -04}
-    {-1046635200 -10800 1 -03}
+    {-1046635200 -10800 1 -04}
     {-1036270800 -14400 0 -04}
-    {-1015099200 -10800 1 -03}
+    {-1015099200 -10800 1 -04}
     {-1004734800 -14400 0 -04}
-    {-983563200 -10800 1 -03}
+    {-983563200 -10800 1 -04}
     {-973198800 -14400 0 -04}
-    {-952027200 -10800 1 -03}
+    {-952027200 -10800 1 -04}
     {-941576400 -14400 0 -04}
-    {-931032000 -10800 1 -03}
+    {-931032000 -10800 1 -04}
     {-900882000 -14400 0 -04}
-    {-890337600 -10800 1 -03}
+    {-890337600 -10800 1 -04}
     {-833749200 -14400 0 -04}
-    {-827265600 -10800 1 -03}
+    {-827265600 -10800 1 -04}
     {-752274000 -14400 0 -04}
-    {-733780800 -10800 1 -03}
+    {-733780800 -10800 1 -04}
     {-197326800 -14400 0 -04}
-    {-190843200 -10800 1 -03}
+    {-190843200 -10800 1 -04}
     {-184194000 -14400 0 -04}
-    {-164491200 -10800 1 -03}
+    {-164491200 -10800 1 -04}
     {-152658000 -14400 0 -04}
-    {-132955200 -10800 1 -03}
+    {-132955200 -10800 1 -04}
     {-121122000 -14400 0 -04}
-    {-101419200 -10800 1 -03}
+    {-101419200 -10800 1 -04}
     {-86821200 -14400 0 -04}
-    {-71092800 -10800 1 -03}
+    {-71092800 -10800 1 -04}
     {-54766800 -14400 0 -04}
-    {-39038400 -10800 1 -03}
+    {-39038400 -10800 1 -04}
     {-23317200 -14400 0 -04}
     {-7588800 -10800 0 -03}
-    {128142000 -7200 1 -02}
+    {128142000 -7200 1 -03}
     {136605600 -10800 0 -03}
-    {596948400 -7200 1 -02}
+    {596948400 -7200 1 -03}
     {605066400 -10800 0 -03}
-    {624423600 -7200 1 -02}
+    {624423600 -7200 1 -03}
     {636516000 -10800 0 -03}
-    {656478000 -7200 1 -02}
+    {656478000 -7200 1 -03}
     {667965600 -10800 0 -03}
-    {687927600 -7200 1 -02}
+    {687927600 -7200 1 -03}
     {699415200 -10800 0 -03}
-    {719377200 -7200 1 -02}
+    {719377200 -7200 1 -03}
     {731469600 -10800 0 -03}
     {938916000 -10800 0 -04}
-    {938919600 -10800 1 -03}
+    {938919600 -10800 1 -04}
     {952056000 -10800 0 -03}
-    {1198983600 -7200 1 -02}
+    {1198983600 -7200 1 -03}
     {1205632800 -10800 0 -03}
-    {1224385200 -7200 1 -02}
+    {1224385200 -7200 1 -03}
     {1237082400 -10800 0 -03}
 }

library/tzdata/America/Argentina/Catamarca

@@ -4,65 +4,65 @@ set TZData(:America/Argentina/Catamarca) {
     {-9223372036854775808 -15788 0 LMT}
     {-2372096212 -15408 0 CMT}
     {-1567453392 -14400 0 -04}
-    {-1233432000 -10800 0 -03}
+    {-1233432000 -10800 0 -04}
     {-1222981200 -14400 0 -04}
-    {-1205956800 -10800 1 -03}
+    {-1205956800 -10800 1 -04}
     {-1194037200 -14400 0 -04}
-    {-1172865600 -10800 1 -03}
+    {-1172865600 -10800 1 -04}
     {-1162501200 -14400 0 -04}
-    {-1141329600 -10800 1 -03}
+    {-1141329600 -10800 1 -04}
     {-1130965200 -14400 0 -04}
-    {-1109793600 -10800 1 -03}
+    {-1109793600 -10800 1 -04}
     {-1099429200 -14400 0 -04}
-    {-1078257600 -10800 1 -03}
+    {-1078257600 -10800 1 -04}
     {-1067806800 -14400 0 -04}
-    {-1046635200 -10800 1 -03}
+    {-1046635200 -10800 1 -04}
     {-1036270800 -14400 0 -04}
-    {-1015099200 -10800 1 -03}
+    {-1015099200 -10800 1 -04}
     {-1004734800 -14400 0 -04}
-    {-983563200 -10800 1 -03}
+    {-983563200 -10800 1 -04}
     {-973198800 -14400 0 -04}
-    {-952027200 -10800 1 -03}
+    {-952027200 -10800 1 -04}
     {-941576400 -14400 0 -04}
-    {-931032000 -10800 1 -03}
+    {-931032000 -10800 1 -04}
     {-900882000 -14400 0 -04}
-    {-890337600 -10800 1 -03}
+    {-890337600 -10800 1 -04}
     {-833749200 -14400 0 -04}
-    {-827265600 -10800 1 -03}
+    {-827265600 -10800 1 -04}
     {-752274000 -14400 0 -04}
-    {-733780800 -10800 1 -03}
+    {-733780800 -10800 1 -04}
     {-197326800 -14400 0 -04}
-    {-190843200 -10800 1 -03}
+    {-190843200 -10800 1 -04}
     {-184194000 -14400 0 -04}
-    {-164491200 -10800 1 -03}
+    {-164491200 -10800 1 -04}
     {-152658000 -14400 0 -04}
-    {-132955200 -10800 1 -03}
+    {-132955200 -10800 1 -04}
     {-121122000 -14400 0 -04}
-    {-101419200 -10800 1 -03}
+    {-101419200 -10800 1 -04}
     {-86821200 -14400 0 -04}
-    {-71092800 -10800 1 -03}
+    {-71092800 -10800 1 -04}
     {-54766800 -14400 0 -04}
-    {-39038400 -10800 1 -03}
+    {-39038400 -10800 1 -04}
     {-23317200 -14400 0 -04}
     {-7588800 -10800 0 -03}
-    {128142000 -7200 1 -02}
+    {128142000 -7200 1 -03}
     {136605600 -10800 0 -03}
-    {596948400 -7200 1 -02}
+    {596948400 -7200 1 -03}
     {605066400 -10800 0 -03}
-    {624423600 -7200 1 -02}
+    {624423600 -7200 1 -03}
     {636516000 -10800 0 -03}
-    {656478000 -7200 1 -02}
+    {656478000 -7200 1 -03}
     {667965600 -14400 0 -04}
-    {687931200 -7200 0 -02}
+    {687931200 -7200 0 -03}
     {699415200 -10800 0 -03}
-    {719377200 -7200 1 -02}
+    {719377200 -7200 1 -03}
     {731469600 -10800 0 -03}
     {938916000 -10800 0 -04}
-    {938919600 -10800 1 -03}
+    {938919600 -10800 1 -04}
     {952056000 -10800 0 -03}
     {1086058800 -14400 0 -04}
     {1087704000 -10800 0 -03}
-    {1198983600 -7200 1 -02}
+    {1198983600 -7200 1 -03}
     {1205632800 -10800 0 -03}
     {1224295200 -10800 0 -03}
 }

library/tzdata/America/Argentina/Cordoba

@@ -4,64 +4,64 @@ set TZData(:America/Argentina/Cordoba) {
     {-9223372036854775808 -15408 0 LMT}
     {-2372096592 -15408 0 CMT}
     {-1567453392 -14400 0 -04}
-    {-1233432000 -10800 0 -03}
+    {-1233432000 -10800 0 -04}
     {-1222981200 -14400 0 -04}
-    {-1205956800 -10800 1 -03}
+    {-1205956800 -10800 1 -04}
     {-1194037200 -14400 0 -04}
-    {-1172865600 -10800 1 -03}
+    {-1172865600 -10800 1 -04}
     {-1162501200 -14400 0 -04}
-    {-1141329600 -10800 1 -03}
+    {-1141329600 -10800 1 -04}
     {-1130965200 -14400 0 -04}
-    {-1109793600 -10800 1 -03}
+    {-1109793600 -10800 1 -04}
     {-1099429200 -14400 0 -04}
-    {-1078257600 -10800 1 -03}
+    {-1078257600 -10800 1 -04}
     {-1067806800 -14400 0 -04}
-    {-1046635200 -10800 1 -03}
+    {-1046635200 -10800 1 -04}
     {-1036270800 -14400 0 -04}
-    {-1015099200 -10800 1 -03}
+    {-1015099200 -10800 1 -04}
     {-1004734800 -14400 0 -04}
-    {-983563200 -10800 1 -03}
+    {-983563200 -10800 1 -04}
     {-973198800 -14400 0 -04}
-    {-952027200 -10800 1 -03}
+    {-952027200 -10800 1 -04}
     {-941576400 -14400 0 -04}
-    {-931032000 -10800 1 -03}
+    {-931032000 -10800 1 -04}
     {-900882000 -14400 0 -04}
-    {-890337600 -10800 1 -03}
+    {-890337600 -10800 1 -04}
     {-833749200 -14400 0 -04}
-    {-827265600 -10800 1 -03}
+    {-827265600 -10800 1 -04}
     {-752274000 -14400 0 -04}
-    {-733780800 -10800 1 -03}
+    {-733780800 -10800 1 -04}
     {-197326800 -14400 0 -04}
-    {-190843200 -10800 1 -03}
+    {-190843200 -10800 1 -04}
     {-184194000 -14400 0 -04}
-    {-164491200 -10800 1 -03}
+    {-164491200 -10800 1 -04}
     {-152658000 -14400 0 -04}
-    {-132955200 -10800 1 -03}
+    {-132955200 -10800 1 -04}
     {-121122000 -14400 0 -04}
-    {-101419200 -10800 1 -03}
+    {-101419200 -10800 1 -04}
     {-86821200 -14400 0 -04}
-    {-71092800 -10800 1 -03}
+    {-71092800 -10800 1 -04}
     {-54766800 -14400 0 -04}
-    {-39038400 -10800 1 -03}
+    {-39038400 -10800 1 -04}
     {-23317200 -14400 0 -04}
     {-7588800 -10800 0 -03}
-    {128142000 -7200 1 -02}
+    {128142000 -7200 1 -03}
     {136605600 -10800 0 -03}
-    {596948400 -7200 1 -02}
+    {596948400 -7200 1 -03}
     {605066400 -10800 0 -03}
-    {624423600 -7200 1 -02}
+    {624423600 -7200 1 -03}
     {636516000 -10800 0 -03}
-    {656478000 -7200 1 -02}
+    {656478000 -7200 1 -03}
     {667965600 -14400 0 -04}
-    {687931200 -7200 0 -02}
+    {687931200 -7200 0 -03}
     {699415200 -10800 0 -03}
-    {719377200 -7200 1 -02}
+    {719377200 -7200 1 -03}
     {731469600 -10800 0 -03}
     {938916000 -10800 0 -04}
-    {938919600 -10800 1 -03}
+    {938919600 -10800 1 -04}
     {952056000 -10800 0 -03}
-    {1198983600 -7200 1 -02}
+    {1198983600 -7200 1 -03}
     {1205632800 -10800 0 -03}
-    {1224385200 -7200 1 -02}
+    {1224385200 -7200 1 -03}
     {1237082400 -10800 0 -03}
 }

library/tzdata/America/Argentina/Jujuy

@@ -4,64 +4,64 @@ set TZData(:America/Argentina/Jujuy) {
     {-9223372036854775808 -15672 0 LMT}
     {-2372096328 -15408 0 CMT}
     {-1567453392 -14400 0 -04}
-    {-1233432000 -10800 0 -03}
+    {-1233432000 -10800 0 -04}
     {-1222981200 -14400 0 -04}
-    {-1205956800 -10800 1 -03}
+    {-1205956800 -10800 1 -04}
     {-1194037200 -14400 0 -04}
-    {-1172865600 -10800 1 -03}
+    {-1172865600 -10800 1 -04}
     {-1162501200 -14400 0 -04}
-    {-1141329600 -10800 1 -03}
+    {-1141329600 -10800 1 -04}
     {-1130965200 -14400 0 -04}
-    {-1109793600 -10800 1 -03}
+    {-1109793600 -10800 1 -04}
     {-1099429200 -14400 0 -04}
-    {-1078257600 -10800 1 -03}
+    {-1078257600 -10800 1 -04}
     {-1067806800 -14400 0 -04}
-    {-1046635200 -10800 1 -03}
+    {-1046635200 -10800 1 -04}
     {-1036270800 -14400 0 -04}
-    {-1015099200 -10800 1 -03}
+    {-1015099200 -10800 1 -04}
     {-1004734800 -14400 0 -04}
-    {-983563200 -10800 1 -03}
+    {-983563200 -10800 1 -04}
     {-973198800 -14400 0 -04}
-    {-952027200 -10800 1 -03}
+    {-952027200 -10800 1 -04}
     {-941576400 -14400 0 -04}
-    {-931032000 -10800 1 -03}
+    {-931032000 -10800 1 -04}
     {-900882000 -14400 0 -04}
-    {-890337600 -10800 1 -03}
+    {-890337600 -10800 1 -04}
     {-833749200 -14400 0 -04}
-    {-827265600 -10800 1 -03}
+    {-827265600 -10800 1 -04}
     {-752274000 -14400 0 -04}
-    {-733780800 -10800 1 -03}
+    {-733780800 -10800 1 -04}
     {-197326800 -14400 0 -04}
-    {-190843200 -10800 1 -03}
+    {-190843200 -10800 1 -04}
     {-184194000 -14400 0 -04}
-    {-164491200 -10800 1 -03}
+    {-164491200 -10800 1 -04}
     {-152658000 -14400 0 -04}
-    {-132955200 -10800 1 -03}
+    {-132955200 -10800 1 -04}
     {-121122000 -14400 0 -04}
-    {-101419200 -10800 1 -03}
+    {-101419200 -10800 1 -04}
     {-86821200 -14400 0 -04}
-    {-71092800 -10800 1 -03}
+    {-71092800 -10800 1 -04}
     {-54766800 -14400 0 -04}
-    {-39038400 -10800 1 -03}
+    {-39038400 -10800 1 -04}
     {-23317200 -14400 0 -04}
     {-7588800 -10800 0 -03}
-    {128142000 -7200 1 -02}
+    {128142000 -7200 1 -03}
     {136605600 -10800 0 -03}
-    {596948400 -7200 1 -02}
+    {596948400 -7200 1 -03}
     {605066400 -10800 0 -03}
-    {624423600 -7200 1 -02}
+    {624423600 -7200 1 -03}
     {636516000 -14400 0 -04}
     {657086400 -10800 1 -03}
     {669178800 -14400 0 -04}
     {686721600 -7200 1 -02}
     {694231200 -7200 0 -03}
     {699415200 -10800 0 -03}
-    {719377200 -7200 1 -02}
+    {719377200 -7200 1 -03}
     {731469600 -10800 0 -03}
     {938916000 -10800 0 -04}
-    {938919600 -10800 1 -03}
+    {938919600 -10800 1 -04}
     {952056000 -10800 0 -03}
-    {1198983600 -7200 1 -02}
+    {1198983600 -7200 1 -03}
     {1205632800 -10800 0 -03}
     {1224295200 -10800 0 -03}
 }

library/tzdata/America/Argentina/La_Rioja

@@ -4,66 +4,66 @@ set TZData(:America/Argentina/La_Rioja) {
     {-9223372036854775808 -16044 0 LMT}
     {-2372095956 -15408 0 CMT}
     {-1567453392 -14400 0 -04}
-    {-1233432000 -10800 0 -03}
+    {-1233432000 -10800 0 -04}
     {-1222981200 -14400 0 -04}
-    {-1205956800 -10800 1 -03}
+    {-1205956800 -10800 1 -04}
     {-1194037200 -14400 0 -04}
-    {-1172865600 -10800 1 -03}
+    {-1172865600 -10800 1 -04}
     {-1162501200 -14400 0 -04}
-    {-1141329600 -10800 1 -03}
+    {-1141329600 -10800 1 -04}
     {-1130965200 -14400 0 -04}
-    {-1109793600 -10800 1 -03}
+    {-1109793600 -10800 1 -04}
     {-1099429200 -14400 0 -04}
-    {-1078257600 -10800 1 -03}
+    {-1078257600 -10800 1 -04}
     {-1067806800 -14400 0 -04}
-    {-1046635200 -10800 1 -03}
+    {-1046635200 -10800 1 -04}
     {-1036270800 -14400 0 -04}
-    {-1015099200 -10800 1 -03}
+    {-1015099200 -10800 1 -04}
     {-1004734800 -14400 0 -04}
-    {-983563200 -10800 1 -03}
+    {-983563200 -10800 1 -04}
     {-973198800 -14400 0 -04}
-    {-952027200 -10800 1 -03}
+    {-952027200 -10800 1 -04}
     {-941576400 -14400 0 -04}
-    {-931032000 -10800 1 -03}
+    {-931032000 -10800 1 -04}
     {-900882000 -14400 0 -04}
-    {-890337600 -10800 1 -03}
+    {-890337600 -10800 1 -04}
     {-833749200 -14400 0 -04}
-    {-827265600 -10800 1 -03}
+    {-827265600 -10800 1 -04}
     {-752274000 -14400 0 -04}
-    {-733780800 -10800 1 -03}
+    {-733780800 -10800 1 -04}
     {-197326800 -14400 0 -04}
-    {-190843200 -10800 1 -03}
+    {-190843200 -10800 1 -04}
     {-184194000 -14400 0 -04}
-    {-164491200 -10800 1 -03}
+    {-164491200 -10800 1 -04}
     {-152658000 -14400 0 -04}
-    {-132955200 -10800 1 -03}
+    {-132955200 -10800 1 -04}
     {-121122000 -14400 0 -04}
-    {-101419200 -10800 1 -03}
+    {-101419200 -10800 1 -04}
     {-86821200 -14400 0 -04}
-    {-71092800 -10800 1 -03}
+    {-71092800 -10800 1 -04}
     {-54766800 -14400 0 -04}
-    {-39038400 -10800 1 -03}
+    {-39038400 -10800 1 -04}
     {-23317200 -14400 0 -04}
     {-7588800 -10800 0 -03}
-    {128142000 -7200 1 -02}
+    {128142000 -7200 1 -03}
     {136605600 -10800 0 -03}
-    {596948400 -7200 1 -02}
+    {596948400 -7200 1 -03}
     {605066400 -10800 0 -03}
-    {624423600 -7200 1 -02}
+    {624423600 -7200 1 -03}
     {636516000 -10800 0 -03}
-    {656478000 -7200 1 -02}
+    {656478000 -7200 1 -03}
     {667792800 -14400 0 -04}
     {673588800 -10800 0 -03}
-    {687927600 -7200 1 -02}
+    {687927600 -7200 1 -03}
     {699415200 -10800 0 -03}
-    {719377200 -7200 1 -02}
+    {719377200 -7200 1 -03}
     {731469600 -10800 0 -03}
     {938916000 -10800 0 -04}
-    {938919600 -10800 1 -03}
+    {938919600 -10800 1 -04}
     {952056000 -10800 0 -03}
     {1086058800 -14400 0 -04}
     {1087704000 -10800 0 -03}
-    {1198983600 -7200 1 -02}
+    {1198983600 -7200 1 -03}
     {1205632800 -10800 0 -03}
     {1224295200 -10800 0 -03}
 }

library/tzdata/America/Argentina/Mendoza

@@ -4,65 +4,65 @@ set TZData(:America/Argentina/Mendoza) {
     {-9223372036854775808 -16516 0 LMT}
     {-2372095484 -15408 0 CMT}
     {-1567453392 -14400 0 -04}
-    {-1233432000 -10800 0 -03}
+    {-1233432000 -10800 0 -04}
     {-1222981200 -14400 0 -04}
-    {-1205956800 -10800 1 -03}
+    {-1205956800 -10800 1 -04}
     {-1194037200 -14400 0 -04}
-    {-1172865600 -10800 1 -03}
+    {-1172865600 -10800 1 -04}
     {-1162501200 -14400 0 -04}
-    {-1141329600 -10800 1 -03}
+    {-1141329600 -10800 1 -04}
     {-1130965200 -14400 0 -04}
-    {-1109793600 -10800 1 -03}
+    {-1109793600 -10800 1 -04}
     {-1099429200 -14400 0 -04}
-    {-1078257600 -10800 1 -03}
+    {-1078257600 -10800 1 -04}
     {-1067806800 -14400 0 -04}
-    {-1046635200 -10800 1 -03}
+    {-1046635200 -10800 1 -04}
     {-1036270800 -14400 0 -04}
-    {-1015099200 -10800 1 -03}
+    {-1015099200 -10800 1 -04}
     {-1004734800 -14400 0 -04}
-    {-983563200 -10800 1 -03}
+    {-983563200 -10800 1 -04}
     {-973198800 -14400 0 -04}
-    {-952027200 -10800 1 -03}
+    {-952027200 -10800 1 -04}
     {-941576400 -14400 0 -04}
-    {-931032000 -10800 1 -03}
+    {-931032000 -10800 1 -04}
     {-900882000 -14400 0 -04}
-    {-890337600 -10800 1 -03}
+    {-890337600 -10800 1 -04}
     {-833749200 -14400 0 -04}
-    {-827265600 -10800 1 -03}
+    {-827265600 -10800 1 -04}
     {-752274000 -14400 0 -04}
-    {-733780800 -10800 1 -03}
+    {-733780800 -10800 1 -04}
     {-197326800 -14400 0 -04}
-    {-190843200 -10800 1 -03}
+    {-190843200 -10800 1 -04}
     {-184194000 -14400 0 -04}
-    {-164491200 -10800 1 -03}
+    {-164491200 -10800 1 -04}
     {-152658000 -14400 0 -04}
-    {-132955200 -10800 1 -03}
+    {-132955200 -10800 1 -04}
     {-121122000 -14400 0 -04}
-    {-101419200 -10800 1 -03}
+    {-101419200 -10800 1 -04}
     {-86821200 -14400 0 -04}
-    {-71092800 -10800 1 -03}
+    {-71092800 -10800 1 -04}
     {-54766800 -14400 0 -04}
-    {-39038400 -10800 1 -03}
+    {-39038400 -10800 1 -04}
     {-23317200 -14400 0 -04}
     {-7588800 -10800 0 -03}
-    {128142000 -7200 1 -02}
+    {128142000 -7200 1 -03}
     {136605600 -10800 0 -03}
-    {596948400 -7200 1 -02}
+    {596948400 -7200 1 -03}
     {605066400 -10800 0 -03}
-    {624423600 -7200 1 -02}
+    {624423600 -7200 1 -03}
     {636516000 -14400 0 -04}
     {655963200 -10800 1 -03}
     {667796400 -14400 0 -04}
     {687499200 -10800 1 -03}
     {699418800 -14400 0 -04}
-    {719380800 -7200 0 -02}
+    {719380800 -7200 0 -03}
     {731469600 -10800 0 -03}
     {938916000 -10800 0 -04}
-    {938919600 -10800 1 -03}
+    {938919600 -10800 1 -04}
     {952056000 -10800 0 -03}
     {1085281200 -14400 0 -04}
     {1096171200 -10800 0 -03}
-    {1198983600 -7200 1 -02}
+    {1198983600 -7200 1 -03}
     {1205632800 -10800 0 -03}
     {1224295200 -10800 0 -03}
 }

library/tzdata/America/Argentina/Rio_Gallegos

@@ -4,65 +4,65 @@ set TZData(:America/Argentina/Rio_Gallegos) {
     {-9223372036854775808 -16612 0 LMT}
     {-2372095388 -15408 0 CMT}
     {-1567453392 -14400 0 -04}
-    {-1233432000 -10800 0 -03}
+    {-1233432000 -10800 0 -04}
     {-1222981200 -14400 0 -04}
-    {-1205956800 -10800 1 -03}
+    {-1205956800 -10800 1 -04}
     {-1194037200 -14400 0 -04}
-    {-1172865600 -10800 1 -03}
+    {-1172865600 -10800 1 -04}
     {-1162501200 -14400 0 -04}
-    {-1141329600 -10800 1 -03}
+    {-1141329600 -10800 1 -04}
     {-1130965200 -14400 0 -04}
-    {-1109793600 -10800 1 -03}
+    {-1109793600 -10800 1 -04}
     {-1099429200 -14400 0 -04}
-    {-1078257600 -10800 1 -03}
+    {-1078257600 -10800 1 -04}
     {-1067806800 -14400 0 -04}
-    {-1046635200 -10800 1 -03}
+    {-1046635200 -10800 1 -04}
     {-1036270800 -14400 0 -04}
-    {-1015099200 -10800 1 -03}
+    {-1015099200 -10800 1 -04}
     {-1004734800 -14400 0 -04}
-    {-983563200 -10800 1 -03}
+    {-983563200 -10800 1 -04}
     {-973198800 -14400 0 -04}
-    {-952027200 -10800 1 -03}
+    {-952027200 -10800 1 -04}
     {-941576400 -14400 0 -04}
-    {-931032000 -10800 1 -03}
+    {-931032000 -10800 1 -04}
     {-900882000 -14400 0 -04}
-    {-890337600 -10800 1 -03}
+    {-890337600 -10800 1 -04}
     {-833749200 -14400 0 -04}
-    {-827265600 -10800 1 -03}
+    {-827265600 -10800 1 -04}
     {-752274000 -14400 0 -04}
-    {-733780800 -10800 1 -03}
+    {-733780800 -10800 1 -04}
     {-197326800 -14400 0 -04}
-    {-190843200 -10800 1 -03}
+    {-190843200 -10800 1 -04}
     {-184194000 -14400 0 -04}
-    {-164491200 -10800 1 -03}
+    {-164491200 -10800 1 -04}
     {-152658000 -14400 0 -04}
-    {-132955200 -10800 1 -03}
+    {-132955200 -10800 1 -04}
     {-121122000 -14400 0 -04}
-    {-101419200 -10800 1 -03}
+    {-101419200 -10800 1 -04}
     {-86821200 -14400 0 -04}
-    {-71092800 -10800 1 -03}
+    {-71092800 -10800 1 -04}
     {-54766800 -14400 0 -04}
-    {-39038400 -10800 1 -03}
+    {-39038400 -10800 1 -04}
     {-23317200 -14400 0 -04}
     {-7588800 -10800 0 -03}
-    {128142000 -7200 1 -02}
+    {128142000 -7200 1 -03}
     {136605600 -10800 0 -03}
-    {596948400 -7200 1 -02}
+    {596948400 -7200 1 -03}
     {605066400 -10800 0 -03}
-    {624423600 -7200 1 -02}
+    {624423600 -7200 1 -03}
     {636516000 -10800 0 -03}
-    {656478000 -7200 1 -02}
+    {656478000 -7200 1 -03}
     {667965600 -10800 0 -03}
-    {687927600 -7200 1 -02}
+    {687927600 -7200 1 -03}
     {699415200 -10800 0 -03}
-    {719377200 -7200 1 -02}
+    {719377200 -7200 1 -03}
     {731469600 -10800 0 -03}
     {938916000 -10800 0 -04}
-    {938919600 -10800 1 -03}
+    {938919600 -10800 1 -04}
     {952056000 -10800 0 -03}
     {1086058800 -14400 0 -04}
     {1087704000 -10800 0 -03}
-    {1198983600 -7200 1 -02}
+    {1198983600 -7200 1 -03}
     {1205632800 -10800 0 -03}
     {1224295200 -10800 0 -03}
 }

library/tzdata/America/Argentina/Salta

@@ -4,63 +4,63 @@ set TZData(:America/Argentina/Salta) {
     {-9223372036854775808 -15700 0 LMT}
     {-2372096300 -15408 0 CMT}
     {-1567453392 -14400 0 -04}
-    {-1233432000 -10800 0 -03}
+    {-1233432000 -10800 0 -04}
     {-1222981200 -14400 0 -04}
-    {-1205956800 -10800 1 -03}
+    {-1205956800 -10800 1 -04}
     {-1194037200 -14400 0 -04}
-    {-1172865600 -10800 1 -03}
+    {-1172865600 -10800 1 -04}
     {-1162501200 -14400 0 -04}
-    {-1141329600 -10800 1 -03}
+    {-1141329600 -10800 1 -04}
     {-1130965200 -14400 0 -04}
-    {-1109793600 -10800 1 -03}
+    {-1109793600 -10800 1 -04}
     {-1099429200 -14400 0 -04}
-    {-1078257600 -10800 1 -03}
+    {-1078257600 -10800 1 -04}
     {-1067806800 -14400 0 -04}
-    {-1046635200 -10800 1 -03}
+    {-1046635200 -10800 1 -04}
     {-1036270800 -14400 0 -04}
-    {-1015099200 -10800 1 -03}
+    {-1015099200 -10800 1 -04}
     {-1004734800 -14400 0 -04}
-    {-983563200 -10800 1 -03}
+    {-983563200 -10800 1 -04}
     {-973198800 -14400 0 -04}
-    {-952027200 -10800 1 -03}
+    {-952027200 -10800 1 -04}
     {-941576400 -14400 0 -04}
-    {-931032000 -10800 1 -03}
+    {-931032000 -10800 1 -04}
     {-900882000 -14400 0 -04}
-    {-890337600 -10800 1 -03}
+    {-890337600 -10800 1 -04}
     {-833749200 -14400 0 -04}
-    {-827265600 -10800 1 -03}
+    {-827265600 -10800 1 -04}
     {-752274000 -14400 0 -04}
-    {-733780800 -10800 1 -03}
+    {-733780800 -10800 1 -04}
     {-197326800 -14400 0 -04}
-    {-190843200 -10800 1 -03}
+    {-190843200 -10800 1 -04}
     {-184194000 -14400 0 -04}
-    {-164491200 -10800 1 -03}
+    {-164491200 -10800 1 -04}
     {-152658000 -14400 0 -04}
-    {-132955200 -10800 1 -03}
+    {-132955200 -10800 1 -04}
     {-121122000 -14400 0 -04}
-    {-101419200 -10800 1 -03}
+    {-101419200 -10800 1 -04}
     {-86821200 -14400 0 -04}
-    {-71092800 -10800 1 -03}
+    {-71092800 -10800 1 -04}
     {-54766800 -14400 0 -04}
-    {-39038400 -10800 1 -03}
+    {-39038400 -10800 1 -04}
     {-23317200 -14400 0 -04}
     {-7588800 -10800 0 -03}
-    {128142000 -7200 1 -02}
+    {128142000 -7200 1 -03}
     {136605600 -10800 0 -03}
-    {596948400 -7200 1 -02}
+    {596948400 -7200 1 -03}
     {605066400 -10800 0 -03}
-    {624423600 -7200 1 -02}
+    {624423600 -7200 1 -03}
     {636516000 -10800 0 -03}
-    {656478000 -7200 1 -02}
+    {656478000 -7200 1 -03}
     {667965600 -14400 0 -04}
-    {687931200 -7200 0 -02}
+    {687931200 -7200 0 -03}
     {699415200 -10800 0 -03}
-    {719377200 -7200 1 -02}
+    {719377200 -7200 1 -03}
     {731469600 -10800 0 -03}
     {938916000 -10800 0 -04}
-    {938919600 -10800 1 -03}
+    {938919600 -10800 1 -04}
     {952056000 -10800 0 -03}
-    {1198983600 -7200 1 -02}
+    {1198983600 -7200 1 -03}
     {1205632800 -10800 0 -03}
     {1224295200 -10800 0 -03}
 }

library/tzdata/America/Argentina/San_Juan

@@ -4,66 +4,66 @@ set TZData(:America/Argentina/San_Juan) {
     {-9223372036854775808 -16444 0 LMT}
     {-2372095556 -15408 0 CMT}
     {-1567453392 -14400 0 -04}
-    {-1233432000 -10800 0 -03}
+    {-1233432000 -10800 0 -04}
     {-1222981200 -14400 0 -04}
-    {-1205956800 -10800 1 -03}
+    {-1205956800 -10800 1 -04}
     {-1194037200 -14400 0 -04}
-    {-1172865600 -10800 1 -03}
+    {-1172865600 -10800 1 -04}
     {-1162501200 -14400 0 -04}
-    {-1141329600 -10800 1 -03}
+    {-1141329600 -10800 1 -04}
     {-1130965200 -14400 0 -04}
-    {-1109793600 -10800 1 -03}
+    {-1109793600 -10800 1 -04}
     {-1099429200 -14400 0 -04}
-    {-1078257600 -10800 1 -03}
+    {-1078257600 -10800 1 -04}
     {-1067806800 -14400 0 -04}
-    {-1046635200 -10800 1 -03}
+    {-1046635200 -10800 1 -04}
     {-1036270800 -14400 0 -04}
-    {-1015099200 -10800 1 -03}
+    {-1015099200 -10800 1 -04}
     {-1004734800 -14400 0 -04}
-    {-983563200 -10800 1 -03}
+    {-983563200 -10800 1 -04}
     {-973198800 -14400 0 -04}
-    {-952027200 -10800 1 -03}
+    {-952027200 -10800 1 -04}
     {-941576400 -14400 0 -04}
-    {-931032000 -10800 1 -03}
+    {-931032000 -10800 1 -04}
     {-900882000 -14400 0 -04}
-    {-890337600 -10800 1 -03}
+    {-890337600 -10800 1 -04}
     {-833749200 -14400 0 -04}
-    {-827265600 -10800 1 -03}
+    {-827265600 -10800 1 -04}
     {-752274000 -14400 0 -04}
-    {-733780800 -10800 1 -03}
+    {-733780800 -10800 1 -04}
     {-197326800 -14400 0 -04}
-    {-190843200 -10800 1 -03}
+    {-190843200 -10800 1 -04}
     {-184194000 -14400 0 -04}
-    {-164491200 -10800 1 -03}
+    {-164491200 -10800 1 -04}
     {-152658000 -14400 0 -04}
-    {-132955200 -10800 1 -03}
+    {-132955200 -10800 1 -04}
     {-121122000 -14400 0 -04}
-    {-101419200 -10800 1 -03}
+    {-101419200 -10800 1 -04}
     {-86821200 -14400 0 -04}
-    {-71092800 -10800 1 -03}
+    {-71092800 -10800 1 -04}
     {-54766800 -14400 0 -04}
-    {-39038400 -10800 1 -03}
+    {-39038400 -10800 1 -04}
     {-23317200 -14400 0 -04}
     {-7588800 -10800 0 -03}
-    {128142000 -7200 1 -02}
+    {128142000 -7200 1 -03}
     {136605600 -10800 0 -03}
-    {596948400 -7200 1 -02}
+    {596948400 -7200 1 -03}
     {605066400 -10800 0 -03}
-    {624423600 -7200 1 -02}
+    {624423600 -7200 1 -03}
     {636516000 -10800 0 -03}
-    {656478000 -7200 1 -02}
+    {656478000 -7200 1 -03}
     {667792800 -14400 0 -04}
     {673588800 -10800 0 -03}
-    {687927600 -7200 1 -02}
+    {687927600 -7200 1 -03}
     {699415200 -10800 0 -03}
-    {719377200 -7200 1 -02}
+    {719377200 -7200 1 -03}
     {731469600 -10800 0 -03}
     {938916000 -10800 0 -04}
-    {938919600 -10800 1 -03}
+    {938919600 -10800 1 -04}
     {952056000 -10800 0 -03}
     {1085972400 -14400 0 -04}
     {1090728000 -10800 0 -03}
-    {1198983600 -7200 1 -02}
+    {1198983600 -7200 1 -03}
     {1205632800 -10800 0 -03}
     {1224295200 -10800 0 -03}
 }

library/tzdata/America/Argentina/San_Luis

@@ -4,52 +4,52 @@ set TZData(:America/Argentina/San_Luis) {
     {-9223372036854775808 -15924 0 LMT}
     {-2372096076 -15408 0 CMT}
     {-1567453392 -14400 0 -04}
-    {-1233432000 -10800 0 -03}
+    {-1233432000 -10800 0 -04}
     {-1222981200 -14400 0 -04}
-    {-1205956800 -10800 1 -03}
+    {-1205956800 -10800 1 -04}
     {-1194037200 -14400 0 -04}
-    {-1172865600 -10800 1 -03}
+    {-1172865600 -10800 1 -04}
     {-1162501200 -14400 0 -04}
-    {-1141329600 -10800 1 -03}
+    {-1141329600 -10800 1 -04}
     {-1130965200 -14400 0 -04}
-    {-1109793600 -10800 1 -03}
+    {-1109793600 -10800 1 -04}
     {-1099429200 -14400 0 -04}
-    {-1078257600 -10800 1 -03}
+    {-1078257600 -10800 1 -04}
     {-1067806800 -14400 0 -04}
-    {-1046635200 -10800 1 -03}
+    {-1046635200 -10800 1 -04}
     {-1036270800 -14400 0 -04}
-    {-1015099200 -10800 1 -03}
+    {-1015099200 -10800 1 -04}
     {-1004734800 -14400 0 -04}
-    {-983563200 -10800 1 -03}
+    {-983563200 -10800 1 -04}
     {-973198800 -14400 0 -04}
-    {-952027200 -10800 1 -03}
+    {-952027200 -10800 1 -04}
     {-941576400 -14400 0 -04}
-    {-931032000 -10800 1 -03}
+    {-931032000 -10800 1 -04}
     {-900882000 -14400 0 -04}
-    {-890337600 -10800 1 -03}
+    {-890337600 -10800 1 -04}
     {-833749200 -14400 0 -04}
-    {-827265600 -10800 1 -03}
+    {-827265600 -10800 1 -04}
     {-752274000 -14400 0 -04}
-    {-733780800 -10800 1 -03}
+    {-733780800 -10800 1 -04}
     {-197326800 -14400 0 -04}
-    {-190843200 -10800 1 -03}
+    {-190843200 -10800 1 -04}
     {-184194000 -14400 0 -04}
-    {-164491200 -10800 1 -03}
+    {-164491200 -10800 1 -04}
     {-152658000 -14400 0 -04}
-    {-132955200 -10800 1 -03}
+    {-132955200 -10800 1 -04}
     {-121122000 -14400 0 -04}
-    {-101419200 -10800 1 -03}
+    {-101419200 -10800 1 -04}
     {-86821200 -14400 0 -04}
-    {-71092800 -10800 1 -03}
+    {-71092800 -10800 1 -04}
     {-54766800 -14400 0 -04}
-    {-39038400 -10800 1 -03}
+    {-39038400 -10800 1 -04}
     {-23317200 -14400 0 -04}
     {-7588800 -10800 0 -03}
-    {128142000 -7200 1 -02}
+    {128142000 -7200 1 -03}
     {136605600 -10800 0 -03}
-    {596948400 -7200 1 -02}
+    {596948400 -7200 1 -03}
     {605066400 -10800 0 -03}
-    {624423600 -7200 1 -02}
+    {624423600 -7200 1 -03}
     {631159200 -7200 1 -02}
     {637380000 -14400 0 -04}
     {655963200 -10800 1 -03}
@@ -59,10 +59,10 @@ set TZData(:America/Argentina/San_Luis) {
     {952052400 -10800 0 -03}
     {1085972400 -14400 0 -04}
     {1090728000 -10800 0 -03}
-    {1198983600 -7200 1 -02}
+    {1198983600 -7200 1 -03}
     {1200880800 -10800 0 -04}
     {1205031600 -14400 0 -04}
-    {1223784000 -10800 1 -03}
+    {1223784000 -10800 1 -04}
     {1236481200 -14400 0 -04}
     {1255233600 -10800 0 -03}
 }

library/tzdata/America/Argentina/Tucuman

@@ -4,66 +4,66 @@ set TZData(:America/Argentina/Tucuman) {
     {-9223372036854775808 -15652 0 LMT}
     {-2372096348 -15408 0 CMT}
     {-1567453392 -14400 0 -04}
-    {-1233432000 -10800 0 -03}
+    {-1233432000 -10800 0 -04}
     {-1222981200 -14400 0 -04}
-    {-1205956800 -10800 1 -03}
+    {-1205956800 -10800 1 -04}
     {-1194037200 -14400 0 -04}
-    {-1172865600 -10800 1 -03}
+    {-1172865600 -10800 1 -04}
     {-1162501200 -14400 0 -04}
-    {-1141329600 -10800 1 -03}
+    {-1141329600 -10800 1 -04}
     {-1130965200 -14400 0 -04}
-    {-1109793600 -10800 1 -03}
+    {-1109793600 -10800 1 -04}
     {-1099429200 -14400 0 -04}
-    {-1078257600 -10800 1 -03}
+    {-1078257600 -10800 1 -04}
     {-1067806800 -14400 0 -04}
-    {-1046635200 -10800 1 -03}
+    {-1046635200 -10800 1 -04}
     {-1036270800 -14400 0 -04}
-    {-1015099200 -10800 1 -03}
+    {-1015099200 -10800 1 -04}
     {-1004734800 -14400 0 -04}
-    {-983563200 -10800 1 -03}
+    {-983563200 -10800 1 -04}
     {-973198800 -14400 0 -04}
-    {-952027200 -10800 1 -03}
+    {-952027200 -10800 1 -04}
     {-941576400 -14400 0 -04}
-    {-931032000 -10800 1 -03}
+    {-931032000 -10800 1 -04}
     {-900882000 -14400 0 -04}
-    {-890337600 -10800 1 -03}
+    {-890337600 -10800 1 -04}
     {-833749200 -14400 0 -04}
-    {-827265600 -10800 1 -03}
+    {-827265600 -10800 1 -04}
     {-752274000 -14400 0 -04}
-    {-733780800 -10800 1 -03}
+    {-733780800 -10800 1 -04}
     {-197326800 -14400 0 -04}
-    {-190843200 -10800 1 -03}
+    {-190843200 -10800 1 -04}
     {-184194000 -14400 0 -04}
-    {-164491200 -10800 1 -03}
+    {-164491200 -10800 1 -04}
     {-152658000 -14400 0 -04}
-    {-132955200 -10800 1 -03}
+    {-132955200 -10800 1 -04}
     {-121122000 -14400 0 -04}
-    {-101419200 -10800 1 -03}
+    {-101419200 -10800 1 -04}
     {-86821200 -14400 0 -04}
-    {-71092800 -10800 1 -03}
+    {-71092800 -10800 1 -04}
     {-54766800 -14400 0 -04}
-    {-39038400 -10800 1 -03}
+    {-39038400 -10800 1 -04}
     {-23317200 -14400 0 -04}
     {-7588800 -10800 0 -03}
-    {128142000 -7200 1 -02}
+    {128142000 -7200 1 -03}
     {136605600 -10800 0 -03}
-    {596948400 -7200 1 -02}
+    {596948400 -7200 1 -03}
     {605066400 -10800 0 -03}
-    {624423600 -7200 1 -02}
+    {624423600 -7200 1 -03}
     {636516000 -10800 0 -03}
-    {656478000 -7200 1 -02}
+    {656478000 -7200 1 -03}
     {667965600 -14400 0 -04}
-    {687931200 -7200 0 -02}
+    {687931200 -7200 0 -03}
     {699415200 -10800 0 -03}
-    {719377200 -7200 1 -02}
+    {719377200 -7200 1 -03}
     {731469600 -10800 0 -03}
     {938916000 -10800 0 -04}
-    {938919600 -10800 1 -03}
+    {938919600 -10800 1 -04}
     {952056000 -10800 0 -03}
     {1086058800 -14400 0 -04}
     {1087099200 -10800 0 -03}
-    {1198983600 -7200 1 -02}
+    {1198983600 -7200 1 -03}
     {1205632800 -10800 0 -03}
-    {1224385200 -7200 1 -02}
+    {1224385200 -7200 1 -03}
     {1237082400 -10800 0 -03}
 }

library/tzdata/America/Argentina/Ushuaia

@@ -4,65 +4,65 @@ set TZData(:America/Argentina/Ushuaia) {
     {-9223372036854775808 -16392 0 LMT}
     {-2372095608 -15408 0 CMT}
     {-1567453392 -14400 0 -04}
-    {-1233432000 -10800 0 -03}
+    {-1233432000 -10800 0 -04}
     {-1222981200 -14400 0 -04}
-    {-1205956800 -10800 1 -03}
+    {-1205956800 -10800 1 -04}
     {-1194037200 -14400 0 -04}
-    {-1172865600 -10800 1 -03}
+    {-1172865600 -10800 1 -04}
     {-1162501200 -14400 0 -04}
-    {-1141329600 -10800 1 -03}
+    {-1141329600 -10800 1 -04}
     {-1130965200 -14400 0 -04}
-    {-1109793600 -10800 1 -03}
+    {-1109793600 -10800 1 -04}
     {-1099429200 -14400 0 -04}
-    {-1078257600 -10800 1 -03}
+    {-1078257600 -10800 1 -04}
     {-1067806800 -14400 0 -04}
-    {-1046635200 -10800 1 -03}
+    {-1046635200 -10800 1 -04}
     {-1036270800 -14400 0 -04}
-    {-1015099200 -10800 1 -03}
+    {-1015099200 -10800 1 -04}
     {-1004734800 -14400 0 -04}
-    {-983563200 -10800 1 -03}
+    {-983563200 -10800 1 -04}
     {-973198800 -14400 0 -04}
-    {-952027200 -10800 1 -03}
+    {-952027200 -10800 1 -04}
     {-941576400 -14400 0 -04}
-    {-931032000 -10800 1 -03}
+    {-931032000 -10800 1 -04}
     {-900882000 -14400 0 -04}
-    {-890337600 -10800 1 -03}
+    {-890337600 -10800 1 -04}
     {-833749200 -14400 0 -04}
-    {-827265600 -10800 1 -03}
+    {-827265600 -10800 1 -04}
     {-752274000 -14400 0 -04}
-    {-733780800 -10800 1 -03}
+    {-733780800 -10800 1 -04}
     {-197326800 -14400 0 -04}
-    {-190843200 -10800 1 -03}
+    {-190843200 -10800 1 -04}
     {-184194000 -14400 0 -04}
-    {-164491200 -10800 1 -03}
+    {-164491200 -10800 1 -04}
     {-152658000 -14400 0 -04}
-    {-132955200 -10800 1 -03}
+    {-132955200 -10800 1 -04}
     {-121122000 -14400 0 -04}
-    {-101419200 -10800 1 -03}
+    {-101419200 -10800 1 -04}
     {-86821200 -14400 0 -04}
-    {-71092800 -10800 1 -03}
+    {-71092800 -10800 1 -04}
     {-54766800 -14400 0 -04}
-    {-39038400 -10800 1 -03}
+    {-39038400 -10800 1 -04}
     {-23317200 -14400 0 -04}
     {-7588800 -10800 0 -03}
-    {128142000 -7200 1 -02}
+    {128142000 -7200 1 -03}
     {136605600 -10800 0 -03}
-    {596948400 -7200 1 -02}
+    {596948400 -7200 1 -03}
     {605066400 -10800 0 -03}
-    {624423600 -7200 1 -02}
+    {624423600 -7200 1 -03}
     {636516000 -10800 0 -03}
-    {656478000 -7200 1 -02}
+    {656478000 -7200 1 -03}
     {667965600 -10800 0 -03}
-    {687927600 -7200 1 -02}
+    {687927600 -7200 1 -03}
     {699415200 -10800 0 -03}
-    {719377200 -7200 1 -02}
+    {719377200 -7200 1 -03}
     {731469600 -10800 0 -03}
     {938916000 -10800 0 -04}
-    {938919600 -10800 1 -03}
+    {938919600 -10800 1 -04}
     {952056000 -10800 0 -03}
     {1085886000 -14400 0 -04}
     {1087704000 -10800 0 -03}
-    {1198983600 -7200 1 -02}
+    {1198983600 -7200 1 -03}
     {1205632800 -10800 0 -03}
     {1224295200 -10800 0 -03}
 }

library/tzdata/America/Asuncion

@@ -7,253 +7,253 @@ set TZData(:America/Asuncion) {
     {86760000 -10800 0 -03}
     {134017200 -14400 0 -04}
     {162878400 -14400 0 -04}
-    {181368000 -10800 1 -03}
+    {181368000 -10800 1 -04}
     {194497200 -14400 0 -04}
-    {212990400 -10800 1 -03}
+    {212990400 -10800 1 -04}
     {226033200 -14400 0 -04}
-    {244526400 -10800 1 -03}
+    {244526400 -10800 1 -04}
     {257569200 -14400 0 -04}
-    {276062400 -10800 1 -03}
+    {276062400 -10800 1 -04}
     {291783600 -14400 0 -04}
-    {307598400 -10800 1 -03}
+    {307598400 -10800 1 -04}
     {323406000 -14400 0 -04}
-    {339220800 -10800 1 -03}
+    {339220800 -10800 1 -04}
     {354942000 -14400 0 -04}
-    {370756800 -10800 1 -03}
+    {370756800 -10800 1 -04}
     {386478000 -14400 0 -04}
-    {402292800 -10800 1 -03}
+    {402292800 -10800 1 -04}
     {418014000 -14400 0 -04}
-    {433828800 -10800 1 -03}
+    {433828800 -10800 1 -04}
     {449636400 -14400 0 -04}
-    {465451200 -10800 1 -03}
+    {465451200 -10800 1 -04}
     {481172400 -14400 0 -04}
-    {496987200 -10800 1 -03}
+    {496987200 -10800 1 -04}
     {512708400 -14400 0 -04}
-    {528523200 -10800 1 -03}
+    {528523200 -10800 1 -04}
     {544244400 -14400 0 -04}
-    {560059200 -10800 1 -03}
+    {560059200 -10800 1 -04}
     {575866800 -14400 0 -04}
-    {591681600 -10800 1 -03}
+    {591681600 -10800 1 -04}
     {607402800 -14400 0 -04}
-    {625032000 -10800 1 -03}
+    {625032000 -10800 1 -04}
     {638938800 -14400 0 -04}
-    {654753600 -10800 1 -03}
+    {654753600 -10800 1 -04}
     {670474800 -14400 0 -04}
-    {686721600 -10800 1 -03}
+    {686721600 -10800 1 -04}
     {699418800 -14400 0 -04}
-    {718257600 -10800 1 -03}
+    {718257600 -10800 1 -04}
     {733546800 -14400 0 -04}
-    {749448000 -10800 1 -03}
+    {749448000 -10800 1 -04}
     {762318000 -14400 0 -04}
-    {780984000 -10800 1 -03}
+    {780984000 -10800 1 -04}
     {793767600 -14400 0 -04}
-    {812520000 -10800 1 -03}
+    {812520000 -10800 1 -04}
     {825649200 -14400 0 -04}
-    {844574400 -10800 1 -03}
+    {844574400 -10800 1 -04}
     {856666800 -14400 0 -04}
-    {876024000 -10800 1 -03}
+    {876024000 -10800 1 -04}
     {888721200 -14400 0 -04}
-    {907473600 -10800 1 -03}
+    {907473600 -10800 1 -04}
     {920775600 -14400 0 -04}
-    {938923200 -10800 1 -03}
+    {938923200 -10800 1 -04}
     {952225200 -14400 0 -04}
-    {970372800 -10800 1 -03}
+    {970372800 -10800 1 -04}
     {983674800 -14400 0 -04}
-    {1002427200 -10800 1 -03}
+    {1002427200 -10800 1 -04}
     {1018148400 -14400 0 -04}
-    {1030852800 -10800 1 -03}
+    {1030852800 -10800 1 -04}
     {1049598000 -14400 0 -04}
-    {1062907200 -10800 1 -03}
+    {1062907200 -10800 1 -04}
     {1081047600 -14400 0 -04}
-    {1097985600 -10800 1 -03}
+    {1097985600 -10800 1 -04}
     {1110682800 -14400 0 -04}
-    {1129435200 -10800 1 -03}
+    {1129435200 -10800 1 -04}
     {1142132400 -14400 0 -04}
-    {1160884800 -10800 1 -03}
+    {1160884800 -10800 1 -04}
     {1173582000 -14400 0 -04}
-    {1192939200 -10800 1 -03}
+    {1192939200 -10800 1 -04}
     {1205031600 -14400 0 -04}
-    {1224388800 -10800 1 -03}
+    {1224388800 -10800 1 -04}
     {1236481200 -14400 0 -04}
-    {1255838400 -10800 1 -03}
+    {1255838400 -10800 1 -04}
     {1270954800 -14400 0 -04}
-    {1286078400 -10800 1 -03}
+    {1286078400 -10800 1 -04}
     {1302404400 -14400 0 -04}
-    {1317528000 -10800 1 -03}
+    {1317528000 -10800 1 -04}
     {1333854000 -14400 0 -04}
-    {1349582400 -10800 1 -03}
+    {1349582400 -10800 1 -04}
     {1364094000 -14400 0 -04}
-    {1381032000 -10800 1 -03}
+    {1381032000 -10800 1 -04}
     {1395543600 -14400 0 -04}
-    {1412481600 -10800 1 -03}
+    {1412481600 -10800 1 -04}
     {1426993200 -14400 0 -04}
-    {1443931200 -10800 1 -03}
+    {1443931200 -10800 1 -04}
     {1459047600 -14400 0 -04}
-    {1475380800 -10800 1 -03}
+    {1475380800 -10800 1 -04}
     {1490497200 -14400 0 -04}
-    {1506830400 -10800 1 -03}
+    {1506830400 -10800 1 -04}
     {1521946800 -14400 0 -04}
-    {1538884800 -10800 1 -03}
+    {1538884800 -10800 1 -04}
     {1553396400 -14400 0 -04}
-    {1570334400 -10800 1 -03}
+    {1570334400 -10800 1 -04}
     {1584846000 -14400 0 -04}
-    {1601784000 -10800 1 -03}
+    {1601784000 -10800 1 -04}
     {1616900400 -14400 0 -04}
-    {1633233600 -10800 1 -03}
+    {1633233600 -10800 1 -04}
     {1648350000 -14400 0 -04}
-    {1664683200 -10800 1 -03}
+    {1664683200 -10800 1 -04}
     {1679799600 -14400 0 -04}
-    {1696132800 -10800 1 -03}
+    {1696132800 -10800 1 -04}
     {1711249200 -14400 0 -04}
-    {1728187200 -10800 1 -03}
+    {1728187200 -10800 1 -04}
     {1742698800 -14400 0 -04}
-    {1759636800 -10800 1 -03}
+    {1759636800 -10800 1 -04}
     {1774148400 -14400 0 -04}
-    {1791086400 -10800 1 -03}
+    {1791086400 -10800 1 -04}
     {1806202800 -14400 0 -04}
-    {1822536000 -10800 1 -03}
+    {1822536000 -10800 1 -04}
     {1837652400 -14400 0 -04}
-    {1853985600 -10800 1 -03}
+    {1853985600 -10800 1 -04}
     {1869102000 -14400 0 -04}
-    {1886040000 -10800 1 -03}
+    {1886040000 -10800 1 -04}
     {1900551600 -14400 0 -04}
-    {1917489600 -10800 1 -03}
+    {1917489600 -10800 1 -04}
     {1932001200 -14400 0 -04}
-    {1948939200 -10800 1 -03}
+    {1948939200 -10800 1 -04}
     {1964055600 -14400 0 -04}
-    {1980388800 -10800 1 -03}
+    {1980388800 -10800 1 -04}
     {1995505200 -14400 0 -04}
-    {2011838400 -10800 1 -03}
+    {2011838400 -10800 1 -04}
     {2026954800 -14400 0 -04}
-    {2043288000 -10800 1 -03}
+    {2043288000 -10800 1 -04}
     {2058404400 -14400 0 -04}
-    {2075342400 -10800 1 -03}
+    {2075342400 -10800 1 -04}
     {2089854000 -14400 0 -04}
-    {2106792000 -10800 1 -03}
+    {2106792000 -10800 1 -04}
     {2121303600 -14400 0 -04}
-    {2138241600 -10800 1 -03}
+    {2138241600 -10800 1 -04}
     {2153358000 -14400 0 -04}
-    {2169691200 -10800 1 -03}
+    {2169691200 -10800 1 -04}
     {2184807600 -14400 0 -04}
-    {2201140800 -10800 1 -03}
+    {2201140800 -10800 1 -04}
     {2216257200 -14400 0 -04}
-    {2233195200 -10800 1 -03}
+    {2233195200 -10800 1 -04}
     {2247706800 -14400 0 -04}
-    {2264644800 -10800 1 -03}
+    {2264644800 -10800 1 -04}
     {2279156400 -14400 0 -04}
-    {2296094400 -10800 1 -03}
+    {2296094400 -10800 1 -04}
     {2310606000 -14400 0 -04}
-    {2327544000 -10800 1 -03}
+    {2327544000 -10800 1 -04}
     {2342660400 -14400 0 -04}
-    {2358993600 -10800 1 -03}
+    {2358993600 -10800 1 -04}
     {2374110000 -14400 0 -04}
-    {2390443200 -10800 1 -03}
+    {2390443200 -10800 1 -04}
     {2405559600 -14400 0 -04}
-    {2422497600 -10800 1 -03}
+    {2422497600 -10800 1 -04}
     {2437009200 -14400 0 -04}
-    {2453947200 -10800 1 -03}
+    {2453947200 -10800 1 -04}
     {2468458800 -14400 0 -04}
-    {2485396800 -10800 1 -03}
+    {2485396800 -10800 1 -04}
     {2500513200 -14400 0 -04}
-    {2516846400 -10800 1 -03}
+    {2516846400 -10800 1 -04}
     {2531962800 -14400 0 -04}
-    {2548296000 -10800 1 -03}
+    {2548296000 -10800 1 -04}
     {2563412400 -14400 0 -04}
-    {2579745600 -10800 1 -03}
+    {2579745600 -10800 1 -04}
     {2594862000 -14400 0 -04}
-    {2611800000 -10800 1 -03}
+    {2611800000 -10800 1 -04}
     {2626311600 -14400 0 -04}
-    {2643249600 -10800 1 -03}
+    {2643249600 -10800 1 -04}
     {2657761200 -14400 0 -04}
-    {2674699200 -10800 1 -03}
+    {2674699200 -10800 1 -04}
     {2689815600 -14400 0 -04}
-    {2706148800 -10800 1 -03}
+    {2706148800 -10800 1 -04}
     {2721265200 -14400 0 -04}
-    {2737598400 -10800 1 -03}
+    {2737598400 -10800 1 -04}
     {2752714800 -14400 0 -04}
-    {2769652800 -10800 1 -03}
+    {2769652800 -10800 1 -04}
     {2784164400 -14400 0 -04}
-    {2801102400 -10800 1 -03}
+    {2801102400 -10800 1 -04}
     {2815614000 -14400 0 -04}
-    {2832552000 -10800 1 -03}
+    {2832552000 -10800 1 -04}
     {2847668400 -14400 0 -04}
-    {2864001600 -10800 1 -03}
+    {2864001600 -10800 1 -04}
     {2879118000 -14400 0 -04}
-    {2895451200 -10800 1 -03}
+    {2895451200 -10800 1 -04}
     {2910567600 -14400 0 -04}
-    {2926900800 -10800 1 -03}
+    {2926900800 -10800 1 -04}
     {2942017200 -14400 0 -04}
-    {2958955200 -10800 1 -03}
+    {2958955200 -10800 1 -04}
     {2973466800 -14400 0 -04}
-    {2990404800 -10800 1 -03}
+    {2990404800 -10800 1 -04}
     {3004916400 -14400 0 -04}
-    {3021854400 -10800 1 -03}
+    {3021854400 -10800 1 -04}
     {3036970800 -14400 0 -04}
-    {3053304000 -10800 1 -03}
+    {3053304000 -10800 1 -04}
     {3068420400 -14400 0 -04}
-    {3084753600 -10800 1 -03}
+    {3084753600 -10800 1 -04}
     {3099870000 -14400 0 -04}
-    {3116808000 -10800 1 -03}
+    {3116808000 -10800 1 -04}
     {3131319600 -14400 0 -04}
-    {3148257600 -10800 1 -03}
+    {3148257600 -10800 1 -04}
     {3162769200 -14400 0 -04}
-    {3179707200 -10800 1 -03}
+    {3179707200 -10800 1 -04}
     {3194218800 -14400 0 -04}
-    {3211156800 -10800 1 -03}
+    {3211156800 -10800 1 -04}
     {3226273200 -14400 0 -04}
-    {3242606400 -10800 1 -03}
+    {3242606400 -10800 1 -04}
     {3257722800 -14400 0 -04}
-    {3274056000 -10800 1 -03}
+    {3274056000 -10800 1 -04}
     {3289172400 -14400 0 -04}
-    {3306110400 -10800 1 -03}
+    {3306110400 -10800 1 -04}
     {3320622000 -14400 0 -04}
-    {3337560000 -10800 1 -03}
+    {3337560000 -10800 1 -04}
     {3352071600 -14400 0 -04}
-    {3369009600 -10800 1 -03}
+    {3369009600 -10800 1 -04}
     {3384126000 -14400 0 -04}
-    {3400459200 -10800 1 -03}
+    {3400459200 -10800 1 -04}
     {3415575600 -14400 0 -04}
-    {3431908800 -10800 1 -03}
+    {3431908800 -10800 1 -04}
     {3447025200 -14400 0 -04}
-    {3463358400 -10800 1 -03}
+    {3463358400 -10800 1 -04}
     {3478474800 -14400 0 -04}
-    {3495412800 -10800 1 -03}
+    {3495412800 -10800 1 -04}
     {3509924400 -14400 0 -04}
-    {3526862400 -10800 1 -03}
+    {3526862400 -10800 1 -04}
     {3541374000 -14400 0 -04}
-    {3558312000 -10800 1 -03}
+    {3558312000 -10800 1 -04}
     {3573428400 -14400 0 -04}
-    {3589761600 -10800 1 -03}
+    {3589761600 -10800 1 -04}
     {3604878000 -14400 0 -04}
-    {3621211200 -10800 1 -03}
+    {3621211200 -10800 1 -04}
     {3636327600 -14400 0 -04}
-    {3653265600 -10800 1 -03}
+    {3653265600 -10800 1 -04}
     {3667777200 -14400 0 -04}
-    {3684715200 -10800 1 -03}
+    {3684715200 -10800 1 -04}
     {3699226800 -14400 0 -04}
-    {3716164800 -10800 1 -03}
+    {3716164800 -10800 1 -04}
     {3731281200 -14400 0 -04}
-    {3747614400 -10800 1 -03}
+    {3747614400 -10800 1 -04}
     {3762730800 -14400 0 -04}
-    {3779064000 -10800 1 -03}
+    {3779064000 -10800 1 -04}
     {3794180400 -14400 0 -04}
-    {3810513600 -10800 1 -03}
+    {3810513600 -10800 1 -04}
     {3825630000 -14400 0 -04}
-    {3842568000 -10800 1 -03}
+    {3842568000 -10800 1 -04}
     {3857079600 -14400 0 -04}
-    {3874017600 -10800 1 -03}
+    {3874017600 -10800 1 -04}
     {3888529200 -14400 0 -04}
-    {3905467200 -10800 1 -03}
+    {3905467200 -10800 1 -04}
     {3920583600 -14400 0 -04}
-    {3936916800 -10800 1 -03}
+    {3936916800 -10800 1 -04}
     {3952033200 -14400 0 -04}
-    {3968366400 -10800 1 -03}
+    {3968366400 -10800 1 -04}
     {3983482800 -14400 0 -04}
-    {4000420800 -10800 1 -03}
+    {4000420800 -10800 1 -04}
     {4014932400 -14400 0 -04}
-    {4031870400 -10800 1 -03}
+    {4031870400 -10800 1 -04}
     {4046382000 -14400 0 -04}
-    {4063320000 -10800 1 -03}
+    {4063320000 -10800 1 -04}
     {4077831600 -14400 0 -04}
-    {4094769600 -10800 1 -03}
+    {4094769600 -10800 1 -04}
 }

library/tzdata/America/Bahia

@@ -3,66 +3,66 @@
 set TZData(:America/Bahia) {
     {-9223372036854775808 -9244 0 LMT}
     {-1767216356 -10800 0 -03}
-    {-1206957600 -7200 1 -02}
+    {-1206957600 -7200 1 -03}
     {-1191362400 -10800 0 -03}
-    {-1175374800 -7200 1 -02}
+    {-1175374800 -7200 1 -03}
     {-1159826400 -10800 0 -03}
-    {-633819600 -7200 1 -02}
+    {-633819600 -7200 1 -03}
     {-622069200 -10800 0 -03}
-    {-602283600 -7200 1 -02}
+    {-602283600 -7200 1 -03}
     {-591832800 -10800 0 -03}
-    {-570747600 -7200 1 -02}
+    {-570747600 -7200 1 -03}
     {-560210400 -10800 0 -03}
-    {-539125200 -7200 1 -02}
+    {-539125200 -7200 1 -03}
     {-531352800 -10800 0 -03}
-    {-191365200 -7200 1 -02}
+    {-191365200 -7200 1 -03}
     {-184197600 -10800 0 -03}
-    {-155163600 -7200 1 -02}
+    {-155163600 -7200 1 -03}
     {-150069600 -10800 0 -03}
-    {-128898000 -7200 1 -02}
+    {-128898000 -7200 1 -03}
     {-121125600 -10800 0 -03}
-    {-99954000 -7200 1 -02}
+    {-99954000 -7200 1 -03}
     {-89589600 -10800 0 -03}
-    {-68418000 -7200 1 -02}
+    {-68418000 -7200 1 -03}
     {-57967200 -10800 0 -03}
-    {499748400 -7200 1 -02}
+    {499748400 -7200 1 -03}
     {511236000 -10800 0 -03}
-    {530593200 -7200 1 -02}
+    {530593200 -7200 1 -03}
     {540266400 -10800 0 -03}
-    {562129200 -7200 1 -02}
+    {562129200 -7200 1 -03}
     {571197600 -10800 0 -03}
-    {592974000 -7200 1 -02}
+    {592974000 -7200 1 -03}
     {602042400 -10800 0 -03}
-    {624423600 -7200 1 -02}
+    {624423600 -7200 1 -03}
     {634701600 -10800 0 -03}
-    {656478000 -7200 1 -02}
+    {656478000 -7200 1 -03}
     {666756000 -10800 0 -03}
-    {687927600 -7200 1 -02}
+    {687927600 -7200 1 -03}
     {697600800 -10800 0 -03}
-    {719982000 -7200 1 -02}
+    {719982000 -7200 1 -03}
     {728445600 -10800 0 -03}
-    {750826800 -7200 1 -02}
+    {750826800 -7200 1 -03}
     {761709600 -10800 0 -03}
-    {782276400 -7200 1 -02}
+    {782276400 -7200 1 -03}
     {793159200 -10800 0 -03}
-    {813726000 -7200 1 -02}
+    {813726000 -7200 1 -03}
     {824004000 -10800 0 -03}
-    {844570800 -7200 1 -02}
+    {844570800 -7200 1 -03}
     {856058400 -10800 0 -03}
-    {876106800 -7200 1 -02}
+    {876106800 -7200 1 -03}
     {888717600 -10800 0 -03}
-    {908074800 -7200 1 -02}
+    {908074800 -7200 1 -03}
     {919562400 -10800 0 -03}
-    {938919600 -7200 1 -02}
+    {938919600 -7200 1 -03}
     {951616800 -10800 0 -03}
-    {970974000 -7200 1 -02}
+    {970974000 -7200 1 -03}
     {982461600 -10800 0 -03}
-    {1003028400 -7200 1 -02}
+    {1003028400 -7200 1 -03}
     {1013911200 -10800 0 -03}
-    {1036292400 -7200 1 -02}
+    {1036292400 -7200 1 -03}
     {1045360800 -10800 0 -03}
     {1064368800 -10800 0 -03}
-    {1318734000 -7200 0 -02}
+    {1318734000 -7200 0 -03}
     {1330221600 -10800 0 -03}
     {1350784800 -10800 0 -03}
 }

library/tzdata/America/Belem

@@ -3,33 +3,33 @@
 set TZData(:America/Belem) {
     {-9223372036854775808 -11636 0 LMT}
     {-1767213964 -10800 0 -03}
-    {-1206957600 -7200 1 -02}
+    {-1206957600 -7200 1 -03}
     {-1191362400 -10800 0 -03}
-    {-1175374800 -7200 1 -02}
+    {-1175374800 -7200 1 -03}
     {-1159826400 -10800 0 -03}
-    {-633819600 -7200 1 -02}
+    {-633819600 -7200 1 -03}
     {-622069200 -10800 0 -03}
-    {-602283600 -7200 1 -02}
+    {-602283600 -7200 1 -03}
     {-591832800 -10800 0 -03}
-    {-570747600 -7200 1 -02}
+    {-570747600 -7200 1 -03}
     {-560210400 -10800 0 -03}
-    {-539125200 -7200 1 -02}
+    {-539125200 -7200 1 -03}
     {-531352800 -10800 0 -03}
-    {-191365200 -7200 1 -02}
+    {-191365200 -7200 1 -03}
     {-184197600 -10800 0 -03}
-    {-155163600 -7200 1 -02}
+    {-155163600 -7200 1 -03}
     {-150069600 -10800 0 -03}
-    {-128898000 -7200 1 -02}
+    {-128898000 -7200 1 -03}
     {-121125600 -10800 0 -03}
-    {-99954000 -7200 1 -02}
+    {-99954000 -7200 1 -03}
     {-89589600 -10800 0 -03}
-    {-68418000 -7200 1 -02}
+    {-68418000 -7200 1 -03}
     {-57967200 -10800 0 -03}
-    {499748400 -7200 1 -02}
+    {499748400 -7200 1 -03}
     {511236000 -10800 0 -03}
-    {530593200 -7200 1 -02}
+    {530593200 -7200 1 -03}
     {540266400 -10800 0 -03}
-    {562129200 -7200 1 -02}
+    {562129200 -7200 1 -03}
     {571197600 -10800 0 -03}
     {590032800 -10800 0 -03}
 }

library/tzdata/America/Boa_Vista

@@ -3,38 +3,38 @@
 set TZData(:America/Boa_Vista) {
     {-9223372036854775808 -14560 0 LMT}
     {-1767211040 -14400 0 -04}
-    {-1206954000 -10800 1 -03}
+    {-1206954000 -10800 1 -04}
     {-1191358800 -14400 0 -04}
-    {-1175371200 -10800 1 -03}
+    {-1175371200 -10800 1 -04}
     {-1159822800 -14400 0 -04}
-    {-633816000 -10800 1 -03}
+    {-633816000 -10800 1 -04}
     {-622065600 -14400 0 -04}
-    {-602280000 -10800 1 -03}
+    {-602280000 -10800 1 -04}
     {-591829200 -14400 0 -04}
-    {-570744000 -10800 1 -03}
+    {-570744000 -10800 1 -04}
     {-560206800 -14400 0 -04}
-    {-539121600 -10800 1 -03}
+    {-539121600 -10800 1 -04}
     {-531349200 -14400 0 -04}
-    {-191361600 -10800 1 -03}
+    {-191361600 -10800 1 -04}
     {-184194000 -14400 0 -04}
-    {-155160000 -10800 1 -03}
+    {-155160000 -10800 1 -04}
     {-150066000 -14400 0 -04}
-    {-128894400 -10800 1 -03}
+    {-128894400 -10800 1 -04}
     {-121122000 -14400 0 -04}
-    {-99950400 -10800 1 -03}
+    {-99950400 -10800 1 -04}
     {-89586000 -14400 0 -04}
-    {-68414400 -10800 1 -03}
+    {-68414400 -10800 1 -04}
     {-57963600 -14400 0 -04}
-    {499752000 -10800 1 -03}
+    {499752000 -10800 1 -04}
     {511239600 -14400 0 -04}
-    {530596800 -10800 1 -03}
+    {530596800 -10800 1 -04}
     {540270000 -14400 0 -04}
-    {562132800 -10800 1 -03}
+    {562132800 -10800 1 -04}
     {571201200 -14400 0 -04}
     {590036400 -14400 0 -04}
     {938664000 -14400 0 -04}
-    {938923200 -10800 1 -03}
+    {938923200 -10800 1 -04}
     {951620400 -14400 0 -04}
-    {970977600 -10800 1 -03}
+    {970977600 -10800 1 -04}
     {971578800 -14400 0 -04}
 }

library/tzdata/America/Bogota

@@ -4,6 +4,6 @@ set TZData(:America/Bogota) {
     {-9223372036854775808 -17776 0 LMT}
     {-2707671824 -17776 0 BMT}
     {-1739041424 -18000 0 -05}
-    {704869200 -14400 1 -04}
+    {704869200 -14400 1 -05}
     {733896000 -18000 0 -05}
 }

library/tzdata/America/Campo_Grande

@@ -3,255 +3,255 @@
 set TZData(:America/Campo_Grande) {
     {-9223372036854775808 -13108 0 LMT}
     {-1767212492 -14400 0 -04}
-    {-1206954000 -10800 1 -03}
+    {-1206954000 -10800 1 -04}
     {-1191358800 -14400 0 -04}
-    {-1175371200 -10800 1 -03}
+    {-1175371200 -10800 1 -04}
     {-1159822800 -14400 0 -04}
-    {-633816000 -10800 1 -03}
+    {-633816000 -10800 1 -04}
     {-622065600 -14400 0 -04}
-    {-602280000 -10800 1 -03}
+    {-602280000 -10800 1 -04}
     {-591829200 -14400 0 -04}
-    {-570744000 -10800 1 -03}
+    {-570744000 -10800 1 -04}
     {-560206800 -14400 0 -04}
-    {-539121600 -10800 1 -03}
+    {-539121600 -10800 1 -04}
     {-531349200 -14400 0 -04}
-    {-191361600 -10800 1 -03}
+    {-191361600 -10800 1 -04}
     {-184194000 -14400 0 -04}
-    {-155160000 -10800 1 -03}
+    {-155160000 -10800 1 -04}
     {-150066000 -14400 0 -04}
-    {-128894400 -10800 1 -03}
+    {-128894400 -10800 1 -04}
     {-121122000 -14400 0 -04}
-    {-99950400 -10800 1 -03}
+    {-99950400 -10800 1 -04}
     {-89586000 -14400 0 -04}
-    {-68414400 -10800 1 -03}
+    {-68414400 -10800 1 -04}
     {-57963600 -14400 0 -04}
-    {499752000 -10800 1 -03}
+    {499752000 -10800 1 -04}
     {511239600 -14400 0 -04}
-    {530596800 -10800 1 -03}
+    {530596800 -10800 1 -04}
     {540270000 -14400 0 -04}
-    {562132800 -10800 1 -03}
+    {562132800 -10800 1 -04}
     {571201200 -14400 0 -04}
-    {592977600 -10800 1 -03}
+    {592977600 -10800 1 -04}
     {602046000 -14400 0 -04}
-    {624427200 -10800 1 -03}
+    {624427200 -10800 1 -04}
     {634705200 -14400 0 -04}
-    {656481600 -10800 1 -03}
+    {656481600 -10800 1 -04}
     {666759600 -14400 0 -04}
-    {687931200 -10800 1 -03}
+    {687931200 -10800 1 -04}
     {697604400 -14400 0 -04}
-    {719985600 -10800 1 -03}
+    {719985600 -10800 1 -04}
     {728449200 -14400 0 -04}
-    {750830400 -10800 1 -03}
+    {750830400 -10800 1 -04}
     {761713200 -14400 0 -04}
-    {782280000 -10800 1 -03}
+    {782280000 -10800 1 -04}
     {793162800 -14400 0 -04}
-    {813729600 -10800 1 -03}
+    {813729600 -10800 1 -04}
     {824007600 -14400 0 -04}
-    {844574400 -10800 1 -03}
+    {844574400 -10800 1 -04}
     {856062000 -14400 0 -04}
-    {876110400 -10800 1 -03}
+    {876110400 -10800 1 -04}
     {888721200 -14400 0 -04}
-    {908078400 -10800 1 -03}
+    {908078400 -10800 1 -04}
     {919566000 -14400 0 -04}
-    {938923200 -10800 1 -03}
+    {938923200 -10800 1 -04}
     {951620400 -14400 0 -04}
-    {970977600 -10800 1 -03}
+    {970977600 -10800 1 -04}
     {982465200 -14400 0 -04}
-    {1003032000 -10800 1 -03}
+    {1003032000 -10800 1 -04}
     {1013914800 -14400 0 -04}
-    {1036296000 -10800 1 -03}
+    {1036296000 -10800 1 -04}
     {1045364400 -14400 0 -04}
-    {1066536000 -10800 1 -03}
+    {1066536000 -10800 1 -04}
     {1076814000 -14400 0 -04}
-    {1099368000 -10800 1 -03}
+    {1099368000 -10800 1 -04}
     {1108868400 -14400 0 -04}
-    {1129435200 -10800 1 -03}
+    {1129435200 -10800 1 -04}
     {1140318000 -14400 0 -04}
-    {1162699200 -10800 1 -03}
+    {1162699200 -10800 1 -04}
     {1172372400 -14400 0 -04}
-    {1192334400 -10800 1 -03}
+    {1192334400 -10800 1 -04}
     {1203217200 -14400 0 -04}
-    {1224388800 -10800 1 -03}
+    {1224388800 -10800 1 -04}
     {1234666800 -14400 0 -04}
-    {1255838400 -10800 1 -03}
+    {1255838400 -10800 1 -04}
     {1266721200 -14400 0 -04}
-    {1287288000 -10800 1 -03}
+    {1287288000 -10800 1 -04}
     {1298170800 -14400 0 -04}
-    {1318737600 -10800 1 -03}
+    {1318737600 -10800 1 -04}
     {1330225200 -14400 0 -04}
-    {1350792000 -10800 1 -03}
+    {1350792000 -10800 1 -04}
     {1361070000 -14400 0 -04}
-    {1382241600 -10800 1 -03}
+    {1382241600 -10800 1 -04}
     {1392519600 -14400 0 -04}
-    {1413691200 -10800 1 -03}
+    {1413691200 -10800 1 -04}
     {1424574000 -14400 0 -04}
-    {1445140800 -10800 1 -03}
+    {1445140800 -10800 1 -04}
     {1456023600 -14400 0 -04}
-    {1476590400 -10800 1 -03}
+    {1476590400 -10800 1 -04}
     {1487473200 -14400 0 -04}
-    {1508040000 -10800 1 -03}
+    {1508040000 -10800 1 -04}
     {1518922800 -14400 0 -04}
-    {1541304000 -10800 1 -03}
+    {1541304000 -10800 1 -04}
     {1550372400 -14400 0 -04}
-    {1572753600 -10800 1 -03}
+    {1572753600 -10800 1 -04}
     {1581822000 -14400 0 -04}
-    {1604203200 -10800 1 -03}
+    {1604203200 -10800 1 -04}
     {1613876400 -14400 0 -04}
-    {1636257600 -10800 1 -03}
+    {1636257600 -10800 1 -04}
     {1645326000 -14400 0 -04}
-    {1667707200 -10800 1 -03}
+    {1667707200 -10800 1 -04}
     {1677380400 -14400 0 -04}
-    {1699156800 -10800 1 -03}
+    {1699156800 -10800 1 -04}
     {1708225200 -14400 0 -04}
-    {1730606400 -10800 1 -03}
+    {1730606400 -10800 1 -04}
     {1739674800 -14400 0 -04}
-    {1762056000 -10800 1 -03}
+    {1762056000 -10800 1 -04}
     {1771729200 -14400 0 -04}
-    {1793505600 -10800 1 -03}
+    {1793505600 -10800 1 -04}
     {1803178800 -14400 0 -04}
-    {1825560000 -10800 1 -03}
+    {1825560000 -10800 1 -04}
     {1834628400 -14400 0 -04}
-    {1857009600 -10800 1 -03}
+    {1857009600 -10800 1 -04}
     {1866078000 -14400 0 -04}
-    {1888459200 -10800 1 -03}
+    {1888459200 -10800 1 -04}
     {1897527600 -14400 0 -04}
-    {1919908800 -10800 1 -03}
+    {1919908800 -10800 1 -04}
     {1928977200 -14400 0 -04}
-    {1951358400 -10800 1 -03}
+    {1951358400 -10800 1 -04}
     {1960426800 -14400 0 -04}
-    {1983412800 -10800 1 -03}
+    {1983412800 -10800 1 -04}
     {1992481200 -14400 0 -04}
-    {2014862400 -10800 1 -03}
+    {2014862400 -10800 1 -04}
     {2024535600 -14400 0 -04}
-    {2046312000 -10800 1 -03}
+    {2046312000 -10800 1 -04}
     {2055380400 -14400 0 -04}
-    {2077761600 -10800 1 -03}
+    {2077761600 -10800 1 -04}
     {2086830000 -14400 0 -04}
-    {2109211200 -10800 1 -03}
+    {2109211200 -10800 1 -04}
     {2118884400 -14400 0 -04}
-    {2140660800 -10800 1 -03}
+    {2140660800 -10800 1 -04}
     {2150334000 -14400 0 -04}
-    {2172715200 -10800 1 -03}
+    {2172715200 -10800 1 -04}
     {2181783600 -14400 0 -04}
-    {2204164800 -10800 1 -03}
+    {2204164800 -10800 1 -04}
     {2213233200 -14400 0 -04}
-    {2235614400 -10800 1 -03}
+    {2235614400 -10800 1 -04}
     {2244682800 -14400 0 -04}
-    {2267064000 -10800 1 -03}
+    {2267064000 -10800 1 -04}
     {2276132400 -14400 0 -04}
-    {2298513600 -10800 1 -03}
+    {2298513600 -10800 1 -04}
     {2307582000 -14400 0 -04}
-    {2329963200 -10800 1 -03}
+    {2329963200 -10800 1 -04}
     {2339636400 -14400 0 -04}
-    {2362017600 -10800 1 -03}
+    {2362017600 -10800 1 -04}
     {2371086000 -14400 0 -04}
-    {2393467200 -10800 1 -03}
+    {2393467200 -10800 1 -04}
     {2402535600 -14400 0 -04}
-    {2424916800 -10800 1 -03}
+    {2424916800 -10800 1 -04}
     {2433985200 -14400 0 -04}
-    {2456366400 -10800 1 -03}
+    {2456366400 -10800 1 -04}
     {2465434800 -14400 0 -04}
-    {2487816000 -10800 1 -03}
+    {2487816000 -10800 1 -04}
     {2497489200 -14400 0 -04}
-    {2519870400 -10800 1 -03}
+    {2519870400 -10800 1 -04}
     {2528938800 -14400 0 -04}
-    {2551320000 -10800 1 -03}
+    {2551320000 -10800 1 -04}
     {2560388400 -14400 0 -04}
-    {2582769600 -10800 1 -03}
+    {2582769600 -10800 1 -04}
     {2591838000 -14400 0 -04}
-    {2614219200 -10800 1 -03}
+    {2614219200 -10800 1 -04}
     {2623287600 -14400 0 -04}
-    {2645668800 -10800 1 -03}
+    {2645668800 -10800 1 -04}
     {2654737200 -14400 0 -04}
-    {2677118400 -10800 1 -03}
+    {2677118400 -10800 1 -04}
     {2686791600 -14400 0 -04}
-    {2709172800 -10800 1 -03}
+    {2709172800 -10800 1 -04}
     {2718241200 -14400 0 -04}
-    {2740622400 -10800 1 -03}
+    {2740622400 -10800 1 -04}
     {2749690800 -14400 0 -04}
-    {2772072000 -10800 1 -03}
+    {2772072000 -10800 1 -04}
     {2781140400 -14400 0 -04}
-    {2803521600 -10800 1 -03}
+    {2803521600 -10800 1 -04}
     {2812590000 -14400 0 -04}
-    {2834971200 -10800 1 -03}
+    {2834971200 -10800 1 -04}
     {2844039600 -14400 0 -04}
-    {2867025600 -10800 1 -03}
+    {2867025600 -10800 1 -04}
     {2876094000 -14400 0 -04}
-    {2898475200 -10800 1 -03}
+    {2898475200 -10800 1 -04}
     {2907543600 -14400 0 -04}
-    {2929924800 -10800 1 -03}
+    {2929924800 -10800 1 -04}
     {2938993200 -14400 0 -04}
-    {2961374400 -10800 1 -03}
+    {2961374400 -10800 1 -04}
     {2970442800 -14400 0 -04}
-    {2992824000 -10800 1 -03}
+    {2992824000 -10800 1 -04}
     {3001892400 -14400 0 -04}
-    {3024273600 -10800 1 -03}
+    {3024273600 -10800 1 -04}
     {3033946800 -14400 0 -04}
-    {3056328000 -10800 1 -03}
+    {3056328000 -10800 1 -04}
     {3065396400 -14400 0 -04}
-    {3087777600 -10800 1 -03}
+    {3087777600 -10800 1 -04}
     {3096846000 -14400 0 -04}
-    {3119227200 -10800 1 -03}
+    {3119227200 -10800 1 -04}
     {3128295600 -14400 0 -04}
-    {3150676800 -10800 1 -03}
+    {3150676800 -10800 1 -04}
     {3159745200 -14400 0 -04}
-    {3182126400 -10800 1 -03}
+    {3182126400 -10800 1 -04}
     {3191194800 -14400 0 -04}
-    {3213576000 -10800 1 -03}
+    {3213576000 -10800 1 -04}
     {3223249200 -14400 0 -04}
-    {3245630400 -10800 1 -03}
+    {3245630400 -10800 1 -04}
     {3254698800 -14400 0 -04}
-    {3277080000 -10800 1 -03}
+    {3277080000 -10800 1 -04}
     {3286148400 -14400 0 -04}
-    {3308529600 -10800 1 -03}
+    {3308529600 -10800 1 -04}
     {3317598000 -14400 0 -04}
-    {3339979200 -10800 1 -03}
+    {3339979200 -10800 1 -04}
     {3349047600 -14400 0 -04}
-    {3371428800 -10800 1 -03}
+    {3371428800 -10800 1 -04}
     {3381102000 -14400 0 -04}
-    {3403483200 -10800 1 -03}
+    {3403483200 -10800 1 -04}
     {3412551600 -14400 0 -04}
-    {3434932800 -10800 1 -03}
+    {3434932800 -10800 1 -04}
     {3444001200 -14400 0 -04}
-    {3466382400 -10800 1 -03}
+    {3466382400 -10800 1 -04}
     {3475450800 -14400 0 -04}
-    {3497832000 -10800 1 -03}
+    {3497832000 -10800 1 -04}
     {3506900400 -14400 0 -04}
-    {3529281600 -10800 1 -03}
+    {3529281600 -10800 1 -04}
     {3538350000 -14400 0 -04}
-    {3560731200 -10800 1 -03}
+    {3560731200 -10800 1 -04}
     {3570404400 -14400 0 -04}
-    {3592785600 -10800 1 -03}
+    {3592785600 -10800 1 -04}
     {3601854000 -14400 0 -04}
-    {3624235200 -10800 1 -03}
+    {3624235200 -10800 1 -04}
     {3633303600 -14400 0 -04}
-    {3655684800 -10800 1 -03}
+    {3655684800 -10800 1 -04}
     {3664753200 -14400 0 -04}
-    {3687134400 -10800 1 -03}
+    {3687134400 -10800 1 -04}
     {3696202800 -14400 0 -04}
-    {3718584000 -10800 1 -03}
+    {3718584000 -10800 1 -04}
     {3727652400 -14400 0 -04}
-    {3750638400 -10800 1 -03}
+    {3750638400 -10800 1 -04}
     {3759706800 -14400 0 -04}
-    {3782088000 -10800 1 -03}
+    {3782088000 -10800 1 -04}
     {3791156400 -14400 0 -04}
-    {3813537600 -10800 1 -03}
+    {3813537600 -10800 1 -04}
     {3822606000 -14400 0 -04}
-    {3844987200 -10800 1 -03}
+    {3844987200 -10800 1 -04}
     {3854055600 -14400 0 -04}
-    {3876436800 -10800 1 -03}
+    {3876436800 -10800 1 -04}
     {3885505200 -14400 0 -04}
-    {3907886400 -10800 1 -03}
+    {3907886400 -10800 1 -04}
     {3917559600 -14400 0 -04}
-    {3939940800 -10800 1 -03}
+    {3939940800 -10800 1 -04}
     {3949009200 -14400 0 -04}
-    {3971390400 -10800 1 -03}
+    {3971390400 -10800 1 -04}
     {3980458800 -14400 0 -04}
-    {4002840000 -10800 1 -03}
+    {4002840000 -10800 1 -04}
     {4011908400 -14400 0 -04}
-    {4034289600 -10800 1 -03}
+    {4034289600 -10800 1 -04}
     {4043358000 -14400 0 -04}
-    {4065739200 -10800 1 -03}
+    {4065739200 -10800 1 -04}
     {4074807600 -14400 0 -04}
-    {4097188800 -10800 1 -03}
+    {4097188800 -10800 1 -04}
 }

library/tzdata/America/Cuiaba

@@ -3,255 +3,255 @@
 set TZData(:America/Cuiaba) {
     {-9223372036854775808 -13460 0 LMT}
     {-1767212140 -14400 0 -04}
-    {-1206954000 -10800 1 -03}
+    {-1206954000 -10800 1 -04}
     {-1191358800 -14400 0 -04}
-    {-1175371200 -10800 1 -03}
+    {-1175371200 -10800 1 -04}
     {-1159822800 -14400 0 -04}
-    {-633816000 -10800 1 -03}
+    {-633816000 -10800 1 -04}
     {-622065600 -14400 0 -04}
-    {-602280000 -10800 1 -03}
+    {-602280000 -10800 1 -04}
     {-591829200 -14400 0 -04}
-    {-570744000 -10800 1 -03}
+    {-570744000 -10800 1 -04}
     {-560206800 -14400 0 -04}
-    {-539121600 -10800 1 -03}
+    {-539121600 -10800 1 -04}
     {-531349200 -14400 0 -04}
-    {-191361600 -10800 1 -03}
+    {-191361600 -10800 1 -04}
     {-184194000 -14400 0 -04}
-    {-155160000 -10800 1 -03}
+    {-155160000 -10800 1 -04}
     {-150066000 -14400 0 -04}
-    {-128894400 -10800 1 -03}
+    {-128894400 -10800 1 -04}
     {-121122000 -14400 0 -04}
-    {-99950400 -10800 1 -03}
+    {-99950400 -10800 1 -04}
     {-89586000 -14400 0 -04}
-    {-68414400 -10800 1 -03}
+    {-68414400 -10800 1 -04}
     {-57963600 -14400 0 -04}
-    {499752000 -10800 1 -03}
+    {499752000 -10800 1 -04}
     {511239600 -14400 0 -04}
-    {530596800 -10800 1 -03}
+    {530596800 -10800 1 -04}
     {540270000 -14400 0 -04}
-    {562132800 -10800 1 -03}
+    {562132800 -10800 1 -04}
     {571201200 -14400 0 -04}
-    {592977600 -10800 1 -03}
+    {592977600 -10800 1 -04}
     {602046000 -14400 0 -04}
-    {624427200 -10800 1 -03}
+    {624427200 -10800 1 -04}
     {634705200 -14400 0 -04}
-    {656481600 -10800 1 -03}
+    {656481600 -10800 1 -04}
     {666759600 -14400 0 -04}
-    {687931200 -10800 1 -03}
+    {687931200 -10800 1 -04}
     {697604400 -14400 0 -04}
-    {719985600 -10800 1 -03}
+    {719985600 -10800 1 -04}
     {728449200 -14400 0 -04}
-    {750830400 -10800 1 -03}
+    {750830400 -10800 1 -04}
     {761713200 -14400 0 -04}
-    {782280000 -10800 1 -03}
+    {782280000 -10800 1 -04}
     {793162800 -14400 0 -04}
-    {813729600 -10800 1 -03}
+    {813729600 -10800 1 -04}
     {824007600 -14400 0 -04}
-    {844574400 -10800 1 -03}
+    {844574400 -10800 1 -04}
     {856062000 -14400 0 -04}
-    {876110400 -10800 1 -03}
+    {876110400 -10800 1 -04}
     {888721200 -14400 0 -04}
-    {908078400 -10800 1 -03}
+    {908078400 -10800 1 -04}
     {919566000 -14400 0 -04}
-    {938923200 -10800 1 -03}
+    {938923200 -10800 1 -04}
     {951620400 -14400 0 -04}
-    {970977600 -10800 1 -03}
+    {970977600 -10800 1 -04}
     {982465200 -14400 0 -04}
-    {1003032000 -10800 1 -03}
+    {1003032000 -10800 1 -04}
     {1013914800 -14400 0 -04}
-    {1036296000 -10800 1 -03}
+    {1036296000 -10800 1 -04}
     {1045364400 -14400 0 -04}
     {1064372400 -14400 0 -04}
     {1096603200 -14400 0 -04}
-    {1099368000 -10800 1 -03}
+    {1099368000 -10800 1 -04}
     {1108868400 -14400 0 -04}
-    {1129435200 -10800 1 -03}
+    {1129435200 -10800 1 -04}
     {1140318000 -14400 0 -04}
-    {1162699200 -10800 1 -03}
+    {1162699200 -10800 1 -04}
     {1172372400 -14400 0 -04}
-    {1192334400 -10800 1 -03}
+    {1192334400 -10800 1 -04}
     {1203217200 -14400 0 -04}
-    {1224388800 -10800 1 -03}
+    {1224388800 -10800 1 -04}
     {1234666800 -14400 0 -04}
-    {1255838400 -10800 1 -03}
+    {1255838400 -10800 1 -04}
     {1266721200 -14400 0 -04}
-    {1287288000 -10800 1 -03}
+    {1287288000 -10800 1 -04}
     {1298170800 -14400 0 -04}
-    {1318737600 -10800 1 -03}
+    {1318737600 -10800 1 -04}
     {1330225200 -14400 0 -04}
-    {1350792000 -10800 1 -03}
+    {1350792000 -10800 1 -04}
     {1361070000 -14400 0 -04}
-    {1382241600 -10800 1 -03}
+    {1382241600 -10800 1 -04}
     {1392519600 -14400 0 -04}
-    {1413691200 -10800 1 -03}
+    {1413691200 -10800 1 -04}
     {1424574000 -14400 0 -04}
-    {1445140800 -10800 1 -03}
+    {1445140800 -10800 1 -04}
     {1456023600 -14400 0 -04}
-    {1476590400 -10800 1 -03}
+    {1476590400 -10800 1 -04}
     {1487473200 -14400 0 -04}
-    {1508040000 -10800 1 -03}
+    {1508040000 -10800 1 -04}
     {1518922800 -14400 0 -04}
-    {1541304000 -10800 1 -03}
+    {1541304000 -10800 1 -04}
     {1550372400 -14400 0 -04}
-    {1572753600 -10800 1 -03}
+    {1572753600 -10800 1 -04}
     {1581822000 -14400 0 -04}
-    {1604203200 -10800 1 -03}
+    {1604203200 -10800 1 -04}
     {1613876400 -14400 0 -04}
-    {1636257600 -10800 1 -03}
+    {1636257600 -10800 1 -04}
     {1645326000 -14400 0 -04}
-    {1667707200 -10800 1 -03}
+    {1667707200 -10800 1 -04}
     {1677380400 -14400 0 -04}
-    {1699156800 -10800 1 -03}
+    {1699156800 -10800 1 -04}
     {1708225200 -14400 0 -04}
-    {1730606400 -10800 1 -03}
+    {1730606400 -10800 1 -04}
     {1739674800 -14400 0 -04}
-    {1762056000 -10800 1 -03}
+    {1762056000 -10800 1 -04}
     {1771729200 -14400 0 -04}
-    {1793505600 -10800 1 -03}
+    {1793505600 -10800 1 -04}
     {1803178800 -14400 0 -04}
-    {1825560000 -10800 1 -03}
+    {1825560000 -10800 1 -04}
     {1834628400 -14400 0 -04}
-    {1857009600 -10800 1 -03}
+    {1857009600 -10800 1 -04}
     {1866078000 -14400 0 -04}
-    {1888459200 -10800 1 -03}
+    {1888459200 -10800 1 -04}
     {1897527600 -14400 0 -04}
-    {1919908800 -10800 1 -03}
+    {1919908800 -10800 1 -04}
     {1928977200 -14400 0 -04}
-    {1951358400 -10800 1 -03}
+    {1951358400 -10800 1 -04}
     {1960426800 -14400 0 -04}
-    {1983412800 -10800 1 -03}
+    {1983412800 -10800 1 -04}
     {1992481200 -14400 0 -04}
-    {2014862400 -10800 1 -03}
+    {2014862400 -10800 1 -04}
     {2024535600 -14400 0 -04}
-    {2046312000 -10800 1 -03}
+    {2046312000 -10800 1 -04}
     {2055380400 -14400 0 -04}
-    {2077761600 -10800 1 -03}
+    {2077761600 -10800 1 -04}
     {2086830000 -14400 0 -04}
-    {2109211200 -10800 1 -03}
+    {2109211200 -10800 1 -04}
     {2118884400 -14400 0 -04}
-    {2140660800 -10800 1 -03}
+    {2140660800 -10800 1 -04}
     {2150334000 -14400 0 -04}
-    {2172715200 -10800 1 -03}
+    {2172715200 -10800 1 -04}
     {2181783600 -14400 0 -04}
-    {2204164800 -10800 1 -03}
+    {2204164800 -10800 1 -04}
     {2213233200 -14400 0 -04}
-    {2235614400 -10800 1 -03}
+    {2235614400 -10800 1 -04}
     {2244682800 -14400 0 -04}
-    {2267064000 -10800 1 -03}
+    {2267064000 -10800 1 -04}
     {2276132400 -14400 0 -04}
-    {2298513600 -10800 1 -03}
+    {2298513600 -10800 1 -04}
     {2307582000 -14400 0 -04}
-    {2329963200 -10800 1 -03}
+    {2329963200 -10800 1 -04}
     {2339636400 -14400 0 -04}
-    {2362017600 -10800 1 -03}
+    {2362017600 -10800 1 -04}
     {2371086000 -14400 0 -04}
-    {2393467200 -10800 1 -03}
+    {2393467200 -10800 1 -04}
     {2402535600 -14400 0 -04}
-    {2424916800 -10800 1 -03}
+    {2424916800 -10800 1 -04}
     {2433985200 -14400 0 -04}
-    {2456366400 -10800 1 -03}
+    {2456366400 -10800 1 -04}
     {2465434800 -14400 0 -04}
-    {2487816000 -10800 1 -03}
+    {2487816000 -10800 1 -04}
     {2497489200 -14400 0 -04}
-    {2519870400 -10800 1 -03}
+    {2519870400 -10800 1 -04}
     {2528938800 -14400 0 -04}
-    {2551320000 -10800 1 -03}
+    {2551320000 -10800 1 -04}
     {2560388400 -14400 0 -04}
-    {2582769600 -10800 1 -03}
+    {2582769600 -10800 1 -04}
     {2591838000 -14400 0 -04}
-    {2614219200 -10800 1 -03}
+    {2614219200 -10800 1 -04}
     {2623287600 -14400 0 -04}
-    {2645668800 -10800 1 -03}
+    {2645668800 -10800 1 -04}
     {2654737200 -14400 0 -04}
-    {2677118400 -10800 1 -03}
+    {2677118400 -10800 1 -04}
     {2686791600 -14400 0 -04}
-    {2709172800 -10800 1 -03}
+    {2709172800 -10800 1 -04}
     {2718241200 -14400 0 -04}
-    {2740622400 -10800 1 -03}
+    {2740622400 -10800 1 -04}
     {2749690800 -14400 0 -04}
-    {2772072000 -10800 1 -03}
+    {2772072000 -10800 1 -04}
     {2781140400 -14400 0 -04}
-    {2803521600 -10800 1 -03}
+    {2803521600 -10800 1 -04}
     {2812590000 -14400 0 -04}
-    {2834971200 -10800 1 -03}
+    {2834971200 -10800 1 -04}
     {2844039600 -14400 0 -04}
-    {2867025600 -10800 1 -03}
+    {2867025600 -10800 1 -04}
     {2876094000 -14400 0 -04}
-    {2898475200 -10800 1 -03}
+    {2898475200 -10800 1 -04}
     {2907543600 -14400 0 -04}
-    {2929924800 -10800 1 -03}
+    {2929924800 -10800 1 -04}
     {2938993200 -14400 0 -04}
-    {2961374400 -10800 1 -03}
+    {2961374400 -10800 1 -04}
     {2970442800 -14400 0 -04}
-    {2992824000 -10800 1 -03}
+    {2992824000 -10800 1 -04}
     {3001892400 -14400 0 -04}
-    {3024273600 -10800 1 -03}
+    {3024273600 -10800 1 -04}
     {3033946800 -14400 0 -04}
-    {3056328000 -10800 1 -03}
+    {3056328000 -10800 1 -04}
     {3065396400 -14400 0 -04}
-    {3087777600 -10800 1 -03}
+    {3087777600 -10800 1 -04}
     {3096846000 -14400 0 -04}
-    {3119227200 -10800 1 -03}
+    {3119227200 -10800 1 -04}
     {3128295600 -14400 0 -04}
-    {3150676800 -10800 1 -03}
+    {3150676800 -10800 1 -04}
     {3159745200 -14400 0 -04}
-    {3182126400 -10800 1 -03}
+    {3182126400 -10800 1 -04}
     {3191194800 -14400 0 -04}
-    {3213576000 -10800 1 -03}
+    {3213576000 -10800 1 -04}
     {3223249200 -14400 0 -04}
-    {3245630400 -10800 1 -03}
+    {3245630400 -10800 1 -04}
     {3254698800 -14400 0 -04}
-    {3277080000 -10800 1 -03}
+    {3277080000 -10800 1 -04}
     {3286148400 -14400 0 -04}
-    {3308529600 -10800 1 -03}
+    {3308529600 -10800 1 -04}
     {3317598000 -14400 0 -04}
-    {3339979200 -10800 1 -03}
+    {3339979200 -10800 1 -04}
     {3349047600 -14400 0 -04}
-    {3371428800 -10800 1 -03}
+    {3371428800 -10800 1 -04}
     {3381102000 -14400 0 -04}
-    {3403483200 -10800 1 -03}
+    {3403483200 -10800 1 -04}
     {3412551600 -14400 0 -04}
-    {3434932800 -10800 1 -03}
+    {3434932800 -10800 1 -04}
     {3444001200 -14400 0 -04}
-    {3466382400 -10800 1 -03}
+    {3466382400 -10800 1 -04}
     {3475450800 -14400 0 -04}
-    {3497832000 -10800 1 -03}
+    {3497832000 -10800 1 -04}
     {3506900400 -14400 0 -04}
-    {3529281600 -10800 1 -03}
+    {3529281600 -10800 1 -04}
     {3538350000 -14400 0 -04}
-    {3560731200 -10800 1 -03}
+    {3560731200 -10800 1 -04}
     {3570404400 -14400 0 -04}
-    {3592785600 -10800 1 -03}
+    {3592785600 -10800 1 -04}
     {3601854000 -14400 0 -04}
-    {3624235200 -10800 1 -03}
+    {3624235200 -10800 1 -04}
     {3633303600 -14400 0 -04}
-    {3655684800 -10800 1 -03}
+    {3655684800 -10800 1 -04}
     {3664753200 -14400 0 -04}
-    {3687134400 -10800 1 -03}
+    {3687134400 -10800 1 -04}
     {3696202800 -14400 0 -04}
-    {3718584000 -10800 1 -03}
+    {3718584000 -10800 1 -04}
     {3727652400 -14400 0 -04}
-    {3750638400 -10800 1 -03}
+    {3750638400 -10800 1 -04}
     {3759706800 -14400 0 -04}
-    {3782088000 -10800 1 -03}
+    {3782088000 -10800 1 -04}
     {3791156400 -14400 0 -04}
-    {3813537600 -10800 1 -03}
+    {3813537600 -10800 1 -04}
     {3822606000 -14400 0 -04}
-    {3844987200 -10800 1 -03}
+    {3844987200 -10800 1 -04}
     {3854055600 -14400 0 -04}
-    {3876436800 -10800 1 -03}
+    {3876436800 -10800 1 -04}
     {3885505200 -14400 0 -04}
-    {3907886400 -10800 1 -03}
+    {3907886400 -10800 1 -04}
     {3917559600 -14400 0 -04}
-    {3939940800 -10800 1 -03}
+    {3939940800 -10800 1 -04}
     {3949009200 -14400 0 -04}
-    {3971390400 -10800 1 -03}
+    {3971390400 -10800 1 -04}
     {3980458800 -14400 0 -04}
-    {4002840000 -10800 1 -03}
+    {4002840000 -10800 1 -04}
     {4011908400 -14400 0 -04}
-    {4034289600 -10800 1 -03}
+    {4034289600 -10800 1 -04}
     {4043358000 -14400 0 -04}
-    {4065739200 -10800 1 -03}
+    {4065739200 -10800 1 -04}
     {4074807600 -14400 0 -04}
-    {4097188800 -10800 1 -03}
+    {4097188800 -10800 1 -04}
 }

library/tzdata/America/Eirunepe

@@ -3,37 +3,37 @@
 set TZData(:America/Eirunepe) {
     {-9223372036854775808 -16768 0 LMT}
     {-1767208832 -18000 0 -05}
-    {-1206950400 -14400 1 -04}
+    {-1206950400 -14400 1 -05}
     {-1191355200 -18000 0 -05}
-    {-1175367600 -14400 1 -04}
+    {-1175367600 -14400 1 -05}
     {-1159819200 -18000 0 -05}
-    {-633812400 -14400 1 -04}
+    {-633812400 -14400 1 -05}
     {-622062000 -18000 0 -05}
-    {-602276400 -14400 1 -04}
+    {-602276400 -14400 1 -05}
     {-591825600 -18000 0 -05}
-    {-570740400 -14400 1 -04}
+    {-570740400 -14400 1 -05}
     {-560203200 -18000 0 -05}
-    {-539118000 -14400 1 -04}
+    {-539118000 -14400 1 -05}
     {-531345600 -18000 0 -05}
-    {-191358000 -14400 1 -04}
+    {-191358000 -14400 1 -05}
     {-184190400 -18000 0 -05}
-    {-155156400 -14400 1 -04}
+    {-155156400 -14400 1 -05}
     {-150062400 -18000 0 -05}
-    {-128890800 -14400 1 -04}
+    {-128890800 -14400 1 -05}
     {-121118400 -18000 0 -05}
-    {-99946800 -14400 1 -04}
+    {-99946800 -14400 1 -05}
     {-89582400 -18000 0 -05}
-    {-68410800 -14400 1 -04}
+    {-68410800 -14400 1 -05}
     {-57960000 -18000 0 -05}
-    {499755600 -14400 1 -04}
+    {499755600 -14400 1 -05}
     {511243200 -18000 0 -05}
-    {530600400 -14400 1 -04}
+    {530600400 -14400 1 -05}
     {540273600 -18000 0 -05}
-    {562136400 -14400 1 -04}
+    {562136400 -14400 1 -05}
     {571204800 -18000 0 -05}
     {590040000 -18000 0 -05}
     {749192400 -18000 0 -05}
-    {750834000 -14400 1 -04}
+    {750834000 -14400 1 -05}
     {761716800 -18000 0 -05}
     {780206400 -18000 0 -05}
     {1214283600 -14400 0 -04}

library/tzdata/America/Fortaleza

@@ -3,46 +3,46 @@
 set TZData(:America/Fortaleza) {
     {-9223372036854775808 -9240 0 LMT}
     {-1767216360 -10800 0 -03}
-    {-1206957600 -7200 1 -02}
+    {-1206957600 -7200 1 -03}
     {-1191362400 -10800 0 -03}
-    {-1175374800 -7200 1 -02}
+    {-1175374800 -7200 1 -03}
     {-1159826400 -10800 0 -03}
-    {-633819600 -7200 1 -02}
+    {-633819600 -7200 1 -03}
     {-622069200 -10800 0 -03}
-    {-602283600 -7200 1 -02}
+    {-602283600 -7200 1 -03}
     {-591832800 -10800 0 -03}
-    {-570747600 -7200 1 -02}
+    {-570747600 -7200 1 -03}
     {-560210400 -10800 0 -03}
-    {-539125200 -7200 1 -02}
+    {-539125200 -7200 1 -03}
     {-531352800 -10800 0 -03}
-    {-191365200 -7200 1 -02}
+    {-191365200 -7200 1 -03}
     {-184197600 -10800 0 -03}
-    {-155163600 -7200 1 -02}
+    {-155163600 -7200 1 -03}
     {-150069600 -10800 0 -03}
-    {-128898000 -7200 1 -02}
+    {-128898000 -7200 1 -03}
     {-121125600 -10800 0 -03}
-    {-99954000 -7200 1 -02}
+    {-99954000 -7200 1 -03}
     {-89589600 -10800 0 -03}
-    {-68418000 -7200 1 -02}
+    {-68418000 -7200 1 -03}
     {-57967200 -10800 0 -03}
-    {499748400 -7200 1 -02}
+    {499748400 -7200 1 -03}
     {511236000 -10800 0 -03}
-    {530593200 -7200 1 -02}
+    {530593200 -7200 1 -03}
     {540266400 -10800 0 -03}
-    {562129200 -7200 1 -02}
+    {562129200 -7200 1 -03}
     {571197600 -10800 0 -03}
-    {592974000 -7200 1 -02}
+    {592974000 -7200 1 -03}
     {602042400 -10800 0 -03}
-    {624423600 -7200 1 -02}
+    {624423600 -7200 1 -03}
     {634701600 -10800 0 -03}
     {653536800 -10800 0 -03}
     {938660400 -10800 0 -03}
-    {938919600 -7200 1 -02}
+    {938919600 -7200 1 -03}
     {951616800 -10800 0 -03}
-    {970974000 -7200 1 -02}
+    {970974000 -7200 1 -03}
     {972180000 -10800 0 -03}
     {1000350000 -10800 0 -03}
-    {1003028400 -7200 1 -02}
+    {1003028400 -7200 1 -03}
     {1013911200 -10800 0 -03}
     {1033437600 -10800 0 -03}
 }

library/tzdata/America/Grand_Turk

@@ -2,8 +2,8 @@
 
 set TZData(:America/Grand_Turk) {
     {-9223372036854775808 -17072 0 LMT}
-    {-2524504528 -18431 0 KMT}
-    {-1827687169 -18000 0 EST}
+    {-2524504528 -18430 0 KMT}
+    {-1827687170 -18000 0 EST}
     {284014800 -18000 0 EST}
     {294217200 -14400 1 EDT}
     {309938400 -18000 0 EST}

library/tzdata/America/Guayaquil

@@ -4,6 +4,6 @@ set TZData(:America/Guayaquil) {
     {-9223372036854775808 -19160 0 LMT}
     {-2524502440 -18840 0 QMT}
     {-1230749160 -18000 0 -05}
-    {722926800 -14400 1 -04}
+    {722926800 -14400 1 -05}
     {728884800 -18000 0 -05}
 }

library/tzdata/America/Jamaica

@@ -1,9 +1,9 @@
 # created by tools/tclZIC.tcl - do not edit
 
 set TZData(:America/Jamaica) {
-    {-9223372036854775808 -18431 0 LMT}
-    {-2524503169 -18431 0 KMT}
-    {-1827687169 -18000 0 EST}
+    {-9223372036854775808 -18430 0 LMT}
+    {-2524503170 -18430 0 KMT}
+    {-1827687170 -18000 0 EST}
     {126248400 -18000 0 EST}
     {126687600 -14400 1 EDT}
     {152085600 -18000 0 EST}

library/tzdata/America/Lima

@@ -3,11 +3,11 @@
 set TZData(:America/Lima) {
     {-9223372036854775808 -18492 0 LMT}
     {-2524503108 -18516 0 LMT}
-    {-1938538284 -14400 0 -04}
+    {-1938538284 -14400 0 -05}
     {-1002052800 -18000 0 -05}
-    {-986756400 -14400 1 -04}
+    {-986756400 -14400 1 -05}
     {-971035200 -18000 0 -05}
-    {-955306800 -14400 1 -04}
+    {-955306800 -14400 1 -05}
     {-939585600 -18000 0 -05}
     {512712000 -18000 0 -05}
     {544248000 -18000 0 -05}

library/tzdata/America/Maceio

@@ -3,50 +3,50 @@
 set TZData(:America/Maceio) {
     {-9223372036854775808 -8572 0 LMT}
     {-1767217028 -10800 0 -03}
-    {-1206957600 -7200 1 -02}
+    {-1206957600 -7200 1 -03}
     {-1191362400 -10800 0 -03}
-    {-1175374800 -7200 1 -02}
+    {-1175374800 -7200 1 -03}
     {-1159826400 -10800 0 -03}
-    {-633819600 -7200 1 -02}
+    {-633819600 -7200 1 -03}
     {-622069200 -10800 0 -03}
-    {-602283600 -7200 1 -02}
+    {-602283600 -7200 1 -03}
     {-591832800 -10800 0 -03}
-    {-570747600 -7200 1 -02}
+    {-570747600 -7200 1 -03}
     {-560210400 -10800 0 -03}
-    {-539125200 -7200 1 -02}
+    {-539125200 -7200 1 -03}
     {-531352800 -10800 0 -03}
-    {-191365200 -7200 1 -02}
+    {-191365200 -7200 1 -03}
     {-184197600 -10800 0 -03}
-    {-155163600 -7200 1 -02}
+    {-155163600 -7200 1 -03}
     {-150069600 -10800 0 -03}
-    {-128898000 -7200 1 -02}
+    {-128898000 -7200 1 -03}
     {-121125600 -10800 0 -03}
-    {-99954000 -7200 1 -02}
+    {-99954000 -7200 1 -03}
     {-89589600 -10800 0 -03}
-    {-68418000 -7200 1 -02}
+    {-68418000 -7200 1 -03}
     {-57967200 -10800 0 -03}
-    {499748400 -7200 1 -02}
+    {499748400 -7200 1 -03}
     {511236000 -10800 0 -03}
-    {530593200 -7200 1 -02}
+    {530593200 -7200 1 -03}
     {540266400 -10800 0 -03}
-    {562129200 -7200 1 -02}
+    {562129200 -7200 1 -03}
     {571197600 -10800 0 -03}
-    {592974000 -7200 1 -02}
+    {592974000 -7200 1 -03}
     {602042400 -10800 0 -03}
-    {624423600 -7200 1 -02}
+    {624423600 -7200 1 -03}
     {634701600 -10800 0 -03}
     {653536800 -10800 0 -03}
     {813553200 -10800 0 -03}
-    {813726000 -7200 1 -02}
+    {813726000 -7200 1 -03}
     {824004000 -10800 0 -03}
     {841802400 -10800 0 -03}
     {938660400 -10800 0 -03}
-    {938919600 -7200 1 -02}
+    {938919600 -7200 1 -03}
     {951616800 -10800 0 -03}
-    {970974000 -7200 1 -02}
+    {970974000 -7200 1 -03}
     {972180000 -10800 0 -03}
     {1000350000 -10800 0 -03}
-    {1003028400 -7200 1 -02}
+    {1003028400 -7200 1 -03}
     {1013911200 -10800 0 -03}
     {1033437600 -10800 0 -03}
 }

library/tzdata/America/Manaus

@@ -3,37 +3,37 @@
 set TZData(:America/Manaus) {
     {-9223372036854775808 -14404 0 LMT}
     {-1767211196 -14400 0 -04}
-    {-1206954000 -10800 1 -03}
+    {-1206954000 -10800 1 -04}
     {-1191358800 -14400 0 -04}
-    {-1175371200 -10800 1 -03}
+    {-1175371200 -10800 1 -04}
     {-1159822800 -14400 0 -04}
-    {-633816000 -10800 1 -03}
+    {-633816000 -10800 1 -04}
     {-622065600 -14400 0 -04}
-    {-602280000 -10800 1 -03}
+    {-602280000 -10800 1 -04}
     {-591829200 -14400 0 -04}
-    {-570744000 -10800 1 -03}
+    {-570744000 -10800 1 -04}
     {-560206800 -14400 0 -04}
-    {-539121600 -10800 1 -03}
+    {-539121600 -10800 1 -04}
     {-531349200 -14400 0 -04}
-    {-191361600 -10800 1 -03}
+    {-191361600 -10800 1 -04}
     {-184194000 -14400 0 -04}
-    {-155160000 -10800 1 -03}
+    {-155160000 -10800 1 -04}
     {-150066000 -14400 0 -04}
-    {-128894400 -10800 1 -03}
+    {-128894400 -10800 1 -04}
     {-121122000 -14400 0 -04}
-    {-99950400 -10800 1 -03}
+    {-99950400 -10800 1 -04}
     {-89586000 -14400 0 -04}
-    {-68414400 -10800 1 -03}
+    {-68414400 -10800 1 -04}
     {-57963600 -14400 0 -04}
-    {499752000 -10800 1 -03}
+    {499752000 -10800 1 -04}
     {511239600 -14400 0 -04}
-    {530596800 -10800 1 -03}
+    {530596800 -10800 1 -04}
     {540270000 -14400 0 -04}
-    {562132800 -10800 1 -03}
+    {562132800 -10800 1 -04}
     {571201200 -14400 0 -04}
     {590036400 -14400 0 -04}
     {749188800 -14400 0 -04}
-    {750830400 -10800 1 -03}
+    {750830400 -10800 1 -04}
     {761713200 -14400 0 -04}
     {780202800 -14400 0 -04}
 }

library/tzdata/America/Montevideo

@@ -1,96 +1,96 @@
 # created by tools/tclZIC.tcl - do not edit
 
 set TZData(:America/Montevideo) {
-    {-9223372036854775808 -13484 0 LMT}
-    {-2256668116 -13484 0 MMT}
-    {-1567455316 -12600 0 -0330}
-    {-1459542600 -10800 1 -03}
+    {-9223372036854775808 -13491 0 LMT}
+    {-1942690509 -13491 0 MMT}
+    {-1567455309 -14400 0 -04}
+    {-1459627200 -10800 0 -0330}
     {-1443819600 -12600 0 -0330}
-    {-1428006600 -10800 1 -03}
+    {-1428006600 -10800 1 -0330}
     {-1412283600 -12600 0 -0330}
-    {-1396470600 -10800 1 -03}
+    {-1396470600 -10800 1 -0330}
     {-1380747600 -12600 0 -0330}
-    {-1141590600 -10800 1 -03}
+    {-1141590600 -10800 1 -0330}
     {-1128286800 -12600 0 -0330}
-    {-1110141000 -10800 1 -03}
+    {-1110141000 -10800 1 -0330}
     {-1096837200 -12600 0 -0330}
-    {-1078691400 -10800 1 -03}
+    {-1078691400 -10800 1 -0330}
     {-1065387600 -12600 0 -0330}
-    {-1046637000 -10800 1 -03}
+    {-1047241800 -10800 1 -0330}
     {-1033938000 -12600 0 -0330}
-    {-1015187400 -10800 1 -03}
+    {-1015187400 -10800 1 -0330}
     {-1002488400 -12600 0 -0330}
-    {-983737800 -10800 1 -03}
+    {-983737800 -10800 1 -0330}
     {-971038800 -12600 0 -0330}
-    {-952288200 -10800 1 -03}
+    {-954707400 -10800 1 -0330}
     {-938984400 -12600 0 -0330}
-    {-920838600 -10800 1 -03}
+    {-920838600 -10800 1 -0330}
     {-907534800 -12600 0 -0330}
-    {-896819400 -10800 1 -03}
-    {-853623000 -10800 0 -03}
-    {-853621200 -7200 1 -02}
-    {-845848800 -10800 0 -03}
-    {-334789200 -7200 1 -02}
-    {-319672800 -10800 0 -03}
-    {-314226000 -7200 1 -02}
+    {-896819400 -10800 1 -0330}
+    {-853621200 -9000 0 -03}
+    {-845847000 -10800 0 -03}
+    {-334789200 -9000 1 -03}
+    {-319671000 -10800 0 -03}
+    {-315608400 -10800 0 -03}
+    {-314226000 -7200 1 -03}
     {-309996000 -10800 0 -03}
-    {-149720400 -7200 1 -02}
+    {-149720400 -7200 1 -03}
     {-134604000 -10800 0 -03}
-    {-118270800 -7200 1 -02}
-    {-100044000 -10800 0 -03}
-    {-86821200 -7200 1 -02}
-    {-68508000 -10800 0 -03}
     {-63147600 -10800 0 -03}
-    {-50446800 -9000 1 -0230}
-    {-34119000 -10800 0 -03}
-    {-18910800 -9000 1 -0230}
-    {-2583000 -10800 0 -03}
-    {12625200 -9000 1 -0230}
-    {28953000 -10800 0 -03}
-    {31546800 -10800 0 -03}
-    {72932400 -7200 1 -02}
-    {82692000 -10800 0 -03}
+    {-50446800 -9000 1 -03}
+    {-34205400 -10800 0 -03}
+    {10800 -10800 0 -03}
+    {9860400 -7200 1 -03}
+    {14176800 -10800 0 -03}
+    {72846000 -7200 1 -03}
+    {80100000 -10800 0 -03}
     {126241200 -10800 0 -03}
-    {132116400 -9000 1 -0230}
-    {156909600 -9000 0 -02}
-    {156911400 -7200 1 -02}
-    {212983200 -10800 0 -03}
-    {250052400 -7200 1 -02}
-    {260244000 -10800 0 -03}
-    {307594800 -7200 1 -02}
-    {325994400 -10800 0 -03}
-    {566449200 -7200 1 -02}
-    {574308000 -10800 0 -03}
-    {597812400 -7200 1 -02}
-    {605671200 -10800 0 -03}
-    {625633200 -7200 1 -02}
-    {636516000 -10800 0 -03}
-    {656478000 -7200 1 -02}
+    {127278000 -5400 1 -03}
+    {132112800 -9000 0 -03}
+    {147234600 -10800 0 -03}
+    {156909600 -10800 0 -03}
+    {156913200 -7200 1 -03}
+    {165376800 -10800 0 -03}
+    {219812400 -7200 1 -03}
+    {226461600 -10800 0 -03}
+    {250052400 -7200 1 -03}
+    {257911200 -10800 0 -03}
+    {282711600 -7200 1 -03}
+    {289360800 -10800 0 -03}
+    {294202800 -7200 1 -03}
+    {322020000 -10800 0 -03}
+    {566449200 -7200 1 -03}
+    {573012000 -10800 0 -03}
+    {597812400 -7200 1 -03}
+    {605066400 -10800 0 -03}
+    {625633200 -7200 1 -03}
+    {635911200 -10800 0 -03}
+    {656478000 -7200 1 -03}
     {667965600 -10800 0 -03}
-    {688532400 -7200 1 -02}
+    {688532400 -7200 1 -03}
     {699415200 -10800 0 -03}
-    {719377200 -7200 1 -02}
+    {719377200 -7200 1 -03}
     {730864800 -10800 0 -03}
-    {1095562800 -7200 1 -02}
+    {1095562800 -7200 1 -03}
     {1111896000 -10800 0 -03}
-    {1128834000 -7200 1 -02}
+    {1128834000 -7200 1 -03}
     {1142136000 -10800 0 -03}
-    {1159678800 -7200 1 -02}
+    {1159678800 -7200 1 -03}
     {1173585600 -10800 0 -03}
-    {1191733200 -7200 1 -02}
+    {1191733200 -7200 1 -03}
     {1205035200 -10800 0 -03}
-    {1223182800 -7200 1 -02}
+    {1223182800 -7200 1 -03}
     {1236484800 -10800 0 -03}
-    {1254632400 -7200 1 -02}
+    {1254632400 -7200 1 -03}
     {1268539200 -10800 0 -03}
-    {1286082000 -7200 1 -02}
+    {1286082000 -7200 1 -03}
     {1299988800 -10800 0 -03}
-    {1317531600 -7200 1 -02}
+    {1317531600 -7200 1 -03}
     {1331438400 -10800 0 -03}
-    {1349586000 -7200 1 -02}
+    {1349586000 -7200 1 -03}
     {1362888000 -10800 0 -03}
-    {1381035600 -7200 1 -02}
+    {1381035600 -7200 1 -03}
     {1394337600 -10800 0 -03}
-    {1412485200 -7200 1 -02}
+    {1412485200 -7200 1 -03}
     {1425787200 -10800 0 -03}
 }

library/tzdata/America/Noronha

@@ -3,46 +3,46 @@
 set TZData(:America/Noronha) {
     {-9223372036854775808 -7780 0 LMT}
     {-1767217820 -7200 0 -02}
-    {-1206961200 -3600 1 -01}
+    {-1206961200 -3600 1 -02}
     {-1191366000 -7200 0 -02}
-    {-1175378400 -3600 1 -01}
+    {-1175378400 -3600 1 -02}
     {-1159830000 -7200 0 -02}
-    {-633823200 -3600 1 -01}
+    {-633823200 -3600 1 -02}
     {-622072800 -7200 0 -02}
-    {-602287200 -3600 1 -01}
+    {-602287200 -3600 1 -02}
     {-591836400 -7200 0 -02}
-    {-570751200 -3600 1 -01}
+    {-570751200 -3600 1 -02}
     {-560214000 -7200 0 -02}
-    {-539128800 -3600 1 -01}
+    {-539128800 -3600 1 -02}
     {-531356400 -7200 0 -02}
-    {-191368800 -3600 1 -01}
+    {-191368800 -3600 1 -02}
     {-184201200 -7200 0 -02}
-    {-155167200 -3600 1 -01}
+    {-155167200 -3600 1 -02}
     {-150073200 -7200 0 -02}
-    {-128901600 -3600 1 -01}
+    {-128901600 -3600 1 -02}
     {-121129200 -7200 0 -02}
-    {-99957600 -3600 1 -01}
+    {-99957600 -3600 1 -02}
     {-89593200 -7200 0 -02}
-    {-68421600 -3600 1 -01}
+    {-68421600 -3600 1 -02}
     {-57970800 -7200 0 -02}
-    {499744800 -3600 1 -01}
+    {499744800 -3600 1 -02}
     {511232400 -7200 0 -02}
-    {530589600 -3600 1 -01}
+    {530589600 -3600 1 -02}
     {540262800 -7200 0 -02}
-    {562125600 -3600 1 -01}
+    {562125600 -3600 1 -02}
     {571194000 -7200 0 -02}
-    {592970400 -3600 1 -01}
+    {592970400 -3600 1 -02}
     {602038800 -7200 0 -02}
-    {624420000 -3600 1 -01}
+    {624420000 -3600 1 -02}
     {634698000 -7200 0 -02}
     {653533200 -7200 0 -02}
     {938656800 -7200 0 -02}
-    {938916000 -3600 1 -01}
+    {938916000 -3600 1 -02}
     {951613200 -7200 0 -02}
-    {970970400 -3600 1 -01}
+    {970970400 -3600 1 -02}
     {971571600 -7200 0 -02}
     {1000346400 -7200 0 -02}
-    {1003024800 -3600 1 -01}
+    {1003024800 -3600 1 -02}
     {1013907600 -7200 0 -02}
     {1033434000 -7200 0 -02}
 }

library/tzdata/America/Porto_Velho

@@ -3,33 +3,33 @@
 set TZData(:America/Porto_Velho) {
     {-9223372036854775808 -15336 0 LMT}
     {-1767210264 -14400 0 -04}
-    {-1206954000 -10800 1 -03}
+    {-1206954000 -10800 1 -04}
     {-1191358800 -14400 0 -04}
-    {-1175371200 -10800 1 -03}
+    {-1175371200 -10800 1 -04}
     {-1159822800 -14400 0 -04}
-    {-633816000 -10800 1 -03}
+    {-633816000 -10800 1 -04}
     {-622065600 -14400 0 -04}
-    {-602280000 -10800 1 -03}
+    {-602280000 -10800 1 -04}
     {-591829200 -14400 0 -04}
-    {-570744000 -10800 1 -03}
+    {-570744000 -10800 1 -04}
     {-560206800 -14400 0 -04}
-    {-539121600 -10800 1 -03}
+    {-539121600 -10800 1 -04}
     {-531349200 -14400 0 -04}
-    {-191361600 -10800 1 -03}
+    {-191361600 -10800 1 -04}
     {-184194000 -14400 0 -04}
-    {-155160000 -10800 1 -03}
+    {-155160000 -10800 1 -04}
     {-150066000 -14400 0 -04}
-    {-128894400 -10800 1 -03}
+    {-128894400 -10800 1 -04}
     {-121122000 -14400 0 -04}
-    {-99950400 -10800 1 -03}
+    {-99950400 -10800 1 -04}
     {-89586000 -14400 0 -04}
-    {-68414400 -10800 1 -03}
+    {-68414400 -10800 1 -04}
     {-57963600 -14400 0 -04}
-    {499752000 -10800 1 -03}
+    {499752000 -10800 1 -04}
     {511239600 -14400 0 -04}
-    {530596800 -10800 1 -03}
+    {530596800 -10800 1 -04}
     {540270000 -14400 0 -04}
-    {562132800 -10800 1 -03}
+    {562132800 -10800 1 -04}
     {571201200 -14400 0 -04}
     {590036400 -14400 0 -04}
 }

library/tzdata/America/Punta_Arenas

@@ -8,115 +8,115 @@ set TZData(:America/Punta_Arenas) {
     {-1619205434 -14400 0 -04}
     {-1593806400 -16966 0 SMT}
     {-1335986234 -18000 0 -05}
-    {-1335985200 -14400 1 -04}
+    {-1335985200 -14400 1 -05}
     {-1317585600 -18000 0 -05}
-    {-1304362800 -14400 1 -04}
+    {-1304362800 -14400 1 -05}
     {-1286049600 -18000 0 -05}
-    {-1272826800 -14400 1 -04}
+    {-1272826800 -14400 1 -05}
     {-1254513600 -18000 0 -05}
-    {-1241290800 -14400 1 -04}
+    {-1241290800 -14400 1 -05}
     {-1222977600 -18000 0 -05}
-    {-1209754800 -14400 1 -04}
+    {-1209754800 -14400 1 -05}
     {-1191355200 -18000 0 -05}
     {-1178132400 -14400 0 -04}
     {-870552000 -18000 0 -05}
     {-865278000 -14400 0 -04}
     {-718056000 -18000 0 -05}
     {-713649600 -14400 0 -04}
-    {-36619200 -10800 1 -03}
+    {-36619200 -10800 1 -04}
     {-23922000 -14400 0 -04}
-    {-3355200 -10800 1 -03}
+    {-3355200 -10800 1 -04}
     {7527600 -14400 0 -04}
-    {24465600 -10800 1 -03}
+    {24465600 -10800 1 -04}
     {37767600 -14400 0 -04}
-    {55915200 -10800 1 -03}
+    {55915200 -10800 1 -04}
     {69217200 -14400 0 -04}
-    {87969600 -10800 1 -03}
+    {87969600 -10800 1 -04}
     {100666800 -14400 0 -04}
-    {118209600 -10800 1 -03}
+    {118209600 -10800 1 -04}
     {132116400 -14400 0 -04}
-    {150868800 -10800 1 -03}
+    {150868800 -10800 1 -04}
     {163566000 -14400 0 -04}
-    {182318400 -10800 1 -03}
+    {182318400 -10800 1 -04}
     {195620400 -14400 0 -04}
-    {213768000 -10800 1 -03}
+    {213768000 -10800 1 -04}
     {227070000 -14400 0 -04}
-    {245217600 -10800 1 -03}
+    {245217600 -10800 1 -04}
     {258519600 -14400 0 -04}
-    {277272000 -10800 1 -03}
+    {277272000 -10800 1 -04}
     {289969200 -14400 0 -04}
-    {308721600 -10800 1 -03}
+    {308721600 -10800 1 -04}
     {321418800 -14400 0 -04}
-    {340171200 -10800 1 -03}
+    {340171200 -10800 1 -04}
     {353473200 -14400 0 -04}
-    {371620800 -10800 1 -03}
+    {371620800 -10800 1 -04}
     {384922800 -14400 0 -04}
-    {403070400 -10800 1 -03}
+    {403070400 -10800 1 -04}
     {416372400 -14400 0 -04}
-    {434520000 -10800 1 -03}
+    {434520000 -10800 1 -04}
     {447822000 -14400 0 -04}
-    {466574400 -10800 1 -03}
+    {466574400 -10800 1 -04}
     {479271600 -14400 0 -04}
-    {498024000 -10800 1 -03}
+    {498024000 -10800 1 -04}
     {510721200 -14400 0 -04}
-    {529473600 -10800 1 -03}
+    {529473600 -10800 1 -04}
     {545194800 -14400 0 -04}
-    {560923200 -10800 1 -03}
+    {560923200 -10800 1 -04}
     {574225200 -14400 0 -04}
-    {592372800 -10800 1 -03}
+    {592372800 -10800 1 -04}
     {605674800 -14400 0 -04}
-    {624427200 -10800 1 -03}
+    {624427200 -10800 1 -04}
     {637124400 -14400 0 -04}
-    {653457600 -10800 1 -03}
+    {653457600 -10800 1 -04}
     {668574000 -14400 0 -04}
-    {687326400 -10800 1 -03}
+    {687326400 -10800 1 -04}
     {700628400 -14400 0 -04}
-    {718776000 -10800 1 -03}
+    {718776000 -10800 1 -04}
     {732078000 -14400 0 -04}
-    {750225600 -10800 1 -03}
+    {750225600 -10800 1 -04}
     {763527600 -14400 0 -04}
-    {781675200 -10800 1 -03}
+    {781675200 -10800 1 -04}
     {794977200 -14400 0 -04}
-    {813729600 -10800 1 -03}
+    {813729600 -10800 1 -04}
     {826426800 -14400 0 -04}
-    {845179200 -10800 1 -03}
+    {845179200 -10800 1 -04}
     {859690800 -14400 0 -04}
-    {876628800 -10800 1 -03}
+    {876628800 -10800 1 -04}
     {889930800 -14400 0 -04}
-    {906868800 -10800 1 -03}
+    {906868800 -10800 1 -04}
     {923194800 -14400 0 -04}
-    {939528000 -10800 1 -03}
+    {939528000 -10800 1 -04}
     {952830000 -14400 0 -04}
-    {971582400 -10800 1 -03}
+    {971582400 -10800 1 -04}
     {984279600 -14400 0 -04}
-    {1003032000 -10800 1 -03}
+    {1003032000 -10800 1 -04}
     {1015729200 -14400 0 -04}
-    {1034481600 -10800 1 -03}
+    {1034481600 -10800 1 -04}
     {1047178800 -14400 0 -04}
-    {1065931200 -10800 1 -03}
+    {1065931200 -10800 1 -04}
     {1079233200 -14400 0 -04}
-    {1097380800 -10800 1 -03}
+    {1097380800 -10800 1 -04}
     {1110682800 -14400 0 -04}
-    {1128830400 -10800 1 -03}
+    {1128830400 -10800 1 -04}
     {1142132400 -14400 0 -04}
-    {1160884800 -10800 1 -03}
+    {1160884800 -10800 1 -04}
     {1173582000 -14400 0 -04}
-    {1192334400 -10800 1 -03}
+    {1192334400 -10800 1 -04}
     {1206846000 -14400 0 -04}
-    {1223784000 -10800 1 -03}
+    {1223784000 -10800 1 -04}
     {1237086000 -14400 0 -04}
-    {1255233600 -10800 1 -03}
+    {1255233600 -10800 1 -04}
     {1270350000 -14400 0 -04}
-    {1286683200 -10800 1 -03}
+    {1286683200 -10800 1 -04}
     {1304823600 -14400 0 -04}
-    {1313899200 -10800 1 -03}
+    {1313899200 -10800 1 -04}
     {1335668400 -14400 0 -04}
-    {1346558400 -10800 1 -03}
+    {1346558400 -10800 1 -04}
     {1367118000 -14400 0 -04}
-    {1378612800 -10800 1 -03}
+    {1378612800 -10800 1 -04}
     {1398567600 -14400 0 -04}
-    {1410062400 -10800 1 -03}
+    {1410062400 -10800 1 -04}
     {1463281200 -14400 0 -04}
-    {1471147200 -10800 1 -03}
+    {1471147200 -10800 1 -04}
     {1480820400 -10800 0 -03}
 }

library/tzdata/America/Recife

@@ -3,46 +3,46 @@
 set TZData(:America/Recife) {
     {-9223372036854775808 -8376 0 LMT}
     {-1767217224 -10800 0 -03}
-    {-1206957600 -7200 1 -02}
+    {-1206957600 -7200 1 -03}
     {-1191362400 -10800 0 -03}
-    {-1175374800 -7200 1 -02}
+    {-1175374800 -7200 1 -03}
     {-1159826400 -10800 0 -03}
-    {-633819600 -7200 1 -02}
+    {-633819600 -7200 1 -03}
     {-622069200 -10800 0 -03}
-    {-602283600 -7200 1 -02}
+    {-602283600 -7200 1 -03}
     {-591832800 -10800 0 -03}
-    {-570747600 -7200 1 -02}
+    {-570747600 -7200 1 -03}
     {-560210400 -10800 0 -03}
-    {-539125200 -7200 1 -02}
+    {-539125200 -7200 1 -03}
     {-531352800 -10800 0 -03}
-    {-191365200 -7200 1 -02}
+    {-191365200 -7200 1 -03}
     {-184197600 -10800 0 -03}
-    {-155163600 -7200 1 -02}
+    {-155163600 -7200 1 -03}
     {-150069600 -10800 0 -03}
-    {-128898000 -7200 1 -02}
+    {-128898000 -7200 1 -03}
     {-121125600 -10800 0 -03}
-    {-99954000 -7200 1 -02}
+    {-99954000 -7200 1 -03}
     {-89589600 -10800 0 -03}
-    {-68418000 -7200 1 -02}
+    {-68418000 -7200 1 -03}
     {-57967200 -10800 0 -03}
-    {499748400 -7200 1 -02}
+    {499748400 -7200 1 -03}
     {511236000 -10800 0 -03}
-    {530593200 -7200 1 -02}
+    {530593200 -7200 1 -03}
     {540266400 -10800 0 -03}
-    {562129200 -7200 1 -02}
+    {562129200 -7200 1 -03}
     {571197600 -10800 0 -03}
-    {592974000 -7200 1 -02}
+    {592974000 -7200 1 -03}
     {602042400 -10800 0 -03}
-    {624423600 -7200 1 -02}
+    {624423600 -7200 1 -03}
     {634701600 -10800 0 -03}
     {653536800 -10800 0 -03}
     {938660400 -10800 0 -03}
-    {938919600 -7200 1 -02}
+    {938919600 -7200 1 -03}
     {951616800 -10800 0 -03}
-    {970974000 -7200 1 -02}
+    {970974000 -7200 1 -03}
     {971575200 -10800 0 -03}
     {1000350000 -10800 0 -03}
-    {1003028400 -7200 1 -02}
+    {1003028400 -7200 1 -03}
     {1013911200 -10800 0 -03}
     {1033437600 -10800 0 -03}
 }

library/tzdata/America/Rio_Branco

@@ -3,33 +3,33 @@
 set TZData(:America/Rio_Branco) {
     {-9223372036854775808 -16272 0 LMT}
     {-1767209328 -18000 0 -05}
-    {-1206950400 -14400 1 -04}
+    {-1206950400 -14400 1 -05}
     {-1191355200 -18000 0 -05}
-    {-1175367600 -14400 1 -04}
+    {-1175367600 -14400 1 -05}
     {-1159819200 -18000 0 -05}
-    {-633812400 -14400 1 -04}
+    {-633812400 -14400 1 -05}
     {-622062000 -18000 0 -05}
-    {-602276400 -14400 1 -04}
+    {-602276400 -14400 1 -05}
     {-591825600 -18000 0 -05}
-    {-570740400 -14400 1 -04}
+    {-570740400 -14400 1 -05}
     {-560203200 -18000 0 -05}
-    {-539118000 -14400 1 -04}
+    {-539118000 -14400 1 -05}
     {-531345600 -18000 0 -05}
-    {-191358000 -14400 1 -04}
+    {-191358000 -14400 1 -05}
     {-184190400 -18000 0 -05}
-    {-155156400 -14400 1 -04}
+    {-155156400 -14400 1 -05}
     {-150062400 -18000 0 -05}
-    {-128890800 -14400 1 -04}
+    {-128890800 -14400 1 -05}
     {-121118400 -18000 0 -05}
-    {-99946800 -14400 1 -04}
+    {-99946800 -14400 1 -05}
     {-89582400 -18000 0 -05}
-    {-68410800 -14400 1 -04}
+    {-68410800 -14400 1 -05}
     {-57960000 -18000 0 -05}
-    {499755600 -14400 1 -04}
+    {499755600 -14400 1 -05}
     {511243200 -18000 0 -05}
-    {530600400 -14400 1 -04}
+    {530600400 -14400 1 -05}
     {540273600 -18000 0 -05}
-    {562136400 -14400 1 -04}
+    {562136400 -14400 1 -05}
     {571204800 -18000 0 -05}
     {590040000 -18000 0 -05}
     {1214283600 -14400 0 -04}

library/tzdata/America/Santarem

@@ -3,33 +3,33 @@
 set TZData(:America/Santarem) {
     {-9223372036854775808 -13128 0 LMT}
     {-1767212472 -14400 0 -04}
-    {-1206954000 -10800 1 -03}
+    {-1206954000 -10800 1 -04}
     {-1191358800 -14400 0 -04}
-    {-1175371200 -10800 1 -03}
+    {-1175371200 -10800 1 -04}
     {-1159822800 -14400 0 -04}
-    {-633816000 -10800 1 -03}
+    {-633816000 -10800 1 -04}
     {-622065600 -14400 0 -04}
-    {-602280000 -10800 1 -03}
+    {-602280000 -10800 1 -04}
     {-591829200 -14400 0 -04}
-    {-570744000 -10800 1 -03}
+    {-570744000 -10800 1 -04}
     {-560206800 -14400 0 -04}
-    {-539121600 -10800 1 -03}
+    {-539121600 -10800 1 -04}
     {-531349200 -14400 0 -04}
-    {-191361600 -10800 1 -03}
+    {-191361600 -10800 1 -04}
     {-184194000 -14400 0 -04}
-    {-155160000 -10800 1 -03}
+    {-155160000 -10800 1 -04}
     {-150066000 -14400 0 -04}
-    {-128894400 -10800 1 -03}
+    {-128894400 -10800 1 -04}
     {-121122000 -14400 0 -04}
-    {-99950400 -10800 1 -03}
+    {-99950400 -10800 1 -04}
     {-89586000 -14400 0 -04}
-    {-68414400 -10800 1 -03}
+    {-68414400 -10800 1 -04}
     {-57963600 -14400 0 -04}
-    {499752000 -10800 1 -03}
+    {499752000 -10800 1 -04}
     {511239600 -14400 0 -04}
-    {530596800 -10800 1 -03}
+    {530596800 -10800 1 -04}
     {540270000 -14400 0 -04}
-    {562132800 -10800 1 -03}
+    {562132800 -10800 1 -04}
     {571201200 -14400 0 -04}
     {590036400 -14400 0 -04}
     {1214280000 -10800 0 -03}

library/tzdata/America/Santiago

@@ -8,15 +8,15 @@ set TZData(:America/Santiago) {
     {-1619205434 -14400 0 -04}
     {-1593806400 -16966 0 SMT}
     {-1335986234 -18000 0 -05}
-    {-1335985200 -14400 1 -04}
+    {-1335985200 -14400 1 -05}
     {-1317585600 -18000 0 -05}
-    {-1304362800 -14400 1 -04}
+    {-1304362800 -14400 1 -05}
     {-1286049600 -18000 0 -05}
-    {-1272826800 -14400 1 -04}
+    {-1272826800 -14400 1 -05}
     {-1254513600 -18000 0 -05}
-    {-1241290800 -14400 1 -04}
+    {-1241290800 -14400 1 -05}
     {-1222977600 -18000 0 -05}
-    {-1209754800 -14400 1 -04}
+    {-1209754800 -14400 1 -05}
     {-1191355200 -18000 0 -05}
     {-1178132400 -14400 0 -04}
     {-870552000 -18000 0 -05}
@@ -25,265 +25,265 @@ set TZData(:America/Santiago) {
     {-736376400 -14400 0 -04}
     {-718056000 -18000 0 -05}
     {-713649600 -14400 0 -04}
-    {-36619200 -10800 1 -03}
+    {-36619200 -10800 1 -04}
     {-23922000 -14400 0 -04}
-    {-3355200 -10800 1 -03}
+    {-3355200 -10800 1 -04}
     {7527600 -14400 0 -04}
-    {24465600 -10800 1 -03}
+    {24465600 -10800 1 -04}
     {37767600 -14400 0 -04}
-    {55915200 -10800 1 -03}
+    {55915200 -10800 1 -04}
     {69217200 -14400 0 -04}
-    {87969600 -10800 1 -03}
+    {87969600 -10800 1 -04}
     {100666800 -14400 0 -04}
-    {118209600 -10800 1 -03}
+    {118209600 -10800 1 -04}
     {132116400 -14400 0 -04}
-    {150868800 -10800 1 -03}
+    {150868800 -10800 1 -04}
     {163566000 -14400 0 -04}
-    {182318400 -10800 1 -03}
+    {182318400 -10800 1 -04}
     {195620400 -14400 0 -04}
-    {213768000 -10800 1 -03}
+    {213768000 -10800 1 -04}
     {227070000 -14400 0 -04}
-    {245217600 -10800 1 -03}
+    {245217600 -10800 1 -04}
     {258519600 -14400 0 -04}
-    {277272000 -10800 1 -03}
+    {277272000 -10800 1 -04}
     {289969200 -14400 0 -04}
-    {308721600 -10800 1 -03}
+    {308721600 -10800 1 -04}
     {321418800 -14400 0 -04}
-    {340171200 -10800 1 -03}
+    {340171200 -10800 1 -04}
     {353473200 -14400 0 -04}
-    {371620800 -10800 1 -03}
+    {371620800 -10800 1 -04}
     {384922800 -14400 0 -04}
-    {403070400 -10800 1 -03}
+    {403070400 -10800 1 -04}
     {416372400 -14400 0 -04}
-    {434520000 -10800 1 -03}
+    {434520000 -10800 1 -04}
     {447822000 -14400 0 -04}
-    {466574400 -10800 1 -03}
+    {466574400 -10800 1 -04}
     {479271600 -14400 0 -04}
-    {498024000 -10800 1 -03}
+    {498024000 -10800 1 -04}
     {510721200 -14400 0 -04}
-    {529473600 -10800 1 -03}
+    {529473600 -10800 1 -04}
     {545194800 -14400 0 -04}
-    {560923200 -10800 1 -03}
+    {560923200 -10800 1 -04}
     {574225200 -14400 0 -04}
-    {592372800 -10800 1 -03}
+    {592372800 -10800 1 -04}
     {605674800 -14400 0 -04}
-    {624427200 -10800 1 -03}
+    {624427200 -10800 1 -04}
     {637124400 -14400 0 -04}
-    {653457600 -10800 1 -03}
+    {653457600 -10800 1 -04}
     {668574000 -14400 0 -04}
-    {687326400 -10800 1 -03}
+    {687326400 -10800 1 -04}
     {700628400 -14400 0 -04}
-    {718776000 -10800 1 -03}
+    {718776000 -10800 1 -04}
     {732078000 -14400 0 -04}
-    {750225600 -10800 1 -03}
+    {750225600 -10800 1 -04}
     {763527600 -14400 0 -04}
-    {781675200 -10800 1 -03}
+    {781675200 -10800 1 -04}
     {794977200 -14400 0 -04}
-    {813729600 -10800 1 -03}
+    {813729600 -10800 1 -04}
     {826426800 -14400 0 -04}
-    {845179200 -10800 1 -03}
+    {845179200 -10800 1 -04}
     {859690800 -14400 0 -04}
-    {876628800 -10800 1 -03}
+    {876628800 -10800 1 -04}
     {889930800 -14400 0 -04}
-    {906868800 -10800 1 -03}
+    {906868800 -10800 1 -04}
     {923194800 -14400 0 -04}
-    {939528000 -10800 1 -03}
+    {939528000 -10800 1 -04}
     {952830000 -14400 0 -04}
-    {971582400 -10800 1 -03}
+    {971582400 -10800 1 -04}
     {984279600 -14400 0 -04}
-    {1003032000 -10800 1 -03}
+    {1003032000 -10800 1 -04}
     {1015729200 -14400 0 -04}
-    {1034481600 -10800 1 -03}
+    {1034481600 -10800 1 -04}
     {1047178800 -14400 0 -04}
-    {1065931200 -10800 1 -03}
+    {1065931200 -10800 1 -04}
     {1079233200 -14400 0 -04}
-    {1097380800 -10800 1 -03}
+    {1097380800 -10800 1 -04}
     {1110682800 -14400 0 -04}
-    {1128830400 -10800 1 -03}
+    {1128830400 -10800 1 -04}
     {1142132400 -14400 0 -04}
-    {1160884800 -10800 1 -03}
+    {1160884800 -10800 1 -04}
     {1173582000 -14400 0 -04}
-    {1192334400 -10800 1 -03}
+    {1192334400 -10800 1 -04}
     {1206846000 -14400 0 -04}
-    {1223784000 -10800 1 -03}
+    {1223784000 -10800 1 -04}
     {1237086000 -14400 0 -04}
-    {1255233600 -10800 1 -03}
+    {1255233600 -10800 1 -04}
     {1270350000 -14400 0 -04}
-    {1286683200 -10800 1 -03}
+    {1286683200 -10800 1 -04}
     {1304823600 -14400 0 -04}
-    {1313899200 -10800 1 -03}
+    {1313899200 -10800 1 -04}
     {1335668400 -14400 0 -04}
-    {1346558400 -10800 1 -03}
+    {1346558400 -10800 1 -04}
     {1367118000 -14400 0 -04}
-    {1378612800 -10800 1 -03}
+    {1378612800 -10800 1 -04}
     {1398567600 -14400 0 -04}
-    {1410062400 -10800 1 -03}
+    {1410062400 -10800 1 -04}
     {1463281200 -14400 0 -04}
-    {1471147200 -10800 1 -03}
+    {1471147200 -10800 1 -04}
     {1494730800 -14400 0 -04}
-    {1502596800 -10800 1 -03}
+    {1502596800 -10800 1 -04}
     {1526180400 -14400 0 -04}
-    {1534046400 -10800 1 -03}
-    {1557630000 -14400 0 -04}
-    {1565496000 -10800 1 -03}
-    {1589079600 -14400 0 -04}
-    {1596945600 -10800 1 -03}
-    {1620529200 -14400 0 -04}
-    {1629000000 -10800 1 -03}
-    {1652583600 -14400 0 -04}
-    {1660449600 -10800 1 -03}
-    {1684033200 -14400 0 -04}
-    {1691899200 -10800 1 -03}
-    {1715482800 -14400 0 -04}
-    {1723348800 -10800 1 -03}
-    {1746932400 -14400 0 -04}
-    {1754798400 -10800 1 -03}
-    {1778382000 -14400 0 -04}
-    {1786248000 -10800 1 -03}
-    {1809831600 -14400 0 -04}
-    {1818302400 -10800 1 -03}
-    {1841886000 -14400 0 -04}
-    {1849752000 -10800 1 -03}
-    {1873335600 -14400 0 -04}
-    {1881201600 -10800 1 -03}
-    {1904785200 -14400 0 -04}
-    {1912651200 -10800 1 -03}
-    {1936234800 -14400 0 -04}
-    {1944100800 -10800 1 -03}
-    {1967684400 -14400 0 -04}
-    {1976155200 -10800 1 -03}
-    {1999738800 -14400 0 -04}
-    {2007604800 -10800 1 -03}
-    {2031188400 -14400 0 -04}
-    {2039054400 -10800 1 -03}
-    {2062638000 -14400 0 -04}
-    {2070504000 -10800 1 -03}
-    {2094087600 -14400 0 -04}
-    {2101953600 -10800 1 -03}
-    {2125537200 -14400 0 -04}
-    {2133403200 -10800 1 -03}
-    {2156986800 -14400 0 -04}
-    {2165457600 -10800 1 -03}
-    {2189041200 -14400 0 -04}
-    {2196907200 -10800 1 -03}
-    {2220490800 -14400 0 -04}
-    {2228356800 -10800 1 -03}
-    {2251940400 -14400 0 -04}
-    {2259806400 -10800 1 -03}
-    {2283390000 -14400 0 -04}
-    {2291256000 -10800 1 -03}
-    {2314839600 -14400 0 -04}
-    {2322705600 -10800 1 -03}
-    {2346894000 -14400 0 -04}
-    {2354760000 -10800 1 -03}
-    {2378343600 -14400 0 -04}
-    {2386209600 -10800 1 -03}
-    {2409793200 -14400 0 -04}
-    {2417659200 -10800 1 -03}
-    {2441242800 -14400 0 -04}
-    {2449108800 -10800 1 -03}
-    {2472692400 -14400 0 -04}
-    {2480558400 -10800 1 -03}
-    {2504142000 -14400 0 -04}
-    {2512612800 -10800 1 -03}
-    {2536196400 -14400 0 -04}
-    {2544062400 -10800 1 -03}
-    {2567646000 -14400 0 -04}
-    {2575512000 -10800 1 -03}
-    {2599095600 -14400 0 -04}
-    {2606961600 -10800 1 -03}
-    {2630545200 -14400 0 -04}
-    {2638411200 -10800 1 -03}
-    {2661994800 -14400 0 -04}
-    {2669860800 -10800 1 -03}
-    {2693444400 -14400 0 -04}
-    {2701915200 -10800 1 -03}
-    {2725498800 -14400 0 -04}
-    {2733364800 -10800 1 -03}
-    {2756948400 -14400 0 -04}
-    {2764814400 -10800 1 -03}
-    {2788398000 -14400 0 -04}
-    {2796264000 -10800 1 -03}
-    {2819847600 -14400 0 -04}
-    {2827713600 -10800 1 -03}
-    {2851297200 -14400 0 -04}
-    {2859768000 -10800 1 -03}
-    {2883351600 -14400 0 -04}
-    {2891217600 -10800 1 -03}
-    {2914801200 -14400 0 -04}
-    {2922667200 -10800 1 -03}
-    {2946250800 -14400 0 -04}
-    {2954116800 -10800 1 -03}
-    {2977700400 -14400 0 -04}
-    {2985566400 -10800 1 -03}
-    {3009150000 -14400 0 -04}
-    {3017016000 -10800 1 -03}
-    {3040599600 -14400 0 -04}
-    {3049070400 -10800 1 -03}
-    {3072654000 -14400 0 -04}
-    {3080520000 -10800 1 -03}
-    {3104103600 -14400 0 -04}
-    {3111969600 -10800 1 -03}
-    {3135553200 -14400 0 -04}
-    {3143419200 -10800 1 -03}
-    {3167002800 -14400 0 -04}
-    {3174868800 -10800 1 -03}
-    {3198452400 -14400 0 -04}
-    {3206318400 -10800 1 -03}
-    {3230506800 -14400 0 -04}
-    {3238372800 -10800 1 -03}
-    {3261956400 -14400 0 -04}
-    {3269822400 -10800 1 -03}
-    {3293406000 -14400 0 -04}
-    {3301272000 -10800 1 -03}
-    {3324855600 -14400 0 -04}
-    {3332721600 -10800 1 -03}
-    {3356305200 -14400 0 -04}
-    {3364171200 -10800 1 -03}
-    {3387754800 -14400 0 -04}
-    {3396225600 -10800 1 -03}
-    {3419809200 -14400 0 -04}
-    {3427675200 -10800 1 -03}
-    {3451258800 -14400 0 -04}
-    {3459124800 -10800 1 -03}
-    {3482708400 -14400 0 -04}
-    {3490574400 -10800 1 -03}
-    {3514158000 -14400 0 -04}
-    {3522024000 -10800 1 -03}
-    {3545607600 -14400 0 -04}
-    {3553473600 -10800 1 -03}
-    {3577057200 -14400 0 -04}
-    {3585528000 -10800 1 -03}
-    {3609111600 -14400 0 -04}
-    {3616977600 -10800 1 -03}
-    {3640561200 -14400 0 -04}
-    {3648427200 -10800 1 -03}
-    {3672010800 -14400 0 -04}
-    {3679876800 -10800 1 -03}
-    {3703460400 -14400 0 -04}
-    {3711326400 -10800 1 -03}
-    {3734910000 -14400 0 -04}
-    {3743380800 -10800 1 -03}
-    {3766964400 -14400 0 -04}
-    {3774830400 -10800 1 -03}
-    {3798414000 -14400 0 -04}
-    {3806280000 -10800 1 -03}
-    {3829863600 -14400 0 -04}
-    {3837729600 -10800 1 -03}
-    {3861313200 -14400 0 -04}
-    {3869179200 -10800 1 -03}
-    {3892762800 -14400 0 -04}
-    {3900628800 -10800 1 -03}
-    {3924212400 -14400 0 -04}
-    {3932683200 -10800 1 -03}
-    {3956266800 -14400 0 -04}
-    {3964132800 -10800 1 -03}
-    {3987716400 -14400 0 -04}
-    {3995582400 -10800 1 -03}
-    {4019166000 -14400 0 -04}
-    {4027032000 -10800 1 -03}
-    {4050615600 -14400 0 -04}
-    {4058481600 -10800 1 -03}
-    {4082065200 -14400 0 -04}
-    {4089931200 -10800 1 -03}
+    {1534046400 -10800 1 -04}
+    {1554606000 -14400 0 -04}
+    {1567915200 -10800 1 -04}
+    {1586055600 -14400 0 -04}
+    {1599364800 -10800 1 -04}
+    {1617505200 -14400 0 -04}
+    {1630814400 -10800 1 -04}
+    {1648954800 -14400 0 -04}
+    {1662264000 -10800 1 -04}
+    {1680404400 -14400 0 -04}
+    {1693713600 -10800 1 -04}
+    {1712458800 -14400 0 -04}
+    {1725768000 -10800 1 -04}
+    {1743908400 -14400 0 -04}
+    {1757217600 -10800 1 -04}
+    {1775358000 -14400 0 -04}
+    {1788667200 -10800 1 -04}
+    {1806807600 -14400 0 -04}
+    {1820116800 -10800 1 -04}
+    {1838257200 -14400 0 -04}
+    {1851566400 -10800 1 -04}
+    {1870311600 -14400 0 -04}
+    {1883016000 -10800 1 -04}
+    {1901761200 -14400 0 -04}
+    {1915070400 -10800 1 -04}
+    {1933210800 -14400 0 -04}
+    {1946520000 -10800 1 -04}
+    {1964660400 -14400 0 -04}
+    {1977969600 -10800 1 -04}
+    {1996110000 -14400 0 -04}
+    {2009419200 -10800 1 -04}
+    {2027559600 -14400 0 -04}
+    {2040868800 -10800 1 -04}
+    {2059614000 -14400 0 -04}
+    {2072318400 -10800 1 -04}
+    {2091063600 -14400 0 -04}
+    {2104372800 -10800 1 -04}
+    {2122513200 -14400 0 -04}
+    {2135822400 -10800 1 -04}
+    {2153962800 -14400 0 -04}
+    {2167272000 -10800 1 -04}
+    {2185412400 -14400 0 -04}
+    {2198721600 -10800 1 -04}
+    {2217466800 -14400 0 -04}
+    {2230171200 -10800 1 -04}
+    {2248916400 -14400 0 -04}
+    {2262225600 -10800 1 -04}
+    {2280366000 -14400 0 -04}
+    {2293675200 -10800 1 -04}
+    {2311815600 -14400 0 -04}
+    {2325124800 -10800 1 -04}
+    {2343265200 -14400 0 -04}
+    {2356574400 -10800 1 -04}
+    {2374714800 -14400 0 -04}
+    {2388024000 -10800 1 -04}
+    {2406769200 -14400 0 -04}
+    {2419473600 -10800 1 -04}
+    {2438218800 -14400 0 -04}
+    {2451528000 -10800 1 -04}
+    {2469668400 -14400 0 -04}
+    {2482977600 -10800 1 -04}
+    {2501118000 -14400 0 -04}
+    {2514427200 -10800 1 -04}
+    {2532567600 -14400 0 -04}
+    {2545876800 -10800 1 -04}
+    {2564017200 -14400 0 -04}
+    {2577326400 -10800 1 -04}
+    {2596071600 -14400 0 -04}
+    {2609380800 -10800 1 -04}
+    {2627521200 -14400 0 -04}
+    {2640830400 -10800 1 -04}
+    {2658970800 -14400 0 -04}
+    {2672280000 -10800 1 -04}
+    {2690420400 -14400 0 -04}
+    {2703729600 -10800 1 -04}
+    {2721870000 -14400 0 -04}
+    {2735179200 -10800 1 -04}
+    {2753924400 -14400 0 -04}
+    {2766628800 -10800 1 -04}
+    {2785374000 -14400 0 -04}
+    {2798683200 -10800 1 -04}
+    {2816823600 -14400 0 -04}
+    {2830132800 -10800 1 -04}
+    {2848273200 -14400 0 -04}
+    {2861582400 -10800 1 -04}
+    {2879722800 -14400 0 -04}
+    {2893032000 -10800 1 -04}
+    {2911172400 -14400 0 -04}
+    {2924481600 -10800 1 -04}
+    {2943226800 -14400 0 -04}
+    {2955931200 -10800 1 -04}
+    {2974676400 -14400 0 -04}
+    {2987985600 -10800 1 -04}
+    {3006126000 -14400 0 -04}
+    {3019435200 -10800 1 -04}
+    {3037575600 -14400 0 -04}
+    {3050884800 -10800 1 -04}
+    {3069025200 -14400 0 -04}
+    {3082334400 -10800 1 -04}
+    {3101079600 -14400 0 -04}
+    {3113784000 -10800 1 -04}
+    {3132529200 -14400 0 -04}
+    {3145838400 -10800 1 -04}
+    {3163978800 -14400 0 -04}
+    {3177288000 -10800 1 -04}
+    {3195428400 -14400 0 -04}
+    {3208737600 -10800 1 -04}
+    {3226878000 -14400 0 -04}
+    {3240187200 -10800 1 -04}
+    {3258327600 -14400 0 -04}
+    {3271636800 -10800 1 -04}
+    {3290382000 -14400 0 -04}
+    {3303086400 -10800 1 -04}
+    {3321831600 -14400 0 -04}
+    {3335140800 -10800 1 -04}
+    {3353281200 -14400 0 -04}
+    {3366590400 -10800 1 -04}
+    {3384730800 -14400 0 -04}
+    {3398040000 -10800 1 -04}
+    {3416180400 -14400 0 -04}
+    {3429489600 -10800 1 -04}
+    {3447630000 -14400 0 -04}
+    {3460939200 -10800 1 -04}
+    {3479684400 -14400 0 -04}
+    {3492993600 -10800 1 -04}
+    {3511134000 -14400 0 -04}
+    {3524443200 -10800 1 -04}
+    {3542583600 -14400 0 -04}
+    {3555892800 -10800 1 -04}
+    {3574033200 -14400 0 -04}
+    {3587342400 -10800 1 -04}
+    {3605482800 -14400 0 -04}
+    {3618792000 -10800 1 -04}
+    {3637537200 -14400 0 -04}
+    {3650241600 -10800 1 -04}
+    {3668986800 -14400 0 -04}
+    {3682296000 -10800 1 -04}
+    {3700436400 -14400 0 -04}
+    {3713745600 -10800 1 -04}
+    {3731886000 -14400 0 -04}
+    {3745195200 -10800 1 -04}
+    {3763335600 -14400 0 -04}
+    {3776644800 -10800 1 -04}
+    {3794785200 -14400 0 -04}
+    {3808094400 -10800 1 -04}
+    {3826839600 -14400 0 -04}
+    {3839544000 -10800 1 -04}
+    {3858289200 -14400 0 -04}
+    {3871598400 -10800 1 -04}
+    {3889738800 -14400 0 -04}
+    {3903048000 -10800 1 -04}
+    {3921188400 -14400 0 -04}
+    {3934497600 -10800 1 -04}
+    {3952638000 -14400 0 -04}
+    {3965947200 -10800 1 -04}
+    {3984692400 -14400 0 -04}
+    {3997396800 -10800 1 -04}
+    {4016142000 -14400 0 -04}
+    {4029451200 -10800 1 -04}
+    {4047591600 -14400 0 -04}
+    {4060900800 -10800 1 -04}
+    {4079041200 -14400 0 -04}
+    {4092350400 -10800 1 -04}
 }

library/tzdata/America/Sao_Paulo

@@ -3,256 +3,256 @@
 set TZData(:America/Sao_Paulo) {
     {-9223372036854775808 -11188 0 LMT}
     {-1767214412 -10800 0 -03}
-    {-1206957600 -7200 1 -02}
+    {-1206957600 -7200 1 -03}
     {-1191362400 -10800 0 -03}
-    {-1175374800 -7200 1 -02}
+    {-1175374800 -7200 1 -03}
     {-1159826400 -10800 0 -03}
-    {-633819600 -7200 1 -02}
+    {-633819600 -7200 1 -03}
     {-622069200 -10800 0 -03}
-    {-602283600 -7200 1 -02}
+    {-602283600 -7200 1 -03}
     {-591832800 -10800 0 -03}
-    {-570747600 -7200 1 -02}
+    {-570747600 -7200 1 -03}
     {-560210400 -10800 0 -03}
-    {-539125200 -7200 1 -02}
+    {-539125200 -7200 1 -03}
     {-531352800 -10800 0 -03}
     {-195429600 -7200 1 -02}
     {-189381600 -7200 0 -03}
     {-184197600 -10800 0 -03}
-    {-155163600 -7200 1 -02}
+    {-155163600 -7200 1 -03}
     {-150069600 -10800 0 -03}
-    {-128898000 -7200 1 -02}
+    {-128898000 -7200 1 -03}
     {-121125600 -10800 0 -03}
-    {-99954000 -7200 1 -02}
+    {-99954000 -7200 1 -03}
     {-89589600 -10800 0 -03}
-    {-68418000 -7200 1 -02}
+    {-68418000 -7200 1 -03}
     {-57967200 -10800 0 -03}
-    {499748400 -7200 1 -02}
+    {499748400 -7200 1 -03}
     {511236000 -10800 0 -03}
-    {530593200 -7200 1 -02}
+    {530593200 -7200 1 -03}
     {540266400 -10800 0 -03}
-    {562129200 -7200 1 -02}
+    {562129200 -7200 1 -03}
     {571197600 -10800 0 -03}
-    {592974000 -7200 1 -02}
+    {592974000 -7200 1 -03}
     {602042400 -10800 0 -03}
-    {624423600 -7200 1 -02}
+    {624423600 -7200 1 -03}
     {634701600 -10800 0 -03}
-    {656478000 -7200 1 -02}
+    {656478000 -7200 1 -03}
     {666756000 -10800 0 -03}
-    {687927600 -7200 1 -02}
+    {687927600 -7200 1 -03}
     {697600800 -10800 0 -03}
-    {719982000 -7200 1 -02}
+    {719982000 -7200 1 -03}
     {728445600 -10800 0 -03}
-    {750826800 -7200 1 -02}
+    {750826800 -7200 1 -03}
     {761709600 -10800 0 -03}
-    {782276400 -7200 1 -02}
+    {782276400 -7200 1 -03}
     {793159200 -10800 0 -03}
-    {813726000 -7200 1 -02}
+    {813726000 -7200 1 -03}
     {824004000 -10800 0 -03}
-    {844570800 -7200 1 -02}
+    {844570800 -7200 1 -03}
     {856058400 -10800 0 -03}
-    {876106800 -7200 1 -02}
+    {876106800 -7200 1 -03}
     {888717600 -10800 0 -03}
-    {908074800 -7200 1 -02}
+    {908074800 -7200 1 -03}
     {919562400 -10800 0 -03}
-    {938919600 -7200 1 -02}
+    {938919600 -7200 1 -03}
     {951616800 -10800 0 -03}
-    {970974000 -7200 1 -02}
+    {970974000 -7200 1 -03}
     {982461600 -10800 0 -03}
-    {1003028400 -7200 1 -02}
+    {1003028400 -7200 1 -03}
     {1013911200 -10800 0 -03}
-    {1036292400 -7200 1 -02}
+    {1036292400 -7200 1 -03}
     {1045360800 -10800 0 -03}
-    {1066532400 -7200 1 -02}
+    {1066532400 -7200 1 -03}
     {1076810400 -10800 0 -03}
-    {1099364400 -7200 1 -02}
+    {1099364400 -7200 1 -03}
     {1108864800 -10800 0 -03}
-    {1129431600 -7200 1 -02}
+    {1129431600 -7200 1 -03}
     {1140314400 -10800 0 -03}
-    {1162695600 -7200 1 -02}
+    {1162695600 -7200 1 -03}
     {1172368800 -10800 0 -03}
-    {1192330800 -7200 1 -02}
+    {1192330800 -7200 1 -03}
     {1203213600 -10800 0 -03}
-    {1224385200 -7200 1 -02}
+    {1224385200 -7200 1 -03}
     {1234663200 -10800 0 -03}
-    {1255834800 -7200 1 -02}
+    {1255834800 -7200 1 -03}
     {1266717600 -10800 0 -03}
-    {1287284400 -7200 1 -02}
+    {1287284400 -7200 1 -03}
     {1298167200 -10800 0 -03}
-    {1318734000 -7200 1 -02}
+    {1318734000 -7200 1 -03}
     {1330221600 -10800 0 -03}
-    {1350788400 -7200 1 -02}
+    {1350788400 -7200 1 -03}
     {1361066400 -10800 0 -03}
-    {1382238000 -7200 1 -02}
+    {1382238000 -7200 1 -03}
     {1392516000 -10800 0 -03}
-    {1413687600 -7200 1 -02}
+    {1413687600 -7200 1 -03}
     {1424570400 -10800 0 -03}
-    {1445137200 -7200 1 -02}
+    {1445137200 -7200 1 -03}
     {1456020000 -10800 0 -03}
-    {1476586800 -7200 1 -02}
+    {1476586800 -7200 1 -03}
     {1487469600 -10800 0 -03}
-    {1508036400 -7200 1 -02}
+    {1508036400 -7200 1 -03}
     {1518919200 -10800 0 -03}
-    {1541300400 -7200 1 -02}
+    {1541300400 -7200 1 -03}
     {1550368800 -10800 0 -03}
-    {1572750000 -7200 1 -02}
+    {1572750000 -7200 1 -03}
     {1581818400 -10800 0 -03}
-    {1604199600 -7200 1 -02}
+    {1604199600 -7200 1 -03}
     {1613872800 -10800 0 -03}
-    {1636254000 -7200 1 -02}
+    {1636254000 -7200 1 -03}
     {1645322400 -10800 0 -03}
-    {1667703600 -7200 1 -02}
+    {1667703600 -7200 1 -03}
     {1677376800 -10800 0 -03}
-    {1699153200 -7200 1 -02}
+    {1699153200 -7200 1 -03}
     {1708221600 -10800 0 -03}
-    {1730602800 -7200 1 -02}
+    {1730602800 -7200 1 -03}
     {1739671200 -10800 0 -03}
-    {1762052400 -7200 1 -02}
+    {1762052400 -7200 1 -03}
     {1771725600 -10800 0 -03}
-    {1793502000 -7200 1 -02}
+    {1793502000 -7200 1 -03}
     {1803175200 -10800 0 -03}
-    {1825556400 -7200 1 -02}
+    {1825556400 -7200 1 -03}
     {1834624800 -10800 0 -03}
-    {1857006000 -7200 1 -02}
+    {1857006000 -7200 1 -03}
     {1866074400 -10800 0 -03}
-    {1888455600 -7200 1 -02}
+    {1888455600 -7200 1 -03}
     {1897524000 -10800 0 -03}
-    {1919905200 -7200 1 -02}
+    {1919905200 -7200 1 -03}
     {1928973600 -10800 0 -03}
-    {1951354800 -7200 1 -02}
+    {1951354800 -7200 1 -03}
     {1960423200 -10800 0 -03}
-    {1983409200 -7200 1 -02}
+    {1983409200 -7200 1 -03}
     {1992477600 -10800 0 -03}
-    {2014858800 -7200 1 -02}
+    {2014858800 -7200 1 -03}
     {2024532000 -10800 0 -03}
-    {2046308400 -7200 1 -02}
+    {2046308400 -7200 1 -03}
     {2055376800 -10800 0 -03}
-    {2077758000 -7200 1 -02}
+    {2077758000 -7200 1 -03}
     {2086826400 -10800 0 -03}
-    {2109207600 -7200 1 -02}
+    {2109207600 -7200 1 -03}
     {2118880800 -10800 0 -03}
-    {2140657200 -7200 1 -02}
+    {2140657200 -7200 1 -03}
     {2150330400 -10800 0 -03}
-    {2172711600 -7200 1 -02}
+    {2172711600 -7200 1 -03}
     {2181780000 -10800 0 -03}
-    {2204161200 -7200 1 -02}
+    {2204161200 -7200 1 -03}
     {2213229600 -10800 0 -03}
-    {2235610800 -7200 1 -02}
+    {2235610800 -7200 1 -03}
     {2244679200 -10800 0 -03}
-    {2267060400 -7200 1 -02}
+    {2267060400 -7200 1 -03}
     {2276128800 -10800 0 -03}
-    {2298510000 -7200 1 -02}
+    {2298510000 -7200 1 -03}
     {2307578400 -10800 0 -03}
-    {2329959600 -7200 1 -02}
+    {2329959600 -7200 1 -03}
     {2339632800 -10800 0 -03}
-    {2362014000 -7200 1 -02}
+    {2362014000 -7200 1 -03}
     {2371082400 -10800 0 -03}
-    {2393463600 -7200 1 -02}
+    {2393463600 -7200 1 -03}
     {2402532000 -10800 0 -03}
-    {2424913200 -7200 1 -02}
+    {2424913200 -7200 1 -03}
     {2433981600 -10800 0 -03}
-    {2456362800 -7200 1 -02}
+    {2456362800 -7200 1 -03}
     {2465431200 -10800 0 -03}
-    {2487812400 -7200 1 -02}
+    {2487812400 -7200 1 -03}
     {2497485600 -10800 0 -03}
-    {2519866800 -7200 1 -02}
+    {2519866800 -7200 1 -03}
     {2528935200 -10800 0 -03}
-    {2551316400 -7200 1 -02}
+    {2551316400 -7200 1 -03}
     {2560384800 -10800 0 -03}
-    {2582766000 -7200 1 -02}
+    {2582766000 -7200 1 -03}
     {2591834400 -10800 0 -03}
-    {2614215600 -7200 1 -02}
+    {2614215600 -7200 1 -03}
     {2623284000 -10800 0 -03}
-    {2645665200 -7200 1 -02}
+    {2645665200 -7200 1 -03}
     {2654733600 -10800 0 -03}
-    {2677114800 -7200 1 -02}
+    {2677114800 -7200 1 -03}
     {2686788000 -10800 0 -03}
-    {2709169200 -7200 1 -02}
+    {2709169200 -7200 1 -03}
     {2718237600 -10800 0 -03}
-    {2740618800 -7200 1 -02}
+    {2740618800 -7200 1 -03}
     {2749687200 -10800 0 -03}
-    {2772068400 -7200 1 -02}
+    {2772068400 -7200 1 -03}
     {2781136800 -10800 0 -03}
-    {2803518000 -7200 1 -02}
+    {2803518000 -7200 1 -03}
     {2812586400 -10800 0 -03}
-    {2834967600 -7200 1 -02}
+    {2834967600 -7200 1 -03}
     {2844036000 -10800 0 -03}
-    {2867022000 -7200 1 -02}
+    {2867022000 -7200 1 -03}
     {2876090400 -10800 0 -03}
-    {2898471600 -7200 1 -02}
+    {2898471600 -7200 1 -03}
     {2907540000 -10800 0 -03}
-    {2929921200 -7200 1 -02}
+    {2929921200 -7200 1 -03}
     {2938989600 -10800 0 -03}
-    {2961370800 -7200 1 -02}
+    {2961370800 -7200 1 -03}
     {2970439200 -10800 0 -03}
-    {2992820400 -7200 1 -02}
+    {2992820400 -7200 1 -03}
     {3001888800 -10800 0 -03}
-    {3024270000 -7200 1 -02}
+    {3024270000 -7200 1 -03}
     {3033943200 -10800 0 -03}
-    {3056324400 -7200 1 -02}
+    {3056324400 -7200 1 -03}
     {3065392800 -10800 0 -03}
-    {3087774000 -7200 1 -02}
+    {3087774000 -7200 1 -03}
     {3096842400 -10800 0 -03}
-    {3119223600 -7200 1 -02}
+    {3119223600 -7200 1 -03}
     {3128292000 -10800 0 -03}
-    {3150673200 -7200 1 -02}
+    {3150673200 -7200 1 -03}
     {3159741600 -10800 0 -03}
-    {3182122800 -7200 1 -02}
+    {3182122800 -7200 1 -03}
     {3191191200 -10800 0 -03}
-    {3213572400 -7200 1 -02}
+    {3213572400 -7200 1 -03}
     {3223245600 -10800 0 -03}
-    {3245626800 -7200 1 -02}
+    {3245626800 -7200 1 -03}
     {3254695200 -10800 0 -03}
-    {3277076400 -7200 1 -02}
+    {3277076400 -7200 1 -03}
     {3286144800 -10800 0 -03}
-    {3308526000 -7200 1 -02}
+    {3308526000 -7200 1 -03}
     {3317594400 -10800 0 -03}
-    {3339975600 -7200 1 -02}
+    {3339975600 -7200 1 -03}
     {3349044000 -10800 0 -03}
-    {3371425200 -7200 1 -02}
+    {3371425200 -7200 1 -03}
     {3381098400 -10800 0 -03}
-    {3403479600 -7200 1 -02}
+    {3403479600 -7200 1 -03}
     {3412548000 -10800 0 -03}
-    {3434929200 -7200 1 -02}
+    {3434929200 -7200 1 -03}
     {3443997600 -10800 0 -03}
-    {3466378800 -7200 1 -02}
+    {3466378800 -7200 1 -03}
     {3475447200 -10800 0 -03}
-    {3497828400 -7200 1 -02}
+    {3497828400 -7200 1 -03}
     {3506896800 -10800 0 -03}
-    {3529278000 -7200 1 -02}
+    {3529278000 -7200 1 -03}
     {3538346400 -10800 0 -03}
-    {3560727600 -7200 1 -02}
+    {3560727600 -7200 1 -03}
     {3570400800 -10800 0 -03}
-    {3592782000 -7200 1 -02}
+    {3592782000 -7200 1 -03}
     {3601850400 -10800 0 -03}
-    {3624231600 -7200 1 -02}
+    {3624231600 -7200 1 -03}
     {3633300000 -10800 0 -03}
-    {3655681200 -7200 1 -02}
+    {3655681200 -7200 1 -03}
     {3664749600 -10800 0 -03}
-    {3687130800 -7200 1 -02}
+    {3687130800 -7200 1 -03}
     {3696199200 -10800 0 -03}
-    {3718580400 -7200 1 -02}
+    {3718580400 -7200 1 -03}
     {3727648800 -10800 0 -03}
-    {3750634800 -7200 1 -02}
+    {3750634800 -7200 1 -03}
     {3759703200 -10800 0 -03}
-    {3782084400 -7200 1 -02}
+    {3782084400 -7200 1 -03}
     {3791152800 -10800 0 -03}
-    {3813534000 -7200 1 -02}
+    {3813534000 -7200 1 -03}
     {3822602400 -10800 0 -03}
-    {3844983600 -7200 1 -02}
+    {3844983600 -7200 1 -03}
     {3854052000 -10800 0 -03}
-    {3876433200 -7200 1 -02}
+    {3876433200 -7200 1 -03}
     {3885501600 -10800 0 -03}
-    {3907882800 -7200 1 -02}
+    {3907882800 -7200 1 -03}
     {3917556000 -10800 0 -03}
-    {3939937200 -7200 1 -02}
+    {3939937200 -7200 1 -03}
     {3949005600 -10800 0 -03}
-    {3971386800 -7200 1 -02}
+    {3971386800 -7200 1 -03}
     {3980455200 -10800 0 -03}
-    {4002836400 -7200 1 -02}
+    {4002836400 -7200 1 -03}
     {4011904800 -10800 0 -03}
-    {4034286000 -7200 1 -02}
+    {4034286000 -7200 1 -03}
     {4043354400 -10800 0 -03}
-    {4065735600 -7200 1 -02}
+    {4065735600 -7200 1 -03}
     {4074804000 -10800 0 -03}
-    {4097185200 -7200 1 -02}
+    {4097185200 -7200 1 -03}
 }