Skip to content

Commit 093ed36

Browse files
rurbanrurban
committed
bump UNICODE_VERSION to 17
1 parent 617be47 commit 093ed36

File tree

13 files changed

+1666
-630
lines changed

13 files changed

+1666
-630
lines changed

‎configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,7 @@ else
781781
AC_MSG_CHECKING([for perl UnicodeVersion])
782782
unicode_version=`$PERL -MUnicode::UCD -e"print Unicode::UCD::UnicodeVersion()"`
783783
AC_DEFINE_UNQUOTED([PERL_UNICODE_VERSION], ["$unicode_version"], [Defined to the perl UnicodeVersion version])
784-
dnl check against our safe_str_lib.h SAFECLIB_UNICODE_VERSION (15)
784+
dnl check against our safe_str_lib.h SAFECLIB_UNICODE_VERSION (17)
785785
our_unicode_version="`$PERL -ane 'if (/^#define SAFECLIB_UNICODE_VERSION/){print \$F[2];exit}' include/safe_str_lib.h`"
786786
if test `echo $unicode_version | cut -d. -f1` = "$our_unicode_version" ; then
787787
AC_MSG_RESULT([$unicode_version ok])

‎include/safe_str_lib.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ extern "C" {
6969
/**
7070
* With this UCD version we generated our tables
7171
*/
72-
#define SAFECLIB_UNICODE_VERSION 15
72+
#define SAFECLIB_UNICODE_VERSION 17
7373

7474
/**
7575
* The shortest string is a null string!!

‎src/extwchar/towctrans.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
4040
#define CASELACE(u1, u2) CASEMAP((u1), (u2), (u1) + 1)
4141

4242
/* Unicode 15.0 */
43+
/* FIXME Need Unicode 17.0 */
4344

4445
/* must be sorted */
4546
static const struct {

‎src/extwchar/unw16ifcan.h‎

Lines changed: 176 additions & 62 deletions
Large diffs are not rendered by default.

‎src/extwchar/unw16ifcmb.h‎

Lines changed: 121 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* !!!!!!! DO NOT EDIT THIS FILE !!!!!!!
33
* This file is auto-generated by Unicode-Normalize 1.32
44
* mkheader -uni -ind -std
5-
* for Unicode 15.0.0 UTF-16
5+
* for Unicode 17.0.0 UTF-16
66
* Any changes here will be lost!
77
*/
88
/* CombiningClass */
@@ -201,7 +201,7 @@ static const uint8_t UNWIF_combin_00_08 [256] = {
201201
/* 0878 */ 0, 0, 0, 0, 0, 0, 0, 0,
202202
/* 0880 */ 0, 0, 0, 0, 0, 0, 0, 0,
203203
/* 0888 */ 0, 0, 0, 0, 0, 0, 0, 0,
204-
/* 0890 */ 0, 0, 0, 0, 0, 0, 0, 0,
204+
/* 0890 */ 0, 0, 0, 0, 0, 0, 0, 230,
205205
/* 0898 */ 230, 220, 220, 220, 230, 230, 230, 230,
206206
/* 08a0 */ 0, 0, 0, 0, 0, 0, 0, 0,
207207
/* 08a8 */ 0, 0, 0, 0, 0, 0, 0, 0,
@@ -663,11 +663,11 @@ static const uint8_t UNWIF_combin_00_1a [256] = {
663663
/* 1ab0 */ 230, 230, 230, 230, 230, 220, 220, 220,
664664
/* 1ab8 */ 220, 220, 220, 230, 230, 220, 0, 220,
665665
/* 1ac0 */ 220, 230, 230, 220, 220, 230, 230, 230,
666-
/* 1ac8 */ 230, 230, 220, 230, 230, 230, 230, 0,
667-
/* 1ad0 */ 0, 0, 0, 0, 0, 0, 0, 0,
668-
/* 1ad8 */ 0, 0, 0, 0, 0, 0, 0, 0,
669-
/* 1ae0 */ 0, 0, 0, 0, 0, 0, 0, 0,
670-
/* 1ae8 */ 0, 0, 0, 0, 0, 0, 0, 0,
666+
/* 1ac8 */ 230, 230, 220, 230, 230, 230, 230, 230,
667+
/* 1ad0 */ 230, 230, 230, 230, 230, 230, 230, 230,
668+
/* 1ad8 */ 230, 230, 230, 230, 230, 220, 0, 0,
669+
/* 1ae0 */ 230, 230, 230, 230, 230, 230, 220, 230,
670+
/* 1ae8 */ 230, 230, 230, 234, 0, 0, 0, 0,
671671
/* 1af0 */ 0, 0, 0, 0, 0, 0, 0, 0,
672672
/* 1af8 */ 0, 0, 0, 0, 0, 0, 0, 0
673673
};
@@ -1316,7 +1316,7 @@ static const uint8_t UNWIF_combin_01_0d [256] = {
13161316
/* 010d50 */ 0, 0, 0, 0, 0, 0, 0, 0,
13171317
/* 010d58 */ 0, 0, 0, 0, 0, 0, 0, 0,
13181318
/* 010d60 */ 0, 0, 0, 0, 0, 0, 0, 0,
1319-
/* 010d68 */ 0, 0, 0, 0, 0, 0, 0, 0,
1319+
/* 010d68 */ 0, 230, 230, 230, 230, 230, 0, 0,
13201320
/* 010d70 */ 0, 0, 0, 0, 0, 0, 0, 0,
13211321
/* 010d78 */ 0, 0, 0, 0, 0, 0, 0, 0,
13221322
/* 010d80 */ 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1369,7 +1369,7 @@ static const uint8_t UNWIF_combin_01_0e [256] = {
13691369
/* 010ee0 */ 0, 0, 0, 0, 0, 0, 0, 0,
13701370
/* 010ee8 */ 0, 0, 0, 0, 0, 0, 0, 0,
13711371
/* 010ef0 */ 0, 0, 0, 0, 0, 0, 0, 0,
1372-
/* 010ef8 */ 0, 0, 0, 0, 0, 220, 220, 220
1372+
/* 010ef8 */ 0, 0, 220, 220, 0, 220, 220, 220
13731373
};
13741374

13751375
static const uint8_t UNWIF_combin_01_0f [256] = {
@@ -1538,8 +1538,8 @@ static const uint8_t UNWIF_combin_01_13 [256] = {
15381538
/* 0113b0 */ 0, 0, 0, 0, 0, 0, 0, 0,
15391539
/* 0113b8 */ 0, 0, 0, 0, 0, 0, 0, 0,
15401540
/* 0113c0 */ 0, 0, 0, 0, 0, 0, 0, 0,
1541-
/* 0113c8 */ 0, 0, 0, 0, 0, 0, 0, 0,
1542-
/* 0113d0 */ 0, 0, 0, 0, 0, 0, 0, 0,
1541+
/* 0113c8 */ 0, 0, 0, 0, 0, 0, 9, 9,
1542+
/* 0113d0 */ 9, 0, 0, 0, 0, 0, 0, 0,
15431543
/* 0113d8 */ 0, 0, 0, 0, 0, 0, 0, 0,
15441544
/* 0113e0 */ 0, 0, 0, 0, 0, 0, 0, 0,
15451545
/* 0113e8 */ 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1897,6 +1897,41 @@ static const uint8_t UNWIF_combin_01_1f [256] = {
18971897
/* 011ff8 */ 0, 0, 0, 0, 0, 0, 0, 0
18981898
};
18991899

1900+
static const uint8_t UNWIF_combin_01_61 [256] = {
1901+
/* 016100 */ 0, 0, 0, 0, 0, 0, 0, 0,
1902+
/* 016108 */ 0, 0, 0, 0, 0, 0, 0, 0,
1903+
/* 016110 */ 0, 0, 0, 0, 0, 0, 0, 0,
1904+
/* 016118 */ 0, 0, 0, 0, 0, 0, 0, 0,
1905+
/* 016120 */ 0, 0, 0, 0, 0, 0, 0, 0,
1906+
/* 016128 */ 0, 0, 0, 0, 0, 0, 0, 9,
1907+
/* 016130 */ 0, 0, 0, 0, 0, 0, 0, 0,
1908+
/* 016138 */ 0, 0, 0, 0, 0, 0, 0, 0,
1909+
/* 016140 */ 0, 0, 0, 0, 0, 0, 0, 0,
1910+
/* 016148 */ 0, 0, 0, 0, 0, 0, 0, 0,
1911+
/* 016150 */ 0, 0, 0, 0, 0, 0, 0, 0,
1912+
/* 016158 */ 0, 0, 0, 0, 0, 0, 0, 0,
1913+
/* 016160 */ 0, 0, 0, 0, 0, 0, 0, 0,
1914+
/* 016168 */ 0, 0, 0, 0, 0, 0, 0, 0,
1915+
/* 016170 */ 0, 0, 0, 0, 0, 0, 0, 0,
1916+
/* 016178 */ 0, 0, 0, 0, 0, 0, 0, 0,
1917+
/* 016180 */ 0, 0, 0, 0, 0, 0, 0, 0,
1918+
/* 016188 */ 0, 0, 0, 0, 0, 0, 0, 0,
1919+
/* 016190 */ 0, 0, 0, 0, 0, 0, 0, 0,
1920+
/* 016198 */ 0, 0, 0, 0, 0, 0, 0, 0,
1921+
/* 0161a0 */ 0, 0, 0, 0, 0, 0, 0, 0,
1922+
/* 0161a8 */ 0, 0, 0, 0, 0, 0, 0, 0,
1923+
/* 0161b0 */ 0, 0, 0, 0, 0, 0, 0, 0,
1924+
/* 0161b8 */ 0, 0, 0, 0, 0, 0, 0, 0,
1925+
/* 0161c0 */ 0, 0, 0, 0, 0, 0, 0, 0,
1926+
/* 0161c8 */ 0, 0, 0, 0, 0, 0, 0, 0,
1927+
/* 0161d0 */ 0, 0, 0, 0, 0, 0, 0, 0,
1928+
/* 0161d8 */ 0, 0, 0, 0, 0, 0, 0, 0,
1929+
/* 0161e0 */ 0, 0, 0, 0, 0, 0, 0, 0,
1930+
/* 0161e8 */ 0, 0, 0, 0, 0, 0, 0, 0,
1931+
/* 0161f0 */ 0, 0, 0, 0, 0, 0, 0, 0,
1932+
/* 0161f8 */ 0, 0, 0, 0, 0, 0, 0, 0
1933+
};
1934+
19001935
static const uint8_t UNWIF_combin_01_6a [256] = {
19011936
/* 016a00 */ 0, 0, 0, 0, 0, 0, 0, 0,
19021937
/* 016a08 */ 0, 0, 0, 0, 0, 0, 0, 0,
@@ -2247,6 +2282,76 @@ static const uint8_t UNWIF_combin_01_e4 [256] = {
22472282
/* 01e4f8 */ 0, 0, 0, 0, 0, 0, 0, 0
22482283
};
22492284

2285+
static const uint8_t UNWIF_combin_01_e5 [256] = {
2286+
/* 01e500 */ 0, 0, 0, 0, 0, 0, 0, 0,
2287+
/* 01e508 */ 0, 0, 0, 0, 0, 0, 0, 0,
2288+
/* 01e510 */ 0, 0, 0, 0, 0, 0, 0, 0,
2289+
/* 01e518 */ 0, 0, 0, 0, 0, 0, 0, 0,
2290+
/* 01e520 */ 0, 0, 0, 0, 0, 0, 0, 0,
2291+
/* 01e528 */ 0, 0, 0, 0, 0, 0, 0, 0,
2292+
/* 01e530 */ 0, 0, 0, 0, 0, 0, 0, 0,
2293+
/* 01e538 */ 0, 0, 0, 0, 0, 0, 0, 0,
2294+
/* 01e540 */ 0, 0, 0, 0, 0, 0, 0, 0,
2295+
/* 01e548 */ 0, 0, 0, 0, 0, 0, 0, 0,
2296+
/* 01e550 */ 0, 0, 0, 0, 0, 0, 0, 0,
2297+
/* 01e558 */ 0, 0, 0, 0, 0, 0, 0, 0,
2298+
/* 01e560 */ 0, 0, 0, 0, 0, 0, 0, 0,
2299+
/* 01e568 */ 0, 0, 0, 0, 0, 0, 0, 0,
2300+
/* 01e570 */ 0, 0, 0, 0, 0, 0, 0, 0,
2301+
/* 01e578 */ 0, 0, 0, 0, 0, 0, 0, 0,
2302+
/* 01e580 */ 0, 0, 0, 0, 0, 0, 0, 0,
2303+
/* 01e588 */ 0, 0, 0, 0, 0, 0, 0, 0,
2304+
/* 01e590 */ 0, 0, 0, 0, 0, 0, 0, 0,
2305+
/* 01e598 */ 0, 0, 0, 0, 0, 0, 0, 0,
2306+
/* 01e5a0 */ 0, 0, 0, 0, 0, 0, 0, 0,
2307+
/* 01e5a8 */ 0, 0, 0, 0, 0, 0, 0, 0,
2308+
/* 01e5b0 */ 0, 0, 0, 0, 0, 0, 0, 0,
2309+
/* 01e5b8 */ 0, 0, 0, 0, 0, 0, 0, 0,
2310+
/* 01e5c0 */ 0, 0, 0, 0, 0, 0, 0, 0,
2311+
/* 01e5c8 */ 0, 0, 0, 0, 0, 0, 0, 0,
2312+
/* 01e5d0 */ 0, 0, 0, 0, 0, 0, 0, 0,
2313+
/* 01e5d8 */ 0, 0, 0, 0, 0, 0, 0, 0,
2314+
/* 01e5e0 */ 0, 0, 0, 0, 0, 0, 0, 0,
2315+
/* 01e5e8 */ 0, 0, 0, 0, 0, 0, 230, 220,
2316+
/* 01e5f0 */ 0, 0, 0, 0, 0, 0, 0, 0,
2317+
/* 01e5f8 */ 0, 0, 0, 0, 0, 0, 0, 0
2318+
};
2319+
2320+
static const uint8_t UNWIF_combin_01_e6 [256] = {
2321+
/* 01e600 */ 0, 0, 0, 0, 0, 0, 0, 0,
2322+
/* 01e608 */ 0, 0, 0, 0, 0, 0, 0, 0,
2323+
/* 01e610 */ 0, 0, 0, 0, 0, 0, 0, 0,
2324+
/* 01e618 */ 0, 0, 0, 0, 0, 0, 0, 0,
2325+
/* 01e620 */ 0, 0, 0, 0, 0, 0, 0, 0,
2326+
/* 01e628 */ 0, 0, 0, 0, 0, 0, 0, 0,
2327+
/* 01e630 */ 0, 0, 0, 0, 0, 0, 0, 0,
2328+
/* 01e638 */ 0, 0, 0, 0, 0, 0, 0, 0,
2329+
/* 01e640 */ 0, 0, 0, 0, 0, 0, 0, 0,
2330+
/* 01e648 */ 0, 0, 0, 0, 0, 0, 0, 0,
2331+
/* 01e650 */ 0, 0, 0, 0, 0, 0, 0, 0,
2332+
/* 01e658 */ 0, 0, 0, 0, 0, 0, 0, 0,
2333+
/* 01e660 */ 0, 0, 0, 0, 0, 0, 0, 0,
2334+
/* 01e668 */ 0, 0, 0, 0, 0, 0, 0, 0,
2335+
/* 01e670 */ 0, 0, 0, 0, 0, 0, 0, 0,
2336+
/* 01e678 */ 0, 0, 0, 0, 0, 0, 0, 0,
2337+
/* 01e680 */ 0, 0, 0, 0, 0, 0, 0, 0,
2338+
/* 01e688 */ 0, 0, 0, 0, 0, 0, 0, 0,
2339+
/* 01e690 */ 0, 0, 0, 0, 0, 0, 0, 0,
2340+
/* 01e698 */ 0, 0, 0, 0, 0, 0, 0, 0,
2341+
/* 01e6a0 */ 0, 0, 0, 0, 0, 0, 0, 0,
2342+
/* 01e6a8 */ 0, 0, 0, 0, 0, 0, 0, 0,
2343+
/* 01e6b0 */ 0, 0, 0, 0, 0, 0, 0, 0,
2344+
/* 01e6b8 */ 0, 0, 0, 0, 0, 0, 0, 0,
2345+
/* 01e6c0 */ 0, 0, 0, 0, 0, 0, 0, 0,
2346+
/* 01e6c8 */ 0, 0, 0, 0, 0, 0, 0, 0,
2347+
/* 01e6d0 */ 0, 0, 0, 0, 0, 0, 0, 0,
2348+
/* 01e6d8 */ 0, 0, 0, 0, 0, 0, 0, 0,
2349+
/* 01e6e0 */ 0, 0, 0, 230, 0, 0, 230, 0,
2350+
/* 01e6e8 */ 0, 0, 0, 0, 0, 0, 230, 230,
2351+
/* 01e6f0 */ 0, 0, 0, 0, 0, 230, 0, 0,
2352+
/* 01e6f8 */ 0, 0, 0, 0, 0, 0, 0, 0
2353+
};
2354+
22502355
static const uint8_t UNWIF_combin_01_e8 [256] = {
22512356
/* 01e800 */ 0, 0, 0, 0, 0, 0, 0, 0,
22522357
/* 01e808 */ 0, 0, 0, 0, 0, 0, 0, 0,
@@ -2414,7 +2519,8 @@ NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
24142519
NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
24152520
NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
24162521
NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
2417-
NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
2522+
NULL,UNWIF_combin_01_61,
2523+
NULL,NULL,NULL,NULL,NULL,NULL,
24182524
NULL,NULL,UNWIF_combin_01_6a,
24192525
UNWIF_combin_01_6b,
24202526
NULL,NULL,NULL,UNWIF_combin_01_6f,
@@ -2439,7 +2545,9 @@ UNWIF_combin_01_e0,
24392545
UNWIF_combin_01_e1,
24402546
UNWIF_combin_01_e2,
24412547
NULL,UNWIF_combin_01_e4,
2442-
NULL,NULL,NULL,
2548+
UNWIF_combin_01_e5,
2549+
UNWIF_combin_01_e6,
2550+
NULL,
24432551
UNWIF_combin_01_e8,
24442552
UNWIF_combin_01_e9,
24452553
NULL,NULL,NULL,NULL,NULL,NULL,

0 commit comments

Comments
 (0)