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.
2024-11-26 19:23:34 +08:00 · 2017-12-11 18:26:22 +01:00 · 2017-12-11 18:26:22 +01:00 · 1597385481
commit 1597385481
parent ce6636b06b
139 changed files with 112618 additions and 5377 deletions
--- a/144
+++ b/144
@ -1,3 +1,147 @@
+2018-02-27  Mike FABIAN  <mfabian@redhat.com>
+
+	[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.
+
 2018-02-27  Mike FABIAN  <mfabian@redhat.com>

 	* gen-locales.mk: Make test files which contain @ modifiers in their
--- a/localedata/Makefile
+++ b/localedata/Makefile
@ -35,12 +35,85 @@ vpath %.h tests-mbwc

 test-srcs := collate-test xfrm-test tst-fmon tst-rpmatch tst-trans \
 	     tst-ctype tst-langinfo tst-langinfo-static tst-numeric
-test-input := de_DE.ISO-8859-1 en_US.ISO-8859-1 da_DK.ISO-8859-1 \
-	      hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 tr_TR.UTF-8 fr_FR.UTF-8 \
-	      si_LK.UTF-8 uk_UA.UTF-8 hu_HU.UTF-8 lv_LV.UTF-8 \
-	      pl_PL.UTF-8 cs_CZ.UTF-8 fr_CA.UTF-8 hr_HR.UTF-8 \
-	      bs_BA.UTF-8 sr_RS.UTF-8 is_IS.UTF-8 et_EE.UTF-8 \
-	      hsb_DE.UTF-8 lt_LT.UTF-8
+# List of test input files (list sorted alphabetically):
+test-input := \
+	am_ET.UTF-8 \
+	az_AZ.UTF-8 \
+	be_BY.UTF-8 \
+	ber_DZ.UTF-8 \
+	ber_MA.UTF-8 \
+	bg_BG.UTF-8 \
+	br_FR.UTF-8 \
+	bs_BA.UTF-8 \
+	cmn_TW.UTF-8 \
+	crh_UA.UTF-8 \
+	cs_CZ.UTF-8 \
+	csb_PL.UTF-8 \
+	cv_RU.UTF-8 \
+	cy_GB.UTF-8 \
+	da_DK.ISO-8859-1 \
+	de_DE.ISO-8859-1 \
+	dz_BT.UTF-8 \
+	en_US.ISO-8859-1 \
+	eo.UTF-8 \
+	es_ES.UTF-8 \
+	et_EE.UTF-8 \
+	fa_IR.UTF-8 \
+	fi_FI.UTF-8 \
+	fil_PH.UTF-8 \
+	fr_CA.UTF-8 \
+	fr_FR.UTF-8 \
+	fur_IT.UTF-8 \
+	gez_ER.UTF-8@abegede \
+	ha_NG.UTF-8 \
+	hr_HR.ISO-8859-2 \
+	hr_HR.UTF-8 \
+	hsb_DE.UTF-8 \
+	hu_HU.UTF-8 \
+	ig_NG.UTF-8 \
+	ik_CA.UTF-8 \
+	is_IS.UTF-8 \
+	kk_KZ.UTF-8 \
+	ku_TR.UTF-8 \
+	ky_KG.UTF-8 \
+	ln_CD.UTF-8 \
+	lt_LT.UTF-8 \
+	lv_LV.UTF-8 \
+	mi_NZ.UTF-8 \
+	ml_IN.UTF-8 \
+	mn_MN.UTF-8 \
+	mr_IN.UTF-8 \
+	mt_MT.UTF-8 \
+	nan_TW.UTF-8@latin \
+	nb_NO.UTF-8 \
+	om_KE.UTF-8 \
+	os_RU.UTF-8 \
+	pl_PL.UTF-8 \
+	ps_AF.UTF-8 \
+	ro_RO.UTF-8 \
+	ru_RU.UTF-8 \
+	sc_IT.UTF-8 \
+	se_NO.UTF-8 \
+	si_LK.UTF-8 \
+	sq_AL.UTF-8 \
+	sr_RS.UTF-8 \
+	sv_SE.ISO-8859-1 \
+	sv_SE.UTF-8 \
+	szl_PL.UTF-8 \
+	tg_TJ.UTF-8 \
+	tk_TM.UTF-8 \
+	tr_TR.UTF-8 \
+	tt_RU.UTF-8 \
+	tt_RU.UTF-8@iqtelif \
+	ug_CN.UTF-8 \
+	uk_UA.UTF-8 \
+	uz_UZ.UTF-8 \
+	vi_VN.UTF-8 \
+	yi_US.UTF-8 \
+	yo_NG.UTF-8 \
+	zh_CN.UTF-8 \
+	$(NULL)
+
 test-input-data = $(addsuffix .in, $(test-input))
 test-output := $(foreach s, .out .xout, \
 			 $(addsuffix $s, $(basename $(test-input))))
@ -103,15 +176,97 @@ tests-special += $(objpfx)sort-test.out $(objpfx)tst-fmon.out \
 		 $(objpfx)tst-trans.out $(objpfx)tst-ctype.out \
 		 $(objpfx)tst-langinfo.out $(objpfx)tst-langinfo-static.out \
 		 $(objpfx)tst-numeric.out
-# We have to generate locales
-LOCALES := de_DE.ISO-8859-1 de_DE.UTF-8 en_US.ANSI_X3.4-1968 \
-	   en_US.ISO-8859-1 en_US.UTF-8 ja_JP.EUC-JP da_DK.ISO-8859-1 \
-	   hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 ja_JP.SJIS fr_FR.ISO-8859-1 \
-	   nb_NO.ISO-8859-1 nn_NO.ISO-8859-1 tr_TR.UTF-8 cs_CZ.UTF-8 \
-	   zh_TW.EUC-TW fa_IR.UTF-8 fr_FR.UTF-8 ja_JP.UTF-8 si_LK.UTF-8 \
-	   tr_TR.ISO-8859-9 en_GB.UTF-8 uk_UA.UTF-8 hu_HU.UTF-8 lv_LV.UTF-8 \
-	   pl_PL.UTF-8 fr_CA.UTF-8 hr_HR.UTF-8 bs_BA.UTF-8 sr_RS.UTF-8 \
-	   is_IS.UTF-8 et_EE.UTF-8 hsb_DE.UTF-8 lt_LT.UTF-8
+# We have to generate locales (list sorted alphabetically)
+LOCALES := \
+	am_ET.UTF-8 \
+	az_AZ.UTF-8 \
+	be_BY.UTF-8 \
+	ber_DZ.UTF-8 \
+	ber_MA.UTF-8 \
+	bg_BG.UTF-8 \
+	br_FR.UTF-8 \
+	bs_BA.UTF-8 \
+	cmn_TW.UTF-8 \
+	crh_UA.UTF-8 \
+	cs_CZ.UTF-8 \
+	csb_PL.UTF-8 \
+	cv_RU.UTF-8 \
+	cy_GB.UTF-8 \
+	da_DK.ISO-8859-1 \
+	de_DE.ISO-8859-1 \
+	de_DE.UTF-8 \
+	dz_BT.UTF-8 \
+	en_GB.UTF-8 \
+	en_US.ANSI_X3.4-1968 \
+	en_US.ISO-8859-1\
+	en_US.UTF-8 \
+	eo.UTF-8 \
+	es_ES.UTF-8 \
+	et_EE.UTF-8 \
+	fa_IR.UTF-8 \
+	fi_FI.UTF-8 \
+	fil_PH.UTF-8 \
+	fr_CA.UTF-8 \
+	fr_FR.ISO-8859-1 \
+	fr_FR.UTF-8 \
+	fur_IT.UTF-8 \
+	gez_ER.UTF-8@abegede \
+	ha_NG.UTF-8 \
+	hr_HR.ISO-8859-2 \
+	hr_HR.UTF-8 \
+	hsb_DE.UTF-8 \
+	hu_HU.UTF-8 \
+	ig_NG.UTF-8 \
+	ik_CA.UTF-8 \
+	is_IS.UTF-8 \
+	ja_JP.EUC-JP \
+	ja_JP.SJIS \
+	ja_JP.UTF-8 \
+	kk_KZ.UTF-8 \
+	ku_TR.UTF-8 \
+	ky_KG.UTF-8 \
+	ln_CD.UTF-8 \
+	lt_LT.UTF-8 \
+	lv_LV.UTF-8 \
+	mi_NZ.UTF-8 \
+	ml_IN.UTF-8 \
+	mn_MN.UTF-8 \
+	mr_IN.UTF-8 \
+	mt_MT.UTF-8 \
+	nan_TW.UTF-8@latin \
+	nb_NO.ISO-8859-1 \
+	nb_NO.UTF-8 \
+	nn_NO.ISO-8859-1 \
+	om_KE.UTF-8 \
+	os_RU.UTF-8 \
+	pl_PL.UTF-8 \
+	ps_AF.UTF-8 \
+	ro_RO.UTF-8 \
+	ru_RU.UTF-8 \
+	sc_IT.UTF-8 \
+	se_NO.UTF-8 \
+	si_LK.UTF-8 \
+	sq_AL.UTF-8 \
+	sr_RS.UTF-8 \
+	sv_SE.ISO-8859-1 \
+	sv_SE.UTF-8 \
+	szl_PL.UTF-8 \
+	tg_TJ.UTF-8 \
+	tk_TM.UTF-8 \
+	tr_TR.ISO-8859-9 \
+	tr_TR.UTF-8 \
+	tt_RU.UTF-8 \
+	tt_RU.UTF-8@iqtelif \
+	ug_CN.UTF-8 \
+	uk_UA.UTF-8 \
+	uz_UZ.UTF-8 \
+	vi_VN.UTF-8 \
+	yi_US.UTF-8 \
+	yo_NG.UTF-8 \
+	zh_CN.UTF-8 \
+	zh_TW.EUC-TW \
+	$(NULL)
+
 include ../gen-locales.mk
 endif

--- a/localedata/am_ET.UTF-8.in
+++ b/localedata/am_ET.UTF-8.in
@ -0,0 +1,347 @@
+፡ ; <U1361>
+። ; <U1362>
+፣ ; <U1363>
+፤ ; <U1364>
+፥ ; <U1365>
+፦ ; <U1366>
+፧ ; <U1367>
+፨ ; <U1368>
+፲ ; <U1372>
+፳ ; <U1373>
+፴ ; <U1374>
+፵ ; <U1375>
+፶ ; <U1376>
+፷ ; <U1377>
+፸ ; <U1378>
+፹ ; <U1379>
+፺ ; <U137A>
+፻ ; <U137B>
+፼ ; <U137C>
+፩ ; <U1369>
+፪ ; <U136A>
+፫ ; <U136B>
+፬ ; <U136C>
+፭ ; <U136D>
+፮ ; <U136E>
+፯ ; <U136F>
+፰ ; <U1370>
+፱ ; <U1371>
+a
+z
+ሀ ; <U1200>
+ሁ ; <U1201>
+ሂ ; <U1202>
+ሃ ; <U1203>
+ሄ ; <U1204>
+ህ ; <U1205>
+ሆ ; <U1206>
+ለ ; <U1208>
+ሉ ; <U1209>
+ሊ ; <U120A>
+ላ ; <U120B>
+ሌ ; <U120C>
+ል ; <U120D>
+ሎ ; <U120E>
+ሏ ; <U120F>
+ሐ ; <U1210>
+ሑ ; <U1211>
+ሒ ; <U1212>
+ሓ ; <U1213>
+ሔ ; <U1214>
+ሕ ; <U1215>
+ሖ ; <U1216>
+ሗ ; <U1217>
+መ ; <U1218>
+ሙ ; <U1219>
+ሚ ; <U121A>
+ማ ; <U121B>
+ሜ ; <U121C>
+ም ; <U121D>
+ሞ ; <U121E>
+ሟ ; <U121F>
+ሠ ; <U1220>
+ሡ ; <U1221>
+ሢ ; <U1222>
+ሣ ; <U1223>
+ሤ ; <U1224>
+ሥ ; <U1225>
+ሦ ; <U1226>
+ሧ ; <U1227>
+ረ ; <U1228>
+ሩ ; <U1229>
+ሪ ; <U122A>
+ራ ; <U122B>
+ሬ ; <U122C>
+ር ; <U122D>
+ሮ ; <U122E>
+ሯ ; <U122F>
+ሰ ; <U1230>
+ሱ ; <U1231>
+ሲ ; <U1232>
+ሳ ; <U1233>
+ሴ ; <U1234>
+ስ ; <U1235>
+ሶ ; <U1236>
+ሷ ; <U1237>
+ሸ ; <U1238>
+ሹ ; <U1239>
+ሺ ; <U123A>
+ሻ ; <U123B>
+ሼ ; <U123C>
+ሽ ; <U123D>
+ሾ ; <U123E>
+ሿ ; <U123F>
+ቀ ; <U1240>
+ቁ ; <U1241>
+ቂ ; <U1242>
+ቃ ; <U1243>
+ቄ ; <U1244>
+ቅ ; <U1245>
+ቆ ; <U1246>
+ቈ ; <U1248>
+ቊ ; <U124A>
+ቋ ; <U124B>
+ቌ ; <U124C>
+ቍ ; <U124D>
+ቐ ; <U1250>
+ቑ ; <U1251>
+ቒ ; <U1252>
+ቓ ; <U1253>
+ቔ ; <U1254>
+ቕ ; <U1255>
+ቖ ; <U1256>
+ቘ ; <U1258>
+ቚ ; <U125A>
+ቛ ; <U125B>
+ቜ ; <U125C>
+ቝ ; <U125D>
+በ ; <U1260>
+ቡ ; <U1261>
+ቢ ; <U1262>
+ባ ; <U1263>
+ቤ ; <U1264>
+ብ ; <U1265>
+ቦ ; <U1266>
+ቧ ; <U1267>
+ቨ ; <U1268>
+ቩ ; <U1269>
+ቪ ; <U126A>
+ቫ ; <U126B>
+ቬ ; <U126C>
+ቭ ; <U126D>
+ቮ ; <U126E>
+ቯ ; <U126F>
+ተ ; <U1270>
+ቱ ; <U1271>
+ቲ ; <U1272>
+ታ ; <U1273>
+ቴ ; <U1274>
+ት ; <U1275>
+ቶ ; <U1276>
+ቷ ; <U1277>
+ቸ ; <U1278>
+ቹ ; <U1279>
+ቺ ; <U127A>
+ቻ ; <U127B>
+ቼ ; <U127C>
+ች ; <U127D>
+ቾ ; <U127E>
+ቿ ; <U127F>
+ኀ ; <U1280>
+ኁ ; <U1281>
+ኂ ; <U1282>
+ኃ ; <U1283>
+ኄ ; <U1284>
+ኅ ; <U1285>
+ኆ ; <U1286>
+ኈ ; <U1288>
+ኊ ; <U128A>
+ኋ ; <U128B>
+ኌ ; <U128C>
+ኍ ; <U128D>
+ነ ; <U1290>
+ኑ ; <U1291>
+ኒ ; <U1292>
+ና ; <U1293>
+ኔ ; <U1294>
+ን ; <U1295>
+ኖ ; <U1296>
+ኗ ; <U1297>
+ኘ ; <U1298>
+ኙ ; <U1299>
+ኚ ; <U129A>
+ኛ ; <U129B>
+ኜ ; <U129C>
+ኝ ; <U129D>
+ኞ ; <U129E>
+ኟ ; <U129F>
+አ ; <U12A0>
+ኡ ; <U12A1>
+ኢ ; <U12A2>
+ኣ ; <U12A3>
+ኤ ; <U12A4>
+እ ; <U12A5>
+ኦ ; <U12A6>
+ኧ ; <U12A7>
+ከ ; <U12A8>
+ኩ ; <U12A9>
+ኪ ; <U12AA>
+ካ ; <U12AB>
+ኬ ; <U12AC>
+ክ ; <U12AD>
+ኮ ; <U12AE>
+ኰ ; <U12B0>
+ኲ ; <U12B2>
+ኳ ; <U12B3>
+ኴ ; <U12B4>
+ኵ ; <U12B5>
+ኸ ; <U12B8>
+ኹ ; <U12B9>
+ኺ ; <U12BA>
+ኻ ; <U12BB>
+ኼ ; <U12BC>
+ኽ ; <U12BD>
+ኾ ; <U12BE>
+ዀ ; <U12C0>
+ዂ ; <U12C2>
+ዃ ; <U12C3>
+ዄ ; <U12C4>
+ዅ ; <U12C5>
+ወ ; <U12C8>
+ዉ ; <U12C9>
+ዊ ; <U12CA>
+ዋ ; <U12CB>
+ዌ ; <U12CC>
+ው ; <U12CD>
+ዎ ; <U12CE>
+ዐ ; <U12D0>
+ዑ ; <U12D1>
+ዒ ; <U12D2>
+ዓ ; <U12D3>
+ዔ ; <U12D4>
+ዕ ; <U12D5>
+ዖ ; <U12D6>
+ዘ ; <U12D8>
+ዙ ; <U12D9>
+ዚ ; <U12DA>
+ዛ ; <U12DB>
+ዜ ; <U12DC>
+ዝ ; <U12DD>
+ዞ ; <U12DE>
+ዟ ; <U12DF>
+ዠ ; <U12E0>
+ዡ ; <U12E1>
+ዢ ; <U12E2>
+ዣ ; <U12E3>
+ዤ ; <U12E4>
+ዥ ; <U12E5>
+ዦ ; <U12E6>
+ዧ ; <U12E7>
+የ ; <U12E8>
+ዩ ; <U12E9>
+ዪ ; <U12EA>
+ያ ; <U12EB>
+ዬ ; <U12EC>
+ይ ; <U12ED>
+ዮ ; <U12EE>
+ደ ; <U12F0>
+ዱ ; <U12F1>
+ዲ ; <U12F2>
+ዳ ; <U12F3>
+ዴ ; <U12F4>
+ድ ; <U12F5>
+ዶ ; <U12F6>
+ዷ ; <U12F7>
+ዸ ; <U12F8>
+ዹ ; <U12F9>
+ዺ ; <U12FA>
+ዻ ; <U12FB>
+ዼ ; <U12FC>
+ዽ ; <U12FD>
+ዾ ; <U12FE>
+ዿ ; <U12FF>
+ጀ ; <U1300>
+ጁ ; <U1301>
+ጂ ; <U1302>
+ጃ ; <U1303>
+ጄ ; <U1304>
+ጅ ; <U1305>
+ጆ ; <U1306>
+ጇ ; <U1307>
+ገ ; <U1308>
+ጉ ; <U1309>
+ጊ ; <U130A>
+ጋ ; <U130B>
+ጌ ; <U130C>
+ግ ; <U130D>
+ጎ ; <U130E>
+ጐ ; <U1310>
+ጒ ; <U1312>
+ጓ ; <U1313>
+ጔ ; <U1314>
+ጕ ; <U1315>
+ጘ ; <U1318>
+ጙ ; <U1319>
+ጚ ; <U131A>
+ጛ ; <U131B>
+ጜ ; <U131C>
+ጝ ; <U131D>
+ጞ ; <U131E>
+ጠ ; <U1320>
+ጡ ; <U1321>
+ጢ ; <U1322>
+ጣ ; <U1323>
+ጤ ; <U1324>
+ጥ ; <U1325>
+ጦ ; <U1326>
+ጧ ; <U1327>
+ጨ ; <U1328>
+ጩ ; <U1329>
+ጪ ; <U132A>
+ጫ ; <U132B>
+ጬ ; <U132C>
+ጭ ; <U132D>
+ጮ ; <U132E>
+ጯ ; <U132F>
+ጰ ; <U1330>
+ጱ ; <U1331>
+ጲ ; <U1332>
+ጳ ; <U1333>
+ጴ ; <U1334>
+ጵ ; <U1335>
+ጶ ; <U1336>
+ጷ ; <U1337>
+ጸ ; <U1338>
+ጹ ; <U1339>
+ጺ ; <U133A>
+ጻ ; <U133B>
+ጼ ; <U133C>
+ጽ ; <U133D>
+ጾ ; <U133E>
+ጿ ; <U133F>
+ፀ ; <U1340>
+ፁ ; <U1341>
+ፂ ; <U1342>
+ፃ ; <U1343>
+ፄ ; <U1344>
+ፅ ; <U1345>
+ፆ ; <U1346>
+ፈ ; <U1348>
+ፉ ; <U1349>
+ፊ ; <U134A>
+ፋ ; <U134B>
+ፌ ; <U134C>
+ፍ ; <U134D>
+ፎ ; <U134E>
+ፏ ; <U134F>
+ፐ ; <U1350>
+ፑ ; <U1351>
+ፒ ; <U1352>
+ፓ ; <U1353>
+ፔ ; <U1354>
+ፕ ; <U1355>
+ፖ ; <U1356>
+ፗ ; <U1357>
+ፘ ; <U1358>
+ፙ ; <U1359>
+ፚ ; <U135A>
--- a/localedata/az_AZ.UTF-8.in
+++ b/localedata/az_AZ.UTF-8.in
@ -0,0 +1,73 @@
+a
+A
+â
+Â
+c
+C
+ca
+ç
+Ç
+d
+D
+e
+E
+ea
+ə
+Ə
+əa
+g
+G
+ga
+ğ
+Ğ
+h
+H
+ha
+x
+X
+xa
+ı
+I
+ıa
+i
+İ
+î
+Î
+ia
+İa
+j
+J
+k
+K
+ka
+q
+Q
+qa
+l
+L
+o
+O
+oa
+ö
+Ö
+öa
+p
+P
+r
+R
+s
+S
+sa
+ş
+Ş
+şa
+t
+T
+u
+U
+z
+Z
+za
+w
+W
+wa
--- a/localedata/be_BY.UTF-8.in
+++ b/localedata/be_BY.UTF-8.in
@ -0,0 +1,16 @@
+Е
+ЕЕ
+ё
+Ё
+І
+ІІ
+й
+Й
+К
+КК
+у
+уу
+ў
+Ў
+Ф
+ФФ
--- a/localedata/ber_DZ.UTF-8.in
+++ b/localedata/ber_DZ.UTF-8.in
@ -0,0 +1,50 @@
+a
+A
+aa
+ɛ
+Ɛ
+c
+C
+cc
+č
+Č
+d
+D
+dd
+ḍ
+Ḍ
+g
+G
+gg
+ğ
+Ğ
+h
+H
+hh
+ḥ
+Ḥ
+q
+Q
+qq
+ɣ
+Ɣ
+r
+R
+rr
+ṛ
+Ṛ
+s
+S
+ss
+ṣ
+Ṣ
+t
+T
+tt
+ṭ
+Ṭ
+z
+Z
+zz
+ẓ
+Ẓ
--- a/localedata/ber_MA.UTF-8.in
+++ b/localedata/ber_MA.UTF-8.in
@ -0,0 +1,13 @@
+ⴳ ; U+2D33
+ⴳⵯ ; U+2D33 U+2D6F
+ⴷ ; U+2D37
+ⴷⵊ ; U+2D37 U+2D4A
+ⴵ ; U2D35
+ⴶ ; U2D36
+ⴽ ; U+2D3D
+ⴽⵯ ; U+2D3D U+2D6F
+ⵊ ; U+2D4A
+ⵜ ; U+2D5C
+ⵜⵛ ; U+2D5C U+2D5B
+ⵞ ; U+2D5E
+ⵝ ; U+2D5D
--- a/localedata/bg_BG.UTF-8.in
+++ b/localedata/bg_BG.UTF-8.in
@ -0,0 +1,57 @@
+а
+А
+б
+Б
+в
+В
+г
+Г
+д
+Д
+е
+Е
+ж
+Ж
+з
+З
+и
+И
+ии
+й
+Й
+к
+К
+л
+Л
+м
+М
+н
+Н
+о
+О
+п
+П
+р
+Р
+с
+С
+т
+Т
+у
+У
+ф
+Ф
+х
+Х
+ц
+Ц
+ч
+Ч
+ш
+Ш
+щ
+Щ
+ю
+Ю
+я
+Я
--- a/localedata/br_FR.UTF-8.in
+++ b/localedata/br_FR.UTF-8.in
@ -0,0 +1,15 @@
+a
+A
+c
+cz
+ch
+cH
+Ch
+CH
+chz
+c'h
+c'H
+C'h
+C'H
+d
+D
--- a/localedata/cmn_TW.UTF-8.in
+++ b/localedata/cmn_TW.UTF-8.in
--- a/localedata/crh_UA.UTF-8.in
+++ b/localedata/crh_UA.UTF-8.in
@ -0,0 +1,50 @@
+a
+b
+c
+C
+cz
+ç
+d
+e
+f
+g
+G
+gz
+ğ
+h
+H
+hz
+ı
+I
+ız
+i
+İ
+iz
+j
+k
+l
+m
+n
+N
+nz
+ñ
+o
+O
+oz
+ö
+p
+q
+r
+s
+S
+sz
+ş
+t
+u
+U
+uz
+ü
+v
+y
+z
+Z
--- a/localedata/csb_PL.UTF-8.in
+++ b/localedata/csb_PL.UTF-8.in
@ -0,0 +1,70 @@
+a
+A
+az
+ą
+Ą
+ąz
+ã
+Ã
+ãz
+B
+C
+D
+e
+E
+ez
+é
+É
+éz
+ë
+Ë
+ëz
+F
+G
+H
+I
+J
+K
+l
+L
+lz
+ł
+Ł
+łz
+M
+n
+N
+nz
+ń
+Ń
+ńz
+o
+O
+oz
+ò
+Ò
+òz
+ó
+Ó
+óz
+ô
+Ô
+ôz
+P
+R
+S
+T
+u
+U
+uz
+ù
+Ù
+ùz
+W
+Y
+z
+Z
+zz
+ż
+Ż
+żz
--- a/localedata/cv_RU.UTF-8.in
+++ b/localedata/cv_RU.UTF-8.in
@ -0,0 +1,45 @@
+a
+A
+az
+ă
+Ă
+c
+e
+E
+ez
+ĕ
+Ĕ
+h
+i
+j
+k
+l
+m
+n
+p
+r
+R
+rz
+š
+Š
+šz
+s
+S
+sz
+ş
+Ş
+ș
+Ș
+şz
+șz
+t
+u
+U
+uz
+ü
+Ü
+üz
+v
+y
+z
+Z
--- a/localedata/cy_GB.UTF-8.in
+++ b/localedata/cy_GB.UTF-8.in
@ -0,0 +1,72 @@
+a
+b
+c
+C
+cz
+ch
+cH
+Ch
+CH
+d
+D
+dz
+dd
+dD
+Dd
+DD
+e
+f
+F
+fz
+ff
+fF
+Ff
+FF
+g
+G
+gz
+ng
+nG
+Ng
+NG
+h
+i
+l
+L
+lz
+ll
+lL
+Ll
+LL
+m
+n
+o
+p
+P
+pz
+ph
+pH
+Ph
+PH
+r
+R
+rz
+rh
+rH
+Rh
+RH
+s
+t
+T
+tz
+th
+tH
+Th
+TH
+u
+v
+w
+x
+y
+z
+Z
--- a/localedata/dz_BT.UTF-8.in
+++ b/localedata/dz_BT.UTF-8.in
@ -0,0 +1,789 @@
+ཀ
+ཀ་རྐ་ཏ་
+ཀ་སྐྱོར་
+ཀ་ཁ་
+ཀ་ཁ་པ་
+ཀ་ཁའི་རིམ་པ་
+ཀ་ཁོལ་མ་
+ཀ་འགོ་
+ཀ་རྒྱན་
+ཀ་རྒྱུག་
+ཀ་སྒྲོགས་
+ཀ་ཅ་
+ཀ་ཅི་
+ཀ་ཅོག་ཞང་གསུམ་
+ཀ་ཆ་
+ཀ་ཆུག་
+ཀ་ཆེན་བཅུ་
+ཀ་ཆེན་བཞི་
+ཀ་གཉིས་པ་
+ཀ་ཏ་པུར་
+ཀ་ཏ་པུར་འཛག་
+ཀ་ཏ་བུ་ར་
+ཀ་ཏ་ཡ་ན་
+ཀ་ཏ་རུ་
+ཀ་ཏན་
+ཀ་ཏའི་བུ་ནོག་ཅན་
+ཀ་ཏའི་བུ་མོ་
+ཀ་ཏི་
+ཀ་ཏི་ཤེལ་གྱི་སྦུ་གུ་ཅན་
+ཀ་ཏི་ཤེལ་གྱི་རྩ་
+ཀ་ཏི་གསེར་གྱི་རྩ་
+ཀ་ཏི་གསེར་གྱི་རྩ་ཆེན་
+ཀ་ཏུ་
+ཀ་ཏོ་ར་
+ཀ་ཏྱ་བུ་མོ
+ཀ་ཏྱ་ཡ་ན
+ཀ་ཏྱཱ་ཡ་ན
+ཀ་ཏྱཱ་ཡ་ན་ཆེན་པོ
+ཀ་ཏྱཱ་ཡ་ན་ནོག་ཅན
+ཀ་ཏྱཱའི་བུ
+ཀ་ཏྱཱའི་བུ་ཆེན་པོ
+ཀ་ཏྱཱའི་བུ་ནོག་ཅན
+ཀ་ཏྱཱའི་བུ་མོ
+ཀ་རྟི་ཀ་
+ཀ་སྟེགས་
+ཀག
+ཀགས
+ཀང
+ཀྃ
+ཀང་
+ཀངས
+ཀད
+ཀན
+ཀན་
+ཀནད་
+ཀབ
+ཀབ་
+ཀབས
+ཀམ
+ཀཾ
+ཀམས
+ཀའ
+ཀའང
+ཀའམ
+ཀའི
+ཀའིའོ
+ཀའུ
+ཀའུའང
+ཀའུའམ
+ཀའུའི
+ཀའུའིའོ
+ཀའུའོ
+ཀའུར
+ཀའུས
+ཀའོ
+ཀར
+ཀར་ལུགས།
+ཀརྐ་ཊ།
+ཀརྨ་
+ཀརྵ་
+ཀལ
+ཀལ་
+ཀལྤ་
+ཀས
+ཀས་
+ཀསྨིར་
+ཀཱ
+ཀི
+ཀི་
+ཀིག
+ཀིགས
+ཀིང
+ཀིྃ
+ཀིངས
+ཀིད
+ཀིན
+ཀིབ
+ཀིབས
+ཀིམ
+ཀིཾ
+ཀིམས
+ཀིའ
+ཀིའང
+ཀིའམ
+ཀིའི
+ཀིའིའོ
+ཀིའུ
+ཀིའུའང
+ཀིའུའམ
+ཀིའུའི
+ཀིའུའིའོ
+ཀིའུའོ
+ཀིའོ
+ཀིར
+ཀིལ
+ཀིས
+ཀཱི
+ཀྀ
+ཀཱྀ
+ཀུ
+ཀཱུ
+ཀེ
+ཀཻ
+ཀེེ
+ཀོ
+ཀོོ
+ཀཽ
+ཀྙ
+ཀྥ
+ཀྭ
+ཀྱ
+ཀྱྭ
+ཀྱྲ
+ཀྲ
+ཀྲྭ
+ཀྲྱ
+ཀླ
+ཀྵ
+ཀྷ
+ཀྷྭ
+ཀྷྲ
+དཀ
+དཀའ
+དཀི
+དཀྱ
+དཀྲ
+བཀ
+བཀའ
+བཀི
+བཀྱ
+བཀྲ
+བཀླ
+རྐ
+རྐྱ
+ལྐ
+སྐ
+སྐྱ
+སྐྲ
+བརྐ
+བརྐྱ
+བསྐ
+བསྐྱ
+བསྐྲ
+ཁ
+ཁྭ
+ཁྱ
+ཁྲ
+མཁ
+མཁའ
+མཁི
+མཁྱ
+མཁྲ
+འཁ
+འཁའ
+འཁི
+འཁྱ
+འཁྲ
+ག
+ག་རེ་
+གངས་
+གངས་ལྷགས།
+གཉྫིར།
+གད
+གད།
+གན
+གར
+གལ
+གས
+གི་
+གིས་
+གུར་
+གེ་སར་
+གོ་
+གྭ
+གྭ་
+གྱ
+གྱང་
+གྱུར་
+གྲ
+གྲང་མོ་
+གྲངས་
+གྲྭ
+གླ
+གླ་
+གླང་
+གྷག
+གྷག
+གྷང
+གྷང
+དགག
+དགང
+དགད
+དགན
+དགབ
+དགཝ
+དགའ
+དགའ་
+དགར
+དགལ
+དགས
+དགི
+དགུ
+དགུ་
+དགེ
+དགེ་བ་
+དགོ
+དགོས་
+དགྱ
+དགྲ
+དགྲ་
+བགག
+བགང
+བགད
+བགབ
+བགམ
+བགཾ
+བགམས་
+བགཝ
+བགའ
+བགར
+བགལ
+བགི
+བགུ
+བགེ
+བགེགས་
+བགོ
+བགྱ
+བགྲ
+མགག
+མགང
+མགད
+མགབ
+མགའ
+མགར
+མགལ
+མགི
+མགུ
+མགུར་
+མགེ
+མགོ
+མགྱ
+མགྱོགས་
+མགྲ
+འགག
+འགང
+འགད
+འགན
+འགབ
+འགམ
+འགཾ
+འགའ
+འགར
+འགལ
+འགས
+འགི
+འགུ
+འགེ
+འགོ
+འགྱ
+འགྲ
+རྒ
+རྒན་
+རྒོད་པོ་
+རྒྱ
+རྒྱ་
+རྒྱ་མ་
+ལྒ
+ལྒང་བུ་
+སྒ
+སྒ་
+སྒུག་
+སྒོར་མོ་
+སྒྱ
+སྒྱུར་
+སྒྲ
+སྒྲ་
+བརྒ
+བརྒལ་
+བརྒྱ
+བརྒྱ་
+བསྒ
+བསྒོམས་
+བསྒྱ
+བསྒྱུར་
+བསྒྲ
+བསྒྲགས་
+བསྒྲིགས་
+ང
+ངྒྷག
+ངྒྷག
+ངྒྷང
+ངྒྷང
+དངག
+དངང
+དངད
+དངན
+དངབ
+དངའ
+དངར
+དངལ
+དངི
+དངུ
+དངེ
+དངོ
+མངག
+མངང
+མངད
+མངན
+མངབ
+མངའ
+མངར
+མངལ
+མངི
+མངུ
+མངེ
+མངོ
+རྔ
+ལྔ
+སྔ
+བརྔ
+བསྔ
+ཅ
+ཅྭ
+གཅ
+གཅའ
+གཅི
+བཅ
+བཅའ
+བཅི
+ལྕ
+བལྕ
+ཆ
+མཆ
+མཆའ
+མཆི
+འཆ
+འཆའ
+འཆི
+ཇ
+མཇ
+མཇའ
+མཇི
+འཇ
+འཇའ
+འཇི
+རྗ
+ལྗ
+བརྗ
+ཉ
+ཉྭ
+གཉ
+གཉའ
+གཉི
+མཉ
+མཉའ
+མཉི
+རྙ
+སྙ
+བརྙ
+བསྙ
+ཏ
+ཏོལ་
+ཊ་
+ཊམ་
+ཊིའུ་
+ཊཱིཀ་
+ཏྭ
+ཏྭོན་
+ཏྲ
+གཏ
+གཏའ
+གཏི
+བཏ
+བཏའ
+བཏི
+རྟ
+ལྟ
+སྟ
+བརྟ
+བལྟ
+བསྟ
+ཐ
+ཐར་ས།
+ཐརྐ།
+ཐྲ
+མཐ
+མཐའ
+མཐི
+འཐ
+འཐའ
+འཐི
+ད
+ད་
+དག
+དང
+དངས
+དབ
+དམ
+དམ་
+ད͏མས་
+དར
+དལ
+དས
+དྭ
+དྲ
+དྲྭ
+གདག
+གདང
+གདད
+གདན
+གདབ
+གདམ
+གདཾ
+གདའ
+གདའ་
+གདར
+གདལ
+གདས
+གདི
+གདུ
+གདེ
+གདོ
+བདང
+བདད
+བདབ
+བདམ
+བདཾ
+བདའ
+བདར
+བདལ
+བདས
+བདི
+བདུ
+བདེ
+བདོ
+མདག
+མདང
+མདད
+མདན
+མདབ
+མདའ
+མདར
+མདལ
+མདས
+མདི
+མདུ
+མདེ
+མདོ
+འདག
+འདང
+འདད
+འདན
+འདབ
+འདམ
+འདཾ
+འདའ
+འདར
+འདལ
+འདས
+འདི
+འདུ
+འདེ
+འདོ
+འདྲ
+རྡ
+ལྡ
+སྡ
+བརྡ
+བལྡ
+བསྡ
+ན
+གནག
+གནང
+གནང་
+གནད
+གནད་
+གནན
+གནབ
+གནམ
+གནཾ
+གནའ
+གནར
+གནལ
+གནས
+གནི
+གནུ
+གནེ
+གནོ
+མནག
+མནང
+མནང་
+མནད
+མནད་
+མནན
+མནབ
+མནམ
+མནཾ
+མནའ
+མནར
+མནལ
+མནས
+མནི
+མནུ
+མནེ
+མནོ
+རྣ
+སྣ
+སྣྲ
+བརྣ
+བསྣ
+པ
+པུས་ལྷང་
+པྱ
+པྲ
+པུསྟིཀཿ་
+དཔག
+དཔང
+དཔད
+དཔབ
+དཔའ
+དཔར
+དཔལ
+དཔས
+དཔི
+དཔུ
+དཔེ
+དཔོ
+དཔྱ
+དཔྲ
+ལྤ
+སྤ
+སྤྱ
+སྤྲ
+ཕ
+ཕལ་མོ་
+ཕལྒུ་ཎ་
+ཕས་
+ཕྱ
+ཕྱྭ
+ཕྲ
+འཕ
+འཕའ
+འཕི
+འཕྱ
+འཕྲ
+བ
+བག
+བགས
+བད
+བར
+བལ
+བས
+བིལ་བ་
+བྱ
+བྲ
+བླ
+བིལྦ་
+དབག
+དབང
+དབད
+དབན
+དབབ
+དབའ
+དབར
+དབལ
+དབས
+དབི
+དབུ
+དབེ
+དབོ
+དབྱ
+དབྲ
+འབག
+འབང
+འབད
+འབན
+འབབ
+འབམ
+འབཾ
+འབའ
+འབར
+འབལ
+འབས
+འབི
+འབུ
+འབེ
+འབོ
+འབྱ
+འབྲ
+རྦ
+ལྦ
+སྦ
+སྦྱ
+སྦྲ
+མ
+མ་
+མག
+མགས
+མང
+མང་
+མངས
+མཉྫ
+མད
+མད་
+མན
+མབ
+མར
+མརྒཏ་
+མལ
+མལ་
+མས
+མྱ
+མྲ
+དམག
+དམང
+དམད
+དམན
+དམབ
+དམཝ
+དམའ
+དམར
+དམར་
+དམལ
+དམས
+དམས་
+དམི
+དམི་
+དམུ
+དམེ
+དམོ
+དམྱ
+རྨ
+རྨྱ
+སྨ
+སྨྱ
+སྨྲ
+ཙ
+ཙྭ
+གཙ
+གཙའ
+གཙི
+བཙ
+བཙའ
+བཙི
+རྩ
+རྩྭ
+སྩ
+བརྩ
+བསྩ
+ཚ
+ཚྭ
+མཚ
+མཚའ
+མཚི
+འཚ
+འཚའ
+འཚི
+ཛ
+མཛ
+མཛའ
+མཛི
+འཛ
+འཛའ
+འཛི
+རྫ
+བརྫ
+ཝ
+ཞ
+ཞྭ
+གཞ
+གཞའ
+གཞི
+བཞ
+བཞའ
+བཞི
+ཟ
+ཟྭ
+ཟླ
+གཟ
+གཟའ
+གཟི
+བཟ
+བཟའ
+བཟི
+བཟླ
+འ
+འག
+འད
+འབ
+ཡ
+གཡ
+གཡའ
+གཡི
+ར
+རྭ
+རླ
+བརླ
+ལ
+ཤ
+ཤས་
+ཤསྟཾ་
+ཤི་
+ཤྭ
+གཤ
+གཤའ
+གཤི
+བཤ
+བཤའ
+བཤི
+ས
+སར་
+སརྒཿ་
+སལ་
+སིང།
+སིངས་པོ།
+སིངྒ།
+སིངྒྷ
+སིངྒྷ
+སིད།
+སིར།
+སུ་
+སྭ
+སྲ
+སླ
+གསག
+གསང
+གསད
+གསན
+གསབ
+གསའ
+གསར
+གསལ
+གསས
+གསི
+གསུ
+གསེ
+གསོ
+བསག
+བསང
+བསད
+བསབ
+བསམ
+བསཾ
+བསའ
+བསར
+བསལ
+བསས
+བསི
+བསུ
+བསེ
+བསོ
+བསྭ
+བསྲ
+བསླ
+ཧ
+ཧྭ
+ཧྲ
+ལྷ
+ཨ
+ཨར་
+ཨརྒྷཾ་
+ཨརྱ་
+ཨལ་
+ཨསྨ་
+ཨཱརྱ་
+ཨོམ
+ཨོཾ
+ༀ
+ཨོར
--- a/localedata/eo.UTF-8.in
+++ b/localedata/eo.UTF-8.in
@ -0,0 +1,32 @@
+c
+C
+cc
+ĉ
+Ĉ
+g
+G
+gg
+ĝ
+Ĝ
+h
+H
+hh
+ĥ
+Ĥ
+j
+J
+jj
+ĵ
+Ĵ
+s
+S
+ss
+ŝ
+Ŝ
+u
+U
+uu
+ŭ
+Ŭ
+z
+Z
--- a/localedata/es_ES.UTF-8.in
+++ b/localedata/es_ES.UTF-8.in
@ -0,0 +1,46 @@
+a
+A
+Alico
+Allen
+Almafuerte
+Almaguer
+Almeida
+Almonte
+Alpujarra
+Altamira
+Alvarado
+Alvear
+Amagá
+caca
+cacha
+caco
+lana
+LIZO
+LLAGA
+llanto
+LUJO
+luna
+mancha
+manco
+manda
+n
+N
+nn
+ñ
+Ñ
+o
+O
+palo
+Pamela
+pan de azúcar
+panal
+panoplia
+panóptico
+panorama
+paño
+paso
+pena
+penoso
+peña
+z
+Z
--- a/localedata/fa_IR.UTF-8.in
+++ b/localedata/fa_IR.UTF-8.in
@ -0,0 +1,71 @@
+َ
+ِ
+ُ
+ً
+ٍ
+ٌ
+آ
+ا
+ٱ
+ء
+أ
+ٲ
+إ
+ٳ
+ؤ
+یٔ
+ىٔ
+ئ
+ب
+پ
+ت
+ث
+ج
+چ
+ح
+خ
+د
+ذ
+ر
+ز
+ژ
+س
+ش
+ص
+ض
+ط
+ظ
+ع
+غ
+ف
+ق
+ک
+ڪ
+ګ
+ك
+ڬ
+ڭ
+ڮ
+گ
+ل
+م
+ن
+و
+ۏ
+ۏۏ
+ه
+ە
+ہ
+ة
+ۃ
+ۀ
+ھ
+هه
+ی
+ى
+ے
+ي
+ې
+ۑ
+ۍ
+ێ
--- a/localedata/fi_FI.UTF-8.in
+++ b/localedata/fi_FI.UTF-8.in
@ -0,0 +1,140 @@
+aalto
+Aalto
+aaltoja
+Aarne
+ad
+að
+az
+Az
+Bertta
+Celsius
+d
+D
+ď
+Ď
+d̵
+D̵
+đ
+Đ
+da
+Da
+ďa
+Ďa
+d̵a
+D̵a
+đa
+Đa
+Daavid
+faarao
+g
+G
+g̵
+G̵
+ǥ
+Ǥ
+ga
+Ga
+g̵a
+G̵a
+ǥa
+Ǥa
+Gideon
+Heikki
+Iivari
+Jussi
+Kalle
+Lauri
+Matti
+n
+N
+na
+Na
+Niilo
+n̵
+N̵
+ŋ
+Ŋ
+n̵a
+N̵a
+ŋa
+Ŋa
+Otto
+Paavo
+Queen
+Risto
+Sakari
+šakki
+Suomi
+t
+T
+ta
+Ta
+Tyyne
+t̵
+T̵
+ŧ
+Ŧ
+t̵a
+T̵a
+ŧa
+Ŧa
+u
+U
+ů
+Ů
+Urho
+van Gogh
+Vihtori
+Waltari
+Xenon
+y
+Y
+ü
+Ü
+ya
+Ya
+y-akseli
+übel
+Yrjö
+z
+Z
+za
+Za
+zeta
+zz
+z̵
+Z̵
+ʒ
+Ʒ
+z̵a
+Z̵a
+ʒa
+Ʒa
+å
+Å
+åa
+Åa
+Åke
+ä
+Ä
+æ
+Æ
+äa
+Äa
+æa
+Æa
+äaa
+Äaa
+æbletræ
+äiti
+ö
+Ö
+ø
+Ø
+öa
+Öa
+øa
+Øa
+öaa
+Öaa
+öljy
--- a/localedata/fil_PH.UTF-8.in
+++ b/localedata/fil_PH.UTF-8.in
@ -0,0 +1,16 @@
+a
+A
+n
+N
+nz
+ñ
+Ñ
+ñz
+ng
+nG
+Ng
+NG
+o
+O
+z
+Z
--- a/localedata/fur_IT.UTF-8.in
+++ b/localedata/fur_IT.UTF-8.in
@ -0,0 +1,12 @@
+a
+A
+c
+C
+cz
+ç
+Ç
+d
+D
+dz
+z
+Z
--- a/localedata/gez_ER.UTF-8@abegede.in
+++ b/localedata/gez_ER.UTF-8@abegede.in
@ -0,0 +1,365 @@
+አ ; <S12A0> % ETHIOPIC SYLLABLE GLOTTAL A old glibc collation-symbol: <ALEF>
+ኡ ; <S12A1> % ETHIOPIC SYLLABLE GLOTTAL U old glibc collation-symbol: <ALEF>
+ኢ ; <S12A2> % ETHIOPIC SYLLABLE GLOTTAL I old glibc collation-symbol: <ALEF>
+ኣ ; <S12A3> % ETHIOPIC SYLLABLE GLOTTAL AA old glibc collation-symbol: <ALEF>
+ኤ ; <S12A4> % ETHIOPIC SYLLABLE GLOTTAL EE old glibc collation-symbol: <ALEF>
+እ ; <S12A5> % ETHIOPIC SYLLABLE GLOTTAL E old glibc collation-symbol: <ALEF>
+ኦ ; <S12A6> % ETHIOPIC SYLLABLE GLOTTAL O old glibc collation-symbol: <ALEF>
+ኧ ; <S12A7> % ETHIOPIC SYLLABLE GLOTTAL WA old glibc collation-symbol: <ALEF>
+በ ; <S1260> % ETHIOPIC SYLLABLE BA old glibc collation-symbol: <BET>
+ቡ ; <S1261> % ETHIOPIC SYLLABLE BU old glibc collation-symbol: <BET>
+ቢ ; <S1262> % ETHIOPIC SYLLABLE BI old glibc collation-symbol: <BET>
+ባ ; <S1263> % ETHIOPIC SYLLABLE BAA old glibc collation-symbol: <BET>
+ቤ ; <S1264> % ETHIOPIC SYLLABLE BEE old glibc collation-symbol: <BET>
+ብ ; <S1265> % ETHIOPIC SYLLABLE BE old glibc collation-symbol: <BET>
+ቦ ; <S1266> % ETHIOPIC SYLLABLE BO old glibc collation-symbol: <BET>
+ቧ ; <S1267> % ETHIOPIC SYLLABLE BWA old glibc collation-symbol: <BET>
+ᎄ ; <S1384> % ETHIOPIC SYLLABLE SEBATBEIT BWA old glibc collation-symbol: <BET>
+ᎅ ; <S1385> % ETHIOPIC SYLLABLE BWI old glibc collation-symbol: <BET>
+ᎆ ; <S1386> % ETHIOPIC SYLLABLE BWEE old glibc collation-symbol: <BET>
+ᎇ ; <S1387> % ETHIOPIC SYLLABLE BWE old glibc collation-symbol: <BET>
+ⶅ ; <S2D85> % ETHIOPIC SYLLABLE BOA old glibc collation-symbol: <BET>
+ቨ ; <S1268> % ETHIOPIC SYLLABLE VA old glibc collation-symbol: <VE-BET>
+ቩ ; <S1269> % ETHIOPIC SYLLABLE VU old glibc collation-symbol: <VE-BET>
+ቪ ; <S126A> % ETHIOPIC SYLLABLE VI old glibc collation-symbol: <VE-BET>
+ቫ ; <S126B> % ETHIOPIC SYLLABLE VAA old glibc collation-symbol: <VE-BET>
+ቬ ; <S126C> % ETHIOPIC SYLLABLE VEE old glibc collation-symbol: <VE-BET>
+ቭ ; <S126D> % ETHIOPIC SYLLABLE VE old glibc collation-symbol: <VE-BET>
+ቮ ; <S126E> % ETHIOPIC SYLLABLE VO old glibc collation-symbol: <VE-BET>
+ቯ ; <S126F> % ETHIOPIC SYLLABLE VWA old glibc collation-symbol: <VE-BET>
+ገ ; <S1308> % ETHIOPIC SYLLABLE GA old glibc collation-symbol: <GEMEL>
+ጉ ; <S1309> % ETHIOPIC SYLLABLE GU old glibc collation-symbol: <GEMEL>
+ጊ ; <S130A> % ETHIOPIC SYLLABLE GI old glibc collation-symbol: <GEMEL>
+ጋ ; <S130B> % ETHIOPIC SYLLABLE GAA old glibc collation-symbol: <GEMEL>
+ጌ ; <S130C> % ETHIOPIC SYLLABLE GEE old glibc collation-symbol: <GEMEL>
+ግ ; <S130D> % ETHIOPIC SYLLABLE GE old glibc collation-symbol: <GEMEL>
+ጎ ; <S130E> % ETHIOPIC SYLLABLE GO old glibc collation-symbol: <GEMEL>
+ጏ ; <S130F> % ETHIOPIC SYLLABLE GOA old glibc collation-symbol: <GEMEL>
+ጐ ; <S1310> % ETHIOPIC SYLLABLE GWA old glibc collation-symbol: <GEMEL>
+ጒ ; <S1312> % ETHIOPIC SYLLABLE GWI old glibc collation-symbol: <GEMEL>
+ጓ ; <S1313> % ETHIOPIC SYLLABLE GWAA old glibc collation-symbol: <GEMEL>
+ጔ ; <S1314> % ETHIOPIC SYLLABLE GWEE old glibc collation-symbol: <GEMEL>
+ጕ ; <S1315> % ETHIOPIC SYLLABLE GWE old glibc collation-symbol: <GEMEL>
+ጘ ; <S1318> % ETHIOPIC SYLLABLE GGA old glibc collation-symbol: <NGE-GEMEL>
+ጙ ; <S1319> % ETHIOPIC SYLLABLE GGU old glibc collation-symbol: <NGE-GEMEL>
+ጚ ; <S131A> % ETHIOPIC SYLLABLE GGI old glibc collation-symbol: <NGE-GEMEL>
+ጛ ; <S131B> % ETHIOPIC SYLLABLE GGAA old glibc collation-symbol: <NGE-GEMEL>
+ጜ ; <S131C> % ETHIOPIC SYLLABLE GGEE old glibc collation-symbol: <NGE-GEMEL>
+ጝ ; <S131D> % ETHIOPIC SYLLABLE GGE old glibc collation-symbol: <NGE-GEMEL>
+ጞ ; <S131E> % ETHIOPIC SYLLABLE GGO old glibc collation-symbol: <NGE-GEMEL>
+ጟ ; <S131F> % ETHIOPIC SYLLABLE GGWAA old glibc collation-symbol: <NGE-GEMEL>
+ⶓ ; <S2D93> % ETHIOPIC SYLLABLE GGWA old glibc collation-symbol: <NGE-GEMEL>
+ⶔ ; <S2D94> % ETHIOPIC SYLLABLE GGWI old glibc collation-symbol: <NGE-GEMEL>
+ⶕ ; <S2D95> % ETHIOPIC SYLLABLE GGWEE old glibc collation-symbol: <NGE-GEMEL>
+ⶖ ; <S2D96> % ETHIOPIC SYLLABLE GGWE old glibc collation-symbol: <NGE-GEMEL>
+ደ ; <S12F0> % ETHIOPIC SYLLABLE DA old glibc collation-symbol: <DINT>
+ዱ ; <S12F1> % ETHIOPIC SYLLABLE DU old glibc collation-symbol: <DINT>
+ዲ ; <S12F2> % ETHIOPIC SYLLABLE DI old glibc collation-symbol: <DINT>
+ዳ ; <S12F3> % ETHIOPIC SYLLABLE DAA old glibc collation-symbol: <DINT>
+ዴ ; <S12F4> % ETHIOPIC SYLLABLE DEE old glibc collation-symbol: <DINT>
+ድ ; <S12F5> % ETHIOPIC SYLLABLE DE old glibc collation-symbol: <DINT>
+ዶ ; <S12F6> % ETHIOPIC SYLLABLE DO old glibc collation-symbol: <DINT>
+ዷ ; <S12F7> % ETHIOPIC SYLLABLE DWA old glibc collation-symbol: <DINT>
+ⶌ ; <S2D8C> % ETHIOPIC SYLLABLE DOA old glibc collation-symbol: <DINT>
+ꬉ ; <SAB09> % ETHIOPIC SYLLABLE DDHU old glibc collation-symbol: <DHI-DINT>
+ꬊ ; <SAB0A> % ETHIOPIC SYLLABLE DDHI old glibc collation-symbol: <DHI-DINT>
+ꬋ ; <SAB0B> % ETHIOPIC SYLLABLE DDHAA old glibc collation-symbol: <DHI-DINT>
+ꬌ ; <SAB0C> % ETHIOPIC SYLLABLE DDHEE old glibc collation-symbol: <DHI-DINT>
+ꬍ ; <SAB0D> % ETHIOPIC SYLLABLE DDHE old glibc collation-symbol: <DHI-DINT>
+ꬎ ; <SAB0E> % ETHIOPIC SYLLABLE DDHO old glibc collation-symbol: <DHI-DINT>
+ዸ ; <S12F8> % ETHIOPIC SYLLABLE DDA old glibc collation-symbol: <DHI-DINT>
+ዹ ; <S12F9> % ETHIOPIC SYLLABLE DDU old glibc collation-symbol: <DHI-DINT>
+ዺ ; <S12FA> % ETHIOPIC SYLLABLE DDI old glibc collation-symbol: <DHI-DINT>
+ዻ ; <S12FB> % ETHIOPIC SYLLABLE DDAA old glibc collation-symbol: <DHI-DINT>
+ዼ ; <S12FC> % ETHIOPIC SYLLABLE DDEE old glibc collation-symbol: <DHI-DINT>
+ዽ ; <S12FD> % ETHIOPIC SYLLABLE DDE old glibc collation-symbol: <DHI-DINT>
+ዾ ; <S12FE> % ETHIOPIC SYLLABLE DDO old glibc collation-symbol: <DHI-DINT>
+ዿ ; <S12FF> % ETHIOPIC SYLLABLE DDWA old glibc collation-symbol: <DHI-DINT>
+ጀ ; <S1300> % ETHIOPIC SYLLABLE JA old glibc collation-symbol: <JI-DINT>
+ጁ ; <S1301> % ETHIOPIC SYLLABLE JU old glibc collation-symbol: <JI-DINT>
+ጂ ; <S1302> % ETHIOPIC SYLLABLE JI old glibc collation-symbol: <JI-DINT>
+ጃ ; <S1303> % ETHIOPIC SYLLABLE JAA old glibc collation-symbol: <JI-DINT>
+ጄ ; <S1304> % ETHIOPIC SYLLABLE JEE old glibc collation-symbol: <JI-DINT>
+ጅ ; <S1305> % ETHIOPIC SYLLABLE JE old glibc collation-symbol: <JI-DINT>
+ጆ ; <S1306> % ETHIOPIC SYLLABLE JO old glibc collation-symbol: <JI-DINT>
+ጇ ; <S1307> % ETHIOPIC SYLLABLE JWA old glibc collation-symbol: <JI-DINT>
+ⶎ ; <S2D8E> % ETHIOPIC SYLLABLE JOA old glibc collation-symbol: <JI-DINT>
+ሀ ; <S1200> % ETHIOPIC SYLLABLE HA old glibc collation-symbol: <HOY>
+ሁ ; <S1201> % ETHIOPIC SYLLABLE HU old glibc collation-symbol: <HOY>
+ሂ ; <S1202> % ETHIOPIC SYLLABLE HI old glibc collation-symbol: <HOY>
+ሃ ; <S1203> % ETHIOPIC SYLLABLE HAA old glibc collation-symbol: <HOY>
+ሄ ; <S1204> % ETHIOPIC SYLLABLE HEE old glibc collation-symbol: <HOY>
+ህ ; <S1205> % ETHIOPIC SYLLABLE HE old glibc collation-symbol: <HOY>
+ሆ ; <S1206> % ETHIOPIC SYLLABLE HO old glibc collation-symbol: <HOY>
+ሇ ; <S1207> % ETHIOPIC SYLLABLE HOA old glibc collation-symbol: <HOY>
+ወ ; <S12C8> % ETHIOPIC SYLLABLE WA old glibc collation-symbol: <WEWE>
+ዉ ; <S12C9> % ETHIOPIC SYLLABLE WU old glibc collation-symbol: <WEWE>
+ዊ ; <S12CA> % ETHIOPIC SYLLABLE WI old glibc collation-symbol: <WEWE>
+ዋ ; <S12CB> % ETHIOPIC SYLLABLE WAA old glibc collation-symbol: <WEWE>
+ዌ ; <S12CC> % ETHIOPIC SYLLABLE WEE old glibc collation-symbol: <WEWE>
+ው ; <S12CD> % ETHIOPIC SYLLABLE WE old glibc collation-symbol: <WEWE>
+ዎ ; <S12CE> % ETHIOPIC SYLLABLE WO old glibc collation-symbol: <WEWE>
+ዏ ; <S12CF> % ETHIOPIC SYLLABLE WOA old glibc collation-symbol: <WEWE>
+ዘ ; <S12D8> % ETHIOPIC SYLLABLE ZA old glibc collation-symbol: <ZEY>
+ዙ ; <S12D9> % ETHIOPIC SYLLABLE ZU old glibc collation-symbol: <ZEY>
+ዚ ; <S12DA> % ETHIOPIC SYLLABLE ZI old glibc collation-symbol: <ZEY>
+ዛ ; <S12DB> % ETHIOPIC SYLLABLE ZAA old glibc collation-symbol: <ZEY>
+ዜ ; <S12DC> % ETHIOPIC SYLLABLE ZEE old glibc collation-symbol: <ZEY>
+ዝ ; <S12DD> % ETHIOPIC SYLLABLE ZE old glibc collation-symbol: <ZEY>
+ዞ ; <S12DE> % ETHIOPIC SYLLABLE ZO old glibc collation-symbol: <ZEY>
+ዟ ; <S12DF> % ETHIOPIC SYLLABLE ZWA old glibc collation-symbol: <ZEY>
+ⶋ ; <S2D8B> % ETHIOPIC SYLLABLE ZOA old glibc collation-symbol: <ZEY>
+ዠ ; <S12E0> % ETHIOPIC SYLLABLE ZHA old glibc collation-symbol: <ZHE-ZEY>
+ዡ ; <S12E1> % ETHIOPIC SYLLABLE ZHU old glibc collation-symbol: <ZHE-ZEY>
+ዢ ; <S12E2> % ETHIOPIC SYLLABLE ZHI old glibc collation-symbol: <ZHE-ZEY>
+ዣ ; <S12E3> % ETHIOPIC SYLLABLE ZHAA old glibc collation-symbol: <ZHE-ZEY>
+ዤ ; <S12E4> % ETHIOPIC SYLLABLE ZHEE old glibc collation-symbol: <ZHE-ZEY>
+ዥ ; <S12E5> % ETHIOPIC SYLLABLE ZHE old glibc collation-symbol: <ZHE-ZEY>
+ዦ ; <S12E6> % ETHIOPIC SYLLABLE ZHO old glibc collation-symbol: <ZHE-ZEY>
+ዧ ; <S12E7> % ETHIOPIC SYLLABLE ZHWA old glibc collation-symbol: <ZHE-ZEY>
+ሐ ; <S1210> % ETHIOPIC SYLLABLE HHA old glibc collation-symbol: <HAWT>
+ሑ ; <S1211> % ETHIOPIC SYLLABLE HHU old glibc collation-symbol: <HAWT>
+ሒ ; <S1212> % ETHIOPIC SYLLABLE HHI old glibc collation-symbol: <HAWT>
+ሓ ; <S1213> % ETHIOPIC SYLLABLE HHAA old glibc collation-symbol: <HAWT>
+ሔ ; <S1214> % ETHIOPIC SYLLABLE HHEE old glibc collation-symbol: <HAWT>
+ሕ ; <S1215> % ETHIOPIC SYLLABLE HHE old glibc collation-symbol: <HAWT>
+ሖ ; <S1216> % ETHIOPIC SYLLABLE HHO old glibc collation-symbol: <HAWT>
+ሗ ; <S1217> % ETHIOPIC SYLLABLE HHWA old glibc collation-symbol: <HAWT>
+ጠ ; <S1320> % ETHIOPIC SYLLABLE THA old glibc collation-symbol: <TEYT>
+ጡ ; <S1321> % ETHIOPIC SYLLABLE THU old glibc collation-symbol: <TEYT>
+ጢ ; <S1322> % ETHIOPIC SYLLABLE THI old glibc collation-symbol: <TEYT>
+ጣ ; <S1323> % ETHIOPIC SYLLABLE THAA old glibc collation-symbol: <TEYT>
+ጤ ; <S1324> % ETHIOPIC SYLLABLE THEE old glibc collation-symbol: <TEYT>
+ጥ ; <S1325> % ETHIOPIC SYLLABLE THE old glibc collation-symbol: <TEYT>
+ጦ ; <S1326> % ETHIOPIC SYLLABLE THO old glibc collation-symbol: <TEYT>
+ጧ ; <S1327> % ETHIOPIC SYLLABLE THWA old glibc collation-symbol: <TEYT>
+ⶏ ; <S2D8F> % ETHIOPIC SYLLABLE THOA old glibc collation-symbol: <TEYT>
+ጨ ; <S1328> % ETHIOPIC SYLLABLE CHA old glibc collation-symbol: <CHE-TEYT>
+ጩ ; <S1329> % ETHIOPIC SYLLABLE CHU old glibc collation-symbol: <CHE-TEYT>
+ጪ ; <S132A> % ETHIOPIC SYLLABLE CHI old glibc collation-symbol: <CHE-TEYT>
+ጫ ; <S132B> % ETHIOPIC SYLLABLE CHAA old glibc collation-symbol: <CHE-TEYT>
+ጬ ; <S132C> % ETHIOPIC SYLLABLE CHEE old glibc collation-symbol: <CHE-TEYT>
+ጭ ; <S132D> % ETHIOPIC SYLLABLE CHE old glibc collation-symbol: <CHE-TEYT>
+ጮ ; <S132E> % ETHIOPIC SYLLABLE CHO old glibc collation-symbol: <CHE-TEYT>
+ጯ ; <S132F> % ETHIOPIC SYLLABLE CHWA old glibc collation-symbol: <CHE-TEYT>
+ⶐ ; <S2D90> % ETHIOPIC SYLLABLE CHOA old glibc collation-symbol: <CHE-TEYT>
+ꬠ ; <SAB20> % ETHIOPIC SYLLABLE CCHHA old glibc collation-symbol: <CHE-TEYT>
+ꬡ ; <SAB21> % ETHIOPIC SYLLABLE CCHHU old glibc collation-symbol: <CHE-TEYT>
+ꬢ ; <SAB22> % ETHIOPIC SYLLABLE CCHHI old glibc collation-symbol: <CHE-TEYT>
+ꬣ ; <SAB23> % ETHIOPIC SYLLABLE CCHHAA old glibc collation-symbol: <CHE-TEYT>
+ꬤ ; <SAB24> % ETHIOPIC SYLLABLE CCHHEE old glibc collation-symbol: <CHE-TEYT>
+ꬥ ; <SAB25> % ETHIOPIC SYLLABLE CCHHE old glibc collation-symbol: <CHE-TEYT>
+ꬦ ; <SAB26> % ETHIOPIC SYLLABLE CCHHO old glibc collation-symbol: <CHE-TEYT>
+የ ; <S12E8> % ETHIOPIC SYLLABLE YA old glibc collation-symbol: <YEMEN>
+ዩ ; <S12E9> % ETHIOPIC SYLLABLE YU old glibc collation-symbol: <YEMEN>
+ዪ ; <S12EA> % ETHIOPIC SYLLABLE YI old glibc collation-symbol: <YEMEN>
+ያ ; <S12EB> % ETHIOPIC SYLLABLE YAA old glibc collation-symbol: <YEMEN>
+ዬ ; <S12EC> % ETHIOPIC SYLLABLE YEE old glibc collation-symbol: <YEMEN>
+ይ ; <S12ED> % ETHIOPIC SYLLABLE YE old glibc collation-symbol: <YEMEN>
+ዮ ; <S12EE> % ETHIOPIC SYLLABLE YO old glibc collation-symbol: <YEMEN>
+ዯ ; <S12EF> % ETHIOPIC SYLLABLE YOA old glibc collation-symbol: <YEMEN>
+ከ ; <S12A8> % ETHIOPIC SYLLABLE KA old glibc collation-symbol: <KAF>
+ኩ ; <S12A9> % ETHIOPIC SYLLABLE KU old glibc collation-symbol: <KAF>
+ኪ ; <S12AA> % ETHIOPIC SYLLABLE KI old glibc collation-symbol: <KAF>
+ካ ; <S12AB> % ETHIOPIC SYLLABLE KAA old glibc collation-symbol: <KAF>
+ኬ ; <S12AC> % ETHIOPIC SYLLABLE KEE old glibc collation-symbol: <KAF>
+ክ ; <S12AD> % ETHIOPIC SYLLABLE KE old glibc collation-symbol: <KAF>
+ኮ ; <S12AE> % ETHIOPIC SYLLABLE KO old glibc collation-symbol: <KAF>
+ኯ ; <S12AF> % ETHIOPIC SYLLABLE KOA old glibc collation-symbol: <KAF>
+ኰ ; <S12B0> % ETHIOPIC SYLLABLE KWA old glibc collation-symbol: <KAF>
+ኲ ; <S12B2> % ETHIOPIC SYLLABLE KWI old glibc collation-symbol: <KAF>
+ኳ ; <S12B3> % ETHIOPIC SYLLABLE KWAA old glibc collation-symbol: <KAF>
+ኴ ; <S12B4> % ETHIOPIC SYLLABLE KWEE old glibc collation-symbol: <KAF>
+ኵ ; <S12B5> % ETHIOPIC SYLLABLE KWE old glibc collation-symbol: <KAF>
+ኸ ; <S12B8> % ETHIOPIC SYLLABLE KXA old glibc collation-symbol: <KHA-KAF>
+ኹ ; <S12B9> % ETHIOPIC SYLLABLE KXU old glibc collation-symbol: <KHA-KAF>
+ኺ ; <S12BA> % ETHIOPIC SYLLABLE KXI old glibc collation-symbol: <KHA-KAF>
+ኻ ; <S12BB> % ETHIOPIC SYLLABLE KXAA old glibc collation-symbol: <KHA-KAF>
+ኼ ; <S12BC> % ETHIOPIC SYLLABLE KXEE old glibc collation-symbol: <KHA-KAF>
+ኽ ; <S12BD> % ETHIOPIC SYLLABLE KXE old glibc collation-symbol: <KHA-KAF>
+ኾ ; <S12BE> % ETHIOPIC SYLLABLE KXO old glibc collation-symbol: <KHA-KAF>
+ዀ ; <S12C0> % ETHIOPIC SYLLABLE KXWA old glibc collation-symbol: <KHA-KAF>
+ዂ ; <S12C2> % ETHIOPIC SYLLABLE KXWI old glibc collation-symbol: <KHA-KAF>
+ዃ ; <S12C3> % ETHIOPIC SYLLABLE KXWAA old glibc collation-symbol: <KHA-KAF>
+ዄ ; <S12C4> % ETHIOPIC SYLLABLE KXWEE old glibc collation-symbol: <KHA-KAF>
+ዅ ; <S12C5> % ETHIOPIC SYLLABLE KXWE old glibc collation-symbol: <KHA-KAF>
+ለ ; <S1208> % ETHIOPIC SYLLABLE LA old glibc collation-symbol: <LAWI>
+ሉ ; <S1209> % ETHIOPIC SYLLABLE LU old glibc collation-symbol: <LAWI>
+ሊ ; <S120A> % ETHIOPIC SYLLABLE LI old glibc collation-symbol: <LAWI>
+ላ ; <S120B> % ETHIOPIC SYLLABLE LAA old glibc collation-symbol: <LAWI>
+ሌ ; <S120C> % ETHIOPIC SYLLABLE LEE old glibc collation-symbol: <LAWI>
+ል ; <S120D> % ETHIOPIC SYLLABLE LE old glibc collation-symbol: <LAWI>
+ሎ ; <S120E> % ETHIOPIC SYLLABLE LO old glibc collation-symbol: <LAWI>
+ሏ ; <S120F> % ETHIOPIC SYLLABLE LWA old glibc collation-symbol: <LAWI>
+ⶀ ; <S2D80> % ETHIOPIC SYLLABLE LOA old glibc collation-symbol: <LAWI>
+መ ; <S1218> % ETHIOPIC SYLLABLE MA old glibc collation-symbol: <MAY>
+ሙ ; <S1219> % ETHIOPIC SYLLABLE MU old glibc collation-symbol: <MAY>
+ሚ ; <S121A> % ETHIOPIC SYLLABLE MI old glibc collation-symbol: <MAY>
+ማ ; <S121B> % ETHIOPIC SYLLABLE MAA old glibc collation-symbol: <MAY>
+ሜ ; <S121C> % ETHIOPIC SYLLABLE MEE old glibc collation-symbol: <MAY>
+ም ; <S121D> % ETHIOPIC SYLLABLE ME old glibc collation-symbol: <MAY>
+ሞ ; <S121E> % ETHIOPIC SYLLABLE MO old glibc collation-symbol: <MAY>
+ሟ ; <S121F> % ETHIOPIC SYLLABLE MWA old glibc collation-symbol: <MAY>
+ᎀ ; <S1380> % ETHIOPIC SYLLABLE SEBATBEIT MWA old glibc collation-symbol: <MAY>
+ᎁ ; <S1381> % ETHIOPIC SYLLABLE MWI old glibc collation-symbol: <MAY>
+ᎂ ; <S1382> % ETHIOPIC SYLLABLE MWEE old glibc collation-symbol: <MAY>
+ᎃ ; <S1383> % ETHIOPIC SYLLABLE MWE old glibc collation-symbol: <MAY>
+ⶁ ; <S2D81> % ETHIOPIC SYLLABLE MOA old glibc collation-symbol: <MAY>
+ነ ; <S1290> % ETHIOPIC SYLLABLE NA old glibc collation-symbol: <NEHAS>
+ኑ ; <S1291> % ETHIOPIC SYLLABLE NU old glibc collation-symbol: <NEHAS>
+ኒ ; <S1292> % ETHIOPIC SYLLABLE NI old glibc collation-symbol: <NEHAS>
+ና ; <S1293> % ETHIOPIC SYLLABLE NAA old glibc collation-symbol: <NEHAS>
+ኔ ; <S1294> % ETHIOPIC SYLLABLE NEE old glibc collation-symbol: <NEHAS>
+ን ; <S1295> % ETHIOPIC SYLLABLE NE old glibc collation-symbol: <NEHAS>
+ኖ ; <S1296> % ETHIOPIC SYLLABLE NO old glibc collation-symbol: <NEHAS>
+ኗ ; <S1297> % ETHIOPIC SYLLABLE NWA old glibc collation-symbol: <NEHAS>
+ⶈ ; <S2D88> % ETHIOPIC SYLLABLE NOA old glibc collation-symbol: <NEHAS>
+ኘ ; <S1298> % ETHIOPIC SYLLABLE NYA old glibc collation-symbol: <NYE-NEHAS>
+ኙ ; <S1299> % ETHIOPIC SYLLABLE NYU old glibc collation-symbol: <NYE-NEHAS>
+ኚ ; <S129A> % ETHIOPIC SYLLABLE NYI old glibc collation-symbol: <NYE-NEHAS>
+ኛ ; <S129B> % ETHIOPIC SYLLABLE NYAA old glibc collation-symbol: <NYE-NEHAS>
+ኜ ; <S129C> % ETHIOPIC SYLLABLE NYEE old glibc collation-symbol: <NYE-NEHAS>
+ኝ ; <S129D> % ETHIOPIC SYLLABLE NYE old glibc collation-symbol: <NYE-NEHAS>
+ኞ ; <S129E> % ETHIOPIC SYLLABLE NYO old glibc collation-symbol: <NYE-NEHAS>
+ኟ ; <S129F> % ETHIOPIC SYLLABLE NYWA old glibc collation-symbol: <NYE-NEHAS>
+ⶉ ; <S2D89> % ETHIOPIC SYLLABLE NYOA old glibc collation-symbol: <NYE-NEHAS>
+ሠ ; <S1220> % ETHIOPIC SYLLABLE SZA old glibc collation-symbol: <SEWT>
+ሡ ; <S1221> % ETHIOPIC SYLLABLE SZU old glibc collation-symbol: <SEWT>
+ሢ ; <S1222> % ETHIOPIC SYLLABLE SZI old glibc collation-symbol: <SEWT>
+ሣ ; <S1223> % ETHIOPIC SYLLABLE SZAA old glibc collation-symbol: <SEWT>
+ሤ ; <S1224> % ETHIOPIC SYLLABLE SZEE old glibc collation-symbol: <SEWT>
+ሥ ; <S1225> % ETHIOPIC SYLLABLE SZE old glibc collation-symbol: <SEWT>
+ሦ ; <S1226> % ETHIOPIC SYLLABLE SZO old glibc collation-symbol: <SEWT>
+ሧ ; <S1227> % ETHIOPIC SYLLABLE SZWA old glibc collation-symbol: <SEWT>
+ዐ ; <S12D0> % ETHIOPIC SYLLABLE PHARYNGEAL A old glibc collation-symbol: <AYIN>
+ዑ ; <S12D1> % ETHIOPIC SYLLABLE PHARYNGEAL U old glibc collation-symbol: <AYIN>
+ዒ ; <S12D2> % ETHIOPIC SYLLABLE PHARYNGEAL I old glibc collation-symbol: <AYIN>
+ዓ ; <S12D3> % ETHIOPIC SYLLABLE PHARYNGEAL AA old glibc collation-symbol: <AYIN>
+ዔ ; <S12D4> % ETHIOPIC SYLLABLE PHARYNGEAL EE old glibc collation-symbol: <AYIN>
+ዕ ; <S12D5> % ETHIOPIC SYLLABLE PHARYNGEAL E old glibc collation-symbol: <AYIN>
+ዖ ; <S12D6> % ETHIOPIC SYLLABLE PHARYNGEAL O old glibc collation-symbol: <AYIN>
+ፈ ; <S1348> % ETHIOPIC SYLLABLE FA old glibc collation-symbol: <AF>
+ፉ ; <S1349> % ETHIOPIC SYLLABLE FU old glibc collation-symbol: <AF>
+ፊ ; <S134A> % ETHIOPIC SYLLABLE FI old glibc collation-symbol: <AF>
+ፋ ; <S134B> % ETHIOPIC SYLLABLE FAA old glibc collation-symbol: <AF>
+ፌ ; <S134C> % ETHIOPIC SYLLABLE FEE old glibc collation-symbol: <AF>
+ፍ ; <S134D> % ETHIOPIC SYLLABLE FE old glibc collation-symbol: <AF>
+ፎ ; <S134E> % ETHIOPIC SYLLABLE FO old glibc collation-symbol: <AF>
+ፏ ; <S134F> % ETHIOPIC SYLLABLE FWA old glibc collation-symbol: <AF>
+ᎈ ; <S1388> % ETHIOPIC SYLLABLE SEBATBEIT FWA old glibc collation-symbol: <AF>
+ᎉ ; <S1389> % ETHIOPIC SYLLABLE FWI old glibc collation-symbol: <AF>
+ᎊ ; <S138A> % ETHIOPIC SYLLABLE FWEE old glibc collation-symbol: <AF>
+ᎋ ; <S138B> % ETHIOPIC SYLLABLE FWE old glibc collation-symbol: <AF>
+ጸ ; <S1338> % ETHIOPIC SYLLABLE TSA old glibc collation-symbol: <SEDEY>
+ጹ ; <S1339> % ETHIOPIC SYLLABLE TSU old glibc collation-symbol: <SEDEY>
+ጺ ; <S133A> % ETHIOPIC SYLLABLE TSI old glibc collation-symbol: <SEDEY>
+ጻ ; <S133B> % ETHIOPIC SYLLABLE TSAA old glibc collation-symbol: <SEDEY>
+ጼ ; <S133C> % ETHIOPIC SYLLABLE TSEE old glibc collation-symbol: <SEDEY>
+ጽ ; <S133D> % ETHIOPIC SYLLABLE TSE old glibc collation-symbol: <SEDEY>
+ጾ ; <S133E> % ETHIOPIC SYLLABLE TSO old glibc collation-symbol: <SEDEY>
+ጿ ; <S133F> % ETHIOPIC SYLLABLE TSWA old glibc collation-symbol: <SEDEY>
+ቀ ; <S1240> % ETHIOPIC SYLLABLE QA old glibc collation-symbol: <QAF>
+ቁ ; <S1241> % ETHIOPIC SYLLABLE QU old glibc collation-symbol: <QAF>
+ቂ ; <S1242> % ETHIOPIC SYLLABLE QI old glibc collation-symbol: <QAF>
+ቃ ; <S1243> % ETHIOPIC SYLLABLE QAA old glibc collation-symbol: <QAF>
+ቄ ; <S1244> % ETHIOPIC SYLLABLE QEE old glibc collation-symbol: <QAF>
+ቅ ; <S1245> % ETHIOPIC SYLLABLE QE old glibc collation-symbol: <QAF>
+ቆ ; <S1246> % ETHIOPIC SYLLABLE QO old glibc collation-symbol: <QAF>
+ቇ ; <S1247> % ETHIOPIC SYLLABLE QOA old glibc collation-symbol: <QAF>
+ቈ ; <S1248> % ETHIOPIC SYLLABLE QWA old glibc collation-symbol: <QAF>
+ቊ ; <S124A> % ETHIOPIC SYLLABLE QWI old glibc collation-symbol: <QAF>
+ቋ ; <S124B> % ETHIOPIC SYLLABLE QWAA old glibc collation-symbol: <QAF>
+ቌ ; <S124C> % ETHIOPIC SYLLABLE QWEE old glibc collation-symbol: <QAF>
+ቍ ; <S124D> % ETHIOPIC SYLLABLE QWE old glibc collation-symbol: <QAF>
+ቐ ; <S1250> % ETHIOPIC SYLLABLE QHA old glibc collation-symbol: <QHA-QAF>
+ቑ ; <S1251> % ETHIOPIC SYLLABLE QHU old glibc collation-symbol: <QHA-QAF>
+ቒ ; <S1252> % ETHIOPIC SYLLABLE QHI old glibc collation-symbol: <QHA-QAF>
+ቓ ; <S1253> % ETHIOPIC SYLLABLE QHAA old glibc collation-symbol: <QHA-QAF>
+ቔ ; <S1254> % ETHIOPIC SYLLABLE QHEE old glibc collation-symbol: <QHA-QAF>
+ቕ ; <S1255> % ETHIOPIC SYLLABLE QHE old glibc collation-symbol: <QHA-QAF>
+ቖ ; <S1256> % ETHIOPIC SYLLABLE QHO old glibc collation-symbol: <QHA-QAF>
+ቘ ; <S1258> % ETHIOPIC SYLLABLE QHWA old glibc collation-symbol: <QHA-QAF>
+ቚ ; <S125A> % ETHIOPIC SYLLABLE QHWI old glibc collation-symbol: <QHA-QAF>
+ቛ ; <S125B> % ETHIOPIC SYLLABLE QHWAA old glibc collation-symbol: <QHA-QAF>
+ቜ ; <S125C> % ETHIOPIC SYLLABLE QHWEE old glibc collation-symbol: <QHA-QAF>
+ቝ ; <S125D> % ETHIOPIC SYLLABLE QHWE old glibc collation-symbol: <QHA-QAF>
+ፘ ; <S1358> % ETHIOPIC SYLLABLE RYA old glibc collation-symbol: <RIS>
+ሰ ; <S1230> % ETHIOPIC SYLLABLE SA old glibc collation-symbol: <SAT>
+ሱ ; <S1231> % ETHIOPIC SYLLABLE SU old glibc collation-symbol: <SAT>
+ሲ ; <S1232> % ETHIOPIC SYLLABLE SI old glibc collation-symbol: <SAT>
+ሳ ; <S1233> % ETHIOPIC SYLLABLE SAA old glibc collation-symbol: <SAT>
+ሴ ; <S1234> % ETHIOPIC SYLLABLE SEE old glibc collation-symbol: <SAT>
+ስ ; <S1235> % ETHIOPIC SYLLABLE SE old glibc collation-symbol: <SAT>
+ሶ ; <S1236> % ETHIOPIC SYLLABLE SO old glibc collation-symbol: <SAT>
+ሷ ; <S1237> % ETHIOPIC SYLLABLE SWA old glibc collation-symbol: <SAT>
+ⶃ ; <S2D83> % ETHIOPIC SYLLABLE SOA old glibc collation-symbol: <SAT>
+ሸ ; <S1238> % ETHIOPIC SYLLABLE SHA old glibc collation-symbol: <SHA-SAT>
+ሹ ; <S1239> % ETHIOPIC SYLLABLE SHU old glibc collation-symbol: <SHA-SAT>
+ሺ ; <S123A> % ETHIOPIC SYLLABLE SHI old glibc collation-symbol: <SHA-SAT>
+ሻ ; <S123B> % ETHIOPIC SYLLABLE SHAA old glibc collation-symbol: <SHA-SAT>
+ሼ ; <S123C> % ETHIOPIC SYLLABLE SHEE old glibc collation-symbol: <SHA-SAT>
+ሽ ; <S123D> % ETHIOPIC SYLLABLE SHE old glibc collation-symbol: <SHA-SAT>
+ሾ ; <S123E> % ETHIOPIC SYLLABLE SHO old glibc collation-symbol: <SHA-SAT>
+ሿ ; <S123F> % ETHIOPIC SYLLABLE SHWA old glibc collation-symbol: <SHA-SAT>
+ⶄ ; <S2D84> % ETHIOPIC SYLLABLE SHOA old glibc collation-symbol: <SHA-SAT>
+ተ ; <S1270> % ETHIOPIC SYLLABLE TA old glibc collation-symbol: <TAW>
+ቱ ; <S1271> % ETHIOPIC SYLLABLE TU old glibc collation-symbol: <TAW>
+ቲ ; <S1272> % ETHIOPIC SYLLABLE TI old glibc collation-symbol: <TAW>
+ታ ; <S1273> % ETHIOPIC SYLLABLE TAA old glibc collation-symbol: <TAW>
+ቴ ; <S1274> % ETHIOPIC SYLLABLE TEE old glibc collation-symbol: <TAW>
+ት ; <S1275> % ETHIOPIC SYLLABLE TE old glibc collation-symbol: <TAW>
+ቶ ; <S1276> % ETHIOPIC SYLLABLE TO old glibc collation-symbol: <TAW>
+ቷ ; <S1277> % ETHIOPIC SYLLABLE TWA old glibc collation-symbol: <TAW>
+ⶆ ; <S2D86> % ETHIOPIC SYLLABLE TOA old glibc collation-symbol: <TAW>
+ቸ ; <S1278> % ETHIOPIC SYLLABLE CA old glibc collation-symbol: <CHA-TAW>
+ቹ ; <S1279> % ETHIOPIC SYLLABLE CU old glibc collation-symbol: <CHA-TAW>
+ቺ ; <S127A> % ETHIOPIC SYLLABLE CI old glibc collation-symbol: <CHA-TAW>
+ቻ ; <S127B> % ETHIOPIC SYLLABLE CAA old glibc collation-symbol: <CHA-TAW>
+ቼ ; <S127C> % ETHIOPIC SYLLABLE CEE old glibc collation-symbol: <CHA-TAW>
+ች ; <S127D> % ETHIOPIC SYLLABLE CE old glibc collation-symbol: <CHA-TAW>
+ቾ ; <S127E> % ETHIOPIC SYLLABLE CO old glibc collation-symbol: <CHA-TAW>
+ቿ ; <S127F> % ETHIOPIC SYLLABLE CWA old glibc collation-symbol: <CHA-TAW>
+ⶇ ; <S2D87> % ETHIOPIC SYLLABLE COA old glibc collation-symbol: <CHA-TAW>
+ኀ ; <S1280> % ETHIOPIC SYLLABLE XA old glibc collation-symbol: <HARM>
+ኁ ; <S1281> % ETHIOPIC SYLLABLE XU old glibc collation-symbol: <HARM>
+ኂ ; <S1282> % ETHIOPIC SYLLABLE XI old glibc collation-symbol: <HARM>
+ኃ ; <S1283> % ETHIOPIC SYLLABLE XAA old glibc collation-symbol: <HARM>
+ኄ ; <S1284> % ETHIOPIC SYLLABLE XEE old glibc collation-symbol: <HARM>
+ኅ ; <S1285> % ETHIOPIC SYLLABLE XE old glibc collation-symbol: <HARM>
+ኆ ; <S1286> % ETHIOPIC SYLLABLE XO old glibc collation-symbol: <HARM>
+ኇ ; <S1287> % ETHIOPIC SYLLABLE XOA old glibc collation-symbol: <HARM>
+ኈ ; <S1288> % ETHIOPIC SYLLABLE XWA old glibc collation-symbol: <HARM>
+ኊ ; <S128A> % ETHIOPIC SYLLABLE XWI old glibc collation-symbol: <HARM>
+ኋ ; <S128B> % ETHIOPIC SYLLABLE XWAA old glibc collation-symbol: <HARM>
+ኌ ; <S128C> % ETHIOPIC SYLLABLE XWEE old glibc collation-symbol: <HARM>
+ኍ ; <S128D> % ETHIOPIC SYLLABLE XWE old glibc collation-symbol: <HARM>
+ፀ ; <S1340> % ETHIOPIC SYLLABLE TZA old glibc collation-symbol: <SEPA>
+ፁ ; <S1341> % ETHIOPIC SYLLABLE TZU old glibc collation-symbol: <SEPA>
+ፂ ; <S1342> % ETHIOPIC SYLLABLE TZI old glibc collation-symbol: <SEPA>
+ፃ ; <S1343> % ETHIOPIC SYLLABLE TZAA old glibc collation-symbol: <SEPA>
+ፄ ; <S1344> % ETHIOPIC SYLLABLE TZEE old glibc collation-symbol: <SEPA>
+ፅ ; <S1345> % ETHIOPIC SYLLABLE TZE old glibc collation-symbol: <SEPA>
+ፆ ; <S1346> % ETHIOPIC SYLLABLE TZO old glibc collation-symbol: <SEPA>
+ፇ ; <S1347> % ETHIOPIC SYLLABLE TZOA old glibc collation-symbol: <SEPA>
+ጰ ; <S1330> % ETHIOPIC SYLLABLE PHA old glibc collation-symbol: <PEYT>
+ጱ ; <S1331> % ETHIOPIC SYLLABLE PHU old glibc collation-symbol: <PEYT>
+ጲ ; <S1332> % ETHIOPIC SYLLABLE PHI old glibc collation-symbol: <PEYT>
+ጳ ; <S1333> % ETHIOPIC SYLLABLE PHAA old glibc collation-symbol: <PEYT>
+ጴ ; <S1334> % ETHIOPIC SYLLABLE PHEE old glibc collation-symbol: <PEYT>
+ጵ ; <S1335> % ETHIOPIC SYLLABLE PHE old glibc collation-symbol: <PEYT>
+ጶ ; <S1336> % ETHIOPIC SYLLABLE PHO old glibc collation-symbol: <PEYT>
+ጷ ; <S1337> % ETHIOPIC SYLLABLE PHWA old glibc collation-symbol: <PEYT>
+ⶑ ; <S2D91> % ETHIOPIC SYLLABLE PHOA old glibc collation-symbol: <PEYT>
+ፐ ; <S1350> % ETHIOPIC SYLLABLE PA old glibc collation-symbol: <PSA>
+ፑ ; <S1351> % ETHIOPIC SYLLABLE PU old glibc collation-symbol: <PSA>
+ፒ ; <S1352> % ETHIOPIC SYLLABLE PI old glibc collation-symbol: <PSA>
+ፓ ; <S1353> % ETHIOPIC SYLLABLE PAA old glibc collation-symbol: <PSA>
+ፔ ; <S1354> % ETHIOPIC SYLLABLE PEE old glibc collation-symbol: <PSA>
+ፕ ; <S1355> % ETHIOPIC SYLLABLE PE old glibc collation-symbol: <PSA>
+ፖ ; <S1356> % ETHIOPIC SYLLABLE PO old glibc collation-symbol: <PSA>
+ፗ ; <S1357> % ETHIOPIC SYLLABLE PWA old glibc collation-symbol: <PSA>
+ᎌ ; <S138C> % ETHIOPIC SYLLABLE SEBATBEIT PWA old glibc collation-symbol: <PSA>
+ᎍ ; <S138D> % ETHIOPIC SYLLABLE PWI old glibc collation-symbol: <PSA>
+ᎎ ; <S138E> % ETHIOPIC SYLLABLE PWEE old glibc collation-symbol: <PSA>
+ᎏ ; <S138F> % ETHIOPIC SYLLABLE PWE old glibc collation-symbol: <PSA>
+ⶒ ; <S2D92> % ETHIOPIC SYLLABLE POA old glibc collation-symbol: <PSA>
--- a/localedata/ha_NG.UTF-8.in
+++ b/localedata/ha_NG.UTF-8.in
@ -0,0 +1,47 @@
+a
+A
+b
+B
+bb
+ɓ
+Ɓ
+d
+D
+dd
+ɗ
+Ɗ
+k
+K
+kk
+ƙ
+Ƙ
+s
+S
+ss
+sz
+sh
+sH
+Sh
+SH
+t
+T
+tt
+tz
+ts
+tS
+Ts
+TS
+u
+U
+y
+Y
+ƴ
+ʼy
+’y
+''y
+Ƴ
+ʼY
+’Y
+''Y
+z
+Z
--- a/localedata/ig_NG.UTF-8.in
+++ b/localedata/ig_NG.UTF-8.in
@ -0,0 +1,93 @@
+b
+B
+bz
+ch
+cH
+Ch
+CH
+CHz
+g
+G
+gz
+gb
+gB
+Gb
+GB
+GBz
+gh
+gH
+Gh
+GHz
+gw
+gW
+Gw
+GW
+GWz
+i
+I
+iz
+ị
+ị
+Ị
+Ị
+ịz
+k
+K
+kz
+kp
+kP
+Kp
+KP
+KPz
+kw
+kW
+Kw
+KW
+KWz
+n
+N
+nz
+ṅ
+ṅ
+Ṅ
+Ṅ
+nw
+nW
+Nw
+NW
+NWz
+ny
+nY
+Ny
+NY
+NYz
+o
+O
+oz
+ọ
+ọ
+Ọ
+Ọ
+ọz
+s
+S
+sz
+sh
+sH
+Sh
+SH
+SHz
+u
+U
+uz
+ụ
+ụ
+Ụ
+Ụ
+ụz
+v
+V
+vz
+z
+Z
+zz
--- a/localedata/ik_CA.UTF-8.in
+++ b/localedata/ik_CA.UTF-8.in
@ -0,0 +1,60 @@
+a
+A
+b
+c
+C
+cz
+ch
+cH
+Ch
+CH
+d
+e
+f
+g
+G
+gz
+ġ
+Ġ
+h
+i
+j
+k
+l
+L
+lz
+ḷ
+Ḷ
+ḷz
+ł
+Ł
+łz
+ł̣
+Ł̣
+ł̣z
+m
+n
+N
+nz
+ñ
+Ñ
+ñz
+ŋ
+Ŋ
+ŋz
+o
+p
+q
+r
+s
+S
+sz
+sr
+t
+u
+v
+w
+x
+y
+z
+Z
--- a/localedata/kk_KZ.UTF-8.in
+++ b/localedata/kk_KZ.UTF-8.in
@ -0,0 +1,40 @@
+ѓ
+Ѓ
+ґ
+Ґ
+ѓя
+ґя
+е
+Е
+ея
+ё
+Ё
+ёя
+и
+И
+ия
+й
+Й
+йя
+у
+У
+уя
+ұ
+Ұ
+ұя
+ү
+Ү
+үя
+Ш
+Щ
+Ъ
+Ы
+і
+І
+ія
+ь
+Ь
+ья
+я
+Я
+яя
--- a/localedata/ku_TR.UTF-8.in
+++ b/localedata/ku_TR.UTF-8.in
@ -0,0 +1,52 @@
+a
+b
+c
+C
+cz
+ç
+Ç
+d
+e
+E
+ez
+ê
+Ê
+f
+g
+h
+H
+hz
+ı
+I
+ız
+i
+İ
+iz
+î
+Î
+îz
+j
+k
+l
+m
+n
+o
+p
+q
+r
+s
+S
+sz
+ş
+Ş
+t
+u
+U
+uz
+û
+Û
+v
+w
+x
+y
+z
--- a/localedata/ky_KG.UTF-8.in
+++ b/localedata/ky_KG.UTF-8.in
@ -0,0 +1,72 @@
+А
+АЯ
+Б
+БЯ
+В
+ВЯ
+Г
+ГЯ
+Д
+ДЯ
+Е
+ЕЯ
+Ё
+ЁЯ
+Ж
+ЖЯ
+З
+ЗЯ
+И
+ИЯ
+Й
+ЙЯ
+К
+КЯ
+Л
+ЛЯ
+М
+МЯ
+Н
+НЯ
+Ң
+ҢЯ
+О
+ОЯ
+Ө
+ӨЯ
+П
+ПЯ
+Р
+РЯ
+С
+СЯ
+Т
+ТЯ
+У
+УЯ
+Ү
+ҮЯ
+Ф
+ФЯ
+Х
+ХЯ
+Ц
+ЦЯ
+Ч
+ЧЯ
+Ш
+ШЯ
+Щ
+ЩЯ
+Ъ
+ЪЯ
+Ы
+ЫЯ
+Ь
+ЬЯ
+Э
+ЭЯ
+Ю
+ЮЯ
+Я
+ЯЯ
--- a/localedata/ln_CD.UTF-8.in
+++ b/localedata/ln_CD.UTF-8.in
@ -0,0 +1,18 @@
+e
+E
+ez
+ɛ
+Ɛ
+ɛz
+f
+F
+fz
+o
+O
+oz
+ɔ
+Ɔ
+ɔz
+p
+P
+Pz
--- a/localedata/locales/am_ET
+++ b/localedata/locales/am_ET
@ -58,536 +58,35 @@ END LC_IDENTIFICATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

 LC_COLLATE
+
+% CLDR collation rules for Amharic:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/am.xml)
 %
-% Copy the template from ISO/IEC 14651
+% <!-- The root collation order is valid for this language. Just move the native script first. -->
+% <collations>
+% 	<collation type="standard"><cr><![CDATA[
+%  [reorder Ethi]
+% 	]]></cr></collation>
+% </collations>
 %
+% And CLDR also lists the following
+% index characters:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/main/am.xml)
+%
+% 		<exemplarCharacters type="index" draft="unconfirmed">[ሀ ለ ሐ መ ሠ ረ ሰ ሸ ቀ ቈ በ ቨ ተ ቸ ኀ ኈ ነ ኘ አ ከ ኰ ኸ ወ ዐ ዘ ዠ የ ደ ጀ ገ ጐ ጠ ጨ ጰ ጸ ፀ ፈ ፐ]</exemplarCharacters>
+%
+% So no extra rules should be necessary, copy "iso14651_t1"
+% should be enough:
 copy "iso14651_t1"
-%
-%  The ETHIOPIC script declaration must come first.
-%
-script <ETHIOPIC>
-%
-%  Correcting Unicode's linguistic ordering to the traditional.
-%
-collating-symbol <HOY>
-collating-symbol <LAWI>
-collating-symbol <HAWT>
-collating-symbol <MAY>
-collating-symbol <SEWT>
-collating-symbol <RIS>
-collating-symbol <SAT>
-collating-symbol <SHA-SAT>
-collating-symbol <QAF>
-collating-symbol <QHA-QAF>
-collating-symbol <BET>
-collating-symbol <VE-BET>
-collating-symbol <TAW>
-collating-symbol <CHA-TAW>
-collating-symbol <HARM>
-collating-symbol <NEHAS>
-collating-symbol <NYE-NEHAS>
-collating-symbol <ALEF>
-collating-symbol <KAF>
-collating-symbol <KHA-KAF>
-collating-symbol <WEWE>
-collating-symbol <AYIN>
-collating-symbol <ZEY>
-collating-symbol <ZHE-ZEY>
-collating-symbol <YEMEN>
-collating-symbol <DINT>
-collating-symbol <DHI-DINT>
-collating-symbol <JI-DINT>
-collating-symbol <GEMEL>
-collating-symbol <NGE-GEMEL>
-collating-symbol <TEYT>
-collating-symbol <CHE-TEYT>
-collating-symbol <PEYT>
-collating-symbol <SEDEY>
-collating-symbol <SEPA>
-collating-symbol <AF>
-collating-symbol <PSA>

-collating-symbol <GE'EZ>
-collating-symbol <KA'IB>
-collating-symbol <SALIS>
-collating-symbol <RABI>
-collating-symbol <HAMIS>
-collating-symbol <SADIS>
-collating-symbol <SABI>
-collating-symbol <YA>
-
-collating-symbol <QELAL>
-collating-symbol <ZEMEDE>
-
-collating-symbol <NUMERALS>
-collating-symbol <AHADU>
-collating-symbol <KILEITU>
-collating-symbol <SELESTU>
-collating-symbol <ARBAITU>
-collating-symbol <HAMISTU>
-collating-symbol <SIDISTU>
-collating-symbol <SEBATU>
-collating-symbol <SEMENTU>
-collating-symbol <TESATU>
-collating-symbol <ASERTU>
-collating-symbol <ISRA>
-collating-symbol <SELASA>
-collating-symbol <ARBA>
-collating-symbol <HAMSA>
-collating-symbol <SISA>
-collating-symbol <SEBA>
-collating-symbol <SEMANYA>
-collating-symbol <TESA>
-collating-symbol <MEET>
-collating-symbol <ILF>
-
-collating-symbol <PUNCTUATION>
-collating-symbol <NEUS-NETEB>
-collating-symbol <EBIY-NETEB>
-collating-symbol <NETELA-SEREZ>
-collating-symbol <NEUS-SEREZ>
-collating-symbol <ASTEAMRO>
-collating-symbol <EBIY-SEREZ>
-collating-symbol <SELESTE-NETEB>
-collating-symbol <SEBATE-NETEB>
-
-<HOY>
-<LAWI>
-<HAWT>
-<MAY>
-<SEWT>
-<RIS>
-<SAT>
-<SHA-SAT>
-<QAF>
-<QHA-QAF>
-<BET>
-<VE-BET>
-<TAW>
-<CHA-TAW>
-<HARM>
-<NEHAS>
-<NYE-NEHAS>
-<ALEF>
-<KAF>
-<KHA-KAF>
-<WEWE>
-<AYIN>
-<ZEY>
-<ZHE-ZEY>
-<YEMEN>
-<DINT>
-<DHI-DINT>
-<JI-DINT>
-<GEMEL>
-<NGE-GEMEL>
-<TEYT>
-<CHE-TEYT>
-<PEYT>
-<SEDEY>
-<SEPA>
-<AF>
-<PSA>
-
-<GE'EZ>
-<KA'IB>
-<SALIS>
-<RABI>
-<HAMIS>
-<SADIS>
-<SABI>
-
-<QELAL>
-<ZEMEDE>
-<YA>
-
-<NUMERALS>
-<PUNCTUATION>
-
-<AHADU>
-<KILEITU>
-<SELESTU>
-<ARBAITU>
-<HAMISTU>
-<SIDISTU>
-<SEBATU>
-<SEMENTU>
-<TESATU>
-<ASERTU>
-<ISRA>
-<SELASA>
-<ARBA>
-<HAMSA>
-<SISA>
-<SEBA>
-<SEMANYA>
-<TESA>
-<MEET>
-<ILF>
-
-<NEUS-NETEB>
-<NETELA-SEREZ>
-<NEUS-SEREZ>
-<EBIY-SEREZ>
-<ASTEAMRO>
-<EBIY-NETEB>
-<SELESTE-NETEB>
-<SEBATE-NETEB>
-
-order_start <ETHIOPIC>;forward;forward;forward;forward,position
-<U1200> <HOY>;<QELAL>;<GE'EZ>;IGNORE
-<U1201> <HOY>;<QELAL>;<KA'IB>;IGNORE
-<U1202> <HOY>;<QELAL>;<SALIS>;IGNORE
-<U1203> <HOY>;<QELAL>;<RABI>;IGNORE
-<U1204> <HOY>;<QELAL>;<HAMIS>;IGNORE
-<U1205> <HOY>;<QELAL>;<SADIS>;IGNORE
-<U1206> <HOY>;<QELAL>;<SABI>;IGNORE
-<U1208> <LAWI>;<QELAL>;<GE'EZ>;IGNORE
-<U1209> <LAWI>;<QELAL>;<KA'IB>;IGNORE
-<U120A> <LAWI>;<QELAL>;<SALIS>;IGNORE
-<U120B> <LAWI>;<QELAL>;<RABI>;IGNORE
-<U120C> <LAWI>;<QELAL>;<HAMIS>;IGNORE
-<U120D> <LAWI>;<QELAL>;<SADIS>;IGNORE
-<U120E> <LAWI>;<QELAL>;<SABI>;IGNORE
-<U120F> <LAWI>;<ZEMEDE>;<RABI>;IGNORE
-<U1210> <HAWT>;<QELAL>;<GE'EZ>;IGNORE
-<U1211> <HAWT>;<QELAL>;<KA'IB>;IGNORE
-<U1212> <HAWT>;<QELAL>;<SALIS>;IGNORE
-<U1213> <HAWT>;<QELAL>;<RABI>;IGNORE
-<U1214> <HAWT>;<QELAL>;<HAMIS>;IGNORE
-<U1215> <HAWT>;<QELAL>;<SADIS>;IGNORE
-<U1216> <HAWT>;<QELAL>;<SABI>;IGNORE
-<U1217> <HAWT>;<ZEMEDE>;<RABI>;IGNORE
-<U1218> <MAY>;<QELAL>;<GE'EZ>;IGNORE
-<U1219> <MAY>;<QELAL>;<KA'IB>;IGNORE
-<U121A> <MAY>;<QELAL>;<SALIS>;IGNORE
-<U121B> <MAY>;<QELAL>;<RABI>;IGNORE
-<U121C> <MAY>;<QELAL>;<HAMIS>;IGNORE
-<U121D> <MAY>;<QELAL>;<SADIS>;IGNORE
-<U121E> <MAY>;<QELAL>;<SABI>;IGNORE
-<U121F> <MAY>;<ZEMEDE>;<RABI>;IGNORE
-<U1220> <SEWT>;<QELAL>;<GE'EZ>;IGNORE
-<U1221> <SEWT>;<QELAL>;<KA'IB>;IGNORE
-<U1222> <SEWT>;<QELAL>;<SALIS>;IGNORE
-<U1223> <SEWT>;<QELAL>;<RABI>;IGNORE
-<U1224> <SEWT>;<QELAL>;<HAMIS>;IGNORE
-<U1225> <SEWT>;<QELAL>;<SADIS>;IGNORE
-<U1226> <SEWT>;<QELAL>;<SABI>;IGNORE
-<U1227> <SEWT>;<ZEMEDE>;<RABI>;IGNORE
-<U1228> <RIS>;<QELAL>;<GE'EZ>;IGNORE
-<U1229> <RIS>;<QELAL>;<KA'IB>;IGNORE
-<U122A> <RIS>;<QELAL>;<SALIS>;IGNORE
-<U122B> <RIS>;<QELAL>;<RABI>;IGNORE
-<U122C> <RIS>;<QELAL>;<HAMIS>;IGNORE
-<U122D> <RIS>;<QELAL>;<SADIS>;IGNORE
-<U122E> <RIS>;<QELAL>;<SABI>;IGNORE
-<U122F> <RIS>;<ZEMEDE>;<RABI>;IGNORE
-<U1230> <SAT>;<QELAL>;<GE'EZ>;IGNORE
-<U1231> <SAT>;<QELAL>;<KA'IB>;IGNORE
-<U1232> <SAT>;<QELAL>;<SALIS>;IGNORE
-<U1233> <SAT>;<QELAL>;<RABI>;IGNORE
-<U1234> <SAT>;<QELAL>;<HAMIS>;IGNORE
-<U1235> <SAT>;<QELAL>;<SADIS>;IGNORE
-<U1236> <SAT>;<QELAL>;<SABI>;IGNORE
-<U1237> <SAT>;<ZEMEDE>;<RABI>;IGNORE
-<U1238> <SHA-SAT>;<QELAL>;<GE'EZ>;IGNORE
-<U1239> <SHA-SAT>;<QELAL>;<KA'IB>;IGNORE
-<U123A> <SHA-SAT>;<QELAL>;<SALIS>;IGNORE
-<U123B> <SHA-SAT>;<QELAL>;<RABI>;IGNORE
-<U123C> <SHA-SAT>;<QELAL>;<HAMIS>;IGNORE
-<U123D> <SHA-SAT>;<QELAL>;<SADIS>;IGNORE
-<U123E> <SHA-SAT>;<QELAL>;<SABI>;IGNORE
-<U123F> <SHA-SAT>;<ZEMEDE>;<RABI>;IGNORE
-<U1240> <QAF>;<QELAL>;<GE'EZ>;IGNORE
-<U1241> <QAF>;<QELAL>;<KA'IB>;IGNORE
-<U1242> <QAF>;<QELAL>;<SALIS>;IGNORE
-<U1243> <QAF>;<QELAL>;<RABI>;IGNORE
-<U1244> <QAF>;<QELAL>;<HAMIS>;IGNORE
-<U1245> <QAF>;<QELAL>;<SADIS>;IGNORE
-<U1246> <QAF>;<QELAL>;<SABI>;IGNORE
-<U1248> <QAF>;<ZEMEDE>;<GE'EZ>;IGNORE
-<U124A> <QAF>;<ZEMEDE>;<SALIS>;IGNORE
-<U124B> <QAF>;<ZEMEDE>;<RABI>;IGNORE
-<U124C> <QAF>;<ZEMEDE>;<HAMIS>;IGNORE
-<U124D> <QAF>;<ZEMEDE>;<KA'IB>;IGNORE
-<U1250> <QHA-QAF>;<QELAL>;<GE'EZ>;IGNORE
-<U1251> <QHA-QAF>;<QELAL>;<KA'IB>;IGNORE
-<U1252> <QHA-QAF>;<QELAL>;<SALIS>;IGNORE
-<U1253> <QHA-QAF>;<QELAL>;<RABI>;IGNORE
-<U1254> <QHA-QAF>;<QELAL>;<HAMIS>;IGNORE
-<U1255> <QHA-QAF>;<QELAL>;<SADIS>;IGNORE
-<U1256> <QHA-QAF>;<QELAL>;<SABI>;IGNORE
-<U1258> <QHA-QAF>;<ZEMEDE>;<GE'EZ>;IGNORE
-<U125A> <QHA-QAF>;<ZEMEDE>;<SALIS>;IGNORE
-<U125B> <QHA-QAF>;<ZEMEDE>;<RABI>;IGNORE
-<U125C> <QHA-QAF>;<ZEMEDE>;<HAMIS>;IGNORE
-<U125D> <QHA-QAF>;<ZEMEDE>;<KA'IB>;IGNORE
-<U1260> <BET>;<QELAL>;<GE'EZ>;IGNORE
-<U1261> <BET>;<QELAL>;<KA'IB>;IGNORE
-<U1262> <BET>;<QELAL>;<SALIS>;IGNORE
-<U1263> <BET>;<QELAL>;<RABI>;IGNORE
-<U1264> <BET>;<QELAL>;<HAMIS>;IGNORE
-<U1265> <BET>;<QELAL>;<SADIS>;IGNORE
-<U1266> <BET>;<QELAL>;<SABI>;IGNORE
-<U1267> <BET>;<ZEMEDE>;<RABI>;IGNORE
-<U1268> <VE-BET>;<QELAL>;<GE'EZ>;IGNORE
-<U1269> <VE-BET>;<QELAL>;<KA'IB>;IGNORE
-<U126A> <VE-BET>;<QELAL>;<SALIS>;IGNORE
-<U126B> <VE-BET>;<QELAL>;<RABI>;IGNORE
-<U126C> <VE-BET>;<QELAL>;<HAMIS>;IGNORE
-<U126D> <VE-BET>;<QELAL>;<SADIS>;IGNORE
-<U126E> <VE-BET>;<QELAL>;<SABI>;IGNORE
-<U126F> <VE-BET>;<ZEMEDE>;<RABI>;IGNORE
-<U1270> <TAW>;<QELAL>;<GE'EZ>;IGNORE
-<U1271> <TAW>;<QELAL>;<KA'IB>;IGNORE
-<U1272> <TAW>;<QELAL>;<SALIS>;IGNORE
-<U1273> <TAW>;<QELAL>;<RABI>;IGNORE
-<U1274> <TAW>;<QELAL>;<HAMIS>;IGNORE
-<U1275> <TAW>;<QELAL>;<SADIS>;IGNORE
-<U1276> <TAW>;<QELAL>;<SABI>;IGNORE
-<U1277> <TAW>;<ZEMEDE>;<RABI>;IGNORE
-<U1278> <CHA-TAW>;<QELAL>;<GE'EZ>;IGNORE
-<U1279> <CHA-TAW>;<QELAL>;<KA'IB>;IGNORE
-<U127A> <CHA-TAW>;<QELAL>;<SALIS>;IGNORE
-<U127B> <CHA-TAW>;<QELAL>;<RABI>;IGNORE
-<U127C> <CHA-TAW>;<QELAL>;<HAMIS>;IGNORE
-<U127D> <CHA-TAW>;<QELAL>;<SADIS>;IGNORE
-<U127E> <CHA-TAW>;<QELAL>;<SABI>;IGNORE
-<U127F> <CHA-TAW>;<QELAL>;<TAW>;IGNORE
-<U1280> <HARM>;<QELAL>;<GE'EZ>;IGNORE
-<U1281> <HARM>;<QELAL>;<KA'IB>;IGNORE
-<U1282> <HARM>;<QELAL>;<SALIS>;IGNORE
-<U1283> <HARM>;<QELAL>;<RABI>;IGNORE
-<U1284> <HARM>;<QELAL>;<HAMIS>;IGNORE
-<U1285> <HARM>;<QELAL>;<SADIS>;IGNORE
-<U1286> <HARM>;<QELAL>;<SABI>;IGNORE
-<U1288> <HARM>;<ZEMEDE>;<GE'EZ>;IGNORE
-<U128A> <HARM>;<ZEMEDE>;<SALIS>;IGNORE
-<U128B> <HARM>;<ZEMEDE>;<RABI>;IGNORE
-<U128C> <HARM>;<ZEMEDE>;<HAMIS>;IGNORE
-<U128D> <HARM>;<ZEMEDE>;<KA'IB>;IGNORE
-<U1290> <NEHAS>;<QELAL>;<GE'EZ>;IGNORE
-<U1291> <NEHAS>;<QELAL>;<KA'IB>;IGNORE
-<U1292> <NEHAS>;<QELAL>;<SALIS>;IGNORE
-<U1293> <NEHAS>;<QELAL>;<RABI>;IGNORE
-<U1294> <NEHAS>;<QELAL>;<HAMIS>;IGNORE
-<U1295> <NEHAS>;<QELAL>;<SADIS>;IGNORE
-<U1296> <NEHAS>;<QELAL>;<SABI>;IGNORE
-<U1297> <NEHAS>;<ZEMEDE>;<RABI>;IGNORE
-<U1298> <NYE-NEHAS>;<QELAL>;<GE'EZ>;IGNORE
-<U1299> <NYE-NEHAS>;<QELAL>;<KA'IB>;IGNORE
-<U129A> <NYE-NEHAS>;<QELAL>;<SALIS>;IGNORE
-<U129B> <NYE-NEHAS>;<QELAL>;<RABI>;IGNORE
-<U129C> <NYE-NEHAS>;<QELAL>;<HAMIS>;IGNORE
-<U129D> <NYE-NEHAS>;<QELAL>;<SADIS>;IGNORE
-<U129E> <NYE-NEHAS>;<QELAL>;<SABI>;IGNORE
-<U129F> <NYE-NEHAS>;<ZEMEDE>;<RABI>;IGNORE
-<U12A0> <ALEF>;<QELAL>;<GE'EZ>;IGNORE
-<U12A1> <ALEF>;<QELAL>;<KA'IB>;IGNORE
-<U12A2> <ALEF>;<QELAL>;<SALIS>;IGNORE
-<U12A3> <ALEF>;<QELAL>;<RABI>;IGNORE
-<U12A4> <ALEF>;<QELAL>;<HAMIS>;IGNORE
-<U12A5> <ALEF>;<QELAL>;<SADIS>;IGNORE
-<U12A6> <ALEF>;<QELAL>;<SABI>;IGNORE
-<U12A7> <ALEF>;<ZEMEDE>;<GE'EZ>;IGNORE
-<U12A8> <KAF>;<QELAL>;<GE'EZ>;IGNORE
-<U12A9> <KAF>;<QELAL>;<KA'IB>;IGNORE
-<U12AA> <KAF>;<QELAL>;<SALIS>;IGNORE
-<U12AB> <KAF>;<QELAL>;<RABI>;IGNORE
-<U12AC> <KAF>;<QELAL>;<HAMIS>;IGNORE
-<U12AD> <KAF>;<QELAL>;<SADIS>;IGNORE
-<U12AE> <KAF>;<QELAL>;<SABI>;IGNORE
-<U12B0> <KAF>;<ZEMEDE>;<GE'EZ>;IGNORE
-<U12B2> <KAF>;<ZEMEDE>;<SALIS>;IGNORE
-<U12B3> <KAF>;<ZEMEDE>;<RABI>;IGNORE
-<U12B4> <KAF>;<ZEMEDE>;<HAMIS>;IGNORE
-<U12B5> <KAF>;<ZEMEDE>;<KA'IB>;IGNORE
-<U12B8> <KHA-KAF>;<QELAL>;<GE'EZ>;IGNORE
-<U12B9> <KHA-KAF>;<QELAL>;<KA'IB>;IGNORE
-<U12BA> <KHA-KAF>;<QELAL>;<SALIS>;IGNORE
-<U12BB> <KHA-KAF>;<QELAL>;<RABI>;IGNORE
-<U12BC> <KHA-KAF>;<QELAL>;<HAMIS>;IGNORE
-<U12BD> <KHA-KAF>;<QELAL>;<SADIS>;IGNORE
-<U12BE> <KHA-KAF>;<QELAL>;<SABI>;IGNORE
-<U12C0> <KHA-KAF>;<ZEMEDE>;<GE'EZ>;IGNORE
-<U12C2> <KHA-KAF>;<ZEMEDE>;<SALIS>;IGNORE
-<U12C3> <KHA-KAF>;<ZEMEDE>;<RABI>;IGNORE
-<U12C4> <KHA-KAF>;<ZEMEDE>;<HAMIS>;IGNORE
-<U12C5> <KHA-KAF>;<ZEMEDE>;<KA'IB>;IGNORE
-<U12C8> <WEWE>;<QELAL>;<GE'EZ>;IGNORE
-<U12C9> <WEWE>;<QELAL>;<KA'IB>;IGNORE
-<U12CA> <WEWE>;<QELAL>;<SALIS>;IGNORE
-<U12CB> <WEWE>;<QELAL>;<RABI>;IGNORE
-<U12CC> <WEWE>;<QELAL>;<HAMIS>;IGNORE
-<U12CD> <WEWE>;<QELAL>;<SADIS>;IGNORE
-<U12CE> <WEWE>;<QELAL>;<SABI>;IGNORE
-<U12D0> <AYIN>;<QELAL>;<GE'EZ>;IGNORE
-<U12D1> <AYIN>;<QELAL>;<KA'IB>;IGNORE
-<U12D2> <AYIN>;<QELAL>;<SALIS>;IGNORE
-<U12D3> <AYIN>;<QELAL>;<RABI>;IGNORE
-<U12D4> <AYIN>;<QELAL>;<HAMIS>;IGNORE
-<U12D5> <AYIN>;<QELAL>;<SADIS>;IGNORE
-<U12D6> <AYIN>;<QELAL>;<SABI>;IGNORE
-<U12D8> <ZEY>;<QELAL>;<GE'EZ>;IGNORE
-<U12D9> <ZEY>;<QELAL>;<KA'IB>;IGNORE
-<U12DA> <ZEY>;<QELAL>;<SALIS>;IGNORE
-<U12DB> <ZEY>;<QELAL>;<RABI>;IGNORE
-<U12DC> <ZEY>;<QELAL>;<HAMIS>;IGNORE
-<U12DD> <ZEY>;<QELAL>;<SADIS>;IGNORE
-<U12DE> <ZEY>;<QELAL>;<SABI>;IGNORE
-<U12DF> <ZEY>;<ZEMEDE>;<RABI>;IGNORE
-<U12E0> <ZHE-ZEY>;<QELAL>;<GE'EZ>;IGNORE
-<U12E1> <ZHE-ZEY>;<QELAL>;<KA'IB>;IGNORE
-<U12E2> <ZHE-ZEY>;<QELAL>;<SALIS>;IGNORE
-<U12E3> <ZHE-ZEY>;<QELAL>;<RABI>;IGNORE
-<U12E4> <ZHE-ZEY>;<QELAL>;<HAMIS>;IGNORE
-<U12E5> <ZHE-ZEY>;<QELAL>;<SADIS>;IGNORE
-<U12E6> <ZHE-ZEY>;<QELAL>;<SABI>;IGNORE
-<U12E7> <ZHE-ZEY>;<ZEMEDE>;<RABI>;IGNORE
-<U12E8> <YEMEN>;<QELAL>;<GE'EZ>;IGNORE
-<U12E9> <YEMEN>;<QELAL>;<KA'IB>;IGNORE
-<U12EA> <YEMEN>;<QELAL>;<SALIS>;IGNORE
-<U12EB> <YEMEN>;<QELAL>;<RABI>;IGNORE
-<U12EC> <YEMEN>;<QELAL>;<HAMIS>;IGNORE
-<U12ED> <YEMEN>;<QELAL>;<SADIS>;IGNORE
-<U12EE> <YEMEN>;<QELAL>;<SABI>;IGNORE
-<U12F0> <DINT>;<QELAL>;<GE'EZ>;IGNORE
-<U12F1> <DINT>;<QELAL>;<KA'IB>;IGNORE
-<U12F2> <DINT>;<QELAL>;<SALIS>;IGNORE
-<U12F3> <DINT>;<QELAL>;<RABI>;IGNORE
-<U12F4> <DINT>;<QELAL>;<HAMIS>;IGNORE
-<U12F5> <DINT>;<QELAL>;<SADIS>;IGNORE
-<U12F6> <DINT>;<QELAL>;<SABI>;IGNORE
-<U12F7> <DINT>;<ZEMEDE>;<RABI>;IGNORE
-<U12F8> <DHI-DINT>;<QELAL>;<GE'EZ>;IGNORE
-<U12F9> <DHI-DINT>;<QELAL>;<KA'IB>;IGNORE
-<U12FA> <DHI-DINT>;<QELAL>;<SALIS>;IGNORE
-<U12FB> <DHI-DINT>;<QELAL>;<RABI>;IGNORE
-<U12FC> <DHI-DINT>;<QELAL>;<HAMIS>;IGNORE
-<U12FD> <DHI-DINT>;<QELAL>;<SADIS>;IGNORE
-<U12FE> <DHI-DINT>;<QELAL>;<SABI>;IGNORE
-<U12FF> <DHI-DINT>;<ZEMEDE>;<RABI>;IGNORE
-<U1300> <JI-DINT>;<QELAL>;<GE'EZ>;IGNORE
-<U1301> <JI-DINT>;<QELAL>;<KA'IB>;IGNORE
-<U1302> <JI-DINT>;<QELAL>;<SALIS>;IGNORE
-<U1303> <JI-DINT>;<QELAL>;<RABI>;IGNORE
-<U1304> <JI-DINT>;<QELAL>;<HAMIS>;IGNORE
-<U1305> <JI-DINT>;<QELAL>;<SADIS>;IGNORE
-<U1306> <JI-DINT>;<QELAL>;<SABI>;IGNORE
-<U1307> <JI-DINT>;<ZEMEDE>;<RABI>;IGNORE
-<U1308> <GEMEL>;<QELAL>;<GE'EZ>;IGNORE
-<U1309> <GEMEL>;<QELAL>;<KA'IB>;IGNORE
-<U130A> <GEMEL>;<QELAL>;<SALIS>;IGNORE
-<U130B> <GEMEL>;<QELAL>;<RABI>;IGNORE
-<U130C> <GEMEL>;<QELAL>;<HAMIS>;IGNORE
-<U130D> <GEMEL>;<QELAL>;<SADIS>;IGNORE
-<U130E> <GEMEL>;<QELAL>;<SABI>;IGNORE
-<U1310> <GEMEL>;<ZEMEDE>;<GE'EZ>;IGNORE
-<U1312> <GEMEL>;<ZEMEDE>;<SALIS>;IGNORE
-<U1313> <GEMEL>;<ZEMEDE>;<RABI>;IGNORE
-<U1314> <GEMEL>;<ZEMEDE>;<HAMIS>;IGNORE
-<U1315> <GEMEL>;<ZEMEDE>;<KA'IB>;IGNORE
-<U1318> <NGE-GEMEL>;<QELAL>;<GE'EZ>;IGNORE
-<U1319> <NGE-GEMEL>;<QELAL>;<KA'IB>;IGNORE
-<U131A> <NGE-GEMEL>;<QELAL>;<SALIS>;IGNORE
-<U131B> <NGE-GEMEL>;<QELAL>;<RABI>;IGNORE
-<U131C> <NGE-GEMEL>;<QELAL>;<HAMIS>;IGNORE
-<U131D> <NGE-GEMEL>;<QELAL>;<SADIS>;IGNORE
-<U131E> <NGE-GEMEL>;<QELAL>;<SABI>;IGNORE
-<U1320> <TEYT>;<QELAL>;<GE'EZ>;IGNORE
-<U1321> <TEYT>;<QELAL>;<KA'IB>;IGNORE
-<U1322> <TEYT>;<QELAL>;<SALIS>;IGNORE
-<U1323> <TEYT>;<QELAL>;<RABI>;IGNORE
-<U1324> <TEYT>;<QELAL>;<HAMIS>;IGNORE
-<U1325> <TEYT>;<QELAL>;<SADIS>;IGNORE
-<U1326> <TEYT>;<QELAL>;<SABI>;IGNORE
-<U1327> <TEYT>;<ZEMEDE>;<RABI>;IGNORE
-<U1328> <CHE-TEYT>;<QELAL>;<GE'EZ>;IGNORE
-<U1329> <CHE-TEYT>;<QELAL>;<KA'IB>;IGNORE
-<U132A> <CHE-TEYT>;<QELAL>;<SALIS>;IGNORE
-<U132B> <CHE-TEYT>;<QELAL>;<RABI>;IGNORE
-<U132C> <CHE-TEYT>;<QELAL>;<HAMIS>;IGNORE
-<U132D> <CHE-TEYT>;<QELAL>;<SADIS>;IGNORE
-<U132E> <CHE-TEYT>;<QELAL>;<SABI>;IGNORE
-<U132F> <CHE-TEYT>;<ZEMEDE>;<RABI>;IGNORE
-<U1330> <PEYT>;<QELAL>;<GE'EZ>;IGNORE
-<U1331> <PEYT>;<QELAL>;<KA'IB>;IGNORE
-<U1332> <PEYT>;<QELAL>;<SALIS>;IGNORE
-<U1333> <PEYT>;<QELAL>;<RABI>;IGNORE
-<U1334> <PEYT>;<QELAL>;<HAMIS>;IGNORE
-<U1335> <PEYT>;<QELAL>;<SADIS>;IGNORE
-<U1336> <PEYT>;<QELAL>;<SABI>;IGNORE
-<U1337> <PEYT>;<ZEMEDE>;<RABI>;IGNORE
-<U1338> <SEDEY>;<QELAL>;<GE'EZ>;IGNORE
-<U1339> <SEDEY>;<QELAL>;<KA'IB>;IGNORE
-<U133A> <SEDEY>;<QELAL>;<SALIS>;IGNORE
-<U133B> <SEDEY>;<QELAL>;<RABI>;IGNORE
-<U133C> <SEDEY>;<QELAL>;<HAMIS>;IGNORE
-<U133D> <SEDEY>;<QELAL>;<SADIS>;IGNORE
-<U133E> <SEDEY>;<QELAL>;<SABI>;IGNORE
-<U133F> <SEDEY>;<ZEMEDE>;<RABI>;IGNORE
-<U1340> <SEPA>;<QELAL>;<GE'EZ>;IGNORE
-<U1341> <SEPA>;<QELAL>;<KA'IB>;IGNORE
-<U1342> <SEPA>;<QELAL>;<SALIS>;IGNORE
-<U1343> <SEPA>;<QELAL>;<RABI>;IGNORE
-<U1344> <SEPA>;<QELAL>;<HAMIS>;IGNORE
-<U1345> <SEPA>;<QELAL>;<SADIS>;IGNORE
-<U1346> <SEPA>;<QELAL>;<SABI>;IGNORE
-<U1348> <AF>;<QELAL>;<GE'EZ>;IGNORE
-<U1349> <AF>;<QELAL>;<KA'IB>;IGNORE
-<U134A> <AF>;<QELAL>;<SALIS>;IGNORE
-<U134B> <AF>;<QELAL>;<RABI>;IGNORE
-<U134C> <AF>;<QELAL>;<HAMIS>;IGNORE
-<U134D> <AF>;<QELAL>;<SADIS>;IGNORE
-<U134E> <AF>;<QELAL>;<SABI>;IGNORE
-<U134F> <AF>;<ZEMEDE>;<RABI>;IGNORE
-<U1350> <PSA>;<QELAL>;<GE'EZ>;IGNORE
-<U1351> <PSA>;<QELAL>;<KA'IB>;IGNORE
-<U1352> <PSA>;<QELAL>;<SALIS>;IGNORE
-<U1353> <PSA>;<QELAL>;<RABI>;IGNORE
-<U1354> <PSA>;<QELAL>;<HAMIS>;IGNORE
-<U1355> <PSA>;<QELAL>;<SADIS>;IGNORE
-<U1356> <PSA>;<QELAL>;<SABI>;IGNORE
-<U1357> <PSA>;<ZEMEDE>;<RABI>;IGNORE
-<U1358> <RIS>;<ZEMEDE>;<YA>;IGNORE
-<U1359> <MAY>;<ZEMEDE>;<YA>;IGNORE
-<U135A> <AF>;<ZEMEDE>;<YA>;IGNORE
-
-<U1361>	<NEUS-NETEB>;<PUNCTUATION>;IGNORE;IGNORE
-<U1362>	<EBIY-NETEB>;<PUNCTUATION>;IGNORE;IGNORE
-<U1363>	<NETELA-SEREZ>;<PUNCTUATION>;IGNORE;IGNORE
-<U1364>	<EBIY-SEREZ>;<PUNCTUATION>;IGNORE;IGNORE
-<U1365>	<NEUS-SEREZ>;<PUNCTUATION>;IGNORE;IGNORE
-<U1366>	<ASTEAMRO>;<PUNCTUATION>;IGNORE;IGNORE
-<U1367>	<SELESTE-NETEB>;<PUNCTUATION>;IGNORE;IGNORE
-<U1368>	<SEBATE-NETEB>;<PUNCTUATION>;IGNORE;IGNORE
-
-<U1369>	<AHADU>;<NUMERALS>;IGNORE;IGNORE
-<U136A>	<KILEITU>;<NUMERALS>;IGNORE;IGNORE
-<U136B>	<SELESTU>;<NUMERALS>;IGNORE;IGNORE
-<U136C>	<ARBAITU>;<NUMERALS>;IGNORE;IGNORE
-<U136D>	<HAMISTU>;<NUMERALS>;IGNORE;IGNORE
-<U136E>	<SIDISTU>;<NUMERALS>;IGNORE;IGNORE
-<U136F>	<SEBATU>;<NUMERALS>;IGNORE;IGNORE
-<U1370>	<SEMENTU>;<NUMERALS>;IGNORE;IGNORE
-<U1371>	<TESATU>;<NUMERALS>;IGNORE;IGNORE
-<U1372>	<ASERTU>;<NUMERALS>;IGNORE;IGNORE
-<U1373>	<ISRA>;<NUMERALS>;IGNORE;IGNORE
-<U1374>	<SELASA>;<NUMERALS>;IGNORE;IGNORE
-<U1375>	<ARBA>;<NUMERALS>;IGNORE;IGNORE
-<U1376>	<HAMSA>;<NUMERALS>;IGNORE;IGNORE
-<U1377>	<SISA>;<NUMERALS>;IGNORE;IGNORE
-<U1378>	<SEBA>;<NUMERALS>;IGNORE;IGNORE
-<U1379>	<SEMANYA>;<NUMERALS>;IGNORE;IGNORE
-<U137A>	<TESA>;<NUMERALS>;IGNORE;IGNORE
-<U137B>	<MEET>;<NUMERALS>;IGNORE;IGNORE
-<U137C>	<ILF>;<NUMERALS>;IGNORE;IGNORE
-order_end
-%
-reorder-sections-after <LATIN>
-<ETHIOPIC>
-reorder-sections-end
-%
+% “reorder-sections-after” unfortunately does not seem to work.
+%script  <FOO>
+%order_start <FOO>;forward;forward;forward;forward,position
+%<U00024A2F> <U00024A2F>;IGNORE;IGNORE;IGNORE
+%order_end
+%reorder-sections-after <SPECIAL>
+%<FOO>
+%reorder-sections-end
 END LC_COLLATE


--- a/localedata/locales/az_AZ
+++ b/localedata/locales/az_AZ
@ -46,144 +46,83 @@ category "i18n:2012";LC_MESSAGES
 END LC_IDENTIFICATION

 %
-% TODO: check LC_COLLATE
 % TODO: fix LC_MONETARY

 LC_COLLATE
-% The new (1991) latin azeri alphabet is:
-% <a>, <b>, <c>, <c,>, <d>, <e>, <sw>, <f>, <g>, <g(>, <h>, <x>,
-% <i> (dotless i), <i.> (i with dot), <j>, <k>, <q>, <l>, <m>, <n>, <o>,
-% <o:>, <p>, <r>, <s>, <s,>, <t>, <u>, <u:>, <v>, <y>, <z>
+% CLDR collation rules for Azerbaijani:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/az.xml)
 %
-% cyrillic alphabet:
-% <a=>, <b=>, <g=>, <g-=>, <d=>, <e=>, <sw=>, <z%>, <z=>, <i=>, <y=>,
-% <j%>, <k=>, <k//=>, <l=>, <m=>, <n=>, <o=>, <o-=>, <p=>, <r=>, <s=>,
-% <t=>, <u=>, <u'=>, <f=>, <h=>, <h'=>, <c%>, <c%//=>, <s%>
+% <collation type="standard" >
+% 	<cr><![CDATA[
+% 		[reorder Latn Cyrl]
+% 		&C<ç<<<Ç
+% 		&G<ğ<<<Ğ
+% 		&[before 1]i<ı<<<I
+% 		&i<<<İ
+% 		&O<ö<<<Ö
+% 		&S<ş<<<Ş
+% 		&U<ü<<<Ü
+% 		&K<q<<<Q
+% 		&E<ə<<<Ə
+% 		&H<x<<<X
+% 		&Z<w<<<W
+% 	]]></cr>
+% </collation>
+%
+% And CLDR also lists the following
+% index characters:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/main/az.xml)
+%
+% <exemplarCharacters type="index" draft="contributed">[A B C Ç D E Ə F G Ğ H X I İ J K Q L M N O Ö P R S Ş T U Ü V Y Z W]</exemplarCharacters>
+%
+% The following rules implement the same order for glibc.

 copy "iso14651_t1"

-collating-symbol <c,>
-collating-symbol <sw>
-collating-symbol <g(>
-collating-symbol <i.>
-collating-symbol <o:>
-collating-symbol <s,>
-collating-symbol <u:>
+collating-symbol <c-cedilla>
+collating-symbol <g-breve>
+collating-symbol <schwa>
+collating-symbol <i-dotless>
+collating-symbol <i-dot>
+collating-symbol <o-diaresis>
+collating-symbol <s-cedilla>
+collating-symbol <u-diaresis>

-collating-symbol <g-=>
-collating-symbol <sw=>
-collating-symbol <k//=>
-collating-symbol <o-=>
-collating-symbol <u'=>
-collating-symbol <h'=>
-collating-symbol <c%//=>
+reorder-after <AFTER-C>
+<c-cedilla>
+reorder-after <AFTER-G>
+<g-breve>
+reorder-after <AFTER-E>
+<schwa>
+reorder-after <BEFORE-I>
+<i-dotless>
+reorder-after <AFTER-O>
+<o-diaresis>
+reorder-after <AFTER-S>
+<s-cedilla>
+reorder-after <AFTER-U>
+<u-diaresis>
+reorder-after <AFTER-K>
+<S0071> % LATIN SMALL LETTER Q
+reorder-after <AFTER-H>
+<S0078> % LATIN SMALL LETTER X
+reorder-after <AFTER-Z>
+<S0077> % LATIN SMALL LETTER W

-reorder-after <c>
-<c,>
-reorder-after <e>
-<sw>
-reorder-after <g>
-<g(>
-reorder-after <h>
-<x>
-<i>
-<i.>
-<j>
-<k>
-<q>
-reorder-after <o>
-<o:>
-reorder-after <s>
-<s,>
-reorder-after <u>
-<u:>
-
-reorder-after <CYR-GHE>
-<g-=>
-reorder-after <CYR-IE>
-<sw=>
-reorder-after <CYR-KA>
-<k//=>
-reorder-after <CYR-O>
-<o-=>
-reorder-after <CYR-OUBRE>
-<u'=>
-reorder-after <CYR-HA>
-<h'=>
-reorder-after <CYR-CHE>
-<c%//=>
-
-reorder-after <U0063>
-<U00E7> <c,>;<CDI>;<MIN>;IGNORE
-reorder-after <U0043>
-<U00C7> <c,>;<CDI>;<CAP>;IGNORE
-
-reorder-after <U0065>
-<U0259> <sw>;<PCL>;<MIN>;IGNORE
-reorder-after <U0045>
-<U018F> <sw>;<PCL>;<CAP>;IGNORE
-
-reorder-after <U0067>
-<U011F> <g(>;<BRE>;<MIN>;IGNORE
-reorder-after <U0047>
-<U011E> <g(>;<BRE>;<CAP>;IGNORE
-
-reorder-after <U0068>
-<U0131> <i>;<BAS>;<MIN>;IGNORE
-<U0069> <i.>;<PCT>;<MIN>;IGNORE
-reorder-after <U0048>
-<U0049> <i>;<BAS>;<CAP>;IGNORE
-<U0130> <i.>;<PCT>;<CAP>;IGNORE
-
-reorder-after <U006F>
-<U00F6> <o:>;<REU>;<MIN>;IGNORE
-reorder-after <U004F>
-<U00D6> <o:>;<REU>;<CAP>;IGNORE
-
-reorder-after <U0073>
-<U015F> <s,>;<CDI>;<MIN>;IGNORE
-reorder-after <U0053>
-<U015E> <s,>;<CDI>;<CAP>;IGNORE
-
-reorder-after <U0075>
-<U00FC> <u:>;<REU>;<MIN>;IGNORE
-reorder-after <U0055>
-<U00DC> <u:>;<REU>;<CAP>;IGNORE
-
-reorder-after <U0433>
-<U0493> <g-=>;<PCL>;<MIN>;IGNORE
-reorder-after <U0413>
-<U0492> <g-=>;<PCL>;<CAP>;IGNORE
-
-reorder-after <U0435>
-<U04D9> <sw=>;<PCL>;<MIN>;IGNORE
-reorder-after <U0415>
-<U04D8> <sw=>;<PCL>;<CAP>;IGNORE
-
-reorder-after <U043A>
-<U049D> <k//=>;<PCL>;<MIN>;IGNORE
-reorder-after <U041A>
-<U049C> <k//=>;<PCL>;<CAP>;IGNORE
-
-reorder-after <U043E>
-<U04E9> <o-=>;<PCL>;<MIN>;IGNORE
-reorder-after <U041E>
-<U04E8> <o-=>;<PCL>;<CAP>;IGNORE
-
-reorder-after <U0443>
-<U04AF> <u'=>;<PCL>;<MIN>;IGNORE
-reorder-after <U0423>
-<U04AE> <u'=>;<PCL>;<CAP>;IGNORE
-
-reorder-after <U0445>
-<U04BB> <h'=>;<PCL>;<MIN>;IGNORE
-reorder-after <U0425>
-<U04BA> <h'=>;<PCL>;<CAP>;IGNORE
-
-reorder-after <U0447>
-<U04B9> <c%//=>;<PCL>;<MIN>;IGNORE
-reorder-after <U0427>
-<U04B8> <c%//=>;<PCL>;<CAP>;IGNORE
+<U00E7> <c-cedilla>;<BASE>;<MIN>;IGNORE % ç
+<U00C7> <c-cedilla>;<BASE>;<CAP>;IGNORE % Ç
+<U011F> <g-breve>;<BASE>;<MIN>;IGNORE % ğ
+<U011E> <g-breve>;<BASE>;<CAP>;IGNORE % Ğ
+<U0131> <i-dotless>;<BASE>;<MIN>;IGNORE % ı
+<U0049> <i-dotless>;<BASE>;<CAP>;IGNORE % I
+<U0069> <S0069>;<BASE>;<MIN>;IGNORE % i
+<U0130> <S0069>;<BASE>;<CAP>;IGNORE % İ
+<U00F6> <o-diaresis>;<BASE>;<MIN>;IGNORE % ö
+<U00D6> <o-diaresis>;<BASE>;<CAP>;IGNORE % Ö
+<U015F> <s-cedilla>;<BASE>;<MIN>;IGNORE % ş
+<U015E> <s-cedilla>;<BASE>;<CAP>;IGNORE % Ş
+<U00FC> <u-diaresis>;<BASE>;<MIN>;IGNORE % ü
+<U00DC> <u-diaresis>;<BASE>;<CAP>;IGNORE % Ü

 reorder-end

--- a/localedata/locales/be_BY
+++ b/localedata/locales/be_BY
@ -46,19 +46,42 @@ category "i18n:2012";LC_MEASUREMENT
 END LC_IDENTIFICATION

 LC_COLLATE
+% CLDR collation rules for Belarusian:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/be.xml)
+%
+% 	<collations>
+% 		<collation type="standard">
+% 			<cr><![CDATA[
+% [reorder Cyrl]
+% # The root collation already sorts й/Й as a base letter.
+% &Е<ё<<<Ё
+% &у<ў<<<Ў
+% 			]]></cr>
+% 		</collation>
+% 	</collations>
+%
+% And CLDR also lists the following
+% index characters:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/main/be.xml)
+%
+% <exemplarCharacters type="index" draft="contributed">[А Б В Г Д Е Ж З І Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Ы Э Ю Я]</exemplarCharacters>
+%
+% The following rules implement the same order for glibc.
+
 copy "iso14651_t1"

-% iso14651_t1 is missing Ukrainian ghe
-collating-symbol <UKR-GHE>
+collating-symbol <cyrillic-io>
+collating-symbol <cyrillic-short-u>

-reorder-after <CYR-GZHE>
-<UKR-GHE>
+reorder-after <S0435> % CYRILLIC SMALL LETTER IE
+<cyrillic-io>
+reorder-after <S0443> % CYRILLIC SMALL LETTER U
+<cyrillic-short-u>

-reorder-after <U0453>
-<U0491> <UKR-GHE>;<BAS>;<MIN>;IGNORE
-
-reorder-after <U0403>
-<U0490> <UKR-GHE>;<BAS>;<CAP>;IGNORE
+<U0451> <cyrillic-io>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % CYRILLIC SMALL LETTER IO
+<U0401> <cyrillic-io>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % CYRILLIC CAPITAL LETTER IO
+<U045E> <cyrillic-short-u>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % CYRILLIC SMALL LETTER SHORT U
+<U040E> <cyrillic-short-u>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % CYRILLIC CAPITAL LETTER SHORT U

 reorder-end
 END LC_COLLATE
--- a/localedata/locales/ber_DZ
+++ b/localedata/locales/ber_DZ
@ -46,115 +46,86 @@ category "i18n:2012";LC_MESSAGES
 END LC_IDENTIFICATION

 %
-% TODO: check LC_COLLATE
 % TODO: fix LC_TIME, LC_MONETARY, LC_MESSAGES, LC_NAME, LC_ADDRESS

 LC_COLLATE
 % The latin amazigh alphabet is:
-% <a>, <eps>, <b>, <b*>, <c>, <c<>, <d>, <d-.>, <e>, <f>, <g>, <g*>, <g(>,
-% <h>, <h-.>, <i>, <j>, <k>, <k*>, <l>, <m>, <n>, <q>, <q*>, <gam>, <gam*>,
-% <r>, <r-.>, <s>, <s-.>, <t>, <t-.>, <u>, <w>, <x>, <x*>, <y>, <z>, <z-.>
 %
-% arabic alphabet:
+% a ɛ b b* c č d ḍ e f g g* ğ h ḥ i j k k* l m n q q* gam gam* r ṛ s ṣ t ṭ u w x x* y z ẓ
+%
+% (What are the letters followed by a *???)
+%
+% CLDR does not yet have collation rules for this language.
+%
+
+% Looking at the above alphabet and the previously existing collation
+% rules in glibc for this language, I implement this in the following way:
+%
+% &A<ɛ<<<Ɛ
+% &C<č<<<Č
+% &D<ḍ<<<Ḍ
+% &G<ğ<<<Ğ
+% &H<ḥ<<<Ḥ
+% &Q<ɣ<<<Ɣ
+% &R<ṛ<<<Ṛ
+% &S<ṣ<<<Ṣ
+% &T<ṭ<<<Ṭ
+% &Z<ẓ<<<Ẓ

 copy "iso14651_t1"

-collating-symbol <eps>
-%collating-symbol <b*>
-collating-symbol <c<>
-collating-symbol <d-.>
-%collating-symbol <g*>
-collating-symbol <g(>
-collating-symbol <h-.>
-%collating-symbol <k*>
-%collating-symbol <q*>
-collating-symbol <gam>
-%collating-symbol <gam*>
-collating-symbol <r-.>
-collating-symbol <s-.>
-collating-symbol <t-.>
-%collating-symbol <x*>
-collating-symbol <z-.>
+collating-symbol <open-e>
+collating-symbol <c-caron>
+collating-symbol <d-dot-below>
+collating-symbol <g-breve>
+collating-symbol <h-dot-below>
+collating-symbol <latin-gamma>
+collating-symbol <r-dot-below>
+collating-symbol <s-dot-below>
+collating-symbol <t-dot-below>
+collating-symbol <z-dot-below>

-reorder-after <a>
-<eps>
-%reorder-after <b>
-%<b*>
-reorder-after <c>
-<c<>
-reorder-after <d>
-<d-.>
-reorder-after <g>
-%<g*>
-<g(>
-reorder-after <h>
-<h-.>
-%reorder-after <k>
-%<k*>
-reorder-after <q>
-%<q*>
-<gam>
-%<gam*>
-reorder-after <r>
-<r-.>
-reorder-after <s>
-<s-.>
-reorder-after <t>
-<t-.>
-%reorder-after <x>
-%<x*>
-reorder-after <z>
-<z-.>
+reorder-after <AFTER-A>
+<open-e>
+reorder-after <AFTER-C>
+<c-caron>
+reorder-after <AFTER-D>
+<d-dot-below>
+reorder-after <AFTER-G>
+<g-breve>
+reorder-after <AFTER-H>
+<h-dot-below>
+reorder-after <AFTER-Q>
+<latin-gamma>
+reorder-after <AFTER-R>
+<r-dot-below>
+reorder-after <AFTER-S>
+<s-dot-below>
+reorder-after <AFTER-T>
+<t-dot-below>
+reorder-after <AFTER-Z>
+<z-dot-below>

-reorder-after <U0061>
-<U025B> <eps>;<PCL>;<MIN>;IGNORE
-reorder-after <U0041>
-<U0190> <eps>;<PCL>;<CAP>;IGNORE
-
-reorder-after <U0063>
-<U010D> <c<>;<CAR>;<MIN>;IGNORE
-reorder-after <U0043>
-<U010C> <c<>;<CAR>;<CAP>;IGNORE
-
-reorder-after <U0064>
-<U1E0D> <d-.>;<PCT>;<MIN>;IGNORE
-reorder-after <U0044>
-<U1E0C> <d-.>;<PCT>;<CAP>;IGNORE
-
-reorder-after <U0067>
-<U011F> <g(>;<BRE>;<MIN>;IGNORE
-reorder-after <U0047>
-<U011E> <g(>;<BRE>;<CAP>;IGNORE
-
-reorder-after <U0068>
-<U1E25> <h-.>;<PCT>;<MIN>;IGNORE
-reorder-after <U0048>
-<U1E24> <h-.>;<PCT>;<CAP>;IGNORE
-
-reorder-after <U0071>
-<U0263> <gam>;<PCL>;<MIN>;IGNORE
-reorder-after <U0051>
-<U0194> <gam>;<PCL>;<CAP>;IGNORE
-
-reorder-after <U0072>
-<U1E5B> <r-.>;<PCT>;<MIN>;IGNORE
-reorder-after <U0052>
-<U1E5A> <r-.>;<PCT>;<CAP>;IGNORE
-
-reorder-after <U0073>
-<U1E63> <s-.>;<PCT>;<MIN>;IGNORE
-reorder-after <U0053>
-<U1E62> <s-.>;<PCT>;<CAP>;IGNORE
-
-reorder-after <U0074>
-<U1E6D> <t-.>;<PCT>;<MIN>;IGNORE
-reorder-after <U0054>
-<U1E6C> <t-.>;<PCT>;<CAP>;IGNORE
-
-reorder-after <U007A>
-<U1E93> <z-.>;<PCT>;<MIN>;IGNORE
-reorder-after <U005A>
-<U1E92> <z-.>;<PCT>;<CAP>;IGNORE
+<U025B> <open-e>;<BASE>;<MIN>;IGNORE % ɛ
+<U0190> <open-e>;<BASE>;<CAP>;IGNORE % Ɛ
+<U010D> <c-caron>;<BASE>;<MIN>;IGNORE % č
+<U010C> <c-caron>;<BASE>;<CAP>;IGNORE % Č
+<U1E0D> <d-dot-below>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ḍ
+<U1E0C> <d-dot-below>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ḍ
+<U011F> <g-breve>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ğ
+<U011E> <g-breve>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ğ
+<U1E25> <h-dot-below>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ḥ
+<U1E24> <h-dot-below>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ḥ
+<U0263> <latin-gamma>;<BASE>;<MIN>;IGNORE % ɣ
+<U0194> <latin-gamma>;<BASE>;<CAP>;IGNORE % Ɣ
+<U1E5B> <r-dot-below>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ṛ
+<U1E5A> <r-dot-below>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ṛ
+<U1E63> <s-dot-below>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ṣ
+<U1E62> <s-dot-below>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ṣ
+<U1E6D> <t-dot-below>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ṭ
+<U1E6C> <t-dot-below>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ṭ
+<U1E93> <z-dot-below>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ẓ
+<U1E92> <z-dot-below>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ẓ

 reorder-end

--- a/localedata/locales/ber_MA
+++ b/localedata/locales/ber_MA
@ -52,32 +52,30 @@ LC_COLLATE

 copy "iso14651_t1"

-collating-symbol <TIF-GW>
-collating-symbol <TIF-KW>
+collating-symbol <tif-yag-labialization-mark>
+collating-symbol <tif-yak-labialization-mark>

-collating-element <TIF-G-W> from "<U2D33><U2D6F>"
-collating-element <TIF-K-W> from "<U2D3D><U2D6F>"
+collating-element <tif-yag-labialization-mark-element> from "<U2D33><U2D6F>"
+collating-element <tif-yak-labialization-mark-element> from "<U2D3D><U2D6F>"

-reorder-after <TIF-G>
-<TIF-GW>
-reorder-after <TIF-K>
-<TIF-KW>
-reorder-after <U2D33>
-<TIF-G-W> <TIF-GW>;<PCT>;<MIN>;IGNORE
-reorder-after <U2D37>
-<U2D35> "<TIF-D><TIF-J>";"<LIG><PCL>";"<MIN><MIN>";IGNORE
-<U2D36> "<TIF-D><TIF-J>";"<LIG><LIG>";"<MIN><MIN>";IGNORE
-reorder-after <U2D3D>
-<TIF-K-W> <TIF-KW>;<PCT>;<MIN>;IGNORE
-reorder-after <U2D5C>
-<U2D5E> "<TIF-T><TIF-C>";"<LIG><LIG>";"<MIN><MIN>";IGNORE
+reorder-after <S2D33>
+<tif-yag-labialization-mark>
+reorder-after <S2D3D>
+<tif-yak-labialization-mark>
+
+<tif-yag-labialization-mark-element> <tif-yag-labialization-mark>;"<BASE>";<MIN>;IGNORE
+<U2D35> "<S2D37><S2D4A>";"<BASE><VRNT1>";"<MIN><MIN>";IGNORE
+<U2D36> "<S2D37><S2D4A>";"<BASE><VRNT2>";"<MIN><MIN>";IGNORE
+<tif-yak-labialization-mark-element> <tif-yak-labialization-mark>;"<BASE>";<MIN>;IGNORE
+<U2D5E> "<S2D5C><S2D5B>";"<BASE><VRNT1>";"<MIN><MIN>";IGNORE
 reorder-end

+% “reorder-sections-after” unfortunately does not seem to work.
 % Moroccan sorting standard requires tifinagh to come
 % before latin script
-reorder-sections-after <SPECIAL>
-<TIFINAGH>
-reorder-sections-end
+%reorder-sections-after <SPECIAL>
+%<TIFINAGH>
+%reorder-sections-end
 END LC_COLLATE

 LC_CTYPE
--- a/localedata/locales/bg_BG
+++ b/localedata/locales/bg_BG
@ -53,112 +53,198 @@ translit_end
 END LC_CTYPE

 LC_COLLATE
+% CLDR collation rules for Ukrainian:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/bg.xml)
+%
+% 		<collation type="standard">
+% 			<cr><![CDATA[
+% [reorder Cyrl]
+% # The root collation already sorts й/Й as a base letter.
+% 			]]></cr>
+% 		</collation>
+%
+% And CLDR also lists the following
+% index characters:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/main/bg.xml)
+%
+% <exemplarCharacters type="index" draft="contributed">[А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ю Я]</exemplarCharacters>
+%
+% The following rules implement the same order for glibc.

-% 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.

 copy "iso14651_t1"
-reorder-after <9>
-<CYR-A>
-<CYR-BE>
-<CYR-VE>
-<CYR-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>
-reorder-after <U0433>
-<U0453> <CYR-GHE>;<CYR-GZHE>;<MIN>;IGNORE % Mac. gje
-reorder-after <U0434>
-<U0452> "<CYR-DE><CYR-ZHE>";"<LIG><LIG>";"<MIN><MIN>";IGNORE % CYR-DJE
-<U045F> "<CYR-DE><CYR-ZHE>";"<CYR-DCHE><LIG>";"<MIN><MIN>";IGNORE % CYR-DCHE
-<U0455> "<CYR-DE><CYR-ZE>";"<LIG><LIG>";"<MIN><MIN>";IGNORE % CYR-DZE
-reorder-after <U0435>
-<U0454> <CYR-IE>;<UKR-IE>;<MIN>;IGNORE
-<U0451> <CYR-IE>;<CYR-IO>;<MIN>;IGNORE
-<U044D> <CYR-IE>;<CYR-E>;<MIN>;IGNORE
-reorder-after <U0438>
-<U0406> <CYR-I>;<UKR-I>;<MIN>;IGNORE
-<U0457> <CYR-I>;<UKR-YI>;<MIN>;IGNORE
-<U044B> <CYR-I>;<CYR-YEROU>;<MIN>;IGNORE
-reorder-after <U043A>
-<U045C> <CYR-KA>;<CYR-KJE>;<MIN>;IGNORE
-reorder-after <U043B>
-<U0459> "<CYR-EL><CYR-SIGMOUIL>";"<LIG><LIG>";"<MIN><MIN>";IGNORE % CYR-LJE
-reorder-after <U043D>
-<U045A> "<CYR-EN><CYR-SIGMOUIL>";"<LIG><LIG>";"<MIN><MIN>";IGNORE % CYR-NJE
-reorder-after <U0443>
-<U045E> <CYR-OU>;<CYR-OUBRE>;<MIN>;IGNORE
-reorder-after <U0447>
-<U045B> <CYR-CHE>;<CYR-TSHE>;<MIN>;IGNORE
-reorder-after <U0413>
-<U0403> <CYR-GHE>;<CYR-GZHE>;<CAP>;IGNORE % Mac. gje
-reorder-after <U0414>
-<U0402> "<CYR-DE><CYR-ZHE>";"<LIG><LIG>";"<CAP><CAP>";IGNORE % CYR-DJE
-<U040F> "<CYR-DE><CYR-ZHE>";"<CYR-DCHE><LIG>";"<CAP><CAP>";IGNORE % CYR-DCHE
-<U0405> "<CYR-DE><CYR-ZE>";"<LIG><LIG>";"<CAP><CAP>";IGNORE % CYR-DZE
-reorder-after <U0415>
-<U0404> <CYR-IE>;<UKR-IE>;<CAP>;IGNORE
-<U0401> <CYR-IE>;<CYR-IO>;<CAP>;IGNORE
-<U042D> <CYR-IE>;<CYR-E>;<CAP>;IGNORE
-reorder-after <U0418>
-<U0456> <CYR-I>;<UKR-I>;<CAP>;IGNORE
-<U0407> <CYR-I>;<UKR-YI>;<CAP>;IGNORE
-<U042B> <CYR-I>;<CYR-YEROU>;<CAP>;IGNORE
-reorder-after <U0419>
-<U0408> <CYR-IBRE>;<CYR-JE>;<CAP>;IGNORE
-reorder-after <U041A>
-<U040C> <CYR-KA>;<CYR-KJE>;<CAP>;IGNORE
-reorder-after <U041B>
-<U0409> "<CYR-EL><CYR-SIGMOUIL>";"<LIG><LIG>";"<CAP><CAP>";IGNORE % CYR-LJE
-reorder-after <U041D>
-<U040A> "<CYR-EN><CYR-SIGMOUIL>";"<LIG><LIG>";"<CAP><CAP>";IGNORE % CYR-NJE
-reorder-after <U0423>
-<U040E> <CYR-OU>;<CYR-OUBRE>;<CAP>;IGNORE
-reorder-after <U0427>
-<U040B> <CYR-CHE>;<CYR-TSHE>;<CAP>;IGNORE
+% Put Cyrillic before Latin because CLDR has:
+%
+% [reorder Cyrl]
+%
+% and because the old glibc collation for Bulgarian 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-end
+
 END LC_COLLATE

 LC_MONETARY
--- a/localedata/locales/br_FR
+++ b/localedata/locales/br_FR
@ -49,43 +49,40 @@ END LC_IDENTIFICATION


 LC_COLLATE
+%% a b c ch c'h d e f g h i j k l m n o p q r s t u v w x y z
+%
+% No collation information is available for this language in CLDR.
+%
+% We use the following at the moment:
+%
+% &c<ch<<<cH<<<Ch<<<CH<c'h<<<c'H<<<C'h<<<C'H
+%
+
 copy "iso14651_t1"

-%% a b c ch c'h d e f g h i j k l m n o p q r s t u v w x y z
 collating-symbol  <c-h-br>
-collating-element <C-H> from "<U0043><U0048>"
-collating-element <c-h> from "<U0063><U0068>"
-collating-element <C-h> from "<U0043><U0068>"
-collating-element <c-H> from "<U0063><U0048>"
+collating-element <c-h> from "ch"
+collating-element <c-H> from "cH"
+collating-element <C-h> from "Ch"
+collating-element <C-H> from "CH"
 collating-symbol  <c-'-h-br>
-collating-element <C'H> from "<U0043><U0027><U0048>"
-collating-element <c'h> from "<U0063><U0027><U0068>"
-collating-element <C'h> from "<U0043><U0027><U0068>"
-collating-element <c'H> from "<U0063><U0027><U0048>"
+collating-element <c'h> from "c'h"
+collating-element <c'H> from "c'H"
+collating-element <C'h> from "C'h"
+collating-element <C'H> from "C'H"

-collating-symbol <CAP-MIN>
-collating-symbol <MIN-CAP>
-
-reorder-after <MIN>
-<MIN-CAP>
-
-reorder-after <CAP>
-<CAP-MIN>
-
-reorder-after <c>
+reorder-after <AFTER-C>
 <c-h-br>
 <c-'-h-br>

-reorder-after <U0063>
-<c-h>	<c-h-br>;<PCT>;<MIN>;IGNORE
-<c-H>	<c-h-br>;<PCT>;<MIN-CAP>;IGNORE
-<c'h>	<c-'-h-br>;<PCT>;<MIN>;IGNORE
-<c'H>	<c-'-h-br>;<PCT>;<MIN-CAP>;IGNORE
-reorder-after <U0043>
-<C-H>	<c-h-br>;<PCT>;<CAP>;IGNORE
-<C-h>	<c-h-br>;<PCT>;<CAP-MIN>;IGNORE
-<C'H>	<c-'-h-br>;<PCT>;<CAP>;IGNORE
-<C'h>	<c-'-h-br>;<PCT>;<CAP-MIN>;IGNORE
+<c-h>	<c-h-br>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<c-H>	<c-h-br>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<C-h>	<c-h-br>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<C-H>	<c-h-br>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<c'h>	<c-'-h-br>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<c'H>	<c-'-h-br>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<C'h>	<c-'-h-br>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<C'H>	<c-'-h-br>;"<BASE><BASE>";"<CAP><CAP>";IGNORE

 reorder-end

--- a/localedata/locales/br_FR@euro
+++ b/localedata/locales/br_FR@euro
@ -46,8 +46,7 @@ copy "br_FR"
 END LC_CTYPE

 LC_COLLATE
-% Copy the template from ISO/IEC 14651
-copy "iso14651_t1"
+copy "br_FR"
 END LC_COLLATE

 LC_MESSAGES
--- a/localedata/locales/ca_ES
+++ b/localedata/locales/ca_ES
@ -49,21 +49,7 @@ category "i18n:2012";LC_MEASUREMENT
 END LC_IDENTIFICATION

 LC_COLLATE
-copy "iso14651_t1"
-
-collating-symbol <ntilde>
-
-reorder-after <n>
-<ntilde>
-
-reorder-after <U006E>
-<U00F1> <ntilde>;<BAS>;<MIN>;IGNORE
-
-reorder-after <U004E>
-<U00D1> <ntilde>;<BAS>;<CAP>;IGNORE
-
-reorder-end
-
+copy "es_ES"
 END LC_COLLATE

 LC_CTYPE
--- a/localedata/locales/cns11643_stroke
+++ b/localedata/locales/cns11643_stroke
@ -21,9 +21,8 @@ LC_COLLATE

 copy "iso14651_t1_common"

-script <HAN>
+reorder-after <BEFORE-LATIN>

-order_start <HAN>;forward;forward;forward;forward,position
 <U4E00> <U4E00>;IGNORE;IGNORE;IGNORE # 1
 <U4E28> <U4E28>;IGNORE;IGNORE;IGNORE # 2
 <U4E3F> <U4E3F>;IGNORE;IGNORE;IGNORE # 3
@ -76341,7 +76340,7 @@ order_start <HAN>;forward;forward;forward;forward,position
 <U4A3B> <U4A3B>;IGNORE;IGNORE;IGNORE # 1452443425121145244342512114524434251211452443425121
 <U0002053B> <U0002053B>;IGNORE;IGNORE;IGNORE # 3211511251251134321151125125113432115112512511343211511251251134
 <U0002A6A5> <U0002A6A5>;IGNORE;IGNORE;IGNORE # 4143135441515111414313544151511141431354415151114143135441515111
-#
-order_end
-#
+
+reorder-end
+
 END LC_COLLATE
--- a/localedata/locales/crh_UA
+++ b/localedata/locales/crh_UA
@ -46,77 +46,56 @@ category "i18n:2012";LC_MESSAGES
 category "i18n:2012";LC_NAME
 END LC_IDENTIFICATION

-%
-% TODO: check and test LC_COLLATE
-
 LC_COLLATE
+% There is no collation information in CLDR for Crimean Tatar
+%
 % The new Crimean Tatar alphabet (Latin) is:
-% <a>, <b>, <c>, <c,>, <d>, <e>, <f>, <g>, <g(>, <h>,
-% <i> (dotless i), <i.> (i with dot), <j>, <k>, <l>, <m>, <n>, <n?>, <o>,
-% <o:>, <p>, <q>, <r>, <s>, <s,>, <t>, <u>, <u:>, <v>, <y>, <z>
+%
+% a b c ç d e f g ğ h ı i j k l m n ñ o ö p q r s ş t u ü v y z

 copy "iso14651_t1"

-collating-symbol <c,>
-collating-symbol <g(>
-collating-symbol <i.>
-collating-symbol <n?>
-collating-symbol <o:>
-collating-symbol <s,>
-collating-symbol <u:>
+collating-symbol <c-cedilla>
+collating-symbol <g-breve>
+collating-symbol <i-dotless>
+collating-symbol <i-dot>
+collating-symbol <n-tilde>
+collating-symbol <o-diaeresis>
+collating-symbol <s-cedilla>
+collating-symbol <u-diaeresis>

-reorder-after <c>
-<c,>
-reorder-after <g>
-<g(>
-reorder-after <h>
-<i>
-<i.>
-reorder-after <n>
-<n?>
-reorder-after <o>
-<o:>
-reorder-after <s>
-<s,>
-reorder-after <u>
-<u:>
+reorder-after <AFTER-C>
+<c-cedilla>
+reorder-after <AFTER-G>
+<g-breve>
+reorder-after <AFTER-H>
+<i-dotless>
+<i-dot>
+reorder-after <AFTER-N>
+<n-tilde>
+reorder-after <AFTER-O>
+<o-diaeresis>
+reorder-after <AFTER-S>
+<s-cedilla>
+reorder-after <AFTER-U>
+<u-diaeresis>

-reorder-after <U0063>
-<U00E7> <c,>;<CDI>;<MIN>;IGNORE
-reorder-after <U0043>
-<U00C7> <c,>;<CDI>;<CAP>;IGNORE
-
-reorder-after <U0067>
-<U011F> <g(>;<BRE>;<MIN>;IGNORE
-reorder-after <U0047>
-<U011E> <g(>;<BRE>;<CAP>;IGNORE
-
-reorder-after <U0068>
-<U0131> <i>;<BAS>;<MIN>;IGNORE
-<U0069> <i.>;<PCT>;<MIN>;IGNORE
-reorder-after <U0048>
-<U0049> <i>;<BAS>;<CAP>;IGNORE
-<U0130> <i.>;<PCT>;<CAP>;IGNORE
-
-reorder-after <U006E>
-<U00F1> <n?>;<TIL>;<MIN>;IGNORE
-reorder-after <U004E>
-<U00D1> <n?>;<TIL>;<CAP>;IGNORE
-
-reorder-after <U006F>
-<U00F6> <o:>;<REU>;<MIN>;IGNORE
-reorder-after <U004F>
-<U00D6> <o:>;<REU>;<CAP>;IGNORE
-
-reorder-after <U0073>
-<U015F> <s,>;<CDI>;<MIN>;IGNORE
-reorder-after <U0053>
-<U015E> <s,>;<CDI>;<CAP>;IGNORE
-
-reorder-after <U0075>
-<U00FC> <u:>;<REU>;<MIN>;IGNORE
-reorder-after <U0055>
-<U00DC> <u:>;<REU>;<CAP>;IGNORE
+<U00E7> <c-cedilla>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ç
+<U00C7> <c-cedilla>;"<BASE><BASE>";"<CAP><CAP>";IGNORE % Ç
+<U011F> <g-breve>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ğ
+<U011E> <g-breve>;"<BASE><BASE>";"<CAP><CAP>";IGNORE % Ğ
+<U0131> <i-dotless>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ı
+<U0049> <i-dotless>;"<BASE><BASE>";"<CAP><CAP>";IGNORE % I
+<U0069> <i-dot>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % i
+<U0130> <i-dot>;"<BASE><BASE>";"<CAP><CAP>";IGNORE % İ
+<U00F1> <n-tilde>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ñ
+<U00D1> <n-tilde>;"<BASE><BASE>";"<CAP><CAP>";IGNORE % Ñ
+<U00F6> <o-diaeresis>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ö
+<U00D6> <o-diaeresis>;"<BASE><BASE>";"<CAP><CAP>";IGNORE % Ö
+<U015F> <s-cedilla>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ş
+<U015E> <s-cedilla>;"<BASE><BASE>";"<CAP><CAP>";IGNORE % Ş
+<U00FC> <u-diaeresis>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ü
+<U00DC> <u-diaeresis>;"<BASE><BASE>";"<CAP><CAP>";IGNORE % Ü

 reorder-end

--- a/localedata/locales/cs_CZ
+++ b/localedata/locales/cs_CZ
@ -142,6 +142,17 @@ LC_COLLATE

 copy "iso14651_t1"

+% CLDR collation rules for Czech:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/cs.xml)
+%
+% &C<č<<<Č
+% &H<ch<<<cH<<<Ch<<<CH
+% &R<ř<<<Ř
+% &S<š<<<Š
+% &Z<ž<<<Ž
+%
+% The following rules implement the same order for glibc.
+
 collating-symbol <c-caron>
 collating-symbol <ch-digraph>
 collating-symbol <r-caron>
@ -153,45 +164,45 @@ collating-element <c-H> from "cH"
 collating-element <C-h> from "Ch"
 collating-element <C-H> from "CH"

-reorder-after <c>
+reorder-after <AFTER-C>
 <c-caron>
-reorder-after <h>
+reorder-after <AFTER-H>
 <ch-digraph>
-reorder-after <r>
+reorder-after <AFTER-R>
 <r-caron>
-reorder-after <s>
+reorder-after <AFTER-S>
 <s-caron>
-reorder-after <z>
+reorder-after <AFTER-Z>
 <z-caron>

 % CLDR has 2 sort orders for Czech, "standard" which sorts the digits
 % before the letters and "digits-after" which sorts the digits after
 % the letters. The cs_CZ locale in glibc always sorted the digits after
 % the letters, so we keep that behaviour here:
-reorder-after <zh>
-<0>
-<1>
-<2>
-<3>
-<4>
-<5>
-<6>
-<7>
-<8>
-<9>
+reorder-after <AFTER-EZH>
+<S0030>
+<S0031>
+<S0032>
+<S0033>
+<S0034>
+<S0035>
+<S0036>
+<S0037>
+<S0038>
+<S0039>

-<U010D> <c-caron>;<BAS>;<MIN>;IGNORE % č
-<U010C> <c-caron>;<BAS>;<CAP>;IGNORE % Č
-<c-h> <ch-digraph>;"<BAS><BAS>";"<MIN><MIN>";IGNORE
-<c-H> <ch-digraph>;"<BAS><BAS>";"<MIN><CAP>";IGNORE
-<C-h> <ch-digraph>;"<BAS><BAS>";"<CAP><MIN>";IGNORE
-<C-H> <ch-digraph>;"<BAS><BAS>";"<CAP><CAP>";IGNORE
-<U0159> <r-caron>;<BAS>;<MIN>;IGNORE % ř
-<U0158> <r-caron>;<BAS>;<CAP>;IGNORE % Ř
-<U0161> <s-caron>;<BAS>;<MIN>;IGNORE % š
-<U0160> <s-caron>;<BAS>;<CAP>;IGNORE % Š
-<U017E> <z-caron>;<BAS>;<MIN>;IGNORE % ž
-<U017D> <z-caron>;<BAS>;<CAP>;IGNORE % Ž
+<U010D> <c-caron>;<BASE>;<MIN>;IGNORE % č
+<U010C> <c-caron>;<BASE>;<CAP>;IGNORE % Č
+<c-h> <ch-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<c-H> <ch-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<C-h> <ch-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<C-H> <ch-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<U0159> <r-caron>;<BASE>;<MIN>;IGNORE % ř
+<U0158> <r-caron>;<BASE>;<CAP>;IGNORE % Ř
+<U0161> <s-caron>;<BASE>;<MIN>;IGNORE % š
+<U0160> <s-caron>;<BASE>;<CAP>;IGNORE % Š
+<U017E> <z-caron>;<BASE>;<MIN>;IGNORE % ž
+<U017D> <z-caron>;<BASE>;<CAP>;IGNORE % Ž

 reorder-end

--- a/localedata/locales/csb_PL
+++ b/localedata/locales/csb_PL
@ -53,6 +53,12 @@ copy "pl_PL"
 END LC_CTYPE

 LC_COLLATE
+% There is no collation information for Kashubian in CLDR.
+%
+% https://en.wikipedia.org/wiki/Kashubian_language#Kashubian_alphabet
+%
+% A Ą Ã B C D E É Ë F G H I J K L Ł M N Ń O Ò Ó Ô P R S T U Ù W Y Z Ż
+
 copy "iso14651_t1"

 collating-symbol <aogonek>
@ -67,66 +73,47 @@ collating-symbol <ocircumflex>
 collating-symbol <ugrave>
 collating-symbol <zdot>

-reorder-after <a>
+reorder-after <AFTER-A>
 <aogonek>
 <atilde>
-
-reorder-after <e>
+reorder-after <AFTER-E>
 <eacute>
 <ediaeresis>
-
-reorder-after <l>
+reorder-after <AFTER-L>
 <lstroke>
-
-reorder-after <n>
+reorder-after <AFTER-N>
 <nacute>
-
-reorder-after <o>
+reorder-after <AFTER-O>
 <ograve>
 <oacute>
 <ocircumflex>
-
-reorder-after <u>
+reorder-after <AFTER-U>
 <ugrave>
-
-reorder-after <z>
+reorder-after <AFTER-Z>
 <zdot>

-reorder-after <U0061>
-<U0105> <aogonek>;<BAS>;<MIN>;IGNORE
-<U0104> <aogonek>;<BAS>;<CAP>;IGNORE
-<U00E3> <atilde>;<BAS>;<MIN>;IGNORE
-<U00C3> <atilde>;<BAS>;<CAP>;IGNORE
-
-reorder-after <U0065>
-<U00E9> <eacute>;<BAS>;<MIN>;IGNORE
-<U00C9> <eacute>;<BAS>;<CAP>;IGNORE
-<U00EB> <ediaeresis>;<BAS>;<MIN>;IGNORE
-<U00CB> <ediaeresis>;<BAS>;<CAP>;IGNORE
-
-reorder-after <U006C>
-<U0142> <lstroke>;<BAS>;<MIN>;IGNORE
-<U0141> <lstroke>;<BAS>;<CAP>;IGNORE
-
-reorder-after <U006E>
-<U0144> <nacute>;<BAS>;<MIN>;IGNORE
-<U0143> <nacute>;<BAS>;<CAP>;IGNORE
-
-reorder-after <U006F>
-<U00F2> <ograve>;<BAS>;<MIN>;IGNORE
-<U00D2> <ograve>;<BAS>;<CAP>;IGNORE
-<U00F3> <oacute>;<BAS>;<MIN>;IGNORE
-<U00D3> <oacute>;<BAS>;<CAP>;IGNORE
-<U00F4> <ocircumflex>;<BAS>;<MIN>;IGNORE
-<U00D4> <ocircumflex>;<BAS>;<CAP>;IGNORE
-
-reorder-after <U0075>
-<U00F9> <ugrave>;<BAS>;<MIN>;IGNORE
-<U00D9> <ugrave>;<BAS>;<CAP>;IGNORE
-
-reorder-after <U007A>
-<U017C> <zdot>;<BAS>;<MIN>;IGNORE
-<U017B> <zdot>;<BAS>;<CAP>;IGNORE
+<U0105> <aogonek>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ą
+<U0104> <aogonek>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ą
+<U00E3> <atilde>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ã
+<U00C3> <atilde>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ã
+<U00E9> <eacute>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % é
+<U00C9> <eacute>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % É
+<U00EB> <ediaeresis>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ë
+<U00CB> <ediaeresis>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ë
+<U0142> <lstroke>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ł
+<U0141> <lstroke>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ł
+<U0144> <nacute>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ń
+<U0143> <nacute>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ń
+<U00F2> <ograve>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ò
+<U00D2> <ograve>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ò
+<U00F3> <oacute>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ó
+<U00D3> <oacute>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ó
+<U00F4> <ocircumflex>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ô
+<U00D4> <ocircumflex>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ô
+<U00F9> <ugrave>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ù
+<U00D9> <ugrave>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ù
+<U017C> <zdot>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ż
+<U017B> <zdot>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ż

 reorder-end

--- a/localedata/locales/cv_RU
+++ b/localedata/locales/cv_RU
@ -50,54 +50,49 @@ category "i18n:2012";LC_MEASUREMENT
 END LC_IDENTIFICATION

 LC_COLLATE
+% There is no collation information for Chuvash in CLDR.
+%
+% According to https://en.wikipedia.org/wiki/Chuvash_language
+% the writing system is Cyrillic.
+%
+% But our Chuvash locale here seems to use the Latin Alphabet ...
+%
+% I just adapt the collation rules which I found here to the
+% updated iso14651_t1_common file.
 copy "iso14651_t1"

 % The Chuvash alphabet has the following letters, ordered as below:
-% a a( c e e( h i j k l m n p r s< s s, t u u: v y
+% a ă c e ĕ h i j k l m n p r š s ş t u ü v y

-collating-symbol <a(>
-collating-symbol <e(>
-collating-symbol <s<>
-collating-symbol <s,>
+collating-symbol <a-breve>
+collating-symbol <e-breve>
+collating-symbol <s-caron>
+collating-symbol <s-cedilla>
 collating-symbol <u-diaerisis>

-reorder-after <a>
-<a(>
-reorder-after <e>
-<e(>
-reorder-after <r>
-<s<>
-reorder-after <s>
-<s,>
-reorder-after <u>
+reorder-after <AFTER-A>
+<a-breve>
+reorder-after <AFTER-E>
+<e-breve>
+reorder-after <AFTER-R>
+<s-caron>
+reorder-after <AFTER-S>
+<s-cedilla>
+reorder-after <AFTER-U>
 <u-diaerisis>

-reorder-after <U0061>
-<U0103> <a(>;<BRE>;<MIN>;IGNORE
-reorder-after <U0041>
-<U0102> <a(>;<BRE>;<CAP>;IGNORE
-
-reorder-after <U0065>
-<U0115> <e(>;<BRE>;<MIN>;IGNORE
-reorder-after <U0045>
-<U0114> <e(>;<BRE>;<CAP>;IGNORE
-
-reorder-after <U0072>
-<U0161> <s<>;<CAR>;<MIN>;IGNORE
-reorder-after <U0053>
-<U0160> <s<>;<CAR>;<CAP>;IGNORE
-
-reorder-after <U0073>
-<U0219> <s,>;<CDI>;<MIN>;IGNORE
-<U015F> <s,>;<CDI>;<MIN>;IGNORE
-reorder-after <U0053>
-<U0218> <s,>;<CDI>;<CAP>;IGNORE
-<U015E> <s,>;<CDI>;<CAP>;IGNORE
-
-reorder-after <U0074>
-<U00FC> <u-diaerisis>;<BAS>;<MIN>;IGNORE
-reorder-after <U0055>
-<U00DC> <u-diaerisis>;<BAS>;<CAP>;IGNORE
+<U0103>     <a-breve>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ă
+<U0102>     <a-breve>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ă
+<U0115>     <e-breve>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ĕ
+<U0114>     <e-breve>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ĕ
+<U0161>     <s-caron>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % š
+<U0160>     <s-caron>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Š
+<U015F>   <s-cedilla>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ş
+<U015E>   <s-cedilla>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ş
+<U0219>   <s-cedilla>;"<BASE><VRNT1>";"<MIN><MIN>";IGNORE % ș
+<U0218>   <s-cedilla>;"<BASE><VRNT1>";"<CAP><MIN>";IGNORE % Ș
+<U00FC> <u-diaerisis>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ü
+<U00DC> <u-diaerisis>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ü

 reorder-end

--- a/localedata/locales/cy_GB
+++ b/localedata/locales/cy_GB
@ -69,139 +69,125 @@ translit_end
 END LC_CTYPE

 LC_COLLATE
+% CLDR collation rules for Welsh:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/cy.xml)
+%
+% <collation type="standard" references="http://www.evertype.com/alphabets/welsh.pdf">
+%   <cr><![CDATA[
+%     &C<ch<<<Ch<<<CH
+%     &D<dd<<<Dd<<<DD
+%     &F<ff<<<Ff<<<FF
+%     &G<ng<<<Ng<<<NG
+%     &L<ll<<<Ll<<<LL
+%     &P<ph<<<Ph<<<PH
+%     &R<rh<<<Rh<<<RH
+%     &T<th<<<Th<<<TH
+%   ]]></cr>
+% </collation>
+%
+% And CLDR also lists the following
+% index characters:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/main/cy.xml)
+%
+%
+%
+% The following rules implement the same order for glibc.
+
 copy "iso14651_t1"

 % Welsh sorting order is:
 %   a b c ch d dd e f ff g ng h i l ll m n o p ph r rh s t th u w y

-collating-symbol  <c-h-cy>
-collating-element <C-H> from "<U0043><U0048>"
-collating-element <c-h> from "<U0063><U0068>"
-collating-element <C-h> from "<U0043><U0068>"
-collating-element <c-H> from "<U0063><U0048>"
+collating-symbol  <ch-digraph>
+collating-element <ch> from "ch"
+collating-element <cH> from "cH"
+collating-element <Ch> from "Ch"
+collating-element <CH> from "CH"
+collating-symbol  <dd-digraph>
+collating-element <dd> from "dd"
+collating-element <dD> from "dD"
+collating-element <Dd> from "Dd"
+collating-element <DD> from "DD"
+collating-symbol  <ff-digraph>
+collating-element <ff> from "ff"
+collating-element <fF> from "fF"
+collating-element <Ff> from "Ff"
+collating-element <FF> from "FF"
+collating-symbol  <ng-digraph>
+collating-element <ng> from "ng"
+collating-element <nG> from "nG"
+collating-element <Ng> from "Ng"
+collating-element <NG> from "NG"
+collating-symbol  <ll-digraph>
+collating-element <ll> from "ll"
+collating-element <lL> from "lL"
+collating-element <Ll> from "Ll"
+collating-element <LL> from "LL"
+collating-symbol  <ph-digraph>
+collating-element <ph> from "ph"
+collating-element <pH> from "pH"
+collating-element <Ph> from "Ph"
+collating-element <PH> from "PH"
+collating-symbol  <rh-digraph>
+collating-element <rh> from "rh"
+collating-element <rH> from "rH"
+collating-element <Rh> from "Rh"
+collating-element <RH> from "RH"
+collating-symbol  <th-digraph>
+collating-element <th> from "th"
+collating-element <tH> from "tH"
+collating-element <Th> from "Th"
+collating-element <TH> from "TH"

-collating-symbol  <d-d-cy>
-collating-element <D-D> from "<U0044><U0044>"
-collating-element <d-d> from "<U0064><U0064>"
-collating-element <D-d> from "<U0044><U0064>"
-collating-element <d-D> from "<U0064><U0044>"
+reorder-after <AFTER-C>
+<ch-digraph>
+reorder-after <AFTER-D>
+<dd-digraph>
+reorder-after <AFTER-F>
+<ff-digraph>
+reorder-after <AFTER-G>
+<ng-digraph>
+reorder-after <AFTER-L>
+<ll-digraph>
+reorder-after <AFTER-P>
+<ph-digraph>
+reorder-after <AFTER-R>
+<rh-digraph>
+reorder-after <AFTER-T>
+<th-digraph>

-collating-symbol  <f-f-cy>
-collating-element <F-F> from "<U0046><U0046>"
-collating-element <f-f> from "<U0066><U0066>"
-collating-element <F-f> from "<U0046><U0066>"
-collating-element <f-F> from "<U0066><U0046>"
-
-collating-symbol  <n-g-cy>
-collating-element <N-G> from "<U004E><U0047>"
-collating-element <n-g> from "<U006E><U0067>"
-collating-element <N-g> from "<U004E><U0067>"
-collating-element <n-G> from "<U006E><U0047>"
-
-collating-symbol  <l-l-cy>
-collating-element <L-L> from "<U004C><U004C>"
-collating-element <l-l> from "<U006C><U006C>"
-collating-element <L-l> from "<U004C><U006C>"
-collating-element <l-L> from "<U006C><U004C>"
-
-collating-symbol  <p-h-cy>
-collating-element <P-H> from "<U0050><U0048>"
-collating-element <p-h> from "<U0070><U0068>"
-collating-element <P-h> from "<U0050><U0068>"
-collating-element <p-H> from "<U0070><U0048>"
-
-collating-symbol  <r-h-cy>
-collating-element <R-H> from "<U0052><U0048>"
-collating-element <r-h> from "<U0072><U0068>"
-collating-element <R-h> from "<U0052><U0068>"
-collating-element <r-H> from "<U0072><U0048>"
-
-collating-symbol  <t-h-cy>
-collating-element <T-H> from "<U0054><U0048>"
-collating-element <t-h> from "<U0074><U0068>"
-collating-element <T-h> from "<U0054><U0068>"
-collating-element <t-H> from "<U0074><U0048>"
-
-collating-symbol <CAP-MIN>
-collating-symbol <MIN-CAP>
-
-reorder-after <MIN>
-<MIN-CAP>
-reorder-after <CAP>
-<CAP-MIN>
-
-reorder-after <c>
-<c-h-cy>
-<d>
-<d-d-cy>
-reorder-after <f>
-<f-f-cy>
-<g>
-<n-g-cy>
-reorder-after <l>
-<l-l-cy>
-reorder-after <p>
-<p-h-cy>
-reorder-after <r>
-<r-h-cy>
-reorder-after <t>
-<t-h-cy>
-
-reorder-after <U0063>
-<c-h>	<c-h-cy>;<PCT>;<MIN>;IGNORE
-<c-H>	<c-h-cy>;<PCT>;<MIN-CAP>;IGNORE
-reorder-after <U0043>
-<C-H>	<c-h-cy>;<PCT>;<CAP>;IGNORE
-<C-h>	<c-h-cy>;<PCT>;<CAP-MIN>;IGNORE
-
-reorder-after <U0064>
-<d-d>	<d-d-cy>;<PCT>;<MIN>;IGNORE
-<d-D>	<d-d-cy>;<PCT>;<MIN-CAP>;IGNORE
-reorder-after <U0044>
-<D-D>	<d-d-cy>;<PCT>;<CAP>;IGNORE
-<D-d>	<d-d-cy>;<PCT>;<CAP-MIN>;IGNORE
-
-reorder-after <U0066>
-<f-f>	<f-f-cy>;<PCT>;<MIN>;IGNORE
-<f-F>	<f-f-cy>;<PCT>;<MIN-CAP>;IGNORE
-reorder-after <U0046>
-<F-F>	<f-f-cy>;<PCT>;<CAP>;IGNORE
-<F-f>	<f-f-cy>;<PCT>;<CAP-MIN>;IGNORE
-
-reorder-after <U0067>
-<n-g>	<n-g-cy>;<PCT>;<MIN>;IGNORE
-<n-G>	<n-g-cy>;<PCT>;<MIN-CAP>;IGNORE
-reorder-after <U0047>
-<N-G>	<n-g-cy>;<PCT>;<CAP>;IGNORE
-<N-g>	<n-g-cy>;<PCT>;<CAP-MIN>;IGNORE
-
-reorder-after <U006C>
-<l-l>	<l-l-cy>;<PCT>;<MIN>;IGNORE
-<l-L>	<l-l-cy>;<PCT>;<MIN-CAP>;IGNORE
-reorder-after <U004C>
-<L-L>	<l-l-cy>;<PCT>;<CAP>;IGNORE
-<L-l>	<l-l-cy>;<PCT>;<CAP-MIN>;IGNORE
-
-reorder-after <U0070>
-<p-h>	<p-h-cy>;<PCT>;<MIN>;IGNORE
-<p-H>	<p-h-cy>;<PCT>;<MIN-CAP>;IGNORE
-reorder-after <U0050>
-<P-H>	<p-h-cy>;<PCT>;<CAP>;IGNORE
-<P-h>	<p-h-cy>;<PCT>;<CAP-MIN>;IGNORE
-
-reorder-after <U0072>
-<r-h>	<r-h-cy>;<PCT>;<MIN>;IGNORE
-<r-H>	<r-h-cy>;<PCT>;<MIN-CAP>;IGNORE
-reorder-after <U0052>
-<R-H>	<r-h-cy>;<PCT>;<CAP>;IGNORE
-<R-h>	<r-h-cy>;<PCT>;<CAP-MIN>;IGNORE
-
-reorder-after <U0074>
-<t-h>	<t-h-cy>;<PCT>;<MIN>;IGNORE
-<t-H>	<t-h-cy>;<PCT>;<MIN-CAP>;IGNORE
-reorder-after <U0054>
-<T-H>	<t-h-cy>;<PCT>;<CAP>;IGNORE
-<T-h>	<t-h-cy>;<PCT>;<CAP-MIN>;IGNORE
+<ch> <ch-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<cH> <ch-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<Ch> <ch-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<CH> <ch-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<dd> <dd-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<dD> <dd-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<Dd> <dd-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<DD> <dd-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<ff> <ff-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<fF> <ff-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<Ff> <ff-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<FF> <ff-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<ng> <ng-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<nG> <ng-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<Ng> <ng-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<NG> <ng-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<ll> <ll-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<lL> <ll-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<Ll> <ll-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<LL> <ll-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<ph> <ph-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<pH> <ph-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<Ph> <ph-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<PH> <ph-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<rh> <rh-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<rH> <rh-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<Rh> <rh-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<RH> <rh-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<th> <th-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<tH> <th-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<Th> <th-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<TH> <th-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE

 reorder-end

--- a/localedata/locales/da_DK
+++ b/localedata/locales/da_DK
@ -60,75 +60,83 @@ END LC_IDENTIFICATION
 LC_COLLATE
 copy "iso14651_t1"

+% CLDR collation rules for Danish:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/da.xml)
+%
+% <collation type="standard">
+%   <cr><![CDATA[
+%     [caseFirst upper]
+%     &D<<đ<<<Đ<<ð<<<Ð
+%     &th<<<þ
+%     &TH<<<Þ
+%     &Y<<ü<<<Ü<<ű<<<Ű
+%     &[before 1]ǀ<æ<<<Æ<<ä<<<Ä<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<å<<<Å<<<aa<<<Aa<<<AA
+%     &oe<<œ<<<Œ
+%   ]]></cr>
+% </collation>
+%
+% And CLDR also lists the following
+% index characters:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/main/da.xml)
+%
+% <exemplarCharacters type="index">[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Æ Ø Å]</exemplarCharacters>
+%
+% The following rules implement the same order for glibc.
+
 collating-element <A-A> from "<U0041><U0041>"
 collating-element <A-a> from "<U0041><U0061>"
 collating-element <a-A> from "<U0061><U0041>"
 collating-element <a-a> from "<U0061><U0061>"
-collating-symbol <CAP-MIN>
-collating-symbol <MIN-CAP>
 collating-symbol <ae>
 collating-symbol <o-stroke>
 collating-symbol <a-ring>
-collating-symbol <ETH>

 reorder-after <RES-1>
+<COMPATCAP>
 <CAP>
-<CAP-MIN>
-<MIN-CAP>
+<COMPAT>
+<MIN>

-reorder-after <z>
+% &[before 1]ǀ<æ<<<Æ<<ä<<<Ä<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<å<<<Å<<<aa<<<Aa<<<AA
+reorder-after <AFTER-Z>
 <ae>
 <o-stroke>
 <a-ring>

-% <U00DC> and <U0170> are treated as <U0059> in Danish
-reorder-after <U0178>
-<U00DC> <y>;<U00DC>;<CAP>;IGNORE
-<U00FC> <y>;<U00DC>;<MIN>;IGNORE
-<U0170> <y>;<U0170>;<CAP>;IGNORE
-<U0171> <y>;<U0170>;<MIN>;IGNORE
+% &D<<đ<<<Đ<<ð<<<Ð
+<U0110> <S0064>;"<BASE><BARRE>";"<CAP><MIN>";IGNORE % Đ
+<U0111> <S0064>;"<BASE><BARRE>";"<MIN><MIN>";IGNORE % đ
+<U00D0> <S0064>;"<BASE><VRNT1>";"<COMPATCAP><COMPAT>";IGNORE % Ð
+<U00F0> <S0064>;"<BASE><VRNT1>";"<COMPAT><COMPAT>";IGNORE % ð

-% <U00C6> is a separate letter in Danish
-reorder-after <U017B>
-<U00C6> <ae>;<BAS>;<CAP>;IGNORE
-<U00E6> <ae>;<BAS>;<MIN>;IGNORE
-<U01FC> <ae>;<ACA>;<CAP>;IGNORE
-<U01FD> <ae>;<ACA>;<MIN>;IGNORE
-<U00C4> <ae>;<REU>;<CAP>;IGNORE
-<U00E4> <ae>;<REU>;<MIN>;IGNORE
-<U01E2> <ae>;<MAC>;<CAP>;IGNORE
-<U01E3> <ae>;<MAC>;<MIN>;IGNORE
-% <U00D8> is a separate letter in Danish
-<U00D8> <o-stroke>;<BAS>;<CAP>;IGNORE
-<U00F8> <o-stroke>;<BAS>;<MIN>;IGNORE
-<U01FE> <o-stroke>;<ACA>;<CAP>;IGNORE
-<U01FF> <o-stroke>;<ACA>;<MIN>;IGNORE
-<U00D6> <o-stroke>;<REU>;<CAP>;IGNORE
-<U00F6> <o-stroke>;<REU>;<MIN>;IGNORE
-<U0150> <o-stroke>;<DAC>;<CAP>;IGNORE
-<U0151> <o-stroke>;<DAC>;<MIN>;IGNORE
-% <U00C5> is a separate letter in Danish
-<U00C5> <a-ring>;<BAS>;<CAP>;IGNORE
-<U00E5> <a-ring>;<BAS>;<MIN>;IGNORE
-<A-A>   <a-ring>;<A-A>;<CAP>;IGNORE
-<A-a>   <a-ring>;<A-A>;<CAP-MIN>;IGNORE
-<a-A>   <a-ring>;<A-A>;<MIN-CAP>;IGNORE
-<a-a>   <a-ring>;<A-A>;<MIN>;IGNORE
+% &T<<<Þ/H
+% &t<<<þ/h
+<U00DE> "<S0074><S0068>";"<BASE><BASE>";"<COMPATCAP><COMPATCAP>";IGNORE % Þ
+<U00FE> "<S0074><S0068>";"<BASE><BASE>";"<COMPAT><COMPAT>";IGNORE % þ

-%  Present in iso14651_t1, but these definitions seem to have been
-%  removed from latest iso14651 tables.
-reorder-after <U0162>
-<U00DE> "<t><h>";"<LIG><LIG>";"<CAP><CAP>";IGNORE
-<U00FE> "<t><h>";"<LIG><LIG>";"<MIN><MIN>";IGNORE
+% &Y<<ü<<<Ü<<ű<<<Ű
+<U00DC> <S0079>;"<BASE><TREMA>";"<CAP><MIN>";IGNORE % Ü
+<U00FC> <S0079>;"<BASE><TREMA>";"<MIN><MIN>";IGNORE % ü
+<U0170> <S0079>;"<BASE><2AIGU>";"<CAP><MIN>";IGNORE % Ű
+<U0171> <S0079>;"<BASE><2AIGU>";"<MIN><MIN>";IGNORE % ű

-reorder-after <OBL>
-<ETH>
-
-reorder-after <U0064>
-<U0110> <d>;<OBL>;<CAP>;IGNORE
-<U0111> <d>;<OBL>;<MIN>;IGNORE
-<U00D0> <d>;<ETH>;<CAP>;IGNORE
-<U00F0> <d>;<ETH>;<MIN>;IGNORE
+% &[before 1]ǀ<æ<<<Æ<<ä<<<Ä<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<å<<<Å<<<aa<<<Aa<<<AA
+<U00C6> <ae>;"<BASE><BASE>";"<COMPATCAP><COMPATCAP>";IGNORE % Æ
+<U00E6> <ae>;"<BASE><BASE>";"<COMPAT><COMPAT>";IGNORE % æ
+<U00C4> <ae>;"<BASE><TREMA>";"<CAP><MIN>";IGNORE % Ä
+<U00E4> <ae>;"<BASE><TREMA>";"<MIN><MIN>";IGNORE % ä
+<U00D8> <o-stroke>;"<BASE><BASE>";"<COMPATCAP><COMPATCAP>";IGNORE % Ø
+<U00F8> <o-stroke>;"<BASE><BASE>";"<COMPAT><COMPAT>";IGNORE % ø
+<U00D6> <o-stroke>;"<BASE><TREMA>";"<CAP><MIN>";IGNORE % Ö
+<U00F6> <o-stroke>;"<BASE><TREMA>";"<MIN><MIN>";IGNORE % ö
+<U0150> <o-stroke>;"<BASE><2AIGU>";"<CAP><MIN>";IGNORE % Ő
+<U0151> <o-stroke>;"<BASE><2AIGU>";"<MIN><MIN>";IGNORE % ő
+<U00C5> <a-ring>;"<BASE><BASE>";"<COMPATCAP><COMPATCAP>";IGNORE % Å
+<U00E5> <a-ring>;"<BASE><BASE>";"<COMPAT><COMPAT>";IGNORE % å
+<A-A>   <a-ring>;"<BASE><VRNT1>";"<CAP><CAP>";IGNORE
+<A-a>   <a-ring>;"<BASE><VRNT1>";"<CAP><MIN>";IGNORE
+<a-A>   <a-ring>;"<BASE><VRNT1>";"<MIN><CAP>";IGNORE
+<a-a>   <a-ring>;"<BASE><VRNT1>";"<MIN><MIN>";IGNORE

 reorder-end
 END LC_COLLATE
--- a/localedata/locales/dz_BT
+++ b/localedata/locales/dz_BT
--- a/localedata/locales/en_CA
+++ b/localedata/locales/en_CA
@ -57,14 +57,6 @@ copy "iso14651_t1"
 reorder-after <RES-1>
 <CAP>

-%  Present in iso14651_t1, but these definitions seem to have been
-%  removed from latest iso14651 tables.
-reorder-after <U0041>
-<U00C6> "<a><e>";"<LIG><LIG>";"<CAP><CAP>";IGNORE
-
-reorder-after <U0061>
-<U00E6> "<a><e>";"<LIG><LIG>";"<MIN><MIN>";IGNORE
-
 reorder-end

 END LC_COLLATE
--- a/localedata/locales/eo
+++ b/localedata/locales/eo
@ -55,6 +55,27 @@ copy "i18n"
 END LC_CTYPE

 LC_COLLATE
+% CLDR collation rules for Esperanto:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/eo.xml)
+%
+% <collation type="standard" >
+%   <cr><![CDATA[
+%     &C<ĉ<<<Ĉ
+%     &G<ĝ<<<Ĝ
+%     &H<ĥ<<<Ĥ
+%     &J<ĵ<<<Ĵ
+%     &S<ŝ<<<Ŝ
+%     &U<ŭ<<<Ŭ
+%   ]]></cr>
+% </collation  >
+%
+% And CLDR also lists the following
+% index characters:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/main/eo.xml)
+%
+% <exemplarCharacters type="index">[A B C Ĉ D E F G Ĝ H Ĥ I J Ĵ K L M N O P R S Ŝ T U Ŭ V Z]</exemplarCharacters>
+%
+% The following rules implement the same order for glibc.
 copy "iso14651_t1"

 collating-symbol <ccirc>
@ -64,43 +85,31 @@ collating-symbol <jcirc>
 collating-symbol <scirc>
 collating-symbol <ubreve>

-reorder-after <c>
+reorder-after <AFTER-C>
 <ccirc>
-reorder-after <g>
+reorder-after <AFTER-G>
 <gcirc>
-reorder-after <h>
+reorder-after <AFTER-H>
 <hcirc>
-reorder-after <j>
+reorder-after <AFTER-J>
 <jcirc>
-reorder-after <s>
+reorder-after <AFTER-S>
 <scirc>
-reorder-after <u>
+reorder-after <AFTER-U>
 <ubreve>

-reorder-after <U0043>
-<U0108> <ccirc>;<CIR>;<CAP>;IGNORE
-reorder-after <U0063>
-<U0109> <ccirc>;<CIR>;<MIN>;IGNORE
-reorder-after <U0047>
-<U011C> <gcirc>;<CIR>;<CAP>;IGNORE
-reorder-after <U0067>
-<U011D> <gcirc>;<CIR>;<MIN>;IGNORE
-reorder-after <U0048>
-<U0124> <hcirc>;<CIR>;<CAP>;IGNORE
-reorder-after <U0068>
-<U0125> <hcirc>;<CIR>;<MIN>;IGNORE
-reorder-after <U004A>
-<U0134> <jcirc>;<CIR>;<CAP>;IGNORE
-reorder-after <U006A>
-<U0135> <jcirc>;<CIR>;<MIN>;IGNORE
-reorder-after <U0053>
-<U015C> <scirc>;<CIR>;<CAP>;IGNORE
-reorder-after <U0073>
-<U015D> <scirc>;<CIR>;<MIN>;IGNORE
-reorder-after <U0055>
-<U016C> <ubreve>;<BRE>;<CAP>;IGNORE
-reorder-after <U0075>
-<U016D> <ubreve>;<BRE>;<MIN>;IGNORE
+<U0108> <ccirc>;<BASE>;<CAP>;IGNORE
+<U0109> <ccirc>;<BASE>;<MIN>;IGNORE
+<U011C> <gcirc>;<BASE>;<CAP>;IGNORE
+<U011D> <gcirc>;<BASE>;<MIN>;IGNORE
+<U0124> <hcirc>;<BASE>;<CAP>;IGNORE
+<U0125> <hcirc>;<BASE>;<MIN>;IGNORE
+<U0134> <jcirc>;<BASE>;<CAP>;IGNORE
+<U0135> <jcirc>;<BASE>;<MIN>;IGNORE
+<U015C> <scirc>;<BASE>;<CAP>;IGNORE
+<U015D> <scirc>;<BASE>;<MIN>;IGNORE
+<U016C> <ubreve>;<BASE>;<CAP>;IGNORE
+<U016D> <ubreve>;<BASE>;<MIN>;IGNORE

 reorder-end

--- a/localedata/locales/es_CU
+++ b/localedata/locales/es_CU
@ -50,8 +50,7 @@ category "i18n:2012";LC_MEASUREMENT
 END LC_IDENTIFICATION

 LC_COLLATE
-% Copy the template from ISO/IEC 14651
-copy "iso14651_t1"
+copy "es_ES"
 END LC_COLLATE

 LC_CTYPE
--- a/localedata/locales/es_EC
+++ b/localedata/locales/es_EC
@ -51,7 +51,7 @@ category "i18n:2012";LC_MEASUREMENT
 END LC_IDENTIFICATION

 LC_COLLATE
-copy "es_US"
+copy "es_ES"
 END LC_COLLATE

 LC_CTYPE
--- a/localedata/locales/es_ES
+++ b/localedata/locales/es_ES
@ -51,8 +51,55 @@ category "i18n:2012";LC_MEASUREMENT
 END LC_IDENTIFICATION

 LC_COLLATE
-% Copy the template from ISO/IEC 14651
+% CLDR collation rules for Spanish:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/es.xml)
+%
+% <collation type="standard">
+% 	<cr><![CDATA[
+% 		&N<ñ<<<Ñ
+% 	]]></cr>
+% </collation>
+% <collation type="traditional">
+% 	<cr><![CDATA[
+% 		&N<ñ<<<Ñ
+% 		&C<ch<<<Ch<<<CH
+% 		&l<ll<<<Ll<<<LL
+% 	]]></cr>
+% </collation>
+% <collation draft="unconfirmed" alt="proposed" type="traditional">
+% 	<cr><![CDATA[
+% 		&N<ñ<<<Ñ
+% 		&C<ch<<<cH<<<Ch<<<CH
+% 		&l<ll<<<lL<<<Ll<<<LL
+% 	]]></cr>
+% </collation>
+%
+% And CLDR also lists the following
+% index characters:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/main/es.xml)
+%
+% <exemplarCharacters type="index">[A B C D E F G H I J K L M N Ñ O P Q R S T U V W X Y Z]</exemplarCharacters>
+%
+% The following rules implement the same order as “standard” for glibc.
+
 copy "iso14651_t1"
+
+collating-symbol <space>
+collating-symbol <n-tilde>
+
+reorder-after <RES-1>
+<space>
+
+reorder-after <AFTER-N>
+<n-tilde>
+
+<U0020> <space>;IGNORE;IGNORE;<U0020>
+<U00A0> <space>;IGNORE;IGNORE;<U00A0>
+<U00F1> <n-tilde>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ñ
+<U00D1> <n-tilde>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ñ
+
+reorder-end
+
 END LC_COLLATE

 LC_CTYPE
--- a/localedata/locales/es_US
+++ b/localedata/locales/es_US
@ -51,61 +51,7 @@ category "i18n:2012";LC_MEASUREMENT
 END LC_IDENTIFICATION

 LC_COLLATE
-copy "iso14651_t1"
-
-collating-element <C-H> from "<U0043><U0048>"
-collating-element <c-h> from "<U0063><U0068>"
-collating-element <C-h> from "<U0043><U0068>"
-collating-element <c-H> from "<U0063><U0048>"
-collating-element <L-L> from "<U004C><U004C>"
-collating-element <l-l> from "<U006C><U006C>"
-collating-element <L-l> from "<U004C><U006C>"
-collating-element <l-L> from "<U006C><U004C>"
-
-collating-symbol <ch>
-collating-symbol <ll>
-collating-symbol <ntilde>
-
-collating-symbol <CAP-MIN>
-collating-symbol <MIN-CAP>
-
-reorder-after <MIN>
-<MIN-CAP>
-<CAP-MIN>
-
-reorder-after <n>
-<ntilde>
-
-reorder-after <U006E>
-<U00F1> <ntilde>;<BAS>;<MIN>;IGNORE
-
-reorder-after <U004E>
-<U00D1> <ntilde>;<BAS>;<CAP>;IGNORE
-
-reorder-after <c>
-<ch>
-
-reorder-after <U0063>
-<c-H>	<ch>;<BAS>;<MIN-CAP>;IGNORE
-<c-h>	<ch>;<BAS>;<MIN>;IGNORE
-
-reorder-after <U0043>
-<C-H>	<ch>;<BAS>;<CAP>;IGNORE
-<C-h>	<ch>;<BAS>;<CAP-MIN>;IGNORE
-
-reorder-after <l>
-<ll>
-
-reorder-after <U006C>
-<l-L>	<ll>;<BAS>;<MIN-CAP>;IGNORE
-<l-l>	<ll>;<BAS>;<MIN>;IGNORE
-
-reorder-after <U004C>
-<L-L>	<ll>;<BAS>;<CAP>;IGNORE
-<L-l>	<ll>;<BAS>;<CAP-MIN>;IGNORE
-
-reorder-end
-
+copy "es_ES"
 END LC_COLLATE

 LC_CTYPE
--- a/localedata/locales/et_EE
+++ b/localedata/locales/et_EE
@ -63,6 +63,7 @@ copy "iso14651_t1"
 % The following rules implement the same order for glibc.

 collating-symbol <s-caron>
+collating-symbol <z>
 collating-symbol <z-caron>
 collating-symbol <o-tilde>
 collating-symbol <a-diaresis>
@ -80,28 +81,28 @@ reorder-after <RES-1>
 <CAP>
 <MIN>

-reorder-after <s>
+reorder-after <BEFORE-T>
 <s-caron>
-<z>
+<S007A>
 <z-caron>
-reorder-after <w>
+reorder-after <BEFORE-X>
 <o-tilde>
 <a-diaresis>
 <o-diaresis>
 <u-diaresis>

-<U0161> <s-caron>;<BAS>;<MIN>;IGNORE % š
-<U0160> <s-caron>;<BAS>;<CAP>;IGNORE % Š
-<U017E> <z-caron>;<BAS>;<MIN>;IGNORE % ž
-<U017D> <z-caron>;<BAS>;<CAP>;IGNORE % Ž
-<U00F5> <o-tilde>;<BAS>;<MIN>;IGNORE % õ
-<U00D5> <o-tilde>;<BAS>;<CAP>;IGNORE % Õ
-<U00E4> <a-diaresis>;<BAS>;<MIN>;IGNORE % ä
-<U00C4> <a-diaresis>;<BAS>;<CAP>;IGNORE % Ä
-<U00F6> <o-diaresis>;<BAS>;<MIN>;IGNORE % ö
-<U00D6> <o-diaresis>;<BAS>;<CAP>;IGNORE % Ö
-<U00FC> <u-diaresis>;<BAS>;<MIN>;IGNORE % ü
-<U00DC> <u-diaresis>;<BAS>;<CAP>;IGNORE % Ü
+<U0161> <s-caron>;<BASE>;<MIN>;IGNORE % š
+<U0160> <s-caron>;<BASE>;<CAP>;IGNORE % Š
+<U017E> <z-caron>;<BASE>;<MIN>;IGNORE % ž
+<U017D> <z-caron>;<BASE>;<CAP>;IGNORE % Ž
+<U00F5> <o-tilde>;<BASE>;<MIN>;IGNORE % õ
+<U00D5> <o-tilde>;<BASE>;<CAP>;IGNORE % Õ
+<U00E4> <a-diaresis>;<BASE>;<MIN>;IGNORE % ä
+<U00C4> <a-diaresis>;<BASE>;<CAP>;IGNORE % Ä
+<U00F6> <o-diaresis>;<BASE>;<MIN>;IGNORE % ö
+<U00D6> <o-diaresis>;<BASE>;<CAP>;IGNORE % Ö
+<U00FC> <u-diaresis>;<BASE>;<MIN>;IGNORE % ü
+<U00DC> <u-diaresis>;<BASE>;<CAP>;IGNORE % Ü

 reorder-end

--- a/localedata/locales/fa_IR
+++ b/localedata/locales/fa_IR
@ -84,188 +84,113 @@ END LC_CTYPE
 LC_COLLATE
 copy "iso14651_t1"

-% The Persian alphabet order is: ALEF WITH MADDA ABOVE, ALEF, HAMZA (all
-% kinds), BEH, PEH, TEH, JEEM, TCHEH, HAH, KHAH, DAL, THAL, REH, ZAIN, JEH,
-% SEEN, SHEEN, SAD, DAD, TAH, ZAH, AIN, GHAIN, FEH, QAF, KAF, GAF, LAM,
-% MEEM, NOON, WAW, HEH, YEH.
-% The various kinds of HAMZA are sorted as ALEF WITH HAMZA ABOVE, ALEF WITH
-% HAMZA BELOW, WAW WITH HAMZA ABOVE, YEH WITH HAMZA ABOVE.
+% CLDR collation rules for Ukrainian:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/fa.xml)
+%
+% 		<collation type="standard">
+% 			<cr><![CDATA[
+% <collations>
+%   <collation type="standard">
+%     <cr><![CDATA[
+%     	[normalization on]
+%     	[reorder Arab]
+%     	&َ<<ِ<<ُ<<ً<<ٍ<<ٌ
+%     	&[before 1]ا<آ
+%     	&ا<<ٱ<ء
+%     	<<أ<<ٲ<<إ<<ٳ<<ؤ
+%     	<<یٔ<<<ىٔ<<<ئ
+%     	&ک<<*ڪګكڬڭڮ
+%     	&ۏ<ه<<ە<<ہ<<ة<<ۃ<<ۀ<<ھ
+%     	&ی<<*ىےيېۑۍێ
+%     ]]></cr>
+%   </collation>
+% </collations>
+%
+% And CLDR also lists the following
+% index characters:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/main/fa.xml)
+%
+% <exemplarCharacters type="index">[آ ا ب پ ت ث ج چ ح خ د ذ ر ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن و ه ی]</exemplarCharacters>
+%
+% The following rules implement the same order for glibc.

-collating-symbol <AHY> % accent hamza over yeh
-collating-symbol <ADL> % dotless
-collating-symbol <ADO> % with dots over
-collating-symbol <AWO> % with wasla over
+collating-symbol <arabic-letter-heh>

-collating-symbol <alefmadda>
-collating-symbol <yeh>
+collating-element <arabic-letter-farsi-yeh-with-hamza-above> from "<U06CC><U0654>"
+collating-element <arabic-letter-alef-maksura-with-hamza-above> from "<U0649><U0654>"

-% Alternate representations displayed the same
-collating-symbol <ALT1>
-collating-symbol <ALT2>
+% &َ<<ِ<<ُ<<ً<<ٍ<<ٌ
+reorder-after <FATHA>
+<KASRA>
+<DAMMA>
+<FATHATAN>
+<KASRATAN>
+<DAMMATAN>

-collating-element <Alef-Madda> from "<U0627><U0653>"
-collating-element <Alef-Hamza> from "<U0627><U0654>"
-collating-element <Alef-HamzaBelow> from "<U0627><U0655>"
-collating-element <Waw-Hamza> from "<U0648><U0654>"
-collating-element <AlefMaksura-Hamza> from "<U0649><U0654>"
-collating-element <Yeh-Hamza> from "<U064A><U0654>"
-collating-element <FarsiYeh-Hamza> from "<U06CC><U0654>"
+% &[before 1]ا<آ
+reorder-after <S08AC> % ARABIC LETTER ROHINGYA YEH
+<S0622> % ARABIC LETTER ALEF WITH MADDA ABOVE

-reorder-after <BAS>
-<AHA>
-<AHS>
-<AWO>
-<AHW>
-<AHY>
-<ADL>
-<ADO>
-<AYE>
-<YBA>
+% &ا<<ٱ<ء<<أ<<ٲ<<إ<<ٳ<<ؤ<<یٔ<<<ىٔ<<<ئ
+% Entry in iso14651_t1_common:
+%
+%    <U0627> <S0627>;<BASE>;<MIN>;<U0627> % ARABIC LETTER ALEF
+%
+% So we make <U0671> sort like <S0627> with a secondary difference:
+<U0671> <S0627>;"<BASE><VRNT1>";<MIN>;<U0671> % ARABIC LETTER ALEF WASLA

-reorder-after <LIG>
-<ALT1>
-<ALT2>
+reorder-after <S0627> % ARABIC LETTER ALEF
+<S0621> % ARABIC LETTER HAMZA

-reorder-after <th>
-<alefmadda>
-<alef>
-<hamza>
+<U0623> <S0621>;"<BASE><VRNT1><VRNT1>";<MIN>;<U0623> % ARABIC LETTER ALEF WITH HAMZA ABOVE
+<U0672> <S0621>;"<BASE><VRNT1><VRNT2>";<MIN>;<U0672> % ARABIC LETTER ALEF WITH WAVY HAMZA ABOVE
+<U0625> <S0621>;"<BASE><VRNT1><VRNT3>";<MIN>;<U0625> % ARABIC LETTER ALEF WITH HAMZA BELOW
+<U0673> <S0621>;"<BASE><VRNT1><VRNT4>";<MIN>;<U0673> % ARABIC LETTER ALEF WITH WAVY HAMZA BELOW
+<U0624> <S0621>;"<BASE><VRNT1><VRNT5>";<MIN>;<U0624> % ARABIC LETTER WAW WITH HAMZA ABOVE
+<arabic-letter-farsi-yeh-with-hamza-above> <S0621>;"<BASE><VRNT2><VRNT1>";<MIN>;<U06CC>
+<arabic-letter-alef-maksura-with-hamza-above> <S0621>;"<BASE><VRNT2><VRNT1>";<CAP>;<U0649>
+<U0626> <S0621>;"<BASE><VRNT2><VRNT1>";<COMPATCAP>;<U0626> % ARABIC LETTER YEH WITH HAMZA ABOVE

-reorder-after <waw>
-<heh>
-<yeh>
+% &ک<<*ڪګكڬڭڮ
+% Entry for ک in iso14651_t1_common:
+%
+%    <U06A9> <S06A9>;<BASE>;<MIN>;<U06A9> % ARABIC LETTER KEHEH
+%
+% So we make ڪ ګ ك ڬ ڭ ڮ sort like <S06A9> with secondary differences:
+<U06AA> <S06A9>;"<BASE><VRNT1><VRNT1>";<MIN>;<U06AA> % ڪ ARABIC LETTER SWASH KAF
+<U06AB> <S06A9>;"<BASE><VRNT1><VRNT2>";<MIN>;<U06AB> % ګ ARABIC LETTER KAF WITH RING
+<U0643> <S06A9>;"<BASE><VRNT1><VRNT3>";<MIN>;<U0643> % ك ARABIC LETTER KAF
+<U06AC> <S06A9>;"<BASE><VRNT1><VRNT4>";<MIN>;<U06AC> % ڬ ARABIC LETTER KAF WITH DOT ABOVE
+<U06AD> <S06A9>;"<BASE><VRNT1><VRNT5>";<MIN>;<U06AD> % ڭ ARABIC LETTER NG
+<U06AE> <S06A9>;"<BASE><VRNT2><VRNT1>";<MIN>;<U06AE> % ڮ ARABIC LETTER KAF WITH THREE DOTS BELOW

-% Persian uses this order: Fatha, Kasra, Damma, Fathatan, Kasratan, Dammatan.
+% &ۏ<ه<<ە<<ہ<<ة<<ۃ<<ۀ<<ھ
+reorder-after <S06CF> % ARABIC LETTER WAW WITH DOT ABOVE
+<arabic-letter-heh>

-reorder-after <U066D>
-<U064E> IGNORE;IGNORE;IGNORE;<U064E> %<fatha_no>
-<UFE76> IGNORE;IGNORE;IGNORE;<UFE76> %<fatha_is>
-<UFE77> IGNORE;IGNORE;IGNORE;<UFE77> %<fatha_me>
-<U0650> IGNORE;IGNORE;IGNORE;<U0650> %<kasra_no>
-<UFE7A> IGNORE;IGNORE;IGNORE;<UFE7A> %<kasra_is>
-<UFE7B> IGNORE;IGNORE;IGNORE;<UFE7B> %<kasra_me>
-<U064F> IGNORE;IGNORE;IGNORE;<U064F> %<damma_no>
-<UFE78> IGNORE;IGNORE;IGNORE;<UFE78> %<damma_is>
-<UFE79> IGNORE;IGNORE;IGNORE;<UFE79> %<damma_me>
-<U064B> IGNORE;IGNORE;IGNORE;<U064B> %<fathatan_no>
-<UFE70> IGNORE;IGNORE;IGNORE;<UFE70> %<fathatan_is>
-<UFE71> IGNORE;IGNORE;IGNORE;<UFE71> %<fathatan_me>
-<U064D> IGNORE;IGNORE;IGNORE;<U064D> %<kasratan_no>
-<UFE74> IGNORE;IGNORE;IGNORE;<UFE74> %<kasratan_is>
-<U064C> IGNORE;IGNORE;IGNORE;<U064C> %<dammatan_no>
-<UFE72> IGNORE;IGNORE;IGNORE;<UFE72> %<dammatan_is>
+% &ۏ<ه<<ە<<ہ<<ة<<ۃ<<ۀ<<ھ
+<U0647> <arabic-letter-heh>;<BASE>;<MIN>;<U0647> % ه ARABIC LETTER HEH
+<U06D5> <arabic-letter-heh>;"<BASE><VRNT1><VRNT1>";<MIN>;<U06D5> % ARABIC LETTER AE
+<U06C1> <arabic-letter-heh>;"<BASE><VRNT1><VRNT2>";<MIN>;<U06C1> % ARABIC LETTER HEH GOAL
+<U0629> <arabic-letter-heh>;"<BASE><VRNT1><VRNT3>";<MIN>;<U0629> % ARABIC LETTER TEH MARBUTA
+<U06C3> <arabic-letter-heh>;"<BASE><VRNT1><VRNT4>";<MIN>;<U06C3> % ARABIC LETTER TEH MARBUTA GOAL
+<U06C0> <arabic-letter-heh>;"<BASE><VRNT1><VRNT5>";"<MIN><MIN>";<U06C0> % ARABIC LETTER HEH WITH YEH ABOVE
+<U06BE> <arabic-letter-heh>;"<BASE><VRNT2><VRNT1>";<MIN>;<U06BE> % ARABIC LETTER HEH DOACHASHMEE

-reorder-after <UFE7F>
-<U0653> IGNORE;IGNORE;IGNORE;<U0653> %<madda_no>
-<U0654> IGNORE;IGNORE;IGNORE;<U0654> %<hamzaabove_no>
-<U0655> IGNORE;IGNORE;IGNORE;<U0655> %<hamzabelow_no>
-<U0670> IGNORE;IGNORE;IGNORE;<U0670> %<supalef_no>
+% &ی<<*ىےيېۑۍێ
+% Entry for  in iso14651_t1_common:
+%
+%    <U06CC> <S06CC>;<BASE>;<MIN>;<U06CC> % ARABIC LETTER FARSI YEH
+%
+% So we make ى ے ي ې ۑ ۍ ێ sort like <S06CC> with secondary differences:
+<U0649> <S06CC>;"<BASE><VRNT1><VRNT1>";<MIN>;<U0649> % ARABIC LETTER ALEF MAKSURA
+<U06D2> <S06CC>;"<BASE><VRNT1><VRNT2>";<MIN>;<U06D2> % ARABIC LETTER YEH BARREE
+<U064A> <S06CC>;"<BASE><VRNT1><VRNT3>";<MIN>;<U064A> % ARABIC LETTER YEH
+<U06D0> <S06CC>;"<BASE><VRNT1><VRNT4>";<MIN>;<U06D0> % ARABIC LETTER E
+<U06D1> <S06CC>;"<BASE><VRNT1><VRNT5>";<MIN>;<U06D1> % ARABIC LETTER YEH WITH THREE DOTS BELOW
+<U06CD> <S06CC>;"<BASE><VRNT2><VRNT1>";<MIN>;<U06CD> % ARABIC LETTER YEH WITH TAIL
+<U06CE> <S06CC>;"<BASE><VRNT2><VRNT2>";<MIN>;<U06CE> % ARABIC LETTER YEH WITH SMALL V

-% The Persian digits are sorted before the Arabic ones: they are the basic forms.
-reorder-after <U0660>
-<U06F0> <0>;<BAS>;<MIN>;IGNORE
-<U0660> <0>;<PCL>;<MIN>;IGNORE
-<U06F1> <1>;<BAS>;<MIN>;IGNORE
-<U0661> <1>;<PCL>;<MIN>;IGNORE
-<U06F2> <2>;<BAS>;<MIN>;IGNORE
-<U0662> <2>;<PCL>;<MIN>;IGNORE
-<U06F3> <3>;<BAS>;<MIN>;IGNORE
-<U0663> <3>;<PCL>;<MIN>;IGNORE
-<U06F4> <4>;<BAS>;<MIN>;IGNORE
-<U0664> <4>;<PCL>;<MIN>;IGNORE
-<U06F5> <5>;<BAS>;<MIN>;IGNORE
-<U0665> <5>;<PCL>;<MIN>;IGNORE
-<U06F6> <6>;<BAS>;<MIN>;IGNORE
-<U0666> <6>;<PCL>;<MIN>;IGNORE
-<U06F7> <7>;<BAS>;<MIN>;IGNORE
-<U0667> <7>;<PCL>;<MIN>;IGNORE
-<U06F8> <8>;<BAS>;<MIN>;IGNORE
-<U0668> <8>;<PCL>;<MIN>;IGNORE
-<U06F9> <9>;<BAS>;<MIN>;IGNORE
-<U0669> <9>;<PCL>;<MIN>;IGNORE
-
-% And then the letters:
-<U0622> <alefmadda>;<BAS>;<MIN>;IGNORE % Alef With Madda Above
-<Alef-Madda> <alefmadda>;<BAS>;<MIN>;IGNORE
-<U0627> <alef>;<BAS>;<MIN>;IGNORE       % Alef
-<U0671> <alef>;<AWO>;<MIN>;IGNORE       % Alef Wasla
-<U0621> <hamza>;<BAS>;<MIN>;IGNORE      % Hamza
-<U0623> <hamza>;<AHA>;<MIN>;IGNORE      % Alef With Hamza Above
-<Alef-Hamza> <hamza>;<AHA>;<MIN>;IGNORE
-<U0625> <hamza>;<AHS>;<MIN>;IGNORE      % Alef With Hamza Below
-<Alef-HamzaBelow> <hamza>;<AHS>;<MIN>;IGNORE
-<U0624> <hamza>;<AHW>;<MIN>;IGNORE      % Waw With Hamza Above
-<Waw-Hamza> <hamza>;<AHW>;<MIN>;IGNORE
-<U0626> <hamza>;<AHY>;<MIN>;IGNORE      % Yeh With Hamza Above
-<FarsiYeh-Hamza> <hamza>;<AHY>;<ALT1>;IGNORE
-<AlefMaksura-Hamza> <hamza>;<AHY>;<ALT2>;IGNORE
-<Yeh-Hamza> <hamza>;<AHY>;<MIN>;IGNORE
-reorder-after <U0642>
-<U06A9> <kaf>;<BAS>;<MIN>;IGNORE        % Keheh
-<U0643> <kaf>;<PCL>;<MIN>;IGNORE        % Kaf
-reorder-after <U0648>
-<U0647> <heh>;<BAS>;<MIN>;IGNORE        % Heh
-<U0629> <heh>;<ADO>;<MIN>;IGNORE        % Teh Marbuta
-<U06C0> <heh>;<AHA>;<MIN>;IGNORE        % Heh With Yeh Above
-<U06CC> <yeh>;<BAS>;<MIN>;IGNORE        % Farsi Yeh
-<U0649> <yeh>;<ADL>;<MIN>;IGNORE        % Alef Maksura
-<U064A> <yeh>;<AYE>;<MIN>;IGNORE        % Yeh
-
-% Finally the letters in Presentation Form:
-reorder-after <UFE80>
-<UFE81> <alefmadda>;<BAS>;<AIS>;IGNORE
-<UFE82> <alefmadda>;<BAS>;<AFI>;IGNORE
-<UFE8D> <alef>;<BAS>;<AIS>;IGNORE
-<UFE8E> <alef>;<BAS>;<AFI>;IGNORE
-<UFB50> <alef>;<AWO>;<AIS>;IGNORE
-<UFB51> <alef>;<AWO>;<AFI>;IGNORE
-<UFE80> <hamza>;<BAS>;<AIS>;IGNORE
-<UFE83> <hamza>;<AHA>;<AIS>;IGNORE
-<UFE84> <hamza>;<AHA>;<AFI>;IGNORE
-<UFE87> <hamza>;<AHS>;<AIS>;IGNORE
-<UFE88> <hamza>;<AHS>;<AFI>;IGNORE
-<UFE85> <hamza>;<AHW>;<AIS>;IGNORE
-<UFE86> <hamza>;<AHW>;<AFI>;IGNORE
-<U0689> <hamza>;<AHY>;<AIS>;IGNORE
-<U068A> <hamza>;<AHY>;<AFI>;IGNORE
-reorder-after <UFEAE>
-<UFDFC> "<reh><yeh><alef><lam>";"<LIG><LIG><LIG><LIG>";"<AII><AME><AFI><AIS>";IGNORE % Rial Sign
-reorder-after <UFED8>
-<UFB8E> <kaf>;<BAS>;<AIS>;IGNORE
-<UFB8F> <kaf>;<BAS>;<AFI>;IGNORE
-<UFB90> <kaf>;<BAS>;<AII>;IGNORE
-<UFB91> <kaf>;<BAS>;<AME>;IGNORE
-<UFED9> <kaf>;<PCL>;<AIS>;IGNORE
-<UFEDA> <kaf>;<PCL>;<AFI>;IGNORE
-<UFEDB> <kaf>;<PCL>;<AII>;IGNORE
-<UFEDC> <kaf>;<PCL>;<AME>;IGNORE
-reorder-after <UFEEE>
-<UFEE9> <heh>;<BAS>;<AIS>;IGNORE
-<UFEEA> <heh>;<BAS>;<AFI>;IGNORE
-<UFEEB> <heh>;<BAS>;<AII>;IGNORE
-<UFEEC> <heh>;<BAS>;<AME>;IGNORE
-<UFE93> <heh>;<ADO>;<AIS>;IGNORE
-<UFE94> <heh>;<ADO>;<AFI>;IGNORE
-<UFBA4> <heh>;<AHA>;<AIS>;IGNORE
-<UFBA5> <heh>;<AHA>;<AFI>;IGNORE
-<UFBFC> <yeh>;<BAS>;<AIS>;IGNORE
-<UFBFD> <yeh>;<BAS>;<AFI>;IGNORE
-<UFBFE> <yeh>;<BAS>;<AII>;IGNORE
-<UFBFF> <yeh>;<BAS>;<AME>;IGNORE
-<UFEEF> <yeh>;<ADL>;<AIS>;IGNORE
-<UFEF0> <yeh>;<ADL>;<AFI>;IGNORE
-<UFEF1> <yeh>;<AYE>;<AIS>;IGNORE
-<UFEF2> <yeh>;<AYE>;<AFI>;IGNORE
-<UFEF3> <yeh>;<AYE>;<AII>;IGNORE
-<UFEF4> <yeh>;<AYE>;<AME>;IGNORE
-<UFEF5> "<lam><alefmadda>";"<BAS><BAS>";"<AIS><AFI>";IGNORE
-<UFEF6> "<lam><alefmadda>";"<BAS><BAS>";"<AFI><AFI>";IGNORE
-<UFEF7> "<lam><hamza>";"<BAS><AHA>";"<AIS><AFI>";IGNORE
-<UFEF8> "<lam><hamza>";"<BAS><AHA>";"<AFI><AFI>";IGNORE
-<UFEF9> "<lam><hamza>";"<BAS><AHS>";"<AIS><AFI>";IGNORE
-<UFEFA> "<lam><hamza>";"<BAS><AHS>";"<AFI><AFI>";IGNORE
-<UFEFB> "<lam><alef>";"<BAS><BAS>";"<AIS><AFI>";IGNORE
-<UFEFC> "<lam><alef>";"<BAS><BAS>";"<AFI><AFI>";IGNORE
 reorder-end

 END LC_COLLATE
--- a/localedata/locales/fi_FI
+++ b/localedata/locales/fi_FI
@ -58,75 +58,116 @@ END LC_IDENTIFICATION
 LC_COLLATE
 copy "iso14651_t1"

+% CLDR collation rules for Finnish:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/fi.xml)
+%
+% <collation type="traditional">
+%   <!-- v and w used to be only secondary-different. -->
+%   <cr><![CDATA[
+%     &D<<ð<<<Ð<<đ<<<Đ
+%     &N<<ŋ<<<Ŋ
+%     &T<<þ/h<<<Þ/h
+%     &V<<w<<<W
+%     &Y<<ü<<<Ü<<ű<<<Ű
+%     &[before 1]ǀ<å<<<Å<ä<<<Ä<<æ<<<Æ<ö<<<Ö<<ø<<<Ø<<ő<<<Ő<<õ<<<Õ<<œ<<<Œ
+%   ]]></cr>
+% </collation>
+% <collation type="standard">
+%   <!-- Standard computer ordering: SFS-EN 13710 -->
+%   <cr><![CDATA[
+%     # D and U+0335 COMBINING SHORT STROKE OVERLAY
+%     &D\u0335<<đ<<<Đ  # root order: d\u0335=đ
+%     # G and U+0335
+%     &G\u0335<<ǥ<<<Ǥ
+%     # N and U+0335
+%     &N\u0335<<ŋ<<<Ŋ
+%     # T and U+0335
+%     &T\u0335<<ŧ<<<Ŧ
+%     &Y<<ü<<<Ü
+%     # Z and U+0335
+%     &Z\u0335<<ʒ<<<Ʒ
+%     &[before 1]ǀ<å<<<Å<ä<<<Ä<<æ<<<Æ<ö<<<Ö<<ø<<<Ø
+%   ]]></cr>
+% </collation>
+% And CLDR also lists the following
+% index characters:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/main/fi.xml)
+%
+% <exemplarCharacters type="index">[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Å Ä Ö]</exemplarCharacters>
+%
+% The following rules implement the “standard” order for glibc.
+
 collating-symbol <a-ring>
-collating-symbol <a-diaerisis>
-collating-symbol <o-diaerisis>
+collating-symbol <a-diaeresis>
+collating-symbol <o-diaeresis>

-reorder-after <z>
+collating-element <d-combining-short-stroke-overlay> from "d<U0335>"
+collating-element <D-combining-short-stroke-overlay> from "D<U0335>"
+collating-element <g-combining-short-stroke-overlay> from "g<U0335>"
+collating-element <G-combining-short-stroke-overlay> from "G<U0335>"
+collating-element <n-combining-short-stroke-overlay> from "n<U0335>"
+collating-element <N-combining-short-stroke-overlay> from "N<U0335>"
+collating-element <t-combining-short-stroke-overlay> from "t<U0335>"
+collating-element <T-combining-short-stroke-overlay> from "T<U0335>"
+collating-element <z-combining-short-stroke-overlay> from "z<U0335>"
+collating-element <Z-combining-short-stroke-overlay> from "Z<U0335>"
+
+% &[before 1]ǀ<å<<<Å<ä<<<Ä<<æ<<<Æ<ö<<<Ö<<ø<<<Ø
+reorder-after <AFTER-LATIN>
 <a-ring>
-<a-diaerisis>
-<o-diaerisis>
+<a-diaeresis>
+<o-diaeresis>

-reorder-after <U007A>
-<U00E5> <a-ring>;<BAS>;<MIN>;IGNORE
-<U01FB> <a-ring>;<ACA>;<MIN>;IGNORE
-<U00E4> <a-diaerisis>;<BAS>;<MIN>;IGNORE
-<U00E6> <a-diaerisis>;<REU>;<MIN>;IGNORE
-<U01FD> <a-diaerisis>;<U01FD>;<MIN>;IGNORE
-<U01E3> <a-diaerisis>;<MAC>;<MIN>;IGNORE
-<U00F6> <o-diaerisis>;<BAS>;<MIN>;IGNORE
-<U00F8> <o-diaerisis>;<U00D8>;<MIN>;IGNORE
-<U01FF> <o-diaerisis>;<U01FF>;<MIN>;IGNORE
-<U00F5> <o-diaerisis>;<TIL>;<MIN>;IGNORE
-reorder-after <U005A>
-<U00C5> <a-ring>;<BAS>;<CAP>;IGNORE
-<U01FA> <a-ring>;<ACA>;<CAP>;IGNORE
-<U00C4> <a-diaerisis>;<BAS>;<CAP>;IGNORE
-<U00C6> <a-diaerisis>;<REU>;<CAP>;IGNORE
-<U01FC> <a-diaerisis>;<U01FD>;<CAP>;IGNORE
-<U01E2> <a-diaerisis>;<MAC>;<CAP>;IGNORE
-<U00D6> <o-diaerisis>;<BAS>;<CAP>;IGNORE
-<U00D8> <o-diaerisis>;<U00D8>;<CAP>;IGNORE
-<U01FE> <o-diaerisis>;<U01FF>;<CAP>;IGNORE
-<U00D5> <o-diaerisis>;<TIL>;<CAP>;IGNORE
+% # D and U+0335 COMBINING SHORT STROKE OVERLAY
+% &D\u0335<<đ<<<Đ  # root order: d\u0335=đ
+<d-combining-short-stroke-overlay> <S0064>;"<BASE><VRNT1>";"<MIN><MIN>";IGNORE
+<D-combining-short-stroke-overlay> <S0064>;"<BASE><VRNT1>";"<CAP><MIN>";IGNORE
+<U0111> <S0064>;"<BASE><VRNT2>";"<MIN><MIN>";IGNORE % đ
+<U0110> <S0064>;"<BASE><VRNT2>";"<CAP><MIN>";IGNORE % Đ

-reorder-after <U016B>
-<U0076> <v>;<U0056>;<BAS>;<MIN>
-<U1E7D> <v>;<U0056>;<TIL>;<MIN>
-<U0077> <w>;<U0057>;<BAS>;<MIN>
-<U1E83> <w>;<U0057>;<ACA>;<MIN>
-<U1E81> <w>;<U0057>;<GRA>;<MIN>
-<U0175> <w>;<U0057>;<CIR>;<MIN>
-<U1E85> <w>;<U0057>;<REU>;<MIN>
-<U1E87> <w>;<U0057>;<PCT>;<MIN>
-reorder-after <U016A>
-<U0056> <v>;<U0056>;<BAS>;<CAP>
-<U1E7C> <v>;<U0056>;<TIL>;<CAP>
-<U0057> <w>;<U0057>;<BAS>;<CAP>
-<U1E82> <w>;<U0057>;<ACA>;<CAP>
-<U1E80> <w>;<U0057>;<GRA>;<CAP>
-<U0174> <w>;<U0057>;<CIR>;<CAP>
-<U1E84> <w>;<U0057>;<REU>;<CAP>
-<U1E86> <w>;<U0057>;<PCT>;<CAP>
+% # G and U+0335
+% &G\u0335<<ǥ<<<Ǥ
+<g-combining-short-stroke-overlay> <S0067>;"<BASE><VRNT1>";"<MIN><MIN>";IGNORE
+<G-combining-short-stroke-overlay> <S0067>;"<BASE><VRNT1>";"<CAP><MIN>";IGNORE
+<U01E5> <S0067>;"<BASE><VRNT2>";"<MIN><MIN>";IGNORE % ǥ
+<U01E4> <S0067>;"<BASE><VRNT2>";"<CAP><MIN>";IGNORE % Ǥ

-reorder-after <U00FF>
-<U00FC> <y>;<DTT>;<MIN>;IGNORE
-reorder-after <U0178>
-<U00DC> <y>;<DTT>;<CAP>;IGNORE
+% # N and U+0335
+% &N\u0335<<ŋ<<<Ŋ
+<n-combining-short-stroke-overlay> <S014B>;"<BASE><VRNT1>";"<MIN><MIN>";IGNORE
+<N-combining-short-stroke-overlay> <S014B>;"<BASE><VRNT1>";"<CAP><MIN>";IGNORE
+<U014B> <S014B>;"<BASE><VRNT2>";"<MIN><MIN>";IGNORE % LATIN SMALL LETTER ENG
+<U014A> <S014B>;"<BASE><VRNT2>";"<CAP><MIN>";IGNORE % LATIN CAPITAL LETTER ENG

-%  Present in iso14651_t1, but these definitions seem to have been
-%  removed from latest iso14651 tables.
-reorder-after <U0163>
-<U00FE> "<t><h>";"<LIG><LIG>";"<MIN><MIN>";IGNORE
-reorder-after <U0162>
-<U00DE> "<t><h>";"<LIG><LIG>";"<CAP><CAP>";IGNORE
+% # T and U+0335
+% &T\u0335<<ŧ<<<Ŧ
+<t-combining-short-stroke-overlay> <S0167>;"<BASE><VRNT1>";"<MIN><MIN>";IGNORE
+<T-combining-short-stroke-overlay> <S0167>;"<BASE><VRNT1>";"<CAP><MIN>";IGNORE
+<U0167> <S0167>;"<BASE><VRNT2>";"<MIN><MIN>";IGNORE % LATIN SMALL LETTER T WITH STROKE
+<U0166> <S0167>;"<BASE><VRNT2>";"<CAP><MIN>";IGNORE % LATIN CAPITAL LETTER T WITH STROKE

-reorder-after <U0064>
-<U00F0> <d>;<PCL>;<MIN>;IGNORE
-<U0111> <d>;<OBL>;<MIN>;IGNORE
-reorder-after <U0044>
-<U00D0> <d>;<PCL>;<CAP>;IGNORE
-<U0110> <d>;<OBL>;<CAP>;IGNORE
+% &Y<<ü<<<Ü
+<U00FC> <S0079>;"<BASE><TREMA>";"<MIN><MIN>";IGNORE % ü
+<U00DC> <S0079>;"<BASE><TREMA>";"<CAP><MIN>";IGNORE % Ü
+
+% # Z and U+0335
+% &Z\u0335<<ʒ<<<Ʒ
+<z-combining-short-stroke-overlay> <S0292>;"<BASE><VRNT1>";"<MIN><MIN>";IGNORE
+<Z-combining-short-stroke-overlay> <S0292>;"<BASE><VRNT1>";"<CAP><MIN>";IGNORE
+<U0292> <S0292>;"<BASE><VRNT2>";"<MIN><MIN>";IGNORE % LATIN SMALL LETTER EZH
+<U01B7> <S0292>;"<BASE><VRNT2>";"<CAP><MIN>";IGNORE % LATIN CAPITAL LETTER EZH
+
+% &[before 1]ǀ<å<<<Å<ä<<<Ä<<æ<<<Æ<ö<<<Ö<<ø<<<Ø
+<U00E5> <a-ring>;"<BASE><BASE>";"<MIN><MIN>";<U00E5> % LATIN SMALL LETTER A WITH RING ABOVE
+<U00C5> <a-ring>;"<BASE><BASE>";"<CAP><MIN>";<U00C5> % LATIN CAPITAL LETTER A WITH RING ABOVE
+<U00E4> <a-diaeresis>;"<BASE><BASE>";"<MIN><MIN>";<U00E4> % LATIN SMALL LETTER A WITH DIAERESIS
+<U00C4> <a-diaeresis>;"<BASE><BASE>";"<CAP><MIN>";<U00C4> % LATIN CAPITAL LETTER A WITH DIAERESIS
+<U00E6> "<a-diaeresis>";"<BASE><VRNT1><BASE>";"<COMPAT><COMPAT><COMPAT>";<U00E6> % LATIN SMALL LETTER AE
+<U00C6> "<a-diaeresis>";"<BASE><VRNT1><BASE>";"<COMPATCAP><COMPAT><COMPATCAP>";<U00C6> % LATIN CAPITAL LETTER AE
+<U00F6> <o-diaeresis>;"<BASE><BASE>";"<MIN><MIN>";<U00F6> % LATIN SMALL LETTER O WITH DIAERESIS
+<U00D6> <o-diaeresis>;"<BASE><BASE>";"<CAP><MIN>";<U00D6> % LATIN CAPITAL LETTER O WITH DIAERESIS
+<U00F8> <o-diaeresis>;"<BASE><OBLIK>";"<MIN><MIN>";<U00F8> % LATIN SMALL LETTER O WITH STROKE
+<U00D8> <o-diaeresis>;"<BASE><OBLIK>";"<CAP><MIN>";<U00D8> % LATIN CAPITAL LETTER O WITH STROKE

 reorder-end
 END LC_COLLATE
--- a/localedata/locales/fil_PH
+++ b/localedata/locales/fil_PH
@ -49,37 +49,42 @@ copy "tl_PH"
 END LC_CTYPE

 LC_COLLATE
+% CLDR collation rules for Filipino:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/fil.xml)
+%
+% <collation type="standard" references="http://std.dkuug.dk/jtc1/sc2/wg2/docs/N2300.htm (N2165)">
+% 	<cr><![CDATA[
+% 		&N<ñ<<<Ñ<ng<<<Ng<<<NG
+% 	]]></cr>
+% </collation>
+%
+% And CLDR also lists the following
+% index characters:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/main/fil.xml)
+%
+% <exemplarCharacters type="index">[A B C D E F G H I J K L M N Ñ {Ng} O P Q R S T U V W X Y Z]</exemplarCharacters>
+%
+% The following rules implement the same order for glibc.
+
 copy "iso14651_t1"

-% a b c d e f g h i j k l m n n~ ng o p q r s t u v w x y z
-
-collating-symbol  <n-g-ph>
-collating-element <N-G> from "<U004E><U0047>"
-collating-element <n-g> from "<U006E><U0067>"
-collating-element <N-g> from "<U004E><U0067>"
-collating-element <n-G> from "<U006E><U0047>"
 collating-symbol  <ntilde>
+collating-symbol  <ng-digraph>
+collating-element <ng> from "ng"
+collating-element <nG> from "nG"
+collating-element <Ng> from "Ng"
+collating-element <NG> from "NG"

-collating-symbol <CAP-MIN>
-collating-symbol <MIN-CAP>
-
-reorder-after <MIN>
-<MIN-CAP>
-reorder-after <CAP>
-<CAP-MIN>
-
-reorder-after <n>
+reorder-after <AFTER-N>
 <ntilde>
-<n-g-ph>
+<ng-digraph>

-reorder-after <U006E>
-<U00F1> <ntilde>;<TIL>;<MIN>;IGNORE
-<n-g>	<n-g-ph>;<PCT>;<MIN>;IGNORE
-<n-G>	<n-g-ph>;<PCT>;<MIN-CAP>;IGNORE
-reorder-after <U004E>
-<U00D1> <ntilde>;<TIL>;<CAP>;IGNORE
-<N-G>	<n-g-ph>;<PCT>;<CAP>;IGNORE
-<N-g>	<n-g-ph>;<PCT>;<CAP-MIN>;IGNORE
+<U00F1> <ntilde>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ñ
+<U00D1> <ntilde>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ñ
+<ng>	<ng-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<nG>	<ng-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<NG>	<ng-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<Ng>	<ng-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE

 reorder-end

--- a/localedata/locales/fur_IT
+++ b/localedata/locales/fur_IT
@ -47,17 +47,18 @@ copy "it_IT"
 END LC_CTYPE

 LC_COLLATE
+% There is no collation information for Furlan in CLDR.
+%
+% We implement only this rule here: &C<ç<<<Ç
 copy "iso14651_t1"

-collating-symbol <c,>
+collating-symbol <c-cedilla>

-reorder-after <c>
-<c,>
+reorder-after <AFTER-C>
+<c-cedilla>

-reorder-after <U0063>
-<U00E7> <c,>;<CDI>;<MIN>;IGNORE
-reorder-after <U0043>
-<U00C7> <c,>;<CDI>;<CAP>;IGNORE
+<U00E7> <c-cedilla>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ç
+<U00C7> <c-cedilla>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ç

 reorder-end

--- a/localedata/locales/gez_ER@abegede
+++ b/localedata/locales/gez_ER@abegede
@ -58,51 +58,374 @@ END LC_IDENTIFICATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

 LC_COLLATE
-%
-% Import Halehame and Resequence:
-%
 copy "ti_ER"
-%
-reorder-after <th>
-<ALEF>
-<BET>
-<VE-BET>
-<GEMEL>
-<NGE-GEMEL>
-<DINT>
-<DHI-DINT>
-<JI-DINT>
-<HOY>
-<WEWE>
-<ZEY>
-<ZHE-ZEY>
-<HAWT>
-<TEYT>
-<CHE-TEYT>
-<YEMEN>
-<KAF>
-<KHA-KAF>
-<LAWI>
-<MAY>
-<NEHAS>
-<NYE-NEHAS>
-<SEWT>
-<AYIN>
-<AF>
-<SEDEY>
-<QAF>
-<QHA-QAF>
-<RIS>
-<SAT>
-<SHA-SAT>
-<TAW>
-<CHA-TAW>
-<HARM>
-<SEPA>
-<PEYT>
-<PSA>
+reorder-after <BEFORE-LATIN>
+<S12A0> % ETHIOPIC SYLLABLE GLOTTAL A old glibc collation-symbol: <ALEF>
+<S12A1> % ETHIOPIC SYLLABLE GLOTTAL U old glibc collation-symbol: <ALEF>
+<S12A2> % ETHIOPIC SYLLABLE GLOTTAL I old glibc collation-symbol: <ALEF>
+<S12A3> % ETHIOPIC SYLLABLE GLOTTAL AA old glibc collation-symbol: <ALEF>
+<S12A4> % ETHIOPIC SYLLABLE GLOTTAL EE old glibc collation-symbol: <ALEF>
+<S12A5> % ETHIOPIC SYLLABLE GLOTTAL E old glibc collation-symbol: <ALEF>
+<S12A6> % ETHIOPIC SYLLABLE GLOTTAL O old glibc collation-symbol: <ALEF>
+<S12A7> % ETHIOPIC SYLLABLE GLOTTAL WA old glibc collation-symbol: <ALEF>
+<S1260> % ETHIOPIC SYLLABLE BA old glibc collation-symbol: <BET>
+<S1261> % ETHIOPIC SYLLABLE BU old glibc collation-symbol: <BET>
+<S1262> % ETHIOPIC SYLLABLE BI old glibc collation-symbol: <BET>
+<S1263> % ETHIOPIC SYLLABLE BAA old glibc collation-symbol: <BET>
+<S1264> % ETHIOPIC SYLLABLE BEE old glibc collation-symbol: <BET>
+<S1265> % ETHIOPIC SYLLABLE BE old glibc collation-symbol: <BET>
+<S1266> % ETHIOPIC SYLLABLE BO old glibc collation-symbol: <BET>
+<S1267> % ETHIOPIC SYLLABLE BWA old glibc collation-symbol: <BET>
+<S1384> % ETHIOPIC SYLLABLE SEBATBEIT BWA old glibc collation-symbol: <BET>
+<S1385> % ETHIOPIC SYLLABLE BWI old glibc collation-symbol: <BET>
+<S1386> % ETHIOPIC SYLLABLE BWEE old glibc collation-symbol: <BET>
+<S1387> % ETHIOPIC SYLLABLE BWE old glibc collation-symbol: <BET>
+<S2D85> % ETHIOPIC SYLLABLE BOA old glibc collation-symbol: <BET>
+<S1268> % ETHIOPIC SYLLABLE VA old glibc collation-symbol: <VE-BET>
+<S1269> % ETHIOPIC SYLLABLE VU old glibc collation-symbol: <VE-BET>
+<S126A> % ETHIOPIC SYLLABLE VI old glibc collation-symbol: <VE-BET>
+<S126B> % ETHIOPIC SYLLABLE VAA old glibc collation-symbol: <VE-BET>
+<S126C> % ETHIOPIC SYLLABLE VEE old glibc collation-symbol: <VE-BET>
+<S126D> % ETHIOPIC SYLLABLE VE old glibc collation-symbol: <VE-BET>
+<S126E> % ETHIOPIC SYLLABLE VO old glibc collation-symbol: <VE-BET>
+<S126F> % ETHIOPIC SYLLABLE VWA old glibc collation-symbol: <VE-BET>
+<S1308> % ETHIOPIC SYLLABLE GA old glibc collation-symbol: <GEMEL>
+<S1309> % ETHIOPIC SYLLABLE GU old glibc collation-symbol: <GEMEL>
+<S130A> % ETHIOPIC SYLLABLE GI old glibc collation-symbol: <GEMEL>
+<S130B> % ETHIOPIC SYLLABLE GAA old glibc collation-symbol: <GEMEL>
+<S130C> % ETHIOPIC SYLLABLE GEE old glibc collation-symbol: <GEMEL>
+<S130D> % ETHIOPIC SYLLABLE GE old glibc collation-symbol: <GEMEL>
+<S130E> % ETHIOPIC SYLLABLE GO old glibc collation-symbol: <GEMEL>
+<S130F> % ETHIOPIC SYLLABLE GOA old glibc collation-symbol: <GEMEL>
+<S1310> % ETHIOPIC SYLLABLE GWA old glibc collation-symbol: <GEMEL>
+<S1312> % ETHIOPIC SYLLABLE GWI old glibc collation-symbol: <GEMEL>
+<S1313> % ETHIOPIC SYLLABLE GWAA old glibc collation-symbol: <GEMEL>
+<S1314> % ETHIOPIC SYLLABLE GWEE old glibc collation-symbol: <GEMEL>
+<S1315> % ETHIOPIC SYLLABLE GWE old glibc collation-symbol: <GEMEL>
+<S1318> % ETHIOPIC SYLLABLE GGA old glibc collation-symbol: <NGE-GEMEL>
+<S1319> % ETHIOPIC SYLLABLE GGU old glibc collation-symbol: <NGE-GEMEL>
+<S131A> % ETHIOPIC SYLLABLE GGI old glibc collation-symbol: <NGE-GEMEL>
+<S131B> % ETHIOPIC SYLLABLE GGAA old glibc collation-symbol: <NGE-GEMEL>
+<S131C> % ETHIOPIC SYLLABLE GGEE old glibc collation-symbol: <NGE-GEMEL>
+<S131D> % ETHIOPIC SYLLABLE GGE old glibc collation-symbol: <NGE-GEMEL>
+<S131E> % ETHIOPIC SYLLABLE GGO old glibc collation-symbol: <NGE-GEMEL>
+<S131F> % ETHIOPIC SYLLABLE GGWAA old glibc collation-symbol: <NGE-GEMEL>
+<S2D93> % ETHIOPIC SYLLABLE GGWA old glibc collation-symbol: <NGE-GEMEL>
+<S2D94> % ETHIOPIC SYLLABLE GGWI old glibc collation-symbol: <NGE-GEMEL>
+<S2D95> % ETHIOPIC SYLLABLE GGWEE old glibc collation-symbol: <NGE-GEMEL>
+<S2D96> % ETHIOPIC SYLLABLE GGWE old glibc collation-symbol: <NGE-GEMEL>
+<S12F0> % ETHIOPIC SYLLABLE DA old glibc collation-symbol: <DINT>
+<S12F1> % ETHIOPIC SYLLABLE DU old glibc collation-symbol: <DINT>
+<S12F2> % ETHIOPIC SYLLABLE DI old glibc collation-symbol: <DINT>
+<S12F3> % ETHIOPIC SYLLABLE DAA old glibc collation-symbol: <DINT>
+<S12F4> % ETHIOPIC SYLLABLE DEE old glibc collation-symbol: <DINT>
+<S12F5> % ETHIOPIC SYLLABLE DE old glibc collation-symbol: <DINT>
+<S12F6> % ETHIOPIC SYLLABLE DO old glibc collation-symbol: <DINT>
+<S12F7> % ETHIOPIC SYLLABLE DWA old glibc collation-symbol: <DINT>
+<S2D8C> % ETHIOPIC SYLLABLE DOA old glibc collation-symbol: <DINT>
+<SAB09> % ETHIOPIC SYLLABLE DDHU old glibc collation-symbol: <DHI-DINT>
+<SAB0A> % ETHIOPIC SYLLABLE DDHI old glibc collation-symbol: <DHI-DINT>
+<SAB0B> % ETHIOPIC SYLLABLE DDHAA old glibc collation-symbol: <DHI-DINT>
+<SAB0C> % ETHIOPIC SYLLABLE DDHEE old glibc collation-symbol: <DHI-DINT>
+<SAB0D> % ETHIOPIC SYLLABLE DDHE old glibc collation-symbol: <DHI-DINT>
+<SAB0E> % ETHIOPIC SYLLABLE DDHO old glibc collation-symbol: <DHI-DINT>
+<S12F8> % ETHIOPIC SYLLABLE DDA old glibc collation-symbol: <DHI-DINT>
+<S12F9> % ETHIOPIC SYLLABLE DDU old glibc collation-symbol: <DHI-DINT>
+<S12FA> % ETHIOPIC SYLLABLE DDI old glibc collation-symbol: <DHI-DINT>
+<S12FB> % ETHIOPIC SYLLABLE DDAA old glibc collation-symbol: <DHI-DINT>
+<S12FC> % ETHIOPIC SYLLABLE DDEE old glibc collation-symbol: <DHI-DINT>
+<S12FD> % ETHIOPIC SYLLABLE DDE old glibc collation-symbol: <DHI-DINT>
+<S12FE> % ETHIOPIC SYLLABLE DDO old glibc collation-symbol: <DHI-DINT>
+<S12FF> % ETHIOPIC SYLLABLE DDWA old glibc collation-symbol: <DHI-DINT>
+<S1300> % ETHIOPIC SYLLABLE JA old glibc collation-symbol: <JI-DINT>
+<S1301> % ETHIOPIC SYLLABLE JU old glibc collation-symbol: <JI-DINT>
+<S1302> % ETHIOPIC SYLLABLE JI old glibc collation-symbol: <JI-DINT>
+<S1303> % ETHIOPIC SYLLABLE JAA old glibc collation-symbol: <JI-DINT>
+<S1304> % ETHIOPIC SYLLABLE JEE old glibc collation-symbol: <JI-DINT>
+<S1305> % ETHIOPIC SYLLABLE JE old glibc collation-symbol: <JI-DINT>
+<S1306> % ETHIOPIC SYLLABLE JO old glibc collation-symbol: <JI-DINT>
+<S1307> % ETHIOPIC SYLLABLE JWA old glibc collation-symbol: <JI-DINT>
+<S2D8E> % ETHIOPIC SYLLABLE JOA old glibc collation-symbol: <JI-DINT>
+<S1200> % ETHIOPIC SYLLABLE HA old glibc collation-symbol: <HOY>
+<S1201> % ETHIOPIC SYLLABLE HU old glibc collation-symbol: <HOY>
+<S1202> % ETHIOPIC SYLLABLE HI old glibc collation-symbol: <HOY>
+<S1203> % ETHIOPIC SYLLABLE HAA old glibc collation-symbol: <HOY>
+<S1204> % ETHIOPIC SYLLABLE HEE old glibc collation-symbol: <HOY>
+<S1205> % ETHIOPIC SYLLABLE HE old glibc collation-symbol: <HOY>
+<S1206> % ETHIOPIC SYLLABLE HO old glibc collation-symbol: <HOY>
+<S1207> % ETHIOPIC SYLLABLE HOA old glibc collation-symbol: <HOY>
+<S12C8> % ETHIOPIC SYLLABLE WA old glibc collation-symbol: <WEWE>
+<S12C9> % ETHIOPIC SYLLABLE WU old glibc collation-symbol: <WEWE>
+<S12CA> % ETHIOPIC SYLLABLE WI old glibc collation-symbol: <WEWE>
+<S12CB> % ETHIOPIC SYLLABLE WAA old glibc collation-symbol: <WEWE>
+<S12CC> % ETHIOPIC SYLLABLE WEE old glibc collation-symbol: <WEWE>
+<S12CD> % ETHIOPIC SYLLABLE WE old glibc collation-symbol: <WEWE>
+<S12CE> % ETHIOPIC SYLLABLE WO old glibc collation-symbol: <WEWE>
+<S12CF> % ETHIOPIC SYLLABLE WOA old glibc collation-symbol: <WEWE>
+<S12D8> % ETHIOPIC SYLLABLE ZA old glibc collation-symbol: <ZEY>
+<S12D9> % ETHIOPIC SYLLABLE ZU old glibc collation-symbol: <ZEY>
+<S12DA> % ETHIOPIC SYLLABLE ZI old glibc collation-symbol: <ZEY>
+<S12DB> % ETHIOPIC SYLLABLE ZAA old glibc collation-symbol: <ZEY>
+<S12DC> % ETHIOPIC SYLLABLE ZEE old glibc collation-symbol: <ZEY>
+<S12DD> % ETHIOPIC SYLLABLE ZE old glibc collation-symbol: <ZEY>
+<S12DE> % ETHIOPIC SYLLABLE ZO old glibc collation-symbol: <ZEY>
+<S12DF> % ETHIOPIC SYLLABLE ZWA old glibc collation-symbol: <ZEY>
+<S2D8B> % ETHIOPIC SYLLABLE ZOA old glibc collation-symbol: <ZEY>
+<S12E0> % ETHIOPIC SYLLABLE ZHA old glibc collation-symbol: <ZHE-ZEY>
+<S12E1> % ETHIOPIC SYLLABLE ZHU old glibc collation-symbol: <ZHE-ZEY>
+<S12E2> % ETHIOPIC SYLLABLE ZHI old glibc collation-symbol: <ZHE-ZEY>
+<S12E3> % ETHIOPIC SYLLABLE ZHAA old glibc collation-symbol: <ZHE-ZEY>
+<S12E4> % ETHIOPIC SYLLABLE ZHEE old glibc collation-symbol: <ZHE-ZEY>
+<S12E5> % ETHIOPIC SYLLABLE ZHE old glibc collation-symbol: <ZHE-ZEY>
+<S12E6> % ETHIOPIC SYLLABLE ZHO old glibc collation-symbol: <ZHE-ZEY>
+<S12E7> % ETHIOPIC SYLLABLE ZHWA old glibc collation-symbol: <ZHE-ZEY>
+<S1210> % ETHIOPIC SYLLABLE HHA old glibc collation-symbol: <HAWT>
+<S1211> % ETHIOPIC SYLLABLE HHU old glibc collation-symbol: <HAWT>
+<S1212> % ETHIOPIC SYLLABLE HHI old glibc collation-symbol: <HAWT>
+<S1213> % ETHIOPIC SYLLABLE HHAA old glibc collation-symbol: <HAWT>
+<S1214> % ETHIOPIC SYLLABLE HHEE old glibc collation-symbol: <HAWT>
+<S1215> % ETHIOPIC SYLLABLE HHE old glibc collation-symbol: <HAWT>
+<S1216> % ETHIOPIC SYLLABLE HHO old glibc collation-symbol: <HAWT>
+<S1217> % ETHIOPIC SYLLABLE HHWA old glibc collation-symbol: <HAWT>
+<S1320> % ETHIOPIC SYLLABLE THA old glibc collation-symbol: <TEYT>
+<S1321> % ETHIOPIC SYLLABLE THU old glibc collation-symbol: <TEYT>
+<S1322> % ETHIOPIC SYLLABLE THI old glibc collation-symbol: <TEYT>
+<S1323> % ETHIOPIC SYLLABLE THAA old glibc collation-symbol: <TEYT>
+<S1324> % ETHIOPIC SYLLABLE THEE old glibc collation-symbol: <TEYT>
+<S1325> % ETHIOPIC SYLLABLE THE old glibc collation-symbol: <TEYT>
+<S1326> % ETHIOPIC SYLLABLE THO old glibc collation-symbol: <TEYT>
+<S1327> % ETHIOPIC SYLLABLE THWA old glibc collation-symbol: <TEYT>
+<S2D8F> % ETHIOPIC SYLLABLE THOA old glibc collation-symbol: <TEYT>
+<S1328> % ETHIOPIC SYLLABLE CHA old glibc collation-symbol: <CHE-TEYT>
+<S1329> % ETHIOPIC SYLLABLE CHU old glibc collation-symbol: <CHE-TEYT>
+<S132A> % ETHIOPIC SYLLABLE CHI old glibc collation-symbol: <CHE-TEYT>
+<S132B> % ETHIOPIC SYLLABLE CHAA old glibc collation-symbol: <CHE-TEYT>
+<S132C> % ETHIOPIC SYLLABLE CHEE old glibc collation-symbol: <CHE-TEYT>
+<S132D> % ETHIOPIC SYLLABLE CHE old glibc collation-symbol: <CHE-TEYT>
+<S132E> % ETHIOPIC SYLLABLE CHO old glibc collation-symbol: <CHE-TEYT>
+<S132F> % ETHIOPIC SYLLABLE CHWA old glibc collation-symbol: <CHE-TEYT>
+<S2D90> % ETHIOPIC SYLLABLE CHOA old glibc collation-symbol: <CHE-TEYT>
+<SAB20> % ETHIOPIC SYLLABLE CCHHA old glibc collation-symbol: <CHE-TEYT>
+<SAB21> % ETHIOPIC SYLLABLE CCHHU old glibc collation-symbol: <CHE-TEYT>
+<SAB22> % ETHIOPIC SYLLABLE CCHHI old glibc collation-symbol: <CHE-TEYT>
+<SAB23> % ETHIOPIC SYLLABLE CCHHAA old glibc collation-symbol: <CHE-TEYT>
+<SAB24> % ETHIOPIC SYLLABLE CCHHEE old glibc collation-symbol: <CHE-TEYT>
+<SAB25> % ETHIOPIC SYLLABLE CCHHE old glibc collation-symbol: <CHE-TEYT>
+<SAB26> % ETHIOPIC SYLLABLE CCHHO old glibc collation-symbol: <CHE-TEYT>
+<S12E8> % ETHIOPIC SYLLABLE YA old glibc collation-symbol: <YEMEN>
+<S12E9> % ETHIOPIC SYLLABLE YU old glibc collation-symbol: <YEMEN>
+<S12EA> % ETHIOPIC SYLLABLE YI old glibc collation-symbol: <YEMEN>
+<S12EB> % ETHIOPIC SYLLABLE YAA old glibc collation-symbol: <YEMEN>
+<S12EC> % ETHIOPIC SYLLABLE YEE old glibc collation-symbol: <YEMEN>
+<S12ED> % ETHIOPIC SYLLABLE YE old glibc collation-symbol: <YEMEN>
+<S12EE> % ETHIOPIC SYLLABLE YO old glibc collation-symbol: <YEMEN>
+<S12EF> % ETHIOPIC SYLLABLE YOA old glibc collation-symbol: <YEMEN>
+<S12A8> % ETHIOPIC SYLLABLE KA old glibc collation-symbol: <KAF>
+<S12A9> % ETHIOPIC SYLLABLE KU old glibc collation-symbol: <KAF>
+<S12AA> % ETHIOPIC SYLLABLE KI old glibc collation-symbol: <KAF>
+<S12AB> % ETHIOPIC SYLLABLE KAA old glibc collation-symbol: <KAF>
+<S12AC> % ETHIOPIC SYLLABLE KEE old glibc collation-symbol: <KAF>
+<S12AD> % ETHIOPIC SYLLABLE KE old glibc collation-symbol: <KAF>
+<S12AE> % ETHIOPIC SYLLABLE KO old glibc collation-symbol: <KAF>
+<S12AF> % ETHIOPIC SYLLABLE KOA old glibc collation-symbol: <KAF>
+<S12B0> % ETHIOPIC SYLLABLE KWA old glibc collation-symbol: <KAF>
+<S12B2> % ETHIOPIC SYLLABLE KWI old glibc collation-symbol: <KAF>
+<S12B3> % ETHIOPIC SYLLABLE KWAA old glibc collation-symbol: <KAF>
+<S12B4> % ETHIOPIC SYLLABLE KWEE old glibc collation-symbol: <KAF>
+<S12B5> % ETHIOPIC SYLLABLE KWE old glibc collation-symbol: <KAF>
+<S12B8> % ETHIOPIC SYLLABLE KXA old glibc collation-symbol: <KHA-KAF>
+<S12B9> % ETHIOPIC SYLLABLE KXU old glibc collation-symbol: <KHA-KAF>
+<S12BA> % ETHIOPIC SYLLABLE KXI old glibc collation-symbol: <KHA-KAF>
+<S12BB> % ETHIOPIC SYLLABLE KXAA old glibc collation-symbol: <KHA-KAF>
+<S12BC> % ETHIOPIC SYLLABLE KXEE old glibc collation-symbol: <KHA-KAF>
+<S12BD> % ETHIOPIC SYLLABLE KXE old glibc collation-symbol: <KHA-KAF>
+<S12BE> % ETHIOPIC SYLLABLE KXO old glibc collation-symbol: <KHA-KAF>
+<S12C0> % ETHIOPIC SYLLABLE KXWA old glibc collation-symbol: <KHA-KAF>
+<S12C2> % ETHIOPIC SYLLABLE KXWI old glibc collation-symbol: <KHA-KAF>
+<S12C3> % ETHIOPIC SYLLABLE KXWAA old glibc collation-symbol: <KHA-KAF>
+<S12C4> % ETHIOPIC SYLLABLE KXWEE old glibc collation-symbol: <KHA-KAF>
+<S12C5> % ETHIOPIC SYLLABLE KXWE old glibc collation-symbol: <KHA-KAF>
+<S1208> % ETHIOPIC SYLLABLE LA old glibc collation-symbol: <LAWI>
+<S1209> % ETHIOPIC SYLLABLE LU old glibc collation-symbol: <LAWI>
+<S120A> % ETHIOPIC SYLLABLE LI old glibc collation-symbol: <LAWI>
+<S120B> % ETHIOPIC SYLLABLE LAA old glibc collation-symbol: <LAWI>
+<S120C> % ETHIOPIC SYLLABLE LEE old glibc collation-symbol: <LAWI>
+<S120D> % ETHIOPIC SYLLABLE LE old glibc collation-symbol: <LAWI>
+<S120E> % ETHIOPIC SYLLABLE LO old glibc collation-symbol: <LAWI>
+<S120F> % ETHIOPIC SYLLABLE LWA old glibc collation-symbol: <LAWI>
+<S2D80> % ETHIOPIC SYLLABLE LOA old glibc collation-symbol: <LAWI>
+<S1218> % ETHIOPIC SYLLABLE MA old glibc collation-symbol: <MAY>
+<S1219> % ETHIOPIC SYLLABLE MU old glibc collation-symbol: <MAY>
+<S121A> % ETHIOPIC SYLLABLE MI old glibc collation-symbol: <MAY>
+<S121B> % ETHIOPIC SYLLABLE MAA old glibc collation-symbol: <MAY>
+<S121C> % ETHIOPIC SYLLABLE MEE old glibc collation-symbol: <MAY>
+<S121D> % ETHIOPIC SYLLABLE ME old glibc collation-symbol: <MAY>
+<S121E> % ETHIOPIC SYLLABLE MO old glibc collation-symbol: <MAY>
+<S121F> % ETHIOPIC SYLLABLE MWA old glibc collation-symbol: <MAY>
+<S1380> % ETHIOPIC SYLLABLE SEBATBEIT MWA old glibc collation-symbol: <MAY>
+<S1381> % ETHIOPIC SYLLABLE MWI old glibc collation-symbol: <MAY>
+<S1382> % ETHIOPIC SYLLABLE MWEE old glibc collation-symbol: <MAY>
+<S1383> % ETHIOPIC SYLLABLE MWE old glibc collation-symbol: <MAY>
+<S2D81> % ETHIOPIC SYLLABLE MOA old glibc collation-symbol: <MAY>
+<S1290> % ETHIOPIC SYLLABLE NA old glibc collation-symbol: <NEHAS>
+<S1291> % ETHIOPIC SYLLABLE NU old glibc collation-symbol: <NEHAS>
+<S1292> % ETHIOPIC SYLLABLE NI old glibc collation-symbol: <NEHAS>
+<S1293> % ETHIOPIC SYLLABLE NAA old glibc collation-symbol: <NEHAS>
+<S1294> % ETHIOPIC SYLLABLE NEE old glibc collation-symbol: <NEHAS>
+<S1295> % ETHIOPIC SYLLABLE NE old glibc collation-symbol: <NEHAS>
+<S1296> % ETHIOPIC SYLLABLE NO old glibc collation-symbol: <NEHAS>
+<S1297> % ETHIOPIC SYLLABLE NWA old glibc collation-symbol: <NEHAS>
+<S2D88> % ETHIOPIC SYLLABLE NOA old glibc collation-symbol: <NEHAS>
+<S1298> % ETHIOPIC SYLLABLE NYA old glibc collation-symbol: <NYE-NEHAS>
+<S1299> % ETHIOPIC SYLLABLE NYU old glibc collation-symbol: <NYE-NEHAS>
+<S129A> % ETHIOPIC SYLLABLE NYI old glibc collation-symbol: <NYE-NEHAS>
+<S129B> % ETHIOPIC SYLLABLE NYAA old glibc collation-symbol: <NYE-NEHAS>
+<S129C> % ETHIOPIC SYLLABLE NYEE old glibc collation-symbol: <NYE-NEHAS>
+<S129D> % ETHIOPIC SYLLABLE NYE old glibc collation-symbol: <NYE-NEHAS>
+<S129E> % ETHIOPIC SYLLABLE NYO old glibc collation-symbol: <NYE-NEHAS>
+<S129F> % ETHIOPIC SYLLABLE NYWA old glibc collation-symbol: <NYE-NEHAS>
+<S2D89> % ETHIOPIC SYLLABLE NYOA old glibc collation-symbol: <NYE-NEHAS>
+<S1220> % ETHIOPIC SYLLABLE SZA old glibc collation-symbol: <SEWT>
+<S1221> % ETHIOPIC SYLLABLE SZU old glibc collation-symbol: <SEWT>
+<S1222> % ETHIOPIC SYLLABLE SZI old glibc collation-symbol: <SEWT>
+<S1223> % ETHIOPIC SYLLABLE SZAA old glibc collation-symbol: <SEWT>
+<S1224> % ETHIOPIC SYLLABLE SZEE old glibc collation-symbol: <SEWT>
+<S1225> % ETHIOPIC SYLLABLE SZE old glibc collation-symbol: <SEWT>
+<S1226> % ETHIOPIC SYLLABLE SZO old glibc collation-symbol: <SEWT>
+<S1227> % ETHIOPIC SYLLABLE SZWA old glibc collation-symbol: <SEWT>
+<S12D0> % ETHIOPIC SYLLABLE PHARYNGEAL A old glibc collation-symbol: <AYIN>
+<S12D1> % ETHIOPIC SYLLABLE PHARYNGEAL U old glibc collation-symbol: <AYIN>
+<S12D2> % ETHIOPIC SYLLABLE PHARYNGEAL I old glibc collation-symbol: <AYIN>
+<S12D3> % ETHIOPIC SYLLABLE PHARYNGEAL AA old glibc collation-symbol: <AYIN>
+<S12D4> % ETHIOPIC SYLLABLE PHARYNGEAL EE old glibc collation-symbol: <AYIN>
+<S12D5> % ETHIOPIC SYLLABLE PHARYNGEAL E old glibc collation-symbol: <AYIN>
+<S12D6> % ETHIOPIC SYLLABLE PHARYNGEAL O old glibc collation-symbol: <AYIN>
+<S1348> % ETHIOPIC SYLLABLE FA old glibc collation-symbol: <AF>
+<S1349> % ETHIOPIC SYLLABLE FU old glibc collation-symbol: <AF>
+<S134A> % ETHIOPIC SYLLABLE FI old glibc collation-symbol: <AF>
+<S134B> % ETHIOPIC SYLLABLE FAA old glibc collation-symbol: <AF>
+<S134C> % ETHIOPIC SYLLABLE FEE old glibc collation-symbol: <AF>
+<S134D> % ETHIOPIC SYLLABLE FE old glibc collation-symbol: <AF>
+<S134E> % ETHIOPIC SYLLABLE FO old glibc collation-symbol: <AF>
+<S134F> % ETHIOPIC SYLLABLE FWA old glibc collation-symbol: <AF>
+<S1388> % ETHIOPIC SYLLABLE SEBATBEIT FWA old glibc collation-symbol: <AF>
+<S1389> % ETHIOPIC SYLLABLE FWI old glibc collation-symbol: <AF>
+<S138A> % ETHIOPIC SYLLABLE FWEE old glibc collation-symbol: <AF>
+<S138B> % ETHIOPIC SYLLABLE FWE old glibc collation-symbol: <AF>
+<S1338> % ETHIOPIC SYLLABLE TSA old glibc collation-symbol: <SEDEY>
+<S1339> % ETHIOPIC SYLLABLE TSU old glibc collation-symbol: <SEDEY>
+<S133A> % ETHIOPIC SYLLABLE TSI old glibc collation-symbol: <SEDEY>
+<S133B> % ETHIOPIC SYLLABLE TSAA old glibc collation-symbol: <SEDEY>
+<S133C> % ETHIOPIC SYLLABLE TSEE old glibc collation-symbol: <SEDEY>
+<S133D> % ETHIOPIC SYLLABLE TSE old glibc collation-symbol: <SEDEY>
+<S133E> % ETHIOPIC SYLLABLE TSO old glibc collation-symbol: <SEDEY>
+<S133F> % ETHIOPIC SYLLABLE TSWA old glibc collation-symbol: <SEDEY>
+<S1240> % ETHIOPIC SYLLABLE QA old glibc collation-symbol: <QAF>
+<S1241> % ETHIOPIC SYLLABLE QU old glibc collation-symbol: <QAF>
+<S1242> % ETHIOPIC SYLLABLE QI old glibc collation-symbol: <QAF>
+<S1243> % ETHIOPIC SYLLABLE QAA old glibc collation-symbol: <QAF>
+<S1244> % ETHIOPIC SYLLABLE QEE old glibc collation-symbol: <QAF>
+<S1245> % ETHIOPIC SYLLABLE QE old glibc collation-symbol: <QAF>
+<S1246> % ETHIOPIC SYLLABLE QO old glibc collation-symbol: <QAF>
+<S1247> % ETHIOPIC SYLLABLE QOA old glibc collation-symbol: <QAF>
+<S1248> % ETHIOPIC SYLLABLE QWA old glibc collation-symbol: <QAF>
+<S124A> % ETHIOPIC SYLLABLE QWI old glibc collation-symbol: <QAF>
+<S124B> % ETHIOPIC SYLLABLE QWAA old glibc collation-symbol: <QAF>
+<S124C> % ETHIOPIC SYLLABLE QWEE old glibc collation-symbol: <QAF>
+<S124D> % ETHIOPIC SYLLABLE QWE old glibc collation-symbol: <QAF>
+<S1250> % ETHIOPIC SYLLABLE QHA old glibc collation-symbol: <QHA-QAF>
+<S1251> % ETHIOPIC SYLLABLE QHU old glibc collation-symbol: <QHA-QAF>
+<S1252> % ETHIOPIC SYLLABLE QHI old glibc collation-symbol: <QHA-QAF>
+<S1253> % ETHIOPIC SYLLABLE QHAA old glibc collation-symbol: <QHA-QAF>
+<S1254> % ETHIOPIC SYLLABLE QHEE old glibc collation-symbol: <QHA-QAF>
+<S1255> % ETHIOPIC SYLLABLE QHE old glibc collation-symbol: <QHA-QAF>
+<S1256> % ETHIOPIC SYLLABLE QHO old glibc collation-symbol: <QHA-QAF>
+<S1258> % ETHIOPIC SYLLABLE QHWA old glibc collation-symbol: <QHA-QAF>
+<S125A> % ETHIOPIC SYLLABLE QHWI old glibc collation-symbol: <QHA-QAF>
+<S125B> % ETHIOPIC SYLLABLE QHWAA old glibc collation-symbol: <QHA-QAF>
+<S125C> % ETHIOPIC SYLLABLE QHWEE old glibc collation-symbol: <QHA-QAF>
+<S125D> % ETHIOPIC SYLLABLE QHWE old glibc collation-symbol: <QHA-QAF>
+<S1358> % ETHIOPIC SYLLABLE RYA old glibc collation-symbol: <RIS>
+<S1230> % ETHIOPIC SYLLABLE SA old glibc collation-symbol: <SAT>
+<S1231> % ETHIOPIC SYLLABLE SU old glibc collation-symbol: <SAT>
+<S1232> % ETHIOPIC SYLLABLE SI old glibc collation-symbol: <SAT>
+<S1233> % ETHIOPIC SYLLABLE SAA old glibc collation-symbol: <SAT>
+<S1234> % ETHIOPIC SYLLABLE SEE old glibc collation-symbol: <SAT>
+<S1235> % ETHIOPIC SYLLABLE SE old glibc collation-symbol: <SAT>
+<S1236> % ETHIOPIC SYLLABLE SO old glibc collation-symbol: <SAT>
+<S1237> % ETHIOPIC SYLLABLE SWA old glibc collation-symbol: <SAT>
+<S2D83> % ETHIOPIC SYLLABLE SOA old glibc collation-symbol: <SAT>
+<S1238> % ETHIOPIC SYLLABLE SHA old glibc collation-symbol: <SHA-SAT>
+<S1239> % ETHIOPIC SYLLABLE SHU old glibc collation-symbol: <SHA-SAT>
+<S123A> % ETHIOPIC SYLLABLE SHI old glibc collation-symbol: <SHA-SAT>
+<S123B> % ETHIOPIC SYLLABLE SHAA old glibc collation-symbol: <SHA-SAT>
+<S123C> % ETHIOPIC SYLLABLE SHEE old glibc collation-symbol: <SHA-SAT>
+<S123D> % ETHIOPIC SYLLABLE SHE old glibc collation-symbol: <SHA-SAT>
+<S123E> % ETHIOPIC SYLLABLE SHO old glibc collation-symbol: <SHA-SAT>
+<S123F> % ETHIOPIC SYLLABLE SHWA old glibc collation-symbol: <SHA-SAT>
+<S2D84> % ETHIOPIC SYLLABLE SHOA old glibc collation-symbol: <SHA-SAT>
+<S1270> % ETHIOPIC SYLLABLE TA old glibc collation-symbol: <TAW>
+<S1271> % ETHIOPIC SYLLABLE TU old glibc collation-symbol: <TAW>
+<S1272> % ETHIOPIC SYLLABLE TI old glibc collation-symbol: <TAW>
+<S1273> % ETHIOPIC SYLLABLE TAA old glibc collation-symbol: <TAW>
+<S1274> % ETHIOPIC SYLLABLE TEE old glibc collation-symbol: <TAW>
+<S1275> % ETHIOPIC SYLLABLE TE old glibc collation-symbol: <TAW>
+<S1276> % ETHIOPIC SYLLABLE TO old glibc collation-symbol: <TAW>
+<S1277> % ETHIOPIC SYLLABLE TWA old glibc collation-symbol: <TAW>
+<S2D86> % ETHIOPIC SYLLABLE TOA old glibc collation-symbol: <TAW>
+<S1278> % ETHIOPIC SYLLABLE CA old glibc collation-symbol: <CHA-TAW>
+<S1279> % ETHIOPIC SYLLABLE CU old glibc collation-symbol: <CHA-TAW>
+<S127A> % ETHIOPIC SYLLABLE CI old glibc collation-symbol: <CHA-TAW>
+<S127B> % ETHIOPIC SYLLABLE CAA old glibc collation-symbol: <CHA-TAW>
+<S127C> % ETHIOPIC SYLLABLE CEE old glibc collation-symbol: <CHA-TAW>
+<S127D> % ETHIOPIC SYLLABLE CE old glibc collation-symbol: <CHA-TAW>
+<S127E> % ETHIOPIC SYLLABLE CO old glibc collation-symbol: <CHA-TAW>
+<S127F> % ETHIOPIC SYLLABLE CWA old glibc collation-symbol: <CHA-TAW>
+<S2D87> % ETHIOPIC SYLLABLE COA old glibc collation-symbol: <CHA-TAW>
+<S1280> % ETHIOPIC SYLLABLE XA old glibc collation-symbol: <HARM>
+<S1281> % ETHIOPIC SYLLABLE XU old glibc collation-symbol: <HARM>
+<S1282> % ETHIOPIC SYLLABLE XI old glibc collation-symbol: <HARM>
+<S1283> % ETHIOPIC SYLLABLE XAA old glibc collation-symbol: <HARM>
+<S1284> % ETHIOPIC SYLLABLE XEE old glibc collation-symbol: <HARM>
+<S1285> % ETHIOPIC SYLLABLE XE old glibc collation-symbol: <HARM>
+<S1286> % ETHIOPIC SYLLABLE XO old glibc collation-symbol: <HARM>
+<S1287> % ETHIOPIC SYLLABLE XOA old glibc collation-symbol: <HARM>
+<S1288> % ETHIOPIC SYLLABLE XWA old glibc collation-symbol: <HARM>
+<S128A> % ETHIOPIC SYLLABLE XWI old glibc collation-symbol: <HARM>
+<S128B> % ETHIOPIC SYLLABLE XWAA old glibc collation-symbol: <HARM>
+<S128C> % ETHIOPIC SYLLABLE XWEE old glibc collation-symbol: <HARM>
+<S128D> % ETHIOPIC SYLLABLE XWE old glibc collation-symbol: <HARM>
+<S1340> % ETHIOPIC SYLLABLE TZA old glibc collation-symbol: <SEPA>
+<S1341> % ETHIOPIC SYLLABLE TZU old glibc collation-symbol: <SEPA>
+<S1342> % ETHIOPIC SYLLABLE TZI old glibc collation-symbol: <SEPA>
+<S1343> % ETHIOPIC SYLLABLE TZAA old glibc collation-symbol: <SEPA>
+<S1344> % ETHIOPIC SYLLABLE TZEE old glibc collation-symbol: <SEPA>
+<S1345> % ETHIOPIC SYLLABLE TZE old glibc collation-symbol: <SEPA>
+<S1346> % ETHIOPIC SYLLABLE TZO old glibc collation-symbol: <SEPA>
+<S1347> % ETHIOPIC SYLLABLE TZOA old glibc collation-symbol: <SEPA>
+<S1330> % ETHIOPIC SYLLABLE PHA old glibc collation-symbol: <PEYT>
+<S1331> % ETHIOPIC SYLLABLE PHU old glibc collation-symbol: <PEYT>
+<S1332> % ETHIOPIC SYLLABLE PHI old glibc collation-symbol: <PEYT>
+<S1333> % ETHIOPIC SYLLABLE PHAA old glibc collation-symbol: <PEYT>
+<S1334> % ETHIOPIC SYLLABLE PHEE old glibc collation-symbol: <PEYT>
+<S1335> % ETHIOPIC SYLLABLE PHE old glibc collation-symbol: <PEYT>
+<S1336> % ETHIOPIC SYLLABLE PHO old glibc collation-symbol: <PEYT>
+<S1337> % ETHIOPIC SYLLABLE PHWA old glibc collation-symbol: <PEYT>
+<S2D91> % ETHIOPIC SYLLABLE PHOA old glibc collation-symbol: <PEYT>
+<S1350> % ETHIOPIC SYLLABLE PA old glibc collation-symbol: <PSA>
+<S1351> % ETHIOPIC SYLLABLE PU old glibc collation-symbol: <PSA>
+<S1352> % ETHIOPIC SYLLABLE PI old glibc collation-symbol: <PSA>
+<S1353> % ETHIOPIC SYLLABLE PAA old glibc collation-symbol: <PSA>
+<S1354> % ETHIOPIC SYLLABLE PEE old glibc collation-symbol: <PSA>
+<S1355> % ETHIOPIC SYLLABLE PE old glibc collation-symbol: <PSA>
+<S1356> % ETHIOPIC SYLLABLE PO old glibc collation-symbol: <PSA>
+<S1357> % ETHIOPIC SYLLABLE PWA old glibc collation-symbol: <PSA>
+<S138C> % ETHIOPIC SYLLABLE SEBATBEIT PWA old glibc collation-symbol: <PSA>
+<S138D> % ETHIOPIC SYLLABLE PWI old glibc collation-symbol: <PSA>
+<S138E> % ETHIOPIC SYLLABLE PWEE old glibc collation-symbol: <PSA>
+<S138F> % ETHIOPIC SYLLABLE PWE old glibc collation-symbol: <PSA>
+<S2D92> % ETHIOPIC SYLLABLE POA old glibc collation-symbol: <PSA>
 reorder-end
-%
 END LC_COLLATE


--- a/localedata/locales/ha_NG
+++ b/localedata/locales/ha_NG
@ -59,96 +59,91 @@ LC_COLLATE
 % order: a, b, b+, c, d, d+, e, f, g, h, i, j, k, k+, l, m, n, o, p
 % q, r, r~, s, sh, t, ts, u, [v], w, [x], 'y, y, z

+% CLDR collation rules for Hausa:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/ha.xml)
+%
+% <collation type="standard" references="Paul Newman: Hausa-English Dictionary ISBN 978-0-300-12246-6">
+%   <cr><![CDATA[
+%     &B<ɓ<<<Ɓ
+%     &D<ɗ<<<Ɗ
+%     &K<ƙ<<<Ƙ
+%     &S<sh<<<Sh<<<SH
+%     &T<ts<<<Ts<<<TS
+%     &Y<ƴ<<<ʼy<<<''y<<<Ƴ<<<ʼY<<<''Y
+%   ]]></cr>
+% </collation>
+%
+% And CLDR also lists the following
+% index characters:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/main/ha.xml)
+%
+% <exemplarCharacters type="index" draft="contributed">[A B Ɓ C D Ɗ E F G H I J K Ƙ L M N O P Q R S T U V W X Y {ʼY} Z]</exemplarCharacters>
+%
+% The following rules implement the same order for glibc.
+%
+% The original order as described above also had r-tilde (r̃) but
+% as CLDR doesn’t have it, I omit it.
+
 copy "iso14651_t1"

-collating-symbol  <s-h-ha>
-collating-element <S-H> from "<U0053><U0048>"
-collating-element <s-h> from "<U0073><U0068>"
-collating-element <S-h> from "<U0053><U0068>"
-collating-element <s-H> from "<U0073><U0048>"
-collating-symbol  <t-s-ha>
-collating-element <T-S> from "<U0054><U0053>"
-collating-element <t-s> from "<U0074><U0073>"
-collating-element <T-s> from "<U0054><U0073>"
-collating-element <t-S> from "<U0074><U0053>"
+collating-symbol  <b-hook>
+collating-symbol  <d-hook>
+collating-symbol  <k-hook>
+collating-symbol  <sh-digraph>
+collating-symbol  <ts-digraph>
 collating-symbol  <'-y-ha>
-collating-element <'1y> from "<U0027><U0079>"
-collating-element <'1Y> from "<U0027><U0059>"
-collating-element <'2y> from "<U2019><U0079>"
-collating-element <'2Y> from "<U2019><U0059>"
-collating-symbol  <rtilde>
-collating-element <r?>  from "<U0072><U0303>"
-collating-element <R?>  from "<U0052><U0303>"
-collating-symbol  <bcurl>
-collating-symbol  <dcurl>
-collating-symbol  <kcurl>

-collating-symbol <CAP-MIN>
-collating-symbol <MIN-CAP>
+collating-element <sh> from "sh"
+collating-element <sH> from "sH"
+collating-element <Sh> from "Sh"
+collating-element <SH> from "SH"
+collating-element <ts> from "ts"
+collating-element <tS> from "tS"
+collating-element <Ts> from "Ts"
+collating-element <TS> from "TS"
+collating-element <modifier-letter-apostrophe-y> from "<U02BC>y"
+collating-element <modifier-letter-apostrophe-Y> from "<U02BC>Y"
+collating-element <right-single-quotation-mark-y> from "<U2019>y"
+collating-element <right-single-quotation-mark-Y> from "<U2019>Y"
+collating-element <double-apostrophe-y> from "''y"
+collating-element <double-apostrophe-Y> from "''Y"

-reorder-after <MIN>
-<MIN-CAP>
-
-reorder-after <CAP>
-<CAP-MIN>
-
-reorder-after <b>
-<bcurl>
-reorder-after <d>
-<dcurl>
-reorder-after <k>
-<kcurl>
-reorder-after <r>
-<rtilde>
-<s>
-<s-h-ha>
-<t>
-<t-s-ha>
-reorder-after <x>
+reorder-after <AFTER-B>
+<b-hook>
+reorder-after <AFTER-D>
+<d-hook>
+reorder-after <AFTER-K>
+<k-hook>
+reorder-after <AFTER-S>
+<sh-digraph>
+reorder-after <AFTER-T>
+<ts-digraph>
+reorder-after <AFTER-Y>
 <'-y-ha>

-reorder-after <U0062>
-<U0253> <bcurl>;<BAS>;<MIN>;IGNORE
-reorder-after <U0042>
-<U0181> <bcurl>;<BAS>;<CAP>;IGNORE
+<U0253>     <b-hook>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ɓ
+<U0181>     <b-hook>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ɓ
+<U0257>     <d-hook>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ɗ
+<U018A>     <d-hook>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ɗ
+<U0199>     <k-hook>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ƙ
+<U0198>     <k-hook>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ƙ
+<sh>    <sh-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<sH>    <sh-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<SH>    <sh-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<Sh>    <sh-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<ts>    <ts-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<tS>    <ts-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<TS>    <ts-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<Ts>    <ts-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE

-reorder-after <U0064>
-<U0257> <dcurl>;<BAS>;<MIN>;IGNORE
-reorder-after <U0044>
-<U018A> <dcurl>;<BAS>;<CAP>;IGNORE
-
-reorder-after <U006B>
-<U0199> <kcurl>;<BAS>;<MIN>;IGNORE
-reorder-after <U004B>
-<U0198> <kcurl>;<BAS>;<CAP>;IGNORE
-
-reorder-after <U0072>
-<r?>    <rtilde>;<ACA>;<MIN>;IGNORE
-reorder-after <U0052>
-<R?>    <rtilde>;<ACA>;<CAP>;IGNORE
-
-reorder-after <U0073>
-<s-h>   <s-h-ha>;<PCL>;<MIN>;IGNORE
-<s-H>   <s-h-ha>;<PCL>;<MIN-CAP>;IGNORE
-reorder-after <U0053>
-<S-H>   <s-h-ha>;<PCL>;<CAP>;IGNORE
-<S-h>   <s-h-ha>;<PCL>;<CAP-MIN>;IGNORE
-
-reorder-after <U0074>
-<t-s>   <t-s-ha>;<PCL>;<MIN>;IGNORE
-<t-S>   <t-s-ha>;<PCL>;<MIN-CAP>;IGNORE
-reorder-after <U0054>
-<T-S>   <t-s-ha>;<PCL>;<CAP>;IGNORE
-<T-s>   <t-s-ha>;<PCL>;<CAP-MIN>;IGNORE
-
-reorder-after <U0078>
-<'1y>   <'-y-ha>;<PCL>;<MIN>;IGNORE
-<'2y>   <'-y-ha>;<PCL>;<MIN>;IGNORE
-<U01B4> <'-y-ha>;<PCL>;<MIN>;IGNORE
-reorder-after <U0058>
-<'1Y>   <'-y-ha>;<PCL>;<CAP>;IGNORE
-<'2Y>   <'-y-ha>;<PCL>;<CAP>;IGNORE
-<U01B3> <'-y-ha>;<PCL>;<CAP>;IGNORE
+<U01B4>                         <'-y-ha>;"<BASE><BASE>";"<MIN><VRNT1>";IGNORE % ƴ
+<modifier-letter-apostrophe-y>  <'-y-ha>;"<BASE><BASE>";"<MIN><VRNT2>";IGNORE
+<right-single-quotation-mark-y> <'-y-ha>;"<BASE><BASE>";"<MIN><VRNT3>";IGNORE
+<double-apostrophe-y>           <'-y-ha>;"<BASE><BASE>";"<MIN><VRNT4>";IGNORE
+<U01B3>                         <'-y-ha>;"<BASE><BASE>";"<CAP><VRNT1>";IGNORE % Ƴ
+<modifier-letter-apostrophe-Y>  <'-y-ha>;"<BASE><BASE>";"<CAP><VRNT2>";IGNORE
+<right-single-quotation-mark-Y> <'-y-ha>;"<BASE><BASE>";"<CAP><VRNT3>";IGNORE
+<double-apostrophe-Y>           <'-y-ha>;"<BASE><BASE>";"<CAP><VRNT4>";IGNORE

 reorder-end

--- a/localedata/locales/hr_HR
+++ b/localedata/locales/hr_HR
@ -108,57 +108,57 @@ collating-symbol <n-j-sh>
 collating-symbol <scaron>
 collating-symbol <zcaron>

-reorder-after <c>
+reorder-after <AFTER-C>
 <ccaron>
 <cacute>
-reorder-after <d>
+reorder-after <AFTER-D>
 <d-z-sh>
 <doblique>
-reorder-after <l>
+reorder-after <AFTER-L>
 <l-j-sh>
-reorder-after <n>
+reorder-after <AFTER-N>
 <n-j-sh>
-reorder-after <s>
+reorder-after <AFTER-S>
 <scaron>
-reorder-after <z>
+reorder-after <AFTER-Z>
 <zcaron>

-<U010D> <ccaron>;<ACA>;<MIN>;IGNORE % č
-<U010C> <ccaron>;<ACA>;<CAP>;IGNORE % Č
-<U0107> <cacute>;<CAR>;<MIN>;IGNORE % ć
-<U0106> <cacute>;<CAR>;<CAP>;IGNORE % Ć
+<U010D> <ccaron>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % č
+<U010C> <ccaron>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Č
+<U0107> <cacute>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ć
+<U0106> <cacute>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ć

-<d-z<> "<d-z-sh>";"<BAS><CAR>";"<MIN><MIN><BAS>";IGNORE % dž
-<U01C6> "<d-z-sh>";"<BAS><CAR>";"<MIN><MIN><LIG>";IGNORE % ǆ
-<d-Z<> "<d-z-sh>";"<BAS><CAR>";"<MIN><CAP><BAS>";IGNORE % dŽ
-<D-z<> "<d-z-sh>";"<BAS><CAR>";"<CAP><MIN><BAS>";IGNORE % Dž
-<U01C5> "<d-z-sh>";"<BAS><CAR>";"<CAP><MIN><LIG>";IGNORE % ǅ
-<D-Z<> "<d-z-sh>";"<BAS><CAR>";"<CAP><CAP><BAS>";IGNORE % DŽ
-<U01C4> "<d-z-sh>";"<BAS><CAR>";"<CAP><CAP><LIG>";IGNORE % Ǆ
-<U0111> <doblique>;<OBL>;<MIN>;IGNORE % đ
-<U0110> <doblique>;<OBL>;<CAP>;IGNORE % Đ
+<d-z<> "<d-z-sh>";"<BASE><BASE>";"<MIN><MIN>";"<VRNT1>" % dž
+<U01C6> "<d-z-sh>";"<BASE><BASE>";"<MIN><MIN>";"<VRNT2>" % ǆ
+<d-Z<> "<d-z-sh>";"<BASE><BASE>";"<MIN><CAP>";"<VRNT1>" % dŽ
+<D-z<> "<d-z-sh>";"<BASE><BASE>";"<CAP><MIN>";"<VRNT1>" % Dž
+<U01C5> "<d-z-sh>";"<BASE><BASE>";"<CAP><MIN>";"<VRNT2>" % ǅ
+<D-Z<> "<d-z-sh>";"<BASE><BASE>";"<CAP><CAP>";"<VRNT1>" % DŽ
+<U01C4> "<d-z-sh>";"<BASE><BASE>";"<CAP><CAP>";"<VRNT2>" % Ǆ
+<U0111> <doblique>;"<BASE><BASE>";<MIN>;IGNORE % đ
+<U0110> <doblique>;"<BASE><BASE>";<CAP>;IGNORE % Đ

-<l-j> "<l-j-sh>";"<BAS><BAS>";"<MIN><MIN><BAS>";IGNORE % lj
-<U01C9> "<l-j-sh>";"<BAS><BAS>";"<MIN><MIN><LIG>";IGNORE % ǉ
-<l-J> "<l-j-sh>";"<BAS><BAS>";"<MIN><CAP><BAS>";IGNORE % lJ
-<L-j> "<l-j-sh>";"<BAS><BAS>";"<CAP><MIN><BAS>";IGNORE % Lj
-<U01C8> "<l-j-sh>";"<BAS><BAS>";"<CAP><MIN><LIG>";IGNORE % ǈ
-<L-J> "<l-j-sh>";"<BAS><BAS>";"<CAP><CAP><BAS>";IGNORE % LJ
-<U01C7> "<l-j-sh>";"<BAS><BAS>";"<CAP><CAP><LIG>";IGNORE % Ǉ
+<l-j> "<l-j-sh>";"<BASE><BASE>";"<MIN><MIN>";"<VRNT1>" % lj
+<U01C9> "<l-j-sh>";"<BASE><BASE>";"<MIN><MIN>";"<VRNT2>" % ǉ
+<l-J> "<l-j-sh>";"<BASE><BASE>";"<MIN><CAP>";"<VRNT1>" % lJ
+<L-j> "<l-j-sh>";"<BASE><BASE>";"<CAP><MIN>";"<VRNT1>" % Lj
+<U01C8> "<l-j-sh>";"<BASE><BASE>";"<CAP><MIN>";"<VRNT2>" % ǈ
+<L-J> "<l-j-sh>";"<BASE><BASE>";"<CAP><CAP>";"<VRNT1>" % LJ
+<U01C7> "<l-j-sh>";"<BASE><BASE>";"<CAP><CAP>";"<VRNT2>" % Ǉ

-<n-j> "<n-j-sh>";"<BAS><BAS>";"<MIN><MIN><BAS>";IGNORE % nj
-<U01CC> "<n-j-sh>";"<BAS><BAS>";"<MIN><MIN><LIG>";IGNORE % ǌ
-<n-J> "<n-j-sh>";"<BAS><BAS>";"<MIN><CAP><BAS>";IGNORE % nJ
-<N-j> "<n-j-sh>";"<BAS><BAS>";"<CAP><MIN><BAS>";IGNORE % Nj
-<U01CB> "<n-j-sh>";"<BAS><BAS>";"<CAP><MIN><LIG>";IGNORE % ǋ
-<N-J> "<n-j-sh>";"<BAS><BAS>";"<CAP><CAP><BAS>";IGNORE % NJ
-<U01CA> "<n-j-sh>";"<BAS><BAS>";"<CAP><CAP><LIG>";IGNORE % Ǌ
+<n-j> "<n-j-sh>";"<BASE><BASE>";"<MIN><MIN>";"<VRNT1>" % nj
+<U01CC> "<n-j-sh>";"<BASE><BASE>";"<MIN><MIN>";"<VRNT2>" % ǌ
+<n-J> "<n-j-sh>";"<BASE><BASE>";"<MIN><CAP>";"<VRNT1>" % nJ
+<N-j> "<n-j-sh>";"<BASE><BASE>";"<CAP><MIN>";"<VRNT1>" % Nj
+<U01CB> "<n-j-sh>";"<BASE><BASE>";"<CAP><MIN>";"<VRNT2>" % ǋ
+<N-J> "<n-j-sh>";"<BASE><BASE>";"<CAP><CAP>";"<VRNT1>" % NJ
+<U01CA> "<n-j-sh>";"<BASE><BASE>";"<CAP><CAP>";"<VRNT2>" % Ǌ

-<U0161> <scaron>;<ACA>;<MIN>;IGNORE % š
-<U0160> <scaron>;<ACA>;<CAP>;IGNORE % Š
+<U0161> <scaron>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % š
+<U0160> <scaron>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Š

-<U017E> <zcaron>;<ACA>;<MIN>;IGNORE % ž
-<U017D> <zcaron>;<ACA>;<CAP>;IGNORE % Ž
+<U017E> <zcaron>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ž
+<U017D> <zcaron>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ž

 reorder-end
 END LC_COLLATE
--- a/localedata/locales/hsb_DE
+++ b/localedata/locales/hsb_DE
@ -85,49 +85,49 @@ collating-symbol <s-caron>
 collating-symbol <z-caron>
 collating-symbol <z-acute>

-reorder-after <c>
+reorder-after <AFTER-C>
 <c-caron>
 <c-acute>
-reorder-after <d>
+reorder-after <AFTER-D>
 <d-z-acute-digraph>
-reorder-after <e>
+reorder-after <AFTER-E>
 <e-caron>
-reorder-after <h>
+reorder-after <AFTER-H>
 <c-h-digraph>
-reorder-after <k>
+reorder-after <AFTER-K>
 <l-stroke>
-reorder-after <r>
+reorder-after <AFTER-R>
 <r-caron>
-reorder-after <s>
+reorder-after <AFTER-S>
 <s-caron>
-reorder-after <z>
+reorder-after <AFTER-Z>
 <z-caron>
 <z-acute>

-<U010D> <c-caron>;<BAS>;<MIN>;IGNORE % č
-<U010C> <c-caron>;<BAS>;<CAP>;IGNORE % Č
-<U0107> <c-acute>;<BAS>;<MIN>;IGNORE % ć
-<U0106> <c-acute>;<BAS>;<CAP>;IGNORE % Ć
-<d-z'> <d-z-acute-digraph>;<BAS>;"<MIN><MIN>";IGNORE % dź
-<d-Z'> <d-z-acute-digraph>;<BAS>;"<MIN><CAP>";IGNORE % dŹ
-<D-z'> <d-z-acute-digraph>;<BAS>;"<CAP><MIN>";IGNORE % Dź
-<D-Z'> <d-z-acute-digraph>;<BAS>;"<CAP><CAP>";IGNORE % DŹ
-<U011B> <e-caron>;<BAS>;<MIN>;IGNORE % ě
-<U011A> <e-caron>;<BAS>;<CAP>;IGNORE % Ě
-<c-h> <c-h-digraph>;<BAS>;"<MIN><MIN>";IGNORE % ch
-<c-H> <c-h-digraph>;<BAS>;"<MIN><CAP>";IGNORE % cH
-<C-h> <c-h-digraph>;<BAS>;"<CAP><MIN>";IGNORE % Ch
-<C-H> <c-h-digraph>;<BAS>;"<CAP><CAP>";IGNORE % CH
-<U0142> <l-stroke>;<BAS>;<MIN>;IGNORE % ł
-<U0141> <l-stroke>;<BAS>;<CAP>;IGNORE % Ł
-<U0159> <r-caron>;<BAS>;<MIN>;IGNORE % ř
-<U0158> <r-caron>;<BAS>;<CAP>;IGNORE % Ř
-<U0161> <s-caron>;<BAS>;<MIN>;IGNORE % š
-<U0160> <s-caron>;<BAS>;<CAP>;IGNORE % Š
-<U017E> <z-caron>;<BAS>;<MIN>;IGNORE % ž
-<U017D> <z-caron>;<BAS>;<CAP>;IGNORE % Ž
-<U017A> <z-acute>;<BAS>;<MIN>;IGNORE % ź
-<U0179> <z-acute>;<BAS>;<CAP>;IGNORE % Ź
+<U010D> <c-caron>;<BASE>;<MIN>;IGNORE % č
+<U010C> <c-caron>;<BASE>;<CAP>;IGNORE % Č
+<U0107> <c-acute>;<BASE>;<MIN>;IGNORE % ć
+<U0106> <c-acute>;<BASE>;<CAP>;IGNORE % Ć
+<d-z'> <d-z-acute-digraph>;<BASE>;"<MIN><MIN>";IGNORE % dź
+<d-Z'> <d-z-acute-digraph>;<BASE>;"<MIN><CAP>";IGNORE % dŹ
+<D-z'> <d-z-acute-digraph>;<BASE>;"<CAP><MIN>";IGNORE % Dź
+<D-Z'> <d-z-acute-digraph>;<BASE>;"<CAP><CAP>";IGNORE % DŹ
+<U011B> <e-caron>;<BASE>;<MIN>;IGNORE % ě
+<U011A> <e-caron>;<BASE>;<CAP>;IGNORE % Ě
+<c-h> <c-h-digraph>;<BASE>;"<MIN><MIN>";IGNORE % ch
+<c-H> <c-h-digraph>;<BASE>;"<MIN><CAP>";IGNORE % cH
+<C-h> <c-h-digraph>;<BASE>;"<CAP><MIN>";IGNORE % Ch
+<C-H> <c-h-digraph>;<BASE>;"<CAP><CAP>";IGNORE % CH
+<U0142> <l-stroke>;<BASE>;<MIN>;IGNORE % ł
+<U0141> <l-stroke>;<BASE>;<CAP>;IGNORE % Ł
+<U0159> <r-caron>;<BASE>;<MIN>;IGNORE % ř
+<U0158> <r-caron>;<BASE>;<CAP>;IGNORE % Ř
+<U0161> <s-caron>;<BASE>;<MIN>;IGNORE % š
+<U0160> <s-caron>;<BASE>;<CAP>;IGNORE % Š
+<U017E> <z-caron>;<BASE>;<MIN>;IGNORE % ž
+<U017D> <z-caron>;<BASE>;<CAP>;IGNORE % Ž
+<U017A> <z-acute>;<BASE>;<MIN>;IGNORE % ź
+<U0179> <z-acute>;<BASE>;<CAP>;IGNORE % Ź

 reorder-end

--- a/localedata/locales/hu_HU
+++ b/localedata/locales/hu_HU
@ -85,8 +85,8 @@ copy "iso14651_t1"
 collating-symbol  <odouble>
 collating-symbol  <udouble>

-collating-symbol  <SINGLE-OR-COMPOUND>
-collating-symbol  <COMPOUND>
+collating-symbol  <single-or-compound>
+collating-symbol  <compound>

 collating-symbol  <cs>
 collating-element <C-S> from "<U0043><U0053>"
@ -255,195 +255,195 @@ reorder-after <CAP>
 <CAP-CAP-MIN>
 <CAP-CAP-CAP>

-reorder-after <c>
+reorder-after <AFTER-C>
 <cs>
-reorder-after <d>
+reorder-after <AFTER-D>
 <dz>
 <dzs>
-reorder-after <g>
+reorder-after <AFTER-G>
 <gy>
-reorder-after <l>
+reorder-after <AFTER-L>
 <ly>
-reorder-after <n>
+reorder-after <AFTER-N>
 <ny>
-reorder-after <o>
+reorder-after <AFTER-O>
 <odouble>
-reorder-after <s>
+reorder-after <AFTER-S>
 <sz>
-reorder-after <t>
+reorder-after <AFTER-T>
 <ty>
-reorder-after <u>
+reorder-after <AFTER-U>
 <udouble>
-reorder-after <z>
+reorder-after <AFTER-Z>
 <zs>

-reorder-after <BAS>
-<SINGLE-OR-COMPOUND>
-<COMPOUND>
+reorder-after <BASE>
+<single-or-compound>
+<compound>

-reorder-after <o>
-<U00F6>	<odouble>;<REU>;<MIN>;IGNORE
-<U0151>	<odouble>;<DAC>;<MIN>;IGNORE
-<U00D6>	<odouble>;<REU>;<CAP>;IGNORE
-<U0150>	<odouble>;<DAC>;<CAP>;IGNORE
+reorder-after <AFTER-O>
+<U00F6>	<odouble>;<TREMA>;<MIN>;IGNORE
+<U0151>	<odouble>;<2AIGU>;<MIN>;IGNORE
+<U00D6>	<odouble>;<TREMA>;<CAP>;IGNORE
+<U0150>	<odouble>;<2AIGU>;<CAP>;IGNORE

-reorder-after <u>
-<U00FC>	<udouble>;<REU>;<MIN>;IGNORE
-<U0171>	<udouble>;<DAC>;<MIN>;IGNORE
-<U00DC>	<udouble>;<REU>;<CAP>;IGNORE
-<U0170>	<udouble>;<DAC>;<CAP>;IGNORE
+reorder-after <AFTER-U>
+<U00FC>	<udouble>;<TREMA>;<MIN>;IGNORE
+<U0171>	<udouble>;<2AIGU>;<MIN>;IGNORE
+<U00DC>	<udouble>;<TREMA>;<CAP>;IGNORE
+<U0170>	<udouble>;<2AIGU>;<CAP>;IGNORE

-reorder-after <BAS>
-<ACA>
-<REU>
-<DAC>
+reorder-after <BASE>
+<AIGUT>
+<TREMA>
+<2AIGU>

 reorder-after <U0043>
-<C-S>		<cs>;<COMPOUND>;<CAP-CAP>;IGNORE
-<C-s>		<cs>;<COMPOUND>;<CAP-MIN>;IGNORE
-<C-C-S>		"<cs><cs>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><CAP-CAP>";IGNORE
-<C-C-s>		"<cs><cs>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><CAP-MIN>";IGNORE
-<C-c-S>		"<cs><cs>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><MIN-CAP>";IGNORE
-<C-c-s>		"<cs><cs>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><MIN-MIN>";IGNORE
+<C-S>		<cs>;<compound>;<CAP-CAP>;IGNORE
+<C-s>		<cs>;<compound>;<CAP-MIN>;IGNORE
+<C-C-S>		"<cs><cs>";"<single-or-compound><compound>";"<CAP><CAP-CAP>";IGNORE
+<C-C-s>		"<cs><cs>";"<single-or-compound><compound>";"<CAP><CAP-MIN>";IGNORE
+<C-c-S>		"<cs><cs>";"<single-or-compound><compound>";"<CAP><MIN-CAP>";IGNORE
+<C-c-s>		"<cs><cs>";"<single-or-compound><compound>";"<CAP><MIN-MIN>";IGNORE
 reorder-after <U0063>
-<c-S>		<cs>;<COMPOUND>;<MIN-CAP>;IGNORE
-<c-s>		<cs>;<COMPOUND>;<MIN-MIN>;IGNORE
-<c-C-S>		"<cs><cs>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><CAP-CAP>";IGNORE
-<c-C-s>		"<cs><cs>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><CAP-MIN>";IGNORE
-<c-c-S>		"<cs><cs>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><MIN-CAP>";IGNORE
-<c-c-s>		"<cs><cs>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><MIN-MIN>";IGNORE
+<c-S>		<cs>;<compound>;<MIN-CAP>;IGNORE
+<c-s>		<cs>;<compound>;<MIN-MIN>;IGNORE
+<c-C-S>		"<cs><cs>";"<single-or-compound><compound>";"<MIN><CAP-CAP>";IGNORE
+<c-C-s>		"<cs><cs>";"<single-or-compound><compound>";"<MIN><CAP-MIN>";IGNORE
+<c-c-S>		"<cs><cs>";"<single-or-compound><compound>";"<MIN><MIN-CAP>";IGNORE
+<c-c-s>		"<cs><cs>";"<single-or-compound><compound>";"<MIN><MIN-MIN>";IGNORE

 reorder-after <U0044>
-<D-Z>		<dz>;<COMPOUND>;<CAP-CAP>;IGNORE
-<D-z>		<dz>;<COMPOUND>;<CAP-MIN>;IGNORE
-<D-D-Z>		"<dz><dz>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><CAP-CAP>";IGNORE
-<D-D-z>		"<dz><dz>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><CAP-MIN>";IGNORE
-<D-d-Z>		"<dz><dz>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><MIN-CAP>";IGNORE
-<D-d-z>		"<dz><dz>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><MIN-MIN>";IGNORE
+<D-Z>		<dz>;<compound>;<CAP-CAP>;IGNORE
+<D-z>		<dz>;<compound>;<CAP-MIN>;IGNORE
+<D-D-Z>		"<dz><dz>";"<single-or-compound><compound>";"<CAP><CAP-CAP>";IGNORE
+<D-D-z>		"<dz><dz>";"<single-or-compound><compound>";"<CAP><CAP-MIN>";IGNORE
+<D-d-Z>		"<dz><dz>";"<single-or-compound><compound>";"<CAP><MIN-CAP>";IGNORE
+<D-d-z>		"<dz><dz>";"<single-or-compound><compound>";"<CAP><MIN-MIN>";IGNORE
 reorder-after <U0064>
-<d-Z>		<dz>;<COMPOUND>;<MIN-CAP>;IGNORE
-<d-z>		<dz>;<COMPOUND>;<MIN-MIN>;IGNORE
-<d-D-Z>		"<dz><dz>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><CAP-CAP>";IGNORE
-<d-D-z>		"<dz><dz>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><CAP-MIN>";IGNORE
-<d-d-Z>		"<dz><dz>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><MIN-CAP>";IGNORE
-<d-d-z>		"<dz><dz>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><MIN-MIN>";IGNORE
+<d-Z>		<dz>;<compound>;<MIN-CAP>;IGNORE
+<d-z>		<dz>;<compound>;<MIN-MIN>;IGNORE
+<d-D-Z>		"<dz><dz>";"<single-or-compound><compound>";"<MIN><CAP-CAP>";IGNORE
+<d-D-z>		"<dz><dz>";"<single-or-compound><compound>";"<MIN><CAP-MIN>";IGNORE
+<d-d-Z>		"<dz><dz>";"<single-or-compound><compound>";"<MIN><MIN-CAP>";IGNORE
+<d-d-z>		"<dz><dz>";"<single-or-compound><compound>";"<MIN><MIN-MIN>";IGNORE

 reorder-after <U0044>
-<D-Z-S>		<dzs>;<COMPOUND>;<CAP-CAP-CAP>;IGNORE
-<D-Z-s>		<dzs>;<COMPOUND>;<CAP-CAP-MIN>;IGNORE
-<D-z-S>		<dzs>;<COMPOUND>;<CAP-MIN-CAP>;IGNORE
-<D-z-s>		<dzs>;<COMPOUND>;<CAP-MIN-MIN>;IGNORE
-<D-D-Z-S>	"<dzs><dzs>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><CAP-CAP-CAP>";IGNORE
-<D-D-Z-s>	"<dzs><dzs>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><CAP-CAP-MIN>";IGNORE
-<D-D-z-S>	"<dzs><dzs>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><CAP-MIN-CAP>";IGNORE
-<D-D-z-s>	"<dzs><dzs>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><CAP-MIN-MIN>";IGNORE
-<D-d-Z-S>	"<dzs><dzs>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><MIN-CAP-CAP>";IGNORE
-<D-d-Z-s>	"<dzs><dzs>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><MIN-CAP-MIN>";IGNORE
-<D-d-z-S>	"<dzs><dzs>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><MIN-MIN-CAP>";IGNORE
-<D-d-z-s>	"<dzs><dzs>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><MIN-MIN-MIN>";IGNORE
+<D-Z-S>		<dzs>;<compound>;<CAP-CAP-CAP>;IGNORE
+<D-Z-s>		<dzs>;<compound>;<CAP-CAP-MIN>;IGNORE
+<D-z-S>		<dzs>;<compound>;<CAP-MIN-CAP>;IGNORE
+<D-z-s>		<dzs>;<compound>;<CAP-MIN-MIN>;IGNORE
+<D-D-Z-S>	"<dzs><dzs>";"<single-or-compound><compound>";"<CAP><CAP-CAP-CAP>";IGNORE
+<D-D-Z-s>	"<dzs><dzs>";"<single-or-compound><compound>";"<CAP><CAP-CAP-MIN>";IGNORE
+<D-D-z-S>	"<dzs><dzs>";"<single-or-compound><compound>";"<CAP><CAP-MIN-CAP>";IGNORE
+<D-D-z-s>	"<dzs><dzs>";"<single-or-compound><compound>";"<CAP><CAP-MIN-MIN>";IGNORE
+<D-d-Z-S>	"<dzs><dzs>";"<single-or-compound><compound>";"<CAP><MIN-CAP-CAP>";IGNORE
+<D-d-Z-s>	"<dzs><dzs>";"<single-or-compound><compound>";"<CAP><MIN-CAP-MIN>";IGNORE
+<D-d-z-S>	"<dzs><dzs>";"<single-or-compound><compound>";"<CAP><MIN-MIN-CAP>";IGNORE
+<D-d-z-s>	"<dzs><dzs>";"<single-or-compound><compound>";"<CAP><MIN-MIN-MIN>";IGNORE
 reorder-after <U0064>
-<d-Z-S>		<dzs>;<COMPOUND>;<MIN-CAP-CAP>;IGNORE
-<d-Z-s>		<dzs>;<COMPOUND>;<MIN-CAP-MIN>;IGNORE
-<d-z-S>		<dzs>;<COMPOUND>;<MIN-MIN-CAP>;IGNORE
-<d-z-s>		<dzs>;<COMPOUND>;<MIN-MIN-MIN>;IGNORE
-<d-D-Z-S>	"<dzs><dzs>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><CAP-CAP-CAP>";IGNORE
-<d-D-Z-s>	"<dzs><dzs>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><CAP-CAP-MIN>";IGNORE
-<d-D-z-S>	"<dzs><dzs>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><CAP-MIN-CAP>";IGNORE
-<d-D-z-s>	"<dzs><dzs>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><CAP-MIN-MIN>";IGNORE
-<d-d-Z-S>	"<dzs><dzs>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><MIN-CAP-CAP>";IGNORE
-<d-d-Z-s>	"<dzs><dzs>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><MIN-CAP-MIN>";IGNORE
-<d-d-z-S>	"<dzs><dzs>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><MIN-MIN-CAP>";IGNORE
-<d-d-z-s>	"<dzs><dzs>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><MIN-MIN-MIN>";IGNORE
+<d-Z-S>		<dzs>;<compound>;<MIN-CAP-CAP>;IGNORE
+<d-Z-s>		<dzs>;<compound>;<MIN-CAP-MIN>;IGNORE
+<d-z-S>		<dzs>;<compound>;<MIN-MIN-CAP>;IGNORE
+<d-z-s>		<dzs>;<compound>;<MIN-MIN-MIN>;IGNORE
+<d-D-Z-S>	"<dzs><dzs>";"<single-or-compound><compound>";"<MIN><CAP-CAP-CAP>";IGNORE
+<d-D-Z-s>	"<dzs><dzs>";"<single-or-compound><compound>";"<MIN><CAP-CAP-MIN>";IGNORE
+<d-D-z-S>	"<dzs><dzs>";"<single-or-compound><compound>";"<MIN><CAP-MIN-CAP>";IGNORE
+<d-D-z-s>	"<dzs><dzs>";"<single-or-compound><compound>";"<MIN><CAP-MIN-MIN>";IGNORE
+<d-d-Z-S>	"<dzs><dzs>";"<single-or-compound><compound>";"<MIN><MIN-CAP-CAP>";IGNORE
+<d-d-Z-s>	"<dzs><dzs>";"<single-or-compound><compound>";"<MIN><MIN-CAP-MIN>";IGNORE
+<d-d-z-S>	"<dzs><dzs>";"<single-or-compound><compound>";"<MIN><MIN-MIN-CAP>";IGNORE
+<d-d-z-s>	"<dzs><dzs>";"<single-or-compound><compound>";"<MIN><MIN-MIN-MIN>";IGNORE

 reorder-after <U0047>
-<G-Y>		<gy>;<COMPOUND>;<CAP-CAP>;IGNORE
-<G-y>		<gy>;<COMPOUND>;<CAP-MIN>;IGNORE
-<G-G-Y>		"<gy><gy>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><CAP-CAP>";IGNORE
-<G-G-y>		"<gy><gy>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><CAP-MIN>";IGNORE
-<G-g-Y>		"<gy><gy>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><MIN-CAP>";IGNORE
-<G-g-y>		"<gy><gy>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><MIN-MIN>";IGNORE
+<G-Y>		<gy>;<compound>;<CAP-CAP>;IGNORE
+<G-y>		<gy>;<compound>;<CAP-MIN>;IGNORE
+<G-G-Y>		"<gy><gy>";"<single-or-compound><compound>";"<CAP><CAP-CAP>";IGNORE
+<G-G-y>		"<gy><gy>";"<single-or-compound><compound>";"<CAP><CAP-MIN>";IGNORE
+<G-g-Y>		"<gy><gy>";"<single-or-compound><compound>";"<CAP><MIN-CAP>";IGNORE
+<G-g-y>		"<gy><gy>";"<single-or-compound><compound>";"<CAP><MIN-MIN>";IGNORE
 reorder-after <U0067>
-<g-Y>		<gy>;<COMPOUND>;<MIN-CAP>;IGNORE
-<g-y>		<gy>;<COMPOUND>;<MIN-MIN>;IGNORE
-<g-G-Y>		"<gy><gy>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><CAP-CAP>";IGNORE
-<g-G-y>		"<gy><gy>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><CAP-MIN>";IGNORE
-<g-g-Y>		"<gy><gy>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><MIN-CAP>";IGNORE
-<g-g-y>		"<gy><gy>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><MIN-MIN>";IGNORE
+<g-Y>		<gy>;<compound>;<MIN-CAP>;IGNORE
+<g-y>		<gy>;<compound>;<MIN-MIN>;IGNORE
+<g-G-Y>		"<gy><gy>";"<single-or-compound><compound>";"<MIN><CAP-CAP>";IGNORE
+<g-G-y>		"<gy><gy>";"<single-or-compound><compound>";"<MIN><CAP-MIN>";IGNORE
+<g-g-Y>		"<gy><gy>";"<single-or-compound><compound>";"<MIN><MIN-CAP>";IGNORE
+<g-g-y>		"<gy><gy>";"<single-or-compound><compound>";"<MIN><MIN-MIN>";IGNORE

 reorder-after <U004C>
-<L-Y>		<ly>;<COMPOUND>;<CAP-CAP>;IGNORE
-<L-y>		<ly>;<COMPOUND>;<CAP-MIN>;IGNORE
-<L-L-Y>		"<ly><ly>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><CAP-CAP>";IGNORE
-<L-L-y>		"<ly><ly>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><CAP-MIN>";IGNORE
-<L-l-Y>		"<ly><ly>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><MIN-CAP>";IGNORE
-<L-l-y>		"<ly><ly>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><MIN-MIN>";IGNORE
+<L-Y>		<ly>;<compound>;<CAP-CAP>;IGNORE
+<L-y>		<ly>;<compound>;<CAP-MIN>;IGNORE
+<L-L-Y>		"<ly><ly>";"<single-or-compound><compound>";"<CAP><CAP-CAP>";IGNORE
+<L-L-y>		"<ly><ly>";"<single-or-compound><compound>";"<CAP><CAP-MIN>";IGNORE
+<L-l-Y>		"<ly><ly>";"<single-or-compound><compound>";"<CAP><MIN-CAP>";IGNORE
+<L-l-y>		"<ly><ly>";"<single-or-compound><compound>";"<CAP><MIN-MIN>";IGNORE
 reorder-after <U006C>
-<l-Y>		<ly>;<COMPOUND>;<MIN-CAP>;IGNORE
-<l-y>		<ly>;<COMPOUND>;<MIN-MIN>;IGNORE
-<l-L-Y>		"<ly><ly>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><CAP-CAP>";IGNORE
-<l-L-y>		"<ly><ly>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><CAP-MIN>";IGNORE
-<l-l-Y>		"<ly><ly>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><MIN-CAP>";IGNORE
-<l-l-y>		"<ly><ly>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><MIN-MIN>";IGNORE
+<l-Y>		<ly>;<compound>;<MIN-CAP>;IGNORE
+<l-y>		<ly>;<compound>;<MIN-MIN>;IGNORE
+<l-L-Y>		"<ly><ly>";"<single-or-compound><compound>";"<MIN><CAP-CAP>";IGNORE
+<l-L-y>		"<ly><ly>";"<single-or-compound><compound>";"<MIN><CAP-MIN>";IGNORE
+<l-l-Y>		"<ly><ly>";"<single-or-compound><compound>";"<MIN><MIN-CAP>";IGNORE
+<l-l-y>		"<ly><ly>";"<single-or-compound><compound>";"<MIN><MIN-MIN>";IGNORE

 reorder-after <U004E>
-<N-Y>		<ny>;<COMPOUND>;<CAP-CAP>;IGNORE
-<N-y>		<ny>;<COMPOUND>;<CAP-MIN>;IGNORE
-<N-N-Y>		"<ny><ny>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><CAP-CAP>";IGNORE
-<N-N-y>		"<ny><ny>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><CAP-MIN>";IGNORE
-<N-n-Y>		"<ny><ny>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><MIN-CAP>";IGNORE
-<N-n-y>		"<ny><ny>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><MIN-MIN>";IGNORE
+<N-Y>		<ny>;<compound>;<CAP-CAP>;IGNORE
+<N-y>		<ny>;<compound>;<CAP-MIN>;IGNORE
+<N-N-Y>		"<ny><ny>";"<single-or-compound><compound>";"<CAP><CAP-CAP>";IGNORE
+<N-N-y>		"<ny><ny>";"<single-or-compound><compound>";"<CAP><CAP-MIN>";IGNORE
+<N-n-Y>		"<ny><ny>";"<single-or-compound><compound>";"<CAP><MIN-CAP>";IGNORE
+<N-n-y>		"<ny><ny>";"<single-or-compound><compound>";"<CAP><MIN-MIN>";IGNORE
 reorder-after <U006E>
-<n-Y>		<ny>;<COMPOUND>;<MIN-CAP>;IGNORE
-<n-y>		<ny>;<COMPOUND>;<MIN-MIN>;IGNORE
-<n-N-Y>		"<ny><ny>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><CAP-CAP>";IGNORE
-<n-N-y>		"<ny><ny>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><CAP-MIN>";IGNORE
-<n-n-Y>		"<ny><ny>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><MIN-CAP>";IGNORE
-<n-n-y>		"<ny><ny>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><MIN-MIN>";IGNORE
+<n-Y>		<ny>;<compound>;<MIN-CAP>;IGNORE
+<n-y>		<ny>;<compound>;<MIN-MIN>;IGNORE
+<n-N-Y>		"<ny><ny>";"<single-or-compound><compound>";"<MIN><CAP-CAP>";IGNORE
+<n-N-y>		"<ny><ny>";"<single-or-compound><compound>";"<MIN><CAP-MIN>";IGNORE
+<n-n-Y>		"<ny><ny>";"<single-or-compound><compound>";"<MIN><MIN-CAP>";IGNORE
+<n-n-y>		"<ny><ny>";"<single-or-compound><compound>";"<MIN><MIN-MIN>";IGNORE

 reorder-after <U0053>
-<S-Z>		<sz>;<COMPOUND>;<CAP-CAP>;IGNORE
-<S-z>		<sz>;<COMPOUND>;<CAP-MIN>;IGNORE
-<S-S-Z>		"<sz><sz>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><CAP-CAP>";IGNORE
-<S-S-z>		"<sz><sz>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><CAP-MIN>";IGNORE
-<S-s-Z>		"<sz><sz>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><MIN-CAP>";IGNORE
-<S-s-z>		"<sz><sz>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><MIN-MIN>";IGNORE
+<S-Z>		<sz>;<compound>;<CAP-CAP>;IGNORE
+<S-z>		<sz>;<compound>;<CAP-MIN>;IGNORE
+<S-S-Z>		"<sz><sz>";"<single-or-compound><compound>";"<CAP><CAP-CAP>";IGNORE
+<S-S-z>		"<sz><sz>";"<single-or-compound><compound>";"<CAP><CAP-MIN>";IGNORE
+<S-s-Z>		"<sz><sz>";"<single-or-compound><compound>";"<CAP><MIN-CAP>";IGNORE
+<S-s-z>		"<sz><sz>";"<single-or-compound><compound>";"<CAP><MIN-MIN>";IGNORE
 reorder-after <U0073>
-<s-Z>		<sz>;<COMPOUND>;<MIN-CAP>;IGNORE
-<s-z>		<sz>;<COMPOUND>;<MIN-MIN>;IGNORE
-<s-S-Z>		"<sz><sz>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><CAP-CAP>";IGNORE
-<s-S-z>		"<sz><sz>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><CAP-MIN>";IGNORE
-<s-s-Z>		"<sz><sz>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><MIN-CAP>";IGNORE
-<s-s-z>		"<sz><sz>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><MIN-MIN>";IGNORE
+<s-Z>		<sz>;<compound>;<MIN-CAP>;IGNORE
+<s-z>		<sz>;<compound>;<MIN-MIN>;IGNORE
+<s-S-Z>		"<sz><sz>";"<single-or-compound><compound>";"<MIN><CAP-CAP>";IGNORE
+<s-S-z>		"<sz><sz>";"<single-or-compound><compound>";"<MIN><CAP-MIN>";IGNORE
+<s-s-Z>		"<sz><sz>";"<single-or-compound><compound>";"<MIN><MIN-CAP>";IGNORE
+<s-s-z>		"<sz><sz>";"<single-or-compound><compound>";"<MIN><MIN-MIN>";IGNORE

 reorder-after <U0054>
-<T-Y>		<ty>;<COMPOUND>;<CAP-CAP>;IGNORE
-<T-y>		<ty>;<COMPOUND>;<CAP-MIN>;IGNORE
-<T-T-Y>		"<ty><ty>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><CAP-CAP>";IGNORE
-<T-T-y>		"<ty><ty>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><CAP-MIN>";IGNORE
-<T-t-Y>		"<ty><ty>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><MIN-CAP>";IGNORE
-<T-t-y>		"<ty><ty>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><MIN-MIN>";IGNORE
+<T-Y>		<ty>;<compound>;<CAP-CAP>;IGNORE
+<T-y>		<ty>;<compound>;<CAP-MIN>;IGNORE
+<T-T-Y>		"<ty><ty>";"<single-or-compound><compound>";"<CAP><CAP-CAP>";IGNORE
+<T-T-y>		"<ty><ty>";"<single-or-compound><compound>";"<CAP><CAP-MIN>";IGNORE
+<T-t-Y>		"<ty><ty>";"<single-or-compound><compound>";"<CAP><MIN-CAP>";IGNORE
+<T-t-y>		"<ty><ty>";"<single-or-compound><compound>";"<CAP><MIN-MIN>";IGNORE
 reorder-after <U0074>
-<t-Y>		<ty>;<COMPOUND>;<MIN-CAP>;IGNORE
-<t-y>		<ty>;<COMPOUND>;<MIN-MIN>;IGNORE
-<t-T-Y>		"<ty><ty>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><CAP-CAP>";IGNORE
-<t-T-y>		"<ty><ty>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><CAP-MIN>";IGNORE
-<t-t-Y>		"<ty><ty>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><MIN-CAP>";IGNORE
-<t-t-y>		"<ty><ty>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><MIN-MIN>";IGNORE
+<t-Y>		<ty>;<compound>;<MIN-CAP>;IGNORE
+<t-y>		<ty>;<compound>;<MIN-MIN>;IGNORE
+<t-T-Y>		"<ty><ty>";"<single-or-compound><compound>";"<MIN><CAP-CAP>";IGNORE
+<t-T-y>		"<ty><ty>";"<single-or-compound><compound>";"<MIN><CAP-MIN>";IGNORE
+<t-t-Y>		"<ty><ty>";"<single-or-compound><compound>";"<MIN><MIN-CAP>";IGNORE
+<t-t-y>		"<ty><ty>";"<single-or-compound><compound>";"<MIN><MIN-MIN>";IGNORE

 reorder-after <U005A>
-<Z-S>		<zs>;<COMPOUND>;<CAP-CAP>;IGNORE
-<Z-s>		<zs>;<COMPOUND>;<CAP-MIN>;IGNORE
-<Z-Z-S>		"<zs><zs>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><CAP-CAP>";IGNORE
-<Z-Z-s>		"<zs><zs>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><CAP-MIN>";IGNORE
-<Z-z-S>		"<zs><zs>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><MIN-CAP>";IGNORE
-<Z-z-s>		"<zs><zs>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<CAP><MIN-MIN>";IGNORE
+<Z-S>		<zs>;<compound>;<CAP-CAP>;IGNORE
+<Z-s>		<zs>;<compound>;<CAP-MIN>;IGNORE
+<Z-Z-S>		"<zs><zs>";"<single-or-compound><compound>";"<CAP><CAP-CAP>";IGNORE
+<Z-Z-s>		"<zs><zs>";"<single-or-compound><compound>";"<CAP><CAP-MIN>";IGNORE
+<Z-z-S>		"<zs><zs>";"<single-or-compound><compound>";"<CAP><MIN-CAP>";IGNORE
+<Z-z-s>		"<zs><zs>";"<single-or-compound><compound>";"<CAP><MIN-MIN>";IGNORE
 reorder-after <U007A>
-<z-S>		<zs>;<COMPOUND>;<MIN-CAP>;IGNORE
-<z-s>		<zs>;<COMPOUND>;<MIN-MIN>;IGNORE
-<z-Z-S>		"<zs><zs>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><CAP-CAP>";IGNORE
-<z-Z-s>		"<zs><zs>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><CAP-MIN>";IGNORE
-<z-z-S>		"<zs><zs>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><MIN-CAP>";IGNORE
-<z-z-s>		"<zs><zs>";"<SINGLE-OR-COMPOUND><COMPOUND>";"<MIN><MIN-MIN>";IGNORE
+<z-S>		<zs>;<compound>;<MIN-CAP>;IGNORE
+<z-s>		<zs>;<compound>;<MIN-MIN>;IGNORE
+<z-Z-S>		"<zs><zs>";"<single-or-compound><compound>";"<MIN><CAP-CAP>";IGNORE
+<z-Z-s>		"<zs><zs>";"<single-or-compound><compound>";"<MIN><CAP-MIN>";IGNORE
+<z-z-S>		"<zs><zs>";"<single-or-compound><compound>";"<MIN><MIN-CAP>";IGNORE
+<z-z-s>		"<zs><zs>";"<single-or-compound><compound>";"<MIN><MIN-MIN>";IGNORE

 reorder-end

--- a/localedata/locales/ig_NG
+++ b/localedata/locales/ig_NG
@ -46,307 +46,166 @@ category "i18n:2012";LC_MEASUREMENT
 END LC_IDENTIFICATION

 LC_COLLATE
-
-% Igbo uses the following extra letters:
-% idotbelow, odotbelow, udotbelow, nabovedot
-% plus acute and grave combining marks over vowels and n
-% of those, the following have precombined forms:
-% aacute, eacute, iacute, oacute, uacute, nacute
-% agrave, egrave, igrave, ograve, ugrave, ngrave
+% CLDR collation rules for Igbo:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/ig.xml)
 %
-% order: a, b, [c], ch, d, e, f, g, gb, gh, gw, h, i, i., j, k, kp, kw,
-% l, m, n, n., nw, ny, o, o., p, [q], r, s, sh, t, u, u., v, w, [x], y, z
+% <collation type="standard">
+%   <cr><![CDATA[
+%     [normalization on]
+%     &B<ch<<<Ch<<<CH
+%     &G<gb<<<Gb<<<GB<gh<<<Gh<<<GH<gw<<<Gw<<<GW
+%     &I<ị<<<Ị
+%     &K<kp<<<Kp<<<KP<kw<<<Kw<<<KW
+%     &N<ṅ<<<Ṅ<nw<<<Nw<<<NW<ny<<<Ny<<<NY
+%     &O<ọ<<<Ọ
+%     &S<sh<<<Sh<<<SH
+%     &U<ụ<<<Ụ
+%   ]]></cr>
+% </collation>
+%
+% And CLDR also lists the following
+% index characters:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/main/ig.xml)
+%
+% <exemplarCharacters type="index">[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]</exemplarCharacters>
+%
+% The following rules implement the same order for glibc.
+

 copy "iso14651_t1"

-collating-symbol  <c-h-ig>
-collating-element <C-H> from "<U0043><U0048>"
-collating-element <c-h> from "<U0063><U0068>"
-collating-element <C-h> from "<U0043><U0068>"
-collating-element <c-H> from "<U0063><U0048>"
-collating-symbol  <g-b-ig>
-collating-element <G-B> from "<U0047><U0042>"
-collating-element <g-b> from "<U0067><U0062>"
-collating-element <G-b> from "<U0047><U0062>"
-collating-element <g-B> from "<U0067><U0042>"
-collating-symbol  <g-h-ig>
-collating-element <G-H> from "<U0047><U0048>"
-collating-element <g-h> from "<U0067><U0068>"
-collating-element <G-h> from "<U0047><U0068>"
-collating-element <g-H> from "<U0067><U0048>"
-collating-symbol  <g-w-ig>
-collating-element <G-W> from "<U0047><U0057>"
-collating-element <g-w> from "<U0067><U0077>"
-collating-element <G-w> from "<U0047><U0077>"
-collating-element <g-W> from "<U0067><U0057>"
-collating-symbol  <k-p-ig>
-collating-element <K-P> from "<U004B><U0050>"
-collating-element <k-p> from "<U006B><U0070>"
-collating-element <K-p> from "<U004B><U0070>"
-collating-element <k-P> from "<U006B><U0050>"
-collating-symbol  <k-w-ig>
-collating-element <K-W> from "<U004B><U0057>"
-collating-element <k-w> from "<U006B><U0077>"
-collating-element <K-w> from "<U004B><U0077>"
-collating-element <k-W> from "<U006B><U0057>"
-collating-symbol  <n-w-ig>
-collating-element <N-W> from "<U004E><U0057>"
-collating-element <n-w> from "<U006E><U0077>"
-collating-element <N-w> from "<U004E><U0077>"
-collating-element <n-W> from "<U006E><U0057>"
-collating-symbol  <n-y-ig>
-collating-element <N-Y> from "<U004E><U0059>"
-collating-element <n-y> from "<U006E><U0079>"
-collating-element <N-y> from "<U004E><U0079>"
-collating-element <n-Y> from "<U006E><U0059>"
-collating-symbol  <ibelowdot>
-collating-element <I_>  from "<U0049><U0323>"
-collating-element <i_>  from "<U0069><U0323>"
-collating-element <I_'> from "<U0049><U0323><U0301>"
-collating-element <i_'> from "<U0069><U0323><U0301>"
-collating-element <I_`> from "<U0049><U0323><U0300>"
-collating-element <i_`> from "<U0069><U0323><U0300>"
-collating-element <I_2'> from "<U1ECA><U0301>"
-collating-element <i_2'> from "<U1ECB><U0301>"
-collating-element <I_2`> from "<U1ECA><U0300>"
-collating-element <i_2`> from "<U1ECB><U0300>"
-collating-symbol  <obelowdot>
-collating-element <O_>  from "<U004F><U0323>"
-collating-element <o_>  from "<U006F><U0323>"
-collating-element <O_'> from "<U004F><U0323><U0301>"
-collating-element <o_'> from "<U006F><U0323><U0301>"
-collating-element <O_`> from "<U004F><U0323><U0300>"
-collating-element <o_`> from "<U006F><U0323><U0300>"
-collating-element <O_2'> from "<U1ECC><U0301>"
-collating-element <o_2'> from "<U1ECD><U0301>"
-collating-element <O_2`> from "<U1ECC><U0300>"
-collating-element <o_2`> from "<U1ECD><U0300>"
-collating-symbol  <s-h-ig>
-collating-element <S-H> from "<U0053><U0048>"
-collating-element <S-h> from "<U0053><U0068>"
-collating-element <s-H> from "<U0073><U0048>"
-collating-element <s-h> from "<U0073><U0068>"
-collating-symbol  <ubelowdot>
-collating-element <U_>  from "<U0055><U0323>"
-collating-element <u_>  from "<U0075><U0323>"
-collating-element <U_'> from "<U0055><U0323><U0301>"
-collating-element <u_'> from "<U0075><U0323><U0301>"
-collating-element <U_`> from "<U0075><U0323><U0300>"
-collating-element <u_`> from "<U0055><U0323><U0300>"
-collating-element <U_2'> from "<U1EE4><U0301>"
-collating-element <u_2'> from "<U1EE5><U0301>"
-collating-element <U_2`> from "<U1EE4><U0300>"
-collating-element <u_2`> from "<U1EE5><U0300>"
-collating-symbol  <nabovedot>
-collating-element <N.> from "<U004E><U0307>"
-collating-element <n.> from "<U006E><U0307>"
-collating-symbol  <aacute>
-collating-element <A'> from "<U0041><U0301>"
-collating-element <a'> from "<U0061><U0301>"
-collating-symbol  <eacute>
-collating-element <E'> from "<U0045><U0301>"
-collating-element <e'> from "<U0065><U0301>"
-collating-symbol  <iacute>
-collating-element <I'> from "<U0049><U0301>"
-collating-element <i'> from "<U0069><U0301>"
-collating-symbol  <oacute>
-collating-element <O'> from "<U004F><U0301>"
-collating-element <o'> from "<U006F><U0301>"
-collating-symbol  <uacute>
-collating-element <U'> from "<U0055><U0301>"
-collating-element <u'> from "<U0075><U0301>"
-collating-symbol  <agrave>
-collating-element <A`> from "<U0041><U0300>"
-collating-element <a`> from "<U0061><U0300>"
-collating-symbol  <egrave>
-collating-element <E`> from "<U0045><U0300>"
-collating-element <e`> from "<U0065><U0300>"
-collating-symbol  <igrave>
-collating-element <I`> from "<U0049><U0300>"
-collating-element <i`> from "<U0069><U0300>"
-collating-symbol  <ograve>
-collating-element <O`> from "<U004F><U0300>"
-collating-element <o`> from "<U006F><U0300>"
-collating-symbol  <ugrave>
-collating-element <U`> from "<U0055><U0300>"
-collating-element <u`> from "<U0075><U0300>"
+collating-symbol  <ch-digraph>
+collating-element <ch> from "ch"
+collating-element <cH> from "cH"
+collating-element <Ch> from "Ch"
+collating-element <CH> from "CH"
+collating-symbol  <gb-digraph>
+collating-element <gb> from "gb"
+collating-element <gB> from "gB"
+collating-element <Gb> from "Gb"
+collating-element <GB> from "GB"
+collating-symbol  <gh-digraph>
+collating-element <gh> from "gh"
+collating-element <gH> from "gH"
+collating-element <Gh> from "Gh"
+collating-element <GH> from "GH"
+collating-symbol  <gw-digraph>
+collating-element <gw> from "gw"
+collating-element <gW> from "gW"
+collating-element <Gw> from "Gw"
+collating-element <GW> from "GW"
+collating-symbol  <kp-digraph>
+collating-element <kp> from "kp"
+collating-element <kP> from "kP"
+collating-element <Kp> from "Kp"
+collating-element <KP> from "KP"
+collating-symbol  <kw-digraph>
+collating-element <kw> from "kw"
+collating-element <kW> from "kW"
+collating-element <Kw> from "Kw"
+collating-element <KW> from "KW"
+collating-symbol  <nw-digraph>
+collating-element <nw> from "nw"
+collating-element <nW> from "nW"
+collating-element <Nw> from "Nw"
+collating-element <NW> from "NW"
+collating-symbol  <ny-digraph>
+collating-element <ny> from "ny"
+collating-element <nY> from "nY"
+collating-element <Ny> from "Ny"
+collating-element <NY> from "NY"
+collating-symbol  <i-dot-below>
+collating-element <i-dot-below-combining>  from "i<U0323>"
+collating-element <I-dot-below-combining>  from "I<U0323>"
+collating-symbol  <o-dot-below>
+collating-element <o-dot-below-combining>  from "o<U0323>"
+collating-element <O-dot-below-combining>  from "O<U0323>"
+collating-symbol  <sh-digraph>
+collating-element <sh> from "sh"
+collating-element <sH> from "sH"
+collating-element <Sh> from "Sh"
+collating-element <SH> from "SH"
+collating-symbol  <u-dot-below>
+collating-element <u-dot-below-combining>  from "u<U0323>"
+collating-element <U-dot-below-combining>  from "U<U0323>"
+collating-symbol  <n-dot-above>
+collating-element <n-dot-above-combining> from "n<U0307>"
+collating-element <N-dot-above-combining> from "N<U0307>"

-collating-symbol <CAP-MIN>
-collating-symbol <MIN-CAP>
+reorder-after <AFTER-B>
+<ch-digraph>
+reorder-after <AFTER-G>
+<gb-digraph>
+<gh-digraph>
+<gw-digraph>
+reorder-after <AFTER-I>
+<i-dot-below>
+reorder-after <AFTER-K>
+<kp-digraph>
+<kw-digraph>
+reorder-after <AFTER-N>
+<n-dot-above>
+<nw-digraph>
+<ny-digraph>
+reorder-after <AFTER-O>
+<o-dot-below>
+reorder-after <AFTER-S>
+<sh-digraph>
+reorder-after <AFTER-U>
+<u-dot-below>

-reorder-after <MIN>
-<MIN-CAP>
-
-reorder-after <CAP>
-<CAP-MIN>
-
-reorder-after <c>
-<c-h-ig>
-reorder-after <g>
-<g-b-ig>
-<g-h-ig>
-<g-w-ig>
-reorder-after <i>
-<ibelowdot>
-reorder-after <k>
-<k-p-ig>
-<k-w-ig>
-reorder-after <n>
-<nabovedot>
-<n-w-ig>
-<n-y-ig>
-<o>
-<obelowdot>
-reorder-after <s>
-<s-h-ig>
-reorder-after <u>
-<ubelowdot>
-
-reorder-after <U0061>
-<U00E1> <a>;<ACA>;<MIN>;IGNORE
-<a'>    <a>;<ACA>;<MIN>;IGNORE
-<U00E0> <a>;<GRA>;<MIN>;IGNORE
-<a`>    <a>;<GRA>;<MIN>;IGNORE
-reorder-after <U0041>
-<U00C1> <a>;<ACA>;<CAP>;IGNORE
-<A'>    <a>;<ACA>;<CAP>;IGNORE
-<U00C0> <a>;<GRA>;<CAP>;IGNORE
-<A`>    <a>;<GRA>;<CAP>;IGNORE
-
-reorder-after <U0063>
-<c-h>   <c-h-ig>;<PCL>;<MIN>;IGNORE
-<c-H>   <c-h-ig>;<PCL>;<MIN-CAP>;IGNORE
-reorder-after <U0043>
-<C-H>   <c-h-ig>;<PCL>;<CAP>;IGNORE
-<C-h>   <c-h-ig>;<PCL>;<CAP-MIN>;IGNORE
-
-reorder-after <U0065>
-<U00E9> <e>;<ACA>;<MIN>;IGNORE
-<e'>    <e>;<ACA>;<MIN>;IGNORE
-<U00E8> <e>;<GRA>;<MIN>;IGNORE
-<e`>    <e>;<GRA>;<MIN>;IGNORE
-reorder-after <U0045>
-<U00C9> <e>;<ACA>;<CAP>;IGNORE
-<E'>    <e>;<ACA>;<CAP>;IGNORE
-<U00C8> <e>;<GRA>;<CAP>;IGNORE
-<E`>    <e>;<GRA>;<CAP>;IGNORE
-
-reorder-after <U0067>
-<g-b>   <g-b-ig>;<PCL>;<MIN>;IGNORE
-<g-B>   <g-b-ig>;<PCL>;<MIN-CAP>;IGNORE
-<g-h>   <g-h-ig>;<PCL>;<MIN>;IGNORE
-<g-H>   <g-h-ig>;<PCL>;<MIN-CAP>;IGNORE
-<g-w>   <g-w-ig>;<PCL>;<MIN>;IGNORE
-<g-W>   <g-w-ig>;<PCL>;<MIN-CAP>;IGNORE
-reorder-after <U0047>
-<G-B>   <g-b-ig>;<PCL>;<CAP>;IGNORE
-<G-b>   <g-b-ig>;<PCL>;<CAP-MIN>;IGNORE
-<G-H>   <g-h-ig>;<PCL>;<CAP>;IGNORE
-<G-h>   <g-h-ig>;<PCL>;<CAP-MIN>;IGNORE
-<G-W>   <g-w-ig>;<PCL>;<CAP>;IGNORE
-<G-w>   <g-w-ig>;<PCL>;<CAP-MIN>;IGNORE
-
-reorder-after <U0069>
-<U00ED> <i>;<ACA>;<MIN>;IGNORE
-<i'>    <i>;<ACA>;<MIN>;IGNORE
-<U00EC> <i>;<GRA>;<MIN>;IGNORE
-<i`>    <i>;<GRA>;<MIN>;IGNORE
-<U1ECB> <ibelowdot>;<BAS>;<MIN>;IGNORE
-<i_>    <ibelowdot>;<BAS>;<MIN>;IGNORE
-<i_'>   <ibelowdot>;<ACA>;<MIN>;IGNORE
-<i_2'>  <ibelowdot>;<ACA>;<MIN>;IGNORE
-<i_`>   <ibelowdot>;<GRA>;<MIN>;IGNORE
-<i_2`>  <ibelowdot>;<GRA>;<MIN>;IGNORE
-reorder-after <U0049>
-<U00CD> <i>;<ACA>;<CAP>;IGNORE
-<I'>    <i>;<ACA>;<CAP>;IGNORE
-<U00CC> <i>;<GRA>;<CAP>;IGNORE
-<I`>    <i>;<GRA>;<CAP>;IGNORE
-<U1ECA> <ibelowdot>;<BAS>;<CAP>;IGNORE
-<I_>    <ibelowdot>;<CAP>;<CAP>;IGNORE
-<I_'>   <ibelowdot>;<ACA>;<CAP>;IGNORE
-<I_2'>  <ibelowdot>;<ACA>;<CAP>;IGNORE
-<I_`>   <ibelowdot>;<GRA>;<CAP>;IGNORE
-<I_2`>  <ibelowdot>;<GRA>;<CAP>;IGNORE
-
-reorder-after <U0067>
-<k-p>   <k-p-ig>;<PCL>;<MIN>;IGNORE
-<k-P>   <k-p-ig>;<PCL>;<MIN-CAP>;IGNORE
-<k-w>   <k-w-ig>;<PCL>;<MIN>;IGNORE
-<k-W>   <k-w-ig>;<PCL>;<MIN-CAP>;IGNORE
-reorder-after <U0047>
-<K-P>   <k-p-ig>;<PCL>;<CAP>;IGNORE
-<K-p>   <k-p-ig>;<PCL>;<CAP-MIN>;IGNORE
-<K-W>   <k-w-ig>;<PCL>;<CAP>;IGNORE
-<K-w>   <k-w-ig>;<PCL>;<CAP-MIN>;IGNORE
-
-reorder-after <U006E>
-<U1E45> <nabovedot>;<BAS>;<MIN>;IGNORE
-<n.>    <nabovedot>;<BAS>;<MIN>;IGNORE
-<n-w>   <n-w-ig>;<PCL>;<MIN>;IGNORE
-<n-W>   <n-w-ig>;<PCL>;<MIN-CAP>;IGNORE
-<n-y>   <n-y-ig>;<PCL>;<MIN>;IGNORE
-<n-Y>   <n-y-ig>;<PCL>;<MIN-CAP>;IGNORE
-reorder-after <U004E>
-<U1E44> <nabovedot>;<BAS>;<CAP>;IGNORE
-<N.>    <nabovedot>;<BAS>;<CAP>;IGNORE
-<N-W>   <n-w-ig>;<PCL>;<CAP>;IGNORE
-<N-w>   <n-w-ig>;<PCL>;<CAP-MIN>;IGNORE
-<N-Y>   <n-y-ig>;<PCL>;<CAP>;IGNORE
-<N-y>   <n-y-ig>;<PCL>;<CAP-MIN>;IGNORE
-
-reorder-after <U006F>
-<U00F3> <o>;<ACA>;<MIN>;IGNORE
-<o'>    <o>;<ACA>;<MIN>;IGNORE
-<U00F2> <o>;<GRA>;<MIN>;IGNORE
-<o`>    <o>;<GRA>;<MIN>;IGNORE
-<U1ECD> <obelowdot>;<BAS>;<MIN>;IGNORE
-<o_>    <obelowdot>;<BAS>;<MIN>;IGNORE
-<o_'>   <obelowdot>;<ACA>;<MIN>;IGNORE
-<o_2'>  <obelowdot>;<ACA>;<MIN>;IGNORE
-<o_`>   <obelowdot>;<GRA>;<MIN>;IGNORE
-<o_2`>  <obelowdot>;<GRA>;<MIN>;IGNORE
-reorder-after <U004F>
-<U00D3> <o>;<ACA>;<CAP>;IGNORE
-<O'>    <o>;<ACA>;<CAP>;IGNORE
-<U00D2> <o>;<GRA>;<CAP>;IGNORE
-<O`>    <o>;<GRA>;<CAP>;IGNORE
-<U1ECC> <obelowdot>;<BAS>;<CAP>;IGNORE
-<O_>    <obelowdot>;<BAS>;<CAP>;IGNORE
-<O_'>   <obelowdot>;<ACA>;<CAP>;IGNORE
-<O_2'>  <obelowdot>;<ACA>;<CAP>;IGNORE
-<O_`>   <obelowdot>;<GRA>;<CAP>;IGNORE
-<O_2`>  <obelowdot>;<GRA>;<CAP>;IGNORE
-
-reorder-after <U0073>
-<s-h>   <s-h-ig>;<PCL>;<MIN>;IGNORE
-<s-H>   <s-h-ig>;<PCL>;<MIN-CAP>;IGNORE
-reorder-after <U0053>
-<S-H>   <s-h-ig>;<PCL>;<CAP>;IGNORE
-<S-h>   <s-h-ig>;<PCL>;<CAP-MIN>;IGNORE
-
-reorder-after <U0075>
-<U00FA> <u>;<ACA>;<MIN>;IGNORE
-<u'>    <u>;<ACA>;<MIN>;IGNORE
-<U00F9> <u>;<GRA>;<MIN>;IGNORE
-<u`>    <u>;<GRA>;<MIN>;IGNORE
-<U1EE5> <ubelowdot>;<BAS>;<MIN>;IGNORE
-<u_>    <ubelowdot>;<BAS>;<MIN>;IGNORE
-<u_'>   <ubelowdot>;<ACA>;<MIN>;IGNORE
-<u_2'>  <ubelowdot>;<ACA>;<MIN>;IGNORE
-<u_`>   <ubelowdot>;<GRA>;<MIN>;IGNORE
-<u_2`>  <ubelowdot>;<GRA>;<MIN>;IGNORE
-reorder-after <U0055>
-<U00DA> <u>;<ACA>;<CAP>;IGNORE
-<U'>    <u>;<ACA>;<CAP>;IGNORE
-<U00D9> <u>;<GRA>;<CAP>;IGNORE
-<U`>    <u>;<GRA>;<CAP>;IGNORE
-<U1EE4> <ubelowdot>;<BAS>;<CAP>;IGNORE
-<U_>    <ubelowdot>;<BAS>;<CAP>;IGNORE
-<U_'>   <ubelowdot>;<ACA>;<CAP>;IGNORE
-<U_2'>  <ubelowdot>;<ACA>;<CAP>;IGNORE
-<U_`>   <ubelowdot>;<GRA>;<CAP>;IGNORE
-<U_2`>  <ubelowdot>;<GRA>;<CAP>;IGNORE
+<ch>                     <ch-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<cH>                     <ch-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<Ch>                     <ch-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<CH>                     <ch-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<gb>                     <gb-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<gB>                     <gb-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<Gb>                     <gb-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<GB>                     <gb-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<gh>                     <gh-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<gH>                     <gh-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<Gh>                     <gh-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<GH>                     <gh-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<gw>                     <gw-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<gW>                     <gw-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<Gw>                     <gw-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<GW>                     <gw-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<U1ECB>                 <i-dot-below>;"<BASE><BASE>";"<MIN><MIN>";<VRNT1> % ị
+<i-dot-below-combining> <i-dot-below>;"<BASE><BASE>";"<MIN><MIN>";<VRNT2>
+<U1ECA>                 <i-dot-below>;"<BASE><BASE>";"<CAP><MIN>";<VRNT1> % Ị
+<I-dot-below-combining> <i-dot-below>;"<BASE><BASE>";"<CAP><MIN>";<VRNT2>
+<kp>                     <kp-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<kP>                     <kp-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<Kp>                     <kp-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<KP>                     <kp-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<kw>                     <kw-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<kW>                     <kw-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<Kw>                     <kw-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<KW>                     <kw-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<U1E45>                 <n-dot-above>;"<BASE><BASE>";"<MIN><MIN>";<VRNT1> % ṅ
+<n-dot-above-combining> <n-dot-above>;"<BASE><BASE>";"<MIN><MIN>";<VRNT2>
+<U1E44>                 <n-dot-above>;"<BASE><BASE>";"<CAP><MIN>";<VRNT1> % Ṅ
+<N-dot-above-combining> <n-dot-above>;"<BASE><BASE>";"<CAP><MIN>";<VRNT2>
+<nw>                     <nw-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<nW>                     <nw-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<Nw>                     <nw-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<NW>                     <nw-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<ny>                     <ny-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<nY>                     <ny-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<Ny>                     <ny-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<NY>                     <ny-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<U1ECD>                 <o-dot-below>;"<BASE><BASE>";"<MIN><MIN>";<VRNT1> % ọ
+<o-dot-below-combining> <o-dot-below>;"<BASE><BASE>";"<MIN><MIN>";<VRNT2>
+<U1ECC>                 <o-dot-below>;"<BASE><BASE>";"<CAP><MIN>";<VRNT1> % Ọ
+<O-dot-below-combining> <o-dot-below>;"<BASE><BASE>";"<CAP><MIN>";<VRNT2>
+<sh>                     <sh-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<sH>                     <sh-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<Sh>                     <sh-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<SH>                     <sh-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<U1EE5>                 <u-dot-below>;"<BASE><BASE>";"<MIN><MIN>";<VRNT1> % ụ
+<u-dot-below-combining> <u-dot-below>;"<BASE><BASE>";"<MIN><MIN>";<VRNT2>
+<U1EE4>                 <u-dot-below>;"<BASE><BASE>";"<CAP><MIN>";<VRNT1> % Ụ
+<U-dot-below-combining> <u-dot-below>;"<BASE><BASE>";"<CAP><MIN>";<VRNT2>

 reorder-end

--- a/localedata/locales/ik_CA
+++ b/localedata/locales/ik_CA
@ -46,106 +46,85 @@ category "i18n:2012";LC_MEASUREMENT
 END LC_IDENTIFICATION

 LC_COLLATE
-
 % Inupiaq uses the following extra letters:
 % gdotabove, ldotbelow, lbarred, lbarreddotbelow (not in unicode,
 % has to be composed as lbarred+composingdotbelow), eng, ntilde
 %
 % sorting order from
-% http://www.nsbsd.org/anep/public/index.cfm/17,459,html
-% however I'm not
+% http://www.nsbsd.org/anep/public/index.cfm/17,459,html (not available anymore).
+% But now Wikipedia has something:
+% https://en.wikipedia.org/wiki/Inupiaq_language#Writing_systems
+%
+% However I'm not
 % sure if all letters are to be considered as separate items for
 % sorting purposes...
 %
-% order: a, [b], [c], ch, [d], [e], [f], g, g., h, i, [j], k, l,
-% l/, l-., l/-., m, n, n?, ng, [o], p, q, r, s, sr, t, u, v, [w],
-% [x], y, [z]
+% order:
+% a [b] [c] ch [d] [e] [f] g ġ h i [j] k l ḷ ł ł̣ m n ñ ŋ [o] p q r s sr t u v [w] [x] y [z]
+%
+% There is no collation information for Inupiaq in CLDR.
+%
+% We implement the following rules:

 copy "iso14651_t1"

-collating-symbol  <c-h-ik>
-collating-element <C-H> from "<U0043><U0048>"
-collating-element <c-h> from "<U0063><U0068>"
-collating-element <C-h> from "<U0043><U0068>"
-collating-element <c-H> from "<U0063><U0048>"
-collating-symbol  <s-r-ik>
-collating-element <S-R> from "<U0053><U0052>"
-collating-element <s-r> from "<U0073><U0072>"
-collating-element <S-r> from "<U0053><U0072>"
-collating-element <s-R> from "<U0073><U0052>"
-collating-symbol  <l-dotbelow-ik>
-collating-element <L-dot> from "<U004C><U0323>"
-collating-element <l-dot> from "<U006C><U0323>"
-collating-symbol  <lbar-dotbelow-ik>
-collating-element <Lbar-dot> from "<U0141><U0323>"
-collating-element <lbar-dot> from "<U0142><U0323>"
-collating-symbol  <gdot>
-collating-symbol  <lbar>
-collating-symbol  <ntilde>
+collating-symbol  <ch-digraph>
+collating-element <CH> from "CH"
+collating-element <ch> from "ch"
+collating-element <Ch> from "Ch"
+collating-element <cH> from "cH"
+collating-symbol  <g-dot-above>
+collating-symbol  <l-stroke>
+collating-symbol  <l-dot-below>
+collating-symbol  <l-dot-below-macron>
+collating-symbol  <n-tilde>
 collating-symbol  <eng>
+collating-symbol  <sr-digraph>
+collating-element <SR> from "SR"
+collating-element <sr> from "sr"
+collating-element <Sr> from "Sr"
+collating-element <sR> from "sR"
+collating-element <L-combining-dot-below> from "L<U0323>" % Ḷ
+collating-element <l-combining-dot-below> from "l<U0323>" % ḷ
+collating-element <L-stroke-combining-dot-below> from "<U0141><U0323>" % Ł̣
+collating-element <l-stroke-combining-dot-below> from "<U0142><U0323>" % ł̣

-collating-symbol <CAP-MIN>
-collating-symbol <MIN-CAP>
-
-reorder-after <MIN>
-<MIN-CAP>
-
-reorder-after <CAP>
-<CAP-MIN>
-
-reorder-after <c>
-<c-h-ik>
-reorder-after <g>
-<gdot>
-reorder-after <l>
-<lbar>
-<l-dotbelow-ik>
-<lbar-dotbelow-ik>
-reorder-after <n>
-<ntilde>
+reorder-after <AFTER-C>
+<ch-digraph>
+reorder-after <AFTER-G>
+<g-dot-above>
+reorder-after <AFTER-L>
+<l-dot-below>
+<l-stroke>
+<l-stroke-dot-below>
+reorder-after <AFTER-N>
+<n-tilde>
 <eng>
-reorder-after <s>
-<s-r-ik>
-
-reorder-after <U0063>
-<c-h>   <c-h-ik>;<PCT>;<MIN>;IGNORE
-<c-H>   <c-h-ik>;<PCT>;<MIN-CAP>;IGNORE
-reorder-after <U0043>
-<C-H>   <c-h-ik>;<PCT>;<CAP>;IGNORE
-<C-h>   <c-h-ik>;<PCT>;<CAP-MIN>;IGNORE
-
-reorder-after <U0067>
-<U0121>   <gdot>;<PCT>;<MIN>;IGNORE
-reorder-after <U0047>
-<U0120>   <gdot>;<PCT>;<CAP>;IGNORE
-
-reorder-after <U006C>
-<U0142> <lbar>;<BAS>;<MIN>;IGNORE
-<l-dot> <l-dotbelow-ik>;<PCT>;<MIN>;IGNORE
-<U1E37> <l-dotbelow-ik>;<PCT>;<MIN>;IGNORE
-<U1E39> <l-dotbelow-ik>;<PCT>;<MIN>;IGNORE
-<lbar-dot> <lbar-dotbelow-ik>;<PCT>;<MIN>;IGNORE
-reorder-after <U004C>
-<U0141> <lbar>;<BAS>;<CAP>;IGNORE
-<L-dot> <l-dotbelow-ik>;<PCT>;<CAP>;IGNORE
-<U1E36> <l-dotbelow-ik>;<PCT>;<CAP>;IGNORE
-<U1E38> <l-dotbelow-ik>;<PCT>;<CAP>;IGNORE
-<Lbar-dot> <lbar-dotbelow-ik>;<PCT>;<CAP>;IGNORE
-
-reorder-after <U006E>
-<U00F1> <ntilde>;<TIL>;<MIN>;IGNORE
-<U014B> <eng>;<PCL>;<MIN>;IGNORE
-reorder-after <U004E>
-<U00D1> <ntilde>;<TIL>;<CAP>;IGNORE
-<U014A> <eng>;<PCL>;<CAP>;IGNORE
-
-reorder-after <U0073>
-<s-r>   <s-r-ik>;<PCT>;<MIN>;IGNORE
-<s-R>   <s-r-ik>;<PCT>;<MIN-CAP>;IGNORE
-reorder-after <U0053>
-<S-R>   <s-r-ik>;<PCT>;<CAP>;IGNORE
-<S-r>   <s-r-ik>;<PCT>;<CAP-MIN>;IGNORE
+reorder-after <AFTER-S>
+<sr-digraph>

+<ch>                           <ch-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<cH>                           <ch-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<Ch>                           <ch-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<CH>                           <ch-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<U0121>                        <g-dot-above>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ġ
+<U0120>                        <g-dot-above>;"<BASE><BASE>";"<CAP><CAP>";IGNORE % Ġ
+<U0142>                        <l-stroke>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ł
+<U0141>                        <l-stroke>;"<BASE><BASE>";"<CAP><CAP>";IGNORE % Ł
+<U1E37>                        <l-dot-below>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ḷ
+<l-combining-dot-below>        <l-dot-below>;"<BASE><VRNT1>";"<MIN><MIN>";IGNORE
+<U1E36>                        <l-dot-below>;"<BASE><BASE>";"<CAP><CAP>";IGNORE % Ḷ
+<L-combining-dot-below>        <l-dot-below>;"<BASE><VRNT1>";"<CAP><CAP>";IGNORE
+<l-stroke-combining-dot-below> <l-stroke-dot-below>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<L-stroke-combining-dot-below> <l-stroke-dot-below>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<U00F1>                        <n-tilde>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ñ
+<U00D1>                        <n-tilde>;"<BASE><BASE>";"<CAP><CAP>";IGNORE % Ñ
+<U014B>                        <eng>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ŋ
+<U014A>                        <eng>;"<BASE><BASE>";"<CAP><CAP>";IGNORE % Ŋ
+<sr>                           <sr-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<sR>                           <sr-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<Sr>                           <sr-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<SR>                           <sr-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE

 reorder-end

--- a/localedata/locales/is_IS
+++ b/localedata/locales/is_IS
@ -88,22 +88,22 @@ collating-symbol <o-diaresis>
 collating-symbol <o-stroke>
 collating-symbol <a-ring>

-reorder-after <a>
+reorder-after <BEFORE-B>
 <a-acute>
-reorder-after <d>
+reorder-after <AFTER-D>
 <d-stroke>
 <eth>
-reorder-after <e>
+reorder-after <BEFORE-F>
 <e-acute>
-reorder-after <i>
+reorder-after <BEFORE-J>
 <i-acute>
-reorder-after <o>
+reorder-after <BEFORE-P>
 <o-acute>
-reorder-after <u>
+reorder-after <BEFORE-V>
 <u-acute>
-reorder-after <y>
+reorder-after <BEFORE-Z>
 <y-acute>
-reorder-after <zh>
+reorder-after <AFTER-EZH>
 <thorn>
 <ae-ligature>
 <a-diaresis>
@ -111,34 +111,34 @@ reorder-after <zh>
 <o-stroke>
 <a-ring>

-<U00E1> <a-acute>;<ACA>;<MIN>;IGNORE % á
-<U00C1> <a-acute>;<ACA>;<CAP>;IGNORE % Á
-<U0111> <d-stroke>;<OBL>;<MIN>;IGNORE % đ
-<U0110> <d-stroke>;<OBL>;<CAP>;IGNORE % Đ
-<U00F0> <eth>;<PCL>;<MIN>;IGNORE % ð
-<U00D0> <eth>;<PCL>;<CAP>;IGNORE % Ð
-<U00E9> <e-acute>;<ACA>;<MIN>;IGNORE % é
-<U00C9> <e-acute>;<ACA>;<CAP>;IGNORE % É
-<U00ED> <i-acute>;<ACA>;<MIN>;IGNORE % í
-<U00CD> <i-acute>;<ACA>;<CAP>;IGNORE % Í
-<U00F3> <o-acute>;<ACA>;<MIN>;IGNORE % ó
-<U00D3> <o-acute>;<ACA>;<CAP>;IGNORE % Ó
-<U00FA> <u-acute>;<ACA>;<MIN>;IGNORE % ú
-<U00DA> <u-acute>;<ACA>;<CAP>;IGNORE % Ú
-<U00FD> <y-acute>;<ACA>;<MIN>;IGNORE % ý
-<U00DD> <y-acute>;<ACA>;<CAP>;IGNORE % Ý
-<U00FE> <thorn>;<BAS>;<MIN>;IGNORE % þ
-<U00DE> <thorn>;<BAS>;<CAP>;IGNORE % Þ
-<U00E6> <ae-ligature>;"<LIG><LIG>";"<MIN><MIN>";IGNORE % æ
-<U00C6> <ae-ligature>;"<LIG><LIG>";"<CAP><CAP>";IGNORE % Æ
-<U00E4> <a-diaresis>;<REU>;<MIN>;IGNORE % ä
-<U00C4> <a-diaresis>;<REU>;<CAP>;IGNORE % Ä
-<U00F6> <o-diaresis>;<REU>;<MIN>;IGNORE % ö
-<U00D6> <o-diaresis>;<REU>;<CAP>;IGNORE % Ö
-<U00F8> <o-stroke>;<OBL>;<MIN>;IGNORE % ø
-<U00D8> <o-stroke>;<OBL>;<CAP>;IGNORE % Ø
-<U00E5> <a-ring>;<RNE>;<MIN>;IGNORE % å
-<U00C5> <a-ring>;<RNE>;<CAP>;IGNORE % Å
+<U00E1> <a-acute>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % á
+<U00C1> <a-acute>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Á
+<U0111> <d-stroke>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % đ
+<U0110> <d-stroke>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Đ
+<U00F0> <eth>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ð
+<U00D0> <eth>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ð
+<U00E9> <e-acute>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % é
+<U00C9> <e-acute>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % É
+<U00ED> <i-acute>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % í
+<U00CD> <i-acute>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Í
+<U00F3> <o-acute>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ó
+<U00D3> <o-acute>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ó
+<U00FA> <u-acute>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ú
+<U00DA> <u-acute>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ú
+<U00FD> <y-acute>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ý
+<U00DD> <y-acute>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ý
+<U00FE> <thorn>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % þ
+<U00DE> <thorn>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Þ
+<U00E6> <ae-ligature>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % æ
+<U00C6> <ae-ligature>;"<BASE><BASE>";"<CAP><CAP>";IGNORE % Æ
+<U00E4> <a-diaresis>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ä
+<U00C4> <a-diaresis>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ä
+<U00F6> <o-diaresis>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ö
+<U00D6> <o-diaresis>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ö
+<U00F8> <o-stroke>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ø
+<U00D8> <o-stroke>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ø
+<U00E5> <a-ring>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % å
+<U00C5> <a-ring>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Å

 reorder-end

--- a/localedata/locales/iso14651_t1_common
+++ b/localedata/locales/iso14651_t1_common
@ -85610,4 +85610,3 @@ END LC_COLLATE

 % Decomment the line above to create a 14652-style
 %   LC_COLLATE definition.
-
--- a/localedata/locales/iso14651_t1_pinyin
+++ b/localedata/locales/iso14651_t1_pinyin
@ -9,9 +9,8 @@ LC_COLLATE

 copy "iso14651_t1_common"

-script <HAN>
+reorder-after <BEFORE-LATIN>

-order_start <HAN>;forward;forward;forward;forward,position
 <U5416> <U5416>;IGNORE;IGNORE;IGNORE	#吖104
 <U814C> <U814C>;IGNORE;IGNORE;IGNORE	#腌185
 <U9312> <U9312>;IGNORE;IGNORE;IGNORE	#錒0
@ -25508,7 +25507,7 @@ order_start <HAN>;forward;forward;forward;forward,position
 <U8444> <U8444>;IGNORE;IGNORE;IGNORE	#葄0
 <U888F> <U888F>;IGNORE;IGNORE;IGNORE	#袏0
 <U963C> <U963C>;IGNORE;IGNORE;IGNORE	#阼0
-#
-order_end
-#
+
+reorder-end
+
 END LC_COLLATE
--- a/localedata/locales/kk_KZ
+++ b/localedata/locales/kk_KZ
@ -51,103 +51,45 @@ category "i18n:2012";LC_MEASUREMENT
 END LC_IDENTIFICATION

 LC_COLLATE
+% CLDR collation rules for Kazakh:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/kk.xml)
+%
+% <collation type="standard">
+% 	<cr><![CDATA[
+% 		[reorder Cyrl]
+% 		# The root collation already sorts й/Й as a base letter.
+% 		&Е<ё<<<Ё
+% 		&Ұ<ү<<<Ү
+% 		&[before 1]ь<і<<<І
+% 	]]></cr>
+% </collation>
+%
+% And CLDR also lists the following
+% index characters:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/main/kk.xml)
+%
+% <exemplarCharacters type="index">[А Ә Б В Г Ғ Д Е Ё Ж З И Й К Қ Л М Н Ң О Ө П Р С Т У Ұ Ү Ф Х Һ Ц Ч Ш Щ Ъ Ы І Ь Э Ю Я]</exemplarCharacters>
+%
+% The following rules implement the same order for glibc.
 copy "iso14651_t1"

-% iso14651_t1 is missing Ukrainian ghe
-collating-symbol <UKR-GHE>
-collating-symbol <CYR-SCHWA>
-collating-symbol <CYR-GHE-WITH-STROKE>
-collating-symbol <CYR-KA-WITH-DESCENDER>
-collating-symbol <CYR-EN-WITH-DESCENDER>
-collating-symbol <CYR-BARRED-O>
-collating-symbol <CYR-STRAIGHT-U-WITH-STROKE>
-collating-symbol <CYR-STRAIGHT-U>
-collating-symbol <CYR-SHHA>
-collating-symbol <CYR-BEL-UKR-I>
+collating-symbol <io>
+collating-symbol <straight-u>
+collating-symbol <i>

-reorder-after <CYR-GZHE>
-<UKR-GHE>
+reorder-after <S0435> % CYRILLIC SMALL LETTER IE
+<io>
+reorder-after <S04B1> % CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE
+<straight-u>
+reorder-after <S044B> % CYRILLIC SMALL LETTER YERU
+<i>

-reorder-after <U0453>
-<U0491> <UKR-GHE>;<BAS>;<MIN>;IGNORE
-
-reorder-after <U0403>
-<U0490> <UKR-GHE>;<BAS>;<CAP>;IGNORE
-
-reorder-after <CYR-A>
-<CYR-SCHWA>
-
-reorder-after <U0430>
-<U04D9> <CYR-SCHWA>;<BAS>;<MIN>;IGNORE
-
-reorder-after <U0410>
-<U04D8> <CYR-SCHWA>;<BAS>;<CAP>;IGNORE
-
-reorder-after <CYR-GHE>
-<CYR-GHE-WITH-STROKE>
-
-reorder-after <U0433>
-<U0493> <CYR-GHE-WITH-STROKE>;<BAS>;<MIN>;IGNORE
-
-reorder-after <U0413>
-<U0492> <CYR-GHE-WITH-STROKE>;<BAS>;<CAP>;IGNORE
-
-reorder-after <CYR-KA>
-<CYR-KA-WITH-DESCENDER>
-
-reorder-after <U043A>
-<U049B> <CYR-KA-WITH-DESCENDER>;<BAS>;<MIN>;IGNORE
-
-reorder-after <U041A>
-<U049A> <CYR-KA-WITH-DESCENDER>;<BAS>;<CAP>;IGNORE
-
-reorder-after <CYR-EN>
-<CYR-EN-WITH-DESCENDER>
-
-reorder-after <U043D>
-<U04A3> <CYR-EN-WITH-DESCENDER>;<BAS>;<MIN>;IGNORE
-
-reorder-after <U041D>
-<U04A2> <CYR-EN-WITH-DESCENDER>;<BAS>;<CAP>;IGNORE
-
-reorder-after <CYR-O>
-<CYR-BARRED-O>
-
-reorder-after <U043E>
-<U04E9> <CYR-BARRED-O>;<BAS>;<MIN>;IGNORE
-
-reorder-after <U041E>
-<U04E8> <CYR-BARRED-O>;<BAS>;<CAP>;IGNORE
-
-reorder-after <CYR-OU>
-<CYR-STRAIGHT-U-WITH-STROKE>
-<CYR-STRAIGHT-U>
-
-reorder-after <U0443>
-<U04B1> <CYR-STRAIGHT-U-WITH-STROKE>;<BAS>;<MIN>;IGNORE
-<U04AF> <CYR-STRAIGHT-U>;<BAS>;<MIN>;IGNORE
-
-reorder-after <U0423>
-<U04B0> <CYR-STRAIGHT-U-WITH-STROKE>;<BAS>;<CAP>;IGNORE
-<U04AE> <CYR-STRAIGHT-U>;<BAS>;<CAP>;IGNORE
-
-reorder-after <CYR-HA>
-<CYR-SHHA>
-
-reorder-after <U0445>
-<U04BB> <CYR-SHHA>;<BAS>;<MIN>;IGNORE
-
-reorder-after <U0425>
-<U04BA> <CYR-SHHA>;<BAS>;<CAP>;IGNORE
-
-reorder-after <CYR-YEROU>
-<CYR-BEL-UKR-I>
-
-reorder-after <U044B>
-<U0456> <CYR-BEL-UKR-I>;<BAS>;<MIN>;IGNORE
-
-reorder-after <U042B>
-<U0406> <CYR-BEL-UKR-I>;<BAS>;<CAP>;IGNORE
+<U0451>                <io>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ё
+<U0401>                <io>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ё
+<U04AF>        <straight-u>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ү
+<U04AE>        <straight-u>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ү
+<U0456>                 <i>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % і
+<U0406>                 <i>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % І

 reorder-end
 END LC_COLLATE
--- a/localedata/locales/ku_TR
+++ b/localedata/locales/ku_TR
@ -53,58 +53,47 @@ copy "tr_TR"
 END LC_CTYPE

 LC_COLLATE
+% CLDR has neither collation rules nor index characters for Kurdish yet.
+%
+%% a b c ç d e ê f g h ı i î j k l m n o p q r s ş t u û v w x y z
 copy "iso14651_t1"

-%% a b c c, d e e> f g h i i> j k l m n o p q r s s, t u u> v w x y z

-collating-symbol <c,>
-collating-symbol <e/>>
-collating-symbol <i.>
-collating-symbol <i/>>
-collating-symbol <s,>
-collating-symbol <u/>>
+collating-symbol <c-cedilla>
+collating-symbol <e-circumflex>
+collating-symbol <i-dotless>
+collating-symbol <i-dot>
+collating-symbol <i-circumflex>
+collating-symbol <s-cedilla>
+collating-symbol <u-circumflex>

-reorder-after <c>
-<c,>
-reorder-after <e>
-<e/>>
-reorder-after <h>
-<i>
-<i.>
-<i/>>
-reorder-after <s>
-<s,>
-reorder-after <u>
-<u/>>
+reorder-after <AFTER-C>
+<c-cedilla>
+reorder-after <AFTER-E>
+<e-circumflex>
+reorder-after <AFTER-H>
+<i-dotless>
+<i-dot>
+<i-circumflex>
+reorder-after <AFTER-S>
+<s-cedilla>
+reorder-after <AFTER-U>
+<u-circumflex>

-reorder-after <U0063>
-<U00E7> <c,>;<CDI>;<MIN>;IGNORE
-reorder-after <U0043>
-<U00C7> <c,>;<CDI>;<CAP>;IGNORE
-
-reorder-after <U0065>
-<U00EA> <e/>>;<CIR>;<MIN>;IGNORE
-reorder-after <U0045>
-<U00CA> <e/>>;<CIR>;<CAP>;IGNORE
-
-reorder-after <U0068>
-<U0131> <i>;<BAS>;<MIN>;IGNORE
-<U0069> <i.>;<PCT>;<MIN>;IGNORE
-<U00EE> <i/>>;<CIR>;<MIN>;IGNORE
-reorder-after <U0048>
-<U0049> <i>;<BAS>;<CAP>;IGNORE
-<U0130> <i.>;<PCT>;<CAP>;IGNORE
-<U00CE> <i/>>;<CIR>;<CAP>;IGNORE
-
-reorder-after <U0073>
-<U015F> <s,>;<CDI>;<MIN>;IGNORE
-reorder-after <U0053>
-<U015E> <s,>;<CDI>;<CAP>;IGNORE
-
-reorder-after <U0075>
-<U00FB> <u/>>;<CIR>;<MIN>;IGNORE
-reorder-after <U0055>
-<U00DB> <u/>>;<CIR>;<CAP>;IGNORE
+<U00E7> <c-cedilla>;<BASE>;<MIN>;IGNORE % ç
+<U00C7> <c-cedilla>;<BASE>;<CAP>;IGNORE % Ç
+<U00EA> <e-circumflex>;<BASE>;<MIN>;IGNORE % ê
+<U00CA> <e-circumflex>;<BASE>;<CAP>;IGNORE % Ê
+<U0131> <i-dotless>;<BASE>;<MIN>;IGNORE % ı
+<U0069> <i-dot>;<BASE>;<MIN>;IGNORE % i
+<U00EE> <i-circumflex>;<BASE>;<MIN>;IGNORE % î
+<U0049> <i-dotless>;<BASE>;<CAP>;IGNORE % I
+<U0130> <i-dot>;<BASE>;<CAP>;IGNORE % İ
+<U00CE> <i-circumflex>;<BASE>;<CAP>;IGNORE % Î
+<U015F> <s-cedilla>;<BASE>;<MIN>;IGNORE % ş
+<U015E> <s-cedilla>;<BASE>;<CAP>;IGNORE % Ş
+<U00FB> <u-circumflex>;<BASE>;<MIN>;IGNORE % û
+<U00DB> <u-circumflex>;<BASE>;<CAP>;IGNORE % Û

 reorder-end

--- a/localedata/locales/ky_KG
+++ b/localedata/locales/ky_KG
@ -39,44 +39,39 @@ category "i18n:2012";LC_MEASUREMENT
 END LC_IDENTIFICATION

 LC_COLLATE
-
-% The kyrgyz cyrillic alphabet is:
-% a=, b=, v=, g=, d=, e=, io, z%, z=, i=, j=, k=, l=, m=, n=, n,=,
-% o=, o-=, p=, r=, s=, t=, u=, u'=, f=, h=, c=, c%, s%, sc, =', y=, %',
-% je, ju, ja
+% CLDR collation rules for Kyrgyz:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/ky.xml)
+%
+% 	<collations>
+% 		<collation type="standard">
+% <!-- Mostly standard Cyrillic sort order,
+%   see http://en.wikipedia.org/wiki/Kyrgyz_alphabets#Correspondence_chart
+%   Tilek Mamutov (Google) confirms that ё and й should sort as base letters,
+%   but for string search ё should only be secondary-different from е. -->
+% <cr><![CDATA[
+% [reorder Cyrl]
+% # The root collation already sorts й/Й as a base letter.
+% &е<ё<<<Ё
+% ]]></cr>
+% 		</collation>
+% 	</collations>
+%
+% And CLDR also lists the following
+% index characters:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/main/ky.xml)
+%
+% <exemplarCharacters type="index">[А Б В Г Д Е Ё Ж З И Й К Л М Н Ң О Ө П Р С Т У Ү Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я]</exemplarCharacters>
 %
-% special letters are:
-% n,=: <U04A2>, <U04A3>
-% o-=: <U04E8>, <U04E9>
-% u'=: <U04AE>, <U04AF>

 copy "iso14651_t1"

-collating-symbol <o-=>
-collating-symbol <u'=>
-collating-symbol <n,=>
+collating-symbol <io>

-reorder-after <CYR-EN>
-<n,=>
-reorder-after <CYR-O>
-<o-=>
-reorder-after <CYR-OUBRE>
-<u'=>
+reorder-after <S0435> % CYRILLIC SMALL LETTER IE
+<io>

-reorder-after <U043D>
-<U04A3> <n,=>;<PCL>;<MIN>;IGNORE
-reorder-after <U041D>
-<U04A2> <n,=>;<PCL>;<CAP>;IGNORE
-
-reorder-after <U043E>
-<U04E9> <o-=>;<PCL>;<MIN>;IGNORE
-reorder-after <U041E>
-<U04E8> <o-=>;<PCL>;<CAP>;IGNORE
-
-reorder-after <U0443>
-<U04AF> <u'=>;<PCL>;<MIN>;IGNORE
-reorder-after <U0423>
-<U04AE> <u'=>;<PCL>;<CAP>;IGNORE
+<U0451>                <io>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ё
+<U0401>                <io>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ё

 reorder-end

--- a/localedata/locales/ln_CD
+++ b/localedata/locales/ln_CD
@ -43,30 +43,37 @@ translit_end
 END LC_CTYPE

 LC_COLLATE
-% Copy the template from ISO/IEC 14651 i.e.
-% use the rules there when making ordered lists of words.
-% add special characters for Lingala
-% a b c d e ɛ f g h i j k l m o ɔ  p (q) (r) s t u v w (x) y z
-% mb mp nd ng nk ns nt nz are not ordered as digraph, use ln_CD@morph
-% should mf, mv, kp, kw, gb, gw, ngb, ngw be included?
+% CLDR collation rules for Lingala:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/ln.xml)
+%
+% <collation type="standard">
+% 	<cr><![CDATA[
+% 		&E<ɛ<<<Ɛ
+% 		&O<<ɔ<<<Ɔ
+% 	]]></cr>
+% </collation>
+%
+% And CLDR also lists the following
+% index characters:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/main/ln.xml)
+%
+%  <exemplarCharacters type="index">[A B C D E Ɛ F G {Gb} H I K L M {Mb} {Mp} N {Nd} {Ng} {Nk} {Ns} {Nt} {Ny} {Nz} O Ɔ P R S T U V W Y Z]</exemplarCharacters>
+%
+% The following rules implement the same order for glibc.
 copy "iso14651_t1"

-collating-symbol <opene>
-collating-symbol <openo>
+collating-symbol <open-e>
+collating-symbol <open-o>

-reorder-after <e>
-<opene>
-reorder-after <o>
-<openo>
+reorder-after <AFTER-E>
+<open-e>
+reorder-after <AFTER-O>
+<open-o>

-reorder-after <U0065>
-<U025B> <opene>;<BAS>;<MIN>;IGNORE % ɛ
-reorder-after <U0045>
-<U0190> <opene>;<BAS>;<CAP>;IGNORE % Ɛ
-reorder-after <U006F>
-<U0254> <openo>;<BAS>;<MIN>;IGNORE % ɔ
-reorder-after <U004F>
-<U0186> <openo>;<BAS>;<CAP>;IGNORE % Ɔ
+<U025B> <open-e>;"<BASE>";"<MIN>";IGNORE % ɛ
+<U0190> <open-e>;"<BASE>";"<CAP>";IGNORE % Ɛ
+<U0254> <open-o>;"<BASE>";"<MIN>";IGNORE % ɔ
+<U0186> <open-o>;"<BASE>";"<CAP>";IGNORE % Ɔ

 reorder-end
 END LC_COLLATE
--- a/localedata/locales/lt_LT
+++ b/localedata/locales/lt_LT
@ -117,42 +117,42 @@ collating-symbol <u-ogonek>
 collating-symbol <u-macron>
 collating-symbol <z-caron>

-reorder-after <a>
+reorder-after <AFTER-A>
 <a-ogonek>
-reorder-after <c>
+reorder-after <AFTER-C>
 <c-caron>
-reorder-after <e>
+reorder-after <AFTER-E>
 <e-ogonek>
 <e-dot-above>
-reorder-after <i>
+reorder-after <AFTER-I>
 <i-ogonek>
-<y>
-reorder-after <s>
+<S0079>
+reorder-after <AFTER-S>
 <s-caron>
-reorder-after <u>
+reorder-after <AFTER-U>
 <u-ogonek>
 <u-macron>
-reorder-after <z>
+reorder-after <AFTER-Z>
 <z-caron>

-<U0105> <a-ogonek>;<BAS>;<MIN>;IGNORE % ą
-<U0104> <a-ogonek>;<BAS>;<CAP>;IGNORE % Ą
-<U010D> <c-caron>;<BAS>;<MIN>;IGNORE % č
-<U010C> <c-caron>;<BAS>;<CAP>;IGNORE % Č
-<U0119> <e-ogonek>;<BAS>;<MIN>;IGNORE % ę
-<U0118> <e-ogonek>;<BAS>;<CAP>;IGNORE % Ę
-<U0117> <e-dot-above>;<BAS>;<MIN>;IGNORE % ė
-<U0116> <e-dot-above>;<BAS>;<CAP>;IGNORE % Ė
-<U012F> <i-ogonek>;<BAS>;<MIN>;IGNORE % į
-<U012E> <i-ogonek>;<BAS>;<CAP>;IGNORE % Į
-<U0161> <s-caron>;<BAS>;<MIN>;IGNORE % š
-<U0160> <s-caron>;<BAS>;<CAP>;IGNORE % Š
-<U0173> <u-ogonek>;<BAS>;<MIN>;IGNORE % ų
-<U0172> <u-ogonek>;<BAS>;<CAP>;IGNORE % Ų
-<U016B> <u-macron>;<BAS>;<MIN>;IGNORE % ū
-<U016A> <u-macron>;<BAS>;<CAP>;IGNORE % Ū
-<U017E> <z-caron>;<BAS>;<MIN>;IGNORE % ž
-<U017D> <z-caron>;<BAS>;<CAP>;IGNORE % Ž
+<U0105> <a-ogonek>;<BASE>;<MIN>;IGNORE % ą
+<U0104> <a-ogonek>;<BASE>;<CAP>;IGNORE % Ą
+<U010D> <c-caron>;<BASE>;<MIN>;IGNORE % č
+<U010C> <c-caron>;<BASE>;<CAP>;IGNORE % Č
+<U0119> <e-ogonek>;<BASE>;<MIN>;IGNORE % ę
+<U0118> <e-ogonek>;<BASE>;<CAP>;IGNORE % Ę
+<U0117> <e-dot-above>;<BASE>;<MIN>;IGNORE % ė
+<U0116> <e-dot-above>;<BASE>;<CAP>;IGNORE % Ė
+<U012F> <i-ogonek>;<BASE>;<MIN>;IGNORE % į
+<U012E> <i-ogonek>;<BASE>;<CAP>;IGNORE % Į
+<U0161> <s-caron>;<BASE>;<MIN>;IGNORE % š
+<U0160> <s-caron>;<BASE>;<CAP>;IGNORE % Š
+<U0173> <u-ogonek>;<BASE>;<MIN>;IGNORE % ų
+<U0172> <u-ogonek>;<BASE>;<CAP>;IGNORE % Ų
+<U016B> <u-macron>;<BASE>;<MIN>;IGNORE % ū
+<U016A> <u-macron>;<BASE>;<CAP>;IGNORE % Ū
+<U017E> <z-caron>;<BASE>;<MIN>;IGNORE % ž
+<U017D> <z-caron>;<BASE>;<CAP>;IGNORE % Ž

 reorder-end

--- a/localedata/locales/lv_LV
+++ b/localedata/locales/lv_LV
@ -56,6 +56,21 @@ LC_COLLATE

 copy "iso14651_t1"

+% CLDR collation rules for Latvian:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/lv.xml)
+%
+% &[before 1]D<č<<<Č
+% &[before 1]H<ģ<<<Ģ
+% &I<<y<<<Y
+% &[before 1]L<ķ<<<Ķ
+% &[before 1]M<ļ<<<Ļ
+% &[before 1]O<ņ<<<Ņ
+% &[before 1]S<ŗ<<<Ŗ
+% &[before 1]T<š<<<Š
+% &[before 1]Ʒ<ž<<<Ž
+%
+% The following rules implement the same order for glibc.
+
 collating-symbol <c-caron>
 collating-symbol <g-cedilla>
 collating-symbol <k-cedilla>
@ -65,41 +80,41 @@ collating-symbol <r-cedilla>
 collating-symbol <s-caron>
 collating-symbol <z-caron>

-reorder-after <c>
+reorder-after <BEFORE-D>
 <c-caron>
-reorder-after <g>
+reorder-after <BEFORE-H>
 <g-cedilla>
-reorder-after <k>
+reorder-after <BEFORE-L>
 <k-cedilla>
-reorder-after <l>
+reorder-after <BEFORE-M>
 <l-cedilla>
-reorder-after <n>
+reorder-after <BEFORE-O>
 <n-cedilla>
-reorder-after <r>
+reorder-after <BEFORE-S>
 <r-cedilla>
-reorder-after <s>
+reorder-after <BEFORE-T>
 <s-caron>
-reorder-after <z>
+reorder-after <BEFORE-EZH>
 <z-caron>

-<U010D> <c-caron>;<BAS>;<MIN>;IGNORE % č
-<U010C> <c-caron>;<BAS>;<CAP>;IGNORE % Č
-<U0123> <g-cedilla>;<BAS>;<MIN>;IGNORE % ģ
-<U0122> <g-cedilla>;<BAS>;<CAP>;IGNORE % Ģ
-<U0079> <i>;<PCL>;<MIN>;IGNORE % y
-<U0059> <i>;<PCL>;<CAP>;IGNORE % Y
-<U0137> <k-cedilla>;<BAS>;<MIN>;IGNORE % ķ
-<U0136> <k-cedilla>;<BAS>;<CAP>;IGNORE % Ķ
-<U013C> <l-cedilla>;<BAS>;<MIN>;IGNORE % ļ
-<U013B> <l-cedilla>;<BAS>;<CAP>;IGNORE % Ļ
-<U0146> <n-cedilla>;<BAS>;<MIN>;IGNORE % ņ
-<U0145> <n-cedilla>;<BAS>;<CAP>;IGNORE % Ņ
-<U0157> <r-cedilla>;<BAS>;<MIN>;IGNORE % ŗ
-<U0156> <r-cedilla>;<BAS>;<CAP>;IGNORE % Ŗ
-<U0161> <s-caron>;<BAS>;<MIN>;IGNORE % š
-<U0160> <s-caron>;<BAS>;<CAP>;IGNORE % Š
-<U017E> <z-caron>;<BAS>;<MIN>;IGNORE % ž
-<U017D> <z-caron>;<BAS>;<CAP>;IGNORE % Ž
+<U010D> <c-caron>;<BASE>;<MIN>;IGNORE % č
+<U010C> <c-caron>;<BASE>;<CAP>;IGNORE % Č
+<U0123> <g-cedilla>;<BASE>;<MIN>;IGNORE % ģ
+<U0122> <g-cedilla>;<BASE>;<CAP>;IGNORE % Ģ
+<U0079> <S0069>;<LOWLINE>;<MIN>;IGNORE % y
+<U0059> <S0069>;<LOWLINE>;<CAP>;IGNORE % Y
+<U0137> <k-cedilla>;<BASE>;<MIN>;IGNORE % ķ
+<U0136> <k-cedilla>;<BASE>;<CAP>;IGNORE % Ķ
+<U013C> <l-cedilla>;<BASE>;<MIN>;IGNORE % ļ
+<U013B> <l-cedilla>;<BASE>;<CAP>;IGNORE % Ļ
+<U0146> <n-cedilla>;<BASE>;<MIN>;IGNORE % ņ
+<U0145> <n-cedilla>;<BASE>;<CAP>;IGNORE % Ņ
+<U0157> <r-cedilla>;<BASE>;<MIN>;IGNORE % ŗ
+<U0156> <r-cedilla>;<BASE>;<CAP>;IGNORE % Ŗ
+<U0161> <s-caron>;<BASE>;<MIN>;IGNORE % š
+<U0160> <s-caron>;<BASE>;<CAP>;IGNORE % Š
+<U017E> <z-caron>;<BASE>;<MIN>;IGNORE % ž
+<U017D> <z-caron>;<BASE>;<CAP>;IGNORE % Ž

 reorder-end

--- a/localedata/locales/mi_NZ
+++ b/localedata/locales/mi_NZ
@ -53,43 +53,30 @@ copy "iso14651_t1"

 %% a b c d e f g h i j k l m n ng o p q r s t u v w wh x y z

-collating-symbol  <n-g-mi>
+collating-symbol  <ng-digraph>
 collating-element <N-G> from "<U004E><U0047>"
 collating-element <n-g> from "<U006E><U0067>"
 collating-element <N-g> from "<U004E><U0067>"
 collating-element <n-G> from "<U006E><U0047>"
-collating-symbol  <w-h-mi>
+collating-symbol  <wh-digraph>
 collating-element <W-H> from "<U0057><U0048>"
 collating-element <w-h> from "<U0077><U0068>"
 collating-element <W-h> from "<U0057><U0068>"
 collating-element <w-H> from "<U0077><U0048>"

-collating-symbol <CAP-MIN>
-collating-symbol <MIN-CAP>
+reorder-after <AFTER-N>
+<ng-digraph>
+reorder-after <AFTER-W>
+<wh-digraph>

-reorder-after <MIN>
-<MIN-CAP>
-reorder-after <CAP>
-<CAP-MIN>
-
-reorder-after <n>
-<n-g-mi>
-reorder-after <w>
-<w-h-mi>
-
-reorder-after <U006E>
-<n-g>	<n-g-mi>;<PCT>;<MIN>;IGNORE
-<n-G>	<n-g-mi>;<PCT>;<MIN-CAP>;IGNORE
-reorder-after <U004E>
-<N-G>	<n-g-mi>;<PCT>;<CAP>;IGNORE
-<N-g>	<n-g-mi>;<PCT>;<CAP-MIN>;IGNORE
-
-reorder-after <U0077>
-<w-h>	<w-h-mi>;<PCT>;<MIN>;IGNORE
-<w-H>	<w-h-mi>;<PCT>;<MIN-CAP>;IGNORE
-reorder-after <U0057>
-<W-H>	<w-h-mi>;<PCT>;<CAP>;IGNORE
-<W-h>	<w-h-mi>;<PCT>;<CAP-MIN>;IGNORE
+<n-g>	<ng-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<n-G>	<ng-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<N-g>	<ng-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<N-G>	<ng-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<w-h>	<wh-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<w-H>	<wh-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<W-h>	<wh-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<W-H>	<wh-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE

 reorder-end

--- a/localedata/locales/ml_IN
+++ b/localedata/locales/ml_IN
@ -65,8 +65,164 @@ END LC_CTYPE
 %
 %
 LC_COLLATE
-% Copy the template from ISO/IEC 14651
+% CLDR collation rules for Malayalam:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/ml.xml)
+%
+% <collation type="standard" references="Sabdatharavali Malayalam Dictionary 23rd Ed. by Sahithya Pravarthaka Co-operative Society Ltd.">
+%   <cr><![CDATA[
+%     [reorder Mlym Latn Deva Arab Taml Knda Telu Beng Guru Gujr Orya Sinh]  # native speaker's special list
+%     #
+%     #  Avagraha and Visarga are primary ignorables.
+%     #
+%     &ഃ<<ഽ
+%     #
+%     #  Vowel sign AU ( ൌ) and AU length mark ( ൗ) need to differ
+%     #  only on secondary level, not primary.
+%     #
+%     &\u0D4C<<\u0D57
+%     #
+%     #  Pre-5.1 Chillus secondary equal to 5.1 chillus.
+%     #  Chillus primary equal to their consonant_dead form.
+%     #
+%     &ക്<<ക്\u200D<<<ൿ
+%     &ണ്<<ണ്\u200D<<<ൺ
+%     &ന്<<ന്\u200D<<<ൻ
+%     &ര്<<ര്\u200D<<<ർ
+%     &ല്<<ല്\u200D<<<ൽ
+%     &ള്<<ള്\u200D<<<ൾ
+%     #
+%     #  Anuswara primary equal to MA_dead.
+%     #
+%     &മ്<<ം
+%     #
+%     #  /nta/ is sorted as <NA, Virama, RRA>.
+%     #
+%     &ന്<<<ൻ്
+%   ]]></cr>
+% </collation>
+%
+% And CLDR also lists the following
+% index characters:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/main/ml.xml)
+%
+% <exemplarCharacters type="index" draft="contributed">[അ ആ ഇ ഈ ഉ ഊ ഋ എ ഏ ഐ ഒ ഓ ഔ ക ഖ ഗ ഘ ങ ച ഛ ജ ഝ ഞ ട ഠ ഡ ഢ ണ ത ഥ ദ ധ ന പ ഫ ബ ഭ മ യ ര ല വ ശ ഷ സ ഹ ള ഴ റ]</exemplarCharacters>
+%
+% The following rules implement the same order for glibc.
 copy "iso14651_t1"
+%     &ക്<<ക്\u200D<<<ൿ
+collating-element <e0d15-0d4d> from "<U0D15><U0D4D>"
+collating-symbol <s0d15-0d4d>
+collating-element <e0d15-0d4d-200d> from "<U0D15><U0D4D><U200D>"
+collating-symbol <s0d15-0d4d-200d>
+%     &ണ്<<ണ്\u200D<<<ൺ
+collating-element <e0d23-0d4d> from "<U0D23><U0D4D>"
+collating-symbol <s0d23-0d4d>
+collating-element <e0d23-0d4d-200d> from "<U0D23><U0D4D><U200D>"
+collating-symbol <s0d23-0d4d-200d>
+%     &ന്<sന്\u200D<<<ൻ
+collating-element <e0d28-0d4d> from "<U0D28><U0D4D>"
+collating-symbol <s0d28-0d4d>
+collating-element <e0d28-0d4d-200d> from "<U0D28><U0D4D><U200D>"
+collating-symbol <s0d28-0d4d-200d>
+%     &ര്<<ര്\u200D<<<ർ
+collating-element <e0d30-0d4d> from "<U0D30><U0D4D>"
+collating-symbol <s0d30-0d4d>
+collating-element <e0d30-0d4d-200d> from "<U0D30><U0D4D><U200D>"
+collating-symbol <s0d30-0d4d-200d>
+%     &ല്<<ല്\u200D<<<ൽ
+collating-element <e0d32-0d4d> from "<U0D32><U0D4D>"
+collating-symbol <s0d32-0d4d>
+collating-element <e0d32-0d4d-200d> from "<U0D32><U0D4D><U200D>"
+collating-symbol <s0d32-0d4d-200d>
+%     &ള്<<ള്\u200D<<<ൾ
+collating-element <e0d33-0d4d> from "<U0D33><U0D4D>"
+collating-symbol <s0d33-0d4d>
+collating-element <e0d33-0d4d-200d> from "<U0D33><U0D4D><U200D>"
+collating-symbol <s0d33-0d4d-200d>
+%     #
+%     #  Anuswara primary equal to MA_dead.
+%     #
+%     &മ്<<ം
+collating-element <e0d2e-0d4d> from "<U0D2e><U0D4D>"
+collating-symbol <s0d2e-0d4d>
+%     #
+%     #  /nta/ is sorted as <NA, Virama, RRA>.
+%     #
+%     &ന്<<<ൻ്
+% already defined:
+% collating-element <e0d28-0d4d> from "<U0D28><U0D4D>"
+% already defined:
+% collating-symbol <s0d28-0d4d>
+collating-element <e0d7b-0d4d> from "<U0D7B><U0D4D>"
+collating-symbol <s0d7b-0d4d>
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Finished defining collating-elements and collating-symbols
+%
+% One dummy reorder-after statement here to avoid a syntax error
+% because the first rule reordering stuff starts without a reorder-after:
+collating-symbol <dummy>
+reorder-after <AFTER-A>
+<dummy>
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% # Avagraha and Visarga are primary ignorables.
+% &ഃ<<ഽ
+<U0D03> IGNORE;<VISARGA>;<MIN>;<U0D03> % MALAYALAM SIGN VISARGA
+<U0D3D> IGNORE;<VRNT1>;<MIN>;<U0D3D> % MALAYALAM SIGN AVAGRAHA
+% #  Vowel sign AU ( ൌ) and AU length mark ( ൗ) need to differ
+% #  only on secondary level, not primary.
+% #
+% &\u0D4C<<\u0D57
+<U0D4C> <S0D4C>;<BASE>;<MIN>;<U0D4C> % MALAYALAM VOWEL SIGN AU
+<U0D57> <S0D4C>;<VRNT1>;<MIN>;<U0D57> % MALAYALAM AU LENGTH MARK
+% &ക്<<ക്\u200D<<<ൿ
+<e0d15-0d4d>      "<S0D15><S0D4D>";"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<e0d15-0d4d-200d> "<S0D15><S0D4D>";"<BASE><VRNT1>";"<MIN><MIN>";IGNORE
+<U0D7F>           "<S0D15><S0D4D>";"<BASE><VRNT1>";"<COMPAT><COMPAT>";<U0D7F>
+% &ണ്<<ണ്\u200D<<<ൺ
+<e0d23-0d4d>      "<S0D23><S0D4D>";"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<e0d23-0d4d-200d> "<S0D23><S0D4D>";"<BASE><VRNT1>";"<MIN><MIN>";IGNORE
+<U0D7A>           "<S0D23><S0D4D>";"<BASE><VRNT1>";"<COMPAT><COMPAT>";<U0D7A>
+% &ന്<<ന്\u200D<<<ൻ
+<e0d28-0d4d>      "<S0D28><S0D4D>";"<BASE><BASE>";"<MIN><MIN>";IGNORE % ന്
+<e0d28-0d4d-200d> "<S0D28><S0D4D>";"<BASE><VRNT1>";"<MIN><MIN>";IGNORE % ന്‍
+<U0D7B>           "<S0D28><S0D4D>";"<BASE><VRNT1>";"<COMPATCAP><COMPATCAP>";<U0D7B> % ൻ
+% &ര്<<ര്\u200D<<<ർ
+<e0d30-0d4d>      "<S0D30><S0D4D>";"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<e0d30-0d4d-200d> "<S0D30><S0D4D>";"<BASE><VRNT1>";"<MIN><MIN>";IGNORE
+<U0D7C>           "<S0D30><S0D4D>";"<BASE><VRNT1>";"<COMPAT><COMPAT>";<U0D7C> % ർ
+% &ല്<<ല്\u200D<<<ൽ
+<e0d32-0d4d>      "<S0D32><S0D4D>";"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<e0d32-0d4d-200d> "<S0D32><S0D4D>";"<BASE><VRNT1>";"<MIN><MIN>";IGNORE
+<U0D7D>           "<S0D32><S0D4D>";"<BASE><VRNT1>";"<COMPAT><COMPAT>";<U0D7D>
+% &ള്<<ള്\u200D<<<ൾ
+<e0d33-0d4d>      "<S0D33><S0D4D>";"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<e0d33-0d4d-200d> "<S0D33><S0D4D>";"<BASE><VRNT1>";"<MIN><MIN>";IGNORE
+<U0D7E>           "<S0D33><S0D4D>";"<BASE><VRNT1>";"<COMPAT><COMPAT>";<U0D7E>
+% #
+% #  Anuswara primary equal to MA_dead.
+% #
+% &മ്<<ം
+<e0d2e-0d4d> "<S0D2E><S0D4D>";"<BASE><BASE>";"<MIN><MIN>";IGNORE % മ്
+<U0D02>      "<S0D2E><S0D4D>";"<BASE><VRNT1>";"<MIN><MIN>";IGNORE % MALAYALAM SIGN ANUSVARA
+% #
+% #  /nta/ is sorted as <NA, Virama, RRA>.
+% #
+% &ന്<<<ൻ്
+%
+% It looks to me that the above line
+% is a contradiction to the earlier rule: &ന്<<ന്\u200D<<<ൻ
+% I experimented with libicu to see how libicu sorts given these rules.
+% And the end result seems to be the same as if the above two rules had been
+% combined in a rule like this:
+%
+%  &ന്<<ന്\u200D<<<ൻ്<<<ൻ
+%
+% So I write the glibc rules to reproduce that behaviour.
+<e0d28-0d4d> "<S0D28><S0D4D>";"<BASE><BASE>";"<MIN><MIN>";<U0D28> % ന്
+<e0d7b-0d4d> "<S0D28><S0D4D>";"<BASE><VRNT1>";"<COMPAT><COMPAT>";<U0D7B> % ൻ്
+
+reorder-end
+
 END LC_COLLATE
 %
 LC_MONETARY
--- a/localedata/locales/mn_MN
+++ b/localedata/locales/mn_MN
@ -40,31 +40,17 @@ category "i18n:2012";LC_MEASUREMENT
 END LC_IDENTIFICATION

 LC_COLLATE
+% CLDR collation rules for Mongolian:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/mn.xml)
+%
+% <!-- The root collation order is valid for this language. Just move the native scripts first. -->
+% <collations>
+% 	<collation type="standard"><cr><![CDATA[
+%  Cyrl Mong]
+% 	]]></cr></collation>
+% </collations>
+%
 copy "iso14651_t1"
-
-% iso14651_t1 is missing Mongolian ue(straight u), oe(barred o)
-% like russian, but with <o-=> (<barred-o>) after <o=> and
-% <u'=>(straight u) after <u=>
-
-collating-symbol <o-=>
-collating-symbol <u'=>
-
-reorder-after <CYR-O>
-<o-=>
-reorder-after <CYR-OUBRE>
-<u'=>
-
-reorder-after <U043E>
-<U04E9> <o-=>;<PCL>;<MIN>;IGNORE
-reorder-after <U041E>
-<U04E8> <o-=>;<PCL>;<CAP>;IGNORE
-
-reorder-after <U0443>
-<U04AF> <u'=>;<PCL>;<MIN>;IGNORE
-reorder-after <U0423>
-<U04AE> <u'=>;<PCL>;<CAP>;IGNORE
-
-reorder-end
 END LC_COLLATE

 LC_CTYPE
--- a/localedata/locales/mr_IN
+++ b/localedata/locales/mr_IN
@ -43,28 +43,82 @@ copy "hi_IN"
 END LC_CTYPE

 LC_COLLATE
-
-% Copy the template from ISO/IEC 14651
+% CLDR collation rules for Marathi:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/mr.xml)
+%
+% 			<collation type="standard">
+% <cr><![CDATA[
+% [normalization on]
+% [reorder Deva Beng Guru Gujr Orya Taml Telu Knda Mlym Sinh]
+% #
+% # The following tailoring is an adjustment of the
+% # DUCET collation order for ANUSVARA, CANDRABINDU,
+% # and VISARGA. Instead of being sorted with secondary
+% # weights, they are collated on primary level before
+% # the independent vowels. CANDRABINDU is secondary
+% # different from ANUSVARA. This gives a sort order
+% # similar to Hindi.
+% #
+% &ॐ<ं<<ँ<ः
+% #
+% # The following tailoring is an adjustment of the
+% # DUCET collation order for LLA. Instead of being
+% # sorted after LA, LLA is sorted after HA.
+% #
+% &ह<ळ
+% #
+% # KSSA is sorted after LLA.
+% #
+% <क्ष
+% #
+% # JNYA is sorted after KSSA.
+% #
+% <ज्ञ
+% ]]></cr>
+% </collation>
+%
+% And CLDR also lists the following
+% index characters:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/main/mr.xml)
+%
+% <exemplarCharacters type="index">[\u200D ॐ \u0902 ः अ आ इ ई उ ऊ ऋ ऌ ए ऐ ऑ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल व श ष स ह ळ ऽ \u0945 \u094D]</exemplarCharacters>
+%
+% The following rules implement the same order for glibc.
 copy "iso14651_t1"

-% customize sorting required for mr_IN
-collating-element <dv_ksha> from "<U0915><U094D><U0937>"
-collating-element <dv_dnya> from "<U091C><U094D><U091E>"
-collating-element <dv_shra> from "<U0936><U094D><U0930>"
+collating-symbol <anusvara>
+collating-symbol <candrabindu>
+collating-symbol <visarga>
+
+collating-element <dv_ksha> from "<U0915><U094D><U0937>" % क ् ष = क्ष
+collating-element <dv_dnya> from "<U091C><U094D><U091E>" % ज ् ञ = ज्ञ
+% This not in CLDR but it was in the old mr_IN collation in glibc:
+collating-element <dv_shra> from "<U0936><U094D><U0930>" % श ् र = श्र

 collating-symbol <d_ksha>
 collating-symbol <d_dnya>
 collating-symbol <d_shra>

-reorder-after <d_ha>
+reorder-after <S0950> % DEVANAGARI OM
+<anusvara>
+<visarga>
+
+<U0902> <anusvara>;<ANUSVARA>;<MIN>;<U0902> % DEVANAGARI SIGN ANUSVARA
+<U0901> <anusvara>;"<ANUSVARA><VRNT1>";<MIN>;<U0901> % DEVANAGARI SIGN CANDRABINDU
+<U0903> <visarga>;<VISARGA>;<MIN>;<U0903> % DEVANAGARI SIGN VISARGA
+
+reorder-after <S0939> % <U0939> <S0939>;<BASE>;<MIN>;<U0939> % DEVANAGARI LETTER HA
+<S0933> % DEVANAGARI LETTER LLA
 <d_ksha>
 <d_dnya>
+% This not in CLDR but it was in the old mr_IN collation in glibc:
 <d_shra>

-reorder-after <U0939>
-<dv_ksha> <d_ksha>;<BAS>;<MIN>;IGNORE
-<dv_dnya> <d_dnya>;<BAS>;<MIN>;IGNORE
-<dv_shra> <d_shra>;<BAS>;<MIN>;IGNORE
+<U0933> <S0933>;<BASE>;<MIN>;<U0933> % DEVANAGARI LETTER LLA
+<dv_ksha> <d_ksha>;<BASE>;<MIN>;"<U0915><U094D><U0937>" % क ् ष = क्ष
+<dv_dnya> <d_dnya>;<BASE>;<MIN>;IGNORE
+% This not in CLDR but it was in the old mr_IN collation in glibc:
+<dv_shra> <d_shra>;<BASE>;<MIN>;IGNORE

 reorder-end

--- a/localedata/locales/mt_MT
+++ b/localedata/locales/mt_MT
@ -51,83 +51,77 @@ translit_end
 END LC_CTYPE

 LC_COLLATE
-
-% a b c c. d e f g. g gh/ h h/ i ie j k l m n o p q r s t u v w x y z. z
-
-% Copy the template from ISO/IEC 14651
+% CLDR collation rules for Maltese:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/mt.xml)
+%
+% <collation type="standard">
+%   <cr><![CDATA[
+% [caseFirst upper]  # DMS MSA 200:2009
+%
+% # This collation follows Maltese Standard DMS MSA 200:2009
+% # The document is available at:
+% #  <http://www.kunsilltalmalti.gov.mt/filebank/documents/2009-10-14%20MSA%20Specification%20for%20Maltese%20locale%20(abbozz%20finali).pdf>
+% # More information is available at: (search for "MSA 200")
+% #  <http://www.kunsilltalmalti.gov.mt/rizorsi>
+%
+% &[before 1]c<ċ<<<Ċ
+% &[before 1]g<ġ<<<Ġ
+% # DMS 200:2009 says that "għ" shall be treated as one letter.
+% &[before 1]h<għ<<<gĦ<<<Għ<<<GĦ
+% # DMS 200:2009 says that "ie" shall be treated as two letters: i + e.
+% &[before 1]i<ħ<<<Ħ
+% &[before 1]z<ż<<<Ż
+%   ]]></cr>
+% </collation>
+%
+% And CLDR also lists the following
+% index characters:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/main/mt.xml)
+%
+% <exemplarCharacters type="index" draft="contributed">[A B Ċ C D E F Ġ G {GĦ} H Ħ I {IE*} J K L M N O P Q R S T U V W X Y Ż Z]</exemplarCharacters>
+%
+% The following rules implement the same order for glibc.
 copy "iso14651_t1"

-collating-symbol <c.>
-collating-symbol <g.>
-collating-symbol <h->
-collating-symbol <z.>
+collating-symbol <c-dot-above>
+collating-symbol <g-dot-above>
+collating-symbol <h-stroke>
+collating-symbol <z-dot-above>
+collating-symbol  <g-h-stroke-digraph>
+collating-element <g-h-stroke> from "g<U0127>"
+collating-element <g-H-stroke> from "g<U0126>"
+collating-element <G-h-stroke> from "G<U0127>"
+collating-element <G-H-stroke> from "G<U0126>"

-collating-symbol  <g-h--mt>
-collating-element <G-H-> from "<U0047><U0126>"
-collating-element <g-h-> from "<U0067><U0127>"
-collating-element <G-h-> from "<U0047><U0127>"
-collating-element <g-H-> from "<U0067><U0126>"
+reorder-after <RES-1>
+<COMPATCAP>
+<CAP>
+<COMPAT>
+<MIN>

-collating-symbol  <i-e-mt>
-collating-element <I-E> from "<U0049><U0045>"
-collating-element <i-e> from "<U0069><U0065>"
-collating-element <I-e> from "<U0049><U0065>"
-collating-element <i-E> from "<U0069><U0045>"
+reorder-after <BEFORE-C>
+<c-dot-above>
+reorder-after <BEFORE-G>
+<g-dot-above>
+reorder-after <BEFORE-H>
+<g-h-stroke-digraph>
+reorder-after <BEFORE-I>
+<h-stroke>
+reorder-after <BEFORE-Z>
+<z-dot-above>

-collating-symbol <CAP-MIN>
-collating-symbol <MIN-CAP>
-
-reorder-after <MIN>
-<MIN-CAP>
-reorder-after <CAP>
-<CAP-MIN>
-
-reorder-after <c>
-<c.>
-reorder-after <f>
-<g.>
-reorder-after <g>
-<g-h--mt>
-reorder-after <h>
-<h->
-reorder-after <i>
-<i-e-mt>
-reorder-after <y>
-<z.>
-
-reorder-after <U0063>
-<U010B> <c.>;<PCT>;<MIN>;IGNORE
-reorder-after <U0043>
-<U010A> <c.>;<PCT>;<CAP>;IGNORE
-
-reorder-after <U0066>
-<U0121> <g.>;<PCT>;<MIN>;IGNORE
-reorder-after <U0046>
-<U0120> <g.>;<PCT>;<CAP>;IGNORE
-
-reorder-after <U0067>
-<g-h->  <g-h--mt>;<PCL>;<MIN>;IGNORE
-<g-H->  <g-h--mt>;<PCL>;<MIN-CAP>;IGNORE
-reorder-after <U0047>
-<G-H->  <g-h--mt>;<PCL>;<CAP>;IGNORE
-<G-h->  <g-h--mt>;<PCL>;<CAP-MIN>;IGNORE
-
-reorder-after <U0068>
-<U0127> <h->;<OBL>;<MIN>;IGNORE
-reorder-after <U0048>
-<U0126> <h->;<OBL>;<CAP>;IGNORE
-
-reorder-after <U0069>
-<i-e>  <i-e-mt>;<PCL>;<MIN>;IGNORE
-<i-E>  <i-e-mt>;<PCL>;<MIN-CAP>;IGNORE
-reorder-after <U0049>
-<I-E>  <i-e-mt>;<PCL>;<CAP>;IGNORE
-<I-e>  <i-e-mt>;<PCL>;<CAP-MIN>;IGNORE
-
-reorder-after <U0079>
-<U017C> <z.>;<PCT>;<MIN>;IGNORE
-reorder-after <U0059>
-<U017B> <z.>;<PCT>;<CAP>;IGNORE
+<U010B>              <c-dot-above>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ċ
+<U010A>              <c-dot-above>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ċ
+<U0121>              <g-dot-above>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ġ
+<U0120>              <g-dot-above>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ġ
+<g-h-stroke>  <g-h-stroke-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<g-H-stroke>  <g-h-stroke-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<G-h-stroke>  <g-h-stroke-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<G-H-stroke>  <g-h-stroke-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<U0127>                 <h-stroke>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ħ
+<U0126>                 <h-stroke>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ħ
+<U017C>              <z-dot-above>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ż
+<U017B>              <z-dot-above>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ż

 reorder-end

--- a/localedata/locales/nan_TW@latin
+++ b/localedata/locales/nan_TW@latin
@ -61,26 +61,19 @@ copy "iso14651_t1"

 %% a b c d e f g h i j k l m n o o͘ p q r s t u v w x y z ⁿ

-collating-element <oo> from "<U006F><U0358>"
-collating-element <OO> from "<U004F><U0358>"
-collating-element <nn> from "<U207F>"
+collating-element <o-combining-dot-above> from "<U006F><U0358>"
+collating-element <O-combining-dot-above> from "<U004F><U0358>"
+collating-symbol <o-dot-above>
+collating-symbol <superscript-n>

-collating-symbol <CAP-MIN>
-collating-symbol <MIN-CAP>
+reorder-after <AFTER-N>
+<o-dot-above>
+reorder-after <AFTER-Z>
+<superscript-n>

-reorder-after <MIN>
-<MIN-CAP>
-reorder-after <CAP>
-<CAP-MIN>
-
-reorder-after <U006E>
-<oo>
-reorder-after <U004E>
-<OO>
-reorder-after <U007A>
-<nn>
-reorder-after <U005A>
-<nn>
+<o-combining-dot-above> <o-dot-above>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % o͘
+<O-combining-dot-above> <o-dot-above>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % O͘
+<U207F>                 <superscript-n>;"<BASE>";"<MNN>";IGNORE % ⁿ

 reorder-end

--- a/localedata/locales/nb_NO
+++ b/localedata/locales/nb_NO
@ -53,75 +53,87 @@ END LC_IDENTIFICATION
 LC_COLLATE
 copy "iso14651_t1"

+% CLDR collation rules for Norwegian (Bokmål):
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/nb.xml)
+%
+% &D<<đ<<<Đ<<ð<<<Ð
+% &t<<<þ/h
+% &T<<<Þ/H
+% &Y<<ü<<<Ü<<ű<<<Ű
+% &[before 1]ǀ<æ<<<Æ<<ä<<<Ä<<ę<<<Ę<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<<œ<<<Œ<å<<<Å<<aa<<<Aa<<<AA
+%
+% And CLDR also lists the following
+% index characters:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/main/nb.xml)
+%
+% <exemplarCharacters type="index">[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Æ Ø Å]</exemplarCharacters>
+%
+% The following rules implement the same order for glibc.
+
 collating-element <A-A> from "<U0041><U0041>"
 collating-element <a-a> from "<U0061><U0061>"
 collating-element <A-a> from "<U0041><U0061>"
 collating-element <a-A> from "<U0061><U0041>"
-collating-symbol <CAP-MIN>
-collating-symbol <MIN-CAP>
 collating-symbol <ae>
 collating-symbol <o-stroke>
 collating-symbol <a-ring>
-collating-symbol <ETH>

 reorder-after <RES-1>
+<COMPATCAP>
 <CAP>
-<CAP-MIN>
-<MIN-CAP>
+<COMPAT>
+<MIN>

-reorder-after <OBL>
-<ETH>
-
-reorder-after <z>
+% &[before 1]ǀ<æ<<<Æ<<ä<<<Ä<<ę<<<Ę<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<<œ<<<Œ<å<<<Å<<aa<<<Aa<<<AA
+reorder-after <AFTER-Z>
 <ae>
 <o-stroke>
 <a-ring>

-reorder-after <U0178>
-<U00DC> <y>;<U00DC>;<CAP>;IGNORE
-<U0170> <y>;<U0170>;<CAP>;IGNORE
-reorder-after <U00FF>
-<U00FC> <y>;<U00DC>;<MIN>;IGNORE
-<U0171> <y>;<U0170>;<MIN>;IGNORE
+% &D<<đ<<<Đ<<ð<<<Ð
+<U0110> <S0064>;"<BASE><BARRE>";"<CAP><MIN>";IGNORE % Đ
+<U0111> <S0064>;"<BASE><BARRE>";"<MIN><MIN>";IGNORE % đ
+<U00D0> <S0064>;"<BASE><VRNT1>";"<COMPATCAP><COMPAT>";IGNORE % Ð
+<U00F0> <S0064>;"<BASE><VRNT1>";"<COMPAT><COMPAT>";IGNORE % ð

-reorder-after <U017B>
-<U00C6> <ae>;<BAS>;<CAP>;IGNORE
-<U01FC> <ae>;<ACA>;<CAP>;IGNORE
-<U01E2> <ae>;<MAC>;<CAP>;IGNORE
-<U00C4> <ae>;<PCL>;<CAP>;IGNORE
-<U00D8> <o-stroke>;<BAS>;<CAP>;IGNORE
-<U01FE> <o-stroke>;<ACA>;<CAP>;IGNORE
-<U00D6> <o-stroke>;<REU>;<CAP>;IGNORE
-<U0150> <o-stroke>;<DAC>;<CAP>;IGNORE
-<U00C5> <a-ring>;<BAS>;<CAP>;IGNORE
-<A-A>   <a-ring>;<A-A>;<CAP>;IGNORE
-<A-a>   <a-ring>;<A-A>;<CAP-MIN>;IGNORE
-reorder-after <U017C>
-<U00E6> <ae>;<BAS>;<MIN>;IGNORE
-<U01FD> <ae>;<ACA>;<MIN>;IGNORE
-<U01E3> <ae>;<MAC>;<MIN>;IGNORE
-<U00E4> <ae>;<PCL>;<MIN>;IGNORE
-<U00F8> <o-stroke>;<BAS>;<MIN>;IGNORE
-<U01FF> <o-stroke>;<ACA>;<MIN>;IGNORE
-<U00F6> <o-stroke>;<REU>;<MIN>;IGNORE
-<U0151> <o-stroke>;<DAC>;<MIN>;IGNORE
-<U00E5> <a-ring>;<BAS>;<MIN>;IGNORE
-<a-A>   <a-ring>;<A-A>;<MIN-CAP>;IGNORE
-<a-a>   <a-ring>;<A-A>;<MIN>;IGNORE
+% &T<<<Þ/H
+% &t<<<þ/h
+<U00DE> "<S0074><S0068>";"<BASE><BASE>";"<COMPATCAP><COMPATCAP>";IGNORE % Þ
+<U00FE> "<S0074><S0068>";"<BASE><BASE>";"<COMPAT><COMPAT>";IGNORE % þ

-%  Present in iso14651_t1, but these definitions seem to have been
-%  removed from latest iso14651 tables.
-reorder-after <U0162>
-<U00DE> "<t><h>";"<LIG><LIG>";"<CAP><CAP>";IGNORE
-reorder-after <U0163>
-<U00FE> "<t><h>";"<LIG><LIG>";"<MIN><MIN>";IGNORE
+% &Y<<ü<<<Ü<<ű<<<Ű
+<U00DC> <S0079>;"<BASE><TREMA>";"<CAP><MIN>";IGNORE % Ü
+<U00FC> <S0079>;"<BASE><TREMA>";"<MIN><MIN>";IGNORE % ü
+<U0170> <S0079>;"<BASE><2AIGU>";"<CAP><MIN>";IGNORE % Ű
+<U0171> <S0079>;"<BASE><2AIGU>";"<MIN><MIN>";IGNORE % ű

-reorder-after <U0064>
-<U0110> <d>;<OBL>;<CAP>;IGNORE
-<U00D0> <d>;<ETH>;<CAP>;IGNORE
-reorder-after <U0044>
-<U0111> <d>;<OBL>;<MIN>;IGNORE
-<U00F0> <d>;<ETH>;<MIN>;IGNORE
+% &[before 1]ǀ<æ<<<Æ<<ä<<<Ä<<ę<<<Ę<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<<œ<<<Œ<å<<<Å<<aa<<<Aa<<<AA
+<U00C6> <ae>;"<BASE><BASE>";"<COMPATCAP><COMPATCAP>";IGNORE % Æ
+<U00E6> <ae>;"<BASE><BASE>";"<COMPAT><COMPAT>";IGNORE % æ
+<U00C4> <ae>;"<BASE><VRNT1>";"<CAP><MIN>";IGNORE % Ä
+<U00E4> <ae>;"<BASE><VRNT1>";"<MIN><MIN>";IGNORE % ä
+<U0118> <ae>;"<BASE><VRNT2>";"<CAP><MIN>";IGNORE % Ę
+<U0119> <ae>;"<BASE><VRNT2>";"<MIN><MIN>";IGNORE % ę
+<U01FC> <ae>;"<BASE><VRNT3>";"<CAP><MIN>";IGNORE % Ǽ
+<U01FD> <ae>;"<BASE><VRNT3>";"<MIN><MIN>";IGNORE % ǽ
+<U01E2> <ae>;"<BASE><VRNT4>";"<CAP><MIN>";IGNORE % Ǣ
+<U01E3> <ae>;"<BASE><VRNT4>";"<MIN><MIN>";IGNORE % ǣ
+<U00D8> <o-stroke>;"<BASE><BASE>";"<COMPATCAP><COMPATCAP>";IGNORE % Ø
+<U00F8> <o-stroke>;"<BASE><BASE>";"<COMPAT><COMPAT>";IGNORE % ø
+<U01FE> <o-stroke>;"<BASE><VRNT1>";"<CAP><MIN>";IGNORE % Ǿ
+<U01FF> <o-stroke>;"<BASE><VRNT1>";"<MIN><MIN>";IGNORE % ǿ
+<U00D6> <o-stroke>;"<BASE><VRNT2>";"<CAP><MIN>";IGNORE % Ö
+<U00F6> <o-stroke>;"<BASE><VRNT2>";"<MIN><MIN>";IGNORE % ö
+<U0150> <o-stroke>;"<BASE><VRNT3>";"<CAP><MIN>";IGNORE % Ő
+<U0151> <o-stroke>;"<BASE><VRNT3>";"<MIN><MIN>";IGNORE % ő
+<U0152> <o-stroke>;"<BASE><VRNT4>";"<CAP><MIN>";IGNORE % Œ
+<U0153> <o-stroke>;"<BASE><VRNT4>";"<MIN><MIN>";IGNORE % œ
+<U00C5> <a-ring>;"<BASE><BASE>";"<COMPATCAP><COMPATCAP>";IGNORE % Å
+<U00E5> <a-ring>;"<BASE><BASE>";"<COMPAT><COMPAT>";IGNORE % å
+<A-A>   <a-ring>;"<BASE><VRNT1>";"<CAP><CAP>";IGNORE
+<A-a>   <a-ring>;"<BASE><VRNT1>";"<CAP><MIN>";IGNORE
+<a-A>   <a-ring>;"<BASE><VRNT1>";"<MIN><CAP>";IGNORE
+<a-a>   <a-ring>;"<BASE><VRNT1>";"<MIN><MIN>";IGNORE

 reorder-end

--- a/localedata/locales/om_KE
+++ b/localedata/locales/om_KE
@ -64,69 +64,87 @@ END LC_IDENTIFICATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

 LC_COLLATE
+% CLDR collation rules for Oromo:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/om.xml)
 %
-% Copy the template from ISO/IEC 14651
+% <collation type="standard" >
+%  <cr><![CDATA[
+%    &Z<ch<<<Ch<<<CH<dh<<<Dh<<<DH<kh<<<Kh<<<KH<ny<<<Ny<<<NY<ph<<<Ph<<<PH<sh<<<Sh
+%  ]]></cr>
+% </collation  >
 %
+% And CLDR also lists the following
+% index characters:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/main/om.xml)
+%
+% <exemplarCharacters type="index">[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]</exemplarCharacters>
+%
+% The following rules implement the same order for glibc.
 copy "iso14651_t1"
-%
-% Define extra Oromo letters and their sort order:
-%
-collating-symbol  <CAP-MIN>
-collating-symbol  <ch-qubee>
-collating-element <CH> from "CH"
-collating-element <Ch> from "Ch"
+
+collating-symbol  <ch-digraph>
 collating-element <ch> from "ch"
-collating-symbol  <dh-qubee>
-collating-element <DH> from "DH"
-collating-element <Dh> from "Dh"
+collating-element <cH> from "cH"
+collating-element <Ch> from "Ch"
+collating-element <CH> from "CH"
+collating-symbol  <dh-digraph>
 collating-element <dh> from "dh"
-collating-symbol  <kh-qubee>
-collating-element <KH> from "KH"
-collating-element <Kh> from "Kh"
+collating-element <dH> from "dH"
+collating-element <Dh> from "Dh"
+collating-element <DH> from "DH"
+collating-symbol  <kh-digraph>
 collating-element <kh> from "kh"
-collating-symbol  <ny-qubee>
-collating-element <NY> from "NY"
-collating-element <Ny> from "Ny"
+collating-element <kH> from "kH"
+collating-element <Kh> from "Kh"
+collating-element <KH> from "KH"
+collating-symbol  <ny-digraph>
 collating-element <ny> from "ny"
-collating-symbol  <ph-qubee>
-collating-element <PH> from "PH"
-collating-element <Ph> from "Ph"
+collating-element <nY> from "nY"
+collating-element <Ny> from "Ny"
+collating-element <NY> from "NY"
+collating-symbol  <ph-digraph>
 collating-element <ph> from "ph"
-collating-symbol  <sh-qubee>
-collating-element <SH> from "SH"
-collating-element <Sh> from "Sh"
+collating-element <pH> from "pH"
+collating-element <Ph> from "Ph"
+collating-element <PH> from "PH"
+collating-symbol  <sh-digraph>
 collating-element <sh> from "sh"
+collating-element <sH> from "sH"
+collating-element <Sh> from "Sh"
+collating-element <SH> from "SH"

-reorder-after <MIN>
-<CAP-MIN>
+reorder-after <AFTER-Z>
+<ch-digraph>
+<dh-digraph>
+<kh-digraph>
+<ny-digraph>
+<ph-digraph>
+<sh-digraph>

-reorder-after <z>
-<ch-qubee>
-<dh-qubee>
-<kh-qubee>
-<ny-qubee>
-<ph-qubee>
-<sh-qubee>
-
-reorder-after <U00DE>
-<ch>	<ch-qubee>;<MIN>;<MIN>;IGNORE
-<Ch>	<ch-qubee>;<CAP>;<MIN>;IGNORE
-<CH>	<ch-qubee>;<CAP>;<CAP>;IGNORE
-<dh>	<dh-qubee>;<MIN>;<MIN>;IGNORE
-<Dh>	<dh-qubee>;<CAP>;<MIN>;IGNORE
-<DH>	<dh-qubee>;<CAP>;<CAP>;IGNORE
-<kh>	<kh-qubee>;<MIN>;<MIN>;IGNORE
-<Kh>	<kh-qubee>;<CAP>;<MIN>;IGNORE
-<KH>	<kh-qubee>;<CAP>;<CAP>;IGNORE
-<ny>	<ny-qubee>;<MIN>;<MIN>;IGNORE
-<Ny>	<ny-qubee>;<CAP>;<MIN>;IGNORE
-<NY>	<ny-qubee>;<CAP>;<CAP>;IGNORE
-<ph>	<ph-qubee>;<MIN>;<MIN>;IGNORE
-<Ph>	<ph-qubee>;<CAP>;<MIN>;IGNORE
-<PH>	<ph-qubee>;<CAP>;<CAP>;IGNORE
-<sh>	<sh-qubee>;<MIN>;<MIN>;IGNORE
-<Sh>	<sh-qubee>;<CAP>;<MIN>;IGNORE
-<SH>	<sh-qubee>;<CAP>;<CAP>;IGNORE
+<ch>	<ch-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<cH>	<ch-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<Ch>	<ch-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<CH>	<ch-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<dh>	<dh-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<dH>	<dh-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<Dh>	<dh-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<DH>	<dh-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<kh>	<kh-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<kH>	<kh-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<Kh>	<kh-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<KH>	<kh-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<ny>	<ny-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<nY>	<ny-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<Ny>	<ny-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<NY>	<ny-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<ph>	<ph-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<pH>	<ph-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<Ph>	<ph-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<PH>	<ph-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<sh>	<sh-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<sH>	<sh-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<Sh>	<sh-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<SH>	<sh-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE

 reorder-end
 %
--- a/localedata/locales/os_RU
+++ b/localedata/locales/os_RU
@ -49,18 +49,20 @@ category "i18n:2012";LC_MEASUREMENT
 END LC_IDENTIFICATION

 LC_COLLATE
+% There is no collation information for Ossetian in CLDR.
+% I just adapt the collation rules which I found here to the
+% updated iso14651_t1_common file.
 copy "iso14651_t1"

 collating-symbol <ae>

-reorder-after <CYR-A>
+reorder-after <S0430> % CYRILLIC SMALL LETTER A
 <ae>

-reorder-after <U0410>
-<U00C6> <ae>;<BAS>;<CAP>;IGNORE
-<U00E6> <ae>;<BAS>;<MIN>;IGNORE
-<U04D4> <ae>;<BAS>;<CAP>;IGNORE
-<U04D5> <ae>;<BAS>;<MIN>;IGNORE
+<U04D5> <ae>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ӕ CYRILLIC SMALL LIGATURE A IE
+<U04D4> <ae>;"<BASE><BASE>";"<CAP><CAP>";IGNORE % Ӕ CYRILLIC CAPITAL LIGATURE A IE
+<U00E6> <ae>;"<BASE><VRNT1>";"<MIN><MIN>";IGNORE % æ LATIN SMALL LETTER AE
+<U00C6> <ae>;"<BASE><VRNT1>";"<CAP><CAP>";IGNORE % Æ LATIN CAPITAL LETTER AE
 reorder-end
 END LC_COLLATE

--- a/localedata/locales/pl_PL
+++ b/localedata/locales/pl_PL
@ -54,6 +54,20 @@ LC_COLLATE

 copy "iso14651_t1"

+% CLDR collation rules for Polish:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/pl.xml)
+%
+% &A<ą<<<Ą
+% &C<ć<<<Ć
+% &E<ę<<<Ę
+% &L<ł<<<Ł
+% &N<ń<<<Ń
+% &O<ó<<<Ó
+% &S<ś<<<Ś
+% &Z<ź<<<Ź<ż<<<Ż
+%
+% The following rules implement the same order for glibc.
+
 collating-symbol <space>
 collating-symbol <a-ogonek>
 collating-symbol <c-acute>
@ -68,44 +82,44 @@ collating-symbol <z-dot-above>
 reorder-after <RES-1>
 <space>

-reorder-after <a>
+reorder-after <AFTER-A>
 <a-ogonek>
-reorder-after <c>
+reorder-after <AFTER-C>
 <c-acute>
-reorder-after <e>
+reorder-after <AFTER-E>
 <e-ogonek>
-reorder-after <l>
+reorder-after <AFTER-L>
 <l-stroke>
-reorder-after <n>
+reorder-after <AFTER-N>
 <n-acute>
-reorder-after <o>
+reorder-after <AFTER-O>
 <o-acute>
-reorder-after <s>
+reorder-after <AFTER-S>
 <s-acute>
-reorder-after <z>
+reorder-after <AFTER-Z>
 <z-acute>
 <z-dot-above>

 <U0020> <space>;IGNORE;IGNORE;<U0020>
 <U00A0> <space>;IGNORE;IGNORE;<U00A0>
-<U0105> <a-ogonek>;<BAS>;<MIN>;IGNORE % ą
-<U0104> <a-ogonek>;<BAS>;<CAP>;IGNORE % Ą
-<U0107> <c-acute>;<BAS>;<MIN>;IGNORE % ć
-<U0106> <c-acute>;<BAS>;<CAP>;IGNORE % Ć
-<U0119> <e-ogonek>;<BAS>;<MIN>;IGNORE % ę
-<U0118> <e-ogonek>;<BAS>;<CAP>;IGNORE % Ę
-<U0142> <l-stroke>;<BAS>;<MIN>;IGNORE % ł
-<U0141> <l-stroke>;<BAS>;<CAP>;IGNORE % Ł
-<U0144> <n-acute>;<BAS>;<MIN>;IGNORE % ń
-<U0143> <n-acute>;<BAS>;<CAP>;IGNORE % Ń
-<U00F3> <o-acute>;<BAS>;<MIN>;IGNORE % ó
-<U00D3> <o-acute>;<BAS>;<CAP>;IGNORE % Ó
-<U015B> <s-acute>;<BAS>;<MIN>;IGNORE % ś
-<U015A> <s-acute>;<BAS>;<CAP>;IGNORE % Ś
-<U017A> <z-acute>;<BAS>;<MIN>;IGNORE % ź
-<U0179> <z-acute>;<BAS>;<CAP>;IGNORE % Ź
-<U017C> <z-dot-above>;<BAS>;<MIN>;IGNORE % ż
-<U017B> <z-dot-above>;<BAS>;<CAP>;IGNORE % Ż
+<U0105> <a-ogonek>;<BASE>;<MIN>;IGNORE % ą
+<U0104> <a-ogonek>;<BASE>;<CAP>;IGNORE % Ą
+<U0107> <c-acute>;<BASE>;<MIN>;IGNORE % ć
+<U0106> <c-acute>;<BASE>;<CAP>;IGNORE % Ć
+<U0119> <e-ogonek>;<BASE>;<MIN>;IGNORE % ę
+<U0118> <e-ogonek>;<BASE>;<CAP>;IGNORE % Ę
+<U0142> <l-stroke>;<BASE>;<MIN>;IGNORE % ł
+<U0141> <l-stroke>;<BASE>;<CAP>;IGNORE % Ł
+<U0144> <n-acute>;<BASE>;<MIN>;IGNORE % ń
+<U0143> <n-acute>;<BASE>;<CAP>;IGNORE % Ń
+<U00F3> <o-acute>;<BASE>;<MIN>;IGNORE % ó
+<U00D3> <o-acute>;<BASE>;<CAP>;IGNORE % Ó
+<U015B> <s-acute>;<BASE>;<MIN>;IGNORE % ś
+<U015A> <s-acute>;<BASE>;<CAP>;IGNORE % Ś
+<U017A> <z-acute>;<BASE>;<MIN>;IGNORE % ź
+<U0179> <z-acute>;<BASE>;<CAP>;IGNORE % Ź
+<U017C> <z-dot-above>;<BASE>;<MIN>;IGNORE % ż
+<U017B> <z-dot-above>;<BASE>;<CAP>;IGNORE % Ż

 reorder-end

--- a/localedata/locales/ps_AF
+++ b/localedata/locales/ps_AF
@ -56,93 +56,153 @@ map to_outpunct;  (<U002E>,<U066B>);(<U002C>,<U066C>)
 END LC_CTYPE

 LC_COLLATE
-% Collation rules updated as per requirement of glibc by Pravin Satpute <psatpute@redhat.com>
-% see rh bug 482881
+% CLDR collation rules for Pashto:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/ps.xml)
+%
+% <collation type="standard">
+%   <cr><![CDATA[
+%     [normalization on]
+%     [reorder Arab]
+%     &َ<<ِ<<ُ<<ً<<ٍ<<ٌ
+%     &[before 1]ا<آ
+%     &ا<<أ<<ٲ<<ٱ<<إ<<ٳ<ء
+%     &ت<ټ<<ٹ
+%     &ج<ځ<<حٔ
+%     &چ<څ
+%     &د<ډ<<ڈ
+%     &ر<ړ<<ڑ
+%     &ژ<ږ
+%     &ک<<*ڪك
+%     &ګ<<گ
+%     &ڼ<<ڻ
+%     &و<<ؤ<<ۇ<<ۉ
+%     &ه<<<ۀ<<<هٔ<<*ەہھةۃ
+%     &ی<<*ىےيېۍ<<یٔ<<<ىٔ<<<ئ
+%     &\u00A0<<\u200C<<\u200D
+%   ]]></cr>
+% </collation>
+%
+% And CLDR also lists the following
+% index characters:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/main/ps.xml)
+%
+% <exemplarCharacters type="index" draft="unconfirmed">[آ ا ء ب پ ت ټ ث ج ځ چ څ ح خ د ډ ذ ر ړ ز ژ ږ س ش ښ ص ض ط ظ ع غ ف ق ک ګ ل م ن ڼ ه و ی]</exemplarCharacters>
+%
+% The following rules implement the same order for glibc.
 copy "iso14651_t1"

-collating-symbol  <teh_with_ring>
-collating-symbol  <hah_with_hamza_above>
-collating-symbol  <hah_with_three_dots>
-collating-symbol  <dal_with_ring>
-collating-symbol  <reh_with_ring>
-collating-symbol <reh_with_dot_below_and_above>
-collating-symbol  <seen_with_dot_below_and_above>
-collating-symbol  <kaaf_with_ring>
-collating-symbol  <noon_with_ring>
-collating-symbol  <farsi_yeh>
-collating-symbol  <arabic_letter_e>
-collating-symbol  <yeh_with_tail>
+collating-element <arabic-letter-heh-with-hamza-above> from "<U0647><U0654>" % هٔ
+collating-element <arabic-letter-farsi-yeh-with-hamza-above> from "<U06CC><U0654>" % یٔ
+collating-element <arabic-letter-alef-maksura-with-hamza-above> from "<U0649><U0654>" % ىٔ

-reorder-after <teh>
-<teh_with_ring>
+% &َ<<ِ<<ُ<<ً<<ٍ<<ٌ
+reorder-after <FATHA>
+<KASRA>
+<DAMMA>
+<FATHATAN>
+<KASRATAN>
+<DAMMATAN>

-reorder-after <jeem>
-<hah_with_hamza_above>
+% &[before 1]ا<آ
+reorder-after <S08AC> % ARABIC LETTER ROHINGYA YEH
+<S0622> % ARABIC LETTER ALEF WITH MADDA ABOVE

-reorder-after <tcheh>
-<hah_with_three_dots>
+% &ا<<أ<<ٲ<<ٱ<<إ<<ٳ<ء
+% Entry in iso14651_t1_common:
+%
+%    <U0627> <S0627>;<BASE>;<MIN>;<U0627> % ARABIC LETTER ALEF
+%
+<U0623> <S0627>;"<BASE><VRNT1>";<MIN>;<U0623> % ARABIC LETTER ALEF WITH HAMZA ABOVE
+<U0672> <S0627>;"<BASE><VRNT2>";<MIN>;<U0672> % ARABIC LETTER ALEF WITH WAVY HAMZA ABOVE
+<U0671> <S0627>;"<BASE><VRNT3>";<MIN>;<U0671> % ARABIC LETTER ALEF WASLA
+<U0625> <S0627>;"<BASE><VRNT4>";<MIN>;<U0625> % ARABIC LETTER ALEF WITH HAMZA BELOW
+<U0673> <S0627>;"<BASE><VRNT5>";<MIN>;<U0673> % ARABIC LETTER ALEF WITH WAVY HAMZA BELOW

-reorder-after <dal>
-<dal_with_ring>
+reorder-after <S0627> % ARABIC LETTER ALEF
+<S0621> % ARABIC LETTER HAMZA

-reorder-after <reh>
-<reh_with_ring>
+% &ت<ټ<<ٹ
+reorder-after <S062A> % ARABIC LETTER TEH
+<S067C> % ARABIC LETTER TEH WITH RING

-reorder-after <jeh>
-<reh_with_dot_below_and_above>
+<U067C> <S067C>;"<BASE><BASE>";<MIN>;<U067C> % ARABIC LETTER TEH WITH RING
+<U0679> <S067C>;"<BASE><VRNT1>";<MIN>;<U0679> % ARABIC LETTER TTEH

-reorder-after <sheen>
-<seen_with_dot_below_and_above>
+% &ج<ځ<<حٔ
+reorder-after <S062C> % ARABIC LETTER JEEM
+<S0681> % ARABIC LETTER HAH WITH HAMZA ABOVE

-reorder-after <keheh>
-<kaaf_with_ring>
+<U0681> <S0681>;"<BASE><BASE>";<MIN>;<U0681> % ARABIC LETTER HAH WITH HAMZA ABOVE
+<U062D> <S0681>;"<BASE><VRNT1>";<MIN>;<U062D> % ARABIC LETTER HAH

-reorder-after <noon>
-<noon_with_ring>
+% &چ<څ
+reorder-after <S0686> % ARABIC LETTER TCHEH
+<S0685> % ARABIC LETTER HAH WITH THREE DOTS ABOVE

-reorder-after <heh>
-<farsi_yeh>
+% &د<ډ<<ڈ
+reorder-after <S062F> % ARABIC LETTER DAL
+<S0689> % ARABIC LETTER DAL WITH RING

-reorder-after <alef_maksura>
-<arabic_letter_e>
-<yeh_with_tail>
+<U0689> <S0689>;"<BASE><BASE>";<MIN>;<U0689> % ARABIC LETTER DAL WITH RING
+<U0688> <S0689>;"<BASE><VRNT1>";<MIN>;<U0688> % ARABIC LETTER DDAL

+% &ر<ړ<<ڑ
+reorder-after <S0631> % ARABIC LETTER REH

-reorder-after <U062A>
-<U067C>  <teh_with_ring>;<BAS>;<MIN>;IGNORE
+<U0693> <S0693>;"<BASE><BASE>";<MIN>;<U0693> % ARABIC LETTER REH WITH RING
+<U0691> <S0693>;"<BASE><VRNT1>";<MIN>;<U0691> % ARABIC LETTER RREH

-reorder-after <U062C>
-<U0681> <hah_with_hamza_above>;<BAS>;<MIN>;IGNORE
+% &ژ<ږ
+reorder-after <S0698> % ARABIC LETTER JEH
+<S0696> % ARABIC LETTER REH WITH DOT BELOW AND DOT ABOVE

-reorder-after <U0686>
-<U0685> <hah_with_three_dots>;<BAS>;<MIN>;IGNORE
+% &ک<<*ڪك
+<U06A9> <S06A9>;"<BASE><BASE>";<MIN>;<U06A9> % ARABIC LETTER KEHEH
+<U06AA> <S06A9>;"<BASE><VRNT1>";<MIN>;<U06AA> % ARABIC LETTER SWASH KAF
+<U0643> <S06A9>;"<BASE><VRNT2>";<MIN>;<U0643> % ARABIC LETTER KAF

-reorder-after  <U062F>
-<U0689> <dal_with_ring>;<BAS>;<MIN>;IGNORE
+% &ګ<<گ
+<U06AB> <S06AB>;"<BASE><BASE>";<MIN>;<U06AB> % ARABIC LETTER KAF WITH RING
+<U06AF> <S06AB>;"<BASE><VRNT1>";<MIN>;<U06AF> % ARABIC LETTER GAF

-reorder-after <U0631>
-<U0693> <reh_with_ring>;<BAS>;<MIN>;IGNORE
+% &ڼ<<ڻ
+<U06BC> <S06BC>;"<BASE><BASE>";<MIN>;<U06BC> % ARABIC LETTER NOON WITH RING
+<U06BB> <S06BC>;"<BASE><VRNT1>";<MIN>;<U06BB> % ARABIC LETTER RNOON

-reorder-after <U0698>
-<U0696> <reh_with_dot_below_and_above>;<BAS>;<MIN>;IGNORE
+% &و<<ؤ<<ۇ<<ۉ
+<U0648> <S0648>;"<BASE><BASE>";<MIN>;<U0648> % ARABIC LETTER WAW
+<U0624> <S0648>;"<BASE><VRNT1>";<MIN>;<U0624> % ARABIC LETTER WAW WITH HAMZA ABOVE
+<U06C7> <S0648>;"<BASE><VRNT2>";<MIN>;<U06C7> % ARABIC LETTER U
+<U06C9> <S0648>;"<BASE><VRNT3>";<MIN>;<U06C9> % ARABIC LETTER KIRGHIZ YU

-reorder-after <U0634>
-<U069A> <seen_with_dot_below_and_above>;<BAS>;<MIN>;IGNORE
+% &ه<<<ۀ<<<هٔ<<*ەہھةۃ
+<U0647> <S0647>;"<BASE><BASE>";"<MIN><VRNT1>";<U0647> % ARABIC LETTER HEH
+<U06C0> <S0647>;"<BASE><BASE>";"<MIN><VRNT2>";<U06C0> % ARABIC LETTER HEH WITH YEH ABOVE
+<arabic-letter-heh-with-hamza-above> <S0647>;"<BASE><BASE>";"<MIN><VRNT3>";"<U0647><U0654>" % ARABIC LETTER HEH WITH HAMZA ABOVE

-reorder-after <U06A9>
-<U06AB> <kaaf_with_ring>;<BAS>;<MIN>;IGNORE
+<U06D5> <S0647>;"<BASE><VRNT1>";<MIN>;<U06D5> % ARABIC LETTER AE
+<U06C1> <S0647>;"<BASE><VRNT2>";<MIN>;<U06C1> % ARABIC LETTER HEH GOAL
+<U06BE> <S0647>;"<BASE><VRNT3>";<MIN>;<U06BE> % ARABIC LETTER HEH DOACHASHMEE
+<U0629> <S0647>;"<BASE><VRNT4>";<MIN>;<U0629> % ARABIC LETTER TEH MARBUTA
+<U06C3> <S0647>;"<BASE><VRNT5>";<MIN>;<U06C3> % ARABIC LETTER TEH MARBUTA GOAL

-reorder-after  <U0646>
-<U06BC> <noon_with_ring>;<BAS>;<MIN>;IGNORE
+% &ی<<*ىےيېۍ<<یٔ<<<ىٔ<<<ئ
+% Entry in iso14651_t1_common:
+%
+% <U06CC> <S06CC>;<BASE>;<MIN>;<U06CC> % ARABIC LETTER FARSI YEH
+<U0649> <S06CC>;"<BASE><VRNT1><VRNT1>";<MIN>;<U0649> % ARABIC LETTER ALEF MAKSURA
+<U06D2> <S06CC>;"<BASE><VRNT1><VRNT2>";<MIN>;<U06D2> % ARABIC LETTER YEH BARREE
+<U064A> <S06CC>;"<BASE><VRNT1><VRNT3>";<MIN>;<U064A> % ARABIC LETTER YEH
+<U06D0> <S06CC>;"<BASE><VRNT1><VRNT4>";<MIN>;<U06D0> % ARABIC LETTER E
+<U06CD> <S06CC>;"<BASE><VRNT2><VRNT1>";<MIN>;<U06CD> % ARABIC LETTER YEH WITH TAIL
+<arabic-letter-farsi-yeh-with-hamza-above> <S06CC>;"<BASE><VRNT2><VRNT2>";<MIN>;<U06CC>
+<arabic-letter-alef-maksura-with-hamza-above> <S06CC>;"<BASE><VRNT2><VRNT2>";<CAP>;<U0649>
+<U0626> <S06CC>;"<BASE><VRNT2><VRNT2>";<COMPATCAP>;<U0626> % ARABIC LETTER YEH WITH HAMZA ABOVE

-reorder-after <U0648>
-<U0647> <heh>;<BAS>;<MIN>;IGNORE
-<U06CC> <farsi_yeh>;<BAS>;<MIN>;IGNORE
-
-reorder-after <U064A>
-<U06D0> <arabic_letter_e>;<AYE>;<MIN>;IGNORE
-<U0626> "<alef_maksura><hamza>";"<BAS><BAS>";"<MIN><MIN>";IGNORE
-<U06CD> <yeh_with_tail>;<AYE>;<MIN>;IGNORE
+% &\u00A0<<\u200C<<\u200D
+<U00A0> IGNORE;"<VRNT1>";IGNORE;<U00A0> % NO-BREAK SPACE
+<U200C> IGNORE;"<VRNT2>";IGNORE;<U200C> % ZERO WIDTH NON-JOINER
+<U200D> IGNORE;"<VRNT3>";IGNORE;<U200D> % ZERO WIDTH JOINER

 reorder-end

--- a/localedata/locales/ro_RO
+++ b/localedata/locales/ro_RO
@ -55,58 +55,57 @@ category "i18n:2012";LC_MEASUREMENT
 END LC_IDENTIFICATION

 LC_COLLATE
-
-% Copy the template from ISO/IEC 14651
+% CLDR collation rules for Romanian:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/ro.xml)
+%
+% <collation type="standard" references="Academia Română: DEX - Dicționarul explicativ al limbii române ISBN 973-924-329-2">
+% 	<cr><![CDATA[
+% 		&A<ă<<<Ă<â<<<Â
+% 		&I<î<<<Î
+% 		&S<ş=ș<<<Ş=Ș
+% 		&T<ţ=ț<<<Ţ=Ț
+% 	]]></cr>
+% </collation>
+%
+% And CLDR also lists the following
+% index characters:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/main/ro.xml)
+%
+% <exemplarCharacters type="index">[A Ă Â B C D E F G H I Î J K L M N O P Q R S Ș T Ț U V W X Y Z]</exemplarCharacters>
+%
+% The following rules implement the same order for glibc.
 copy "iso14651_t1"

-% The modern Romanian alphabet has 31 letters, ordered as below:
-% a a( a> b c d e f g h i i> j k l m n o p q r s s, t t, u v w x y z
+collating-symbol <a-breve>
+collating-symbol <a-circumflex>
+collating-symbol <i-circumflex>
+collating-symbol <s-cedilla>
+collating-symbol <t-cedilla>

-collating-symbol <a(>
-collating-symbol <a/>>
-collating-symbol <i/>>
-collating-symbol <s,>
-collating-symbol <t,>
+reorder-after <AFTER-A>
+<a-breve>
+<a-circumflex>
+reorder-after <AFTER-I>
+<i-circumflex>
+reorder-after <AFTER-S>
+<s-cedilla>
+reorder-after <AFTER-T>
+<t-cedilla>

-reorder-after <GRA>
-<CIR>
-<BRE>
-
-reorder-after <a>
-<a(>
-<a/>>
-reorder-after <i>
-<i/>>
-reorder-after <s>
-<s,>
-reorder-after <t>
-<t,>
-
-reorder-after <U0061>
-<U0103> <a(>;<BRE>;<MIN>;IGNORE
-<U00E2> <a/>>;<CIR>;<MIN>;IGNORE
-reorder-after <U0041>
-<U0102> <a(>;<BRE>;<CAP>;IGNORE
-<U00C2> <a/>>;<CIR>;<CAP>;IGNORE
-
-reorder-after <U0069>
-<U00EE> <i/>>;<CIR>;<MIN>;IGNORE
-reorder-after <U0049>
-<U00CE> <i/>>;<CIR>;<CAP>;IGNORE
-
-reorder-after <U0073>
-<U0219> <s,>;<CDI>;<MIN>;IGNORE
-<U015F> <s,>;<CDI>;<MIN>;IGNORE
-reorder-after <U0053>
-<U0218> <s,>;<CDI>;<CAP>;IGNORE
-<U015E> <s,>;<CDI>;<CAP>;IGNORE
-
-reorder-after <U0074>
-<U021B> <t,>;<CDI>;<MIN>;IGNORE
-<U0163> <t,>;<CDI>;<MIN>;IGNORE
-reorder-after <U0054>
-<U021A> <t,>;<CDI>;<CAP>;IGNORE
-<U0162> <t,>;<CDI>;<CAP>;IGNORE
+<U0103>      <a-breve>;"<BASE><BASE>";"<MIN><MIN>";<U0103> % ă
+<U0102>      <a-breve>;"<BASE><BASE>";"<CAP><MIN>";<U0102> % Ă
+<U00E2> <a-circumflex>;"<BASE><BASE>";"<MIN><MIN>";<U00E2> % â
+<U00C2> <a-circumflex>;"<BASE><BASE>";"<CAP><MIN>";<U00C2> % Â
+<U00EE> <i-circumflex>;"<BASE><BASE>";"<MIN><MIN>";<U00EE> % î
+<U00CE> <i-circumflex>;"<BASE><BASE>";"<CAP><MIN>";<U00CE> % Î
+<U015F>    <s-cedilla>;"<BASE><BASE>";"<MIN><MIN>";<U015F> % ş
+<U0219>    <s-cedilla>;"<BASE><BASE>";"<MIN><MIN>";<U0219> % ș
+<U015E>    <s-cedilla>;"<BASE><BASE>";"<CAP><MIN>";<U015E> % Ş
+<U0218>    <s-cedilla>;"<BASE><BASE>";"<CAP><MIN>";<U0218> % Ș
+<U0163>    <t-cedilla>;"<BASE><BASE>";"<MIN><MIN>";<U0163> % ţ
+<U021B>    <t-cedilla>;"<BASE><BASE>";"<MIN><MIN>";<U021B> % ț
+<U0162>    <t-cedilla>;"<BASE><BASE>";"<CAP><MIN>";<U0162> % Ţ
+<U021A>    <t-cedilla>;"<BASE><BASE>";"<CAP><MIN>";<U021A> % Ț

 reorder-end

--- a/localedata/locales/ru_RU
+++ b/localedata/locales/ru_RU
@ -51,21 +51,17 @@ category "i18n:2012";LC_MEASUREMENT
 END LC_IDENTIFICATION

 LC_COLLATE
+% CLDR collation rules for Russian:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/ru.xml)
+%
+% <collation type="standard">
+% 	<cr><![CDATA[
+% 		[reorder Cyrl]
+% 		# The root collation already sorts й/Й as a base letter.
+% 	]]></cr>
+% </collation>
+%
 copy "iso14651_t1"
-
-% iso14651_t1 is missing Ukrainian ghe
-collating-symbol <UKR-GHE>
-
-reorder-after <CYR-GZHE>
-<UKR-GHE>
-
-reorder-after <U0453>
-<U0491> <UKR-GHE>;<BAS>;<MIN>;IGNORE
-
-reorder-after <U0403>
-<U0490> <UKR-GHE>;<BAS>;<CAP>;IGNORE
-
-reorder-end
 END LC_COLLATE

 LC_CTYPE
--- a/localedata/locales/ru_UA
+++ b/localedata/locales/ru_UA
@ -51,21 +51,7 @@ copy "ru_RU"
 END LC_CTYPE

 LC_COLLATE
-copy "iso14651_t1"
-
-% iso14651_t1 is missing Ukrainian ghe
-collating-symbol <UKR-GHE>
-
-reorder-after <CYR-GZHE>
-<UKR-GHE>
-
-reorder-after <U0453>
-<U0491> <UKR-GHE>;<BAS>;<MIN>;IGNORE
-
-reorder-after <U0403>
-<U0490> <UKR-GHE>;<BAS>;<CAP>;IGNORE
-
-reorder-end
+copy "ru_RU"
 END LC_COLLATE

 LC_MESSAGES
--- a/localedata/locales/sc_IT
+++ b/localedata/locales/sc_IT
@ -47,17 +47,18 @@ copy "it_IT"
 END LC_CTYPE

 LC_COLLATE
+% There is no collation information for Sardinian in CLDR.
+%
+% We implement only this rule here: &C<ç<<<Ç
 copy "iso14651_t1"

-collating-symbol <c,>
+collating-symbol <c-cedilla>

-reorder-after <c>
-<c,>
+reorder-after <AFTER-C>
+<c-cedilla>

-reorder-after <U0063>
-<U00E7> <c,>;<CDI>;<MIN>;IGNORE
-reorder-after <U0043>
-<U00C7> <c,>;<CDI>;<CAP>;IGNORE
+<U00E7> <c-cedilla>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ç
+<U00C7> <c-cedilla>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ç

 reorder-end

--- a/localedata/locales/se_NO
+++ b/localedata/locales/se_NO
@ -47,153 +47,171 @@ END LC_IDENTIFICATION


 LC_COLLATE
+% CLDR collation rules for Northern Saami:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/se.xml)
+%
+% <collation type="standard">
+%  <cr><![CDATA[
+%   &[before 1]b<á<<<Á
+%   &[before 1]d<č # fallback: ch
+%   <<<Č<ʒ # Skolt Sami, not "index" for other Sami languages
+%   <<<Ʒ<ǯ # Skolt Sami, not "index" for other Sami languages
+%   <<<Ǯ
+%   &[before 1]e<đ # fallback: dh
+%   <<<Đ<<ð # Icelandic uses a "eth"...
+%   <<<Ð
+%   &[before 1]h<ǧ # Skolt Sami, not "index" for other Sami languages
+%   <<<Ǧ<ǥ # Skolt Sami, not "index" for other Sami languages
+%   <<<Ǥ
+%   &[before 1]l<ǩ # Skolt Sami, not "index" for other Sami languages
+%   <<<Ǩ
+%   &[before 1]o<ŋ # fallback: ng
+%   <<<Ŋ<<ń # Lule Sami (alternative "eng")
+%   <<<Ń<<ñ # Lule Sami (alternative "eng")
+%   <<<Ñ
+%   &[before 1]t<š # fallback: sh
+%   <<<Š
+%   &[before 1]u<ŧ # fallback: th
+%   <<<Ŧ<<þ # Icelandic uses thorn...
+%   <<<Þ
+%   &y<<ü # compat. for Norwegian/Swedish
+%   <<<Ü<<ű # considered a variant of ü
+%   <<<Ű
+%   &[before 1]ǀ # LATIN LETTER DENTAL CLICK
+%   <ž # fallback: zh
+%   <<<Ž<ø # compat. for Norwegian
+%   <<<Ø<<œ # considered a variant of ø (and ö...)
+%   <<<Œ<æ # compat. for Norwegian
+%   <<<Æ<å # compat. for Norwegian/Swedish
+%   <<<Å<<ȧ # considered a variant of å
+%   <<<Ȧ<ä # compat. for Swedish
+%   <<<Ä<<ã # considered a variant of ä
+%   <<<Ã<ö # compat. for Swedish
+%   <<<Ö<<ő # considered a variant of ö
+%   <<<Ő<<õ # considered a variant of ö
+%   <<<Õ<<ô # while pronounced as å in French, it is used for some Swedish dialects for "thick ö"
+%   <<<Ô<<ǫ # variant from old Icelandic/old Norse of a vowel now pronounced like ö
+%   <<<Ǫ
+%  ]]></cr>
+% </collation>
+%
+% And CLDR also lists the following
+% index characters:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/main/se.xml)
+%
+% <exemplarCharacters type="index" draft="contributed">[A Á B C Č D Đ E É F G H I J K L M N Ŋ O P Q R S Š T Ŧ U V W X Y Z Ž Ø Æ Å Ä Ö]</exemplarCharacters>
+%
+% The following rules implement the same order for glibc.
 copy "iso14651_t1"

-collating-symbol <aring>
-collating-symbol <atilde>
-collating-symbol <acircumflex>
-collating-symbol <agrave>
-collating-symbol <aacute>
-collating-symbol <noae>
-collating-symbol <svae>
-collating-symbol <ccedilla>
-collating-symbol <ccaron>
+collating-symbol <a-acute>
+collating-symbol <c-caron>
 collating-symbol <ezh>
-collating-symbol <ezhcaron>
-collating-symbol <dstroke>
+collating-symbol <ezh-caron>
+collating-symbol <d-stroke>
 collating-symbol <eth>
-collating-symbol <fhook>
-collating-symbol <gcaron>
-collating-symbol <gstroke>
-collating-symbol <kcaron>
-collating-symbol <otilde>
-collating-symbol <oe>
-collating-symbol <ssharp>
-collating-symbol <scaron>
-collating-symbol <oumlaut>
-collating-symbol <oslash>
+collating-symbol <g-caron>
+collating-symbol <g-stroke>
+collating-symbol <k-caron>
+collating-symbol <eng>
+collating-symbol <t-stroke>
+collating-symbol <z-caron>
+collating-symbol <o-stroke>
+collating-symbol <ae>
+collating-symbol <a-ring>
+collating-symbol <a-diaeresis>
+collating-symbol <o-diaeresis>

-%
-reorder-after <CAP>
-<MIN>
-
-reorder-after <a>
-<agrave>
-<atilde>
-<aacute>
-<acircumflex>
-
-
-reorder-after <c>
-<ccaron>
-<ccedilla>
+reorder-after <BEFORE-B>
+<a-acute>
+reorder-after <BEFORE-D>
+<c-caron>
 <ezh>
-<ezhcaron>
-
-reorder-after <d>
-<dstroke>
-<eth>
-
-reorder-after <f>
-<fhook>
-
-reorder-after <g>
-<gcaron>
-<gstroke>
-
-reorder-after <k>
-<kcaron>
-
-reorder-after <s>
-<ssharp>
+<ezh-caron>
+reorder-after <BEFORE-E>
+<d-stroke>
+reorder-after <BEFORE-H>
+<g-caron>
+<g-stroke>
+reorder-after <BEFORE-L>
+<k-caron>
+reorder-after <BEFORE-O>
+<eng>
+reorder-after <BEFORE-T>
 <scaron>
+reorder-after <BEFORE-U>
+<t-stroke>
+reorder-after <AFTER-LATIN>
+<z-caron>
+<o-stroke>
+<ae>
+<a-ring>
+<a-diaeresis>
+<o-diaeresis>

-reorder-after <th>
-<noae>
-<oslash>
-<aring>
-<svae>
-<oumlaut>
+<U00E1> <a-acute>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % á
+<U00C1> <a-acute>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Á
+<U010D> <c-caron>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % č
+<U010C> <c-caron>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Č
+<U0292> <ezh>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ʒ
+<U01B7> <ezh>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ʒ
+<U01EF> <ezh-caron>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ǯ
+<U01EE> <ezh-caron>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ǯ
+<U0111> <d-stroke>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % đ
+<U0110> <d-stroke>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Đ
+<U00F0> <d-stroke>;"<BASE><VRNT1>";"<MIN><MIN>";IGNORE % ð
+<U00D0> <d-stroke>;"<BASE><VRNT1>";"<CAP><MIN>";IGNORE % Ð
+<U01E7> <g-caron>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ǧ
+<U01E6> <g-caron>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ǧ
+<U01E5> <g-stroke>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ǥ
+<U01E4> <g-stroke>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ǥ
+<U01E9> <k-caron>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ǩ
+<U01E8> <k-caron>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ǩ
+<U014B> <eng>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ŋ
+<U014A> <eng>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ŋ
+<U0144> <eng>;"<BASE><VRNT1>";"<MIN><MIN>";IGNORE % ń
+<U0143> <eng>;"<BASE><VRNT1>";"<CAP><MIN>";IGNORE % Ń
+<U00F1> <eng>;"<BASE><VRNT2>";"<MIN><MIN>";IGNORE % ñ
+<U00D1> <eng>;"<BASE><VRNT2>";"<CAP><MIN>";IGNORE % Ñ
+<U0161> <scaron>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % š
+<U0160> <scaron>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Š
+<U0167> <t-stroke>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ŧ
+<U0166> <t-stroke>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ŧ
+<U00FE> <t-stroke>;"<BASE><VRNT1>";"<MIN><MIN>";IGNORE % þ
+<U00DE> <t-stroke>;"<BASE><VRNT1>";"<CAP><MIN>";IGNORE % Þ
+% &y<<ü<<<Ü<<ű<<<Ű
+<U00DC> <S0079>;"<BASE><VRNT1>";"<CAP><MIN>";IGNORE % Ü
+<U00FC> <S0079>;"<BASE><VRNT1>";"<MIN><MIN>";IGNORE % ü
+<U0170> <S0079>;"<BASE><VRNT2>";"<CAP><MIN>";IGNORE % Ű
+<U0171> <S0079>;"<BASE><VRNT2>";"<MIN><MIN>";IGNORE % ű

-reorder-after <U0061>
-<U00E0> <agrave>;<GRA>;<MIN>;IGNORE % 201 à
-<U00E1> <aacute>;<ACA>;<MIN>;IGNORE % 200 á
-<U00E2> <acircumflex>;<CIR>;<MIN>;IGNORE % 202 â
-<U00E3> <atilde>;<TIL>;<MIN>;IGNORE % 203 ã
+<U017E> <z-caron>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ž
+<U017D> <z-caron>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ž
+<U00F8> <o-stroke>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ø
+<U00D8> <o-stroke>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ø
+<U0153> <o-stroke>;"<BASE><VRNT1>";"<MIN><MIN>";IGNORE % œ
+<U0152> <o-stroke>;"<BASE><VRNT1>";"<CAP><MIN>";IGNORE % Œ
+<U00E6> <ae>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % æ
+<U00C6> <ae>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Æ
+<U00E5> <a-ring>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % å
+<U00C5> <a-ring>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Å
+<U0227> <a-ring>;"<BASE><VRNT1>";"<MIN><MIN>";IGNORE % ȧ
+<U0226> <a-ring>;"<BASE><VRNT1>";"<CAP><MIN>";IGNORE % Ȧ
+<U00E4> <a-diaeresis>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ä
+<U00C4> <a-diaeresis>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ä
+<U00E3> <a-diaeresis>;"<BASE><VRNT1>";"<MIN><MIN>";IGNORE % ã
+<U00C3> <a-diaeresis>;"<BASE><VRNT1>";"<CAP><MIN>";IGNORE % Ã
+<U00F6> <o-diaeresis>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ö
+<U00D6> <o-diaeresis>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ö
+<U0151> <o-diaeresis>;"<BASE><VRNT1>";"<MIN><MIN>";IGNORE % ő
+<U0150> <o-diaeresis>;"<BASE><VRNT1>";"<CAP><MIN>";IGNORE % Ő
+<U00F5> <o-diaeresis>;"<BASE><VRNT2>";"<MIN><MIN>";IGNORE % õ
+<U00D5> <o-diaeresis>;"<BASE><VRNT2>";"<CAP><MIN>";IGNORE % Õ
+<U00F4> <o-diaeresis>;"<BASE><VRNT3>";"<MIN><MIN>";IGNORE % ô
+<U00D4> <o-diaeresis>;"<BASE><VRNT3>";"<CAP><MIN>";IGNORE % Ô
+<U01EB> <o-diaeresis>;"<BASE><VRNT4>";"<MIN><MIN>";IGNORE % ǫ
+<U01EA> <o-diaeresis>;"<BASE><VRNT4>";"<CAP><MIN>";IGNORE % Ǫ

-reorder-after <U0041>
-<U00C0> <agrave>;<GRA>;<CAP>;IGNORE % 321 À
-<U00C1> <aacute>;<ACA>;<CAP>;IGNORE % 320 Á
-<U00C2> <acircumflex>;<CIR>;<CAP>;IGNORE % 322 Â
-<U00C3> <atilde>;<TIL>;<CAP>;IGNORE % 323 Ã
-
-reorder-after <U0063>
-<U00E7> <ccedilla>;<CDI>;<MIN>;IGNORE % 212 ç
-<U010D> <ccaron>;<CAR>;<MIN>;IGNORE % 215 <c<>
-
-reorder-after <U0043>
-<U00C7> <ccedilla>;<CDI>;<CAP>;IGNORE % 332 Ç
-<U010C> <ccaron>;<CAR>;<CAP>;IGNORE % 335 <C<>
-
-reorder-after <U010B>
-<U0292> <ezh>;<BAS>;<MIN>;IGNORE % ezh
-<U01EF> <ezhcaron>;<CAR>;<MIN>;IGNORE % ezh caron
-
-reorder-after <U010A>
-<U01B7> <ezh>;<BAS>;<MIN>;IGNORE % EZH
-<U01EE> <ezhcaron>;<CAR>;<CAP>;IGNORE % EZH caron
-
-reorder-after <U0064>
-<U00F0> <eth>;<PCL>;<MIN>;IGNORE % 218 ð
-<U0111> <dstroke>;<OBL>;<MIN>;IGNORE % 220 <d//>
-
-reorder-after <U0044>
-<U00D0> <eth>;<PCL>;<CAP>;IGNORE % 338 Ð
-<U0110> <dstroke>;<OBL>;<CAP>;IGNORE % 340 <D//>
-
-reorder-after <U0066>
-<U0192> <fhook>;<BAS>;<MIN>;IGNORE % f WITH HOOK
-
-reorder-after <U0123>
-<U01E7> <gcaron>;<CAR>;<MIN>;IGNORE % gcaron
-<U01E5> <gstroke>;<OBL>;<MIN>;IGNORE % gstroke
-
-reorder-after <U0122>
-<U01E6> <gcaron>;<CAR>;<MIN>;IGNORE % Gcaron
-<U01E4> <gstroke>;<OBL>;<MIN>;IGNORE % Gstroke
-
-reorder-after <U0137>
-<U01E9> <kcaron>;<CAR>;<MIN>;IGNORE % kcaron
-reorder-after <U0136>
-<U01E8> <kcaron>;<CAR>;<CAP>;IGNORE % Kcaron
-
-reorder-after <U0053>
-<U00DF> <ssharp>;"<LIG><LIG>";"<MIN><MIN>";IGNORE % ß
-<U0161> <scaron>;<CAR>;<MIN>;IGNORE % 288 <s<>
-<U0160> <scaron>;<CAR>;<CAP>;IGNORE % 405 <S<>
-
-
-reorder-after <U00E3>
-<U00E4> <svae>;<REU>;<MIN>;IGNORE % ä
-<U00E5> <aring>;<RNE>;<MIN>;IGNORE % å
-<U00E6> <noae>;<LIG>;<MIN>;IGNORE % æ
-reorder-after <U00F5>
-<U00F6> <oumlaut>;<REU>;<MIN>;IGNORE % ö
-<U00F8> <oslash>;<OBL>;<MIN>;IGNORE % ø
-
-reorder-after <U00C3>
-<U00C4> <svae>;<REU>;<CAP>;IGNORE % Ä
-<U00C5> <aring>;<RNE>;<CAP>;IGNORE % Å
-<U00C6> <noae>;<LIG>;<CAP>;IGNORE % Æ
-reorder-after <U00D5>
-<U00D6> <oumlaut>;<REU>;<CAP>;IGNORE % Ö
-<U00D8> <oslash>;<OBL>;<CAP>;IGNORE % Ø
-
-% ü/Ü is treated like y/Y but is sorted after the latter
-reorder-after <U00FB>
-<U00FC> <y>;<REU>;<MIN>;IGNORE % ü
-reorder-after <U00DB>
-<U00DC> <y>;<REU>;<CAP>;IGNORE % Ü
 reorder-end

 END LC_COLLATE
--- a/localedata/locales/si_LK
+++ b/localedata/locales/si_LK
@ -52,6 +52,48 @@ LC_COLLATE
 % Copy the template from ISO/IEC 14651
 copy "iso14651_t1"

+% CLDR collation rules for Sinhala:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/si.xml)
+%
+% <collation type="standard" references="Sri Lanka standard 1134 Part 1 - 2007 edition - Sri Lanka Standards Institution">
+% 	<cr><![CDATA[
+% 		[normalization on]
+% 		[reorder Sinh Deva Beng Guru Gujr Orya Taml Telu Knda Mlym]
+% 		&ඖ<ං<ඃ
+% 		&ඥ<ඤ
+% 	]]></cr>
+% </collation>
+%
+% And CLDR also lists the following
+% index characters:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/main/si.xml)
+%
+% <exemplarCharacters type="index">[අ ආ ඇ ඈ ඉ ඊ උ ඌ ඍ එ ඒ ඓ ඔ ඕ ඖ ක ඛ ග ඝ ඞ ඟ ච ඡ ජ ඣ ඥ ඤ ට ඨ ඩ ඪ ණ ඬ ත ථ ද ධ න ඳ ප ඵ බ භ ම ඹ ය ර ල ව ශ ෂ ස හ ළ ෆ]</exemplarCharacters>
+%
+% The following rules implement the same order for glibc.
+
+collating-symbol <sinhala-sign-anusvaraya>
+collating-symbol <sinhala-sign-visargaya>
+collating-symbol <sinhala-letter-taaluja-naasikyaya>
+
+% &ඖ<ං<ඃ
+reorder-after <S0D96> % ඖ U+0D96 SINHALA LETTER AUYANNA
+<sinhala-sign-anusvaraya>
+<sinhala-sign-visargaya>
+
+% &ඥ<ඤ
+reorder-after <S0DA5> % ඥ U+0DA5 SINHALA LETTER TAALUJA SANYOOGA NAAKSIKYAYA
+<sinhala-letter-taaluja-naasikyaya>
+
+% &ඖ<ං<ඃ
+<U0D82> <sinhala-sign-anusvaraya>;<ANUSVARA>;<MIN>;<U0D82> % SINHALA SIGN ANUSVARAYA
+<U0D83> <sinhala-sign-visargaya>;<VISARGA>;<MIN>;<U0D83> % SINHALA SIGN VISARGAYA
+
+% &ඥ<ඤ
+<U0DA4> <sinhala-letter-taaluja-naasikyaya>;<BASE>;<MIN>;<U0DA4> % SINHALA LETTER TAALUJA NAASIKYAYA
+
+reorder-end
+
 END LC_COLLATE


--- a/localedata/locales/sq_AL
+++ b/localedata/locales/sq_AL
@ -49,147 +49,162 @@ translit_end
 END LC_CTYPE

 LC_COLLATE
+% CLDR collation rules for :
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/sq.xml)
+%
+% <collation type="standard" >
+%   <cr><![CDATA[
+%     &[before 1]D<ç<<<Ç
+%     &[before 1]E<dh<<<Dh<<<DH
+%     &[before 1]F<ë<<<Ë
+%     &[before 1]H<gj<<<Gj<<<GJ
+%     &[before 1]M<ll<<<Ll<<<LL
+%     &[before 1]O<nj<<<Nj<<<NJ
+%     &[before 1]S<rr<<<Rr<<<RR
+%     &[before 1]T<sh<<<Sh<<<SH
+%     &[before 1]U<th<<<Th<<<TH
+%     &[before 1]Y<xh<<<Xh<<<XH
+%     &[before 1]Ʒ<zh<<<Zh<<<ZH
+%   ]]></cr>
+% </collation  >
+% <collation draft="unconfirmed" alt="proposed" type="standard" >
+%   <cr><![CDATA[
+%     &[before 1]D<ç<<<Ç
+%     &[before 1]E<dh<<<dH<<<Dh<<<DH
+%     &[before 1]F<ë<<<Ë
+%     &[before 1]H<gj<<<gJ<<<Gj<<<GJ
+%     &[before 1]M<ll<<<lL<<<Ll<<<LL
+%     &[before 1]O<nj<<<nJ<<<Nj<<<NJ
+%     &[before 1]S<rr<<<rR<<<Rr<<<RR
+%     &[before 1]T<sh<<<sH<<<Sh<<<SH
+%     &[before 1]U<th<<<tH<<<Th<<<TH
+%     &[before 1]Y<xh<<<xH<<<Xh<<<XH
+%     &[before 1]Ʒ<zh<<<zH<<<Zh<<<ZH
+%   ]]></cr>
+% </collation  >
+%
+% And CLDR also lists the following
+% index characters:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/main/sq.xml)
+%
+% <exemplarCharacters type="index">[A B C Ç D {DH} E Ë F G {GJ} H I J K L {LL} M N {NJ} O P Q R {RR} S {SH} T {TH} U V X {XH} Y Z {ZH}]</exemplarCharacters>
+%
+% The following rules implement the same order for glibc.

-% Copy the template from ISO/IEC 14651
 copy "iso14651_t1"

-%% a, b, c, c,, d, dh, e, e:, f, g, gj, h, i, j, k, l, ll, m, n, nj, o, p, q
-%% r, rr, s, sh, t, th, u, v, x, xh, y, z, zh.
-collating-symbol  <ccedilla>
-collating-symbol  <d-h-sq>
-collating-element <D-H> from "<U0044><U0048>"
-collating-element <d-h> from "<U0064><U0068>"
-collating-element <D-h> from "<U0044><U0068>"
-collating-element <d-H> from "<U0064><U0048>"
-collating-symbol  <ediaeresis>
-collating-symbol  <g-j-sq>
-collating-element <G-J> from "<U0047><U004A>"
-collating-element <g-j> from "<U0067><U006A>"
-collating-element <G-j> from "<U0047><U006A>"
-collating-element <g-J> from "<U0067><U004A>"
-collating-symbol  <l-l-sq>
-collating-element <L-L> from "<U004C><U004C>"
-collating-element <l-l> from "<U006C><U006C>"
-collating-element <L-l> from "<U004C><U006C>"
-collating-element <l-L> from "<U006C><U004C>"
-collating-symbol  <n-j-sq>
-collating-element <N-J> from "<U004E><U004A>"
-collating-element <n-j> from "<U006E><U006A>"
-collating-element <N-j> from "<U004E><U006A>"
-collating-element <n-J> from "<U006E><U004A>"
-collating-symbol  <r-r-sq>
-collating-element <R-R> from "<U0052><U0052>"
-collating-element <r-r> from "<U0072><U0072>"
-collating-element <R-r> from "<U0052><U0072>"
-collating-element <r-R> from "<U0072><U0052>"
-collating-symbol  <s-h-sq>
-collating-element <S-H> from "<U0053><U0048>"
-collating-element <s-h> from "<U0073><U0068>"
-collating-element <S-h> from "<U0053><U0068>"
-collating-element <s-H> from "<U0073><U0048>"
-collating-symbol  <t-h-sq>
-collating-element <T-H> from "<U0054><U0048>"
-collating-element <t-h> from "<U0074><U0068>"
-collating-element <T-h> from "<U0054><U0068>"
-collating-element <t-H> from "<U0074><U0048>"
-collating-symbol  <x-h-sq>
-collating-element <X-H> from "<U0058><U0048>"
-collating-element <x-h> from "<U0078><U0068>"
-collating-element <X-h> from "<U0058><U0068>"
-collating-element <x-H> from "<U0078><U0048>"
-collating-symbol  <z-h-sq>
-collating-element <Z-H> from "<U005A><U0048>"
-collating-element <z-h> from "<U007A><U0068>"
-collating-element <Z-h> from "<U005A><U0068>"
-collating-element <z-H> from "<U007A><U0048>"
+collating-symbol <c-cedilla>
+collating-symbol <dh-digraph>
+collating-symbol <e-diaeresis>
+collating-symbol <gj-digraph>
+collating-symbol <ll-digraph>
+collating-symbol <nj-digraph>
+collating-symbol <rr-digraph>
+collating-symbol <sh-digraph>
+collating-symbol <th-digraph>
+collating-symbol <xh-digraph>
+collating-symbol <zh-digraph>

-collating-symbol <CAP-MIN>
-collating-symbol <MIN-CAP>
+collating-element <dh> from "dh"
+collating-element <dH> from "dH"
+collating-element <Dh> from "Dh"
+collating-element <DH> from "DH"
+collating-element <gj> from "gj"
+collating-element <gJ> from "gJ"
+collating-element <Gj> from "Gj"
+collating-element <GJ> from "GJ"
+collating-element <ll> from "ll"
+collating-element <lL> from "lL"
+collating-element <Ll> from "Ll"
+collating-element <LL> from "LL"
+collating-element <nj> from "nj"
+collating-element <nJ> from "nJ"
+collating-element <Nj> from "Nj"
+collating-element <NJ> from "NJ"
+collating-element <rr> from "rr"
+collating-element <rR> from "rR"
+collating-element <Rr> from "Rr"
+collating-element <RR> from "RR"
+collating-element <sh> from "sh"
+collating-element <sH> from "sH"
+collating-element <Sh> from "Sh"
+collating-element <SH> from "SH"
+collating-element <th> from "th"
+collating-element <tH> from "tH"
+collating-element <Th> from "Th"
+collating-element <TH> from "TH"
+collating-element <xh> from "xh"
+collating-element <xH> from "xH"
+collating-element <Xh> from "Xh"
+collating-element <XH> from "XH"
+collating-element <zh> from "zh"
+collating-element <zH> from "zH"
+collating-element <Zh> from "Zh"
+collating-element <ZH> from "ZH"

-reorder-after <MIN>
-<MIN-CAP>
-reorder-after <CAP>
-<CAP-MIN>
+reorder-after <BEFORE-D>
+<c-cedilla>
+reorder-after <BEFORE-E>
+<dh-digraph>
+reorder-after <BEFORE-F>
+<e-diaeresis>
+reorder-after <BEFORE-H>
+<gj-digraph>
+reorder-after <BEFORE-M>
+<ll-digraph>
+reorder-after <BEFORE-O>
+<nj-digraph>
+reorder-after <BEFORE-S>
+<rr-digraph>
+reorder-after <BEFORE-T>
+<sh-digraph>
+reorder-after <BEFORE-U>
+<th-digraph>
+reorder-after <BEFORE-Y>
+<xh-digraph>
+reorder-after <BEFORE-EZH>
+<zh-digraph>

-reorder-after <c>
-<ccedilla>
-reorder-after <d>
-<d-h-sq>
-reorder-after <e>
-<ediaeresis>
-reorder-after <g>
-<g-j-sq>
-reorder-after <l>
-<l-l-sq>
-reorder-after <n>
-<n-j-sq>
-reorder-after <r>
-<r-r-sq>
-reorder-after <s>
-<s-h-sq>
-reorder-after <t>
-<t-h-sq>
-reorder-after <x>
-<x-h-sq>
-reorder-after <z>
-<z-h-sq>
-
-reorder-after <U0063>
-<U00E7> <ccedilla>;<CDI>;<MIN>;IGNORE
-reorder-after <U0043>
-<U00C7> <ccedilla>;<CDI>;<CAP>;IGNORE
-reorder-after <U0064>
-<d-h>   <d-h-sq>;<PCT>;<MIN>;IGNORE
-<d-H>   <d-h-sq>;<PCT>;<MIN-CAP>;IGNORE
-reorder-after <U0044>
-<D-H>   <d-h-sq>;<PCT>;<CAP>;IGNORE
-<D-h>   <d-h-sq>;<PCT>;<CAP-MIN>;IGNORE
-reorder-after <U0065>
-<U00EB> <ediaeresis>;<REU>;<MIN>;IGNORE
-reorder-after <U0045>
-<U00CB> <ediaeresis>;<REU>;<CAP>;IGNORE
-reorder-after <U0067>
-<g-j>   <g-j-sq>;<PCT>;<MIN>;IGNORE
-<g-J>   <g-j-sq>;<PCT>;<MIN-CAP>;IGNORE
-reorder-after <U0047>
-<G-J>   <g-j-sq>;<PCT>;<CAP>;IGNORE
-<G-j>   <g-j-sq>;<PCT>;<CAP-MIN>;IGNORE
-reorder-after <U006C>
-<l-l>   <l-l-sq>;<PCT>;<MIN>;IGNORE
-<l-L>   <l-l-sq>;<PCT>;<MIN-CAP>;IGNORE
-reorder-after <U004C>
-<L-L>   <l-l-sq>;<PCT>;<CAP>;IGNORE
-<L-l>   <l-l-sq>;<PCT>;<CAP-MIN>;IGNORE
-reorder-after <U006E>
-<n-j>   <n-j-sq>;<PCT>;<MIN>;IGNORE
-<n-J>   <n-j-sq>;<PCT>;<MIN-CAP>;IGNORE
-reorder-after <U004E>
-<N-J>   <n-j-sq>;<PCT>;<CAP>;IGNORE
-<N-j>   <n-j-sq>;<PCT>;<CAP-MIN>;IGNORE
-reorder-after <U0072>
-<r-r>   <r-r-sq>;<PCT>;<MIN>;IGNORE
-<r-R>   <r-r-sq>;<PCT>;<MIN-CAP>;IGNORE
-reorder-after <U0052>
-<R-R>   <r-r-sq>;<PCT>;<CAP>;IGNORE
-<R-r>   <r-r-sq>;<PCT>;<CAP-MIN>;IGNORE
-reorder-after <U0074>
-<t-h>   <t-h-sq>;<PCT>;<MIN>;IGNORE
-<t-H>   <t-h-sq>;<PCT>;<MIN-CAP>;IGNORE
-reorder-after <U0054>
-<T-H>   <t-h-sq>;<PCT>;<CAP>;IGNORE
-<T-h>   <t-h-sq>;<PCT>;<CAP-MIN>;IGNORE
-reorder-after <U0078>
-<x-h>   <x-h-sq>;<PCT>;<MIN>;IGNORE
-<x-H>   <x-h-sq>;<PCT>;<MIN-CAP>;IGNORE
-reorder-after <U0058>
-<X-H>   <x-h-sq>;<PCT>;<CAP>;IGNORE
-<X-h>   <x-h-sq>;<PCT>;<CAP-MIN>;IGNORE
-reorder-after <U007A>
-<z-h>   <z-h-sq>;<PCT>;<MIN>;IGNORE
-<z-H>   <z-h-sq>;<PCT>;<MIN-CAP>;IGNORE
-reorder-after <U005A>
-<Z-H>   <z-h-sq>;<PCT>;<CAP>;IGNORE
-<Z-h>   <z-h-sq>;<PCT>;<CAP-MIN>;IGNORE
+<U00E7> <c-cedilla>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ç
+<U00C7> <c-cedilla>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ç
+<dh>    <dh-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<dH>    <dh-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<Dh>    <dh-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<DH>    <dh-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<U00EB> <e-diaeresis>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ë
+<U00CB> <e-diaeresis>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ë
+<gj>    <gj-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<gJ>    <gj-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<Gj>    <gj-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<GJ>    <gj-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<ll>    <ll-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<lL>    <ll-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<Ll>    <ll-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<LL>    <ll-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<nj>    <nj-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<nJ>    <nj-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<Nj>    <nj-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<NJ>    <nj-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<rr>    <rr-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<rR>    <rr-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<Rr>    <rr-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<RR>    <rr-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<sh>    <sh-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<sH>    <sh-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<Sh>    <sh-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<SH>    <sh-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<th>    <th-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<tH>    <th-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<Th>    <th-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<TH>    <th-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<xh>    <xh-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<xH>    <xh-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<Xh>    <xh-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<XH>    <xh-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+<zh>    <zh-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<zH>    <zh-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<Zh>    <zh-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<ZH>    <zh-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE

 reorder-end

--- a/localedata/locales/sv_FI
+++ b/localedata/locales/sv_FI
@ -54,7 +54,7 @@ copy "sv_SE"
 END LC_CTYPE

 LC_COLLATE
-copy "fi_FI"
+copy "sv_SE"
 END LC_COLLATE

 LC_MESSAGES
--- a/localedata/locales/sv_FI@euro
+++ b/localedata/locales/sv_FI@euro
@ -47,7 +47,7 @@ copy "sv_FI"
 END LC_CTYPE

 LC_COLLATE
-copy "fi_FI"
+copy "sv_SE"
 END LC_COLLATE

 LC_MESSAGES
--- a/localedata/locales/sv_SE
+++ b/localedata/locales/sv_SE
@ -60,20 +60,48 @@ END LC_IDENTIFICATION
 LC_COLLATE
 copy "iso14651_t1"

+% CLDR collation rules for Swedish:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/sv.xml)
+%
+% <collation type="standard">
+%   <cr><![CDATA[
+%     &D<<đ<<<Đ<<ð<<<Ð
+%     &t<<<þ/h
+%     &T<<<Þ/H
+%     &v<<<V<<w<<<W
+%     &Y<<ü<<<Ü<<ű<<<Ű
+%     &[before 1]ǀ<å<<<Å<ä<<<Ä<<æ<<<Æ<<ę<<<Ę<ö<<<Ö<<ø<<<Ø<<ő<<<Ő<<œ<<<Œ<<ô<<<Ô
+%   ]]></cr>
+% </collation>
+%
+% And CLDR also lists the following
+% index characters:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/main/sv.xml)
+%
+% <exemplarCharacters type="index">[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Å Ä Ö]</exemplarCharacters>
+%
+% The following rules implement the same order for glibc.
+
 collating-symbol <aring>
-collating-symbol <ae>
-collating-symbol <oumlaut>
-collating-symbol <oslash>
+collating-symbol <a-diaresis>
+collating-symbol <o-diaresis>

-% æ is sorted after ä and å etc.
-reorder-after <REU>
-<LIG>
+% &[before 1]ǀ<å<<<Å<ä<<<Ä<<æ<<<Æ<<ę<<<Ę<ö<<<Ö<<ø<<<Ø<<ő<<<Ő<<œ<<<Œ<<ô<<<Ô
+reorder-after <AFTER-Z>
+<a-ring>
+<a-diaresis>
+<o-diaresis>

-reorder-after <z>
-<aring>
-<ae>
-<oumlaut>
-<oslash>
+% &D<<đ<<<Đ<<ð<<<Ð
+<U0110> <S0064>;"<BASE><BARRE>";"<CAP><MIN>";IGNORE % Đ
+<U0111> <S0064>;"<BASE><BARRE>";"<MIN><MIN>";IGNORE % đ
+<U00D0> <S0064>;"<BASE><VRNT1>";"<COMPATCAP><COMPAT>";IGNORE % Ð
+<U00F0> <S0064>;"<BASE><VRNT1>";"<COMPAT><COMPAT>";IGNORE % ð
+
+% &T<<<Þ/H
+% &t<<<þ/h
+<U00DE> "<S0074><S0068>";"<BASE><BASE>";"<COMPATCAP><COMPATCAP>";IGNORE % Þ
+<U00FE> "<S0074><S0068>";"<BASE><BASE>";"<COMPAT><COMPAT>";IGNORE % þ

 % The letter w is normally not present in the Swedish alphabet. It
 % exists in some names in Swedish and foreign words, but is accounted
@ -81,32 +109,39 @@ reorder-after <z>
 % ordered alphabetically among the words and names with 'v'. If two
 % words or names are only to be distinguished by 'v' or % 'w', 'v' is
 % placed before 'w'.
-reorder-after <U0056>
-<U0057> <v>;<BAS>;<CAP>;<w> % W
-reorder-after <U0076>
-<U0077> <v>;<BAS>;<MIN>;<w> % w

-reorder-after <U00E3>
-<U00E4> <ae>;<REU>;<MIN>;IGNORE % ä
-<U00E5> <aring>;<RNE>;<MIN>;IGNORE % å
-<U00E6> <ae>;<LIG>;<MIN>;IGNORE % æ
-reorder-after <U00F5>
-<U00F6> <oumlaut>;<REU>;<MIN>;IGNORE % ö
-<U00F8> <oslash>;<OBL>;<MIN>;IGNORE % ø
+% &v<<<V<<w<<<W
+<U0057> <S0076>;"<BASE><VRNT1>";"<CAP><MIN>";IGNORE % W
+<U0077> <S0076>;"<BASE><VRNT1>";"<MIN><MIN>";IGNORE % w

-reorder-after <U00C3>
-<U00C4> <ae>;<REU>;<CAP>;IGNORE % Ä
-<U00C5> <aring>;<RNE>;<CAP>;IGNORE % Å
-<U00C6> <ae>;<LIG>;<CAP>;IGNORE % Æ
-reorder-after <U00D5>
-<U00D6> <oumlaut>;<REU>;<CAP>;IGNORE % Ö
-<U00D8> <oslash>;<OBL>;<CAP>;IGNORE % Ø
+% &Y<<ü<<<Ü<<ű<<<Ű
+<U00DC> <S0079>;"<BASE><TREMA>";"<CAP><MIN>";IGNORE % Ü
+<U00FC> <S0079>;"<BASE><TREMA>";"<MIN><MIN>";IGNORE % ü
+<U0170> <S0079>;"<BASE><2AIGU>";"<CAP><MIN>";IGNORE % Ű
+<U0171> <S0079>;"<BASE><2AIGU>";"<MIN><MIN>";IGNORE % ű
+
+% &[before 1]ǀ<å<<<Å<ä<<<Ä<<æ<<<Æ<<ę<<<Ę<ö<<<Ö<<ø<<<Ø<<ő<<<Ő<<œ<<<Œ<<ô<<<Ô
+<U00C5> <a-ring>;"<BASE><BASE>";"<COMPATCAP><COMPATCAP>";IGNORE % Å
+<U00E5> <a-ring>;"<BASE><BASE>";"<COMPAT><COMPAT>";IGNORE % å
+
+<U00C4> <a-diaresis>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ä
+<U00E4> <a-diaresis>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ä
+<U00C6> <a-diaresis>;"<BASE><VRNT1>";"<COMPATCAP><COMPATCAP>";IGNORE % Æ
+<U00E6> <a-diaresis>;"<BASE><VRNT1>";"<COMPAT><COMPAT>";IGNORE % æ
+<U0118> <a-diaresis>;"<BASE><VRNT2>";"<CAP><MIN>";IGNORE % Ę
+<U0119> <a-diaresis>;"<BASE><VRNT2>";"<MIN><MIN>";IGNORE % ę
+
+<U00D6> <o-diaresis>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ö
+<U00F6> <o-diaresis>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ö
+<U00D8> <o-diaresis>;"<BASE><VRNT1>";"<COMPATCAP><COMPATCAP>";IGNORE % Ø
+<U00F8> <o-diaresis>;"<BASE><VRNT1>";"<COMPAT><COMPAT>";IGNORE % ø
+<U0150> <o-diaresis>;"<BASE><VRNT2>";"<CAP><MIN>";IGNORE % Ő
+<U0151> <o-diaresis>;"<BASE><VRNT2>";"<MIN><MIN>";IGNORE % ő
+<U0152> <o-diaresis>;"<BASE><VRNT3>";"<CAP><MIN>";IGNORE % Œ
+<U0153> <o-diaresis>;"<BASE><VRNT3>";"<MIN><MIN>";IGNORE % œ
+<U00D4> <o-diaresis>;"<BASE><VRNT4>";"<CAP><MIN>";IGNORE % Ô
+<U00F4> <o-diaresis>;"<BASE><VRNT4>";"<MIN><MIN>";IGNORE % ô

-% ü/Ü is treated like y/Y but is sorted after the latter
-reorder-after <U00FB>
-<U00FC> <y>;<REU>;<MIN>;IGNORE % ü
-reorder-after <U00DB>
-<U00DC> <y>;<REU>;<CAP>;IGNORE % Ü
 reorder-end

 END LC_COLLATE
--- a/localedata/locales/szl_PL
+++ b/localedata/locales/szl_PL
@ -53,6 +53,10 @@ copy "pl_PL"
 END LC_CTYPE

 LC_COLLATE
+% There is no collation information in CLDR for Silesian
+%
+% A Ã B C Ć D E F G H I J K L Ł M N N Ń O Õ Ō Ô Ŏ P Q R S Ś T U V W X Y Z Ź Ż
+
 copy "iso14651_t1"

 collating-symbol <atilde>
@ -62,70 +66,52 @@ collating-symbol <nacute>
 collating-symbol <otilde>
 collating-symbol <omacron>
 collating-symbol <ocircumflex>
-collating-symbol <U_014F>
+collating-symbol <obreve>
+collating-symbol <sacute>
 collating-symbol <zacute>
 collating-symbol <zdot>

-reorder-after <a>
+reorder-after <AFTER-A>
 <atilde>
-
-reorder-after <c>
+reorder-after <AFTER-C>
 <cacute>
-
-reorder-after <l>
+reorder-after <AFTER-L>
 <lstroke>
-
-reorder-after <n>
+reorder-after <AFTER-N>
 <nacute>
-
-reorder-after <o>
+reorder-after <AFTER-O>
 <otilde>
 <omacron>
 <ocircumflex>
-<U014F>
-
-reorder-after <s>
+<obreve>
+reorder-after <AFTER-S>
 <sacute>
-
-reorder-after <z>
+reorder-after <AFTER-Z>
 <zacute>
 <zdot>

-reorder-after <U0061>
-<U00E3> <atilde>;<BAS>;<MIN>;IGNORE
-<U00C3> <atilde>;<BAS>;<CAP>;IGNORE
-
-reorder-after <U0063>
-<U0107> <cacute>;<BAS>;<MIN>;IGNORE
-<U0106> <cacute>;<BAS>;<CAP>;IGNORE
-
-reorder-after <U006C>
-<U0142> <lstroke>;<BAS>;<MIN>;IGNORE
-<U0141> <lstroke>;<BAS>;<CAP>;IGNORE
-
-reorder-after <U006E>
-<U0144> <nacute>;<BAS>;<MIN>;IGNORE
-<U0143> <nacute>;<BAS>;<CAP>;IGNORE
-
-reorder-after <U006F>
-<U00F5> <otilde>;<BAS>;<MIN>;IGNORE
-<U00D5> <otilde>;<BAS>;<CAP>;IGNORE
-<U014D> <omacron>;<BAS>;<MIN>;IGNORE
-<U013D> <omacron>;<BAS>;<CAP>;IGNORE
-<U00F4> <ocircumflex>;<BAS>;<MIN>;IGNORE
-<U00D4> <ocircumflex>;<BAS>;<CAP>;IGNORE
-<U014F> <U014F>;<BAS>;<MIN>;IGNORE
-<U014F> <U014F>;<BAS>;<CAP>;IGNORE
-
-reorder-after <U0073>
-<U015B> <sacute>;<BAS>;<MIN>;IGNORE
-<U015A> <sacute>;<BAS>;<CAP>;IGNORE
-
-reorder-after <U007A>
-<U017A> <zacute>;<BAS>;<MIN>;IGNORE
-<U0179> <zacute>;<BAS>;<CAP>;IGNORE
-<U017C> <zdot>;<BAS>;<MIN>;IGNORE
-<U017B> <zdot>;<BAS>;<CAP>;IGNORE
+<U00E3> <atilde>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ã
+<U00C3> <atilde>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ã
+<U0107> <cacute>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ć
+<U0106> <cacute>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ć
+<U0142> <lstroke>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ł
+<U0141> <lstroke>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ł
+<U0144> <nacute>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ń
+<U0143> <nacute>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ń
+<U00F5> <otilde>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % õ
+<U00D5> <otilde>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Õ
+<U014D> <omacron>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ō
+<U014C> <omacron>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ō
+<U00F4> <ocircumflex>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ô
+<U00D4> <ocircumflex>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ô
+<U014F> <obreve>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ŏ
+<U014E> <obreve>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ŏ
+<U015B> <sacute>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ś
+<U015A> <sacute>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ś
+<U017A> <zacute>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ź
+<U0179> <zacute>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ź
+<U017C> <zdot>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ż
+<U017B> <zdot>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ż

 reorder-end

--- a/localedata/locales/tg_TJ
+++ b/localedata/locales/tg_TJ
@ -61,65 +61,61 @@ END LC_CTYPE

 LC_COLLATE

+% There is no collation information for Tadjik in CLDR.
+%
 % Tadjik cyrillic alphabet is:
-% <U0430>, <U0431>, <U0432>, <U0433>, <U0493> (cyr ghe with stroke), <U0434>, <U0435>,
-% <U0451>, <U0436>, <U0437>, <U0438>, <U04E3> (cyr i with macron), <U0439>, <U043A>,
-% <U049B> (cyr k with descender), <U043B>, <U043C>, <U043D>, <U043E>, <U043F>, <U0440>,
-% <U0441>, <U0442>, <U0443>, <U04EF> (cyr u with macron), <U0444>, <U0445>,
-% <U04B3> (cyr ha with descender), <U0447>, <U04B7> (cyr che with descender),
-% <U0448>, <U044A> (cyr hard sign), <U044D>, <U044E>, <U044F>
+% а, б, в, г, ғ (cyr ghe with stroke), д, е,
+% ё, ж, з, и, ӣ (cyr i with macron), й, к,
+% қ (cyr k with descender), л, м, н, о, п, р,
+% с, т, у, ӯ (cyr u with macron), ф, х,
+% ҳ (cyr ha with descender), ч, ҷ (cyr che with descender),
+% ш, ъ (cyr hard sign), э, ю, я
+%
+% https://en.wikipedia.org/wiki/Tajik_alphabet#Cyrillic
+%
+% А а  Б б  В в  Г г  Ғ ғ  Д д  Е е  Ё ё  Ж ж  З з  И и  Ӣ ӣ
+% Й й  К к  Қ қ  Л л  М м  Н н  О о  П п  Р р  С с  Т т  У у
+% Ӯ ӯ  Ф ф  Х х  Ҳ ҳ  Ч ч  Ҷ ҷ  Ш ш  Ъ ъ  Э э  Ю ю  Я я

 copy "iso14651_t1"

-collating-symbol <g-=>
-collating-symbol <i-=>
-collating-symbol <k,=>
-collating-symbol <u-=>
-collating-symbol <h,=>
-collating-symbol <c%,=>
+collating-symbol <ghe-with-stroke>
+collating-symbol <io>
+collating-symbol <i-with-macron>
+collating-symbol <k-descender>
+collating-symbol <u-macron>
+collating-symbol <ha-descender>
+collating-symbol <che-descender>

-reorder-after <CYR-GHE>
-<g-=>
-reorder-after <CYR-I>
-<i-=>
-reorder-after <CYR-KA>
-<k,=>
-reorder-after <CYR-OU>
-<u-=>
-reorder-after <CYR-HA>
-<h,=>
-reorder-after <CYR-CHE>
-<c%,=>
+reorder-after <S0433> % CYRILLIC SMALL LETTER GHE
+<ghe-with-stroke>
+reorder-after <S0435> % CYRILLIC SMALL LETTER IE
+<io>
+reorder-after <S0438> % CYRILLIC SMALL LETTER I
+<i-with-macron>
+reorder-after <S043A> % CYRILLIC SMALL LETTER KA
+<k-descender>
+reorder-after <S0443> % CYRILLIC SMALL LETTER U
+<u-macron>
+reorder-after <S0445> % CYRILLIC SMALL LETTER HA
+<ha-descender>
+reorder-after <S0447> % CYRILLIC SMALL LETTER CHE
+<che-descender>

-reorder-after <U0433>
-<U0493> <g-=>;<PCL>;<MIN>;IGNORE
-reorder-after <U0413>
-<U0492> <g-=>;<PCL>;<CAP>;IGNORE
-
-reorder-after <U0438>
-<U04E3> <i-=>;<PCL>;<MIN>;IGNORE
-reorder-after <U0418>
-<U04E2> <i-=>;<PCL>;<CAP>;IGNORE
-
-reorder-after <U043A>
-<U049B> <k,=>;<PCL>;<MIN>;IGNORE
-reorder-after <U041A>
-<U049A> <k,=>;<PCL>;<CAP>;IGNORE
-
-reorder-after <U0443>
-<U04EF> <u-=>;<PCL>;<MIN>;IGNORE
-reorder-after <U0423>
-<U04EE> <u-=>;<PCL>;<CAP>;IGNORE
-
-reorder-after <U0445>
-<U04B3> <h,=>;<PCL>;<MIN>;IGNORE
-reorder-after <U0425>
-<U04B2> <h,=>;<PCL>;<CAP>;IGNORE
-
-reorder-after <U0447>
-<U04B7> <c%,=>;<PCL>;<MIN>;IGNORE
-reorder-after <U0427>
-<U04B6> <c%,=>;<PCL>;<CAP>;IGNORE
+<U0493>   <ghe-with-stroke>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ғ
+<U0492>   <ghe-with-stroke>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ғ
+<U0451>                <io>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ё
+<U0401>                <io>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ё
+<U04E3>     <i-with-macron>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ӣ
+<U04E2>     <i-with-macron>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ӣ
+<U049B>       <k-descender>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % қ
+<U049A>       <k-descender>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Қ
+<U04EF>          <u-macron>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ӯ
+<U04EE>          <u-macron>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ӯ
+<U04B3>      <ha-descender>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ҳ
+<U04B2>      <ha-descender>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ҳ
+<U04B7>     <che-descender>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ҷ
+<U04B6>     <che-descender>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ҷ

 reorder-end

--- a/localedata/locales/ti_ER
+++ b/localedata/locales/ti_ER
@ -155,7 +155,9 @@ END LC_ADDRESS
 LC_MESSAGES
 yesexpr "^[+1yY<U12A5>]"
 noexpr  "^[-0nN<U1290>]"
+% እወ
 yesstr  "<U12A5><U12C8>"
+% ነኖእ
 nostr   "<U1290><U1296><U12A5>"
 END LC_MESSAGES

--- a/localedata/locales/tk_TM
+++ b/localedata/locales/tk_TM
@ -19,9 +19,6 @@ escape_char /
 % Application: general
 % Users: general

-% needed extra chars: ä, ö, ü, ý, ç, ş, ň, ž
-% cyrillic extra chars: җ (z%,=), ң (n,=), ө (o-=), ү (u'=), ә (sw=)
-
 LC_IDENTIFICATION

 title     "Turkmen locale for Turkmenistan"
@ -59,83 +56,83 @@ include "translit_combining";""
 % cyrillic -> latin
 % lower case letters

-<U0430> "<U0061>"        % a=   -> a
-<U0431> "<U0062>"        % b=   -> b
-<U0432> "<U0077>"        % v=   -> w
-<U0433> "<U0067>"        % g=   -> g
-<U0434> "<U0064>"        % d=   -> d
-<U0435> "<U0065>"        % e=   -> e (y'e also, but context dependent)
-<U0451> "<U00FD><U006F>" % io   -> y'o
-<U0436> "<U017E>"        % z%   -> z<
-<U0497> "<U006A>"        % z%,  -> j
-<U0437> "<U007A>"        % z=   -> z
-<U0438> "<U0069>"        % i=   -> i
-<U0439> "<U00FD>"        % j=   -> y'
-<U043A> "<U006B>"        % k=   -> k
-<U043B> "<U006C>"        % l=   -> l
-<U043C> "<U006D>"        % m=   -> m
-<U043D> "<U006E>"        % n=   -> n
-<U04A3> "<U0148>"        % n,=  -> n<
-<U043E> "<U006F>"        % o=   -> o
-<U04E9> "<U00F6>"        % o-=  -> o:
-<U043F> "<U0070>"        % p=   -> p
-<U0440> "<U0072>"        % r=   -> r
-<U0441> "<U0073>"        % s=   -> s
-<U0442> "<U0074>"        % t=   -> t
-<U0443> "<U0075>"        % u=   -> u
-<U04AF> "<U00FC>"        % u'=  -> u:
-<U0444> "<U0066>"        % f=   -> f
-<U0445> "<U0068>"        % h=   -> h
-<U0446> "<U0074><U0073>" % c=   -> ts
-<U0447> "<U00E7>"        % c%   -> c,
-<U0448> "<U015F>"        % s%   -> s,
-<U044A> ""               % hard sign omitted
-<U044B> "<U0079>"        % yeru -> y
-<U044C> ""               % soft sign omitted.
-<U044D> "<U0065>"        % je=  -> e
-<U04D9> "<U00E4>"        % sw=  -> a:
-<U044E> "<U00FD><U0075>" % ju   -> y'u
-<U044F> "<U00FD><U0061>" % ja   -> y'a
+<U0430> "<U0061>"        % а -> a
+<U0431> "<U0062>"        % б -> b
+<U0432> "<U0077>"        % в -> w
+<U0433> "<U0067>"        % г -> g
+<U0434> "<U0064>"        % д -> d
+<U0435> "<U0065>"        % е -> e (y'e also, but context dependent)
+<U0451> "<U00FD><U006F>" % ё -> y'o
+<U0436> "<U017E>"        % ж -> z<
+<U0497> "<U006A>"        % җ -> j
+<U0437> "<U007A>"        % з -> z
+<U0438> "<U0069>"        % и -> i
+<U0439> "<U00FD>"        % й -> y'
+<U043A> "<U006B>"        % к -> k
+<U043B> "<U006C>"        % л -> l
+<U043C> "<U006D>"        % м -> m
+<U043D> "<U006E>"        % н -> n
+<U04A3> "<U0148>"        % ң -> n<
+<U043E> "<U006F>"        % о -> o
+<U04E9> "<U00F6>"        % ө -> o:
+<U043F> "<U0070>"        % п -> p
+<U0440> "<U0072>"        % р -> r
+<U0441> "<U0073>"        % с -> s
+<U0442> "<U0074>"        % т -> t
+<U0443> "<U0075>"        % у -> u
+<U04AF> "<U00FC>"        % ү -> u:
+<U0444> "<U0066>"        % ф -> f
+<U0445> "<U0068>"        % х -> h
+<U0446> "<U0074><U0073>" % ц -> ts
+<U0447> "<U00E7>"        % ч -> c,
+<U0448> "<U015F>"        % ш -> s,
+<U044A> ""               % ъ hard sign omitted
+<U044B> "<U0079>"        % ы -> y
+<U044C> ""               % ь soft sign omitted.
+<U044D> "<U0065>"        % э -> e
+<U04D9> "<U00E4>"        % ә -> a:
+<U044E> "<U00FD><U0075>" % ю -> y'u
+<U044F> "<U00FD><U0061>" % я -> y'a

 % upper case letters

-<U0410> "<U0041>"        % a=   -> a
-<U0411> "<U0042>"        % b=   -> b
-<U0412> "<U0057>"        % v=   -> w
-<U0413> "<U0047>"        % g=   -> g
-<U0414> "<U0044>"        % d=   -> d
-<U0415> "<U0045>"        % e=   -> e (y'e also, but context dependent)
-<U0401> "<U00DD><U006F>" % io   -> y'o
-<U0416> "<U017D>"        % z%   -> z<
-<U0496> "<U004A>"        % z%,  -> j
-<U0417> "<U005A>"        % z=   -> z
-<U0418> "<U0049>"        % i=   -> i
-<U0419> "<U00DD>"        % j=   -> y'
-<U041A> "<U004B>"        % k=   -> k
-<U041B> "<U004C>"        % l=   -> l
-<U041C> "<U004D>"        % m=   -> m
-<U041D> "<U004E>"        % n=   -> n
-<U04A2> "<U0147>"        % n,=  -> n<
-<U041E> "<U004F>"        % o=   -> o
-<U04E8> "<U00D6>"        % o-=  -> o:
-<U041F> "<U0050>"        % p=   -> p
-<U0420> "<U0052>"        % r=   -> r
-<U0421> "<U0053>"        % s=   -> s
-<U0422> "<U0054>"        % t=   -> t
-<U0423> "<U0055>"        % u=   -> u
-<U04AE> "<U00DC>"        % u'=  -> u:
-<U0424> "<U0046>"        % f=   -> f
-<U0425> "<U0048>"        % h=   -> h
-<U0426> "<U0054><U0073>" % c=   -> ts
-<U0427> "<U00C7>"        % c%   -> c,
-<U0428> "<U015E>"        % s%   -> s,
-<U042A> ""               % hard sign omitted
-<U042B> "<U0059>"        % yeru -> y
-<U042C> ""               % soft sign omitted.
-<U042D> "<U0045>"        % je=  -> e
-<U04D8> "<U00C4>"        % sw=  -> a:
-<U042E> "<U00DD><U0075>" % ju   -> y'u
-<U042F> "<U00DD><U0061>" % ja   -> y'a
+<U0410> "<U0041>"        % А -> a
+<U0411> "<U0042>"        % Б -> b
+<U0412> "<U0057>"        % В -> w
+<U0413> "<U0047>"        % Г -> g
+<U0414> "<U0044>"        % Д -> d
+<U0415> "<U0045>"        % Е -> e (y'e also, but context dependent)
+<U0401> "<U00DD><U006F>" % Ё -> y'o
+<U0416> "<U017D>"        % Ж -> z<
+<U0496> "<U004A>"        % Җ -> j
+<U0417> "<U005A>"        % З -> z
+<U0418> "<U0049>"        % И -> i
+<U0419> "<U00DD>"        % Й -> y'
+<U041A> "<U004B>"        % К -> k
+<U041B> "<U004C>"        % Л -> l
+<U041C> "<U004D>"        % М -> m
+<U041D> "<U004E>"        % Н -> n
+<U04A2> "<U0147>"        % Ң -> n<
+<U041E> "<U004F>"        % О -> o
+<U04E8> "<U00D6>"        % Ө -> o:
+<U041F> "<U0050>"        % П -> p
+<U0420> "<U0052>"        % Р -> r
+<U0421> "<U0053>"        % С -> s
+<U0422> "<U0054>"        % Т -> t
+<U0423> "<U0055>"        % У -> u
+<U04AE> "<U00DC>"        % Ү -> u:
+<U0424> "<U0046>"        % Ф -> f
+<U0425> "<U0048>"        % Х -> h
+<U0426> "<U0054><U0073>" % Ц -> ts
+<U0427> "<U00C7>"        % Ч -> c,
+<U0428> "<U015E>"        % Ш -> s,
+<U042A> ""               % Ъ hard sign omitted
+<U042B> "<U0059>"        % Ы -> y
+<U042C> ""               % Ь soft sign omitted.
+<U042D> "<U0045>"        % Э -> e
+<U04D8> "<U00C4>"        % Ә -> a:
+<U042E> "<U00DD><U0075>" % Ю -> y'u
+<U042F> "<U00DD><U0061>" % Я -> y'a

 translit_end

@ -143,149 +140,121 @@ END LC_CTYPE

 LC_COLLATE

+% CLDR collation rules for Turkmen:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/tk.xml)
 %
-% The turkmen latin alphabet order is:
-% (letters in parenthesis are not used in tk)
-% <a>, <b>, <c,> (<c>), <d>, <e>, <a:> (<sw>), <f>, <g>, <h>, <i>
-% <j>, <z<>, <k>, <l>, <m>, <n>, <n<> (<n?> <ng>), <o>, <o:>, <p>, (<q>),
-% <r>, <s>, <s,>, <t>, <u>, <u:>, (<v>) <w>, (<x>), <y>, <y'> (<y:>), <z>
+% <collation type="standard">
+% 	<cr><![CDATA[
+% 		&C<ç<<<Ç
+% 		&E<ä<<<Ä
+% 		&J<ž<<<Ž
+% 		&N<ň<<<Ň
+% 		&O<ö<<<Ö
+% 		&S<ş<<<Ş
+% 		&U<ü<<<Ü
+% 		&Y<ý<<<Ý
+% 	]]></cr>
+% </collation>
 %
-% cyrillic alphabet order:
-% <a=>, <b=>, <v=>, <g=>, <d=>, <e=>, <io>, <z%>, <z%,=>, <z=>, <i=>,
-% <j=>, <k=>, <l=>, <m=>, <n=>, <n,=>, <o=>, <o-=>, <p=>, <r=>, <s=>,
-% <t=>, <u=>, <u'=>, <f=>, <h=>, <c=>, <c%>, <s%>, <='>, <y=>, <%'>,
-% <je>, <sw=>, <ju>, <ja>
+% And CLDR also lists the following
+% index characters:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/main/tk.xml)
 %
+%
+% <exemplarCharacters type="index">[A B Ç D E Ä F G H I J Ž K L M N Ň O Ö P R S Ş T U Ü W Y Ý Z]</exemplarCharacters>
+%
+% https://en.wikipedia.org/wiki/Turkmen_alphabet
+%
+% Alphabetic order
+%
+% Latin alphabet (1995-present)
+%
+% Aa, Bb, Çç, Dd, Ee, Ää, Ff, Gg, Hh, Ii, Jj, Žž, Kk, Ll, Mm, Nn, Ňň, Oo, Öö, Pp, Rr, Ss, Şş, Tt, Uu, Üü, Ww, Yy, Ýý, Zz
+%
+%Cyrillic alphabet
+%
+% Аа, Бб, Вв, Гг, Дд, Ее, Ёё, Жж, Җҗ, Зз, Ии, Йй, Кк, Лл, Мм, Нн, Ңң, Оо, Өө, Пп, Рр, Сс, Тт, Уу, Үү, Фф, Хх, (Цц), Чч, Шш, (Щщ), (Ъъ), Ыы, (Ьь), Ээ, Әә, Юю, Яя
 copy "iso14651_t1"

-collating-symbol <c,>
-collating-symbol <a:>
-collating-symbol <z<>
-collating-symbol <n<>
-collating-symbol <o:>
-collating-symbol <s,>
-collating-symbol <u:>
-collating-symbol <y'>
-%
-collating-symbol <z,=>
-collating-symbol <n,=>
-collating-symbol <o-=>
-collating-symbol <u'=>
-collating-symbol <sw=>
+collating-symbol <latin-c-cedilla>
+collating-symbol <latin-a-diaeresis>
+collating-symbol <latin-z-caron>
+collating-symbol <latin-n-caron>
+collating-symbol <latin-o-diaeresis>
+collating-symbol <latin-s-cedilla>
+collating-symbol <latin-u-diaeresis>
+collating-symbol <latin-y-acute>
+collating-symbol <cyrillic-io>
+collating-symbol <cyrillic-zhe-descender>
+collating-symbol <cyrillic-en-descender>
+collating-symbol <cyrillic-barred-o>
+collating-symbol <cyrillic-straight-u>
+collating-symbol <cyrillic-schwa>

-% priority given to Turkmen accents
-reorder-after <BAS>
-<CDI>
-<CAR>
-<ACA>
-<REU>
+reorder-after <AFTER-C>
+<latin-c-cedilla>
+reorder-after <AFTER-E>
+<latin-a-diaeresis>
+reorder-after <AFTER-J>
+<latin-z-caron>
+reorder-after <AFTER-N>
+<latin-n-caron>
+reorder-after <AFTER-O>
+<latin-o-diaeresis>
+reorder-after <AFTER-S>
+<latin-s-cedilla>
+reorder-after <AFTER-U>
+<latin-u-diaeresis>
+reorder-after <AFTER-Y>
+<latin-y-acute>

-reorder-after <b>
-<c,>
-reorder-after <e>
-<a:>
-reorder-after <j>
-<z<>
-reorder-after <n>
-<n<>
-reorder-after <o>
-<o:>
-reorder-after <s>
-<s,>
-reorder-after <u>
-<u:>
-reorder-after <y>
-<y'>
+reorder-after <S0435> % CYRILLIC SMALL LETTER IE
+<cyrillic-io>
+reorder-after <S0436> % CYRILLIC SMALL LETTER ZHE
+<cyrillic-zhe-descender>
+reorder-after <S043D> % CYRILLIC SMALL LETTER EN
+<cyrillic-en-descender>
+reorder-after <S043E> % CYRILLIC SMALL LETTER O
+<cyrillic-barred-o>
+reorder-after <S0443> % CYRILLIC SMALL LETTER U
+<cyrillic-straight-u>
+reorder-after <S044D> % CYRILLIC SMALL LETTER E
+<cyrillic-schwa>

-reorder-after <CYR-ZHE>
-<z,=>
-reorder-after <CYR-EN>
-<n,=>
-reorder-after <CYR-O>
-<o-=>
-reorder-after <CYR-OUBRE>
-<u'=>
-reorder-after <CYR-E>
-<sw=>
-
-reorder-after <U0062>
-<U00E7> <c,>;<BAS>;<MIN>;IGNORE
-<U0063> <c,>;<BAS>;<MIN>;<c>
-reorder-after <U0042>
-<U00C7> <c,>;<BAS>;<CAP>;IGNORE
-<U0043> <c,>;<BAS>;<CAP>;<c>
-
-reorder-after <U0065>
-<U00E4> <a:>;<REU>;<MIN>;IGNORE
-<U0259> <a:>;<PCL>;<MIN>;IGNORE
-reorder-after <U0045>
-<U00C4> <a:>;<REU>;<CAP>;IGNORE
-<U018F> <a:>;<PCL>;<CAP>;IGNORE
-
-reorder-after <U006A>
-<U017E> <z<>;<CAR>;<MIN>;IGNORE
-reorder-after <U004A>
-<U017D> <z<>;<CAR>;<CAP>;IGNORE
-
-reorder-after <U006E>
-<U0147> <n<>;<CAR>;<MIN>;IGNORE
-<U00F1> <n<>;<TIL>;<MIN>;IGNORE
-<U014B> <n<>;<PCL>;<MIN>;IGNORE
-reorder-after <U004E>
-<U0148> <n<>;<CAR>;<CAP>;IGNORE
-<U00D1> <n<>;<TIL>;<CAP>;IGNORE
-<U014A> <n<>;<PCL>;<CAP>;IGNORE
-
-reorder-after <U006F>
-<U00F6> <o:>;<REU>;<MIN>;IGNORE
-reorder-after <U004F>
-<U00D6> <o:>;<REU>;<CAP>;IGNORE
-
-reorder-after <U0073>
-<U015F> <s,>;<CDI>;<MIN>;IGNORE
-reorder-after <U0053>
-<U015E> <s,>;<CDI>;<CAP>;IGNORE
-
-reorder-after <U0075>
-<U00FC> <u:>;<REU>;<MIN>;IGNORE
-<U0056> <w>;<BAS>;<CAP>;<v>
-<U0057> <w>;<BAS>;<CAP>;<w>
-reorder-after <U0055>
-<U00DC> <u:>;<REU>;<CAP>;IGNORE
-<U0076> <w>;<BAS>;<MIN>;<v>
-<U0077> <w>;<BAS>;<MIN>;<w>
-
-reorder-after <U0079>
-<U00FD> <y'>;<ACA>;<MIN>;IGNORE
-<U00FF> <y'>;<REU>;<MIN>;IGNORE
-reorder-after <U0059>
-<U00DD> <y'>;<ACA>;<CAP>;IGNORE
-<U0178> <y'>;<REU>;<CAP>;IGNORE
-
-reorder-after <U0436>
-<U0497> <z,=>;<PCL>;<MIN>;IGNORE
-reorder-after <U0416>
-<U0496> <z,=>;<PCL>;<CAP>;IGNORE
-
-reorder-after <U043D>
-<U04A3> <n,=>;<PCL>;<MIN>;IGNORE
-reorder-after <U041D>
-<U04A2> <n,=>;<PCL>;<CAP>;IGNORE
-
-reorder-after <U043E>
-<U04E9> <o-=>;<PCL>;<MIN>;IGNORE
-reorder-after <U041E>
-<U04E8> <o-=>;<PCL>;<CAP>;IGNORE
-
-reorder-after <U0443>
-<U04AF> <u'=>;<PCL>;<MIN>;IGNORE
-reorder-after <U0423>
-<U04AE> <u'=>;<PCL>;<CAP>;IGNORE
-
-reorder-after <U044D>
-<U04D9> <sw=>;<PCL>;<MIN>;IGNORE
-reorder-after <U042D>
-<U04D8> <sw=>;<PCL>;<CAP>;IGNORE
+<U00E7>        <latin-c-cedilla>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ç
+<U00C7>        <latin-c-cedilla>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ç
+<U00E4>      <latin-a-diaeresis>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ä
+<U00C4>      <latin-a-diaeresis>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ä
+<U017E>          <latin-z-caron>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ž
+<U017D>          <latin-z-caron>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ž
+<U0148>          <latin-n-caron>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ň
+<U0147>          <latin-n-caron>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ň
+<U00F1>          <latin-n-caron>;"<BASE><VRNT1>";"<MIN><MIN>";IGNORE % ñ
+<U00D1>          <latin-n-caron>;"<BASE><VRNT1>";"<CAP><MIN>";IGNORE % Ñ
+<U014B>          <latin-n-caron>;"<BASE><VRNT2>";"<MIN><MIN>";IGNORE % ŋ
+<U014A>          <latin-n-caron>;"<BASE><VRNT2>";"<CAP><MIN>";IGNORE % Ŋ
+<U00F6>      <latin-o-diaeresis>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ö
+<U00D6>      <latin-o-diaeresis>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ö
+<U015F>        <latin-s-cedilla>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ş
+<U015E>        <latin-s-cedilla>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ş
+<U00FC>      <latin-u-diaeresis>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ü
+<U00DC>      <latin-u-diaeresis>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ü
+<U00FD>          <latin-y-acute>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ý
+<U00DD>          <latin-y-acute>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ý
+<U00FF>          <latin-y-acute>;"<BASE><VRNT1>";"<MIN><MIN>";IGNORE % ÿ
+<U0178>          <latin-y-acute>;"<BASE><VRNT1>";"<CAP><MIN>";IGNORE % Ÿ
+<U0451>            <cyrillic-io>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ё
+<U0401>            <cyrillic-io>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ё
+<U0497> <cyrillic-zhe-descender>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % җ
+<U0496> <cyrillic-zhe-descender>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Җ
+<U04A3>  <cyrillic-en-descender>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ң
+<U04A2>  <cyrillic-en-descender>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ң
+<U04E9>      <cyrillic-barred-o>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ө
+<U04E8>      <cyrillic-barred-o>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ө
+<U04AF>    <cyrillic-straight-u>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ү
+<U04AE>    <cyrillic-straight-u>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ү
+<U04D9>         <cyrillic-schwa>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ә
+<U04D8>         <cyrillic-schwa>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ә

 reorder-end

--- a/localedata/locales/tl_PH
+++ b/localedata/locales/tl_PH
@ -49,36 +49,7 @@ copy "en_DK"
 END LC_CTYPE

 LC_COLLATE
-copy "iso14651_t1"
-
-%% a b c d e f g h i j k l m n ng o p q r s t u v w x y z
-
-collating-symbol  <n-g-ph>
-collating-element <N-G> from "<U004E><U0047>"
-collating-element <n-g> from "<U006E><U0067>"
-collating-element <N-g> from "<U004E><U0067>"
-collating-element <n-G> from "<U006E><U0047>"
-
-collating-symbol <CAP-MIN>
-collating-symbol <MIN-CAP>
-
-reorder-after <MIN>
-<MIN-CAP>
-reorder-after <CAP>
-<CAP-MIN>
-
-reorder-after <n>
-<n-g-ph>
-
-reorder-after <U006E>
-<n-g>	<n-g-ph>;<PCT>;<MIN>;IGNORE
-<n-G>	<n-g-ph>;<PCT>;<MIN-CAP>;IGNORE
-reorder-after <U004E>
-<N-G>	<n-g-ph>;<PCT>;<CAP>;IGNORE
-<N-g>	<n-g-ph>;<PCT>;<CAP-MIN>;IGNORE
-
-reorder-end
-
+copy "fil_PH"
 END LC_COLLATE

 LC_MONETARY
--- a/localedata/locales/tr_TR
+++ b/localedata/locales/tr_TR
@ -73,11 +73,18 @@ copy "iso14651_t1"
 % &S<ş<<<Ş
 % &U<ü<<<Ü
 %
+% And CLDR also lists the following
+% index characters:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/main/tr.xml)
+%
+% <exemplarCharacters type="index">[A B C Ç D E F G H I İ J K L M N O Ö P Q R S Ş T U Ü V W X Y Z]</exemplarCharacters>
+%
 % The following rules implement the same order for glibc.

 collating-symbol <c-cedilla>
 collating-symbol <g-breve>
 collating-symbol <i-dotless>
+collating-symbol <i-dot>
 collating-symbol <o-diaresis>
 collating-symbol <s-cedilla>
 collating-symbol <u-diaresis>
@ -86,33 +93,33 @@ reorder-after <RES-1>
 <CAP>
 <MIN>

-reorder-after <c>
+reorder-after <AFTER-C>
 <c-cedilla>
-reorder-after <g>
+reorder-after <AFTER-G>
 <g-breve>
-reorder-after <h>
+reorder-after <BEFORE-I>
 <i-dotless>
-reorder-after <o>
+reorder-after <AFTER-O>
 <o-diaresis>
-reorder-after <s>
+reorder-after <AFTER-S>
 <s-cedilla>
-reorder-after <u>
+reorder-after <AFTER-U>
 <u-diaresis>

-<U00E7> <c-cedilla>;<BAS>;<MIN>;IGNORE % ç
-<U00C7> <c-cedilla>;<BAS>;<CAP>;IGNORE % Ç
-<U011F> <g-breve>;<BAS>;<MIN>;IGNORE % ğ
-<U011E> <g-breve>;<BAS>;<CAP>;IGNORE % Ğ
-<U0131> <i-dotless>;<BAS>;<MIN>;IGNORE % ı
-<U0049> <i-dotless>;<BAS>;<CAP>;IGNORE % I
-<U0069> <i>;<BAS>;<MIN>;IGNORE % i
-<U0130> <i>;<BAS>;<CAP>;IGNORE % İ
-<U00F6> <o-diaresis>;<BAS>;<MIN>;IGNORE % ö
-<U00D6> <o-diaresis>;<BAS>;<CAP>;IGNORE % Ö
-<U015F> <s-cedilla>;<BAS>;<MIN>;IGNORE % ş
-<U015E> <s-cedilla>;<BAS>;<CAP>;IGNORE % Ş
-<U00FC> <u-diaresis>;<BAS>;<MIN>;IGNORE % ü
-<U00DC> <u-diaresis>;<BAS>;<CAP>;IGNORE % Ü
+<U00E7> <c-cedilla>;<BASE>;<MIN>;IGNORE % ç
+<U00C7> <c-cedilla>;<BASE>;<CAP>;IGNORE % Ç
+<U011F> <g-breve>;<BASE>;<MIN>;IGNORE % ğ
+<U011E> <g-breve>;<BASE>;<CAP>;IGNORE % Ğ
+<U0131> <i-dotless>;<BASE>;<MIN>;IGNORE % ı
+<U0049> <i-dotless>;<BASE>;<CAP>;IGNORE % I
+<U0069> <S0069>;<BASE>;<MIN>;IGNORE % i
+<U0130> <S0069>;<BASE>;<CAP>;IGNORE % İ
+<U00F6> <o-diaresis>;<BASE>;<MIN>;IGNORE % ö
+<U00D6> <o-diaresis>;<BASE>;<CAP>;IGNORE % Ö
+<U015F> <s-cedilla>;<BASE>;<MIN>;IGNORE % ş
+<U015E> <s-cedilla>;<BASE>;<CAP>;IGNORE % Ş
+<U00FC> <u-diaresis>;<BASE>;<MIN>;IGNORE % ü
+<U00DC> <u-diaresis>;<BASE>;<CAP>;IGNORE % Ü

 reorder-end

--- a/Show More
+++ b/Show More