ICU-9437 update to Unicode 6.2; merge in branches/markus/uni62 r32109

X-SVN-Rev: 32283

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/UCharacterProperty.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/UCharacterProperty.java
index 4df1c9d9b562021273a42211b51be639b4caceb3..527ef8dad5c0a8760234dd5102bfa141fe886db7 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/UCharacterProperty.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/UCharacterProperty.java
@@ -1,7 +1,7 @@
 /**
 *******************************************************************************
-* Copyright (C) 1996-2011, International Business Machines Corporation and    *
-* others. All Rights Reserved.                                                *
+* Copyright (C) 1996-2012, International Business Machines Corporation and
+* others. All Rights Reserved.
 *******************************************************************************
 */
 
@@ -808,7 +808,7 @@ public final class UCharacterProperty
         } else if(ntv<NTV_LARGE_START_) {
             /* fraction */
             return -2;
-        } else if(ntv<NTV_RESERVED_START_) {
+        } else if(ntv<NTV_BASE60_START_) {
             /* large, single-significant-digit integer */
             int mant=(ntv>>5)-14;
             int exp=(ntv&0x1f)+2;
@@ -821,6 +821,30 @@ public final class UCharacterProperty
             } else {
                 return -2;
             }
+        } else if(ntv<NTV_RESERVED_START_) {
+            /* sexagesimal (base 60) integer */
+            int numValue=(ntv>>2)-0xbf;
+            int exp=(ntv&3)+1;
+
+            switch(exp) {
+            case 4:
+                numValue*=60*60*60*60;
+                break;
+            case 3:
+                numValue*=60*60*60;
+                break;
+            case 2:
+                numValue*=60*60;
+                break;
+            case 1:
+                numValue*=60;
+                break;
+            case 0:
+            default:
+                break;
+            }
+
+            return numValue;
         } else {
             /* reserved */
             return -2;
@@ -847,7 +871,7 @@ public final class UCharacterProperty
             int numerator=(ntv>>4)-12;
             int denominator=(ntv&0xf)+1;
             return (double)numerator/denominator;
-        } else if(ntv<NTV_RESERVED_START_) {
+        } else if(ntv<NTV_BASE60_START_) {
             /* large, single-significant-digit integer */
             double numValue;
             int mant=(ntv>>5)-14;
@@ -874,6 +898,30 @@ public final class UCharacterProperty
                 break;
             }
 
+            return numValue;
+        } else if(ntv<NTV_RESERVED_START_) {
+            /* sexagesimal (base 60) integer */
+            int numValue=(ntv>>2)-0xbf;
+            int exp=(ntv&3)+1;
+
+            switch(exp) {
+            case 4:
+                numValue*=60*60*60*60;
+                break;
+            case 3:
+                numValue*=60*60*60;
+                break;
+            case 2:
+                numValue*=60*60;
+                break;
+            case 1:
+                numValue*=60;
+                break;
+            case 0:
+            default:
+                break;
+            }
+
             return numValue;
         } else {
             /* reserved */
@@ -948,13 +996,29 @@ public final class UCharacterProperty
         return props >> NUMERIC_TYPE_VALUE_SHIFT_;
     }
     /* constants for the storage form of numeric types and values */
+    /** No numeric value. */
     private static final int NTV_NONE_ = 0;
+    /** Decimal digits: nv=0..9 */
     private static final int NTV_DECIMAL_START_ = 1;
+    /** Other digits: nv=0..9 */
     private static final int NTV_DIGIT_START_ = 11;
+    /** Small integers: nv=0..154 */
     private static final int NTV_NUMERIC_START_ = 21;
+    /** Fractions: ((ntv>>4)-12) / ((ntv&0xf)+1) = -1..17 / 1..16 */
     private static final int NTV_FRACTION_START_ = 0xb0;
+    /**
+     * Large integers:
+     * ((ntv>>5)-14) * 10^((ntv&0x1f)+2) = (1..9)*(10^2..10^33)
+     * (only one significant decimal digit)
+     */
     private static final int NTV_LARGE_START_ = 0x1e0;
-    private static final int NTV_RESERVED_START_ = 0x300;
+    /**
+     * Sexagesimal numbers:
+     * ((ntv>>2)-0xbf) * 60^((ntv&3)+1) = (1..9)*(60^1..60^4)
+     */
+    private static final int NTV_BASE60_START_=0x300;
+    /** No numeric value (yet). */
+    private static final int NTV_RESERVED_START_ = NTV_BASE60_START_ + 36;  // 0x300+9*4=0x324
 
     private static final int ntvGetType(int ntv) {
         return

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/lang/UCharacter.java b/icu4j/main/classes/core/src/com/ibm/icu/lang/UCharacter.java
index 3d5ee47e8251704f41c0a0de6523b2786261c407..50996eed0be8085ad2626fb55f1d35b3039ed160 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/lang/UCharacter.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/lang/UCharacter.java
@@ -2756,10 +2756,12 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection
          * @stable ICU 4.0
          */
         public static final int PREPEND = 11;
+        /** @stable ICU 50 */
+        public static final int REGIONAL_INDICATOR = 12;  /*[RI]*/ /* new in Unicode 6.2/ICU 50 */
         /**
          * @stable ICU 3.4
          */
-        public static final int COUNT = 12;
+        public static final int COUNT = 13;
     }
 
     /**
@@ -2820,10 +2822,12 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection
          * @stable ICU 4.0
          */
         public static final int NEWLINE = 12;
+        /** @stable ICU 50 */
+        public static final int REGIONAL_INDICATOR = 13;  /*[RI]*/ /* new in Unicode 6.2/ICU 50 */
         /**
          * @stable ICU 4.0
          */
-        public static final int COUNT = 13;
+        public static final int COUNT = 14;
     }
 
     /**
@@ -3061,10 +3065,12 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection
         public static final int CONDITIONAL_JAPANESE_STARTER = 37;  /*[CJ]*/ /* new in Unicode 6.1/ICU 49 */
         /** @stable ICU 49 */
         public static final int HEBREW_LETTER = 38;  /*[HL]*/ /* new in Unicode 6.1/ICU 49 */
+        /** @stable ICU 50 */
+        public static final int REGIONAL_INDICATOR = 39;  /*[RI]*/ /* new in Unicode 6.2/ICU 50 */
         /**
          * @stable ICU 2.4
          */
-        public static final int COUNT = 39;
+        public static final int COUNT = 40;
     }
 
     /**

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 efd81e8ed237ad18ec39e482a01f49913a7963b5..84a1f23e0038040d712757a22092e97d3b5a0fbd 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java
@@ -137,6 +137,12 @@ public final class VersionInfo implements Comparable<VersionInfo>
      */
     public static final VersionInfo UNICODE_6_1;
 
+    /**
+     * Unicode 6.2 version
+     * @stable ICU 50
+     */
+    public static final VersionInfo UNICODE_6_2;
+
     /**
      * ICU4J current release version
      * @stable ICU 2.8
@@ -494,10 +500,11 @@ public final class VersionInfo implements Comparable<VersionInfo>
         UNICODE_5_2   = getInstance(5, 2, 0, 0);
         UNICODE_6_0   = getInstance(6, 0, 0, 0);
         UNICODE_6_1   = getInstance(6, 1, 0, 0);
+        UNICODE_6_2   = getInstance(6, 2, 0, 0);
 
         ICU_VERSION   = getInstance(50, 0, 1, 0);
         ICU_DATA_VERSION = getInstance(50, 0, 1, 0);
-        UNICODE_VERSION = UNICODE_6_1;
+        UNICODE_VERSION = UNICODE_6_2;
 
         UCOL_RUNTIME_VERSION = getInstance(7);
         UCOL_BUILDER_VERSION = getInstance(8);

diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar
index 590c3a06a7053567eccc8749ee7ed338dedcbf53..e01dad1c9b4a96e2846ea8bc021433d72564ddac 100755 (executable)
--- 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:545810802554cb0da527feef2334fa8e7f9b263b5d11416d0cc095ffe238c3f2
-size 9833888
+oid sha256:61218a138fcc75f37c9b1aa3b0184f145650ded6cda22d4e25bf6d2ab6f52ac0
+size 9826096

diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar
index bb55d11acc54ce0f07869f012a232821369bdfe8..720d2aa984e6a93394b28cad5fd5e6e72e025c87 100755 (executable)
--- a/icu4j/main/shared/data/icutzdata.jar
+++ b/icu4j/main/shared/data/icutzdata.jar
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8df1f2eb389175057ef1710473f0594943c3900e889b40f2baa41b56793a942c
+oid sha256:2478348dc1711c33be33d1f36d80425ca8e93d6c9b5b60e3d39c5147a34aad54
 size 97673

diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar
index 934d4bba20cacbe21cff1e4773d88140166371a2..0884fb4d7d6859f38655fad7af3355033fb3a867 100755 (executable)
--- a/icu4j/main/shared/data/testdata.jar
+++ b/icu4j/main/shared/data/testdata.jar
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8615d6fbae85f72c790c8db6176612120d4bc21307fb1eca90cc25621bd1cc11
-size 722851
+oid sha256:dd3d0c8605fa6c0d04086fbdbaf8392f13a37e07c5d8f1f0d90e4e9df567c04e
+size 722457

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 28d382790ec6a7b6b7e7d0fe8a805322352bfc5e..f2a7ec0ffb7a33b6feae0cd916ed2fb6c0aaff5d 100644 (file)
--- 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,7 +1,7 @@
 # File:        CollationTest_CLDR_NON_IGNORABLE_SHORT.txt
-# UCA Version: 6.1.0
-# UCD Version: 6.1.0
-# Generated:   2012-01-03, 21:53:27 GMT [MD]
+# UCA Version: 6.2.0
+# UCD Version: 6.2.0
+# Generated:   2012-08-15, 21:43:27 GMT [MD]
 # For a description of the format and usage, see CollationAuxiliary.html
 
 0338 0334
@@ -14,289 +14,344 @@
 20EA 0334
 20EB 0334
 0334 0591
+0591 0334
 0334 0592
+0592 0334
 0334 0593
+0593 0334
 0334 0594
+0594 0334
 0334 0595
+0595 0334
 0334 0596
+0596 0334
 0334 0597
+0597 0334
 0334 0598
+0598 0334
 0334 0599
+0599 0334
 0334 059A
+059A 0334
 0334 059B
+059B 0334
 0334 059C
+059C 0334
 0334 059D
+059D 0334
 0334 059E
+059E 0334
 0334 059F
+059F 0334
 0334 05A0
+05A0 0334
 0334 05A1
+05A1 0334
 0334 05A2
+05A2 0334
 0334 05A3
+05A3 0334
 0334 05A4
+05A4 0334
 0334 05A5
+05A5 0334
 0334 05A6
+05A6 0334
 0334 05A7
+05A7 0334
 0334 05A8
+05A8 0334
 0334 05A9
+05A9 0334
 0334 05AA
+05AA 0334
 0334 05AB
+05AB 0334
 0334 05AC
+05AC 0334
 0334 05AD
+05AD 0334
 0334 05AE
+05AE 0334
 0334 05AF
+05AF 0334
 0334 05BD
+05BD 0334
 0334 05C4
+05C4 0334
 0334 05C5
+05C5 0334
 0334 0610
+0610 0334
 0334 0611
+0611 0334
 0334 0612
+0612 0334
 0334 0613
+0613 0334
 0334 0614
+0614 0334
 0334 0615
+0615 0334
 0334 0616
+0616 0334
 0334 0617
+0617 0334
 0334 0618
+0618 0334
 0334 0619
+0619 0334
 0334 061A
+061A 0334
 0334 06D6
+06D6 0334
 0334 06D7
+06D7 0334
 0334 06D8
+06D8 0334
 0334 06D9
+06D9 0334
 0334 06DA
+06DA 0334
 0334 06DB
+06DB 0334
 0334 06DC
+06DC 0334
 0334 06DF
+06DF 0334
 0334 06E0
+06E0 0334
 0334 06E1
+06E1 0334
 0334 06E2
+06E2 0334
 0334 06E3
+06E3 0334
 0334 06E4
+06E4 0334
 0334 06E7
+06E7 0334
 0334 06E8
+06E8 0334
 0334 06EA
+06EA 0334
 0334 06EB
+06EB 0334
 0334 06EC
+06EC 0334
 0334 06ED
+06ED 0334
 0334 0740
+0740 0334
 0334 0743
+0743 0334
 0334 0744
+0744 0334
 0334 0747
+0747 0334
 0334 0748
+0748 0334
 0334 0749
+0749 0334
 0334 074A
+074A 0334
 0334 08EA
+08EA 0334
 0334 08EB
+08EB 0334
 0334 08EC
+08EC 0334
 0334 08ED
+08ED 0334
 0334 08EE
+08EE 0334
 0334 08EF
+08EF 0334
 0334 08F3
+08F3 0334
 0334 0951
+0951 0334
 0334 0952
+0952 0334
 0334 0F18
+0F18 0334
 0334 0F19
+0F19 0334
 0334 0F35
+0F35 0334
 0334 0F37
+0F37 0334
 0334 0F82
+0F82 0334
 0334 0F83
+0F83 0334
 0334 0F86
+0F86 0334
 0334 0F87
+0F87 0334
 0334 0FC6
+0FC6 0334
 0334 1A7F
+1A7F 0334
 0334 1B6B
+1B6B 0334
 0334 1B6C
+1B6C 0334
 0334 1B6D
+1B6D 0334
 0334 1B6E
+1B6E 0334
 0334 1B6F
+1B6F 0334
 0334 1B70
+1B70 0334
 0334 1B71
+1B71 0334
 0334 1B72
+1B72 0334
 0334 1B73
+1B73 0334
 0334 1CD0
+1CD0 0334
 0334 1CD1
+1CD1 0334
 0334 1CD2
+1CD2 0334
 0334 1CD5
+1CD5 0334
 0334 1CD6
+1CD6 0334
 0334 1CD7
+1CD7 0334
 0334 1CD8
+1CD8 0334
 0334 1CD9
+1CD9 0334
 0334 1CDA
+1CDA 0334
 0334 1CDB
+1CDB 0334
 0334 1CDC
+1CDC 0334
 0334 1CDD
+1CDD 0334
 0334 1CDE
+1CDE 0334
 0334 1CDF
+1CDF 0334
 0334 1CE0
+1CE0 0334
 0334 1CF4
+1CF4 0334
 0334 2D7F
+2D7F 0334
 0334 A8E0
+A8E0 0334
 0334 A8E1
+A8E1 0334
 0334 A8E2
+A8E2 0334
 0334 A8E3
+A8E3 0334
 0334 A8E4
+A8E4 0334
 0334 A8E5
+A8E5 0334
 0334 A8E6
+A8E6 0334
 0334 A8E7
+A8E7 0334
 0334 A8E8
+A8E8 0334
 0334 A8E9
+A8E9 0334
 0334 A8EA
+A8EA 0334
 0334 A8EB
+A8EB 0334
 0334 A8EC
+A8EC 0334
 0334 A8ED
+A8ED 0334
 0334 A8EE
+A8EE 0334
 0334 A8EF
+A8EF 0334
 0334 A8F0
+A8F0 0334
 0334 A8F1
+A8F1 0334
 0334 FE21
+FE21 0334
 0334 FE23
+FE23 0334
 0334 FE24
+FE24 0334
 0334 FE25
+FE25 0334
 0334 FE26
+FE26 0334
 0334 1D165
+1D165 0334
 0334 1D166
+1D166 0334
 0334 1D16D
+1D16D 0334
 0334 1D16E
+1D16E 0334
 0334 1D16F
+1D16F 0334
 0334 1D170
+1D170 0334
 0334 1D171
+1D171 0334
 0334 1D172
+1D172 0334
 0334 1D17B
+1D17B 0334
 0334 1D17C
+1D17C 0334
 0334 1D17D
+1D17D 0334
 0334 1D17E
+1D17E 0334
 0334 1D17F
+1D17F 0334
 0334 1D180
+1D180 0334
 0334 1D181
+1D181 0334
 0334 1D182
+1D182 0334
 0334 1D185
+1D185 0334
 0334 1D186
+1D186 0334
 0334 1D187
+1D187 0334
 0334 1D188
+1D188 0334
 0334 1D189
+1D189 0334
 0334 1D18A
+1D18A 0334
 0334 1D18B
+1D18B 0334
 0334 1D1AA
+1D1AA 0334
 0334 1D1AB
+1D1AB 0334
 0334 1D1AC
+1D1AC 0334
 0334 1D1AD
+1D1AD 0334
 0334 1D242
+1D242 0334
 0334 1D243
+1D243 0334
 0334 1D244
-0591 0334
-0592 0334
-0593 0334
-0594 0334
-0595 0334
-0596 0334
-0597 0334
-0598 0334
-0599 0334
-059A 0334
-059B 0334
-059C 0334
-059D 0334
-059E 0334
-059F 0334
-05A0 0334
-05A1 0334
-05A2 0334
-05A3 0334
-05A4 0334
-05A5 0334
-05A6 0334
-05A7 0334
-05A8 0334
-05A9 0334
-05AA 0334
-05AB 0334
-05AC 0334
-05AD 0334
-05AE 0334
-05AF 0334
-05BD 0334
-05C4 0334
-05C5 0334
-0610 0334
-0611 0334
-0612 0334
-0613 0334
-0614 0334
-0615 0334
-0616 0334
-0617 0334
-0618 0334
-0619 0334
-061A 0334
-06D6 0334
-06D7 0334
-06D8 0334
-06D9 0334
-06DA 0334
-06DB 0334
-06DC 0334
-06DF 0334
-06E0 0334
-06E1 0334
-06E2 0334
-06E3 0334
-06E4 0334
-06E7 0334
-06E8 0334
-06EA 0334
-06EB 0334
-06EC 0334
-06ED 0334
-0740 0334
-0743 0334
-0744 0334
-0747 0334
-0748 0334
-0749 0334
-074A 0334
-08EA 0334
-08EB 0334
-08EC 0334
-08ED 0334
-08EE 0334
-08EF 0334
-08F3 0334
-0951 0334
-0952 0334
-0F18 0334
-0F19 0334
-0F35 0334
-0F37 0334
-0F82 0334
-0F83 0334
-0F86 0334
-0F87 0334
-0FC6 0334
-1A7F 0334
-1B6B 0334
-1B6C 0334
-1B6D 0334
-1B6E 0334
-1B6F 0334
-1B70 0334
-1B71 0334
-1B72 0334
-1B73 0334
-1CD0 0334
-1CD1 0334
-1CD2 0334
+1D244 0334
 1CD4 0334
-1CD5 0334
-1CD6 0334
-1CD7 0334
-1CD8 0334
-1CD9 0334
-1CDA 0334
-1CDB 0334
-1CDC 0334
-1CDD 0334
-1CDE 0334
-1CDF 0334
-1CE0 0334
 1CE2 0334
 1CE3 0334
 1CE4 0334
@@ -304,91 +359,36 @@
 1CE6 0334
 1CE7 0334
 1CE8 0334
-1CF4 0334
-2D7F 0334
-A8E0 0334
-A8E1 0334
-A8E2 0334
-A8E3 0334
-A8E4 0334
-A8E5 0334
-A8E6 0334
-A8E7 0334
-A8E8 0334
-A8E9 0334
-A8EA 0334
-A8EB 0334
-A8EC 0334
-A8ED 0334
-A8EE 0334
-A8EF 0334
-A8F0 0334
-A8F1 0334
-FE21 0334
-FE23 0334
-FE24 0334
-FE25 0334
-FE26 0334
-1D165 0334
-1D166 0334
 1D167 0334
 1D168 0334
 1D169 0334
-1D16D 0334
-1D16E 0334
-1D16F 0334
-1D170 0334
-1D171 0334
-1D172 0334
-1D17B 0334
-1D17C 0334
-1D17D 0334
-1D17E 0334
-1D17F 0334
-1D180 0334
-1D181 0334
-1D182 0334
-1D185 0334
-1D186 0334
-1D187 0334
-1D188 0334
-1D189 0334
-1D18A 0334
-1D18B 0334
-1D1AA 0334
-1D1AB 0334
-1D1AC 0334
-1D1AD 0334
-1D242 0334
-1D243 0334
-1D244 0334
 0332 0334
 0334 0332
 0313 0334
 0334 0313
 0334 0343
-0334 0486
-0334 2CF1
 0343 0334
+0334 0486
 0486 0334
+0334 2CF1
 2CF1 0334
 0314 0334
 0334 0314
 0334 0485
-0334 2CF0
 0485 0334
+0334 2CF0
 2CF0 0334
 0301 0334
 0334 0301
 0334 0341
-0334 0954
 0341 0334
+0334 0954
 0954 0334
 0300 0334
 0334 0300
 0334 0340
-0334 0953
 0340 0334
+0334 0953
 0953 0334
 0306 0334
 0334 0306
@@ -419,186 +419,186 @@ FE26 0334
 0304 0334
 0334 0304
 030D 0334
-030E 0334
-0312 0334
-0315 0334
-031A 0334
 0334 030D
+030E 0334
 0334 030E
+0312 0334
 0334 0312
+0315 0334
 0334 0315
+031A 0334
 0334 031A
 0334 033D
-0334 033E
-0334 033F
-0334 0346
-0334 034A
-0334 034B
-0334 034C
-0334 0350
-0334 0351
-0334 0352
-0334 0357
-0334 035B
-0334 035D
-0334 035E
-0334 0484
-0334 0487
-0334 0741
-0334 0745
-0334 17DD
-0334 1DC0
-0334 1DC1
-0334 1DC3
-0334 1DC4
-0334 1DC5
-0334 1DC6
-0334 1DC7
-0334 1DC8
-0334 1DC9
-0334 1DCB
-0334 1DCC
-0334 1DCD
-0334 1DCE
-0334 1DD1
-0334 1DFE
-0334 20F0
-0334 2CEF
-0334 A67C
-0334 A67D
 033D 0334
+0334 033E
 033E 0334
+0334 033F
 033F 0334
+0334 0346
 0346 0334
+0334 034A
 034A 0334
+0334 034B
 034B 0334
+0334 034C
 034C 0334
+0334 0350
 0350 0334
+0334 0351
 0351 0334
+0334 0352
 0352 0334
+0334 0357
 0357 0334
+0334 035B
 035B 0334
+0334 035D
 035D 0334
+0334 035E
 035E 0334
+0334 0484
 0484 0334
+0334 0487
 0487 0334
+0334 0741
 0741 0334
+0334 0745
 0745 0334
+0334 17DD
 17DD 0334
+0334 1DC0
 1DC0 0334
+0334 1DC1
 1DC1 0334
+0334 1DC3
 1DC3 0334
+0334 1DC4
 1DC4 0334
+0334 1DC5
 1DC5 0334
+0334 1DC6
 1DC6 0334
+0334 1DC7
 1DC7 0334
+0334 1DC8
 1DC8 0334
+0334 1DC9
 1DC9 0334
+0334 1DCB
 1DCB 0334
+0334 1DCC
 1DCC 0334
+0334 1DCD
 1DCD 0334
+0334 1DCE
 1DCE 0334
+0334 1DD1
 1DD1 0334
+0334 1DFE
 1DFE 0334
+0334 20F0
 20F0 0334
+0334 2CEF
 2CEF 0334
+0334 A67C
 A67C 0334
+0334 A67D
 A67D 0334
 0316 0334
-0317 0334
-0318 0334
-0319 0334
-031C 0334
-031D 0334
-031E 0334
-031F 0334
-0320 0334
-0329 0334
-032A 0334
-032B 0334
-032C 0334
-032F 0334
-0333 0334
 0334 0316
+0317 0334
 0334 0317
+0318 0334
 0334 0318
+0319 0334
 0334 0319
+031C 0334
 0334 031C
+031D 0334
 0334 031D
+031E 0334
 0334 031E
+031F 0334
 0334 031F
+0320 0334
 0334 0320
+0329 0334
 0334 0329
+032A 0334
 0334 032A
+032B 0334
 0334 032B
+032C 0334
 0334 032C
+032F 0334
 0334 032F
+0333 0334
 0334 0333
 0334 033A
-0334 033B
-0334 033C
-0334 0347
-0334 0348
-0334 0349
-0334 034D
-0334 034E
-0334 0353
-0334 0354
-0334 0355
-0334 0356
-0334 0359
-0334 035A
-0334 035C
-0334 035F
-0334 0362
-0334 0742
-0334 0746
-0334 0859
-0334 085A
-0334 085B
-0334 1DC2
-0334 1DCF
-0334 1DD0
-0334 1DFC
-0334 1DFD
-0334 1DFF
-0334 20EC
-0334 20ED
-0334 20EE
-0334 20EF
-0334 10A0D
 033A 0334
+0334 033B
 033B 0334
+0334 033C
 033C 0334
+0334 0347
 0347 0334
+0334 0348
 0348 0334
+0334 0349
 0349 0334
+0334 034D
 034D 0334
+0334 034E
 034E 0334
+0334 0353
 0353 0334
+0334 0354
 0354 0334
+0334 0355
 0355 0334
+0334 0356
 0356 0334
+0334 0359
 0359 0334
+0334 035A
 035A 0334
+0334 035C
 035C 0334
+0334 035F
 035F 0334
+0334 0362
 0362 0334
+0334 0742
 0742 0334
+0334 0746
 0746 0334
+0334 0859
 0859 0334
+0334 085A
 085A 0334
+0334 085B
 085B 0334
+0334 1DC2
 1DC2 0334
+0334 1DCF
 1DCF 0334
+0334 1DD0
 1DD0 0334
+0334 1DFC
 1DFC 0334
+0334 1DFD
 1DFD 0334
+0334 1DFF
 1DFF 0334
+0334 20EC
 20EC 0334
+0334 20ED
 20ED 0334
+0334 20EE
 20EE 0334
+0334 20EF
 20EF 0334
+0334 10A0D
 10A0D 0334
 0305 0334
 0334 0305
@@ -640,12 +640,12 @@ A67D 0334
 0334 0358
 0358 0334
 0334 0360
-0334 FE22
 0360 0334
+0334 FE22
 FE22 0334
 0334 0361
-0334 FE20
 0361 0334
+0334 FE20
 FE20 0334
 0334 0483
 0483 0334
@@ -668,12 +668,12 @@ A66F 0334
 0334 05B7
 05B7 0334
 0334 05B8
-0334 05C7
 05B8 0334
+0334 05C7
 05C7 0334
 0334 05B9
-0334 05BA
 05B9 0334
+0334 05BA
 05BA 0334
 0334 05BB
 05BB 0334
@@ -688,30 +688,30 @@ A66F 0334
 0334 FB1E
 FB1E 0334
 0334 081C
-0334 081D
 081C 0334
+0334 081D
 081D 0334
 0334 081E
-0334 081F
-0334 0820
 081E 0334
+0334 081F
 081F 0334
+0334 0820
 0820 0334
 0334 0821
-0334 0822
-0334 0823
 0821 0334
+0334 0822
 0822 0334
+0334 0823
 0823 0334
 0334 0825
 0825 0334
 0334 0826
-0334 0827
 0826 0334
+0334 0827
 0827 0334
 0334 0829
-0334 082A
 0829 0334
+0334 082A
 082A 0334
 0334 082B
 082B 0334
@@ -870,38 +870,38 @@ A6F0 0334
 0334 A6F1
 A6F1 0334
 0334 093C
-0334 09BC
-0334 0A3C
-0334 0ABC
-0334 0B3C
-0334 0CBC
-0334 1B34
-0334 1BE6
-0334 1C37
-0334 A9B3
-0334 110BA
-0334 116B7
 093C 0334
+0334 09BC
 09BC 0334
+0334 0A3C
 0A3C 0334
+0334 0ABC
 0ABC 0334
+0334 0B3C
 0B3C 0334
+0334 0CBC
 0CBC 0334
+0334 1B34
 1B34 0334
+0334 1BE6
 1BE6 0334
+0334 1C37
 1C37 0334
+0334 A9B3
 A9B3 0334
+0334 110BA
 110BA 0334
+0334 116B7
 116B7 0334
 0334 11100
 11100 0334
 0334 1CED
-0334 11101
 1CED 0334
+0334 11101
 11101 0334
 0334 10A0F
-0334 11102
 10A0F 0334
+0334 11102
 11102 0334
 0334 10A38
 10A38 0334
@@ -1062,8 +1062,8 @@ FFFE 0062
 3000 0021
 1680 0021
 2000 0021
-2001 0021
 2002 0021
+2001 0021
 2003 0021
 2004 0021
 2005 0021
@@ -1079,8 +1079,8 @@ FFFE 0062
 3000 003F
 1680 003F
 2000 003F
-2001 003F
 2002 003F
+2001 003F
 2003 003F
 2004 003F
 2005 003F
@@ -1098,8 +1098,8 @@ FFFE 0062
 3000 0041
 1680 0061
 2000 0061
-2001 0061
 2002 0061
+2001 0061
 2003 0061
 2004 0061
 2005 0061
@@ -1110,8 +1110,8 @@ FFFE 0062
 205F 0061
 1680 0041
 2000 0041
-2001 0041
 2002 0041
+2001 0041
 2003 0041
 2004 0041
 2005 0041
@@ -1130,8 +1130,8 @@ FFFE 0062
 3000 0062
 1680 0062
 2000 0062
-2001 0062
 2002 0062
+2001 0062
 2003 0062
 2004 0062
 2005 0062
@@ -7265,20 +7265,20 @@ FF40 0041
 1FEF 0062
 FF40 0062
 00B4 0021
-0384 0021
 1FFD 0021
+0384 0021
 00B4 003F
-0384 003F
 1FFD 003F
+0384 003F
 00B4 0061
-0384 0061
 1FFD 0061
+0384 0061
 00B4 0041
-0384 0041
 1FFD 0041
+0384 0041
 00B4 0062
-0384 0062
 1FFD 0062
+0384 0062
 02DC 0021
 02DC 003F
 02DC 0061
@@ -14905,6 +14905,136 @@ FFEE 0062
 26FF 0061
 26FF 0041
 26FF 0062
+1F1E6 0021
+1F1E6 003F
+1F1E6 0061
+1F1E6 0041
+1F1E6 0062
+1F1E7 0021
+1F1E7 003F
+1F1E7 0061
+1F1E7 0041
+1F1E7 0062
+1F1E8 0021
+1F1E8 003F
+1F1E8 0061
+1F1E8 0041
+1F1E8 0062
+1F1E9 0021
+1F1E9 003F
+1F1E9 0061
+1F1E9 0041
+1F1E9 0062
+1F1EA 0021
+1F1EA 003F
+1F1EA 0061
+1F1EA 0041
+1F1EA 0062
+1F1EB 0021
+1F1EB 003F
+1F1EB 0061
+1F1EB 0041
+1F1EB 0062
+1F1EC 0021
+1F1EC 003F
+1F1EC 0061
+1F1EC 0041
+1F1EC 0062
+1F1ED 0021
+1F1ED 003F
+1F1ED 0061
+1F1ED 0041
+1F1ED 0062
+1F1EE 0021
+1F1EE 003F
+1F1EE 0061
+1F1EE 0041
+1F1EE 0062
+1F1EF 0021
+1F1EF 003F
+1F1EF 0061
+1F1EF 0041
+1F1EF 0062
+1F1F0 0021
+1F1F0 003F
+1F1F0 0061
+1F1F0 0041
+1F1F0 0062
+1F1F1 0021
+1F1F1 003F
+1F1F1 0061
+1F1F1 0041
+1F1F1 0062
+1F1F2 0021
+1F1F2 003F
+1F1F2 0061
+1F1F2 0041
+1F1F2 0062
+1F1F3 0021
+1F1F3 003F
+1F1F3 0061
+1F1F3 0041
+1F1F3 0062
+1F1F4 0021
+1F1F4 003F
+1F1F4 0061
+1F1F4 0041
+1F1F4 0062
+1F1F5 0021
+1F1F5 003F
+1F1F5 0061
+1F1F5 0041
+1F1F5 0062
+1F1F6 0021
+1F1F6 003F
+1F1F6 0061
+1F1F6 0041
+1F1F6 0062
+1F1F7 0021
+1F1F7 003F
+1F1F7 0061
+1F1F7 0041
+1F1F7 0062
+1F1F8 0021
+1F1F8 003F
+1F1F8 0061
+1F1F8 0041
+1F1F8 0062
+1F1F9 0021
+1F1F9 003F
+1F1F9 0061
+1F1F9 0041
+1F1F9 0062
+1F1FA 0021
+1F1FA 003F
+1F1FA 0061
+1F1FA 0041
+1F1FA 0062
+1F1FB 0021
+1F1FB 003F
+1F1FB 0061
+1F1FB 0041
+1F1FB 0062
+1F1FC 0021
+1F1FC 003F
+1F1FC 0061
+1F1FC 0041
+1F1FC 0062
+1F1FD 0021
+1F1FD 003F
+1F1FD 0061
+1F1FD 0041
+1F1FD 0062
+1F1FE 0021
+1F1FE 003F
+1F1FE 0061
+1F1FE 0041
+1F1FE 0062
+1F1FF 0021
+1F1FF 003F
+1F1FF 0061
+1F1FF 0041
+1F1FF 0062
 2701 0021
 2701 003F
 2701 0061
@@ -23246,27 +23376,27 @@ A4C6 0062
 1D157 0062
 1D15E 0062
 1D158 0334 1D165
-1D158 0334 1D165 1D16E
-1D158 0334 1D165 1D170
-1D158 0334 1D165 1D171
-1D158 0334 1D165 1D172
 1D158 1D165 0334
+1D15F 0334
+1D158 0334 1D165 1D16E
 1D158 1D165 0334 1D16E
-1D158 1D165 0334 1D16F
-1D158 1D165 0334 1D170
-1D158 1D165 0334 1D171
-1D158 1D165 0334 1D172
 1D158 1D165 1D16E 0334
-1D158 1D165 1D16F 0334
-1D15F 0334
-1D15F 0334 1D171
-1D15F 0334 1D172
 1D15F 1D16E 0334
+1D158 1D165 0334 1D16F
+1D158 1D165 1D16F 0334
 1D15F 1D16F 0334
-1D15F 1D170 0334
 1D161 0334
+1D158 0334 1D165 1D170
+1D158 1D165 0334 1D170
+1D15F 1D170 0334
 1D162 0334
+1D158 0334 1D165 1D171
+1D158 1D165 0334 1D171
+1D15F 0334 1D171
 1D163 0334
+1D158 0334 1D165 1D172
+1D158 1D165 0334 1D172
+1D15F 0334 1D172
 1D164 0334
 1D158 0021
 1D15F 0021
@@ -23559,16 +23689,16 @@ A4C6 0062
 1D1B8 0041
 1D1B8 0062
 1D1B9 0334 1D165
-1D1B9 0334 1D165 1D16E
-1D1B9 0334 1D165 1D16F
 1D1B9 1D165 0334
-1D1B9 1D165 0334 1D16E
-1D1B9 1D165 0334 1D16F
 1D1BB 0334
+1D1B9 0334 1D165 1D16E
+1D1B9 1D165 0334 1D16E
 1D1BB 0334 1D16E
+1D1BD 0334
+1D1B9 0334 1D165 1D16F
+1D1B9 1D165 0334 1D16F
 1D1BB 0334 1D16F
 1D1BB 1D16F 0334
-1D1BD 0334
 1D1B9 0021
 1D1BB 0021
 1D1BD 0021
@@ -23590,16 +23720,16 @@ A4C6 0062
 1D1BD 0062
 1D1BF 0062
 1D1BA 0334 1D165
-1D1BA 0334 1D165 1D16F
 1D1BA 1D165 0334
-1D1BA 1D165 0334 1D16F
-1D1BA 1D165 1D16E 0334
-1D1BA 1D165 1D16F 0334
 1D1BC 0334
+1D1BA 1D165 1D16E 0334
 1D1BC 0334 1D16E
-1D1BC 0334 1D16F
 1D1BC 1D16E 0334
 1D1BE 0334
+1D1BA 0334 1D165 1D16F
+1D1BA 1D165 0334 1D16F
+1D1BA 1D165 1D16F 0334
+1D1BC 0334 1D16F
 1D1BA 0021
 1D1BC 0021
 1D1BE 0021
@@ -29756,6 +29886,11 @@ FFE6 0062
 20B9 0061
 20B9 0041
 20B9 0062
+20BA 0021
+20BA 003F
+20BA 0061
+20BA 0041
+20BA 0062
 20A8 0021
 20A8 003F
 20A8 0061
@@ -37810,7 +37945,6 @@ FF41 0021
 24D0 0021
 0041 0021
 FF21 0021
-1F1E6 0021
 1D400 0021
 1D434 0021
 1D468 0021
@@ -37911,7 +38045,6 @@ FF41 003F
 24D0 003F
 0041 003F
 FF21 003F
-1F1E6 003F
 1D400 003F
 1D434 003F
 1D468 003F
@@ -38056,8 +38189,6 @@ FF41 0041
 0041 0041
 FF21 0061
 FF21 0041
-1F1E6 0061
-1F1E6 0041
 1D400 0061
 1D434 0061
 1D468 0061
@@ -38249,7 +38380,6 @@ FF41 0062
 24D0 0062
 0041 0062
 FF21 0062
-1F1E6 0062
 1D400 0062
 1D434 0062
 1D468 0062
@@ -39690,7 +39820,6 @@ FF42 0021
 24D1 0021
 0042 0021
 FF22 0021
-1F1E7 0021
 212C 0021
 1D401 0021
 1D435 0021
@@ -39734,7 +39863,6 @@ FF42 003F
 24D1 003F
 0042 003F
 FF22 003F
-1F1E7 003F
 212C 003F
 1D401 003F
 1D435 003F
@@ -39796,8 +39924,6 @@ FF42 0041
 0042 0041
 FF22 0061
 FF22 0041
-1F1E7 0061
-1F1E7 0041
 212C 0061
 1D401 0061
 1D435 0061
@@ -39871,7 +39997,6 @@ FF42 0062
 24D1 0062
 0042 0062
 FF22 0062
-1F1E7 0062
 212C 0062
 1D401 0062
 1D435 0062
@@ -40022,7 +40147,6 @@ FF43 0021
 0043 0021
 FF23 0021
 216D 0021
-1F1E8 0021
 2102 0021
 212D 0021
 1D402 0021
@@ -40076,7 +40200,6 @@ FF43 003F
 0043 003F
 FF23 003F
 216D 003F
-1F1E8 003F
 2102 003F
 212D 003F
 1D402 003F
@@ -40165,9 +40288,7 @@ FF43 0041
 FF23 0061
 FF23 0041
 216D 0061
-1F1E8 0061
 216D 0041
-1F1E8 0041
 2102 0061
 212D 0061
 1D402 0061
@@ -40258,7 +40379,6 @@ FF43 0062
 0043 0062
 FF23 0062
 216D 0062
-1F1E8 0062
 2102 0062
 212D 0062
 1D402 0062
@@ -40465,7 +40585,6 @@ FF44 0021
 0044 0021
 FF24 0021
 216E 0021
-1F1E9 0021
 2145 0021
 1D403 0021
 1D437 0021
@@ -40529,7 +40648,6 @@ FF44 003F
 0044 003F
 FF24 003F
 216E 003F
-1F1E9 003F
 2145 003F
 1D403 003F
 1D437 003F
@@ -40614,9 +40732,7 @@ FF44 0041
 FF24 0061
 FF24 0041
 216E 0061
-1F1E9 0061
 216E 0041
-1F1E9 0041
 2145 0061
 1D403 0061
 1D437 0061
@@ -40726,7 +40842,6 @@ FF44 0062
 0044 0062
 FF24 0062
 216E 0062
-1F1E9 0062
 2145 0062
 1D403 0062
 1D437 0062
@@ -41110,7 +41225,6 @@ FF45 0021
 24D4 0021
 0045 0021
 FF25 0021
-1F1EA 0021
 2130 0021
 1D404 0021
 1D438 0021
@@ -41201,7 +41315,6 @@ FF45 003F
 24D4 003F
 0045 003F
 FF25 003F
-1F1EA 003F
 2130 003F
 1D404 003F
 1D438 003F
@@ -41312,8 +41425,6 @@ FF45 0041
 0045 0041
 FF25 0061
 FF25 0041
-1F1EA 0061
-1F1EA 0041
 2130 0061
 1D404 0061
 1D438 0061
@@ -41474,7 +41585,6 @@ FF45 0062
 24D4 0062
 0045 0062
 FF25 0062
-1F1EA 0062
 2130 0062
 1D404 0062
 1D438 0062
@@ -41729,7 +41839,6 @@ FF46 0021
 24D5 0021
 0046 0021
 FF26 0021
-1F1EB 0021
 2131 0021
 1D405 0021
 1D439 0021
@@ -41770,7 +41879,6 @@ FF46 003F
 24D5 003F
 0046 003F
 FF26 003F
-1F1EB 003F
 2131 003F
 1D405 003F
 1D439 003F
@@ -41829,8 +41937,6 @@ FF46 0041
 0046 0041
 FF26 0061
 FF26 0041
-1F1EB 0061
-1F1EB 0041
 2131 0061
 1D405 0061
 1D439 0061
@@ -41898,7 +42004,6 @@ FF46 0062
 24D5 0062
 0046 0062
 FF26 0062
-1F1EB 0062
 2131 0062
 1D405 0062
 1D439 0062
@@ -42066,7 +42171,6 @@ FF47 0021
 24D6 0021
 0047 0021
 FF27 0021
-1F1EC 0021
 1D406 0021
 1D43A 0021
 1D46E 0021
@@ -42123,7 +42227,6 @@ FF47 003F
 24D6 003F
 0047 003F
 FF27 003F
-1F1EC 003F
 1D406 003F
 1D43A 003F
 1D46E 003F
@@ -42199,8 +42302,6 @@ FF47 0041
 0047 0041
 FF27 0061
 FF27 0041
-1F1EC 0061
-1F1EC 0041
 1D406 0061
 1D43A 0061
 1D46E 0061
@@ -42299,7 +42400,6 @@ FF47 0062
 24D6 0062
 0047 0062
 FF27 0062
-1F1EC 0062
 1D406 0062
 1D43A 0062
 1D46E 0062
@@ -42515,7 +42615,6 @@ FF48 0021
 24D7 0021
 0048 0021
 FF28 0021
-1F1ED 0021
 210B 0021
 210C 0021
 210D 0021
@@ -42574,7 +42673,6 @@ FF48 003F
 24D7 003F
 0048 003F
 FF28 003F
-1F1ED 003F
 210B 003F
 210C 003F
 210D 003F
@@ -42652,8 +42750,6 @@ FF48 0041
 0048 0041
 FF28 0061
 FF28 0041
-1F1ED 0061
-1F1ED 0041
 210B 0061
 210C 0061
 210D 0061
@@ -42756,7 +42852,6 @@ FF48 0062
 24D7 0062
 0048 0062
 FF28 0062
-1F1ED 0062
 210B 0062
 210C 0062
 210D 0062
@@ -43020,7 +43115,6 @@ FF49 0021
 0049 0021
 FF29 0021
 2160 0021
-1F1EE 0021
 2110 0021
 2111 0021
 1D408 0021
@@ -43095,7 +43189,6 @@ FF49 003F
 0049 003F
 FF29 003F
 2160 003F
-1F1EE 003F
 2110 003F
 2111 003F
 1D408 003F
@@ -43192,9 +43285,7 @@ FF49 0041
 FF29 0061
 FF29 0041
 2160 0061
-1F1EE 0061
 2160 0041
-1F1EE 0041
 2110 0061
 2111 0061
 1D408 0061
@@ -43320,7 +43411,6 @@ FF49 0062
 0049 0062
 FF29 0062
 2160 0062
-1F1EE 0062
 2110 0062
 2111 0062
 1D408 0062
@@ -43555,7 +43645,6 @@ FF4A 0021
 24D9 0021
 004A 0021
 FF2A 0021
-1F1EF 0021
 1D409 0021
 1D43D 0021
 1D471 0021
@@ -43598,7 +43687,6 @@ FF4A 003F
 24D9 003F
 004A 003F
 FF2A 003F
-1F1EF 003F
 1D409 003F
 1D43D 003F
 1D471 003F
@@ -43660,8 +43748,6 @@ FF4A 0041
 004A 0041
 FF2A 0061
 FF2A 0041
-1F1EF 0061
-1F1EF 0041
 1D409 0061
 1D43D 0061
 1D471 0061
@@ -43727,7 +43813,6 @@ FF4A 0062
 24D9 0062
 004A 0062
 FF2A 0062
-1F1EF 0062
 1D409 0062
 1D43D 0062
 1D471 0062
@@ -43859,7 +43944,6 @@ FF4B 0021
 004B 0021
 212A 0021
 FF2B 0021
-1F1F0 0021
 1D40A 0021
 1D43E 0021
 1D472 0021
@@ -43912,7 +43996,6 @@ FF4B 003F
 004B 003F
 212A 003F
 FF2B 003F
-1F1F0 003F
 1D40A 003F
 1D43E 003F
 1D472 003F
@@ -43985,8 +44068,6 @@ FF4B 0041
 212A 0041
 FF2B 0061
 FF2B 0041
-1F1F0 0061
-1F1F0 0041
 1D40A 0061
 1D43E 0061
 1D472 0061
@@ -44076,7 +44157,6 @@ FF4B 0062
 004B 0062
 212A 0062
 FF2B 0062
-1F1F0 0062
 1D40A 0062
 1D43E 0062
 1D472 0062
@@ -44319,7 +44399,6 @@ FF4C 0021
 004C 0021
 FF2C 0021
 216C 0021
-1F1F1 0021
 2112 0021
 1D40B 0021
 1D43F 0021
@@ -44384,7 +44463,6 @@ FF4C 003F
 004C 003F
 FF2C 003F
 216C 003F
-1F1F1 003F
 2112 003F
 1D40B 003F
 1D43F 003F
@@ -44482,9 +44560,7 @@ FF4C 0041
 FF2C 0061
 FF2C 0041
 216C 0061
-1F1F1 0061
 216C 0041
-1F1F1 0041
 2112 0061
 1D40B 0061
 1D43F 0061
@@ -44591,7 +44667,6 @@ FF4C 0062
 004C 0062
 FF2C 0062
 216C 0062
-1F1F1 0062
 2112 0062
 1D40B 0062
 1D43F 0062
@@ -44874,7 +44949,6 @@ FF4D 0021
 004D 0021
 FF2D 0021
 216F 0021
-1F1F2 0021
 2133 0021
 1D40C 0021
 1D440 0021
@@ -44922,7 +44996,6 @@ FF4D 003F
 004D 003F
 FF2D 003F
 216F 003F
-1F1F2 003F
 2133 003F
 1D40C 003F
 1D440 003F
@@ -45010,9 +45083,7 @@ FF4D 0041
 FF2D 0061
 FF2D 0041
 216F 0061
-1F1F2 0061
 216F 0041
-1F1F2 0041
 2133 0061
 1D40C 0061
 1D440 0061
@@ -45091,7 +45162,6 @@ FF4D 0062
 004D 0062
 FF2D 0062
 216F 0062
-1F1F2 0062
 2133 0062
 1D40C 0062
 1D440 0062
@@ -45349,7 +45419,6 @@ FF4E 0021
 24DD 0021
 004E 0021
 FF2E 0021
-1F1F3 0021
 2115 0021
 1D40D 0021
 1D441 0021
@@ -45409,7 +45478,6 @@ FF4E 003F
 24DD 003F
 004E 003F
 FF2E 003F
-1F1F3 003F
 2115 003F
 1D40D 003F
 1D441 003F
@@ -45488,8 +45556,6 @@ FF4E 0041
 004E 0041
 FF2E 0061
 FF2E 0041
-1F1F3 0061
-1F1F3 0041
 2115 0061
 1D40D 0061
 1D441 0061
@@ -45594,7 +45660,6 @@ FF4E 0062
 24DD 0062
 004E 0062
 FF2E 0062
-1F1F3 0062
 2115 0062
 1D40D 0062
 1D441 0062
@@ -46070,7 +46135,6 @@ FF4F 0021
 24DE 0021
 004F 0021
 FF2F 0021
-1F1F4 0021
 1D40E 0021
 1D442 0021
 1D476 0021
@@ -46183,7 +46247,6 @@ FF4F 003F
 24DE 003F
 004F 003F
 FF2F 003F
-1F1F4 003F
 1D40E 003F
 1D442 003F
 1D476 003F
@@ -46315,8 +46378,6 @@ FF4F 0041
 004F 0041
 FF2F 0061
 FF2F 0041
-1F1F4 0061
-1F1F4 0041
 1D40E 0061
 1D442 0061
 1D476 0061
@@ -46522,7 +46583,6 @@ FF4F 0062
 24DE 0062
 004F 0062
 FF2F 0062
-1F1F4 0062
 1D40E 0062
 1D442 0062
 1D476 0062
@@ -46823,7 +46883,6 @@ FF50 0021
 24DF 0021
 0050 0021
 FF30 0021
-1F1F5 0021
 2119 0021
 1D40F 0021
 1D443 0021
@@ -46867,7 +46926,6 @@ FF50 003F
 24DF 003F
 0050 003F
 FF30 003F
-1F1F5 003F
 2119 003F
 1D40F 003F
 1D443 003F
@@ -46934,8 +46992,6 @@ FF50 0041
 0050 0041
 FF30 0061
 FF30 0041
-1F1F5 0061
-1F1F5 0041
 2119 0061
 1D40F 0061
 1D443 0061
@@ -47019,7 +47075,6 @@ FF50 0062
 24DF 0062
 0050 0062
 FF30 0062
-1F1F5 0062
 2119 0062
 1D40F 0062
 1D443 0062
@@ -47198,7 +47253,6 @@ FF51 0021
 24E0 0021
 0051 0021
 FF31 0021
-1F1F6 0021
 211A 0021
 1D410 0021
 1D444 0021
@@ -47234,7 +47288,6 @@ FF51 003F
 24E0 003F
 0051 003F
 FF31 003F
-1F1F6 003F
 211A 003F
 1D410 003F
 1D444 003F
@@ -47288,8 +47341,6 @@ FF51 0041
 0051 0041
 FF31 0061
 FF31 0041
-1F1F6 0061
-1F1F6 0041
 211A 0061
 1D410 0061
 1D444 0061
@@ -47342,7 +47393,6 @@ FF51 0062
 24E0 0062
 0051 0062
 FF31 0062
-1F1F6 0062
 211A 0062
 1D410 0062
 1D444 0062
@@ -47464,8 +47514,8 @@ A758 0062
 0052 0334 0331
 1E5E 0334
 0334 036C
-0334 1DCA
 036C 0334
+0334 1DCA
 1DCA 0334
 0072 0021
 FF52 0021
@@ -47487,7 +47537,6 @@ FF52 0021
 24E1 0021
 0052 0021
 FF32 0021
-1F1F7 0021
 211B 0021
 211C 0021
 211D 0021
@@ -47551,7 +47600,6 @@ FF52 003F
 24E1 003F
 0052 003F
 FF32 003F
-1F1F7 003F
 211B 003F
 211C 003F
 211D 003F
@@ -47635,8 +47683,6 @@ FF52 0041
 0052 0041
 FF32 0061
 FF32 0041
-1F1F7 0061
-1F1F7 0041
 211B 0061
 211C 0061
 211D 0061
@@ -47758,7 +47804,6 @@ FF52 0062
 24E1 0062
 0052 0062
 FF32 0062
-1F1F7 0062
 211B 0062
 211C 0062
 211D 0062
@@ -48050,7 +48095,6 @@ FF53 0021
 24E2 0021
 0053 0021
 FF33 0021
-1F1F8 0021
 1D412 0021
 1D446 0021
 1D47A 0021
@@ -48116,7 +48160,6 @@ FF53 003F
 24E2 003F
 0053 003F
 FF33 003F
-1F1F8 003F
 1D412 003F
 1D446 003F
 1D47A 003F
@@ -48201,8 +48244,6 @@ FF53 0041
 0053 0041
 FF33 0061
 FF33 0041
-1F1F8 0061
-1F1F8 0041
 1D412 0061
 1D446 0061
 1D47A 0061
@@ -48319,7 +48360,6 @@ FF53 0062
 24E2 0062
 0053 0062
 FF33 0062
-1F1F8 0062
 1D412 0062
 1D446 0062
 1D47A 0062
@@ -48567,7 +48607,6 @@ FF54 0021
 24E3 0021
 0054 0021
 FF34 0021
-1F1F9 0021
 1D413 0021
 1D447 0021
 1D47B 0021
@@ -48624,7 +48663,6 @@ FF54 003F
 24E3 003F
 0054 003F
 FF34 003F
-1F1F9 003F
 1D413 003F
 1D447 003F
 1D47B 003F
@@ -48700,8 +48738,6 @@ FF54 0041
 0054 0041
 FF34 0061
 FF34 0041
-1F1F9 0061
-1F1F9 0041
 1D413 0061
 1D447 0061
 1D47B 0061
@@ -48795,7 +48831,6 @@ FF54 0062
 24E3 0062
 0054 0062
 FF34 0062
-1F1F9 0062
 1D413 0062
 1D447 0062
 1D47B 0062
@@ -49185,7 +49220,6 @@ FF55 0021
 24E4 0021
 0055 0021
 FF35 0021
-1F1FA 0021
 1D414 0021
 1D448 0021
 1D47C 0021
@@ -49285,7 +49319,6 @@ FF55 003F
 24E4 003F
 0055 003F
 FF35 003F
-1F1FA 003F
 1D414 003F
 1D448 003F
 1D47C 003F
@@ -49404,8 +49437,6 @@ FF55 0041
 0055 0041
 FF35 0061
 FF35 0041
-1F1FA 0061
-1F1FA 0041
 1D414 0061
 1D448 0061
 1D47C 0061
@@ -49585,7 +49616,6 @@ FF55 0062
 24E4 0062
 0055 0062
 FF35 0062
-1F1FA 0062
 1D414 0062
 1D448 0062
 1D47C 0062
@@ -49841,7 +49871,6 @@ FF56 0021
 0056 0021
 FF36 0021
 2164 0021
-1F1FB 0021
 1D415 0021
 1D449 0021
 1D47D 0021
@@ -49887,7 +49916,6 @@ FF56 003F
 0056 003F
 FF36 003F
 2164 003F
-1F1FB 003F
 1D415 003F
 1D449 003F
 1D47D 003F
@@ -49958,9 +49986,7 @@ FF56 0041
 FF36 0061
 FF36 0041
 2164 0061
-1F1FB 0061
 2164 0041
-1F1FB 0041
 1D415 0061
 1D449 0061
 1D47D 0061
@@ -50030,7 +50056,6 @@ FF56 0062
 0056 0062
 FF36 0062
 2164 0062
-1F1FB 0062
 1D415 0062
 1D449 0062
 1D47D 0062
@@ -50231,7 +50256,6 @@ FF57 0021
 24E6 0021
 0057 0021
 FF37 0021
-1F1FC 0021
 1D416 0021
 1D44A 0021
 1D47E 0021
@@ -50282,7 +50306,6 @@ FF57 003F
 24E6 003F
 0057 003F
 FF37 003F
-1F1FC 003F
 1D416 003F
 1D44A 003F
 1D47E 003F
@@ -50351,8 +50374,6 @@ FF57 0041
 0057 0041
 FF37 0061
 FF37 0041
-1F1FC 0061
-1F1FC 0041
 1D416 0061
 1D44A 0061
 1D47E 0061
@@ -50435,7 +50456,6 @@ FF57 0062
 24E6 0062
 0057 0062
 FF37 0062
-1F1FC 0062
 1D416 0062
 1D44A 0062
 1D47E 0062
@@ -50543,7 +50563,6 @@ FF58 0021
 0058 0021
 FF38 0021
 2169 0021
-1F1FD 0021
 1D417 0021
 1D44B 0021
 1D47F 0021
@@ -50588,7 +50607,6 @@ FF58 003F
 0058 003F
 FF38 003F
 2169 003F
-1F1FD 003F
 1D417 003F
 1D44B 003F
 1D47F 003F
@@ -50653,9 +50671,7 @@ FF58 0041
 FF38 0061
 FF38 0041
 2169 0061
-1F1FD 0061
 2169 0041
-1F1FD 0041
 1D417 0061
 1D44B 0061
 1D47F 0061
@@ -50723,7 +50739,6 @@ FF58 0062
 0058 0062
 FF38 0062
 2169 0062
-1F1FD 0062
 1D417 0062
 1D44B 0062
 1D47F 0062
@@ -50851,7 +50866,6 @@ FF59 0021
 24E8 0021
 0059 0021
 FF39 0021
-1F1FE 0021
 1D418 0021
 1D44C 0021
 1D480 0021
@@ -50907,7 +50921,6 @@ FF59 003F
 24E8 003F
 0059 003F
 FF39 003F
-1F1FE 003F
 1D418 003F
 1D44C 003F
 1D480 003F
@@ -50981,8 +50994,6 @@ FF59 0041
 0059 0041
 FF39 0061
 FF39 0041
-1F1FE 0061
-1F1FE 0041
 1D418 0061
 1D44C 0061
 1D480 0061
@@ -51075,7 +51086,6 @@ FF59 0062
 24E8 0062
 0059 0062
 FF39 0062
-1F1FE 0062
 1D418 0062
 1D44C 0062
 1D480 0062
@@ -51217,7 +51227,6 @@ FF5A 0021
 24E9 0021
 005A 0021
 FF3A 0021
-1F1FF 0021
 2124 0021
 2128 0021
 1D419 0021
@@ -51267,7 +51276,6 @@ FF5A 003F
 24E9 003F
 005A 003F
 FF3A 003F
-1F1FF 003F
 2124 003F
 2128 003F
 1D419 003F
@@ -51336,8 +51344,6 @@ FF5A 0041
 005A 0041
 FF3A 0061
 FF3A 0041
-1F1FF 0061
-1F1FF 0041
 2124 0061
 2128 0061
 1D419 0061
@@ -51417,7 +51423,6 @@ FF5A 0062
 24E9 0062
 005A 0062
 FF3A 0062
-1F1FF 0062
 2124 0062
 2128 0062
 1D419 0062
@@ -56632,15 +56637,15 @@ A724 0062
 0410 0306 003F
 04D0 003F
 0430 0306 0061
+04D1 0061
 0430 0591 0306 0061
 0430 1D165 0306 0061
-04D1 0061
 0430 0306 0041
 04D1 0041
 0410 0306 0061
+04D0 0061
 0410 0591 0306 0061
 0410 1D165 0306 0061
-04D0 0061
 0410 0306 0041
 04D0 0041
 0430 0306 0062
@@ -56662,15 +56667,15 @@ A724 0062
 0410 0308 003F
 04D2 003F
 0430 0308 0061
+04D3 0061
 0430 0591 0308 0061
 0430 1D165 0308 0061
-04D3 0061
 0430 0308 0041
 04D3 0041
 0410 0308 0061
+04D2 0061
 0410 0591 0308 0061
 0410 1D165 0308 0061
-04D2 0061
 0410 0308 0041
 04D2 0041
 0430 0308 0062
@@ -56704,15 +56709,15 @@ A724 0062
 04D8 0308 003F
 04DA 003F
 04D9 0308 0061
+04DB 0061
 04D9 0591 0308 0061
 04D9 1D165 0308 0061
-04DB 0061
 04D9 0308 0041
 04DB 0041
 04D8 0308 0061
+04DA 0061
 04D8 0591 0308 0061
 04D8 1D165 0308 0061
-04DA 0061
 04D8 0308 0041
 04DA 0041
 04D9 0308 0062
@@ -56923,11 +56928,11 @@ A662 0062
 0413 0341 003F
 0433 0301 0061
 0433 0341 0061
+0453 0061
 0433 0591 0301 0061
 0433 0591 0341 0061
 0433 1D165 0301 0061
 0433 1D165 0341 0061
-0453 0061
 0433 0301 0041
 0433 0341 0041
 0453 0041
@@ -57025,15 +57030,15 @@ A662 0062
 0415 0306 003F
 04D6 003F
 0435 0306 0061
+04D7 0061
 0435 0591 0306 0061
 0435 1D165 0306 0061
-04D7 0061
 0435 0306 0041
 04D7 0041
 0415 0306 0061
+04D6 0061
 0415 0591 0306 0061
 0415 1D165 0306 0061
-04D6 0061
 0415 0306 0041
 04D6 0041
 0435 0306 0062
@@ -57117,15 +57122,15 @@ A684 0062
 0416 0308 003F
 04DC 003F
 0436 0308 0061
+04DD 0061
 0436 0591 0308 0061
 0436 1D165 0308 0061
-04DD 0061
 0436 0308 0041
 04DD 0041
 0416 0308 0061
+04DC 0061
 0416 0591 0308 0061
 0416 1D165 0308 0061
-04DC 0061
 0416 0308 0041
 04DC 0041
 0436 0308 0062
@@ -57206,15 +57211,15 @@ A640 0062
 0417 0308 003F
 04DE 003F
 0437 0308 0061
+04DF 0061
 0437 0591 0308 0061
 0437 1D165 0308 0061
-04DF 0061
 0437 0308 0041
 04DF 0041
 0417 0308 0061
+04DE 0061
 0417 0591 0308 0061
 0417 1D165 0308 0061
-04DE 0061
 0417 0308 0041
 04DE 0041
 0437 0308 0062
@@ -57371,15 +57376,15 @@ A675 0062
 0418 0308 003F
 04E4 003F
 0438 0308 0061
+04E5 0061
 0438 0591 0308 0061
 0438 1D165 0308 0061
-04E5 0061
 0438 0308 0041
 04E5 0041
 0418 0308 0061
+04E4 0061
 0418 0591 0308 0061
 0418 1D165 0308 0061
-04E4 0061
 0418 0308 0041
 04E4 0041
 0438 0308 0062
@@ -57427,17 +57432,17 @@ A676 003F
 0406 0308 003F
 0407 003F
 0456 0308 0061
+0457 0061
 0456 0591 0308 0061
 0456 1D165 0308 0061
-0457 0061
 0456 0308 0041
 0457 0041
 A676 0061
 A676 0041
 0406 0308 0061
+0407 0061
 0406 0591 0308 0061
 0406 1D165 0308 0061
-0407 0061
 0406 0308 0041
 0407 0041
 0456 0308 0062
@@ -57460,15 +57465,15 @@ A676 0062
 0418 0306 003F
 0419 003F
 0438 0306 0061
+0439 0061
 0438 0591 0306 0061
 0438 1D165 0306 0061
-0439 0061
 0438 0306 0041
 0439 0041
 0418 0306 0061
+0419 0061
 0418 0591 0306 0061
 0418 1D165 0306 0061
-0419 0061
 0418 0306 0041
 0419 0041
 0438 0306 0062
@@ -57883,15 +57888,15 @@ A66C 0062
 041E 0308 003F
 04E6 003F
 043E 0308 0061
+04E7 0061
 043E 0591 0308 0061
 043E 1D165 0308 0061
-04E7 0061
 043E 0308 0041
 04E7 0041
 041E 0308 0061
+04E6 0061
 041E 0591 0308 0061
 041E 1D165 0308 0061
-04E6 0061
 041E 0308 0041
 04E6 0041
 043E 0308 0062
@@ -57925,15 +57930,15 @@ A66C 0062
 04E8 0308 003F
 04EA 003F
 04E9 0308 0061
+04EB 0061
 04E9 0591 0308 0061
 04E9 1D165 0308 0061
-04EB 0061
 04E9 0308 0041
 04EB 0041
 04E8 0308 0061
+04EA 0061
 04E8 0591 0308 0061
 04E8 1D165 0308 0061
-04EA 0061
 04E8 0308 0041
 04EA 0041
 04E9 0308 0062
@@ -58157,11 +58162,11 @@ A68A 0062
 041A 0341 003F
 043A 0301 0061
 043A 0341 0061
+045C 0061
 043A 0591 0301 0061
 043A 0591 0341 0061
 043A 1D165 0301 0061
 043A 1D165 0341 0061
-045C 0061
 043A 0301 0041
 043A 0341 0041
 045C 0041
@@ -58235,9 +58240,9 @@ A677 0062
 040E 003F
 0423 0306 003F
 0443 0306 0061
+045E 0061
 0443 0591 0306 0061
 0443 1D165 0306 0061
-045E 0061
 0443 0306 0041
 045E 0041
 040E 0061
@@ -58265,15 +58270,15 @@ A677 0062
 0423 0308 003F
 04F0 003F
 0443 0308 0061
+04F1 0061
 0443 0591 0308 0061
 0443 1D165 0308 0061
-04F1 0061
 0443 0308 0041
 04F1 0041
 0423 0308 0061
+04F0 0061
 0423 0591 0308 0061
 0423 1D165 0308 0061
-04F0 0061
 0423 0308 0041
 04F0 0041
 0443 0308 0062
@@ -58295,15 +58300,15 @@ A677 0062
 0423 030B 003F
 04F2 003F
 0443 030B 0061
+04F3 0061
 0443 0591 030B 0061
 0443 1D165 030B 0061
-04F3 0061
 0443 030B 0041
 04F3 0041
 0423 030B 0061
+04F2 0061
 0423 0591 030B 0061
 0423 1D165 030B 0061
-04F2 0061
 0423 030B 0041
 04F2 0041
 0443 030B 0062
@@ -58602,15 +58607,15 @@ A692 0062
 0427 0308 003F
 04F4 003F
 0447 0308 0061
+04F5 0061
 0447 0591 0308 0061
 0447 1D165 0308 0061
-04F5 0061
 0447 0308 0041
 04F5 0041
 0427 0308 0061
+04F4 0061
 0427 0591 0308 0061
 0427 1D165 0308 0061
-04F4 0061
 0427 0308 0041
 04F4 0041
 0447 0308 0062
@@ -58812,15 +58817,15 @@ A679 0062
 042B 0308 003F
 04F8 003F
 044B 0308 0061
+04F9 0061
 044B 0591 0308 0061
 044B 1D165 0308 0061
-04F9 0061
 044B 0308 0041
 04F9 0041
 042B 0308 0061
+04F8 0061
 042B 0591 0308 0061
 042B 1D165 0308 0061
-04F8 0061
 042B 0308 0041
 04F8 0041
 044B 0308 0062
@@ -58908,15 +58913,15 @@ A652 0062
 042D 0308 003F
 04EC 003F
 044D 0308 0061
+04ED 0061
 044D 0591 0308 0061
 044D 1D165 0308 0061
-04ED 0061
 044D 0308 0041
 04ED 0041
 042D 0308 0061
+04EC 0061
 042D 0591 0308 0061
 042D 1D165 0308 0061
-04EC 0061
 042D 0308 0041
 04EC 0041
 044D 0308 0062
@@ -59159,15 +59164,15 @@ A65C 0062
 0474 030F 003F
 0476 003F
 0475 030F 0061
+0477 0061
 0475 0591 030F 0061
 0475 1D165 030F 0061
-0477 0061
 0475 030F 0041
 0477 0041
 0474 030F 0061
+0476 0061
 0474 0591 030F 0061
 0474 1D165 030F 0061
-0476 0061
 0474 030F 0041
 0476 0041
 0475 030F 0062
@@ -61505,8 +61510,8 @@ FE81 0021
 0627 0653 003F
 FE82 003F
 FE81 003F
-0622 0061
 0627 0591 0653 0061
+0622 0061
 0627 0653 0061
 0627 1D165 0653 0061
 0622 0041
@@ -61530,8 +61535,8 @@ FE83 0021
 0627 0654 003F
 FE84 003F
 FE83 003F
-0623 0061
 0627 0591 0654 0061
+0623 0061
 0627 0654 0061
 0627 1D165 0654 0061
 0623 0041
@@ -61575,8 +61580,8 @@ FE85 0021
 0648 0654 003F
 FE86 003F
 FE85 003F
-0624 0061
 0648 0591 0654 0061
+0624 0061
 0648 0654 0061
 0648 1D165 0654 0061
 0624 0041
@@ -61643,8 +61648,8 @@ FE8B 003F
 FE8C 003F
 FE8A 003F
 FE89 003F
-0626 0061
 064A 0591 0654 0061
+0626 0061
 064A 0654 0061
 064A 1D165 0654 0061
 0626 0041
@@ -72796,10 +72801,10 @@ A8FB 0062
 0C48 0021
 0C46 0C56 003F
 0C48 003F
-0C46 0591 0C56 0061
 0C46 0C56 0061
-0C46 1D165 0C56 0061
 0C48 0061
+0C46 0591 0C56 0061
+0C46 1D165 0C56 0061
 0C46 0C56 0041
 0C48 0041
 0C46 0C56 0062
@@ -73216,10 +73221,10 @@ A8FB 0062
 0CC6 0CC2 0062
 0CCA 0062
 0CC6 0CC2 0001 0CD5 0061
-0CC6 0CC2 0591 0CD5 0061
-0CC6 0CC2 1D165 0CD5 0061
 0CCA 0001 0CD5 0061
+0CC6 0CC2 0591 0CD5 0061
 0CCA 0591 0CD5 0061
+0CC6 0CC2 1D165 0CD5 0061
 0CCA 1D165 0CD5 0061
 0CC6 0CC2 0CD5 0021
 0CCA 0CD5 0021
@@ -74051,10 +74056,10 @@ A8FB 0062
 0DDA 0021
 0DD9 0DCA 003F
 0DDA 003F
-0DD9 0591 0DCA 0061
 0DD9 0DCA 0061
-0DD9 1D165 0DCA 0061
 0DDA 0061
+0DD9 0591 0DCA 0061
+0DD9 1D165 0DCA 0061
 0DD9 0DCA 0041
 0DDA 0041
 0DD9 0DCA 0062
@@ -74086,13 +74091,13 @@ A8FB 0062
 0DD9 0DCF 0DCA 003F
 0DDC 0DCA 003F
 0DDD 003F
-0DD9 0DCF 0591 0DCA 0061
 0DD9 0DCF 0DCA 0061
-0DD9 0DCF 1D165 0DCA 0061
-0DDC 0591 0DCA 0061
 0DDC 0DCA 0061
-0DDC 1D165 0DCA 0061
 0DDD 0061
+0DD9 0DCF 0591 0DCA 0061
+0DDC 0591 0DCA 0061
+0DD9 0DCF 1D165 0DCA 0061
+0DDC 1D165 0DCA 0061
 0DD9 0DCF 0DCA 0041
 0DDC 0DCA 0041
 0DDD 0041
@@ -78846,6 +78851,31 @@ A8C4 0062
 0EDE 0061
 0EDE 0041
 0EDE 0062
+0EC0 0EDE 0021
+0EC0 0EDE 003F
+0EC0 0EDE 0061
+0EC0 0EDE 0041
+0EC0 0EDE 0062
+0EC1 0EDE 0021
+0EC1 0EDE 003F
+0EC1 0EDE 0061
+0EC1 0EDE 0041
+0EC1 0EDE 0062
+0EC2 0EDE 0021
+0EC2 0EDE 003F
+0EC2 0EDE 0061
+0EC2 0EDE 0041
+0EC2 0EDE 0062
+0EC3 0EDE 0021
+0EC3 0EDE 003F
+0EC3 0EDE 0061
+0EC3 0EDE 0041
+0EC3 0EDE 0062
+0EC4 0EDE 0021
+0EC4 0EDE 003F
+0EC4 0EDE 0061
+0EC4 0EDE 0041
+0EC4 0EDE 0062
 0E81 0021
 0E81 003F
 0E81 0061
@@ -79061,6 +79091,31 @@ A8C4 0062
 0EDF 0061
 0EDF 0041
 0EDF 0062
+0EC0 0EDF 0021
+0EC0 0EDF 003F
+0EC0 0EDF 0061
+0EC0 0EDF 0041
+0EC0 0EDF 0062
+0EC1 0EDF 0021
+0EC1 0EDF 003F
+0EC1 0EDF 0061
+0EC1 0EDF 0041
+0EC1 0EDF 0062
+0EC2 0EDF 0021
+0EC2 0EDF 003F
+0EC2 0EDF 0061
+0EC2 0EDF 0041
+0EC2 0EDF 0062
+0EC3 0EDF 0021
+0EC3 0EDF 003F
+0EC3 0EDF 0061
+0EC3 0EDF 0041
+0EC3 0EDF 0062
+0EC4 0EDF 0021
+0EC4 0EDF 003F
+0EC4 0EDF 0061
+0EC4 0EDF 0041
+0EC4 0EDF 0062
 0E8D 0021
 0E8D 003F
 0E8D 0061
@@ -79808,6 +79863,9 @@ A8C4 0062
 0EC0 0061
 0EC0 0041
 0EC0 0062
+0EC0 0001 0EDE 0061
+0EC0 0591 0EDE 0061
+0EC0 1D165 0EDE 0061
 0EC0 0001 0E81 0061
 0EC0 0591 0E81 0061
 0EC0 1D165 0E81 0061
@@ -79829,6 +79887,9 @@ A8C4 0062
 0EC0 0001 0E8A 0061
 0EC0 0591 0E8A 0061
 0EC0 1D165 0E8A 0061
+0EC0 0001 0EDF 0061
+0EC0 0591 0EDF 0061
+0EC0 1D165 0EDF 0061
 0EC0 0001 0E8D 0061
 0EC0 0591 0E8D 0061
 0EC0 1D165 0E8D 0061
@@ -79900,6 +79961,9 @@ A8C4 0062
 0EC1 0061
 0EC1 0041
 0EC1 0062
+0EC1 0001 0EDE 0061
+0EC1 0591 0EDE 0061
+0EC1 1D165 0EDE 0061
 0EC1 0001 0E81 0061
 0EC1 0591 0E81 0061
 0EC1 1D165 0E81 0061
@@ -79921,6 +79985,9 @@ A8C4 0062
 0EC1 0001 0E8A 0061
 0EC1 0591 0E8A 0061
 0EC1 1D165 0E8A 0061
+0EC1 0001 0EDF 0061
+0EC1 0591 0EDF 0061
+0EC1 1D165 0EDF 0061
 0EC1 0001 0E8D 0061
 0EC1 0591 0E8D 0061
 0EC1 1D165 0E8D 0061
@@ -79992,6 +80059,9 @@ A8C4 0062
 0EC2 0061
 0EC2 0041
 0EC2 0062
+0EC2 0001 0EDE 0061
+0EC2 0591 0EDE 0061
+0EC2 1D165 0EDE 0061
 0EC2 0001 0E81 0061
 0EC2 0591 0E81 0061
 0EC2 1D165 0E81 0061
@@ -80013,6 +80083,9 @@ A8C4 0062
 0EC2 0001 0E8A 0061
 0EC2 0591 0E8A 0061
 0EC2 1D165 0E8A 0061
+0EC2 0001 0EDF 0061
+0EC2 0591 0EDF 0061
+0EC2 1D165 0EDF 0061
 0EC2 0001 0E8D 0061
 0EC2 0591 0E8D 0061
 0EC2 1D165 0E8D 0061
@@ -80084,6 +80157,9 @@ A8C4 0062
 0EC3 0061
 0EC3 0041
 0EC3 0062
+0EC3 0001 0EDE 0061
+0EC3 0591 0EDE 0061
+0EC3 1D165 0EDE 0061
 0EC3 0001 0E81 0061
 0EC3 0591 0E81 0061
 0EC3 1D165 0E81 0061
@@ -80105,6 +80181,9 @@ A8C4 0062
 0EC3 0001 0E8A 0061
 0EC3 0591 0E8A 0061
 0EC3 1D165 0E8A 0061
+0EC3 0001 0EDF 0061
+0EC3 0591 0EDF 0061
+0EC3 1D165 0EDF 0061
 0EC3 0001 0E8D 0061
 0EC3 0591 0E8D 0061
 0EC3 1D165 0E8D 0061
@@ -80176,6 +80255,9 @@ A8C4 0062
 0EC4 0061
 0EC4 0041
 0EC4 0062
+0EC4 0001 0EDE 0061
+0EC4 0591 0EDE 0061
+0EC4 1D165 0EDE 0061
 0EC4 0001 0E81 0061
 0EC4 0591 0E81 0061
 0EC4 1D165 0E81 0061
@@ -80197,6 +80279,9 @@ A8C4 0062
 0EC4 0001 0E8A 0061
 0EC4 0591 0E8A 0061
 0EC4 1D165 0E8A 0061
+0EC4 0001 0EDF 0061
+0EC4 0591 0EDF 0061
+0EC4 1D165 0EDF 0061
 0EC4 0001 0E8D 0061
 0EC4 0591 0E8D 0061
 0EC4 1D165 0E8D 0061
@@ -82910,15 +82995,61 @@ AADC 0062
 0FB2 0F71 0021
 0FB2 0F71 003F
 0FB2 0001 0F71 0061
-0FB2 0591 0F71 0061
 0FB2 0F71 0061
+0FB2 0591 0F71 0061
 0FB2 1D165 0F71 0061
 0FB2 0F71 0041
 0FB2 0F71 0062
+0FB2 0F71 0001 0F72 0061
 0FB2 0F71 0001 0F80 0061
+0FB2 0F71 0001 0F74 0061
+0FB2 0334 0F72 0F71
+0FB2 0F71 0334 0F72
+0FB2 0F72 0334 0F71
+0FB2 0F72 0F71 0334
+0FB2 0F71 0F72 0021
+0FB2 0F73 0021
+0FB2 0F71 0F72 003F
+0FB2 0F73 003F
+0FB2 0001 0F71 0F72 0061
+0FB2 0001 0F73 0061
+0FB2 0F71 0F72 0061
+0FB2 0F73 0061
+0FB2 0591 0F71 0F72 0061
+0FB2 0591 0F73 0061
+0FB2 0F71 0591 0F72 0061
+0FB2 0F71 1D165 0F72 0061
+0FB2 1D165 0F71 0F72 0061
+0FB2 1D165 0F73 0061
+0FB2 0F71 0F72 0041
+0FB2 0F73 0041
+0FB2 0F71 0F72 0062
+0FB2 0F73 0062
 0FB2 0001 0F80 0061
 0FB2 0001 0F71 0F80 0061
 0FB2 0001 0F81 0061
+0FB2 0334 0F71 0F74
+0FB2 0F71 0334 0F74
+0FB2 0F71 0F74 0334
+0FB2 0F74 0334 0F71
+0FB2 0F71 0F74 0021
+0FB2 0F75 0021
+0FB2 0F71 0F74 003F
+0FB2 0F75 003F
+0FB2 0001 0F71 0F74 0061
+0FB2 0001 0F75 0061
+0FB2 0F71 0F74 0061
+0FB2 0F75 0061
+0FB2 0591 0F71 0F74 0061
+0FB2 0591 0F75 0061
+0FB2 0F71 0591 0F74 0061
+0FB2 0F71 1D165 0F74 0061
+0FB2 1D165 0F71 0F74 0061
+0FB2 1D165 0F75 0061
+0FB2 0F71 0F74 0041
+0FB2 0F75 0041
+0FB2 0F71 0F74 0062
+0FB2 0F75 0062
 0F6C 0021
 0F6C 003F
 0F6C 0061
@@ -82937,15 +83068,61 @@ AADC 0062
 0FB3 0F71 0021
 0FB3 0F71 003F
 0FB3 0001 0F71 0061
-0FB3 0591 0F71 0061
 0FB3 0F71 0061
+0FB3 0591 0F71 0061
 0FB3 1D165 0F71 0061
 0FB3 0F71 0041
 0FB3 0F71 0062
+0FB3 0F71 0001 0F72 0061
 0FB3 0F71 0001 0F80 0061
+0FB3 0F71 0001 0F74 0061
+0FB3 0334 0F71 0F72
+0FB3 0334 0F72 0F71
+0FB3 0334 0F73
+0FB3 0F71 0F72 0334
+0FB3 0F71 0F72 0021
+0FB3 0F73 0021
+0FB3 0F71 0F72 003F
+0FB3 0F73 003F
+0FB3 0001 0F71 0F72 0061
+0FB3 0001 0F73 0061
+0FB3 0F71 0F72 0061
+0FB3 0F73 0061
+0FB3 0591 0F71 0F72 0061
+0FB3 0591 0F73 0061
+0FB3 0F71 0591 0F72 0061
+0FB3 0F71 1D165 0F72 0061
+0FB3 1D165 0F71 0F72 0061
+0FB3 1D165 0F73 0061
+0FB3 0F71 0F72 0041
+0FB3 0F73 0041
+0FB3 0F71 0F72 0062
+0FB3 0F73 0062
 0FB3 0001 0F80 0061
 0FB3 0001 0F71 0F80 0061
 0FB3 0001 0F81 0061
+0FB3 0334 0F71 0F74
+0FB3 0334 0F75
+0FB3 0F71 0334 0F74
+0FB3 0F74 0F71 0334
+0FB3 0F71 0F74 0021
+0FB3 0F75 0021
+0FB3 0F71 0F74 003F
+0FB3 0F75 003F
+0FB3 0001 0F71 0F74 0061
+0FB3 0001 0F75 0061
+0FB3 0F71 0F74 0061
+0FB3 0F75 0061
+0FB3 0591 0F71 0F74 0061
+0FB3 0591 0F75 0061
+0FB3 0F71 0591 0F74 0061
+0FB3 0F71 1D165 0F74 0061
+0FB3 1D165 0F71 0F74 0061
+0FB3 1D165 0F75 0061
+0FB3 0F71 0F74 0041
+0FB3 0F75 0041
+0FB3 0F71 0F74 0062
+0FB3 0F75 0062
 0F64 0021
 0F64 003F
 0F64 0061
@@ -83066,10 +83243,10 @@ AADC 0062
 0F73 0021
 0F71 0F72 003F
 0F73 003F
-0F71 0591 0F72 0061
 0F71 0F72 0061
-0F71 1D165 0F72 0061
 0F73 0061
+0F71 0591 0F72 0061
+0F71 1D165 0F72 0061
 0F71 0F72 0041
 0F73 0041
 0F71 0F72 0062
@@ -83089,10 +83266,10 @@ AADC 0062
 0F81 0021
 0F71 0F80 003F
 0F81 003F
-0F71 0591 0F80 0061
 0F71 0F80 0061
-0F71 1D165 0F80 0061
 0F81 0061
+0F71 0591 0F80 0061
+0F71 1D165 0F80 0061
 0F71 0F80 0041
 0F81 0041
 0F71 0F80 0062
@@ -83112,10 +83289,10 @@ AADC 0062
 0F75 0021
 0F71 0F74 003F
 0F75 003F
-0F71 0591 0F74 0061
 0F71 0F74 0061
-0F71 1D165 0F74 0061
 0F75 0061
+0F71 0591 0F74 0061
+0F71 1D165 0F74 0061
 0F71 0F74 0041
 0F75 0041
 0F71 0F74 0062
@@ -83128,15 +83305,15 @@ AADC 0062
 0F76 003F
 0FB2 0F80 003F
 0F76 0061
-0FB2 0591 0F80 0061
 0FB2 0F80 0061
+0FB2 0591 0F80 0061
 0FB2 1D165 0F80 0061
 0F76 0041
 0FB2 0F80 0041
 0F76 0062
 0FB2 0F80 0062
 0F76 0F71 0334
-# TODO: Fix ICU ticket #8052 -- 0FB2 0334 0F81
+0FB2 0334 0F81
 0FB2 0F80 0334 0F71
 0FB2 0F80 0F71 0334
 0F77 0021
@@ -83146,12 +83323,12 @@ AADC 0062
 0FB2 0F71 0F80 003F
 0FB2 0F81 003F
 0F77 0061
+0FB2 0F71 0F80 0061
+0FB2 0F81 0061
 0FB2 0591 0F71 0F80 0061
 0FB2 0591 0F81 0061
 0FB2 0F71 0591 0F80 0061
-0FB2 0F71 0F80 0061
 0FB2 0F71 1D165 0F80 0061
-0FB2 0F81 0061
 0FB2 1D165 0F71 0F80 0061
 0FB2 1D165 0F81 0061
 0F77 0041
@@ -83168,8 +83345,8 @@ AADC 0062
 0F78 003F
 0FB3 0F80 003F
 0F78 0061
-0FB3 0591 0F80 0061
 0FB3 0F80 0061
+0FB3 0591 0F80 0061
 0FB3 1D165 0F80 0061
 0F78 0041
 0FB3 0F80 0041
@@ -83178,7 +83355,7 @@ AADC 0062
 0F78 0334 0F71
 0F78 0F71 0334
 0FB3 0334 0F71 0F80
-# TODO: Fix ICU ticket #8052 -- 0FB3 0334 0F81
+0FB3 0334 0F81
 0F79 0021
 0FB3 0F71 0F80 0021
 0FB3 0F81 0021
@@ -83186,12 +83363,12 @@ AADC 0062
 0FB3 0F71 0F80 003F
 0FB3 0F81 003F
 0F79 0061
+0FB3 0F71 0F80 0061
+0FB3 0F81 0061
 0FB3 0591 0F71 0F80 0061
 0FB3 0591 0F81 0061
 0FB3 0F71 0591 0F80 0061
-0FB3 0F71 0F80 0061
 0FB3 0F71 1D165 0F80 0061
-0FB3 0F81 0061
 0FB3 1D165 0F71 0F80 0061
 0FB3 1D165 0F81 0061
 0F79 0041
@@ -86204,14 +86381,6 @@ AA76 0062
 11131 0001 11127 0061
 11131 0591 11127 0061
 11131 1D165 11127 0061
-11131 D804 0021
-11131 D804 003F
-11131 0001 D804 0061
-11131 0591 D804 0061
-11131 D804 0061
-# TODO: Fix ICU ticket #8922 -- 11131 1D165 D804 0061
-11131 D804 0041
-11131 D804 0062
 11132 0021
 11132 003F
 11132 0061
@@ -86220,14 +86389,6 @@ AA76 0062
 11132 0001 11127 0061
 11132 0591 11127 0061
 11132 1D165 11127 0061
-11132 D804 0021
-11132 D804 003F
-11132 0001 D804 0061
-11132 0591 D804 0061
-11132 D804 0061
-# TODO: Fix ICU ticket #8922 -- 11132 1D165 D804 0061
-11132 D804 0041
-11132 D804 0062
 0334 11133
 11133 0334
 11133 0021
@@ -99024,8 +99185,8 @@ AC00 003F
 1100 0001 1161 0061
 1100 0591 1161 0061
 1100 1161 0061
-1100 1D165 1161 0061
 AC00 0061
+1100 1D165 1161 0061
 1100 1161 0041
 AC00 0041
 326E 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 b7da7e1b896c09676b1ef703e6f0ecaae419bcac..c155d132c3ab540f5820b2624f79313d612dd50f 100644 (file)
--- 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,11 +1,9 @@
 # File:        CollationTest_CLDR_SHIFTED_SHORT.txt
-# UCA Version: 6.1.0
-# UCD Version: 6.1.0
-# Generated:   2012-01-03, 21:53:28 GMT [MD]
+# UCA Version: 6.2.0
+# UCD Version: 6.2.0
+# Generated:   2012-08-15, 21:43:28 GMT [MD]
 # For a description of the format and usage, see CollationAuxiliary.html
 
-FFFE 0021
-FFFE 003F
 0009 0021
 0009 003F
 000A 0021
@@ -28,8 +26,8 @@ FFFE 003F
 00A0 0021
 1680 0021
 2000 0021
-2001 0021
 2002 0021
+2001 0021
 2003 0021
 2004 0021
 2005 0021
@@ -45,8 +43,8 @@ FFFE 003F
 00A0 003F
 1680 003F
 2000 003F
-2001 003F
 2002 003F
+2001 003F
 2003 003F
 2004 003F
 2005 003F
@@ -3000,289 +2998,344 @@ A67D 003F
 0331 0021
 0331 003F
 0334 0591
+0591 0334
 0334 0592
+0592 0334
 0334 0593
+0593 0334
 0334 0594
+0594 0334
 0334 0595
+0595 0334
 0334 0596
+0596 0334
 0334 0597
+0597 0334
 0334 0598
+0598 0334
 0334 0599
+0599 0334
 0334 059A
+059A 0334
 0334 059B
+059B 0334
 0334 059C
+059C 0334
 0334 059D
+059D 0334
 0334 059E
+059E 0334
 0334 059F
+059F 0334
 0334 05A0
+05A0 0334
 0334 05A1
+05A1 0334
 0334 05A2
+05A2 0334
 0334 05A3
+05A3 0334
 0334 05A4
+05A4 0334
 0334 05A5
+05A5 0334
 0334 05A6
+05A6 0334
 0334 05A7
+05A7 0334
 0334 05A8
+05A8 0334
 0334 05A9
+05A9 0334
 0334 05AA
+05AA 0334
 0334 05AB
+05AB 0334
 0334 05AC
+05AC 0334
 0334 05AD
+05AD 0334
 0334 05AE
+05AE 0334
 0334 05AF
+05AF 0334
 0334 05BD
+05BD 0334
 0334 05C4
+05C4 0334
 0334 05C5
+05C5 0334
 0334 0610
+0610 0334
 0334 0611
+0611 0334
 0334 0612
+0612 0334
 0334 0613
+0613 0334
 0334 0614
+0614 0334
 0334 0615
+0615 0334
 0334 0616
+0616 0334
 0334 0617
+0617 0334
 0334 0618
+0618 0334
 0334 0619
+0619 0334
 0334 061A
+061A 0334
 0334 06D6
+06D6 0334
 0334 06D7
+06D7 0334
 0334 06D8
+06D8 0334
 0334 06D9
+06D9 0334
 0334 06DA
+06DA 0334
 0334 06DB
+06DB 0334
 0334 06DC
+06DC 0334
 0334 06DF
+06DF 0334
 0334 06E0
+06E0 0334
 0334 06E1
+06E1 0334
 0334 06E2
+06E2 0334
 0334 06E3
+06E3 0334
 0334 06E4
+06E4 0334
 0334 06E7
+06E7 0334
 0334 06E8
+06E8 0334
 0334 06EA
+06EA 0334
 0334 06EB
+06EB 0334
 0334 06EC
+06EC 0334
 0334 06ED
+06ED 0334
 0334 0740
+0740 0334
 0334 0743
+0743 0334
 0334 0744
+0744 0334
 0334 0747
+0747 0334
 0334 0748
+0748 0334
 0334 0749
+0749 0334
 0334 074A
+074A 0334
 0334 08EA
+08EA 0334
 0334 08EB
+08EB 0334
 0334 08EC
+08EC 0334
 0334 08ED
+08ED 0334
 0334 08EE
+08EE 0334
 0334 08EF
+08EF 0334
 0334 08F3
+08F3 0334
 0334 0951
+0951 0334
 0334 0952
+0952 0334
 0334 0F18
+0F18 0334
 0334 0F19
+0F19 0334
 0334 0F35
+0F35 0334
 0334 0F37
+0F37 0334
 0334 0F82
+0F82 0334
 0334 0F83
+0F83 0334
 0334 0F86
+0F86 0334
 0334 0F87
+0F87 0334
 0334 0FC6
+0FC6 0334
 0334 1A7F
+1A7F 0334
 0334 1B6B
+1B6B 0334
 0334 1B6C
+1B6C 0334
 0334 1B6D
+1B6D 0334
 0334 1B6E
+1B6E 0334
 0334 1B6F
+1B6F 0334
 0334 1B70
+1B70 0334
 0334 1B71
+1B71 0334
 0334 1B72
+1B72 0334
 0334 1B73
+1B73 0334
 0334 1CD0
+1CD0 0334
 0334 1CD1
+1CD1 0334
 0334 1CD2
+1CD2 0334
 0334 1CD5
+1CD5 0334
 0334 1CD6
+1CD6 0334
 0334 1CD7
+1CD7 0334
 0334 1CD8
+1CD8 0334
 0334 1CD9
+1CD9 0334
 0334 1CDA
+1CDA 0334
 0334 1CDB
+1CDB 0334
 0334 1CDC
+1CDC 0334
 0334 1CDD
+1CDD 0334
 0334 1CDE
+1CDE 0334
 0334 1CDF
+1CDF 0334
 0334 1CE0
+1CE0 0334
 0334 1CF4
+1CF4 0334
 0334 2D7F
+2D7F 0334
 0334 A8E0
+A8E0 0334
 0334 A8E1
+A8E1 0334
 0334 A8E2
+A8E2 0334
 0334 A8E3
+A8E3 0334
 0334 A8E4
+A8E4 0334
 0334 A8E5
+A8E5 0334
 0334 A8E6
+A8E6 0334
 0334 A8E7
+A8E7 0334
 0334 A8E8
+A8E8 0334
 0334 A8E9
+A8E9 0334
 0334 A8EA
+A8EA 0334
 0334 A8EB
+A8EB 0334
 0334 A8EC
+A8EC 0334
 0334 A8ED
+A8ED 0334
 0334 A8EE
+A8EE 0334
 0334 A8EF
+A8EF 0334
 0334 A8F0
+A8F0 0334
 0334 A8F1
+A8F1 0334
 0334 FE21
+FE21 0334
 0334 FE23
+FE23 0334
 0334 FE24
+FE24 0334
 0334 FE25
+FE25 0334
 0334 FE26
+FE26 0334
 0334 1D165
+1D165 0334
 0334 1D166
+1D166 0334
 0334 1D16D
+1D16D 0334
 0334 1D16E
+1D16E 0334
 0334 1D16F
+1D16F 0334
 0334 1D170
+1D170 0334
 0334 1D171
+1D171 0334
 0334 1D172
+1D172 0334
 0334 1D17B
+1D17B 0334
 0334 1D17C
+1D17C 0334
 0334 1D17D
+1D17D 0334
 0334 1D17E
+1D17E 0334
 0334 1D17F
+1D17F 0334
 0334 1D180
+1D180 0334
 0334 1D181
+1D181 0334
 0334 1D182
+1D182 0334
 0334 1D185
+1D185 0334
 0334 1D186
+1D186 0334
 0334 1D187
+1D187 0334
 0334 1D188
+1D188 0334
 0334 1D189
+1D189 0334
 0334 1D18A
+1D18A 0334
 0334 1D18B
+1D18B 0334
 0334 1D1AA
+1D1AA 0334
 0334 1D1AB
+1D1AB 0334
 0334 1D1AC
+1D1AC 0334
 0334 1D1AD
+1D1AD 0334
 0334 1D242
+1D242 0334
 0334 1D243
+1D243 0334
 0334 1D244
-0591 0334
-0592 0334
-0593 0334
-0594 0334
-0595 0334
-0596 0334
-0597 0334
-0598 0334
-0599 0334
-059A 0334
-059B 0334
-059C 0334
-059D 0334
-059E 0334
-059F 0334
-05A0 0334
-05A1 0334
-05A2 0334
-05A3 0334
-05A4 0334
-05A5 0334
-05A6 0334
-05A7 0334
-05A8 0334
-05A9 0334
-05AA 0334
-05AB 0334
-05AC 0334
-05AD 0334
-05AE 0334
-05AF 0334
-05BD 0334
-05C4 0334
-05C5 0334
-0610 0334
-0611 0334
-0612 0334
-0613 0334
-0614 0334
-0615 0334
-0616 0334
-0617 0334
-0618 0334
-0619 0334
-061A 0334
-06D6 0334
-06D7 0334
-06D8 0334
-06D9 0334
-06DA 0334
-06DB 0334
-06DC 0334
-06DF 0334
-06E0 0334
-06E1 0334
-06E2 0334
-06E3 0334
-06E4 0334
-06E7 0334
-06E8 0334
-06EA 0334
-06EB 0334
-06EC 0334
-06ED 0334
-0740 0334
-0743 0334
-0744 0334
-0747 0334
-0748 0334
-0749 0334
-074A 0334
-08EA 0334
-08EB 0334
-08EC 0334
-08ED 0334
-08EE 0334
-08EF 0334
-08F3 0334
-0951 0334
-0952 0334
-0F18 0334
-0F19 0334
-0F35 0334
-0F37 0334
-0F82 0334
-0F83 0334
-0F86 0334
-0F87 0334
-0FC6 0334
-1A7F 0334
-1B6B 0334
-1B6C 0334
-1B6D 0334
-1B6E 0334
-1B6F 0334
-1B70 0334
-1B71 0334
-1B72 0334
-1B73 0334
-1CD0 0334
-1CD1 0334
-1CD2 0334
+1D244 0334
 1CD4 0334
-1CD5 0334
-1CD6 0334
-1CD7 0334
-1CD8 0334
-1CD9 0334
-1CDA 0334
-1CDB 0334
-1CDC 0334
-1CDD 0334
-1CDE 0334
-1CDF 0334
-1CE0 0334
 1CE2 0334
 1CE3 0334
 1CE4 0334
@@ -3290,43 +3343,10 @@ A67D 003F
 1CE6 0334
 1CE7 0334
 1CE8 0334
-1CF4 0334
-2D7F 0334
-A8E0 0334
-A8E1 0334
-A8E2 0334
-A8E3 0334
-A8E4 0334
-A8E5 0334
-A8E6 0334
-A8E7 0334
-A8E8 0334
-A8E9 0334
-A8EA 0334
-A8EB 0334
-A8EC 0334
-A8ED 0334
-A8EE 0334
-A8EF 0334
-A8F0 0334
-A8F1 0334
-FE21 0334
-FE23 0334
-FE24 0334
-FE25 0334
-FE26 0334
 110BD 0334
-1D165 0334
-1D166 0334
 1D167 0334
 1D168 0334
 1D169 0334
-1D16D 0334
-1D16E 0334
-1D16F 0334
-1D170 0334
-1D171 0334
-1D172 0334
 1D173 0334
 1D174 0334
 1D175 0334
@@ -3335,28 +3355,6 @@ FE26 0334
 1D178 0334
 1D179 0334
 1D17A 0334
-1D17B 0334
-1D17C 0334
-1D17D 0334
-1D17E 0334
-1D17F 0334
-1D180 0334
-1D181 0334
-1D182 0334
-1D185 0334
-1D186 0334
-1D187 0334
-1D188 0334
-1D189 0334
-1D18A 0334
-1D18B 0334
-1D1AA 0334
-1D1AB 0334
-1D1AC 0334
-1D1AD 0334
-1D242 0334
-1D243 0334
-1D244 0334
 E0001 0334
 E0020 0334
 E0021 0334
@@ -3701,28 +3699,28 @@ E01EF 0334
 0313 0334
 0334 0313
 0334 0343
-0334 0486
-0334 2CF1
 0343 0334
+0334 0486
 0486 0334
+0334 2CF1
 2CF1 0334
 0314 0334
 0334 0314
 0334 0485
-0334 2CF0
 0485 0334
+0334 2CF0
 2CF0 0334
 0301 0334
 0334 0301
 0334 0341
-0334 0954
 0341 0334
+0334 0954
 0954 0334
 0300 0334
 0334 0300
 0334 0340
-0334 0953
 0340 0334
+0334 0953
 0953 0334
 0306 0334
 0334 0306
@@ -3753,186 +3751,186 @@ E01EF 0334
 0304 0334
 0334 0304
 030D 0334
-030E 0334
-0312 0334
-0315 0334
-031A 0334
 0334 030D
+030E 0334
 0334 030E
+0312 0334
 0334 0312
+0315 0334
 0334 0315
+031A 0334
 0334 031A
 0334 033D
-0334 033E
-0334 033F
-0334 0346
-0334 034A
-0334 034B
-0334 034C
-0334 0350
-0334 0351
-0334 0352
-0334 0357
-0334 035B
-0334 035D
-0334 035E
-0334 0484
-0334 0487
-0334 0741
-0334 0745
-0334 17DD
-0334 1DC0
-0334 1DC1
-0334 1DC3
-0334 1DC4
-0334 1DC5
-0334 1DC6
-0334 1DC7
-0334 1DC8
-0334 1DC9
-0334 1DCB
-0334 1DCC
-0334 1DCD
-0334 1DCE
-0334 1DD1
-0334 1DFE
-0334 20F0
-0334 2CEF
-0334 A67C
-0334 A67D
 033D 0334
+0334 033E
 033E 0334
+0334 033F
 033F 0334
+0334 0346
 0346 0334
+0334 034A
 034A 0334
+0334 034B
 034B 0334
+0334 034C
 034C 0334
+0334 0350
 0350 0334
+0334 0351
 0351 0334
+0334 0352
 0352 0334
+0334 0357
 0357 0334
+0334 035B
 035B 0334
+0334 035D
 035D 0334
+0334 035E
 035E 0334
+0334 0484
 0484 0334
+0334 0487
 0487 0334
+0334 0741
 0741 0334
+0334 0745
 0745 0334
+0334 17DD
 17DD 0334
+0334 1DC0
 1DC0 0334
+0334 1DC1
 1DC1 0334
+0334 1DC3
 1DC3 0334
+0334 1DC4
 1DC4 0334
+0334 1DC5
 1DC5 0334
+0334 1DC6
 1DC6 0334
+0334 1DC7
 1DC7 0334
+0334 1DC8
 1DC8 0334
+0334 1DC9
 1DC9 0334
+0334 1DCB
 1DCB 0334
+0334 1DCC
 1DCC 0334
+0334 1DCD
 1DCD 0334
+0334 1DCE
 1DCE 0334
+0334 1DD1
 1DD1 0334
+0334 1DFE
 1DFE 0334
+0334 20F0
 20F0 0334
+0334 2CEF
 2CEF 0334
+0334 A67C
 A67C 0334
+0334 A67D
 A67D 0334
 0316 0334
-0317 0334
-0318 0334
-0319 0334
-031C 0334
-031D 0334
-031E 0334
-031F 0334
-0320 0334
-0329 0334
-032A 0334
-032B 0334
-032C 0334
-032F 0334
-0333 0334
 0334 0316
+0317 0334
 0334 0317
+0318 0334
 0334 0318
+0319 0334
 0334 0319
+031C 0334
 0334 031C
+031D 0334
 0334 031D
+031E 0334
 0334 031E
+031F 0334
 0334 031F
+0320 0334
 0334 0320
+0329 0334
 0334 0329
+032A 0334
 0334 032A
+032B 0334
 0334 032B
+032C 0334
 0334 032C
+032F 0334
 0334 032F
+0333 0334
 0334 0333
 0334 033A
-0334 033B
-0334 033C
-0334 0347
-0334 0348
-0334 0349
-0334 034D
-0334 034E
-0334 0353
-0334 0354
-0334 0355
-0334 0356
-0334 0359
-0334 035A
-0334 035C
-0334 035F
-0334 0362
-0334 0742
-0334 0746
-0334 0859
-0334 085A
-0334 085B
-0334 1DC2
-0334 1DCF
-0334 1DD0
-0334 1DFC
-0334 1DFD
-0334 1DFF
-0334 20EC
-0334 20ED
-0334 20EE
-0334 20EF
-0334 10A0D
 033A 0334
+0334 033B
 033B 0334
+0334 033C
 033C 0334
+0334 0347
 0347 0334
+0334 0348
 0348 0334
+0334 0349
 0349 0334
+0334 034D
 034D 0334
+0334 034E
 034E 0334
+0334 0353
 0353 0334
+0334 0354
 0354 0334
+0334 0355
 0355 0334
+0334 0356
 0356 0334
+0334 0359
 0359 0334
+0334 035A
 035A 0334
+0334 035C
 035C 0334
+0334 035F
 035F 0334
+0334 0362
 0362 0334
+0334 0742
 0742 0334
+0334 0746
 0746 0334
+0334 0859
 0859 0334
+0334 085A
 085A 0334
+0334 085B
 085B 0334
+0334 1DC2
 1DC2 0334
+0334 1DCF
 1DCF 0334
+0334 1DD0
 1DD0 0334
+0334 1DFC
 1DFC 0334
+0334 1DFD
 1DFD 0334
+0334 1DFF
 1DFF 0334
+0334 20EC
 20EC 0334
+0334 20ED
 20ED 0334
+0334 20EE
 20EE 0334
+0334 20EF
 20EF 0334
+0334 10A0D
 10A0D 0334
 0305 0334
 0334 0305
@@ -3974,12 +3972,12 @@ A67D 0334
 0334 0358
 0358 0334
 0334 0360
-0334 FE22
 0360 0334
+0334 FE22
 FE22 0334
 0334 0361
-0334 FE20
 0361 0334
+0334 FE20
 FE20 0334
 0334 0483
 0483 0334
@@ -4002,12 +4000,12 @@ A66F 0334
 0334 05B7
 05B7 0334
 0334 05B8
-0334 05C7
 05B8 0334
+0334 05C7
 05C7 0334
 0334 05B9
-0334 05BA
 05B9 0334
+0334 05BA
 05BA 0334
 0334 05BB
 05BB 0334
@@ -4022,30 +4020,30 @@ A66F 0334
 0334 FB1E
 FB1E 0334
 0334 081C
-0334 081D
 081C 0334
+0334 081D
 081D 0334
 0334 081E
-0334 081F
-0334 0820
 081E 0334
+0334 081F
 081F 0334
+0334 0820
 0820 0334
 0334 0821
-0334 0822
-0334 0823
 0821 0334
+0334 0822
 0822 0334
+0334 0823
 0823 0334
 0334 0825
 0825 0334
 0334 0826
-0334 0827
 0826 0334
+0334 0827
 0827 0334
 0334 0829
-0334 082A
 0829 0334
+0334 082A
 082A 0334
 0334 082B
 082B 0334
@@ -4204,38 +4202,38 @@ A6F0 0334
 0334 A6F1
 A6F1 0334
 0334 093C
-0334 09BC
-0334 0A3C
-0334 0ABC
-0334 0B3C
-0334 0CBC
-0334 1B34
-0334 1BE6
-0334 1C37
-0334 A9B3
-0334 110BA
-0334 116B7
 093C 0334
+0334 09BC
 09BC 0334
+0334 0A3C
 0A3C 0334
+0334 0ABC
 0ABC 0334
+0334 0B3C
 0B3C 0334
+0334 0CBC
 0CBC 0334
+0334 1B34
 1B34 0334
+0334 1BE6
 1BE6 0334
+0334 1C37
 1C37 0334
+0334 A9B3
 A9B3 0334
+0334 110BA
 110BA 0334
+0334 116B7
 116B7 0334
 0334 11100
 11100 0334
 0334 1CED
-0334 11101
 1CED 0334
+0334 11101
 11101 0334
 0334 10A0F
-0334 11102
 10A0F 0334
+0334 11102
 11102 0334
 0334 10A38
 10A38 0334
@@ -4936,6 +4934,11 @@ FF9F 003F
 20E9 003F
 101FD 0021
 101FD 003F
+FFFE 0021
+FFFE 003F
+FFFE 0061
+FFFE 0041
+FFFE 0062
 0060 0021
 1FEF 0021
 0060 003F
@@ -4952,20 +4955,20 @@ FF40 0041
 1FEF 0062
 FF40 0062
 00B4 0021
-0384 0021
 1FFD 0021
+0384 0021
 00B4 003F
-0384 003F
 1FFD 003F
+0384 003F
 00B4 0061
-0384 0061
 1FFD 0061
+0384 0061
 00B4 0041
-0384 0041
 1FFD 0041
+0384 0041
 00B4 0062
-0384 0062
 1FFD 0062
+0384 0062
 02DC 0021
 02DC 003F
 02DC 0061
@@ -12609,6 +12612,162 @@ FFEE 0062
 26FF 0061
 26FF 0041
 26FF 0062
+1F1E6 0021
+1F1E6 003F
+1F1E6 0334
+1F1E6 0061
+1F1E6 0041
+1F1E6 0062
+1F1E7 0021
+1F1E7 003F
+1F1E7 0334
+1F1E7 0061
+1F1E7 0041
+1F1E7 0062
+1F1E8 0021
+1F1E8 003F
+1F1E8 0334
+1F1E8 0061
+1F1E8 0041
+1F1E8 0062
+1F1E9 0021
+1F1E9 003F
+1F1E9 0334
+1F1E9 0061
+1F1E9 0041
+1F1E9 0062
+1F1EA 0021
+1F1EA 003F
+1F1EA 0334
+1F1EA 0061
+1F1EA 0041
+1F1EA 0062
+1F1EB 0021
+1F1EB 003F
+1F1EB 0334
+1F1EB 0061
+1F1EB 0041
+1F1EB 0062
+1F1EC 0021
+1F1EC 003F
+1F1EC 0334
+1F1EC 0061
+1F1EC 0041
+1F1EC 0062
+1F1ED 0021
+1F1ED 003F
+1F1ED 0334
+1F1ED 0061
+1F1ED 0041
+1F1ED 0062
+1F1EE 0021
+1F1EE 003F
+1F1EE 0334
+1F1EE 0061
+1F1EE 0041
+1F1EE 0062
+1F1EF 0021
+1F1EF 003F
+1F1EF 0334
+1F1EF 0061
+1F1EF 0041
+1F1EF 0062
+1F1F0 0021
+1F1F0 003F
+1F1F0 0334
+1F1F0 0061
+1F1F0 0041
+1F1F0 0062
+1F1F1 0021
+1F1F1 003F
+1F1F1 0334
+1F1F1 0061
+1F1F1 0041
+1F1F1 0062
+1F1F2 0021
+1F1F2 003F
+1F1F2 0334
+1F1F2 0061
+1F1F2 0041
+1F1F2 0062
+1F1F3 0021
+1F1F3 003F
+1F1F3 0334
+1F1F3 0061
+1F1F3 0041
+1F1F3 0062
+1F1F4 0021
+1F1F4 003F
+1F1F4 0334
+1F1F4 0061
+1F1F4 0041
+1F1F4 0062
+1F1F5 0021
+1F1F5 003F
+1F1F5 0334
+1F1F5 0061
+1F1F5 0041
+1F1F5 0062
+1F1F6 0021
+1F1F6 003F
+1F1F6 0334
+1F1F6 0061
+1F1F6 0041
+1F1F6 0062
+1F1F7 0021
+1F1F7 003F
+1F1F7 0334
+1F1F7 0061
+1F1F7 0041
+1F1F7 0062
+1F1F8 0021
+1F1F8 003F
+1F1F8 0334
+1F1F8 0061
+1F1F8 0041
+1F1F8 0062
+1F1F9 0021
+1F1F9 003F
+1F1F9 0334
+1F1F9 0061
+1F1F9 0041
+1F1F9 0062
+1F1FA 0021
+1F1FA 003F
+1F1FA 0334
+1F1FA 0061
+1F1FA 0041
+1F1FA 0062
+1F1FB 0021
+1F1FB 003F
+1F1FB 0334
+1F1FB 0061
+1F1FB 0041
+1F1FB 0062
+1F1FC 0021
+1F1FC 003F
+1F1FC 0334
+1F1FC 0061
+1F1FC 0041
+1F1FC 0062
+1F1FD 0021
+1F1FD 003F
+1F1FD 0334
+1F1FD 0061
+1F1FD 0041
+1F1FD 0062
+1F1FE 0021
+1F1FE 003F
+1F1FE 0334
+1F1FE 0061
+1F1FE 0041
+1F1FE 0062
+1F1FF 0021
+1F1FF 003F
+1F1FF 0334
+1F1FF 0061
+1F1FF 0041
+1F1FF 0062
 2701 0021
 2701 003F
 2701 0061
@@ -21467,28 +21626,28 @@ A4C6 0062
 1D164 003F
 1D158 0334
 1D158 0334 1D165
-1D158 0334 1D165 1D16E
-1D158 0334 1D165 1D170
-1D158 0334 1D165 1D171
-1D158 0334 1D165 1D172
 1D158 1D165 0334
+1D15F 0334
+1D158 0334 1D165 1D16E
 1D158 1D165 0334 1D16E
-1D158 1D165 0334 1D16F
-1D158 1D165 0334 1D170
-1D158 1D165 0334 1D171
-1D158 1D165 0334 1D172
 1D158 1D165 1D16E 0334
-1D158 1D165 1D16F 0334
-1D15F 0334
-1D15F 0334 1D171
-1D15F 0334 1D172
 1D15F 1D16E 0334
-1D15F 1D16F 0334
-1D15F 1D170 0334
 1D160 0334
+1D158 1D165 0334 1D16F
+1D158 1D165 1D16F 0334
+1D15F 1D16F 0334
 1D161 0334
+1D158 0334 1D165 1D170
+1D158 1D165 0334 1D170
+1D15F 1D170 0334
 1D162 0334
+1D158 0334 1D165 1D171
+1D158 1D165 0334 1D171
+1D15F 0334 1D171
 1D163 0334
+1D158 0334 1D165 1D172
+1D158 1D165 0334 1D172
+1D15F 0334 1D172
 1D164 0334
 1D158 0061
 1D15F 0061
@@ -21827,16 +21986,16 @@ A4C6 0062
 1D1BF 003F
 1D1B9 0334
 1D1B9 0334 1D165
-1D1B9 0334 1D165 1D16E
-1D1B9 0334 1D165 1D16F
 1D1B9 1D165 0334
-1D1B9 1D165 0334 1D16E
-1D1B9 1D165 0334 1D16F
 1D1BB 0334
+1D1B9 0334 1D165 1D16E
+1D1B9 1D165 0334 1D16E
 1D1BB 0334 1D16E
+1D1BD 0334
+1D1B9 0334 1D165 1D16F
+1D1B9 1D165 0334 1D16F
 1D1BB 0334 1D16F
 1D1BB 1D16F 0334
-1D1BD 0334
 1D1BF 0334
 1D1B9 0061
 1D1BB 0061
@@ -21860,16 +22019,16 @@ A4C6 0062
 1D1C0 003F
 1D1BA 0334
 1D1BA 0334 1D165
-1D1BA 0334 1D165 1D16F
 1D1BA 1D165 0334
-1D1BA 1D165 0334 1D16F
-1D1BA 1D165 1D16E 0334
-1D1BA 1D165 1D16F 0334
 1D1BC 0334
+1D1BA 1D165 1D16E 0334
 1D1BC 0334 1D16E
-1D1BC 0334 1D16F
 1D1BC 1D16E 0334
 1D1BE 0334
+1D1BA 0334 1D165 1D16F
+1D1BA 1D165 0334 1D16F
+1D1BA 1D165 1D16F 0334
+1D1BC 0334 1D16F
 1D1C0 0334
 1D1BA 0061
 1D1BC 0061
@@ -29113,6 +29272,11 @@ FFE6 0062
 20B9 0061
 20B9 0041
 20B9 0062
+20BA 0021
+20BA 003F
+20BA 0061
+20BA 0041
+20BA 0062
 20A8 0021
 20A8 003F
 20A8 0061
@@ -30877,10 +31041,10 @@ A621 003F
 215F 0061
 215F 0041
 215F 0062
-2491 0021
-2491 003F
 247D 0021
 247D 003F
+2491 0021
+2491 003F
 2469 0021
 24FE 0021
 277F 0021
@@ -30893,10 +31057,10 @@ A621 003F
 2789 003F
 2793 003F
 3248 003F
-2491 0061
-2491 0041
 247D 0061
+2491 0061
 247D 0041
+2491 0041
 2469 0061
 24FE 0061
 277F 0061
@@ -30909,8 +31073,8 @@ A621 003F
 2789 0041
 2793 0041
 3248 0041
-2491 0062
 247D 0062
+2491 0062
 2469 0062
 24FE 0062
 277F 0062
@@ -30932,24 +31096,24 @@ A621 003F
 3362 0061
 3362 0041
 3362 0062
-2492 0021
-2492 003F
 247E 0021
 247E 003F
+2492 0021
+2492 003F
 246A 0021
 24EB 0021
 246A 003F
 24EB 003F
-2492 0061
-2492 0041
 247E 0061
+2492 0061
 247E 0041
+2492 0041
 246A 0061
 24EB 0061
 246A 0041
 24EB 0041
-2492 0062
 247E 0062
+2492 0062
 246A 0062
 24EB 0062
 33EA 0021
@@ -30967,24 +31131,24 @@ A621 003F
 3363 0061
 3363 0041
 3363 0062
-2493 0021
-2493 003F
 247F 0021
 247F 003F
+2493 0021
+2493 003F
 246B 0021
 24EC 0021
 246B 003F
 24EC 003F
-2493 0061
-2493 0041
 247F 0061
+2493 0061
 247F 0041
+2493 0041
 246B 0061
 24EC 0061
 246B 0041
 24EC 0041
-2493 0062
 247F 0062
+2493 0062
 246B 0062
 24EC 0062
 33EB 0021
@@ -31002,24 +31166,24 @@ A621 003F
 3364 0061
 3364 0041
 3364 0062
-2494 0021
-2494 003F
 2480 0021
 2480 003F
+2494 0021
+2494 003F
 246C 0021
 24ED 0021
 246C 003F
 24ED 003F
-2494 0061
-2494 0041
 2480 0061
+2494 0061
 2480 0041
+2494 0041
 246C 0061
 24ED 0061
 246C 0041
 24ED 0041
-2494 0062
 2480 0062
+2494 0062
 246C 0062
 24ED 0062
 33EC 0021
@@ -31032,24 +31196,24 @@ A621 003F
 3365 0061
 3365 0041
 3365 0062
-2495 0021
-2495 003F
 2481 0021
 2481 003F
+2495 0021
+2495 003F
 246D 0021
 24EE 0021
 246D 003F
 24EE 003F
-2495 0061
-2495 0041
 2481 0061
+2495 0061
 2481 0041
+2495 0041
 246D 0061
 24EE 0061
 246D 0041
 24EE 0041
-2495 0062
 2481 0062
+2495 0062
 246D 0062
 24EE 0062
 33ED 0021
@@ -31062,24 +31226,24 @@ A621 003F
 3366 0061
 3366 0041
 3366 0062
-2496 0021
-2496 003F
 2482 0021
 2482 003F
+2496 0021
+2496 003F
 246E 0021
 24EF 0021
 246E 003F
 24EF 003F
-2496 0061
-2496 0041
 2482 0061
+2496 0061
 2482 0041
+2496 0041
 246E 0061
 24EF 0061
 246E 0041
 24EF 0041
-2496 0062
 2482 0062
+2496 0062
 246E 0062
 24EF 0062
 33EE 0021
@@ -31092,24 +31256,24 @@ A621 003F
 3367 0061
 3367 0041
 3367 0062
-2497 0021
-2497 003F
 2483 0021
 2483 003F
+2497 0021
+2497 003F
 246F 0021
 24F0 0021
 246F 003F
 24F0 003F
-2497 0061
-2497 0041
 2483 0061
+2497 0061
 2483 0041
+2497 0041
 246F 0061
 24F0 0061
 246F 0041
 24F0 0041
-2497 0062
 2483 0062
+2497 0062
 246F 0062
 24F0 0062
 33EF 0021
@@ -31122,24 +31286,24 @@ A621 003F
 3368 0061
 3368 0041
 3368 0062
-2498 0021
-2498 003F
 2484 0021
 2484 003F
+2498 0021
+2498 003F
 2470 0021
 24F1 0021
 2470 003F
 24F1 003F
-2498 0061
-2498 0041
 2484 0061
+2498 0061
 2484 0041
+2498 0041
 2470 0061
 24F1 0061
 2470 0041
 24F1 0041
-2498 0062
 2484 0062
+2498 0062
 2470 0062
 24F1 0062
 33F0 0021
@@ -31152,24 +31316,24 @@ A621 003F
 3369 0061
 3369 0041
 3369 0062
-2499 0021
-2499 003F
 2485 0021
 2485 003F
+2499 0021
+2499 003F
 2471 0021
 24F2 0021
 2471 003F
 24F2 003F
-2499 0061
-2499 0041
 2485 0061
+2499 0061
 2485 0041
+2499 0041
 2471 0061
 24F2 0061
 2471 0041
 24F2 0041
-2499 0062
 2485 0062
+2499 0062
 2471 0062
 24F2 0062
 33F1 0021
@@ -31182,24 +31346,24 @@ A621 003F
 336A 0061
 336A 0041
 336A 0062
-249A 0021
-249A 003F
 2486 0021
 2486 003F
+249A 0021
+249A 003F
 2472 0021
 24F3 0021
 2472 003F
 24F3 003F
-249A 0061
-249A 0041
 2486 0061
+249A 0061
 2486 0041
+249A 0041
 2472 0061
 24F3 0061
 2472 0041
 24F3 0041
-249A 0062
 2486 0062
+249A 0062
 2472 0062
 24F3 0062
 33F2 0021
@@ -31697,28 +31861,28 @@ A622 003F
 2156 0061
 2156 0041
 2156 0062
-249B 0021
-249B 003F
 2487 0021
 2487 003F
+249B 0021
+249B 003F
 2473 0021
 24F4 0021
 3249 0021
 2473 003F
 24F4 003F
 3249 003F
-249B 0061
-249B 0041
 2487 0061
+249B 0061
 2487 0041
+249B 0041
 2473 0061
 24F4 0061
 3249 0061
 2473 0041
 24F4 0041
 3249 0041
-249B 0062
 2487 0062
+249B 0062
 2473 0062
 24F4 0062
 3249 0062
@@ -35274,7 +35438,6 @@ A629 0062
 3361 0061
 3361 0041
 3361 0062
-FFFE 0061
 0009 0061
 000A 0061
 000B 0061
@@ -35288,8 +35451,8 @@ FFFE 0061
 00A0 0061
 1680 0061
 2000 0061
-2001 0061
 2002 0061
+2001 0061
 2003 0061
 2004 0061
 2005 0061
@@ -36621,7 +36784,6 @@ FF41 003F
 1D68A 003F
 24D0 0021
 24D0 003F
-FFFE 0041
 0009 0041
 000A 0041
 000B 0041
@@ -36635,8 +36797,8 @@ FFFE 0041
 00A0 0041
 1680 0041
 2000 0041
-2001 0041
 2002 0041
+2001 0041
 2003 0041
 2004 0041
 2005 0041
@@ -37939,8 +38101,6 @@ FF21 003F
 1F110 0334
 1F110 0021
 1F110 003F
-1F1E6 0021
-1F1E6 003F
 1D400 0021
 1D434 0021
 1D468 0021
@@ -38114,7 +38274,6 @@ FF21 003F
 1D622 0334
 1D656 0334
 1D68A 0334
-1F1E6 0334
 1D400 0334
 1D434 0334
 1D468 0334
@@ -39288,9 +39447,7 @@ A733 003F
 FF21 0061
 FF21 0041
 1F110 0061
-1F1E6 0061
 1F110 0041
-1F1E6 0041
 A732 0021
 A732 003F
 1D400 0061
@@ -39482,7 +39639,6 @@ FF41 0062
 0041 0062
 FF21 0062
 1F110 0062
-1F1E6 0062
 1D400 0062
 1D434 0062
 1D468 0062
@@ -39805,7 +39961,6 @@ A73C 0062
 0252 0062
 2C70 0062
 1D9B 0062
-FFFE 0062
 0009 0062
 000A 0062
 000B 0062
@@ -39819,8 +39974,8 @@ FFFE 0062
 00A0 0062
 1680 0062
 2000 0062
-2001 0062
 2002 0062
+2001 0062
 2003 0062
 2004 0062
 2005 0062
@@ -41157,8 +41312,6 @@ FF22 003F
 1F111 0334
 1F111 0021
 1F111 003F
-1F1E7 0021
-1F1E7 003F
 212C 0021
 1D401 0021
 1D435 0021
@@ -41222,7 +41375,6 @@ FF22 003F
 1D623 0334
 1D657 0334
 1D68B 0334
-1F1E7 0334
 1D401 0334
 1D435 0334
 1D469 0334
@@ -41744,9 +41896,7 @@ FF42 0041
 FF22 0061
 FF22 0041
 1F111 0061
-1F1E7 0061
 1F111 0041
-1F1E7 0041
 212C 0061
 1D401 0061
 1D435 0061
@@ -41822,7 +41972,6 @@ FF42 0062
 0042 0062
 FF22 0062
 1F111 0062
-1F1E7 0062
 212C 0062
 1D401 0062
 1D435 0062
@@ -41954,9 +42103,7 @@ FF23 003F
 1F112 0021
 1F112 003F
 216D 0021
-1F1E8 0021
 216D 003F
-1F1E8 003F
 2102 0021
 212D 0021
 1D402 0021
@@ -42034,7 +42181,6 @@ FF23 003F
 1D624 0334
 1D658 0334
 1D68C 0334
-1F1E8 0334
 1D402 0334
 1D436 0334
 1D46A 0334
@@ -42143,10 +42289,8 @@ FF23 0061
 FF23 0041
 1F112 0061
 216D 0061
-1F1E8 0061
 1F112 0041
 216D 0041
-1F1E8 0041
 2102 0061
 212D 0061
 1D402 0061
@@ -42239,7 +42383,6 @@ FF43 0062
 FF23 0062
 1F112 0062
 216D 0062
-1F1E8 0062
 2102 0062
 212D 0062
 1D402 0062
@@ -42443,9 +42586,7 @@ FF24 003F
 1F113 0021
 1F113 003F
 216E 0021
-1F1E9 0021
 216E 003F
-1F1E9 003F
 2145 0021
 1D403 0021
 1D437 0021
@@ -42523,7 +42664,6 @@ FF24 003F
 1D625 0334
 1D659 0334
 1D68D 0334
-1F1E9 0334
 1D403 0334
 1D437 0334
 1D46B 0334
@@ -42646,10 +42786,8 @@ FF24 0061
 FF24 0041
 1F113 0061
 216E 0061
-1F1E9 0061
 1F113 0041
 216E 0041
-1F1E9 0041
 2145 0061
 1D403 0061
 1D437 0061
@@ -42763,7 +42901,6 @@ FF44 0062
 FF24 0062
 1F113 0062
 216E 0062
-1F1E9 0062
 2145 0062
 1D403 0062
 1D437 0062
@@ -42999,8 +43136,6 @@ FF25 003F
 1F114 0334
 1F114 0021
 1F114 003F
-1F1EA 0021
-1F1EA 003F
 2130 0021
 1D404 0021
 1D438 0021
@@ -43153,7 +43288,6 @@ FF25 003F
 1D626 0334
 1D65A 0334
 1D68E 0334
-1F1EA 0334
 1D404 0334
 1D438 0334
 1D46C 0334
@@ -43384,9 +43518,7 @@ FF45 0041
 FF25 0061
 FF25 0041
 1F114 0061
-1F1EA 0061
 1F114 0041
-1F1EA 0041
 2130 0061
 1D404 0061
 1D438 0061
@@ -43549,7 +43681,6 @@ FF45 0062
 0045 0062
 FF25 0062
 1F114 0062
-1F1EA 0062
 2130 0062
 1D404 0062
 1D438 0062
@@ -43821,8 +43952,6 @@ FF26 003F
 1F115 0334
 1F115 0021
 1F115 003F
-1F1EB 0021
-1F1EB 003F
 2131 0021
 1D405 0021
 1D439 0021
@@ -43876,7 +44005,6 @@ FF26 003F
 1D627 0334
 1D65B 0334
 1D68F 0334
-1F1EB 0334
 1D405 0334
 1D439 0334
 1D46D 0334
@@ -43941,9 +44069,7 @@ FF46 0041
 FF26 0061
 FF26 0041
 1F115 0061
-1F1EB 0061
 1F115 0041
-1F1EB 0041
 2131 0061
 1D405 0061
 1D439 0061
@@ -44013,7 +44139,6 @@ FF46 0062
 0046 0062
 FF26 0062
 1F115 0062
-1F1EB 0062
 2131 0062
 1D405 0062
 1D439 0062
@@ -44160,8 +44285,6 @@ FF27 003F
 1F116 0334
 1F116 0021
 1F116 003F
-1F1EC 0021
-1F1EC 003F
 1D406 0021
 1D43A 0021
 1D46E 0021
@@ -44244,7 +44367,6 @@ A7A0 003F
 1D628 0334
 1D65C 0334
 1D690 0334
-1F1EC 0334
 1D406 0334
 1D43A 0334
 1D46E 0334
@@ -44352,9 +44474,7 @@ FF47 0041
 FF27 0061
 FF27 0041
 1F116 0061
-1F1EC 0061
 1F116 0041
-1F1EC 0041
 1D406 0061
 1D43A 0061
 1D46E 0061
@@ -44455,7 +44575,6 @@ FF47 0062
 0047 0062
 FF27 0062
 1F116 0062
-1F1EC 0062
 1D406 0062
 1D43A 0062
 1D46E 0062
@@ -44648,8 +44767,6 @@ FF28 003F
 1F117 0334
 1F117 0021
 1F117 003F
-1F1ED 0021
-1F1ED 003F
 210B 0021
 210C 0021
 210D 0021
@@ -44732,7 +44849,6 @@ FF28 003F
 1D629 0334
 1D65D 0334
 1D691 0334
-1F1ED 0334
 1D407 0334
 1D43B 0334
 1D46F 0334
@@ -44842,9 +44958,7 @@ FF48 0041
 FF28 0061
 FF28 0041
 1F117 0061
-1F1ED 0061
 1F117 0041
-1F1ED 0041
 210B 0061
 210C 0061
 210D 0061
@@ -44949,7 +45063,6 @@ FF48 0062
 0048 0062
 FF28 0062
 1F117 0062
-1F1ED 0062
 210B 0062
 210C 0062
 210D 0062
@@ -45140,9 +45253,7 @@ FF29 003F
 1F118 0021
 1F118 003F
 2160 0021
-1F1EE 0021
 2160 003F
-1F1EE 003F
 2110 0021
 2111 0021
 1D408 0021
@@ -45258,7 +45369,6 @@ FF29 003F
 1D62A 0334
 1D65E 0334
 1D692 0334
-1F1EE 0334
 1D408 0334
 1D43C 0334
 1D470 0334
@@ -45422,10 +45532,8 @@ FF29 0061
 FF29 0041
 1F118 0061
 2160 0061
-1F1EE 0061
 1F118 0041
 2160 0041
-1F1EE 0041
 2110 0061
 2111 0061
 1D408 0061
@@ -45553,7 +45661,6 @@ FF49 0062
 FF29 0062
 1F118 0062
 2160 0062
-1F1EE 0062
 2110 0062
 2111 0062
 1D408 0062
@@ -45806,8 +45913,6 @@ FF2A 003F
 1F119 0334
 1F119 0021
 1F119 003F
-1F1EF 0021
-1F1EF 003F
 1D409 0021
 1D43D 0021
 1D471 0021
@@ -45867,7 +45972,6 @@ FF2A 003F
 1D62B 0334
 1D65F 0334
 1D693 0334
-1F1EF 0334
 1D409 0334
 1D43D 0334
 1D471 0334
@@ -45934,9 +46038,7 @@ FF4A 0041
 FF2A 0061
 FF2A 0041
 1F119 0061
-1F1EF 0061
 1F119 0041
-1F1EF 0041
 1D409 0061
 1D43D 0061
 1D471 0061
@@ -46004,7 +46106,6 @@ FF4A 0062
 004A 0062
 FF2A 0062
 1F119 0062
-1F1EF 0062
 1D409 0062
 1D43D 0062
 1D471 0062
@@ -46124,8 +46225,6 @@ FF2B 003F
 1F11A 0334
 1F11A 0021
 1F11A 003F
-1F1F0 0021
-1F1F0 003F
 1D40A 0021
 1D43E 0021
 1D472 0021
@@ -46203,7 +46302,6 @@ A7A2 003F
 1D62C 0334
 1D660 0334
 1D694 0334
-1F1F0 0334
 1D40A 0334
 1D43E 0334
 1D472 0334
@@ -46301,9 +46399,7 @@ FF4B 0041
 FF2B 0061
 FF2B 0041
 1F11A 0061
-1F1F0 0061
 1F11A 0041
-1F1F0 0041
 1D40A 0061
 1D43E 0061
 1D472 0061
@@ -46395,7 +46491,6 @@ FF4B 0062
 212A 0062
 FF2B 0062
 1F11A 0062
-1F1F0 0062
 1D40A 0062
 1D43E 0062
 1D472 0062
@@ -46616,9 +46711,7 @@ FF2C 003F
 1F11B 0021
 1F11B 003F
 216C 0021
-1F1F1 0021
 216C 003F
-1F1F1 003F
 2112 0021
 1D40B 0021
 1D43F 0021
@@ -46700,7 +46793,6 @@ FF2C 003F
 1D62D 0334
 1D661 0334
 1D695 0334
-1F1F1 0334
 1D40B 0334
 1D43F 0334
 1D473 0334
@@ -46838,10 +46930,8 @@ FF2C 0061
 FF2C 0041
 1F11B 0061
 216C 0061
-1F1F1 0061
 1F11B 0041
 216C 0041
-1F1F1 0041
 2112 0061
 1D40B 0061
 1D43F 0061
@@ -46950,7 +47040,6 @@ FF4C 0062
 FF2C 0062
 1F11B 0062
 216C 0062
-1F1F1 0062
 2112 0062
 1D40B 0062
 1D43F 0062
@@ -47236,9 +47325,7 @@ FF2D 003F
 1F11C 0021
 1F11C 003F
 216F 0021
-1F1F2 0021
 216F 003F
-1F1F2 003F
 2133 0021
 1D40C 0021
 1D440 0021
@@ -47304,7 +47391,6 @@ FF2D 003F
 1D62E 0334
 1D662 0334
 1D696 0334
-1F1F2 0334
 1D40C 0334
 1D440 0334
 1D474 0334
@@ -47406,10 +47492,8 @@ FF2D 0061
 FF2D 0041
 1F11C 0061
 216F 0061
-1F1F2 0061
 1F11C 0041
 216F 0041
-1F1F2 0041
 2133 0061
 1D40C 0061
 1D440 0061
@@ -47490,7 +47574,6 @@ FF4D 0062
 FF2D 0062
 1F11C 0062
 216F 0062
-1F1F2 0062
 2133 0062
 1D40C 0062
 1D440 0062
@@ -47715,8 +47798,6 @@ FF2E 003F
 1F11D 0334
 1F11D 0021
 1F11D 003F
-1F1F3 0021
-1F1F3 003F
 2115 0021
 1D40D 0021
 1D441 0021
@@ -47810,7 +47891,6 @@ A7A4 003F
 1D62F 0334
 1D663 0334
 1D697 0334
-1F1F3 0334
 1D40D 0334
 1D441 0334
 1D475 0334
@@ -47927,9 +48007,7 @@ FF4E 0041
 FF2E 0061
 FF2E 0041
 1F11D 0061
-1F1F3 0061
 1F11D 0041
-1F1F3 0041
 2115 0061
 1D40D 0061
 1D441 0061
@@ -48036,7 +48114,6 @@ FF4E 0062
 004E 0062
 FF2E 0062
 1F11D 0062
-1F1F3 0062
 2115 0062
 1D40D 0062
 1D441 0062
@@ -48284,8 +48361,6 @@ FF2F 003F
 1F11E 0334
 1F11E 0021
 1F11E 003F
-1F1F4 0021
-1F1F4 003F
 1D40E 0021
 1D442 0021
 1D476 0021
@@ -48492,7 +48567,6 @@ FF2F 003F
 1D630 0334
 1D664 0334
 1D698 0334
-1F1F4 0334
 1D40E 0334
 1D442 0334
 1D476 0334
@@ -48796,9 +48870,7 @@ FF4F 0041
 FF2F 0061
 FF2F 0041
 1F11E 0061
-1F1F4 0061
 1F11E 0041
-1F1F4 0041
 1D40E 0061
 1D442 0061
 1D476 0061
@@ -49006,7 +49078,6 @@ FF4F 0062
 004F 0062
 FF2F 0062
 1F11E 0062
-1F1F4 0062
 1D40E 0062
 1D442 0062
 1D476 0062
@@ -49317,8 +49388,6 @@ FF30 003F
 1F11F 0334
 1F11F 0021
 1F11F 003F
-1F1F5 0021
-1F1F5 003F
 2119 0021
 1D40F 0021
 1D443 0021
@@ -49382,7 +49451,6 @@ FF30 003F
 1D631 0334
 1D665 0334
 1D699 0334
-1F1F5 0334
 1D40F 0334
 1D443 0334
 1D477 0334
@@ -49452,9 +49520,7 @@ FF50 0041
 FF30 0061
 FF30 0041
 1F11F 0061
-1F1F5 0061
 1F11F 0041
-1F1F5 0041
 2119 0061
 1D40F 0061
 1D443 0061
@@ -49541,7 +49607,6 @@ FF50 0062
 0050 0062
 FF30 0062
 1F11F 0062
-1F1F5 0062
 2119 0062
 1D40F 0062
 1D443 0062
@@ -49749,8 +49814,6 @@ FF31 003F
 1F120 0334
 1F120 0021
 1F120 003F
-1F1F6 0021
-1F1F6 003F
 211A 0021
 1D410 0021
 1D444 0021
@@ -49798,7 +49861,6 @@ FF31 003F
 1D632 0334
 1D666 0334
 1D69A 0334
-1F1F6 0334
 1D410 0334
 1D444 0334
 1D478 0334
@@ -49853,9 +49915,7 @@ FF51 0041
 FF31 0061
 FF31 0041
 1F120 0061
-1F1F6 0061
 1F120 0041
-1F1F6 0041
 211A 0061
 1D410 0061
 1D444 0061
@@ -49910,7 +49970,6 @@ FF51 0062
 0051 0062
 FF31 0062
 1F120 0062
-1F1F6 0062
 211A 0062
 1D410 0062
 1D444 0062
@@ -50018,8 +50077,6 @@ FF32 003F
 1F121 0334
 1F121 0021
 1F121 003F
-1F1F7 0021
-1F1F7 003F
 211B 0021
 211C 0021
 211D 0021
@@ -50115,7 +50172,6 @@ A7A6 003F
 1D633 0334
 1D667 0334
 1D69B 0334
-1F1F7 0334
 1D411 0334
 1D445 0334
 1D479 0334
@@ -50193,8 +50249,8 @@ A783 003F
 A782 0021
 A782 003F
 0334 036C
-0334 1DCA
 036C 0334
+0334 1DCA
 1DCA 0334
 0072 0061
 0072 0041
@@ -50239,9 +50295,7 @@ FF52 0041
 FF32 0061
 FF32 0041
 1F121 0061
-1F1F7 0061
 1F121 0041
-1F1F7 0041
 211B 0061
 211C 0061
 211D 0061
@@ -50365,7 +50419,6 @@ FF52 0062
 0052 0062
 FF32 0062
 1F121 0062
-1F1F7 0062
 211B 0062
 211C 0062
 211D 0062
@@ -50609,8 +50662,6 @@ FF33 003F
 1F12A 0334
 1F12A 0021
 1F12A 003F
-1F1F8 0021
-1F1F8 003F
 1D412 0021
 1D446 0021
 1D47A 0021
@@ -50706,7 +50757,6 @@ A7A8 003F
 1D634 0334
 1D668 0334
 1D69C 0334
-1F1F8 0334
 1D412 0334
 1D446 0334
 1D47A 0334
@@ -50850,10 +50900,8 @@ FF33 0061
 FF33 0041
 1F122 0061
 1F12A 0061
-1F1F8 0061
 1F122 0041
 1F12A 0041
-1F1F8 0041
 1D412 0061
 1D446 0061
 1D47A 0061
@@ -50974,7 +51022,6 @@ FF53 0062
 FF33 0062
 1F122 0062
 1F12A 0062
-1F1F8 0062
 1D412 0062
 1D446 0062
 1D47A 0062
@@ -51202,8 +51249,6 @@ FF34 003F
 1F123 0334
 1F123 0021
 1F123 003F
-1F1F9 0021
-1F1F9 003F
 1D413 0021
 1D447 0021
 1D47B 0021
@@ -51287,7 +51332,6 @@ FF34 003F
 1D635 0334
 1D669 0334
 1D69D 0334
-1F1F9 0334
 1D413 0334
 1D447 0334
 1D47B 0334
@@ -51396,9 +51440,7 @@ FF54 0041
 FF34 0061
 FF34 0041
 1F123 0061
-1F1F9 0061
 1F123 0041
-1F1F9 0041
 1D413 0061
 1D447 0061
 1D47B 0061
@@ -51494,7 +51536,6 @@ FF54 0062
 0054 0062
 FF34 0062
 1F123 0062
-1F1F9 0062
 1D413 0062
 1D447 0062
 1D47B 0062
@@ -51700,8 +51741,6 @@ FF35 003F
 1F124 0334
 1F124 0021
 1F124 003F
-1F1FA 0021
-1F1FA 003F
 1D414 0021
 1D448 0021
 1D47C 0021
@@ -51875,7 +51914,6 @@ FF35 003F
 1D636 0334
 1D66A 0334
 1D69E 0334
-1F1FA 0334
 1D414 0334
 1D448 0334
 1D47C 0334
@@ -52141,9 +52179,7 @@ FF55 0041
 FF35 0061
 FF35 0041
 1F124 0061
-1F1FA 0061
 1F124 0041
-1F1FA 0041
 1D414 0061
 1D448 0061
 1D47C 0061
@@ -52325,7 +52361,6 @@ FF55 0062
 0055 0062
 FF35 0062
 1F124 0062
-1F1FA 0062
 1D414 0062
 1D448 0062
 1D47C 0062
@@ -52593,9 +52628,7 @@ FF36 003F
 1F125 0021
 1F125 003F
 2164 0021
-1F1FB 0021
 2164 003F
-1F1FB 003F
 1D415 0021
 1D449 0021
 1D47D 0021
@@ -52657,7 +52690,6 @@ FF36 003F
 1D637 0334
 1D66B 0334
 1D69F 0334
-1F1FB 0334
 1D415 0334
 1D449 0334
 1D47D 0334
@@ -52737,10 +52769,8 @@ FF36 0061
 FF36 0041
 1F125 0061
 2164 0061
-1F1FB 0061
 1F125 0041
 2164 0041
-1F1FB 0041
 1D415 0061
 1D449 0061
 1D47D 0061
@@ -52812,7 +52842,6 @@ FF56 0062
 FF36 0062
 1F125 0062
 2164 0062
-1F1FB 0062
 1D415 0062
 1D449 0062
 1D47D 0062
@@ -52994,8 +53023,6 @@ FF37 003F
 1F126 0334
 1F126 0021
 1F126 003F
-1F1FC 0021
-1F1FC 003F
 1D416 0021
 1D44A 0021
 1D47E 0021
@@ -53073,7 +53100,6 @@ FF37 003F
 1D638 0334
 1D66C 0334
 1D6A0 0334
-1F1FC 0334
 1D416 0334
 1D44A 0334
 1D47E 0334
@@ -53172,9 +53198,7 @@ FF57 0041
 FF37 0061
 FF37 0041
 1F126 0061
-1F1FC 0061
 1F126 0041
-1F1FC 0041
 1D416 0061
 1D44A 0061
 1D47E 0061
@@ -53259,7 +53283,6 @@ FF57 0062
 0057 0062
 FF37 0062
 1F126 0062
-1F1FC 0062
 1D416 0062
 1D44A 0062
 1D47E 0062
@@ -53381,9 +53404,7 @@ FF38 003F
 1F127 0021
 1F127 003F
 2169 0021
-1F1FD 0021
 2169 003F
-1F1FD 003F
 1D417 0021
 1D44B 0021
 1D47F 0021
@@ -53443,7 +53464,6 @@ FF38 003F
 1D639 0334
 1D66D 0334
 1D6A1 0334
-1F1FD 0334
 1D417 0334
 1D44B 0334
 1D47F 0334
@@ -53518,10 +53538,8 @@ FF38 0061
 FF38 0041
 1F127 0061
 2169 0061
-1F1FD 0061
 1F127 0041
 2169 0041
-1F1FD 0041
 1D417 0061
 1D44B 0061
 1D47F 0061
@@ -53591,7 +53609,6 @@ FF58 0062
 FF38 0062
 1F127 0062
 2169 0062
-1F1FD 0062
 1D417 0062
 1D44B 0062
 1D47F 0062
@@ -53681,8 +53698,6 @@ FF39 003F
 1F128 0334
 1F128 0021
 1F128 003F
-1F1FE 0021
-1F1FE 003F
 1D418 0021
 1D44C 0021
 1D480 0021
@@ -53770,7 +53785,6 @@ FF39 003F
 1D63A 0334
 1D66E 0334
 1D6A2 0334
-1F1FE 0334
 1D418 0334
 1D44C 0334
 1D480 0334
@@ -53887,9 +53901,7 @@ FF59 0041
 FF39 0061
 FF39 0041
 1F128 0061
-1F1FE 0061
 1F128 0041
-1F1FE 0041
 1D418 0061
 1D44C 0061
 1D480 0061
@@ -53984,7 +53996,6 @@ FF59 0062
 0059 0062
 FF39 0062
 1F128 0062
-1F1FE 0062
 1D418 0062
 1D44C 0062
 1D480 0062
@@ -54110,8 +54121,6 @@ FF3A 003F
 1F129 0334
 1F129 0021
 1F129 003F
-1F1FF 0021
-1F1FF 003F
 2124 0021
 2128 0021
 1D419 0021
@@ -54185,7 +54194,6 @@ FF3A 003F
 1D63B 0334
 1D66F 0334
 1D6A3 0334
-1F1FF 0334
 1D419 0334
 1D44D 0334
 1D481 0334
@@ -54281,9 +54289,7 @@ FF5A 0041
 FF3A 0061
 FF3A 0041
 1F129 0061
-1F1FF 0061
 1F129 0041
-1F1FF 0041
 2124 0061
 2128 0061
 1D419 0061
@@ -54365,7 +54371,6 @@ FF5A 0062
 005A 0062
 FF3A 0062
 1F129 0062
-1F1FF 0062
 2124 0062
 2128 0062
 1D419 0062
@@ -59862,15 +59867,15 @@ A724 0062
 0410 0334 0306
 04D0 0334
 0430 0306 0061
+04D1 0061
 0430 0591 0306 0061
 0430 1D165 0306 0061
-04D1 0061
 0430 0306 0041
 04D1 0041
 0410 0306 0061
+04D0 0061
 0410 0591 0306 0061
 0410 1D165 0306 0061
-04D0 0061
 0410 0306 0041
 04D0 0041
 0430 0306 0062
@@ -59892,15 +59897,15 @@ A724 0062
 0410 0334 0308
 04D2 0334
 0430 0308 0061
+04D3 0061
 0430 0591 0308 0061
 0430 1D165 0308 0061
-04D3 0061
 0430 0308 0041
 04D3 0041
 0410 0308 0061
+04D2 0061
 0410 0591 0308 0061
 0410 1D165 0308 0061
-04D2 0061
 0410 0308 0041
 04D2 0041
 0430 0308 0062
@@ -59934,15 +59939,15 @@ A724 0062
 04D8 0334 0308
 04DA 0334
 04D9 0308 0061
+04DB 0061
 04D9 0591 0308 0061
 04D9 1D165 0308 0061
-04DB 0061
 04D9 0308 0041
 04DB 0041
 04D8 0308 0061
+04DA 0061
 04D8 0591 0308 0061
 04D8 1D165 0308 0061
-04DA 0061
 04D8 0308 0041
 04DA 0041
 04D9 0308 0062
@@ -60153,11 +60158,11 @@ A662 0062
 0413 0341 0334
 0433 0301 0061
 0433 0341 0061
+0453 0061
 0433 0591 0301 0061
 0433 0591 0341 0061
 0433 1D165 0301 0061
 0433 1D165 0341 0061
-0453 0061
 0433 0301 0041
 0433 0341 0041
 0453 0041
@@ -60255,15 +60260,15 @@ A662 0062
 0415 0334 0306
 04D6 0334
 0435 0306 0061
+04D7 0061
 0435 0591 0306 0061
 0435 1D165 0306 0061
-04D7 0061
 0435 0306 0041
 04D7 0041
 0415 0306 0061
+04D6 0061
 0415 0591 0306 0061
 0415 1D165 0306 0061
-04D6 0061
 0415 0306 0041
 04D6 0041
 0435 0306 0062
@@ -60347,15 +60352,15 @@ A684 0062
 0416 0334 0308
 04DC 0334
 0436 0308 0061
+04DD 0061
 0436 0591 0308 0061
 0436 1D165 0308 0061
-04DD 0061
 0436 0308 0041
 04DD 0041
 0416 0308 0061
+04DC 0061
 0416 0591 0308 0061
 0416 1D165 0308 0061
-04DC 0061
 0416 0308 0041
 04DC 0041
 0436 0308 0062
@@ -60436,15 +60441,15 @@ A640 0062
 0417 0334 0308
 04DE 0334
 0437 0308 0061
+04DF 0061
 0437 0591 0308 0061
 0437 1D165 0308 0061
-04DF 0061
 0437 0308 0041
 04DF 0041
 0417 0308 0061
+04DE 0061
 0417 0591 0308 0061
 0417 1D165 0308 0061
-04DE 0061
 0417 0308 0041
 04DE 0041
 0437 0308 0062
@@ -60601,15 +60606,15 @@ A675 0062
 0418 0334 0308
 04E4 0334
 0438 0308 0061
+04E5 0061
 0438 0591 0308 0061
 0438 1D165 0308 0061
-04E5 0061
 0438 0308 0041
 04E5 0041
 0418 0308 0061
+04E4 0061
 0418 0591 0308 0061
 0418 1D165 0308 0061
-04E4 0061
 0418 0308 0041
 04E4 0041
 0438 0308 0062
@@ -60657,17 +60662,17 @@ A676 003F
 0334 A676
 A676 0334
 0456 0308 0061
+0457 0061
 0456 0591 0308 0061
 0456 1D165 0308 0061
-0457 0061
 0456 0308 0041
 0457 0041
 A676 0061
 A676 0041
 0406 0308 0061
+0407 0061
 0406 0591 0308 0061
 0406 1D165 0308 0061
-0407 0061
 0406 0308 0041
 0407 0041
 0456 0308 0062
@@ -60690,15 +60695,15 @@ A676 0062
 0418 0334 0306
 0419 0334
 0438 0306 0061
+0439 0061
 0438 0591 0306 0061
 0438 1D165 0306 0061
-0439 0061
 0438 0306 0041
 0439 0041
 0418 0306 0061
+0419 0061
 0418 0591 0306 0061
 0418 1D165 0306 0061
-0419 0061
 0418 0306 0041
 0419 0041
 0438 0306 0062
@@ -61113,15 +61118,15 @@ A66C 0062
 041E 0334 0308
 04E6 0334
 043E 0308 0061
+04E7 0061
 043E 0591 0308 0061
 043E 1D165 0308 0061
-04E7 0061
 043E 0308 0041
 04E7 0041
 041E 0308 0061
+04E6 0061
 041E 0591 0308 0061
 041E 1D165 0308 0061
-04E6 0061
 041E 0308 0041
 04E6 0041
 043E 0308 0062
@@ -61155,15 +61160,15 @@ A66C 0062
 04E8 0334 0308
 04EA 0334
 04E9 0308 0061
+04EB 0061
 04E9 0591 0308 0061
 04E9 1D165 0308 0061
-04EB 0061
 04E9 0308 0041
 04EB 0041
 04E8 0308 0061
+04EA 0061
 04E8 0591 0308 0061
 04E8 1D165 0308 0061
-04EA 0061
 04E8 0308 0041
 04EA 0041
 04E9 0308 0062
@@ -61387,11 +61392,11 @@ A68A 0062
 041A 0341 0334
 043A 0301 0061
 043A 0341 0061
+045C 0061
 043A 0591 0301 0061
 043A 0591 0341 0061
 043A 1D165 0301 0061
 043A 1D165 0341 0061
-045C 0061
 043A 0301 0041
 043A 0341 0041
 045C 0041
@@ -61465,9 +61470,9 @@ A677 0062
 0423 0306 0334
 0423 0334 0306
 0443 0306 0061
+045E 0061
 0443 0591 0306 0061
 0443 1D165 0306 0061
-045E 0061
 0443 0306 0041
 045E 0041
 040E 0061
@@ -61495,15 +61500,15 @@ A677 0062
 0423 0334 0308
 04F0 0334
 0443 0308 0061
+04F1 0061
 0443 0591 0308 0061
 0443 1D165 0308 0061
-04F1 0061
 0443 0308 0041
 04F1 0041
 0423 0308 0061
+04F0 0061
 0423 0591 0308 0061
 0423 1D165 0308 0061
-04F0 0061
 0423 0308 0041
 04F0 0041
 0443 0308 0062
@@ -61525,15 +61530,15 @@ A677 0062
 0423 0334 030B
 04F2 0334
 0443 030B 0061
+04F3 0061
 0443 0591 030B 0061
 0443 1D165 030B 0061
-04F3 0061
 0443 030B 0041
 04F3 0041
 0423 030B 0061
+04F2 0061
 0423 0591 030B 0061
 0423 1D165 030B 0061
-04F2 0061
 0423 030B 0041
 04F2 0041
 0443 030B 0062
@@ -61832,15 +61837,15 @@ A692 0062
 0427 0334 0308
 04F4 0334
 0447 0308 0061
+04F5 0061
 0447 0591 0308 0061
 0447 1D165 0308 0061
-04F5 0061
 0447 0308 0041
 04F5 0041
 0427 0308 0061
+04F4 0061
 0427 0591 0308 0061
 0427 1D165 0308 0061
-04F4 0061
 0427 0308 0041
 04F4 0041
 0447 0308 0062
@@ -62042,15 +62047,15 @@ A679 0062
 042B 0334 0308
 04F8 0334
 044B 0308 0061
+04F9 0061
 044B 0591 0308 0061
 044B 1D165 0308 0061
-04F9 0061
 044B 0308 0041
 04F9 0041
 042B 0308 0061
+04F8 0061
 042B 0591 0308 0061
 042B 1D165 0308 0061
-04F8 0061
 042B 0308 0041
 04F8 0041
 044B 0308 0062
@@ -62138,15 +62143,15 @@ A652 0062
 042D 0334 0308
 04EC 0334
 044D 0308 0061
+04ED 0061
 044D 0591 0308 0061
 044D 1D165 0308 0061
-04ED 0061
 044D 0308 0041
 04ED 0041
 042D 0308 0061
+04EC 0061
 042D 0591 0308 0061
 042D 1D165 0308 0061
-04EC 0061
 042D 0308 0041
 04EC 0041
 044D 0308 0062
@@ -62389,15 +62394,15 @@ A65C 0062
 0474 0334 030F
 0476 0334
 0475 030F 0061
+0477 0061
 0475 0591 030F 0061
 0475 1D165 030F 0061
-0477 0061
 0475 030F 0041
 0477 0041
 0474 030F 0061
+0476 0061
 0474 0591 030F 0061
 0474 1D165 030F 0061
-0476 0061
 0474 030F 0041
 0476 0041
 0475 030F 0062
@@ -64757,8 +64762,8 @@ FE81 003F
 0622 0334
 0627 0334 0653
 0627 0653 0334
-0622 0061
 0627 0591 0653 0061
+0622 0061
 0627 0653 0061
 0627 1D165 0653 0061
 0622 0041
@@ -64782,8 +64787,8 @@ FE83 003F
 0623 0334
 0627 0334 0654
 0627 0654 0334
-0623 0061
 0627 0591 0654 0061
+0623 0061
 0627 0654 0061
 0627 1D165 0654 0061
 0623 0041
@@ -64827,8 +64832,8 @@ FE85 003F
 0624 0334
 0648 0334 0654
 0648 0654 0334
-0624 0061
 0648 0591 0654 0061
+0624 0061
 0648 0654 0061
 0648 1D165 0654 0061
 0624 0041
@@ -64895,8 +64900,8 @@ FE89 003F
 0626 0334
 064A 0334 0654
 064A 0654 0334
-0626 0061
 064A 0591 0654 0061
+0626 0061
 064A 0654 0061
 064A 1D165 0654 0061
 0626 0041
@@ -76189,10 +76194,10 @@ A8FB 0062
 0C46 0334 0C56
 0C46 0C56 0334
 0C48 0334
-0C46 0591 0C56 0061
 0C46 0C56 0061
-0C46 1D165 0C56 0061
 0C48 0061
+0C46 0591 0C56 0061
+0C46 1D165 0C56 0061
 0C46 0C56 0041
 0C48 0041
 0C46 0C56 0062
@@ -76609,10 +76614,10 @@ A8FB 0062
 0CC6 0CC2 0062
 0CCA 0062
 0CC6 0CC2 0001 0CD5 0061
-0CC6 0CC2 0591 0CD5 0061
-0CC6 0CC2 1D165 0CD5 0061
 0CCA 0001 0CD5 0061
+0CC6 0CC2 0591 0CD5 0061
 0CCA 0591 0CD5 0061
+0CC6 0CC2 1D165 0CD5 0061
 0CCA 1D165 0CD5 0061
 0CC6 0CC2 0CD5 0021
 0CCA 0CD5 0021
@@ -77444,10 +77449,10 @@ A8FB 0062
 0DD9 0334 0DCA
 0DD9 0DCA 0334
 0DDA 0334
-0DD9 0591 0DCA 0061
 0DD9 0DCA 0061
-0DD9 1D165 0DCA 0061
 0DDA 0061
+0DD9 0591 0DCA 0061
+0DD9 1D165 0DCA 0061
 0DD9 0DCA 0041
 0DDA 0041
 0DD9 0DCA 0062
@@ -77479,13 +77484,13 @@ A8FB 0062
 0DD9 0DCF 0DCA 0334
 0DDC 0334 0DCA
 0DDD 0334
-0DD9 0DCF 0591 0DCA 0061
 0DD9 0DCF 0DCA 0061
-0DD9 0DCF 1D165 0DCA 0061
-0DDC 0591 0DCA 0061
 0DDC 0DCA 0061
-0DDC 1D165 0DCA 0061
 0DDD 0061
+0DD9 0DCF 0591 0DCA 0061
+0DDC 0591 0DCA 0061
+0DD9 0DCF 1D165 0DCA 0061
+0DDC 1D165 0DCA 0061
 0DD9 0DCF 0DCA 0041
 0DDC 0DCA 0041
 0DDD 0041
@@ -82515,6 +82520,31 @@ A8C4 0062
 0EDE 0061
 0EDE 0041
 0EDE 0062
+0EC0 0EDE 0021
+0EC0 0EDE 003F
+0EC0 0EDE 0061
+0EC0 0EDE 0041
+0EC0 0EDE 0062
+0EC1 0EDE 0021
+0EC1 0EDE 003F
+0EC1 0EDE 0061
+0EC1 0EDE 0041
+0EC1 0EDE 0062
+0EC2 0EDE 0021
+0EC2 0EDE 003F
+0EC2 0EDE 0061
+0EC2 0EDE 0041
+0EC2 0EDE 0062
+0EC3 0EDE 0021
+0EC3 0EDE 003F
+0EC3 0EDE 0061
+0EC3 0EDE 0041
+0EC3 0EDE 0062
+0EC4 0EDE 0021
+0EC4 0EDE 003F
+0EC4 0EDE 0061
+0EC4 0EDE 0041
+0EC4 0EDE 0062
 0E81 0021
 0E81 003F
 0E81 0061
@@ -82730,6 +82760,31 @@ A8C4 0062
 0EDF 0061
 0EDF 0041
 0EDF 0062
+0EC0 0EDF 0021
+0EC0 0EDF 003F
+0EC0 0EDF 0061
+0EC0 0EDF 0041
+0EC0 0EDF 0062
+0EC1 0EDF 0021
+0EC1 0EDF 003F
+0EC1 0EDF 0061
+0EC1 0EDF 0041
+0EC1 0EDF 0062
+0EC2 0EDF 0021
+0EC2 0EDF 003F
+0EC2 0EDF 0061
+0EC2 0EDF 0041
+0EC2 0EDF 0062
+0EC3 0EDF 0021
+0EC3 0EDF 003F
+0EC3 0EDF 0061
+0EC3 0EDF 0041
+0EC3 0EDF 0062
+0EC4 0EDF 0021
+0EC4 0EDF 003F
+0EC4 0EDF 0061
+0EC4 0EDF 0041
+0EC4 0EDF 0062
 0E8D 0021
 0E8D 003F
 0E8D 0061
@@ -83477,6 +83532,9 @@ A8C4 0062
 0EC0 0061
 0EC0 0041
 0EC0 0062
+0EC0 0001 0EDE 0061
+0EC0 0591 0EDE 0061
+0EC0 1D165 0EDE 0061
 0EC0 0001 0E81 0061
 0EC0 0591 0E81 0061
 0EC0 1D165 0E81 0061
@@ -83498,6 +83556,9 @@ A8C4 0062
 0EC0 0001 0E8A 0061
 0EC0 0591 0E8A 0061
 0EC0 1D165 0E8A 0061
+0EC0 0001 0EDF 0061
+0EC0 0591 0EDF 0061
+0EC0 1D165 0EDF 0061
 0EC0 0001 0E8D 0061
 0EC0 0591 0E8D 0061
 0EC0 1D165 0E8D 0061
@@ -83569,6 +83630,9 @@ A8C4 0062
 0EC1 0061
 0EC1 0041
 0EC1 0062
+0EC1 0001 0EDE 0061
+0EC1 0591 0EDE 0061
+0EC1 1D165 0EDE 0061
 0EC1 0001 0E81 0061
 0EC1 0591 0E81 0061
 0EC1 1D165 0E81 0061
@@ -83590,6 +83654,9 @@ A8C4 0062
 0EC1 0001 0E8A 0061
 0EC1 0591 0E8A 0061
 0EC1 1D165 0E8A 0061
+0EC1 0001 0EDF 0061
+0EC1 0591 0EDF 0061
+0EC1 1D165 0EDF 0061
 0EC1 0001 0E8D 0061
 0EC1 0591 0E8D 0061
 0EC1 1D165 0E8D 0061
@@ -83661,6 +83728,9 @@ A8C4 0062
 0EC2 0061
 0EC2 0041
 0EC2 0062
+0EC2 0001 0EDE 0061
+0EC2 0591 0EDE 0061
+0EC2 1D165 0EDE 0061
 0EC2 0001 0E81 0061
 0EC2 0591 0E81 0061
 0EC2 1D165 0E81 0061
@@ -83682,6 +83752,9 @@ A8C4 0062
 0EC2 0001 0E8A 0061
 0EC2 0591 0E8A 0061
 0EC2 1D165 0E8A 0061
+0EC2 0001 0EDF 0061
+0EC2 0591 0EDF 0061
+0EC2 1D165 0EDF 0061
 0EC2 0001 0E8D 0061
 0EC2 0591 0E8D 0061
 0EC2 1D165 0E8D 0061
@@ -83753,6 +83826,9 @@ A8C4 0062
 0EC3 0061
 0EC3 0041
 0EC3 0062
+0EC3 0001 0EDE 0061
+0EC3 0591 0EDE 0061
+0EC3 1D165 0EDE 0061
 0EC3 0001 0E81 0061
 0EC3 0591 0E81 0061
 0EC3 1D165 0E81 0061
@@ -83774,6 +83850,9 @@ A8C4 0062
 0EC3 0001 0E8A 0061
 0EC3 0591 0E8A 0061
 0EC3 1D165 0E8A 0061
+0EC3 0001 0EDF 0061
+0EC3 0591 0EDF 0061
+0EC3 1D165 0EDF 0061
 0EC3 0001 0E8D 0061
 0EC3 0591 0E8D 0061
 0EC3 1D165 0E8D 0061
@@ -83845,6 +83924,9 @@ A8C4 0062
 0EC4 0061
 0EC4 0041
 0EC4 0062
+0EC4 0001 0EDE 0061
+0EC4 0591 0EDE 0061
+0EC4 1D165 0EDE 0061
 0EC4 0001 0E81 0061
 0EC4 0591 0E81 0061
 0EC4 1D165 0E81 0061
@@ -83866,6 +83948,9 @@ A8C4 0062
 0EC4 0001 0E8A 0061
 0EC4 0591 0E8A 0061
 0EC4 1D165 0E8A 0061
+0EC4 0001 0EDF 0061
+0EC4 0591 0EDF 0061
+0EC4 1D165 0EDF 0061
 0EC4 0001 0E8D 0061
 0EC4 0591 0E8D 0061
 0EC4 1D165 0E8D 0061
@@ -86579,15 +86664,61 @@ AADC 0062
 0FB2 0F71 0021
 0FB2 0F71 003F
 0FB2 0001 0F71 0061
-0FB2 0591 0F71 0061
 0FB2 0F71 0061
+0FB2 0591 0F71 0061
 0FB2 1D165 0F71 0061
 0FB2 0F71 0041
 0FB2 0F71 0062
+0FB2 0F71 0001 0F72 0061
 0FB2 0F71 0001 0F80 0061
+0FB2 0F71 0001 0F74 0061
+0FB2 0F71 0F72 0021
+0FB2 0F73 0021
+0FB2 0F71 0F72 003F
+0FB2 0F73 003F
+0FB2 0334 0F72 0F71
+0FB2 0F71 0334 0F72
+0FB2 0F72 0334 0F71
+0FB2 0F72 0F71 0334
+0FB2 0001 0F71 0F72 0061
+0FB2 0001 0F73 0061
+0FB2 0F71 0F72 0061
+0FB2 0F73 0061
+0FB2 0591 0F71 0F72 0061
+0FB2 0591 0F73 0061
+0FB2 0F71 0591 0F72 0061
+0FB2 0F71 1D165 0F72 0061
+0FB2 1D165 0F71 0F72 0061
+0FB2 1D165 0F73 0061
+0FB2 0F71 0F72 0041
+0FB2 0F73 0041
+0FB2 0F71 0F72 0062
+0FB2 0F73 0062
 0FB2 0001 0F80 0061
 0FB2 0001 0F71 0F80 0061
 0FB2 0001 0F81 0061
+0FB2 0F71 0F74 0021
+0FB2 0F75 0021
+0FB2 0F71 0F74 003F
+0FB2 0F75 003F
+0FB2 0334 0F71 0F74
+0FB2 0F71 0334 0F74
+0FB2 0F71 0F74 0334
+0FB2 0F74 0334 0F71
+0FB2 0001 0F71 0F74 0061
+0FB2 0001 0F75 0061
+0FB2 0F71 0F74 0061
+0FB2 0F75 0061
+0FB2 0591 0F71 0F74 0061
+0FB2 0591 0F75 0061
+0FB2 0F71 0591 0F74 0061
+0FB2 0F71 1D165 0F74 0061
+0FB2 1D165 0F71 0F74 0061
+0FB2 1D165 0F75 0061
+0FB2 0F71 0F74 0041
+0FB2 0F75 0041
+0FB2 0F71 0F74 0062
+0FB2 0F75 0062
 0F6C 0021
 0F6C 003F
 0F6C 0061
@@ -86606,15 +86737,61 @@ AADC 0062
 0FB3 0F71 0021
 0FB3 0F71 003F
 0FB3 0001 0F71 0061
-0FB3 0591 0F71 0061
 0FB3 0F71 0061
+0FB3 0591 0F71 0061
 0FB3 1D165 0F71 0061
 0FB3 0F71 0041
 0FB3 0F71 0062
+0FB3 0F71 0001 0F72 0061
 0FB3 0F71 0001 0F80 0061
+0FB3 0F71 0001 0F74 0061
+0FB3 0F71 0F72 0021
+0FB3 0F73 0021
+0FB3 0F71 0F72 003F
+0FB3 0F73 003F
+0FB3 0334 0F71 0F72
+0FB3 0334 0F72 0F71
+0FB3 0334 0F73
+0FB3 0F71 0F72 0334
+0FB3 0001 0F71 0F72 0061
+0FB3 0001 0F73 0061
+0FB3 0F71 0F72 0061
+0FB3 0F73 0061
+0FB3 0591 0F71 0F72 0061
+0FB3 0591 0F73 0061
+0FB3 0F71 0591 0F72 0061
+0FB3 0F71 1D165 0F72 0061
+0FB3 1D165 0F71 0F72 0061
+0FB3 1D165 0F73 0061
+0FB3 0F71 0F72 0041
+0FB3 0F73 0041
+0FB3 0F71 0F72 0062
+0FB3 0F73 0062
 0FB3 0001 0F80 0061
 0FB3 0001 0F71 0F80 0061
 0FB3 0001 0F81 0061
+0FB3 0F71 0F74 0021
+0FB3 0F75 0021
+0FB3 0F71 0F74 003F
+0FB3 0F75 003F
+0FB3 0334 0F71 0F74
+0FB3 0334 0F75
+0FB3 0F71 0334 0F74
+0FB3 0F74 0F71 0334
+0FB3 0001 0F71 0F74 0061
+0FB3 0001 0F75 0061
+0FB3 0F71 0F74 0061
+0FB3 0F75 0061
+0FB3 0591 0F71 0F74 0061
+0FB3 0591 0F75 0061
+0FB3 0F71 0591 0F74 0061
+0FB3 0F71 1D165 0F74 0061
+0FB3 1D165 0F71 0F74 0061
+0FB3 1D165 0F75 0061
+0FB3 0F71 0F74 0041
+0FB3 0F75 0041
+0FB3 0F71 0F74 0062
+0FB3 0F75 0062
 0F64 0021
 0F64 003F
 0F64 0061
@@ -86735,10 +86912,10 @@ AADC 0062
 0F71 0F72 0334
 0F72 0334 0F71
 0F72 0F71 0334
-0F71 0591 0F72 0061
 0F71 0F72 0061
-0F71 1D165 0F72 0061
 0F73 0061
+0F71 0591 0F72 0061
+0F71 1D165 0F72 0061
 0F71 0F72 0041
 0F73 0041
 0F71 0F72 0062
@@ -86758,10 +86935,10 @@ AADC 0062
 0334 0F81
 0F71 0334 0F80
 0F71 0F80 0334
-0F71 0591 0F80 0061
 0F71 0F80 0061
-0F71 1D165 0F80 0061
 0F81 0061
+0F71 0591 0F80 0061
+0F71 1D165 0F80 0061
 0F71 0F80 0041
 0F81 0041
 0F71 0F80 0062
@@ -86781,10 +86958,10 @@ AADC 0062
 0F71 0334 0F74
 0F71 0F74 0334
 0F74 0334 0F71
-0F71 0591 0F74 0061
 0F71 0F74 0061
-0F71 1D165 0F74 0061
 0F75 0061
+0F71 0591 0F74 0061
+0F71 1D165 0F74 0061
 0F71 0F74 0041
 0F75 0041
 0F71 0F74 0062
@@ -86797,8 +86974,8 @@ AADC 0062
 0FB2 0334 0F80
 0FB2 0F80 0334
 0F76 0061
-0FB2 0591 0F80 0061
 0FB2 0F80 0061
+0FB2 0591 0F80 0061
 0FB2 1D165 0F80 0061
 0F76 0041
 0FB2 0F80 0041
@@ -86811,16 +86988,16 @@ AADC 0062
 0FB2 0F71 0F80 003F
 0FB2 0F81 003F
 0F76 0F71 0334
-# TODO: Fix ICU ticket #8052 -- 0FB2 0334 0F81
+0FB2 0334 0F81
 0FB2 0F80 0334 0F71
 0FB2 0F80 0F71 0334
 0F77 0061
+0FB2 0F71 0F80 0061
+0FB2 0F81 0061
 0FB2 0591 0F71 0F80 0061
 0FB2 0591 0F81 0061
 0FB2 0F71 0591 0F80 0061
-0FB2 0F71 0F80 0061
 0FB2 0F71 1D165 0F80 0061
-0FB2 0F81 0061
 0FB2 1D165 0F71 0F80 0061
 0FB2 1D165 0F81 0061
 0F77 0041
@@ -86837,8 +87014,8 @@ AADC 0062
 0FB3 0334 0F80
 0FB3 0F80 0334
 0F78 0061
-0FB3 0591 0F80 0061
 0FB3 0F80 0061
+0FB3 0591 0F80 0061
 0FB3 1D165 0F80 0061
 0F78 0041
 0FB3 0F80 0041
@@ -86853,14 +87030,14 @@ AADC 0062
 0F78 0334 0F71
 0F78 0F71 0334
 0FB3 0334 0F71 0F80
-# TODO: Fix ICU ticket #8052 -- 0FB3 0334 0F81
+0FB3 0334 0F81
 0F79 0061
+0FB3 0F71 0F80 0061
+0FB3 0F81 0061
 0FB3 0591 0F71 0F80 0061
 0FB3 0591 0F81 0061
 0FB3 0F71 0591 0F80 0061
-0FB3 0F71 0F80 0061
 0FB3 0F71 1D165 0F80 0061
-0FB3 0F81 0061
 0FB3 1D165 0F71 0F80 0061
 0FB3 1D165 0F81 0061
 0F79 0041
@@ -89922,15 +90099,6 @@ AA76 0062
 11131 0001 11127 0061
 11131 0591 11127 0061
 11131 1D165 11127 0061
-11131 D804 0021
-11131 D804 003F
-11131 D804 0334
-11131 0001 D804 0061
-11131 0591 D804 0061
-11131 D804 0061
-11131 1D165 D804 0061
-11131 D804 0041
-11131 D804 0062
 11132 0021
 11132 003F
 11132 0334
@@ -89940,15 +90108,6 @@ AA76 0062
 11132 0001 11127 0061
 11132 0591 11127 0061
 11132 1D165 11127 0061
-11132 D804 0021
-11132 D804 003F
-11132 D804 0334
-11132 0001 D804 0061
-11132 0591 D804 0061
-11132 D804 0061
-11132 1D165 D804 0061
-11132 D804 0041
-11132 D804 0062
 11133 0021
 11133 003F
 0334 11133
@@ -103394,8 +103553,8 @@ AC00 003F
 1100 0001 1161 0061
 1100 0591 1161 0061
 1100 1161 0061
-1100 1D165 1161 0061
 AC00 0061
+1100 1D165 1161 0061
 1100 1161 0041
 AC00 0041
 320E 0061

diff --git a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/UCAConformanceTest.java b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/UCAConformanceTest.java
index 8763236ffa5d94042a4782d33632dc5c20ee6185..7567beb1ea42c418a3a968c6f6f0d250ff46cc31 100644 (file)
--- a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/UCAConformanceTest.java
+++ b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/UCAConformanceTest.java
@@ -1,6 +1,6 @@
 /********************************************************************
  * COPYRIGHT: 
- * Copyright (c) 2002-2011, International Business Machines Corporation and
+ * Copyright (c) 2002-2012, International Business Machines Corporation and
  * others. All Rights Reserved.
  ********************************************************************/
 
@@ -17,10 +17,12 @@ import java.util.Locale;
 
 import com.ibm.icu.dev.test.TestFmwk;
 import com.ibm.icu.dev.test.TestUtil;
+import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.CollationKey;
 import com.ibm.icu.text.Collator;
 import com.ibm.icu.text.RuleBasedCollator;
 import com.ibm.icu.text.UTF16;
+import com.ibm.icu.util.VersionInfo;
 
 public class UCAConformanceTest extends TestFmwk {
 
@@ -39,9 +41,11 @@ public class UCAConformanceTest extends TestFmwk {
 
         comparer = new UTF16.StringComparator(true, false, UTF16.StringComparator.FOLD_CASE_DEFAULT);
     }
-    RuleBasedCollator UCA;
-    RuleBasedCollator rbUCA;
-    UTF16.StringComparator comparer;
+    private RuleBasedCollator UCA;
+    private RuleBasedCollator rbUCA;
+    private UTF16.StringComparator comparer;
+    private boolean isAtLeastUCA62 =
+        UCharacter.getUnicodeVersion().compareTo(VersionInfo.UNICODE_6_2) >= 0;
 
     public void TestTableNonIgnorable() {
         setCollNonIgnorable(UCA);
@@ -56,30 +60,26 @@ public class UCAConformanceTest extends TestFmwk {
     }
 
     public void TestRulesNonIgnorable() {
-        logln("This test is disabled because it fails here in Java " +
-              "although it passes in C++. TODO: Fix ICU ticket #8923");
-        return;
-        /*
         initRbUCA();
+        if(rbUCA == null) { return; }
 
         setCollNonIgnorable(rbUCA);
         openTestFile("NON_IGNORABLE");
         conformanceTest(rbUCA);
-        */
     }
 
     public void TestRulesShifted() {
         logln("This test is currently disabled, as it is impossible to "+
         "wholly represent fractional UCA using tailoring rules.");
         return;
-        /*        initRbUCA();
-
-         if(U_SUCCESS(status)) {
-         setCollShifted(rbUCA);
-         openTestFile("SHIFTED");
-         testConformance(rbUCA);
-         }
-         */
+        /*
+        initRbUCA();
+        if(rbUCA == null) { return; }
+
+        setCollShifted(rbUCA);
+        openTestFile("SHIFTED");
+        testConformance(rbUCA);
+        */
     }
     BufferedReader in;
     private void openTestFile(String type)
@@ -116,10 +116,10 @@ public class UCAConformanceTest extends TestFmwk {
     private void setCollNonIgnorable(RuleBasedCollator coll) 
     {
         if(coll != null) {
-            coll.setDecomposition(RuleBasedCollator.CANONICAL_DECOMPOSITION);
+            coll.setDecomposition(Collator.CANONICAL_DECOMPOSITION);
             coll.setLowerCaseFirst(false);
             coll.setCaseLevel(false);
-            coll.setStrength(RuleBasedCollator.TERTIARY);
+            coll.setStrength(isAtLeastUCA62 ? Collator.IDENTICAL : Collator.TERTIARY);
             coll.setAlternateHandlingShifted(false);
         }
     }
@@ -127,27 +127,27 @@ public class UCAConformanceTest extends TestFmwk {
     private void setCollShifted(RuleBasedCollator coll) 
     {
         if(coll != null) {
-            coll.setDecomposition(RuleBasedCollator.CANONICAL_DECOMPOSITION);
+            coll.setDecomposition(Collator.CANONICAL_DECOMPOSITION);
             coll.setLowerCaseFirst(false);
             coll.setCaseLevel(false);
-            coll.setStrength(RuleBasedCollator.QUATERNARY);
+            coll.setStrength(isAtLeastUCA62 ? Collator.IDENTICAL : Collator.QUATERNARY);
             coll.setAlternateHandlingShifted(true);
         }
     }
 
 
 
-//    private void initRbUCA() 
-//    {
-//        if(rbUCA == null) {
-//            String ucarules = UCA.getRules(true);
-//            try {
-//                rbUCA = new RuleBasedCollator(ucarules);
-//            } catch(Exception e) {
-//                errln("Failure creating UCA rule-based collator: " + e);
-//            }
-//        }
-//    }
+    private void initRbUCA() 
+    {
+        if(rbUCA == null) {
+            String ucarules = UCA.getRules(true);
+            try {
+                rbUCA = new RuleBasedCollator(ucarules);
+            } catch(Exception e) {
+                errln("Failure creating UCA rule-based collator: " + e);
+            }
+        }
+    }
 
     private String parseString(String line) {
         int i = 0, value;
@@ -173,57 +173,100 @@ public class UCAConformanceTest extends TestFmwk {
         }
 
     }
+
+    private static final int IS_SHIFTED = 1;
+    private static final int FROM_RULES = 2;
+
+    private static boolean skipLineBecauseOfBug(String s, int flags) {
+        // TODO: Fix ICU ticket #8052
+        if(s.length() >= 3 &&
+                (s.charAt(0) == 0xfb2 || s.charAt(0) == 0xfb3) &&
+                s.charAt(1) == 0x334 &&
+                (s.charAt(2) == 0xf73 || s.charAt(2) == 0xf75 || s.charAt(2) == 0xf81)) {
+            return true;
+        }
+        // TODO: Fix ICU ticket #9361
+        if((flags & IS_SHIFTED) != 0 && s.length() >= 2 && s.charAt(0) == 0xfffe) {
+            return true;
+        }
+        // TODO: Fix ICU ticket #9494
+        int c;
+        if(s.length() >= 2 && 0xe0100 <= (c = s.codePointAt(0)) && c <= 0xe01ef) {
+            return true;
+        }
+        // TODO: Fix ICU ticket #8923
+        if((flags & FROM_RULES) != 0 && 0xac00 <= (c = s.charAt(0)) && c <= 0xd7a3) {
+            return true;
+        }
+        // TODO: Fix UCARules.txt.
+        if((flags & FROM_RULES) != 0 && s.length() >= 2 && 0xec0 <= (c = s.charAt(0)) && c <= 0xec4) {
+            return true;
+        }
+        return false;
+    }
+
+    private static int normalizeResult(int result) {
+        return result < 0 ? -1 : result == 0 ? 0 : 1;
+    }
+
     private void conformanceTest(RuleBasedCollator coll) {
         if(in == null || coll == null) {
             return;
         }
+        int skipFlags = 0;
+        if(coll.isAlternateHandlingShifted()) {
+            skipFlags |= IS_SHIFTED;
+        }
+        if(coll == rbUCA) {
+            skipFlags |= FROM_RULES;
+        }
 
         int lineNo = 0;
 
         String line = null, oldLine = null, buffer = null, oldB = null;
         CollationKey oldSk = null, newSk = null;
 
-        int res = 0, cmpres = 0, cmpres2 = 0;
-
         try {
             while ((line = in.readLine()) != null) {
                 lineNo++;
-                if(line.length() < 3 || line.charAt(0) == '#') {
+                if(line.length() == 0 || line.charAt(0) == '#') {
                     continue;
                 }
                 buffer = parseString(line);
 
+                if(skipLineBecauseOfBug(buffer, skipFlags)) {
+                    logln("Skipping line " + lineNo + " because of a known bug");
+                    continue;
+                }
+
                 newSk = coll.getCollationKey(buffer);
                 if(oldSk != null) {
-                    res = oldSk.compareTo(newSk);
-                    cmpres = coll.compare(oldB, buffer);
-                    cmpres2 = coll.compare(buffer, oldB);
+                    int skres = oldSk.compareTo(newSk);
+                    int cmpres = coll.compare(oldB, buffer);
+                    int cmpres2 = coll.compare(buffer, oldB);
 
                     if(cmpres != -cmpres2) {
                         errln("Compare result not symmetrical on line "+lineNo);
                     }
-                    if(((res&0x80000000) != (cmpres&0x80000000)) || (res == 0 && cmpres != 0) || (res != 0 && cmpres == 0)) {
-                        errln("Difference between ucol_strcoll and sortkey compare on line " + lineNo);
-                        logln(oldLine);
-                        logln(line);
+                    if(normalizeResult(cmpres) != normalizeResult(skres)) {
+                        errln("Difference between coll.compare (" + cmpres + ") and sortkey compare (" + skres + ") on line " + lineNo);
+                        errln(oldLine);
+                        errln(line);
                     }
 
+                    int res = cmpres;
+                    if(res == 0 && !isAtLeastUCA62) {
+                        // Up to UCA 6.1, the collation test files use a custom tie-breaker,
+                        // comparing the raw input strings.
+                        res = comparer.compare(oldB, buffer);
+                        // Starting with UCA 6.2, the collation test files use the standard UCA tie-breaker,
+                        // comparing the NFD versions of the input strings,
+                        // which we do via setting strength=identical.
+                    }
                     if(res > 0) {
                         errln("Line " + lineNo + " is not greater or equal than previous line");
-                        logln(oldLine);
-                        logln(line);
-                        cmpres = coll.compare(oldB, buffer);
-                    } else if(res == 0) {  // equal 
-                        res = comparer.compare(oldB, buffer);
-                        if (res == 0) {
-                            errln("Probable error in test file on line " + lineNo +" (comparing identical strings)");
-                            logln(oldLine);
-                            logln(line);
-                        } else if (res > 0) {
-                            errln("Sortkeys are identical, but code point comapare gives >0 on line " + lineNo);
-                            logln(oldLine);
-                            logln(line);
-                        }
+                        errln(oldLine);
+                        errln(line);
                     }
                 }
 
@@ -235,5 +278,4 @@ public class UCAConformanceTest extends TestFmwk {
             errln("Unexpected exception "+e);
         }
     }
-
 }

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 675d15bd4ab774e8b75ffa3474e66df0cd7f7958..7684d39096ab491dd07295cad06f011012614c52 100644 (file)
--- 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,8 +1,8 @@
-# BidiTest-5.2.0.txt
-# Date: 2009-06-03, 17:03:12 GMT [MD]
+# BidiTest-6.2.0.txt
+# Date: 2010-10-06, 03:47:43 GMT [MD]
 #
 # Unicode Character Database
-# Copyright (c) 1991-2009 Unicode, Inc.
+# Copyright (c) 1991-2012 Unicode, Inc.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 # For documentation, see http://www.unicode.org/reports/tr44/
 #
@@ -12,18 +12,14 @@
 #
 # Format:
 #
-# @Type:    <bidi_class>:  <set>
-# These lines define which characters have the bidi_class property value,
-# and are used in the remainder of the test.
-#   <bidi_class> =  The bidi class property value
-#   <set> =         All and only the those codepoints with that property value in <set>.
-#                   <set> is a character range as defined in UTS #18 Unicode Regular Expressions.
-# Example:
-#   @Type:    AN:    [\u0600-\u0603\u0660-\u0669\u066B\u066C\u06DD]
+# All tokens may be separated by whitespaces (space or tab). There are three kinds of lines:
+# Levels, Reorder, and data.
+#
+# A Levels line indicates that all following data lines, up to the next Levels line,
+# have the same resulting ordering levels. It has the following format:
 #
 # @Levels: <levels>
-# These lines indicate that all following* data lines have the same resulting ordering levels
-# (*that is, data lines up to the next @Levels).
+#
 #    <levels> =     An ordered space-delimited list of numbers indicating the resulting levels
 #                   for each input property value. The UBA does not assign levels to certain values;
 #                   those are indicated with an x. See the note below.
@@ -31,24 +27,31 @@
 #   @Levels:    1 0
 #   @Levels:    x 1 x 2
 #
+# A Reorder line indicates that all following data lines, up to the next Reorder line,
+# have the same resulting reordering. It has the following format:
+#
 # @Reorder: <ordering>
-# These lines indicate that all following* data lines have the same resulting reordering
-# (*that is, data lines up to the next @Reorder).
+#
 #    <ordering> =   An ordered space-delimited list of numbers indicating the resulting
-#                   ordering from left to right. The numbers are zero-based. Items with
-#                   a level of x are skipped. Thus "1 0" indicates what would happen
-#                   with input of "L R" and an RTL paragraph direction.
+#                   visual ordering from left to right. The numbers are zero-based, and
+#                   are indexes into the input string. Items with a level of x are skipped.
+#                   Thus "1 0" indicates what would happen with input of "L R" and an RTL
+#                   paragraph direction.
 # Example:
 #   @Reorder:    1 0
 #   @Reorder:    3 1
 #
+# A data line has the following format:
 # <input> ; <bitset>
 #   <input>  =      An ordered list of BIDI property values
-#   <bitset> =      A bitset for paragraph levels (P): 1 = automatic, 2 = LTR, 4 = RTL
+#   <bitset> =      A hex bitset for paragraph levels (P): 1 = auto-LTR, 2 = LTR, 4 = RTL
+#                   Auto-LTR (standard BIDI) uses the first L/R/AL character, and is LTR if none is found.
 # Example:
 #    L LRE R R; 7
 #    L LRE R AL; 7
 #
+# Any other line starting with @ is to be ignored (this allows some degree of forward compatibility).
+#
 # Usage:
 #
 # - If the implementation API allows a list of bidi property values as input:
@@ -60,7 +63,8 @@
 #       If they are different, the test fails.
 #
 # - If the implementation allows for a character string as input,
-#   randomly pick characters from the @type values, and test the reordering as above.
+#   randomly pick characters from those with the same Bidi_Class values,
+#   and test the reordering as above.
 #
 # Note that the UBA doesn't specify the output level or order of certain characters,
 # such as LRO. These are omitted from the reordered output. Thus the following two
@@ -69,24 +73,6 @@
 #   L; 7
 #   L LRE; 7
 #
-@Type: L:      [A-Za-z\u00AA\u00B5\u00BA\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02B8\u02BB-\u02C1\u02D0\u02D1\u02E0-\u02E4\u02EE\u0370-\u0373\u0376-\u037D\u037F-\u0383\u0386\u0388-\u03F5\u03F7-\u0482\u048A-\u0589\u058B-\u058F\u0900\u0903-\u093B\u093D-\u0940\u0949-\u094C\u094E-\u0950\u0955-\u0961\u0964-\u0980\u0982-\u09BB\u09BD-\u09C0\u09C5-\u09CC\u09CE-\u09E1\u09E4-\u09F1\u09F4-\u0A00\u0A03-\u0A3B\u0A3D-\u0A40\u0A43-\u0A46\u0A49\u0A4A\u0A4E-\u0A50\u0A52-\u0A6F\u0A72-\u0A74\u0A76-\u0A80\u0A83-\u0ABB\u0ABD-\u0AC0\u0AC6\u0AC9-\u0ACC\u0ACE-\u0AE1\u0AE4-\u0AF0\u0AF2-\u0B00\u0B02-\u0B3B\u0B3D\u0B3E\u0B40\u0B45-\u0B4C\u0B4E-\u0B55\u0B57-\u0B61\u0B64-\u0B81\u0B83-\u0BBF\u0BC1-\u0BCC\u0BCE-\u0BF2\u0BFB-\u0C3D\u0C41-\u0C45\u0C49\u0C4E-\u0C54\u0C57-\u0C61\u0C64-\u0C77\u0C7F-\u0CBB\u0CBD-\u0CCB\u0CCE-\u0CE1\u0CE4-\u0CF0\u0CF3-\u0D40\u0D45-\u0D4C\u0D4E-\u0D61\u0D64-\u0DC9\u0DCB-\u0DD1\u0DD5\u0DD7-\u0E30\u0E32\u0E33\u0E3B-\u0E3E\u0E40-\u0E46\u0E4F-\u0EB0\u0EB2\u0EB3\u0EBA\u0EBD-\u0EC7\u0ECE-\u0F17\u0F1A-\u0F34\u0F36\u0F38\u0F3E-\u0F70\u0F7F\u0F85\u0F88-\u0F8F\u0F98\u0FBD-\u0FC5\u0FC7-\u102C\u1031\u1038\u103B\u103C\u103F-\u1057\u105A-\u105D\u1061-\u1070\u1075-\u1081\u1083\u1084\u1087-\u108C\u108E-\u135E\u1360-\u138F\u139A-\u167F\u1681-\u169A\u169D-\u1711\u1715-\u1731\u1735-\u1751\u1754-\u1771\u1774-\u17B6\u17BE-\u17C5\u17C7\u17C8\u17D4-\u17DA\u17DC\u17DE-\u17EF\u17FA-\u17FF\u180F-\u18A8\u18AA-\u191F\u1923-\u1926\u1929-\u1931\u1933-\u1938\u193C-\u193F\u1941-\u1943\u1946-\u19DD\u1A00-\u1A16\u1A19-\u1AFF\u1B04-\u1B33\u1B35\u1B3B\u1B3D-\u1B41\u1B43-\u1B6A\u1B74-\u1B7F\u1B82-\u1BA1\u1BA6\u1BA7\u1BAA-\u1C2B\u1C34\u1C35\u1C38-\u1DBF\u1DE7-\u1DFD\u1E00-\u1FBC\u1FBE\u1FC2-\u1FCC\u1FD0-\u1FDC\u1FE0-\u1FEC\u1FF0-\u1FFC\u1FFF\u200E\u2071-\u2073\u207F\u208F-\u209F\u20B6-\u20CF\u20F1-\u20FF\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E-\u2152\u2160-\u218F\u2336-\u237A\u2395\u23E8-\u23FF\u2427-\u243F\u244B-\u245F\u249C-\u24E9\u269E\u269F\u26AC\u26BD-\u26BF\u26C4-\u2700\u2705\u270A\u270B\u2728\u274C\u274E\u2753-\u2755\u2757\u275F\u2760\u2795-\u2797\u27B0\u27BF\u27CB\u27CD-\u27CF\u2800-\u28FF\u2B4D-\u2B4F\u2B55-\u2CE4\u2CEB-\u2CF8\u2D00-\u2DDF\u2E31-\u2E7F\u2E9A\u2EF4-\u2EFF\u2FD6-\u2FEF\u2FFC-\u2FFF\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3040-\u3098\u309D-\u309F\u30A1-\u30FA\u30FC-\u31BF\u31E4-\u321C\u321F-\u324F\u3260-\u327B\u327F-\u32B0\u32C0-\u32CB\u32D0-\u3376\u337B-\u33DD\u33E0-\u33FE\u3400-\u4DBF\u4E00-\uA48F\uA4C7-\uA60C\uA610-\uA66E\uA674-\uA67B\uA680-\uA6FF\uA722-\uA787\uA789-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA824\uA827\uA82C-\uA873\uA878-\uA8C3\uA8C5-\uA925\uA92E-\uA946\uA952-\uAA28\uAA2F\uAA30\uAA33\uAA34\uAA37-\uAA42\uAA44-\uAA4B\uAA4D-\uFB1C\uFE1A-\uFE1F\uFE27-\uFE2F\uFE53\uFE67\uFE6C-\uFE6F\uFF00\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFDF\uFFE7\uFFEF\U00010000-\U00010100\U00010102-\U0001013F\U0001018B-\U0001018F\U0001019C-\U000101FC\U000101FE-\U000107FF\U00011000-\U0001D166\U0001D16A-\U0001D172\U0001D183\U0001D184\U0001D18C-\U0001D1A9\U0001D1AE-\U0001D1FF\U0001D246-\U0001D2FF\U0001D357-\U0001D7CD\U0001D800-\U0001EFFF\U0001F02C-\U0001F02F\U0001F094-\U0001FFFD\U00020000-\U0002FFFD\U00030000-\U0003FFFD\U00040000-\U0004FFFD\U00050000-\U0005FFFD\U00060000-\U0006FFFD\U00070000-\U0007FFFD\U00080000-\U0008FFFD\U00090000-\U0009FFFD\U000A0000-\U000AFFFD\U000B0000-\U000BFFFD\U000C0000-\U000CFFFD\U000D0000-\U000DFFFD\U000E1000-\U000EFFFD\U000F0000-\U000FFFFD\U00100000-\U0010FFFD]
-@Type: LRE:    [\u202A]
-@Type: LRO:    [\u202D]
-@Type: R:      [\u0590\u05BE\u05C0\u05C3\u05C6\u05C8-\u05FF\u07C0-\u07EA\u07F4\u07F5\u07FA-\u08FF\u200F\uFB1D\uFB1F-\uFB28\uFB2A-\uFB4F\U00010800-\U0001091E\U00010920-\U00010A00\U00010A04\U00010A07-\U00010A0B\U00010A10-\U00010A37\U00010A3B-\U00010A3E\U00010A40-\U00010FFF]
-@Type: AL:     [\u0604\u0605\u0608\u060B\u060D\u061B-\u064A\u065F\u066D-\u066F\u0671-\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u070E\u0710\u0712-\u072F\u074B-\u07A5\u07B1-\u07BF\uFB50-\uFD3D\uFD40-\uFDCF\uFDF0-\uFDFC\uFDFE\uFDFF\uFE70-\uFEFE]
-@Type: RLE:    [\u202B]
-@Type: RLO:    [\u202E]
-@Type: PDF:    [\u202C]
-@Type: EN:     [0-9\u00B2\u00B3\u00B9\u06F0-\u06F9\u2070\u2074-\u2079\u2080-\u2089\u2488-\u249B\uFF10-\uFF19\U0001D7CE-\U0001D7FF]
-@Type: ES:     [+\-\u207A\u207B\u208A\u208B\u2212\uFB29\uFE62\uFE63\uFF0B\uFF0D]
-@Type: ET:     [#-%\u00A2-\u00A5\u00B0\u00B1\u0609\u060A\u066A\u09F2\u09F3\u0AF1\u0BF9\u0E3F\u17DB\u2030-\u2034\u20A0-\u20B5\u212E\u2213\uFE5F\uFE69\uFE6A\uFF03-\uFF05\uFFE0\uFFE1\uFFE5\uFFE6]
-@Type: AN:     [\u0600-\u0603\u0660-\u0669\u066B\u066C\u06DD]
-@Type: CS:     [,./\:\u00A0\u060C\u202F\u2044\uFE50\uFE52\uFE55\uFF0C\uFF0E\uFF0F\uFF1A]
-@Type: NSM:    [\u0300-\u036F\u0483-\u0489\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u0610-\u061A\u064B-\u065E\u0670\u06D6-\u06DC\u06DE-\u06E4\u06E7\u06E8\u06EA-\u06ED\u0711\u0730-\u074A\u07A6-\u07B0\u07EB-\u07F3\u0901\u0902\u093C\u0941-\u0948\u094D\u0951-\u0954\u0962\u0963\u0981\u09BC\u09C1-\u09C4\u09CD\u09E2\u09E3\u0A01\u0A02\u0A3C\u0A41\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A70\u0A71\u0A75\u0A81\u0A82\u0ABC\u0AC1-\u0AC5\u0AC7\u0AC8\u0ACD\u0AE2\u0AE3\u0B01\u0B3C\u0B3F\u0B41-\u0B44\u0B4D\u0B56\u0B62\u0B63\u0B82\u0BC0\u0BCD\u0C3E-\u0C40\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C62\u0C63\u0CBC\u0CCC\u0CCD\u0CE2\u0CE3\u0D41-\u0D44\u0D4D\u0D62\u0D63\u0DCA\u0DD2-\u0DD4\u0DD6\u0E31\u0E34-\u0E3A\u0E47-\u0E4E\u0EB1\u0EB4-\u0EB9\u0EBB\u0EBC\u0EC8-\u0ECD\u0F18\u0F19\u0F35\u0F37\u0F39\u0F71-\u0F7E\u0F80-\u0F84\u0F86\u0F87\u0F90-\u0F97\u0F99-\u0FBC\u0FC6\u102D-\u1030\u1032-\u1037\u1039\u103A\u103D\u103E\u1058\u1059\u105E-\u1060\u1071-\u1074\u1082\u1085\u1086\u108D\u135F\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17B7-\u17BD\u17C6\u17C9-\u17D3\u17DD\u180B-\u180D\u18A9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193B\u1A17\u1A18\u1B00-\u1B03\u1B34\u1B36-\u1B3A\u1B3C\u1B42\u1B6B-\u1B73\u1B80\u1B81\u1BA2-\u1BA5\u1BA8\u1BA9\u1C2C-\u1C33\u1C36\u1C37\u1DC0-\u1DE6\u1DFE\u1DFF\u20D0-\u20F0\u2DE0-\u2DFF\u302A-\u302F\u3099\u309A\uA66F-\uA672\uA67C\uA67D\uA802\uA806\uA80B\uA825\uA826\uA8C4\uA926-\uA92D\uA947-\uA951\uAA29-\uAA2E\uAA31\uAA32\uAA35\uAA36\uAA43\uAA4C\uFB1E\uFE00-\uFE0F\uFE20-\uFE26\U000101FD\U00010A01-\U00010A03\U00010A05\U00010A06\U00010A0C-\U00010A0F\U00010A38-\U00010A3A\U00010A3F\U0001D167-\U0001D169\U0001D17B-\U0001D182\U0001D185-\U0001D18B\U0001D1AA-\U0001D1AD\U0001D242-\U0001D244\U000E0100-\U000E01EF]
-@Type: BN:     [^\u0009-\u000D\u001C-~\u0085\u00A0-\u00AC\u00AE-\u070E\u0710-\u200A\u200E-\u205F\u2070-\uFDCF\uFDF0-\uFEFE\uFF00-\uFFEF\uFFF9-\uFFFD\U00010000-\U0001D172\U0001D17B-\U0001FFFD\U00020000-\U0002FFFD\U00030000-\U0003FFFD\U00040000-\U0004FFFD\U00050000-\U0005FFFD\U00060000-\U0006FFFD\U00070000-\U0007FFFD\U00080000-\U0008FFFD\U00090000-\U0009FFFD\U000A0000-\U000AFFFD\U000B0000-\U000BFFFD\U000C0000-\U000CFFFD\U000D0000-\U000DFFFD\U000E0100-\U000E01EF\U000E1000-\U000EFFFD\U000F0000-\U000FFFFD\U00100000-\U0010FFFD]
-@Type: B:      [\u000A\u000D\u001C-\u001E\u0085\u2029]
-@Type: S:      [\u0009\u000B\u001F]
-@Type: WS:     [\u000C\ \u1680\u180E\u2000-\u200A\u2028\u205F\u3000]
 
 @Levels:       x
 @Reorder:      
@@ -219556,3 +219542,5 @@ AN NSM NSM NSM; 7
 #Count:        478
 
 #Total Count:  216357
+
+# EOF
\ No newline at end of file

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 61800b82adc14e7c9c2e864f203b15f2337c006f..b53bb408a5b48feacdeec01607189f0c665d7a80 100644 (file)
--- 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,10 +1,10 @@
-# NormalizationCorrections-6.1.0.txt
-# Date: 2011-06-23, 00:46:00 GMT [KW, LI]
+# NormalizationCorrections-6.2.0.txt
+# Date: 2012-05-15, 22:25:00 GMT [KW, LI]
 #
 # This file is a normative contributory data file in the
 # Unicode Character Database.
 #
-# Copyright (c) 1991-2011 Unicode, Inc.
+# Copyright (c) 1991-2012 Unicode, Inc.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 #
 # The normalization stability policy of the Unicode Consortium
@@ -46,3 +46,5 @@ F951;96FB;964B;3.2.0 # Corrigendum 3
 2F91F;43AB;243AB;4.0.0 # Corrigendum 4
 2F95F;7AAE;7AEE;4.0.0 # Corrigendum 4
 2F9BF;4D57;45D7;4.0.0 # Corrigendum 4
+
+# EOF

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 acc3a9aa27ed38ac5c3fa18633d404adec59b894..995d54b8807034c03d0c1606565a5c6d8dc4fada 100644 (file)
--- 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,8 +1,8 @@
-# NormalizationTest-6.1.0.txt
-# Date: 2011-11-27, 05:10:33 GMT [MD]
+# NormalizationTest-6.2.0.txt
+# Date: 2012-08-14, 17:54:58 GMT [MD]
 #
 # Unicode Character Database
-# Copyright (c) 1991-2011 Unicode, Inc.
+# Copyright (c) 1991-2012 Unicode, Inc.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 # For documentation, see http://www.unicode.org/reports/tr44/
 #
@@ -18428,4 +18428,4 @@ D750 0334 11B5;D750 0334 11B5;1112 1173 0334 11B5;D750 0334 11B5;1112 1173 0334
 11131 0334 11127;11131 0334 11127;11131 0334 11127;11131 0334 11127;11131 0334 11127;
 11132 0334 11127;11132 0334 11127;11132 0334 11127;11132 0334 11127;11132 0334 11127;
 #
-# END OF FILE
+# EOF

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 d650b6d9dcd24012fe0526fa3a2b220618c905f1..994043f01bf28923b4690969f1a6debf0e328720 100644 (file)
--- 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,8 +1,8 @@
-# SpecialCasing-6.1.0.txt
-# Date: 2011-11-27, 05:10:51 GMT [MD]
+# SpecialCasing-6.2.0.txt
+# Date: 2012-05-23, 20:35:15 GMT [MD]
 #
 # Unicode Character Database
-# Copyright (c) 1991-2011 Unicode, Inc.
+# Copyright (c) 1991-2012 Unicode, Inc.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 # For documentation, see http://www.unicode.org/reports/tr44/
 #

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 9f204050c6bb2e587cb1c3154372b8131f9e2f28..086379eb4f34526f18ac207c7b640d60b5c66416 100644 (file)
--- 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
@@ -7190,6 +7190,7 @@
 20B7;SPESMILO SIGN;Sc;0;ET;;;;;N;;;;;
 20B8;TENGE SIGN;Sc;0;ET;;;;;N;;;;;
 20B9;INDIAN RUPEE SIGN;Sc;0;ET;;;;;N;;;;;
+20BA;TURKISH LIRA SIGN;Sc;0;ET;;;;;N;;;;;
 20D0;COMBINING LEFT HARPOON ABOVE;Mn;230;NSM;;;;;N;NON-SPACING LEFT HARPOON ABOVE;;;;
 20D1;COMBINING RIGHT HARPOON ABOVE;Mn;230;NSM;;;;;N;NON-SPACING RIGHT HARPOON ABOVE;;;;
 20D2;COMBINING LONG VERTICAL LINE OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING LONG VERTICAL BAR OVERLAY;;;;
@@ -18703,8 +18704,8 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1242F;CUNEIFORM NUMERIC SIGN THREE SHARU VARIANT FORM;Nl;0;L;;;;3;N;;;;;
 12430;CUNEIFORM NUMERIC SIGN FOUR SHARU;Nl;0;L;;;;4;N;;;;;
 12431;CUNEIFORM NUMERIC SIGN FIVE SHARU;Nl;0;L;;;;5;N;;;;;
-12432;CUNEIFORM NUMERIC SIGN SHAR2 TIMES GAL PLUS DISH;Nl;0;L;;;;;N;;;;;
-12433;CUNEIFORM NUMERIC SIGN SHAR2 TIMES GAL PLUS MIN;Nl;0;L;;;;;N;;;;;
+12432;CUNEIFORM NUMERIC SIGN SHAR2 TIMES GAL PLUS DISH;Nl;0;L;;;;216000;N;;;;;
+12433;CUNEIFORM NUMERIC SIGN SHAR2 TIMES GAL PLUS MIN;Nl;0;L;;;;432000;N;;;;;
 12434;CUNEIFORM NUMERIC SIGN ONE BURU;Nl;0;L;;;;1;N;;;;;
 12435;CUNEIFORM NUMERIC SIGN TWO BURU;Nl;0;L;;;;2;N;;;;;
 12436;CUNEIFORM NUMERIC SIGN THREE BURU;Nl;0;L;;;;3;N;;;;;
@@ -18739,8 +18740,8 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 12453;CUNEIFORM NUMERIC SIGN FOUR BAN2 VARIANT FORM;Nl;0;L;;;;4;N;;;;;
 12454;CUNEIFORM NUMERIC SIGN FIVE BAN2;Nl;0;L;;;;5;N;;;;;
 12455;CUNEIFORM NUMERIC SIGN FIVE BAN2 VARIANT FORM;Nl;0;L;;;;5;N;;;;;
-12456;CUNEIFORM NUMERIC SIGN NIGIDAMIN;Nl;0;L;;;;;N;;;;;
-12457;CUNEIFORM NUMERIC SIGN NIGIDAESH;Nl;0;L;;;;;N;;;;;
+12456;CUNEIFORM NUMERIC SIGN NIGIDAMIN;Nl;0;L;;;;-1;N;;;;;
+12457;CUNEIFORM NUMERIC SIGN NIGIDAESH;Nl;0;L;;;;-1;N;;;;;
 12458;CUNEIFORM NUMERIC SIGN ONE ESHE3;Nl;0;L;;;;1;N;;;;;
 12459;CUNEIFORM NUMERIC SIGN TWO ESHE3;Nl;0;L;;;;2;N;;;;;
 1245A;CUNEIFORM NUMERIC SIGN ONE THIRD DISH;Nl;0;L;;;;1/3;N;;;;;

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 a58a013b11dfaff0b0d854655ae3d6273ab83d11..89da3dda2a214e192ad12629b6259da9a5e700b7 100644 (file)
--- 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
@@ -1,7 +1,7 @@
 /**
 *******************************************************************************
-* Copyright (C) 1996-2011, International Business Machines Corporation and    *
-* others. All Rights Reserved.                                                *
+* Copyright (C) 1996-2012, International Business Machines Corporation and
+* others. All Rights Reserved.
 *******************************************************************************
 */
 
@@ -46,7 +46,7 @@ public final class UCharacterTest extends TestFmwk
     /**
     * ICU4J data version number
     */
-    private final VersionInfo VERSION_ = VersionInfo.getInstance("6.1.0.0");
+    private final VersionInfo VERSION_ = VersionInfo.getInstance("6.2.0.0");
 
     // constructor ===================================================
 
@@ -2221,6 +2221,14 @@ public final class UCharacterTest extends TestFmwk
     {
         // see UnicodeData.txt, DerivedNumericValues.txt
         double values[][] = {
+            // Code point, numeric type, numeric value.
+            // If a fourth value is specified, it is the getNumericValue().
+            // Otherwise it is expected to be the same as the getUnicodeNumericValue(),
+            // where UCharacter.NO_NUMERIC_VALUE is turned into -1.
+            // getNumericValue() returns -2 if the code point has a value
+            // which is not a non-negative integer. (This is mostly auto-converted to -2.)
+            { 0x12456, UCharacter.NumericType.NUMERIC, -1. },
+            { 0x12457, UCharacter.NumericType.NUMERIC, -1. },
             { 0x0F33, UCharacter.NumericType.NUMERIC, -1./2. },
             { 0x0C66, UCharacter.NumericType.DECIMAL, 0 },
             { 0x96f6, UCharacter.NumericType.NUMERIC, 0 },
@@ -2265,10 +2273,12 @@ public final class UCharacterTest extends TestFmwk
             { 0x2181, UCharacter.NumericType.NUMERIC, 5000. },
             { 0x137C, UCharacter.NumericType.NUMERIC, 10000. },
             { 0x4e07, UCharacter.NumericType.NUMERIC, 10000. },
+            { 0x12432, UCharacter.NumericType.NUMERIC, 216000. },
+            { 0x12433, UCharacter.NumericType.NUMERIC, 432000. },
             { 0x4ebf, UCharacter.NumericType.NUMERIC, 100000000. },
             { 0x5146, UCharacter.NumericType.NUMERIC, 1000000000000. },
             { -1, UCharacter.NumericType.NONE, UCharacter.NO_NUMERIC_VALUE },
-            { 0x61, UCharacter.NumericType.NONE, UCharacter.NO_NUMERIC_VALUE },
+            { 0x61, UCharacter.NumericType.NONE, UCharacter.NO_NUMERIC_VALUE, 10. },
             { 0x3000, UCharacter.NumericType.NONE, UCharacter.NO_NUMERIC_VALUE },
             { 0xfffe, UCharacter.NumericType.NONE, UCharacter.NO_NUMERIC_VALUE },
             { 0x10301, UCharacter.NumericType.NONE, UCharacter.NO_NUMERIC_VALUE },
@@ -2288,9 +2298,32 @@ public final class UCharacterTest extends TestFmwk
                        + ") = " + type + " should be " + (int)values[i][1]);
             }
             if (0.000001 <= Math.abs(nv - values[i][2])) {
-                errln("UCharacter.getNumericValue(\\u" + Utility.hex(c, 4)
+                errln("UCharacter.getUnicodeNumericValue(\\u" + Utility.hex(c, 4)
                         + ") = " + nv + " should be " + values[i][2]);
             }
+
+            // Test getNumericValue() as well.
+            // It can only return the subset of numeric values that are
+            // non-negative and fit into an int.
+            int expectedInt;
+            if (values[i].length == 3) {
+                if (values[i][2] == UCharacter.NO_NUMERIC_VALUE) {
+                    expectedInt = -1;
+                } else {
+                    expectedInt = (int)values[i][2];
+                    if (expectedInt < 0 || expectedInt != values[i][2]) {
+                        // The numeric value is not a non-negative integer.
+                        expectedInt = -2;
+                    }
+                }
+            } else {
+                expectedInt = (int)values[i][3];
+            }
+            int nvInt = UCharacter.getNumericValue(c);
+            if (nvInt != expectedInt) {
+                errln("UCharacter.getNumericValue(\\u" + Utility.hex(c, 4)
+                        + ") = " + nvInt + " should be " + expectedInt);
+            }
         }
     }
 

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/UnicodeSetTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/UnicodeSetTest.java
index c55f43150e9ce7e5c7bafacbac90945d658e395f..e466a8f22c771b34816d24a8eea284e782feee3e 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/UnicodeSetTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/UnicodeSetTest.java
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (C) 1996-2011, International Business Machines Corporation and
+ * Copyright (C) 1996-2012, International Business Machines Corporation and
  * others. All Rights Reserved.
  *******************************************************************************
  */
@@ -1138,7 +1138,7 @@ public class UnicodeSetTest extends TestFmwk {
                 // Script_Extensions, new in Unicode 6.0
                 "[:scx=Arab:]",
                 "\\u061E\\u061F\\u0620\\u0621\\u063F\\u0640\\u0650\\u065E\\uFDF1\\uFDF2\\uFDF3",
-                "\\u061D\\u065F\\uFDEF\\uFDFE",
+                "\\u061D\\uFDEF\\uFDFE",
 
                 // U+FDF2 has Script=Arabic and also Arab in its Script_Extensions,
                 // so scx-sc is missing U+FDF2.

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/rbbi/RBBITestMonkey.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/rbbi/RBBITestMonkey.java
index 9e3719b5348f1d9f201a6cd7747ee0951358fd92..b3c57a0e43e9a45fcec7be39fca5e47a80dfb71e 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/rbbi/RBBITestMonkey.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/rbbi/RBBITestMonkey.java
@@ -57,12 +57,12 @@ public class RBBITestMonkey extends TestFmwk {
         // Set the test text on which subsequent calls to next() will operate
         abstract  void   setText(StringBuffer text);
 
-        // Find the next break postion, starting from the specified position.
+        // Find the next break position, starting from the specified position.
         // Return -1 after reaching end of string.
         abstract   int   next(int i);
         
         // A Character Property, one of the constants defined in class UProperty.
-        //   The value fo this property will be displayed for the characters
+        //   The value of this property will be displayed for the characters
         //    near any test failure.  
         int   fCharProperty;
     }
@@ -78,6 +78,7 @@ public class RBBITestMonkey extends TestFmwk {
         UnicodeSet                fCRLFSet;
         UnicodeSet                fControlSet;
         UnicodeSet                fExtendSet;
+        UnicodeSet                fRegionalIndicatorSet;
         UnicodeSet                fPrependSet;
         UnicodeSet                fSpacingSet;
         UnicodeSet                fLSet;
@@ -97,6 +98,7 @@ public class RBBITestMonkey extends TestFmwk {
         fCRLFSet    = new UnicodeSet("[\\r\\n]");
         fControlSet = new UnicodeSet("[\\p{Grapheme_Cluster_Break = Control}]");
         fExtendSet  = new UnicodeSet("[\\p{Grapheme_Cluster_Break = Extend}]");
+        fRegionalIndicatorSet = new UnicodeSet("[\\p{Grapheme_Cluster_Break = Regional_Indicator}]");
         fPrependSet = new UnicodeSet("[\\p{Grapheme_Cluster_Break = Prepend}]");
         fSpacingSet = new UnicodeSet("[\\p{Grapheme_Cluster_Break = SpacingMark}]");
         fLSet       = new UnicodeSet("[\\p{Grapheme_Cluster_Break = L}]");
@@ -117,6 +119,7 @@ public class RBBITestMonkey extends TestFmwk {
         fSets.add(fCRLFSet);
         fSets.add(fControlSet);
         fSets.add(fExtendSet);
+        fSets.add(fRegionalIndicatorSet);
         if (!fPrependSet.isEmpty()) {
             fSets.add(fPrependSet);
         }
@@ -215,11 +218,16 @@ public class RBBITestMonkey extends TestFmwk {
                 continue;
             }
     
+            // Rule (GB8a)   Regional_Indicator x Regional_Indicator
+            if (fRegionalIndicatorSet.contains(c1) && fRegionalIndicatorSet.contains(c2)) {
+                continue;
+            }
+            
             // Rule (GB9)    Numeric x ALetter
             if (fExtendSet.contains(c2))  {
                 continue;
             }
-    
+            
             // Rule (GB9a)   x  SpacingMark
             if (fSpacingSet.contains(c2)) {
                 continue;
@@ -263,6 +271,7 @@ public class RBBITestMonkey extends TestFmwk {
         UnicodeSet                fFormatSet;
         UnicodeSet                fExtendSet;
         UnicodeSet                fExtendNumLetSet;
+        UnicodeSet                fRegionalIndicatorSet;
         UnicodeSet                fOtherSet;
         
         UnicodeSet                fDictionaryCjkSet;
@@ -285,6 +294,7 @@ public class RBBITestMonkey extends TestFmwk {
             fFormatSet       = new UnicodeSet("[\\p{Word_Break = Format}]");
             fExtendNumLetSet = new UnicodeSet("[\\p{Word_Break = ExtendNumLet}]");
             fExtendSet       = new UnicodeSet("[\\p{Word_Break = Extend}]");
+            fRegionalIndicatorSet = new UnicodeSet("[\\p{Word_Break = Regional_Indicator}]");
 
             fOtherSet        = new UnicodeSet();
             fOtherSet.complement();
@@ -299,6 +309,7 @@ public class RBBITestMonkey extends TestFmwk {
             fOtherSet.removeAll(fFormatSet);
             fOtherSet.removeAll(fExtendSet);
             fOtherSet.removeAll(fExtendNumLetSet);
+            fOtherSet.removeAll(fRegionalIndicatorSet);
             // Inhibit dictionary characters from being tested at all.
             // remove surrogates so as to not generate higher CJK characters
             fOtherSet.removeAll(new UnicodeSet("[[\\p{LineBreak = Complex_Context}][:Line_Break=Surrogate:]]"));
@@ -317,6 +328,7 @@ public class RBBITestMonkey extends TestFmwk {
             fSets.add(fFormatSet);
             fSets.add(fExtendSet);
             fSets.add(fExtendNumLetSet);
+            fSets.add(fRegionalIndicatorSet);
             fSets.add(fOtherSet);
         }
         
@@ -354,7 +366,7 @@ public class RBBITestMonkey extends TestFmwk {
                 p1 = p2;  c1 = c2;
                 p2 = p3;  c2 = c3;
                 
-                // Advancd p3 by    X(Extend | Format)*   Rule 4
+                // Advance p3 by    X(Extend | Format)*   Rule 4
                 //    But do not advance over Extend & Format following a new line. (Unicode 5.1 change)
                 do {
                     p3 = moveIndex32(fText, p3, 1);
@@ -467,7 +479,13 @@ public class RBBITestMonkey extends TestFmwk {
                         fKatakanaSet.contains(c2) || fExtendNumLetSet.contains(c2))) {
                     continue;
                 }
-               
+                
+                // Rule 13c   Do not break between Regional Indicators. 
+                //            Regional_Indicator  ×   Regional_Indicator
+                if (fRegionalIndicatorSet.contains(c1) && fRegionalIndicatorSet.contains(c2)) {
+                    continue;
+                }
+                
                 // Rule 14.  Break found here.
                 break;
             }
@@ -519,6 +537,7 @@ public class RBBITestMonkey extends TestFmwk {
         UnicodeSet  fJT;
         UnicodeSet  fH2;
         UnicodeSet  fH3;
+        UnicodeSet  fRI;
         UnicodeSet  fXX;
         
         StringBuffer  fText;
@@ -567,6 +586,7 @@ public class RBBITestMonkey extends TestFmwk {
             fH2    = new UnicodeSet("[\\p{Line_break=H2}]");
             fH3    = new UnicodeSet("[\\p{Line_break=H3}]");
             fSG    = new UnicodeSet("[\\ud800-\\udfff]");
+            fRI    = new UnicodeSet("[\\p{Line_break=RI}]");
             fXX    = new UnicodeSet("[\\p{Line_break=XX}]");
 
             
@@ -614,6 +634,7 @@ public class RBBITestMonkey extends TestFmwk {
             fSets.add(fWJ);
             fSets.add(fSA);
             fSets.add(fSG);
+            fSets.add(fRI);
         }
         
         void setText(StringBuffer s) {
@@ -982,7 +1003,11 @@ public class RBBITestMonkey extends TestFmwk {
                     continue;
                 }
 
-              
+                // LB 30a   Do not break between regional indicators.  RI × RI
+                if (fRI.contains(prevChar) && fRI.contains(thisChar)) {
+                    continue;
+                }
+                
                 // LB 31    Break everywhere else
                 break;            
             }