From 40ce2eccbc52b403d4a4b7bc479fbde987a14e18 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Tue, 24 Oct 2017 21:24:07 +0000
Subject: 'array for' implementation (TIP #421) from Brad Lanam

---
 doc/array.n        |   7 +
 generic/tclVar.c   | 388 +++++++++++++++++++++++++++++++++++++++++++++++++----
 tests/set-old.test |   6 +-
 tests/var.test     | 160 +++++++++++++++++++++-
 4 files changed, 528 insertions(+), 33 deletions(-)

diff --git a/doc/array.n b/doc/array.n
index 25ad0c6..751c688 100644
--- a/doc/array.n
+++ b/doc/array.n
@@ -47,6 +47,13 @@ been the return value from a previous invocation of
 Returns 1 if \fIarrayName\fR is an array variable, 0 if there
 is no variable by that name or if it is a scalar variable.
 .TP
+\fBarray for {\fIkeyVariable ?valueVariable?\fB} \fIarrayName body\fR
+The first argument is a one or two element list of variable names for the
+key and value of each entry in the array.  The second argument is the
+array name to iterate over.  The third argument is the body to execute
+for each key and value returned.
+The ordering of the returned keys is undefined.
+.TP
 \fBarray get \fIarrayName\fR ?\fIpattern\fR?
 Returns a list containing pairs of elements.  The first
 element in each pair is the name of an element in \fIarrayName\fR
diff --git a/generic/tclVar.c b/generic/tclVar.c
index 3dd6790..d6f3e96 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -165,6 +165,7 @@ typedef struct ArraySearch {
     struct ArraySearch *nextPtr;/* Next in list of all active searches for
 				 * this variable, or NULL if this is the last
 				 * one. */
+    Tcl_Obj *arrayNameObj;      /* name of the array object */
 } ArraySearch;
 
 /*
@@ -173,6 +174,8 @@ typedef struct ArraySearch {
 
 static void		AppendLocals(Tcl_Interp *interp, Tcl_Obj *listPtr,
 			    Tcl_Obj *patternPtr, int includeLinks);
+static void             ArrayDoneSearch (Interp *iPtr, Var *varPtr, ArraySearch *searchPtr);
+static Tcl_NRPostProc   ArrayForLoopCallback;
 static void		DeleteSearches(Interp *iPtr, Var *arrayVarPtr);
 static void		DeleteArray(Interp *iPtr, Tcl_Obj *arrayNamePtr,
 			    Var *varPtr, int flags, int index);
@@ -3098,6 +3101,321 @@ TclArraySet(
 /*
  *----------------------------------------------------------------------
  *
+ * ArrayForNRCmd
+ * ArrayForLoopCallback
+ * ArrayObjFirst
+ * ArrayObjNext
+ *
+ *  These functions implement the "array for" Tcl command.
+ *    array for {k v} a {}
+ *  The array for command iterates over the array, setting the
+ *  the specified loop variables, and executing the body each iteration.
+ *
+ *  ArrayForNRCmd() sets up the ArraySearch structure, sets arrayNamePtr
+ *  inside the structure and calls VarHashFirstEntry to start the hash
+ *  iteration.
+ *
+ *  ArrayForNRCmd() does not execute the body or set the loop variables,
+ *  it only initializes the iterator.
+ *
+ *  ArrayForLoopCallback() iterates over the entire array, executing
+ *  the body each time.
+ *
+ *  ArrayObjFirst() Does not execute the body or set the key/value variables.
+ *
+ *----------------------------------------------------------------------
+ */
+void
+ArrayObjFirst(
+    Tcl_Interp *interp,
+    Tcl_Obj *arrayNameObj,
+    Var *varPtr,
+    ArraySearch *searchPtr)
+{
+    Interp *iPtr = (Interp *) interp;
+    Tcl_HashEntry   *hPtr;
+    int             isNew;
+
+    searchPtr->varPtr = varPtr;
+    searchPtr->arrayNameObj = arrayNameObj;
+
+    /* add the search to the search table */
+    hPtr = Tcl_CreateHashEntry(&iPtr->varSearches, varPtr, &isNew);
+    if (isNew) {
+	searchPtr->id = 1;
+	varPtr->flags |= VAR_SEARCH_ACTIVE;
+        searchPtr->nextPtr = NULL;
+    } else {
+	searchPtr->id = ((ArraySearch *) Tcl_GetHashValue(hPtr))->id + 1;
+	searchPtr->nextPtr = Tcl_GetHashValue(hPtr);
+    }
+    searchPtr->nextEntry = VarHashFirstEntry(varPtr->value.tablePtr,
+	    &searchPtr->search);
+    Tcl_SetHashValue(hPtr, searchPtr);
+}
+
+int
+ArrayObjNext(
+    Tcl_Interp *interp,
+    Var *varPtr,                /* array */
+    ArraySearch *searchPtr,
+    Tcl_Obj **keyPtrPtr,	/* Pointer to a variable to have the key
+				 * written into, or NULL. */
+    Tcl_Obj **valuePtrPtr	/* Pointer to a variable to have the
+				 * value written into, or NULL.*/
+    )
+{
+    Tcl_Obj *keyObj;
+    Tcl_Obj *valueObj = NULL;
+    int     gotValue;
+    int     donerc;
+
+    donerc = TCL_BREAK;
+
+    if ((varPtr->flags & VAR_SEARCH_ACTIVE) != VAR_SEARCH_ACTIVE) {
+      donerc = TCL_ERROR;
+      return donerc;
+    }
+
+    gotValue = 0;
+    while (1) {
+	Tcl_HashEntry *hPtr = searchPtr->nextEntry;
+        if (hPtr != NULL) {
+          searchPtr->nextEntry = NULL;
+        } else {
+          hPtr = Tcl_NextHashEntry(&searchPtr->search);
+          if (hPtr == NULL) {
+            gotValue = 0;
+            break;
+          }
+        }
+	varPtr = VarHashGetValue(hPtr);
+	if (!TclIsVarUndefined(varPtr)) {
+	    gotValue = 1;
+	    break;
+	}
+    }
+
+    if (! gotValue) {
+	return donerc;
+    }
+
+    donerc = TCL_CONTINUE;
+
+    keyObj = VarHashGetKey(varPtr);
+    *keyPtrPtr = keyObj;
+    valueObj = Tcl_ObjGetVar2(interp, searchPtr->arrayNameObj,
+        keyObj, TCL_LEAVE_ERR_MSG);
+    *valuePtrPtr = valueObj;
+
+    return donerc;
+}
+
+static int
+ArrayForNRCmd(
+    ClientData dummy,
+    Tcl_Interp *interp,
+    int objc,
+    Tcl_Obj *const *objv)
+{
+    Interp *iPtr = (Interp *) interp;
+    Tcl_Obj *scriptObj, *keyVarObj, *valueVarObj;
+    Tcl_Obj **varv;
+    Tcl_Obj *arrayNameObj;
+    ArraySearch *searchPtr = NULL;
+    Var *varPtr;
+    Var *arrayPtr;
+    int varc;
+
+    /*
+     * array for {k v} a body
+     */
+
+    if (objc != 4) {
+	Tcl_WrongNumArgs(interp, 1, objv,
+		"{key value} arrayName script");
+	return TCL_ERROR;
+    }
+
+    /*
+     * Parse arguments.
+     */
+
+    if (TclListObjGetElements(interp, objv[1], &varc, &varv) != TCL_OK) {
+	return TCL_ERROR;
+    }
+    if (varc != 2) {
+	Tcl_SetObjResult(interp, Tcl_NewStringObj(
+		"must have two variable names", -1));
+	Tcl_SetErrorCode(interp, "TCL", "SYNTAX", "array", "for", NULL);
+	return TCL_ERROR;
+    }
+
+    arrayNameObj = objv[2];
+    keyVarObj = varv[0];
+    valueVarObj = varv[1];
+    scriptObj = objv[3];
+
+    /*
+     * Locate the array variable.
+     */
+
+    varPtr = TclObjLookupVarEx(interp, arrayNameObj, NULL, /*flags*/ 0,
+	    /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
+
+    /*
+     * Special array trace used to keep the env array in sync for array names,
+     * array get, etc.
+     */
+
+    if (varPtr && (varPtr->flags & VAR_TRACED_ARRAY)
+	    && (TclIsVarArray(varPtr) || TclIsVarUndefined(varPtr))) {
+	if (TclObjCallVarTraces(iPtr, arrayPtr, varPtr, arrayNameObj, NULL,
+		(TCL_LEAVE_ERR_MSG|TCL_NAMESPACE_ONLY|TCL_GLOBAL_ONLY|
+		TCL_TRACE_ARRAY), /* leaveErrMsg */ 1, -1) == TCL_ERROR) {
+	    return TCL_ERROR;
+	}
+    }
+
+    /*
+     * Verify that it is indeed an array variable. This test comes after the
+     * traces; the variable may actually become an array as an effect of said
+     * traces.
+     */
+
+    if ((varPtr == NULL) || !TclIsVarArray(varPtr)
+	    || TclIsVarUndefined(varPtr)) {
+	const char *varName = Tcl_GetString(arrayNameObj);
+
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"\"%s\" isn't an array", varName));
+	Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ARRAY", varName, NULL);
+	return TCL_ERROR;
+    }
+
+    /*
+     * Make a new array search, put it on the stack.
+     */
+
+    searchPtr = ckalloc(sizeof(ArraySearch));
+    searchPtr->arrayNameObj = NULL;
+    ArrayObjFirst(interp, arrayNameObj, varPtr, searchPtr);
+
+    /*
+     * Make sure that these objects (which we need throughout the body of the
+     * loop) don't vanish.
+     */
+
+    Tcl_IncrRefCount(keyVarObj);
+    Tcl_IncrRefCount(valueVarObj);
+    Tcl_IncrRefCount(scriptObj);
+
+    /*
+     * Run the script.
+     */
+
+    TclNRAddCallback(interp, ArrayForLoopCallback, searchPtr, keyVarObj,
+	    valueVarObj, scriptObj);
+    return TCL_OK;
+}
+
+static int
+ArrayForLoopCallback(
+    ClientData data[],
+    Tcl_Interp *interp,
+    int result)
+{
+    Interp *iPtr = (Interp *) interp;
+    ArraySearch *searchPtr = data[0];
+    Tcl_Obj *keyVarObj = data[1];
+    Tcl_Obj *valueVarObj = data[2];
+    Tcl_Obj *scriptObj = data[3];
+    Tcl_Obj *keyObj, *valueObj;
+    Var *varPtr;
+    Var *arrayPtr;
+    int done;
+
+    /*
+     * Process the result from the previous execution of the script body.
+     */
+
+    done = TCL_ERROR;
+    varPtr = TclObjLookupVarEx(interp, searchPtr->arrayNameObj, NULL, /*flags*/ 0,
+	    /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
+
+    if (result == TCL_CONTINUE) {
+	result = TCL_OK;
+    } else if (result != TCL_OK) {
+	if (result == TCL_BREAK) {
+	    Tcl_ResetResult(interp);
+	    result = TCL_OK;
+	} else if (result == TCL_ERROR) {
+	    Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
+		    "\n    (\"array for\" body line %d)",
+		    Tcl_GetErrorLine(interp)));
+	}
+	goto arrayfordone;
+    }
+
+    /*
+     * Get the next mapping from the array.
+     */
+
+    keyObj = NULL;
+    valueObj = NULL;
+    done = ArrayObjNext (interp, varPtr, searchPtr, &keyObj, &valueObj);
+
+    result = TCL_OK;
+    if (done != TCL_CONTINUE) {
+	Tcl_ResetResult(interp);
+        if (done == TCL_ERROR) {
+          varPtr->flags |= TCL_LEAVE_ERR_MSG;
+          Tcl_AddErrorInfo(interp, "array changed during iteration");
+          result = done;
+        }
+	goto arrayfordone;
+    }
+    if (Tcl_ObjSetVar2(interp, keyVarObj, NULL, keyObj, TCL_LEAVE_ERR_MSG) == NULL) {
+      result = TCL_ERROR;
+      goto arrayfordone;
+    }
+    if (valueObj != NULL) {
+      if (Tcl_ObjSetVar2(interp, valueVarObj, NULL, valueObj, TCL_LEAVE_ERR_MSG) == NULL) {
+        result = TCL_ERROR;
+        goto arrayfordone;
+      }
+    }
+
+    /*
+     * Run the script.
+     */
+
+    TclNRAddCallback(interp, ArrayForLoopCallback, searchPtr, keyVarObj,
+	    valueVarObj, scriptObj);
+    return TclNREvalObjEx(interp, scriptObj, 0, iPtr->cmdFramePtr, 3);
+
+    /*
+     * For unwinding everything once the iterating is done.
+     */
+
+  arrayfordone:
+    /* if the search was terminated by an array change, the
+     * VAR_SEARCH_ACTIVE flag will no longer be set
+     */
+    if (done != TCL_ERROR) {
+      ArrayDoneSearch (iPtr, varPtr, searchPtr);
+      ckfree(searchPtr);
+    }
+
+    TclDecrRefCount(keyVarObj);
+    TclDecrRefCount(valueVarObj);
+    TclDecrRefCount(scriptObj);
+    return result;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
  * ArrayStartSearchCmd --
  *
  *	This object-based function is invoked to process the "array
@@ -3197,6 +3515,50 @@ ArrayStartSearchCmd(
 /*
  *----------------------------------------------------------------------
  *
+ * ArrayDoneSearch --
+ *
+ *      Removes the search from the hash of active searches.
+ *
+ *----------------------------------------------------------------------
+ */
+static void
+ArrayDoneSearch (
+    Interp *iPtr,
+    Var *varPtr,
+    ArraySearch *searchPtr)
+{
+    Tcl_HashEntry *hPtr;
+    ArraySearch *prevPtr;
+
+    /*
+     * Unhook the search from the list of searches associated with the
+     * variable.
+     */
+
+    hPtr = Tcl_FindHashEntry(&iPtr->varSearches, varPtr);
+    if (hPtr == NULL) {
+      return;
+    }
+    if (searchPtr == Tcl_GetHashValue(hPtr)) {
+	if (searchPtr->nextPtr) {
+	    Tcl_SetHashValue(hPtr, searchPtr->nextPtr);
+	} else {
+	    varPtr->flags &= ~VAR_SEARCH_ACTIVE;
+	    Tcl_DeleteHashEntry(hPtr);
+	}
+    } else {
+	for (prevPtr=Tcl_GetHashValue(hPtr) ;; prevPtr=prevPtr->nextPtr) {
+	    if (prevPtr->nextPtr == searchPtr) {
+		prevPtr->nextPtr = searchPtr->nextPtr;
+		break;
+	    }
+	}
+    }
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
  * ArrayAnyMoreCmd --
  *
  *	This object-based function is invoked to process the "array anymore"
@@ -3437,9 +3799,8 @@ ArrayDoneSearchCmd(
 {
     Interp *iPtr = (Interp *) interp;
     Var *varPtr, *arrayPtr;
-    Tcl_HashEntry *hPtr;
     Tcl_Obj *varNameObj, *searchObj;
-    ArraySearch *searchPtr, *prevPtr;
+    ArraySearch *searchPtr;
 
     if (objc != 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "arrayName searchId");
@@ -3493,27 +3854,7 @@ ArrayDoneSearchCmd(
 	return TCL_ERROR;
     }
 
-    /*
-     * Unhook the search from the list of searches associated with the
-     * variable.
-     */
-
-    hPtr = Tcl_FindHashEntry(&iPtr->varSearches, varPtr);
-    if (searchPtr == Tcl_GetHashValue(hPtr)) {
-	if (searchPtr->nextPtr) {
-	    Tcl_SetHashValue(hPtr, searchPtr->nextPtr);
-	} else {
-	    varPtr->flags &= ~VAR_SEARCH_ACTIVE;
-	    Tcl_DeleteHashEntry(hPtr);
-	}
-    } else {
-	for (prevPtr=Tcl_GetHashValue(hPtr) ;; prevPtr=prevPtr->nextPtr) {
-	    if (prevPtr->nextPtr == searchPtr) {
-		prevPtr->nextPtr = searchPtr->nextPtr;
-		break;
-	    }
-	}
-    }
+    ArrayDoneSearch (iPtr, varPtr, searchPtr);
     ckfree(searchPtr);
     return TCL_OK;
 }
@@ -4372,6 +4713,7 @@ TclInitArrayCmd(
 	{"anymore",	ArrayAnyMoreCmd,	TclCompileBasic2ArgCmd, NULL, NULL, 0},
 	{"donesearch",	ArrayDoneSearchCmd,	TclCompileBasic2ArgCmd, NULL, NULL, 0},
 	{"exists",	ArrayExistsCmd,		TclCompileArrayExistsCmd, NULL, NULL, 0},
+	{"for",		NULL,			TclCompileBasic3ArgCmd, ArrayForNRCmd, NULL, 0},
 	{"get",		ArrayGetCmd,		TclCompileBasic1Or2ArgCmd, NULL, NULL, 0},
 	{"names",	ArrayNamesCmd,		TclCompileBasic1To3ArgCmd, NULL, NULL, 0},
 	{"nextelement",	ArrayNextElementCmd,	TclCompileBasic2ArgCmd, NULL, NULL, 0},
diff --git a/tests/set-old.test b/tests/set-old.test
index 6138ed8..3b4184c 100644
--- a/tests/set-old.test
+++ b/tests/set-old.test
@@ -340,7 +340,7 @@ test set-old-8.6 {array command} {
     catch {unset a}
     set a(22) 3
     list [catch {array gorp a} msg] $msg
-} {1 {unknown or ambiguous subcommand "gorp": must be anymore, donesearch, exists, get, names, nextelement, set, size, startsearch, statistics, or unset}}
+} {1 {unknown or ambiguous subcommand "gorp": must be anymore, donesearch, exists, for, get, names, nextelement, set, size, startsearch, statistics, or unset}}
 test set-old-8.7 {array command, anymore option} {
     catch {unset a}
     list [catch {array anymore a x} msg] $msg
@@ -652,7 +652,7 @@ test set-old-8.52 {array command, array names -regexp on regexp pattern} {
     set a(11) 1
     list [catch {lsort [array names a -regexp ^1]} msg] $msg
 } {0 {1*2 11 12}}
-test set-old-8.52.1 {array command, array names -regexp, backrefs} {
+?test set-old-8.52.1 {array command, array names -regexp, backrefs} {
     catch {unset a}
     set a(1*2) 1
     set a(12) 1
@@ -940,7 +940,7 @@ catch {rename foo {}}
 
 # cleanup
 ::tcltest::cleanupTests
-return 
+return
 
 # Local Variables:
 # mode: tcl
diff --git a/tests/var.test b/tests/var.test
index a9d93ac..630202a 100644
--- a/tests/var.test
+++ b/tests/var.test
@@ -53,7 +53,7 @@ catch {unset arr}
 test var-1.1 {TclLookupVar, Array handling} -setup {
     catch {unset a}
 } -body {
-    set x "incr"  ;# force no compilation and runtime call to Tcl_IncrCmd 
+    set x "incr"  ;# force no compilation and runtime call to Tcl_IncrCmd
     set i 10
     set arr(foo) 37
     list [$x i] $i [$x arr(foo)] $arr(foo)
@@ -234,7 +234,7 @@ test var-3.3 {MakeUpvar, my var has TCL_GLOBAL_ONLY specified} -setup {
     set a 123321
     proc p {} {
 	# create global xx linked to global a
-	testupvar 1 a {} xx global 
+	testupvar 1 a {} xx global
     }
     list [p] $xx [set xx 789] $a
 } -result {{} 123321 789 789}
@@ -246,7 +246,7 @@ test var-3.4 {MakeUpvar, my var has TCL_NAMESPACE_ONLY specified} -setup {
 	catch {unset ::test_ns_var::vv}
 	proc p {} {
 	    # create namespace var vv linked to global a
-	    testupvar 1 a {} vv namespace 
+	    testupvar 1 a {} vv namespace
 	}
 	p
     }
@@ -548,11 +548,11 @@ test var-7.14 {Tcl_VariableObjCmd, array element parameter} -body {
     namespace eval test_ns_var { variable arrayvar(1) }
 } -returnCodes error -result "can't define \"arrayvar(1)\": name refers to an element in an array"
 test var-7.15 {Tcl_VariableObjCmd, array element parameter} -body {
-    namespace eval test_ns_var { 
+    namespace eval test_ns_var {
 	variable arrayvar
 	set arrayvar(1) x
 	variable arrayvar(1) y
-    }   
+    }
 } -returnCodes error -result "can't define \"arrayvar(1)\": name refers to an element in an array"
 test var-7.16 {Tcl_VariableObjCmd, no args (TIP 323)} {
     variable
@@ -790,7 +790,7 @@ test var-15.1 {segfault in [unset], [Bug 735335]} {
 	set var $name
     }
     #
-    # Note that the variable name has to be 
+    # Note that the variable name has to be
     # unused previously for the segfault to
     # be triggered.
     #
@@ -997,7 +997,153 @@ test var-22.1 {leak in localVarName intrep: Bug 80304238ac} -setup {
     rename getbytes {}
     rename doit {}
 } -result 0
-
+
+unset -nocomplain a k v
+test var-23.1 {array command, for loop, too many args} -returnCodes error -body {
+    array for {k v} c d e {}
+} -result {wrong # args: should be "array for {key value} arrayName script"}
+test var-23.2 {array command, for loop, not enough args} -returnCodes error -body {
+    array for {k v} {}
+} -result {wrong # args: should be "array for {key value} arrayName script"}
+test var-23.3 {array command, for loop, too many list args} -setup {
+    unset -nocomplain a
+} -returnCodes error -body {
+    array for {k v w} a {}
+} -result {must have two variable names}
+test var-23.4 {array command, for loop, not enough list args} -setup {
+    unset -nocomplain a
+} -returnCodes error -body {
+    array for {k} a {}
+} -result {must have two variable names}
+test var-23.5 {array command, for loop, no array} -setup {
+    unset -nocomplain a
+} -returnCodes error -body {
+    array for {k v} a {}
+} -result {"a" isn't an array}
+test var-23.6 {array command, for loop, array doesn't exist yet but has compiler-allocated procedure slot} -setup {
+    catch {rename p ""}
+} -returnCodes error -body {
+    apply {{x} {
+        if {$x==1} {
+            return [array for {k v} a {}]
+        }
+        set a(x) 123
+    }} 1
+} -result {"a" isn't an array}
+test var-23.7 {array enumeration} -setup {
+    unset -nocomplain a
+    set reslist [list]
+} -body {
+    array set a {a 1 b 2 c 3}
+    array for {k v} a {
+	lappend reslist $k $v
+    }
+    lsort -stride 2 -index 0 $reslist
+} -cleanup {
+    unset -nocomplain a
+    unset -nocomplain reslist
+} -result {a 1 b 2 c 3}
+test var-23.9 {array enumeration, nested} -setup {
+    unset -nocomplain a
+    set reslist [list]
+} -body {
+    array set a {a 1 b 2 c 3}
+    array for {k1 v1} a {
+	lappend reslist $k1 $v1
+	set r2 {}
+	array for {k2 v2} a {
+	    lappend r2 $k2 $v2
+	}
+	lappend reslist [lsort -stride 2 -index 0 $r2]
+    }
+    # there is no guarantee in which order the array contents will be
+    # returned.
+    lsort -stride 3 -index 0 $reslist
+} -cleanup {
+    unset -nocomplain a
+    unset -nocomplain reslist
+} -result {a 1 {a 1 b 2 c 3} b 2 {a 1 b 2 c 3} c 3 {a 1 b 2 c 3}}
+test var-23.10 {array enumeration, delete key} -match glob -setup {
+    unset -nocomplain a
+    set reslist [list]
+} -body {
+    set retval {}
+    try {
+      array set a {a 1 b 2 c 3 d 4}
+      array for {k v} a {
+  	lappend reslist $k $v
+          if { $k eq "a" } {
+            unset a(c)
+          }
+      }
+      lsort -stride 2 -index 0 $reslist
+    } on error {err res} {
+      set retval [dict get $res -errorinfo]
+    }
+    set retval
+} -cleanup {
+    unset -nocomplain a
+    unset -nocomplain reslist
+    unset -nocomplain retval
+} -result {array changed during iteration*}
+test var-23.11 {array enumeration, insert key} -match glob -setup {
+    unset -nocomplain a
+    set reslist [list]
+} -body {
+    set retval {}
+    try {
+      array set a {a 1 b 2 c 3 d 4}
+      array for {k v} a {
+  	lappend reslist $k $v
+          if { $k eq "a" } {
+            set a(e) 5
+          }
+      }
+      lsort -stride 2 -index 0 $reslist
+    } on error {err res} {
+      set retval [dict get $res -errorinfo]
+    }
+} -cleanup {
+    unset -nocomplain a
+    unset -nocomplain reslist
+} -result {array changed during iteration*}
+test var-23.12 {array enumeration, change value} -setup {
+    unset -nocomplain a
+    set reslist [list]
+} -body {
+    array set a {a 1 b 2 c 3}
+    array for {k v} a {
+	lappend reslist $k $v
+        if { $k eq "a" } {
+          set a(c) 9
+        }
+    }
+    lsort -stride 2 -index 0 $reslist
+} -cleanup {
+    unset -nocomplain a
+    unset -nocomplain reslist
+} -result {a 1 b 2 c 9}
+test var-23.13 {array enumeration, number of traces} -setup {
+    set ::countarrayfor 0
+    proc ::tracearrayfor { args } {
+      incr ::countarrayfor
+    }
+    unset -nocomplain ::a
+    set reslist [list]
+} -body {
+    array set ::a {a 1 b 2 c 3}
+    foreach {k} [array names a] {
+      trace add variable ::a($k) read ::tracearrayfor
+    }
+    array for {k v} ::a {
+	lappend reslist $k $v
+    }
+    set ::countarrayfor
+} -cleanup {
+    unset -nocomplain ::countarrayfor
+    unset -nocomplain ::a
+    unset -nocomplain reslist
+} -result 3
 
 catch {namespace delete ns}
 catch {unset arr}
-- 
cgit v0.12


From d8cae66217adcfb4920030071e54e37b5a88a1c4 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Wed, 25 Oct 2017 17:31:09 +0000
Subject: Fix typo in set-old.test

---
 tests/set-old.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/set-old.test b/tests/set-old.test
index 3b4184c..b2e7aa6 100644
--- a/tests/set-old.test
+++ b/tests/set-old.test
@@ -652,7 +652,7 @@ test set-old-8.52 {array command, array names -regexp on regexp pattern} {
     set a(11) 1
     list [catch {lsort [array names a -regexp ^1]} msg] $msg
 } {0 {1*2 11 12}}
-?test set-old-8.52.1 {array command, array names -regexp, backrefs} {
+test set-old-8.52.1 {array command, array names -regexp, backrefs} {
     catch {unset a}
     set a(1*2) 1
     set a(12) 1
-- 
cgit v0.12


From 48b529209c87473364215e8aef740e331f88415a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 7 Nov 2017 12:15:30 +0000
Subject: Somewhat simplified implementation of TIP #389, in which the "string
 length" if characters > U+FFFF is considered to be 2, not 1.

---
 doc/StringObj.3        |  2 +-
 doc/ToUpper.3          |  2 +-
 doc/Utf.3              |  2 +-
 generic/tcl.decls      | 10 +++---
 generic/tcl.h          |  2 +-
 generic/tclCmdMZ.c     | 18 ++++++++--
 generic/tclDecls.h     | 20 +++++------
 generic/tclScan.c      | 12 +++++--
 generic/tclStringObj.c | 12 +++----
 generic/tclUtf.c       | 95 +++++++++++++++++++++++++++++++++++---------------
 tests/string.test      | 26 +++++++-------
 tests/utf.test         |  4 +--
 12 files changed, 132 insertions(+), 73 deletions(-)

diff --git a/doc/StringObj.3 b/doc/StringObj.3
index 7042cc8..8d9bb56 100644
--- a/doc/StringObj.3
+++ b/doc/StringObj.3
@@ -37,7 +37,7 @@ Tcl_UniChar *
 Tcl_UniChar *
 \fBTcl_GetUnicode\fR(\fIobjPtr\fR)
 .sp
-Tcl_UniChar
+int
 \fBTcl_GetUniChar\fR(\fIobjPtr, index\fR)
 .sp
 int
diff --git a/doc/ToUpper.3 b/doc/ToUpper.3
index b933e9c..14766da 100644
--- a/doc/ToUpper.3
+++ b/doc/ToUpper.3
@@ -13,7 +13,7 @@ Tcl_UniCharToUpper, Tcl_UniCharToLower, Tcl_UniCharToTitle, Tcl_UtfToUpper, Tcl_
 .nf
 \fB#include <tcl.h>\fR
 .sp
-Tcl_UniChar
+int
 \fBTcl_UniCharToUpper\fR(\fIch\fR)
 .sp
 Tcl_UniChar
diff --git a/doc/Utf.3 b/doc/Utf.3
index 378c806..5cd6b7df 100644
--- a/doc/Utf.3
+++ b/doc/Utf.3
@@ -63,7 +63,7 @@ const char *
 const char *
 \fBTcl_UtfPrev\fR(\fIsrc, start\fR)
 .sp
-Tcl_UniChar
+int
 \fBTcl_UniCharAtIndex\fR(\fIsrc, index\fR)
 .sp
 const char *
diff --git a/generic/tcl.decls b/generic/tcl.decls
index b2b91a9..e3ea9bc 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -1148,16 +1148,16 @@ declare 319 {
 	    Tcl_QueuePosition position)
 }
 declare 320 {
-    Tcl_UniChar Tcl_UniCharAtIndex(const char *src, int index)
+    int Tcl_UniCharAtIndex(const char *src, int index)
 }
 declare 321 {
-    Tcl_UniChar Tcl_UniCharToLower(int ch)
+    int Tcl_UniCharToLower(int ch)
 }
 declare 322 {
-    Tcl_UniChar Tcl_UniCharToTitle(int ch)
+    int Tcl_UniCharToTitle(int ch)
 }
 declare 323 {
-    Tcl_UniChar Tcl_UniCharToUpper(int ch)
+    int Tcl_UniCharToUpper(int ch)
 }
 declare 324 {
     int Tcl_UniCharToUtf(int ch, char *buf)
@@ -1351,7 +1351,7 @@ declare 380 {
     int Tcl_GetCharLength(Tcl_Obj *objPtr)
 }
 declare 381 {
-    Tcl_UniChar Tcl_GetUniChar(Tcl_Obj *objPtr, int index)
+    int Tcl_GetUniChar(Tcl_Obj *objPtr, int index)
 }
 declare 382 {
     Tcl_UniChar *Tcl_GetUnicode(Tcl_Obj *objPtr)
diff --git a/generic/tcl.h b/generic/tcl.h
index 07d841d..f874997 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2201,7 +2201,7 @@ typedef struct Tcl_EncodingType {
  */
 
 #ifndef TCL_UTF_MAX
-#define TCL_UTF_MAX		3
+#define TCL_UTF_MAX		4
 #endif
 
 /*
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index 2195aa1..b6a8fe9 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -309,7 +309,7 @@ Tcl_RegexpObjCmd(
 	    eflags = 0;
 	} else if (offset > stringLength) {
 	    eflags = TCL_REG_NOTBOL;
-	} else if (Tcl_GetUniChar(objPtr, offset-1) == (Tcl_UniChar)'\n') {
+	} else if (Tcl_GetUniChar(objPtr, offset-1) == '\n') {
 	    eflags = 0;
 	} else {
 	    eflags = TCL_REG_NOTBOL;
@@ -1218,6 +1218,12 @@ Tcl_SplitObjCmd(
 	for ( ; stringPtr < end; stringPtr += len) {
 	    len = TclUtfToUniChar(stringPtr, &ch);
 
+#if TCL_UTF_MAX == 4
+	    if (!len) {
+		continue;
+	    }
+#endif
+
 	    /*
 	     * Assume Tcl_UniChar is an integral type...
 	     */
@@ -1814,8 +1820,16 @@ StringIsCmd(
 	}
 	end = string1 + length1;
 	for (; string1 < end; string1 += length2, failat++) {
+	    int fullchar;
 	    length2 = TclUtfToUniChar(string1, &ch);
-	    if (!chcomp(ch)) {
+	    fullchar = ch;
+#if TCL_UTF_MAX == 4
+	    if (!length2) {
+	    	length2 = TclUtfToUniChar(string1, &ch);
+	    	fullchar = (((fullchar & 0x3ff) << 10) | (ch & 0x3ff)) + 0x10000;
+	    }
+#endif
+	    if (!chcomp(fullchar)) {
 		result = 0;
 		break;
 	    }
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 464fc0f..5f83636 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -959,13 +959,13 @@ EXTERN void		Tcl_ThreadAlert(Tcl_ThreadId threadId);
 EXTERN void		Tcl_ThreadQueueEvent(Tcl_ThreadId threadId,
 				Tcl_Event *evPtr, Tcl_QueuePosition position);
 /* 320 */
-EXTERN Tcl_UniChar	Tcl_UniCharAtIndex(const char *src, int index);
+EXTERN int		Tcl_UniCharAtIndex(const char *src, int index);
 /* 321 */
-EXTERN Tcl_UniChar	Tcl_UniCharToLower(int ch);
+EXTERN int		Tcl_UniCharToLower(int ch);
 /* 322 */
-EXTERN Tcl_UniChar	Tcl_UniCharToTitle(int ch);
+EXTERN int		Tcl_UniCharToTitle(int ch);
 /* 323 */
-EXTERN Tcl_UniChar	Tcl_UniCharToUpper(int ch);
+EXTERN int		Tcl_UniCharToUpper(int ch);
 /* 324 */
 EXTERN int		Tcl_UniCharToUtf(int ch, char *buf);
 /* 325 */
@@ -1117,7 +1117,7 @@ EXTERN void		Tcl_SetUnicodeObj(Tcl_Obj *objPtr,
 /* 380 */
 EXTERN int		Tcl_GetCharLength(Tcl_Obj *objPtr);
 /* 381 */
-EXTERN Tcl_UniChar	Tcl_GetUniChar(Tcl_Obj *objPtr, int index);
+EXTERN int		Tcl_GetUniChar(Tcl_Obj *objPtr, int index);
 /* 382 */
 EXTERN Tcl_UniChar *	Tcl_GetUnicode(Tcl_Obj *objPtr);
 /* 383 */
@@ -2186,10 +2186,10 @@ typedef struct TclStubs {
     Tcl_Obj * (*tcl_SetVar2Ex) (Tcl_Interp *interp, const char *part1, const char *part2, Tcl_Obj *newValuePtr, int flags); /* 317 */
     void (*tcl_ThreadAlert) (Tcl_ThreadId threadId); /* 318 */
     void (*tcl_ThreadQueueEvent) (Tcl_ThreadId threadId, Tcl_Event *evPtr, Tcl_QueuePosition position); /* 319 */
-    Tcl_UniChar (*tcl_UniCharAtIndex) (const char *src, int index); /* 320 */
-    Tcl_UniChar (*tcl_UniCharToLower) (int ch); /* 321 */
-    Tcl_UniChar (*tcl_UniCharToTitle) (int ch); /* 322 */
-    Tcl_UniChar (*tcl_UniCharToUpper) (int ch); /* 323 */
+    int (*tcl_UniCharAtIndex) (const char *src, int index); /* 320 */
+    int (*tcl_UniCharToLower) (int ch); /* 321 */
+    int (*tcl_UniCharToTitle) (int ch); /* 322 */
+    int (*tcl_UniCharToUpper) (int ch); /* 323 */
     int (*tcl_UniCharToUtf) (int ch, char *buf); /* 324 */
     CONST84_RETURN char * (*tcl_UtfAtIndex) (const char *src, int index); /* 325 */
     int (*tcl_UtfCharComplete) (const char *src, int length); /* 326 */
@@ -2247,7 +2247,7 @@ typedef struct TclStubs {
     Tcl_Obj * (*tcl_NewUnicodeObj) (const Tcl_UniChar *unicode, int numChars); /* 378 */
     void (*tcl_SetUnicodeObj) (Tcl_Obj *objPtr, const Tcl_UniChar *unicode, int numChars); /* 379 */
     int (*tcl_GetCharLength) (Tcl_Obj *objPtr); /* 380 */
-    Tcl_UniChar (*tcl_GetUniChar) (Tcl_Obj *objPtr, int index); /* 381 */
+    int (*tcl_GetUniChar) (Tcl_Obj *objPtr, int index); /* 381 */
     Tcl_UniChar * (*tcl_GetUnicode) (Tcl_Obj *objPtr); /* 382 */
     Tcl_Obj * (*tcl_GetRange) (Tcl_Obj *objPtr, int first, int last); /* 383 */
     void (*tcl_AppendUnicodeToObj) (Tcl_Obj *objPtr, const Tcl_UniChar *unicode, int length); /* 384 */
diff --git a/generic/tclScan.c b/generic/tclScan.c
index e1fcad4..7f71262 100644
--- a/generic/tclScan.c
+++ b/generic/tclScan.c
@@ -885,9 +885,17 @@ Tcl_ScanObjCmd(
 	     * Scan a single Unicode character.
 	     */
 
-	    string += TclUtfToUniChar(string, &sch);
+	    offset = TclUtfToUniChar(string, &sch);
+	    i = (int)sch;
+#if TCL_UTF_MAX == 4
+	    if (!offset) {
+		offset = Tcl_UtfToUniChar(string, &sch);
+		i = (((i<<10) & 0x0FFC00) + 0x10000) + (sch & 0x3FF);
+	    }
+#endif
+	    string += offset;
 	    if (!(flags & SCAN_SUPPRESS)) {
-		objPtr = Tcl_NewIntObj((int)sch);
+		objPtr = Tcl_NewIntObj(i);
 		Tcl_IncrRefCount(objPtr);
 		CLANG_ASSERT(objs);
 		objs[objIndex++] = objPtr;
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 3a35bcf..1ccd778 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -466,7 +466,7 @@ Tcl_GetCharLength(
  *----------------------------------------------------------------------
  */
 
-Tcl_UniChar
+int
 Tcl_GetUniChar(
     Tcl_Obj *objPtr,		/* The object to get the Unicode charater
 				 * from. */
@@ -483,7 +483,7 @@ Tcl_GetUniChar(
     if (TclIsPureByteArray(objPtr)) {
 	unsigned char *bytes = Tcl_GetByteArrayFromObj(objPtr, NULL);
 
-	return (Tcl_UniChar) bytes[index];
+	return (int) bytes[index];
     }
 
     /*
@@ -507,7 +507,7 @@ Tcl_GetUniChar(
 	FillUnicodeRep(objPtr);
 	stringPtr = GET_STRING(objPtr);
     }
-    return stringPtr->unicode[index];
+    return (int) stringPtr->unicode[index];
 }
 
 /*
@@ -3462,7 +3462,6 @@ TclStringObjReverse(
 	     * Tcl_SetObjLength into growing the unicode rep buffer.
 	     */
 
-	    ch = 0;
 	    objPtr = Tcl_NewUnicodeObj(&ch, 1);
 	    Tcl_SetObjLength(objPtr, stringPtr->numChars);
 	    to = Tcl_GetUnicode(objPtr);
@@ -3565,7 +3564,7 @@ ExtendUnicodeRepWithString(
 {
     String *stringPtr = GET_STRING(objPtr);
     int needed, numOrigChars = 0;
-    Tcl_UniChar *dst;
+    Tcl_UniChar *dst, unichar = 0;
 
     if (stringPtr->hasUnicode) {
 	numOrigChars = stringPtr->numChars;
@@ -3588,7 +3587,8 @@ ExtendUnicodeRepWithString(
 	numAppendChars = 0;
     }
     for (dst=stringPtr->unicode + numOrigChars; numAppendChars-- > 0; dst++) {
-	bytes += TclUtfToUniChar(bytes, dst);
+	bytes += TclUtfToUniChar(bytes, &unichar);
+	*dst = unichar;
     }
     *dst = 0;
 }
diff --git a/generic/tclUtf.c b/generic/tclUtf.c
index 25cc2d1..859fe78 100644
--- a/generic/tclUtf.c
+++ b/generic/tclUtf.c
@@ -699,7 +699,7 @@ Tcl_UtfPrev(
  *---------------------------------------------------------------------------
  */
 
-Tcl_UniChar
+int
 Tcl_UniCharAtIndex(
     register const char *src,	/* The UTF-8 string to dereference. */
     register int index)		/* The position of the desired character. */
@@ -819,7 +819,8 @@ int
 Tcl_UtfToUpper(
     char *str)			/* String to convert in place. */
 {
-    Tcl_UniChar ch = 0, upChar;
+    Tcl_UniChar ch = 0;
+    int upChar;
     char *src, *dst;
     int bytes;
 
@@ -830,7 +831,14 @@ Tcl_UtfToUpper(
     src = dst = str;
     while (*src) {
 	bytes = TclUtfToUniChar(src, &ch);
-	upChar = Tcl_UniCharToUpper(ch);
+	upChar = ch;
+	if (!bytes) {
+	    /* TclUtfToUniChar only returns 0 for chars > 0xffff ! */
+	    bytes = TclUtfToUniChar(src, &ch);
+	    /* Combine surrogates */
+	    upChar = (((upChar & 0x3ff) << 10) | (ch & 0x3ff)) + 0x10000;
+	}
+	upChar = Tcl_UniCharToUpper(upChar);
 
 	/*
 	 * To keep badly formed Utf strings from getting inflated by the
@@ -872,7 +880,8 @@ int
 Tcl_UtfToLower(
     char *str)			/* String to convert in place. */
 {
-    Tcl_UniChar ch = 0, lowChar;
+    Tcl_UniChar ch = 0;
+    int lowChar;
     char *src, *dst;
     int bytes;
 
@@ -883,7 +892,14 @@ Tcl_UtfToLower(
     src = dst = str;
     while (*src) {
 	bytes = TclUtfToUniChar(src, &ch);
-	lowChar = Tcl_UniCharToLower(ch);
+	lowChar = ch;
+	if (!bytes) {
+	    /* TclUtfToUniChar only returns 0 for chars > 0xffff ! */
+	    bytes = TclUtfToUniChar(src, &ch);
+	    /* Combine surrogates */
+	    lowChar = (((lowChar & 0x3ff) << 10) | (ch & 0x3ff)) + 0x10000;
+	}
+	lowChar = Tcl_UniCharToLower(lowChar);
 
 	/*
 	 * To keep badly formed Utf strings from getting inflated by the
@@ -926,7 +942,8 @@ int
 Tcl_UtfToTitle(
     char *str)			/* String to convert in place. */
 {
-    Tcl_UniChar ch = 0, titleChar, lowChar;
+    Tcl_UniChar ch = 0;
+    int titleChar, lowChar;
     char *src, *dst;
     int bytes;
 
@@ -939,7 +956,14 @@ Tcl_UtfToTitle(
 
     if (*src) {
 	bytes = TclUtfToUniChar(src, &ch);
-	titleChar = Tcl_UniCharToTitle(ch);
+	titleChar = ch;
+	if (!bytes) {
+	    /* TclUtfToUniChar only returns 0 for chars > 0xffff ! */
+	    bytes = TclUtfToUniChar(src, &ch);
+	    /* Combine surrogates */
+	    titleChar = (((titleChar & 0x3ff) << 10) | (ch & 0x3ff)) + 0x10000;
+	}
+	titleChar = Tcl_UniCharToTitle(titleChar);
 
 	if (bytes < TclUtfCount(titleChar)) {
 	    memcpy(dst, src, (size_t) bytes);
@@ -951,7 +975,14 @@ Tcl_UtfToTitle(
     }
     while (*src) {
 	bytes = TclUtfToUniChar(src, &ch);
-	lowChar = Tcl_UniCharToLower(ch);
+	lowChar = ch;
+	if (!bytes) {
+	    /* TclUtfToUniChar only returns 0 for chars > 0xffff ! */
+	    bytes = TclUtfToUniChar(src, &ch);
+	    /* Combine surrogates */
+	    lowChar = (((lowChar & 0x3ff) << 10) | (ch & 0x3ff)) + 0x10000;
+	}
+	lowChar = Tcl_UniCharToLower(lowChar);
 
 	if (bytes < TclUtfCount(lowChar)) {
 	    memcpy(dst, src, (size_t) bytes);
@@ -1159,16 +1190,18 @@ TclUtfCasecmp(
  *----------------------------------------------------------------------
  */
 
-Tcl_UniChar
+int
 Tcl_UniCharToUpper(
     int ch)			/* Unicode character to convert. */
 {
-    int info = GetUniCharInfo(ch);
+    if (!UNICODE_OUT_OF_RANGE(ch)) {
+	int info = GetUniCharInfo(ch);
 
-    if (GetCaseType(info) & 0x04) {
-	ch -= GetDelta(info);
+	if (GetCaseType(info) & 0x04) {
+	    ch -= GetDelta(info);
+	}
     }
-    return (Tcl_UniChar) ch;
+    return ch & 0x1FFFFF;
 }
 
 /*
@@ -1187,16 +1220,18 @@ Tcl_UniCharToUpper(
  *----------------------------------------------------------------------
  */
 
-Tcl_UniChar
+int
 Tcl_UniCharToLower(
     int ch)			/* Unicode character to convert. */
 {
-    int info = GetUniCharInfo(ch);
+    if (!UNICODE_OUT_OF_RANGE(ch)) {
+	int info = GetUniCharInfo(ch);
 
-    if (GetCaseType(info) & 0x02) {
-	ch += GetDelta(info);
+	if (GetCaseType(info) & 0x02) {
+	    ch += GetDelta(info);
+	}
     }
-    return (Tcl_UniChar) ch;
+    return ch & 0x1FFFFF;
 }
 
 /*
@@ -1215,23 +1250,25 @@ Tcl_UniCharToLower(
  *----------------------------------------------------------------------
  */
 
-Tcl_UniChar
+int
 Tcl_UniCharToTitle(
     int ch)			/* Unicode character to convert. */
 {
-    int info = GetUniCharInfo(ch);
-    int mode = GetCaseType(info);
+    if (!UNICODE_OUT_OF_RANGE(ch)) {
+	int info = GetUniCharInfo(ch);
+	int mode = GetCaseType(info);
 
-    if (mode & 0x1) {
-	/*
-	 * Subtract or add one depending on the original case.
-	 */
+	if (mode & 0x1) {
+	    /*
+	     * Subtract or add one depending on the original case.
+	     */
 
-	ch += ((mode & 0x4) ? -1 : 1);
-    } else if (mode == 0x4) {
-	ch -= GetDelta(info);
+	    ch += ((mode & 0x4) ? -1 : 1);
+	} else if (mode == 0x4) {
+	    ch -= GetDelta(info);
+	}
     }
-    return (Tcl_UniChar) ch;
+    return ch & 0x1FFFFF;
 }
 
 /*
diff --git a/tests/string.test b/tests/string.test
index cb901b9..cebaf4c 100644
--- a/tests/string.test
+++ b/tests/string.test
@@ -1697,40 +1697,40 @@ test string-24.4 {string reverse command - unshared string} {
     string reverse $x$y
 } edcba
 test string-24.5 {string reverse command - shared unicode string} {
-    set x abcde\udead
+    set x abcde\ud0ad
     string reverse $x
-} \udeadedcba
+} \ud0adedcba
 test string-24.6 {string reverse command - unshared string} {
     set x abc
-    set y de\udead
+    set y de\ud0ad
     string reverse $x$y
-} \udeadedcba
+} \ud0adedcba
 test string-24.7 {string reverse command - simple case} {
     string reverse a
 } a
 test string-24.8 {string reverse command - simple case} {
-    string reverse \udead
-} \udead
+    string reverse \ud0ad
+} \ud0ad
 test string-24.9 {string reverse command - simple case} {
     string reverse {}
 } {}
 test string-24.10 {string reverse command - corner case} {
-    set x \ubeef\udead
+    set x \ubeef\ud0ad
     string reverse $x
-} \udead\ubeef
+} \ud0ad\ubeef
 test string-24.11 {string reverse command - corner case} {
     set x \ubeef
-    set y \udead
+    set y \ud0ad
     string reverse $x$y
-} \udead\ubeef
+} \ud0ad\ubeef
 test string-24.12 {string reverse command - corner case} {
     set x \ubeef
-    set y \udead
+    set y \ud0ad
     string is ascii [string reverse $x$y]
 } 0
 test string-24.13 {string reverse command - pure Unicode string} {
-    string reverse [string range \ubeef\udead\ubeef\udead\ubeef\udead 1 5]
-} \udead\ubeef\udead\ubeef\udead
+    string reverse [string range \ubeef\ud0ad\ubeef\ud0ad\ubeef\ud0ad 1 5]
+} \ud0ad\ubeef\ud0ad\ubeef\ud0ad
 test string-24.14 {string reverse command - pure bytearray} {
     binary scan [string reverse [binary format H* 010203]] H* x
     set x
diff --git a/tests/utf.test b/tests/utf.test
index 422ab08..45f9c0c 100644
--- a/tests/utf.test
+++ b/tests/utf.test
@@ -68,10 +68,10 @@ test utf-2.7 {Tcl_UtfToUniChar: lead (3-byte) followed by 2 trail} testbytestrin
 } {1}
 test utf-2.8 {Tcl_UtfToUniChar: lead (4-byte) followed by 3 trail} -constraints {fullutf testbytestring} -body {
     string length [testbytestring "\xF0\x90\x80\x80"]
-} -result {1}
+} -result {2}
 test utf-2.9 {Tcl_UtfToUniChar: lead (4-byte) followed by 3 trail} -constraints {fullutf testbytestring} -body {
     string length [testbytestring "\xF4\x8F\xBF\xBF"]
-} -result {1}
+} -result {2}
 test utf-2.10 {Tcl_UtfToUniChar: lead (4-byte) followed by 3 trail, underflow} testbytestring {
     string length [testbytestring "\xF0\x8F\xBF\xBF"]
 } {4}
-- 
cgit v0.12


From 2ea8f0fe98ed8a2f72d7d355b9c080fbb5bdd912 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 17 Nov 2017 16:08:49 +0000
Subject: merge core-8-branch. Fix some Tcl_UniChar initialization, in case
 TCL_UTF_MAX == 4

---
 doc/ToUpper.3          |  6 +++---
 doc/UniCharIsAlpha.3   |  7 ++-----
 doc/Utf.3              |  2 +-
 generic/tclScan.c      |  2 +-
 generic/tclStringObj.c | 10 +++++-----
 generic/tclUtf.c       | 34 ++++++++++++++++++++++++----------
 generic/tclUtil.c      | 14 +++++++-------
 win/tclWinSerial.c     |  6 +++---
 8 files changed, 46 insertions(+), 35 deletions(-)

diff --git a/doc/ToUpper.3 b/doc/ToUpper.3
index 14766da..b06b793 100644
--- a/doc/ToUpper.3
+++ b/doc/ToUpper.3
@@ -16,10 +16,10 @@ Tcl_UniCharToUpper, Tcl_UniCharToLower, Tcl_UniCharToTitle, Tcl_UtfToUpper, Tcl_
 int
 \fBTcl_UniCharToUpper\fR(\fIch\fR)
 .sp
-Tcl_UniChar
+int
 \fBTcl_UniCharToLower\fR(\fIch\fR)
 .sp
-Tcl_UniChar
+int
 \fBTcl_UniCharToTitle\fR(\fIch\fR)
 .sp
 int
@@ -33,7 +33,7 @@ int
 .SH ARGUMENTS
 .AS char *str in/out
 .AP int ch in
-The Tcl_UniChar to be converted.
+The character to be converted.
 .AP char *str in/out
 Pointer to UTF-8 string to be converted in place.
 .BE
diff --git a/doc/UniCharIsAlpha.3 b/doc/UniCharIsAlpha.3
index 2336c34..e1d23ab 100644
--- a/doc/UniCharIsAlpha.3
+++ b/doc/UniCharIsAlpha.3
@@ -48,19 +48,16 @@ int
 .SH ARGUMENTS
 .AS int ch
 .AP int ch in
-The Tcl_UniChar to be examined.
+The character to be examined.
 .BE
 
 .SH DESCRIPTION
 .PP
-All of the routines described examine Tcl_UniChars and return a
+All of the routines described examine characters and return a
 boolean value. A non-zero return value means that the character does
 belong to the character class associated with the called routine. The
 rest of this document just describes the character classes associated
 with the various routines.
-.PP
-Note: A Tcl_UniChar is a Unicode character represented as an unsigned,
-fixed-size quantity.
 
 .SH "CHARACTER CLASSES"
 .PP
diff --git a/doc/Utf.3 b/doc/Utf.3
index 5cd6b7df..638f349 100644
--- a/doc/Utf.3
+++ b/doc/Utf.3
@@ -77,7 +77,7 @@ int
 Buffer in which the UTF-8 representation of the Tcl_UniChar is stored.  At most
 \fBTCL_UTF_MAX\fR bytes are stored in the buffer.
 .AP int ch in
-The Tcl_UniChar to be converted or examined.
+The character to be converted or examined.
 .AP Tcl_UniChar *chPtr out
 Filled with the Tcl_UniChar represented by the head of the UTF-8 string.
 .AP "const char" *src in
diff --git a/generic/tclScan.c b/generic/tclScan.c
index 7f71262..e0798df 100644
--- a/generic/tclScan.c
+++ b/generic/tclScan.c
@@ -889,7 +889,7 @@ Tcl_ScanObjCmd(
 	    i = (int)sch;
 #if TCL_UTF_MAX == 4
 	    if (!offset) {
-		offset = Tcl_UtfToUniChar(string, &sch);
+		offset = TclUtfToUniChar(string, &sch);
 		i = (((i<<10) & 0x0FFC00) + 0x10000) + (sch & 0x3FF);
 	    }
 #endif
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 1ccd778..fda6ac1 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -1869,20 +1869,20 @@ Tcl_AppendFormatToObj(
 	} else if (ch == 'I') {
 	    if ((format[1] == '6') && (format[2] == '4')) {
 		format += (step + 2);
-		step = Tcl_UtfToUniChar(format, &ch);
+		step = TclUtfToUniChar(format, &ch);
 #ifndef TCL_WIDE_INT_IS_LONG
 		useWide = 1;
 #endif
 	    } else if ((format[1] == '3') && (format[2] == '2')) {
 		format += (step + 2);
-		step = Tcl_UtfToUniChar(format, &ch);
+		step = TclUtfToUniChar(format, &ch);
 	    } else {
 		format += step;
-		step = Tcl_UtfToUniChar(format, &ch);
+		step = TclUtfToUniChar(format, &ch);
 	    }
 	} else if ((ch == 't') || (ch == 'z')) {
 	    format += step;
-	    step = Tcl_UtfToUniChar(format, &ch);
+	    step = TclUtfToUniChar(format, &ch);
 #ifndef TCL_WIDE_INT_IS_LONG
 	    if (sizeof(size_t) > sizeof(int)) {
 		useWide = 1;
@@ -1890,7 +1890,7 @@ Tcl_AppendFormatToObj(
 #endif
 	} else if ((ch == 'q') ||(ch == 'j')) {
 	    format += step;
-	    step = Tcl_UtfToUniChar(format, &ch);
+	    step = TclUtfToUniChar(format, &ch);
 #ifndef TCL_WIDE_INT_IS_LONG
 	    useWide = 1;
 #endif
diff --git a/generic/tclUtf.c b/generic/tclUtf.c
index 859fe78..e651757 100644
--- a/generic/tclUtf.c
+++ b/generic/tclUtf.c
@@ -398,7 +398,7 @@ Tcl_UtfToUniCharDString(
 				 * appended to this previously initialized
 				 * DString. */
 {
-    Tcl_UniChar ch, *w, *wString;
+    Tcl_UniChar ch = 0, *w, *wString;
     const char *p, *end;
     int oldLength;
 
@@ -522,12 +522,12 @@ Tcl_NumUtfChars(
  *
  * Tcl_UtfFindFirst --
  *
- *	Returns a pointer to the first occurance of the given Tcl_UniChar in
+ *	Returns a pointer to the first occurance of the given character in
  *	the NULL-terminated UTF-8 string. The NULL terminator is considered
  *	part of the UTF-8 string. Equivalent to Plan 9 utfrune().
  *
  * Results:
- *	As above. If the Tcl_UniChar does not exist in the given string, the
+ *	As above. If the character does not exist in the given string, the
  *	return value is NULL.
  *
  * Side effects:
@@ -539,14 +539,21 @@ Tcl_NumUtfChars(
 const char *
 Tcl_UtfFindFirst(
     const char *src,		/* The UTF-8 string to be searched. */
-    int ch)			/* The Tcl_UniChar to search for. */
+    int ch)			/* The character to search for. */
 {
-    int len;
+    int len, fullchar;
     Tcl_UniChar find = 0;
 
     while (1) {
 	len = TclUtfToUniChar(src, &find);
-	if (find == ch) {
+	fullchar = find;
+#if TCL_UTF_MAX == 4
+	if (!len) {
+	    len += TclUtfToUniChar(stringPtr, &find);
+	    fullchar = (((fullchar & 0x3ff) << 10) | (ch & 0x3ff)) + 0x10000;
+	}
+#endif
+	if (find == fullchar) {
 	    return src;
 	}
 	if (*src == '\0') {
@@ -578,16 +585,23 @@ Tcl_UtfFindFirst(
 const char *
 Tcl_UtfFindLast(
     const char *src,		/* The UTF-8 string to be searched. */
-    int ch)			/* The Tcl_UniChar to search for. */
+    int ch)			/* The character to search for. */
 {
-    int len;
+    int len, fullchar;
     Tcl_UniChar find = 0;
     const char *last;
 
     last = NULL;
     while (1) {
 	len = TclUtfToUniChar(src, &find);
-	if (find == ch) {
+	fullchar = find;
+#if TCL_UTF_MAX == 4
+	if (!len) {
+	    len += TclUtfToUniChar(stringPtr, &find);
+	    fullchar = (((fullchar & 0x3ff) << 10) | (ch & 0x3ff)) + 0x10000;
+	}
+#endif
+	if (find == fullchar) {
 	    last = src;
 	}
 	if (*src == '\0') {
@@ -1158,7 +1172,7 @@ TclUtfCasecmp(
     const char *ct)		/* UTF string cs is compared to. */
 {
     while (*cs && *ct) {
-	Tcl_UniChar ch1, ch2;
+	Tcl_UniChar ch1 = 0, ch2 = 0;
 
 	cs += TclUtfToUniChar(cs, &ch1);
 	ct += TclUtfToUniChar(ct, &ch2);
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index 8ebace5..21d1071 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -1695,7 +1695,7 @@ TclTrimRight(
 	 */
 
 	do {
-	    Tcl_UniChar ch2;
+	    Tcl_UniChar ch2 = 0;
 	    int qInc = TclUtfToUniChar(q, &ch2);
 
 	    if (ch1 == ch2) {
@@ -1763,7 +1763,7 @@ TclTrimLeft(
      */
 
     do {
-	Tcl_UniChar ch1;
+	Tcl_UniChar ch1 = 0;
 	int pInc = TclUtfToUniChar(p, &ch1);
 	const char *q = trim;
 	int bytesLeft = numTrim;
@@ -1773,7 +1773,7 @@ TclTrimLeft(
 	 */
 
 	do {
-	    Tcl_UniChar ch2;
+	    Tcl_UniChar ch2 = 0;
 	    int qInc = TclUtfToUniChar(q, &ch2);
 
 	    if (ch1 == ch2) {
@@ -2107,7 +2107,7 @@ Tcl_StringCaseMatch(
 {
     int p, charLen;
     const char *pstart = pattern;
-    Tcl_UniChar ch1, ch2;
+    Tcl_UniChar ch1 = 0, ch2 = 0;
 
     while (1) {
 	p = *pattern;
@@ -2217,7 +2217,7 @@ Tcl_StringCaseMatch(
 	 */
 
 	if (p == '[') {
-	    Tcl_UniChar startChar, endChar;
+	    Tcl_UniChar startChar = 0, endChar = 0;
 
 	    pattern++;
 	    if (UCHAR(*str) < 0x80) {
@@ -2225,7 +2225,7 @@ Tcl_StringCaseMatch(
 			(nocase ? tolower(UCHAR(*str)) : UCHAR(*str));
 		str++;
 	    } else {
-		str += Tcl_UtfToUniChar(str, &ch1);
+		str += TclUtfToUniChar(str, &ch1);
 		if (nocase) {
 		    ch1 = Tcl_UniCharToLower(ch1);
 		}
@@ -2254,7 +2254,7 @@ Tcl_StringCaseMatch(
 				? tolower(UCHAR(*pattern)) : UCHAR(*pattern));
 			pattern++;
 		    } else {
-			pattern += Tcl_UtfToUniChar(pattern, &endChar);
+			pattern += TclUtfToUniChar(pattern, &endChar);
 			if (nocase) {
 			    endChar = Tcl_UniCharToLower(endChar);
 			}
diff --git a/win/tclWinSerial.c b/win/tclWinSerial.c
index ed1a8e5..894f431 100644
--- a/win/tclWinSerial.c
+++ b/win/tclWinSerial.c
@@ -1738,15 +1738,15 @@ SerialSetOptionProc(
 	dcb.XonChar = argv[0][0];
 	dcb.XoffChar = argv[1][0];
 	if (argv[0][0] & 0x80 || argv[1][0] & 0x80) {
-	    Tcl_UniChar character;
+	    Tcl_UniChar character = 0;
 	    int charLen;
 
-	    charLen = Tcl_UtfToUniChar(argv[0], &character);
+	    charLen = TclUtfToUniChar(argv[0], &character);
 	    if (argv[0][charLen]) {
 		goto badXchar;
 	    }
 	    dcb.XonChar = (char) character;
-	    charLen = Tcl_UtfToUniChar(argv[1], &character);
+	    charLen = TclUtfToUniChar(argv[1], &character);
 	    if (argv[1][charLen]) {
 		goto badXchar;
 	    }
-- 
cgit v0.12


From 61536390c542d9aa9d1a91d173190cd2421294e5 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 20 Nov 2017 13:05:36 +0000
Subject: Fix executable flags

---
 generic/tclDecls.h    | 0
 generic/tclIntDecls.h | 0
 generic/tclStubInit.c | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 generic/tclDecls.h
 mode change 100755 => 100644 generic/tclIntDecls.h
 mode change 100755 => 100644 generic/tclStubInit.c

diff --git a/generic/tclDecls.h b/generic/tclDecls.h
old mode 100755
new mode 100644
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
old mode 100755
new mode 100644
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
old mode 100755
new mode 100644
-- 
cgit v0.12


From 3af16acbcb63ea2935d71b905371252560dc4659 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 29 Nov 2017 08:59:49 +0000
Subject: Treat invalid UTF-8 characters in the range 0x80-0x9F as cp1252: See
 [https://en.wikipedia.org/wiki/UTF-8]. To be added to TIP #389

---
 doc/Utf.3        |  3 +++
 generic/tclInt.h |  2 +-
 generic/tclUtf.c | 17 +++++++++++++++--
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/doc/Utf.3 b/doc/Utf.3
index 638f349..de9545d 100644
--- a/doc/Utf.3
+++ b/doc/Utf.3
@@ -140,6 +140,9 @@ number of bytes read from \fIsrc\fR.  The caller must ensure that the
 source buffer is long enough such that this routine does not run off the
 end and dereference non-existent or random memory; if the source buffer
 is known to be null-terminated, this will not happen.  If the input is
+a byte in the range 0x80 - 0x9F, \fBTcl_UtfToUniChar\fR assumes the
+cp1252 encoding, stores the corresponding Tcl_UniChar in \fI*chPtr\fR
+and returns 1. If the input is otherwise
 not in proper UTF-8 format, \fBTcl_UtfToUniChar\fR will store the first
 byte of \fIsrc\fR in \fI*chPtr\fR as a Tcl_UniChar between 0x0000 and
 0x00ff and return 1.
diff --git a/generic/tclInt.h b/generic/tclInt.h
index ef88bf5..d77889e 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -4446,7 +4446,7 @@ MODULE_SCOPE void	TclDbInitNewObj(Tcl_Obj *objPtr, const char *file,
  */
 
 #define TclUtfToUniChar(str, chPtr) \
-	((((unsigned char) *(str)) < 0xC0) ?		\
+	((((unsigned char) *(str)) < 0x80) ?		\
 	    ((*(chPtr) = (unsigned char) *(str)), 1)	\
 	    : Tcl_UtfToUniChar(str, chPtr))
 
diff --git a/generic/tclUtf.c b/generic/tclUtf.c
index 4ed201f..aed332f 100644
--- a/generic/tclUtf.c
+++ b/generic/tclUtf.c
@@ -272,6 +272,13 @@ Tcl_UniCharToUtfDString(
  *---------------------------------------------------------------------------
  */
 
+static const unsigned short cp1252[32] = {
+  0x20ac,   0x81, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
+  0x02C6, 0x2030, 0x0160, 0x2039, 0x0152,   0x8D, 0x017D,   0x8F,
+    0x90, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+   0x2DC, 0x2122, 0x0161, 0x203A, 0x0153,   0x9D, 0x017E, 0x0178
+};
+
 int
 Tcl_UtfToUniChar(
     register const char *src,	/* The UTF-8 string. */
@@ -288,11 +295,17 @@ Tcl_UtfToUniChar(
     if (byte < 0xC0) {
 	/*
 	 * Handles properly formed UTF-8 characters between 0x01 and 0x7F.
-	 * Also treats \0 and naked trail bytes 0x80 to 0xBF as valid
+	 * Treats naked trail bytes 0x80 to 0x9F as valid characters from
+	 * the cp1252 table. See: <https://en.wikipedia.org/wiki/UTF-8>
+	 * Also treats \0 and other naked trail bytes 0xA0 to 0xBF as valid
 	 * characters representing themselves.
 	 */
 
-	*chPtr = (Tcl_UniChar) byte;
+	if ((unsigned)(byte-0x80) < (unsigned) 0x20) {
+	    *chPtr = (Tcl_UniChar) cp1252[byte-0x80];
+	} else {
+	    *chPtr = (Tcl_UniChar) byte;
+	}
 	return 1;
     } else if (byte < 0xE0) {
 	if ((src[1] & 0xC0) == 0x80) {
-- 
cgit v0.12


From 03c66864aa2ffa9871ce216b00cd661eaf1be688 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 29 Nov 2017 09:49:31 +0000
Subject: Fix [8e1e31eac0fd6b6c4452bc108a98ab08c6b64588|8e1e31eac0]: lsort
 treats NUL chars strangely

---
 generic/tclCmdIL.c |  4 +--
 generic/tclCmdMZ.c |  2 +-
 generic/tclInt.h   |  1 +
 generic/tclUtf.c   | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++---
 4 files changed, 80 insertions(+), 6 deletions(-)

diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c
index 47076ec..b41d312 100644
--- a/generic/tclCmdIL.c
+++ b/generic/tclCmdIL.c
@@ -2945,7 +2945,7 @@ Tcl_LsearchObjCmd(
     double patDouble, objDouble;
     SortInfo sortInfo;
     Tcl_Obj *patObj, **listv, *listPtr, *startPtr, *itemPtr;
-    SortStrCmpFn_t strCmpFn = strcmp;
+    SortStrCmpFn_t strCmpFn = TclUtfCmp;
     Tcl_RegExp regexp = NULL;
     static const char *const options[] = {
 	"-all",	    "-ascii",   "-bisect", "-decreasing", "-dictionary",
@@ -4263,7 +4263,7 @@ SortCompare(
     int order = 0;
 
     if (infoPtr->sortMode == SORTMODE_ASCII) {
-	order = strcmp(elemPtr1->collationKey.strValuePtr,
+	order = TclUtfCmp(elemPtr1->collationKey.strValuePtr,
 		elemPtr2->collationKey.strValuePtr);
     } else if (infoPtr->sortMode == SORTMODE_ASCII_NC) {
 	order = TclUtfCasecmp(elemPtr1->collationKey.strValuePtr,
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index ad1dd5f..a206cc5 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -3547,7 +3547,7 @@ TclNRSwitchObjCmd(
 	OPT_LAST
     };
     typedef int (*strCmpFn_t)(const char *, const char *);
-    strCmpFn_t strCmpFn = strcmp;
+    strCmpFn_t strCmpFn = TclUtfCmp;
 
     mode = OPT_EXACT;
     foundmode = 0;
diff --git a/generic/tclInt.h b/generic/tclInt.h
index d77889e..ad1d9c6 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -3219,6 +3219,7 @@ MODULE_SCOPE int	TclTrimLeft(const char *bytes, int numBytes,
 			    const char *trim, int numTrim);
 MODULE_SCOPE int	TclTrimRight(const char *bytes, int numBytes,
 			    const char *trim, int numTrim);
+MODULE_SCOPE int	TclUtfCmp(const char *cs, const char *ct);
 MODULE_SCOPE int	TclUtfCasecmp(const char *cs, const char *ct);
 MODULE_SCOPE int	TclUtfCount(int ch);
 MODULE_SCOPE Tcl_Obj *	TclpNativeToNormalized(ClientData clientData);
diff --git a/generic/tclUtf.c b/generic/tclUtf.c
index aed332f..aff10c1 100644
--- a/generic/tclUtf.c
+++ b/generic/tclUtf.c
@@ -1108,6 +1108,15 @@ Tcl_UtfNcmp(
 
 	cs += TclUtfToUniChar(cs, &ch1);
 	ct += TclUtfToUniChar(ct, &ch2);
+#if TCL_UTF_MAX == 4
+    /* map high surrogate characters to values > 0xffff */
+    if ((ch1 & 0xFC00) == 0xD800) {
+	ch1 += 0x4000;
+    }
+    if ((ch2 & 0xFC00) == 0xD800) {
+	ch2 += 0x4000;
+    }
+#endif
 	if (ch1 != ch2) {
 	    return (ch1 - ch2);
 	}
@@ -1140,6 +1149,7 @@ Tcl_UtfNcasecmp(
     unsigned long numChars)	/* Number of UTF chars to compare. */
 {
     Tcl_UniChar ch1 = 0, ch2 = 0;
+
     while (numChars-- > 0) {
 	/*
 	 * n must be interpreted as chars, not bytes.
@@ -1148,6 +1158,15 @@ Tcl_UtfNcasecmp(
 	 */
 	cs += TclUtfToUniChar(cs, &ch1);
 	ct += TclUtfToUniChar(ct, &ch2);
+#if TCL_UTF_MAX == 4
+    /* map high surrogate characters to values > 0xffff */
+    if ((ch1 & 0xFC00) == 0xD800) {
+	ch1 += 0x4000;
+    }
+    if ((ch2 & 0xFC00) == 0xD800) {
+	ch2 += 0x4000;
+    }
+#endif
 	if (ch1 != ch2) {
 	    ch1 = Tcl_UniCharToLower(ch1);
 	    ch2 = Tcl_UniCharToLower(ch2);
@@ -1158,11 +1177,56 @@ Tcl_UtfNcasecmp(
     }
     return 0;
 }
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * Tcl_UtfCmp --
+ *
+ *	Compare UTF chars of string cs to string ct case sensitively.
+ *	Replacement for strcmp in Tcl core, in places where UTF-8 should
+ *	be handled.
+ *
+ * Results:
+ *	Return <0 if cs < ct, 0 if cs == ct, or >0 if cs > ct.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int
+TclUtfCmp(
+    const char *cs,		/* UTF string to compare to ct. */
+    const char *ct)		/* UTF string cs is compared to. */
+{
+    Tcl_UniChar ch1 = 0, ch2 = 0;
+
+    while (*cs && *ct) {
+	cs += TclUtfToUniChar(cs, &ch1);
+	ct += TclUtfToUniChar(ct, &ch2);
+#if TCL_UTF_MAX == 4
+    /* map high surrogate characters to values > 0xffff */
+    if ((ch1 & 0xFC00) == 0xD800) {
+	ch1 += 0x4000;
+    }
+    if ((ch2 & 0xFC00) == 0xD800) {
+	ch2 += 0x4000;
+    }
+#endif
+	if (ch1 != ch2) {
+	    return ch1 - ch2;
+	}
+    }
+    return UCHAR(*cs) - UCHAR(*ct);
+}
+
 
 /*
  *----------------------------------------------------------------------
  *
- * Tcl_UtfNcasecmp --
+ * TclUtfCasecmp --
  *
  *	Compare UTF chars of string cs to string ct case insensitively.
  *	Replacement for strcasecmp in Tcl core, in places where UTF-8 should
@@ -1182,11 +1246,20 @@ TclUtfCasecmp(
     const char *cs,		/* UTF string to compare to ct. */
     const char *ct)		/* UTF string cs is compared to. */
 {
-    while (*cs && *ct) {
-	Tcl_UniChar ch1 = 0, ch2 = 0;
+    Tcl_UniChar ch1 = 0, ch2 = 0;
 
+    while (*cs && *ct) {
 	cs += TclUtfToUniChar(cs, &ch1);
 	ct += TclUtfToUniChar(ct, &ch2);
+#if TCL_UTF_MAX == 4
+    /* map high surrogate characters to values > 0xffff */
+    if ((ch1 & 0xFC00) == 0xD800) {
+	ch1 += 0x4000;
+    }
+    if ((ch2 & 0xFC00) == 0xD800) {
+	ch2 += 0x4000;
+    }
+#endif
 	if (ch1 != ch2) {
 	    ch1 = Tcl_UniCharToLower(ch1);
 	    ch2 = Tcl_UniCharToLower(ch2);
-- 
cgit v0.12


From 0f6d3fd95989e7b5c22a40bbdc90631e3ae10bc1 Mon Sep 17 00:00:00 2001
From: pspjuth <peter.spjuth@gmail.com>
Date: Thu, 28 Dec 2017 23:54:57 +0000
Subject: Optimise lrange for unshared object.

---
 generic/tclExecute.c |  13 +++++++
 tests/lrange.test    | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 115 insertions(+)

diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index f2cda0c..0f501b9 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -5140,12 +5140,25 @@ TEBCresume(
 	    if (toIdx >= objc) {
 		toIdx = objc-1;
 	    }
+
+	    /*
+	     * If we are just removing the beginning or the end from an
+	     * unshared object, Tcl_ListObjReplace is very efficient, and also
+	     * guarantees a pure list.
+	     */
+
 	    if (fromIdx == 0 && toIdx != objc-1 && !Tcl_IsShared(valuePtr)) {
 		Tcl_ListObjReplace(interp, valuePtr,
 			toIdx + 1, LIST_MAX, 0, NULL);
 		TRACE_APPEND(("%.30s\n", O2S(valuePtr)));
 		NEXT_INST_F(9, 0, 0);
 	    }
+	    if (toIdx == objc-1 && !Tcl_IsShared(valuePtr)) {
+		Tcl_ListObjReplace(interp, 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 {
 	    TclNewObj(objResultPtr);
diff --git a/tests/lrange.test b/tests/lrange.test
index 02b9c65..0b1a7ca 100644
--- a/tests/lrange.test
+++ b/tests/lrange.test
@@ -90,6 +90,108 @@ test lrange-3.1 {Bug 3588366: end-offsets before start} {
 	lrange $l 0 end-5
     }} {1 2 3 4 5}
 } {}
+
+test lrange-4.1 {lrange pure promise} -body {
+    set ll1 [list $tcl_version 2 3 4]
+    # Shared
+    set ll2 $ll1
+    # With string rep
+    string length $ll1
+    set rep1 [tcl::unsupported::representation $ll1]
+    # Get new pure object
+    set x [lrange $ll1 0 end]
+    set rep2 [tcl::unsupported::representation $x]
+    regexp {object pointer at (\S+)} $rep1 -> obj1
+    regexp {object pointer at (\S+)} $rep2 -> obj2
+    list $rep1 $rep2 [string equal $obj1 $obj2]
+    # Check for a new clean object
+} -match glob -result {*value is *refcount of 3,*, string rep*value is*refcount of 2,* no string rep* 0}
+
+test lrange-4.2 {lrange pure promise} -body {
+    set ll1 [list $tcl_version 2 3 4]
+    # Shared
+    set ll2 $ll1
+    # With string rep
+    string length $ll1
+    set rep1 [tcl::unsupported::representation $ll1]
+    # Get new pure object, not compiled
+    set x [[string cat l range] $ll1 0 end]
+    set rep2 [tcl::unsupported::representation $x]
+    regexp {object pointer at (\S+)} $rep1 -> obj1
+    regexp {object pointer at (\S+)} $rep2 -> obj2
+    list $rep1 $rep2 [string equal $obj1 $obj2]
+    # Check for a new clean object
+} -match glob -result {*value is *refcount of 3,*, string rep*value is*refcount of 2,* no string rep* 0}
+
+test lrange-4.3 {lrange pure promise} -body {
+    set ll1 [list $tcl_version 2 3 4]
+    # With string rep
+    string length $ll1
+    set rep1 [tcl::unsupported::representation $ll1]
+    # Get pure object, unshared
+    set ll2 [lrange $ll1[set ll1 {}] 0 end]
+    set rep2 [tcl::unsupported::representation $ll2]
+    regexp {object pointer at (\S+)} $rep1 -> obj1
+    regexp {object pointer at (\S+)} $rep2 -> obj2
+    list $rep1 $rep2 [string equal $obj1 $obj2]
+    # Internal optimisations should keep the same object
+} -match glob -result {*value is *refcount of 2,*, string rep*value is*refcount of 2,* no string rep* 1}
+
+test lrange-4.4 {lrange pure promise} -body {
+    set ll1 [list $tcl_version 2 3 4]
+    # With string rep
+    string length $ll1
+    set rep1 [tcl::unsupported::representation $ll1]
+    # Get pure object, unshared, not compiled
+    set ll2 [[string cat l range] $ll1[set ll1 {}] 0 end]
+    set rep2 [tcl::unsupported::representation $ll2]
+    regexp {object pointer at (\S+)} $rep1 -> obj1
+    regexp {object pointer at (\S+)} $rep2 -> obj2
+    list $rep1 $rep2 [string equal $obj1 $obj2]
+    # Internal optimisations should keep the same object
+} -match glob -result {*value is *refcount of 2,*, string rep*value is*refcount of 2,* no string rep* 1}
+
+# Testing for compiled vs non-compiled behaviour, and shared vs non-shared.
+# Far too many variations to check with spelt-out tests.
+# Note that this *just* checks whether the different versions are the same
+# not whether any of them is correct.
+apply {{} {
+    set lss     {{} {a} {a b c} {a b c d}}
+    set idxs    {-2 -1 0 1 2 3 end-3 end-2 end-1 end end+1 end+2}
+    set lrange  lrange
+
+    foreach ls $lss {
+	foreach a $idxs {
+	    foreach b $idxs {
+                # Shared, uncompiled
+                set ls2 $ls
+                set expected [list [catch {$lrange $ls $a $b} m] $m]
+                # Shared, compiled
+                set tester [list lrange $ls $a $b]
+                set script [list catch $tester m]
+                set script "list \[$script\] \$m"
+                test lrange-5.[incr n].1 {lrange shared compiled} \
+			[list apply [list {} $script]] $expected
+                # Unshared, uncompiled
+                set tester [string map [list %l [list $ls] %a $a %b $b] {
+                    [string cat l range] [lrange %l 0 end] %a %b
+                }]
+                set script [list catch $tester m]
+                set script "list \[$script\] \$m"
+                test lrange-5.$n.2 {lrange unshared uncompiled} \
+			[list apply [list {} $script]] $expected
+                # Unshared, compiled
+                set tester [string map [list %l [list $ls] %a $a %b $b] {
+                    lrange [lrange %l 0 end] %a %b
+                }]
+                set script [list catch $tester m]
+                set script "list \[$script\] \$m"
+                test lrange-5.$n.3 {lrange unshared compiled} \
+			[list apply [list {} $script]] $expected
+	    }
+	}
+    }
+}}
 
 # cleanup
 ::tcltest::cleanupTests
-- 
cgit v0.12


From 651697f7cd746dded1a031d4217376000a176037 Mon Sep 17 00:00:00 2001
From: pspjuth <peter.spjuth@gmail.com>
Date: Fri, 29 Dec 2017 18:58:01 +0000
Subject: Refactored lrange to common function.

---
 generic/tclCmdIL.c   | 44 +---------------------------
 generic/tclExecute.c | 40 ++------------------------
 generic/tclInt.h     |  2 ++
 generic/tclListObj.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 87 insertions(+), 80 deletions(-)

diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c
index b41d312..001b62d 100644
--- a/generic/tclCmdIL.c
+++ b/generic/tclCmdIL.c
@@ -2543,7 +2543,6 @@ Tcl_LrangeObjCmd(
     register Tcl_Obj *const objv[])
 				/* Argument objects. */
 {
-    Tcl_Obj **elemPtrs;
     int listLen, first, last, result;
 
     if (objc != 4) {
@@ -2561,55 +2560,14 @@ Tcl_LrangeObjCmd(
     if (result != TCL_OK) {
 	return result;
     }
-    if (first < 0) {
-	first = 0;
-    }
 
     result = TclGetIntForIndexM(interp, objv[3], /*endValue*/ listLen - 1,
 	    &last);
     if (result != TCL_OK) {
 	return result;
     }
-    if (last >= listLen) {
-	last = listLen - 1;
-    }
-
-    if (first > last) {
-	/*
-	 * Returning an empty list is easy.
-	 */
-
-	return TCL_OK;
-    }
-
-    result = TclListObjGetElements(interp, objv[1], &listLen, &elemPtrs);
-    if (result != TCL_OK) {
-	return result;
-    }
-
-    if (Tcl_IsShared(objv[1]) ||
-	    ((ListRepPtr(objv[1])->refCount > 1))) {
-	Tcl_SetObjResult(interp, Tcl_NewListObj(last - first + 1,
-		&elemPtrs[first]));
-    } else {
-	/*
-	 * In-place is possible.
-	 */
-
-	if (last < (listLen - 1)) {
-	    Tcl_ListObjReplace(interp, objv[1], last + 1, listLen - 1 - last,
-		    0, NULL);
-	}
-
-	/*
-	 * This one is not conditioned on (first > 0) in order to preserve the
-	 * string-canonizing effect of [lrange 0 end].
-	 */
-
-	Tcl_ListObjReplace(interp, objv[1], 0, first, 0, NULL);
-	Tcl_SetObjResult(interp, objv[1]);
-    }
 
+    Tcl_SetObjResult(interp, TclListObjRange(objv[1], first, last));
     return TCL_OK;
 }
 
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 0f501b9..8568642 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -5087,11 +5087,11 @@ TEBCresume(
 		TclGetInt4AtPtr(pc+5)));
 
 	/*
-	 * Get the contents of the list, making sure that it really is a list
+	 * Get the length of the list, making sure that it really is a list
 	 * in the process.
 	 */
 
-	if (TclListObjGetElements(interp, valuePtr, &objc, &objv) != TCL_OK) {
+	if (TclListObjLength(interp, valuePtr, &objc) != TCL_OK) {
 	    TRACE_ERROR(interp);
 	    goto gotError;
 	}
@@ -5128,41 +5128,7 @@ TEBCresume(
 	    toIdx = objc;
 	}
 
-	/*
-	 * Check if we are referring to a valid, non-empty list range, and if
-	 * so, build the list of elements in that range.
-	 */
-
-	if (fromIdx<=toIdx && fromIdx<objc && toIdx>=0) {
-	    if (fromIdx < 0) {
-		fromIdx = 0;
-	    }
-	    if (toIdx >= objc) {
-		toIdx = objc-1;
-	    }
-
-	    /*
-	     * If we are just removing the beginning or the end from an
-	     * unshared object, Tcl_ListObjReplace is very efficient, and also
-	     * guarantees a pure list.
-	     */
-
-	    if (fromIdx == 0 && toIdx != objc-1 && !Tcl_IsShared(valuePtr)) {
-		Tcl_ListObjReplace(interp, valuePtr,
-			toIdx + 1, LIST_MAX, 0, NULL);
-		TRACE_APPEND(("%.30s\n", O2S(valuePtr)));
-		NEXT_INST_F(9, 0, 0);
-	    }
-	    if (toIdx == objc-1 && !Tcl_IsShared(valuePtr)) {
-		Tcl_ListObjReplace(interp, 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 {
-	    TclNewObj(objResultPtr);
-	}
+	objResultPtr = TclListObjRange(valuePtr, fromIdx, toIdx);
 
 	TRACE_APPEND(("\"%.30s\"", O2S(objResultPtr)));
 	NEXT_INST_F(9, 1, 1);
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 2ba0493..8322095 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -3069,6 +3069,8 @@ MODULE_SCOPE Tcl_Obj *	TclLindexFlat(Tcl_Interp *interp, Tcl_Obj *listPtr,
 MODULE_SCOPE void	TclListLines(Tcl_Obj *listObj, int line, int n,
 			    int *lines, Tcl_Obj *const *elems);
 MODULE_SCOPE Tcl_Obj *	TclListObjCopy(Tcl_Interp *interp, Tcl_Obj *listPtr);
+MODULE_SCOPE Tcl_Obj *	TclListObjRange(Tcl_Obj *listPtr, int fromIdx,
+			    int toIdx);
 MODULE_SCOPE Tcl_Obj *	TclLsetList(Tcl_Interp *interp, Tcl_Obj *listPtr,
 			    Tcl_Obj *indexPtr, Tcl_Obj *valuePtr);
 MODULE_SCOPE Tcl_Obj *	TclLsetFlat(Tcl_Interp *interp, Tcl_Obj *listPtr,
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index 43d90ab..c4dafba 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -423,6 +423,87 @@ TclListObjCopy(
 /*
  *----------------------------------------------------------------------
  *
+ * TclListObjRange --
+ *
+ *	Makes a slice of a list value.
+ *      *listPtr must be known to be a valid list.
+ *
+ * Results:
+ *	Returns a pointer to the sliced list.
+ *      This may be a new object or the same object if not shared.
+ *
+ * Side effects:
+ *	The possible conversion of the object referenced by listPtr
+ *	to a list object.
+ *
+ *----------------------------------------------------------------------
+ */
+
+Tcl_Obj *
+TclListObjRange(
+    Tcl_Obj *listPtr,		/* List object to take a range from. */
+    int fromIdx,		/* Index of first element to include. */
+    int toIdx)			/* Index of last element to include. */
+{
+    Tcl_Obj **elemPtrs;
+    int listLen, i, newLen;
+    List *listRepPtr;
+
+    TclListObjGetElements(NULL, listPtr, &listLen, &elemPtrs);
+
+    if (fromIdx < 0) {
+	fromIdx = 0;
+    }
+    if (toIdx >= listLen) {
+	toIdx = listLen-1;
+    }
+    if (fromIdx > toIdx) {
+	return Tcl_NewObj();
+    }
+
+    newLen = toIdx - fromIdx + 1;
+
+    if (Tcl_IsShared(listPtr) ||
+	    ((ListRepPtr(listPtr)->refCount > 1))) {
+	return Tcl_NewListObj(newLen, &elemPtrs[fromIdx]);
+    }
+
+    /*
+     * In-place is possible.
+     */
+
+    /*
+     * Even if nothing below cause any changes, we still want the
+     * string-canonizing effect of [lrange 0 end].
+     */
+
+    TclInvalidateStringRep(listPtr);
+
+    /*
+     * Delete elements that should not be included.
+     */
+
+    for (i = 0; i < fromIdx; i++) {
+	TclDecrRefCount(elemPtrs[i]);
+    }
+    for (i = toIdx + 1; i < listLen; i++) {
+	TclDecrRefCount(elemPtrs[i]);
+    }
+
+    if (fromIdx > 0) {
+	memmove(elemPtrs, &elemPtrs[fromIdx],
+		(size_t) newLen * sizeof(Tcl_Obj*));
+    }
+
+    listRepPtr = ListRepPtr(listPtr);
+    listRepPtr->elemCount = newLen;
+
+    return listPtr;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
  * Tcl_ListObjGetElements --
  *
  *	This function returns an (objc,objv) array of the elements in a list
-- 
cgit v0.12


From 04d3db559246ee9e2ac2a5e20e52cf57b7af808b Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 10 Jan 2018 09:32:51 +0000
Subject: Don't use TclUtfToUniChar here: it doesn't give any advantage over
 Tcl_UtfToUniChar

---
 generic/tclUtil.c  | 4 ++--
 win/tclWinSerial.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index 41795e8..15018de 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -2223,7 +2223,7 @@ Tcl_StringCaseMatch(
 			(nocase ? tolower(UCHAR(*str)) : UCHAR(*str));
 		str++;
 	    } else {
-		str += TclUtfToUniChar(str, &ch1);
+		str += Tcl_UtfToUniChar(str, &ch1);
 		if (nocase) {
 		    ch1 = Tcl_UniCharToLower(ch1);
 		}
@@ -2252,7 +2252,7 @@ Tcl_StringCaseMatch(
 				? tolower(UCHAR(*pattern)) : UCHAR(*pattern));
 			pattern++;
 		    } else {
-			pattern += TclUtfToUniChar(pattern, &endChar);
+			pattern += Tcl_UtfToUniChar(pattern, &endChar);
 			if (nocase) {
 			    endChar = Tcl_UniCharToLower(endChar);
 			}
diff --git a/win/tclWinSerial.c b/win/tclWinSerial.c
index 894f431..acfeecb 100644
--- a/win/tclWinSerial.c
+++ b/win/tclWinSerial.c
@@ -1741,12 +1741,12 @@ SerialSetOptionProc(
 	    Tcl_UniChar character = 0;
 	    int charLen;
 
-	    charLen = TclUtfToUniChar(argv[0], &character);
+	    charLen = Tcl_UtfToUniChar(argv[0], &character);
 	    if (argv[0][charLen]) {
 		goto badXchar;
 	    }
 	    dcb.XonChar = (char) character;
-	    charLen = TclUtfToUniChar(argv[1], &character);
+	    charLen = Tcl_UtfToUniChar(argv[1], &character);
 	    if (argv[1][charLen]) {
 		goto badXchar;
 	    }
-- 
cgit v0.12


From eb3422673ff62a7427f2e6d166840fce68237d74 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 11 Jan 2018 14:11:38 +0000
Subject: Add test-cases for bug [11ae2be95dac9417], and make a start fixing
 it. Almost works.

---
 generic/tclCmdMZ.c     | 12 ++++++++++--
 generic/tclStringObj.c | 33 +++++++++++++++++++++++++++++++--
 tests/string.test      |  7 +++++++
 3 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index a206cc5..a23f007 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -1435,7 +1435,7 @@ StringIndexCmd(
     }
 
     /*
-     * Get the char length to calulate what 'end' means.
+     * Get the char length to calculate what 'end' means.
      */
 
     length = Tcl_GetCharLength(objv[1]);
@@ -1444,7 +1444,15 @@ StringIndexCmd(
     }
 
     if ((index >= 0) && (index < length)) {
-	Tcl_UniChar ch = Tcl_GetUniChar(objv[1], index);
+	int ch = Tcl_GetUniChar(objv[1], index);
+
+	if (ch >= 0x10000) {
+	    printf("HI: %x\n", ch);
+	}
+	if (ch == -1) {
+	    printf("LO: %x\n", ch);
+	    return TCL_OK;
+	}
 
 	/*
 	 * If we have a ByteArray object, we're careful to generate a new
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 01f8d80..aa5aba3 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -460,7 +460,8 @@ Tcl_GetCharLength(
  * Tcl_GetUniChar --
  *
  *	Get the index'th Unicode character from the String object. The index
- *	is assumed to be in the appropriate range.
+ *	is assumed to be in the appropriate range. If index references a lower
+ *	surrogate preceded by a higher surrogate, the result = -1;
  *
  * Results:
  *	Returns the index'th Unicode character in the Object.
@@ -478,6 +479,7 @@ Tcl_GetUniChar(
     int index)			/* Get the index'th Unicode character. */
 {
     String *stringPtr;
+    int ch;
 
     /*
      * Optimize the case where we're really dealing with a bytearray object
@@ -512,7 +514,23 @@ Tcl_GetUniChar(
 	FillUnicodeRep(objPtr);
 	stringPtr = GET_STRING(objPtr);
     }
-    return (int) stringPtr->unicode[index];
+
+	ch = stringPtr->unicode[index];
+#if TCL_UTF_MAX == 4
+	/* See: bug [11ae2be95dac9417] */
+	if ((ch&0xF800) == 0xD800) {
+	    if (ch&0x400) {
+		if ((index > 0) && ((stringPtr->unicode[index-1]&0xFC00) == 0xD800)) {
+		    ch = -1; /* low surrogate preceded by high surrogate */
+		}
+	    } else if ((++index < stringPtr->numChars)
+		    && ((stringPtr->unicode[index]&0xFC00) == 0xDC00)) {
+		/* high surrogate followed by low surrogate */
+		ch = (((ch & 0x3FF) << 10) | (stringPtr->unicode[index] & 0x3FF)) + 0x10000;
+	    }
+	}
+#endif
+    return ch;
 }
 
 /*
@@ -656,6 +674,17 @@ Tcl_GetRange(
 	stringPtr = GET_STRING(objPtr);
     }
 
+#if TCL_UTF_MAX == 4
+	/* See: bug [11ae2be95dac9417] */
+	if ((first>0) && ((stringPtr->unicode[first]&0xFC00) == 0xDC00)
+		&& ((stringPtr->unicode[first-1]&0xFC00) == 0xD800)) {
+	    ++first;
+	}
+	if ((last+1<stringPtr->numChars) && ((stringPtr->unicode[last+1]&0xFC00) == 0xDC00)
+		&& ((stringPtr->unicode[last]&0xFC00) == 0xD800)) {
+	    ++last;
+	}
+#endif
     return Tcl_NewUnicodeObj(stringPtr->unicode + first, last-first+1);
 }
 
diff --git a/tests/string.test b/tests/string.test
index cebaf4c..58328bb 100644
--- a/tests/string.test
+++ b/tests/string.test
@@ -24,6 +24,7 @@ catch [list package require -exact Tcltest [info patchlevel]]
 
 testConstraint testobj [expr {[info commands testobj] != {}}]
 testConstraint testindexobj [expr {[info commands testindexobj] != {}}]
+testConstraint fullutf [expr {[format %c 0x010000] != "\ufffd"}]
 
 # Used for constraining memory leak tests
 testConstraint memory [llength [info commands memory]]
@@ -302,6 +303,9 @@ test string-5.19 {string index, bytearray object out of bounds} {
 test string-5.20 {string index, bytearray object out of bounds} {
     string index [binary format I* {0x50515253 0x52}] 20
 } {}
+test string-5.21 {string index, surrogates, bug [11ae2be95dac9417]} fullutf {
+    list [string index a\U100000b 1] [string index a\U100000b 2] [string index a\U100000b 3]
+} [list \U100000 {} b]
 
 
 proc largest_int {} {
@@ -1288,6 +1292,9 @@ test string-12.22 {string range, shimmering binary/index} {
     binary scan $s a* x
     string range $s $s end
 } 000000001
+test string-12.23 {string range, surrogates, bug [11ae2be95dac9417]} fullutf {
+    list [string range a\U100000b 1 1] [string range a\U100000b 2 2] [string range a\U100000b 3 3]
+} [list \U100000 {} b]
 
 test string-13.1 {string repeat} {
     list [catch {string repeat} msg] $msg
-- 
cgit v0.12


From c8219a9a2995c5658cd709f4bb7b5b933e6575e9 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 12 Jan 2018 10:03:58 +0000
Subject: Fix [11ae2be95d]: tip-389 branch: string range errors with code
 points greater than U+FFFF

---
 generic/tclExecute.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index f2cda0c..63281a8 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -5445,7 +5445,7 @@ TEBCresume(
 		    valuePtr->bytes+index, 1);
 	} else {
 	    char buf[TCL_UTF_MAX];
-	    Tcl_UniChar ch = Tcl_GetUniChar(valuePtr, index);
+	    int ch = Tcl_GetUniChar(valuePtr, index);
 
 	    /*
 	     * This could be: Tcl_NewUnicodeObj((const Tcl_UniChar *)&ch, 1)
@@ -5453,7 +5453,7 @@ TEBCresume(
 	     * practical use.
 	     */
 
-	    length = Tcl_UniCharToUtf(ch, buf);
+	    length = (ch != -1) ? Tcl_UniCharToUtf(ch, buf) : 0;
 	    objResultPtr = Tcl_NewStringObj(buf, length);
 	}
 
-- 
cgit v0.12


From 80c3bfdcaa069911ed98d7400fe426bc84ae8a56 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Mon, 5 Mar 2018 19:29:12 +0000
Subject: Last bit of TIP 503 implementation.

---
 generic/tcl.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index 0d6549f..a3684c3 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -269,8 +269,6 @@ extern "C" {
 #ifndef CONST
 #   define CONST const
 #endif
-#define CONST84 const
-#define CONST84_RETURN const
 
 #endif /* !TCL_NO_DEPRECATED */
 
-- 
cgit v0.12


From 77d58c599368d5ecbe0803d79023efe7cd2f24bc Mon Sep 17 00:00:00 2001
From: bll <brad.lanam.comp@gmail.com>
Date: Tue, 6 Mar 2018 17:19:40 +0000
Subject: tip-421: array for:   a) Fix bug starting search (name not set).   b)
 Fix error message for array change on iteration.

---
 generic/tclVar.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/generic/tclVar.c b/generic/tclVar.c
index da9fb23..c5df6c8 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -3074,6 +3074,8 @@ ArrayObjFirst(
     Tcl_HashEntry   *hPtr;
     int             isNew;
 
+    /* this code is duplicated from arraystartsearchcmd,
+       excepting that arrayNameObj is set */
     searchPtr->varPtr = varPtr;
     searchPtr->arrayNameObj = arrayNameObj;
 
@@ -3090,6 +3092,7 @@ ArrayObjFirst(
     searchPtr->nextEntry = VarHashFirstEntry(varPtr->value.tablePtr,
 	    &searchPtr->search);
     Tcl_SetHashValue(hPtr, searchPtr);
+    searchPtr->name = Tcl_ObjPrintf("s-%d-%s", searchPtr->id, TclGetString(arrayNameObj));
 }
 
 int
@@ -3307,8 +3310,10 @@ ArrayForLoopCallback(
     if (done != TCL_CONTINUE) {
 	Tcl_ResetResult(interp);
         if (done == TCL_ERROR) {
-          varPtr->flags |= TCL_LEAVE_ERR_MSG;
-          Tcl_AddErrorInfo(interp, "array changed during iteration");
+	  Tcl_SetObjResult(interp, Tcl_NewStringObj(
+	      "array changed during iteration", -1));
+	  Tcl_SetErrorCode(interp, "TCL", "READ", "array", "for", NULL);
+	  varPtr->flags |= TCL_LEAVE_ERR_MSG;
           result = done;
         }
 	goto arrayfordone;
-- 
cgit v0.12


From d2d193de11dddfa68c52223bfee22fc1c7e9de3c Mon Sep 17 00:00:00 2001
From: bll <brad.lanam.comp@gmail.com>
Date: Tue, 6 Mar 2018 18:21:34 +0000
Subject: array for: updated documentation: value variable is not optional, add
 specifics about when array for terminates.

---
 doc/array.n | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/array.n b/doc/array.n
index 751c688..d6d4dff 100644
--- a/doc/array.n
+++ b/doc/array.n
@@ -47,12 +47,14 @@ been the return value from a previous invocation of
 Returns 1 if \fIarrayName\fR is an array variable, 0 if there
 is no variable by that name or if it is a scalar variable.
 .TP
-\fBarray for {\fIkeyVariable ?valueVariable?\fB} \fIarrayName body\fR
-The first argument is a one or two element list of variable names for the
+\fBarray for {\fIkeyVariable valueVariable\fB} \fIarrayName body\fP
+The first argument is a two element list of variable names for the
 key and value of each entry in the array.  The second argument is the
 array name to iterate over.  The third argument is the body to execute
 for each key and value returned.
 The ordering of the returned keys is undefined.
+If an array element is deleted or a new array element is inserted during
+the \fIarray for\fP process, the command will terminate with an error.
 .TP
 \fBarray get \fIarrayName\fR ?\fIpattern\fR?
 Returns a list containing pairs of elements.  The first
-- 
cgit v0.12


From a735b5d3acb8dadac8bfec4f9b06cb2b1063db2d Mon Sep 17 00:00:00 2001
From: bll <brad.lanam.comp@gmail.com>
Date: Tue, 6 Mar 2018 18:42:25 +0000
Subject: array for:   Add missing ObjCmdProc wrapper around the NR proc.

---
 generic/tclVar.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/generic/tclVar.c b/generic/tclVar.c
index c5df6c8..8986fdd 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -177,6 +177,7 @@ static void		AppendLocals(Tcl_Interp *interp, Tcl_Obj *listPtr,
 			    Tcl_Obj *patternPtr, int includeLinks);
 static void             ArrayDoneSearch (Interp *iPtr, Var *varPtr, ArraySearch *searchPtr);
 static Tcl_NRPostProc   ArrayForLoopCallback;
+static int              ArrayForNRCmd(ClientData dummy, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv);
 static void		DeleteSearches(Interp *iPtr, Var *arrayVarPtr);
 static void		DeleteArray(Interp *iPtr, Tcl_Obj *arrayNamePtr,
 			    Var *varPtr, int flags, int index);
@@ -3039,6 +3040,7 @@ TclArraySet(
 /*
  *----------------------------------------------------------------------
  *
+ * ArrayForObjCmd
  * ArrayForNRCmd
  * ArrayForLoopCallback
  * ArrayObjFirst
@@ -3049,6 +3051,8 @@ TclArraySet(
  *  The array for command iterates over the array, setting the
  *  the specified loop variables, and executing the body each iteration.
  *
+ *  ArrayForObjCmd() is the standard wrapper around ArrayForNRCmd().
+ *
  *  ArrayForNRCmd() sets up the ArraySearch structure, sets arrayNamePtr
  *  inside the structure and calls VarHashFirstEntry to start the hash
  *  iteration.
@@ -3152,6 +3156,16 @@ ArrayObjNext(
     return donerc;
 }
 
+int
+ArrayForObjCmd(
+    ClientData dummy,		/* Not used. */
+    Tcl_Interp *interp,		/* Current interpreter. */
+    int objc,			/* Number of arguments. */
+    Tcl_Obj *const objv[])	/* Argument objects. */
+{
+    return Tcl_NRCallObjProc(interp, ArrayForNRCmd, dummy, objc, objv);
+}
+
 static int
 ArrayForNRCmd(
     ClientData dummy,
@@ -4577,7 +4591,7 @@ TclInitArrayCmd(
 	{"anymore",	ArrayAnyMoreCmd,	TclCompileBasic2ArgCmd, NULL, NULL, 0},
 	{"donesearch",	ArrayDoneSearchCmd,	TclCompileBasic2ArgCmd, NULL, NULL, 0},
 	{"exists",	ArrayExistsCmd,		TclCompileArrayExistsCmd, NULL, NULL, 0},
-	{"for",		NULL,			TclCompileBasic3ArgCmd, ArrayForNRCmd, NULL, 0},
+	{"for",		ArrayForObjCmd,		TclCompileBasic3ArgCmd, ArrayForNRCmd, NULL, 0},
 	{"get",		ArrayGetCmd,		TclCompileBasic1Or2ArgCmd, NULL, NULL, 0},
 	{"names",	ArrayNamesCmd,		TclCompileBasic1To3ArgCmd, NULL, NULL, 0},
 	{"nextelement",	ArrayNextElementCmd,	TclCompileBasic2ArgCmd, NULL, NULL, 0},
-- 
cgit v0.12


From df06afadcfb949909d6a640b77fe234e266dc848 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 15 Mar 2018 20:58:00 +0000
Subject: Bring back makefile.vc to CRLF line-endings, as all other *.vc files

---
 win/makefile.vc | 1890 +++++++++++++++++++++++++++----------------------------
 1 file changed, 945 insertions(+), 945 deletions(-)

diff --git a/win/makefile.vc b/win/makefile.vc
index 7ed4c63..918c6b7 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -1,945 +1,945 @@
-#------------------------------------------------------------- -*- makefile -*-
-#
-#	Microsoft Visual C++ makefile for building Tcl with nmake
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# Copyright (c) 1995-1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-2000 Ajuba Solutions.
-# Copyright (c) 2001-2005 ActiveState Corporation.
-# Copyright (c) 2001-2004 David Gravereaux.
-# Copyright (c) 2003-2008 Pat Thoyts.
-# Copyright (c) 2017 Ashok P. Nadkarni
-#------------------------------------------------------------------------------
-
-# General usage:
-#   nmake [-nologo] -f makefile.vc [TARGET|MACRODEF [TARGET|MACRODEF] [...]]
-#
-# For MACRODEF, see TIP 477 (https://core.tcl.tk/tips/doc/trunk/tip/477.md)
-# or examine Sections 6-8 in rules.vc.
-#
-# Possible values of TARGET are:
-#	release  -- Builds the core, the shell and the dlls. (default)
-#	dlls     -- Just builds the windows extensions
-#	shell    -- Just builds the shell and the core.
-#	core     -- Only builds the core [tclXX.(dll|lib)].
-#	all      -- Builds everything.
-#	test     -- Builds and runs the test suite.
-#	tcltest  -- Just builds the test shell.
-#	install  -- Installs the built binaries and libraries to $(INSTALLDIR)
-#		    as the root of the install tree.
-#	tidy/clean/hose -- varying levels of cleaning.
-#	genstubs -- Rebuilds the Stubs table and support files (dev only).
-#	depend   -- Generates an accurate set of source dependancies for this
-#		    makefile.  Helpful to avoid problems when the sources are
-#		    refreshed and you rebuild, but can "overbuild" when common
-#		    headers like tclInt.h just get small changes.
-#	htmlhelp -- Builds a Windows .chm help file for Tcl and Tk from the
-#		    troff manual pages found in $(ROOT)\doc. You need to
-#		    have installed the HTML Help Compiler package from Microsoft
-#		    to produce the .chm file.
-#
-# The steps to setup a Visual C++ environment depend on which
-# version of Visual Studio and/or the Windows SDK you are building
-# against and are not described here. The simplest method is generally
-# to start a command shell using one of the short cuts installed by
-# Visual Studio/Windows SDK for the appropriate target architecture.
-#
-# NOTE: For older (Visual C++ 6 or the 2003 SDK), to use the Platform
-# SDK (not expressly needed), run setenv.bat after
-# vcvars32.bat according to the instructions for it.  This can also
-# turn on the 64-bit compiler, if your SDK has it.
-#
-# Examples:
-#       c:\tcl_src\win\>nmake -f makefile.vc release
-#       c:\tcl_src\win\>nmake -f makefile.vc test
-#       c:\tcl_src\win\>nmake -f makefile.vc install INSTALLDIR=c:\progra~1\tcl
-#       c:\tcl_src\win\>nmake -f makefile.vc release OPTS=pdbs 
-#       c:\tcl_src\win\>nmake -f makefile.vc release OPTS=symbols
-#
-
-# NOTE:
-# Before modifying this file, check whether the modification is applicable
-# to building extensions as well and if so, modify rules.vc instead.
-
-# The PROJECT macro is used by rules.vc for generating appropriate
-# macros and rules.
-PROJECT = tcl
-
-# Default target to build if no target is specified. If unspecified, the
-# rules.vc file will set up "all" as the target.
-DEFAULT_BUILD_TARGET = release
-
-# We want to use our own resource file, not the standard template one.
-RCFILE = tcl.rc
-
-# The rules.vc file does most of the hard work in terms of defining
-# the build configuration, macros, output directories etc.
-!include "rules.vc"
-
-# Tcl version info based on macros set up by rules.vc
-DOTVERSION      = $(TCL_MAJOR_VERSION).$(TCL_MINOR_VERSION)
-VERSION         = $(TCL_MAJOR_VERSION)$(TCL_MINOR_VERSION)
-
-# We need versions of various core packages to generate appropriate
-# file names during installation.
-!if [echo REM = This file is generated from makefile.vc > versions.vc]
-!endif
-!if [echo PKG_HTTP_VER = \>> versions.vc] \
-   && [nmakehlp -V ..\library\http\pkgIndex.tcl http >> versions.vc]
-!endif
-!if [echo PKG_TCLTEST_VER = \>> versions.vc] \
-   && [nmakehlp -V ..\library\tcltest\pkgIndex.tcl tcltest >> versions.vc]
-!endif
-!if [echo PKG_MSGCAT_VER = \>> versions.vc] \
-   && [nmakehlp -V ..\library\msgcat\pkgIndex.tcl msgcat >> versions.vc]
-!endif
-!if [echo PKG_PLATFORM_VER = \>> versions.vc] \
-   && [nmakehlp -V ..\library\platform\pkgIndex.tcl "platform " >> versions.vc]
-!endif
-!if [echo PKG_SHELL_VER = \>> versions.vc] \
-   && [nmakehlp -V ..\library\platform\pkgIndex.tcl "platform::shell" >> versions.vc]
-!endif
-!if [echo PKG_DDE_VER = \>> versions.vc] \
-   && [nmakehlp -V ..\library\dde\pkgIndex.tcl "dde " >> versions.vc]
-!endif
-!if [echo PKG_REG_VER =\>> versions.vc] \
-   && [nmakehlp -V ..\library\reg\pkgIndex.tcl registry >> versions.vc]
-!endif
-
-!include versions.vc
-
-DDEDOTVERSION = 1.4
-DDEVERSION = $(DDEDOTVERSION:.=)
-
-REGDOTVERSION = 1.3
-REGVERSION = $(REGDOTVERSION:.=)
-
-TCLREGLIBNAME	= $(PROJECT)reg$(REGVERSION)$(SUFX:t=).$(EXT)
-TCLREGLIB	= $(OUT_DIR)\$(TCLREGLIBNAME)
-
-TCLDDELIBNAME	= $(PROJECT)dde$(DDEVERSION)$(SUFX:t=).$(EXT)
-TCLDDELIB	= $(OUT_DIR)\$(TCLDDELIBNAME)
-
-TCLTEST		= $(OUT_DIR)\$(PROJECT)test.exe
-CAT32		= $(OUT_DIR)\cat32.exe
-
-TCLSHOBJS = \
-	$(TMP_DIR)\tclAppInit.obj \
-!if !$(STATIC_BUILD)
-!if $(TCL_USE_STATIC_PACKAGES)
-	$(TMP_DIR)\tclWinReg.obj \
-	$(TMP_DIR)\tclWinDde.obj \
-!endif
-!endif
-	$(TMP_DIR)\tclsh.res
-
-TCLTESTOBJS = \
-	$(TMP_DIR)\tclTest.obj \
-	$(TMP_DIR)\tclTestObj.obj \
-	$(TMP_DIR)\tclTestProcBodyObj.obj \
-	$(TMP_DIR)\tclThreadTest.obj \
-	$(TMP_DIR)\tclWinTest.obj \
-!if !$(STATIC_BUILD)
-!if $(TCL_USE_STATIC_PACKAGES)
-	$(TMP_DIR)\tclWinReg.obj \
-	$(TMP_DIR)\tclWinDde.obj \
-!endif
-!endif
-	$(TMP_DIR)\testMain.obj
-
-COREOBJS = \
-	$(TMP_DIR)\regcomp.obj \
-	$(TMP_DIR)\regerror.obj \
-	$(TMP_DIR)\regexec.obj \
-	$(TMP_DIR)\regfree.obj \
-	$(TMP_DIR)\tclAlloc.obj \
-	$(TMP_DIR)\tclAssembly.obj \
-	$(TMP_DIR)\tclAsync.obj \
-	$(TMP_DIR)\tclBasic.obj \
-	$(TMP_DIR)\tclBinary.obj \
-	$(TMP_DIR)\tclCkalloc.obj \
-	$(TMP_DIR)\tclClock.obj \
-	$(TMP_DIR)\tclCmdAH.obj \
-	$(TMP_DIR)\tclCmdIL.obj \
-	$(TMP_DIR)\tclCmdMZ.obj \
-	$(TMP_DIR)\tclCompCmds.obj \
-	$(TMP_DIR)\tclCompCmdsGR.obj \
-	$(TMP_DIR)\tclCompCmdsSZ.obj \
-	$(TMP_DIR)\tclCompExpr.obj \
-	$(TMP_DIR)\tclCompile.obj \
-	$(TMP_DIR)\tclConfig.obj \
-	$(TMP_DIR)\tclDate.obj \
-	$(TMP_DIR)\tclDictObj.obj \
-	$(TMP_DIR)\tclDisassemble.obj \
-	$(TMP_DIR)\tclEncoding.obj \
-	$(TMP_DIR)\tclEnsemble.obj \
-	$(TMP_DIR)\tclEnv.obj \
-	$(TMP_DIR)\tclEvent.obj \
-	$(TMP_DIR)\tclExecute.obj \
-	$(TMP_DIR)\tclFCmd.obj \
-	$(TMP_DIR)\tclFileName.obj \
-	$(TMP_DIR)\tclGet.obj \
-	$(TMP_DIR)\tclHash.obj \
-	$(TMP_DIR)\tclHistory.obj \
-	$(TMP_DIR)\tclIndexObj.obj \
-	$(TMP_DIR)\tclInterp.obj \
-	$(TMP_DIR)\tclIO.obj \
-	$(TMP_DIR)\tclIOCmd.obj \
-	$(TMP_DIR)\tclIOGT.obj \
-	$(TMP_DIR)\tclIOSock.obj \
-	$(TMP_DIR)\tclIOUtil.obj \
-	$(TMP_DIR)\tclIORChan.obj \
-	$(TMP_DIR)\tclIORTrans.obj \
-	$(TMP_DIR)\tclLink.obj \
-	$(TMP_DIR)\tclListObj.obj \
-	$(TMP_DIR)\tclLiteral.obj \
-	$(TMP_DIR)\tclLoad.obj \
-	$(TMP_DIR)\tclMain.obj \
-	$(TMP_DIR)\tclMain2.obj \
-	$(TMP_DIR)\tclNamesp.obj \
-	$(TMP_DIR)\tclNotify.obj \
-	$(TMP_DIR)\tclOO.obj \
-	$(TMP_DIR)\tclOOBasic.obj \
-	$(TMP_DIR)\tclOOCall.obj \
-	$(TMP_DIR)\tclOODefineCmds.obj \
-	$(TMP_DIR)\tclOOInfo.obj \
-	$(TMP_DIR)\tclOOMethod.obj \
-	$(TMP_DIR)\tclOOStubInit.obj \
-	$(TMP_DIR)\tclObj.obj \
-	$(TMP_DIR)\tclOptimize.obj \
-	$(TMP_DIR)\tclPanic.obj \
-	$(TMP_DIR)\tclParse.obj \
-	$(TMP_DIR)\tclPathObj.obj \
-	$(TMP_DIR)\tclPipe.obj \
-	$(TMP_DIR)\tclPkg.obj \
-	$(TMP_DIR)\tclPkgConfig.obj \
-	$(TMP_DIR)\tclPosixStr.obj \
-	$(TMP_DIR)\tclPreserve.obj \
-	$(TMP_DIR)\tclProc.obj \
-	$(TMP_DIR)\tclProcess.obj \
-	$(TMP_DIR)\tclRegexp.obj \
-	$(TMP_DIR)\tclResolve.obj \
-	$(TMP_DIR)\tclResult.obj \
-	$(TMP_DIR)\tclScan.obj \
-	$(TMP_DIR)\tclStringObj.obj \
-	$(TMP_DIR)\tclStrToD.obj \
-	$(TMP_DIR)\tclStubInit.obj \
-	$(TMP_DIR)\tclThread.obj \
-	$(TMP_DIR)\tclThreadAlloc.obj \
-	$(TMP_DIR)\tclThreadJoin.obj \
-	$(TMP_DIR)\tclThreadStorage.obj \
-	$(TMP_DIR)\tclTimer.obj \
-	$(TMP_DIR)\tclTomMathInterface.obj \
-	$(TMP_DIR)\tclTrace.obj \
-	$(TMP_DIR)\tclUtf.obj \
-	$(TMP_DIR)\tclUtil.obj \
-	$(TMP_DIR)\tclVar.obj \
-	$(TMP_DIR)\tclZlib.obj
-
-ZLIBOBJS = \
-	$(TMP_DIR)\adler32.obj \
-	$(TMP_DIR)\compress.obj \
-	$(TMP_DIR)\crc32.obj \
-	$(TMP_DIR)\deflate.obj \
-	$(TMP_DIR)\infback.obj \
-	$(TMP_DIR)\inffast.obj \
-	$(TMP_DIR)\inflate.obj \
-	$(TMP_DIR)\inftrees.obj \
-	$(TMP_DIR)\trees.obj \
-	$(TMP_DIR)\uncompr.obj \
-	$(TMP_DIR)\zutil.obj
-
-TOMMATHOBJS = \
-	$(TMP_DIR)\bncore.obj \
-	$(TMP_DIR)\bn_reverse.obj \
-	$(TMP_DIR)\bn_fast_s_mp_mul_digs.obj \
-	$(TMP_DIR)\bn_fast_s_mp_sqr.obj \
-	$(TMP_DIR)\bn_mp_add.obj \
-	$(TMP_DIR)\bn_mp_add_d.obj \
-	$(TMP_DIR)\bn_mp_and.obj \
-	$(TMP_DIR)\bn_mp_clamp.obj \
-	$(TMP_DIR)\bn_mp_clear.obj \
-	$(TMP_DIR)\bn_mp_clear_multi.obj \
-	$(TMP_DIR)\bn_mp_cmp.obj \
-	$(TMP_DIR)\bn_mp_cmp_d.obj \
-	$(TMP_DIR)\bn_mp_cmp_mag.obj \
-	$(TMP_DIR)\bn_mp_cnt_lsb.obj \
-	$(TMP_DIR)\bn_mp_copy.obj \
-	$(TMP_DIR)\bn_mp_count_bits.obj \
-	$(TMP_DIR)\bn_mp_div.obj \
-	$(TMP_DIR)\bn_mp_div_d.obj \
-	$(TMP_DIR)\bn_mp_div_2.obj \
-	$(TMP_DIR)\bn_mp_div_2d.obj \
-	$(TMP_DIR)\bn_mp_div_3.obj \
-	$(TMP_DIR)\bn_mp_exch.obj \
-	$(TMP_DIR)\bn_mp_expt_d.obj \
-	$(TMP_DIR)\bn_mp_expt_d_ex.obj \
-	$(TMP_DIR)\bn_mp_get_int.obj \
-	$(TMP_DIR)\bn_mp_get_long.obj \
-	$(TMP_DIR)\bn_mp_get_long_long.obj \
-	$(TMP_DIR)\bn_mp_grow.obj \
-	$(TMP_DIR)\bn_mp_init.obj \
-	$(TMP_DIR)\bn_mp_init_copy.obj \
-	$(TMP_DIR)\bn_mp_init_multi.obj \
-	$(TMP_DIR)\bn_mp_init_set.obj \
-	$(TMP_DIR)\bn_mp_init_set_int.obj \
-	$(TMP_DIR)\bn_mp_init_size.obj \
-	$(TMP_DIR)\bn_mp_karatsuba_mul.obj \
-	$(TMP_DIR)\bn_mp_karatsuba_sqr.obj \
-	$(TMP_DIR)\bn_mp_lshd.obj \
-	$(TMP_DIR)\bn_mp_mod.obj \
-	$(TMP_DIR)\bn_mp_mod_2d.obj \
-	$(TMP_DIR)\bn_mp_mul.obj \
-	$(TMP_DIR)\bn_mp_mul_2.obj \
-	$(TMP_DIR)\bn_mp_mul_2d.obj \
-	$(TMP_DIR)\bn_mp_mul_d.obj \
-	$(TMP_DIR)\bn_mp_neg.obj \
-	$(TMP_DIR)\bn_mp_or.obj \
-	$(TMP_DIR)\bn_mp_radix_size.obj \
-	$(TMP_DIR)\bn_mp_radix_smap.obj \
-	$(TMP_DIR)\bn_mp_read_radix.obj \
-	$(TMP_DIR)\bn_mp_rshd.obj \
-	$(TMP_DIR)\bn_mp_set.obj \
-	$(TMP_DIR)\bn_mp_set_int.obj \
-	$(TMP_DIR)\bn_mp_set_long.obj \
-	$(TMP_DIR)\bn_mp_set_long_long.obj \
-	$(TMP_DIR)\bn_mp_shrink.obj \
-	$(TMP_DIR)\bn_mp_sqr.obj \
-	$(TMP_DIR)\bn_mp_sqrt.obj \
-	$(TMP_DIR)\bn_mp_sub.obj \
-	$(TMP_DIR)\bn_mp_sub_d.obj \
-	$(TMP_DIR)\bn_mp_to_unsigned_bin.obj \
-	$(TMP_DIR)\bn_mp_to_unsigned_bin_n.obj \
-	$(TMP_DIR)\bn_mp_toom_mul.obj \
-	$(TMP_DIR)\bn_mp_toom_sqr.obj \
-	$(TMP_DIR)\bn_mp_toradix_n.obj \
-	$(TMP_DIR)\bn_mp_unsigned_bin_size.obj \
-	$(TMP_DIR)\bn_mp_xor.obj \
-	$(TMP_DIR)\bn_mp_zero.obj \
-	$(TMP_DIR)\bn_s_mp_add.obj \
-	$(TMP_DIR)\bn_s_mp_mul_digs.obj \
-	$(TMP_DIR)\bn_s_mp_sqr.obj \
-	$(TMP_DIR)\bn_s_mp_sub.obj
-
-PLATFORMOBJS = \
-	$(TMP_DIR)\tclWin32Dll.obj \
-	$(TMP_DIR)\tclWinChan.obj \
-	$(TMP_DIR)\tclWinConsole.obj \
-	$(TMP_DIR)\tclWinError.obj \
-	$(TMP_DIR)\tclWinFCmd.obj \
-	$(TMP_DIR)\tclWinFile.obj \
-	$(TMP_DIR)\tclWinInit.obj \
-	$(TMP_DIR)\tclWinLoad.obj \
-	$(TMP_DIR)\tclWinNotify.obj \
-	$(TMP_DIR)\tclWinPipe.obj \
-	$(TMP_DIR)\tclWinSerial.obj \
-	$(TMP_DIR)\tclWinSock.obj \
-	$(TMP_DIR)\tclWinThrd.obj \
-	$(TMP_DIR)\tclWinTime.obj \
-!if $(STATIC_BUILD)
-	$(TMP_DIR)\tclWinReg.obj \
-	$(TMP_DIR)\tclWinDde.obj \
-!else
-	$(TMP_DIR)\tcl.res
-!endif
-
-TCLOBJS = $(COREOBJS) $(ZLIBOBJS) $(TOMMATHOBJS) $(PLATFORMOBJS)
-
-TCLSTUBOBJS = \
-	$(TMP_DIR)\tclStubLib.obj \
-	$(TMP_DIR)\tclTomMathStubLib.obj \
-	$(TMP_DIR)\tclOOStubLib.obj
-
-### The following paths CANNOT have spaces in them as they appear on
-### the left side of implicit rules.
-TOMMATHDIR	= $(ROOT)\libtommath
-PKGSDIR		= $(ROOT)\pkgs
-
-# Additional include and C macro definitions for the implicit rules
-# defined in rules.vc
-PRJ_INCLUDES	= -I"$(TOMMATHDIR)"
-PRJ_DEFINES	= -DTCL_TOMMATH -DMP_PREC=4 -Dinline=__inline -DHAVE_ZLIB=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
-
-# Additional Link libraries needed beyond those in rules.vc
-PRJ_LIBS   = netapi32.lib user32.lib userenv.lib ws2_32.lib
-
-#---------------------------------------------------------------------
-# TclTest flags
-#---------------------------------------------------------------------
-
-!if "$(TESTPAT)" != ""
-TESTFLAGS = $(TESTFLAGS) -file $(TESTPAT)
-!endif
-
-
-#---------------------------------------------------------------------
-# Project specific targets
-#---------------------------------------------------------------------
-
-release:    setup $(TCLSH) $(TCLSTUBLIB) dlls pkgs
-core:	    setup $(TCLLIB) $(TCLSTUBLIB)
-shell:	    setup $(TCLSH)
-dlls:	    setup $(TCLREGLIB) $(TCLDDELIB)
-all:	    setup $(TCLSH) $(TCLSTUBLIB) dlls $(CAT32) pkgs
-tcltest:    setup $(TCLTEST) dlls $(CAT32)
-install:    install-binaries install-libraries install-docs install-pkgs
-setup:      default-setup
-
-test: test-core test-pkgs
-test-core: setup $(TCLTEST) dlls $(CAT32)
-	set TCL_LIBRARY=$(ROOT:\=/)/library
-	$(DEBUGGER) $(TCLTEST) "$(ROOT:\=/)/tests/all.tcl" $(TESTFLAGS) -loadfile <<
-		package ifneeded dde 1.4.0 [list load "$(TCLDDELIB:\=/)" dde]
-		package ifneeded registry 1.3.2 [list load "$(TCLREGLIB:\=/)" registry]
-<<
-
-runtest: setup $(TCLTEST) dlls $(CAT32)
-	set TCL_LIBRARY=$(ROOT:\=/)/library
-	$(DEBUGGER) $(TCLTEST) $(SCRIPT)
-
-runshell: setup $(TCLSH) dlls
-	set TCL_LIBRARY=$(ROOT:\=/)/library
-	$(DEBUGGER) $(TCLSH) $(SCRIPT)
-
-!if $(STATIC_BUILD)
-
-$(TCLLIB): $(TCLOBJS)
-	$(LIBCMD) @<<
-$**
-<<
-
-!else
-
-$(TCLLIB): $(TCLOBJS)
-	$(DLLCMD) @<<
-$**
-<<
-	$(_VC_MANIFEST_EMBED_DLL)
-$(TCLIMPLIB): $(TCLLIB)
-
-!endif # $(STATIC_BUILD)
-
-
-$(TCLSTUBLIB): $(TCLSTUBOBJS)
-	$(LIBCMD) -nodefaultlib $(TCLSTUBOBJS)
-
-$(TCLSH): $(TCLSHOBJS) $(TCLSTUBLIB) $(TCLIMPLIB)
-	$(CONEXECMD) -stack:2300000 $**
-	$(_VC_MANIFEST_EMBED_EXE)
-
-$(TCLTEST): $(TCLTESTOBJS) $(TCLSTUBLIB) $(TCLIMPLIB)
-	$(CONEXECMD) -stack:2300000 $**
-	$(_VC_MANIFEST_EMBED_EXE)
-
-!if $(STATIC_BUILD)
-$(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj
-	$(LIBCMD) $**
-!else
-$(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj $(TCLSTUBLIB)
-	$(DLLCMD) $**
-	$(_VC_MANIFEST_EMBED_DLL)
-!endif
-
-!if $(STATIC_BUILD)
-$(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj
-	$(LIBCMD) $**
-!else
-$(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj $(TCLSTUBLIB)
-	$(DLLCMD) $**
-	$(_VC_MANIFEST_EMBED_DLL)
-!endif
-
-pkgs:
-	@for /d %d in ($(PKGSDIR)\*) do \
-	  @if exist "%~fd\win\makefile.vc" ( \
-	    pushd "%~fd\win" & \
-	    $(MAKE) -$(MAKEFLAGS) -f makefile.vc TCLDIR=$(ROOT) &\
-	    popd \
-	  )
-
-test-pkgs:
-	@for /d %d in ($(PKGSDIR)\*) do \
-	  @if exist "%~fd\win\makefile.vc" ( \
-	    pushd "%~fd\win" & \
-	    $(MAKE) -$(MAKEFLAGS) -f makefile.vc TCLDIR=$(ROOT) test &\
-	    popd \
-	  )
-
-install-pkgs:
-	@for /d %d in ($(PKGSDIR)\*) do \
-	  @if exist "%~fd\win\makefile.vc" ( \
-	    pushd "%~fd\win" & \
-	    $(MAKE) -$(MAKEFLAGS) -f makefile.vc TCLDIR=$(ROOT) install &\
-	    popd \
-	  )
-
-clean-pkgs:
-	@for /d %d in ($(PKGSDIR)\*) do \
-	  @if exist "%~fd\win\makefile.vc" ( \
-	    pushd "%~fd\win" & \
-	    $(MAKE) -$(MAKEFLAGS) -f makefile.vc TCLDIR=$(ROOT) clean &\
-	    popd \
-	  )
-
-$(CAT32): $(WINDIR)\cat.c
-	$(cc32) $(cflags) $(crt) -D_CRT_NONSTDC_NO_DEPRECATE -DCONSOLE -Fo$(TMP_DIR)\ $?
-	$(CONEXECMD) -stack:16384 $(TMP_DIR)\cat.obj
-	$(_VC_MANIFEST_EMBED_EXE)
-
-#---------------------------------------------------------------------
-# Regenerate the stubs files.  [Development use only]
-#---------------------------------------------------------------------
-
-genstubs:
-!if !exist($(TCLSH))
-	@echo Build tclsh first!
-!else
-	$(TCLSH) $(TOOLSDIR:\=/)/genStubs.tcl $(GENERICDIR:\=/) \
-		$(GENERICDIR:\=/)/tcl.decls $(GENERICDIR:\=/)/tclInt.decls \
-		$(GENERICDIR:\=/)/tclTomMath.decls
-	$(TCLSH) $(TOOLSDIR:\=/)/genStubs.tcl $(GENERICDIR:\=/) \
-		$(GENERICDIR:\=/)/tclOO.decls
-!endif
-
-
-#----------------------------------------------------------------------
-# The following target generates the file generic/tclTomMath.h.
-# It needs to be run (and the results checked) after updating
-# to a new release of libtommath.
-#----------------------------------------------------------------------
-
-gentommath_h:
-!if !exist($(TCLSH))
-	@echo Build tclsh first!
-!else
-	$(TCLSH) "$(TOOLSDIR:\=/)/fix_tommath_h.tcl" \
-		"$(TOMMATHDIR:\=/)/tommath.h" \
-		> "$(GENERICDIR)\tclTomMath.h"
-!endif
-
-#---------------------------------------------------------------------
-# Build the Windows HTML help file.
-#---------------------------------------------------------------------
-
-# NOTE: you can define HHC on the command-line to override this.
-# nmake does not set macro values if already set on the command line.
-!if defined(PROCESSOR_ARCHITECTURE) && "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
-HHC="%ProgramFiles(x86)%\HTML Help Workshop\hhc.exe"
-!else
-HHC="%ProgramFiles%\HTML Help Workshop\hhc.exe"
-!endif
-HTMLDIR=$(OUT_DIR)\html
-HTMLBASE=TclTk$(VERSION)
-HHPFILE=$(HTMLDIR)\$(HTMLBASE).hhp
-CHMFILE=$(HTMLDIR)\$(HTMLBASE).chm
-
-htmlhelp: chmsetup $(CHMFILE)
-
-$(CHMFILE): $(DOCDIR)\*
-	@$(TCLSH) $(TOOLSDIR)\tcltk-man2html.tcl "--htmldir=$(HTMLDIR)"
-	@echo Compiling HTML help project
-	-"$(HHC)" <<$(HHPFILE) >NUL
-[OPTIONS]
-Compatibility=1.1 or later
-Compiled file=$(HTMLBASE).chm
-Default topic=contents.htm
-Display compile progress=no
-Error log file=$(HTMLBASE).log
-Full-text search=Yes
-Language=0x409 English (United States)
-Title=Tcl/Tk $(DOTVERSION) Help
-[FILES]
-contents.htm
-docs.css
-Keywords\*.htm
-TclCmd\*.htm
-TclLib\*.htm
-TkCmd\*.htm
-TkLib\*.htm
-UserCmd\*.htm
-<<
-
-chmsetup:
-	@if not exist $(HTMLDIR)\nul mkdir $(HTMLDIR)
-
-install-docs:
-!if exist("$(CHMFILE)")
-	@echo Installing compiled HTML help
-	@$(CPY) "$(CHMFILE)" "$(DOC_INSTALL_DIR)\"
-!endif
-
-# "emacs font-lock highlighting fix
-
-#---------------------------------------------------------------------
-# Generate the tcl.nmake file which contains the options used to build
-# Tcl itself. This is used when building extensions.
-#---------------------------------------------------------------------
-tcl-nmake: $(OUT_DIR)\tcl.nmake
-$(OUT_DIR)\tcl.nmake:
-	@type << >$@
-CORE_MACHINE = $(MACHINE)
-CORE_DEBUG = $(DEBUG)
-CORE_TCL_THREADS = $(TCL_THREADS)
-CORE_USE_THREAD_ALLOC = $(USE_THREAD_ALLOC)
-CORE_USE_WIDECHAR_API = $(USE_WIDECHAR_API)
-<<
-
-#---------------------------------------------------------------------
-# Build tclConfig.sh for the TEA build system.
-#---------------------------------------------------------------------
-
-tclConfig: $(OUT_DIR)\tclConfig.sh
-
-# TBD - is this tclConfig.sh file ever used? The values are incorrect!
-$(OUT_DIR)\tclConfig.sh: $(WINDIR)\tclConfig.sh.in
-	@echo Creating tclConfig.sh
-        @nmakehlp -s << $** >$@
-@TCL_DLL_FILE@       $(TCLLIBNAME)
-@TCL_VERSION@        $(DOTVERSION)
-@TCL_MAJOR_VERSION@  $(TCL_MAJOR_VERSION)
-@TCL_MINOR_VERSION@  $(TCL_MINOR_VERSION)
-@TCL_PATCH_LEVEL@    $(TCL_PATCH_LEVEL)
-@CC@                 $(CC)
-@DEFS@               $(pkgcflags)
-@CFLAGS_DEBUG@       -nologo -c -W3 -YX -Fp$(TMP_DIR)\ -MDd
-@CFLAGS_OPTIMIZE@    -nologo -c -W3 -YX -Fp$(TMP_DIR)\ -MD
-@LDFLAGS_DEBUG@      -nologo -machine:$(MACHINE) -debug -debugtype:cv
-@LDFLAGS_OPTIMIZE@   -nologo -machine:$(MACHINE) -release -opt:ref -opt:icf,3
-@TCL_DBGX@           $(SUFX)
-@TCL_LIB_FILE@       $(PROJECT)$(VERSION)$(SUFX).lib
-@TCL_NEEDS_EXP_FILE@
-@LIBS@               $(baselibs) $(PRJ_LIBS)
-@prefix@             $(_INSTALLDIR)
-@exec_prefix@        $(BIN_INSTALL_DIR)
-@SHLIB_CFLAGS@
-@STLIB_CFLAGS@
-@CFLAGS_WARNING@     -W3
-@EXTRA_CFLAGS@       -YX
-@SHLIB_LD@           $(link32) $(dlllflags)
-@STLIB_LD@           $(lib32) -nologo
-@SHLIB_LD_LIBS@      $(baselibs) $(PRJ_LIBS)
-@SHLIB_SUFFIX@       .dll
-@DL_LIBS@
-@LDFLAGS@
-@TCL_CC_SEARCH_FLAGS@
-@TCL_LD_SEARCH_FLAGS@
-@LIBOBJS@
-@RANLIB@
-@TCL_LIB_FLAG@
-@TCL_BUILD_LIB_SPEC@
-@TCL_LIB_SPEC@       $(LIB_INSTALL_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib
-@TCL_INCLUDE_SPEC@   -I$(INCLUDE_INSTALL_DIR)
-@TCL_LIB_VERSIONS_OK@
-@TCL_SRC_DIR@        $(ROOT)
-@TCL_PACKAGE_PATH@
-@TCL_STUB_LIB_FILE@  $(TCLSTUBLIBNAME)
-@TCL_STUB_LIB_FLAG@  $(TCLSTUBLIBNAME)
-@TCL_STUB_LIB_SPEC@  -L$(LIB_INSTALL_DIR) $(TCLSTUBLIBNAME)
-@TCL_THREADS@        $(TCL_THREADS)
-@TCL_BUILD_STUB_LIB_SPEC@ -L$(OUT_DIR) $(TCLSTUBLIBNAME)
-@TCL_BUILD_STUB_LIB_PATH@ $(TCLSTUBLIB)
-@TCL_STUB_LIB_PATH@  $(LIB_INSTALL_DIR)\$(TCLSTUBLIBNAME)
-@CFG_TCL_EXPORT_FILE_SUFFIX@  $(VERSION)$(SUFX).lib
-@CFG_TCL_SHARED_LIB_SUFFIX@   $(VERSION)$(SUFX).dll
-@CFG_TCL_UNSHARED_LIB_SUFFIX@ $(VERSION)$(SUFX).lib
-!if $(STATIC_BUILD)
-@TCL_SHARED_BUILD@   0
-!else
-@TCL_SHARED_BUILD@   1
-!endif
-<<
-
-
-#---------------------------------------------------------------------
-# The following target generates the file generic/tclDate.c
-# from the yacc grammar found in generic/tclGetDate.y.  This is
-# only run by hand as yacc is not available in all environments.
-# The name of the .c file is different than the name of the .y file
-# so that make doesn't try to automatically regenerate the .c file.
-#---------------------------------------------------------------------
-
-gendate:
-	bison --output-file=$(GENERICDIR)/tclDate.c \
-	--name-prefix=TclDate \
-	$(GENERICDIR)/tclGetDate.y
-
-#---------------------------------------------------------------------
-# Special case object file targets
-#---------------------------------------------------------------------
-
-$(TMP_DIR)\testMain.obj: $(WINDIR)\tclAppInit.c
-	$(cc32) $(appcflags) -DTCL_TEST \
-	    -DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \
-	    -Fo$@ $?
-
-$(TMP_DIR)\tclMain2.obj: $(GENERICDIR)\tclMain.c
-	$(cc32) $(pkgcflags) -DTCL_ASCII_MAIN \
-	    -Fo$@ $?
-
-$(TMP_DIR)\tclTest.obj: $(GENERICDIR)\tclTest.c
-	$(cc32) $(appcflags) -Fo$@ $?
-
-$(TMP_DIR)\tclTestObj.obj: $(GENERICDIR)\tclTestObj.c
-	$(cc32) $(appcflags) -Fo$@ $?
-
-$(TMP_DIR)\tclWinTest.obj: $(WINDIR)\tclWinTest.c
-	$(CCAPPCMD) $?
-
-$(TMP_DIR)\tclZlib.obj: $(GENERICDIR)\tclZlib.c
-	$(cc32) $(pkgcflags) -I$(COMPATDIR)\zlib -Fo$@ $?
-
-$(TMP_DIR)\tclPkgConfig.obj: $(GENERICDIR)\tclPkgConfig.c
-	$(cc32) $(pkgcflags) \
-	-DCFG_INSTALL_LIBDIR="\"$(LIB_INSTALL_DIR:\=\\)\"" \
-	-DCFG_INSTALL_BINDIR="\"$(BIN_INSTALL_DIR:\=\\)\"" \
-	-DCFG_INSTALL_SCRDIR="\"$(SCRIPT_INSTALL_DIR:\=\\)\"" \
-	-DCFG_INSTALL_INCDIR="\"$(INCLUDE_INSTALL_DIR:\=\\)\"" \
-	-DCFG_INSTALL_DOCDIR="\"$(DOC_INSTALL_DIR:\=\\)\""	\
-	-DCFG_RUNTIME_LIBDIR="\"$(LIB_INSTALL_DIR:\=\\)\"" \
-	-DCFG_RUNTIME_BINDIR="\"$(BIN_INSTALL_DIR:\=\\)\"" \
-	-DCFG_RUNTIME_SCRDIR="\"$(SCRIPT_INSTALL_DIR:\=\\)\"" \
-	-DCFG_RUNTIME_INCDIR="\"$(INCLUDE_INSTALL_DIR:\=\\)\"" \
-	-DCFG_RUNTIME_DOCDIR="\"$(DOC_INSTALL_DIR:\=\\)\""     \
-	-Fo$@ $?
-
-$(TMP_DIR)\tclAppInit.obj: $(WINDIR)\tclAppInit.c
-	$(cc32) $(appcflags) \
-	    -DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \
-	    -Fo$@ $?
-
-### The following objects should be built using the stub interfaces
-### *ALL* extensions need to built with -DTCL_THREADS=1
-
-$(TMP_DIR)\tclWinReg.obj: $(WINDIR)\tclWinReg.c
-!if $(STATIC_BUILD)
-	$(cc32) $(appcflags) -DSTATIC_BUILD -Fo$@ $?
-!else
-	$(cc32) $(appcflags) -DUSE_TCL_STUBS -Fo$@ $?
-!endif
-
-
-$(TMP_DIR)\tclWinDde.obj: $(WINDIR)\tclWinDde.c
-!if $(STATIC_BUILD)
-	$(cc32) $(appcflags) -DSTATIC_BUILD -Fo$@ $?
-!else
-	$(cc32) $(appcflags) -DUSE_TCL_STUBS -Fo$@ $?
-!endif
-
-
-### The following objects are part of the stub library and should not
-### be built as DLL objects.  -Zl is used to avoid a dependency on any
-### specific C run-time.
-
-$(TMP_DIR)\tclStubLib.obj: $(GENERICDIR)\tclStubLib.c
-	$(cc32) $(stubscflags) -Fo$@ $?
-
-$(TMP_DIR)\tclTomMathStubLib.obj: $(GENERICDIR)\tclTomMathStubLib.c
-	$(cc32) $(stubscflags) -Fo$@ $?
-
-$(TMP_DIR)\tclOOStubLib.obj: $(GENERICDIR)\tclOOStubLib.c
-	$(cc32) $(stubscflags) -Fo$@ $?
-
-$(TMP_DIR)\tclsh.exe.manifest: $(WINDIR)\tclsh.exe.manifest.in
-	@nmakehlp -s << $** >$@
-@MACHINE@	  $(MACHINE:IX86=X86)
-@TCL_WIN_VERSION@  $(DOTVERSION).0.0
-<<
-
-#---------------------------------------------------------------------
-# Generate the source dependencies.  Having dependency rules will
-# improve incremental build accuracy without having to resort to a
-# full rebuild just because some non-global header file like
-# tclCompile.h was changed.  These rules aren't needed when building
-# from scratch.
-#---------------------------------------------------------------------
-
-depend:
-!if !exist($(TCLSH))
-	@echo Build tclsh first!
-!else
-	$(TCLSH) $(TOOLSDIR:\=/)/mkdepend.tcl -vc32 -out:"$(OUT_DIR)\depend.mk" \
-		-passthru:"-DBUILD_tcl $(TCL_INCLUDES) $(PRJ_INCLUDES)" $(GENERICDIR),$$(GENERICDIR) \
-		$(COMPATDIR),$$(COMPATDIR) $(TOMMATHDIR),$$(TOMMATHDIR) $(WINDIR),$$(WINDIR) @<<
-$(TCLOBJS)
-<<
-!endif
-
-#---------------------------------------------------------------------
-# Dependency rules
-#---------------------------------------------------------------------
-
-!if exist("$(OUT_DIR)\depend.mk")
-!include "$(OUT_DIR)\depend.mk"
-!message *** Dependency rules in use.
-!else
-!message *** Dependency rules are not being used.
-!endif
-
-### add a spacer in the output
-!message
-
-
-#---------------------------------------------------------------------
-# Implicit rules that are not covered by the common ones defined in
-# rules.vc. A limitation exists with nmake that requires that
-# source directory can not contain spaces in the path.  This an
-# absolute.
-#---------------------------------------------------------------------
-
-{$(TOMMATHDIR)}.c{$(TMP_DIR)}.obj::
-	$(cc32) $(pkgcflags) -Fo$(TMP_DIR)\ @<<
-$<
-<<
-
-{$(COMPATDIR)\zlib}.c{$(TMP_DIR)}.obj::
-	$(cc32) $(pkgcflags) -Fo$(TMP_DIR)\ @<<
-$<
-<<
-
-$(TMP_DIR)\tclsh.res: $(TMP_DIR)\tclsh.exe.manifest $(WINDIR)\tclsh.rc
-
-
-#---------------------------------------------------------------------
-# Installation.
-#---------------------------------------------------------------------
-
-install-binaries:
-	@echo Installing to '$(_INSTALLDIR)'
-	@echo Installing $(TCLLIBNAME)
-!if "$(TCLLIB)" != "$(TCLIMPLIB)"
-	@$(CPY) "$(TCLLIB)" "$(BIN_INSTALL_DIR)\"
-!endif
-	@$(CPY) "$(TCLIMPLIB)" "$(LIB_INSTALL_DIR)\"
-!if exist($(TCLSH))
-	@echo Installing $(TCLSHNAME)
-	@$(CPY) "$(TCLSH)" "$(BIN_INSTALL_DIR)\"
-!endif
-	@echo Installing $(TCLSTUBLIBNAME)
-	@$(CPY) "$(TCLSTUBLIB)" "$(LIB_INSTALL_DIR)\"
-
-install-libraries: tclConfig tcl-nmake install-msgs install-tzdata
-	@if not exist "$(SCRIPT_INSTALL_DIR)" \
-		$(MKDIR) "$(SCRIPT_INSTALL_DIR)"
-	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8" \
-		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8"
-	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4" \
-		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4"
-	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4\platform" \
-		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4\platform"
-	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.5" \
-		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.5"
-	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.6" \
-		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.6"
-	@if not exist "$(LIB_INSTALL_DIR)\nmake" \
-		$(MKDIR) "$(LIB_INSTALL_DIR)\nmake"
-	@echo Installing header files
-	@$(CPY) "$(GENERICDIR)\tcl.h"             "$(INCLUDE_INSTALL_DIR)\"
-	@$(CPY) "$(GENERICDIR)\tclDecls.h"        "$(INCLUDE_INSTALL_DIR)\"
-	@$(CPY) "$(GENERICDIR)\tclOO.h"           "$(INCLUDE_INSTALL_DIR)\"
-	@$(CPY) "$(GENERICDIR)\tclOODecls.h"      "$(INCLUDE_INSTALL_DIR)\"
-	@$(CPY) "$(GENERICDIR)\tclPlatDecls.h"    "$(INCLUDE_INSTALL_DIR)\"
-	@$(CPY) "$(GENERICDIR)\tclTomMath.h"      "$(INCLUDE_INSTALL_DIR)\"
-	@$(CPY) "$(GENERICDIR)\tclTomMathDecls.h" "$(INCLUDE_INSTALL_DIR)\"
-	@$(CPY) "$(TOMMATHDIR)\tommath_class.h"   "$(INCLUDE_INSTALL_DIR)\"
-	@$(CPY) "$(TOMMATHDIR)\tommath_superclass.h" "$(INCLUDE_INSTALL_DIR)\"
-	@echo Installing library files to $(SCRIPT_INSTALL_DIR)
-	@$(CPY) "$(ROOT)\library\history.tcl"     "$(SCRIPT_INSTALL_DIR)\"
-	@$(CPY) "$(ROOT)\library\init.tcl"        "$(SCRIPT_INSTALL_DIR)\"
-	@$(CPY) "$(ROOT)\library\clock.tcl"       "$(SCRIPT_INSTALL_DIR)\"
-	@$(CPY) "$(ROOT)\library\tm.tcl"          "$(SCRIPT_INSTALL_DIR)\"
-	@$(CPY) "$(ROOT)\library\parray.tcl"      "$(SCRIPT_INSTALL_DIR)\"
-	@$(CPY) "$(ROOT)\library\safe.tcl"        "$(SCRIPT_INSTALL_DIR)\"
-	@$(CPY) "$(ROOT)\library\tclIndex"        "$(SCRIPT_INSTALL_DIR)\"
-	@$(CPY) "$(ROOT)\library\package.tcl"     "$(SCRIPT_INSTALL_DIR)\"
-	@$(CPY) "$(ROOT)\library\word.tcl"        "$(SCRIPT_INSTALL_DIR)\"
-	@$(CPY) "$(ROOT)\library\auto.tcl"        "$(SCRIPT_INSTALL_DIR)\"
-	@$(CPY) "$(OUT_DIR)\tclConfig.sh"         "$(LIB_INSTALL_DIR)\"
-	@$(CPY) "$(WINDIR)\tclooConfig.sh"        "$(LIB_INSTALL_DIR)\"
-	@$(CPY) "$(WINDIR)\rules.vc"              "$(LIB_INSTALL_DIR)\nmake\"
-	@$(CPY) "$(WINDIR)\targets.vc"              "$(LIB_INSTALL_DIR)\nmake\"
-	@$(CPY) "$(WINDIR)\nmakehlp.c"            "$(LIB_INSTALL_DIR)\nmake\"
-	@$(CPY) "$(OUT_DIR)\tcl.nmake"            "$(LIB_INSTALL_DIR)\nmake\"
-	@echo Installing library opt0.4 directory
-	@$(CPY) "$(ROOT)\library\opt\*.tcl" \
-	    "$(SCRIPT_INSTALL_DIR)\opt0.4\"
-	@echo Installing package http $(PKG_HTTP_VER) as a Tcl Module
-	@$(COPY) "$(ROOT)\library\http\http.tcl" \
-	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.6\http-$(PKG_HTTP_VER).tm"
-	@echo Installing package msgcat $(PKG_MSGCAT_VER) as a Tcl Module
-	@$(COPY) "$(ROOT)\library\msgcat\msgcat.tcl" \
-	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.7\msgcat-$(PKG_MSGCAT_VER).tm"
-	@echo Installing package tcltest $(PKG_TCLTEST_VER) as a Tcl Module
-	@$(COPY) "$(ROOT)\library\tcltest\tcltest.tcl" \
-	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.5\tcltest-$(PKG_TCLTEST_VER).tm"
-	@echo Installing package platform $(PKG_PLATFORM_VER) as a Tcl Module
-	@$(COPY) "$(ROOT)\library\platform\platform.tcl" \
-	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4\platform-$(PKG_PLATFORM_VER).tm"
-	@echo Installing package platform::shell $(PKG_SHELL_VER) as a Tcl Module
-	@$(COPY) "$(ROOT)\library\platform\shell.tcl" \
-	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4\platform\shell-$(PKG_SHELL_VER).tm"
-	@echo Installing $(TCLDDELIBNAME)
-!if $(STATIC_BUILD)
-!if !$(TCL_USE_STATIC_PACKAGES)
-	@$(CPY) "$(TCLDDELIB)" "$(LIB_INSTALL_DIR)\"
-!endif
-!else
-	@$(CPY) "$(TCLDDELIB)" "$(LIB_INSTALL_DIR)\dde$(DDEDOTVERSION)\"
-	@$(CPY) "$(ROOT)\library\dde\pkgIndex.tcl" \
-	    "$(LIB_INSTALL_DIR)\dde$(DDEDOTVERSION)\"
-!endif
-	@echo Installing $(TCLREGLIBNAME)
-!if $(STATIC_BUILD)
-!if !$(TCL_USE_STATIC_PACKAGES)
-	@$(CPY) "$(TCLREGLIB)" "$(LIB_INSTALL_DIR)\"
-!endif
-!else
-	@$(CPY) "$(TCLREGLIB)" "$(LIB_INSTALL_DIR)\reg$(REGDOTVERSION)\"
-	@$(CPY) "$(ROOT)\library\reg\pkgIndex.tcl" \
-	    "$(LIB_INSTALL_DIR)\reg$(REGDOTVERSION)\"
-!endif
-	@echo Installing encodings
-	@$(CPY) "$(ROOT)\library\encoding\*.enc" \
-		"$(SCRIPT_INSTALL_DIR)\encoding\"
-# "emacs font-lock highlighting fix
-
-install-tzdata:
-	@echo Installing time zone data
-	@set TCL_LIBRARY=$(ROOT:\=/)/library
-	@$(TCLSH_NATIVE) "$(ROOT:\=/)/tools/installData.tcl" \
-	    "$(ROOT:\=/)/library/tzdata" "$(SCRIPT_INSTALL_DIR)/tzdata"
-
-install-msgs:
-	@echo Installing message catalogs
-	@set TCL_LIBRARY=$(ROOT:\=/)/library
-	@$(TCLSH_NATIVE) "$(ROOT:\=/)/tools/installData.tcl" \
-	    "$(ROOT:\=/)/library/msgs" "$(SCRIPT_INSTALL_DIR)/msgs"
-
-#---------------------------------------------------------------------
-# Clean up
-#---------------------------------------------------------------------
-
-tidy:
-!if "$(TCLLIB)" != "$(TCLIMPLIB)"
-	@echo Removing $(TCLLIB) ...
-	@if exist $(TCLLIB) del $(TCLLIB)
-!endif
-	@echo Removing $(TCLIMPLIB) ...
-	@if exist $(TCLIMPLIB) del $(TCLIMPLIB)
-	@echo Removing $(TCLSH) ...
-	@if exist $(TCLSH) del $(TCLSH)
-	@echo Removing $(TCLTEST) ...
-	@if exist $(TCLTEST) del $(TCLTEST)
-	@echo Removing $(TCLDDELIB) ...
-	@if exist $(TCLDDELIB) del $(TCLDDELIB)
-	@echo Removing $(TCLREGLIB) ...
-	@if exist $(TCLREGLIB) del $(TCLREGLIB)
-
-clean: default-clean clean-pkgs
-hose: default-hose
-realclean: hose
-
-# Local Variables:
-# mode: makefile
-# End:
+#------------------------------------------------------------- -*- makefile -*-
+#
+#	Microsoft Visual C++ makefile for building Tcl with nmake
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# Copyright (c) 1995-1996 Sun Microsystems, Inc.
+# Copyright (c) 1998-2000 Ajuba Solutions.
+# Copyright (c) 2001-2005 ActiveState Corporation.
+# Copyright (c) 2001-2004 David Gravereaux.
+# Copyright (c) 2003-2008 Pat Thoyts.
+# Copyright (c) 2017 Ashok P. Nadkarni
+#------------------------------------------------------------------------------
+
+# General usage:
+#   nmake [-nologo] -f makefile.vc [TARGET|MACRODEF [TARGET|MACRODEF] [...]]
+#
+# For MACRODEF, see TIP 477 (https://core.tcl.tk/tips/doc/trunk/tip/477.md)
+# or examine Sections 6-8 in rules.vc.
+#
+# Possible values of TARGET are:
+#	release  -- Builds the core, the shell and the dlls. (default)
+#	dlls     -- Just builds the windows extensions
+#	shell    -- Just builds the shell and the core.
+#	core     -- Only builds the core [tclXX.(dll|lib)].
+#	all      -- Builds everything.
+#	test     -- Builds and runs the test suite.
+#	tcltest  -- Just builds the test shell.
+#	install  -- Installs the built binaries and libraries to $(INSTALLDIR)
+#		    as the root of the install tree.
+#	tidy/clean/hose -- varying levels of cleaning.
+#	genstubs -- Rebuilds the Stubs table and support files (dev only).
+#	depend   -- Generates an accurate set of source dependancies for this
+#		    makefile.  Helpful to avoid problems when the sources are
+#		    refreshed and you rebuild, but can "overbuild" when common
+#		    headers like tclInt.h just get small changes.
+#	htmlhelp -- Builds a Windows .chm help file for Tcl and Tk from the
+#		    troff manual pages found in $(ROOT)\doc. You need to
+#		    have installed the HTML Help Compiler package from Microsoft
+#		    to produce the .chm file.
+#
+# The steps to setup a Visual C++ environment depend on which
+# version of Visual Studio and/or the Windows SDK you are building
+# against and are not described here. The simplest method is generally
+# to start a command shell using one of the short cuts installed by
+# Visual Studio/Windows SDK for the appropriate target architecture.
+#
+# NOTE: For older (Visual C++ 6 or the 2003 SDK), to use the Platform
+# SDK (not expressly needed), run setenv.bat after
+# vcvars32.bat according to the instructions for it.  This can also
+# turn on the 64-bit compiler, if your SDK has it.
+#
+# Examples:
+#       c:\tcl_src\win\>nmake -f makefile.vc release
+#       c:\tcl_src\win\>nmake -f makefile.vc test
+#       c:\tcl_src\win\>nmake -f makefile.vc install INSTALLDIR=c:\progra~1\tcl
+#       c:\tcl_src\win\>nmake -f makefile.vc release OPTS=pdbs 
+#       c:\tcl_src\win\>nmake -f makefile.vc release OPTS=symbols
+#
+
+# NOTE:
+# Before modifying this file, check whether the modification is applicable
+# to building extensions as well and if so, modify rules.vc instead.
+
+# The PROJECT macro is used by rules.vc for generating appropriate
+# macros and rules.
+PROJECT = tcl
+
+# Default target to build if no target is specified. If unspecified, the
+# rules.vc file will set up "all" as the target.
+DEFAULT_BUILD_TARGET = release
+
+# We want to use our own resource file, not the standard template one.
+RCFILE = tcl.rc
+
+# The rules.vc file does most of the hard work in terms of defining
+# the build configuration, macros, output directories etc.
+!include "rules.vc"
+
+# Tcl version info based on macros set up by rules.vc
+DOTVERSION      = $(TCL_MAJOR_VERSION).$(TCL_MINOR_VERSION)
+VERSION         = $(TCL_MAJOR_VERSION)$(TCL_MINOR_VERSION)
+
+# We need versions of various core packages to generate appropriate
+# file names during installation.
+!if [echo REM = This file is generated from makefile.vc > versions.vc]
+!endif
+!if [echo PKG_HTTP_VER = \>> versions.vc] \
+   && [nmakehlp -V ..\library\http\pkgIndex.tcl http >> versions.vc]
+!endif
+!if [echo PKG_TCLTEST_VER = \>> versions.vc] \
+   && [nmakehlp -V ..\library\tcltest\pkgIndex.tcl tcltest >> versions.vc]
+!endif
+!if [echo PKG_MSGCAT_VER = \>> versions.vc] \
+   && [nmakehlp -V ..\library\msgcat\pkgIndex.tcl msgcat >> versions.vc]
+!endif
+!if [echo PKG_PLATFORM_VER = \>> versions.vc] \
+   && [nmakehlp -V ..\library\platform\pkgIndex.tcl "platform " >> versions.vc]
+!endif
+!if [echo PKG_SHELL_VER = \>> versions.vc] \
+   && [nmakehlp -V ..\library\platform\pkgIndex.tcl "platform::shell" >> versions.vc]
+!endif
+!if [echo PKG_DDE_VER = \>> versions.vc] \
+   && [nmakehlp -V ..\library\dde\pkgIndex.tcl "dde " >> versions.vc]
+!endif
+!if [echo PKG_REG_VER =\>> versions.vc] \
+   && [nmakehlp -V ..\library\reg\pkgIndex.tcl registry >> versions.vc]
+!endif
+
+!include versions.vc
+
+DDEDOTVERSION = 1.4
+DDEVERSION = $(DDEDOTVERSION:.=)
+
+REGDOTVERSION = 1.3
+REGVERSION = $(REGDOTVERSION:.=)
+
+TCLREGLIBNAME	= $(PROJECT)reg$(REGVERSION)$(SUFX:t=).$(EXT)
+TCLREGLIB	= $(OUT_DIR)\$(TCLREGLIBNAME)
+
+TCLDDELIBNAME	= $(PROJECT)dde$(DDEVERSION)$(SUFX:t=).$(EXT)
+TCLDDELIB	= $(OUT_DIR)\$(TCLDDELIBNAME)
+
+TCLTEST		= $(OUT_DIR)\$(PROJECT)test.exe
+CAT32		= $(OUT_DIR)\cat32.exe
+
+TCLSHOBJS = \
+	$(TMP_DIR)\tclAppInit.obj \
+!if !$(STATIC_BUILD)
+!if $(TCL_USE_STATIC_PACKAGES)
+	$(TMP_DIR)\tclWinReg.obj \
+	$(TMP_DIR)\tclWinDde.obj \
+!endif
+!endif
+	$(TMP_DIR)\tclsh.res
+
+TCLTESTOBJS = \
+	$(TMP_DIR)\tclTest.obj \
+	$(TMP_DIR)\tclTestObj.obj \
+	$(TMP_DIR)\tclTestProcBodyObj.obj \
+	$(TMP_DIR)\tclThreadTest.obj \
+	$(TMP_DIR)\tclWinTest.obj \
+!if !$(STATIC_BUILD)
+!if $(TCL_USE_STATIC_PACKAGES)
+	$(TMP_DIR)\tclWinReg.obj \
+	$(TMP_DIR)\tclWinDde.obj \
+!endif
+!endif
+	$(TMP_DIR)\testMain.obj
+
+COREOBJS = \
+	$(TMP_DIR)\regcomp.obj \
+	$(TMP_DIR)\regerror.obj \
+	$(TMP_DIR)\regexec.obj \
+	$(TMP_DIR)\regfree.obj \
+	$(TMP_DIR)\tclAlloc.obj \
+	$(TMP_DIR)\tclAssembly.obj \
+	$(TMP_DIR)\tclAsync.obj \
+	$(TMP_DIR)\tclBasic.obj \
+	$(TMP_DIR)\tclBinary.obj \
+	$(TMP_DIR)\tclCkalloc.obj \
+	$(TMP_DIR)\tclClock.obj \
+	$(TMP_DIR)\tclCmdAH.obj \
+	$(TMP_DIR)\tclCmdIL.obj \
+	$(TMP_DIR)\tclCmdMZ.obj \
+	$(TMP_DIR)\tclCompCmds.obj \
+	$(TMP_DIR)\tclCompCmdsGR.obj \
+	$(TMP_DIR)\tclCompCmdsSZ.obj \
+	$(TMP_DIR)\tclCompExpr.obj \
+	$(TMP_DIR)\tclCompile.obj \
+	$(TMP_DIR)\tclConfig.obj \
+	$(TMP_DIR)\tclDate.obj \
+	$(TMP_DIR)\tclDictObj.obj \
+	$(TMP_DIR)\tclDisassemble.obj \
+	$(TMP_DIR)\tclEncoding.obj \
+	$(TMP_DIR)\tclEnsemble.obj \
+	$(TMP_DIR)\tclEnv.obj \
+	$(TMP_DIR)\tclEvent.obj \
+	$(TMP_DIR)\tclExecute.obj \
+	$(TMP_DIR)\tclFCmd.obj \
+	$(TMP_DIR)\tclFileName.obj \
+	$(TMP_DIR)\tclGet.obj \
+	$(TMP_DIR)\tclHash.obj \
+	$(TMP_DIR)\tclHistory.obj \
+	$(TMP_DIR)\tclIndexObj.obj \
+	$(TMP_DIR)\tclInterp.obj \
+	$(TMP_DIR)\tclIO.obj \
+	$(TMP_DIR)\tclIOCmd.obj \
+	$(TMP_DIR)\tclIOGT.obj \
+	$(TMP_DIR)\tclIOSock.obj \
+	$(TMP_DIR)\tclIOUtil.obj \
+	$(TMP_DIR)\tclIORChan.obj \
+	$(TMP_DIR)\tclIORTrans.obj \
+	$(TMP_DIR)\tclLink.obj \
+	$(TMP_DIR)\tclListObj.obj \
+	$(TMP_DIR)\tclLiteral.obj \
+	$(TMP_DIR)\tclLoad.obj \
+	$(TMP_DIR)\tclMain.obj \
+	$(TMP_DIR)\tclMain2.obj \
+	$(TMP_DIR)\tclNamesp.obj \
+	$(TMP_DIR)\tclNotify.obj \
+	$(TMP_DIR)\tclOO.obj \
+	$(TMP_DIR)\tclOOBasic.obj \
+	$(TMP_DIR)\tclOOCall.obj \
+	$(TMP_DIR)\tclOODefineCmds.obj \
+	$(TMP_DIR)\tclOOInfo.obj \
+	$(TMP_DIR)\tclOOMethod.obj \
+	$(TMP_DIR)\tclOOStubInit.obj \
+	$(TMP_DIR)\tclObj.obj \
+	$(TMP_DIR)\tclOptimize.obj \
+	$(TMP_DIR)\tclPanic.obj \
+	$(TMP_DIR)\tclParse.obj \
+	$(TMP_DIR)\tclPathObj.obj \
+	$(TMP_DIR)\tclPipe.obj \
+	$(TMP_DIR)\tclPkg.obj \
+	$(TMP_DIR)\tclPkgConfig.obj \
+	$(TMP_DIR)\tclPosixStr.obj \
+	$(TMP_DIR)\tclPreserve.obj \
+	$(TMP_DIR)\tclProc.obj \
+	$(TMP_DIR)\tclProcess.obj \
+	$(TMP_DIR)\tclRegexp.obj \
+	$(TMP_DIR)\tclResolve.obj \
+	$(TMP_DIR)\tclResult.obj \
+	$(TMP_DIR)\tclScan.obj \
+	$(TMP_DIR)\tclStringObj.obj \
+	$(TMP_DIR)\tclStrToD.obj \
+	$(TMP_DIR)\tclStubInit.obj \
+	$(TMP_DIR)\tclThread.obj \
+	$(TMP_DIR)\tclThreadAlloc.obj \
+	$(TMP_DIR)\tclThreadJoin.obj \
+	$(TMP_DIR)\tclThreadStorage.obj \
+	$(TMP_DIR)\tclTimer.obj \
+	$(TMP_DIR)\tclTomMathInterface.obj \
+	$(TMP_DIR)\tclTrace.obj \
+	$(TMP_DIR)\tclUtf.obj \
+	$(TMP_DIR)\tclUtil.obj \
+	$(TMP_DIR)\tclVar.obj \
+	$(TMP_DIR)\tclZlib.obj
+
+ZLIBOBJS = \
+	$(TMP_DIR)\adler32.obj \
+	$(TMP_DIR)\compress.obj \
+	$(TMP_DIR)\crc32.obj \
+	$(TMP_DIR)\deflate.obj \
+	$(TMP_DIR)\infback.obj \
+	$(TMP_DIR)\inffast.obj \
+	$(TMP_DIR)\inflate.obj \
+	$(TMP_DIR)\inftrees.obj \
+	$(TMP_DIR)\trees.obj \
+	$(TMP_DIR)\uncompr.obj \
+	$(TMP_DIR)\zutil.obj
+
+TOMMATHOBJS = \
+	$(TMP_DIR)\bncore.obj \
+	$(TMP_DIR)\bn_reverse.obj \
+	$(TMP_DIR)\bn_fast_s_mp_mul_digs.obj \
+	$(TMP_DIR)\bn_fast_s_mp_sqr.obj \
+	$(TMP_DIR)\bn_mp_add.obj \
+	$(TMP_DIR)\bn_mp_add_d.obj \
+	$(TMP_DIR)\bn_mp_and.obj \
+	$(TMP_DIR)\bn_mp_clamp.obj \
+	$(TMP_DIR)\bn_mp_clear.obj \
+	$(TMP_DIR)\bn_mp_clear_multi.obj \
+	$(TMP_DIR)\bn_mp_cmp.obj \
+	$(TMP_DIR)\bn_mp_cmp_d.obj \
+	$(TMP_DIR)\bn_mp_cmp_mag.obj \
+	$(TMP_DIR)\bn_mp_cnt_lsb.obj \
+	$(TMP_DIR)\bn_mp_copy.obj \
+	$(TMP_DIR)\bn_mp_count_bits.obj \
+	$(TMP_DIR)\bn_mp_div.obj \
+	$(TMP_DIR)\bn_mp_div_d.obj \
+	$(TMP_DIR)\bn_mp_div_2.obj \
+	$(TMP_DIR)\bn_mp_div_2d.obj \
+	$(TMP_DIR)\bn_mp_div_3.obj \
+	$(TMP_DIR)\bn_mp_exch.obj \
+	$(TMP_DIR)\bn_mp_expt_d.obj \
+	$(TMP_DIR)\bn_mp_expt_d_ex.obj \
+	$(TMP_DIR)\bn_mp_get_int.obj \
+	$(TMP_DIR)\bn_mp_get_long.obj \
+	$(TMP_DIR)\bn_mp_get_long_long.obj \
+	$(TMP_DIR)\bn_mp_grow.obj \
+	$(TMP_DIR)\bn_mp_init.obj \
+	$(TMP_DIR)\bn_mp_init_copy.obj \
+	$(TMP_DIR)\bn_mp_init_multi.obj \
+	$(TMP_DIR)\bn_mp_init_set.obj \
+	$(TMP_DIR)\bn_mp_init_set_int.obj \
+	$(TMP_DIR)\bn_mp_init_size.obj \
+	$(TMP_DIR)\bn_mp_karatsuba_mul.obj \
+	$(TMP_DIR)\bn_mp_karatsuba_sqr.obj \
+	$(TMP_DIR)\bn_mp_lshd.obj \
+	$(TMP_DIR)\bn_mp_mod.obj \
+	$(TMP_DIR)\bn_mp_mod_2d.obj \
+	$(TMP_DIR)\bn_mp_mul.obj \
+	$(TMP_DIR)\bn_mp_mul_2.obj \
+	$(TMP_DIR)\bn_mp_mul_2d.obj \
+	$(TMP_DIR)\bn_mp_mul_d.obj \
+	$(TMP_DIR)\bn_mp_neg.obj \
+	$(TMP_DIR)\bn_mp_or.obj \
+	$(TMP_DIR)\bn_mp_radix_size.obj \
+	$(TMP_DIR)\bn_mp_radix_smap.obj \
+	$(TMP_DIR)\bn_mp_read_radix.obj \
+	$(TMP_DIR)\bn_mp_rshd.obj \
+	$(TMP_DIR)\bn_mp_set.obj \
+	$(TMP_DIR)\bn_mp_set_int.obj \
+	$(TMP_DIR)\bn_mp_set_long.obj \
+	$(TMP_DIR)\bn_mp_set_long_long.obj \
+	$(TMP_DIR)\bn_mp_shrink.obj \
+	$(TMP_DIR)\bn_mp_sqr.obj \
+	$(TMP_DIR)\bn_mp_sqrt.obj \
+	$(TMP_DIR)\bn_mp_sub.obj \
+	$(TMP_DIR)\bn_mp_sub_d.obj \
+	$(TMP_DIR)\bn_mp_to_unsigned_bin.obj \
+	$(TMP_DIR)\bn_mp_to_unsigned_bin_n.obj \
+	$(TMP_DIR)\bn_mp_toom_mul.obj \
+	$(TMP_DIR)\bn_mp_toom_sqr.obj \
+	$(TMP_DIR)\bn_mp_toradix_n.obj \
+	$(TMP_DIR)\bn_mp_unsigned_bin_size.obj \
+	$(TMP_DIR)\bn_mp_xor.obj \
+	$(TMP_DIR)\bn_mp_zero.obj \
+	$(TMP_DIR)\bn_s_mp_add.obj \
+	$(TMP_DIR)\bn_s_mp_mul_digs.obj \
+	$(TMP_DIR)\bn_s_mp_sqr.obj \
+	$(TMP_DIR)\bn_s_mp_sub.obj
+
+PLATFORMOBJS = \
+	$(TMP_DIR)\tclWin32Dll.obj \
+	$(TMP_DIR)\tclWinChan.obj \
+	$(TMP_DIR)\tclWinConsole.obj \
+	$(TMP_DIR)\tclWinError.obj \
+	$(TMP_DIR)\tclWinFCmd.obj \
+	$(TMP_DIR)\tclWinFile.obj \
+	$(TMP_DIR)\tclWinInit.obj \
+	$(TMP_DIR)\tclWinLoad.obj \
+	$(TMP_DIR)\tclWinNotify.obj \
+	$(TMP_DIR)\tclWinPipe.obj \
+	$(TMP_DIR)\tclWinSerial.obj \
+	$(TMP_DIR)\tclWinSock.obj \
+	$(TMP_DIR)\tclWinThrd.obj \
+	$(TMP_DIR)\tclWinTime.obj \
+!if $(STATIC_BUILD)
+	$(TMP_DIR)\tclWinReg.obj \
+	$(TMP_DIR)\tclWinDde.obj \
+!else
+	$(TMP_DIR)\tcl.res
+!endif
+
+TCLOBJS = $(COREOBJS) $(ZLIBOBJS) $(TOMMATHOBJS) $(PLATFORMOBJS)
+
+TCLSTUBOBJS = \
+	$(TMP_DIR)\tclStubLib.obj \
+	$(TMP_DIR)\tclTomMathStubLib.obj \
+	$(TMP_DIR)\tclOOStubLib.obj
+
+### The following paths CANNOT have spaces in them as they appear on
+### the left side of implicit rules.
+TOMMATHDIR	= $(ROOT)\libtommath
+PKGSDIR		= $(ROOT)\pkgs
+
+# Additional include and C macro definitions for the implicit rules
+# defined in rules.vc
+PRJ_INCLUDES	= -I"$(TOMMATHDIR)"
+PRJ_DEFINES	= -DTCL_TOMMATH -DMP_PREC=4 -Dinline=__inline -DHAVE_ZLIB=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
+
+# Additional Link libraries needed beyond those in rules.vc
+PRJ_LIBS   = netapi32.lib user32.lib userenv.lib ws2_32.lib
+
+#---------------------------------------------------------------------
+# TclTest flags
+#---------------------------------------------------------------------
+
+!if "$(TESTPAT)" != ""
+TESTFLAGS = $(TESTFLAGS) -file $(TESTPAT)
+!endif
+
+
+#---------------------------------------------------------------------
+# Project specific targets
+#---------------------------------------------------------------------
+
+release:    setup $(TCLSH) $(TCLSTUBLIB) dlls pkgs
+core:	    setup $(TCLLIB) $(TCLSTUBLIB)
+shell:	    setup $(TCLSH)
+dlls:	    setup $(TCLREGLIB) $(TCLDDELIB)
+all:	    setup $(TCLSH) $(TCLSTUBLIB) dlls $(CAT32) pkgs
+tcltest:    setup $(TCLTEST) dlls $(CAT32)
+install:    install-binaries install-libraries install-docs install-pkgs
+setup:      default-setup
+
+test: test-core test-pkgs
+test-core: setup $(TCLTEST) dlls $(CAT32)
+	set TCL_LIBRARY=$(ROOT:\=/)/library
+	$(DEBUGGER) $(TCLTEST) "$(ROOT:\=/)/tests/all.tcl" $(TESTFLAGS) -loadfile <<
+		package ifneeded dde 1.4.0 [list load "$(TCLDDELIB:\=/)" dde]
+		package ifneeded registry 1.3.2 [list load "$(TCLREGLIB:\=/)" registry]
+<<
+
+runtest: setup $(TCLTEST) dlls $(CAT32)
+	set TCL_LIBRARY=$(ROOT:\=/)/library
+	$(DEBUGGER) $(TCLTEST) $(SCRIPT)
+
+runshell: setup $(TCLSH) dlls
+	set TCL_LIBRARY=$(ROOT:\=/)/library
+	$(DEBUGGER) $(TCLSH) $(SCRIPT)
+
+!if $(STATIC_BUILD)
+
+$(TCLLIB): $(TCLOBJS)
+	$(LIBCMD) @<<
+$**
+<<
+
+!else
+
+$(TCLLIB): $(TCLOBJS)
+	$(DLLCMD) @<<
+$**
+<<
+	$(_VC_MANIFEST_EMBED_DLL)
+$(TCLIMPLIB): $(TCLLIB)
+
+!endif # $(STATIC_BUILD)
+
+
+$(TCLSTUBLIB): $(TCLSTUBOBJS)
+	$(LIBCMD) -nodefaultlib $(TCLSTUBOBJS)
+
+$(TCLSH): $(TCLSHOBJS) $(TCLSTUBLIB) $(TCLIMPLIB)
+	$(CONEXECMD) -stack:2300000 $**
+	$(_VC_MANIFEST_EMBED_EXE)
+
+$(TCLTEST): $(TCLTESTOBJS) $(TCLSTUBLIB) $(TCLIMPLIB)
+	$(CONEXECMD) -stack:2300000 $**
+	$(_VC_MANIFEST_EMBED_EXE)
+
+!if $(STATIC_BUILD)
+$(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj
+	$(LIBCMD) $**
+!else
+$(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj $(TCLSTUBLIB)
+	$(DLLCMD) $**
+	$(_VC_MANIFEST_EMBED_DLL)
+!endif
+
+!if $(STATIC_BUILD)
+$(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj
+	$(LIBCMD) $**
+!else
+$(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj $(TCLSTUBLIB)
+	$(DLLCMD) $**
+	$(_VC_MANIFEST_EMBED_DLL)
+!endif
+
+pkgs:
+	@for /d %d in ($(PKGSDIR)\*) do \
+	  @if exist "%~fd\win\makefile.vc" ( \
+	    pushd "%~fd\win" & \
+	    $(MAKE) -$(MAKEFLAGS) -f makefile.vc TCLDIR=$(ROOT) &\
+	    popd \
+	  )
+
+test-pkgs:
+	@for /d %d in ($(PKGSDIR)\*) do \
+	  @if exist "%~fd\win\makefile.vc" ( \
+	    pushd "%~fd\win" & \
+	    $(MAKE) -$(MAKEFLAGS) -f makefile.vc TCLDIR=$(ROOT) test &\
+	    popd \
+	  )
+
+install-pkgs:
+	@for /d %d in ($(PKGSDIR)\*) do \
+	  @if exist "%~fd\win\makefile.vc" ( \
+	    pushd "%~fd\win" & \
+	    $(MAKE) -$(MAKEFLAGS) -f makefile.vc TCLDIR=$(ROOT) install &\
+	    popd \
+	  )
+
+clean-pkgs:
+	@for /d %d in ($(PKGSDIR)\*) do \
+	  @if exist "%~fd\win\makefile.vc" ( \
+	    pushd "%~fd\win" & \
+	    $(MAKE) -$(MAKEFLAGS) -f makefile.vc TCLDIR=$(ROOT) clean &\
+	    popd \
+	  )
+
+$(CAT32): $(WINDIR)\cat.c
+	$(cc32) $(cflags) $(crt) -D_CRT_NONSTDC_NO_DEPRECATE -DCONSOLE -Fo$(TMP_DIR)\ $?
+	$(CONEXECMD) -stack:16384 $(TMP_DIR)\cat.obj
+	$(_VC_MANIFEST_EMBED_EXE)
+
+#---------------------------------------------------------------------
+# Regenerate the stubs files.  [Development use only]
+#---------------------------------------------------------------------
+
+genstubs:
+!if !exist($(TCLSH))
+	@echo Build tclsh first!
+!else
+	$(TCLSH) $(TOOLSDIR:\=/)/genStubs.tcl $(GENERICDIR:\=/) \
+		$(GENERICDIR:\=/)/tcl.decls $(GENERICDIR:\=/)/tclInt.decls \
+		$(GENERICDIR:\=/)/tclTomMath.decls
+	$(TCLSH) $(TOOLSDIR:\=/)/genStubs.tcl $(GENERICDIR:\=/) \
+		$(GENERICDIR:\=/)/tclOO.decls
+!endif
+
+
+#----------------------------------------------------------------------
+# The following target generates the file generic/tclTomMath.h.
+# It needs to be run (and the results checked) after updating
+# to a new release of libtommath.
+#----------------------------------------------------------------------
+
+gentommath_h:
+!if !exist($(TCLSH))
+	@echo Build tclsh first!
+!else
+	$(TCLSH) "$(TOOLSDIR:\=/)/fix_tommath_h.tcl" \
+		"$(TOMMATHDIR:\=/)/tommath.h" \
+		> "$(GENERICDIR)\tclTomMath.h"
+!endif
+
+#---------------------------------------------------------------------
+# Build the Windows HTML help file.
+#---------------------------------------------------------------------
+
+# NOTE: you can define HHC on the command-line to override this.
+# nmake does not set macro values if already set on the command line.
+!if defined(PROCESSOR_ARCHITECTURE) && "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
+HHC="%ProgramFiles(x86)%\HTML Help Workshop\hhc.exe"
+!else
+HHC="%ProgramFiles%\HTML Help Workshop\hhc.exe"
+!endif
+HTMLDIR=$(OUT_DIR)\html
+HTMLBASE=TclTk$(VERSION)
+HHPFILE=$(HTMLDIR)\$(HTMLBASE).hhp
+CHMFILE=$(HTMLDIR)\$(HTMLBASE).chm
+
+htmlhelp: chmsetup $(CHMFILE)
+
+$(CHMFILE): $(DOCDIR)\*
+	@$(TCLSH) $(TOOLSDIR)\tcltk-man2html.tcl "--htmldir=$(HTMLDIR)"
+	@echo Compiling HTML help project
+	-"$(HHC)" <<$(HHPFILE) >NUL
+[OPTIONS]
+Compatibility=1.1 or later
+Compiled file=$(HTMLBASE).chm
+Default topic=contents.htm
+Display compile progress=no
+Error log file=$(HTMLBASE).log
+Full-text search=Yes
+Language=0x409 English (United States)
+Title=Tcl/Tk $(DOTVERSION) Help
+[FILES]
+contents.htm
+docs.css
+Keywords\*.htm
+TclCmd\*.htm
+TclLib\*.htm
+TkCmd\*.htm
+TkLib\*.htm
+UserCmd\*.htm
+<<
+
+chmsetup:
+	@if not exist $(HTMLDIR)\nul mkdir $(HTMLDIR)
+
+install-docs:
+!if exist("$(CHMFILE)")
+	@echo Installing compiled HTML help
+	@$(CPY) "$(CHMFILE)" "$(DOC_INSTALL_DIR)\"
+!endif
+
+# "emacs font-lock highlighting fix
+
+#---------------------------------------------------------------------
+# Generate the tcl.nmake file which contains the options used to build
+# Tcl itself. This is used when building extensions.
+#---------------------------------------------------------------------
+tcl-nmake: $(OUT_DIR)\tcl.nmake
+$(OUT_DIR)\tcl.nmake:
+	@type << >$@
+CORE_MACHINE = $(MACHINE)
+CORE_DEBUG = $(DEBUG)
+CORE_TCL_THREADS = $(TCL_THREADS)
+CORE_USE_THREAD_ALLOC = $(USE_THREAD_ALLOC)
+CORE_USE_WIDECHAR_API = $(USE_WIDECHAR_API)
+<<
+
+#---------------------------------------------------------------------
+# Build tclConfig.sh for the TEA build system.
+#---------------------------------------------------------------------
+
+tclConfig: $(OUT_DIR)\tclConfig.sh
+
+# TBD - is this tclConfig.sh file ever used? The values are incorrect!
+$(OUT_DIR)\tclConfig.sh: $(WINDIR)\tclConfig.sh.in
+	@echo Creating tclConfig.sh
+        @nmakehlp -s << $** >$@
+@TCL_DLL_FILE@       $(TCLLIBNAME)
+@TCL_VERSION@        $(DOTVERSION)
+@TCL_MAJOR_VERSION@  $(TCL_MAJOR_VERSION)
+@TCL_MINOR_VERSION@  $(TCL_MINOR_VERSION)
+@TCL_PATCH_LEVEL@    $(TCL_PATCH_LEVEL)
+@CC@                 $(CC)
+@DEFS@               $(pkgcflags)
+@CFLAGS_DEBUG@       -nologo -c -W3 -YX -Fp$(TMP_DIR)\ -MDd
+@CFLAGS_OPTIMIZE@    -nologo -c -W3 -YX -Fp$(TMP_DIR)\ -MD
+@LDFLAGS_DEBUG@      -nologo -machine:$(MACHINE) -debug -debugtype:cv
+@LDFLAGS_OPTIMIZE@   -nologo -machine:$(MACHINE) -release -opt:ref -opt:icf,3
+@TCL_DBGX@           $(SUFX)
+@TCL_LIB_FILE@       $(PROJECT)$(VERSION)$(SUFX).lib
+@TCL_NEEDS_EXP_FILE@
+@LIBS@               $(baselibs) $(PRJ_LIBS)
+@prefix@             $(_INSTALLDIR)
+@exec_prefix@        $(BIN_INSTALL_DIR)
+@SHLIB_CFLAGS@
+@STLIB_CFLAGS@
+@CFLAGS_WARNING@     -W3
+@EXTRA_CFLAGS@       -YX
+@SHLIB_LD@           $(link32) $(dlllflags)
+@STLIB_LD@           $(lib32) -nologo
+@SHLIB_LD_LIBS@      $(baselibs) $(PRJ_LIBS)
+@SHLIB_SUFFIX@       .dll
+@DL_LIBS@
+@LDFLAGS@
+@TCL_CC_SEARCH_FLAGS@
+@TCL_LD_SEARCH_FLAGS@
+@LIBOBJS@
+@RANLIB@
+@TCL_LIB_FLAG@
+@TCL_BUILD_LIB_SPEC@
+@TCL_LIB_SPEC@       $(LIB_INSTALL_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib
+@TCL_INCLUDE_SPEC@   -I$(INCLUDE_INSTALL_DIR)
+@TCL_LIB_VERSIONS_OK@
+@TCL_SRC_DIR@        $(ROOT)
+@TCL_PACKAGE_PATH@
+@TCL_STUB_LIB_FILE@  $(TCLSTUBLIBNAME)
+@TCL_STUB_LIB_FLAG@  $(TCLSTUBLIBNAME)
+@TCL_STUB_LIB_SPEC@  -L$(LIB_INSTALL_DIR) $(TCLSTUBLIBNAME)
+@TCL_THREADS@        $(TCL_THREADS)
+@TCL_BUILD_STUB_LIB_SPEC@ -L$(OUT_DIR) $(TCLSTUBLIBNAME)
+@TCL_BUILD_STUB_LIB_PATH@ $(TCLSTUBLIB)
+@TCL_STUB_LIB_PATH@  $(LIB_INSTALL_DIR)\$(TCLSTUBLIBNAME)
+@CFG_TCL_EXPORT_FILE_SUFFIX@  $(VERSION)$(SUFX).lib
+@CFG_TCL_SHARED_LIB_SUFFIX@   $(VERSION)$(SUFX).dll
+@CFG_TCL_UNSHARED_LIB_SUFFIX@ $(VERSION)$(SUFX).lib
+!if $(STATIC_BUILD)
+@TCL_SHARED_BUILD@   0
+!else
+@TCL_SHARED_BUILD@   1
+!endif
+<<
+
+
+#---------------------------------------------------------------------
+# The following target generates the file generic/tclDate.c
+# from the yacc grammar found in generic/tclGetDate.y.  This is
+# only run by hand as yacc is not available in all environments.
+# The name of the .c file is different than the name of the .y file
+# so that make doesn't try to automatically regenerate the .c file.
+#---------------------------------------------------------------------
+
+gendate:
+	bison --output-file=$(GENERICDIR)/tclDate.c \
+	--name-prefix=TclDate \
+	$(GENERICDIR)/tclGetDate.y
+
+#---------------------------------------------------------------------
+# Special case object file targets
+#---------------------------------------------------------------------
+
+$(TMP_DIR)\testMain.obj: $(WINDIR)\tclAppInit.c
+	$(cc32) $(appcflags) -DTCL_TEST \
+	    -DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \
+	    -Fo$@ $?
+
+$(TMP_DIR)\tclMain2.obj: $(GENERICDIR)\tclMain.c
+	$(cc32) $(pkgcflags) -DTCL_ASCII_MAIN \
+	    -Fo$@ $?
+
+$(TMP_DIR)\tclTest.obj: $(GENERICDIR)\tclTest.c
+	$(cc32) $(appcflags) -Fo$@ $?
+
+$(TMP_DIR)\tclTestObj.obj: $(GENERICDIR)\tclTestObj.c
+	$(cc32) $(appcflags) -Fo$@ $?
+
+$(TMP_DIR)\tclWinTest.obj: $(WINDIR)\tclWinTest.c
+	$(CCAPPCMD) $?
+
+$(TMP_DIR)\tclZlib.obj: $(GENERICDIR)\tclZlib.c
+	$(cc32) $(pkgcflags) -I$(COMPATDIR)\zlib -Fo$@ $?
+
+$(TMP_DIR)\tclPkgConfig.obj: $(GENERICDIR)\tclPkgConfig.c
+	$(cc32) $(pkgcflags) \
+	-DCFG_INSTALL_LIBDIR="\"$(LIB_INSTALL_DIR:\=\\)\"" \
+	-DCFG_INSTALL_BINDIR="\"$(BIN_INSTALL_DIR:\=\\)\"" \
+	-DCFG_INSTALL_SCRDIR="\"$(SCRIPT_INSTALL_DIR:\=\\)\"" \
+	-DCFG_INSTALL_INCDIR="\"$(INCLUDE_INSTALL_DIR:\=\\)\"" \
+	-DCFG_INSTALL_DOCDIR="\"$(DOC_INSTALL_DIR:\=\\)\""	\
+	-DCFG_RUNTIME_LIBDIR="\"$(LIB_INSTALL_DIR:\=\\)\"" \
+	-DCFG_RUNTIME_BINDIR="\"$(BIN_INSTALL_DIR:\=\\)\"" \
+	-DCFG_RUNTIME_SCRDIR="\"$(SCRIPT_INSTALL_DIR:\=\\)\"" \
+	-DCFG_RUNTIME_INCDIR="\"$(INCLUDE_INSTALL_DIR:\=\\)\"" \
+	-DCFG_RUNTIME_DOCDIR="\"$(DOC_INSTALL_DIR:\=\\)\""     \
+	-Fo$@ $?
+
+$(TMP_DIR)\tclAppInit.obj: $(WINDIR)\tclAppInit.c
+	$(cc32) $(appcflags) \
+	    -DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \
+	    -Fo$@ $?
+
+### The following objects should be built using the stub interfaces
+### *ALL* extensions need to built with -DTCL_THREADS=1
+
+$(TMP_DIR)\tclWinReg.obj: $(WINDIR)\tclWinReg.c
+!if $(STATIC_BUILD)
+	$(cc32) $(appcflags) -DSTATIC_BUILD -Fo$@ $?
+!else
+	$(cc32) $(appcflags) -DUSE_TCL_STUBS -Fo$@ $?
+!endif
+
+
+$(TMP_DIR)\tclWinDde.obj: $(WINDIR)\tclWinDde.c
+!if $(STATIC_BUILD)
+	$(cc32) $(appcflags) -DSTATIC_BUILD -Fo$@ $?
+!else
+	$(cc32) $(appcflags) -DUSE_TCL_STUBS -Fo$@ $?
+!endif
+
+
+### The following objects are part of the stub library and should not
+### be built as DLL objects.  -Zl is used to avoid a dependency on any
+### specific C run-time.
+
+$(TMP_DIR)\tclStubLib.obj: $(GENERICDIR)\tclStubLib.c
+	$(cc32) $(stubscflags) -Fo$@ $?
+
+$(TMP_DIR)\tclTomMathStubLib.obj: $(GENERICDIR)\tclTomMathStubLib.c
+	$(cc32) $(stubscflags) -Fo$@ $?
+
+$(TMP_DIR)\tclOOStubLib.obj: $(GENERICDIR)\tclOOStubLib.c
+	$(cc32) $(stubscflags) -Fo$@ $?
+
+$(TMP_DIR)\tclsh.exe.manifest: $(WINDIR)\tclsh.exe.manifest.in
+	@nmakehlp -s << $** >$@
+@MACHINE@	  $(MACHINE:IX86=X86)
+@TCL_WIN_VERSION@  $(DOTVERSION).0.0
+<<
+
+#---------------------------------------------------------------------
+# Generate the source dependencies.  Having dependency rules will
+# improve incremental build accuracy without having to resort to a
+# full rebuild just because some non-global header file like
+# tclCompile.h was changed.  These rules aren't needed when building
+# from scratch.
+#---------------------------------------------------------------------
+
+depend:
+!if !exist($(TCLSH))
+	@echo Build tclsh first!
+!else
+	$(TCLSH) $(TOOLSDIR:\=/)/mkdepend.tcl -vc32 -out:"$(OUT_DIR)\depend.mk" \
+		-passthru:"-DBUILD_tcl $(TCL_INCLUDES) $(PRJ_INCLUDES)" $(GENERICDIR),$$(GENERICDIR) \
+		$(COMPATDIR),$$(COMPATDIR) $(TOMMATHDIR),$$(TOMMATHDIR) $(WINDIR),$$(WINDIR) @<<
+$(TCLOBJS)
+<<
+!endif
+
+#---------------------------------------------------------------------
+# Dependency rules
+#---------------------------------------------------------------------
+
+!if exist("$(OUT_DIR)\depend.mk")
+!include "$(OUT_DIR)\depend.mk"
+!message *** Dependency rules in use.
+!else
+!message *** Dependency rules are not being used.
+!endif
+
+### add a spacer in the output
+!message
+
+
+#---------------------------------------------------------------------
+# Implicit rules that are not covered by the common ones defined in
+# rules.vc. A limitation exists with nmake that requires that
+# source directory can not contain spaces in the path.  This an
+# absolute.
+#---------------------------------------------------------------------
+
+{$(TOMMATHDIR)}.c{$(TMP_DIR)}.obj::
+	$(cc32) $(pkgcflags) -Fo$(TMP_DIR)\ @<<
+$<
+<<
+
+{$(COMPATDIR)\zlib}.c{$(TMP_DIR)}.obj::
+	$(cc32) $(pkgcflags) -Fo$(TMP_DIR)\ @<<
+$<
+<<
+
+$(TMP_DIR)\tclsh.res: $(TMP_DIR)\tclsh.exe.manifest $(WINDIR)\tclsh.rc
+
+
+#---------------------------------------------------------------------
+# Installation.
+#---------------------------------------------------------------------
+
+install-binaries:
+	@echo Installing to '$(_INSTALLDIR)'
+	@echo Installing $(TCLLIBNAME)
+!if "$(TCLLIB)" != "$(TCLIMPLIB)"
+	@$(CPY) "$(TCLLIB)" "$(BIN_INSTALL_DIR)\"
+!endif
+	@$(CPY) "$(TCLIMPLIB)" "$(LIB_INSTALL_DIR)\"
+!if exist($(TCLSH))
+	@echo Installing $(TCLSHNAME)
+	@$(CPY) "$(TCLSH)" "$(BIN_INSTALL_DIR)\"
+!endif
+	@echo Installing $(TCLSTUBLIBNAME)
+	@$(CPY) "$(TCLSTUBLIB)" "$(LIB_INSTALL_DIR)\"
+
+install-libraries: tclConfig tcl-nmake install-msgs install-tzdata
+	@if not exist "$(SCRIPT_INSTALL_DIR)" \
+		$(MKDIR) "$(SCRIPT_INSTALL_DIR)"
+	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8" \
+		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8"
+	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4" \
+		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4"
+	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4\platform" \
+		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4\platform"
+	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.5" \
+		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.5"
+	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.6" \
+		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.6"
+	@if not exist "$(LIB_INSTALL_DIR)\nmake" \
+		$(MKDIR) "$(LIB_INSTALL_DIR)\nmake"
+	@echo Installing header files
+	@$(CPY) "$(GENERICDIR)\tcl.h"             "$(INCLUDE_INSTALL_DIR)\"
+	@$(CPY) "$(GENERICDIR)\tclDecls.h"        "$(INCLUDE_INSTALL_DIR)\"
+	@$(CPY) "$(GENERICDIR)\tclOO.h"           "$(INCLUDE_INSTALL_DIR)\"
+	@$(CPY) "$(GENERICDIR)\tclOODecls.h"      "$(INCLUDE_INSTALL_DIR)\"
+	@$(CPY) "$(GENERICDIR)\tclPlatDecls.h"    "$(INCLUDE_INSTALL_DIR)\"
+	@$(CPY) "$(GENERICDIR)\tclTomMath.h"      "$(INCLUDE_INSTALL_DIR)\"
+	@$(CPY) "$(GENERICDIR)\tclTomMathDecls.h" "$(INCLUDE_INSTALL_DIR)\"
+	@$(CPY) "$(TOMMATHDIR)\tommath_class.h"   "$(INCLUDE_INSTALL_DIR)\"
+	@$(CPY) "$(TOMMATHDIR)\tommath_superclass.h" "$(INCLUDE_INSTALL_DIR)\"
+	@echo Installing library files to $(SCRIPT_INSTALL_DIR)
+	@$(CPY) "$(ROOT)\library\history.tcl"     "$(SCRIPT_INSTALL_DIR)\"
+	@$(CPY) "$(ROOT)\library\init.tcl"        "$(SCRIPT_INSTALL_DIR)\"
+	@$(CPY) "$(ROOT)\library\clock.tcl"       "$(SCRIPT_INSTALL_DIR)\"
+	@$(CPY) "$(ROOT)\library\tm.tcl"          "$(SCRIPT_INSTALL_DIR)\"
+	@$(CPY) "$(ROOT)\library\parray.tcl"      "$(SCRIPT_INSTALL_DIR)\"
+	@$(CPY) "$(ROOT)\library\safe.tcl"        "$(SCRIPT_INSTALL_DIR)\"
+	@$(CPY) "$(ROOT)\library\tclIndex"        "$(SCRIPT_INSTALL_DIR)\"
+	@$(CPY) "$(ROOT)\library\package.tcl"     "$(SCRIPT_INSTALL_DIR)\"
+	@$(CPY) "$(ROOT)\library\word.tcl"        "$(SCRIPT_INSTALL_DIR)\"
+	@$(CPY) "$(ROOT)\library\auto.tcl"        "$(SCRIPT_INSTALL_DIR)\"
+	@$(CPY) "$(OUT_DIR)\tclConfig.sh"         "$(LIB_INSTALL_DIR)\"
+	@$(CPY) "$(WINDIR)\tclooConfig.sh"        "$(LIB_INSTALL_DIR)\"
+	@$(CPY) "$(WINDIR)\rules.vc"              "$(LIB_INSTALL_DIR)\nmake\"
+	@$(CPY) "$(WINDIR)\targets.vc"              "$(LIB_INSTALL_DIR)\nmake\"
+	@$(CPY) "$(WINDIR)\nmakehlp.c"            "$(LIB_INSTALL_DIR)\nmake\"
+	@$(CPY) "$(OUT_DIR)\tcl.nmake"            "$(LIB_INSTALL_DIR)\nmake\"
+	@echo Installing library opt0.4 directory
+	@$(CPY) "$(ROOT)\library\opt\*.tcl" \
+	    "$(SCRIPT_INSTALL_DIR)\opt0.4\"
+	@echo Installing package http $(PKG_HTTP_VER) as a Tcl Module
+	@$(COPY) "$(ROOT)\library\http\http.tcl" \
+	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.6\http-$(PKG_HTTP_VER).tm"
+	@echo Installing package msgcat $(PKG_MSGCAT_VER) as a Tcl Module
+	@$(COPY) "$(ROOT)\library\msgcat\msgcat.tcl" \
+	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.7\msgcat-$(PKG_MSGCAT_VER).tm"
+	@echo Installing package tcltest $(PKG_TCLTEST_VER) as a Tcl Module
+	@$(COPY) "$(ROOT)\library\tcltest\tcltest.tcl" \
+	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.5\tcltest-$(PKG_TCLTEST_VER).tm"
+	@echo Installing package platform $(PKG_PLATFORM_VER) as a Tcl Module
+	@$(COPY) "$(ROOT)\library\platform\platform.tcl" \
+	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4\platform-$(PKG_PLATFORM_VER).tm"
+	@echo Installing package platform::shell $(PKG_SHELL_VER) as a Tcl Module
+	@$(COPY) "$(ROOT)\library\platform\shell.tcl" \
+	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4\platform\shell-$(PKG_SHELL_VER).tm"
+	@echo Installing $(TCLDDELIBNAME)
+!if $(STATIC_BUILD)
+!if !$(TCL_USE_STATIC_PACKAGES)
+	@$(CPY) "$(TCLDDELIB)" "$(LIB_INSTALL_DIR)\"
+!endif
+!else
+	@$(CPY) "$(TCLDDELIB)" "$(LIB_INSTALL_DIR)\dde$(DDEDOTVERSION)\"
+	@$(CPY) "$(ROOT)\library\dde\pkgIndex.tcl" \
+	    "$(LIB_INSTALL_DIR)\dde$(DDEDOTVERSION)\"
+!endif
+	@echo Installing $(TCLREGLIBNAME)
+!if $(STATIC_BUILD)
+!if !$(TCL_USE_STATIC_PACKAGES)
+	@$(CPY) "$(TCLREGLIB)" "$(LIB_INSTALL_DIR)\"
+!endif
+!else
+	@$(CPY) "$(TCLREGLIB)" "$(LIB_INSTALL_DIR)\reg$(REGDOTVERSION)\"
+	@$(CPY) "$(ROOT)\library\reg\pkgIndex.tcl" \
+	    "$(LIB_INSTALL_DIR)\reg$(REGDOTVERSION)\"
+!endif
+	@echo Installing encodings
+	@$(CPY) "$(ROOT)\library\encoding\*.enc" \
+		"$(SCRIPT_INSTALL_DIR)\encoding\"
+# "emacs font-lock highlighting fix
+
+install-tzdata:
+	@echo Installing time zone data
+	@set TCL_LIBRARY=$(ROOT:\=/)/library
+	@$(TCLSH_NATIVE) "$(ROOT:\=/)/tools/installData.tcl" \
+	    "$(ROOT:\=/)/library/tzdata" "$(SCRIPT_INSTALL_DIR)/tzdata"
+
+install-msgs:
+	@echo Installing message catalogs
+	@set TCL_LIBRARY=$(ROOT:\=/)/library
+	@$(TCLSH_NATIVE) "$(ROOT:\=/)/tools/installData.tcl" \
+	    "$(ROOT:\=/)/library/msgs" "$(SCRIPT_INSTALL_DIR)/msgs"
+
+#---------------------------------------------------------------------
+# Clean up
+#---------------------------------------------------------------------
+
+tidy:
+!if "$(TCLLIB)" != "$(TCLIMPLIB)"
+	@echo Removing $(TCLLIB) ...
+	@if exist $(TCLLIB) del $(TCLLIB)
+!endif
+	@echo Removing $(TCLIMPLIB) ...
+	@if exist $(TCLIMPLIB) del $(TCLIMPLIB)
+	@echo Removing $(TCLSH) ...
+	@if exist $(TCLSH) del $(TCLSH)
+	@echo Removing $(TCLTEST) ...
+	@if exist $(TCLTEST) del $(TCLTEST)
+	@echo Removing $(TCLDDELIB) ...
+	@if exist $(TCLDDELIB) del $(TCLDDELIB)
+	@echo Removing $(TCLREGLIB) ...
+	@if exist $(TCLREGLIB) del $(TCLREGLIB)
+
+clean: default-clean clean-pkgs
+hose: default-hose
+realclean: hose
+
+# Local Variables:
+# mode: makefile
+# End:
-- 
cgit v0.12


From bac2aebf1061014fdf5973b4d8d79544d24e74e0 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Tue, 20 Mar 2018 16:10:49 +0000
Subject: Test and fix for botch in binary string replace.

---
 generic/tclStringObj.c | 1 +
 tests/string.test      | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 9913160..2ebec64 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -3637,6 +3637,7 @@ TclStringReplace(
 	    }
 	    result = Tcl_NewByteArrayObj(NULL, numBytes - count + newBytes);
 								/* PANIC? */
+	    Tcl_SetByteArrayLength(result, 0);
 	    TclAppendBytesToByteArray(result, bytes, first);	
 	    TclAppendBytesToByteArray(result, iBytes, newBytes);
 	    TclAppendBytesToByteArray(result, bytes + first + count,
diff --git a/tests/string.test b/tests/string.test
index f4b94de..bfd8d58 100644
--- a/tests/string.test
+++ b/tests/string.test
@@ -20,6 +20,9 @@ if {[lsearch [namespace children] ::tcltest] == -1} {
 ::tcltest::loadTestedCommands
 catch [list package require -exact Tcltest [info patchlevel]]
 
+# Helper commands to test various optimizations, code paths, and special cases.
+proc makeByteArray {s} {binary format a* $s}
+
 # Some tests require the testobj command
 
 testConstraint testobj [expr {[info commands testobj] != {}}]
@@ -1396,6 +1399,9 @@ test string-14.18 {string replace} {
 test string-14.19 {string replace} {
     string replace {} -1 0 A
 } A
+test string-14.20 {string replace} {
+    string replace [makeByteArray abcdefghijklmnop] end-10 end-2 [makeByteArray NEW]
+} abcdeNEWop
 
 test string-15.1 {string tolower too few args} {
     list [catch {string tolower} msg] $msg
-- 
cgit v0.12


From dc07332444484fd4bdb433ea09e36316be74d8f0 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Tue, 20 Mar 2018 19:25:54 +0000
Subject: Merge over testing improvements from the TIP 475 work. Test files
 string.test and stringComp.test had become out of sync. Use one file to
 maintain even coverage.

---
 tests/basic.test      |    2 +-
 tests/compile.test    |    3 +-
 tests/string.test     | 2537 +++++++++++++++++++++++++++----------------------
 tests/stringComp.test |  801 ----------------
 4 files changed, 1389 insertions(+), 1954 deletions(-)
 delete mode 100644 tests/stringComp.test

diff --git a/tests/basic.test b/tests/basic.test
index 0e4ddea..2332994 100644
--- a/tests/basic.test
+++ b/tests/basic.test
@@ -670,7 +670,7 @@ proc l3 {} {
 }
 
 # Do all tests once byte compiled and once with direct string evaluation
-for {set noComp 0} {$noComp <= 1} {incr noComp} {
+foreach noComp {0 1} {
 
 if $noComp {
     interp alias {} run {} testevalex
diff --git a/tests/compile.test b/tests/compile.test
index 2fa4147..fb9a87a 100644
--- a/tests/compile.test
+++ b/tests/compile.test
@@ -499,7 +499,8 @@ test compile-15.5 {proper TCL_RETURN code from [return]} {
     apply {{} {catch {set a 1}; return}}
 } ""
 
-for {set noComp 0} {$noComp <= 1} {incr noComp} {
+# Do all tests once byte compiled and once with direct string evaluation
+foreach noComp {0 1} {
 
 if $noComp {
     interp alias {} run {} testevalex
diff --git a/tests/string.test b/tests/string.test
index bfd8d58..da302eb 100644
--- a/tests/string.test
+++ b/tests/string.test
@@ -22,289 +22,470 @@ catch [list package require -exact Tcltest [info patchlevel]]
 
 # Helper commands to test various optimizations, code paths, and special cases.
 proc makeByteArray {s} {binary format a* $s}
+proc makeUnicode {s} {lindex [regexp -inline .* $s] 0}
+proc makeList {args} {return $args}
+proc makeShared {s} {uplevel 1 [list lappend copy $s]; return $s}
 
 # Some tests require the testobj command
 
-testConstraint testobj [expr {[info commands testobj] != {}}]
-testConstraint testindexobj [expr {[info commands testindexobj] != {}}]
+testConstraint testobj [expr {[info commands testobj] ne {}}]
+testConstraint testindexobj [expr {[info commands testindexobj] ne {}}]
+testConstraint testevalex [expr {[info commands testevalex] ne {}}]
 testConstraint fullutf [expr {[format %c 0x010000] != "\ufffd"}]
 
 # Used for constraining memory leak tests
 testConstraint memory [llength [info commands memory]]
+if {[testConstraint memory]} {
+    proc getbytes {} {
+        set lines [split [memory info] \n]
+        return [lindex $lines 3 3]
+    }
+    proc leaktest {script {iterations 3}} {
+        set end [getbytes]
+        for {set i 0} {$i < $iterations} {incr i} {
+            uplevel 1 $script
+            set tmp $end
+            set end [getbytes]
+        }
+        return [expr {$end - $tmp}]
+    }
+}
 
 proc representationpoke s {
     set r [::tcl::unsupported::representation $s]
     list [lindex $r 3] [string match {*, string representation "*"} $r]
 }
+
+foreach noComp {0 1} {
+
+if {$noComp} {
+    if {[info commands testevalex] eq {}} {
+	test string-0.1.$noComp "show testevalex availability" {testevalex} {list} {}
+	continue
+    }
+    interp alias {} run {} testevalex
+    set constraints testevalex
+} else {
+    interp alias {} run {} try
+    set constraints {}
+}
+
 
-test string-1.1 {error conditions} {
-    list [catch {string gorp a b} msg] $msg
+test string-1.1.$noComp {error conditions} {
+    list [catch {run {string gorp a b}} msg] $msg
 } {1 {unknown or ambiguous subcommand "gorp": must be bytelength, cat, compare, equal, first, index, is, last, length, map, match, range, repeat, replace, reverse, tolower, totitle, toupper, trim, trimleft, trimright, wordend, or wordstart}}
-test string-1.2 {error conditions} {
-    list [catch {string} msg] $msg
+test string-1.2.$noComp {error conditions} {
+    list [catch {run {string}} msg] $msg
 } {1 {wrong # args: should be "string subcommand ?arg ...?"}}
+test stringComp-1.3.$noComp {error condition - undefined method during compile} {
+    # We don't want this to complain about 'never' because it may never
+    # be called, or string may get redefined.  This must compile OK.
+    proc foo {str i} {
+        if {"yes" == "no"} { string never called but complains here }
+        string index $str $i
+    }
+    foo abc 0
+} a
 
-test string-2.1 {string compare, too few args} {
-    list [catch {string compare a} msg] $msg
+test string-2.1.$noComp {string compare, too few args} {
+    list [catch {run {string compare a}} msg] $msg
 } {1 {wrong # args: should be "string compare ?-nocase? ?-length int? string1 string2"}}
-test string-2.2 {string compare, bad args} {
-    list [catch {string compare a b c} msg] $msg
+test string-2.2.$noComp {string compare, bad args} {
+    list [catch {run {string compare a b c}} msg] $msg
 } {1 {bad option "a": must be -nocase or -length}}
-test string-2.3 {string compare, bad args} {
-    list [catch {string compare -length -nocase str1 str2} msg] $msg
+test string-2.3.$noComp {string compare, bad args} {
+    list [catch {run {string compare -length -nocase str1 str2}} msg] $msg
 } {1 {expected integer but got "-nocase"}}
-test string-2.4 {string compare, too many args} {
-    list [catch {string compare -length 10 -nocase str1 str2 str3} msg] $msg
+test string-2.4.$noComp {string compare, too many args} {
+    list [catch {run {string compare -length 10 -nocase str1 str2 str3}} msg] $msg
 } {1 {wrong # args: should be "string compare ?-nocase? ?-length int? string1 string2"}}
-test string-2.5 {string compare with length unspecified} {
-    list [catch {string compare -length 10 10} msg] $msg
+test string-2.5.$noComp {string compare with length unspecified} {
+    list [catch {run {string compare -length 10 10}} msg] $msg
 } {1 {wrong # args: should be "string compare ?-nocase? ?-length int? string1 string2"}}
-test string-2.6 {string compare} {
-    string compare abcde abdef
+test string-2.6.$noComp {string compare} {
+    run {string compare abcde abdef}
 } -1
-test string-2.7 {string compare, shortest method name} {
-    string co abcde ABCDE
+test string-2.7.$noComp {string compare, shortest method name} {
+    run {string co abcde ABCDE}
 } 1
-test string-2.8 {string compare} {
-    string compare abcde abcde
+test string-2.8.$noComp {string compare} {
+    run {string compare abcde abcde}
 } 0
-test string-2.9 {string compare with length} {
-    string compare -length 2 abcde abxyz
+test string-2.9.$noComp {string compare with length} {
+    run {string compare -length 2 abcde abxyz}
 } 0
-test string-2.10 {string compare with special index} {
-    list [catch {string compare -length end-3 abcde abxyz} msg] $msg
+test string-2.10.$noComp {string compare with special index} {
+    list [catch {run {string compare -length end-3 abcde abxyz}} msg] $msg
 } {1 {expected integer but got "end-3"}}
-test string-2.11 {string compare, unicode} {
-    string compare ab\u7266 ab\u7267
+test string-2.11.$noComp {string compare, unicode} {
+    run {string compare ab\u7266 ab\u7267}
+} -1
+test string-2.11.1.$noComp {string compare, unicode} {
+    run {string compare \334 \u00dc}
+} 0
+test string-2.11.2.$noComp {string compare, unicode} {
+    run {string compare \334 \u00fc}
 } -1
-test string-2.12 {string compare, high bit} {
+test string-2.11.3.$noComp {string compare, unicode} {
+    run {string compare \334\334\334\374\374 \334\334\334\334\334}
+} 1
+test string-2.12.$noComp {string compare, high bit} {
     # This test will fail if the underlying comparaison
     # is using signed chars instead of unsigned chars.
     # (like SunOS's default memcmp thus the compat/memcmp.c)
-    string compare "\x80" "@"
+    run {string compare "\x80" "@"}
     # Nb this tests works also in utf8 space because \x80 is
     # translated into a 2 or more bytelength but whose first byte has
     # the high bit set.
 } 1
-test string-2.13 {string compare -nocase} {
-    string compare -nocase abcde abdef
+test string-2.13.$noComp {string compare -nocase} {
+    run {string compare -nocase abcde abdef}
+} -1
+test string-2.13.1.$noComp {string compare -nocase} {
+    run {string compare -nocase abcde Abdef}
 } -1
-test string-2.14 {string compare -nocase} {
-    string compare -nocase abcde ABCDE
+test string-2.14.$noComp {string compare -nocase} {
+    run {string compare -nocase abcde ABCDE}
+} 0
+test string-2.15.$noComp {string compare -nocase} {
+    run {string compare -nocase abcde abcde}
+} 0
+test string-2.15.1.$noComp {string compare -nocase} {
+    run {string compare -nocase \334 \u00dc}
 } 0
-test string-2.15 {string compare -nocase} {
-    string compare -nocase abcde abcde
+test string-2.15.2.$noComp {string compare -nocase} {
+    run {string compare -nocase \334\334\334\374\u00fc \334\334\334\334\334}
 } 0
-test string-2.16 {string compare -nocase with length} {
-    string compare -length 2 -nocase abcde Abxyz
+test string-2.16.$noComp {string compare -nocase with length} {
+    run {string compare -length 2 -nocase abcde Abxyz}
 } 0
-test string-2.17 {string compare -nocase with length} {
-    string compare -nocase -length 3 abcde Abxyz
+test string-2.17.$noComp {string compare -nocase with length} {
+    run {string compare -nocase -length 3 abcde Abxyz}
 } -1
-test string-2.18 {string compare -nocase with length <= 0} {
-    string compare -nocase -length -1 abcde AbCdEf
+test string-2.18.$noComp {string compare -nocase with length <= 0} {
+    run {string compare -nocase -length -1 abcde AbCdEf}
 } -1
-test string-2.19 {string compare -nocase with excessive length} {
-    string compare -nocase -length 50 AbCdEf abcde
+test string-2.19.$noComp {string compare -nocase with excessive length} {
+    run {string compare -nocase -length 50 AbCdEf abcde}
 } 1
-test string-2.20 {string compare -len unicode} {
+test string-2.20.$noComp {string compare -len unicode} {
     # These are strings that are 6 BYTELENGTH long, but the length
     # shouldn't make a different because there are actually 3 CHARS long
-    string compare -len 5 \334\334\334 \334\334\374
+    run {string compare -len 5 \334\334\334 \334\334\374}
 } -1
-test string-2.21 {string compare -nocase with special index} {
-    list [catch {string compare -nocase -length end-3 Abcde abxyz} msg] $msg
+test string-2.21.$noComp {string compare -nocase with special index} {
+    list [catch {run {string compare -nocase -length end-3 Abcde abxyz}} msg] $msg
 } {1 {expected integer but got "end-3"}}
-test string-2.22 {string compare, null strings} {
-    string compare "" ""
+test string-2.22.$noComp {string compare, null strings} {
+    run {string compare "" ""}
 } 0
-test string-2.23 {string compare, null strings} {
-    string compare "" foo
+test string-2.23.$noComp {string compare, null strings} {
+    run {string compare "" foo}
 } -1
-test string-2.24 {string compare, null strings} {
-    string compare foo ""
+test string-2.24.$noComp {string compare, null strings} {
+    run {string compare foo ""}
 } 1
-test string-2.25 {string compare -nocase, null strings} {
-    string compare -nocase "" ""
+test string-2.25.$noComp {string compare -nocase, null strings} {
+    run {string compare -nocase "" ""}
 } 0
-test string-2.26 {string compare -nocase, null strings} {
-    string compare -nocase "" foo
+test string-2.26.$noComp {string compare -nocase, null strings} {
+    run {string compare -nocase "" foo}
 } -1
-test string-2.27 {string compare -nocase, null strings} {
-    string compare -nocase foo ""
+test string-2.27.$noComp {string compare -nocase, null strings} {
+    run {string compare -nocase foo ""}
 } 1
-test string-2.28 {string compare with length, unequal strings} {
-    string compare -length 2 abc abde
+test string-2.28.$noComp {string compare with length, unequal strings} {
+    run {string compare -length 2 abc abde}
 } 0
-test string-2.29 {string compare with length, unequal strings} {
-    string compare -length 2 ab abde
+test string-2.29.$noComp {string compare with length, unequal strings} {
+    run {string compare -length 2 ab abde}
 } 0
-test string-2.30 {string compare with NUL character vs. other ASCII} {
+test string-2.30.$noComp {string compare with NUL character vs. other ASCII} {
     # Be careful here, since UTF-8 rep comparison with memcmp() of
     # these puts chars in the wrong order
-    string compare \x00 \x01
+    run {string compare \x00 \x01}
 } -1
-test string-2.31 {string compare, high bit} {
-    proc foo {} {string compare "a\x80" "a@"}
-    foo
+test string-2.31.$noComp {string compare, high bit} {
+    run {string compare "a\x80" "a@"}
 } 1
-test string-2.32 {string compare, high bit} {
-    proc foo {} {string compare "a\x00" "a\x01"}
-    foo
+test string-2.32.$noComp {string compare, high bit} {
+    run {string compare "a\x00" "a\x01"}
 } -1
-test string-2.33 {string compare, high bit} {
-    proc foo {} {string compare "\x00\x00" "\x00\x01"}
-    foo
+test string-2.33.$noComp {string compare, high bit} {
+    run {string compare "\x00\x00" "\x00\x01"}
 } -1
+test string-2.34.$noComp {string compare, binary equal} {
+    run {string compare [binary format a100 0] [binary format a100 0]}
+} 0
+test string-2.35.$noComp {string compare, binary neq} {
+    run {string compare [binary format a100a 0 1] [binary format a100a 0 0]}
+} 1
+test string-2.36.$noComp {string compare, binary neq unequal length} {
+    run {string compare [binary format a20a 0 1] [binary format a100a 0 0]}
+} 1
 
 # only need a few tests on equal, since it uses the same code as
 # string compare, but just modifies the return output
-test string-3.1 {string equal} {
-    string equal abcde abdef
+test string-3.1.$noComp {string equal} {
+    run {string equal abcde abdef}
+} 0
+test string-3.2.$noComp {string equal} {
+    run {string e abcde ABCDE}
+} 0
+test string-3.3.$noComp {string equal} {
+    run {string equal abcde abcde}
+} 1
+test string-3.4.$noComp {string equal -nocase} {
+    run {string equal -nocase \334\334\334\334\374\374\374\374 \334\334\334\334\334\334\334\334}
+} 1
+test string-3.5.$noComp {string equal -nocase} {
+    run {string equal -nocase abcde abdef}
+} 0
+test string-3.6.$noComp {string equal -nocase} {
+    run {string eq -nocase abcde ABCDE}
+} 1
+test string-3.7.$noComp {string equal -nocase} {
+    run {string equal -nocase abcde abcde}
+} 1
+test string-3.8.$noComp {string equal with length, unequal strings} {
+    run {string equal -length 2 abc abde}
+} 1
+test string-3.9.$noComp {string equal, too few args} {
+    list [catch {run {string equal a}} msg] $msg
+} {1 {wrong # args: should be "string equal ?-nocase? ?-length int? string1 string2"}}
+test string-3.10.$noComp {string equal, bad args} {
+    list [catch {run {string equal a b c}} msg] $msg
+} {1 {bad option "a": must be -nocase or -length}}
+test string-3.11.$noComp {string equal, bad args} {
+    list [catch {run {string equal -length -nocase str1 str2}} msg] $msg
+} {1 {expected integer but got "-nocase"}}
+test string-3.12.$noComp {string equal, too many args} {
+    list [catch {run {string equal -length 10 -nocase str1 str2 str3}} msg] $msg
+} {1 {wrong # args: should be "string equal ?-nocase? ?-length int? string1 string2"}}
+test string-3.13.$noComp {string equal with length unspecified} {
+    list [catch {run {string equal -length 10 10}} msg] $msg
+} {1 {wrong # args: should be "string equal ?-nocase? ?-length int? string1 string2"}}
+test string-3.14.$noComp {string equal with length} {
+    run {string equal -length 2 abcde abxyz}
+} 1
+test string-3.15.$noComp {string equal with special index} {
+    list [catch {run {string equal -length end-3 abcde abxyz}} msg] $msg
+} {1 {expected integer but got "end-3"}}
+
+test string-3.16.$noComp {string equal, unicode} {
+    run {string equal ab\u7266 ab\u7267}
+} 0
+test string-3.17.$noComp {string equal, unicode} {
+    run {string equal \334 \u00dc}
+} 1
+test string-3.18.$noComp {string equal, unicode} {
+    run {string equal \334 \u00fc}
+} 0 
+test string-3.19.$noComp {string equal, unicode} {
+    run {string equal \334\334\334\374\374 \334\334\334\334\334}
+} 0
+test string-3.20.$noComp {string equal, high bit} {
+    # This test will fail if the underlying comparaison
+    # is using signed chars instead of unsigned chars.
+    # (like SunOS's default memcmp thus the compat/memcmp.c)
+    run {string equal "\x80" "@"}
+    # Nb this tests works also in utf8 space because \x80 is
+    # translated into a 2 or more bytelength but whose first byte has
+    # the high bit set.
 } 0
-test string-3.2 {string equal} {
-    string eq abcde ABCDE
+test string-3.21.$noComp {string equal -nocase} {
+    run {string equal -nocase abcde Abdef}
 } 0
-test string-3.3 {string equal} {
-    string equal abcde abcde
+test string-3.22.$noComp {string equal, -nocase unicode} {
+    run {string equal -nocase \334 \u00dc}
 } 1
-test string-3.4 {string equal -nocase} {
-    string equal -nocase \334\334\334\334\374\374\374\374 \334\334\334\334\334\334\334\334
+test string-3.23.$noComp {string equal, -nocase unicode} {
+    run {string equal -nocase \334\334\334\374\u00fc \334\334\334\334\334}
 } 1
-test string-3.5 {string equal -nocase} {
-    string equal -nocase abcde abdef
+test string-3.24.$noComp {string equal -nocase with length} {
+    run {string equal -length 2 -nocase abcde Abxyz}
+} 1
+test string-3.25.$noComp {string equal -nocase with length} {
+    run {string equal -nocase -length 3 abcde Abxyz}
+} 0 
+test string-3.26.$noComp {string equal -nocase with length <= 0} {
+    run {string equal -nocase -length -1 abcde AbCdEf}
+} 0
+test string-3.27.$noComp {string equal -nocase with excessive length} {
+    run {string equal -nocase -length 50 AbCdEf abcde}
+} 0
+test string-3.28.$noComp {string equal -len unicode} {
+    # These are strings that are 6 BYTELENGTH long, but the length
+    # shouldn't make a different because there are actually 3 CHARS long
+    run {string equal -len 5 \334\334\334 \334\334\374}
 } 0
-test string-3.6 {string equal -nocase} {
-    string eq -nocase abcde ABCDE
+test string-3.29.$noComp {string equal -nocase with special index} {
+    list [catch {run {string equal -nocase -length end-3 Abcde abxyz}} msg] $msg
+} {1 {expected integer but got "end-3"}}
+test string-3.30.$noComp {string equal, null strings} {
+    run {string equal "" ""}
 } 1
-test string-3.7 {string equal -nocase} {
-    string equal -nocase abcde abcde
+test string-3.31.$noComp {string equal, null strings} {
+    run {string equal "" foo}
+} 0
+test string-3.32.$noComp {string equal, null strings} {
+    run {string equal foo ""}
+} 0
+test string-3.33.$noComp {string equal -nocase, null strings} {
+    run {string equal -nocase "" ""}
 } 1
-test string-3.8 {string equal with length, unequal strings} {
-    string equal -length 2 abc abde
+test string-3.34.$noComp {string equal -nocase, null strings} {
+    run {string equal -nocase "" foo}
+} 0
+test string-3.35.$noComp {string equal -nocase, null strings} {
+    run {string equal -nocase foo ""}
+} 0
+test string-3.36.$noComp {string equal with NUL character vs. other ASCII} {
+    # Be careful here, since UTF-8 rep comparison with memcmp() of
+    # these puts chars in the wrong order
+    run {string equal \x00 \x01}
+} 0
+test string-3.37.$noComp {string equal, high bit} {
+    run {string equal "a\x80" "a@"}
+} 0
+test string-3.38.$noComp {string equal, high bit} {
+    run {string equal "a\x00" "a\x01"}
+} 0
+test string-3.39.$noComp {string equal, high bit} {
+    run {string equal "a\x00\x00" "a\x00\x01"}
+} 0
+test string-3.40.$noComp {string equal, binary equal} {
+    run {string equal [binary format a100 0] [binary format a100 0]}
 } 1
+test string-3.41.$noComp {string equal, binary neq} {
+    run {string equal [binary format a100a 0 1] [binary format a100a 0 0]}
+} 0
+test string-3.42.$noComp {string equal, binary neq inequal length} {
+    run {string equal [binary format a20a 0 1] [binary format a100a 0 0]}
+} 0
 
-test string-4.1 {string first, too few args} {
-    list [catch {string first a} msg] $msg
+
+test string-4.1.$noComp {string first, too few args} {
+    list [catch {run {string first a}} msg] $msg
 } {1 {wrong # args: should be "string first needleString haystackString ?startIndex?"}}
-test string-4.2 {string first, bad args} {
-    list [catch {string first a b c} msg] $msg
+test string-4.2.$noComp {string first, bad args} {
+    list [catch {run {string first a b c}} msg] $msg
 } {1 {bad index "c": must be integer?[+-]integer? or end?[+-]integer?}}
-test string-4.3 {string first, too many args} {
-    list [catch {string first a b 5 d} msg] $msg
+test string-4.3.$noComp {string first, too many args} {
+    list [catch {run {string first a b 5 d}} msg] $msg
 } {1 {wrong # args: should be "string first needleString haystackString ?startIndex?"}}
-test string-4.4 {string first} {
-    string first bq abcdefgbcefgbqrs
+test string-4.4.$noComp {string first} {
+    run {string first bq abcdefgbcefgbqrs}
 } 12
-test string-4.5 {string first} {
-    string fir bcd abcdefgbcefgbqrs
+test string-4.5.$noComp {string first} {
+    run {string fir bcd abcdefgbcefgbqrs}
 } 1
-test string-4.6 {string first} {
-    string f b abcdefgbcefgbqrs
+test string-4.6.$noComp {string first} {
+    run {string f b abcdefgbcefgbqrs}
 } 1
-test string-4.7 {string first} {
-    string first xxx x123xx345xxx789xxx012
+test string-4.7.$noComp {string first} {
+    run {string first xxx x123xx345xxx789xxx012}
 } 9
-test string-4.8 {string first} {
-    string first "" x123xx345xxx789xxx012
+test string-4.8.$noComp {string first} {
+    run {string first "" x123xx345xxx789xxx012}
 } -1
-test string-4.9 {string first, unicode} {
-    string first x abc\u7266x
+test string-4.9.$noComp {string first, unicode} {
+    run {string first x abc\u7266x}
 } 4
-test string-4.10 {string first, unicode} {
-    string first \u7266 abc\u7266x
+test string-4.10.$noComp {string first, unicode} {
+    run {string first \u7266 abc\u7266x}
 } 3
-test string-4.11 {string first, start index} {
-    string first \u7266 abc\u7266x 3
+test string-4.11.$noComp {string first, start index} {
+    run {string first \u7266 abc\u7266x 3}
 } 3
-test string-4.12 {string first, start index} {
-    string first \u7266 abc\u7266x 4
+test string-4.12.$noComp {string first, start index} {
+    run {string first \u7266 abc\u7266x 4}
 } -1
-test string-4.13 {string first, start index} {
-    string first \u7266 abc\u7266x end-2
+test string-4.13.$noComp {string first, start index} {
+    run {string first \u7266 abc\u7266x end-2}
 } 3
-test string-4.14 {string first, negative start index} {
-    string first b abc -1
+test string-4.14.$noComp {string first, negative start index} {
+    run {string first b abc -1}
 } 1
-test string-4.15 {string first, ability to two-byte encoded utf-8 chars} {
+test string-4.15.$noComp {string first, ability to two-byte encoded utf-8 chars} {
     # Test for a bug in Tcl 8.3 where test for all-single-byte-encoded
     # strings was incorrect, leading to an index returned by [string first]
     # which pointed past the end of the string.
     set uchar \u057e    ;# character with two-byte encoding in utf-8
-    string first % %#$uchar$uchar#$uchar$uchar#% 3
+    run {string first % %#$uchar$uchar#$uchar$uchar#% 3}
 } 8
-test string-4.16 {string first, normal string vs pure unicode string} {
+test string-4.16.$noComp {string first, normal string vs pure unicode string} {
     set s hello
     regexp ll $s m
     # Representation checks are canaries
-    list [representationpoke $s] [representationpoke $m] \
-	[string first $m $s]
+    run {list [representationpoke $s] [representationpoke $m] \
+	[string first $m $s]}
 } {{string 1} {string 0} 2}
 
-test string-5.1 {string index} {
-    list [catch {string index} msg] $msg
+test string-5.1.$noComp {string index} {
+    list [catch {run {string index}} msg] $msg
 } {1 {wrong # args: should be "string index string charIndex"}}
-test string-5.2 {string index} {
-    list [catch {string index a b c} msg] $msg
+test string-5.2.$noComp {string index} {
+    list [catch {run {string index a b c}} msg] $msg
 } {1 {wrong # args: should be "string index string charIndex"}}
-test string-5.3 {string index} {
-    string index abcde 0
+test string-5.3.$noComp {string index} {
+    run {string index abcde 0}
 } a
-test string-5.4 {string index} {
-    string in abcde 4
+test string-5.4.$noComp {string index} {
+    run {string ind abcde 4}
 } e
-test string-5.5 {string index} {
-    string index abcde 5
+test string-5.5.$noComp {string index} {
+    run {string index abcde 5}
 } {}
-test string-5.6 {string index} {
-    list [catch {string index abcde -10} msg] $msg
+test string-5.6.$noComp {string index} {
+    list [catch {run {string index abcde -10}} msg] $msg
 } {0 {}}
-test string-5.7 {string index} {
-    list [catch {string index a xyz} msg] $msg
+test string-5.7.$noComp {string index} {
+    list [catch {run {string index a xyz}} msg] $msg
 } {1 {bad index "xyz": must be integer?[+-]integer? or end?[+-]integer?}}
-test string-5.8 {string index} {
-    string index abc end
+test string-5.8.$noComp {string index} {
+    run {string index abc end}
 } c
-test string-5.9 {string index} {
-    string index abc end-1
+test string-5.9.$noComp {string index} {
+    run {string index abc end-1}
 } b
-test string-5.10 {string index, unicode} {
-    string index abc\u7266d 4
+test string-5.10.$noComp {string index, unicode} {
+    run {string index abc\u7266d 4}
 } d
-test string-5.11 {string index, unicode} {
-    string index abc\u7266d 3
+test string-5.11.$noComp {string index, unicode} {
+    run {string index abc\u7266d 3}
 } \u7266
-test string-5.12 {string index, unicode over char length, under byte length} {
-    string index \334\374\334\374 6
+test string-5.12.$noComp {string index, unicode over char length, under byte length} {
+    run {string index \334\374\334\374 6}
 } {}
-test string-5.13 {string index, bytearray object} {
-    string index [binary format a5 fuz] 0
+test string-5.13.$noComp {string index, bytearray object} {
+    run {string index [binary format a5 fuz] 0}
 } f
-test string-5.14 {string index, bytearray object} {
-    string index [binary format I* {0x50515253 0x52}] 3
+test string-5.14.$noComp {string index, bytearray object} {
+    run {string index [binary format I* {0x50515253 0x52}] 3}
 } S
-test string-5.15 {string index, bytearray object} {
+test string-5.15.$noComp {string index, bytearray object} {
     set b [binary format I* {0x50515253 0x52}]
-    set i1 [string index $b end-6]
-    set i2 [string index $b 1]
-    string compare $i1 $i2
+    set i1 [run {string index $b end-6}]
+    set i2 [run {string index $b 1}]
+    run {string compare $i1 $i2}
 } 0
-test string-5.16 {string index, bytearray object with string obj shimmering} {
+test string-5.16.$noComp {string index, bytearray object with string obj shimmering} {
     set str "0123456789\x00 abcdedfghi"
     binary scan $str H* dump
-    string compare [string index $str 10] \x00
+    run {string compare [run {string index $str 10}] \x00}
 } 0
-test string-5.17 {string index, bad integer} -body {
-    list [catch {string index "abc" 0o8} msg] $msg
+test string-5.17.$noComp {string index, bad integer} -body {
+    list [catch {run {string index "abc" 0o8}} msg] $msg
 } -match glob -result {1 {*invalid octal number*}}
-test string-5.18 {string index, bad integer} -body {
-    list [catch {string index "abc" end-0o0289} msg] $msg
+test string-5.18.$noComp {string index, bad integer} -body {
+    list [catch {run {string index "abc" end-0o0289}} msg] $msg
 } -match glob -result {1 {*invalid octal number*}}
-test string-5.19 {string index, bytearray object out of bounds} {
-    string index [binary format I* {0x50515253 0x52}] -1
+test string-5.19.$noComp {string index, bytearray object out of bounds} {
+    run {string index [binary format I* {0x50515253 0x52}] -1}
 } {}
-test string-5.20 {string index, bytearray object out of bounds} {
-    string index [binary format I* {0x50515253 0x52}] 20
+test string-5.20.$noComp {string index, bytearray object out of bounds} {
+    run {string index [binary format I* {0x50515253 0x52}] 20}
 } {}
 
 
@@ -317,871 +498,871 @@ proc largest_int {} {
     return [expr {$int-1}]
 }
 
-test string-6.1 {string is, too few args} {
-    list [catch {string is} msg] $msg
+test string-6.1.$noComp {string is, too few args} {
+    list [catch {run {string is}} msg] $msg
 } {1 {wrong # args: should be "string is class ?-strict? ?-failindex var? str"}}
-test string-6.2 {string is, too few args} {
-    list [catch {string is alpha} msg] $msg
+test string-6.2.$noComp {string is, too few args} {
+    list [catch {run {string is alpha}} msg] $msg
 } {1 {wrong # args: should be "string is class ?-strict? ?-failindex var? str"}}
-test string-6.3 {string is, bad args} {
-    list [catch {string is alpha -failin str} msg] $msg
+test string-6.3.$noComp {string is, bad args} {
+    list [catch {run {string is alpha -failin str}} msg] $msg
 } {1 {wrong # args: should be "string is alpha ?-strict? ?-failindex var? str"}}
-test string-6.4 {string is, too many args} {
-    list [catch {string is alpha -failin var -strict str more} msg] $msg
+test string-6.4.$noComp {string is, too many args} {
+    list [catch {run {string is alpha -failin var -strict str more}} msg] $msg
 } {1 {wrong # args: should be "string is class ?-strict? ?-failindex var? str"}}
-test string-6.5 {string is, class check} {
-    list [catch {string is bogus str} msg] $msg
+test string-6.5.$noComp {string is, class check} {
+    list [catch {run {string is bogus str}} msg] $msg
 } {1 {bad class "bogus": must be alnum, alpha, ascii, control, boolean, digit, double, entier, false, graph, integer, list, lower, print, punct, space, true, upper, wideinteger, wordchar, or xdigit}}
-test string-6.6 {string is, ambiguous class} {
-    list [catch {string is al str} msg] $msg
+test string-6.6.$noComp {string is, ambiguous class} {
+    list [catch {run {string is al str}} msg] $msg
 } {1 {ambiguous class "al": must be alnum, alpha, ascii, control, boolean, digit, double, entier, false, graph, integer, list, lower, print, punct, space, true, upper, wideinteger, wordchar, or xdigit}}
-test string-6.7 {string is alpha, all ok} {
-    string is alpha -strict -failindex var abc
+test string-6.7.$noComp {string is alpha, all ok} {
+    run {string is alpha -strict -failindex var abc}
 } 1
-test string-6.8 {string is, error in var} {
-    list [string is alpha -failindex var abc5def] $var
+test string-6.8.$noComp {string is, error in var} {
+    list [run {string is alpha -failindex var abc5def}] $var
 } {0 3}
-test string-6.9 {string is, var shouldn't get set} {
+test string-6.9.$noComp {string is, var shouldn't get set} {
     catch {unset var}
-    list [catch {string is alpha -failindex var abc; set var} msg] $msg
+    list [catch {run {string is alpha -failindex var abc; set var}} msg] $msg
 } {1 {can't read "var": no such variable}}
-test string-6.10 {string is, ok on empty} {
-    string is alpha {}
+test string-6.10.$noComp {string is, ok on empty} {
+    run {string is alpha {}}
 } 1
-test string-6.11 {string is, -strict check against empty} {
-    string is alpha -strict {}
+test string-6.11.$noComp {string is, -strict check against empty} {
+    run {string is alpha -strict {}}
 } 0
-test string-6.12 {string is alnum, true} {
-    string is alnum abc123
+test string-6.12.$noComp {string is alnum, true} {
+    run {string is alnum abc123}
 } 1
-test string-6.13 {string is alnum, false} {
-    list [string is alnum -failindex var abc1.23] $var
+test string-6.13.$noComp {string is alnum, false} {
+    list [run {string is alnum -failindex var abc1.23}] $var
 } {0 4}
-test string-6.14 {string is alnum, unicode} "string is alnum abc\xfc" 1
-test string-6.15 {string is alpha, true} {
-    string is alpha abc
+test string-6.14.$noComp {string is alnum, unicode} "run {string is alnum abc\xfc}" 1
+test string-6.15.$noComp {string is alpha, true} {
+    run {string is alpha abc}
 } 1
-test string-6.16 {string is alpha, false} {
-    list [string is alpha -fail var a1bcde] $var
+test string-6.16.$noComp {string is alpha, false} {
+    list [run {string is alpha -fail var a1bcde}] $var
 } {0 1}
-test string-6.17 {string is alpha, unicode} {
-    string is alpha abc\374
+test string-6.17.$noComp {string is alpha, unicode} {
+    run {string is alpha abc\374}
 } 1
-test string-6.18 {string is ascii, true} {
-    string is ascii abc\u007Fend\u0000
+test string-6.18.$noComp {string is ascii, true} {
+    run {string is ascii abc\u007Fend\u0000}
 } 1
-test string-6.19 {string is ascii, false} {
-    list [string is ascii -fail var abc\u0000def\u0080more] $var
+test string-6.19.$noComp {string is ascii, false} {
+    list [run {string is ascii -fail var abc\u0000def\u0080more}] $var
 } {0 7}
-test string-6.20 {string is boolean, true} {
-    string is boolean true
+test string-6.20.$noComp {string is boolean, true} {
+    run {string is boolean true}
 } 1
-test string-6.21 {string is boolean, true} {
-    string is boolean f
+test string-6.21.$noComp {string is boolean, true} {
+    run {string is boolean f}
 } 1
-test string-6.22 {string is boolean, true based on type} {
-    string is bool [string compare a a]
+test string-6.22.$noComp {string is boolean, true based on type} {
+    run {string is bool [run {string compare a a}]}
 } 1
-test string-6.23 {string is boolean, false} {
-    list [string is bool -fail var yada] $var
+test string-6.23.$noComp {string is boolean, false} {
+    list [run {string is bool -fail var yada}] $var
 } {0 0}
-test string-6.24 {string is digit, true} {
-    string is digit 0123456789
+test string-6.24.$noComp {string is digit, true} {
+    run {string is digit 0123456789}
 } 1
-test string-6.25 {string is digit, false} {
-    list [string is digit -fail var 0123\u00dc567] $var
+test string-6.25.$noComp {string is digit, false} {
+    list [run {string is digit -fail var 0123\u00dc567}] $var
 } {0 4}
-test string-6.26 {string is digit, false} {
-    list [string is digit -fail var +123567] $var
+test string-6.26.$noComp {string is digit, false} {
+    list [run {string is digit -fail var +123567}] $var
 } {0 0}
-test string-6.27 {string is double, true} {
-    string is double 1
+test string-6.27.$noComp {string is double, true} {
+    run {string is double 1}
 } 1
-test string-6.28 {string is double, true} {
-    string is double [expr double(1)]
+test string-6.28.$noComp {string is double, true} {
+    run {string is double [expr double(1)]}
 } 1
-test string-6.29 {string is double, true} {
-    string is double 1.0
+test string-6.29.$noComp {string is double, true} {
+    run {string is double 1.0}
 } 1
-test string-6.30 {string is double, true} {
-    string is double [string compare a a]
+test string-6.30.$noComp {string is double, true} {
+    run {string is double [run {string compare a a}]}
 } 1
-test string-6.31 {string is double, true} {
-    string is double "   +1.0e-1  "
+test string-6.31.$noComp {string is double, true} {
+    run {string is double "   +1.0e-1  "}
 } 1
-test string-6.32 {string is double, true} {
-    string is double "\n1.0\v"
+test string-6.32.$noComp {string is double, true} {
+    run {string is double "\n1.0\v"}
 } 1
-test string-6.33 {string is double, false} {
-    list [string is double -fail var 1abc] $var
+test string-6.33.$noComp {string is double, false} {
+    list [run {string is double -fail var 1abc}] $var
 } {0 1}
-test string-6.34 {string is double, false} {
-    list [string is double -fail var abc] $var
+test string-6.34.$noComp {string is double, false} {
+    list [run {string is double -fail var abc}] $var
 } {0 0}
-test string-6.35 {string is double, false} {
-    list [string is double -fail var "   1.0e4e4  "] $var
+test string-6.35.$noComp {string is double, false} {
+    list [run {string is double -fail var "   1.0e4e4  "}] $var
 } {0 8}
-test string-6.36 {string is double, false} {
-    list [string is double -fail var "\n"] $var
+test string-6.36.$noComp {string is double, false} {
+    list [run {string is double -fail var "\n"}] $var
 } {0 0}
-test string-6.37 {string is double, false on int overflow} -setup {
+test string-6.37.$noComp {string is double, false on int overflow} -setup {
     set var priorValue
 } -body {
     # Make it the largest int recognizable, with one more digit for overflow
     # Since bignums arrived in Tcl 8.5, the sense of this test changed.
     # Now integer values that exceed native limits become bignums, and
     # bignums can convert to doubles without error.
-    list [string is double -fail var [largest_int]0] $var
+    list [run {string is double -fail var [largest_int]0}] $var
 } -result {1 priorValue}
 # string-6.38 removed, underflow on input is no longer an error.
-test string-6.39 {string is double, false} {
+test string-6.39.$noComp {string is double, false} {
     # This test is non-portable because IRIX thinks
     # that .e1 is a valid double - this is really a bug
     # on IRIX as .e1 should NOT be a valid double
     #
     # Portable now. Tcl 8.5 does its own double parsing.
 
-    list [string is double -fail var .e1] $var
+    list [run {string is double -fail var .e1}] $var
 } {0 0}
-test string-6.40 {string is false, true} {
-    string is false false
+test string-6.40.$noComp {string is false, true} {
+    run {string is false false}
 } 1
-test string-6.41 {string is false, true} {
-    string is false FaLsE
+test string-6.41.$noComp {string is false, true} {
+    run {string is false FaLsE}
 } 1
-test string-6.42 {string is false, true} {
-    string is false N
+test string-6.42.$noComp {string is false, true} {
+    run {string is false N}
 } 1
-test string-6.43 {string is false, true} {
-    string is false 0
+test string-6.43.$noComp {string is false, true} {
+    run {string is false 0}
 } 1
-test string-6.44 {string is false, true} {
-    string is false off
+test string-6.44.$noComp {string is false, true} {
+    run {string is false off}
 } 1
-test string-6.45 {string is false, false} {
-    list [string is false -fail var abc] $var
+test string-6.45.$noComp {string is false, false} {
+    list [run {string is false -fail var abc}] $var
 } {0 0}
-test string-6.46 {string is false, false} {
+test string-6.46.$noComp {string is false, false} {
     catch {unset var}
-    list [string is false -fail var Y] $var
+    list [run {string is false -fail var Y}] $var
 } {0 0}
-test string-6.47 {string is false, false} {
+test string-6.47.$noComp {string is false, false} {
     catch {unset var}
-    list [string is false -fail var offensive] $var
+    list [run {string is false -fail var offensive}] $var
 } {0 0}
-test string-6.48 {string is integer, true} {
-    string is integer +1234567890
+test string-6.48.$noComp {string is integer, true} {
+    run {string is integer +1234567890}
 } 1
-test string-6.49 {string is integer, true on type} {
-    string is integer [expr int(50.0)]
+test string-6.49.$noComp {string is integer, true on type} {
+    run {string is integer [expr int(50.0)]}
 } 1
-test string-6.50 {string is integer, true} {
-    string is integer [list -10]
+test string-6.50.$noComp {string is integer, true} {
+    run {string is integer [list -10]}
 } 1
-test string-6.51 {string is integer, true as hex} {
-    string is integer 0xabcdef
+test string-6.51.$noComp {string is integer, true as hex} {
+    run {string is integer 0xabcdef}
 } 1
-test string-6.52 {string is integer, true as octal} {
-    string is integer 012345
+test string-6.52.$noComp {string is integer, true as octal} {
+    run {string is integer 012345}
 } 1
-test string-6.53 {string is integer, true with whitespace} {
-    string is integer "  \n1234\v"
+test string-6.53.$noComp {string is integer, true with whitespace} {
+    run {string is integer "  \n1234\v"}
 } 1
-test string-6.54 {string is integer, false} {
-    list [string is integer -fail var 123abc] $var
+test string-6.54.$noComp {string is integer, false} {
+    list [run {string is integer -fail var 123abc}] $var
 } {0 3}
-test string-6.55 {string is integer, false on overflow} {
-    list [string is integer -fail var +[largest_int]0] $var
+test string-6.55.$noComp {string is integer, false on overflow} {
+    list [run {string is integer -fail var +[largest_int]0}] $var
 } {0 -1}
-test string-6.56 {string is integer, false} {
-    list [string is integer -fail var [expr double(1)]] $var
+test string-6.56.$noComp {string is integer, false} {
+    list [run {string is integer -fail var [expr double(1)]}] $var
 } {0 1}
-test string-6.57 {string is integer, false} {
-    list [string is integer -fail var "    "] $var
+test string-6.57.$noComp {string is integer, false} {
+    list [run {string is integer -fail var "    "}] $var
 } {0 0}
-test string-6.58 {string is integer, false on bad octal} {
-    list [string is integer -fail var 0o36963] $var
+test string-6.58.$noComp {string is integer, false on bad octal} {
+    list [run {string is integer -fail var 0o36963}] $var
 } {0 4}
-test string-6.58.1 {string is integer, false on bad octal} {
-    list [string is integer -fail var 0o36963] $var
+test string-6.58.1.$noComp {string is integer, false on bad octal} {
+    list [run {string is integer -fail var 0o36963}] $var
 } {0 4}
-test string-6.59 {string is integer, false on bad hex} {
-    list [string is integer -fail var 0X345XYZ] $var
+test string-6.59.$noComp {string is integer, false on bad hex} {
+    list [run {string is integer -fail var 0X345XYZ}] $var
 } {0 5}
-test string-6.60 {string is lower, true} {
-    string is lower abc
+test string-6.60.$noComp {string is lower, true} {
+    run {string is lower abc}
 } 1
-test string-6.61 {string is lower, unicode true} {
-    string is lower abc\u00fcue
+test string-6.61.$noComp {string is lower, unicode true} {
+    run {string is lower abc\u00fcue}
 } 1
-test string-6.62 {string is lower, false} {
-    list [string is lower -fail var aBc] $var
+test string-6.62.$noComp {string is lower, false} {
+    list [run {string is lower -fail var aBc}] $var
 } {0 1}
-test string-6.63 {string is lower, false} {
-    list [string is lower -fail var abc1] $var
+test string-6.63.$noComp {string is lower, false} {
+    list [run {string is lower -fail var abc1}] $var
 } {0 3}
-test string-6.64 {string is lower, unicode false} {
-    list [string is lower -fail var ab\u00dcUE] $var
+test string-6.64.$noComp {string is lower, unicode false} {
+    list [run {string is lower -fail var ab\u00dcUE}] $var
 } {0 2}
-test string-6.65 {string is space, true} {
-    string is space " \t\n\v\f"
+test string-6.65.$noComp {string is space, true} {
+    run {string is space " \t\n\v\f"}
 } 1
-test string-6.66 {string is space, false} {
-    list [string is space -fail var " \t\n\v1\f"] $var
+test string-6.66.$noComp {string is space, false} {
+    list [run {string is space -fail var " \t\n\v1\f"}] $var
 } {0 4}
-test string-6.67 {string is true, true} {
-    string is true true
+test string-6.67.$noComp {string is true, true} {
+    run {string is true true}
 } 1
-test string-6.68 {string is true, true} {
-    string is true TrU
+test string-6.68.$noComp {string is true, true} {
+    run {string is true TrU}
 } 1
-test string-6.69 {string is true, true} {
-    string is true ye
+test string-6.69.$noComp {string is true, true} {
+    run {string is true ye}
 } 1
-test string-6.70 {string is true, true} {
-    string is true 1
+test string-6.70.$noComp {string is true, true} {
+    run {string is true 1}
 } 1
-test string-6.71 {string is true, true} {
-    string is true on
+test string-6.71.$noComp {string is true, true} {
+    run {string is true on}
 } 1
-test string-6.72 {string is true, false} {
-    list [string is true -fail var onto] $var
+test string-6.72.$noComp {string is true, false} {
+    list [run {string is true -fail var onto}] $var
 } {0 0}
-test string-6.73 {string is true, false} {
+test string-6.73.$noComp {string is true, false} {
     catch {unset var}
-    list [string is true -fail var 25] $var
+    list [run {string is true -fail var 25}] $var
 } {0 0}
-test string-6.74 {string is true, false} {
+test string-6.74.$noComp {string is true, false} {
     catch {unset var}
-    list [string is true -fail var no] $var
+    list [run {string is true -fail var no}] $var
 } {0 0}
-test string-6.75 {string is upper, true} {
-    string is upper ABC
+test string-6.75.$noComp {string is upper, true} {
+    run {string is upper ABC}
 } 1
-test string-6.76 {string is upper, unicode true} {
-    string is upper ABC\u00dcUE
+test string-6.76.$noComp {string is upper, unicode true} {
+    run {string is upper ABC\u00dcUE}
 } 1
-test string-6.77 {string is upper, false} {
-    list [string is upper -fail var AbC] $var
+test string-6.77.$noComp {string is upper, false} {
+    list [run {string is upper -fail var AbC}] $var
 } {0 1}
-test string-6.78 {string is upper, false} {
-    list [string is upper -fail var AB2C] $var
+test string-6.78.$noComp {string is upper, false} {
+    list [run {string is upper -fail var AB2C}] $var
 } {0 2}
-test string-6.79 {string is upper, unicode false} {
-    list [string is upper -fail var ABC\u00fcue] $var
+test string-6.79.$noComp {string is upper, unicode false} {
+    list [run {string is upper -fail var ABC\u00fcue}] $var
 } {0 3}
-test string-6.80 {string is wordchar, true} {
-    string is wordchar abc_123
+test string-6.80.$noComp {string is wordchar, true} {
+    run {string is wordchar abc_123}
 } 1
-test string-6.81 {string is wordchar, unicode true} {
-    string is wordchar abc\u00fcab\u00dcAB\u5001
+test string-6.81.$noComp {string is wordchar, unicode true} {
+    run {string is wordchar abc\u00fcab\u00dcAB\u5001}
 } 1
-test string-6.82 {string is wordchar, false} {
-    list [string is wordchar -fail var abcd.ef] $var
+test string-6.82.$noComp {string is wordchar, false} {
+    list [run {string is wordchar -fail var abcd.ef}] $var
 } {0 4}
-test string-6.83 {string is wordchar, unicode false} {
-    list [string is wordchar -fail var abc\u0080def] $var
+test string-6.83.$noComp {string is wordchar, unicode false} {
+    list [run {string is wordchar -fail var abc\u0080def}] $var
 } {0 3}
-test string-6.84 {string is control} {
+test string-6.84.$noComp {string is control} {
     ## Control chars are in the ranges
     ## 00..1F && 7F..9F
-    list [string is control -fail var \x00\x01\x10\x1F\x7F\x80\x9F\x60] $var
+    list [run {string is control -fail var \x00\x01\x10\x1F\x7F\x80\x9F\x60}] $var
 } {0 7}
-test string-6.85 {string is control} {
-    string is control \u0100
+test string-6.85.$noComp {string is control} {
+    run {string is control \u0100}
 } 0
-test string-6.86 {string is graph} {
+test string-6.86.$noComp {string is graph} {
     ## graph is any print char, except space
-    list [string is gra -fail var "0123abc!@#\$\u0100\UE0100\UE01EF "] $var
+    list [run {string is gra -fail var "0123abc!@#\$\u0100\UE0100\UE01EF "}] $var
 } {0 14}
-test string-6.87 {string is print} {
+test string-6.87.$noComp {string is print} {
     ## basically any printable char
-    list [string is print -fail var "0123abc!@#\$\u0100 \UE0100\UE01EF\u0010"] $var
+    list [run {string is print -fail var "0123abc!@#\$\u0100 \UE0100\UE01EF\u0010"}] $var
 } {0 15}
-test string-6.88 {string is punct} {
+test string-6.88.$noComp {string is punct} {
     ## any graph char that isn't alnum
-    list [string is punct -fail var "_!@#\u00beq0"] $var
+    list [run {string is punct -fail var "_!@#\u00beq0"}] $var
 } {0 4}
-test string-6.89 {string is xdigit} {
-    list [string is xdigit -fail var 0123456789\u0061bcdefABCDEFg] $var
+test string-6.89.$noComp {string is xdigit} {
+    list [run {string is xdigit -fail var 0123456789\u0061bcdefABCDEFg}] $var
 } {0 22}
 
-test string-6.90 {string is integer, bad integers} {
+test string-6.90.$noComp {string is integer, bad integers} {
     # SF bug #634856
     set result ""
     set numbers [list 1 +1 ++1 +-1 -+1 -1 --1 "- +1"]
     foreach num $numbers {
-	lappend result [string is int -strict $num]
+	lappend result [run {string is int -strict $num}]
     }
     return $result
 } {1 1 0 0 0 1 0 0}
-test string-6.91 {string is double, bad doubles} {
+test string-6.91.$noComp {string is double, bad doubles} {
     set result ""
     set numbers [list 1.0 +1.0 ++1.0 +-1.0 -+1.0 -1.0 --1.0 "- +1.0"]
     foreach num $numbers {
-	lappend result [string is double -strict $num]
+	lappend result [run {string is double -strict $num}]
     }
     return $result
 } {1 1 0 0 0 1 0 0}
-test string-6.92 {string is integer, 32-bit overflow} {
+test string-6.92.$noComp {string is integer, 32-bit overflow} {
     # Bug 718878
     set x 0x100000000
-    list [string is integer -failindex var $x] $var
+    list [run {string is integer -failindex var $x}] $var
 } {0 -1}
-test string-6.93 {string is integer, 32-bit overflow} {
+test string-6.93.$noComp {string is integer, 32-bit overflow} {
     # Bug 718878
     set x 0x100000000
     append x ""
-    list [string is integer -failindex var $x] $var
+    list [run {string is integer -failindex var $x}] $var
 } {0 -1}
-test string-6.94 {string is integer, 32-bit overflow} {
+test string-6.94.$noComp {string is integer, 32-bit overflow} {
     # Bug 718878
     set x 0x100000000
-    list [string is integer -failindex var [expr {$x}]] $var
+    list [run {string is integer -failindex var [expr {$x}]}] $var
 } {0 -1}
-test string-6.95 {string is wideinteger, true} {
-    string is wideinteger +1234567890
+test string-6.95.$noComp {string is wideinteger, true} {
+    run {string is wideinteger +1234567890}
 } 1
-test string-6.96 {string is wideinteger, true on type} {
-    string is wideinteger [expr wide(50.0)]
+test string-6.96.$noComp {string is wideinteger, true on type} {
+    run {string is wideinteger [expr wide(50.0)]}
 } 1
-test string-6.97 {string is wideinteger, true} {
-    string is wideinteger [list -10]
+test string-6.97.$noComp {string is wideinteger, true} {
+    run {string is wideinteger [list -10]}
 } 1
-test string-6.98 {string is wideinteger, true as hex} {
-    string is wideinteger 0xabcdef
+test string-6.98.$noComp {string is wideinteger, true as hex} {
+    run {string is wideinteger 0xabcdef}
 } 1
-test string-6.99 {string is wideinteger, true as octal} {
-    string is wideinteger 0123456
+test string-6.99.$noComp {string is wideinteger, true as octal} {
+    run {string is wideinteger 0123456}
 } 1
-test string-6.100 {string is wideinteger, true with whitespace} {
-    string is wideinteger "  \n1234\v"
+test string-6.100.$noComp {string is wideinteger, true with whitespace} {
+    run {string is wideinteger "  \n1234\v"}
 } 1
-test string-6.101 {string is wideinteger, false} {
-    list [string is wideinteger -fail var 123abc] $var
+test string-6.101.$noComp {string is wideinteger, false} {
+    list [run {string is wideinteger -fail var 123abc}] $var
 } {0 3}
-test string-6.102 {string is wideinteger, false on overflow} {
-    list [string is wideinteger -fail var +[largest_int]0] $var
+test string-6.102.$noComp {string is wideinteger, false on overflow} {
+    list [run {string is wideinteger -fail var +[largest_int]0}] $var
 } {0 -1}
-test string-6.103 {string is wideinteger, false} {
-    list [string is wideinteger -fail var [expr double(1)]] $var
+test string-6.103.$noComp {string is wideinteger, false} {
+    list [run {string is wideinteger -fail var [expr double(1)]}] $var
 } {0 1}
-test string-6.104 {string is wideinteger, false} {
-    list [string is wideinteger -fail var "    "] $var
+test string-6.104.$noComp {string is wideinteger, false} {
+    list [run {string is wideinteger -fail var "    "}] $var
 } {0 0}
-test string-6.105 {string is wideinteger, false on bad octal} {
-    list [string is wideinteger -fail var 0o36963] $var
+test string-6.105.$noComp {string is wideinteger, false on bad octal} {
+    list [run {string is wideinteger -fail var 0o36963}] $var
 } {0 4}
-test string-6.105.1 {string is wideinteger, false on bad octal} {
-    list [string is wideinteger -fail var 0o36963] $var
+test string-6.105.1.$noComp {string is wideinteger, false on bad octal} {
+    list [run {string is wideinteger -fail var 0o36963}] $var
 } {0 4}
-test string-6.106 {string is wideinteger, false on bad hex} {
-    list [string is wideinteger -fail var 0X345XYZ] $var
+test string-6.106.$noComp {string is wideinteger, false on bad hex} {
+    list [run {string is wideinteger -fail var 0X345XYZ}] $var
 } {0 5}
-test string-6.107 {string is integer, bad integers} {
+test string-6.107.$noComp {string is integer, bad integers} {
     # SF bug #634856
     set result ""
     set numbers [list 1 +1 ++1 +-1 -+1 -1 --1 "- +1"]
     foreach num $numbers {
-	lappend result [string is wideinteger -strict $num]
+	lappend result [run {string is wideinteger -strict $num}]
     }
     return $result
 } {1 1 0 0 0 1 0 0}
-test string-6.108 {string is double, Bug 1382287} {
+test string-6.108.$noComp {string is double, Bug 1382287} {
     set x 2turtledoves
-    string is double $x
-    string is double $x
+    run {string is double $x}
+    run {string is double $x}
 } 0
-test string-6.109 {string is double, Bug 1360532} {
-    string is double 1\u00a0
+test string-6.109.$noComp {string is double, Bug 1360532} {
+    run {string is double 1\u00a0}
 } 0
-test string-6.110 {string is entier, true} {
-    string is entier +1234567890
+test string-6.110.$noComp {string is entier, true} {
+    run {string is entier +1234567890}
 } 1
-test string-6.111 {string is entier, true on type} {
-    string is entier [expr wide(50.0)]
+test string-6.111.$noComp {string is entier, true on type} {
+    run {string is entier [expr wide(50.0)]}
 } 1
-test string-6.112 {string is entier, true} {
-    string is entier [list -10]
+test string-6.112.$noComp {string is entier, true} {
+    run {string is entier [list -10]}
 } 1
-test string-6.113 {string is entier, true as hex} {
-    string is entier 0xabcdef
+test string-6.113.$noComp {string is entier, true as hex} {
+    run {string is entier 0xabcdef}
 } 1
-test string-6.114 {string is entier, true as octal} {
-    string is entier 0123456
+test string-6.114.$noComp {string is entier, true as octal} {
+    run {string is entier 0123456}
 } 1
-test string-6.115 {string is entier, true with whitespace} {
-    string is entier "  \n1234\v"
+test string-6.115.$noComp {string is entier, true with whitespace} {
+    run {string is entier "  \n1234\v"}
 } 1
-test string-6.116 {string is entier, false} {
-    list [string is entier -fail var 123abc] $var
+test string-6.116.$noComp {string is entier, false} {
+    list [run {string is entier -fail var 123abc}] $var
 } {0 3}
-test string-6.117 {string is entier, false} {
-    list [string is entier -fail var 123123123123123123123123123123123123123123123123123123123123123123123123123123123123abc] $var
+test string-6.117.$noComp {string is entier, false} {
+    list [run {string is entier -fail var 123123123123123123123123123123123123123123123123123123123123123123123123123123123123abc}] $var
 } {0 84}
-test string-6.118 {string is entier, false} {
-    list [string is entier -fail var [expr double(1)]] $var
+test string-6.118.$noComp {string is entier, false} {
+    list [run {string is entier -fail var [expr double(1)]}] $var
 } {0 1}
-test string-6.119 {string is entier, false} {
-    list [string is entier -fail var "    "] $var
+test string-6.119.$noComp {string is entier, false} {
+    list [run {string is entier -fail var "    "}] $var
 } {0 0}
-test string-6.120 {string is entier, false on bad octal} {
-    list [string is entier -fail var 0o36963] $var
+test string-6.120.$noComp {string is entier, false on bad octal} {
+    list [run {string is entier -fail var 0o36963}] $var
 } {0 4}
-test string-6.121.1 {string is entier, false on bad octal} {
-    list [string is entier -fail var 0o36963] $var
+test string-6.121.1.$noComp {string is entier, false on bad octal} {
+    list [run {string is entier -fail var 0o36963}] $var
 } {0 4}
-test string-6.122 {string is entier, false on bad hex} {
-    list [string is entier -fail var 0X345XYZ] $var
+test string-6.122.$noComp {string is entier, false on bad hex} {
+    list [run {string is entier -fail var 0X345XYZ}] $var
 } {0 5}
-test string-6.123 {string is entier, bad integers} {
+test string-6.123.$noComp {string is entier, bad integers} {
     # SF bug #634856
     set result ""
     set numbers [list 1 +1 ++1 +-1 -+1 -1 --1 "- +1"]
     foreach num $numbers {
-	lappend result [string is entier -strict $num]
+	lappend result [run {string is entier -strict $num}]
     }
     return $result
 } {1 1 0 0 0 1 0 0}
-test string-6.124 {string is entier, true} {
-    string is entier +1234567890123456789012345678901234567890
+test string-6.124.$noComp {string is entier, true} {
+    run {string is entier +1234567890123456789012345678901234567890}
 } 1
-test string-6.125 {string is entier, true} {
-    string is entier [list -10000000000000000000000000000000000000000000000000000000000000000000000000000000000000]
+test string-6.125.$noComp {string is entier, true} {
+    run {string is entier [list -10000000000000000000000000000000000000000000000000000000000000000000000000000000000000]}
 } 1
-test string-6.126 {string is entier, true as hex} {
-    string is entier 0xabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdef
+test string-6.126.$noComp {string is entier, true as hex} {
+    run {string is entier 0xabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdef}
 } 1
-test string-6.127 {string is entier, true as octal} {
-    string is entier 0123456112341234561234565623456123456123456123456123456123456123456123456123456123456
+test string-6.127.$noComp {string is entier, true as octal} {
+    run {string is entier 0123456112341234561234565623456123456123456123456123456123456123456123456123456123456}
 } 1
-test string-6.128 {string is entier, true with whitespace} {
-    string is entier "  \n12340000000000000000000000000000000000000000000000000000000000000000000000000000000000000\v"
+test string-6.128.$noComp {string is entier, true with whitespace} {
+    run {string is entier "  \n12340000000000000000000000000000000000000000000000000000000000000000000000000000000000000\v"}
 } 1
-test string-6.129 {string is entier, false on bad octal} {
-    list [string is entier -fail var 0o1234561123412345612345656234561234561234561234561234561234561234561234561234561234536963] $var
+test string-6.129.$noComp {string is entier, false on bad octal} {
+    list [run {string is entier -fail var 0o1234561123412345612345656234561234561234561234561234561234561234561234561234561234536963}] $var
 } {0 87}
-test string-6.130.1 {string is entier, false on bad octal} {
-    list [string is entier -fail var 0o1234561123412345612345656234561234561234561234561234561234561234561234561234561234536963] $var
+test string-6.130.1.$noComp {string is entier, false on bad octal} {
+    list [run {string is entier -fail var 0o1234561123412345612345656234561234561234561234561234561234561234561234561234561234536963}] $var
 } {0 87}
-test string-6.131 {string is entier, false on bad hex} {
-    list [string is entier -fail var 0X12345611234123456123456562345612345612345612345612345612345612345612345612345612345345XYZ] $var
+test string-6.131.$noComp {string is entier, false on bad hex} {
+    list [run {string is entier -fail var 0X12345611234123456123456562345612345612345612345612345612345612345612345612345612345345XYZ}] $var
 } {0 88}
 
 catch {rename largest_int {}}
 
-test string-7.1 {string last, too few args} {
-    list [catch {string last a} msg] $msg
+test string-7.1.$noComp {string last, too few args} {
+    list [catch {run {string last a}} msg] $msg
 } {1 {wrong # args: should be "string last needleString haystackString ?lastIndex?"}}
-test string-7.2 {string last, bad args} {
-    list [catch {string last a b c} msg] $msg
+test string-7.2.$noComp {string last, bad args} {
+    list [catch {run {string last a b c}} msg] $msg
 } {1 {bad index "c": must be integer?[+-]integer? or end?[+-]integer?}}
-test string-7.3 {string last, too many args} {
-    list [catch {string last a b c d} msg] $msg
+test string-7.3.$noComp {string last, too many args} {
+    list [catch {run {string last a b c d}} msg] $msg
 } {1 {wrong # args: should be "string last needleString haystackString ?lastIndex?"}}
-test string-7.4 {string last} {
-    string la xxx xxxx123xx345x678
+test string-7.4.$noComp {string last} {
+    run {string la xxx xxxx123xx345x678}
 } 1
-test string-7.5 {string last} {
-    string last xx xxxx123xx345x678
+test string-7.5.$noComp {string last} {
+    run {string last xx xxxx123xx345x678}
 } 7
-test string-7.6 {string last} {
-    string las x xxxx123xx345x678
+test string-7.6.$noComp {string last} {
+    run {string las x xxxx123xx345x678}
 } 12
-test string-7.7 {string last, unicode} {
-    string las x xxxx12\u7266xx345x678
+test string-7.7.$noComp {string last, unicode} {
+    run {string las x xxxx12\u7266xx345x678}
 } 12
-test string-7.8 {string last, unicode} {
-    string las \u7266 xxxx12\u7266xx345x678
+test string-7.8.$noComp {string last, unicode} {
+    run {string las \u7266 xxxx12\u7266xx345x678}
 } 6
-test string-7.9 {string last, stop index} {
-    string las \u7266 xxxx12\u7266xx345x678
+test string-7.9.$noComp {string last, stop index} {
+    run {string las \u7266 xxxx12\u7266xx345x678}
 } 6
-test string-7.10 {string last, unicode} {
-    string las \u7266 xxxx12\u7266xx345x678
+test string-7.10.$noComp {string last, unicode} {
+    run {string las \u7266 xxxx12\u7266xx345x678}
 } 6
-test string-7.11 {string last, start index} {
-    string last \u7266 abc\u7266x 3
+test string-7.11.$noComp {string last, start index} {
+    run {string last \u7266 abc\u7266x 3}
 } 3
-test string-7.12 {string last, start index} {
-    string last \u7266 abc\u7266x 2
+test string-7.12.$noComp {string last, start index} {
+    run {string last \u7266 abc\u7266x 2}
 } -1
-test string-7.13 {string last, start index} {
+test string-7.13.$noComp {string last, start index} {
     ## Constrain to last 'a' should work
-    string last ba badbad end-1
+    run {string last ba badbad end-1}
 } 3
-test string-7.14 {string last, start index} {
+test string-7.14.$noComp {string last, start index} {
     ## Constrain to last 'b' should skip last 'ba'
-    string last ba badbad end-2
+    run {string last ba badbad end-2}
 } 0
-test string-7.15 {string last, start index} {
-    string last \334a \334ad\334ad 0
+test string-7.15.$noComp {string last, start index} {
+    run {string last \334a \334ad\334ad 0}
 } -1
-test string-7.16 {string last, start index} {
-    string last \334a \334ad\334ad end-1
+test string-7.16.$noComp {string last, start index} {
+    run {string last \334a \334ad\334ad end-1}
 } 3
 
-test string-8.1 {string bytelength} {
-    list [catch {string bytelength} msg] $msg
+test string-8.1.$noComp {string bytelength} {
+    list [catch {run {string bytelength}} msg] $msg
 } {1 {wrong # args: should be "string bytelength string"}}
-test string-8.2 {string bytelength} {
-    list [catch {string bytelength a b} msg] $msg
+test string-8.2.$noComp {string bytelength} {
+    list [catch {run {string bytelength a b}} msg] $msg
 } {1 {wrong # args: should be "string bytelength string"}}
-test string-8.3 {string bytelength} {
-    string bytelength "\u00c7"
+test string-8.3.$noComp {string bytelength} {
+    run {string bytelength "\u00c7"}
 } 2
-test string-8.4 {string bytelength} {
-    string b ""
+test string-8.4.$noComp {string bytelength} {
+    run {string b ""}
 } 0
 
-test string-9.1 {string length} {
-    list [catch {string length} msg] $msg
+test string-9.1.$noComp {string length} {
+    list [catch {run {string length}} msg] $msg
 } {1 {wrong # args: should be "string length string"}}
-test string-9.2 {string length} {
-    list [catch {string length a b} msg] $msg
+test string-9.2.$noComp {string length} {
+    list [catch {run {string length a b}} msg] $msg
 } {1 {wrong # args: should be "string length string"}}
-test string-9.3 {string length} {
-    string length "a little string"
+test string-9.3.$noComp {string length} {
+    run {string length "a little string"}
 } 15
-test string-9.4 {string length} {
-    string le ""
+test string-9.4.$noComp {string length} {
+    run {string le ""}
 } 0
-test string-9.5 {string length, unicode} {
-    string le "abcd\u7266"
+test string-9.5.$noComp {string length, unicode} {
+    run {string le "abcd\u7266"}
 } 5
-test string-9.6 {string length, bytearray object} {
-    string length [binary format a5 foo]
+test string-9.6.$noComp {string length, bytearray object} {
+    run {string length [binary format a5 foo]}
 } 5
-test string-9.7 {string length, bytearray object} {
-    string length [binary format I* {0x50515253 0x52}]
+test string-9.7.$noComp {string length, bytearray object} {
+    run {string length [binary format I* {0x50515253 0x52}]}
 } 8
 
-test string-10.1 {string map, too few args} {
-    list [catch {string map} msg] $msg
+test string-10.1.$noComp {string map, too few args} {
+    list [catch {run {string map}} msg] $msg
 } {1 {wrong # args: should be "string map ?-nocase? charMap string"}}
-test string-10.2 {string map, bad args} {
-    list [catch {string map {a b} abba oops} msg] $msg
+test string-10.2.$noComp {string map, bad args} {
+    list [catch {run {string map {a b} abba oops}} msg] $msg
 } {1 {bad option "a b": must be -nocase}}
-test string-10.3 {string map, too many args} {
-    list [catch {string map -nocase {a b} str1 str2} msg] $msg
+test string-10.3.$noComp {string map, too many args} {
+    list [catch {run {string map -nocase {a b} str1 str2}} msg] $msg
 } {1 {wrong # args: should be "string map ?-nocase? charMap string"}}
-test string-10.4 {string map} {
-    string map {a b} abba
+test string-10.4.$noComp {string map} {
+    run {string map {a b} abba}
 } {bbbb}
-test string-10.5 {string map} {
-    string map {a b} a
+test string-10.5.$noComp {string map} {
+    run {string map {a b} a}
 } {b}
-test string-10.6 {string map -nocase} {
-    string map -nocase {a b} Abba
+test string-10.6.$noComp {string map -nocase} {
+    run {string map -nocase {a b} Abba}
 } {bbbb}
-test string-10.7 {string map} {
-    string map {abc 321 ab * a A} aabcabaababcab
+test string-10.7.$noComp {string map} {
+    run {string map {abc 321 ab * a A} aabcabaababcab}
 } {A321*A*321*}
-test string-10.8 {string map -nocase} {
-    string map -nocase {aBc 321 Ab * a A} aabcabaababcab
+test string-10.8.$noComp {string map -nocase} {
+    run {string map -nocase {aBc 321 Ab * a A} aabcabaababcab}
 } {A321*A*321*}
-test string-10.9 {string map -nocase} {
-    string map -no {abc 321 Ab * a A} aAbCaBaAbAbcAb
+test string-10.9.$noComp {string map -nocase} {
+    run {string map -no {abc 321 Ab * a A} aAbCaBaAbAbcAb}
 } {A321*A*321*}
-test string-10.10 {string map} {
-    list [catch {string map {a b c} abba} msg] $msg
+test string-10.10.$noComp {string map} {
+    list [catch {run {string map {a b c} abba}} msg] $msg
 } {1 {char map list unbalanced}}
-test string-10.11 {string map, nulls} {
-    string map {\x00 NULL blah \x00nix} {qwerty}
+test string-10.11.$noComp {string map, nulls} {
+    run {string map {\x00 NULL blah \x00nix} {qwerty}}
 } {qwerty}
-test string-10.12 {string map, unicode} {
-    string map [list \374 ue UE \334] "a\374ueUE\000EU"
+test string-10.12.$noComp {string map, unicode} {
+    run {string map [list \374 ue UE \334] "a\374ueUE\000EU"}
 } aueue\334\0EU
-test string-10.13 {string map, -nocase unicode} {
-    string map -nocase [list \374 ue UE \334] "a\374ueUE\000EU"
+test string-10.13.$noComp {string map, -nocase unicode} {
+    run {string map -nocase [list \374 ue UE \334] "a\374ueUE\000EU"}
 } aue\334\334\0EU
-test string-10.14 {string map, -nocase null arguments} {
-    string map -nocase {{} abc} foo
+test string-10.14.$noComp {string map, -nocase null arguments} {
+    run {string map -nocase {{} abc} foo}
 } foo
-test string-10.15 {string map, one pair case} {
-    string map -nocase {abc 32} aAbCaBaAbAbcAb
+test string-10.15.$noComp {string map, one pair case} {
+    run {string map -nocase {abc 32} aAbCaBaAbAbcAb}
 } {a32aBaAb32Ab}
-test string-10.16 {string map, one pair case} {
-    string map -nocase {ab 4321} aAbCaBaAbAbcAb
+test string-10.16.$noComp {string map, one pair case} {
+    run {string map -nocase {ab 4321} aAbCaBaAbAbcAb}
 } {a4321C4321a43214321c4321}
-test string-10.17 {string map, one pair case} {
-    string map {Ab 4321} aAbCaBaAbAbcAb
+test string-10.17.$noComp {string map, one pair case} {
+    run {string map {Ab 4321} aAbCaBaAbAbcAb}
 } {a4321CaBa43214321c4321}
-test string-10.18 {string map, empty argument} {
-    string map -nocase {{} abc} foo
+test string-10.18.$noComp {string map, empty argument} {
+    run {string map -nocase {{} abc} foo}
 } foo
-test string-10.19 {string map, empty arguments} {
-    string map -nocase {{} abc f bar {} def} foo
+test string-10.19.$noComp {string map, empty arguments} {
+    run {string map -nocase {{} abc f bar {} def} foo}
 } baroo
-test string-10.20 {string map, dictionaries don't alter map ordering} {
+test string-10.20.$noComp {string map, dictionaries don't alter map ordering} {
     set map {aa X a Y}
-    list [string map [dict create aa X a Y] aaa] [string map $map aaa] [dict size $map] [string map $map aaa]
+    list [run {string map [dict create aa X a Y] aaa}] [run {string map $map aaa}] [dict size $map] [run {string map $map aaa}]
 } {XY XY 2 XY}
-test string-10.20.1 {string map, dictionaries don't alter map ordering} {
+test string-10.20.1.$noComp {string map, dictionaries don't alter map ordering} {
     set map {a X b Y a Z}
-    list [string map [dict create a X b Y a Z] aaa] [string map $map aaa] [dict size $map] [string map $map aaa]
+    list [run {string map [dict create a X b Y a Z] aaa}] [run {string map $map aaa}] [dict size $map] [run {string map $map aaa}]
 } {ZZZ XXX 2 XXX}
-test string-10.21 {string map, ABR checks} {
-    string map {longstring foob} long
+test string-10.21.$noComp {string map, ABR checks} {
+    run {string map {longstring foob} long}
 } long
-test string-10.22 {string map, ABR checks} {
-    string map {long foob} long
+test string-10.22.$noComp {string map, ABR checks} {
+    run {string map {long foob} long}
 } foob
-test string-10.23 {string map, ABR checks} {
-    string map {lon foob} long
+test string-10.23.$noComp {string map, ABR checks} {
+    run {string map {lon foob} long}
 } foobg
-test string-10.24 {string map, ABR checks} {
-    string map {lon foob} longlo
+test string-10.24.$noComp {string map, ABR checks} {
+    run {string map {lon foob} longlo}
 } foobglo
-test string-10.25 {string map, ABR checks} {
-    string map {lon foob} longlon
+test string-10.25.$noComp {string map, ABR checks} {
+    run {string map {lon foob} longlon}
 } foobgfoob
-test string-10.26 {string map, ABR checks} {
-    string map {longstring foob longstring bar} long
+test string-10.26.$noComp {string map, ABR checks} {
+    run {string map {longstring foob longstring bar} long}
 } long
-test string-10.27 {string map, ABR checks} {
-    string map {long foob longstring bar} long
+test string-10.27.$noComp {string map, ABR checks} {
+    run {string map {long foob longstring bar} long}
 } foob
-test string-10.28 {string map, ABR checks} {
-    string map {lon foob longstring bar} long
+test string-10.28.$noComp {string map, ABR checks} {
+    run {string map {lon foob longstring bar} long}
 } foobg
-test string-10.29 {string map, ABR checks} {
-    string map {lon foob longstring bar} longlo
+test string-10.29.$noComp {string map, ABR checks} {
+    run {string map {lon foob longstring bar} longlo}
 } foobglo
-test string-10.30 {string map, ABR checks} {
-    string map {lon foob longstring bar} longlon
+test string-10.30.$noComp {string map, ABR checks} {
+    run {string map {lon foob longstring bar} longlon}
 } foobgfoob
-test string-10.31 {string map, nasty sharing crash from [Bug 1018562]} {
+test string-10.31.$noComp {string map, nasty sharing crash from [Bug 1018562]} {
     set a {a b}
-    string map $a $a
+    run {string map $a $a}
 } {b b}
 
-test string-11.1 {string match, too few args} {
-    list [catch {string match a} msg] $msg
+test string-11.1.$noComp {string match, too few args} {
+    list [catch {run {string match a}} msg] $msg
 } {1 {wrong # args: should be "string match ?-nocase? pattern string"}}
-test string-11.2 {string match, too many args} {
-    list [catch {string match a b c d} msg] $msg
+test string-11.2.$noComp {string match, too many args} {
+    list [catch {run {string match a b c d}} msg] $msg
 } {1 {wrong # args: should be "string match ?-nocase? pattern string"}}
-test string-11.3 {string match} {
-    string match abc abc
+test string-11.3.$noComp {string match} {
+    run {string match abc abc}
 } 1
-test string-11.4 {string match} {
-    string mat abc abd
+test string-11.4.$noComp {string match} {
+    run {string mat abc abd}
 } 0
-test string-11.5 {string match} {
-    string match ab*c abc
+test string-11.5.$noComp {string match} {
+    run {string match ab*c abc}
 } 1
-test string-11.6 {string match} {
-    string match ab**c abc
+test string-11.6.$noComp {string match} {
+    run {string match ab**c abc}
 } 1
-test string-11.7 {string match} {
-    string match ab* abcdef
+test string-11.7.$noComp {string match} {
+    run {string match ab* abcdef}
 } 1
-test string-11.8 {string match} {
-    string match *c abc
+test string-11.8.$noComp {string match} {
+    run {string match *c abc}
 } 1
-test string-11.9 {string match} {
-    string match *3*6*9 0123456789
+test string-11.9.$noComp {string match} {
+    run {string match *3*6*9 0123456789}
 } 1
-test string-11.9.1 {string match} {
-    string match *3*6*89 0123456789
+test string-11.9.1.$noComp {string match} {
+    run {string match *3*6*89 0123456789}
 } 1
-test string-11.9.2 {string match} {
-    string match *3*456*89 0123456789
+test string-11.9.2.$noComp {string match} {
+    run {string match *3*456*89 0123456789}
 } 1
-test string-11.9.3 {string match} {
-    string match *3*6* 0123456789
+test string-11.9.3.$noComp {string match} {
+    run {string match *3*6* 0123456789}
 } 1
-test string-11.9.4 {string match} {
-    string match *3*56* 0123456789
+test string-11.9.4.$noComp {string match} {
+    run {string match *3*56* 0123456789}
 } 1
-test string-11.9.5 {string match} {
-    string match *3*456*** 0123456789
+test string-11.9.5.$noComp {string match} {
+    run {string match *3*456*** 0123456789}
 } 1
-test string-11.9.6 {string match} {
-    string match **3*456** 0123456789
+test string-11.9.6.$noComp {string match} {
+    run {string match **3*456** 0123456789}
 } 1
-test string-11.9.7 {string match} {
-    string match *3***456* 0123456789
+test string-11.9.7.$noComp {string match} {
+    run {string match *3***456* 0123456789}
 } 1
-test string-11.9.8 {string match} {
-    string match *3***\[456]* 0123456789
+test string-11.9.8.$noComp {string match} {
+    run {string match *3***\[456]* 0123456789}
 } 1
-test string-11.9.9 {string match} {
-    string match *3***\[4-6]* 0123456789
+test string-11.9.9.$noComp {string match} {
+    run {string match *3***\[4-6]* 0123456789}
 } 1
-test string-11.9.10 {string match} {
-    string match *3***\[4-6] 0123456789
+test string-11.9.10.$noComp {string match} {
+    run {string match *3***\[4-6] 0123456789}
 } 0
-test string-11.9.11 {string match} {
-    string match *3***\[4-6] 0123456
+test string-11.9.11.$noComp {string match} {
+    run {string match *3***\[4-6] 0123456}
 } 1
-test string-11.10 {string match} {
-    string match *3*6*9 01234567890
+test string-11.10.$noComp {string match} {
+    run {string match *3*6*9 01234567890}
 } 0
-test string-11.10.1 {string match} {
-    string match *3*6*89 01234567890
+test string-11.10.1.$noComp {string match} {
+    run {string match *3*6*89 01234567890}
 } 0
-test string-11.10.2 {string match} {
-    string match *3*456*89 01234567890
+test string-11.10.2.$noComp {string match} {
+    run {string match *3*456*89 01234567890}
 } 0
-test string-11.10.3 {string match} {
-    string match **3*456*89 01234567890
+test string-11.10.3.$noComp {string match} {
+    run {string match **3*456*89 01234567890}
 } 0
-test string-11.10.4 {string match} {
-    string match *3*456***89 01234567890
+test string-11.10.4.$noComp {string match} {
+    run {string match *3*456***89 01234567890}
 } 0
-test string-11.11 {string match} {
-    string match a?c abc
+test string-11.11.$noComp {string match} {
+    run {string match a?c abc}
 } 1
-test string-11.12 {string match} {
-    string match a??c abc
+test string-11.12.$noComp {string match} {
+    run {string match a??c abc}
 } 0
-test string-11.13 {string match} {
-    string match ?1??4???8? 0123456789
+test string-11.13.$noComp {string match} {
+    run {string match ?1??4???8? 0123456789}
 } 1
-test string-11.14 {string match} {
-    string match {[abc]bc} abc
+test string-11.14.$noComp {string match} {
+    run {string match {[abc]bc} abc}
 } 1
-test string-11.15 {string match} {
-    string match {a[abc]c} abc
+test string-11.15.$noComp {string match} {
+    run {string match {a[abc]c} abc}
 } 1
-test string-11.16 {string match} {
-    string match {a[xyz]c} abc
+test string-11.16.$noComp {string match} {
+    run {string match {a[xyz]c} abc}
 } 0
-test string-11.17 {string match} {
-    string match {12[2-7]45} 12345
+test string-11.17.$noComp {string match} {
+    run {string match {12[2-7]45} 12345}
 } 1
-test string-11.18 {string match} {
-    string match {12[ab2-4cd]45} 12345
+test string-11.18.$noComp {string match} {
+    run {string match {12[ab2-4cd]45} 12345}
 } 1
-test string-11.19 {string match} {
-    string match {12[ab2-4cd]45} 12b45
+test string-11.19.$noComp {string match} {
+    run {string match {12[ab2-4cd]45} 12b45}
 } 1
-test string-11.20 {string match} {
-    string match {12[ab2-4cd]45} 12d45
+test string-11.20.$noComp {string match} {
+    run {string match {12[ab2-4cd]45} 12d45}
 } 1
-test string-11.21 {string match} {
-    string match {12[ab2-4cd]45} 12145
+test string-11.21.$noComp {string match} {
+    run {string match {12[ab2-4cd]45} 12145}
 } 0
-test string-11.22 {string match} {
-    string match {12[ab2-4cd]45} 12545
+test string-11.22.$noComp {string match} {
+    run {string match {12[ab2-4cd]45} 12545}
 } 0
-test string-11.23 {string match} {
-    string match {a\*b} a*b
+test string-11.23.$noComp {string match} {
+    run {string match {a\*b} a*b}
 } 1
-test string-11.24 {string match} {
-    string match {a\*b} ab
+test string-11.24.$noComp {string match} {
+    run {string match {a\*b} ab}
 } 0
-test string-11.25 {string match} {
-    string match {a\*\?\[\]\\\x} "a*?\[\]\\x"
+test string-11.25.$noComp {string match} {
+    run {string match {a\*\?\[\]\\\x} "a*?\[\]\\x"}
 } 1
-test string-11.26 {string match} {
-    string match ** ""
+test string-11.26.$noComp {string match} {
+    run {string match ** ""}
 } 1
-test string-11.27 {string match} {
-    string match *. ""
+test string-11.27.$noComp {string match} {
+    run {string match *. ""}
 } 0
-test string-11.28 {string match} {
-    string match "" ""
+test string-11.28.$noComp {string match} {
+    run {string match "" ""}
 } 1
-test string-11.29 {string match} {
-    string match \[a a
+test string-11.29.$noComp {string match} {
+    run {string match \[a a}
 } 1
-test string-11.30 {string match, bad args} {
-    list [catch {string match - b c} msg] $msg
+test string-11.30.$noComp {string match, bad args} {
+    list [catch {run {string match - b c}} msg] $msg
 } {1 {bad option "-": must be -nocase}}
-test string-11.31 {string match case} {
-    string match a A
+test string-11.31.$noComp {string match case} {
+    run {string match a A}
 } 0
-test string-11.32 {string match nocase} {
-    string match -n a A
+test string-11.32.$noComp {string match nocase} {
+    run {string match -n a A}
 } 1
-test string-11.33 {string match nocase} {
-    string match -nocase a\334 A\374
+test string-11.33.$noComp {string match nocase} {
+    run {string match -nocase a\334 A\374}
 } 1
-test string-11.34 {string match nocase} {
-    string match -nocase a*f ABCDEf
+test string-11.34.$noComp {string match nocase} {
+    run {string match -nocase a*f ABCDEf}
 } 1
-test string-11.35 {string match case, false hope} {
+test string-11.35.$noComp {string match case, false hope} {
     # This is true because '_' lies between the A-Z and a-z ranges
-    string match {[A-z]} _
+    run {string match {[A-z]} _}
 } 1
-test string-11.36 {string match nocase range} {
+test string-11.36.$noComp {string match nocase range} {
     # This is false because although '_' lies between the A-Z and a-z ranges,
     # we lower case the end points before checking the ranges.
-    string match -nocase {[A-z]} _
+    run {string match -nocase {[A-z]} _}
 } 0
-test string-11.37 {string match nocase} {
-    string match -nocase {[A-fh-Z]} g
+test string-11.37.$noComp {string match nocase} {
+    run {string match -nocase {[A-fh-Z]} g}
 } 0
-test string-11.38 {string match case, reverse range} {
-    string match {[A-fh-Z]} g
+test string-11.38.$noComp {string match case, reverse range} {
+    run {string match {[A-fh-Z]} g}
 } 1
-test string-11.39 {string match, *\ case} {
-    string match {*\abc} abc
+test string-11.39.$noComp {string match, *\ case} {
+    run {string match {*\abc} abc}
 } 1
-test string-11.39.1 {string match, *\ case} {
-    string match {*ab\c} abc
+test string-11.39.1.$noComp {string match, *\ case} {
+    run {string match {*ab\c} abc}
 } 1
-test string-11.39.2 {string match, *\ case} {
-    string match {*ab\*} ab*
+test string-11.39.2.$noComp {string match, *\ case} {
+    run {string match {*ab\*} ab*}
 } 1
-test string-11.39.3 {string match, *\ case} {
-    string match {*ab\*} abc
+test string-11.39.3.$noComp {string match, *\ case} {
+    run {string match {*ab\*} abc}
 } 0
-test string-11.39.4 {string match, *\ case} {
-    string match {*ab\\*} {ab\c}
+test string-11.39.4.$noComp {string match, *\ case} {
+    run {string match {*ab\\*} {ab\c}}
 } 1
-test string-11.39.5 {string match, *\ case} {
-    string match {*ab\\*} {ab\*}
+test string-11.39.5.$noComp {string match, *\ case} {
+    run {string match {*ab\\*} {ab\*}}
 } 1
-test string-11.40 {string match, *special case} {
-    string match {*[ab]} abc
+test string-11.40.$noComp {string match, *special case} {
+    run {string match {*[ab]} abc}
 } 0
-test string-11.41 {string match, *special case} {
-    string match {*[ab]*} abc
+test string-11.41.$noComp {string match, *special case} {
+    run {string match {*[ab]*} abc}
 } 1
-test string-11.42 {string match, *special case} {
-    string match "*\\" "\\"
+test string-11.42.$noComp {string match, *special case} {
+    run {string match "*\\" "\\"}
 } 0
-test string-11.43 {string match, *special case} {
-    string match "*\\\\" "\\"
+test string-11.43.$noComp {string match, *special case} {
+    run {string match "*\\\\" "\\"}
 } 1
-test string-11.44 {string match, *special case} {
-    string match "*???" "12345"
+test string-11.44.$noComp {string match, *special case} {
+    run {string match "*???" "12345"}
 } 1
-test string-11.45 {string match, *special case} {
-    string match "*???" "12"
+test string-11.45.$noComp {string match, *special case} {
+    run {string match "*???" "12"}
 } 0
-test string-11.46 {string match, *special case} {
-    string match "*\\*" "abc*"
+test string-11.46.$noComp {string match, *special case} {
+    run {string match "*\\*" "abc*"}
 } 1
-test string-11.47 {string match, *special case} {
-    string match "*\\*" "*"
+test string-11.47.$noComp {string match, *special case} {
+    run {string match "*\\*" "*"}
 } 1
-test string-11.48 {string match, *special case} {
-    string match "*\\*" "*abc"
+test string-11.48.$noComp {string match, *special case} {
+    run {string match "*\\*" "*abc"}
 } 0
-test string-11.49 {string match, *special case} {
-    string match "?\\*" "a*"
+test string-11.49.$noComp {string match, *special case} {
+    run {string match "?\\*" "a*"}
 } 1
-test string-11.50 {string match, *special case} {
-    string match "\\" "\\"
+test string-11.50.$noComp {string match, *special case} {
+    run {string match "\\" "\\"}
 } 0
-test string-11.51 {string match; *, -nocase and UTF-8} {
-    string match -nocase [binary format I 717316707] \
-	    [binary format I 2028036707]
+test string-11.51.$noComp {string match; *, -nocase and UTF-8} {
+    run {string match -nocase [binary format I 717316707] \
+	    [binary format I 2028036707]}
 } 1
-test string-11.52 {string match, null char in string} {
+test string-11.52.$noComp {string match, null char in string} {
     set out ""
     set ptn "*abc*"
     foreach elem [list "\u0000@abc" "@abc" "\u0000@abc\u0000" "blahabcblah"] {
-	lappend out [string match $ptn $elem]
+	lappend out [run {string match $ptn $elem}]
     }
     set out
 } {1 1 1 1}
-test string-11.53 {string match, null char in pattern} {
+test string-11.53.$noComp {string match, null char in pattern} {
     set out ""
     foreach {ptn elem} [list \
 	    "*\u0000abc\u0000"  "\u0000abc\u0000" \
@@ -1190,661 +1371,707 @@ test string-11.53 {string match, null char in pattern} {
 	    "*\u0000abc\u0000"  "@\u0000abc\u0000ef" \
 	    "*\u0000abc\u0000*"  "@\u0000abc\u0000ef" \
 	    ] {
-	lappend out [string match $ptn $elem]
+	lappend out [run {string match $ptn $elem}]
     }
     set out
 } {1 0 1 0 1}
-test string-11.54 {string match, failure} {
+test string-11.54.$noComp {string match, failure} {
     set longString ""
     for {set i 0} {$i < 10} {incr i} {
 	append longString "abcdefghijklmnopqrstuvwxy\u0000z01234567890123"
     }
-    string first $longString 123
-    list [string match *cba* $longString] \
-	    [string match *a*l*\u0000* $longString] \
-	    [string match *a*l*\u0000*123 $longString] \
-	    [string match *a*l*\u0000*123* $longString] \
-	    [string match *a*l*\u0000*cba* $longString] \
-	    [string match *===* $longString]
+    run {string first $longString 123}
+    list [run {string match *cba* $longString}] \
+	    [run {string match *a*l*\u0000* $longString}] \
+	    [run {string match *a*l*\u0000*123 $longString}] \
+	    [run {string match *a*l*\u0000*123* $longString}] \
+	    [run {string match *a*l*\u0000*cba* $longString}] \
+	    [run {string match *===* $longString}]
 } {0 1 1 1 0 0}
-test string-11.55 {string match, invalid binary optimization} {
+test string-11.55.$noComp {string match, invalid binary optimization} {
     [format string] match \u0141 [binary format c 65]
 } 0
 
-test string-12.1 {string range} {
-    list [catch {string range} msg] $msg
+test stringComp-12.1.0.$noComp {Bug 3588366: end-offsets before start} {
+    apply {s {
+        string range $s 0 end-5
+    }} 12345
+} {}
+test string-12.1.$noComp {string range} {
+    list [catch {run {string range}} msg] $msg
 } {1 {wrong # args: should be "string range string first last"}}
-test string-12.2 {string range} {
-    list [catch {string range a 1} msg] $msg
+test string-12.2.$noComp {string range} {
+    list [catch {run {string range a 1}} msg] $msg
 } {1 {wrong # args: should be "string range string first last"}}
-test string-12.3 {string range} {
-    list [catch {string range a 1 2 3} msg] $msg
+test string-12.3.$noComp {string range} {
+    list [catch {run {string range a 1 2 3}} msg] $msg
 } {1 {wrong # args: should be "string range string first last"}}
-test string-12.4 {string range} {
-    string range abcdefghijklmnop 2 14
+test string-12.4.$noComp {string range} {
+    run {string range abcdefghijklmnop 2 14}
 } {cdefghijklmno}
-test string-12.5 {string range, last > length} {
-    string range abcdefghijklmnop 7 1000
+test string-12.5.$noComp {string range, last > length} {
+    run {string range abcdefghijklmnop 7 1000}
 } {hijklmnop}
-test string-12.6 {string range} {
-    string range abcdefghijklmnop 10 end
+test string-12.6.$noComp {string range} {
+    run {string range abcdefghijklmnop 10 end}
 } {klmnop}
-test string-12.7 {string range, last < first} {
-    string range abcdefghijklmnop 10 9
+test string-12.7.$noComp {string range, last < first} {
+    run {string range abcdefghijklmnop 10 9}
 } {}
-test string-12.8 {string range, first < 0} {
-    string range abcdefghijklmnop -3 2
+test string-12.8.$noComp {string range, first < 0} {
+    run {string range abcdefghijklmnop -3 2}
 } {abc}
-test string-12.9 {string range} {
-    string range abcdefghijklmnop -3 -2
+test string-12.9.$noComp {string range} {
+    run {string range abcdefghijklmnop -3 -2}
 } {}
-test string-12.10 {string range} {
-    string range abcdefghijklmnop 1000 1010
+test string-12.10.$noComp {string range} {
+    run {string range abcdefghijklmnop 1000 1010}
 } {}
-test string-12.11 {string range} {
-    string range abcdefghijklmnop -100 end
+test string-12.11.$noComp {string range} {
+    run {string range abcdefghijklmnop -100 end}
 } {abcdefghijklmnop}
-test string-12.12 {string range} {
-    list [catch {string range abc abc 1} msg] $msg
+test string-12.12.$noComp {string range} {
+    list [catch {run {string range abc abc 1}} msg] $msg
 } {1 {bad index "abc": must be integer?[+-]integer? or end?[+-]integer?}}
-test string-12.13 {string range} {
-    list [catch {string range abc 1 eof} msg] $msg
+test string-12.13.$noComp {string range} {
+    list [catch {run {string range abc 1 eof}} msg] $msg
 } {1 {bad index "eof": must be integer?[+-]integer? or end?[+-]integer?}}
-test string-12.14 {string range} {
-    string range abcdefghijklmnop end-1 end
+test string-12.14.$noComp {string range} {
+    run {string range abcdefghijklmnop end-1 end}
 } {op}
-test string-12.15 {string range} {
-    string range abcdefghijklmnop end 1000
+test string-12.15.$noComp {string range} {
+    run {string range abcdefghijklmnop end 1000}
 } {p}
-test string-12.16 {string range} {
-    string range abcdefghijklmnop end end-1
+test string-12.16.$noComp {string range} {
+    run {string range abcdefghijklmnop end end-1}
 } {}
-test string-12.17 {string range, unicode} {
-    string range ab\u7266cdefghijklmnop 5 5
+test string-12.17.$noComp {string range, unicode} {
+    run {string range ab\u7266cdefghijklmnop 5 5}
 } e
-test string-12.18 {string range, unicode} {
-    string range ab\u7266cdefghijklmnop 2 3
+test string-12.18.$noComp {string range, unicode} {
+    run {string range ab\u7266cdefghijklmnop 2 3}
 } \u7266c
-test string-12.19 {string range, bytearray object} {
+test string-12.19.$noComp {string range, bytearray object} {
     set b [binary format I* {0x50515253 0x52}]
-    set r1 [string range $b 1 end-1]
-    set r2 [string range $b 1 6]
-    string equal $r1 $r2
+    set r1 [run {string range $b 1 end-1}]
+    set r2 [run {string range $b 1 6}]
+    run {string equal $r1 $r2}
 } 1
-test string-12.20 {string range, out of bounds indices} {
-    string range \u00ff 0 1
+test string-12.20.$noComp {string range, out of bounds indices} {
+    run {string range \u00ff 0 1}
 } \u00ff
 # Bug 1410553
-test string-12.21 {string range, regenerates correct reps, bug 1410553} {
+test string-12.21.$noComp {string range, regenerates correct reps, bug 1410553} {
     set bytes "\x00 \x03 \x41"
     set rxBuffer {}
     foreach ch $bytes {
 	append rxBuffer $ch
 	if {$ch eq "\x03"} {
-	    string length $rxBuffer
+	    run {string length $rxBuffer}
 	}
     }
-    set rxCRC [string range $rxBuffer end-1 end]
+    set rxCRC [run {string range $rxBuffer end-1 end}]
     binary scan [join $bytes {}] "H*" input_hex
     binary scan $rxBuffer "H*" rxBuffer_hex
     binary scan $rxCRC "H*" rxCRC_hex
     list $input_hex $rxBuffer_hex $rxCRC_hex
 } {000341 000341 0341}
-test string-12.22 {string range, shimmering binary/index} {
+test string-12.22.$noComp {string range, shimmering binary/index} {
     set s 0000000001
     binary scan $s a* x
-    string range $s $s end
+    run {string range $s $s end}
 } 000000001
-test string-12.23 {string range, surrogates, bug [11ae2be95dac9417]} fullutf {
-    list [string range a\U100000b 1 1] [string range a\U100000b 2 2] [string range a\U100000b 3 3]
+test string-12.23.$noComp {string range, surrogates, bug [11ae2be95dac9417]} fullutf {
+    run {list [string range a\U100000b 1 1] [string range a\U100000b 2 2] [string range a\U100000b 3 3]}
 } [list \U100000 {} b]
 
-test string-13.1 {string repeat} {
-    list [catch {string repeat} msg] $msg
+test string-13.1.$noComp {string repeat} {
+    list [catch {run {string repeat}} msg] $msg
 } {1 {wrong # args: should be "string repeat string count"}}
-test string-13.2 {string repeat} {
-    list [catch {string repeat abc 10 oops} msg] $msg
+test string-13.2.$noComp {string repeat} {
+    list [catch {run {string repeat abc 10 oops}} msg] $msg
 } {1 {wrong # args: should be "string repeat string count"}}
-test string-13.3 {string repeat} {
-    string repeat {} 100
+test string-13.3.$noComp {string repeat} {
+    run {string repeat {} 100}
 } {}
-test string-13.4 {string repeat} {
-    string repeat { } 5
+test string-13.4.$noComp {string repeat} {
+    run {string repeat { } 5}
 } {     }
-test string-13.5 {string repeat} {
-    string repeat abc 3
+test string-13.5.$noComp {string repeat} {
+    run {string repeat abc 3}
 } {abcabcabc}
-test string-13.6 {string repeat} {
-    string repeat abc -1
+test string-13.6.$noComp {string repeat} {
+    run {string repeat abc -1}
 } {}
-test string-13.7 {string repeat} {
-    list [catch {string repeat abc end} msg] $msg
+test string-13.7.$noComp {string repeat} {
+    list [catch {run {string repeat abc end}} msg] $msg
 } {1 {expected integer but got "end"}}
-test string-13.8 {string repeat} {
-    string repeat {} -1000
+test string-13.8.$noComp {string repeat} {
+    run {string repeat {} -1000}
 } {}
-test string-13.9 {string repeat} {
-    string repeat {} 0
+test string-13.9.$noComp {string repeat} {
+    run {string repeat {} 0}
 } {}
-test string-13.10 {string repeat} {
-    string repeat def 0
+test string-13.10.$noComp {string repeat} {
+    run {string repeat def 0}
 } {}
-test string-13.11 {string repeat} {
-    string repeat def 1
+test string-13.11.$noComp {string repeat} {
+    run {string repeat def 1}
 } def
-test string-13.12 {string repeat} {
-    string repeat ab\u7266cd 3
+test string-13.12.$noComp {string repeat} {
+    run {string repeat ab\u7266cd 3}
 } ab\u7266cdab\u7266cdab\u7266cd
-test string-13.13 {string repeat} {
-    string repeat \x00 3
+test string-13.13.$noComp {string repeat} {
+    run {string repeat \x00 3}
 } \x00\x00\x00
-test string-13.14 {string repeat} {
+test string-13.14.$noComp {string repeat} {
     # The string range will ensure us that string repeat gets a unicode string
-    string repeat [string range ab\u7266cd 2 3] 3
+    run {string repeat [run {string range ab\u7266cd 2 3}] 3}
 } \u7266c\u7266c\u7266c
 
-test string-14.1 {string replace} {
-    list [catch {string replace} msg] $msg
+test string-14.1.$noComp {string replace} {
+    list [catch {run {string replace}} msg] $msg
 } {1 {wrong # args: should be "string replace string first last ?string?"}}
-test string-14.2 {string replace} {
-    list [catch {string replace a 1} msg] $msg
+test string-14.2.$noComp {string replace} {
+    list [catch {run {string replace a 1}} msg] $msg
 } {1 {wrong # args: should be "string replace string first last ?string?"}}
-test string-14.3 {string replace} {
-    list [catch {string replace a 1 2 3 4} msg] $msg
+test string-14.3.$noComp {string replace} {
+    list [catch {run {string replace a 1 2 3 4}} msg] $msg
 } {1 {wrong # args: should be "string replace string first last ?string?"}}
-test string-14.4 {string replace} {
+test string-14.4.$noComp {string replace} {
 } {}
-test string-14.5 {string replace} {
-    string replace abcdefghijklmnop 2 14
+test string-14.5.$noComp {string replace} {
+    run {string replace abcdefghijklmnop 2 14}
 } {abp}
-test string-14.6 {string replace} {
-    string replace abcdefghijklmnop 7 1000
+test string-14.6.$noComp {string replace} {
+    run {string replace abcdefghijklmnop 7 1000}
 } {abcdefg}
-test string-14.7 {string replace} {
-    string replace abcdefghijklmnop 10 end
+test string-14.7.$noComp {string replace} {
+    run {string replace abcdefghijklmnop 10 end}
 } {abcdefghij}
-test string-14.8 {string replace} {
-    string replace abcdefghijklmnop 10 9
+test string-14.8.$noComp {string replace} {
+    run {string replace abcdefghijklmnop 10 9}
 } {abcdefghijklmnop}
-test string-14.9 {string replace} {
-    string replace abcdefghijklmnop -3 2
+test string-14.9.$noComp {string replace} {
+    run {string replace abcdefghijklmnop -3 2}
 } {defghijklmnop}
-test string-14.10 {string replace} {
-    string replace abcdefghijklmnop -3 -2
+test string-14.10.$noComp {string replace} {
+    run {string replace abcdefghijklmnop -3 -2}
 } {abcdefghijklmnop}
-test string-14.11 {string replace} {
-    string replace abcdefghijklmnop 1000 1010
+test string-14.11.$noComp {string replace} {
+    run {string replace abcdefghijklmnop 1000 1010}
 } {abcdefghijklmnop}
-test string-14.12 {string replace} {
-    string replace abcdefghijklmnop -100 end
+test string-14.12.$noComp {string replace} {
+    run {string replace abcdefghijklmnop -100 end}
 } {}
-test string-14.13 {string replace} {
-    list [catch {string replace abc abc 1} msg] $msg
+test string-14.13.$noComp {string replace} {
+    list [catch {run {string replace abc abc 1}} msg] $msg
 } {1 {bad index "abc": must be integer?[+-]integer? or end?[+-]integer?}}
-test string-14.14 {string replace} {
-    list [catch {string replace abc 1 eof} msg] $msg
+test string-14.14.$noComp {string replace} {
+    list [catch {run {string replace abc 1 eof}} msg] $msg
 } {1 {bad index "eof": must be integer?[+-]integer? or end?[+-]integer?}}
-test string-14.15 {string replace} {
-    string replace abcdefghijklmnop end-10 end-2 NEW
+test string-14.15.$noComp {string replace} {
+    run {string replace abcdefghijklmnop end-10 end-2 NEW}
 } {abcdeNEWop}
-test string-14.16 {string replace} {
-    string replace abcdefghijklmnop 0 end foo
+test string-14.16.$noComp {string replace} {
+    run {string replace abcdefghijklmnop 0 end foo}
 } {foo}
-test string-14.17 {string replace} {
-    string replace abcdefghijklmnop end end-1
+test string-14.17.$noComp {string replace} {
+    run {string replace abcdefghijklmnop end end-1}
 } {abcdefghijklmnop}
-test string-14.18 {string replace} {
-    string replace abcdefghijklmnop 10 9 XXX
+test string-14.18.$noComp {string replace} {
+    run {string replace abcdefghijklmnop 10 9 XXX}
 } {abcdefghijklmnop}
-test string-14.19 {string replace} {
-    string replace {} -1 0 A
+test string-14.19.$noComp {string replace} {
+    run {string replace {} -1 0 A}
 } A
-test string-14.20 {string replace} {
-    string replace [makeByteArray abcdefghijklmnop] end-10 end-2 [makeByteArray NEW]
-} abcdeNEWop
+test string-14.20.$noComp {string replace} {
+    run {string replace [makeByteArray abcdefghijklmnop] end-10 end-2\
+	    [makeByteArray NEW]}
+} {abcdeNEWop}
+
 
-test string-15.1 {string tolower too few args} {
-    list [catch {string tolower} msg] $msg
+test stringComp-14.21.$noComp {Bug 82e7f67325} {
+    apply {x {
+        set a [join $x {}]
+        lappend b [string length [string replace ___! 0 2 $a]]
+        lappend b [string length [string replace ___! 0 2 $a[unset a]]]
+    }} {a b}
+} {3 3}
+test stringComp-14.22.$noComp {Bug 82e7f67325} memory {
+    # As in stringComp-14.1, but make sure we don't retain too many refs
+    leaktest {
+        apply {x {
+            set a [join $x {}]
+            lappend b [string length [string replace ___! 0 2 $a]]
+            lappend b [string length [string replace ___! 0 2 $a[unset a]]]
+        }} {a b}
+    }
+} {0}
+test stringComp-14.23.$noComp {Bug 0dca3bfa8f} {
+    apply {arg {
+        set argCopy $arg
+        set arg [string replace $arg 1 2 aa]
+        # Crashes in comparison before fix
+        expr {$arg ne $argCopy}
+    }} abcde
+} 1
+test stringComp-14.24.$noComp {Bug 1af8de570511} {
+    apply {{x y} {
+        # Generate an unshared string value
+        set val ""
+        for { set i 0 } { $i < $x } { incr i } {
+            set val [format "0%s" $val]
+        }
+        string replace $val[unset val] 1 1 $y
+    }} 4 x
+} 0x00
+test stringComp-14.25.$noComp {} {
+    string length [string replace [string repeat a\u00fe 2] 3 end {}]
+} 3
+
+test string-15.1.$noComp {string tolower too few args} {
+    list [catch {run {string tolower}} msg] $msg
 } {1 {wrong # args: should be "string tolower string ?first? ?last?"}}
-test string-15.2 {string tolower bad args} {
-    list [catch {string tolower a b} msg] $msg
+test string-15.2.$noComp {string tolower bad args} {
+    list [catch {run {string tolower a b}} msg] $msg
 } {1 {bad index "b": must be integer?[+-]integer? or end?[+-]integer?}}
-test string-15.3 {string tolower too many args} {
-    list [catch {string tolower ABC 1 end oops} msg] $msg
+test string-15.3.$noComp {string tolower too many args} {
+    list [catch {run {string tolower ABC 1 end oops}} msg] $msg
 } {1 {wrong # args: should be "string tolower string ?first? ?last?"}}
-test string-15.4 {string tolower} {
-    string tolower ABCDeF
+test string-15.4.$noComp {string tolower} {
+    run {string tolower ABCDeF}
 } {abcdef}
-test string-15.5 {string tolower} {
-    string tolower "ABC  XyZ"
+test string-15.5.$noComp {string tolower} {
+    run {string tolower "ABC  XyZ"}
 } {abc  xyz}
-test string-15.6 {string tolower} {
-    string tolower {123#$&*()}
+test string-15.6.$noComp {string tolower} {
+    run {string tolower {123#$&*()}}
 } {123#$&*()}
-test string-15.7 {string tolower} {
-    string tolower ABC 1
+test string-15.7.$noComp {string tolower} {
+    run {string tolower ABC 1}
 } AbC
-test string-15.8 {string tolower} {
-    string tolower ABC 1 end
+test string-15.8.$noComp {string tolower} {
+    run {string tolower ABC 1 end}
 } Abc
-test string-15.9 {string tolower} {
-    string tolower ABC 0 end-1
+test string-15.9.$noComp {string tolower} {
+    run {string tolower ABC 0 end-1}
 } abC
-test string-15.10 {string tolower, unicode} {
-     string tolower ABCabc\xc7\xe7
+test string-15.10.$noComp {string tolower, unicode} {
+     run {string tolower ABCabc\xc7\xe7}
 } "abcabc\xe7\xe7"
-test string-15.11 {string tolower, compiled} {
-    lindex [string tolower [list A B [list C]]] 1
+test string-15.11.$noComp {string tolower, compiled} {
+    lindex [run {string tolower [list A B [list C]]}] 1
 } b
 
-test string-16.1 {string toupper} {
-    list [catch {string toupper} msg] $msg
+test string-16.1.$noComp {string toupper} {
+    list [catch {run {string toupper}} msg] $msg
 } {1 {wrong # args: should be "string toupper string ?first? ?last?"}}
-test string-16.2 {string toupper} {
-    list [catch {string toupper a b} msg] $msg
+test string-16.2.$noComp {string toupper} {
+    list [catch {run {string toupper a b}} msg] $msg
 } {1 {bad index "b": must be integer?[+-]integer? or end?[+-]integer?}}
-test string-16.3 {string toupper} {
-    list [catch {string toupper a 1 end oops} msg] $msg
+test string-16.3.$noComp {string toupper} {
+    list [catch {run {string toupper a 1 end oops}} msg] $msg
 } {1 {wrong # args: should be "string toupper string ?first? ?last?"}}
-test string-16.4 {string toupper} {
-    string toupper abCDEf
+test string-16.4.$noComp {string toupper} {
+    run {string toupper abCDEf}
 } {ABCDEF}
-test string-16.5 {string toupper} {
-    string toupper "abc xYz"
+test string-16.5.$noComp {string toupper} {
+    run {string toupper "abc xYz"}
 } {ABC XYZ}
-test string-16.6 {string toupper} {
-    string toupper {123#$&*()}
+test string-16.6.$noComp {string toupper} {
+    run {string toupper {123#$&*()}}
 } {123#$&*()}
-test string-16.7 {string toupper} {
-    string toupper abc 1
+test string-16.7.$noComp {string toupper} {
+    run {string toupper abc 1}
 } aBc
-test string-16.8 {string toupper} {
-    string toupper abc 1 end
+test string-16.8.$noComp {string toupper} {
+    run {string toupper abc 1 end}
 } aBC
-test string-16.9 {string toupper} {
-    string toupper abc 0 end-1
+test string-16.9.$noComp {string toupper} {
+    run {string toupper abc 0 end-1}
 } ABc
-test string-16.10 {string toupper, unicode} {
-    string toupper ABCabc\xc7\xe7
+test string-16.10.$noComp {string toupper, unicode} {
+    run {string toupper ABCabc\xc7\xe7}
 } "ABCABC\xc7\xc7"
-test string-16.11 {string toupper, compiled} {
-    lindex [string toupper [list a b [list c]]] 1
+test string-16.11.$noComp {string toupper, compiled} {
+    lindex [run {string toupper [list a b [list c]]}] 1
 } B
 
-test string-17.1 {string totitle} {
-    list [catch {string totitle} msg] $msg
+test string-17.1.$noComp {string totitle} {
+    list [catch {run {string totitle}} msg] $msg
 } {1 {wrong # args: should be "string totitle string ?first? ?last?"}}
-test string-17.2 {string totitle} {
-    list [catch {string totitle a b} msg] $msg
+test string-17.2.$noComp {string totitle} {
+    list [catch {run {string totitle a b}} msg] $msg
 } {1 {bad index "b": must be integer?[+-]integer? or end?[+-]integer?}}
-test string-17.3 {string totitle} {
-    string totitle abCDEf
+test string-17.3.$noComp {string totitle} {
+    run {string totitle abCDEf}
 } {Abcdef}
-test string-17.4 {string totitle} {
-    string totitle "abc xYz"
+test string-17.4.$noComp {string totitle} {
+    run {string totitle "abc xYz"}
 } {Abc xyz}
-test string-17.5 {string totitle} {
-    string totitle {123#$&*()}
+test string-17.5.$noComp {string totitle} {
+    run {string totitle {123#$&*()}}
 } {123#$&*()}
-test string-17.6 {string totitle, unicode} {
-    string totitle ABCabc\xc7\xe7
+test string-17.6.$noComp {string totitle, unicode} {
+    run {string totitle ABCabc\xc7\xe7}
 } "Abcabc\xe7\xe7"
-test string-17.7 {string totitle, unicode} {
-    string totitle \u01f3BCabc\xc7\xe7
+test string-17.7.$noComp {string totitle, unicode} {
+    run {string totitle \u01f3BCabc\xc7\xe7}
 } "\u01f2bcabc\xe7\xe7"
-test string-17.8 {string totitle, compiled} {
-    lindex [string totitle [list aa bb [list cc]]] 0
+test string-17.8.$noComp {string totitle, compiled} {
+    lindex [run {string totitle [list aa bb [list cc]]}] 0
 } Aa
 
-test string-18.1 {string trim} {
-    list [catch {string trim} msg] $msg
+test string-18.1.$noComp {string trim} {
+    list [catch {run {string trim}} msg] $msg
 } {1 {wrong # args: should be "string trim string ?chars?"}}
-test string-18.2 {string trim} {
-    list [catch {string trim a b c} msg] $msg
+test string-18.2.$noComp {string trim} {
+    list [catch {run {string trim a b c}} msg] $msg
 } {1 {wrong # args: should be "string trim string ?chars?"}}
-test string-18.3 {string trim} {
-    string trim "    XYZ      "
+test string-18.3.$noComp {string trim} {
+    run {string trim "    XYZ      "}
 } {XYZ}
-test string-18.4 {string trim} {
-    string trim "\t\nXYZ\t\n\r\n"
+test string-18.4.$noComp {string trim} {
+    run {string trim "\t\nXYZ\t\n\r\n"}
 } {XYZ}
-test string-18.5 {string trim} {
-    string trim "  A XYZ A    "
+test string-18.5.$noComp {string trim} {
+    run {string trim "  A XYZ A    "}
 } {A XYZ A}
-test string-18.6 {string trim} {
-    string trim "XXYYZZABC XXYYZZ" ZYX
+test string-18.6.$noComp {string trim} {
+    run {string trim "XXYYZZABC XXYYZZ" ZYX}
 } {ABC }
-test string-18.7 {string trim} {
-    string trim "    \t\r      "
+test string-18.7.$noComp {string trim} {
+    run {string trim "    \t\r      "}
 } {}
-test string-18.8 {string trim} {
-    string trim {abcdefg} {}
+test string-18.8.$noComp {string trim} {
+    run {string trim {abcdefg} {}}
 } {abcdefg}
-test string-18.9 {string trim} {
-    string trim {}
+test string-18.9.$noComp {string trim} {
+    run {string trim {}}
 } {}
-test string-18.10 {string trim} {
-    string trim ABC DEF
+test string-18.10.$noComp {string trim} {
+    run {string trim ABC DEF}
 } {ABC}
-test string-18.11 {string trim, unicode} {
-    string trim "\xe7\xe8 AB\xe7C \xe8\xe7" \xe7\xe8
+test string-18.11.$noComp {string trim, unicode} {
+    run {string trim "\xe7\xe8 AB\xe7C \xe8\xe7" \xe7\xe8}
 } " AB\xe7C "
-test string-18.12 {string trim, unicode default} {
-    string trim \ufeff\x00\u0085\u00a0\u1680\u180eABC\u1361\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u2028\u2029\u202f\u205f\u3000
+test string-18.12.$noComp {string trim, unicode default} {
+    run {string trim \ufeff\x00\u0085\u00a0\u1680\u180eABC\u1361\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u2028\u2029\u202f\u205f\u3000}
 } ABC\u1361
 
-test string-19.1 {string trimleft} {
-    list [catch {string trimleft} msg] $msg
+test string-19.1.$noComp {string trimleft} {
+    list [catch {run {string trimleft}} msg] $msg
 } {1 {wrong # args: should be "string trimleft string ?chars?"}}
-test string-19.2 {string trimleft} {
-    string trimleft "    XYZ      "
+test string-19.2.$noComp {string trimleft} {
+    run {string trimleft "    XYZ      "}
 } {XYZ      }
-test string-19.3 {string trimleft, unicode default} {
-    string trimleft \ufeff\u0085\u00a0\x00\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u2028\u2029\u202f\u205f\u3000\u1361ABC
+test string-19.3.$noComp {string trimleft, unicode default} {
+    run {string trimleft \ufeff\u0085\u00a0\x00\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u2028\u2029\u202f\u205f\u3000\u1361ABC}
 } \u1361ABC
 
-test string-20.1 {string trimright errors} {
-    list [catch {string trimright} msg] $msg
+test string-20.1.$noComp {string trimright errors} {
+    list [catch {run {string trimright}} msg] $msg
 } {1 {wrong # args: should be "string trimright string ?chars?"}}
-test string-20.2 {string trimright errors} {
-    list [catch {string trimg a} msg] $msg
+test string-20.2.$noComp {string trimright errors} {
+    list [catch {run {string trimg a}} msg] $msg
 } {1 {unknown or ambiguous subcommand "trimg": must be bytelength, cat, compare, equal, first, index, is, last, length, map, match, range, repeat, replace, reverse, tolower, totitle, toupper, trim, trimleft, trimright, wordend, or wordstart}}
-test string-20.3 {string trimright} {
-    string trimright "    XYZ      "
+test string-20.3.$noComp {string trimright} {
+    run {string trimright "    XYZ      "}
 } {    XYZ}
-test string-20.4 {string trimright} {
-    string trimright "   "
+test string-20.4.$noComp {string trimright} {
+    run {string trimright "   "}
 } {}
-test string-20.5 {string trimright} {
-    string trimright ""
+test string-20.5.$noComp {string trimright} {
+    run {string trimright ""}
 } {}
-test string-20.6 {string trimright, unicode default} {
-    string trimright ABC\u1361\u0085\x00\u00a0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u2028\u2029\u202f\u205f\u3000
+test string-20.6.$noComp {string trimright, unicode default} {
+    run {string trimright ABC\u1361\u0085\x00\u00a0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u2028\u2029\u202f\u205f\u3000}
 } ABC\u1361
 
-test string-21.1 {string wordend} {
-    list [catch {string wordend a} msg] $msg
+test string-21.1.$noComp {string wordend} {
+    list [catch {run {string wordend a}} msg] $msg
 } {1 {wrong # args: should be "string wordend string index"}}
-test string-21.2 {string wordend} {
-    list [catch {string wordend a b c} msg] $msg
+test string-21.2.$noComp {string wordend} {
+    list [catch {run {string wordend a b c}} msg] $msg
 } {1 {wrong # args: should be "string wordend string index"}}
-test string-21.3 {string wordend} {
-    list [catch {string wordend a gorp} msg] $msg
+test string-21.3.$noComp {string wordend} {
+    list [catch {run {string wordend a gorp}} msg] $msg
 } {1 {bad index "gorp": must be integer?[+-]integer? or end?[+-]integer?}}
-test string-21.4 {string wordend} {
-    string wordend abc. -1
+test string-21.4.$noComp {string wordend} {
+    run {string wordend abc. -1}
 } 3
-test string-21.5 {string wordend} {
-    string wordend abc. 100
+test string-21.5.$noComp {string wordend} {
+    run {string wordend abc. 100}
 } 4
-test string-21.6 {string wordend} {
-    string wordend "word_one two three" 2
+test string-21.6.$noComp {string wordend} {
+    run {string wordend "word_one two three" 2}
 } 8
-test string-21.7 {string wordend} {
-    string wordend "one .&# three" 5
+test string-21.7.$noComp {string wordend} {
+    run {string wordend "one .&# three" 5}
 } 6
-test string-21.8 {string wordend} {
-    string worde "x.y" 0
+test string-21.8.$noComp {string wordend} {
+    run {string worde "x.y" 0}
 } 1
-test string-21.9 {string wordend} {
-    string worde "x.y" end-1
+test string-21.9.$noComp {string wordend} {
+    run {string worde "x.y" end-1}
 } 2
-test string-21.10 {string wordend, unicode} {
-    string wordend "xyz\u00c7de fg" 0
+test string-21.10.$noComp {string wordend, unicode} {
+    run {string wordend "xyz\u00c7de fg" 0}
 } 6
-test string-21.11 {string wordend, unicode} {
-    string wordend "xyz\uc700de fg" 0
+test string-21.11.$noComp {string wordend, unicode} {
+    run {string wordend "xyz\uc700de fg" 0}
 } 6
-test string-21.12 {string wordend, unicode} {
-    string wordend "xyz\u203fde fg" 0
+test string-21.12.$noComp {string wordend, unicode} {
+    run {string wordend "xyz\u203fde fg" 0}
 } 6
-test string-21.13 {string wordend, unicode} {
-    string wordend "xyz\u2045de fg" 0
+test string-21.13.$noComp {string wordend, unicode} {
+    run {string wordend "xyz\u2045de fg" 0}
 } 3
-test string-21.14 {string wordend, unicode} {
-    string wordend "\uc700\uc700 abc" 8
+test string-21.14.$noComp {string wordend, unicode} {
+    run {string wordend "\uc700\uc700 abc" 8}
 } 6
 
-test string-22.1 {string wordstart} {
-    list [catch {string word a} msg] $msg
+test string-22.1.$noComp {string wordstart} {
+    list [catch {run {string word a}} msg] $msg
 } {1 {unknown or ambiguous subcommand "word": must be bytelength, cat, compare, equal, first, index, is, last, length, map, match, range, repeat, replace, reverse, tolower, totitle, toupper, trim, trimleft, trimright, wordend, or wordstart}}
-test string-22.2 {string wordstart} {
-    list [catch {string wordstart a} msg] $msg
+test string-22.2.$noComp {string wordstart} {
+    list [catch {run {string wordstart a}} msg] $msg
 } {1 {wrong # args: should be "string wordstart string index"}}
-test string-22.3 {string wordstart} {
-    list [catch {string wordstart a b c} msg] $msg
+test string-22.3.$noComp {string wordstart} {
+    list [catch {run {string wordstart a b c}} msg] $msg
 } {1 {wrong # args: should be "string wordstart string index"}}
-test string-22.4 {string wordstart} {
-    list [catch {string wordstart a gorp} msg] $msg
+test string-22.4.$noComp {string wordstart} {
+    list [catch {run {string wordstart a gorp}} msg] $msg
 } {1 {bad index "gorp": must be integer?[+-]integer? or end?[+-]integer?}}
-test string-22.5 {string wordstart} {
-    string wordstart "one two three_words" 400
+test string-22.5.$noComp {string wordstart} {
+    run {string wordstart "one two three_words" 400}
 } 8
-test string-22.6 {string wordstart} {
-    string wordstart "one two three_words" 2
+test string-22.6.$noComp {string wordstart} {
+    run {string wordstart "one two three_words" 2}
 } 0
-test string-22.7 {string wordstart} {
-    string wordstart "one two three_words" -2
+test string-22.7.$noComp {string wordstart} {
+    run {string wordstart "one two three_words" -2}
 } 0
-test string-22.8 {string wordstart} {
-    string wordstart "one .*&^ three" 6
+test string-22.8.$noComp {string wordstart} {
+    run {string wordstart "one .*&^ three" 6}
 } 6
-test string-22.9 {string wordstart} {
-    string wordstart "one two three" 4
+test string-22.9.$noComp {string wordstart} {
+    run {string wordstart "one two three" 4}
 } 4
-test string-22.10 {string wordstart} {
-    string wordstart "one two three" end-5
+test string-22.10.$noComp {string wordstart} {
+    run {string wordstart "one two three" end-5}
 } 7
-test string-22.11 {string wordstart, unicode} {
-    string wordstart "one tw\u00c7o three" 7
+test string-22.11.$noComp {string wordstart, unicode} {
+    run {string wordstart "one tw\u00c7o three" 7}
 } 4
-test string-22.12 {string wordstart, unicode} {
-    string wordstart "ab\uc700\uc700 cdef ghi" 12
+test string-22.12.$noComp {string wordstart, unicode} {
+    run {string wordstart "ab\uc700\uc700 cdef ghi" 12}
 } 10
-test string-22.13 {string wordstart, unicode} {
-    string wordstart "\uc700\uc700 abc" 8
+test string-22.13.$noComp {string wordstart, unicode} {
+    run {string wordstart "\uc700\uc700 abc" 8}
 } 3
 
-test string-23.0 {string is boolean, Bug 1187123} testindexobj {
+test string-23.0.$noComp {string is boolean, Bug 1187123} testindexobj {
     set x 5
     catch {testindexobj $x foo bar soom}
-    string is boolean $x
+    run {string is boolean $x}
 } 0
-test string-23.1 {string is command with empty string} {
+test string-23.1.$noComp {string is command with empty string} {
     set s ""
     list \
-        [string is alnum $s] \
-        [string is alpha $s] \
-        [string is ascii $s] \
-        [string is control $s] \
-        [string is boolean $s] \
-        [string is digit $s] \
-        [string is double $s] \
-        [string is false $s] \
-        [string is graph $s] \
-        [string is integer $s] \
-        [string is lower $s] \
-        [string is print $s] \
-        [string is punct $s] \
-        [string is space $s] \
-        [string is true $s] \
-        [string is upper $s] \
-        [string is wordchar $s] \
-        [string is xdigit $s] \
+        [run {string is alnum $s}] \
+        [run {string is alpha $s}] \
+        [run {string is ascii $s}] \
+        [run {string is control $s}] \
+        [run {string is boolean $s}] \
+        [run {string is digit $s}] \
+        [run {string is double $s}] \
+        [run {string is false $s}] \
+        [run {string is graph $s}] \
+        [run {string is integer $s}] \
+        [run {string is lower $s}] \
+        [run {string is print $s}] \
+        [run {string is punct $s}] \
+        [run {string is space $s}] \
+        [run {string is true $s}] \
+        [run {string is upper $s}] \
+        [run {string is wordchar $s}] \
+        [run {string is xdigit $s}] \
 
 } {1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1}
-test string-23.2 {string is command with empty string} {
+test string-23.2.$noComp {string is command with empty string} {
     set s ""
     list \
-        [string is alnum -strict $s] \
-        [string is alpha -strict $s] \
-        [string is ascii -strict $s] \
-        [string is control -strict $s] \
-        [string is boolean -strict $s] \
-        [string is digit -strict $s] \
-        [string is double -strict $s] \
-        [string is false -strict $s] \
-        [string is graph -strict $s] \
-        [string is integer -strict $s] \
-        [string is lower -strict $s] \
-        [string is print -strict $s] \
-        [string is punct -strict $s] \
-        [string is space -strict $s] \
-        [string is true -strict $s] \
-        [string is upper -strict $s] \
-        [string is wordchar -strict $s] \
-        [string is xdigit -strict $s] \
+        [run {string is alnum -strict $s}] \
+        [run {string is alpha -strict $s}] \
+        [run {string is ascii -strict $s}] \
+        [run {string is control -strict $s}] \
+        [run {string is boolean -strict $s}] \
+        [run {string is digit -strict $s}] \
+        [run {string is double -strict $s}] \
+        [run {string is false -strict $s}] \
+        [run {string is graph -strict $s}] \
+        [run {string is integer -strict $s}] \
+        [run {string is lower -strict $s}] \
+        [run {string is print -strict $s}] \
+        [run {string is punct -strict $s}] \
+        [run {string is space -strict $s}] \
+        [run {string is true -strict $s}] \
+        [run {string is upper -strict $s}] \
+        [run {string is wordchar -strict $s}] \
+        [run {string is xdigit -strict $s}] \
 
 } {0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0}
 
-test string-24.1 {string reverse command} -body {
-    string reverse
+test string-24.1.$noComp {string reverse command} -body {
+    run {string reverse}
 } -returnCodes error -result "wrong # args: should be \"string reverse string\""
-test string-24.2 {string reverse command} -body {
-    string reverse a b
+test string-24.2.$noComp {string reverse command} -body {
+    run {string reverse a b}
 } -returnCodes error -result "wrong # args: should be \"string reverse string\""
-test string-24.3 {string reverse command - shared string} {
+test string-24.3.$noComp {string reverse command - shared string} {
     set x abcde
-    string reverse $x
+    run {string reverse $x}
 } edcba
-test string-24.4 {string reverse command - unshared string} {
+test string-24.4.$noComp {string reverse command - unshared string} {
     set x abc
     set y de
-    string reverse $x$y
+    run {string reverse $x$y}
 } edcba
-test string-24.5 {string reverse command - shared unicode string} {
+test string-24.5.$noComp {string reverse command - shared unicode string} {
     set x abcde\ud0ad
-    string reverse $x
+    run {string reverse $x}
 } \ud0adedcba
-test string-24.6 {string reverse command - unshared string} {
+test string-24.6.$noComp {string reverse command - unshared string} {
     set x abc
     set y de\ud0ad
-    string reverse $x$y
+    run {string reverse $x$y}
 } \ud0adedcba
-test string-24.7 {string reverse command - simple case} {
-    string reverse a
+test string-24.7.$noComp {string reverse command - simple case} {
+    run {string reverse a}
 } a
-test string-24.8 {string reverse command - simple case} {
-    string reverse \ud0ad
+test string-24.8.$noComp {string reverse command - simple case} {
+    run {string reverse \ud0ad}
 } \ud0ad
-test string-24.9 {string reverse command - simple case} {
-    string reverse {}
+test string-24.9.$noComp {string reverse command - simple case} {
+    run {string reverse {}}
 } {}
-test string-24.10 {string reverse command - corner case} {
+test string-24.10.$noComp {string reverse command - corner case} {
     set x \ubeef\ud0ad
-    string reverse $x
+    run {string reverse $x}
 } \ud0ad\ubeef
-test string-24.11 {string reverse command - corner case} {
+test string-24.11.$noComp {string reverse command - corner case} {
     set x \ubeef
     set y \ud0ad
-    string reverse $x$y
+    run {string reverse $x$y}
 } \ud0ad\ubeef
-test string-24.12 {string reverse command - corner case} {
+test string-24.12.$noComp {string reverse command - corner case} {
     set x \ubeef
     set y \ud0ad
-    string is ascii [string reverse $x$y]
+    run {string is ascii [run {string reverse $x$y}]}
 } 0
-test string-24.13 {string reverse command - pure Unicode string} {
-    string reverse [string range \ubeef\ud0ad\ubeef\ud0ad\ubeef\ud0ad 1 5]
+test string-24.13.$noComp {string reverse command - pure Unicode string} {
+    run {string reverse [run {string range \ubeef\ud0ad\ubeef\ud0ad\ubeef\ud0ad 1 5}]}
 } \ud0ad\ubeef\ud0ad\ubeef\ud0ad
-test string-24.14 {string reverse command - pure bytearray} {
-    binary scan [string reverse [binary format H* 010203]] H* x
+test string-24.14.$noComp {string reverse command - pure bytearray} {
+    binary scan [run {string reverse [binary format H* 010203]}] H* x
     set x
 } 030201
-test string-24.15 {string reverse command - pure bytearray} {
-    binary scan [tcl::string::reverse [binary format H* 010203]] H* x
+test string-24.15.$noComp {string reverse command - pure bytearray} {
+    binary scan [run {tcl::string::reverse [binary format H* 010203]}] H* x
     set x
 } 030201
 
-test string-25.1 {string is list} {
-    string is list {a b c}
+test string-25.1.$noComp {string is list} {
+    run {string is list {a b c}}
 } 1
-test string-25.2 {string is list} {
-    string is list "a \{b c"
+test string-25.2.$noComp {string is list} {
+    run {string is list "a \{b c"}
 } 0
-test string-25.3 {string is list} {
-    string is list {a {b c}d e}
+test string-25.3.$noComp {string is list} {
+    run {string is list {a {b c}d e}}
 } 0
-test string-25.4 {string is list} {
-    string is list {}
+test string-25.4.$noComp {string is list} {
+    run {string is list {}}
 } 1
-test string-25.5 {string is list} {
-    string is list -strict {a b c}
+test string-25.5.$noComp {string is list} {
+    run {string is list -strict {a b c}}
 } 1
-test string-25.6 {string is list} {
-    string is list -strict "a \{b c"
+test string-25.6.$noComp {string is list} {
+    run {string is list -strict "a \{b c"}
 } 0
-test string-25.7 {string is list} {
-    string is list -strict {a {b c}d e}
+test string-25.7.$noComp {string is list} {
+    run {string is list -strict {a {b c}d e}}
 } 0
-test string-25.8 {string is list} {
-    string is list -strict {}
+test string-25.8.$noComp {string is list} {
+    run {string is list -strict {}}
 } 1
-test string-25.9 {string is list} {
+test string-25.9.$noComp {string is list} {
     set x {}
-    list [string is list -failindex x {a b c}] $x
+    list [run {string is list -failindex x {a b c}}] $x
 } {1 {}}
-test string-25.10 {string is list} {
+test string-25.10.$noComp {string is list} {
     set x {}
-    list [string is list -failindex x "a \{b c"] $x
+    list [run {string is list -failindex x "a \{b c"}] $x
 } {0 2}
-test string-25.11 {string is list} {
+test string-25.11.$noComp {string is list} {
     set x {}
-    list [string is list -failindex x {a b {b c}d e}] $x
+    list [run {string is list -failindex x {a b {b c}d e}}] $x
 } {0 4}
-test string-25.12 {string is list} {
+test string-25.12.$noComp {string is list} {
     set x {}
-    list [string is list -failindex x {}] $x
+    list [run {string is list -failindex x {}}] $x
 } {1 {}}
-test string-25.13 {string is list} {
+test string-25.13.$noComp {string is list} {
     set x {}
-    list [string is list -failindex x {  {b c}d e}] $x
+    list [run {string is list -failindex x {  {b c}d e}}] $x
 } {0 2}
-test string-25.14 {string is list} {
+test string-25.14.$noComp {string is list} {
     set x {}
-    list [string is list -failindex x "\uabcd {b c}d e"] $x
+    list [run {string is list -failindex x "\uabcd {b c}d e"}] $x
 } {0 2}
 
-test string-26.1 {tcl::prefix, too few args} -body {
+test string-26.1.$noComp {tcl::prefix, too few args} -body {
     tcl::prefix match a
 } -returnCodes 1 -result {wrong # args: should be "tcl::prefix match ?options? table string"}
-test string-26.2 {tcl::prefix, bad args} -body {
+test string-26.2.$noComp {tcl::prefix, bad args} -body {
     tcl::prefix match a b c
 } -returnCodes 1 -result {bad option "a": must be -error, -exact, or -message}
-test string-26.2.1 {tcl::prefix, empty table} -body {
+test string-26.2.1.$noComp {tcl::prefix, empty table} -body {
     tcl::prefix match {} foo
 } -returnCodes 1 -result {bad option "foo": no valid options}
-test string-26.3 {tcl::prefix, bad args} -body {
+test string-26.3.$noComp {tcl::prefix, bad args} -body {
     tcl::prefix match -error "{}x" -exact str1 str2
 } -returnCodes 1 -result {list element in braces followed by "x" instead of space}
-test string-26.3.1 {tcl::prefix, bad args} -body {
+test string-26.3.1.$noComp {tcl::prefix, bad args} -body {
     tcl::prefix match -error "x" -exact str1 str2
 } -returnCodes 1 -result {error options must have an even number of elements}
-test string-26.3.2 {tcl::prefix, bad args} -body {
+test string-26.3.2.$noComp {tcl::prefix, bad args} -body {
     tcl::prefix match -error str1 str2
 } -returnCodes 1 -result {missing value for -error}
-test string-26.4 {tcl::prefix, bad args} -body {
+test string-26.4.$noComp {tcl::prefix, bad args} -body {
     tcl::prefix match -message str1 str2
 } -returnCodes 1 -result {missing value for -message}
-test string-26.5 {tcl::prefix} {
+test string-26.5.$noComp {tcl::prefix} {
     tcl::prefix match {apa bepa cepa depa} cepa
 } cepa
-test string-26.6 {tcl::prefix} {
+test string-26.6.$noComp {tcl::prefix} {
     tcl::prefix match {apa bepa cepa depa} be
 } bepa
-test string-26.7 {tcl::prefix} -body {
+test string-26.7.$noComp {tcl::prefix} -body {
     tcl::prefix match -exact {apa bepa cepa depa} be
 } -returnCodes 1 -result {bad option "be": must be apa, bepa, cepa, or depa}
-test string-26.8 {tcl::prefix} -body {
+test string-26.8.$noComp {tcl::prefix} -body {
     tcl::prefix match -message wombat {apa bepa bear depa} be
 } -returnCodes 1 -result {ambiguous wombat "be": must be apa, bepa, bear, or depa}
-test string-26.9 {tcl::prefix} -body {
+test string-26.9.$noComp {tcl::prefix} -body {
     tcl::prefix match -error {} {apa bepa bear depa} be
 } -returnCodes 0 -result {}
-test string-26.10 {tcl::prefix} -body {
+test string-26.10.$noComp {tcl::prefix} -body {
     tcl::prefix match -error {-level 1} {apa bepa bear depa} be
 } -returnCodes 2 -result {ambiguous option "be": must be apa, bepa, bear, or depa}
-test string-26.10.1 {tcl::prefix} -setup {
+test string-26.10.1.$noComp {tcl::prefix} -setup {
     proc _testprefix {args} {
         array set opts {-a x -b y -c y}
         foreach {opt val} $args {
@@ -1880,7 +2107,7 @@ proc MemStress {args} {
     return $res
 }
 
-test string-26.11 {tcl::prefix: testing for leaks} -body {
+test string-26.11.$noComp {tcl::prefix: testing for leaks} -body {
     # This test is made to stress object reference management
     MemStress {
         set table {hejj miff gurk}
@@ -1901,7 +2128,7 @@ test string-26.11 {tcl::prefix: testing for leaks} -body {
     }
 } -constraints memory -result {0 0 0}
 
-test string-26.12 {tcl::prefix: testing for leaks} -body {
+test string-26.12.$noComp {tcl::prefix: testing for leaks} -body {
     # This is a memory leak test in a form that might actually happen
     # in real code.  The shared literal "miff" causes a connection
     # between the item and the table.
@@ -1919,7 +2146,7 @@ test string-26.12 {tcl::prefix: testing for leaks} -body {
     }
 } -constraints memory -result 0
 
-test string-26.13 {tcl::prefix: testing for leaks} -body {
+test string-26.13.$noComp {tcl::prefix: testing for leaks} -body {
     # This test is made to stress object reference management
     MemStress {
         set table [list hejj miff]
@@ -1932,147 +2159,155 @@ test string-26.13 {tcl::prefix: testing for leaks} -body {
     }
 } -constraints memory -result {0}
 
-test string-27.1 {tcl::prefix all, too few args} -body {
+test string-27.1.$noComp {tcl::prefix all, too few args} -body {
     tcl::prefix all a
 } -returnCodes 1 -result {wrong # args: should be "tcl::prefix all table string"}
-test string-27.2 {tcl::prefix all, bad args} -body {
+test string-27.2.$noComp {tcl::prefix all, bad args} -body {
     tcl::prefix all a b c
 } -returnCodes 1 -result {wrong # args: should be "tcl::prefix all table string"}
-test string-27.3 {tcl::prefix all, bad args} -body {
+test string-27.3.$noComp {tcl::prefix all, bad args} -body {
     tcl::prefix all "{}x" str2
 } -returnCodes 1 -result {list element in braces followed by "x" instead of space}
-test string-27.4 {tcl::prefix all} {
+test string-27.4.$noComp {tcl::prefix all} {
     tcl::prefix all {apa bepa cepa depa} c
 } cepa
-test string-27.5 {tcl::prefix all} {
+test string-27.5.$noComp {tcl::prefix all} {
     tcl::prefix all {apa bepa cepa depa} cepa
 } cepa
-test string-27.6 {tcl::prefix all} {
+test string-27.6.$noComp {tcl::prefix all} {
     tcl::prefix all {apa bepa cepa depa} cepax
 } {}
-test string-27.7 {tcl::prefix all} {
+test string-27.7.$noComp {tcl::prefix all} {
     tcl::prefix all {apa aska appa} a
 } {apa aska appa}
-test string-27.8 {tcl::prefix all} {
+test string-27.8.$noComp {tcl::prefix all} {
     tcl::prefix all {apa aska appa} ap
 } {apa appa}
-test string-27.9 {tcl::prefix all} {
+test string-27.9.$noComp {tcl::prefix all} {
     tcl::prefix all {apa aska appa} p
 } {}
-test string-27.10 {tcl::prefix all} {
+test string-27.10.$noComp {tcl::prefix all} {
     tcl::prefix all {apa aska appa} {}
 } {apa aska appa}
 
-test string-28.1 {tcl::prefix longest, too few args} -body {
+test string-28.1.$noComp {tcl::prefix longest, too few args} -body {
     tcl::prefix longest a
 } -returnCodes 1 -result {wrong # args: should be "tcl::prefix longest table string"}
-test string-28.2 {tcl::prefix longest, bad args} -body {
+test string-28.2.$noComp {tcl::prefix longest, bad args} -body {
     tcl::prefix longest a b c
 } -returnCodes 1 -result {wrong # args: should be "tcl::prefix longest table string"}
-test string-28.3 {tcl::prefix longest, bad args} -body {
+test string-28.3.$noComp {tcl::prefix longest, bad args} -body {
     tcl::prefix longest "{}x" str2
 } -returnCodes 1 -result {list element in braces followed by "x" instead of space}
-test string-28.4 {tcl::prefix longest} {
+test string-28.4.$noComp {tcl::prefix longest} {
     tcl::prefix longest {apa bepa cepa depa} c
 } cepa
-test string-28.5 {tcl::prefix longest} {
+test string-28.5.$noComp {tcl::prefix longest} {
     tcl::prefix longest {apa bepa cepa depa} cepa
 } cepa
-test string-28.6 {tcl::prefix longest} {
+test string-28.6.$noComp {tcl::prefix longest} {
     tcl::prefix longest {apa bepa cepa depa} cepax
 } {}
-test string-28.7 {tcl::prefix longest} {
+test string-28.7.$noComp {tcl::prefix longest} {
     tcl::prefix longest {apa aska appa} a
 } a
-test string-28.8 {tcl::prefix longest} {
+test string-28.8.$noComp {tcl::prefix longest} {
     tcl::prefix longest {apa aska appa} ap
 } ap
-test string-28.9 {tcl::prefix longest} {
+test string-28.9.$noComp {tcl::prefix longest} {
     tcl::prefix longest {apa bska appa} a
 } ap
-test string-28.10 {tcl::prefix longest} {
+test string-28.10.$noComp {tcl::prefix longest} {
     tcl::prefix longest {apa bska appa} {}
 } {}
-test string-28.11 {tcl::prefix longest} {
+test string-28.11.$noComp {tcl::prefix longest} {
     tcl::prefix longest {{} bska appa} {}
 } {}
-test string-28.12 {tcl::prefix longest} {
+test string-28.12.$noComp {tcl::prefix longest} {
     tcl::prefix longest {apa {} appa} {}
 } {}
-test string-28.13 {tcl::prefix longest} {
+test string-28.13.$noComp {tcl::prefix longest} {
     # Test UTF8 handling
     tcl::prefix longest {ax\x90 bep ax\x91} a
 } ax
 
-test string-29.1 {string cat, no arg} {
-    string cat
+test string-29.1.$noComp {string cat, no arg} {
+    run {string cat}
 } ""
-test string-29.2 {string cat, single arg} {
+test string-29.2.$noComp {string cat, single arg} {
     set x FOO
-    string compare $x [string cat $x]
+    run {string compare $x [run {string cat $x}]}
 } 0
-test string-29.3 {string cat, two args} {
+test string-29.3.$noComp {string cat, two args} {
     set x FOO
-    string compare $x$x [string cat $x $x]
+    run {string compare $x$x [run {string cat $x $x}]}
 } 0
-test string-29.4 {string cat, many args} {
+test string-29.4.$noComp {string cat, many args} {
     set x FOO
     set n 260
-    set xx [string repeat $x $n]
-    set vv [string repeat {$x} $n]
-    set vvs [string repeat {$x } $n]
-    set r1 [string compare $xx [subst $vv]]
-    set r2 [string compare $xx [eval "string cat $vvs"]]
+    set xx [run {string repeat $x $n}]
+    set vv [run {string repeat {$x} $n}]
+    set vvs [run {string repeat {$x } $n}]
+    set r1 [run {string compare $xx [subst $vv]}]
+    set r2 [run {string compare $xx [eval "run {string cat $vvs}"]}]
     list $r1 $r2
 } {0 0}
-test string-29.5 {string cat, efficiency} -body {
-    tcl::unsupported::representation [string cat [list x] [list]]
+if {$noComp} {
+test string-29.5.$noComp {string cat, efficiency} -body {
+    tcl::unsupported::representation [run {string cat [list x] [list]}]
 } -match glob -result {*no string representation}
-test string-29.6 {string cat, efficiency} -body {
-    tcl::unsupported::representation [string cat [list] [list x]]
+test string-29.6.$noComp {string cat, efficiency} -body {
+    tcl::unsupported::representation [run {string cat [list] [list x]}]
 } -match glob -result {*no string representation}
-test string-29.7 {string cat, efficiency} -body {
-    tcl::unsupported::representation [string cat [list x] [list] [list]]
+test string-29.7.$noComp {string cat, efficiency} -body {
+    tcl::unsupported::representation [run {string cat [list x] [list] [list]}]
 } -match glob -result {*no string representation}
-test string-29.8 {string cat, efficiency} -body {
-    tcl::unsupported::representation [string cat [list] [list x] [list]]
+test string-29.8.$noComp {string cat, efficiency} -body {
+    tcl::unsupported::representation [run {string cat [list] [list x] [list]}]
 } -match glob -result {*no string representation}
-test string-29.9 {string cat, efficiency} -body {
-    tcl::unsupported::representation [string cat [list] [list] [list x]]
+test string-29.9.$noComp {string cat, efficiency} -body {
+    tcl::unsupported::representation [run {string cat [list] [list] [list x]}]
 } -match glob -result {*no string representation}
-test string-29.10 {string cat, efficiency} -body {
-    tcl::unsupported::representation [string cat [list x] [list x]]
+test string-29.10.$noComp {string cat, efficiency} -body {
+    tcl::unsupported::representation [run {string cat [list x] [list x]}]
 } -match glob -result {*, string representation "xx"}
-test string-29.11 {string cat, efficiency} -body {
+test string-29.11.$noComp {string cat, efficiency} -body {
     tcl::unsupported::representation \
-	[string cat [list x] [encoding convertto utf-8 {}]]
+	[run {string cat [list x] [encoding convertto utf-8 {}]}]
 } -match glob -result {*no string representation}
-test string-29.12 {string cat, efficiency} -body {
+test string-29.12.$noComp {string cat, efficiency} -body {
     tcl::unsupported::representation \
-	[string cat [encoding convertto utf-8 {}] [list x]]
+	[run {string cat [encoding convertto utf-8 {}] [list x]}]
 } -match glob -result {*, string representation "x"}
-test string-29.13 {string cat, efficiency} -body {
-    tcl::unsupported::representation [string cat \
-	[encoding convertto utf-8 {}] [encoding convertto utf-8 {}] [list x]]
+test string-29.13.$noComp {string cat, efficiency} -body {
+    tcl::unsupported::representation [run {string cat \
+	[encoding convertto utf-8 {}] [encoding convertto utf-8 {}] [list x]}]
 } -match glob -result {*, string representation "x"}
-test string-29.14 {string cat, efficiency} -setup {
+test string-29.14.$noComp {string cat, efficiency} -setup {
     set e [encoding convertto utf-8 {}]
 } -cleanup {
     unset e
 } -body {
-    tcl::unsupported::representation [string cat $e $e [list x]]
+    tcl::unsupported::representation [run {string cat $e $e [list x]}]
 } -match glob -result {*no string representation}
-test string-29.15 {string cat, efficiency} -setup {
+test string-29.15.$noComp {string cat, efficiency} -setup {
     set e [encoding convertto utf-8 {}]
     set f [encoding convertto utf-8 {}]
 } -cleanup {
     unset e f
 } -body {
-    tcl::unsupported::representation [string cat $e $f $e $f [list x]]
+    tcl::unsupported::representation [run {string cat $e $f $e $f [list x]}]
 } -match glob -result {*no string representation}
-
+}
+
+}
+
 # cleanup
 rename MemStress {}
+rename makeByteArray {}
+rename makeUnicode {}
+rename makeList {}
+rename makeShared {}
 catch {rename foo {}}
 ::tcltest::cleanupTests
 return
diff --git a/tests/stringComp.test b/tests/stringComp.test
deleted file mode 100644
index 2aeb08e..0000000
--- a/tests/stringComp.test
+++ /dev/null
@@ -1,801 +0,0 @@
-# Commands covered:  string
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# This differs from the original string tests in that the tests call
-# things in procs, which uses the compiled string code instead of
-# the runtime parse string code.  The tests of import should match
-# their equivalent number in string.test.
-#
-# Copyright (c) 2001 by ActiveState Corporation.
-# Copyright (c) 2001 by Kevin B. Kenny.  All rights reserved.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    package require tcltest
-    namespace import -force ::tcltest::*
-}
-
-::tcltest::loadTestedCommands
-catch [list package require -exact Tcltest [info patchlevel]]
-
-# Some tests require the testobj command
-
-testConstraint testobj [expr {[info commands testobj] != {}}]
-testConstraint memory [llength [info commands memory]]
-if {[testConstraint memory]} {
-    proc getbytes {} {
-	set lines [split [memory info] \n]
-	return [lindex $lines 3 3]
-    }
-    proc leaktest {script {iterations 3}} {
-	set end [getbytes]
-	for {set i 0} {$i < $iterations} {incr i} {
-	    uplevel 1 $script
-	    set tmp $end
-	    set end [getbytes]
-	}
-	return [expr {$end - $tmp}]
-    }
-}
-
-test stringComp-1.1 {error conditions} {
-    proc foo {} {string gorp a b}
-    list [catch {foo} msg] $msg
-} {1 {unknown or ambiguous subcommand "gorp": must be bytelength, cat, compare, equal, first, index, is, last, length, map, match, range, repeat, replace, reverse, tolower, totitle, toupper, trim, trimleft, trimright, wordend, or wordstart}}
-test stringComp-1.2 {error conditions} {
-    proc foo {} {string}
-    list [catch {foo} msg] $msg
-} {1 {wrong # args: should be "string subcommand ?arg ...?"}}
-test stringComp-1.3 {error condition - undefined method during compile} {
-    # We don't want this to complain about 'never' because it may never
-    # be called, or string may get redefined.  This must compile OK.
-    proc foo {str i} {
-        if {"yes" == "no"} { string never called but complains here }
-        string index $str $i
-    }
-    foo abc 0
-} a
-
-## Test string compare|equal over equal constraints
-## Use result for string compare, and negate it for string equal
-## The body will be tested both in and outside a proc
-set i 0
-foreach {tname tbody tresult tcode} {
-    {too few args} {
-	string compare a
-    } {wrong # args: should be "string compare ?-nocase? ?-length int? string1 string2"} {error}
-    {bad args} {
-	string compare a b c
-    } {bad option "a": must be -nocase or -length} {error}
-    {bad args} {
-	string compare -length -nocase str1 str2
-    } {expected integer but got "-nocase"} {error}
-    {too many args} {
-	string compare -length 10 -nocase str1 str2 str3
-    } {wrong # args: should be "string compare ?-nocase? ?-length int? string1 string2"} {error}
-    {compare with length unspecified} {
-	string compare -length 10 10
-    } {wrong # args: should be "string compare ?-nocase? ?-length int? string1 string2"} {error}
-    {basic operation fail} {
-	string compare abcde abdef
-    } {-1} {}
-    {basic operation success} {
-	string compare abcde abcde
-    } {0} {}
-    {with length} {
-	string compare -length 2 abcde abxyz
-    } {0} {}
-    {with special index} {
-	string compare -length end-3 abcde abxyz
-    } {expected integer but got "end-3"} {error}
-    {unicode} {
-	string compare ab\u7266 ab\u7267
-    } {-1} {}
-    {unicode} {string compare \334 \u00dc} 0 {}
-    {unicode} {string compare \334 \u00fc} -1 {}
-    {unicode} {string compare \334\334\334\374\374 \334\334\334\334\334} 1 {}
-    {high bit} {
-	# This test will fail if the underlying comparaison
-	# is using signed chars instead of unsigned chars.
-	# (like SunOS's default memcmp thus the compat/memcmp.c)
-	string compare "\x80" "@"
-	# Nb this tests works also in utf8 space because \x80 is
-	# translated into a 2 or more bytelength but whose first byte has
-	# the high bit set.
-    } {1} {}
-    {-nocase 1} {string compare -nocase abcde abdef} {-1} {}
-    {-nocase 2} {string compare -nocase abcde Abdef} {-1} {}
-    {-nocase 3} {string compare -nocase abcde ABCDE} {0} {}
-    {-nocase 4} {string compare -nocase abcde abcde} {0} {}
-    {-nocase unicode} {
-	string compare -nocase \334 \u00dc
-    } 0 {}
-    {-nocase unicode} {
-	string compare -nocase \334\334\334\374\u00fc \334\334\334\334\334
-    } 0 {}
-    {-nocase with length} {
-	string compare -length 2 -nocase abcde Abxyz
-    } {0} {}
-    {-nocase with length} {
-	string compare -nocase -length 3 abcde Abxyz
-    } {-1} {}
-    {-nocase with length <= 0} {
-	string compare -nocase -length -1 abcde AbCdEf
-    } {-1} {}
-    {-nocase with excessive length} {
-	string compare -nocase -length 50 AbCdEf abcde
-    } {1} {}
-    {-len unicode} {
-	# These are strings that are 6 BYTELENGTH long, but the length
-	# shouldn't make a different because there are actually 3 CHARS long
-	string compare -len 5 \334\334\334 \334\334\374
-    } -1 {}
-    {-nocase with special index} {
-	string compare -nocase -length end-3 Abcde abxyz
-    } {expected integer but got "end-3"} error
-    {null strings} {
-	string compare "" ""
-    } 0 {}
-    {null strings} {
-	string compare "" foo
-    } -1 {}
-    {null strings} {
-	string compare foo ""
-    } 1 {}
-    {-nocase null strings} {
-	string compare -nocase "" ""
-    } 0 {}
-    {-nocase null strings} {
-	string compare -nocase "" foo
-    } -1 {}
-    {-nocase null strings} {
-	string compare -nocase foo ""
-    } 1 {}
-    {with length, unequal strings} {
-	string compare -length 2 abc abde
-    } 0 {}
-    {with length, unequal strings} {
-	string compare -length 2 ab abde
-    } 0 {}
-    {with NUL character vs. other ASCII} {
-	# Be careful here, since UTF-8 rep comparison with memcmp() of
-	# these puts chars in the wrong order
-	string compare \x00 \x01
-    } -1 {}
-    {high bit} {
-	string compare "a\x80" "a@"
-    } 1 {}
-    {high bit} {
-	string compare "a\x00" "a\x01"
-    } -1 {}
-    {high bit} {
-	string compare "\x00\x00" "\x00\x01"
-    } -1 {}
-    {binary equal} {
-	string compare [binary format a100 0] [binary format a100 0]
-    } 0 {}
-    {binary neq} {
-	string compare [binary format a100a 0 1] [binary format a100a 0 0]
-    } 1 {}
-    {binary neq inequal length} {
-	string compare [binary format a20a 0 1] [binary format a100a 0 0]
-    } 1 {}
-} {
-    if {$tname eq ""} { continue }
-    if {$tcode eq ""} { set tcode ok }
-    test stringComp-2.[incr i] "string compare, $tname" \
-	-body [list eval $tbody] \
-	-returnCodes $tcode -result $tresult
-    test stringComp-2.[incr i] "string compare bc, $tname" \
-	-body "[list proc foo {} $tbody];foo" \
-	-returnCodes $tcode -result $tresult
-    if {"error" ni $tcode} {
-	set tresult [expr {!$tresult}]
-    } else {
-	set tresult [string map {compare equal} $tresult]
-    }
-    set tbody [string map {compare equal} $tbody]
-    test stringComp-2.[incr i] "string equal, $tname" \
-	-body [list eval $tbody] \
-	-returnCodes $tcode -result $tresult
-    test stringComp-2.[incr i] "string equal bc, $tname" \
-	-body "[list proc foo {} $tbody];foo" \
-	-returnCodes $tcode -result $tresult
-}
-
-# need a few extra tests short abbr cmd
-test stringComp-3.1 {string compare, shortest method name} {
-    proc foo {} {string co abcde ABCDE}
-    foo
-} 1
-test stringComp-3.2 {string equal, shortest method name} {
-    proc foo {} {string e abcde ABCDE}
-    foo
-} 0
-test stringComp-3.3 {string equal -nocase} {
-    proc foo {} {string eq -nocase abcde ABCDE}
-    foo
-} 1
-
-test stringComp-4.1 {string first, too few args} {
-    proc foo {} {string first a}
-    list [catch {foo} msg] $msg
-} {1 {wrong # args: should be "string first needleString haystackString ?startIndex?"}}
-test stringComp-4.2 {string first, bad args} {
-    proc foo {} {string first a b c}
-    list [catch {foo} msg] $msg
-} {1 {bad index "c": must be integer?[+-]integer? or end?[+-]integer?}}
-test stringComp-4.3 {string first, too many args} {
-    proc foo {} {string first a b 5 d}
-    list [catch {foo} msg] $msg
-} {1 {wrong # args: should be "string first needleString haystackString ?startIndex?"}}
-test stringComp-4.4 {string first} {
-    proc foo {} {string first bq abcdefgbcefgbqrs}
-    foo
-} 12
-test stringComp-4.5 {string first} {
-    proc foo {} {string fir bcd abcdefgbcefgbqrs}
-    foo
-} 1
-test stringComp-4.6 {string first} {
-    proc foo {} {string f b abcdefgbcefgbqrs}
-    foo
-} 1
-test stringComp-4.7 {string first} {
-    proc foo {} {string first xxx x123xx345xxx789xxx012}
-    foo
-} 9
-test stringComp-4.8 {string first} {
-    proc foo {} {string first "" x123xx345xxx789xxx012}
-    foo
-} -1
-test stringComp-4.9 {string first, unicode} {
-    proc foo {} {string first x abc\u7266x}
-    foo
-} 4
-test stringComp-4.10 {string first, unicode} {
-    proc foo {} {string first \u7266 abc\u7266x}
-    foo
-} 3
-test stringComp-4.11 {string first, start index} {
-    proc foo {} {string first \u7266 abc\u7266x 3}
-    foo
-} 3
-test stringComp-4.12 {string first, start index} {
-    proc foo {} {string first \u7266 abc\u7266x 4}
-    foo
-} -1
-test stringComp-4.13 {string first, start index} {
-    proc foo {} {string first \u7266 abc\u7266x end-2}
-    foo
-} 3
-test stringComp-4.14 {string first, negative start index} {
-    proc foo {} {string first b abc -1}
-    foo
-} 1
-
-test stringComp-5.1 {string index} {
-    proc foo {} {string index}
-    list [catch {foo} msg] $msg
-} {1 {wrong # args: should be "string index string charIndex"}}
-test stringComp-5.2 {string index} {
-    proc foo {} {string index a b c}
-    list [catch {foo} msg] $msg
-} {1 {wrong # args: should be "string index string charIndex"}}
-test stringComp-5.3 {string index} {
-    proc foo {} {string index abcde 0}
-    foo
-} a
-test stringComp-5.4 {string index} {
-    proc foo {} {string in abcde 4}
-    foo
-} e
-test stringComp-5.5 {string index} {
-    proc foo {} {string index abcde 5}
-    foo
-} {}
-test stringComp-5.6 {string index} {
-    proc foo {} {string index abcde -10}
-    list [catch {foo} msg] $msg
-} {0 {}}
-test stringComp-5.7 {string index} {
-    proc foo {} {string index a xyz}
-    list [catch {foo} msg] $msg
-} {1 {bad index "xyz": must be integer?[+-]integer? or end?[+-]integer?}}
-test stringComp-5.8 {string index} {
-    proc foo {} {string index abc end}
-    foo
-} c
-test stringComp-5.9 {string index} {
-    proc foo {} {string index abc end-1}
-    foo
-} b
-test stringComp-5.10 {string index, unicode} {
-    proc foo {} {string index abc\u7266d 4}
-    foo
-} d
-test stringComp-5.11 {string index, unicode} {
-    proc foo {} {string index abc\u7266d 3}
-    foo
-} \u7266
-test stringComp-5.12 {string index, unicode over char length, under byte length} {
-    proc foo {} {string index \334\374\334\374 6}
-    foo
-} {}
-test stringComp-5.13 {string index, bytearray object} {
-    proc foo {} {string index [binary format a5 fuz] 0}
-    foo
-} f
-test stringComp-5.14 {string index, bytearray object} {
-    proc foo {} {string index [binary format I* {0x50515253 0x52}] 3}
-    foo
-} S
-test stringComp-5.15 {string index, bytearray object} {
-    proc foo {} {
-	set b [binary format I* {0x50515253 0x52}]
-	set i1 [string index $b end-6]
-	set i2 [string index $b 1]
-	string compare $i1 $i2
-    }
-    foo
-} 0
-test stringComp-5.16 {string index, bytearray object with string obj shimmering} {
-    proc foo {} {
-	set str "0123456789\x00 abcdedfghi"
-	binary scan $str H* dump
-	string compare [string index $str 10] \x00
-    }
-    foo
-} 0
-test stringComp-5.17 {string index, bad integer} -body {
-    proc foo {} {string index "abc" 0o8}
-    list [catch {foo} msg] $msg
-} -match glob -result {1 {*invalid octal number*}}
-test stringComp-5.18 {string index, bad integer} -body {
-    proc foo {} {string index "abc" end-0o0289}
-    list [catch {foo} msg] $msg
-} -match glob -result {1 {*invalid octal number*}}
-test stringComp-5.19 {string index, bytearray object out of bounds} {
-    proc foo {} {string index [binary format I* {0x50515253 0x52}] -1}
-    foo
-} {}
-test stringComp-5.20 {string index, bytearray object out of bounds} {
-    proc foo {} {string index [binary format I* {0x50515253 0x52}] 20}
-    foo
-} {}
-
-
-proc largest_int {} {
-    # This will give us what the largest valid int on this machine is,
-    # so we can test for overflow properly below on >32 bit systems
-    set int 1
-    set exp 7; # assume we get at least 8 bits
-    while {$int > 0} { set int [expr {1 << [incr exp]}] }
-    return [expr {$int-1}]
-}
-
-## string is
-## not yet bc
-
-catch {rename largest_int {}}
-
-## string last
-## not yet bc
-
-## string length
-## not yet bc
-test stringComp-8.1 {string bytelength} {
-    proc foo {} {string bytelength}
-    list [catch {foo} msg] $msg
-} {1 {wrong # args: should be "string bytelength string"}}
-test stringComp-8.2 {string bytelength} {
-    proc foo {} {string bytelength a b}
-    list [catch {foo} msg] $msg
-} {1 {wrong # args: should be "string bytelength string"}}
-test stringComp-8.3 {string bytelength} {
-    proc foo {} {string bytelength "\u00c7"}
-    foo
-} 2
-test stringComp-8.4 {string bytelength} {
-    proc foo {} {string b ""}
-    foo
-} 0
-
-## string length
-##
-test stringComp-9.1 {string length} {
-    proc foo {} {string length}
-    list [catch {foo} msg] $msg
-} {1 {wrong # args: should be "string length string"}}
-test stringComp-9.2 {string length} {
-    proc foo {} {string length a b}
-    list [catch {foo} msg] $msg
-} {1 {wrong # args: should be "string length string"}}
-test stringComp-9.3 {string length} {
-    proc foo {} {string length "a little string"}
-    foo
-} 15
-test stringComp-9.4 {string length} {
-    proc foo {} {string le ""}
-    foo
-} 0
-test stringComp-9.5 {string length, unicode} {
-    proc foo {} {string le "abcd\u7266"}
-    foo
-} 5
-test stringComp-9.6 {string length, bytearray object} {
-    proc foo {} {string length [binary format a5 foo]}
-    foo
-} 5
-test stringComp-9.7 {string length, bytearray object} {
-    proc foo {} {string length [binary format I* {0x50515253 0x52}]}
-    foo
-} 8
-
-## string map
-## not yet bc
-
-## string match
-##
-test stringComp-11.1 {string match, too few args} {
-    proc foo {} {string match a}
-    list [catch {foo} msg] $msg
-} {1 {wrong # args: should be "string match ?-nocase? pattern string"}}
-test stringComp-11.2 {string match, too many args} {
-    proc foo {} {string match a b c d}
-    list [catch {foo} msg] $msg
-} {1 {wrong # args: should be "string match ?-nocase? pattern string"}}
-test stringComp-11.3 {string match} {
-    proc foo {} {string match abc abc}
-    foo
-} 1
-test stringComp-11.4 {string match} {
-    proc foo {} {string mat abc abd}
-    foo
-} 0
-test stringComp-11.5 {string match} {
-    proc foo {} {string match ab*c abc}
-    foo
-} 1
-test stringComp-11.6 {string match} {
-    proc foo {} {string match ab**c abc}
-    foo
-} 1
-test stringComp-11.7 {string match} {
-    proc foo {} {string match ab* abcdef}
-    foo
-} 1
-test stringComp-11.8 {string match} {
-    proc foo {} {string match *c abc}
-    foo
-} 1
-test stringComp-11.9 {string match} {
-    proc foo {} {string match *3*6*9 0123456789}
-    foo
-} 1
-test stringComp-11.10 {string match} {
-    proc foo {} {string match *3*6*9 01234567890}
-    foo
-} 0
-test stringComp-11.11 {string match} {
-    proc foo {} {string match a?c abc}
-    foo
-} 1
-test stringComp-11.12 {string match} {
-    proc foo {} {string match a??c abc}
-    foo
-} 0
-test stringComp-11.13 {string match} {
-    proc foo {} {string match ?1??4???8? 0123456789}
-    foo
-} 1
-test stringComp-11.14 {string match} {
-    proc foo {} {string match {[abc]bc} abc}
-    foo
-} 1
-test stringComp-11.15 {string match} {
-    proc foo {} {string match {a[abc]c} abc}
-    foo
-} 1
-test stringComp-11.16 {string match} {
-    proc foo {} {string match {a[xyz]c} abc}
-    foo
-} 0
-test stringComp-11.17 {string match} {
-    proc foo {} {string match {12[2-7]45} 12345}
-    foo
-} 1
-test stringComp-11.18 {string match} {
-    proc foo {} {string match {12[ab2-4cd]45} 12345}
-    foo
-} 1
-test stringComp-11.19 {string match} {
-    proc foo {} {string match {12[ab2-4cd]45} 12b45}
-    foo
-} 1
-test stringComp-11.20 {string match} {
-    proc foo {} {string match {12[ab2-4cd]45} 12d45}
-    foo
-} 1
-test stringComp-11.21 {string match} {
-    proc foo {} {string match {12[ab2-4cd]45} 12145}
-    foo
-} 0
-test stringComp-11.22 {string match} {
-    proc foo {} {string match {12[ab2-4cd]45} 12545}
-    foo
-} 0
-test stringComp-11.23 {string match} {
-    proc foo {} {string match {a\*b} a*b}
-    foo
-} 1
-test stringComp-11.24 {string match} {
-    proc foo {} {string match {a\*b} ab}
-    foo
-} 0
-test stringComp-11.25 {string match} {
-    proc foo {} {string match {a\*\?\[\]\\\x} "a*?\[\]\\x"}
-    foo
-} 1
-test stringComp-11.26 {string match} {
-    proc foo {} {string match ** ""}
-    foo
-} 1
-test stringComp-11.27 {string match} {
-    proc foo {} {string match *. ""}
-    foo
-} 0
-test stringComp-11.28 {string match} {
-    proc foo {} {string match "" ""}
-    foo
-} 1
-test stringComp-11.29 {string match} {
-    proc foo {} {string match \[a a}
-    foo
-} 1
-test stringComp-11.30 {string match, bad args} {
-    proc foo {} {string match - b c}
-    list [catch {foo} msg] $msg
-} {1 {bad option "-": must be -nocase}}
-test stringComp-11.31 {string match case} {
-    proc foo {} {string match a A}
-    foo
-} 0
-test stringComp-11.32 {string match nocase} {
-    proc foo {} {string match -n a A}
-    foo
-} 1
-test stringComp-11.33 {string match nocase} {
-    proc foo {} {string match -nocase a\334 A\374}
-    foo
-} 1
-test stringComp-11.34 {string match nocase} {
-    proc foo {} {string match -nocase a*f ABCDEf}
-    foo
-} 1
-test stringComp-11.35 {string match case, false hope} {
-    # This is true because '_' lies between the A-Z and a-z ranges
-    proc foo {} {string match {[A-z]} _}
-    foo
-} 1
-test stringComp-11.36 {string match nocase range} {
-    # This is false because although '_' lies between the A-Z and a-z ranges,
-    # we lower case the end points before checking the ranges.
-    proc foo {} {string match -nocase {[A-z]} _}
-    foo
-} 0
-test stringComp-11.37 {string match nocase} {
-    proc foo {} {string match -nocase {[A-fh-Z]} g}
-    foo
-} 0
-test stringComp-11.38 {string match case, reverse range} {
-    proc foo {} {string match {[A-fh-Z]} g}
-    foo
-} 1
-test stringComp-11.39 {string match, *\ case} {
-    proc foo {} {string match {*\abc} abc}
-    foo
-} 1
-test stringComp-11.40 {string match, *special case} {
-    proc foo {} {string match {*[ab]} abc}
-    foo
-} 0
-test stringComp-11.41 {string match, *special case} {
-    proc foo {} {string match {*[ab]*} abc}
-    foo
-} 1
-test stringComp-11.42 {string match, *special case} {
-    proc foo {} {string match "*\\" "\\"}
-    foo
-} 0
-test stringComp-11.43 {string match, *special case} {
-    proc foo {} {string match "*\\\\" "\\"}
-    foo
-} 1
-test stringComp-11.44 {string match, *special case} {
-    proc foo {} {string match "*???" "12345"}
-    foo
-} 1
-test stringComp-11.45 {string match, *special case} {
-    proc foo {} {string match "*???" "12"}
-    foo
-} 0
-test stringComp-11.46 {string match, *special case} {
-    proc foo {} {string match "*\\*" "abc*"}
-    foo
-} 1
-test stringComp-11.47 {string match, *special case} {
-    proc foo {} {string match "*\\*" "*"}
-    foo
-} 1
-test stringComp-11.48 {string match, *special case} {
-    proc foo {} {string match "*\\*" "*abc"}
-    foo
-} 0
-test stringComp-11.49 {string match, *special case} {
-    proc foo {} {string match "?\\*" "a*"}
-    foo
-} 1
-test stringComp-11.50 {string match, *special case} {
-    proc foo {} {string match "\\" "\\"}
-    foo
-} 0
-test stringComp-11.51 {string match; *, -nocase and UTF-8} {
-    proc foo {} {string match -nocase [binary format I 717316707] \
-	    [binary format I 2028036707]}
-    foo
-} 1
-test stringComp-11.52 {string match, null char in string} {
-    proc foo {} {
-	set ptn "*abc*"
-	foreach elem [list "\u0000@abc" "@abc" "\u0000@abc\u0000" "blahabcblah"] {
-	    lappend out [string match $ptn $elem]
-	}
-	set out
-    }
-    foo
-} {1 1 1 1}
-test stringComp-11.53 {string match, null char in pattern} {
-    proc foo {} {
-	set out ""
-	foreach {ptn elem} [list \
-		"*\u0000abc\u0000"  "\u0000abc\u0000" \
-		"*\u0000abc\u0000"  "\u0000abc\u0000ef" \
-		"*\u0000abc\u0000*" "\u0000abc\u0000ef" \
-		"*\u0000abc\u0000"  "@\u0000abc\u0000ef" \
-		"*\u0000abc\u0000*"  "@\u0000abc\u0000ef" \
-		] {
-	    lappend out [string match $ptn $elem]
-	}
-	set out
-    }
-    foo
-} {1 0 1 0 1}
-test stringComp-11.54 {string match, failure} {
-    proc foo {} {
-	set longString ""
-	for {set i 0} {$i < 10} {incr i} {
-	    append longString "abcdefghijklmnopqrstuvwxy\u0000z01234567890123"
-	}
-	list [string match *cba* $longString] \
-		[string match *a*l*\u0000* $longString] \
-		[string match *a*l*\u0000*123 $longString] \
-		[string match *a*l*\u0000*123* $longString] \
-		[string match *a*l*\u0000*cba* $longString] \
-		[string match *===* $longString]
-    }
-    foo
-} {0 1 1 1 0 0}
-
-## string range
-test stringComp-12.1 {Bug 3588366: end-offsets before start} {
-    apply {s {
-	string range $s 0 end-5
-    }} 12345
-} {}
-
-## string repeat
-## not yet bc
-
-## string replace
-test stringComp-14.1 {Bug 82e7f67325} {
-    apply {x {
-	set a [join $x {}]
-	lappend b [string length [string replace ___! 0 2 $a]]
-	lappend b [string length [string replace ___! 0 2 $a[unset a]]]
-    }} {a b}
-} {3 3}
-test stringComp-14.2 {Bug 82e7f67325} memory {
-    # As in stringComp-14.1, but make sure we don't retain too many refs
-    leaktest {
-	apply {x {
-	    set a [join $x {}]
-	    lappend b [string length [string replace ___! 0 2 $a]]
-	    lappend b [string length [string replace ___! 0 2 $a[unset a]]]
-	}} {a b}
-    }
-} {0}
-test stringComp-14.3 {Bug 0dca3bfa8f} {
-    apply {arg {
-	set argCopy $arg
-	set arg [string replace $arg 1 2 aa]
-	# Crashes in comparison before fix
-	expr {$arg ne $argCopy}
-    }} abcde
-} 1
-test stringComp-14.4 {Bug 1af8de570511} {
-    apply {{x y} {
-	# Generate an unshared string value
-	set val ""
-	for { set i 0 } { $i < $x } { incr i } {
-	    set val [format "0%s" $val]
-	}
-	string replace $val[unset val] 1 1 $y
-    }} 4 x
-} 0x00
-test stringComp-14.5 {} {
-    string length [string replace [string repeat a\u00fe 2] 3 end {}]
-} 3
-
-## string tolower
-## not yet bc
-
-## string toupper
-## not yet bc
-
-## string totitle
-## not yet bc
-
-## string trim*
-## not yet bc
-
-## string word*
-## not yet bc
-
-## string cat
-test stringComp-29.1 {string cat, no arg} {
-    proc foo {} {string cat}
-    foo
-} ""
-test stringComp-29.2 {string cat, single arg} {
-    proc foo {} {
-	set x FOO
-	string compare $x [string cat $x]
-    }
-    foo
-} 0
-test stringComp-29.3 {string cat, two args} {
-    proc foo {} {
-	set x FOO
-	string compare $x$x [string cat $x $x]
-    }
-    foo
-} 0
-test stringComp-29.4 {string cat, many args} {
-    proc foo {} {
-	set x FOO
-	set n 260
-	set xx [string repeat $x $n]
-	set vv [string repeat {$x} $n]
-	set vvs [string repeat {$x } $n]
-	set r1 [string compare $xx [subst $vv]]
-	set r2 [string compare $xx [eval "string cat $vvs"]]
-	list $r1 $r2
-    }
-    foo
-} {0 0}
-
-
-# cleanup
-catch {rename foo {}}
-::tcltest::cleanupTests
-return
-
-# Local Variables:
-# mode: tcl
-# End:
-- 
cgit v0.12


From 05c789647adebac2a77a4910a46810e94cad3efe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Ignacio=20Mar=C3=ADn?= <jima00@gmail.com>
Date: Sat, 24 Mar 2018 10:20:43 +0000
Subject: Update TZ info to tzdata2018d.

---
 library/tzdata/Africa/Accra                   |  94 ++---
 library/tzdata/Africa/Bissau                  |   2 +-
 library/tzdata/Africa/Sao_Tome                |   2 +-
 library/tzdata/America/Araguaina              |  50 +--
 library/tzdata/America/Argentina/Buenos_Aires |  58 +--
 library/tzdata/America/Argentina/Catamarca    |  56 +--
 library/tzdata/America/Argentina/Cordoba      |  58 +--
 library/tzdata/America/Argentina/Jujuy        |  52 +--
 library/tzdata/America/Argentina/La_Rioja     |  56 +--
 library/tzdata/America/Argentina/Mendoza      |  52 +--
 library/tzdata/America/Argentina/Rio_Gallegos |  56 +--
 library/tzdata/America/Argentina/Salta        |  56 +--
 library/tzdata/America/Argentina/San_Juan     |  56 +--
 library/tzdata/America/Argentina/San_Luis     |  50 +--
 library/tzdata/America/Argentina/Tucuman      |  58 +--
 library/tzdata/America/Argentina/Ushuaia      |  56 +--
 library/tzdata/America/Asuncion               | 250 ++++++-------
 library/tzdata/America/Bahia                  |  60 +--
 library/tzdata/America/Belem                  |  28 +-
 library/tzdata/America/Boa_Vista              |  32 +-
 library/tzdata/America/Bogota                 |   2 +-
 library/tzdata/America/Campo_Grande           | 252 ++++++-------
 library/tzdata/America/Cuiaba                 | 250 ++++++-------
 library/tzdata/America/Eirunepe               |  30 +-
 library/tzdata/America/Fortaleza              |  38 +-
 library/tzdata/America/Grand_Turk             |   4 +-
 library/tzdata/America/Guayaquil              |   2 +-
 library/tzdata/America/Jamaica                |   6 +-
 library/tzdata/America/Lima                   |   6 +-
 library/tzdata/America/Maceio                 |  40 +-
 library/tzdata/America/Manaus                 |  30 +-
 library/tzdata/America/Montevideo             | 126 +++----
 library/tzdata/America/Noronha                |  38 +-
 library/tzdata/America/Porto_Velho            |  28 +-
 library/tzdata/America/Punta_Arenas           | 106 +++---
 library/tzdata/America/Recife                 |  38 +-
 library/tzdata/America/Rio_Branco             |  28 +-
 library/tzdata/America/Santarem               |  28 +-
 library/tzdata/America/Santiago               | 272 +++++++-------
 library/tzdata/America/Sao_Paulo              | 250 ++++++-------
 library/tzdata/Antarctica/Casey               |   1 +
 library/tzdata/Antarctica/Palmer              |  78 ++--
 library/tzdata/Asia/Almaty                    |  48 +--
 library/tzdata/Asia/Aqtau                     |  48 +--
 library/tzdata/Asia/Aqtobe                    |  46 +--
 library/tzdata/Asia/Ashgabat                  |  22 +-
 library/tzdata/Asia/Atyrau                    |  46 +--
 library/tzdata/Asia/Baghdad                   | 104 +++---
 library/tzdata/Asia/Baku                      |  62 ++--
 library/tzdata/Asia/Bishkek                   |  50 +--
 library/tzdata/Asia/Choibalsan                |  48 +--
 library/tzdata/Asia/Dhaka                     |   2 +-
 library/tzdata/Asia/Dushanbe                  |  20 +-
 library/tzdata/Asia/Gaza                      |  72 ++--
 library/tzdata/Asia/Hebron                    |  72 ++--
 library/tzdata/Asia/Hovd                      |  48 +--
 library/tzdata/Asia/Kuching                   |  14 +-
 library/tzdata/Asia/Macau                     |   2 +-
 library/tzdata/Asia/Manila                    |   6 +-
 library/tzdata/Asia/Oral                      |  46 +--
 library/tzdata/Asia/Qyzylorda                 |  46 +--
 library/tzdata/Asia/Samarkand                 |  20 +-
 library/tzdata/Asia/Tashkent                  |  22 +-
 library/tzdata/Asia/Tbilisi                   |  50 +--
 library/tzdata/Asia/Tehran                    | 444 +++++++++++------------
 library/tzdata/Asia/Ulaanbaatar               |  48 +--
 library/tzdata/Asia/Yerevan                   |  60 +--
 library/tzdata/Atlantic/Azores                |   2 +-
 library/tzdata/Atlantic/Cape_Verde            |   2 +-
 library/tzdata/Atlantic/Madeira               |   2 +-
 library/tzdata/Atlantic/Reykjavik             |  66 ++--
 library/tzdata/Atlantic/Stanley               |  66 ++--
 library/tzdata/Australia/Lord_Howe            | 478 ++++++++++++------------
 library/tzdata/Europe/Lisbon                  |   2 +-
 library/tzdata/Indian/Mauritius               |   4 +-
 library/tzdata/Pacific/Apia                   | 362 +++++++++---------
 library/tzdata/Pacific/Chatham                | 504 +++++++++++++-------------
 library/tzdata/Pacific/Easter                 | 262 ++++++-------
 library/tzdata/Pacific/Efate                  |  20 +-
 library/tzdata/Pacific/Enderbury              |   2 +-
 library/tzdata/Pacific/Fiji                   | 186 +++++-----
 library/tzdata/Pacific/Galapagos              |   2 +-
 library/tzdata/Pacific/Kiritimati             |   2 +-
 library/tzdata/Pacific/Noumea                 |   6 +-
 library/tzdata/Pacific/Rarotonga              |  26 +-
 library/tzdata/Pacific/Tongatapu              |   8 +-
 86 files changed, 3142 insertions(+), 3141 deletions(-)

diff --git a/library/tzdata/Africa/Accra b/library/tzdata/Africa/Accra
index 18f4522..f43f751 100644
--- a/library/tzdata/Africa/Accra
+++ b/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}
 }
diff --git a/library/tzdata/Africa/Bissau b/library/tzdata/Africa/Bissau
index 88d9d03..e0568fb 100644
--- a/library/tzdata/Africa/Bissau
+++ b/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}
 }
diff --git a/library/tzdata/Africa/Sao_Tome b/library/tzdata/Africa/Sao_Tome
index fe08d89..6a60f5c 100644
--- a/library/tzdata/Africa/Sao_Tome
+++ b/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}
 }
diff --git a/library/tzdata/America/Araguaina b/library/tzdata/America/Araguaina
index b9e2aec..ca64292 100644
--- a/library/tzdata/America/Araguaina
+++ b/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}
 }
diff --git a/library/tzdata/America/Argentina/Buenos_Aires b/library/tzdata/America/Argentina/Buenos_Aires
index 8be2c45..40f1912 100644
--- a/library/tzdata/America/Argentina/Buenos_Aires
+++ b/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}
 }
diff --git a/library/tzdata/America/Argentina/Catamarca b/library/tzdata/America/Argentina/Catamarca
index a546bfc..da5b42a 100644
--- a/library/tzdata/America/Argentina/Catamarca
+++ b/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}
 }
diff --git a/library/tzdata/America/Argentina/Cordoba b/library/tzdata/America/Argentina/Cordoba
index ec6978e..6a1426e 100644
--- a/library/tzdata/America/Argentina/Cordoba
+++ b/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}
 }
diff --git a/library/tzdata/America/Argentina/Jujuy b/library/tzdata/America/Argentina/Jujuy
index 0e11ba2..72080f5 100644
--- a/library/tzdata/America/Argentina/Jujuy
+++ b/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}
 }
diff --git a/library/tzdata/America/Argentina/La_Rioja b/library/tzdata/America/Argentina/La_Rioja
index 90e0030..fb7b237 100644
--- a/library/tzdata/America/Argentina/La_Rioja
+++ b/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}
 }
diff --git a/library/tzdata/America/Argentina/Mendoza b/library/tzdata/America/Argentina/Mendoza
index 8dfcd2b..af7342e 100644
--- a/library/tzdata/America/Argentina/Mendoza
+++ b/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}
 }
diff --git a/library/tzdata/America/Argentina/Rio_Gallegos b/library/tzdata/America/Argentina/Rio_Gallegos
index 4b2a348..2a197a4 100644
--- a/library/tzdata/America/Argentina/Rio_Gallegos
+++ b/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}
 }
diff --git a/library/tzdata/America/Argentina/Salta b/library/tzdata/America/Argentina/Salta
index 4f9ccf9..d49e82f 100644
--- a/library/tzdata/America/Argentina/Salta
+++ b/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}
 }
diff --git a/library/tzdata/America/Argentina/San_Juan b/library/tzdata/America/Argentina/San_Juan
index 1f0530a..d67f688 100644
--- a/library/tzdata/America/Argentina/San_Juan
+++ b/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}
 }
diff --git a/library/tzdata/America/Argentina/San_Luis b/library/tzdata/America/Argentina/San_Luis
index 3583a39..4d27c32 100644
--- a/library/tzdata/America/Argentina/San_Luis
+++ b/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}
 }
diff --git a/library/tzdata/America/Argentina/Tucuman b/library/tzdata/America/Argentina/Tucuman
index 15c5c63..6809800 100644
--- a/library/tzdata/America/Argentina/Tucuman
+++ b/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}
 }
diff --git a/library/tzdata/America/Argentina/Ushuaia b/library/tzdata/America/Argentina/Ushuaia
index 4214c1d..c62ca0d 100644
--- a/library/tzdata/America/Argentina/Ushuaia
+++ b/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}
 }
diff --git a/library/tzdata/America/Asuncion b/library/tzdata/America/Asuncion
index 606db57..8e6c1b0 100644
--- a/library/tzdata/America/Asuncion
+++ b/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}
 }
diff --git a/library/tzdata/America/Bahia b/library/tzdata/America/Bahia
index 7dbcb90..7aaf834 100644
--- a/library/tzdata/America/Bahia
+++ b/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}
 }
diff --git a/library/tzdata/America/Belem b/library/tzdata/America/Belem
index b2bf3a6..42a3ec5 100644
--- a/library/tzdata/America/Belem
+++ b/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}
 }
diff --git a/library/tzdata/America/Boa_Vista b/library/tzdata/America/Boa_Vista
index 982249b..0af989e 100644
--- a/library/tzdata/America/Boa_Vista
+++ b/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}
 }
diff --git a/library/tzdata/America/Bogota b/library/tzdata/America/Bogota
index 69e4557..8ca39ba 100644
--- a/library/tzdata/America/Bogota
+++ b/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}
 }
diff --git a/library/tzdata/America/Campo_Grande b/library/tzdata/America/Campo_Grande
index f8bfb67..5ec7112 100644
--- a/library/tzdata/America/Campo_Grande
+++ b/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}
 }
diff --git a/library/tzdata/America/Cuiaba b/library/tzdata/America/Cuiaba
index 69acddb..09f5b1f 100644
--- a/library/tzdata/America/Cuiaba
+++ b/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}
 }
diff --git a/library/tzdata/America/Eirunepe b/library/tzdata/America/Eirunepe
index 41b4cc9..a81b09e 100644
--- a/library/tzdata/America/Eirunepe
+++ b/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}
diff --git a/library/tzdata/America/Fortaleza b/library/tzdata/America/Fortaleza
index 06c7b84..bd806f1 100644
--- a/library/tzdata/America/Fortaleza
+++ b/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}
 }
diff --git a/library/tzdata/America/Grand_Turk b/library/tzdata/America/Grand_Turk
index c963adc..da5f09b 100644
--- a/library/tzdata/America/Grand_Turk
+++ b/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}
diff --git a/library/tzdata/America/Guayaquil b/library/tzdata/America/Guayaquil
index 353eb69..6ba7b93 100644
--- a/library/tzdata/America/Guayaquil
+++ b/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}
 }
diff --git a/library/tzdata/America/Jamaica b/library/tzdata/America/Jamaica
index f752842..0f758bd 100644
--- a/library/tzdata/America/Jamaica
+++ b/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}
diff --git a/library/tzdata/America/Lima b/library/tzdata/America/Lima
index b224a64..e8b69d6 100644
--- a/library/tzdata/America/Lima
+++ b/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}
diff --git a/library/tzdata/America/Maceio b/library/tzdata/America/Maceio
index e6ed548..eab534e 100644
--- a/library/tzdata/America/Maceio
+++ b/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}
 }
diff --git a/library/tzdata/America/Manaus b/library/tzdata/America/Manaus
index f17023c..a855062 100644
--- a/library/tzdata/America/Manaus
+++ b/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}
 }
diff --git a/library/tzdata/America/Montevideo b/library/tzdata/America/Montevideo
index ff85fb3..27fb76e 100644
--- a/library/tzdata/America/Montevideo
+++ b/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}
 }
diff --git a/library/tzdata/America/Noronha b/library/tzdata/America/Noronha
index f24b412..01fb745 100644
--- a/library/tzdata/America/Noronha
+++ b/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}
 }
diff --git a/library/tzdata/America/Porto_Velho b/library/tzdata/America/Porto_Velho
index 42566ad..8d7c8fd 100644
--- a/library/tzdata/America/Porto_Velho
+++ b/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}
 }
diff --git a/library/tzdata/America/Punta_Arenas b/library/tzdata/America/Punta_Arenas
index 75487e7..5e8202a 100644
--- a/library/tzdata/America/Punta_Arenas
+++ b/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}
 }
diff --git a/library/tzdata/America/Recife b/library/tzdata/America/Recife
index 8eae571..db0a445 100644
--- a/library/tzdata/America/Recife
+++ b/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}
 }
diff --git a/library/tzdata/America/Rio_Branco b/library/tzdata/America/Rio_Branco
index e3c2f31..088800b 100644
--- a/library/tzdata/America/Rio_Branco
+++ b/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}
diff --git a/library/tzdata/America/Santarem b/library/tzdata/America/Santarem
index f81e9b6..5fa3551 100644
--- a/library/tzdata/America/Santarem
+++ b/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}
diff --git a/library/tzdata/America/Santiago b/library/tzdata/America/Santiago
index 95e920d..67d5b5c 100644
--- a/library/tzdata/America/Santiago
+++ b/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}
+    {1534046400 -10800 1 -04}
     {1557630000 -14400 0 -04}
-    {1565496000 -10800 1 -03}
+    {1565496000 -10800 1 -04}
     {1589079600 -14400 0 -04}
-    {1596945600 -10800 1 -03}
+    {1596945600 -10800 1 -04}
     {1620529200 -14400 0 -04}
-    {1629000000 -10800 1 -03}
+    {1629000000 -10800 1 -04}
     {1652583600 -14400 0 -04}
-    {1660449600 -10800 1 -03}
+    {1660449600 -10800 1 -04}
     {1684033200 -14400 0 -04}
-    {1691899200 -10800 1 -03}
+    {1691899200 -10800 1 -04}
     {1715482800 -14400 0 -04}
-    {1723348800 -10800 1 -03}
+    {1723348800 -10800 1 -04}
     {1746932400 -14400 0 -04}
-    {1754798400 -10800 1 -03}
+    {1754798400 -10800 1 -04}
     {1778382000 -14400 0 -04}
-    {1786248000 -10800 1 -03}
+    {1786248000 -10800 1 -04}
     {1809831600 -14400 0 -04}
-    {1818302400 -10800 1 -03}
+    {1818302400 -10800 1 -04}
     {1841886000 -14400 0 -04}
-    {1849752000 -10800 1 -03}
+    {1849752000 -10800 1 -04}
     {1873335600 -14400 0 -04}
-    {1881201600 -10800 1 -03}
+    {1881201600 -10800 1 -04}
     {1904785200 -14400 0 -04}
-    {1912651200 -10800 1 -03}
+    {1912651200 -10800 1 -04}
     {1936234800 -14400 0 -04}
-    {1944100800 -10800 1 -03}
+    {1944100800 -10800 1 -04}
     {1967684400 -14400 0 -04}
-    {1976155200 -10800 1 -03}
+    {1976155200 -10800 1 -04}
     {1999738800 -14400 0 -04}
-    {2007604800 -10800 1 -03}
+    {2007604800 -10800 1 -04}
     {2031188400 -14400 0 -04}
-    {2039054400 -10800 1 -03}
+    {2039054400 -10800 1 -04}
     {2062638000 -14400 0 -04}
-    {2070504000 -10800 1 -03}
+    {2070504000 -10800 1 -04}
     {2094087600 -14400 0 -04}
-    {2101953600 -10800 1 -03}
+    {2101953600 -10800 1 -04}
     {2125537200 -14400 0 -04}
-    {2133403200 -10800 1 -03}
+    {2133403200 -10800 1 -04}
     {2156986800 -14400 0 -04}
-    {2165457600 -10800 1 -03}
+    {2165457600 -10800 1 -04}
     {2189041200 -14400 0 -04}
-    {2196907200 -10800 1 -03}
+    {2196907200 -10800 1 -04}
     {2220490800 -14400 0 -04}
-    {2228356800 -10800 1 -03}
+    {2228356800 -10800 1 -04}
     {2251940400 -14400 0 -04}
-    {2259806400 -10800 1 -03}
+    {2259806400 -10800 1 -04}
     {2283390000 -14400 0 -04}
-    {2291256000 -10800 1 -03}
+    {2291256000 -10800 1 -04}
     {2314839600 -14400 0 -04}
-    {2322705600 -10800 1 -03}
+    {2322705600 -10800 1 -04}
     {2346894000 -14400 0 -04}
-    {2354760000 -10800 1 -03}
+    {2354760000 -10800 1 -04}
     {2378343600 -14400 0 -04}
-    {2386209600 -10800 1 -03}
+    {2386209600 -10800 1 -04}
     {2409793200 -14400 0 -04}
-    {2417659200 -10800 1 -03}
+    {2417659200 -10800 1 -04}
     {2441242800 -14400 0 -04}
-    {2449108800 -10800 1 -03}
+    {2449108800 -10800 1 -04}
     {2472692400 -14400 0 -04}
-    {2480558400 -10800 1 -03}
+    {2480558400 -10800 1 -04}
     {2504142000 -14400 0 -04}
-    {2512612800 -10800 1 -03}
+    {2512612800 -10800 1 -04}
     {2536196400 -14400 0 -04}
-    {2544062400 -10800 1 -03}
+    {2544062400 -10800 1 -04}
     {2567646000 -14400 0 -04}
-    {2575512000 -10800 1 -03}
+    {2575512000 -10800 1 -04}
     {2599095600 -14400 0 -04}
-    {2606961600 -10800 1 -03}
+    {2606961600 -10800 1 -04}
     {2630545200 -14400 0 -04}
-    {2638411200 -10800 1 -03}
+    {2638411200 -10800 1 -04}
     {2661994800 -14400 0 -04}
-    {2669860800 -10800 1 -03}
+    {2669860800 -10800 1 -04}
     {2693444400 -14400 0 -04}
-    {2701915200 -10800 1 -03}
+    {2701915200 -10800 1 -04}
     {2725498800 -14400 0 -04}
-    {2733364800 -10800 1 -03}
+    {2733364800 -10800 1 -04}
     {2756948400 -14400 0 -04}
-    {2764814400 -10800 1 -03}
+    {2764814400 -10800 1 -04}
     {2788398000 -14400 0 -04}
-    {2796264000 -10800 1 -03}
+    {2796264000 -10800 1 -04}
     {2819847600 -14400 0 -04}
-    {2827713600 -10800 1 -03}
+    {2827713600 -10800 1 -04}
     {2851297200 -14400 0 -04}
-    {2859768000 -10800 1 -03}
+    {2859768000 -10800 1 -04}
     {2883351600 -14400 0 -04}
-    {2891217600 -10800 1 -03}
+    {2891217600 -10800 1 -04}
     {2914801200 -14400 0 -04}
-    {2922667200 -10800 1 -03}
+    {2922667200 -10800 1 -04}
     {2946250800 -14400 0 -04}
-    {2954116800 -10800 1 -03}
+    {2954116800 -10800 1 -04}
     {2977700400 -14400 0 -04}
-    {2985566400 -10800 1 -03}
+    {2985566400 -10800 1 -04}
     {3009150000 -14400 0 -04}
-    {3017016000 -10800 1 -03}
+    {3017016000 -10800 1 -04}
     {3040599600 -14400 0 -04}
-    {3049070400 -10800 1 -03}
+    {3049070400 -10800 1 -04}
     {3072654000 -14400 0 -04}
-    {3080520000 -10800 1 -03}
+    {3080520000 -10800 1 -04}
     {3104103600 -14400 0 -04}
-    {3111969600 -10800 1 -03}
+    {3111969600 -10800 1 -04}
     {3135553200 -14400 0 -04}
-    {3143419200 -10800 1 -03}
+    {3143419200 -10800 1 -04}
     {3167002800 -14400 0 -04}
-    {3174868800 -10800 1 -03}
+    {3174868800 -10800 1 -04}
     {3198452400 -14400 0 -04}
-    {3206318400 -10800 1 -03}
+    {3206318400 -10800 1 -04}
     {3230506800 -14400 0 -04}
-    {3238372800 -10800 1 -03}
+    {3238372800 -10800 1 -04}
     {3261956400 -14400 0 -04}
-    {3269822400 -10800 1 -03}
+    {3269822400 -10800 1 -04}
     {3293406000 -14400 0 -04}
-    {3301272000 -10800 1 -03}
+    {3301272000 -10800 1 -04}
     {3324855600 -14400 0 -04}
-    {3332721600 -10800 1 -03}
+    {3332721600 -10800 1 -04}
     {3356305200 -14400 0 -04}
-    {3364171200 -10800 1 -03}
+    {3364171200 -10800 1 -04}
     {3387754800 -14400 0 -04}
-    {3396225600 -10800 1 -03}
+    {3396225600 -10800 1 -04}
     {3419809200 -14400 0 -04}
-    {3427675200 -10800 1 -03}
+    {3427675200 -10800 1 -04}
     {3451258800 -14400 0 -04}
-    {3459124800 -10800 1 -03}
+    {3459124800 -10800 1 -04}
     {3482708400 -14400 0 -04}
-    {3490574400 -10800 1 -03}
+    {3490574400 -10800 1 -04}
     {3514158000 -14400 0 -04}
-    {3522024000 -10800 1 -03}
+    {3522024000 -10800 1 -04}
     {3545607600 -14400 0 -04}
-    {3553473600 -10800 1 -03}
+    {3553473600 -10800 1 -04}
     {3577057200 -14400 0 -04}
-    {3585528000 -10800 1 -03}
+    {3585528000 -10800 1 -04}
     {3609111600 -14400 0 -04}
-    {3616977600 -10800 1 -03}
+    {3616977600 -10800 1 -04}
     {3640561200 -14400 0 -04}
-    {3648427200 -10800 1 -03}
+    {3648427200 -10800 1 -04}
     {3672010800 -14400 0 -04}
-    {3679876800 -10800 1 -03}
+    {3679876800 -10800 1 -04}
     {3703460400 -14400 0 -04}
-    {3711326400 -10800 1 -03}
+    {3711326400 -10800 1 -04}
     {3734910000 -14400 0 -04}
-    {3743380800 -10800 1 -03}
+    {3743380800 -10800 1 -04}
     {3766964400 -14400 0 -04}
-    {3774830400 -10800 1 -03}
+    {3774830400 -10800 1 -04}
     {3798414000 -14400 0 -04}
-    {3806280000 -10800 1 -03}
+    {3806280000 -10800 1 -04}
     {3829863600 -14400 0 -04}
-    {3837729600 -10800 1 -03}
+    {3837729600 -10800 1 -04}
     {3861313200 -14400 0 -04}
-    {3869179200 -10800 1 -03}
+    {3869179200 -10800 1 -04}
     {3892762800 -14400 0 -04}
-    {3900628800 -10800 1 -03}
+    {3900628800 -10800 1 -04}
     {3924212400 -14400 0 -04}
-    {3932683200 -10800 1 -03}
+    {3932683200 -10800 1 -04}
     {3956266800 -14400 0 -04}
-    {3964132800 -10800 1 -03}
+    {3964132800 -10800 1 -04}
     {3987716400 -14400 0 -04}
-    {3995582400 -10800 1 -03}
+    {3995582400 -10800 1 -04}
     {4019166000 -14400 0 -04}
-    {4027032000 -10800 1 -03}
+    {4027032000 -10800 1 -04}
     {4050615600 -14400 0 -04}
-    {4058481600 -10800 1 -03}
+    {4058481600 -10800 1 -04}
     {4082065200 -14400 0 -04}
-    {4089931200 -10800 1 -03}
+    {4089931200 -10800 1 -04}
 }
diff --git a/library/tzdata/America/Sao_Paulo b/library/tzdata/America/Sao_Paulo
index 93c524d..235f57a 100644
--- a/library/tzdata/America/Sao_Paulo
+++ b/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}
 }
diff --git a/library/tzdata/Antarctica/Casey b/library/tzdata/Antarctica/Casey
index beb0f9e..aa37480 100644
--- a/library/tzdata/Antarctica/Casey
+++ b/library/tzdata/Antarctica/Casey
@@ -8,4 +8,5 @@ set TZData(:Antarctica/Casey) {
     {1319738400 39600 0 +11}
     {1329843600 28800 0 +08}
     {1477065600 39600 0 +11}
+    {1520701200 28800 0 +08}
 }
diff --git a/library/tzdata/Antarctica/Palmer b/library/tzdata/Antarctica/Palmer
index bb2be4d..f450e3b 100644
--- a/library/tzdata/Antarctica/Palmer
+++ b/library/tzdata/Antarctica/Palmer
@@ -4,84 +4,84 @@ set TZData(:Antarctica/Palmer) {
     {-9223372036854775808 0 0 -00}
     {-157766400 -14400 0 -04}
     {-152654400 -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}
     {389070000 -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}
 }
diff --git a/library/tzdata/Asia/Almaty b/library/tzdata/Asia/Almaty
index 2b83197..f42935d 100644
--- a/library/tzdata/Asia/Almaty
+++ b/library/tzdata/Asia/Almaty
@@ -4,54 +4,54 @@ set TZData(:Asia/Almaty) {
     {-9223372036854775808 18468 0 LMT}
     {-1441170468 18000 0 +05}
     {-1247547600 21600 0 +06}
-    {354909600 25200 1 +07}
+    {354909600 25200 1 +06}
     {370717200 21600 0 +06}
-    {386445600 25200 1 +07}
+    {386445600 25200 1 +06}
     {402253200 21600 0 +06}
-    {417981600 25200 1 +07}
+    {417981600 25200 1 +06}
     {433789200 21600 0 +06}
-    {449604000 25200 1 +07}
+    {449604000 25200 1 +06}
     {465336000 21600 0 +06}
-    {481060800 25200 1 +07}
+    {481060800 25200 1 +06}
     {496785600 21600 0 +06}
-    {512510400 25200 1 +07}
+    {512510400 25200 1 +06}
     {528235200 21600 0 +06}
-    {543960000 25200 1 +07}
+    {543960000 25200 1 +06}
     {559684800 21600 0 +06}
-    {575409600 25200 1 +07}
+    {575409600 25200 1 +06}
     {591134400 21600 0 +06}
-    {606859200 25200 1 +07}
+    {606859200 25200 1 +06}
     {622584000 21600 0 +06}
-    {638308800 25200 1 +07}
+    {638308800 25200 1 +06}
     {654638400 21600 0 +06}
     {670363200 18000 0 +05}
-    {670366800 21600 1 +06}
+    {670366800 21600 1 +05}
     {686091600 18000 0 +05}
     {695768400 21600 0 +06}
-    {701812800 25200 1 +07}
+    {701812800 25200 1 +06}
     {717537600 21600 0 +06}
-    {733262400 25200 1 +07}
+    {733262400 25200 1 +06}
     {748987200 21600 0 +06}
-    {764712000 25200 1 +07}
+    {764712000 25200 1 +06}
     {780436800 21600 0 +06}
-    {796161600 25200 1 +07}
+    {796161600 25200 1 +06}
     {811886400 21600 0 +06}
-    {828216000 25200 1 +07}
+    {828216000 25200 1 +06}
     {846360000 21600 0 +06}
-    {859665600 25200 1 +07}
+    {859665600 25200 1 +06}
     {877809600 21600 0 +06}
-    {891115200 25200 1 +07}
+    {891115200 25200 1 +06}
     {909259200 21600 0 +06}
-    {922564800 25200 1 +07}
+    {922564800 25200 1 +06}
     {941313600 21600 0 +06}
-    {954014400 25200 1 +07}
+    {954014400 25200 1 +06}
     {972763200 21600 0 +06}
-    {985464000 25200 1 +07}
+    {985464000 25200 1 +06}
     {1004212800 21600 0 +06}
-    {1017518400 25200 1 +07}
+    {1017518400 25200 1 +06}
     {1035662400 21600 0 +06}
-    {1048968000 25200 1 +07}
+    {1048968000 25200 1 +06}
     {1067112000 21600 0 +06}
-    {1080417600 25200 1 +07}
+    {1080417600 25200 1 +06}
     {1099166400 21600 0 +06}
 }
diff --git a/library/tzdata/Asia/Aqtau b/library/tzdata/Asia/Aqtau
index c128b27..41da2ca 100644
--- a/library/tzdata/Asia/Aqtau
+++ b/library/tzdata/Asia/Aqtau
@@ -6,53 +6,53 @@ set TZData(:Asia/Aqtau) {
     {-1247544000 18000 0 +05}
     {370724400 21600 0 +06}
     {386445600 18000 0 +05}
-    {386449200 21600 1 +06}
+    {386449200 21600 1 +05}
     {402256800 18000 0 +05}
-    {417985200 21600 1 +06}
+    {417985200 21600 1 +05}
     {433792800 18000 0 +05}
-    {449607600 21600 1 +06}
+    {449607600 21600 1 +05}
     {465339600 18000 0 +05}
-    {481064400 21600 1 +06}
+    {481064400 21600 1 +05}
     {496789200 18000 0 +05}
-    {512514000 21600 1 +06}
+    {512514000 21600 1 +05}
     {528238800 18000 0 +05}
-    {543963600 21600 1 +06}
+    {543963600 21600 1 +05}
     {559688400 18000 0 +05}
-    {575413200 21600 1 +06}
+    {575413200 21600 1 +05}
     {591138000 18000 0 +05}
-    {606862800 21600 1 +06}
+    {606862800 21600 1 +05}
     {622587600 18000 0 +05}
-    {638312400 21600 1 +06}
+    {638312400 21600 1 +05}
     {654642000 18000 0 +05}
     {670366800 14400 0 +04}
-    {670370400 18000 1 +05}
+    {670370400 18000 1 +04}
     {686095200 14400 0 +04}
     {695772000 18000 0 +05}
-    {701816400 21600 1 +06}
+    {701816400 21600 1 +05}
     {717541200 18000 0 +05}
-    {733266000 21600 1 +06}
+    {733266000 21600 1 +05}
     {748990800 18000 0 +05}
-    {764715600 21600 1 +06}
-    {780440400 18000 0 +05}
+    {764715600 21600 1 +05}
+    {780440400 18000 0 +04}
     {780444000 14400 0 +04}
-    {796168800 18000 1 +05}
+    {796168800 18000 1 +04}
     {811893600 14400 0 +04}
-    {828223200 18000 1 +05}
+    {828223200 18000 1 +04}
     {846367200 14400 0 +04}
-    {859672800 18000 1 +05}
+    {859672800 18000 1 +04}
     {877816800 14400 0 +04}
-    {891122400 18000 1 +05}
+    {891122400 18000 1 +04}
     {909266400 14400 0 +04}
-    {922572000 18000 1 +05}
+    {922572000 18000 1 +04}
     {941320800 14400 0 +04}
-    {954021600 18000 1 +05}
+    {954021600 18000 1 +04}
     {972770400 14400 0 +04}
-    {985471200 18000 1 +05}
+    {985471200 18000 1 +04}
     {1004220000 14400 0 +04}
-    {1017525600 18000 1 +05}
+    {1017525600 18000 1 +04}
     {1035669600 14400 0 +04}
-    {1048975200 18000 1 +05}
+    {1048975200 18000 1 +04}
     {1067119200 14400 0 +04}
-    {1080424800 18000 1 +05}
+    {1080424800 18000 1 +04}
     {1099173600 18000 0 +05}
 }
diff --git a/library/tzdata/Asia/Aqtobe b/library/tzdata/Asia/Aqtobe
index 55ef556..2316e68 100644
--- a/library/tzdata/Asia/Aqtobe
+++ b/library/tzdata/Asia/Aqtobe
@@ -7,52 +7,52 @@ set TZData(:Asia/Aqtobe) {
     {354913200 21600 1 +06}
     {370720800 21600 0 +06}
     {386445600 18000 0 +05}
-    {386449200 21600 1 +06}
+    {386449200 21600 1 +05}
     {402256800 18000 0 +05}
-    {417985200 21600 1 +06}
+    {417985200 21600 1 +05}
     {433792800 18000 0 +05}
-    {449607600 21600 1 +06}
+    {449607600 21600 1 +05}
     {465339600 18000 0 +05}
-    {481064400 21600 1 +06}
+    {481064400 21600 1 +05}
     {496789200 18000 0 +05}
-    {512514000 21600 1 +06}
+    {512514000 21600 1 +05}
     {528238800 18000 0 +05}
-    {543963600 21600 1 +06}
+    {543963600 21600 1 +05}
     {559688400 18000 0 +05}
-    {575413200 21600 1 +06}
+    {575413200 21600 1 +05}
     {591138000 18000 0 +05}
-    {606862800 21600 1 +06}
+    {606862800 21600 1 +05}
     {622587600 18000 0 +05}
-    {638312400 21600 1 +06}
+    {638312400 21600 1 +05}
     {654642000 18000 0 +05}
     {670366800 14400 0 +04}
-    {670370400 18000 1 +05}
+    {670370400 18000 1 +04}
     {686095200 14400 0 +04}
     {695772000 18000 0 +05}
-    {701816400 21600 1 +06}
+    {701816400 21600 1 +05}
     {717541200 18000 0 +05}
-    {733266000 21600 1 +06}
+    {733266000 21600 1 +05}
     {748990800 18000 0 +05}
-    {764715600 21600 1 +06}
+    {764715600 21600 1 +05}
     {780440400 18000 0 +05}
-    {796165200 21600 1 +06}
+    {796165200 21600 1 +05}
     {811890000 18000 0 +05}
-    {828219600 21600 1 +06}
+    {828219600 21600 1 +05}
     {846363600 18000 0 +05}
-    {859669200 21600 1 +06}
+    {859669200 21600 1 +05}
     {877813200 18000 0 +05}
-    {891118800 21600 1 +06}
+    {891118800 21600 1 +05}
     {909262800 18000 0 +05}
-    {922568400 21600 1 +06}
+    {922568400 21600 1 +05}
     {941317200 18000 0 +05}
-    {954018000 21600 1 +06}
+    {954018000 21600 1 +05}
     {972766800 18000 0 +05}
-    {985467600 21600 1 +06}
+    {985467600 21600 1 +05}
     {1004216400 18000 0 +05}
-    {1017522000 21600 1 +06}
+    {1017522000 21600 1 +05}
     {1035666000 18000 0 +05}
-    {1048971600 21600 1 +06}
+    {1048971600 21600 1 +05}
     {1067115600 18000 0 +05}
-    {1080421200 21600 1 +06}
+    {1080421200 21600 1 +05}
     {1099170000 18000 0 +05}
 }
diff --git a/library/tzdata/Asia/Ashgabat b/library/tzdata/Asia/Ashgabat
index fa6a619..feb7725 100644
--- a/library/tzdata/Asia/Ashgabat
+++ b/library/tzdata/Asia/Ashgabat
@@ -4,28 +4,28 @@ set TZData(:Asia/Ashgabat) {
     {-9223372036854775808 14012 0 LMT}
     {-1441166012 14400 0 +04}
     {-1247544000 18000 0 +05}
-    {354913200 21600 1 +06}
+    {354913200 21600 1 +05}
     {370720800 18000 0 +05}
-    {386449200 21600 1 +06}
+    {386449200 21600 1 +05}
     {402256800 18000 0 +05}
-    {417985200 21600 1 +06}
+    {417985200 21600 1 +05}
     {433792800 18000 0 +05}
-    {449607600 21600 1 +06}
+    {449607600 21600 1 +05}
     {465339600 18000 0 +05}
-    {481064400 21600 1 +06}
+    {481064400 21600 1 +05}
     {496789200 18000 0 +05}
-    {512514000 21600 1 +06}
+    {512514000 21600 1 +05}
     {528238800 18000 0 +05}
-    {543963600 21600 1 +06}
+    {543963600 21600 1 +05}
     {559688400 18000 0 +05}
-    {575413200 21600 1 +06}
+    {575413200 21600 1 +05}
     {591138000 18000 0 +05}
-    {606862800 21600 1 +06}
+    {606862800 21600 1 +05}
     {622587600 18000 0 +05}
-    {638312400 21600 1 +06}
+    {638312400 21600 1 +05}
     {654642000 18000 0 +05}
     {670366800 14400 0 +04}
-    {670370400 18000 1 +05}
+    {670370400 18000 1 +04}
     {686095200 14400 0 +04}
     {695772000 18000 0 +05}
 }
diff --git a/library/tzdata/Asia/Atyrau b/library/tzdata/Asia/Atyrau
index c31ff11..b6d8253 100644
--- a/library/tzdata/Asia/Atyrau
+++ b/library/tzdata/Asia/Atyrau
@@ -6,53 +6,53 @@ set TZData(:Asia/Atyrau) {
     {-1247540400 18000 0 +05}
     {370724400 21600 0 +06}
     {386445600 18000 0 +05}
-    {386449200 21600 1 +06}
+    {386449200 21600 1 +05}
     {402256800 18000 0 +05}
-    {417985200 21600 1 +06}
+    {417985200 21600 1 +05}
     {433792800 18000 0 +05}
-    {449607600 21600 1 +06}
+    {449607600 21600 1 +05}
     {465339600 18000 0 +05}
-    {481064400 21600 1 +06}
+    {481064400 21600 1 +05}
     {496789200 18000 0 +05}
-    {512514000 21600 1 +06}
+    {512514000 21600 1 +05}
     {528238800 18000 0 +05}
-    {543963600 21600 1 +06}
+    {543963600 21600 1 +05}
     {559688400 18000 0 +05}
-    {575413200 21600 1 +06}
+    {575413200 21600 1 +05}
     {591138000 18000 0 +05}
-    {606862800 21600 1 +06}
+    {606862800 21600 1 +05}
     {622587600 18000 0 +05}
-    {638312400 21600 1 +06}
+    {638312400 21600 1 +05}
     {654642000 18000 0 +05}
     {670366800 14400 0 +04}
-    {670370400 18000 1 +05}
+    {670370400 18000 1 +04}
     {686095200 14400 0 +04}
     {695772000 18000 0 +05}
-    {701816400 21600 1 +06}
+    {701816400 21600 1 +05}
     {717541200 18000 0 +05}
-    {733266000 21600 1 +06}
+    {733266000 21600 1 +05}
     {748990800 18000 0 +05}
-    {764715600 21600 1 +06}
+    {764715600 21600 1 +05}
     {780440400 18000 0 +05}
-    {796165200 21600 1 +06}
+    {796165200 21600 1 +05}
     {811890000 18000 0 +05}
-    {828219600 21600 1 +06}
+    {828219600 21600 1 +05}
     {846363600 18000 0 +05}
-    {859669200 21600 1 +06}
+    {859669200 21600 1 +05}
     {877813200 18000 0 +05}
-    {891118800 21600 1 +06}
+    {891118800 21600 1 +05}
     {909262800 18000 0 +05}
     {922568400 14400 0 +04}
-    {922572000 18000 1 +05}
+    {922572000 18000 1 +04}
     {941320800 14400 0 +04}
-    {954021600 18000 1 +05}
+    {954021600 18000 1 +04}
     {972770400 14400 0 +04}
-    {985471200 18000 1 +05}
+    {985471200 18000 1 +04}
     {1004220000 14400 0 +04}
-    {1017525600 18000 1 +05}
+    {1017525600 18000 1 +04}
     {1035669600 14400 0 +04}
-    {1048975200 18000 1 +05}
+    {1048975200 18000 1 +04}
     {1067119200 14400 0 +04}
-    {1080424800 18000 1 +05}
+    {1080424800 18000 1 +04}
     {1099173600 18000 0 +05}
 }
diff --git a/library/tzdata/Asia/Baghdad b/library/tzdata/Asia/Baghdad
index 623e310..c76a6a1 100644
--- a/library/tzdata/Asia/Baghdad
+++ b/library/tzdata/Asia/Baghdad
@@ -4,56 +4,56 @@ set TZData(:Asia/Baghdad) {
     {-9223372036854775808 10660 0 LMT}
     {-2524532260 10656 0 BMT}
     {-1641005856 10800 0 +03}
-    {389048400 14400 0 +04}
-    {402264000 10800 0 +04}
-    {417906000 14400 1 +04}
-    {433800000 10800 0 +04}
-    {449614800 14400 1 +04}
-    {465422400 10800 0 +04}
-    {481150800 14400 1 +04}
-    {496792800 10800 0 +04}
-    {512517600 14400 1 +04}
-    {528242400 10800 0 +04}
-    {543967200 14400 1 +04}
-    {559692000 10800 0 +04}
-    {575416800 14400 1 +04}
-    {591141600 10800 0 +04}
-    {606866400 14400 1 +04}
-    {622591200 10800 0 +04}
-    {638316000 14400 1 +04}
-    {654645600 10800 0 +04}
-    {670464000 14400 1 +04}
-    {686275200 10800 0 +04}
-    {702086400 14400 1 +04}
-    {717897600 10800 0 +04}
-    {733622400 14400 1 +04}
-    {749433600 10800 0 +04}
-    {765158400 14400 1 +04}
-    {780969600 10800 0 +04}
-    {796694400 14400 1 +04}
-    {812505600 10800 0 +04}
-    {828316800 14400 1 +04}
-    {844128000 10800 0 +04}
-    {859852800 14400 1 +04}
-    {875664000 10800 0 +04}
-    {891388800 14400 1 +04}
-    {907200000 10800 0 +04}
-    {922924800 14400 1 +04}
-    {938736000 10800 0 +04}
-    {954547200 14400 1 +04}
-    {970358400 10800 0 +04}
-    {986083200 14400 1 +04}
-    {1001894400 10800 0 +04}
-    {1017619200 14400 1 +04}
-    {1033430400 10800 0 +04}
-    {1049155200 14400 1 +04}
-    {1064966400 10800 0 +04}
-    {1080777600 14400 1 +04}
-    {1096588800 10800 0 +04}
-    {1112313600 14400 1 +04}
-    {1128124800 10800 0 +04}
-    {1143849600 14400 1 +04}
-    {1159660800 10800 0 +04}
-    {1175385600 14400 1 +04}
-    {1191196800 10800 0 +04}
+    {389048400 14400 0 +03}
+    {402264000 10800 0 +03}
+    {417906000 14400 1 +03}
+    {433800000 10800 0 +03}
+    {449614800 14400 1 +03}
+    {465422400 10800 0 +03}
+    {481150800 14400 1 +03}
+    {496792800 10800 0 +03}
+    {512517600 14400 1 +03}
+    {528242400 10800 0 +03}
+    {543967200 14400 1 +03}
+    {559692000 10800 0 +03}
+    {575416800 14400 1 +03}
+    {591141600 10800 0 +03}
+    {606866400 14400 1 +03}
+    {622591200 10800 0 +03}
+    {638316000 14400 1 +03}
+    {654645600 10800 0 +03}
+    {670464000 14400 1 +03}
+    {686275200 10800 0 +03}
+    {702086400 14400 1 +03}
+    {717897600 10800 0 +03}
+    {733622400 14400 1 +03}
+    {749433600 10800 0 +03}
+    {765158400 14400 1 +03}
+    {780969600 10800 0 +03}
+    {796694400 14400 1 +03}
+    {812505600 10800 0 +03}
+    {828316800 14400 1 +03}
+    {844128000 10800 0 +03}
+    {859852800 14400 1 +03}
+    {875664000 10800 0 +03}
+    {891388800 14400 1 +03}
+    {907200000 10800 0 +03}
+    {922924800 14400 1 +03}
+    {938736000 10800 0 +03}
+    {954547200 14400 1 +03}
+    {970358400 10800 0 +03}
+    {986083200 14400 1 +03}
+    {1001894400 10800 0 +03}
+    {1017619200 14400 1 +03}
+    {1033430400 10800 0 +03}
+    {1049155200 14400 1 +03}
+    {1064966400 10800 0 +03}
+    {1080777600 14400 1 +03}
+    {1096588800 10800 0 +03}
+    {1112313600 14400 1 +03}
+    {1128124800 10800 0 +03}
+    {1143849600 14400 1 +03}
+    {1159660800 10800 0 +03}
+    {1175385600 14400 1 +03}
+    {1191196800 10800 0 +03}
 }
diff --git a/library/tzdata/Asia/Baku b/library/tzdata/Asia/Baku
index f945b89..03dee19 100644
--- a/library/tzdata/Asia/Baku
+++ b/library/tzdata/Asia/Baku
@@ -4,71 +4,71 @@ set TZData(:Asia/Baku) {
     {-9223372036854775808 11964 0 LMT}
     {-1441163964 10800 0 +03}
     {-405140400 14400 0 +04}
-    {354916800 18000 1 +05}
+    {354916800 18000 1 +04}
     {370724400 14400 0 +04}
-    {386452800 18000 1 +05}
+    {386452800 18000 1 +04}
     {402260400 14400 0 +04}
-    {417988800 18000 1 +05}
+    {417988800 18000 1 +04}
     {433796400 14400 0 +04}
-    {449611200 18000 1 +05}
+    {449611200 18000 1 +04}
     {465343200 14400 0 +04}
-    {481068000 18000 1 +05}
+    {481068000 18000 1 +04}
     {496792800 14400 0 +04}
-    {512517600 18000 1 +05}
+    {512517600 18000 1 +04}
     {528242400 14400 0 +04}
-    {543967200 18000 1 +05}
+    {543967200 18000 1 +04}
     {559692000 14400 0 +04}
-    {575416800 18000 1 +05}
+    {575416800 18000 1 +04}
     {591141600 14400 0 +04}
-    {606866400 18000 1 +05}
+    {606866400 18000 1 +04}
     {622591200 14400 0 +04}
-    {638316000 18000 1 +05}
+    {638316000 18000 1 +04}
     {654645600 14400 0 +04}
     {670370400 10800 0 +03}
-    {670374000 14400 1 +04}
+    {670374000 14400 1 +03}
     {686098800 10800 0 +03}
-    {701823600 14400 1 +04}
+    {701823600 14400 1 +03}
     {717548400 14400 0 +04}
     {820440000 14400 0 +04}
     {828234000 18000 1 +05}
     {846378000 14400 0 +04}
     {852062400 14400 0 +04}
-    {859680000 18000 1 +05}
+    {859680000 18000 1 +04}
     {877824000 14400 0 +04}
-    {891129600 18000 1 +05}
+    {891129600 18000 1 +04}
     {909273600 14400 0 +04}
-    {922579200 18000 1 +05}
+    {922579200 18000 1 +04}
     {941328000 14400 0 +04}
-    {954028800 18000 1 +05}
+    {954028800 18000 1 +04}
     {972777600 14400 0 +04}
-    {985478400 18000 1 +05}
+    {985478400 18000 1 +04}
     {1004227200 14400 0 +04}
-    {1017532800 18000 1 +05}
+    {1017532800 18000 1 +04}
     {1035676800 14400 0 +04}
-    {1048982400 18000 1 +05}
+    {1048982400 18000 1 +04}
     {1067126400 14400 0 +04}
-    {1080432000 18000 1 +05}
+    {1080432000 18000 1 +04}
     {1099180800 14400 0 +04}
-    {1111881600 18000 1 +05}
+    {1111881600 18000 1 +04}
     {1130630400 14400 0 +04}
-    {1143331200 18000 1 +05}
+    {1143331200 18000 1 +04}
     {1162080000 14400 0 +04}
-    {1174780800 18000 1 +05}
+    {1174780800 18000 1 +04}
     {1193529600 14400 0 +04}
-    {1206835200 18000 1 +05}
+    {1206835200 18000 1 +04}
     {1224979200 14400 0 +04}
-    {1238284800 18000 1 +05}
+    {1238284800 18000 1 +04}
     {1256428800 14400 0 +04}
-    {1269734400 18000 1 +05}
+    {1269734400 18000 1 +04}
     {1288483200 14400 0 +04}
-    {1301184000 18000 1 +05}
+    {1301184000 18000 1 +04}
     {1319932800 14400 0 +04}
-    {1332633600 18000 1 +05}
+    {1332633600 18000 1 +04}
     {1351382400 14400 0 +04}
-    {1364688000 18000 1 +05}
+    {1364688000 18000 1 +04}
     {1382832000 14400 0 +04}
-    {1396137600 18000 1 +05}
+    {1396137600 18000 1 +04}
     {1414281600 14400 0 +04}
-    {1427587200 18000 1 +05}
+    {1427587200 18000 1 +04}
     {1445731200 14400 0 +04}
 }
diff --git a/library/tzdata/Asia/Bishkek b/library/tzdata/Asia/Bishkek
index a02d789..bc4cbdd 100644
--- a/library/tzdata/Asia/Bishkek
+++ b/library/tzdata/Asia/Bishkek
@@ -4,55 +4,55 @@ set TZData(:Asia/Bishkek) {
     {-9223372036854775808 17904 0 LMT}
     {-1441169904 18000 0 +05}
     {-1247547600 21600 0 +06}
-    {354909600 25200 1 +07}
+    {354909600 25200 1 +06}
     {370717200 21600 0 +06}
-    {386445600 25200 1 +07}
+    {386445600 25200 1 +06}
     {402253200 21600 0 +06}
-    {417981600 25200 1 +07}
+    {417981600 25200 1 +06}
     {433789200 21600 0 +06}
-    {449604000 25200 1 +07}
+    {449604000 25200 1 +06}
     {465336000 21600 0 +06}
-    {481060800 25200 1 +07}
+    {481060800 25200 1 +06}
     {496785600 21600 0 +06}
-    {512510400 25200 1 +07}
+    {512510400 25200 1 +06}
     {528235200 21600 0 +06}
-    {543960000 25200 1 +07}
+    {543960000 25200 1 +06}
     {559684800 21600 0 +06}
-    {575409600 25200 1 +07}
+    {575409600 25200 1 +06}
     {591134400 21600 0 +06}
-    {606859200 25200 1 +07}
+    {606859200 25200 1 +06}
     {622584000 21600 0 +06}
-    {638308800 25200 1 +07}
+    {638308800 25200 1 +06}
     {654638400 21600 0 +06}
     {670363200 18000 0 +05}
-    {670366800 21600 1 +06}
+    {670366800 21600 1 +05}
     {683586000 18000 0 +05}
-    {703018800 21600 1 +06}
+    {703018800 21600 1 +05}
     {717530400 18000 0 +05}
-    {734468400 21600 1 +06}
+    {734468400 21600 1 +05}
     {748980000 18000 0 +05}
-    {765918000 21600 1 +06}
+    {765918000 21600 1 +05}
     {780429600 18000 0 +05}
-    {797367600 21600 1 +06}
+    {797367600 21600 1 +05}
     {811879200 18000 0 +05}
-    {828817200 21600 1 +06}
+    {828817200 21600 1 +05}
     {843933600 18000 0 +05}
-    {859671000 21600 1 +06}
+    {859671000 21600 1 +05}
     {877811400 18000 0 +05}
-    {891120600 21600 1 +06}
+    {891120600 21600 1 +05}
     {909261000 18000 0 +05}
-    {922570200 21600 1 +06}
+    {922570200 21600 1 +05}
     {941315400 18000 0 +05}
-    {954019800 21600 1 +06}
+    {954019800 21600 1 +05}
     {972765000 18000 0 +05}
-    {985469400 21600 1 +06}
+    {985469400 21600 1 +05}
     {1004214600 18000 0 +05}
-    {1017523800 21600 1 +06}
+    {1017523800 21600 1 +05}
     {1035664200 18000 0 +05}
-    {1048973400 21600 1 +06}
+    {1048973400 21600 1 +05}
     {1067113800 18000 0 +05}
-    {1080423000 21600 1 +06}
+    {1080423000 21600 1 +05}
     {1099168200 18000 0 +05}
-    {1111872600 21600 1 +06}
+    {1111872600 21600 1 +05}
     {1123783200 21600 0 +06}
 }
diff --git a/library/tzdata/Asia/Choibalsan b/library/tzdata/Asia/Choibalsan
index 3db65de..b072c76 100644
--- a/library/tzdata/Asia/Choibalsan
+++ b/library/tzdata/Asia/Choibalsan
@@ -4,53 +4,53 @@ set TZData(:Asia/Choibalsan) {
     {-9223372036854775808 27480 0 LMT}
     {-2032933080 25200 0 +07}
     {252435600 28800 0 +08}
-    {417974400 36000 0 +10}
+    {417974400 36000 0 +09}
     {433778400 32400 0 +09}
-    {449593200 36000 1 +10}
+    {449593200 36000 1 +09}
     {465314400 32400 0 +09}
-    {481042800 36000 1 +10}
+    {481042800 36000 1 +09}
     {496764000 32400 0 +09}
-    {512492400 36000 1 +10}
+    {512492400 36000 1 +09}
     {528213600 32400 0 +09}
-    {543942000 36000 1 +10}
+    {543942000 36000 1 +09}
     {559663200 32400 0 +09}
-    {575391600 36000 1 +10}
+    {575391600 36000 1 +09}
     {591112800 32400 0 +09}
-    {606841200 36000 1 +10}
+    {606841200 36000 1 +09}
     {622562400 32400 0 +09}
-    {638290800 36000 1 +10}
+    {638290800 36000 1 +09}
     {654616800 32400 0 +09}
-    {670345200 36000 1 +10}
+    {670345200 36000 1 +09}
     {686066400 32400 0 +09}
-    {701794800 36000 1 +10}
+    {701794800 36000 1 +09}
     {717516000 32400 0 +09}
-    {733244400 36000 1 +10}
+    {733244400 36000 1 +09}
     {748965600 32400 0 +09}
-    {764694000 36000 1 +10}
+    {764694000 36000 1 +09}
     {780415200 32400 0 +09}
-    {796143600 36000 1 +10}
+    {796143600 36000 1 +09}
     {811864800 32400 0 +09}
-    {828198000 36000 1 +10}
+    {828198000 36000 1 +09}
     {843919200 32400 0 +09}
-    {859647600 36000 1 +10}
+    {859647600 36000 1 +09}
     {875368800 32400 0 +09}
-    {891097200 36000 1 +10}
+    {891097200 36000 1 +09}
     {906818400 32400 0 +09}
-    {988390800 36000 1 +10}
+    {988390800 36000 1 +09}
     {1001692800 32400 0 +09}
-    {1017421200 36000 1 +10}
+    {1017421200 36000 1 +09}
     {1033142400 32400 0 +09}
-    {1048870800 36000 1 +10}
+    {1048870800 36000 1 +09}
     {1064592000 32400 0 +09}
-    {1080320400 36000 1 +10}
+    {1080320400 36000 1 +09}
     {1096041600 32400 0 +09}
-    {1111770000 36000 1 +10}
+    {1111770000 36000 1 +09}
     {1127491200 32400 0 +09}
-    {1143219600 36000 1 +10}
+    {1143219600 36000 1 +09}
     {1159545600 32400 0 +09}
     {1206889200 28800 0 +08}
-    {1427479200 32400 1 +09}
+    {1427479200 32400 1 +08}
     {1443193200 28800 0 +08}
-    {1458928800 32400 1 +09}
+    {1458928800 32400 1 +08}
     {1474642800 28800 0 +08}
 }
diff --git a/library/tzdata/Asia/Dhaka b/library/tzdata/Asia/Dhaka
index 0dc3987..c044095 100644
--- a/library/tzdata/Asia/Dhaka
+++ b/library/tzdata/Asia/Dhaka
@@ -8,6 +8,6 @@ set TZData(:Asia/Dhaka) {
     {-862637400 23400 0 +0630}
     {-576138600 21600 0 +06}
     {1230746400 21600 0 +06}
-    {1245430800 25200 1 +07}
+    {1245430800 25200 1 +06}
     {1262278800 21600 0 +06}
 }
diff --git a/library/tzdata/Asia/Dushanbe b/library/tzdata/Asia/Dushanbe
index e9ed132..fe82ce7 100644
--- a/library/tzdata/Asia/Dushanbe
+++ b/library/tzdata/Asia/Dushanbe
@@ -4,25 +4,25 @@ set TZData(:Asia/Dushanbe) {
     {-9223372036854775808 16512 0 LMT}
     {-1441168512 18000 0 +05}
     {-1247547600 21600 0 +06}
-    {354909600 25200 1 +07}
+    {354909600 25200 1 +06}
     {370717200 21600 0 +06}
-    {386445600 25200 1 +07}
+    {386445600 25200 1 +06}
     {402253200 21600 0 +06}
-    {417981600 25200 1 +07}
+    {417981600 25200 1 +06}
     {433789200 21600 0 +06}
-    {449604000 25200 1 +07}
+    {449604000 25200 1 +06}
     {465336000 21600 0 +06}
-    {481060800 25200 1 +07}
+    {481060800 25200 1 +06}
     {496785600 21600 0 +06}
-    {512510400 25200 1 +07}
+    {512510400 25200 1 +06}
     {528235200 21600 0 +06}
-    {543960000 25200 1 +07}
+    {543960000 25200 1 +06}
     {559684800 21600 0 +06}
-    {575409600 25200 1 +07}
+    {575409600 25200 1 +06}
     {591134400 21600 0 +06}
-    {606859200 25200 1 +07}
+    {606859200 25200 1 +06}
     {622584000 21600 0 +06}
-    {638308800 25200 1 +07}
+    {638308800 25200 1 +06}
     {654638400 21600 0 +06}
     {670363200 21600 1 +06}
     {684363600 18000 0 +05}
diff --git a/library/tzdata/Asia/Gaza b/library/tzdata/Asia/Gaza
index 1149d51..85b9f67 100644
--- a/library/tzdata/Asia/Gaza
+++ b/library/tzdata/Asia/Gaza
@@ -111,9 +111,9 @@ set TZData(:Asia/Gaza) {
     {1477692000 7200 0 EET}
     {1490396400 10800 1 EEST}
     {1509141600 7200 0 EET}
-    {1522450800 10800 1 EEST}
+    {1521846000 10800 1 EEST}
     {1540591200 7200 0 EET}
-    {1553900400 10800 1 EEST}
+    {1553295600 10800 1 EEST}
     {1572040800 7200 0 EET}
     {1585350000 10800 1 EEST}
     {1604095200 7200 0 EET}
@@ -123,9 +123,9 @@ set TZData(:Asia/Gaza) {
     {1666994400 7200 0 EET}
     {1679698800 10800 1 EEST}
     {1698444000 7200 0 EET}
-    {1711753200 10800 1 EEST}
+    {1711148400 10800 1 EEST}
     {1729893600 7200 0 EET}
-    {1743202800 10800 1 EEST}
+    {1742598000 10800 1 EEST}
     {1761343200 7200 0 EET}
     {1774652400 10800 1 EEST}
     {1793397600 7200 0 EET}
@@ -133,11 +133,11 @@ set TZData(:Asia/Gaza) {
     {1824847200 7200 0 EET}
     {1837551600 10800 1 EEST}
     {1856296800 7200 0 EET}
-    {1869606000 10800 1 EEST}
+    {1869001200 10800 1 EEST}
     {1887746400 7200 0 EET}
-    {1901055600 10800 1 EEST}
+    {1900450800 10800 1 EEST}
     {1919196000 7200 0 EET}
-    {1932505200 10800 1 EEST}
+    {1931900400 10800 1 EEST}
     {1950645600 7200 0 EET}
     {1963954800 10800 1 EEST}
     {1982700000 7200 0 EET}
@@ -145,9 +145,9 @@ set TZData(:Asia/Gaza) {
     {2014149600 7200 0 EET}
     {2026854000 10800 1 EEST}
     {2045599200 7200 0 EET}
-    {2058908400 10800 1 EEST}
+    {2058303600 10800 1 EEST}
     {2077048800 7200 0 EET}
-    {2090358000 10800 1 EEST}
+    {2089753200 10800 1 EEST}
     {2108498400 7200 0 EET}
     {2121807600 10800 1 EEST}
     {2140552800 7200 0 EET}
@@ -155,11 +155,11 @@ set TZData(:Asia/Gaza) {
     {2172002400 7200 0 EET}
     {2184706800 10800 1 EEST}
     {2203452000 7200 0 EET}
-    {2216761200 10800 1 EEST}
+    {2216156400 10800 1 EEST}
     {2234901600 7200 0 EET}
-    {2248210800 10800 1 EEST}
+    {2247606000 10800 1 EEST}
     {2266351200 7200 0 EET}
-    {2279660400 10800 1 EEST}
+    {2279055600 10800 1 EEST}
     {2297800800 7200 0 EET}
     {2311110000 10800 1 EEST}
     {2329855200 7200 0 EET}
@@ -167,9 +167,9 @@ set TZData(:Asia/Gaza) {
     {2361304800 7200 0 EET}
     {2374009200 10800 1 EEST}
     {2392754400 7200 0 EET}
-    {2406063600 10800 1 EEST}
+    {2405458800 10800 1 EEST}
     {2424204000 7200 0 EET}
-    {2437513200 10800 1 EEST}
+    {2436908400 10800 1 EEST}
     {2455653600 7200 0 EET}
     {2468962800 10800 1 EEST}
     {2487708000 7200 0 EET}
@@ -179,9 +179,9 @@ set TZData(:Asia/Gaza) {
     {2550607200 7200 0 EET}
     {2563311600 10800 1 EEST}
     {2582056800 7200 0 EET}
-    {2595366000 10800 1 EEST}
+    {2594761200 10800 1 EEST}
     {2613506400 7200 0 EET}
-    {2626815600 10800 1 EEST}
+    {2626210800 10800 1 EEST}
     {2644956000 7200 0 EET}
     {2658265200 10800 1 EEST}
     {2677010400 7200 0 EET}
@@ -189,11 +189,11 @@ set TZData(:Asia/Gaza) {
     {2708460000 7200 0 EET}
     {2721164400 10800 1 EEST}
     {2739909600 7200 0 EET}
-    {2753218800 10800 1 EEST}
+    {2752614000 10800 1 EEST}
     {2771359200 7200 0 EET}
-    {2784668400 10800 1 EEST}
+    {2784063600 10800 1 EEST}
     {2802808800 7200 0 EET}
-    {2816118000 10800 1 EEST}
+    {2815513200 10800 1 EEST}
     {2834258400 7200 0 EET}
     {2847567600 10800 1 EEST}
     {2866312800 7200 0 EET}
@@ -201,9 +201,9 @@ set TZData(:Asia/Gaza) {
     {2897762400 7200 0 EET}
     {2910466800 10800 1 EEST}
     {2929212000 7200 0 EET}
-    {2942521200 10800 1 EEST}
+    {2941916400 10800 1 EEST}
     {2960661600 7200 0 EET}
-    {2973970800 10800 1 EEST}
+    {2973366000 10800 1 EEST}
     {2992111200 7200 0 EET}
     {3005420400 10800 1 EEST}
     {3024165600 7200 0 EET}
@@ -211,11 +211,11 @@ set TZData(:Asia/Gaza) {
     {3055615200 7200 0 EET}
     {3068319600 10800 1 EEST}
     {3087064800 7200 0 EET}
-    {3100374000 10800 1 EEST}
+    {3099769200 10800 1 EEST}
     {3118514400 7200 0 EET}
-    {3131823600 10800 1 EEST}
+    {3131218800 10800 1 EEST}
     {3149964000 7200 0 EET}
-    {3163273200 10800 1 EEST}
+    {3162668400 10800 1 EEST}
     {3181413600 7200 0 EET}
     {3194722800 10800 1 EEST}
     {3213468000 7200 0 EET}
@@ -223,9 +223,9 @@ set TZData(:Asia/Gaza) {
     {3244917600 7200 0 EET}
     {3257622000 10800 1 EEST}
     {3276367200 7200 0 EET}
-    {3289676400 10800 1 EEST}
+    {3289071600 10800 1 EEST}
     {3307816800 7200 0 EET}
-    {3321126000 10800 1 EEST}
+    {3320521200 10800 1 EEST}
     {3339266400 7200 0 EET}
     {3352575600 10800 1 EEST}
     {3371320800 7200 0 EET}
@@ -235,9 +235,9 @@ set TZData(:Asia/Gaza) {
     {3434220000 7200 0 EET}
     {3446924400 10800 1 EEST}
     {3465669600 7200 0 EET}
-    {3478978800 10800 1 EEST}
+    {3478374000 10800 1 EEST}
     {3497119200 7200 0 EET}
-    {3510428400 10800 1 EEST}
+    {3509823600 10800 1 EEST}
     {3528568800 7200 0 EET}
     {3541878000 10800 1 EEST}
     {3560623200 7200 0 EET}
@@ -245,11 +245,11 @@ set TZData(:Asia/Gaza) {
     {3592072800 7200 0 EET}
     {3604777200 10800 1 EEST}
     {3623522400 7200 0 EET}
-    {3636831600 10800 1 EEST}
+    {3636226800 10800 1 EEST}
     {3654972000 7200 0 EET}
-    {3668281200 10800 1 EEST}
+    {3667676400 10800 1 EEST}
     {3686421600 7200 0 EET}
-    {3699730800 10800 1 EEST}
+    {3699126000 10800 1 EEST}
     {3717871200 7200 0 EET}
     {3731180400 10800 1 EEST}
     {3749925600 7200 0 EET}
@@ -257,9 +257,9 @@ set TZData(:Asia/Gaza) {
     {3781375200 7200 0 EET}
     {3794079600 10800 1 EEST}
     {3812824800 7200 0 EET}
-    {3826134000 10800 1 EEST}
+    {3825529200 10800 1 EEST}
     {3844274400 7200 0 EET}
-    {3857583600 10800 1 EEST}
+    {3856978800 10800 1 EEST}
     {3875724000 7200 0 EET}
     {3889033200 10800 1 EEST}
     {3907778400 7200 0 EET}
@@ -267,11 +267,11 @@ set TZData(:Asia/Gaza) {
     {3939228000 7200 0 EET}
     {3951932400 10800 1 EEST}
     {3970677600 7200 0 EET}
-    {3983986800 10800 1 EEST}
+    {3983382000 10800 1 EEST}
     {4002127200 7200 0 EET}
-    {4015436400 10800 1 EEST}
+    {4014831600 10800 1 EEST}
     {4033576800 7200 0 EET}
-    {4046886000 10800 1 EEST}
+    {4046281200 10800 1 EEST}
     {4065026400 7200 0 EET}
     {4078335600 10800 1 EEST}
     {4097080800 7200 0 EET}
diff --git a/library/tzdata/Asia/Hebron b/library/tzdata/Asia/Hebron
index 5d312b8..c0f5447 100644
--- a/library/tzdata/Asia/Hebron
+++ b/library/tzdata/Asia/Hebron
@@ -110,9 +110,9 @@ set TZData(:Asia/Hebron) {
     {1477692000 7200 0 EET}
     {1490396400 10800 1 EEST}
     {1509141600 7200 0 EET}
-    {1522450800 10800 1 EEST}
+    {1521846000 10800 1 EEST}
     {1540591200 7200 0 EET}
-    {1553900400 10800 1 EEST}
+    {1553295600 10800 1 EEST}
     {1572040800 7200 0 EET}
     {1585350000 10800 1 EEST}
     {1604095200 7200 0 EET}
@@ -122,9 +122,9 @@ set TZData(:Asia/Hebron) {
     {1666994400 7200 0 EET}
     {1679698800 10800 1 EEST}
     {1698444000 7200 0 EET}
-    {1711753200 10800 1 EEST}
+    {1711148400 10800 1 EEST}
     {1729893600 7200 0 EET}
-    {1743202800 10800 1 EEST}
+    {1742598000 10800 1 EEST}
     {1761343200 7200 0 EET}
     {1774652400 10800 1 EEST}
     {1793397600 7200 0 EET}
@@ -132,11 +132,11 @@ set TZData(:Asia/Hebron) {
     {1824847200 7200 0 EET}
     {1837551600 10800 1 EEST}
     {1856296800 7200 0 EET}
-    {1869606000 10800 1 EEST}
+    {1869001200 10800 1 EEST}
     {1887746400 7200 0 EET}
-    {1901055600 10800 1 EEST}
+    {1900450800 10800 1 EEST}
     {1919196000 7200 0 EET}
-    {1932505200 10800 1 EEST}
+    {1931900400 10800 1 EEST}
     {1950645600 7200 0 EET}
     {1963954800 10800 1 EEST}
     {1982700000 7200 0 EET}
@@ -144,9 +144,9 @@ set TZData(:Asia/Hebron) {
     {2014149600 7200 0 EET}
     {2026854000 10800 1 EEST}
     {2045599200 7200 0 EET}
-    {2058908400 10800 1 EEST}
+    {2058303600 10800 1 EEST}
     {2077048800 7200 0 EET}
-    {2090358000 10800 1 EEST}
+    {2089753200 10800 1 EEST}
     {2108498400 7200 0 EET}
     {2121807600 10800 1 EEST}
     {2140552800 7200 0 EET}
@@ -154,11 +154,11 @@ set TZData(:Asia/Hebron) {
     {2172002400 7200 0 EET}
     {2184706800 10800 1 EEST}
     {2203452000 7200 0 EET}
-    {2216761200 10800 1 EEST}
+    {2216156400 10800 1 EEST}
     {2234901600 7200 0 EET}
-    {2248210800 10800 1 EEST}
+    {2247606000 10800 1 EEST}
     {2266351200 7200 0 EET}
-    {2279660400 10800 1 EEST}
+    {2279055600 10800 1 EEST}
     {2297800800 7200 0 EET}
     {2311110000 10800 1 EEST}
     {2329855200 7200 0 EET}
@@ -166,9 +166,9 @@ set TZData(:Asia/Hebron) {
     {2361304800 7200 0 EET}
     {2374009200 10800 1 EEST}
     {2392754400 7200 0 EET}
-    {2406063600 10800 1 EEST}
+    {2405458800 10800 1 EEST}
     {2424204000 7200 0 EET}
-    {2437513200 10800 1 EEST}
+    {2436908400 10800 1 EEST}
     {2455653600 7200 0 EET}
     {2468962800 10800 1 EEST}
     {2487708000 7200 0 EET}
@@ -178,9 +178,9 @@ set TZData(:Asia/Hebron) {
     {2550607200 7200 0 EET}
     {2563311600 10800 1 EEST}
     {2582056800 7200 0 EET}
-    {2595366000 10800 1 EEST}
+    {2594761200 10800 1 EEST}
     {2613506400 7200 0 EET}
-    {2626815600 10800 1 EEST}
+    {2626210800 10800 1 EEST}
     {2644956000 7200 0 EET}
     {2658265200 10800 1 EEST}
     {2677010400 7200 0 EET}
@@ -188,11 +188,11 @@ set TZData(:Asia/Hebron) {
     {2708460000 7200 0 EET}
     {2721164400 10800 1 EEST}
     {2739909600 7200 0 EET}
-    {2753218800 10800 1 EEST}
+    {2752614000 10800 1 EEST}
     {2771359200 7200 0 EET}
-    {2784668400 10800 1 EEST}
+    {2784063600 10800 1 EEST}
     {2802808800 7200 0 EET}
-    {2816118000 10800 1 EEST}
+    {2815513200 10800 1 EEST}
     {2834258400 7200 0 EET}
     {2847567600 10800 1 EEST}
     {2866312800 7200 0 EET}
@@ -200,9 +200,9 @@ set TZData(:Asia/Hebron) {
     {2897762400 7200 0 EET}
     {2910466800 10800 1 EEST}
     {2929212000 7200 0 EET}
-    {2942521200 10800 1 EEST}
+    {2941916400 10800 1 EEST}
     {2960661600 7200 0 EET}
-    {2973970800 10800 1 EEST}
+    {2973366000 10800 1 EEST}
     {2992111200 7200 0 EET}
     {3005420400 10800 1 EEST}
     {3024165600 7200 0 EET}
@@ -210,11 +210,11 @@ set TZData(:Asia/Hebron) {
     {3055615200 7200 0 EET}
     {3068319600 10800 1 EEST}
     {3087064800 7200 0 EET}
-    {3100374000 10800 1 EEST}
+    {3099769200 10800 1 EEST}
     {3118514400 7200 0 EET}
-    {3131823600 10800 1 EEST}
+    {3131218800 10800 1 EEST}
     {3149964000 7200 0 EET}
-    {3163273200 10800 1 EEST}
+    {3162668400 10800 1 EEST}
     {3181413600 7200 0 EET}
     {3194722800 10800 1 EEST}
     {3213468000 7200 0 EET}
@@ -222,9 +222,9 @@ set TZData(:Asia/Hebron) {
     {3244917600 7200 0 EET}
     {3257622000 10800 1 EEST}
     {3276367200 7200 0 EET}
-    {3289676400 10800 1 EEST}
+    {3289071600 10800 1 EEST}
     {3307816800 7200 0 EET}
-    {3321126000 10800 1 EEST}
+    {3320521200 10800 1 EEST}
     {3339266400 7200 0 EET}
     {3352575600 10800 1 EEST}
     {3371320800 7200 0 EET}
@@ -234,9 +234,9 @@ set TZData(:Asia/Hebron) {
     {3434220000 7200 0 EET}
     {3446924400 10800 1 EEST}
     {3465669600 7200 0 EET}
-    {3478978800 10800 1 EEST}
+    {3478374000 10800 1 EEST}
     {3497119200 7200 0 EET}
-    {3510428400 10800 1 EEST}
+    {3509823600 10800 1 EEST}
     {3528568800 7200 0 EET}
     {3541878000 10800 1 EEST}
     {3560623200 7200 0 EET}
@@ -244,11 +244,11 @@ set TZData(:Asia/Hebron) {
     {3592072800 7200 0 EET}
     {3604777200 10800 1 EEST}
     {3623522400 7200 0 EET}
-    {3636831600 10800 1 EEST}
+    {3636226800 10800 1 EEST}
     {3654972000 7200 0 EET}
-    {3668281200 10800 1 EEST}
+    {3667676400 10800 1 EEST}
     {3686421600 7200 0 EET}
-    {3699730800 10800 1 EEST}
+    {3699126000 10800 1 EEST}
     {3717871200 7200 0 EET}
     {3731180400 10800 1 EEST}
     {3749925600 7200 0 EET}
@@ -256,9 +256,9 @@ set TZData(:Asia/Hebron) {
     {3781375200 7200 0 EET}
     {3794079600 10800 1 EEST}
     {3812824800 7200 0 EET}
-    {3826134000 10800 1 EEST}
+    {3825529200 10800 1 EEST}
     {3844274400 7200 0 EET}
-    {3857583600 10800 1 EEST}
+    {3856978800 10800 1 EEST}
     {3875724000 7200 0 EET}
     {3889033200 10800 1 EEST}
     {3907778400 7200 0 EET}
@@ -266,11 +266,11 @@ set TZData(:Asia/Hebron) {
     {3939228000 7200 0 EET}
     {3951932400 10800 1 EEST}
     {3970677600 7200 0 EET}
-    {3983986800 10800 1 EEST}
+    {3983382000 10800 1 EEST}
     {4002127200 7200 0 EET}
-    {4015436400 10800 1 EEST}
+    {4014831600 10800 1 EEST}
     {4033576800 7200 0 EET}
-    {4046886000 10800 1 EEST}
+    {4046281200 10800 1 EEST}
     {4065026400 7200 0 EET}
     {4078335600 10800 1 EEST}
     {4097080800 7200 0 EET}
diff --git a/library/tzdata/Asia/Hovd b/library/tzdata/Asia/Hovd
index a9c995b..9b14d5b 100644
--- a/library/tzdata/Asia/Hovd
+++ b/library/tzdata/Asia/Hovd
@@ -4,52 +4,52 @@ set TZData(:Asia/Hovd) {
     {-9223372036854775808 21996 0 LMT}
     {-2032927596 21600 0 +06}
     {252439200 25200 0 +07}
-    {417978000 28800 1 +08}
+    {417978000 28800 1 +07}
     {433785600 25200 0 +07}
-    {449600400 28800 1 +08}
+    {449600400 28800 1 +07}
     {465321600 25200 0 +07}
-    {481050000 28800 1 +08}
+    {481050000 28800 1 +07}
     {496771200 25200 0 +07}
-    {512499600 28800 1 +08}
+    {512499600 28800 1 +07}
     {528220800 25200 0 +07}
-    {543949200 28800 1 +08}
+    {543949200 28800 1 +07}
     {559670400 25200 0 +07}
-    {575398800 28800 1 +08}
+    {575398800 28800 1 +07}
     {591120000 25200 0 +07}
-    {606848400 28800 1 +08}
+    {606848400 28800 1 +07}
     {622569600 25200 0 +07}
-    {638298000 28800 1 +08}
+    {638298000 28800 1 +07}
     {654624000 25200 0 +07}
-    {670352400 28800 1 +08}
+    {670352400 28800 1 +07}
     {686073600 25200 0 +07}
-    {701802000 28800 1 +08}
+    {701802000 28800 1 +07}
     {717523200 25200 0 +07}
-    {733251600 28800 1 +08}
+    {733251600 28800 1 +07}
     {748972800 25200 0 +07}
-    {764701200 28800 1 +08}
+    {764701200 28800 1 +07}
     {780422400 25200 0 +07}
-    {796150800 28800 1 +08}
+    {796150800 28800 1 +07}
     {811872000 25200 0 +07}
-    {828205200 28800 1 +08}
+    {828205200 28800 1 +07}
     {843926400 25200 0 +07}
-    {859654800 28800 1 +08}
+    {859654800 28800 1 +07}
     {875376000 25200 0 +07}
-    {891104400 28800 1 +08}
+    {891104400 28800 1 +07}
     {906825600 25200 0 +07}
-    {988398000 28800 1 +08}
+    {988398000 28800 1 +07}
     {1001700000 25200 0 +07}
-    {1017428400 28800 1 +08}
+    {1017428400 28800 1 +07}
     {1033149600 25200 0 +07}
-    {1048878000 28800 1 +08}
+    {1048878000 28800 1 +07}
     {1064599200 25200 0 +07}
-    {1080327600 28800 1 +08}
+    {1080327600 28800 1 +07}
     {1096048800 25200 0 +07}
-    {1111777200 28800 1 +08}
+    {1111777200 28800 1 +07}
     {1127498400 25200 0 +07}
-    {1143226800 28800 1 +08}
+    {1143226800 28800 1 +07}
     {1159552800 25200 0 +07}
-    {1427482800 28800 1 +08}
+    {1427482800 28800 1 +07}
     {1443196800 25200 0 +07}
-    {1458932400 28800 1 +08}
+    {1458932400 28800 1 +07}
     {1474646400 25200 0 +07}
 }
diff --git a/library/tzdata/Asia/Kuching b/library/tzdata/Asia/Kuching
index d6f5ad4..e5dc1b7 100644
--- a/library/tzdata/Asia/Kuching
+++ b/library/tzdata/Asia/Kuching
@@ -4,19 +4,19 @@ set TZData(:Asia/Kuching) {
     {-9223372036854775808 26480 0 LMT}
     {-1383463280 27000 0 +0730}
     {-1167636600 28800 0 +08}
-    {-1082448000 30000 1 +0820}
+    {-1082448000 30000 1 +08}
     {-1074586800 28800 0 +08}
-    {-1050825600 30000 1 +0820}
+    {-1050825600 30000 1 +08}
     {-1042964400 28800 0 +08}
-    {-1019289600 30000 1 +0820}
+    {-1019289600 30000 1 +08}
     {-1011428400 28800 0 +08}
-    {-987753600 30000 1 +0820}
+    {-987753600 30000 1 +08}
     {-979892400 28800 0 +08}
-    {-956217600 30000 1 +0820}
+    {-956217600 30000 1 +08}
     {-948356400 28800 0 +08}
-    {-924595200 30000 1 +0820}
+    {-924595200 30000 1 +08}
     {-916734000 28800 0 +08}
-    {-893059200 30000 1 +0820}
+    {-893059200 30000 1 +08}
     {-885198000 28800 0 +08}
     {-879667200 32400 0 +09}
     {-767005200 28800 0 +08}
diff --git a/library/tzdata/Asia/Macau b/library/tzdata/Asia/Macau
index 8458a8a..76a00aa 100644
--- a/library/tzdata/Asia/Macau
+++ b/library/tzdata/Asia/Macau
@@ -2,7 +2,7 @@
 
 set TZData(:Asia/Macau) {
     {-9223372036854775808 27260 0 LMT}
-    {-1830411260 28800 0 CST}
+    {-1830412800 28800 0 CST}
     {-277360200 32400 1 CDT}
     {-257405400 28800 0 CST}
     {-245910600 32400 1 CDT}
diff --git a/library/tzdata/Asia/Manila b/library/tzdata/Asia/Manila
index 987919a..b7ffa7a 100644
--- a/library/tzdata/Asia/Manila
+++ b/library/tzdata/Asia/Manila
@@ -4,12 +4,12 @@ set TZData(:Asia/Manila) {
     {-9223372036854775808 -57360 0 LMT}
     {-3944621040 29040 0 LMT}
     {-2229321840 28800 0 +08}
-    {-1046678400 32400 1 +09}
+    {-1046678400 32400 1 +08}
     {-1038733200 28800 0 +08}
     {-873273600 32400 0 +09}
     {-794221200 28800 0 +08}
-    {-496224000 32400 1 +09}
+    {-496224000 32400 1 +08}
     {-489315600 28800 0 +08}
-    {259344000 32400 1 +09}
+    {259344000 32400 1 +08}
     {275151600 28800 0 +08}
 }
diff --git a/library/tzdata/Asia/Oral b/library/tzdata/Asia/Oral
index 624a59d..e781b60 100644
--- a/library/tzdata/Asia/Oral
+++ b/library/tzdata/Asia/Oral
@@ -7,52 +7,52 @@ set TZData(:Asia/Oral) {
     {354913200 21600 1 +06}
     {370720800 21600 0 +06}
     {386445600 18000 0 +05}
-    {386449200 21600 1 +06}
+    {386449200 21600 1 +05}
     {402256800 18000 0 +05}
-    {417985200 21600 1 +06}
+    {417985200 21600 1 +05}
     {433792800 18000 0 +05}
-    {449607600 21600 1 +06}
+    {449607600 21600 1 +05}
     {465339600 18000 0 +05}
-    {481064400 21600 1 +06}
+    {481064400 21600 1 +05}
     {496789200 18000 0 +05}
-    {512514000 21600 1 +06}
+    {512514000 21600 1 +05}
     {528238800 18000 0 +05}
-    {543963600 21600 1 +06}
+    {543963600 21600 1 +05}
     {559688400 18000 0 +05}
-    {575413200 21600 1 +06}
+    {575413200 21600 1 +05}
     {591138000 18000 0 +05}
     {606862800 14400 0 +04}
-    {606866400 18000 1 +05}
+    {606866400 18000 1 +04}
     {622591200 14400 0 +04}
-    {638316000 18000 1 +05}
+    {638316000 18000 1 +04}
     {654645600 14400 0 +04}
-    {670370400 18000 1 +05}
+    {670370400 18000 1 +04}
     {686095200 14400 0 +04}
     {701816400 14400 0 +04}
-    {701820000 18000 1 +05}
+    {701820000 18000 1 +04}
     {717544800 14400 0 +04}
-    {733269600 18000 1 +05}
+    {733269600 18000 1 +04}
     {748994400 14400 0 +04}
-    {764719200 18000 1 +05}
+    {764719200 18000 1 +04}
     {780444000 14400 0 +04}
-    {796168800 18000 1 +05}
+    {796168800 18000 1 +04}
     {811893600 14400 0 +04}
-    {828223200 18000 1 +05}
+    {828223200 18000 1 +04}
     {846367200 14400 0 +04}
-    {859672800 18000 1 +05}
+    {859672800 18000 1 +04}
     {877816800 14400 0 +04}
-    {891122400 18000 1 +05}
+    {891122400 18000 1 +04}
     {909266400 14400 0 +04}
-    {922572000 18000 1 +05}
+    {922572000 18000 1 +04}
     {941320800 14400 0 +04}
-    {954021600 18000 1 +05}
+    {954021600 18000 1 +04}
     {972770400 14400 0 +04}
-    {985471200 18000 1 +05}
+    {985471200 18000 1 +04}
     {1004220000 14400 0 +04}
-    {1017525600 18000 1 +05}
+    {1017525600 18000 1 +04}
     {1035669600 14400 0 +04}
-    {1048975200 18000 1 +05}
+    {1048975200 18000 1 +04}
     {1067119200 14400 0 +04}
-    {1080424800 18000 1 +05}
+    {1080424800 18000 1 +04}
     {1099173600 18000 0 +05}
 }
diff --git a/library/tzdata/Asia/Qyzylorda b/library/tzdata/Asia/Qyzylorda
index b2e9472..7c6df32 100644
--- a/library/tzdata/Asia/Qyzylorda
+++ b/library/tzdata/Asia/Qyzylorda
@@ -7,51 +7,51 @@ set TZData(:Asia/Qyzylorda) {
     {354913200 21600 1 +06}
     {370720800 21600 0 +06}
     {386445600 18000 0 +05}
-    {386449200 21600 1 +06}
+    {386449200 21600 1 +05}
     {402256800 18000 0 +05}
-    {417985200 21600 1 +06}
+    {417985200 21600 1 +05}
     {433792800 18000 0 +05}
-    {449607600 21600 1 +06}
+    {449607600 21600 1 +05}
     {465339600 18000 0 +05}
-    {481064400 21600 1 +06}
+    {481064400 21600 1 +05}
     {496789200 18000 0 +05}
-    {512514000 21600 1 +06}
+    {512514000 21600 1 +05}
     {528238800 18000 0 +05}
-    {543963600 21600 1 +06}
+    {543963600 21600 1 +05}
     {559688400 18000 0 +05}
-    {575413200 21600 1 +06}
+    {575413200 21600 1 +05}
     {591138000 18000 0 +05}
-    {606862800 21600 1 +06}
+    {606862800 21600 1 +05}
     {622587600 18000 0 +05}
-    {638312400 21600 1 +06}
+    {638312400 21600 1 +05}
     {654642000 18000 0 +05}
     {670366800 14400 0 +04}
-    {670370400 18000 1 +05}
+    {670370400 18000 1 +04}
     {701812800 18000 0 +05}
-    {701816400 21600 1 +06}
+    {701816400 21600 1 +05}
     {717541200 18000 0 +05}
-    {733266000 21600 1 +06}
+    {733266000 21600 1 +05}
     {748990800 18000 0 +05}
-    {764715600 21600 1 +06}
+    {764715600 21600 1 +05}
     {780440400 18000 0 +05}
-    {796165200 21600 1 +06}
+    {796165200 21600 1 +05}
     {811890000 18000 0 +05}
-    {828219600 21600 1 +06}
+    {828219600 21600 1 +05}
     {846363600 18000 0 +05}
-    {859669200 21600 1 +06}
+    {859669200 21600 1 +05}
     {877813200 18000 0 +05}
-    {891118800 21600 1 +06}
+    {891118800 21600 1 +05}
     {909262800 18000 0 +05}
-    {922568400 21600 1 +06}
+    {922568400 21600 1 +05}
     {941317200 18000 0 +05}
-    {954018000 21600 1 +06}
+    {954018000 21600 1 +05}
     {972766800 18000 0 +05}
-    {985467600 21600 1 +06}
+    {985467600 21600 1 +05}
     {1004216400 18000 0 +05}
-    {1017522000 21600 1 +06}
+    {1017522000 21600 1 +05}
     {1035666000 18000 0 +05}
-    {1048971600 21600 1 +06}
+    {1048971600 21600 1 +05}
     {1067115600 18000 0 +05}
-    {1080421200 21600 1 +06}
+    {1080421200 21600 1 +05}
     {1099170000 21600 0 +06}
 }
diff --git a/library/tzdata/Asia/Samarkand b/library/tzdata/Asia/Samarkand
index 43ad774..805bab7 100644
--- a/library/tzdata/Asia/Samarkand
+++ b/library/tzdata/Asia/Samarkand
@@ -7,25 +7,25 @@ set TZData(:Asia/Samarkand) {
     {354913200 21600 1 +06}
     {370720800 21600 0 +06}
     {386445600 18000 0 +05}
-    {386449200 21600 1 +06}
+    {386449200 21600 1 +05}
     {402256800 18000 0 +05}
-    {417985200 21600 1 +06}
+    {417985200 21600 1 +05}
     {433792800 18000 0 +05}
-    {449607600 21600 1 +06}
+    {449607600 21600 1 +05}
     {465339600 18000 0 +05}
-    {481064400 21600 1 +06}
+    {481064400 21600 1 +05}
     {496789200 18000 0 +05}
-    {512514000 21600 1 +06}
+    {512514000 21600 1 +05}
     {528238800 18000 0 +05}
-    {543963600 21600 1 +06}
+    {543963600 21600 1 +05}
     {559688400 18000 0 +05}
-    {575413200 21600 1 +06}
+    {575413200 21600 1 +05}
     {591138000 18000 0 +05}
-    {606862800 21600 1 +06}
+    {606862800 21600 1 +05}
     {622587600 18000 0 +05}
-    {638312400 21600 1 +06}
+    {638312400 21600 1 +05}
     {654642000 18000 0 +05}
-    {670366800 21600 1 +06}
+    {670366800 21600 1 +05}
     {686091600 18000 0 +05}
     {694206000 18000 0 +05}
 }
diff --git a/library/tzdata/Asia/Tashkent b/library/tzdata/Asia/Tashkent
index 7b6abe4..bd16c91 100644
--- a/library/tzdata/Asia/Tashkent
+++ b/library/tzdata/Asia/Tashkent
@@ -4,28 +4,28 @@ set TZData(:Asia/Tashkent) {
     {-9223372036854775808 16631 0 LMT}
     {-1441168631 18000 0 +05}
     {-1247547600 21600 0 +06}
-    {354909600 25200 1 +07}
+    {354909600 25200 1 +06}
     {370717200 21600 0 +06}
-    {386445600 25200 1 +07}
+    {386445600 25200 1 +06}
     {402253200 21600 0 +06}
-    {417981600 25200 1 +07}
+    {417981600 25200 1 +06}
     {433789200 21600 0 +06}
-    {449604000 25200 1 +07}
+    {449604000 25200 1 +06}
     {465336000 21600 0 +06}
-    {481060800 25200 1 +07}
+    {481060800 25200 1 +06}
     {496785600 21600 0 +06}
-    {512510400 25200 1 +07}
+    {512510400 25200 1 +06}
     {528235200 21600 0 +06}
-    {543960000 25200 1 +07}
+    {543960000 25200 1 +06}
     {559684800 21600 0 +06}
-    {575409600 25200 1 +07}
+    {575409600 25200 1 +06}
     {591134400 21600 0 +06}
-    {606859200 25200 1 +07}
+    {606859200 25200 1 +06}
     {622584000 21600 0 +06}
-    {638308800 25200 1 +07}
+    {638308800 25200 1 +06}
     {654638400 21600 0 +06}
     {670363200 18000 0 +05}
-    {670366800 21600 1 +06}
+    {670366800 21600 1 +05}
     {686091600 18000 0 +05}
     {694206000 18000 0 +05}
 }
diff --git a/library/tzdata/Asia/Tbilisi b/library/tzdata/Asia/Tbilisi
index 60d253c..71e7695 100644
--- a/library/tzdata/Asia/Tbilisi
+++ b/library/tzdata/Asia/Tbilisi
@@ -5,56 +5,56 @@ set TZData(:Asia/Tbilisi) {
     {-2840151551 10751 0 TBMT}
     {-1441162751 10800 0 +03}
     {-405140400 14400 0 +04}
-    {354916800 18000 1 +05}
+    {354916800 18000 1 +04}
     {370724400 14400 0 +04}
-    {386452800 18000 1 +05}
+    {386452800 18000 1 +04}
     {402260400 14400 0 +04}
-    {417988800 18000 1 +05}
+    {417988800 18000 1 +04}
     {433796400 14400 0 +04}
-    {449611200 18000 1 +05}
+    {449611200 18000 1 +04}
     {465343200 14400 0 +04}
-    {481068000 18000 1 +05}
+    {481068000 18000 1 +04}
     {496792800 14400 0 +04}
-    {512517600 18000 1 +05}
+    {512517600 18000 1 +04}
     {528242400 14400 0 +04}
-    {543967200 18000 1 +05}
+    {543967200 18000 1 +04}
     {559692000 14400 0 +04}
-    {575416800 18000 1 +05}
+    {575416800 18000 1 +04}
     {591141600 14400 0 +04}
-    {606866400 18000 1 +05}
+    {606866400 18000 1 +04}
     {622591200 14400 0 +04}
-    {638316000 18000 1 +05}
+    {638316000 18000 1 +04}
     {654645600 14400 0 +04}
     {670370400 10800 0 +03}
-    {670374000 14400 1 +04}
+    {670374000 14400 1 +03}
     {686098800 10800 0 +03}
     {694213200 10800 0 +03}
-    {701816400 14400 1 +04}
+    {701816400 14400 1 +03}
     {717537600 10800 0 +03}
-    {733266000 14400 1 +04}
+    {733266000 14400 1 +03}
     {748987200 10800 0 +03}
-    {764715600 14400 1 +04}
+    {764715600 14400 1 +03}
     {780440400 14400 0 +04}
-    {796161600 18000 1 +05}
+    {796161600 18000 1 +04}
     {811882800 14400 0 +04}
-    {828216000 18000 1 +05}
+    {828216000 18000 1 +04}
     {846360000 18000 1 +05}
-    {859662000 18000 0 +05}
+    {859662000 18000 0 +04}
     {877806000 14400 0 +04}
-    {891115200 18000 1 +05}
+    {891115200 18000 1 +04}
     {909255600 14400 0 +04}
-    {922564800 18000 1 +05}
+    {922564800 18000 1 +04}
     {941310000 14400 0 +04}
-    {954014400 18000 1 +05}
+    {954014400 18000 1 +04}
     {972759600 14400 0 +04}
-    {985464000 18000 1 +05}
+    {985464000 18000 1 +04}
     {1004209200 14400 0 +04}
-    {1017518400 18000 1 +05}
+    {1017518400 18000 1 +04}
     {1035658800 14400 0 +04}
-    {1048968000 18000 1 +05}
+    {1048968000 18000 1 +04}
     {1067108400 14400 0 +04}
-    {1080417600 18000 1 +05}
-    {1088280000 14400 0 +04}
+    {1080417600 18000 1 +04}
+    {1088280000 14400 0 +03}
     {1099177200 10800 0 +03}
     {1111878000 14400 0 +04}
 }
diff --git a/library/tzdata/Asia/Tehran b/library/tzdata/Asia/Tehran
index a8912ce..3d44e42 100644
--- a/library/tzdata/Asia/Tehran
+++ b/library/tzdata/Asia/Tehran
@@ -4,226 +4,226 @@ set TZData(:Asia/Tehran) {
     {-9223372036854775808 12344 0 LMT}
     {-1704165944 12344 0 TMT}
     {-757394744 12600 0 +0330}
-    {247177800 14400 0 +05}
-    {259272000 18000 1 +05}
-    {277758000 14400 0 +05}
-    {283982400 12600 0 +0430}
-    {290809800 16200 1 +0430}
-    {306531000 12600 0 +0430}
-    {322432200 16200 1 +0430}
-    {338499000 12600 0 +0430}
-    {673216200 16200 1 +0430}
-    {685481400 12600 0 +0430}
-    {701209800 16200 1 +0430}
-    {717103800 12600 0 +0430}
-    {732745800 16200 1 +0430}
-    {748639800 12600 0 +0430}
-    {764281800 16200 1 +0430}
-    {780175800 12600 0 +0430}
-    {795817800 16200 1 +0430}
-    {811711800 12600 0 +0430}
-    {827353800 16200 1 +0430}
-    {843247800 12600 0 +0430}
-    {858976200 16200 1 +0430}
-    {874870200 12600 0 +0430}
-    {890512200 16200 1 +0430}
-    {906406200 12600 0 +0430}
-    {922048200 16200 1 +0430}
-    {937942200 12600 0 +0430}
-    {953584200 16200 1 +0430}
-    {969478200 12600 0 +0430}
-    {985206600 16200 1 +0430}
-    {1001100600 12600 0 +0430}
-    {1016742600 16200 1 +0430}
-    {1032636600 12600 0 +0430}
-    {1048278600 16200 1 +0430}
-    {1064172600 12600 0 +0430}
-    {1079814600 16200 1 +0430}
-    {1095708600 12600 0 +0430}
-    {1111437000 16200 1 +0430}
-    {1127331000 12600 0 +0430}
-    {1206045000 16200 1 +0430}
-    {1221939000 12600 0 +0430}
-    {1237667400 16200 1 +0430}
-    {1253561400 12600 0 +0430}
-    {1269203400 16200 1 +0430}
-    {1285097400 12600 0 +0430}
-    {1300739400 16200 1 +0430}
-    {1316633400 12600 0 +0430}
-    {1332275400 16200 1 +0430}
-    {1348169400 12600 0 +0430}
-    {1363897800 16200 1 +0430}
-    {1379791800 12600 0 +0430}
-    {1395433800 16200 1 +0430}
-    {1411327800 12600 0 +0430}
-    {1426969800 16200 1 +0430}
-    {1442863800 12600 0 +0430}
-    {1458505800 16200 1 +0430}
-    {1474399800 12600 0 +0430}
-    {1490128200 16200 1 +0430}
-    {1506022200 12600 0 +0430}
-    {1521664200 16200 1 +0430}
-    {1537558200 12600 0 +0430}
-    {1553200200 16200 1 +0430}
-    {1569094200 12600 0 +0430}
-    {1584736200 16200 1 +0430}
-    {1600630200 12600 0 +0430}
-    {1616358600 16200 1 +0430}
-    {1632252600 12600 0 +0430}
-    {1647894600 16200 1 +0430}
-    {1663788600 12600 0 +0430}
-    {1679430600 16200 1 +0430}
-    {1695324600 12600 0 +0430}
-    {1710966600 16200 1 +0430}
-    {1726860600 12600 0 +0430}
-    {1742589000 16200 1 +0430}
-    {1758483000 12600 0 +0430}
-    {1774125000 16200 1 +0430}
-    {1790019000 12600 0 +0430}
-    {1805661000 16200 1 +0430}
-    {1821555000 12600 0 +0430}
-    {1837197000 16200 1 +0430}
-    {1853091000 12600 0 +0430}
-    {1868733000 16200 1 +0430}
-    {1884627000 12600 0 +0430}
-    {1900355400 16200 1 +0430}
-    {1916249400 12600 0 +0430}
-    {1931891400 16200 1 +0430}
-    {1947785400 12600 0 +0430}
-    {1963427400 16200 1 +0430}
-    {1979321400 12600 0 +0430}
-    {1994963400 16200 1 +0430}
-    {2010857400 12600 0 +0430}
-    {2026585800 16200 1 +0430}
-    {2042479800 12600 0 +0430}
-    {2058121800 16200 1 +0430}
-    {2074015800 12600 0 +0430}
-    {2089657800 16200 1 +0430}
-    {2105551800 12600 0 +0430}
-    {2121193800 16200 1 +0430}
-    {2137087800 12600 0 +0430}
-    {2152729800 16200 1 +0430}
-    {2168623800 12600 0 +0430}
-    {2184265800 16200 1 +0430}
-    {2200159800 12600 0 +0430}
-    {2215888200 16200 1 +0430}
-    {2231782200 12600 0 +0430}
-    {2247424200 16200 1 +0430}
-    {2263318200 12600 0 +0430}
-    {2278960200 16200 1 +0430}
-    {2294854200 12600 0 +0430}
-    {2310496200 16200 1 +0430}
-    {2326390200 12600 0 +0430}
-    {2342118600 16200 1 +0430}
-    {2358012600 12600 0 +0430}
-    {2373654600 16200 1 +0430}
-    {2389548600 12600 0 +0430}
-    {2405190600 16200 1 +0430}
-    {2421084600 12600 0 +0430}
-    {2436726600 16200 1 +0430}
-    {2452620600 12600 0 +0430}
-    {2468349000 16200 1 +0430}
-    {2484243000 12600 0 +0430}
-    {2499885000 16200 1 +0430}
-    {2515779000 12600 0 +0430}
-    {2531421000 16200 1 +0430}
-    {2547315000 12600 0 +0430}
-    {2562957000 16200 1 +0430}
-    {2578851000 12600 0 +0430}
-    {2594579400 16200 1 +0430}
-    {2610473400 12600 0 +0430}
-    {2626115400 16200 1 +0430}
-    {2642009400 12600 0 +0430}
-    {2657651400 16200 1 +0430}
-    {2673545400 12600 0 +0430}
-    {2689187400 16200 1 +0430}
-    {2705081400 12600 0 +0430}
-    {2720809800 16200 1 +0430}
-    {2736703800 12600 0 +0430}
-    {2752345800 16200 1 +0430}
-    {2768239800 12600 0 +0430}
-    {2783881800 16200 1 +0430}
-    {2799775800 12600 0 +0430}
-    {2815417800 16200 1 +0430}
-    {2831311800 12600 0 +0430}
-    {2847040200 16200 1 +0430}
-    {2862934200 12600 0 +0430}
-    {2878576200 16200 1 +0430}
-    {2894470200 12600 0 +0430}
-    {2910112200 16200 1 +0430}
-    {2926006200 12600 0 +0430}
-    {2941648200 16200 1 +0430}
-    {2957542200 12600 0 +0430}
-    {2973270600 16200 1 +0430}
-    {2989164600 12600 0 +0430}
-    {3004806600 16200 1 +0430}
-    {3020700600 12600 0 +0430}
-    {3036342600 16200 1 +0430}
-    {3052236600 12600 0 +0430}
-    {3067878600 16200 1 +0430}
-    {3083772600 12600 0 +0430}
-    {3099501000 16200 1 +0430}
-    {3115395000 12600 0 +0430}
-    {3131037000 16200 1 +0430}
-    {3146931000 12600 0 +0430}
-    {3162573000 16200 1 +0430}
-    {3178467000 12600 0 +0430}
-    {3194109000 16200 1 +0430}
-    {3210003000 12600 0 +0430}
-    {3225731400 16200 1 +0430}
-    {3241625400 12600 0 +0430}
-    {3257267400 16200 1 +0430}
-    {3273161400 12600 0 +0430}
-    {3288803400 16200 1 +0430}
-    {3304697400 12600 0 +0430}
-    {3320339400 16200 1 +0430}
-    {3336233400 12600 0 +0430}
-    {3351961800 16200 1 +0430}
-    {3367855800 12600 0 +0430}
-    {3383497800 16200 1 +0430}
-    {3399391800 12600 0 +0430}
-    {3415033800 16200 1 +0430}
-    {3430927800 12600 0 +0430}
-    {3446569800 16200 1 +0430}
-    {3462463800 12600 0 +0430}
-    {3478192200 16200 1 +0430}
-    {3494086200 12600 0 +0430}
-    {3509728200 16200 1 +0430}
-    {3525622200 12600 0 +0430}
-    {3541264200 16200 1 +0430}
-    {3557158200 12600 0 +0430}
-    {3572800200 16200 1 +0430}
-    {3588694200 12600 0 +0430}
-    {3604422600 16200 1 +0430}
-    {3620316600 12600 0 +0430}
-    {3635958600 16200 1 +0430}
-    {3651852600 12600 0 +0430}
-    {3667494600 16200 1 +0430}
-    {3683388600 12600 0 +0430}
-    {3699030600 16200 1 +0430}
-    {3714924600 12600 0 +0430}
-    {3730653000 16200 1 +0430}
-    {3746547000 12600 0 +0430}
-    {3762189000 16200 1 +0430}
-    {3778083000 12600 0 +0430}
-    {3793725000 16200 1 +0430}
-    {3809619000 12600 0 +0430}
-    {3825261000 16200 1 +0430}
-    {3841155000 12600 0 +0430}
-    {3856883400 16200 1 +0430}
-    {3872777400 12600 0 +0430}
-    {3888419400 16200 1 +0430}
-    {3904313400 12600 0 +0430}
-    {3919955400 16200 1 +0430}
-    {3935849400 12600 0 +0430}
-    {3951491400 16200 1 +0430}
-    {3967385400 12600 0 +0430}
-    {3983113800 16200 1 +0430}
-    {3999007800 12600 0 +0430}
-    {4014649800 16200 1 +0430}
-    {4030543800 12600 0 +0430}
-    {4046185800 16200 1 +0430}
-    {4062079800 12600 0 +0430}
-    {4077721800 16200 1 +0430}
-    {4093615800 12600 0 +0430}
+    {247177800 14400 0 +04}
+    {259272000 18000 1 +04}
+    {277758000 14400 0 +04}
+    {283982400 12600 0 +0330}
+    {290809800 16200 1 +0330}
+    {306531000 12600 0 +0330}
+    {322432200 16200 1 +0330}
+    {338499000 12600 0 +0330}
+    {673216200 16200 1 +0330}
+    {685481400 12600 0 +0330}
+    {701209800 16200 1 +0330}
+    {717103800 12600 0 +0330}
+    {732745800 16200 1 +0330}
+    {748639800 12600 0 +0330}
+    {764281800 16200 1 +0330}
+    {780175800 12600 0 +0330}
+    {795817800 16200 1 +0330}
+    {811711800 12600 0 +0330}
+    {827353800 16200 1 +0330}
+    {843247800 12600 0 +0330}
+    {858976200 16200 1 +0330}
+    {874870200 12600 0 +0330}
+    {890512200 16200 1 +0330}
+    {906406200 12600 0 +0330}
+    {922048200 16200 1 +0330}
+    {937942200 12600 0 +0330}
+    {953584200 16200 1 +0330}
+    {969478200 12600 0 +0330}
+    {985206600 16200 1 +0330}
+    {1001100600 12600 0 +0330}
+    {1016742600 16200 1 +0330}
+    {1032636600 12600 0 +0330}
+    {1048278600 16200 1 +0330}
+    {1064172600 12600 0 +0330}
+    {1079814600 16200 1 +0330}
+    {1095708600 12600 0 +0330}
+    {1111437000 16200 1 +0330}
+    {1127331000 12600 0 +0330}
+    {1206045000 16200 1 +0330}
+    {1221939000 12600 0 +0330}
+    {1237667400 16200 1 +0330}
+    {1253561400 12600 0 +0330}
+    {1269203400 16200 1 +0330}
+    {1285097400 12600 0 +0330}
+    {1300739400 16200 1 +0330}
+    {1316633400 12600 0 +0330}
+    {1332275400 16200 1 +0330}
+    {1348169400 12600 0 +0330}
+    {1363897800 16200 1 +0330}
+    {1379791800 12600 0 +0330}
+    {1395433800 16200 1 +0330}
+    {1411327800 12600 0 +0330}
+    {1426969800 16200 1 +0330}
+    {1442863800 12600 0 +0330}
+    {1458505800 16200 1 +0330}
+    {1474399800 12600 0 +0330}
+    {1490128200 16200 1 +0330}
+    {1506022200 12600 0 +0330}
+    {1521664200 16200 1 +0330}
+    {1537558200 12600 0 +0330}
+    {1553200200 16200 1 +0330}
+    {1569094200 12600 0 +0330}
+    {1584736200 16200 1 +0330}
+    {1600630200 12600 0 +0330}
+    {1616358600 16200 1 +0330}
+    {1632252600 12600 0 +0330}
+    {1647894600 16200 1 +0330}
+    {1663788600 12600 0 +0330}
+    {1679430600 16200 1 +0330}
+    {1695324600 12600 0 +0330}
+    {1710966600 16200 1 +0330}
+    {1726860600 12600 0 +0330}
+    {1742589000 16200 1 +0330}
+    {1758483000 12600 0 +0330}
+    {1774125000 16200 1 +0330}
+    {1790019000 12600 0 +0330}
+    {1805661000 16200 1 +0330}
+    {1821555000 12600 0 +0330}
+    {1837197000 16200 1 +0330}
+    {1853091000 12600 0 +0330}
+    {1868733000 16200 1 +0330}
+    {1884627000 12600 0 +0330}
+    {1900355400 16200 1 +0330}
+    {1916249400 12600 0 +0330}
+    {1931891400 16200 1 +0330}
+    {1947785400 12600 0 +0330}
+    {1963427400 16200 1 +0330}
+    {1979321400 12600 0 +0330}
+    {1994963400 16200 1 +0330}
+    {2010857400 12600 0 +0330}
+    {2026585800 16200 1 +0330}
+    {2042479800 12600 0 +0330}
+    {2058121800 16200 1 +0330}
+    {2074015800 12600 0 +0330}
+    {2089657800 16200 1 +0330}
+    {2105551800 12600 0 +0330}
+    {2121193800 16200 1 +0330}
+    {2137087800 12600 0 +0330}
+    {2152729800 16200 1 +0330}
+    {2168623800 12600 0 +0330}
+    {2184265800 16200 1 +0330}
+    {2200159800 12600 0 +0330}
+    {2215888200 16200 1 +0330}
+    {2231782200 12600 0 +0330}
+    {2247424200 16200 1 +0330}
+    {2263318200 12600 0 +0330}
+    {2278960200 16200 1 +0330}
+    {2294854200 12600 0 +0330}
+    {2310496200 16200 1 +0330}
+    {2326390200 12600 0 +0330}
+    {2342118600 16200 1 +0330}
+    {2358012600 12600 0 +0330}
+    {2373654600 16200 1 +0330}
+    {2389548600 12600 0 +0330}
+    {2405190600 16200 1 +0330}
+    {2421084600 12600 0 +0330}
+    {2436726600 16200 1 +0330}
+    {2452620600 12600 0 +0330}
+    {2468349000 16200 1 +0330}
+    {2484243000 12600 0 +0330}
+    {2499885000 16200 1 +0330}
+    {2515779000 12600 0 +0330}
+    {2531421000 16200 1 +0330}
+    {2547315000 12600 0 +0330}
+    {2562957000 16200 1 +0330}
+    {2578851000 12600 0 +0330}
+    {2594579400 16200 1 +0330}
+    {2610473400 12600 0 +0330}
+    {2626115400 16200 1 +0330}
+    {2642009400 12600 0 +0330}
+    {2657651400 16200 1 +0330}
+    {2673545400 12600 0 +0330}
+    {2689187400 16200 1 +0330}
+    {2705081400 12600 0 +0330}
+    {2720809800 16200 1 +0330}
+    {2736703800 12600 0 +0330}
+    {2752345800 16200 1 +0330}
+    {2768239800 12600 0 +0330}
+    {2783881800 16200 1 +0330}
+    {2799775800 12600 0 +0330}
+    {2815417800 16200 1 +0330}
+    {2831311800 12600 0 +0330}
+    {2847040200 16200 1 +0330}
+    {2862934200 12600 0 +0330}
+    {2878576200 16200 1 +0330}
+    {2894470200 12600 0 +0330}
+    {2910112200 16200 1 +0330}
+    {2926006200 12600 0 +0330}
+    {2941648200 16200 1 +0330}
+    {2957542200 12600 0 +0330}
+    {2973270600 16200 1 +0330}
+    {2989164600 12600 0 +0330}
+    {3004806600 16200 1 +0330}
+    {3020700600 12600 0 +0330}
+    {3036342600 16200 1 +0330}
+    {3052236600 12600 0 +0330}
+    {3067878600 16200 1 +0330}
+    {3083772600 12600 0 +0330}
+    {3099501000 16200 1 +0330}
+    {3115395000 12600 0 +0330}
+    {3131037000 16200 1 +0330}
+    {3146931000 12600 0 +0330}
+    {3162573000 16200 1 +0330}
+    {3178467000 12600 0 +0330}
+    {3194109000 16200 1 +0330}
+    {3210003000 12600 0 +0330}
+    {3225731400 16200 1 +0330}
+    {3241625400 12600 0 +0330}
+    {3257267400 16200 1 +0330}
+    {3273161400 12600 0 +0330}
+    {3288803400 16200 1 +0330}
+    {3304697400 12600 0 +0330}
+    {3320339400 16200 1 +0330}
+    {3336233400 12600 0 +0330}
+    {3351961800 16200 1 +0330}
+    {3367855800 12600 0 +0330}
+    {3383497800 16200 1 +0330}
+    {3399391800 12600 0 +0330}
+    {3415033800 16200 1 +0330}
+    {3430927800 12600 0 +0330}
+    {3446569800 16200 1 +0330}
+    {3462463800 12600 0 +0330}
+    {3478192200 16200 1 +0330}
+    {3494086200 12600 0 +0330}
+    {3509728200 16200 1 +0330}
+    {3525622200 12600 0 +0330}
+    {3541264200 16200 1 +0330}
+    {3557158200 12600 0 +0330}
+    {3572800200 16200 1 +0330}
+    {3588694200 12600 0 +0330}
+    {3604422600 16200 1 +0330}
+    {3620316600 12600 0 +0330}
+    {3635958600 16200 1 +0330}
+    {3651852600 12600 0 +0330}
+    {3667494600 16200 1 +0330}
+    {3683388600 12600 0 +0330}
+    {3699030600 16200 1 +0330}
+    {3714924600 12600 0 +0330}
+    {3730653000 16200 1 +0330}
+    {3746547000 12600 0 +0330}
+    {3762189000 16200 1 +0330}
+    {3778083000 12600 0 +0330}
+    {3793725000 16200 1 +0330}
+    {3809619000 12600 0 +0330}
+    {3825261000 16200 1 +0330}
+    {3841155000 12600 0 +0330}
+    {3856883400 16200 1 +0330}
+    {3872777400 12600 0 +0330}
+    {3888419400 16200 1 +0330}
+    {3904313400 12600 0 +0330}
+    {3919955400 16200 1 +0330}
+    {3935849400 12600 0 +0330}
+    {3951491400 16200 1 +0330}
+    {3967385400 12600 0 +0330}
+    {3983113800 16200 1 +0330}
+    {3999007800 12600 0 +0330}
+    {4014649800 16200 1 +0330}
+    {4030543800 12600 0 +0330}
+    {4046185800 16200 1 +0330}
+    {4062079800 12600 0 +0330}
+    {4077721800 16200 1 +0330}
+    {4093615800 12600 0 +0330}
 }
diff --git a/library/tzdata/Asia/Ulaanbaatar b/library/tzdata/Asia/Ulaanbaatar
index e0ba7ab..3a33ef9 100644
--- a/library/tzdata/Asia/Ulaanbaatar
+++ b/library/tzdata/Asia/Ulaanbaatar
@@ -4,52 +4,52 @@ set TZData(:Asia/Ulaanbaatar) {
     {-9223372036854775808 25652 0 LMT}
     {-2032931252 25200 0 +07}
     {252435600 28800 0 +08}
-    {417974400 32400 1 +09}
+    {417974400 32400 1 +08}
     {433782000 28800 0 +08}
-    {449596800 32400 1 +09}
+    {449596800 32400 1 +08}
     {465318000 28800 0 +08}
-    {481046400 32400 1 +09}
+    {481046400 32400 1 +08}
     {496767600 28800 0 +08}
-    {512496000 32400 1 +09}
+    {512496000 32400 1 +08}
     {528217200 28800 0 +08}
-    {543945600 32400 1 +09}
+    {543945600 32400 1 +08}
     {559666800 28800 0 +08}
-    {575395200 32400 1 +09}
+    {575395200 32400 1 +08}
     {591116400 28800 0 +08}
-    {606844800 32400 1 +09}
+    {606844800 32400 1 +08}
     {622566000 28800 0 +08}
-    {638294400 32400 1 +09}
+    {638294400 32400 1 +08}
     {654620400 28800 0 +08}
-    {670348800 32400 1 +09}
+    {670348800 32400 1 +08}
     {686070000 28800 0 +08}
-    {701798400 32400 1 +09}
+    {701798400 32400 1 +08}
     {717519600 28800 0 +08}
-    {733248000 32400 1 +09}
+    {733248000 32400 1 +08}
     {748969200 28800 0 +08}
-    {764697600 32400 1 +09}
+    {764697600 32400 1 +08}
     {780418800 28800 0 +08}
-    {796147200 32400 1 +09}
+    {796147200 32400 1 +08}
     {811868400 28800 0 +08}
-    {828201600 32400 1 +09}
+    {828201600 32400 1 +08}
     {843922800 28800 0 +08}
-    {859651200 32400 1 +09}
+    {859651200 32400 1 +08}
     {875372400 28800 0 +08}
-    {891100800 32400 1 +09}
+    {891100800 32400 1 +08}
     {906822000 28800 0 +08}
-    {988394400 32400 1 +09}
+    {988394400 32400 1 +08}
     {1001696400 28800 0 +08}
-    {1017424800 32400 1 +09}
+    {1017424800 32400 1 +08}
     {1033146000 28800 0 +08}
-    {1048874400 32400 1 +09}
+    {1048874400 32400 1 +08}
     {1064595600 28800 0 +08}
-    {1080324000 32400 1 +09}
+    {1080324000 32400 1 +08}
     {1096045200 28800 0 +08}
-    {1111773600 32400 1 +09}
+    {1111773600 32400 1 +08}
     {1127494800 28800 0 +08}
-    {1143223200 32400 1 +09}
+    {1143223200 32400 1 +08}
     {1159549200 28800 0 +08}
-    {1427479200 32400 1 +09}
+    {1427479200 32400 1 +08}
     {1443193200 28800 0 +08}
-    {1458928800 32400 1 +09}
+    {1458928800 32400 1 +08}
     {1474642800 28800 0 +08}
 }
diff --git a/library/tzdata/Asia/Yerevan b/library/tzdata/Asia/Yerevan
index 25a349a..463bed0 100644
--- a/library/tzdata/Asia/Yerevan
+++ b/library/tzdata/Asia/Yerevan
@@ -4,67 +4,67 @@ set TZData(:Asia/Yerevan) {
     {-9223372036854775808 10680 0 LMT}
     {-1441162680 10800 0 +03}
     {-405140400 14400 0 +04}
-    {354916800 18000 1 +05}
+    {354916800 18000 1 +04}
     {370724400 14400 0 +04}
-    {386452800 18000 1 +05}
+    {386452800 18000 1 +04}
     {402260400 14400 0 +04}
-    {417988800 18000 1 +05}
+    {417988800 18000 1 +04}
     {433796400 14400 0 +04}
-    {449611200 18000 1 +05}
+    {449611200 18000 1 +04}
     {465343200 14400 0 +04}
-    {481068000 18000 1 +05}
+    {481068000 18000 1 +04}
     {496792800 14400 0 +04}
-    {512517600 18000 1 +05}
+    {512517600 18000 1 +04}
     {528242400 14400 0 +04}
-    {543967200 18000 1 +05}
+    {543967200 18000 1 +04}
     {559692000 14400 0 +04}
-    {575416800 18000 1 +05}
+    {575416800 18000 1 +04}
     {591141600 14400 0 +04}
-    {606866400 18000 1 +05}
+    {606866400 18000 1 +04}
     {622591200 14400 0 +04}
-    {638316000 18000 1 +05}
+    {638316000 18000 1 +04}
     {654645600 14400 0 +04}
     {670370400 10800 0 +03}
-    {670374000 14400 1 +04}
+    {670374000 14400 1 +03}
     {686098800 10800 0 +03}
-    {701823600 14400 1 +04}
+    {701823600 14400 1 +03}
     {717548400 10800 0 +03}
-    {733273200 14400 1 +04}
+    {733273200 14400 1 +03}
     {748998000 10800 0 +03}
-    {764722800 14400 1 +04}
+    {764722800 14400 1 +03}
     {780447600 10800 0 +03}
-    {796172400 14400 1 +04}
+    {796172400 14400 1 +03}
     {811897200 14400 0 +04}
     {852062400 14400 0 +04}
-    {859672800 18000 1 +05}
+    {859672800 18000 1 +04}
     {877816800 14400 0 +04}
-    {891122400 18000 1 +05}
+    {891122400 18000 1 +04}
     {909266400 14400 0 +04}
-    {922572000 18000 1 +05}
+    {922572000 18000 1 +04}
     {941320800 14400 0 +04}
-    {954021600 18000 1 +05}
+    {954021600 18000 1 +04}
     {972770400 14400 0 +04}
-    {985471200 18000 1 +05}
+    {985471200 18000 1 +04}
     {1004220000 14400 0 +04}
-    {1017525600 18000 1 +05}
+    {1017525600 18000 1 +04}
     {1035669600 14400 0 +04}
-    {1048975200 18000 1 +05}
+    {1048975200 18000 1 +04}
     {1067119200 14400 0 +04}
-    {1080424800 18000 1 +05}
+    {1080424800 18000 1 +04}
     {1099173600 14400 0 +04}
-    {1111874400 18000 1 +05}
+    {1111874400 18000 1 +04}
     {1130623200 14400 0 +04}
-    {1143324000 18000 1 +05}
+    {1143324000 18000 1 +04}
     {1162072800 14400 0 +04}
-    {1174773600 18000 1 +05}
+    {1174773600 18000 1 +04}
     {1193522400 14400 0 +04}
-    {1206828000 18000 1 +05}
+    {1206828000 18000 1 +04}
     {1224972000 14400 0 +04}
-    {1238277600 18000 1 +05}
+    {1238277600 18000 1 +04}
     {1256421600 14400 0 +04}
-    {1269727200 18000 1 +05}
+    {1269727200 18000 1 +04}
     {1288476000 14400 0 +04}
     {1293825600 14400 0 +04}
-    {1301176800 18000 1 +05}
+    {1301176800 18000 1 +04}
     {1319925600 14400 0 +04}
 }
diff --git a/library/tzdata/Atlantic/Azores b/library/tzdata/Atlantic/Azores
index a9bec94..088dd9a 100644
--- a/library/tzdata/Atlantic/Azores
+++ b/library/tzdata/Atlantic/Azores
@@ -3,7 +3,7 @@
 set TZData(:Atlantic/Azores) {
     {-9223372036854775808 -6160 0 LMT}
     {-2713904240 -6872 0 HMT}
-    {-1830377128 -7200 0 -02}
+    {-1830376800 -7200 0 -02}
     {-1689548400 -3600 1 -01}
     {-1677794400 -7200 0 -02}
     {-1667430000 -3600 1 -01}
diff --git a/library/tzdata/Atlantic/Cape_Verde b/library/tzdata/Atlantic/Cape_Verde
index 6fc94eb..595db0b 100644
--- a/library/tzdata/Atlantic/Cape_Verde
+++ b/library/tzdata/Atlantic/Cape_Verde
@@ -2,7 +2,7 @@
 
 set TZData(:Atlantic/Cape_Verde) {
     {-9223372036854775808 -5644 0 LMT}
-    {-1988144756 -7200 0 -02}
+    {-1830376800 -7200 0 -02}
     {-862610400 -3600 1 -01}
     {-764118000 -7200 0 -02}
     {186120000 -3600 0 -01}
diff --git a/library/tzdata/Atlantic/Madeira b/library/tzdata/Atlantic/Madeira
index cc5e5f8..fed9c19 100644
--- a/library/tzdata/Atlantic/Madeira
+++ b/library/tzdata/Atlantic/Madeira
@@ -3,7 +3,7 @@
 set TZData(:Atlantic/Madeira) {
     {-9223372036854775808 -4056 0 LMT}
     {-2713906344 -4056 0 FMT}
-    {-1830379944 -3600 0 -01}
+    {-1830380400 -3600 0 -01}
     {-1689552000 0 1 +00}
     {-1677798000 -3600 0 -01}
     {-1667433600 0 1 +00}
diff --git a/library/tzdata/Atlantic/Reykjavik b/library/tzdata/Atlantic/Reykjavik
index 5555460..6270572 100644
--- a/library/tzdata/Atlantic/Reykjavik
+++ b/library/tzdata/Atlantic/Reykjavik
@@ -3,71 +3,71 @@
 set TZData(:Atlantic/Reykjavik) {
     {-9223372036854775808 -5280 0 LMT}
     {-1956609120 -3600 0 -01}
-    {-1668211200 0 1 +00}
+    {-1668211200 0 1 -01}
     {-1647212400 -3600 0 -01}
-    {-1636675200 0 1 +00}
+    {-1636675200 0 1 -01}
     {-1613430000 -3600 0 -01}
-    {-1605139200 0 1 +00}
+    {-1605139200 0 1 -01}
     {-1581894000 -3600 0 -01}
-    {-1539561600 0 1 +00}
+    {-1539561600 0 1 -01}
     {-1531350000 -3600 0 -01}
-    {-968025600 0 1 +00}
+    {-968025600 0 1 -01}
     {-952293600 -3600 0 -01}
-    {-942008400 0 1 +00}
+    {-942008400 0 1 -01}
     {-920239200 -3600 0 -01}
-    {-909957600 0 1 +00}
+    {-909957600 0 1 -01}
     {-888789600 -3600 0 -01}
-    {-877903200 0 1 +00}
+    {-877903200 0 1 -01}
     {-857944800 -3600 0 -01}
-    {-846453600 0 1 +00}
+    {-846453600 0 1 -01}
     {-826495200 -3600 0 -01}
-    {-815004000 0 1 +00}
+    {-815004000 0 1 -01}
     {-795045600 -3600 0 -01}
-    {-783554400 0 1 +00}
+    {-783554400 0 1 -01}
     {-762991200 -3600 0 -01}
-    {-752104800 0 1 +00}
+    {-752104800 0 1 -01}
     {-731541600 -3600 0 -01}
-    {-717631200 0 1 +00}
+    {-717631200 0 1 -01}
     {-700092000 -3600 0 -01}
-    {-686181600 0 1 +00}
+    {-686181600 0 1 -01}
     {-668642400 -3600 0 -01}
-    {-654732000 0 1 +00}
+    {-654732000 0 1 -01}
     {-636588000 -3600 0 -01}
-    {-623282400 0 1 +00}
+    {-623282400 0 1 -01}
     {-605743200 -3600 0 -01}
-    {-591832800 0 1 +00}
+    {-591832800 0 1 -01}
     {-573688800 -3600 0 -01}
-    {-559778400 0 1 +00}
+    {-559778400 0 1 -01}
     {-542239200 -3600 0 -01}
-    {-528328800 0 1 +00}
+    {-528328800 0 1 -01}
     {-510789600 -3600 0 -01}
-    {-496879200 0 1 +00}
+    {-496879200 0 1 -01}
     {-479340000 -3600 0 -01}
-    {-465429600 0 1 +00}
+    {-465429600 0 1 -01}
     {-447890400 -3600 0 -01}
-    {-433980000 0 1 +00}
+    {-433980000 0 1 -01}
     {-415836000 -3600 0 -01}
-    {-401925600 0 1 +00}
+    {-401925600 0 1 -01}
     {-384386400 -3600 0 -01}
-    {-370476000 0 1 +00}
+    {-370476000 0 1 -01}
     {-352936800 -3600 0 -01}
-    {-339026400 0 1 +00}
+    {-339026400 0 1 -01}
     {-321487200 -3600 0 -01}
-    {-307576800 0 1 +00}
+    {-307576800 0 1 -01}
     {-290037600 -3600 0 -01}
-    {-276127200 0 1 +00}
+    {-276127200 0 1 -01}
     {-258588000 -3600 0 -01}
-    {-244677600 0 1 +00}
+    {-244677600 0 1 -01}
     {-226533600 -3600 0 -01}
-    {-212623200 0 1 +00}
+    {-212623200 0 1 -01}
     {-195084000 -3600 0 -01}
-    {-181173600 0 1 +00}
+    {-181173600 0 1 -01}
     {-163634400 -3600 0 -01}
-    {-149724000 0 1 +00}
+    {-149724000 0 1 -01}
     {-132184800 -3600 0 -01}
-    {-118274400 0 1 +00}
+    {-118274400 0 1 -01}
     {-100735200 -3600 0 -01}
-    {-86824800 0 1 +00}
+    {-86824800 0 1 -01}
     {-68680800 -3600 0 -01}
     {-54770400 0 0 GMT}
 }
diff --git a/library/tzdata/Atlantic/Stanley b/library/tzdata/Atlantic/Stanley
index 5210832..48473ca 100644
--- a/library/tzdata/Atlantic/Stanley
+++ b/library/tzdata/Atlantic/Stanley
@@ -4,72 +4,72 @@ set TZData(:Atlantic/Stanley) {
     {-9223372036854775808 -13884 0 LMT}
     {-2524507716 -13884 0 SMT}
     {-1824235716 -14400 0 -04}
-    {-1018209600 -10800 1 -03}
+    {-1018209600 -10800 1 -04}
     {-1003093200 -14400 0 -04}
-    {-986760000 -10800 1 -03}
+    {-986760000 -10800 1 -04}
     {-971643600 -14400 0 -04}
-    {-954705600 -10800 1 -03}
+    {-954705600 -10800 1 -04}
     {-939589200 -14400 0 -04}
-    {-923256000 -10800 1 -03}
+    {-923256000 -10800 1 -04}
     {-908139600 -14400 0 -04}
-    {-891806400 -10800 1 -03}
+    {-891806400 -10800 1 -04}
     {-876690000 -14400 0 -04}
-    {-860356800 -10800 1 -03}
+    {-860356800 -10800 1 -04}
     {420606000 -7200 0 -03}
-    {433303200 -7200 1 -02}
+    {433303200 -7200 1 -03}
     {452052000 -10800 0 -03}
-    {464151600 -7200 1 -02}
+    {464151600 -7200 1 -03}
     {483501600 -10800 0 -03}
     {495597600 -14400 0 -04}
-    {495604800 -10800 1 -03}
+    {495604800 -10800 1 -04}
     {514350000 -14400 0 -04}
-    {527054400 -10800 1 -03}
+    {527054400 -10800 1 -04}
     {545799600 -14400 0 -04}
-    {558504000 -10800 1 -03}
+    {558504000 -10800 1 -04}
     {577249200 -14400 0 -04}
-    {589953600 -10800 1 -03}
+    {589953600 -10800 1 -04}
     {608698800 -14400 0 -04}
-    {621403200 -10800 1 -03}
+    {621403200 -10800 1 -04}
     {640753200 -14400 0 -04}
-    {652852800 -10800 1 -03}
+    {652852800 -10800 1 -04}
     {672202800 -14400 0 -04}
-    {684907200 -10800 1 -03}
+    {684907200 -10800 1 -04}
     {703652400 -14400 0 -04}
-    {716356800 -10800 1 -03}
+    {716356800 -10800 1 -04}
     {735102000 -14400 0 -04}
-    {747806400 -10800 1 -03}
+    {747806400 -10800 1 -04}
     {766551600 -14400 0 -04}
-    {779256000 -10800 1 -03}
+    {779256000 -10800 1 -04}
     {798001200 -14400 0 -04}
-    {810705600 -10800 1 -03}
+    {810705600 -10800 1 -04}
     {830055600 -14400 0 -04}
-    {842760000 -10800 1 -03}
+    {842760000 -10800 1 -04}
     {861505200 -14400 0 -04}
-    {874209600 -10800 1 -03}
+    {874209600 -10800 1 -04}
     {892954800 -14400 0 -04}
-    {905659200 -10800 1 -03}
+    {905659200 -10800 1 -04}
     {924404400 -14400 0 -04}
-    {937108800 -10800 1 -03}
+    {937108800 -10800 1 -04}
     {955854000 -14400 0 -04}
-    {968558400 -10800 1 -03}
+    {968558400 -10800 1 -04}
     {987310800 -14400 0 -04}
-    {999410400 -10800 1 -03}
+    {999410400 -10800 1 -04}
     {1019365200 -14400 0 -04}
-    {1030860000 -10800 1 -03}
+    {1030860000 -10800 1 -04}
     {1050814800 -14400 0 -04}
-    {1062914400 -10800 1 -03}
+    {1062914400 -10800 1 -04}
     {1082264400 -14400 0 -04}
-    {1094364000 -10800 1 -03}
+    {1094364000 -10800 1 -04}
     {1113714000 -14400 0 -04}
-    {1125813600 -10800 1 -03}
+    {1125813600 -10800 1 -04}
     {1145163600 -14400 0 -04}
-    {1157263200 -10800 1 -03}
+    {1157263200 -10800 1 -04}
     {1176613200 -14400 0 -04}
-    {1188712800 -10800 1 -03}
+    {1188712800 -10800 1 -04}
     {1208667600 -14400 0 -04}
-    {1220767200 -10800 1 -03}
+    {1220767200 -10800 1 -04}
     {1240117200 -14400 0 -04}
-    {1252216800 -10800 1 -03}
+    {1252216800 -10800 1 -04}
     {1271566800 -14400 0 -04}
     {1283662800 -10800 0 -03}
 }
diff --git a/library/tzdata/Australia/Lord_Howe b/library/tzdata/Australia/Lord_Howe
index 0e2405e..c595967 100644
--- a/library/tzdata/Australia/Lord_Howe
+++ b/library/tzdata/Australia/Lord_Howe
@@ -3,243 +3,243 @@
 set TZData(:Australia/Lord_Howe) {
     {-9223372036854775808 38180 0 LMT}
     {-2364114980 36000 0 AEST}
-    {352216800 37800 0 +1130}
-    {372785400 41400 1 +1130}
-    {384273000 37800 0 +1130}
-    {404839800 41400 1 +1130}
-    {415722600 37800 0 +1130}
-    {436289400 41400 1 +1130}
-    {447172200 37800 0 +1130}
-    {467739000 41400 1 +1130}
-    {478621800 37800 0 +1130}
-    {488984400 37800 0 +11}
-    {499188600 39600 1 +11}
-    {511282800 37800 0 +11}
-    {530033400 39600 1 +11}
-    {542732400 37800 0 +11}
-    {562087800 39600 1 +11}
-    {574786800 37800 0 +11}
-    {594142200 39600 1 +11}
-    {606236400 37800 0 +11}
-    {625591800 39600 1 +11}
-    {636476400 37800 0 +11}
-    {657041400 39600 1 +11}
-    {667926000 37800 0 +11}
-    {688491000 39600 1 +11}
-    {699375600 37800 0 +11}
-    {719940600 39600 1 +11}
-    {731430000 37800 0 +11}
-    {751995000 39600 1 +11}
-    {762879600 37800 0 +11}
-    {783444600 39600 1 +11}
-    {794329200 37800 0 +11}
-    {814894200 39600 1 +11}
-    {828198000 37800 0 +11}
-    {846343800 39600 1 +11}
-    {859647600 37800 0 +11}
-    {877793400 39600 1 +11}
-    {891097200 37800 0 +11}
-    {909243000 39600 1 +11}
-    {922546800 37800 0 +11}
-    {941297400 39600 1 +11}
-    {953996400 37800 0 +11}
-    {967303800 39600 1 +11}
-    {985446000 37800 0 +11}
-    {1004196600 39600 1 +11}
-    {1017500400 37800 0 +11}
-    {1035646200 39600 1 +11}
-    {1048950000 37800 0 +11}
-    {1067095800 39600 1 +11}
-    {1080399600 37800 0 +11}
-    {1099150200 39600 1 +11}
-    {1111849200 37800 0 +11}
-    {1130599800 39600 1 +11}
-    {1143903600 37800 0 +11}
-    {1162049400 39600 1 +11}
-    {1174748400 37800 0 +11}
-    {1193499000 39600 1 +11}
-    {1207407600 37800 0 +11}
-    {1223134200 39600 1 +11}
-    {1238857200 37800 0 +11}
-    {1254583800 39600 1 +11}
-    {1270306800 37800 0 +11}
-    {1286033400 39600 1 +11}
-    {1301756400 37800 0 +11}
-    {1317483000 39600 1 +11}
-    {1333206000 37800 0 +11}
-    {1349537400 39600 1 +11}
-    {1365260400 37800 0 +11}
-    {1380987000 39600 1 +11}
-    {1396710000 37800 0 +11}
-    {1412436600 39600 1 +11}
-    {1428159600 37800 0 +11}
-    {1443886200 39600 1 +11}
-    {1459609200 37800 0 +11}
-    {1475335800 39600 1 +11}
-    {1491058800 37800 0 +11}
-    {1506785400 39600 1 +11}
-    {1522508400 37800 0 +11}
-    {1538839800 39600 1 +11}
-    {1554562800 37800 0 +11}
-    {1570289400 39600 1 +11}
-    {1586012400 37800 0 +11}
-    {1601739000 39600 1 +11}
-    {1617462000 37800 0 +11}
-    {1633188600 39600 1 +11}
-    {1648911600 37800 0 +11}
-    {1664638200 39600 1 +11}
-    {1680361200 37800 0 +11}
-    {1696087800 39600 1 +11}
-    {1712415600 37800 0 +11}
-    {1728142200 39600 1 +11}
-    {1743865200 37800 0 +11}
-    {1759591800 39600 1 +11}
-    {1775314800 37800 0 +11}
-    {1791041400 39600 1 +11}
-    {1806764400 37800 0 +11}
-    {1822491000 39600 1 +11}
-    {1838214000 37800 0 +11}
-    {1853940600 39600 1 +11}
-    {1869663600 37800 0 +11}
-    {1885995000 39600 1 +11}
-    {1901718000 37800 0 +11}
-    {1917444600 39600 1 +11}
-    {1933167600 37800 0 +11}
-    {1948894200 39600 1 +11}
-    {1964617200 37800 0 +11}
-    {1980343800 39600 1 +11}
-    {1996066800 37800 0 +11}
-    {2011793400 39600 1 +11}
-    {2027516400 37800 0 +11}
-    {2043243000 39600 1 +11}
-    {2058966000 37800 0 +11}
-    {2075297400 39600 1 +11}
-    {2091020400 37800 0 +11}
-    {2106747000 39600 1 +11}
-    {2122470000 37800 0 +11}
-    {2138196600 39600 1 +11}
-    {2153919600 37800 0 +11}
-    {2169646200 39600 1 +11}
-    {2185369200 37800 0 +11}
-    {2201095800 39600 1 +11}
-    {2216818800 37800 0 +11}
-    {2233150200 39600 1 +11}
-    {2248873200 37800 0 +11}
-    {2264599800 39600 1 +11}
-    {2280322800 37800 0 +11}
-    {2296049400 39600 1 +11}
-    {2311772400 37800 0 +11}
-    {2327499000 39600 1 +11}
-    {2343222000 37800 0 +11}
-    {2358948600 39600 1 +11}
-    {2374671600 37800 0 +11}
-    {2390398200 39600 1 +11}
-    {2406121200 37800 0 +11}
-    {2422452600 39600 1 +11}
-    {2438175600 37800 0 +11}
-    {2453902200 39600 1 +11}
-    {2469625200 37800 0 +11}
-    {2485351800 39600 1 +11}
-    {2501074800 37800 0 +11}
-    {2516801400 39600 1 +11}
-    {2532524400 37800 0 +11}
-    {2548251000 39600 1 +11}
-    {2563974000 37800 0 +11}
-    {2579700600 39600 1 +11}
-    {2596028400 37800 0 +11}
-    {2611755000 39600 1 +11}
-    {2627478000 37800 0 +11}
-    {2643204600 39600 1 +11}
-    {2658927600 37800 0 +11}
-    {2674654200 39600 1 +11}
-    {2690377200 37800 0 +11}
-    {2706103800 39600 1 +11}
-    {2721826800 37800 0 +11}
-    {2737553400 39600 1 +11}
-    {2753276400 37800 0 +11}
-    {2769607800 39600 1 +11}
-    {2785330800 37800 0 +11}
-    {2801057400 39600 1 +11}
-    {2816780400 37800 0 +11}
-    {2832507000 39600 1 +11}
-    {2848230000 37800 0 +11}
-    {2863956600 39600 1 +11}
-    {2879679600 37800 0 +11}
-    {2895406200 39600 1 +11}
-    {2911129200 37800 0 +11}
-    {2926855800 39600 1 +11}
-    {2942578800 37800 0 +11}
-    {2958910200 39600 1 +11}
-    {2974633200 37800 0 +11}
-    {2990359800 39600 1 +11}
-    {3006082800 37800 0 +11}
-    {3021809400 39600 1 +11}
-    {3037532400 37800 0 +11}
-    {3053259000 39600 1 +11}
-    {3068982000 37800 0 +11}
-    {3084708600 39600 1 +11}
-    {3100431600 37800 0 +11}
-    {3116763000 39600 1 +11}
-    {3132486000 37800 0 +11}
-    {3148212600 39600 1 +11}
-    {3163935600 37800 0 +11}
-    {3179662200 39600 1 +11}
-    {3195385200 37800 0 +11}
-    {3211111800 39600 1 +11}
-    {3226834800 37800 0 +11}
-    {3242561400 39600 1 +11}
-    {3258284400 37800 0 +11}
-    {3274011000 39600 1 +11}
-    {3289734000 37800 0 +11}
-    {3306065400 39600 1 +11}
-    {3321788400 37800 0 +11}
-    {3337515000 39600 1 +11}
-    {3353238000 37800 0 +11}
-    {3368964600 39600 1 +11}
-    {3384687600 37800 0 +11}
-    {3400414200 39600 1 +11}
-    {3416137200 37800 0 +11}
-    {3431863800 39600 1 +11}
-    {3447586800 37800 0 +11}
-    {3463313400 39600 1 +11}
-    {3479641200 37800 0 +11}
-    {3495367800 39600 1 +11}
-    {3511090800 37800 0 +11}
-    {3526817400 39600 1 +11}
-    {3542540400 37800 0 +11}
-    {3558267000 39600 1 +11}
-    {3573990000 37800 0 +11}
-    {3589716600 39600 1 +11}
-    {3605439600 37800 0 +11}
-    {3621166200 39600 1 +11}
-    {3636889200 37800 0 +11}
-    {3653220600 39600 1 +11}
-    {3668943600 37800 0 +11}
-    {3684670200 39600 1 +11}
-    {3700393200 37800 0 +11}
-    {3716119800 39600 1 +11}
-    {3731842800 37800 0 +11}
-    {3747569400 39600 1 +11}
-    {3763292400 37800 0 +11}
-    {3779019000 39600 1 +11}
-    {3794742000 37800 0 +11}
-    {3810468600 39600 1 +11}
-    {3826191600 37800 0 +11}
-    {3842523000 39600 1 +11}
-    {3858246000 37800 0 +11}
-    {3873972600 39600 1 +11}
-    {3889695600 37800 0 +11}
-    {3905422200 39600 1 +11}
-    {3921145200 37800 0 +11}
-    {3936871800 39600 1 +11}
-    {3952594800 37800 0 +11}
-    {3968321400 39600 1 +11}
-    {3984044400 37800 0 +11}
-    {4000375800 39600 1 +11}
-    {4016098800 37800 0 +11}
-    {4031825400 39600 1 +11}
-    {4047548400 37800 0 +11}
-    {4063275000 39600 1 +11}
-    {4078998000 37800 0 +11}
-    {4094724600 39600 1 +11}
+    {352216800 37800 0 +1030}
+    {372785400 41400 1 +1030}
+    {384273000 37800 0 +1030}
+    {404839800 41400 1 +1030}
+    {415722600 37800 0 +1030}
+    {436289400 41400 1 +1030}
+    {447172200 37800 0 +1030}
+    {467739000 41400 1 +1030}
+    {478621800 37800 0 +1030}
+    {488984400 37800 0 +1030}
+    {499188600 39600 1 +1030}
+    {511282800 37800 0 +1030}
+    {530033400 39600 1 +1030}
+    {542732400 37800 0 +1030}
+    {562087800 39600 1 +1030}
+    {574786800 37800 0 +1030}
+    {594142200 39600 1 +1030}
+    {606236400 37800 0 +1030}
+    {625591800 39600 1 +1030}
+    {636476400 37800 0 +1030}
+    {657041400 39600 1 +1030}
+    {667926000 37800 0 +1030}
+    {688491000 39600 1 +1030}
+    {699375600 37800 0 +1030}
+    {719940600 39600 1 +1030}
+    {731430000 37800 0 +1030}
+    {751995000 39600 1 +1030}
+    {762879600 37800 0 +1030}
+    {783444600 39600 1 +1030}
+    {794329200 37800 0 +1030}
+    {814894200 39600 1 +1030}
+    {828198000 37800 0 +1030}
+    {846343800 39600 1 +1030}
+    {859647600 37800 0 +1030}
+    {877793400 39600 1 +1030}
+    {891097200 37800 0 +1030}
+    {909243000 39600 1 +1030}
+    {922546800 37800 0 +1030}
+    {941297400 39600 1 +1030}
+    {953996400 37800 0 +1030}
+    {967303800 39600 1 +1030}
+    {985446000 37800 0 +1030}
+    {1004196600 39600 1 +1030}
+    {1017500400 37800 0 +1030}
+    {1035646200 39600 1 +1030}
+    {1048950000 37800 0 +1030}
+    {1067095800 39600 1 +1030}
+    {1080399600 37800 0 +1030}
+    {1099150200 39600 1 +1030}
+    {1111849200 37800 0 +1030}
+    {1130599800 39600 1 +1030}
+    {1143903600 37800 0 +1030}
+    {1162049400 39600 1 +1030}
+    {1174748400 37800 0 +1030}
+    {1193499000 39600 1 +1030}
+    {1207407600 37800 0 +1030}
+    {1223134200 39600 1 +1030}
+    {1238857200 37800 0 +1030}
+    {1254583800 39600 1 +1030}
+    {1270306800 37800 0 +1030}
+    {1286033400 39600 1 +1030}
+    {1301756400 37800 0 +1030}
+    {1317483000 39600 1 +1030}
+    {1333206000 37800 0 +1030}
+    {1349537400 39600 1 +1030}
+    {1365260400 37800 0 +1030}
+    {1380987000 39600 1 +1030}
+    {1396710000 37800 0 +1030}
+    {1412436600 39600 1 +1030}
+    {1428159600 37800 0 +1030}
+    {1443886200 39600 1 +1030}
+    {1459609200 37800 0 +1030}
+    {1475335800 39600 1 +1030}
+    {1491058800 37800 0 +1030}
+    {1506785400 39600 1 +1030}
+    {1522508400 37800 0 +1030}
+    {1538839800 39600 1 +1030}
+    {1554562800 37800 0 +1030}
+    {1570289400 39600 1 +1030}
+    {1586012400 37800 0 +1030}
+    {1601739000 39600 1 +1030}
+    {1617462000 37800 0 +1030}
+    {1633188600 39600 1 +1030}
+    {1648911600 37800 0 +1030}
+    {1664638200 39600 1 +1030}
+    {1680361200 37800 0 +1030}
+    {1696087800 39600 1 +1030}
+    {1712415600 37800 0 +1030}
+    {1728142200 39600 1 +1030}
+    {1743865200 37800 0 +1030}
+    {1759591800 39600 1 +1030}
+    {1775314800 37800 0 +1030}
+    {1791041400 39600 1 +1030}
+    {1806764400 37800 0 +1030}
+    {1822491000 39600 1 +1030}
+    {1838214000 37800 0 +1030}
+    {1853940600 39600 1 +1030}
+    {1869663600 37800 0 +1030}
+    {1885995000 39600 1 +1030}
+    {1901718000 37800 0 +1030}
+    {1917444600 39600 1 +1030}
+    {1933167600 37800 0 +1030}
+    {1948894200 39600 1 +1030}
+    {1964617200 37800 0 +1030}
+    {1980343800 39600 1 +1030}
+    {1996066800 37800 0 +1030}
+    {2011793400 39600 1 +1030}
+    {2027516400 37800 0 +1030}
+    {2043243000 39600 1 +1030}
+    {2058966000 37800 0 +1030}
+    {2075297400 39600 1 +1030}
+    {2091020400 37800 0 +1030}
+    {2106747000 39600 1 +1030}
+    {2122470000 37800 0 +1030}
+    {2138196600 39600 1 +1030}
+    {2153919600 37800 0 +1030}
+    {2169646200 39600 1 +1030}
+    {2185369200 37800 0 +1030}
+    {2201095800 39600 1 +1030}
+    {2216818800 37800 0 +1030}
+    {2233150200 39600 1 +1030}
+    {2248873200 37800 0 +1030}
+    {2264599800 39600 1 +1030}
+    {2280322800 37800 0 +1030}
+    {2296049400 39600 1 +1030}
+    {2311772400 37800 0 +1030}
+    {2327499000 39600 1 +1030}
+    {2343222000 37800 0 +1030}
+    {2358948600 39600 1 +1030}
+    {2374671600 37800 0 +1030}
+    {2390398200 39600 1 +1030}
+    {2406121200 37800 0 +1030}
+    {2422452600 39600 1 +1030}
+    {2438175600 37800 0 +1030}
+    {2453902200 39600 1 +1030}
+    {2469625200 37800 0 +1030}
+    {2485351800 39600 1 +1030}
+    {2501074800 37800 0 +1030}
+    {2516801400 39600 1 +1030}
+    {2532524400 37800 0 +1030}
+    {2548251000 39600 1 +1030}
+    {2563974000 37800 0 +1030}
+    {2579700600 39600 1 +1030}
+    {2596028400 37800 0 +1030}
+    {2611755000 39600 1 +1030}
+    {2627478000 37800 0 +1030}
+    {2643204600 39600 1 +1030}
+    {2658927600 37800 0 +1030}
+    {2674654200 39600 1 +1030}
+    {2690377200 37800 0 +1030}
+    {2706103800 39600 1 +1030}
+    {2721826800 37800 0 +1030}
+    {2737553400 39600 1 +1030}
+    {2753276400 37800 0 +1030}
+    {2769607800 39600 1 +1030}
+    {2785330800 37800 0 +1030}
+    {2801057400 39600 1 +1030}
+    {2816780400 37800 0 +1030}
+    {2832507000 39600 1 +1030}
+    {2848230000 37800 0 +1030}
+    {2863956600 39600 1 +1030}
+    {2879679600 37800 0 +1030}
+    {2895406200 39600 1 +1030}
+    {2911129200 37800 0 +1030}
+    {2926855800 39600 1 +1030}
+    {2942578800 37800 0 +1030}
+    {2958910200 39600 1 +1030}
+    {2974633200 37800 0 +1030}
+    {2990359800 39600 1 +1030}
+    {3006082800 37800 0 +1030}
+    {3021809400 39600 1 +1030}
+    {3037532400 37800 0 +1030}
+    {3053259000 39600 1 +1030}
+    {3068982000 37800 0 +1030}
+    {3084708600 39600 1 +1030}
+    {3100431600 37800 0 +1030}
+    {3116763000 39600 1 +1030}
+    {3132486000 37800 0 +1030}
+    {3148212600 39600 1 +1030}
+    {3163935600 37800 0 +1030}
+    {3179662200 39600 1 +1030}
+    {3195385200 37800 0 +1030}
+    {3211111800 39600 1 +1030}
+    {3226834800 37800 0 +1030}
+    {3242561400 39600 1 +1030}
+    {3258284400 37800 0 +1030}
+    {3274011000 39600 1 +1030}
+    {3289734000 37800 0 +1030}
+    {3306065400 39600 1 +1030}
+    {3321788400 37800 0 +1030}
+    {3337515000 39600 1 +1030}
+    {3353238000 37800 0 +1030}
+    {3368964600 39600 1 +1030}
+    {3384687600 37800 0 +1030}
+    {3400414200 39600 1 +1030}
+    {3416137200 37800 0 +1030}
+    {3431863800 39600 1 +1030}
+    {3447586800 37800 0 +1030}
+    {3463313400 39600 1 +1030}
+    {3479641200 37800 0 +1030}
+    {3495367800 39600 1 +1030}
+    {3511090800 37800 0 +1030}
+    {3526817400 39600 1 +1030}
+    {3542540400 37800 0 +1030}
+    {3558267000 39600 1 +1030}
+    {3573990000 37800 0 +1030}
+    {3589716600 39600 1 +1030}
+    {3605439600 37800 0 +1030}
+    {3621166200 39600 1 +1030}
+    {3636889200 37800 0 +1030}
+    {3653220600 39600 1 +1030}
+    {3668943600 37800 0 +1030}
+    {3684670200 39600 1 +1030}
+    {3700393200 37800 0 +1030}
+    {3716119800 39600 1 +1030}
+    {3731842800 37800 0 +1030}
+    {3747569400 39600 1 +1030}
+    {3763292400 37800 0 +1030}
+    {3779019000 39600 1 +1030}
+    {3794742000 37800 0 +1030}
+    {3810468600 39600 1 +1030}
+    {3826191600 37800 0 +1030}
+    {3842523000 39600 1 +1030}
+    {3858246000 37800 0 +1030}
+    {3873972600 39600 1 +1030}
+    {3889695600 37800 0 +1030}
+    {3905422200 39600 1 +1030}
+    {3921145200 37800 0 +1030}
+    {3936871800 39600 1 +1030}
+    {3952594800 37800 0 +1030}
+    {3968321400 39600 1 +1030}
+    {3984044400 37800 0 +1030}
+    {4000375800 39600 1 +1030}
+    {4016098800 37800 0 +1030}
+    {4031825400 39600 1 +1030}
+    {4047548400 37800 0 +1030}
+    {4063275000 39600 1 +1030}
+    {4078998000 37800 0 +1030}
+    {4094724600 39600 1 +1030}
 }
diff --git a/library/tzdata/Europe/Lisbon b/library/tzdata/Europe/Lisbon
index 7168f96..b566b51 100644
--- a/library/tzdata/Europe/Lisbon
+++ b/library/tzdata/Europe/Lisbon
@@ -3,7 +3,7 @@
 set TZData(:Europe/Lisbon) {
     {-9223372036854775808 -2205 0 LMT}
     {-2713908195 -2205 0 LMT}
-    {-1830381795 0 0 WET}
+    {-1830384000 0 0 WET}
     {-1689555600 3600 1 WEST}
     {-1677801600 0 0 WET}
     {-1667437200 3600 1 WEST}
diff --git a/library/tzdata/Indian/Mauritius b/library/tzdata/Indian/Mauritius
index 2a7a0b1..4c9a051 100644
--- a/library/tzdata/Indian/Mauritius
+++ b/library/tzdata/Indian/Mauritius
@@ -3,8 +3,8 @@
 set TZData(:Indian/Mauritius) {
     {-9223372036854775808 13800 0 LMT}
     {-1988164200 14400 0 +04}
-    {403041600 18000 1 +05}
+    {403041600 18000 1 +04}
     {417034800 14400 0 +04}
-    {1224972000 18000 1 +05}
+    {1224972000 18000 1 +04}
     {1238274000 14400 0 +04}
 }
diff --git a/library/tzdata/Pacific/Apia b/library/tzdata/Pacific/Apia
index 4c0d84a..4fc91f4 100644
--- a/library/tzdata/Pacific/Apia
+++ b/library/tzdata/Pacific/Apia
@@ -4,185 +4,185 @@ set TZData(:Pacific/Apia) {
     {-9223372036854775808 45184 0 LMT}
     {-2445424384 -41216 0 LMT}
     {-1861878784 -41400 0 -1130}
-    {-631110600 -39600 0 -10}
-    {1285498800 -36000 1 -10}
-    {1301752800 -39600 0 -10}
-    {1316872800 -36000 1 -10}
-    {1325239200 50400 0 +14}
-    {1333202400 46800 0 +14}
-    {1348927200 50400 1 +14}
-    {1365256800 46800 0 +14}
-    {1380376800 50400 1 +14}
-    {1396706400 46800 0 +14}
-    {1411826400 50400 1 +14}
-    {1428156000 46800 0 +14}
-    {1443276000 50400 1 +14}
-    {1459605600 46800 0 +14}
-    {1474725600 50400 1 +14}
-    {1491055200 46800 0 +14}
-    {1506175200 50400 1 +14}
-    {1522504800 46800 0 +14}
-    {1538229600 50400 1 +14}
-    {1554559200 46800 0 +14}
-    {1569679200 50400 1 +14}
-    {1586008800 46800 0 +14}
-    {1601128800 50400 1 +14}
-    {1617458400 46800 0 +14}
-    {1632578400 50400 1 +14}
-    {1648908000 46800 0 +14}
-    {1664028000 50400 1 +14}
-    {1680357600 46800 0 +14}
-    {1695477600 50400 1 +14}
-    {1712412000 46800 0 +14}
-    {1727532000 50400 1 +14}
-    {1743861600 46800 0 +14}
-    {1758981600 50400 1 +14}
-    {1775311200 46800 0 +14}
-    {1790431200 50400 1 +14}
-    {1806760800 46800 0 +14}
-    {1821880800 50400 1 +14}
-    {1838210400 46800 0 +14}
-    {1853330400 50400 1 +14}
-    {1869660000 46800 0 +14}
-    {1885384800 50400 1 +14}
-    {1901714400 46800 0 +14}
-    {1916834400 50400 1 +14}
-    {1933164000 46800 0 +14}
-    {1948284000 50400 1 +14}
-    {1964613600 46800 0 +14}
-    {1979733600 50400 1 +14}
-    {1996063200 46800 0 +14}
-    {2011183200 50400 1 +14}
-    {2027512800 46800 0 +14}
-    {2042632800 50400 1 +14}
-    {2058962400 46800 0 +14}
-    {2074687200 50400 1 +14}
-    {2091016800 46800 0 +14}
-    {2106136800 50400 1 +14}
-    {2122466400 46800 0 +14}
-    {2137586400 50400 1 +14}
-    {2153916000 46800 0 +14}
-    {2169036000 50400 1 +14}
-    {2185365600 46800 0 +14}
-    {2200485600 50400 1 +14}
-    {2216815200 46800 0 +14}
-    {2232540000 50400 1 +14}
-    {2248869600 46800 0 +14}
-    {2263989600 50400 1 +14}
-    {2280319200 46800 0 +14}
-    {2295439200 50400 1 +14}
-    {2311768800 46800 0 +14}
-    {2326888800 50400 1 +14}
-    {2343218400 46800 0 +14}
-    {2358338400 50400 1 +14}
-    {2374668000 46800 0 +14}
-    {2389788000 50400 1 +14}
-    {2406117600 46800 0 +14}
-    {2421842400 50400 1 +14}
-    {2438172000 46800 0 +14}
-    {2453292000 50400 1 +14}
-    {2469621600 46800 0 +14}
-    {2484741600 50400 1 +14}
-    {2501071200 46800 0 +14}
-    {2516191200 50400 1 +14}
-    {2532520800 46800 0 +14}
-    {2547640800 50400 1 +14}
-    {2563970400 46800 0 +14}
-    {2579090400 50400 1 +14}
-    {2596024800 46800 0 +14}
-    {2611144800 50400 1 +14}
-    {2627474400 46800 0 +14}
-    {2642594400 50400 1 +14}
-    {2658924000 46800 0 +14}
-    {2674044000 50400 1 +14}
-    {2690373600 46800 0 +14}
-    {2705493600 50400 1 +14}
-    {2721823200 46800 0 +14}
-    {2736943200 50400 1 +14}
-    {2753272800 46800 0 +14}
-    {2768997600 50400 1 +14}
-    {2785327200 46800 0 +14}
-    {2800447200 50400 1 +14}
-    {2816776800 46800 0 +14}
-    {2831896800 50400 1 +14}
-    {2848226400 46800 0 +14}
-    {2863346400 50400 1 +14}
-    {2879676000 46800 0 +14}
-    {2894796000 50400 1 +14}
-    {2911125600 46800 0 +14}
-    {2926245600 50400 1 +14}
-    {2942575200 46800 0 +14}
-    {2958300000 50400 1 +14}
-    {2974629600 46800 0 +14}
-    {2989749600 50400 1 +14}
-    {3006079200 46800 0 +14}
-    {3021199200 50400 1 +14}
-    {3037528800 46800 0 +14}
-    {3052648800 50400 1 +14}
-    {3068978400 46800 0 +14}
-    {3084098400 50400 1 +14}
-    {3100428000 46800 0 +14}
-    {3116152800 50400 1 +14}
-    {3132482400 46800 0 +14}
-    {3147602400 50400 1 +14}
-    {3163932000 46800 0 +14}
-    {3179052000 50400 1 +14}
-    {3195381600 46800 0 +14}
-    {3210501600 50400 1 +14}
-    {3226831200 46800 0 +14}
-    {3241951200 50400 1 +14}
-    {3258280800 46800 0 +14}
-    {3273400800 50400 1 +14}
-    {3289730400 46800 0 +14}
-    {3305455200 50400 1 +14}
-    {3321784800 46800 0 +14}
-    {3336904800 50400 1 +14}
-    {3353234400 46800 0 +14}
-    {3368354400 50400 1 +14}
-    {3384684000 46800 0 +14}
-    {3399804000 50400 1 +14}
-    {3416133600 46800 0 +14}
-    {3431253600 50400 1 +14}
-    {3447583200 46800 0 +14}
-    {3462703200 50400 1 +14}
-    {3479637600 46800 0 +14}
-    {3494757600 50400 1 +14}
-    {3511087200 46800 0 +14}
-    {3526207200 50400 1 +14}
-    {3542536800 46800 0 +14}
-    {3557656800 50400 1 +14}
-    {3573986400 46800 0 +14}
-    {3589106400 50400 1 +14}
-    {3605436000 46800 0 +14}
-    {3620556000 50400 1 +14}
-    {3636885600 46800 0 +14}
-    {3652610400 50400 1 +14}
-    {3668940000 46800 0 +14}
-    {3684060000 50400 1 +14}
-    {3700389600 46800 0 +14}
-    {3715509600 50400 1 +14}
-    {3731839200 46800 0 +14}
-    {3746959200 50400 1 +14}
-    {3763288800 46800 0 +14}
-    {3778408800 50400 1 +14}
-    {3794738400 46800 0 +14}
-    {3809858400 50400 1 +14}
-    {3826188000 46800 0 +14}
-    {3841912800 50400 1 +14}
-    {3858242400 46800 0 +14}
-    {3873362400 50400 1 +14}
-    {3889692000 46800 0 +14}
-    {3904812000 50400 1 +14}
-    {3921141600 46800 0 +14}
-    {3936261600 50400 1 +14}
-    {3952591200 46800 0 +14}
-    {3967711200 50400 1 +14}
-    {3984040800 46800 0 +14}
-    {3999765600 50400 1 +14}
-    {4016095200 46800 0 +14}
-    {4031215200 50400 1 +14}
-    {4047544800 46800 0 +14}
-    {4062664800 50400 1 +14}
-    {4078994400 46800 0 +14}
-    {4094114400 50400 1 +14}
+    {-631110600 -39600 0 -11}
+    {1285498800 -36000 1 -11}
+    {1301752800 -39600 0 -11}
+    {1316872800 -36000 1 -11}
+    {1325239200 50400 0 +13}
+    {1333202400 46800 0 +13}
+    {1348927200 50400 1 +13}
+    {1365256800 46800 0 +13}
+    {1380376800 50400 1 +13}
+    {1396706400 46800 0 +13}
+    {1411826400 50400 1 +13}
+    {1428156000 46800 0 +13}
+    {1443276000 50400 1 +13}
+    {1459605600 46800 0 +13}
+    {1474725600 50400 1 +13}
+    {1491055200 46800 0 +13}
+    {1506175200 50400 1 +13}
+    {1522504800 46800 0 +13}
+    {1538229600 50400 1 +13}
+    {1554559200 46800 0 +13}
+    {1569679200 50400 1 +13}
+    {1586008800 46800 0 +13}
+    {1601128800 50400 1 +13}
+    {1617458400 46800 0 +13}
+    {1632578400 50400 1 +13}
+    {1648908000 46800 0 +13}
+    {1664028000 50400 1 +13}
+    {1680357600 46800 0 +13}
+    {1695477600 50400 1 +13}
+    {1712412000 46800 0 +13}
+    {1727532000 50400 1 +13}
+    {1743861600 46800 0 +13}
+    {1758981600 50400 1 +13}
+    {1775311200 46800 0 +13}
+    {1790431200 50400 1 +13}
+    {1806760800 46800 0 +13}
+    {1821880800 50400 1 +13}
+    {1838210400 46800 0 +13}
+    {1853330400 50400 1 +13}
+    {1869660000 46800 0 +13}
+    {1885384800 50400 1 +13}
+    {1901714400 46800 0 +13}
+    {1916834400 50400 1 +13}
+    {1933164000 46800 0 +13}
+    {1948284000 50400 1 +13}
+    {1964613600 46800 0 +13}
+    {1979733600 50400 1 +13}
+    {1996063200 46800 0 +13}
+    {2011183200 50400 1 +13}
+    {2027512800 46800 0 +13}
+    {2042632800 50400 1 +13}
+    {2058962400 46800 0 +13}
+    {2074687200 50400 1 +13}
+    {2091016800 46800 0 +13}
+    {2106136800 50400 1 +13}
+    {2122466400 46800 0 +13}
+    {2137586400 50400 1 +13}
+    {2153916000 46800 0 +13}
+    {2169036000 50400 1 +13}
+    {2185365600 46800 0 +13}
+    {2200485600 50400 1 +13}
+    {2216815200 46800 0 +13}
+    {2232540000 50400 1 +13}
+    {2248869600 46800 0 +13}
+    {2263989600 50400 1 +13}
+    {2280319200 46800 0 +13}
+    {2295439200 50400 1 +13}
+    {2311768800 46800 0 +13}
+    {2326888800 50400 1 +13}
+    {2343218400 46800 0 +13}
+    {2358338400 50400 1 +13}
+    {2374668000 46800 0 +13}
+    {2389788000 50400 1 +13}
+    {2406117600 46800 0 +13}
+    {2421842400 50400 1 +13}
+    {2438172000 46800 0 +13}
+    {2453292000 50400 1 +13}
+    {2469621600 46800 0 +13}
+    {2484741600 50400 1 +13}
+    {2501071200 46800 0 +13}
+    {2516191200 50400 1 +13}
+    {2532520800 46800 0 +13}
+    {2547640800 50400 1 +13}
+    {2563970400 46800 0 +13}
+    {2579090400 50400 1 +13}
+    {2596024800 46800 0 +13}
+    {2611144800 50400 1 +13}
+    {2627474400 46800 0 +13}
+    {2642594400 50400 1 +13}
+    {2658924000 46800 0 +13}
+    {2674044000 50400 1 +13}
+    {2690373600 46800 0 +13}
+    {2705493600 50400 1 +13}
+    {2721823200 46800 0 +13}
+    {2736943200 50400 1 +13}
+    {2753272800 46800 0 +13}
+    {2768997600 50400 1 +13}
+    {2785327200 46800 0 +13}
+    {2800447200 50400 1 +13}
+    {2816776800 46800 0 +13}
+    {2831896800 50400 1 +13}
+    {2848226400 46800 0 +13}
+    {2863346400 50400 1 +13}
+    {2879676000 46800 0 +13}
+    {2894796000 50400 1 +13}
+    {2911125600 46800 0 +13}
+    {2926245600 50400 1 +13}
+    {2942575200 46800 0 +13}
+    {2958300000 50400 1 +13}
+    {2974629600 46800 0 +13}
+    {2989749600 50400 1 +13}
+    {3006079200 46800 0 +13}
+    {3021199200 50400 1 +13}
+    {3037528800 46800 0 +13}
+    {3052648800 50400 1 +13}
+    {3068978400 46800 0 +13}
+    {3084098400 50400 1 +13}
+    {3100428000 46800 0 +13}
+    {3116152800 50400 1 +13}
+    {3132482400 46800 0 +13}
+    {3147602400 50400 1 +13}
+    {3163932000 46800 0 +13}
+    {3179052000 50400 1 +13}
+    {3195381600 46800 0 +13}
+    {3210501600 50400 1 +13}
+    {3226831200 46800 0 +13}
+    {3241951200 50400 1 +13}
+    {3258280800 46800 0 +13}
+    {3273400800 50400 1 +13}
+    {3289730400 46800 0 +13}
+    {3305455200 50400 1 +13}
+    {3321784800 46800 0 +13}
+    {3336904800 50400 1 +13}
+    {3353234400 46800 0 +13}
+    {3368354400 50400 1 +13}
+    {3384684000 46800 0 +13}
+    {3399804000 50400 1 +13}
+    {3416133600 46800 0 +13}
+    {3431253600 50400 1 +13}
+    {3447583200 46800 0 +13}
+    {3462703200 50400 1 +13}
+    {3479637600 46800 0 +13}
+    {3494757600 50400 1 +13}
+    {3511087200 46800 0 +13}
+    {3526207200 50400 1 +13}
+    {3542536800 46800 0 +13}
+    {3557656800 50400 1 +13}
+    {3573986400 46800 0 +13}
+    {3589106400 50400 1 +13}
+    {3605436000 46800 0 +13}
+    {3620556000 50400 1 +13}
+    {3636885600 46800 0 +13}
+    {3652610400 50400 1 +13}
+    {3668940000 46800 0 +13}
+    {3684060000 50400 1 +13}
+    {3700389600 46800 0 +13}
+    {3715509600 50400 1 +13}
+    {3731839200 46800 0 +13}
+    {3746959200 50400 1 +13}
+    {3763288800 46800 0 +13}
+    {3778408800 50400 1 +13}
+    {3794738400 46800 0 +13}
+    {3809858400 50400 1 +13}
+    {3826188000 46800 0 +13}
+    {3841912800 50400 1 +13}
+    {3858242400 46800 0 +13}
+    {3873362400 50400 1 +13}
+    {3889692000 46800 0 +13}
+    {3904812000 50400 1 +13}
+    {3921141600 46800 0 +13}
+    {3936261600 50400 1 +13}
+    {3952591200 46800 0 +13}
+    {3967711200 50400 1 +13}
+    {3984040800 46800 0 +13}
+    {3999765600 50400 1 +13}
+    {4016095200 46800 0 +13}
+    {4031215200 50400 1 +13}
+    {4047544800 46800 0 +13}
+    {4062664800 50400 1 +13}
+    {4078994400 46800 0 +13}
+    {4094114400 50400 1 +13}
 }
diff --git a/library/tzdata/Pacific/Chatham b/library/tzdata/Pacific/Chatham
index 5d39879..6c1ab19 100644
--- a/library/tzdata/Pacific/Chatham
+++ b/library/tzdata/Pacific/Chatham
@@ -3,256 +3,256 @@
 set TZData(:Pacific/Chatham) {
     {-9223372036854775808 44028 0 LMT}
     {-3192437628 44100 0 +1215}
-    {-757426500 45900 0 +1345}
-    {152632800 49500 1 +1345}
-    {162309600 45900 0 +1345}
-    {183477600 49500 1 +1345}
-    {194968800 45900 0 +1345}
-    {215532000 49500 1 +1345}
-    {226418400 45900 0 +1345}
-    {246981600 49500 1 +1345}
-    {257868000 45900 0 +1345}
-    {278431200 49500 1 +1345}
-    {289317600 45900 0 +1345}
-    {309880800 49500 1 +1345}
-    {320767200 45900 0 +1345}
-    {341330400 49500 1 +1345}
-    {352216800 45900 0 +1345}
-    {372780000 49500 1 +1345}
-    {384271200 45900 0 +1345}
-    {404834400 49500 1 +1345}
-    {415720800 45900 0 +1345}
-    {436284000 49500 1 +1345}
-    {447170400 45900 0 +1345}
-    {467733600 49500 1 +1345}
-    {478620000 45900 0 +1345}
-    {499183200 49500 1 +1345}
-    {510069600 45900 0 +1345}
-    {530632800 49500 1 +1345}
-    {541519200 45900 0 +1345}
-    {562082400 49500 1 +1345}
-    {573573600 45900 0 +1345}
-    {594136800 49500 1 +1345}
-    {605023200 45900 0 +1345}
-    {623772000 49500 1 +1345}
-    {637682400 45900 0 +1345}
-    {655221600 49500 1 +1345}
-    {669132000 45900 0 +1345}
-    {686671200 49500 1 +1345}
-    {700581600 45900 0 +1345}
-    {718120800 49500 1 +1345}
-    {732636000 45900 0 +1345}
-    {749570400 49500 1 +1345}
-    {764085600 45900 0 +1345}
-    {781020000 49500 1 +1345}
-    {795535200 45900 0 +1345}
-    {812469600 49500 1 +1345}
-    {826984800 45900 0 +1345}
-    {844524000 49500 1 +1345}
-    {858434400 45900 0 +1345}
-    {875973600 49500 1 +1345}
-    {889884000 45900 0 +1345}
-    {907423200 49500 1 +1345}
-    {921938400 45900 0 +1345}
-    {938872800 49500 1 +1345}
-    {953388000 45900 0 +1345}
-    {970322400 49500 1 +1345}
-    {984837600 45900 0 +1345}
-    {1002376800 49500 1 +1345}
-    {1016287200 45900 0 +1345}
-    {1033826400 49500 1 +1345}
-    {1047736800 45900 0 +1345}
-    {1065276000 49500 1 +1345}
-    {1079791200 45900 0 +1345}
-    {1096725600 49500 1 +1345}
-    {1111240800 45900 0 +1345}
-    {1128175200 49500 1 +1345}
-    {1142690400 45900 0 +1345}
-    {1159624800 49500 1 +1345}
-    {1174140000 45900 0 +1345}
-    {1191074400 49500 1 +1345}
-    {1207404000 45900 0 +1345}
-    {1222524000 49500 1 +1345}
-    {1238853600 45900 0 +1345}
-    {1253973600 49500 1 +1345}
-    {1270303200 45900 0 +1345}
-    {1285423200 49500 1 +1345}
-    {1301752800 45900 0 +1345}
-    {1316872800 49500 1 +1345}
-    {1333202400 45900 0 +1345}
-    {1348927200 49500 1 +1345}
-    {1365256800 45900 0 +1345}
-    {1380376800 49500 1 +1345}
-    {1396706400 45900 0 +1345}
-    {1411826400 49500 1 +1345}
-    {1428156000 45900 0 +1345}
-    {1443276000 49500 1 +1345}
-    {1459605600 45900 0 +1345}
-    {1474725600 49500 1 +1345}
-    {1491055200 45900 0 +1345}
-    {1506175200 49500 1 +1345}
-    {1522504800 45900 0 +1345}
-    {1538229600 49500 1 +1345}
-    {1554559200 45900 0 +1345}
-    {1569679200 49500 1 +1345}
-    {1586008800 45900 0 +1345}
-    {1601128800 49500 1 +1345}
-    {1617458400 45900 0 +1345}
-    {1632578400 49500 1 +1345}
-    {1648908000 45900 0 +1345}
-    {1664028000 49500 1 +1345}
-    {1680357600 45900 0 +1345}
-    {1695477600 49500 1 +1345}
-    {1712412000 45900 0 +1345}
-    {1727532000 49500 1 +1345}
-    {1743861600 45900 0 +1345}
-    {1758981600 49500 1 +1345}
-    {1775311200 45900 0 +1345}
-    {1790431200 49500 1 +1345}
-    {1806760800 45900 0 +1345}
-    {1821880800 49500 1 +1345}
-    {1838210400 45900 0 +1345}
-    {1853330400 49500 1 +1345}
-    {1869660000 45900 0 +1345}
-    {1885384800 49500 1 +1345}
-    {1901714400 45900 0 +1345}
-    {1916834400 49500 1 +1345}
-    {1933164000 45900 0 +1345}
-    {1948284000 49500 1 +1345}
-    {1964613600 45900 0 +1345}
-    {1979733600 49500 1 +1345}
-    {1996063200 45900 0 +1345}
-    {2011183200 49500 1 +1345}
-    {2027512800 45900 0 +1345}
-    {2042632800 49500 1 +1345}
-    {2058962400 45900 0 +1345}
-    {2074687200 49500 1 +1345}
-    {2091016800 45900 0 +1345}
-    {2106136800 49500 1 +1345}
-    {2122466400 45900 0 +1345}
-    {2137586400 49500 1 +1345}
-    {2153916000 45900 0 +1345}
-    {2169036000 49500 1 +1345}
-    {2185365600 45900 0 +1345}
-    {2200485600 49500 1 +1345}
-    {2216815200 45900 0 +1345}
-    {2232540000 49500 1 +1345}
-    {2248869600 45900 0 +1345}
-    {2263989600 49500 1 +1345}
-    {2280319200 45900 0 +1345}
-    {2295439200 49500 1 +1345}
-    {2311768800 45900 0 +1345}
-    {2326888800 49500 1 +1345}
-    {2343218400 45900 0 +1345}
-    {2358338400 49500 1 +1345}
-    {2374668000 45900 0 +1345}
-    {2389788000 49500 1 +1345}
-    {2406117600 45900 0 +1345}
-    {2421842400 49500 1 +1345}
-    {2438172000 45900 0 +1345}
-    {2453292000 49500 1 +1345}
-    {2469621600 45900 0 +1345}
-    {2484741600 49500 1 +1345}
-    {2501071200 45900 0 +1345}
-    {2516191200 49500 1 +1345}
-    {2532520800 45900 0 +1345}
-    {2547640800 49500 1 +1345}
-    {2563970400 45900 0 +1345}
-    {2579090400 49500 1 +1345}
-    {2596024800 45900 0 +1345}
-    {2611144800 49500 1 +1345}
-    {2627474400 45900 0 +1345}
-    {2642594400 49500 1 +1345}
-    {2658924000 45900 0 +1345}
-    {2674044000 49500 1 +1345}
-    {2690373600 45900 0 +1345}
-    {2705493600 49500 1 +1345}
-    {2721823200 45900 0 +1345}
-    {2736943200 49500 1 +1345}
-    {2753272800 45900 0 +1345}
-    {2768997600 49500 1 +1345}
-    {2785327200 45900 0 +1345}
-    {2800447200 49500 1 +1345}
-    {2816776800 45900 0 +1345}
-    {2831896800 49500 1 +1345}
-    {2848226400 45900 0 +1345}
-    {2863346400 49500 1 +1345}
-    {2879676000 45900 0 +1345}
-    {2894796000 49500 1 +1345}
-    {2911125600 45900 0 +1345}
-    {2926245600 49500 1 +1345}
-    {2942575200 45900 0 +1345}
-    {2958300000 49500 1 +1345}
-    {2974629600 45900 0 +1345}
-    {2989749600 49500 1 +1345}
-    {3006079200 45900 0 +1345}
-    {3021199200 49500 1 +1345}
-    {3037528800 45900 0 +1345}
-    {3052648800 49500 1 +1345}
-    {3068978400 45900 0 +1345}
-    {3084098400 49500 1 +1345}
-    {3100428000 45900 0 +1345}
-    {3116152800 49500 1 +1345}
-    {3132482400 45900 0 +1345}
-    {3147602400 49500 1 +1345}
-    {3163932000 45900 0 +1345}
-    {3179052000 49500 1 +1345}
-    {3195381600 45900 0 +1345}
-    {3210501600 49500 1 +1345}
-    {3226831200 45900 0 +1345}
-    {3241951200 49500 1 +1345}
-    {3258280800 45900 0 +1345}
-    {3273400800 49500 1 +1345}
-    {3289730400 45900 0 +1345}
-    {3305455200 49500 1 +1345}
-    {3321784800 45900 0 +1345}
-    {3336904800 49500 1 +1345}
-    {3353234400 45900 0 +1345}
-    {3368354400 49500 1 +1345}
-    {3384684000 45900 0 +1345}
-    {3399804000 49500 1 +1345}
-    {3416133600 45900 0 +1345}
-    {3431253600 49500 1 +1345}
-    {3447583200 45900 0 +1345}
-    {3462703200 49500 1 +1345}
-    {3479637600 45900 0 +1345}
-    {3494757600 49500 1 +1345}
-    {3511087200 45900 0 +1345}
-    {3526207200 49500 1 +1345}
-    {3542536800 45900 0 +1345}
-    {3557656800 49500 1 +1345}
-    {3573986400 45900 0 +1345}
-    {3589106400 49500 1 +1345}
-    {3605436000 45900 0 +1345}
-    {3620556000 49500 1 +1345}
-    {3636885600 45900 0 +1345}
-    {3652610400 49500 1 +1345}
-    {3668940000 45900 0 +1345}
-    {3684060000 49500 1 +1345}
-    {3700389600 45900 0 +1345}
-    {3715509600 49500 1 +1345}
-    {3731839200 45900 0 +1345}
-    {3746959200 49500 1 +1345}
-    {3763288800 45900 0 +1345}
-    {3778408800 49500 1 +1345}
-    {3794738400 45900 0 +1345}
-    {3809858400 49500 1 +1345}
-    {3826188000 45900 0 +1345}
-    {3841912800 49500 1 +1345}
-    {3858242400 45900 0 +1345}
-    {3873362400 49500 1 +1345}
-    {3889692000 45900 0 +1345}
-    {3904812000 49500 1 +1345}
-    {3921141600 45900 0 +1345}
-    {3936261600 49500 1 +1345}
-    {3952591200 45900 0 +1345}
-    {3967711200 49500 1 +1345}
-    {3984040800 45900 0 +1345}
-    {3999765600 49500 1 +1345}
-    {4016095200 45900 0 +1345}
-    {4031215200 49500 1 +1345}
-    {4047544800 45900 0 +1345}
-    {4062664800 49500 1 +1345}
-    {4078994400 45900 0 +1345}
-    {4094114400 49500 1 +1345}
+    {-757426500 45900 0 +1245}
+    {152632800 49500 1 +1245}
+    {162309600 45900 0 +1245}
+    {183477600 49500 1 +1245}
+    {194968800 45900 0 +1245}
+    {215532000 49500 1 +1245}
+    {226418400 45900 0 +1245}
+    {246981600 49500 1 +1245}
+    {257868000 45900 0 +1245}
+    {278431200 49500 1 +1245}
+    {289317600 45900 0 +1245}
+    {309880800 49500 1 +1245}
+    {320767200 45900 0 +1245}
+    {341330400 49500 1 +1245}
+    {352216800 45900 0 +1245}
+    {372780000 49500 1 +1245}
+    {384271200 45900 0 +1245}
+    {404834400 49500 1 +1245}
+    {415720800 45900 0 +1245}
+    {436284000 49500 1 +1245}
+    {447170400 45900 0 +1245}
+    {467733600 49500 1 +1245}
+    {478620000 45900 0 +1245}
+    {499183200 49500 1 +1245}
+    {510069600 45900 0 +1245}
+    {530632800 49500 1 +1245}
+    {541519200 45900 0 +1245}
+    {562082400 49500 1 +1245}
+    {573573600 45900 0 +1245}
+    {594136800 49500 1 +1245}
+    {605023200 45900 0 +1245}
+    {623772000 49500 1 +1245}
+    {637682400 45900 0 +1245}
+    {655221600 49500 1 +1245}
+    {669132000 45900 0 +1245}
+    {686671200 49500 1 +1245}
+    {700581600 45900 0 +1245}
+    {718120800 49500 1 +1245}
+    {732636000 45900 0 +1245}
+    {749570400 49500 1 +1245}
+    {764085600 45900 0 +1245}
+    {781020000 49500 1 +1245}
+    {795535200 45900 0 +1245}
+    {812469600 49500 1 +1245}
+    {826984800 45900 0 +1245}
+    {844524000 49500 1 +1245}
+    {858434400 45900 0 +1245}
+    {875973600 49500 1 +1245}
+    {889884000 45900 0 +1245}
+    {907423200 49500 1 +1245}
+    {921938400 45900 0 +1245}
+    {938872800 49500 1 +1245}
+    {953388000 45900 0 +1245}
+    {970322400 49500 1 +1245}
+    {984837600 45900 0 +1245}
+    {1002376800 49500 1 +1245}
+    {1016287200 45900 0 +1245}
+    {1033826400 49500 1 +1245}
+    {1047736800 45900 0 +1245}
+    {1065276000 49500 1 +1245}
+    {1079791200 45900 0 +1245}
+    {1096725600 49500 1 +1245}
+    {1111240800 45900 0 +1245}
+    {1128175200 49500 1 +1245}
+    {1142690400 45900 0 +1245}
+    {1159624800 49500 1 +1245}
+    {1174140000 45900 0 +1245}
+    {1191074400 49500 1 +1245}
+    {1207404000 45900 0 +1245}
+    {1222524000 49500 1 +1245}
+    {1238853600 45900 0 +1245}
+    {1253973600 49500 1 +1245}
+    {1270303200 45900 0 +1245}
+    {1285423200 49500 1 +1245}
+    {1301752800 45900 0 +1245}
+    {1316872800 49500 1 +1245}
+    {1333202400 45900 0 +1245}
+    {1348927200 49500 1 +1245}
+    {1365256800 45900 0 +1245}
+    {1380376800 49500 1 +1245}
+    {1396706400 45900 0 +1245}
+    {1411826400 49500 1 +1245}
+    {1428156000 45900 0 +1245}
+    {1443276000 49500 1 +1245}
+    {1459605600 45900 0 +1245}
+    {1474725600 49500 1 +1245}
+    {1491055200 45900 0 +1245}
+    {1506175200 49500 1 +1245}
+    {1522504800 45900 0 +1245}
+    {1538229600 49500 1 +1245}
+    {1554559200 45900 0 +1245}
+    {1569679200 49500 1 +1245}
+    {1586008800 45900 0 +1245}
+    {1601128800 49500 1 +1245}
+    {1617458400 45900 0 +1245}
+    {1632578400 49500 1 +1245}
+    {1648908000 45900 0 +1245}
+    {1664028000 49500 1 +1245}
+    {1680357600 45900 0 +1245}
+    {1695477600 49500 1 +1245}
+    {1712412000 45900 0 +1245}
+    {1727532000 49500 1 +1245}
+    {1743861600 45900 0 +1245}
+    {1758981600 49500 1 +1245}
+    {1775311200 45900 0 +1245}
+    {1790431200 49500 1 +1245}
+    {1806760800 45900 0 +1245}
+    {1821880800 49500 1 +1245}
+    {1838210400 45900 0 +1245}
+    {1853330400 49500 1 +1245}
+    {1869660000 45900 0 +1245}
+    {1885384800 49500 1 +1245}
+    {1901714400 45900 0 +1245}
+    {1916834400 49500 1 +1245}
+    {1933164000 45900 0 +1245}
+    {1948284000 49500 1 +1245}
+    {1964613600 45900 0 +1245}
+    {1979733600 49500 1 +1245}
+    {1996063200 45900 0 +1245}
+    {2011183200 49500 1 +1245}
+    {2027512800 45900 0 +1245}
+    {2042632800 49500 1 +1245}
+    {2058962400 45900 0 +1245}
+    {2074687200 49500 1 +1245}
+    {2091016800 45900 0 +1245}
+    {2106136800 49500 1 +1245}
+    {2122466400 45900 0 +1245}
+    {2137586400 49500 1 +1245}
+    {2153916000 45900 0 +1245}
+    {2169036000 49500 1 +1245}
+    {2185365600 45900 0 +1245}
+    {2200485600 49500 1 +1245}
+    {2216815200 45900 0 +1245}
+    {2232540000 49500 1 +1245}
+    {2248869600 45900 0 +1245}
+    {2263989600 49500 1 +1245}
+    {2280319200 45900 0 +1245}
+    {2295439200 49500 1 +1245}
+    {2311768800 45900 0 +1245}
+    {2326888800 49500 1 +1245}
+    {2343218400 45900 0 +1245}
+    {2358338400 49500 1 +1245}
+    {2374668000 45900 0 +1245}
+    {2389788000 49500 1 +1245}
+    {2406117600 45900 0 +1245}
+    {2421842400 49500 1 +1245}
+    {2438172000 45900 0 +1245}
+    {2453292000 49500 1 +1245}
+    {2469621600 45900 0 +1245}
+    {2484741600 49500 1 +1245}
+    {2501071200 45900 0 +1245}
+    {2516191200 49500 1 +1245}
+    {2532520800 45900 0 +1245}
+    {2547640800 49500 1 +1245}
+    {2563970400 45900 0 +1245}
+    {2579090400 49500 1 +1245}
+    {2596024800 45900 0 +1245}
+    {2611144800 49500 1 +1245}
+    {2627474400 45900 0 +1245}
+    {2642594400 49500 1 +1245}
+    {2658924000 45900 0 +1245}
+    {2674044000 49500 1 +1245}
+    {2690373600 45900 0 +1245}
+    {2705493600 49500 1 +1245}
+    {2721823200 45900 0 +1245}
+    {2736943200 49500 1 +1245}
+    {2753272800 45900 0 +1245}
+    {2768997600 49500 1 +1245}
+    {2785327200 45900 0 +1245}
+    {2800447200 49500 1 +1245}
+    {2816776800 45900 0 +1245}
+    {2831896800 49500 1 +1245}
+    {2848226400 45900 0 +1245}
+    {2863346400 49500 1 +1245}
+    {2879676000 45900 0 +1245}
+    {2894796000 49500 1 +1245}
+    {2911125600 45900 0 +1245}
+    {2926245600 49500 1 +1245}
+    {2942575200 45900 0 +1245}
+    {2958300000 49500 1 +1245}
+    {2974629600 45900 0 +1245}
+    {2989749600 49500 1 +1245}
+    {3006079200 45900 0 +1245}
+    {3021199200 49500 1 +1245}
+    {3037528800 45900 0 +1245}
+    {3052648800 49500 1 +1245}
+    {3068978400 45900 0 +1245}
+    {3084098400 49500 1 +1245}
+    {3100428000 45900 0 +1245}
+    {3116152800 49500 1 +1245}
+    {3132482400 45900 0 +1245}
+    {3147602400 49500 1 +1245}
+    {3163932000 45900 0 +1245}
+    {3179052000 49500 1 +1245}
+    {3195381600 45900 0 +1245}
+    {3210501600 49500 1 +1245}
+    {3226831200 45900 0 +1245}
+    {3241951200 49500 1 +1245}
+    {3258280800 45900 0 +1245}
+    {3273400800 49500 1 +1245}
+    {3289730400 45900 0 +1245}
+    {3305455200 49500 1 +1245}
+    {3321784800 45900 0 +1245}
+    {3336904800 49500 1 +1245}
+    {3353234400 45900 0 +1245}
+    {3368354400 49500 1 +1245}
+    {3384684000 45900 0 +1245}
+    {3399804000 49500 1 +1245}
+    {3416133600 45900 0 +1245}
+    {3431253600 49500 1 +1245}
+    {3447583200 45900 0 +1245}
+    {3462703200 49500 1 +1245}
+    {3479637600 45900 0 +1245}
+    {3494757600 49500 1 +1245}
+    {3511087200 45900 0 +1245}
+    {3526207200 49500 1 +1245}
+    {3542536800 45900 0 +1245}
+    {3557656800 49500 1 +1245}
+    {3573986400 45900 0 +1245}
+    {3589106400 49500 1 +1245}
+    {3605436000 45900 0 +1245}
+    {3620556000 49500 1 +1245}
+    {3636885600 45900 0 +1245}
+    {3652610400 49500 1 +1245}
+    {3668940000 45900 0 +1245}
+    {3684060000 49500 1 +1245}
+    {3700389600 45900 0 +1245}
+    {3715509600 49500 1 +1245}
+    {3731839200 45900 0 +1245}
+    {3746959200 49500 1 +1245}
+    {3763288800 45900 0 +1245}
+    {3778408800 49500 1 +1245}
+    {3794738400 45900 0 +1245}
+    {3809858400 49500 1 +1245}
+    {3826188000 45900 0 +1245}
+    {3841912800 49500 1 +1245}
+    {3858242400 45900 0 +1245}
+    {3873362400 49500 1 +1245}
+    {3889692000 45900 0 +1245}
+    {3904812000 49500 1 +1245}
+    {3921141600 45900 0 +1245}
+    {3936261600 49500 1 +1245}
+    {3952591200 45900 0 +1245}
+    {3967711200 49500 1 +1245}
+    {3984040800 45900 0 +1245}
+    {3999765600 49500 1 +1245}
+    {4016095200 45900 0 +1245}
+    {4031215200 49500 1 +1245}
+    {4047544800 45900 0 +1245}
+    {4062664800 49500 1 +1245}
+    {4078994400 45900 0 +1245}
+    {4094114400 49500 1 +1245}
 }
diff --git a/library/tzdata/Pacific/Easter b/library/tzdata/Pacific/Easter
index 474a32b..a087cd0 100644
--- a/library/tzdata/Pacific/Easter
+++ b/library/tzdata/Pacific/Easter
@@ -4,265 +4,265 @@ set TZData(:Pacific/Easter) {
     {-9223372036854775808 -26248 0 LMT}
     {-2524495352 -26248 0 EMT}
     {-1178124152 -25200 0 -07}
-    {-36619200 -21600 1 -06}
+    {-36619200 -21600 1 -07}
     {-23922000 -25200 0 -07}
-    {-3355200 -21600 1 -06}
+    {-3355200 -21600 1 -07}
     {7527600 -25200 0 -07}
-    {24465600 -21600 1 -06}
+    {24465600 -21600 1 -07}
     {37767600 -25200 0 -07}
-    {55915200 -21600 1 -06}
+    {55915200 -21600 1 -07}
     {69217200 -25200 0 -07}
-    {87969600 -21600 1 -06}
+    {87969600 -21600 1 -07}
     {100666800 -25200 0 -07}
-    {118209600 -21600 1 -06}
+    {118209600 -21600 1 -07}
     {132116400 -25200 0 -07}
-    {150868800 -21600 1 -06}
+    {150868800 -21600 1 -07}
     {163566000 -25200 0 -07}
-    {182318400 -21600 1 -06}
+    {182318400 -21600 1 -07}
     {195620400 -25200 0 -07}
-    {213768000 -21600 1 -06}
+    {213768000 -21600 1 -07}
     {227070000 -25200 0 -07}
-    {245217600 -21600 1 -06}
+    {245217600 -21600 1 -07}
     {258519600 -25200 0 -07}
-    {277272000 -21600 1 -06}
+    {277272000 -21600 1 -07}
     {289969200 -25200 0 -07}
-    {308721600 -21600 1 -06}
+    {308721600 -21600 1 -07}
     {321418800 -25200 0 -07}
-    {340171200 -21600 1 -06}
+    {340171200 -21600 1 -07}
     {353473200 -25200 0 -07}
-    {371620800 -21600 1 -06}
+    {371620800 -21600 1 -07}
     {384922800 -21600 0 -06}
-    {403070400 -18000 1 -05}
+    {403070400 -18000 1 -06}
     {416372400 -21600 0 -06}
-    {434520000 -18000 1 -05}
+    {434520000 -18000 1 -06}
     {447822000 -21600 0 -06}
-    {466574400 -18000 1 -05}
+    {466574400 -18000 1 -06}
     {479271600 -21600 0 -06}
-    {498024000 -18000 1 -05}
+    {498024000 -18000 1 -06}
     {510721200 -21600 0 -06}
-    {529473600 -18000 1 -05}
+    {529473600 -18000 1 -06}
     {545194800 -21600 0 -06}
-    {560923200 -18000 1 -05}
+    {560923200 -18000 1 -06}
     {574225200 -21600 0 -06}
-    {592372800 -18000 1 -05}
+    {592372800 -18000 1 -06}
     {605674800 -21600 0 -06}
-    {624427200 -18000 1 -05}
+    {624427200 -18000 1 -06}
     {637124400 -21600 0 -06}
-    {653457600 -18000 1 -05}
+    {653457600 -18000 1 -06}
     {668574000 -21600 0 -06}
-    {687326400 -18000 1 -05}
+    {687326400 -18000 1 -06}
     {700628400 -21600 0 -06}
-    {718776000 -18000 1 -05}
+    {718776000 -18000 1 -06}
     {732078000 -21600 0 -06}
-    {750225600 -18000 1 -05}
+    {750225600 -18000 1 -06}
     {763527600 -21600 0 -06}
-    {781675200 -18000 1 -05}
+    {781675200 -18000 1 -06}
     {794977200 -21600 0 -06}
-    {813729600 -18000 1 -05}
+    {813729600 -18000 1 -06}
     {826426800 -21600 0 -06}
-    {845179200 -18000 1 -05}
+    {845179200 -18000 1 -06}
     {859690800 -21600 0 -06}
-    {876628800 -18000 1 -05}
+    {876628800 -18000 1 -06}
     {889930800 -21600 0 -06}
-    {906868800 -18000 1 -05}
+    {906868800 -18000 1 -06}
     {923194800 -21600 0 -06}
-    {939528000 -18000 1 -05}
+    {939528000 -18000 1 -06}
     {952830000 -21600 0 -06}
-    {971582400 -18000 1 -05}
+    {971582400 -18000 1 -06}
     {984279600 -21600 0 -06}
-    {1003032000 -18000 1 -05}
+    {1003032000 -18000 1 -06}
     {1015729200 -21600 0 -06}
-    {1034481600 -18000 1 -05}
+    {1034481600 -18000 1 -06}
     {1047178800 -21600 0 -06}
-    {1065931200 -18000 1 -05}
+    {1065931200 -18000 1 -06}
     {1079233200 -21600 0 -06}
-    {1097380800 -18000 1 -05}
+    {1097380800 -18000 1 -06}
     {1110682800 -21600 0 -06}
-    {1128830400 -18000 1 -05}
+    {1128830400 -18000 1 -06}
     {1142132400 -21600 0 -06}
-    {1160884800 -18000 1 -05}
+    {1160884800 -18000 1 -06}
     {1173582000 -21600 0 -06}
-    {1192334400 -18000 1 -05}
+    {1192334400 -18000 1 -06}
     {1206846000 -21600 0 -06}
-    {1223784000 -18000 1 -05}
+    {1223784000 -18000 1 -06}
     {1237086000 -21600 0 -06}
-    {1255233600 -18000 1 -05}
+    {1255233600 -18000 1 -06}
     {1270350000 -21600 0 -06}
-    {1286683200 -18000 1 -05}
+    {1286683200 -18000 1 -06}
     {1304823600 -21600 0 -06}
-    {1313899200 -18000 1 -05}
+    {1313899200 -18000 1 -06}
     {1335668400 -21600 0 -06}
-    {1346558400 -18000 1 -05}
+    {1346558400 -18000 1 -06}
     {1367118000 -21600 0 -06}
-    {1378612800 -18000 1 -05}
+    {1378612800 -18000 1 -06}
     {1398567600 -21600 0 -06}
-    {1410062400 -18000 1 -05}
+    {1410062400 -18000 1 -06}
     {1463281200 -21600 0 -06}
-    {1471147200 -18000 1 -05}
+    {1471147200 -18000 1 -06}
     {1494730800 -21600 0 -06}
-    {1502596800 -18000 1 -05}
+    {1502596800 -18000 1 -06}
     {1526180400 -21600 0 -06}
-    {1534046400 -18000 1 -05}
+    {1534046400 -18000 1 -06}
     {1557630000 -21600 0 -06}
-    {1565496000 -18000 1 -05}
+    {1565496000 -18000 1 -06}
     {1589079600 -21600 0 -06}
-    {1596945600 -18000 1 -05}
+    {1596945600 -18000 1 -06}
     {1620529200 -21600 0 -06}
-    {1629000000 -18000 1 -05}
+    {1629000000 -18000 1 -06}
     {1652583600 -21600 0 -06}
-    {1660449600 -18000 1 -05}
+    {1660449600 -18000 1 -06}
     {1684033200 -21600 0 -06}
-    {1691899200 -18000 1 -05}
+    {1691899200 -18000 1 -06}
     {1715482800 -21600 0 -06}
-    {1723348800 -18000 1 -05}
+    {1723348800 -18000 1 -06}
     {1746932400 -21600 0 -06}
-    {1754798400 -18000 1 -05}
+    {1754798400 -18000 1 -06}
     {1778382000 -21600 0 -06}
-    {1786248000 -18000 1 -05}
+    {1786248000 -18000 1 -06}
     {1809831600 -21600 0 -06}
-    {1818302400 -18000 1 -05}
+    {1818302400 -18000 1 -06}
     {1841886000 -21600 0 -06}
-    {1849752000 -18000 1 -05}
+    {1849752000 -18000 1 -06}
     {1873335600 -21600 0 -06}
-    {1881201600 -18000 1 -05}
+    {1881201600 -18000 1 -06}
     {1904785200 -21600 0 -06}
-    {1912651200 -18000 1 -05}
+    {1912651200 -18000 1 -06}
     {1936234800 -21600 0 -06}
-    {1944100800 -18000 1 -05}
+    {1944100800 -18000 1 -06}
     {1967684400 -21600 0 -06}
-    {1976155200 -18000 1 -05}
+    {1976155200 -18000 1 -06}
     {1999738800 -21600 0 -06}
-    {2007604800 -18000 1 -05}
+    {2007604800 -18000 1 -06}
     {2031188400 -21600 0 -06}
-    {2039054400 -18000 1 -05}
+    {2039054400 -18000 1 -06}
     {2062638000 -21600 0 -06}
-    {2070504000 -18000 1 -05}
+    {2070504000 -18000 1 -06}
     {2094087600 -21600 0 -06}
-    {2101953600 -18000 1 -05}
+    {2101953600 -18000 1 -06}
     {2125537200 -21600 0 -06}
-    {2133403200 -18000 1 -05}
+    {2133403200 -18000 1 -06}
     {2156986800 -21600 0 -06}
-    {2165457600 -18000 1 -05}
+    {2165457600 -18000 1 -06}
     {2189041200 -21600 0 -06}
-    {2196907200 -18000 1 -05}
+    {2196907200 -18000 1 -06}
     {2220490800 -21600 0 -06}
-    {2228356800 -18000 1 -05}
+    {2228356800 -18000 1 -06}
     {2251940400 -21600 0 -06}
-    {2259806400 -18000 1 -05}
+    {2259806400 -18000 1 -06}
     {2283390000 -21600 0 -06}
-    {2291256000 -18000 1 -05}
+    {2291256000 -18000 1 -06}
     {2314839600 -21600 0 -06}
-    {2322705600 -18000 1 -05}
+    {2322705600 -18000 1 -06}
     {2346894000 -21600 0 -06}
-    {2354760000 -18000 1 -05}
+    {2354760000 -18000 1 -06}
     {2378343600 -21600 0 -06}
-    {2386209600 -18000 1 -05}
+    {2386209600 -18000 1 -06}
     {2409793200 -21600 0 -06}
-    {2417659200 -18000 1 -05}
+    {2417659200 -18000 1 -06}
     {2441242800 -21600 0 -06}
-    {2449108800 -18000 1 -05}
+    {2449108800 -18000 1 -06}
     {2472692400 -21600 0 -06}
-    {2480558400 -18000 1 -05}
+    {2480558400 -18000 1 -06}
     {2504142000 -21600 0 -06}
-    {2512612800 -18000 1 -05}
+    {2512612800 -18000 1 -06}
     {2536196400 -21600 0 -06}
-    {2544062400 -18000 1 -05}
+    {2544062400 -18000 1 -06}
     {2567646000 -21600 0 -06}
-    {2575512000 -18000 1 -05}
+    {2575512000 -18000 1 -06}
     {2599095600 -21600 0 -06}
-    {2606961600 -18000 1 -05}
+    {2606961600 -18000 1 -06}
     {2630545200 -21600 0 -06}
-    {2638411200 -18000 1 -05}
+    {2638411200 -18000 1 -06}
     {2661994800 -21600 0 -06}
-    {2669860800 -18000 1 -05}
+    {2669860800 -18000 1 -06}
     {2693444400 -21600 0 -06}
-    {2701915200 -18000 1 -05}
+    {2701915200 -18000 1 -06}
     {2725498800 -21600 0 -06}
-    {2733364800 -18000 1 -05}
+    {2733364800 -18000 1 -06}
     {2756948400 -21600 0 -06}
-    {2764814400 -18000 1 -05}
+    {2764814400 -18000 1 -06}
     {2788398000 -21600 0 -06}
-    {2796264000 -18000 1 -05}
+    {2796264000 -18000 1 -06}
     {2819847600 -21600 0 -06}
-    {2827713600 -18000 1 -05}
+    {2827713600 -18000 1 -06}
     {2851297200 -21600 0 -06}
-    {2859768000 -18000 1 -05}
+    {2859768000 -18000 1 -06}
     {2883351600 -21600 0 -06}
-    {2891217600 -18000 1 -05}
+    {2891217600 -18000 1 -06}
     {2914801200 -21600 0 -06}
-    {2922667200 -18000 1 -05}
+    {2922667200 -18000 1 -06}
     {2946250800 -21600 0 -06}
-    {2954116800 -18000 1 -05}
+    {2954116800 -18000 1 -06}
     {2977700400 -21600 0 -06}
-    {2985566400 -18000 1 -05}
+    {2985566400 -18000 1 -06}
     {3009150000 -21600 0 -06}
-    {3017016000 -18000 1 -05}
+    {3017016000 -18000 1 -06}
     {3040599600 -21600 0 -06}
-    {3049070400 -18000 1 -05}
+    {3049070400 -18000 1 -06}
     {3072654000 -21600 0 -06}
-    {3080520000 -18000 1 -05}
+    {3080520000 -18000 1 -06}
     {3104103600 -21600 0 -06}
-    {3111969600 -18000 1 -05}
+    {3111969600 -18000 1 -06}
     {3135553200 -21600 0 -06}
-    {3143419200 -18000 1 -05}
+    {3143419200 -18000 1 -06}
     {3167002800 -21600 0 -06}
-    {3174868800 -18000 1 -05}
+    {3174868800 -18000 1 -06}
     {3198452400 -21600 0 -06}
-    {3206318400 -18000 1 -05}
+    {3206318400 -18000 1 -06}
     {3230506800 -21600 0 -06}
-    {3238372800 -18000 1 -05}
+    {3238372800 -18000 1 -06}
     {3261956400 -21600 0 -06}
-    {3269822400 -18000 1 -05}
+    {3269822400 -18000 1 -06}
     {3293406000 -21600 0 -06}
-    {3301272000 -18000 1 -05}
+    {3301272000 -18000 1 -06}
     {3324855600 -21600 0 -06}
-    {3332721600 -18000 1 -05}
+    {3332721600 -18000 1 -06}
     {3356305200 -21600 0 -06}
-    {3364171200 -18000 1 -05}
+    {3364171200 -18000 1 -06}
     {3387754800 -21600 0 -06}
-    {3396225600 -18000 1 -05}
+    {3396225600 -18000 1 -06}
     {3419809200 -21600 0 -06}
-    {3427675200 -18000 1 -05}
+    {3427675200 -18000 1 -06}
     {3451258800 -21600 0 -06}
-    {3459124800 -18000 1 -05}
+    {3459124800 -18000 1 -06}
     {3482708400 -21600 0 -06}
-    {3490574400 -18000 1 -05}
+    {3490574400 -18000 1 -06}
     {3514158000 -21600 0 -06}
-    {3522024000 -18000 1 -05}
+    {3522024000 -18000 1 -06}
     {3545607600 -21600 0 -06}
-    {3553473600 -18000 1 -05}
+    {3553473600 -18000 1 -06}
     {3577057200 -21600 0 -06}
-    {3585528000 -18000 1 -05}
+    {3585528000 -18000 1 -06}
     {3609111600 -21600 0 -06}
-    {3616977600 -18000 1 -05}
+    {3616977600 -18000 1 -06}
     {3640561200 -21600 0 -06}
-    {3648427200 -18000 1 -05}
+    {3648427200 -18000 1 -06}
     {3672010800 -21600 0 -06}
-    {3679876800 -18000 1 -05}
+    {3679876800 -18000 1 -06}
     {3703460400 -21600 0 -06}
-    {3711326400 -18000 1 -05}
+    {3711326400 -18000 1 -06}
     {3734910000 -21600 0 -06}
-    {3743380800 -18000 1 -05}
+    {3743380800 -18000 1 -06}
     {3766964400 -21600 0 -06}
-    {3774830400 -18000 1 -05}
+    {3774830400 -18000 1 -06}
     {3798414000 -21600 0 -06}
-    {3806280000 -18000 1 -05}
+    {3806280000 -18000 1 -06}
     {3829863600 -21600 0 -06}
-    {3837729600 -18000 1 -05}
+    {3837729600 -18000 1 -06}
     {3861313200 -21600 0 -06}
-    {3869179200 -18000 1 -05}
+    {3869179200 -18000 1 -06}
     {3892762800 -21600 0 -06}
-    {3900628800 -18000 1 -05}
+    {3900628800 -18000 1 -06}
     {3924212400 -21600 0 -06}
-    {3932683200 -18000 1 -05}
+    {3932683200 -18000 1 -06}
     {3956266800 -21600 0 -06}
-    {3964132800 -18000 1 -05}
+    {3964132800 -18000 1 -06}
     {3987716400 -21600 0 -06}
-    {3995582400 -18000 1 -05}
+    {3995582400 -18000 1 -06}
     {4019166000 -21600 0 -06}
-    {4027032000 -18000 1 -05}
+    {4027032000 -18000 1 -06}
     {4050615600 -21600 0 -06}
-    {4058481600 -18000 1 -05}
+    {4058481600 -18000 1 -06}
     {4082065200 -21600 0 -06}
-    {4089931200 -18000 1 -05}
+    {4089931200 -18000 1 -06}
 }
diff --git a/library/tzdata/Pacific/Efate b/library/tzdata/Pacific/Efate
index a43852e..a026ee1 100644
--- a/library/tzdata/Pacific/Efate
+++ b/library/tzdata/Pacific/Efate
@@ -3,24 +3,24 @@
 set TZData(:Pacific/Efate) {
     {-9223372036854775808 40396 0 LMT}
     {-1829387596 39600 0 +11}
-    {433256400 43200 1 +12}
+    {433256400 43200 1 +11}
     {448977600 39600 0 +11}
-    {467298000 43200 1 +12}
+    {467298000 43200 1 +11}
     {480427200 39600 0 +11}
-    {496760400 43200 1 +12}
+    {496760400 43200 1 +11}
     {511876800 39600 0 +11}
-    {528210000 43200 1 +12}
+    {528210000 43200 1 +11}
     {543931200 39600 0 +11}
-    {559659600 43200 1 +12}
+    {559659600 43200 1 +11}
     {575380800 39600 0 +11}
-    {591109200 43200 1 +12}
+    {591109200 43200 1 +11}
     {606830400 39600 0 +11}
-    {622558800 43200 1 +12}
+    {622558800 43200 1 +11}
     {638280000 39600 0 +11}
-    {654008400 43200 1 +12}
+    {654008400 43200 1 +11}
     {669729600 39600 0 +11}
-    {686062800 43200 1 +12}
+    {686062800 43200 1 +11}
     {696340800 39600 0 +11}
-    {719931600 43200 1 +12}
+    {719931600 43200 1 +11}
     {727790400 39600 0 +11}
 }
diff --git a/library/tzdata/Pacific/Enderbury b/library/tzdata/Pacific/Enderbury
index 6abd57e..48eaafe 100644
--- a/library/tzdata/Pacific/Enderbury
+++ b/library/tzdata/Pacific/Enderbury
@@ -4,5 +4,5 @@ set TZData(:Pacific/Enderbury) {
     {-9223372036854775808 -41060 0 LMT}
     {-2177411740 -43200 0 -12}
     {307627200 -39600 0 -11}
-    {788958000 46800 0 +13}
+    {788871600 46800 0 +13}
 }
diff --git a/library/tzdata/Pacific/Fiji b/library/tzdata/Pacific/Fiji
index f9d393c..610c191 100644
--- a/library/tzdata/Pacific/Fiji
+++ b/library/tzdata/Pacific/Fiji
@@ -3,189 +3,189 @@
 set TZData(:Pacific/Fiji) {
     {-9223372036854775808 42944 0 LMT}
     {-1709985344 43200 0 +12}
-    {909842400 46800 1 +13}
+    {909842400 46800 1 +12}
     {920124000 43200 0 +12}
-    {941896800 46800 1 +13}
+    {941896800 46800 1 +12}
     {951573600 43200 0 +12}
-    {1259416800 46800 1 +13}
+    {1259416800 46800 1 +12}
     {1269698400 43200 0 +12}
-    {1287842400 46800 1 +13}
+    {1287842400 46800 1 +12}
     {1299333600 43200 0 +12}
-    {1319292000 46800 1 +13}
+    {1319292000 46800 1 +12}
     {1327154400 43200 0 +12}
-    {1350741600 46800 1 +13}
+    {1350741600 46800 1 +12}
     {1358604000 43200 0 +12}
-    {1382796000 46800 1 +13}
+    {1382796000 46800 1 +12}
     {1390050000 43200 0 +12}
-    {1414850400 46800 1 +13}
+    {1414850400 46800 1 +12}
     {1421503200 43200 0 +12}
-    {1446300000 46800 1 +13}
+    {1446300000 46800 1 +12}
     {1452952800 43200 0 +12}
-    {1478354400 46800 1 +13}
+    {1478354400 46800 1 +12}
     {1484402400 43200 0 +12}
-    {1509804000 46800 1 +13}
+    {1509804000 46800 1 +12}
     {1515852000 43200 0 +12}
-    {1541253600 46800 1 +13}
+    {1541253600 46800 1 +12}
     {1547906400 43200 0 +12}
-    {1572703200 46800 1 +13}
+    {1572703200 46800 1 +12}
     {1579356000 43200 0 +12}
-    {1604152800 46800 1 +13}
+    {1604152800 46800 1 +12}
     {1610805600 43200 0 +12}
-    {1636207200 46800 1 +13}
+    {1636207200 46800 1 +12}
     {1642255200 43200 0 +12}
-    {1667656800 46800 1 +13}
+    {1667656800 46800 1 +12}
     {1673704800 43200 0 +12}
-    {1699106400 46800 1 +13}
+    {1699106400 46800 1 +12}
     {1705154400 43200 0 +12}
-    {1730556000 46800 1 +13}
+    {1730556000 46800 1 +12}
     {1737208800 43200 0 +12}
-    {1762005600 46800 1 +13}
+    {1762005600 46800 1 +12}
     {1768658400 43200 0 +12}
-    {1793455200 46800 1 +13}
+    {1793455200 46800 1 +12}
     {1800108000 43200 0 +12}
-    {1825509600 46800 1 +13}
+    {1825509600 46800 1 +12}
     {1831557600 43200 0 +12}
-    {1856959200 46800 1 +13}
+    {1856959200 46800 1 +12}
     {1863007200 43200 0 +12}
-    {1888408800 46800 1 +13}
+    {1888408800 46800 1 +12}
     {1895061600 43200 0 +12}
-    {1919858400 46800 1 +13}
+    {1919858400 46800 1 +12}
     {1926511200 43200 0 +12}
-    {1951308000 46800 1 +13}
+    {1951308000 46800 1 +12}
     {1957960800 43200 0 +12}
-    {1983362400 46800 1 +13}
+    {1983362400 46800 1 +12}
     {1989410400 43200 0 +12}
-    {2014812000 46800 1 +13}
+    {2014812000 46800 1 +12}
     {2020860000 43200 0 +12}
-    {2046261600 46800 1 +13}
+    {2046261600 46800 1 +12}
     {2052309600 43200 0 +12}
-    {2077711200 46800 1 +13}
+    {2077711200 46800 1 +12}
     {2084364000 43200 0 +12}
-    {2109160800 46800 1 +13}
+    {2109160800 46800 1 +12}
     {2115813600 43200 0 +12}
-    {2140610400 46800 1 +13}
+    {2140610400 46800 1 +12}
     {2147263200 43200 0 +12}
-    {2172664800 46800 1 +13}
+    {2172664800 46800 1 +12}
     {2178712800 43200 0 +12}
-    {2204114400 46800 1 +13}
+    {2204114400 46800 1 +12}
     {2210162400 43200 0 +12}
-    {2235564000 46800 1 +13}
+    {2235564000 46800 1 +12}
     {2242216800 43200 0 +12}
-    {2267013600 46800 1 +13}
+    {2267013600 46800 1 +12}
     {2273666400 43200 0 +12}
-    {2298463200 46800 1 +13}
+    {2298463200 46800 1 +12}
     {2305116000 43200 0 +12}
-    {2329912800 46800 1 +13}
+    {2329912800 46800 1 +12}
     {2336565600 43200 0 +12}
-    {2361967200 46800 1 +13}
+    {2361967200 46800 1 +12}
     {2368015200 43200 0 +12}
-    {2393416800 46800 1 +13}
+    {2393416800 46800 1 +12}
     {2399464800 43200 0 +12}
-    {2424866400 46800 1 +13}
+    {2424866400 46800 1 +12}
     {2431519200 43200 0 +12}
-    {2456316000 46800 1 +13}
+    {2456316000 46800 1 +12}
     {2462968800 43200 0 +12}
-    {2487765600 46800 1 +13}
+    {2487765600 46800 1 +12}
     {2494418400 43200 0 +12}
-    {2519820000 46800 1 +13}
+    {2519820000 46800 1 +12}
     {2525868000 43200 0 +12}
-    {2551269600 46800 1 +13}
+    {2551269600 46800 1 +12}
     {2557317600 43200 0 +12}
-    {2582719200 46800 1 +13}
+    {2582719200 46800 1 +12}
     {2588767200 43200 0 +12}
-    {2614168800 46800 1 +13}
+    {2614168800 46800 1 +12}
     {2620821600 43200 0 +12}
-    {2645618400 46800 1 +13}
+    {2645618400 46800 1 +12}
     {2652271200 43200 0 +12}
-    {2677068000 46800 1 +13}
+    {2677068000 46800 1 +12}
     {2683720800 43200 0 +12}
-    {2709122400 46800 1 +13}
+    {2709122400 46800 1 +12}
     {2715170400 43200 0 +12}
-    {2740572000 46800 1 +13}
+    {2740572000 46800 1 +12}
     {2746620000 43200 0 +12}
-    {2772021600 46800 1 +13}
+    {2772021600 46800 1 +12}
     {2778674400 43200 0 +12}
-    {2803471200 46800 1 +13}
+    {2803471200 46800 1 +12}
     {2810124000 43200 0 +12}
-    {2834920800 46800 1 +13}
+    {2834920800 46800 1 +12}
     {2841573600 43200 0 +12}
-    {2866975200 46800 1 +13}
+    {2866975200 46800 1 +12}
     {2873023200 43200 0 +12}
-    {2898424800 46800 1 +13}
+    {2898424800 46800 1 +12}
     {2904472800 43200 0 +12}
-    {2929874400 46800 1 +13}
+    {2929874400 46800 1 +12}
     {2935922400 43200 0 +12}
-    {2961324000 46800 1 +13}
+    {2961324000 46800 1 +12}
     {2967976800 43200 0 +12}
-    {2992773600 46800 1 +13}
+    {2992773600 46800 1 +12}
     {2999426400 43200 0 +12}
-    {3024223200 46800 1 +13}
+    {3024223200 46800 1 +12}
     {3030876000 43200 0 +12}
-    {3056277600 46800 1 +13}
+    {3056277600 46800 1 +12}
     {3062325600 43200 0 +12}
-    {3087727200 46800 1 +13}
+    {3087727200 46800 1 +12}
     {3093775200 43200 0 +12}
-    {3119176800 46800 1 +13}
+    {3119176800 46800 1 +12}
     {3125829600 43200 0 +12}
-    {3150626400 46800 1 +13}
+    {3150626400 46800 1 +12}
     {3157279200 43200 0 +12}
-    {3182076000 46800 1 +13}
+    {3182076000 46800 1 +12}
     {3188728800 43200 0 +12}
-    {3213525600 46800 1 +13}
+    {3213525600 46800 1 +12}
     {3220178400 43200 0 +12}
-    {3245580000 46800 1 +13}
+    {3245580000 46800 1 +12}
     {3251628000 43200 0 +12}
-    {3277029600 46800 1 +13}
+    {3277029600 46800 1 +12}
     {3283077600 43200 0 +12}
-    {3308479200 46800 1 +13}
+    {3308479200 46800 1 +12}
     {3315132000 43200 0 +12}
-    {3339928800 46800 1 +13}
+    {3339928800 46800 1 +12}
     {3346581600 43200 0 +12}
-    {3371378400 46800 1 +13}
+    {3371378400 46800 1 +12}
     {3378031200 43200 0 +12}
-    {3403432800 46800 1 +13}
+    {3403432800 46800 1 +12}
     {3409480800 43200 0 +12}
-    {3434882400 46800 1 +13}
+    {3434882400 46800 1 +12}
     {3440930400 43200 0 +12}
-    {3466332000 46800 1 +13}
+    {3466332000 46800 1 +12}
     {3472380000 43200 0 +12}
-    {3497781600 46800 1 +13}
+    {3497781600 46800 1 +12}
     {3504434400 43200 0 +12}
-    {3529231200 46800 1 +13}
+    {3529231200 46800 1 +12}
     {3535884000 43200 0 +12}
-    {3560680800 46800 1 +13}
+    {3560680800 46800 1 +12}
     {3567333600 43200 0 +12}
-    {3592735200 46800 1 +13}
+    {3592735200 46800 1 +12}
     {3598783200 43200 0 +12}
-    {3624184800 46800 1 +13}
+    {3624184800 46800 1 +12}
     {3630232800 43200 0 +12}
-    {3655634400 46800 1 +13}
+    {3655634400 46800 1 +12}
     {3662287200 43200 0 +12}
-    {3687084000 46800 1 +13}
+    {3687084000 46800 1 +12}
     {3693736800 43200 0 +12}
-    {3718533600 46800 1 +13}
+    {3718533600 46800 1 +12}
     {3725186400 43200 0 +12}
-    {3750588000 46800 1 +13}
+    {3750588000 46800 1 +12}
     {3756636000 43200 0 +12}
-    {3782037600 46800 1 +13}
+    {3782037600 46800 1 +12}
     {3788085600 43200 0 +12}
-    {3813487200 46800 1 +13}
+    {3813487200 46800 1 +12}
     {3819535200 43200 0 +12}
-    {3844936800 46800 1 +13}
+    {3844936800 46800 1 +12}
     {3851589600 43200 0 +12}
-    {3876386400 46800 1 +13}
+    {3876386400 46800 1 +12}
     {3883039200 43200 0 +12}
-    {3907836000 46800 1 +13}
+    {3907836000 46800 1 +12}
     {3914488800 43200 0 +12}
-    {3939890400 46800 1 +13}
+    {3939890400 46800 1 +12}
     {3945938400 43200 0 +12}
-    {3971340000 46800 1 +13}
+    {3971340000 46800 1 +12}
     {3977388000 43200 0 +12}
-    {4002789600 46800 1 +13}
+    {4002789600 46800 1 +12}
     {4009442400 43200 0 +12}
-    {4034239200 46800 1 +13}
+    {4034239200 46800 1 +12}
     {4040892000 43200 0 +12}
-    {4065688800 46800 1 +13}
+    {4065688800 46800 1 +12}
     {4072341600 43200 0 +12}
-    {4097138400 46800 1 +13}
+    {4097138400 46800 1 +12}
 }
diff --git a/library/tzdata/Pacific/Galapagos b/library/tzdata/Pacific/Galapagos
index f276f73..180ce6a 100644
--- a/library/tzdata/Pacific/Galapagos
+++ b/library/tzdata/Pacific/Galapagos
@@ -4,6 +4,6 @@ set TZData(:Pacific/Galapagos) {
     {-9223372036854775808 -21504 0 LMT}
     {-1230746496 -18000 0 -05}
     {504939600 -21600 0 -06}
-    {722930400 -18000 1 -05}
+    {722930400 -18000 1 -06}
     {728888400 -21600 0 -06}
 }
diff --git a/library/tzdata/Pacific/Kiritimati b/library/tzdata/Pacific/Kiritimati
index b703f19..7d600f3 100644
--- a/library/tzdata/Pacific/Kiritimati
+++ b/library/tzdata/Pacific/Kiritimati
@@ -4,5 +4,5 @@ set TZData(:Pacific/Kiritimati) {
     {-9223372036854775808 -37760 0 LMT}
     {-2177415040 -38400 0 -1040}
     {307622400 -36000 0 -10}
-    {788954400 50400 0 +14}
+    {788868000 50400 0 +14}
 }
diff --git a/library/tzdata/Pacific/Noumea b/library/tzdata/Pacific/Noumea
index 36b570d..c9da825 100644
--- a/library/tzdata/Pacific/Noumea
+++ b/library/tzdata/Pacific/Noumea
@@ -3,10 +3,10 @@
 set TZData(:Pacific/Noumea) {
     {-9223372036854775808 39948 0 LMT}
     {-1829387148 39600 0 +11}
-    {250002000 43200 1 +12}
+    {250002000 43200 1 +11}
     {257342400 39600 0 +11}
-    {281451600 43200 1 +12}
+    {281451600 43200 1 +11}
     {288878400 39600 0 +11}
-    {849366000 43200 1 +12}
+    {849366000 43200 1 +11}
     {857228400 39600 0 +11}
 }
diff --git a/library/tzdata/Pacific/Rarotonga b/library/tzdata/Pacific/Rarotonga
index 9a70318..2913d68 100644
--- a/library/tzdata/Pacific/Rarotonga
+++ b/library/tzdata/Pacific/Rarotonga
@@ -3,30 +3,30 @@
 set TZData(:Pacific/Rarotonga) {
     {-9223372036854775808 -38344 0 LMT}
     {-2177414456 -37800 0 -1030}
-    {279714600 -34200 0 -0930}
+    {279714600 -34200 0 -10}
     {289387800 -36000 0 -10}
-    {309952800 -34200 1 -0930}
+    {309952800 -34200 1 -10}
     {320837400 -36000 0 -10}
-    {341402400 -34200 1 -0930}
+    {341402400 -34200 1 -10}
     {352287000 -36000 0 -10}
-    {372852000 -34200 1 -0930}
+    {372852000 -34200 1 -10}
     {384341400 -36000 0 -10}
-    {404906400 -34200 1 -0930}
+    {404906400 -34200 1 -10}
     {415791000 -36000 0 -10}
-    {436356000 -34200 1 -0930}
+    {436356000 -34200 1 -10}
     {447240600 -36000 0 -10}
-    {467805600 -34200 1 -0930}
+    {467805600 -34200 1 -10}
     {478690200 -36000 0 -10}
-    {499255200 -34200 1 -0930}
+    {499255200 -34200 1 -10}
     {510139800 -36000 0 -10}
-    {530704800 -34200 1 -0930}
+    {530704800 -34200 1 -10}
     {541589400 -36000 0 -10}
-    {562154400 -34200 1 -0930}
+    {562154400 -34200 1 -10}
     {573643800 -36000 0 -10}
-    {594208800 -34200 1 -0930}
+    {594208800 -34200 1 -10}
     {605093400 -36000 0 -10}
-    {625658400 -34200 1 -0930}
+    {625658400 -34200 1 -10}
     {636543000 -36000 0 -10}
-    {657108000 -34200 1 -0930}
+    {657108000 -34200 1 -10}
     {667992600 -36000 0 -10}
 }
diff --git a/library/tzdata/Pacific/Tongatapu b/library/tzdata/Pacific/Tongatapu
index 3cfaaaa..104888a 100644
--- a/library/tzdata/Pacific/Tongatapu
+++ b/library/tzdata/Pacific/Tongatapu
@@ -5,12 +5,12 @@ set TZData(:Pacific/Tongatapu) {
     {-2177497160 44400 0 +1220}
     {-915193200 46800 0 +13}
     {915102000 46800 0 +13}
-    {939214800 50400 1 +14}
+    {939214800 50400 1 +13}
     {953384400 46800 0 +13}
-    {973342800 50400 1 +14}
+    {973342800 50400 1 +13}
     {980596800 46800 0 +13}
-    {1004792400 50400 1 +14}
+    {1004792400 50400 1 +13}
     {1012046400 46800 0 +13}
-    {1478350800 50400 1 +14}
+    {1478350800 50400 1 +13}
     {1484398800 46800 0 +13}
 }
-- 
cgit v0.12


From 3abde0eac5528b50db5a8267c5fb30b07714c079 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 25 Mar 2018 17:43:09 +0000
Subject: workaround for TclFormatInt on CYGWIN is no longer necessary now.

---
 generic/tclStubInit.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 86406c1..5df72be 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -335,10 +335,6 @@ static int uniCharNcasecmp(const Tcl_UniChar *ucs, const Tcl_UniChar *uct, unsig
    return Tcl_UniCharNcasecmp(ucs, uct, (unsigned long)n);
 }
 #define Tcl_UniCharNcasecmp (int(*)(const Tcl_UniChar*,const Tcl_UniChar*,unsigned long))uniCharNcasecmp
-static int formatInt(char *buffer, int n){
-   return TclFormatInt(buffer, (long)n);
-}
-#define TclFormatInt (int(*)(char *, long))formatInt
 
 #endif /* TCL_WIDE_INT_IS_LONG */
 
-- 
cgit v0.12


From 08dc58ce408e626f0042eb1bbe92257aa3bdd927 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 25 Mar 2018 19:20:28 +0000
Subject: No need any more on 64-bit cygwin for special *Long* stub entries.

---
 generic/tclStubInit.c | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 5df72be..be37bc0 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -265,28 +265,6 @@ Tcl_WinTCharToUtf(
  * signature. Tcl 9 must find a better solution, but that cannot be done
  * without introducing a binary incompatibility.
  */
-#define Tcl_DbNewLongObj ((Tcl_Obj*(*)(long,const char*,int))dbNewLongObj)
-static Tcl_Obj *dbNewLongObj(
-    int intValue,
-    const char *file,
-    int line
-) {
-#ifdef TCL_MEM_DEBUG
-    register Tcl_Obj *objPtr;
-
-    TclDbNewObj(objPtr, file, line);
-    objPtr->bytes = NULL;
-
-    objPtr->internalRep.wideValue = (long) intValue;
-    objPtr->typePtr = &tclIntType;
-    return objPtr;
-#else
-    return Tcl_NewIntObj(intValue);
-#endif
-}
-#define Tcl_GetLongFromObj (int(*)(Tcl_Interp*,Tcl_Obj*,long*))Tcl_GetIntFromObj
-#define Tcl_NewLongObj (Tcl_Obj*(*)(long))Tcl_NewIntObj
-#define Tcl_SetLongObj (void(*)(Tcl_Obj*,long))Tcl_SetIntObj
 static int exprInt(Tcl_Interp *interp, const char *expr, int *ptr){
     long longValue;
     int result = Tcl_ExprLong(interp, expr, &longValue);
-- 
cgit v0.12


From 220d2d7d9c2c61b1c319685a76e410fc3024facf Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 26 Mar 2018 20:21:00 +0000
Subject: Remove MINGW32 from the UNIX makefile, since Mingw should always
 build from the "win" directory. Better to avoid confusion.

---
 unix/configure | 4 ++--
 unix/tcl.m4    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/unix/configure b/unix/configure
index afc6842..36bc4b9 100755
--- a/unix/configure
+++ b/unix/configure
@@ -5189,7 +5189,7 @@ fi
 	    CC_SEARCH_FLAGS=""
 	    LD_SEARCH_FLAGS=""
 	    ;;
-	CYGWIN_*|MINGW32*)
+	CYGWIN_*)
 	    SHLIB_CFLAGS=""
 	    SHLIB_LD='${CC} -shared'
 	    SHLIB_SUFFIX=".dll"
@@ -6464,7 +6464,7 @@ fi
 	case $system in
 	    AIX-*) ;;
 	    BSD/OS*) ;;
-	    CYGWIN_*|MINGW32_*) ;;
+	    CYGWIN_*) ;;
 	    IRIX*) ;;
 	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
 	    Darwin-*) ;;
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index a6abef1..4acbed0 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1196,7 +1196,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 	    CC_SEARCH_FLAGS=""
 	    LD_SEARCH_FLAGS=""
 	    ;;
-	CYGWIN_*|MINGW32*)
+	CYGWIN_*)
 	    SHLIB_CFLAGS=""
 	    SHLIB_LD='${CC} -shared'
 	    SHLIB_SUFFIX=".dll"
@@ -1912,7 +1912,7 @@ dnl # preprocessing tests use only CPPFLAGS.
 	case $system in
 	    AIX-*) ;;
 	    BSD/OS*) ;;
-	    CYGWIN_*|MINGW32_*) ;;
+	    CYGWIN_*) ;;
 	    IRIX*) ;;
 	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
 	    Darwin-*) ;;
-- 
cgit v0.12


From 0ad3b13e2663019e4ff8d3dc944fd030e33eb358 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 5 Apr 2018 13:34:58 +0000
Subject: Failed to mutex protect all multi-thread access to the hash tables in
 the [tcl::process] implementation. This was causing segfaults in thread-8.1.

---
 generic/tclProcess.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/generic/tclProcess.c b/generic/tclProcess.c
index 7187ee4..604b7ce 100644
--- a/generic/tclProcess.c
+++ b/generic/tclProcess.c
@@ -887,6 +887,7 @@ TclProcessWait(
      * First search for pid in table.
      */
 
+    Tcl_MutexLock(&infoTablesMutex);
     entry = Tcl_FindHashEntry(&infoTablePerPid, pid);
     if (!entry) {
 	/*
@@ -897,6 +898,7 @@ TclProcessWait(
 		msgObjPtr, errorObjPtr);
 	if (msgObjPtr && *msgObjPtr) Tcl_IncrRefCount(*msgObjPtr);
 	if (errorObjPtr && *errorObjPtr) Tcl_IncrRefCount(*errorObjPtr);
+    Tcl_MutexUnlock(&infoTablesMutex);
 	return result;
     }
 
@@ -906,6 +908,7 @@ TclProcessWait(
 	 * Process has completed but TclProcessWait has already been called,
 	 * so report no change.
 	 */
+    Tcl_MutexUnlock(&infoTablesMutex);
 	
 	return TCL_PROCESS_UNCHANGED;
     }
@@ -915,6 +918,7 @@ TclProcessWait(
 	/*
 	 * No change, stop there.
 	 */
+    Tcl_MutexUnlock(&infoTablesMutex);
 	
 	return TCL_PROCESS_UNCHANGED;
     }
@@ -948,5 +952,6 @@ TclProcessWait(
 
 	info->purge = 1;
     }
+    Tcl_MutexUnlock(&infoTablesMutex);
     return result;
 }
-- 
cgit v0.12


From eb8817687f0753816e8308b93b3e992414afeca4 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 5 Apr 2018 15:37:40 +0000
Subject: [string cat] was failing to NUL terminate string reps. Stopped
 "string" values triggering false valgrind alarms when tests make use of
 [tcl::unsupported::representation].

---
 generic/tclStringObj.c | 2 ++
 generic/tclStringRep.h | 1 +
 2 files changed, 3 insertions(+)

diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 2ebec64..a2a1d41 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -3205,6 +3205,8 @@ TclStringCat(
 		dst += more;
 	    }
 	}
+	/* Must NUL-terminate! */
+	*dst = '\0';
     }
     return objResultPtr;
 
diff --git a/generic/tclStringRep.h b/generic/tclStringRep.h
index 1ef1957..fc5a713 100644
--- a/generic/tclStringRep.h
+++ b/generic/tclStringRep.h
@@ -86,6 +86,7 @@ typedef struct {
 #define GET_STRING(objPtr) \
     ((String *) (objPtr)->internalRep.twoPtrValue.ptr1)
 #define SET_STRING(objPtr, stringPtr) \
+    ((objPtr)->internalRep.twoPtrValue.ptr2 = NULL),			\
     ((objPtr)->internalRep.twoPtrValue.ptr1 = (void *) (stringPtr))
 
 /*
-- 
cgit v0.12


From 43507f353b82f414fff3810cc0d781a44e7ae3e9 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 5 Apr 2018 16:37:35 +0000
Subject: Plug memleak when [scan] raises an error.

---
 generic/tclScan.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/generic/tclScan.c b/generic/tclScan.c
index 113b4c6..0e3da17 100644
--- a/generic/tclScan.c
+++ b/generic/tclScan.c
@@ -941,11 +941,24 @@ Tcl_ScanObjCmd(
 	    } else if (flags & SCAN_BIG) {
 		if (flags & SCAN_UNSIGNED) {
 		    mp_int big;
-		    if ((Tcl_GetBignumFromObj(interp, objPtr, &big) != TCL_OK)
-			    || mp_isneg(&big)) {
+		    int code = Tcl_GetBignumFromObj(interp, objPtr, &big);
+
+		    if (code == TCL_OK) {
+			if (mp_isneg(&big)) {
+			    code = TCL_ERROR;
+			}
+			mp_clear(&big);
+		    }
+
+		    if (code == TCL_ERROR) {
+			if (objs != NULL) {
+			    ckfree(objs);
+			}
+			Tcl_DecrRefCount(objPtr);
 			Tcl_SetObjResult(interp, Tcl_NewStringObj(
 				"unsigned bignum scans are invalid", -1));
-			Tcl_SetErrorCode(interp, "TCL", "FORMAT", "BADUNSIGNED",NULL);
+			Tcl_SetErrorCode(interp, "TCL", "FORMAT",
+				"BADUNSIGNED",NULL);
 			return TCL_ERROR;
 		    }
 		}
-- 
cgit v0.12


From 634c443219ba3420c6a3403b7c1565076d86dbae Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 5 Apr 2018 17:22:09 +0000
Subject: Plug memleak in [format] applied to bignums.

---
 generic/tclStringObj.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index a2a1d41..fa50d6d 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -1972,6 +1972,7 @@ Tcl_AppendFormatToObj(
 		if (cmpResult == MP_EQ) gotHash = 0;
 		if (ch == 'u') {
 		    if (isNegative) {
+			mp_clear(&big);
 			msg = "unsigned bignum format is invalid";
 			errCode = "BADUNSIGNED";
 			goto errorMsg;
-- 
cgit v0.12


From 689f5653f9349eb55b176a83f0daf2762a353a2b Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Sat, 7 Apr 2018 16:55:53 +0000
Subject: Correct out-of-date documentation for [string is].

---
 doc/string.n       | 8 +++-----
 generic/tclCmdMZ.c | 1 -
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/doc/string.n b/doc/string.n
index 7e427ab..d4e2833 100644
--- a/doc/string.n
+++ b/doc/string.n
@@ -136,9 +136,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 \fBfalse\fR 12
 Any of the forms allowed to \fBTcl_GetBoolean\fR where the value is
 false.
@@ -146,7 +144,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
@@ -171,7 +169,7 @@ Any upper case alphabet character in the Unicode character set.
 .VS 8.5
 .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.
 .VE 8.5
 .IP \fBwordchar\fR 12
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index de953aa..db4e57b 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -1515,7 +1515,6 @@ StringIsCmd(
 	chcomp = Tcl_UniCharIsDigit;
 	break;
     case STR_IS_DOUBLE: {
-	/* TODO */
 	if ((objPtr->typePtr == &tclDoubleType) ||
 		(objPtr->typePtr == &tclIntType) ||
 #ifndef NO_WIDE_TYPE
-- 
cgit v0.12


From 2d5be386031bb7171009c07d78243bfcb1642d7d Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Mon, 16 Apr 2018 14:15:22 +0000
Subject: Memleak fix from Brad Lanam.

---
 generic/tclVar.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/generic/tclVar.c b/generic/tclVar.c
index 8986fdd..92b3524 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -3097,6 +3097,7 @@ ArrayObjFirst(
 	    &searchPtr->search);
     Tcl_SetHashValue(hPtr, searchPtr);
     searchPtr->name = Tcl_ObjPrintf("s-%d-%s", searchPtr->id, TclGetString(arrayNameObj));
+    Tcl_IncrRefCount(searchPtr->name);
 }
 
 int
@@ -3361,6 +3362,7 @@ ArrayForLoopCallback(
      */
     if (done != TCL_ERROR) {
       ArrayDoneSearch (iPtr, varPtr, searchPtr);
+	Tcl_DecrRefCount(searchPtr->name);
       ckfree(searchPtr);
     }
 
-- 
cgit v0.12


From 08d704bbb1b78da3ca7806bfc5c7fd8fae51e570 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Tue, 17 Apr 2018 03:48:47 +0000
Subject: Test of shimmer segfault.

---
 tests/var.test | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/var.test b/tests/var.test
index a391a01..6ac3e52 100644
--- a/tests/var.test
+++ b/tests/var.test
@@ -1143,6 +1143,15 @@ test var-23.13 {array enumeration, number of traces} -setup {
     unset -nocomplain ::a
     unset -nocomplain reslist
 } -result 3
+test var-23.14 {array for, shared arguments} -setup {
+    set vn {k v}
+    unset -nocomplain $vn
+} -body {
+    array set $vn {a 1 b 2 c 3}
+    array for $vn $vn {}
+} -cleanup {
+    unset -nocomplain $vn vn
+} -result {}
 
 catch {namespace delete ns}
 catch {unset arr}
-- 
cgit v0.12


From 47fc4afd862da2e3956e8437f7689ba043ac3a43 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Tue, 17 Apr 2018 11:11:35 +0000
Subject: Satisfy test var-23.14

---
 generic/tclVar.c | 42 ++++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/generic/tclVar.c b/generic/tclVar.c
index 92b3524..a2fa680 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -3175,13 +3175,11 @@ ArrayForNRCmd(
     Tcl_Obj *const *objv)
 {
     Interp *iPtr = (Interp *) interp;
-    Tcl_Obj *scriptObj, *keyVarObj, *valueVarObj;
-    Tcl_Obj **varv;
-    Tcl_Obj *arrayNameObj;
+    Tcl_Obj *varListObj, *arrayNameObj, *scriptObj;
     ArraySearch *searchPtr = NULL;
     Var *varPtr;
     Var *arrayPtr;
-    int varc;
+    int numVars;
 
     /*
      * array for {k v} a body
@@ -3197,10 +3195,12 @@ ArrayForNRCmd(
      * Parse arguments.
      */
 
-    if (TclListObjGetElements(interp, objv[1], &varc, &varv) != TCL_OK) {
+
+    if (Tcl_ListObjLength(interp, objv[1], &numVars) != TCL_OK) {
 	return TCL_ERROR;
     }
-    if (varc != 2) {
+
+    if (numVars != 2) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		"must have two variable names", -1));
 	Tcl_SetErrorCode(interp, "TCL", "SYNTAX", "array", "for", NULL);
@@ -3208,9 +3208,6 @@ ArrayForNRCmd(
     }
 
     arrayNameObj = objv[2];
-    keyVarObj = varv[0];
-    valueVarObj = varv[1];
-    scriptObj = objv[3];
 
     /*
      * Locate the array variable.
@@ -3262,16 +3259,16 @@ ArrayForNRCmd(
      * loop) don't vanish.
      */
 
-    Tcl_IncrRefCount(keyVarObj);
-    Tcl_IncrRefCount(valueVarObj);
+    varListObj = TclListObjCopy(NULL, objv[1]);
+    scriptObj = objv[3];
     Tcl_IncrRefCount(scriptObj);
 
     /*
      * Run the script.
      */
 
-    TclNRAddCallback(interp, ArrayForLoopCallback, searchPtr, keyVarObj,
-	    valueVarObj, scriptObj);
+    TclNRAddCallback(interp, ArrayForLoopCallback, searchPtr, varListObj,
+	    NULL, scriptObj);
     return TCL_OK;
 }
 
@@ -3283,13 +3280,13 @@ ArrayForLoopCallback(
 {
     Interp *iPtr = (Interp *) interp;
     ArraySearch *searchPtr = data[0];
-    Tcl_Obj *keyVarObj = data[1];
-    Tcl_Obj *valueVarObj = data[2];
+    Tcl_Obj *varListObj = data[1];
     Tcl_Obj *scriptObj = data[3];
+    Tcl_Obj **varv;
     Tcl_Obj *keyObj, *valueObj;
     Var *varPtr;
     Var *arrayPtr;
-    int done;
+    int done, varc;
 
     /*
      * Process the result from the previous execution of the script body.
@@ -3333,12 +3330,14 @@ ArrayForLoopCallback(
         }
 	goto arrayfordone;
     }
-    if (Tcl_ObjSetVar2(interp, keyVarObj, NULL, keyObj, TCL_LEAVE_ERR_MSG) == NULL) {
+
+    Tcl_ListObjGetElements(NULL, varListObj, &varc, &varv);
+    if (Tcl_ObjSetVar2(interp, varv[0], NULL, keyObj, TCL_LEAVE_ERR_MSG) == NULL) {
       result = TCL_ERROR;
       goto arrayfordone;
     }
     if (valueObj != NULL) {
-      if (Tcl_ObjSetVar2(interp, valueVarObj, NULL, valueObj, TCL_LEAVE_ERR_MSG) == NULL) {
+      if (Tcl_ObjSetVar2(interp, varv[1], NULL, valueObj, TCL_LEAVE_ERR_MSG) == NULL) {
         result = TCL_ERROR;
         goto arrayfordone;
       }
@@ -3348,8 +3347,8 @@ ArrayForLoopCallback(
      * Run the script.
      */
 
-    TclNRAddCallback(interp, ArrayForLoopCallback, searchPtr, keyVarObj,
-	    valueVarObj, scriptObj);
+    TclNRAddCallback(interp, ArrayForLoopCallback, searchPtr, varListObj,
+	    NULL, scriptObj);
     return TclNREvalObjEx(interp, scriptObj, 0, iPtr->cmdFramePtr, 3);
 
     /*
@@ -3366,8 +3365,7 @@ ArrayForLoopCallback(
       ckfree(searchPtr);
     }
 
-    TclDecrRefCount(keyVarObj);
-    TclDecrRefCount(valueVarObj);
+    TclDecrRefCount(varListObj);
     TclDecrRefCount(scriptObj);
     return result;
 }
-- 
cgit v0.12


From 80e5aed49e2cac237b9d91db0f5dc1139c6462dd Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Tue, 17 Apr 2018 14:32:30 +0000
Subject: Restore build success to the TCL_REMOVE_OBSOLETE_TRACES
 configuration.

---
 generic/tclTrace.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/generic/tclTrace.c b/generic/tclTrace.c
index 2e1b241..cb465ca 100644
--- a/generic/tclTrace.c
+++ b/generic/tclTrace.c
@@ -176,7 +176,9 @@ Tcl_TraceObjCmd(
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     int optionIndex;
+#ifndef TCL_REMOVE_OBSOLETE_TRACES
     char *name, *flagOps, *p;
+#endif
     /* Main sub commands to 'trace' */
     static const char *traceOptions[] = {
 	"add", "info", "remove",
@@ -352,10 +354,12 @@ Tcl_TraceObjCmd(
     }
     return TCL_OK;
 
+#ifndef TCL_REMOVE_OBSOLETE_TRACES
   badVarOps:
     Tcl_AppendResult(interp, "bad operations \"", flagOps,
 	    "\": should be one or more of rwua", NULL);
     return TCL_ERROR;
+#endif
 }
 
 /*
@@ -902,9 +906,11 @@ TraceVariableObjCmd(
 		    (sizeof(CombinedTraceVarInfo) + length + 1
 		    - sizeof(ctvarPtr->traceCmdInfo.command)));
 	    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);
@@ -931,7 +937,11 @@ TraceVariableObjCmd(
 		    TraceVarProc, clientData)) != 0) {
 		tvarPtr = (TraceVarInfo *) 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,
-- 
cgit v0.12


From f316d7539c5bb69dc519fc27be251c9ba056c189 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Tue, 17 Apr 2018 18:34:41 +0000
Subject: [array set] must fire array traces. Don't disrupt that by reporting
 argument errors too early.

---
 generic/tclCompCmds.c | 11 +++++++++++
 tests/var.test        |  9 +++++++++
 2 files changed, 20 insertions(+)

diff --git a/generic/tclCompCmds.c b/generic/tclCompCmds.c
index c2b4bdb..9a15ee0 100644
--- a/generic/tclCompCmds.c
+++ b/generic/tclCompCmds.c
@@ -322,11 +322,22 @@ TclCompileArraySetCmd(
      */
 
     if (isDataValid && !isDataEven) {
+	/* Abandon compile and let direct eval raise the error */
+	code = TCL_ERROR;
+	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;
+	 *
+	 */
     }
 
     /*
diff --git a/tests/var.test b/tests/var.test
index a9d93ac..d1340f6 100644
--- a/tests/var.test
+++ b/tests/var.test
@@ -930,6 +930,15 @@ test var-20.9 {[bc1a96407a] array set compiled w/ trace} -setup {
 test var-20.10 {[bc1a96407a] array set don't compile bad varname} -body {
     apply {{} {set name foo(bar); array set $name {a 1}}}
 } -returnCodes error -match glob -result *
+test var-20.11 {array set don't compile bad initializer} -setup {
+    unset -nocomplain foo
+    trace add variable foo array {set foo(bar) baz;#}
+} -body {
+    catch {array set foo bad}
+    set foo(bar)
+} -cleanup {
+    unset -nocomplain foo
+} -result baz
 
 test var-21.0 {PushVarNameWord OBOE in compiled unset} -setup {
     proc linenumber {} {dict get [info frame -1] line}
-- 
cgit v0.12


From 5dff80f2fe38009bc7e7c6b3f74033a8a05a59a1 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Tue, 17 Apr 2018 18:54:36 +0000
Subject: Gentler fallback.

---
 generic/tclCompCmds.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/generic/tclCompCmds.c b/generic/tclCompCmds.c
index 9a15ee0..22bbca0 100644
--- a/generic/tclCompCmds.c
+++ b/generic/tclCompCmds.c
@@ -322,8 +322,8 @@ TclCompileArraySetCmd(
      */
 
     if (isDataValid && !isDataEven) {
-	/* Abandon compile and let direct eval raise the error */
-	code = TCL_ERROR;
+	/* Abandon custom compile and let invocation raise the error */
+	code = TclCompileBasic2ArgCmd(interp, parsePtr, cmdPtr, envPtr);
 	goto done;
 
 	/*
-- 
cgit v0.12


From 62ea5e49a10037bf3a3896a933db4951ff0b15bc Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Tue, 17 Apr 2018 19:14:01 +0000
Subject: Array trace firing must come before argument checking might raise
 error.

---
 generic/tclCompCmds.c |  7 ++++---
 tests/var.test        | 13 +++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/generic/tclCompCmds.c b/generic/tclCompCmds.c
index 22bbca0..838e9d7 100644
--- a/generic/tclCompCmds.c
+++ b/generic/tclCompCmds.c
@@ -415,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) {
 	/*
@@ -439,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);
diff --git a/tests/var.test b/tests/var.test
index d1340f6..01080bc 100644
--- a/tests/var.test
+++ b/tests/var.test
@@ -939,6 +939,19 @@ test var-20.11 {array set don't compile bad initializer} -setup {
 } -cleanup {
     unset -nocomplain foo
 } -result baz
+test var-20.12 {array set don't compile bad initializer} -setup {
+    unset -nocomplain ::foo
+    trace add variable ::foo array {set ::foo(bar) baz;#}
+} -body {
+    catch {apply {{} {
+	set value bad
+	array set ::foo $value
+
+    }}}
+    set ::foo(bar)
+} -cleanup {
+    unset -nocomplain ::foo
+} -result baz
 
 test var-21.0 {PushVarNameWord OBOE in compiled unset} -setup {
     proc linenumber {} {dict get [info frame -1] line}
-- 
cgit v0.12


From 6b8039a9524bb88679e0d837a5345f26c8654a52 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Tue, 17 Apr 2018 20:29:02 +0000
Subject: Refactor array trace handling into a common routine
 TclCheckArrayTraces().

---
 generic/tclExecute.c |  17 ++---
 generic/tclInt.h     |   2 +
 generic/tclTrace.c   |  41 ++++++++++++
 generic/tclVar.c     | 180 +++++++++++----------------------------------------
 4 files changed, 86 insertions(+), 154 deletions(-)

diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index aab9092..5bc5c2d 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -4294,17 +4294,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);
diff --git a/generic/tclInt.h b/generic/tclInt.h
index dc7909c..371e3fa 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -2873,6 +2873,8 @@ 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	TclChanCaughtErrorBypass(Tcl_Interp *interp,
diff --git a/generic/tclTrace.c b/generic/tclTrace.c
index 958399a..d48761b 100644
--- a/generic/tclTrace.c
+++ b/generic/tclTrace.c
@@ -2478,6 +2478,47 @@ TclVarTraceExists(
 /*
  *----------------------------------------------------------------------
  *
+ * 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;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
  * TclCallVarTraces --
  *
  *	This function is invoked to find and invoke relevant trace functions
diff --git a/generic/tclVar.c b/generic/tclVar.c
index 3dd6790..e07d39a 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -3121,7 +3121,7 @@ ArrayStartSearchCmd(
     int objc,
     Tcl_Obj *const objv[])
 {
-    Interp *iPtr = (Interp *) interp;
+    Interp *iPtr = (Interp *)interp;
     Var *varPtr, *arrayPtr;
     Tcl_HashEntry *hPtr;
     Tcl_Obj *varNameObj;
@@ -3143,18 +3143,9 @@ ArrayStartSearchCmd(
 	    /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
     varName = TclGetString(varNameObj);
 
-    /*
-     * Special array trace used to keep the env array in sync for array names,
-     * array get, etc.
-     */
-
-    if (varPtr && (varPtr->flags & VAR_TRACED_ARRAY)
-	    && (TclIsVarArray(varPtr) || TclIsVarUndefined(varPtr))) {
-	if (TclObjCallVarTraces(iPtr, arrayPtr, varPtr, varNameObj, NULL,
-		(TCL_LEAVE_ERR_MSG|TCL_NAMESPACE_ONLY|TCL_GLOBAL_ONLY|
-		TCL_TRACE_ARRAY), /* leaveErrMsg */ 1, -1) == TCL_ERROR) {
-	    return TCL_ERROR;
-	}
+    if (TclCheckArrayTraces(interp, varPtr, arrayPtr, varNameObj, -1)
+	    == TCL_ERROR) {
+	return TCL_ERROR;
     }
 
     /*
@@ -3219,7 +3210,7 @@ ArrayAnyMoreCmd(
     int objc,
     Tcl_Obj *const objv[])
 {
-    Interp *iPtr = (Interp *) interp;
+    Interp *iPtr = (Interp *)interp;
     Var *varPtr, *arrayPtr;
     Tcl_Obj *varNameObj, *searchObj;
     int gotValue;
@@ -3239,18 +3230,9 @@ ArrayAnyMoreCmd(
     varPtr = TclObjLookupVarEx(interp, varNameObj, NULL, /*flags*/ 0,
 	    /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
 
-    /*
-     * Special array trace used to keep the env array in sync for array names,
-     * array get, etc.
-     */
-
-    if (varPtr && (varPtr->flags & VAR_TRACED_ARRAY)
-	    && (TclIsVarArray(varPtr) || TclIsVarUndefined(varPtr))) {
-	if (TclObjCallVarTraces(iPtr, arrayPtr, varPtr, varNameObj, NULL,
-		(TCL_LEAVE_ERR_MSG|TCL_NAMESPACE_ONLY|TCL_GLOBAL_ONLY|
-		TCL_TRACE_ARRAY), /* leaveErrMsg */ 1, -1) == TCL_ERROR) {
-	    return TCL_ERROR;
-	}
+    if (TclCheckArrayTraces(interp, varPtr, arrayPtr, varNameObj, -1)
+	    == TCL_ERROR) {
+	return TCL_ERROR;
     }
 
     /*
@@ -3326,7 +3308,6 @@ ArrayNextElementCmd(
     int objc,
     Tcl_Obj *const objv[])
 {
-    Interp *iPtr = (Interp *) interp;
     Var *varPtr, *arrayPtr;
     Tcl_Obj *varNameObj, *searchObj;
     ArraySearch *searchPtr;
@@ -3345,18 +3326,9 @@ ArrayNextElementCmd(
     varPtr = TclObjLookupVarEx(interp, varNameObj, NULL, /*flags*/ 0,
 	    /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
 
-    /*
-     * Special array trace used to keep the env array in sync for array names,
-     * array get, etc.
-     */
-
-    if (varPtr && (varPtr->flags & VAR_TRACED_ARRAY)
-	    && (TclIsVarArray(varPtr) || TclIsVarUndefined(varPtr))) {
-	if (TclObjCallVarTraces(iPtr, arrayPtr, varPtr, varNameObj, NULL,
-		(TCL_LEAVE_ERR_MSG|TCL_NAMESPACE_ONLY|TCL_GLOBAL_ONLY|
-		TCL_TRACE_ARRAY), /* leaveErrMsg */ 1, -1) == TCL_ERROR) {
-	    return TCL_ERROR;
-	}
+    if (TclCheckArrayTraces(interp, varPtr, arrayPtr, varNameObj, -1)
+	    == TCL_ERROR) {
+	return TCL_ERROR;
     }
 
     /*
@@ -3435,7 +3407,7 @@ ArrayDoneSearchCmd(
     int objc,
     Tcl_Obj *const objv[])
 {
-    Interp *iPtr = (Interp *) interp;
+    Interp *iPtr = (Interp *)interp;
     Var *varPtr, *arrayPtr;
     Tcl_HashEntry *hPtr;
     Tcl_Obj *varNameObj, *searchObj;
@@ -3455,18 +3427,9 @@ ArrayDoneSearchCmd(
     varPtr = TclObjLookupVarEx(interp, varNameObj, NULL, /*flags*/ 0,
 	    /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
 
-    /*
-     * Special array trace used to keep the env array in sync for array names,
-     * array get, etc.
-     */
-
-    if (varPtr && (varPtr->flags & VAR_TRACED_ARRAY)
-	    && (TclIsVarArray(varPtr) || TclIsVarUndefined(varPtr))) {
-	if (TclObjCallVarTraces(iPtr, arrayPtr, varPtr, varNameObj, NULL,
-		(TCL_LEAVE_ERR_MSG|TCL_NAMESPACE_ONLY|TCL_GLOBAL_ONLY|
-		TCL_TRACE_ARRAY), /* leaveErrMsg */ 1, -1) == TCL_ERROR) {
-	    return TCL_ERROR;
-	}
+    if (TclCheckArrayTraces(interp, varPtr, arrayPtr, varNameObj, -1)
+	    == TCL_ERROR) {
+	return TCL_ERROR;
     }
 
     /*
@@ -3543,7 +3506,7 @@ ArrayExistsCmd(
     int objc,
     Tcl_Obj *const objv[])
 {
-    Interp *iPtr = (Interp *) interp;
+    Interp *iPtr = (Interp *)interp;
     Var *varPtr, *arrayPtr;
     Tcl_Obj *arrayNameObj;
     int notArray;
@@ -3561,18 +3524,9 @@ ArrayExistsCmd(
     varPtr = TclObjLookupVarEx(interp, arrayNameObj, NULL, /*flags*/ 0,
 	    /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
 
-    /*
-     * Special array trace used to keep the env array in sync for array names,
-     * array get, etc.
-     */
-
-    if (varPtr && (varPtr->flags & VAR_TRACED_ARRAY)
-	    && (TclIsVarArray(varPtr) || TclIsVarUndefined(varPtr))) {
-	if (TclObjCallVarTraces(iPtr, arrayPtr, varPtr, arrayNameObj, NULL,
-		(TCL_LEAVE_ERR_MSG|TCL_NAMESPACE_ONLY|TCL_GLOBAL_ONLY|
-		TCL_TRACE_ARRAY), /* leaveErrMsg */ 1, -1) == TCL_ERROR) {
-	    return TCL_ERROR;
-	}
+    if (TclCheckArrayTraces(interp, varPtr, arrayPtr, arrayNameObj, -1)
+	    == TCL_ERROR) {
+	return TCL_ERROR;
     }
 
     /*
@@ -3610,7 +3564,6 @@ ArrayGetCmd(
     int objc,
     Tcl_Obj *const objv[])
 {
-    Interp *iPtr = (Interp *) interp;
     Var *varPtr, *arrayPtr, *varPtr2;
     Tcl_Obj *varNameObj, *nameObj, *valueObj, *nameLstObj, *tmpResObj;
     Tcl_Obj **nameObjPtr, *patternObj;
@@ -3639,18 +3592,9 @@ ArrayGetCmd(
     varPtr = TclObjLookupVarEx(interp, varNameObj, NULL, /*flags*/ 0,
 	    /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
 
-    /*
-     * Special array trace used to keep the env array in sync for array names,
-     * array get, etc.
-     */
-
-    if (varPtr && (varPtr->flags & VAR_TRACED_ARRAY)
-	    && (TclIsVarArray(varPtr) || TclIsVarUndefined(varPtr))) {
-	if (TclObjCallVarTraces(iPtr, arrayPtr, varPtr, varNameObj, NULL,
-		(TCL_LEAVE_ERR_MSG|TCL_NAMESPACE_ONLY|TCL_GLOBAL_ONLY|
-		TCL_TRACE_ARRAY), /* leaveErrMsg */ 1, -1) == TCL_ERROR) {
-	    return TCL_ERROR;
-	}
+    if (TclCheckArrayTraces(interp, varPtr, arrayPtr, varNameObj, -1)
+	    == TCL_ERROR) {
+	return TCL_ERROR;
     }
 
     /*
@@ -3798,7 +3742,6 @@ ArrayNamesCmd(
 	"-exact", "-glob", "-regexp", NULL
     };
     enum options { OPT_EXACT, OPT_GLOB, OPT_REGEXP };
-    Interp *iPtr = (Interp *) interp;
     Var *varPtr, *arrayPtr, *varPtr2;
     Tcl_Obj *varNameObj, *nameObj, *resultObj, *patternObj;
     Tcl_HashSearch search;
@@ -3819,18 +3762,9 @@ ArrayNamesCmd(
     varPtr = TclObjLookupVarEx(interp, varNameObj, NULL, /*flags*/ 0,
 	    /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
 
-    /*
-     * Special array trace used to keep the env array in sync for array names,
-     * array get, etc.
-     */
-
-    if (varPtr && (varPtr->flags & VAR_TRACED_ARRAY)
-	    && (TclIsVarArray(varPtr) || TclIsVarUndefined(varPtr))) {
-	if (TclObjCallVarTraces(iPtr, arrayPtr, varPtr, varNameObj, NULL,
-		(TCL_LEAVE_ERR_MSG|TCL_NAMESPACE_ONLY|TCL_GLOBAL_ONLY|
-		TCL_TRACE_ARRAY), /* leaveErrMsg */ 1, -1) == TCL_ERROR) {
-	    return TCL_ERROR;
-	}
+    if (TclCheckArrayTraces(interp, varPtr, arrayPtr, varNameObj, -1)
+	    == TCL_ERROR) {
+	return TCL_ERROR;
     }
 
     /*
@@ -3986,7 +3920,6 @@ ArraySetCmd(
     int objc,
     Tcl_Obj *const objv[])
 {
-    Interp *iPtr = (Interp *) interp;
     Var *varPtr, *arrayPtr;
 
     if (objc != 3) {
@@ -4001,18 +3934,9 @@ ArraySetCmd(
     varPtr = TclObjLookupVarEx(interp, objv[1], NULL, /*flags*/ 0,
 	    /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
 
-    /*
-     * Special array trace used to keep the env array in sync for array names,
-     * array get, etc.
-     */
-
-    if (varPtr && (varPtr->flags & VAR_TRACED_ARRAY)
-	    && (TclIsVarArray(varPtr) || TclIsVarUndefined(varPtr))) {
-	if (TclObjCallVarTraces(iPtr, arrayPtr, varPtr, objv[1], NULL,
-		(TCL_LEAVE_ERR_MSG|TCL_NAMESPACE_ONLY|TCL_GLOBAL_ONLY|
-		TCL_TRACE_ARRAY), /* leaveErrMsg */ 1, -1) == TCL_ERROR) {
-	    return TCL_ERROR;
-	}
+    if (TclCheckArrayTraces(interp, varPtr, arrayPtr, objv[1], -1)
+	    == TCL_ERROR) {
+	return TCL_ERROR;
     }
 
     return TclArraySet(interp, objv[1], objv[2]);
@@ -4043,7 +3967,6 @@ ArraySizeCmd(
     int objc,
     Tcl_Obj *const objv[])
 {
-    Interp *iPtr = (Interp *) interp;
     Var *varPtr, *arrayPtr;
     Tcl_Obj *varNameObj;
     Tcl_HashSearch search;
@@ -4063,18 +3986,9 @@ ArraySizeCmd(
     varPtr = TclObjLookupVarEx(interp, varNameObj, NULL, /*flags*/ 0,
 	    /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
 
-    /*
-     * Special array trace used to keep the env array in sync for array names,
-     * array get, etc.
-     */
-
-    if (varPtr && (varPtr->flags & VAR_TRACED_ARRAY)
-	    && (TclIsVarArray(varPtr) || TclIsVarUndefined(varPtr))) {
-	if (TclObjCallVarTraces(iPtr, arrayPtr, varPtr, varNameObj, NULL,
-		(TCL_LEAVE_ERR_MSG|TCL_NAMESPACE_ONLY|TCL_GLOBAL_ONLY|
-		TCL_TRACE_ARRAY), /* leaveErrMsg */ 1, -1) == TCL_ERROR) {
-	    return TCL_ERROR;
-	}
+    if (TclCheckArrayTraces(interp, varPtr, arrayPtr, varNameObj, -1)
+	    == TCL_ERROR) {
+	return TCL_ERROR;
     }
 
     /*
@@ -4127,7 +4041,6 @@ ArrayStatsCmd(
     int objc,
     Tcl_Obj *const objv[])
 {
-    Interp *iPtr = (Interp *) interp;
     Var *varPtr, *arrayPtr;
     Tcl_Obj *varNameObj;
     char *stats;
@@ -4145,18 +4058,9 @@ ArrayStatsCmd(
     varPtr = TclObjLookupVarEx(interp, varNameObj, NULL, /*flags*/ 0,
 	    /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
 
-    /*
-     * Special array trace used to keep the env array in sync for array names,
-     * array get, etc.
-     */
-
-    if (varPtr && (varPtr->flags & VAR_TRACED_ARRAY)
-	    && (TclIsVarArray(varPtr) || TclIsVarUndefined(varPtr))) {
-	if (TclObjCallVarTraces(iPtr, arrayPtr, varPtr, varNameObj, NULL,
-		(TCL_LEAVE_ERR_MSG|TCL_NAMESPACE_ONLY|TCL_GLOBAL_ONLY|
-		TCL_TRACE_ARRAY), /* leaveErrMsg */ 1, -1) == TCL_ERROR) {
-	    return TCL_ERROR;
-	}
+    if (TclCheckArrayTraces(interp, varPtr, arrayPtr, varNameObj, -1)
+	    == TCL_ERROR) {
+	return TCL_ERROR;
     }
 
     /*
@@ -4210,7 +4114,6 @@ ArrayUnsetCmd(
     int objc,
     Tcl_Obj *const objv[])
 {
-    Interp *iPtr = (Interp *) interp;
     Var *varPtr, *arrayPtr, *varPtr2, *protectedVarPtr;
     Tcl_Obj *varNameObj, *patternObj, *nameObj;
     Tcl_HashSearch search;
@@ -4238,18 +4141,9 @@ ArrayUnsetCmd(
     varPtr = TclObjLookupVarEx(interp, varNameObj, NULL, /*flags*/ 0,
 	    /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
 
-    /*
-     * Special array trace used to keep the env array in sync for array names,
-     * array get, etc.
-     */
-
-    if (varPtr && (varPtr->flags & VAR_TRACED_ARRAY)
-	    && (TclIsVarArray(varPtr) || TclIsVarUndefined(varPtr))) {
-	if (TclObjCallVarTraces(iPtr, arrayPtr, varPtr, varNameObj, NULL,
-		(TCL_LEAVE_ERR_MSG|TCL_NAMESPACE_ONLY|TCL_GLOBAL_ONLY|
-		TCL_TRACE_ARRAY), /* leaveErrMsg */ 1, -1) == TCL_ERROR) {
-	    return TCL_ERROR;
-	}
+    if (TclCheckArrayTraces(interp, varPtr, arrayPtr, varNameObj, -1)
+	    == TCL_ERROR) {
+	return TCL_ERROR;
     }
 
     /*
-- 
cgit v0.12


From 28ac08663306381af8f310b247bec60e5ed694db Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 17 Apr 2018 21:49:00 +0000
Subject: Slightly better unmatched-surrogates handling. Unmatched High
 surrogates will still be silently removed, but Unmatched Low surrogates will
 pass through as-is now. Inspired by Kevin Kenny's remarks. Thanks!

---
 generic/tclUtf.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/generic/tclUtf.c b/generic/tclUtf.c
index 923b1f8..ab4e142 100644
--- a/generic/tclUtf.c
+++ b/generic/tclUtf.c
@@ -148,15 +148,22 @@ Tcl_UniCharToUtf(
 	    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;
 		}
 	    }
-- 
cgit v0.12


From 327595170bbc91997186ac34d44238537e330cd5 Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Wed, 18 Apr 2018 11:59:57 +0000
Subject: http::geturl now returns full error stack information if the initial
 socket command fails Ticket [ff82755e15]

---
 library/http/http.tcl     | 7 ++++---
 library/http/pkgIndex.tcl | 2 +-
 unix/Makefile.in          | 4 ++--
 win/Makefile.in           | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/library/http/http.tcl b/library/http/http.tcl
index 9f5310b..186d067 100644
--- a/library/http/http.tcl
+++ b/library/http/http.tcl
@@ -11,7 +11,7 @@
 package require Tcl 8.6-
 # Keep this in sync with pkgIndex.tcl and with the install directories in
 # Makefiles
-package provide http 2.8.12
+package provide http 2.8.13
 
 namespace eval http {
     # Allow resourcing to not clobber existing data
@@ -602,7 +602,7 @@ proc http::geturl {url args} {
 	if {[info exists state(-myaddr)]} {
 	    lappend sockopts -myaddr $state(-myaddr)
 	}
-        if {[catch {eval $defcmd $sockopts $targetAddr} sock]} {
+        if {[catch {eval $defcmd $sockopts $targetAddr} sock errdict]} {
 	    # something went wrong while trying to establish the connection.
 	    # Clean up after events and such, but DON'T call the command
 	    # callback (if available) because we're going to throw an
@@ -611,7 +611,8 @@ proc http::geturl {url args} {
 	    set state(sock) $sock
 	    Finish $token "" 1
 	    cleanup $token
-	    return -code error $sock
+	    dict unset errdict -level
+	    return -options $errdict $sock
         }
     }
     set state(sock) $sock
diff --git a/library/http/pkgIndex.tcl b/library/http/pkgIndex.tcl
index d3fc7af..3324af9 100644
--- a/library/http/pkgIndex.tcl
+++ b/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.8.13 [list tclPkgSetup $dir http 2.8.13 {{http.tcl source {::http::config ::http::formatQuery ::http::geturl ::http::reset ::http::wait ::http::register ::http::unregister ::http::mapReply}}}]
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 29c051d..4277fad 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -840,8 +840,8 @@ install-libraries: libraries
 	    do \
 	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
 	    done;
-	@echo "Installing package http 2.8.12 as a Tcl Module";
-	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.12.tm;
+	@echo "Installing package http 2.8.13 as a Tcl Module";
+	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.13.tm;
 	@echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/";
 	@for i in $(TOP_DIR)/library/opt/*.tcl ; \
 	    do \
diff --git a/win/Makefile.in b/win/Makefile.in
index 633a9f5..f063da1 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -651,8 +651,8 @@ install-libraries: libraries install-tzdata install-msgs
 	    do \
 	    $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/http1.0"; \
 	    done;
-	@echo "Installing package http 2.8.12 as a Tcl Module";
-	@$(COPY) $(ROOT_DIR)/library/http/http.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.6/http-2.8.12.tm;
+	@echo "Installing package http 2.8.13 as a Tcl Module";
+	@$(COPY) $(ROOT_DIR)/library/http/http.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.6/http-2.8.13.tm;
 	@echo "Installing library opt0.4 directory";
 	@for j in $(ROOT_DIR)/library/opt/*.tcl; \
 	    do \
-- 
cgit v0.12


From fb91d4b68b081abb8ff689ed624a567c1a27a260 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Wed, 18 Apr 2018 19:21:33 +0000
Subject: Refactor the common operations of looking up and checking traces on
 an array variable into a single routine LocateArray().

---
 generic/tclVar.c | 152 +++++++++++++++----------------------------------------
 1 file changed, 41 insertions(+), 111 deletions(-)

diff --git a/generic/tclVar.c b/generic/tclVar.c
index e07d39a..a4cd62b 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -176,6 +176,8 @@ static void		AppendLocals(Tcl_Interp *interp, Tcl_Obj *listPtr,
 static void		DeleteSearches(Interp *iPtr, Var *arrayVarPtr);
 static void		DeleteArray(Interp *iPtr, Tcl_Obj *arrayNamePtr,
 			    Var *varPtr, int flags, int index);
+static int		LocateArray(Tcl_Interp *interp, Tcl_Obj *name,
+			    Var **varPtrPtr);
 static Tcl_Var		ObjFindNamespaceVar(Tcl_Interp *interp,
 			    Tcl_Obj *namePtr, Tcl_Namespace *contextNsPtr,
 			    int flags);
@@ -269,6 +271,22 @@ TclVarHashCreateVar(
 
     return varPtr;
 }
+
+static int
+LocateArray(
+    Tcl_Interp *interp,
+    Tcl_Obj *name,
+    Var **varPtrPtr)
+{
+    Var *arrayPtr, *varPtr = TclObjLookupVarEx(interp, name, NULL, /*flags*/ 0,
+	    /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
+
+    if (TclCheckArrayTraces(interp, varPtr, arrayPtr, name, -1) == TCL_ERROR) {
+	return TCL_ERROR;
+    }
+    *varPtrPtr = varPtr;
+    return TCL_OK;
+}
 
 /*
  *----------------------------------------------------------------------
@@ -3122,7 +3140,7 @@ ArrayStartSearchCmd(
     Tcl_Obj *const objv[])
 {
     Interp *iPtr = (Interp *)interp;
-    Var *varPtr, *arrayPtr;
+    Var *varPtr;
     Tcl_HashEntry *hPtr;
     Tcl_Obj *varNameObj;
     int isNew;
@@ -3135,16 +3153,7 @@ ArrayStartSearchCmd(
     }
     varNameObj = objv[1];
 
-    /*
-     * Locate the array variable.
-     */
-
-    varPtr = TclObjLookupVarEx(interp, varNameObj, NULL, /*flags*/ 0,
-	    /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
-    varName = TclGetString(varNameObj);
-
-    if (TclCheckArrayTraces(interp, varPtr, arrayPtr, varNameObj, -1)
-	    == TCL_ERROR) {
+    if (TCL_ERROR == LocateArray(interp, varNameObj, &varPtr)) {
 	return TCL_ERROR;
     }
 
@@ -3154,6 +3163,7 @@ ArrayStartSearchCmd(
      * traces.
      */
 
+    varName = TclGetString(varNameObj);
     if ((varPtr == NULL) || !TclIsVarArray(varPtr)
 	    || TclIsVarUndefined(varPtr)) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
@@ -3211,7 +3221,7 @@ ArrayAnyMoreCmd(
     Tcl_Obj *const objv[])
 {
     Interp *iPtr = (Interp *)interp;
-    Var *varPtr, *arrayPtr;
+    Var *varPtr;
     Tcl_Obj *varNameObj, *searchObj;
     int gotValue;
     ArraySearch *searchPtr;
@@ -3223,15 +3233,7 @@ ArrayAnyMoreCmd(
     varNameObj = objv[1];
     searchObj = objv[2];
 
-    /*
-     * Locate the array variable.
-     */
-
-    varPtr = TclObjLookupVarEx(interp, varNameObj, NULL, /*flags*/ 0,
-	    /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
-
-    if (TclCheckArrayTraces(interp, varPtr, arrayPtr, varNameObj, -1)
-	    == TCL_ERROR) {
+    if (TCL_ERROR == LocateArray(interp, varNameObj, &varPtr)) {
 	return TCL_ERROR;
     }
 
@@ -3308,7 +3310,7 @@ ArrayNextElementCmd(
     int objc,
     Tcl_Obj *const objv[])
 {
-    Var *varPtr, *arrayPtr;
+    Var *varPtr;
     Tcl_Obj *varNameObj, *searchObj;
     ArraySearch *searchPtr;
 
@@ -3319,15 +3321,7 @@ ArrayNextElementCmd(
     varNameObj = objv[1];
     searchObj = objv[2];
 
-    /*
-     * Locate the array variable.
-     */
-
-    varPtr = TclObjLookupVarEx(interp, varNameObj, NULL, /*flags*/ 0,
-	    /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
-
-    if (TclCheckArrayTraces(interp, varPtr, arrayPtr, varNameObj, -1)
-	    == TCL_ERROR) {
+    if (TCL_ERROR == LocateArray(interp, varNameObj, &varPtr)) {
 	return TCL_ERROR;
     }
 
@@ -3408,7 +3402,7 @@ ArrayDoneSearchCmd(
     Tcl_Obj *const objv[])
 {
     Interp *iPtr = (Interp *)interp;
-    Var *varPtr, *arrayPtr;
+    Var *varPtr;
     Tcl_HashEntry *hPtr;
     Tcl_Obj *varNameObj, *searchObj;
     ArraySearch *searchPtr, *prevPtr;
@@ -3420,15 +3414,7 @@ ArrayDoneSearchCmd(
     varNameObj = objv[1];
     searchObj = objv[2];
 
-    /*
-     * Locate the array variable.
-     */
-
-    varPtr = TclObjLookupVarEx(interp, varNameObj, NULL, /*flags*/ 0,
-	    /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
-
-    if (TclCheckArrayTraces(interp, varPtr, arrayPtr, varNameObj, -1)
-	    == TCL_ERROR) {
+    if (TCL_ERROR == LocateArray(interp, varNameObj, &varPtr)) {
 	return TCL_ERROR;
     }
 
@@ -3507,7 +3493,7 @@ ArrayExistsCmd(
     Tcl_Obj *const objv[])
 {
     Interp *iPtr = (Interp *)interp;
-    Var *varPtr, *arrayPtr;
+    Var *varPtr;
     Tcl_Obj *arrayNameObj;
     int notArray;
 
@@ -3517,15 +3503,7 @@ ArrayExistsCmd(
     }
     arrayNameObj = objv[1];
 
-    /*
-     * Locate the array variable.
-     */
-
-    varPtr = TclObjLookupVarEx(interp, arrayNameObj, NULL, /*flags*/ 0,
-	    /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
-
-    if (TclCheckArrayTraces(interp, varPtr, arrayPtr, arrayNameObj, -1)
-	    == TCL_ERROR) {
+    if (TCL_ERROR == LocateArray(interp, arrayNameObj, &varPtr)) {
 	return TCL_ERROR;
     }
 
@@ -3564,7 +3542,7 @@ ArrayGetCmd(
     int objc,
     Tcl_Obj *const objv[])
 {
-    Var *varPtr, *arrayPtr, *varPtr2;
+    Var *varPtr, *varPtr2;
     Tcl_Obj *varNameObj, *nameObj, *valueObj, *nameLstObj, *tmpResObj;
     Tcl_Obj **nameObjPtr, *patternObj;
     Tcl_HashSearch search;
@@ -3585,15 +3563,7 @@ ArrayGetCmd(
 	return TCL_ERROR;
     }
 
-    /*
-     * Locate the array variable.
-     */
-
-    varPtr = TclObjLookupVarEx(interp, varNameObj, NULL, /*flags*/ 0,
-	    /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
-
-    if (TclCheckArrayTraces(interp, varPtr, arrayPtr, varNameObj, -1)
-	    == TCL_ERROR) {
+    if (TCL_ERROR == LocateArray(interp, varNameObj, &varPtr)) {
 	return TCL_ERROR;
     }
 
@@ -3742,7 +3712,7 @@ ArrayNamesCmd(
 	"-exact", "-glob", "-regexp", NULL
     };
     enum options { OPT_EXACT, OPT_GLOB, OPT_REGEXP };
-    Var *varPtr, *arrayPtr, *varPtr2;
+    Var *varPtr, *varPtr2;
     Tcl_Obj *varNameObj, *nameObj, *resultObj, *patternObj;
     Tcl_HashSearch search;
     const char *pattern = NULL;
@@ -3755,15 +3725,7 @@ ArrayNamesCmd(
     varNameObj = objv[1];
     patternObj = (objc > 2 ? objv[objc-1] : NULL);
 
-    /*
-     * Locate the array variable.
-     */
-
-    varPtr = TclObjLookupVarEx(interp, varNameObj, NULL, /*flags*/ 0,
-	    /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
-
-    if (TclCheckArrayTraces(interp, varPtr, arrayPtr, varNameObj, -1)
-	    == TCL_ERROR) {
+    if (TCL_ERROR == LocateArray(interp, varNameObj, &varPtr)) {
 	return TCL_ERROR;
     }
 
@@ -3920,22 +3882,14 @@ ArraySetCmd(
     int objc,
     Tcl_Obj *const objv[])
 {
-    Var *varPtr, *arrayPtr;
+    Var *varPtr;
 
     if (objc != 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "arrayName list");
 	return TCL_ERROR;
     }
 
-    /*
-     * Locate the array variable.
-     */
-
-    varPtr = TclObjLookupVarEx(interp, objv[1], NULL, /*flags*/ 0,
-	    /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
-
-    if (TclCheckArrayTraces(interp, varPtr, arrayPtr, objv[1], -1)
-	    == TCL_ERROR) {
+    if (TCL_ERROR == LocateArray(interp, objv[1], &varPtr)) {
 	return TCL_ERROR;
     }
 
@@ -3967,7 +3921,7 @@ ArraySizeCmd(
     int objc,
     Tcl_Obj *const objv[])
 {
-    Var *varPtr, *arrayPtr;
+    Var *varPtr;
     Tcl_Obj *varNameObj;
     Tcl_HashSearch search;
     Var *varPtr2;
@@ -3979,15 +3933,7 @@ ArraySizeCmd(
     }
     varNameObj = objv[1];
 
-    /*
-     * Locate the array variable.
-     */
-
-    varPtr = TclObjLookupVarEx(interp, varNameObj, NULL, /*flags*/ 0,
-	    /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
-
-    if (TclCheckArrayTraces(interp, varPtr, arrayPtr, varNameObj, -1)
-	    == TCL_ERROR) {
+    if (TCL_ERROR == LocateArray(interp, varNameObj, &varPtr)) {
 	return TCL_ERROR;
     }
 
@@ -4041,7 +3987,7 @@ ArrayStatsCmd(
     int objc,
     Tcl_Obj *const objv[])
 {
-    Var *varPtr, *arrayPtr;
+    Var *varPtr;
     Tcl_Obj *varNameObj;
     char *stats;
 
@@ -4051,15 +3997,7 @@ ArrayStatsCmd(
     }
     varNameObj = objv[1];
 
-    /*
-     * Locate the array variable.
-     */
-
-    varPtr = TclObjLookupVarEx(interp, varNameObj, NULL, /*flags*/ 0,
-	    /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
-
-    if (TclCheckArrayTraces(interp, varPtr, arrayPtr, varNameObj, -1)
-	    == TCL_ERROR) {
+    if (TCL_ERROR == LocateArray(interp, varNameObj, &varPtr)) {
 	return TCL_ERROR;
     }
 
@@ -4114,7 +4052,7 @@ ArrayUnsetCmd(
     int objc,
     Tcl_Obj *const objv[])
 {
-    Var *varPtr, *arrayPtr, *varPtr2, *protectedVarPtr;
+    Var *varPtr, *varPtr2, *protectedVarPtr;
     Tcl_Obj *varNameObj, *patternObj, *nameObj;
     Tcl_HashSearch search;
     const char *pattern;
@@ -4134,15 +4072,7 @@ ArrayUnsetCmd(
 	return TCL_ERROR;
     }
 
-    /*
-     * Locate the array variable
-     */
-
-    varPtr = TclObjLookupVarEx(interp, varNameObj, NULL, /*flags*/ 0,
-	    /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
-
-    if (TclCheckArrayTraces(interp, varPtr, arrayPtr, varNameObj, -1)
-	    == TCL_ERROR) {
+    if (TCL_ERROR == LocateArray(interp, varNameObj, &varPtr)) {
 	return TCL_ERROR;
     }
 
-- 
cgit v0.12


From 08c1a8dd343c7b9f2f21daf4b03894a3d28e1c47 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Wed, 18 Apr 2018 21:03:53 +0000
Subject: cleanup of refactor

---
 generic/tclVar.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/generic/tclVar.c b/generic/tclVar.c
index a4cd62b..d954f0a 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -3142,7 +3142,6 @@ ArrayStartSearchCmd(
     Interp *iPtr = (Interp *)interp;
     Var *varPtr;
     Tcl_HashEntry *hPtr;
-    Tcl_Obj *varNameObj;
     int isNew;
     ArraySearch *searchPtr;
     const char *varName;
@@ -3151,9 +3150,8 @@ ArrayStartSearchCmd(
 	Tcl_WrongNumArgs(interp, 1, objv, "arrayName");
 	return TCL_ERROR;
     }
-    varNameObj = objv[1];
 
-    if (TCL_ERROR == LocateArray(interp, varNameObj, &varPtr)) {
+    if (TCL_ERROR == LocateArray(interp, objv[1], &varPtr)) {
 	return TCL_ERROR;
     }
 
@@ -3163,7 +3161,7 @@ ArrayStartSearchCmd(
      * traces.
      */
 
-    varName = TclGetString(varNameObj);
+    varName = TclGetString(objv[1]);
     if ((varPtr == NULL) || !TclIsVarArray(varPtr)
 	    || TclIsVarUndefined(varPtr)) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
@@ -3494,16 +3492,14 @@ ArrayExistsCmd(
 {
     Interp *iPtr = (Interp *)interp;
     Var *varPtr;
-    Tcl_Obj *arrayNameObj;
     int notArray;
 
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "arrayName");
 	return TCL_ERROR;
     }
-    arrayNameObj = objv[1];
 
-    if (TCL_ERROR == LocateArray(interp, arrayNameObj, &varPtr)) {
+    if (TCL_ERROR == LocateArray(interp, objv[1], &varPtr)) {
 	return TCL_ERROR;
     }
 
@@ -3713,7 +3709,7 @@ ArrayNamesCmd(
     };
     enum options { OPT_EXACT, OPT_GLOB, OPT_REGEXP };
     Var *varPtr, *varPtr2;
-    Tcl_Obj *varNameObj, *nameObj, *resultObj, *patternObj;
+    Tcl_Obj *nameObj, *resultObj, *patternObj;
     Tcl_HashSearch search;
     const char *pattern = NULL;
     int mode = OPT_GLOB;
@@ -3722,10 +3718,9 @@ ArrayNamesCmd(
 	Tcl_WrongNumArgs(interp, 1, objv, "arrayName ?mode? ?pattern?");
 	return TCL_ERROR;
     }
-    varNameObj = objv[1];
     patternObj = (objc > 2 ? objv[objc-1] : NULL);
 
-    if (TCL_ERROR == LocateArray(interp, varNameObj, &varPtr)) {
+    if (TCL_ERROR == LocateArray(interp, objv[1], &varPtr)) {
 	return TCL_ERROR;
     }
 
@@ -3922,7 +3917,6 @@ ArraySizeCmd(
     Tcl_Obj *const objv[])
 {
     Var *varPtr;
-    Tcl_Obj *varNameObj;
     Tcl_HashSearch search;
     Var *varPtr2;
     int size = 0;
@@ -3931,9 +3925,8 @@ ArraySizeCmd(
 	Tcl_WrongNumArgs(interp, 1, objv, "arrayName");
 	return TCL_ERROR;
     }
-    varNameObj = objv[1];
 
-    if (TCL_ERROR == LocateArray(interp, varNameObj, &varPtr)) {
+    if (TCL_ERROR == LocateArray(interp, objv[1], &varPtr)) {
 	return TCL_ERROR;
     }
 
-- 
cgit v0.12


From 61f580bd36bb6b0f50e0d0735c1b72459434c8f5 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Wed, 18 Apr 2018 23:31:07 +0000
Subject: Refactor to bring the test for existence of an array variable into
 LocateArray().

---
 generic/tclVar.c | 132 +++++++++++++++++++------------------------------------
 1 file changed, 44 insertions(+), 88 deletions(-)

diff --git a/generic/tclVar.c b/generic/tclVar.c
index d954f0a..f1c8669 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -177,7 +177,7 @@ static void		DeleteSearches(Interp *iPtr, Var *arrayVarPtr);
 static void		DeleteArray(Interp *iPtr, Tcl_Obj *arrayNamePtr,
 			    Var *varPtr, int flags, int index);
 static int		LocateArray(Tcl_Interp *interp, Tcl_Obj *name,
-			    Var **varPtrPtr);
+			    Var **varPtrPtr, int *isArrayPtr);
 static Tcl_Var		ObjFindNamespaceVar(Tcl_Interp *interp,
 			    Tcl_Obj *namePtr, Tcl_Namespace *contextNsPtr,
 			    int flags);
@@ -276,7 +276,8 @@ static int
 LocateArray(
     Tcl_Interp *interp,
     Tcl_Obj *name,
-    Var **varPtrPtr)
+    Var **varPtrPtr,
+    int *isArrayPtr)
 {
     Var *arrayPtr, *varPtr = TclObjLookupVarEx(interp, name, NULL, /*flags*/ 0,
 	    /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
@@ -284,7 +285,13 @@ LocateArray(
     if (TclCheckArrayTraces(interp, varPtr, arrayPtr, name, -1) == TCL_ERROR) {
 	return TCL_ERROR;
     }
-    *varPtrPtr = varPtr;
+    if (varPtrPtr) {
+	*varPtrPtr = varPtr;
+    }
+    if (isArrayPtr) {
+	*isArrayPtr = varPtr && !TclIsVarUndefined(varPtr)
+		&& TclIsVarArray(varPtr);
+    }
     return TCL_OK;
 }
 
@@ -3142,7 +3149,7 @@ ArrayStartSearchCmd(
     Interp *iPtr = (Interp *)interp;
     Var *varPtr;
     Tcl_HashEntry *hPtr;
-    int isNew;
+    int isNew, isArray;
     ArraySearch *searchPtr;
     const char *varName;
 
@@ -3151,19 +3158,12 @@ ArrayStartSearchCmd(
 	return TCL_ERROR;
     }
 
-    if (TCL_ERROR == LocateArray(interp, objv[1], &varPtr)) {
+    if (TCL_ERROR == LocateArray(interp, objv[1], &varPtr, &isArray)) {
 	return TCL_ERROR;
     }
 
-    /*
-     * Verify that it is indeed an array variable. This test comes after the
-     * traces - the variable may actually become an array as an effect of said
-     * traces.
-     */
-
     varName = TclGetString(objv[1]);
-    if ((varPtr == NULL) || !TclIsVarArray(varPtr)
-	    || TclIsVarUndefined(varPtr)) {
+    if (!isArray) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"\"%s\" isn't an array", varName));
 	Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ARRAY", varName, NULL);
@@ -3221,7 +3221,7 @@ ArrayAnyMoreCmd(
     Interp *iPtr = (Interp *)interp;
     Var *varPtr;
     Tcl_Obj *varNameObj, *searchObj;
-    int gotValue;
+    int gotValue, isArray;
     ArraySearch *searchPtr;
 
     if (objc != 3) {
@@ -3231,18 +3231,11 @@ ArrayAnyMoreCmd(
     varNameObj = objv[1];
     searchObj = objv[2];
 
-    if (TCL_ERROR == LocateArray(interp, varNameObj, &varPtr)) {
+    if (TCL_ERROR == LocateArray(interp, varNameObj, &varPtr, &isArray)) {
 	return TCL_ERROR;
     }
 
-    /*
-     * Verify that it is indeed an array variable. This test comes after the
-     * traces - the variable may actually become an array as an effect of said
-     * traces.
-     */
-
-    if ((varPtr == NULL) || !TclIsVarArray(varPtr)
-	    || TclIsVarUndefined(varPtr)) {
+    if (!isArray) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"\"%s\" isn't an array", TclGetString(varNameObj)));
 	Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ARRAY",
@@ -3311,6 +3304,7 @@ ArrayNextElementCmd(
     Var *varPtr;
     Tcl_Obj *varNameObj, *searchObj;
     ArraySearch *searchPtr;
+    int isArray;
 
     if (objc != 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "arrayName searchId");
@@ -3319,7 +3313,7 @@ ArrayNextElementCmd(
     varNameObj = objv[1];
     searchObj = objv[2];
 
-    if (TCL_ERROR == LocateArray(interp, varNameObj, &varPtr)) {
+    if (TCL_ERROR == LocateArray(interp, varNameObj, &varPtr, &isArray)) {
 	return TCL_ERROR;
     }
 
@@ -3328,9 +3322,7 @@ ArrayNextElementCmd(
      * traces - the variable may actually become an array as an effect of said
      * traces.
      */
-
-    if ((varPtr == NULL) || !TclIsVarArray(varPtr)
-	    || TclIsVarUndefined(varPtr)) {
+    if (!isArray) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"\"%s\" isn't an array", TclGetString(varNameObj)));
 	Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ARRAY",
@@ -3404,6 +3396,7 @@ ArrayDoneSearchCmd(
     Tcl_HashEntry *hPtr;
     Tcl_Obj *varNameObj, *searchObj;
     ArraySearch *searchPtr, *prevPtr;
+    int isArray;
 
     if (objc != 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "arrayName searchId");
@@ -3412,7 +3405,7 @@ ArrayDoneSearchCmd(
     varNameObj = objv[1];
     searchObj = objv[2];
 
-    if (TCL_ERROR == LocateArray(interp, varNameObj, &varPtr)) {
+    if (TCL_ERROR == LocateArray(interp, varNameObj, &varPtr, &isArray)) {
 	return TCL_ERROR;
     }
 
@@ -3422,8 +3415,7 @@ ArrayDoneSearchCmd(
      * traces.
      */
 
-    if ((varPtr == NULL) || !TclIsVarArray(varPtr)
-	    || TclIsVarUndefined(varPtr)) {
+    if (!isArray) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"\"%s\" isn't an array", TclGetString(varNameObj)));
 	Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ARRAY",
@@ -3491,25 +3483,18 @@ ArrayExistsCmd(
     Tcl_Obj *const objv[])
 {
     Interp *iPtr = (Interp *)interp;
-    Var *varPtr;
-    int notArray;
+    int isArray;
 
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "arrayName");
 	return TCL_ERROR;
     }
 
-    if (TCL_ERROR == LocateArray(interp, objv[1], &varPtr)) {
+    if (TCL_ERROR == LocateArray(interp, objv[1], NULL, &isArray)) {
 	return TCL_ERROR;
     }
 
-    /*
-     * Check whether we've actually got an array variable.
-     */
-
-    notArray = ((varPtr == NULL) || !TclIsVarArray(varPtr)
-	    || TclIsVarUndefined(varPtr));
-    Tcl_SetObjResult(interp, iPtr->execEnvPtr->constants[!notArray]);
+    Tcl_SetObjResult(interp, iPtr->execEnvPtr->constants[isArray]);
     return TCL_OK;
 }
 
@@ -3543,7 +3528,7 @@ ArrayGetCmd(
     Tcl_Obj **nameObjPtr, *patternObj;
     Tcl_HashSearch search;
     const char *pattern;
-    int i, count, result;
+    int i, count, result, isArray;
 
     switch (objc) {
     case 2:
@@ -3559,18 +3544,12 @@ ArrayGetCmd(
 	return TCL_ERROR;
     }
 
-    if (TCL_ERROR == LocateArray(interp, varNameObj, &varPtr)) {
+    if (TCL_ERROR == LocateArray(interp, varNameObj, &varPtr, &isArray)) {
 	return TCL_ERROR;
     }
 
-    /*
-     * Verify that it is indeed an array variable. This test comes after the
-     * traces - the variable may actually become an array as an effect of said
-     * traces. If not an array, it's an empty result.
-     */
-
-    if ((varPtr == NULL) || !TclIsVarArray(varPtr)
-	    || TclIsVarUndefined(varPtr)) {
+    /* If not an array, it's an empty result. */
+    if (!isArray) {
 	return TCL_OK;
     }
 
@@ -3712,7 +3691,7 @@ ArrayNamesCmd(
     Tcl_Obj *nameObj, *resultObj, *patternObj;
     Tcl_HashSearch search;
     const char *pattern = NULL;
-    int mode = OPT_GLOB;
+    int isArray, mode = OPT_GLOB;
 
     if ((objc < 2) || (objc > 4)) {
 	Tcl_WrongNumArgs(interp, 1, objv, "arrayName ?mode? ?pattern?");
@@ -3720,7 +3699,7 @@ ArrayNamesCmd(
     }
     patternObj = (objc > 2 ? objv[objc-1] : NULL);
 
-    if (TCL_ERROR == LocateArray(interp, objv[1], &varPtr)) {
+    if (TCL_ERROR == LocateArray(interp, objv[1], &varPtr, &isArray)) {
 	return TCL_ERROR;
     }
 
@@ -3733,14 +3712,9 @@ ArrayNamesCmd(
 	return TCL_ERROR;
     }
 
-    /*
-     * Verify that it is indeed an array variable. This test comes after the
-     * traces - the variable may actually become an array as an effect of said
-     * traces. If not an array, the result is empty.
-     */
+    /* If not an array, the result is empty. */
 
-    if ((varPtr == NULL) || !TclIsVarArray(varPtr)
-	    || TclIsVarUndefined(varPtr)) {
+    if (!isArray) {
 	return TCL_OK;
     }
 
@@ -3877,14 +3851,12 @@ ArraySetCmd(
     int objc,
     Tcl_Obj *const objv[])
 {
-    Var *varPtr;
-
     if (objc != 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "arrayName list");
 	return TCL_ERROR;
     }
 
-    if (TCL_ERROR == LocateArray(interp, objv[1], &varPtr)) {
+    if (TCL_ERROR == LocateArray(interp, objv[1], NULL, NULL)) {
 	return TCL_ERROR;
     }
 
@@ -3919,24 +3891,20 @@ ArraySizeCmd(
     Var *varPtr;
     Tcl_HashSearch search;
     Var *varPtr2;
-    int size = 0;
+    int isArray, size = 0;
 
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "arrayName");
 	return TCL_ERROR;
     }
 
-    if (TCL_ERROR == LocateArray(interp, objv[1], &varPtr)) {
+    if (TCL_ERROR == LocateArray(interp, objv[1], &varPtr, &isArray)) {
 	return TCL_ERROR;
     }
 
-    /*
-     * Verify that it is indeed an array variable. This test comes after the
-     * traces - the variable may actually become an array as an effect of said
-     * traces. We can only iterate over the array if it exists...
-     */
+    /* We can only iterate over the array if it exists... */
 
-    if (varPtr && TclIsVarArray(varPtr) && !TclIsVarUndefined(varPtr)) {
+    if (isArray) {
 	/*
 	 * Must iterate in order to get chance to check for present but
 	 * "undefined" entries.
@@ -3983,6 +3951,7 @@ ArrayStatsCmd(
     Var *varPtr;
     Tcl_Obj *varNameObj;
     char *stats;
+    int isArray;
 
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "arrayName");
@@ -3990,18 +3959,11 @@ ArrayStatsCmd(
     }
     varNameObj = objv[1];
 
-    if (TCL_ERROR == LocateArray(interp, varNameObj, &varPtr)) {
+    if (TCL_ERROR == LocateArray(interp, varNameObj, &varPtr, &isArray)) {
 	return TCL_ERROR;
     }
 
-    /*
-     * Verify that it is indeed an array variable. This test comes after the
-     * traces - the variable may actually become an array as an effect of said
-     * traces.
-     */
-
-    if ((varPtr == NULL) || !TclIsVarArray(varPtr)
-	    || TclIsVarUndefined(varPtr)) {
+    if (!isArray) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"\"%s\" isn't an array", TclGetString(varNameObj)));
 	Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ARRAY",
@@ -4050,6 +4012,7 @@ ArrayUnsetCmd(
     Tcl_HashSearch search;
     const char *pattern;
     const int unsetFlags = 0;	/* Should this be TCL_LEAVE_ERR_MSG? */
+    int isArray;
 
     switch (objc) {
     case 2:
@@ -4065,18 +4028,11 @@ ArrayUnsetCmd(
 	return TCL_ERROR;
     }
 
-    if (TCL_ERROR == LocateArray(interp, varNameObj, &varPtr)) {
+    if (TCL_ERROR == LocateArray(interp, varNameObj, &varPtr, &isArray)) {
 	return TCL_ERROR;
     }
 
-    /*
-     * Verify that it is indeed an array variable. This test comes after the
-     * traces - the variable may actually become an array as an effect of said
-     * traces.
-     */
-
-    if ((varPtr == NULL) || !TclIsVarArray(varPtr)
-	    || TclIsVarUndefined(varPtr)) {
+    if (!isArray) {
 	return TCL_OK;
     }
 
-- 
cgit v0.12


From 8d0340e39e077c5577acacc1a175b5c412c8905b Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Wed, 18 Apr 2018 23:41:48 +0000
Subject: Refactor error reporting when value is not an expected array variable
 name.

---
 generic/tclVar.c | 56 ++++++++++++++++++++------------------------------------
 1 file changed, 20 insertions(+), 36 deletions(-)

diff --git a/generic/tclVar.c b/generic/tclVar.c
index f1c8669..92ae183 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -178,6 +178,7 @@ static void		DeleteArray(Interp *iPtr, Tcl_Obj *arrayNamePtr,
 			    Var *varPtr, int flags, int index);
 static int		LocateArray(Tcl_Interp *interp, Tcl_Obj *name,
 			    Var **varPtrPtr, int *isArrayPtr);
+static int		NotArrayError(Tcl_Interp *interp, Tcl_Obj *name);
 static Tcl_Var		ObjFindNamespaceVar(Tcl_Interp *interp,
 			    Tcl_Obj *namePtr, Tcl_Namespace *contextNsPtr,
 			    int flags);
@@ -294,6 +295,19 @@ LocateArray(
     }
     return TCL_OK;
 }
+
+static int
+NotArrayError(
+    Tcl_Interp *interp,
+    Tcl_Obj *name)
+{
+    const char *nameStr = Tcl_GetString(name);
+
+    Tcl_SetObjResult(interp,
+	    Tcl_ObjPrintf("\"%s\" isn't an array", nameStr));
+    Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ARRAY", nameStr, NULL);
+    return TCL_ERROR;
+}
 
 /*
  *----------------------------------------------------------------------
@@ -3162,18 +3176,15 @@ ArrayStartSearchCmd(
 	return TCL_ERROR;
     }
 
-    varName = TclGetString(objv[1]);
     if (!isArray) {
-	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		"\"%s\" isn't an array", varName));
-	Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ARRAY", varName, NULL);
-	return TCL_ERROR;
+	return NotArrayError(interp, objv[1]);
     }
 
     /*
      * Make a new array search with a free name.
      */
 
+    varName = TclGetString(objv[1]);
     searchPtr = ckalloc(sizeof(ArraySearch));
     hPtr = Tcl_CreateHashEntry(&iPtr->varSearches, varPtr, &isNew);
     if (isNew) {
@@ -3236,11 +3247,7 @@ ArrayAnyMoreCmd(
     }
 
     if (!isArray) {
-	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		"\"%s\" isn't an array", TclGetString(varNameObj)));
-	Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ARRAY",
-		TclGetString(varNameObj), NULL);
-	return TCL_ERROR;
+	return NotArrayError(interp, varNameObj);
     }
 
     /*
@@ -3317,17 +3324,8 @@ ArrayNextElementCmd(
 	return TCL_ERROR;
     }
 
-    /*
-     * Verify that it is indeed an array variable. This test comes after the
-     * traces - the variable may actually become an array as an effect of said
-     * traces.
-     */
     if (!isArray) {
-	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		"\"%s\" isn't an array", TclGetString(varNameObj)));
-	Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ARRAY",
-		TclGetString(varNameObj), NULL);
-	return TCL_ERROR;
+	return NotArrayError(interp, varNameObj);
     }
 
     /*
@@ -3409,18 +3407,8 @@ ArrayDoneSearchCmd(
 	return TCL_ERROR;
     }
 
-    /*
-     * Verify that it is indeed an array variable. This test comes after the
-     * traces - the variable may actually become an array as an effect of said
-     * traces.
-     */
-
     if (!isArray) {
-	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		"\"%s\" isn't an array", TclGetString(varNameObj)));
-	Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ARRAY",
-		TclGetString(varNameObj), NULL);
-	return TCL_ERROR;
+	return NotArrayError(interp, varNameObj);
     }
 
     /*
@@ -3964,11 +3952,7 @@ ArrayStatsCmd(
     }
 
     if (!isArray) {
-	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		"\"%s\" isn't an array", TclGetString(varNameObj)));
-	Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ARRAY",
-		TclGetString(varNameObj), NULL);
-	return TCL_ERROR;
+	return NotArrayError(interp, varNameObj);
     }
 
     stats = Tcl_HashStats((Tcl_HashTable *) varPtr->value.tablePtr);
-- 
cgit v0.12


From df94eecf119611a2fa8de1abb3abe59269be7550 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 19 Apr 2018 01:39:38 +0000
Subject: An [array set] from a dict can only take shortcuts when the dict is
 "pure", that is, has no string rep.

---
 generic/tclVar.c |  2 +-
 tests/var.test   | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/generic/tclVar.c b/generic/tclVar.c
index e540c49..d4e5339 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -3411,7 +3411,7 @@ TclArraySet(
      * Install the contents of the dictionary or list into the array.
      */
 
-    if (arrayElemObj->typePtr == &tclDictType) {
+    if (arrayElemObj->typePtr == &tclDictType && arrayElemObj->bytes == NULL) {
 	Tcl_Obj *keyPtr, *valuePtr;
 	Tcl_DictSearch search;
 	int done;
diff --git a/tests/var.test b/tests/var.test
index 30e340e..aadeb34 100644
--- a/tests/var.test
+++ b/tests/var.test
@@ -761,6 +761,18 @@ test var-17.1 {TclArraySet [Bug 1669489]} -setup {
 } -cleanup {
     unset -nocomplain ::a ::elements
 } -result {}
+test var-17.2 {TclArraySet Dict shortcut only on pure value} -setup {
+    unset -nocomplain a d
+    set d {p 1 p 2}
+    dict get $d p
+    set foo 0
+} -body {
+    trace add variable a write "[list incr [namespace which -variable foo]];#"
+    array set a $d
+    set foo
+} -cleanup {
+    unset -nocomplain a d foo
+} -result 2
 
 test var-18.1 {array unset and unset traces: Bug 2939073} -setup {
     set already 0
-- 
cgit v0.12


From 75bd116527ce94efc1c14c6dc82c526614ed6c7f Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 19 Apr 2018 02:01:29 +0000
Subject: Fold TclArraySet() into its only caller. tclEnv.c no longer calls it

---
 generic/tclInt.h |   2 -
 generic/tclVar.c | 311 +++++++++++++++++++++++++------------------------------
 2 files changed, 141 insertions(+), 172 deletions(-)

diff --git a/generic/tclInt.h b/generic/tclInt.h
index 371e3fa..4db4576 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -2864,8 +2864,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,
diff --git a/generic/tclVar.c b/generic/tclVar.c
index 84f2d7b..c4952be 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -2968,175 +2968,6 @@ Tcl_LappendObjCmd(
 /*
  *----------------------------------------------------------------------
  *
- * TclArraySet --
- *
- *	Set the elements of an array. If there are no elements to set, create
- *	an empty array. This routine is used by the Tcl_ArrayObjCmd and by the
- *	TclSetupEnv routine.
- *
- * Results:
- *	A standard Tcl result object.
- *
- * Side effects:
- *	A variable will be created if one does not already exist.
- *	Callers must Incr arrayNameObj if they pland to Decr it.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclArraySet(
-    Tcl_Interp *interp,		/* Current interpreter. */
-    Tcl_Obj *arrayNameObj,	/* The array name. */
-    Tcl_Obj *arrayElemObj)	/* The array elements list or dict. If this is
-				 * NULL, create an empty array. */
-{
-    Var *varPtr, *arrayPtr;
-    int result, i;
-
-    varPtr = TclObjLookupVarEx(interp, arrayNameObj, NULL,
-	    /*flags*/ TCL_LEAVE_ERR_MSG, /*msg*/ "set", /*createPart1*/ 1,
-	    /*createPart2*/ 1, &arrayPtr);
-    if (varPtr == NULL) {
-	return TCL_ERROR;
-    }
-    if (arrayPtr) {
-	CleanupVar(varPtr, arrayPtr);
-	TclObjVarErrMsg(interp, arrayNameObj, NULL, "set", needArray, -1);
-	Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "VARNAME",
-		TclGetString(arrayNameObj), NULL);
-	return TCL_ERROR;
-    }
-
-    if (arrayElemObj == NULL) {
-	goto ensureArray;
-    }
-
-    /*
-     * Install the contents of the dictionary or list into the array.
-     */
-
-    if (arrayElemObj->typePtr == &tclDictType && arrayElemObj->bytes == NULL) {
-	Tcl_Obj *keyPtr, *valuePtr;
-	Tcl_DictSearch search;
-	int done;
-
-	if (Tcl_DictObjSize(interp, arrayElemObj, &done) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	if (done == 0) {
-	    /*
-	     * Empty, so we'll just force the array to be properly existing
-	     * instead.
-	     */
-
-	    goto ensureArray;
-	}
-
-	/*
-	 * Don't need to look at result of Tcl_DictObjFirst as we've just
-	 * successfully used a dictionary operation on the same object.
-	 */
-
-	for (Tcl_DictObjFirst(interp, arrayElemObj, &search,
-		&keyPtr, &valuePtr, &done) ; !done ;
-		Tcl_DictObjNext(&search, &keyPtr, &valuePtr, &done)) {
-	    /*
-	     * At this point, it would be nice if the key was directly usable
-	     * by the array. This isn't the case though.
-	     */
-
-	    Var *elemVarPtr = TclLookupArrayElement(interp, arrayNameObj,
-		    keyPtr, TCL_LEAVE_ERR_MSG, "set", 1, 1, varPtr, -1);
-
-	    if ((elemVarPtr == NULL) ||
-		    (TclPtrSetVarIdx(interp, elemVarPtr, varPtr, arrayNameObj,
-		    keyPtr, valuePtr, TCL_LEAVE_ERR_MSG, -1) == NULL)) {
-		Tcl_DictObjDone(&search);
-		return TCL_ERROR;
-	    }
-	}
-	return TCL_OK;
-    } else {
-	/*
-	 * Not a dictionary, so assume (and convert to, for backward-
-	 * -compatibility reasons) a list.
-	 */
-
-	int elemLen;
-	Tcl_Obj **elemPtrs, *copyListObj;
-
-	result = TclListObjGetElements(interp, arrayElemObj,
-		&elemLen, &elemPtrs);
-	if (result != TCL_OK) {
-	    return result;
-	}
-	if (elemLen & 1) {
-	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "list must have an even number of elements", -1));
-	    Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "FORMAT", NULL);
-	    return TCL_ERROR;
-	}
-	if (elemLen == 0) {
-	    goto ensureArray;
-	}
-
-	/*
-	 * We needn't worry about traces invalidating arrayPtr: should that be
-	 * the case, TclPtrSetVarIdx will return NULL so that we break out of
-	 * the loop and return an error.
-	 */
-
-	copyListObj = TclListObjCopy(NULL, arrayElemObj);
-	for (i=0 ; i<elemLen ; i+=2) {
-	    Var *elemVarPtr = TclLookupArrayElement(interp, arrayNameObj,
-		    elemPtrs[i], TCL_LEAVE_ERR_MSG, "set", 1, 1, varPtr, -1);
-
-	    if ((elemVarPtr == NULL) ||
-		    (TclPtrSetVarIdx(interp, elemVarPtr, varPtr, arrayNameObj,
-		    elemPtrs[i],elemPtrs[i+1],TCL_LEAVE_ERR_MSG,-1) == NULL)){
-		result = TCL_ERROR;
-		break;
-	    }
-	}
-	Tcl_DecrRefCount(copyListObj);
-	return result;
-    }
-
-    /*
-     * The list is empty make sure we have an array, or create one if
-     * necessary.
-     */
-
-  ensureArray:
-    if (varPtr != NULL) {
-	if (TclIsVarArray(varPtr)) {
-	    /*
-	     * Already an array, done.
-	     */
-
-	    return TCL_OK;
-	}
-	if (TclIsVarArrayElement(varPtr) || !TclIsVarUndefined(varPtr)) {
-	    /*
-	     * Either an array element, or a scalar: lose!
-	     */
-
-	    TclObjVarErrMsg(interp, arrayNameObj, NULL, "array set",
-		    needArray, -1);
-	    Tcl_SetErrorCode(interp, "TCL", "WRITE", "ARRAY", NULL);
-	    return TCL_ERROR;
-	}
-    }
-    TclSetVarArray(varPtr);
-    varPtr->value.tablePtr = ckalloc(sizeof(TclVarHashTable));
-    TclInitVarHashTable(varPtr->value.tablePtr, TclGetVarNsPtr(varPtr));
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
  * ArrayStartSearchCmd --
  *
  *	This object-based function is invoked to process the "array
@@ -3839,6 +3670,11 @@ ArraySetCmd(
     int objc,
     Tcl_Obj *const objv[])
 {
+    Tcl_Obj *arrayNameObj;
+    Tcl_Obj *arrayElemObj;
+    Var *varPtr, *arrayPtr;
+    int result, i;
+
     if (objc != 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "arrayName list");
 	return TCL_ERROR;
@@ -3848,7 +3684,142 @@ ArraySetCmd(
 	return TCL_ERROR;
     }
 
-    return TclArraySet(interp, objv[1], objv[2]);
+    arrayNameObj = objv[1];
+    varPtr = TclObjLookupVarEx(interp, arrayNameObj, NULL,
+	    /*flags*/ TCL_LEAVE_ERR_MSG, /*msg*/ "set", /*createPart1*/ 1,
+	    /*createPart2*/ 1, &arrayPtr);
+    if (varPtr == NULL) {
+	return TCL_ERROR;
+    }
+    if (arrayPtr) {
+	CleanupVar(varPtr, arrayPtr);
+	TclObjVarErrMsg(interp, arrayNameObj, NULL, "set", needArray, -1);
+	Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "VARNAME",
+		TclGetString(arrayNameObj), NULL);
+	return TCL_ERROR;
+    }
+
+    /*
+     * Install the contents of the dictionary or list into the array.
+     */
+
+    arrayElemObj = objv[2];
+    if (arrayElemObj->typePtr == &tclDictType && arrayElemObj->bytes == NULL) {
+	Tcl_Obj *keyPtr, *valuePtr;
+	Tcl_DictSearch search;
+	int done;
+
+	if (Tcl_DictObjSize(interp, arrayElemObj, &done) != TCL_OK) {
+	    return TCL_ERROR;
+	}
+	if (done == 0) {
+	    /*
+	     * Empty, so we'll just force the array to be properly existing
+	     * instead.
+	     */
+
+	    goto ensureArray;
+	}
+
+	/*
+	 * Don't need to look at result of Tcl_DictObjFirst as we've just
+	 * successfully used a dictionary operation on the same object.
+	 */
+
+	for (Tcl_DictObjFirst(interp, arrayElemObj, &search,
+		&keyPtr, &valuePtr, &done) ; !done ;
+		Tcl_DictObjNext(&search, &keyPtr, &valuePtr, &done)) {
+	    /*
+	     * At this point, it would be nice if the key was directly usable
+	     * by the array. This isn't the case though.
+	     */
+
+	    Var *elemVarPtr = TclLookupArrayElement(interp, arrayNameObj,
+		    keyPtr, TCL_LEAVE_ERR_MSG, "set", 1, 1, varPtr, -1);
+
+	    if ((elemVarPtr == NULL) ||
+		    (TclPtrSetVarIdx(interp, elemVarPtr, varPtr, arrayNameObj,
+		    keyPtr, valuePtr, TCL_LEAVE_ERR_MSG, -1) == NULL)) {
+		Tcl_DictObjDone(&search);
+		return TCL_ERROR;
+	    }
+	}
+	return TCL_OK;
+    } else {
+	/*
+	 * Not a dictionary, so assume (and convert to, for backward-
+	 * -compatibility reasons) a list.
+	 */
+
+	int elemLen;
+	Tcl_Obj **elemPtrs, *copyListObj;
+
+	result = TclListObjGetElements(interp, arrayElemObj,
+		&elemLen, &elemPtrs);
+	if (result != TCL_OK) {
+	    return result;
+	}
+	if (elemLen & 1) {
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
+		    "list must have an even number of elements", -1));
+	    Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "FORMAT", NULL);
+	    return TCL_ERROR;
+	}
+	if (elemLen == 0) {
+	    goto ensureArray;
+	}
+
+	/*
+	 * We needn't worry about traces invalidating arrayPtr: should that be
+	 * the case, TclPtrSetVarIdx will return NULL so that we break out of
+	 * the loop and return an error.
+	 */
+
+	copyListObj = TclListObjCopy(NULL, arrayElemObj);
+	for (i=0 ; i<elemLen ; i+=2) {
+	    Var *elemVarPtr = TclLookupArrayElement(interp, arrayNameObj,
+		    elemPtrs[i], TCL_LEAVE_ERR_MSG, "set", 1, 1, varPtr, -1);
+
+	    if ((elemVarPtr == NULL) ||
+		    (TclPtrSetVarIdx(interp, elemVarPtr, varPtr, arrayNameObj,
+		    elemPtrs[i],elemPtrs[i+1],TCL_LEAVE_ERR_MSG,-1) == NULL)){
+		result = TCL_ERROR;
+		break;
+	    }
+	}
+	Tcl_DecrRefCount(copyListObj);
+	return result;
+    }
+
+    /*
+     * The list is empty make sure we have an array, or create one if
+     * necessary.
+     */
+
+  ensureArray:
+    if (varPtr != NULL) {
+	if (TclIsVarArray(varPtr)) {
+	    /*
+	     * Already an array, done.
+	     */
+
+	    return TCL_OK;
+	}
+	if (TclIsVarArrayElement(varPtr) || !TclIsVarUndefined(varPtr)) {
+	    /*
+	     * Either an array element, or a scalar: lose!
+	     */
+
+	    TclObjVarErrMsg(interp, arrayNameObj, NULL, "array set",
+		    needArray, -1);
+	    Tcl_SetErrorCode(interp, "TCL", "WRITE", "ARRAY", NULL);
+	    return TCL_ERROR;
+	}
+    }
+    TclSetVarArray(varPtr);
+    varPtr->value.tablePtr = ckalloc(sizeof(TclVarHashTable));
+    TclInitVarHashTable(varPtr->value.tablePtr, TclGetVarNsPtr(varPtr));
+    return TCL_OK;
 }
 
 /*
-- 
cgit v0.12


From ddb7bbe66c5b805d02fc11f55c53e909e1af45ac Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Thu, 19 Apr 2018 11:48:28 +0000
Subject: correct msgcat test numbering for section util from 15.x (used twice)
 to 18.x

---
 tests/msgcat.test | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/msgcat.test b/tests/msgcat.test
index d38152b..12030fb 100644
--- a/tests/msgcat.test
+++ b/tests/msgcat.test
@@ -1317,33 +1317,33 @@ if {[package vsatisfies [package provide msgcat] 1.7]} {
 
     interp bgerror {} $bgerrorsaved
 
-    # Tests msgcat-15.*: [mcutil]
+    # Tests msgcat-18.*: [mcutil]
 
-    test msgcat-15.5 {mcutil - no argument} -body {
+    test msgcat-18.1 {mcutil - no argument} -body {
 	mcutil
     } -returnCodes 1\
     -result {wrong # args: should be "mcutil subcommand ?arg ...?"}
 
-    test msgcat-15.6 {mcutil - wrong argument} -body {
+    test msgcat-18.2 {mcutil - wrong argument} -body {
 	mcutil junk
     } -returnCodes 1\
     -result {unknown subcommand "junk": must be getpreferences, or getsystemlocale}
     
-    test msgcat-15.7 {mcutil - partial argument} -body {
+    test msgcat-18.3 {mcutil - partial argument} -body {
 	mcutil getsystem
     } -returnCodes 1\
     -result {unknown subcommand "getsystem": must be getpreferences, or getsystemlocale}
     
-    test msgcat-15.8 {mcutil getpreferences - no argument} -body {
+    test msgcat-18.4 {mcutil getpreferences - no argument} -body {
 	mcutil getpreferences
     } -returnCodes 1\
     -result {wrong # args: should be "mcutil getpreferences locale"}
     
-    test msgcat-15.9 {mcutil getpreferences - DE_de} -body {
+    test msgcat-18.5 {mcutil getpreferences - DE_de} -body {
 	mcutil getpreferences DE_de
     } -result {de_de de {}}
     
-    test msgcat-15.10 {mcutil getsystemlocale - wrong argument} -body {
+    test msgcat-18.6 {mcutil getsystemlocale - wrong argument} -body {
 	mcutil getsystemlocale DE_de
     } -returnCodes 1\
     -result {wrong # args: should be "mcutil getsystemlocale"}
@@ -1351,7 +1351,7 @@ if {[package vsatisfies [package provide msgcat] 1.7]} {
     # The result is system dependent
     # So just test if it runs
     # The environment variable version was test with test 0.x
-    test msgcat-15.11 {mcutil getsystemlocale} -body {
+    test msgcat-18.7 {mcutil getsystemlocale} -body {
 	mcutil getsystemlocale
 	set ok ok
     } -result {ok}
-- 
cgit v0.12


From 5c2ea0542f62da981d08766756c2e421db40955c Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 19 Apr 2018 17:46:37 +0000
Subject: Adapt [array for] to use the refactored routines.

---
 generic/tclVar.c | 42 +++++-------------------------------------
 1 file changed, 5 insertions(+), 37 deletions(-)

diff --git a/generic/tclVar.c b/generic/tclVar.c
index 7a71990..51eec61 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -3043,12 +3043,10 @@ ArrayForNRCmd(
     int objc,
     Tcl_Obj *const *objv)
 {
-    Interp *iPtr = (Interp *) interp;
     Tcl_Obj *varListObj, *arrayNameObj, *scriptObj;
     ArraySearch *searchPtr = NULL;
     Var *varPtr;
-    Var *arrayPtr;
-    int numVars;
+    int isArray, numVars;
 
     /*
      * array for {k v} a body
@@ -3064,7 +3062,6 @@ ArrayForNRCmd(
      * Parse arguments.
      */
 
-
     if (Tcl_ListObjLength(interp, objv[1], &numVars) != TCL_OK) {
 	return TCL_ERROR;
     }
@@ -3078,41 +3075,12 @@ ArrayForNRCmd(
 
     arrayNameObj = objv[2];
 
-    /*
-     * Locate the array variable.
-     */
-
-    varPtr = TclObjLookupVarEx(interp, arrayNameObj, NULL, /*flags*/ 0,
-	    /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
-
-    /*
-     * Special array trace used to keep the env array in sync for array names,
-     * array get, etc.
-     */
-
-    if (varPtr && (varPtr->flags & VAR_TRACED_ARRAY)
-	    && (TclIsVarArray(varPtr) || TclIsVarUndefined(varPtr))) {
-	if (TclObjCallVarTraces(iPtr, arrayPtr, varPtr, arrayNameObj, NULL,
-		(TCL_LEAVE_ERR_MSG|TCL_NAMESPACE_ONLY|TCL_GLOBAL_ONLY|
-		TCL_TRACE_ARRAY), /* leaveErrMsg */ 1, -1) == TCL_ERROR) {
-	    return TCL_ERROR;
-	}
+    if (TCL_ERROR == LocateArray(interp, arrayNameObj, &varPtr, &isArray)) {
+	return TCL_ERROR;
     }
 
-    /*
-     * Verify that it is indeed an array variable. This test comes after the
-     * traces; the variable may actually become an array as an effect of said
-     * traces.
-     */
-
-    if ((varPtr == NULL) || !TclIsVarArray(varPtr)
-	    || TclIsVarUndefined(varPtr)) {
-	const char *varName = Tcl_GetString(arrayNameObj);
-
-	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		"\"%s\" isn't an array", varName));
-	Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ARRAY", varName, NULL);
-	return TCL_ERROR;
+    if (!isArray) {
+	return NotArrayError(interp, arrayNameObj);
     }
 
     /*
-- 
cgit v0.12


From 1734eed89f76598661a4ce4c7d5e43ce7fe4368c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 19 Apr 2018 22:29:00 +0000
Subject: Slightly improved (more fail-safe) surrogate handling for
 TCL_UTF_MAX>3. Backported from latest TIP 389 implementation. (to be used for
 androwish)

---
 generic/tclUtf.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/generic/tclUtf.c b/generic/tclUtf.c
index 6255a4e..0d88d36 100644
--- a/generic/tclUtf.c
+++ b/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;
 		}
 	    }
-- 
cgit v0.12


From ae76fbd559e8e30a6cb4c448bf4c924cbd79841b Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Fri, 20 Apr 2018 20:17:17 +0000
Subject: DeleteArray has only one caller. It is called on the "dummy" variable
 that is created during unset, and which cannot be reached by resolving any
 name. It cannot have VAR_SEARCH_ACTIVE set because the sole thing that sets
 that flag is an [array startsearch] applied to a named variable.

---
 generic/tclVar.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/generic/tclVar.c b/generic/tclVar.c
index c4952be..ed16c9f 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -5324,9 +5324,6 @@ DeleteArray(
     Tcl_Obj *objPtr;
     VarTrace *tracePtr;
 
-    if (varPtr->flags & VAR_SEARCH_ACTIVE) {
-	DeleteSearches(iPtr, varPtr);
-    }
     for (elPtr = VarHashFirstVar(varPtr->value.tablePtr, &search);
 	    elPtr != NULL; elPtr = VarHashNextVar(&search)) {
 	if (TclIsVarScalar(elPtr) && (elPtr->value.objPtr != NULL)) {
-- 
cgit v0.12


From 8e06fd796be19c40e0e82a7d9c9e54d34e975504 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Sun, 22 Apr 2018 13:22:20 +0000
Subject: [46a2410650] compiled [unset] was bypassing cleanup of active array
 search. Overdue thanks to Andy Goth for tests and report.

---
 generic/tclExecute.c |  3 ++-
 tests/var.test       | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 5bc5c2d..af44323 100644
--- a/generic/tclExecute.c
+++ b/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)) {
 		/*
diff --git a/tests/var.test b/tests/var.test
index b235e5d..8d86fce 100644
--- a/tests/var.test
+++ b/tests/var.test
@@ -776,6 +776,22 @@ test var-13.1 {Tcl_UnsetVar2, unset array with trace set on element} -setup {
     }
     set x "If you see this, it worked"
 } -result "If you see this, it worked"
+test var-13.2 {unset array with search, bug 46a2410650} -body {
+    apply {{} {
+	array set a {aa 11 bb 22 cc 33 dd 44 ee 55 ff 66}
+	set s [array startsearch a]
+	unset a([array nextelement a $s])
+	array nextelement a $s
+    }}
+} -returnCodes error -result {couldn't find search "s-1-a"}
+test var-13.3 {unset array with search, SIGSEGV, bug 46a2410650} -body {
+    apply {{} {
+	array set a {aa 11 bb 22 cc 33 dd 44 ee 55 ff 66}
+	set s [array startsearch a]
+        unset a(ff)
+	array nextelement a $s
+    }}
+} -returnCodes error -result {couldn't find search "s-1-a"}
 
 test var-14.1 {array names syntax} -body {
     array names foo bar baz snafu
-- 
cgit v0.12


From 95f246935924442788522c93b95723eeef602e77 Mon Sep 17 00:00:00 2001
From: bll <brad.lanam.comp@gmail.com>
Date: Mon, 23 Apr 2018 12:58:41 +0000
Subject: Rework 'array for' to pass the arrayNameObj to the NRE routines
 rather than saving it in the ArraySearch structure (which will not work).
 Create ArrayPopulateSearch to consolidate duplicate code.

---
 generic/tclVar.c | 114 ++++++++++++++++++++++++-------------------------------
 1 file changed, 49 insertions(+), 65 deletions(-)

diff --git a/generic/tclVar.c b/generic/tclVar.c
index 889e6ba..f22815c 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -166,7 +166,6 @@ typedef struct ArraySearch {
     struct ArraySearch *nextPtr;/* Next in list of all active searches for
 				 * this variable, or NULL if this is the last
 				 * one. */
-    Tcl_Obj *arrayNameObj;      /* name of the array object */
 } ArraySearch;
 
 /*
@@ -175,6 +174,7 @@ typedef struct ArraySearch {
 
 static void		AppendLocals(Tcl_Interp *interp, Tcl_Obj *listPtr,
 			    Tcl_Obj *patternPtr, int includeLinks);
+static void             ArrayPopulateSearch(Tcl_Interp *interp, Tcl_Obj *arrayNameObj, Var *varPtr, ArraySearch *searchPtr);
 static void             ArrayDoneSearch (Interp *iPtr, Var *varPtr, ArraySearch *searchPtr);
 static Tcl_NRPostProc   ArrayForLoopCallback;
 static int              ArrayForNRCmd(ClientData dummy, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv);
@@ -2912,7 +2912,6 @@ Tcl_LappendObjCmd(
  * ArrayForObjCmd
  * ArrayForNRCmd
  * ArrayForLoopCallback
- * ArrayObjFirst
  * ArrayObjNext
  *
  *  These functions implement the "array for" Tcl command.
@@ -2932,46 +2931,13 @@ Tcl_LappendObjCmd(
  *  ArrayForLoopCallback() iterates over the entire array, executing
  *  the body each time.
  *
- *  ArrayObjFirst() Does not execute the body or set the key/value variables.
- *
  *----------------------------------------------------------------------
  */
-void
-ArrayObjFirst(
-    Tcl_Interp *interp,
-    Tcl_Obj *arrayNameObj,
-    Var *varPtr,
-    ArraySearch *searchPtr)
-{
-    Interp *iPtr = (Interp *) interp;
-    Tcl_HashEntry   *hPtr;
-    int             isNew;
-
-    /* this code is duplicated from arraystartsearchcmd,
-       excepting that arrayNameObj is set */
-    searchPtr->varPtr = varPtr;
-    searchPtr->arrayNameObj = arrayNameObj;
-
-    /* add the search to the search table */
-    hPtr = Tcl_CreateHashEntry(&iPtr->varSearches, varPtr, &isNew);
-    if (isNew) {
-	searchPtr->id = 1;
-	varPtr->flags |= VAR_SEARCH_ACTIVE;
-        searchPtr->nextPtr = NULL;
-    } else {
-	searchPtr->id = ((ArraySearch *) Tcl_GetHashValue(hPtr))->id + 1;
-	searchPtr->nextPtr = Tcl_GetHashValue(hPtr);
-    }
-    searchPtr->nextEntry = VarHashFirstEntry(varPtr->value.tablePtr,
-	    &searchPtr->search);
-    Tcl_SetHashValue(hPtr, searchPtr);
-    searchPtr->name = Tcl_ObjPrintf("s-%d-%s", searchPtr->id, TclGetString(arrayNameObj));
-    Tcl_IncrRefCount(searchPtr->name);
-}
 
-int
+static int
 ArrayObjNext(
     Tcl_Interp *interp,
+    Tcl_Obj *arrayNameObj,      /* array */
     Var *varPtr,                /* array */
     ArraySearch *searchPtr,
     Tcl_Obj **keyPtrPtr,	/* Pointer to a variable to have the key
@@ -3019,7 +2985,7 @@ ArrayObjNext(
 
     keyObj = VarHashGetKey(varPtr);
     *keyPtrPtr = keyObj;
-    valueObj = Tcl_ObjGetVar2(interp, searchPtr->arrayNameObj,
+    valueObj = Tcl_ObjGetVar2(interp, arrayNameObj,
         keyObj, TCL_LEAVE_ERR_MSG);
     *valuePtrPtr = valueObj;
 
@@ -3088,8 +3054,7 @@ ArrayForNRCmd(
      */
 
     searchPtr = ckalloc(sizeof(ArraySearch));
-    searchPtr->arrayNameObj = NULL;
-    ArrayObjFirst(interp, arrayNameObj, varPtr, searchPtr);
+    ArrayPopulateSearch (interp, arrayNameObj, varPtr, searchPtr);
 
     /*
      * Make sure that these objects (which we need throughout the body of the
@@ -3105,7 +3070,7 @@ ArrayForNRCmd(
      */
 
     TclNRAddCallback(interp, ArrayForLoopCallback, searchPtr, varListObj,
-	    NULL, scriptObj);
+	    arrayNameObj, scriptObj);
     return TCL_OK;
 }
 
@@ -3118,6 +3083,7 @@ ArrayForLoopCallback(
     Interp *iPtr = (Interp *) interp;
     ArraySearch *searchPtr = data[0];
     Tcl_Obj *varListObj = data[1];
+    Tcl_Obj *arrayNameObj = data[2];
     Tcl_Obj *scriptObj = data[3];
     Tcl_Obj **varv;
     Tcl_Obj *keyObj, *valueObj;
@@ -3130,8 +3096,6 @@ ArrayForLoopCallback(
      */
 
     done = TCL_ERROR;
-    varPtr = TclObjLookupVarEx(interp, searchPtr->arrayNameObj, NULL, /*flags*/ 0,
-	    /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
 
     if (result == TCL_CONTINUE) {
 	result = TCL_OK;
@@ -3153,7 +3117,14 @@ ArrayForLoopCallback(
 
     keyObj = NULL;
     valueObj = NULL;
-    done = ArrayObjNext (interp, varPtr, searchPtr, &keyObj, &valueObj);
+    varPtr = TclObjLookupVarEx(interp, arrayNameObj, NULL, /*flags*/ 0,
+	    /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
+    if (varPtr == NULL) {
+      done = TCL_ERROR;
+    } else {
+      done = ArrayObjNext (interp, arrayNameObj, varPtr,
+          searchPtr, &keyObj, &valueObj);
+    }
 
     result = TCL_OK;
     if (done != TCL_CONTINUE) {
@@ -3185,7 +3156,7 @@ ArrayForLoopCallback(
      */
 
     TclNRAddCallback(interp, ArrayForLoopCallback, searchPtr, varListObj,
-	    NULL, scriptObj);
+	    arrayNameObj, scriptObj);
     return TclNREvalObjEx(interp, scriptObj, 0, iPtr->cmdFramePtr, 3);
 
     /*
@@ -3208,6 +3179,37 @@ ArrayForLoopCallback(
 }
 
 /*
+ * ArrayPopulateSearch
+ */
+static void
+ArrayPopulateSearch(
+    Tcl_Interp  *interp,
+    Tcl_Obj     *arrayNameObj,
+    Var         *varPtr,
+    ArraySearch *searchPtr)
+{
+    Interp *iPtr = (Interp *)interp;
+    Tcl_HashEntry *hPtr;
+    int isNew;
+
+    hPtr = Tcl_CreateHashEntry(&iPtr->varSearches, varPtr, &isNew);
+    if (isNew) {
+	searchPtr->id = 1;
+	varPtr->flags |= VAR_SEARCH_ACTIVE;
+	searchPtr->nextPtr = NULL;
+    } else {
+	searchPtr->id = ((ArraySearch *) Tcl_GetHashValue(hPtr))->id + 1;
+	searchPtr->nextPtr = Tcl_GetHashValue(hPtr);
+    }
+    searchPtr->varPtr = varPtr;
+    searchPtr->nextEntry = VarHashFirstEntry(varPtr->value.tablePtr,
+	    &searchPtr->search);
+    Tcl_SetHashValue(hPtr, searchPtr);
+    searchPtr->name = Tcl_ObjPrintf("s-%d-%s", searchPtr->id,
+        TclGetString(arrayNameObj));
+    Tcl_IncrRefCount(searchPtr->name);
+}
+/*
  *----------------------------------------------------------------------
  *
  * ArrayStartSearchCmd --
@@ -3234,12 +3236,9 @@ ArrayStartSearchCmd(
     int objc,
     Tcl_Obj *const objv[])
 {
-    Interp *iPtr = (Interp *)interp;
     Var *varPtr;
-    Tcl_HashEntry *hPtr;
-    int isNew, isArray;
+    int isArray;
     ArraySearch *searchPtr;
-    const char *varName;
 
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "arrayName");
@@ -3258,23 +3257,8 @@ ArrayStartSearchCmd(
      * Make a new array search with a free name.
      */
 
-    varName = TclGetString(objv[1]);
     searchPtr = ckalloc(sizeof(ArraySearch));
-    hPtr = Tcl_CreateHashEntry(&iPtr->varSearches, varPtr, &isNew);
-    if (isNew) {
-	searchPtr->id = 1;
-	varPtr->flags |= VAR_SEARCH_ACTIVE;
-	searchPtr->nextPtr = NULL;
-    } else {
-	searchPtr->id = ((ArraySearch *) Tcl_GetHashValue(hPtr))->id + 1;
-	searchPtr->nextPtr = Tcl_GetHashValue(hPtr);
-    }
-    searchPtr->varPtr = varPtr;
-    searchPtr->nextEntry = VarHashFirstEntry(varPtr->value.tablePtr,
-	    &searchPtr->search);
-    Tcl_SetHashValue(hPtr, searchPtr);
-    searchPtr->name = Tcl_ObjPrintf("s-%d-%s", searchPtr->id, TclGetString(objv[1]));
-    Tcl_IncrRefCount(searchPtr->name);
+    ArrayPopulateSearch (interp, objv[1], varPtr, searchPtr);
     Tcl_SetObjResult(interp, searchPtr->name);
     return TCL_OK;
 }
-- 
cgit v0.12


From 523d6ea42c58bae3ffe912865264036fd8d1b311 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Mon, 23 Apr 2018 13:51:05 +0000
Subject: Dup test name.

---
 tests/string.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/string.test b/tests/string.test
index 2300f08..35b6880 100644
--- a/tests/string.test
+++ b/tests/string.test
@@ -487,7 +487,7 @@ test string-5.19.$noComp {string index, bytearray object out of bounds} {
 test string-5.20.$noComp {string index, bytearray object out of bounds} {
     run {string index [binary format I* {0x50515253 0x52}] 20}
 } {}
-test string-5.21 {string index, surrogates, bug [11ae2be95dac9417]} fullutf {
+test string-5.21.$noComp {string index, surrogates, bug [11ae2be95dac9417]} fullutf {
     list [string index a\U100000b 1] [string index a\U100000b 2] [string index a\U100000b 3]
 } [list \U100000 {} b]
 
-- 
cgit v0.12


From 9acb063268f48f19e3c67a877f2c83e15fd1019d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 23 Apr 2018 14:56:44 +0000
Subject: Add some state to encodings, so we can do better surrogate handling
 for TCL_UTF_MAX >= 4. Backported from TIP #389.

---
 generic/tclEncoding.c | 79 ++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 53 insertions(+), 26 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 2548b73..6b440e7 100644
--- a/generic/tclEncoding.c
+++ b/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.
-- 
cgit v0.12


From 4519681dcd20c967abbe68795911c77c317fab4f Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 23 Apr 2018 23:23:00 +0000
Subject: Bug-fix in Tcl_UtfAtIndex (for TCL_UTF_MAX=4 only). With test-case
 (in "string totitle") demonstrating the bug.

---
 generic/tclUtf.c  |  8 ++++++++
 tests/string.test | 11 +++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/generic/tclUtf.c b/generic/tclUtf.c
index 0d88d36..c08464b 100644
--- a/generic/tclUtf.c
+++ b/generic/tclUtf.c
@@ -762,10 +762,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;
 }
 
diff --git a/tests/string.test b/tests/string.test
index d69fda4..868fc25 100644
--- a/tests/string.test
+++ b/tests/string.test
@@ -24,7 +24,7 @@ catch [list package require -exact Tcltest [info patchlevel]]
 
 testConstraint testobj [expr {[info commands testobj] != {}}]
 testConstraint testindexobj [expr {[info commands testindexobj] != {}}]
-testConstraint fullutf [expr {[format %c 0x010000] != "\ufffd"}]
+testConstraint tip389 [expr {[string length \U010000] == 2}]
 
 # Used for constraining memory leak tests
 testConstraint memory [llength [info commands memory]]
@@ -291,6 +291,9 @@ test string-5.19 {string index, bytearray object out of bounds} {
 test string-5.20 {string index, bytearray object out of bounds} {
     string index [binary format I* {0x50515253 0x52}] 20
 } {}
+test string-5.21 {string index, surrogates, bug [11ae2be95dac9417]} tip389 {
+    list [string index a\U100000b 1] [string index a\U100000b 2] [string index a\U100000b 3]
+} [list \U100000 {} b]
 
 
 proc largest_int {} {
@@ -1280,7 +1283,7 @@ test string-12.22 {string range, shimmering binary/index} {
     binary scan $s a* x
     string range $s $s end
 } 000000001
-test string-12.23 {string range, surrogates, bug [11ae2be95dac9417]} fullutf {
+test string-12.23 {string range, surrogates, bug [11ae2be95dac9417]} tip389 {
     list [string range a\U100000b 1 1] [string range a\U100000b 2 2] [string range a\U100000b 3 3]
 } [list \U100000 {} b]
 
@@ -1477,6 +1480,10 @@ test string-17.7 {string totitle, unicode} {
 test string-17.8 {string totitle, compiled} {
     lindex [string totitle [list aa bb [list cc]]] 0
 } Aa
+test string-17.9 {string totitle, surrogates, bug [11ae2be95dac9417]} tip389 {
+    list [string totitle a\U118c0c 1 1] [string totitle a\U118c0c 2 2] \
+	[string totitle a\U118c0c 3 3]
+} [list a\U118a0c a\U118c0C a\U118c0C]
 
 test string-18.1 {string trim} {
     list [catch {string trim} msg] $msg
-- 
cgit v0.12


From c876decde3e6b34582d26e1cef4967b777a8753c Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Wed, 25 Apr 2018 11:48:14 +0000
Subject: Doc typo fix from Andy Goth.

---
 doc/define.n | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/define.n b/doc/define.n
index 7599ec0..e619728 100644
--- a/doc/define.n
+++ b/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
-- 
cgit v0.12