Adapt collation in several locales to the new iso14651_t1_common file

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

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

1 files changed, 36 insertions, 160 deletions

diff --git a/localedata/locales/ug_CN b/localedata/locales/ug_CN
index 5bc5c681a1..1ba583c588 100644
--- a/localedata/locales/ug_CN
+++ b/localedata/locales/ug_CN
@@ -46,172 +46,48 @@ category "i18n:2012";LC_TELEPHONE
 END LC_IDENTIFICATION
 
 LC_COLLATE
-
+% CLDR collation rules for Uyghur:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/ug.xml)
 %
-% http://en.wikipedia.org/wiki/Uyghur_language
+% <collation type="standard">
+%  <cr><![CDATA[
+%    [reorder Arab]
+%    &ا<ە<ب
+%    &ك<گ<ڭ<ل
+%    &ھ<و<ۇ<ۆ<ۈ<ۋ<ې<ى<ي
+%  ]]></cr>
+% </collation>
 %
-% CODE - UNICODE CODE POINT
-% UL   - UYGHUR LATIN
-% IN?  - IN ISO 14651_T1
+% And CLDR also lists the following
+% index characters:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/main/ug.xml)
 %
-% NO CODE UL ENGLISH NAME         AR IN?
-% ======================================
-%  1 0627 a  alef                 ا
-%  2 06d5 e  ae                   ە  ???
-%  3 0628 b  beh                  ب
-%  4 067e p  peh                  پ
-%  5 062a t  teh                  ت
-%  6 062c j  jeem                 ج
-%  7 0686 ch tcheh                چ
-%  8 062e x  khah                 خ
-%  9 062f d  dal                  د
-% 10 0631 r  reh                  ر
-% 11 0632 z  zain                 ز
-% 12 0698 zh jeh                  ژ
-% 13 0633 s  seen                 س
-% 14 0634 sh sheen                ش
-% 15 063a gh ghain                غ
-% 16 0641 f  feh                  ف
-% 17 0642 q  qaf                  ق
-% 18 0643 k  kaf                  ك
-% 19 06af g  gaf                  گ
-% 20 06ad ng ng                   ڭ ???
-% 21 0644 l  lam                  ل
-% 22 0645 m  meem                 م
-% 23 0646 n  noon                 ن
-% 24 06be h  heh doachashmee      ھ ???
-% 25 0648 o  waw                  و
-% 26 06c7 u  u                    ۇ ???
-% 27 06c6 ö  oe                   ۆ ???
-% 28 06c8 ü  yu                   ۈ ???
-% 29 06cb w  ve                   ۋ ???
-% 30 06d0 é  e                    ې ???
-% 31 0649 i  alef maksura         ى
-% 32 064a y  yeh                  ي ???
-% -- 0626 '  yeh with hamza above ئ ???
+% <exemplarCharacters type="index" draft="contributed">[ئ ا ە ب پ ت ج چ خ د ر ز ژ س ش غ ف ق ك گ ڭ ل م ن ھ و ۇ ۆ ۈ ۋ ې ى ي]</exemplarCharacters>
 %
+% The following rules implement the same order for glibc.
 copy "iso14651_t1"
 
-% <yeh with hamza above> + <alef> = ئا
-collating-symbol  <ARA_ywha_alef>
-
-% <yeh with hamza above> + <ae> = ئە
-collating-symbol  <ARA_ywha_ae>
-
-% <ae> = ە
-collating-symbol  <ARA_ae>
-
-% <ng> = ڭ
-collating-symbol  <ARA_ng>
-
-% <heh doachashmee> = ھ
-collating-symbol  <ARA_hehd>
-
-% <yeh with hamza above> + <waw> = ئو
-collating-symbol  <ARA_ywha_waw>
-
-% <yeh with hamza above> + <u> = ئۇ
-collating-symbol  <ARA_ywha_u>
-
-% <u> = ۇ
-collating-symbol  <ARA_u>
-
-% <yeh with hamza above> + <oe> = ئۆ
-collating-symbol  <ARA_ywha_oe>
-
-% <oe> = ۆ
-collating-symbol  <ARA_oe>
-
-% <yeh with hamza above> + <yu> = ئۈ
-collating-symbol  <ARA_ywha_yu>
-
-% <yu> = ۈ
-collating-symbol  <ARA_yu>
-
-% <ve> = ۋ
-collating-symbol  <ARA_ve>
-
-% <yeh with hamza above> + <e> = ئې
-collating-symbol  <ARA_ywha_e>
-
-% <e> = ې
-collating-symbol  <ARA_e>
-
-% <yeh with hamza above> + <alef maksura> = ئى
-collating-symbol  <ARA_ywha_alma>
-
-% <yeh> = ي
-collating-symbol  <ARA_yeh>
-
-% <yeh with hamza above> = ئ
-collating-symbol  <ARA_ywha>
-
-collating-element <ara_h_alef> from "<U0626><U0627>" % ئا
-collating-element <ara_h_ae>   from "<U0626><U06D5>" % ئە
-collating-element <ara_h_waw>  from "<U0626><U0648>" % ئو
-collating-element <ara_h_u>    from "<U0626><U06C7>" % ئۇ
-collating-element <ara_h_oe>   from "<U0626><U06C6>" % ئۆ
-collating-element <ara_h_yu>   from "<U0626><U06C8>" % ئۈ
-collating-element <ara_h_e>    from "<U0626><U06D0>" % ئې
-collating-element <ara_h_alma> from "<U0626><U0649>" % ئى
-
-reorder-after <alef>
-<ARA_ywha_alef>
-<alef>
-<ARA_ywha_ae>
-<ARA_ae>
-
-reorder-after <gaf>
-<ARA_ng>
-
-reorder-after <noon>
-<ARA_hehd>
-
-reorder-after <waw>
-<ARA_ywha_waw>
-<waw>
-<ARA_ywha_u>
-<ARA_u>
-<ARA_ywha_oe>
-<ARA_oe>
-<ARA_ywha_yu>
-<ARA_yu>
-<ARA_ve>
-<ARA_ywha_e>
-<ARA_e>
-<ARA_ywha_alma>
-<alef_maksura>
-<ARA_yeh>
-<ARA_ywha>
-
-reorder-after   <U0627>
-<ara_h_alef>    <ARA_ywha_alef>;<BAS>;<MIN>;IGNORE
-<U0627>         <alef>;<BAS>;<MIN>;IGNORE
-<ara_h_ae>      <ARA_ywha_ae>;<BAS>;<MIN>;IGNORE
-<U06D5>         <ARA_ae>;<BAS>;<MIN>;IGNORE
-
-reorder-after   <U06AF>
-<U06AD>         <ARA_ng>;<BAS>;<MIN>;IGNORE
-
-reorder-after   <U0646>
-<U06BE>         <ARA_hehd>;<BAS>;<MIN>;IGNORE
-
-reorder-after   <U0648>
-<ara_ywha_waw>  <ARA_ywha_waw>;<BAS>;<MIN>;IGNORE
-<U0648>         <waw>;<BAS>;<MIN>;IGNORE
-<ara_ywha_u>    <ARA_ywha_u>;<BAS>;<MIN>;IGNORE
-<U06C7>         <ARA_u>;<BAS>;<MIN>;IGNORE
-<ara_ywha_oe>   <ARA_ywha_oe>;<BAS>;<MIN>;IGNORE
-<U06C6>         <ARA_oe>;<BAS>;<MIN>;IGNORE
-<ara_ywha_yu>   <ARA_ywha_yu>;<BAS>;<MIN>;IGNORE
-<U06C8>         <ARA_yu>;<BAS>;<MIN>;IGNORE
-<U06CB>         <ARA_ve>;<BAS>;<MIN>;IGNORE
-<ara_ywha_e>    <ARA_ywha_e>;<BAS>;<MIN>;IGNORE
-<U06D0>         <ARA_e>;<BAS>;<MIN>;IGNORE
-<ara_ywha_alma> <ARA_ywha_alma>;<BAS>;<MIN>;IGNORE
-<U0649>         <alef_maksura>;<BAS>;<MIN>;IGNORE
-<U064A>         <ARA_yeh>;<BAS>;<MIN>;IGNORE
-<U0626>         <ARA_ywha>;<BAS>;<MIN>;IGNORE
+% &ا<ە<ب
+reorder-after <S0627> % ARABIC LETTER ALEF
+<S06D5> % ARABIC LETTER AE
+<S0628> % ARABIC LETTER BEH
+
+% &ك<گ<ڭ<ل
+reorder-after <S0643> % ARABIC LETTER KAF
+<S06AF> % ARABIC LETTER GAF
+<S06AD> % ARABIC LETTER NG
+<S0644> % ARABIC LETTER LAM
+
+% &ھ<و<ۇ<ۆ<ۈ<ۋ<ې<ى<ي
+reorder-after <S06BE> % ARABIC LETTER HEH DOACHASHMEE
+<S0648> % ARABIC LETTER WAW
+<S06C7> % ARABIC LETTER U
+<S06C6> % ARABIC LETTER OE
+<S06C8> % ARABIC LETTER YU
+<S06CB> % ARABIC LETTER VE
+<S06D0> % ARABIC LETTER E
+<S0649> % ARABIC LETTER ALEF MAKSURA
+<S064A> % ARABIC LETTER YEH
 
 reorder-end