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, 114 insertions, 128 deletions

diff --git a/localedata/locales/cy_GB b/localedata/locales/cy_GB
index 75a8f6b0b1..5f6fd7c87f 100644
--- 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  <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>"
-
-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
+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"
+
+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>
+
+<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