[CCing bug-gnulib] [email protected] wrote: > u8_tolower in libunistring 1.4.2 applies the Final_Sigma condition > without skipping U+0027 APOSTROPHE, although U+0027 is Case_Ignorable and > uc_is_property_case_ignorable (0x27) answers 1. U+00B7, also > Case_Ignorable, is skipped correctly, so the difference seems specific to > U+0027 in the casing context code. > > Final_Sigma (Unicode Standard, section 3.13, Table 3-17): C is preceded by > a cased letter followed by zero or more case-ignorable characters, and C > is not followed by zero or more case-ignorable characters and then a cased > letter. > > Reproducer (gcc -o repro repro.c -lunistring): > > #include <stdio.h> > #include <string.h> > #include <stdlib.h> > #include <unicase.h> > #include <unictype.h> > > static void show (const char *in) > { > size_t n = 0; > uint8_t *out = u8_tolower ((const uint8_t *) in, strlen (in), > NULL, NULL, NULL, &n); > printf ("%s -> %.*s\n", in, (int) n, (const char *) out); > free (out); > } > > int main (void) > { > printf ("U+0027 Case_Ignorable: %d\n", > uc_is_property_case_ignorable (0x27)); > show ("ΓΙΑΝΝΗΣ'S"); > show ("ΓΙΑΝΝΗΣ·S"); > show ("ΓΙΑΝΝΗΣ S"); > show ("Α'Σ"); > return 0; > } > > Output with libunistring 1.4.2 (Arch Linux, aarch64): > > U+0027 Case_Ignorable: 1 > ΓΙΑΝΝΗΣ'S -> γιαννης's > ΓΙΑΝΝΗΣ·S -> γιαννησ·s > ΓΙΑΝΝΗΣ S -> γιαννης s > Α'Σ -> α'σ > > Expected, as Python's str.lower and Rust's str::to_lowercase give: > > ΓΙΑΝΝΗΣ'S -> γιαννησ's (a cased letter follows past U+0027) > ΓΙΑΝΝΗΣ·S -> γιαννησ·s > ΓΙΑΝΝΗΣ S -> γιαννης s > Α'Σ -> α'ς (a cased letter precedes past U+0027) > > Both directions are affected: U+0027 is treated as ending the search > backward and forward instead of being skipped.
Thanks for the report! I reproduce the issue also with libunistring 1.5. The cause is that we missed this change in Unicode 6.3.0 / 7.0.0 when doing that upgrade in 2015. I'm applying this fix. It will be contained in libunistring 1.6. 2026-11-16 Bruno Haible <[email protected]> unicase/ignorable: Fix for character U+0027. Reported by <[email protected]> in <https://lists.gnu.org/archive/html/bug-libunistring/2026-11/msg00000.html>. * lib/gen-uni-tables.c (is_WBP_SQ): New function. (is_property_case_ignorable): Use it. (is_case_ignorable): Return true for U+0027. * lib/unicase/caseprop.h: Update comments. * lib/unicase/ignorable.c: Likewise. * lib/unicase/ignorable.h: Regenerated. * tests/unicase/test-ignorable.c: Likewise. * modules/unicase/*: Bump required libunistring version.
>From f9e4c24e9bf3f878a11505a8d06bec965f0fca02 Mon Sep 17 00:00:00 2001 From: Bruno Haible <[email protected]> Date: Tue, 17 Nov 2026 02:22:10 +0100 Subject: [PATCH] unicase/ignorable: Fix for character U+0027. Reported by <[email protected]> in <https://lists.gnu.org/archive/html/bug-libunistring/2026-11/msg00000.html>. * lib/gen-uni-tables.c (is_WBP_SQ): New function. (is_property_case_ignorable): Use it. (is_case_ignorable): Return true for U+0027. * lib/unicase/caseprop.h: Update comments. * lib/unicase/ignorable.c: Likewise. * lib/unicase/ignorable.h: Regenerated. * tests/unicase/test-ignorable.c: Likewise. * modules/unicase/*: Bump required libunistring version. --- ChangeLog | 14 ++++++++++++++ lib/gen-uni-tables.c | 19 +++++++++++++++---- lib/unicase/caseprop.h | 8 ++++---- lib/unicase/ignorable.c | 12 ++++++++---- lib/unicase/ignorable.h | 2 +- modules/unicase/u16-casecmp | 2 +- modules/unicase/u16-casecoll | 2 +- modules/unicase/u16-casefold | 2 +- modules/unicase/u16-casexfrm | 2 +- modules/unicase/u16-ct-casefold | 2 +- modules/unicase/u16-ct-tolower | 2 +- modules/unicase/u16-ct-totitle | 2 +- modules/unicase/u16-ct-toupper | 2 +- modules/unicase/u16-is-cased | 2 +- modules/unicase/u16-is-casefolded | 2 +- modules/unicase/u16-is-lowercase | 2 +- modules/unicase/u16-is-titlecase | 2 +- modules/unicase/u16-is-uppercase | 2 +- modules/unicase/u16-prefix-context | 2 +- modules/unicase/u16-suffix-context | 2 +- modules/unicase/u16-tolower | 2 +- modules/unicase/u16-totitle | 2 +- modules/unicase/u16-toupper | 2 +- modules/unicase/u32-casecmp | 2 +- modules/unicase/u32-casecoll | 2 +- modules/unicase/u32-casefold | 2 +- modules/unicase/u32-casexfrm | 2 +- modules/unicase/u32-ct-casefold | 2 +- modules/unicase/u32-ct-tolower | 2 +- modules/unicase/u32-ct-totitle | 2 +- modules/unicase/u32-ct-toupper | 2 +- modules/unicase/u32-is-cased | 2 +- modules/unicase/u32-is-casefolded | 2 +- modules/unicase/u32-is-lowercase | 2 +- modules/unicase/u32-is-titlecase | 2 +- modules/unicase/u32-is-uppercase | 2 +- modules/unicase/u32-prefix-context | 2 +- modules/unicase/u32-suffix-context | 2 +- modules/unicase/u32-tolower | 2 +- modules/unicase/u32-totitle | 2 +- modules/unicase/u32-toupper | 2 +- modules/unicase/u8-casecmp | 2 +- modules/unicase/u8-casecoll | 2 +- modules/unicase/u8-casefold | 2 +- modules/unicase/u8-casexfrm | 2 +- modules/unicase/u8-ct-casefold | 2 +- modules/unicase/u8-ct-tolower | 2 +- modules/unicase/u8-ct-totitle | 2 +- modules/unicase/u8-ct-toupper | 2 +- modules/unicase/u8-is-cased | 2 +- modules/unicase/u8-is-casefolded | 2 +- modules/unicase/u8-is-lowercase | 2 +- modules/unicase/u8-is-titlecase | 2 +- modules/unicase/u8-is-uppercase | 2 +- modules/unicase/u8-prefix-context | 2 +- modules/unicase/u8-suffix-context | 2 +- modules/unicase/u8-tolower | 2 +- modules/unicase/u8-totitle | 2 +- modules/unicase/u8-toupper | 2 +- modules/unicase/ulc-casecmp | 2 +- modules/unicase/ulc-casecoll | 2 +- modules/unicase/ulc-casexfrm | 2 +- tests/unicase/test-ignorable.c | 1 + 63 files changed, 100 insertions(+), 70 deletions(-) diff --git a/ChangeLog b/ChangeLog index 03aa173ee4..ba9e9befad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2026-11-16 Bruno Haible <[email protected]> + + unicase/ignorable: Fix for character U+0027. + Reported by <[email protected]> in + <https://lists.gnu.org/archive/html/bug-libunistring/2026-11/msg00000.html>. + * lib/gen-uni-tables.c (is_WBP_SQ): New function. + (is_property_case_ignorable): Use it. + (is_case_ignorable): Return true for U+0027. + * lib/unicase/caseprop.h: Update comments. + * lib/unicase/ignorable.c: Likewise. + * lib/unicase/ignorable.h: Regenerated. + * tests/unicase/test-ignorable.c: Likewise. + * modules/unicase/*: Bump required libunistring version. + 2026-11-16 Bruno Haible <[email protected]> setlocale: Fix conflict with gettext's <libintl.h> on macOS, Windows. diff --git a/lib/gen-uni-tables.c b/lib/gen-uni-tables.c index 25bd337a06..c890489b61 100644 --- a/lib/gen-uni-tables.c +++ b/lib/gen-uni-tables.c @@ -2739,6 +2739,12 @@ is_WBP_MIDLETTER (unsigned int ch) || ch == 0x055F); } +static bool +is_WBP_SQ (unsigned int ch) +{ + return (ch == 0x0027); +} + /* ========================================================================= */ /* Properties. */ @@ -3266,7 +3272,7 @@ static bool is_property_case_ignorable (unsigned int ch) { bool result1 = (is_WBP_MIDLETTER (ch) || is_WBP_MIDNUMLET (ch) - || ch == 0x0027 + || is_WBP_SQ (ch) || is_category_Mn (ch) || is_category_Me (ch) || is_category_Cf (ch) @@ -11793,12 +11799,16 @@ is_cased (unsigned int ch) /* Quoting the Unicode standard: Definition: A character is defined to be "case-ignorable" if it has the - value MidLetter {or the value MidNumLet} for the Word_Break property or + value MidLetter or MidNumLet or Single_Quote for the Word_Break property or its General_Category is one of Nonspacing_Mark (Mn), Enclosing_Mark (Me), Format (Cf), Modifier_Letter (Lm), or Modifier_Symbol (Sk). - The text marked in braces was added in Unicode 5.1.0, see + The value MidNumLet was added in Unicode 5.1.0, see <https://www.unicode.org/versions/Unicode5.1.0/> section "Update of - Definition of case-ignorable". */ + Definition of case-ignorable". + The value Single_Quote was added in Unicode 6.3.0, see + <https://www.unicode.org/versions/Unicode7.0.0/#Conformance_Changes> and + <https://www.unicode.org/versions/Unicode6.3.0/#Conformance_Changes>. + */ /* Since this predicate is only used for the "Before C" and "After C" conditions of FINAL_SIGMA, we exclude the "cased" characters here. This simplifies the evaluation of the regular expressions @@ -11811,6 +11821,7 @@ is_case_ignorable (unsigned int ch) { return (unicode_org_wbp[ch] == WBP_MIDLETTER || unicode_org_wbp[ch] == WBP_MIDNUMLET + || unicode_org_wbp[ch] == WBP_SQ || is_category_Mn (ch) || is_category_Me (ch) || is_category_Cf (ch) diff --git a/lib/unicase/caseprop.h b/lib/unicase/caseprop.h index a469f3166d..9b833cec99 100644 --- a/lib/unicase/caseprop.h +++ b/lib/unicase/caseprop.h @@ -31,16 +31,16 @@ extern "C" { /* Determine whether a character is "cased" according to the Unicode Standard, - <https://www.unicode.org/versions/Unicode5.0.0/ch03.pdf>, section 3.13, - definition D120. */ + <https://www.unicode.org/versions/Unicode18.0.0/core-spec/chapter-3/>, + section 3.13, definition D135. */ extern bool uc_is_cased (ucs4_t uc) _UC_ATTRIBUTE_CONST; /* Determine whether a character is "case-ignorable" according to the Unicode Standard, - <https://www.unicode.org/versions/Unicode5.0.0/ch03.pdf>, section 3.13, - definition D121. */ + <https://www.unicode.org/versions/Unicode18.0.0/core-spec/chapter-3/>, + section 3.13, definition D136. */ extern bool uc_is_case_ignorable (ucs4_t uc) _UC_ATTRIBUTE_CONST; diff --git a/lib/unicase/ignorable.c b/lib/unicase/ignorable.c index 3e17f6af0b..3a8078cce8 100644 --- a/lib/unicase/ignorable.c +++ b/lib/unicase/ignorable.c @@ -30,12 +30,16 @@ /* Quoting the Unicode standard: Definition: A character is defined to be "case-ignorable" if it has the - value MidLetter {or the value MidNumLet} for the Word_Break property or + value MidLetter or MidNumLet or Single_Quote for the Word_Break property or its General_Category is one of Nonspacing_Mark (Mn), Enclosing_Mark (Me), Format (Cf), Modifier_Letter (Lm), or Modifier_Symbol (Sk). - The text marked in braces was added in Unicode 5.1.0, see + The value MidNumLet was added in Unicode 5.1.0, see <https://www.unicode.org/versions/Unicode5.1.0/> section "Update of - Definition of case-ignorable". */ + Definition of case-ignorable". + The value Single_Quote was added in Unicode 6.3.0, see + <https://www.unicode.org/versions/Unicode7.0.0/#Conformance_Changes> and + <https://www.unicode.org/versions/Unicode6.3.0/#Conformance_Changes>. + */ /* Since this predicate is only used for the "Before C" and "After C" conditions of FINAL_SIGMA, we exclude the "cased" characters here. This simplifies the evaluation of the regular expressions @@ -54,7 +58,7 @@ uc_is_case_ignorable (ucs4_t uc) { int wbp = uc_wordbreak_property (uc); - return (wbp == WBP_MIDLETTER || wbp == WBP_MIDNUMLET + return (wbp == WBP_MIDLETTER || wbp == WBP_MIDNUMLET || wbp == WBP_SQ || uc_is_general_category_withtable (uc, UC_CATEGORY_MASK_Mn | UC_CATEGORY_MASK_Me | UC_CATEGORY_MASK_Cf diff --git a/lib/unicase/ignorable.h b/lib/unicase/ignorable.h index f21bd890c0..44eca08ecb 100644 --- a/lib/unicase/ignorable.h +++ b/lib/unicase/ignorable.h @@ -444,7 +444,7 @@ u_casing_property_case_ignorable = -1 }, { - 0x00000000U, 0x04004000U, 0x40000000U, 0x00000001U, + 0x00000000U, 0x04004080U, 0x40000000U, 0x00000001U, 0x00000000U, 0x0190A100U, 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, diff --git a/modules/unicase/u16-casecmp b/modules/unicase/u16-casecmp index 4c04806800..dc5eba5a2e 100644 --- a/modules/unicase/u16-casecmp +++ b/modules/unicase/u16-casecmp @@ -13,7 +13,7 @@ unistr/u16-cmp2 minmax configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u16-casecmp]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u16-casecmp]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U16_CASECMP diff --git a/modules/unicase/u16-casecoll b/modules/unicase/u16-casecoll index 4bb66d2562..c9b8dfdb1e 100644 --- a/modules/unicase/u16-casecoll +++ b/modules/unicase/u16-casecoll @@ -12,7 +12,7 @@ unicase/u16-casexfrm memcmp2 configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u16-casecoll]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u16-casecoll]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U16_CASECOLL diff --git a/modules/unicase/u16-casefold b/modules/unicase/u16-casefold index 52e5c72976..f358d9d325 100644 --- a/modules/unicase/u16-casefold +++ b/modules/unicase/u16-casefold @@ -12,7 +12,7 @@ unicase/empty-prefix-context unicase/empty-suffix-context configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u16-casefold]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u16-casefold]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U16_CASEFOLD diff --git a/modules/unicase/u16-casexfrm b/modules/unicase/u16-casexfrm index b420952fdf..4d708b3ff3 100644 --- a/modules/unicase/u16-casexfrm +++ b/modules/unicase/u16-casexfrm @@ -14,7 +14,7 @@ localcharset amemxfrm configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u16-casexfrm]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u16-casexfrm]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U16_CASEXFRM diff --git a/modules/unicase/u16-ct-casefold b/modules/unicase/u16-ct-casefold index a487e723e4..e0dc40a4e4 100644 --- a/modules/unicase/u16-ct-casefold +++ b/modules/unicase/u16-ct-casefold @@ -15,7 +15,7 @@ uninorm/u16-normalize uninorm/nfd configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u16-ct-casefold]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u16-ct-casefold]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U16_CT_CASEFOLD diff --git a/modules/unicase/u16-ct-tolower b/modules/unicase/u16-ct-tolower index f337e5c77c..adfa13a84e 100644 --- a/modules/unicase/u16-ct-tolower +++ b/modules/unicase/u16-ct-tolower @@ -11,7 +11,7 @@ unicase/special-casing unicase/toupper configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u16-ct-tolower]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u16-ct-tolower]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U16_CT_TOLOWER diff --git a/modules/unicase/u16-ct-totitle b/modules/unicase/u16-ct-totitle index 42c7cd9632..928c6dfbaa 100644 --- a/modules/unicase/u16-ct-totitle +++ b/modules/unicase/u16-ct-totitle @@ -23,7 +23,7 @@ uninorm/u16-normalize bool configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u16-ct-totitle]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u16-ct-totitle]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U16_CT_TOTITLE diff --git a/modules/unicase/u16-ct-toupper b/modules/unicase/u16-ct-toupper index 2dc0c2e1bc..bd97aea272 100644 --- a/modules/unicase/u16-ct-toupper +++ b/modules/unicase/u16-ct-toupper @@ -11,7 +11,7 @@ unicase/special-casing unicase/toupper configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u16-ct-toupper]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u16-ct-toupper]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U16_CT_TOUPPER diff --git a/modules/unicase/u16-is-cased b/modules/unicase/u16-is-cased index 8e136bbdc4..0b12a62154 100644 --- a/modules/unicase/u16-is-cased +++ b/modules/unicase/u16-is-cased @@ -16,7 +16,7 @@ unistr/u16-cmp bool configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u16-is-cased]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u16-is-cased]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U16_IS_CASED diff --git a/modules/unicase/u16-is-casefolded b/modules/unicase/u16-is-casefolded index 3acfd45f44..f6a1141ed4 100644 --- a/modules/unicase/u16-is-casefolded +++ b/modules/unicase/u16-is-casefolded @@ -10,7 +10,7 @@ unicase/u16-is-invariant unicase/u16-casefold configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u16-is-casefolded]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u16-is-casefolded]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U16_IS_CASEFOLDED diff --git a/modules/unicase/u16-is-lowercase b/modules/unicase/u16-is-lowercase index fe1db7e39a..6589659fd2 100644 --- a/modules/unicase/u16-is-lowercase +++ b/modules/unicase/u16-is-lowercase @@ -10,7 +10,7 @@ unicase/u16-is-invariant unicase/u16-tolower configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u16-is-lowercase]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u16-is-lowercase]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U16_IS_LOWERCASE diff --git a/modules/unicase/u16-is-titlecase b/modules/unicase/u16-is-titlecase index 889de81f31..aee6dadcf2 100644 --- a/modules/unicase/u16-is-titlecase +++ b/modules/unicase/u16-is-titlecase @@ -10,7 +10,7 @@ unicase/u16-is-invariant unicase/u16-totitle configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u16-is-titlecase]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u16-is-titlecase]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U16_IS_TITLECASE diff --git a/modules/unicase/u16-is-uppercase b/modules/unicase/u16-is-uppercase index 6e3d178767..6677300106 100644 --- a/modules/unicase/u16-is-uppercase +++ b/modules/unicase/u16-is-uppercase @@ -10,7 +10,7 @@ unicase/u16-is-invariant unicase/u16-toupper configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u16-is-uppercase]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u16-is-uppercase]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U16_IS_UPPERCASE diff --git a/modules/unicase/u16-prefix-context b/modules/unicase/u16-prefix-context index c6fbcd246a..2e3133f0d6 100644 --- a/modules/unicase/u16-prefix-context +++ b/modules/unicase/u16-prefix-context @@ -15,7 +15,7 @@ unistr/u16-mbtouc-unsafe unistr/u16-prev configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u16-prefix-context]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u16-prefix-context]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U16_PREFIX_CONTEXT diff --git a/modules/unicase/u16-suffix-context b/modules/unicase/u16-suffix-context index 9bd4c832a4..a615cab65b 100644 --- a/modules/unicase/u16-suffix-context +++ b/modules/unicase/u16-suffix-context @@ -14,7 +14,7 @@ unictype/combining-class unistr/u16-mbtouc-unsafe configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u16-suffix-context]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u16-suffix-context]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U16_SUFFIX_CONTEXT diff --git a/modules/unicase/u16-tolower b/modules/unicase/u16-tolower index a6ac8b3d71..4b71ad3790 100644 --- a/modules/unicase/u16-tolower +++ b/modules/unicase/u16-tolower @@ -13,7 +13,7 @@ unicase/empty-suffix-context unicase/tolower configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u16-tolower]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u16-tolower]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U16_TOLOWER diff --git a/modules/unicase/u16-totitle b/modules/unicase/u16-totitle index d7a8663b3f..d181841634 100644 --- a/modules/unicase/u16-totitle +++ b/modules/unicase/u16-totitle @@ -12,7 +12,7 @@ unicase/empty-prefix-context unicase/empty-suffix-context configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u16-totitle]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u16-totitle]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U16_TOTITLE diff --git a/modules/unicase/u16-toupper b/modules/unicase/u16-toupper index 11c54bc04f..8e51b28e72 100644 --- a/modules/unicase/u16-toupper +++ b/modules/unicase/u16-toupper @@ -13,7 +13,7 @@ unicase/empty-suffix-context unicase/toupper configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u16-toupper]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u16-toupper]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U16_TOUPPER diff --git a/modules/unicase/u32-casecmp b/modules/unicase/u32-casecmp index 2f72d64547..d429431965 100644 --- a/modules/unicase/u32-casecmp +++ b/modules/unicase/u32-casecmp @@ -13,7 +13,7 @@ unistr/u32-cmp2 minmax configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u32-casecmp]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u32-casecmp]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U32_CASECMP diff --git a/modules/unicase/u32-casecoll b/modules/unicase/u32-casecoll index 77fcd37606..363da80e5f 100644 --- a/modules/unicase/u32-casecoll +++ b/modules/unicase/u32-casecoll @@ -12,7 +12,7 @@ unicase/u32-casexfrm memcmp2 configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u32-casecoll]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u32-casecoll]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U32_CASECOLL diff --git a/modules/unicase/u32-casefold b/modules/unicase/u32-casefold index 01dc0e44a9..b0b04cccb5 100644 --- a/modules/unicase/u32-casefold +++ b/modules/unicase/u32-casefold @@ -12,7 +12,7 @@ unicase/empty-prefix-context unicase/empty-suffix-context configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u32-casefold]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u32-casefold]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U32_CASEFOLD diff --git a/modules/unicase/u32-casexfrm b/modules/unicase/u32-casexfrm index 020d4e3de4..0ce5abdbba 100644 --- a/modules/unicase/u32-casexfrm +++ b/modules/unicase/u32-casexfrm @@ -14,7 +14,7 @@ localcharset amemxfrm configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u32-casexfrm]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u32-casexfrm]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U32_CASEXFRM diff --git a/modules/unicase/u32-ct-casefold b/modules/unicase/u32-ct-casefold index 593ca798fa..0adab09ca2 100644 --- a/modules/unicase/u32-ct-casefold +++ b/modules/unicase/u32-ct-casefold @@ -15,7 +15,7 @@ uninorm/u32-normalize uninorm/nfd configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u32-ct-casefold]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u32-ct-casefold]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U32_CT_CASEFOLD diff --git a/modules/unicase/u32-ct-tolower b/modules/unicase/u32-ct-tolower index dc9848c206..2e91776d6f 100644 --- a/modules/unicase/u32-ct-tolower +++ b/modules/unicase/u32-ct-tolower @@ -11,7 +11,7 @@ unicase/special-casing unicase/toupper configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u32-ct-tolower]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u32-ct-tolower]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U32_CT_TOLOWER diff --git a/modules/unicase/u32-ct-totitle b/modules/unicase/u32-ct-totitle index 0d31dc794a..177866588e 100644 --- a/modules/unicase/u32-ct-totitle +++ b/modules/unicase/u32-ct-totitle @@ -23,7 +23,7 @@ uninorm/u32-normalize bool configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u32-ct-totitle]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u32-ct-totitle]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U32_CT_TOTITLE diff --git a/modules/unicase/u32-ct-toupper b/modules/unicase/u32-ct-toupper index 9f4749fc59..145484e626 100644 --- a/modules/unicase/u32-ct-toupper +++ b/modules/unicase/u32-ct-toupper @@ -11,7 +11,7 @@ unicase/special-casing unicase/toupper configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u32-ct-toupper]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u32-ct-toupper]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U32_CT_TOUPPER diff --git a/modules/unicase/u32-is-cased b/modules/unicase/u32-is-cased index 11fab66fa2..0e3f7fcb0a 100644 --- a/modules/unicase/u32-is-cased +++ b/modules/unicase/u32-is-cased @@ -16,7 +16,7 @@ unistr/u32-cmp bool configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u32-is-cased]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u32-is-cased]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U32_IS_CASED diff --git a/modules/unicase/u32-is-casefolded b/modules/unicase/u32-is-casefolded index cc8b8e361d..9e4d820cfc 100644 --- a/modules/unicase/u32-is-casefolded +++ b/modules/unicase/u32-is-casefolded @@ -10,7 +10,7 @@ unicase/u32-is-invariant unicase/u32-casefold configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u32-is-casefolded]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u32-is-casefolded]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U32_IS_CASEFOLDED diff --git a/modules/unicase/u32-is-lowercase b/modules/unicase/u32-is-lowercase index f4a263563f..57d836b056 100644 --- a/modules/unicase/u32-is-lowercase +++ b/modules/unicase/u32-is-lowercase @@ -10,7 +10,7 @@ unicase/u32-is-invariant unicase/u32-tolower configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u32-is-lowercase]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u32-is-lowercase]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U32_IS_LOWERCASE diff --git a/modules/unicase/u32-is-titlecase b/modules/unicase/u32-is-titlecase index da3b2cee31..580b0801f2 100644 --- a/modules/unicase/u32-is-titlecase +++ b/modules/unicase/u32-is-titlecase @@ -10,7 +10,7 @@ unicase/u32-is-invariant unicase/u32-totitle configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u32-is-titlecase]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u32-is-titlecase]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U32_IS_TITLECASE diff --git a/modules/unicase/u32-is-uppercase b/modules/unicase/u32-is-uppercase index deeb3823d2..b0ed8308c2 100644 --- a/modules/unicase/u32-is-uppercase +++ b/modules/unicase/u32-is-uppercase @@ -10,7 +10,7 @@ unicase/u32-is-invariant unicase/u32-toupper configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u32-is-uppercase]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u32-is-uppercase]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U32_IS_UPPERCASE diff --git a/modules/unicase/u32-prefix-context b/modules/unicase/u32-prefix-context index 34bff6787c..4e9a5104bc 100644 --- a/modules/unicase/u32-prefix-context +++ b/modules/unicase/u32-prefix-context @@ -15,7 +15,7 @@ unistr/u32-mbtouc-unsafe unistr/u32-prev configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u32-prefix-context]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u32-prefix-context]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U32_PREFIX_CONTEXT diff --git a/modules/unicase/u32-suffix-context b/modules/unicase/u32-suffix-context index 6be5c02752..5641d2c8e6 100644 --- a/modules/unicase/u32-suffix-context +++ b/modules/unicase/u32-suffix-context @@ -14,7 +14,7 @@ unictype/combining-class unistr/u32-mbtouc-unsafe configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u32-suffix-context]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u32-suffix-context]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U32_SUFFIX_CONTEXT diff --git a/modules/unicase/u32-tolower b/modules/unicase/u32-tolower index 015a45bdfc..2ff5e2966e 100644 --- a/modules/unicase/u32-tolower +++ b/modules/unicase/u32-tolower @@ -13,7 +13,7 @@ unicase/empty-suffix-context unicase/tolower configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u32-tolower]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u32-tolower]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U32_TOLOWER diff --git a/modules/unicase/u32-totitle b/modules/unicase/u32-totitle index a9bf5a7374..dfe0e6c6ea 100644 --- a/modules/unicase/u32-totitle +++ b/modules/unicase/u32-totitle @@ -12,7 +12,7 @@ unicase/empty-prefix-context unicase/empty-suffix-context configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u32-totitle]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u32-totitle]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U32_TOTITLE diff --git a/modules/unicase/u32-toupper b/modules/unicase/u32-toupper index 545e08cf54..ffe9191a02 100644 --- a/modules/unicase/u32-toupper +++ b/modules/unicase/u32-toupper @@ -13,7 +13,7 @@ unicase/empty-suffix-context unicase/toupper configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u32-toupper]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u32-toupper]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U32_TOUPPER diff --git a/modules/unicase/u8-casecmp b/modules/unicase/u8-casecmp index 401588e4ed..321f7588a3 100644 --- a/modules/unicase/u8-casecmp +++ b/modules/unicase/u8-casecmp @@ -13,7 +13,7 @@ unistr/u8-cmp2 minmax configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u8-casecmp]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u8-casecmp]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U8_CASECMP diff --git a/modules/unicase/u8-casecoll b/modules/unicase/u8-casecoll index ff8ad6a885..5e30d6b79f 100644 --- a/modules/unicase/u8-casecoll +++ b/modules/unicase/u8-casecoll @@ -12,7 +12,7 @@ unicase/u8-casexfrm memcmp2 configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u8-casecoll]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u8-casecoll]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U8_CASECOLL diff --git a/modules/unicase/u8-casefold b/modules/unicase/u8-casefold index 03e351530c..205e7a1e5f 100644 --- a/modules/unicase/u8-casefold +++ b/modules/unicase/u8-casefold @@ -12,7 +12,7 @@ unicase/empty-prefix-context unicase/empty-suffix-context configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u8-casefold]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u8-casefold]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U8_CASEFOLD diff --git a/modules/unicase/u8-casexfrm b/modules/unicase/u8-casexfrm index 331e54bf4c..e8ede9d44e 100644 --- a/modules/unicase/u8-casexfrm +++ b/modules/unicase/u8-casexfrm @@ -14,7 +14,7 @@ localcharset amemxfrm configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u8-casexfrm]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u8-casexfrm]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U8_CASEXFRM diff --git a/modules/unicase/u8-ct-casefold b/modules/unicase/u8-ct-casefold index 2120a4d3c6..8d28923844 100644 --- a/modules/unicase/u8-ct-casefold +++ b/modules/unicase/u8-ct-casefold @@ -15,7 +15,7 @@ uninorm/u8-normalize uninorm/nfd configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u8-ct-casefold]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u8-ct-casefold]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U8_CT_CASEFOLD diff --git a/modules/unicase/u8-ct-tolower b/modules/unicase/u8-ct-tolower index 9d5a9c96ea..b274af79c6 100644 --- a/modules/unicase/u8-ct-tolower +++ b/modules/unicase/u8-ct-tolower @@ -11,7 +11,7 @@ unicase/special-casing unicase/toupper configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u8-ct-tolower]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u8-ct-tolower]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U8_CT_TOLOWER diff --git a/modules/unicase/u8-ct-totitle b/modules/unicase/u8-ct-totitle index 26ee2690e1..83ff4b8970 100644 --- a/modules/unicase/u8-ct-totitle +++ b/modules/unicase/u8-ct-totitle @@ -23,7 +23,7 @@ uninorm/u8-normalize bool configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u8-ct-totitle]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u8-ct-totitle]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U8_CT_TOTITLE diff --git a/modules/unicase/u8-ct-toupper b/modules/unicase/u8-ct-toupper index c6a03fdf7f..2bf32936eb 100644 --- a/modules/unicase/u8-ct-toupper +++ b/modules/unicase/u8-ct-toupper @@ -11,7 +11,7 @@ unicase/special-casing unicase/toupper configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u8-ct-toupper]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u8-ct-toupper]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U8_CT_TOUPPER diff --git a/modules/unicase/u8-is-cased b/modules/unicase/u8-is-cased index 6ce0c963fb..d5dcc93fb0 100644 --- a/modules/unicase/u8-is-cased +++ b/modules/unicase/u8-is-cased @@ -16,7 +16,7 @@ unistr/u8-cmp bool configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u8-is-cased]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u8-is-cased]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U8_IS_CASED diff --git a/modules/unicase/u8-is-casefolded b/modules/unicase/u8-is-casefolded index 4ff2528ad8..91305ed6ce 100644 --- a/modules/unicase/u8-is-casefolded +++ b/modules/unicase/u8-is-casefolded @@ -10,7 +10,7 @@ unicase/u8-is-invariant unicase/u8-casefold configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u8-is-casefolded]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u8-is-casefolded]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U8_IS_CASEFOLDED diff --git a/modules/unicase/u8-is-lowercase b/modules/unicase/u8-is-lowercase index 8c29246f1f..0680838cfa 100644 --- a/modules/unicase/u8-is-lowercase +++ b/modules/unicase/u8-is-lowercase @@ -10,7 +10,7 @@ unicase/u8-is-invariant unicase/u8-tolower configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u8-is-lowercase]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u8-is-lowercase]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U8_IS_LOWERCASE diff --git a/modules/unicase/u8-is-titlecase b/modules/unicase/u8-is-titlecase index e23087bb05..69c8bfffe0 100644 --- a/modules/unicase/u8-is-titlecase +++ b/modules/unicase/u8-is-titlecase @@ -10,7 +10,7 @@ unicase/u8-is-invariant unicase/u8-totitle configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u8-is-titlecase]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u8-is-titlecase]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U8_IS_TITLECASE diff --git a/modules/unicase/u8-is-uppercase b/modules/unicase/u8-is-uppercase index 83f2f7ec3c..10cdde57fb 100644 --- a/modules/unicase/u8-is-uppercase +++ b/modules/unicase/u8-is-uppercase @@ -10,7 +10,7 @@ unicase/u8-is-invariant unicase/u8-toupper configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u8-is-uppercase]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u8-is-uppercase]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U8_IS_UPPERCASE diff --git a/modules/unicase/u8-prefix-context b/modules/unicase/u8-prefix-context index f99af5b744..bf58e50d59 100644 --- a/modules/unicase/u8-prefix-context +++ b/modules/unicase/u8-prefix-context @@ -15,7 +15,7 @@ unistr/u8-mbtouc-unsafe unistr/u8-prev configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u8-prefix-context]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u8-prefix-context]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U8_PREFIX_CONTEXT diff --git a/modules/unicase/u8-suffix-context b/modules/unicase/u8-suffix-context index abf257698a..79b38ddcfc 100644 --- a/modules/unicase/u8-suffix-context +++ b/modules/unicase/u8-suffix-context @@ -14,7 +14,7 @@ unictype/combining-class unistr/u8-mbtouc-unsafe configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u8-suffix-context]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u8-suffix-context]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U8_SUFFIX_CONTEXT diff --git a/modules/unicase/u8-tolower b/modules/unicase/u8-tolower index 590b8f29a6..917700cc08 100644 --- a/modules/unicase/u8-tolower +++ b/modules/unicase/u8-tolower @@ -13,7 +13,7 @@ unicase/empty-suffix-context unicase/tolower configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u8-tolower]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u8-tolower]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U8_TOLOWER diff --git a/modules/unicase/u8-totitle b/modules/unicase/u8-totitle index 0be7d2231c..ff399d03f7 100644 --- a/modules/unicase/u8-totitle +++ b/modules/unicase/u8-totitle @@ -12,7 +12,7 @@ unicase/empty-prefix-context unicase/empty-suffix-context configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u8-totitle]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u8-totitle]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U8_TOTITLE diff --git a/modules/unicase/u8-toupper b/modules/unicase/u8-toupper index 99a0a731bf..72ffa1c8da 100644 --- a/modules/unicase/u8-toupper +++ b/modules/unicase/u8-toupper @@ -13,7 +13,7 @@ unicase/empty-suffix-context unicase/toupper configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/u8-toupper]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/u8-toupper]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_U8_TOUPPER diff --git a/modules/unicase/ulc-casecmp b/modules/unicase/ulc-casecmp index 1e75e59069..71655f25e4 100644 --- a/modules/unicase/ulc-casecmp +++ b/modules/unicase/ulc-casecmp @@ -15,7 +15,7 @@ localcharset minmax configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/ulc-casecmp]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/ulc-casecmp]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_ULC_CASECMP diff --git a/modules/unicase/ulc-casecoll b/modules/unicase/ulc-casecoll index 2e4e7016f9..896bc7af7d 100644 --- a/modules/unicase/ulc-casecoll +++ b/modules/unicase/ulc-casecoll @@ -11,7 +11,7 @@ unicase/ulc-casexfrm memcmp2 configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/ulc-casecoll]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/ulc-casecoll]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_ULC_CASECOLL diff --git a/modules/unicase/ulc-casexfrm b/modules/unicase/ulc-casexfrm index 42aa33b014..c7296a5c8d 100644 --- a/modules/unicase/ulc-casexfrm +++ b/modules/unicase/ulc-casexfrm @@ -11,7 +11,7 @@ uniconv/u8-conv-from-enc localcharset configure.ac: -gl_LIBUNISTRING_MODULE([1.5], [unicase/ulc-casexfrm]) +gl_LIBUNISTRING_MODULE([1.6], [unicase/ulc-casexfrm]) Makefile.am: if LIBUNISTRING_COMPILE_UNICASE_ULC_CASEXFRM diff --git a/tests/unicase/test-ignorable.c b/tests/unicase/test-ignorable.c index 0e7c340992..1fee0a5d15 100644 --- a/tests/unicase/test-ignorable.c +++ b/tests/unicase/test-ignorable.c @@ -17,6 +17,7 @@ #include "test-predicate-part1.h" + { 0x0027, 0x0027 }, { 0x002E, 0x002E }, { 0x003A, 0x003A }, { 0x005E, 0x005E }, -- 2.53.0
