Merge 8.7

15 files changed, 40 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index 84281bc..ec5e78f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1847,7 +1847,7 @@ a better first place to look now.
 
 	* tools/uniClass.tcl:    [FRQ 3473670]: Various Unicode-related
 	* tools/uniParse.tcl:    speedups/robustness. Enhanced tools to be
-	* generic/tclUniData.c:  able to handle characters > 0xffff. Done in
+	* generic/tclUniData.c:  able to handle characters > 0xFFFF. Done in
 	* generic/tclUtf.c:      all branches in order to simplify merges for
 	* generic/regc_locale.c: new Unicode versions (such as 6.1)
 
diff --git a/ChangeLog.2005 b/ChangeLog.2005
index 0d1d7cf..109ea8e 100644
--- a/ChangeLog.2005
+++ b/ChangeLog.2005
@@ -2913,7 +2913,7 @@
 	* generic/tclCompCmds.c:	Updated callers to call new routine.
 	* generic/tclDictObj.c:	Updated callers to call new routine.
 	* tests/obj.test:	Corrected bad tests that actually expected
-	values like "47" and "0xac" to be accepted as booleans.
+	values like "47" and "0xAC" to be accepted as booleans.
 
 	* generic/tclLiteral.c: Disabled the code that forces some literals
 	into the "int" Tcl_ObjType during registration. We can re-enable it if
diff --git a/changes b/changes
index ca2f7ee..c8080d1 100644
--- a/changes
+++ b/changes
@@ -2307,7 +2307,7 @@ to the standard channel, do not increment the refcount. The channel can
 be NULL if there is for example no standard input. (JL)
 
 9/6/96 (portability improvement) Changed parsing of backslash sequences
-like \n to translate directly to absolute values like 0xa instead of
+like \n to translate directly to absolute values like 0xA instead of
 letting the compiler do the translation.  This guarantees that the
 translation is done the same everywhere. (JO)
 
diff --git a/doc/ParseCmd.3 b/doc/ParseCmd.3
index 41f43cb..9da0d42 100644
--- a/doc/ParseCmd.3
+++ b/doc/ParseCmd.3
@@ -288,7 +288,7 @@ The \fInumComponents\fR field is always 0.
 .TP
 \fBTCL_TOKEN_BS\fR
 .
-The token describes a backslash sequence such as \fB\en\fR or \fB\e0xa3\fR.
+The token describes a backslash sequence such as \fB\en\fR or \fB\e0xA3\fR.
 The \fInumComponents\fR field is always 0.
 .TP
 \fBTCL_TOKEN_COMMAND\fR
diff --git a/generic/regc_locale.c b/generic/regc_locale.c
index f98230f..182428d 100644
--- a/generic/regc_locale.c
+++ b/generic/regc_locale.c
@@ -244,7 +244,7 @@ static const crange alphaRangeTable[] = {
     {0x1EE74, 0x1EE77}, {0x1EE79, 0x1EE7C}, {0x1EE80, 0x1EE89}, {0x1EE8B, 0x1EE9B},
     {0x1EEA1, 0x1EEA3}, {0x1EEA5, 0x1EEA9}, {0x1EEAB, 0x1EEBB}, {0x20000, 0x2A6DD},
     {0x2A700, 0x2B734}, {0x2B740, 0x2B81D}, {0x2B820, 0x2CEA1}, {0x2CEB0, 0x2EBE0},
-    {0x2F800, 0x2FA1D}
+    {0x2F800, 0x2FA1D}, {0x30000, 0x3134A}
 #endif
 };
 
@@ -769,7 +769,7 @@ static const crange graphRangeTable[] = {
     {0x1FA90, 0x1FAA8}, {0x1FAB0, 0x1FAB6}, {0x1FAC0, 0x1FAC2}, {0x1FAD0, 0x1FAD6},
     {0x1FB00, 0x1FB92}, {0x1FB94, 0x1FBCA}, {0x1FBF0, 0x1FBF9}, {0x20000, 0x2A6DD},
     {0x2A700, 0x2B734}, {0x2B740, 0x2B81D}, {0x2B820, 0x2CEA1}, {0x2CEB0, 0x2EBE0},
-    {0x2F800, 0x2FA1D}, {0xE0100, 0xE01EF}
+    {0x2F800, 0x2FA1D}, {0x30000, 0x3134A}, {0xE0100, 0xE01EF}
 #endif
 };
 
diff --git a/generic/tclEnv.c b/generic/tclEnv.c
index fb719c8..869f92a 100644
--- a/generic/tclEnv.c
+++ b/generic/tclEnv.c
@@ -27,7 +27,7 @@ TCL_DECLARE_MUTEX(envMutex)	/* To serialize access to environ. */
 #  ifdef USE_PUTENV
 #    define putenv(env) _wputenv((const wchar_t *)env)
 #  endif
-#else 
+#else
 #  define tenviron environ
 #  define tenviron2utfdstr(tenvstr, len, dstr) \
 		Tcl_ExternalToUtfDString(NULL, tenvstr, len, dstr)
diff --git a/generic/tclUniData.c b/generic/tclUniData.c
index 569e196..ad47dda 100644
--- a/generic/tclUniData.c
+++ b/generic/tclUniData.c
@@ -539,7 +539,24 @@ static const unsigned short pageMap[] = {
     1824, 1824, 1824, 1824, 1824, 1824, 1824, 1824, 1824, 1824, 1824, 1824,
     1824, 1824, 1824, 1824, 1824, 1824, 1824, 1824, 1824, 1824, 1824, 1824,
     1824, 1824, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344,
-    1344, 1344, 1344, 1344, 1344, 1344, 11360
+    1344, 1344, 1344, 1344, 1344, 1344, 11360, 1824, 1824, 1824, 1824,
+    1824, 1824, 1824, 1824, 1824, 1824, 1824, 1824, 1824, 1824, 1824, 1824,
+    1824, 1824, 1824, 1824, 1824, 1824, 1824, 1824, 1824, 1824, 1824, 1824,
+    1824, 1824, 1824, 1824, 1824, 1824, 1824, 1824, 1824, 1824, 1824, 1824,
+    1824, 1824, 1824, 1824, 1824, 1824, 1824, 1344, 1344, 1344, 1344, 1344,
+    1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344,
+    1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344,
+    1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344,
+    1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344,
+    1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344,
+    1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344,
+    1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344,
+    1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344,
+    1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344,
+    1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344,
+    1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344,
+    1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344, 1344,
+    1344, 1344, 1344, 1344, 1344, 1792
 #endif /* TCL_UTF_MAX > 3 */
 };
 
@@ -1629,7 +1646,7 @@ static const int groups[] = {
 };
 
 #if TCL_UTF_MAX > 3 || TCL_MAJOR_VERSION > 8 || TCL_MINOR_VERSION > 6
-#   define UNICODE_OUT_OF_RANGE(ch) (((ch) & 0x1FFFFF) >= 0x2FA20)
+#   define UNICODE_OUT_OF_RANGE(ch) (((ch) & 0x1FFFFF) >= 0x31360)
 #else
 #   define UNICODE_OUT_OF_RANGE(ch) (((ch) & 0x1F0000) != 0)
 #endif
diff --git a/library/clock.tcl b/library/clock.tcl
index 8e4b657..49dfdbe 100644
--- a/library/clock.tcl
+++ b/library/clock.tcl
@@ -3452,7 +3452,7 @@ proc ::tcl::clock::ReadZoneinfoFile {fileName fname} {
     set times [linsert $times 0 $MINWIDE]
     set codes {}
     foreach c $tempCodes {
-	lappend codes [expr { $c & 0xff }]
+	lappend codes [expr { $c & 0xFF }]
     }
     set codes [linsert $codes 0 0]
 
diff --git a/tools/loadICU.tcl b/tools/loadICU.tcl
index 43d7e6a..e07b126 100755
--- a/tools/loadICU.tcl
+++ b/tools/loadICU.tcl
@@ -591,7 +591,7 @@ proc backslashify { string } {
     set retval {}
     foreach char [split $string {}] {
 	scan $char %c ccode
-	if { $ccode >= 0x0020 && $ccode < 0x007f && $char ne "\""
+	if { $ccode >= 0x0020 && $ccode < 0x007F && $char ne "\""
 	     && $char ne "\{" && $char ne "\}" && $char ne "\["
 	     && $char ne "\]" && $char ne "\\" && $char ne "\$" } {
 	    append retval $char
diff --git a/tools/makeTestCases.tcl b/tools/makeTestCases.tcl
index 6cc033b..70213e0 100755
--- a/tools/makeTestCases.tcl
+++ b/tools/makeTestCases.tcl
@@ -592,7 +592,7 @@ proc testcases5 { f2 } {
 	foreach { t offset isdst tzname } $row break
 	if { $t > -4000000000000 } {
 	    set conds [list detroit]
-	    if { $t > wide(0x7fffffff) } {
+	    if { $t > wide(0x7FFFFFFF) } {
 		set conds [list detroit y2038]
 	    }
 	    incr t -1
diff --git a/tools/uniParse.tcl b/tools/uniParse.tcl
index 24be687..a451096 100644
--- a/tools/uniParse.tcl
+++ b/tools/uniParse.tcl
@@ -114,8 +114,8 @@ proc uni::buildTables {data} {
 	set items [split $line \;]
 
 	scan [lindex $items 0] %x index
-	if {$index > 0x2FFFF} then {
-	    # Ignore non-BMP characters, as long as Tcl doesn't support them
+	if {$index > 0x3FFFF} then {
+	    # Ignore characters > plane 3
 	    continue
 	}
 	set index [format %d $index]
diff --git a/unix/configure b/unix/configure
index 1ba1e5c..f813e99 100755
--- a/unix/configure
+++ b/unix/configure
@@ -10422,7 +10422,7 @@ $as_echo "static library" >&6; }
 
     TCL_SHLIB_LD_EXTRAS="-compatibility_version ${TCL_VERSION} -current_version ${TCL_VERSION}`echo ${TCL_PATCH_LEVEL} | awk '{match($0, "\\\.[0-9]+"); print substr($0,RSTART,RLENGTH)}'`"
     TCL_SHLIB_LD_EXTRAS="${TCL_SHLIB_LD_EXTRAS}"' -install_name "${DYLIB_INSTALL_DIR}"/${TCL_LIB_FILE}'
-    echo "$LDFLAGS " | grep -q -- '-prebind ' && TCL_SHLIB_LD_EXTRAS="${TCL_SHLIB_LD_EXTRAS}"' -seg1addr 0xa000000'
+    echo "$LDFLAGS " | grep -q -- '-prebind ' && TCL_SHLIB_LD_EXTRAS="${TCL_SHLIB_LD_EXTRAS}"' -seg1addr 0xA000000'
     TCL_SHLIB_LD_EXTRAS="${TCL_SHLIB_LD_EXTRAS}"' -sectcreate __TEXT __info_plist Tcl-Info.plist'
     EXTRA_TCLSH_LIBS='-sectcreate __TEXT __info_plist Tclsh-Info.plist'
     EXTRA_APP_CC_SWITCHES='-mdynamic-no-pic'
diff --git a/unix/configure.ac b/unix/configure.ac
index e9176ad..144ce4b 100644
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -878,7 +878,7 @@ if test "`uname -s`" = "Darwin" ; then
     SC_ENABLE_FRAMEWORK
     TCL_SHLIB_LD_EXTRAS="-compatibility_version ${TCL_VERSION} -current_version ${TCL_VERSION}`echo ${TCL_PATCH_LEVEL} | awk ['{match($0, "\\\.[0-9]+"); print substr($0,RSTART,RLENGTH)}']`"
     TCL_SHLIB_LD_EXTRAS="${TCL_SHLIB_LD_EXTRAS}"' -install_name "${DYLIB_INSTALL_DIR}"/${TCL_LIB_FILE}'
-    echo "$LDFLAGS " | grep -q -- '-prebind ' && TCL_SHLIB_LD_EXTRAS="${TCL_SHLIB_LD_EXTRAS}"' -seg1addr 0xa000000'
+    echo "$LDFLAGS " | grep -q -- '-prebind ' && TCL_SHLIB_LD_EXTRAS="${TCL_SHLIB_LD_EXTRAS}"' -seg1addr 0xA000000'
     TCL_SHLIB_LD_EXTRAS="${TCL_SHLIB_LD_EXTRAS}"' -sectcreate __TEXT __info_plist Tcl-Info.plist'
     EXTRA_TCLSH_LIBS='-sectcreate __TEXT __info_plist Tclsh-Info.plist'
     EXTRA_APP_CC_SWITCHES='-mdynamic-no-pic'
diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h
index 1f8ff99..4242542 100644
--- a/unix/tclUnixPort.h
+++ b/unix/tclUnixPort.h
@@ -255,29 +255,29 @@ MODULE_SCOPE int TclUnixSetBlockingMode(int fd, int mode);
  */
 
 #ifndef WIFEXITED
-#   define WIFEXITED(stat)	(((*((int *) &(stat))) & 0xff) == 0)
+#   define WIFEXITED(stat)	(((*((int *) &(stat))) & 0xFF) == 0)
 #endif
 
 #ifndef WEXITSTATUS
-#   define WEXITSTATUS(stat)	(((*((int *) &(stat))) >> 8) & 0xff)
+#   define WEXITSTATUS(stat)	(((*((int *) &(stat))) >> 8) & 0xFF)
 #endif
 
 #ifndef WIFSIGNALED
 #   define WIFSIGNALED(stat) \
 	(((*((int *) &(stat)))) && ((*((int *) &(stat))) \
-		== ((*((int *) &(stat))) & 0x00ff)))
+		== ((*((int *) &(stat))) & 0x00FF)))
 #endif
 
 #ifndef WTERMSIG
-#   define WTERMSIG(stat)	((*((int *) &(stat))) & 0x7f)
+#   define WTERMSIG(stat)	((*((int *) &(stat))) & 0x7F)
 #endif
 
 #ifndef WIFSTOPPED
-#   define WIFSTOPPED(stat)	(((*((int *) &(stat))) & 0xff) == 0177)
+#   define WIFSTOPPED(stat)	(((*((int *) &(stat))) & 0xFF) == 0177)
 #endif
 
 #ifndef WSTOPSIG
-#   define WSTOPSIG(stat)	(((*((int *) &(stat))) >> 8) & 0xff)
+#   define WSTOPSIG(stat)	(((*((int *) &(stat))) >> 8) & 0xFF)
 #endif
 
 /*
diff --git a/win/tclWinInit.c b/win/tclWinInit.c
index d951be7..122c4ae 100644
--- a/win/tclWinInit.c
+++ b/win/tclWinInit.c
@@ -629,7 +629,7 @@ TclpSetVariables(
 #  define tenviron _wenviron
 #  define tenviron2utfdstr(string, len, dsPtr) (Tcl_DStringInit(dsPtr), \
 		(char *)Tcl_Char16ToUtfDString((const unsigned short *)(string), ((((len) + 2) >> 1) - 1), (dsPtr)))
-#else 
+#else
 #  define tenviron environ
 #  define tenviron2utfdstr(tenvstr, len, dstr) \
 		Tcl_ExternalToUtfDString(NULL, tenvstr, len, dstr)