ICU-11375 ICU root collation: remove Cyrillic contractions

X-SVN-Rev: 36735

icu4c/source/data/coll/be.txt

@@ -10,14 +10,15 @@
  * ICU <specials> source: <path>/xml/collation/be.xml
  */
 be{
-    Version{"2.0.96.14"}
+    Version{"2.1.10.26"}
     collations{
         standard{
             Sequence{
-                "[reorder Cyrl][suppressContractions [АаӘәГгЕеЖжЗзІіОоӨөКкЧчЫыЭэѴѵ]]"
+                "[reorder Cyrl]"
                 "&Е<ё<<<Ё"
+                "&у<ў<<<Ў"
             }
-            Version{"26"}
+            Version{"27"}
         }
     }
 }

icu4c/source/data/coll/bg.txt

@@ -10,14 +10,11 @@
  * ICU <specials> source: <path>/xml/collation/bg.xml
  */
 bg{
-    Version{"2.0.96.14"}
+    Version{"2.1.10.26"}
     collations{
         standard{
-            Sequence{
-                "[reorder Cyrl][suppressContractions [АаӘәГгЕеЖжЗзІіОоӨөКкУуЧчЫыЭэѴѵ]"
-                "]"
-            }
-            Version{"26"}
+            Sequence{"[reorder Cyrl]"}
+            Version{"27"}
         }
     }
 }

icu4c/source/data/coll/kk.txt

@@ -10,16 +10,16 @@
  * ICU <specials> source: <path>/xml/collation/kk.xml
  */
 kk{
-    Version{"2.0.96.14"}
+    Version{"2.1.10.26"}
     collations{
         standard{
             Sequence{
-                "[reorder Cyrl][suppressContractions [АаӘәГгЕеЖжЗзІіОоӨөКкУуЧчЫыЭэѴѵ]]"
+                "[reorder Cyrl]"
                 "&Е<ё<<<Ё"
                 "&Ұ<ү<<<Ү"
                 "&[before 1]ь<і<<<І"
             }
-            Version{"26"}
+            Version{"27"}
         }
     }
 }

icu4c/source/data/coll/ky.txt

@@ -7,5 +7,14 @@
 // *
 // ***************************************************************************
 ky{
-    Version{"2.0.97.57"}
+    Version{"2.1.10.28"}
+    collations{
+        standard{
+            Sequence{
+                "[reorder Cyrl]"
+                "&е<ё<<<Ё"
+            }
+            Version{"27"}
+        }
+    }
 }

icu4c/source/data/coll/mk.txt

@@ -10,11 +10,15 @@
  * ICU <specials> source: <path>/xml/collation/mk.xml
  */
 mk{
-    Version{"2.0.96.14"}
+    Version{"2.1.10.26"}
     collations{
         standard{
-            Sequence{"[reorder Cyrl][suppressContractions [АаӘәЕеЖжЗзИиІіОоӨөУуЧчЫыЭэѴѵ]]"}
-            Version{"26"}
+            Sequence{
+                "[reorder Cyrl][suppressContractions [Ии]]"
+                "&ԃ<ѓ<<<Ѓ"
+                "&ћ<ќ<<<Ќ"
+            }
+            Version{"27"}
         }
     }
 }

icu4c/source/data/coll/ru.txt

@@ -10,14 +10,11 @@
  * ICU <specials> source: <path>/xml/collation/ru.xml
  */
 ru{
-    Version{"2.0.96.14"}
+    Version{"2.1.10.26"}
     collations{
         standard{
-            Sequence{
-                "[reorder Cyrl][suppressContractions [АаӘәГгЕеЖжЗзІіОоӨөКкУуЧчЫыЭэѴѵ]"
-                "]"
-            }
-            Version{"26"}
+            Sequence{"[reorder Cyrl]"}
+            Version{"27"}
         }
     }
 }

icu4c/source/data/coll/sr.txt

@@ -10,14 +10,11 @@
  * ICU <specials> source: <path>/xml/collation/sr.xml
  */
 sr{
-    Version{"2.0.96.14"}
+    Version{"2.1.10.26"}
     collations{
         standard{
-            Sequence{
-                "[reorder Cyrl][suppressContractions [АаӘәГгЕеЖжЗзИиІіОоӨөКкУуЧчЫыЭэѴ"
-                "ѵ]]"
-            }
-            Version{"26"}
+            Sequence{"[reorder Cyrl][suppressContractions [Ии]]"}
+            Version{"27"}
         }
     }
 }

icu4c/source/data/coll/uk.txt

@@ -10,14 +10,15 @@
  * ICU <specials> source: <path>/xml/collation/uk.xml
  */
 uk{
-    Version{"2.0.96.14"}
+    Version{"2.1.10.26"}
     collations{
         standard{
             Sequence{
-                "[reorder Cyrl][suppressContractions [АаӘәГгЕеЖжЗзОоӨөКкУуЧчЫыЭэѴѵ]]"
+                "[reorder Cyrl]"
                 "&Г<ґ<<<Ґ"
+                "&ꙇ<ї<<<\uA676<<<Ї"
             }
-            Version{"26"}
+            Version{"27"}
         }
     }
 }

icu4c/source/data/unidata/UCARules.txt

@@ -1,8 +1,9 @@
 # File:        UCA_Rules_SHORT.txt
-# UCA Version: 7.0.0
-# UCD Version: 7.0.0
-# Generated:   2014-04-08 [MS]
-# For a description of the format and usage, see CollationAuxiliary.html
+# UCA Version: 8.0.0
+# UCD Version: 8.0.0
+# Generated:   2014-10-09 [MS]
+# For a description of the format and usage, see
+# http://www.unicode.org/reports/tr35/tr35-collation.html#Root_Data_Files
 
 & [last tertiary ignorable]
 
@@ -107,7 +108,7 @@
     =	 '\u0602'
     =	 '\u0603'
     =	 '\u0604'
-    =	 ؅
+    =	 '\u0605'
     =	 ؐ
     =	 ؑ
     =	 ؒ
@@ -308,10 +309,10 @@
     =	 𑍲
     =	 𑍳
     =	 𑍴
-    =	 𛲠
-    =	 𛲡
-    =	 𛲢
-    =	 𛲣
+    =	 '\U0001BCA0'
+    =	 '\U0001BCA1'
+    =	 '\U0001BCA2'
+    =	 '\U0001BCA3'
     =	 𝅥
     =	 𝅦
     =	 𝅧
@@ -10866,14 +10867,8 @@
  <	 а
    <<<	 ⷶ
    <<<	 А
- <	 ӑ
-   <<<	 Ӑ
- <	 ӓ
-   <<<	 Ӓ
  <	 ә
    <<<	 Ә
- <	 ӛ
-   <<<	 Ӛ
  <	 ӕ
    <<<	 Ӕ
  <	 б
@@ -10908,17 +10903,11 @@
    <<<	 Ꙣ
  <	 ԃ
    <<<	 Ԃ
- <	 ѓ
-    =	 ѓ
-   <<<	 Ѓ
-    =	 Ѓ
  <	 ҙ
    <<<	 Ҙ
  <	 е
    <<<	 ⷷ
    <<<	 Е
- <	 ӗ
-   <<<	 Ӗ
  <	 є
    <<<	 ꙴ
    <<<	 Є
@@ -10929,8 +10918,6 @@
    <<<	 Ԫ
  <	 ꚅ
    <<<	 Ꚅ
- <	 ӝ
-   <<<	 Ӝ
  <	 җ
    <<<	 Җ
  <	 з
@@ -10942,8 +10929,6 @@
    <<<	 Ԅ
  <	 ԑ
    <<<	 Ԑ
- <	 ӟ
-   <<<	 Ӟ
  <	 ꙃ
    <<<	 Ꙃ
  <	 ѕ
@@ -10963,15 +10948,11 @@
    <<<	 И
  <	 ҋ
    <<<	 Ҋ
- <	 ӥ
-   <<<	 Ӥ
  <	 і
+   <<<	 ꙶ / ̈
    <<<	 І
  <	 ꙇ
    <<<	 Ꙇ
- <	 ї
-   <<<	 ꙶ
-   <<<	 Ї
  <	 й
    <<<	 Й
  <	 ј
@@ -11057,12 +11038,8 @@
     =	 Ꙭ
     =	 Ꚙ
     =	 Ꚛ
- <	 ӧ
-   <<<	 Ӧ
  <	 ө
    <<<	 Ө
- <	 ӫ
-   <<<	 Ӫ
  <	 п
    <<<	 ⷫ
    <<<	 П
@@ -11100,19 +11077,9 @@
    <<<	 Ꚋ
  <	 ћ
    <<<	 Ћ
- <	 ќ
-    =	 ќ
-   <<<	 Ќ
-    =	 Ќ
  <	 у
    <<<	 ꙷ
    <<<	 У
- <	 ў
-   <<<	 Ў
- <	 ӱ
-   <<<	 Ӱ
- <	 ӳ
-   <<<	 Ӳ
  <	 ү
    <<<	 Ү
  <	 ұ
@@ -11168,8 +11135,6 @@
    <<<	 Ԭ
  <	 ꚓ
    <<<	 Ꚓ
- <	 ӵ
-   <<<	 Ӵ
  <	 ҷ
    <<<	 Ҷ
  <	 ӌ
@@ -11205,8 +11170,6 @@
  <	 ы
    <<<	 ꙹ
    <<<	 Ы
- <	 ӹ
-   <<<	 Ӹ
  <	 ь
    <<<	 ꙺ
    <<<	 Ь
@@ -11220,8 +11183,6 @@
    <<<	 Ꙓ
  <	 э
    <<<	 Э
- <	 ӭ
-   <<<	 Ӭ
  <	 ю
    <<<	 ⷻ
    <<<	 Ю
@@ -11263,8 +11224,6 @@
    <<<	 Ѳ
  <	 ѵ
    <<<	 Ѵ
- <	 ѷ
-   <<<	 Ѷ
  <	 ꙟ
    <<<	 Ꙟ
  <	 ҩ

icu4c/source/test/cintltst/cmsccoll.c

@@ -1368,13 +1368,17 @@ static void TestCyrillicTailoring(void) {
     /* Russian overrides contractions, so this test is not valid anymore */
     /*genericLocaleStarter("ru", test, 3);*/
 
-    genericLocaleStarter("root", test, 3);
-    genericRulesStarter("&\\u0410 = \\u0410", test, 3);
-    genericRulesStarter("&Z < \\u0410", test, 3);
+    // Most of the following are commented out because UCA 8.0
+    // drops most of the Cyrillic contractions from the default order.
+    // See CLDR ticket #7246 "root collation: remove Cyrillic contractions".
+
+    // genericLocaleStarter("root", test, 3);
+    // genericRulesStarter("&\\u0410 = \\u0410", test, 3);
+    // genericRulesStarter("&Z < \\u0410", test, 3);
     genericRulesStarter("&\\u0410 = \\u0410 < \\u04d0", test, 3);
     genericRulesStarter("&Z < \\u0410 < \\u04d0", test, 3);
-    genericRulesStarter("&\\u0410 = \\u0410 < \\u0410\\u0301", test, 3);
-    genericRulesStarter("&Z < \\u0410 < \\u0410\\u0301", test, 3);
+    // genericRulesStarter("&\\u0410 = \\u0410 < \\u0410\\u0301", test, 3);
+    // genericRulesStarter("&Z < \\u0410 < \\u0410\\u0301", test, 3);
 }
 
 static void TestSuppressContractions(void) {