merge revision(s) 67439,67441,67453,67476: [Backport #15740]

        change lib/unicode_normalize/tables.rb to single item per line to make diffs shorter

        * template/unicode_norm_gen.tmpl: Change formatting of output to produce only a
          single item (or range) for each line to make future diffs shorter and easier
          to understand and check.

        * lib/unicode_normalize/tables.rb: output of the above

        update to Unicode Version 12.1.0 (beta)

        Unicode Version 12.1.0 adds one single character, U+32FF SQUARE ERA NAME REIWA,
        for the new Japanese era starting on May 1st. 12.1.0 will be finalized only on
        May 7th, so we go with the beta version because further changes in the data we
        need are highly unlikely, and we want to make sure Ruby is ready for the new era.

        * common.mk: change UNICODE_VERSION to 12.1.0, UNICODE_BETA to YES

        * enc/unicode/12.1.0, enc/unicode/12.1.0/casefold.h, enc/unicode/12.1.0/name2ctype.h:
          add directory and generated data files for new version

        * lib/unicode_normalize/tables.rb: update for new character

        * test/ruby/test_regexp.rb: add test for character property age=12.1

        * test/test_unicode_normalize.rb: add test for NFKC decomposition of new character

        This (mostly) completes issue #15195.

        remove Unicode 12.0.0 related directory and generated files


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67525 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 1096 insertions, 404 deletions

diff --git a/enc/unicode/12.0.0/casefold.h b/enc/unicode/12.1.0/casefold.h
index 1b2804b06a..4c62f0faee 100644
--- a/enc/unicode/12.0.0/casefold.h
+++ b/enc/unicode/12.1.0/casefold.h
@@ -3,14 +3,14 @@
 
 #if defined ONIG_UNICODE_VERSION_STRING && !( \
       ONIG_UNICODE_VERSION_MAJOR == 12 && \
-      ONIG_UNICODE_VERSION_MINOR == 0 && \
+      ONIG_UNICODE_VERSION_MINOR == 1 && \
       ONIG_UNICODE_VERSION_TEENY == 0 && \
       1)
 # error ONIG_UNICODE_VERSION_STRING mismatch
 #endif
-#define ONIG_UNICODE_VERSION_STRING "12.0.0"
+#define ONIG_UNICODE_VERSION_STRING "12.1.0"
 #define ONIG_UNICODE_VERSION_MAJOR 12
-#define ONIG_UNICODE_VERSION_MINOR 0
+#define ONIG_UNICODE_VERSION_MINOR 1
 #define ONIG_UNICODE_VERSION_TEENY 0
 
 static const CaseFold_11_Type CaseFold_11_Table[] = {
diff --git a/enc/unicode/12.0.0/name2ctype.h b/enc/unicode/12.1.0/name2ctype.h
index c325931df6..b2270d5cac 100644
--- a/enc/unicode/12.0.0/name2ctype.h
+++ b/enc/unicode/12.1.0/name2ctype.h
@@ -811,7 +811,7 @@ static const OnigCodePoint CR_Digit[] = {
 
 /* 'Graph': [[:Graph:]] */
 static const OnigCodePoint CR_Graph[] = {
-	672,
+	671,
 	0x0021, 0x007e,
 	0x00a1, 0x0377,
 	0x037a, 0x037f,
@@ -1101,8 +1101,7 @@ static const OnigCodePoint CR_Graph[] = {
 	0x3190, 0x31ba,
 	0x31c0, 0x31e3,
 	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
+	0x3220, 0x4db5,
 	0x4dc0, 0x9fef,
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
@@ -2142,7 +2141,7 @@ static const OnigCodePoint CR_Lower[] = {
 
 /* 'Print': [[:Print:]] */
 static const OnigCodePoint CR_Print[] = {
-	669,
+	668,
 	0x0020, 0x007e,
 	0x00a0, 0x0377,
 	0x037a, 0x037f,
@@ -2429,8 +2428,7 @@ static const OnigCodePoint CR_Print[] = {
 	0x3190, 0x31ba,
 	0x31c0, 0x31e3,
 	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
+	0x3220, 0x4db5,
 	0x4dc0, 0x9fef,
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
@@ -5308,7 +5306,7 @@ static const OnigCodePoint CR_Any[] = {
 
 /* 'Assigned': - */
 static const OnigCodePoint CR_Assigned[] = {
-	667,
+	666,
 	0x0000, 0x0377,
 	0x037a, 0x037f,
 	0x0384, 0x038a,
@@ -5593,8 +5591,7 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x3190, 0x31ba,
 	0x31c0, 0x31e3,
 	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
+	0x3220, 0x4db5,
 	0x4dc0, 0x9fef,
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
@@ -5980,7 +5977,7 @@ static const OnigCodePoint CR_Assigned[] = {
 
 /* 'C': Major Category */
 static const OnigCodePoint CR_C[] = {
-	669,
+	668,
 	0x0000, 0x001f,
 	0x007f, 0x009f,
 	0x00ad, 0x00ad,
@@ -6272,7 +6269,6 @@ static const OnigCodePoint CR_C[] = {
 	0x31bb, 0x31bf,
 	0x31e4, 0x31ef,
 	0x321f, 0x321f,
-	0x32ff, 0x32ff,
 	0x4db6, 0x4dbf,
 	0x9ff0, 0x9fff,
 	0xa48d, 0xa48f,
@@ -6682,7 +6678,7 @@ static const OnigCodePoint CR_Cf[] = {
 
 /* 'Cn': General Category */
 static const OnigCodePoint CR_Cn[] = {
-	667,
+	666,
 	0x0378, 0x0379,
 	0x0380, 0x0383,
 	0x038b, 0x038b,
@@ -6967,7 +6963,6 @@ static const OnigCodePoint CR_Cn[] = {
 	0x31bb, 0x31bf,
 	0x31e4, 0x31ef,
 	0x321f, 0x321f,
-	0x32ff, 0x32ff,
 	0x4db6, 0x4dbf,
 	0x9ff0, 0x9fff,
 	0xa48d, 0xa48f,
@@ -11396,7 +11391,7 @@ static const OnigCodePoint CR_Ps[] = {
 
 /* 'S': Major Category */
 static const OnigCodePoint CR_S[] = {
-	227,
+	226,
 	0x0024, 0x0024,
 	0x002b, 0x002b,
 	0x003c, 0x003e,
@@ -11517,8 +11512,7 @@ static const OnigCodePoint CR_S[] = {
 	0x3250, 0x3250,
 	0x3260, 0x327f,
 	0x328a, 0x32b0,
-	0x32c0, 0x32fe,
-	0x3300, 0x33ff,
+	0x32c0, 0x33ff,
 	0x4dc0, 0x4dff,
 	0xa490, 0xa4c6,
 	0xa700, 0xa716,
@@ -11757,7 +11751,7 @@ static const OnigCodePoint CR_Sm[] = {
 
 /* 'So': General Category */
 static const OnigCodePoint CR_So[] = {
-	181,
+	180,
 	0x00a6, 0x00a6,
 	0x00a9, 0x00a9,
 	0x00ae, 0x00ae,
@@ -11857,8 +11851,7 @@ static const OnigCodePoint CR_So[] = {
 	0x3250, 0x3250,
 	0x3260, 0x327f,
 	0x328a, 0x32b0,
-	0x32c0, 0x32fe,
-	0x3300, 0x33ff,
+	0x32c0, 0x33ff,
 	0x4dc0, 0x4dff,
 	0xa490, 0xa4c6,
 	0xa828, 0xa82b,
@@ -18313,7 +18306,7 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 
 /* 'Grapheme_Base': Derived Property */
 static const OnigCodePoint CR_Grapheme_Base[] = {
-	820,
+	819,
 	0x0020, 0x007e,
 	0x00a0, 0x00ac,
 	0x00ae, 0x02ff,
@@ -18678,8 +18671,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x3190, 0x31ba,
 	0x31c0, 0x31e3,
 	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
+	0x3220, 0x4db5,
 	0x4dc0, 0x9fef,
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
@@ -19195,7 +19187,7 @@ static const OnigCodePoint CR_Grapheme_Link[] = {
 
 /* 'Common': Script */
 static const OnigCodePoint CR_Common[] = {
-	171,
+	172,
 	0x0000, 0x0040,
 	0x005b, 0x0060,
 	0x007b, 0x00a9,
@@ -19264,6 +19256,7 @@ static const OnigCodePoint CR_Common[] = {
 	0x31c0, 0x31e3,
 	0x3220, 0x325f,
 	0x327f, 0x32cf,
+	0x32ff, 0x32ff,
 	0x3358, 0x33ff,
 	0x4dc0, 0x4dff,
 	0xa700, 0xa721,
@@ -22402,7 +22395,7 @@ static const OnigCodePoint CR_Extended_Pictographic[] = {
 
 /* 'Unknown': Script */
 static const OnigCodePoint CR_Unknown[] = {
-	665,
+	664,
 	0x0378, 0x0379,
 	0x0380, 0x0383,
 	0x038b, 0x038b,
@@ -22687,7 +22680,6 @@ static const OnigCodePoint CR_Unknown[] = {
 	0x31bb, 0x31bf,
 	0x31e4, 0x31ef,
 	0x321f, 0x321f,
-	0x32ff, 0x32ff,
 	0x4db6, 0x4dbf,
 	0x9ff0, 0x9fff,
 	0xa48d, 0xa48f,
@@ -33531,6 +33523,687 @@ static const OnigCodePoint CR_Age_12_0[] = {
 	0xefffe, 0x10ffff,
 }; /* CR_Age_12_0 */
 
+/* 'Age_12_1': Derived Age 12.1 */
+static const OnigCodePoint CR_Age_12_1[] = {
+	676,
+	0x0000, 0x0377,
+	0x037a, 0x037f,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x058a,
+	0x058d, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05ef, 0x05f4,
+	0x0600, 0x061c,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x07fd, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x0860, 0x086a,
+	0x08a0, 0x08b4,
+	0x08b6, 0x08bd,
+	0x08d3, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fe,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a76,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0af1,
+	0x0af9, 0x0aff,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b77,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c00, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c5a,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c77, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d00, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4f,
+	0x0d54, 0x0d63,
+	0x0d66, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0de6, 0x0def,
+	0x0df2, 0x0df4,
+	0x0e01, 0x0e3a,
+	0x0e3f, 0x0e5b,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edf,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135d, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f5,
+	0x13f8, 0x13fd,
+	0x1400, 0x169c,
+	0x16a0, 0x16f8,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1736,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17dd,
+	0x17e0, 0x17e9,
+	0x17f0, 0x17f9,
+	0x1800, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1878,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191e,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+	0x1ab0, 0x1abe,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c88,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cc7,
+	0x1cd0, 0x1cfa,
+	0x1d00, 0x1df9,
+	0x1dfb, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fc4,
+	0x1fc6, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fdd, 0x1fef,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffe,
+	0x2000, 0x2064,
+	0x2066, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x209c,
+	0x20a0, 0x20bf,
+	0x20d0, 0x20f0,
+	0x2100, 0x218b,
+	0x2190, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e4f,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312f,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x4db5,
+	0x4dc0, 0x9fef,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa6f7,
+	0xa700, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7f7, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c5,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa953,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9fe,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaac2,
+	0xaadb, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab67,
+	0xab70, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xd800, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfff9, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018e,
+	0x10190, 0x1019b,
+	0x101a0, 0x101a0,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x102e0, 0x102fb,
+	0x10300, 0x10323,
+	0x1032d, 0x1034a,
+	0x10350, 0x1037a,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x104b0, 0x104d3,
+	0x104d8, 0x104fb,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x1056f, 0x1056f,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10857, 0x1089e,
+	0x108a7, 0x108af,
+	0x108e0, 0x108f2,
+	0x108f4, 0x108f5,
+	0x108fb, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10980, 0x109b7,
+	0x109bc, 0x109cf,
+	0x109d2, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a35,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a48,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a9f,
+	0x10ac0, 0x10ae6,
+	0x10aeb, 0x10af6,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b91,
+	0x10b99, 0x10b9c,
+	0x10ba9, 0x10baf,
+	0x10c00, 0x10c48,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x10cfa, 0x10d27,
+	0x10d30, 0x10d39,
+	0x10e60, 0x10e7e,
+	0x10f00, 0x10f27,
+	0x10f30, 0x10f59,
+	0x10fe0, 0x10ff6,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x1107f, 0x110c1,
+	0x110cd, 0x110cd,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11146,
+	0x11150, 0x11176,
+	0x11180, 0x111cd,
+	0x111d0, 0x111df,
+	0x111e1, 0x111f4,
+	0x11200, 0x11211,
+	0x11213, 0x1123e,
+	0x11280, 0x11286,
+	0x11288, 0x11288,
+	0x1128a, 0x1128d,
+	0x1128f, 0x1129d,
+	0x1129f, 0x112a9,
+	0x112b0, 0x112ea,
+	0x112f0, 0x112f9,
+	0x11300, 0x11303,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133b, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11350, 0x11350,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11400, 0x11459,
+	0x1145b, 0x1145b,
+	0x1145d, 0x1145f,
+	0x11480, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115dd,
+	0x11600, 0x11644,
+	0x11650, 0x11659,
+	0x11660, 0x1166c,
+	0x11680, 0x116b8,
+	0x116c0, 0x116c9,
+	0x11700, 0x1171a,
+	0x1171d, 0x1172b,
+	0x11730, 0x1173f,
+	0x11800, 0x1183b,
+	0x118a0, 0x118f2,
+	0x118ff, 0x118ff,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d7,
+	0x119da, 0x119e4,
+	0x11a00, 0x11a47,
+	0x11a50, 0x11aa2,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c45,
+	0x11c50, 0x11c6c,
+	0x11c70, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d47,
+	0x11d50, 0x11d59,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d8e,
+	0x11d90, 0x11d91,
+	0x11d93, 0x11d98,
+	0x11da0, 0x11da9,
+	0x11ee0, 0x11ef8,
+	0x11fc0, 0x11ff1,
+	0x11fff, 0x12399,
+	0x12400, 0x1246e,
+	0x12470, 0x12474,
+	0x12480, 0x12543,
+	0x13000, 0x1342e,
+	0x13430, 0x13438,
+	0x14400, 0x14646,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16a6e, 0x16a6f,
+	0x16ad0, 0x16aed,
+	0x16af0, 0x16af5,
+	0x16b00, 0x16b45,
+	0x16b50, 0x16b59,
+	0x16b5b, 0x16b61,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16e40, 0x16e9a,
+	0x16f00, 0x16f4a,
+	0x16f4f, 0x16f87,
+	0x16f8f, 0x16f9f,
+	0x16fe0, 0x16fe3,
+	0x17000, 0x187f7,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1b164, 0x1b167,
+	0x1b170, 0x1b2fb,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9c, 0x1bca3,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1e8,
+	0x1d200, 0x1d245,
+	0x1d2e0, 0x1d2f3,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d378,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d7cb,
+	0x1d7ce, 0x1da8b,
+	0x1da9b, 0x1da9f,
+	0x1daa1, 0x1daaf,
+	0x1e000, 0x1e006,
+	0x1e008, 0x1e018,
+	0x1e01b, 0x1e021,
+	0x1e023, 0x1e024,
+	0x1e026, 0x1e02a,
+	0x1e100, 0x1e12c,
+	0x1e130, 0x1e13d,
+	0x1e140, 0x1e149,
+	0x1e14e, 0x1e14f,
+	0x1e2c0, 0x1e2f9,
+	0x1e2ff, 0x1e2ff,
+	0x1e800, 0x1e8c4,
+	0x1e8c7, 0x1e8d6,
+	0x1e900, 0x1e94b,
+	0x1e950, 0x1e959,
+	0x1e95e, 0x1e95f,
+	0x1ec71, 0x1ecb4,
+	0x1ed01, 0x1ed3d,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0bf,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0f5,
+	0x1f100, 0x1f10c,
+	0x1f110, 0x1f16c,
+	0x1f170, 0x1f1ac,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23b,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f260, 0x1f265,
+	0x1f300, 0x1f6d5,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6fa,
+	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d8,
+	0x1f7e0, 0x1f7eb,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0x1f900, 0x1f90b,
+	0x1f90d, 0x1f971,
+	0x1f973, 0x1f976,
+	0x1f97a, 0x1f9a2,
+	0x1f9a5, 0x1f9aa,
+	0x1f9ae, 0x1f9ca,
+	0x1f9cd, 0x1fa53,
+	0x1fa60, 0x1fa6d,
+	0x1fa70, 0x1fa73,
+	0x1fa78, 0x1fa7a,
+	0x1fa80, 0x1fa82,
+	0x1fa90, 0x1fa95,
+	0x1fffe, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_12_1 */
+
 #endif /* USE_UNICODE_AGE_PROPERTIES */
 /* 'Grapheme_Cluster_Break_Prepend': Grapheme_Cluster_Break=Prepend */
 static const OnigCodePoint CR_Grapheme_Cluster_Break_Prepend[] = {
@@ -37038,6 +37711,7 @@ static const OnigCodePoint* const CodeRanges[] = {
   CR_Age_10_0,
   CR_Age_11_0,
   CR_Age_12_0,
+  CR_Age_12_1,
 #endif /* USE_UNICODE_AGE_PROPERTIES */
   CR_Grapheme_Cluster_Break_Prepend,
   CR_Grapheme_Cluster_Break_CR,
@@ -37378,7 +38052,7 @@ static const struct uniname2ctype_struct *uniname2ctype_p(
 #ifndef USE_UNICODE_AGE_PROPERTIES
 #define TOTAL_KEYWORDS 814
 #else /* USE_UNICODE_AGE_PROPERTIES */
-#define TOTAL_KEYWORDS 835
+#define TOTAL_KEYWORDS 836
 #endif /* USE_UNICODE_AGE_PROPERTIES */
 #define MIN_WORD_LENGTH 1
 #define MAX_WORD_LENGTH 44
@@ -37426,8 +38100,8 @@ uniname2ctype_hash (register const char *str, register size_t len)
       6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
       6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
 #else /* USE_UNICODE_AGE_PROPERTIES */
-      6099, 6099, 6099, 6099, 6099, 6099,    7, 6099,    3,    1,
-         2,   21,    3,   24,   13,   14,    9,    4, 6099, 6099,
+      6099, 6099, 6099, 6099, 6099, 6099,   17, 6099,    3,    1,
+         4,   13,    3,   22,    9,   16,   12,    5, 6099, 6099,
 #endif /* USE_UNICODE_AGE_PROPERTIES */
       6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
       6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
@@ -37807,43 +38481,48 @@ struct uniname2ctype_pool_t
     char uniname2ctype_pool_str1233[sizeof("graphemebase")];
 #ifdef USE_UNICODE_AGE_PROPERTIES
     char uniname2ctype_pool_str1234[sizeof("age=11.0")];
-    char uniname2ctype_pool_str1235[sizeof("age=12.0")];
+    char uniname2ctype_pool_str1235[sizeof("age=12.1")];
     char uniname2ctype_pool_str1236[sizeof("age=10.0")];
-    char uniname2ctype_pool_str1237[sizeof("age=1.1")];
-    char uniname2ctype_pool_str1238[sizeof("age=2.1")];
-    char uniname2ctype_pool_str1239[sizeof("age=4.1")];
-    char uniname2ctype_pool_str1240[sizeof("age=2.0")];
-    char uniname2ctype_pool_str1241[sizeof("age=4.0")];
-    char uniname2ctype_pool_str1242[sizeof("age=9.0")];
+    char uniname2ctype_pool_str1237[sizeof("age=12.0")];
 #endif /* USE_UNICODE_AGE_PROPERTIES */
     char uniname2ctype_pool_str1243[sizeof("casedletter")];
     char uniname2ctype_pool_str1244[sizeof("ingurmukhi")];
     char uniname2ctype_pool_str1245[sizeof("odi")];
     char uniname2ctype_pool_str1246[sizeof("incjkunifiedideographsextensiona")];
 #ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str1247[sizeof("age=8.0")];
+    char uniname2ctype_pool_str1247[sizeof("age=1.1")];
 #endif /* USE_UNICODE_AGE_PROPERTIES */
     char uniname2ctype_pool_str1248[sizeof("lu")];
 #ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str1249[sizeof("age=6.1")];
-    char uniname2ctype_pool_str1250[sizeof("age=6.2")];
-    char uniname2ctype_pool_str1251[sizeof("age=6.0")];
-    char uniname2ctype_pool_str1252[sizeof("age=7.0")];
+    char uniname2ctype_pool_str1249[sizeof("age=4.1")];
+    char uniname2ctype_pool_str1250[sizeof("age=2.1")];
+    char uniname2ctype_pool_str1251[sizeof("age=4.0")];
+    char uniname2ctype_pool_str1252[sizeof("age=2.0")];
+    char uniname2ctype_pool_str1253[sizeof("age=9.0")];
 #endif /* USE_UNICODE_AGE_PROPERTIES */
     char uniname2ctype_pool_str1254[sizeof("intamilsupplement")];
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    char uniname2ctype_pool_str1255[sizeof("age=6.1")];
+#endif /* USE_UNICODE_AGE_PROPERTIES */
     char uniname2ctype_pool_str1256[sizeof("unknown")];
 #ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str1257[sizeof("age=3.1")];
-    char uniname2ctype_pool_str1258[sizeof("age=3.2")];
-    char uniname2ctype_pool_str1259[sizeof("age=3.0")];
-    char uniname2ctype_pool_str1260[sizeof("age=5.1")];
-    char uniname2ctype_pool_str1261[sizeof("age=5.2")];
-    char uniname2ctype_pool_str1262[sizeof("age=5.0")];
+    char uniname2ctype_pool_str1257[sizeof("age=6.0")];
+    char uniname2ctype_pool_str1258[sizeof("age=6.2")];
+    char uniname2ctype_pool_str1259[sizeof("age=3.1")];
+    char uniname2ctype_pool_str1260[sizeof("age=8.0")];
+    char uniname2ctype_pool_str1261[sizeof("age=3.0")];
+    char uniname2ctype_pool_str1262[sizeof("age=3.2")];
 #endif /* USE_UNICODE_AGE_PROPERTIES */
     char uniname2ctype_pool_str1263[sizeof("cwt")];
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    char uniname2ctype_pool_str1264[sizeof("age=7.0")];
+#endif /* USE_UNICODE_AGE_PROPERTIES */
     char uniname2ctype_pool_str1266[sizeof("unassigned")];
 #ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str1269[sizeof("age=6.3")];
+    char uniname2ctype_pool_str1267[sizeof("age=6.3")];
+    char uniname2ctype_pool_str1268[sizeof("age=5.1")];
+    char uniname2ctype_pool_str1270[sizeof("age=5.0")];
+    char uniname2ctype_pool_str1271[sizeof("age=5.2")];
 #endif /* USE_UNICODE_AGE_PROPERTIES */
     char uniname2ctype_pool_str1274[sizeof("ahom")];
     char uniname2ctype_pool_str1282[sizeof("incjkunifiedideographsextensione")];
@@ -38671,43 +39350,48 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "graphemebase",
 #ifdef USE_UNICODE_AGE_PROPERTIES
     "age=11.0",
-    "age=12.0",
+    "age=12.1",
     "age=10.0",
-    "age=1.1",
-    "age=2.1",
-    "age=4.1",
-    "age=2.0",
-    "age=4.0",
-    "age=9.0",
+    "age=12.0",
 #endif /* USE_UNICODE_AGE_PROPERTIES */
     "casedletter",
     "ingurmukhi",
     "odi",
     "incjkunifiedideographsextensiona",
 #ifdef USE_UNICODE_AGE_PROPERTIES
-    "age=8.0",
+    "age=1.1",
 #endif /* USE_UNICODE_AGE_PROPERTIES */
     "lu",
 #ifdef USE_UNICODE_AGE_PROPERTIES
-    "age=6.1",
-    "age=6.2",
-    "age=6.0",
-    "age=7.0",
+    "age=4.1",
+    "age=2.1",
+    "age=4.0",
+    "age=2.0",
+    "age=9.0",
 #endif /* USE_UNICODE_AGE_PROPERTIES */
     "intamilsupplement",
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    "age=6.1",
+#endif /* USE_UNICODE_AGE_PROPERTIES */
     "unknown",
 #ifdef USE_UNICODE_AGE_PROPERTIES
+    "age=6.0",
+    "age=6.2",
     "age=3.1",
-    "age=3.2",
+    "age=8.0",
     "age=3.0",
-    "age=5.1",
-    "age=5.2",
-    "age=5.0",
+    "age=3.2",
 #endif /* USE_UNICODE_AGE_PROPERTIES */
     "cwt",
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    "age=7.0",
+#endif /* USE_UNICODE_AGE_PROPERTIES */
     "unassigned",
 #ifdef USE_UNICODE_AGE_PROPERTIES
     "age=6.3",
+    "age=5.1",
+    "age=5.0",
+    "age=5.2",
 #endif /* USE_UNICODE_AGE_PROPERTIES */
     "ahom",
     "incjkunifiedideographsextensione",
@@ -39253,13 +39937,13 @@ uniname2ctype_p (register const char *str, register size_t len)
       {uniname2ctype_offset(str48), 95},
       {uniname2ctype_offset(str49), 95},
       {-1}, {-1},
-      {uniname2ctype_offset(str52), 330},
+      {uniname2ctype_offset(str52), 331},
       {-1}, {-1},
       {uniname2ctype_offset(str55), 21},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str64), 44},
       {-1},
-      {uniname2ctype_offset(str66), 318},
+      {uniname2ctype_offset(str66), 319},
       {uniname2ctype_offset(str67), 267},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str71), 181},
@@ -39275,7 +39959,7 @@ uniname2ctype_p (register const char *str, register size_t len)
       {uniname2ctype_offset(str94), 33},
       {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str100), 149},
-      {uniname2ctype_offset(str101), 495},
+      {uniname2ctype_offset(str101), 496},
       {uniname2ctype_offset(str102), 108},
       {uniname2ctype_offset(str103), 252},
       {-1}, {-1}, {-1},
@@ -39296,25 +39980,25 @@ uniname2ctype_p (register const char *str, register size_t len)
       {uniname2ctype_offset(str130), 42},
       {uniname2ctype_offset(str131), 172},
       {-1}, {-1},
-      {uniname2ctype_offset(str134), 481},
+      {uniname2ctype_offset(str134), 482},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str139), 170},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str145), 498},
-      {uniname2ctype_offset(str146), 547},
+      {uniname2ctype_offset(str145), 499},
+      {uniname2ctype_offset(str146), 548},
       {-1},
-      {uniname2ctype_offset(str148), 551},
-      {uniname2ctype_offset(str149), 513},
+      {uniname2ctype_offset(str148), 552},
+      {uniname2ctype_offset(str149), 514},
       {-1},
       {uniname2ctype_offset(str151), 18},
       {uniname2ctype_offset(str152), 169},
       {uniname2ctype_offset(str153), 160},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str161), 312},
+      {uniname2ctype_offset(str161), 313},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str177), 336},
-      {uniname2ctype_offset(str178), 538},
+      {uniname2ctype_offset(str177), 337},
+      {uniname2ctype_offset(str178), 539},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str183), 75},
       {-1}, {-1},
@@ -39323,15 +40007,15 @@ uniname2ctype_p (register const char *str, register size_t len)
       {uniname2ctype_offset(str190), 208},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str203), 344},
-      {uniname2ctype_offset(str204), 472},
+      {uniname2ctype_offset(str203), 345},
+      {uniname2ctype_offset(str204), 473},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str210), 552},
+      {uniname2ctype_offset(str210), 553},
       {-1},
-      {uniname2ctype_offset(str212), 349},
+      {uniname2ctype_offset(str212), 350},
       {uniname2ctype_offset(str213), 115},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str218), 527},
+      {uniname2ctype_offset(str218), 528},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str226), 171},
       {-1}, {-1}, {-1}, {-1},
@@ -39346,37 +40030,37 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1},
       {uniname2ctype_offset(str253), 102},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str260), 541},
+      {uniname2ctype_offset(str260), 542},
       {-1}, {-1},
       {uniname2ctype_offset(str263), 161},
       {-1},
       {uniname2ctype_offset(str265), 19},
       {-1},
       {uniname2ctype_offset(str267), 79},
-      {uniname2ctype_offset(str268), 341},
+      {uniname2ctype_offset(str268), 342},
       {-1},
       {uniname2ctype_offset(str270), 259},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str274), 540},
-      {uniname2ctype_offset(str275), 499},
+      {uniname2ctype_offset(str274), 541},
+      {uniname2ctype_offset(str275), 500},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str281), 306},
+      {uniname2ctype_offset(str281), 307},
       {uniname2ctype_offset(str282), 40},
       {uniname2ctype_offset(str283), 79},
       {-1},
-      {uniname2ctype_offset(str285), 515},
+      {uniname2ctype_offset(str285), 516},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str289), 535},
+      {uniname2ctype_offset(str289), 536},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str293), 218},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str297), 212},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str301), 379},
+      {uniname2ctype_offset(str301), 380},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str311), 310},
+      {uniname2ctype_offset(str311), 311},
       {-1},
-      {uniname2ctype_offset(str313), 440},
+      {uniname2ctype_offset(str313), 441},
       {-1},
       {uniname2ctype_offset(str315), 232},
       {-1}, {-1}, {-1}, {-1},
@@ -39384,26 +40068,26 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1},
       {uniname2ctype_offset(str322), 129},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str328), 319},
+      {uniname2ctype_offset(str328), 320},
       {-1}, {-1},
       {uniname2ctype_offset(str331), 76},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str335), 536},
+      {uniname2ctype_offset(str335), 537},
       {-1}, {-1},
-      {uniname2ctype_offset(str338), 317},
+      {uniname2ctype_offset(str338), 318},
       {-1},
       {uniname2ctype_offset(str340), 76},
       {-1},
-      {uniname2ctype_offset(str342), 333},
+      {uniname2ctype_offset(str342), 334},
       {-1}, {-1},
       {uniname2ctype_offset(str345), 53},
       {uniname2ctype_offset(str346), 259},
       {-1},
-      {uniname2ctype_offset(str348), 410},
+      {uniname2ctype_offset(str348), 411},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str352), 511},
+      {uniname2ctype_offset(str352), 512},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str357), 531},
+      {uniname2ctype_offset(str357), 532},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str362), 163},
       {-1}, {-1}, {-1},
@@ -39414,12 +40098,12 @@ uniname2ctype_p (register const char *str, register size_t len)
       {uniname2ctype_offset(str376), 144},
       {uniname2ctype_offset(str377), 144},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str386), 355},
+      {uniname2ctype_offset(str386), 356},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str399), 315},
+      {uniname2ctype_offset(str399), 316},
       {-1},
-      {uniname2ctype_offset(str401), 526},
+      {uniname2ctype_offset(str401), 527},
       {-1}, {-1},
       {uniname2ctype_offset(str404), 81},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -39441,16 +40125,16 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1},
       {uniname2ctype_offset(str470), 22},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str475), 506},
+      {uniname2ctype_offset(str475), 507},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str480), 441},
+      {uniname2ctype_offset(str480), 442},
       {uniname2ctype_offset(str481), 188},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str486), 460},
+      {uniname2ctype_offset(str486), 461},
       {-1},
-      {uniname2ctype_offset(str488), 556},
+      {uniname2ctype_offset(str488), 557},
       {-1}, {-1},
-      {uniname2ctype_offset(str491), 454},
+      {uniname2ctype_offset(str491), 455},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str500), 127},
       {-1}, {-1}, {-1},
@@ -39460,72 +40144,72 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1},
       {uniname2ctype_offset(str509), 24},
       {-1},
-      {uniname2ctype_offset(str511), 447},
+      {uniname2ctype_offset(str511), 448},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str520), 407},
+      {uniname2ctype_offset(str520), 408},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str535), 70},
       {-1}, {-1},
       {uniname2ctype_offset(str538), 91},
       {-1}, {-1},
-      {uniname2ctype_offset(str541), 530},
+      {uniname2ctype_offset(str541), 531},
       {-1},
       {uniname2ctype_offset(str543), 91},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str556), 524},
+      {uniname2ctype_offset(str556), 525},
       {-1},
-      {uniname2ctype_offset(str558), 334},
+      {uniname2ctype_offset(str558), 335},
       {-1},
-      {uniname2ctype_offset(str560), 497},
+      {uniname2ctype_offset(str560), 498},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str565), 585},
+      {uniname2ctype_offset(str565), 586},
       {uniname2ctype_offset(str566), 37},
       {-1},
       {uniname2ctype_offset(str568), 113},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str572), 485},
+      {uniname2ctype_offset(str572), 486},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str577), 572},
+      {uniname2ctype_offset(str577), 573},
       {uniname2ctype_offset(str578), 70},
       {uniname2ctype_offset(str579), 106},
       {-1}, {-1},
-      {uniname2ctype_offset(str582), 390},
-      {uniname2ctype_offset(str583), 464},
+      {uniname2ctype_offset(str582), 391},
+      {uniname2ctype_offset(str583), 465},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str590), 74},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str594), 168},
       {-1},
-      {uniname2ctype_offset(str596), 583},
+      {uniname2ctype_offset(str596), 584},
       {uniname2ctype_offset(str597), 146},
       {-1}, {-1},
-      {uniname2ctype_offset(str600), 474},
+      {uniname2ctype_offset(str600), 475},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str604), 550},
-      {uniname2ctype_offset(str605), 590},
+      {uniname2ctype_offset(str604), 551},
+      {uniname2ctype_offset(str605), 591},
       {-1}, {-1},
-      {uniname2ctype_offset(str608), 597},
+      {uniname2ctype_offset(str608), 598},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str614), 573},
+      {uniname2ctype_offset(str614), 574},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str624), 195},
-      {uniname2ctype_offset(str625), 431},
+      {uniname2ctype_offset(str625), 432},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str630), 29},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str636), 521},
+      {uniname2ctype_offset(str636), 522},
       {-1}, {-1},
       {uniname2ctype_offset(str639), 49},
       {-1}, {-1},
       {uniname2ctype_offset(str642), 19},
       {-1}, {-1},
-      {uniname2ctype_offset(str645), 469},
+      {uniname2ctype_offset(str645), 470},
       {-1},
       {uniname2ctype_offset(str647), 192},
       {-1}, {-1},
-      {uniname2ctype_offset(str650), 471},
+      {uniname2ctype_offset(str650), 472},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str657), 51},
       {-1}, {-1},
@@ -39533,44 +40217,44 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str668), 69},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str672), 320},
+      {uniname2ctype_offset(str672), 321},
       {-1}, {-1},
       {uniname2ctype_offset(str675), 68},
       {-1}, {-1},
       {uniname2ctype_offset(str678), 171},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str695), 529},
+      {uniname2ctype_offset(str695), 530},
       {uniname2ctype_offset(str696), 175},
-      {uniname2ctype_offset(str697), 383},
+      {uniname2ctype_offset(str697), 384},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str703), 507},
+      {uniname2ctype_offset(str703), 508},
       {-1},
-      {uniname2ctype_offset(str705), 331},
+      {uniname2ctype_offset(str705), 332},
       {-1},
       {uniname2ctype_offset(str707), 158},
-      {uniname2ctype_offset(str708), 555},
+      {uniname2ctype_offset(str708), 556},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str713), 360},
+      {uniname2ctype_offset(str713), 361},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str720), 72},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str737), 7},
-      {uniname2ctype_offset(str738), 357},
+      {uniname2ctype_offset(str738), 358},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str742), 6},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
       {uniname2ctype_offset(str753), 229},
       {-1},
-      {uniname2ctype_offset(str755), 496},
+      {uniname2ctype_offset(str755), 497},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str760), 415},
+      {uniname2ctype_offset(str760), 416},
       {uniname2ctype_offset(str761), 167},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str766), 156},
-      {uniname2ctype_offset(str767), 571},
+      {uniname2ctype_offset(str767), 572},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str771), 167},
       {uniname2ctype_offset(str772), 256},
@@ -39583,27 +40267,27 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str791), 193},
       {-1}, {-1},
-      {uniname2ctype_offset(str794), 557},
+      {uniname2ctype_offset(str794), 558},
       {-1}, {-1},
       {uniname2ctype_offset(str797), 50},
       {-1},
-      {uniname2ctype_offset(str799), 578},
+      {uniname2ctype_offset(str799), 579},
       {-1}, {-1},
       {uniname2ctype_offset(str802), 13},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str809), 430},
+      {uniname2ctype_offset(str809), 431},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str814), 477},
+      {uniname2ctype_offset(str814), 478},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str818), 382},
+      {uniname2ctype_offset(str818), 383},
       {-1}, {-1},
-      {uniname2ctype_offset(str821), 466},
-      {uniname2ctype_offset(str822), 562},
+      {uniname2ctype_offset(str821), 467},
+      {uniname2ctype_offset(str822), 563},
       {uniname2ctype_offset(str823), 47},
       {uniname2ctype_offset(str824), 112},
-      {uniname2ctype_offset(str825), 428},
+      {uniname2ctype_offset(str825), 429},
       {-1}, {-1},
-      {uniname2ctype_offset(str828), 563},
+      {uniname2ctype_offset(str828), 564},
       {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str834), 258},
       {-1}, {-1}, {-1},
@@ -39618,32 +40302,32 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str855), 67},
       {-1},
-      {uniname2ctype_offset(str857), 304},
+      {uniname2ctype_offset(str857), 305},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str862), 88},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str875), 353},
+      {uniname2ctype_offset(str875), 354},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
-      {uniname2ctype_offset(str886), 388},
+      {uniname2ctype_offset(str886), 389},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str895), 396},
+      {uniname2ctype_offset(str895), 397},
       {-1}, {-1},
-      {uniname2ctype_offset(str898), 484},
+      {uniname2ctype_offset(str898), 485},
       {-1},
-      {uniname2ctype_offset(str900), 582},
+      {uniname2ctype_offset(str900), 583},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str906), 503},
-      {uniname2ctype_offset(str907), 433},
+      {uniname2ctype_offset(str906), 504},
+      {uniname2ctype_offset(str907), 434},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str924), 68},
       {-1},
-      {uniname2ctype_offset(str926), 328},
+      {uniname2ctype_offset(str926), 329},
       {-1},
-      {uniname2ctype_offset(str928), 518},
-      {uniname2ctype_offset(str929), 445},
+      {uniname2ctype_offset(str928), 519},
+      {uniname2ctype_offset(str929), 446},
       {uniname2ctype_offset(str930), 41},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -39655,34 +40339,34 @@ uniname2ctype_p (register const char *str, register size_t len)
       {uniname2ctype_offset(str963), 246},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
-      {uniname2ctype_offset(str974), 492},
+      {uniname2ctype_offset(str974), 493},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1},
-      {uniname2ctype_offset(str986), 354},
+      {uniname2ctype_offset(str986), 355},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str994), 85},
       {uniname2ctype_offset(str995), 104},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1005), 53},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1009), 403},
+      {uniname2ctype_offset(str1009), 404},
       {uniname2ctype_offset(str1010), 26},
       {-1}, {-1},
-      {uniname2ctype_offset(str1013), 479},
-      {uniname2ctype_offset(str1014), 565},
-      {uniname2ctype_offset(str1015), 468},
+      {uniname2ctype_offset(str1013), 480},
+      {uniname2ctype_offset(str1014), 566},
+      {uniname2ctype_offset(str1015), 469},
       {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1021), 67},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1025), 443},
+      {uniname2ctype_offset(str1025), 444},
       {-1}, {-1},
       {uniname2ctype_offset(str1028), 136},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1032), 239},
       {uniname2ctype_offset(str1033), 71},
       {-1},
-      {uniname2ctype_offset(str1035), 307},
-      {uniname2ctype_offset(str1036), 542},
+      {uniname2ctype_offset(str1035), 308},
+      {uniname2ctype_offset(str1036), 543},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1049), 173},
@@ -39695,33 +40379,33 @@ uniname2ctype_p (register const char *str, register size_t len)
       {uniname2ctype_offset(str1072), 197},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1080), 210},
-      {uniname2ctype_offset(str1081), 398},
+      {uniname2ctype_offset(str1081), 399},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1085), 248},
       {-1},
-      {uniname2ctype_offset(str1087), 566},
+      {uniname2ctype_offset(str1087), 567},
       {-1}, {-1},
       {uniname2ctype_offset(str1090), 69},
       {uniname2ctype_offset(str1091), 11},
       {-1},
       {uniname2ctype_offset(str1093), 125},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1097), 519},
+      {uniname2ctype_offset(str1097), 520},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1102), 505},
+      {uniname2ctype_offset(str1102), 506},
       {-1}, {-1},
       {uniname2ctype_offset(str1105), 217},
       {-1},
-      {uniname2ctype_offset(str1107), 520},
+      {uniname2ctype_offset(str1107), 521},
       {-1},
       {uniname2ctype_offset(str1109), 228},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1119), 106},
       {uniname2ctype_offset(str1120), 60},
-      {uniname2ctype_offset(str1121), 364},
+      {uniname2ctype_offset(str1121), 365},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1134), 409},
+      {uniname2ctype_offset(str1134), 410},
       {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1140), 93},
       {-1},
@@ -39732,7 +40416,7 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1},
       {uniname2ctype_offset(str1149), 158},
       {uniname2ctype_offset(str1150), 98},
-      {uniname2ctype_offset(str1151), 482},
+      {uniname2ctype_offset(str1151), 483},
       {uniname2ctype_offset(str1152), 217},
       {uniname2ctype_offset(str1153), 138},
       {-1}, {-1}, {-1},
@@ -39743,107 +40427,115 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1168), 104},
       {-1},
-      {uniname2ctype_offset(str1170), 373},
-      {uniname2ctype_offset(str1171), 514},
+      {uniname2ctype_offset(str1170), 374},
+      {uniname2ctype_offset(str1171), 515},
       {-1}, {-1},
-      {uniname2ctype_offset(str1174), 311},
+      {uniname2ctype_offset(str1174), 312},
       {uniname2ctype_offset(str1175), 26},
       {uniname2ctype_offset(str1176), 208},
       {uniname2ctype_offset(str1177), 74},
-      {uniname2ctype_offset(str1178), 337},
+      {uniname2ctype_offset(str1178), 338},
       {-1},
       {uniname2ctype_offset(str1180), 183},
       {uniname2ctype_offset(str1181), 151},
-      {uniname2ctype_offset(str1182), 343},
+      {uniname2ctype_offset(str1182), 344},
       {uniname2ctype_offset(str1183), 101},
       {-1},
       {uniname2ctype_offset(str1185), 170},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1190), 261},
-      {uniname2ctype_offset(str1191), 523},
+      {uniname2ctype_offset(str1191), 524},
       {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1197), 101},
       {uniname2ctype_offset(str1198), 135},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1203), 350},
+      {uniname2ctype_offset(str1203), 351},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1207), 446},
+      {uniname2ctype_offset(str1207), 447},
       {uniname2ctype_offset(str1208), 239},
       {uniname2ctype_offset(str1209), 186},
       {uniname2ctype_offset(str1210), 137},
       {-1},
-      {uniname2ctype_offset(str1212), 363},
+      {uniname2ctype_offset(str1212), 364},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1227), 232},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1231), 206},
-      {uniname2ctype_offset(str1232), 339},
+      {uniname2ctype_offset(str1232), 340},
       {uniname2ctype_offset(str1233), 73},
 #ifndef USE_UNICODE_AGE_PROPERTIES
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
 #else /* USE_UNICODE_AGE_PROPERTIES */
       {uniname2ctype_offset(str1234), 287},
-      {uniname2ctype_offset(str1235), 288},
+      {uniname2ctype_offset(str1235), 289},
       {uniname2ctype_offset(str1236), 286},
-      {uniname2ctype_offset(str1237), 268},
-      {uniname2ctype_offset(str1238), 270},
-      {uniname2ctype_offset(str1239), 275},
-      {uniname2ctype_offset(str1240), 269},
-      {uniname2ctype_offset(str1241), 274},
-      {uniname2ctype_offset(str1242), 285},
+      {uniname2ctype_offset(str1237), 288},
+      {-1}, {-1}, {-1}, {-1}, {-1},
 #endif /* USE_UNICODE_AGE_PROPERTIES */
       {uniname2ctype_offset(str1243), 25},
-      {uniname2ctype_offset(str1244), 325},
+      {uniname2ctype_offset(str1244), 326},
       {uniname2ctype_offset(str1245), 249},
-      {uniname2ctype_offset(str1246), 419},
+      {uniname2ctype_offset(str1246), 420},
 #ifndef USE_UNICODE_AGE_PROPERTIES
       {-1},
 #else /* USE_UNICODE_AGE_PROPERTIES */
-      {uniname2ctype_offset(str1247), 284},
+      {uniname2ctype_offset(str1247), 268},
 #endif /* USE_UNICODE_AGE_PROPERTIES */
       {uniname2ctype_offset(str1248), 30},
 #ifndef USE_UNICODE_AGE_PROPERTIES
       {-1}, {-1}, {-1}, {-1}, {-1},
 #else /* USE_UNICODE_AGE_PROPERTIES */
-      {uniname2ctype_offset(str1249), 280},
-      {uniname2ctype_offset(str1250), 281},
-      {uniname2ctype_offset(str1251), 279},
-      {uniname2ctype_offset(str1252), 283},
-      {-1},
+      {uniname2ctype_offset(str1249), 275},
+      {uniname2ctype_offset(str1250), 270},
+      {uniname2ctype_offset(str1251), 274},
+      {uniname2ctype_offset(str1252), 269},
+      {uniname2ctype_offset(str1253), 285},
 #endif /* USE_UNICODE_AGE_PROPERTIES */
-      {uniname2ctype_offset(str1254), 539},
+      {uniname2ctype_offset(str1254), 540},
+#ifndef USE_UNICODE_AGE_PROPERTIES
       {-1},
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1255), 280},
+#endif /* USE_UNICODE_AGE_PROPERTIES */
       {uniname2ctype_offset(str1256), 267},
 #ifndef USE_UNICODE_AGE_PROPERTIES
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
 #else /* USE_UNICODE_AGE_PROPERTIES */
-      {uniname2ctype_offset(str1257), 272},
-      {uniname2ctype_offset(str1258), 273},
-      {uniname2ctype_offset(str1259), 271},
-      {uniname2ctype_offset(str1260), 277},
-      {uniname2ctype_offset(str1261), 278},
-      {uniname2ctype_offset(str1262), 276},
+      {uniname2ctype_offset(str1257), 279},
+      {uniname2ctype_offset(str1258), 281},
+      {uniname2ctype_offset(str1259), 272},
+      {uniname2ctype_offset(str1260), 284},
+      {uniname2ctype_offset(str1261), 271},
+      {uniname2ctype_offset(str1262), 273},
 #endif /* USE_UNICODE_AGE_PROPERTIES */
       {uniname2ctype_offset(str1263), 64},
+#ifndef USE_UNICODE_AGE_PROPERTIES
       {-1}, {-1},
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1264), 283},
+      {-1},
+#endif /* USE_UNICODE_AGE_PROPERTIES */
       {uniname2ctype_offset(str1266), 21},
 #ifndef USE_UNICODE_AGE_PROPERTIES
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
 #else /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1267), 282},
+      {uniname2ctype_offset(str1268), 277},
+      {-1},
+      {uniname2ctype_offset(str1270), 276},
+      {uniname2ctype_offset(str1271), 278},
       {-1}, {-1},
-      {uniname2ctype_offset(str1269), 282},
-      {-1}, {-1}, {-1}, {-1},
 #endif /* USE_UNICODE_AGE_PROPERTIES */
       {uniname2ctype_offset(str1274), 200},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1282), 595},
+      {uniname2ctype_offset(str1282), 596},
       {-1}, {-1},
       {uniname2ctype_offset(str1285), 105},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1289), 332},
+      {uniname2ctype_offset(str1289), 333},
       {-1}, {-1},
-      {uniname2ctype_offset(str1292), 381},
+      {uniname2ctype_offset(str1292), 382},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1297), 145},
       {-1}, {-1},
@@ -39869,13 +40561,13 @@ uniname2ctype_p (register const char *str, register size_t len)
       {uniname2ctype_offset(str1354), 164},
       {uniname2ctype_offset(str1355), 254},
       {-1}, {-1},
-      {uniname2ctype_offset(str1358), 593},
+      {uniname2ctype_offset(str1358), 594},
       {-1},
       {uniname2ctype_offset(str1360), 3},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1365), 371},
+      {uniname2ctype_offset(str1365), 372},
       {uniname2ctype_offset(str1366), 36},
-      {uniname2ctype_offset(str1367), 512},
+      {uniname2ctype_offset(str1367), 513},
       {-1},
       {uniname2ctype_offset(str1369), 247},
       {-1}, {-1}, {-1},
@@ -39891,7 +40583,7 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1400), 201},
-      {uniname2ctype_offset(str1401), 384},
+      {uniname2ctype_offset(str1401), 385},
       {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1407), 224},
       {-1},
@@ -39900,7 +40592,7 @@ uniname2ctype_p (register const char *str, register size_t len)
       {uniname2ctype_offset(str1419), 140},
       {uniname2ctype_offset(str1420), 140},
       {-1},
-      {uniname2ctype_offset(str1422), 309},
+      {uniname2ctype_offset(str1422), 310},
       {uniname2ctype_offset(str1423), 143},
       {-1}, {-1},
       {uniname2ctype_offset(str1426), 39},
@@ -39909,14 +40601,14 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1434), 143},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1438), 421},
+      {uniname2ctype_offset(str1438), 422},
       {-1}, {-1},
       {uniname2ctype_offset(str1441), 215},
-      {uniname2ctype_offset(str1442), 522},
+      {uniname2ctype_offset(str1442), 523},
       {-1}, {-1},
       {uniname2ctype_offset(str1445), 253},
       {-1}, {-1},
-      {uniname2ctype_offset(str1448), 490},
+      {uniname2ctype_offset(str1448), 491},
       {uniname2ctype_offset(str1449), 122},
       {uniname2ctype_offset(str1450), 134},
       {uniname2ctype_offset(str1451), 203},
@@ -39925,29 +40617,29 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1},
       {uniname2ctype_offset(str1457), 166},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1462), 534},
+      {uniname2ctype_offset(str1462), 535},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1466), 241},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1470), 489},
-      {uniname2ctype_offset(str1471), 491},
+      {uniname2ctype_offset(str1470), 490},
+      {uniname2ctype_offset(str1471), 492},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1475), 413},
-      {uniname2ctype_offset(str1476), 493},
+      {uniname2ctype_offset(str1475), 414},
+      {uniname2ctype_offset(str1476), 494},
       {-1},
-      {uniname2ctype_offset(str1478), 435},
+      {uniname2ctype_offset(str1478), 436},
       {-1}, {-1},
       {uniname2ctype_offset(str1481), 138},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1485), 327},
+      {uniname2ctype_offset(str1485), 328},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1489), 33},
       {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1495), 251},
       {-1},
-      {uniname2ctype_offset(str1497), 483},
+      {uniname2ctype_offset(str1497), 484},
       {uniname2ctype_offset(str1498), 199},
-      {uniname2ctype_offset(str1499), 581},
+      {uniname2ctype_offset(str1499), 582},
       {-1},
       {uniname2ctype_offset(str1501), 196},
       {-1}, {-1}, {-1}, {-1}, {-1},
@@ -39957,17 +40649,17 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1},
       {uniname2ctype_offset(str1512), 110},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1517), 580},
+      {uniname2ctype_offset(str1517), 581},
       {-1},
       {uniname2ctype_offset(str1519), 219},
       {uniname2ctype_offset(str1520), 228},
       {-1}, {-1},
       {uniname2ctype_offset(str1523), 117},
-      {uniname2ctype_offset(str1524), 470},
+      {uniname2ctype_offset(str1524), 471},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1529), 120},
       {-1},
-      {uniname2ctype_offset(str1531), 406},
+      {uniname2ctype_offset(str1531), 407},
       {-1},
       {uniname2ctype_offset(str1533), 142},
       {-1},
@@ -39975,13 +40667,13 @@ uniname2ctype_p (register const char *str, register size_t len)
       {uniname2ctype_offset(str1536), 127},
       {uniname2ctype_offset(str1537), 260},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1542), 452},
+      {uniname2ctype_offset(str1542), 453},
       {-1},
-      {uniname2ctype_offset(str1544), 560},
+      {uniname2ctype_offset(str1544), 561},
       {-1}, {-1},
       {uniname2ctype_offset(str1547), 168},
-      {uniname2ctype_offset(str1548), 517},
-      {uniname2ctype_offset(str1549), 504},
+      {uniname2ctype_offset(str1548), 518},
+      {uniname2ctype_offset(str1549), 505},
       {-1}, {-1},
       {uniname2ctype_offset(str1552), 117},
       {-1}, {-1},
@@ -39991,7 +40683,7 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1563), 264},
       {-1},
-      {uniname2ctype_offset(str1565), 314},
+      {uniname2ctype_offset(str1565), 315},
       {-1},
       {uniname2ctype_offset(str1567), 148},
       {-1},
@@ -40003,7 +40695,7 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1},
       {uniname2ctype_offset(str1582), 148},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1587), 528},
+      {uniname2ctype_offset(str1587), 529},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1594), 114},
       {-1}, {-1},
@@ -40015,10 +40707,10 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1613), 164},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1617), 487},
+      {uniname2ctype_offset(str1617), 488},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1622), 372},
-      {uniname2ctype_offset(str1623), 545},
+      {uniname2ctype_offset(str1622), 373},
+      {uniname2ctype_offset(str1623), 546},
       {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1629), 39},
       {-1},
@@ -40026,23 +40718,23 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1635), 72},
       {-1}, {-1},
-      {uniname2ctype_offset(str1638), 425},
+      {uniname2ctype_offset(str1638), 426},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1643), 62},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
-      {uniname2ctype_offset(str1654), 387},
+      {uniname2ctype_offset(str1654), 388},
       {uniname2ctype_offset(str1655), 265},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1662), 129},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1671), 114},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1675), 456},
+      {uniname2ctype_offset(str1675), 457},
       {uniname2ctype_offset(str1676), 176},
-      {uniname2ctype_offset(str1677), 302},
+      {uniname2ctype_offset(str1677), 303},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1682), 594},
+      {uniname2ctype_offset(str1682), 595},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1686), 93},
       {uniname2ctype_offset(str1687), 141},
@@ -40050,24 +40742,24 @@ uniname2ctype_p (register const char *str, register size_t len)
       {uniname2ctype_offset(str1691), 124},
       {uniname2ctype_offset(str1692), 121},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1699), 366},
+      {uniname2ctype_offset(str1699), 367},
       {-1}, {-1},
-      {uniname2ctype_offset(str1702), 509},
-      {uniname2ctype_offset(str1703), 532},
+      {uniname2ctype_offset(str1702), 510},
+      {uniname2ctype_offset(str1703), 533},
       {uniname2ctype_offset(str1704), 207},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1714), 207},
       {-1},
-      {uniname2ctype_offset(str1716), 418},
+      {uniname2ctype_offset(str1716), 419},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1722), 346},
+      {uniname2ctype_offset(str1722), 347},
       {-1},
-      {uniname2ctype_offset(str1724), 553},
+      {uniname2ctype_offset(str1724), 554},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1728), 221},
-      {uniname2ctype_offset(str1729), 429},
+      {uniname2ctype_offset(str1729), 430},
       {uniname2ctype_offset(str1730), 222},
-      {uniname2ctype_offset(str1731), 516},
+      {uniname2ctype_offset(str1731), 517},
       {uniname2ctype_offset(str1732), 238},
       {uniname2ctype_offset(str1733), 123},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -40075,18 +40767,18 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1},
       {uniname2ctype_offset(str1742), 161},
       {-1}, {-1},
-      {uniname2ctype_offset(str1745), 508},
-      {uniname2ctype_offset(str1746), 389},
+      {uniname2ctype_offset(str1745), 509},
+      {uniname2ctype_offset(str1746), 390},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1750), 20},
       {-1},
-      {uniname2ctype_offset(str1752), 501},
+      {uniname2ctype_offset(str1752), 502},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1757), 500},
+      {uniname2ctype_offset(str1757), 501},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1766), 73},
       {-1}, {-1},
-      {uniname2ctype_offset(str1769), 361},
+      {uniname2ctype_offset(str1769), 362},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1776), 126},
       {-1}, {-1}, {-1},
@@ -40097,28 +40789,28 @@ uniname2ctype_p (register const char *str, register size_t len)
       {uniname2ctype_offset(str1791), 233},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1806), 335},
+      {uniname2ctype_offset(str1806), 336},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1810), 598},
+      {uniname2ctype_offset(str1810), 599},
       {uniname2ctype_offset(str1811), 236},
       {-1},
       {uniname2ctype_offset(str1813), 255},
       {-1}, {-1},
-      {uniname2ctype_offset(str1816), 564},
+      {uniname2ctype_offset(str1816), 565},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1821), 224},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1825), 258},
       {uniname2ctype_offset(str1826), 202},
       {-1},
-      {uniname2ctype_offset(str1828), 386},
+      {uniname2ctype_offset(str1828), 387},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1838), 584},
+      {uniname2ctype_offset(str1838), 585},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1842), 378},
+      {uniname2ctype_offset(str1842), 379},
       {uniname2ctype_offset(str1843), 134},
       {-1}, {-1},
-      {uniname2ctype_offset(str1846), 480},
+      {uniname2ctype_offset(str1846), 481},
       {-1},
       {uniname2ctype_offset(str1848), 109},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -40127,71 +40819,71 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1866), 61},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1871), 478},
+      {uniname2ctype_offset(str1871), 479},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1878), 27},
       {-1}, {-1},
       {uniname2ctype_offset(str1881), 63},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1891), 150},
-      {uniname2ctype_offset(str1892), 561},
+      {uniname2ctype_offset(str1892), 562},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1896), 587},
+      {uniname2ctype_offset(str1896), 588},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1904), 439},
-      {uniname2ctype_offset(str1905), 558},
+      {uniname2ctype_offset(str1904), 440},
+      {uniname2ctype_offset(str1905), 559},
       {uniname2ctype_offset(str1906), 150},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1911), 342},
+      {uniname2ctype_offset(str1911), 343},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1915), 165},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1928), 423},
-      {uniname2ctype_offset(str1929), 416},
-      {uniname2ctype_offset(str1930), 444},
+      {uniname2ctype_offset(str1928), 424},
+      {uniname2ctype_offset(str1929), 417},
+      {uniname2ctype_offset(str1930), 445},
       {-1},
-      {uniname2ctype_offset(str1932), 399},
+      {uniname2ctype_offset(str1932), 400},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1936), 322},
+      {uniname2ctype_offset(str1936), 323},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
       {uniname2ctype_offset(str1947), 194},
       {-1}, {-1},
-      {uniname2ctype_offset(str1950), 408},
+      {uniname2ctype_offset(str1950), 409},
       {uniname2ctype_offset(str1951), 12},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1958), 109},
       {-1}, {-1},
       {uniname2ctype_offset(str1961), 103},
       {-1}, {-1},
-      {uniname2ctype_offset(str1964), 424},
+      {uniname2ctype_offset(str1964), 425},
       {-1}, {-1},
-      {uniname2ctype_offset(str1967), 476},
-      {uniname2ctype_offset(str1968), 602},
+      {uniname2ctype_offset(str1967), 477},
+      {uniname2ctype_offset(str1968), 603},
       {-1}, {-1},
       {uniname2ctype_offset(str1971), 153},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1985), 392},
+      {uniname2ctype_offset(str1985), 393},
       {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1991), 1},
       {-1},
-      {uniname2ctype_offset(str1993), 359},
+      {uniname2ctype_offset(str1993), 360},
       {uniname2ctype_offset(str1994), 175},
       {-1},
       {uniname2ctype_offset(str1996), 42},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2006), 394},
+      {uniname2ctype_offset(str2006), 395},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2010), 362},
+      {uniname2ctype_offset(str2010), 363},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2014), 321},
+      {uniname2ctype_offset(str2014), 322},
       {-1},
       {uniname2ctype_offset(str2016), 209},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2023), 32},
-      {uniname2ctype_offset(str2024), 488},
+      {uniname2ctype_offset(str2024), 489},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2033), 78},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -40207,17 +40899,17 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2070), 9},
       {-1}, {-1},
-      {uniname2ctype_offset(str2073), 329},
+      {uniname2ctype_offset(str2073), 330},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2078), 245},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2083), 323},
+      {uniname2ctype_offset(str2083), 324},
       {uniname2ctype_offset(str2084), 154},
       {uniname2ctype_offset(str2085), 20},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2093), 192},
       {-1},
-      {uniname2ctype_offset(str2095), 340},
+      {uniname2ctype_offset(str2095), 341},
       {-1},
       {uniname2ctype_offset(str2097), 214},
       {uniname2ctype_offset(str2098), 8},
@@ -40242,12 +40934,12 @@ uniname2ctype_p (register const char *str, register size_t len)
       {uniname2ctype_offset(str2137), 172},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2145), 52},
-      {uniname2ctype_offset(str2146), 400},
+      {uniname2ctype_offset(str2146), 401},
       {-1}, {-1},
       {uniname2ctype_offset(str2149), 221},
       {uniname2ctype_offset(str2150), 121},
       {-1}, {-1},
-      {uniname2ctype_offset(str2153), 351},
+      {uniname2ctype_offset(str2153), 352},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2161), 233},
       {-1}, {-1}, {-1},
@@ -40263,43 +40955,43 @@ uniname2ctype_p (register const char *str, register size_t len)
       {uniname2ctype_offset(str2182), 87},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2195), 338},
+      {uniname2ctype_offset(str2195), 339},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2199), 159},
       {-1},
       {uniname2ctype_offset(str2201), 89},
       {-1}, {-1},
-      {uniname2ctype_offset(str2204), 368},
+      {uniname2ctype_offset(str2204), 369},
       {-1}, {-1},
       {uniname2ctype_offset(str2207), 196},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2217), 128},
-      {uniname2ctype_offset(str2218), 525},
+      {uniname2ctype_offset(str2218), 526},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2222), 457},
+      {uniname2ctype_offset(str2222), 458},
       {-1},
-      {uniname2ctype_offset(str2224), 437},
-      {uniname2ctype_offset(str2225), 458},
+      {uniname2ctype_offset(str2224), 438},
+      {uniname2ctype_offset(str2225), 459},
       {-1}, {-1},
       {uniname2ctype_offset(str2228), 82},
       {uniname2ctype_offset(str2229), 35},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2235), 473},
+      {uniname2ctype_offset(str2235), 474},
       {-1}, {-1},
       {uniname2ctype_offset(str2238), 154},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2244), 427},
+      {uniname2ctype_offset(str2244), 428},
       {-1}, {-1},
       {uniname2ctype_offset(str2247), 36},
-      {uniname2ctype_offset(str2248), 568},
+      {uniname2ctype_offset(str2248), 569},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2252), 240},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2258), 442},
+      {uniname2ctype_offset(str2258), 443},
       {-1},
       {uniname2ctype_offset(str2260), 235},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2268), 596},
+      {uniname2ctype_offset(str2268), 597},
       {-1}, {-1},
       {uniname2ctype_offset(str2271), 18},
       {uniname2ctype_offset(str2272), 254},
@@ -40312,32 +41004,32 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2294), 88},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2302), 367},
+      {uniname2ctype_offset(str2302), 368},
       {-1}, {-1},
       {uniname2ctype_offset(str2305), 205},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2312), 177},
       {-1}, {-1},
-      {uniname2ctype_offset(str2315), 567},
+      {uniname2ctype_offset(str2315), 568},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2321), 369},
+      {uniname2ctype_offset(str2321), 370},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2339), 599},
+      {uniname2ctype_offset(str2339), 600},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2343), 559},
+      {uniname2ctype_offset(str2343), 560},
       {uniname2ctype_offset(str2344), 82},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2357), 237},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2361), 570},
+      {uniname2ctype_offset(str2361), 571},
       {-1}, {-1},
-      {uniname2ctype_offset(str2364), 308},
-      {uniname2ctype_offset(str2365), 402},
+      {uniname2ctype_offset(str2364), 309},
+      {uniname2ctype_offset(str2365), 403},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2373), 37},
-      {uniname2ctype_offset(str2374), 376},
+      {uniname2ctype_offset(str2374), 377},
       {uniname2ctype_offset(str2375), 197},
       {-1}, {-1},
       {uniname2ctype_offset(str2378), 237},
@@ -40345,18 +41037,18 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1},
       {uniname2ctype_offset(str2389), 204},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2396), 375},
-      {uniname2ctype_offset(str2397), 405},
-      {uniname2ctype_offset(str2398), 397},
+      {uniname2ctype_offset(str2396), 376},
+      {uniname2ctype_offset(str2397), 406},
+      {uniname2ctype_offset(str2398), 398},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2415), 401},
-      {uniname2ctype_offset(str2416), 365},
+      {uniname2ctype_offset(str2415), 402},
+      {uniname2ctype_offset(str2416), 366},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
       {uniname2ctype_offset(str2427), 23},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2433), 426},
+      {uniname2ctype_offset(str2433), 427},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2440), 100},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -40365,29 +41057,29 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1},
       {uniname2ctype_offset(str2454), 220},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2458), 494},
+      {uniname2ctype_offset(str2458), 495},
       {-1},
       {uniname2ctype_offset(str2460), 246},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2470), 432},
+      {uniname2ctype_offset(str2470), 433},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2475), 142},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2479), 345},
+      {uniname2ctype_offset(str2479), 346},
       {uniname2ctype_offset(str2480), 50},
-      {uniname2ctype_offset(str2481), 370},
+      {uniname2ctype_offset(str2481), 371},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2506), 510},
+      {uniname2ctype_offset(str2506), 511},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2513), 591},
+      {uniname2ctype_offset(str2513), 592},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2519), 465},
+      {uniname2ctype_offset(str2519), 466},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2529), 165},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2534), 324},
+      {uniname2ctype_offset(str2534), 325},
       {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2540), 226},
       {-1},
@@ -40395,17 +41087,17 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2548), 118},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2552), 461},
+      {uniname2ctype_offset(str2552), 462},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2561), 434},
+      {uniname2ctype_offset(str2561), 435},
       {uniname2ctype_offset(str2562), 251},
       {-1},
-      {uniname2ctype_offset(str2564), 356},
+      {uniname2ctype_offset(str2564), 357},
       {-1},
       {uniname2ctype_offset(str2566), 185},
-      {uniname2ctype_offset(str2567), 303},
+      {uniname2ctype_offset(str2567), 304},
       {-1}, {-1},
-      {uniname2ctype_offset(str2570), 475},
+      {uniname2ctype_offset(str2570), 476},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2575), 185},
       {uniname2ctype_offset(str2576), 99},
@@ -40414,15 +41106,15 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2586), 199},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2595), 326},
+      {uniname2ctype_offset(str2595), 327},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2603), 198},
       {-1}, {-1},
-      {uniname2ctype_offset(str2606), 358},
+      {uniname2ctype_offset(str2606), 359},
       {-1}, {-1},
       {uniname2ctype_offset(str2609), 55},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2614), 537},
+      {uniname2ctype_offset(str2614), 538},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2624), 226},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -40430,8 +41122,8 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1},
       {uniname2ctype_offset(str2634), 266},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2643), 436},
-      {uniname2ctype_offset(str2644), 575},
+      {uniname2ctype_offset(str2643), 437},
+      {uniname2ctype_offset(str2644), 576},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2648), 243},
       {-1},
@@ -40439,7 +41131,7 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1},
       {uniname2ctype_offset(str2653), 183},
       {-1}, {-1},
-      {uniname2ctype_offset(str2656), 352},
+      {uniname2ctype_offset(str2656), 353},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2663), 182},
       {-1},
@@ -40447,7 +41139,7 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1},
       {uniname2ctype_offset(str2668), 94},
       {-1},
-      {uniname2ctype_offset(str2670), 592},
+      {uniname2ctype_offset(str2670), 593},
       {-1}, {-1},
       {uniname2ctype_offset(str2673), 84},
       {-1}, {-1},
@@ -40463,7 +41155,7 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2698), 119},
       {-1}, {-1},
-      {uniname2ctype_offset(str2701), 417},
+      {uniname2ctype_offset(str2701), 418},
       {uniname2ctype_offset(str2702), 89},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -40476,14 +41168,14 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2747), 54},
       {-1}, {-1},
-      {uniname2ctype_offset(str2750), 533},
+      {uniname2ctype_offset(str2750), 534},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2760), 152},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2764), 241},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2768), 90},
-      {uniname2ctype_offset(str2769), 467},
+      {uniname2ctype_offset(str2769), 468},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2777), 28},
       {-1}, {-1},
@@ -40494,27 +41186,27 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2816), 295},
+      {uniname2ctype_offset(str2816), 296},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2821), 377},
+      {uniname2ctype_offset(str2821), 378},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2834), 348},
+      {uniname2ctype_offset(str2834), 349},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2841), 222},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2848), 253},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2852), 290},
+      {uniname2ctype_offset(str2852), 291},
       {-1}, {-1},
       {uniname2ctype_offset(str2855), 190},
       {uniname2ctype_offset(str2856), 66},
       {-1}, {-1},
-      {uniname2ctype_offset(str2859), 411},
+      {uniname2ctype_offset(str2859), 412},
       {-1}, {-1},
       {uniname2ctype_offset(str2862), 211},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2867), 294},
+      {uniname2ctype_offset(str2867), 295},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2871), 243},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -40525,11 +41217,11 @@ uniname2ctype_p (register const char *str, register size_t len)
       {uniname2ctype_offset(str2886), 133},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2904), 448},
+      {uniname2ctype_offset(str2904), 449},
       {uniname2ctype_offset(str2905), 262},
-      {uniname2ctype_offset(str2906), 574},
+      {uniname2ctype_offset(str2906), 575},
       {-1}, {-1},
-      {uniname2ctype_offset(str2909), 548},
+      {uniname2ctype_offset(str2909), 549},
       {-1}, {-1},
       {uniname2ctype_offset(str2912), 244},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -40539,23 +41231,23 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1},
       {uniname2ctype_offset(str2938), 242},
       {-1}, {-1},
-      {uniname2ctype_offset(str2941), 347},
+      {uniname2ctype_offset(str2941), 348},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2963), 225},
-      {uniname2ctype_offset(str2964), 502},
+      {uniname2ctype_offset(str2964), 503},
       {-1}, {-1},
       {uniname2ctype_offset(str2967), 43},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2980), 195},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2984), 546},
+      {uniname2ctype_offset(str2984), 547},
       {-1},
       {uniname2ctype_offset(str2986), 118},
       {uniname2ctype_offset(str2987), 54},
-      {uniname2ctype_offset(str2988), 455},
+      {uniname2ctype_offset(str2988), 456},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2993), 234},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -40563,8 +41255,8 @@ uniname2ctype_p (register const char *str, register size_t len)
       {uniname2ctype_offset(str3001), 180},
       {uniname2ctype_offset(str3002), 64},
       {-1}, {-1},
-      {uniname2ctype_offset(str3005), 459},
-      {uniname2ctype_offset(str3006), 554},
+      {uniname2ctype_offset(str3005), 460},
+      {uniname2ctype_offset(str3006), 555},
       {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3012), 80},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -40572,23 +41264,23 @@ uniname2ctype_p (register const char *str, register size_t len)
       {uniname2ctype_offset(str3028), 250},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3045), 576},
+      {uniname2ctype_offset(str3045), 577},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3055), 453},
+      {uniname2ctype_offset(str3055), 454},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3089), 146},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3098), 579},
-      {uniname2ctype_offset(str3099), 462},
+      {uniname2ctype_offset(str3098), 580},
+      {uniname2ctype_offset(str3099), 463},
       {uniname2ctype_offset(str3100), 103},
       {uniname2ctype_offset(str3101), 223},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3107), 298},
+      {uniname2ctype_offset(str3107), 299},
       {-1},
-      {uniname2ctype_offset(str3109), 300},
+      {uniname2ctype_offset(str3109), 301},
       {-1},
       {uniname2ctype_offset(str3111), 191},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -40600,15 +41292,15 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3158), 313},
+      {uniname2ctype_offset(str3158), 314},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3165), 438},
+      {uniname2ctype_offset(str3165), 439},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3169), 47},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3176), 380},
+      {uniname2ctype_offset(str3176), 381},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3180), 316},
+      {uniname2ctype_offset(str3180), 317},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3185), 126},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -40624,26 +41316,26 @@ uniname2ctype_p (register const char *str, register size_t len)
       {uniname2ctype_offset(str3218), 201},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3237), 374},
+      {uniname2ctype_offset(str3237), 375},
       {-1},
-      {uniname2ctype_offset(str3239), 293},
-      {uniname2ctype_offset(str3240), 289},
+      {uniname2ctype_offset(str3239), 294},
+      {uniname2ctype_offset(str3240), 290},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3248), 213},
       {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3254), 190},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1},
-      {uniname2ctype_offset(str3266), 420},
+      {uniname2ctype_offset(str3266), 421},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
       {uniname2ctype_offset(str3286), 235},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
-      {uniname2ctype_offset(str3297), 296},
+      {uniname2ctype_offset(str3297), 297},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3303), 292},
+      {uniname2ctype_offset(str3303), 293},
       {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3309), 178},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -40651,11 +41343,11 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
       {uniname2ctype_offset(str3328), 63},
-      {uniname2ctype_offset(str3329), 586},
+      {uniname2ctype_offset(str3329), 587},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3348), 391},
-      {uniname2ctype_offset(str3349), 422},
+      {uniname2ctype_offset(str3348), 392},
+      {uniname2ctype_offset(str3349), 423},
       {-1},
       {uniname2ctype_offset(str3351), 96},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -40663,7 +41355,7 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1},
       {uniname2ctype_offset(str3363), 96},
       {-1},
-      {uniname2ctype_offset(str3365), 577},
+      {uniname2ctype_offset(str3365), 578},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -40678,26 +41370,26 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1},
       {uniname2ctype_offset(str3439), 49},
       {-1}, {-1},
-      {uniname2ctype_offset(str3442), 463},
+      {uniname2ctype_offset(str3442), 464},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3458), 10},
       {-1},
-      {uniname2ctype_offset(str3460), 588},
+      {uniname2ctype_offset(str3460), 589},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3511), 395},
-      {uniname2ctype_offset(str3512), 486},
+      {uniname2ctype_offset(str3511), 396},
+      {uniname2ctype_offset(str3512), 487},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3517), 179},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3531), 153},
-      {uniname2ctype_offset(str3532), 549},
+      {uniname2ctype_offset(str3532), 550},
       {uniname2ctype_offset(str3533), 57},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -40720,7 +41412,7 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
-      {uniname2ctype_offset(str3648), 449},
+      {uniname2ctype_offset(str3648), 450},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3664), 177},
@@ -40731,7 +41423,7 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1},
       {uniname2ctype_offset(str3703), 132},
       {-1},
-      {uniname2ctype_offset(str3705), 305},
+      {uniname2ctype_offset(str3705), 306},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3714), 132},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -40740,7 +41432,7 @@ uniname2ctype_p (register const char *str, register size_t 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},
-      {uniname2ctype_offset(str3766), 451},
+      {uniname2ctype_offset(str3766), 452},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -40752,7 +41444,7 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3819), 162},
       {-1},
-      {uniname2ctype_offset(str3821), 291},
+      {uniname2ctype_offset(str3821), 292},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1},
@@ -40769,7 +41461,7 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3924), 404},
+      {uniname2ctype_offset(str3924), 405},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3942), 100},
@@ -40777,7 +41469,7 @@ uniname2ctype_p (register const char *str, register size_t 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},
-      {uniname2ctype_offset(str3976), 569},
+      {uniname2ctype_offset(str3976), 570},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3995), 147},
@@ -40792,7 +41484,7 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
-      {uniname2ctype_offset(str4087), 414},
+      {uniname2ctype_offset(str4087), 415},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
@@ -40804,10 +41496,10 @@ uniname2ctype_p (register const char *str, register size_t 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},
-      {uniname2ctype_offset(str4162), 543},
+      {uniname2ctype_offset(str4162), 544},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str4175), 544},
+      {uniname2ctype_offset(str4175), 545},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -40825,7 +41517,7 @@ uniname2ctype_p (register const char *str, register size_t len)
       {uniname2ctype_offset(str4276), 116},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str4291), 301},
+      {uniname2ctype_offset(str4291), 302},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -40841,10 +41533,10 @@ uniname2ctype_p (register const char *str, register size_t 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},
-      {uniname2ctype_offset(str4397), 385},
+      {uniname2ctype_offset(str4397), 386},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str4405), 297},
-      {uniname2ctype_offset(str4406), 299},
+      {uniname2ctype_offset(str4405), 298},
+      {uniname2ctype_offset(str4406), 300},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -40879,9 +41571,9 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
-      {uniname2ctype_offset(str4674), 600},
+      {uniname2ctype_offset(str4674), 601},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str4683), 450},
+      {uniname2ctype_offset(str4683), 451},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -40892,7 +41584,7 @@ uniname2ctype_p (register const char *str, register size_t 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},
-      {uniname2ctype_offset(str4772), 393},
+      {uniname2ctype_offset(str4772), 394},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -40913,7 +41605,7 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str4948), 589},
+      {uniname2ctype_offset(str4948), 590},
 #endif /* USE_UNICODE_PROPERTIES */
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
 #ifndef USE_UNICODE_PROPERTIES
@@ -40938,7 +41630,7 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str4986), 412},
+      {uniname2ctype_offset(str4986), 413},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -41066,7 +41758,7 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str6098), 601}
+      {uniname2ctype_offset(str6098), 602}
 #endif /* USE_UNICODE_PROPERTIES */
     };
 
@@ -41098,14 +41790,14 @@ uniname2ctype(const UChar *name, unsigned int len)
 }
 #if defined ONIG_UNICODE_VERSION_STRING && !( \
       ONIG_UNICODE_VERSION_MAJOR == 12 && \
-      ONIG_UNICODE_VERSION_MINOR == 0 && \
+      ONIG_UNICODE_VERSION_MINOR == 1 && \
       ONIG_UNICODE_VERSION_TEENY == 0 && \
       1)
 # error ONIG_UNICODE_VERSION_STRING mismatch
 #endif
-#define ONIG_UNICODE_VERSION_STRING "12.0.0"
+#define ONIG_UNICODE_VERSION_STRING "12.1.0"
 #define ONIG_UNICODE_VERSION_MAJOR 12
-#define ONIG_UNICODE_VERSION_MINOR 0
+#define ONIG_UNICODE_VERSION_MINOR 1
 #define ONIG_UNICODE_VERSION_TEENY 0
 #if defined ONIG_UNICODE_EMOJI_VERSION_STRING && !( \
       ONIG_UNICODE_EMOJI_VERSION_MAJOR == 12 && \