diff --git a/enc/unicode/name2ctype.h b/enc/unicode/name2ctype.h
index df6f02e..d7abb98 100644
--- a/enc/unicode/name2ctype.h
+++ b/enc/unicode/name2ctype.h
@@ -46,13 +46,13 @@ static const OnigCodePoint CR_Any[] = {
 
 /* 'Assigned': - */
 static const OnigCodePoint CR_Assigned[] = {
-	485,
+	501,
 	0x0000, 0x0377,
 	0x037a, 0x037e,
 	0x0384, 0x038a,
 	0x038c, 0x038c,
 	0x038e, 0x03a1,
-	0x03a3, 0x0525,
+	0x03a3, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x055f,
 	0x0561, 0x0587,
@@ -62,18 +62,15 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x05f0, 0x05f4,
 	0x0600, 0x0603,
 	0x0606, 0x061b,
-	0x061e, 0x061f,
-	0x0621, 0x065e,
-	0x0660, 0x070d,
+	0x061e, 0x070d,
 	0x070f, 0x074a,
 	0x074d, 0x07b1,
 	0x07c0, 0x07fa,
 	0x0800, 0x082d,
 	0x0830, 0x083e,
-	0x0900, 0x0939,
-	0x093c, 0x094e,
-	0x0950, 0x0955,
-	0x0958, 0x0972,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x0900, 0x0977,
 	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
@@ -132,7 +129,7 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x0b56, 0x0b57,
 	0x0b5c, 0x0b5d,
 	0x0b5f, 0x0b63,
-	0x0b66, 0x0b71,
+	0x0b66, 0x0b77,
 	0x0b82, 0x0b83,
 	0x0b85, 0x0b8a,
 	0x0b8e, 0x0b90,
@@ -180,11 +177,10 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
+	0x0d4a, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d66, 0x0d75,
@@ -222,11 +218,10 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x0edc, 0x0edd,
 	0x0f00, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f71, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fd8,
+	0x0fce, 0x0fda,
 	0x1000, 0x10c5,
 	0x10d0, 0x10fc,
 	0x1100, 0x1248,
@@ -245,7 +240,7 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x12d8, 0x1310,
 	0x1312, 0x1315,
 	0x1318, 0x135a,
-	0x135f, 0x137c,
+	0x135d, 0x137c,
 	0x1380, 0x1399,
 	0x13a0, 0x13f4,
 	0x1400, 0x169c,
@@ -284,12 +279,13 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x1b50, 0x1b7c,
 	0x1b80, 0x1baa,
 	0x1bae, 0x1bb9,
-	0x1c00, 0x1c37,
+	0x1bc0, 0x1bf3,
+	0x1bfc, 0x1c37,
 	0x1c3b, 0x1c49,
 	0x1c4d, 0x1c7f,
 	0x1cd0, 0x1cf2,
 	0x1d00, 0x1de6,
-	0x1dfd, 0x1f15,
+	0x1dfc, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
 	0x1f48, 0x1f4d,
@@ -308,38 +304,25 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x2000, 0x2064,
 	0x206a, 0x2071,
 	0x2074, 0x208e,
-	0x2090, 0x2094,
-	0x20a0, 0x20b8,
+	0x2090, 0x209c,
+	0x20a0, 0x20b9,
 	0x20d0, 0x20f0,
 	0x2100, 0x2189,
-	0x2190, 0x23e8,
+	0x2190, 0x23f3,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
-	0x2460, 0x26cd,
-	0x26cf, 0x26e1,
-	0x26e3, 0x26e3,
-	0x26e8, 0x26ff,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
+	0x2460, 0x26ff,
+	0x2701, 0x27ca,
 	0x27cc, 0x27cc,
-	0x27d0, 0x2b4c,
+	0x27ce, 0x2b4c,
 	0x2b50, 0x2b59,
 	0x2c00, 0x2c2e,
 	0x2c30, 0x2c5e,
 	0x2c60, 0x2cf1,
 	0x2cf9, 0x2d25,
 	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
 	0x2da0, 0x2da6,
 	0x2da8, 0x2dae,
 	0x2db0, 0x2db6,
@@ -358,7 +341,7 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x3099, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x3190, 0x31b7,
+	0x3190, 0x31ba,
 	0x31c0, 0x31e3,
 	0x31f0, 0x321e,
 	0x3220, 0x32fe,
@@ -367,12 +350,13 @@ static const OnigCodePoint CR_Assigned[] = {
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
 	0xa4d0, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa673,
+	0xa640, 0xa673,
 	0xa67c, 0xa697,
 	0xa6a0, 0xa6f7,
-	0xa700, 0xa78c,
-	0xa7fb, 0xa82b,
+	0xa700, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa82b,
 	0xa830, 0xa839,
 	0xa840, 0xa877,
 	0xa880, 0xa8c4,
@@ -389,6 +373,11 @@ static const OnigCodePoint CR_Assigned[] = {
 	0xaa5c, 0xaa7b,
 	0xaa80, 0xaac2,
 	0xaadb, 0xaadf,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabed,
 	0xabf0, 0xabf9,
 	0xac00, 0xd7a3,
@@ -404,7 +393,7 @@ static const OnigCodePoint CR_Assigned[] = {
 	0xfb3e, 0xfb3e,
 	0xfb40, 0xfb41,
 	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
+	0xfb46, 0xfbc1,
 	0xfbd3, 0xfd3f,
 	0xfd50, 0xfd8f,
 	0xfd92, 0xfdc7,
@@ -472,11 +461,15 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x10b78, 0x10b7f,
 	0x10c00, 0x10c48,
 	0x10e60, 0x10e7e,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
 	0x11080, 0x110c1,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x12470, 0x12473,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d000, 0x1d0f5,
 	0x1d100, 0x1d126,
 	0x1d129, 0x1d1dd,
@@ -506,26 +499,49 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x1d7ce, 0x1d7ff,
 	0x1f000, 0x1f02b,
 	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
 	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,
+	0x1f130, 0x1f169,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
 	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f5ff,
+	0x1f601, 0x1f610,
+	0x1f612, 0x1f614,
+	0x1f616, 0x1f616,
+	0x1f618, 0x1f618,
+	0x1f61a, 0x1f61a,
+	0x1f61c, 0x1f61e,
+	0x1f620, 0x1f625,
+	0x1f628, 0x1f62b,
+	0x1f62d, 0x1f62d,
+	0x1f630, 0x1f633,
+	0x1f635, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 	0xe0001, 0xe0001,
 	0xe0020, 0xe007f,
@@ -588,13 +604,13 @@ static const OnigCodePoint CR_Cf[] = {
 
 /* 'Cn': General Category */
 static const OnigCodePoint CR_Cn[] = {
-	485,
+	501,
 	0x0378, 0x0379,
 	0x037f, 0x0383,
 	0x038b, 0x038b,
 	0x038d, 0x038d,
 	0x03a2, 0x03a2,
-	0x0526, 0x0530,
+	0x0528, 0x0530,
 	0x0557, 0x0558,
 	0x0560, 0x0560,
 	0x0588, 0x0588,
@@ -604,18 +620,15 @@ static const OnigCodePoint CR_Cn[] = {
 	0x05f5, 0x05ff,
 	0x0604, 0x0605,
 	0x061c, 0x061d,
-	0x0620, 0x0620,
-	0x065f, 0x065f,
 	0x070e, 0x070e,
 	0x074b, 0x074c,
 	0x07b2, 0x07bf,
 	0x07fb, 0x07ff,
 	0x082e, 0x082f,
-	0x083f, 0x08ff,
-	0x093a, 0x093b,
-	0x094f, 0x094f,
-	0x0956, 0x0957,
-	0x0973, 0x0978,
+	0x083f, 0x083f,
+	0x085c, 0x085d,
+	0x085f, 0x08ff,
+	0x0978, 0x0978,
 	0x0980, 0x0980,
 	0x0984, 0x0984,
 	0x098d, 0x098e,
@@ -674,7 +687,7 @@ static const OnigCodePoint CR_Cn[] = {
 	0x0b58, 0x0b5b,
 	0x0b5e, 0x0b5e,
 	0x0b64, 0x0b65,
-	0x0b72, 0x0b81,
+	0x0b78, 0x0b81,
 	0x0b84, 0x0b84,
 	0x0b8b, 0x0b8d,
 	0x0b91, 0x0b91,
@@ -722,11 +735,10 @@ static const OnigCodePoint CR_Cn[] = {
 	0x0d04, 0x0d04,
 	0x0d0d, 0x0d0d,
 	0x0d11, 0x0d11,
-	0x0d29, 0x0d29,
-	0x0d3a, 0x0d3c,
+	0x0d3b, 0x0d3c,
 	0x0d45, 0x0d45,
 	0x0d49, 0x0d49,
-	0x0d4e, 0x0d56,
+	0x0d4f, 0x0d56,
 	0x0d58, 0x0d5f,
 	0x0d64, 0x0d65,
 	0x0d76, 0x0d78,
@@ -764,11 +776,10 @@ static const OnigCodePoint CR_Cn[] = {
 	0x0ede, 0x0eff,
 	0x0f48, 0x0f48,
 	0x0f6d, 0x0f70,
-	0x0f8c, 0x0f8f,
 	0x0f98, 0x0f98,
 	0x0fbd, 0x0fbd,
 	0x0fcd, 0x0fcd,
-	0x0fd9, 0x0fff,
+	0x0fdb, 0x0fff,
 	0x10c6, 0x10cf,
 	0x10fd, 0x10ff,
 	0x1249, 0x1249,
@@ -786,7 +797,7 @@ static const OnigCodePoint CR_Cn[] = {
 	0x12d7, 0x12d7,
 	0x1311, 0x1311,
 	0x1316, 0x1317,
-	0x135b, 0x135e,
+	0x135b, 0x135c,
 	0x137d, 0x137f,
 	0x139a, 0x139f,
 	0x13f5, 0x13ff,
@@ -825,12 +836,13 @@ static const OnigCodePoint CR_Cn[] = {
 	0x1b4c, 0x1b4f,
 	0x1b7d, 0x1b7f,
 	0x1bab, 0x1bad,
-	0x1bba, 0x1bff,
+	0x1bba, 0x1bbf,
+	0x1bf4, 0x1bfb,
 	0x1c38, 0x1c3a,
 	0x1c4a, 0x1c4c,
 	0x1c80, 0x1ccf,
 	0x1cf3, 0x1cff,
-	0x1de7, 0x1dfc,
+	0x1de7, 0x1dfb,
 	0x1f16, 0x1f17,
 	0x1f1e, 0x1f1f,
 	0x1f46, 0x1f47,
@@ -850,29 +862,16 @@ static const OnigCodePoint CR_Cn[] = {
 	0x2065, 0x2069,
 	0x2072, 0x2073,
 	0x208f, 0x208f,
-	0x2095, 0x209f,
-	0x20b9, 0x20cf,
+	0x209d, 0x209f,
+	0x20ba, 0x20cf,
 	0x20f1, 0x20ff,
 	0x218a, 0x218f,
-	0x23e9, 0x23ff,
+	0x23f4, 0x23ff,
 	0x2427, 0x243f,
 	0x244b, 0x245f,
-	0x26ce, 0x26ce,
-	0x26e2, 0x26e2,
-	0x26e4, 0x26e7,
 	0x2700, 0x2700,
-	0x2705, 0x2705,
-	0x270a, 0x270b,
-	0x2728, 0x2728,
-	0x274c, 0x274c,
-	0x274e, 0x274e,
-	0x2753, 0x2755,
-	0x275f, 0x2760,
-	0x2795, 0x2797,
-	0x27b0, 0x27b0,
-	0x27bf, 0x27bf,
 	0x27cb, 0x27cb,
-	0x27cd, 0x27cf,
+	0x27cd, 0x27cd,
 	0x2b4d, 0x2b4f,
 	0x2b5a, 0x2bff,
 	0x2c2f, 0x2c2f,
@@ -880,7 +879,7 @@ static const OnigCodePoint CR_Cn[] = {
 	0x2cf2, 0x2cf8,
 	0x2d26, 0x2d2f,
 	0x2d66, 0x2d6e,
-	0x2d70, 0x2d7f,
+	0x2d71, 0x2d7e,
 	0x2d97, 0x2d9f,
 	0x2da7, 0x2da7,
 	0x2daf, 0x2daf,
@@ -900,7 +899,7 @@ static const OnigCodePoint CR_Cn[] = {
 	0x3100, 0x3104,
 	0x312e, 0x3130,
 	0x318f, 0x318f,
-	0x31b8, 0x31bf,
+	0x31bb, 0x31bf,
 	0x31e4, 0x31ef,
 	0x321f, 0x321f,
 	0x32ff, 0x32ff,
@@ -909,11 +908,12 @@ static const OnigCodePoint CR_Cn[] = {
 	0xa48d, 0xa48f,
 	0xa4c7, 0xa4cf,
 	0xa62c, 0xa63f,
-	0xa660, 0xa661,
 	0xa674, 0xa67b,
 	0xa698, 0xa69f,
 	0xa6f8, 0xa6ff,
-	0xa78d, 0xa7fa,
+	0xa78f, 0xa78f,
+	0xa792, 0xa79f,
+	0xa7aa, 0xa7f9,
 	0xa82c, 0xa82f,
 	0xa83a, 0xa83f,
 	0xa878, 0xa87f,
@@ -930,7 +930,12 @@ static const OnigCodePoint CR_Cn[] = {
 	0xaa5a, 0xaa5b,
 	0xaa7c, 0xaa7f,
 	0xaac3, 0xaada,
-	0xaae0, 0xabbf,
+	0xaae0, 0xab00,
+	0xab07, 0xab08,
+	0xab0f, 0xab10,
+	0xab17, 0xab1f,
+	0xab27, 0xab27,
+	0xab2f, 0xabbf,
 	0xabee, 0xabef,
 	0xabfa, 0xabff,
 	0xd7a4, 0xd7af,
@@ -946,7 +951,7 @@ static const OnigCodePoint CR_Cn[] = {
 	0xfb3f, 0xfb3f,
 	0xfb42, 0xfb42,
 	0xfb45, 0xfb45,
-	0xfbb2, 0xfbd2,
+	0xfbc2, 0xfbd2,
 	0xfd40, 0xfd4f,
 	0xfd90, 0xfd91,
 	0xfdc8, 0xfdef,
@@ -1013,12 +1018,16 @@ static const OnigCodePoint CR_Cn[] = {
 	0x10b73, 0x10b77,
 	0x10b80, 0x10bff,
 	0x10c49, 0x10e5f,
-	0x10e7f, 0x1107f,
+	0x10e7f, 0x10fff,
+	0x1104e, 0x11051,
+	0x11070, 0x1107f,
 	0x110c2, 0x11fff,
 	0x1236f, 0x123ff,
 	0x12463, 0x1246f,
 	0x12474, 0x12fff,
-	0x1342f, 0x1cfff,
+	0x1342f, 0x167ff,
+	0x16a39, 0x1afff,
+	0x1b002, 0x1cfff,
 	0x1d0f6, 0x1d0ff,
 	0x1d127, 0x1d128,
 	0x1d1de, 0x1d1ff,
@@ -1047,27 +1056,50 @@ static const OnigCodePoint CR_Cn[] = {
 	0x1d7cc, 0x1d7cd,
 	0x1d800, 0x1efff,
 	0x1f02c, 0x1f02f,
-	0x1f094, 0x1f0ff,
+	0x1f094, 0x1f09f,
+	0x1f0af, 0x1f0b0,
+	0x1f0bf, 0x1f0c0,
+	0x1f0d0, 0x1f0d0,
+	0x1f0e0, 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,
+	0x1f12f, 0x1f12f,
+	0x1f16a, 0x1f16f,
+	0x1f19b, 0x1f1e5,
+	0x1f203, 0x1f20f,
+	0x1f23b, 0x1f23f,
+	0x1f249, 0x1f24f,
+	0x1f252, 0x1f2ff,
+	0x1f321, 0x1f32f,
+	0x1f336, 0x1f336,
+	0x1f37d, 0x1f37f,
+	0x1f394, 0x1f39f,
+	0x1f3c5, 0x1f3c5,
+	0x1f3cb, 0x1f3df,
+	0x1f3f1, 0x1f3ff,
+	0x1f43f, 0x1f43f,
+	0x1f441, 0x1f441,
+	0x1f4f8, 0x1f4f8,
+	0x1f4fd, 0x1f4ff,
+	0x1f53e, 0x1f54f,
+	0x1f568, 0x1f5fa,
+	0x1f600, 0x1f600,
+	0x1f611, 0x1f611,
+	0x1f615, 0x1f615,
+	0x1f617, 0x1f617,
+	0x1f619, 0x1f619,
+	0x1f61b, 0x1f61b,
+	0x1f61f, 0x1f61f,
+	0x1f626, 0x1f627,
+	0x1f62c, 0x1f62c,
+	0x1f62e, 0x1f62f,
+	0x1f634, 0x1f634,
+	0x1f641, 0x1f644,
+	0x1f650, 0x1f67f,
+	0x1f6c6, 0x1f6ff,
+	0x1f774, 0x1ffff,
 	0x2a6d7, 0x2a6ff,
-	0x2b735, 0x2f7ff,
+	0x2b735, 0x2b73f,
+	0x2b81e, 0x2f7ff,
 	0x2fa1e, 0xe0000,
 	0xe0002, 0xe001f,
 	0xe0080, 0xe00ff,
@@ -1092,7 +1124,7 @@ static const OnigCodePoint CR_Cs[] = {
 
 /* 'L': Major Category */
 static const OnigCodePoint CR_L[] = {
-	422,
+	435,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -1114,13 +1146,13 @@ static const OnigCodePoint CR_L[] = {
 	0x038e, 0x03a1,
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x0559,
 	0x0561, 0x0587,
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
-	0x0621, 0x064a,
+	0x0620, 0x064a,
 	0x066e, 0x066f,
 	0x0671, 0x06d3,
 	0x06d5, 0x06d5,
@@ -1139,11 +1171,12 @@ static const OnigCodePoint CR_L[] = {
 	0x081a, 0x081a,
 	0x0824, 0x0824,
 	0x0828, 0x0828,
+	0x0840, 0x0858,
 	0x0904, 0x0939,
 	0x093d, 0x093d,
 	0x0950, 0x0950,
 	0x0958, 0x0961,
-	0x0971, 0x0972,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0x0985, 0x098c,
 	0x098f, 0x0990,
@@ -1212,11 +1245,12 @@ static const OnigCodePoint CR_L[] = {
 	0x0cbd, 0x0cbd,
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce1,
+	0x0cf1, 0x0cf2,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
 	0x0d60, 0x0d61,
 	0x0d7a, 0x0d7f,
 	0x0d85, 0x0d96,
@@ -1247,7 +1281,7 @@ static const OnigCodePoint CR_L[] = {
 	0x0f00, 0x0f00,
 	0x0f40, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8b,
+	0x0f88, 0x0f8c,
 	0x1000, 0x102a,
 	0x103f, 0x103f,
 	0x1050, 0x1055,
@@ -1307,6 +1341,7 @@ static const OnigCodePoint CR_L[] = {
 	0x1b45, 0x1b4b,
 	0x1b83, 0x1ba0,
 	0x1bae, 0x1baf,
+	0x1bc0, 0x1be5,
 	0x1c00, 0x1c23,
 	0x1c4d, 0x1c4f,
 	0x1c5a, 0x1c7d,
@@ -1334,7 +1369,7 @@ static const OnigCodePoint CR_L[] = {
 	0x1ff6, 0x1ffc,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x2102, 0x2102,
 	0x2107, 0x2107,
 	0x210a, 0x2113,
@@ -1375,7 +1410,7 @@ static const OnigCodePoint CR_L[] = {
 	0x30fc, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -1384,14 +1419,15 @@ static const OnigCodePoint CR_L[] = {
 	0xa500, 0xa60c,
 	0xa610, 0xa61f,
 	0xa62a, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa66e,
+	0xa640, 0xa66e,
 	0xa67f, 0xa697,
 	0xa6a0, 0xa6e5,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa801,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa801,
 	0xa803, 0xa805,
 	0xa807, 0xa80a,
 	0xa80c, 0xa822,
@@ -1416,6 +1452,11 @@ static const OnigCodePoint CR_L[] = {
 	0xaac0, 0xaac0,
 	0xaac2, 0xaac2,
 	0xaadb, 0xaadd,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabe2,
 	0xac00, 0xd7a3,
 	0xd7b0, 0xd7c6,
@@ -1479,9 +1520,12 @@ static const OnigCodePoint CR_L[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11003, 0x11037,
 	0x11083, 0x110af,
 	0x12000, 0x1236e,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d400, 0x1d454,
 	0x1d456, 0x1d49c,
 	0x1d49e, 0x1d49f,
@@ -1514,12 +1558,13 @@ static const OnigCodePoint CR_L[] = {
 	0x1d7c4, 0x1d7cb,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_L */
 
 /* 'Ll': General Category */
 static const OnigCodePoint CR_Ll[] = {
-	599,
+	609,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
 	0x00b5, 0x00b5,
@@ -1786,6 +1831,7 @@ static const OnigCodePoint CR_Ll[] = {
 	0x0521, 0x0521,
 	0x0523, 0x0523,
 	0x0525, 0x0525,
+	0x0527, 0x0527,
 	0x0561, 0x0587,
 	0x1d00, 0x1d2b,
 	0x1d62, 0x1d77,
@@ -2022,6 +2068,7 @@ static const OnigCodePoint CR_Ll[] = {
 	0xa65b, 0xa65b,
 	0xa65d, 0xa65d,
 	0xa65f, 0xa65f,
+	0xa661, 0xa661,
 	0xa663, 0xa663,
 	0xa665, 0xa665,
 	0xa667, 0xa667,
@@ -2087,6 +2134,14 @@ static const OnigCodePoint CR_Ll[] = {
 	0xa785, 0xa785,
 	0xa787, 0xa787,
 	0xa78c, 0xa78c,
+	0xa78e, 0xa78e,
+	0xa791, 0xa791,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
+	0xa7fa, 0xa7fa,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
 	0xff41, 0xff5a,
@@ -2152,7 +2207,7 @@ static const OnigCodePoint CR_Lm[] = {
 	0x1d9b, 0x1dbf,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x2c7d, 0x2c7d,
 	0x2d6f, 0x2d6f,
 	0x2e2f, 0x2e2f,
@@ -2177,13 +2232,13 @@ static const OnigCodePoint CR_Lm[] = {
 
 /* 'Lo': General Category */
 static const OnigCodePoint CR_Lo[] = {
-	311,
+	323,
 	0x01bb, 0x01bb,
 	0x01c0, 0x01c3,
 	0x0294, 0x0294,
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
-	0x0621, 0x063f,
+	0x0620, 0x063f,
 	0x0641, 0x064a,
 	0x066e, 0x066f,
 	0x0671, 0x06d3,
@@ -2197,11 +2252,12 @@ static const OnigCodePoint CR_Lo[] = {
 	0x07b1, 0x07b1,
 	0x07ca, 0x07ea,
 	0x0800, 0x0815,
+	0x0840, 0x0858,
 	0x0904, 0x0939,
 	0x093d, 0x093d,
 	0x0950, 0x0950,
 	0x0958, 0x0961,
-	0x0972, 0x0972,
+	0x0972, 0x0977,
 	0x0979, 0x097f,
 	0x0985, 0x098c,
 	0x098f, 0x0990,
@@ -2270,11 +2326,12 @@ static const OnigCodePoint CR_Lo[] = {
 	0x0cbd, 0x0cbd,
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce1,
+	0x0cf1, 0x0cf2,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
 	0x0d60, 0x0d61,
 	0x0d7a, 0x0d7f,
 	0x0d85, 0x0d96,
@@ -2304,7 +2361,7 @@ static const OnigCodePoint CR_Lo[] = {
 	0x0f00, 0x0f00,
 	0x0f40, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8b,
+	0x0f88, 0x0f8c,
 	0x1000, 0x102a,
 	0x103f, 0x103f,
 	0x1050, 0x1055,
@@ -2361,6 +2418,7 @@ static const OnigCodePoint CR_Lo[] = {
 	0x1b45, 0x1b4b,
 	0x1b83, 0x1ba0,
 	0x1bae, 0x1baf,
+	0x1bc0, 0x1be5,
 	0x1c00, 0x1c23,
 	0x1c4d, 0x1c4f,
 	0x1c5a, 0x1c77,
@@ -2385,7 +2443,7 @@ static const OnigCodePoint CR_Lo[] = {
 	0x30ff, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -2422,6 +2480,11 @@ static const OnigCodePoint CR_Lo[] = {
 	0xaac0, 0xaac0,
 	0xaac2, 0xaac2,
 	0xaadb, 0xaadc,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabe2,
 	0xac00, 0xd7a3,
 	0xd7b0, 0xd7c6,
@@ -2483,11 +2546,15 @@ static const OnigCodePoint CR_Lo[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11003, 0x11037,
 	0x11083, 0x110af,
 	0x12000, 0x1236e,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_Lo */
 
@@ -2508,7 +2575,7 @@ static const OnigCodePoint CR_Lt[] = {
 
 /* 'Lu': General Category */
 static const OnigCodePoint CR_Lu[] = {
-	594,
+	603,
 	0x0041, 0x005a,
 	0x00c0, 0x00d6,
 	0x00d8, 0x00de,
@@ -2774,6 +2841,7 @@ static const OnigCodePoint CR_Lu[] = {
 	0x0520, 0x0520,
 	0x0522, 0x0522,
 	0x0524, 0x0524,
+	0x0526, 0x0526,
 	0x0531, 0x0556,
 	0x10a0, 0x10c5,
 	0x1e00, 0x1e00,
@@ -3006,6 +3074,7 @@ static const OnigCodePoint CR_Lu[] = {
 	0xa65a, 0xa65a,
 	0xa65c, 0xa65c,
 	0xa65e, 0xa65e,
+	0xa660, 0xa660,
 	0xa662, 0xa662,
 	0xa664, 0xa664,
 	0xa666, 0xa666,
@@ -3070,6 +3139,13 @@ static const OnigCodePoint CR_Lu[] = {
 	0xa784, 0xa784,
 	0xa786, 0xa786,
 	0xa78b, 0xa78b,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
 	0xff21, 0xff3a,
 	0x10400, 0x10427,
 	0x1d400, 0x1d419,
@@ -3107,7 +3183,7 @@ static const OnigCodePoint CR_Lu[] = {
 
 /* 'M': Major Category */
 static const OnigCodePoint CR_M[] = {
-	188,
+	193,
 	0x0300, 0x036f,
 	0x0483, 0x0489,
 	0x0591, 0x05bd,
@@ -3116,10 +3192,10 @@ static const OnigCodePoint CR_M[] = {
 	0x05c4, 0x05c5,
 	0x05c7, 0x05c7,
 	0x0610, 0x061a,
-	0x064b, 0x065e,
+	0x064b, 0x065f,
 	0x0670, 0x0670,
 	0x06d6, 0x06dc,
-	0x06de, 0x06e4,
+	0x06df, 0x06e4,
 	0x06e7, 0x06e8,
 	0x06ea, 0x06ed,
 	0x0711, 0x0711,
@@ -3130,10 +3206,11 @@ static const OnigCodePoint CR_M[] = {
 	0x081b, 0x0823,
 	0x0825, 0x0827,
 	0x0829, 0x082d,
+	0x0859, 0x085b,
 	0x0900, 0x0903,
-	0x093c, 0x093c,
-	0x093e, 0x094e,
-	0x0951, 0x0955,
+	0x093a, 0x093c,
+	0x093e, 0x094f,
+	0x0951, 0x0957,
 	0x0962, 0x0963,
 	0x0981, 0x0983,
 	0x09bc, 0x09bc,
@@ -3207,7 +3284,7 @@ static const OnigCodePoint CR_M[] = {
 	0x0f3e, 0x0f3f,
 	0x0f71, 0x0f84,
 	0x0f86, 0x0f87,
-	0x0f90, 0x0f97,
+	0x0f8d, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fc6, 0x0fc6,
 	0x102b, 0x103e,
@@ -3219,7 +3296,7 @@ static const OnigCodePoint CR_M[] = {
 	0x1082, 0x108d,
 	0x108f, 0x108f,
 	0x109a, 0x109d,
-	0x135f, 0x135f,
+	0x135d, 0x135f,
 	0x1712, 0x1714,
 	0x1732, 0x1734,
 	0x1752, 0x1753,
@@ -3241,15 +3318,17 @@ static const OnigCodePoint CR_M[] = {
 	0x1b6b, 0x1b73,
 	0x1b80, 0x1b82,
 	0x1ba1, 0x1baa,
+	0x1be6, 0x1bf3,
 	0x1c24, 0x1c37,
 	0x1cd0, 0x1cd2,
 	0x1cd4, 0x1ce8,
 	0x1ced, 0x1ced,
 	0x1cf2, 0x1cf2,
 	0x1dc0, 0x1de6,
-	0x1dfd, 0x1dff,
+	0x1dfc, 0x1dff,
 	0x20d0, 0x20f0,
 	0x2cef, 0x2cf1,
+	0x2d7f, 0x2d7f,
 	0x2de0, 0x2dff,
 	0x302a, 0x302f,
 	0x3099, 0x309a,
@@ -3287,6 +3366,8 @@ static const OnigCodePoint CR_M[] = {
 	0x10a0c, 0x10a0f,
 	0x10a38, 0x10a3a,
 	0x10a3f, 0x10a3f,
+	0x11000, 0x11002,
+	0x11038, 0x11046,
 	0x11080, 0x11082,
 	0x110b0, 0x110ba,
 	0x1d165, 0x1d169,
@@ -3300,11 +3381,12 @@ static const OnigCodePoint CR_M[] = {
 
 /* 'Mc': General Category */
 static const OnigCodePoint CR_Mc[] = {
-	106,
+	113,
 	0x0903, 0x0903,
+	0x093b, 0x093b,
 	0x093e, 0x0940,
 	0x0949, 0x094c,
-	0x094e, 0x094e,
+	0x094e, 0x094f,
 	0x0982, 0x0983,
 	0x09be, 0x09c0,
 	0x09c7, 0x09c8,
@@ -3381,6 +3463,10 @@ static const OnigCodePoint CR_Mc[] = {
 	0x1ba1, 0x1ba1,
 	0x1ba6, 0x1ba7,
 	0x1baa, 0x1baa,
+	0x1be7, 0x1be7,
+	0x1bea, 0x1bec,
+	0x1bee, 0x1bee,
+	0x1bf2, 0x1bf3,
 	0x1c24, 0x1c2b,
 	0x1c34, 0x1c35,
 	0x1ce1, 0x1ce1,
@@ -3402,6 +3488,8 @@ static const OnigCodePoint CR_Mc[] = {
 	0xabe6, 0xabe7,
 	0xabe9, 0xabea,
 	0xabec, 0xabec,
+	0x11000, 0x11000,
+	0x11002, 0x11002,
 	0x11082, 0x11082,
 	0x110b0, 0x110b2,
 	0x110b7, 0x110b8,
@@ -3411,9 +3499,8 @@ static const OnigCodePoint CR_Mc[] = {
 
 /* 'Me': General Category */
 static const OnigCodePoint CR_Me[] = {
-	5,
+	4,
 	0x0488, 0x0489,
-	0x06de, 0x06de,
 	0x20dd, 0x20e0,
 	0x20e2, 0x20e4,
 	0xa670, 0xa672,
@@ -3421,7 +3508,7 @@ static const OnigCodePoint CR_Me[] = {
 
 /* 'Mn': General Category */
 static const OnigCodePoint CR_Mn[] = {
-	194,
+	203,
 	0x0300, 0x036f,
 	0x0483, 0x0487,
 	0x0591, 0x05bd,
@@ -3430,7 +3517,7 @@ static const OnigCodePoint CR_Mn[] = {
 	0x05c4, 0x05c5,
 	0x05c7, 0x05c7,
 	0x0610, 0x061a,
-	0x064b, 0x065e,
+	0x064b, 0x065f,
 	0x0670, 0x0670,
 	0x06d6, 0x06dc,
 	0x06df, 0x06e4,
@@ -3444,11 +3531,13 @@ static const OnigCodePoint CR_Mn[] = {
 	0x081b, 0x0823,
 	0x0825, 0x0827,
 	0x0829, 0x082d,
+	0x0859, 0x085b,
 	0x0900, 0x0902,
+	0x093a, 0x093a,
 	0x093c, 0x093c,
 	0x0941, 0x0948,
 	0x094d, 0x094d,
-	0x0951, 0x0955,
+	0x0951, 0x0957,
 	0x0962, 0x0963,
 	0x0981, 0x0981,
 	0x09bc, 0x09bc,
@@ -3509,7 +3598,7 @@ static const OnigCodePoint CR_Mn[] = {
 	0x0f71, 0x0f7e,
 	0x0f80, 0x0f84,
 	0x0f86, 0x0f87,
-	0x0f90, 0x0f97,
+	0x0f8d, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fc6, 0x0fc6,
 	0x102d, 0x1030,
@@ -3523,7 +3612,7 @@ static const OnigCodePoint CR_Mn[] = {
 	0x1085, 0x1086,
 	0x108d, 0x108d,
 	0x109d, 0x109d,
-	0x135f, 0x135f,
+	0x135d, 0x135f,
 	0x1712, 0x1714,
 	0x1732, 0x1734,
 	0x1752, 0x1753,
@@ -3555,6 +3644,10 @@ static const OnigCodePoint CR_Mn[] = {
 	0x1b80, 0x1b81,
 	0x1ba2, 0x1ba5,
 	0x1ba8, 0x1ba9,
+	0x1be6, 0x1be6,
+	0x1be8, 0x1be9,
+	0x1bed, 0x1bed,
+	0x1bef, 0x1bf1,
 	0x1c2c, 0x1c33,
 	0x1c36, 0x1c37,
 	0x1cd0, 0x1cd2,
@@ -3562,11 +3655,12 @@ static const OnigCodePoint CR_Mn[] = {
 	0x1ce2, 0x1ce8,
 	0x1ced, 0x1ced,
 	0x1dc0, 0x1de6,
-	0x1dfd, 0x1dff,
+	0x1dfc, 0x1dff,
 	0x20d0, 0x20dc,
 	0x20e1, 0x20e1,
 	0x20e5, 0x20f0,
 	0x2cef, 0x2cf1,
+	0x2d7f, 0x2d7f,
 	0x2de0, 0x2dff,
 	0x302a, 0x302f,
 	0x3099, 0x309a,
@@ -3607,6 +3701,8 @@ static const OnigCodePoint CR_Mn[] = {
 	0x10a0c, 0x10a0f,
 	0x10a38, 0x10a3a,
 	0x10a3f, 0x10a3f,
+	0x11001, 0x11001,
+	0x11038, 0x11046,
 	0x11080, 0x11081,
 	0x110b3, 0x110b6,
 	0x110b9, 0x110ba,
@@ -3620,7 +3716,7 @@ static const OnigCodePoint CR_Mn[] = {
 
 /* 'N': Major Category */
 static const OnigCodePoint CR_N[] = {
-	81,
+	83,
 	0x0030, 0x0039,
 	0x00b2, 0x00b3,
 	0x00b9, 0x00b9,
@@ -3634,6 +3730,7 @@ static const OnigCodePoint CR_N[] = {
 	0x0a66, 0x0a6f,
 	0x0ae6, 0x0aef,
 	0x0b66, 0x0b6f,
+	0x0b72, 0x0b77,
 	0x0be6, 0x0bf2,
 	0x0c66, 0x0c6f,
 	0x0c78, 0x0c7e,
@@ -3698,6 +3795,7 @@ static const OnigCodePoint CR_N[] = {
 	0x10b58, 0x10b5f,
 	0x10b78, 0x10b7f,
 	0x10e60, 0x10e7e,
+	0x11052, 0x1106f,
 	0x12400, 0x12462,
 	0x1d360, 0x1d371,
 	0x1d7ce, 0x1d7ff,
@@ -3706,7 +3804,7 @@ static const OnigCodePoint CR_N[] = {
 
 /* 'Nd': General Category */
 static const OnigCodePoint CR_Nd[] = {
-	37,
+	38,
 	0x0030, 0x0039,
 	0x0660, 0x0669,
 	0x06f0, 0x06f9,
@@ -3728,7 +3826,7 @@ static const OnigCodePoint CR_Nd[] = {
 	0x17e0, 0x17e9,
 	0x1810, 0x1819,
 	0x1946, 0x194f,
-	0x19d0, 0x19da,
+	0x19d0, 0x19d9,
 	0x1a80, 0x1a89,
 	0x1a90, 0x1a99,
 	0x1b50, 0x1b59,
@@ -3743,6 +3841,7 @@ static const OnigCodePoint CR_Nd[] = {
 	0xabf0, 0xabf9,
 	0xff10, 0xff19,
 	0x104a0, 0x104a9,
+	0x11066, 0x1106f,
 	0x1d7ce, 0x1d7ff,
 }; /* CR_Nd */
 
@@ -3765,17 +3864,19 @@ static const OnigCodePoint CR_Nl[] = {
 
 /* 'No': General Category */
 static const OnigCodePoint CR_No[] = {
-	38,
+	41,
 	0x00b2, 0x00b3,
 	0x00b9, 0x00b9,
 	0x00bc, 0x00be,
 	0x09f4, 0x09f9,
+	0x0b72, 0x0b77,
 	0x0bf0, 0x0bf2,
 	0x0c78, 0x0c7e,
 	0x0d70, 0x0d75,
 	0x0f2a, 0x0f33,
 	0x1369, 0x137c,
 	0x17f0, 0x17f9,
+	0x19da, 0x19da,
 	0x2070, 0x2070,
 	0x2074, 0x2079,
 	0x2080, 0x2089,
@@ -3802,13 +3903,14 @@ static const OnigCodePoint CR_No[] = {
 	0x10b58, 0x10b5f,
 	0x10b78, 0x10b7f,
 	0x10e60, 0x10e7e,
+	0x11052, 0x11065,
 	0x1d360, 0x1d371,
 	0x1f100, 0x1f10a,
 }; /* CR_No */
 
 /* 'P': Major Category */
 static const OnigCodePoint CR_P[] = {
-	129,
+	133,
 	0x0021, 0x0023,
 	0x0025, 0x002a,
 	0x002c, 0x002f,
@@ -3841,6 +3943,7 @@ static const OnigCodePoint CR_P[] = {
 	0x0700, 0x070d,
 	0x07f7, 0x07f9,
 	0x0830, 0x083e,
+	0x085e, 0x085e,
 	0x0964, 0x0965,
 	0x0970, 0x0970,
 	0x0df4, 0x0df4,
@@ -3850,6 +3953,7 @@ static const OnigCodePoint CR_P[] = {
 	0x0f3a, 0x0f3d,
 	0x0f85, 0x0f85,
 	0x0fd0, 0x0fd4,
+	0x0fd9, 0x0fda,
 	0x104a, 0x104f,
 	0x10fb, 0x10fb,
 	0x1361, 0x1368,
@@ -3862,11 +3966,11 @@ static const OnigCodePoint CR_P[] = {
 	0x17d8, 0x17da,
 	0x1800, 0x180a,
 	0x1944, 0x1945,
-	0x19de, 0x19df,
 	0x1a1e, 0x1a1f,
 	0x1aa0, 0x1aa6,
 	0x1aa8, 0x1aad,
 	0x1b5a, 0x1b60,
+	0x1bfc, 0x1bff,
 	0x1c3b, 0x1c3f,
 	0x1c7e, 0x1c7f,
 	0x1cd3, 0x1cd3,
@@ -3885,6 +3989,7 @@ static const OnigCodePoint CR_P[] = {
 	0x29fc, 0x29fd,
 	0x2cf9, 0x2cfc,
 	0x2cfe, 0x2cff,
+	0x2d70, 0x2d70,
 	0x2e00, 0x2e2e,
 	0x2e30, 0x2e31,
 	0x3001, 0x3003,
@@ -3935,6 +4040,7 @@ static const OnigCodePoint CR_P[] = {
 	0x10a50, 0x10a58,
 	0x10a7f, 0x10a7f,
 	0x10b39, 0x10b3f,
+	0x11047, 0x1104d,
 	0x110bb, 0x110bc,
 	0x110be, 0x110c1,
 	0x12470, 0x12473,
@@ -4079,7 +4185,7 @@ static const OnigCodePoint CR_Pi[] = {
 
 /* 'Po': General Category */
 static const OnigCodePoint CR_Po[] = {
-	124,
+	128,
 	0x0021, 0x0023,
 	0x0025, 0x0027,
 	0x002a, 0x002a,
@@ -4108,6 +4214,7 @@ static const OnigCodePoint CR_Po[] = {
 	0x0700, 0x070d,
 	0x07f7, 0x07f9,
 	0x0830, 0x083e,
+	0x085e, 0x085e,
 	0x0964, 0x0965,
 	0x0970, 0x0970,
 	0x0df4, 0x0df4,
@@ -4116,6 +4223,7 @@ static const OnigCodePoint CR_Po[] = {
 	0x0f04, 0x0f12,
 	0x0f85, 0x0f85,
 	0x0fd0, 0x0fd4,
+	0x0fd9, 0x0fda,
 	0x104a, 0x104f,
 	0x10fb, 0x10fb,
 	0x1361, 0x1368,
@@ -4127,11 +4235,11 @@ static const OnigCodePoint CR_Po[] = {
 	0x1800, 0x1805,
 	0x1807, 0x180a,
 	0x1944, 0x1945,
-	0x19de, 0x19df,
 	0x1a1e, 0x1a1f,
 	0x1aa0, 0x1aa6,
 	0x1aa8, 0x1aad,
 	0x1b5a, 0x1b60,
+	0x1bfc, 0x1bff,
 	0x1c3b, 0x1c3f,
 	0x1c7e, 0x1c7f,
 	0x1cd3, 0x1cd3,
@@ -4145,6 +4253,7 @@ static const OnigCodePoint CR_Po[] = {
 	0x2055, 0x205e,
 	0x2cf9, 0x2cfc,
 	0x2cfe, 0x2cff,
+	0x2d70, 0x2d70,
 	0x2e00, 0x2e01,
 	0x2e06, 0x2e08,
 	0x2e0b, 0x2e0b,
@@ -4201,6 +4310,7 @@ static const OnigCodePoint CR_Po[] = {
 	0x10a50, 0x10a58,
 	0x10a7f, 0x10a7f,
 	0x10b39, 0x10b3f,
+	0x11047, 0x1104d,
 	0x110bb, 0x110bc,
 	0x110be, 0x110c1,
 	0x12470, 0x12473,
@@ -4285,7 +4395,7 @@ static const OnigCodePoint CR_Ps[] = {
 
 /* 'S': Major Category */
 static const OnigCodePoint CR_S[] = {
-	198,
+	208,
 	0x0024, 0x0024,
 	0x002b, 0x002b,
 	0x003c, 0x003e,
@@ -4313,6 +4423,7 @@ static const OnigCodePoint CR_S[] = {
 	0x0606, 0x0608,
 	0x060b, 0x060b,
 	0x060e, 0x060f,
+	0x06de, 0x06de,
 	0x06e9, 0x06e9,
 	0x06fd, 0x06fe,
 	0x07f6, 0x07f6,
@@ -4322,7 +4433,6 @@ static const OnigCodePoint CR_S[] = {
 	0x0b70, 0x0b70,
 	0x0bf3, 0x0bfa,
 	0x0c7f, 0x0c7f,
-	0x0cf1, 0x0cf2,
 	0x0d79, 0x0d79,
 	0x0e3f, 0x0e3f,
 	0x0f01, 0x0f03,
@@ -4340,7 +4450,7 @@ static const OnigCodePoint CR_S[] = {
 	0x1390, 0x1399,
 	0x17db, 0x17db,
 	0x1940, 0x1940,
-	0x19e0, 0x19ff,
+	0x19de, 0x19ff,
 	0x1b61, 0x1b6a,
 	0x1b74, 0x1b7c,
 	0x1fbd, 0x1fbd,
@@ -4353,7 +4463,7 @@ static const OnigCodePoint CR_S[] = {
 	0x2052, 0x2052,
 	0x207a, 0x207c,
 	0x208a, 0x208c,
-	0x20a0, 0x20b8,
+	0x20a0, 0x20b9,
 	0x2100, 0x2101,
 	0x2103, 0x2106,
 	0x2108, 0x2109,
@@ -4369,29 +4479,16 @@ static const OnigCodePoint CR_S[] = {
 	0x214a, 0x214d,
 	0x214f, 0x214f,
 	0x2190, 0x2328,
-	0x232b, 0x23e8,
+	0x232b, 0x23f3,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
 	0x249c, 0x24e9,
-	0x2500, 0x26cd,
-	0x26cf, 0x26e1,
-	0x26e3, 0x26e3,
-	0x26e8, 0x26ff,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x275e,
-	0x2761, 0x2767,
-	0x2794, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27c4,
+	0x2500, 0x26ff,
+	0x2701, 0x2767,
+	0x2794, 0x27c4,
 	0x27c7, 0x27ca,
 	0x27cc, 0x27cc,
-	0x27d0, 0x27e5,
+	0x27ce, 0x27e5,
 	0x27f0, 0x2982,
 	0x2999, 0x29d7,
 	0x29dc, 0x29fb,
@@ -4426,6 +4523,7 @@ static const OnigCodePoint CR_S[] = {
 	0xa836, 0xa839,
 	0xaa77, 0xaa79,
 	0xfb29, 0xfb29,
+	0xfbb2, 0xfbc1,
 	0xfdfc, 0xfdfd,
 	0xfe62, 0xfe62,
 	0xfe64, 0xfe66,
@@ -4467,23 +4565,45 @@ static const OnigCodePoint CR_S[] = {
 	0x1d7c3, 0x1d7c3,
 	0x1f000, 0x1f02b,
 	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
 	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,
+	0x1f130, 0x1f169,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
 	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f5ff,
+	0x1f601, 0x1f610,
+	0x1f612, 0x1f614,
+	0x1f616, 0x1f616,
+	0x1f618, 0x1f618,
+	0x1f61a, 0x1f61a,
+	0x1f61c, 0x1f61e,
+	0x1f620, 0x1f625,
+	0x1f628, 0x1f62b,
+	0x1f62d, 0x1f62d,
+	0x1f630, 0x1f633,
+	0x1f635, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
 }; /* CR_S */
 
 /* 'Sc': General Category */
@@ -4498,7 +4618,7 @@ static const OnigCodePoint CR_Sc[] = {
 	0x0bf9, 0x0bf9,
 	0x0e3f, 0x0e3f,
 	0x17db, 0x17db,
-	0x20a0, 0x20b8,
+	0x20a0, 0x20b9,
 	0xa838, 0xa838,
 	0xfdfc, 0xfdfc,
 	0xfe69, 0xfe69,
@@ -4509,7 +4629,7 @@ static const OnigCodePoint CR_Sc[] = {
 
 /* 'Sk': General Category */
 static const OnigCodePoint CR_Sk[] = {
-	26,
+	27,
 	0x005e, 0x005e,
 	0x0060, 0x0060,
 	0x00a8, 0x00a8,
@@ -4533,6 +4653,7 @@ static const OnigCodePoint CR_Sk[] = {
 	0xa700, 0xa716,
 	0xa720, 0xa721,
 	0xa789, 0xa78a,
+	0xfbb2, 0xfbc1,
 	0xff3e, 0xff3e,
 	0xff40, 0xff40,
 	0xffe3, 0xffe3,
@@ -4540,7 +4661,7 @@ static const OnigCodePoint CR_Sk[] = {
 
 /* 'Sm': General Category */
 static const OnigCodePoint CR_Sm[] = {
-	65,
+	66,
 	0x002b, 0x002b,
 	0x003c, 0x003e,
 	0x007c, 0x007c,
@@ -4555,6 +4676,7 @@ static const OnigCodePoint CR_Sm[] = {
 	0x2052, 0x2052,
 	0x207a, 0x207c,
 	0x208a, 0x208c,
+	0x2118, 0x2118,
 	0x2140, 0x2144,
 	0x214b, 0x214b,
 	0x2190, 0x2194,
@@ -4579,7 +4701,7 @@ static const OnigCodePoint CR_Sm[] = {
 	0x27c0, 0x27c4,
 	0x27c7, 0x27ca,
 	0x27cc, 0x27cc,
-	0x27d0, 0x27e5,
+	0x27ce, 0x27e5,
 	0x27f0, 0x27ff,
 	0x2900, 0x2982,
 	0x2999, 0x29d7,
@@ -4610,7 +4732,7 @@ static const OnigCodePoint CR_Sm[] = {
 
 /* 'So': General Category */
 static const OnigCodePoint CR_So[] = {
-	154,
+	164,
 	0x00a6, 0x00a7,
 	0x00a9, 0x00a9,
 	0x00ae, 0x00ae,
@@ -4618,6 +4740,7 @@ static const OnigCodePoint CR_So[] = {
 	0x00b6, 0x00b6,
 	0x0482, 0x0482,
 	0x060e, 0x060f,
+	0x06de, 0x06de,
 	0x06e9, 0x06e9,
 	0x06fd, 0x06fe,
 	0x07f6, 0x07f6,
@@ -4626,7 +4749,6 @@ static const OnigCodePoint CR_So[] = {
 	0x0bf3, 0x0bf8,
 	0x0bfa, 0x0bfa,
 	0x0c7f, 0x0c7f,
-	0x0cf1, 0x0cf2,
 	0x0d79, 0x0d79,
 	0x0f01, 0x0f03,
 	0x0f13, 0x0f17,
@@ -4642,14 +4764,14 @@ static const OnigCodePoint CR_So[] = {
 	0x1360, 0x1360,
 	0x1390, 0x1399,
 	0x1940, 0x1940,
-	0x19e0, 0x19ff,
+	0x19de, 0x19ff,
 	0x1b61, 0x1b6a,
 	0x1b74, 0x1b7c,
 	0x2100, 0x2101,
 	0x2103, 0x2106,
 	0x2108, 0x2109,
 	0x2114, 0x2114,
-	0x2116, 0x2118,
+	0x2116, 0x2117,
 	0x211e, 0x2123,
 	0x2125, 0x2125,
 	0x2127, 0x2127,
@@ -4674,7 +4796,7 @@ static const OnigCodePoint CR_So[] = {
 	0x232b, 0x237b,
 	0x237d, 0x239a,
 	0x23b4, 0x23db,
-	0x23e2, 0x23e8,
+	0x23e2, 0x23f3,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
 	0x249c, 0x24e9,
@@ -4682,21 +4804,9 @@ static const OnigCodePoint CR_So[] = {
 	0x25b8, 0x25c0,
 	0x25c2, 0x25f7,
 	0x2600, 0x266e,
-	0x2670, 0x26cd,
-	0x26cf, 0x26e1,
-	0x26e3, 0x26e3,
-	0x26e8, 0x26ff,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x275e,
-	0x2761, 0x2767,
-	0x2794, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
+	0x2670, 0x26ff,
+	0x2701, 0x2767,
+	0x2794, 0x27bf,
 	0x2800, 0x28ff,
 	0x2b00, 0x2b2f,
 	0x2b45, 0x2b46,
@@ -4748,23 +4858,45 @@ static const OnigCodePoint CR_So[] = {
 	0x1d300, 0x1d356,
 	0x1f000, 0x1f02b,
 	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
 	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,
+	0x1f130, 0x1f169,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
 	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f5ff,
+	0x1f601, 0x1f610,
+	0x1f612, 0x1f614,
+	0x1f616, 0x1f616,
+	0x1f618, 0x1f618,
+	0x1f61a, 0x1f61a,
+	0x1f61c, 0x1f61e,
+	0x1f620, 0x1f625,
+	0x1f628, 0x1f62b,
+	0x1f62d, 0x1f62d,
+	0x1f630, 0x1f633,
+	0x1f635, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
 }; /* CR_So */
 
 /* 'Z': Major Category */
@@ -4808,7 +4940,7 @@ static const OnigCodePoint CR_Zs[] = {
 
 /* 'Math': Derived Property */
 static const OnigCodePoint CR_Math[] = {
-	105,
+	106,
 	0x002b, 0x002b,
 	0x003c, 0x003e,
 	0x005e, 0x005e,
@@ -4836,9 +4968,10 @@ static const OnigCodePoint CR_Math[] = {
 	0x20e5, 0x20e6,
 	0x20eb, 0x20ef,
 	0x2102, 0x2102,
+	0x2107, 0x2107,
 	0x210a, 0x2113,
 	0x2115, 0x2115,
-	0x2119, 0x211d,
+	0x2118, 0x211d,
 	0x2124, 0x2124,
 	0x2128, 0x2129,
 	0x212c, 0x212d,
@@ -4878,7 +5011,7 @@ static const OnigCodePoint CR_Math[] = {
 	0x266d, 0x266f,
 	0x27c0, 0x27ca,
 	0x27cc, 0x27cc,
-	0x27d0, 0x27ff,
+	0x27ce, 0x27ff,
 	0x2900, 0x2aff,
 	0x2b30, 0x2b44,
 	0x2b47, 0x2b4c,
@@ -4918,7 +5051,7 @@ static const OnigCodePoint CR_Math[] = {
 
 /* 'Alphabetic': Derived Property */
 static const OnigCodePoint CR_Alphabetic[] = {
-	474,
+	486,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -4941,7 +5074,7 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x038e, 0x03a1,
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x0559,
 	0x0561, 0x0587,
@@ -4953,8 +5086,8 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
 	0x0610, 0x061a,
-	0x0621, 0x0657,
-	0x0659, 0x065e,
+	0x0620, 0x0657,
+	0x0659, 0x065f,
 	0x066e, 0x06d3,
 	0x06d5, 0x06dc,
 	0x06e1, 0x06e8,
@@ -4968,13 +5101,12 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x07fa, 0x07fa,
 	0x0800, 0x0817,
 	0x081a, 0x082c,
-	0x0900, 0x0939,
+	0x0840, 0x0858,
+	0x0900, 0x093b,
 	0x093d, 0x094c,
-	0x094e, 0x094e,
-	0x0950, 0x0950,
-	0x0955, 0x0955,
-	0x0958, 0x0963,
-	0x0971, 0x0972,
+	0x094e, 0x0950,
+	0x0955, 0x0963,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
@@ -5071,14 +5203,15 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x0cd5, 0x0cd6,
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce3,
+	0x0cf1, 0x0cf2,
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
 	0x0d4a, 0x0d4c,
+	0x0d4e, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d7a, 0x0d7f,
@@ -5116,8 +5249,7 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x0f40, 0x0f47,
 	0x0f49, 0x0f6c,
 	0x0f71, 0x0f81,
-	0x0f88, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f88, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x1000, 0x1036,
 	0x1038, 0x1038,
@@ -5184,6 +5316,8 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x1b45, 0x1b4b,
 	0x1b80, 0x1ba9,
 	0x1bae, 0x1baf,
+	0x1bc0, 0x1be5,
+	0x1be7, 0x1bf1,
 	0x1c00, 0x1c35,
 	0x1c4d, 0x1c4f,
 	0x1c5a, 0x1c7d,
@@ -5211,7 +5345,7 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x1ff6, 0x1ffc,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x2102, 0x2102,
 	0x2107, 0x2107,
 	0x210a, 0x2113,
@@ -5255,7 +5389,7 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x30fc, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -5264,14 +5398,15 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0xa500, 0xa60c,
 	0xa610, 0xa61f,
 	0xa62a, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa66e,
+	0xa640, 0xa66e,
 	0xa67f, 0xa697,
 	0xa6a0, 0xa6ef,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa801,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa801,
 	0xa803, 0xa805,
 	0xa807, 0xa80a,
 	0xa80c, 0xa827,
@@ -5282,7 +5417,8 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0xa90a, 0xa92a,
 	0xa930, 0xa952,
 	0xa960, 0xa97c,
-	0xa980, 0xa9bf,
+	0xa980, 0xa9b2,
+	0xa9b4, 0xa9bf,
 	0xa9cf, 0xa9cf,
 	0xaa00, 0xaa36,
 	0xaa40, 0xaa4d,
@@ -5292,6 +5428,11 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0xaac0, 0xaac0,
 	0xaac2, 0xaac2,
 	0xaadb, 0xaadd,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabea,
 	0xac00, 0xd7a3,
 	0xd7b0, 0xd7c6,
@@ -5356,10 +5497,13 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11000, 0x11045,
 	0x11082, 0x110b8,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d400, 0x1d454,
 	0x1d456, 0x1d49c,
 	0x1d49e, 0x1d49f,
@@ -5392,12 +5536,13 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x1d7c4, 0x1d7cb,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_Alphabetic */
 
 /* 'Lowercase': Derived Property */
 static const OnigCodePoint CR_Lowercase[] = {
-	602,
+	612,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
 	0x00b5, 0x00b5,
@@ -5667,6 +5812,7 @@ static const OnigCodePoint CR_Lowercase[] = {
 	0x0521, 0x0521,
 	0x0523, 0x0523,
 	0x0525, 0x0525,
+	0x0527, 0x0527,
 	0x0561, 0x0587,
 	0x1d00, 0x1dbf,
 	0x1e01, 0x1e01,
@@ -5904,6 +6050,7 @@ static const OnigCodePoint CR_Lowercase[] = {
 	0xa65b, 0xa65b,
 	0xa65d, 0xa65d,
 	0xa65f, 0xa65f,
+	0xa661, 0xa661,
 	0xa663, 0xa663,
 	0xa665, 0xa665,
 	0xa667, 0xa667,
@@ -5968,6 +6115,14 @@ static const OnigCodePoint CR_Lowercase[] = {
 	0xa785, 0xa785,
 	0xa787, 0xa787,
 	0xa78c, 0xa78c,
+	0xa78e, 0xa78e,
+	0xa791, 0xa791,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
+	0xa7fa, 0xa7fa,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
 	0xff41, 0xff5a,
@@ -6004,7 +6159,7 @@ static const OnigCodePoint CR_Lowercase[] = {
 
 /* 'Uppercase': Derived Property */
 static const OnigCodePoint CR_Uppercase[] = {
-	596,
+	605,
 	0x0041, 0x005a,
 	0x00c0, 0x00d6,
 	0x00d8, 0x00de,
@@ -6270,6 +6425,7 @@ static const OnigCodePoint CR_Uppercase[] = {
 	0x0520, 0x0520,
 	0x0522, 0x0522,
 	0x0524, 0x0524,
+	0x0526, 0x0526,
 	0x0531, 0x0556,
 	0x10a0, 0x10c5,
 	0x1e00, 0x1e00,
@@ -6504,6 +6660,7 @@ static const OnigCodePoint CR_Uppercase[] = {
 	0xa65a, 0xa65a,
 	0xa65c, 0xa65c,
 	0xa65e, 0xa65e,
+	0xa660, 0xa660,
 	0xa662, 0xa662,
 	0xa664, 0xa664,
 	0xa666, 0xa666,
@@ -6568,6 +6725,13 @@ static const OnigCodePoint CR_Uppercase[] = {
 	0xa784, 0xa784,
 	0xa786, 0xa786,
 	0xa78b, 0xa78b,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
 	0xff21, 0xff3a,
 	0x10400, 0x10427,
 	0x1d400, 0x1d419,
@@ -6605,7 +6769,7 @@ static const OnigCodePoint CR_Uppercase[] = {
 
 /* 'Cased': Derived Property */
 static const OnigCodePoint CR_Cased[] = {
-	110,
+	112,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -6629,7 +6793,7 @@ static const OnigCodePoint CR_Cased[] = {
 	0x038e, 0x03a1,
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0561, 0x0587,
 	0x10a0, 0x10c5,
@@ -6676,11 +6840,13 @@ static const OnigCodePoint CR_Cased[] = {
 	0x2c60, 0x2ce4,
 	0x2ceb, 0x2cee,
 	0x2d00, 0x2d25,
-	0xa640, 0xa65f,
-	0xa662, 0xa66d,
+	0xa640, 0xa66d,
 	0xa680, 0xa697,
 	0xa722, 0xa787,
-	0xa78b, 0xa78c,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa7fa,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
 	0xff21, 0xff3a,
@@ -6720,7 +6886,7 @@ static const OnigCodePoint CR_Cased[] = {
 
 /* 'Case_Ignorable': Derived Property */
 static const OnigCodePoint CR_Case_Ignorable[] = {
-	266,
+	277,
 	0x0027, 0x0027,
 	0x002e, 0x002e,
 	0x003a, 0x003a,
@@ -6747,9 +6913,10 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x0600, 0x0603,
 	0x0610, 0x061a,
 	0x0640, 0x0640,
-	0x064b, 0x065e,
+	0x064b, 0x065f,
 	0x0670, 0x0670,
-	0x06d6, 0x06e8,
+	0x06d6, 0x06dd,
+	0x06df, 0x06e8,
 	0x06ea, 0x06ed,
 	0x070f, 0x070f,
 	0x0711, 0x0711,
@@ -6758,11 +6925,13 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x07eb, 0x07f5,
 	0x07fa, 0x07fa,
 	0x0816, 0x082d,
+	0x0859, 0x085b,
 	0x0900, 0x0902,
+	0x093a, 0x093a,
 	0x093c, 0x093c,
 	0x0941, 0x0948,
 	0x094d, 0x094d,
-	0x0951, 0x0955,
+	0x0951, 0x0957,
 	0x0962, 0x0963,
 	0x0971, 0x0971,
 	0x0981, 0x0981,
@@ -6825,7 +6994,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x0f71, 0x0f7e,
 	0x0f80, 0x0f84,
 	0x0f86, 0x0f87,
-	0x0f90, 0x0f97,
+	0x0f8d, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fc6, 0x0fc6,
 	0x102d, 0x1030,
@@ -6840,7 +7009,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x108d, 0x108d,
 	0x109d, 0x109d,
 	0x10fc, 0x10fc,
-	0x135f, 0x135f,
+	0x135d, 0x135f,
 	0x1712, 0x1714,
 	0x1732, 0x1734,
 	0x1752, 0x1753,
@@ -6876,6 +7045,10 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x1b80, 0x1b81,
 	0x1ba2, 0x1ba5,
 	0x1ba8, 0x1ba9,
+	0x1be6, 0x1be6,
+	0x1be8, 0x1be9,
+	0x1bed, 0x1bed,
+	0x1bef, 0x1bf1,
 	0x1c2c, 0x1c33,
 	0x1c36, 0x1c37,
 	0x1c78, 0x1c7d,
@@ -6886,7 +7059,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x1d2c, 0x1d61,
 	0x1d78, 0x1d78,
 	0x1d9b, 0x1de6,
-	0x1dfd, 0x1dff,
+	0x1dfc, 0x1dff,
 	0x1fbd, 0x1fbd,
 	0x1fbf, 0x1fc1,
 	0x1fcd, 0x1fcf,
@@ -6902,11 +7075,12 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x206a, 0x206f,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x20d0, 0x20f0,
 	0x2c7d, 0x2c7d,
 	0x2cef, 0x2cf1,
 	0x2d6f, 0x2d6f,
+	0x2d7f, 0x2d7f,
 	0x2de0, 0x2dff,
 	0x2e2f, 0x2e2f,
 	0x3005, 0x3005,
@@ -6954,6 +7128,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0xabe8, 0xabe8,
 	0xabed, 0xabed,
 	0xfb1e, 0xfb1e,
+	0xfbb2, 0xfbc1,
 	0xfe00, 0xfe0f,
 	0xfe13, 0xfe13,
 	0xfe20, 0xfe26,
@@ -6975,6 +7150,8 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x10a0c, 0x10a0f,
 	0x10a38, 0x10a3a,
 	0x10a3f, 0x10a3f,
+	0x11001, 0x11001,
+	0x11038, 0x11046,
 	0x11080, 0x11081,
 	0x110b3, 0x110b6,
 	0x110b9, 0x110ba,
@@ -6991,7 +7168,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 
 /* 'Changes_When_Lowercased': Derived Property */
 static const OnigCodePoint CR_Changes_When_Lowercased[] = {
-	557,
+	566,
 	0x0041, 0x005a,
 	0x00c0, 0x00d6,
 	0x00d8, 0x00de,
@@ -7256,6 +7433,7 @@ static const OnigCodePoint CR_Changes_When_Lowercased[] = {
 	0x0520, 0x0520,
 	0x0522, 0x0522,
 	0x0524, 0x0524,
+	0x0526, 0x0526,
 	0x0531, 0x0556,
 	0x10a0, 0x10c5,
 	0x1e00, 0x1e00,
@@ -7483,6 +7661,7 @@ static const OnigCodePoint CR_Changes_When_Lowercased[] = {
 	0xa65a, 0xa65a,
 	0xa65c, 0xa65c,
 	0xa65e, 0xa65e,
+	0xa660, 0xa660,
 	0xa662, 0xa662,
 	0xa664, 0xa664,
 	0xa666, 0xa666,
@@ -7547,13 +7726,20 @@ static const OnigCodePoint CR_Changes_When_Lowercased[] = {
 	0xa784, 0xa784,
 	0xa786, 0xa786,
 	0xa78b, 0xa78b,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
 	0xff21, 0xff3a,
 	0x10400, 0x10427,
 }; /* CR_Changes_When_Lowercased */
 
 /* 'Changes_When_Uppercased': Derived Property */
 static const OnigCodePoint CR_Changes_When_Uppercased[] = {
-	573,
+	582,
 	0x0061, 0x007a,
 	0x00b5, 0x00b5,
 	0x00df, 0x00f6,
@@ -7703,6 +7889,7 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
 	0x025b, 0x025b,
 	0x0260, 0x0260,
 	0x0263, 0x0263,
+	0x0265, 0x0265,
 	0x0268, 0x0269,
 	0x026b, 0x026b,
 	0x026f, 0x026f,
@@ -7832,6 +8019,7 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
 	0x0521, 0x0521,
 	0x0523, 0x0523,
 	0x0525, 0x0525,
+	0x0527, 0x0527,
 	0x0561, 0x0587,
 	0x1d79, 0x1d79,
 	0x1d7d, 0x1d7d,
@@ -8059,6 +8247,7 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
 	0xa65b, 0xa65b,
 	0xa65d, 0xa65d,
 	0xa65f, 0xa65f,
+	0xa661, 0xa661,
 	0xa663, 0xa663,
 	0xa665, 0xa665,
 	0xa667, 0xa667,
@@ -8123,6 +8312,12 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
 	0xa785, 0xa785,
 	0xa787, 0xa787,
 	0xa78c, 0xa78c,
+	0xa791, 0xa791,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
 	0xff41, 0xff5a,
@@ -8131,7 +8326,7 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
 
 /* 'Changes_When_Titlecased': Derived Property */
 static const OnigCodePoint CR_Changes_When_Titlecased[] = {
-	574,
+	583,
 	0x0061, 0x007a,
 	0x00b5, 0x00b5,
 	0x00df, 0x00f6,
@@ -8282,6 +8477,7 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
 	0x025b, 0x025b,
 	0x0260, 0x0260,
 	0x0263, 0x0263,
+	0x0265, 0x0265,
 	0x0268, 0x0269,
 	0x026b, 0x026b,
 	0x026f, 0x026f,
@@ -8411,6 +8607,7 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
 	0x0521, 0x0521,
 	0x0523, 0x0523,
 	0x0525, 0x0525,
+	0x0527, 0x0527,
 	0x0561, 0x0587,
 	0x1d79, 0x1d79,
 	0x1d7d, 0x1d7d,
@@ -8638,6 +8835,7 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
 	0xa65b, 0xa65b,
 	0xa65d, 0xa65d,
 	0xa65f, 0xa65f,
+	0xa661, 0xa661,
 	0xa663, 0xa663,
 	0xa665, 0xa665,
 	0xa667, 0xa667,
@@ -8702,6 +8900,12 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
 	0xa785, 0xa785,
 	0xa787, 0xa787,
 	0xa78c, 0xa78c,
+	0xa791, 0xa791,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
 	0xff41, 0xff5a,
@@ -8710,7 +8914,7 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
 
 /* 'Changes_When_Casefolded': Derived Property */
 static const OnigCodePoint CR_Changes_When_Casefolded[] = {
-	568,
+	577,
 	0x0041, 0x005a,
 	0x00b5, 0x00b5,
 	0x00c0, 0x00d6,
@@ -8981,6 +9185,7 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
 	0x0520, 0x0520,
 	0x0522, 0x0522,
 	0x0524, 0x0524,
+	0x0526, 0x0526,
 	0x0531, 0x0556,
 	0x0587, 0x0587,
 	0x10a0, 0x10c5,
@@ -9211,6 +9416,7 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
 	0xa65a, 0xa65a,
 	0xa65c, 0xa65c,
 	0xa65e, 0xa65e,
+	0xa660, 0xa660,
 	0xa662, 0xa662,
 	0xa664, 0xa664,
 	0xa666, 0xa666,
@@ -9275,6 +9481,13 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
 	0xa784, 0xa784,
 	0xa786, 0xa786,
 	0xa78b, 0xa78b,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
 	0xff21, 0xff3a,
@@ -9283,7 +9496,7 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
 
 /* 'Changes_When_Casemapped': Derived Property */
 static const OnigCodePoint CR_Changes_When_Casemapped[] = {
-	97,
+	99,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00b5, 0x00b5,
@@ -9304,6 +9517,7 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
 	0x025b, 0x025b,
 	0x0260, 0x0260,
 	0x0263, 0x0263,
+	0x0265, 0x0265,
 	0x0268, 0x0269,
 	0x026b, 0x026b,
 	0x026f, 0x026f,
@@ -9327,7 +9541,7 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
 	0x03f4, 0x03f5,
 	0x03f7, 0x03fb,
 	0x03fd, 0x0481,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0561, 0x0587,
 	0x10a0, 0x10c5,
@@ -9369,13 +9583,14 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
 	0x2c7e, 0x2ce3,
 	0x2ceb, 0x2cee,
 	0x2d00, 0x2d25,
-	0xa640, 0xa65f,
-	0xa662, 0xa66d,
+	0xa640, 0xa66d,
 	0xa680, 0xa697,
 	0xa722, 0xa72f,
 	0xa732, 0xa76f,
 	0xa779, 0xa787,
-	0xa78b, 0xa78c,
+	0xa78b, 0xa78d,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
 	0xff21, 0xff3a,
@@ -9385,7 +9600,7 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
 
 /* 'ID_Start': Derived Property */
 static const OnigCodePoint CR_ID_Start[] = {
-	424,
+	437,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -9407,13 +9622,13 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x038e, 0x03a1,
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x0559,
 	0x0561, 0x0587,
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
-	0x0621, 0x064a,
+	0x0620, 0x064a,
 	0x066e, 0x066f,
 	0x0671, 0x06d3,
 	0x06d5, 0x06d5,
@@ -9432,11 +9647,12 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x081a, 0x081a,
 	0x0824, 0x0824,
 	0x0828, 0x0828,
+	0x0840, 0x0858,
 	0x0904, 0x0939,
 	0x093d, 0x093d,
 	0x0950, 0x0950,
 	0x0958, 0x0961,
-	0x0971, 0x0972,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0x0985, 0x098c,
 	0x098f, 0x0990,
@@ -9505,11 +9721,12 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x0cbd, 0x0cbd,
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce1,
+	0x0cf1, 0x0cf2,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
 	0x0d60, 0x0d61,
 	0x0d7a, 0x0d7f,
 	0x0d85, 0x0d96,
@@ -9540,7 +9757,7 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x0f00, 0x0f00,
 	0x0f40, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8b,
+	0x0f88, 0x0f8c,
 	0x1000, 0x102a,
 	0x103f, 0x103f,
 	0x1050, 0x1055,
@@ -9601,6 +9818,7 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x1b45, 0x1b4b,
 	0x1b83, 0x1ba0,
 	0x1bae, 0x1baf,
+	0x1bc0, 0x1be5,
 	0x1c00, 0x1c23,
 	0x1c4d, 0x1c4f,
 	0x1c5a, 0x1c7d,
@@ -9628,7 +9846,7 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x1ff6, 0x1ffc,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x2102, 0x2102,
 	0x2107, 0x2107,
 	0x210a, 0x2113,
@@ -9668,7 +9886,7 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x30fc, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -9677,14 +9895,15 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0xa500, 0xa60c,
 	0xa610, 0xa61f,
 	0xa62a, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa66e,
+	0xa640, 0xa66e,
 	0xa67f, 0xa697,
 	0xa6a0, 0xa6ef,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa801,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa801,
 	0xa803, 0xa805,
 	0xa807, 0xa80a,
 	0xa80c, 0xa822,
@@ -9709,6 +9928,11 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0xaac0, 0xaac0,
 	0xaac2, 0xaac2,
 	0xaadb, 0xaadd,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabe2,
 	0xac00, 0xd7a3,
 	0xd7b0, 0xd7c6,
@@ -9773,10 +9997,13 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11003, 0x11037,
 	0x11083, 0x110af,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d400, 0x1d454,
 	0x1d456, 0x1d49c,
 	0x1d49e, 0x1d49f,
@@ -9809,12 +10036,13 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x1d7c4, 0x1d7cb,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_ID_Start */
 
 /* 'ID_Continue': Derived Property */
 static const OnigCodePoint CR_ID_Continue[] = {
-	506,
+	514,
 	0x0030, 0x0039,
 	0x0041, 0x005a,
 	0x005f, 0x005f,
@@ -9839,7 +10067,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
 	0x0483, 0x0487,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x0559,
 	0x0561, 0x0587,
@@ -9851,8 +10079,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
 	0x0610, 0x061a,
-	0x0621, 0x065e,
-	0x0660, 0x0669,
+	0x0620, 0x0669,
 	0x066e, 0x06d3,
 	0x06d5, 0x06dc,
 	0x06df, 0x06e8,
@@ -9863,12 +10090,10 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x07c0, 0x07f5,
 	0x07fa, 0x07fa,
 	0x0800, 0x082d,
-	0x0900, 0x0939,
-	0x093c, 0x094e,
-	0x0950, 0x0955,
-	0x0958, 0x0963,
+	0x0840, 0x085b,
+	0x0900, 0x0963,
 	0x0966, 0x096f,
-	0x0971, 0x0972,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
@@ -9970,14 +10195,14 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
+	0x0d4a, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d66, 0x0d6f,
@@ -10023,8 +10248,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x0f3e, 0x0f47,
 	0x0f49, 0x0f6c,
 	0x0f71, 0x0f84,
-	0x0f86, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f86, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fc6, 0x0fc6,
 	0x1000, 0x1049,
@@ -10048,7 +10272,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x12d8, 0x1310,
 	0x1312, 0x1315,
 	0x1318, 0x135a,
-	0x135f, 0x135f,
+	0x135d, 0x135f,
 	0x1369, 0x1371,
 	0x1380, 0x138f,
 	0x13a0, 0x13f4,
@@ -10093,13 +10317,14 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x1b6b, 0x1b73,
 	0x1b80, 0x1baa,
 	0x1bae, 0x1bb9,
+	0x1bc0, 0x1bf3,
 	0x1c00, 0x1c37,
 	0x1c40, 0x1c49,
 	0x1c4d, 0x1c7d,
 	0x1cd0, 0x1cd2,
 	0x1cd4, 0x1cf2,
 	0x1d00, 0x1de6,
-	0x1dfd, 0x1f15,
+	0x1dfc, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
 	0x1f48, 0x1f4d,
@@ -10122,7 +10347,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x2054, 0x2054,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x20d0, 0x20dc,
 	0x20e1, 0x20e1,
 	0x20e5, 0x20f0,
@@ -10146,7 +10371,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x2d00, 0x2d25,
 	0x2d30, 0x2d65,
 	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
+	0x2d7f, 0x2d96,
 	0x2da0, 0x2da6,
 	0x2da8, 0x2dae,
 	0x2db0, 0x2db6,
@@ -10166,7 +10391,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x30fc, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -10174,15 +10399,16 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0xa4d0, 0xa4fd,
 	0xa500, 0xa60c,
 	0xa610, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa66f,
+	0xa640, 0xa66f,
 	0xa67c, 0xa67d,
 	0xa67f, 0xa697,
 	0xa6a0, 0xa6f1,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa827,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa827,
 	0xa840, 0xa873,
 	0xa880, 0xa8c4,
 	0xa8d0, 0xa8d9,
@@ -10200,6 +10426,11 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0xaa7a, 0xaa7b,
 	0xaa80, 0xaac2,
 	0xaadb, 0xaadd,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabea,
 	0xabec, 0xabed,
 	0xabf0, 0xabf9,
@@ -10276,10 +10507,14 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11000, 0x11046,
+	0x11066, 0x1106f,
 	0x11080, 0x110ba,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d165, 0x1d169,
 	0x1d16d, 0x1d172,
 	0x1d17b, 0x1d182,
@@ -10319,13 +10554,14 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x1d7ce, 0x1d7ff,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 	0xe0100, 0xe01ef,
 }; /* CR_ID_Continue */
 
 /* 'XID_Start': Derived Property */
 static const OnigCodePoint CR_XID_Start[] = {
-	431,
+	444,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -10347,13 +10583,13 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x038e, 0x03a1,
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x0559,
 	0x0561, 0x0587,
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
-	0x0621, 0x064a,
+	0x0620, 0x064a,
 	0x066e, 0x066f,
 	0x0671, 0x06d3,
 	0x06d5, 0x06d5,
@@ -10372,11 +10608,12 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x081a, 0x081a,
 	0x0824, 0x0824,
 	0x0828, 0x0828,
+	0x0840, 0x0858,
 	0x0904, 0x0939,
 	0x093d, 0x093d,
 	0x0950, 0x0950,
 	0x0958, 0x0961,
-	0x0971, 0x0972,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0x0985, 0x098c,
 	0x098f, 0x0990,
@@ -10445,11 +10682,12 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x0cbd, 0x0cbd,
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce1,
+	0x0cf1, 0x0cf2,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
 	0x0d60, 0x0d61,
 	0x0d7a, 0x0d7f,
 	0x0d85, 0x0d96,
@@ -10480,7 +10718,7 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x0f00, 0x0f00,
 	0x0f40, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8b,
+	0x0f88, 0x0f8c,
 	0x1000, 0x102a,
 	0x103f, 0x103f,
 	0x1050, 0x1055,
@@ -10541,6 +10779,7 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x1b45, 0x1b4b,
 	0x1b83, 0x1ba0,
 	0x1bae, 0x1baf,
+	0x1bc0, 0x1be5,
 	0x1c00, 0x1c23,
 	0x1c4d, 0x1c4f,
 	0x1c5a, 0x1c7d,
@@ -10568,7 +10807,7 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x1ff6, 0x1ffc,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x2102, 0x2102,
 	0x2107, 0x2107,
 	0x210a, 0x2113,
@@ -10608,7 +10847,7 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x30fc, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -10617,14 +10856,15 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0xa500, 0xa60c,
 	0xa610, 0xa61f,
 	0xa62a, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa66e,
+	0xa640, 0xa66e,
 	0xa67f, 0xa697,
 	0xa6a0, 0xa6ef,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa801,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa801,
 	0xa803, 0xa805,
 	0xa807, 0xa80a,
 	0xa80c, 0xa822,
@@ -10649,6 +10889,11 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0xaac0, 0xaac0,
 	0xaac2, 0xaac2,
 	0xaadb, 0xaadd,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabe2,
 	0xac00, 0xd7a3,
 	0xd7b0, 0xd7c6,
@@ -10720,10 +10965,13 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11003, 0x11037,
 	0x11083, 0x110af,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d400, 0x1d454,
 	0x1d456, 0x1d49c,
 	0x1d49e, 0x1d49f,
@@ -10756,12 +11004,13 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x1d7c4, 0x1d7cb,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_XID_Start */
 
 /* 'XID_Continue': Derived Property */
 static const OnigCodePoint CR_XID_Continue[] = {
-	513,
+	521,
 	0x0030, 0x0039,
 	0x0041, 0x005a,
 	0x005f, 0x005f,
@@ -10786,7 +11035,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
 	0x0483, 0x0487,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x0559,
 	0x0561, 0x0587,
@@ -10798,8 +11047,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
 	0x0610, 0x061a,
-	0x0621, 0x065e,
-	0x0660, 0x0669,
+	0x0620, 0x0669,
 	0x066e, 0x06d3,
 	0x06d5, 0x06dc,
 	0x06df, 0x06e8,
@@ -10810,12 +11058,10 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x07c0, 0x07f5,
 	0x07fa, 0x07fa,
 	0x0800, 0x082d,
-	0x0900, 0x0939,
-	0x093c, 0x094e,
-	0x0950, 0x0955,
-	0x0958, 0x0963,
+	0x0840, 0x085b,
+	0x0900, 0x0963,
 	0x0966, 0x096f,
-	0x0971, 0x0972,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
@@ -10917,14 +11163,14 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
+	0x0d4a, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d66, 0x0d6f,
@@ -10970,8 +11216,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x0f3e, 0x0f47,
 	0x0f49, 0x0f6c,
 	0x0f71, 0x0f84,
-	0x0f86, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f86, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fc6, 0x0fc6,
 	0x1000, 0x1049,
@@ -10995,7 +11240,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x12d8, 0x1310,
 	0x1312, 0x1315,
 	0x1318, 0x135a,
-	0x135f, 0x135f,
+	0x135d, 0x135f,
 	0x1369, 0x1371,
 	0x1380, 0x138f,
 	0x13a0, 0x13f4,
@@ -11040,13 +11285,14 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x1b6b, 0x1b73,
 	0x1b80, 0x1baa,
 	0x1bae, 0x1bb9,
+	0x1bc0, 0x1bf3,
 	0x1c00, 0x1c37,
 	0x1c40, 0x1c49,
 	0x1c4d, 0x1c7d,
 	0x1cd0, 0x1cd2,
 	0x1cd4, 0x1cf2,
 	0x1d00, 0x1de6,
-	0x1dfd, 0x1f15,
+	0x1dfc, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
 	0x1f48, 0x1f4d,
@@ -11069,7 +11315,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x2054, 0x2054,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x20d0, 0x20dc,
 	0x20e1, 0x20e1,
 	0x20e5, 0x20f0,
@@ -11093,7 +11339,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x2d00, 0x2d25,
 	0x2d30, 0x2d65,
 	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
+	0x2d7f, 0x2d96,
 	0x2da0, 0x2da6,
 	0x2da8, 0x2dae,
 	0x2db0, 0x2db6,
@@ -11114,7 +11360,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x30fc, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -11122,15 +11368,16 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0xa4d0, 0xa4fd,
 	0xa500, 0xa60c,
 	0xa610, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa66f,
+	0xa640, 0xa66f,
 	0xa67c, 0xa67d,
 	0xa67f, 0xa697,
 	0xa6a0, 0xa6f1,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa827,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa827,
 	0xa840, 0xa873,
 	0xa880, 0xa8c4,
 	0xa8d0, 0xa8d9,
@@ -11148,6 +11395,11 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0xaa7a, 0xaa7b,
 	0xaa80, 0xaac2,
 	0xaadb, 0xaadd,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabea,
 	0xabec, 0xabed,
 	0xabf0, 0xabf9,
@@ -11230,10 +11482,14 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11000, 0x11046,
+	0x11066, 0x1106f,
 	0x11080, 0x110ba,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d165, 0x1d169,
 	0x1d16d, 0x1d172,
 	0x1d17b, 0x1d182,
@@ -11273,6 +11529,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x1d7ce, 0x1d7ff,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 	0xe0100, 0xe01ef,
 }; /* CR_XID_Continue */
@@ -11299,7 +11556,7 @@ static const OnigCodePoint CR_Default_Ignorable_Code_Point[] = {
 
 /* 'Grapheme_Extend': Derived Property */
 static const OnigCodePoint CR_Grapheme_Extend[] = {
-	206,
+	215,
 	0x0300, 0x036f,
 	0x0483, 0x0489,
 	0x0591, 0x05bd,
@@ -11308,10 +11565,10 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x05c4, 0x05c5,
 	0x05c7, 0x05c7,
 	0x0610, 0x061a,
-	0x064b, 0x065e,
+	0x064b, 0x065f,
 	0x0670, 0x0670,
 	0x06d6, 0x06dc,
-	0x06de, 0x06e4,
+	0x06df, 0x06e4,
 	0x06e7, 0x06e8,
 	0x06ea, 0x06ed,
 	0x0711, 0x0711,
@@ -11322,11 +11579,13 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x081b, 0x0823,
 	0x0825, 0x0827,
 	0x0829, 0x082d,
+	0x0859, 0x085b,
 	0x0900, 0x0902,
+	0x093a, 0x093a,
 	0x093c, 0x093c,
 	0x0941, 0x0948,
 	0x094d, 0x094d,
-	0x0951, 0x0955,
+	0x0951, 0x0957,
 	0x0962, 0x0963,
 	0x0981, 0x0981,
 	0x09bc, 0x09bc,
@@ -11397,7 +11656,7 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x0f71, 0x0f7e,
 	0x0f80, 0x0f84,
 	0x0f86, 0x0f87,
-	0x0f90, 0x0f97,
+	0x0f8d, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fc6, 0x0fc6,
 	0x102d, 0x1030,
@@ -11411,7 +11670,7 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x1085, 0x1086,
 	0x108d, 0x108d,
 	0x109d, 0x109d,
-	0x135f, 0x135f,
+	0x135d, 0x135f,
 	0x1712, 0x1714,
 	0x1732, 0x1734,
 	0x1752, 0x1753,
@@ -11443,6 +11702,10 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x1b80, 0x1b81,
 	0x1ba2, 0x1ba5,
 	0x1ba8, 0x1ba9,
+	0x1be6, 0x1be6,
+	0x1be8, 0x1be9,
+	0x1bed, 0x1bed,
+	0x1bef, 0x1bf1,
 	0x1c2c, 0x1c33,
 	0x1c36, 0x1c37,
 	0x1cd0, 0x1cd2,
@@ -11450,10 +11713,11 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x1ce2, 0x1ce8,
 	0x1ced, 0x1ced,
 	0x1dc0, 0x1de6,
-	0x1dfd, 0x1dff,
+	0x1dfc, 0x1dff,
 	0x200c, 0x200d,
 	0x20d0, 0x20f0,
 	0x2cef, 0x2cf1,
+	0x2d7f, 0x2d7f,
 	0x2de0, 0x2dff,
 	0x302a, 0x302f,
 	0x3099, 0x309a,
@@ -11495,6 +11759,8 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x10a0c, 0x10a0f,
 	0x10a38, 0x10a3a,
 	0x10a3f, 0x10a3f,
+	0x11001, 0x11001,
+	0x11038, 0x11046,
 	0x11080, 0x11081,
 	0x110b3, 0x110b6,
 	0x110b9, 0x110ba,
@@ -11510,7 +11776,7 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 
 /* 'Grapheme_Base': Derived Property */
 static const OnigCodePoint CR_Grapheme_Base[] = {
-	567,
+	596,
 	0x0020, 0x007e,
 	0x00a0, 0x00ac,
 	0x00ae, 0x02ff,
@@ -11520,7 +11786,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x038c, 0x038c,
 	0x038e, 0x03a1,
 	0x03a3, 0x0482,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x055f,
 	0x0561, 0x0587,
@@ -11533,10 +11799,10 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x05f0, 0x05f4,
 	0x0606, 0x060f,
 	0x061b, 0x061b,
-	0x061e, 0x061f,
-	0x0621, 0x064a,
+	0x061e, 0x064a,
 	0x0660, 0x066f,
 	0x0671, 0x06d5,
+	0x06de, 0x06de,
 	0x06e5, 0x06e6,
 	0x06e9, 0x06e9,
 	0x06ee, 0x070d,
@@ -11551,13 +11817,15 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x0824, 0x0824,
 	0x0828, 0x0828,
 	0x0830, 0x083e,
+	0x0840, 0x0858,
+	0x085e, 0x085e,
 	0x0903, 0x0939,
+	0x093b, 0x093b,
 	0x093d, 0x0940,
 	0x0949, 0x094c,
-	0x094e, 0x094e,
-	0x0950, 0x0950,
+	0x094e, 0x0950,
 	0x0958, 0x0961,
-	0x0964, 0x0972,
+	0x0964, 0x0977,
 	0x0979, 0x097f,
 	0x0982, 0x0983,
 	0x0985, 0x098c,
@@ -11614,7 +11882,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x0b4b, 0x0b4c,
 	0x0b5c, 0x0b5d,
 	0x0b5f, 0x0b61,
-	0x0b66, 0x0b71,
+	0x0b66, 0x0b77,
 	0x0b83, 0x0b83,
 	0x0b85, 0x0b8a,
 	0x0b8e, 0x0b90,
@@ -11661,12 +11929,12 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d3d,
 	0x0d3f, 0x0d40,
 	0x0d46, 0x0d48,
 	0x0d4a, 0x0d4c,
+	0x0d4e, 0x0d4e,
 	0x0d60, 0x0d61,
 	0x0d66, 0x0d75,
 	0x0d79, 0x0d7f,
@@ -11709,10 +11977,10 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x0f49, 0x0f6c,
 	0x0f7f, 0x0f7f,
 	0x0f85, 0x0f85,
-	0x0f88, 0x0f8b,
+	0x0f88, 0x0f8c,
 	0x0fbe, 0x0fc5,
 	0x0fc7, 0x0fcc,
-	0x0fce, 0x0fd8,
+	0x0fce, 0x0fda,
 	0x1000, 0x102c,
 	0x1031, 0x1031,
 	0x1038, 0x1038,
@@ -11800,7 +12068,12 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x1ba6, 0x1ba7,
 	0x1baa, 0x1baa,
 	0x1bae, 0x1bb9,
-	0x1c00, 0x1c2b,
+	0x1bc0, 0x1be5,
+	0x1be7, 0x1be7,
+	0x1bea, 0x1bec,
+	0x1bee, 0x1bee,
+	0x1bf2, 0x1bf3,
+	0x1bfc, 0x1c2b,
 	0x1c34, 0x1c35,
 	0x1c3b, 0x1c49,
 	0x1c4d, 0x1c7f,
@@ -11830,36 +12103,23 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x202f, 0x205f,
 	0x2070, 0x2071,
 	0x2074, 0x208e,
-	0x2090, 0x2094,
-	0x20a0, 0x20b8,
+	0x2090, 0x209c,
+	0x20a0, 0x20b9,
 	0x2100, 0x2189,
-	0x2190, 0x23e8,
+	0x2190, 0x23f3,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
-	0x2460, 0x26cd,
-	0x26cf, 0x26e1,
-	0x26e3, 0x26e3,
-	0x26e8, 0x26ff,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
+	0x2460, 0x26ff,
+	0x2701, 0x27ca,
 	0x27cc, 0x27cc,
-	0x27d0, 0x2b4c,
+	0x27ce, 0x2b4c,
 	0x2b50, 0x2b59,
 	0x2c00, 0x2c2e,
 	0x2c30, 0x2c5e,
 	0x2c60, 0x2cee,
 	0x2cf9, 0x2d25,
 	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
+	0x2d6f, 0x2d70,
 	0x2d80, 0x2d96,
 	0x2da0, 0x2da6,
 	0x2da8, 0x2dae,
@@ -11880,7 +12140,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x309b, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x3190, 0x31b7,
+	0x3190, 0x31ba,
 	0x31c0, 0x31e3,
 	0x31f0, 0x321e,
 	0x3220, 0x32fe,
@@ -11889,14 +12149,15 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
 	0xa4d0, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa66e,
+	0xa640, 0xa66e,
 	0xa673, 0xa673,
 	0xa67e, 0xa697,
 	0xa6a0, 0xa6ef,
 	0xa6f2, 0xa6f7,
-	0xa700, 0xa78c,
-	0xa7fb, 0xa801,
+	0xa700, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa801,
 	0xa803, 0xa805,
 	0xa807, 0xa80a,
 	0xa80c, 0xa824,
@@ -11931,6 +12192,11 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0xaac0, 0xaac0,
 	0xaac2, 0xaac2,
 	0xaadb, 0xaadf,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabe4,
 	0xabe6, 0xabe7,
 	0xabe9, 0xabec,
@@ -11949,7 +12215,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0xfb3e, 0xfb3e,
 	0xfb40, 0xfb41,
 	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
+	0xfb46, 0xfbc1,
 	0xfbd3, 0xfd3f,
 	0xfd50, 0xfd8f,
 	0xfd92, 0xfdc7,
@@ -12014,6 +12280,10 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x10b78, 0x10b7f,
 	0x10c00, 0x10c48,
 	0x10e60, 0x10e7e,
+	0x11000, 0x11000,
+	0x11002, 0x11037,
+	0x11047, 0x1104d,
+	0x11052, 0x1106f,
 	0x11082, 0x110b2,
 	0x110b7, 0x110b8,
 	0x110bb, 0x110bc,
@@ -12022,6 +12292,8 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x12400, 0x12462,
 	0x12470, 0x12473,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d000, 0x1d0f5,
 	0x1d100, 0x1d126,
 	0x1d129, 0x1d164,
@@ -12057,32 +12329,55 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x1d7ce, 0x1d7ff,
 	0x1f000, 0x1f02b,
 	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
 	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,
+	0x1f130, 0x1f169,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
 	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f5ff,
+	0x1f601, 0x1f610,
+	0x1f612, 0x1f614,
+	0x1f616, 0x1f616,
+	0x1f618, 0x1f618,
+	0x1f61a, 0x1f61a,
+	0x1f61c, 0x1f61e,
+	0x1f620, 0x1f625,
+	0x1f628, 0x1f62b,
+	0x1f62d, 0x1f62d,
+	0x1f630, 0x1f633,
+	0x1f635, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_Grapheme_Base */
 
 /* 'Grapheme_Link': Derived Property */
 static const OnigCodePoint CR_Grapheme_Link[] = {
-	26,
+	29,
 	0x094d, 0x094d,
 	0x09cd, 0x09cd,
 	0x0a4d, 0x0a4d,
@@ -12102,18 +12397,21 @@ static const OnigCodePoint CR_Grapheme_Link[] = {
 	0x1a60, 0x1a60,
 	0x1b44, 0x1b44,
 	0x1baa, 0x1baa,
+	0x1bf2, 0x1bf3,
+	0x2d7f, 0x2d7f,
 	0xa806, 0xa806,
 	0xa8c4, 0xa8c4,
 	0xa953, 0xa953,
 	0xa9c0, 0xa9c0,
 	0xabed, 0xabed,
 	0x10a3f, 0x10a3f,
+	0x11046, 0x11046,
 	0x110b9, 0x110b9,
 }; /* CR_Grapheme_Link */
 
 /* 'Common': Script */
 static const OnigCodePoint CR_Common[] = {
-	159,
+	169,
 	0x0000, 0x0040,
 	0x005b, 0x0060,
 	0x007b, 0x00a9,
@@ -12122,13 +12420,13 @@ static const OnigCodePoint CR_Common[] = {
 	0x00d7, 0x00d7,
 	0x00f7, 0x00f7,
 	0x02b9, 0x02df,
-	0x02e5, 0x02ff,
+	0x02e5, 0x02e9,
+	0x02ec, 0x02ff,
 	0x0374, 0x0374,
 	0x037e, 0x037e,
 	0x0385, 0x0385,
 	0x0387, 0x0387,
 	0x0589, 0x0589,
-	0x0600, 0x0603,
 	0x060c, 0x060c,
 	0x061b, 0x061b,
 	0x061f, 0x061f,
@@ -12137,7 +12435,6 @@ static const OnigCodePoint CR_Common[] = {
 	0x06dd, 0x06dd,
 	0x0964, 0x0965,
 	0x0970, 0x0970,
-	0x0cf1, 0x0cf2,
 	0x0e3f, 0x0e3f,
 	0x0fd5, 0x0fd8,
 	0x10fb, 0x10fb,
@@ -12154,33 +12451,20 @@ static const OnigCodePoint CR_Common[] = {
 	0x206a, 0x2070,
 	0x2074, 0x207e,
 	0x2080, 0x208e,
-	0x20a0, 0x20b8,
+	0x20a0, 0x20b9,
 	0x2100, 0x2125,
 	0x2127, 0x2129,
 	0x212c, 0x2131,
 	0x2133, 0x214d,
 	0x214f, 0x215f,
 	0x2189, 0x2189,
-	0x2190, 0x23e8,
+	0x2190, 0x23f3,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
-	0x2460, 0x26cd,
-	0x26cf, 0x26e1,
-	0x26e3, 0x26e3,
-	0x26e8, 0x26ff,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
+	0x2460, 0x26ff,
+	0x2701, 0x27ca,
 	0x27cc, 0x27cc,
-	0x27d0, 0x27ff,
+	0x27ce, 0x27ff,
 	0x2900, 0x2b4c,
 	0x2b50, 0x2b59,
 	0x2e00, 0x2e31,
@@ -12254,30 +12538,54 @@ static const OnigCodePoint CR_Common[] = {
 	0x1d7ce, 0x1d7ff,
 	0x1f000, 0x1f02b,
 	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
 	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,
+	0x1f130, 0x1f169,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f1ff,
+	0x1f201, 0x1f202,
+	0x1f210, 0x1f23a,
 	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f5ff,
+	0x1f601, 0x1f610,
+	0x1f612, 0x1f614,
+	0x1f616, 0x1f616,
+	0x1f618, 0x1f618,
+	0x1f61a, 0x1f61a,
+	0x1f61c, 0x1f61e,
+	0x1f620, 0x1f625,
+	0x1f628, 0x1f62b,
+	0x1f62d, 0x1f62d,
+	0x1f630, 0x1f633,
+	0x1f635, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
 	0xe0001, 0xe0001,
 	0xe0020, 0xe007f,
 }; /* CR_Common */
 
 /* 'Latin': Script */
 static const OnigCodePoint CR_Latin[] = {
-	28,
+	30,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -12294,15 +12602,17 @@ static const OnigCodePoint CR_Latin[] = {
 	0x1e00, 0x1eff,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x212a, 0x212b,
 	0x2132, 0x2132,
 	0x214e, 0x214e,
 	0x2160, 0x2188,
 	0x2c60, 0x2c7f,
 	0xa722, 0xa787,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa7ff,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa7ff,
 	0xfb00, 0xfb06,
 	0xff21, 0xff3a,
 	0xff41, 0xff5a,
@@ -12348,14 +12658,13 @@ static const OnigCodePoint CR_Greek[] = {
 
 /* 'Cyrillic': Script */
 static const OnigCodePoint CR_Cyrillic[] = {
-	8,
+	7,
 	0x0400, 0x0484,
-	0x0487, 0x0525,
+	0x0487, 0x0527,
 	0x1d2b, 0x1d2b,
 	0x1d78, 0x1d78,
 	0x2de0, 0x2dff,
-	0xa640, 0xa65f,
-	0xa662, 0xa673,
+	0xa640, 0xa673,
 	0xa67c, 0xa697,
 }; /* CR_Cyrillic */
 
@@ -12385,18 +12694,19 @@ static const OnigCodePoint CR_Hebrew[] = {
 
 /* 'Arabic': Script */
 static const OnigCodePoint CR_Arabic[] = {
-	18,
+	19,
+	0x0600, 0x0603,
 	0x0606, 0x060b,
 	0x060d, 0x061a,
 	0x061e, 0x061e,
-	0x0621, 0x063f,
+	0x0620, 0x063f,
 	0x0641, 0x064a,
 	0x0656, 0x065e,
 	0x066a, 0x066f,
 	0x0671, 0x06dc,
 	0x06de, 0x06ff,
 	0x0750, 0x077f,
-	0xfb50, 0xfbb1,
+	0xfb50, 0xfbc1,
 	0xfbd3, 0xfd3d,
 	0xfd50, 0xfd8f,
 	0xfd92, 0xfdc7,
@@ -12422,14 +12732,11 @@ static const OnigCodePoint CR_Thaana[] = {
 
 /* 'Devanagari': Script */
 static const OnigCodePoint CR_Devanagari[] = {
-	9,
-	0x0900, 0x0939,
-	0x093c, 0x094e,
-	0x0950, 0x0950,
-	0x0953, 0x0955,
-	0x0958, 0x0963,
+	6,
+	0x0900, 0x0950,
+	0x0953, 0x0963,
 	0x0966, 0x096f,
-	0x0971, 0x0972,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0xa8e0, 0xa8fb,
 }; /* CR_Devanagari */
@@ -12509,7 +12816,7 @@ static const OnigCodePoint CR_Oriya[] = {
 	0x0b56, 0x0b57,
 	0x0b5c, 0x0b5d,
 	0x0b5f, 0x0b63,
-	0x0b66, 0x0b71,
+	0x0b66, 0x0b77,
 }; /* CR_Oriya */
 
 /* 'Tamil': Script */
@@ -12554,7 +12861,7 @@ static const OnigCodePoint CR_Telugu[] = {
 
 /* 'Kannada': Script */
 static const OnigCodePoint CR_Kannada[] = {
-	13,
+	14,
 	0x0c82, 0x0c83,
 	0x0c85, 0x0c8c,
 	0x0c8e, 0x0c90,
@@ -12568,19 +12875,19 @@ static const OnigCodePoint CR_Kannada[] = {
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
 }; /* CR_Kannada */
 
 /* 'Malayalam': Script */
 static const OnigCodePoint CR_Malayalam[] = {
-	12,
+	11,
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
+	0x0d4a, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d66, 0x0d75,
@@ -12638,11 +12945,11 @@ static const OnigCodePoint CR_Tibetan[] = {
 	7,
 	0x0f00, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f71, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fbe, 0x0fcc,
 	0x0fce, 0x0fd4,
+	0x0fd9, 0x0fda,
 }; /* CR_Tibetan */
 
 /* 'Myanmar': Script */
@@ -12663,8 +12970,9 @@ static const OnigCodePoint CR_Georgian[] = {
 
 /* 'Hangul': Script */
 static const OnigCodePoint CR_Hangul[] = {
-	13,
+	14,
 	0x1100, 0x11ff,
+	0x302e, 0x302f,
 	0x3131, 0x318e,
 	0x3200, 0x321e,
 	0x3260, 0x327e,
@@ -12681,7 +12989,7 @@ static const OnigCodePoint CR_Hangul[] = {
 
 /* 'Ethiopic': Script */
 static const OnigCodePoint CR_Ethiopic[] = {
-	27,
+	32,
 	0x1200, 0x1248,
 	0x124a, 0x124d,
 	0x1250, 0x1256,
@@ -12698,7 +13006,7 @@ static const OnigCodePoint CR_Ethiopic[] = {
 	0x12d8, 0x1310,
 	0x1312, 0x1315,
 	0x1318, 0x135a,
-	0x135f, 0x137c,
+	0x135d, 0x137c,
 	0x1380, 0x1399,
 	0x2d80, 0x2d96,
 	0x2da0, 0x2da6,
@@ -12709,6 +13017,11 @@ static const OnigCodePoint CR_Ethiopic[] = {
 	0x2dc8, 0x2dce,
 	0x2dd0, 0x2dd6,
 	0x2dd8, 0x2dde,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 }; /* CR_Ethiopic */
 
 /* 'Cherokee': Script */
@@ -12759,15 +13072,16 @@ static const OnigCodePoint CR_Mongolian[] = {
 
 /* 'Hiragana': Script */
 static const OnigCodePoint CR_Hiragana[] = {
-	3,
+	4,
 	0x3041, 0x3096,
 	0x309d, 0x309f,
+	0x1b001, 0x1b001,
 	0x1f200, 0x1f200,
 }; /* CR_Hiragana */
 
 /* 'Katakana': Script */
 static const OnigCodePoint CR_Katakana[] = {
-	7,
+	8,
 	0x30a1, 0x30fa,
 	0x30fd, 0x30ff,
 	0x31f0, 0x31ff,
@@ -12775,18 +13089,20 @@ static const OnigCodePoint CR_Katakana[] = {
 	0x3300, 0x3357,
 	0xff66, 0xff6f,
 	0xff71, 0xff9d,
+	0x1b000, 0x1b000,
 }; /* CR_Katakana */
 
 /* 'Bopomofo': Script */
 static const OnigCodePoint CR_Bopomofo[] = {
-	2,
+	3,
+	0x02ea, 0x02eb,
 	0x3105, 0x312d,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 }; /* CR_Bopomofo */
 
 /* 'Han': Script */
 static const OnigCodePoint CR_Han[] = {
-	15,
+	16,
 	0x2e80, 0x2e99,
 	0x2e9b, 0x2ef3,
 	0x2f00, 0x2fd5,
@@ -12801,6 +13117,7 @@ static const OnigCodePoint CR_Han[] = {
 	0xfa70, 0xfad9,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_Han */
 
@@ -12832,10 +13149,11 @@ static const OnigCodePoint CR_Deseret[] = {
 
 /* 'Inherited': Script */
 static const OnigCodePoint CR_Inherited[] = {
-	23,
+	24,
 	0x0300, 0x036f,
 	0x0485, 0x0486,
 	0x064b, 0x0655,
+	0x065f, 0x065f,
 	0x0670, 0x0670,
 	0x0951, 0x0952,
 	0x1cd0, 0x1cd2,
@@ -12843,10 +13161,10 @@ static const OnigCodePoint CR_Inherited[] = {
 	0x1ce2, 0x1ce8,
 	0x1ced, 0x1ced,
 	0x1dc0, 0x1de6,
-	0x1dfd, 0x1dff,
+	0x1dfc, 0x1dff,
 	0x200c, 0x200d,
 	0x20d0, 0x20f0,
-	0x302a, 0x302f,
+	0x302a, 0x302d,
 	0x3099, 0x309a,
 	0xfe00, 0xfe0f,
 	0xfe20, 0xfe26,
@@ -12984,9 +13302,10 @@ static const OnigCodePoint CR_Glagolitic[] = {
 
 /* 'Tifinagh': Script */
 static const OnigCodePoint CR_Tifinagh[] = {
-	2,
+	3,
 	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d7f,
 }; /* CR_Tifinagh */
 
 /* 'Syloti_Nagri': Script */
@@ -13169,8 +13488,9 @@ static const OnigCodePoint CR_Lisu[] = {
 
 /* 'Bamum': Script */
 static const OnigCodePoint CR_Bamum[] = {
-	1,
+	2,
 	0xa6a0, 0xa6f7,
+	0x16800, 0x16a38,
 }; /* CR_Bamum */
 
 /* 'Javanese': Script */
@@ -13227,6 +13547,27 @@ static const OnigCodePoint CR_Kaithi[] = {
 	0x11080, 0x110c1,
 }; /* CR_Kaithi */
 
+/* 'Batak': Script */
+static const OnigCodePoint CR_Batak[] = {
+	2,
+	0x1bc0, 0x1bf3,
+	0x1bfc, 0x1bff,
+}; /* CR_Batak */
+
+/* 'Brahmi': Script */
+static const OnigCodePoint CR_Brahmi[] = {
+	2,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+}; /* CR_Brahmi */
+
+/* 'Mandaic': Script */
+static const OnigCodePoint CR_Mandaic[] = {
+	2,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+}; /* CR_Mandaic */
+
 /* 'White_Space': Binary Property */
 static const OnigCodePoint CR_White_Space[] = {
 	11,
@@ -13314,7 +13655,7 @@ static const OnigCodePoint CR_Quotation_Mark[] = {
 
 /* 'Terminal_Punctuation': Binary Property */
 static const OnigCodePoint CR_Terminal_Punctuation[] = {
-	65,
+	67,
 	0x0021, 0x0021,
 	0x002c, 0x002c,
 	0x002e, 0x002e,
@@ -13332,6 +13673,7 @@ static const OnigCodePoint CR_Terminal_Punctuation[] = {
 	0x070c, 0x070c,
 	0x07f8, 0x07f9,
 	0x0830, 0x083e,
+	0x085e, 0x085e,
 	0x0964, 0x0965,
 	0x0e5a, 0x0e5b,
 	0x0f08, 0x0f08,
@@ -13378,13 +13720,14 @@ static const OnigCodePoint CR_Terminal_Punctuation[] = {
 	0x10857, 0x10857,
 	0x1091f, 0x1091f,
 	0x10b3a, 0x10b3f,
+	0x11047, 0x1104d,
 	0x110be, 0x110c1,
 	0x12470, 0x12473,
 }; /* CR_Terminal_Punctuation */
 
 /* 'Other_Math': Binary Property */
 static const OnigCodePoint CR_Other_Math[] = {
-	99,
+	100,
 	0x005e, 0x005e,
 	0x03d0, 0x03d2,
 	0x03d5, 0x03d5,
@@ -13401,6 +13744,7 @@ static const OnigCodePoint CR_Other_Math[] = {
 	0x20e5, 0x20e6,
 	0x20eb, 0x20ef,
 	0x2102, 0x2102,
+	0x2107, 0x2107,
 	0x210a, 0x2113,
 	0x2115, 0x2115,
 	0x2119, 0x211d,
@@ -13507,7 +13851,7 @@ static const OnigCodePoint CR_ASCII_Hex_Digit[] = {
 
 /* 'Other_Alphabetic': Binary Property */
 static const OnigCodePoint CR_Other_Alphabetic[] = {
-	141,
+	145,
 	0x0345, 0x0345,
 	0x05b0, 0x05bd,
 	0x05bf, 0x05bf,
@@ -13516,7 +13860,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0x05c7, 0x05c7,
 	0x0610, 0x061a,
 	0x064b, 0x0657,
-	0x0659, 0x065e,
+	0x0659, 0x065f,
 	0x0670, 0x0670,
 	0x06d6, 0x06dc,
 	0x06e1, 0x06e4,
@@ -13530,9 +13874,10 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0x0825, 0x0827,
 	0x0829, 0x082c,
 	0x0900, 0x0903,
+	0x093a, 0x093b,
 	0x093e, 0x094c,
-	0x094e, 0x094e,
-	0x0955, 0x0955,
+	0x094e, 0x094f,
+	0x0955, 0x0957,
 	0x0962, 0x0963,
 	0x0981, 0x0983,
 	0x09be, 0x09c4,
@@ -13594,7 +13939,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0x0ebb, 0x0ebc,
 	0x0ecd, 0x0ecd,
 	0x0f71, 0x0f81,
-	0x0f90, 0x0f97,
+	0x0f8d, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x102b, 0x1036,
 	0x1038, 0x1038,
@@ -13624,6 +13969,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0x1b35, 0x1b43,
 	0x1b80, 0x1b82,
 	0x1ba1, 0x1ba9,
+	0x1be7, 0x1bf1,
 	0x1c24, 0x1c35,
 	0x1cf2, 0x1cf2,
 	0x24b6, 0x24e9,
@@ -13634,7 +13980,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0xa926, 0xa92a,
 	0xa947, 0xa952,
 	0xa980, 0xa983,
-	0xa9b3, 0xa9bf,
+	0xa9b4, 0xa9bf,
 	0xaa29, 0xaa36,
 	0xaa43, 0xaa43,
 	0xaa4c, 0xaa4d,
@@ -13647,13 +13993,15 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0x10a01, 0x10a03,
 	0x10a05, 0x10a06,
 	0x10a0c, 0x10a0f,
+	0x11000, 0x11002,
+	0x11038, 0x11045,
 	0x11082, 0x11082,
 	0x110b0, 0x110b8,
 }; /* CR_Other_Alphabetic */
 
 /* 'Ideographic': Binary Property */
 static const OnigCodePoint CR_Ideographic[] = {
-	11,
+	12,
 	0x3006, 0x3007,
 	0x3021, 0x3029,
 	0x3038, 0x303a,
@@ -13664,6 +14012,7 @@ static const OnigCodePoint CR_Ideographic[] = {
 	0xfa70, 0xfad9,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_Ideographic */
 
@@ -13906,7 +14255,7 @@ static const OnigCodePoint CR_Radical[] = {
 
 /* 'Unified_Ideograph': Binary Property */
 static const OnigCodePoint CR_Unified_Ideograph[] = {
-	11,
+	12,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
 	0xfa0e, 0xfa0f,
@@ -13918,6 +14267,7 @@ static const OnigCodePoint CR_Unified_Ideograph[] = {
 	0xfa27, 0xfa29,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 }; /* CR_Unified_Ideograph */
 
 /* 'Other_Default_Ignorable_Code_Point': Binary Property */
@@ -13937,8 +14287,9 @@ static const OnigCodePoint CR_Other_Default_Ignorable_Code_Point[] = {
 
 /* 'Deprecated': Binary Property */
 static const OnigCodePoint CR_Deprecated[] = {
-	8,
+	9,
 	0x0149, 0x0149,
+	0x0673, 0x0673,
 	0x0f77, 0x0f77,
 	0x0f79, 0x0f79,
 	0x17a3, 0x17a4,
@@ -14004,15 +14355,16 @@ static const OnigCodePoint CR_Other_ID_Start[] = {
 
 /* 'Other_ID_Continue': Binary Property */
 static const OnigCodePoint CR_Other_ID_Continue[] = {
-	3,
+	4,
 	0x00b7, 0x00b7,
 	0x0387, 0x0387,
 	0x1369, 0x1371,
+	0x19da, 0x19da,
 }; /* CR_Other_ID_Continue */
 
 /* 'STerm': Binary Property */
 static const OnigCodePoint CR_STerm[] = {
-	43,
+	47,
 	0x0021, 0x0021,
 	0x002e, 0x002e,
 	0x003f, 0x003f,
@@ -14028,9 +14380,11 @@ static const OnigCodePoint CR_STerm[] = {
 	0x1362, 0x1362,
 	0x1367, 0x1368,
 	0x166e, 0x166e,
+	0x1735, 0x1736,
 	0x1803, 0x1803,
 	0x1809, 0x1809,
 	0x1944, 0x1945,
+	0x1aa8, 0x1aab,
 	0x1b5a, 0x1b5b,
 	0x1b5e, 0x1b5f,
 	0x1c3b, 0x1c3c,
@@ -14055,6 +14409,8 @@ static const OnigCodePoint CR_STerm[] = {
 	0xff0e, 0xff0e,
 	0xff1f, 0xff1f,
 	0xff61, 0xff61,
+	0x10a56, 0x10a57,
+	0x11047, 0x11048,
 	0x110be, 0x110c1,
 }; /* CR_STerm */
 
@@ -14142,14 +14498,14 @@ static const OnigCodePoint CR_Blank[] = {
 
 /* 'Graph': [[:Graph:]] */
 static const OnigCodePoint CR_Graph[] = {
-	490,
+	506,
 	0x0021, 0x007e,
 	0x00a1, 0x0377,
 	0x037a, 0x037e,
 	0x0384, 0x038a,
 	0x038c, 0x038c,
 	0x038e, 0x03a1,
-	0x03a3, 0x0525,
+	0x03a3, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x055f,
 	0x0561, 0x0587,
@@ -14159,18 +14515,15 @@ static const OnigCodePoint CR_Graph[] = {
 	0x05f0, 0x05f4,
 	0x0600, 0x0603,
 	0x0606, 0x061b,
-	0x061e, 0x061f,
-	0x0621, 0x065e,
-	0x0660, 0x070d,
+	0x061e, 0x070d,
 	0x070f, 0x074a,
 	0x074d, 0x07b1,
 	0x07c0, 0x07fa,
 	0x0800, 0x082d,
 	0x0830, 0x083e,
-	0x0900, 0x0939,
-	0x093c, 0x094e,
-	0x0950, 0x0955,
-	0x0958, 0x0972,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x0900, 0x0977,
 	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
@@ -14229,7 +14582,7 @@ static const OnigCodePoint CR_Graph[] = {
 	0x0b56, 0x0b57,
 	0x0b5c, 0x0b5d,
 	0x0b5f, 0x0b63,
-	0x0b66, 0x0b71,
+	0x0b66, 0x0b77,
 	0x0b82, 0x0b83,
 	0x0b85, 0x0b8a,
 	0x0b8e, 0x0b90,
@@ -14277,11 +14630,10 @@ static const OnigCodePoint CR_Graph[] = {
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
+	0x0d4a, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d66, 0x0d75,
@@ -14319,11 +14671,10 @@ static const OnigCodePoint CR_Graph[] = {
 	0x0edc, 0x0edd,
 	0x0f00, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f71, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fd8,
+	0x0fce, 0x0fda,
 	0x1000, 0x10c5,
 	0x10d0, 0x10fc,
 	0x1100, 0x1248,
@@ -14342,7 +14693,7 @@ static const OnigCodePoint CR_Graph[] = {
 	0x12d8, 0x1310,
 	0x1312, 0x1315,
 	0x1318, 0x135a,
-	0x135f, 0x137c,
+	0x135d, 0x137c,
 	0x1380, 0x1399,
 	0x13a0, 0x13f4,
 	0x1400, 0x167f,
@@ -14382,12 +14733,13 @@ static const OnigCodePoint CR_Graph[] = {
 	0x1b50, 0x1b7c,
 	0x1b80, 0x1baa,
 	0x1bae, 0x1bb9,
-	0x1c00, 0x1c37,
+	0x1bc0, 0x1bf3,
+	0x1bfc, 0x1c37,
 	0x1c3b, 0x1c49,
 	0x1c4d, 0x1c7f,
 	0x1cd0, 0x1cf2,
 	0x1d00, 0x1de6,
-	0x1dfd, 0x1f15,
+	0x1dfc, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
 	0x1f48, 0x1f4d,
@@ -14409,38 +14761,25 @@ static const OnigCodePoint CR_Graph[] = {
 	0x2060, 0x2064,
 	0x206a, 0x2071,
 	0x2074, 0x208e,
-	0x2090, 0x2094,
-	0x20a0, 0x20b8,
+	0x2090, 0x209c,
+	0x20a0, 0x20b9,
 	0x20d0, 0x20f0,
 	0x2100, 0x2189,
-	0x2190, 0x23e8,
+	0x2190, 0x23f3,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
-	0x2460, 0x26cd,
-	0x26cf, 0x26e1,
-	0x26e3, 0x26e3,
-	0x26e8, 0x26ff,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
+	0x2460, 0x26ff,
+	0x2701, 0x27ca,
 	0x27cc, 0x27cc,
-	0x27d0, 0x2b4c,
+	0x27ce, 0x2b4c,
 	0x2b50, 0x2b59,
 	0x2c00, 0x2c2e,
 	0x2c30, 0x2c5e,
 	0x2c60, 0x2cf1,
 	0x2cf9, 0x2d25,
 	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
 	0x2da0, 0x2da6,
 	0x2da8, 0x2dae,
 	0x2db0, 0x2db6,
@@ -14459,7 +14798,7 @@ static const OnigCodePoint CR_Graph[] = {
 	0x3099, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x3190, 0x31b7,
+	0x3190, 0x31ba,
 	0x31c0, 0x31e3,
 	0x31f0, 0x321e,
 	0x3220, 0x32fe,
@@ -14468,12 +14807,13 @@ static const OnigCodePoint CR_Graph[] = {
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
 	0xa4d0, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa673,
+	0xa640, 0xa673,
 	0xa67c, 0xa697,
 	0xa6a0, 0xa6f7,
-	0xa700, 0xa78c,
-	0xa7fb, 0xa82b,
+	0xa700, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa82b,
 	0xa830, 0xa839,
 	0xa840, 0xa877,
 	0xa880, 0xa8c4,
@@ -14490,6 +14830,11 @@ static const OnigCodePoint CR_Graph[] = {
 	0xaa5c, 0xaa7b,
 	0xaa80, 0xaac2,
 	0xaadb, 0xaadf,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabed,
 	0xabf0, 0xabf9,
 	0xac00, 0xd7a3,
@@ -14505,7 +14850,7 @@ static const OnigCodePoint CR_Graph[] = {
 	0xfb3e, 0xfb3e,
 	0xfb40, 0xfb41,
 	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
+	0xfb46, 0xfbc1,
 	0xfbd3, 0xfd3f,
 	0xfd50, 0xfd8f,
 	0xfd92, 0xfdc7,
@@ -14573,11 +14918,15 @@ static const OnigCodePoint CR_Graph[] = {
 	0x10b78, 0x10b7f,
 	0x10c00, 0x10c48,
 	0x10e60, 0x10e7e,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
 	0x11080, 0x110c1,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x12470, 0x12473,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d000, 0x1d0f5,
 	0x1d100, 0x1d126,
 	0x1d129, 0x1d1dd,
@@ -14607,26 +14956,49 @@ static const OnigCodePoint CR_Graph[] = {
 	0x1d7ce, 0x1d7ff,
 	0x1f000, 0x1f02b,
 	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
 	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,
+	0x1f130, 0x1f169,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
 	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f5ff,
+	0x1f601, 0x1f610,
+	0x1f612, 0x1f614,
+	0x1f616, 0x1f616,
+	0x1f618, 0x1f618,
+	0x1f61a, 0x1f61a,
+	0x1f61c, 0x1f61e,
+	0x1f620, 0x1f625,
+	0x1f628, 0x1f62b,
+	0x1f62d, 0x1f62d,
+	0x1f630, 0x1f633,
+	0x1f635, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 	0xe0001, 0xe0001,
 	0xe0020, 0xe007f,
@@ -14640,14 +15012,14 @@ static const OnigCodePoint CR_Graph[] = {
 
 /* 'Print': [[:Print:]] */
 static const OnigCodePoint CR_Print[] = {
-	487,
+	503,
 	0x0020, 0x007e,
 	0x00a0, 0x0377,
 	0x037a, 0x037e,
 	0x0384, 0x038a,
 	0x038c, 0x038c,
 	0x038e, 0x03a1,
-	0x03a3, 0x0525,
+	0x03a3, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x055f,
 	0x0561, 0x0587,
@@ -14657,18 +15029,15 @@ static const OnigCodePoint CR_Print[] = {
 	0x05f0, 0x05f4,
 	0x0600, 0x0603,
 	0x0606, 0x061b,
-	0x061e, 0x061f,
-	0x0621, 0x065e,
-	0x0660, 0x070d,
+	0x061e, 0x070d,
 	0x070f, 0x074a,
 	0x074d, 0x07b1,
 	0x07c0, 0x07fa,
 	0x0800, 0x082d,
 	0x0830, 0x083e,
-	0x0900, 0x0939,
-	0x093c, 0x094e,
-	0x0950, 0x0955,
-	0x0958, 0x0972,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x0900, 0x0977,
 	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
@@ -14727,7 +15096,7 @@ static const OnigCodePoint CR_Print[] = {
 	0x0b56, 0x0b57,
 	0x0b5c, 0x0b5d,
 	0x0b5f, 0x0b63,
-	0x0b66, 0x0b71,
+	0x0b66, 0x0b77,
 	0x0b82, 0x0b83,
 	0x0b85, 0x0b8a,
 	0x0b8e, 0x0b90,
@@ -14775,11 +15144,10 @@ static const OnigCodePoint CR_Print[] = {
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
+	0x0d4a, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d66, 0x0d75,
@@ -14817,11 +15185,10 @@ static const OnigCodePoint CR_Print[] = {
 	0x0edc, 0x0edd,
 	0x0f00, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f71, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fd8,
+	0x0fce, 0x0fda,
 	0x1000, 0x10c5,
 	0x10d0, 0x10fc,
 	0x1100, 0x1248,
@@ -14840,7 +15207,7 @@ static const OnigCodePoint CR_Print[] = {
 	0x12d8, 0x1310,
 	0x1312, 0x1315,
 	0x1318, 0x135a,
-	0x135f, 0x137c,
+	0x135d, 0x137c,
 	0x1380, 0x1399,
 	0x13a0, 0x13f4,
 	0x1400, 0x169c,
@@ -14879,12 +15246,13 @@ static const OnigCodePoint CR_Print[] = {
 	0x1b50, 0x1b7c,
 	0x1b80, 0x1baa,
 	0x1bae, 0x1bb9,
-	0x1c00, 0x1c37,
+	0x1bc0, 0x1bf3,
+	0x1bfc, 0x1c37,
 	0x1c3b, 0x1c49,
 	0x1c4d, 0x1c7f,
 	0x1cd0, 0x1cf2,
 	0x1d00, 0x1de6,
-	0x1dfd, 0x1f15,
+	0x1dfc, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
 	0x1f48, 0x1f4d,
@@ -14904,38 +15272,25 @@ static const OnigCodePoint CR_Print[] = {
 	0x202a, 0x2064,
 	0x206a, 0x2071,
 	0x2074, 0x208e,
-	0x2090, 0x2094,
-	0x20a0, 0x20b8,
+	0x2090, 0x209c,
+	0x20a0, 0x20b9,
 	0x20d0, 0x20f0,
 	0x2100, 0x2189,
-	0x2190, 0x23e8,
+	0x2190, 0x23f3,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
-	0x2460, 0x26cd,
-	0x26cf, 0x26e1,
-	0x26e3, 0x26e3,
-	0x26e8, 0x26ff,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
+	0x2460, 0x26ff,
+	0x2701, 0x27ca,
 	0x27cc, 0x27cc,
-	0x27d0, 0x2b4c,
+	0x27ce, 0x2b4c,
 	0x2b50, 0x2b59,
 	0x2c00, 0x2c2e,
 	0x2c30, 0x2c5e,
 	0x2c60, 0x2cf1,
 	0x2cf9, 0x2d25,
 	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
 	0x2da0, 0x2da6,
 	0x2da8, 0x2dae,
 	0x2db0, 0x2db6,
@@ -14954,7 +15309,7 @@ static const OnigCodePoint CR_Print[] = {
 	0x3099, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x3190, 0x31b7,
+	0x3190, 0x31ba,
 	0x31c0, 0x31e3,
 	0x31f0, 0x321e,
 	0x3220, 0x32fe,
@@ -14963,12 +15318,13 @@ static const OnigCodePoint CR_Print[] = {
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
 	0xa4d0, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa673,
+	0xa640, 0xa673,
 	0xa67c, 0xa697,
 	0xa6a0, 0xa6f7,
-	0xa700, 0xa78c,
-	0xa7fb, 0xa82b,
+	0xa700, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa82b,
 	0xa830, 0xa839,
 	0xa840, 0xa877,
 	0xa880, 0xa8c4,
@@ -14985,6 +15341,11 @@ static const OnigCodePoint CR_Print[] = {
 	0xaa5c, 0xaa7b,
 	0xaa80, 0xaac2,
 	0xaadb, 0xaadf,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabed,
 	0xabf0, 0xabf9,
 	0xac00, 0xd7a3,
@@ -15000,7 +15361,7 @@ static const OnigCodePoint CR_Print[] = {
 	0xfb3e, 0xfb3e,
 	0xfb40, 0xfb41,
 	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
+	0xfb46, 0xfbc1,
 	0xfbd3, 0xfd3f,
 	0xfd50, 0xfd8f,
 	0xfd92, 0xfdc7,
@@ -15068,11 +15429,15 @@ static const OnigCodePoint CR_Print[] = {
 	0x10b78, 0x10b7f,
 	0x10c00, 0x10c48,
 	0x10e60, 0x10e7e,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
 	0x11080, 0x110c1,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x12470, 0x12473,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d000, 0x1d0f5,
 	0x1d100, 0x1d126,
 	0x1d129, 0x1d1dd,
@@ -15102,26 +15467,49 @@ static const OnigCodePoint CR_Print[] = {
 	0x1d7ce, 0x1d7ff,
 	0x1f000, 0x1f02b,
 	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
 	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,
+	0x1f130, 0x1f169,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
 	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f5ff,
+	0x1f601, 0x1f610,
+	0x1f612, 0x1f614,
+	0x1f616, 0x1f616,
+	0x1f618, 0x1f618,
+	0x1f61a, 0x1f61a,
+	0x1f61c, 0x1f61e,
+	0x1f620, 0x1f625,
+	0x1f628, 0x1f62b,
+	0x1f62d, 0x1f62d,
+	0x1f630, 0x1f633,
+	0x1f635, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 	0xe0001, 0xe0001,
 	0xe0020, 0xe007f,
@@ -15144,7 +15532,7 @@ static const OnigCodePoint CR_Print[] = {
 
 /* 'Word': [[:Word:]] */
 static const OnigCodePoint CR_Word[] = {
-	506,
+	514,
 	0x0030, 0x0039,
 	0x0041, 0x005a,
 	0x005f, 0x005f,
@@ -15168,7 +15556,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x038e, 0x03a1,
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
-	0x0483, 0x0525,
+	0x0483, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x0559,
 	0x0561, 0x0587,
@@ -15180,11 +15568,10 @@ static const OnigCodePoint CR_Word[] = {
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
 	0x0610, 0x061a,
-	0x0621, 0x065e,
-	0x0660, 0x0669,
+	0x0620, 0x0669,
 	0x066e, 0x06d3,
 	0x06d5, 0x06dc,
-	0x06de, 0x06e8,
+	0x06df, 0x06e8,
 	0x06ea, 0x06fc,
 	0x06ff, 0x06ff,
 	0x0710, 0x074a,
@@ -15192,12 +15579,10 @@ static const OnigCodePoint CR_Word[] = {
 	0x07c0, 0x07f5,
 	0x07fa, 0x07fa,
 	0x0800, 0x082d,
-	0x0900, 0x0939,
-	0x093c, 0x094e,
-	0x0950, 0x0955,
-	0x0958, 0x0963,
+	0x0840, 0x085b,
+	0x0900, 0x0963,
 	0x0966, 0x096f,
-	0x0971, 0x0972,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
@@ -15299,14 +15684,14 @@ static const OnigCodePoint CR_Word[] = {
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
+	0x0d4a, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d66, 0x0d6f,
@@ -15352,8 +15737,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x0f3e, 0x0f47,
 	0x0f49, 0x0f6c,
 	0x0f71, 0x0f84,
-	0x0f86, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f86, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fc6, 0x0fc6,
 	0x1000, 0x1049,
@@ -15377,7 +15761,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x12d8, 0x1310,
 	0x1312, 0x1315,
 	0x1318, 0x135a,
-	0x135f, 0x135f,
+	0x135d, 0x135f,
 	0x1380, 0x138f,
 	0x13a0, 0x13f4,
 	0x1401, 0x166c,
@@ -15409,7 +15793,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x1970, 0x1974,
 	0x1980, 0x19ab,
 	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
+	0x19d0, 0x19d9,
 	0x1a00, 0x1a1b,
 	0x1a20, 0x1a5e,
 	0x1a60, 0x1a7c,
@@ -15421,13 +15805,14 @@ static const OnigCodePoint CR_Word[] = {
 	0x1b6b, 0x1b73,
 	0x1b80, 0x1baa,
 	0x1bae, 0x1bb9,
+	0x1bc0, 0x1bf3,
 	0x1c00, 0x1c37,
 	0x1c40, 0x1c49,
 	0x1c4d, 0x1c7d,
 	0x1cd0, 0x1cd2,
 	0x1cd4, 0x1cf2,
 	0x1d00, 0x1de6,
-	0x1dfd, 0x1f15,
+	0x1dfc, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
 	0x1f48, 0x1f4d,
@@ -15450,7 +15835,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x2054, 0x2054,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x20d0, 0x20f0,
 	0x2102, 0x2102,
 	0x2107, 0x2107,
@@ -15474,7 +15859,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x2d00, 0x2d25,
 	0x2d30, 0x2d65,
 	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
+	0x2d7f, 0x2d96,
 	0x2da0, 0x2da6,
 	0x2da8, 0x2dae,
 	0x2db0, 0x2db6,
@@ -15496,7 +15881,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x30fc, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -15504,15 +15889,16 @@ static const OnigCodePoint CR_Word[] = {
 	0xa4d0, 0xa4fd,
 	0xa500, 0xa60c,
 	0xa610, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa672,
+	0xa640, 0xa672,
 	0xa67c, 0xa67d,
 	0xa67f, 0xa697,
 	0xa6a0, 0xa6f1,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa827,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa827,
 	0xa840, 0xa873,
 	0xa880, 0xa8c4,
 	0xa8d0, 0xa8d9,
@@ -15530,6 +15916,11 @@ static const OnigCodePoint CR_Word[] = {
 	0xaa7a, 0xaa7b,
 	0xaa80, 0xaac2,
 	0xaadb, 0xaadd,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabea,
 	0xabec, 0xabed,
 	0xabf0, 0xabf9,
@@ -15606,10 +15997,14 @@ static const OnigCodePoint CR_Word[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11000, 0x11046,
+	0x11066, 0x1106f,
 	0x11080, 0x110ba,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d165, 0x1d169,
 	0x1d16d, 0x1d172,
 	0x1d17b, 0x1d182,
@@ -15649,13 +16044,14 @@ static const OnigCodePoint CR_Word[] = {
 	0x1d7ce, 0x1d7ff,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 	0xe0100, 0xe01ef,
 }; /* CR_Word */
 
 /* 'Alnum': [[:Alnum:]] */
 static const OnigCodePoint CR_Alnum[] = {
-	497,
+	509,
 	0x0030, 0x0039,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
@@ -15679,7 +16075,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x038e, 0x03a1,
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x0559,
 	0x0561, 0x0587,
@@ -15691,9 +16087,8 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
 	0x0610, 0x061a,
-	0x0621, 0x0657,
-	0x0659, 0x065e,
-	0x0660, 0x0669,
+	0x0620, 0x0657,
+	0x0659, 0x0669,
 	0x066e, 0x06d3,
 	0x06d5, 0x06dc,
 	0x06e1, 0x06e8,
@@ -15706,14 +16101,13 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x07fa, 0x07fa,
 	0x0800, 0x0817,
 	0x081a, 0x082c,
-	0x0900, 0x0939,
+	0x0840, 0x0858,
+	0x0900, 0x093b,
 	0x093d, 0x094c,
-	0x094e, 0x094e,
-	0x0950, 0x0950,
-	0x0955, 0x0955,
-	0x0958, 0x0963,
+	0x094e, 0x0950,
+	0x0955, 0x0963,
 	0x0966, 0x096f,
-	0x0971, 0x0972,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
@@ -15815,14 +16209,15 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
 	0x0d4a, 0x0d4c,
+	0x0d4e, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d66, 0x0d6f,
@@ -15864,8 +16259,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x0f40, 0x0f47,
 	0x0f49, 0x0f6c,
 	0x0f71, 0x0f81,
-	0x0f88, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f88, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x1000, 0x1036,
 	0x1038, 0x1038,
@@ -15926,7 +16320,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x1970, 0x1974,
 	0x1980, 0x19ab,
 	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
+	0x19d0, 0x19d9,
 	0x1a00, 0x1a1b,
 	0x1a20, 0x1a5e,
 	0x1a61, 0x1a74,
@@ -15939,6 +16333,8 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x1b50, 0x1b59,
 	0x1b80, 0x1ba9,
 	0x1bae, 0x1bb9,
+	0x1bc0, 0x1be5,
+	0x1be7, 0x1bf1,
 	0x1c00, 0x1c35,
 	0x1c40, 0x1c49,
 	0x1c4d, 0x1c7d,
@@ -15966,7 +16362,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x1ff6, 0x1ffc,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x2102, 0x2102,
 	0x2107, 0x2107,
 	0x210a, 0x2113,
@@ -16010,7 +16406,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x30fc, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -16018,14 +16414,15 @@ static const OnigCodePoint CR_Alnum[] = {
 	0xa4d0, 0xa4fd,
 	0xa500, 0xa60c,
 	0xa610, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa66e,
+	0xa640, 0xa66e,
 	0xa67f, 0xa697,
 	0xa6a0, 0xa6ef,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa801,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa801,
 	0xa803, 0xa805,
 	0xa807, 0xa80a,
 	0xa80c, 0xa827,
@@ -16037,7 +16434,8 @@ static const OnigCodePoint CR_Alnum[] = {
 	0xa900, 0xa92a,
 	0xa930, 0xa952,
 	0xa960, 0xa97c,
-	0xa980, 0xa9bf,
+	0xa980, 0xa9b2,
+	0xa9b4, 0xa9bf,
 	0xa9cf, 0xa9d9,
 	0xaa00, 0xaa36,
 	0xaa40, 0xaa4d,
@@ -16048,6 +16446,11 @@ static const OnigCodePoint CR_Alnum[] = {
 	0xaac0, 0xaac0,
 	0xaac2, 0xaac2,
 	0xaadb, 0xaadd,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabea,
 	0xabf0, 0xabf9,
 	0xac00, 0xd7a3,
@@ -16115,10 +16518,14 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11000, 0x11045,
+	0x11066, 0x1106f,
 	0x11082, 0x110b8,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d400, 0x1d454,
 	0x1d456, 0x1d49c,
 	0x1d49e, 0x1d49f,
@@ -16152,6 +16559,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x1d7ce, 0x1d7ff,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_Alnum */
 
@@ -16329,6 +16737,9 @@ static const OnigCodePoint* const CodeRanges[] = {
   CR_Inscriptional_Pahlavi,
   CR_Old_Turkic,
   CR_Kaithi,
+  CR_Batak,
+  CR_Brahmi,
+  CR_Mandaic,
   CR_White_Space,
   CR_Bidi_Control,
   CR_Join_Control,
@@ -16378,12 +16789,12 @@ static const struct uniname2ctype_struct *uniname2ctype_p(const char *, unsigned
 #define MAX_HASH_VALUE 21
 /* maximum key range = 15, duplicates = 0 */
 #else /* USE_UNICODE_PROPERTIES */
-#define TOTAL_KEYWORDS 367
+#define TOTAL_KEYWORDS 373
 #define MIN_WORD_LENGTH 1
 #define MAX_WORD_LENGTH 30
 #define MIN_HASH_VALUE 3
-#define MAX_HASH_VALUE 1751
-/* maximum key range = 1749, duplicates = 0 */
+#define MAX_HASH_VALUE 2124
+/* maximum key range = 2122, duplicates = 0 */
 #endif /* USE_UNICODE_PROPERTIES */
 
 #ifdef __GNUC__
@@ -16419,19 +16830,19 @@ uniname2ctype_hash (str, len)
        2, 22,  1, 22, 10,  8,  4,  7, 22,  3,
        4, 22, 22, 22, 22, 22, 22, 22
 #else /* USE_UNICODE_PROPERTIES */
-      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
-      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
-      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
-      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
-      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
-      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
-      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
-      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
-      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
-      1752, 1752, 1752, 1752, 1752, 1752, 1752,    7,  419,    1,
-       128,   38,  100,  186,   46,   11,  226,  463,    4,  317,
-         6,    2,  265,    5,   18,  112,   30,  289,  164,  384,
-       368,  579,   10, 1752, 1752, 1752, 1752, 1752
+      2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125,
+      2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125,
+      2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125,
+      2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125,
+      2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125,
+      2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125,
+      2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125,
+      2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125,
+      2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125,
+      2125, 2125, 2125, 2125, 2125, 2125, 2125,    7,  538,    1,
+       105,   51,  100,  387,   51,   11,    4,  668,    4,  320,
+         6,    2,  239,    1,   18,  134,   30,  240,    5,  440,
+       248,  698,   26, 2125, 2125, 2125, 2125, 2125
 #endif /* USE_UNICODE_PROPERTIES */
     };
 #ifndef USE_UNICODE_PROPERTIES
@@ -16505,14 +16916,18 @@ struct uniname2ctype_pool_t
     char uniname2ctype_pool_str16[sizeof("nl")];
     char uniname2ctype_pool_str18[sizeof("lao")];
     char uniname2ctype_pool_str19[sizeof("laoo")];
-    char uniname2ctype_pool_str20[sizeof("zl")];
-    char uniname2ctype_pool_str21[sizeof("z")];
+    char uniname2ctype_pool_str20[sizeof("qaac")];
     char uniname2ctype_pool_str22[sizeof("control")];
-    char uniname2ctype_pool_str24[sizeof("qaac")];
+    char uniname2ctype_pool_str23[sizeof("joinc")];
     char uniname2ctype_pool_str25[sizeof("ci")];
+    char uniname2ctype_pool_str27[sizeof("java")];
     char uniname2ctype_pool_str28[sizeof("lana")];
+    char uniname2ctype_pool_str30[sizeof("qaai")];
     char uniname2ctype_pool_str33[sizeof("oalpha")];
-    char uniname2ctype_pool_str34[sizeof("qaai")];
+    char uniname2ctype_pool_str34[sizeof("joincontrol")];
+    char uniname2ctype_pool_str36[sizeof("zl")];
+    char uniname2ctype_pool_str37[sizeof("vai")];
+    char uniname2ctype_pool_str38[sizeof("vaii")];
     char uniname2ctype_pool_str40[sizeof("arabic")];
     char uniname2ctype_pool_str41[sizeof("cari")];
     char uniname2ctype_pool_str43[sizeof("oriya")];
@@ -16522,344 +16937,346 @@ struct uniname2ctype_pool_t
     char uniname2ctype_pool_str50[sizeof("olower")];
     char uniname2ctype_pool_str51[sizeof("latn")];
     char uniname2ctype_pool_str52[sizeof("latin")];
+    char uniname2ctype_pool_str53[sizeof("z")];
     char uniname2ctype_pool_str56[sizeof("ital")];
-    char uniname2ctype_pool_str65[sizeof("hano")];
     char uniname2ctype_pool_str66[sizeof("lt")];
-    char uniname2ctype_pool_str68[sizeof("han")];
-    char uniname2ctype_pool_str70[sizeof("hanunoo")];
+    char uniname2ctype_pool_str70[sizeof("hano")];
     char uniname2ctype_pool_str71[sizeof("canadianaboriginal")];
-    char uniname2ctype_pool_str73[sizeof("hangul")];
-    char uniname2ctype_pool_str74[sizeof("hani")];
-    char uniname2ctype_pool_str76[sizeof("nchar")];
-    char uniname2ctype_pool_str77[sizeof("zinh")];
-    char uniname2ctype_pool_str83[sizeof("tale")];
-    char uniname2ctype_pool_str85[sizeof("loe")];
-    char uniname2ctype_pool_str86[sizeof("hira")];
-    char uniname2ctype_pool_str91[sizeof("taile")];
-    char uniname2ctype_pool_str92[sizeof("lineseparator")];
-    char uniname2ctype_pool_str94[sizeof("thaa")];
-    char uniname2ctype_pool_str97[sizeof("hiragana")];
-    char uniname2ctype_pool_str98[sizeof("thai")];
+    char uniname2ctype_pool_str73[sizeof("han")];
+    char uniname2ctype_pool_str75[sizeof("hanunoo")];
+    char uniname2ctype_pool_str76[sizeof("tavt")];
+    char uniname2ctype_pool_str78[sizeof("hangul")];
+    char uniname2ctype_pool_str79[sizeof("hani")];
+    char uniname2ctype_pool_str81[sizeof("nchar")];
+    char uniname2ctype_pool_str83[sizeof("avestan")];
+    char uniname2ctype_pool_str91[sizeof("hira")];
+    char uniname2ctype_pool_str96[sizeof("tale")];
+    char uniname2ctype_pool_str98[sizeof("zinh")];
+    char uniname2ctype_pool_str99[sizeof("thaa")];
     char uniname2ctype_pool_str100[sizeof("initialpunctuation")];
-    char uniname2ctype_pool_str101[sizeof("other")];
-    char uniname2ctype_pool_str103[sizeof("thaana")];
-    char uniname2ctype_pool_str107[sizeof("cher")];
-    char uniname2ctype_pool_str111[sizeof("otherletter")];
-    char uniname2ctype_pool_str113[sizeof("othernumber")];
-    char uniname2ctype_pool_str114[sizeof("letter")];
-    char uniname2ctype_pool_str116[sizeof("sc")];
-    char uniname2ctype_pool_str118[sizeof("so")];
-    char uniname2ctype_pool_str123[sizeof("taiviet")];
-    char uniname2ctype_pool_str128[sizeof("noncharactercodepoint")];
-    char uniname2ctype_pool_str129[sizeof("ethi")];
-    char uniname2ctype_pool_str130[sizeof("cans")];
+    char uniname2ctype_pool_str101[sizeof("variationselector")];
+    char uniname2ctype_pool_str102[sizeof("hiragana")];
+    char uniname2ctype_pool_str103[sizeof("thai")];
+    char uniname2ctype_pool_str104[sizeof("taile")];
+    char uniname2ctype_pool_str105[sizeof("lineseparator")];
+    char uniname2ctype_pool_str106[sizeof("other")];
+    char uniname2ctype_pool_str108[sizeof("thaana")];
+    char uniname2ctype_pool_str111[sizeof("loe")];
+    char uniname2ctype_pool_str116[sizeof("otherletter")];
+    char uniname2ctype_pool_str118[sizeof("othernumber")];
+    char uniname2ctype_pool_str121[sizeof("idc")];
+    char uniname2ctype_pool_str123[sizeof("oidc")];
+    char uniname2ctype_pool_str125[sizeof("cher")];
+    char uniname2ctype_pool_str126[sizeof("javanese")];
+    char uniname2ctype_pool_str127[sizeof("letter")];
+    char uniname2ctype_pool_str128[sizeof("olditalic")];
+    char uniname2ctype_pool_str129[sizeof("di")];
+    char uniname2ctype_pool_str132[sizeof("odi")];
+    char uniname2ctype_pool_str133[sizeof("dia")];
     char uniname2ctype_pool_str135[sizeof("titlecaseletter")];
-    char uniname2ctype_pool_str136[sizeof("ascii")];
-    char uniname2ctype_pool_str138[sizeof("letternumber")];
-    char uniname2ctype_pool_str139[sizeof("otheralphabetic")];
-    char uniname2ctype_pool_str141[sizeof("otherlowercase")];
-    char uniname2ctype_pool_str144[sizeof("idc")];
-    char uniname2ctype_pool_str146[sizeof("oidc")];
-    char uniname2ctype_pool_str147[sizeof("sinhala")];
-    char uniname2ctype_pool_str148[sizeof("terminalpunctuation")];
-    char uniname2ctype_pool_str151[sizeof("olditalic")];
-    char uniname2ctype_pool_str152[sizeof("di")];
-    char uniname2ctype_pool_str153[sizeof("otheridcontinue")];
-    char uniname2ctype_pool_str155[sizeof("odi")];
-    char uniname2ctype_pool_str156[sizeof("dia")];
-    char uniname2ctype_pool_str161[sizeof("otheridstart")];
-    char uniname2ctype_pool_str162[sizeof("oldturkic")];
-    char uniname2ctype_pool_str167[sizeof("diacritic")];
-    char uniname2ctype_pool_str168[sizeof("oldpersian")];
-    char uniname2ctype_pool_str171[sizeof("radical")];
-    char uniname2ctype_pool_str179[sizeof("sinh")];
-    char uniname2ctype_pool_str183[sizeof("ideo")];
-    char uniname2ctype_pool_str185[sizeof("shavian")];
+    char uniname2ctype_pool_str136[sizeof("taiviet")];
+    char uniname2ctype_pool_str138[sizeof("sc")];
+    char uniname2ctype_pool_str139[sizeof("oldturkic")];
+    char uniname2ctype_pool_str140[sizeof("so")];
+    char uniname2ctype_pool_str141[sizeof("noncharactercodepoint")];
+    char uniname2ctype_pool_str144[sizeof("diacritic")];
+    char uniname2ctype_pool_str145[sizeof("oldpersian")];
+    char uniname2ctype_pool_str147[sizeof("ethi")];
+    char uniname2ctype_pool_str148[sizeof("radical")];
+    char uniname2ctype_pool_str151[sizeof("letternumber")];
+    char uniname2ctype_pool_str152[sizeof("cans")];
+    char uniname2ctype_pool_str157[sizeof("otheralphabetic")];
+    char uniname2ctype_pool_str158[sizeof("ascii")];
+    char uniname2ctype_pool_str159[sizeof("otherlowercase")];
+    char uniname2ctype_pool_str161[sizeof("terminalpunctuation")];
+    char uniname2ctype_pool_str166[sizeof("otheridstart")];
+    char uniname2ctype_pool_str169[sizeof("sinhala")];
+    char uniname2ctype_pool_str171[sizeof("otheridcontinue")];
+    char uniname2ctype_pool_str172[sizeof("deva")];
+    char uniname2ctype_pool_str173[sizeof("ideo")];
+    char uniname2ctype_pool_str180[sizeof("avst")];
     char uniname2ctype_pool_str186[sizeof("format")];
-    char uniname2ctype_pool_str192[sizeof("inscriptionalparthian")];
-    char uniname2ctype_pool_str196[sizeof("vai")];
-    char uniname2ctype_pool_str197[sizeof("vaii")];
-    char uniname2ctype_pool_str202[sizeof("tifinagh")];
+    char uniname2ctype_pool_str189[sizeof("devanagari")];
+    char uniname2ctype_pool_str193[sizeof("inherited")];
+    char uniname2ctype_pool_str197[sizeof("ideographic")];
     char uniname2ctype_pool_str203[sizeof("cf")];
-    char uniname2ctype_pool_str205[sizeof("othersymbol")];
-    char uniname2ctype_pool_str207[sizeof("ideographic")];
-    char uniname2ctype_pool_str211[sizeof("inherited")];
-    char uniname2ctype_pool_str212[sizeof("glagolitic")];
-    char uniname2ctype_pool_str218[sizeof("idcontinue")];
-    char uniname2ctype_pool_str220[sizeof("asciihexdigit")];
-    char uniname2ctype_pool_str224[sizeof("inscriptionalpahlavi")];
-    char uniname2ctype_pool_str225[sizeof("s")];
-    char uniname2ctype_pool_str226[sizeof("gothic")];
-    char uniname2ctype_pool_str227[sizeof("cs")];
-    char uniname2ctype_pool_str229[sizeof("avestan")];
-    char uniname2ctype_pool_str235[sizeof("tavt")];
-    char uniname2ctype_pool_str236[sizeof("zs")];
-    char uniname2ctype_pool_str243[sizeof("decimalnumber")];
-    char uniname2ctype_pool_str244[sizeof("tagbanwa")];
-    char uniname2ctype_pool_str245[sizeof("joinc")];
-    char uniname2ctype_pool_str248[sizeof("geor")];
-    char uniname2ctype_pool_str249[sizeof("hang")];
-    char uniname2ctype_pool_str251[sizeof("georgian")];
-    char uniname2ctype_pool_str253[sizeof("cased")];
-    char uniname2ctype_pool_str256[sizeof("joincontrol")];
-    char uniname2ctype_pool_str257[sizeof("oids")];
-    char uniname2ctype_pool_str260[sizeof("variationselector")];
-    char uniname2ctype_pool_str262[sizeof("graph")];
-    char uniname2ctype_pool_str263[sizeof("changeswhenlowercased")];
-    char uniname2ctype_pool_str264[sizeof("nd")];
-    char uniname2ctype_pool_str268[sizeof("goth")];
-    char uniname2ctype_pool_str269[sizeof("pc")];
-    char uniname2ctype_pool_str271[sizeof("po")];
-    char uniname2ctype_pool_str272[sizeof("ogrext")];
-    char uniname2ctype_pool_str276[sizeof("coptic")];
-    char uniname2ctype_pool_str277[sizeof("grext")];
-    char uniname2ctype_pool_str282[sizeof("logicalorderexception")];
-    char uniname2ctype_pool_str285[sizeof("idst")];
-    char uniname2ctype_pool_str288[sizeof("alpha")];
-    char uniname2ctype_pool_str289[sizeof("pi")];
-    char uniname2ctype_pool_str292[sizeof("dsrt")];
-    char uniname2ctype_pool_str297[sizeof("dash")];
-    char uniname2ctype_pool_str298[sizeof("otherdefaultignorablecodepoint")];
-    char uniname2ctype_pool_str302[sizeof("copt")];
-    char uniname2ctype_pool_str306[sizeof("idstart")];
-    char uniname2ctype_pool_str307[sizeof("closepunctuation")];
-    char uniname2ctype_pool_str309[sizeof("changeswhentitlecased")];
-    char uniname2ctype_pool_str312[sizeof("lepc")];
-    char uniname2ctype_pool_str317[sizeof("avst")];
-    char uniname2ctype_pool_str318[sizeof("cprt")];
-    char uniname2ctype_pool_str319[sizeof("runic")];
-    char uniname2ctype_pool_str320[sizeof("patsyn")];
-    char uniname2ctype_pool_str321[sizeof("mc")];
-    char uniname2ctype_pool_str326[sizeof("tfng")];
-    char uniname2ctype_pool_str327[sizeof("lepcha")];
-    char uniname2ctype_pool_str328[sizeof("prti")];
-    char uniname2ctype_pool_str329[sizeof("print")];
-    char uniname2ctype_pool_str330[sizeof("phli")];
-    char uniname2ctype_pool_str331[sizeof("mn")];
-    char uniname2ctype_pool_str332[sizeof("idsbinaryoperator")];
-    char uniname2ctype_pool_str334[sizeof("talu")];
-    char uniname2ctype_pool_str335[sizeof("runr")];
-    char uniname2ctype_pool_str337[sizeof("graphemebase")];
-    char uniname2ctype_pool_str338[sizeof("common")];
-    char uniname2ctype_pool_str339[sizeof("alnum")];
-    char uniname2ctype_pool_str340[sizeof("phoenician")];
-    char uniname2ctype_pool_str341[sizeof("deva")];
-    char uniname2ctype_pool_str342[sizeof("changeswhencasefolded")];
+    char uniname2ctype_pool_str206[sizeof("sinh")];
+    char uniname2ctype_pool_str207[sizeof("tifinagh")];
+    char uniname2ctype_pool_str208[sizeof("idcontinue")];
+    char uniname2ctype_pool_str212[sizeof("shavian")];
+    char uniname2ctype_pool_str214[sizeof("inscriptionalparthian")];
+    char uniname2ctype_pool_str218[sizeof("nd")];
+    char uniname2ctype_pool_str232[sizeof("othersymbol")];
+    char uniname2ctype_pool_str243[sizeof("pc")];
+    char uniname2ctype_pool_str245[sizeof("po")];
+    char uniname2ctype_pool_str246[sizeof("decimalnumber")];
+    char uniname2ctype_pool_str247[sizeof("asciihexdigit")];
+    char uniname2ctype_pool_str250[sizeof("coptic")];
+    char uniname2ctype_pool_str251[sizeof("inscriptionalpahlavi")];
+    char uniname2ctype_pool_str252[sizeof("cased")];
+    char uniname2ctype_pool_str256[sizeof("oids")];
+    char uniname2ctype_pool_str258[sizeof("changeswhenlowercased")];
+    char uniname2ctype_pool_str262[sizeof("alpha")];
+    char uniname2ctype_pool_str263[sizeof("pi")];
+    char uniname2ctype_pool_str269[sizeof("s")];
+    char uniname2ctype_pool_str270[sizeof("runic")];
+    char uniname2ctype_pool_str271[sizeof("cs")];
+    char uniname2ctype_pool_str275[sizeof("vs")];
+    char uniname2ctype_pool_str276[sizeof("copt")];
+    char uniname2ctype_pool_str280[sizeof("otherdefaultignorablecodepoint")];
+    char uniname2ctype_pool_str281[sizeof("closepunctuation")];
+    char uniname2ctype_pool_str284[sizeof("idst")];
+    char uniname2ctype_pool_str285[sizeof("talu")];
+    char uniname2ctype_pool_str286[sizeof("runr")];
+    char uniname2ctype_pool_str291[sizeof("dsrt")];
+    char uniname2ctype_pool_str292[sizeof("cprt")];
+    char uniname2ctype_pool_str294[sizeof("patsyn")];
+    char uniname2ctype_pool_str296[sizeof("zs")];
+    char uniname2ctype_pool_str299[sizeof("lepc")];
+    char uniname2ctype_pool_str301[sizeof("dash")];
+    char uniname2ctype_pool_str302[sizeof("prti")];
+    char uniname2ctype_pool_str303[sizeof("print")];
+    char uniname2ctype_pool_str305[sizeof("idstart")];
+    char uniname2ctype_pool_str309[sizeof("phli")];
+    char uniname2ctype_pool_str314[sizeof("lepcha")];
+    char uniname2ctype_pool_str317[sizeof("changeswhentitlecased")];
+    char uniname2ctype_pool_str319[sizeof("phoenician")];
+    char uniname2ctype_pool_str324[sizeof("mc")];
+    char uniname2ctype_pool_str329[sizeof("telu")];
+    char uniname2ctype_pool_str334[sizeof("mn")];
+    char uniname2ctype_pool_str337[sizeof("changeswhencasefolded")];
+    char uniname2ctype_pool_str341[sizeof("common")];
+    char uniname2ctype_pool_str342[sizeof("alnum")];
     char uniname2ctype_pool_str343[sizeof("pe")];
-    char uniname2ctype_pool_str344[sizeof("mongolian")];
-    char uniname2ctype_pool_str352[sizeof("armn")];
-    char uniname2ctype_pool_str353[sizeof("deseret")];
-    char uniname2ctype_pool_str354[sizeof("softdotted")];
-    char uniname2ctype_pool_str357[sizeof("armi")];
-    char uniname2ctype_pool_str358[sizeof("devanagari")];
-    char uniname2ctype_pool_str360[sizeof("digit")];
-    char uniname2ctype_pool_str361[sizeof("caseignorable")];
-    char uniname2ctype_pool_str362[sizeof("taml")];
-    char uniname2ctype_pool_str363[sizeof("tamil")];
-    char uniname2ctype_pool_str365[sizeof("telu")];
-    char uniname2ctype_pool_str366[sizeof("ids")];
-    char uniname2ctype_pool_str367[sizeof("armenian")];
-    char uniname2ctype_pool_str370[sizeof("sd")];
-    char uniname2ctype_pool_str372[sizeof("privateuse")];
-    char uniname2ctype_pool_str373[sizeof("assigned")];
-    char uniname2ctype_pool_str375[sizeof("cham")];
-    char uniname2ctype_pool_str377[sizeof("omath")];
-    char uniname2ctype_pool_str378[sizeof("otherpunctuation")];
-    char uniname2ctype_pool_str379[sizeof("taitham")];
-    char uniname2ctype_pool_str381[sizeof("defaultignorablecodepoint")];
-    char uniname2ctype_pool_str387[sizeof("glag")];
-    char uniname2ctype_pool_str388[sizeof("ethiopic")];
-    char uniname2ctype_pool_str390[sizeof("vs")];
-    char uniname2ctype_pool_str395[sizeof("me")];
-    char uniname2ctype_pool_str396[sizeof("cwl")];
-    char uniname2ctype_pool_str400[sizeof("mtei")];
-    char uniname2ctype_pool_str404[sizeof("math")];
-    char uniname2ctype_pool_str407[sizeof("term")];
-    char uniname2ctype_pool_str408[sizeof("java")];
-    char uniname2ctype_pool_str410[sizeof("tglg")];
-    char uniname2ctype_pool_str413[sizeof("lower")];
+    char uniname2ctype_pool_str344[sizeof("idsbinaryoperator")];
+    char uniname2ctype_pool_str346[sizeof("sd")];
+    char uniname2ctype_pool_str347[sizeof("mongolian")];
+    char uniname2ctype_pool_str352[sizeof("mandaic")];
+    char uniname2ctype_pool_str353[sizeof("softdotted")];
+    char uniname2ctype_pool_str355[sizeof("armn")];
+    char uniname2ctype_pool_str357[sizeof("otherpunctuation")];
+    char uniname2ctype_pool_str359[sizeof("privateuse")];
+    char uniname2ctype_pool_str360[sizeof("armi")];
+    char uniname2ctype_pool_str361[sizeof("ahex")];
+    char uniname2ctype_pool_str362[sizeof("ext")];
+    char uniname2ctype_pool_str363[sizeof("uideo")];
+    char uniname2ctype_pool_str365[sizeof("taml")];
+    char uniname2ctype_pool_str366[sizeof("tamil")];
+    char uniname2ctype_pool_str369[sizeof("xidc")];
+    char uniname2ctype_pool_str370[sizeof("armenian")];
+    char uniname2ctype_pool_str378[sizeof("deseret")];
+    char uniname2ctype_pool_str379[sizeof("unassigned")];
+    char uniname2ctype_pool_str380[sizeof("ethiopic")];
+    char uniname2ctype_pool_str382[sizeof("taitham")];
+    char uniname2ctype_pool_str383[sizeof("cham")];
+    char uniname2ctype_pool_str384[sizeof("defaultignorablecodepoint")];
+    char uniname2ctype_pool_str385[sizeof("omath")];
+    char uniname2ctype_pool_str387[sizeof("ids")];
+    char uniname2ctype_pool_str391[sizeof("finalpunctuation")];
+    char uniname2ctype_pool_str393[sizeof("lisu")];
+    char uniname2ctype_pool_str394[sizeof("assigned")];
+    char uniname2ctype_pool_str395[sizeof("otheruppercase")];
+    char uniname2ctype_pool_str403[sizeof("saur")];
+    char uniname2ctype_pool_str409[sizeof("xidstart")];
+    char uniname2ctype_pool_str412[sizeof("math")];
+    char uniname2ctype_pool_str413[sizeof("glagolitic")];
     char uniname2ctype_pool_str414[sizeof("patternwhitespace")];
-    char uniname2ctype_pool_str417[sizeof("finalpunctuation")];
-    char uniname2ctype_pool_str418[sizeof("tagalog")];
-    char uniname2ctype_pool_str419[sizeof("patws")];
-    char uniname2ctype_pool_str420[sizeof("lisu")];
-    char uniname2ctype_pool_str426[sizeof("otheruppercase")];
-    char uniname2ctype_pool_str427[sizeof("space")];
-    char uniname2ctype_pool_str429[sizeof("graphemeextend")];
-    char uniname2ctype_pool_str430[sizeof("saur")];
-    char uniname2ctype_pool_str435[sizeof("uideo")];
-    char uniname2ctype_pool_str438[sizeof("lowercase")];
-    char uniname2ctype_pool_str440[sizeof("rjng")];
-    char uniname2ctype_pool_str442[sizeof("osma")];
-    char uniname2ctype_pool_str444[sizeof("linb")];
-    char uniname2ctype_pool_str445[sizeof("bali")];
-    char uniname2ctype_pool_str448[sizeof("cwt")];
-    char uniname2ctype_pool_str449[sizeof("separator")];
-    char uniname2ctype_pool_str450[sizeof("othermath")];
-    char uniname2ctype_pool_str451[sizeof("unassigned")];
-    char uniname2ctype_pool_str454[sizeof("lowercaseletter")];
-    char uniname2ctype_pool_str455[sizeof("arab")];
-    char uniname2ctype_pool_str458[sizeof("samr")];
-    char uniname2ctype_pool_str459[sizeof("brai")];
-    char uniname2ctype_pool_str460[sizeof("sundanese")];
-    char uniname2ctype_pool_str462[sizeof("samaritan")];
-    char uniname2ctype_pool_str463[sizeof("ahex")];
-    char uniname2ctype_pool_str465[sizeof("linearb")];
-    char uniname2ctype_pool_str467[sizeof("pf")];
-    char uniname2ctype_pool_str469[sizeof("ext")];
-    char uniname2ctype_pool_str474[sizeof("olck")];
-    char uniname2ctype_pool_str476[sizeof("nko")];
-    char uniname2ctype_pool_str477[sizeof("nkoo")];
-    char uniname2ctype_pool_str479[sizeof("newline")];
-    char uniname2ctype_pool_str480[sizeof("tibetan")];
-    char uniname2ctype_pool_str481[sizeof("javanese")];
-    char uniname2ctype_pool_str485[sizeof("bengali")];
-    char uniname2ctype_pool_str486[sizeof("newtailue")];
-    char uniname2ctype_pool_str487[sizeof("kana")];
-    char uniname2ctype_pool_str488[sizeof("olchiki")];
-    char uniname2ctype_pool_str489[sizeof("kali")];
-    char uniname2ctype_pool_str490[sizeof("cwcf")];
-    char uniname2ctype_pool_str491[sizeof("ps")];
-    char uniname2ctype_pool_str493[sizeof("braille")];
-    char uniname2ctype_pool_str494[sizeof("tibt")];
-    char uniname2ctype_pool_str502[sizeof("sterm")];
-    char uniname2ctype_pool_str504[sizeof("ugar")];
-    char uniname2ctype_pool_str505[sizeof("nonspacingmark")];
-    char uniname2ctype_pool_str508[sizeof("phag")];
-    char uniname2ctype_pool_str509[sizeof("kaithi")];
-    char uniname2ctype_pool_str512[sizeof("xidc")];
-    char uniname2ctype_pool_str514[sizeof("balinese")];
-    char uniname2ctype_pool_str515[sizeof("mong")];
-    char uniname2ctype_pool_str516[sizeof("ogam")];
-    char uniname2ctype_pool_str520[sizeof("modifierletter")];
-    char uniname2ctype_pool_str521[sizeof("ugaritic")];
-    char uniname2ctype_pool_str522[sizeof("katakana")];
-    char uniname2ctype_pool_str523[sizeof("pd")];
-    char uniname2ctype_pool_str525[sizeof("hebr")];
-    char uniname2ctype_pool_str531[sizeof("p")];
-    char uniname2ctype_pool_str533[sizeof("orkh")];
-    char uniname2ctype_pool_str536[sizeof("word")];
-    char uniname2ctype_pool_str537[sizeof("saurashtra")];
-    char uniname2ctype_pool_str538[sizeof("khar")];
-    char uniname2ctype_pool_str539[sizeof("sund")];
-    char uniname2ctype_pool_str542[sizeof("zp")];
-    char uniname2ctype_pool_str548[sizeof("changeswhenuppercased")];
-    char uniname2ctype_pool_str552[sizeof("xidstart")];
-    char uniname2ctype_pool_str553[sizeof("shaw")];
-    char uniname2ctype_pool_str554[sizeof("kthi")];
-    char uniname2ctype_pool_str556[sizeof("ogham")];
-    char uniname2ctype_pool_str558[sizeof("spaceseparator")];
-    char uniname2ctype_pool_str559[sizeof("changeswhencasemapped")];
-    char uniname2ctype_pool_str560[sizeof("sarb")];
-    char uniname2ctype_pool_str562[sizeof("xidcontinue")];
-    char uniname2ctype_pool_str564[sizeof("bidic")];
-    char uniname2ctype_pool_str570[sizeof("deprecated")];
-    char uniname2ctype_pool_str573[sizeof("xdigit")];
-    char uniname2ctype_pool_str575[sizeof("bidicontrol")];
-    char uniname2ctype_pool_str584[sizeof("lu")];
-    char uniname2ctype_pool_str587[sizeof("dashpunctuation")];
-    char uniname2ctype_pool_str590[sizeof("extender")];
-    char uniname2ctype_pool_str593[sizeof("idstrinaryoperator")];
-    char uniname2ctype_pool_str594[sizeof("cherokee")];
-    char uniname2ctype_pool_str595[sizeof("punct")];
-    char uniname2ctype_pool_str597[sizeof("phagspa")];
-    char uniname2ctype_pool_str598[sizeof("oupper")];
-    char uniname2ctype_pool_str599[sizeof("lyci")];
-    char uniname2ctype_pool_str601[sizeof("whitespace")];
-    char uniname2ctype_pool_str602[sizeof("lycian")];
-    char uniname2ctype_pool_str603[sizeof("yi")];
-    char uniname2ctype_pool_str606[sizeof("cyrl")];
-    char uniname2ctype_pool_str608[sizeof("knda")];
-    char uniname2ctype_pool_str610[sizeof("orya")];
-    char uniname2ctype_pool_str611[sizeof("cyrillic")];
-    char uniname2ctype_pool_str616[sizeof("yiii")];
-    char uniname2ctype_pool_str618[sizeof("kannada")];
-    char uniname2ctype_pool_str623[sizeof("xids")];
-    char uniname2ctype_pool_str626[sizeof("limbu")];
-    char uniname2ctype_pool_str635[sizeof("m")];
-    char uniname2ctype_pool_str638[sizeof("unifiedideograph")];
-    char uniname2ctype_pool_str639[sizeof("paragraphseparator")];
-    char uniname2ctype_pool_str640[sizeof("lm")];
-    char uniname2ctype_pool_str645[sizeof("openpunctuation")];
-    char uniname2ctype_pool_str646[sizeof("tagb")];
-    char uniname2ctype_pool_str649[sizeof("kharoshthi")];
-    char uniname2ctype_pool_str651[sizeof("enclosingmark")];
-    char uniname2ctype_pool_str652[sizeof("surrogate")];
-    char uniname2ctype_pool_str653[sizeof("beng")];
-    char uniname2ctype_pool_str654[sizeof("number")];
-    char uniname2ctype_pool_str656[sizeof("telugu")];
-    char uniname2ctype_pool_str660[sizeof("rejang")];
-    char uniname2ctype_pool_str661[sizeof("malayalam")];
-    char uniname2ctype_pool_str674[sizeof("idsb")];
-    char uniname2ctype_pool_str676[sizeof("hexdigit")];
-    char uniname2ctype_pool_str677[sizeof("xpeo")];
-    char uniname2ctype_pool_str689[sizeof("phnx")];
-    char uniname2ctype_pool_str692[sizeof("bopo")];
-    char uniname2ctype_pool_str698[sizeof("bopomofo")];
-    char uniname2ctype_pool_str699[sizeof("dep")];
-    char uniname2ctype_pool_str701[sizeof("sylo")];
-    char uniname2ctype_pool_str705[sizeof("grbase")];
-    char uniname2ctype_pool_str706[sizeof("alphabetic")];
-    char uniname2ctype_pool_str707[sizeof("cwcm")];
-    char uniname2ctype_pool_str708[sizeof("patternsyntax")];
-    char uniname2ctype_pool_str709[sizeof("grek")];
-    char uniname2ctype_pool_str710[sizeof("greek")];
-    char uniname2ctype_pool_str714[sizeof("syrc")];
-    char uniname2ctype_pool_str717[sizeof("syriac")];
-    char uniname2ctype_pool_str722[sizeof("cuneiform")];
-    char uniname2ctype_pool_str723[sizeof("gujr")];
-    char uniname2ctype_pool_str726[sizeof("lydi")];
-    char uniname2ctype_pool_str727[sizeof("gujarati")];
-    char uniname2ctype_pool_str728[sizeof("sylotinagri")];
-    char uniname2ctype_pool_str729[sizeof("lydian")];
-    char uniname2ctype_pool_str748[sizeof("sm")];
-    char uniname2ctype_pool_str751[sizeof("currencysymbol")];
-    char uniname2ctype_pool_str755[sizeof("limb")];
-    char uniname2ctype_pool_str758[sizeof("othergraphemeextend")];
-    char uniname2ctype_pool_str786[sizeof("guru")];
-    char uniname2ctype_pool_str797[sizeof("qmark")];
-    char uniname2ctype_pool_str809[sizeof("mark")];
-    char uniname2ctype_pool_str820[sizeof("quotationmark")];
-    char uniname2ctype_pool_str823[sizeof("hex")];
-    char uniname2ctype_pool_str842[sizeof("upper")];
-    char uniname2ctype_pool_str843[sizeof("wspace")];
-    char uniname2ctype_pool_str848[sizeof("khmr")];
-    char uniname2ctype_pool_str849[sizeof("khmer")];
-    char uniname2ctype_pool_str863[sizeof("oldsoutharabian")];
-    char uniname2ctype_pool_str864[sizeof("spacingmark")];
-    char uniname2ctype_pool_str866[sizeof("punctuation")];
-    char uniname2ctype_pool_str867[sizeof("uppercase")];
-    char uniname2ctype_pool_str878[sizeof("meeteimayek")];
-    char uniname2ctype_pool_str883[sizeof("uppercaseletter")];
-    char uniname2ctype_pool_str884[sizeof("cypriot")];
-    char uniname2ctype_pool_str886[sizeof("buhd")];
-    char uniname2ctype_pool_str887[sizeof("buhid")];
-    char uniname2ctype_pool_str895[sizeof("modifiersymbol")];
-    char uniname2ctype_pool_str898[sizeof("blank")];
-    char uniname2ctype_pool_str908[sizeof("hyphen")];
-    char uniname2ctype_pool_str909[sizeof("bugi")];
-    char uniname2ctype_pool_str935[sizeof("myanmar")];
-    char uniname2ctype_pool_str937[sizeof("imperialaramaic")];
-    char uniname2ctype_pool_str947[sizeof("mathsymbol")];
-    char uniname2ctype_pool_str966[sizeof("cwu")];
-    char uniname2ctype_pool_str975[sizeof("gurmukhi")];
-    char uniname2ctype_pool_str978[sizeof("buginese")];
-    char uniname2ctype_pool_str1022[sizeof("symbol")];
-    char uniname2ctype_pool_str1024[sizeof("osmanya")];
-    char uniname2ctype_pool_str1036[sizeof("bamu")];
-    char uniname2ctype_pool_str1040[sizeof("sk")];
-    char uniname2ctype_pool_str1065[sizeof("bamum")];
-    char uniname2ctype_pool_str1071[sizeof("kayahli")];
-    char uniname2ctype_pool_str1072[sizeof("egyp")];
-    char uniname2ctype_pool_str1140[sizeof("grlink")];
-    char uniname2ctype_pool_str1141[sizeof("xsux")];
-    char uniname2ctype_pool_str1174[sizeof("any")];
-    char uniname2ctype_pool_str1187[sizeof("graphemelink")];
-    char uniname2ctype_pool_str1221[sizeof("mlym")];
-    char uniname2ctype_pool_str1235[sizeof("mymr")];
-    char uniname2ctype_pool_str1277[sizeof("hebrew")];
-    char uniname2ctype_pool_str1542[sizeof("egyptianhieroglyphs")];
-    char uniname2ctype_pool_str1751[sizeof("zyyy")];
+    char uniname2ctype_pool_str415[sizeof("patws")];
+    char uniname2ctype_pool_str416[sizeof("mtei")];
+    char uniname2ctype_pool_str419[sizeof("rjng")];
+    char uniname2ctype_pool_str423[sizeof("term")];
+    char uniname2ctype_pool_str424[sizeof("me")];
+    char uniname2ctype_pool_str427[sizeof("gothic")];
+    char uniname2ctype_pool_str430[sizeof("xdigit")];
+    char uniname2ctype_pool_str432[sizeof("xidcontinue")];
+    char uniname2ctype_pool_str436[sizeof("space")];
+    char uniname2ctype_pool_str441[sizeof("pf")];
+    char uniname2ctype_pool_str442[sizeof("mand")];
+    char uniname2ctype_pool_str445[sizeof("tagbanwa")];
+    char uniname2ctype_pool_str446[sizeof("sundanese")];
+    char uniname2ctype_pool_str451[sizeof("pd")];
+    char uniname2ctype_pool_str452[sizeof("cwl")];
+    char uniname2ctype_pool_str455[sizeof("hang")];
+    char uniname2ctype_pool_str458[sizeof("separator")];
+    char uniname2ctype_pool_str460[sizeof("extender")];
+    char uniname2ctype_pool_str462[sizeof("geor")];
+    char uniname2ctype_pool_str463[sizeof("othermath")];
+    char uniname2ctype_pool_str465[sizeof("georgian")];
+    char uniname2ctype_pool_str467[sizeof("osma")];
+    char uniname2ctype_pool_str468[sizeof("graph")];
+    char uniname2ctype_pool_str469[sizeof("lower")];
+    char uniname2ctype_pool_str473[sizeof("ogrext")];
+    char uniname2ctype_pool_str474[sizeof("goth")];
+    char uniname2ctype_pool_str479[sizeof("p")];
+    char uniname2ctype_pool_str483[sizeof("samr")];
+    char uniname2ctype_pool_str486[sizeof("lu")];
+    char uniname2ctype_pool_str487[sizeof("samaritan")];
+    char uniname2ctype_pool_str489[sizeof("sund")];
+    char uniname2ctype_pool_str491[sizeof("grext")];
+    char uniname2ctype_pool_str494[sizeof("changeswhenuppercased")];
+    char uniname2ctype_pool_str496[sizeof("logicalorderexception")];
+    char uniname2ctype_pool_str500[sizeof("modifierletter")];
+    char uniname2ctype_pool_str502[sizeof("xids")];
+    char uniname2ctype_pool_str504[sizeof("cwt")];
+    char uniname2ctype_pool_str506[sizeof("zp")];
+    char uniname2ctype_pool_str507[sizeof("lowercase")];
+    char uniname2ctype_pool_str509[sizeof("ps")];
+    char uniname2ctype_pool_str510[sizeof("lowercaseletter")];
+    char uniname2ctype_pool_str511[sizeof("deprecated")];
+    char uniname2ctype_pool_str520[sizeof("punct")];
+    char uniname2ctype_pool_str523[sizeof("oupper")];
+    char uniname2ctype_pool_str527[sizeof("tfng")];
+    char uniname2ctype_pool_str532[sizeof("saurashtra")];
+    char uniname2ctype_pool_str537[sizeof("dashpunctuation")];
+    char uniname2ctype_pool_str538[sizeof("digit")];
+    char uniname2ctype_pool_str540[sizeof("sterm")];
+    char uniname2ctype_pool_str544[sizeof("xpeo")];
+    char uniname2ctype_pool_str546[sizeof("cwcf")];
+    char uniname2ctype_pool_str548[sizeof("phnx")];
+    char uniname2ctype_pool_str550[sizeof("phagspa")];
+    char uniname2ctype_pool_str557[sizeof("changeswhencasemapped")];
+    char uniname2ctype_pool_str561[sizeof("newline")];
+    char uniname2ctype_pool_str562[sizeof("patternsyntax")];
+    char uniname2ctype_pool_str563[sizeof("linb")];
+    char uniname2ctype_pool_str564[sizeof("bali")];
+    char uniname2ctype_pool_str566[sizeof("idstrinaryoperator")];
+    char uniname2ctype_pool_str568[sizeof("newtailue")];
+    char uniname2ctype_pool_str569[sizeof("word")];
+    char uniname2ctype_pool_str571[sizeof("telugu")];
+    char uniname2ctype_pool_str574[sizeof("arab")];
+    char uniname2ctype_pool_str576[sizeof("spaceseparator")];
+    char uniname2ctype_pool_str577[sizeof("graphemebase")];
+    char uniname2ctype_pool_str578[sizeof("brai")];
+    char uniname2ctype_pool_str580[sizeof("limbu")];
+    char uniname2ctype_pool_str583[sizeof("openpunctuation")];
+    char uniname2ctype_pool_str584[sizeof("linearb")];
+    char uniname2ctype_pool_str587[sizeof("paragraphseparator")];
+    char uniname2ctype_pool_str591[sizeof("brahmi")];
+    char uniname2ctype_pool_str597[sizeof("caseignorable")];
+    char uniname2ctype_pool_str599[sizeof("tibetan")];
+    char uniname2ctype_pool_str601[sizeof("hex")];
+    char uniname2ctype_pool_str608[sizeof("number")];
+    char uniname2ctype_pool_str613[sizeof("tibt")];
+    char uniname2ctype_pool_str617[sizeof("bengali")];
+    char uniname2ctype_pool_str618[sizeof("brah")];
+    char uniname2ctype_pool_str625[sizeof("braille")];
+    char uniname2ctype_pool_str633[sizeof("graphemeextend")];
+    char uniname2ctype_pool_str636[sizeof("shaw")];
+    char uniname2ctype_pool_str637[sizeof("dep")];
+    char uniname2ctype_pool_str641[sizeof("m")];
+    char uniname2ctype_pool_str646[sizeof("lm")];
+    char uniname2ctype_pool_str653[sizeof("gujr")];
+    char uniname2ctype_pool_str656[sizeof("ugar")];
+    char uniname2ctype_pool_str657[sizeof("gujarati")];
+    char uniname2ctype_pool_str659[sizeof("balinese")];
+    char uniname2ctype_pool_str660[sizeof("bidic")];
+    char uniname2ctype_pool_str662[sizeof("hebr")];
+    char uniname2ctype_pool_str667[sizeof("malayalam")];
+    char uniname2ctype_pool_str671[sizeof("bidicontrol")];
+    char uniname2ctype_pool_str673[sizeof("ugaritic")];
+    char uniname2ctype_pool_str676[sizeof("cuneiform")];
+    char uniname2ctype_pool_str679[sizeof("olck")];
+    char uniname2ctype_pool_str681[sizeof("nko")];
+    char uniname2ctype_pool_str682[sizeof("nkoo")];
+    char uniname2ctype_pool_str688[sizeof("phag")];
+    char uniname2ctype_pool_str692[sizeof("kana")];
+    char uniname2ctype_pool_str693[sizeof("olchiki")];
+    char uniname2ctype_pool_str694[sizeof("kali")];
+    char uniname2ctype_pool_str697[sizeof("whitespace")];
+    char uniname2ctype_pool_str701[sizeof("sarb")];
+    char uniname2ctype_pool_str710[sizeof("nonspacingmark")];
+    char uniname2ctype_pool_str714[sizeof("kaithi")];
+    char uniname2ctype_pool_str718[sizeof("lyci")];
+    char uniname2ctype_pool_str719[sizeof("mong")];
+    char uniname2ctype_pool_str720[sizeof("ogam")];
+    char uniname2ctype_pool_str721[sizeof("lycian")];
+    char uniname2ctype_pool_str722[sizeof("yi")];
+    char uniname2ctype_pool_str725[sizeof("cyrl")];
+    char uniname2ctype_pool_str727[sizeof("katakana")];
+    char uniname2ctype_pool_str729[sizeof("orya")];
+    char uniname2ctype_pool_str730[sizeof("cyrillic")];
+    char uniname2ctype_pool_str735[sizeof("yiii")];
+    char uniname2ctype_pool_str741[sizeof("upper")];
+    char uniname2ctype_pool_str742[sizeof("punctuation")];
+    char uniname2ctype_pool_str743[sizeof("orkh")];
+    char uniname2ctype_pool_str748[sizeof("khar")];
+    char uniname2ctype_pool_str764[sizeof("kthi")];
+    char uniname2ctype_pool_str765[sizeof("ogham")];
+    char uniname2ctype_pool_str766[sizeof("cwcm")];
+    char uniname2ctype_pool_str775[sizeof("hexdigit")];
+    char uniname2ctype_pool_str776[sizeof("sm")];
+    char uniname2ctype_pool_str779[sizeof("uppercase")];
+    char uniname2ctype_pool_str782[sizeof("uppercaseletter")];
+    char uniname2ctype_pool_str785[sizeof("bopo")];
+    char uniname2ctype_pool_str789[sizeof("glag")];
+    char uniname2ctype_pool_str790[sizeof("knda")];
+    char uniname2ctype_pool_str791[sizeof("bopomofo")];
+    char uniname2ctype_pool_str792[sizeof("idsb")];
+    char uniname2ctype_pool_str799[sizeof("alphabetic")];
+    char uniname2ctype_pool_str800[sizeof("kannada")];
+    char uniname2ctype_pool_str812[sizeof("tglg")];
+    char uniname2ctype_pool_str813[sizeof("unifiedideograph")];
+    char uniname2ctype_pool_str820[sizeof("tagalog")];
+    char uniname2ctype_pool_str821[sizeof("currencysymbol")];
+    char uniname2ctype_pool_str822[sizeof("lydi")];
+    char uniname2ctype_pool_str825[sizeof("lydian")];
+    char uniname2ctype_pool_str830[sizeof("cherokee")];
+    char uniname2ctype_pool_str839[sizeof("surrogate")];
+    char uniname2ctype_pool_str842[sizeof("sylo")];
+    char uniname2ctype_pool_str853[sizeof("rejang")];
+    char uniname2ctype_pool_str855[sizeof("syrc")];
+    char uniname2ctype_pool_str858[sizeof("syriac")];
+    char uniname2ctype_pool_str869[sizeof("sylotinagri")];
+    char uniname2ctype_pool_str874[sizeof("xsux")];
+    char uniname2ctype_pool_str877[sizeof("limb")];
+    char uniname2ctype_pool_str881[sizeof("kharoshthi")];
+    char uniname2ctype_pool_str889[sizeof("guru")];
+    char uniname2ctype_pool_str891[sizeof("enclosingmark")];
+    char uniname2ctype_pool_str910[sizeof("oldsoutharabian")];
+    char uniname2ctype_pool_str917[sizeof("imperialaramaic")];
+    char uniname2ctype_pool_str921[sizeof("wspace")];
+    char uniname2ctype_pool_str924[sizeof("cwu")];
+    char uniname2ctype_pool_str938[sizeof("buhd")];
+    char uniname2ctype_pool_str939[sizeof("buhid")];
+    char uniname2ctype_pool_str944[sizeof("othergraphemeextend")];
+    char uniname2ctype_pool_str966[sizeof("tagb")];
+    char uniname2ctype_pool_str972[sizeof("quotationmark")];
+    char uniname2ctype_pool_str977[sizeof("cypriot")];
+    char uniname2ctype_pool_str986[sizeof("beng")];
+    char uniname2ctype_pool_str994[sizeof("modifiersymbol")];
+    char uniname2ctype_pool_str1001[sizeof("qmark")];
+    char uniname2ctype_pool_str1006[sizeof("hyphen")];
+    char uniname2ctype_pool_str1017[sizeof("mark")];
+    char uniname2ctype_pool_str1051[sizeof("grbase")];
+    char uniname2ctype_pool_str1057[sizeof("myanmar")];
+    char uniname2ctype_pool_str1061[sizeof("khmr")];
+    char uniname2ctype_pool_str1062[sizeof("khmer")];
+    char uniname2ctype_pool_str1065[sizeof("spacingmark")];
+    char uniname2ctype_pool_str1069[sizeof("mathsymbol")];
+    char uniname2ctype_pool_str1109[sizeof("bamu")];
+    char uniname2ctype_pool_str1112[sizeof("meeteimayek")];
+    char uniname2ctype_pool_str1128[sizeof("grek")];
+    char uniname2ctype_pool_str1129[sizeof("greek")];
+    char uniname2ctype_pool_str1166[sizeof("symbol")];
+    char uniname2ctype_pool_str1168[sizeof("osmanya")];
+    char uniname2ctype_pool_str1180[sizeof("bugi")];
+    char uniname2ctype_pool_str1190[sizeof("bamum")];
+    char uniname2ctype_pool_str1222[sizeof("blank")];
+    char uniname2ctype_pool_str1247[sizeof("batk")];
+    char uniname2ctype_pool_str1248[sizeof("batak")];
+    char uniname2ctype_pool_str1275[sizeof("buginese")];
+    char uniname2ctype_pool_str1332[sizeof("gurmukhi")];
+    char uniname2ctype_pool_str1346[sizeof("mlym")];
+    char uniname2ctype_pool_str1360[sizeof("mymr")];
+    char uniname2ctype_pool_str1379[sizeof("egyp")];
+    char uniname2ctype_pool_str1395[sizeof("kayahli")];
+    char uniname2ctype_pool_str1412[sizeof("any")];
+    char uniname2ctype_pool_str1472[sizeof("sk")];
+    char uniname2ctype_pool_str1526[sizeof("hebrew")];
+    char uniname2ctype_pool_str1751[sizeof("grlink")];
+    char uniname2ctype_pool_str1811[sizeof("graphemelink")];
+    char uniname2ctype_pool_str2016[sizeof("egyptianhieroglyphs")];
+    char uniname2ctype_pool_str2124[sizeof("zyyy")];
 #endif /* USE_UNICODE_PROPERTIES */
   };
 static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
@@ -16880,14 +17297,18 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "nl",
     "lao",
     "laoo",
-    "zl",
-    "z",
-    "control",
     "qaac",
+    "control",
+    "joinc",
     "ci",
+    "java",
     "lana",
-    "oalpha",
     "qaai",
+    "oalpha",
+    "joincontrol",
+    "zl",
+    "vai",
+    "vaii",
     "arabic",
     "cari",
     "oriya",
@@ -16897,361 +17318,366 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "olower",
     "latn",
     "latin",
+    "z",
     "ital",
-    "hano",
     "lt",
+    "hano",
+    "canadianaboriginal",
     "han",
     "hanunoo",
-    "canadianaboriginal",
+    "tavt",
     "hangul",
     "hani",
     "nchar",
-    "zinh",
-    "tale",
-    "loe",
+    "avestan",
     "hira",
-    "taile",
-    "lineseparator",
+    "tale",
+    "zinh",
     "thaa",
+    "initialpunctuation",
+    "variationselector",
     "hiragana",
     "thai",
-    "initialpunctuation",
+    "taile",
+    "lineseparator",
     "other",
     "thaana",
-    "cher",
+    "loe",
     "otherletter",
     "othernumber",
-    "letter",
-    "sc",
-    "so",
-    "taiviet",
-    "noncharactercodepoint",
-    "ethi",
-    "cans",
-    "titlecaseletter",
-    "ascii",
-    "letternumber",
-    "otheralphabetic",
-    "otherlowercase",
     "idc",
     "oidc",
-    "sinhala",
-    "terminalpunctuation",
+    "cher",
+    "javanese",
+    "letter",
     "olditalic",
     "di",
-    "otheridcontinue",
     "odi",
     "dia",
-    "otheridstart",
+    "titlecaseletter",
+    "taiviet",
+    "sc",
     "oldturkic",
+    "so",
+    "noncharactercodepoint",
     "diacritic",
     "oldpersian",
+    "ethi",
     "radical",
-    "sinh",
+    "letternumber",
+    "cans",
+    "otheralphabetic",
+    "ascii",
+    "otherlowercase",
+    "terminalpunctuation",
+    "otheridstart",
+    "sinhala",
+    "otheridcontinue",
+    "deva",
     "ideo",
-    "shavian",
+    "avst",
     "format",
-    "inscriptionalparthian",
-    "vai",
-    "vaii",
-    "tifinagh",
-    "cf",
-    "othersymbol",
-    "ideographic",
+    "devanagari",
     "inherited",
-    "glagolitic",
+    "ideographic",
+    "cf",
+    "sinh",
+    "tifinagh",
     "idcontinue",
+    "shavian",
+    "inscriptionalparthian",
+    "nd",
+    "othersymbol",
+    "pc",
+    "po",
+    "decimalnumber",
     "asciihexdigit",
+    "coptic",
     "inscriptionalpahlavi",
-    "s",
-    "gothic",
-    "cs",
-    "avestan",
-    "tavt",
-    "zs",
-    "decimalnumber",
-    "tagbanwa",
-    "joinc",
-    "geor",
-    "hang",
-    "georgian",
     "cased",
-    "joincontrol",
     "oids",
-    "variationselector",
-    "graph",
     "changeswhenlowercased",
-    "nd",
-    "goth",
-    "pc",
-    "po",
-    "ogrext",
-    "coptic",
-    "grext",
-    "logicalorderexception",
-    "idst",
 #endif /* USE_UNICODE_PROPERTIES */
     "alpha",
 #ifdef USE_UNICODE_PROPERTIES
     "pi",
-    "dsrt",
-    "dash",
-    "otherdefaultignorablecodepoint",
+    "s",
+    "runic",
+    "cs",
+    "vs",
     "copt",
-    "idstart",
+    "otherdefaultignorablecodepoint",
     "closepunctuation",
-    "changeswhentitlecased",
-    "lepc",
-    "avst",
+    "idst",
+    "talu",
+    "runr",
+    "dsrt",
     "cprt",
-    "runic",
     "patsyn",
-    "mc",
-    "tfng",
-    "lepcha",
+    "zs",
+    "lepc",
+    "dash",
     "prti",
     "print",
+    "idstart",
     "phli",
+    "lepcha",
+    "changeswhentitlecased",
+    "phoenician",
+    "mc",
+    "telu",
     "mn",
-    "idsbinaryoperator",
-    "talu",
-    "runr",
-    "graphemebase",
+    "changeswhencasefolded",
     "common",
 #endif /* USE_UNICODE_PROPERTIES */
     "alnum",
-#ifndef USE_UNICODE_PROPERTIES
-    "xdigit",
-    "newline",
-    "upper",
-    "ascii",
-    "cntrl",
-#else /* USE_UNICODE_PROPERTIES */
-    "phoenician",
-    "deva",
-    "changeswhencasefolded",
+#ifdef USE_UNICODE_PROPERTIES
     "pe",
+    "idsbinaryoperator",
+    "sd",
     "mongolian",
-    "armn",
-    "deseret",
+    "mandaic",
     "softdotted",
+    "armn",
+    "otherpunctuation",
+    "privateuse",
     "armi",
-    "devanagari",
-    "digit",
-    "caseignorable",
+    "ahex",
+    "ext",
+    "uideo",
     "taml",
     "tamil",
-    "telu",
-    "ids",
+    "xidc",
     "armenian",
-    "sd",
-    "privateuse",
-    "assigned",
-    "cham",
-    "omath",
-    "otherpunctuation",
+    "deseret",
+    "unassigned",
+    "ethiopic",
     "taitham",
+    "cham",
     "defaultignorablecodepoint",
-    "glag",
-    "ethiopic",
-    "vs",
-    "me",
-    "cwl",
-    "mtei",
-    "math",
-    "term",
-    "java",
-    "tglg",
-    "lower",
-    "patternwhitespace",
+    "omath",
+    "ids",
     "finalpunctuation",
-    "tagalog",
-    "patws",
     "lisu",
+    "assigned",
     "otheruppercase",
+    "saur",
+    "xidstart",
+    "math",
+    "glagolitic",
+    "patternwhitespace",
+    "patws",
+    "mtei",
+    "rjng",
+    "term",
+    "me",
+    "gothic",
+#endif /* USE_UNICODE_PROPERTIES */
+    "xdigit",
+#ifndef USE_UNICODE_PROPERTIES
+    "newline",
+    "upper",
+    "ascii",
+    "cntrl",
+#else /* USE_UNICODE_PROPERTIES */
+    "xidcontinue",
 #endif /* USE_UNICODE_PROPERTIES */
     "space",
+#ifndef USE_UNICODE_PROPERTIES
+    "word",
+    "lower",
+#else /* USE_UNICODE_PROPERTIES */
+    "pf",
+    "mand",
+    "tagbanwa",
+    "sundanese",
+    "pd",
+    "cwl",
+    "hang",
+    "separator",
+    "extender",
+    "geor",
+    "othermath",
+    "georgian",
+    "osma",
+#endif /* USE_UNICODE_PROPERTIES */
+    "graph",
 #ifdef USE_UNICODE_PROPERTIES
-    "graphemeextend",
-    "saur",
-    "uideo",
+    "lower",
+    "ogrext",
+    "goth",
+    "p",
+    "samr",
+    "lu",
+    "samaritan",
+    "sund",
+    "grext",
+    "changeswhenuppercased",
+    "logicalorderexception",
+    "modifierletter",
+    "xids",
+    "cwt",
+    "zp",
     "lowercase",
-    "rjng",
-    "osma",
+    "ps",
+    "lowercaseletter",
+    "deprecated",
+    "punct",
+    "oupper",
+    "tfng",
+    "saurashtra",
+    "dashpunctuation",
+#endif /* USE_UNICODE_PROPERTIES */
+    "digit",
+#ifndef USE_UNICODE_PROPERTIES
+    "blank"
+#else /* USE_UNICODE_PROPERTIES */
+    "sterm",
+    "xpeo",
+    "cwcf",
+    "phnx",
+    "phagspa",
+    "changeswhencasemapped",
+    "newline",
+    "patternsyntax",
     "linb",
     "bali",
-    "cwt",
-    "separator",
-    "othermath",
-    "unassigned",
-    "lowercaseletter",
+    "idstrinaryoperator",
+    "newtailue",
+    "word",
+    "telugu",
     "arab",
-    "samr",
+    "spaceseparator",
+    "graphemebase",
     "brai",
-    "sundanese",
-    "samaritan",
-    "ahex",
+    "limbu",
+    "openpunctuation",
     "linearb",
-    "pf",
-    "ext",
+    "paragraphseparator",
+    "brahmi",
+    "caseignorable",
+    "tibetan",
+    "hex",
+    "number",
+    "tibt",
+    "bengali",
+    "brah",
+    "braille",
+    "graphemeextend",
+    "shaw",
+    "dep",
+    "m",
+    "lm",
+    "gujr",
+    "ugar",
+    "gujarati",
+    "balinese",
+    "bidic",
+    "hebr",
+    "malayalam",
+    "bidicontrol",
+    "ugaritic",
+    "cuneiform",
     "olck",
     "nko",
     "nkoo",
-    "newline",
-    "tibetan",
-    "javanese",
-    "bengali",
-    "newtailue",
+    "phag",
     "kana",
     "olchiki",
     "kali",
-    "cwcf",
-    "ps",
-    "braille",
-    "tibt",
-    "sterm",
-    "ugar",
+    "whitespace",
+    "sarb",
     "nonspacingmark",
-    "phag",
     "kaithi",
-    "xidc",
-    "balinese",
+    "lyci",
     "mong",
     "ogam",
-    "modifierletter",
-    "ugaritic",
-    "katakana",
-    "pd",
-    "hebr",
-    "p",
-    "orkh",
-#endif /* USE_UNICODE_PROPERTIES */
-    "word",
-#ifndef USE_UNICODE_PROPERTIES
-    "lower",
-    "graph",
-    "digit",
-    "blank"
-#else /* USE_UNICODE_PROPERTIES */
-    "saurashtra",
-    "khar",
-    "sund",
-    "zp",
-    "changeswhenuppercased",
-    "xidstart",
-    "shaw",
-    "kthi",
-    "ogham",
-    "spaceseparator",
-    "changeswhencasemapped",
-    "sarb",
-    "xidcontinue",
-    "bidic",
-    "deprecated",
-    "xdigit",
-    "bidicontrol",
-    "lu",
-    "dashpunctuation",
-    "extender",
-    "idstrinaryoperator",
-    "cherokee",
-    "punct",
-    "phagspa",
-    "oupper",
-    "lyci",
-    "whitespace",
     "lycian",
     "yi",
     "cyrl",
-    "knda",
+    "katakana",
     "orya",
     "cyrillic",
     "yiii",
-    "kannada",
-    "xids",
-    "limbu",
-    "m",
-    "unifiedideograph",
-    "paragraphseparator",
-    "lm",
-    "openpunctuation",
-    "tagb",
-    "kharoshthi",
-    "enclosingmark",
-    "surrogate",
-    "beng",
-    "number",
-    "telugu",
-    "rejang",
-    "malayalam",
-    "idsb",
+    "upper",
+    "punctuation",
+    "orkh",
+    "khar",
+    "kthi",
+    "ogham",
+    "cwcm",
     "hexdigit",
-    "xpeo",
-    "phnx",
+    "sm",
+    "uppercase",
+    "uppercaseletter",
     "bopo",
+    "glag",
+    "knda",
     "bopomofo",
-    "dep",
-    "sylo",
-    "grbase",
+    "idsb",
     "alphabetic",
-    "cwcm",
-    "patternsyntax",
-    "grek",
-    "greek",
+    "kannada",
+    "tglg",
+    "unifiedideograph",
+    "tagalog",
+    "currencysymbol",
+    "lydi",
+    "lydian",
+    "cherokee",
+    "surrogate",
+    "sylo",
+    "rejang",
     "syrc",
     "syriac",
-    "cuneiform",
-    "gujr",
-    "lydi",
-    "gujarati",
     "sylotinagri",
-    "lydian",
-    "sm",
-    "currencysymbol",
+    "xsux",
     "limb",
-    "othergraphemeextend",
+    "kharoshthi",
     "guru",
-    "qmark",
-    "mark",
-    "quotationmark",
-    "hex",
-    "upper",
-    "wspace",
-    "khmr",
-    "khmer",
+    "enclosingmark",
     "oldsoutharabian",
-    "spacingmark",
-    "punctuation",
-    "uppercase",
-    "meeteimayek",
-    "uppercaseletter",
-    "cypriot",
+    "imperialaramaic",
+    "wspace",
+    "cwu",
     "buhd",
     "buhid",
+    "othergraphemeextend",
+    "tagb",
+    "quotationmark",
+    "cypriot",
+    "beng",
     "modifiersymbol",
-    "blank",
+    "qmark",
     "hyphen",
-    "bugi",
+    "mark",
+    "grbase",
     "myanmar",
-    "imperialaramaic",
+    "khmr",
+    "khmer",
+    "spacingmark",
     "mathsymbol",
-    "cwu",
-    "gurmukhi",
-    "buginese",
+    "bamu",
+    "meeteimayek",
+    "grek",
+    "greek",
     "symbol",
     "osmanya",
-    "bamu",
-    "sk",
+    "bugi",
     "bamum",
-    "kayahli",
-    "egyp",
-    "grlink",
-    "xsux",
-    "any",
-    "graphemelink",
+    "blank",
+    "batk",
+    "batak",
+    "buginese",
+    "gurmukhi",
     "mlym",
     "mymr",
+    "egyp",
+    "kayahli",
+    "any",
+    "sk",
     "hebrew",
+    "grlink",
+    "graphemelink",
     "egyptianhieroglyphs",
     "zyyy"
 #endif /* USE_UNICODE_PROPERTIES */
@@ -17289,18 +17715,25 @@ uniname2ctype_p (str, len)
       {-1},
       {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str18,                                      93},
       {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str19,                                     93},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str20,                                       51},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str21,                                        50},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str20,                                    127},
+      {-1},
       {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str22,                                  18},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str23,                                   170},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str24,                                    127},
       {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str25,                                       59},
-      {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str27,                                    157},
       {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str28,                                    150},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str33,                                  175},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str34,                                    113},
-      {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str30,                                    113},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str33,                                  178},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str34,                             170},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str36,                                       51},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str37,                                     142},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str38,                                    142},
+      {-1},
       {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str40,                                   79},
       {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str41,                                    147},
       {-1},
@@ -17310,528 +17743,601 @@ uniname2ctype_p (str, len)
       {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str46,                                     3},
       {-1}, {-1},
       {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str49,                     38},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str50,                                  179},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str50,                                  182},
       {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str51,                                     74},
       {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str52,                                    74},
-      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str53,                                        50},
+      {-1}, {-1},
       {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str56,                                    110},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str65,                                    115},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str66,                                       27},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str70,                                    115},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str71,                      100},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str68,                                     108},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str73,                                     108},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str70,                                 115},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str71,                      100},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str75,                                 115},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str76,                                    151},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str73,                                   97},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str74,                                    108},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str78,                                   97},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str79,                                    108},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str76,                                   181},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str77,                                    113},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str83,                                    119},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str81,                                   184},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str85,                                     190},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str86,                                    105},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str83,                                 152},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str91,                                    105},
       {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str91,                                   119},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str92,                            51},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str94,                                     81},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str97,                                105},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str98,                                     92},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str96,                                    119},
       {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str98,                                    113},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str99,                                     81},
       {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str100,                       42},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str101,                                    17},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str101,                       197},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str102,                                105},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str103,                                     92},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str104,                                   119},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str105,                            51},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str106,                                    17},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str103,                                   81},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str107,                                     99},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str111,                              26},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str108,                                   81},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str111,                                     193},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str116,                              26},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str113,                              36},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str114,                                   23},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str118,                              36},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str121,                                      66},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str116,                                       46},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str123,                                    195},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str118,                                       49},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str123,                                 151},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str128,                   181},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str129,                                     98},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str130,                                    100},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str135,                          27},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str136,                                    14},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str125,                                     99},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str126,                                157},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str127,                                   23},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str128,                               110},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str129,                                       69},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str132,                                     190},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str133,                                     180},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str138,                             35},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str139,                         175},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str135,                          27},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str136,                                 151},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str141,                          179},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str138,                                       46},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str139,                               163},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str140,                                       49},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str141,                   184},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str144,                                      66},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str144,                               180},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str145,                              132},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str146,                                    192},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str147,                                  91},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str148,                     171},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str147,                                     98},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str148,                                 188},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str151,                               110},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str152,                                       69},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str153,                         192},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str155,                                     187},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str156,                                     177},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str151,                             35},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str152,                                    100},
       {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str161,                            191},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str162,                               163},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str157,                         178},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str158,                                    14},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str159,                          182},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str161,                     174},
       {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str167,                               177},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str168,                              132},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str166,                            194},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str171,                                 185},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str179,                                     91},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str183,                                    176},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str169,                                  91},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str185,                                 122},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str171,                         195},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str172,                                     82},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str173,                                    179},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str180,                                    152},
+      {-1}, {-1}, {-1}, {-1}, {-1},
       {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str186,                                   19},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str189,                               82},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str193,                               113},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str197,                             179},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str192,                   161},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str203,                                       19},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str206,                                     91},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str207,                                130},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str208,                               66},
       {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str196,                                     142},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str197,                                    142},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str212,                                 122},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str214,                   161},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str218,                                       34},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str202,                                130},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str203,                                       19},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str232,                              49},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str205,                              49},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str243,                                       38},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str207,                             176},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str245,                                       43},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str246,                            34},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str247,                           177},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str250,                                  127},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str251,                    162},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str252,                                    58},
       {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str211,                               113},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str212,                              129},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str218,                               66},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str256,                                    194},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str220,                           174},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str258,                    60},
       {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str224,                    162},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str225,                                        45},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str226,                                  111},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str227,                                       22},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str229,                                 152},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str262,                                     1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str263,                                       42},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str235,                                    151},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str236,                                       53},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str243,                            34},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str244,                                117},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str245,                                   167},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str269,                                        45},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str270,                                   102},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str271,                                       22},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str275,                                      197},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str276,                                    127},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str280,          190},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str281,                         40},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str248,                                     96},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str249,                                     97},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str284,                                    187},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str285,                                    128},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str286,                                    102},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str291,                                    112},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str292,                                    124},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str251,                                 96},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str294,                                  199},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str253,                                    58},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str256,                             167},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str257,                                    191},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str296,                                       53},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str260,                       194},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str299,                                    140},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str262,                                     5},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str263,                    60},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str264,                                       34},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str268,                                    111},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str269,                                       38},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str301,                                    171},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str302,                                    161},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str303,                                     7},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str271,                                       43},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str272,                                  182},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str305,                                  65},
       {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str276,                                  127},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str277,                                    70},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str309,                                    162},
       {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str282,                   190},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str314,                                  140},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str285,                                    184},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str288,                                     1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str289,                                       42},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str292,                                    112},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str317,                    62},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str319,                              136},
       {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str297,                                    168},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str298,          187},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str302,                                    127},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str324,                                       30},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str329,                                     88},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str334,                                       32},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str337,                    63},
       {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str306,                                  65},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str307,                         40},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str341,                                   73},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str342,                                    13},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str343,                                       40},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str344,                       186},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str309,                    62},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str312,                                    140},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str317,                                    152},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str318,                                    124},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str319,                                   102},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str320,                                  196},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str321,                                       30},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str346,                                      192},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str347,                               104},
       {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str326,                                    130},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str327,                                  140},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str328,                                    161},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str329,                                     7},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str330,                                    162},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str331,                                       32},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str332,                       183},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str352,                                 167},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str353,                              192},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str334,                                    128},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str335,                                    102},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str355,                                     77},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str337,                             71},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str338,                                   73},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str339,                                    13},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str340,                              136},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str341,                                     82},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str342,                    63},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str343,                                       40},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str344,                               104},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str352,                                     77},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str353,                                 112},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str354,                              189},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str357,                                    159},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str358,                               82},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str357,                         43},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str360,                                     4},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str361,                            59},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str362,                                     87},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str363,                                    87},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str359,                               21},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str360,                                    159},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str361,                                    177},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str362,                                     181},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str363,                                   189},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str365,                                     88},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str366,                                      65},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str367,                                 77},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str365,                                     87},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str366,                                    87},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str370,                                      189},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str372,                               21},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str373,                                 16},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str369,                                     68},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str370,                                 77},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str378,                                 112},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str379,                               20},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str380,                                 98},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str375,                                    149},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str382,                                 150},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str383,                                    149},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str384,                69},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str385,                                   175},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str377,                                   172},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str378,                         43},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str379,                                 150},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str387,                                      65},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str391,                         41},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str381,                69},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str393,                                    155},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str394,                                 16},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str395,                          183},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str403,                                    143},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str387,                                    129},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str388,                                 98},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str390,                                      194},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str395,                                       31},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str396,                                      60},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str400,                                    158},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str404,                                     54},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str409,                                 67},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str407,                                    171},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str408,                                    157},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str410,                                    114},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str412,                                     54},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str413,                              129},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str414,                       198},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str415,                                   198},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str416,                                    158},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str413,                                     6},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str414,                       195},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str419,                                    145},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str423,                                    174},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str424,                                       31},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str417,                         41},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str418,                                 114},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str419,                                   195},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str420,                                    155},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str426,                          180},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str427,                                     9},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str429,                           70},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str430,                                    143},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str435,                                   186},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str427,                                  111},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str438,                                56},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str430,                                   11},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str440,                                    145},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str442,                                    123},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str444,                                    120},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str445,                                    134},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str432,                              68},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str436,                                     9},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str441,                                       41},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str442,                                    167},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str448,                                      62},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str449,                                50},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str450,                               172},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str451,                               20},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str445,                                117},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str446,                               139},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str451,                                       39},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str452,                                      60},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str454,                          24},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str455,                                     79},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str455,                                     97},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str458,                                    154},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str459,                                    125},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str460,                               139},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str458,                                50},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str462,                               154},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str463,                                    174},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str460,                                181},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str465,                                 120},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str462,                                     96},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str463,                               175},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str467,                                       41},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str465,                                 96},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str469,                                     178},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str467,                                    123},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str468,                                     5},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str469,                                     6},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str473,                                  185},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str474,                                    111},
       {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str474,                                    141},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str476,                                     138},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str477,                                    138},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str479,                                   0},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str480,                                  94},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str481,                                157},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str479,                                        37},
       {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str485,                                  83},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str486,                               128},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str487,                                    106},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str488,                                 141},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str489,                                    144},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str490,                                     63},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str491,                                       44},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str483,                                    154},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str486,                                       28},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str487,                               154},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str493,                                 125},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str494,                                     94},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str502,                                   193},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str489,                                    139},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str504,                                    121},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str505,                           32},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str491,                                    70},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str508,                                    137},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str509,                                  164},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str512,                                     68},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str494,                    61},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str514,                                134},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str515,                                    104},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str516,                                    101},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str496,                   193},
       {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str520,                           25},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str521,                                121},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str522,                                106},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str523,                                       39},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str500,                           25},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str525,                                     78},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str531,                                        37},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str502,                                     67},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str533,                                    163},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str536,                                     12},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str537,                              143},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str538,                                    133},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str539,                                    139},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str504,                                      62},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str506,                                       52},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str507,                                56},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str509,                                       44},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str510,                          24},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str511,                              191},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str520,                                     8},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str542,                                       52},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str548,                    61},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str523,                                  183},
       {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str552,                                 67},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str553,                                    122},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str554,                                    164},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str527,                                    130},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str532,                              143},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str537,                          39},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str538,                                     4},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str556,                                   101},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str540,                                   196},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str544,                                    132},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str558,                           53},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str559,                    64},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str560,                                    160},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str546,                                     63},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str562,                              68},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str548,                                    136},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str564,                                   166},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str570,                              188},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str573,                                   11},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str550,                                 137},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str557,                    64},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str561,                                   0},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str562,                           199},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str563,                                    120},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str564,                                    134},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str575,                             166},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str584,                                       28},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str566,                      187},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str568,                               128},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str569,                                     12},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str571,                                   88},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str587,                          39},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str574,                                     79},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str576,                           53},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str577,                             71},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str578,                                    125},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str580,                                   118},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str590,                                178},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str583,                          44},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str584,                                 120},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str593,                      184},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str594,                                 99},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str595,                                     8},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str587,                       52},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str591,                                  166},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str597,                            59},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str597,                                 137},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str598,                                  180},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str599,                                    146},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str599,                                  94},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str601,                              165},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str602,                                  146},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str603,                                      109},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str601,                                     176},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str608,                                   33},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str613,                                     94},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str617,                                  83},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str618,                                    166},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str625,                                 125},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str633,                           70},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str606,                                     76},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str636,                                    122},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str637,                                     191},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str641,                                        29},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str646,                                       25},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str653,                                     85},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str656,                                    121},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str657,                                 85},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str608,                                     89},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str659,                                134},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str660,                                   169},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str610,                                     86},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str611,                                 76},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str662,                                     78},
       {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str616,                                    109},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str667,                                90},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str671,                             169},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str618,                                  89},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str623,                                     67},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str673,                                121},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str626,                                   118},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str635,                                        29},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str676,                               135},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str638,                        186},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str639,                       52},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str640,                                       25},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str645,                          44},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str646,                                    117},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str649,                              133},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str651,                            31},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str652,                                22},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str653,                                     83},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str654,                                   33},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str679,                                    141},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str656,                                   88},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str681,                                     138},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str682,                                    138},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str688,                                    137},
       {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str660,                                  145},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str661,                                90},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str692,                                    106},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str693,                                 141},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str694,                                    144},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str697,                              168},
       {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str674,                                    183},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str701,                                    160},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str710,                           32},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str714,                                  164},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str718,                                    146},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str719,                                    104},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str720,                                    101},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str721,                                  146},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str722,                                      109},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str725,                                     76},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str676,                                173},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str677,                                    132},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str727,                                106},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str729,                                     86},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str730,                                 76},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str735,                                    109},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str741,                                    10},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str742,                              37},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str743,                                    163},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str748,                                    133},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str764,                                    164},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str765,                                   101},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str766,                                     64},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str775,                                176},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str776,                                       48},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str689,                                    136},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str779,                                57},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str692,                                    107},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str698,                                107},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str699,                                     188},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str701,                                    131},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str705,                                   71},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str706,                               55},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str707,                                     64},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str708,                           196},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str709,                                     75},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str710,                                    75},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str782,                          28},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str785,                                    107},
       {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str714,                                     80},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str789,                                    129},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str790,                                     89},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str791,                                107},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str792,                                    186},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str799,                               55},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str800,                                  89},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str812,                                    114},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str813,                        189},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str820,                                 114},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str821,                           46},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str822,                                    148},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str717,                                   80},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str825,                                  148},
       {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str722,                               135},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str723,                                     85},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str830,                                 99},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str839,                                22},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str726,                                    148},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str727,                                 85},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str728,                             131},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str729,                                  148},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str842,                                    131},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str853,                                  145},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str855,                                     80},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str858,                                   80},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str748,                                       48},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str869,                             131},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str874,                                    135},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str751,                           46},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str877,                                    118},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str881,                              133},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str889,                                     84},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str891,                            31},
+      {-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_str910,                         160},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str917,                         159},
       {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str755,                                    118},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str921,                                  168},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str758,                     182},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str924,                                      61},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str938,                                    116},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str939,                                   116},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str944,                     185},
       {-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_str786,                                     84},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str966,                                    117},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str972,                           173},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str977,                                 124},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str986,                                     83},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str994,                           47},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1001,                                   173},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1006,                                  172},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str797,                                   170},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1017,                                     29},
       {-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}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1051,                                   71},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1057,                                  95},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1061,                                    103},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1062,                                   103},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str809,                                     29},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1065,                              30},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1069,                               48},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str820,                           170},
+      {-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}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1109,                                    156},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str823,                                     173},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1112,                             158},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1128,                                     75},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1129,                                    75},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str842,                                    10},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str843,                                  165},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str848,                                    103},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str849,                                   103},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str863,                         160},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str864,                              30},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str866,                              37},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str867,                                57},
       {-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_str1166,                                   45},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str878,                             158},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str883,                          28},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str884,                                 124},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str886,                                    116},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str887,                                   116},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str895,                           47},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1168,                                 123},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str898,                                     2},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1180,                                    126},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str908,                                  169},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str909,                                    126},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1190,                                   156},
       {-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_str935,                                  95},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str937,                         159},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str947,                               48},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1222,                                     2},
+      {-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_str1247,                                    165},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1248,                                   165},
       {-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_str966,                                      61},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str975,                                 84},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1275,                                126},
+      {-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}, {-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_str978,                                126},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1332,                                 84},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1346,                                     90},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1360,                                     95},
       {-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_str1379,                                    153},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1395,                                 144},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
 #endif /* USE_UNICODE_PROPERTIES */
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -17852,53 +18358,33 @@ uniname2ctype_p (str, len)
       {(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_str1022,                                   45},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1024,                                 123},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1412,                                      15},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1036,                                    156},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1040,                                       47},
       {-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_str1065,                                   156},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1071,                                 144},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1072,                                    153},
       {-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}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1472,                                       47},
       {-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}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1140,                                   72},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1141,                                    135},
       {-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_str1526,                                   78},
       {-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_str1174,                                      15},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1187,                             72},
       {-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}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1221,                                     90},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1235,                                     95},
       {-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}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1277,                                   78},
       {-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},
@@ -17912,12 +18398,16 @@ uniname2ctype_p (str, len)
       {-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}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1751,                                   72},
       {-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}, {-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}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1811,                             72},
       {-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},
@@ -17928,8 +18418,6 @@ uniname2ctype_p (str, len)
       {-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}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1542,                     153},
       {-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},
@@ -17942,6 +18430,8 @@ uniname2ctype_p (str, len)
       {-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}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2016,                     153},
       {-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},
@@ -17953,8 +18443,8 @@ uniname2ctype_p (str, len)
       {-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_str1751,                                     73}
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2124,                                     73}
 #endif /* USE_UNICODE_PROPERTIES */
     };
 
diff --git a/enc/unicode/name2ctype.h.blt b/enc/unicode/name2ctype.h.blt
index df6f02e..d7abb98 100644
--- a/enc/unicode/name2ctype.h.blt
+++ b/enc/unicode/name2ctype.h.blt
@@ -46,13 +46,13 @@ static const OnigCodePoint CR_Any[] = {
 
 /* 'Assigned': - */
 static const OnigCodePoint CR_Assigned[] = {
-	485,
+	501,
 	0x0000, 0x0377,
 	0x037a, 0x037e,
 	0x0384, 0x038a,
 	0x038c, 0x038c,
 	0x038e, 0x03a1,
-	0x03a3, 0x0525,
+	0x03a3, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x055f,
 	0x0561, 0x0587,
@@ -62,18 +62,15 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x05f0, 0x05f4,
 	0x0600, 0x0603,
 	0x0606, 0x061b,
-	0x061e, 0x061f,
-	0x0621, 0x065e,
-	0x0660, 0x070d,
+	0x061e, 0x070d,
 	0x070f, 0x074a,
 	0x074d, 0x07b1,
 	0x07c0, 0x07fa,
 	0x0800, 0x082d,
 	0x0830, 0x083e,
-	0x0900, 0x0939,
-	0x093c, 0x094e,
-	0x0950, 0x0955,
-	0x0958, 0x0972,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x0900, 0x0977,
 	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
@@ -132,7 +129,7 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x0b56, 0x0b57,
 	0x0b5c, 0x0b5d,
 	0x0b5f, 0x0b63,
-	0x0b66, 0x0b71,
+	0x0b66, 0x0b77,
 	0x0b82, 0x0b83,
 	0x0b85, 0x0b8a,
 	0x0b8e, 0x0b90,
@@ -180,11 +177,10 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
+	0x0d4a, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d66, 0x0d75,
@@ -222,11 +218,10 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x0edc, 0x0edd,
 	0x0f00, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f71, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fd8,
+	0x0fce, 0x0fda,
 	0x1000, 0x10c5,
 	0x10d0, 0x10fc,
 	0x1100, 0x1248,
@@ -245,7 +240,7 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x12d8, 0x1310,
 	0x1312, 0x1315,
 	0x1318, 0x135a,
-	0x135f, 0x137c,
+	0x135d, 0x137c,
 	0x1380, 0x1399,
 	0x13a0, 0x13f4,
 	0x1400, 0x169c,
@@ -284,12 +279,13 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x1b50, 0x1b7c,
 	0x1b80, 0x1baa,
 	0x1bae, 0x1bb9,
-	0x1c00, 0x1c37,
+	0x1bc0, 0x1bf3,
+	0x1bfc, 0x1c37,
 	0x1c3b, 0x1c49,
 	0x1c4d, 0x1c7f,
 	0x1cd0, 0x1cf2,
 	0x1d00, 0x1de6,
-	0x1dfd, 0x1f15,
+	0x1dfc, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
 	0x1f48, 0x1f4d,
@@ -308,38 +304,25 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x2000, 0x2064,
 	0x206a, 0x2071,
 	0x2074, 0x208e,
-	0x2090, 0x2094,
-	0x20a0, 0x20b8,
+	0x2090, 0x209c,
+	0x20a0, 0x20b9,
 	0x20d0, 0x20f0,
 	0x2100, 0x2189,
-	0x2190, 0x23e8,
+	0x2190, 0x23f3,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
-	0x2460, 0x26cd,
-	0x26cf, 0x26e1,
-	0x26e3, 0x26e3,
-	0x26e8, 0x26ff,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
+	0x2460, 0x26ff,
+	0x2701, 0x27ca,
 	0x27cc, 0x27cc,
-	0x27d0, 0x2b4c,
+	0x27ce, 0x2b4c,
 	0x2b50, 0x2b59,
 	0x2c00, 0x2c2e,
 	0x2c30, 0x2c5e,
 	0x2c60, 0x2cf1,
 	0x2cf9, 0x2d25,
 	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
 	0x2da0, 0x2da6,
 	0x2da8, 0x2dae,
 	0x2db0, 0x2db6,
@@ -358,7 +341,7 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x3099, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x3190, 0x31b7,
+	0x3190, 0x31ba,
 	0x31c0, 0x31e3,
 	0x31f0, 0x321e,
 	0x3220, 0x32fe,
@@ -367,12 +350,13 @@ static const OnigCodePoint CR_Assigned[] = {
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
 	0xa4d0, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa673,
+	0xa640, 0xa673,
 	0xa67c, 0xa697,
 	0xa6a0, 0xa6f7,
-	0xa700, 0xa78c,
-	0xa7fb, 0xa82b,
+	0xa700, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa82b,
 	0xa830, 0xa839,
 	0xa840, 0xa877,
 	0xa880, 0xa8c4,
@@ -389,6 +373,11 @@ static const OnigCodePoint CR_Assigned[] = {
 	0xaa5c, 0xaa7b,
 	0xaa80, 0xaac2,
 	0xaadb, 0xaadf,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabed,
 	0xabf0, 0xabf9,
 	0xac00, 0xd7a3,
@@ -404,7 +393,7 @@ static const OnigCodePoint CR_Assigned[] = {
 	0xfb3e, 0xfb3e,
 	0xfb40, 0xfb41,
 	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
+	0xfb46, 0xfbc1,
 	0xfbd3, 0xfd3f,
 	0xfd50, 0xfd8f,
 	0xfd92, 0xfdc7,
@@ -472,11 +461,15 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x10b78, 0x10b7f,
 	0x10c00, 0x10c48,
 	0x10e60, 0x10e7e,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
 	0x11080, 0x110c1,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x12470, 0x12473,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d000, 0x1d0f5,
 	0x1d100, 0x1d126,
 	0x1d129, 0x1d1dd,
@@ -506,26 +499,49 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x1d7ce, 0x1d7ff,
 	0x1f000, 0x1f02b,
 	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
 	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,
+	0x1f130, 0x1f169,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
 	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f5ff,
+	0x1f601, 0x1f610,
+	0x1f612, 0x1f614,
+	0x1f616, 0x1f616,
+	0x1f618, 0x1f618,
+	0x1f61a, 0x1f61a,
+	0x1f61c, 0x1f61e,
+	0x1f620, 0x1f625,
+	0x1f628, 0x1f62b,
+	0x1f62d, 0x1f62d,
+	0x1f630, 0x1f633,
+	0x1f635, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 	0xe0001, 0xe0001,
 	0xe0020, 0xe007f,
@@ -588,13 +604,13 @@ static const OnigCodePoint CR_Cf[] = {
 
 /* 'Cn': General Category */
 static const OnigCodePoint CR_Cn[] = {
-	485,
+	501,
 	0x0378, 0x0379,
 	0x037f, 0x0383,
 	0x038b, 0x038b,
 	0x038d, 0x038d,
 	0x03a2, 0x03a2,
-	0x0526, 0x0530,
+	0x0528, 0x0530,
 	0x0557, 0x0558,
 	0x0560, 0x0560,
 	0x0588, 0x0588,
@@ -604,18 +620,15 @@ static const OnigCodePoint CR_Cn[] = {
 	0x05f5, 0x05ff,
 	0x0604, 0x0605,
 	0x061c, 0x061d,
-	0x0620, 0x0620,
-	0x065f, 0x065f,
 	0x070e, 0x070e,
 	0x074b, 0x074c,
 	0x07b2, 0x07bf,
 	0x07fb, 0x07ff,
 	0x082e, 0x082f,
-	0x083f, 0x08ff,
-	0x093a, 0x093b,
-	0x094f, 0x094f,
-	0x0956, 0x0957,
-	0x0973, 0x0978,
+	0x083f, 0x083f,
+	0x085c, 0x085d,
+	0x085f, 0x08ff,
+	0x0978, 0x0978,
 	0x0980, 0x0980,
 	0x0984, 0x0984,
 	0x098d, 0x098e,
@@ -674,7 +687,7 @@ static const OnigCodePoint CR_Cn[] = {
 	0x0b58, 0x0b5b,
 	0x0b5e, 0x0b5e,
 	0x0b64, 0x0b65,
-	0x0b72, 0x0b81,
+	0x0b78, 0x0b81,
 	0x0b84, 0x0b84,
 	0x0b8b, 0x0b8d,
 	0x0b91, 0x0b91,
@@ -722,11 +735,10 @@ static const OnigCodePoint CR_Cn[] = {
 	0x0d04, 0x0d04,
 	0x0d0d, 0x0d0d,
 	0x0d11, 0x0d11,
-	0x0d29, 0x0d29,
-	0x0d3a, 0x0d3c,
+	0x0d3b, 0x0d3c,
 	0x0d45, 0x0d45,
 	0x0d49, 0x0d49,
-	0x0d4e, 0x0d56,
+	0x0d4f, 0x0d56,
 	0x0d58, 0x0d5f,
 	0x0d64, 0x0d65,
 	0x0d76, 0x0d78,
@@ -764,11 +776,10 @@ static const OnigCodePoint CR_Cn[] = {
 	0x0ede, 0x0eff,
 	0x0f48, 0x0f48,
 	0x0f6d, 0x0f70,
-	0x0f8c, 0x0f8f,
 	0x0f98, 0x0f98,
 	0x0fbd, 0x0fbd,
 	0x0fcd, 0x0fcd,
-	0x0fd9, 0x0fff,
+	0x0fdb, 0x0fff,
 	0x10c6, 0x10cf,
 	0x10fd, 0x10ff,
 	0x1249, 0x1249,
@@ -786,7 +797,7 @@ static const OnigCodePoint CR_Cn[] = {
 	0x12d7, 0x12d7,
 	0x1311, 0x1311,
 	0x1316, 0x1317,
-	0x135b, 0x135e,
+	0x135b, 0x135c,
 	0x137d, 0x137f,
 	0x139a, 0x139f,
 	0x13f5, 0x13ff,
@@ -825,12 +836,13 @@ static const OnigCodePoint CR_Cn[] = {
 	0x1b4c, 0x1b4f,
 	0x1b7d, 0x1b7f,
 	0x1bab, 0x1bad,
-	0x1bba, 0x1bff,
+	0x1bba, 0x1bbf,
+	0x1bf4, 0x1bfb,
 	0x1c38, 0x1c3a,
 	0x1c4a, 0x1c4c,
 	0x1c80, 0x1ccf,
 	0x1cf3, 0x1cff,
-	0x1de7, 0x1dfc,
+	0x1de7, 0x1dfb,
 	0x1f16, 0x1f17,
 	0x1f1e, 0x1f1f,
 	0x1f46, 0x1f47,
@@ -850,29 +862,16 @@ static const OnigCodePoint CR_Cn[] = {
 	0x2065, 0x2069,
 	0x2072, 0x2073,
 	0x208f, 0x208f,
-	0x2095, 0x209f,
-	0x20b9, 0x20cf,
+	0x209d, 0x209f,
+	0x20ba, 0x20cf,
 	0x20f1, 0x20ff,
 	0x218a, 0x218f,
-	0x23e9, 0x23ff,
+	0x23f4, 0x23ff,
 	0x2427, 0x243f,
 	0x244b, 0x245f,
-	0x26ce, 0x26ce,
-	0x26e2, 0x26e2,
-	0x26e4, 0x26e7,
 	0x2700, 0x2700,
-	0x2705, 0x2705,
-	0x270a, 0x270b,
-	0x2728, 0x2728,
-	0x274c, 0x274c,
-	0x274e, 0x274e,
-	0x2753, 0x2755,
-	0x275f, 0x2760,
-	0x2795, 0x2797,
-	0x27b0, 0x27b0,
-	0x27bf, 0x27bf,
 	0x27cb, 0x27cb,
-	0x27cd, 0x27cf,
+	0x27cd, 0x27cd,
 	0x2b4d, 0x2b4f,
 	0x2b5a, 0x2bff,
 	0x2c2f, 0x2c2f,
@@ -880,7 +879,7 @@ static const OnigCodePoint CR_Cn[] = {
 	0x2cf2, 0x2cf8,
 	0x2d26, 0x2d2f,
 	0x2d66, 0x2d6e,
-	0x2d70, 0x2d7f,
+	0x2d71, 0x2d7e,
 	0x2d97, 0x2d9f,
 	0x2da7, 0x2da7,
 	0x2daf, 0x2daf,
@@ -900,7 +899,7 @@ static const OnigCodePoint CR_Cn[] = {
 	0x3100, 0x3104,
 	0x312e, 0x3130,
 	0x318f, 0x318f,
-	0x31b8, 0x31bf,
+	0x31bb, 0x31bf,
 	0x31e4, 0x31ef,
 	0x321f, 0x321f,
 	0x32ff, 0x32ff,
@@ -909,11 +908,12 @@ static const OnigCodePoint CR_Cn[] = {
 	0xa48d, 0xa48f,
 	0xa4c7, 0xa4cf,
 	0xa62c, 0xa63f,
-	0xa660, 0xa661,
 	0xa674, 0xa67b,
 	0xa698, 0xa69f,
 	0xa6f8, 0xa6ff,
-	0xa78d, 0xa7fa,
+	0xa78f, 0xa78f,
+	0xa792, 0xa79f,
+	0xa7aa, 0xa7f9,
 	0xa82c, 0xa82f,
 	0xa83a, 0xa83f,
 	0xa878, 0xa87f,
@@ -930,7 +930,12 @@ static const OnigCodePoint CR_Cn[] = {
 	0xaa5a, 0xaa5b,
 	0xaa7c, 0xaa7f,
 	0xaac3, 0xaada,
-	0xaae0, 0xabbf,
+	0xaae0, 0xab00,
+	0xab07, 0xab08,
+	0xab0f, 0xab10,
+	0xab17, 0xab1f,
+	0xab27, 0xab27,
+	0xab2f, 0xabbf,
 	0xabee, 0xabef,
 	0xabfa, 0xabff,
 	0xd7a4, 0xd7af,
@@ -946,7 +951,7 @@ static const OnigCodePoint CR_Cn[] = {
 	0xfb3f, 0xfb3f,
 	0xfb42, 0xfb42,
 	0xfb45, 0xfb45,
-	0xfbb2, 0xfbd2,
+	0xfbc2, 0xfbd2,
 	0xfd40, 0xfd4f,
 	0xfd90, 0xfd91,
 	0xfdc8, 0xfdef,
@@ -1013,12 +1018,16 @@ static const OnigCodePoint CR_Cn[] = {
 	0x10b73, 0x10b77,
 	0x10b80, 0x10bff,
 	0x10c49, 0x10e5f,
-	0x10e7f, 0x1107f,
+	0x10e7f, 0x10fff,
+	0x1104e, 0x11051,
+	0x11070, 0x1107f,
 	0x110c2, 0x11fff,
 	0x1236f, 0x123ff,
 	0x12463, 0x1246f,
 	0x12474, 0x12fff,
-	0x1342f, 0x1cfff,
+	0x1342f, 0x167ff,
+	0x16a39, 0x1afff,
+	0x1b002, 0x1cfff,
 	0x1d0f6, 0x1d0ff,
 	0x1d127, 0x1d128,
 	0x1d1de, 0x1d1ff,
@@ -1047,27 +1056,50 @@ static const OnigCodePoint CR_Cn[] = {
 	0x1d7cc, 0x1d7cd,
 	0x1d800, 0x1efff,
 	0x1f02c, 0x1f02f,
-	0x1f094, 0x1f0ff,
+	0x1f094, 0x1f09f,
+	0x1f0af, 0x1f0b0,
+	0x1f0bf, 0x1f0c0,
+	0x1f0d0, 0x1f0d0,
+	0x1f0e0, 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,
+	0x1f12f, 0x1f12f,
+	0x1f16a, 0x1f16f,
+	0x1f19b, 0x1f1e5,
+	0x1f203, 0x1f20f,
+	0x1f23b, 0x1f23f,
+	0x1f249, 0x1f24f,
+	0x1f252, 0x1f2ff,
+	0x1f321, 0x1f32f,
+	0x1f336, 0x1f336,
+	0x1f37d, 0x1f37f,
+	0x1f394, 0x1f39f,
+	0x1f3c5, 0x1f3c5,
+	0x1f3cb, 0x1f3df,
+	0x1f3f1, 0x1f3ff,
+	0x1f43f, 0x1f43f,
+	0x1f441, 0x1f441,
+	0x1f4f8, 0x1f4f8,
+	0x1f4fd, 0x1f4ff,
+	0x1f53e, 0x1f54f,
+	0x1f568, 0x1f5fa,
+	0x1f600, 0x1f600,
+	0x1f611, 0x1f611,
+	0x1f615, 0x1f615,
+	0x1f617, 0x1f617,
+	0x1f619, 0x1f619,
+	0x1f61b, 0x1f61b,
+	0x1f61f, 0x1f61f,
+	0x1f626, 0x1f627,
+	0x1f62c, 0x1f62c,
+	0x1f62e, 0x1f62f,
+	0x1f634, 0x1f634,
+	0x1f641, 0x1f644,
+	0x1f650, 0x1f67f,
+	0x1f6c6, 0x1f6ff,
+	0x1f774, 0x1ffff,
 	0x2a6d7, 0x2a6ff,
-	0x2b735, 0x2f7ff,
+	0x2b735, 0x2b73f,
+	0x2b81e, 0x2f7ff,
 	0x2fa1e, 0xe0000,
 	0xe0002, 0xe001f,
 	0xe0080, 0xe00ff,
@@ -1092,7 +1124,7 @@ static const OnigCodePoint CR_Cs[] = {
 
 /* 'L': Major Category */
 static const OnigCodePoint CR_L[] = {
-	422,
+	435,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -1114,13 +1146,13 @@ static const OnigCodePoint CR_L[] = {
 	0x038e, 0x03a1,
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x0559,
 	0x0561, 0x0587,
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
-	0x0621, 0x064a,
+	0x0620, 0x064a,
 	0x066e, 0x066f,
 	0x0671, 0x06d3,
 	0x06d5, 0x06d5,
@@ -1139,11 +1171,12 @@ static const OnigCodePoint CR_L[] = {
 	0x081a, 0x081a,
 	0x0824, 0x0824,
 	0x0828, 0x0828,
+	0x0840, 0x0858,
 	0x0904, 0x0939,
 	0x093d, 0x093d,
 	0x0950, 0x0950,
 	0x0958, 0x0961,
-	0x0971, 0x0972,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0x0985, 0x098c,
 	0x098f, 0x0990,
@@ -1212,11 +1245,12 @@ static const OnigCodePoint CR_L[] = {
 	0x0cbd, 0x0cbd,
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce1,
+	0x0cf1, 0x0cf2,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
 	0x0d60, 0x0d61,
 	0x0d7a, 0x0d7f,
 	0x0d85, 0x0d96,
@@ -1247,7 +1281,7 @@ static const OnigCodePoint CR_L[] = {
 	0x0f00, 0x0f00,
 	0x0f40, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8b,
+	0x0f88, 0x0f8c,
 	0x1000, 0x102a,
 	0x103f, 0x103f,
 	0x1050, 0x1055,
@@ -1307,6 +1341,7 @@ static const OnigCodePoint CR_L[] = {
 	0x1b45, 0x1b4b,
 	0x1b83, 0x1ba0,
 	0x1bae, 0x1baf,
+	0x1bc0, 0x1be5,
 	0x1c00, 0x1c23,
 	0x1c4d, 0x1c4f,
 	0x1c5a, 0x1c7d,
@@ -1334,7 +1369,7 @@ static const OnigCodePoint CR_L[] = {
 	0x1ff6, 0x1ffc,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x2102, 0x2102,
 	0x2107, 0x2107,
 	0x210a, 0x2113,
@@ -1375,7 +1410,7 @@ static const OnigCodePoint CR_L[] = {
 	0x30fc, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -1384,14 +1419,15 @@ static const OnigCodePoint CR_L[] = {
 	0xa500, 0xa60c,
 	0xa610, 0xa61f,
 	0xa62a, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa66e,
+	0xa640, 0xa66e,
 	0xa67f, 0xa697,
 	0xa6a0, 0xa6e5,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa801,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa801,
 	0xa803, 0xa805,
 	0xa807, 0xa80a,
 	0xa80c, 0xa822,
@@ -1416,6 +1452,11 @@ static const OnigCodePoint CR_L[] = {
 	0xaac0, 0xaac0,
 	0xaac2, 0xaac2,
 	0xaadb, 0xaadd,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabe2,
 	0xac00, 0xd7a3,
 	0xd7b0, 0xd7c6,
@@ -1479,9 +1520,12 @@ static const OnigCodePoint CR_L[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11003, 0x11037,
 	0x11083, 0x110af,
 	0x12000, 0x1236e,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d400, 0x1d454,
 	0x1d456, 0x1d49c,
 	0x1d49e, 0x1d49f,
@@ -1514,12 +1558,13 @@ static const OnigCodePoint CR_L[] = {
 	0x1d7c4, 0x1d7cb,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_L */
 
 /* 'Ll': General Category */
 static const OnigCodePoint CR_Ll[] = {
-	599,
+	609,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
 	0x00b5, 0x00b5,
@@ -1786,6 +1831,7 @@ static const OnigCodePoint CR_Ll[] = {
 	0x0521, 0x0521,
 	0x0523, 0x0523,
 	0x0525, 0x0525,
+	0x0527, 0x0527,
 	0x0561, 0x0587,
 	0x1d00, 0x1d2b,
 	0x1d62, 0x1d77,
@@ -2022,6 +2068,7 @@ static const OnigCodePoint CR_Ll[] = {
 	0xa65b, 0xa65b,
 	0xa65d, 0xa65d,
 	0xa65f, 0xa65f,
+	0xa661, 0xa661,
 	0xa663, 0xa663,
 	0xa665, 0xa665,
 	0xa667, 0xa667,
@@ -2087,6 +2134,14 @@ static const OnigCodePoint CR_Ll[] = {
 	0xa785, 0xa785,
 	0xa787, 0xa787,
 	0xa78c, 0xa78c,
+	0xa78e, 0xa78e,
+	0xa791, 0xa791,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
+	0xa7fa, 0xa7fa,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
 	0xff41, 0xff5a,
@@ -2152,7 +2207,7 @@ static const OnigCodePoint CR_Lm[] = {
 	0x1d9b, 0x1dbf,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x2c7d, 0x2c7d,
 	0x2d6f, 0x2d6f,
 	0x2e2f, 0x2e2f,
@@ -2177,13 +2232,13 @@ static const OnigCodePoint CR_Lm[] = {
 
 /* 'Lo': General Category */
 static const OnigCodePoint CR_Lo[] = {
-	311,
+	323,
 	0x01bb, 0x01bb,
 	0x01c0, 0x01c3,
 	0x0294, 0x0294,
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
-	0x0621, 0x063f,
+	0x0620, 0x063f,
 	0x0641, 0x064a,
 	0x066e, 0x066f,
 	0x0671, 0x06d3,
@@ -2197,11 +2252,12 @@ static const OnigCodePoint CR_Lo[] = {
 	0x07b1, 0x07b1,
 	0x07ca, 0x07ea,
 	0x0800, 0x0815,
+	0x0840, 0x0858,
 	0x0904, 0x0939,
 	0x093d, 0x093d,
 	0x0950, 0x0950,
 	0x0958, 0x0961,
-	0x0972, 0x0972,
+	0x0972, 0x0977,
 	0x0979, 0x097f,
 	0x0985, 0x098c,
 	0x098f, 0x0990,
@@ -2270,11 +2326,12 @@ static const OnigCodePoint CR_Lo[] = {
 	0x0cbd, 0x0cbd,
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce1,
+	0x0cf1, 0x0cf2,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
 	0x0d60, 0x0d61,
 	0x0d7a, 0x0d7f,
 	0x0d85, 0x0d96,
@@ -2304,7 +2361,7 @@ static const OnigCodePoint CR_Lo[] = {
 	0x0f00, 0x0f00,
 	0x0f40, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8b,
+	0x0f88, 0x0f8c,
 	0x1000, 0x102a,
 	0x103f, 0x103f,
 	0x1050, 0x1055,
@@ -2361,6 +2418,7 @@ static const OnigCodePoint CR_Lo[] = {
 	0x1b45, 0x1b4b,
 	0x1b83, 0x1ba0,
 	0x1bae, 0x1baf,
+	0x1bc0, 0x1be5,
 	0x1c00, 0x1c23,
 	0x1c4d, 0x1c4f,
 	0x1c5a, 0x1c77,
@@ -2385,7 +2443,7 @@ static const OnigCodePoint CR_Lo[] = {
 	0x30ff, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -2422,6 +2480,11 @@ static const OnigCodePoint CR_Lo[] = {
 	0xaac0, 0xaac0,
 	0xaac2, 0xaac2,
 	0xaadb, 0xaadc,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabe2,
 	0xac00, 0xd7a3,
 	0xd7b0, 0xd7c6,
@@ -2483,11 +2546,15 @@ static const OnigCodePoint CR_Lo[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11003, 0x11037,
 	0x11083, 0x110af,
 	0x12000, 0x1236e,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_Lo */
 
@@ -2508,7 +2575,7 @@ static const OnigCodePoint CR_Lt[] = {
 
 /* 'Lu': General Category */
 static const OnigCodePoint CR_Lu[] = {
-	594,
+	603,
 	0x0041, 0x005a,
 	0x00c0, 0x00d6,
 	0x00d8, 0x00de,
@@ -2774,6 +2841,7 @@ static const OnigCodePoint CR_Lu[] = {
 	0x0520, 0x0520,
 	0x0522, 0x0522,
 	0x0524, 0x0524,
+	0x0526, 0x0526,
 	0x0531, 0x0556,
 	0x10a0, 0x10c5,
 	0x1e00, 0x1e00,
@@ -3006,6 +3074,7 @@ static const OnigCodePoint CR_Lu[] = {
 	0xa65a, 0xa65a,
 	0xa65c, 0xa65c,
 	0xa65e, 0xa65e,
+	0xa660, 0xa660,
 	0xa662, 0xa662,
 	0xa664, 0xa664,
 	0xa666, 0xa666,
@@ -3070,6 +3139,13 @@ static const OnigCodePoint CR_Lu[] = {
 	0xa784, 0xa784,
 	0xa786, 0xa786,
 	0xa78b, 0xa78b,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
 	0xff21, 0xff3a,
 	0x10400, 0x10427,
 	0x1d400, 0x1d419,
@@ -3107,7 +3183,7 @@ static const OnigCodePoint CR_Lu[] = {
 
 /* 'M': Major Category */
 static const OnigCodePoint CR_M[] = {
-	188,
+	193,
 	0x0300, 0x036f,
 	0x0483, 0x0489,
 	0x0591, 0x05bd,
@@ -3116,10 +3192,10 @@ static const OnigCodePoint CR_M[] = {
 	0x05c4, 0x05c5,
 	0x05c7, 0x05c7,
 	0x0610, 0x061a,
-	0x064b, 0x065e,
+	0x064b, 0x065f,
 	0x0670, 0x0670,
 	0x06d6, 0x06dc,
-	0x06de, 0x06e4,
+	0x06df, 0x06e4,
 	0x06e7, 0x06e8,
 	0x06ea, 0x06ed,
 	0x0711, 0x0711,
@@ -3130,10 +3206,11 @@ static const OnigCodePoint CR_M[] = {
 	0x081b, 0x0823,
 	0x0825, 0x0827,
 	0x0829, 0x082d,
+	0x0859, 0x085b,
 	0x0900, 0x0903,
-	0x093c, 0x093c,
-	0x093e, 0x094e,
-	0x0951, 0x0955,
+	0x093a, 0x093c,
+	0x093e, 0x094f,
+	0x0951, 0x0957,
 	0x0962, 0x0963,
 	0x0981, 0x0983,
 	0x09bc, 0x09bc,
@@ -3207,7 +3284,7 @@ static const OnigCodePoint CR_M[] = {
 	0x0f3e, 0x0f3f,
 	0x0f71, 0x0f84,
 	0x0f86, 0x0f87,
-	0x0f90, 0x0f97,
+	0x0f8d, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fc6, 0x0fc6,
 	0x102b, 0x103e,
@@ -3219,7 +3296,7 @@ static const OnigCodePoint CR_M[] = {
 	0x1082, 0x108d,
 	0x108f, 0x108f,
 	0x109a, 0x109d,
-	0x135f, 0x135f,
+	0x135d, 0x135f,
 	0x1712, 0x1714,
 	0x1732, 0x1734,
 	0x1752, 0x1753,
@@ -3241,15 +3318,17 @@ static const OnigCodePoint CR_M[] = {
 	0x1b6b, 0x1b73,
 	0x1b80, 0x1b82,
 	0x1ba1, 0x1baa,
+	0x1be6, 0x1bf3,
 	0x1c24, 0x1c37,
 	0x1cd0, 0x1cd2,
 	0x1cd4, 0x1ce8,
 	0x1ced, 0x1ced,
 	0x1cf2, 0x1cf2,
 	0x1dc0, 0x1de6,
-	0x1dfd, 0x1dff,
+	0x1dfc, 0x1dff,
 	0x20d0, 0x20f0,
 	0x2cef, 0x2cf1,
+	0x2d7f, 0x2d7f,
 	0x2de0, 0x2dff,
 	0x302a, 0x302f,
 	0x3099, 0x309a,
@@ -3287,6 +3366,8 @@ static const OnigCodePoint CR_M[] = {
 	0x10a0c, 0x10a0f,
 	0x10a38, 0x10a3a,
 	0x10a3f, 0x10a3f,
+	0x11000, 0x11002,
+	0x11038, 0x11046,
 	0x11080, 0x11082,
 	0x110b0, 0x110ba,
 	0x1d165, 0x1d169,
@@ -3300,11 +3381,12 @@ static const OnigCodePoint CR_M[] = {
 
 /* 'Mc': General Category */
 static const OnigCodePoint CR_Mc[] = {
-	106,
+	113,
 	0x0903, 0x0903,
+	0x093b, 0x093b,
 	0x093e, 0x0940,
 	0x0949, 0x094c,
-	0x094e, 0x094e,
+	0x094e, 0x094f,
 	0x0982, 0x0983,
 	0x09be, 0x09c0,
 	0x09c7, 0x09c8,
@@ -3381,6 +3463,10 @@ static const OnigCodePoint CR_Mc[] = {
 	0x1ba1, 0x1ba1,
 	0x1ba6, 0x1ba7,
 	0x1baa, 0x1baa,
+	0x1be7, 0x1be7,
+	0x1bea, 0x1bec,
+	0x1bee, 0x1bee,
+	0x1bf2, 0x1bf3,
 	0x1c24, 0x1c2b,
 	0x1c34, 0x1c35,
 	0x1ce1, 0x1ce1,
@@ -3402,6 +3488,8 @@ static const OnigCodePoint CR_Mc[] = {
 	0xabe6, 0xabe7,
 	0xabe9, 0xabea,
 	0xabec, 0xabec,
+	0x11000, 0x11000,
+	0x11002, 0x11002,
 	0x11082, 0x11082,
 	0x110b0, 0x110b2,
 	0x110b7, 0x110b8,
@@ -3411,9 +3499,8 @@ static const OnigCodePoint CR_Mc[] = {
 
 /* 'Me': General Category */
 static const OnigCodePoint CR_Me[] = {
-	5,
+	4,
 	0x0488, 0x0489,
-	0x06de, 0x06de,
 	0x20dd, 0x20e0,
 	0x20e2, 0x20e4,
 	0xa670, 0xa672,
@@ -3421,7 +3508,7 @@ static const OnigCodePoint CR_Me[] = {
 
 /* 'Mn': General Category */
 static const OnigCodePoint CR_Mn[] = {
-	194,
+	203,
 	0x0300, 0x036f,
 	0x0483, 0x0487,
 	0x0591, 0x05bd,
@@ -3430,7 +3517,7 @@ static const OnigCodePoint CR_Mn[] = {
 	0x05c4, 0x05c5,
 	0x05c7, 0x05c7,
 	0x0610, 0x061a,
-	0x064b, 0x065e,
+	0x064b, 0x065f,
 	0x0670, 0x0670,
 	0x06d6, 0x06dc,
 	0x06df, 0x06e4,
@@ -3444,11 +3531,13 @@ static const OnigCodePoint CR_Mn[] = {
 	0x081b, 0x0823,
 	0x0825, 0x0827,
 	0x0829, 0x082d,
+	0x0859, 0x085b,
 	0x0900, 0x0902,
+	0x093a, 0x093a,
 	0x093c, 0x093c,
 	0x0941, 0x0948,
 	0x094d, 0x094d,
-	0x0951, 0x0955,
+	0x0951, 0x0957,
 	0x0962, 0x0963,
 	0x0981, 0x0981,
 	0x09bc, 0x09bc,
@@ -3509,7 +3598,7 @@ static const OnigCodePoint CR_Mn[] = {
 	0x0f71, 0x0f7e,
 	0x0f80, 0x0f84,
 	0x0f86, 0x0f87,
-	0x0f90, 0x0f97,
+	0x0f8d, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fc6, 0x0fc6,
 	0x102d, 0x1030,
@@ -3523,7 +3612,7 @@ static const OnigCodePoint CR_Mn[] = {
 	0x1085, 0x1086,
 	0x108d, 0x108d,
 	0x109d, 0x109d,
-	0x135f, 0x135f,
+	0x135d, 0x135f,
 	0x1712, 0x1714,
 	0x1732, 0x1734,
 	0x1752, 0x1753,
@@ -3555,6 +3644,10 @@ static const OnigCodePoint CR_Mn[] = {
 	0x1b80, 0x1b81,
 	0x1ba2, 0x1ba5,
 	0x1ba8, 0x1ba9,
+	0x1be6, 0x1be6,
+	0x1be8, 0x1be9,
+	0x1bed, 0x1bed,
+	0x1bef, 0x1bf1,
 	0x1c2c, 0x1c33,
 	0x1c36, 0x1c37,
 	0x1cd0, 0x1cd2,
@@ -3562,11 +3655,12 @@ static const OnigCodePoint CR_Mn[] = {
 	0x1ce2, 0x1ce8,
 	0x1ced, 0x1ced,
 	0x1dc0, 0x1de6,
-	0x1dfd, 0x1dff,
+	0x1dfc, 0x1dff,
 	0x20d0, 0x20dc,
 	0x20e1, 0x20e1,
 	0x20e5, 0x20f0,
 	0x2cef, 0x2cf1,
+	0x2d7f, 0x2d7f,
 	0x2de0, 0x2dff,
 	0x302a, 0x302f,
 	0x3099, 0x309a,
@@ -3607,6 +3701,8 @@ static const OnigCodePoint CR_Mn[] = {
 	0x10a0c, 0x10a0f,
 	0x10a38, 0x10a3a,
 	0x10a3f, 0x10a3f,
+	0x11001, 0x11001,
+	0x11038, 0x11046,
 	0x11080, 0x11081,
 	0x110b3, 0x110b6,
 	0x110b9, 0x110ba,
@@ -3620,7 +3716,7 @@ static const OnigCodePoint CR_Mn[] = {
 
 /* 'N': Major Category */
 static const OnigCodePoint CR_N[] = {
-	81,
+	83,
 	0x0030, 0x0039,
 	0x00b2, 0x00b3,
 	0x00b9, 0x00b9,
@@ -3634,6 +3730,7 @@ static const OnigCodePoint CR_N[] = {
 	0x0a66, 0x0a6f,
 	0x0ae6, 0x0aef,
 	0x0b66, 0x0b6f,
+	0x0b72, 0x0b77,
 	0x0be6, 0x0bf2,
 	0x0c66, 0x0c6f,
 	0x0c78, 0x0c7e,
@@ -3698,6 +3795,7 @@ static const OnigCodePoint CR_N[] = {
 	0x10b58, 0x10b5f,
 	0x10b78, 0x10b7f,
 	0x10e60, 0x10e7e,
+	0x11052, 0x1106f,
 	0x12400, 0x12462,
 	0x1d360, 0x1d371,
 	0x1d7ce, 0x1d7ff,
@@ -3706,7 +3804,7 @@ static const OnigCodePoint CR_N[] = {
 
 /* 'Nd': General Category */
 static const OnigCodePoint CR_Nd[] = {
-	37,
+	38,
 	0x0030, 0x0039,
 	0x0660, 0x0669,
 	0x06f0, 0x06f9,
@@ -3728,7 +3826,7 @@ static const OnigCodePoint CR_Nd[] = {
 	0x17e0, 0x17e9,
 	0x1810, 0x1819,
 	0x1946, 0x194f,
-	0x19d0, 0x19da,
+	0x19d0, 0x19d9,
 	0x1a80, 0x1a89,
 	0x1a90, 0x1a99,
 	0x1b50, 0x1b59,
@@ -3743,6 +3841,7 @@ static const OnigCodePoint CR_Nd[] = {
 	0xabf0, 0xabf9,
 	0xff10, 0xff19,
 	0x104a0, 0x104a9,
+	0x11066, 0x1106f,
 	0x1d7ce, 0x1d7ff,
 }; /* CR_Nd */
 
@@ -3765,17 +3864,19 @@ static const OnigCodePoint CR_Nl[] = {
 
 /* 'No': General Category */
 static const OnigCodePoint CR_No[] = {
-	38,
+	41,
 	0x00b2, 0x00b3,
 	0x00b9, 0x00b9,
 	0x00bc, 0x00be,
 	0x09f4, 0x09f9,
+	0x0b72, 0x0b77,
 	0x0bf0, 0x0bf2,
 	0x0c78, 0x0c7e,
 	0x0d70, 0x0d75,
 	0x0f2a, 0x0f33,
 	0x1369, 0x137c,
 	0x17f0, 0x17f9,
+	0x19da, 0x19da,
 	0x2070, 0x2070,
 	0x2074, 0x2079,
 	0x2080, 0x2089,
@@ -3802,13 +3903,14 @@ static const OnigCodePoint CR_No[] = {
 	0x10b58, 0x10b5f,
 	0x10b78, 0x10b7f,
 	0x10e60, 0x10e7e,
+	0x11052, 0x11065,
 	0x1d360, 0x1d371,
 	0x1f100, 0x1f10a,
 }; /* CR_No */
 
 /* 'P': Major Category */
 static const OnigCodePoint CR_P[] = {
-	129,
+	133,
 	0x0021, 0x0023,
 	0x0025, 0x002a,
 	0x002c, 0x002f,
@@ -3841,6 +3943,7 @@ static const OnigCodePoint CR_P[] = {
 	0x0700, 0x070d,
 	0x07f7, 0x07f9,
 	0x0830, 0x083e,
+	0x085e, 0x085e,
 	0x0964, 0x0965,
 	0x0970, 0x0970,
 	0x0df4, 0x0df4,
@@ -3850,6 +3953,7 @@ static const OnigCodePoint CR_P[] = {
 	0x0f3a, 0x0f3d,
 	0x0f85, 0x0f85,
 	0x0fd0, 0x0fd4,
+	0x0fd9, 0x0fda,
 	0x104a, 0x104f,
 	0x10fb, 0x10fb,
 	0x1361, 0x1368,
@@ -3862,11 +3966,11 @@ static const OnigCodePoint CR_P[] = {
 	0x17d8, 0x17da,
 	0x1800, 0x180a,
 	0x1944, 0x1945,
-	0x19de, 0x19df,
 	0x1a1e, 0x1a1f,
 	0x1aa0, 0x1aa6,
 	0x1aa8, 0x1aad,
 	0x1b5a, 0x1b60,
+	0x1bfc, 0x1bff,
 	0x1c3b, 0x1c3f,
 	0x1c7e, 0x1c7f,
 	0x1cd3, 0x1cd3,
@@ -3885,6 +3989,7 @@ static const OnigCodePoint CR_P[] = {
 	0x29fc, 0x29fd,
 	0x2cf9, 0x2cfc,
 	0x2cfe, 0x2cff,
+	0x2d70, 0x2d70,
 	0x2e00, 0x2e2e,
 	0x2e30, 0x2e31,
 	0x3001, 0x3003,
@@ -3935,6 +4040,7 @@ static const OnigCodePoint CR_P[] = {
 	0x10a50, 0x10a58,
 	0x10a7f, 0x10a7f,
 	0x10b39, 0x10b3f,
+	0x11047, 0x1104d,
 	0x110bb, 0x110bc,
 	0x110be, 0x110c1,
 	0x12470, 0x12473,
@@ -4079,7 +4185,7 @@ static const OnigCodePoint CR_Pi[] = {
 
 /* 'Po': General Category */
 static const OnigCodePoint CR_Po[] = {
-	124,
+	128,
 	0x0021, 0x0023,
 	0x0025, 0x0027,
 	0x002a, 0x002a,
@@ -4108,6 +4214,7 @@ static const OnigCodePoint CR_Po[] = {
 	0x0700, 0x070d,
 	0x07f7, 0x07f9,
 	0x0830, 0x083e,
+	0x085e, 0x085e,
 	0x0964, 0x0965,
 	0x0970, 0x0970,
 	0x0df4, 0x0df4,
@@ -4116,6 +4223,7 @@ static const OnigCodePoint CR_Po[] = {
 	0x0f04, 0x0f12,
 	0x0f85, 0x0f85,
 	0x0fd0, 0x0fd4,
+	0x0fd9, 0x0fda,
 	0x104a, 0x104f,
 	0x10fb, 0x10fb,
 	0x1361, 0x1368,
@@ -4127,11 +4235,11 @@ static const OnigCodePoint CR_Po[] = {
 	0x1800, 0x1805,
 	0x1807, 0x180a,
 	0x1944, 0x1945,
-	0x19de, 0x19df,
 	0x1a1e, 0x1a1f,
 	0x1aa0, 0x1aa6,
 	0x1aa8, 0x1aad,
 	0x1b5a, 0x1b60,
+	0x1bfc, 0x1bff,
 	0x1c3b, 0x1c3f,
 	0x1c7e, 0x1c7f,
 	0x1cd3, 0x1cd3,
@@ -4145,6 +4253,7 @@ static const OnigCodePoint CR_Po[] = {
 	0x2055, 0x205e,
 	0x2cf9, 0x2cfc,
 	0x2cfe, 0x2cff,
+	0x2d70, 0x2d70,
 	0x2e00, 0x2e01,
 	0x2e06, 0x2e08,
 	0x2e0b, 0x2e0b,
@@ -4201,6 +4310,7 @@ static const OnigCodePoint CR_Po[] = {
 	0x10a50, 0x10a58,
 	0x10a7f, 0x10a7f,
 	0x10b39, 0x10b3f,
+	0x11047, 0x1104d,
 	0x110bb, 0x110bc,
 	0x110be, 0x110c1,
 	0x12470, 0x12473,
@@ -4285,7 +4395,7 @@ static const OnigCodePoint CR_Ps[] = {
 
 /* 'S': Major Category */
 static const OnigCodePoint CR_S[] = {
-	198,
+	208,
 	0x0024, 0x0024,
 	0x002b, 0x002b,
 	0x003c, 0x003e,
@@ -4313,6 +4423,7 @@ static const OnigCodePoint CR_S[] = {
 	0x0606, 0x0608,
 	0x060b, 0x060b,
 	0x060e, 0x060f,
+	0x06de, 0x06de,
 	0x06e9, 0x06e9,
 	0x06fd, 0x06fe,
 	0x07f6, 0x07f6,
@@ -4322,7 +4433,6 @@ static const OnigCodePoint CR_S[] = {
 	0x0b70, 0x0b70,
 	0x0bf3, 0x0bfa,
 	0x0c7f, 0x0c7f,
-	0x0cf1, 0x0cf2,
 	0x0d79, 0x0d79,
 	0x0e3f, 0x0e3f,
 	0x0f01, 0x0f03,
@@ -4340,7 +4450,7 @@ static const OnigCodePoint CR_S[] = {
 	0x1390, 0x1399,
 	0x17db, 0x17db,
 	0x1940, 0x1940,
-	0x19e0, 0x19ff,
+	0x19de, 0x19ff,
 	0x1b61, 0x1b6a,
 	0x1b74, 0x1b7c,
 	0x1fbd, 0x1fbd,
@@ -4353,7 +4463,7 @@ static const OnigCodePoint CR_S[] = {
 	0x2052, 0x2052,
 	0x207a, 0x207c,
 	0x208a, 0x208c,
-	0x20a0, 0x20b8,
+	0x20a0, 0x20b9,
 	0x2100, 0x2101,
 	0x2103, 0x2106,
 	0x2108, 0x2109,
@@ -4369,29 +4479,16 @@ static const OnigCodePoint CR_S[] = {
 	0x214a, 0x214d,
 	0x214f, 0x214f,
 	0x2190, 0x2328,
-	0x232b, 0x23e8,
+	0x232b, 0x23f3,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
 	0x249c, 0x24e9,
-	0x2500, 0x26cd,
-	0x26cf, 0x26e1,
-	0x26e3, 0x26e3,
-	0x26e8, 0x26ff,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x275e,
-	0x2761, 0x2767,
-	0x2794, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27c4,
+	0x2500, 0x26ff,
+	0x2701, 0x2767,
+	0x2794, 0x27c4,
 	0x27c7, 0x27ca,
 	0x27cc, 0x27cc,
-	0x27d0, 0x27e5,
+	0x27ce, 0x27e5,
 	0x27f0, 0x2982,
 	0x2999, 0x29d7,
 	0x29dc, 0x29fb,
@@ -4426,6 +4523,7 @@ static const OnigCodePoint CR_S[] = {
 	0xa836, 0xa839,
 	0xaa77, 0xaa79,
 	0xfb29, 0xfb29,
+	0xfbb2, 0xfbc1,
 	0xfdfc, 0xfdfd,
 	0xfe62, 0xfe62,
 	0xfe64, 0xfe66,
@@ -4467,23 +4565,45 @@ static const OnigCodePoint CR_S[] = {
 	0x1d7c3, 0x1d7c3,
 	0x1f000, 0x1f02b,
 	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
 	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,
+	0x1f130, 0x1f169,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
 	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f5ff,
+	0x1f601, 0x1f610,
+	0x1f612, 0x1f614,
+	0x1f616, 0x1f616,
+	0x1f618, 0x1f618,
+	0x1f61a, 0x1f61a,
+	0x1f61c, 0x1f61e,
+	0x1f620, 0x1f625,
+	0x1f628, 0x1f62b,
+	0x1f62d, 0x1f62d,
+	0x1f630, 0x1f633,
+	0x1f635, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
 }; /* CR_S */
 
 /* 'Sc': General Category */
@@ -4498,7 +4618,7 @@ static const OnigCodePoint CR_Sc[] = {
 	0x0bf9, 0x0bf9,
 	0x0e3f, 0x0e3f,
 	0x17db, 0x17db,
-	0x20a0, 0x20b8,
+	0x20a0, 0x20b9,
 	0xa838, 0xa838,
 	0xfdfc, 0xfdfc,
 	0xfe69, 0xfe69,
@@ -4509,7 +4629,7 @@ static const OnigCodePoint CR_Sc[] = {
 
 /* 'Sk': General Category */
 static const OnigCodePoint CR_Sk[] = {
-	26,
+	27,
 	0x005e, 0x005e,
 	0x0060, 0x0060,
 	0x00a8, 0x00a8,
@@ -4533,6 +4653,7 @@ static const OnigCodePoint CR_Sk[] = {
 	0xa700, 0xa716,
 	0xa720, 0xa721,
 	0xa789, 0xa78a,
+	0xfbb2, 0xfbc1,
 	0xff3e, 0xff3e,
 	0xff40, 0xff40,
 	0xffe3, 0xffe3,
@@ -4540,7 +4661,7 @@ static const OnigCodePoint CR_Sk[] = {
 
 /* 'Sm': General Category */
 static const OnigCodePoint CR_Sm[] = {
-	65,
+	66,
 	0x002b, 0x002b,
 	0x003c, 0x003e,
 	0x007c, 0x007c,
@@ -4555,6 +4676,7 @@ static const OnigCodePoint CR_Sm[] = {
 	0x2052, 0x2052,
 	0x207a, 0x207c,
 	0x208a, 0x208c,
+	0x2118, 0x2118,
 	0x2140, 0x2144,
 	0x214b, 0x214b,
 	0x2190, 0x2194,
@@ -4579,7 +4701,7 @@ static const OnigCodePoint CR_Sm[] = {
 	0x27c0, 0x27c4,
 	0x27c7, 0x27ca,
 	0x27cc, 0x27cc,
-	0x27d0, 0x27e5,
+	0x27ce, 0x27e5,
 	0x27f0, 0x27ff,
 	0x2900, 0x2982,
 	0x2999, 0x29d7,
@@ -4610,7 +4732,7 @@ static const OnigCodePoint CR_Sm[] = {
 
 /* 'So': General Category */
 static const OnigCodePoint CR_So[] = {
-	154,
+	164,
 	0x00a6, 0x00a7,
 	0x00a9, 0x00a9,
 	0x00ae, 0x00ae,
@@ -4618,6 +4740,7 @@ static const OnigCodePoint CR_So[] = {
 	0x00b6, 0x00b6,
 	0x0482, 0x0482,
 	0x060e, 0x060f,
+	0x06de, 0x06de,
 	0x06e9, 0x06e9,
 	0x06fd, 0x06fe,
 	0x07f6, 0x07f6,
@@ -4626,7 +4749,6 @@ static const OnigCodePoint CR_So[] = {
 	0x0bf3, 0x0bf8,
 	0x0bfa, 0x0bfa,
 	0x0c7f, 0x0c7f,
-	0x0cf1, 0x0cf2,
 	0x0d79, 0x0d79,
 	0x0f01, 0x0f03,
 	0x0f13, 0x0f17,
@@ -4642,14 +4764,14 @@ static const OnigCodePoint CR_So[] = {
 	0x1360, 0x1360,
 	0x1390, 0x1399,
 	0x1940, 0x1940,
-	0x19e0, 0x19ff,
+	0x19de, 0x19ff,
 	0x1b61, 0x1b6a,
 	0x1b74, 0x1b7c,
 	0x2100, 0x2101,
 	0x2103, 0x2106,
 	0x2108, 0x2109,
 	0x2114, 0x2114,
-	0x2116, 0x2118,
+	0x2116, 0x2117,
 	0x211e, 0x2123,
 	0x2125, 0x2125,
 	0x2127, 0x2127,
@@ -4674,7 +4796,7 @@ static const OnigCodePoint CR_So[] = {
 	0x232b, 0x237b,
 	0x237d, 0x239a,
 	0x23b4, 0x23db,
-	0x23e2, 0x23e8,
+	0x23e2, 0x23f3,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
 	0x249c, 0x24e9,
@@ -4682,21 +4804,9 @@ static const OnigCodePoint CR_So[] = {
 	0x25b8, 0x25c0,
 	0x25c2, 0x25f7,
 	0x2600, 0x266e,
-	0x2670, 0x26cd,
-	0x26cf, 0x26e1,
-	0x26e3, 0x26e3,
-	0x26e8, 0x26ff,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x275e,
-	0x2761, 0x2767,
-	0x2794, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
+	0x2670, 0x26ff,
+	0x2701, 0x2767,
+	0x2794, 0x27bf,
 	0x2800, 0x28ff,
 	0x2b00, 0x2b2f,
 	0x2b45, 0x2b46,
@@ -4748,23 +4858,45 @@ static const OnigCodePoint CR_So[] = {
 	0x1d300, 0x1d356,
 	0x1f000, 0x1f02b,
 	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
 	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,
+	0x1f130, 0x1f169,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
 	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f5ff,
+	0x1f601, 0x1f610,
+	0x1f612, 0x1f614,
+	0x1f616, 0x1f616,
+	0x1f618, 0x1f618,
+	0x1f61a, 0x1f61a,
+	0x1f61c, 0x1f61e,
+	0x1f620, 0x1f625,
+	0x1f628, 0x1f62b,
+	0x1f62d, 0x1f62d,
+	0x1f630, 0x1f633,
+	0x1f635, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
 }; /* CR_So */
 
 /* 'Z': Major Category */
@@ -4808,7 +4940,7 @@ static const OnigCodePoint CR_Zs[] = {
 
 /* 'Math': Derived Property */
 static const OnigCodePoint CR_Math[] = {
-	105,
+	106,
 	0x002b, 0x002b,
 	0x003c, 0x003e,
 	0x005e, 0x005e,
@@ -4836,9 +4968,10 @@ static const OnigCodePoint CR_Math[] = {
 	0x20e5, 0x20e6,
 	0x20eb, 0x20ef,
 	0x2102, 0x2102,
+	0x2107, 0x2107,
 	0x210a, 0x2113,
 	0x2115, 0x2115,
-	0x2119, 0x211d,
+	0x2118, 0x211d,
 	0x2124, 0x2124,
 	0x2128, 0x2129,
 	0x212c, 0x212d,
@@ -4878,7 +5011,7 @@ static const OnigCodePoint CR_Math[] = {
 	0x266d, 0x266f,
 	0x27c0, 0x27ca,
 	0x27cc, 0x27cc,
-	0x27d0, 0x27ff,
+	0x27ce, 0x27ff,
 	0x2900, 0x2aff,
 	0x2b30, 0x2b44,
 	0x2b47, 0x2b4c,
@@ -4918,7 +5051,7 @@ static const OnigCodePoint CR_Math[] = {
 
 /* 'Alphabetic': Derived Property */
 static const OnigCodePoint CR_Alphabetic[] = {
-	474,
+	486,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -4941,7 +5074,7 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x038e, 0x03a1,
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x0559,
 	0x0561, 0x0587,
@@ -4953,8 +5086,8 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
 	0x0610, 0x061a,
-	0x0621, 0x0657,
-	0x0659, 0x065e,
+	0x0620, 0x0657,
+	0x0659, 0x065f,
 	0x066e, 0x06d3,
 	0x06d5, 0x06dc,
 	0x06e1, 0x06e8,
@@ -4968,13 +5101,12 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x07fa, 0x07fa,
 	0x0800, 0x0817,
 	0x081a, 0x082c,
-	0x0900, 0x0939,
+	0x0840, 0x0858,
+	0x0900, 0x093b,
 	0x093d, 0x094c,
-	0x094e, 0x094e,
-	0x0950, 0x0950,
-	0x0955, 0x0955,
-	0x0958, 0x0963,
-	0x0971, 0x0972,
+	0x094e, 0x0950,
+	0x0955, 0x0963,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
@@ -5071,14 +5203,15 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x0cd5, 0x0cd6,
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce3,
+	0x0cf1, 0x0cf2,
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
 	0x0d4a, 0x0d4c,
+	0x0d4e, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d7a, 0x0d7f,
@@ -5116,8 +5249,7 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x0f40, 0x0f47,
 	0x0f49, 0x0f6c,
 	0x0f71, 0x0f81,
-	0x0f88, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f88, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x1000, 0x1036,
 	0x1038, 0x1038,
@@ -5184,6 +5316,8 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x1b45, 0x1b4b,
 	0x1b80, 0x1ba9,
 	0x1bae, 0x1baf,
+	0x1bc0, 0x1be5,
+	0x1be7, 0x1bf1,
 	0x1c00, 0x1c35,
 	0x1c4d, 0x1c4f,
 	0x1c5a, 0x1c7d,
@@ -5211,7 +5345,7 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x1ff6, 0x1ffc,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x2102, 0x2102,
 	0x2107, 0x2107,
 	0x210a, 0x2113,
@@ -5255,7 +5389,7 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x30fc, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -5264,14 +5398,15 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0xa500, 0xa60c,
 	0xa610, 0xa61f,
 	0xa62a, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa66e,
+	0xa640, 0xa66e,
 	0xa67f, 0xa697,
 	0xa6a0, 0xa6ef,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa801,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa801,
 	0xa803, 0xa805,
 	0xa807, 0xa80a,
 	0xa80c, 0xa827,
@@ -5282,7 +5417,8 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0xa90a, 0xa92a,
 	0xa930, 0xa952,
 	0xa960, 0xa97c,
-	0xa980, 0xa9bf,
+	0xa980, 0xa9b2,
+	0xa9b4, 0xa9bf,
 	0xa9cf, 0xa9cf,
 	0xaa00, 0xaa36,
 	0xaa40, 0xaa4d,
@@ -5292,6 +5428,11 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0xaac0, 0xaac0,
 	0xaac2, 0xaac2,
 	0xaadb, 0xaadd,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabea,
 	0xac00, 0xd7a3,
 	0xd7b0, 0xd7c6,
@@ -5356,10 +5497,13 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11000, 0x11045,
 	0x11082, 0x110b8,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d400, 0x1d454,
 	0x1d456, 0x1d49c,
 	0x1d49e, 0x1d49f,
@@ -5392,12 +5536,13 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x1d7c4, 0x1d7cb,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_Alphabetic */
 
 /* 'Lowercase': Derived Property */
 static const OnigCodePoint CR_Lowercase[] = {
-	602,
+	612,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
 	0x00b5, 0x00b5,
@@ -5667,6 +5812,7 @@ static const OnigCodePoint CR_Lowercase[] = {
 	0x0521, 0x0521,
 	0x0523, 0x0523,
 	0x0525, 0x0525,
+	0x0527, 0x0527,
 	0x0561, 0x0587,
 	0x1d00, 0x1dbf,
 	0x1e01, 0x1e01,
@@ -5904,6 +6050,7 @@ static const OnigCodePoint CR_Lowercase[] = {
 	0xa65b, 0xa65b,
 	0xa65d, 0xa65d,
 	0xa65f, 0xa65f,
+	0xa661, 0xa661,
 	0xa663, 0xa663,
 	0xa665, 0xa665,
 	0xa667, 0xa667,
@@ -5968,6 +6115,14 @@ static const OnigCodePoint CR_Lowercase[] = {
 	0xa785, 0xa785,
 	0xa787, 0xa787,
 	0xa78c, 0xa78c,
+	0xa78e, 0xa78e,
+	0xa791, 0xa791,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
+	0xa7fa, 0xa7fa,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
 	0xff41, 0xff5a,
@@ -6004,7 +6159,7 @@ static const OnigCodePoint CR_Lowercase[] = {
 
 /* 'Uppercase': Derived Property */
 static const OnigCodePoint CR_Uppercase[] = {
-	596,
+	605,
 	0x0041, 0x005a,
 	0x00c0, 0x00d6,
 	0x00d8, 0x00de,
@@ -6270,6 +6425,7 @@ static const OnigCodePoint CR_Uppercase[] = {
 	0x0520, 0x0520,
 	0x0522, 0x0522,
 	0x0524, 0x0524,
+	0x0526, 0x0526,
 	0x0531, 0x0556,
 	0x10a0, 0x10c5,
 	0x1e00, 0x1e00,
@@ -6504,6 +6660,7 @@ static const OnigCodePoint CR_Uppercase[] = {
 	0xa65a, 0xa65a,
 	0xa65c, 0xa65c,
 	0xa65e, 0xa65e,
+	0xa660, 0xa660,
 	0xa662, 0xa662,
 	0xa664, 0xa664,
 	0xa666, 0xa666,
@@ -6568,6 +6725,13 @@ static const OnigCodePoint CR_Uppercase[] = {
 	0xa784, 0xa784,
 	0xa786, 0xa786,
 	0xa78b, 0xa78b,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
 	0xff21, 0xff3a,
 	0x10400, 0x10427,
 	0x1d400, 0x1d419,
@@ -6605,7 +6769,7 @@ static const OnigCodePoint CR_Uppercase[] = {
 
 /* 'Cased': Derived Property */
 static const OnigCodePoint CR_Cased[] = {
-	110,
+	112,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -6629,7 +6793,7 @@ static const OnigCodePoint CR_Cased[] = {
 	0x038e, 0x03a1,
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0561, 0x0587,
 	0x10a0, 0x10c5,
@@ -6676,11 +6840,13 @@ static const OnigCodePoint CR_Cased[] = {
 	0x2c60, 0x2ce4,
 	0x2ceb, 0x2cee,
 	0x2d00, 0x2d25,
-	0xa640, 0xa65f,
-	0xa662, 0xa66d,
+	0xa640, 0xa66d,
 	0xa680, 0xa697,
 	0xa722, 0xa787,
-	0xa78b, 0xa78c,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa7fa,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
 	0xff21, 0xff3a,
@@ -6720,7 +6886,7 @@ static const OnigCodePoint CR_Cased[] = {
 
 /* 'Case_Ignorable': Derived Property */
 static const OnigCodePoint CR_Case_Ignorable[] = {
-	266,
+	277,
 	0x0027, 0x0027,
 	0x002e, 0x002e,
 	0x003a, 0x003a,
@@ -6747,9 +6913,10 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x0600, 0x0603,
 	0x0610, 0x061a,
 	0x0640, 0x0640,
-	0x064b, 0x065e,
+	0x064b, 0x065f,
 	0x0670, 0x0670,
-	0x06d6, 0x06e8,
+	0x06d6, 0x06dd,
+	0x06df, 0x06e8,
 	0x06ea, 0x06ed,
 	0x070f, 0x070f,
 	0x0711, 0x0711,
@@ -6758,11 +6925,13 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x07eb, 0x07f5,
 	0x07fa, 0x07fa,
 	0x0816, 0x082d,
+	0x0859, 0x085b,
 	0x0900, 0x0902,
+	0x093a, 0x093a,
 	0x093c, 0x093c,
 	0x0941, 0x0948,
 	0x094d, 0x094d,
-	0x0951, 0x0955,
+	0x0951, 0x0957,
 	0x0962, 0x0963,
 	0x0971, 0x0971,
 	0x0981, 0x0981,
@@ -6825,7 +6994,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x0f71, 0x0f7e,
 	0x0f80, 0x0f84,
 	0x0f86, 0x0f87,
-	0x0f90, 0x0f97,
+	0x0f8d, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fc6, 0x0fc6,
 	0x102d, 0x1030,
@@ -6840,7 +7009,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x108d, 0x108d,
 	0x109d, 0x109d,
 	0x10fc, 0x10fc,
-	0x135f, 0x135f,
+	0x135d, 0x135f,
 	0x1712, 0x1714,
 	0x1732, 0x1734,
 	0x1752, 0x1753,
@@ -6876,6 +7045,10 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x1b80, 0x1b81,
 	0x1ba2, 0x1ba5,
 	0x1ba8, 0x1ba9,
+	0x1be6, 0x1be6,
+	0x1be8, 0x1be9,
+	0x1bed, 0x1bed,
+	0x1bef, 0x1bf1,
 	0x1c2c, 0x1c33,
 	0x1c36, 0x1c37,
 	0x1c78, 0x1c7d,
@@ -6886,7 +7059,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x1d2c, 0x1d61,
 	0x1d78, 0x1d78,
 	0x1d9b, 0x1de6,
-	0x1dfd, 0x1dff,
+	0x1dfc, 0x1dff,
 	0x1fbd, 0x1fbd,
 	0x1fbf, 0x1fc1,
 	0x1fcd, 0x1fcf,
@@ -6902,11 +7075,12 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x206a, 0x206f,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x20d0, 0x20f0,
 	0x2c7d, 0x2c7d,
 	0x2cef, 0x2cf1,
 	0x2d6f, 0x2d6f,
+	0x2d7f, 0x2d7f,
 	0x2de0, 0x2dff,
 	0x2e2f, 0x2e2f,
 	0x3005, 0x3005,
@@ -6954,6 +7128,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0xabe8, 0xabe8,
 	0xabed, 0xabed,
 	0xfb1e, 0xfb1e,
+	0xfbb2, 0xfbc1,
 	0xfe00, 0xfe0f,
 	0xfe13, 0xfe13,
 	0xfe20, 0xfe26,
@@ -6975,6 +7150,8 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x10a0c, 0x10a0f,
 	0x10a38, 0x10a3a,
 	0x10a3f, 0x10a3f,
+	0x11001, 0x11001,
+	0x11038, 0x11046,
 	0x11080, 0x11081,
 	0x110b3, 0x110b6,
 	0x110b9, 0x110ba,
@@ -6991,7 +7168,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 
 /* 'Changes_When_Lowercased': Derived Property */
 static const OnigCodePoint CR_Changes_When_Lowercased[] = {
-	557,
+	566,
 	0x0041, 0x005a,
 	0x00c0, 0x00d6,
 	0x00d8, 0x00de,
@@ -7256,6 +7433,7 @@ static const OnigCodePoint CR_Changes_When_Lowercased[] = {
 	0x0520, 0x0520,
 	0x0522, 0x0522,
 	0x0524, 0x0524,
+	0x0526, 0x0526,
 	0x0531, 0x0556,
 	0x10a0, 0x10c5,
 	0x1e00, 0x1e00,
@@ -7483,6 +7661,7 @@ static const OnigCodePoint CR_Changes_When_Lowercased[] = {
 	0xa65a, 0xa65a,
 	0xa65c, 0xa65c,
 	0xa65e, 0xa65e,
+	0xa660, 0xa660,
 	0xa662, 0xa662,
 	0xa664, 0xa664,
 	0xa666, 0xa666,
@@ -7547,13 +7726,20 @@ static const OnigCodePoint CR_Changes_When_Lowercased[] = {
 	0xa784, 0xa784,
 	0xa786, 0xa786,
 	0xa78b, 0xa78b,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
 	0xff21, 0xff3a,
 	0x10400, 0x10427,
 }; /* CR_Changes_When_Lowercased */
 
 /* 'Changes_When_Uppercased': Derived Property */
 static const OnigCodePoint CR_Changes_When_Uppercased[] = {
-	573,
+	582,
 	0x0061, 0x007a,
 	0x00b5, 0x00b5,
 	0x00df, 0x00f6,
@@ -7703,6 +7889,7 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
 	0x025b, 0x025b,
 	0x0260, 0x0260,
 	0x0263, 0x0263,
+	0x0265, 0x0265,
 	0x0268, 0x0269,
 	0x026b, 0x026b,
 	0x026f, 0x026f,
@@ -7832,6 +8019,7 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
 	0x0521, 0x0521,
 	0x0523, 0x0523,
 	0x0525, 0x0525,
+	0x0527, 0x0527,
 	0x0561, 0x0587,
 	0x1d79, 0x1d79,
 	0x1d7d, 0x1d7d,
@@ -8059,6 +8247,7 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
 	0xa65b, 0xa65b,
 	0xa65d, 0xa65d,
 	0xa65f, 0xa65f,
+	0xa661, 0xa661,
 	0xa663, 0xa663,
 	0xa665, 0xa665,
 	0xa667, 0xa667,
@@ -8123,6 +8312,12 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
 	0xa785, 0xa785,
 	0xa787, 0xa787,
 	0xa78c, 0xa78c,
+	0xa791, 0xa791,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
 	0xff41, 0xff5a,
@@ -8131,7 +8326,7 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
 
 /* 'Changes_When_Titlecased': Derived Property */
 static const OnigCodePoint CR_Changes_When_Titlecased[] = {
-	574,
+	583,
 	0x0061, 0x007a,
 	0x00b5, 0x00b5,
 	0x00df, 0x00f6,
@@ -8282,6 +8477,7 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
 	0x025b, 0x025b,
 	0x0260, 0x0260,
 	0x0263, 0x0263,
+	0x0265, 0x0265,
 	0x0268, 0x0269,
 	0x026b, 0x026b,
 	0x026f, 0x026f,
@@ -8411,6 +8607,7 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
 	0x0521, 0x0521,
 	0x0523, 0x0523,
 	0x0525, 0x0525,
+	0x0527, 0x0527,
 	0x0561, 0x0587,
 	0x1d79, 0x1d79,
 	0x1d7d, 0x1d7d,
@@ -8638,6 +8835,7 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
 	0xa65b, 0xa65b,
 	0xa65d, 0xa65d,
 	0xa65f, 0xa65f,
+	0xa661, 0xa661,
 	0xa663, 0xa663,
 	0xa665, 0xa665,
 	0xa667, 0xa667,
@@ -8702,6 +8900,12 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
 	0xa785, 0xa785,
 	0xa787, 0xa787,
 	0xa78c, 0xa78c,
+	0xa791, 0xa791,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
 	0xff41, 0xff5a,
@@ -8710,7 +8914,7 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
 
 /* 'Changes_When_Casefolded': Derived Property */
 static const OnigCodePoint CR_Changes_When_Casefolded[] = {
-	568,
+	577,
 	0x0041, 0x005a,
 	0x00b5, 0x00b5,
 	0x00c0, 0x00d6,
@@ -8981,6 +9185,7 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
 	0x0520, 0x0520,
 	0x0522, 0x0522,
 	0x0524, 0x0524,
+	0x0526, 0x0526,
 	0x0531, 0x0556,
 	0x0587, 0x0587,
 	0x10a0, 0x10c5,
@@ -9211,6 +9416,7 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
 	0xa65a, 0xa65a,
 	0xa65c, 0xa65c,
 	0xa65e, 0xa65e,
+	0xa660, 0xa660,
 	0xa662, 0xa662,
 	0xa664, 0xa664,
 	0xa666, 0xa666,
@@ -9275,6 +9481,13 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
 	0xa784, 0xa784,
 	0xa786, 0xa786,
 	0xa78b, 0xa78b,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
 	0xff21, 0xff3a,
@@ -9283,7 +9496,7 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
 
 /* 'Changes_When_Casemapped': Derived Property */
 static const OnigCodePoint CR_Changes_When_Casemapped[] = {
-	97,
+	99,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00b5, 0x00b5,
@@ -9304,6 +9517,7 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
 	0x025b, 0x025b,
 	0x0260, 0x0260,
 	0x0263, 0x0263,
+	0x0265, 0x0265,
 	0x0268, 0x0269,
 	0x026b, 0x026b,
 	0x026f, 0x026f,
@@ -9327,7 +9541,7 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
 	0x03f4, 0x03f5,
 	0x03f7, 0x03fb,
 	0x03fd, 0x0481,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0561, 0x0587,
 	0x10a0, 0x10c5,
@@ -9369,13 +9583,14 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
 	0x2c7e, 0x2ce3,
 	0x2ceb, 0x2cee,
 	0x2d00, 0x2d25,
-	0xa640, 0xa65f,
-	0xa662, 0xa66d,
+	0xa640, 0xa66d,
 	0xa680, 0xa697,
 	0xa722, 0xa72f,
 	0xa732, 0xa76f,
 	0xa779, 0xa787,
-	0xa78b, 0xa78c,
+	0xa78b, 0xa78d,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
 	0xff21, 0xff3a,
@@ -9385,7 +9600,7 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
 
 /* 'ID_Start': Derived Property */
 static const OnigCodePoint CR_ID_Start[] = {
-	424,
+	437,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -9407,13 +9622,13 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x038e, 0x03a1,
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x0559,
 	0x0561, 0x0587,
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
-	0x0621, 0x064a,
+	0x0620, 0x064a,
 	0x066e, 0x066f,
 	0x0671, 0x06d3,
 	0x06d5, 0x06d5,
@@ -9432,11 +9647,12 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x081a, 0x081a,
 	0x0824, 0x0824,
 	0x0828, 0x0828,
+	0x0840, 0x0858,
 	0x0904, 0x0939,
 	0x093d, 0x093d,
 	0x0950, 0x0950,
 	0x0958, 0x0961,
-	0x0971, 0x0972,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0x0985, 0x098c,
 	0x098f, 0x0990,
@@ -9505,11 +9721,12 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x0cbd, 0x0cbd,
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce1,
+	0x0cf1, 0x0cf2,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
 	0x0d60, 0x0d61,
 	0x0d7a, 0x0d7f,
 	0x0d85, 0x0d96,
@@ -9540,7 +9757,7 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x0f00, 0x0f00,
 	0x0f40, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8b,
+	0x0f88, 0x0f8c,
 	0x1000, 0x102a,
 	0x103f, 0x103f,
 	0x1050, 0x1055,
@@ -9601,6 +9818,7 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x1b45, 0x1b4b,
 	0x1b83, 0x1ba0,
 	0x1bae, 0x1baf,
+	0x1bc0, 0x1be5,
 	0x1c00, 0x1c23,
 	0x1c4d, 0x1c4f,
 	0x1c5a, 0x1c7d,
@@ -9628,7 +9846,7 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x1ff6, 0x1ffc,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x2102, 0x2102,
 	0x2107, 0x2107,
 	0x210a, 0x2113,
@@ -9668,7 +9886,7 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x30fc, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -9677,14 +9895,15 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0xa500, 0xa60c,
 	0xa610, 0xa61f,
 	0xa62a, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa66e,
+	0xa640, 0xa66e,
 	0xa67f, 0xa697,
 	0xa6a0, 0xa6ef,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa801,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa801,
 	0xa803, 0xa805,
 	0xa807, 0xa80a,
 	0xa80c, 0xa822,
@@ -9709,6 +9928,11 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0xaac0, 0xaac0,
 	0xaac2, 0xaac2,
 	0xaadb, 0xaadd,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabe2,
 	0xac00, 0xd7a3,
 	0xd7b0, 0xd7c6,
@@ -9773,10 +9997,13 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11003, 0x11037,
 	0x11083, 0x110af,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d400, 0x1d454,
 	0x1d456, 0x1d49c,
 	0x1d49e, 0x1d49f,
@@ -9809,12 +10036,13 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x1d7c4, 0x1d7cb,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_ID_Start */
 
 /* 'ID_Continue': Derived Property */
 static const OnigCodePoint CR_ID_Continue[] = {
-	506,
+	514,
 	0x0030, 0x0039,
 	0x0041, 0x005a,
 	0x005f, 0x005f,
@@ -9839,7 +10067,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
 	0x0483, 0x0487,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x0559,
 	0x0561, 0x0587,
@@ -9851,8 +10079,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
 	0x0610, 0x061a,
-	0x0621, 0x065e,
-	0x0660, 0x0669,
+	0x0620, 0x0669,
 	0x066e, 0x06d3,
 	0x06d5, 0x06dc,
 	0x06df, 0x06e8,
@@ -9863,12 +10090,10 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x07c0, 0x07f5,
 	0x07fa, 0x07fa,
 	0x0800, 0x082d,
-	0x0900, 0x0939,
-	0x093c, 0x094e,
-	0x0950, 0x0955,
-	0x0958, 0x0963,
+	0x0840, 0x085b,
+	0x0900, 0x0963,
 	0x0966, 0x096f,
-	0x0971, 0x0972,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
@@ -9970,14 +10195,14 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
+	0x0d4a, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d66, 0x0d6f,
@@ -10023,8 +10248,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x0f3e, 0x0f47,
 	0x0f49, 0x0f6c,
 	0x0f71, 0x0f84,
-	0x0f86, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f86, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fc6, 0x0fc6,
 	0x1000, 0x1049,
@@ -10048,7 +10272,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x12d8, 0x1310,
 	0x1312, 0x1315,
 	0x1318, 0x135a,
-	0x135f, 0x135f,
+	0x135d, 0x135f,
 	0x1369, 0x1371,
 	0x1380, 0x138f,
 	0x13a0, 0x13f4,
@@ -10093,13 +10317,14 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x1b6b, 0x1b73,
 	0x1b80, 0x1baa,
 	0x1bae, 0x1bb9,
+	0x1bc0, 0x1bf3,
 	0x1c00, 0x1c37,
 	0x1c40, 0x1c49,
 	0x1c4d, 0x1c7d,
 	0x1cd0, 0x1cd2,
 	0x1cd4, 0x1cf2,
 	0x1d00, 0x1de6,
-	0x1dfd, 0x1f15,
+	0x1dfc, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
 	0x1f48, 0x1f4d,
@@ -10122,7 +10347,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x2054, 0x2054,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x20d0, 0x20dc,
 	0x20e1, 0x20e1,
 	0x20e5, 0x20f0,
@@ -10146,7 +10371,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x2d00, 0x2d25,
 	0x2d30, 0x2d65,
 	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
+	0x2d7f, 0x2d96,
 	0x2da0, 0x2da6,
 	0x2da8, 0x2dae,
 	0x2db0, 0x2db6,
@@ -10166,7 +10391,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x30fc, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -10174,15 +10399,16 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0xa4d0, 0xa4fd,
 	0xa500, 0xa60c,
 	0xa610, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa66f,
+	0xa640, 0xa66f,
 	0xa67c, 0xa67d,
 	0xa67f, 0xa697,
 	0xa6a0, 0xa6f1,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa827,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa827,
 	0xa840, 0xa873,
 	0xa880, 0xa8c4,
 	0xa8d0, 0xa8d9,
@@ -10200,6 +10426,11 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0xaa7a, 0xaa7b,
 	0xaa80, 0xaac2,
 	0xaadb, 0xaadd,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabea,
 	0xabec, 0xabed,
 	0xabf0, 0xabf9,
@@ -10276,10 +10507,14 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11000, 0x11046,
+	0x11066, 0x1106f,
 	0x11080, 0x110ba,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d165, 0x1d169,
 	0x1d16d, 0x1d172,
 	0x1d17b, 0x1d182,
@@ -10319,13 +10554,14 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x1d7ce, 0x1d7ff,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 	0xe0100, 0xe01ef,
 }; /* CR_ID_Continue */
 
 /* 'XID_Start': Derived Property */
 static const OnigCodePoint CR_XID_Start[] = {
-	431,
+	444,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -10347,13 +10583,13 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x038e, 0x03a1,
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x0559,
 	0x0561, 0x0587,
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
-	0x0621, 0x064a,
+	0x0620, 0x064a,
 	0x066e, 0x066f,
 	0x0671, 0x06d3,
 	0x06d5, 0x06d5,
@@ -10372,11 +10608,12 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x081a, 0x081a,
 	0x0824, 0x0824,
 	0x0828, 0x0828,
+	0x0840, 0x0858,
 	0x0904, 0x0939,
 	0x093d, 0x093d,
 	0x0950, 0x0950,
 	0x0958, 0x0961,
-	0x0971, 0x0972,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0x0985, 0x098c,
 	0x098f, 0x0990,
@@ -10445,11 +10682,12 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x0cbd, 0x0cbd,
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce1,
+	0x0cf1, 0x0cf2,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
 	0x0d60, 0x0d61,
 	0x0d7a, 0x0d7f,
 	0x0d85, 0x0d96,
@@ -10480,7 +10718,7 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x0f00, 0x0f00,
 	0x0f40, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8b,
+	0x0f88, 0x0f8c,
 	0x1000, 0x102a,
 	0x103f, 0x103f,
 	0x1050, 0x1055,
@@ -10541,6 +10779,7 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x1b45, 0x1b4b,
 	0x1b83, 0x1ba0,
 	0x1bae, 0x1baf,
+	0x1bc0, 0x1be5,
 	0x1c00, 0x1c23,
 	0x1c4d, 0x1c4f,
 	0x1c5a, 0x1c7d,
@@ -10568,7 +10807,7 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x1ff6, 0x1ffc,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x2102, 0x2102,
 	0x2107, 0x2107,
 	0x210a, 0x2113,
@@ -10608,7 +10847,7 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x30fc, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -10617,14 +10856,15 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0xa500, 0xa60c,
 	0xa610, 0xa61f,
 	0xa62a, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa66e,
+	0xa640, 0xa66e,
 	0xa67f, 0xa697,
 	0xa6a0, 0xa6ef,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa801,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa801,
 	0xa803, 0xa805,
 	0xa807, 0xa80a,
 	0xa80c, 0xa822,
@@ -10649,6 +10889,11 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0xaac0, 0xaac0,
 	0xaac2, 0xaac2,
 	0xaadb, 0xaadd,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabe2,
 	0xac00, 0xd7a3,
 	0xd7b0, 0xd7c6,
@@ -10720,10 +10965,13 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11003, 0x11037,
 	0x11083, 0x110af,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d400, 0x1d454,
 	0x1d456, 0x1d49c,
 	0x1d49e, 0x1d49f,
@@ -10756,12 +11004,13 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x1d7c4, 0x1d7cb,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_XID_Start */
 
 /* 'XID_Continue': Derived Property */
 static const OnigCodePoint CR_XID_Continue[] = {
-	513,
+	521,
 	0x0030, 0x0039,
 	0x0041, 0x005a,
 	0x005f, 0x005f,
@@ -10786,7 +11035,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
 	0x0483, 0x0487,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x0559,
 	0x0561, 0x0587,
@@ -10798,8 +11047,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
 	0x0610, 0x061a,
-	0x0621, 0x065e,
-	0x0660, 0x0669,
+	0x0620, 0x0669,
 	0x066e, 0x06d3,
 	0x06d5, 0x06dc,
 	0x06df, 0x06e8,
@@ -10810,12 +11058,10 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x07c0, 0x07f5,
 	0x07fa, 0x07fa,
 	0x0800, 0x082d,
-	0x0900, 0x0939,
-	0x093c, 0x094e,
-	0x0950, 0x0955,
-	0x0958, 0x0963,
+	0x0840, 0x085b,
+	0x0900, 0x0963,
 	0x0966, 0x096f,
-	0x0971, 0x0972,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
@@ -10917,14 +11163,14 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
+	0x0d4a, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d66, 0x0d6f,
@@ -10970,8 +11216,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x0f3e, 0x0f47,
 	0x0f49, 0x0f6c,
 	0x0f71, 0x0f84,
-	0x0f86, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f86, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fc6, 0x0fc6,
 	0x1000, 0x1049,
@@ -10995,7 +11240,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x12d8, 0x1310,
 	0x1312, 0x1315,
 	0x1318, 0x135a,
-	0x135f, 0x135f,
+	0x135d, 0x135f,
 	0x1369, 0x1371,
 	0x1380, 0x138f,
 	0x13a0, 0x13f4,
@@ -11040,13 +11285,14 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x1b6b, 0x1b73,
 	0x1b80, 0x1baa,
 	0x1bae, 0x1bb9,
+	0x1bc0, 0x1bf3,
 	0x1c00, 0x1c37,
 	0x1c40, 0x1c49,
 	0x1c4d, 0x1c7d,
 	0x1cd0, 0x1cd2,
 	0x1cd4, 0x1cf2,
 	0x1d00, 0x1de6,
-	0x1dfd, 0x1f15,
+	0x1dfc, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
 	0x1f48, 0x1f4d,
@@ -11069,7 +11315,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x2054, 0x2054,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x20d0, 0x20dc,
 	0x20e1, 0x20e1,
 	0x20e5, 0x20f0,
@@ -11093,7 +11339,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x2d00, 0x2d25,
 	0x2d30, 0x2d65,
 	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
+	0x2d7f, 0x2d96,
 	0x2da0, 0x2da6,
 	0x2da8, 0x2dae,
 	0x2db0, 0x2db6,
@@ -11114,7 +11360,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x30fc, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -11122,15 +11368,16 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0xa4d0, 0xa4fd,
 	0xa500, 0xa60c,
 	0xa610, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa66f,
+	0xa640, 0xa66f,
 	0xa67c, 0xa67d,
 	0xa67f, 0xa697,
 	0xa6a0, 0xa6f1,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa827,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa827,
 	0xa840, 0xa873,
 	0xa880, 0xa8c4,
 	0xa8d0, 0xa8d9,
@@ -11148,6 +11395,11 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0xaa7a, 0xaa7b,
 	0xaa80, 0xaac2,
 	0xaadb, 0xaadd,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabea,
 	0xabec, 0xabed,
 	0xabf0, 0xabf9,
@@ -11230,10 +11482,14 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11000, 0x11046,
+	0x11066, 0x1106f,
 	0x11080, 0x110ba,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d165, 0x1d169,
 	0x1d16d, 0x1d172,
 	0x1d17b, 0x1d182,
@@ -11273,6 +11529,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x1d7ce, 0x1d7ff,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 	0xe0100, 0xe01ef,
 }; /* CR_XID_Continue */
@@ -11299,7 +11556,7 @@ static const OnigCodePoint CR_Default_Ignorable_Code_Point[] = {
 
 /* 'Grapheme_Extend': Derived Property */
 static const OnigCodePoint CR_Grapheme_Extend[] = {
-	206,
+	215,
 	0x0300, 0x036f,
 	0x0483, 0x0489,
 	0x0591, 0x05bd,
@@ -11308,10 +11565,10 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x05c4, 0x05c5,
 	0x05c7, 0x05c7,
 	0x0610, 0x061a,
-	0x064b, 0x065e,
+	0x064b, 0x065f,
 	0x0670, 0x0670,
 	0x06d6, 0x06dc,
-	0x06de, 0x06e4,
+	0x06df, 0x06e4,
 	0x06e7, 0x06e8,
 	0x06ea, 0x06ed,
 	0x0711, 0x0711,
@@ -11322,11 +11579,13 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x081b, 0x0823,
 	0x0825, 0x0827,
 	0x0829, 0x082d,
+	0x0859, 0x085b,
 	0x0900, 0x0902,
+	0x093a, 0x093a,
 	0x093c, 0x093c,
 	0x0941, 0x0948,
 	0x094d, 0x094d,
-	0x0951, 0x0955,
+	0x0951, 0x0957,
 	0x0962, 0x0963,
 	0x0981, 0x0981,
 	0x09bc, 0x09bc,
@@ -11397,7 +11656,7 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x0f71, 0x0f7e,
 	0x0f80, 0x0f84,
 	0x0f86, 0x0f87,
-	0x0f90, 0x0f97,
+	0x0f8d, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fc6, 0x0fc6,
 	0x102d, 0x1030,
@@ -11411,7 +11670,7 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x1085, 0x1086,
 	0x108d, 0x108d,
 	0x109d, 0x109d,
-	0x135f, 0x135f,
+	0x135d, 0x135f,
 	0x1712, 0x1714,
 	0x1732, 0x1734,
 	0x1752, 0x1753,
@@ -11443,6 +11702,10 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x1b80, 0x1b81,
 	0x1ba2, 0x1ba5,
 	0x1ba8, 0x1ba9,
+	0x1be6, 0x1be6,
+	0x1be8, 0x1be9,
+	0x1bed, 0x1bed,
+	0x1bef, 0x1bf1,
 	0x1c2c, 0x1c33,
 	0x1c36, 0x1c37,
 	0x1cd0, 0x1cd2,
@@ -11450,10 +11713,11 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x1ce2, 0x1ce8,
 	0x1ced, 0x1ced,
 	0x1dc0, 0x1de6,
-	0x1dfd, 0x1dff,
+	0x1dfc, 0x1dff,
 	0x200c, 0x200d,
 	0x20d0, 0x20f0,
 	0x2cef, 0x2cf1,
+	0x2d7f, 0x2d7f,
 	0x2de0, 0x2dff,
 	0x302a, 0x302f,
 	0x3099, 0x309a,
@@ -11495,6 +11759,8 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x10a0c, 0x10a0f,
 	0x10a38, 0x10a3a,
 	0x10a3f, 0x10a3f,
+	0x11001, 0x11001,
+	0x11038, 0x11046,
 	0x11080, 0x11081,
 	0x110b3, 0x110b6,
 	0x110b9, 0x110ba,
@@ -11510,7 +11776,7 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 
 /* 'Grapheme_Base': Derived Property */
 static const OnigCodePoint CR_Grapheme_Base[] = {
-	567,
+	596,
 	0x0020, 0x007e,
 	0x00a0, 0x00ac,
 	0x00ae, 0x02ff,
@@ -11520,7 +11786,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x038c, 0x038c,
 	0x038e, 0x03a1,
 	0x03a3, 0x0482,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x055f,
 	0x0561, 0x0587,
@@ -11533,10 +11799,10 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x05f0, 0x05f4,
 	0x0606, 0x060f,
 	0x061b, 0x061b,
-	0x061e, 0x061f,
-	0x0621, 0x064a,
+	0x061e, 0x064a,
 	0x0660, 0x066f,
 	0x0671, 0x06d5,
+	0x06de, 0x06de,
 	0x06e5, 0x06e6,
 	0x06e9, 0x06e9,
 	0x06ee, 0x070d,
@@ -11551,13 +11817,15 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x0824, 0x0824,
 	0x0828, 0x0828,
 	0x0830, 0x083e,
+	0x0840, 0x0858,
+	0x085e, 0x085e,
 	0x0903, 0x0939,
+	0x093b, 0x093b,
 	0x093d, 0x0940,
 	0x0949, 0x094c,
-	0x094e, 0x094e,
-	0x0950, 0x0950,
+	0x094e, 0x0950,
 	0x0958, 0x0961,
-	0x0964, 0x0972,
+	0x0964, 0x0977,
 	0x0979, 0x097f,
 	0x0982, 0x0983,
 	0x0985, 0x098c,
@@ -11614,7 +11882,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x0b4b, 0x0b4c,
 	0x0b5c, 0x0b5d,
 	0x0b5f, 0x0b61,
-	0x0b66, 0x0b71,
+	0x0b66, 0x0b77,
 	0x0b83, 0x0b83,
 	0x0b85, 0x0b8a,
 	0x0b8e, 0x0b90,
@@ -11661,12 +11929,12 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d3d,
 	0x0d3f, 0x0d40,
 	0x0d46, 0x0d48,
 	0x0d4a, 0x0d4c,
+	0x0d4e, 0x0d4e,
 	0x0d60, 0x0d61,
 	0x0d66, 0x0d75,
 	0x0d79, 0x0d7f,
@@ -11709,10 +11977,10 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x0f49, 0x0f6c,
 	0x0f7f, 0x0f7f,
 	0x0f85, 0x0f85,
-	0x0f88, 0x0f8b,
+	0x0f88, 0x0f8c,
 	0x0fbe, 0x0fc5,
 	0x0fc7, 0x0fcc,
-	0x0fce, 0x0fd8,
+	0x0fce, 0x0fda,
 	0x1000, 0x102c,
 	0x1031, 0x1031,
 	0x1038, 0x1038,
@@ -11800,7 +12068,12 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x1ba6, 0x1ba7,
 	0x1baa, 0x1baa,
 	0x1bae, 0x1bb9,
-	0x1c00, 0x1c2b,
+	0x1bc0, 0x1be5,
+	0x1be7, 0x1be7,
+	0x1bea, 0x1bec,
+	0x1bee, 0x1bee,
+	0x1bf2, 0x1bf3,
+	0x1bfc, 0x1c2b,
 	0x1c34, 0x1c35,
 	0x1c3b, 0x1c49,
 	0x1c4d, 0x1c7f,
@@ -11830,36 +12103,23 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x202f, 0x205f,
 	0x2070, 0x2071,
 	0x2074, 0x208e,
-	0x2090, 0x2094,
-	0x20a0, 0x20b8,
+	0x2090, 0x209c,
+	0x20a0, 0x20b9,
 	0x2100, 0x2189,
-	0x2190, 0x23e8,
+	0x2190, 0x23f3,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
-	0x2460, 0x26cd,
-	0x26cf, 0x26e1,
-	0x26e3, 0x26e3,
-	0x26e8, 0x26ff,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
+	0x2460, 0x26ff,
+	0x2701, 0x27ca,
 	0x27cc, 0x27cc,
-	0x27d0, 0x2b4c,
+	0x27ce, 0x2b4c,
 	0x2b50, 0x2b59,
 	0x2c00, 0x2c2e,
 	0x2c30, 0x2c5e,
 	0x2c60, 0x2cee,
 	0x2cf9, 0x2d25,
 	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
+	0x2d6f, 0x2d70,
 	0x2d80, 0x2d96,
 	0x2da0, 0x2da6,
 	0x2da8, 0x2dae,
@@ -11880,7 +12140,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x309b, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x3190, 0x31b7,
+	0x3190, 0x31ba,
 	0x31c0, 0x31e3,
 	0x31f0, 0x321e,
 	0x3220, 0x32fe,
@@ -11889,14 +12149,15 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
 	0xa4d0, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa66e,
+	0xa640, 0xa66e,
 	0xa673, 0xa673,
 	0xa67e, 0xa697,
 	0xa6a0, 0xa6ef,
 	0xa6f2, 0xa6f7,
-	0xa700, 0xa78c,
-	0xa7fb, 0xa801,
+	0xa700, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa801,
 	0xa803, 0xa805,
 	0xa807, 0xa80a,
 	0xa80c, 0xa824,
@@ -11931,6 +12192,11 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0xaac0, 0xaac0,
 	0xaac2, 0xaac2,
 	0xaadb, 0xaadf,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabe4,
 	0xabe6, 0xabe7,
 	0xabe9, 0xabec,
@@ -11949,7 +12215,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0xfb3e, 0xfb3e,
 	0xfb40, 0xfb41,
 	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
+	0xfb46, 0xfbc1,
 	0xfbd3, 0xfd3f,
 	0xfd50, 0xfd8f,
 	0xfd92, 0xfdc7,
@@ -12014,6 +12280,10 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x10b78, 0x10b7f,
 	0x10c00, 0x10c48,
 	0x10e60, 0x10e7e,
+	0x11000, 0x11000,
+	0x11002, 0x11037,
+	0x11047, 0x1104d,
+	0x11052, 0x1106f,
 	0x11082, 0x110b2,
 	0x110b7, 0x110b8,
 	0x110bb, 0x110bc,
@@ -12022,6 +12292,8 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x12400, 0x12462,
 	0x12470, 0x12473,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d000, 0x1d0f5,
 	0x1d100, 0x1d126,
 	0x1d129, 0x1d164,
@@ -12057,32 +12329,55 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x1d7ce, 0x1d7ff,
 	0x1f000, 0x1f02b,
 	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
 	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,
+	0x1f130, 0x1f169,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
 	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f5ff,
+	0x1f601, 0x1f610,
+	0x1f612, 0x1f614,
+	0x1f616, 0x1f616,
+	0x1f618, 0x1f618,
+	0x1f61a, 0x1f61a,
+	0x1f61c, 0x1f61e,
+	0x1f620, 0x1f625,
+	0x1f628, 0x1f62b,
+	0x1f62d, 0x1f62d,
+	0x1f630, 0x1f633,
+	0x1f635, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_Grapheme_Base */
 
 /* 'Grapheme_Link': Derived Property */
 static const OnigCodePoint CR_Grapheme_Link[] = {
-	26,
+	29,
 	0x094d, 0x094d,
 	0x09cd, 0x09cd,
 	0x0a4d, 0x0a4d,
@@ -12102,18 +12397,21 @@ static const OnigCodePoint CR_Grapheme_Link[] = {
 	0x1a60, 0x1a60,
 	0x1b44, 0x1b44,
 	0x1baa, 0x1baa,
+	0x1bf2, 0x1bf3,
+	0x2d7f, 0x2d7f,
 	0xa806, 0xa806,
 	0xa8c4, 0xa8c4,
 	0xa953, 0xa953,
 	0xa9c0, 0xa9c0,
 	0xabed, 0xabed,
 	0x10a3f, 0x10a3f,
+	0x11046, 0x11046,
 	0x110b9, 0x110b9,
 }; /* CR_Grapheme_Link */
 
 /* 'Common': Script */
 static const OnigCodePoint CR_Common[] = {
-	159,
+	169,
 	0x0000, 0x0040,
 	0x005b, 0x0060,
 	0x007b, 0x00a9,
@@ -12122,13 +12420,13 @@ static const OnigCodePoint CR_Common[] = {
 	0x00d7, 0x00d7,
 	0x00f7, 0x00f7,
 	0x02b9, 0x02df,
-	0x02e5, 0x02ff,
+	0x02e5, 0x02e9,
+	0x02ec, 0x02ff,
 	0x0374, 0x0374,
 	0x037e, 0x037e,
 	0x0385, 0x0385,
 	0x0387, 0x0387,
 	0x0589, 0x0589,
-	0x0600, 0x0603,
 	0x060c, 0x060c,
 	0x061b, 0x061b,
 	0x061f, 0x061f,
@@ -12137,7 +12435,6 @@ static const OnigCodePoint CR_Common[] = {
 	0x06dd, 0x06dd,
 	0x0964, 0x0965,
 	0x0970, 0x0970,
-	0x0cf1, 0x0cf2,
 	0x0e3f, 0x0e3f,
 	0x0fd5, 0x0fd8,
 	0x10fb, 0x10fb,
@@ -12154,33 +12451,20 @@ static const OnigCodePoint CR_Common[] = {
 	0x206a, 0x2070,
 	0x2074, 0x207e,
 	0x2080, 0x208e,
-	0x20a0, 0x20b8,
+	0x20a0, 0x20b9,
 	0x2100, 0x2125,
 	0x2127, 0x2129,
 	0x212c, 0x2131,
 	0x2133, 0x214d,
 	0x214f, 0x215f,
 	0x2189, 0x2189,
-	0x2190, 0x23e8,
+	0x2190, 0x23f3,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
-	0x2460, 0x26cd,
-	0x26cf, 0x26e1,
-	0x26e3, 0x26e3,
-	0x26e8, 0x26ff,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
+	0x2460, 0x26ff,
+	0x2701, 0x27ca,
 	0x27cc, 0x27cc,
-	0x27d0, 0x27ff,
+	0x27ce, 0x27ff,
 	0x2900, 0x2b4c,
 	0x2b50, 0x2b59,
 	0x2e00, 0x2e31,
@@ -12254,30 +12538,54 @@ static const OnigCodePoint CR_Common[] = {
 	0x1d7ce, 0x1d7ff,
 	0x1f000, 0x1f02b,
 	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
 	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,
+	0x1f130, 0x1f169,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f1ff,
+	0x1f201, 0x1f202,
+	0x1f210, 0x1f23a,
 	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f5ff,
+	0x1f601, 0x1f610,
+	0x1f612, 0x1f614,
+	0x1f616, 0x1f616,
+	0x1f618, 0x1f618,
+	0x1f61a, 0x1f61a,
+	0x1f61c, 0x1f61e,
+	0x1f620, 0x1f625,
+	0x1f628, 0x1f62b,
+	0x1f62d, 0x1f62d,
+	0x1f630, 0x1f633,
+	0x1f635, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
 	0xe0001, 0xe0001,
 	0xe0020, 0xe007f,
 }; /* CR_Common */
 
 /* 'Latin': Script */
 static const OnigCodePoint CR_Latin[] = {
-	28,
+	30,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -12294,15 +12602,17 @@ static const OnigCodePoint CR_Latin[] = {
 	0x1e00, 0x1eff,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x212a, 0x212b,
 	0x2132, 0x2132,
 	0x214e, 0x214e,
 	0x2160, 0x2188,
 	0x2c60, 0x2c7f,
 	0xa722, 0xa787,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa7ff,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa7ff,
 	0xfb00, 0xfb06,
 	0xff21, 0xff3a,
 	0xff41, 0xff5a,
@@ -12348,14 +12658,13 @@ static const OnigCodePoint CR_Greek[] = {
 
 /* 'Cyrillic': Script */
 static const OnigCodePoint CR_Cyrillic[] = {
-	8,
+	7,
 	0x0400, 0x0484,
-	0x0487, 0x0525,
+	0x0487, 0x0527,
 	0x1d2b, 0x1d2b,
 	0x1d78, 0x1d78,
 	0x2de0, 0x2dff,
-	0xa640, 0xa65f,
-	0xa662, 0xa673,
+	0xa640, 0xa673,
 	0xa67c, 0xa697,
 }; /* CR_Cyrillic */
 
@@ -12385,18 +12694,19 @@ static const OnigCodePoint CR_Hebrew[] = {
 
 /* 'Arabic': Script */
 static const OnigCodePoint CR_Arabic[] = {
-	18,
+	19,
+	0x0600, 0x0603,
 	0x0606, 0x060b,
 	0x060d, 0x061a,
 	0x061e, 0x061e,
-	0x0621, 0x063f,
+	0x0620, 0x063f,
 	0x0641, 0x064a,
 	0x0656, 0x065e,
 	0x066a, 0x066f,
 	0x0671, 0x06dc,
 	0x06de, 0x06ff,
 	0x0750, 0x077f,
-	0xfb50, 0xfbb1,
+	0xfb50, 0xfbc1,
 	0xfbd3, 0xfd3d,
 	0xfd50, 0xfd8f,
 	0xfd92, 0xfdc7,
@@ -12422,14 +12732,11 @@ static const OnigCodePoint CR_Thaana[] = {
 
 /* 'Devanagari': Script */
 static const OnigCodePoint CR_Devanagari[] = {
-	9,
-	0x0900, 0x0939,
-	0x093c, 0x094e,
-	0x0950, 0x0950,
-	0x0953, 0x0955,
-	0x0958, 0x0963,
+	6,
+	0x0900, 0x0950,
+	0x0953, 0x0963,
 	0x0966, 0x096f,
-	0x0971, 0x0972,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0xa8e0, 0xa8fb,
 }; /* CR_Devanagari */
@@ -12509,7 +12816,7 @@ static const OnigCodePoint CR_Oriya[] = {
 	0x0b56, 0x0b57,
 	0x0b5c, 0x0b5d,
 	0x0b5f, 0x0b63,
-	0x0b66, 0x0b71,
+	0x0b66, 0x0b77,
 }; /* CR_Oriya */
 
 /* 'Tamil': Script */
@@ -12554,7 +12861,7 @@ static const OnigCodePoint CR_Telugu[] = {
 
 /* 'Kannada': Script */
 static const OnigCodePoint CR_Kannada[] = {
-	13,
+	14,
 	0x0c82, 0x0c83,
 	0x0c85, 0x0c8c,
 	0x0c8e, 0x0c90,
@@ -12568,19 +12875,19 @@ static const OnigCodePoint CR_Kannada[] = {
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
 }; /* CR_Kannada */
 
 /* 'Malayalam': Script */
 static const OnigCodePoint CR_Malayalam[] = {
-	12,
+	11,
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
+	0x0d4a, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d66, 0x0d75,
@@ -12638,11 +12945,11 @@ static const OnigCodePoint CR_Tibetan[] = {
 	7,
 	0x0f00, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f71, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fbe, 0x0fcc,
 	0x0fce, 0x0fd4,
+	0x0fd9, 0x0fda,
 }; /* CR_Tibetan */
 
 /* 'Myanmar': Script */
@@ -12663,8 +12970,9 @@ static const OnigCodePoint CR_Georgian[] = {
 
 /* 'Hangul': Script */
 static const OnigCodePoint CR_Hangul[] = {
-	13,
+	14,
 	0x1100, 0x11ff,
+	0x302e, 0x302f,
 	0x3131, 0x318e,
 	0x3200, 0x321e,
 	0x3260, 0x327e,
@@ -12681,7 +12989,7 @@ static const OnigCodePoint CR_Hangul[] = {
 
 /* 'Ethiopic': Script */
 static const OnigCodePoint CR_Ethiopic[] = {
-	27,
+	32,
 	0x1200, 0x1248,
 	0x124a, 0x124d,
 	0x1250, 0x1256,
@@ -12698,7 +13006,7 @@ static const OnigCodePoint CR_Ethiopic[] = {
 	0x12d8, 0x1310,
 	0x1312, 0x1315,
 	0x1318, 0x135a,
-	0x135f, 0x137c,
+	0x135d, 0x137c,
 	0x1380, 0x1399,
 	0x2d80, 0x2d96,
 	0x2da0, 0x2da6,
@@ -12709,6 +13017,11 @@ static const OnigCodePoint CR_Ethiopic[] = {
 	0x2dc8, 0x2dce,
 	0x2dd0, 0x2dd6,
 	0x2dd8, 0x2dde,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 }; /* CR_Ethiopic */
 
 /* 'Cherokee': Script */
@@ -12759,15 +13072,16 @@ static const OnigCodePoint CR_Mongolian[] = {
 
 /* 'Hiragana': Script */
 static const OnigCodePoint CR_Hiragana[] = {
-	3,
+	4,
 	0x3041, 0x3096,
 	0x309d, 0x309f,
+	0x1b001, 0x1b001,
 	0x1f200, 0x1f200,
 }; /* CR_Hiragana */
 
 /* 'Katakana': Script */
 static const OnigCodePoint CR_Katakana[] = {
-	7,
+	8,
 	0x30a1, 0x30fa,
 	0x30fd, 0x30ff,
 	0x31f0, 0x31ff,
@@ -12775,18 +13089,20 @@ static const OnigCodePoint CR_Katakana[] = {
 	0x3300, 0x3357,
 	0xff66, 0xff6f,
 	0xff71, 0xff9d,
+	0x1b000, 0x1b000,
 }; /* CR_Katakana */
 
 /* 'Bopomofo': Script */
 static const OnigCodePoint CR_Bopomofo[] = {
-	2,
+	3,
+	0x02ea, 0x02eb,
 	0x3105, 0x312d,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 }; /* CR_Bopomofo */
 
 /* 'Han': Script */
 static const OnigCodePoint CR_Han[] = {
-	15,
+	16,
 	0x2e80, 0x2e99,
 	0x2e9b, 0x2ef3,
 	0x2f00, 0x2fd5,
@@ -12801,6 +13117,7 @@ static const OnigCodePoint CR_Han[] = {
 	0xfa70, 0xfad9,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_Han */
 
@@ -12832,10 +13149,11 @@ static const OnigCodePoint CR_Deseret[] = {
 
 /* 'Inherited': Script */
 static const OnigCodePoint CR_Inherited[] = {
-	23,
+	24,
 	0x0300, 0x036f,
 	0x0485, 0x0486,
 	0x064b, 0x0655,
+	0x065f, 0x065f,
 	0x0670, 0x0670,
 	0x0951, 0x0952,
 	0x1cd0, 0x1cd2,
@@ -12843,10 +13161,10 @@ static const OnigCodePoint CR_Inherited[] = {
 	0x1ce2, 0x1ce8,
 	0x1ced, 0x1ced,
 	0x1dc0, 0x1de6,
-	0x1dfd, 0x1dff,
+	0x1dfc, 0x1dff,
 	0x200c, 0x200d,
 	0x20d0, 0x20f0,
-	0x302a, 0x302f,
+	0x302a, 0x302d,
 	0x3099, 0x309a,
 	0xfe00, 0xfe0f,
 	0xfe20, 0xfe26,
@@ -12984,9 +13302,10 @@ static const OnigCodePoint CR_Glagolitic[] = {
 
 /* 'Tifinagh': Script */
 static const OnigCodePoint CR_Tifinagh[] = {
-	2,
+	3,
 	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d7f,
 }; /* CR_Tifinagh */
 
 /* 'Syloti_Nagri': Script */
@@ -13169,8 +13488,9 @@ static const OnigCodePoint CR_Lisu[] = {
 
 /* 'Bamum': Script */
 static const OnigCodePoint CR_Bamum[] = {
-	1,
+	2,
 	0xa6a0, 0xa6f7,
+	0x16800, 0x16a38,
 }; /* CR_Bamum */
 
 /* 'Javanese': Script */
@@ -13227,6 +13547,27 @@ static const OnigCodePoint CR_Kaithi[] = {
 	0x11080, 0x110c1,
 }; /* CR_Kaithi */
 
+/* 'Batak': Script */
+static const OnigCodePoint CR_Batak[] = {
+	2,
+	0x1bc0, 0x1bf3,
+	0x1bfc, 0x1bff,
+}; /* CR_Batak */
+
+/* 'Brahmi': Script */
+static const OnigCodePoint CR_Brahmi[] = {
+	2,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+}; /* CR_Brahmi */
+
+/* 'Mandaic': Script */
+static const OnigCodePoint CR_Mandaic[] = {
+	2,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+}; /* CR_Mandaic */
+
 /* 'White_Space': Binary Property */
 static const OnigCodePoint CR_White_Space[] = {
 	11,
@@ -13314,7 +13655,7 @@ static const OnigCodePoint CR_Quotation_Mark[] = {
 
 /* 'Terminal_Punctuation': Binary Property */
 static const OnigCodePoint CR_Terminal_Punctuation[] = {
-	65,
+	67,
 	0x0021, 0x0021,
 	0x002c, 0x002c,
 	0x002e, 0x002e,
@@ -13332,6 +13673,7 @@ static const OnigCodePoint CR_Terminal_Punctuation[] = {
 	0x070c, 0x070c,
 	0x07f8, 0x07f9,
 	0x0830, 0x083e,
+	0x085e, 0x085e,
 	0x0964, 0x0965,
 	0x0e5a, 0x0e5b,
 	0x0f08, 0x0f08,
@@ -13378,13 +13720,14 @@ static const OnigCodePoint CR_Terminal_Punctuation[] = {
 	0x10857, 0x10857,
 	0x1091f, 0x1091f,
 	0x10b3a, 0x10b3f,
+	0x11047, 0x1104d,
 	0x110be, 0x110c1,
 	0x12470, 0x12473,
 }; /* CR_Terminal_Punctuation */
 
 /* 'Other_Math': Binary Property */
 static const OnigCodePoint CR_Other_Math[] = {
-	99,
+	100,
 	0x005e, 0x005e,
 	0x03d0, 0x03d2,
 	0x03d5, 0x03d5,
@@ -13401,6 +13744,7 @@ static const OnigCodePoint CR_Other_Math[] = {
 	0x20e5, 0x20e6,
 	0x20eb, 0x20ef,
 	0x2102, 0x2102,
+	0x2107, 0x2107,
 	0x210a, 0x2113,
 	0x2115, 0x2115,
 	0x2119, 0x211d,
@@ -13507,7 +13851,7 @@ static const OnigCodePoint CR_ASCII_Hex_Digit[] = {
 
 /* 'Other_Alphabetic': Binary Property */
 static const OnigCodePoint CR_Other_Alphabetic[] = {
-	141,
+	145,
 	0x0345, 0x0345,
 	0x05b0, 0x05bd,
 	0x05bf, 0x05bf,
@@ -13516,7 +13860,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0x05c7, 0x05c7,
 	0x0610, 0x061a,
 	0x064b, 0x0657,
-	0x0659, 0x065e,
+	0x0659, 0x065f,
 	0x0670, 0x0670,
 	0x06d6, 0x06dc,
 	0x06e1, 0x06e4,
@@ -13530,9 +13874,10 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0x0825, 0x0827,
 	0x0829, 0x082c,
 	0x0900, 0x0903,
+	0x093a, 0x093b,
 	0x093e, 0x094c,
-	0x094e, 0x094e,
-	0x0955, 0x0955,
+	0x094e, 0x094f,
+	0x0955, 0x0957,
 	0x0962, 0x0963,
 	0x0981, 0x0983,
 	0x09be, 0x09c4,
@@ -13594,7 +13939,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0x0ebb, 0x0ebc,
 	0x0ecd, 0x0ecd,
 	0x0f71, 0x0f81,
-	0x0f90, 0x0f97,
+	0x0f8d, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x102b, 0x1036,
 	0x1038, 0x1038,
@@ -13624,6 +13969,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0x1b35, 0x1b43,
 	0x1b80, 0x1b82,
 	0x1ba1, 0x1ba9,
+	0x1be7, 0x1bf1,
 	0x1c24, 0x1c35,
 	0x1cf2, 0x1cf2,
 	0x24b6, 0x24e9,
@@ -13634,7 +13980,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0xa926, 0xa92a,
 	0xa947, 0xa952,
 	0xa980, 0xa983,
-	0xa9b3, 0xa9bf,
+	0xa9b4, 0xa9bf,
 	0xaa29, 0xaa36,
 	0xaa43, 0xaa43,
 	0xaa4c, 0xaa4d,
@@ -13647,13 +13993,15 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0x10a01, 0x10a03,
 	0x10a05, 0x10a06,
 	0x10a0c, 0x10a0f,
+	0x11000, 0x11002,
+	0x11038, 0x11045,
 	0x11082, 0x11082,
 	0x110b0, 0x110b8,
 }; /* CR_Other_Alphabetic */
 
 /* 'Ideographic': Binary Property */
 static const OnigCodePoint CR_Ideographic[] = {
-	11,
+	12,
 	0x3006, 0x3007,
 	0x3021, 0x3029,
 	0x3038, 0x303a,
@@ -13664,6 +14012,7 @@ static const OnigCodePoint CR_Ideographic[] = {
 	0xfa70, 0xfad9,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_Ideographic */
 
@@ -13906,7 +14255,7 @@ static const OnigCodePoint CR_Radical[] = {
 
 /* 'Unified_Ideograph': Binary Property */
 static const OnigCodePoint CR_Unified_Ideograph[] = {
-	11,
+	12,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
 	0xfa0e, 0xfa0f,
@@ -13918,6 +14267,7 @@ static const OnigCodePoint CR_Unified_Ideograph[] = {
 	0xfa27, 0xfa29,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 }; /* CR_Unified_Ideograph */
 
 /* 'Other_Default_Ignorable_Code_Point': Binary Property */
@@ -13937,8 +14287,9 @@ static const OnigCodePoint CR_Other_Default_Ignorable_Code_Point[] = {
 
 /* 'Deprecated': Binary Property */
 static const OnigCodePoint CR_Deprecated[] = {
-	8,
+	9,
 	0x0149, 0x0149,
+	0x0673, 0x0673,
 	0x0f77, 0x0f77,
 	0x0f79, 0x0f79,
 	0x17a3, 0x17a4,
@@ -14004,15 +14355,16 @@ static const OnigCodePoint CR_Other_ID_Start[] = {
 
 /* 'Other_ID_Continue': Binary Property */
 static const OnigCodePoint CR_Other_ID_Continue[] = {
-	3,
+	4,
 	0x00b7, 0x00b7,
 	0x0387, 0x0387,
 	0x1369, 0x1371,
+	0x19da, 0x19da,
 }; /* CR_Other_ID_Continue */
 
 /* 'STerm': Binary Property */
 static const OnigCodePoint CR_STerm[] = {
-	43,
+	47,
 	0x0021, 0x0021,
 	0x002e, 0x002e,
 	0x003f, 0x003f,
@@ -14028,9 +14380,11 @@ static const OnigCodePoint CR_STerm[] = {
 	0x1362, 0x1362,
 	0x1367, 0x1368,
 	0x166e, 0x166e,
+	0x1735, 0x1736,
 	0x1803, 0x1803,
 	0x1809, 0x1809,
 	0x1944, 0x1945,
+	0x1aa8, 0x1aab,
 	0x1b5a, 0x1b5b,
 	0x1b5e, 0x1b5f,
 	0x1c3b, 0x1c3c,
@@ -14055,6 +14409,8 @@ static const OnigCodePoint CR_STerm[] = {
 	0xff0e, 0xff0e,
 	0xff1f, 0xff1f,
 	0xff61, 0xff61,
+	0x10a56, 0x10a57,
+	0x11047, 0x11048,
 	0x110be, 0x110c1,
 }; /* CR_STerm */
 
@@ -14142,14 +14498,14 @@ static const OnigCodePoint CR_Blank[] = {
 
 /* 'Graph': [[:Graph:]] */
 static const OnigCodePoint CR_Graph[] = {
-	490,
+	506,
 	0x0021, 0x007e,
 	0x00a1, 0x0377,
 	0x037a, 0x037e,
 	0x0384, 0x038a,
 	0x038c, 0x038c,
 	0x038e, 0x03a1,
-	0x03a3, 0x0525,
+	0x03a3, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x055f,
 	0x0561, 0x0587,
@@ -14159,18 +14515,15 @@ static const OnigCodePoint CR_Graph[] = {
 	0x05f0, 0x05f4,
 	0x0600, 0x0603,
 	0x0606, 0x061b,
-	0x061e, 0x061f,
-	0x0621, 0x065e,
-	0x0660, 0x070d,
+	0x061e, 0x070d,
 	0x070f, 0x074a,
 	0x074d, 0x07b1,
 	0x07c0, 0x07fa,
 	0x0800, 0x082d,
 	0x0830, 0x083e,
-	0x0900, 0x0939,
-	0x093c, 0x094e,
-	0x0950, 0x0955,
-	0x0958, 0x0972,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x0900, 0x0977,
 	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
@@ -14229,7 +14582,7 @@ static const OnigCodePoint CR_Graph[] = {
 	0x0b56, 0x0b57,
 	0x0b5c, 0x0b5d,
 	0x0b5f, 0x0b63,
-	0x0b66, 0x0b71,
+	0x0b66, 0x0b77,
 	0x0b82, 0x0b83,
 	0x0b85, 0x0b8a,
 	0x0b8e, 0x0b90,
@@ -14277,11 +14630,10 @@ static const OnigCodePoint CR_Graph[] = {
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
+	0x0d4a, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d66, 0x0d75,
@@ -14319,11 +14671,10 @@ static const OnigCodePoint CR_Graph[] = {
 	0x0edc, 0x0edd,
 	0x0f00, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f71, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fd8,
+	0x0fce, 0x0fda,
 	0x1000, 0x10c5,
 	0x10d0, 0x10fc,
 	0x1100, 0x1248,
@@ -14342,7 +14693,7 @@ static const OnigCodePoint CR_Graph[] = {
 	0x12d8, 0x1310,
 	0x1312, 0x1315,
 	0x1318, 0x135a,
-	0x135f, 0x137c,
+	0x135d, 0x137c,
 	0x1380, 0x1399,
 	0x13a0, 0x13f4,
 	0x1400, 0x167f,
@@ -14382,12 +14733,13 @@ static const OnigCodePoint CR_Graph[] = {
 	0x1b50, 0x1b7c,
 	0x1b80, 0x1baa,
 	0x1bae, 0x1bb9,
-	0x1c00, 0x1c37,
+	0x1bc0, 0x1bf3,
+	0x1bfc, 0x1c37,
 	0x1c3b, 0x1c49,
 	0x1c4d, 0x1c7f,
 	0x1cd0, 0x1cf2,
 	0x1d00, 0x1de6,
-	0x1dfd, 0x1f15,
+	0x1dfc, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
 	0x1f48, 0x1f4d,
@@ -14409,38 +14761,25 @@ static const OnigCodePoint CR_Graph[] = {
 	0x2060, 0x2064,
 	0x206a, 0x2071,
 	0x2074, 0x208e,
-	0x2090, 0x2094,
-	0x20a0, 0x20b8,
+	0x2090, 0x209c,
+	0x20a0, 0x20b9,
 	0x20d0, 0x20f0,
 	0x2100, 0x2189,
-	0x2190, 0x23e8,
+	0x2190, 0x23f3,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
-	0x2460, 0x26cd,
-	0x26cf, 0x26e1,
-	0x26e3, 0x26e3,
-	0x26e8, 0x26ff,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
+	0x2460, 0x26ff,
+	0x2701, 0x27ca,
 	0x27cc, 0x27cc,
-	0x27d0, 0x2b4c,
+	0x27ce, 0x2b4c,
 	0x2b50, 0x2b59,
 	0x2c00, 0x2c2e,
 	0x2c30, 0x2c5e,
 	0x2c60, 0x2cf1,
 	0x2cf9, 0x2d25,
 	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
 	0x2da0, 0x2da6,
 	0x2da8, 0x2dae,
 	0x2db0, 0x2db6,
@@ -14459,7 +14798,7 @@ static const OnigCodePoint CR_Graph[] = {
 	0x3099, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x3190, 0x31b7,
+	0x3190, 0x31ba,
 	0x31c0, 0x31e3,
 	0x31f0, 0x321e,
 	0x3220, 0x32fe,
@@ -14468,12 +14807,13 @@ static const OnigCodePoint CR_Graph[] = {
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
 	0xa4d0, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa673,
+	0xa640, 0xa673,
 	0xa67c, 0xa697,
 	0xa6a0, 0xa6f7,
-	0xa700, 0xa78c,
-	0xa7fb, 0xa82b,
+	0xa700, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa82b,
 	0xa830, 0xa839,
 	0xa840, 0xa877,
 	0xa880, 0xa8c4,
@@ -14490,6 +14830,11 @@ static const OnigCodePoint CR_Graph[] = {
 	0xaa5c, 0xaa7b,
 	0xaa80, 0xaac2,
 	0xaadb, 0xaadf,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabed,
 	0xabf0, 0xabf9,
 	0xac00, 0xd7a3,
@@ -14505,7 +14850,7 @@ static const OnigCodePoint CR_Graph[] = {
 	0xfb3e, 0xfb3e,
 	0xfb40, 0xfb41,
 	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
+	0xfb46, 0xfbc1,
 	0xfbd3, 0xfd3f,
 	0xfd50, 0xfd8f,
 	0xfd92, 0xfdc7,
@@ -14573,11 +14918,15 @@ static const OnigCodePoint CR_Graph[] = {
 	0x10b78, 0x10b7f,
 	0x10c00, 0x10c48,
 	0x10e60, 0x10e7e,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
 	0x11080, 0x110c1,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x12470, 0x12473,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d000, 0x1d0f5,
 	0x1d100, 0x1d126,
 	0x1d129, 0x1d1dd,
@@ -14607,26 +14956,49 @@ static const OnigCodePoint CR_Graph[] = {
 	0x1d7ce, 0x1d7ff,
 	0x1f000, 0x1f02b,
 	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
 	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,
+	0x1f130, 0x1f169,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
 	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f5ff,
+	0x1f601, 0x1f610,
+	0x1f612, 0x1f614,
+	0x1f616, 0x1f616,
+	0x1f618, 0x1f618,
+	0x1f61a, 0x1f61a,
+	0x1f61c, 0x1f61e,
+	0x1f620, 0x1f625,
+	0x1f628, 0x1f62b,
+	0x1f62d, 0x1f62d,
+	0x1f630, 0x1f633,
+	0x1f635, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 	0xe0001, 0xe0001,
 	0xe0020, 0xe007f,
@@ -14640,14 +15012,14 @@ static const OnigCodePoint CR_Graph[] = {
 
 /* 'Print': [[:Print:]] */
 static const OnigCodePoint CR_Print[] = {
-	487,
+	503,
 	0x0020, 0x007e,
 	0x00a0, 0x0377,
 	0x037a, 0x037e,
 	0x0384, 0x038a,
 	0x038c, 0x038c,
 	0x038e, 0x03a1,
-	0x03a3, 0x0525,
+	0x03a3, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x055f,
 	0x0561, 0x0587,
@@ -14657,18 +15029,15 @@ static const OnigCodePoint CR_Print[] = {
 	0x05f0, 0x05f4,
 	0x0600, 0x0603,
 	0x0606, 0x061b,
-	0x061e, 0x061f,
-	0x0621, 0x065e,
-	0x0660, 0x070d,
+	0x061e, 0x070d,
 	0x070f, 0x074a,
 	0x074d, 0x07b1,
 	0x07c0, 0x07fa,
 	0x0800, 0x082d,
 	0x0830, 0x083e,
-	0x0900, 0x0939,
-	0x093c, 0x094e,
-	0x0950, 0x0955,
-	0x0958, 0x0972,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x0900, 0x0977,
 	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
@@ -14727,7 +15096,7 @@ static const OnigCodePoint CR_Print[] = {
 	0x0b56, 0x0b57,
 	0x0b5c, 0x0b5d,
 	0x0b5f, 0x0b63,
-	0x0b66, 0x0b71,
+	0x0b66, 0x0b77,
 	0x0b82, 0x0b83,
 	0x0b85, 0x0b8a,
 	0x0b8e, 0x0b90,
@@ -14775,11 +15144,10 @@ static const OnigCodePoint CR_Print[] = {
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
+	0x0d4a, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d66, 0x0d75,
@@ -14817,11 +15185,10 @@ static const OnigCodePoint CR_Print[] = {
 	0x0edc, 0x0edd,
 	0x0f00, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f71, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fd8,
+	0x0fce, 0x0fda,
 	0x1000, 0x10c5,
 	0x10d0, 0x10fc,
 	0x1100, 0x1248,
@@ -14840,7 +15207,7 @@ static const OnigCodePoint CR_Print[] = {
 	0x12d8, 0x1310,
 	0x1312, 0x1315,
 	0x1318, 0x135a,
-	0x135f, 0x137c,
+	0x135d, 0x137c,
 	0x1380, 0x1399,
 	0x13a0, 0x13f4,
 	0x1400, 0x169c,
@@ -14879,12 +15246,13 @@ static const OnigCodePoint CR_Print[] = {
 	0x1b50, 0x1b7c,
 	0x1b80, 0x1baa,
 	0x1bae, 0x1bb9,
-	0x1c00, 0x1c37,
+	0x1bc0, 0x1bf3,
+	0x1bfc, 0x1c37,
 	0x1c3b, 0x1c49,
 	0x1c4d, 0x1c7f,
 	0x1cd0, 0x1cf2,
 	0x1d00, 0x1de6,
-	0x1dfd, 0x1f15,
+	0x1dfc, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
 	0x1f48, 0x1f4d,
@@ -14904,38 +15272,25 @@ static const OnigCodePoint CR_Print[] = {
 	0x202a, 0x2064,
 	0x206a, 0x2071,
 	0x2074, 0x208e,
-	0x2090, 0x2094,
-	0x20a0, 0x20b8,
+	0x2090, 0x209c,
+	0x20a0, 0x20b9,
 	0x20d0, 0x20f0,
 	0x2100, 0x2189,
-	0x2190, 0x23e8,
+	0x2190, 0x23f3,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
-	0x2460, 0x26cd,
-	0x26cf, 0x26e1,
-	0x26e3, 0x26e3,
-	0x26e8, 0x26ff,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
+	0x2460, 0x26ff,
+	0x2701, 0x27ca,
 	0x27cc, 0x27cc,
-	0x27d0, 0x2b4c,
+	0x27ce, 0x2b4c,
 	0x2b50, 0x2b59,
 	0x2c00, 0x2c2e,
 	0x2c30, 0x2c5e,
 	0x2c60, 0x2cf1,
 	0x2cf9, 0x2d25,
 	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
 	0x2da0, 0x2da6,
 	0x2da8, 0x2dae,
 	0x2db0, 0x2db6,
@@ -14954,7 +15309,7 @@ static const OnigCodePoint CR_Print[] = {
 	0x3099, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x3190, 0x31b7,
+	0x3190, 0x31ba,
 	0x31c0, 0x31e3,
 	0x31f0, 0x321e,
 	0x3220, 0x32fe,
@@ -14963,12 +15318,13 @@ static const OnigCodePoint CR_Print[] = {
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
 	0xa4d0, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa673,
+	0xa640, 0xa673,
 	0xa67c, 0xa697,
 	0xa6a0, 0xa6f7,
-	0xa700, 0xa78c,
-	0xa7fb, 0xa82b,
+	0xa700, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa82b,
 	0xa830, 0xa839,
 	0xa840, 0xa877,
 	0xa880, 0xa8c4,
@@ -14985,6 +15341,11 @@ static const OnigCodePoint CR_Print[] = {
 	0xaa5c, 0xaa7b,
 	0xaa80, 0xaac2,
 	0xaadb, 0xaadf,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabed,
 	0xabf0, 0xabf9,
 	0xac00, 0xd7a3,
@@ -15000,7 +15361,7 @@ static const OnigCodePoint CR_Print[] = {
 	0xfb3e, 0xfb3e,
 	0xfb40, 0xfb41,
 	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
+	0xfb46, 0xfbc1,
 	0xfbd3, 0xfd3f,
 	0xfd50, 0xfd8f,
 	0xfd92, 0xfdc7,
@@ -15068,11 +15429,15 @@ static const OnigCodePoint CR_Print[] = {
 	0x10b78, 0x10b7f,
 	0x10c00, 0x10c48,
 	0x10e60, 0x10e7e,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
 	0x11080, 0x110c1,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x12470, 0x12473,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d000, 0x1d0f5,
 	0x1d100, 0x1d126,
 	0x1d129, 0x1d1dd,
@@ -15102,26 +15467,49 @@ static const OnigCodePoint CR_Print[] = {
 	0x1d7ce, 0x1d7ff,
 	0x1f000, 0x1f02b,
 	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
 	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,
+	0x1f130, 0x1f169,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
 	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f5ff,
+	0x1f601, 0x1f610,
+	0x1f612, 0x1f614,
+	0x1f616, 0x1f616,
+	0x1f618, 0x1f618,
+	0x1f61a, 0x1f61a,
+	0x1f61c, 0x1f61e,
+	0x1f620, 0x1f625,
+	0x1f628, 0x1f62b,
+	0x1f62d, 0x1f62d,
+	0x1f630, 0x1f633,
+	0x1f635, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 	0xe0001, 0xe0001,
 	0xe0020, 0xe007f,
@@ -15144,7 +15532,7 @@ static const OnigCodePoint CR_Print[] = {
 
 /* 'Word': [[:Word:]] */
 static const OnigCodePoint CR_Word[] = {
-	506,
+	514,
 	0x0030, 0x0039,
 	0x0041, 0x005a,
 	0x005f, 0x005f,
@@ -15168,7 +15556,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x038e, 0x03a1,
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
-	0x0483, 0x0525,
+	0x0483, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x0559,
 	0x0561, 0x0587,
@@ -15180,11 +15568,10 @@ static const OnigCodePoint CR_Word[] = {
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
 	0x0610, 0x061a,
-	0x0621, 0x065e,
-	0x0660, 0x0669,
+	0x0620, 0x0669,
 	0x066e, 0x06d3,
 	0x06d5, 0x06dc,
-	0x06de, 0x06e8,
+	0x06df, 0x06e8,
 	0x06ea, 0x06fc,
 	0x06ff, 0x06ff,
 	0x0710, 0x074a,
@@ -15192,12 +15579,10 @@ static const OnigCodePoint CR_Word[] = {
 	0x07c0, 0x07f5,
 	0x07fa, 0x07fa,
 	0x0800, 0x082d,
-	0x0900, 0x0939,
-	0x093c, 0x094e,
-	0x0950, 0x0955,
-	0x0958, 0x0963,
+	0x0840, 0x085b,
+	0x0900, 0x0963,
 	0x0966, 0x096f,
-	0x0971, 0x0972,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
@@ -15299,14 +15684,14 @@ static const OnigCodePoint CR_Word[] = {
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
+	0x0d4a, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d66, 0x0d6f,
@@ -15352,8 +15737,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x0f3e, 0x0f47,
 	0x0f49, 0x0f6c,
 	0x0f71, 0x0f84,
-	0x0f86, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f86, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fc6, 0x0fc6,
 	0x1000, 0x1049,
@@ -15377,7 +15761,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x12d8, 0x1310,
 	0x1312, 0x1315,
 	0x1318, 0x135a,
-	0x135f, 0x135f,
+	0x135d, 0x135f,
 	0x1380, 0x138f,
 	0x13a0, 0x13f4,
 	0x1401, 0x166c,
@@ -15409,7 +15793,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x1970, 0x1974,
 	0x1980, 0x19ab,
 	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
+	0x19d0, 0x19d9,
 	0x1a00, 0x1a1b,
 	0x1a20, 0x1a5e,
 	0x1a60, 0x1a7c,
@@ -15421,13 +15805,14 @@ static const OnigCodePoint CR_Word[] = {
 	0x1b6b, 0x1b73,
 	0x1b80, 0x1baa,
 	0x1bae, 0x1bb9,
+	0x1bc0, 0x1bf3,
 	0x1c00, 0x1c37,
 	0x1c40, 0x1c49,
 	0x1c4d, 0x1c7d,
 	0x1cd0, 0x1cd2,
 	0x1cd4, 0x1cf2,
 	0x1d00, 0x1de6,
-	0x1dfd, 0x1f15,
+	0x1dfc, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
 	0x1f48, 0x1f4d,
@@ -15450,7 +15835,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x2054, 0x2054,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x20d0, 0x20f0,
 	0x2102, 0x2102,
 	0x2107, 0x2107,
@@ -15474,7 +15859,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x2d00, 0x2d25,
 	0x2d30, 0x2d65,
 	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
+	0x2d7f, 0x2d96,
 	0x2da0, 0x2da6,
 	0x2da8, 0x2dae,
 	0x2db0, 0x2db6,
@@ -15496,7 +15881,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x30fc, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -15504,15 +15889,16 @@ static const OnigCodePoint CR_Word[] = {
 	0xa4d0, 0xa4fd,
 	0xa500, 0xa60c,
 	0xa610, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa672,
+	0xa640, 0xa672,
 	0xa67c, 0xa67d,
 	0xa67f, 0xa697,
 	0xa6a0, 0xa6f1,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa827,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa827,
 	0xa840, 0xa873,
 	0xa880, 0xa8c4,
 	0xa8d0, 0xa8d9,
@@ -15530,6 +15916,11 @@ static const OnigCodePoint CR_Word[] = {
 	0xaa7a, 0xaa7b,
 	0xaa80, 0xaac2,
 	0xaadb, 0xaadd,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabea,
 	0xabec, 0xabed,
 	0xabf0, 0xabf9,
@@ -15606,10 +15997,14 @@ static const OnigCodePoint CR_Word[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11000, 0x11046,
+	0x11066, 0x1106f,
 	0x11080, 0x110ba,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d165, 0x1d169,
 	0x1d16d, 0x1d172,
 	0x1d17b, 0x1d182,
@@ -15649,13 +16044,14 @@ static const OnigCodePoint CR_Word[] = {
 	0x1d7ce, 0x1d7ff,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 	0xe0100, 0xe01ef,
 }; /* CR_Word */
 
 /* 'Alnum': [[:Alnum:]] */
 static const OnigCodePoint CR_Alnum[] = {
-	497,
+	509,
 	0x0030, 0x0039,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
@@ -15679,7 +16075,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x038e, 0x03a1,
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x0559,
 	0x0561, 0x0587,
@@ -15691,9 +16087,8 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
 	0x0610, 0x061a,
-	0x0621, 0x0657,
-	0x0659, 0x065e,
-	0x0660, 0x0669,
+	0x0620, 0x0657,
+	0x0659, 0x0669,
 	0x066e, 0x06d3,
 	0x06d5, 0x06dc,
 	0x06e1, 0x06e8,
@@ -15706,14 +16101,13 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x07fa, 0x07fa,
 	0x0800, 0x0817,
 	0x081a, 0x082c,
-	0x0900, 0x0939,
+	0x0840, 0x0858,
+	0x0900, 0x093b,
 	0x093d, 0x094c,
-	0x094e, 0x094e,
-	0x0950, 0x0950,
-	0x0955, 0x0955,
-	0x0958, 0x0963,
+	0x094e, 0x0950,
+	0x0955, 0x0963,
 	0x0966, 0x096f,
-	0x0971, 0x0972,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
@@ -15815,14 +16209,15 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
 	0x0d4a, 0x0d4c,
+	0x0d4e, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d66, 0x0d6f,
@@ -15864,8 +16259,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x0f40, 0x0f47,
 	0x0f49, 0x0f6c,
 	0x0f71, 0x0f81,
-	0x0f88, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f88, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x1000, 0x1036,
 	0x1038, 0x1038,
@@ -15926,7 +16320,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x1970, 0x1974,
 	0x1980, 0x19ab,
 	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
+	0x19d0, 0x19d9,
 	0x1a00, 0x1a1b,
 	0x1a20, 0x1a5e,
 	0x1a61, 0x1a74,
@@ -15939,6 +16333,8 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x1b50, 0x1b59,
 	0x1b80, 0x1ba9,
 	0x1bae, 0x1bb9,
+	0x1bc0, 0x1be5,
+	0x1be7, 0x1bf1,
 	0x1c00, 0x1c35,
 	0x1c40, 0x1c49,
 	0x1c4d, 0x1c7d,
@@ -15966,7 +16362,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x1ff6, 0x1ffc,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x2102, 0x2102,
 	0x2107, 0x2107,
 	0x210a, 0x2113,
@@ -16010,7 +16406,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x30fc, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -16018,14 +16414,15 @@ static const OnigCodePoint CR_Alnum[] = {
 	0xa4d0, 0xa4fd,
 	0xa500, 0xa60c,
 	0xa610, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa66e,
+	0xa640, 0xa66e,
 	0xa67f, 0xa697,
 	0xa6a0, 0xa6ef,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa801,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa801,
 	0xa803, 0xa805,
 	0xa807, 0xa80a,
 	0xa80c, 0xa827,
@@ -16037,7 +16434,8 @@ static const OnigCodePoint CR_Alnum[] = {
 	0xa900, 0xa92a,
 	0xa930, 0xa952,
 	0xa960, 0xa97c,
-	0xa980, 0xa9bf,
+	0xa980, 0xa9b2,
+	0xa9b4, 0xa9bf,
 	0xa9cf, 0xa9d9,
 	0xaa00, 0xaa36,
 	0xaa40, 0xaa4d,
@@ -16048,6 +16446,11 @@ static const OnigCodePoint CR_Alnum[] = {
 	0xaac0, 0xaac0,
 	0xaac2, 0xaac2,
 	0xaadb, 0xaadd,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabea,
 	0xabf0, 0xabf9,
 	0xac00, 0xd7a3,
@@ -16115,10 +16518,14 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11000, 0x11045,
+	0x11066, 0x1106f,
 	0x11082, 0x110b8,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d400, 0x1d454,
 	0x1d456, 0x1d49c,
 	0x1d49e, 0x1d49f,
@@ -16152,6 +16559,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x1d7ce, 0x1d7ff,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_Alnum */
 
@@ -16329,6 +16737,9 @@ static const OnigCodePoint* const CodeRanges[] = {
   CR_Inscriptional_Pahlavi,
   CR_Old_Turkic,
   CR_Kaithi,
+  CR_Batak,
+  CR_Brahmi,
+  CR_Mandaic,
   CR_White_Space,
   CR_Bidi_Control,
   CR_Join_Control,
@@ -16378,12 +16789,12 @@ static const struct uniname2ctype_struct *uniname2ctype_p(const char *, unsigned
 #define MAX_HASH_VALUE 21
 /* maximum key range = 15, duplicates = 0 */
 #else /* USE_UNICODE_PROPERTIES */
-#define TOTAL_KEYWORDS 367
+#define TOTAL_KEYWORDS 373
 #define MIN_WORD_LENGTH 1
 #define MAX_WORD_LENGTH 30
 #define MIN_HASH_VALUE 3
-#define MAX_HASH_VALUE 1751
-/* maximum key range = 1749, duplicates = 0 */
+#define MAX_HASH_VALUE 2124
+/* maximum key range = 2122, duplicates = 0 */
 #endif /* USE_UNICODE_PROPERTIES */
 
 #ifdef __GNUC__
@@ -16419,19 +16830,19 @@ uniname2ctype_hash (str, len)
        2, 22,  1, 22, 10,  8,  4,  7, 22,  3,
        4, 22, 22, 22, 22, 22, 22, 22
 #else /* USE_UNICODE_PROPERTIES */
-      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
-      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
-      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
-      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
-      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
-      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
-      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
-      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
-      1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
-      1752, 1752, 1752, 1752, 1752, 1752, 1752,    7,  419,    1,
-       128,   38,  100,  186,   46,   11,  226,  463,    4,  317,
-         6,    2,  265,    5,   18,  112,   30,  289,  164,  384,
-       368,  579,   10, 1752, 1752, 1752, 1752, 1752
+      2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125,
+      2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125,
+      2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125,
+      2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125,
+      2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125,
+      2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125,
+      2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125,
+      2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125,
+      2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125, 2125,
+      2125, 2125, 2125, 2125, 2125, 2125, 2125,    7,  538,    1,
+       105,   51,  100,  387,   51,   11,    4,  668,    4,  320,
+         6,    2,  239,    1,   18,  134,   30,  240,    5,  440,
+       248,  698,   26, 2125, 2125, 2125, 2125, 2125
 #endif /* USE_UNICODE_PROPERTIES */
     };
 #ifndef USE_UNICODE_PROPERTIES
@@ -16505,14 +16916,18 @@ struct uniname2ctype_pool_t
     char uniname2ctype_pool_str16[sizeof("nl")];
     char uniname2ctype_pool_str18[sizeof("lao")];
     char uniname2ctype_pool_str19[sizeof("laoo")];
-    char uniname2ctype_pool_str20[sizeof("zl")];
-    char uniname2ctype_pool_str21[sizeof("z")];
+    char uniname2ctype_pool_str20[sizeof("qaac")];
     char uniname2ctype_pool_str22[sizeof("control")];
-    char uniname2ctype_pool_str24[sizeof("qaac")];
+    char uniname2ctype_pool_str23[sizeof("joinc")];
     char uniname2ctype_pool_str25[sizeof("ci")];
+    char uniname2ctype_pool_str27[sizeof("java")];
     char uniname2ctype_pool_str28[sizeof("lana")];
+    char uniname2ctype_pool_str30[sizeof("qaai")];
     char uniname2ctype_pool_str33[sizeof("oalpha")];
-    char uniname2ctype_pool_str34[sizeof("qaai")];
+    char uniname2ctype_pool_str34[sizeof("joincontrol")];
+    char uniname2ctype_pool_str36[sizeof("zl")];
+    char uniname2ctype_pool_str37[sizeof("vai")];
+    char uniname2ctype_pool_str38[sizeof("vaii")];
     char uniname2ctype_pool_str40[sizeof("arabic")];
     char uniname2ctype_pool_str41[sizeof("cari")];
     char uniname2ctype_pool_str43[sizeof("oriya")];
@@ -16522,344 +16937,346 @@ struct uniname2ctype_pool_t
     char uniname2ctype_pool_str50[sizeof("olower")];
     char uniname2ctype_pool_str51[sizeof("latn")];
     char uniname2ctype_pool_str52[sizeof("latin")];
+    char uniname2ctype_pool_str53[sizeof("z")];
     char uniname2ctype_pool_str56[sizeof("ital")];
-    char uniname2ctype_pool_str65[sizeof("hano")];
     char uniname2ctype_pool_str66[sizeof("lt")];
-    char uniname2ctype_pool_str68[sizeof("han")];
-    char uniname2ctype_pool_str70[sizeof("hanunoo")];
+    char uniname2ctype_pool_str70[sizeof("hano")];
     char uniname2ctype_pool_str71[sizeof("canadianaboriginal")];
-    char uniname2ctype_pool_str73[sizeof("hangul")];
-    char uniname2ctype_pool_str74[sizeof("hani")];
-    char uniname2ctype_pool_str76[sizeof("nchar")];
-    char uniname2ctype_pool_str77[sizeof("zinh")];
-    char uniname2ctype_pool_str83[sizeof("tale")];
-    char uniname2ctype_pool_str85[sizeof("loe")];
-    char uniname2ctype_pool_str86[sizeof("hira")];
-    char uniname2ctype_pool_str91[sizeof("taile")];
-    char uniname2ctype_pool_str92[sizeof("lineseparator")];
-    char uniname2ctype_pool_str94[sizeof("thaa")];
-    char uniname2ctype_pool_str97[sizeof("hiragana")];
-    char uniname2ctype_pool_str98[sizeof("thai")];
+    char uniname2ctype_pool_str73[sizeof("han")];
+    char uniname2ctype_pool_str75[sizeof("hanunoo")];
+    char uniname2ctype_pool_str76[sizeof("tavt")];
+    char uniname2ctype_pool_str78[sizeof("hangul")];
+    char uniname2ctype_pool_str79[sizeof("hani")];
+    char uniname2ctype_pool_str81[sizeof("nchar")];
+    char uniname2ctype_pool_str83[sizeof("avestan")];
+    char uniname2ctype_pool_str91[sizeof("hira")];
+    char uniname2ctype_pool_str96[sizeof("tale")];
+    char uniname2ctype_pool_str98[sizeof("zinh")];
+    char uniname2ctype_pool_str99[sizeof("thaa")];
     char uniname2ctype_pool_str100[sizeof("initialpunctuation")];
-    char uniname2ctype_pool_str101[sizeof("other")];
-    char uniname2ctype_pool_str103[sizeof("thaana")];
-    char uniname2ctype_pool_str107[sizeof("cher")];
-    char uniname2ctype_pool_str111[sizeof("otherletter")];
-    char uniname2ctype_pool_str113[sizeof("othernumber")];
-    char uniname2ctype_pool_str114[sizeof("letter")];
-    char uniname2ctype_pool_str116[sizeof("sc")];
-    char uniname2ctype_pool_str118[sizeof("so")];
-    char uniname2ctype_pool_str123[sizeof("taiviet")];
-    char uniname2ctype_pool_str128[sizeof("noncharactercodepoint")];
-    char uniname2ctype_pool_str129[sizeof("ethi")];
-    char uniname2ctype_pool_str130[sizeof("cans")];
+    char uniname2ctype_pool_str101[sizeof("variationselector")];
+    char uniname2ctype_pool_str102[sizeof("hiragana")];
+    char uniname2ctype_pool_str103[sizeof("thai")];
+    char uniname2ctype_pool_str104[sizeof("taile")];
+    char uniname2ctype_pool_str105[sizeof("lineseparator")];
+    char uniname2ctype_pool_str106[sizeof("other")];
+    char uniname2ctype_pool_str108[sizeof("thaana")];
+    char uniname2ctype_pool_str111[sizeof("loe")];
+    char uniname2ctype_pool_str116[sizeof("otherletter")];
+    char uniname2ctype_pool_str118[sizeof("othernumber")];
+    char uniname2ctype_pool_str121[sizeof("idc")];
+    char uniname2ctype_pool_str123[sizeof("oidc")];
+    char uniname2ctype_pool_str125[sizeof("cher")];
+    char uniname2ctype_pool_str126[sizeof("javanese")];
+    char uniname2ctype_pool_str127[sizeof("letter")];
+    char uniname2ctype_pool_str128[sizeof("olditalic")];
+    char uniname2ctype_pool_str129[sizeof("di")];
+    char uniname2ctype_pool_str132[sizeof("odi")];
+    char uniname2ctype_pool_str133[sizeof("dia")];
     char uniname2ctype_pool_str135[sizeof("titlecaseletter")];
-    char uniname2ctype_pool_str136[sizeof("ascii")];
-    char uniname2ctype_pool_str138[sizeof("letternumber")];
-    char uniname2ctype_pool_str139[sizeof("otheralphabetic")];
-    char uniname2ctype_pool_str141[sizeof("otherlowercase")];
-    char uniname2ctype_pool_str144[sizeof("idc")];
-    char uniname2ctype_pool_str146[sizeof("oidc")];
-    char uniname2ctype_pool_str147[sizeof("sinhala")];
-    char uniname2ctype_pool_str148[sizeof("terminalpunctuation")];
-    char uniname2ctype_pool_str151[sizeof("olditalic")];
-    char uniname2ctype_pool_str152[sizeof("di")];
-    char uniname2ctype_pool_str153[sizeof("otheridcontinue")];
-    char uniname2ctype_pool_str155[sizeof("odi")];
-    char uniname2ctype_pool_str156[sizeof("dia")];
-    char uniname2ctype_pool_str161[sizeof("otheridstart")];
-    char uniname2ctype_pool_str162[sizeof("oldturkic")];
-    char uniname2ctype_pool_str167[sizeof("diacritic")];
-    char uniname2ctype_pool_str168[sizeof("oldpersian")];
-    char uniname2ctype_pool_str171[sizeof("radical")];
-    char uniname2ctype_pool_str179[sizeof("sinh")];
-    char uniname2ctype_pool_str183[sizeof("ideo")];
-    char uniname2ctype_pool_str185[sizeof("shavian")];
+    char uniname2ctype_pool_str136[sizeof("taiviet")];
+    char uniname2ctype_pool_str138[sizeof("sc")];
+    char uniname2ctype_pool_str139[sizeof("oldturkic")];
+    char uniname2ctype_pool_str140[sizeof("so")];
+    char uniname2ctype_pool_str141[sizeof("noncharactercodepoint")];
+    char uniname2ctype_pool_str144[sizeof("diacritic")];
+    char uniname2ctype_pool_str145[sizeof("oldpersian")];
+    char uniname2ctype_pool_str147[sizeof("ethi")];
+    char uniname2ctype_pool_str148[sizeof("radical")];
+    char uniname2ctype_pool_str151[sizeof("letternumber")];
+    char uniname2ctype_pool_str152[sizeof("cans")];
+    char uniname2ctype_pool_str157[sizeof("otheralphabetic")];
+    char uniname2ctype_pool_str158[sizeof("ascii")];
+    char uniname2ctype_pool_str159[sizeof("otherlowercase")];
+    char uniname2ctype_pool_str161[sizeof("terminalpunctuation")];
+    char uniname2ctype_pool_str166[sizeof("otheridstart")];
+    char uniname2ctype_pool_str169[sizeof("sinhala")];
+    char uniname2ctype_pool_str171[sizeof("otheridcontinue")];
+    char uniname2ctype_pool_str172[sizeof("deva")];
+    char uniname2ctype_pool_str173[sizeof("ideo")];
+    char uniname2ctype_pool_str180[sizeof("avst")];
     char uniname2ctype_pool_str186[sizeof("format")];
-    char uniname2ctype_pool_str192[sizeof("inscriptionalparthian")];
-    char uniname2ctype_pool_str196[sizeof("vai")];
-    char uniname2ctype_pool_str197[sizeof("vaii")];
-    char uniname2ctype_pool_str202[sizeof("tifinagh")];
+    char uniname2ctype_pool_str189[sizeof("devanagari")];
+    char uniname2ctype_pool_str193[sizeof("inherited")];
+    char uniname2ctype_pool_str197[sizeof("ideographic")];
     char uniname2ctype_pool_str203[sizeof("cf")];
-    char uniname2ctype_pool_str205[sizeof("othersymbol")];
-    char uniname2ctype_pool_str207[sizeof("ideographic")];
-    char uniname2ctype_pool_str211[sizeof("inherited")];
-    char uniname2ctype_pool_str212[sizeof("glagolitic")];
-    char uniname2ctype_pool_str218[sizeof("idcontinue")];
-    char uniname2ctype_pool_str220[sizeof("asciihexdigit")];
-    char uniname2ctype_pool_str224[sizeof("inscriptionalpahlavi")];
-    char uniname2ctype_pool_str225[sizeof("s")];
-    char uniname2ctype_pool_str226[sizeof("gothic")];
-    char uniname2ctype_pool_str227[sizeof("cs")];
-    char uniname2ctype_pool_str229[sizeof("avestan")];
-    char uniname2ctype_pool_str235[sizeof("tavt")];
-    char uniname2ctype_pool_str236[sizeof("zs")];
-    char uniname2ctype_pool_str243[sizeof("decimalnumber")];
-    char uniname2ctype_pool_str244[sizeof("tagbanwa")];
-    char uniname2ctype_pool_str245[sizeof("joinc")];
-    char uniname2ctype_pool_str248[sizeof("geor")];
-    char uniname2ctype_pool_str249[sizeof("hang")];
-    char uniname2ctype_pool_str251[sizeof("georgian")];
-    char uniname2ctype_pool_str253[sizeof("cased")];
-    char uniname2ctype_pool_str256[sizeof("joincontrol")];
-    char uniname2ctype_pool_str257[sizeof("oids")];
-    char uniname2ctype_pool_str260[sizeof("variationselector")];
-    char uniname2ctype_pool_str262[sizeof("graph")];
-    char uniname2ctype_pool_str263[sizeof("changeswhenlowercased")];
-    char uniname2ctype_pool_str264[sizeof("nd")];
-    char uniname2ctype_pool_str268[sizeof("goth")];
-    char uniname2ctype_pool_str269[sizeof("pc")];
-    char uniname2ctype_pool_str271[sizeof("po")];
-    char uniname2ctype_pool_str272[sizeof("ogrext")];
-    char uniname2ctype_pool_str276[sizeof("coptic")];
-    char uniname2ctype_pool_str277[sizeof("grext")];
-    char uniname2ctype_pool_str282[sizeof("logicalorderexception")];
-    char uniname2ctype_pool_str285[sizeof("idst")];
-    char uniname2ctype_pool_str288[sizeof("alpha")];
-    char uniname2ctype_pool_str289[sizeof("pi")];
-    char uniname2ctype_pool_str292[sizeof("dsrt")];
-    char uniname2ctype_pool_str297[sizeof("dash")];
-    char uniname2ctype_pool_str298[sizeof("otherdefaultignorablecodepoint")];
-    char uniname2ctype_pool_str302[sizeof("copt")];
-    char uniname2ctype_pool_str306[sizeof("idstart")];
-    char uniname2ctype_pool_str307[sizeof("closepunctuation")];
-    char uniname2ctype_pool_str309[sizeof("changeswhentitlecased")];
-    char uniname2ctype_pool_str312[sizeof("lepc")];
-    char uniname2ctype_pool_str317[sizeof("avst")];
-    char uniname2ctype_pool_str318[sizeof("cprt")];
-    char uniname2ctype_pool_str319[sizeof("runic")];
-    char uniname2ctype_pool_str320[sizeof("patsyn")];
-    char uniname2ctype_pool_str321[sizeof("mc")];
-    char uniname2ctype_pool_str326[sizeof("tfng")];
-    char uniname2ctype_pool_str327[sizeof("lepcha")];
-    char uniname2ctype_pool_str328[sizeof("prti")];
-    char uniname2ctype_pool_str329[sizeof("print")];
-    char uniname2ctype_pool_str330[sizeof("phli")];
-    char uniname2ctype_pool_str331[sizeof("mn")];
-    char uniname2ctype_pool_str332[sizeof("idsbinaryoperator")];
-    char uniname2ctype_pool_str334[sizeof("talu")];
-    char uniname2ctype_pool_str335[sizeof("runr")];
-    char uniname2ctype_pool_str337[sizeof("graphemebase")];
-    char uniname2ctype_pool_str338[sizeof("common")];
-    char uniname2ctype_pool_str339[sizeof("alnum")];
-    char uniname2ctype_pool_str340[sizeof("phoenician")];
-    char uniname2ctype_pool_str341[sizeof("deva")];
-    char uniname2ctype_pool_str342[sizeof("changeswhencasefolded")];
+    char uniname2ctype_pool_str206[sizeof("sinh")];
+    char uniname2ctype_pool_str207[sizeof("tifinagh")];
+    char uniname2ctype_pool_str208[sizeof("idcontinue")];
+    char uniname2ctype_pool_str212[sizeof("shavian")];
+    char uniname2ctype_pool_str214[sizeof("inscriptionalparthian")];
+    char uniname2ctype_pool_str218[sizeof("nd")];
+    char uniname2ctype_pool_str232[sizeof("othersymbol")];
+    char uniname2ctype_pool_str243[sizeof("pc")];
+    char uniname2ctype_pool_str245[sizeof("po")];
+    char uniname2ctype_pool_str246[sizeof("decimalnumber")];
+    char uniname2ctype_pool_str247[sizeof("asciihexdigit")];
+    char uniname2ctype_pool_str250[sizeof("coptic")];
+    char uniname2ctype_pool_str251[sizeof("inscriptionalpahlavi")];
+    char uniname2ctype_pool_str252[sizeof("cased")];
+    char uniname2ctype_pool_str256[sizeof("oids")];
+    char uniname2ctype_pool_str258[sizeof("changeswhenlowercased")];
+    char uniname2ctype_pool_str262[sizeof("alpha")];
+    char uniname2ctype_pool_str263[sizeof("pi")];
+    char uniname2ctype_pool_str269[sizeof("s")];
+    char uniname2ctype_pool_str270[sizeof("runic")];
+    char uniname2ctype_pool_str271[sizeof("cs")];
+    char uniname2ctype_pool_str275[sizeof("vs")];
+    char uniname2ctype_pool_str276[sizeof("copt")];
+    char uniname2ctype_pool_str280[sizeof("otherdefaultignorablecodepoint")];
+    char uniname2ctype_pool_str281[sizeof("closepunctuation")];
+    char uniname2ctype_pool_str284[sizeof("idst")];
+    char uniname2ctype_pool_str285[sizeof("talu")];
+    char uniname2ctype_pool_str286[sizeof("runr")];
+    char uniname2ctype_pool_str291[sizeof("dsrt")];
+    char uniname2ctype_pool_str292[sizeof("cprt")];
+    char uniname2ctype_pool_str294[sizeof("patsyn")];
+    char uniname2ctype_pool_str296[sizeof("zs")];
+    char uniname2ctype_pool_str299[sizeof("lepc")];
+    char uniname2ctype_pool_str301[sizeof("dash")];
+    char uniname2ctype_pool_str302[sizeof("prti")];
+    char uniname2ctype_pool_str303[sizeof("print")];
+    char uniname2ctype_pool_str305[sizeof("idstart")];
+    char uniname2ctype_pool_str309[sizeof("phli")];
+    char uniname2ctype_pool_str314[sizeof("lepcha")];
+    char uniname2ctype_pool_str317[sizeof("changeswhentitlecased")];
+    char uniname2ctype_pool_str319[sizeof("phoenician")];
+    char uniname2ctype_pool_str324[sizeof("mc")];
+    char uniname2ctype_pool_str329[sizeof("telu")];
+    char uniname2ctype_pool_str334[sizeof("mn")];
+    char uniname2ctype_pool_str337[sizeof("changeswhencasefolded")];
+    char uniname2ctype_pool_str341[sizeof("common")];
+    char uniname2ctype_pool_str342[sizeof("alnum")];
     char uniname2ctype_pool_str343[sizeof("pe")];
-    char uniname2ctype_pool_str344[sizeof("mongolian")];
-    char uniname2ctype_pool_str352[sizeof("armn")];
-    char uniname2ctype_pool_str353[sizeof("deseret")];
-    char uniname2ctype_pool_str354[sizeof("softdotted")];
-    char uniname2ctype_pool_str357[sizeof("armi")];
-    char uniname2ctype_pool_str358[sizeof("devanagari")];
-    char uniname2ctype_pool_str360[sizeof("digit")];
-    char uniname2ctype_pool_str361[sizeof("caseignorable")];
-    char uniname2ctype_pool_str362[sizeof("taml")];
-    char uniname2ctype_pool_str363[sizeof("tamil")];
-    char uniname2ctype_pool_str365[sizeof("telu")];
-    char uniname2ctype_pool_str366[sizeof("ids")];
-    char uniname2ctype_pool_str367[sizeof("armenian")];
-    char uniname2ctype_pool_str370[sizeof("sd")];
-    char uniname2ctype_pool_str372[sizeof("privateuse")];
-    char uniname2ctype_pool_str373[sizeof("assigned")];
-    char uniname2ctype_pool_str375[sizeof("cham")];
-    char uniname2ctype_pool_str377[sizeof("omath")];
-    char uniname2ctype_pool_str378[sizeof("otherpunctuation")];
-    char uniname2ctype_pool_str379[sizeof("taitham")];
-    char uniname2ctype_pool_str381[sizeof("defaultignorablecodepoint")];
-    char uniname2ctype_pool_str387[sizeof("glag")];
-    char uniname2ctype_pool_str388[sizeof("ethiopic")];
-    char uniname2ctype_pool_str390[sizeof("vs")];
-    char uniname2ctype_pool_str395[sizeof("me")];
-    char uniname2ctype_pool_str396[sizeof("cwl")];
-    char uniname2ctype_pool_str400[sizeof("mtei")];
-    char uniname2ctype_pool_str404[sizeof("math")];
-    char uniname2ctype_pool_str407[sizeof("term")];
-    char uniname2ctype_pool_str408[sizeof("java")];
-    char uniname2ctype_pool_str410[sizeof("tglg")];
-    char uniname2ctype_pool_str413[sizeof("lower")];
+    char uniname2ctype_pool_str344[sizeof("idsbinaryoperator")];
+    char uniname2ctype_pool_str346[sizeof("sd")];
+    char uniname2ctype_pool_str347[sizeof("mongolian")];
+    char uniname2ctype_pool_str352[sizeof("mandaic")];
+    char uniname2ctype_pool_str353[sizeof("softdotted")];
+    char uniname2ctype_pool_str355[sizeof("armn")];
+    char uniname2ctype_pool_str357[sizeof("otherpunctuation")];
+    char uniname2ctype_pool_str359[sizeof("privateuse")];
+    char uniname2ctype_pool_str360[sizeof("armi")];
+    char uniname2ctype_pool_str361[sizeof("ahex")];
+    char uniname2ctype_pool_str362[sizeof("ext")];
+    char uniname2ctype_pool_str363[sizeof("uideo")];
+    char uniname2ctype_pool_str365[sizeof("taml")];
+    char uniname2ctype_pool_str366[sizeof("tamil")];
+    char uniname2ctype_pool_str369[sizeof("xidc")];
+    char uniname2ctype_pool_str370[sizeof("armenian")];
+    char uniname2ctype_pool_str378[sizeof("deseret")];
+    char uniname2ctype_pool_str379[sizeof("unassigned")];
+    char uniname2ctype_pool_str380[sizeof("ethiopic")];
+    char uniname2ctype_pool_str382[sizeof("taitham")];
+    char uniname2ctype_pool_str383[sizeof("cham")];
+    char uniname2ctype_pool_str384[sizeof("defaultignorablecodepoint")];
+    char uniname2ctype_pool_str385[sizeof("omath")];
+    char uniname2ctype_pool_str387[sizeof("ids")];
+    char uniname2ctype_pool_str391[sizeof("finalpunctuation")];
+    char uniname2ctype_pool_str393[sizeof("lisu")];
+    char uniname2ctype_pool_str394[sizeof("assigned")];
+    char uniname2ctype_pool_str395[sizeof("otheruppercase")];
+    char uniname2ctype_pool_str403[sizeof("saur")];
+    char uniname2ctype_pool_str409[sizeof("xidstart")];
+    char uniname2ctype_pool_str412[sizeof("math")];
+    char uniname2ctype_pool_str413[sizeof("glagolitic")];
     char uniname2ctype_pool_str414[sizeof("patternwhitespace")];
-    char uniname2ctype_pool_str417[sizeof("finalpunctuation")];
-    char uniname2ctype_pool_str418[sizeof("tagalog")];
-    char uniname2ctype_pool_str419[sizeof("patws")];
-    char uniname2ctype_pool_str420[sizeof("lisu")];
-    char uniname2ctype_pool_str426[sizeof("otheruppercase")];
-    char uniname2ctype_pool_str427[sizeof("space")];
-    char uniname2ctype_pool_str429[sizeof("graphemeextend")];
-    char uniname2ctype_pool_str430[sizeof("saur")];
-    char uniname2ctype_pool_str435[sizeof("uideo")];
-    char uniname2ctype_pool_str438[sizeof("lowercase")];
-    char uniname2ctype_pool_str440[sizeof("rjng")];
-    char uniname2ctype_pool_str442[sizeof("osma")];
-    char uniname2ctype_pool_str444[sizeof("linb")];
-    char uniname2ctype_pool_str445[sizeof("bali")];
-    char uniname2ctype_pool_str448[sizeof("cwt")];
-    char uniname2ctype_pool_str449[sizeof("separator")];
-    char uniname2ctype_pool_str450[sizeof("othermath")];
-    char uniname2ctype_pool_str451[sizeof("unassigned")];
-    char uniname2ctype_pool_str454[sizeof("lowercaseletter")];
-    char uniname2ctype_pool_str455[sizeof("arab")];
-    char uniname2ctype_pool_str458[sizeof("samr")];
-    char uniname2ctype_pool_str459[sizeof("brai")];
-    char uniname2ctype_pool_str460[sizeof("sundanese")];
-    char uniname2ctype_pool_str462[sizeof("samaritan")];
-    char uniname2ctype_pool_str463[sizeof("ahex")];
-    char uniname2ctype_pool_str465[sizeof("linearb")];
-    char uniname2ctype_pool_str467[sizeof("pf")];
-    char uniname2ctype_pool_str469[sizeof("ext")];
-    char uniname2ctype_pool_str474[sizeof("olck")];
-    char uniname2ctype_pool_str476[sizeof("nko")];
-    char uniname2ctype_pool_str477[sizeof("nkoo")];
-    char uniname2ctype_pool_str479[sizeof("newline")];
-    char uniname2ctype_pool_str480[sizeof("tibetan")];
-    char uniname2ctype_pool_str481[sizeof("javanese")];
-    char uniname2ctype_pool_str485[sizeof("bengali")];
-    char uniname2ctype_pool_str486[sizeof("newtailue")];
-    char uniname2ctype_pool_str487[sizeof("kana")];
-    char uniname2ctype_pool_str488[sizeof("olchiki")];
-    char uniname2ctype_pool_str489[sizeof("kali")];
-    char uniname2ctype_pool_str490[sizeof("cwcf")];
-    char uniname2ctype_pool_str491[sizeof("ps")];
-    char uniname2ctype_pool_str493[sizeof("braille")];
-    char uniname2ctype_pool_str494[sizeof("tibt")];
-    char uniname2ctype_pool_str502[sizeof("sterm")];
-    char uniname2ctype_pool_str504[sizeof("ugar")];
-    char uniname2ctype_pool_str505[sizeof("nonspacingmark")];
-    char uniname2ctype_pool_str508[sizeof("phag")];
-    char uniname2ctype_pool_str509[sizeof("kaithi")];
-    char uniname2ctype_pool_str512[sizeof("xidc")];
-    char uniname2ctype_pool_str514[sizeof("balinese")];
-    char uniname2ctype_pool_str515[sizeof("mong")];
-    char uniname2ctype_pool_str516[sizeof("ogam")];
-    char uniname2ctype_pool_str520[sizeof("modifierletter")];
-    char uniname2ctype_pool_str521[sizeof("ugaritic")];
-    char uniname2ctype_pool_str522[sizeof("katakana")];
-    char uniname2ctype_pool_str523[sizeof("pd")];
-    char uniname2ctype_pool_str525[sizeof("hebr")];
-    char uniname2ctype_pool_str531[sizeof("p")];
-    char uniname2ctype_pool_str533[sizeof("orkh")];
-    char uniname2ctype_pool_str536[sizeof("word")];
-    char uniname2ctype_pool_str537[sizeof("saurashtra")];
-    char uniname2ctype_pool_str538[sizeof("khar")];
-    char uniname2ctype_pool_str539[sizeof("sund")];
-    char uniname2ctype_pool_str542[sizeof("zp")];
-    char uniname2ctype_pool_str548[sizeof("changeswhenuppercased")];
-    char uniname2ctype_pool_str552[sizeof("xidstart")];
-    char uniname2ctype_pool_str553[sizeof("shaw")];
-    char uniname2ctype_pool_str554[sizeof("kthi")];
-    char uniname2ctype_pool_str556[sizeof("ogham")];
-    char uniname2ctype_pool_str558[sizeof("spaceseparator")];
-    char uniname2ctype_pool_str559[sizeof("changeswhencasemapped")];
-    char uniname2ctype_pool_str560[sizeof("sarb")];
-    char uniname2ctype_pool_str562[sizeof("xidcontinue")];
-    char uniname2ctype_pool_str564[sizeof("bidic")];
-    char uniname2ctype_pool_str570[sizeof("deprecated")];
-    char uniname2ctype_pool_str573[sizeof("xdigit")];
-    char uniname2ctype_pool_str575[sizeof("bidicontrol")];
-    char uniname2ctype_pool_str584[sizeof("lu")];
-    char uniname2ctype_pool_str587[sizeof("dashpunctuation")];
-    char uniname2ctype_pool_str590[sizeof("extender")];
-    char uniname2ctype_pool_str593[sizeof("idstrinaryoperator")];
-    char uniname2ctype_pool_str594[sizeof("cherokee")];
-    char uniname2ctype_pool_str595[sizeof("punct")];
-    char uniname2ctype_pool_str597[sizeof("phagspa")];
-    char uniname2ctype_pool_str598[sizeof("oupper")];
-    char uniname2ctype_pool_str599[sizeof("lyci")];
-    char uniname2ctype_pool_str601[sizeof("whitespace")];
-    char uniname2ctype_pool_str602[sizeof("lycian")];
-    char uniname2ctype_pool_str603[sizeof("yi")];
-    char uniname2ctype_pool_str606[sizeof("cyrl")];
-    char uniname2ctype_pool_str608[sizeof("knda")];
-    char uniname2ctype_pool_str610[sizeof("orya")];
-    char uniname2ctype_pool_str611[sizeof("cyrillic")];
-    char uniname2ctype_pool_str616[sizeof("yiii")];
-    char uniname2ctype_pool_str618[sizeof("kannada")];
-    char uniname2ctype_pool_str623[sizeof("xids")];
-    char uniname2ctype_pool_str626[sizeof("limbu")];
-    char uniname2ctype_pool_str635[sizeof("m")];
-    char uniname2ctype_pool_str638[sizeof("unifiedideograph")];
-    char uniname2ctype_pool_str639[sizeof("paragraphseparator")];
-    char uniname2ctype_pool_str640[sizeof("lm")];
-    char uniname2ctype_pool_str645[sizeof("openpunctuation")];
-    char uniname2ctype_pool_str646[sizeof("tagb")];
-    char uniname2ctype_pool_str649[sizeof("kharoshthi")];
-    char uniname2ctype_pool_str651[sizeof("enclosingmark")];
-    char uniname2ctype_pool_str652[sizeof("surrogate")];
-    char uniname2ctype_pool_str653[sizeof("beng")];
-    char uniname2ctype_pool_str654[sizeof("number")];
-    char uniname2ctype_pool_str656[sizeof("telugu")];
-    char uniname2ctype_pool_str660[sizeof("rejang")];
-    char uniname2ctype_pool_str661[sizeof("malayalam")];
-    char uniname2ctype_pool_str674[sizeof("idsb")];
-    char uniname2ctype_pool_str676[sizeof("hexdigit")];
-    char uniname2ctype_pool_str677[sizeof("xpeo")];
-    char uniname2ctype_pool_str689[sizeof("phnx")];
-    char uniname2ctype_pool_str692[sizeof("bopo")];
-    char uniname2ctype_pool_str698[sizeof("bopomofo")];
-    char uniname2ctype_pool_str699[sizeof("dep")];
-    char uniname2ctype_pool_str701[sizeof("sylo")];
-    char uniname2ctype_pool_str705[sizeof("grbase")];
-    char uniname2ctype_pool_str706[sizeof("alphabetic")];
-    char uniname2ctype_pool_str707[sizeof("cwcm")];
-    char uniname2ctype_pool_str708[sizeof("patternsyntax")];
-    char uniname2ctype_pool_str709[sizeof("grek")];
-    char uniname2ctype_pool_str710[sizeof("greek")];
-    char uniname2ctype_pool_str714[sizeof("syrc")];
-    char uniname2ctype_pool_str717[sizeof("syriac")];
-    char uniname2ctype_pool_str722[sizeof("cuneiform")];
-    char uniname2ctype_pool_str723[sizeof("gujr")];
-    char uniname2ctype_pool_str726[sizeof("lydi")];
-    char uniname2ctype_pool_str727[sizeof("gujarati")];
-    char uniname2ctype_pool_str728[sizeof("sylotinagri")];
-    char uniname2ctype_pool_str729[sizeof("lydian")];
-    char uniname2ctype_pool_str748[sizeof("sm")];
-    char uniname2ctype_pool_str751[sizeof("currencysymbol")];
-    char uniname2ctype_pool_str755[sizeof("limb")];
-    char uniname2ctype_pool_str758[sizeof("othergraphemeextend")];
-    char uniname2ctype_pool_str786[sizeof("guru")];
-    char uniname2ctype_pool_str797[sizeof("qmark")];
-    char uniname2ctype_pool_str809[sizeof("mark")];
-    char uniname2ctype_pool_str820[sizeof("quotationmark")];
-    char uniname2ctype_pool_str823[sizeof("hex")];
-    char uniname2ctype_pool_str842[sizeof("upper")];
-    char uniname2ctype_pool_str843[sizeof("wspace")];
-    char uniname2ctype_pool_str848[sizeof("khmr")];
-    char uniname2ctype_pool_str849[sizeof("khmer")];
-    char uniname2ctype_pool_str863[sizeof("oldsoutharabian")];
-    char uniname2ctype_pool_str864[sizeof("spacingmark")];
-    char uniname2ctype_pool_str866[sizeof("punctuation")];
-    char uniname2ctype_pool_str867[sizeof("uppercase")];
-    char uniname2ctype_pool_str878[sizeof("meeteimayek")];
-    char uniname2ctype_pool_str883[sizeof("uppercaseletter")];
-    char uniname2ctype_pool_str884[sizeof("cypriot")];
-    char uniname2ctype_pool_str886[sizeof("buhd")];
-    char uniname2ctype_pool_str887[sizeof("buhid")];
-    char uniname2ctype_pool_str895[sizeof("modifiersymbol")];
-    char uniname2ctype_pool_str898[sizeof("blank")];
-    char uniname2ctype_pool_str908[sizeof("hyphen")];
-    char uniname2ctype_pool_str909[sizeof("bugi")];
-    char uniname2ctype_pool_str935[sizeof("myanmar")];
-    char uniname2ctype_pool_str937[sizeof("imperialaramaic")];
-    char uniname2ctype_pool_str947[sizeof("mathsymbol")];
-    char uniname2ctype_pool_str966[sizeof("cwu")];
-    char uniname2ctype_pool_str975[sizeof("gurmukhi")];
-    char uniname2ctype_pool_str978[sizeof("buginese")];
-    char uniname2ctype_pool_str1022[sizeof("symbol")];
-    char uniname2ctype_pool_str1024[sizeof("osmanya")];
-    char uniname2ctype_pool_str1036[sizeof("bamu")];
-    char uniname2ctype_pool_str1040[sizeof("sk")];
-    char uniname2ctype_pool_str1065[sizeof("bamum")];
-    char uniname2ctype_pool_str1071[sizeof("kayahli")];
-    char uniname2ctype_pool_str1072[sizeof("egyp")];
-    char uniname2ctype_pool_str1140[sizeof("grlink")];
-    char uniname2ctype_pool_str1141[sizeof("xsux")];
-    char uniname2ctype_pool_str1174[sizeof("any")];
-    char uniname2ctype_pool_str1187[sizeof("graphemelink")];
-    char uniname2ctype_pool_str1221[sizeof("mlym")];
-    char uniname2ctype_pool_str1235[sizeof("mymr")];
-    char uniname2ctype_pool_str1277[sizeof("hebrew")];
-    char uniname2ctype_pool_str1542[sizeof("egyptianhieroglyphs")];
-    char uniname2ctype_pool_str1751[sizeof("zyyy")];
+    char uniname2ctype_pool_str415[sizeof("patws")];
+    char uniname2ctype_pool_str416[sizeof("mtei")];
+    char uniname2ctype_pool_str419[sizeof("rjng")];
+    char uniname2ctype_pool_str423[sizeof("term")];
+    char uniname2ctype_pool_str424[sizeof("me")];
+    char uniname2ctype_pool_str427[sizeof("gothic")];
+    char uniname2ctype_pool_str430[sizeof("xdigit")];
+    char uniname2ctype_pool_str432[sizeof("xidcontinue")];
+    char uniname2ctype_pool_str436[sizeof("space")];
+    char uniname2ctype_pool_str441[sizeof("pf")];
+    char uniname2ctype_pool_str442[sizeof("mand")];
+    char uniname2ctype_pool_str445[sizeof("tagbanwa")];
+    char uniname2ctype_pool_str446[sizeof("sundanese")];
+    char uniname2ctype_pool_str451[sizeof("pd")];
+    char uniname2ctype_pool_str452[sizeof("cwl")];
+    char uniname2ctype_pool_str455[sizeof("hang")];
+    char uniname2ctype_pool_str458[sizeof("separator")];
+    char uniname2ctype_pool_str460[sizeof("extender")];
+    char uniname2ctype_pool_str462[sizeof("geor")];
+    char uniname2ctype_pool_str463[sizeof("othermath")];
+    char uniname2ctype_pool_str465[sizeof("georgian")];
+    char uniname2ctype_pool_str467[sizeof("osma")];
+    char uniname2ctype_pool_str468[sizeof("graph")];
+    char uniname2ctype_pool_str469[sizeof("lower")];
+    char uniname2ctype_pool_str473[sizeof("ogrext")];
+    char uniname2ctype_pool_str474[sizeof("goth")];
+    char uniname2ctype_pool_str479[sizeof("p")];
+    char uniname2ctype_pool_str483[sizeof("samr")];
+    char uniname2ctype_pool_str486[sizeof("lu")];
+    char uniname2ctype_pool_str487[sizeof("samaritan")];
+    char uniname2ctype_pool_str489[sizeof("sund")];
+    char uniname2ctype_pool_str491[sizeof("grext")];
+    char uniname2ctype_pool_str494[sizeof("changeswhenuppercased")];
+    char uniname2ctype_pool_str496[sizeof("logicalorderexception")];
+    char uniname2ctype_pool_str500[sizeof("modifierletter")];
+    char uniname2ctype_pool_str502[sizeof("xids")];
+    char uniname2ctype_pool_str504[sizeof("cwt")];
+    char uniname2ctype_pool_str506[sizeof("zp")];
+    char uniname2ctype_pool_str507[sizeof("lowercase")];
+    char uniname2ctype_pool_str509[sizeof("ps")];
+    char uniname2ctype_pool_str510[sizeof("lowercaseletter")];
+    char uniname2ctype_pool_str511[sizeof("deprecated")];
+    char uniname2ctype_pool_str520[sizeof("punct")];
+    char uniname2ctype_pool_str523[sizeof("oupper")];
+    char uniname2ctype_pool_str527[sizeof("tfng")];
+    char uniname2ctype_pool_str532[sizeof("saurashtra")];
+    char uniname2ctype_pool_str537[sizeof("dashpunctuation")];
+    char uniname2ctype_pool_str538[sizeof("digit")];
+    char uniname2ctype_pool_str540[sizeof("sterm")];
+    char uniname2ctype_pool_str544[sizeof("xpeo")];
+    char uniname2ctype_pool_str546[sizeof("cwcf")];
+    char uniname2ctype_pool_str548[sizeof("phnx")];
+    char uniname2ctype_pool_str550[sizeof("phagspa")];
+    char uniname2ctype_pool_str557[sizeof("changeswhencasemapped")];
+    char uniname2ctype_pool_str561[sizeof("newline")];
+    char uniname2ctype_pool_str562[sizeof("patternsyntax")];
+    char uniname2ctype_pool_str563[sizeof("linb")];
+    char uniname2ctype_pool_str564[sizeof("bali")];
+    char uniname2ctype_pool_str566[sizeof("idstrinaryoperator")];
+    char uniname2ctype_pool_str568[sizeof("newtailue")];
+    char uniname2ctype_pool_str569[sizeof("word")];
+    char uniname2ctype_pool_str571[sizeof("telugu")];
+    char uniname2ctype_pool_str574[sizeof("arab")];
+    char uniname2ctype_pool_str576[sizeof("spaceseparator")];
+    char uniname2ctype_pool_str577[sizeof("graphemebase")];
+    char uniname2ctype_pool_str578[sizeof("brai")];
+    char uniname2ctype_pool_str580[sizeof("limbu")];
+    char uniname2ctype_pool_str583[sizeof("openpunctuation")];
+    char uniname2ctype_pool_str584[sizeof("linearb")];
+    char uniname2ctype_pool_str587[sizeof("paragraphseparator")];
+    char uniname2ctype_pool_str591[sizeof("brahmi")];
+    char uniname2ctype_pool_str597[sizeof("caseignorable")];
+    char uniname2ctype_pool_str599[sizeof("tibetan")];
+    char uniname2ctype_pool_str601[sizeof("hex")];
+    char uniname2ctype_pool_str608[sizeof("number")];
+    char uniname2ctype_pool_str613[sizeof("tibt")];
+    char uniname2ctype_pool_str617[sizeof("bengali")];
+    char uniname2ctype_pool_str618[sizeof("brah")];
+    char uniname2ctype_pool_str625[sizeof("braille")];
+    char uniname2ctype_pool_str633[sizeof("graphemeextend")];
+    char uniname2ctype_pool_str636[sizeof("shaw")];
+    char uniname2ctype_pool_str637[sizeof("dep")];
+    char uniname2ctype_pool_str641[sizeof("m")];
+    char uniname2ctype_pool_str646[sizeof("lm")];
+    char uniname2ctype_pool_str653[sizeof("gujr")];
+    char uniname2ctype_pool_str656[sizeof("ugar")];
+    char uniname2ctype_pool_str657[sizeof("gujarati")];
+    char uniname2ctype_pool_str659[sizeof("balinese")];
+    char uniname2ctype_pool_str660[sizeof("bidic")];
+    char uniname2ctype_pool_str662[sizeof("hebr")];
+    char uniname2ctype_pool_str667[sizeof("malayalam")];
+    char uniname2ctype_pool_str671[sizeof("bidicontrol")];
+    char uniname2ctype_pool_str673[sizeof("ugaritic")];
+    char uniname2ctype_pool_str676[sizeof("cuneiform")];
+    char uniname2ctype_pool_str679[sizeof("olck")];
+    char uniname2ctype_pool_str681[sizeof("nko")];
+    char uniname2ctype_pool_str682[sizeof("nkoo")];
+    char uniname2ctype_pool_str688[sizeof("phag")];
+    char uniname2ctype_pool_str692[sizeof("kana")];
+    char uniname2ctype_pool_str693[sizeof("olchiki")];
+    char uniname2ctype_pool_str694[sizeof("kali")];
+    char uniname2ctype_pool_str697[sizeof("whitespace")];
+    char uniname2ctype_pool_str701[sizeof("sarb")];
+    char uniname2ctype_pool_str710[sizeof("nonspacingmark")];
+    char uniname2ctype_pool_str714[sizeof("kaithi")];
+    char uniname2ctype_pool_str718[sizeof("lyci")];
+    char uniname2ctype_pool_str719[sizeof("mong")];
+    char uniname2ctype_pool_str720[sizeof("ogam")];
+    char uniname2ctype_pool_str721[sizeof("lycian")];
+    char uniname2ctype_pool_str722[sizeof("yi")];
+    char uniname2ctype_pool_str725[sizeof("cyrl")];
+    char uniname2ctype_pool_str727[sizeof("katakana")];
+    char uniname2ctype_pool_str729[sizeof("orya")];
+    char uniname2ctype_pool_str730[sizeof("cyrillic")];
+    char uniname2ctype_pool_str735[sizeof("yiii")];
+    char uniname2ctype_pool_str741[sizeof("upper")];
+    char uniname2ctype_pool_str742[sizeof("punctuation")];
+    char uniname2ctype_pool_str743[sizeof("orkh")];
+    char uniname2ctype_pool_str748[sizeof("khar")];
+    char uniname2ctype_pool_str764[sizeof("kthi")];
+    char uniname2ctype_pool_str765[sizeof("ogham")];
+    char uniname2ctype_pool_str766[sizeof("cwcm")];
+    char uniname2ctype_pool_str775[sizeof("hexdigit")];
+    char uniname2ctype_pool_str776[sizeof("sm")];
+    char uniname2ctype_pool_str779[sizeof("uppercase")];
+    char uniname2ctype_pool_str782[sizeof("uppercaseletter")];
+    char uniname2ctype_pool_str785[sizeof("bopo")];
+    char uniname2ctype_pool_str789[sizeof("glag")];
+    char uniname2ctype_pool_str790[sizeof("knda")];
+    char uniname2ctype_pool_str791[sizeof("bopomofo")];
+    char uniname2ctype_pool_str792[sizeof("idsb")];
+    char uniname2ctype_pool_str799[sizeof("alphabetic")];
+    char uniname2ctype_pool_str800[sizeof("kannada")];
+    char uniname2ctype_pool_str812[sizeof("tglg")];
+    char uniname2ctype_pool_str813[sizeof("unifiedideograph")];
+    char uniname2ctype_pool_str820[sizeof("tagalog")];
+    char uniname2ctype_pool_str821[sizeof("currencysymbol")];
+    char uniname2ctype_pool_str822[sizeof("lydi")];
+    char uniname2ctype_pool_str825[sizeof("lydian")];
+    char uniname2ctype_pool_str830[sizeof("cherokee")];
+    char uniname2ctype_pool_str839[sizeof("surrogate")];
+    char uniname2ctype_pool_str842[sizeof("sylo")];
+    char uniname2ctype_pool_str853[sizeof("rejang")];
+    char uniname2ctype_pool_str855[sizeof("syrc")];
+    char uniname2ctype_pool_str858[sizeof("syriac")];
+    char uniname2ctype_pool_str869[sizeof("sylotinagri")];
+    char uniname2ctype_pool_str874[sizeof("xsux")];
+    char uniname2ctype_pool_str877[sizeof("limb")];
+    char uniname2ctype_pool_str881[sizeof("kharoshthi")];
+    char uniname2ctype_pool_str889[sizeof("guru")];
+    char uniname2ctype_pool_str891[sizeof("enclosingmark")];
+    char uniname2ctype_pool_str910[sizeof("oldsoutharabian")];
+    char uniname2ctype_pool_str917[sizeof("imperialaramaic")];
+    char uniname2ctype_pool_str921[sizeof("wspace")];
+    char uniname2ctype_pool_str924[sizeof("cwu")];
+    char uniname2ctype_pool_str938[sizeof("buhd")];
+    char uniname2ctype_pool_str939[sizeof("buhid")];
+    char uniname2ctype_pool_str944[sizeof("othergraphemeextend")];
+    char uniname2ctype_pool_str966[sizeof("tagb")];
+    char uniname2ctype_pool_str972[sizeof("quotationmark")];
+    char uniname2ctype_pool_str977[sizeof("cypriot")];
+    char uniname2ctype_pool_str986[sizeof("beng")];
+    char uniname2ctype_pool_str994[sizeof("modifiersymbol")];
+    char uniname2ctype_pool_str1001[sizeof("qmark")];
+    char uniname2ctype_pool_str1006[sizeof("hyphen")];
+    char uniname2ctype_pool_str1017[sizeof("mark")];
+    char uniname2ctype_pool_str1051[sizeof("grbase")];
+    char uniname2ctype_pool_str1057[sizeof("myanmar")];
+    char uniname2ctype_pool_str1061[sizeof("khmr")];
+    char uniname2ctype_pool_str1062[sizeof("khmer")];
+    char uniname2ctype_pool_str1065[sizeof("spacingmark")];
+    char uniname2ctype_pool_str1069[sizeof("mathsymbol")];
+    char uniname2ctype_pool_str1109[sizeof("bamu")];
+    char uniname2ctype_pool_str1112[sizeof("meeteimayek")];
+    char uniname2ctype_pool_str1128[sizeof("grek")];
+    char uniname2ctype_pool_str1129[sizeof("greek")];
+    char uniname2ctype_pool_str1166[sizeof("symbol")];
+    char uniname2ctype_pool_str1168[sizeof("osmanya")];
+    char uniname2ctype_pool_str1180[sizeof("bugi")];
+    char uniname2ctype_pool_str1190[sizeof("bamum")];
+    char uniname2ctype_pool_str1222[sizeof("blank")];
+    char uniname2ctype_pool_str1247[sizeof("batk")];
+    char uniname2ctype_pool_str1248[sizeof("batak")];
+    char uniname2ctype_pool_str1275[sizeof("buginese")];
+    char uniname2ctype_pool_str1332[sizeof("gurmukhi")];
+    char uniname2ctype_pool_str1346[sizeof("mlym")];
+    char uniname2ctype_pool_str1360[sizeof("mymr")];
+    char uniname2ctype_pool_str1379[sizeof("egyp")];
+    char uniname2ctype_pool_str1395[sizeof("kayahli")];
+    char uniname2ctype_pool_str1412[sizeof("any")];
+    char uniname2ctype_pool_str1472[sizeof("sk")];
+    char uniname2ctype_pool_str1526[sizeof("hebrew")];
+    char uniname2ctype_pool_str1751[sizeof("grlink")];
+    char uniname2ctype_pool_str1811[sizeof("graphemelink")];
+    char uniname2ctype_pool_str2016[sizeof("egyptianhieroglyphs")];
+    char uniname2ctype_pool_str2124[sizeof("zyyy")];
 #endif /* USE_UNICODE_PROPERTIES */
   };
 static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
@@ -16880,14 +17297,18 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "nl",
     "lao",
     "laoo",
-    "zl",
-    "z",
-    "control",
     "qaac",
+    "control",
+    "joinc",
     "ci",
+    "java",
     "lana",
-    "oalpha",
     "qaai",
+    "oalpha",
+    "joincontrol",
+    "zl",
+    "vai",
+    "vaii",
     "arabic",
     "cari",
     "oriya",
@@ -16897,361 +17318,366 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "olower",
     "latn",
     "latin",
+    "z",
     "ital",
-    "hano",
     "lt",
+    "hano",
+    "canadianaboriginal",
     "han",
     "hanunoo",
-    "canadianaboriginal",
+    "tavt",
     "hangul",
     "hani",
     "nchar",
-    "zinh",
-    "tale",
-    "loe",
+    "avestan",
     "hira",
-    "taile",
-    "lineseparator",
+    "tale",
+    "zinh",
     "thaa",
+    "initialpunctuation",
+    "variationselector",
     "hiragana",
     "thai",
-    "initialpunctuation",
+    "taile",
+    "lineseparator",
     "other",
     "thaana",
-    "cher",
+    "loe",
     "otherletter",
     "othernumber",
-    "letter",
-    "sc",
-    "so",
-    "taiviet",
-    "noncharactercodepoint",
-    "ethi",
-    "cans",
-    "titlecaseletter",
-    "ascii",
-    "letternumber",
-    "otheralphabetic",
-    "otherlowercase",
     "idc",
     "oidc",
-    "sinhala",
-    "terminalpunctuation",
+    "cher",
+    "javanese",
+    "letter",
     "olditalic",
     "di",
-    "otheridcontinue",
     "odi",
     "dia",
-    "otheridstart",
+    "titlecaseletter",
+    "taiviet",
+    "sc",
     "oldturkic",
+    "so",
+    "noncharactercodepoint",
     "diacritic",
     "oldpersian",
+    "ethi",
     "radical",
-    "sinh",
+    "letternumber",
+    "cans",
+    "otheralphabetic",
+    "ascii",
+    "otherlowercase",
+    "terminalpunctuation",
+    "otheridstart",
+    "sinhala",
+    "otheridcontinue",
+    "deva",
     "ideo",
-    "shavian",
+    "avst",
     "format",
-    "inscriptionalparthian",
-    "vai",
-    "vaii",
-    "tifinagh",
-    "cf",
-    "othersymbol",
-    "ideographic",
+    "devanagari",
     "inherited",
-    "glagolitic",
+    "ideographic",
+    "cf",
+    "sinh",
+    "tifinagh",
     "idcontinue",
+    "shavian",
+    "inscriptionalparthian",
+    "nd",
+    "othersymbol",
+    "pc",
+    "po",
+    "decimalnumber",
     "asciihexdigit",
+    "coptic",
     "inscriptionalpahlavi",
-    "s",
-    "gothic",
-    "cs",
-    "avestan",
-    "tavt",
-    "zs",
-    "decimalnumber",
-    "tagbanwa",
-    "joinc",
-    "geor",
-    "hang",
-    "georgian",
     "cased",
-    "joincontrol",
     "oids",
-    "variationselector",
-    "graph",
     "changeswhenlowercased",
-    "nd",
-    "goth",
-    "pc",
-    "po",
-    "ogrext",
-    "coptic",
-    "grext",
-    "logicalorderexception",
-    "idst",
 #endif /* USE_UNICODE_PROPERTIES */
     "alpha",
 #ifdef USE_UNICODE_PROPERTIES
     "pi",
-    "dsrt",
-    "dash",
-    "otherdefaultignorablecodepoint",
+    "s",
+    "runic",
+    "cs",
+    "vs",
     "copt",
-    "idstart",
+    "otherdefaultignorablecodepoint",
     "closepunctuation",
-    "changeswhentitlecased",
-    "lepc",
-    "avst",
+    "idst",
+    "talu",
+    "runr",
+    "dsrt",
     "cprt",
-    "runic",
     "patsyn",
-    "mc",
-    "tfng",
-    "lepcha",
+    "zs",
+    "lepc",
+    "dash",
     "prti",
     "print",
+    "idstart",
     "phli",
+    "lepcha",
+    "changeswhentitlecased",
+    "phoenician",
+    "mc",
+    "telu",
     "mn",
-    "idsbinaryoperator",
-    "talu",
-    "runr",
-    "graphemebase",
+    "changeswhencasefolded",
     "common",
 #endif /* USE_UNICODE_PROPERTIES */
     "alnum",
-#ifndef USE_UNICODE_PROPERTIES
-    "xdigit",
-    "newline",
-    "upper",
-    "ascii",
-    "cntrl",
-#else /* USE_UNICODE_PROPERTIES */
-    "phoenician",
-    "deva",
-    "changeswhencasefolded",
+#ifdef USE_UNICODE_PROPERTIES
     "pe",
+    "idsbinaryoperator",
+    "sd",
     "mongolian",
-    "armn",
-    "deseret",
+    "mandaic",
     "softdotted",
+    "armn",
+    "otherpunctuation",
+    "privateuse",
     "armi",
-    "devanagari",
-    "digit",
-    "caseignorable",
+    "ahex",
+    "ext",
+    "uideo",
     "taml",
     "tamil",
-    "telu",
-    "ids",
+    "xidc",
     "armenian",
-    "sd",
-    "privateuse",
-    "assigned",
-    "cham",
-    "omath",
-    "otherpunctuation",
+    "deseret",
+    "unassigned",
+    "ethiopic",
     "taitham",
+    "cham",
     "defaultignorablecodepoint",
-    "glag",
-    "ethiopic",
-    "vs",
-    "me",
-    "cwl",
-    "mtei",
-    "math",
-    "term",
-    "java",
-    "tglg",
-    "lower",
-    "patternwhitespace",
+    "omath",
+    "ids",
     "finalpunctuation",
-    "tagalog",
-    "patws",
     "lisu",
+    "assigned",
     "otheruppercase",
+    "saur",
+    "xidstart",
+    "math",
+    "glagolitic",
+    "patternwhitespace",
+    "patws",
+    "mtei",
+    "rjng",
+    "term",
+    "me",
+    "gothic",
+#endif /* USE_UNICODE_PROPERTIES */
+    "xdigit",
+#ifndef USE_UNICODE_PROPERTIES
+    "newline",
+    "upper",
+    "ascii",
+    "cntrl",
+#else /* USE_UNICODE_PROPERTIES */
+    "xidcontinue",
 #endif /* USE_UNICODE_PROPERTIES */
     "space",
+#ifndef USE_UNICODE_PROPERTIES
+    "word",
+    "lower",
+#else /* USE_UNICODE_PROPERTIES */
+    "pf",
+    "mand",
+    "tagbanwa",
+    "sundanese",
+    "pd",
+    "cwl",
+    "hang",
+    "separator",
+    "extender",
+    "geor",
+    "othermath",
+    "georgian",
+    "osma",
+#endif /* USE_UNICODE_PROPERTIES */
+    "graph",
 #ifdef USE_UNICODE_PROPERTIES
-    "graphemeextend",
-    "saur",
-    "uideo",
+    "lower",
+    "ogrext",
+    "goth",
+    "p",
+    "samr",
+    "lu",
+    "samaritan",
+    "sund",
+    "grext",
+    "changeswhenuppercased",
+    "logicalorderexception",
+    "modifierletter",
+    "xids",
+    "cwt",
+    "zp",
     "lowercase",
-    "rjng",
-    "osma",
+    "ps",
+    "lowercaseletter",
+    "deprecated",
+    "punct",
+    "oupper",
+    "tfng",
+    "saurashtra",
+    "dashpunctuation",
+#endif /* USE_UNICODE_PROPERTIES */
+    "digit",
+#ifndef USE_UNICODE_PROPERTIES
+    "blank"
+#else /* USE_UNICODE_PROPERTIES */
+    "sterm",
+    "xpeo",
+    "cwcf",
+    "phnx",
+    "phagspa",
+    "changeswhencasemapped",
+    "newline",
+    "patternsyntax",
     "linb",
     "bali",
-    "cwt",
-    "separator",
-    "othermath",
-    "unassigned",
-    "lowercaseletter",
+    "idstrinaryoperator",
+    "newtailue",
+    "word",
+    "telugu",
     "arab",
-    "samr",
+    "spaceseparator",
+    "graphemebase",
     "brai",
-    "sundanese",
-    "samaritan",
-    "ahex",
+    "limbu",
+    "openpunctuation",
     "linearb",
-    "pf",
-    "ext",
+    "paragraphseparator",
+    "brahmi",
+    "caseignorable",
+    "tibetan",
+    "hex",
+    "number",
+    "tibt",
+    "bengali",
+    "brah",
+    "braille",
+    "graphemeextend",
+    "shaw",
+    "dep",
+    "m",
+    "lm",
+    "gujr",
+    "ugar",
+    "gujarati",
+    "balinese",
+    "bidic",
+    "hebr",
+    "malayalam",
+    "bidicontrol",
+    "ugaritic",
+    "cuneiform",
     "olck",
     "nko",
     "nkoo",
-    "newline",
-    "tibetan",
-    "javanese",
-    "bengali",
-    "newtailue",
+    "phag",
     "kana",
     "olchiki",
     "kali",
-    "cwcf",
-    "ps",
-    "braille",
-    "tibt",
-    "sterm",
-    "ugar",
+    "whitespace",
+    "sarb",
     "nonspacingmark",
-    "phag",
     "kaithi",
-    "xidc",
-    "balinese",
+    "lyci",
     "mong",
     "ogam",
-    "modifierletter",
-    "ugaritic",
-    "katakana",
-    "pd",
-    "hebr",
-    "p",
-    "orkh",
-#endif /* USE_UNICODE_PROPERTIES */
-    "word",
-#ifndef USE_UNICODE_PROPERTIES
-    "lower",
-    "graph",
-    "digit",
-    "blank"
-#else /* USE_UNICODE_PROPERTIES */
-    "saurashtra",
-    "khar",
-    "sund",
-    "zp",
-    "changeswhenuppercased",
-    "xidstart",
-    "shaw",
-    "kthi",
-    "ogham",
-    "spaceseparator",
-    "changeswhencasemapped",
-    "sarb",
-    "xidcontinue",
-    "bidic",
-    "deprecated",
-    "xdigit",
-    "bidicontrol",
-    "lu",
-    "dashpunctuation",
-    "extender",
-    "idstrinaryoperator",
-    "cherokee",
-    "punct",
-    "phagspa",
-    "oupper",
-    "lyci",
-    "whitespace",
     "lycian",
     "yi",
     "cyrl",
-    "knda",
+    "katakana",
     "orya",
     "cyrillic",
     "yiii",
-    "kannada",
-    "xids",
-    "limbu",
-    "m",
-    "unifiedideograph",
-    "paragraphseparator",
-    "lm",
-    "openpunctuation",
-    "tagb",
-    "kharoshthi",
-    "enclosingmark",
-    "surrogate",
-    "beng",
-    "number",
-    "telugu",
-    "rejang",
-    "malayalam",
-    "idsb",
+    "upper",
+    "punctuation",
+    "orkh",
+    "khar",
+    "kthi",
+    "ogham",
+    "cwcm",
     "hexdigit",
-    "xpeo",
-    "phnx",
+    "sm",
+    "uppercase",
+    "uppercaseletter",
     "bopo",
+    "glag",
+    "knda",
     "bopomofo",
-    "dep",
-    "sylo",
-    "grbase",
+    "idsb",
     "alphabetic",
-    "cwcm",
-    "patternsyntax",
-    "grek",
-    "greek",
+    "kannada",
+    "tglg",
+    "unifiedideograph",
+    "tagalog",
+    "currencysymbol",
+    "lydi",
+    "lydian",
+    "cherokee",
+    "surrogate",
+    "sylo",
+    "rejang",
     "syrc",
     "syriac",
-    "cuneiform",
-    "gujr",
-    "lydi",
-    "gujarati",
     "sylotinagri",
-    "lydian",
-    "sm",
-    "currencysymbol",
+    "xsux",
     "limb",
-    "othergraphemeextend",
+    "kharoshthi",
     "guru",
-    "qmark",
-    "mark",
-    "quotationmark",
-    "hex",
-    "upper",
-    "wspace",
-    "khmr",
-    "khmer",
+    "enclosingmark",
     "oldsoutharabian",
-    "spacingmark",
-    "punctuation",
-    "uppercase",
-    "meeteimayek",
-    "uppercaseletter",
-    "cypriot",
+    "imperialaramaic",
+    "wspace",
+    "cwu",
     "buhd",
     "buhid",
+    "othergraphemeextend",
+    "tagb",
+    "quotationmark",
+    "cypriot",
+    "beng",
     "modifiersymbol",
-    "blank",
+    "qmark",
     "hyphen",
-    "bugi",
+    "mark",
+    "grbase",
     "myanmar",
-    "imperialaramaic",
+    "khmr",
+    "khmer",
+    "spacingmark",
     "mathsymbol",
-    "cwu",
-    "gurmukhi",
-    "buginese",
+    "bamu",
+    "meeteimayek",
+    "grek",
+    "greek",
     "symbol",
     "osmanya",
-    "bamu",
-    "sk",
+    "bugi",
     "bamum",
-    "kayahli",
-    "egyp",
-    "grlink",
-    "xsux",
-    "any",
-    "graphemelink",
+    "blank",
+    "batk",
+    "batak",
+    "buginese",
+    "gurmukhi",
     "mlym",
     "mymr",
+    "egyp",
+    "kayahli",
+    "any",
+    "sk",
     "hebrew",
+    "grlink",
+    "graphemelink",
     "egyptianhieroglyphs",
     "zyyy"
 #endif /* USE_UNICODE_PROPERTIES */
@@ -17289,18 +17715,25 @@ uniname2ctype_p (str, len)
       {-1},
       {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str18,                                      93},
       {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str19,                                     93},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str20,                                       51},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str21,                                        50},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str20,                                    127},
+      {-1},
       {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str22,                                  18},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str23,                                   170},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str24,                                    127},
       {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str25,                                       59},
-      {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str27,                                    157},
       {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str28,                                    150},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str33,                                  175},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str34,                                    113},
-      {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str30,                                    113},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str33,                                  178},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str34,                             170},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str36,                                       51},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str37,                                     142},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str38,                                    142},
+      {-1},
       {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str40,                                   79},
       {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str41,                                    147},
       {-1},
@@ -17310,528 +17743,601 @@ uniname2ctype_p (str, len)
       {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str46,                                     3},
       {-1}, {-1},
       {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str49,                     38},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str50,                                  179},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str50,                                  182},
       {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str51,                                     74},
       {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str52,                                    74},
-      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str53,                                        50},
+      {-1}, {-1},
       {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str56,                                    110},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str65,                                    115},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str66,                                       27},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str70,                                    115},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str71,                      100},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str68,                                     108},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str73,                                     108},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str70,                                 115},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str71,                      100},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str75,                                 115},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str76,                                    151},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str73,                                   97},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str74,                                    108},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str78,                                   97},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str79,                                    108},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str76,                                   181},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str77,                                    113},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str83,                                    119},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str81,                                   184},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str85,                                     190},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str86,                                    105},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str83,                                 152},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str91,                                    105},
       {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str91,                                   119},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str92,                            51},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str94,                                     81},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str97,                                105},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str98,                                     92},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str96,                                    119},
       {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str98,                                    113},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str99,                                     81},
       {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str100,                       42},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str101,                                    17},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str101,                       197},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str102,                                105},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str103,                                     92},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str104,                                   119},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str105,                            51},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str106,                                    17},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str103,                                   81},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str107,                                     99},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str111,                              26},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str108,                                   81},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str111,                                     193},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str116,                              26},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str113,                              36},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str114,                                   23},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str118,                              36},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str121,                                      66},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str116,                                       46},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str123,                                    195},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str118,                                       49},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str123,                                 151},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str128,                   181},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str129,                                     98},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str130,                                    100},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str135,                          27},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str136,                                    14},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str125,                                     99},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str126,                                157},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str127,                                   23},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str128,                               110},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str129,                                       69},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str132,                                     190},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str133,                                     180},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str138,                             35},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str139,                         175},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str135,                          27},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str136,                                 151},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str141,                          179},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str138,                                       46},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str139,                               163},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str140,                                       49},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str141,                   184},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str144,                                      66},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str144,                               180},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str145,                              132},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str146,                                    192},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str147,                                  91},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str148,                     171},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str147,                                     98},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str148,                                 188},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str151,                               110},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str152,                                       69},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str153,                         192},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str155,                                     187},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str156,                                     177},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str151,                             35},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str152,                                    100},
       {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str161,                            191},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str162,                               163},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str157,                         178},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str158,                                    14},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str159,                          182},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str161,                     174},
       {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str167,                               177},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str168,                              132},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str166,                            194},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str171,                                 185},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str179,                                     91},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str183,                                    176},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str169,                                  91},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str185,                                 122},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str171,                         195},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str172,                                     82},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str173,                                    179},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str180,                                    152},
+      {-1}, {-1}, {-1}, {-1}, {-1},
       {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str186,                                   19},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str189,                               82},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str193,                               113},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str197,                             179},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str192,                   161},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str203,                                       19},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str206,                                     91},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str207,                                130},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str208,                               66},
       {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str196,                                     142},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str197,                                    142},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str212,                                 122},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str214,                   161},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str218,                                       34},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str202,                                130},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str203,                                       19},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str232,                              49},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str205,                              49},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str243,                                       38},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str207,                             176},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str245,                                       43},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str246,                            34},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str247,                           177},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str250,                                  127},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str251,                    162},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str252,                                    58},
       {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str211,                               113},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str212,                              129},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str218,                               66},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str256,                                    194},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str220,                           174},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str258,                    60},
       {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str224,                    162},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str225,                                        45},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str226,                                  111},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str227,                                       22},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str229,                                 152},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str262,                                     1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str263,                                       42},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str235,                                    151},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str236,                                       53},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str243,                            34},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str244,                                117},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str245,                                   167},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str269,                                        45},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str270,                                   102},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str271,                                       22},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str275,                                      197},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str276,                                    127},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str280,          190},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str281,                         40},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str248,                                     96},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str249,                                     97},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str284,                                    187},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str285,                                    128},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str286,                                    102},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str291,                                    112},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str292,                                    124},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str251,                                 96},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str294,                                  199},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str253,                                    58},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str256,                             167},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str257,                                    191},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str296,                                       53},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str260,                       194},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str299,                                    140},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str262,                                     5},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str263,                    60},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str264,                                       34},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str268,                                    111},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str269,                                       38},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str301,                                    171},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str302,                                    161},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str303,                                     7},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str271,                                       43},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str272,                                  182},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str305,                                  65},
       {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str276,                                  127},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str277,                                    70},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str309,                                    162},
       {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str282,                   190},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str314,                                  140},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str285,                                    184},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str288,                                     1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str289,                                       42},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str292,                                    112},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str317,                    62},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str319,                              136},
       {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str297,                                    168},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str298,          187},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str302,                                    127},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str324,                                       30},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str329,                                     88},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str334,                                       32},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str337,                    63},
       {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str306,                                  65},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str307,                         40},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str341,                                   73},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str342,                                    13},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str343,                                       40},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str344,                       186},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str309,                    62},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str312,                                    140},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str317,                                    152},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str318,                                    124},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str319,                                   102},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str320,                                  196},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str321,                                       30},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str346,                                      192},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str347,                               104},
       {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str326,                                    130},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str327,                                  140},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str328,                                    161},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str329,                                     7},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str330,                                    162},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str331,                                       32},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str332,                       183},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str352,                                 167},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str353,                              192},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str334,                                    128},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str335,                                    102},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str355,                                     77},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str337,                             71},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str338,                                   73},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str339,                                    13},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str340,                              136},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str341,                                     82},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str342,                    63},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str343,                                       40},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str344,                               104},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str352,                                     77},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str353,                                 112},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str354,                              189},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str357,                                    159},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str358,                               82},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str357,                         43},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str360,                                     4},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str361,                            59},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str362,                                     87},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str363,                                    87},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str359,                               21},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str360,                                    159},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str361,                                    177},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str362,                                     181},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str363,                                   189},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str365,                                     88},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str366,                                      65},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str367,                                 77},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str365,                                     87},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str366,                                    87},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str370,                                      189},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str372,                               21},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str373,                                 16},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str369,                                     68},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str370,                                 77},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str378,                                 112},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str379,                               20},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str380,                                 98},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str375,                                    149},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str382,                                 150},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str383,                                    149},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str384,                69},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str385,                                   175},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str377,                                   172},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str378,                         43},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str379,                                 150},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str387,                                      65},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str391,                         41},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str381,                69},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str393,                                    155},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str394,                                 16},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str395,                          183},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str403,                                    143},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str387,                                    129},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str388,                                 98},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str390,                                      194},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str395,                                       31},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str396,                                      60},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str400,                                    158},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str404,                                     54},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str409,                                 67},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str407,                                    171},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str408,                                    157},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str410,                                    114},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str412,                                     54},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str413,                              129},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str414,                       198},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str415,                                   198},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str416,                                    158},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str413,                                     6},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str414,                       195},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str419,                                    145},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str423,                                    174},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str424,                                       31},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str417,                         41},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str418,                                 114},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str419,                                   195},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str420,                                    155},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str426,                          180},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str427,                                     9},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str429,                           70},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str430,                                    143},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str435,                                   186},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str427,                                  111},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str438,                                56},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str430,                                   11},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str440,                                    145},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str442,                                    123},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str444,                                    120},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str445,                                    134},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str432,                              68},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str436,                                     9},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str441,                                       41},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str442,                                    167},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str448,                                      62},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str449,                                50},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str450,                               172},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str451,                               20},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str445,                                117},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str446,                               139},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str451,                                       39},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str452,                                      60},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str454,                          24},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str455,                                     79},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str455,                                     97},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str458,                                    154},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str459,                                    125},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str460,                               139},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str458,                                50},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str462,                               154},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str463,                                    174},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str460,                                181},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str465,                                 120},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str462,                                     96},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str463,                               175},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str467,                                       41},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str465,                                 96},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str469,                                     178},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str467,                                    123},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str468,                                     5},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str469,                                     6},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str473,                                  185},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str474,                                    111},
       {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str474,                                    141},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str476,                                     138},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str477,                                    138},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str479,                                   0},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str480,                                  94},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str481,                                157},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str479,                                        37},
       {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str485,                                  83},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str486,                               128},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str487,                                    106},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str488,                                 141},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str489,                                    144},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str490,                                     63},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str491,                                       44},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str483,                                    154},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str486,                                       28},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str487,                               154},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str493,                                 125},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str494,                                     94},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str502,                                   193},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str489,                                    139},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str504,                                    121},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str505,                           32},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str491,                                    70},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str508,                                    137},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str509,                                  164},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str512,                                     68},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str494,                    61},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str514,                                134},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str515,                                    104},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str516,                                    101},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str496,                   193},
       {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str520,                           25},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str521,                                121},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str522,                                106},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str523,                                       39},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str500,                           25},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str525,                                     78},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str531,                                        37},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str502,                                     67},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str533,                                    163},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str536,                                     12},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str537,                              143},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str538,                                    133},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str539,                                    139},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str504,                                      62},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str506,                                       52},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str507,                                56},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str509,                                       44},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str510,                          24},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str511,                              191},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str520,                                     8},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str542,                                       52},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str548,                    61},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str523,                                  183},
       {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str552,                                 67},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str553,                                    122},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str554,                                    164},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str527,                                    130},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str532,                              143},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str537,                          39},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str538,                                     4},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str556,                                   101},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str540,                                   196},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str544,                                    132},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str558,                           53},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str559,                    64},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str560,                                    160},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str546,                                     63},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str562,                              68},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str548,                                    136},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str564,                                   166},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str570,                              188},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str573,                                   11},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str550,                                 137},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str557,                    64},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str561,                                   0},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str562,                           199},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str563,                                    120},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str564,                                    134},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str575,                             166},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str584,                                       28},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str566,                      187},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str568,                               128},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str569,                                     12},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str571,                                   88},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str587,                          39},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str574,                                     79},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str576,                           53},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str577,                             71},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str578,                                    125},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str580,                                   118},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str590,                                178},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str583,                          44},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str584,                                 120},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str593,                      184},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str594,                                 99},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str595,                                     8},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str587,                       52},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str591,                                  166},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str597,                            59},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str597,                                 137},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str598,                                  180},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str599,                                    146},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str599,                                  94},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str601,                              165},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str602,                                  146},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str603,                                      109},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str601,                                     176},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str608,                                   33},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str613,                                     94},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str617,                                  83},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str618,                                    166},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str625,                                 125},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str633,                           70},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str606,                                     76},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str636,                                    122},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str637,                                     191},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str641,                                        29},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str646,                                       25},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str653,                                     85},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str656,                                    121},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str657,                                 85},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str608,                                     89},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str659,                                134},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str660,                                   169},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str610,                                     86},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str611,                                 76},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str662,                                     78},
       {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str616,                                    109},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str667,                                90},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str671,                             169},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str618,                                  89},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str623,                                     67},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str673,                                121},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str626,                                   118},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str635,                                        29},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str676,                               135},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str638,                        186},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str639,                       52},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str640,                                       25},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str645,                          44},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str646,                                    117},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str649,                              133},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str651,                            31},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str652,                                22},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str653,                                     83},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str654,                                   33},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str679,                                    141},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str656,                                   88},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str681,                                     138},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str682,                                    138},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str688,                                    137},
       {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str660,                                  145},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str661,                                90},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str692,                                    106},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str693,                                 141},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str694,                                    144},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str697,                              168},
       {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str674,                                    183},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str701,                                    160},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str710,                           32},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str714,                                  164},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str718,                                    146},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str719,                                    104},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str720,                                    101},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str721,                                  146},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str722,                                      109},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str725,                                     76},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str676,                                173},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str677,                                    132},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str727,                                106},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str729,                                     86},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str730,                                 76},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str735,                                    109},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str741,                                    10},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str742,                              37},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str743,                                    163},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str748,                                    133},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str764,                                    164},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str765,                                   101},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str766,                                     64},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str775,                                176},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str776,                                       48},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str689,                                    136},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str779,                                57},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str692,                                    107},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str698,                                107},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str699,                                     188},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str701,                                    131},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str705,                                   71},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str706,                               55},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str707,                                     64},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str708,                           196},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str709,                                     75},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str710,                                    75},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str782,                          28},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str785,                                    107},
       {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str714,                                     80},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str789,                                    129},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str790,                                     89},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str791,                                107},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str792,                                    186},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str799,                               55},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str800,                                  89},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str812,                                    114},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str813,                        189},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str820,                                 114},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str821,                           46},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str822,                                    148},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str717,                                   80},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str825,                                  148},
       {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str722,                               135},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str723,                                     85},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str830,                                 99},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str839,                                22},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str726,                                    148},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str727,                                 85},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str728,                             131},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str729,                                  148},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str842,                                    131},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str853,                                  145},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str855,                                     80},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str858,                                   80},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str748,                                       48},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str869,                             131},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str874,                                    135},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str751,                           46},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str877,                                    118},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str881,                              133},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str889,                                     84},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str891,                            31},
+      {-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_str910,                         160},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str917,                         159},
       {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str755,                                    118},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str921,                                  168},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str758,                     182},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str924,                                      61},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str938,                                    116},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str939,                                   116},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str944,                     185},
       {-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_str786,                                     84},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str966,                                    117},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str972,                           173},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str977,                                 124},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str986,                                     83},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str994,                           47},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1001,                                   173},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1006,                                  172},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str797,                                   170},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1017,                                     29},
       {-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}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1051,                                   71},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1057,                                  95},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1061,                                    103},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1062,                                   103},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str809,                                     29},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1065,                              30},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1069,                               48},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str820,                           170},
+      {-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}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1109,                                    156},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str823,                                     173},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1112,                             158},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1128,                                     75},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1129,                                    75},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str842,                                    10},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str843,                                  165},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str848,                                    103},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str849,                                   103},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str863,                         160},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str864,                              30},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str866,                              37},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str867,                                57},
       {-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_str1166,                                   45},
       {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str878,                             158},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str883,                          28},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str884,                                 124},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str886,                                    116},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str887,                                   116},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str895,                           47},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1168,                                 123},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str898,                                     2},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1180,                                    126},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str908,                                  169},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str909,                                    126},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1190,                                   156},
       {-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_str935,                                  95},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str937,                         159},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str947,                               48},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1222,                                     2},
+      {-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_str1247,                                    165},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1248,                                   165},
       {-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_str966,                                      61},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str975,                                 84},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1275,                                126},
+      {-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}, {-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_str978,                                126},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1332,                                 84},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1346,                                     90},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1360,                                     95},
       {-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_str1379,                                    153},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1395,                                 144},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
 #endif /* USE_UNICODE_PROPERTIES */
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -17852,53 +18358,33 @@ uniname2ctype_p (str, len)
       {(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_str1022,                                   45},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1024,                                 123},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1412,                                      15},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1036,                                    156},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1040,                                       47},
       {-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_str1065,                                   156},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1071,                                 144},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1072,                                    153},
       {-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}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1472,                                       47},
       {-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}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1140,                                   72},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1141,                                    135},
       {-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_str1526,                                   78},
       {-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_str1174,                                      15},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1187,                             72},
       {-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}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1221,                                     90},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1235,                                     95},
       {-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}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1277,                                   78},
       {-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},
@@ -17912,12 +18398,16 @@ uniname2ctype_p (str, len)
       {-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}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1751,                                   72},
       {-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}, {-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}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1811,                             72},
       {-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},
@@ -17928,8 +18418,6 @@ uniname2ctype_p (str, len)
       {-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}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1542,                     153},
       {-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},
@@ -17942,6 +18430,8 @@ uniname2ctype_p (str, len)
       {-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}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2016,                     153},
       {-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},
@@ -17953,8 +18443,8 @@ uniname2ctype_p (str, len)
       {-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_str1751,                                     73}
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2124,                                     73}
 #endif /* USE_UNICODE_PROPERTIES */
     };
 
diff --git a/enc/unicode/name2ctype.kwd b/enc/unicode/name2ctype.kwd
index f434172..e9ffef8 100644
--- a/enc/unicode/name2ctype.kwd
+++ b/enc/unicode/name2ctype.kwd
@@ -10,13 +10,13 @@ static const OnigCodePoint CR_Any[] = {
 
 /* 'Assigned': - */
 static const OnigCodePoint CR_Assigned[] = {
-	485,
+	501,
 	0x0000, 0x0377,
 	0x037a, 0x037e,
 	0x0384, 0x038a,
 	0x038c, 0x038c,
 	0x038e, 0x03a1,
-	0x03a3, 0x0525,
+	0x03a3, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x055f,
 	0x0561, 0x0587,
@@ -26,18 +26,15 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x05f0, 0x05f4,
 	0x0600, 0x0603,
 	0x0606, 0x061b,
-	0x061e, 0x061f,
-	0x0621, 0x065e,
-	0x0660, 0x070d,
+	0x061e, 0x070d,
 	0x070f, 0x074a,
 	0x074d, 0x07b1,
 	0x07c0, 0x07fa,
 	0x0800, 0x082d,
 	0x0830, 0x083e,
-	0x0900, 0x0939,
-	0x093c, 0x094e,
-	0x0950, 0x0955,
-	0x0958, 0x0972,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x0900, 0x0977,
 	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
@@ -96,7 +93,7 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x0b56, 0x0b57,
 	0x0b5c, 0x0b5d,
 	0x0b5f, 0x0b63,
-	0x0b66, 0x0b71,
+	0x0b66, 0x0b77,
 	0x0b82, 0x0b83,
 	0x0b85, 0x0b8a,
 	0x0b8e, 0x0b90,
@@ -144,11 +141,10 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
+	0x0d4a, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d66, 0x0d75,
@@ -186,11 +182,10 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x0edc, 0x0edd,
 	0x0f00, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f71, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fd8,
+	0x0fce, 0x0fda,
 	0x1000, 0x10c5,
 	0x10d0, 0x10fc,
 	0x1100, 0x1248,
@@ -209,7 +204,7 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x12d8, 0x1310,
 	0x1312, 0x1315,
 	0x1318, 0x135a,
-	0x135f, 0x137c,
+	0x135d, 0x137c,
 	0x1380, 0x1399,
 	0x13a0, 0x13f4,
 	0x1400, 0x169c,
@@ -248,12 +243,13 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x1b50, 0x1b7c,
 	0x1b80, 0x1baa,
 	0x1bae, 0x1bb9,
-	0x1c00, 0x1c37,
+	0x1bc0, 0x1bf3,
+	0x1bfc, 0x1c37,
 	0x1c3b, 0x1c49,
 	0x1c4d, 0x1c7f,
 	0x1cd0, 0x1cf2,
 	0x1d00, 0x1de6,
-	0x1dfd, 0x1f15,
+	0x1dfc, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
 	0x1f48, 0x1f4d,
@@ -272,38 +268,25 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x2000, 0x2064,
 	0x206a, 0x2071,
 	0x2074, 0x208e,
-	0x2090, 0x2094,
-	0x20a0, 0x20b8,
+	0x2090, 0x209c,
+	0x20a0, 0x20b9,
 	0x20d0, 0x20f0,
 	0x2100, 0x2189,
-	0x2190, 0x23e8,
+	0x2190, 0x23f3,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
-	0x2460, 0x26cd,
-	0x26cf, 0x26e1,
-	0x26e3, 0x26e3,
-	0x26e8, 0x26ff,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
+	0x2460, 0x26ff,
+	0x2701, 0x27ca,
 	0x27cc, 0x27cc,
-	0x27d0, 0x2b4c,
+	0x27ce, 0x2b4c,
 	0x2b50, 0x2b59,
 	0x2c00, 0x2c2e,
 	0x2c30, 0x2c5e,
 	0x2c60, 0x2cf1,
 	0x2cf9, 0x2d25,
 	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
 	0x2da0, 0x2da6,
 	0x2da8, 0x2dae,
 	0x2db0, 0x2db6,
@@ -322,7 +305,7 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x3099, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x3190, 0x31b7,
+	0x3190, 0x31ba,
 	0x31c0, 0x31e3,
 	0x31f0, 0x321e,
 	0x3220, 0x32fe,
@@ -331,12 +314,13 @@ static const OnigCodePoint CR_Assigned[] = {
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
 	0xa4d0, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa673,
+	0xa640, 0xa673,
 	0xa67c, 0xa697,
 	0xa6a0, 0xa6f7,
-	0xa700, 0xa78c,
-	0xa7fb, 0xa82b,
+	0xa700, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa82b,
 	0xa830, 0xa839,
 	0xa840, 0xa877,
 	0xa880, 0xa8c4,
@@ -353,6 +337,11 @@ static const OnigCodePoint CR_Assigned[] = {
 	0xaa5c, 0xaa7b,
 	0xaa80, 0xaac2,
 	0xaadb, 0xaadf,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabed,
 	0xabf0, 0xabf9,
 	0xac00, 0xd7a3,
@@ -368,7 +357,7 @@ static const OnigCodePoint CR_Assigned[] = {
 	0xfb3e, 0xfb3e,
 	0xfb40, 0xfb41,
 	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
+	0xfb46, 0xfbc1,
 	0xfbd3, 0xfd3f,
 	0xfd50, 0xfd8f,
 	0xfd92, 0xfdc7,
@@ -436,11 +425,15 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x10b78, 0x10b7f,
 	0x10c00, 0x10c48,
 	0x10e60, 0x10e7e,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
 	0x11080, 0x110c1,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x12470, 0x12473,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d000, 0x1d0f5,
 	0x1d100, 0x1d126,
 	0x1d129, 0x1d1dd,
@@ -470,26 +463,49 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x1d7ce, 0x1d7ff,
 	0x1f000, 0x1f02b,
 	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
 	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,
+	0x1f130, 0x1f169,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
 	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f5ff,
+	0x1f601, 0x1f610,
+	0x1f612, 0x1f614,
+	0x1f616, 0x1f616,
+	0x1f618, 0x1f618,
+	0x1f61a, 0x1f61a,
+	0x1f61c, 0x1f61e,
+	0x1f620, 0x1f625,
+	0x1f628, 0x1f62b,
+	0x1f62d, 0x1f62d,
+	0x1f630, 0x1f633,
+	0x1f635, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 	0xe0001, 0xe0001,
 	0xe0020, 0xe007f,
@@ -552,13 +568,13 @@ static const OnigCodePoint CR_Cf[] = {
 
 /* 'Cn': General Category */
 static const OnigCodePoint CR_Cn[] = {
-	485,
+	501,
 	0x0378, 0x0379,
 	0x037f, 0x0383,
 	0x038b, 0x038b,
 	0x038d, 0x038d,
 	0x03a2, 0x03a2,
-	0x0526, 0x0530,
+	0x0528, 0x0530,
 	0x0557, 0x0558,
 	0x0560, 0x0560,
 	0x0588, 0x0588,
@@ -568,18 +584,15 @@ static const OnigCodePoint CR_Cn[] = {
 	0x05f5, 0x05ff,
 	0x0604, 0x0605,
 	0x061c, 0x061d,
-	0x0620, 0x0620,
-	0x065f, 0x065f,
 	0x070e, 0x070e,
 	0x074b, 0x074c,
 	0x07b2, 0x07bf,
 	0x07fb, 0x07ff,
 	0x082e, 0x082f,
-	0x083f, 0x08ff,
-	0x093a, 0x093b,
-	0x094f, 0x094f,
-	0x0956, 0x0957,
-	0x0973, 0x0978,
+	0x083f, 0x083f,
+	0x085c, 0x085d,
+	0x085f, 0x08ff,
+	0x0978, 0x0978,
 	0x0980, 0x0980,
 	0x0984, 0x0984,
 	0x098d, 0x098e,
@@ -638,7 +651,7 @@ static const OnigCodePoint CR_Cn[] = {
 	0x0b58, 0x0b5b,
 	0x0b5e, 0x0b5e,
 	0x0b64, 0x0b65,
-	0x0b72, 0x0b81,
+	0x0b78, 0x0b81,
 	0x0b84, 0x0b84,
 	0x0b8b, 0x0b8d,
 	0x0b91, 0x0b91,
@@ -686,11 +699,10 @@ static const OnigCodePoint CR_Cn[] = {
 	0x0d04, 0x0d04,
 	0x0d0d, 0x0d0d,
 	0x0d11, 0x0d11,
-	0x0d29, 0x0d29,
-	0x0d3a, 0x0d3c,
+	0x0d3b, 0x0d3c,
 	0x0d45, 0x0d45,
 	0x0d49, 0x0d49,
-	0x0d4e, 0x0d56,
+	0x0d4f, 0x0d56,
 	0x0d58, 0x0d5f,
 	0x0d64, 0x0d65,
 	0x0d76, 0x0d78,
@@ -728,11 +740,10 @@ static const OnigCodePoint CR_Cn[] = {
 	0x0ede, 0x0eff,
 	0x0f48, 0x0f48,
 	0x0f6d, 0x0f70,
-	0x0f8c, 0x0f8f,
 	0x0f98, 0x0f98,
 	0x0fbd, 0x0fbd,
 	0x0fcd, 0x0fcd,
-	0x0fd9, 0x0fff,
+	0x0fdb, 0x0fff,
 	0x10c6, 0x10cf,
 	0x10fd, 0x10ff,
 	0x1249, 0x1249,
@@ -750,7 +761,7 @@ static const OnigCodePoint CR_Cn[] = {
 	0x12d7, 0x12d7,
 	0x1311, 0x1311,
 	0x1316, 0x1317,
-	0x135b, 0x135e,
+	0x135b, 0x135c,
 	0x137d, 0x137f,
 	0x139a, 0x139f,
 	0x13f5, 0x13ff,
@@ -789,12 +800,13 @@ static const OnigCodePoint CR_Cn[] = {
 	0x1b4c, 0x1b4f,
 	0x1b7d, 0x1b7f,
 	0x1bab, 0x1bad,
-	0x1bba, 0x1bff,
+	0x1bba, 0x1bbf,
+	0x1bf4, 0x1bfb,
 	0x1c38, 0x1c3a,
 	0x1c4a, 0x1c4c,
 	0x1c80, 0x1ccf,
 	0x1cf3, 0x1cff,
-	0x1de7, 0x1dfc,
+	0x1de7, 0x1dfb,
 	0x1f16, 0x1f17,
 	0x1f1e, 0x1f1f,
 	0x1f46, 0x1f47,
@@ -814,29 +826,16 @@ static const OnigCodePoint CR_Cn[] = {
 	0x2065, 0x2069,
 	0x2072, 0x2073,
 	0x208f, 0x208f,
-	0x2095, 0x209f,
-	0x20b9, 0x20cf,
+	0x209d, 0x209f,
+	0x20ba, 0x20cf,
 	0x20f1, 0x20ff,
 	0x218a, 0x218f,
-	0x23e9, 0x23ff,
+	0x23f4, 0x23ff,
 	0x2427, 0x243f,
 	0x244b, 0x245f,
-	0x26ce, 0x26ce,
-	0x26e2, 0x26e2,
-	0x26e4, 0x26e7,
 	0x2700, 0x2700,
-	0x2705, 0x2705,
-	0x270a, 0x270b,
-	0x2728, 0x2728,
-	0x274c, 0x274c,
-	0x274e, 0x274e,
-	0x2753, 0x2755,
-	0x275f, 0x2760,
-	0x2795, 0x2797,
-	0x27b0, 0x27b0,
-	0x27bf, 0x27bf,
 	0x27cb, 0x27cb,
-	0x27cd, 0x27cf,
+	0x27cd, 0x27cd,
 	0x2b4d, 0x2b4f,
 	0x2b5a, 0x2bff,
 	0x2c2f, 0x2c2f,
@@ -844,7 +843,7 @@ static const OnigCodePoint CR_Cn[] = {
 	0x2cf2, 0x2cf8,
 	0x2d26, 0x2d2f,
 	0x2d66, 0x2d6e,
-	0x2d70, 0x2d7f,
+	0x2d71, 0x2d7e,
 	0x2d97, 0x2d9f,
 	0x2da7, 0x2da7,
 	0x2daf, 0x2daf,
@@ -864,7 +863,7 @@ static const OnigCodePoint CR_Cn[] = {
 	0x3100, 0x3104,
 	0x312e, 0x3130,
 	0x318f, 0x318f,
-	0x31b8, 0x31bf,
+	0x31bb, 0x31bf,
 	0x31e4, 0x31ef,
 	0x321f, 0x321f,
 	0x32ff, 0x32ff,
@@ -873,11 +872,12 @@ static const OnigCodePoint CR_Cn[] = {
 	0xa48d, 0xa48f,
 	0xa4c7, 0xa4cf,
 	0xa62c, 0xa63f,
-	0xa660, 0xa661,
 	0xa674, 0xa67b,
 	0xa698, 0xa69f,
 	0xa6f8, 0xa6ff,
-	0xa78d, 0xa7fa,
+	0xa78f, 0xa78f,
+	0xa792, 0xa79f,
+	0xa7aa, 0xa7f9,
 	0xa82c, 0xa82f,
 	0xa83a, 0xa83f,
 	0xa878, 0xa87f,
@@ -894,7 +894,12 @@ static const OnigCodePoint CR_Cn[] = {
 	0xaa5a, 0xaa5b,
 	0xaa7c, 0xaa7f,
 	0xaac3, 0xaada,
-	0xaae0, 0xabbf,
+	0xaae0, 0xab00,
+	0xab07, 0xab08,
+	0xab0f, 0xab10,
+	0xab17, 0xab1f,
+	0xab27, 0xab27,
+	0xab2f, 0xabbf,
 	0xabee, 0xabef,
 	0xabfa, 0xabff,
 	0xd7a4, 0xd7af,
@@ -910,7 +915,7 @@ static const OnigCodePoint CR_Cn[] = {
 	0xfb3f, 0xfb3f,
 	0xfb42, 0xfb42,
 	0xfb45, 0xfb45,
-	0xfbb2, 0xfbd2,
+	0xfbc2, 0xfbd2,
 	0xfd40, 0xfd4f,
 	0xfd90, 0xfd91,
 	0xfdc8, 0xfdef,
@@ -977,12 +982,16 @@ static const OnigCodePoint CR_Cn[] = {
 	0x10b73, 0x10b77,
 	0x10b80, 0x10bff,
 	0x10c49, 0x10e5f,
-	0x10e7f, 0x1107f,
+	0x10e7f, 0x10fff,
+	0x1104e, 0x11051,
+	0x11070, 0x1107f,
 	0x110c2, 0x11fff,
 	0x1236f, 0x123ff,
 	0x12463, 0x1246f,
 	0x12474, 0x12fff,
-	0x1342f, 0x1cfff,
+	0x1342f, 0x167ff,
+	0x16a39, 0x1afff,
+	0x1b002, 0x1cfff,
 	0x1d0f6, 0x1d0ff,
 	0x1d127, 0x1d128,
 	0x1d1de, 0x1d1ff,
@@ -1011,27 +1020,50 @@ static const OnigCodePoint CR_Cn[] = {
 	0x1d7cc, 0x1d7cd,
 	0x1d800, 0x1efff,
 	0x1f02c, 0x1f02f,
-	0x1f094, 0x1f0ff,
+	0x1f094, 0x1f09f,
+	0x1f0af, 0x1f0b0,
+	0x1f0bf, 0x1f0c0,
+	0x1f0d0, 0x1f0d0,
+	0x1f0e0, 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,
+	0x1f12f, 0x1f12f,
+	0x1f16a, 0x1f16f,
+	0x1f19b, 0x1f1e5,
+	0x1f203, 0x1f20f,
+	0x1f23b, 0x1f23f,
+	0x1f249, 0x1f24f,
+	0x1f252, 0x1f2ff,
+	0x1f321, 0x1f32f,
+	0x1f336, 0x1f336,
+	0x1f37d, 0x1f37f,
+	0x1f394, 0x1f39f,
+	0x1f3c5, 0x1f3c5,
+	0x1f3cb, 0x1f3df,
+	0x1f3f1, 0x1f3ff,
+	0x1f43f, 0x1f43f,
+	0x1f441, 0x1f441,
+	0x1f4f8, 0x1f4f8,
+	0x1f4fd, 0x1f4ff,
+	0x1f53e, 0x1f54f,
+	0x1f568, 0x1f5fa,
+	0x1f600, 0x1f600,
+	0x1f611, 0x1f611,
+	0x1f615, 0x1f615,
+	0x1f617, 0x1f617,
+	0x1f619, 0x1f619,
+	0x1f61b, 0x1f61b,
+	0x1f61f, 0x1f61f,
+	0x1f626, 0x1f627,
+	0x1f62c, 0x1f62c,
+	0x1f62e, 0x1f62f,
+	0x1f634, 0x1f634,
+	0x1f641, 0x1f644,
+	0x1f650, 0x1f67f,
+	0x1f6c6, 0x1f6ff,
+	0x1f774, 0x1ffff,
 	0x2a6d7, 0x2a6ff,
-	0x2b735, 0x2f7ff,
+	0x2b735, 0x2b73f,
+	0x2b81e, 0x2f7ff,
 	0x2fa1e, 0xe0000,
 	0xe0002, 0xe001f,
 	0xe0080, 0xe00ff,
@@ -1056,7 +1088,7 @@ static const OnigCodePoint CR_Cs[] = {
 
 /* 'L': Major Category */
 static const OnigCodePoint CR_L[] = {
-	422,
+	435,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -1078,13 +1110,13 @@ static const OnigCodePoint CR_L[] = {
 	0x038e, 0x03a1,
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x0559,
 	0x0561, 0x0587,
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
-	0x0621, 0x064a,
+	0x0620, 0x064a,
 	0x066e, 0x066f,
 	0x0671, 0x06d3,
 	0x06d5, 0x06d5,
@@ -1103,11 +1135,12 @@ static const OnigCodePoint CR_L[] = {
 	0x081a, 0x081a,
 	0x0824, 0x0824,
 	0x0828, 0x0828,
+	0x0840, 0x0858,
 	0x0904, 0x0939,
 	0x093d, 0x093d,
 	0x0950, 0x0950,
 	0x0958, 0x0961,
-	0x0971, 0x0972,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0x0985, 0x098c,
 	0x098f, 0x0990,
@@ -1176,11 +1209,12 @@ static const OnigCodePoint CR_L[] = {
 	0x0cbd, 0x0cbd,
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce1,
+	0x0cf1, 0x0cf2,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
 	0x0d60, 0x0d61,
 	0x0d7a, 0x0d7f,
 	0x0d85, 0x0d96,
@@ -1211,7 +1245,7 @@ static const OnigCodePoint CR_L[] = {
 	0x0f00, 0x0f00,
 	0x0f40, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8b,
+	0x0f88, 0x0f8c,
 	0x1000, 0x102a,
 	0x103f, 0x103f,
 	0x1050, 0x1055,
@@ -1271,6 +1305,7 @@ static const OnigCodePoint CR_L[] = {
 	0x1b45, 0x1b4b,
 	0x1b83, 0x1ba0,
 	0x1bae, 0x1baf,
+	0x1bc0, 0x1be5,
 	0x1c00, 0x1c23,
 	0x1c4d, 0x1c4f,
 	0x1c5a, 0x1c7d,
@@ -1298,7 +1333,7 @@ static const OnigCodePoint CR_L[] = {
 	0x1ff6, 0x1ffc,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x2102, 0x2102,
 	0x2107, 0x2107,
 	0x210a, 0x2113,
@@ -1339,7 +1374,7 @@ static const OnigCodePoint CR_L[] = {
 	0x30fc, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -1348,14 +1383,15 @@ static const OnigCodePoint CR_L[] = {
 	0xa500, 0xa60c,
 	0xa610, 0xa61f,
 	0xa62a, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa66e,
+	0xa640, 0xa66e,
 	0xa67f, 0xa697,
 	0xa6a0, 0xa6e5,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa801,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa801,
 	0xa803, 0xa805,
 	0xa807, 0xa80a,
 	0xa80c, 0xa822,
@@ -1380,6 +1416,11 @@ static const OnigCodePoint CR_L[] = {
 	0xaac0, 0xaac0,
 	0xaac2, 0xaac2,
 	0xaadb, 0xaadd,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabe2,
 	0xac00, 0xd7a3,
 	0xd7b0, 0xd7c6,
@@ -1443,9 +1484,12 @@ static const OnigCodePoint CR_L[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11003, 0x11037,
 	0x11083, 0x110af,
 	0x12000, 0x1236e,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d400, 0x1d454,
 	0x1d456, 0x1d49c,
 	0x1d49e, 0x1d49f,
@@ -1478,12 +1522,13 @@ static const OnigCodePoint CR_L[] = {
 	0x1d7c4, 0x1d7cb,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_L */
 
 /* 'Ll': General Category */
 static const OnigCodePoint CR_Ll[] = {
-	599,
+	609,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
 	0x00b5, 0x00b5,
@@ -1750,6 +1795,7 @@ static const OnigCodePoint CR_Ll[] = {
 	0x0521, 0x0521,
 	0x0523, 0x0523,
 	0x0525, 0x0525,
+	0x0527, 0x0527,
 	0x0561, 0x0587,
 	0x1d00, 0x1d2b,
 	0x1d62, 0x1d77,
@@ -1986,6 +2032,7 @@ static const OnigCodePoint CR_Ll[] = {
 	0xa65b, 0xa65b,
 	0xa65d, 0xa65d,
 	0xa65f, 0xa65f,
+	0xa661, 0xa661,
 	0xa663, 0xa663,
 	0xa665, 0xa665,
 	0xa667, 0xa667,
@@ -2051,6 +2098,14 @@ static const OnigCodePoint CR_Ll[] = {
 	0xa785, 0xa785,
 	0xa787, 0xa787,
 	0xa78c, 0xa78c,
+	0xa78e, 0xa78e,
+	0xa791, 0xa791,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
+	0xa7fa, 0xa7fa,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
 	0xff41, 0xff5a,
@@ -2116,7 +2171,7 @@ static const OnigCodePoint CR_Lm[] = {
 	0x1d9b, 0x1dbf,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x2c7d, 0x2c7d,
 	0x2d6f, 0x2d6f,
 	0x2e2f, 0x2e2f,
@@ -2141,13 +2196,13 @@ static const OnigCodePoint CR_Lm[] = {
 
 /* 'Lo': General Category */
 static const OnigCodePoint CR_Lo[] = {
-	311,
+	323,
 	0x01bb, 0x01bb,
 	0x01c0, 0x01c3,
 	0x0294, 0x0294,
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
-	0x0621, 0x063f,
+	0x0620, 0x063f,
 	0x0641, 0x064a,
 	0x066e, 0x066f,
 	0x0671, 0x06d3,
@@ -2161,11 +2216,12 @@ static const OnigCodePoint CR_Lo[] = {
 	0x07b1, 0x07b1,
 	0x07ca, 0x07ea,
 	0x0800, 0x0815,
+	0x0840, 0x0858,
 	0x0904, 0x0939,
 	0x093d, 0x093d,
 	0x0950, 0x0950,
 	0x0958, 0x0961,
-	0x0972, 0x0972,
+	0x0972, 0x0977,
 	0x0979, 0x097f,
 	0x0985, 0x098c,
 	0x098f, 0x0990,
@@ -2234,11 +2290,12 @@ static const OnigCodePoint CR_Lo[] = {
 	0x0cbd, 0x0cbd,
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce1,
+	0x0cf1, 0x0cf2,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
 	0x0d60, 0x0d61,
 	0x0d7a, 0x0d7f,
 	0x0d85, 0x0d96,
@@ -2268,7 +2325,7 @@ static const OnigCodePoint CR_Lo[] = {
 	0x0f00, 0x0f00,
 	0x0f40, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8b,
+	0x0f88, 0x0f8c,
 	0x1000, 0x102a,
 	0x103f, 0x103f,
 	0x1050, 0x1055,
@@ -2325,6 +2382,7 @@ static const OnigCodePoint CR_Lo[] = {
 	0x1b45, 0x1b4b,
 	0x1b83, 0x1ba0,
 	0x1bae, 0x1baf,
+	0x1bc0, 0x1be5,
 	0x1c00, 0x1c23,
 	0x1c4d, 0x1c4f,
 	0x1c5a, 0x1c77,
@@ -2349,7 +2407,7 @@ static const OnigCodePoint CR_Lo[] = {
 	0x30ff, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -2386,6 +2444,11 @@ static const OnigCodePoint CR_Lo[] = {
 	0xaac0, 0xaac0,
 	0xaac2, 0xaac2,
 	0xaadb, 0xaadc,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabe2,
 	0xac00, 0xd7a3,
 	0xd7b0, 0xd7c6,
@@ -2447,11 +2510,15 @@ static const OnigCodePoint CR_Lo[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11003, 0x11037,
 	0x11083, 0x110af,
 	0x12000, 0x1236e,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_Lo */
 
@@ -2472,7 +2539,7 @@ static const OnigCodePoint CR_Lt[] = {
 
 /* 'Lu': General Category */
 static const OnigCodePoint CR_Lu[] = {
-	594,
+	603,
 	0x0041, 0x005a,
 	0x00c0, 0x00d6,
 	0x00d8, 0x00de,
@@ -2738,6 +2805,7 @@ static const OnigCodePoint CR_Lu[] = {
 	0x0520, 0x0520,
 	0x0522, 0x0522,
 	0x0524, 0x0524,
+	0x0526, 0x0526,
 	0x0531, 0x0556,
 	0x10a0, 0x10c5,
 	0x1e00, 0x1e00,
@@ -2970,6 +3038,7 @@ static const OnigCodePoint CR_Lu[] = {
 	0xa65a, 0xa65a,
 	0xa65c, 0xa65c,
 	0xa65e, 0xa65e,
+	0xa660, 0xa660,
 	0xa662, 0xa662,
 	0xa664, 0xa664,
 	0xa666, 0xa666,
@@ -3034,6 +3103,13 @@ static const OnigCodePoint CR_Lu[] = {
 	0xa784, 0xa784,
 	0xa786, 0xa786,
 	0xa78b, 0xa78b,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
 	0xff21, 0xff3a,
 	0x10400, 0x10427,
 	0x1d400, 0x1d419,
@@ -3071,7 +3147,7 @@ static const OnigCodePoint CR_Lu[] = {
 
 /* 'M': Major Category */
 static const OnigCodePoint CR_M[] = {
-	188,
+	193,
 	0x0300, 0x036f,
 	0x0483, 0x0489,
 	0x0591, 0x05bd,
@@ -3080,10 +3156,10 @@ static const OnigCodePoint CR_M[] = {
 	0x05c4, 0x05c5,
 	0x05c7, 0x05c7,
 	0x0610, 0x061a,
-	0x064b, 0x065e,
+	0x064b, 0x065f,
 	0x0670, 0x0670,
 	0x06d6, 0x06dc,
-	0x06de, 0x06e4,
+	0x06df, 0x06e4,
 	0x06e7, 0x06e8,
 	0x06ea, 0x06ed,
 	0x0711, 0x0711,
@@ -3094,10 +3170,11 @@ static const OnigCodePoint CR_M[] = {
 	0x081b, 0x0823,
 	0x0825, 0x0827,
 	0x0829, 0x082d,
+	0x0859, 0x085b,
 	0x0900, 0x0903,
-	0x093c, 0x093c,
-	0x093e, 0x094e,
-	0x0951, 0x0955,
+	0x093a, 0x093c,
+	0x093e, 0x094f,
+	0x0951, 0x0957,
 	0x0962, 0x0963,
 	0x0981, 0x0983,
 	0x09bc, 0x09bc,
@@ -3171,7 +3248,7 @@ static const OnigCodePoint CR_M[] = {
 	0x0f3e, 0x0f3f,
 	0x0f71, 0x0f84,
 	0x0f86, 0x0f87,
-	0x0f90, 0x0f97,
+	0x0f8d, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fc6, 0x0fc6,
 	0x102b, 0x103e,
@@ -3183,7 +3260,7 @@ static const OnigCodePoint CR_M[] = {
 	0x1082, 0x108d,
 	0x108f, 0x108f,
 	0x109a, 0x109d,
-	0x135f, 0x135f,
+	0x135d, 0x135f,
 	0x1712, 0x1714,
 	0x1732, 0x1734,
 	0x1752, 0x1753,
@@ -3205,15 +3282,17 @@ static const OnigCodePoint CR_M[] = {
 	0x1b6b, 0x1b73,
 	0x1b80, 0x1b82,
 	0x1ba1, 0x1baa,
+	0x1be6, 0x1bf3,
 	0x1c24, 0x1c37,
 	0x1cd0, 0x1cd2,
 	0x1cd4, 0x1ce8,
 	0x1ced, 0x1ced,
 	0x1cf2, 0x1cf2,
 	0x1dc0, 0x1de6,
-	0x1dfd, 0x1dff,
+	0x1dfc, 0x1dff,
 	0x20d0, 0x20f0,
 	0x2cef, 0x2cf1,
+	0x2d7f, 0x2d7f,
 	0x2de0, 0x2dff,
 	0x302a, 0x302f,
 	0x3099, 0x309a,
@@ -3251,6 +3330,8 @@ static const OnigCodePoint CR_M[] = {
 	0x10a0c, 0x10a0f,
 	0x10a38, 0x10a3a,
 	0x10a3f, 0x10a3f,
+	0x11000, 0x11002,
+	0x11038, 0x11046,
 	0x11080, 0x11082,
 	0x110b0, 0x110ba,
 	0x1d165, 0x1d169,
@@ -3264,11 +3345,12 @@ static const OnigCodePoint CR_M[] = {
 
 /* 'Mc': General Category */
 static const OnigCodePoint CR_Mc[] = {
-	106,
+	113,
 	0x0903, 0x0903,
+	0x093b, 0x093b,
 	0x093e, 0x0940,
 	0x0949, 0x094c,
-	0x094e, 0x094e,
+	0x094e, 0x094f,
 	0x0982, 0x0983,
 	0x09be, 0x09c0,
 	0x09c7, 0x09c8,
@@ -3345,6 +3427,10 @@ static const OnigCodePoint CR_Mc[] = {
 	0x1ba1, 0x1ba1,
 	0x1ba6, 0x1ba7,
 	0x1baa, 0x1baa,
+	0x1be7, 0x1be7,
+	0x1bea, 0x1bec,
+	0x1bee, 0x1bee,
+	0x1bf2, 0x1bf3,
 	0x1c24, 0x1c2b,
 	0x1c34, 0x1c35,
 	0x1ce1, 0x1ce1,
@@ -3366,6 +3452,8 @@ static const OnigCodePoint CR_Mc[] = {
 	0xabe6, 0xabe7,
 	0xabe9, 0xabea,
 	0xabec, 0xabec,
+	0x11000, 0x11000,
+	0x11002, 0x11002,
 	0x11082, 0x11082,
 	0x110b0, 0x110b2,
 	0x110b7, 0x110b8,
@@ -3375,9 +3463,8 @@ static const OnigCodePoint CR_Mc[] = {
 
 /* 'Me': General Category */
 static const OnigCodePoint CR_Me[] = {
-	5,
+	4,
 	0x0488, 0x0489,
-	0x06de, 0x06de,
 	0x20dd, 0x20e0,
 	0x20e2, 0x20e4,
 	0xa670, 0xa672,
@@ -3385,7 +3472,7 @@ static const OnigCodePoint CR_Me[] = {
 
 /* 'Mn': General Category */
 static const OnigCodePoint CR_Mn[] = {
-	194,
+	203,
 	0x0300, 0x036f,
 	0x0483, 0x0487,
 	0x0591, 0x05bd,
@@ -3394,7 +3481,7 @@ static const OnigCodePoint CR_Mn[] = {
 	0x05c4, 0x05c5,
 	0x05c7, 0x05c7,
 	0x0610, 0x061a,
-	0x064b, 0x065e,
+	0x064b, 0x065f,
 	0x0670, 0x0670,
 	0x06d6, 0x06dc,
 	0x06df, 0x06e4,
@@ -3408,11 +3495,13 @@ static const OnigCodePoint CR_Mn[] = {
 	0x081b, 0x0823,
 	0x0825, 0x0827,
 	0x0829, 0x082d,
+	0x0859, 0x085b,
 	0x0900, 0x0902,
+	0x093a, 0x093a,
 	0x093c, 0x093c,
 	0x0941, 0x0948,
 	0x094d, 0x094d,
-	0x0951, 0x0955,
+	0x0951, 0x0957,
 	0x0962, 0x0963,
 	0x0981, 0x0981,
 	0x09bc, 0x09bc,
@@ -3473,7 +3562,7 @@ static const OnigCodePoint CR_Mn[] = {
 	0x0f71, 0x0f7e,
 	0x0f80, 0x0f84,
 	0x0f86, 0x0f87,
-	0x0f90, 0x0f97,
+	0x0f8d, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fc6, 0x0fc6,
 	0x102d, 0x1030,
@@ -3487,7 +3576,7 @@ static const OnigCodePoint CR_Mn[] = {
 	0x1085, 0x1086,
 	0x108d, 0x108d,
 	0x109d, 0x109d,
-	0x135f, 0x135f,
+	0x135d, 0x135f,
 	0x1712, 0x1714,
 	0x1732, 0x1734,
 	0x1752, 0x1753,
@@ -3519,6 +3608,10 @@ static const OnigCodePoint CR_Mn[] = {
 	0x1b80, 0x1b81,
 	0x1ba2, 0x1ba5,
 	0x1ba8, 0x1ba9,
+	0x1be6, 0x1be6,
+	0x1be8, 0x1be9,
+	0x1bed, 0x1bed,
+	0x1bef, 0x1bf1,
 	0x1c2c, 0x1c33,
 	0x1c36, 0x1c37,
 	0x1cd0, 0x1cd2,
@@ -3526,11 +3619,12 @@ static const OnigCodePoint CR_Mn[] = {
 	0x1ce2, 0x1ce8,
 	0x1ced, 0x1ced,
 	0x1dc0, 0x1de6,
-	0x1dfd, 0x1dff,
+	0x1dfc, 0x1dff,
 	0x20d0, 0x20dc,
 	0x20e1, 0x20e1,
 	0x20e5, 0x20f0,
 	0x2cef, 0x2cf1,
+	0x2d7f, 0x2d7f,
 	0x2de0, 0x2dff,
 	0x302a, 0x302f,
 	0x3099, 0x309a,
@@ -3571,6 +3665,8 @@ static const OnigCodePoint CR_Mn[] = {
 	0x10a0c, 0x10a0f,
 	0x10a38, 0x10a3a,
 	0x10a3f, 0x10a3f,
+	0x11001, 0x11001,
+	0x11038, 0x11046,
 	0x11080, 0x11081,
 	0x110b3, 0x110b6,
 	0x110b9, 0x110ba,
@@ -3584,7 +3680,7 @@ static const OnigCodePoint CR_Mn[] = {
 
 /* 'N': Major Category */
 static const OnigCodePoint CR_N[] = {
-	81,
+	83,
 	0x0030, 0x0039,
 	0x00b2, 0x00b3,
 	0x00b9, 0x00b9,
@@ -3598,6 +3694,7 @@ static const OnigCodePoint CR_N[] = {
 	0x0a66, 0x0a6f,
 	0x0ae6, 0x0aef,
 	0x0b66, 0x0b6f,
+	0x0b72, 0x0b77,
 	0x0be6, 0x0bf2,
 	0x0c66, 0x0c6f,
 	0x0c78, 0x0c7e,
@@ -3662,6 +3759,7 @@ static const OnigCodePoint CR_N[] = {
 	0x10b58, 0x10b5f,
 	0x10b78, 0x10b7f,
 	0x10e60, 0x10e7e,
+	0x11052, 0x1106f,
 	0x12400, 0x12462,
 	0x1d360, 0x1d371,
 	0x1d7ce, 0x1d7ff,
@@ -3670,7 +3768,7 @@ static const OnigCodePoint CR_N[] = {
 
 /* 'Nd': General Category */
 static const OnigCodePoint CR_Nd[] = {
-	37,
+	38,
 	0x0030, 0x0039,
 	0x0660, 0x0669,
 	0x06f0, 0x06f9,
@@ -3692,7 +3790,7 @@ static const OnigCodePoint CR_Nd[] = {
 	0x17e0, 0x17e9,
 	0x1810, 0x1819,
 	0x1946, 0x194f,
-	0x19d0, 0x19da,
+	0x19d0, 0x19d9,
 	0x1a80, 0x1a89,
 	0x1a90, 0x1a99,
 	0x1b50, 0x1b59,
@@ -3707,6 +3805,7 @@ static const OnigCodePoint CR_Nd[] = {
 	0xabf0, 0xabf9,
 	0xff10, 0xff19,
 	0x104a0, 0x104a9,
+	0x11066, 0x1106f,
 	0x1d7ce, 0x1d7ff,
 }; /* CR_Nd */
 
@@ -3729,17 +3828,19 @@ static const OnigCodePoint CR_Nl[] = {
 
 /* 'No': General Category */
 static const OnigCodePoint CR_No[] = {
-	38,
+	41,
 	0x00b2, 0x00b3,
 	0x00b9, 0x00b9,
 	0x00bc, 0x00be,
 	0x09f4, 0x09f9,
+	0x0b72, 0x0b77,
 	0x0bf0, 0x0bf2,
 	0x0c78, 0x0c7e,
 	0x0d70, 0x0d75,
 	0x0f2a, 0x0f33,
 	0x1369, 0x137c,
 	0x17f0, 0x17f9,
+	0x19da, 0x19da,
 	0x2070, 0x2070,
 	0x2074, 0x2079,
 	0x2080, 0x2089,
@@ -3766,13 +3867,14 @@ static const OnigCodePoint CR_No[] = {
 	0x10b58, 0x10b5f,
 	0x10b78, 0x10b7f,
 	0x10e60, 0x10e7e,
+	0x11052, 0x11065,
 	0x1d360, 0x1d371,
 	0x1f100, 0x1f10a,
 }; /* CR_No */
 
 /* 'P': Major Category */
 static const OnigCodePoint CR_P[] = {
-	129,
+	133,
 	0x0021, 0x0023,
 	0x0025, 0x002a,
 	0x002c, 0x002f,
@@ -3805,6 +3907,7 @@ static const OnigCodePoint CR_P[] = {
 	0x0700, 0x070d,
 	0x07f7, 0x07f9,
 	0x0830, 0x083e,
+	0x085e, 0x085e,
 	0x0964, 0x0965,
 	0x0970, 0x0970,
 	0x0df4, 0x0df4,
@@ -3814,6 +3917,7 @@ static const OnigCodePoint CR_P[] = {
 	0x0f3a, 0x0f3d,
 	0x0f85, 0x0f85,
 	0x0fd0, 0x0fd4,
+	0x0fd9, 0x0fda,
 	0x104a, 0x104f,
 	0x10fb, 0x10fb,
 	0x1361, 0x1368,
@@ -3826,11 +3930,11 @@ static const OnigCodePoint CR_P[] = {
 	0x17d8, 0x17da,
 	0x1800, 0x180a,
 	0x1944, 0x1945,
-	0x19de, 0x19df,
 	0x1a1e, 0x1a1f,
 	0x1aa0, 0x1aa6,
 	0x1aa8, 0x1aad,
 	0x1b5a, 0x1b60,
+	0x1bfc, 0x1bff,
 	0x1c3b, 0x1c3f,
 	0x1c7e, 0x1c7f,
 	0x1cd3, 0x1cd3,
@@ -3849,6 +3953,7 @@ static const OnigCodePoint CR_P[] = {
 	0x29fc, 0x29fd,
 	0x2cf9, 0x2cfc,
 	0x2cfe, 0x2cff,
+	0x2d70, 0x2d70,
 	0x2e00, 0x2e2e,
 	0x2e30, 0x2e31,
 	0x3001, 0x3003,
@@ -3899,6 +4004,7 @@ static const OnigCodePoint CR_P[] = {
 	0x10a50, 0x10a58,
 	0x10a7f, 0x10a7f,
 	0x10b39, 0x10b3f,
+	0x11047, 0x1104d,
 	0x110bb, 0x110bc,
 	0x110be, 0x110c1,
 	0x12470, 0x12473,
@@ -4043,7 +4149,7 @@ static const OnigCodePoint CR_Pi[] = {
 
 /* 'Po': General Category */
 static const OnigCodePoint CR_Po[] = {
-	124,
+	128,
 	0x0021, 0x0023,
 	0x0025, 0x0027,
 	0x002a, 0x002a,
@@ -4072,6 +4178,7 @@ static const OnigCodePoint CR_Po[] = {
 	0x0700, 0x070d,
 	0x07f7, 0x07f9,
 	0x0830, 0x083e,
+	0x085e, 0x085e,
 	0x0964, 0x0965,
 	0x0970, 0x0970,
 	0x0df4, 0x0df4,
@@ -4080,6 +4187,7 @@ static const OnigCodePoint CR_Po[] = {
 	0x0f04, 0x0f12,
 	0x0f85, 0x0f85,
 	0x0fd0, 0x0fd4,
+	0x0fd9, 0x0fda,
 	0x104a, 0x104f,
 	0x10fb, 0x10fb,
 	0x1361, 0x1368,
@@ -4091,11 +4199,11 @@ static const OnigCodePoint CR_Po[] = {
 	0x1800, 0x1805,
 	0x1807, 0x180a,
 	0x1944, 0x1945,
-	0x19de, 0x19df,
 	0x1a1e, 0x1a1f,
 	0x1aa0, 0x1aa6,
 	0x1aa8, 0x1aad,
 	0x1b5a, 0x1b60,
+	0x1bfc, 0x1bff,
 	0x1c3b, 0x1c3f,
 	0x1c7e, 0x1c7f,
 	0x1cd3, 0x1cd3,
@@ -4109,6 +4217,7 @@ static const OnigCodePoint CR_Po[] = {
 	0x2055, 0x205e,
 	0x2cf9, 0x2cfc,
 	0x2cfe, 0x2cff,
+	0x2d70, 0x2d70,
 	0x2e00, 0x2e01,
 	0x2e06, 0x2e08,
 	0x2e0b, 0x2e0b,
@@ -4165,6 +4274,7 @@ static const OnigCodePoint CR_Po[] = {
 	0x10a50, 0x10a58,
 	0x10a7f, 0x10a7f,
 	0x10b39, 0x10b3f,
+	0x11047, 0x1104d,
 	0x110bb, 0x110bc,
 	0x110be, 0x110c1,
 	0x12470, 0x12473,
@@ -4249,7 +4359,7 @@ static const OnigCodePoint CR_Ps[] = {
 
 /* 'S': Major Category */
 static const OnigCodePoint CR_S[] = {
-	198,
+	208,
 	0x0024, 0x0024,
 	0x002b, 0x002b,
 	0x003c, 0x003e,
@@ -4277,6 +4387,7 @@ static const OnigCodePoint CR_S[] = {
 	0x0606, 0x0608,
 	0x060b, 0x060b,
 	0x060e, 0x060f,
+	0x06de, 0x06de,
 	0x06e9, 0x06e9,
 	0x06fd, 0x06fe,
 	0x07f6, 0x07f6,
@@ -4286,7 +4397,6 @@ static const OnigCodePoint CR_S[] = {
 	0x0b70, 0x0b70,
 	0x0bf3, 0x0bfa,
 	0x0c7f, 0x0c7f,
-	0x0cf1, 0x0cf2,
 	0x0d79, 0x0d79,
 	0x0e3f, 0x0e3f,
 	0x0f01, 0x0f03,
@@ -4304,7 +4414,7 @@ static const OnigCodePoint CR_S[] = {
 	0x1390, 0x1399,
 	0x17db, 0x17db,
 	0x1940, 0x1940,
-	0x19e0, 0x19ff,
+	0x19de, 0x19ff,
 	0x1b61, 0x1b6a,
 	0x1b74, 0x1b7c,
 	0x1fbd, 0x1fbd,
@@ -4317,7 +4427,7 @@ static const OnigCodePoint CR_S[] = {
 	0x2052, 0x2052,
 	0x207a, 0x207c,
 	0x208a, 0x208c,
-	0x20a0, 0x20b8,
+	0x20a0, 0x20b9,
 	0x2100, 0x2101,
 	0x2103, 0x2106,
 	0x2108, 0x2109,
@@ -4333,29 +4443,16 @@ static const OnigCodePoint CR_S[] = {
 	0x214a, 0x214d,
 	0x214f, 0x214f,
 	0x2190, 0x2328,
-	0x232b, 0x23e8,
+	0x232b, 0x23f3,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
 	0x249c, 0x24e9,
-	0x2500, 0x26cd,
-	0x26cf, 0x26e1,
-	0x26e3, 0x26e3,
-	0x26e8, 0x26ff,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x275e,
-	0x2761, 0x2767,
-	0x2794, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27c4,
+	0x2500, 0x26ff,
+	0x2701, 0x2767,
+	0x2794, 0x27c4,
 	0x27c7, 0x27ca,
 	0x27cc, 0x27cc,
-	0x27d0, 0x27e5,
+	0x27ce, 0x27e5,
 	0x27f0, 0x2982,
 	0x2999, 0x29d7,
 	0x29dc, 0x29fb,
@@ -4390,6 +4487,7 @@ static const OnigCodePoint CR_S[] = {
 	0xa836, 0xa839,
 	0xaa77, 0xaa79,
 	0xfb29, 0xfb29,
+	0xfbb2, 0xfbc1,
 	0xfdfc, 0xfdfd,
 	0xfe62, 0xfe62,
 	0xfe64, 0xfe66,
@@ -4431,23 +4529,45 @@ static const OnigCodePoint CR_S[] = {
 	0x1d7c3, 0x1d7c3,
 	0x1f000, 0x1f02b,
 	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
 	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,
+	0x1f130, 0x1f169,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
 	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f5ff,
+	0x1f601, 0x1f610,
+	0x1f612, 0x1f614,
+	0x1f616, 0x1f616,
+	0x1f618, 0x1f618,
+	0x1f61a, 0x1f61a,
+	0x1f61c, 0x1f61e,
+	0x1f620, 0x1f625,
+	0x1f628, 0x1f62b,
+	0x1f62d, 0x1f62d,
+	0x1f630, 0x1f633,
+	0x1f635, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
 }; /* CR_S */
 
 /* 'Sc': General Category */
@@ -4462,7 +4582,7 @@ static const OnigCodePoint CR_Sc[] = {
 	0x0bf9, 0x0bf9,
 	0x0e3f, 0x0e3f,
 	0x17db, 0x17db,
-	0x20a0, 0x20b8,
+	0x20a0, 0x20b9,
 	0xa838, 0xa838,
 	0xfdfc, 0xfdfc,
 	0xfe69, 0xfe69,
@@ -4473,7 +4593,7 @@ static const OnigCodePoint CR_Sc[] = {
 
 /* 'Sk': General Category */
 static const OnigCodePoint CR_Sk[] = {
-	26,
+	27,
 	0x005e, 0x005e,
 	0x0060, 0x0060,
 	0x00a8, 0x00a8,
@@ -4497,6 +4617,7 @@ static const OnigCodePoint CR_Sk[] = {
 	0xa700, 0xa716,
 	0xa720, 0xa721,
 	0xa789, 0xa78a,
+	0xfbb2, 0xfbc1,
 	0xff3e, 0xff3e,
 	0xff40, 0xff40,
 	0xffe3, 0xffe3,
@@ -4504,7 +4625,7 @@ static const OnigCodePoint CR_Sk[] = {
 
 /* 'Sm': General Category */
 static const OnigCodePoint CR_Sm[] = {
-	65,
+	66,
 	0x002b, 0x002b,
 	0x003c, 0x003e,
 	0x007c, 0x007c,
@@ -4519,6 +4640,7 @@ static const OnigCodePoint CR_Sm[] = {
 	0x2052, 0x2052,
 	0x207a, 0x207c,
 	0x208a, 0x208c,
+	0x2118, 0x2118,
 	0x2140, 0x2144,
 	0x214b, 0x214b,
 	0x2190, 0x2194,
@@ -4543,7 +4665,7 @@ static const OnigCodePoint CR_Sm[] = {
 	0x27c0, 0x27c4,
 	0x27c7, 0x27ca,
 	0x27cc, 0x27cc,
-	0x27d0, 0x27e5,
+	0x27ce, 0x27e5,
 	0x27f0, 0x27ff,
 	0x2900, 0x2982,
 	0x2999, 0x29d7,
@@ -4574,7 +4696,7 @@ static const OnigCodePoint CR_Sm[] = {
 
 /* 'So': General Category */
 static const OnigCodePoint CR_So[] = {
-	154,
+	164,
 	0x00a6, 0x00a7,
 	0x00a9, 0x00a9,
 	0x00ae, 0x00ae,
@@ -4582,6 +4704,7 @@ static const OnigCodePoint CR_So[] = {
 	0x00b6, 0x00b6,
 	0x0482, 0x0482,
 	0x060e, 0x060f,
+	0x06de, 0x06de,
 	0x06e9, 0x06e9,
 	0x06fd, 0x06fe,
 	0x07f6, 0x07f6,
@@ -4590,7 +4713,6 @@ static const OnigCodePoint CR_So[] = {
 	0x0bf3, 0x0bf8,
 	0x0bfa, 0x0bfa,
 	0x0c7f, 0x0c7f,
-	0x0cf1, 0x0cf2,
 	0x0d79, 0x0d79,
 	0x0f01, 0x0f03,
 	0x0f13, 0x0f17,
@@ -4606,14 +4728,14 @@ static const OnigCodePoint CR_So[] = {
 	0x1360, 0x1360,
 	0x1390, 0x1399,
 	0x1940, 0x1940,
-	0x19e0, 0x19ff,
+	0x19de, 0x19ff,
 	0x1b61, 0x1b6a,
 	0x1b74, 0x1b7c,
 	0x2100, 0x2101,
 	0x2103, 0x2106,
 	0x2108, 0x2109,
 	0x2114, 0x2114,
-	0x2116, 0x2118,
+	0x2116, 0x2117,
 	0x211e, 0x2123,
 	0x2125, 0x2125,
 	0x2127, 0x2127,
@@ -4638,7 +4760,7 @@ static const OnigCodePoint CR_So[] = {
 	0x232b, 0x237b,
 	0x237d, 0x239a,
 	0x23b4, 0x23db,
-	0x23e2, 0x23e8,
+	0x23e2, 0x23f3,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
 	0x249c, 0x24e9,
@@ -4646,21 +4768,9 @@ static const OnigCodePoint CR_So[] = {
 	0x25b8, 0x25c0,
 	0x25c2, 0x25f7,
 	0x2600, 0x266e,
-	0x2670, 0x26cd,
-	0x26cf, 0x26e1,
-	0x26e3, 0x26e3,
-	0x26e8, 0x26ff,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x275e,
-	0x2761, 0x2767,
-	0x2794, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
+	0x2670, 0x26ff,
+	0x2701, 0x2767,
+	0x2794, 0x27bf,
 	0x2800, 0x28ff,
 	0x2b00, 0x2b2f,
 	0x2b45, 0x2b46,
@@ -4712,23 +4822,45 @@ static const OnigCodePoint CR_So[] = {
 	0x1d300, 0x1d356,
 	0x1f000, 0x1f02b,
 	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
 	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,
+	0x1f130, 0x1f169,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
 	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f5ff,
+	0x1f601, 0x1f610,
+	0x1f612, 0x1f614,
+	0x1f616, 0x1f616,
+	0x1f618, 0x1f618,
+	0x1f61a, 0x1f61a,
+	0x1f61c, 0x1f61e,
+	0x1f620, 0x1f625,
+	0x1f628, 0x1f62b,
+	0x1f62d, 0x1f62d,
+	0x1f630, 0x1f633,
+	0x1f635, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
 }; /* CR_So */
 
 /* 'Z': Major Category */
@@ -4772,7 +4904,7 @@ static const OnigCodePoint CR_Zs[] = {
 
 /* 'Math': Derived Property */
 static const OnigCodePoint CR_Math[] = {
-	105,
+	106,
 	0x002b, 0x002b,
 	0x003c, 0x003e,
 	0x005e, 0x005e,
@@ -4800,9 +4932,10 @@ static const OnigCodePoint CR_Math[] = {
 	0x20e5, 0x20e6,
 	0x20eb, 0x20ef,
 	0x2102, 0x2102,
+	0x2107, 0x2107,
 	0x210a, 0x2113,
 	0x2115, 0x2115,
-	0x2119, 0x211d,
+	0x2118, 0x211d,
 	0x2124, 0x2124,
 	0x2128, 0x2129,
 	0x212c, 0x212d,
@@ -4842,7 +4975,7 @@ static const OnigCodePoint CR_Math[] = {
 	0x266d, 0x266f,
 	0x27c0, 0x27ca,
 	0x27cc, 0x27cc,
-	0x27d0, 0x27ff,
+	0x27ce, 0x27ff,
 	0x2900, 0x2aff,
 	0x2b30, 0x2b44,
 	0x2b47, 0x2b4c,
@@ -4882,7 +5015,7 @@ static const OnigCodePoint CR_Math[] = {
 
 /* 'Alphabetic': Derived Property */
 static const OnigCodePoint CR_Alphabetic[] = {
-	474,
+	486,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -4905,7 +5038,7 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x038e, 0x03a1,
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x0559,
 	0x0561, 0x0587,
@@ -4917,8 +5050,8 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
 	0x0610, 0x061a,
-	0x0621, 0x0657,
-	0x0659, 0x065e,
+	0x0620, 0x0657,
+	0x0659, 0x065f,
 	0x066e, 0x06d3,
 	0x06d5, 0x06dc,
 	0x06e1, 0x06e8,
@@ -4932,13 +5065,12 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x07fa, 0x07fa,
 	0x0800, 0x0817,
 	0x081a, 0x082c,
-	0x0900, 0x0939,
+	0x0840, 0x0858,
+	0x0900, 0x093b,
 	0x093d, 0x094c,
-	0x094e, 0x094e,
-	0x0950, 0x0950,
-	0x0955, 0x0955,
-	0x0958, 0x0963,
-	0x0971, 0x0972,
+	0x094e, 0x0950,
+	0x0955, 0x0963,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
@@ -5035,14 +5167,15 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x0cd5, 0x0cd6,
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce3,
+	0x0cf1, 0x0cf2,
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
 	0x0d4a, 0x0d4c,
+	0x0d4e, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d7a, 0x0d7f,
@@ -5080,8 +5213,7 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x0f40, 0x0f47,
 	0x0f49, 0x0f6c,
 	0x0f71, 0x0f81,
-	0x0f88, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f88, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x1000, 0x1036,
 	0x1038, 0x1038,
@@ -5148,6 +5280,8 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x1b45, 0x1b4b,
 	0x1b80, 0x1ba9,
 	0x1bae, 0x1baf,
+	0x1bc0, 0x1be5,
+	0x1be7, 0x1bf1,
 	0x1c00, 0x1c35,
 	0x1c4d, 0x1c4f,
 	0x1c5a, 0x1c7d,
@@ -5175,7 +5309,7 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x1ff6, 0x1ffc,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x2102, 0x2102,
 	0x2107, 0x2107,
 	0x210a, 0x2113,
@@ -5219,7 +5353,7 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x30fc, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -5228,14 +5362,15 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0xa500, 0xa60c,
 	0xa610, 0xa61f,
 	0xa62a, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa66e,
+	0xa640, 0xa66e,
 	0xa67f, 0xa697,
 	0xa6a0, 0xa6ef,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa801,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa801,
 	0xa803, 0xa805,
 	0xa807, 0xa80a,
 	0xa80c, 0xa827,
@@ -5246,7 +5381,8 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0xa90a, 0xa92a,
 	0xa930, 0xa952,
 	0xa960, 0xa97c,
-	0xa980, 0xa9bf,
+	0xa980, 0xa9b2,
+	0xa9b4, 0xa9bf,
 	0xa9cf, 0xa9cf,
 	0xaa00, 0xaa36,
 	0xaa40, 0xaa4d,
@@ -5256,6 +5392,11 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0xaac0, 0xaac0,
 	0xaac2, 0xaac2,
 	0xaadb, 0xaadd,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabea,
 	0xac00, 0xd7a3,
 	0xd7b0, 0xd7c6,
@@ -5320,10 +5461,13 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11000, 0x11045,
 	0x11082, 0x110b8,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d400, 0x1d454,
 	0x1d456, 0x1d49c,
 	0x1d49e, 0x1d49f,
@@ -5356,12 +5500,13 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x1d7c4, 0x1d7cb,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_Alphabetic */
 
 /* 'Lowercase': Derived Property */
 static const OnigCodePoint CR_Lowercase[] = {
-	602,
+	612,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
 	0x00b5, 0x00b5,
@@ -5631,6 +5776,7 @@ static const OnigCodePoint CR_Lowercase[] = {
 	0x0521, 0x0521,
 	0x0523, 0x0523,
 	0x0525, 0x0525,
+	0x0527, 0x0527,
 	0x0561, 0x0587,
 	0x1d00, 0x1dbf,
 	0x1e01, 0x1e01,
@@ -5868,6 +6014,7 @@ static const OnigCodePoint CR_Lowercase[] = {
 	0xa65b, 0xa65b,
 	0xa65d, 0xa65d,
 	0xa65f, 0xa65f,
+	0xa661, 0xa661,
 	0xa663, 0xa663,
 	0xa665, 0xa665,
 	0xa667, 0xa667,
@@ -5932,6 +6079,14 @@ static const OnigCodePoint CR_Lowercase[] = {
 	0xa785, 0xa785,
 	0xa787, 0xa787,
 	0xa78c, 0xa78c,
+	0xa78e, 0xa78e,
+	0xa791, 0xa791,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
+	0xa7fa, 0xa7fa,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
 	0xff41, 0xff5a,
@@ -5968,7 +6123,7 @@ static const OnigCodePoint CR_Lowercase[] = {
 
 /* 'Uppercase': Derived Property */
 static const OnigCodePoint CR_Uppercase[] = {
-	596,
+	605,
 	0x0041, 0x005a,
 	0x00c0, 0x00d6,
 	0x00d8, 0x00de,
@@ -6234,6 +6389,7 @@ static const OnigCodePoint CR_Uppercase[] = {
 	0x0520, 0x0520,
 	0x0522, 0x0522,
 	0x0524, 0x0524,
+	0x0526, 0x0526,
 	0x0531, 0x0556,
 	0x10a0, 0x10c5,
 	0x1e00, 0x1e00,
@@ -6468,6 +6624,7 @@ static const OnigCodePoint CR_Uppercase[] = {
 	0xa65a, 0xa65a,
 	0xa65c, 0xa65c,
 	0xa65e, 0xa65e,
+	0xa660, 0xa660,
 	0xa662, 0xa662,
 	0xa664, 0xa664,
 	0xa666, 0xa666,
@@ -6532,6 +6689,13 @@ static const OnigCodePoint CR_Uppercase[] = {
 	0xa784, 0xa784,
 	0xa786, 0xa786,
 	0xa78b, 0xa78b,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
 	0xff21, 0xff3a,
 	0x10400, 0x10427,
 	0x1d400, 0x1d419,
@@ -6569,7 +6733,7 @@ static const OnigCodePoint CR_Uppercase[] = {
 
 /* 'Cased': Derived Property */
 static const OnigCodePoint CR_Cased[] = {
-	110,
+	112,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -6593,7 +6757,7 @@ static const OnigCodePoint CR_Cased[] = {
 	0x038e, 0x03a1,
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0561, 0x0587,
 	0x10a0, 0x10c5,
@@ -6640,11 +6804,13 @@ static const OnigCodePoint CR_Cased[] = {
 	0x2c60, 0x2ce4,
 	0x2ceb, 0x2cee,
 	0x2d00, 0x2d25,
-	0xa640, 0xa65f,
-	0xa662, 0xa66d,
+	0xa640, 0xa66d,
 	0xa680, 0xa697,
 	0xa722, 0xa787,
-	0xa78b, 0xa78c,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa7fa,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
 	0xff21, 0xff3a,
@@ -6684,7 +6850,7 @@ static const OnigCodePoint CR_Cased[] = {
 
 /* 'Case_Ignorable': Derived Property */
 static const OnigCodePoint CR_Case_Ignorable[] = {
-	266,
+	277,
 	0x0027, 0x0027,
 	0x002e, 0x002e,
 	0x003a, 0x003a,
@@ -6711,9 +6877,10 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x0600, 0x0603,
 	0x0610, 0x061a,
 	0x0640, 0x0640,
-	0x064b, 0x065e,
+	0x064b, 0x065f,
 	0x0670, 0x0670,
-	0x06d6, 0x06e8,
+	0x06d6, 0x06dd,
+	0x06df, 0x06e8,
 	0x06ea, 0x06ed,
 	0x070f, 0x070f,
 	0x0711, 0x0711,
@@ -6722,11 +6889,13 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x07eb, 0x07f5,
 	0x07fa, 0x07fa,
 	0x0816, 0x082d,
+	0x0859, 0x085b,
 	0x0900, 0x0902,
+	0x093a, 0x093a,
 	0x093c, 0x093c,
 	0x0941, 0x0948,
 	0x094d, 0x094d,
-	0x0951, 0x0955,
+	0x0951, 0x0957,
 	0x0962, 0x0963,
 	0x0971, 0x0971,
 	0x0981, 0x0981,
@@ -6789,7 +6958,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x0f71, 0x0f7e,
 	0x0f80, 0x0f84,
 	0x0f86, 0x0f87,
-	0x0f90, 0x0f97,
+	0x0f8d, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fc6, 0x0fc6,
 	0x102d, 0x1030,
@@ -6804,7 +6973,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x108d, 0x108d,
 	0x109d, 0x109d,
 	0x10fc, 0x10fc,
-	0x135f, 0x135f,
+	0x135d, 0x135f,
 	0x1712, 0x1714,
 	0x1732, 0x1734,
 	0x1752, 0x1753,
@@ -6840,6 +7009,10 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x1b80, 0x1b81,
 	0x1ba2, 0x1ba5,
 	0x1ba8, 0x1ba9,
+	0x1be6, 0x1be6,
+	0x1be8, 0x1be9,
+	0x1bed, 0x1bed,
+	0x1bef, 0x1bf1,
 	0x1c2c, 0x1c33,
 	0x1c36, 0x1c37,
 	0x1c78, 0x1c7d,
@@ -6850,7 +7023,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x1d2c, 0x1d61,
 	0x1d78, 0x1d78,
 	0x1d9b, 0x1de6,
-	0x1dfd, 0x1dff,
+	0x1dfc, 0x1dff,
 	0x1fbd, 0x1fbd,
 	0x1fbf, 0x1fc1,
 	0x1fcd, 0x1fcf,
@@ -6866,11 +7039,12 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x206a, 0x206f,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x20d0, 0x20f0,
 	0x2c7d, 0x2c7d,
 	0x2cef, 0x2cf1,
 	0x2d6f, 0x2d6f,
+	0x2d7f, 0x2d7f,
 	0x2de0, 0x2dff,
 	0x2e2f, 0x2e2f,
 	0x3005, 0x3005,
@@ -6918,6 +7092,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0xabe8, 0xabe8,
 	0xabed, 0xabed,
 	0xfb1e, 0xfb1e,
+	0xfbb2, 0xfbc1,
 	0xfe00, 0xfe0f,
 	0xfe13, 0xfe13,
 	0xfe20, 0xfe26,
@@ -6939,6 +7114,8 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x10a0c, 0x10a0f,
 	0x10a38, 0x10a3a,
 	0x10a3f, 0x10a3f,
+	0x11001, 0x11001,
+	0x11038, 0x11046,
 	0x11080, 0x11081,
 	0x110b3, 0x110b6,
 	0x110b9, 0x110ba,
@@ -6955,7 +7132,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 
 /* 'Changes_When_Lowercased': Derived Property */
 static const OnigCodePoint CR_Changes_When_Lowercased[] = {
-	557,
+	566,
 	0x0041, 0x005a,
 	0x00c0, 0x00d6,
 	0x00d8, 0x00de,
@@ -7220,6 +7397,7 @@ static const OnigCodePoint CR_Changes_When_Lowercased[] = {
 	0x0520, 0x0520,
 	0x0522, 0x0522,
 	0x0524, 0x0524,
+	0x0526, 0x0526,
 	0x0531, 0x0556,
 	0x10a0, 0x10c5,
 	0x1e00, 0x1e00,
@@ -7447,6 +7625,7 @@ static const OnigCodePoint CR_Changes_When_Lowercased[] = {
 	0xa65a, 0xa65a,
 	0xa65c, 0xa65c,
 	0xa65e, 0xa65e,
+	0xa660, 0xa660,
 	0xa662, 0xa662,
 	0xa664, 0xa664,
 	0xa666, 0xa666,
@@ -7511,13 +7690,20 @@ static const OnigCodePoint CR_Changes_When_Lowercased[] = {
 	0xa784, 0xa784,
 	0xa786, 0xa786,
 	0xa78b, 0xa78b,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
 	0xff21, 0xff3a,
 	0x10400, 0x10427,
 }; /* CR_Changes_When_Lowercased */
 
 /* 'Changes_When_Uppercased': Derived Property */
 static const OnigCodePoint CR_Changes_When_Uppercased[] = {
-	573,
+	582,
 	0x0061, 0x007a,
 	0x00b5, 0x00b5,
 	0x00df, 0x00f6,
@@ -7667,6 +7853,7 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
 	0x025b, 0x025b,
 	0x0260, 0x0260,
 	0x0263, 0x0263,
+	0x0265, 0x0265,
 	0x0268, 0x0269,
 	0x026b, 0x026b,
 	0x026f, 0x026f,
@@ -7796,6 +7983,7 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
 	0x0521, 0x0521,
 	0x0523, 0x0523,
 	0x0525, 0x0525,
+	0x0527, 0x0527,
 	0x0561, 0x0587,
 	0x1d79, 0x1d79,
 	0x1d7d, 0x1d7d,
@@ -8023,6 +8211,7 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
 	0xa65b, 0xa65b,
 	0xa65d, 0xa65d,
 	0xa65f, 0xa65f,
+	0xa661, 0xa661,
 	0xa663, 0xa663,
 	0xa665, 0xa665,
 	0xa667, 0xa667,
@@ -8087,6 +8276,12 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
 	0xa785, 0xa785,
 	0xa787, 0xa787,
 	0xa78c, 0xa78c,
+	0xa791, 0xa791,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
 	0xff41, 0xff5a,
@@ -8095,7 +8290,7 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
 
 /* 'Changes_When_Titlecased': Derived Property */
 static const OnigCodePoint CR_Changes_When_Titlecased[] = {
-	574,
+	583,
 	0x0061, 0x007a,
 	0x00b5, 0x00b5,
 	0x00df, 0x00f6,
@@ -8246,6 +8441,7 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
 	0x025b, 0x025b,
 	0x0260, 0x0260,
 	0x0263, 0x0263,
+	0x0265, 0x0265,
 	0x0268, 0x0269,
 	0x026b, 0x026b,
 	0x026f, 0x026f,
@@ -8375,6 +8571,7 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
 	0x0521, 0x0521,
 	0x0523, 0x0523,
 	0x0525, 0x0525,
+	0x0527, 0x0527,
 	0x0561, 0x0587,
 	0x1d79, 0x1d79,
 	0x1d7d, 0x1d7d,
@@ -8602,6 +8799,7 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
 	0xa65b, 0xa65b,
 	0xa65d, 0xa65d,
 	0xa65f, 0xa65f,
+	0xa661, 0xa661,
 	0xa663, 0xa663,
 	0xa665, 0xa665,
 	0xa667, 0xa667,
@@ -8666,6 +8864,12 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
 	0xa785, 0xa785,
 	0xa787, 0xa787,
 	0xa78c, 0xa78c,
+	0xa791, 0xa791,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
 	0xff41, 0xff5a,
@@ -8674,7 +8878,7 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
 
 /* 'Changes_When_Casefolded': Derived Property */
 static const OnigCodePoint CR_Changes_When_Casefolded[] = {
-	568,
+	577,
 	0x0041, 0x005a,
 	0x00b5, 0x00b5,
 	0x00c0, 0x00d6,
@@ -8945,6 +9149,7 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
 	0x0520, 0x0520,
 	0x0522, 0x0522,
 	0x0524, 0x0524,
+	0x0526, 0x0526,
 	0x0531, 0x0556,
 	0x0587, 0x0587,
 	0x10a0, 0x10c5,
@@ -9175,6 +9380,7 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
 	0xa65a, 0xa65a,
 	0xa65c, 0xa65c,
 	0xa65e, 0xa65e,
+	0xa660, 0xa660,
 	0xa662, 0xa662,
 	0xa664, 0xa664,
 	0xa666, 0xa666,
@@ -9239,6 +9445,13 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
 	0xa784, 0xa784,
 	0xa786, 0xa786,
 	0xa78b, 0xa78b,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
 	0xff21, 0xff3a,
@@ -9247,7 +9460,7 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
 
 /* 'Changes_When_Casemapped': Derived Property */
 static const OnigCodePoint CR_Changes_When_Casemapped[] = {
-	97,
+	99,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00b5, 0x00b5,
@@ -9268,6 +9481,7 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
 	0x025b, 0x025b,
 	0x0260, 0x0260,
 	0x0263, 0x0263,
+	0x0265, 0x0265,
 	0x0268, 0x0269,
 	0x026b, 0x026b,
 	0x026f, 0x026f,
@@ -9291,7 +9505,7 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
 	0x03f4, 0x03f5,
 	0x03f7, 0x03fb,
 	0x03fd, 0x0481,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0561, 0x0587,
 	0x10a0, 0x10c5,
@@ -9333,13 +9547,14 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
 	0x2c7e, 0x2ce3,
 	0x2ceb, 0x2cee,
 	0x2d00, 0x2d25,
-	0xa640, 0xa65f,
-	0xa662, 0xa66d,
+	0xa640, 0xa66d,
 	0xa680, 0xa697,
 	0xa722, 0xa72f,
 	0xa732, 0xa76f,
 	0xa779, 0xa787,
-	0xa78b, 0xa78c,
+	0xa78b, 0xa78d,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
 	0xff21, 0xff3a,
@@ -9349,7 +9564,7 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
 
 /* 'ID_Start': Derived Property */
 static const OnigCodePoint CR_ID_Start[] = {
-	424,
+	437,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -9371,13 +9586,13 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x038e, 0x03a1,
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x0559,
 	0x0561, 0x0587,
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
-	0x0621, 0x064a,
+	0x0620, 0x064a,
 	0x066e, 0x066f,
 	0x0671, 0x06d3,
 	0x06d5, 0x06d5,
@@ -9396,11 +9611,12 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x081a, 0x081a,
 	0x0824, 0x0824,
 	0x0828, 0x0828,
+	0x0840, 0x0858,
 	0x0904, 0x0939,
 	0x093d, 0x093d,
 	0x0950, 0x0950,
 	0x0958, 0x0961,
-	0x0971, 0x0972,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0x0985, 0x098c,
 	0x098f, 0x0990,
@@ -9469,11 +9685,12 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x0cbd, 0x0cbd,
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce1,
+	0x0cf1, 0x0cf2,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
 	0x0d60, 0x0d61,
 	0x0d7a, 0x0d7f,
 	0x0d85, 0x0d96,
@@ -9504,7 +9721,7 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x0f00, 0x0f00,
 	0x0f40, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8b,
+	0x0f88, 0x0f8c,
 	0x1000, 0x102a,
 	0x103f, 0x103f,
 	0x1050, 0x1055,
@@ -9565,6 +9782,7 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x1b45, 0x1b4b,
 	0x1b83, 0x1ba0,
 	0x1bae, 0x1baf,
+	0x1bc0, 0x1be5,
 	0x1c00, 0x1c23,
 	0x1c4d, 0x1c4f,
 	0x1c5a, 0x1c7d,
@@ -9592,7 +9810,7 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x1ff6, 0x1ffc,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x2102, 0x2102,
 	0x2107, 0x2107,
 	0x210a, 0x2113,
@@ -9632,7 +9850,7 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x30fc, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -9641,14 +9859,15 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0xa500, 0xa60c,
 	0xa610, 0xa61f,
 	0xa62a, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa66e,
+	0xa640, 0xa66e,
 	0xa67f, 0xa697,
 	0xa6a0, 0xa6ef,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa801,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa801,
 	0xa803, 0xa805,
 	0xa807, 0xa80a,
 	0xa80c, 0xa822,
@@ -9673,6 +9892,11 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0xaac0, 0xaac0,
 	0xaac2, 0xaac2,
 	0xaadb, 0xaadd,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabe2,
 	0xac00, 0xd7a3,
 	0xd7b0, 0xd7c6,
@@ -9737,10 +9961,13 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11003, 0x11037,
 	0x11083, 0x110af,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d400, 0x1d454,
 	0x1d456, 0x1d49c,
 	0x1d49e, 0x1d49f,
@@ -9773,12 +10000,13 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x1d7c4, 0x1d7cb,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_ID_Start */
 
 /* 'ID_Continue': Derived Property */
 static const OnigCodePoint CR_ID_Continue[] = {
-	506,
+	514,
 	0x0030, 0x0039,
 	0x0041, 0x005a,
 	0x005f, 0x005f,
@@ -9803,7 +10031,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
 	0x0483, 0x0487,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x0559,
 	0x0561, 0x0587,
@@ -9815,8 +10043,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
 	0x0610, 0x061a,
-	0x0621, 0x065e,
-	0x0660, 0x0669,
+	0x0620, 0x0669,
 	0x066e, 0x06d3,
 	0x06d5, 0x06dc,
 	0x06df, 0x06e8,
@@ -9827,12 +10054,10 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x07c0, 0x07f5,
 	0x07fa, 0x07fa,
 	0x0800, 0x082d,
-	0x0900, 0x0939,
-	0x093c, 0x094e,
-	0x0950, 0x0955,
-	0x0958, 0x0963,
+	0x0840, 0x085b,
+	0x0900, 0x0963,
 	0x0966, 0x096f,
-	0x0971, 0x0972,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
@@ -9934,14 +10159,14 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
+	0x0d4a, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d66, 0x0d6f,
@@ -9987,8 +10212,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x0f3e, 0x0f47,
 	0x0f49, 0x0f6c,
 	0x0f71, 0x0f84,
-	0x0f86, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f86, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fc6, 0x0fc6,
 	0x1000, 0x1049,
@@ -10012,7 +10236,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x12d8, 0x1310,
 	0x1312, 0x1315,
 	0x1318, 0x135a,
-	0x135f, 0x135f,
+	0x135d, 0x135f,
 	0x1369, 0x1371,
 	0x1380, 0x138f,
 	0x13a0, 0x13f4,
@@ -10057,13 +10281,14 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x1b6b, 0x1b73,
 	0x1b80, 0x1baa,
 	0x1bae, 0x1bb9,
+	0x1bc0, 0x1bf3,
 	0x1c00, 0x1c37,
 	0x1c40, 0x1c49,
 	0x1c4d, 0x1c7d,
 	0x1cd0, 0x1cd2,
 	0x1cd4, 0x1cf2,
 	0x1d00, 0x1de6,
-	0x1dfd, 0x1f15,
+	0x1dfc, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
 	0x1f48, 0x1f4d,
@@ -10086,7 +10311,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x2054, 0x2054,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x20d0, 0x20dc,
 	0x20e1, 0x20e1,
 	0x20e5, 0x20f0,
@@ -10110,7 +10335,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x2d00, 0x2d25,
 	0x2d30, 0x2d65,
 	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
+	0x2d7f, 0x2d96,
 	0x2da0, 0x2da6,
 	0x2da8, 0x2dae,
 	0x2db0, 0x2db6,
@@ -10130,7 +10355,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x30fc, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -10138,15 +10363,16 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0xa4d0, 0xa4fd,
 	0xa500, 0xa60c,
 	0xa610, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa66f,
+	0xa640, 0xa66f,
 	0xa67c, 0xa67d,
 	0xa67f, 0xa697,
 	0xa6a0, 0xa6f1,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa827,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa827,
 	0xa840, 0xa873,
 	0xa880, 0xa8c4,
 	0xa8d0, 0xa8d9,
@@ -10164,6 +10390,11 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0xaa7a, 0xaa7b,
 	0xaa80, 0xaac2,
 	0xaadb, 0xaadd,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabea,
 	0xabec, 0xabed,
 	0xabf0, 0xabf9,
@@ -10240,10 +10471,14 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11000, 0x11046,
+	0x11066, 0x1106f,
 	0x11080, 0x110ba,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d165, 0x1d169,
 	0x1d16d, 0x1d172,
 	0x1d17b, 0x1d182,
@@ -10283,13 +10518,14 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x1d7ce, 0x1d7ff,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 	0xe0100, 0xe01ef,
 }; /* CR_ID_Continue */
 
 /* 'XID_Start': Derived Property */
 static const OnigCodePoint CR_XID_Start[] = {
-	431,
+	444,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -10311,13 +10547,13 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x038e, 0x03a1,
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x0559,
 	0x0561, 0x0587,
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
-	0x0621, 0x064a,
+	0x0620, 0x064a,
 	0x066e, 0x066f,
 	0x0671, 0x06d3,
 	0x06d5, 0x06d5,
@@ -10336,11 +10572,12 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x081a, 0x081a,
 	0x0824, 0x0824,
 	0x0828, 0x0828,
+	0x0840, 0x0858,
 	0x0904, 0x0939,
 	0x093d, 0x093d,
 	0x0950, 0x0950,
 	0x0958, 0x0961,
-	0x0971, 0x0972,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0x0985, 0x098c,
 	0x098f, 0x0990,
@@ -10409,11 +10646,12 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x0cbd, 0x0cbd,
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce1,
+	0x0cf1, 0x0cf2,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
 	0x0d60, 0x0d61,
 	0x0d7a, 0x0d7f,
 	0x0d85, 0x0d96,
@@ -10444,7 +10682,7 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x0f00, 0x0f00,
 	0x0f40, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8b,
+	0x0f88, 0x0f8c,
 	0x1000, 0x102a,
 	0x103f, 0x103f,
 	0x1050, 0x1055,
@@ -10505,6 +10743,7 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x1b45, 0x1b4b,
 	0x1b83, 0x1ba0,
 	0x1bae, 0x1baf,
+	0x1bc0, 0x1be5,
 	0x1c00, 0x1c23,
 	0x1c4d, 0x1c4f,
 	0x1c5a, 0x1c7d,
@@ -10532,7 +10771,7 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x1ff6, 0x1ffc,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x2102, 0x2102,
 	0x2107, 0x2107,
 	0x210a, 0x2113,
@@ -10572,7 +10811,7 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x30fc, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -10581,14 +10820,15 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0xa500, 0xa60c,
 	0xa610, 0xa61f,
 	0xa62a, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa66e,
+	0xa640, 0xa66e,
 	0xa67f, 0xa697,
 	0xa6a0, 0xa6ef,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa801,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa801,
 	0xa803, 0xa805,
 	0xa807, 0xa80a,
 	0xa80c, 0xa822,
@@ -10613,6 +10853,11 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0xaac0, 0xaac0,
 	0xaac2, 0xaac2,
 	0xaadb, 0xaadd,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabe2,
 	0xac00, 0xd7a3,
 	0xd7b0, 0xd7c6,
@@ -10684,10 +10929,13 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11003, 0x11037,
 	0x11083, 0x110af,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d400, 0x1d454,
 	0x1d456, 0x1d49c,
 	0x1d49e, 0x1d49f,
@@ -10720,12 +10968,13 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x1d7c4, 0x1d7cb,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_XID_Start */
 
 /* 'XID_Continue': Derived Property */
 static const OnigCodePoint CR_XID_Continue[] = {
-	513,
+	521,
 	0x0030, 0x0039,
 	0x0041, 0x005a,
 	0x005f, 0x005f,
@@ -10750,7 +10999,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
 	0x0483, 0x0487,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x0559,
 	0x0561, 0x0587,
@@ -10762,8 +11011,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
 	0x0610, 0x061a,
-	0x0621, 0x065e,
-	0x0660, 0x0669,
+	0x0620, 0x0669,
 	0x066e, 0x06d3,
 	0x06d5, 0x06dc,
 	0x06df, 0x06e8,
@@ -10774,12 +11022,10 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x07c0, 0x07f5,
 	0x07fa, 0x07fa,
 	0x0800, 0x082d,
-	0x0900, 0x0939,
-	0x093c, 0x094e,
-	0x0950, 0x0955,
-	0x0958, 0x0963,
+	0x0840, 0x085b,
+	0x0900, 0x0963,
 	0x0966, 0x096f,
-	0x0971, 0x0972,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
@@ -10881,14 +11127,14 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
+	0x0d4a, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d66, 0x0d6f,
@@ -10934,8 +11180,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x0f3e, 0x0f47,
 	0x0f49, 0x0f6c,
 	0x0f71, 0x0f84,
-	0x0f86, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f86, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fc6, 0x0fc6,
 	0x1000, 0x1049,
@@ -10959,7 +11204,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x12d8, 0x1310,
 	0x1312, 0x1315,
 	0x1318, 0x135a,
-	0x135f, 0x135f,
+	0x135d, 0x135f,
 	0x1369, 0x1371,
 	0x1380, 0x138f,
 	0x13a0, 0x13f4,
@@ -11004,13 +11249,14 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x1b6b, 0x1b73,
 	0x1b80, 0x1baa,
 	0x1bae, 0x1bb9,
+	0x1bc0, 0x1bf3,
 	0x1c00, 0x1c37,
 	0x1c40, 0x1c49,
 	0x1c4d, 0x1c7d,
 	0x1cd0, 0x1cd2,
 	0x1cd4, 0x1cf2,
 	0x1d00, 0x1de6,
-	0x1dfd, 0x1f15,
+	0x1dfc, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
 	0x1f48, 0x1f4d,
@@ -11033,7 +11279,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x2054, 0x2054,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x20d0, 0x20dc,
 	0x20e1, 0x20e1,
 	0x20e5, 0x20f0,
@@ -11057,7 +11303,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x2d00, 0x2d25,
 	0x2d30, 0x2d65,
 	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
+	0x2d7f, 0x2d96,
 	0x2da0, 0x2da6,
 	0x2da8, 0x2dae,
 	0x2db0, 0x2db6,
@@ -11078,7 +11324,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x30fc, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -11086,15 +11332,16 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0xa4d0, 0xa4fd,
 	0xa500, 0xa60c,
 	0xa610, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa66f,
+	0xa640, 0xa66f,
 	0xa67c, 0xa67d,
 	0xa67f, 0xa697,
 	0xa6a0, 0xa6f1,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa827,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa827,
 	0xa840, 0xa873,
 	0xa880, 0xa8c4,
 	0xa8d0, 0xa8d9,
@@ -11112,6 +11359,11 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0xaa7a, 0xaa7b,
 	0xaa80, 0xaac2,
 	0xaadb, 0xaadd,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabea,
 	0xabec, 0xabed,
 	0xabf0, 0xabf9,
@@ -11194,10 +11446,14 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11000, 0x11046,
+	0x11066, 0x1106f,
 	0x11080, 0x110ba,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d165, 0x1d169,
 	0x1d16d, 0x1d172,
 	0x1d17b, 0x1d182,
@@ -11237,6 +11493,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x1d7ce, 0x1d7ff,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 	0xe0100, 0xe01ef,
 }; /* CR_XID_Continue */
@@ -11263,7 +11520,7 @@ static const OnigCodePoint CR_Default_Ignorable_Code_Point[] = {
 
 /* 'Grapheme_Extend': Derived Property */
 static const OnigCodePoint CR_Grapheme_Extend[] = {
-	206,
+	215,
 	0x0300, 0x036f,
 	0x0483, 0x0489,
 	0x0591, 0x05bd,
@@ -11272,10 +11529,10 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x05c4, 0x05c5,
 	0x05c7, 0x05c7,
 	0x0610, 0x061a,
-	0x064b, 0x065e,
+	0x064b, 0x065f,
 	0x0670, 0x0670,
 	0x06d6, 0x06dc,
-	0x06de, 0x06e4,
+	0x06df, 0x06e4,
 	0x06e7, 0x06e8,
 	0x06ea, 0x06ed,
 	0x0711, 0x0711,
@@ -11286,11 +11543,13 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x081b, 0x0823,
 	0x0825, 0x0827,
 	0x0829, 0x082d,
+	0x0859, 0x085b,
 	0x0900, 0x0902,
+	0x093a, 0x093a,
 	0x093c, 0x093c,
 	0x0941, 0x0948,
 	0x094d, 0x094d,
-	0x0951, 0x0955,
+	0x0951, 0x0957,
 	0x0962, 0x0963,
 	0x0981, 0x0981,
 	0x09bc, 0x09bc,
@@ -11361,7 +11620,7 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x0f71, 0x0f7e,
 	0x0f80, 0x0f84,
 	0x0f86, 0x0f87,
-	0x0f90, 0x0f97,
+	0x0f8d, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fc6, 0x0fc6,
 	0x102d, 0x1030,
@@ -11375,7 +11634,7 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x1085, 0x1086,
 	0x108d, 0x108d,
 	0x109d, 0x109d,
-	0x135f, 0x135f,
+	0x135d, 0x135f,
 	0x1712, 0x1714,
 	0x1732, 0x1734,
 	0x1752, 0x1753,
@@ -11407,6 +11666,10 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x1b80, 0x1b81,
 	0x1ba2, 0x1ba5,
 	0x1ba8, 0x1ba9,
+	0x1be6, 0x1be6,
+	0x1be8, 0x1be9,
+	0x1bed, 0x1bed,
+	0x1bef, 0x1bf1,
 	0x1c2c, 0x1c33,
 	0x1c36, 0x1c37,
 	0x1cd0, 0x1cd2,
@@ -11414,10 +11677,11 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x1ce2, 0x1ce8,
 	0x1ced, 0x1ced,
 	0x1dc0, 0x1de6,
-	0x1dfd, 0x1dff,
+	0x1dfc, 0x1dff,
 	0x200c, 0x200d,
 	0x20d0, 0x20f0,
 	0x2cef, 0x2cf1,
+	0x2d7f, 0x2d7f,
 	0x2de0, 0x2dff,
 	0x302a, 0x302f,
 	0x3099, 0x309a,
@@ -11459,6 +11723,8 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x10a0c, 0x10a0f,
 	0x10a38, 0x10a3a,
 	0x10a3f, 0x10a3f,
+	0x11001, 0x11001,
+	0x11038, 0x11046,
 	0x11080, 0x11081,
 	0x110b3, 0x110b6,
 	0x110b9, 0x110ba,
@@ -11474,7 +11740,7 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 
 /* 'Grapheme_Base': Derived Property */
 static const OnigCodePoint CR_Grapheme_Base[] = {
-	567,
+	596,
 	0x0020, 0x007e,
 	0x00a0, 0x00ac,
 	0x00ae, 0x02ff,
@@ -11484,7 +11750,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x038c, 0x038c,
 	0x038e, 0x03a1,
 	0x03a3, 0x0482,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x055f,
 	0x0561, 0x0587,
@@ -11497,10 +11763,10 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x05f0, 0x05f4,
 	0x0606, 0x060f,
 	0x061b, 0x061b,
-	0x061e, 0x061f,
-	0x0621, 0x064a,
+	0x061e, 0x064a,
 	0x0660, 0x066f,
 	0x0671, 0x06d5,
+	0x06de, 0x06de,
 	0x06e5, 0x06e6,
 	0x06e9, 0x06e9,
 	0x06ee, 0x070d,
@@ -11515,13 +11781,15 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x0824, 0x0824,
 	0x0828, 0x0828,
 	0x0830, 0x083e,
+	0x0840, 0x0858,
+	0x085e, 0x085e,
 	0x0903, 0x0939,
+	0x093b, 0x093b,
 	0x093d, 0x0940,
 	0x0949, 0x094c,
-	0x094e, 0x094e,
-	0x0950, 0x0950,
+	0x094e, 0x0950,
 	0x0958, 0x0961,
-	0x0964, 0x0972,
+	0x0964, 0x0977,
 	0x0979, 0x097f,
 	0x0982, 0x0983,
 	0x0985, 0x098c,
@@ -11578,7 +11846,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x0b4b, 0x0b4c,
 	0x0b5c, 0x0b5d,
 	0x0b5f, 0x0b61,
-	0x0b66, 0x0b71,
+	0x0b66, 0x0b77,
 	0x0b83, 0x0b83,
 	0x0b85, 0x0b8a,
 	0x0b8e, 0x0b90,
@@ -11625,12 +11893,12 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d3d,
 	0x0d3f, 0x0d40,
 	0x0d46, 0x0d48,
 	0x0d4a, 0x0d4c,
+	0x0d4e, 0x0d4e,
 	0x0d60, 0x0d61,
 	0x0d66, 0x0d75,
 	0x0d79, 0x0d7f,
@@ -11673,10 +11941,10 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x0f49, 0x0f6c,
 	0x0f7f, 0x0f7f,
 	0x0f85, 0x0f85,
-	0x0f88, 0x0f8b,
+	0x0f88, 0x0f8c,
 	0x0fbe, 0x0fc5,
 	0x0fc7, 0x0fcc,
-	0x0fce, 0x0fd8,
+	0x0fce, 0x0fda,
 	0x1000, 0x102c,
 	0x1031, 0x1031,
 	0x1038, 0x1038,
@@ -11764,7 +12032,12 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x1ba6, 0x1ba7,
 	0x1baa, 0x1baa,
 	0x1bae, 0x1bb9,
-	0x1c00, 0x1c2b,
+	0x1bc0, 0x1be5,
+	0x1be7, 0x1be7,
+	0x1bea, 0x1bec,
+	0x1bee, 0x1bee,
+	0x1bf2, 0x1bf3,
+	0x1bfc, 0x1c2b,
 	0x1c34, 0x1c35,
 	0x1c3b, 0x1c49,
 	0x1c4d, 0x1c7f,
@@ -11794,36 +12067,23 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x202f, 0x205f,
 	0x2070, 0x2071,
 	0x2074, 0x208e,
-	0x2090, 0x2094,
-	0x20a0, 0x20b8,
+	0x2090, 0x209c,
+	0x20a0, 0x20b9,
 	0x2100, 0x2189,
-	0x2190, 0x23e8,
+	0x2190, 0x23f3,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
-	0x2460, 0x26cd,
-	0x26cf, 0x26e1,
-	0x26e3, 0x26e3,
-	0x26e8, 0x26ff,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
+	0x2460, 0x26ff,
+	0x2701, 0x27ca,
 	0x27cc, 0x27cc,
-	0x27d0, 0x2b4c,
+	0x27ce, 0x2b4c,
 	0x2b50, 0x2b59,
 	0x2c00, 0x2c2e,
 	0x2c30, 0x2c5e,
 	0x2c60, 0x2cee,
 	0x2cf9, 0x2d25,
 	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
+	0x2d6f, 0x2d70,
 	0x2d80, 0x2d96,
 	0x2da0, 0x2da6,
 	0x2da8, 0x2dae,
@@ -11844,7 +12104,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x309b, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x3190, 0x31b7,
+	0x3190, 0x31ba,
 	0x31c0, 0x31e3,
 	0x31f0, 0x321e,
 	0x3220, 0x32fe,
@@ -11853,14 +12113,15 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
 	0xa4d0, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa66e,
+	0xa640, 0xa66e,
 	0xa673, 0xa673,
 	0xa67e, 0xa697,
 	0xa6a0, 0xa6ef,
 	0xa6f2, 0xa6f7,
-	0xa700, 0xa78c,
-	0xa7fb, 0xa801,
+	0xa700, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa801,
 	0xa803, 0xa805,
 	0xa807, 0xa80a,
 	0xa80c, 0xa824,
@@ -11895,6 +12156,11 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0xaac0, 0xaac0,
 	0xaac2, 0xaac2,
 	0xaadb, 0xaadf,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabe4,
 	0xabe6, 0xabe7,
 	0xabe9, 0xabec,
@@ -11913,7 +12179,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0xfb3e, 0xfb3e,
 	0xfb40, 0xfb41,
 	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
+	0xfb46, 0xfbc1,
 	0xfbd3, 0xfd3f,
 	0xfd50, 0xfd8f,
 	0xfd92, 0xfdc7,
@@ -11978,6 +12244,10 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x10b78, 0x10b7f,
 	0x10c00, 0x10c48,
 	0x10e60, 0x10e7e,
+	0x11000, 0x11000,
+	0x11002, 0x11037,
+	0x11047, 0x1104d,
+	0x11052, 0x1106f,
 	0x11082, 0x110b2,
 	0x110b7, 0x110b8,
 	0x110bb, 0x110bc,
@@ -11986,6 +12256,8 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x12400, 0x12462,
 	0x12470, 0x12473,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d000, 0x1d0f5,
 	0x1d100, 0x1d126,
 	0x1d129, 0x1d164,
@@ -12021,32 +12293,55 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x1d7ce, 0x1d7ff,
 	0x1f000, 0x1f02b,
 	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
 	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,
+	0x1f130, 0x1f169,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
 	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f5ff,
+	0x1f601, 0x1f610,
+	0x1f612, 0x1f614,
+	0x1f616, 0x1f616,
+	0x1f618, 0x1f618,
+	0x1f61a, 0x1f61a,
+	0x1f61c, 0x1f61e,
+	0x1f620, 0x1f625,
+	0x1f628, 0x1f62b,
+	0x1f62d, 0x1f62d,
+	0x1f630, 0x1f633,
+	0x1f635, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_Grapheme_Base */
 
 /* 'Grapheme_Link': Derived Property */
 static const OnigCodePoint CR_Grapheme_Link[] = {
-	26,
+	29,
 	0x094d, 0x094d,
 	0x09cd, 0x09cd,
 	0x0a4d, 0x0a4d,
@@ -12066,18 +12361,21 @@ static const OnigCodePoint CR_Grapheme_Link[] = {
 	0x1a60, 0x1a60,
 	0x1b44, 0x1b44,
 	0x1baa, 0x1baa,
+	0x1bf2, 0x1bf3,
+	0x2d7f, 0x2d7f,
 	0xa806, 0xa806,
 	0xa8c4, 0xa8c4,
 	0xa953, 0xa953,
 	0xa9c0, 0xa9c0,
 	0xabed, 0xabed,
 	0x10a3f, 0x10a3f,
+	0x11046, 0x11046,
 	0x110b9, 0x110b9,
 }; /* CR_Grapheme_Link */
 
 /* 'Common': Script */
 static const OnigCodePoint CR_Common[] = {
-	159,
+	169,
 	0x0000, 0x0040,
 	0x005b, 0x0060,
 	0x007b, 0x00a9,
@@ -12086,13 +12384,13 @@ static const OnigCodePoint CR_Common[] = {
 	0x00d7, 0x00d7,
 	0x00f7, 0x00f7,
 	0x02b9, 0x02df,
-	0x02e5, 0x02ff,
+	0x02e5, 0x02e9,
+	0x02ec, 0x02ff,
 	0x0374, 0x0374,
 	0x037e, 0x037e,
 	0x0385, 0x0385,
 	0x0387, 0x0387,
 	0x0589, 0x0589,
-	0x0600, 0x0603,
 	0x060c, 0x060c,
 	0x061b, 0x061b,
 	0x061f, 0x061f,
@@ -12101,7 +12399,6 @@ static const OnigCodePoint CR_Common[] = {
 	0x06dd, 0x06dd,
 	0x0964, 0x0965,
 	0x0970, 0x0970,
-	0x0cf1, 0x0cf2,
 	0x0e3f, 0x0e3f,
 	0x0fd5, 0x0fd8,
 	0x10fb, 0x10fb,
@@ -12118,33 +12415,20 @@ static const OnigCodePoint CR_Common[] = {
 	0x206a, 0x2070,
 	0x2074, 0x207e,
 	0x2080, 0x208e,
-	0x20a0, 0x20b8,
+	0x20a0, 0x20b9,
 	0x2100, 0x2125,
 	0x2127, 0x2129,
 	0x212c, 0x2131,
 	0x2133, 0x214d,
 	0x214f, 0x215f,
 	0x2189, 0x2189,
-	0x2190, 0x23e8,
+	0x2190, 0x23f3,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
-	0x2460, 0x26cd,
-	0x26cf, 0x26e1,
-	0x26e3, 0x26e3,
-	0x26e8, 0x26ff,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
+	0x2460, 0x26ff,
+	0x2701, 0x27ca,
 	0x27cc, 0x27cc,
-	0x27d0, 0x27ff,
+	0x27ce, 0x27ff,
 	0x2900, 0x2b4c,
 	0x2b50, 0x2b59,
 	0x2e00, 0x2e31,
@@ -12218,30 +12502,54 @@ static const OnigCodePoint CR_Common[] = {
 	0x1d7ce, 0x1d7ff,
 	0x1f000, 0x1f02b,
 	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
 	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,
+	0x1f130, 0x1f169,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f1ff,
+	0x1f201, 0x1f202,
+	0x1f210, 0x1f23a,
 	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f5ff,
+	0x1f601, 0x1f610,
+	0x1f612, 0x1f614,
+	0x1f616, 0x1f616,
+	0x1f618, 0x1f618,
+	0x1f61a, 0x1f61a,
+	0x1f61c, 0x1f61e,
+	0x1f620, 0x1f625,
+	0x1f628, 0x1f62b,
+	0x1f62d, 0x1f62d,
+	0x1f630, 0x1f633,
+	0x1f635, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
 	0xe0001, 0xe0001,
 	0xe0020, 0xe007f,
 }; /* CR_Common */
 
 /* 'Latin': Script */
 static const OnigCodePoint CR_Latin[] = {
-	28,
+	30,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -12258,15 +12566,17 @@ static const OnigCodePoint CR_Latin[] = {
 	0x1e00, 0x1eff,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x212a, 0x212b,
 	0x2132, 0x2132,
 	0x214e, 0x214e,
 	0x2160, 0x2188,
 	0x2c60, 0x2c7f,
 	0xa722, 0xa787,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa7ff,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa7ff,
 	0xfb00, 0xfb06,
 	0xff21, 0xff3a,
 	0xff41, 0xff5a,
@@ -12312,14 +12622,13 @@ static const OnigCodePoint CR_Greek[] = {
 
 /* 'Cyrillic': Script */
 static const OnigCodePoint CR_Cyrillic[] = {
-	8,
+	7,
 	0x0400, 0x0484,
-	0x0487, 0x0525,
+	0x0487, 0x0527,
 	0x1d2b, 0x1d2b,
 	0x1d78, 0x1d78,
 	0x2de0, 0x2dff,
-	0xa640, 0xa65f,
-	0xa662, 0xa673,
+	0xa640, 0xa673,
 	0xa67c, 0xa697,
 }; /* CR_Cyrillic */
 
@@ -12349,18 +12658,19 @@ static const OnigCodePoint CR_Hebrew[] = {
 
 /* 'Arabic': Script */
 static const OnigCodePoint CR_Arabic[] = {
-	18,
+	19,
+	0x0600, 0x0603,
 	0x0606, 0x060b,
 	0x060d, 0x061a,
 	0x061e, 0x061e,
-	0x0621, 0x063f,
+	0x0620, 0x063f,
 	0x0641, 0x064a,
 	0x0656, 0x065e,
 	0x066a, 0x066f,
 	0x0671, 0x06dc,
 	0x06de, 0x06ff,
 	0x0750, 0x077f,
-	0xfb50, 0xfbb1,
+	0xfb50, 0xfbc1,
 	0xfbd3, 0xfd3d,
 	0xfd50, 0xfd8f,
 	0xfd92, 0xfdc7,
@@ -12386,14 +12696,11 @@ static const OnigCodePoint CR_Thaana[] = {
 
 /* 'Devanagari': Script */
 static const OnigCodePoint CR_Devanagari[] = {
-	9,
-	0x0900, 0x0939,
-	0x093c, 0x094e,
-	0x0950, 0x0950,
-	0x0953, 0x0955,
-	0x0958, 0x0963,
+	6,
+	0x0900, 0x0950,
+	0x0953, 0x0963,
 	0x0966, 0x096f,
-	0x0971, 0x0972,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0xa8e0, 0xa8fb,
 }; /* CR_Devanagari */
@@ -12473,7 +12780,7 @@ static const OnigCodePoint CR_Oriya[] = {
 	0x0b56, 0x0b57,
 	0x0b5c, 0x0b5d,
 	0x0b5f, 0x0b63,
-	0x0b66, 0x0b71,
+	0x0b66, 0x0b77,
 }; /* CR_Oriya */
 
 /* 'Tamil': Script */
@@ -12518,7 +12825,7 @@ static const OnigCodePoint CR_Telugu[] = {
 
 /* 'Kannada': Script */
 static const OnigCodePoint CR_Kannada[] = {
-	13,
+	14,
 	0x0c82, 0x0c83,
 	0x0c85, 0x0c8c,
 	0x0c8e, 0x0c90,
@@ -12532,19 +12839,19 @@ static const OnigCodePoint CR_Kannada[] = {
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
 }; /* CR_Kannada */
 
 /* 'Malayalam': Script */
 static const OnigCodePoint CR_Malayalam[] = {
-	12,
+	11,
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
+	0x0d4a, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d66, 0x0d75,
@@ -12602,11 +12909,11 @@ static const OnigCodePoint CR_Tibetan[] = {
 	7,
 	0x0f00, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f71, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fbe, 0x0fcc,
 	0x0fce, 0x0fd4,
+	0x0fd9, 0x0fda,
 }; /* CR_Tibetan */
 
 /* 'Myanmar': Script */
@@ -12627,8 +12934,9 @@ static const OnigCodePoint CR_Georgian[] = {
 
 /* 'Hangul': Script */
 static const OnigCodePoint CR_Hangul[] = {
-	13,
+	14,
 	0x1100, 0x11ff,
+	0x302e, 0x302f,
 	0x3131, 0x318e,
 	0x3200, 0x321e,
 	0x3260, 0x327e,
@@ -12645,7 +12953,7 @@ static const OnigCodePoint CR_Hangul[] = {
 
 /* 'Ethiopic': Script */
 static const OnigCodePoint CR_Ethiopic[] = {
-	27,
+	32,
 	0x1200, 0x1248,
 	0x124a, 0x124d,
 	0x1250, 0x1256,
@@ -12662,7 +12970,7 @@ static const OnigCodePoint CR_Ethiopic[] = {
 	0x12d8, 0x1310,
 	0x1312, 0x1315,
 	0x1318, 0x135a,
-	0x135f, 0x137c,
+	0x135d, 0x137c,
 	0x1380, 0x1399,
 	0x2d80, 0x2d96,
 	0x2da0, 0x2da6,
@@ -12673,6 +12981,11 @@ static const OnigCodePoint CR_Ethiopic[] = {
 	0x2dc8, 0x2dce,
 	0x2dd0, 0x2dd6,
 	0x2dd8, 0x2dde,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 }; /* CR_Ethiopic */
 
 /* 'Cherokee': Script */
@@ -12723,15 +13036,16 @@ static const OnigCodePoint CR_Mongolian[] = {
 
 /* 'Hiragana': Script */
 static const OnigCodePoint CR_Hiragana[] = {
-	3,
+	4,
 	0x3041, 0x3096,
 	0x309d, 0x309f,
+	0x1b001, 0x1b001,
 	0x1f200, 0x1f200,
 }; /* CR_Hiragana */
 
 /* 'Katakana': Script */
 static const OnigCodePoint CR_Katakana[] = {
-	7,
+	8,
 	0x30a1, 0x30fa,
 	0x30fd, 0x30ff,
 	0x31f0, 0x31ff,
@@ -12739,18 +13053,20 @@ static const OnigCodePoint CR_Katakana[] = {
 	0x3300, 0x3357,
 	0xff66, 0xff6f,
 	0xff71, 0xff9d,
+	0x1b000, 0x1b000,
 }; /* CR_Katakana */
 
 /* 'Bopomofo': Script */
 static const OnigCodePoint CR_Bopomofo[] = {
-	2,
+	3,
+	0x02ea, 0x02eb,
 	0x3105, 0x312d,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 }; /* CR_Bopomofo */
 
 /* 'Han': Script */
 static const OnigCodePoint CR_Han[] = {
-	15,
+	16,
 	0x2e80, 0x2e99,
 	0x2e9b, 0x2ef3,
 	0x2f00, 0x2fd5,
@@ -12765,6 +13081,7 @@ static const OnigCodePoint CR_Han[] = {
 	0xfa70, 0xfad9,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_Han */
 
@@ -12796,10 +13113,11 @@ static const OnigCodePoint CR_Deseret[] = {
 
 /* 'Inherited': Script */
 static const OnigCodePoint CR_Inherited[] = {
-	23,
+	24,
 	0x0300, 0x036f,
 	0x0485, 0x0486,
 	0x064b, 0x0655,
+	0x065f, 0x065f,
 	0x0670, 0x0670,
 	0x0951, 0x0952,
 	0x1cd0, 0x1cd2,
@@ -12807,10 +13125,10 @@ static const OnigCodePoint CR_Inherited[] = {
 	0x1ce2, 0x1ce8,
 	0x1ced, 0x1ced,
 	0x1dc0, 0x1de6,
-	0x1dfd, 0x1dff,
+	0x1dfc, 0x1dff,
 	0x200c, 0x200d,
 	0x20d0, 0x20f0,
-	0x302a, 0x302f,
+	0x302a, 0x302d,
 	0x3099, 0x309a,
 	0xfe00, 0xfe0f,
 	0xfe20, 0xfe26,
@@ -12948,9 +13266,10 @@ static const OnigCodePoint CR_Glagolitic[] = {
 
 /* 'Tifinagh': Script */
 static const OnigCodePoint CR_Tifinagh[] = {
-	2,
+	3,
 	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d7f,
 }; /* CR_Tifinagh */
 
 /* 'Syloti_Nagri': Script */
@@ -13133,8 +13452,9 @@ static const OnigCodePoint CR_Lisu[] = {
 
 /* 'Bamum': Script */
 static const OnigCodePoint CR_Bamum[] = {
-	1,
+	2,
 	0xa6a0, 0xa6f7,
+	0x16800, 0x16a38,
 }; /* CR_Bamum */
 
 /* 'Javanese': Script */
@@ -13191,6 +13511,27 @@ static const OnigCodePoint CR_Kaithi[] = {
 	0x11080, 0x110c1,
 }; /* CR_Kaithi */
 
+/* 'Batak': Script */
+static const OnigCodePoint CR_Batak[] = {
+	2,
+	0x1bc0, 0x1bf3,
+	0x1bfc, 0x1bff,
+}; /* CR_Batak */
+
+/* 'Brahmi': Script */
+static const OnigCodePoint CR_Brahmi[] = {
+	2,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+}; /* CR_Brahmi */
+
+/* 'Mandaic': Script */
+static const OnigCodePoint CR_Mandaic[] = {
+	2,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+}; /* CR_Mandaic */
+
 /* 'White_Space': Binary Property */
 static const OnigCodePoint CR_White_Space[] = {
 	11,
@@ -13278,7 +13619,7 @@ static const OnigCodePoint CR_Quotation_Mark[] = {
 
 /* 'Terminal_Punctuation': Binary Property */
 static const OnigCodePoint CR_Terminal_Punctuation[] = {
-	65,
+	67,
 	0x0021, 0x0021,
 	0x002c, 0x002c,
 	0x002e, 0x002e,
@@ -13296,6 +13637,7 @@ static const OnigCodePoint CR_Terminal_Punctuation[] = {
 	0x070c, 0x070c,
 	0x07f8, 0x07f9,
 	0x0830, 0x083e,
+	0x085e, 0x085e,
 	0x0964, 0x0965,
 	0x0e5a, 0x0e5b,
 	0x0f08, 0x0f08,
@@ -13342,13 +13684,14 @@ static const OnigCodePoint CR_Terminal_Punctuation[] = {
 	0x10857, 0x10857,
 	0x1091f, 0x1091f,
 	0x10b3a, 0x10b3f,
+	0x11047, 0x1104d,
 	0x110be, 0x110c1,
 	0x12470, 0x12473,
 }; /* CR_Terminal_Punctuation */
 
 /* 'Other_Math': Binary Property */
 static const OnigCodePoint CR_Other_Math[] = {
-	99,
+	100,
 	0x005e, 0x005e,
 	0x03d0, 0x03d2,
 	0x03d5, 0x03d5,
@@ -13365,6 +13708,7 @@ static const OnigCodePoint CR_Other_Math[] = {
 	0x20e5, 0x20e6,
 	0x20eb, 0x20ef,
 	0x2102, 0x2102,
+	0x2107, 0x2107,
 	0x210a, 0x2113,
 	0x2115, 0x2115,
 	0x2119, 0x211d,
@@ -13471,7 +13815,7 @@ static const OnigCodePoint CR_ASCII_Hex_Digit[] = {
 
 /* 'Other_Alphabetic': Binary Property */
 static const OnigCodePoint CR_Other_Alphabetic[] = {
-	141,
+	145,
 	0x0345, 0x0345,
 	0x05b0, 0x05bd,
 	0x05bf, 0x05bf,
@@ -13480,7 +13824,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0x05c7, 0x05c7,
 	0x0610, 0x061a,
 	0x064b, 0x0657,
-	0x0659, 0x065e,
+	0x0659, 0x065f,
 	0x0670, 0x0670,
 	0x06d6, 0x06dc,
 	0x06e1, 0x06e4,
@@ -13494,9 +13838,10 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0x0825, 0x0827,
 	0x0829, 0x082c,
 	0x0900, 0x0903,
+	0x093a, 0x093b,
 	0x093e, 0x094c,
-	0x094e, 0x094e,
-	0x0955, 0x0955,
+	0x094e, 0x094f,
+	0x0955, 0x0957,
 	0x0962, 0x0963,
 	0x0981, 0x0983,
 	0x09be, 0x09c4,
@@ -13558,7 +13903,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0x0ebb, 0x0ebc,
 	0x0ecd, 0x0ecd,
 	0x0f71, 0x0f81,
-	0x0f90, 0x0f97,
+	0x0f8d, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x102b, 0x1036,
 	0x1038, 0x1038,
@@ -13588,6 +13933,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0x1b35, 0x1b43,
 	0x1b80, 0x1b82,
 	0x1ba1, 0x1ba9,
+	0x1be7, 0x1bf1,
 	0x1c24, 0x1c35,
 	0x1cf2, 0x1cf2,
 	0x24b6, 0x24e9,
@@ -13598,7 +13944,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0xa926, 0xa92a,
 	0xa947, 0xa952,
 	0xa980, 0xa983,
-	0xa9b3, 0xa9bf,
+	0xa9b4, 0xa9bf,
 	0xaa29, 0xaa36,
 	0xaa43, 0xaa43,
 	0xaa4c, 0xaa4d,
@@ -13611,13 +13957,15 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0x10a01, 0x10a03,
 	0x10a05, 0x10a06,
 	0x10a0c, 0x10a0f,
+	0x11000, 0x11002,
+	0x11038, 0x11045,
 	0x11082, 0x11082,
 	0x110b0, 0x110b8,
 }; /* CR_Other_Alphabetic */
 
 /* 'Ideographic': Binary Property */
 static const OnigCodePoint CR_Ideographic[] = {
-	11,
+	12,
 	0x3006, 0x3007,
 	0x3021, 0x3029,
 	0x3038, 0x303a,
@@ -13628,6 +13976,7 @@ static const OnigCodePoint CR_Ideographic[] = {
 	0xfa70, 0xfad9,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_Ideographic */
 
@@ -13870,7 +14219,7 @@ static const OnigCodePoint CR_Radical[] = {
 
 /* 'Unified_Ideograph': Binary Property */
 static const OnigCodePoint CR_Unified_Ideograph[] = {
-	11,
+	12,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
 	0xfa0e, 0xfa0f,
@@ -13882,6 +14231,7 @@ static const OnigCodePoint CR_Unified_Ideograph[] = {
 	0xfa27, 0xfa29,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 }; /* CR_Unified_Ideograph */
 
 /* 'Other_Default_Ignorable_Code_Point': Binary Property */
@@ -13901,8 +14251,9 @@ static const OnigCodePoint CR_Other_Default_Ignorable_Code_Point[] = {
 
 /* 'Deprecated': Binary Property */
 static const OnigCodePoint CR_Deprecated[] = {
-	8,
+	9,
 	0x0149, 0x0149,
+	0x0673, 0x0673,
 	0x0f77, 0x0f77,
 	0x0f79, 0x0f79,
 	0x17a3, 0x17a4,
@@ -13968,15 +14319,16 @@ static const OnigCodePoint CR_Other_ID_Start[] = {
 
 /* 'Other_ID_Continue': Binary Property */
 static const OnigCodePoint CR_Other_ID_Continue[] = {
-	3,
+	4,
 	0x00b7, 0x00b7,
 	0x0387, 0x0387,
 	0x1369, 0x1371,
+	0x19da, 0x19da,
 }; /* CR_Other_ID_Continue */
 
 /* 'STerm': Binary Property */
 static const OnigCodePoint CR_STerm[] = {
-	43,
+	47,
 	0x0021, 0x0021,
 	0x002e, 0x002e,
 	0x003f, 0x003f,
@@ -13992,9 +14344,11 @@ static const OnigCodePoint CR_STerm[] = {
 	0x1362, 0x1362,
 	0x1367, 0x1368,
 	0x166e, 0x166e,
+	0x1735, 0x1736,
 	0x1803, 0x1803,
 	0x1809, 0x1809,
 	0x1944, 0x1945,
+	0x1aa8, 0x1aab,
 	0x1b5a, 0x1b5b,
 	0x1b5e, 0x1b5f,
 	0x1c3b, 0x1c3c,
@@ -14019,6 +14373,8 @@ static const OnigCodePoint CR_STerm[] = {
 	0xff0e, 0xff0e,
 	0xff1f, 0xff1f,
 	0xff61, 0xff61,
+	0x10a56, 0x10a57,
+	0x11047, 0x11048,
 	0x110be, 0x110c1,
 }; /* CR_STerm */
 
@@ -14105,14 +14461,14 @@ static const OnigCodePoint CR_Blank[] = {
 
 /* 'Graph': [[:Graph:]] */
 static const OnigCodePoint CR_Graph[] = {
-	490,
+	506,
 	0x0021, 0x007e,
 	0x00a1, 0x0377,
 	0x037a, 0x037e,
 	0x0384, 0x038a,
 	0x038c, 0x038c,
 	0x038e, 0x03a1,
-	0x03a3, 0x0525,
+	0x03a3, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x055f,
 	0x0561, 0x0587,
@@ -14122,18 +14478,15 @@ static const OnigCodePoint CR_Graph[] = {
 	0x05f0, 0x05f4,
 	0x0600, 0x0603,
 	0x0606, 0x061b,
-	0x061e, 0x061f,
-	0x0621, 0x065e,
-	0x0660, 0x070d,
+	0x061e, 0x070d,
 	0x070f, 0x074a,
 	0x074d, 0x07b1,
 	0x07c0, 0x07fa,
 	0x0800, 0x082d,
 	0x0830, 0x083e,
-	0x0900, 0x0939,
-	0x093c, 0x094e,
-	0x0950, 0x0955,
-	0x0958, 0x0972,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x0900, 0x0977,
 	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
@@ -14192,7 +14545,7 @@ static const OnigCodePoint CR_Graph[] = {
 	0x0b56, 0x0b57,
 	0x0b5c, 0x0b5d,
 	0x0b5f, 0x0b63,
-	0x0b66, 0x0b71,
+	0x0b66, 0x0b77,
 	0x0b82, 0x0b83,
 	0x0b85, 0x0b8a,
 	0x0b8e, 0x0b90,
@@ -14240,11 +14593,10 @@ static const OnigCodePoint CR_Graph[] = {
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
+	0x0d4a, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d66, 0x0d75,
@@ -14282,11 +14634,10 @@ static const OnigCodePoint CR_Graph[] = {
 	0x0edc, 0x0edd,
 	0x0f00, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f71, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fd8,
+	0x0fce, 0x0fda,
 	0x1000, 0x10c5,
 	0x10d0, 0x10fc,
 	0x1100, 0x1248,
@@ -14305,7 +14656,7 @@ static const OnigCodePoint CR_Graph[] = {
 	0x12d8, 0x1310,
 	0x1312, 0x1315,
 	0x1318, 0x135a,
-	0x135f, 0x137c,
+	0x135d, 0x137c,
 	0x1380, 0x1399,
 	0x13a0, 0x13f4,
 	0x1400, 0x167f,
@@ -14345,12 +14696,13 @@ static const OnigCodePoint CR_Graph[] = {
 	0x1b50, 0x1b7c,
 	0x1b80, 0x1baa,
 	0x1bae, 0x1bb9,
-	0x1c00, 0x1c37,
+	0x1bc0, 0x1bf3,
+	0x1bfc, 0x1c37,
 	0x1c3b, 0x1c49,
 	0x1c4d, 0x1c7f,
 	0x1cd0, 0x1cf2,
 	0x1d00, 0x1de6,
-	0x1dfd, 0x1f15,
+	0x1dfc, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
 	0x1f48, 0x1f4d,
@@ -14372,38 +14724,25 @@ static const OnigCodePoint CR_Graph[] = {
 	0x2060, 0x2064,
 	0x206a, 0x2071,
 	0x2074, 0x208e,
-	0x2090, 0x2094,
-	0x20a0, 0x20b8,
+	0x2090, 0x209c,
+	0x20a0, 0x20b9,
 	0x20d0, 0x20f0,
 	0x2100, 0x2189,
-	0x2190, 0x23e8,
+	0x2190, 0x23f3,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
-	0x2460, 0x26cd,
-	0x26cf, 0x26e1,
-	0x26e3, 0x26e3,
-	0x26e8, 0x26ff,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
+	0x2460, 0x26ff,
+	0x2701, 0x27ca,
 	0x27cc, 0x27cc,
-	0x27d0, 0x2b4c,
+	0x27ce, 0x2b4c,
 	0x2b50, 0x2b59,
 	0x2c00, 0x2c2e,
 	0x2c30, 0x2c5e,
 	0x2c60, 0x2cf1,
 	0x2cf9, 0x2d25,
 	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
 	0x2da0, 0x2da6,
 	0x2da8, 0x2dae,
 	0x2db0, 0x2db6,
@@ -14422,7 +14761,7 @@ static const OnigCodePoint CR_Graph[] = {
 	0x3099, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x3190, 0x31b7,
+	0x3190, 0x31ba,
 	0x31c0, 0x31e3,
 	0x31f0, 0x321e,
 	0x3220, 0x32fe,
@@ -14431,12 +14770,13 @@ static const OnigCodePoint CR_Graph[] = {
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
 	0xa4d0, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa673,
+	0xa640, 0xa673,
 	0xa67c, 0xa697,
 	0xa6a0, 0xa6f7,
-	0xa700, 0xa78c,
-	0xa7fb, 0xa82b,
+	0xa700, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa82b,
 	0xa830, 0xa839,
 	0xa840, 0xa877,
 	0xa880, 0xa8c4,
@@ -14453,6 +14793,11 @@ static const OnigCodePoint CR_Graph[] = {
 	0xaa5c, 0xaa7b,
 	0xaa80, 0xaac2,
 	0xaadb, 0xaadf,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabed,
 	0xabf0, 0xabf9,
 	0xac00, 0xd7a3,
@@ -14468,7 +14813,7 @@ static const OnigCodePoint CR_Graph[] = {
 	0xfb3e, 0xfb3e,
 	0xfb40, 0xfb41,
 	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
+	0xfb46, 0xfbc1,
 	0xfbd3, 0xfd3f,
 	0xfd50, 0xfd8f,
 	0xfd92, 0xfdc7,
@@ -14536,11 +14881,15 @@ static const OnigCodePoint CR_Graph[] = {
 	0x10b78, 0x10b7f,
 	0x10c00, 0x10c48,
 	0x10e60, 0x10e7e,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
 	0x11080, 0x110c1,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x12470, 0x12473,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d000, 0x1d0f5,
 	0x1d100, 0x1d126,
 	0x1d129, 0x1d1dd,
@@ -14570,26 +14919,49 @@ static const OnigCodePoint CR_Graph[] = {
 	0x1d7ce, 0x1d7ff,
 	0x1f000, 0x1f02b,
 	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
 	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,
+	0x1f130, 0x1f169,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
 	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f5ff,
+	0x1f601, 0x1f610,
+	0x1f612, 0x1f614,
+	0x1f616, 0x1f616,
+	0x1f618, 0x1f618,
+	0x1f61a, 0x1f61a,
+	0x1f61c, 0x1f61e,
+	0x1f620, 0x1f625,
+	0x1f628, 0x1f62b,
+	0x1f62d, 0x1f62d,
+	0x1f630, 0x1f633,
+	0x1f635, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 	0xe0001, 0xe0001,
 	0xe0020, 0xe007f,
@@ -14603,14 +14975,14 @@ static const OnigCodePoint CR_Graph[] = {
 
 /* 'Print': [[:Print:]] */
 static const OnigCodePoint CR_Print[] = {
-	487,
+	503,
 	0x0020, 0x007e,
 	0x00a0, 0x0377,
 	0x037a, 0x037e,
 	0x0384, 0x038a,
 	0x038c, 0x038c,
 	0x038e, 0x03a1,
-	0x03a3, 0x0525,
+	0x03a3, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x055f,
 	0x0561, 0x0587,
@@ -14620,18 +14992,15 @@ static const OnigCodePoint CR_Print[] = {
 	0x05f0, 0x05f4,
 	0x0600, 0x0603,
 	0x0606, 0x061b,
-	0x061e, 0x061f,
-	0x0621, 0x065e,
-	0x0660, 0x070d,
+	0x061e, 0x070d,
 	0x070f, 0x074a,
 	0x074d, 0x07b1,
 	0x07c0, 0x07fa,
 	0x0800, 0x082d,
 	0x0830, 0x083e,
-	0x0900, 0x0939,
-	0x093c, 0x094e,
-	0x0950, 0x0955,
-	0x0958, 0x0972,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x0900, 0x0977,
 	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
@@ -14690,7 +15059,7 @@ static const OnigCodePoint CR_Print[] = {
 	0x0b56, 0x0b57,
 	0x0b5c, 0x0b5d,
 	0x0b5f, 0x0b63,
-	0x0b66, 0x0b71,
+	0x0b66, 0x0b77,
 	0x0b82, 0x0b83,
 	0x0b85, 0x0b8a,
 	0x0b8e, 0x0b90,
@@ -14738,11 +15107,10 @@ static const OnigCodePoint CR_Print[] = {
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
+	0x0d4a, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d66, 0x0d75,
@@ -14780,11 +15148,10 @@ static const OnigCodePoint CR_Print[] = {
 	0x0edc, 0x0edd,
 	0x0f00, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f71, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fd8,
+	0x0fce, 0x0fda,
 	0x1000, 0x10c5,
 	0x10d0, 0x10fc,
 	0x1100, 0x1248,
@@ -14803,7 +15170,7 @@ static const OnigCodePoint CR_Print[] = {
 	0x12d8, 0x1310,
 	0x1312, 0x1315,
 	0x1318, 0x135a,
-	0x135f, 0x137c,
+	0x135d, 0x137c,
 	0x1380, 0x1399,
 	0x13a0, 0x13f4,
 	0x1400, 0x169c,
@@ -14842,12 +15209,13 @@ static const OnigCodePoint CR_Print[] = {
 	0x1b50, 0x1b7c,
 	0x1b80, 0x1baa,
 	0x1bae, 0x1bb9,
-	0x1c00, 0x1c37,
+	0x1bc0, 0x1bf3,
+	0x1bfc, 0x1c37,
 	0x1c3b, 0x1c49,
 	0x1c4d, 0x1c7f,
 	0x1cd0, 0x1cf2,
 	0x1d00, 0x1de6,
-	0x1dfd, 0x1f15,
+	0x1dfc, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
 	0x1f48, 0x1f4d,
@@ -14867,38 +15235,25 @@ static const OnigCodePoint CR_Print[] = {
 	0x202a, 0x2064,
 	0x206a, 0x2071,
 	0x2074, 0x208e,
-	0x2090, 0x2094,
-	0x20a0, 0x20b8,
+	0x2090, 0x209c,
+	0x20a0, 0x20b9,
 	0x20d0, 0x20f0,
 	0x2100, 0x2189,
-	0x2190, 0x23e8,
+	0x2190, 0x23f3,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
-	0x2460, 0x26cd,
-	0x26cf, 0x26e1,
-	0x26e3, 0x26e3,
-	0x26e8, 0x26ff,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
+	0x2460, 0x26ff,
+	0x2701, 0x27ca,
 	0x27cc, 0x27cc,
-	0x27d0, 0x2b4c,
+	0x27ce, 0x2b4c,
 	0x2b50, 0x2b59,
 	0x2c00, 0x2c2e,
 	0x2c30, 0x2c5e,
 	0x2c60, 0x2cf1,
 	0x2cf9, 0x2d25,
 	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
 	0x2da0, 0x2da6,
 	0x2da8, 0x2dae,
 	0x2db0, 0x2db6,
@@ -14917,7 +15272,7 @@ static const OnigCodePoint CR_Print[] = {
 	0x3099, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x3190, 0x31b7,
+	0x3190, 0x31ba,
 	0x31c0, 0x31e3,
 	0x31f0, 0x321e,
 	0x3220, 0x32fe,
@@ -14926,12 +15281,13 @@ static const OnigCodePoint CR_Print[] = {
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
 	0xa4d0, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa673,
+	0xa640, 0xa673,
 	0xa67c, 0xa697,
 	0xa6a0, 0xa6f7,
-	0xa700, 0xa78c,
-	0xa7fb, 0xa82b,
+	0xa700, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa82b,
 	0xa830, 0xa839,
 	0xa840, 0xa877,
 	0xa880, 0xa8c4,
@@ -14948,6 +15304,11 @@ static const OnigCodePoint CR_Print[] = {
 	0xaa5c, 0xaa7b,
 	0xaa80, 0xaac2,
 	0xaadb, 0xaadf,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabed,
 	0xabf0, 0xabf9,
 	0xac00, 0xd7a3,
@@ -14963,7 +15324,7 @@ static const OnigCodePoint CR_Print[] = {
 	0xfb3e, 0xfb3e,
 	0xfb40, 0xfb41,
 	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
+	0xfb46, 0xfbc1,
 	0xfbd3, 0xfd3f,
 	0xfd50, 0xfd8f,
 	0xfd92, 0xfdc7,
@@ -15031,11 +15392,15 @@ static const OnigCodePoint CR_Print[] = {
 	0x10b78, 0x10b7f,
 	0x10c00, 0x10c48,
 	0x10e60, 0x10e7e,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
 	0x11080, 0x110c1,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x12470, 0x12473,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d000, 0x1d0f5,
 	0x1d100, 0x1d126,
 	0x1d129, 0x1d1dd,
@@ -15065,26 +15430,49 @@ static const OnigCodePoint CR_Print[] = {
 	0x1d7ce, 0x1d7ff,
 	0x1f000, 0x1f02b,
 	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
 	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,
+	0x1f130, 0x1f169,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
 	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f5ff,
+	0x1f601, 0x1f610,
+	0x1f612, 0x1f614,
+	0x1f616, 0x1f616,
+	0x1f618, 0x1f618,
+	0x1f61a, 0x1f61a,
+	0x1f61c, 0x1f61e,
+	0x1f620, 0x1f625,
+	0x1f628, 0x1f62b,
+	0x1f62d, 0x1f62d,
+	0x1f630, 0x1f633,
+	0x1f635, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 	0xe0001, 0xe0001,
 	0xe0020, 0xe007f,
@@ -15107,7 +15495,7 @@ static const OnigCodePoint CR_Print[] = {
 
 /* 'Word': [[:Word:]] */
 static const OnigCodePoint CR_Word[] = {
-	506,
+	514,
 	0x0030, 0x0039,
 	0x0041, 0x005a,
 	0x005f, 0x005f,
@@ -15131,7 +15519,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x038e, 0x03a1,
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
-	0x0483, 0x0525,
+	0x0483, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x0559,
 	0x0561, 0x0587,
@@ -15143,11 +15531,10 @@ static const OnigCodePoint CR_Word[] = {
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
 	0x0610, 0x061a,
-	0x0621, 0x065e,
-	0x0660, 0x0669,
+	0x0620, 0x0669,
 	0x066e, 0x06d3,
 	0x06d5, 0x06dc,
-	0x06de, 0x06e8,
+	0x06df, 0x06e8,
 	0x06ea, 0x06fc,
 	0x06ff, 0x06ff,
 	0x0710, 0x074a,
@@ -15155,12 +15542,10 @@ static const OnigCodePoint CR_Word[] = {
 	0x07c0, 0x07f5,
 	0x07fa, 0x07fa,
 	0x0800, 0x082d,
-	0x0900, 0x0939,
-	0x093c, 0x094e,
-	0x0950, 0x0955,
-	0x0958, 0x0963,
+	0x0840, 0x085b,
+	0x0900, 0x0963,
 	0x0966, 0x096f,
-	0x0971, 0x0972,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
@@ -15262,14 +15647,14 @@ static const OnigCodePoint CR_Word[] = {
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
+	0x0d4a, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d66, 0x0d6f,
@@ -15315,8 +15700,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x0f3e, 0x0f47,
 	0x0f49, 0x0f6c,
 	0x0f71, 0x0f84,
-	0x0f86, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f86, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fc6, 0x0fc6,
 	0x1000, 0x1049,
@@ -15340,7 +15724,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x12d8, 0x1310,
 	0x1312, 0x1315,
 	0x1318, 0x135a,
-	0x135f, 0x135f,
+	0x135d, 0x135f,
 	0x1380, 0x138f,
 	0x13a0, 0x13f4,
 	0x1401, 0x166c,
@@ -15372,7 +15756,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x1970, 0x1974,
 	0x1980, 0x19ab,
 	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
+	0x19d0, 0x19d9,
 	0x1a00, 0x1a1b,
 	0x1a20, 0x1a5e,
 	0x1a60, 0x1a7c,
@@ -15384,13 +15768,14 @@ static const OnigCodePoint CR_Word[] = {
 	0x1b6b, 0x1b73,
 	0x1b80, 0x1baa,
 	0x1bae, 0x1bb9,
+	0x1bc0, 0x1bf3,
 	0x1c00, 0x1c37,
 	0x1c40, 0x1c49,
 	0x1c4d, 0x1c7d,
 	0x1cd0, 0x1cd2,
 	0x1cd4, 0x1cf2,
 	0x1d00, 0x1de6,
-	0x1dfd, 0x1f15,
+	0x1dfc, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
 	0x1f48, 0x1f4d,
@@ -15413,7 +15798,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x2054, 0x2054,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x20d0, 0x20f0,
 	0x2102, 0x2102,
 	0x2107, 0x2107,
@@ -15437,7 +15822,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x2d00, 0x2d25,
 	0x2d30, 0x2d65,
 	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
+	0x2d7f, 0x2d96,
 	0x2da0, 0x2da6,
 	0x2da8, 0x2dae,
 	0x2db0, 0x2db6,
@@ -15459,7 +15844,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x30fc, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -15467,15 +15852,16 @@ static const OnigCodePoint CR_Word[] = {
 	0xa4d0, 0xa4fd,
 	0xa500, 0xa60c,
 	0xa610, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa672,
+	0xa640, 0xa672,
 	0xa67c, 0xa67d,
 	0xa67f, 0xa697,
 	0xa6a0, 0xa6f1,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa827,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa827,
 	0xa840, 0xa873,
 	0xa880, 0xa8c4,
 	0xa8d0, 0xa8d9,
@@ -15493,6 +15879,11 @@ static const OnigCodePoint CR_Word[] = {
 	0xaa7a, 0xaa7b,
 	0xaa80, 0xaac2,
 	0xaadb, 0xaadd,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabea,
 	0xabec, 0xabed,
 	0xabf0, 0xabf9,
@@ -15569,10 +15960,14 @@ static const OnigCodePoint CR_Word[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11000, 0x11046,
+	0x11066, 0x1106f,
 	0x11080, 0x110ba,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d165, 0x1d169,
 	0x1d16d, 0x1d172,
 	0x1d17b, 0x1d182,
@@ -15612,13 +16007,14 @@ static const OnigCodePoint CR_Word[] = {
 	0x1d7ce, 0x1d7ff,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 	0xe0100, 0xe01ef,
 }; /* CR_Word */
 
 /* 'Alnum': [[:Alnum:]] */
 static const OnigCodePoint CR_Alnum[] = {
-	497,
+	509,
 	0x0030, 0x0039,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
@@ -15642,7 +16038,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x038e, 0x03a1,
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x0559,
 	0x0561, 0x0587,
@@ -15654,9 +16050,8 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
 	0x0610, 0x061a,
-	0x0621, 0x0657,
-	0x0659, 0x065e,
-	0x0660, 0x0669,
+	0x0620, 0x0657,
+	0x0659, 0x0669,
 	0x066e, 0x06d3,
 	0x06d5, 0x06dc,
 	0x06e1, 0x06e8,
@@ -15669,14 +16064,13 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x07fa, 0x07fa,
 	0x0800, 0x0817,
 	0x081a, 0x082c,
-	0x0900, 0x0939,
+	0x0840, 0x0858,
+	0x0900, 0x093b,
 	0x093d, 0x094c,
-	0x094e, 0x094e,
-	0x0950, 0x0950,
-	0x0955, 0x0955,
-	0x0958, 0x0963,
+	0x094e, 0x0950,
+	0x0955, 0x0963,
 	0x0966, 0x096f,
-	0x0971, 0x0972,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
@@ -15778,14 +16172,15 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
 	0x0d4a, 0x0d4c,
+	0x0d4e, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d66, 0x0d6f,
@@ -15827,8 +16222,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x0f40, 0x0f47,
 	0x0f49, 0x0f6c,
 	0x0f71, 0x0f81,
-	0x0f88, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f88, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x1000, 0x1036,
 	0x1038, 0x1038,
@@ -15889,7 +16283,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x1970, 0x1974,
 	0x1980, 0x19ab,
 	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
+	0x19d0, 0x19d9,
 	0x1a00, 0x1a1b,
 	0x1a20, 0x1a5e,
 	0x1a61, 0x1a74,
@@ -15902,6 +16296,8 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x1b50, 0x1b59,
 	0x1b80, 0x1ba9,
 	0x1bae, 0x1bb9,
+	0x1bc0, 0x1be5,
+	0x1be7, 0x1bf1,
 	0x1c00, 0x1c35,
 	0x1c40, 0x1c49,
 	0x1c4d, 0x1c7d,
@@ -15929,7 +16325,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x1ff6, 0x1ffc,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x2102, 0x2102,
 	0x2107, 0x2107,
 	0x210a, 0x2113,
@@ -15973,7 +16369,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x30fc, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -15981,14 +16377,15 @@ static const OnigCodePoint CR_Alnum[] = {
 	0xa4d0, 0xa4fd,
 	0xa500, 0xa60c,
 	0xa610, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa66e,
+	0xa640, 0xa66e,
 	0xa67f, 0xa697,
 	0xa6a0, 0xa6ef,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa801,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa801,
 	0xa803, 0xa805,
 	0xa807, 0xa80a,
 	0xa80c, 0xa827,
@@ -16000,7 +16397,8 @@ static const OnigCodePoint CR_Alnum[] = {
 	0xa900, 0xa92a,
 	0xa930, 0xa952,
 	0xa960, 0xa97c,
-	0xa980, 0xa9bf,
+	0xa980, 0xa9b2,
+	0xa9b4, 0xa9bf,
 	0xa9cf, 0xa9d9,
 	0xaa00, 0xaa36,
 	0xaa40, 0xaa4d,
@@ -16011,6 +16409,11 @@ static const OnigCodePoint CR_Alnum[] = {
 	0xaac0, 0xaac0,
 	0xaac2, 0xaac2,
 	0xaadb, 0xaadd,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabea,
 	0xabf0, 0xabf9,
 	0xac00, 0xd7a3,
@@ -16078,10 +16481,14 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11000, 0x11045,
+	0x11066, 0x1106f,
 	0x11082, 0x110b8,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d400, 0x1d454,
 	0x1d456, 0x1d49c,
 	0x1d49e, 0x1d49f,
@@ -16115,6 +16522,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x1d7ce, 0x1d7ff,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_Alnum */
 
@@ -16291,6 +16699,9 @@ static const OnigCodePoint* const CodeRanges[] = {
   CR_Inscriptional_Pahlavi,
   CR_Old_Turkic,
   CR_Kaithi,
+  CR_Batak,
+  CR_Brahmi,
+  CR_Mandaic,
   CR_White_Space,
   CR_Bidi_Control,
   CR_Join_Control,
@@ -16499,78 +16910,81 @@ inscriptionalparthian,                   161
 inscriptionalpahlavi,                    162
 oldturkic,                               163
 kaithi,                                  164
-whitespace,                              165
-bidicontrol,                             166
-joincontrol,                             167
-dash,                                    168
-hyphen,                                  169
-quotationmark,                           170
-terminalpunctuation,                     171
-othermath,                               172
-hexdigit,                                173
-asciihexdigit,                           174
-otheralphabetic,                         175
-ideographic,                             176
-diacritic,                               177
-extender,                                178
-otherlowercase,                          179
-otheruppercase,                          180
-noncharactercodepoint,                   181
-othergraphemeextend,                     182
-idsbinaryoperator,                       183
-idstrinaryoperator,                      184
-radical,                                 185
-unifiedideograph,                        186
-otherdefaultignorablecodepoint,          187
-deprecated,                              188
-softdotted,                              189
-logicalorderexception,                   190
-otheridstart,                            191
-otheridcontinue,                         192
-sterm,                                   193
-variationselector,                       194
-patternwhitespace,                       195
-patternsyntax,                           196
-ahex,                                    174
-bidic,                                   166
+batak,                                   165
+brahmi,                                  166
+mandaic,                                 167
+whitespace,                              168
+bidicontrol,                             169
+joincontrol,                             170
+dash,                                    171
+hyphen,                                  172
+quotationmark,                           173
+terminalpunctuation,                     174
+othermath,                               175
+hexdigit,                                176
+asciihexdigit,                           177
+otheralphabetic,                         178
+ideographic,                             179
+diacritic,                               180
+extender,                                181
+otherlowercase,                          182
+otheruppercase,                          183
+noncharactercodepoint,                   184
+othergraphemeextend,                     185
+idsbinaryoperator,                       186
+idstrinaryoperator,                      187
+radical,                                 188
+unifiedideograph,                        189
+otherdefaultignorablecodepoint,          190
+deprecated,                              191
+softdotted,                              192
+logicalorderexception,                   193
+otheridstart,                            194
+otheridcontinue,                         195
+sterm,                                   196
+variationselector,                       197
+patternwhitespace,                       198
+patternsyntax,                           199
+ahex,                                    177
+bidic,                                   169
 ci,                                       59
 cwcf,                                     63
 cwcm,                                     64
 cwl,                                      60
 cwt,                                      62
 cwu,                                      61
-dep,                                     188
+dep,                                     191
 di,                                       69
-dia,                                     177
-ext,                                     178
+dia,                                     180
+ext,                                     181
 grbase,                                   71
 grext,                                    70
 grlink,                                   72
-hex,                                     173
+hex,                                     176
 idc,                                      66
-ideo,                                    176
+ideo,                                    179
 ids,                                      65
-idsb,                                    183
-idst,                                    184
-joinc,                                   167
-loe,                                     190
-nchar,                                   181
-oalpha,                                  175
-odi,                                     187
-ogrext,                                  182
-oidc,                                    192
-oids,                                    191
-olower,                                  179
-omath,                                   172
-oupper,                                  180
-patsyn,                                  196
-patws,                                   195
-qmark,                                   170
-sd,                                      189
-term,                                    171
-uideo,                                   186
-vs,                                      194
-wspace,                                  165
+idsb,                                    186
+idst,                                    187
+joinc,                                   170
+loe,                                     193
+nchar,                                   184
+oalpha,                                  178
+odi,                                     190
+ogrext,                                  185
+oidc,                                    195
+oids,                                    194
+olower,                                  182
+omath,                                   175
+oupper,                                  183
+patsyn,                                  199
+patws,                                   198
+qmark,                                   173
+sd,                                      192
+term,                                    174
+uideo,                                   189
+vs,                                      197
+wspace,                                  168
 xidc,                                     68
 xids,                                     67
 other,                                    17
@@ -16616,8 +17030,10 @@ armn,                                     77
 avst,                                    152
 bali,                                    134
 bamu,                                    156
+batk,                                    165
 beng,                                     83
 bopo,                                    107
+brah,                                    166
 brai,                                    125
 bugi,                                    126
 buhd,                                    116
@@ -16659,6 +17075,7 @@ limb,                                    118
 linb,                                    120
 lyci,                                    146
 lydi,                                    148
+mand,                                    167
 mlym,                                     90
 mong,                                    104
 mtei,                                    158
diff --git a/enc/unicode/name2ctype.src b/enc/unicode/name2ctype.src
index f434172..e9ffef8 100644
--- a/enc/unicode/name2ctype.src
+++ b/enc/unicode/name2ctype.src
@@ -10,13 +10,13 @@ static const OnigCodePoint CR_Any[] = {
 
 /* 'Assigned': - */
 static const OnigCodePoint CR_Assigned[] = {
-	485,
+	501,
 	0x0000, 0x0377,
 	0x037a, 0x037e,
 	0x0384, 0x038a,
 	0x038c, 0x038c,
 	0x038e, 0x03a1,
-	0x03a3, 0x0525,
+	0x03a3, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x055f,
 	0x0561, 0x0587,
@@ -26,18 +26,15 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x05f0, 0x05f4,
 	0x0600, 0x0603,
 	0x0606, 0x061b,
-	0x061e, 0x061f,
-	0x0621, 0x065e,
-	0x0660, 0x070d,
+	0x061e, 0x070d,
 	0x070f, 0x074a,
 	0x074d, 0x07b1,
 	0x07c0, 0x07fa,
 	0x0800, 0x082d,
 	0x0830, 0x083e,
-	0x0900, 0x0939,
-	0x093c, 0x094e,
-	0x0950, 0x0955,
-	0x0958, 0x0972,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x0900, 0x0977,
 	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
@@ -96,7 +93,7 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x0b56, 0x0b57,
 	0x0b5c, 0x0b5d,
 	0x0b5f, 0x0b63,
-	0x0b66, 0x0b71,
+	0x0b66, 0x0b77,
 	0x0b82, 0x0b83,
 	0x0b85, 0x0b8a,
 	0x0b8e, 0x0b90,
@@ -144,11 +141,10 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
+	0x0d4a, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d66, 0x0d75,
@@ -186,11 +182,10 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x0edc, 0x0edd,
 	0x0f00, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f71, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fd8,
+	0x0fce, 0x0fda,
 	0x1000, 0x10c5,
 	0x10d0, 0x10fc,
 	0x1100, 0x1248,
@@ -209,7 +204,7 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x12d8, 0x1310,
 	0x1312, 0x1315,
 	0x1318, 0x135a,
-	0x135f, 0x137c,
+	0x135d, 0x137c,
 	0x1380, 0x1399,
 	0x13a0, 0x13f4,
 	0x1400, 0x169c,
@@ -248,12 +243,13 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x1b50, 0x1b7c,
 	0x1b80, 0x1baa,
 	0x1bae, 0x1bb9,
-	0x1c00, 0x1c37,
+	0x1bc0, 0x1bf3,
+	0x1bfc, 0x1c37,
 	0x1c3b, 0x1c49,
 	0x1c4d, 0x1c7f,
 	0x1cd0, 0x1cf2,
 	0x1d00, 0x1de6,
-	0x1dfd, 0x1f15,
+	0x1dfc, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
 	0x1f48, 0x1f4d,
@@ -272,38 +268,25 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x2000, 0x2064,
 	0x206a, 0x2071,
 	0x2074, 0x208e,
-	0x2090, 0x2094,
-	0x20a0, 0x20b8,
+	0x2090, 0x209c,
+	0x20a0, 0x20b9,
 	0x20d0, 0x20f0,
 	0x2100, 0x2189,
-	0x2190, 0x23e8,
+	0x2190, 0x23f3,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
-	0x2460, 0x26cd,
-	0x26cf, 0x26e1,
-	0x26e3, 0x26e3,
-	0x26e8, 0x26ff,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
+	0x2460, 0x26ff,
+	0x2701, 0x27ca,
 	0x27cc, 0x27cc,
-	0x27d0, 0x2b4c,
+	0x27ce, 0x2b4c,
 	0x2b50, 0x2b59,
 	0x2c00, 0x2c2e,
 	0x2c30, 0x2c5e,
 	0x2c60, 0x2cf1,
 	0x2cf9, 0x2d25,
 	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
 	0x2da0, 0x2da6,
 	0x2da8, 0x2dae,
 	0x2db0, 0x2db6,
@@ -322,7 +305,7 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x3099, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x3190, 0x31b7,
+	0x3190, 0x31ba,
 	0x31c0, 0x31e3,
 	0x31f0, 0x321e,
 	0x3220, 0x32fe,
@@ -331,12 +314,13 @@ static const OnigCodePoint CR_Assigned[] = {
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
 	0xa4d0, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa673,
+	0xa640, 0xa673,
 	0xa67c, 0xa697,
 	0xa6a0, 0xa6f7,
-	0xa700, 0xa78c,
-	0xa7fb, 0xa82b,
+	0xa700, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa82b,
 	0xa830, 0xa839,
 	0xa840, 0xa877,
 	0xa880, 0xa8c4,
@@ -353,6 +337,11 @@ static const OnigCodePoint CR_Assigned[] = {
 	0xaa5c, 0xaa7b,
 	0xaa80, 0xaac2,
 	0xaadb, 0xaadf,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabed,
 	0xabf0, 0xabf9,
 	0xac00, 0xd7a3,
@@ -368,7 +357,7 @@ static const OnigCodePoint CR_Assigned[] = {
 	0xfb3e, 0xfb3e,
 	0xfb40, 0xfb41,
 	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
+	0xfb46, 0xfbc1,
 	0xfbd3, 0xfd3f,
 	0xfd50, 0xfd8f,
 	0xfd92, 0xfdc7,
@@ -436,11 +425,15 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x10b78, 0x10b7f,
 	0x10c00, 0x10c48,
 	0x10e60, 0x10e7e,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
 	0x11080, 0x110c1,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x12470, 0x12473,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d000, 0x1d0f5,
 	0x1d100, 0x1d126,
 	0x1d129, 0x1d1dd,
@@ -470,26 +463,49 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x1d7ce, 0x1d7ff,
 	0x1f000, 0x1f02b,
 	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
 	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,
+	0x1f130, 0x1f169,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
 	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f5ff,
+	0x1f601, 0x1f610,
+	0x1f612, 0x1f614,
+	0x1f616, 0x1f616,
+	0x1f618, 0x1f618,
+	0x1f61a, 0x1f61a,
+	0x1f61c, 0x1f61e,
+	0x1f620, 0x1f625,
+	0x1f628, 0x1f62b,
+	0x1f62d, 0x1f62d,
+	0x1f630, 0x1f633,
+	0x1f635, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 	0xe0001, 0xe0001,
 	0xe0020, 0xe007f,
@@ -552,13 +568,13 @@ static const OnigCodePoint CR_Cf[] = {
 
 /* 'Cn': General Category */
 static const OnigCodePoint CR_Cn[] = {
-	485,
+	501,
 	0x0378, 0x0379,
 	0x037f, 0x0383,
 	0x038b, 0x038b,
 	0x038d, 0x038d,
 	0x03a2, 0x03a2,
-	0x0526, 0x0530,
+	0x0528, 0x0530,
 	0x0557, 0x0558,
 	0x0560, 0x0560,
 	0x0588, 0x0588,
@@ -568,18 +584,15 @@ static const OnigCodePoint CR_Cn[] = {
 	0x05f5, 0x05ff,
 	0x0604, 0x0605,
 	0x061c, 0x061d,
-	0x0620, 0x0620,
-	0x065f, 0x065f,
 	0x070e, 0x070e,
 	0x074b, 0x074c,
 	0x07b2, 0x07bf,
 	0x07fb, 0x07ff,
 	0x082e, 0x082f,
-	0x083f, 0x08ff,
-	0x093a, 0x093b,
-	0x094f, 0x094f,
-	0x0956, 0x0957,
-	0x0973, 0x0978,
+	0x083f, 0x083f,
+	0x085c, 0x085d,
+	0x085f, 0x08ff,
+	0x0978, 0x0978,
 	0x0980, 0x0980,
 	0x0984, 0x0984,
 	0x098d, 0x098e,
@@ -638,7 +651,7 @@ static const OnigCodePoint CR_Cn[] = {
 	0x0b58, 0x0b5b,
 	0x0b5e, 0x0b5e,
 	0x0b64, 0x0b65,
-	0x0b72, 0x0b81,
+	0x0b78, 0x0b81,
 	0x0b84, 0x0b84,
 	0x0b8b, 0x0b8d,
 	0x0b91, 0x0b91,
@@ -686,11 +699,10 @@ static const OnigCodePoint CR_Cn[] = {
 	0x0d04, 0x0d04,
 	0x0d0d, 0x0d0d,
 	0x0d11, 0x0d11,
-	0x0d29, 0x0d29,
-	0x0d3a, 0x0d3c,
+	0x0d3b, 0x0d3c,
 	0x0d45, 0x0d45,
 	0x0d49, 0x0d49,
-	0x0d4e, 0x0d56,
+	0x0d4f, 0x0d56,
 	0x0d58, 0x0d5f,
 	0x0d64, 0x0d65,
 	0x0d76, 0x0d78,
@@ -728,11 +740,10 @@ static const OnigCodePoint CR_Cn[] = {
 	0x0ede, 0x0eff,
 	0x0f48, 0x0f48,
 	0x0f6d, 0x0f70,
-	0x0f8c, 0x0f8f,
 	0x0f98, 0x0f98,
 	0x0fbd, 0x0fbd,
 	0x0fcd, 0x0fcd,
-	0x0fd9, 0x0fff,
+	0x0fdb, 0x0fff,
 	0x10c6, 0x10cf,
 	0x10fd, 0x10ff,
 	0x1249, 0x1249,
@@ -750,7 +761,7 @@ static const OnigCodePoint CR_Cn[] = {
 	0x12d7, 0x12d7,
 	0x1311, 0x1311,
 	0x1316, 0x1317,
-	0x135b, 0x135e,
+	0x135b, 0x135c,
 	0x137d, 0x137f,
 	0x139a, 0x139f,
 	0x13f5, 0x13ff,
@@ -789,12 +800,13 @@ static const OnigCodePoint CR_Cn[] = {
 	0x1b4c, 0x1b4f,
 	0x1b7d, 0x1b7f,
 	0x1bab, 0x1bad,
-	0x1bba, 0x1bff,
+	0x1bba, 0x1bbf,
+	0x1bf4, 0x1bfb,
 	0x1c38, 0x1c3a,
 	0x1c4a, 0x1c4c,
 	0x1c80, 0x1ccf,
 	0x1cf3, 0x1cff,
-	0x1de7, 0x1dfc,
+	0x1de7, 0x1dfb,
 	0x1f16, 0x1f17,
 	0x1f1e, 0x1f1f,
 	0x1f46, 0x1f47,
@@ -814,29 +826,16 @@ static const OnigCodePoint CR_Cn[] = {
 	0x2065, 0x2069,
 	0x2072, 0x2073,
 	0x208f, 0x208f,
-	0x2095, 0x209f,
-	0x20b9, 0x20cf,
+	0x209d, 0x209f,
+	0x20ba, 0x20cf,
 	0x20f1, 0x20ff,
 	0x218a, 0x218f,
-	0x23e9, 0x23ff,
+	0x23f4, 0x23ff,
 	0x2427, 0x243f,
 	0x244b, 0x245f,
-	0x26ce, 0x26ce,
-	0x26e2, 0x26e2,
-	0x26e4, 0x26e7,
 	0x2700, 0x2700,
-	0x2705, 0x2705,
-	0x270a, 0x270b,
-	0x2728, 0x2728,
-	0x274c, 0x274c,
-	0x274e, 0x274e,
-	0x2753, 0x2755,
-	0x275f, 0x2760,
-	0x2795, 0x2797,
-	0x27b0, 0x27b0,
-	0x27bf, 0x27bf,
 	0x27cb, 0x27cb,
-	0x27cd, 0x27cf,
+	0x27cd, 0x27cd,
 	0x2b4d, 0x2b4f,
 	0x2b5a, 0x2bff,
 	0x2c2f, 0x2c2f,
@@ -844,7 +843,7 @@ static const OnigCodePoint CR_Cn[] = {
 	0x2cf2, 0x2cf8,
 	0x2d26, 0x2d2f,
 	0x2d66, 0x2d6e,
-	0x2d70, 0x2d7f,
+	0x2d71, 0x2d7e,
 	0x2d97, 0x2d9f,
 	0x2da7, 0x2da7,
 	0x2daf, 0x2daf,
@@ -864,7 +863,7 @@ static const OnigCodePoint CR_Cn[] = {
 	0x3100, 0x3104,
 	0x312e, 0x3130,
 	0x318f, 0x318f,
-	0x31b8, 0x31bf,
+	0x31bb, 0x31bf,
 	0x31e4, 0x31ef,
 	0x321f, 0x321f,
 	0x32ff, 0x32ff,
@@ -873,11 +872,12 @@ static const OnigCodePoint CR_Cn[] = {
 	0xa48d, 0xa48f,
 	0xa4c7, 0xa4cf,
 	0xa62c, 0xa63f,
-	0xa660, 0xa661,
 	0xa674, 0xa67b,
 	0xa698, 0xa69f,
 	0xa6f8, 0xa6ff,
-	0xa78d, 0xa7fa,
+	0xa78f, 0xa78f,
+	0xa792, 0xa79f,
+	0xa7aa, 0xa7f9,
 	0xa82c, 0xa82f,
 	0xa83a, 0xa83f,
 	0xa878, 0xa87f,
@@ -894,7 +894,12 @@ static const OnigCodePoint CR_Cn[] = {
 	0xaa5a, 0xaa5b,
 	0xaa7c, 0xaa7f,
 	0xaac3, 0xaada,
-	0xaae0, 0xabbf,
+	0xaae0, 0xab00,
+	0xab07, 0xab08,
+	0xab0f, 0xab10,
+	0xab17, 0xab1f,
+	0xab27, 0xab27,
+	0xab2f, 0xabbf,
 	0xabee, 0xabef,
 	0xabfa, 0xabff,
 	0xd7a4, 0xd7af,
@@ -910,7 +915,7 @@ static const OnigCodePoint CR_Cn[] = {
 	0xfb3f, 0xfb3f,
 	0xfb42, 0xfb42,
 	0xfb45, 0xfb45,
-	0xfbb2, 0xfbd2,
+	0xfbc2, 0xfbd2,
 	0xfd40, 0xfd4f,
 	0xfd90, 0xfd91,
 	0xfdc8, 0xfdef,
@@ -977,12 +982,16 @@ static const OnigCodePoint CR_Cn[] = {
 	0x10b73, 0x10b77,
 	0x10b80, 0x10bff,
 	0x10c49, 0x10e5f,
-	0x10e7f, 0x1107f,
+	0x10e7f, 0x10fff,
+	0x1104e, 0x11051,
+	0x11070, 0x1107f,
 	0x110c2, 0x11fff,
 	0x1236f, 0x123ff,
 	0x12463, 0x1246f,
 	0x12474, 0x12fff,
-	0x1342f, 0x1cfff,
+	0x1342f, 0x167ff,
+	0x16a39, 0x1afff,
+	0x1b002, 0x1cfff,
 	0x1d0f6, 0x1d0ff,
 	0x1d127, 0x1d128,
 	0x1d1de, 0x1d1ff,
@@ -1011,27 +1020,50 @@ static const OnigCodePoint CR_Cn[] = {
 	0x1d7cc, 0x1d7cd,
 	0x1d800, 0x1efff,
 	0x1f02c, 0x1f02f,
-	0x1f094, 0x1f0ff,
+	0x1f094, 0x1f09f,
+	0x1f0af, 0x1f0b0,
+	0x1f0bf, 0x1f0c0,
+	0x1f0d0, 0x1f0d0,
+	0x1f0e0, 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,
+	0x1f12f, 0x1f12f,
+	0x1f16a, 0x1f16f,
+	0x1f19b, 0x1f1e5,
+	0x1f203, 0x1f20f,
+	0x1f23b, 0x1f23f,
+	0x1f249, 0x1f24f,
+	0x1f252, 0x1f2ff,
+	0x1f321, 0x1f32f,
+	0x1f336, 0x1f336,
+	0x1f37d, 0x1f37f,
+	0x1f394, 0x1f39f,
+	0x1f3c5, 0x1f3c5,
+	0x1f3cb, 0x1f3df,
+	0x1f3f1, 0x1f3ff,
+	0x1f43f, 0x1f43f,
+	0x1f441, 0x1f441,
+	0x1f4f8, 0x1f4f8,
+	0x1f4fd, 0x1f4ff,
+	0x1f53e, 0x1f54f,
+	0x1f568, 0x1f5fa,
+	0x1f600, 0x1f600,
+	0x1f611, 0x1f611,
+	0x1f615, 0x1f615,
+	0x1f617, 0x1f617,
+	0x1f619, 0x1f619,
+	0x1f61b, 0x1f61b,
+	0x1f61f, 0x1f61f,
+	0x1f626, 0x1f627,
+	0x1f62c, 0x1f62c,
+	0x1f62e, 0x1f62f,
+	0x1f634, 0x1f634,
+	0x1f641, 0x1f644,
+	0x1f650, 0x1f67f,
+	0x1f6c6, 0x1f6ff,
+	0x1f774, 0x1ffff,
 	0x2a6d7, 0x2a6ff,
-	0x2b735, 0x2f7ff,
+	0x2b735, 0x2b73f,
+	0x2b81e, 0x2f7ff,
 	0x2fa1e, 0xe0000,
 	0xe0002, 0xe001f,
 	0xe0080, 0xe00ff,
@@ -1056,7 +1088,7 @@ static const OnigCodePoint CR_Cs[] = {
 
 /* 'L': Major Category */
 static const OnigCodePoint CR_L[] = {
-	422,
+	435,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -1078,13 +1110,13 @@ static const OnigCodePoint CR_L[] = {
 	0x038e, 0x03a1,
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x0559,
 	0x0561, 0x0587,
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
-	0x0621, 0x064a,
+	0x0620, 0x064a,
 	0x066e, 0x066f,
 	0x0671, 0x06d3,
 	0x06d5, 0x06d5,
@@ -1103,11 +1135,12 @@ static const OnigCodePoint CR_L[] = {
 	0x081a, 0x081a,
 	0x0824, 0x0824,
 	0x0828, 0x0828,
+	0x0840, 0x0858,
 	0x0904, 0x0939,
 	0x093d, 0x093d,
 	0x0950, 0x0950,
 	0x0958, 0x0961,
-	0x0971, 0x0972,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0x0985, 0x098c,
 	0x098f, 0x0990,
@@ -1176,11 +1209,12 @@ static const OnigCodePoint CR_L[] = {
 	0x0cbd, 0x0cbd,
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce1,
+	0x0cf1, 0x0cf2,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
 	0x0d60, 0x0d61,
 	0x0d7a, 0x0d7f,
 	0x0d85, 0x0d96,
@@ -1211,7 +1245,7 @@ static const OnigCodePoint CR_L[] = {
 	0x0f00, 0x0f00,
 	0x0f40, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8b,
+	0x0f88, 0x0f8c,
 	0x1000, 0x102a,
 	0x103f, 0x103f,
 	0x1050, 0x1055,
@@ -1271,6 +1305,7 @@ static const OnigCodePoint CR_L[] = {
 	0x1b45, 0x1b4b,
 	0x1b83, 0x1ba0,
 	0x1bae, 0x1baf,
+	0x1bc0, 0x1be5,
 	0x1c00, 0x1c23,
 	0x1c4d, 0x1c4f,
 	0x1c5a, 0x1c7d,
@@ -1298,7 +1333,7 @@ static const OnigCodePoint CR_L[] = {
 	0x1ff6, 0x1ffc,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x2102, 0x2102,
 	0x2107, 0x2107,
 	0x210a, 0x2113,
@@ -1339,7 +1374,7 @@ static const OnigCodePoint CR_L[] = {
 	0x30fc, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -1348,14 +1383,15 @@ static const OnigCodePoint CR_L[] = {
 	0xa500, 0xa60c,
 	0xa610, 0xa61f,
 	0xa62a, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa66e,
+	0xa640, 0xa66e,
 	0xa67f, 0xa697,
 	0xa6a0, 0xa6e5,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa801,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa801,
 	0xa803, 0xa805,
 	0xa807, 0xa80a,
 	0xa80c, 0xa822,
@@ -1380,6 +1416,11 @@ static const OnigCodePoint CR_L[] = {
 	0xaac0, 0xaac0,
 	0xaac2, 0xaac2,
 	0xaadb, 0xaadd,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabe2,
 	0xac00, 0xd7a3,
 	0xd7b0, 0xd7c6,
@@ -1443,9 +1484,12 @@ static const OnigCodePoint CR_L[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11003, 0x11037,
 	0x11083, 0x110af,
 	0x12000, 0x1236e,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d400, 0x1d454,
 	0x1d456, 0x1d49c,
 	0x1d49e, 0x1d49f,
@@ -1478,12 +1522,13 @@ static const OnigCodePoint CR_L[] = {
 	0x1d7c4, 0x1d7cb,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_L */
 
 /* 'Ll': General Category */
 static const OnigCodePoint CR_Ll[] = {
-	599,
+	609,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
 	0x00b5, 0x00b5,
@@ -1750,6 +1795,7 @@ static const OnigCodePoint CR_Ll[] = {
 	0x0521, 0x0521,
 	0x0523, 0x0523,
 	0x0525, 0x0525,
+	0x0527, 0x0527,
 	0x0561, 0x0587,
 	0x1d00, 0x1d2b,
 	0x1d62, 0x1d77,
@@ -1986,6 +2032,7 @@ static const OnigCodePoint CR_Ll[] = {
 	0xa65b, 0xa65b,
 	0xa65d, 0xa65d,
 	0xa65f, 0xa65f,
+	0xa661, 0xa661,
 	0xa663, 0xa663,
 	0xa665, 0xa665,
 	0xa667, 0xa667,
@@ -2051,6 +2098,14 @@ static const OnigCodePoint CR_Ll[] = {
 	0xa785, 0xa785,
 	0xa787, 0xa787,
 	0xa78c, 0xa78c,
+	0xa78e, 0xa78e,
+	0xa791, 0xa791,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
+	0xa7fa, 0xa7fa,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
 	0xff41, 0xff5a,
@@ -2116,7 +2171,7 @@ static const OnigCodePoint CR_Lm[] = {
 	0x1d9b, 0x1dbf,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x2c7d, 0x2c7d,
 	0x2d6f, 0x2d6f,
 	0x2e2f, 0x2e2f,
@@ -2141,13 +2196,13 @@ static const OnigCodePoint CR_Lm[] = {
 
 /* 'Lo': General Category */
 static const OnigCodePoint CR_Lo[] = {
-	311,
+	323,
 	0x01bb, 0x01bb,
 	0x01c0, 0x01c3,
 	0x0294, 0x0294,
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
-	0x0621, 0x063f,
+	0x0620, 0x063f,
 	0x0641, 0x064a,
 	0x066e, 0x066f,
 	0x0671, 0x06d3,
@@ -2161,11 +2216,12 @@ static const OnigCodePoint CR_Lo[] = {
 	0x07b1, 0x07b1,
 	0x07ca, 0x07ea,
 	0x0800, 0x0815,
+	0x0840, 0x0858,
 	0x0904, 0x0939,
 	0x093d, 0x093d,
 	0x0950, 0x0950,
 	0x0958, 0x0961,
-	0x0972, 0x0972,
+	0x0972, 0x0977,
 	0x0979, 0x097f,
 	0x0985, 0x098c,
 	0x098f, 0x0990,
@@ -2234,11 +2290,12 @@ static const OnigCodePoint CR_Lo[] = {
 	0x0cbd, 0x0cbd,
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce1,
+	0x0cf1, 0x0cf2,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
 	0x0d60, 0x0d61,
 	0x0d7a, 0x0d7f,
 	0x0d85, 0x0d96,
@@ -2268,7 +2325,7 @@ static const OnigCodePoint CR_Lo[] = {
 	0x0f00, 0x0f00,
 	0x0f40, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8b,
+	0x0f88, 0x0f8c,
 	0x1000, 0x102a,
 	0x103f, 0x103f,
 	0x1050, 0x1055,
@@ -2325,6 +2382,7 @@ static const OnigCodePoint CR_Lo[] = {
 	0x1b45, 0x1b4b,
 	0x1b83, 0x1ba0,
 	0x1bae, 0x1baf,
+	0x1bc0, 0x1be5,
 	0x1c00, 0x1c23,
 	0x1c4d, 0x1c4f,
 	0x1c5a, 0x1c77,
@@ -2349,7 +2407,7 @@ static const OnigCodePoint CR_Lo[] = {
 	0x30ff, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -2386,6 +2444,11 @@ static const OnigCodePoint CR_Lo[] = {
 	0xaac0, 0xaac0,
 	0xaac2, 0xaac2,
 	0xaadb, 0xaadc,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabe2,
 	0xac00, 0xd7a3,
 	0xd7b0, 0xd7c6,
@@ -2447,11 +2510,15 @@ static const OnigCodePoint CR_Lo[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11003, 0x11037,
 	0x11083, 0x110af,
 	0x12000, 0x1236e,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_Lo */
 
@@ -2472,7 +2539,7 @@ static const OnigCodePoint CR_Lt[] = {
 
 /* 'Lu': General Category */
 static const OnigCodePoint CR_Lu[] = {
-	594,
+	603,
 	0x0041, 0x005a,
 	0x00c0, 0x00d6,
 	0x00d8, 0x00de,
@@ -2738,6 +2805,7 @@ static const OnigCodePoint CR_Lu[] = {
 	0x0520, 0x0520,
 	0x0522, 0x0522,
 	0x0524, 0x0524,
+	0x0526, 0x0526,
 	0x0531, 0x0556,
 	0x10a0, 0x10c5,
 	0x1e00, 0x1e00,
@@ -2970,6 +3038,7 @@ static const OnigCodePoint CR_Lu[] = {
 	0xa65a, 0xa65a,
 	0xa65c, 0xa65c,
 	0xa65e, 0xa65e,
+	0xa660, 0xa660,
 	0xa662, 0xa662,
 	0xa664, 0xa664,
 	0xa666, 0xa666,
@@ -3034,6 +3103,13 @@ static const OnigCodePoint CR_Lu[] = {
 	0xa784, 0xa784,
 	0xa786, 0xa786,
 	0xa78b, 0xa78b,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
 	0xff21, 0xff3a,
 	0x10400, 0x10427,
 	0x1d400, 0x1d419,
@@ -3071,7 +3147,7 @@ static const OnigCodePoint CR_Lu[] = {
 
 /* 'M': Major Category */
 static const OnigCodePoint CR_M[] = {
-	188,
+	193,
 	0x0300, 0x036f,
 	0x0483, 0x0489,
 	0x0591, 0x05bd,
@@ -3080,10 +3156,10 @@ static const OnigCodePoint CR_M[] = {
 	0x05c4, 0x05c5,
 	0x05c7, 0x05c7,
 	0x0610, 0x061a,
-	0x064b, 0x065e,
+	0x064b, 0x065f,
 	0x0670, 0x0670,
 	0x06d6, 0x06dc,
-	0x06de, 0x06e4,
+	0x06df, 0x06e4,
 	0x06e7, 0x06e8,
 	0x06ea, 0x06ed,
 	0x0711, 0x0711,
@@ -3094,10 +3170,11 @@ static const OnigCodePoint CR_M[] = {
 	0x081b, 0x0823,
 	0x0825, 0x0827,
 	0x0829, 0x082d,
+	0x0859, 0x085b,
 	0x0900, 0x0903,
-	0x093c, 0x093c,
-	0x093e, 0x094e,
-	0x0951, 0x0955,
+	0x093a, 0x093c,
+	0x093e, 0x094f,
+	0x0951, 0x0957,
 	0x0962, 0x0963,
 	0x0981, 0x0983,
 	0x09bc, 0x09bc,
@@ -3171,7 +3248,7 @@ static const OnigCodePoint CR_M[] = {
 	0x0f3e, 0x0f3f,
 	0x0f71, 0x0f84,
 	0x0f86, 0x0f87,
-	0x0f90, 0x0f97,
+	0x0f8d, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fc6, 0x0fc6,
 	0x102b, 0x103e,
@@ -3183,7 +3260,7 @@ static const OnigCodePoint CR_M[] = {
 	0x1082, 0x108d,
 	0x108f, 0x108f,
 	0x109a, 0x109d,
-	0x135f, 0x135f,
+	0x135d, 0x135f,
 	0x1712, 0x1714,
 	0x1732, 0x1734,
 	0x1752, 0x1753,
@@ -3205,15 +3282,17 @@ static const OnigCodePoint CR_M[] = {
 	0x1b6b, 0x1b73,
 	0x1b80, 0x1b82,
 	0x1ba1, 0x1baa,
+	0x1be6, 0x1bf3,
 	0x1c24, 0x1c37,
 	0x1cd0, 0x1cd2,
 	0x1cd4, 0x1ce8,
 	0x1ced, 0x1ced,
 	0x1cf2, 0x1cf2,
 	0x1dc0, 0x1de6,
-	0x1dfd, 0x1dff,
+	0x1dfc, 0x1dff,
 	0x20d0, 0x20f0,
 	0x2cef, 0x2cf1,
+	0x2d7f, 0x2d7f,
 	0x2de0, 0x2dff,
 	0x302a, 0x302f,
 	0x3099, 0x309a,
@@ -3251,6 +3330,8 @@ static const OnigCodePoint CR_M[] = {
 	0x10a0c, 0x10a0f,
 	0x10a38, 0x10a3a,
 	0x10a3f, 0x10a3f,
+	0x11000, 0x11002,
+	0x11038, 0x11046,
 	0x11080, 0x11082,
 	0x110b0, 0x110ba,
 	0x1d165, 0x1d169,
@@ -3264,11 +3345,12 @@ static const OnigCodePoint CR_M[] = {
 
 /* 'Mc': General Category */
 static const OnigCodePoint CR_Mc[] = {
-	106,
+	113,
 	0x0903, 0x0903,
+	0x093b, 0x093b,
 	0x093e, 0x0940,
 	0x0949, 0x094c,
-	0x094e, 0x094e,
+	0x094e, 0x094f,
 	0x0982, 0x0983,
 	0x09be, 0x09c0,
 	0x09c7, 0x09c8,
@@ -3345,6 +3427,10 @@ static const OnigCodePoint CR_Mc[] = {
 	0x1ba1, 0x1ba1,
 	0x1ba6, 0x1ba7,
 	0x1baa, 0x1baa,
+	0x1be7, 0x1be7,
+	0x1bea, 0x1bec,
+	0x1bee, 0x1bee,
+	0x1bf2, 0x1bf3,
 	0x1c24, 0x1c2b,
 	0x1c34, 0x1c35,
 	0x1ce1, 0x1ce1,
@@ -3366,6 +3452,8 @@ static const OnigCodePoint CR_Mc[] = {
 	0xabe6, 0xabe7,
 	0xabe9, 0xabea,
 	0xabec, 0xabec,
+	0x11000, 0x11000,
+	0x11002, 0x11002,
 	0x11082, 0x11082,
 	0x110b0, 0x110b2,
 	0x110b7, 0x110b8,
@@ -3375,9 +3463,8 @@ static const OnigCodePoint CR_Mc[] = {
 
 /* 'Me': General Category */
 static const OnigCodePoint CR_Me[] = {
-	5,
+	4,
 	0x0488, 0x0489,
-	0x06de, 0x06de,
 	0x20dd, 0x20e0,
 	0x20e2, 0x20e4,
 	0xa670, 0xa672,
@@ -3385,7 +3472,7 @@ static const OnigCodePoint CR_Me[] = {
 
 /* 'Mn': General Category */
 static const OnigCodePoint CR_Mn[] = {
-	194,
+	203,
 	0x0300, 0x036f,
 	0x0483, 0x0487,
 	0x0591, 0x05bd,
@@ -3394,7 +3481,7 @@ static const OnigCodePoint CR_Mn[] = {
 	0x05c4, 0x05c5,
 	0x05c7, 0x05c7,
 	0x0610, 0x061a,
-	0x064b, 0x065e,
+	0x064b, 0x065f,
 	0x0670, 0x0670,
 	0x06d6, 0x06dc,
 	0x06df, 0x06e4,
@@ -3408,11 +3495,13 @@ static const OnigCodePoint CR_Mn[] = {
 	0x081b, 0x0823,
 	0x0825, 0x0827,
 	0x0829, 0x082d,
+	0x0859, 0x085b,
 	0x0900, 0x0902,
+	0x093a, 0x093a,
 	0x093c, 0x093c,
 	0x0941, 0x0948,
 	0x094d, 0x094d,
-	0x0951, 0x0955,
+	0x0951, 0x0957,
 	0x0962, 0x0963,
 	0x0981, 0x0981,
 	0x09bc, 0x09bc,
@@ -3473,7 +3562,7 @@ static const OnigCodePoint CR_Mn[] = {
 	0x0f71, 0x0f7e,
 	0x0f80, 0x0f84,
 	0x0f86, 0x0f87,
-	0x0f90, 0x0f97,
+	0x0f8d, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fc6, 0x0fc6,
 	0x102d, 0x1030,
@@ -3487,7 +3576,7 @@ static const OnigCodePoint CR_Mn[] = {
 	0x1085, 0x1086,
 	0x108d, 0x108d,
 	0x109d, 0x109d,
-	0x135f, 0x135f,
+	0x135d, 0x135f,
 	0x1712, 0x1714,
 	0x1732, 0x1734,
 	0x1752, 0x1753,
@@ -3519,6 +3608,10 @@ static const OnigCodePoint CR_Mn[] = {
 	0x1b80, 0x1b81,
 	0x1ba2, 0x1ba5,
 	0x1ba8, 0x1ba9,
+	0x1be6, 0x1be6,
+	0x1be8, 0x1be9,
+	0x1bed, 0x1bed,
+	0x1bef, 0x1bf1,
 	0x1c2c, 0x1c33,
 	0x1c36, 0x1c37,
 	0x1cd0, 0x1cd2,
@@ -3526,11 +3619,12 @@ static const OnigCodePoint CR_Mn[] = {
 	0x1ce2, 0x1ce8,
 	0x1ced, 0x1ced,
 	0x1dc0, 0x1de6,
-	0x1dfd, 0x1dff,
+	0x1dfc, 0x1dff,
 	0x20d0, 0x20dc,
 	0x20e1, 0x20e1,
 	0x20e5, 0x20f0,
 	0x2cef, 0x2cf1,
+	0x2d7f, 0x2d7f,
 	0x2de0, 0x2dff,
 	0x302a, 0x302f,
 	0x3099, 0x309a,
@@ -3571,6 +3665,8 @@ static const OnigCodePoint CR_Mn[] = {
 	0x10a0c, 0x10a0f,
 	0x10a38, 0x10a3a,
 	0x10a3f, 0x10a3f,
+	0x11001, 0x11001,
+	0x11038, 0x11046,
 	0x11080, 0x11081,
 	0x110b3, 0x110b6,
 	0x110b9, 0x110ba,
@@ -3584,7 +3680,7 @@ static const OnigCodePoint CR_Mn[] = {
 
 /* 'N': Major Category */
 static const OnigCodePoint CR_N[] = {
-	81,
+	83,
 	0x0030, 0x0039,
 	0x00b2, 0x00b3,
 	0x00b9, 0x00b9,
@@ -3598,6 +3694,7 @@ static const OnigCodePoint CR_N[] = {
 	0x0a66, 0x0a6f,
 	0x0ae6, 0x0aef,
 	0x0b66, 0x0b6f,
+	0x0b72, 0x0b77,
 	0x0be6, 0x0bf2,
 	0x0c66, 0x0c6f,
 	0x0c78, 0x0c7e,
@@ -3662,6 +3759,7 @@ static const OnigCodePoint CR_N[] = {
 	0x10b58, 0x10b5f,
 	0x10b78, 0x10b7f,
 	0x10e60, 0x10e7e,
+	0x11052, 0x1106f,
 	0x12400, 0x12462,
 	0x1d360, 0x1d371,
 	0x1d7ce, 0x1d7ff,
@@ -3670,7 +3768,7 @@ static const OnigCodePoint CR_N[] = {
 
 /* 'Nd': General Category */
 static const OnigCodePoint CR_Nd[] = {
-	37,
+	38,
 	0x0030, 0x0039,
 	0x0660, 0x0669,
 	0x06f0, 0x06f9,
@@ -3692,7 +3790,7 @@ static const OnigCodePoint CR_Nd[] = {
 	0x17e0, 0x17e9,
 	0x1810, 0x1819,
 	0x1946, 0x194f,
-	0x19d0, 0x19da,
+	0x19d0, 0x19d9,
 	0x1a80, 0x1a89,
 	0x1a90, 0x1a99,
 	0x1b50, 0x1b59,
@@ -3707,6 +3805,7 @@ static const OnigCodePoint CR_Nd[] = {
 	0xabf0, 0xabf9,
 	0xff10, 0xff19,
 	0x104a0, 0x104a9,
+	0x11066, 0x1106f,
 	0x1d7ce, 0x1d7ff,
 }; /* CR_Nd */
 
@@ -3729,17 +3828,19 @@ static const OnigCodePoint CR_Nl[] = {
 
 /* 'No': General Category */
 static const OnigCodePoint CR_No[] = {
-	38,
+	41,
 	0x00b2, 0x00b3,
 	0x00b9, 0x00b9,
 	0x00bc, 0x00be,
 	0x09f4, 0x09f9,
+	0x0b72, 0x0b77,
 	0x0bf0, 0x0bf2,
 	0x0c78, 0x0c7e,
 	0x0d70, 0x0d75,
 	0x0f2a, 0x0f33,
 	0x1369, 0x137c,
 	0x17f0, 0x17f9,
+	0x19da, 0x19da,
 	0x2070, 0x2070,
 	0x2074, 0x2079,
 	0x2080, 0x2089,
@@ -3766,13 +3867,14 @@ static const OnigCodePoint CR_No[] = {
 	0x10b58, 0x10b5f,
 	0x10b78, 0x10b7f,
 	0x10e60, 0x10e7e,
+	0x11052, 0x11065,
 	0x1d360, 0x1d371,
 	0x1f100, 0x1f10a,
 }; /* CR_No */
 
 /* 'P': Major Category */
 static const OnigCodePoint CR_P[] = {
-	129,
+	133,
 	0x0021, 0x0023,
 	0x0025, 0x002a,
 	0x002c, 0x002f,
@@ -3805,6 +3907,7 @@ static const OnigCodePoint CR_P[] = {
 	0x0700, 0x070d,
 	0x07f7, 0x07f9,
 	0x0830, 0x083e,
+	0x085e, 0x085e,
 	0x0964, 0x0965,
 	0x0970, 0x0970,
 	0x0df4, 0x0df4,
@@ -3814,6 +3917,7 @@ static const OnigCodePoint CR_P[] = {
 	0x0f3a, 0x0f3d,
 	0x0f85, 0x0f85,
 	0x0fd0, 0x0fd4,
+	0x0fd9, 0x0fda,
 	0x104a, 0x104f,
 	0x10fb, 0x10fb,
 	0x1361, 0x1368,
@@ -3826,11 +3930,11 @@ static const OnigCodePoint CR_P[] = {
 	0x17d8, 0x17da,
 	0x1800, 0x180a,
 	0x1944, 0x1945,
-	0x19de, 0x19df,
 	0x1a1e, 0x1a1f,
 	0x1aa0, 0x1aa6,
 	0x1aa8, 0x1aad,
 	0x1b5a, 0x1b60,
+	0x1bfc, 0x1bff,
 	0x1c3b, 0x1c3f,
 	0x1c7e, 0x1c7f,
 	0x1cd3, 0x1cd3,
@@ -3849,6 +3953,7 @@ static const OnigCodePoint CR_P[] = {
 	0x29fc, 0x29fd,
 	0x2cf9, 0x2cfc,
 	0x2cfe, 0x2cff,
+	0x2d70, 0x2d70,
 	0x2e00, 0x2e2e,
 	0x2e30, 0x2e31,
 	0x3001, 0x3003,
@@ -3899,6 +4004,7 @@ static const OnigCodePoint CR_P[] = {
 	0x10a50, 0x10a58,
 	0x10a7f, 0x10a7f,
 	0x10b39, 0x10b3f,
+	0x11047, 0x1104d,
 	0x110bb, 0x110bc,
 	0x110be, 0x110c1,
 	0x12470, 0x12473,
@@ -4043,7 +4149,7 @@ static const OnigCodePoint CR_Pi[] = {
 
 /* 'Po': General Category */
 static const OnigCodePoint CR_Po[] = {
-	124,
+	128,
 	0x0021, 0x0023,
 	0x0025, 0x0027,
 	0x002a, 0x002a,
@@ -4072,6 +4178,7 @@ static const OnigCodePoint CR_Po[] = {
 	0x0700, 0x070d,
 	0x07f7, 0x07f9,
 	0x0830, 0x083e,
+	0x085e, 0x085e,
 	0x0964, 0x0965,
 	0x0970, 0x0970,
 	0x0df4, 0x0df4,
@@ -4080,6 +4187,7 @@ static const OnigCodePoint CR_Po[] = {
 	0x0f04, 0x0f12,
 	0x0f85, 0x0f85,
 	0x0fd0, 0x0fd4,
+	0x0fd9, 0x0fda,
 	0x104a, 0x104f,
 	0x10fb, 0x10fb,
 	0x1361, 0x1368,
@@ -4091,11 +4199,11 @@ static const OnigCodePoint CR_Po[] = {
 	0x1800, 0x1805,
 	0x1807, 0x180a,
 	0x1944, 0x1945,
-	0x19de, 0x19df,
 	0x1a1e, 0x1a1f,
 	0x1aa0, 0x1aa6,
 	0x1aa8, 0x1aad,
 	0x1b5a, 0x1b60,
+	0x1bfc, 0x1bff,
 	0x1c3b, 0x1c3f,
 	0x1c7e, 0x1c7f,
 	0x1cd3, 0x1cd3,
@@ -4109,6 +4217,7 @@ static const OnigCodePoint CR_Po[] = {
 	0x2055, 0x205e,
 	0x2cf9, 0x2cfc,
 	0x2cfe, 0x2cff,
+	0x2d70, 0x2d70,
 	0x2e00, 0x2e01,
 	0x2e06, 0x2e08,
 	0x2e0b, 0x2e0b,
@@ -4165,6 +4274,7 @@ static const OnigCodePoint CR_Po[] = {
 	0x10a50, 0x10a58,
 	0x10a7f, 0x10a7f,
 	0x10b39, 0x10b3f,
+	0x11047, 0x1104d,
 	0x110bb, 0x110bc,
 	0x110be, 0x110c1,
 	0x12470, 0x12473,
@@ -4249,7 +4359,7 @@ static const OnigCodePoint CR_Ps[] = {
 
 /* 'S': Major Category */
 static const OnigCodePoint CR_S[] = {
-	198,
+	208,
 	0x0024, 0x0024,
 	0x002b, 0x002b,
 	0x003c, 0x003e,
@@ -4277,6 +4387,7 @@ static const OnigCodePoint CR_S[] = {
 	0x0606, 0x0608,
 	0x060b, 0x060b,
 	0x060e, 0x060f,
+	0x06de, 0x06de,
 	0x06e9, 0x06e9,
 	0x06fd, 0x06fe,
 	0x07f6, 0x07f6,
@@ -4286,7 +4397,6 @@ static const OnigCodePoint CR_S[] = {
 	0x0b70, 0x0b70,
 	0x0bf3, 0x0bfa,
 	0x0c7f, 0x0c7f,
-	0x0cf1, 0x0cf2,
 	0x0d79, 0x0d79,
 	0x0e3f, 0x0e3f,
 	0x0f01, 0x0f03,
@@ -4304,7 +4414,7 @@ static const OnigCodePoint CR_S[] = {
 	0x1390, 0x1399,
 	0x17db, 0x17db,
 	0x1940, 0x1940,
-	0x19e0, 0x19ff,
+	0x19de, 0x19ff,
 	0x1b61, 0x1b6a,
 	0x1b74, 0x1b7c,
 	0x1fbd, 0x1fbd,
@@ -4317,7 +4427,7 @@ static const OnigCodePoint CR_S[] = {
 	0x2052, 0x2052,
 	0x207a, 0x207c,
 	0x208a, 0x208c,
-	0x20a0, 0x20b8,
+	0x20a0, 0x20b9,
 	0x2100, 0x2101,
 	0x2103, 0x2106,
 	0x2108, 0x2109,
@@ -4333,29 +4443,16 @@ static const OnigCodePoint CR_S[] = {
 	0x214a, 0x214d,
 	0x214f, 0x214f,
 	0x2190, 0x2328,
-	0x232b, 0x23e8,
+	0x232b, 0x23f3,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
 	0x249c, 0x24e9,
-	0x2500, 0x26cd,
-	0x26cf, 0x26e1,
-	0x26e3, 0x26e3,
-	0x26e8, 0x26ff,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x275e,
-	0x2761, 0x2767,
-	0x2794, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27c4,
+	0x2500, 0x26ff,
+	0x2701, 0x2767,
+	0x2794, 0x27c4,
 	0x27c7, 0x27ca,
 	0x27cc, 0x27cc,
-	0x27d0, 0x27e5,
+	0x27ce, 0x27e5,
 	0x27f0, 0x2982,
 	0x2999, 0x29d7,
 	0x29dc, 0x29fb,
@@ -4390,6 +4487,7 @@ static const OnigCodePoint CR_S[] = {
 	0xa836, 0xa839,
 	0xaa77, 0xaa79,
 	0xfb29, 0xfb29,
+	0xfbb2, 0xfbc1,
 	0xfdfc, 0xfdfd,
 	0xfe62, 0xfe62,
 	0xfe64, 0xfe66,
@@ -4431,23 +4529,45 @@ static const OnigCodePoint CR_S[] = {
 	0x1d7c3, 0x1d7c3,
 	0x1f000, 0x1f02b,
 	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
 	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,
+	0x1f130, 0x1f169,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
 	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f5ff,
+	0x1f601, 0x1f610,
+	0x1f612, 0x1f614,
+	0x1f616, 0x1f616,
+	0x1f618, 0x1f618,
+	0x1f61a, 0x1f61a,
+	0x1f61c, 0x1f61e,
+	0x1f620, 0x1f625,
+	0x1f628, 0x1f62b,
+	0x1f62d, 0x1f62d,
+	0x1f630, 0x1f633,
+	0x1f635, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
 }; /* CR_S */
 
 /* 'Sc': General Category */
@@ -4462,7 +4582,7 @@ static const OnigCodePoint CR_Sc[] = {
 	0x0bf9, 0x0bf9,
 	0x0e3f, 0x0e3f,
 	0x17db, 0x17db,
-	0x20a0, 0x20b8,
+	0x20a0, 0x20b9,
 	0xa838, 0xa838,
 	0xfdfc, 0xfdfc,
 	0xfe69, 0xfe69,
@@ -4473,7 +4593,7 @@ static const OnigCodePoint CR_Sc[] = {
 
 /* 'Sk': General Category */
 static const OnigCodePoint CR_Sk[] = {
-	26,
+	27,
 	0x005e, 0x005e,
 	0x0060, 0x0060,
 	0x00a8, 0x00a8,
@@ -4497,6 +4617,7 @@ static const OnigCodePoint CR_Sk[] = {
 	0xa700, 0xa716,
 	0xa720, 0xa721,
 	0xa789, 0xa78a,
+	0xfbb2, 0xfbc1,
 	0xff3e, 0xff3e,
 	0xff40, 0xff40,
 	0xffe3, 0xffe3,
@@ -4504,7 +4625,7 @@ static const OnigCodePoint CR_Sk[] = {
 
 /* 'Sm': General Category */
 static const OnigCodePoint CR_Sm[] = {
-	65,
+	66,
 	0x002b, 0x002b,
 	0x003c, 0x003e,
 	0x007c, 0x007c,
@@ -4519,6 +4640,7 @@ static const OnigCodePoint CR_Sm[] = {
 	0x2052, 0x2052,
 	0x207a, 0x207c,
 	0x208a, 0x208c,
+	0x2118, 0x2118,
 	0x2140, 0x2144,
 	0x214b, 0x214b,
 	0x2190, 0x2194,
@@ -4543,7 +4665,7 @@ static const OnigCodePoint CR_Sm[] = {
 	0x27c0, 0x27c4,
 	0x27c7, 0x27ca,
 	0x27cc, 0x27cc,
-	0x27d0, 0x27e5,
+	0x27ce, 0x27e5,
 	0x27f0, 0x27ff,
 	0x2900, 0x2982,
 	0x2999, 0x29d7,
@@ -4574,7 +4696,7 @@ static const OnigCodePoint CR_Sm[] = {
 
 /* 'So': General Category */
 static const OnigCodePoint CR_So[] = {
-	154,
+	164,
 	0x00a6, 0x00a7,
 	0x00a9, 0x00a9,
 	0x00ae, 0x00ae,
@@ -4582,6 +4704,7 @@ static const OnigCodePoint CR_So[] = {
 	0x00b6, 0x00b6,
 	0x0482, 0x0482,
 	0x060e, 0x060f,
+	0x06de, 0x06de,
 	0x06e9, 0x06e9,
 	0x06fd, 0x06fe,
 	0x07f6, 0x07f6,
@@ -4590,7 +4713,6 @@ static const OnigCodePoint CR_So[] = {
 	0x0bf3, 0x0bf8,
 	0x0bfa, 0x0bfa,
 	0x0c7f, 0x0c7f,
-	0x0cf1, 0x0cf2,
 	0x0d79, 0x0d79,
 	0x0f01, 0x0f03,
 	0x0f13, 0x0f17,
@@ -4606,14 +4728,14 @@ static const OnigCodePoint CR_So[] = {
 	0x1360, 0x1360,
 	0x1390, 0x1399,
 	0x1940, 0x1940,
-	0x19e0, 0x19ff,
+	0x19de, 0x19ff,
 	0x1b61, 0x1b6a,
 	0x1b74, 0x1b7c,
 	0x2100, 0x2101,
 	0x2103, 0x2106,
 	0x2108, 0x2109,
 	0x2114, 0x2114,
-	0x2116, 0x2118,
+	0x2116, 0x2117,
 	0x211e, 0x2123,
 	0x2125, 0x2125,
 	0x2127, 0x2127,
@@ -4638,7 +4760,7 @@ static const OnigCodePoint CR_So[] = {
 	0x232b, 0x237b,
 	0x237d, 0x239a,
 	0x23b4, 0x23db,
-	0x23e2, 0x23e8,
+	0x23e2, 0x23f3,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
 	0x249c, 0x24e9,
@@ -4646,21 +4768,9 @@ static const OnigCodePoint CR_So[] = {
 	0x25b8, 0x25c0,
 	0x25c2, 0x25f7,
 	0x2600, 0x266e,
-	0x2670, 0x26cd,
-	0x26cf, 0x26e1,
-	0x26e3, 0x26e3,
-	0x26e8, 0x26ff,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x275e,
-	0x2761, 0x2767,
-	0x2794, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
+	0x2670, 0x26ff,
+	0x2701, 0x2767,
+	0x2794, 0x27bf,
 	0x2800, 0x28ff,
 	0x2b00, 0x2b2f,
 	0x2b45, 0x2b46,
@@ -4712,23 +4822,45 @@ static const OnigCodePoint CR_So[] = {
 	0x1d300, 0x1d356,
 	0x1f000, 0x1f02b,
 	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
 	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,
+	0x1f130, 0x1f169,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
 	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f5ff,
+	0x1f601, 0x1f610,
+	0x1f612, 0x1f614,
+	0x1f616, 0x1f616,
+	0x1f618, 0x1f618,
+	0x1f61a, 0x1f61a,
+	0x1f61c, 0x1f61e,
+	0x1f620, 0x1f625,
+	0x1f628, 0x1f62b,
+	0x1f62d, 0x1f62d,
+	0x1f630, 0x1f633,
+	0x1f635, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
 }; /* CR_So */
 
 /* 'Z': Major Category */
@@ -4772,7 +4904,7 @@ static const OnigCodePoint CR_Zs[] = {
 
 /* 'Math': Derived Property */
 static const OnigCodePoint CR_Math[] = {
-	105,
+	106,
 	0x002b, 0x002b,
 	0x003c, 0x003e,
 	0x005e, 0x005e,
@@ -4800,9 +4932,10 @@ static const OnigCodePoint CR_Math[] = {
 	0x20e5, 0x20e6,
 	0x20eb, 0x20ef,
 	0x2102, 0x2102,
+	0x2107, 0x2107,
 	0x210a, 0x2113,
 	0x2115, 0x2115,
-	0x2119, 0x211d,
+	0x2118, 0x211d,
 	0x2124, 0x2124,
 	0x2128, 0x2129,
 	0x212c, 0x212d,
@@ -4842,7 +4975,7 @@ static const OnigCodePoint CR_Math[] = {
 	0x266d, 0x266f,
 	0x27c0, 0x27ca,
 	0x27cc, 0x27cc,
-	0x27d0, 0x27ff,
+	0x27ce, 0x27ff,
 	0x2900, 0x2aff,
 	0x2b30, 0x2b44,
 	0x2b47, 0x2b4c,
@@ -4882,7 +5015,7 @@ static const OnigCodePoint CR_Math[] = {
 
 /* 'Alphabetic': Derived Property */
 static const OnigCodePoint CR_Alphabetic[] = {
-	474,
+	486,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -4905,7 +5038,7 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x038e, 0x03a1,
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x0559,
 	0x0561, 0x0587,
@@ -4917,8 +5050,8 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
 	0x0610, 0x061a,
-	0x0621, 0x0657,
-	0x0659, 0x065e,
+	0x0620, 0x0657,
+	0x0659, 0x065f,
 	0x066e, 0x06d3,
 	0x06d5, 0x06dc,
 	0x06e1, 0x06e8,
@@ -4932,13 +5065,12 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x07fa, 0x07fa,
 	0x0800, 0x0817,
 	0x081a, 0x082c,
-	0x0900, 0x0939,
+	0x0840, 0x0858,
+	0x0900, 0x093b,
 	0x093d, 0x094c,
-	0x094e, 0x094e,
-	0x0950, 0x0950,
-	0x0955, 0x0955,
-	0x0958, 0x0963,
-	0x0971, 0x0972,
+	0x094e, 0x0950,
+	0x0955, 0x0963,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
@@ -5035,14 +5167,15 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x0cd5, 0x0cd6,
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce3,
+	0x0cf1, 0x0cf2,
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
 	0x0d4a, 0x0d4c,
+	0x0d4e, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d7a, 0x0d7f,
@@ -5080,8 +5213,7 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x0f40, 0x0f47,
 	0x0f49, 0x0f6c,
 	0x0f71, 0x0f81,
-	0x0f88, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f88, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x1000, 0x1036,
 	0x1038, 0x1038,
@@ -5148,6 +5280,8 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x1b45, 0x1b4b,
 	0x1b80, 0x1ba9,
 	0x1bae, 0x1baf,
+	0x1bc0, 0x1be5,
+	0x1be7, 0x1bf1,
 	0x1c00, 0x1c35,
 	0x1c4d, 0x1c4f,
 	0x1c5a, 0x1c7d,
@@ -5175,7 +5309,7 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x1ff6, 0x1ffc,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x2102, 0x2102,
 	0x2107, 0x2107,
 	0x210a, 0x2113,
@@ -5219,7 +5353,7 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x30fc, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -5228,14 +5362,15 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0xa500, 0xa60c,
 	0xa610, 0xa61f,
 	0xa62a, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa66e,
+	0xa640, 0xa66e,
 	0xa67f, 0xa697,
 	0xa6a0, 0xa6ef,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa801,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa801,
 	0xa803, 0xa805,
 	0xa807, 0xa80a,
 	0xa80c, 0xa827,
@@ -5246,7 +5381,8 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0xa90a, 0xa92a,
 	0xa930, 0xa952,
 	0xa960, 0xa97c,
-	0xa980, 0xa9bf,
+	0xa980, 0xa9b2,
+	0xa9b4, 0xa9bf,
 	0xa9cf, 0xa9cf,
 	0xaa00, 0xaa36,
 	0xaa40, 0xaa4d,
@@ -5256,6 +5392,11 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0xaac0, 0xaac0,
 	0xaac2, 0xaac2,
 	0xaadb, 0xaadd,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabea,
 	0xac00, 0xd7a3,
 	0xd7b0, 0xd7c6,
@@ -5320,10 +5461,13 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11000, 0x11045,
 	0x11082, 0x110b8,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d400, 0x1d454,
 	0x1d456, 0x1d49c,
 	0x1d49e, 0x1d49f,
@@ -5356,12 +5500,13 @@ static const OnigCodePoint CR_Alphabetic[] = {
 	0x1d7c4, 0x1d7cb,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_Alphabetic */
 
 /* 'Lowercase': Derived Property */
 static const OnigCodePoint CR_Lowercase[] = {
-	602,
+	612,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
 	0x00b5, 0x00b5,
@@ -5631,6 +5776,7 @@ static const OnigCodePoint CR_Lowercase[] = {
 	0x0521, 0x0521,
 	0x0523, 0x0523,
 	0x0525, 0x0525,
+	0x0527, 0x0527,
 	0x0561, 0x0587,
 	0x1d00, 0x1dbf,
 	0x1e01, 0x1e01,
@@ -5868,6 +6014,7 @@ static const OnigCodePoint CR_Lowercase[] = {
 	0xa65b, 0xa65b,
 	0xa65d, 0xa65d,
 	0xa65f, 0xa65f,
+	0xa661, 0xa661,
 	0xa663, 0xa663,
 	0xa665, 0xa665,
 	0xa667, 0xa667,
@@ -5932,6 +6079,14 @@ static const OnigCodePoint CR_Lowercase[] = {
 	0xa785, 0xa785,
 	0xa787, 0xa787,
 	0xa78c, 0xa78c,
+	0xa78e, 0xa78e,
+	0xa791, 0xa791,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
+	0xa7fa, 0xa7fa,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
 	0xff41, 0xff5a,
@@ -5968,7 +6123,7 @@ static const OnigCodePoint CR_Lowercase[] = {
 
 /* 'Uppercase': Derived Property */
 static const OnigCodePoint CR_Uppercase[] = {
-	596,
+	605,
 	0x0041, 0x005a,
 	0x00c0, 0x00d6,
 	0x00d8, 0x00de,
@@ -6234,6 +6389,7 @@ static const OnigCodePoint CR_Uppercase[] = {
 	0x0520, 0x0520,
 	0x0522, 0x0522,
 	0x0524, 0x0524,
+	0x0526, 0x0526,
 	0x0531, 0x0556,
 	0x10a0, 0x10c5,
 	0x1e00, 0x1e00,
@@ -6468,6 +6624,7 @@ static const OnigCodePoint CR_Uppercase[] = {
 	0xa65a, 0xa65a,
 	0xa65c, 0xa65c,
 	0xa65e, 0xa65e,
+	0xa660, 0xa660,
 	0xa662, 0xa662,
 	0xa664, 0xa664,
 	0xa666, 0xa666,
@@ -6532,6 +6689,13 @@ static const OnigCodePoint CR_Uppercase[] = {
 	0xa784, 0xa784,
 	0xa786, 0xa786,
 	0xa78b, 0xa78b,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
 	0xff21, 0xff3a,
 	0x10400, 0x10427,
 	0x1d400, 0x1d419,
@@ -6569,7 +6733,7 @@ static const OnigCodePoint CR_Uppercase[] = {
 
 /* 'Cased': Derived Property */
 static const OnigCodePoint CR_Cased[] = {
-	110,
+	112,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -6593,7 +6757,7 @@ static const OnigCodePoint CR_Cased[] = {
 	0x038e, 0x03a1,
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0561, 0x0587,
 	0x10a0, 0x10c5,
@@ -6640,11 +6804,13 @@ static const OnigCodePoint CR_Cased[] = {
 	0x2c60, 0x2ce4,
 	0x2ceb, 0x2cee,
 	0x2d00, 0x2d25,
-	0xa640, 0xa65f,
-	0xa662, 0xa66d,
+	0xa640, 0xa66d,
 	0xa680, 0xa697,
 	0xa722, 0xa787,
-	0xa78b, 0xa78c,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa7fa,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
 	0xff21, 0xff3a,
@@ -6684,7 +6850,7 @@ static const OnigCodePoint CR_Cased[] = {
 
 /* 'Case_Ignorable': Derived Property */
 static const OnigCodePoint CR_Case_Ignorable[] = {
-	266,
+	277,
 	0x0027, 0x0027,
 	0x002e, 0x002e,
 	0x003a, 0x003a,
@@ -6711,9 +6877,10 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x0600, 0x0603,
 	0x0610, 0x061a,
 	0x0640, 0x0640,
-	0x064b, 0x065e,
+	0x064b, 0x065f,
 	0x0670, 0x0670,
-	0x06d6, 0x06e8,
+	0x06d6, 0x06dd,
+	0x06df, 0x06e8,
 	0x06ea, 0x06ed,
 	0x070f, 0x070f,
 	0x0711, 0x0711,
@@ -6722,11 +6889,13 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x07eb, 0x07f5,
 	0x07fa, 0x07fa,
 	0x0816, 0x082d,
+	0x0859, 0x085b,
 	0x0900, 0x0902,
+	0x093a, 0x093a,
 	0x093c, 0x093c,
 	0x0941, 0x0948,
 	0x094d, 0x094d,
-	0x0951, 0x0955,
+	0x0951, 0x0957,
 	0x0962, 0x0963,
 	0x0971, 0x0971,
 	0x0981, 0x0981,
@@ -6789,7 +6958,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x0f71, 0x0f7e,
 	0x0f80, 0x0f84,
 	0x0f86, 0x0f87,
-	0x0f90, 0x0f97,
+	0x0f8d, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fc6, 0x0fc6,
 	0x102d, 0x1030,
@@ -6804,7 +6973,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x108d, 0x108d,
 	0x109d, 0x109d,
 	0x10fc, 0x10fc,
-	0x135f, 0x135f,
+	0x135d, 0x135f,
 	0x1712, 0x1714,
 	0x1732, 0x1734,
 	0x1752, 0x1753,
@@ -6840,6 +7009,10 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x1b80, 0x1b81,
 	0x1ba2, 0x1ba5,
 	0x1ba8, 0x1ba9,
+	0x1be6, 0x1be6,
+	0x1be8, 0x1be9,
+	0x1bed, 0x1bed,
+	0x1bef, 0x1bf1,
 	0x1c2c, 0x1c33,
 	0x1c36, 0x1c37,
 	0x1c78, 0x1c7d,
@@ -6850,7 +7023,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x1d2c, 0x1d61,
 	0x1d78, 0x1d78,
 	0x1d9b, 0x1de6,
-	0x1dfd, 0x1dff,
+	0x1dfc, 0x1dff,
 	0x1fbd, 0x1fbd,
 	0x1fbf, 0x1fc1,
 	0x1fcd, 0x1fcf,
@@ -6866,11 +7039,12 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x206a, 0x206f,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x20d0, 0x20f0,
 	0x2c7d, 0x2c7d,
 	0x2cef, 0x2cf1,
 	0x2d6f, 0x2d6f,
+	0x2d7f, 0x2d7f,
 	0x2de0, 0x2dff,
 	0x2e2f, 0x2e2f,
 	0x3005, 0x3005,
@@ -6918,6 +7092,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0xabe8, 0xabe8,
 	0xabed, 0xabed,
 	0xfb1e, 0xfb1e,
+	0xfbb2, 0xfbc1,
 	0xfe00, 0xfe0f,
 	0xfe13, 0xfe13,
 	0xfe20, 0xfe26,
@@ -6939,6 +7114,8 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x10a0c, 0x10a0f,
 	0x10a38, 0x10a3a,
 	0x10a3f, 0x10a3f,
+	0x11001, 0x11001,
+	0x11038, 0x11046,
 	0x11080, 0x11081,
 	0x110b3, 0x110b6,
 	0x110b9, 0x110ba,
@@ -6955,7 +7132,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 
 /* 'Changes_When_Lowercased': Derived Property */
 static const OnigCodePoint CR_Changes_When_Lowercased[] = {
-	557,
+	566,
 	0x0041, 0x005a,
 	0x00c0, 0x00d6,
 	0x00d8, 0x00de,
@@ -7220,6 +7397,7 @@ static const OnigCodePoint CR_Changes_When_Lowercased[] = {
 	0x0520, 0x0520,
 	0x0522, 0x0522,
 	0x0524, 0x0524,
+	0x0526, 0x0526,
 	0x0531, 0x0556,
 	0x10a0, 0x10c5,
 	0x1e00, 0x1e00,
@@ -7447,6 +7625,7 @@ static const OnigCodePoint CR_Changes_When_Lowercased[] = {
 	0xa65a, 0xa65a,
 	0xa65c, 0xa65c,
 	0xa65e, 0xa65e,
+	0xa660, 0xa660,
 	0xa662, 0xa662,
 	0xa664, 0xa664,
 	0xa666, 0xa666,
@@ -7511,13 +7690,20 @@ static const OnigCodePoint CR_Changes_When_Lowercased[] = {
 	0xa784, 0xa784,
 	0xa786, 0xa786,
 	0xa78b, 0xa78b,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
 	0xff21, 0xff3a,
 	0x10400, 0x10427,
 }; /* CR_Changes_When_Lowercased */
 
 /* 'Changes_When_Uppercased': Derived Property */
 static const OnigCodePoint CR_Changes_When_Uppercased[] = {
-	573,
+	582,
 	0x0061, 0x007a,
 	0x00b5, 0x00b5,
 	0x00df, 0x00f6,
@@ -7667,6 +7853,7 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
 	0x025b, 0x025b,
 	0x0260, 0x0260,
 	0x0263, 0x0263,
+	0x0265, 0x0265,
 	0x0268, 0x0269,
 	0x026b, 0x026b,
 	0x026f, 0x026f,
@@ -7796,6 +7983,7 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
 	0x0521, 0x0521,
 	0x0523, 0x0523,
 	0x0525, 0x0525,
+	0x0527, 0x0527,
 	0x0561, 0x0587,
 	0x1d79, 0x1d79,
 	0x1d7d, 0x1d7d,
@@ -8023,6 +8211,7 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
 	0xa65b, 0xa65b,
 	0xa65d, 0xa65d,
 	0xa65f, 0xa65f,
+	0xa661, 0xa661,
 	0xa663, 0xa663,
 	0xa665, 0xa665,
 	0xa667, 0xa667,
@@ -8087,6 +8276,12 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
 	0xa785, 0xa785,
 	0xa787, 0xa787,
 	0xa78c, 0xa78c,
+	0xa791, 0xa791,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
 	0xff41, 0xff5a,
@@ -8095,7 +8290,7 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
 
 /* 'Changes_When_Titlecased': Derived Property */
 static const OnigCodePoint CR_Changes_When_Titlecased[] = {
-	574,
+	583,
 	0x0061, 0x007a,
 	0x00b5, 0x00b5,
 	0x00df, 0x00f6,
@@ -8246,6 +8441,7 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
 	0x025b, 0x025b,
 	0x0260, 0x0260,
 	0x0263, 0x0263,
+	0x0265, 0x0265,
 	0x0268, 0x0269,
 	0x026b, 0x026b,
 	0x026f, 0x026f,
@@ -8375,6 +8571,7 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
 	0x0521, 0x0521,
 	0x0523, 0x0523,
 	0x0525, 0x0525,
+	0x0527, 0x0527,
 	0x0561, 0x0587,
 	0x1d79, 0x1d79,
 	0x1d7d, 0x1d7d,
@@ -8602,6 +8799,7 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
 	0xa65b, 0xa65b,
 	0xa65d, 0xa65d,
 	0xa65f, 0xa65f,
+	0xa661, 0xa661,
 	0xa663, 0xa663,
 	0xa665, 0xa665,
 	0xa667, 0xa667,
@@ -8666,6 +8864,12 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
 	0xa785, 0xa785,
 	0xa787, 0xa787,
 	0xa78c, 0xa78c,
+	0xa791, 0xa791,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
 	0xff41, 0xff5a,
@@ -8674,7 +8878,7 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
 
 /* 'Changes_When_Casefolded': Derived Property */
 static const OnigCodePoint CR_Changes_When_Casefolded[] = {
-	568,
+	577,
 	0x0041, 0x005a,
 	0x00b5, 0x00b5,
 	0x00c0, 0x00d6,
@@ -8945,6 +9149,7 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
 	0x0520, 0x0520,
 	0x0522, 0x0522,
 	0x0524, 0x0524,
+	0x0526, 0x0526,
 	0x0531, 0x0556,
 	0x0587, 0x0587,
 	0x10a0, 0x10c5,
@@ -9175,6 +9380,7 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
 	0xa65a, 0xa65a,
 	0xa65c, 0xa65c,
 	0xa65e, 0xa65e,
+	0xa660, 0xa660,
 	0xa662, 0xa662,
 	0xa664, 0xa664,
 	0xa666, 0xa666,
@@ -9239,6 +9445,13 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
 	0xa784, 0xa784,
 	0xa786, 0xa786,
 	0xa78b, 0xa78b,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
 	0xff21, 0xff3a,
@@ -9247,7 +9460,7 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
 
 /* 'Changes_When_Casemapped': Derived Property */
 static const OnigCodePoint CR_Changes_When_Casemapped[] = {
-	97,
+	99,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00b5, 0x00b5,
@@ -9268,6 +9481,7 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
 	0x025b, 0x025b,
 	0x0260, 0x0260,
 	0x0263, 0x0263,
+	0x0265, 0x0265,
 	0x0268, 0x0269,
 	0x026b, 0x026b,
 	0x026f, 0x026f,
@@ -9291,7 +9505,7 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
 	0x03f4, 0x03f5,
 	0x03f7, 0x03fb,
 	0x03fd, 0x0481,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0561, 0x0587,
 	0x10a0, 0x10c5,
@@ -9333,13 +9547,14 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
 	0x2c7e, 0x2ce3,
 	0x2ceb, 0x2cee,
 	0x2d00, 0x2d25,
-	0xa640, 0xa65f,
-	0xa662, 0xa66d,
+	0xa640, 0xa66d,
 	0xa680, 0xa697,
 	0xa722, 0xa72f,
 	0xa732, 0xa76f,
 	0xa779, 0xa787,
-	0xa78b, 0xa78c,
+	0xa78b, 0xa78d,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
 	0xff21, 0xff3a,
@@ -9349,7 +9564,7 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
 
 /* 'ID_Start': Derived Property */
 static const OnigCodePoint CR_ID_Start[] = {
-	424,
+	437,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -9371,13 +9586,13 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x038e, 0x03a1,
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x0559,
 	0x0561, 0x0587,
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
-	0x0621, 0x064a,
+	0x0620, 0x064a,
 	0x066e, 0x066f,
 	0x0671, 0x06d3,
 	0x06d5, 0x06d5,
@@ -9396,11 +9611,12 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x081a, 0x081a,
 	0x0824, 0x0824,
 	0x0828, 0x0828,
+	0x0840, 0x0858,
 	0x0904, 0x0939,
 	0x093d, 0x093d,
 	0x0950, 0x0950,
 	0x0958, 0x0961,
-	0x0971, 0x0972,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0x0985, 0x098c,
 	0x098f, 0x0990,
@@ -9469,11 +9685,12 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x0cbd, 0x0cbd,
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce1,
+	0x0cf1, 0x0cf2,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
 	0x0d60, 0x0d61,
 	0x0d7a, 0x0d7f,
 	0x0d85, 0x0d96,
@@ -9504,7 +9721,7 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x0f00, 0x0f00,
 	0x0f40, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8b,
+	0x0f88, 0x0f8c,
 	0x1000, 0x102a,
 	0x103f, 0x103f,
 	0x1050, 0x1055,
@@ -9565,6 +9782,7 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x1b45, 0x1b4b,
 	0x1b83, 0x1ba0,
 	0x1bae, 0x1baf,
+	0x1bc0, 0x1be5,
 	0x1c00, 0x1c23,
 	0x1c4d, 0x1c4f,
 	0x1c5a, 0x1c7d,
@@ -9592,7 +9810,7 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x1ff6, 0x1ffc,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x2102, 0x2102,
 	0x2107, 0x2107,
 	0x210a, 0x2113,
@@ -9632,7 +9850,7 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x30fc, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -9641,14 +9859,15 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0xa500, 0xa60c,
 	0xa610, 0xa61f,
 	0xa62a, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa66e,
+	0xa640, 0xa66e,
 	0xa67f, 0xa697,
 	0xa6a0, 0xa6ef,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa801,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa801,
 	0xa803, 0xa805,
 	0xa807, 0xa80a,
 	0xa80c, 0xa822,
@@ -9673,6 +9892,11 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0xaac0, 0xaac0,
 	0xaac2, 0xaac2,
 	0xaadb, 0xaadd,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabe2,
 	0xac00, 0xd7a3,
 	0xd7b0, 0xd7c6,
@@ -9737,10 +9961,13 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11003, 0x11037,
 	0x11083, 0x110af,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d400, 0x1d454,
 	0x1d456, 0x1d49c,
 	0x1d49e, 0x1d49f,
@@ -9773,12 +10000,13 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x1d7c4, 0x1d7cb,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_ID_Start */
 
 /* 'ID_Continue': Derived Property */
 static const OnigCodePoint CR_ID_Continue[] = {
-	506,
+	514,
 	0x0030, 0x0039,
 	0x0041, 0x005a,
 	0x005f, 0x005f,
@@ -9803,7 +10031,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
 	0x0483, 0x0487,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x0559,
 	0x0561, 0x0587,
@@ -9815,8 +10043,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
 	0x0610, 0x061a,
-	0x0621, 0x065e,
-	0x0660, 0x0669,
+	0x0620, 0x0669,
 	0x066e, 0x06d3,
 	0x06d5, 0x06dc,
 	0x06df, 0x06e8,
@@ -9827,12 +10054,10 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x07c0, 0x07f5,
 	0x07fa, 0x07fa,
 	0x0800, 0x082d,
-	0x0900, 0x0939,
-	0x093c, 0x094e,
-	0x0950, 0x0955,
-	0x0958, 0x0963,
+	0x0840, 0x085b,
+	0x0900, 0x0963,
 	0x0966, 0x096f,
-	0x0971, 0x0972,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
@@ -9934,14 +10159,14 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
+	0x0d4a, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d66, 0x0d6f,
@@ -9987,8 +10212,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x0f3e, 0x0f47,
 	0x0f49, 0x0f6c,
 	0x0f71, 0x0f84,
-	0x0f86, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f86, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fc6, 0x0fc6,
 	0x1000, 0x1049,
@@ -10012,7 +10236,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x12d8, 0x1310,
 	0x1312, 0x1315,
 	0x1318, 0x135a,
-	0x135f, 0x135f,
+	0x135d, 0x135f,
 	0x1369, 0x1371,
 	0x1380, 0x138f,
 	0x13a0, 0x13f4,
@@ -10057,13 +10281,14 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x1b6b, 0x1b73,
 	0x1b80, 0x1baa,
 	0x1bae, 0x1bb9,
+	0x1bc0, 0x1bf3,
 	0x1c00, 0x1c37,
 	0x1c40, 0x1c49,
 	0x1c4d, 0x1c7d,
 	0x1cd0, 0x1cd2,
 	0x1cd4, 0x1cf2,
 	0x1d00, 0x1de6,
-	0x1dfd, 0x1f15,
+	0x1dfc, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
 	0x1f48, 0x1f4d,
@@ -10086,7 +10311,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x2054, 0x2054,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x20d0, 0x20dc,
 	0x20e1, 0x20e1,
 	0x20e5, 0x20f0,
@@ -10110,7 +10335,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x2d00, 0x2d25,
 	0x2d30, 0x2d65,
 	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
+	0x2d7f, 0x2d96,
 	0x2da0, 0x2da6,
 	0x2da8, 0x2dae,
 	0x2db0, 0x2db6,
@@ -10130,7 +10355,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x30fc, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -10138,15 +10363,16 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0xa4d0, 0xa4fd,
 	0xa500, 0xa60c,
 	0xa610, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa66f,
+	0xa640, 0xa66f,
 	0xa67c, 0xa67d,
 	0xa67f, 0xa697,
 	0xa6a0, 0xa6f1,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa827,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa827,
 	0xa840, 0xa873,
 	0xa880, 0xa8c4,
 	0xa8d0, 0xa8d9,
@@ -10164,6 +10390,11 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0xaa7a, 0xaa7b,
 	0xaa80, 0xaac2,
 	0xaadb, 0xaadd,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabea,
 	0xabec, 0xabed,
 	0xabf0, 0xabf9,
@@ -10240,10 +10471,14 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11000, 0x11046,
+	0x11066, 0x1106f,
 	0x11080, 0x110ba,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d165, 0x1d169,
 	0x1d16d, 0x1d172,
 	0x1d17b, 0x1d182,
@@ -10283,13 +10518,14 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x1d7ce, 0x1d7ff,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 	0xe0100, 0xe01ef,
 }; /* CR_ID_Continue */
 
 /* 'XID_Start': Derived Property */
 static const OnigCodePoint CR_XID_Start[] = {
-	431,
+	444,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -10311,13 +10547,13 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x038e, 0x03a1,
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x0559,
 	0x0561, 0x0587,
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
-	0x0621, 0x064a,
+	0x0620, 0x064a,
 	0x066e, 0x066f,
 	0x0671, 0x06d3,
 	0x06d5, 0x06d5,
@@ -10336,11 +10572,12 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x081a, 0x081a,
 	0x0824, 0x0824,
 	0x0828, 0x0828,
+	0x0840, 0x0858,
 	0x0904, 0x0939,
 	0x093d, 0x093d,
 	0x0950, 0x0950,
 	0x0958, 0x0961,
-	0x0971, 0x0972,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0x0985, 0x098c,
 	0x098f, 0x0990,
@@ -10409,11 +10646,12 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x0cbd, 0x0cbd,
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce1,
+	0x0cf1, 0x0cf2,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
 	0x0d60, 0x0d61,
 	0x0d7a, 0x0d7f,
 	0x0d85, 0x0d96,
@@ -10444,7 +10682,7 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x0f00, 0x0f00,
 	0x0f40, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8b,
+	0x0f88, 0x0f8c,
 	0x1000, 0x102a,
 	0x103f, 0x103f,
 	0x1050, 0x1055,
@@ -10505,6 +10743,7 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x1b45, 0x1b4b,
 	0x1b83, 0x1ba0,
 	0x1bae, 0x1baf,
+	0x1bc0, 0x1be5,
 	0x1c00, 0x1c23,
 	0x1c4d, 0x1c4f,
 	0x1c5a, 0x1c7d,
@@ -10532,7 +10771,7 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x1ff6, 0x1ffc,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x2102, 0x2102,
 	0x2107, 0x2107,
 	0x210a, 0x2113,
@@ -10572,7 +10811,7 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x30fc, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -10581,14 +10820,15 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0xa500, 0xa60c,
 	0xa610, 0xa61f,
 	0xa62a, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa66e,
+	0xa640, 0xa66e,
 	0xa67f, 0xa697,
 	0xa6a0, 0xa6ef,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa801,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa801,
 	0xa803, 0xa805,
 	0xa807, 0xa80a,
 	0xa80c, 0xa822,
@@ -10613,6 +10853,11 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0xaac0, 0xaac0,
 	0xaac2, 0xaac2,
 	0xaadb, 0xaadd,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabe2,
 	0xac00, 0xd7a3,
 	0xd7b0, 0xd7c6,
@@ -10684,10 +10929,13 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11003, 0x11037,
 	0x11083, 0x110af,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d400, 0x1d454,
 	0x1d456, 0x1d49c,
 	0x1d49e, 0x1d49f,
@@ -10720,12 +10968,13 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x1d7c4, 0x1d7cb,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_XID_Start */
 
 /* 'XID_Continue': Derived Property */
 static const OnigCodePoint CR_XID_Continue[] = {
-	513,
+	521,
 	0x0030, 0x0039,
 	0x0041, 0x005a,
 	0x005f, 0x005f,
@@ -10750,7 +10999,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
 	0x0483, 0x0487,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x0559,
 	0x0561, 0x0587,
@@ -10762,8 +11011,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
 	0x0610, 0x061a,
-	0x0621, 0x065e,
-	0x0660, 0x0669,
+	0x0620, 0x0669,
 	0x066e, 0x06d3,
 	0x06d5, 0x06dc,
 	0x06df, 0x06e8,
@@ -10774,12 +11022,10 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x07c0, 0x07f5,
 	0x07fa, 0x07fa,
 	0x0800, 0x082d,
-	0x0900, 0x0939,
-	0x093c, 0x094e,
-	0x0950, 0x0955,
-	0x0958, 0x0963,
+	0x0840, 0x085b,
+	0x0900, 0x0963,
 	0x0966, 0x096f,
-	0x0971, 0x0972,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
@@ -10881,14 +11127,14 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
+	0x0d4a, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d66, 0x0d6f,
@@ -10934,8 +11180,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x0f3e, 0x0f47,
 	0x0f49, 0x0f6c,
 	0x0f71, 0x0f84,
-	0x0f86, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f86, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fc6, 0x0fc6,
 	0x1000, 0x1049,
@@ -10959,7 +11204,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x12d8, 0x1310,
 	0x1312, 0x1315,
 	0x1318, 0x135a,
-	0x135f, 0x135f,
+	0x135d, 0x135f,
 	0x1369, 0x1371,
 	0x1380, 0x138f,
 	0x13a0, 0x13f4,
@@ -11004,13 +11249,14 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x1b6b, 0x1b73,
 	0x1b80, 0x1baa,
 	0x1bae, 0x1bb9,
+	0x1bc0, 0x1bf3,
 	0x1c00, 0x1c37,
 	0x1c40, 0x1c49,
 	0x1c4d, 0x1c7d,
 	0x1cd0, 0x1cd2,
 	0x1cd4, 0x1cf2,
 	0x1d00, 0x1de6,
-	0x1dfd, 0x1f15,
+	0x1dfc, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
 	0x1f48, 0x1f4d,
@@ -11033,7 +11279,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x2054, 0x2054,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x20d0, 0x20dc,
 	0x20e1, 0x20e1,
 	0x20e5, 0x20f0,
@@ -11057,7 +11303,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x2d00, 0x2d25,
 	0x2d30, 0x2d65,
 	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
+	0x2d7f, 0x2d96,
 	0x2da0, 0x2da6,
 	0x2da8, 0x2dae,
 	0x2db0, 0x2db6,
@@ -11078,7 +11324,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x30fc, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -11086,15 +11332,16 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0xa4d0, 0xa4fd,
 	0xa500, 0xa60c,
 	0xa610, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa66f,
+	0xa640, 0xa66f,
 	0xa67c, 0xa67d,
 	0xa67f, 0xa697,
 	0xa6a0, 0xa6f1,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa827,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa827,
 	0xa840, 0xa873,
 	0xa880, 0xa8c4,
 	0xa8d0, 0xa8d9,
@@ -11112,6 +11359,11 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0xaa7a, 0xaa7b,
 	0xaa80, 0xaac2,
 	0xaadb, 0xaadd,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabea,
 	0xabec, 0xabed,
 	0xabf0, 0xabf9,
@@ -11194,10 +11446,14 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11000, 0x11046,
+	0x11066, 0x1106f,
 	0x11080, 0x110ba,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d165, 0x1d169,
 	0x1d16d, 0x1d172,
 	0x1d17b, 0x1d182,
@@ -11237,6 +11493,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x1d7ce, 0x1d7ff,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 	0xe0100, 0xe01ef,
 }; /* CR_XID_Continue */
@@ -11263,7 +11520,7 @@ static const OnigCodePoint CR_Default_Ignorable_Code_Point[] = {
 
 /* 'Grapheme_Extend': Derived Property */
 static const OnigCodePoint CR_Grapheme_Extend[] = {
-	206,
+	215,
 	0x0300, 0x036f,
 	0x0483, 0x0489,
 	0x0591, 0x05bd,
@@ -11272,10 +11529,10 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x05c4, 0x05c5,
 	0x05c7, 0x05c7,
 	0x0610, 0x061a,
-	0x064b, 0x065e,
+	0x064b, 0x065f,
 	0x0670, 0x0670,
 	0x06d6, 0x06dc,
-	0x06de, 0x06e4,
+	0x06df, 0x06e4,
 	0x06e7, 0x06e8,
 	0x06ea, 0x06ed,
 	0x0711, 0x0711,
@@ -11286,11 +11543,13 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x081b, 0x0823,
 	0x0825, 0x0827,
 	0x0829, 0x082d,
+	0x0859, 0x085b,
 	0x0900, 0x0902,
+	0x093a, 0x093a,
 	0x093c, 0x093c,
 	0x0941, 0x0948,
 	0x094d, 0x094d,
-	0x0951, 0x0955,
+	0x0951, 0x0957,
 	0x0962, 0x0963,
 	0x0981, 0x0981,
 	0x09bc, 0x09bc,
@@ -11361,7 +11620,7 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x0f71, 0x0f7e,
 	0x0f80, 0x0f84,
 	0x0f86, 0x0f87,
-	0x0f90, 0x0f97,
+	0x0f8d, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fc6, 0x0fc6,
 	0x102d, 0x1030,
@@ -11375,7 +11634,7 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x1085, 0x1086,
 	0x108d, 0x108d,
 	0x109d, 0x109d,
-	0x135f, 0x135f,
+	0x135d, 0x135f,
 	0x1712, 0x1714,
 	0x1732, 0x1734,
 	0x1752, 0x1753,
@@ -11407,6 +11666,10 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x1b80, 0x1b81,
 	0x1ba2, 0x1ba5,
 	0x1ba8, 0x1ba9,
+	0x1be6, 0x1be6,
+	0x1be8, 0x1be9,
+	0x1bed, 0x1bed,
+	0x1bef, 0x1bf1,
 	0x1c2c, 0x1c33,
 	0x1c36, 0x1c37,
 	0x1cd0, 0x1cd2,
@@ -11414,10 +11677,11 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x1ce2, 0x1ce8,
 	0x1ced, 0x1ced,
 	0x1dc0, 0x1de6,
-	0x1dfd, 0x1dff,
+	0x1dfc, 0x1dff,
 	0x200c, 0x200d,
 	0x20d0, 0x20f0,
 	0x2cef, 0x2cf1,
+	0x2d7f, 0x2d7f,
 	0x2de0, 0x2dff,
 	0x302a, 0x302f,
 	0x3099, 0x309a,
@@ -11459,6 +11723,8 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x10a0c, 0x10a0f,
 	0x10a38, 0x10a3a,
 	0x10a3f, 0x10a3f,
+	0x11001, 0x11001,
+	0x11038, 0x11046,
 	0x11080, 0x11081,
 	0x110b3, 0x110b6,
 	0x110b9, 0x110ba,
@@ -11474,7 +11740,7 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 
 /* 'Grapheme_Base': Derived Property */
 static const OnigCodePoint CR_Grapheme_Base[] = {
-	567,
+	596,
 	0x0020, 0x007e,
 	0x00a0, 0x00ac,
 	0x00ae, 0x02ff,
@@ -11484,7 +11750,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x038c, 0x038c,
 	0x038e, 0x03a1,
 	0x03a3, 0x0482,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x055f,
 	0x0561, 0x0587,
@@ -11497,10 +11763,10 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x05f0, 0x05f4,
 	0x0606, 0x060f,
 	0x061b, 0x061b,
-	0x061e, 0x061f,
-	0x0621, 0x064a,
+	0x061e, 0x064a,
 	0x0660, 0x066f,
 	0x0671, 0x06d5,
+	0x06de, 0x06de,
 	0x06e5, 0x06e6,
 	0x06e9, 0x06e9,
 	0x06ee, 0x070d,
@@ -11515,13 +11781,15 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x0824, 0x0824,
 	0x0828, 0x0828,
 	0x0830, 0x083e,
+	0x0840, 0x0858,
+	0x085e, 0x085e,
 	0x0903, 0x0939,
+	0x093b, 0x093b,
 	0x093d, 0x0940,
 	0x0949, 0x094c,
-	0x094e, 0x094e,
-	0x0950, 0x0950,
+	0x094e, 0x0950,
 	0x0958, 0x0961,
-	0x0964, 0x0972,
+	0x0964, 0x0977,
 	0x0979, 0x097f,
 	0x0982, 0x0983,
 	0x0985, 0x098c,
@@ -11578,7 +11846,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x0b4b, 0x0b4c,
 	0x0b5c, 0x0b5d,
 	0x0b5f, 0x0b61,
-	0x0b66, 0x0b71,
+	0x0b66, 0x0b77,
 	0x0b83, 0x0b83,
 	0x0b85, 0x0b8a,
 	0x0b8e, 0x0b90,
@@ -11625,12 +11893,12 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d3d,
 	0x0d3f, 0x0d40,
 	0x0d46, 0x0d48,
 	0x0d4a, 0x0d4c,
+	0x0d4e, 0x0d4e,
 	0x0d60, 0x0d61,
 	0x0d66, 0x0d75,
 	0x0d79, 0x0d7f,
@@ -11673,10 +11941,10 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x0f49, 0x0f6c,
 	0x0f7f, 0x0f7f,
 	0x0f85, 0x0f85,
-	0x0f88, 0x0f8b,
+	0x0f88, 0x0f8c,
 	0x0fbe, 0x0fc5,
 	0x0fc7, 0x0fcc,
-	0x0fce, 0x0fd8,
+	0x0fce, 0x0fda,
 	0x1000, 0x102c,
 	0x1031, 0x1031,
 	0x1038, 0x1038,
@@ -11764,7 +12032,12 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x1ba6, 0x1ba7,
 	0x1baa, 0x1baa,
 	0x1bae, 0x1bb9,
-	0x1c00, 0x1c2b,
+	0x1bc0, 0x1be5,
+	0x1be7, 0x1be7,
+	0x1bea, 0x1bec,
+	0x1bee, 0x1bee,
+	0x1bf2, 0x1bf3,
+	0x1bfc, 0x1c2b,
 	0x1c34, 0x1c35,
 	0x1c3b, 0x1c49,
 	0x1c4d, 0x1c7f,
@@ -11794,36 +12067,23 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x202f, 0x205f,
 	0x2070, 0x2071,
 	0x2074, 0x208e,
-	0x2090, 0x2094,
-	0x20a0, 0x20b8,
+	0x2090, 0x209c,
+	0x20a0, 0x20b9,
 	0x2100, 0x2189,
-	0x2190, 0x23e8,
+	0x2190, 0x23f3,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
-	0x2460, 0x26cd,
-	0x26cf, 0x26e1,
-	0x26e3, 0x26e3,
-	0x26e8, 0x26ff,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
+	0x2460, 0x26ff,
+	0x2701, 0x27ca,
 	0x27cc, 0x27cc,
-	0x27d0, 0x2b4c,
+	0x27ce, 0x2b4c,
 	0x2b50, 0x2b59,
 	0x2c00, 0x2c2e,
 	0x2c30, 0x2c5e,
 	0x2c60, 0x2cee,
 	0x2cf9, 0x2d25,
 	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
+	0x2d6f, 0x2d70,
 	0x2d80, 0x2d96,
 	0x2da0, 0x2da6,
 	0x2da8, 0x2dae,
@@ -11844,7 +12104,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x309b, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x3190, 0x31b7,
+	0x3190, 0x31ba,
 	0x31c0, 0x31e3,
 	0x31f0, 0x321e,
 	0x3220, 0x32fe,
@@ -11853,14 +12113,15 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
 	0xa4d0, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa66e,
+	0xa640, 0xa66e,
 	0xa673, 0xa673,
 	0xa67e, 0xa697,
 	0xa6a0, 0xa6ef,
 	0xa6f2, 0xa6f7,
-	0xa700, 0xa78c,
-	0xa7fb, 0xa801,
+	0xa700, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa801,
 	0xa803, 0xa805,
 	0xa807, 0xa80a,
 	0xa80c, 0xa824,
@@ -11895,6 +12156,11 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0xaac0, 0xaac0,
 	0xaac2, 0xaac2,
 	0xaadb, 0xaadf,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabe4,
 	0xabe6, 0xabe7,
 	0xabe9, 0xabec,
@@ -11913,7 +12179,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0xfb3e, 0xfb3e,
 	0xfb40, 0xfb41,
 	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
+	0xfb46, 0xfbc1,
 	0xfbd3, 0xfd3f,
 	0xfd50, 0xfd8f,
 	0xfd92, 0xfdc7,
@@ -11978,6 +12244,10 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x10b78, 0x10b7f,
 	0x10c00, 0x10c48,
 	0x10e60, 0x10e7e,
+	0x11000, 0x11000,
+	0x11002, 0x11037,
+	0x11047, 0x1104d,
+	0x11052, 0x1106f,
 	0x11082, 0x110b2,
 	0x110b7, 0x110b8,
 	0x110bb, 0x110bc,
@@ -11986,6 +12256,8 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x12400, 0x12462,
 	0x12470, 0x12473,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d000, 0x1d0f5,
 	0x1d100, 0x1d126,
 	0x1d129, 0x1d164,
@@ -12021,32 +12293,55 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x1d7ce, 0x1d7ff,
 	0x1f000, 0x1f02b,
 	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
 	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,
+	0x1f130, 0x1f169,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
 	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f5ff,
+	0x1f601, 0x1f610,
+	0x1f612, 0x1f614,
+	0x1f616, 0x1f616,
+	0x1f618, 0x1f618,
+	0x1f61a, 0x1f61a,
+	0x1f61c, 0x1f61e,
+	0x1f620, 0x1f625,
+	0x1f628, 0x1f62b,
+	0x1f62d, 0x1f62d,
+	0x1f630, 0x1f633,
+	0x1f635, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_Grapheme_Base */
 
 /* 'Grapheme_Link': Derived Property */
 static const OnigCodePoint CR_Grapheme_Link[] = {
-	26,
+	29,
 	0x094d, 0x094d,
 	0x09cd, 0x09cd,
 	0x0a4d, 0x0a4d,
@@ -12066,18 +12361,21 @@ static const OnigCodePoint CR_Grapheme_Link[] = {
 	0x1a60, 0x1a60,
 	0x1b44, 0x1b44,
 	0x1baa, 0x1baa,
+	0x1bf2, 0x1bf3,
+	0x2d7f, 0x2d7f,
 	0xa806, 0xa806,
 	0xa8c4, 0xa8c4,
 	0xa953, 0xa953,
 	0xa9c0, 0xa9c0,
 	0xabed, 0xabed,
 	0x10a3f, 0x10a3f,
+	0x11046, 0x11046,
 	0x110b9, 0x110b9,
 }; /* CR_Grapheme_Link */
 
 /* 'Common': Script */
 static const OnigCodePoint CR_Common[] = {
-	159,
+	169,
 	0x0000, 0x0040,
 	0x005b, 0x0060,
 	0x007b, 0x00a9,
@@ -12086,13 +12384,13 @@ static const OnigCodePoint CR_Common[] = {
 	0x00d7, 0x00d7,
 	0x00f7, 0x00f7,
 	0x02b9, 0x02df,
-	0x02e5, 0x02ff,
+	0x02e5, 0x02e9,
+	0x02ec, 0x02ff,
 	0x0374, 0x0374,
 	0x037e, 0x037e,
 	0x0385, 0x0385,
 	0x0387, 0x0387,
 	0x0589, 0x0589,
-	0x0600, 0x0603,
 	0x060c, 0x060c,
 	0x061b, 0x061b,
 	0x061f, 0x061f,
@@ -12101,7 +12399,6 @@ static const OnigCodePoint CR_Common[] = {
 	0x06dd, 0x06dd,
 	0x0964, 0x0965,
 	0x0970, 0x0970,
-	0x0cf1, 0x0cf2,
 	0x0e3f, 0x0e3f,
 	0x0fd5, 0x0fd8,
 	0x10fb, 0x10fb,
@@ -12118,33 +12415,20 @@ static const OnigCodePoint CR_Common[] = {
 	0x206a, 0x2070,
 	0x2074, 0x207e,
 	0x2080, 0x208e,
-	0x20a0, 0x20b8,
+	0x20a0, 0x20b9,
 	0x2100, 0x2125,
 	0x2127, 0x2129,
 	0x212c, 0x2131,
 	0x2133, 0x214d,
 	0x214f, 0x215f,
 	0x2189, 0x2189,
-	0x2190, 0x23e8,
+	0x2190, 0x23f3,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
-	0x2460, 0x26cd,
-	0x26cf, 0x26e1,
-	0x26e3, 0x26e3,
-	0x26e8, 0x26ff,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
+	0x2460, 0x26ff,
+	0x2701, 0x27ca,
 	0x27cc, 0x27cc,
-	0x27d0, 0x27ff,
+	0x27ce, 0x27ff,
 	0x2900, 0x2b4c,
 	0x2b50, 0x2b59,
 	0x2e00, 0x2e31,
@@ -12218,30 +12502,54 @@ static const OnigCodePoint CR_Common[] = {
 	0x1d7ce, 0x1d7ff,
 	0x1f000, 0x1f02b,
 	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
 	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,
+	0x1f130, 0x1f169,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f1ff,
+	0x1f201, 0x1f202,
+	0x1f210, 0x1f23a,
 	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f5ff,
+	0x1f601, 0x1f610,
+	0x1f612, 0x1f614,
+	0x1f616, 0x1f616,
+	0x1f618, 0x1f618,
+	0x1f61a, 0x1f61a,
+	0x1f61c, 0x1f61e,
+	0x1f620, 0x1f625,
+	0x1f628, 0x1f62b,
+	0x1f62d, 0x1f62d,
+	0x1f630, 0x1f633,
+	0x1f635, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
 	0xe0001, 0xe0001,
 	0xe0020, 0xe007f,
 }; /* CR_Common */
 
 /* 'Latin': Script */
 static const OnigCodePoint CR_Latin[] = {
-	28,
+	30,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -12258,15 +12566,17 @@ static const OnigCodePoint CR_Latin[] = {
 	0x1e00, 0x1eff,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x212a, 0x212b,
 	0x2132, 0x2132,
 	0x214e, 0x214e,
 	0x2160, 0x2188,
 	0x2c60, 0x2c7f,
 	0xa722, 0xa787,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa7ff,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa7ff,
 	0xfb00, 0xfb06,
 	0xff21, 0xff3a,
 	0xff41, 0xff5a,
@@ -12312,14 +12622,13 @@ static const OnigCodePoint CR_Greek[] = {
 
 /* 'Cyrillic': Script */
 static const OnigCodePoint CR_Cyrillic[] = {
-	8,
+	7,
 	0x0400, 0x0484,
-	0x0487, 0x0525,
+	0x0487, 0x0527,
 	0x1d2b, 0x1d2b,
 	0x1d78, 0x1d78,
 	0x2de0, 0x2dff,
-	0xa640, 0xa65f,
-	0xa662, 0xa673,
+	0xa640, 0xa673,
 	0xa67c, 0xa697,
 }; /* CR_Cyrillic */
 
@@ -12349,18 +12658,19 @@ static const OnigCodePoint CR_Hebrew[] = {
 
 /* 'Arabic': Script */
 static const OnigCodePoint CR_Arabic[] = {
-	18,
+	19,
+	0x0600, 0x0603,
 	0x0606, 0x060b,
 	0x060d, 0x061a,
 	0x061e, 0x061e,
-	0x0621, 0x063f,
+	0x0620, 0x063f,
 	0x0641, 0x064a,
 	0x0656, 0x065e,
 	0x066a, 0x066f,
 	0x0671, 0x06dc,
 	0x06de, 0x06ff,
 	0x0750, 0x077f,
-	0xfb50, 0xfbb1,
+	0xfb50, 0xfbc1,
 	0xfbd3, 0xfd3d,
 	0xfd50, 0xfd8f,
 	0xfd92, 0xfdc7,
@@ -12386,14 +12696,11 @@ static const OnigCodePoint CR_Thaana[] = {
 
 /* 'Devanagari': Script */
 static const OnigCodePoint CR_Devanagari[] = {
-	9,
-	0x0900, 0x0939,
-	0x093c, 0x094e,
-	0x0950, 0x0950,
-	0x0953, 0x0955,
-	0x0958, 0x0963,
+	6,
+	0x0900, 0x0950,
+	0x0953, 0x0963,
 	0x0966, 0x096f,
-	0x0971, 0x0972,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0xa8e0, 0xa8fb,
 }; /* CR_Devanagari */
@@ -12473,7 +12780,7 @@ static const OnigCodePoint CR_Oriya[] = {
 	0x0b56, 0x0b57,
 	0x0b5c, 0x0b5d,
 	0x0b5f, 0x0b63,
-	0x0b66, 0x0b71,
+	0x0b66, 0x0b77,
 }; /* CR_Oriya */
 
 /* 'Tamil': Script */
@@ -12518,7 +12825,7 @@ static const OnigCodePoint CR_Telugu[] = {
 
 /* 'Kannada': Script */
 static const OnigCodePoint CR_Kannada[] = {
-	13,
+	14,
 	0x0c82, 0x0c83,
 	0x0c85, 0x0c8c,
 	0x0c8e, 0x0c90,
@@ -12532,19 +12839,19 @@ static const OnigCodePoint CR_Kannada[] = {
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
 }; /* CR_Kannada */
 
 /* 'Malayalam': Script */
 static const OnigCodePoint CR_Malayalam[] = {
-	12,
+	11,
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
+	0x0d4a, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d66, 0x0d75,
@@ -12602,11 +12909,11 @@ static const OnigCodePoint CR_Tibetan[] = {
 	7,
 	0x0f00, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f71, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fbe, 0x0fcc,
 	0x0fce, 0x0fd4,
+	0x0fd9, 0x0fda,
 }; /* CR_Tibetan */
 
 /* 'Myanmar': Script */
@@ -12627,8 +12934,9 @@ static const OnigCodePoint CR_Georgian[] = {
 
 /* 'Hangul': Script */
 static const OnigCodePoint CR_Hangul[] = {
-	13,
+	14,
 	0x1100, 0x11ff,
+	0x302e, 0x302f,
 	0x3131, 0x318e,
 	0x3200, 0x321e,
 	0x3260, 0x327e,
@@ -12645,7 +12953,7 @@ static const OnigCodePoint CR_Hangul[] = {
 
 /* 'Ethiopic': Script */
 static const OnigCodePoint CR_Ethiopic[] = {
-	27,
+	32,
 	0x1200, 0x1248,
 	0x124a, 0x124d,
 	0x1250, 0x1256,
@@ -12662,7 +12970,7 @@ static const OnigCodePoint CR_Ethiopic[] = {
 	0x12d8, 0x1310,
 	0x1312, 0x1315,
 	0x1318, 0x135a,
-	0x135f, 0x137c,
+	0x135d, 0x137c,
 	0x1380, 0x1399,
 	0x2d80, 0x2d96,
 	0x2da0, 0x2da6,
@@ -12673,6 +12981,11 @@ static const OnigCodePoint CR_Ethiopic[] = {
 	0x2dc8, 0x2dce,
 	0x2dd0, 0x2dd6,
 	0x2dd8, 0x2dde,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 }; /* CR_Ethiopic */
 
 /* 'Cherokee': Script */
@@ -12723,15 +13036,16 @@ static const OnigCodePoint CR_Mongolian[] = {
 
 /* 'Hiragana': Script */
 static const OnigCodePoint CR_Hiragana[] = {
-	3,
+	4,
 	0x3041, 0x3096,
 	0x309d, 0x309f,
+	0x1b001, 0x1b001,
 	0x1f200, 0x1f200,
 }; /* CR_Hiragana */
 
 /* 'Katakana': Script */
 static const OnigCodePoint CR_Katakana[] = {
-	7,
+	8,
 	0x30a1, 0x30fa,
 	0x30fd, 0x30ff,
 	0x31f0, 0x31ff,
@@ -12739,18 +13053,20 @@ static const OnigCodePoint CR_Katakana[] = {
 	0x3300, 0x3357,
 	0xff66, 0xff6f,
 	0xff71, 0xff9d,
+	0x1b000, 0x1b000,
 }; /* CR_Katakana */
 
 /* 'Bopomofo': Script */
 static const OnigCodePoint CR_Bopomofo[] = {
-	2,
+	3,
+	0x02ea, 0x02eb,
 	0x3105, 0x312d,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 }; /* CR_Bopomofo */
 
 /* 'Han': Script */
 static const OnigCodePoint CR_Han[] = {
-	15,
+	16,
 	0x2e80, 0x2e99,
 	0x2e9b, 0x2ef3,
 	0x2f00, 0x2fd5,
@@ -12765,6 +13081,7 @@ static const OnigCodePoint CR_Han[] = {
 	0xfa70, 0xfad9,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_Han */
 
@@ -12796,10 +13113,11 @@ static const OnigCodePoint CR_Deseret[] = {
 
 /* 'Inherited': Script */
 static const OnigCodePoint CR_Inherited[] = {
-	23,
+	24,
 	0x0300, 0x036f,
 	0x0485, 0x0486,
 	0x064b, 0x0655,
+	0x065f, 0x065f,
 	0x0670, 0x0670,
 	0x0951, 0x0952,
 	0x1cd0, 0x1cd2,
@@ -12807,10 +13125,10 @@ static const OnigCodePoint CR_Inherited[] = {
 	0x1ce2, 0x1ce8,
 	0x1ced, 0x1ced,
 	0x1dc0, 0x1de6,
-	0x1dfd, 0x1dff,
+	0x1dfc, 0x1dff,
 	0x200c, 0x200d,
 	0x20d0, 0x20f0,
-	0x302a, 0x302f,
+	0x302a, 0x302d,
 	0x3099, 0x309a,
 	0xfe00, 0xfe0f,
 	0xfe20, 0xfe26,
@@ -12948,9 +13266,10 @@ static const OnigCodePoint CR_Glagolitic[] = {
 
 /* 'Tifinagh': Script */
 static const OnigCodePoint CR_Tifinagh[] = {
-	2,
+	3,
 	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d7f,
 }; /* CR_Tifinagh */
 
 /* 'Syloti_Nagri': Script */
@@ -13133,8 +13452,9 @@ static const OnigCodePoint CR_Lisu[] = {
 
 /* 'Bamum': Script */
 static const OnigCodePoint CR_Bamum[] = {
-	1,
+	2,
 	0xa6a0, 0xa6f7,
+	0x16800, 0x16a38,
 }; /* CR_Bamum */
 
 /* 'Javanese': Script */
@@ -13191,6 +13511,27 @@ static const OnigCodePoint CR_Kaithi[] = {
 	0x11080, 0x110c1,
 }; /* CR_Kaithi */
 
+/* 'Batak': Script */
+static const OnigCodePoint CR_Batak[] = {
+	2,
+	0x1bc0, 0x1bf3,
+	0x1bfc, 0x1bff,
+}; /* CR_Batak */
+
+/* 'Brahmi': Script */
+static const OnigCodePoint CR_Brahmi[] = {
+	2,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+}; /* CR_Brahmi */
+
+/* 'Mandaic': Script */
+static const OnigCodePoint CR_Mandaic[] = {
+	2,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+}; /* CR_Mandaic */
+
 /* 'White_Space': Binary Property */
 static const OnigCodePoint CR_White_Space[] = {
 	11,
@@ -13278,7 +13619,7 @@ static const OnigCodePoint CR_Quotation_Mark[] = {
 
 /* 'Terminal_Punctuation': Binary Property */
 static const OnigCodePoint CR_Terminal_Punctuation[] = {
-	65,
+	67,
 	0x0021, 0x0021,
 	0x002c, 0x002c,
 	0x002e, 0x002e,
@@ -13296,6 +13637,7 @@ static const OnigCodePoint CR_Terminal_Punctuation[] = {
 	0x070c, 0x070c,
 	0x07f8, 0x07f9,
 	0x0830, 0x083e,
+	0x085e, 0x085e,
 	0x0964, 0x0965,
 	0x0e5a, 0x0e5b,
 	0x0f08, 0x0f08,
@@ -13342,13 +13684,14 @@ static const OnigCodePoint CR_Terminal_Punctuation[] = {
 	0x10857, 0x10857,
 	0x1091f, 0x1091f,
 	0x10b3a, 0x10b3f,
+	0x11047, 0x1104d,
 	0x110be, 0x110c1,
 	0x12470, 0x12473,
 }; /* CR_Terminal_Punctuation */
 
 /* 'Other_Math': Binary Property */
 static const OnigCodePoint CR_Other_Math[] = {
-	99,
+	100,
 	0x005e, 0x005e,
 	0x03d0, 0x03d2,
 	0x03d5, 0x03d5,
@@ -13365,6 +13708,7 @@ static const OnigCodePoint CR_Other_Math[] = {
 	0x20e5, 0x20e6,
 	0x20eb, 0x20ef,
 	0x2102, 0x2102,
+	0x2107, 0x2107,
 	0x210a, 0x2113,
 	0x2115, 0x2115,
 	0x2119, 0x211d,
@@ -13471,7 +13815,7 @@ static const OnigCodePoint CR_ASCII_Hex_Digit[] = {
 
 /* 'Other_Alphabetic': Binary Property */
 static const OnigCodePoint CR_Other_Alphabetic[] = {
-	141,
+	145,
 	0x0345, 0x0345,
 	0x05b0, 0x05bd,
 	0x05bf, 0x05bf,
@@ -13480,7 +13824,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0x05c7, 0x05c7,
 	0x0610, 0x061a,
 	0x064b, 0x0657,
-	0x0659, 0x065e,
+	0x0659, 0x065f,
 	0x0670, 0x0670,
 	0x06d6, 0x06dc,
 	0x06e1, 0x06e4,
@@ -13494,9 +13838,10 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0x0825, 0x0827,
 	0x0829, 0x082c,
 	0x0900, 0x0903,
+	0x093a, 0x093b,
 	0x093e, 0x094c,
-	0x094e, 0x094e,
-	0x0955, 0x0955,
+	0x094e, 0x094f,
+	0x0955, 0x0957,
 	0x0962, 0x0963,
 	0x0981, 0x0983,
 	0x09be, 0x09c4,
@@ -13558,7 +13903,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0x0ebb, 0x0ebc,
 	0x0ecd, 0x0ecd,
 	0x0f71, 0x0f81,
-	0x0f90, 0x0f97,
+	0x0f8d, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x102b, 0x1036,
 	0x1038, 0x1038,
@@ -13588,6 +13933,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0x1b35, 0x1b43,
 	0x1b80, 0x1b82,
 	0x1ba1, 0x1ba9,
+	0x1be7, 0x1bf1,
 	0x1c24, 0x1c35,
 	0x1cf2, 0x1cf2,
 	0x24b6, 0x24e9,
@@ -13598,7 +13944,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0xa926, 0xa92a,
 	0xa947, 0xa952,
 	0xa980, 0xa983,
-	0xa9b3, 0xa9bf,
+	0xa9b4, 0xa9bf,
 	0xaa29, 0xaa36,
 	0xaa43, 0xaa43,
 	0xaa4c, 0xaa4d,
@@ -13611,13 +13957,15 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0x10a01, 0x10a03,
 	0x10a05, 0x10a06,
 	0x10a0c, 0x10a0f,
+	0x11000, 0x11002,
+	0x11038, 0x11045,
 	0x11082, 0x11082,
 	0x110b0, 0x110b8,
 }; /* CR_Other_Alphabetic */
 
 /* 'Ideographic': Binary Property */
 static const OnigCodePoint CR_Ideographic[] = {
-	11,
+	12,
 	0x3006, 0x3007,
 	0x3021, 0x3029,
 	0x3038, 0x303a,
@@ -13628,6 +13976,7 @@ static const OnigCodePoint CR_Ideographic[] = {
 	0xfa70, 0xfad9,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_Ideographic */
 
@@ -13870,7 +14219,7 @@ static const OnigCodePoint CR_Radical[] = {
 
 /* 'Unified_Ideograph': Binary Property */
 static const OnigCodePoint CR_Unified_Ideograph[] = {
-	11,
+	12,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
 	0xfa0e, 0xfa0f,
@@ -13882,6 +14231,7 @@ static const OnigCodePoint CR_Unified_Ideograph[] = {
 	0xfa27, 0xfa29,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 }; /* CR_Unified_Ideograph */
 
 /* 'Other_Default_Ignorable_Code_Point': Binary Property */
@@ -13901,8 +14251,9 @@ static const OnigCodePoint CR_Other_Default_Ignorable_Code_Point[] = {
 
 /* 'Deprecated': Binary Property */
 static const OnigCodePoint CR_Deprecated[] = {
-	8,
+	9,
 	0x0149, 0x0149,
+	0x0673, 0x0673,
 	0x0f77, 0x0f77,
 	0x0f79, 0x0f79,
 	0x17a3, 0x17a4,
@@ -13968,15 +14319,16 @@ static const OnigCodePoint CR_Other_ID_Start[] = {
 
 /* 'Other_ID_Continue': Binary Property */
 static const OnigCodePoint CR_Other_ID_Continue[] = {
-	3,
+	4,
 	0x00b7, 0x00b7,
 	0x0387, 0x0387,
 	0x1369, 0x1371,
+	0x19da, 0x19da,
 }; /* CR_Other_ID_Continue */
 
 /* 'STerm': Binary Property */
 static const OnigCodePoint CR_STerm[] = {
-	43,
+	47,
 	0x0021, 0x0021,
 	0x002e, 0x002e,
 	0x003f, 0x003f,
@@ -13992,9 +14344,11 @@ static const OnigCodePoint CR_STerm[] = {
 	0x1362, 0x1362,
 	0x1367, 0x1368,
 	0x166e, 0x166e,
+	0x1735, 0x1736,
 	0x1803, 0x1803,
 	0x1809, 0x1809,
 	0x1944, 0x1945,
+	0x1aa8, 0x1aab,
 	0x1b5a, 0x1b5b,
 	0x1b5e, 0x1b5f,
 	0x1c3b, 0x1c3c,
@@ -14019,6 +14373,8 @@ static const OnigCodePoint CR_STerm[] = {
 	0xff0e, 0xff0e,
 	0xff1f, 0xff1f,
 	0xff61, 0xff61,
+	0x10a56, 0x10a57,
+	0x11047, 0x11048,
 	0x110be, 0x110c1,
 }; /* CR_STerm */
 
@@ -14105,14 +14461,14 @@ static const OnigCodePoint CR_Blank[] = {
 
 /* 'Graph': [[:Graph:]] */
 static const OnigCodePoint CR_Graph[] = {
-	490,
+	506,
 	0x0021, 0x007e,
 	0x00a1, 0x0377,
 	0x037a, 0x037e,
 	0x0384, 0x038a,
 	0x038c, 0x038c,
 	0x038e, 0x03a1,
-	0x03a3, 0x0525,
+	0x03a3, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x055f,
 	0x0561, 0x0587,
@@ -14122,18 +14478,15 @@ static const OnigCodePoint CR_Graph[] = {
 	0x05f0, 0x05f4,
 	0x0600, 0x0603,
 	0x0606, 0x061b,
-	0x061e, 0x061f,
-	0x0621, 0x065e,
-	0x0660, 0x070d,
+	0x061e, 0x070d,
 	0x070f, 0x074a,
 	0x074d, 0x07b1,
 	0x07c0, 0x07fa,
 	0x0800, 0x082d,
 	0x0830, 0x083e,
-	0x0900, 0x0939,
-	0x093c, 0x094e,
-	0x0950, 0x0955,
-	0x0958, 0x0972,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x0900, 0x0977,
 	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
@@ -14192,7 +14545,7 @@ static const OnigCodePoint CR_Graph[] = {
 	0x0b56, 0x0b57,
 	0x0b5c, 0x0b5d,
 	0x0b5f, 0x0b63,
-	0x0b66, 0x0b71,
+	0x0b66, 0x0b77,
 	0x0b82, 0x0b83,
 	0x0b85, 0x0b8a,
 	0x0b8e, 0x0b90,
@@ -14240,11 +14593,10 @@ static const OnigCodePoint CR_Graph[] = {
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
+	0x0d4a, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d66, 0x0d75,
@@ -14282,11 +14634,10 @@ static const OnigCodePoint CR_Graph[] = {
 	0x0edc, 0x0edd,
 	0x0f00, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f71, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fd8,
+	0x0fce, 0x0fda,
 	0x1000, 0x10c5,
 	0x10d0, 0x10fc,
 	0x1100, 0x1248,
@@ -14305,7 +14656,7 @@ static const OnigCodePoint CR_Graph[] = {
 	0x12d8, 0x1310,
 	0x1312, 0x1315,
 	0x1318, 0x135a,
-	0x135f, 0x137c,
+	0x135d, 0x137c,
 	0x1380, 0x1399,
 	0x13a0, 0x13f4,
 	0x1400, 0x167f,
@@ -14345,12 +14696,13 @@ static const OnigCodePoint CR_Graph[] = {
 	0x1b50, 0x1b7c,
 	0x1b80, 0x1baa,
 	0x1bae, 0x1bb9,
-	0x1c00, 0x1c37,
+	0x1bc0, 0x1bf3,
+	0x1bfc, 0x1c37,
 	0x1c3b, 0x1c49,
 	0x1c4d, 0x1c7f,
 	0x1cd0, 0x1cf2,
 	0x1d00, 0x1de6,
-	0x1dfd, 0x1f15,
+	0x1dfc, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
 	0x1f48, 0x1f4d,
@@ -14372,38 +14724,25 @@ static const OnigCodePoint CR_Graph[] = {
 	0x2060, 0x2064,
 	0x206a, 0x2071,
 	0x2074, 0x208e,
-	0x2090, 0x2094,
-	0x20a0, 0x20b8,
+	0x2090, 0x209c,
+	0x20a0, 0x20b9,
 	0x20d0, 0x20f0,
 	0x2100, 0x2189,
-	0x2190, 0x23e8,
+	0x2190, 0x23f3,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
-	0x2460, 0x26cd,
-	0x26cf, 0x26e1,
-	0x26e3, 0x26e3,
-	0x26e8, 0x26ff,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
+	0x2460, 0x26ff,
+	0x2701, 0x27ca,
 	0x27cc, 0x27cc,
-	0x27d0, 0x2b4c,
+	0x27ce, 0x2b4c,
 	0x2b50, 0x2b59,
 	0x2c00, 0x2c2e,
 	0x2c30, 0x2c5e,
 	0x2c60, 0x2cf1,
 	0x2cf9, 0x2d25,
 	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
 	0x2da0, 0x2da6,
 	0x2da8, 0x2dae,
 	0x2db0, 0x2db6,
@@ -14422,7 +14761,7 @@ static const OnigCodePoint CR_Graph[] = {
 	0x3099, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x3190, 0x31b7,
+	0x3190, 0x31ba,
 	0x31c0, 0x31e3,
 	0x31f0, 0x321e,
 	0x3220, 0x32fe,
@@ -14431,12 +14770,13 @@ static const OnigCodePoint CR_Graph[] = {
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
 	0xa4d0, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa673,
+	0xa640, 0xa673,
 	0xa67c, 0xa697,
 	0xa6a0, 0xa6f7,
-	0xa700, 0xa78c,
-	0xa7fb, 0xa82b,
+	0xa700, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa82b,
 	0xa830, 0xa839,
 	0xa840, 0xa877,
 	0xa880, 0xa8c4,
@@ -14453,6 +14793,11 @@ static const OnigCodePoint CR_Graph[] = {
 	0xaa5c, 0xaa7b,
 	0xaa80, 0xaac2,
 	0xaadb, 0xaadf,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabed,
 	0xabf0, 0xabf9,
 	0xac00, 0xd7a3,
@@ -14468,7 +14813,7 @@ static const OnigCodePoint CR_Graph[] = {
 	0xfb3e, 0xfb3e,
 	0xfb40, 0xfb41,
 	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
+	0xfb46, 0xfbc1,
 	0xfbd3, 0xfd3f,
 	0xfd50, 0xfd8f,
 	0xfd92, 0xfdc7,
@@ -14536,11 +14881,15 @@ static const OnigCodePoint CR_Graph[] = {
 	0x10b78, 0x10b7f,
 	0x10c00, 0x10c48,
 	0x10e60, 0x10e7e,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
 	0x11080, 0x110c1,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x12470, 0x12473,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d000, 0x1d0f5,
 	0x1d100, 0x1d126,
 	0x1d129, 0x1d1dd,
@@ -14570,26 +14919,49 @@ static const OnigCodePoint CR_Graph[] = {
 	0x1d7ce, 0x1d7ff,
 	0x1f000, 0x1f02b,
 	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
 	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,
+	0x1f130, 0x1f169,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
 	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f5ff,
+	0x1f601, 0x1f610,
+	0x1f612, 0x1f614,
+	0x1f616, 0x1f616,
+	0x1f618, 0x1f618,
+	0x1f61a, 0x1f61a,
+	0x1f61c, 0x1f61e,
+	0x1f620, 0x1f625,
+	0x1f628, 0x1f62b,
+	0x1f62d, 0x1f62d,
+	0x1f630, 0x1f633,
+	0x1f635, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 	0xe0001, 0xe0001,
 	0xe0020, 0xe007f,
@@ -14603,14 +14975,14 @@ static const OnigCodePoint CR_Graph[] = {
 
 /* 'Print': [[:Print:]] */
 static const OnigCodePoint CR_Print[] = {
-	487,
+	503,
 	0x0020, 0x007e,
 	0x00a0, 0x0377,
 	0x037a, 0x037e,
 	0x0384, 0x038a,
 	0x038c, 0x038c,
 	0x038e, 0x03a1,
-	0x03a3, 0x0525,
+	0x03a3, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x055f,
 	0x0561, 0x0587,
@@ -14620,18 +14992,15 @@ static const OnigCodePoint CR_Print[] = {
 	0x05f0, 0x05f4,
 	0x0600, 0x0603,
 	0x0606, 0x061b,
-	0x061e, 0x061f,
-	0x0621, 0x065e,
-	0x0660, 0x070d,
+	0x061e, 0x070d,
 	0x070f, 0x074a,
 	0x074d, 0x07b1,
 	0x07c0, 0x07fa,
 	0x0800, 0x082d,
 	0x0830, 0x083e,
-	0x0900, 0x0939,
-	0x093c, 0x094e,
-	0x0950, 0x0955,
-	0x0958, 0x0972,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x0900, 0x0977,
 	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
@@ -14690,7 +15059,7 @@ static const OnigCodePoint CR_Print[] = {
 	0x0b56, 0x0b57,
 	0x0b5c, 0x0b5d,
 	0x0b5f, 0x0b63,
-	0x0b66, 0x0b71,
+	0x0b66, 0x0b77,
 	0x0b82, 0x0b83,
 	0x0b85, 0x0b8a,
 	0x0b8e, 0x0b90,
@@ -14738,11 +15107,10 @@ static const OnigCodePoint CR_Print[] = {
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
+	0x0d4a, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d66, 0x0d75,
@@ -14780,11 +15148,10 @@ static const OnigCodePoint CR_Print[] = {
 	0x0edc, 0x0edd,
 	0x0f00, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f71, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fd8,
+	0x0fce, 0x0fda,
 	0x1000, 0x10c5,
 	0x10d0, 0x10fc,
 	0x1100, 0x1248,
@@ -14803,7 +15170,7 @@ static const OnigCodePoint CR_Print[] = {
 	0x12d8, 0x1310,
 	0x1312, 0x1315,
 	0x1318, 0x135a,
-	0x135f, 0x137c,
+	0x135d, 0x137c,
 	0x1380, 0x1399,
 	0x13a0, 0x13f4,
 	0x1400, 0x169c,
@@ -14842,12 +15209,13 @@ static const OnigCodePoint CR_Print[] = {
 	0x1b50, 0x1b7c,
 	0x1b80, 0x1baa,
 	0x1bae, 0x1bb9,
-	0x1c00, 0x1c37,
+	0x1bc0, 0x1bf3,
+	0x1bfc, 0x1c37,
 	0x1c3b, 0x1c49,
 	0x1c4d, 0x1c7f,
 	0x1cd0, 0x1cf2,
 	0x1d00, 0x1de6,
-	0x1dfd, 0x1f15,
+	0x1dfc, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
 	0x1f48, 0x1f4d,
@@ -14867,38 +15235,25 @@ static const OnigCodePoint CR_Print[] = {
 	0x202a, 0x2064,
 	0x206a, 0x2071,
 	0x2074, 0x208e,
-	0x2090, 0x2094,
-	0x20a0, 0x20b8,
+	0x2090, 0x209c,
+	0x20a0, 0x20b9,
 	0x20d0, 0x20f0,
 	0x2100, 0x2189,
-	0x2190, 0x23e8,
+	0x2190, 0x23f3,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
-	0x2460, 0x26cd,
-	0x26cf, 0x26e1,
-	0x26e3, 0x26e3,
-	0x26e8, 0x26ff,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
+	0x2460, 0x26ff,
+	0x2701, 0x27ca,
 	0x27cc, 0x27cc,
-	0x27d0, 0x2b4c,
+	0x27ce, 0x2b4c,
 	0x2b50, 0x2b59,
 	0x2c00, 0x2c2e,
 	0x2c30, 0x2c5e,
 	0x2c60, 0x2cf1,
 	0x2cf9, 0x2d25,
 	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
 	0x2da0, 0x2da6,
 	0x2da8, 0x2dae,
 	0x2db0, 0x2db6,
@@ -14917,7 +15272,7 @@ static const OnigCodePoint CR_Print[] = {
 	0x3099, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x3190, 0x31b7,
+	0x3190, 0x31ba,
 	0x31c0, 0x31e3,
 	0x31f0, 0x321e,
 	0x3220, 0x32fe,
@@ -14926,12 +15281,13 @@ static const OnigCodePoint CR_Print[] = {
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
 	0xa4d0, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa673,
+	0xa640, 0xa673,
 	0xa67c, 0xa697,
 	0xa6a0, 0xa6f7,
-	0xa700, 0xa78c,
-	0xa7fb, 0xa82b,
+	0xa700, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa82b,
 	0xa830, 0xa839,
 	0xa840, 0xa877,
 	0xa880, 0xa8c4,
@@ -14948,6 +15304,11 @@ static const OnigCodePoint CR_Print[] = {
 	0xaa5c, 0xaa7b,
 	0xaa80, 0xaac2,
 	0xaadb, 0xaadf,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabed,
 	0xabf0, 0xabf9,
 	0xac00, 0xd7a3,
@@ -14963,7 +15324,7 @@ static const OnigCodePoint CR_Print[] = {
 	0xfb3e, 0xfb3e,
 	0xfb40, 0xfb41,
 	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
+	0xfb46, 0xfbc1,
 	0xfbd3, 0xfd3f,
 	0xfd50, 0xfd8f,
 	0xfd92, 0xfdc7,
@@ -15031,11 +15392,15 @@ static const OnigCodePoint CR_Print[] = {
 	0x10b78, 0x10b7f,
 	0x10c00, 0x10c48,
 	0x10e60, 0x10e7e,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
 	0x11080, 0x110c1,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x12470, 0x12473,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d000, 0x1d0f5,
 	0x1d100, 0x1d126,
 	0x1d129, 0x1d1dd,
@@ -15065,26 +15430,49 @@ static const OnigCodePoint CR_Print[] = {
 	0x1d7ce, 0x1d7ff,
 	0x1f000, 0x1f02b,
 	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
 	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,
+	0x1f130, 0x1f169,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
 	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f5ff,
+	0x1f601, 0x1f610,
+	0x1f612, 0x1f614,
+	0x1f616, 0x1f616,
+	0x1f618, 0x1f618,
+	0x1f61a, 0x1f61a,
+	0x1f61c, 0x1f61e,
+	0x1f620, 0x1f625,
+	0x1f628, 0x1f62b,
+	0x1f62d, 0x1f62d,
+	0x1f630, 0x1f633,
+	0x1f635, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 	0xe0001, 0xe0001,
 	0xe0020, 0xe007f,
@@ -15107,7 +15495,7 @@ static const OnigCodePoint CR_Print[] = {
 
 /* 'Word': [[:Word:]] */
 static const OnigCodePoint CR_Word[] = {
-	506,
+	514,
 	0x0030, 0x0039,
 	0x0041, 0x005a,
 	0x005f, 0x005f,
@@ -15131,7 +15519,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x038e, 0x03a1,
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
-	0x0483, 0x0525,
+	0x0483, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x0559,
 	0x0561, 0x0587,
@@ -15143,11 +15531,10 @@ static const OnigCodePoint CR_Word[] = {
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
 	0x0610, 0x061a,
-	0x0621, 0x065e,
-	0x0660, 0x0669,
+	0x0620, 0x0669,
 	0x066e, 0x06d3,
 	0x06d5, 0x06dc,
-	0x06de, 0x06e8,
+	0x06df, 0x06e8,
 	0x06ea, 0x06fc,
 	0x06ff, 0x06ff,
 	0x0710, 0x074a,
@@ -15155,12 +15542,10 @@ static const OnigCodePoint CR_Word[] = {
 	0x07c0, 0x07f5,
 	0x07fa, 0x07fa,
 	0x0800, 0x082d,
-	0x0900, 0x0939,
-	0x093c, 0x094e,
-	0x0950, 0x0955,
-	0x0958, 0x0963,
+	0x0840, 0x085b,
+	0x0900, 0x0963,
 	0x0966, 0x096f,
-	0x0971, 0x0972,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
@@ -15262,14 +15647,14 @@ static const OnigCodePoint CR_Word[] = {
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
+	0x0d4a, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d66, 0x0d6f,
@@ -15315,8 +15700,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x0f3e, 0x0f47,
 	0x0f49, 0x0f6c,
 	0x0f71, 0x0f84,
-	0x0f86, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f86, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fc6, 0x0fc6,
 	0x1000, 0x1049,
@@ -15340,7 +15724,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x12d8, 0x1310,
 	0x1312, 0x1315,
 	0x1318, 0x135a,
-	0x135f, 0x135f,
+	0x135d, 0x135f,
 	0x1380, 0x138f,
 	0x13a0, 0x13f4,
 	0x1401, 0x166c,
@@ -15372,7 +15756,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x1970, 0x1974,
 	0x1980, 0x19ab,
 	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
+	0x19d0, 0x19d9,
 	0x1a00, 0x1a1b,
 	0x1a20, 0x1a5e,
 	0x1a60, 0x1a7c,
@@ -15384,13 +15768,14 @@ static const OnigCodePoint CR_Word[] = {
 	0x1b6b, 0x1b73,
 	0x1b80, 0x1baa,
 	0x1bae, 0x1bb9,
+	0x1bc0, 0x1bf3,
 	0x1c00, 0x1c37,
 	0x1c40, 0x1c49,
 	0x1c4d, 0x1c7d,
 	0x1cd0, 0x1cd2,
 	0x1cd4, 0x1cf2,
 	0x1d00, 0x1de6,
-	0x1dfd, 0x1f15,
+	0x1dfc, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
 	0x1f48, 0x1f4d,
@@ -15413,7 +15798,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x2054, 0x2054,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x20d0, 0x20f0,
 	0x2102, 0x2102,
 	0x2107, 0x2107,
@@ -15437,7 +15822,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x2d00, 0x2d25,
 	0x2d30, 0x2d65,
 	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
+	0x2d7f, 0x2d96,
 	0x2da0, 0x2da6,
 	0x2da8, 0x2dae,
 	0x2db0, 0x2db6,
@@ -15459,7 +15844,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x30fc, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -15467,15 +15852,16 @@ static const OnigCodePoint CR_Word[] = {
 	0xa4d0, 0xa4fd,
 	0xa500, 0xa60c,
 	0xa610, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa672,
+	0xa640, 0xa672,
 	0xa67c, 0xa67d,
 	0xa67f, 0xa697,
 	0xa6a0, 0xa6f1,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa827,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa827,
 	0xa840, 0xa873,
 	0xa880, 0xa8c4,
 	0xa8d0, 0xa8d9,
@@ -15493,6 +15879,11 @@ static const OnigCodePoint CR_Word[] = {
 	0xaa7a, 0xaa7b,
 	0xaa80, 0xaac2,
 	0xaadb, 0xaadd,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabea,
 	0xabec, 0xabed,
 	0xabf0, 0xabf9,
@@ -15569,10 +15960,14 @@ static const OnigCodePoint CR_Word[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11000, 0x11046,
+	0x11066, 0x1106f,
 	0x11080, 0x110ba,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d165, 0x1d169,
 	0x1d16d, 0x1d172,
 	0x1d17b, 0x1d182,
@@ -15612,13 +16007,14 @@ static const OnigCodePoint CR_Word[] = {
 	0x1d7ce, 0x1d7ff,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 	0xe0100, 0xe01ef,
 }; /* CR_Word */
 
 /* 'Alnum': [[:Alnum:]] */
 static const OnigCodePoint CR_Alnum[] = {
-	497,
+	509,
 	0x0030, 0x0039,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
@@ -15642,7 +16038,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x038e, 0x03a1,
 	0x03a3, 0x03f5,
 	0x03f7, 0x0481,
-	0x048a, 0x0525,
+	0x048a, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x0559,
 	0x0561, 0x0587,
@@ -15654,9 +16050,8 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f2,
 	0x0610, 0x061a,
-	0x0621, 0x0657,
-	0x0659, 0x065e,
-	0x0660, 0x0669,
+	0x0620, 0x0657,
+	0x0659, 0x0669,
 	0x066e, 0x06d3,
 	0x06d5, 0x06dc,
 	0x06e1, 0x06e8,
@@ -15669,14 +16064,13 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x07fa, 0x07fa,
 	0x0800, 0x0817,
 	0x081a, 0x082c,
-	0x0900, 0x0939,
+	0x0840, 0x0858,
+	0x0900, 0x093b,
 	0x093d, 0x094c,
-	0x094e, 0x094e,
-	0x0950, 0x0950,
-	0x0955, 0x0955,
-	0x0958, 0x0963,
+	0x094e, 0x0950,
+	0x0955, 0x0963,
 	0x0966, 0x096f,
-	0x0971, 0x0972,
+	0x0971, 0x0977,
 	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
@@ -15778,14 +16172,15 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x0cde, 0x0cde,
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
 	0x0d4a, 0x0d4c,
+	0x0d4e, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d66, 0x0d6f,
@@ -15827,8 +16222,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x0f40, 0x0f47,
 	0x0f49, 0x0f6c,
 	0x0f71, 0x0f81,
-	0x0f88, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f88, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x1000, 0x1036,
 	0x1038, 0x1038,
@@ -15889,7 +16283,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x1970, 0x1974,
 	0x1980, 0x19ab,
 	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
+	0x19d0, 0x19d9,
 	0x1a00, 0x1a1b,
 	0x1a20, 0x1a5e,
 	0x1a61, 0x1a74,
@@ -15902,6 +16296,8 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x1b50, 0x1b59,
 	0x1b80, 0x1ba9,
 	0x1bae, 0x1bb9,
+	0x1bc0, 0x1be5,
+	0x1be7, 0x1bf1,
 	0x1c00, 0x1c35,
 	0x1c40, 0x1c49,
 	0x1c4d, 0x1c7d,
@@ -15929,7 +16325,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x1ff6, 0x1ffc,
 	0x2071, 0x2071,
 	0x207f, 0x207f,
-	0x2090, 0x2094,
+	0x2090, 0x209c,
 	0x2102, 0x2102,
 	0x2107, 0x2107,
 	0x210a, 0x2113,
@@ -15973,7 +16369,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x30fc, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x31a0, 0x31b7,
+	0x31a0, 0x31ba,
 	0x31f0, 0x31ff,
 	0x3400, 0x4db5,
 	0x4e00, 0x9fcb,
@@ -15981,14 +16377,15 @@ static const OnigCodePoint CR_Alnum[] = {
 	0xa4d0, 0xa4fd,
 	0xa500, 0xa60c,
 	0xa610, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa66e,
+	0xa640, 0xa66e,
 	0xa67f, 0xa697,
 	0xa6a0, 0xa6ef,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa78c,
-	0xa7fb, 0xa801,
+	0xa78b, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa801,
 	0xa803, 0xa805,
 	0xa807, 0xa80a,
 	0xa80c, 0xa827,
@@ -16000,7 +16397,8 @@ static const OnigCodePoint CR_Alnum[] = {
 	0xa900, 0xa92a,
 	0xa930, 0xa952,
 	0xa960, 0xa97c,
-	0xa980, 0xa9bf,
+	0xa980, 0xa9b2,
+	0xa9b4, 0xa9bf,
 	0xa9cf, 0xa9d9,
 	0xaa00, 0xaa36,
 	0xaa40, 0xaa4d,
@@ -16011,6 +16409,11 @@ static const OnigCodePoint CR_Alnum[] = {
 	0xaac0, 0xaac0,
 	0xaac2, 0xaac2,
 	0xaadb, 0xaadd,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabea,
 	0xabf0, 0xabf9,
 	0xac00, 0xd7a3,
@@ -16078,10 +16481,14 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x10b40, 0x10b55,
 	0x10b60, 0x10b72,
 	0x10c00, 0x10c48,
+	0x11000, 0x11045,
+	0x11066, 0x1106f,
 	0x11082, 0x110b8,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d400, 0x1d454,
 	0x1d456, 0x1d49c,
 	0x1d49e, 0x1d49f,
@@ -16115,6 +16522,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x1d7ce, 0x1d7ff,
 	0x20000, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 }; /* CR_Alnum */
 
@@ -16291,6 +16699,9 @@ static const OnigCodePoint* const CodeRanges[] = {
   CR_Inscriptional_Pahlavi,
   CR_Old_Turkic,
   CR_Kaithi,
+  CR_Batak,
+  CR_Brahmi,
+  CR_Mandaic,
   CR_White_Space,
   CR_Bidi_Control,
   CR_Join_Control,
@@ -16499,78 +16910,81 @@ inscriptionalparthian,                   161
 inscriptionalpahlavi,                    162
 oldturkic,                               163
 kaithi,                                  164
-whitespace,                              165
-bidicontrol,                             166
-joincontrol,                             167
-dash,                                    168
-hyphen,                                  169
-quotationmark,                           170
-terminalpunctuation,                     171
-othermath,                               172
-hexdigit,                                173
-asciihexdigit,                           174
-otheralphabetic,                         175
-ideographic,                             176
-diacritic,                               177
-extender,                                178
-otherlowercase,                          179
-otheruppercase,                          180
-noncharactercodepoint,                   181
-othergraphemeextend,                     182
-idsbinaryoperator,                       183
-idstrinaryoperator,                      184
-radical,                                 185
-unifiedideograph,                        186
-otherdefaultignorablecodepoint,          187
-deprecated,                              188
-softdotted,                              189
-logicalorderexception,                   190
-otheridstart,                            191
-otheridcontinue,                         192
-sterm,                                   193
-variationselector,                       194
-patternwhitespace,                       195
-patternsyntax,                           196
-ahex,                                    174
-bidic,                                   166
+batak,                                   165
+brahmi,                                  166
+mandaic,                                 167
+whitespace,                              168
+bidicontrol,                             169
+joincontrol,                             170
+dash,                                    171
+hyphen,                                  172
+quotationmark,                           173
+terminalpunctuation,                     174
+othermath,                               175
+hexdigit,                                176
+asciihexdigit,                           177
+otheralphabetic,                         178
+ideographic,                             179
+diacritic,                               180
+extender,                                181
+otherlowercase,                          182
+otheruppercase,                          183
+noncharactercodepoint,                   184
+othergraphemeextend,                     185
+idsbinaryoperator,                       186
+idstrinaryoperator,                      187
+radical,                                 188
+unifiedideograph,                        189
+otherdefaultignorablecodepoint,          190
+deprecated,                              191
+softdotted,                              192
+logicalorderexception,                   193
+otheridstart,                            194
+otheridcontinue,                         195
+sterm,                                   196
+variationselector,                       197
+patternwhitespace,                       198
+patternsyntax,                           199
+ahex,                                    177
+bidic,                                   169
 ci,                                       59
 cwcf,                                     63
 cwcm,                                     64
 cwl,                                      60
 cwt,                                      62
 cwu,                                      61
-dep,                                     188
+dep,                                     191
 di,                                       69
-dia,                                     177
-ext,                                     178
+dia,                                     180
+ext,                                     181
 grbase,                                   71
 grext,                                    70
 grlink,                                   72
-hex,                                     173
+hex,                                     176
 idc,                                      66
-ideo,                                    176
+ideo,                                    179
 ids,                                      65
-idsb,                                    183
-idst,                                    184
-joinc,                                   167
-loe,                                     190
-nchar,                                   181
-oalpha,                                  175
-odi,                                     187
-ogrext,                                  182
-oidc,                                    192
-oids,                                    191
-olower,                                  179
-omath,                                   172
-oupper,                                  180
-patsyn,                                  196
-patws,                                   195
-qmark,                                   170
-sd,                                      189
-term,                                    171
-uideo,                                   186
-vs,                                      194
-wspace,                                  165
+idsb,                                    186
+idst,                                    187
+joinc,                                   170
+loe,                                     193
+nchar,                                   184
+oalpha,                                  178
+odi,                                     190
+ogrext,                                  185
+oidc,                                    195
+oids,                                    194
+olower,                                  182
+omath,                                   175
+oupper,                                  183
+patsyn,                                  199
+patws,                                   198
+qmark,                                   173
+sd,                                      192
+term,                                    174
+uideo,                                   189
+vs,                                      197
+wspace,                                  168
 xidc,                                     68
 xids,                                     67
 other,                                    17
@@ -16616,8 +17030,10 @@ armn,                                     77
 avst,                                    152
 bali,                                    134
 bamu,                                    156
+batk,                                    165
 beng,                                     83
 bopo,                                    107
+brah,                                    166
 brai,                                    125
 bugi,                                    126
 buhd,                                    116
@@ -16659,6 +17075,7 @@ limb,                                    118
 linb,                                    120
 lyci,                                    146
 lydi,                                    148
+mand,                                    167
 mlym,                                     90
 mong,                                    104
 mtei,                                    158
diff --git a/tool/enc-unicode.rb b/tool/enc-unicode.rb
index 351d40e..49729ec 100755
--- a/tool/enc-unicode.rb
+++ b/tool/enc-unicode.rb
@@ -3,12 +3,12 @@
 # Creates the data structures needed by Onigurma to map Unicode codepoints to
 # property names and POSIX character classes
 #
-# To use this, get UnicodeData.txt, Scripts.txt, PropList.txt from unicode.org.
-# (http://unicode.org/Public/UNIDATA/)
-# And run following command.
-#   ruby1.9 tool/enc-unicode.rb data_dir > enc/unicode/name2ctype.kwd
-# You can get source file for gperf.
-# After this, simply make ruby.
+# To use this, get UnicodeData.txt, Scripts.txt, PropList.txt,
+# PropertyAliases.txt, PropertyValueAliases.txt, and
+# DerivedCoreProperties.txt from unicode.org.
+# (http://unicode.org/Public/UNIDATA/) And run following command.
+# ruby1.9 tool/enc-unicode.rb data_dir > enc/unicode/name2ctype.kwd
+# You can get source file for gperf.  After this, simply make ruby.
 
 unless ARGV.size == 1
   $stderr.puts "Usage: #{$0} data_directory"
