Adapt collation in several locales to the new iso14651_t1_common file

[BZ #22550] - es_ES locale (and other es_* locales): collation should
treat ñ as a primary different character, sync the collation
for Spanish with CLDR
[BZ #21547] - Tibetan script collation broken (Dzongkha and Tibetan)

	* localedata/Makefile: Add new test files.
	* localedata/lv_LV.UTF-8.in: Adapt test file to new collation order.
	* localedata/sv_SE.ISO-8859-1.in: Adapt test file to new collation order.
	* localedata/uk_UA.UTF-8.in: Adapt test file to new collation order.
	* localedata/am_ET.UTF-8.in: New test file.
	* localedata/az_AZ.UTF-8.in: Likewise.
	* localedata/be_BY.UTF-8.in: Likewise.
	* localedata/ber_DZ.UTF-8.in: Likewise.
	* localedata/ber_MA.UTF-8.in: Likewise.
	* localedata/bg_BG.UTF-8.in: Likewise.
	* localedata/br_FR.UTF-8.in: Likewise.
	* localedata/cmn_TW.UTF-8.in: Likewise.
	* localedata/crh_UA.UTF-8.in: Likewise.
	* localedata/csb_PL.UTF-8.in: Likewise.
	* localedata/cv_RU.UTF-8.in: Likewise.
	* localedata/cy_GB.UTF-8.in: Likewise.
	* localedata/dz_BT.UTF-8.in: Likewise.
	* localedata/eo.UTF-8.in: Likewise.
	* localedata/es_ES.UTF-8.in: Likewise.
	* localedata/fa_IR.UTF-8.in: Likewise.
	* localedata/fi_FI.UTF-8.in: Likewise.
	* localedata/fil_PH.UTF-8.in: Likewise.
	* localedata/fur_IT.UTF-8.in: Likewise.
	* localedata/gez_ER.UTF-8@abegede.in: Likewise.
	* localedata/ha_NG.UTF-8.in: Likewise.
	* localedata/ig_NG.UTF-8.in: Likewise.
	* localedata/ik_CA.UTF-8.in: Likewise.
	* localedata/kk_KZ.UTF-8.in: Likewise.
	* localedata/ku_TR.UTF-8.in: Likewise.
	* localedata/ky_KG.UTF-8.in: Likewise.
	* localedata/ln_CD.UTF-8.in: Likewise.
	* localedata/mi_NZ.UTF-8.in: Likewise.
	* localedata/ml_IN.UTF-8.in: Likewise.
	* localedata/mn_MN.UTF-8.in: Likewise.
	* localedata/mr_IN.UTF-8.in: Likewise.
	* localedata/mt_MT.UTF-8.in: Likewise.
	* localedata/nb_NO.UTF-8.in: Likewise.
	* localedata/om_KE.UTF-8.in: Likewise.
	* localedata/os_RU.UTF-8.in: Likewise.
	* localedata/ps_AF.UTF-8.in: Likewise.
	* localedata/ro_RO.UTF-8.in: Likewise.
	* localedata/ru_RU.UTF-8.in: Likewise.
	* localedata/sc_IT.UTF-8.in: Likewise.
	* localedata/se_NO.UTF-8.in: Likewise.
	* localedata/sq_AL.UTF-8.in: Likewise.
	* localedata/sv_SE.UTF-8.in: Likewise.
	* localedata/szl_PL.UTF-8.in: Likewise.
	* localedata/tg_TJ.UTF-8.in: Likewise.
	* localedata/tk_TM.UTF-8.in: Likewise.
	* localedata/tt_RU.UTF-8.in: Likewise.
	* localedata/tt_RU.UTF-8@iqtelif.in: Likewise.
	* localedata/ug_CN.UTF-8.in: Likewise.
	* localedata/uz_UZ.UTF-8.in: Likewise.
	* localedata/vi_VN.UTF-8.in: Likewise.
	* localedata/yi_US.UTF-8.in: Likewise.
	* localedata/yo_NG.UTF-8.in: Likewise.
	* localedata/zh_CN.UTF-8.in: Likewise.
	* localedata/locales/am_ET: Adapt collation rules to new iso14651_t1_common
        file and fix bugs in the collation.
	* localedata/locales/az_AZ: Likewise.
	* localedata/locales/be_BY: Likewise.
	* localedata/locales/ber_DZ: Likewise.
	* localedata/locales/ber_MA: Likewise.
	* localedata/locales/bg_BG: Likewise.
	* localedata/locales/br_FR: Likewise.
	* localedata/locales/br_FR@euro: Likewise.
	* localedata/locales/ca_ES: Likewise.
	* localedata/locales/cns11643_stroke: Likewise.
	* localedata/locales/crh_UA: Likewise.
	* localedata/locales/cs_CZ: Likewise.
	* localedata/locales/csb_PL: Likewise.
	* localedata/locales/cv_RU: Likewise.
	* localedata/locales/cy_GB: Likewise.
	* localedata/locales/da_DK: Likewise.
	* localedata/locales/dz_BT: Likewise.
	* localedata/locales/en_CA: Likewise.
	* localedata/locales/eo: Likewise.
	* localedata/locales/es_CU: Likewise.
	* localedata/locales/es_EC: Likewise.
	* localedata/locales/es_ES: Likewise.
	* localedata/locales/es_US: Likewise.
	* localedata/locales/et_EE: Likewise.
	* localedata/locales/fa_IR: Likewise.
	* localedata/locales/fi_FI: Likewise.
	* localedata/locales/fil_PH: Likewise.
	* localedata/locales/fur_IT: Likewise.
	* localedata/locales/gez_ER@abegede: Likewise.
	* localedata/locales/ha_NG: Likewise.
	* localedata/locales/hr_HR: Likewise.
	* localedata/locales/hsb_DE: Likewise.
	* localedata/locales/hu_HU: Likewise.
	* localedata/locales/ig_NG: Likewise.
	* localedata/locales/ik_CA: Likewise.
	* localedata/locales/is_IS: Likewise.
	* localedata/locales/iso14651_t1_pinyin: Likewise.
	* localedata/locales/kk_KZ: Likewise.
	* localedata/locales/ku_TR: Likewise.
	* localedata/locales/ky_KG: Likewise.
	* localedata/locales/ln_CD: Likewise.
	* localedata/locales/lt_LT: Likewise.
	* localedata/locales/lv_LV: Likewise.
	* localedata/locales/mi_NZ: Likewise.
	* localedata/locales/ml_IN: Likewise.
	* localedata/locales/mn_MN: Likewise.
	* localedata/locales/mr_IN: Likewise.
	* localedata/locales/mt_MT: Likewise.
	* localedata/locales/nb_NO: Likewise.
	* localedata/locales/om_KE: Likewise.
	* localedata/locales/os_RU: Likewise.
	* localedata/locales/pl_PL: Likewise.
	* localedata/locales/ps_AF: Likewise.
	* localedata/locales/ro_RO: Likewise.
	* localedata/locales/ru_RU: Likewise.
	* localedata/locales/ru_UA: Likewise.
	* localedata/locales/sc_IT: Likewise.
	* localedata/locales/se_NO: Likewise.
	* localedata/locales/si_LK: Likewise.
	* localedata/locales/sq_AL: Likewise.
	* localedata/locales/sv_FI: Likewise.
	* localedata/locales/sv_FI@euro: Likewise.
	* localedata/locales/sv_SE: Likewise.
	* localedata/locales/szl_PL: Likewise.
	* localedata/locales/tg_TJ: Likewise.
	* localedata/locales/ti_ER: Likewise.
	* localedata/locales/tk_TM: Likewise.
	* localedata/locales/tl_PH: Likewise.
	* localedata/locales/tr_TR: Likewise.
	* localedata/locales/tt_RU: Likewise.
	* localedata/locales/tt_RU@iqtelif: Likewise.
	* localedata/locales/ug_CN: Likewise.
	* localedata/locales/uk_UA: Likewise.
	* localedata/locales/uz_UZ: Likewise.
	* localedata/locales/uz_UZ@cyrillic: Likewise.
	* localedata/locales/vi_VN: Likewise.
	* localedata/locales/yi_US: Likewise.
	* localedata/locales/yo_NG: Likewise.

1 files changed, 239 insertions, 254 deletions

diff --git a/localedata/locales/uk_UA b/localedata/locales/uk_UA
index 552952edb6..b8818bf9c4 100644
--- a/localedata/locales/uk_UA
+++ b/localedata/locales/uk_UA
@@ -254,47 +254,26 @@ END LC_CTYPE
 LC_COLLATE
 % Ukrainian Alpahabet (1881-1933) (old and correct)
 %
-% <U0410><U0430> <U0411><U0431> <U0412><U0432> <U0413><U0433>
-% <U0490><U0491> <U0414><U0434> <U0415><U0435> <U0404><U0454>
-% <U0416><U0436> <U0417><U0437> <U0418><U0438> <U0406><U0456>
-% <U0407><U0457> <U0419><U0439> <U041A><U043A> <U041B><U043B>
-% <U041C><U043C> <U041D><U043D> <U041E><U043E> <U041F><U043F>
-% <U0420><U0440> <U0421><U0441> <U0422><U0442> <U0423><U0443>
-% <U0424><U0444> <U0425><U0445> <U0426><U0446> <U0427><U0447>
-% <U0428><U0448> <U0429><U0449> <U042E><U044E> <U042F><U044F>
-% <U042C><U044C>
-%
+% Аа Бб Вв Гг Ґґ Дд Ее Єє Жж Зз Ии Іі Її Йй Кк Лл Мм Нн Оо Пп Рр Сс Тт Уу Фф
+% Хх Цц Чч Шш Щщ Юю Яя Ьь
 %
 % Ukrainian Alpahabet (1933-1991) (old)
 %
-% <U0410><U0430> <U0411><U0431> <U0412><U0432> <U0413><U0433>
-% <U0414><U0434> <U0415><U0435> <U0404><U0454> <U0416><U0436>
-% <U0417><U0437> <U0418><U0438> <U0406><U0456> <U0407><U0457>
-% <U0419><U0439> <U041A><U043A> <U041B><U043B> <U041C><U043C>
-% <U041D><U043D> <U041E><U043E> <U041F><U043F> <U0420><U0440>
-% <U0421><U0441> <U0422><U0442> <U0423><U0443> <U0424><U0444>
-% <U0425><U0445> <U0426><U0446> <U0427><U0447> <U0428><U0448>
-% <U0429><U0449> <U042E><U044E> <U042F><U044F> <U042C><U044C>
+% Аа Бб Вв Гг Дд Ее Єє Жж Зз Ии Іі Її Йй Кк Лл Мм Нн Оо Пп Рр Сс Тт Уу Фф
+% Хх Цц Чч Шш Щщ Юю Яя Ьь
 %
 % Note:
-% Ukrainian letter GHE_WITH_UPTURN (<U0490>) was removed from Ukrainian
+% Ukrainian letter GHE_WITH_UPTURN (Ґ) was removed from Ukrainian
 % alphabet by Stalin in 1933 and was returned back in 1991 when
 % Ukraine became independent from Soviet Union.
 %
 % Ukrainian Alphabet (1991) (current but not correct)
 %
-% <U0410><U0430> <U0411><U0431> <U0412><U0432> <U0413><U0433>
-% <U0490><U0491> <U0414><U0434> <U0415><U0435> <U0404><U0454>
-% <U0416><U0436> <U0417><U0437> <U0418><U0438> <U0406><U0456>
-% <U0407><U0457> <U0419><U0439> <U041A><U043A> <U041B><U043B>
-% <U041C><U043C> <U041D><U043D> <U041E><U043E> <U041F><U043F>
-% <U0420><U0440> <U0421><U0441> <U0422><U0442> <U0423><U0443>
-% <U0424><U0444> <U0425><U0445> <U0426><U0446> <U0427><U0447>
-% <U0428><U0448> <U0429><U0449> <U042C><U044C> <U042E><U044E>
-% <U042F><U044F>
+% Аа Бб Вв Гг Ґґ Дд Ее Єє Жж Зз Ии Іі Її Йй Кк Лл Мм Нн Оо Пп Рр Сс Тт Уу
+% Фф Хх Цц Чч Шш Щщ Ьь Юю Яя
 %
 % Note:
-% Soft sign (<U042C>) is not considered to be a letter and therefore should have been
+% Soft sign (Ь) is not considered to be a letter and therefore should have been
 % placed at the end of the table. Unfortunately this letter was reordered in
 % Ukrainian alpabet right before Ukraine got independency (1990-1991) by Soviet
 % academic Ivanenko who tried to make MS DOS code pages compatible between
@@ -306,233 +285,239 @@ LC_COLLATE
 
 copy "iso14651_t1"
 
-% Ukrainian ghe is missing in iso14651_t1
-collating-symbol <UKR-GHE>
-
-% Apostrophe must be ignored during sorting because it's just a sign, not a
-% real letter.
-% ( "n`"=="n", "'ya"=="ya", etc. )
-%
-% Apostrophe already ignored by iso14651_t1.
-%
-% In the official alphabet the soft sign is a letter and has a hard position in
-% the order.
-
-
-collating-symbol <CAP-MIN>
-collating-symbol <MIN-CAP>
-
-% Taken from bg_BG 2.0.1:
-
-% We have made the following changes to the basic collation scheme in
-% the file iso14651_t1:
-%   1. The Cyrillic script is first in the order.
-%   2. The non-Bulgarian Cyrillic letters are sorted according to
-%      their transliteration with Bulgarian Cyrillic letters.
-
-% Local changes:
-% Added <UKR-GHE> collation symbol at proper position.
-% Reordering of <UKR-I>,<UKR-YI> to wrong positions (according to Ukrainian
-% alhabet) was removed.
-
-reorder-after <9>
-<CYR-A>
-<CYR-BE>
-<CYR-VE>
-<CYR-GHE>
-<UKR-GHE>
-<CYR-DE>
-<CYR-GZHE>
-<CYR-DJE>
-<CYR-IE>
-<UKR-IE>
-<CYR-IO>
-<CYR-ZHE>
-<CYR-ZE>
-<CYR-DZE>
-<CYR-I>
-<UKR-I>
-<UKR-YI>
-<CYR-IBRE>
-<CYR-JE>
-<CYR-KA>
-<CYR-EL>
-<CYR-LJE>
-<CYR-EM>
-<CYR-EN>
-<CYR-NJE>
-<CYR-O>
-<CYR-PE>
-<CYR-ER>
-<CYR-ES>
-<CYR-TE>
-<CYR-KJE>
-<CYR-TSHE>
-<CYR-OU>
-<CYR-OUBRE>
-<CYR-EF>
-<CYR-HA>
-<CYR-TSE>
-<CYR-CHE>
-<CYR-DCHE>
-<CYR-SHA>
-<CYR-SHTSHA>
-<CYR-SIGDUR>
-<CYR-YEROU>
-<CYR-SIGMOUIL>
-<CYR-E>
-<CYR-YOU>
-<CYR-YA>
-
-% Placing <UKR-GHE> to proper position.
-reorder-after <U0413>
-<U0490> <UKR-GHE>;<BAS>;<CAP>;IGNORE
-<U0403> <CYR-GHE>;<CYR-GZHE>;<CAP>;IGNORE % Mac. gje
-reorder-after <U0433>
-<U0491> <UKR-GHE>;<BAS>;<MIN>;IGNORE
-<U0453> <CYR-GHE>;<CYR-GZHE>;<MIN>;IGNORE % Mac. gje
-
-reorder-after <U0414>
-<U0402> "<U003C><U0043><U0059><U0052><U002D><U0044><U0045><U003E><U003C><U0043><U0059><U0052><U002D><U005A><U0048><U0045><U003E>";"<U003C><U004C><U0049><U0047><U003E><U003C><U004C><U0049><U0047><U003E>";"<U003C><U0043><U0041><U0050><U003E><U003C><U0043><U0041><U0050><U003E>";IGNORE % CYR-DJE
-<U040F> "<U003C><U0043><U0059><U0052><U002D><U0044><U0045><U003E><U003C><U0043><U0059><U0052><U002D><U005A><U0048><U0045><U003E>";"<U003C><U0043><U0059><U0052><U002D><U0044><U0043><U0048><U0045><U003E><U003C><U004C><U0049><U0047><U003E>";"<U003C><U0043><U0041><U0050><U003E><U003C><U0043><U0041><U0050><U003E>";IGNORE % CYR-DCHE
-<U0405> "<U003C><U0043><U0059><U0052><U002D><U0044><U0045><U003E><U003C><U0043><U0059><U0052><U002D><U005A><U0045><U003E>";"<U003C><U004C><U0049><U0047><U003E><U003C><U004C><U0049><U0047><U003E>";"<U003C><U0043><U0041><U0050><U003E><U003C><U0043><U0041><U0050><U003E>";IGNORE % CYR-DZE
-reorder-after <U0434>
-<U0452> "<U003C><U0043><U0059><U0052><U002D><U0044><U0045><U003E><U003C><U0043><U0059><U0052><U002D><U005A><U0048><U0045><U003E>";"<U003C><U004C><U0049><U0047><U003E><U003C><U004C><U0049><U0047><U003E>";"<U003C><U004D><U0049><U004E><U003E><U003C><U004D><U0049><U004E><U003E>";IGNORE % CYR-DJE
-<U045F> "<U003C><U0043><U0059><U0052><U002D><U0044><U0045><U003E><U003C><U0043><U0059><U0052><U002D><U005A><U0048><U0045><U003E>";"<U003C><U0043><U0059><U0052><U002D><U0044><U0043><U0048><U0045><U003E><U003C><U004C><U0049><U0047><U003E>";"<U003C><U004D><U0049><U004E><U003E><U003C><U004D><U0049><U004E><U003E>";IGNORE % CYR-DCHE
-<U0455> "<U003C><U0043><U0059><U0052><U002D><U0044><U0045><U003E><U003C><U0043><U0059><U0052><U002D><U005A><U0045><U003E>";"<U003C><U004C><U0049><U0047><U003E><U003C><U004C><U0049><U0047><U003E>";"<U003C><U004D><U0049><U004E><U003E><U003C><U004D><U0049><U004E><U003E>";IGNORE % CYR-DZE
-
-reorder-after <U0435>
-<U0451> <CYR-IE>;<CYR-IO>;<MIN>;IGNORE
-<U044D> <CYR-IE>;<CYR-E>;<MIN>;IGNORE
-reorder-after <U0415>
-<U0401> <CYR-IE>;<CYR-IO>;<CAP>;IGNORE
-<U042D> <CYR-IE>;<CYR-E>;<CAP>;IGNORE
-
-reorder-after <U041A>
-<U040C> <CYR-KA>;<CYR-KJE>;<CAP>;IGNORE
-reorder-after <U043A>
-<U045C> <CYR-KA>;<CYR-KJE>;<MIN>;IGNORE
-
-reorder-after <U041D>
-<U040A> "<U003C><U0043><U0059><U0052><U002D><U0045><U004E><U003E><U003C><U0043><U0059><U0052><U002D><U0053><U0049><U0047><U004D><U004F><U0055><U0049><U004C><U003E>";"<U003C><U004C><U0049><U0047><U003E><U003C><U004C><U0049><U0047><U003E>";"<U003C><U0043><U0041><U0050><U003E><U003C><U0043><U0041><U0050><U003E>";IGNORE % CYR-NJE
-reorder-after <U043D>
-<U045A> "<U003C><U0043><U0059><U0052><U002D><U0045><U004E><U003E><U003C><U0043><U0059><U0052><U002D><U0053><U0049><U0047><U004D><U004F><U0055><U0049><U004C><U003E>";"<U003C><U004C><U0049><U0047><U003E><U003C><U004C><U0049><U0047><U003E>";"<U003C><U004D><U0049><U004E><U003E><U003C><U004D><U0049><U004E><U003E>";IGNORE % CYR-NJE
-
-reorder-after <U0427>
-<U040B> <CYR-CHE>;<CYR-TSHE>;<CAP>;IGNORE
-reorder-after <U0447>
-<U045B> <CYR-CHE>;<CYR-TSHE>;<MIN>;IGNORE
-
-reorder-after <U041B>
-<U0409> "<U003C><U0043><U0059><U0052><U002D><U0045><U004C><U003E><U003C><U0043><U0059><U0052><U002D><U0053><U0049><U0047><U004D><U004F><U0055><U0049><U004C><U003E>";"<U003C><U004C><U0049><U0047><U003E><U003C><U004C><U0049><U0047><U003E>";"<U003C><U0043><U0041><U0050><U003E><U003C><U0043><U0041><U0050><U003E>";IGNORE % CYR-LJE
-reorder-after <U043B>
-<U0459> "<U003C><U0043><U0059><U0052><U002D><U0045><U004C><U003E><U003C><U0043><U0059><U0052><U002D><U0053><U0049><U0047><U004D><U004F><U0055><U0049><U004C><U003E>";"<U003C><U004C><U0049><U0047><U003E><U003C><U004C><U0049><U0047><U003E>";"<U003C><U004D><U0049><U004E><U003E><U003C><U004D><U0049><U004E><U003E>";IGNORE % CYR-LJE
-
-reorder-after <U0423>
-<U040E> <CYR-OU>;<CYR-OUBRE>;<CAP>;IGNORE
-reorder-after <U0443>
-<U045E> <CYR-OU>;<CYR-OUBRE>;<MIN>;IGNORE
-
-% Capital letters go before small letters. ("A"<"a")
-reorder-after <CAP>
-<CAP-MIN>
-<MIN-CAP>
-<MIN>
+% CLDR collation rules for Ukrainian:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/uk.xml)
+%
+% 		<collation type="standard">
+% 			<cr><![CDATA[
+% [reorder Cyrl]
+% # The root collation already sorts й/Й as a base letter.
+% &Г<ґ<<<Ґ
+% &ꙇ<ї<<<\uA676<<<Ї  # U+A676=COMBINING CYRILLIC LETTER YI
+% 			]]></cr>
+% 		</collation>
+%
+% And CLDR also lists the following
+% index characters:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/main/uk.xml)
+%
+% <exemplarCharacters type="index">[А Б В Г Ґ Д Е Є Ж З И І Ї Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ю Я]</exemplarCharacters>
+%
+% The following rules implement the same order for glibc.
 
+collating-symbol <cyrillic-ghe-with-upturn>
+collating-symbol <cyrillic-yi>
+
+reorder-after <RES-1>
+<COMPATCAP>
+<CAP>
+<COMPAT>
+<MIN>
 
-% Reorder letters with soft sign
-% [<U0432><U0434><U0437><U043B><U043D><U0440><U0441><U0442><U0446>] + <U044C>
-
-reorder-after <CYR-VE>
-<V+SS>
-reorder-after <U0412>
-<V-SS> <CYR-VE>;<BAS>;<CAP>;<V+SS>
-<V-ss> <CYR-VE>;<BAS>;<CAP-MIN>;<V+SS>
-reorder-after <U0432>
-<v-SS> <CYR-VE>;<BAS>;<MIN-CAP>;<V+SS>
-<v-ss> <CYR-VE>;<BAS>;<MIN>;<V+SS>
-
-reorder-after <CYR-DE>
-<D+SS>
-reorder-after <U0414>
-<D-SS> <CYR-DE>;<BAS>;<CAP>;<D+SS>
-<D-ss> <CYR-DE>;<BAS>;<CAP-MIN>;<D+SS>
-reorder-after <U0434>
-<d-SS> <CYR-DE>;<BAS>;<MIN-CAP>;<D+SS>
-<d-ss> <CYR-DE>;<BAS>;<MIN>;<D+SS>
-
-reorder-after <CYR-ZE>
-<Z+SS>
-reorder-after <U0417>
-<Z-SS> <CYR-ZE>;<BAS>;<CAP>;<Z+SS>
-<Z-ss> <CYR-ZE>;<BAS>;<CAP-MIN>;<Z+SS>
-reorder-after <U0437>
-<z-SS> <CYR-ZE>;<BAS>;<MIN-CAP>;<Z+SS>
-<z-ss> <CYR-ZE>;<BAS>;<MIN>;<Z+SS>
-
-reorder-after <CYR-EL>
-<L+SS>
-reorder-after <U041B>
-<L-SS> <CYR-EL>;<BAS>;<CAP>;<L+SS>
-<L-ss> <CYR-EL>;<BAS>;<CAP-MIN>;<L+SS>
-reorder-after <U043B>
-<l-SS> <CYR-EL>;<BAS>;<MIN-CAP>;<L+SS>
-<l-ss> <CYR-EL>;<BAS>;<MIN>;<L+SS>
-
-reorder-after <CYR-EN>
-<N+SS>
-reorder-after <U041D>
-<N-SS> <CYR-EN>;<BAS>;<CAP>;<N+SS>
-<N-ss> <CYR-EN>;<BAS>;<CAP-MIN>;<N+SS>
-reorder-after <U043D>
-<n-SS> <CYR-EN>;<BAS>;<MIN-CAP>;<N+SS>
-<n-ss> <CYR-EN>;<BAS>;<MIN>;<N+SS>
-
-reorder-after <CYR-ER>
-<R+SS>
-reorder-after <U0420>
-<R-SS> <CYR-ER>;<BAS>;<CAP>;<R+SS>
-<R-ss> <CYR-ER>;<BAS>;<CAP-MIN>;<R+SS>
-reorder-after <U0440>
-<r-SS> <CYR-ER>;<BAS>;<MIN-CAP>;<R+SS>
-<r-ss> <CYR-ER>;<BAS>;<MIN>;<R+SS>
-
-reorder-after <CYR-ES>
-<S+SS>
-reorder-after <U0421>
-<S-SS> <CYR-ES>;<BAS>;<CAP>;<S+SS>
-<S-ss> <CYR-ES>;<BAS>;<CAP-MIN>;<S+SS>
-reorder-after <U0441>
-<s-SS> <CYR-ES>;<BAS>;<MIN-CAP>;<S+SS>
-<s-ss> <CYR-ES>;<BAS>;<MIN>;<S+SS>
-
-reorder-after <CYR-TE>
-<T+SS>
-reorder-after <U0422>
-<T-SS> <CYR-TE>;<BAS>;<CAP>;<T+SS>
-<T-ss> <CYR-TE>;<BAS>;<CAP-MIN>;<T+SS>
-reorder-after <U0442>
-<t-SS> <CYR-TE>;<BAS>;<MIN-CAP>;<T+SS>
-<t-ss> <CYR-TE>;<BAS>;<MIN>;<T+SS>
-
-reorder-after <CYR-TSE>
-<TSE+SS>
-reorder-after <U0426>
-<TS-SS> <CYR-TSE>;<BAS>;<CAP>;<TSE+SS>
-<TS-ss> <CYR-TSE>;<BAS>;<CAP-MIN>;<TSE+SS>
-reorder-after <U0446>
-<ts-SS> <CYR-TSE>;<BAS>;<MIN-CAP>;<TSE+SS>
-<ts-ss> <CYR-TSE>;<BAS>;<MIN>;<TSE+SS>
-
-% To get back to correct but still unofficial pre-1991 alphabet uncomment the
-% following lines that move soft sign (<CYR-YEROU>) to the end of the alphabet.
-%
-% reorder-after <CYR-YA>
-% <CYR-YEROU>
-% reorder-after <U042F>
-% <U042C> <CYR-YEROU>;<BAS>;<CAP>;IGNORE
-% reorder-after <U044F>
-% <U044C> <CYR-YEROU>;<BAS>;<MIN>;IGNORE
+% Put Cyrillic before Latin because CLDR has:
+%
+% [reorder Cyrl]
+%
+% and because the old glibc collation for Ukrainian also did put
+% Cyrillic before Latin.
+%
+% I copied the whole Cyrillic block from iso14651_t1_common here.
+%
+% I cannot find any better way doing this.
+reorder-after <BEFORE-LATIN>
+<S0430> % CYRILLIC SMALL LETTER A
+<S04D9> % CYRILLIC SMALL LETTER SCHWA
+<S04D5> % CYRILLIC SMALL LIGATURE A IE
+<S0431> % CYRILLIC SMALL LETTER BE
+<S0432> % CYRILLIC SMALL LETTER VE
+<S0433> % CYRILLIC SMALL LETTER GHE
+<S0493> % CYRILLIC SMALL LETTER GHE WITH STROKE
+<S04FB> % CYRILLIC SMALL LETTER GHE WITH STROKE AND HOOK
+<S0495> % CYRILLIC SMALL LETTER GHE WITH MIDDLE HOOK
+<S04F7> % CYRILLIC SMALL LETTER GHE WITH DESCENDER
+<S0434> % CYRILLIC SMALL LETTER DE
+<S0501> % CYRILLIC SMALL LETTER KOMI DE
+<SA681> % CYRILLIC SMALL LETTER DWE
+<S0452> % CYRILLIC SMALL LETTER DJE
+<SA663> % CYRILLIC SMALL LETTER SOFT DE
+<S0503> % CYRILLIC SMALL LETTER KOMI DJE
+<S0499> % CYRILLIC SMALL LETTER ZE WITH DESCENDER
+<S0435> % CYRILLIC SMALL LETTER IE
+<S0454> % CYRILLIC SMALL LETTER UKRAINIAN IE
+<S0436> % CYRILLIC SMALL LETTER ZHE
+<S052B> % CYRILLIC SMALL LETTER DZZHE
+<SA685> % CYRILLIC SMALL LETTER ZHWE
+<S0497> % CYRILLIC SMALL LETTER ZHE WITH DESCENDER
+<S0437> % CYRILLIC SMALL LETTER ZE
+<SA641> % CYRILLIC SMALL LETTER ZEMLYA
+<S0505> % CYRILLIC SMALL LETTER KOMI ZJE
+<S0511> % CYRILLIC SMALL LETTER REVERSED ZE
+<SA643> % CYRILLIC SMALL LETTER DZELO
+<S0455> % CYRILLIC SMALL LETTER DZE
+<SA645> % CYRILLIC SMALL LETTER REVERSED DZE
+<S04E1> % CYRILLIC SMALL LETTER ABKHASIAN DZE
+<SA689> % CYRILLIC SMALL LETTER DZZE
+<S0507> % CYRILLIC SMALL LETTER KOMI DZJE
+<SA683> % CYRILLIC SMALL LETTER DZWE
+<S0438> % CYRILLIC SMALL LETTER I
+<S048B> % CYRILLIC SMALL LETTER SHORT I WITH TAIL
+<S0456> % CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
+<SA647> % CYRILLIC SMALL LETTER IOTA
+<S0439> % CYRILLIC SMALL LETTER SHORT I
+<S0458> % CYRILLIC SMALL LETTER JE
+<SA649> % CYRILLIC SMALL LETTER DJERV
+<S043A> % CYRILLIC SMALL LETTER KA
+<S049B> % CYRILLIC SMALL LETTER KA WITH DESCENDER
+<S04C4> % CYRILLIC SMALL LETTER KA WITH HOOK
+<S04A1> % CYRILLIC SMALL LETTER BASHKIR KA
+<S049F> % CYRILLIC SMALL LETTER KA WITH STROKE
+<S049D> % CYRILLIC SMALL LETTER KA WITH VERTICAL STROKE
+<S051F> % CYRILLIC SMALL LETTER ALEUT KA
+<S051B> % CYRILLIC SMALL LETTER QA
+<S043B> % CYRILLIC SMALL LETTER EL
+<S1D2B> % CYRILLIC LETTER SMALL CAPITAL EL
+<S04C6> % CYRILLIC SMALL LETTER EL WITH TAIL
+<S052F> % CYRILLIC SMALL LETTER EL WITH DESCENDER
+<S0513> % CYRILLIC SMALL LETTER EL WITH HOOK
+<S0521> % CYRILLIC SMALL LETTER EL WITH MIDDLE HOOK
+<S0459> % CYRILLIC SMALL LETTER LJE
+<SA665> % CYRILLIC SMALL LETTER SOFT EL
+<S0509> % CYRILLIC SMALL LETTER KOMI LJE
+<S0515> % CYRILLIC SMALL LETTER LHA
+<S043C> % CYRILLIC SMALL LETTER EM
+<S04CE> % CYRILLIC SMALL LETTER EM WITH TAIL
+<SA667> % CYRILLIC SMALL LETTER SOFT EM
+<S043D> % CYRILLIC SMALL LETTER EN
+<S0529> % CYRILLIC SMALL LETTER EN WITH LEFT HOOK
+<S04CA> % CYRILLIC SMALL LETTER EN WITH TAIL
+<S04A3> % CYRILLIC SMALL LETTER EN WITH DESCENDER
+<S04C8> % CYRILLIC SMALL LETTER EN WITH HOOK
+<S0523> % CYRILLIC SMALL LETTER EN WITH MIDDLE HOOK
+<S04A5> % CYRILLIC SMALL LIGATURE EN GHE
+<S045A> % CYRILLIC SMALL LETTER NJE
+<S050B> % CYRILLIC SMALL LETTER KOMI NJE
+<S043E> % CYRILLIC SMALL LETTER O
+<S04E9> % CYRILLIC SMALL LETTER BARRED O
+<S043F> % CYRILLIC SMALL LETTER PE
+<S0525> % CYRILLIC SMALL LETTER PE WITH DESCENDER
+<S04A7> % CYRILLIC SMALL LETTER PE WITH MIDDLE HOOK
+<S0481> % CYRILLIC SMALL LETTER KOPPA
+<S0440> % CYRILLIC SMALL LETTER ER
+<S048F> % CYRILLIC SMALL LETTER ER WITH TICK
+<S0517> % CYRILLIC SMALL LETTER RHA
+<S0441> % CYRILLIC SMALL LETTER ES
+<S050D> % CYRILLIC SMALL LETTER KOMI SJE
+<S04AB> % CYRILLIC SMALL LETTER ES WITH DESCENDER
+<S0442> % CYRILLIC SMALL LETTER TE
+<SA68D> % CYRILLIC SMALL LETTER TWE
+<S050F> % CYRILLIC SMALL LETTER KOMI TJE
+<S04AD> % CYRILLIC SMALL LETTER TE WITH DESCENDER
+<SA68B> % CYRILLIC SMALL LETTER TE WITH MIDDLE HOOK
+<S045B> % CYRILLIC SMALL LETTER TSHE
+<S0443> % CYRILLIC SMALL LETTER U
+<S04AF> % CYRILLIC SMALL LETTER STRAIGHT U
+<S04B1> % CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE
+<SA64B> % CYRILLIC SMALL LETTER MONOGRAPH UK
+<S0479> % CYRILLIC SMALL LETTER UK
+<S0444> % CYRILLIC SMALL LETTER EF
+<S0445> % CYRILLIC SMALL LETTER HA
+<S04FD> % CYRILLIC SMALL LETTER HA WITH HOOK
+<S04FF> % CYRILLIC SMALL LETTER HA WITH STROKE
+<S04B3> % CYRILLIC SMALL LETTER HA WITH DESCENDER
+<S04BB> % CYRILLIC SMALL LETTER SHHA
+<S0527> % CYRILLIC SMALL LETTER SHHA WITH DESCENDER
+<SA695> % CYRILLIC SMALL LETTER HWE
+<S0461> % CYRILLIC SMALL LETTER OMEGA
+<S047F> % CYRILLIC SMALL LETTER OT
+<SA64D> % CYRILLIC SMALL LETTER BROAD OMEGA
+<S047D> % CYRILLIC SMALL LETTER OMEGA WITH TITLO
+<S047B> % CYRILLIC SMALL LETTER ROUND OMEGA
+<S0446> % CYRILLIC SMALL LETTER TSE
+<SA661> % CYRILLIC SMALL LETTER REVERSED TSE
+<SA68F> % CYRILLIC SMALL LETTER TSWE
+<S04B5> % CYRILLIC SMALL LIGATURE TE TSE
+<SA691> % CYRILLIC SMALL LETTER TSSE
+<S0447> % CYRILLIC SMALL LETTER CHE
+<S052D> % CYRILLIC SMALL LETTER DCHE
+<SA693> % CYRILLIC SMALL LETTER TCHE
+<S04B7> % CYRILLIC SMALL LETTER CHE WITH DESCENDER
+<S04CC> % CYRILLIC SMALL LETTER KHAKASSIAN CHE
+<S04B9> % CYRILLIC SMALL LETTER CHE WITH VERTICAL STROKE
+<SA687> % CYRILLIC SMALL LETTER CCHE
+<S04BD> % CYRILLIC SMALL LETTER ABKHASIAN CHE
+<S04BF> % CYRILLIC SMALL LETTER ABKHASIAN CHE WITH DESCENDER
+<S045F> % CYRILLIC SMALL LETTER DZHE
+<S0448> % CYRILLIC SMALL LETTER SHA
+<SA697> % CYRILLIC SMALL LETTER SHWE
+<S0449> % CYRILLIC SMALL LETTER SHCHA
+<SA64F> % CYRILLIC SMALL LETTER NEUTRAL YER
+<S2E2F> % VERTICAL TILDE
+<SA67F> % CYRILLIC PAYEROK
+<S044A> % CYRILLIC SMALL LETTER HARD SIGN
+<SA651> % CYRILLIC SMALL LETTER YERU WITH BACK YER
+<S044B> % CYRILLIC SMALL LETTER YERU
+<S044C> % CYRILLIC SMALL LETTER SOFT SIGN
+<S048D> % CYRILLIC SMALL LETTER SEMISOFT SIGN
+<S0463> % CYRILLIC SMALL LETTER YAT
+<SA653> % CYRILLIC SMALL LETTER IOTIFIED YAT
+<S044D> % CYRILLIC SMALL LETTER E
+<S044E> % CYRILLIC SMALL LETTER YU
+<SA655> % CYRILLIC SMALL LETTER REVERSED YU
+<SA657> % CYRILLIC SMALL LETTER IOTIFIED A
+<S044F> % CYRILLIC SMALL LETTER YA
+<S0519> % CYRILLIC SMALL LETTER YAE
+<S0465> % CYRILLIC SMALL LETTER IOTIFIED E
+<S0467> % CYRILLIC SMALL LETTER LITTLE YUS
+<SA659> % CYRILLIC SMALL LETTER CLOSED LITTLE YUS
+<S046B> % CYRILLIC SMALL LETTER BIG YUS
+<SA65B> % CYRILLIC SMALL LETTER BLENDED YUS
+<S0469> % CYRILLIC SMALL LETTER IOTIFIED LITTLE YUS
+<SA65D> % CYRILLIC SMALL LETTER IOTIFIED CLOSED LITTLE YUS
+<S046D> % CYRILLIC SMALL LETTER IOTIFIED BIG YUS
+<S046F> % CYRILLIC SMALL LETTER KSI
+<S0471> % CYRILLIC SMALL LETTER PSI
+<S0473> % CYRILLIC SMALL LETTER FITA
+<S0475> % CYRILLIC SMALL LETTER IZHITSA
+<SA65F> % CYRILLIC SMALL LETTER YN
+<S04A9> % CYRILLIC SMALL LETTER ABKHASIAN HA
+<S051D> % CYRILLIC SMALL LETTER WE
+<S04CF> % CYRILLIC SMALL LETTER PALOCHKA
+
+% &Г<ґ<<<Ґ
+reorder-after <S0433> % г CYRILLIC SMALL LETTER GHE
+<cyrillic-ghe-with-upturn>
+
+% &ꙇ<ї<<<\uA676<<<Ї  # U+A676=COMBINING CYRILLIC LETTER YI
+reorder-after <SA647> % ꙇ CYRILLIC SMALL LETTER IOTA
+<cyrillic-yi>
+
+% &Г<ґ<<<Ґ
+<U0491> <cyrillic-ghe-with-upturn>;"<BASE>";"<MIN>";<U0491> % ґ CYRILLIC SMALL LETTER GHE WITH UPTURN
+<U0490> <cyrillic-ghe-with-upturn>;"<BASE>";"<CAP>";<U0490> % Ґ CYRILLIC CAPITAL LETTER GHE WITH UPTURN
+
+% &ꙇ<ї<<<\uA676<<<Ї  # U+A676=COMBINING CYRILLIC LETTER YI
+<U0457> <cyrillic-yi>;"<BASE>";"<MIN>";<U0457> % ї CYRILLIC SMALL LETTER YI
+<UA676> <cyrillic-yi>;"<BASE>";"<COMPAT>";<UA676> % ꙶ COMBINING CYRILLIC LETTER YI
+<U0407> <cyrillic-yi>;"<BASE>";"<CAP>";<U0407> % Ї CYRILLIC CAPITAL LETTER YI
+
+% Make ʼ U+02BC MODIFIER LETTER APOSTROPHE behave like
+% ' U+0027 APOSTROPHE and ’ U+2019 RIGHT SINGLE QUOTATION MARK
+% to make these sort close to each other. The original entry in
+% iso14651_t1_common for ʼ U+S02BC MODIFIER LETTER APOSTROPHE
+% looks like:
+%
+%     <U02BC> <S02BC>;<BASE>;<MIN>;<U02BC> % MODIFIER LETTER APOSTROPHE
+%
+% i.e. it is treated as a base letter whereas U+0027 and U+2019 are
+% treated as punctuation.
+%
+% See also: https://en.wikipedia.org/wiki/Modifier_letter_apostrophe
+%
+% These apostrophe variants are sorted in  the order of the
+% following lines:
+<U0027> IGNORE;IGNORE;IGNORE;<U0027> % APOSTROPHE
+<U2019> IGNORE;IGNORE;IGNORE;<U2019> % RIGHT SINGLE QUOTATION MARK
+<U02BC> IGNORE;IGNORE;IGNORE;<U02BC> % MODIFIER LETTER APOSTROPHE
 
 reorder-end