diff options
| -rw-r--r-- | generic/regc_locale.c | 4 | ||||
| -rw-r--r-- | generic/tcl.decls | 5 | ||||
| -rw-r--r-- | generic/tclDecls.h | 9 | ||||
| -rw-r--r-- | generic/tclStubInit.c | 3 | ||||
| -rw-r--r-- | generic/tclUniData.c | 21 | ||||
| -rw-r--r-- | tools/uniParse.tcl | 4 |
6 files changed, 35 insertions, 11 deletions
diff --git a/generic/regc_locale.c b/generic/regc_locale.c index 6b2b2ea..28fd01f 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/tcl.decls b/generic/tcl.decls index f811ab6..6510249 100644 --- a/generic/tcl.decls +++ b/generic/tcl.decls @@ -2107,7 +2107,10 @@ declare 578 { declare 579 { void Tcl_AppendPrintfToObj(Tcl_Obj *objPtr, const char *format, ...) } -declare 648 { + +# ----- BASELINE -- FOR -- 8.5.0 ----- # + +declare 649 { void TclUnusedStubEntry(void) } diff --git a/generic/tclDecls.h b/generic/tclDecls.h index a1dbb26..a5b7ec1 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -3480,9 +3480,10 @@ EXTERN void Tcl_AppendPrintfToObj(Tcl_Obj *objPtr, /* Slot 645 is reserved */ /* Slot 646 is reserved */ /* Slot 647 is reserved */ +/* Slot 648 is reserved */ #ifndef TclUnusedStubEntry_TCL_DECLARED #define TclUnusedStubEntry_TCL_DECLARED -/* 648 */ +/* 649 */ EXTERN void TclUnusedStubEntry(void); #endif @@ -4168,7 +4169,8 @@ typedef struct TclStubs { VOID *reserved645; VOID *reserved646; VOID *reserved647; - void (*tclUnusedStubEntry) (void); /* 648 */ + VOID *reserved648; + void (*tclUnusedStubEntry) (void); /* 649 */ } TclStubs; extern TclStubs *tclStubsPtr; @@ -6589,9 +6591,10 @@ extern TclStubs *tclStubsPtr; /* Slot 645 is reserved */ /* Slot 646 is reserved */ /* Slot 647 is reserved */ +/* Slot 648 is reserved */ #ifndef TclUnusedStubEntry #define TclUnusedStubEntry \ - (tclStubsPtr->tclUnusedStubEntry) /* 648 */ + (tclStubsPtr->tclUnusedStubEntry) /* 649 */ #endif #endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */ diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index 239cf60..67cb68e 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -1443,7 +1443,8 @@ TclStubs tclStubs = { NULL, /* 645 */ NULL, /* 646 */ NULL, /* 647 */ - TclUnusedStubEntry, /* 648 */ + NULL, /* 648 */ + TclUnusedStubEntry, /* 649 */ }; /* !END!: Do not edit above this line. */ 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/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] |