diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-03-17 16:45:47 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-03-17 16:45:47 (GMT) |
commit | ae243c85b7e7b470ea541cce41e76cd2cd7474f6 (patch) | |
tree | a5bce13e421f0a68acf9592afe02fc79c73c785e /tools | |
parent | cb291b4c47b87c9080c820a1b28c381167a5fa74 (diff) | |
parent | 27c27e941a08c8ea873a5de4333a498788a22c33 (diff) | |
download | tcl-ae243c85b7e7b470ea541cce41e76cd2cd7474f6.zip tcl-ae243c85b7e7b470ea541cce41e76cd2cd7474f6.tar.gz tcl-ae243c85b7e7b470ea541cce41e76cd2cd7474f6.tar.bz2 |
Merge 8.6
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/loadICU.tcl | 2 | ||||
-rwxr-xr-x | tools/makeTestCases.tcl | 2 | ||||
-rw-r--r-- | tools/uniParse.tcl | 4 |
3 files changed, 4 insertions, 4 deletions
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] |