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, 66 insertions, 87 deletions

diff --git a/localedata/locales/ik_CA b/localedata/locales/ik_CA
index f672488016..922bb87241 100644
--- 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 <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>
+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>" % Ḷ
+collating-element <l-combining-dot-below> from "l<U0323>" % ḷ
+collating-element <L-stroke-combining-dot-below> from "<U0141><U0323>" % Ł̣
+collating-element <l-stroke-combining-dot-below> from "<U0142><U0323>" % ł̣
+
+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