ruby-changes:13424
From: naruse <ko1@a...>
Date: Sat, 3 Oct 2009 01:03:37 +0900 (JST)
Subject: [ruby-changes:13424] Ruby:r25195 (trunk): * enc/unicode/name2ctype.h: Updated to Unicode 5.2.0.
naruse 2009-10-03 01:03:20 +0900 (Sat, 03 Oct 2009) New Revision: 25195 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25195 Log: * enc/unicode/name2ctype.h: Updated to Unicode 5.2.0. Modified files: trunk/ChangeLog trunk/enc/unicode/name2ctype.h Index: ChangeLog =================================================================== --- ChangeLog (revision 25194) +++ ChangeLog (revision 25195) @@ -1,3 +1,7 @@ +Sat Oct 3 01:01:20 2009 NARUSE, Yui <naruse@r...> + + * enc/unicode/name2ctype.h: Updated to Unicode 5.2.0. + Sat Oct 3 01:01:03 2009 Nobuyoshi Nakada <nobu@r...> * configure.in: workaround for regexp metacharacters of expr in Index: enc/unicode/name2ctype.h =================================================================== --- enc/unicode/name2ctype.h (revision 25194) +++ enc/unicode/name2ctype.h (revision 25195) @@ -3,7 +3,7 @@ #ifndef USE_UNICODE_PROPERTIES /* Computed positions: -k'1,3' */ #else /* USE_UNICODE_PROPERTIES */ -/* Computed positions: -k'1-3' */ +/* Computed positions: -k'1,3-4,$' */ #endif /* USE_UNICODE_PROPERTIES */ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ @@ -43,7 +43,7 @@ /* 'Alpha': [[:Alpha:]] */ static const OnigCodePoint CR_Alpha[] = { - 452, + 482, 0x0041, 0x005a, 0x0061, 0x007a, 0x00aa, 0x00aa, @@ -65,7 +65,7 @@ 0x038e, 0x03a1, 0x03a3, 0x03f5, 0x03f7, 0x0481, - 0x0483, 0x0523, + 0x0483, 0x0525, 0x0531, 0x0556, 0x0559, 0x0559, 0x0561, 0x0587, @@ -88,12 +88,13 @@ 0x074d, 0x07b1, 0x07ca, 0x07f5, 0x07fa, 0x07fa, - 0x0901, 0x0939, - 0x093c, 0x094d, - 0x0950, 0x0954, + 0x0800, 0x082d, + 0x0900, 0x0939, + 0x093c, 0x094e, + 0x0950, 0x0955, 0x0958, 0x0963, 0x0971, 0x0972, - 0x097b, 0x097f, + 0x0979, 0x097f, 0x0981, 0x0983, 0x0985, 0x098c, 0x098f, 0x0990, @@ -244,13 +245,11 @@ 0x0fc6, 0x0fc6, 0x1000, 0x103f, 0x1050, 0x108f, + 0x109a, 0x109d, 0x10a0, 0x10c5, 0x10d0, 0x10fa, 0x10fc, 0x10fc, - 0x1100, 0x1159, - 0x115f, 0x11a2, - 0x11a8, 0x11f9, - 0x1200, 0x1248, + 0x1100, 0x1248, 0x124a, 0x124d, 0x1250, 0x1256, 0x1258, 0x1258, @@ -270,7 +269,7 @@ 0x1380, 0x138f, 0x13a0, 0x13f4, 0x1401, 0x166c, - 0x166f, 0x1676, + 0x166f, 0x167f, 0x1681, 0x169a, 0x16a0, 0x16ea, 0x1700, 0x170c, @@ -287,14 +286,19 @@ 0x180b, 0x180d, 0x1820, 0x1877, 0x1880, 0x18aa, + 0x18b0, 0x18f5, 0x1900, 0x191c, 0x1920, 0x192b, 0x1930, 0x193b, 0x1950, 0x196d, 0x1970, 0x1974, - 0x1980, 0x19a9, + 0x1980, 0x19ab, 0x19b0, 0x19c9, 0x1a00, 0x1a1b, + 0x1a20, 0x1a5e, + 0x1a60, 0x1a7c, + 0x1a7f, 0x1a7f, + 0x1aa7, 0x1aa7, 0x1b00, 0x1b4b, 0x1b6b, 0x1b73, 0x1b80, 0x1baa, @@ -302,8 +306,10 @@ 0x1c00, 0x1c37, 0x1c4d, 0x1c4f, 0x1c5a, 0x1c7d, + 0x1cd0, 0x1cd2, + 0x1cd4, 0x1cf2, 0x1d00, 0x1de6, - 0x1dfe, 0x1f15, + 0x1dfd, 0x1f15, 0x1f18, 0x1f1d, 0x1f20, 0x1f45, 0x1f48, 0x1f4d, @@ -342,9 +348,8 @@ 0x2183, 0x2184, 0x2c00, 0x2c2e, 0x2c30, 0x2c5e, - 0x2c60, 0x2c6f, - 0x2c71, 0x2c7d, - 0x2c80, 0x2ce4, + 0x2c60, 0x2ce4, + 0x2ceb, 0x2cf1, 0x2d00, 0x2d25, 0x2d30, 0x2d65, 0x2d6f, 0x2d6f, @@ -375,8 +380,9 @@ 0x3400, 0x3400, 0x4db5, 0x4db5, 0x4e00, 0x4e00, - 0x9fc3, 0x9fc3, + 0x9fcb, 0x9fcb, 0xa000, 0xa48c, + 0xa4d0, 0xa4fd, 0xa500, 0xa60c, 0xa610, 0xa61f, 0xa62a, 0xa62b, @@ -384,20 +390,35 @@ 0xa662, 0xa672, 0xa67c, 0xa67d, 0xa67f, 0xa697, + 0xa6a0, 0xa6e5, + 0xa6f0, 0xa6f1, 0xa717, 0xa71f, 0xa722, 0xa788, 0xa78b, 0xa78c, 0xa7fb, 0xa827, 0xa840, 0xa873, 0xa880, 0xa8c4, + 0xa8e0, 0xa8f7, + 0xa8fb, 0xa8fb, 0xa90a, 0xa92d, 0xa930, 0xa953, + 0xa960, 0xa97c, + 0xa980, 0xa9c0, + 0xa9cf, 0xa9cf, 0xaa00, 0xaa36, 0xaa40, 0xaa4d, + 0xaa60, 0xaa76, + 0xaa7a, 0xaa7b, + 0xaa80, 0xaac2, + 0xaadb, 0xaadd, + 0xabc0, 0xabea, + 0xabec, 0xabed, 0xac00, 0xac00, 0xd7a3, 0xd7a3, + 0xd7b0, 0xd7c6, + 0xd7cb, 0xd7fb, 0xf900, 0xfa2d, - 0xfa30, 0xfa6a, + 0xfa30, 0xfa6d, 0xfa70, 0xfad9, 0xfb00, 0xfb06, 0xfb13, 0xfb17, @@ -445,7 +466,7 @@ 0x1080a, 0x10835, 0x10837, 0x10838, 0x1083c, 0x1083c, - 0x1083f, 0x1083f, + 0x1083f, 0x10855, 0x10900, 0x10915, 0x10920, 0x10939, 0x10a00, 0x10a03, @@ -455,7 +476,14 @@ 0x10a19, 0x10a33, 0x10a38, 0x10a3a, 0x10a3f, 0x10a3f, + 0x10a60, 0x10a7c, + 0x10b00, 0x10b35, + 0x10b40, 0x10b55, + 0x10b60, 0x10b72, + 0x10c00, 0x10c48, + 0x11080, 0x110ba, 0x12000, 0x1236e, + 0x13000, 0x1342e, 0x1d165, 0x1d169, 0x1d16d, 0x1d172, 0x1d17b, 0x1d182, @@ -494,6 +522,8 @@ 0x1d7c4, 0x1d7cb, 0x20000, 0x20000, 0x2a6d6, 0x2a6d6, + 0x2a700, 0x2a700, + 0x2b734, 0x2b734, 0x2f800, 0x2fa1d, 0xe0100, 0xe01ef, }; /* CR_Alpha */ @@ -521,7 +551,7 @@ /* 'Digit': [[:Digit:]] */ static const OnigCodePoint CR_Digit[] = { - 33, + 37, 0x0030, 0x0039, 0x0660, 0x0669, 0x06f0, 0x06f9, @@ -543,7 +573,9 @@ 0x17e0, 0x17e9, 0x1810, 0x1819, 0x1946, 0x194f, - 0x19d0, 0x19d9, + 0x19d0, 0x19da, + 0x1a80, 0x1a89, + 0x1a90, 0x1a99, 0x1b50, 0x1b59, 0x1bb0, 0x1bb9, 0x1c40, 0x1c49, @@ -551,7 +583,9 @@ 0xa620, 0xa629, 0xa8d0, 0xa8d9, 0xa900, 0xa909, + 0xa9d0, 0xa9d9, 0xaa50, 0xaa59, + 0xabf0, 0xabf9, 0xff10, 0xff19, 0x104a0, 0x104a9, 0x1d7ce, 0x1d7ff, @@ -559,7 +593,7 @@ /* 'Graph': [[:Graph:]] */ static const OnigCodePoint CR_Graph[] = { - 449, + 492, 0x0021, 0x007e, 0x00a1, 0x00ac, 0x00ae, 0x0377, @@ -567,7 +601,7 @@ 0x0384, 0x038a, 0x038c, 0x038c, 0x038e, 0x03a1, - 0x03a3, 0x0523, + 0x03a3, 0x0525, 0x0531, 0x0556, 0x0559, 0x055f, 0x0561, 0x0587, @@ -583,11 +617,13 @@ 0x0710, 0x074a, 0x074d, 0x07b1, 0x07c0, 0x07fa, - 0x0901, 0x0939, - 0x093c, 0x094d, - 0x0950, 0x0954, + 0x0800, 0x082d, + 0x0830, 0x083e, + 0x0900, 0x0939, + 0x093c, 0x094e, + 0x0950, 0x0955, 0x0958, 0x0972, - 0x097b, 0x097f, + 0x0979, 0x097f, 0x0981, 0x0983, 0x0985, 0x098c, 0x098f, 0x0990, @@ -601,7 +637,7 @@ 0x09d7, 0x09d7, 0x09dc, 0x09dd, 0x09df, 0x09e3, - 0x09e6, 0x09fa, + 0x09e6, 0x09fb, 0x0a01, 0x0a03, 0x0a05, 0x0a0a, 0x0a0f, 0x0a10, @@ -739,14 +775,10 @@ 0x0f90, 0x0f97, 0x0f99, 0x0fbc, 0x0fbe, 0x0fcc, - 0x0fce, 0x0fd4, - 0x1000, 0x1099, - 0x109e, 0x10c5, + 0x0fce, 0x0fd8, + 0x1000, 0x10c5, 0x10d0, 0x10fc, - 0x1100, 0x1159, - 0x115f, 0x11a2, - 0x11a8, 0x11f9, - 0x1200, 0x1248, + 0x1100, 0x1248, 0x124a, 0x124d, 0x1250, 0x1256, 0x1258, 0x1258, @@ -765,7 +797,7 @@ 0x135f, 0x137c, 0x1380, 0x1399, 0x13a0, 0x13f4, - 0x1401, 0x1676, + 0x1400, 0x167f, 0x1681, 0x169c, 0x16a0, 0x16f0, 0x1700, 0x170c, @@ -783,17 +815,22 @@ 0x1810, 0x1819, 0x1820, 0x1877, 0x1880, 0x18aa, + 0x18b0, 0x18f5, 0x1900, 0x191c, 0x1920, 0x192b, 0x1930, 0x193b, 0x1940, 0x1940, 0x1944, 0x196d, 0x1970, 0x1974, - 0x1980, 0x19a9, + 0x1980, 0x19ab, 0x19b0, 0x19c9, - 0x19d0, 0x19d9, + 0x19d0, 0x19da, 0x19de, 0x1a1b, - 0x1a1e, 0x1a1f, + 0x1a1e, 0x1a5e, + 0x1a60, 0x1a7c, + 0x1a7f, 0x1a89, + 0x1a90, 0x1a99, + 0x1aa0, 0x1aad, 0x1b00, 0x1b4b, 0x1b50, 0x1b7c, 0x1b80, 0x1baa, @@ -801,8 +838,9 @@ 0x1c00, 0x1c37, 0x1c3b, 0x1c49, 0x1c4d, 0x1c7f, + 0x1cd0, 0x1cf2, 0x1d00, 0x1de6, - 0x1dfe, 0x1f15, + 0x1dfd, 0x1f15, 0x1f18, 0x1f1d, 0x1f20, 0x1f45, 0x1f48, 0x1f4d, @@ -823,36 +861,33 @@ 0x2070, 0x2071, 0x2074, 0x208e, 0x2090, 0x2094, - 0x20a0, 0x20b5, + 0x20a0, 0x20b8, 0x20d0, 0x20f0, - 0x2100, 0x214f, - 0x2153, 0x2188, - 0x2190, 0x23e7, + 0x2100, 0x2189, + 0x2190, 0x23e8, 0x2400, 0x2426, 0x2440, 0x244a, - 0x2460, 0x269d, - 0x26a0, 0x26bc, - 0x26c0, 0x26c3, + 0x2460, 0x26cd, + 0x26cf, 0x26e1, + 0x26e3, 0x26e3, + 0x26e8, 0x26ff, 0x2701, 0x2704, 0x2706, 0x2709, 0x270c, 0x2727, 0x2729, 0x274b, 0x274d, 0x274d, 0x274f, 0x2752, - 0x2756, 0x2756, - 0x2758, 0x275e, + 0x2756, 0x275e, 0x2761, 0x2794, 0x2798, 0x27af, 0x27b1, 0x27be, 0x27c0, 0x27ca, 0x27cc, 0x27cc, 0x27d0, 0x2b4c, - 0x2b50, 0x2b54, + 0x2b50, 0x2b59, 0x2c00, 0x2c2e, 0x2c30, 0x2c5e, - 0x2c60, 0x2c6f, - 0x2c71, 0x2c7d, - 0x2c80, 0x2cea, + 0x2c60, 0x2cf1, 0x2cf9, 0x2d25, 0x2d30, 0x2d65, 0x2d6f, 0x2d6f, @@ -865,7 +900,7 @@ 0x2dc8, 0x2dce, 0x2dd0, 0x2dd6, 0x2dd8, 0x2dde, - 0x2de0, 0x2e30, + 0x2de0, 0x2e31, 0x2e80, 0x2e99, 0x2e9b, 0x2ef3, 0x2f00, 0x2fd5, @@ -878,33 +913,44 @@ 0x3190, 0x31b7, 0x31c0, 0x31e3, 0x31f0, 0x321e, - 0x3220, 0x3243, - 0x3250, 0x32fe, + 0x3220, 0x32fe, 0x3300, 0x3400, 0x4db5, 0x4db5, 0x4dc0, 0x4e00, - 0x9fc3, 0x9fc3, + 0x9fcb, 0x9fcb, 0xa000, 0xa48c, 0xa490, 0xa4c6, - 0xa500, 0xa62b, + 0xa4d0, 0xa62b, 0xa640, 0xa65f, 0xa662, 0xa673, 0xa67c, 0xa697, + 0xa6a0, 0xa6f7, 0xa700, 0xa78c, 0xa7fb, 0xa82b, + 0xa830, 0xa839, 0xa840, 0xa877, 0xa880, 0xa8c4, 0xa8ce, 0xa8d9, + 0xa8e0, 0xa8fb, 0xa900, 0xa953, - 0xa95f, 0xa95f, + 0xa95f, 0xa97c, + 0xa980, 0xa9cd, + 0xa9cf, 0xa9d9, + 0xa9de, 0xa9df, 0xaa00, 0xaa36, 0xaa40, 0xaa4d, 0xaa50, 0xaa59, - 0xaa5c, 0xaa5f, + 0xaa5c, 0xaa7b, + 0xaa80, 0xaac2, + 0xaadb, 0xaadf, + 0xabc0, 0xabed, + 0xabf0, 0xabf9, 0xac00, 0xac00, 0xd7a3, 0xd7a3, + 0xd7b0, 0xd7c6, + 0xd7cb, 0xd7fb, 0xf900, 0xfa2d, - 0xfa30, 0xfa6a, + 0xfa30, 0xfa6d, 0xfa70, 0xfad9, 0xfb00, 0xfb06, 0xfb13, 0xfb17, @@ -960,8 +1006,9 @@ 0x1080a, 0x10835, 0x10837, 0x10838, 0x1083c, 0x1083c, - 0x1083f, 0x1083f, - 0x10900, 0x10919, + 0x1083f, 0x10855, + 0x10857, 0x1085f, + 0x10900, 0x1091b, 0x1091f, 0x10939, 0x1093f, 0x1093f, 0x10a00, 0x10a03, @@ -972,9 +1019,19 @@ 0x10a38, 0x10a3a, 0x10a3f, 0x10a47, 0x10a50, 0x10a58, + 0x10a60, 0x10a7f, + 0x10b00, 0x10b35, + 0x10b39, 0x10b55, + 0x10b58, 0x10b72, + 0x10b78, 0x10b7f, + 0x10c00, 0x10c48, + 0x10e60, 0x10e7e, + 0x11080, 0x110bc, + 0x110be, 0x110c1, 0x12000, 0x1236e, 0x12400, 0x12462, 0x12470, 0x12473, + 0x13000, 0x1342e, 0x1d000, 0x1d0f5, 0x1d100, 0x1d126, 0x1d129, 0x1d172, @@ -1005,15 +1062,35 @@ 0x1d7ce, 0x1d7ff, 0x1f000, 0x1f02b, 0x1f030, 0x1f093, + 0x1f100, 0x1f10a, + 0x1f110, 0x1f12e, + 0x1f131, 0x1f131, + 0x1f13d, 0x1f13d, + 0x1f13f, 0x1f13f, + 0x1f142, 0x1f142, + 0x1f146, 0x1f146, + 0x1f14a, 0x1f14e, + 0x1f157, 0x1f157, + 0x1f15f, 0x1f15f, + 0x1f179, 0x1f179, + 0x1f17b, 0x1f17c, + 0x1f17f, 0x1f17f, + 0x1f18a, 0x1f18d, + 0x1f190, 0x1f190, + 0x1f200, 0x1f200, + 0x1f210, 0x1f231, + 0x1f240, 0x1f248, 0x20000, 0x20000, 0x2a6d6, 0x2a6d6, + 0x2a700, 0x2a700, + 0x2b734, 0x2b734, 0x2f800, 0x2fa1d, 0xe0100, 0xe01ef, }; /* CR_Graph */ /* 'Lower': [[:Lower:]] */ static const OnigCodePoint CR_Lower[] = { - 598, + 599, 0x0061, 0x007a, 0x00aa, 0x00aa, 0x00b5, 0x00b5, @@ -1279,6 +1356,7 @@ 0x051f, 0x051f, 0x0521, 0x0521, 0x0523, 0x0523, + 0x0525, 0x0525, 0x0561, 0x0587, 0x1d00, 0x1d2b, 0x1d62, 0x1d77, @@ -1427,8 +1505,6 @@ 0x1fe0, 0x1fe7, 0x1ff2, 0x1ff4, 0x1ff6, 0x1ff7, - 0x2071, 0x2071, - 0x207f, 0x207f, 0x210a, 0x210a, 0x210e, 0x210f, 0x2113, 0x2113, @@ -1498,6 +1574,8 @@ 0x2cdf, 0x2cdf, 0x2ce1, 0x2ce1, 0x2ce3, 0x2ce4, + 0x2cec, 0x2cec, + 0x2cee, 0x2cee, 0x2d00, 0x2d25, 0xa641, 0xa641, 0xa643, 0xa643, @@ -1616,7 +1694,7 @@ /* 'Print': [[:Print:]] */ static const OnigCodePoint CR_Print[] = { - 452, + 494, 0x0009, 0x000d, 0x0020, 0x007e, 0x0085, 0x0085, @@ -1626,7 +1704,7 @@ 0x0384, 0x038a, 0x038c, 0x038c, 0x038e, 0x03a1, - 0x03a3, 0x0523, + 0x03a3, 0x0525, 0x0531, 0x0556, 0x0559, 0x055f, 0x0561, 0x0587, @@ -1642,11 +1720,13 @@ 0x0710, 0x074a, 0x074d, 0x07b1, 0x07c0, 0x07fa, - 0x0901, 0x0939, - 0x093c, 0x094d, - 0x0950, 0x0954, + 0x0800, 0x082d, + 0x0830, 0x083e, + 0x0900, 0x0939, + 0x093c, 0x094e, + 0x0950, 0x0955, 0x0958, 0x0972, - 0x097b, 0x097f, + 0x0979, 0x097f, 0x0981, 0x0983, 0x0985, 0x098c, 0x098f, 0x0990, @@ -1660,7 +1740,7 @@ 0x09d7, 0x09d7, 0x09dc, 0x09dd, 0x09df, 0x09e3, - 0x09e6, 0x09fa, + 0x09e6, 0x09fb, 0x0a01, 0x0a03, 0x0a05, 0x0a0a, 0x0a0f, 0x0a10, @@ -1798,14 +1878,10 @@ 0x0f90, 0x0f97, 0x0f99, 0x0fbc, 0x0fbe, 0x0fcc, - 0x0fce, 0x0fd4, - 0x1000, 0x1099, - 0x109e, 0x10c5, + 0x0fce, 0x0fd8, + 0x1000, 0x10c5, 0x10d0, 0x10fc, - 0x1100, 0x1159, - 0x115f, 0x11a2, - 0x11a8, 0x11f9, - 0x1200, 0x1248, + 0x1100, 0x1248, 0x124a, 0x124d, 0x1250, 0x1256, 0x1258, 0x1258, @@ -1824,8 +1900,7 @@ 0x135f, 0x137c, 0x1380, 0x1399, 0x13a0, 0x13f4, - 0x1401, 0x1676, - 0x1680, 0x169c, + 0x1400, 0x169c, 0x16a0, 0x16f0, 0x1700, 0x170c, 0x170e, 0x1714, @@ -1842,17 +1917,22 @@ 0x1810, 0x1819, 0x1820, 0x1877, 0x1880, 0x18aa, + 0x18b0, 0x18f5, 0x1900, 0x191c, 0x1920, 0x192b, 0x1930, 0x193b, 0x1940, 0x1940, 0x1944, 0x196d, 0x1970, 0x1974, - 0x1980, 0x19a9, + 0x1980, 0x19ab, 0x19b0, 0x19c9, - 0x19d0, 0x19d9, + 0x19d0, 0x19da, 0x19de, 0x1a1b, - 0x1a1e, 0x1a1f, + 0x1a1e, 0x1a5e, + 0x1a60, 0x1a7c, + 0x1a7f, 0x1a89, + 0x1a90, 0x1a99, + 0x1aa0, 0x1aad, 0x1b00, 0x1b4b, 0x1b50, 0x1b7c, 0x1b80, 0x1baa, @@ -1860,8 +1940,9 @@ 0x1c00, 0x1c37, 0x1c3b, 0x1c49, 0x1c4d, 0x1c7f, + 0x1cd0, 0x1cf2, 0x1d00, 0x1de6, - 0x1dfe, 0x1f15, + 0x1dfd, 0x1f15, 0x1f18, 0x1f1d, 0x1f20, 0x1f45, 0x1f48, 0x1f4d, @@ -1883,36 +1964,33 @@ 0x2070, 0x2071, 0x2074, 0x208e, 0x2090, 0x2094, - 0x20a0, 0x20b5, + 0x20a0, 0x20b8, 0x20d0, 0x20f0, - 0x2100, 0x214f, - 0x2153, 0x2188, - 0x2190, 0x23e7, + 0x2100, 0x2189, + 0x2190, 0x23e8, 0x2400, 0x2426, 0x2440, 0x244a, - 0x2460, 0x269d, - 0x26a0, 0x26bc, - 0x26c0, 0x26c3, + 0x2460, 0x26cd, + 0x26cf, 0x26e1, + 0x26e3, 0x26e3, + 0x26e8, 0x26ff, 0x2701, 0x2704, 0x2706, 0x2709, 0x270c, 0x2727, 0x2729, 0x274b, 0x274d, 0x274d, 0x274f, 0x2752, - 0x2756, 0x2756, - 0x2758, 0x275e, + 0x2756, 0x275e, 0x2761, 0x2794, 0x2798, 0x27af, 0x27b1, 0x27be, 0x27c0, 0x27ca, 0x27cc, 0x27cc, 0x27d0, 0x2b4c, - 0x2b50, 0x2b54, + 0x2b50, 0x2b59, 0x2c00, 0x2c2e, 0x2c30, 0x2c5e, - 0x2c60, 0x2c6f, - 0x2c71, 0x2c7d, - 0x2c80, 0x2cea, + 0x2c60, 0x2cf1, 0x2cf9, 0x2d25, 0x2d30, 0x2d65, 0x2d6f, 0x2d6f, @@ -1925,7 +2003,7 @@ 0x2dc8, 0x2dce, 0x2dd0, 0x2dd6, 0x2dd8, 0x2dde, - 0x2de0, 0x2e30, + 0x2de0, 0x2e31, 0x2e80, 0x2e99, 0x2e9b, 0x2ef3, 0x2f00, 0x2fd5, @@ -1938,33 +2016,44 @@ 0x3190, 0x31b7, 0x31c0, 0x31e3, 0x31f0, 0x321e, - 0x3220, 0x3243, - 0x3250, 0x32fe, + 0x3220, 0x32fe, 0x3300, 0x3400, 0x4db5, 0x4db5, 0x4dc0, 0x4e00, - 0x9fc3, 0x9fc3, + 0x9fcb, 0x9fcb, 0xa000, 0xa48c, 0xa490, 0xa4c6, - 0xa500, 0xa62b, + 0xa4d0, 0xa62b, 0xa640, 0xa65f, 0xa662, 0xa673, 0xa67c, 0xa697, + 0xa6a0, 0xa6f7, 0xa700, 0xa78c, 0xa7fb, 0xa82b, + 0xa830, 0xa839, 0xa840, 0xa877, 0xa880, 0xa8c4, 0xa8ce, 0xa8d9, + 0xa8e0, 0xa8fb, 0xa900, 0xa953, - 0xa95f, 0xa95f, + 0xa95f, 0xa97c, + 0xa980, 0xa9cd, + 0xa9cf, 0xa9d9, + 0xa9de, 0xa9df, 0xaa00, 0xaa36, 0xaa40, 0xaa4d, 0xaa50, 0xaa59, - 0xaa5c, 0xaa5f, + 0xaa5c, 0xaa7b, + 0xaa80, 0xaac2, + 0xaadb, 0xaadf, + 0xabc0, 0xabed, + 0xabf0, 0xabf9, 0xac00, 0xac00, 0xd7a3, 0xd7a3, + 0xd7b0, 0xd7c6, + 0xd7cb, 0xd7fb, 0xf900, 0xfa2d, - 0xfa30, 0xfa6a, + 0xfa30, 0xfa6d, 0xfa70, 0xfad9, 0xfb00, 0xfb06, 0xfb13, 0xfb17, @@ -2020,8 +2109,9 @@ 0x1080a, 0x10835, 0x10837, 0x10838, 0x1083c, 0x1083c, - 0x1083f, 0x1083f, - 0x10900, 0x10919, + 0x1083f, 0x10855, + 0x10857, 0x1085f, + 0x10900, 0x1091b, 0x1091f, 0x10939, 0x1093f, 0x1093f, 0x10a00, 0x10a03, @@ -2032,9 +2122,19 @@ 0x10a38, 0x10a3a, 0x10a3f, 0x10a47, 0x10a50, 0x10a58, + 0x10a60, 0x10a7f, + 0x10b00, 0x10b35, + 0x10b39, 0x10b55, + 0x10b58, 0x10b72, + 0x10b78, 0x10b7f, + 0x10c00, 0x10c48, + 0x10e60, 0x10e7e, + 0x11080, 0x110bc, + 0x110be, 0x110c1, 0x12000, 0x1236e, 0x12400, 0x12462, 0x12470, 0x12473, + 0x13000, 0x1342e, 0x1d000, 0x1d0f5, 0x1d100, 0x1d126, 0x1d129, 0x1d172, @@ -2065,15 +2165,35 @@ 0x1d7ce, 0x1d7ff, 0x1f000, 0x1f02b, 0x1f030, 0x1f093, + 0x1f100, 0x1f10a, + 0x1f110, 0x1f12e, + 0x1f131, 0x1f131, + 0x1f13d, 0x1f13d, + 0x1f13f, 0x1f13f, + 0x1f142, 0x1f142, + 0x1f146, 0x1f146, + 0x1f14a, 0x1f14e, + 0x1f157, 0x1f157, + 0x1f15f, 0x1f15f, + 0x1f179, 0x1f179, + 0x1f17b, 0x1f17c, + 0x1f17f, 0x1f17f, + 0x1f18a, 0x1f18d, + 0x1f190, 0x1f190, + 0x1f200, 0x1f200, + 0x1f210, 0x1f231, + 0x1f240, 0x1f248, 0x20000, 0x20000, 0x2a6d6, 0x2a6d6, + 0x2a700, 0x2a700, + 0x2b734, 0x2b734, 0x2f800, 0x2fa1d, 0xe0100, 0xe01ef, }; /* CR_Print */ /* 'Punct': [[:Punct:]] */ static const OnigCodePoint CR_Punct[] = { - 112, + 129, 0x0021, 0x0023, 0x0025, 0x002a, 0x002c, 0x002f, @@ -2105,6 +2225,7 @@ 0x06d4, 0x06d4, 0x0700, 0x070d, 0x07f7, 0x07f9, + 0x0830, 0x083e, 0x0964, 0x0965, 0x0970, 0x0970, 0x0df4, 0x0df4, @@ -2117,6 +2238,7 @@ 0x104a, 0x104f, 0x10fb, 0x10fb, 0x1361, 0x1368, + 0x1400, 0x1400, 0x166d, 0x166e, 0x169b, 0x169c, 0x16eb, 0x16ed, @@ -2127,9 +2249,12 @@ 0x1944, 0x1945, 0x19de, 0x19df, 0x1a1e, 0x1a1f, + 0x1aa0, 0x1aa6, + 0x1aa8, 0x1aad, 0x1b5a, 0x1b60, 0x1c3b, 0x1c3f, 0x1c7e, 0x1c7f, + 0x1cd3, 0x1cd3, 0x2010, 0x2027, 0x2030, 0x2043, 0x2045, 0x2051, @@ -2146,7 +2271,7 @@ 0x2cf9, 0x2cfc, 0x2cfe, 0x2cff, 0x2e00, 0x2e2e, - 0x2e30, 0x2e30, + 0x2e30, 0x2e31, 0x3001, 0x3003, 0x3008, 0x3011, 0x3014, 0x301f, @@ -2154,14 +2279,21 @@ 0x303d, 0x303d, 0x30a0, 0x30a0, 0x30fb, 0x30fb, + 0xa4fe, 0xa4ff, 0xa60d, 0xa60f, 0xa673, 0xa673, 0xa67e, 0xa67e, + 0xa6f2, 0xa6f7, 0xa874, 0xa877, 0xa8ce, 0xa8cf, + 0xa8f8, 0xa8fa, 0xa92e, 0xa92f, 0xa95f, 0xa95f, + 0xa9c1, 0xa9cd, + 0xa9de, 0xa9df, 0xaa5c, 0xaa5f, + 0xaade, 0xaadf, + 0xabeb, 0xabeb, 0xfd3e, 0xfd3f, 0xfe10, 0xfe19, 0xfe30, 0xfe52, @@ -2182,9 +2314,14 @@ 0x10100, 0x10101, 0x1039f, 0x1039f, 0x103d0, 0x103d0, + 0x10857, 0x10857, 0x1091f, 0x1091f, 0x1093f, 0x1093f, 0x10a50, 0x10a58, + 0x10a7f, 0x10a7f, + 0x10b39, 0x10b3f, + 0x110bb, 0x110bc, + 0x110be, 0x110c1, 0x12470, 0x12473, }; /* CR_Punct */ @@ -2206,7 +2343,7 @@ /* 'Upper': [[:Upper:]] */ static const OnigCodePoint CR_Upper[] = { - 591, + 594, 0x0041, 0x005a, 0x00c0, 0x00d6, 0x00d8, 0x00de, @@ -2471,6 +2608,7 @@ 0x051e, 0x051e, 0x0520, 0x0520, 0x0522, 0x0522, + 0x0524, 0x0524, 0x0531, 0x0556, 0x10a0, 0x10c5, 0x1e00, 0x1e00, @@ -2632,10 +2770,10 @@ 0x2c67, 0x2c67, 0x2c69, 0x2c69, 0x2c6b, 0x2c6b, - 0x2c6d, 0x2c6f, + 0x2c6d, 0x2c70, 0x2c72, 0x2c72, 0x2c75, 0x2c75, - 0x2c80, 0x2c80, + 0x2c7e, 0x2c80, 0x2c82, 0x2c82, 0x2c84, 0x2c84, 0x2c86, 0x2c86, @@ -2685,6 +2823,8 @@ 0x2cde, 0x2cde, 0x2ce0, 0x2ce0, 0x2ce2, 0x2ce2, + 0x2ceb, 0x2ceb, + 0x2ced, 0x2ced, 0xa640, 0xa640, 0xa642, 0xa642, 0xa644, 0xa644, @@ -2810,7 +2950,7 @@ /* 'Word': [[:Word:]] */ static const OnigCodePoint CR_Word[] = { - 477, + 508, 0x0030, 0x0039, 0x0041, 0x005a, 0x005f, 0x005f, @@ -2834,7 +2974,7 @@ 0x038e, 0x03a1, 0x03a3, 0x03f5, 0x03f7, 0x0481, - 0x0483, 0x0523, + 0x0483, 0x0525, 0x0531, 0x0556, 0x0559, 0x0559, 0x0561, 0x0587, @@ -2857,13 +2997,14 @@ 0x074d, 0x07b1, 0x07c0, 0x07f5, 0x07fa, 0x07fa, - 0x0901, 0x0939, - 0x093c, 0x094d, - 0x0950, 0x0954, + 0x0800, 0x082d, + 0x0900, 0x0939, + 0x093c, 0x094e, + 0x0950, 0x0955, 0x0958, 0x0963, 0x0966, 0x096f, 0x0971, 0x0972, - 0x097b, 0x097f, + 0x0979, 0x097f, 0x0981, 0x0983, 0x0985, 0x098c, 0x098f, 0x0990, @@ -3022,14 +3163,11 @@ 0x0f99, 0x0fbc, 0x0fc6, 0x0fc6, 0x1000, 0x1049, - 0x1050, 0x1099, + 0x1050, 0x109d, 0x10a0, 0x10c5, 0x10d0, 0x10fa, 0x10fc, 0x10fc, - 0x1100, 0x1159, - 0x115f, 0x11a2, - 0x11a8, 0x11f9, - 0x1200, 0x1248, + 0x1100, 0x1248, 0x124a, 0x124d, 0x1250, 0x1256, 0x1258, 0x1258, @@ -3049,7 +3187,7 @@ 0x1380, 0x138f, 0x13a0, 0x13f4, 0x1401, 0x166c, - 0x166f, 0x1676, + 0x166f, 0x167f, 0x1681, 0x169a, 0x16a0, 0x16ea, 0x1700, 0x170c, @@ -3068,15 +3206,21 @@ 0x1810, 0x1819, 0x1820, 0x1877, 0x1880, 0x18aa, + 0x18b0, 0x18f5, 0x1900, 0x191c, 0x1920, 0x192b, 0x1930, 0x193b, 0x1946, 0x196d, 0x1970, 0x1974, - 0x1980, 0x19a9, + 0x1980, 0x19ab, 0x19b0, 0x19c9, - 0x19d0, 0x19d9, + 0x19d0, 0x19da, 0x1a00, 0x1a1b, + 0x1a20, 0x1a5e, + 0x1a60, 0x1a7c, + 0x1a7f, 0x1a89, + 0x1a90, 0x1a99, + 0x1aa7, 0x1aa7, 0x1b00, 0x1b4b, 0x1b50, 0x1b59, 0x1b6b, 0x1b73, @@ -3085,8 +3229,10 @@ 0x1c00, 0x1c37, 0x1c40, 0x1c49, 0x1c4d, 0x1c7d, + 0x1cd0, 0x1cd2, + 0x1cd4, 0x1cf2, 0x1d00, 0x1de6, - 0x1dfe, 0x1f15, + 0x1dfd, 0x1f15, 0x1f18, 0x1f1d, 0x1f20, 0x1f45, 0x1f48, 0x1f4d, @@ -3127,9 +3273,8 @@ 0x2183, 0x2184, 0x2c00, 0x2c2e, 0x2c30, 0x2c5e, - 0x2c60, 0x2c6f, - 0x2c71, 0x2c7d, - 0x2c80, 0x2ce4, + 0x2c60, 0x2ce4, + 0x2ceb, 0x2cf1, 0x2d00, 0x2d25, 0x2d30, 0x2d65, 0x2d6f, 0x2d6f, @@ -3160,14 +3305,17 @@ 0x3400, 0x3400, 0x4db5, 0x4db5, 0x4e00, 0x4e00, - 0x9fc3, 0x9fc3, + 0x9fcb, 0x9fcb, 0xa000, 0xa48c, + 0xa4d0, 0xa4fd, 0xa500, 0xa60c, 0xa610, 0xa62b, 0xa640, 0xa65f, 0xa662, 0xa672, 0xa67c, 0xa67d, 0xa67f, 0xa697, + 0xa6a0, 0xa6e5, + 0xa6f0, 0xa6f1, 0xa717, 0xa71f, 0xa722, 0xa788, 0xa78b, 0xa78c, @@ -3175,15 +3323,29 @@ 0xa840, 0xa873, 0xa880, 0xa8c4, 0xa8d0, 0xa8d9, + 0xa8e0, 0xa8f7, + 0xa8fb, 0xa8fb, 0xa900, 0xa92d, 0xa930, 0xa953, + 0xa960, 0xa97c, + 0xa980, 0xa9c0, + 0xa9cf, 0xa9d9, 0xaa00, 0xaa36, 0xaa40, 0xaa4d, 0xaa50, 0xaa59, + 0xaa60, 0xaa76, + 0xaa7a, 0xaa7b, + 0xaa80, 0xaac2, + 0xaadb, 0xaadd, + 0xabc0, 0xabea, + 0xabec, 0xabed, + 0xabf0, 0xabf9, 0xac00, 0xac00, 0xd7a3, 0xd7a3, + 0xd7b0, 0xd7c6, + 0xd7cb, 0xd7fb, 0xf900, 0xfa2d, - 0xfa30, 0xfa6a, + 0xfa30, 0xfa6d, 0xfa70, 0xfad9, 0xfb00, 0xfb06, 0xfb13, 0xfb17, @@ -3236,7 +3398,7 @@ 0x1080a, 0x10835, 0x10837, 0x10838, 0x1083c, 0x1083c, - 0x1083f, 0x1083f, + 0x1083f, 0x10855, 0x10900, 0x10915, 0x10920, 0x10939, 0x10a00, 0x10a03, @@ -3246,7 +3408,14 @@ 0x10a19, 0x10a33, 0x10a38, 0x10a3a, 0x10a3f, 0x10a3f, + 0x10a60, 0x10a7c, + 0x10b00, 0x10b35, + 0x10b40, 0x10b55, + 0x10b60, 0x10b72, + 0x10c00, 0x10c48, + 0x11080, 0x110ba, 0x12000, 0x1236e, + 0x13000, 0x1342e, 0x1d165, 0x1d169, 0x1d16d, 0x1d172, 0x1d17b, 0x1d182, @@ -3286,13 +3455,15 @@ 0x1d7ce, 0x1d7ff, 0x20000, 0x20000, 0x2a6d6, 0x2a6d6, + 0x2a700, 0x2a700, + 0x2b734, 0x2b734, 0x2f800, 0x2fa1d, 0xe0100, 0xe01ef, }; /* CR_Word */ /* 'Alnum': [[:Alnum:]] */ static const OnigCodePoint CR_Alnum[] = { - 471, + 502, 0x0030, 0x0039, 0x0041, 0x005a, 0x0061, 0x007a, @@ -3315,7 +3486,7 @@ 0x038e, 0x03a1, 0x03a3, 0x03f5, 0x03f7, 0x0481, - 0x0483, 0x0523, + 0x0483, 0x0525, 0x0531, 0x0556, 0x0559, 0x0559, 0x0561, 0x0587, @@ -3338,13 +3509,14 @@ 0x074d, 0x07b1, 0x07c0, 0x07f5, 0x07fa, 0x07fa, - 0x0901, 0x0939, - 0x093c, 0x094d, - 0x0950, 0x0954, + 0x0800, 0x082d, + 0x0900, 0x0939, + 0x093c, 0x094e, + 0x0950, 0x0955, 0x0958, 0x0963, 0x0966, 0x096f, 0x0971, 0x0972, - 0x097b, 0x097f, + 0x0979, 0x097f, 0x0981, 0x0983, 0x0985, 0x098c, 0x098f, 0x0990, @@ -3503,14 +3675,11 @@ 0x0f99, 0x0fbc, 0x0fc6, 0x0fc6, 0x1000, 0x1049, - 0x1050, 0x1099, + 0x1050, 0x109d, 0x10a0, 0x10c5, 0x10d0, 0x10fa, 0x10fc, 0x10fc, - 0x1100, 0x1159, - 0x115f, 0x11a2, - 0x11a8, 0x11f9, - 0x1200, 0x1248, + 0x1100, 0x1248, 0x124a, 0x124d, 0x1250, 0x1256, 0x1258, 0x1258, @@ -3530,7 +3699,7 @@ 0x1380, 0x138f, 0x13a0, 0x13f4, 0x1401, 0x166c, - 0x166f, 0x1676, + 0x166f, 0x167f, 0x1681, 0x169a, 0x16a0, 0x16ea, 0x1700, 0x170c, @@ -3549,15 +3718,21 @@ 0x1810, 0x1819, 0x1820, 0x1877, 0x1880, 0x18aa, + 0x18b0, 0x18f5, 0x1900, 0x191c, 0x1920, 0x192b, 0x1930, 0x193b, 0x1946, 0x196d, 0x1970, 0x1974, - 0x1980, 0x19a9, + 0x1980, 0x19ab, 0x19b0, 0x19c9, - 0x19d0, 0x19d9, + 0x19d0, 0x19da, 0x1a00, 0x1a1b, + 0x1a20, 0x1a5e, + 0x1a60, 0x1a7c, + 0x1a7f, 0x1a89, + 0x1a90, 0x1a99, + 0x1aa7, 0x1aa7, 0x1b00, 0x1b4b, 0x1b50, 0x1b59, 0x1b6b, 0x1b73, @@ -3566,8 +3741,10 @@ 0x1c00, 0x1c37, 0x1c40, 0x1c49, 0x1c4d, 0x1c7d, + 0x1cd0, 0x1cd2, + 0x1cd4, 0x1cf2, 0x1d00, 0x1de6, - 0x1dfe, 0x1f15, + 0x1dfd, 0x1f15, 0x1f18, 0x1f1d, 0x1f20, 0x1f45, 0x1f48, 0x1f4d, @@ -3606,9 +3783,8 @@ 0x2183, 0x2184, 0x2c00, 0x2c2e, 0x2c30, 0x2c5e, - 0x2c60, 0x2c6f, - 0x2c71, 0x2c7d, - 0x2c80, 0x2ce4, + 0x2c60, 0x2ce4, + 0x2ceb, 0x2cf1, 0x2d00, 0x2d25, 0x2d30, 0x2d65, 0x2d6f, 0x2d6f, @@ -3639,14 +3815,17 @@ 0x3400, 0x3400, 0x4db5, 0x4db5, 0x4e00, 0x4e00, - 0x9fc3, 0x9fc3, + 0x9fcb, 0x9fcb, 0xa000, 0xa48c, + 0xa4d0, 0xa4fd, 0xa500, 0xa60c, 0xa610, 0xa62b, 0xa640, 0xa65f, 0xa662, 0xa672, 0xa67c, 0xa67d, 0xa67f, 0xa697, + 0xa6a0, 0xa6e5, + 0xa6f0, 0xa6f1, 0xa717, 0xa71f, 0xa722, 0xa788, 0xa78b, 0xa78c, @@ -3654,15 +3833,29 @@ 0xa840, 0xa873, 0xa880, 0xa8c4, 0xa8d0, 0xa8d9, + 0xa8e0, 0xa8f7, + 0xa8fb, 0xa8fb, 0xa900, 0xa92d, 0xa930, 0xa953, + 0xa960, 0xa97c, + 0xa980, 0xa9c0, + 0xa9cf, 0xa9d9, 0xaa00, 0xaa36, 0xaa40, 0xaa4d, 0xaa50, 0xaa59, + 0xaa60, 0xaa76, + 0xaa7a, 0xaa7b, + 0xaa80, 0xaac2, + 0xaadb, 0xaadd, + 0xabc0, 0xabea, + 0xabec, 0xabed, + 0xabf0, 0xabf9, 0xac00, 0xac00, 0xd7a3, 0xd7a3, + 0xd7b0, 0xd7c6, + 0xd7cb, 0xd7fb, 0xf900, 0xfa2d, - 0xfa30, 0xfa6a, + 0xfa30, 0xfa6d, 0xfa70, 0xfad9, 0xfb00, 0xfb06, 0xfb13, 0xfb17, @@ -3712,7 +3905,7 @@ 0x1080a, 0x10835, 0x10837, 0x10838, 0x1083c, 0x1083c, - 0x1083f, 0x1083f, + 0x1083f, 0x10855, 0x10900, 0x10915, 0x10920, 0x10939, 0x10a00, 0x10a03, @@ -3722,7 +3915,14 @@ 0x10a19, 0x10a33, 0x10a38, 0x10a3a, 0x10a3f, 0x10a3f, + 0x10a60, 0x10a7c, + 0x10b00, 0x10b35, + 0x10b40, 0x10b55, + 0x10b60, 0x10b72, + 0x10c00, 0x10c48, + 0x11080, 0x110ba, 0x12000, 0x1236e, + 0x13000, 0x1342e, 0x1d165, 0x1d169, 0x1d16d, 0x1d172, 0x1d17b, 0x1d182, @@ -3762,6 +3962,8 @@ 0x1d7ce, 0x1d7ff, 0x20000, 0x20000, 0x2a6d6, 0x2a6d6, + 0x2a700, 0x2a700, + 0x2b734, 0x2b734, 0x2f800, 0x2fa1d, 0xe0100, 0xe01ef, }; /* CR_Alnum */ @@ -3782,13 +3984,13 @@ /* 'Assigned': - */ static const OnigCodePoint CR_Assigned[] = { - 454, + 495, 0x0000, 0x0377, 0x037a, 0x037e, 0x0384, 0x038a, 0x038c, 0x038c, 0x038e, 0x03a1, - 0x03a3, 0x0523, + 0x03a3, 0x0525, 0x0531, 0x0556, 0x0559, 0x055f, 0x0561, 0x0587, @@ -3804,11 +4006,13 @@ 0x070f, 0x074a, 0x074d, 0x07b1, 0x07c0, 0x07fa, - 0x0901, 0x0939, - 0x093c, 0x094d, - 0x0950, 0x0954, + 0x0800, 0x082d, + 0x0830, 0x083e, + 0x0900, 0x0939, + 0x093c, 0x094e, + 0x0950, 0x0955, 0x0958, 0x0972, - 0x097b, 0x097f, + 0x0979, 0x097f, 0x0981, 0x0983, 0x0985, 0x098c, 0x098f, 0x0990, @@ -3822,7 +4026,7 @@ 0x09d7, 0x09d7, 0x09dc, 0x09dd, 0x09df, 0x09e3, - 0x09e6, 0x09fa, + 0x09e6, 0x09fb, 0x0a01, 0x0a03, 0x0a05, 0x0a0a, 0x0a0f, 0x0a10, @@ -3960,14 +4164,10 @@ 0x0f90, 0x0f97, 0x0f99, 0x0fbc, 0x0fbe, 0x0fcc, - 0x0fce, 0x0fd4, - 0x1000, 0x1099, - 0x109e, 0x10c5, + 0x0fce, 0x0fd8, + 0x1000, 0x10c5, 0x10d0, 0x10fc, - 0x1100, 0x1159, - 0x115f, 0x11a2, - 0x11a8, 0x11f9, - 0x1200, 0x1248, + 0x1100, 0x1248, 0x124a, 0x124d, 0x1250, 0x1256, 0x1258, 0x1258, @@ -3986,8 +4186,7 @@ 0x135f, 0x137c, 0x1380, 0x1399, 0x13a0, 0x13f4, - 0x1401, 0x1676, - 0x1680, 0x169c, + 0x1400, 0x169c, 0x16a0, 0x16f0, 0x1700, 0x170c, 0x170e, 0x1714, @@ -4003,17 +4202,22 @@ 0x1810, 0x1819, 0x1820, 0x1877, 0x1880, 0x18aa, + 0x18b0, 0x18f5, 0x1900, 0x191c, 0x1920, 0x192b, 0x1930, 0x193b, 0x1940, 0x1940, 0x1944, 0x196d, 0x1970, 0x1974, - 0x1980, 0x19a9, + 0x1980, 0x19ab, 0x19b0, 0x19c9, - 0x19d0, 0x19d9, + 0x19d0, 0x19da, 0x19de, 0x1a1b, - 0x1a1e, 0x1a1f, + 0x1a1e, 0x1a5e, + 0x1a60, 0x1a7c, + 0x1a7f, 0x1a89, + 0x1a90, 0x1a99, + 0x1aa0, 0x1aad, 0x1b00, 0x1b4b, 0x1b50, 0x1b7c, 0x1b80, 0x1baa, @@ -4021,8 +4225,9 @@ 0x1c00, 0x1c37, 0x1c3b, 0x1c49, 0x1c4d, 0x1c7f, + 0x1cd0, 0x1cf2, 0x1d00, 0x1de6, - 0x1dfe, 0x1f15, + 0x1dfd, 0x1f15, 0x1f18, 0x1f1d, 0x1f20, 0x1f45, 0x1f48, 0x1f4d, @@ -4042,36 +4247,33 @@ 0x206a, 0x2071, 0x2074, 0x208e, 0x2090, 0x2094, - 0x20a0, 0x20b5, + 0x20a0, 0x20b8, 0x20d0, 0x20f0, - 0x2100, 0x214f, - 0x2153, 0x2188, - 0x2190, 0x23e7, + 0x2100, 0x2189, + 0x2190, 0x23e8, 0x2400, 0x2426, 0x2440, 0x244a, - 0x2460, 0x269d, - 0x26a0, 0x26bc, - 0x26c0, 0x26c3, + 0x2460, 0x26cd, + 0x26cf, 0x26e1, + 0x26e3, 0x26e3, + 0x26e8, 0x26ff, 0x2701, 0x2704, 0x2706, 0x2709, 0x270c, 0x2727, 0x2729, 0x274b, 0x274d, 0x274d, 0x274f, 0x2752, - 0x2756, 0x2756, - 0x2758, 0x275e, + 0x2756, 0x275e, 0x2761, 0x2794, 0x2798, 0x27af, 0x27b1, 0x27be, 0x27c0, 0x27ca, 0x27cc, 0x27cc, 0x27d0, 0x2b4c, - 0x2b50, 0x2b54, + 0x2b50, 0x2b59, 0x2c00, 0x2c2e, 0x2c30, 0x2c5e, - 0x2c60, 0x2c6f, - 0x2c71, 0x2c7d, - 0x2c80, 0x2cea, + 0x2c60, 0x2cf1, 0x2cf9, 0x2d25, 0x2d30, 0x2d65, 0x2d6f, 0x2d6f, @@ -4084,7 +4286,7 @@ 0x2dc8, 0x2dce, 0x2dd0, 0x2dd6, 0x2dd8, 0x2dde, - 0x2de0, 0x2e30, + 0x2de0, 0x2e31, 0x2e80, 0x2e99, 0x2e9b, 0x2ef3, 0x2f00, 0x2fd5, @@ -4097,37 +4299,48 @@ 0x3190, 0x31b7, 0x31c0, 0x31e3, 0x31f0, 0x321e, - 0x3220, 0x3243, - 0x3250, 0x32fe, + 0x3220, 0x32fe, 0x3300, 0x3400, 0x4db5, 0x4db5, 0x4dc0, 0x4e00, - 0x9fc3, 0x9fc3, + 0x9fcb, 0x9fcb, 0xa000, 0xa48c, 0xa490, 0xa4c6, - 0xa500, 0xa62b, + 0xa4d0, 0xa62b, 0xa640, 0xa65f, 0xa662, 0xa673, 0xa67c, 0xa697, + 0xa6a0, 0xa6f7, 0xa700, 0xa78c, 0xa7fb, 0xa82b, + 0xa830, 0xa839, 0xa840, 0xa877, 0xa880, 0xa8c4, 0xa8ce, 0xa8d9, + 0xa8e0, 0xa8fb, 0xa900, 0xa953, - 0xa95f, 0xa95f, + 0xa95f, 0xa97c, + 0xa980, 0xa9cd, + 0xa9cf, 0xa9d9, + 0xa9de, 0xa9df, 0xaa00, 0xaa36, 0xaa40, 0xaa4d, 0xaa50, 0xaa59, - 0xaa5c, 0xaa5f, + 0xaa5c, 0xaa7b, + 0xaa80, 0xaac2, + 0xaadb, 0xaadf, + 0xabc0, 0xabed, + 0xabf0, 0xabf9, 0xac00, 0xac00, 0xd7a3, 0xd7a3, + 0xd7b0, 0xd7c6, + 0xd7cb, 0xd7fb, 0xd800, 0xd800, 0xdb7f, 0xdb80, 0xdbff, 0xdc00, 0xdfff, 0xe000, 0xf8ff, 0xfa2d, - 0xfa30, 0xfa6a, + 0xfa30, 0xfa6d, 0xfa70, 0xfad9, 0xfb00, 0xfb06, 0xfb13, 0xfb17, @@ -4184,8 +4397,9 @@ 0x1080a, 0x10835, 0x10837, 0x10838, 0x1083c, 0x1083c, - 0x1083f, 0x1083f, - 0x10900, 0x10919, + 0x1083f, 0x10855, + 0x10857, 0x1085f, + 0x10900, 0x1091b, 0x1091f, 0x10939, 0x1093f, 0x1093f, 0x10a00, 0x10a03, @@ -4196,9 +4410,18 @@ 0x10a38, 0x10a3a, 0x10a3f, 0x10a47, 0x10a50, 0x10a58, + 0x10a60, 0x10a7f, + 0x10b00, 0x10b35, + 0x10b39, 0x10b55, + 0x10b58, 0x10b72, + 0x10b78, 0x10b7f, + 0x10c00, 0x10c48, + 0x10e60, 0x10e7e, + 0x11080, 0x110c1, 0x12000, 0x1236e, 0x12400, 0x12462, 0x12470, 0x12473, + 0x13000, 0x1342e, 0x1d000, 0x1d0f5, 0x1d100, 0x1d126, 0x1d129, 0x1d1dd, @@ -4228,8 +4451,28 @@ 0x1d7ce, 0x1d7ff, 0x1f000, 0x1f02b, 0x1f030, 0x1f093, + 0x1f100, 0x1f10a, + 0x1f110, 0x1f12e, + 0x1f131, 0x1f131, + 0x1f13d, 0x1f13d, + 0x1f13f, 0x1f13f, + 0x1f142, 0x1f142, + 0x1f146, 0x1f146, + 0x1f14a, 0x1f14e, + 0x1f157, 0x1f157, + 0x1f15f, 0x1f15f, + 0x1f179, 0x1f179, + 0x1f17b, 0x1f17c, + 0x1f17f, 0x1f17f, + 0x1f18a, 0x1f18d, + 0x1f190, 0x1f190, + 0x1f200, 0x1f200, + 0x1f210, 0x1f231, + 0x1f240, 0x1f248, 0x20000, 0x20000, 0x2a6d6, 0x2a6d6, + 0x2a700, 0x2a700, + 0x2b734, 0x2b734, 0x2f800, 0x2fa1d, 0xe0001, 0xe0001, 0xe0020, 0xe007f, @@ -4241,7 +4484,7 @@ /* 'C': Major Category */ static const OnigCodePoint CR_C[] = { - 25, + 26, 0x0000, 0x001f, 0x007f, 0x009f, 0x00ad, 0x00ad, @@ -4260,6 +4503,7 @@ 0xf8ff, 0xf8ff, 0xfeff, 0xfeff, 0xfff9, 0xfffb, + 0x110bd, 0x110bd, 0x1d173, 0x1d17a, 0xe0001, 0xe0001, 0xe0020, 0xe007f, @@ -4278,7 +4522,7 @@ /* 'Cf': General Category */ static const OnigCodePoint CR_Cf[] = { - 14, + 15, 0x00ad, 0x00ad, 0x0600, 0x0603, 0x06dd, 0x06dd, @@ -4290,6 +4534,7 @@ 0x206a, 0x206f, 0xfeff, 0xfeff, 0xfff9, 0xfffb, + 0x110bd, 0x110bd, 0x1d173, 0x1d17a, 0xe0001, 0xe0001, 0xe0020, 0xe007f, @@ -4297,13 +4542,13 @@ /* 'Cn': General Category */ static const OnigCodePoint CR_Cn[] = { - 454, + 495, 0x0378, 0x0379, 0x037f, 0x0383, 0x038b, 0x038b, 0x038d, 0x038d, 0x03a2, 0x03a2, - 0x0524, 0x0530, + 0x0526, 0x0530, 0x0557, 0x0558, 0x0560, 0x0560, 0x0588, 0x0588, @@ -4318,11 +4563,13 @@ 0x070e, 0x070e, 0x074b, 0x074c, 0x07b2, 0x07bf, - 0x07fb, 0x0900, + 0x07fb, 0x07ff, + 0x082e, 0x082f, + 0x083f, 0x08ff, 0x093a, 0x093b, - 0x094e, 0x094f, - 0x0955, 0x0957, - 0x0973, 0x097a, + 0x094f, 0x094f, + 0x0956, 0x0957, + 0x0973, 0x0978, 0x0980, 0x0980, 0x0984, 0x0984, 0x098d, 0x098e, @@ -4337,7 +4584,7 @@ 0x09d8, 0x09db, 0x09de, 0x09de, 0x09e4, 0x09e5, - 0x09fb, 0x0a00, + 0x09fc, 0x0a00, 0x0a04, 0x0a04, 0x0a0b, 0x0a0e, 0x0a11, 0x0a12, @@ -4475,13 +4722,9 @@ 0x0f98, 0x0f98, 0x0fbd, 0x0fbd, 0x0fcd, 0x0fcd, - 0x0fd5, 0x0fff, - 0x109a, 0x109d, + 0x0fd9, 0x0fff, 0x10c6, 0x10cf, 0x10fd, 0x10ff, - 0x115a, 0x115e, - 0x11a3, 0x11a7, - 0x11fa, 0x11ff, 0x1249, 0x1249, 0x124e, 0x124f, 0x1257, 0x1257, @@ -4500,8 +4743,7 @@ 0x135b, 0x135e, 0x137d, 0x137f, 0x139a, 0x139f, - 0x13f5, 0x1400, - 0x1677, 0x167f, + 0x13f5, 0x13ff, 0x169d, 0x169f, 0x16f1, 0x16ff, 0x170d, 0x170d, @@ -4517,26 +4759,32 @@ 0x180f, 0x180f, 0x181a, 0x181f, 0x1878, 0x187f, - 0x18ab, 0x18ff, + 0x18ab, 0x18af, + 0x18f6, 0x18ff, 0x191d, 0x191f, 0x192c, 0x192f, 0x193c, 0x193f, 0x1941, 0x1943, 0x196e, 0x196f, 0x1975, 0x197f, - 0x19aa, 0x19af, + 0x19ac, 0x19af, 0x19ca, 0x19cf, - 0x19da, 0x19dd, + 0x19db, 0x19dd, 0x1a1c, 0x1a1d, - 0x1a20, 0x1aff, + 0x1a5f, 0x1a5f, + 0x1a7d, 0x1a7e, + 0x1a8a, 0x1a8f, + 0x1a9a, 0x1a9f, + 0x1aae, 0x1aff, 0x1b4c, 0x1b4f, 0x1b7d, 0x1b7f, 0x1bab, 0x1bad, 0x1bba, 0x1bff, 0x1c38, 0x1c3a, 0x1c4a, 0x1c4c, - 0x1c80, 0x1cff, - 0x1de7, 0x1dfd, + 0x1c80, 0x1ccf, + 0x1cf3, 0x1cff, + 0x1de7, 0x1dfc, 0x1f16, 0x1f17, 0x1f1e, 0x1f1f, 0x1f46, 0x1f47, @@ -4557,23 +4805,22 @@ 0x2072, 0x2073, 0x208f, 0x208f, 0x2095, 0x209f, - 0x20b6, 0x20cf, + 0x20b9, 0x20cf, 0x20f1, 0x20ff, - 0x2150, 0x2152, - 0x2189, 0x218f, - 0x23e8, 0x23ff, + 0x218a, 0x218f, + 0x23e9, 0x23ff, 0x2427, 0x243f, 0x244b, 0x245f, - 0x269e, 0x269f, - 0x26bd, 0x26bf, - 0x26c4, 0x2700, + 0x26ce, 0x26ce, + 0x26e2, 0x26e2, + 0x26e4, 0x26e7, + 0x2700, 0x2700, 0x2705, 0x2705, 0x270a, 0x270b, 0x2728, 0x2728, 0x274c, 0x274c, 0x274e, 0x274e, 0x2753, 0x2755, - 0x2757, 0x2757, 0x275f, 0x2760, 0x2795, 0x2797, 0x27b0, 0x27b0, @@ -4581,12 +4828,10 @@ 0x27cb, 0x27cb, 0x27cd, 0x27cf, 0x2b4d, 0x2b4f, - 0x2b55, 0x2bff, + 0x2b5a, 0x2bff, 0x2c2f, 0x2c2f, 0x2c5f, 0x2c5f, - 0x2c70, 0x2c70, - 0x2c7e, 0x2c7f, - 0x2ceb, 0x2cf8, + 0x2cf2, 0x2cf8, 0x2d26, 0x2d2f, 0x2d66, 0x2d6e, 0x2d70, 0x2d7f, @@ -4599,7 +4844,7 @@ 0x2dcf, 0x2dcf, 0x2dd7, 0x2dd7, 0x2ddf, 0x2ddf, - 0x2e31, 0x2e7f, + 0x2e32, 0x2e7f, 0x2e9a, 0x2e9a, 0x2ef4, 0x2eff, 0x2fd6, 0x2fef, @@ -4612,37 +4857,48 @@ 0x31b8, 0x31bf, 0x31e4, 0x31ef, 0x321f, 0x321f, - 0x3244, 0x324f, 0x32ff, 0x32ff, 0x3401, 0x4db4, 0x4db6, 0x4dbf, - 0x4e01, 0x9fc2, - 0x9fc4, 0x9fff, + 0x4e01, 0x9fca, + 0x9fcc, 0x9fff, 0xa48d, 0xa48f, - 0xa4c7, 0xa4ff, + 0xa4c7, 0xa4cf, 0xa62c, 0xa63f, 0xa660, 0xa661, 0xa674, 0xa67b, - 0xa698, 0xa6ff, + 0xa698, 0xa69f, + 0xa6f8, 0xa6ff, 0xa78d, 0xa7fa, - 0xa82c, 0xa83f, + 0xa82c, 0xa82f, + 0xa83a, 0xa83f, 0xa878, 0xa87f, 0xa8c5, 0xa8cd, - 0xa8da, 0xa8ff, + 0xa8da, 0xa8df, + 0xa8fc, 0xa8ff, 0xa954, 0xa95e, - 0xa960, 0xa9ff, + 0xa97d, 0xa97f, + 0xa9ce, 0xa9ce, + 0xa9da, 0xa9dd, + 0xa9e0, 0xa9ff, 0xaa37, 0xaa3f, 0xaa4e, 0xaa4f, 0xaa5a, 0xaa5b, - 0xaa60, 0xabff, + 0xaa7c, 0xaa7f, + 0xaac3, 0xaada, + 0xaae0, 0xabbf, + 0xabee, 0xabef, + 0xabfa, 0xabff, 0xac01, 0xd7a2, - 0xd7a4, 0xd7ff, + 0xd7a4, 0xd7af, + 0xd7c7, 0xd7ca, + 0xd7fc, 0xd7ff, 0xd801, 0xdb7e, 0xdb81, 0xdbfe, 0xdc01, 0xdffe, 0xe001, 0xf8fe, 0xfa2e, 0xfa2f, - 0xfa6b, 0xfa6f, + 0xfa6e, 0xfa6f, 0xfada, 0xfaff, 0xfb07, 0xfb12, 0xfb18, 0xfb1c, @@ -4699,8 +4955,9 @@ 0x10836, 0x10836, 0x10839, 0x1083b, 0x1083d, 0x1083e, - 0x10840, 0x108ff, - 0x1091a, 0x1091e, + 0x10856, 0x10856, + 0x10860, 0x108ff, + 0x1091c, 0x1091e, 0x1093a, 0x1093e, 0x10940, 0x109ff, 0x10a04, 0x10a04, @@ -4710,10 +4967,19 @@ 0x10a34, 0x10a37, 0x10a3b, 0x10a3e, 0x10a48, 0x10a4f, - 0x10a59, 0x11fff, + 0x10a59, 0x10a5f, + 0x10a80, 0x10aff, + 0x10b36, 0x10b38, + 0x10b56, 0x10b57, + 0x10b73, 0x10b77, + 0x10b80, 0x10bff, + 0x10c49, 0x10e5f, + 0x10e7f, 0x1107f, + 0x110c2, 0x11fff, 0x1236f, 0x123ff, 0x12463, 0x1246f, - 0x12474, 0x1cfff, + 0x12474, 0x12fff, + 0x1342f, 0x1cfff, 0x1d0f6, 0x1d0ff, 0x1d127, 0x1d128, 0x1d1de, 0x1d1ff, @@ -4742,9 +5008,29 @@ 0x1d7cc, 0x1d7cd, 0x1d800, 0x1efff, 0x1f02c, 0x1f02f, - 0x1f094, 0x1ffff, + 0x1f094, 0x1f0ff, + 0x1f10b, 0x1f10f, + 0x1f12f, 0x1f130, + 0x1f132, 0x1f13c, + 0x1f13e, 0x1f13e, + 0x1f140, 0x1f141, + 0x1f143, 0x1f145, + 0x1f147, 0x1f149, + 0x1f14f, 0x1f156, + 0x1f158, 0x1f15e, + 0x1f160, 0x1f178, + 0x1f17a, 0x1f17a, + 0x1f17d, 0x1f17e, + 0x1f180, 0x1f189, + 0x1f18e, 0x1f18f, + 0x1f191, 0x1f1ff, + 0x1f201, 0x1f20f, + 0x1f232, 0x1f23f, + 0x1f249, 0x1ffff, 0x20001, 0x2a6d5, - 0x2a6d7, 0x2f7ff, + 0x2a6d7, 0x2a6ff, + 0x2a701, 0x2b733, + 0x2b735, 0x2f7ff, 0x2fa1e, 0xe0000, 0xe0002, 0xe001f, 0xe0080, 0xe00ff, @@ -4776,7 +5062,7 @@ /* 'L': Major Category */ static const OnigCodePoint CR_L[] = { - 394, + 427, 0x0041, 0x005a, 0x0061, 0x007a, 0x00aa, 0x00aa, @@ -4798,7 +5084,7 @@ 0x038e, 0x03a1, 0x03a3, 0x03f5, 0x03f7, 0x0481, - 0x048a, 0x0523, + 0x048a, 0x0525, 0x0531, 0x0556, 0x0559, 0x0559, 0x0561, 0x0587, @@ -4819,12 +5105,16 @@ 0x07ca, 0x07ea, 0x07f4, 0x07f5, 0x07fa, 0x07fa, + 0x0800, 0x0815, + 0x081a, 0x081a, + 0x0824, 0x0824, + 0x0828, 0x0828, 0x0904, 0x0939, 0x093d, 0x093d, 0x0950, 0x0950, 0x0958, 0x0961, 0x0971, 0x0972, - 0x097b, 0x097f, + 0x0979, 0x097f, 0x0985, 0x098c, 0x098f, 0x0990, 0x0993, 0x09a8, @@ -4940,10 +5230,7 @@ 0x10a0, 0x10c5, 0x10d0, 0x10fa, 0x10fc, 0x10fc, - 0x1100, 0x1159, - 0x115f, 0x11a2, - 0x11a8, 0x11f9, - 0x1200, 0x1248, + 0x1100, 0x1248, 0x124a, 0x124d, 0x1250, 0x1256, 0x1258, 0x1258, @@ -4962,7 +5249,7 @@ 0x1380, 0x138f, 0x13a0, 0x13f4, 0x1401, 0x166c, - 0x166f, 0x1676, + 0x166f, 0x167f, 0x1681, 0x169a, 0x16a0, 0x16ea, 0x1700, 0x170c, @@ -4977,12 +5264,15 @@ 0x1820, 0x1877, 0x1880, 0x18a8, 0x18aa, 0x18aa, + 0x18b0, 0x18f5, 0x1900, 0x191c, 0x1950, 0x196d, 0x1970, 0x1974, - 0x1980, 0x19a9, + 0x1980, 0x19ab, 0x19c1, 0x19c7, 0x1a00, 0x1a16, + 0x1a20, 0x1a54, + 0x1aa7, 0x1aa7, 0x1b05, 0x1b33, 0x1b45, 0x1b4b, 0x1b83, 0x1ba0, @@ -4990,6 +5280,8 @@ 0x1c00, 0x1c23, 0x1c4d, 0x1c4f, 0x1c5a, 0x1c7d, + 0x1ce9, 0x1cec, + 0x1cee, 0x1cf1, 0x1d00, 0x1dbf, 0x1e00, 0x1f15, 0x1f18, 0x1f1d, @@ -5029,9 +5321,8 @@ 0x2183, 0x2184, 0x2c00, 0x2c2e, 0x2c30, 0x2c5e, - 0x2c60, 0x2c6f, - 0x2c71, 0x2c7d, - 0x2c80, 0x2ce4, + 0x2c60, 0x2ce4, + 0x2ceb, 0x2cee, 0x2d00, 0x2d25, 0x2d30, 0x2d65, 0x2d6f, 0x2d6f, @@ -5059,14 +5350,16 @@ 0x3400, 0x3400, 0x4db5, 0x4db5, 0x4e00, 0x4e00, - 0x9fc3, 0x9fc3, + 0x9fcb, 0x9fcb, 0xa000, 0xa48c, + 0xa4d0, 0xa4fd, 0xa500, 0xa60c, 0xa610, 0xa61f, 0xa62a, 0xa62b, 0xa640, 0xa65f, 0xa662, 0xa66e, 0xa67f, 0xa697, + 0xa6a0, 0xa6e5, 0xa717, 0xa71f, 0xa722, 0xa788, 0xa78b, 0xa78c, @@ -5076,15 +5369,32 @@ 0xa80c, 0xa822, 0xa840, 0xa873, 0xa882, 0xa8b3, + 0xa8f2, 0xa8f7, + 0xa8fb, 0xa8fb, 0xa90a, 0xa925, 0xa930, 0xa946, + 0xa960, 0xa97c, + 0xa984, 0xa9b2, + 0xa9cf, 0xa9cf, 0xaa00, 0xaa28, 0xaa40, 0xaa42, 0xaa44, 0xaa4b, + 0xaa60, 0xaa76, + 0xaa7a, 0xaa7a, + 0xaa80, 0xaaaf, + 0xaab1, 0xaab1, + 0xaab5, 0xaab6, + 0xaab9, 0xaabd, + 0xaac0, 0xaac0, + 0xaac2, 0xaac2, + 0xaadb, 0xaadd, + 0xabc0, 0xabe2, 0xac00, 0xac00, 0xd7a3, 0xd7a3, + 0xd7b0, 0xd7c6, + 0xd7cb, 0xd7fb, 0xf900, 0xfa2d, - 0xfa30, 0xfa6a, + 0xfa30, 0xfa6d, 0xfa70, 0xfad9, 0xfb00, 0xfb06, 0xfb13, 0xfb17, @@ -5130,14 +5440,21 @@ 0x1080a, 0x10835, 0x10837, 0x10838, 0x1083c, 0x1083c, - 0x1083f, 0x1083f, + 0x1083f, 0x10855, 0x10900, 0x10915, 0x10920, 0x10939, 0x10a00, 0x10a00, 0x10a10, 0x10a13, 0x10a15, 0x10a17, 0x10a19, 0x10a33, + 0x10a60, 0x10a7c, + 0x10b00, 0x10b35, + 0x10b40, 0x10b55, + 0x10b60, 0x10b72, + 0x10c00, 0x10c48, + 0x11083, 0x110af, 0x12000, 0x1236e, + 0x13000, 0x1342e, 0x1d400, 0x1d454, 0x1d456, 0x1d49c, 0x1d49e, 0x1d49f, @@ -5170,12 +5487,14 @@ 0x1d7c4, 0x1d7cb, 0x20000, 0x20000, 0x2a6d6, 0x2a6d6, + 0x2a700, 0x2a700, + 0x2b734, 0x2b734, 0x2f800, 0x2fa1d, }; /* CR_L */ /* 'Ll': General Category */ static const OnigCodePoint CR_Ll[] = { - 598, + 599, 0x0061, 0x007a, 0x00aa, 0x00aa, 0x00b5, 0x00b5, @@ -5441,6 +5760,7 @@ 0x051f, 0x051f, 0x0521, 0x0521, 0x0523, 0x0523, + 0x0525, 0x0525, 0x0561, 0x0587, 0x1d00, 0x1d2b, 0x1d62, 0x1d77, @@ -5589,8 +5909,6 @@ 0x1fe0, 0x1fe7, 0x1ff2, 0x1ff4, 0x1ff6, 0x1ff7, - 0x2071, 0x2071, - 0x207f, 0x207f, 0x210a, 0x210a, 0x210e, 0x210f, 0x2113, 0x2113, @@ -5660,6 +5978,8 @@ 0x2cdf, 0x2cdf, 0x2ce1, 0x2ce1, 0x2ce3, 0x2ce4, + 0x2cec, 0x2cec, + 0x2cee, 0x2cee, 0x2d00, 0x2d25, 0xa641, 0xa641, 0xa643, 0xa643, @@ -5778,7 +6098,7 @@ /* 'Lm': General Category */ static const OnigCodePoint CR_Lm[] = { - 39, + 49, 0x02b0, 0x02c1, 0x02c6, 0x02d1, 0x02e0, 0x02e4, @@ -5791,16 +6111,22 @@ 0x06e5, 0x06e6, 0x07f4, 0x07f5, 0x07fa, 0x07fa, + 0x081a, 0x081a, + 0x0824, 0x0824, + 0x0828, 0x0828, 0x0971, 0x0971, 0x0e46, 0x0e46, 0x0ec6, 0x0ec6, 0x10fc, 0x10fc, 0x17d7, 0x17d7, 0x1843, 0x1843, + 0x1aa7, 0x1aa7, 0x1c78, 0x1c7d, 0x1d2c, 0x1d61, 0x1d78, 0x1d78, 0x1d9b, 0x1dbf, + 0x2071, 0x2071, + 0x207f, 0x207f, 0x2090, 0x2094, 0x2c7d, 0x2c7d, 0x2d6f, 0x2d6f, @@ -5811,18 +6137,22 @@ 0x309d, 0x309e, 0x30fc, 0x30fe, 0xa015, 0xa015, + 0xa4f8, 0xa4fd, 0xa60c, 0xa60c, 0xa67f, 0xa67f, 0xa717, 0xa71f, 0xa770, 0xa770, 0xa788, 0xa788, + 0xa9cf, 0xa9cf, + 0xaa70, 0xaa70, + 0xaadd, 0xaadd, 0xff70, 0xff70, 0xff9e, 0xff9f, }; /* CR_Lm */ /* 'Lo': General Category */ static const OnigCodePoint CR_Lo[] = { - 286, + 316, 0x01bb, 0x01bb, 0x01c0, 0x01c3, 0x0294, 0x0294, @@ -5841,12 +6171,13 @@ 0x074d, 0x07a5, 0x07b1, 0x07b1, 0x07ca, 0x07ea, + 0x0800, 0x0815, 0x0904, 0x0939, 0x093d, 0x093d, 0x0950, 0x0950, 0x0958, 0x0961, 0x0972, 0x0972, - 0x097b, 0x097f, + 0x0979, 0x097f, 0x0985, 0x098c, 0x098f, 0x0990, 0x0993, 0x09a8, @@ -5959,10 +6290,7 @@ 0x1075, 0x1081, 0x108e, 0x108e, 0x10d0, 0x10fa, - 0x1100, 0x1159, - 0x115f, 0x11a2, - 0x11a8, 0x11f9, - 0x1200, 0x1248, + 0x1100, 0x1248, 0x124a, 0x124d, 0x1250, 0x1256, 0x1258, 0x1258, @@ -5981,7 +6309,7 @@ 0x1380, 0x138f, 0x13a0, 0x13f4, 0x1401, 0x166c, - 0x166f, 0x1676, + 0x166f, 0x167f, 0x1681, 0x169a, 0x16a0, 0x16ea, 0x1700, 0x170c, @@ -5996,12 +6324,14 @@ 0x1844, 0x1877, 0x1880, 0x18a8, 0x18aa, 0x18aa, + 0x18b0, 0x18f5, 0x1900, 0x191c, 0x1950, 0x196d, 0x1970, 0x1974, - 0x1980, 0x19a9, + 0x1980, 0x19ab, 0x19c1, 0x19c7, 0x1a00, 0x1a16, + 0x1a20, 0x1a54, 0x1b05, 0x1b33, 0x1b45, 0x1b4b, 0x1b83, 0x1ba0, @@ -6009,6 +6339,8 @@ 0x1c00, 0x1c23, 0x1c4d, 0x1c4f, 0x1c5a, 0x1c77, + 0x1ce9, 0x1cec, + 0x1cee, 0x1cf1, 0x2135, 0x2138, 0x2d30, 0x2d65, 0x2d80, 0x2d96, @@ -6033,28 +6365,47 @@ 0x3400, 0x3400, 0x4db5, 0x4db5, 0x4e00, 0x4e00, - 0x9fc3, 0x9fc3, + 0x9fcb, 0x9fcb, 0xa000, 0xa014, 0xa016, 0xa48c, + 0xa4d0, 0xa4f7, 0xa500, 0xa60b, 0xa610, 0xa61f, 0xa62a, 0xa62b, 0xa66e, 0xa66e, + 0xa6a0, 0xa6e5, 0xa7fb, 0xa801, 0xa803, 0xa805, 0xa807, 0xa80a, 0xa80c, 0xa822, 0xa840, 0xa873, 0xa882, 0xa8b3, + 0xa8f2, 0xa8f7, + 0xa8fb, 0xa8fb, 0xa90a, 0xa925, 0xa930, 0xa946, + 0xa960, 0xa97c, + 0xa984, 0xa9b2, 0xaa00, 0xaa28, 0xaa40, 0xaa42, 0xaa44, 0xaa4b, + 0xaa60, 0xaa6f, + 0xaa71, 0xaa76, + 0xaa7a, 0xaa7a, + 0xaa80, 0xaaaf, + 0xaab1, 0xaab1, + 0xaab5, 0xaab6, + 0xaab9, 0xaabd, + 0xaac0, 0xaac0, + 0xaac2, 0xaac2, + 0xaadb, 0xaadc, + 0xabc0, 0xabe2, 0xac00, 0xac00, 0xd7a3, 0xd7a3, + 0xd7b0, 0xd7c6, + 0xd7cb, 0xd7fb, 0xf900, 0xfa2d, - 0xfa30, 0xfa6a, + 0xfa30, 0xfa6d, 0xfa70, 0xfad9, 0xfb1d, 0xfb1d, 0xfb1f, 0xfb28, @@ -6098,16 +6449,25 @@ 0x1080a, 0x10835, 0x10837, 0x10838, 0x1083c, 0x1083c, - 0x1083f, 0x1083f, + 0x1083f, 0x10855, 0x10900, 0x10915, 0x10920, 0x10939, 0x10a00, 0x10a00, 0x10a10, 0x10a13, 0x10a15, 0x10a17, 0x10a19, 0x10a33, + 0x10a60, 0x10a7c, + 0x10b00, 0x10b35, + 0x10b40, 0x10b55, + 0x10b60, 0x10b72, + 0x10c00, 0x10c48, + 0x11083, 0x110af, 0x12000, 0x1236e, + 0x13000, 0x1342e, 0x20000, 0x20000, 0x2a6d6, 0x2a6d6, + 0x2a700, 0x2a700, + 0x2b734, 0x2b734, 0x2f800, 0x2fa1d, }; /* CR_Lo */ @@ -6128,7 +6488,7 @@ /* 'Lu': General Category */ static const OnigCodePoint CR_Lu[] = { - 591, + 594, 0x0041, 0x005a, 0x00c0, 0x00d6, 0x00d8, 0x00de, @@ -6393,6 +6753,7 @@ 0x051e, 0x051e, 0x0520, 0x0520, 0x0522, 0x0522, + 0x0524, 0x0524, 0x0531, 0x0556, 0x10a0, 0x10c5, 0x1e00, 0x1e00, @@ -6554,10 +6915,10 @@ 0x2c67, 0x2c67, 0x2c69, 0x2c69, 0x2c6b, 0x2c6b, - 0x2c6d, 0x2c6f, + 0x2c6d, 0x2c70, 0x2c72, 0x2c72, 0x2c75, 0x2c75, - 0x2c80, 0x2c80, + 0x2c7e, 0x2c80, 0x2c82, 0x2c82, 0x2c84, 0x2c84, 0x2c86, 0x2c86, @@ -6607,6 +6968,8 @@ 0x2cde, 0x2cde, 0x2ce0, 0x2ce0, 0x2ce2, 0x2ce2, + 0x2ceb, 0x2ceb, + 0x2ced, 0x2ced, 0xa640, 0xa640, 0xa642, 0xa642, 0xa644, 0xa644, @@ -6724,7 +7087,7 @@ /* 'M': Major Category */ static const OnigCodePoint CR_M[] = { - 161, + 188, 0x0300, 0x036f, 0x0483, 0x0489, 0x0591, 0x05bd, @@ -6743,10 +7106,14 @@ 0x0730, 0x074a, 0x07a6, 0x07b0, 0x07eb, 0x07f3, - 0x0901, 0x0903, + 0x0816, 0x0819, + 0x081b, 0x0823, + 0x0825, 0x0827, + 0x0829, 0x082d, + 0x0900, 0x0903, 0x093c, 0x093c, - 0x093e, 0x094d, - 0x0951, 0x0954, + 0x093e, 0x094e, + 0x0951, 0x0955, 0x0962, 0x0963, 0x0981, 0x0983, 0x09bc, 0x09bc, @@ -6831,6 +7198,7 @@ 0x1071, 0x1074, 0x1082, 0x108d, 0x108f, 0x108f, + 0x109a, 0x109d, 0x135f, 0x135f, 0x1712, 0x1714, 0x1732, 0x1734, @@ -6845,31 +7213,51 @@ 0x19b0, 0x19c0, 0x19c8, 0x19c9, 0x1a17, 0x1a1b, + 0x1a55, 0x1a5e, + 0x1a60, 0x1a7c, + 0x1a7f, 0x1a7f, 0x1b00, 0x1b04, 0x1b34, 0x1b44, 0x1b6b, 0x1b73, 0x1b80, 0x1b82, 0x1ba1, 0x1baa, 0x1c24, 0x1c37, + 0x1cd0, 0x1cd2, + 0x1cd4, 0x1ce8, + 0x1ced, 0x1ced, + 0x1cf2, 0x1cf2, 0x1dc0, 0x1de6, - 0x1dfe, 0x1dff, + 0x1dfd, 0x1dff, 0x20d0, 0x20f0, + 0x2cef, 0x2cf1, 0x2de0, 0x2dff, 0x302a, 0x302f, 0x3099, 0x309a, 0xa66f, 0xa672, 0xa67c, 0xa67d, + 0xa6f0, 0xa6f1, 0xa802, 0xa802, 0xa806, 0xa806, 0xa80b, 0xa80b, 0xa823, 0xa827, 0xa880, 0xa881, 0xa8b4, 0xa8c4, + 0xa8e0, 0xa8f1, 0xa926, 0xa92d, 0xa947, 0xa953, + 0xa980, 0xa983, + 0xa9b3, 0xa9c0, 0xaa29, 0xaa36, 0xaa43, 0xaa43, 0xaa4c, 0xaa4d, + 0xaa7b, 0xaa7b, + 0xaab0, 0xaab0, + 0xaab2, 0xaab4, + 0xaab7, 0xaab8, + 0xaabe, 0xaabf, + 0xaac1, 0xaac1, + 0xabe3, 0xabea, + 0xabec, 0xabed, 0xfb1e, 0xfb1e, 0xfe00, 0xfe0f, 0xfe20, 0xfe26, @@ -6879,6 +7267,8 @@ 0x10a0c, 0x10a0f, 0x10a38, 0x10a3a, 0x10a3f, 0x10a3f, + 0x11080, 0x11082, + 0x110b0, 0x110ba, 0x1d165, 0x1d169, 0x1d16d, 0x1d172, 0x1d17b, 0x1d182, @@ -6890,10 +7280,11 @@ /* 'Mc': General Category */ static const OnigCodePoint CR_Mc[] = { - 85, + 106, 0x0903, 0x0903, 0x093e, 0x0940, 0x0949, 0x094c, + 0x094e, 0x094e, 0x0982, 0x0983, 0x09be, 0x09c0, 0x09c7, 0x09c8, @@ -6945,6 +7336,7 @@ 0x1083, 0x1084, 0x1087, 0x108c, 0x108f, 0x108f, + 0x109a, 0x109c, 0x17b6, 0x17b6, 0x17be, 0x17c5, 0x17c7, 0x17c8, @@ -6955,6 +7347,11 @@ 0x19b0, 0x19c0, 0x19c8, 0x19c9, 0x1a19, 0x1a1b, + 0x1a55, 0x1a55, + 0x1a57, 0x1a57, + 0x1a61, 0x1a61, + 0x1a63, 0x1a64, + 0x1a6d, 0x1a72, 0x1b04, 0x1b04, 0x1b35, 0x1b35, 0x1b3b, 0x1b3b, @@ -6966,14 +7363,28 @@ 0x1baa, 0x1baa, 0x1c24, 0x1c2b, 0x1c34, 0x1c35, + 0x1ce1, 0x1ce1, + 0x1cf2, 0x1cf2, 0xa823, 0xa824, 0xa827, 0xa827, 0xa880, 0xa881, 0xa8b4, 0xa8c3, 0xa952, 0xa953, + 0xa983, 0xa983, + 0xa9b4, 0xa9b5, + 0xa9ba, 0xa9bb, + 0xa9bd, 0xa9c0, 0xaa2f, 0xaa30, 0xaa33, 0xaa34, 0xaa4d, 0xaa4d, + 0xaa7b, 0xaa7b, + 0xabe3, 0xabe4, + 0xabe6, 0xabe7, + 0xabe9, 0xabea, + 0xabec, 0xabec, + 0x11082, 0x11082, + 0x110b0, 0x110b2, + 0x110b7, 0x110b8, 0x1d165, 0x1d166, 0x1d16d, 0x1d172, }; /* CR_Mc */ @@ -6990,7 +7401,7 @@ /* 'Mn': General Category */ static const OnigCodePoint CR_Mn[] = { - 160, + 194, 0x0300, 0x036f, 0x0483, 0x0487, 0x0591, 0x05bd, @@ -7009,11 +7420,15 @@ 0x0730, 0x074a, 0x07a6, 0x07b0, 0x07eb, 0x07f3, - 0x0901, 0x0902, + 0x0816, 0x0819, + 0x081b, 0x0823, + 0x0825, 0x0827, + 0x0829, 0x082d, + 0x0900, 0x0902, 0x093c, 0x093c, 0x0941, 0x0948, 0x094d, 0x094d, - 0x0951, 0x0954, + 0x0951, 0x0955, 0x0962, 0x0963, 0x0981, 0x0981, 0x09bc, 0x09bc, @@ -7087,6 +7502,7 @@ 0x1082, 0x1082, 0x1085, 0x1086, 0x108d, 0x108d, + 0x109d, 0x109d, 0x135f, 0x135f, 0x1712, 0x1714, 0x1732, 0x1734, @@ -7103,6 +7519,13 @@ 0x1932, 0x1932, 0x1939, 0x193b, 0x1a17, 0x1a18, + 0x1a56, 0x1a56, + 0x1a58, 0x1a5e, + 0x1a60, 0x1a60, + 0x1a62, 0x1a62, + 0x1a65, 0x1a6c, + 0x1a73, 0x1a7c, + 0x1a7f, 0x1a7f, 0x1b00, 0x1b03, 0x1b34, 0x1b34, 0x1b36, 0x1b3a, @@ -7114,28 +7537,47 @@ 0x1ba8, 0x1ba9, 0x1c2c, 0x1c33, 0x1c36, 0x1c37, + 0x1cd0, 0x1cd2, + 0x1cd4, 0x1ce0, + 0x1ce2, 0x1ce8, + 0x1ced, 0x1ced, 0x1dc0, 0x1de6, - 0x1dfe, 0x1dff, + 0x1dfd, 0x1dff, 0x20d0, 0x20dc, 0x20e1, 0x20e1, 0x20e5, 0x20f0, + 0x2cef, 0x2cf1, 0x2de0, 0x2dff, 0x302a, 0x302f, 0x3099, 0x309a, 0xa66f, 0xa66f, 0xa67c, 0xa67d, + 0xa6f0, 0xa6f1, 0xa802, 0xa802, 0xa806, 0xa806, 0xa80b, 0xa80b, 0xa825, 0xa826, 0xa8c4, 0xa8c4, + 0xa8e0, 0xa8f1, 0xa926, 0xa92d, 0xa947, 0xa951, + 0xa980, 0xa982, + 0xa9b3, 0xa9b3, + 0xa9b6, 0xa9b9, + 0xa9bc, 0xa9bc, 0xaa29, 0xaa2e, 0xaa31, 0xaa32, 0xaa35, 0xaa36, 0xaa43, 0xaa43, 0xaa4c, 0xaa4c, + 0xaab0, 0xaab0, + 0xaab2, 0xaab4, + 0xaab7, 0xaab8, + 0xaabe, 0xaabf, + 0xaac1, 0xaac1, + 0xabe5, 0xabe5, + 0xabe8, 0xabe8, + 0xabed, 0xabed, 0xfb1e, 0xfb1e, 0xfe00, 0xfe0f, 0xfe20, 0xfe26, @@ -7145,6 +7587,9 @@ 0x10a0c, 0x10a0f, 0x10a38, 0x10a3a, 0x10a3f, 0x10a3f, + 0x11080, 0x11081, + 0x110b3, 0x110b6, + 0x110b9, 0x110ba, 0x1d167, 0x1d169, 0x1d17b, 0x1d182, 0x1d185, 0x1d18b, @@ -7155,7 +7600,7 @@ /* 'N': Major Category */ static const OnigCodePoint CR_N[] = { - 69, + 81, 0x0030, 0x0039, 0x00b2, 0x00b3, 0x00b9, 0x00b9, @@ -7185,7 +7630,9 @@ 0x17f0, 0x17f9, 0x1810, 0x1819, 0x1946, 0x194f, - 0x19d0, 0x19d9, + 0x19d0, 0x19da, + 0x1a80, 0x1a89, + 0x1a90, 0x1a99, 0x1b50, 0x1b59, 0x1bb0, 0x1bb9, 0x1c40, 0x1c49, @@ -7193,8 +7640,8 @@ 0x2070, 0x2070, 0x2074, 0x2079, 0x2080, 0x2089, - 0x2153, 0x2182, - 0x2185, 0x2188, + 0x2150, 0x2182, + 0x2185, 0x2189, 0x2460, 0x249b, 0x24ea, 0x24ff, 0x2776, 0x2793, @@ -7208,9 +7655,13 @@ 0x3280, 0x3289, 0x32b1, 0x32bf, 0xa620, 0xa629, + 0xa6e6, 0xa6ef, + 0xa830, 0xa835, 0xa8d0, 0xa8d9, 0xa900, 0xa909, + 0xa9d0, 0xa9d9, 0xaa50, 0xaa59, + 0xabf0, 0xabf9, 0xff10, 0xff19, 0x10107, 0x10133, 0x10140, 0x10178, @@ -7220,16 +7671,22 @@ 0x1034a, 0x1034a, 0x103d1, 0x103d5, 0x104a0, 0x104a9, - 0x10916, 0x10919, + 0x10858, 0x1085f, + 0x10916, 0x1091b, 0x10a40, 0x10a47, + 0x10a7d, 0x10a7e, + 0x10b58, 0x10b5f, + 0x10b78, 0x10b7f, + 0x10e60, 0x10e7e, 0x12400, 0x12462, 0x1d360, 0x1d371, 0x1d7ce, 0x1d7ff, + 0x1f100, 0x1f10a, }; /* CR_N */ /* 'Nd': General Category */ static const OnigCodePoint CR_Nd[] = { - 33, + 37, 0x0030, 0x0039, 0x0660, 0x0669, 0x06f0, 0x06f9, @@ -7251,7 +7708,9 @@ 0x17e0, 0x17e9, 0x1810, 0x1819, 0x1946, 0x194f, - 0x19d0, 0x19d9, + 0x19d0, 0x19da, + 0x1a80, 0x1a89, + 0x1a90, 0x1a99, 0x1b50, 0x1b59, 0x1bb0, 0x1bb9, 0x1c40, 0x1c49, @@ -7259,7 +7718,9 @@ 0xa620, 0xa629, 0xa8d0, 0xa8d9, 0xa900, 0xa909, + 0xa9d0, 0xa9d9, 0xaa50, 0xaa59, + 0xabf0, 0xabf9, 0xff10, 0xff19, 0x104a0, 0x104a9, 0x1d7ce, 0x1d7ff, @@ -7267,13 +7728,14 @@ /* 'Nl': General Category */ static const OnigCodePoint CR_Nl[] = { - 11, + 12, 0x16ee, 0x16f0, 0x2160, 0x2182, 0x2185, 0x2188, 0x3007, 0x3007, 0x3021, 0x3029, 0x3038, 0x303a, + 0xa6e6, 0xa6ef, 0x10140, 0x10174, 0x10341, 0x10341, 0x1034a, 0x1034a, @@ -7283,7 +7745,7 @@ /* 'No': General Category */ static const OnigCodePoint CR_No[] = { - 30, + 38, 0x00b2, 0x00b3, 0x00b9, 0x00b9, 0x00bc, 0x00be, @@ -7297,7 +7759,8 @@ 0x2070, 0x2070, 0x2074, 0x2079, 0x2080, 0x2089, - 0x2153, 0x215f, + 0x2150, 0x215f, + 0x2189, 0x2189, 0x2460, 0x249b, 0x24ea, 0x24ff, 0x2776, 0x2793, @@ -7307,18 +7770,25 @@ 0x3251, 0x325f, 0x3280, 0x3289, 0x32b1, 0x32bf, + 0xa830, 0xa835, 0x10107, 0x10133, 0x10175, 0x10178, 0x1018a, 0x1018a, 0x10320, 0x10323, - 0x10916, 0x10919, + 0x10858, 0x1085f, + 0x10916, 0x1091b, 0x10a40, 0x10a47, + 0x10a7d, 0x10a7e, + 0x10b58, 0x10b5f, + 0x10b78, 0x10b7f, + 0x10e60, 0x10e7e, 0x1d360, 0x1d371, + 0x1f100, 0x1f10a, }; /* CR_No */ /* 'P': Major Category */ static const OnigCodePoint CR_P[] = { - 112, + 129, 0x0021, 0x0023, 0x0025, 0x002a, 0x002c, 0x002f, @@ -7350,6 +7820,7 @@ 0x06d4, 0x06d4, 0x0700, 0x070d, 0x07f7, 0x07f9, + 0x0830, 0x083e, 0x0964, 0x0965, 0x0970, 0x0970, 0x0df4, 0x0df4, @@ -7362,6 +7833,7 @@ 0x104a, 0x104f, 0x10fb, 0x10fb, 0x1361, 0x1368, + 0x1400, 0x1400, 0x166d, 0x166e, 0x169b, 0x169c, 0x16eb, 0x16ed, @@ -7372,9 +7844,12 @@ 0x1944, 0x1945, 0x19de, 0x19df, 0x1a1e, 0x1a1f, + 0x1aa0, 0x1aa6, + 0x1aa8, 0x1aad, 0x1b5a, 0x1b60, 0x1c3b, 0x1c3f, 0x1c7e, 0x1c7f, + 0x1cd3, 0x1cd3, 0x2010, 0x2027, 0x2030, 0x2043, 0x2045, 0x2051, @@ -7391,7 +7866,7 @@ 0x2cf9, 0x2cfc, 0x2cfe, 0x2cff, 0x2e00, 0x2e2e, - 0x2e30, 0x2e30, + 0x2e30, 0x2e31, 0x3001, 0x3003, 0x3008, 0x3011, 0x3014, 0x301f, @@ -7399,14 +7874,21 @@ 0x303d, 0x303d, 0x30a0, 0x30a0, 0x30fb, 0x30fb, + 0xa4fe, 0xa4ff, 0xa60d, 0xa60f, 0xa673, 0xa673, 0xa67e, 0xa67e, + 0xa6f2, 0xa6f7, 0xa874, 0xa877, 0xa8ce, 0xa8cf, + 0xa8f8, 0xa8fa, 0xa92e, 0xa92f, 0xa95f, 0xa95f, + 0xa9c1, 0xa9cd, + 0xa9de, 0xa9df, 0xaa5c, 0xaa5f, + 0xaade, 0xaadf, + 0xabeb, 0xabeb, 0xfd3e, 0xfd3f, 0xfe10, 0xfe19, 0xfe30, 0xfe52, @@ -7427,9 +7909,14 @@ 0x10100, 0x10101, 0x1039f, 0x1039f, 0x103d0, 0x103d0, + 0x10857, 0x10857, 0x1091f, 0x1091f, 0x1093f, 0x1093f, 0x10a50, 0x10a58, + 0x10a7f, 0x10a7f, + 0x10b39, 0x10b3f, + 0x110bb, 0x110bc, + 0x110be, 0x110c1, 0x12470, 0x12473, }; /* CR_P */ @@ -7446,10 +7933,11 @@ /* 'Pd': General Category */ static const OnigCodePoint CR_Pd[] = { - 14, + 15, 0x002d, 0x002d, 0x058a, 0x058a, 0x05be, 0x05be, + 0x1400, 0x1400, 0x1806, 0x1806, 0x2010, 0x2015, 0x2e17, 0x2e17, @@ -7571,7 +8059,7 @@ /* 'Po': General Category */ static const OnigCodePoint CR_Po[] = { - 108, + 124, 0x0021, 0x0023, 0x0025, 0x0027, 0x002a, 0x002a, @@ -7599,6 +8087,7 @@ 0x06d4, 0x06d4, 0x0700, 0x070d, 0x07f7, 0x07f9, + 0x0830, 0x083e, 0x0964, 0x0965, 0x0970, 0x0970, 0x0df4, 0x0df4, @@ -7620,9 +8109,12 @@ 0x1944, 0x1945, 0x19de, 0x19df, 0x1a1e, 0x1a1f, + 0x1aa0, 0x1aa6, + 0x1aa8, 0x1aad, 0x1b5a, 0x1b60, 0x1c3b, 0x1c3f, 0x1c7e, 0x1c7f, + 0x1cd3, 0x1cd3, 0x2016, 0x2017, 0x2020, 0x2027, 0x2030, 0x2038, @@ -7641,18 +8133,25 @@ 0x2e1b, 0x2e1b, 0x2e1e, 0x2e1f, 0x2e2a, 0x2e2e, - 0x2e30, 0x2e30, + 0x2e30, 0x2e31, 0x3001, 0x3003, 0x303d, 0x303d, 0x30fb, 0x30fb, + 0xa4fe, 0xa4ff, 0xa60d, 0xa60f, 0xa673, 0xa673, 0xa67e, 0xa67e, + 0xa6f2, 0xa6f7, 0xa874, 0xa877, 0xa8ce, 0xa8cf, + 0xa8f8, 0xa8fa, 0xa92e, 0xa92f, 0xa95f, 0xa95f, + 0xa9c1, 0xa9cd, + 0xa9de, 0xa9df, 0xaa5c, 0xaa5f, + 0xaade, 0xaadf, + 0xabeb, 0xabeb, 0xfe10, 0xfe16, 0xfe19, 0xfe19, 0xfe30, 0xfe30, @@ -7676,9 +8175,14 @@ 0x10100, 0x10101, 0x1039f, 0x1039f, 0x103d0, 0x103d0, + 0x10857, 0x10857, 0x1091f, 0x1091f, 0x1093f, 0x1093f, 0x10a50, 0x10a58, + 0x10a7f, 0x10a7f, + 0x10b39, 0x10b3f, + 0x110bb, 0x110bc, + 0x110be, 0x110c1, 0x12470, 0x12473, }; /* CR_Po */ @@ -7761,7 +8265,7 @@ /* 'S': Major Category */ static const OnigCodePoint CR_S[] = { - 179, + 198, 0x0024, 0x0024, 0x002b, 0x002b, 0x003c, 0x003e, @@ -7793,7 +8297,7 @@ 0x06fd, 0x06fe, 0x07f6, 0x07f6, 0x09f2, 0x09f3, - 0x09fa, 0x09fa, + 0x09fa, 0x09fb, 0x0af1, 0x0af1, 0x0b70, 0x0b70, 0x0bf3, 0x0bfa, @@ -7810,6 +8314,7 @@ 0x0fbe, 0x0fc5, 0x0fc7, 0x0fcc, 0x0fce, 0x0fcf, + 0x0fd5, 0x0fd8, 0x109e, 0x109f, 0x1360, 0x1360, 0x1390, 0x1399, @@ -7828,7 +8333,7 @@ 0x2052, 0x2052, 0x207a, 0x207c, 0x208a, 0x208c, - 0x20a0, 0x20b5, + 0x20a0, 0x20b8, 0x2100, 0x2101, 0x2103, 0x2106, 0x2108, 0x2109, @@ -7844,21 +8349,21 @@ 0x214a, 0x214d, 0x214f, 0x214f, 0x2190, 0x2328, - 0x232b, 0x23e7, + 0x232b, 0x23e8, 0x2400, 0x2426, 0x2440, 0x244a, 0x249c, 0x24e9, - 0x2500, 0x269d, - 0x26a0, 0x26bc, - 0x26c0, 0x26c3, + 0x2500, 0x26cd, + 0x26cf, 0x26e1, + 0x26e3, 0x26e3, + 0x26e8, 0x26ff, 0x2701, 0x2704, 0x2706, 0x2709, 0x270c, 0x2727, 0x2729, 0x274b, 0x274d, 0x274d, 0x274f, 0x2752, - 0x2756, 0x2756, - 0x2758, 0x275e, + 0x2756, 0x275e, 0x2761, 0x2767, 0x2794, 0x2794, 0x2798, 0x27af, @@ -7871,7 +8376,7 @@ 0x2999, 0x29d7, 0x29dc, 0x29fb, 0x29fe, 0x2b4c, - 0x2b50, 0x2b54, + 0x2b50, 0x2b59, 0x2ce5, 0x2cea, 0x2e80, 0x2e99, 0x2e9b, 0x2ef3, @@ -7887,8 +8392,7 @@ 0x3196, 0x319f, 0x31c0, 0x31e3, 0x3200, 0x321e, - 0x322a, 0x3243, - 0x3250, 0x3250, + 0x322a, 0x3250, 0x3260, 0x327f, 0x328a, 0x32b0, 0x32c0, 0x32fe, @@ -7899,6 +8403,8 @@ 0xa720, 0xa721, 0xa789, 0xa78a, 0xa828, 0xa82b, + 0xa836, 0xa839, + 0xaa77, 0xaa79, 0xfb29, 0xfb29, 0xfdfc, 0xfdfd, 0xfe62, 0xfe62, @@ -7941,20 +8447,39 @@ 0x1d7c3, 0x1d7c3, 0x1f000, 0x1f02b, 0x1f030, 0x1f093, + 0x1f110, 0x1f12e, + 0x1f131, 0x1f131, + 0x1f13d, 0x1f13d, + 0x1f13f, 0x1f13f, + 0x1f142, 0x1f142, + 0x1f146, 0x1f146, + 0x1f14a, 0x1f14e, + 0x1f157, 0x1f157, + 0x1f15f, 0x1f15f, + 0x1f179, 0x1f179, + 0x1f17b, 0x1f17c, + 0x1f17f, 0x1f17f, + 0x1f18a, 0x1f18d, + 0x1f190, 0x1f190, + 0x1f200, 0x1f200, + 0x1f210, 0x1f231, + 0x1f240, 0x1f248, }; /* CR_S */ /* 'Sc': General Category */ static const OnigCodePoint CR_Sc[] = { - 14, + 16, 0x0024, 0x0024, 0x00a2, 0x00a5, 0x060b, 0x060b, 0x09f2, 0x09f3, + 0x09fb, 0x09fb, 0x0af1, 0x0af1, 0x0bf9, 0x0bf9, 0x0e3f, 0x0e3f, 0x17db, 0x17db, - 0x20a0, 0x20b5, + 0x20a0, 0x20b8, + 0xa838, 0xa838, 0xfdfc, 0xfdfc, 0xfe69, 0xfe69, 0xff04, 0xff04, @@ -8065,7 +8590,7 @@ /* 'So': General Category */ static const OnigCodePoint CR_So[] = { - 134, + 154, 0x00a6, 0x00a7, 0x00a9, 0x00a9, 0x00ae, 0x00ae, @@ -8092,6 +8617,7 @@ 0x0fbe, 0x0fc5, 0x0fc7, 0x0fcc, 0x0fce, 0x0fcf, + 0x0fd5, 0x0fd8, 0x109e, 0x109f, 0x1360, 0x1360, 0x1390, 0x1399, @@ -8128,7 +8654,7 @@ 0x232b, 0x237b, 0x237d, 0x239a, 0x23b4, 0x23db, - 0x23e2, 0x23e7, + 0x23e2, 0x23e8, 0x2400, 0x2426, 0x2440, 0x244a, 0x249c, 0x24e9, @@ -8136,17 +8662,17 @@ 0x25b8, 0x25c0, 0x25c2, 0x25f7, 0x2600, 0x266e, - 0x2670, 0x269d, - 0x26a0, 0x26bc, - 0x26c0, 0x26c3, + 0x2670, 0x26cd, + 0x26cf, 0x26e1, + 0x26e3, 0x26e3, + 0x26e8, 0x26ff, 0x2701, 0x2704, 0x2706, 0x2709, 0x270c, 0x2727, 0x2729, 0x274b, 0x274d, 0x274d, 0x274f, 0x2752, - 0x2756, 0x2756, - 0x2758, 0x275e, + 0x2756, 0x275e, 0x2761, 0x2767, 0x2794, 0x2794, 0x2798, 0x27af, @@ -8154,7 +8680,7 @@ 0x2800, 0x28ff, 0x2b00, 0x2b2f, 0x2b45, 0x2b46, - 0x2b50, 0x2b54, + 0x2b50, 0x2b59, 0x2ce5, 0x2cea, 0x2e80, 0x2e99, 0x2e9b, 0x2ef3, @@ -8169,8 +8695,7 @@ 0x3196, 0x319f, 0x31c0, 0x31e3, 0x3200, 0x321e, - 0x322a, 0x3243, - 0x3250, 0x3250, + 0x322a, 0x3250, 0x3260, 0x327f, 0x328a, 0x32b0, 0x32c0, 0x32fe, @@ -8178,6 +8703,9 @@ 0x4dc0, 0x4dff, 0xa490, 0xa4c6, 0xa828, 0xa82b, + 0xa836, 0xa837, + 0xa839, 0xa839, + 0xaa77, 0xaa79, 0xfdfd, 0xfdfd, 0xffe4, 0xffe4, 0xffe8, 0xffe8, @@ -8200,6 +8728,23 @@ 0x1d300, 0x1d356, 0x1f000, 0x1f02b, 0x1f030, 0x1f093, + 0x1f110, 0x1f12e, + 0x1f131, 0x1f131, + 0x1f13d, 0x1f13d, + 0x1f13f, 0x1f13f, + 0x1f142, 0x1f142, + 0x1f146, 0x1f146, + 0x1f14a, 0x1f14e, + 0x1f157, 0x1f157, + 0x1f15f, 0x1f15f, + 0x1f179, 0x1f179, + 0x1f17b, 0x1f17c, + 0x1f17f, 0x1f17f, + 0x1f18a, 0x1f18d, + 0x1f190, 0x1f190, + 0x1f200, 0x1f200, + 0x1f210, 0x1f231, + 0x1f240, 0x1f248, }; /* CR_So */ /* 'Z': Major Category */ @@ -8243,7 +8788,7 @@ /* 'Common': Script */ static const OnigCodePoint CR_Common[] = { - 137, + 159, 0x0000, 0x0040, 0x005b, 0x0060, 0x007b, 0x00a9, @@ -8269,37 +8814,42 @@ 0x0970, 0x0970, 0x0cf1, 0x0cf2, 0x0e3f, 0x0e3f, + 0x0fd5, 0x0fd8, 0x10fb, 0x10fb, 0x16eb, 0x16ed, 0x1735, 0x1736, 0x1802, 0x1803, 0x1805, 0x1805, + 0x1cd3, 0x1cd3, + 0x1ce1, 0x1ce1, + 0x1ce9, 0x1cec, + 0x1cee, 0x1cf2, 0x2000, 0x200b, 0x200e, 0x2064, 0x206a, 0x2070, 0x2074, 0x207e, 0x2080, 0x208e, - 0x20a0, 0x20b5, + 0x20a0, 0x20b8, 0x2100, 0x2125, 0x2127, 0x2129, 0x212c, 0x2131, 0x2133, 0x214d, - 0x214f, 0x214f, - 0x2153, 0x215f, - 0x2190, 0x23e7, + 0x214f, 0x215f, + 0x2189, 0x2189, + 0x2190, 0x23e8, 0x2400, 0x2426, 0x2440, 0x244a, - 0x2460, 0x269d, - 0x26a0, 0x26bc, - 0x26c0, 0x26c3, + 0x2460, 0x26cd, + 0x26cf, 0x26e1, + 0x26e3, 0x26e3, + 0x26e8, 0x26ff, 0x2701, 0x2704, 0x2706, 0x2709, 0x270c, 0x2727, 0x2729, 0x274b, 0x274d, 0x274d, 0x274f, 0x2752, - 0x2756, 0x2756, - 0x2758, 0x275e, + 0x2756, 0x275e, 0x2761, 0x2794, 0x2798, 0x27af, 0x27b1, 0x27be, @@ -8307,8 +8857,8 @@ 0x27cc, 0x27cc, 0x27d0, 0x27ff, 0x2900, 0x2b4c, - 0x2b50, 0x2b54, - 0x2e00, 0x2e30, + 0x2b50, 0x2b59, + 0x2e00, 0x2e31, 0x2ff0, 0x2ffb, 0x3000, 0x3004, 0x3006, 0x3006, @@ -8320,13 +8870,13 @@ 0x30fb, 0x30fc, 0x3190, 0x319f, 0x31c0, 0x31e3, - 0x3220, 0x3243, - 0x3250, 0x325f, + 0x3220, 0x325f, 0x327f, 0x32cf, 0x3358, 0x33ff, 0x4dc0, 0x4dff, 0xa700, 0xa721, 0xa788, 0xa78a, + 0xa830, 0xa839, 0xfd3e, 0xfd3f, 0xfdfd, 0xfdfd, 0xfe10, 0xfe19, @@ -8379,13 +8929,30 @@ 0x1d7ce, 0x1d7ff, 0x1f000, 0x1f02b, 0x1f030, 0x1f093, + 0x1f100, 0x1f10a, + 0x1f110, 0x1f12e, + 0x1f131, 0x1f131, + 0x1f13d, 0x1f13d, + 0x1f13f, 0x1f13f, + 0x1f142, 0x1f142, + 0x1f146, 0x1f146, + 0x1f14a, 0x1f14e, + 0x1f157, 0x1f157, + 0x1f15f, 0x1f15f, + 0x1f179, 0x1f179, + 0x1f17b, 0x1f17c, + 0x1f17f, 0x1f17f, + 0x1f18a, 0x1f18d, + 0x1f190, 0x1f190, + 0x1f210, 0x1f231, + 0x1f240, 0x1f248, 0xe0001, 0xe0001, 0xe0020, 0xe007f, }; /* CR_Common */ /* 'Latin': Script */ static const OnigCodePoint CR_Latin[] = { - 29, + 28, 0x0041, 0x005a, 0x0061, 0x007a, 0x00aa, 0x00aa, @@ -8407,8 +8974,7 @@ 0x2132, 0x2132, 0x214e, 0x214e, 0x2160, 0x2188, - 0x2c60, 0x2c6f, - 0x2c71, 0x2c7d, + 0x2c60, 0x2c7f, 0xa722, 0xa787, 0xa78b, 0xa78c, 0xa7fb, 0xa7ff, @@ -8457,8 +9023,9 @@ /* 'Cyrillic': Script */ static const OnigCodePoint CR_Cyrillic[] = { - 7, - 0x0400, 0x0523, + 8, + 0x0400, 0x0484, + 0x0487, 0x0525, 0x1d2b, 0x1d2b, 0x1d78, 0x1d78, 0x2de0, 0x2dff, @@ -8493,7 +9060,7 @@ /* 'Arabic': Script */ static const OnigCodePoint CR_Arabic[] = { - 17, + 18, 0x0606, 0x060b, 0x060d, 0x061a, 0x061e, 0x061e, @@ -8511,6 +9078,7 @@ 0xfdf0, 0xfdfc, 0xfe70, 0xfe74, 0xfe76, 0xfefc, + 0x10e60, 0x10e7e, }; /* CR_Arabic */ /* 'Syriac': Script */ @@ -8529,15 +9097,16 @@ /* 'Devanagari': Script */ static const OnigCodePoint CR_Devanagari[] = { - 8, - 0x0901, 0x0939, - 0x093c, 0x094d, + 9, + 0x0900, 0x0939, + 0x093c, 0x094e, 0x0950, 0x0950, - 0x0953, 0x0954, + 0x0953, 0x0955, 0x0958, 0x0963, 0x0966, 0x096f, 0x0971, 0x0972, - 0x097b, 0x097f, + 0x0979, 0x097f, + 0xa8e0, 0xa8fb, }; /* CR_Devanagari */ /* 'Bengali': Script */ @@ -8556,7 +9125,7 @@ 0x09d7, 0x09d7, 0x09dc, 0x09dd, 0x09df, 0x09e3, - 0x09e6, 0x09fa, + 0x09e6, 0x09fb, }; /* CR_Bengali */ /* 'Gurmukhi': Script */ @@ -8754,8 +9323,8 @@ /* 'Myanmar': Script */ static const OnigCodePoint CR_Myanmar[] = { 2, - 0x1000, 0x1099, - 0x109e, 0x109f, + 0x1000, 0x109f, + 0xaa60, 0xaa7b, }; /* CR_Myanmar */ /* 'Georgian': Script */ @@ -8769,14 +9338,15 @@ /* 'Hangul': Script */ static const OnigCodePoint CR_Hangul[] = { - 12, - 0x1100, 0x1159, - 0x115f, 0x11a2, - 0x11a8, 0x11f9, + 13, + 0x1100, 0x11ff, 0x3131, 0x318e, 0x3200, 0x321e, 0x3260, 0x327e, + 0xa960, 0xa97c, 0xac00, 0xd7a3, + 0xd7b0, 0xd7c6, + 0xd7cb, 0xd7fb, 0xffa0, 0xffbe, 0xffc2, 0xffc7, 0xffca, 0xffcf, @@ -8824,8 +9394,9 @@ /* 'Canadian_Aboriginal': Script */ static const OnigCodePoint CR_Canadian_Aboriginal[] = { - 1, - 0x1401, 0x1676, + 2, + 0x1400, 0x167f, + 0x18b0, 0x18f5, }; /* CR_Canadian_Aboriginal */ /* 'Ogham': Script */ @@ -8863,9 +9434,10 @@ /* 'Hiragana': Script */ static const OnigCodePoint CR_Hiragana[] = { - 2, + 3, 0x3041, 0x3096, 0x309d, 0x309f, + 0x1f200, 0x1f200, }; /* CR_Hiragana */ /* 'Katakana': Script */ @@ -8889,7 +9461,7 @@ /* 'Han': Script */ static const OnigCodePoint CR_Han[] = { - 14, + 15, 0x2e80, 0x2e99, 0x2e9b, 0x2ef3, 0x2f00, 0x2fd5, @@ -8898,11 +9470,12 @@ 0x3021, 0x3029, 0x3038, 0x303b, 0x3400, 0x4db5, - 0x4e00, 0x9fc3, + 0x4e00, 0x9fcb, 0xf900, 0xfa2d, - 0xfa30, 0xfa6a, + 0xfa30, 0xfa6d, 0xfa70, 0xfad9, 0x20000, 0x2a6d6, + 0x2a700, 0x2b734, 0x2f800, 0x2fa1d, }; /* CR_Han */ @@ -8934,13 +9507,18 @@ /* 'Inherited': Script */ static const OnigCodePoint CR_Inherited[] = { - 18, + 23, 0x0300, 0x036f, + 0x0485, 0x0486, 0x064b, 0x0655, 0x0670, 0x0670, 0x0951, 0x0952, + 0x1cd0, 0x1cd2, + 0x1cd4, 0x1ce0, + 0x1ce2, 0x1ce8, + 0x1ced, 0x1ced, 0x1dc0, 0x1de6, - 0x1dfe, 0x1dff, + 0x1dfd, 0x1dff, 0x200c, 0x200d, 0x20d0, 0x20f0, 0x302a, 0x302f, @@ -9059,16 +9637,16 @@ static const OnigCodePoint CR_Coptic[] = { 3, 0x03e2, 0x03ef, - 0x2c80, 0x2cea, + 0x2c80, 0x2cf1, 0x2cf9, 0x2cff, }; /* CR_Coptic */ /* 'New_Tai_Lue': Script */ static const OnigCodePoint CR_New_Tai_Lue[] = { 4, - 0x1980, 0x19a9, + 0x1980, 0x19ab, 0x19b0, 0x19c9, - 0x19d0, 0x19d9, + 0x19d0, 0x19da, 0x19de, 0x19df, }; /* CR_New_Tai_Lue */ @@ -9130,7 +9708,7 @@ /* 'Phoenician': Script */ static const OnigCodePoint CR_Phoenician[] = { 2, - 0x10900, 0x10919, + 0x10900, 0x1091b, 0x1091f, 0x1091f, }; /* CR_Phoenician */ @@ -9220,6 +9798,109 @@ 0xaa50, 0xaa59, 0xaa5c, 0xaa5f, }; /* CR_Cham */ + +/* 'Tai_Tham': Script */ +static const OnigCodePoint CR_Tai_Tham[] = { + 5, + 0x1a20, 0x1a5e, + 0x1a60, 0x1a7c, + 0x1a7f, 0x1a89, + 0x1a90, 0x1a99, + 0x1aa0, 0x1aad, +}; /* CR_Tai_Tham */ + +/* 'Tai_Viet': Script */ +static const OnigCodePoint CR_Tai_Viet[] = { + 2, + 0xaa80, 0xaac2, + 0xaadb, 0xaadf, +}; /* CR_Tai_Viet */ + +/* 'Avestan': Script */ +static const OnigCodePoint CR_Avestan[] = { + 2, + 0x10b00, 0x10b35, + 0x10b39, 0x10b3f, +}; /* CR_Avestan */ + +/* 'Egyptian_Hieroglyphs': Script */ +static const OnigCodePoint CR_Egyptian_Hieroglyphs[] = { + 1, + 0x13000, 0x1342e, +}; /* CR_Egyptian_Hieroglyphs */ + +/* 'Samaritan': Script */ +static const OnigCodePoint CR_Samaritan[] = { + 2, + 0x0800, 0x082d, + 0x0830, 0x083e, +}; /* CR_Samaritan */ + +/* 'Lisu': Script */ +static const OnigCodePoint CR_Lisu[] = { + 1, + 0xa4d0, 0xa4ff, +}; /* CR_Lisu */ + +/* 'Bamum': Script */ +static const OnigCodePoint CR_Bamum[] = { + 1, + 0xa6a0, 0xa6f7, +}; /* CR_Bamum */ + +/* 'Javanese': Script */ +static const OnigCodePoint CR_Javanese[] = { + 3, + 0xa980, 0xa9cd, + 0xa9cf, 0xa9d9, + 0xa9de, 0xa9df, +}; /* CR_Javanese */ + +/* 'Meetei_Mayek': Script */ +static const OnigCodePoint CR_Meetei_Mayek[] = { + 2, + 0xabc0, 0xabed, + 0xabf0, 0xabf9, +}; /* CR_Meetei_Mayek */ + +/* 'Imperial_Aramaic': Script */ +static const OnigCodePoint CR_Imperial_Aramaic[] = { + 2, + 0x10840, 0x10855, + 0x10857, 0x1085f, +}; /* CR_Imperial_Aramaic */ + +/* 'Old_South_Arabian': Script */ +static const OnigCodePoint CR_Old_South_Arabian[] = { + 1, + 0x10a60, 0x10a7f, +}; /* CR_Old_South_Arabian */ + +/* 'Inscriptional_Parthian': Script */ +static const OnigCodePoint CR_Inscriptional_Parthian[] = { + 2, + 0x10b40, 0x10b55, + 0x10b58, 0x10b5f, +}; /* CR_Inscriptional_Parthian */ + +/* 'Inscriptional_Pahlavi': Script */ +static const OnigCodePoint CR_Inscriptional_Pahlavi[] = { + 2, + 0x10b60, 0x10b72, + 0x10b78, 0x10b7f, +}; /* CR_Inscriptional_Pahlavi */ + +/* 'Old_Turkic': Script */ +static const OnigCodePoint CR_Old_Turkic[] = { + 1, + 0x10c00, 0x10c48, +}; /* CR_Old_Turkic */ + +/* 'Kaithi': Script */ +static const OnigCodePoint CR_Kaithi[] = { + 1, + 0x11080, 0x110c1, +}; /* CR_Kaithi */ #endif /* USE_UNICODE_PROPERTIES */ #endif /* USE_UNICODE_PROPERTIES */ @@ -9358,6 +10039,21 @@ CR_Carian, CR_Lydian, CR_Cham, + CR_Tai_Tham, + CR_Tai_Viet, + CR_Avestan, + CR_Egyptian_Hieroglyphs, + CR_Samaritan, + CR_Lisu, + CR_Bamum, + CR_Javanese, + CR_Meetei_Mayek, + CR_Imperial_Aramaic, + CR_Old_South_Arabian, + CR_Inscriptional_Parthian, + CR_Inscriptional_Pahlavi, + CR_Old_Turkic, + CR_Kaithi, #endif /* USE_UNICODE_PROPERTIES */ #endif /* USE_UNICODE_PROPERTIES */ }; @@ -9371,16 +10067,18 @@ #define TOTAL_KEYWORDS 15 #define MIN_WORD_LENGTH 4 #define MAX_WORD_LENGTH 7 +#else /* USE_UNICODE_PROPERTIES */ +#define TOTAL_KEYWORDS 146 +#define MIN_WORD_LENGTH 1 +#define MAX_WORD_LENGTH 21 +#endif /* USE_UNICODE_PROPERTIES */ #define MIN_HASH_VALUE 7 +#ifndef USE_UNICODE_PROPERTIES #define MAX_HASH_VALUE 21 /* maximum key range = 15, duplicates = 0 */ #else /* USE_UNICODE_PROPERTIES */ -#define TOTAL_KEYWORDS 131 -#define MIN_WORD_LENGTH 1 -#define MAX_WORD_LENGTH 18 -#define MIN_HASH_VALUE 2 -#define MAX_HASH_VALUE 266 -/* maximum key range = 265, duplicates = 0 */ +#define MAX_HASH_VALUE 299 +/* maximum key range = 293, duplicates = 0 */ #endif /* USE_UNICODE_PROPERTIES */ #ifdef __GNUC__ @@ -9416,19 +10114,20 @@ 2, 22, 1, 22, 10, 8, 4, 7, 22, 3, 4, 22, 22, 22, 22, 22, 22, 22 #else /* USE_UNICODE_PROPERTIES */ - 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, - 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, - 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, - 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, - 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, - 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, - 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, - 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, - 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, - 267, 267, 267, 267, 267, 267, 267, 9, 11, 29, - 82, 48, 86, 43, 3, 25, 92, 97, 4, 2, - 8, 45, 1, 79, 53, 12, 30, 98, 88, 62, - 22, 20, 61, 267, 267, 267, 267, 267, 267 + 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, + 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, + 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, + 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, + 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, + 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, + 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, + 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, + 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, + 300, 300, 300, 300, 300, 300, 300, 21, 74, 8, + 18, 35, 111, 9, 52, 6, 4, 60, 31, 43, + 6, 1, 4, 128, 28, 57, 5, 88, 112, 42, + 86, 111, 29, 1, 2, 6, 17, 300, 300, 300, + 300, 300 #endif /* USE_UNICODE_PROPERTIES */ }; #ifndef USE_UNICODE_PROPERTIES @@ -9439,16 +10138,17 @@ switch (hval) { default: + hval += asso_values[(unsigned char)str[3]]; + /*FALLTHROUGH*/ + case 3: hval += asso_values[(unsigned char)str[2]]; /*FALLTHROUGH*/ case 2: - hval += asso_values[(unsigned char)str[1]+1]; - /*FALLTHROUGH*/ case 1: - hval += asso_values[(unsigned char)str[0]]; + hval += asso_values[(unsigned char)str[0]+4]; break; } - return hval; + return hval + asso_values[(unsigned char)str[len - 1]]; #endif /* USE_UNICODE_PROPERTIES */ } @@ -9471,300 +10171,329 @@ char uniname2ctype_pool_str20[sizeof("digit")]; char uniname2ctype_pool_str21[sizeof("blank")]; #else /* USE_UNICODE_PROPERTIES */ - char uniname2ctype_pool_str2[sizeof("p")]; - char uniname2ctype_pool_str3[sizeof("m")]; - char uniname2ctype_pool_str4[sizeof("po")]; - char uniname2ctype_pool_str5[sizeof("l")]; char uniname2ctype_pool_str7[sizeof("lo")]; - char uniname2ctype_pool_str8[sizeof("ll")]; - char uniname2ctype_pool_str9[sizeof("n")]; - char uniname2ctype_pool_str11[sizeof("no")]; - char uniname2ctype_pool_str12[sizeof("nl")]; - char uniname2ctype_pool_str13[sizeof("s")]; - char uniname2ctype_pool_str14[sizeof("lm")]; - char uniname2ctype_pool_str15[sizeof("so")]; - char uniname2ctype_pool_str17[sizeof("alpha")]; - char uniname2ctype_pool_str18[sizeof("sk")]; - char uniname2ctype_pool_str20[sizeof("mongolian")]; - char uniname2ctype_pool_str21[sizeof("bopomofo")]; - char uniname2ctype_pool_str22[sizeof("sm")]; - char uniname2ctype_pool_str24[sizeof("alnum")]; - char uniname2ctype_pool_str25[sizeof("han")]; - char uniname2ctype_pool_str26[sizeof("malayalam")]; - char uniname2ctype_pool_str27[sizeof("blank")]; - char uniname2ctype_pool_str28[sizeof("hangul")]; - char uniname2ctype_pool_str29[sizeof("hanunoo")]; - char uniname2ctype_pool_str30[sizeof("c")]; - char uniname2ctype_pool_str31[sizeof("armenian")]; - char uniname2ctype_pool_str32[sizeof("co")]; - char uniname2ctype_pool_str33[sizeof("ps")]; - char uniname2ctype_pool_str34[sizeof("balinese")]; - char uniname2ctype_pool_str36[sizeof("arabic")]; - char uniname2ctype_pool_str37[sizeof("coptic")]; - char uniname2ctype_pool_str38[sizeof("common")]; - char uniname2ctype_pool_str39[sizeof("braille")]; - char uniname2ctype_pool_str42[sizeof("phagspa")]; - char uniname2ctype_pool_str43[sizeof("print")]; - char uniname2ctype_pool_str46[sizeof("pf")]; - char uniname2ctype_pool_str48[sizeof("tamil")]; - char uniname2ctype_pool_str49[sizeof("mn")]; - char uniname2ctype_pool_str50[sizeof("latin")]; - char uniname2ctype_pool_str51[sizeof("pd")]; - char uniname2ctype_pool_str53[sizeof("shavian")]; - char uniname2ctype_pool_str56[sizeof("ogham")]; - char uniname2ctype_pool_str58[sizeof("nd")]; - char uniname2ctype_pool_str59[sizeof("assigned")]; - char uniname2ctype_pool_str60[sizeof("nko")]; - char uniname2ctype_pool_str61[sizeof("cs")]; - char uniname2ctype_pool_str62[sizeof("z")]; - char uniname2ctype_pool_str63[sizeof("lao")]; - char uniname2ctype_pool_str64[sizeof("glagolitic")]; - char uniname2ctype_pool_str65[sizeof("zl")]; - char uniname2ctype_pool_str66[sizeof("canadianaboriginal")]; - char uniname2ctype_pool_str67[sizeof("cham")]; - char uniname2ctype_pool_str68[sizeof("thai")]; - char uniname2ctype_pool_str69[sizeof("graph")]; - char uniname2ctype_pool_str70[sizeof("thaana")]; - char uniname2ctype_pool_str71[sizeof("taile")]; - char uniname2ctype_pool_str72[sizeof("lower")]; - char uniname2ctype_pool_str73[sizeof("ascii")]; - char uniname2ctype_pool_str74[sizeof("cf")]; - char uniname2ctype_pool_str76[sizeof("cn")]; - char uniname2ctype_pool_str77[sizeof("any")]; - char uniname2ctype_pool_str79[sizeof("myanmar")]; - char uniname2ctype_pool_str80[sizeof("gothic")]; - char uniname2ctype_pool_str81[sizeof("phoenician")]; - char uniname2ctype_pool_str82[sizeof("inherited")]; - char uniname2ctype_pool_str83[sizeof("olchiki")]; - char uniname2ctype_pool_str84[sizeof("osmanya")]; - char uniname2ctype_pool_str85[sizeof("pc")]; - char uniname2ctype_pool_str86[sizeof("mc")]; - char uniname2ctype_pool_str87[sizeof("oriya")]; - char uniname2ctype_pool_str88[sizeof("sylotinagri")]; - char uniname2ctype_pool_str89[sizeof("pe")]; - char uniname2ctype_pool_str90[sizeof("me")]; - char uniname2ctype_pool_str91[sizeof("tagalog")]; - char uniname2ctype_pool_str92[sizeof("tagbanwa")]; - char uniname2ctype_pool_str93[sizeof("zs")]; + char uniname2ctype_pool_str8[sizeof("po")]; + char uniname2ctype_pool_str9[sizeof("lao")]; + char uniname2ctype_pool_str10[sizeof("p")]; + char uniname2ctype_pool_str11[sizeof("lt")]; + char uniname2ctype_pool_str12[sizeof("co")]; + char uniname2ctype_pool_str13[sizeof("pi")]; + char uniname2ctype_pool_str14[sizeof("yi")]; + char uniname2ctype_pool_str15[sizeof("pc")]; + char uniname2ctype_pool_str17[sizeof("cn")]; + char uniname2ctype_pool_str18[sizeof("c")]; + char uniname2ctype_pool_str19[sizeof("cc")]; + char uniname2ctype_pool_str23[sizeof("zp")]; + char uniname2ctype_pool_str24[sizeof("kaithi")]; + char uniname2ctype_pool_str25[sizeof("pd")]; + char uniname2ctype_pool_str26[sizeof("latin")]; + char uniname2ctype_pool_str27[sizeof("print")]; + char uniname2ctype_pool_str28[sizeof("xdigit")]; + char uniname2ctype_pool_str29[sizeof("punct")]; + char uniname2ctype_pool_str30[sizeof("lycian")]; + char uniname2ctype_pool_str31[sizeof("no")]; + char uniname2ctype_pool_str32[sizeof("coptic")]; + char uniname2ctype_pool_str33[sizeof("nko")]; + char uniname2ctype_pool_str35[sizeof("n")]; + char uniname2ctype_pool_str36[sizeof("l")]; + char uniname2ctype_pool_str37[sizeof("ll")]; + char uniname2ctype_pool_str40[sizeof("lydian")]; + char uniname2ctype_pool_str41[sizeof("kannada")]; + char uniname2ctype_pool_str42[sizeof("pe")]; + char uniname2ctype_pool_str43[sizeof("lepcha")]; + char uniname2ctype_pool_str44[sizeof("vai")]; + char uniname2ctype_pool_str45[sizeof("so")]; + char uniname2ctype_pool_str46[sizeof("han")]; + char uniname2ctype_pool_str47[sizeof("z")]; + char uniname2ctype_pool_str48[sizeof("nd")]; + char uniname2ctype_pool_str49[sizeof("lm")]; + char uniname2ctype_pool_str50[sizeof("zl")]; + char uniname2ctype_pool_str52[sizeof("sc")]; + char uniname2ctype_pool_str53[sizeof("cypriot")]; + char uniname2ctype_pool_str55[sizeof("carian")]; + char uniname2ctype_pool_str56[sizeof("katakana")]; + char uniname2ctype_pool_str57[sizeof("phoenician")]; + char uniname2ctype_pool_str59[sizeof("cyrillic")]; + char uniname2ctype_pool_str60[sizeof("ascii")]; + char uniname2ctype_pool_str61[sizeof("nl")]; + char uniname2ctype_pool_str63[sizeof("phagspa")]; + char uniname2ctype_pool_str64[sizeof("ps")]; + char uniname2ctype_pool_str66[sizeof("kharoshthi")]; + char uniname2ctype_pool_str68[sizeof("cs")]; + char uniname2ctype_pool_str69[sizeof("word")]; + char uniname2ctype_pool_str76[sizeof("zs")]; + char uniname2ctype_pool_str77[sizeof("digit")]; + char uniname2ctype_pool_str78[sizeof("cntrl")]; + char uniname2ctype_pool_str80[sizeof("ethiopic")]; + char uniname2ctype_pool_str83[sizeof("hangul")]; + char uniname2ctype_pool_str85[sizeof("canadianaboriginal")]; + char uniname2ctype_pool_str87[sizeof("sm")]; + char uniname2ctype_pool_str90[sizeof("syriac")]; + char uniname2ctype_pool_str91[sizeof("sylotinagri")]; char uniname2ctype_pool_str94[sizeof("lu")]; - char uniname2ctype_pool_str95[sizeof("pi")]; - char uniname2ctype_pool_str96[sizeof("sc")]; - char uniname2ctype_pool_str97[sizeof("lepcha")]; - char uniname2ctype_pool_str98[sizeof("cypriot")]; - char uniname2ctype_pool_str99[sizeof("carian")]; - char uniname2ctype_pool_str100[sizeof("lycian")]; - char uniname2ctype_pool_str101[sizeof("xdigit")]; - char uniname2ctype_pool_str102[sizeof("punct")]; - char uniname2ctype_pool_str103[sizeof("limbu")]; - char uniname2ctype_pool_str104[sizeof("lt")]; - char uniname2ctype_pool_str105[sizeof("space")]; - char uniname2ctype_pool_str106[sizeof("hebrew")]; - char uniname2ctype_pool_str107[sizeof("buhid")]; - char uniname2ctype_pool_str108[sizeof("greek")]; - char uniname2ctype_pool_str109[sizeof("cntrl")]; - char uniname2ctype_pool_str110[sizeof("cherokee")]; - char uniname2ctype_pool_str111[sizeof("linearb")]; - char uniname2ctype_pool_str112[sizeof("bengali")]; - char uniname2ctype_pool_str113[sizeof("cc")]; - char uniname2ctype_pool_str114[sizeof("yi")]; - char uniname2ctype_pool_str117[sizeof("sundanese")]; - char uniname2ctype_pool_str118[sizeof("ugaritic")]; - char uniname2ctype_pool_str119[sizeof("sinhala")]; - char uniname2ctype_pool_str120[sizeof("word")]; - char uniname2ctype_pool_str123[sizeof("kannada")]; - char uniname2ctype_pool_str126[sizeof("telugu")]; - char uniname2ctype_pool_str127[sizeof("vai")]; - char uniname2ctype_pool_str129[sizeof("khmer")]; - char uniname2ctype_pool_str131[sizeof("saurashtra")]; - char uniname2ctype_pool_str132[sizeof("syriac")]; - char uniname2ctype_pool_str134[sizeof("cuneiform")]; - char uniname2ctype_pool_str135[sizeof("kayahli")]; - char uniname2ctype_pool_str138[sizeof("olditalic")]; - char uniname2ctype_pool_str139[sizeof("oldpersian")]; - char uniname2ctype_pool_str140[sizeof("tibetan")]; - char uniname2ctype_pool_str141[sizeof("kharoshthi")]; - char uniname2ctype_pool_str142[sizeof("zp")]; - char uniname2ctype_pool_str146[sizeof("katakana")]; - char uniname2ctype_pool_str150[sizeof("buginese")]; - char uniname2ctype_pool_str151[sizeof("cyrillic")]; - char uniname2ctype_pool_str153[sizeof("lydian")]; - char uniname2ctype_pool_str154[sizeof("runic")]; - char uniname2ctype_pool_str156[sizeof("hiragana")]; - char uniname2ctype_pool_str157[sizeof("ethiopic")]; - char uniname2ctype_pool_str163[sizeof("newline")]; - char uniname2ctype_pool_str165[sizeof("newtailue")]; - char uniname2ctype_pool_str182[sizeof("georgian")]; + char uniname2ctype_pool_str95[sizeof("oldpersian")]; + char uniname2ctype_pool_str97[sizeof("oldturkic")]; + char uniname2ctype_pool_str98[sizeof("olditalic")]; + char uniname2ctype_pool_str99[sizeof("gujarati")]; + char uniname2ctype_pool_str100[sizeof("s")]; + char uniname2ctype_pool_str102[sizeof("cuneiform")]; + char uniname2ctype_pool_str103[sizeof("georgian")]; + char uniname2ctype_pool_str104[sizeof("sk")]; + char uniname2ctype_pool_str105[sizeof("imperialaramaic")]; + char uniname2ctype_pool_str107[sizeof("common")]; + char uniname2ctype_pool_str108[sizeof("glagolitic")]; + char uniname2ctype_pool_str109[sizeof("hiragana")]; + char uniname2ctype_pool_str110[sizeof("sundanese")]; + char uniname2ctype_pool_str111[sizeof("space")]; + char uniname2ctype_pool_str112[sizeof("khmer")]; + char uniname2ctype_pool_str114[sizeof("lower")]; + char uniname2ctype_pool_str115[sizeof("cherokee")]; + char uniname2ctype_pool_str117[sizeof("alpha")]; + char uniname2ctype_pool_str118[sizeof("pf")]; + char uniname2ctype_pool_str119[sizeof("newtailue")]; + char uniname2ctype_pool_str120[sizeof("cham")]; + char uniname2ctype_pool_str121[sizeof("samaritan")]; + char uniname2ctype_pool_str122[sizeof("cf")]; + char uniname2ctype_pool_str123[sizeof("thai")]; + char uniname2ctype_pool_str124[sizeof("assigned")]; + char uniname2ctype_pool_str125[sizeof("bopomofo")]; + char uniname2ctype_pool_str126[sizeof("linearb")]; + char uniname2ctype_pool_str127[sizeof("armenian")]; + char uniname2ctype_pool_str128[sizeof("sinhala")]; + char uniname2ctype_pool_str130[sizeof("olchiki")]; + char uniname2ctype_pool_str131[sizeof("gothic")]; + char uniname2ctype_pool_str132[sizeof("tagalog")]; + char uniname2ctype_pool_str133[sizeof("hanunoo")]; + char uniname2ctype_pool_str134[sizeof("inscriptionalpahlavi")]; + char uniname2ctype_pool_str135[sizeof("inscriptionalparthian")]; + char uniname2ctype_pool_str136[sizeof("mn")]; + char uniname2ctype_pool_str137[sizeof("runic")]; + char uniname2ctype_pool_str138[sizeof("mc")]; + char uniname2ctype_pool_str139[sizeof("bengali")]; + char uniname2ctype_pool_str140[sizeof("avestan")]; + char uniname2ctype_pool_str142[sizeof("graph")]; + char uniname2ctype_pool_str143[sizeof("newline")]; + char uniname2ctype_pool_str144[sizeof("arabic")]; + char uniname2ctype_pool_str145[sizeof("gurmukhi")]; + char uniname2ctype_pool_str146[sizeof("kayahli")]; + char uniname2ctype_pool_str147[sizeof("taitham")]; + char uniname2ctype_pool_str149[sizeof("osmanya")]; + char uniname2ctype_pool_str152[sizeof("rejang")]; + char uniname2ctype_pool_str153[sizeof("oldsoutharabian")]; + char uniname2ctype_pool_str155[sizeof("thaana")]; + char uniname2ctype_pool_str156[sizeof("deseret")]; + char uniname2ctype_pool_str157[sizeof("inherited")]; + char uniname2ctype_pool_str158[sizeof("mongolian")]; + char uniname2ctype_pool_str163[sizeof("taile")]; + char uniname2ctype_pool_str165[sizeof("me")]; + char uniname2ctype_pool_str169[sizeof("buginese")]; + char uniname2ctype_pool_str171[sizeof("tamil")]; + char uniname2ctype_pool_str172[sizeof("m")]; + char uniname2ctype_pool_str176[sizeof("ugaritic")]; + char uniname2ctype_pool_str177[sizeof("alnum")]; + char uniname2ctype_pool_str178[sizeof("ogham")]; + char uniname2ctype_pool_str180[sizeof("braille")]; + char uniname2ctype_pool_str181[sizeof("hebrew")]; + char uniname2ctype_pool_str182[sizeof("javanese")]; char uniname2ctype_pool_str183[sizeof("upper")]; - char uniname2ctype_pool_str187[sizeof("deseret")]; - char uniname2ctype_pool_str192[sizeof("gurmukhi")]; - char uniname2ctype_pool_str216[sizeof("tifinagh")]; - char uniname2ctype_pool_str222[sizeof("digit")]; - char uniname2ctype_pool_str231[sizeof("gujarati")]; - char uniname2ctype_pool_str237[sizeof("rejang")]; - char uniname2ctype_pool_str266[sizeof("devanagari")]; + char uniname2ctype_pool_str188[sizeof("shavian")]; + char uniname2ctype_pool_str189[sizeof("saurashtra")]; + char uniname2ctype_pool_str190[sizeof("myanmar")]; + char uniname2ctype_pool_str191[sizeof("balinese")]; + char uniname2ctype_pool_str192[sizeof("buhid")]; + char uniname2ctype_pool_str195[sizeof("greek")]; + char uniname2ctype_pool_str197[sizeof("egyptianhieroglyphs")]; + char uniname2ctype_pool_str198[sizeof("tagbanwa")]; + char uniname2ctype_pool_str200[sizeof("oriya")]; + char uniname2ctype_pool_str201[sizeof("devanagari")]; + char uniname2ctype_pool_str203[sizeof("blank")]; + char uniname2ctype_pool_str208[sizeof("tibetan")]; + char uniname2ctype_pool_str214[sizeof("limbu")]; + char uniname2ctype_pool_str216[sizeof("taiviet")]; + char uniname2ctype_pool_str232[sizeof("malayalam")]; + char uniname2ctype_pool_str239[sizeof("meeteimayek")]; + char uniname2ctype_pool_str241[sizeof("lisu")]; + char uniname2ctype_pool_str260[sizeof("any")]; + char uniname2ctype_pool_str263[sizeof("tifinagh")]; + char uniname2ctype_pool_str290[sizeof("bamum")]; + char uniname2ctype_pool_str299[sizeof("telugu")]; #endif /* USE_UNICODE_PROPERTIES */ }; static const struct uniname2ctype_pool_t uniname2ctype_pool_contents = { +#ifdef USE_UNICODE_PROPERTIES + "lo", + "po", + "lao", + "p", + "lt", + "co", + "pi", + "yi", + "pc", + "cn", + "c", + "cc", + "zp", + "kaithi", + "pd", + "latin", +#endif /* USE_UNICODE_PROPERTIES */ + "print", #ifndef USE_UNICODE_PROPERTIES - "print", "punct", -#else /* USE_UNICODE_PROPERTIES */ - "p", - "m", - "po", - "l", - "lo", - "ll", - "n", - "no", - "nl", - "s", - "lm", - "so", -#endif /* USE_UNICODE_PROPERTIES */ "alpha", -#ifdef USE_UNICODE_PROPERTIES - "sk", - "mongolian", - "bopomofo", - "sm", -#endif /* USE_UNICODE_PROPERTIES */ "alnum", +#endif /* ! USE_UNICODE_PROPERTIES */ + "xdigit", #ifndef USE_UNICODE_PROPERTIES - "xdigit", "newline", "upper", #else /* USE_UNICODE_PROPERTIES */ - "han", - "malayalam", - "blank", - "hangul", - "hanunoo", - "c", - "armenian", - "co", - "ps", - "balinese", - "arabic", + "punct", + "lycian", + "no", "coptic", - "common", - "braille", - "phagspa", - "print", - "pf", - "tamil", - "mn", - "latin", - "pd", - "shavian", - "ogham", - "nd", - "assigned", "nko", - "cs", + "n", + "l", + "ll", + "lydian", + "kannada", + "pe", + "lepcha", + "vai", + "so", + "han", "z", - "lao", - "glagolitic", + "nd", + "lm", "zl", - "canadianaboriginal", - "cham", - "thai", - "graph", - "thaana", - "taile", - "lower", + "sc", + "cypriot", + "carian", + "katakana", + "phoenician", + "cyrillic", #endif /* USE_UNICODE_PROPERTIES */ "ascii", -#ifndef USE_UNICODE_PROPERTIES +#ifdef USE_UNICODE_PROPERTIES + "nl", + "phagspa", + "ps", + "kharoshthi", + "cs", + "word", + "zs", + "digit", +#endif /* USE_UNICODE_PROPERTIES */ "cntrl", -#else /* USE_UNICODE_PROPERTIES */ - "cf", - "cn", - "any", - "myanmar", - "gothic", - "phoenician", - "inherited", - "olchiki", - "osmanya", - "pc", - "mc", - "oriya", +#ifdef USE_UNICODE_PROPERTIES + "ethiopic", + "hangul", + "canadianaboriginal", + "sm", + "syriac", "sylotinagri", - "pe", - "me", - "tagalog", - "tagbanwa", - "zs", "lu", - "pi", - "sc", - "lepcha", - "cypriot", - "carian", - "lycian", - "xdigit", - "punct", - "limbu", - "lt", + "oldpersian", + "oldturkic", + "olditalic", + "gujarati", + "s", + "cuneiform", + "georgian", + "sk", + "imperialaramaic", + "common", + "glagolitic", + "hiragana", + "sundanese", #endif /* USE_UNICODE_PROPERTIES */ "space", +#ifndef USE_UNICODE_PROPERTIES + "word", +#else /* USE_UNICODE_PROPERTIES */ + "khmer", +#endif /* USE_UNICODE_PROPERTIES */ + "lower", #ifdef USE_UNICODE_PROPERTIES - "hebrew", - "buhid", - "greek", - "cntrl", "cherokee", + "alpha", + "pf", + "newtailue", + "cham", + "samaritan", + "cf", + "thai", + "assigned", + "bopomofo", "linearb", + "armenian", + "sinhala", + "olchiki", + "gothic", + "tagalog", + "hanunoo", + "inscriptionalpahlavi", + "inscriptionalparthian", + "mn", + "runic", + "mc", "bengali", - "cc", - "yi", - "sundanese", - "ugaritic", - "sinhala", + "avestan", #endif /* USE_UNICODE_PROPERTIES */ - "word", + "graph", #ifndef USE_UNICODE_PROPERTIES - "lower", - "graph", + "digit", + "blank" #else /* USE_UNICODE_PROPERTIES */ - "kannada", - "telugu", - "vai", - "khmer", - "saurashtra", - "syriac", - "cuneiform", + "newline", + "arabic", + "gurmukhi", "kayahli", - "olditalic", - "oldpersian", - "tibetan", - "kharoshthi", - "zp", - "katakana", + "taitham", + "osmanya", + "rejang", + "oldsoutharabian", + "thaana", + "deseret", + "inherited", + "mongolian", + "taile", + "me", "buginese", - "cyrillic", - "lydian", - "runic", - "hiragana", - "ethiopic", - "newline", - "newtailue", - "georgian", + "tamil", + "m", + "ugaritic", + "alnum", + "ogham", + "braille", + "hebrew", + "javanese", "upper", - "deseret", - "gurmukhi", + "shavian", + "saurashtra", + "myanmar", + "balinese", + "buhid", + "greek", + "egyptianhieroglyphs", + "tagbanwa", + "oriya", + "devanagari", + "blank", + "tibetan", + "limbu", + "taiviet", + "malayalam", + "meeteimayek", + "lisu", + "any", "tifinagh", + "bamum", + "telugu" #endif /* USE_UNICODE_PROPERTIES */ - "digit", -#ifndef USE_UNICODE_PROPERTIES - "blank" -#else /* USE_UNICODE_PROPERTIES */ - "gujarati", - "rejang", - "devanagari" -#endif /* USE_UNICODE_PROPERTIES */ }; #define uniname2ctype_pool ((const char *) &uniname2ctype_pool_contents) #ifdef __GNUC__ @@ -9780,198 +10509,222 @@ { static const struct uniname2ctype_struct wordlist[] = { -#ifdef USE_UNICODE_PROPERTIES + {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, +#ifndef USE_UNICODE_PROPERTIES + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str7, 7}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str8, 8}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str9, 1}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str10, 13}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str11, 11}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str12, 0}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str13, 10}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str14, 14}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str15, 3}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str16, 9}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str17, 12}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str18, 6}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str19, 5}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str20, 4}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str21, 2} +#else /* USE_UNICODE_PROPERTIES */ + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str7, 26}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str8, 43}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str9, 74}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str10, 37}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str11, 27}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str12, 21}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str13, 42}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str14, 90}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str15, 38}, + {-1}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str17, 20}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str18, 17}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str19, 18}, + {-1}, {-1}, {-1}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str23, 52}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str24, 145}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str25, 39}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str26, 55}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str27, 7}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str28, 11}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str29, 8}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str30, 127}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str31, 36}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str32, 108}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str33, 119}, + {-1}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str35, 33}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str36, 23}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str37, 24}, {-1}, {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2, 37}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3, 29}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str4, 43}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str5, 23}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str40, 129}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str41, 70}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str42, 40}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str43, 121}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str44, 123}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str45, 49}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str46, 89}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str47, 50}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str48, 34}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str49, 25}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str50, 51}, {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str7, 26}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str8, 24}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str9, 33}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str52, 46}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str53, 105}, {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str11, 36}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str12, 35}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str13, 45}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str14, 25}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str15, 49}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str55, 128}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str56, 87}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str57, 117}, {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str17, 1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str18, 47}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str59, 57}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str60, 14}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str61, 35}, {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str20, 85}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str21, 88}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str22, 48}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str63, 118}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str64, 44}, {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str24, 13}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str25, 89}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str26, 71}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str27, 2}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str28, 78}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str29, 96}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str30, 17}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str31, 58}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str32, 21}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str33, 44}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str34, 115}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str66, 114}, {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str36, 60}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str37, 108}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str38, 54}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str39, 106}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str68, 22}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str69, 12}, + {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str76, 53}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str77, 4}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str78, 3}, + {-1}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str80, 79}, {-1}, {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str42, 118}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str43, 7}, - {-1}, {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str46, 41}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str83, 78}, {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str48, 68}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str49, 32}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str50, 55}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str51, 39}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str85, 81}, {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str53, 103}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str87, 48}, {-1}, {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str56, 82}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str90, 61}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str91, 112}, + {-1}, {-1}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str94, 28}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str95, 113}, {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str58, 34}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str59, 16}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str60, 119}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str61, 22}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str62, 50}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str63, 74}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str64, 110}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str65, 51}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str66, 81}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str67, 130}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str68, 73}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str69, 5}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str70, 62}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str71, 100}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str72, 6}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str73, 14}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str74, 19}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str97, 144}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str98, 91}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str99, 66}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str100, 45}, {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str76, 20}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str77, 15}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str102, 116}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str103, 77}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str104, 47}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str105, 140}, {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str79, 76}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str80, 92}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str81, 117}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str82, 94}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str83, 122}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str84, 104}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str85, 38}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str86, 30}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str87, 67}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str88, 112}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str89, 40}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str90, 31}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str91, 95}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str92, 98}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str93, 53}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str94, 28}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str95, 42}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str96, 46}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str97, 121}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str98, 105}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str99, 128}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str100, 127}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str101, 11}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str102, 8}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str103, 99}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str104, 27}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str105, 9}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str106, 59}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str107, 97}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str108, 56}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str109, 3}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str110, 80}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str111, 101}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str112, 64}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str113, 18}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str114, 90}, - {-1}, {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str117, 120}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str118, 102}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str119, 72}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str120, 12}, - {-1}, {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str123, 70}, - {-1}, {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str126, 69}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str127, 123}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str107, 54}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str108, 110}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str109, 86}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str110, 120}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str111, 9}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str112, 84}, {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str129, 84}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str114, 6}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str115, 80}, {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str131, 124}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str132, 61}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str117, 1}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str118, 41}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str119, 109}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str120, 130}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str121, 135}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str122, 19}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str123, 73}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str124, 16}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str125, 88}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str126, 101}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str127, 58}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str128, 72}, {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str134, 116}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str135, 125}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str130, 122}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str131, 92}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str132, 95}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str133, 96}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str134, 143}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str135, 142}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str136, 32}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str137, 83}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str138, 30}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str139, 64}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str140, 133}, + {-1}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str142, 5}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str143, 0}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str144, 60}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str145, 65}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str146, 125}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str147, 131}, + {-1}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str149, 104}, {-1}, {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str138, 91}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str139, 113}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str140, 75}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str141, 114}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str142, 52}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str152, 126}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str153, 141}, + {-1}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str155, 62}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str156, 93}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str157, 94}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str158, 85}, + {-1}, {-1}, {-1}, {-1}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str163, 100}, + {-1}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str165, 31}, {-1}, {-1}, {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str146, 87}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str169, 107}, + {-1}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str171, 68}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str172, 29}, {-1}, {-1}, {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str150, 107}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str151, 57}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str176, 102}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str177, 13}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str178, 82}, {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str153, 129}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str154, 83}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str180, 106}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str181, 59}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str182, 138}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str183, 10}, + {-1}, {-1}, {-1}, {-1}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str188, 103}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str189, 124}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str190, 76}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str191, 115}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str192, 97}, + {-1}, {-1}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str195, 56}, {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str156, 86}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str157, 79}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str197, 134}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str198, 98}, + {-1}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str200, 67}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str201, 63}, + {-1}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str203, 2}, + {-1}, {-1}, {-1}, {-1}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str208, 75}, {-1}, {-1}, {-1}, {-1}, {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str163, 0}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str214, 99}, {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str165, 109}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str216, 132}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, -#endif /* USE_UNICODE_PROPERTIES */ - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, -#ifndef USE_UNICODE_PROPERTIES - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str7, 7}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str8, 8}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str9, 1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str10, 13}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str11, 11}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str12, 0}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str13, 10}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str14, 14}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str15, 3}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str16, 9}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str17, 12}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str18, 6}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str19, 5}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str20, 4}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str21, 2} -#else /* USE_UNICODE_PROPERTIES */ - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str182, 77}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str183, 10}, - {-1}, {-1}, {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str187, 93}, - {-1}, {-1}, {-1}, {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str192, 65}, + {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str232, 71}, + {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str239, 139}, + {-1}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str241, 136}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - {-1}, {-1}, {-1}, {-1}, {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str216, 111}, - {-1}, {-1}, {-1}, {-1}, {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str222, 4}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str231, 66}, - {-1}, {-1}, {-1}, {-1}, {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str237, 126}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str260, 15}, + {-1}, {-1}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str263, 111}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - {-1}, - {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str266, 63} + {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str290, 137}, + {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, + {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str299, 69} #endif /* USE_UNICODE_PROPERTIES */ }; -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/