diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-03-17 16:35:51 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-03-17 16:35:51 (GMT) |
| commit | 27c27e941a08c8ea873a5de4333a498788a22c33 (patch) | |
| tree | 27485d4f1bbb8509ad6e0ade9f8402cc056bcb44 /tools | |
| parent | 07cfb2190f1ec3f06fb59425ad6fc3b5edd5dcff (diff) | |
| parent | 50eee151a907e29a58d8201f66988816ae14eae5 (diff) | |
| download | tcl-27c27e941a08c8ea873a5de4333a498788a22c33.zip tcl-27c27e941a08c8ea873a5de4333a498788a22c33.tar.gz tcl-27c27e941a08c8ea873a5de4333a498788a22c33.tar.bz2 | |
Merge 8.5. Mainly add Unicode 13 new plane 3 characters to the internal Unicode tables. Not used in 8.6 yet.
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 31f1e54..021ced3 100755 --- a/tools/loadICU.tcl +++ b/tools/loadICU.tcl @@ -588,7 +588,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] |