Index: source/i18n/collationfcd.cpp |
diff --git a/source/i18n/collationfcd.cpp b/source/i18n/collationfcd.cpp |
index 153953cfc8671b54d9387a117269903a24dc3b2e..de1d9a2d1d8c5bb6fd5c8ab6f3907fb7d0d1a4fe 100644 |
--- a/source/i18n/collationfcd.cpp |
+++ b/source/i18n/collationfcd.cpp |
@@ -1,5 +1,7 @@ |
+// Copyright (C) 2016 and later: Unicode, Inc. and others. |
+// License & terms of use: http://www.unicode.org/copyright.html |
/* |
- * Copyright (C) 1999-2015, International Business Machines |
+ * Copyright (C) 1999-2016, International Business Machines |
* Corporation and others. All Rights Reserved. |
* |
* file name: collationfcd.cpp |
@@ -20,27 +22,27 @@ const uint8_t CollationFCD::lcccIndex[2048]={ |
0,0,0,0,0,0,0,0,1,1,2,3,0,0,0,0, |
0,0,0,0,4,0,0,0,0,0,0,0,5,6,7,0, |
8,0,9,0xa,0,0,0xb,0xc,0xd,0xe,0xf,0,0,0,0,0x10, |
-0x11,0x12,0x13,0,0,0,0,0x14,0,0x15,0x16,0,0,0x15,0x17,0, |
-0,0x15,0x17,0,0,0x15,0x17,0,0,0x15,0x17,0,0,0,0x17,0, |
-0,0,0x18,0,0,0x15,0x17,0,0,0,0x17,0,0,0,0x19,0, |
-0,0x1a,0x1b,0,0,0x1c,0x1b,0,0x1c,0x1d,0,0x1e,0x1f,0,0x20,0, |
-0,0x21,0,0,0x17,0,0,0,0,0,0,0,0,0,0,0, |
-0,0,0,0,0,0,0,0,0,0,0x22,0,0,0,0,0, |
+0x11,0x12,0x13,0,0,0,0x14,0x15,0,0x16,0x17,0,0,0x16,0x18,0, |
+0,0x16,0x18,0,0,0x16,0x18,0,0,0x16,0x18,0,0,0,0x18,0, |
+0,0,0x19,0,0,0x16,0x18,0,0,0,0x18,0,0,0,0x1a,0, |
+0,0x1b,0x1c,0,0,0x1d,0x1c,0,0x1d,0x1e,0,0x1f,0x20,0,0x21,0, |
+0,0x22,0,0,0x18,0,0,0,0,0,0,0,0,0,0,0, |
+0,0,0,0,0,0,0,0,0,0,0x23,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,0x23,0x23,0,0,0,0,0x24,0, |
-0,0,0,0,0,0x25,0,0,0,0x13,0,0,0,0,0,0, |
-0x26,0,0,0x27,0,0x28,0,0,0,0x23,0x29,0x10,0,0x2a,0,0x2b, |
-0,0x2c,0,0,0,0,0x2d,0x2e,0,0,0,0,0,0,1,0x2f, |
+0,0,0,0,0,0,0,0,0x24,0x24,0,0,0,0,0x25,0, |
+0,0,0,0,0,0x26,0,0,0,0x13,0,0,0,0,0,0, |
+0x27,0,0,0x28,0,0x29,0,0,0,0x24,0x2a,0x10,0,0x2b,0,0x2c, |
+0,0x2d,0,0,0,0,0x2e,0x2f,0,0,0,0,0,0,1,0x30, |
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, |
-0,0,0,0,0,0,0x30,0x31,0,0,0,0,0,0,0,0, |
+0,0,0,0,0,0,0x31,0x32,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, |
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,0,0,0,0,0,0,0,0, |
-0,0,0,0,0,0,0,0x32,0,0,0,0x33,0,0,0,1, |
+0,0,0,0,0,0,0,0x33,0,0,0,0x34,0,0,0,1, |
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, |
-0,0x34,0,0,0x35,0,0,0,0,0,0,0,0,0,0,0, |
+0,0x35,0,0,0x36,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,0,0,0, |
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, |
@@ -99,9 +101,9 @@ const uint8_t CollationFCD::lcccIndex[2048]={ |
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,0,0,0,0,0,0,0,0, |
-0,0,0,0x36,0x37,0,0,0x38,0,0,0,0,0,0,0,0, |
-0x20,0,0,0,0,0,0x29,0x39,0,0x3a,0x3b,0,0,0x3b,0x3c,0, |
-0,0,0,0,0,0x3d,0x3e,0x3f,0,0,0,0,0,0,0,0x17, |
+0,0,0,0x37,0x38,0,0,0x39,0,0,0,0,0,0,0,0, |
+0x21,0,0,0,0,0,0x2a,0x3a,0,0x3b,0x3c,0,0,0x3c,0x3d,0, |
+0,0,0,0,0,0x3e,0x3f,0x40,0,0,0,0,0,0,0,0x18, |
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,0,0,0,0,0,0,0,0, |
@@ -124,7 +126,7 @@ const uint8_t CollationFCD::lcccIndex[2048]={ |
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,0,0,0,0,0,0,0,0, |
-0x40,0x41,0,0,0,0,0,0,0,0,0,0,0,0,0,0, |
+0x41,0x42,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, |
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, |
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, |
@@ -141,17 +143,17 @@ const uint8_t CollationFCD::lcccIndex[2048]={ |
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,0,0,0,0,0,0,0,0, |
-0,0,0,0,0,0,0,0,0x42,0,0,0,0,0,0,0, |
+0,0,0,0,0,0,0,0,0x43,0,0,0,0,0,0,0, |
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, |
0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0 |
}; |
-const uint32_t CollationFCD::lcccBits[67]={ |
+const uint32_t CollationFCD::lcccBits[68]={ |
0,0xffffffff,0xffff7fff,0xffff,0xf8,0xfffe0000,0xbfffffff,0xb6,0x7ff0000,0xfffff800,0x10000,0x9fc00000,0x3d9f,0x20000,0xffff0000,0x7ff, |
-0xff800,0xfbc00000,0x3eef,0xe000000,0xfffffff8,0x10000000,0x1e2000,0x2000,0x602000,0x400,0x7000000,0xf00,0x3000000,0x2a00000,0x3c3e0000,0xdf, |
-0x40,0x6800000,0xe0000000,0x100000,0x20040000,0x200,0x1800000,0x9fe00001,0x3fff0000,0x10,0xc00,0xc0040,0x800000,0xfff70000,0x31021fd,0xf03fffff, |
-0x1fff0000,0x1ffe2,0x38000,0x80000000,0xfc00,0x6000000,0x3ff08000,0xc0000000,0x30000,0x3ffff,0x3800,0x80000,1,0xc19d0000,2,0x400000, |
-0x4000035,0x4108000,0x40000000 |
+0xff800,0xfbc00000,0x3eef,0xe000000,0xfff00000,0xfffffffb,0x10000000,0x1e2000,0x2000,0x602000,0x400,0x7000000,0xf00,0x3000000,0x2a00000,0x3c3e0000, |
+0xdf,0x40,0x6800000,0xe0000000,0x100000,0x20040000,0x200,0x1800000,0x9fe00001,0x3fff0000,0x10,0xc00,0xc0040,0x800000,0xfff70000,0x31021fd, |
+0xf83fffff,0x1fff0000,0x1ffe2,0x38000,0x80000000,0xfc00,0x6000000,0x3ff08000,0xc0000000,0x30000,0x3ffff,0x3800,0x80000,1,0xc19d0000,2, |
+0x400000,0x40000b5,0x5108000,0x40000000 |
}; |
const uint8_t CollationFCD::tcccIndex[2048]={ |
@@ -159,27 +161,27 @@ const uint8_t CollationFCD::tcccIndex[2048]={ |
0xb,0xc,0,0,0,0,0,0,1,1,0xd,0xe,0xf,0x10,0x11,0, |
0x12,0x13,0x14,0x15,0x16,0,0x17,0x18,0,0,0,0,0x19,0x1a,0x1b,0, |
0x1c,0x1d,0x1e,0x1f,0,0,0x20,0x21,0x22,0x23,0x24,0,0,0,0,0x25, |
-0x26,0x27,0x28,0,0,0,0,0x29,0,0x2a,0x2b,0,0,0x2c,0x2d,0, |
-0,0x2e,0x2f,0,0,0x2c,0x30,0,0,0x2c,0x31,0,0,0,0x30,0, |
-0,0,0x32,0,0,0x2c,0x30,0,0,0,0x30,0,0,0,0x33,0, |
-0,0x34,0x35,0,0,0x36,0x35,0,0x36,0x37,0,0x38,0x39,0,0x3a,0, |
-0,0x3b,0,0,0x30,0,0,0,0,0,0,0,0,0,0,0, |
-0,0,0,0,0,0,0,0,0,0,0x3c,0,0,0,0,0, |
+0x26,0x27,0x28,0,0,0,0x29,0x2a,0,0x2b,0x2c,0,0,0x2d,0x2e,0, |
+0,0x2f,0x30,0,0,0x2d,0x31,0,0,0x2d,0x32,0,0,0,0x31,0, |
+0,0,0x33,0,0,0x2d,0x31,0,0,0,0x31,0,0,0,0x34,0, |
+0,0x35,0x36,0,0,0x37,0x36,0,0x37,0x38,0,0x39,0x3a,0,0x3b,0, |
+0,0x3c,0,0,0x31,0,0,0,0,0,0,0,0,0,0,0, |
+0,0,0,0,0,0,0,0,0,0,0x3d,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,0x3d,0x3d,0,0,0,0,0x3e,0, |
-0,0,0,0,0,0x3f,0,0,0,0x28,0,0,0,0,0,0, |
-0x40,0,0,0x41,0,0x42,0,0,0,0x3d,0x43,0x25,0,0x44,0,0x45, |
-0,0x46,0,0,0,0,0x47,0x48,0,0,0,0,0,0,1,0x49, |
-1,1,1,1,0x4a,1,1,0x4b,0x4c,1,0x4d,0x4e,1,0x4f,0x50,0x51, |
-0,0,0,0,0,0,0x52,0x53,0,0x54,0,0,0x55,0x56,0x57,0, |
-0x58,0x59,0x5a,0x5b,0x5c,0x5d,0,0x5e,0,0,0,0,0,0,0,0, |
+0,0,0,0,0,0,0,0,0x3e,0x3e,0,0,0,0,0x3f,0, |
+0,0,0,0,0,0x40,0,0,0,0x28,0,0,0,0,0,0, |
+0x41,0,0,0x42,0,0x43,0,0,0,0x3e,0x44,0x25,0,0x45,0,0x46, |
+0,0x47,0,0,0,0,0x48,0x49,0,0,0,0,0,0,1,0x4a, |
+1,1,1,1,0x4b,1,1,0x4c,0x4d,1,0x4e,0x4f,1,0x50,0x51,0x52, |
+0,0,0,0,0,0,0x53,0x54,0,0x55,0,0,0x56,0x57,0x58,0, |
+0x59,0x5a,0x5b,0x5c,0x5d,0x5e,0,0x5f,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, |
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, |
-0,0,0,0,0,0,0x2c,0,0,0,0,0,0,0,0,0, |
-0,0,0,0,0,0,0,0x5f,0,0,0,0x60,0,0,0,1, |
+0,0,0,0,0,0,0x2d,0,0,0,0,0,0,0,0,0, |
+0,0,0,0,0,0,0,0x60,0,0,0,0x61,0,0,0,1, |
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, |
-0,0x61,0x62,0x63,0x64,0x62,0x63,0x65,0,0,0,0,0,0,0,0, |
+0,0x62,0x63,0x64,0x65,0x63,0x64,0x66,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, |
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, |
@@ -238,9 +240,9 @@ const uint8_t CollationFCD::tcccIndex[2048]={ |
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,0,0,0,0,0,0,0,0, |
-0,0,0,0x66,0x67,0,0,0x68,0,0,0,0,0,0,0,0, |
-0x3a,0,0,0,0,0,0x43,0x69,0,0x6a,0x6b,0,0,0x6b,0x6c,0, |
-0,0,0,0,0,0x6d,0x6e,0x6f,0,0,0,0,0,0,0,0x30, |
+0,0,0,0x67,0x68,0,0,0x69,0,0,0,0,0,0,0,0, |
+0x3b,0,0,0,0,0,0x44,0x6a,0,0x6b,0x6c,0,0,0x6c,0x6d,0, |
+0,0,0,0,0,0x6e,0x6f,0x70,0,0,0,0,0,0,0,0x31, |
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,0,0,0,0,0,0,0,0, |
@@ -263,7 +265,7 @@ const uint8_t CollationFCD::tcccIndex[2048]={ |
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,0,0,0,0,0,0,0,0, |
-0x70,0x71,0,0,0,0,0,0,0,0,0,0,0,0,0,0, |
+0x71,0x72,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,0,0,0,0,0,0, |
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, |
@@ -280,20 +282,20 @@ const uint8_t CollationFCD::tcccIndex[2048]={ |
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,0,0,0,0,0,0,0,0, |
-0,0,0,0,0,0,0,0,0x3c,0x72,0x73,0,0,0,0,0, |
+0,0,0,0,0,0,0,0,0x3d,0x73,0x74,0,0,0,0,0, |
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, |
0,0xe,0,0,0,0,0,0,0,0,0,0,0,0,0,0 |
}; |
-const uint32_t CollationFCD::tcccBits[116]={ |
+const uint32_t CollationFCD::tcccBits[117]={ |
0,0xffffffff,0x3e7effbf,0xbe7effbf,0xfffcffff,0x7ef1ff3f,0xfff3f1f8,0x7fffff3f,0x18003,0xdfffe000,0xff31ffcf,0xcfffffff,0xfffc0,0xffff7fff,0xffff,0x1d760, |
0x1fc00,0x187c00,0x200708b,0x2000000,0x708b0000,0xc00000,0xf8,0xfccf0006,0x33ffcfc,0xfffe0000,0xbfffffff,0xb6,0x7ff0000,0x7c,0xfffff800,0x10000, |
-0x9fc80005,0x3d9f,0x20000,0xffff0000,0x7ff,0xff800,0xfbc00000,0x3eef,0xe000000,0xfffffff8,0x10120200,0xff1e2000,0x10000000,0xb0002000,0x10480000,0x4e002000, |
-0x2000,0x30002000,0x602100,0x24000400,0x7000000,0xf00,0x3000000,0x2a00000,0x3d7e0000,0xdf,0x40,0x6800000,0xe0000000,0x100000,0x20040000,0x200, |
-0x1800000,0x9fe00001,0x3fff0000,0x10,0xc00,0xc0040,0x800000,0xfff70000,0x31021fd,0xf03fffff,0xbffffff,0x3ffffff,0x3f3fffff,0xaaff3f3f,0x3fffffff,0x1fdfffff, |
-0xefcfffde,0x1fdc7fff,0x1fff0000,0x1ffe2,0x800,0xc000000,0x4000,0xe000,0x1210,0x50,0x292,0x333e005,0x333,0xf000,0x3c0f,0x38000, |
-0x80000000,0xfc00,0x55555000,0x36db02a5,0x46100000,0x47900000,0x3ff08000,0xc0000000,0x30000,0x3ffff,0x3800,0x80000,1,0xc19d0000,2,0x400000, |
-0x4000035,0x4108000,0x5f7ffc00,0x7fdb |
+0x9fc80005,0x3d9f,0x20000,0xffff0000,0x7ff,0xff800,0xfbc00000,0x3eef,0xe000000,0xfff00000,0xfffffffb,0x10120200,0xff1e2000,0x10000000,0xb0002000,0x10480000, |
+0x4e002000,0x2000,0x30002000,0x602100,0x24000400,0x7000000,0xf00,0x3000000,0x2a00000,0x3d7e0000,0xdf,0x40,0x6800000,0xe0000000,0x100000,0x20040000, |
+0x200,0x1800000,0x9fe00001,0x3fff0000,0x10,0xc00,0xc0040,0x800000,0xfff70000,0x31021fd,0xf83fffff,0xbffffff,0x3ffffff,0x3f3fffff,0xaaff3f3f,0x3fffffff, |
+0x1fdfffff,0xefcfffde,0x1fdc7fff,0x1fff0000,0x1ffe2,0x800,0xc000000,0x4000,0xe000,0x1210,0x50,0x292,0x333e005,0x333,0xf000,0x3c0f, |
+0x38000,0x80000000,0xfc00,0x55555000,0x36db02a5,0x46100000,0x47900000,0x3ff08000,0xc0000000,0x30000,0x3ffff,0x3800,0x80000,1,0xc19d0000,2, |
+0x400000,0x40000b5,0x5108000,0x5f7ffc00,0x7fdb |
}; |
U_NAMESPACE_END |