ICU-20497 Unicode 12.1
diff --git a/icu4c/source/common/norm2_nfc_data.h b/icu4c/source/common/norm2_nfc_data.h
index d9d7140..c04bdac 100644
--- a/icu4c/source/common/norm2_nfc_data.h
+++ b/icu4c/source/common/norm2_nfc_data.h
@@ -12,7 +12,7 @@
#ifdef INCLUDED_FROM_NORMALIZER2_CPP
static const UVersionInfo norm2_nfc_data_formatVersion={4,0,0,0};
-static const UVersionInfo norm2_nfc_data_dataVersion={0xc,0,0,0};
+static const UVersionInfo norm2_nfc_data_dataVersion={0xc,1,0,0};
static const int32_t norm2_nfc_data_indexes[Normalizer2Impl::IX_COUNT]={
0x50,0x4ae0,0x8738,0x8838,0x8838,0x8838,0x8838,0x8838,0xc0,0x300,0xadc,0x29d0,0x3c56,0xfc00,0x1282,0x3b8c,
diff --git a/icu4c/source/common/ubidi_props_data.h b/icu4c/source/common/ubidi_props_data.h
index 97ba1e5..7008389 100644
--- a/icu4c/source/common/ubidi_props_data.h
+++ b/icu4c/source/common/ubidi_props_data.h
@@ -11,7 +11,7 @@
#ifdef INCLUDED_FROM_UBIDI_PROPS_C
-static const UVersionInfo ubidi_props_dataVersion={0xc,0,0,0};
+static const UVersionInfo ubidi_props_dataVersion={0xc,1,0,0};
static const int32_t ubidi_props_indexes[UBIDI_IX_TOP]={0x10,0x663c,0x6058,0x28,0x620,0x8c0,0x10ac0,0x10d24,0,0,0,0,0,0,0,0x6502b6};
diff --git a/icu4c/source/common/ucase_props_data.h b/icu4c/source/common/ucase_props_data.h
index 0754737..68554b3 100644
--- a/icu4c/source/common/ucase_props_data.h
+++ b/icu4c/source/common/ucase_props_data.h
@@ -11,7 +11,7 @@
#ifdef INCLUDED_FROM_UCASE_CPP
-static const UVersionInfo ucase_props_dataVersion={0xc,0,0,0};
+static const UVersionInfo ucase_props_dataVersion={0xc,1,0,0};
static const int32_t ucase_props_indexes[UCASE_IX_TOP]={0x10,0x6fea,0x5fb8,0x687,0x172,0,0,0,0,0,0,0,0,0,0,3};
diff --git a/icu4c/source/common/uchar_props_data.h b/icu4c/source/common/uchar_props_data.h
index 94005d2..10c25b3 100644
--- a/icu4c/source/common/uchar_props_data.h
+++ b/icu4c/source/common/uchar_props_data.h
@@ -11,7 +11,7 @@
#ifdef INCLUDED_FROM_UCHAR_C
-static const UVersionInfo dataVersion={0xc,0,0,0};
+static const UVersionInfo dataVersion={0xc,1,0,0};
static const uint16_t propsTrie_index[21968]={
0x45d,0x465,0x46d,0x475,0x48d,0x495,0x49d,0x4a5,0x4ad,0x4b5,0x4bb,0x4c3,0x4cb,0x4d3,0x4db,0x4e3,
@@ -39,7 +39,7 @@
0x555,0xb34,0xb2c,0xb3c,0x4ad,0x4ad,0x4ad,0xb44,0x4fd,0xb4c,0x5c8,0xb52,0xb62,0xb5a,0xb5a,0x524,
0xb6a,0xb72,0xb7a,0x47d,0xb82,0x8fe,0x8fe,0xb89,0x8fe,0x8fe,0x8fe,0x8fe,0x8fe,0x8fe,0xb91,0xb97,
0xba7,0xb9f,0x609,0x5c8,0xbaf,0x85a,0x5c8,0xbb7,0xbbf,0xbc3,0x5c8,0x5c8,0xbc8,0xbd0,0x8fe,0xbd8,
-0xaa3,0xbe0,0xbe6,0x8fe,0xbe0,0xbee,0x8fe,0xaa3,0x8fe,0x8fe,0x8fe,0x8fe,0x8fe,0x8fe,0x8fe,0x8fe,
+0xaa3,0xbe0,0xbe6,0x8fe,0xbe0,0xbee,0x8fe,0x8fe,0x8fe,0x8fe,0x8fe,0x8fe,0x8fe,0x8fe,0x8fe,0x8fe,
0xbf6,0x5c8,0x5c8,0x5c8,0xbfe,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,
0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,
0x5c8,0xc04,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,
@@ -1404,137 +1404,137 @@
NULL, 0, FALSE, FALSE, 0, NULL
};
-static const uint16_t propsVectorsTrie_index[30604]={
+static const uint16_t propsVectorsTrie_index[30588]={
0x4d6,0x4de,0x4e6,0x4ee,0x506,0x50e,0x516,0x51e,0x526,0x52e,0x536,0x53e,0x546,0x54e,0x556,0x55e,
0x565,0x56d,0x575,0x57d,0x580,0x588,0x590,0x598,0x5a0,0x5a8,0x5b0,0x5b8,0x5c0,0x5c8,0x5d0,0x5d8,
0x5e0,0x5e8,0x5ef,0x5f7,0x5ff,0x607,0x60f,0x617,0x61f,0x627,0x62c,0x634,0x63b,0x643,0x64b,0x653,
0x65b,0x663,0x66b,0x673,0x67a,0x682,0x68a,0x692,0x69a,0x6a2,0x6aa,0x6b2,0x6ba,0x6c2,0x6ca,0x6d2,
-0x19e8,0xd4b,0xe32,0x6da,0x4f6,0xe99,0xea1,0x1b92,0x12bf,0x12cf,0x12b7,0x12c7,0x7a3,0x7a9,0x7b1,0x7b9,
+0x19e4,0xd43,0xe2a,0x6da,0x4f6,0xe91,0xe99,0x1b8e,0x12b7,0x12c7,0x12af,0x12bf,0x7a3,0x7a9,0x7b1,0x7b9,
0x7c1,0x7c7,0x7cf,0x7d7,0x7df,0x7e5,0x7ed,0x7f5,0x7fd,0x803,0x80b,0x813,0x81b,0x823,0x82b,0x832,
-0x83a,0x840,0x848,0x850,0x858,0x85e,0x866,0x86e,0x876,0x12d7,0x87e,0x886,0x88e,0x895,0x89d,0x8a5,
-0x8ad,0x8b1,0x8b9,0x8c0,0x8c8,0x8d0,0x8d8,0x8e0,0x15e7,0x15ef,0x8e8,0x8f0,0x8f8,0x900,0x908,0x90f,
-0x164d,0x163d,0x1645,0x1923,0x192b,0x12e7,0x917,0x12df,0x1531,0x1531,0x1533,0x12fb,0x12fc,0x12ef,0x12f1,0x12f3,
-0x1655,0x1657,0x91f,0x1657,0x927,0x92c,0x934,0x165c,0x93a,0x1657,0x940,0x948,0xc27,0x1664,0x1664,0x950,
-0x1674,0x1675,0x1675,0x1675,0x1675,0x1675,0x1675,0x1675,0x1675,0x1675,0x1675,0x1675,0x1675,0x1675,0x1675,0x1675,
-0x1675,0x1675,0x1675,0x166c,0x958,0x167d,0x167d,0x960,0xb47,0xb4f,0xb57,0xb5f,0x168d,0x1685,0x968,0x970,
-0x978,0x1697,0x169f,0x980,0x1695,0x988,0x19f0,0xd53,0xb67,0xb6f,0xb77,0xb7c,0x1891,0xc5a,0xc61,0x17f9,
-0xbf7,0x19f8,0xd5b,0xd63,0xd6b,0xd73,0xf4c,0xf4c,0x18e9,0x18ee,0xc95,0xc9d,0x195f,0x1967,0x1ab1,0xe3a,
-0x196f,0xcdf,0xce7,0x1977,0x1109,0x11b1,0xf2c,0xd7b,0x1819,0x1801,0x1811,0x1809,0x18a9,0x18a1,0x1869,0xc07,
-0x1304,0x1304,0x1304,0x1304,0x1307,0x1304,0x1304,0x130f,0x990,0x1317,0x994,0x99c,0x1317,0x9a4,0x9ac,0x9b4,
-0x1327,0x131f,0x132f,0x9bc,0x9c4,0x1337,0x9cc,0x9d4,0x133f,0x1347,0x134f,0x1357,0x9dc,0x135f,0x1366,0x136e,
-0x1376,0x137e,0x1386,0x138e,0x1396,0x139d,0x13a5,0x13ad,0x13b5,0x13bd,0x13c0,0x13c2,0x16a7,0x178c,0x1792,0x18d9,
-0x13ca,0x9e4,0x9ec,0x14e4,0x14e9,0x14ec,0x14f4,0x13d2,0x14fc,0x14fc,0x13e2,0x13da,0x13ea,0x13f2,0x13fa,0x1402,
-0x140a,0x1412,0x141a,0x1422,0x179a,0x17f1,0x1933,0x1a89,0x1432,0x1439,0x1441,0x1449,0x142a,0x1451,0x17a2,0x17a9,
-0x16af,0x16af,0x16af,0x16af,0x16af,0x16af,0x16af,0x16af,0x17b1,0x17b4,0x17b1,0x17b1,0x17bc,0x17c3,0x17c5,0x17cc,
-0x17d4,0x17d8,0x17d8,0x17db,0x17d8,0x17d8,0x17e1,0x17d8,0x1821,0x18e1,0x193b,0xb84,0xb8a,0x1bce,0x1bd6,0x1cad,
-0x1881,0xc37,0xc3b,0x18f6,0x1871,0x1871,0x1871,0xc0f,0x1879,0xc2f,0x18c1,0xc85,0xc17,0xc1f,0xc1f,0x197f,
-0x18b1,0x1943,0xc71,0xc75,0x9f4,0x16b7,0x16b7,0x9fc,0x16bf,0x16bf,0x16bf,0x16bf,0x16bf,0x16bf,0xa04,0x6de,
-0x1519,0x153b,0xa0c,0x1543,0xa14,0x154b,0x1553,0x155b,0xa1c,0xa21,0x1563,0x156a,0xa26,0xa2e,0x18d1,0xbff,
-0xa36,0x15c1,0x15c8,0x1572,0x15d0,0x15d7,0x157a,0xa3e,0x1593,0x1593,0x1595,0x1582,0x158a,0x158a,0x158b,0x15df,
-0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,
-0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,
-0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,
-0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,
-0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,
-0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,
-0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,
-0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,
-0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,
-0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,
-0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,
-0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,
-0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x126c,0x1829,0x1829,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x15a4,0x19e0,0x1274,
-0x16cf,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,
-0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,
-0x16d5,0x16d5,0x16d5,0x16d5,0xa46,0x16dd,0xa4e,0x1a00,0x198b,0x198b,0x198b,0x198b,0x198b,0x198b,0x198b,0x198b,
-0x1987,0xcef,0x199b,0x1993,0x199d,0x1a08,0x1a08,0xd83,0x1889,0x18fe,0x1953,0x1957,0x194b,0x1aa9,0xca5,0xca8,
-0x18b9,0xc7d,0x1906,0xcb0,0x19a5,0x19a8,0xcf7,0x1a10,0x19b8,0x19b0,0xcff,0xd8b,0x1a18,0x1a1c,0xd93,0xff4,
-0x19c0,0xd07,0xd0f,0x1a24,0x1a34,0x1a2c,0xd9b,0xef4,0xe42,0xe4a,0x1c1d,0xfac,0x1cca,0x1cca,0x1a3c,0xda3,
-0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,
-0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,
-0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,
-0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,
-0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,
-0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,
-0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,
-0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,
-0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,
-0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,
-0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,
-0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,
-0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,
-0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,
-0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,
-0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,
-0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,
-0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,
-0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,
-0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,
-0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,
-0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0xa56,0xdab,0xdae,
+0x83a,0x840,0x848,0x850,0x858,0x85e,0x866,0x86e,0x876,0x12cf,0x87e,0x886,0x88e,0x895,0x89d,0x8a5,
+0x8ad,0x8b1,0x8b9,0x8c0,0x8c8,0x8d0,0x8d8,0x8e0,0x15e3,0x15eb,0x8e8,0x8f0,0x8f8,0x900,0x908,0x90f,
+0x1649,0x1639,0x1641,0x191f,0x1927,0x12df,0x917,0x12d7,0x1529,0x1529,0x152b,0x12f3,0x12f4,0x12e7,0x12e9,0x12eb,
+0x1651,0x1653,0x91f,0x1653,0x927,0x92c,0x934,0x1658,0x93a,0x1653,0x940,0x948,0xc1f,0x1660,0x1660,0x950,
+0x1670,0x1671,0x1671,0x1671,0x1671,0x1671,0x1671,0x1671,0x1671,0x1671,0x1671,0x1671,0x1671,0x1671,0x1671,0x1671,
+0x1671,0x1671,0x1671,0x1668,0x958,0x1679,0x1679,0x960,0xb3f,0xb47,0xb4f,0xb57,0x1689,0x1681,0x968,0x970,
+0x978,0x1693,0x169b,0x980,0x1691,0x988,0x19ec,0xd4b,0xb5f,0xb67,0xb6f,0xb74,0x188d,0xc52,0xc59,0x17f5,
+0xbef,0x19f4,0xd53,0xd5b,0xd63,0xd6b,0xf44,0xf44,0x18e5,0x18ea,0xc8d,0xc95,0x195b,0x1963,0x1aad,0xe32,
+0x196b,0xcd7,0xcdf,0x1973,0x1101,0x11a9,0xf24,0xd73,0x1815,0x17fd,0x180d,0x1805,0x18a5,0x189d,0x1865,0xbff,
+0x12fc,0x12fc,0x12fc,0x12fc,0x12ff,0x12fc,0x12fc,0x1307,0x990,0x130f,0x994,0x99c,0x130f,0x9a4,0x9ac,0x9b4,
+0x131f,0x1317,0x1327,0x9bc,0x9c4,0x132f,0x9cc,0x9d4,0x1337,0x133f,0x1347,0x134f,0x9dc,0x1357,0x135e,0x1366,
+0x136e,0x1376,0x137e,0x1386,0x138e,0x1395,0x139d,0x13a5,0x13ad,0x13b5,0x13b8,0x13ba,0x16a3,0x1788,0x178e,0x18d5,
+0x13c2,0x9e4,0x9ec,0x14dc,0x14e1,0x14e4,0x14ec,0x13ca,0x14f4,0x14f4,0x13da,0x13d2,0x13e2,0x13ea,0x13f2,0x13fa,
+0x1402,0x140a,0x1412,0x141a,0x1796,0x17ed,0x192f,0x1a85,0x142a,0x1431,0x1439,0x1441,0x1422,0x1449,0x179e,0x17a5,
+0x16ab,0x16ab,0x16ab,0x16ab,0x16ab,0x16ab,0x16ab,0x16ab,0x17ad,0x17b0,0x17ad,0x17ad,0x17b8,0x17bf,0x17c1,0x17c8,
+0x17d0,0x17d4,0x17d4,0x17d7,0x17d4,0x17d4,0x17dd,0x17d4,0x181d,0x18dd,0x1937,0xb7c,0xb82,0x1bca,0x1bd2,0x1ca9,
+0x187d,0xc2f,0xc33,0x18f2,0x186d,0x186d,0x186d,0xc07,0x1875,0xc27,0x18bd,0xc7d,0xc0f,0xc17,0xc17,0x197b,
+0x18ad,0x193f,0xc69,0xc6d,0x9f4,0x16b3,0x16b3,0x9fc,0x16bb,0x16bb,0x16bb,0x16bb,0x16bb,0x16bb,0xa04,0x6de,
+0x1511,0x1533,0xa0c,0x153b,0xa14,0x1543,0x154b,0x1553,0xa1c,0xa21,0x155b,0x1562,0xa26,0xa2e,0x18cd,0xbf7,
+0xa36,0x15bd,0x15c4,0x156a,0x15cc,0x15d3,0x1572,0x1576,0x158f,0x158f,0x1591,0x157e,0x1586,0x1586,0x1587,0x15db,
+0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,
+0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,
+0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,
+0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,
+0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,
+0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,
+0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,
+0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,
+0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,
+0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,
+0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,
+0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,
+0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x1264,0x1825,0x1825,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x15a0,0x19dc,0x126c,
+0x16cb,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,
+0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,
+0x16d1,0x16d1,0x16d1,0x16d1,0xa3e,0x16d9,0xa46,0x19fc,0x1987,0x1987,0x1987,0x1987,0x1987,0x1987,0x1987,0x1987,
+0x1983,0xce7,0x1997,0x198f,0x1999,0x1a04,0x1a04,0xd7b,0x1885,0x18fa,0x194f,0x1953,0x1947,0x1aa5,0xc9d,0xca0,
+0x18b5,0xc75,0x1902,0xca8,0x19a1,0x19a4,0xcef,0x1a0c,0x19b4,0x19ac,0xcf7,0xd83,0x1a14,0x1a18,0xd8b,0xfec,
+0x19bc,0xcff,0xd07,0x1a20,0x1a30,0x1a28,0xd93,0xeec,0xe3a,0xe42,0x1c19,0xfa4,0x1cc6,0x1cc6,0x1a38,0xd9b,
+0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,
+0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,
+0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,
+0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,
+0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,
+0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,
+0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,
+0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,
+0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,
+0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,
+0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,
+0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,
+0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,
+0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,
+0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,
+0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,
+0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,
+0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,
+0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,
+0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,
+0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,
+0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0xa4e,0xda3,0xda6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,
-0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,
-0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,
-0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,
-0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,
-0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,
-0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,
-0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,
-0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,
-0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,
-0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,
-0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,
-0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,
-0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,
-0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x15ac,0x15ac,0x15ac,0x15ac,0x15ac,0x15ac,0x15ac,0x15ac,
-0x15b1,0x15b9,0x17e9,0x127c,0x18c9,0x18c9,0x1280,0x1287,0xa5e,0xa66,0xa6e,0x1471,0x1478,0x1480,0xa76,0x1488,
-0x14b9,0x14b9,0x1461,0x1469,0x1490,0x14b0,0x14b1,0x14c1,0x1498,0x1459,0xa7e,0x14a0,0xa86,0x14a8,0xa8e,0xa92,
-0xc8d,0x14c9,0xa9a,0xaa2,0x14d1,0x14d7,0x14dc,0xaaa,0xaba,0x1521,0x1529,0x150c,0x1511,0xac2,0xaca,0xab2,
-0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,
-0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15ff,0x15ff,0x15ff,0x15ff,
+0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,
+0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,
+0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,
+0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,
+0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,
+0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,
+0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,
+0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,
+0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,
+0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,
+0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,
+0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,
+0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,
+0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,
+0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x15a8,0x15a8,0x15a8,0x15a8,0x15a8,0x15a8,0x15a8,0x15a8,
+0x15ad,0x15b5,0x17e5,0x1274,0x18c5,0x18c5,0x1278,0x127f,0xa56,0xa5e,0xa66,0x1469,0x1470,0x1478,0xa6e,0x1480,
+0x14b1,0x14b1,0x1459,0x1461,0x1488,0x14a8,0x14a9,0x14b9,0x1490,0x1451,0xa76,0x1498,0xa7e,0x14a0,0xa86,0xa8a,
+0xc85,0x14c1,0xa92,0xa9a,0x14c9,0x14cf,0x14d4,0xaa2,0xab2,0x1519,0x1521,0x1504,0x1509,0xaba,0xac2,0xaaa,
+0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,
+0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15fb,0x15fb,0x15fb,0x15fb,
0x13d8,0x13d8,0x1418,0x1458,0x1498,0x14d8,0x1518,0x1558,0x1594,0x15d4,0x1600,0x1640,0x1680,0x16c0,0x1700,0x1740,
0x1780,0x17bc,0x17fc,0x183c,0x187c,0x18b0,0x18ec,0x192c,0x196c,0x19ac,0x19e8,0x1a28,0x1a68,0x1aa8,0x1ae8,0x1b28,
0xa80,0xac0,0xb00,0xb40,0xb80,0xa40,0xe48,0xa40,0xe6a,0xa40,0xa40,0xa40,0xa40,0xbc0,0x12d5,0x12d5,
@@ -1573,148 +1573,148 @@
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0xb92,0xb99,0xba1,0xba9,0x1831,0x1831,0x1831,0xbb1,0xbb9,0xbbc,0x1861,0x1859,0xbef,0xd17,0xd1b,0xd1f,
-0x4f6,0x4f6,0x4f6,0x4f6,0xd27,0x19c8,0xd2f,0xf44,0x16e5,0xad2,0xad8,0x1004,0xbc4,0x1899,0xc69,0x4f6,
-0x16fa,0x16ed,0x16f2,0x1839,0xbcc,0xbd4,0x1147,0x114d,0x1c05,0xf61,0x1bf5,0x6e6,0x4f6,0x4f6,0x4f6,0x4f6,
-0x1c25,0x1c25,0x1c25,0x1c25,0x1c25,0x1c25,0x1c25,0x1c25,0x1c25,0xfb4,0xfbc,0xfc4,0x4f6,0x4f6,0x4f6,0x4f6,
-0xbdc,0xbdf,0xdb6,0x1c6d,0xffc,0x6ee,0x4f6,0x1095,0xcb8,0xd37,0x4f6,0x4f6,0x1ba2,0xefc,0xf04,0x1cb5,
-0xc43,0xc4a,0xc52,0x1a44,0x1c4d,0x4f6,0x1c2d,0xfd4,0x1a4c,0xdbe,0xdc6,0xdce,0x1024,0x6f6,0x4f6,0x4f6,
-0x1a54,0x1a54,0x6fe,0x4f6,0x1ce2,0x10ad,0x1cda,0x10b5,0x1d9a,0x11c7,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0x4f6,0x4f6,0x4f6,0xdd6,0x4f6,0x4f6,0x4f6,0x4f6,0x1dba,0x11ef,0x11f6,0x706,0x4f6,0x4f6,0x4f6,0x11fe,
-0x1ab9,0x1abb,0xe52,0xe59,0x1a5c,0x1a64,0xdde,0xf24,0x1b9a,0xee4,0xeec,0xfcc,0x1bba,0x1bbe,0xf1c,0x1044,
-0xf97,0xf9c,0x70e,0x4f6,0x109d,0x10a5,0x1c15,0xfa4,0xf79,0xf7f,0xf87,0xf8f,0x4f6,0x4f6,0x4f6,0x4f6,
-0x1d2a,0x1d22,0x1137,0x113f,0x1c95,0x1c8d,0x106b,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x1c7d,0x102c,0x1034,0x103c,
-0x1c45,0x1c3d,0xfe4,0x112f,0x1bc6,0xf34,0x716,0x4f6,0x107b,0x1083,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0x1d92,0x11a9,0x71e,0x4f6,0x4f6,0x1ca5,0x1c9d,0x1073,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x1206,0x120a,0x1212,
-0x1d6a,0x1d62,0x1191,0x1d5a,0x1d52,0x726,0x1c75,0x101c,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0x10ed,0x10f2,0x10fa,0x1101,0x1121,0x1127,0x4f6,0x4f6,0x1175,0x1179,0x1181,0x11b9,0x11bf,0x72e,0x4f6,0x4f6,
-0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x11d7,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x1dd2,0x1248,
-0x190e,0x190e,0x190e,0x190e,0x190e,0x190e,0x190e,0x190e,0x190e,0x190e,0x190e,0x190e,0x190e,0x190e,0x190e,0x190e,
-0x190e,0x190e,0x190e,0x190e,0x190e,0x190e,0x190e,0x190e,0x190e,0x190e,0x190e,0x1913,0xcc0,0xcc7,0xcc7,0xcc7,
-0x191b,0x191b,0x191b,0xccf,0x1cd2,0x1cd2,0x1cd2,0x1cd2,0x1cd2,0x1cd2,0x736,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
+0xb8a,0xb91,0xb99,0xba1,0x182d,0x182d,0x182d,0xba9,0xbb1,0xbb4,0x185d,0x1855,0xbe7,0xd0f,0xd13,0xd17,
+0x4f6,0x4f6,0x4f6,0x4f6,0xd1f,0x19c4,0xd27,0xf3c,0x16e1,0xaca,0xad0,0xffc,0xbbc,0x1895,0xc61,0x4f6,
+0x16f6,0x16e9,0x16ee,0x1835,0xbc4,0xbcc,0x113f,0x1145,0x1c01,0xf59,0x1bf1,0x6e6,0x4f6,0x4f6,0x4f6,0x4f6,
+0x1c21,0x1c21,0x1c21,0x1c21,0x1c21,0x1c21,0x1c21,0x1c21,0x1c21,0xfac,0xfb4,0xfbc,0x4f6,0x4f6,0x4f6,0x4f6,
+0xbd4,0xbd7,0xdae,0x1c69,0xff4,0x6ee,0x4f6,0x108d,0xcb0,0xd2f,0x4f6,0x4f6,0x1b9e,0xef4,0xefc,0x1cb1,
+0xc3b,0xc42,0xc4a,0x1a40,0x1c49,0x4f6,0x1c29,0xfcc,0x1a48,0xdb6,0xdbe,0xdc6,0x101c,0x6f6,0x4f6,0x4f6,
+0x1a50,0x1a50,0x6fe,0x4f6,0x1cde,0x10a5,0x1cd6,0x10ad,0x1d96,0x11bf,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
+0x4f6,0x4f6,0x4f6,0xdce,0x4f6,0x4f6,0x4f6,0x4f6,0x1db6,0x11e7,0x11ee,0x706,0x4f6,0x4f6,0x4f6,0x11f6,
+0x1ab5,0x1ab7,0xe4a,0xe51,0x1a58,0x1a60,0xdd6,0xf1c,0x1b96,0xedc,0xee4,0xfc4,0x1bb6,0x1bba,0xf14,0x103c,
+0xf8f,0xf94,0x70e,0x4f6,0x1095,0x109d,0x1c11,0xf9c,0xf71,0xf77,0xf7f,0xf87,0x4f6,0x4f6,0x4f6,0x4f6,
+0x1d26,0x1d1e,0x112f,0x1137,0x1c91,0x1c89,0x1063,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x1c79,0x1024,0x102c,0x1034,
+0x1c41,0x1c39,0xfdc,0x1127,0x1bc2,0xf2c,0x716,0x4f6,0x1073,0x107b,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
+0x1d8e,0x11a1,0x71e,0x4f6,0x4f6,0x1ca1,0x1c99,0x106b,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x11fe,0x1202,0x120a,
+0x1d66,0x1d5e,0x1189,0x1d56,0x1d4e,0x726,0x1c71,0x1014,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
+0x10e5,0x10ea,0x10f2,0x10f9,0x1119,0x111f,0x4f6,0x4f6,0x116d,0x1171,0x1179,0x11b1,0x11b7,0x72e,0x4f6,0x4f6,
+0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x11cf,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x1dce,0x1240,
+0x190a,0x190a,0x190a,0x190a,0x190a,0x190a,0x190a,0x190a,0x190a,0x190a,0x190a,0x190a,0x190a,0x190a,0x190a,0x190a,
+0x190a,0x190a,0x190a,0x190a,0x190a,0x190a,0x190a,0x190a,0x190a,0x190a,0x190a,0x190f,0xcb8,0xcbf,0xcbf,0xcbf,
+0x1917,0x1917,0x1917,0xcc7,0x1cce,0x1cce,0x1cce,0x1cce,0x1cce,0x1cce,0x736,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0x1ac3,0x1ac3,0x1ac3,0x1ac3,0x1ac3,0x1ac3,0x1ac3,0x1ac3,0x1ac3,0x1ac3,0x1ac3,0x1ac3,0x1ac3,0x1ac3,0x1ac3,0x1ac3,
-0x1ac3,0xe61,0xfec,0x73e,0x4f6,0x4f6,0x742,0xf3c,0x1c65,0x1c5d,0x100c,0x1014,0x74a,0x4f6,0x4f6,0x4f6,
+0x1abf,0x1abf,0x1abf,0x1abf,0x1abf,0x1abf,0x1abf,0x1abf,0x1abf,0x1abf,0x1abf,0x1abf,0x1abf,0x1abf,0x1abf,0x1abf,
+0x1abf,0xe59,0xfe4,0x73e,0x4f6,0x4f6,0x742,0xf34,0x1c61,0x1c59,0x1004,0x100c,0x74a,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0x4f6,0x4f6,0x1db2,0x1daa,0x11e7,0x4f6,0x4f6,0x4f6,0x1bb2,0x1bb2,0xf0c,0x1baa,0xf14,0x4f6,0x4f6,0x1119,
+0x4f6,0x4f6,0x1dae,0x1da6,0x11df,0x4f6,0x4f6,0x4f6,0x1bae,0x1bae,0xf04,0x1ba6,0xf0c,0x4f6,0x4f6,0x1111,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0x1bfd,0x1bfd,0x1bfd,0xf54,0xf59,0x752,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
+0x1bf9,0x1bf9,0x1bf9,0xf4c,0xf51,0x752,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0x1702,0x1702,0x1702,0x1702,0x1702,0x1702,0x1702,0xae0,0x1712,0xae8,0x1713,0x170a,0x171b,0x1721,0x1729,0xaf0,
-0x1851,0x1851,0x75a,0x4f6,0x4f6,0x4f6,0x4f6,0x11df,0x1841,0x1841,0xbe7,0xcd7,0x4f6,0x4f6,0x4f6,0x4f6,
-0x175a,0x1761,0xaf8,0x1764,0xb00,0xb08,0xb10,0x175e,0xb18,0xb20,0xb28,0x1763,0x176b,0x175a,0x1761,0x175d,
-0x1764,0x176c,0x175b,0x1762,0x175e,0xb2f,0x1731,0x1739,0x1740,0x1747,0x1734,0x173c,0x1743,0x174a,0xb37,0x1752,
-0x1cfa,0x1cfa,0x1cfa,0x1cfa,0x1cfa,0x1cfa,0x1cfa,0x1cfa,0x1cfa,0x1cfa,0x1cfa,0x1cfa,0x1cfa,0x1cfa,0x1cfa,0x1cfa,
-0x1cea,0x1ced,0x1cea,0x1cf4,0x10dd,0x762,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
+0x16fe,0x16fe,0x16fe,0x16fe,0x16fe,0x16fe,0x16fe,0xad8,0x170e,0xae0,0x170f,0x1706,0x1717,0x171d,0x1725,0xae8,
+0x184d,0x184d,0x75a,0x4f6,0x4f6,0x4f6,0x4f6,0x11d7,0x183d,0x183d,0xbdf,0xccf,0x4f6,0x4f6,0x4f6,0x4f6,
+0x1756,0x175d,0xaf0,0x1760,0xaf8,0xb00,0xb08,0x175a,0xb10,0xb18,0xb20,0x175f,0x1767,0x1756,0x175d,0x1759,
+0x1760,0x1768,0x1757,0x175e,0x175a,0xb27,0x172d,0x1735,0x173c,0x1743,0x1730,0x1738,0x173f,0x1746,0xb2f,0x174e,
+0x1cf6,0x1cf6,0x1cf6,0x1cf6,0x1cf6,0x1cf6,0x1cf6,0x1cf6,0x1cf6,0x1cf6,0x1cf6,0x1cf6,0x1cf6,0x1cf6,0x1cf6,0x1cf6,
+0x1ce6,0x1ce9,0x1ce6,0x1cf0,0x10d5,0x762,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0x1111,0x76a,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x1dca,0x121a,0x772,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x1dda,0x1250,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
+0x1109,0x76a,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x1dc6,0x1212,0x772,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
+0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x1dd6,0x1248,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0x1c35,0x1c35,0x1c35,0x1c35,0x1c35,0x1c35,0xfdc,0x4f6,0x1d1a,0x1d12,0x10e5,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
+0x1c31,0x1c31,0x1c31,0x1c31,0x1c31,0x1c31,0xfd4,0x4f6,0x1d16,0x1d0e,0x10dd,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0x4f6,0x4f6,0x4f6,0x776,0x1da2,0x11cf,0x4f6,0x4f6,0x1222,0x1223,0x77e,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0xea9,0xeb1,0xeb9,0xec1,0xec9,0xed1,0xed8,0xedc,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
+0x4f6,0x4f6,0x4f6,0x776,0x1d9e,0x11c7,0x4f6,0x4f6,0x121a,0x121b,0x77e,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
+0xea1,0xea9,0xeb1,0xeb9,0xec1,0xec9,0xed0,0xed4,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x782,0x104c,0x1c85,0x1052,0x1c85,0x105a,0x105f,0x1063,0x1063,
-0x10bd,0x1d32,0x1d3a,0x10c5,0x1d0a,0x10cd,0x10d5,0x1d7a,0x1dc2,0x1dc2,0x1199,0x11a1,0x123a,0x1240,0x1240,0x1240,
+0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x782,0x1044,0x1c81,0x104a,0x1c81,0x1052,0x1057,0x105b,0x105b,
+0x10b5,0x1d2e,0x1d36,0x10bd,0x1d06,0x10c5,0x10cd,0x1d76,0x1dbe,0x1dbe,0x1191,0x1199,0x1232,0x1238,0x1238,0x1238,
0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,
0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,
-0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78b,0xb3f,0x1774,0x1774,0x1774,0x793,0x793,0x793,0x793,
-0x1849,0x1849,0x1849,0x1849,0x1849,0x1849,0x1849,0x79b,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,
+0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78b,0xb37,0x1770,0x1770,0x1770,0x793,0x793,0x793,0x793,
+0x1845,0x1845,0x1845,0x1845,0x1845,0x1845,0x1845,0x79b,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,
0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,
0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,
0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,
-0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x19d0,0xd3f,0x19d8,0x19d8,0xd43,0xe69,0xe71,0xe79,
-0xdee,0x1a81,0x1a99,0xdf6,0x1a91,0xdfe,0xe02,0xe09,0xe11,0xe18,0xe20,0xe28,0xe2a,0xe2a,0xe2a,0xe2a,
-0x1afa,0x1b02,0x1afa,0x1b08,0x1b10,0x1adb,0x1b18,0x1b20,0x1afa,0x1b28,0x1b30,0x1b37,0x1b3f,0x1ae3,0x1afa,0x1b44,
-0x1aeb,0x1af2,0x1b4c,0x1b52,0x1be6,0x1bed,0x1bde,0x1b5a,0x1b62,0x1b6a,0x1b72,0x1c55,0x1b7a,0x1b82,0xe81,0xe89,
-0x1acb,0x1acb,0x1acb,0xe91,0x1c0d,0x1c0d,0xf69,0xf71,0x1a6c,0x1a6c,0x1a6c,0x1a6c,0x1a6c,0x1a6c,0x1a6c,0x1a6c,
-0x1a6c,0x1a6c,0x1a6c,0x1a6c,0x1a6c,0x1a6c,0x1a6c,0x1a6c,0x1a6c,0x1a6c,0x1a6e,0x1a6c,0x1a76,0x1a6c,0x1a6c,0x1a6c,
-0x1a6c,0x1a6c,0x1a6c,0x1a79,0x1a6c,0x1a6c,0x1a6c,0x1a6c,0x1a6c,0xde6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
+0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x19cc,0xd37,0x19d4,0x19d4,0xd3b,0xe61,0xe69,0xe71,
+0xde6,0x1a7d,0x1a95,0xdee,0x1a8d,0xdf6,0xdfa,0xe01,0xe09,0xe10,0xe18,0xe20,0xe22,0xe22,0xe22,0xe22,
+0x1af6,0x1afe,0x1af6,0x1b04,0x1b0c,0x1ad7,0x1b14,0x1b1c,0x1af6,0x1b24,0x1b2c,0x1b33,0x1b3b,0x1adf,0x1af6,0x1b40,
+0x1ae7,0x1aee,0x1b48,0x1b4e,0x1be2,0x1be9,0x1bda,0x1b56,0x1b5e,0x1b66,0x1b6e,0x1c51,0x1b76,0x1b7e,0xe79,0xe81,
+0x1ac7,0x1ac7,0x1ac7,0xe89,0x1c09,0x1c09,0xf61,0xf69,0x1a68,0x1a68,0x1a68,0x1a68,0x1a68,0x1a68,0x1a68,0x1a68,
+0x1a68,0x1a68,0x1a68,0x1a68,0x1a68,0x1a68,0x1a68,0x1a68,0x1a68,0x1a68,0x1a6a,0x1a68,0x1a72,0x1a68,0x1a68,0x1a68,
+0x1a68,0x1a68,0x1a68,0x1a75,0x1a68,0x1a68,0x1a68,0x1a68,0x1a68,0xdde,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x1cbd,0x1cbd,0x1cbd,0x1cbd,0x1cbd,0x1cbd,
-0x1cbd,0x1cbd,0x1cbd,0x1cbd,0x1cbd,0x1cbd,0x1cbd,0x1cbd,0x1cc2,0x1cbd,0x1cbd,0x1cbd,0x108b,0x108d,0x4f6,0x4f6,
-0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,
-0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,
-0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,
-0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,
-0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1155,0x1d4a,0x1d4a,0x1d4a,0x1d4a,0x1d4a,0x1d4a,
-0x1d4a,0x1d4a,0x1d4a,0x1d4a,0x1d4a,0x1d4a,0x1d4a,0x1d4a,0x1d4a,0x1d4a,0x1d4a,0x1d4a,0x1d4a,0x1d4a,0x1d4a,0x1d4a,
-0x1d4a,0x115d,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
+0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x1cb9,0x1cb9,0x1cb9,0x1cb9,0x1cb9,0x1cb9,
+0x1cb9,0x1cb9,0x1cb9,0x1cb9,0x1cb9,0x1cb9,0x1cb9,0x1cb9,0x1cbe,0x1cb9,0x1cb9,0x1cb9,0x1083,0x1085,0x4f6,0x4f6,
+0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,
+0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,
+0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,
+0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,
+0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x114d,0x1d46,0x1d46,0x1d46,0x1d46,0x1d46,0x1d46,
+0x1d46,0x1d46,0x1d46,0x1d46,0x1d46,0x1d46,0x1d46,0x1d46,0x1d46,0x1d46,0x1d46,0x1d46,0x1d46,0x1d46,0x1d46,0x1d46,
+0x1d46,0x1155,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x1ad3,0x1d72,0x1d72,0x1d72,0x1d72,0x1d72,
-0x1d72,0x1d72,0x1165,0x116d,0x122b,0x1232,0x1d8a,0x1d8a,0x1d8a,0x1d8a,0x1d8a,0x1d8a,0x1d8a,0x1d8a,0x1d8a,0x1d8a,
-0x1d8a,0x1189,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
+0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x1acf,0x1d6e,0x1d6e,0x1d6e,0x1d6e,0x1d6e,
+0x1d6e,0x1d6e,0x115d,0x1165,0x1223,0x122a,0x1d86,0x1d86,0x1d86,0x1d86,0x1d86,0x1d86,0x1d86,0x1d86,0x1d86,0x1d86,
+0x1d86,0x1181,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,
-0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,
-0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,
-0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,
-0x128f,0x1258,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,
-0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,
-0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1260,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,
-0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,
-0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,
-0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,
-0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1784,0x1784,0x1784,0x1784,0x1784,0x1784,
-0x1784,0x1784,0x1784,0x1784,0x1784,0x1784,0x1784,0x1784,0x1784,0x1784,0x1297,0x1258,0x1258,0x1258,0x1258,0x1258,
-0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,
-0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,
-0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1264,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,
-0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,
-0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,
-0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,
-0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1264,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,
-0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,
-0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,
-0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,
-0x1aa1,0x1aa1,0x1aa1,0x129f,0x1b8a,0x1b8a,0x1b8a,0x1b8a,0x1b8a,0x1b8a,0x12a7,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,
-0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,
-0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,
-0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,
-0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x12af,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,
-0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,
-0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,
-0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,
-0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,
-0x161f,0x161f,0x161f,0x161f,0x160f,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,
-0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,
-0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,
-0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,
-0x1627,0x1627,0x1627,0x1627,0x1617,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,
-0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,
-0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,
-0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,
-0x161f,0x161f,0x161f,0x161f,0x161f,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,
-0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,
-0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,
-0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,
-0x1627,0x1627,0x1627,0x1627,0x1627,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,
-0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,
-0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,
-0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,
-0x177c,0x177c,0x177c,0x177c,0x177c,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,
-0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,
-0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,
-0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,
-0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,
-0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,
-0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,
-0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,
-0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,
-0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,
-0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,
-0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,
-0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,
-0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,
-0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,
-0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,
-0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x4d5,0x4d5,0x4d5,0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,
+0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,
+0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,
+0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,
+0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,
+0x1287,0x1250,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,
+0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,
+0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1258,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,
+0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,
+0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,
+0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,
+0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1780,0x1780,0x1780,0x1780,0x1780,0x1780,
+0x1780,0x1780,0x1780,0x1780,0x1780,0x1780,0x1780,0x1780,0x1780,0x1780,0x128f,0x1250,0x1250,0x1250,0x1250,0x1250,
+0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,
+0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,
+0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x125c,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,
+0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,
+0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,
+0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,
+0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x125c,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,
+0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,
+0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,
+0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,
+0x1a9d,0x1a9d,0x1a9d,0x1297,0x1b86,0x1b86,0x1b86,0x1b86,0x1b86,0x1b86,0x129f,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,
+0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,
+0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,
+0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,
+0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x12a7,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,
+0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,
+0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,
+0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,
+0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,
+0x161b,0x161b,0x161b,0x161b,0x160b,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,
+0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,
+0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,
+0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,
+0x1623,0x1623,0x1623,0x1623,0x1613,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,
+0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,
+0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,
+0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,
+0x161b,0x161b,0x161b,0x161b,0x161b,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,
+0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,
+0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,
+0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,
+0x1623,0x1623,0x1623,0x1623,0x1623,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,
+0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,
+0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,
+0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,
+0x1778,0x1778,0x1778,0x1778,0x1778,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,
+0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,
+0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,
+0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,
+0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,
+0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,
+0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,
+0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,
+0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,
+0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,
+0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,
+0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,
+0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,
+0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,
+0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,
+0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,
+0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x4d5,0x4d5,0x4d5,0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,
0x2bb,0x2be,0x2c7,0x2c1,0x2c1,0x2c4,0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,
0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,0x7ef,0x7e9,0x7ce,0x7c5,0x7bc,0x7b9,0x7b0,0x7cb,
0x7b6,0x7c2,0x7c5,0x7e0,0x7d7,0x7c8,0x7ec,0x7bf,0x7ad,0x7ad,0x7ad,0x7ad,0x7ad,0x7ad,0x7ad,0x7ad,
@@ -2060,9 +2060,7 @@
0xb37,0xb37,0xb37,0xb37,0xb37,0xb37,0xb37,0xb37,0xb37,0xb37,0xb37,0xb37,0xb37,0xb37,0xb37,0xb37,
0x13e0,0x13e0,0x13e0,0x7e,0x7e,0x7e,0x7e,0x7e,0x85b,0x85b,0x85b,0x85b,0x85b,0x85b,0x85b,0x85b,
0x85b,0x85b,0x85b,0x85b,0x85b,0x85b,0x85b,0x85b,0x85b,0x85b,0x85b,0x85b,0x85b,0x85b,0x85b,0x85b,
-0x85b,0x85b,0x85b,0x85b,0x85b,0xd8f,0xd8f,0x81,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,
-0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,
-0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x81,0xb3d,0xb3d,0xb3d,0xb3d,0xb3d,0xb3d,0xb3d,0xb3d,
+0x85b,0x85b,0x85b,0x85b,0x85b,0xd8f,0xd8f,0x81,0xb3d,0xb3d,0xb3d,0xb3d,0xb3d,0xb3d,0xb3d,0xb3d,
0xb3d,0xb3d,0xb3d,0xb3d,0xb3d,0x84,0x84,0x84,0xb43,0xb43,0xb43,0xb43,0xb43,0xb43,0xb43,0xb43,
0xb43,0xb43,0xb43,0xb43,0xb43,0xb43,0xb43,0xb43,0xb43,0xc93,0xb43,0xb43,0xb43,0xc93,0xb43,0x87,
0x87,0x87,0x87,0x87,0x87,0x87,0x87,0x87,0x11d3,0x11d3,0x11d3,0x11d3,0x11d3,0x11d3,0x11d3,0x11d3,
@@ -2781,7 +2779,8 @@
0x85e,0x85e,0x85e,0x85e,0x85e,0x85e,0x85e,0x85e,0x85e,0x85e,0x85e,0x85e,0x85e,0x85e,0x85e,0x85e,
0x85e,0x85e,0x85e,0x85e,0xd92,0xd92,0xec1,0x858,0x924,0x924,0x924,0x924,0x924,0x924,0x924,0x924,
0x924,0x924,0x924,0x924,0xd8c,0xd8c,0xd8c,0xd8c,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,
-0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x92d,0x92d,0x92d,0x92d,0x92d,0x92d,0x92d,0x92d,
+0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,
+0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x1aa3,0x92d,0x92d,0x92d,0x92d,0x92d,0x92d,0x92d,0x92d,
0x92d,0x92d,0x92d,0x92d,0x92d,0x92d,0x92d,0x92d,0x92d,0x864,0x864,0x864,0x864,0x864,0x864,0xd95,
0xd95,0xd95,0xd95,0x930,0x930,0x930,0x930,0x930,0x864,0x864,0x864,0x864,0x864,0x864,0x864,0x864,
0x864,0x864,0x864,0x864,0x864,0x864,0x864,0x864,0x864,0x864,0x864,0x864,0x864,0x864,0x864,0x864,
@@ -3325,17 +3324,17 @@
propsVectorsTrie_index+4952,
NULL,
4952,
- 25652,
+ 25636,
0xa40,
0x13d8,
0x0,
0x0,
0x110000,
- 0x7788,
+ 0x7778,
NULL, 0, FALSE, FALSE, 0, NULL
};
-static const uint32_t propsVectors[6819]={
+static const uint32_t propsVectors[6822]={
0x67,0,0,0x67,0,0x4e00000,0x67,0x80000,0x20,0x867,0,0,0xa67,0,0,0xb67,
0,0,0xc67,0,0,0xd67,0,0,0xe67,0,0,0x1067,0,0,0x1167,0,
0,0x1267,0,0,0x1367,0,0,0x1467,0,0,0x1567,0,0,0x1667,0,0,
@@ -3762,9 +3761,9 @@
0xc0012b23,0x4000000,0x1500000,0xc0012cbc,0x2802400,0x962460,0xc0012cbc,0x4000000,0x1600000,0xc0012cbc,0x6800000,0x1329800,0xc0012cbc,0x7c00100,0x230400,0xc00acf00,
0x4000000,0x34e00000,0xc00ae300,0x4000000,0x34e00000,0xc00b0500,0x4000000,0x34e00000,0xc00b0500,0x4000000,0xb6800000,0xc00b0b00,0x4000000,0x1200000,0xc00b0b00,0x7c00900,
0x1230400,0xc00b109a,0x7c00300,0xe30000,0xc00b2914,0x7c00100,0x2530000,0xc00b2916,0x7c00100,0x2530c00,0xc00b2a00,0x4000000,0x34e00000,0xc040af55,0x7c00100,0x230400,
-0xc0c12b80,0x4000000,0x200000};
+0xc0c12b80,0x4000000,0x200000,0xc14a44bf,0x4000000,0xe0000d};
-static const int32_t countPropsVectors=6819;
+static const int32_t countPropsVectors=6822;
static const int32_t propsVectorsColumns=3;
static const uint16_t scriptExtensions[256]={
0x800e,0x8019,8,0x8059,8,2,8,0x8038,8,6,8,0x8019,3,0x800c,2,0x22,
@@ -3784,6 +3783,6 @@
0x10,0x15,0x78,0x91,0x99,0x9d,0x9e,0xa0,0xa3,0xb2,0x80bb,0xa,0x9a,0xa,0x8023,0xa,
0xed,0x19,0x1c,0x804f,0x37,0x804e,0x2f,0x31,0x8053,0x2f,0x8031,2,0x8007,0x89,0x7e,0x8087};
-static const int32_t indexes[UPROPS_INDEX_COUNT]={0x2afc,0x2afc,0x2afc,0x2afc,0x66c6,3,0x8169,0x81e9,0x81e9,0x81e9,0xb2cbc,0x2a75a31,0,0,0,0};
+static const int32_t indexes[UPROPS_INDEX_COUNT]={0x2afc,0x2afc,0x2afc,0x2afc,0x66be,3,0x8164,0x81e4,0x81e4,0x81e4,0xb2cbc,0x2a75a31,0,0,0,0};
#endif // INCLUDED_FROM_UCHAR_C
diff --git a/icu4c/source/common/unicode/uchar.h b/icu4c/source/common/unicode/uchar.h
index f04ea70..d70c964 100644
--- a/icu4c/source/common/unicode/uchar.h
+++ b/icu4c/source/common/unicode/uchar.h
@@ -60,7 +60,7 @@
* @see u_getUnicodeVersion
* @stable ICU 2.0
*/
-#define U_UNICODE_VERSION "12.0"
+#define U_UNICODE_VERSION "12.1"
/**
* \file
diff --git a/icu4c/source/data/in/coll/ucadata-implicithan.icu b/icu4c/source/data/in/coll/ucadata-implicithan.icu
index 05ad0b1..296515d 100644
--- a/icu4c/source/data/in/coll/ucadata-implicithan.icu
+++ b/icu4c/source/data/in/coll/ucadata-implicithan.icu
Binary files differ
diff --git a/icu4c/source/data/in/coll/ucadata-unihan.icu b/icu4c/source/data/in/coll/ucadata-unihan.icu
index c67bc5c..3c86fd1 100644
--- a/icu4c/source/data/in/coll/ucadata-unihan.icu
+++ b/icu4c/source/data/in/coll/ucadata-unihan.icu
Binary files differ
diff --git a/icu4c/source/data/in/nfc.nrm b/icu4c/source/data/in/nfc.nrm
index d13f4d3..5691b2b 100644
--- a/icu4c/source/data/in/nfc.nrm
+++ b/icu4c/source/data/in/nfc.nrm
Binary files differ
diff --git a/icu4c/source/data/in/nfkc.nrm b/icu4c/source/data/in/nfkc.nrm
index 3159f19..b0f4405 100644
--- a/icu4c/source/data/in/nfkc.nrm
+++ b/icu4c/source/data/in/nfkc.nrm
Binary files differ
diff --git a/icu4c/source/data/in/nfkc_cf.nrm b/icu4c/source/data/in/nfkc_cf.nrm
index 1cc63aa..eef4e62 100644
--- a/icu4c/source/data/in/nfkc_cf.nrm
+++ b/icu4c/source/data/in/nfkc_cf.nrm
Binary files differ
diff --git a/icu4c/source/data/in/pnames.icu b/icu4c/source/data/in/pnames.icu
index bcdf576..443a8e4 100644
--- a/icu4c/source/data/in/pnames.icu
+++ b/icu4c/source/data/in/pnames.icu
Binary files differ
diff --git a/icu4c/source/data/in/ubidi.icu b/icu4c/source/data/in/ubidi.icu
index bf4df7e..df3bbb8 100644
--- a/icu4c/source/data/in/ubidi.icu
+++ b/icu4c/source/data/in/ubidi.icu
Binary files differ
diff --git a/icu4c/source/data/in/ucase.icu b/icu4c/source/data/in/ucase.icu
index c7c33e7..cb65fe7 100644
--- a/icu4c/source/data/in/ucase.icu
+++ b/icu4c/source/data/in/ucase.icu
Binary files differ
diff --git a/icu4c/source/data/in/ulayout.icu b/icu4c/source/data/in/ulayout.icu
index 7ec7a51..c129d1b 100644
--- a/icu4c/source/data/in/ulayout.icu
+++ b/icu4c/source/data/in/ulayout.icu
Binary files differ
diff --git a/icu4c/source/data/in/unames.icu b/icu4c/source/data/in/unames.icu
index e8ffe8e..77ff1fd 100644
--- a/icu4c/source/data/in/unames.icu
+++ b/icu4c/source/data/in/unames.icu
Binary files differ
diff --git a/icu4c/source/data/in/uprops.icu b/icu4c/source/data/in/uprops.icu
index d24261c..4a16695 100644
--- a/icu4c/source/data/in/uprops.icu
+++ b/icu4c/source/data/in/uprops.icu
Binary files differ
diff --git a/icu4c/source/data/in/uts46.nrm b/icu4c/source/data/in/uts46.nrm
index d281563..210b4d6 100644
--- a/icu4c/source/data/in/uts46.nrm
+++ b/icu4c/source/data/in/uts46.nrm
Binary files differ
diff --git a/icu4c/source/data/makedata.mak b/icu4c/source/data/makedata.mak
index 1f42124..75cdb2a 100644
--- a/icu4c/source/data/makedata.mak
+++ b/icu4c/source/data/makedata.mak
@@ -19,7 +19,7 @@
U_ICUDATA_NAME=icudt64
!ENDIF
U_ICUDATA_ENDIAN_SUFFIX=l
-UNICODE_VERSION=12.0
+UNICODE_VERSION=12.1
ICU_LIB_TARGET=$(DLL_OUTPUT)\$(U_ICUDATA_NAME).dll
# ICUMAKE
diff --git a/icu4c/source/data/unidata/CaseFolding.txt b/icu4c/source/data/unidata/CaseFolding.txt
index 47949f0..7eeb915 100644
--- a/icu4c/source/data/unidata/CaseFolding.txt
+++ b/icu4c/source/data/unidata/CaseFolding.txt
@@ -1,5 +1,5 @@
-# CaseFolding-12.0.0.txt
-# Date: 2019-01-22, 08:18:22 GMT
+# CaseFolding-12.1.0.txt
+# Date: 2019-03-10, 10:53:00 GMT
# © 2019 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see http://www.unicode.org/terms_of_use.html
diff --git a/icu4c/source/data/unidata/DerivedCoreProperties.txt b/icu4c/source/data/unidata/DerivedCoreProperties.txt
index 04cd07e..7856f2b 100644
--- a/icu4c/source/data/unidata/DerivedCoreProperties.txt
+++ b/icu4c/source/data/unidata/DerivedCoreProperties.txt
@@ -1,5 +1,5 @@
-# DerivedCoreProperties-12.0.0.txt
-# Date: 2019-01-22, 08:18:27 GMT
+# DerivedCoreProperties-12.1.0.txt
+# Date: 2019-03-10, 10:53:06 GMT
# © 2019 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see http://www.unicode.org/terms_of_use.html
@@ -11071,8 +11071,7 @@
3280..3289 ; Grapheme_Base
328A..32B0 ; Grapheme_Base
32B1..32BF ; Grapheme_Base
-32C0..32FE ; Grapheme_Base
-3300..33FF ; Grapheme_Base
+32C0..33FF ; Grapheme_Base
3400..4DB5 ; Grapheme_Base
4DC0..4DFF ; Grapheme_Base
4E00..9FEF ; Grapheme_Base
@@ -11819,7 +11818,7 @@
2CEB0..2EBE0 ; Grapheme_Base
2F800..2FA1D ; Grapheme_Base
-# Total code points: 135897
+# Total code points: 135898
# ================================================
diff --git a/icu4c/source/data/unidata/DerivedNormalizationProps.txt b/icu4c/source/data/unidata/DerivedNormalizationProps.txt
index 277c3ea..1c75ebd 100644
--- a/icu4c/source/data/unidata/DerivedNormalizationProps.txt
+++ b/icu4c/source/data/unidata/DerivedNormalizationProps.txt
@@ -1,5 +1,5 @@
-# DerivedNormalizationProps-12.0.0.txt
-# Date: 2019-01-22, 08:18:29 GMT
+# DerivedNormalizationProps-12.1.0.txt
+# Date: 2019-04-01, 09:10:23 GMT
# © 2019 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see http://www.unicode.org/terms_of_use.html
@@ -1464,8 +1464,7 @@
3280..3289 ; NFKD_QC; N
328A..32B0 ; NFKD_QC; N
32B1..32BF ; NFKD_QC; N
-32C0..32FE ; NFKD_QC; N
-3300..33FF ; NFKD_QC; N
+32C0..33FF ; NFKD_QC; N
A69C..A69D ; NFKD_QC; N
A770 ; NFKD_QC; N
A7F8..A7F9 ; NFKD_QC; N
@@ -1686,7 +1685,7 @@
1F250..1F251 ; NFKD_QC; N
2F800..2FA1D ; NFKD_QC; N
-# Total code points: 16895
+# Total code points: 16896
# ================================================
@@ -1876,8 +1875,7 @@
3280..3289 ; NFKC_QC; N
328A..32B0 ; NFKC_QC; N
32B1..32BF ; NFKC_QC; N
-32C0..32FE ; NFKC_QC; N
-3300..33FF ; NFKC_QC; N
+32C0..33FF ; NFKC_QC; N
A69C..A69D ; NFKC_QC; N
A770 ; NFKC_QC; N
A7F8..A7F9 ; NFKC_QC; N
@@ -2089,7 +2087,7 @@
1F250..1F251 ; NFKC_QC; N
2F800..2FA1D ; NFKC_QC; N
-# Total code points: 4795
+# Total code points: 4796
# ================================================
@@ -2683,7 +2681,7 @@
326E..327E ; Expands_On_NFKD
32B1..32BF ; Expands_On_NFKD
32C0..32CF ; Expands_On_NFKD
-3300..33FF ; Expands_On_NFKD
+32FF..33FF ; Expands_On_NFKD
AC00..D7A3 ; Expands_On_NFKD
FB00..FB06 ; Expands_On_NFKD
FB13..FB17 ; Expands_On_NFKD
@@ -2733,7 +2731,7 @@
1F213 ; Expands_On_NFKD
1F240..1F248 ; Expands_On_NFKD
-# Total code points: 13388
+# Total code points: 13389
# ================================================
@@ -2834,7 +2832,7 @@
327C..327D ; Expands_On_NFKC
32B1..32BF ; Expands_On_NFKC
32C0..32CF ; Expands_On_NFKC
-3300..33FF ; Expands_On_NFKC
+32FF..33FF ; Expands_On_NFKC
FB00..FB06 ; Expands_On_NFKC
FB13..FB17 ; Expands_On_NFKC
FB1D ; Expands_On_NFKC
@@ -2871,7 +2869,7 @@
1F200..1F201 ; Expands_On_NFKC
1F240..1F248 ; Expands_On_NFKC
-# Total code points: 1236
+# Total code points: 1237
# ================================================
@@ -4959,6 +4957,7 @@
32FC ; NFKC_CF; 30F0
32FD ; NFKC_CF; 30F1
32FE ; NFKC_CF; 30F2
+32FF ; NFKC_CF; 4EE4 548C
3300 ; NFKC_CF; 30A2 30D1 30FC 30C8
3301 ; NFKC_CF; 30A2 30EB 30D5 30A1
3302 ; NFKC_CF; 30A2 30F3 30DA 30A2
@@ -8803,7 +8802,7 @@
E0100..E01EF ; NFKC_CF;
E01F0..E0FFF ; NFKC_CF;
-# Total code points: 10314
+# Total code points: 10315
# ================================================
@@ -9461,8 +9460,7 @@
3280..3289 ; Changes_When_NFKC_Casefolded
328A..32B0 ; Changes_When_NFKC_Casefolded
32B1..32BF ; Changes_When_NFKC_Casefolded
-32C0..32FE ; Changes_When_NFKC_Casefolded
-3300..33FF ; Changes_When_NFKC_Casefolded
+32C0..33FF ; Changes_When_NFKC_Casefolded
A640 ; Changes_When_NFKC_Casefolded
A642 ; Changes_When_NFKC_Casefolded
A644 ; Changes_When_NFKC_Casefolded
@@ -9798,6 +9796,6 @@
E0100..E01EF ; Changes_When_NFKC_Casefolded
E01F0..E0FFF ; Changes_When_NFKC_Casefolded
-# Total code points: 10314
+# Total code points: 10315
# EOF
diff --git a/icu4c/source/data/unidata/FractionalUCA.txt b/icu4c/source/data/unidata/FractionalUCA.txt
index aeff577..5655134 100644
--- a/icu4c/source/data/unidata/FractionalUCA.txt
+++ b/icu4c/source/data/unidata/FractionalUCA.txt
@@ -1,12 +1,12 @@
# Fractional UCA Table, generated from the UCA DUCET
-# 2019-02-14 [MS]
-# VERSION: UCA=12.0.0, UCD=12.0.0
+# 2019-04-01 [MS]
+# VERSION: UCA=12.1.0, UCD=12.1.0
# © 2016 and later: Unicode, Inc. and others.
# License & terms of use: http://www.unicode.org/copyright.html
# For a description of the format and usage, see
# http://www.unicode.org/reports/tr35/tr35-collation.html
-[UCA version = 12.0.0]
+[UCA version = 12.1.0]
# Unified_Ideograph: 87887 characters
[Unified_Ideograph 4E00..9FEF FA0E..FA0F FA11 FA13..FA14 FA1F FA21 FA23..FA24 FA27..FA29 3400..4DB5 20000..2A6D6 2A700..2B734 2B740..2B81D 2B820..2CEA1 2CEB0..2EBE0]
@@ -61187,6 +61187,7 @@
F9FD; [U+4EC0]
2F819; [U+4ECC]
F9A8; [U+4EE4]
+32FF; [U+4EE4, 31][U+548C, 31]
32AD; [U+4F01, 1B]
32A1; [U+4F11, 1B]
2F804; [U+4F60]
diff --git a/icu4c/source/data/unidata/NormalizationCorrections.txt b/icu4c/source/data/unidata/NormalizationCorrections.txt
index 1f39b32..360f49c 100644
--- a/icu4c/source/data/unidata/NormalizationCorrections.txt
+++ b/icu4c/source/data/unidata/NormalizationCorrections.txt
@@ -1,6 +1,6 @@
-# NormalizationCorrections-12.0.0.txt
-# Date: 2018-08-03, 00:00:00 GMT [KW, LI]
-# © 2018 Unicode®, Inc.
+# NormalizationCorrections-12.1.0.txt
+# Date: 2019-03-08, 23:59:00 GMT [KW, LI]
+# © 2019 Unicode®, Inc.
# For terms of use, see http://www.unicode.org/terms_of_use.html
#
# Unicode Character Database
diff --git a/icu4c/source/data/unidata/NormalizationTest.txt b/icu4c/source/data/unidata/NormalizationTest.txt
index b91cf78..cf4c3a9 100644
--- a/icu4c/source/data/unidata/NormalizationTest.txt
+++ b/icu4c/source/data/unidata/NormalizationTest.txt
@@ -1,5 +1,5 @@
-# NormalizationTest-12.0.0.txt
-# Date: 2019-01-22, 08:18:33 GMT
+# NormalizationTest-12.1.0.txt
+# Date: 2019-04-01, 09:10:28 GMT
# © 2019 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see http://www.unicode.org/terms_of_use.html
@@ -2149,6 +2149,7 @@
32FC;32FC;32FC;30F0;30F0;
32FD;32FD;32FD;30F1;30F1;
32FE;32FE;32FE;30F2;30F2;
+32FF;32FF;32FF;4EE4 548C;4EE4 548C;
3300;3300;3300;30A2 30D1 30FC 30C8;30A2 30CF 309A 30FC 30C8;
3301;3301;3301;30A2 30EB 30D5 30A1;30A2 30EB 30D5 30A1;
3302;3302;3302;30A2 30F3 30DA 30A2;30A2 30F3 30D8 309A 30A2;
diff --git a/icu4c/source/data/unidata/SpecialCasing.txt b/icu4c/source/data/unidata/SpecialCasing.txt
index 7db2e31..1c04aac 100644
--- a/icu4c/source/data/unidata/SpecialCasing.txt
+++ b/icu4c/source/data/unidata/SpecialCasing.txt
@@ -1,5 +1,5 @@
-# SpecialCasing-12.0.0.txt
-# Date: 2019-01-22, 08:18:50 GMT
+# SpecialCasing-12.1.0.txt
+# Date: 2019-03-10, 10:53:28 GMT
# © 2019 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see http://www.unicode.org/terms_of_use.html
diff --git a/icu4c/source/data/unidata/UCARules.txt b/icu4c/source/data/unidata/UCARules.txt
index 0bbea76..264fa88 100644
--- a/icu4c/source/data/unidata/UCARules.txt
+++ b/icu4c/source/data/unidata/UCARules.txt
@@ -1,10 +1,10 @@
# UCA_Rules_SHORT.txt
-# Date: 2019-02-14, 21:26:41 GMT
+# Date: 2019-04-01, 20:17:28 GMT
# © 2019 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see http://www.unicode.org/terms_of_use.html
-# UCA Version: 12.0.0
-# UCD Version: 12.0.0
+# UCA Version: 12.1.0
+# UCD Version: 12.1.0
# For a description of the format and usage, see
# http://www.unicode.org/reports/tr35/tr35-collation.html#Root_Data_Files
@@ -331,15 +331,15 @@
= 𑍲
= 𑍳
= 𑍴
- =
- =
- =
- =
- =
- =
- =
- =
- =
+ = '\U00013430'
+ = '\U00013431'
+ = '\U00013432'
+ = '\U00013433'
+ = '\U00013434'
+ = '\U00013435'
+ = '\U00013436'
+ = '\U00013437'
+ = '\U00013438'
= '\U0001BCA0'
= '\U0001BCA1'
= '\U0001BCA2'
@@ -29294,6 +29294,8 @@
<<< ㆟
& 亻
<<< ⺅
+& 令
+ < ㋿ / 和
& 企
<<< ㊭
& 休
diff --git a/icu4c/source/data/unidata/UnicodeData.txt b/icu4c/source/data/unidata/UnicodeData.txt
index d88a601..e65aec5 100644
--- a/icu4c/source/data/unidata/UnicodeData.txt
+++ b/icu4c/source/data/unidata/UnicodeData.txt
@@ -11856,6 +11856,7 @@
32FC;CIRCLED KATAKANA WI;So;0;L;<circle> 30F0;;;;N;;;;;
32FD;CIRCLED KATAKANA WE;So;0;L;<circle> 30F1;;;;N;;;;;
32FE;CIRCLED KATAKANA WO;So;0;L;<circle> 30F2;;;;N;;;;;
+32FF;SQUARE ERA NAME REIWA;So;0;L;<square> 4EE4 548C;;;;N;;;;;
3300;SQUARE APAATO;So;0;L;<square> 30A2 30D1 30FC 30C8;;;;N;SQUARED APAATO;;;;
3301;SQUARE ARUHUA;So;0;L;<square> 30A2 30EB 30D5 30A1;;;;N;SQUARED ARUHUA;;;;
3302;SQUARE ANPEA;So;0;L;<square> 30A2 30F3 30DA 30A2;;;;N;SQUARED ANPEA;;;;
diff --git a/icu4c/source/data/unidata/changes.txt b/icu4c/source/data/unidata/changes.txt
index af96e68..833868f 100644
--- a/icu4c/source/data/unidata/changes.txt
+++ b/icu4c/source/data/unidata/changes.txt
@@ -49,6 +49,279 @@
---------------------------------------------------------------------------- ***
+Unicode 12.1 update for ICU 64.2
+
+** This is an abbreviated update with one new character for the new
+** Japanese era expected to start on 2019-May-01: U+32FF SQUARE ERA NAME REIWA
+https://en.wikipedia.org/wiki/Reiwa_period
+
+http://www.unicode.org/versions/Unicode12.1.0/
+
+ICU-20497 Unicode 12.1
+
+cldrbug 11978: Unicode 12.1
+
+* Command-line environment setup
+
+UNICODE_DATA=~/unidata/uni121/20190403
+CLDR_SRC=~/svn.cldr/uni
+ICU_ROOT=~/icu/uni
+ICU_SRC=$ICU_ROOT/src
+ICUDT=icudt64b
+ICU4C_DATA_IN=$ICU_SRC/icu4c/source/data/in
+ICU4C_UNIDATA=$ICU_SRC/icu4c/source/data/unidata
+export LD_LIBRARY_PATH=$ICU_ROOT/dbg/icu4c/lib
+
+*** Unicode version numbers
+- makedata.mak
+- uchar.h
+- com.ibm.icu.util.VersionInfo
+- com.ibm.icu.dev.test.lang.UCharacterTest.VERSION_
+
+- Run ICU4C "configure" _after_ updating the Unicode version number in uchar.h
+ so that the makefiles see the new version number.
+ cd $ICU_ROOT/dbg/icu4c
+ ICU_DATA_BUILDTOOL_OPTS=--include_uni_core_data ../../../doconfig-clang-dbg.sh
+
+*** data files & enums & parser code
+
+* download files
+- mkdir -p $UNICODE_DATA
+- download Unicode files into $UNICODE_DATA
+ + subfolders: emoji, idna, security, ucd, uca
+ + inside ucd: extract Unihan.zip to "here" (.../ucd/Unihan/*.txt), delete Unihan.zip
+
+* for manual diffs and for Unicode Tools input data updates:
+ remove version suffixes from the file names
+ ~$ unidata/desuffixucd.py $UNICODE_DATA
+ (see https://sites.google.com/site/unicodetools/inputdata)
+
+* process and/or copy files
+- $ICU_SRC/tools/unicode$ py/preparseucd.py $UNICODE_DATA $ICU_SRC
+ + This writes files (especially ppucd.txt) to the ICU4C unidata and testdata subfolders.
+ + For debugging, and tweaking how ppucd.txt is written,
+ the tool has an --only_ppucd option:
+ py/preparseucd.py $UNICODE_DATA --only_ppucd path/to/ppucd/outputfile
+
+- cp -v $UNICODE_DATA/security/confusables.txt $ICU4C_UNIDATA
+
+* build ICU (make install)
+ so that the tools build can pick up the new definitions from the installed header files.
+
+ $ICU_ROOT/dbg/icu4c$ echo;echo; date; make -j7 install &> out.txt ; tail -n 30 out.txt ; date
+
+* update spoof checker UnicodeSet initializers:
+ inclusionPat & recommendedPat in uspoof.cpp
+ INCLUSION & RECOMMENDED in SpoofChecker.java
+- make sure that the Unicode Tools tree contains the latest security data files
+- go to Unicode Tools org.unicode.text.tools.RecommendedSetGenerator
+- update the hardcoded version number there in the DIRECTORY path
+- run the tool (no special environment variables needed)
+- copy & paste from the Console output into the .cpp & .java files
+
+* generate normalization data files
+ cd $ICU_ROOT/dbg/icu4c
+ bin/gennorm2 -o $ICU_SRC/icu4c/source/common/norm2_nfc_data.h -s $ICU4C_UNIDATA/norm2 nfc.txt --csource
+ bin/gennorm2 -o $ICU4C_DATA_IN/nfc.nrm -s $ICU4C_UNIDATA/norm2 nfc.txt
+ bin/gennorm2 -o $ICU4C_DATA_IN/nfkc.nrm -s $ICU4C_UNIDATA/norm2 nfc.txt nfkc.txt
+ bin/gennorm2 -o $ICU4C_DATA_IN/nfkc_cf.nrm -s $ICU4C_UNIDATA/norm2 nfc.txt nfkc.txt nfkc_cf.txt
+ bin/gennorm2 -o $ICU4C_DATA_IN/uts46.nrm -s $ICU4C_UNIDATA/norm2 nfc.txt uts46.txt
+
+* build ICU (make install)
+ so that the tools build can pick up the new definitions from the installed header files.
+
+ $ICU_ROOT/dbg/icu4c$ echo;echo; make -j7 install &> out.txt ; tail -n 30 out.txt ; date
+
+* build Unicode tools using CMake+make
+
+$ICU_SRC/tools/unicode/c/icudefs.txt:
+
+# Location (--prefix) of where ICU was installed.
+set(ICU_INST_DIR /usr/local/google/home/mscherer/icu/mine/inst/icu4c)
+# Location of the ICU4C source tree.
+set(ICU4C_SRC_DIR /usr/local/google/home/mscherer/icu/uni/src/icu4c)
+
+ $ICU_ROOT/dbg$
+ mkdir -p tools/unicode/c
+ cd tools/unicode/c
+
+ $ICU_ROOT/dbg/tools/unicode/c$
+ cmake ../../../../src/tools/unicode/c
+ make
+
+* generate core properties data files
+ $ICU_ROOT/dbg/tools/unicode/c$
+ genprops/genprops $ICU_SRC/icu4c
+ genuca/genuca --hanOrder implicit $ICU_SRC/icu4c && \
+ genuca/genuca --hanOrder radical-stroke $ICU_SRC/icu4c
+- rebuild ICU (make install) & tools
+
+* update uts46test.cpp and UTS46Test.java if there are new characters that are equivalent to
+ sequences with non-LDH ASCII (that is, their decompositions contain '=' or similar)
+- grep IdnaMappingTable.txt or uts46.txt for "disallowed_STD3_valid" on non-ASCII characters
+- Unicode 6.0..12.1: U+2260, U+226E, U+226F
+- nothing new in this Unicode version, no test file to update
+
+* run & fix ICU4C tests
+- Andy handles RBBI & spoof check test failures
+
+* collation: CLDR collation root, UCA DUCET
+
+- UCA DUCET goes into Mark's Unicode tools, see
+ https://sites.google.com/site/unicodetools/home#TOC-UCA
+ diff the main mapping file, look for bad changes
+ (for example, more bytes per weight for common characters)
+ ~/svn.unitools/trunk$ sed -r -f ~/svn.cldr/uni/tools/scripts/uca/blankweights.sed ../Generated/UCA/12.1.0/CollationAuxiliary/FractionalUCA.txt > ../frac-12.1.txt
+ ~/svn.unitools/trunk$ meld ../frac-12.txt ../frac-12.1.txt
+
+- CLDR root data files are checked into $CLDR_SRC/common/uca/
+ cp (Unicode Tools UCA generated)/CollationAuxiliary/* $CLDR_SRC/common/uca/
+
+- update source/data/unidata/FractionalUCA.txt with FractionalUCA_SHORT.txt
+ cp -v $CLDR_SRC/common/uca/FractionalUCA_SHORT.txt $ICU4C_UNIDATA/FractionalUCA.txt
+- update source/data/unidata/UCARules.txt with UCA_Rules_SHORT.txt
+ cp -v $ICU4C_UNIDATA/UCARules.txt /tmp/UCARules-old.txt
+ (note removing the underscore before "Rules")
+ cp -v $CLDR_SRC/common/uca/UCA_Rules_SHORT.txt $ICU4C_UNIDATA/UCARules.txt
+- restore TODO diffs in UCARules.txt
+ meld /tmp/UCARules-old.txt $ICU4C_UNIDATA/UCARules.txt
+- update (ICU4C)/source/test/testdata/CollationTest_*.txt
+ and (ICU4J)/main/tests/collate/src/com/ibm/icu/dev/data/CollationTest_*.txt
+ from the CLDR root files (..._CLDR_..._SHORT.txt)
+ cp -v $CLDR_SRC/common/uca/CollationTest_CLDR_NON_IGNORABLE_SHORT.txt $ICU_SRC/icu4c/source/test/testdata/CollationTest_NON_IGNORABLE_SHORT.txt
+ cp -v $CLDR_SRC/common/uca/CollationTest_CLDR_SHIFTED_SHORT.txt $ICU_SRC/icu4c/source/test/testdata/CollationTest_SHIFTED_SHORT.txt
+ cp -v $ICU_SRC/icu4c/source/test/testdata/CollationTest_*.txt $ICU_SRC/icu4j/main/tests/collate/src/com/ibm/icu/dev/data
+- if CLDR common/uca/unihan-index.txt changes, then update
+ CLDR common/collation/root.xml <collation type="private-unihan">
+ and regenerate (or update in parallel) $ICU_SRC/icu4c/source/data/coll/root.txt
+
+- run genuca, see command line above
+- rebuild ICU4C
+
+* Unihan collators
+ https://sites.google.com/site/unicodetools/unihan
+- run Unicode Tools
+ org.unicode.draft.GenerateUnihanCollators
+ with VM arguments
+ -ea
+ -DSVN_WORKSPACE=/usr/local/google/home/mscherer/svn.unitools/trunk
+ -DOTHER_WORKSPACE=/usr/local/google/home/mscherer/svn.unitools
+ -DUCD_DIR=/usr/local/google/home/mscherer/svn.unitools/trunk/data
+ -DCLDR_DIR=/usr/local/google/home/mscherer/svn.cldr/uni
+ -DUVERSION=12.1.0
+- run Unicode Tools
+ org.unicode.draft.GenerateUnihanCollatorFiles
+ with the same arguments
+- check CLDR diffs
+ cd $CLDR_SRC
+ meld common/collation/zh.xml ../Generated/cldr/han/replace/zh.xml
+ meld common/transforms/Han-Latin.xml ../Generated/cldr/han/replace/Han-Latin.xml
+- copy to CLDR
+ cd $CLDR_SRC
+ cp ../Generated/cldr/han/replace/zh.xml common/collation/zh.xml
+ cp ../Generated/cldr/han/replace/Han-Latin.xml common/transforms/Han-Latin.xml
+- run CLDR unit tests, commit to CLDR
+- generate ICU zh collation data: run CLDR
+ org.unicode.cldr.icu.NewLdml2IcuConverter
+ with program arguments
+ -t collation
+ -s /usr/local/google/home/mscherer/svn.cldr/uni/common/collation
+ -m /usr/local/google/home/mscherer/svn.cldr/uni/common/supplemental
+ -d /usr/local/google/home/mscherer/icu/uni/src/icu4c/source/data/coll
+ -p /usr/local/google/home/mscherer/icu/uni/src/icu4c/source/data/xml/collation
+ zh
+ and VM arguments
+ -ea
+ -DCLDR_DIR=/usr/local/google/home/mscherer/svn.cldr/uni
+- rebuild ICU4C
+
+* run & fix ICU4C tests, now with new CLDR collation root data
+- run all tests with the collation test data *_SHORT.txt or the full files
+ (the full ones have comments, useful for debugging)
+- note on intltest: if collate/UCAConformanceTest fails, then
+ utility/MultithreadTest/TestCollators will fail as well;
+ fix the conformance test before looking into the multi-thread test
+
+* update Java data files
+- refresh just the UCD/UCA-related/derived files, just to be safe
+- see (ICU4C)/source/data/icu4j-readme.txt
+- mkdir -p /tmp/icu4j/com/ibm/icu/impl/data/$ICUDT
+- $ICU_ROOT/dbg/icu4c$ make ICU4J_ROOT=/tmp/icu4j icu4j-data-install
+ output:
+ ...
+ make[1]: Entering directory '/usr/local/google/home/mscherer/icu/uni/dbg/icu4c/data'
+ mkdir -p ./out/icu4j/com/ibm/icu/impl/data/icudt64b
+ mkdir -p ./out/icu4j/tzdata/com/ibm/icu/impl/data/icudt64b
+ LD_LIBRARY_PATH=../lib:../stubdata:../tools/ctestfw:$LD_LIBRARY_PATH ../bin/icupkg ./out/tmp/icudt64l.dat ./out/icu4j/icudt64b.dat -s ./out/build/icudt64l -x '*' -tb -d ./out/icu4j/com/ibm/icu/impl/data/icudt64b
+ mv ./out/icu4j/"com/ibm/icu/impl/data/icudt64b/zoneinfo64.res" ./out/icu4j/"com/ibm/icu/impl/data/icudt64b/metaZones.res" ./out/icu4j/"com/ibm/icu/impl/data/icudt64b/timezoneTypes.res" ./out/icu4j/"com/ibm/icu/impl/data/icudt64b/windowsZones.res" "./out/icu4j/tzdata/com/ibm/icu/impl/data/icudt64b"
+ jar cf ./out/icu4j/icudata.jar -C ./out/icu4j com/ibm/icu/impl/data/icudt64b/
+ mkdir -p /tmp/icu4j/main/shared/data
+ cp ./out/icu4j/icudata.jar /tmp/icu4j/main/shared/data
+ jar cf ./out/icu4j/icutzdata.jar -C ./out/icu4j/tzdata com/ibm/icu/impl/data/icudt64b/
+ mkdir -p /tmp/icu4j/main/shared/data
+ cp ./out/icu4j/icutzdata.jar /tmp/icu4j/main/shared/data
+ make[1]: Leaving directory '/usr/local/google/home/mscherer/icu/uni/dbg/icu4c/data'
+- copy the big-endian Unicode data files to another location,
+ separate from the other data files,
+ and then refresh ICU4J
+ cd $ICU_ROOT/dbg/icu4c/data/out/icu4j
+ mkdir -p /tmp/icu4j/com/ibm/icu/impl/data/$ICUDT/coll
+ mkdir -p /tmp/icu4j/com/ibm/icu/impl/data/$ICUDT/brkitr
+ cp -v com/ibm/icu/impl/data/$ICUDT/confusables.cfu /tmp/icu4j/com/ibm/icu/impl/data/$ICUDT
+ cp -v com/ibm/icu/impl/data/$ICUDT/*.icu /tmp/icu4j/com/ibm/icu/impl/data/$ICUDT
+ rm /tmp/icu4j/com/ibm/icu/impl/data/$ICUDT/cnvalias.icu
+ cp -v com/ibm/icu/impl/data/$ICUDT/*.nrm /tmp/icu4j/com/ibm/icu/impl/data/$ICUDT
+ cp -v com/ibm/icu/impl/data/$ICUDT/coll/* /tmp/icu4j/com/ibm/icu/impl/data/$ICUDT/coll
+ cp -v com/ibm/icu/impl/data/$ICUDT/brkitr/* /tmp/icu4j/com/ibm/icu/impl/data/$ICUDT/brkitr
+ jar uvf $ICU_SRC/icu4j/main/shared/data/icudata.jar -C /tmp/icu4j com/ibm/icu/impl/data/$ICUDT
+
+* When refreshing all of ICU4J data from ICU4C
+- $ICU_ROOT/dbg/icu4c$ make ICU4J_ROOT=/tmp/icu4j icu4j-data-install
+- cp /tmp/icu4j/main/shared/data/icudata.jar $ICU_SRC/icu4j/main/shared/data
+or
+- $ICU_ROOT/dbg/icu4c$ make ICU4J_ROOT=$ICU_SRC/icu4j icu4j-data-install
+
+* update CollationFCD.java
+ + copy & paste the initializers of lcccIndex[] etc. from
+ ICU4C/source/i18n/collationfcd.cpp to
+ ICU4J/main/classes/collate/src/com/ibm/icu/impl/coll/CollationFCD.java
+
+* refresh Java test .txt files
+- copy new .txt files into ICU4J's main/tests/core/src/com/ibm/icu/dev/data/unicode
+ cd $ICU_SRC/icu4c/source/data/unidata
+ cp -v confusables.txt confusablesWholeScript.txt NormalizationCorrections.txt NormalizationTest.txt SpecialCasing.txt UnicodeData.txt $ICU_SRC/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode
+ cd ../../test/testdata
+ cp -v BidiCharacterTest.txt BidiTest.txt IdnaTestV2.txt $ICU_SRC/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode
+ cp -v $UNICODE_DATA/ucd/CompositionExclusions.txt $ICU_SRC/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode
+
+* run & fix ICU4J tests
+
+*** API additions
+- send notice to icu-design about new born-@stable API (enum constants etc.)
+
+*** CLDR numbering systems
+- look for new sets of decimal digits (gc=ND & nv=4) and add to CLDR
+ for example, look for
+ ~/icu/uni/src$ egrep ';gc=Nd.+;nv=4' icu4c/source/data/unidata/ppucd.txt
+ in new blocks (Blocks.txt)
+ Unicode 12: using Unicode 12 CLDR ticket #11478
+ hmnp 1E140..1E149 Nyiakeng_Puachue_Hmong
+ wcho 1E2F0..1E2F9 Wancho
+ Unicode 11: using Unicode 11 CLDR ticket #10978
+ rohg 10D30..10D39 Hanifi_Rohingya
+ gong 11DA0..11DA9 Gunjala_Gondi
+ Earlier: CLDR tickets specific to adding new numbering systems.
+ Unicode 10: http://unicode.org/cldr/trac/ticket/10219
+ Unicode 9: http://unicode.org/cldr/trac/ticket/9692
+
+*** merge the Unicode update branches back onto the trunk
+- do not merge the icudata.jar and testdata.jar,
+ instead rebuild them from merged & tested ICU4C
+- make sure that changes to Unicode tools are checked in:
+ http://www.unicode.org/utility/trac/log/trunk/unicodetools
+
+---------------------------------------------------------------------------- ***
+
Unicode 12.0 update for ICU 64
http://www.unicode.org/versions/Unicode12.0.0/
diff --git a/icu4c/source/data/unidata/confusables.txt b/icu4c/source/data/unidata/confusables.txt
index 4ad83e4..ee85eee 100644
--- a/icu4c/source/data/unidata/confusables.txt
+++ b/icu4c/source/data/unidata/confusables.txt
@@ -1,11 +1,11 @@
# confusables.txt
-# Date: 2018-11-05, 07:39:47 GMT
-# © 2018 Unicode®, Inc.
+# Date: 2019-04-01, 21:59:19 GMT
+# © 2019 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see http://www.unicode.org/terms_of_use.html
#
# Unicode Security Mechanisms for UTS #39
-# Version: 12.0.0
+# Version: 12.1.0
#
# For documentation and usage, see http://www.unicode.org/reports/tr39
#
@@ -2353,7 +2353,7 @@
A795 ; A727 ; MA # ( ꞕ → ꜧ ) LATIN SMALL LETTER H WITH PALATAL HOOK → LATIN SMALL LETTER HENG #
02DB ; 0069 ; MA #* ( ˛ → i ) OGONEK → LATIN SMALL LETTER I # →ͺ→→ι→→ι→
-2373 ; 0069 ; MA #* ( ⍳ → i ) APL FUNCTIONAL SYMBOL IOTA → LATIN SMALL LETTER I # →ɩ→
+2373 ; 0069 ; MA #* ( ⍳ → i ) APL FUNCTIONAL SYMBOL IOTA → LATIN SMALL LETTER I # →ι→
FF49 ; 0069 ; MA # ( ｉ → i ) FULLWIDTH LATIN SMALL LETTER I → LATIN SMALL LETTER I # →і→
2170 ; 0069 ; MA # ( ⅰ → i ) SMALL ROMAN NUMERAL ONE → LATIN SMALL LETTER I #
2139 ; 0069 ; MA # ( ℹ → i ) INFORMATION SOURCE → LATIN SMALL LETTER I #
diff --git a/icu4c/source/data/unidata/norm2/nfc.txt b/icu4c/source/data/unidata/norm2/nfc.txt
index 62be5d7..31dc256 100644
--- a/icu4c/source/data/unidata/norm2/nfc.txt
+++ b/icu4c/source/data/unidata/norm2/nfc.txt
@@ -9,7 +9,7 @@
#
# Complete data for Unicode NFC normalization.
-* Unicode 12.0.0
+* Unicode 12.1.0
# Canonical_Combining_Class (ccc) values
0300..0314:230
diff --git a/icu4c/source/data/unidata/norm2/nfkc.txt b/icu4c/source/data/unidata/norm2/nfkc.txt
index 1ab0d38..a1e363f 100644
--- a/icu4c/source/data/unidata/norm2/nfkc.txt
+++ b/icu4c/source/data/unidata/norm2/nfkc.txt
@@ -13,7 +13,7 @@
# to NFKC one-way mappings.
# Use this file as the second gennorm2 input file after nfc.txt.
-* Unicode 12.0.0
+* Unicode 12.1.0
00A0>0020
00A8>0020 0308
@@ -1107,6 +1107,7 @@
32FC>30F0
32FD>30F1
32FE>30F2
+32FF>4EE4 548C
3300>30A2 30D1 30FC 30C8
3301>30A2 30EB 30D5 30A1
3302>30A2 30F3 30DA 30A2
diff --git a/icu4c/source/data/unidata/norm2/nfkc_cf.txt b/icu4c/source/data/unidata/norm2/nfkc_cf.txt
index 6f15a6b..3248c3a 100644
--- a/icu4c/source/data/unidata/norm2/nfkc_cf.txt
+++ b/icu4c/source/data/unidata/norm2/nfkc_cf.txt
@@ -12,7 +12,7 @@
# and reformatted into syntax for the gennorm2 Normalizer2 data generator tool.
# Use this file as the third gennorm2 input file after nfc.txt and nfkc.txt.
-* Unicode 12.0.0
+* Unicode 12.1.0
0041>0061
0042>0062
@@ -2082,6 +2082,7 @@
32FC>30F0
32FD>30F1
32FE>30F2
+32FF>4EE4 548C
3300>30A2 30D1 30FC 30C8
3301>30A2 30EB 30D5 30A1
3302>30A2 30F3 30DA 30A2
diff --git a/icu4c/source/data/unidata/norm2/uts46.txt b/icu4c/source/data/unidata/norm2/uts46.txt
index 2ffb466..15427fc 100644
--- a/icu4c/source/data/unidata/norm2/uts46.txt
+++ b/icu4c/source/data/unidata/norm2/uts46.txt
@@ -1,12 +1,14 @@
# Original file:
-# IdnaMappingTable-12.0.0.txt
-# Date: 2019-03-02, 13:45:26 GMT
+# IdnaMappingTable.txt
+# Date: 2019-04-01, 09:17:25 GMT
# © 2019 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see http://www.unicode.org/terms_of_use.html
#
-# Unicode IDNA Compatible Preprocessing (UTS #46)
-# For documentation, see http://www.unicode.org/reports/tr46/
+# Unicode IDNA Compatible Preprocessing for UTS #46
+# Version: 12.1.0
+#
+# For documentation and usage, see http://www.unicode.org/reports/tr46
# ================================================
# This file has been reformatted into syntax for the
@@ -23,7 +25,7 @@
#
# Use this file as the second gennorm2 input file after nfc.txt.
# ================================================
-
+#
# 0000..002C disallowed_STD3_valid # 1.1 <control-0000>..COMMA
# 002D..002E valid # 1.1 HYPHEN-MINUS..FULL STOP
# 002F disallowed_STD3_valid # 1.1 SOLIDUS
@@ -3664,7 +3666,7 @@
32FC >30F0 # 1.1 CIRCLED KATAKANA WI
32FD >30F1 # 1.1 CIRCLED KATAKANA WE
32FE >30F2 # 1.1 CIRCLED KATAKANA WO
-32FF >FFFD # NA <reserved-32FF>
+32FF >4EE4 548C # 12.1 SQUARE ERA NAME REIWA
3300 >30A2 30D1 30FC 30C8 #1.1 SQUARE APAATO
3301 >30A2 30EB 30D5 30A1 #1.1 SQUARE ARUHUA
3302 >30A2 30F3 30DA 30A2 #1.1 SQUARE ANPEA
diff --git a/icu4c/source/data/unidata/ppucd.txt b/icu4c/source/data/unidata/ppucd.txt
index 20f86ba..83a8e59 100644
--- a/icu4c/source/data/unidata/ppucd.txt
+++ b/icu4c/source/data/unidata/ppucd.txt
@@ -1,7 +1,7 @@
# Preparsed UCD generated by ICU preparseucd.py
# Copyright (C) 1991 and later: Unicode, Inc. and others.
# License & terms of use: http://www.unicode.org/copyright.html
-ucd;12.0.0
+ucd;12.1.0
property;Catalog;age;Age
property;Binary;AHex;ASCII_Hex_Digit
@@ -124,6 +124,7 @@
value;age;10.0;V10_0
value;age;11.0;V11_0
value;age;12.0;V12_0
+value;age;12.1;V12_1
value;age;2.0;V2_0
value;age;2.1;V2_1
value;age;3.0;V3_0
@@ -14837,7 +14838,8 @@
cp;32FC;dm=30F0;na=CIRCLED KATAKANA WI;NFKC_CF=30F0;sc=Kana;WB=KA
cp;32FD;dm=30F1;na=CIRCLED KATAKANA WE;NFKC_CF=30F1;sc=Kana;WB=KA
cp;32FE;dm=30F2;na=CIRCLED KATAKANA WO;NFKC_CF=30F2;sc=Kana;WB=KA
-unassigned;32FF;vo=U
+# Japanese era name
+cp;32FF;age=12.1;dm=4EE4 548C;dt=Sqr;na=SQUARE ERA NAME REIWA;NFKC_CF=4EE4 548C;scx=Hani;vo=Tu
block;3300..33FF;age=1.1;blk=CJK_Compat;CWKCF;dt=Sqr;ea=W;gc=So;Gr_Base;lb=ID;NFKC_QC=N;NFKD_QC=N;sc=Zyyy;vo=U
# 3300..33FF CJK Compatibility
diff --git a/icu4c/source/test/testdata/BidiTest.txt b/icu4c/source/test/testdata/BidiTest.txt
index 3daa3b9..49665bd 100644
--- a/icu4c/source/test/testdata/BidiTest.txt
+++ b/icu4c/source/test/testdata/BidiTest.txt
@@ -1,5 +1,5 @@
-# BidiTest-12.0.0.txt
-# Date: 2019-01-22, 08:18:20 GMT
+# BidiTest-12.1.0.txt
+# Date: 2019-03-08, 23:59:20 GMT
# © 2019 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see http://www.unicode.org/terms_of_use.html
diff --git a/icu4c/source/test/testdata/CollationTest_NON_IGNORABLE_SHORT.txt b/icu4c/source/test/testdata/CollationTest_NON_IGNORABLE_SHORT.txt
index a568a73..488aa67 100644
--- a/icu4c/source/test/testdata/CollationTest_NON_IGNORABLE_SHORT.txt
+++ b/icu4c/source/test/testdata/CollationTest_NON_IGNORABLE_SHORT.txt
@@ -1,10 +1,10 @@
# CollationTest_CLDR_NON_IGNORABLE_SHORT.txt
-# Date: 2019-02-14, 21:26:47 GMT
+# Date: 2019-04-01, 20:17:34 GMT
# © 2019 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see http://www.unicode.org/terms_of_use.html
-# UCA Version: 12.0.0
-# UCD Version: 12.0.0
+# UCA Version: 12.1.0
+# UCD Version: 12.1.0
# For a description of the format and usage, see
# http://www.unicode.org/reports/tr35/tr35-collation.html#Root_Data_Files
@@ -1183,28 +1183,39 @@
193B 0334
0334 16B30
16B30 0334
+0334 1E131
1E131 0334
0334 16B31
16B31 0334
+0334 1E136
1E136 0334
0334 16B32
16B32 0334
+0334 1E132
1E132 0334
0334 16B33
16B33 0334
+0334 1E133
1E133 0334
0334 16B34
16B34 0334
+0334 1E130
1E130 0334
0334 16B35
16B35 0334
+0334 1E134
1E134 0334
0334 16B36
16B36 0334
+0334 1E135
1E135 0334
+0334 1E2EC
1E2EC 0334
+0334 1E2ED
1E2ED 0334
+0334 1E2EE
1E2EE 0334
+0334 1E2EF
1E2EF 0334
0334 302A
302A 0334
@@ -94808,6 +94819,7 @@
119DD 0061
119DD 0041
119DD 0062
+0334 119E0
119E0 0334
119E0 0021
119E0 003F
@@ -100597,6 +100609,7 @@
0EB9 0061
0EB9 0041
0EB9 0062
+0334 0EBA
0EBA 0334
0EBA 0021
0EBA 003F
@@ -164034,6 +164047,11 @@
F9A8 0061
F9A8 0041
F9A8 0062
+32FF 0021
+32FF 003F
+32FF 0061
+32FF 0041
+32FF 0062
32AD 0021
32AD 003F
32AD 0061
diff --git a/icu4c/source/test/testdata/CollationTest_SHIFTED_SHORT.txt b/icu4c/source/test/testdata/CollationTest_SHIFTED_SHORT.txt
index b8a4d8f..4a20889 100644
--- a/icu4c/source/test/testdata/CollationTest_SHIFTED_SHORT.txt
+++ b/icu4c/source/test/testdata/CollationTest_SHIFTED_SHORT.txt
@@ -1,10 +1,10 @@
# CollationTest_CLDR_SHIFTED_SHORT.txt
-# Date: 2019-02-14, 21:26:49 GMT
+# Date: 2019-04-01, 20:17:36 GMT
# © 2019 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see http://www.unicode.org/terms_of_use.html
-# UCA Version: 12.0.0
-# UCD Version: 12.0.0
+# UCA Version: 12.1.0
+# UCD Version: 12.1.0
# For a description of the format and usage, see
# http://www.unicode.org/reports/tr35/tr35-collation.html#Root_Data_Files
@@ -5587,28 +5587,39 @@
193B 0334
0334 16B30
16B30 0334
+0334 1E131
1E131 0334
0334 16B31
16B31 0334
+0334 1E136
1E136 0334
0334 16B32
16B32 0334
+0334 1E132
1E132 0334
0334 16B33
16B33 0334
+0334 1E133
1E133 0334
0334 16B34
16B34 0334
+0334 1E130
1E130 0334
0334 16B35
16B35 0334
+0334 1E134
1E134 0334
0334 16B36
16B36 0334
+0334 1E135
1E135 0334
+0334 1E2EC
1E2EC 0334
+0334 1E2ED
1E2ED 0334
+0334 1E2EE
1E2EE 0334
+0334 1E2EF
1E2EF 0334
0334 302A
302A 0334
@@ -101476,6 +101487,7 @@
119DD 0062
119E0 0021
119E0 003F
+0334 119E0
119E0 0334
119E0 0061
119E0 0041
@@ -107639,6 +107651,7 @@
0EB9 0062
0EBA 0021
0EBA 003F
+0334 0EBA
0EBA 0334
0EBA 0061
0EBA 0041
@@ -178033,6 +178046,11 @@
F9A8 0061
F9A8 0041
F9A8 0062
+32FF 0021
+32FF 003F
+32FF 0061
+32FF 0041
+32FF 0062
323D 0021
323D 003F
32AD 0021
diff --git a/icu4c/source/test/testdata/GraphemeBreakTest.txt b/icu4c/source/test/testdata/GraphemeBreakTest.txt
index 5ccc00c..fb4fec9 100644
--- a/icu4c/source/test/testdata/GraphemeBreakTest.txt
+++ b/icu4c/source/test/testdata/GraphemeBreakTest.txt
@@ -1,5 +1,5 @@
-# GraphemeBreakTest-12.0.0.txt
-# Date: 2019-01-29, 15:48:47 GMT
+# GraphemeBreakTest-12.1.0.txt
+# Date: 2019-03-10, 10:53:12 GMT
# © 2019 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see http://www.unicode.org/terms_of_use.html
diff --git a/icu4c/source/test/testdata/IdnaTestV2.txt b/icu4c/source/test/testdata/IdnaTestV2.txt
index 87e79f9..731b781 100644
--- a/icu4c/source/test/testdata/IdnaTestV2.txt
+++ b/icu4c/source/test/testdata/IdnaTestV2.txt
@@ -1,10 +1,15 @@
# IdnaTestV2.txt
-# Date: 2019-03-02, 13:46:18 GMT
+# Date: 2019-04-01, 09:18:19 GMT
# © 2019 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see http://www.unicode.org/terms_of_use.html
-# Contains test cases for verifying UTS #46 conformance. For more information,
-# see http://www.unicode.org/reports/tr46/
+#
+# Unicode IDNA Compatible Preprocessing for UTS #46
+# Version: 12.1.0
+#
+# For documentation and usage, see http://www.unicode.org/reports/tr46
+#
+# Test cases for verifying UTS #46 conformance.
#
# FORMAT:
#
diff --git a/icu4c/source/test/testdata/LineBreakTest.txt b/icu4c/source/test/testdata/LineBreakTest.txt
index 7ab64a1..eb05699 100644
--- a/icu4c/source/test/testdata/LineBreakTest.txt
+++ b/icu4c/source/test/testdata/LineBreakTest.txt
@@ -1,5 +1,5 @@
-# LineBreakTest-12.0.0.txt
-# Date: 2019-01-22, 08:18:33 GMT
+# LineBreakTest-12.1.0.txt
+# Date: 2019-03-10, 10:53:14 GMT
# © 2019 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see http://www.unicode.org/terms_of_use.html
diff --git a/icu4c/source/test/testdata/SentenceBreakTest.txt b/icu4c/source/test/testdata/SentenceBreakTest.txt
index 868dba0..7c1c34a 100644
--- a/icu4c/source/test/testdata/SentenceBreakTest.txt
+++ b/icu4c/source/test/testdata/SentenceBreakTest.txt
@@ -1,5 +1,5 @@
-# SentenceBreakTest-12.0.0.txt
-# Date: 2019-01-22, 08:18:49 GMT
+# SentenceBreakTest-12.1.0.txt
+# Date: 2019-03-10, 10:53:28 GMT
# © 2019 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see http://www.unicode.org/terms_of_use.html
diff --git a/icu4c/source/test/testdata/WordBreakTest.txt b/icu4c/source/test/testdata/WordBreakTest.txt
index 52296b7..facd892 100644
--- a/icu4c/source/test/testdata/WordBreakTest.txt
+++ b/icu4c/source/test/testdata/WordBreakTest.txt
@@ -1,5 +1,5 @@
-# WordBreakTest-12.0.0.txt
-# Date: 2019-01-22, 08:18:50 GMT
+# WordBreakTest-12.1.0.txt
+# Date: 2019-03-10, 10:53:29 GMT
# © 2019 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see http://www.unicode.org/terms_of_use.html
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java b/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java
index c26c90b..28ef244 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java
@@ -188,6 +188,12 @@
public static final VersionInfo UNICODE_12_0;
/**
+ * Unicode 12.1 version
+ * @stable ICU 64
+ */
+ public static final VersionInfo UNICODE_12_1;
+
+ /**
* ICU4J current release version
* @stable ICU 2.8
*/
@@ -580,10 +586,11 @@
UNICODE_10_0 = getInstance(10, 0, 0, 0);
UNICODE_11_0 = getInstance(11, 0, 0, 0);
UNICODE_12_0 = getInstance(12, 0, 0, 0);
+ UNICODE_12_1 = getInstance(12, 1, 0, 0);
ICU_VERSION = getInstance(64, 2, 0, 0);
ICU_DATA_VERSION = ICU_VERSION;
- UNICODE_VERSION = UNICODE_12_0;
+ UNICODE_VERSION = UNICODE_12_1;
UCOL_RUNTIME_VERSION = getInstance(9);
UCOL_BUILDER_VERSION = getInstance(9);
diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar
index 033e017..bbbf619 100644
--- a/icu4j/main/shared/data/icudata.jar
+++ b/icu4j/main/shared/data/icudata.jar
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:7b1eb395e730b69ea5a797123891255b575883260637f120efdecdd8dfdcd307
-size 12818198
+oid sha256:ecd030369fc275eec0a3d7827453a287caa597ac7432ba043181f344c0b63ff2
+size 12818307
diff --git a/icu4j/main/tests/collate/src/com/ibm/icu/dev/data/CollationTest_NON_IGNORABLE_SHORT.txt b/icu4j/main/tests/collate/src/com/ibm/icu/dev/data/CollationTest_NON_IGNORABLE_SHORT.txt
index a568a73..488aa67 100644
--- a/icu4j/main/tests/collate/src/com/ibm/icu/dev/data/CollationTest_NON_IGNORABLE_SHORT.txt
+++ b/icu4j/main/tests/collate/src/com/ibm/icu/dev/data/CollationTest_NON_IGNORABLE_SHORT.txt
@@ -1,10 +1,10 @@
# CollationTest_CLDR_NON_IGNORABLE_SHORT.txt
-# Date: 2019-02-14, 21:26:47 GMT
+# Date: 2019-04-01, 20:17:34 GMT
# © 2019 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see http://www.unicode.org/terms_of_use.html
-# UCA Version: 12.0.0
-# UCD Version: 12.0.0
+# UCA Version: 12.1.0
+# UCD Version: 12.1.0
# For a description of the format and usage, see
# http://www.unicode.org/reports/tr35/tr35-collation.html#Root_Data_Files
@@ -1183,28 +1183,39 @@
193B 0334
0334 16B30
16B30 0334
+0334 1E131
1E131 0334
0334 16B31
16B31 0334
+0334 1E136
1E136 0334
0334 16B32
16B32 0334
+0334 1E132
1E132 0334
0334 16B33
16B33 0334
+0334 1E133
1E133 0334
0334 16B34
16B34 0334
+0334 1E130
1E130 0334
0334 16B35
16B35 0334
+0334 1E134
1E134 0334
0334 16B36
16B36 0334
+0334 1E135
1E135 0334
+0334 1E2EC
1E2EC 0334
+0334 1E2ED
1E2ED 0334
+0334 1E2EE
1E2EE 0334
+0334 1E2EF
1E2EF 0334
0334 302A
302A 0334
@@ -94808,6 +94819,7 @@
119DD 0061
119DD 0041
119DD 0062
+0334 119E0
119E0 0334
119E0 0021
119E0 003F
@@ -100597,6 +100609,7 @@
0EB9 0061
0EB9 0041
0EB9 0062
+0334 0EBA
0EBA 0334
0EBA 0021
0EBA 003F
@@ -164034,6 +164047,11 @@
F9A8 0061
F9A8 0041
F9A8 0062
+32FF 0021
+32FF 003F
+32FF 0061
+32FF 0041
+32FF 0062
32AD 0021
32AD 003F
32AD 0061
diff --git a/icu4j/main/tests/collate/src/com/ibm/icu/dev/data/CollationTest_SHIFTED_SHORT.txt b/icu4j/main/tests/collate/src/com/ibm/icu/dev/data/CollationTest_SHIFTED_SHORT.txt
index b8a4d8f..4a20889 100644
--- a/icu4j/main/tests/collate/src/com/ibm/icu/dev/data/CollationTest_SHIFTED_SHORT.txt
+++ b/icu4j/main/tests/collate/src/com/ibm/icu/dev/data/CollationTest_SHIFTED_SHORT.txt
@@ -1,10 +1,10 @@
# CollationTest_CLDR_SHIFTED_SHORT.txt
-# Date: 2019-02-14, 21:26:49 GMT
+# Date: 2019-04-01, 20:17:36 GMT
# © 2019 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see http://www.unicode.org/terms_of_use.html
-# UCA Version: 12.0.0
-# UCD Version: 12.0.0
+# UCA Version: 12.1.0
+# UCD Version: 12.1.0
# For a description of the format and usage, see
# http://www.unicode.org/reports/tr35/tr35-collation.html#Root_Data_Files
@@ -5587,28 +5587,39 @@
193B 0334
0334 16B30
16B30 0334
+0334 1E131
1E131 0334
0334 16B31
16B31 0334
+0334 1E136
1E136 0334
0334 16B32
16B32 0334
+0334 1E132
1E132 0334
0334 16B33
16B33 0334
+0334 1E133
1E133 0334
0334 16B34
16B34 0334
+0334 1E130
1E130 0334
0334 16B35
16B35 0334
+0334 1E134
1E134 0334
0334 16B36
16B36 0334
+0334 1E135
1E135 0334
+0334 1E2EC
1E2EC 0334
+0334 1E2ED
1E2ED 0334
+0334 1E2EE
1E2EE 0334
+0334 1E2EF
1E2EF 0334
0334 302A
302A 0334
@@ -101476,6 +101487,7 @@
119DD 0062
119E0 0021
119E0 003F
+0334 119E0
119E0 0334
119E0 0061
119E0 0041
@@ -107639,6 +107651,7 @@
0EB9 0062
0EBA 0021
0EBA 003F
+0334 0EBA
0EBA 0334
0EBA 0061
0EBA 0041
@@ -178033,6 +178046,11 @@
F9A8 0061
F9A8 0041
F9A8 0062
+32FF 0021
+32FF 003F
+32FF 0061
+32FF 0041
+32FF 0062
323D 0021
323D 003F
32AD 0021
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/BidiTest.txt b/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/BidiTest.txt
index 3daa3b9..49665bd 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/BidiTest.txt
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/BidiTest.txt
@@ -1,5 +1,5 @@
-# BidiTest-12.0.0.txt
-# Date: 2019-01-22, 08:18:20 GMT
+# BidiTest-12.1.0.txt
+# Date: 2019-03-08, 23:59:20 GMT
# © 2019 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see http://www.unicode.org/terms_of_use.html
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/CompositionExclusions.txt b/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/CompositionExclusions.txt
index 925e5c1..aa65497 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/CompositionExclusions.txt
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/CompositionExclusions.txt
@@ -1,6 +1,6 @@
-# CompositionExclusions-12.0.0.txt
-# Date: 2018-08-03, 00:00:00 GMT [KW, LI]
-# © 2018 Unicode®, Inc.
+# CompositionExclusions-12.1.0.txt
+# Date: 2019-03-08, 23:59:00 GMT [KW, LI]
+# © 2019 Unicode®, Inc.
# For terms of use, see http://www.unicode.org/terms_of_use.html
#
# Unicode Character Database
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/IdnaTestV2.txt b/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/IdnaTestV2.txt
index 87e79f9..731b781 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/IdnaTestV2.txt
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/IdnaTestV2.txt
@@ -1,10 +1,15 @@
# IdnaTestV2.txt
-# Date: 2019-03-02, 13:46:18 GMT
+# Date: 2019-04-01, 09:18:19 GMT
# © 2019 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see http://www.unicode.org/terms_of_use.html
-# Contains test cases for verifying UTS #46 conformance. For more information,
-# see http://www.unicode.org/reports/tr46/
+#
+# Unicode IDNA Compatible Preprocessing for UTS #46
+# Version: 12.1.0
+#
+# For documentation and usage, see http://www.unicode.org/reports/tr46
+#
+# Test cases for verifying UTS #46 conformance.
#
# FORMAT:
#
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/NormalizationCorrections.txt b/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/NormalizationCorrections.txt
index 1f39b32..360f49c 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/NormalizationCorrections.txt
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/NormalizationCorrections.txt
@@ -1,6 +1,6 @@
-# NormalizationCorrections-12.0.0.txt
-# Date: 2018-08-03, 00:00:00 GMT [KW, LI]
-# © 2018 Unicode®, Inc.
+# NormalizationCorrections-12.1.0.txt
+# Date: 2019-03-08, 23:59:00 GMT [KW, LI]
+# © 2019 Unicode®, Inc.
# For terms of use, see http://www.unicode.org/terms_of_use.html
#
# Unicode Character Database
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/NormalizationTest.txt b/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/NormalizationTest.txt
index b91cf78..cf4c3a9 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/NormalizationTest.txt
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/NormalizationTest.txt
@@ -1,5 +1,5 @@
-# NormalizationTest-12.0.0.txt
-# Date: 2019-01-22, 08:18:33 GMT
+# NormalizationTest-12.1.0.txt
+# Date: 2019-04-01, 09:10:28 GMT
# © 2019 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see http://www.unicode.org/terms_of_use.html
@@ -2149,6 +2149,7 @@
32FC;32FC;32FC;30F0;30F0;
32FD;32FD;32FD;30F1;30F1;
32FE;32FE;32FE;30F2;30F2;
+32FF;32FF;32FF;4EE4 548C;4EE4 548C;
3300;3300;3300;30A2 30D1 30FC 30C8;30A2 30CF 309A 30FC 30C8;
3301;3301;3301;30A2 30EB 30D5 30A1;30A2 30EB 30D5 30A1;
3302;3302;3302;30A2 30F3 30DA 30A2;30A2 30F3 30D8 309A 30A2;
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/SpecialCasing.txt b/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/SpecialCasing.txt
index 7db2e31..1c04aac 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/SpecialCasing.txt
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/SpecialCasing.txt
@@ -1,5 +1,5 @@
-# SpecialCasing-12.0.0.txt
-# Date: 2019-01-22, 08:18:50 GMT
+# SpecialCasing-12.1.0.txt
+# Date: 2019-03-10, 10:53:28 GMT
# © 2019 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see http://www.unicode.org/terms_of_use.html
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/UnicodeData.txt b/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/UnicodeData.txt
index d88a601..e65aec5 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/UnicodeData.txt
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/UnicodeData.txt
@@ -11856,6 +11856,7 @@
32FC;CIRCLED KATAKANA WI;So;0;L;<circle> 30F0;;;;N;;;;;
32FD;CIRCLED KATAKANA WE;So;0;L;<circle> 30F1;;;;N;;;;;
32FE;CIRCLED KATAKANA WO;So;0;L;<circle> 30F2;;;;N;;;;;
+32FF;SQUARE ERA NAME REIWA;So;0;L;<square> 4EE4 548C;;;;N;;;;;
3300;SQUARE APAATO;So;0;L;<square> 30A2 30D1 30FC 30C8;;;;N;SQUARED APAATO;;;;
3301;SQUARE ARUHUA;So;0;L;<square> 30A2 30EB 30D5 30A1;;;;N;SQUARED ARUHUA;;;;
3302;SQUARE ANPEA;So;0;L;<square> 30A2 30F3 30DA 30A2;;;;N;SQUARED ANPEA;;;;
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/confusables.txt b/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/confusables.txt
index 4ad83e4..ee85eee 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/confusables.txt
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/confusables.txt
@@ -1,11 +1,11 @@
# confusables.txt
-# Date: 2018-11-05, 07:39:47 GMT
-# © 2018 Unicode®, Inc.
+# Date: 2019-04-01, 21:59:19 GMT
+# © 2019 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see http://www.unicode.org/terms_of_use.html
#
# Unicode Security Mechanisms for UTS #39
-# Version: 12.0.0
+# Version: 12.1.0
#
# For documentation and usage, see http://www.unicode.org/reports/tr39
#
@@ -2353,7 +2353,7 @@
A795 ; A727 ; MA # ( ꞕ → ꜧ ) LATIN SMALL LETTER H WITH PALATAL HOOK → LATIN SMALL LETTER HENG #
02DB ; 0069 ; MA #* ( ˛ → i ) OGONEK → LATIN SMALL LETTER I # →ͺ→→ι→→ι→
-2373 ; 0069 ; MA #* ( ⍳ → i ) APL FUNCTIONAL SYMBOL IOTA → LATIN SMALL LETTER I # →ɩ→
+2373 ; 0069 ; MA #* ( ⍳ → i ) APL FUNCTIONAL SYMBOL IOTA → LATIN SMALL LETTER I # →ι→
FF49 ; 0069 ; MA # ( ｉ → i ) FULLWIDTH LATIN SMALL LETTER I → LATIN SMALL LETTER I # →і→
2170 ; 0069 ; MA # ( ⅰ → i ) SMALL ROMAN NUMERAL ONE → LATIN SMALL LETTER I #
2139 ; 0069 ; MA # ( ℹ → i ) INFORMATION SOURCE → LATIN SMALL LETTER I #
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/UCharacterTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/UCharacterTest.java
index 890d9be..dd8357a 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/UCharacterTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/UCharacterTest.java
@@ -56,7 +56,7 @@
/**
* Expected Unicode version.
*/
- private final VersionInfo VERSION_ = VersionInfo.getInstance(12);
+ private final VersionInfo VERSION_ = VersionInfo.getInstance(12, 1);
// constructor ===================================================
diff --git a/tools/unicode/c/genprops/pnames_data.h b/tools/unicode/c/genprops/pnames_data.h
index 943cf7e..61801a6 100644
--- a/tools/unicode/c/genprops/pnames_data.h
+++ b/tools/unicode/c/genprops/pnames_data.h
@@ -7,7 +7,7 @@
* machine-generated by: icu/tools/unicode/py/preparseucd.py
*/
-#define UNICODE_VERSION { 12, 0, 0, 0 }
+#define UNICODE_VERSION { 12, 1, 0, 0 }
static const Value VALUES_binprop[2] = {
Value(0, "N No F False"),
diff --git a/tools/unicode/py/preparseucd.py b/tools/unicode/py/preparseucd.py
index 70e23d9..45584de 100755
--- a/tools/unicode/py/preparseucd.py
+++ b/tools/unicode/py/preparseucd.py
@@ -1443,7 +1443,7 @@
out_file.write("# Original file:\n")
for line in in_file:
orig_line = line
- if line.startswith("# For documentation, see"):
+ if line.startswith("# For documentation"):
out_file.write(line)
out_file.write(r"""
# ================================================
