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, 153 insertions, 138 deletions

diff --git a/localedata/locales/sq_AL b/localedata/locales/sq_AL
index ae99fe5f6e..b16a459c56 100644
--- 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 <CAP-MIN>
-collating-symbol <MIN-CAP>
-
-reorder-after <MIN>
-<MIN-CAP>
-reorder-after <CAP>
-<CAP-MIN>
-
-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
+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-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 <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>
+
+<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