ICU-8972 ucase.icu generated by newly merged genprops/casepropsbuilder.cpp; slightly...

X-SVN-Rev: 31190

diff --git a/icu4c/source/common/ucase.h b/icu4c/source/common/ucase.h
index a80ed1a3b83bf676a330df9191ea1dcb0f8e398b..a2a93cc2cb6ef4b7d265e6766ee04b84d005cbee 100644 (file)
--- a/icu4c/source/common/ucase.h
+++ b/icu4c/source/common/ucase.h
@@ -302,7 +302,7 @@ enum {
 #   define UCASE_GET_DELTA(props) (int16_t)(((props)&0x8000) ? (((props)>>UCASE_DELTA_SHIFT)|0xfc00) : ((uint16_t)(props)>>UCASE_DELTA_SHIFT))
 #endif
 
-/* case-ignorable uses one of the delta bits, see gencase/store.c */
+/* case-ignorable uses one of the delta bits, see genprops/casepropsbuilder.cpp */
 #define UCASE_CASE_IGNORABLE 0x40
 
 /* exception: bits 15..4 are an unsigned 12-bit index into the exceptions array */

diff --git a/icu4c/source/common/ucase_props_data.h b/icu4c/source/common/ucase_props_data.h
index dc39077622d68e9aef5956db84fef3b17a1291fe..e0bdaed569e03833e9887317f350e141b43f7944 100644 (file)
--- a/icu4c/source/common/ucase_props_data.h
+++ b/icu4c/source/common/ucase_props_data.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (C) 1999-2011, International Business Machines
+ * Copyright (C) 1999-2012, International Business Machines
  * Corporation and others.  All Rights Reserved.
  *
  * file name: ucase_props_data.h
  *
- * machine-generated on: 2011-12-05
+ * machine-generated by: icu/tools/unicode/c/genprops/casepropsbuilder.cpp
  */
 
 #ifndef INCLUDED_FROM_UCASE_CPP
@@ -13,9 +13,9 @@
 
 static const UVersionInfo ucase_props_dataVersion={6,1,0,0};
 
-static const int32_t ucase_props_indexes[UCASE_IX_TOP]={0x10,0x58fc,0x4ba8,0x518,0x172,0,0,0,0,0,0,0,0,0,0,3};
+static const int32_t ucase_props_indexes[UCASE_IX_TOP]={0x10,0x590c,0x4bb8,0x518,0x172,0,0,0,0,0,0,0,0,0,0,3};
 
-static const uint16_t ucase_props_trieIndex[9676]={
+static const uint16_t ucase_props_trieIndex[9684]={
 0x2d1,0x2d9,0x2e1,0x2e9,0x2f7,0x2ff,0x307,0x30f,0x317,0x31f,0x326,0x32e,0x336,0x33e,0x346,0x34e,
 0x354,0x35c,0x364,0x36c,0x374,0x37c,0x384,0x38c,0x394,0x39c,0x3a4,0x3ac,0x3b4,0x3bc,0x3c4,0x3cc,
 0x3d4,0x3dc,0x3e0,0x3e8,0x3f0,0x3f8,0x400,0x408,0x406,0x40e,0x413,0x41b,0x422,0x42a,0x432,0x43a,
@@ -30,17 +30,17 @@ static const uint16_t ucase_props_trieIndex[9676]={
 0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x5a6,0x5a6,0x4dc,0x4dc,0x2f0,0x5ac,0x5b4,0x2f0,
 0x5bc,0x2f0,0x5c4,0x2f0,0x2f0,0x5ca,0x2f0,0x2f0,0x2f0,0x5d2,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
 0x5d9,0x2f0,0x5e0,0x5e8,0x2f0,0x5c3,0x2f0,0x2f0,0x5f0,0x5f3,0x5fb,0x601,0x609,0x611,0x2f0,0x618,
-0x2f0,0x61d,0x2f0,0x623,0x2f0,0x2f0,0x62b,0x633,0x63b,0x640,0x643,0x64b,0x653,0x65a,0x662,0x669,
-0x317,0x671,0x317,0x679,0x67c,0x317,0x684,0x317,0x68c,0x694,0x69c,0x6a4,0x6ac,0x6b4,0x6bc,0x6c4,
-0x6cc,0x6d3,0x2f0,0x6db,0x6e3,0x2f0,0x6eb,0x6f3,0x6fb,0x703,0x70b,0x713,0x71b,0x2f0,0x2f0,0x2f0,
+0x2f0,0x61d,0x2f0,0x623,0x2f0,0x2f0,0x62b,0x633,0x63b,0x640,0x643,0x64b,0x65b,0x653,0x66b,0x663,
+0x317,0x673,0x317,0x67b,0x67e,0x317,0x686,0x317,0x68e,0x696,0x69e,0x6a6,0x6ae,0x6b6,0x6be,0x6c6,
+0x6ce,0x6d5,0x2f0,0x6dd,0x6e5,0x2f0,0x6ed,0x6f5,0x6fd,0x705,0x70d,0x715,0x71d,0x2f0,0x2f0,0x2f0,
 0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
-0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x71e,0x724,0x72a,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
+0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x720,0x726,0x72c,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
 0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
 0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
 0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
-0x732,0x737,0x73b,0x743,0x317,0x317,0x317,0x74b,0x753,0x75b,0x2f0,0x760,0x2f0,0x2f0,0x2f0,0x768,
+0x734,0x739,0x73d,0x745,0x317,0x317,0x317,0x74d,0x755,0x75d,0x2f0,0x762,0x2f0,0x2f0,0x2f0,0x76a,
 0x2f0,0x5c1,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
-0x4ce,0x770,0x2f0,0x2f0,0x777,0x2f0,0x2f0,0x77f,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
+0x4ce,0x772,0x2f0,0x2f0,0x779,0x2f0,0x2f0,0x781,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
 0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
 0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
 0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
@@ -96,12 +96,12 @@ static const uint16_t ucase_props_trieIndex[9676]={
 0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
 0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
 0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
-0x787,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
+0x789,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
 0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
 0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x623,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
-0x78d,0x2f0,0x317,0x795,0x79d,0x2f0,0x2f0,0x7a5,0x7ad,0x7b5,0x317,0x7ba,0x7c2,0x7ca,0x2f0,0x7cd,
-0x7d5,0x4e7,0x2f0,0x2f0,0x2f0,0x2f0,0x7dc,0x7e4,0x2f0,0x7eb,0x7f2,0x2f0,0x4b9,0x7f7,0x7ff,0x2f0,
-0x2f0,0x805,0x80d,0x811,0x2f0,0x816,0x81e,0x826,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x82d,
+0x78f,0x2f0,0x317,0x797,0x79f,0x2f0,0x2f0,0x7a7,0x7af,0x7b7,0x317,0x7bc,0x7c4,0x7cc,0x2f0,0x7cf,
+0x7d7,0x4e7,0x2f0,0x2f0,0x2f0,0x2f0,0x7de,0x7e6,0x2f0,0x7ed,0x7f4,0x2f0,0x4b9,0x7f9,0x801,0x2f0,
+0x2f0,0x807,0x80f,0x813,0x2f0,0x818,0x820,0x828,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x82f,
 0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
 0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
 0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
@@ -141,9 +141,9 @@ static const uint16_t ucase_props_trieIndex[9676]={
 0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
 0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
 0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
-0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x835,0x2f0,0x2f0,0x2f0,0x2f0,0x83d,0x609,0x2f0,
+0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x837,0x2f0,0x2f0,0x2f0,0x2f0,0x83f,0x609,0x2f0,
 0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
-0x842,0x84a,0x84e,0x2f0,0x2f0,0x2f0,0x2f0,0x2d3,0x2d9,0x856,0x85e,0x811,0x485,0x2f0,0x2f0,0x866,
+0x844,0x84c,0x850,0x2f0,0x2f0,0x2f0,0x2f0,0x2d3,0x2d9,0x858,0x860,0x813,0x485,0x2f0,0x2f0,0x868,
 0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
 0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
 0xbc4,0xbc4,0xbdc,0xc1c,0xc5c,0xc98,0xcd8,0xd18,0xd50,0xd90,0xdd0,0xe10,0xe50,0xe90,0xed0,0xf10,
@@ -176,24 +176,24 @@ static const uint16_t ucase_props_trieIndex[9676]={
 0x188,0x188,0x188,0x188,0x188,0x188,0x188,0x188,0x188,0x188,0x188,0x188,0x188,0x188,0x188,0x188,
 0xb04,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
 0x5c5,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
-0x2f0,0x86e,0x874,0x878,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
+0x2f0,0x870,0x876,0x87a,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
 0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
-0x2f0,0x880,0x884,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
+0x2f0,0x882,0x886,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
 0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
 0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
-0x2f0,0x4cf,0x88c,0x893,0x2f0,0x609,0x897,0x2f0,0x2f0,0x89f,0x8a6,0x2f0,0x2f0,0x609,0x8ac,0x8b4,
+0x2f0,0x4cf,0x88e,0x895,0x2f0,0x609,0x899,0x2f0,0x2f0,0x8a1,0x8a8,0x2f0,0x2f0,0x609,0x8ae,0x8b6,
 0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
 0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
-0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x8ba,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
+0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x8bc,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
 0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
 0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
 0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
-0x2f0,0x2f0,0x2f0,0x8c0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x8c8,
-0x8d0,0x8d6,0x2f0,0x2f0,0x2f0,0x2f0,0x8de,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
-0x2f0,0x2f0,0x2f0,0x2f0,0x8e6,0x8ee,0x8f3,0x8f9,0x901,0x909,0x911,0x8ea,0x919,0x921,0x929,0x930,
-0x8eb,0x8e6,0x8ee,0x8e9,0x8f9,0x8ec,0x8e7,0x938,0x8ea,0x940,0x948,0x950,0x957,0x943,0x94b,0x953,
-0x95a,0x946,0x962,0x2f0,0x4cf,0x7ad,0x7ad,0x7ad,0x2f0,0x2f0,0x2f0,0x2f0,0x7ad,0x7ad,0x7ad,0x7ad,
-0x7ad,0x7ad,0x7ad,0x96a,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
+0x2f0,0x2f0,0x2f0,0x8c2,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x8ca,
+0x8d2,0x8d8,0x2f0,0x2f0,0x2f0,0x2f0,0x8e0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
+0x2f0,0x2f0,0x2f0,0x2f0,0x8e8,0x8f0,0x8f5,0x8fb,0x903,0x90b,0x913,0x8ec,0x91b,0x923,0x92b,0x932,
+0x8ed,0x8e8,0x8f0,0x8eb,0x8fb,0x8ee,0x8e9,0x93a,0x8ec,0x942,0x94a,0x952,0x959,0x945,0x94d,0x955,
+0x95c,0x948,0x964,0x2f0,0x4cf,0x7af,0x7af,0x7af,0x2f0,0x2f0,0x2f0,0x2f0,0x7af,0x7af,0x7af,0x7af,
+0x7af,0x7af,0x7af,0x96c,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
 0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
 0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,0x2f0,
 0x2f0,0x2f0,0x2f0,0x2f0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -420,214 +420,215 @@ static const uint16_t ucase_props_trieIndex[9676]={
 0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,
 0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x979,0x969,
 0x969,0x969,0x969,0x969,0x969,0x969,0x969,1,1,1,1,1,1,1,1,1,
-1,1,1,1,0x969,0x18bd,1,1,1,0x18dd,1,1,1,1,1,1,
+1,1,1,1,0x969,0x18bd,1,1,1,0x18dd,1,1,0x969,0x969,0x969,0x969,
+0x979,0x969,0x969,0x969,0x979,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,
+0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,1,1,1,1,
 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-1,1,0x11,1,1,1,1,0x969,0x969,0x969,0x969,0x969,0x979,0x969,0x969,0x969,
-0x979,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,
-0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x60,0x60,0x70,0x60,0x60,0x60,0x60,0x60,
-0x60,0x60,0x70,0x60,0x60,0x70,0x70,0x70,0x70,0x60,0x60,0x60,0x60,0x60,0x60,0x60,
-0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0x70,0x70,0x60,0x70,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,
-0x46,0xffd5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,
-0x46,0xffc5,0x46,0xffc5,0x18fe,0x193d,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,
+1,1,0x11,1,1,1,1,0x969,0x969,0x969,0x969,0x969,0x60,0x60,0x60,0x60,
+0x60,0x60,0x60,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0x70,0x70,0x60,0x70,0x60,0x60,0x70,0x60,
+0x60,0x60,0x60,0x60,0x60,0x60,0x70,0x60,0x60,0x70,0x70,0x70,0x70,0x60,0x60,0x60,
+0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x46,0xffc5,0x46,0xffc5,
+0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffd5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,
+0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x18fe,0x193d,0x46,0xffc5,
 0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,
-0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x197d,0x19fd,0x1a7d,0x1afd,0x1b7d,0x1bfd,1,1,0x1c2e,1,
-0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffd5,0x46,0xffc5,0x46,0xffc5,
-0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,
-0x205,0x205,0x205,0x205,0x205,0x205,0x205,0x205,0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,
-0x205,0x205,0x205,0x205,0x205,0x205,0,0,0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0,0,
-0x205,0x205,0x205,0x205,0x205,0x205,0x205,0x205,0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,
-0x205,0x205,0x205,0x205,0x205,0x205,0x205,0x205,0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,
-0x205,0x205,0x205,0x205,0x205,0x205,0,0,0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0,0,
-0x1c7d,0x205,0x1cfd,0x205,0x1dad,0x205,0x1e5d,0x205,0,0xfe06,0,0xfe06,0,0xfe06,0,0xfe06,
-0x205,0x205,0x205,0x205,0x205,0x205,0x205,0x205,0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,
-0x1285,0x1285,0x1585,0x1585,0x1585,0x1585,0x1905,0x1905,0x2005,0x2005,0x1c05,0x1c05,0x1f85,0x1f85,0,0,
-0x1f0d,0x1f7d,0x1fed,0x205d,0x20cd,0x213d,0x21ad,0x221d,0x228f,0x22ff,0x236f,0x23df,0x244f,0x24bf,0x252f,0x259f,
-0x260d,0x267d,0x26ed,0x275d,0x27cd,0x283d,0x28ad,0x291d,0x298f,0x29ff,0x2a6f,0x2adf,0x2b4f,0x2bbf,0x2c2f,0x2c9f,
-0x2d0d,0x2d7d,0x2ded,0x2e5d,0x2ecd,0x2f3d,0x2fad,0x301d,0x308f,0x30ff,0x316f,0x31df,0x324f,0x32bf,0x332f,0x339f,
-0x205,0x205,0x340d,0x348d,0x34fd,0,0x357d,0x35fd,0xfe06,0xfe06,0xed86,0xed86,0x36af,0x40,0x371d,0x40,
-0x40,0x40,0x376d,0x37ed,0x385d,0,0x38dd,0x395d,0xea86,0xea86,0xea86,0xea86,0x3a0f,0x40,0x40,0x40,
-0x205,0x205,0x3a7d,0x3b2d,0,0,0x3bfd,0x3c7d,0xfe06,0xfe06,0xe706,0xe706,0,0x40,0x40,0x40,
-0x205,0x205,0x3d2d,0x3ddd,0x3ead,0x1c5,0x3f2d,0x3fad,0xfe06,0xfe06,0xe406,0xe406,0xfe46,0x40,0x40,0x40,
-0,0,0x405d,0x40dd,0x414d,0,0x41cd,0x424d,0xe006,0xe006,0xe086,0xe086,0x42ff,0x40,0x40,0,
-0,0,0,0,0,0,0,0,0,0,0,0x40,0x40,0x40,0x40,0x40,
-0,0,0,0,0,0,0,0,0x40,0x40,0,0,0,0,0,0,
-0x40,0,0,0x40,0,0,0x40,0x40,0x40,0x40,0x40,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0x40,0x40,0x40,0x40,
-0x40,0,0,0,0,0,0x40,0x40,0x40,0x40,0x40,0x40,0,0x979,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0x969,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0x969,0x969,0x969,0x969,
-0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0x60,0x60,0x70,0x70,
-0x60,0x60,0x60,0x60,0x70,0x70,0x70,0x60,0x60,0x40,0x40,0x40,0x40,0x60,0x40,0x40,
-0x40,0x70,0x70,0x60,0x70,0x60,0x70,0x70,0x70,0x70,0x70,0x70,0x60,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,
-0,0,0,2,0,0,1,2,2,2,1,1,2,2,2,1,
-0,2,0,0,0,2,2,2,2,2,0,0,0,0,0,0,
-2,0,0x436e,0,2,0,0x43ae,0x43ee,2,2,0,1,2,2,0x706,2,
-1,0,0,0,0,1,0,0,1,1,2,2,0,0,0,0,
-0,2,1,1,0x11,0x11,0,0,0,0,0xf905,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0x406,0x406,0x406,0x406,
-0x406,0x406,0x406,0x406,0x406,0x406,0x406,0x406,0x406,0x406,0x406,0x406,0xfc05,0xfc05,0xfc05,0xfc05,
-0xfc05,0xfc05,0xfc05,0xfc05,0xfc05,0xfc05,0xfc05,0xfc05,0xfc05,0xfc05,0xfc05,0xfc05,0,0,0,0x46,
-0xffc5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x686,0x686,
-0x686,0x686,0x686,0x686,0x686,0x686,0x686,0x686,0x686,0x686,0x686,0x686,0x686,0x686,0x686,0x686,
-0xf985,0xf985,0xf985,0xf985,0xf985,0xf985,0xf985,0xf985,0xf985,0xf985,0xf985,0xf985,0xf985,0xf985,0xf985,0xf985,
-0xf985,0xf985,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0xc06,0xc06,0xc06,0xc06,0xc06,0xc06,0xc06,0xc06,
+0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x197d,0x19fd,
+0x1a7d,0x1afd,0x1b7d,0x1bfd,1,1,0x1c2e,1,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,
+0x46,0xffc5,0x46,0xffd5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,
+0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x205,0x205,0x205,0x205,0x205,0x205,0x205,0x205,
+0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0x205,0x205,0x205,0x205,0x205,0x205,0,0,
+0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0,0,0x205,0x205,0x205,0x205,0x205,0x205,0x205,0x205,
+0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0x205,0x205,0x205,0x205,0x205,0x205,0x205,0x205,
+0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0x205,0x205,0x205,0x205,0x205,0x205,0,0,
+0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0,0,0x1c7d,0x205,0x1cfd,0x205,0x1dad,0x205,0x1e5d,0x205,
+0,0xfe06,0,0xfe06,0,0xfe06,0,0xfe06,0x205,0x205,0x205,0x205,0x205,0x205,0x205,0x205,
+0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0xfe06,0x1285,0x1285,0x1585,0x1585,0x1585,0x1585,0x1905,0x1905,
+0x2005,0x2005,0x1c05,0x1c05,0x1f85,0x1f85,0,0,0x1f0d,0x1f7d,0x1fed,0x205d,0x20cd,0x213d,0x21ad,0x221d,
+0x228f,0x22ff,0x236f,0x23df,0x244f,0x24bf,0x252f,0x259f,0x260d,0x267d,0x26ed,0x275d,0x27cd,0x283d,0x28ad,0x291d,
+0x298f,0x29ff,0x2a6f,0x2adf,0x2b4f,0x2bbf,0x2c2f,0x2c9f,0x2d0d,0x2d7d,0x2ded,0x2e5d,0x2ecd,0x2f3d,0x2fad,0x301d,
+0x308f,0x30ff,0x316f,0x31df,0x324f,0x32bf,0x332f,0x339f,0x205,0x205,0x340d,0x348d,0x34fd,0,0x357d,0x35fd,
+0xfe06,0xfe06,0xed86,0xed86,0x36af,0x40,0x371d,0x40,0x40,0x40,0x376d,0x37ed,0x385d,0,0x38dd,0x395d,
+0xea86,0xea86,0xea86,0xea86,0x3a0f,0x40,0x40,0x40,0x205,0x205,0x3a7d,0x3b2d,0,0,0x3bfd,0x3c7d,
+0xfe06,0xfe06,0xe706,0xe706,0,0x40,0x40,0x40,0x205,0x205,0x3d2d,0x3ddd,0x3ead,0x1c5,0x3f2d,0x3fad,
+0xfe06,0xfe06,0xe406,0xe406,0xfe46,0x40,0x40,0x40,0,0,0x405d,0x40dd,0x414d,0,0x41cd,0x424d,
+0xe006,0xe006,0xe086,0xe086,0x42ff,0x40,0x40,0,0,0,0,0,0,0,0,0,
+0,0,0,0x40,0x40,0x40,0x40,0x40,0,0,0,0,0,0,0,0,
+0x40,0x40,0,0,0,0,0,0,0x40,0,0,0x40,0,0,0x40,0x40,
+0x40,0x40,0x40,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0x40,0x40,0x40,0x40,0x40,0,0,0,0,0,0x40,0x40,
+0x40,0x40,0x40,0x40,0,0x979,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0x969,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,0x969,
+0x969,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0x60,0x60,0x70,0x70,0x60,0x60,0x60,0x60,0x70,0x70,0x70,0x60,
+0x60,0x40,0x40,0x40,0x40,0x60,0x40,0x40,0x40,0x70,0x70,0x60,0x70,0x60,0x70,0x70,
+0x70,0x70,0x70,0x70,0x60,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,2,0,0,0,0,2,0,0,1,2,
+2,2,1,1,2,2,2,1,0,2,0,0,0,2,2,2,
+2,2,0,0,0,0,0,0,2,0,0x436e,0,2,0,0x43ae,0x43ee,
+2,2,0,1,2,2,0x706,2,1,0,0,0,0,1,0,0,
+1,1,2,2,0,0,0,0,0,2,1,1,0x11,0x11,0,0,
+0,0,0xf905,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0x406,0x406,0x406,0x406,0x406,0x406,0x406,0x406,0x406,0x406,0x406,0x406,
+0x406,0x406,0x406,0x406,0xfc05,0xfc05,0xfc05,0xfc05,0xfc05,0xfc05,0xfc05,0xfc05,0xfc05,0xfc05,0xfc05,0xfc05,
+0xfc05,0xfc05,0xfc05,0xfc05,0,0,0,0x46,0xffc5,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0x686,0x686,0x686,0x686,0x686,0x686,0x686,0x686,0x686,0x686,
+0x686,0x686,0x686,0x686,0x686,0x686,0x686,0x686,0xf985,0xf985,0xf985,0xf985,0xf985,0xf985,0xf985,0xf985,
+0xf985,0xf985,0xf985,0xf985,0xf985,0xf985,0xf985,0xf985,0xf985,0xf985,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0xc06,0xc06,0xc06,0xc06,0xc06,0xc06,0xc06,0xc06,0xc06,0xc06,0xc06,0xc06,0xc06,0xc06,0xc06,0xc06,
-0xc06,0xc06,0xc06,0xc06,0xc06,0xc06,0xc06,0xc06,0xc06,0xc06,0xc06,0,0xf405,0xf405,0xf405,0xf405,
+0xc06,0xc06,0xc06,0xc06,0xc06,0xc06,0xc06,0xc06,0xc06,0xc06,0xc06,0xc06,0xc06,0xc06,0xc06,0xc06,
+0xc06,0xc06,0xc06,0,0xf405,0xf405,0xf405,0xf405,0xf405,0xf405,0xf405,0xf405,0xf405,0xf405,0xf405,0xf405,
 0xf405,0xf405,0xf405,0xf405,0xf405,0xf405,0xf405,0xf405,0xf405,0xf405,0xf405,0xf405,0xf405,0xf405,0xf405,0xf405,
-0xf405,0xf405,0xf405,0xf405,0xf405,0xf405,0xf405,0xf405,0xf405,0xf405,0xf405,0,0x46,0xffc5,0x442e,0x444e,
-0x446e,0x448d,0x44ad,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x44ce,0x44ee,0x450e,0x452e,1,0x46,0xffc5,
-1,0x46,0xffc5,1,1,1,1,1,0x979,0x969,0x454e,0x456e,0x46,0xffc5,0x46,0xffc5,
-1,0,0,0,0,0,0,0x46,0xffc5,0x46,0xffc5,0x60,0x60,0x60,0x46,0xffc5,
-0,0,0,0,0,0,0,0,0,0,0,0,0x458d,0x45ad,0x45cd,0x45ed,
-0x460d,0x462d,0x464d,0x466d,0x468d,0x46ad,0x46cd,0x46ed,0x470d,0x472d,0x474d,0x476d,0x478d,0x47ad,0x47cd,0x47ed,
-0x480d,0x482d,0x484d,0x486d,0x488d,0x48ad,0x48cd,0x48ed,0x490d,0x492d,0x494d,0x496d,0x498d,0x49ad,0x49cd,0x49ed,
-0x4a0d,0x4a2d,0,0x4a4d,0,0,0,0,0,0x4a6d,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x40,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x70,
-0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,
+0xf405,0xf405,0xf405,0,0x46,0xffc5,0x442e,0x444e,0x446e,0x448d,0x44ad,0x46,0xffc5,0x46,0xffc5,0x46,
+0xffc5,0x44ce,0x44ee,0x450e,0x452e,1,0x46,0xffc5,1,0x46,0xffc5,1,1,1,1,1,
+0x979,0x969,0x454e,0x456e,0x46,0xffc5,0x46,0xffc5,1,0,0,0,0,0,0,0x46,
+0xffc5,0x46,0xffc5,0x60,0x60,0x60,0x46,0xffc5,0,0,0,0,0,0,0,0,
+0,0,0,0,0x458d,0x45ad,0x45cd,0x45ed,0x460d,0x462d,0x464d,0x466d,0x468d,0x46ad,0x46cd,0x46ed,
+0x470d,0x472d,0x474d,0x476d,0x478d,0x47ad,0x47cd,0x47ed,0x480d,0x482d,0x484d,0x486d,0x488d,0x48ad,0x48cd,0x48ed,
+0x490d,0x492d,0x494d,0x496d,0x498d,0x49ad,0x49cd,0x49ed,0x4a0d,0x4a2d,0,0x4a4d,0,0,0,0,
+0,0x4a6d,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0x40,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0x70,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,
 0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,
-0,0,0,0,0,0,0,0,0,0,0x70,0x70,0x70,0x70,0x30,0x30,
-0,0x40,0x40,0x40,0x40,0x40,0,0,0,0,0,0x40,0,0,0,0,
+0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0,0,0,0,0,0,0,0,
+0,0,0x70,0x70,0x70,0x70,0x30,0x30,0,0x40,0x40,0x40,0x40,0x40,0,0,
+0,0,0,0x40,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0x70,0x70,0x40,
+0x40,0x40,0x40,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0x70,0x70,0x40,0x40,0x40,0x40,0,0,0,0,0,
+0x40,0x40,0x40,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0x40,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0x40,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0x46,0xffc5,0x46,0xffc5,
+0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0,0x60,0x40,0x40,0x40,0,
+0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0,0x40,0x46,0xffc5,0x46,0xffc5,
+0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,
+0x46,0xffc5,0x46,0xffc5,0,0,0,0,0,0,0,0x60,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0x60,0x60,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0x40,0x40,0x40,0x40,
+0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,
+0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x46,0xffc5,
+0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,1,1,0x46,0xffc5,
+0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,
+0x969,1,1,1,1,1,1,1,1,0x46,0xffc5,0x46,0xffc5,0x4a8e,0x46,0xffc5,
+0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x40,0x40,0x40,0x46,0xffc5,0x4aae,1,0,
+0x46,0xffc5,0x46,0xffc5,0,0,0,0,0,0,0,0,0,0,0,0,
+0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x4ace,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0x40,0x40,0x40,0,0,0,0,0,
+0,0,0,0,0x969,0x969,1,0,0,0,0,0,0,0,0x40,0,
+0,0,0x70,0,0,0,0,0x40,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0x70,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0x40,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0x40,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,
-0x46,0xffc5,0,0x60,0x40,0x40,0x40,0,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,
-0x60,0x60,0,0x40,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,
-0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0,0,0,0,
-0,0,0,0x60,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0x60,0x60,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,
-0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,
-0x40,0x40,0x40,0x40,0x40,0x40,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,
-0x46,0xffc5,0x46,0xffc5,1,1,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,
-0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x969,1,1,1,1,1,1,1,
-1,0x46,0xffc5,0x46,0xffc5,0x4a8e,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,
-0x40,0x40,0x40,0x46,0xffc5,0x4aae,1,0,0x46,0xffc5,0x46,0xffc5,0,0,0,0,
-0,0,0,0,0,0,0,0,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,0x46,0xffc5,
-0x46,0xffc5,0x4ace,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0x969,0x969,1,0,
-0,0,0,0,0,0,0x40,0,0,0,0x70,0,0,0,0,0x40,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0x70,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,
+0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0x40,0x40,0x40,0x40,0x40,0x70,
+0x70,0x70,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,
+0x40,0x40,0,0x30,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0x70,0,0,0x40,0x40,0x40,0x40,0,0,
+0x40,0,0,0,0x30,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0x40,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0x40,0x40,0x40,0x40,0x40,0x40,0,0,0x40,0x40,0,
+0,0x40,0x40,0,0,0,0,0,0,0,0,0,0,0,0,0x40,
+0,0,0,0,0,0,0,0,0x40,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0x40,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,
-0x60,0x60,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0x40,0x40,0x40,0x40,0x40,0x70,0x70,0x70,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x40,
-0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0,0x30,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x70,
-0,0,0x40,0x40,0x40,0x40,0,0,0x40,0,0,0,0x30,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0x40,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0x40,0x40,0x40,
-0x40,0x40,0x40,0,0,0x40,0x40,0,0,0x40,0x40,0,0,0,0,0,
-0,0,0,0,0,0,0,0x40,0,0,0,0,0,0,0,0,
-0x40,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0x40,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0x60,0,0x60,0x60,0x70,0,0,0x60,
-0x60,0,0,0,0,0,0x60,0x60,0,0x60,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0x40,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0x40,0x40,0,0,0,0,0,0x40,0x40,0,0x70,0,
-0,0,0,0,0,0,0,0,0,0x40,0,0,0x40,0,0,0,
-0,0x70,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0x4aed,0x4b6d,0x4bed,0x4c6d,0x4d1d,0x4dcd,0x4e6d,0,0,0,0,0,
-0,0,0,0,0,0,0,0x4f0d,0x4f8d,0x500d,0x508d,0x510d,0,0,0,0,
-0,0,0x70,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,
-0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0,0,0,0x40,0,0,0,0,
-0,0,0,0,0,0,0,0,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0x40,0,0,0x40,0,0,
-0,0,0,0,0,0,0,0,0,0x806,0x806,0x806,0x806,0x806,0x806,0x806,
-0x806,0x806,0x806,0x806,0x806,0x806,0x806,0x806,0x806,0x806,0x806,0x806,0x806,0x806,0x806,0x806,
-0x806,0x806,0x806,0,0,0,0x40,0,0x40,0xf805,0xf805,0xf805,0xf805,0xf805,0xf805,0xf805,
-0xf805,0xf805,0xf805,0xf805,0xf805,0xf805,0xf805,0xf805,0xf805,0xf805,0xf805,0xf805,0xf805,0xf805,0xf805,0xf805,
-0xf805,0xf805,0xf805,0,0,0,0,0,0,0,0,0x40,0,0,0,0,
+0x60,0,0x60,0x60,0x70,0,0,0x60,0x60,0,0,0,0,0,0x60,0x60,
+0,0x60,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0x40,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0x40,0x40,0,0,
+0,0,0,0x40,0x40,0,0x70,0,0,0,0,0,0,0,0,0,
+0,0x40,0,0,0x40,0,0,0,0,0x70,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0x4aed,0x4b6d,0x4bed,0x4c6d,
+0x4d1d,0x4dcd,0x4e6d,0,0,0,0,0,0,0,0,0,0,0,0,0x4f0d,
+0x4f8d,0x500d,0x508d,0x510d,0,0,0,0,0,0,0x70,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x40,0x40,
+0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,
+0,0,0,0x40,0,0,0,0,0,0,0,0,0,0,0,0,
+0x60,0x60,0x60,0x60,0x60,0x60,0x60,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0x40,0x40,0x40,0,0,0,0,0xa06,0xa06,0xa06,0xa06,0xa06,0xa06,0xa06,0xa06,
+0,0,0x40,0,0,0x40,0,0,0,0,0,0,0,0,0,0,
+0,0x806,0x806,0x806,0x806,0x806,0x806,0x806,0x806,0x806,0x806,0x806,0x806,0x806,0x806,0x806,
+0x806,0x806,0x806,0x806,0x806,0x806,0x806,0x806,0x806,0x806,0x806,0,0,0,0x40,0,
+0x40,0xf805,0xf805,0xf805,0xf805,0xf805,0xf805,0xf805,0xf805,0xf805,0xf805,0xf805,0xf805,0xf805,0xf805,0xf805,
+0xf805,0xf805,0xf805,0xf805,0xf805,0xf805,0xf805,0xf805,0xf805,0xf805,0xf805,0,0,0,0,0,
+0,0,0,0x40,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0x40,0x40,0x40,0,0,0,0,
+0xa06,0xa06,0xa06,0xa06,0xa06,0xa06,0xa06,0xa06,0xa06,0xa06,0xa06,0xa06,0xa06,0xa06,0xa06,0xa06,
 0xa06,0xa06,0xa06,0xa06,0xa06,0xa06,0xa06,0xa06,0xa06,0xa06,0xa06,0xa06,0xa06,0xa06,0xa06,0xa06,
-0xa06,0xa06,0xa06,0xa06,0xa06,0xa06,0xa06,0xa06,0xf605,0xf605,0xf605,0xf605,0xf605,0xf605,0xf605,0xf605,
 0xf605,0xf605,0xf605,0xf605,0xf605,0xf605,0xf605,0xf605,0xf605,0xf605,0xf605,0xf605,0xf605,0xf605,0xf605,0xf605,
+0xf605,0xf605,0xf605,0xf605,0xf605,0xf605,0xf605,0xf605,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0x40,0x40,0x40,0,0x40,0x40,0,
+0,0,0,0,0x40,0x70,0x40,0x60,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0x40,0x40,0x40,0,0x40,0x40,0,0,0,0,0,0x40,0x70,0x40,0x60,
+0x60,0x70,0x70,0,0,0,0,0x70,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0x60,0x70,0x70,0,0,0,0,0x70,
+0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x70,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,
-0x40,0x40,0x70,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x40,
-0x40,0x40,0x40,0,0,0x70,0x70,0,0,0x40,0,0,0x60,0x60,0x60,0,
+0,0,0,0,0,0,0,0x40,0x40,0x40,0x40,0,0,0x70,0x70,0,
+0,0x40,0,0,0x60,0x60,0x60,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x40,
-0x40,0x40,0x40,0x40,0,0x40,0x40,0x40,0x40,0x40,0x40,0x70,0x70,0,0,0,
+0,0,0,0,0,0,0,0x40,0x40,0x40,0x40,0x40,0,0x40,0x40,0x40,
+0x40,0x40,0x40,0x70,0x70,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x40,0x40,
+0x40,0x40,0x40,0x40,0x40,0x40,0x40,0,0x30,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0,
-0x30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0x40,0,0x40,0,0,
+0x40,0x40,0x40,0x40,0x40,0x40,0x30,0x70,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,
+0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0,0,0,0,0,0x30,0x30,0x70,
+0x70,0x70,0,0,0,0x30,0x30,0x30,0x30,0x30,0x30,0x40,0x40,0x40,0x40,0x40,
+0x40,0x40,0x40,0x70,0x70,0x70,0x70,0x70,0x70,0x70,0x70,0,0,0x60,0x60,0x60,
+0x60,0x60,0x70,0x70,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0x60,0x60,0x60,0x60,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0x40,0,0x40,0,0,0x40,0x40,0x40,0x40,0x40,0x40,0x30,0x70,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x40,
-0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,
-0,0,0,0,0,0x30,0x30,0x70,0x70,0x70,0,0,0,0x30,0x30,0x30,
-0x30,0x30,0x30,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x70,0x70,0x70,0x70,0x70,
-0x70,0x70,0x70,0,0,0x60,0x60,0x60,0x60,0x60,0x70,0x70,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0x60,0x60,0x60,0x60,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0x60,0x60,0x60,0,0,0,
+0,0,0x60,0x60,0x60,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,1,1,1,1,1,1,1,1,0x11,0x11,1,1,1,1,
-1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,
-1,0,0x11,0x11,1,1,1,1,1,1,1,1,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,1,1,1,1,1,1,1,1,0x11,0x11,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-2,0,2,2,0,0,2,0,0,2,2,0,0,2,2,2,
-2,0,2,2,2,2,2,2,2,2,1,1,1,1,0,1,
-0,1,0x11,0x11,1,1,1,1,0,1,1,1,1,1,1,1,
+1,1,0x11,0x11,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,1,1,1,1,1,1,1,0,0x11,0x11,1,1,1,1,
 1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,1,1,1,1,2,2,0,2,2,2,2,0,
-0,2,2,2,2,2,2,2,2,0,2,2,2,2,2,2,
-2,0,1,1,1,1,1,1,1,1,0x11,0x11,1,1,1,1,
-1,1,1,1,1,1,1,1,1,1,1,1,2,2,0,2,
-2,2,2,0,2,2,2,2,2,0,2,0,0,0,2,2,
-2,2,2,2,2,0,1,1,1,1,1,1,1,1,0x11,0x11,
-1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,
+1,1,1,1,1,1,0x11,0x11,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,2,0,2,2,0,0,2,0,
+0,2,2,0,0,2,2,2,2,0,2,2,2,2,2,2,
+2,2,1,1,1,1,0,1,0,1,0x11,0x11,1,1,1,1,
+0,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,
+2,2,0,2,2,2,2,0,0,2,2,2,2,2,2,2,
+2,0,2,2,2,2,2,2,2,0,1,1,1,1,1,1,
+1,1,0x11,0x11,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,2,2,0,2,2,2,2,0,2,2,2,2,
+2,0,2,0,0,0,2,2,2,2,2,2,2,0,1,1,
+1,1,1,1,1,1,0x11,0x11,1,1,1,1,1,1,1,1,
+1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,1,1,1,1,1,1,0,0,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,0,1,1,1,1,1,1,
 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,0,1,1,1,1,1,1,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-1,1,1,1,1,1,0,0,2,2,2,2,2,2,2,2,
+2,2,2,0,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,1,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,
-1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,0,1,1,1,1,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-1,0,1,1,1,1,1,1,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,1,1,1,0,1,1,1,1,
-1,1,2,1,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,
-0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0
+1,1,1,0,1,1,1,1,1,1,2,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0
 };
 
 static const uint16_t ucase_props_exceptions[1304]={
 0xc041,0x69,2,0x130,0x131,0x4001,0x6a,0x41,0x6b,1,0x212a,0x41,0x73,1,0x17f,0x5044,
 0x49,2,0x130,0x131,0x44,0x4b,1,0x212a,0x44,0x53,1,0x17f,6,0x3bc,0x39c,0x41,
 0xe5,1,0x212b,0x4001,0xec,0x4001,0xed,0xc0,1,0x2220,0x73,0x73,0x53,0x53,0x53,0x73,
-0x1e9e,0x44,0xc5,1,0x212b,0x4001,0x129,0x4001,0x12f,0xc041,0x69,2,0x131,0x49,0x44,0x49,
+0x1e9e,0x44,0xc5,1,0x212b,0x4001,0x129,0x4001,0x12f,0xc041,0x69,2,0x49,0x131,0x44,0x49,
 2,0x69,0x130,0x80,0x2220,0x2bc,0x6e,0x2bc,0x4e,0x2bc,0x4e,6,0x73,0x53,9,0x1c6,
 0x1c5,0xd,0x1c6,0x1c4,0x1c5,0xc,0x1c4,0x1c5,9,0x1c9,0x1c8,0xd,0x1c9,0x1c7,0x1c8,0xc,
 0x1c7,0x1c8,9,0x1cc,0x1cb,0xd,0x1cc,0x1ca,0x1cb,0xc,0x1ca,0x1cb,0x80,0x2220,0x6a,0x30c,
@@ -745,13 +746,13 @@ static const UCaseProps ucase_props_singleton={
     ucase_props_trieIndex+2884,
     NULL,
     2884,
-    6792,
+    6800,
     0x188,
     0xbc0,
     0x0,
     0x0,
     0xe0800,
-    0x25c8,
+    0x25d0,
     NULL, 0, FALSE, FALSE, 0, NULL
   },
   { 2,0,0,0 }

diff --git a/icu4c/source/data/in/ucase.icu b/icu4c/source/data/in/ucase.icu
index bfa180802093767bf891f5e8efa0f1f709e1ee66..26215ad41cf889883c08e6e26a4568c7eea2cd75 100644 (file)
Binary files a/icu4c/source/data/in/ucase.icu and b/icu4c/source/data/in/ucase.icu differ