Fix prev commit

diff --git a/libraries/liblunicode/Makefile.in b/libraries/liblunicode/Makefile.in
index 6cd9a228af47122c6864636987d1c38c9ab8bbb5..e91dcd60ccda607c29583c74fec18d2738034ad5 100644 (file)
--- a/libraries/liblunicode/Makefile.in
+++ b/libraries/liblunicode/Makefile.in
@@ -29,7 +29,7 @@ XLIBS = $(LDAP_LIBLBER_LA) $(LDAP_LIBLUTIL_A)
 LDAP_INCDIR= ../../include       
 LDAP_LIBDIR= ../../libraries
 
-uctable.h: $(srcdir)/UnicodeData.txt $(srcdir)/CompositionExclusions.txt
+uctable.h: ucgendat.c $(srcdir)/UnicodeData.txt $(srcdir)/CompositionExclusions.txt
        $(MAKE) ucgendat
        ./ucgendat $(srcdir)/UnicodeData.txt -x $(srcdir)/CompositionExclusions.txt
 

diff --git a/libraries/liblunicode/ucdata/ucdata.c b/libraries/liblunicode/ucdata/ucdata.c
index 4e5856218c82a5d6ef7323443709577586efc3f4..9e64122f85a5e49f64b9de3ac7e62b0a8220fbf7 100644 (file)
--- a/libraries/liblunicode/ucdata/ucdata.c
+++ b/libraries/liblunicode/ucdata/ucdata.c
@@ -1378,7 +1378,7 @@ main(void)
     ac_uint4 i, lo, *dec;
     struct ucnumber num;
 
-    ucdata_setup(".");
+/*    ucdata_setup("."); */
 
     if (ucisweak(0x30))
       printf("WEAK\n");
@@ -1490,7 +1490,7 @@ main(void)
     else
       printf("UCGETNUMBER: 0xff19 = %d\n", num.numerator);
 
-    ucdata_cleanup();
+/*    ucdata_cleanup(); */
     exit(0);
 }
 

diff --git a/libraries/liblunicode/ucdata/ucgendat.c b/libraries/liblunicode/ucdata/ucgendat.c
index d397f1832a692f8e81b15be573b4c3fdd7bdba2a..8539f7f1c1e9584b4e0a60b277ede960407b0299 100644 (file)
--- a/libraries/liblunicode/ucdata/ucgendat.c
+++ b/libraries/liblunicode/ucdata/ucgendat.c
@@ -1805,9 +1805,9 @@ write_cdata(char *opath)
     if (ncodes_used > 0) {
        for (i = 0; i<ncodes_used; i++) {
            if (i) fprintf(out, ",");
-           if (!(i&3)) fprintf(out, "\n\t");
+           if (!(i&1)) fprintf(out, "\n\t");
            else fprintf(out, " ");
-           fprintf(out, "0x%08x", ncodes[i]);
+           fprintf(out, "0x%08x, 0x%08x", ncodes[i].code, ncodes[i].idx);
        }
        fprintf(out, "\n};\n\n");
 

diff --git a/libraries/liblunicode/ucdata/uctable.h b/libraries/liblunicode/ucdata/uctable.h
index 3ce6ff8b59d6afe3ddcd13b13a49d7a9523f2d31..a68723a3e97e8a52091fa5dbbcb45087ceef5fda 100644 (file)
--- a/libraries/liblunicode/ucdata/uctable.h
+++ b/libraries/liblunicode/ucdata/uctable.h
@@ -14022,140 +14022,273 @@ static const ac_uint4 _uccmcl_nodes[] = {
 static const ac_uint4 _ucnum_size = 1066;
 
 static const ac_uint4 _ucnum_nodes[] = {
-       0x00000030, 0x00000031, 0x00000032, 0x00000033,
-       0x00000034, 0x00000035, 0x00000036, 0x00000037,
-       0x00000038, 0x00000039, 0x000000b2, 0x000000b3,
-       0x000000b9, 0x000000bc, 0x000000bd, 0x000000be,
-       0x00000660, 0x00000661, 0x00000662, 0x00000663,
-       0x00000664, 0x00000665, 0x00000666, 0x00000667,
-       0x00000668, 0x00000669, 0x000006f0, 0x000006f1,
-       0x000006f2, 0x000006f3, 0x000006f4, 0x000006f5,
-       0x000006f6, 0x000006f7, 0x000006f8, 0x000006f9,
-       0x00000966, 0x00000967, 0x00000968, 0x00000969,
-       0x0000096a, 0x0000096b, 0x0000096c, 0x0000096d,
-       0x0000096e, 0x0000096f, 0x000009e6, 0x000009e7,
-       0x000009e8, 0x000009e9, 0x000009ea, 0x000009eb,
-       0x000009ec, 0x000009ed, 0x000009ee, 0x000009ef,
-       0x000009f4, 0x000009f5, 0x000009f6, 0x000009f7,
-       0x000009f9, 0x00000a66, 0x00000a67, 0x00000a68,
-       0x00000a69, 0x00000a6a, 0x00000a6b, 0x00000a6c,
-       0x00000a6d, 0x00000a6e, 0x00000a6f, 0x00000ae6,
-       0x00000ae7, 0x00000ae8, 0x00000ae9, 0x00000aea,
-       0x00000aeb, 0x00000aec, 0x00000aed, 0x00000aee,
-       0x00000aef, 0x00000b66, 0x00000b67, 0x00000b68,
-       0x00000b69, 0x00000b6a, 0x00000b6b, 0x00000b6c,
-       0x00000b6d, 0x00000b6e, 0x00000b6f, 0x00000be7,
-       0x00000be8, 0x00000be9, 0x00000bea, 0x00000beb,
-       0x00000bec, 0x00000bed, 0x00000bee, 0x00000bef,
-       0x00000bf0, 0x00000bf1, 0x00000bf2, 0x00000c66,
-       0x00000c67, 0x00000c68, 0x00000c69, 0x00000c6a,
-       0x00000c6b, 0x00000c6c, 0x00000c6d, 0x00000c6e,
-       0x00000c6f, 0x00000ce6, 0x00000ce7, 0x00000ce8,
-       0x00000ce9, 0x00000cea, 0x00000ceb, 0x00000cec,
-       0x00000ced, 0x00000cee, 0x00000cef, 0x00000d66,
-       0x00000d67, 0x00000d68, 0x00000d69, 0x00000d6a,
-       0x00000d6b, 0x00000d6c, 0x00000d6d, 0x00000d6e,
-       0x00000d6f, 0x00000e50, 0x00000e51, 0x00000e52,
-       0x00000e53, 0x00000e54, 0x00000e55, 0x00000e56,
-       0x00000e57, 0x00000e58, 0x00000e59, 0x00000ed0,
-       0x00000ed1, 0x00000ed2, 0x00000ed3, 0x00000ed4,
-       0x00000ed5, 0x00000ed6, 0x00000ed7, 0x00000ed8,
-       0x00000ed9, 0x00000f20, 0x00000f21, 0x00000f22,
-       0x00000f23, 0x00000f24, 0x00000f25, 0x00000f26,
-       0x00000f27, 0x00000f28, 0x00000f29, 0x00000f2a,
-       0x00000f2b, 0x00000f2c, 0x00000f2d, 0x00000f2e,
-       0x00000f2f, 0x00000f30, 0x00000f31, 0x00000f32,
-       0x00000f33, 0x00001040, 0x00001041, 0x00001042,
-       0x00001043, 0x00001044, 0x00001045, 0x00001046,
-       0x00001047, 0x00001048, 0x00001049, 0x00001369,
-       0x0000136a, 0x0000136b, 0x0000136c, 0x0000136d,
-       0x0000136e, 0x0000136f, 0x00001370, 0x00001371,
-       0x00001372, 0x00001373, 0x00001374, 0x00001375,
-       0x00001376, 0x00001377, 0x00001378, 0x00001379,
-       0x0000137a, 0x0000137b, 0x0000137c, 0x000016ee,
-       0x000016ef, 0x000016f0, 0x000017e0, 0x000017e1,
-       0x000017e2, 0x000017e3, 0x000017e4, 0x000017e5,
-       0x000017e6, 0x000017e7, 0x000017e8, 0x000017e9,
-       0x00001810, 0x00001811, 0x00001812, 0x00001813,
-       0x00001814, 0x00001815, 0x00001816, 0x00001817,
-       0x00001818, 0x00001819, 0x00002070, 0x00002074,
-       0x00002075, 0x00002076, 0x00002077, 0x00002078,
-       0x00002079, 0x00002080, 0x00002081, 0x00002082,
-       0x00002083, 0x00002084, 0x00002085, 0x00002086,
-       0x00002087, 0x00002088, 0x00002089, 0x00002153,
-       0x00002154, 0x00002155, 0x00002156, 0x00002157,
-       0x00002158, 0x00002159, 0x0000215a, 0x0000215b,
-       0x0000215c, 0x0000215d, 0x0000215e, 0x0000215f,
-       0x00002160, 0x00002161, 0x00002162, 0x00002163,
-       0x00002164, 0x00002165, 0x00002166, 0x00002167,
-       0x00002168, 0x00002169, 0x0000216a, 0x0000216b,
-       0x0000216c, 0x0000216d, 0x0000216e, 0x0000216f,
-       0x00002170, 0x00002171, 0x00002172, 0x00002173,
-       0x00002174, 0x00002175, 0x00002176, 0x00002177,
-       0x00002178, 0x00002179, 0x0000217a, 0x0000217b,
-       0x0000217c, 0x0000217d, 0x0000217e, 0x0000217f,
-       0x00002180, 0x00002181, 0x00002182, 0x00002460,
-       0x00002461, 0x00002462, 0x00002463, 0x00002464,
-       0x00002465, 0x00002466, 0x00002467, 0x00002468,
-       0x00002469, 0x0000246a, 0x0000246b, 0x0000246c,
-       0x0000246d, 0x0000246e, 0x0000246f, 0x00002470,
-       0x00002471, 0x00002472, 0x00002473, 0x00002474,
-       0x00002475, 0x00002476, 0x00002477, 0x00002478,
-       0x00002479, 0x0000247a, 0x0000247b, 0x0000247c,
-       0x0000247d, 0x0000247e, 0x0000247f, 0x00002480,
-       0x00002481, 0x00002482, 0x00002483, 0x00002484,
-       0x00002485, 0x00002486, 0x00002487, 0x00002488,
-       0x00002489, 0x0000248a, 0x0000248b, 0x0000248c,
-       0x0000248d, 0x0000248e, 0x0000248f, 0x00002490,
-       0x00002491, 0x00002492, 0x00002493, 0x00002494,
-       0x00002495, 0x00002496, 0x00002497, 0x00002498,
-       0x00002499, 0x0000249a, 0x0000249b, 0x000024ea,
-       0x000024eb, 0x000024ec, 0x000024ed, 0x000024ee,
-       0x000024ef, 0x000024f0, 0x000024f1, 0x000024f2,
-       0x000024f3, 0x000024f4, 0x000024f5, 0x000024f6,
-       0x000024f7, 0x000024f8, 0x000024f9, 0x000024fa,
-       0x000024fb, 0x000024fc, 0x000024fd, 0x000024fe,
-       0x00002776, 0x00002777, 0x00002778, 0x00002779,
-       0x0000277a, 0x0000277b, 0x0000277c, 0x0000277d,
-       0x0000277e, 0x0000277f, 0x00002780, 0x00002781,
-       0x00002782, 0x00002783, 0x00002784, 0x00002785,
-       0x00002786, 0x00002787, 0x00002788, 0x00002789,
-       0x0000278a, 0x0000278b, 0x0000278c, 0x0000278d,
-       0x0000278e, 0x0000278f, 0x00002790, 0x00002791,
-       0x00002792, 0x00002793, 0x00003007, 0x00003021,
-       0x00003022, 0x00003023, 0x00003024, 0x00003025,
-       0x00003026, 0x00003027, 0x00003028, 0x00003029,
-       0x00003038, 0x00003039, 0x0000303a, 0x00003192,
-       0x00003193, 0x00003194, 0x00003195, 0x00003220,
-       0x00003221, 0x00003222, 0x00003223, 0x00003224,
-       0x00003225, 0x00003226, 0x00003227, 0x00003228,
-       0x00003229, 0x00003251, 0x00003252, 0x00003253,
-       0x00003254, 0x00003255, 0x00003256, 0x00003257,
-       0x00003258, 0x00003259, 0x0000325a, 0x0000325b,
-       0x0000325c, 0x0000325d, 0x0000325e, 0x0000325f,
-       0x00003280, 0x00003281, 0x00003282, 0x00003283,
-       0x00003284, 0x00003285, 0x00003286, 0x00003287,
-       0x00003288, 0x00003289, 0x000032b1, 0x000032b2,
-       0x000032b3, 0x000032b4, 0x000032b5, 0x000032b6,
-       0x000032b7, 0x000032b8, 0x000032b9, 0x000032ba,
-       0x000032bb, 0x000032bc, 0x000032bd, 0x000032be,
-       0x000032bf, 0x0000ff10, 0x0000ff11, 0x0000ff12,
-       0x0000ff13, 0x0000ff14, 0x0000ff15, 0x0000ff16,
-       0x0000ff17, 0x0000ff18, 0x0000ff19, 0x00010320,
-       0x00010321, 0x00010322, 0x00010323, 0x0001d7ce,
-       0x0001d7cf, 0x0001d7d0, 0x0001d7d1, 0x0001d7d2,
-       0x0001d7d3, 0x0001d7d4, 0x0001d7d5, 0x0001d7d6,
-       0x0001d7d7, 0x0001d7d8, 0x0001d7d9, 0x0001d7da,
-       0x0001d7db, 0x0001d7dc, 0x0001d7dd, 0x0001d7de,
-       0x0001d7df, 0x0001d7e0, 0x0001d7e1, 0x0001d7e2,
-       0x0001d7e3, 0x0001d7e4, 0x0001d7e5, 0x0001d7e6,
-       0x0001d7e7, 0x0001d7e8, 0x0001d7e9, 0x0001d7ea,
-       0x0001d7eb, 0x0001d7ec, 0x0001d7ed, 0x0001d7ee,
-       0x0001d7ef, 0x0001d7f0, 0x0001d7f1, 0x0001d7f2,
-       0x0001d7f3, 0x0001d7f4, 0x0001d7f5, 0x0001d7f6,
-       0x0001d7f7, 0x0001d7f8, 0x0001d7f9, 0x0001d7fa,
-       0x0001d7fb, 0x0001d7fc, 0x0001d7fd, 0x0001d7fe,
-       0x0001d7ff
+       0x00000030, 0x00000000, 0x00000031, 0x00000002,
+       0x00000032, 0x00000004, 0x00000033, 0x00000006,
+       0x00000034, 0x00000008, 0x00000035, 0x0000000a,
+       0x00000036, 0x0000000c, 0x00000037, 0x0000000e,
+       0x00000038, 0x00000010, 0x00000039, 0x00000012,
+       0x000000b2, 0x00000004, 0x000000b3, 0x00000006,
+       0x000000b9, 0x00000002, 0x000000bc, 0x00000014,
+       0x000000bd, 0x00000016, 0x000000be, 0x00000018,
+       0x00000660, 0x00000000, 0x00000661, 0x00000002,
+       0x00000662, 0x00000004, 0x00000663, 0x00000006,
+       0x00000664, 0x00000008, 0x00000665, 0x0000000a,
+       0x00000666, 0x0000000c, 0x00000667, 0x0000000e,
+       0x00000668, 0x00000010, 0x00000669, 0x00000012,
+       0x000006f0, 0x00000000, 0x000006f1, 0x00000002,
+       0x000006f2, 0x00000004, 0x000006f3, 0x00000006,
+       0x000006f4, 0x00000008, 0x000006f5, 0x0000000a,
+       0x000006f6, 0x0000000c, 0x000006f7, 0x0000000e,
+       0x000006f8, 0x00000010, 0x000006f9, 0x00000012,
+       0x00000966, 0x00000000, 0x00000967, 0x00000002,
+       0x00000968, 0x00000004, 0x00000969, 0x00000006,
+       0x0000096a, 0x00000008, 0x0000096b, 0x0000000a,
+       0x0000096c, 0x0000000c, 0x0000096d, 0x0000000e,
+       0x0000096e, 0x00000010, 0x0000096f, 0x00000012,
+       0x000009e6, 0x00000000, 0x000009e7, 0x00000002,
+       0x000009e8, 0x00000004, 0x000009e9, 0x00000006,
+       0x000009ea, 0x00000008, 0x000009eb, 0x0000000a,
+       0x000009ec, 0x0000000c, 0x000009ed, 0x0000000e,
+       0x000009ee, 0x00000010, 0x000009ef, 0x00000012,
+       0x000009f4, 0x00000002, 0x000009f5, 0x00000004,
+       0x000009f6, 0x00000006, 0x000009f7, 0x00000008,
+       0x000009f9, 0x0000001a, 0x00000a66, 0x00000000,
+       0x00000a67, 0x00000002, 0x00000a68, 0x00000004,
+       0x00000a69, 0x00000006, 0x00000a6a, 0x00000008,
+       0x00000a6b, 0x0000000a, 0x00000a6c, 0x0000000c,
+       0x00000a6d, 0x0000000e, 0x00000a6e, 0x00000010,
+       0x00000a6f, 0x00000012, 0x00000ae6, 0x00000000,
+       0x00000ae7, 0x00000002, 0x00000ae8, 0x00000004,
+       0x00000ae9, 0x00000006, 0x00000aea, 0x00000008,
+       0x00000aeb, 0x0000000a, 0x00000aec, 0x0000000c,
+       0x00000aed, 0x0000000e, 0x00000aee, 0x00000010,
+       0x00000aef, 0x00000012, 0x00000b66, 0x00000000,
+       0x00000b67, 0x00000002, 0x00000b68, 0x00000004,
+       0x00000b69, 0x00000006, 0x00000b6a, 0x00000008,
+       0x00000b6b, 0x0000000a, 0x00000b6c, 0x0000000c,
+       0x00000b6d, 0x0000000e, 0x00000b6e, 0x00000010,
+       0x00000b6f, 0x00000012, 0x00000be7, 0x00000002,
+       0x00000be8, 0x00000004, 0x00000be9, 0x00000006,
+       0x00000bea, 0x00000008, 0x00000beb, 0x0000000a,
+       0x00000bec, 0x0000000c, 0x00000bed, 0x0000000e,
+       0x00000bee, 0x00000010, 0x00000bef, 0x00000012,
+       0x00000bf0, 0x0000001c, 0x00000bf1, 0x0000001e,
+       0x00000bf2, 0x00000020, 0x00000c66, 0x00000000,
+       0x00000c67, 0x00000002, 0x00000c68, 0x00000004,
+       0x00000c69, 0x00000006, 0x00000c6a, 0x00000008,
+       0x00000c6b, 0x0000000a, 0x00000c6c, 0x0000000c,
+       0x00000c6d, 0x0000000e, 0x00000c6e, 0x00000010,
+       0x00000c6f, 0x00000012, 0x00000ce6, 0x00000000,
+       0x00000ce7, 0x00000002, 0x00000ce8, 0x00000004,
+       0x00000ce9, 0x00000006, 0x00000cea, 0x00000008,
+       0x00000ceb, 0x0000000a, 0x00000cec, 0x0000000c,
+       0x00000ced, 0x0000000e, 0x00000cee, 0x00000010,
+       0x00000cef, 0x00000012, 0x00000d66, 0x00000000,
+       0x00000d67, 0x00000002, 0x00000d68, 0x00000004,
+       0x00000d69, 0x00000006, 0x00000d6a, 0x00000008,
+       0x00000d6b, 0x0000000a, 0x00000d6c, 0x0000000c,
+       0x00000d6d, 0x0000000e, 0x00000d6e, 0x00000010,
+       0x00000d6f, 0x00000012, 0x00000e50, 0x00000000,
+       0x00000e51, 0x00000002, 0x00000e52, 0x00000004,
+       0x00000e53, 0x00000006, 0x00000e54, 0x00000008,
+       0x00000e55, 0x0000000a, 0x00000e56, 0x0000000c,
+       0x00000e57, 0x0000000e, 0x00000e58, 0x00000010,
+       0x00000e59, 0x00000012, 0x00000ed0, 0x00000000,
+       0x00000ed1, 0x00000002, 0x00000ed2, 0x00000004,
+       0x00000ed3, 0x00000006, 0x00000ed4, 0x00000008,
+       0x00000ed5, 0x0000000a, 0x00000ed6, 0x0000000c,
+       0x00000ed7, 0x0000000e, 0x00000ed8, 0x00000010,
+       0x00000ed9, 0x00000012, 0x00000f20, 0x00000000,
+       0x00000f21, 0x00000002, 0x00000f22, 0x00000004,
+       0x00000f23, 0x00000006, 0x00000f24, 0x00000008,
+       0x00000f25, 0x0000000a, 0x00000f26, 0x0000000c,
+       0x00000f27, 0x0000000e, 0x00000f28, 0x00000010,
+       0x00000f29, 0x00000012, 0x00000f2a, 0x00000016,
+       0x00000f2b, 0x00000022, 0x00000f2c, 0x00000024,
+       0x00000f2d, 0x00000026, 0x00000f2e, 0x00000028,
+       0x00000f2f, 0x0000002a, 0x00000f30, 0x0000002c,
+       0x00000f31, 0x0000002e, 0x00000f32, 0x00000030,
+       0x00000f33, 0x00000032, 0x00001040, 0x00000000,
+       0x00001041, 0x00000002, 0x00001042, 0x00000004,
+       0x00001043, 0x00000006, 0x00001044, 0x00000008,
+       0x00001045, 0x0000000a, 0x00001046, 0x0000000c,
+       0x00001047, 0x0000000e, 0x00001048, 0x00000010,
+       0x00001049, 0x00000012, 0x00001369, 0x00000002,
+       0x0000136a, 0x00000004, 0x0000136b, 0x00000006,
+       0x0000136c, 0x00000008, 0x0000136d, 0x0000000a,
+       0x0000136e, 0x0000000c, 0x0000136f, 0x0000000e,
+       0x00001370, 0x00000010, 0x00001371, 0x00000012,
+       0x00001372, 0x0000001c, 0x00001373, 0x00000034,
+       0x00001374, 0x00000036, 0x00001375, 0x00000038,
+       0x00001376, 0x0000003a, 0x00001377, 0x0000003c,
+       0x00001378, 0x0000003e, 0x00001379, 0x00000040,
+       0x0000137a, 0x00000042, 0x0000137b, 0x0000001e,
+       0x0000137c, 0x00000044, 0x000016ee, 0x00000046,
+       0x000016ef, 0x00000048, 0x000016f0, 0x0000004a,
+       0x000017e0, 0x00000000, 0x000017e1, 0x00000002,
+       0x000017e2, 0x00000004, 0x000017e3, 0x00000006,
+       0x000017e4, 0x00000008, 0x000017e5, 0x0000000a,
+       0x000017e6, 0x0000000c, 0x000017e7, 0x0000000e,
+       0x000017e8, 0x00000010, 0x000017e9, 0x00000012,
+       0x00001810, 0x00000000, 0x00001811, 0x00000002,
+       0x00001812, 0x00000004, 0x00001813, 0x00000006,
+       0x00001814, 0x00000008, 0x00001815, 0x0000000a,
+       0x00001816, 0x0000000c, 0x00001817, 0x0000000e,
+       0x00001818, 0x00000010, 0x00001819, 0x00000012,
+       0x00002070, 0x00000000, 0x00002074, 0x00000008,
+       0x00002075, 0x0000000a, 0x00002076, 0x0000000c,
+       0x00002077, 0x0000000e, 0x00002078, 0x00000010,
+       0x00002079, 0x00000012, 0x00002080, 0x00000000,
+       0x00002081, 0x00000002, 0x00002082, 0x00000004,
+       0x00002083, 0x00000006, 0x00002084, 0x00000008,
+       0x00002085, 0x0000000a, 0x00002086, 0x0000000c,
+       0x00002087, 0x0000000e, 0x00002088, 0x00000010,
+       0x00002089, 0x00000012, 0x00002153, 0x0000004c,
+       0x00002154, 0x0000004e, 0x00002155, 0x00000050,
+       0x00002156, 0x00000052, 0x00002157, 0x00000054,
+       0x00002158, 0x00000056, 0x00002159, 0x00000058,
+       0x0000215a, 0x0000005a, 0x0000215b, 0x0000005c,
+       0x0000215c, 0x0000005e, 0x0000215d, 0x00000060,
+       0x0000215e, 0x00000062, 0x0000215f, 0x00000002,
+       0x00002160, 0x00000002, 0x00002161, 0x00000004,
+       0x00002162, 0x00000006, 0x00002163, 0x00000008,
+       0x00002164, 0x0000000a, 0x00002165, 0x0000000c,
+       0x00002166, 0x0000000e, 0x00002167, 0x00000010,
+       0x00002168, 0x00000012, 0x00002169, 0x0000001c,
+       0x0000216a, 0x00000064, 0x0000216b, 0x00000066,
+       0x0000216c, 0x0000003a, 0x0000216d, 0x0000001e,
+       0x0000216e, 0x00000068, 0x0000216f, 0x00000020,
+       0x00002170, 0x00000002, 0x00002171, 0x00000004,
+       0x00002172, 0x00000006, 0x00002173, 0x00000008,
+       0x00002174, 0x0000000a, 0x00002175, 0x0000000c,
+       0x00002176, 0x0000000e, 0x00002177, 0x00000010,
+       0x00002178, 0x00000012, 0x00002179, 0x0000001c,
+       0x0000217a, 0x00000064, 0x0000217b, 0x00000066,
+       0x0000217c, 0x0000003a, 0x0000217d, 0x0000001e,
+       0x0000217e, 0x00000068, 0x0000217f, 0x00000020,
+       0x00002180, 0x00000020, 0x00002181, 0x0000006a,
+       0x00002182, 0x00000044, 0x00002460, 0x00000002,
+       0x00002461, 0x00000004, 0x00002462, 0x00000006,
+       0x00002463, 0x00000008, 0x00002464, 0x0000000a,
+       0x00002465, 0x0000000c, 0x00002466, 0x0000000e,
+       0x00002467, 0x00000010, 0x00002468, 0x00000012,
+       0x00002469, 0x0000001c, 0x0000246a, 0x00000064,
+       0x0000246b, 0x00000066, 0x0000246c, 0x0000006c,
+       0x0000246d, 0x0000006e, 0x0000246e, 0x00000070,
+       0x0000246f, 0x0000001a, 0x00002470, 0x00000046,
+       0x00002471, 0x00000048, 0x00002472, 0x0000004a,
+       0x00002473, 0x00000034, 0x00002474, 0x00000002,
+       0x00002475, 0x00000004, 0x00002476, 0x00000006,
+       0x00002477, 0x00000008, 0x00002478, 0x0000000a,
+       0x00002479, 0x0000000c, 0x0000247a, 0x0000000e,
+       0x0000247b, 0x00000010, 0x0000247c, 0x00000012,
+       0x0000247d, 0x0000001c, 0x0000247e, 0x00000064,
+       0x0000247f, 0x00000066, 0x00002480, 0x0000006c,
+       0x00002481, 0x0000006e, 0x00002482, 0x00000070,
+       0x00002483, 0x0000001a, 0x00002484, 0x00000046,
+       0x00002485, 0x00000048, 0x00002486, 0x0000004a,
+       0x00002487, 0x00000034, 0x00002488, 0x00000002,
+       0x00002489, 0x00000004, 0x0000248a, 0x00000006,
+       0x0000248b, 0x00000008, 0x0000248c, 0x0000000a,
+       0x0000248d, 0x0000000c, 0x0000248e, 0x0000000e,
+       0x0000248f, 0x00000010, 0x00002490, 0x00000012,
+       0x00002491, 0x0000001c, 0x00002492, 0x00000064,
+       0x00002493, 0x00000066, 0x00002494, 0x0000006c,
+       0x00002495, 0x0000006e, 0x00002496, 0x00000070,
+       0x00002497, 0x0000001a, 0x00002498, 0x00000046,
+       0x00002499, 0x00000048, 0x0000249a, 0x0000004a,
+       0x0000249b, 0x00000034, 0x000024ea, 0x00000000,
+       0x000024eb, 0x00000064, 0x000024ec, 0x00000066,
+       0x000024ed, 0x0000006c, 0x000024ee, 0x0000006e,
+       0x000024ef, 0x00000070, 0x000024f0, 0x0000001a,
+       0x000024f1, 0x00000046, 0x000024f2, 0x00000048,
+       0x000024f3, 0x0000004a, 0x000024f4, 0x00000034,
+       0x000024f5, 0x00000002, 0x000024f6, 0x00000004,
+       0x000024f7, 0x00000006, 0x000024f8, 0x00000008,
+       0x000024f9, 0x0000000a, 0x000024fa, 0x0000000c,
+       0x000024fb, 0x0000000e, 0x000024fc, 0x00000010,
+       0x000024fd, 0x00000012, 0x000024fe, 0x0000001c,
+       0x00002776, 0x00000002, 0x00002777, 0x00000004,
+       0x00002778, 0x00000006, 0x00002779, 0x00000008,
+       0x0000277a, 0x0000000a, 0x0000277b, 0x0000000c,
+       0x0000277c, 0x0000000e, 0x0000277d, 0x00000010,
+       0x0000277e, 0x00000012, 0x0000277f, 0x0000001c,
+       0x00002780, 0x00000002, 0x00002781, 0x00000004,
+       0x00002782, 0x00000006, 0x00002783, 0x00000008,
+       0x00002784, 0x0000000a, 0x00002785, 0x0000000c,
+       0x00002786, 0x0000000e, 0x00002787, 0x00000010,
+       0x00002788, 0x00000012, 0x00002789, 0x0000001c,
+       0x0000278a, 0x00000002, 0x0000278b, 0x00000004,
+       0x0000278c, 0x00000006, 0x0000278d, 0x00000008,
+       0x0000278e, 0x0000000a, 0x0000278f, 0x0000000c,
+       0x00002790, 0x0000000e, 0x00002791, 0x00000010,
+       0x00002792, 0x00000012, 0x00002793, 0x0000001c,
+       0x00003007, 0x00000000, 0x00003021, 0x00000002,
+       0x00003022, 0x00000004, 0x00003023, 0x00000006,
+       0x00003024, 0x00000008, 0x00003025, 0x0000000a,
+       0x00003026, 0x0000000c, 0x00003027, 0x0000000e,
+       0x00003028, 0x00000010, 0x00003029, 0x00000012,
+       0x00003038, 0x0000001c, 0x00003039, 0x00000034,
+       0x0000303a, 0x00000036, 0x00003192, 0x00000002,
+       0x00003193, 0x00000004, 0x00003194, 0x00000006,
+       0x00003195, 0x00000008, 0x00003220, 0x00000002,
+       0x00003221, 0x00000004, 0x00003222, 0x00000006,
+       0x00003223, 0x00000008, 0x00003224, 0x0000000a,
+       0x00003225, 0x0000000c, 0x00003226, 0x0000000e,
+       0x00003227, 0x00000010, 0x00003228, 0x00000012,
+       0x00003229, 0x0000001c, 0x00003251, 0x00000072,
+       0x00003252, 0x00000074, 0x00003253, 0x00000076,
+       0x00003254, 0x00000078, 0x00003255, 0x0000007a,
+       0x00003256, 0x0000007c, 0x00003257, 0x0000007e,
+       0x00003258, 0x00000080, 0x00003259, 0x00000082,
+       0x0000325a, 0x00000036, 0x0000325b, 0x00000084,
+       0x0000325c, 0x00000086, 0x0000325d, 0x00000088,
+       0x0000325e, 0x0000008a, 0x0000325f, 0x0000008c,
+       0x00003280, 0x00000002, 0x00003281, 0x00000004,
+       0x00003282, 0x00000006, 0x00003283, 0x00000008,
+       0x00003284, 0x0000000a, 0x00003285, 0x0000000c,
+       0x00003286, 0x0000000e, 0x00003287, 0x00000010,
+       0x00003288, 0x00000012, 0x00003289, 0x0000001c,
+       0x000032b1, 0x0000008e, 0x000032b2, 0x00000090,
+       0x000032b3, 0x00000092, 0x000032b4, 0x00000094,
+       0x000032b5, 0x00000038, 0x000032b6, 0x00000096,
+       0x000032b7, 0x00000098, 0x000032b8, 0x0000009a,
+       0x000032b9, 0x0000009c, 0x000032ba, 0x0000009e,
+       0x000032bb, 0x000000a0, 0x000032bc, 0x000000a2,
+       0x000032bd, 0x000000a4, 0x000032be, 0x000000a6,
+       0x000032bf, 0x0000003a, 0x0000ff10, 0x00000000,
+       0x0000ff11, 0x00000002, 0x0000ff12, 0x00000004,
+       0x0000ff13, 0x00000006, 0x0000ff14, 0x00000008,
+       0x0000ff15, 0x0000000a, 0x0000ff16, 0x0000000c,
+       0x0000ff17, 0x0000000e, 0x0000ff18, 0x00000010,
+       0x0000ff19, 0x00000012, 0x00010320, 0x00000002,
+       0x00010321, 0x0000000a, 0x00010322, 0x0000001c,
+       0x00010323, 0x0000003a, 0x0001d7ce, 0x00000000,
+       0x0001d7cf, 0x00000002, 0x0001d7d0, 0x00000004,
+       0x0001d7d1, 0x00000006, 0x0001d7d2, 0x00000008,
+       0x0001d7d3, 0x0000000a, 0x0001d7d4, 0x0000000c,
+       0x0001d7d5, 0x0000000e, 0x0001d7d6, 0x00000010,
+       0x0001d7d7, 0x00000012, 0x0001d7d8, 0x00000000,
+       0x0001d7d9, 0x00000002, 0x0001d7da, 0x00000004,
+       0x0001d7db, 0x00000006, 0x0001d7dc, 0x00000008,
+       0x0001d7dd, 0x0000000a, 0x0001d7de, 0x0000000c,
+       0x0001d7df, 0x0000000e, 0x0001d7e0, 0x00000010,
+       0x0001d7e1, 0x00000012, 0x0001d7e2, 0x00000000,
+       0x0001d7e3, 0x00000002, 0x0001d7e4, 0x00000004,
+       0x0001d7e5, 0x00000006, 0x0001d7e6, 0x00000008,
+       0x0001d7e7, 0x0000000a, 0x0001d7e8, 0x0000000c,
+       0x0001d7e9, 0x0000000e, 0x0001d7ea, 0x00000010,
+       0x0001d7eb, 0x00000012, 0x0001d7ec, 0x00000000,
+       0x0001d7ed, 0x00000002, 0x0001d7ee, 0x00000004,
+       0x0001d7ef, 0x00000006, 0x0001d7f0, 0x00000008,
+       0x0001d7f1, 0x0000000a, 0x0001d7f2, 0x0000000c,
+       0x0001d7f3, 0x0000000e, 0x0001d7f4, 0x00000010,
+       0x0001d7f5, 0x00000012, 0x0001d7f6, 0x00000000,
+       0x0001d7f7, 0x00000002, 0x0001d7f8, 0x00000004,
+       0x0001d7f9, 0x00000006, 0x0001d7fa, 0x00000008,
+       0x0001d7fb, 0x0000000a, 0x0001d7fc, 0x0000000c,
+       0x0001d7fd, 0x0000000e, 0x0001d7fe, 0x00000010,
+       0x0001d7ff, 0x00000012
 };
 
 static const short _ucnum_vals[] = {