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, 79 insertions, 286 deletions

diff --git a/localedata/locales/yo_NG b/localedata/locales/yo_NG
index 32e23f2b59..ec72d078bb 100644
--- a/localedata/locales/yo_NG
+++ b/localedata/locales/yo_NG
@@ -68,292 +68,85 @@ LC_COLLATE
 
 copy "iso14651_t1"
 
-% digraphs (gb)
-collating-symbol  <g-b-yo>
-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>"
-% belowdot (ẹ, ọ, ș)
-collating-symbol  <ebelowdot>
-collating-element <E_>  from "<U0045><U0323>"
-collating-element <e_>  from "<U0065><U0323>"
-collating-element <E_'> from "<U1EB8><U0301>"
-collating-element <e_'> from "<U1EB9><U0301>"
-collating-element <E_`> from "<U1EB8><U0300>"
-collating-element <e_`> from "<U1EB9><U0300>"
-collating-element <E_2'> from "<U0045><U0323><U0301>"
-collating-element <e_2'> from "<U0065><U0323><U0301>"
-collating-element <E_2`> from "<U0045><U0323><U0300>"
-collating-element <e_2`> from "<U0065><U0323><U0300>"
-collating-symbol  <obelowdot>
-collating-element <O_>  from "<U004F><U0323>"
-collating-element <o_>  from "<U006F><U0323>"
-collating-element <O_'> from "<U1ECC><U0301>"
-collating-element <o_'> from "<U1ECD><U0301>"
-collating-element <O_`> from "<U1ECC><U0300>"
-collating-element <o_`> from "<U1ECD><U0300>"
-collating-element <O_2'> from "<U004F><U0323><U0301>"
-collating-element <o_2'> from "<U006F><U0323><U0301>"
-collating-element <O_2`> from "<U004F><U0323><U0300>"
-collating-element <o_2`> from "<U006F><U0323><U0300>"
-collating-symbol  <sbelowdot>
-collating-element <S_> from "<U0053><U0323>"
-collating-element <s_> from "<U0073><U0323>"
-% acute (áéíḿńóú; for acute on ẹọ look above)
-collating-element <A'> from "<U0041><U0301>"
-collating-element <a'> from "<U0061><U0301>"
-collating-element <E'> from "<U0045><U0301>"
-collating-element <e'> from "<U0065><U0301>"
-collating-element <I'> from "<U0049><U0301>"
-collating-element <i'> from "<U0069><U0301>"
-collating-element <M'> from "<U004D><U0301>"
-collating-element <m'> from "<U006D><U0301>"
-collating-element <N'> from "<U004E><U0301>"
-collating-element <n'> from "<U006E><U0301>"
-collating-element <O'> from "<U004F><U0301>"
-collating-element <o'> from "<U006F><U0301>"
-collating-element <U'> from "<U0055><U0301>"
-collating-element <u'> from "<U0075><U0301>"
-% grave (àèìm̀ǹòù; for grave on ẹọ look above)
-collating-element <A`> from "<U0041><U0300>"
-collating-element <a`> from "<U0061><U0300>"
-collating-element <E`> from "<U0045><U0300>"
-collating-element <e`> from "<U0065><U0300>"
-collating-element <I`> from "<U0049><U0300>"
-collating-element <i`> from "<U0069><U0300>"
-collating-element <M`> from "<U004D><U0300>"
-collating-element <m`> from "<U006D><U0300>"
-collating-element <N`> from "<U004E><U0300>"
-collating-element <n`> from "<U006E><U0300>"
-collating-element <O`> from "<U004F><U0300>"
-collating-element <o`> from "<U006F><U0300>"
-collating-element <U`> from "<U0055><U0300>"
-collating-element <u`> from "<U0075><U0300>"
-% macron (m̅, n̅; not implemented on other letters)
-collating-element <M-> from "<U004D><U0304>"
-collating-element <m-> from "<U006D><U0304>"
-collating-element <N-> from "<U004E><U0304>"
-collating-element <n-> from "<U006E><U0304>"
-% circumflex (âêệîôộû)
-collating-element <A/>> from "<U0041><U0302>"
-collating-element <a/>> from "<U0061><U0302>"
-collating-element <E/>> from "<U0045><U0302>"
-collating-element <e/>> from "<U0065><U0302>"
-collating-element <E_/>> from "<U1EB8><U0302>"
-collating-element <e_/>> from "<U1EB9><U0302>"
-collating-element <I/>> from "<U0049><U0302>"
-collating-element <i/>> from "<U0069><U0302>"
-collating-element <O/>> from "<U004F><U0302>"
-collating-element <o/>> from "<U006F><U0302>"
-collating-element <O_/>> from "<U1ECC><U0302>"
-collating-element <o_/>> from "<U1ECD><U0302>"
-collating-element <U/>> from "<U0055><U0302>"
-collating-element <u/>> from "<U0075><U0302>"
-% caron (ǎěẹ̌ǐǒọ̌ǔ)
-collating-element <A<> from "<U0041><U030C>"
-collating-element <a<> from "<U0061><U030C>"
-collating-element <E<> from "<U0045><U030C>"
-collating-element <e<> from "<U0065><U030C>"
-collating-element <E_<> from "<U1EB8><U030C>"
-collating-element <e_<> from "<U1EB9><U030C>"
-collating-element <I<> from "<U0049><U030C>"
-collating-element <i<> from "<U0069><U030C>"
-collating-element <O<> from "<U004F><U030C>"
-collating-element <o<> from "<U006F><U030C>"
-collating-element <O_<> from "<U1ECC><U030C>"
-collating-element <o_<> from "<U1ECD><U030C>"
-collating-element <U<> from "<U0055><U030C>"
-collating-element <u<> from "<U0075><U030C>"
-% tilde (not implemented; old orthography)
-
-collating-symbol <CAP-MIN>
-collating-symbol <MIN-CAP>
-
-reorder-after <BAS>
-<ACA>
-<MAC>
-<GRA>
-
-reorder-after <MIN>
-<MIN-CAP>
-
-reorder-after <CAP>
-<CAP-MIN>
-
-reorder-after <e>
-<ebelowdot>
-reorder-after <g>
-<g-b-yo>
-reorder-after <o>
-<obelowdot>
-reorder-after <s>
-<sbelowdot>
-
-reorder-after <U0061>
-<U00E1> <a>;<ACA>;<MIN>;IGNORE
-<a'>    <a>;<ACA>;<MIN>;IGNORE
-<U00E2> "<a><a>";"<ACA><GRA>";"<MIN><MIN>";IGNORE
-<a/>>   "<a><a>";"<ACA><GRA>";"<MIN><MIN>";IGNORE
-<U00E0> <a>;<GRA>;<MIN>;IGNORE
-<a`>    <a>;<GRA>;<MIN>;IGNORE
-<U01CE> "<a><a>";"<GRA><ACA>";"<MIN><MIN>";IGNORE
-<a<>    "<a><a>";"<GRA><ACA>";"<MIN><MIN>";IGNORE
-reorder-after <U0041>
-<U00C1> <a>;<ACA>;<CAP>;IGNORE
-<A'>    <a>;<ACA>;<CAP>;IGNORE
-<U00C2> "<a><a>";"<ACA><GRA>";"<CAP><CAP>";IGNORE
-<A/>>   "<a><a>";"<ACA><GRA>";"<CAP><CAP>";IGNORE
-<U00C0> <a>;<GRA>;<CAP>;IGNORE
-<A`>    <a>;<GRA>;<CAP>;IGNORE
-<U01CD> "<a><a>";"<GRA><ACA>";"<CAP><CAP>";IGNORE
-<A<>    "<a><a>";"<GRA><ACA>";"<CAP><CAP>";IGNORE
-
-reorder-after <U0065>
-<U00E9> <e>;<ACA>;<MIN>;IGNORE
-<e'>    <e>;<ACA>;<MIN>;IGNORE
-<U00EA> "<e><e>";"<ACA><GRA>";"<MIN><MIN>";IGNORE
-<e/>>   "<e><e>";"<ACA><GRA>";"<MIN><MIN>";IGNORE
-<U00E8> <e>;<GRA>;<MIN>;IGNORE
-<e`>    <e>;<GRA>;<MIN>;IGNORE
-<U011B> "<e><e>";"<GRA><ACA>";"<MIN><MIN>";IGNORE
-<e<>    "<e><e>";"<GRA><ACA>";"<MIN><MIN>";IGNORE
-<U1EB9> <ebelowdot>;<BAS>;<MIN>;IGNORE
-<e_>    <ebelowdot>;<BAS>;<MIN>;IGNORE
-<e_'>   <ebelowdot>;<ACA>;<MIN>;IGNORE
-<e_2'>  <ebelowdot>;<ACA>;<MIN>;IGNORE
-<e_/>>  "<ebelowdot><ebelowdot>";"<ACA><GRA>";"<MIN><MIN>";IGNORE
-<e_`>   <ebelowdot>;<GRA>;<MIN>;IGNORE
-<e_2`>  <ebelowdot>;<GRA>;<MIN>;IGNORE
-<e_<>   "<ebelowdot><ebelowdot>";"<GRA><ACA>";"<MIN><MIN>";IGNORE
-reorder-after <U0045>
-<U00C9> <e>;<ACA>;<CAP>;IGNORE
-<E'>    <e>;<ACA>;<CAP>;IGNORE
-<U00CA> "<e><e>";"<ACA><GRA>";"<CAP><CAP>";IGNORE
-<E/>>   "<e><e>";"<ACA><GRA>";"<CAP><CAP>";IGNORE
-<U00C8> <e>;<GRA>;<CAP>;IGNORE
-<E`>    <e>;<GRA>;<CAP>;IGNORE
-<U011A> "<e><e>";"<GRA><ACA>";"<CAP><CAP>";IGNORE
-<E<>    "<e><e>";"<GRA><ACA>";"<CAP><CAP>";IGNORE
-<U1EB8> <ebelowdot>;<BAS>;<CAP>;IGNORE
-<E_>    <ebelowdot>;<CAP>;<CAP>;IGNORE
-<E_'>   <ebelowdot>;<ACA>;<CAP>;IGNORE
-<E_2'>  <ebelowdot>;<ACA>;<CAP>;IGNORE
-<E_/>>  "<ebelowdot><ebelowdot>";"<ACA><GRA>";"<CAP><CAP>";IGNORE
-<E_`>   <ebelowdot>;<GRA>;<CAP>;IGNORE
-<E_2`>  <ebelowdot>;<GRA>;<CAP>;IGNORE
-<E_<>   "<ebelowdot><ebelowdot>";"<GRA><ACA>";"<CAP><CAP>";IGNORE
-
-reorder-after <U0067>
-<g-b>   <g-b-yo>;<PCL>;<MIN>;IGNORE
-<g-B>   <g-b-yo>;<PCL>;<MIN-CAP>;IGNORE
-reorder-after <U0047>
-<G-B>   <g-b-yo>;<PCL>;<CAP>;IGNORE
-<G-b>   <g-b-yo>;<PCL>;<CAP-MIN>;IGNORE
-
-reorder-after <U0069>
-<U00ED> <i>;<ACA>;<MIN>;IGNORE
-<i'>    <i>;<ACA>;<MIN>;IGNORE
-<U00EE> "<i><i>";"<ACA><GRA>";"<MIN><MIN>";IGNORE
-<i/>>   "<i><i>";"<ACA><GRA>";"<MIN><MIN>";IGNORE
-<U00EC> <i>;<GRA>;<MIN>;IGNORE
-<i`>    <i>;<GRA>;<MIN>;IGNORE
-<U01D0> "<i><i>";"<GRA><ACA>";"<MIN><MIN>";IGNORE
-<i<>    "<i><i>";"<GRA><ACA>";"<MIN><MIN>";IGNORE
-reorder-after <U0049>
-<U00CD> <i>;<ACA>;<CAP>;IGNORE
-<I'>    <i>;<ACA>;<CAP>;IGNORE
-<U00CE> "<i><i>";"<ACA><GRA>";"<CAP><CAP>";IGNORE
-<I/>>   "<i><i>";"<ACA><GRA>";"<CAP><CAP>";IGNORE
-<U00CC> <i>;<GRA>;<CAP>;IGNORE
-<I`>    <i>;<GRA>;<CAP>;IGNORE
-<U01CF> "<i><i>";"<GRA><ACA>";"<CAP><CAP>";IGNORE
-<I<>    "<i><i>";"<GRA><ACA>";"<CAP><CAP>";IGNORE
-
-reorder-after <U006D>
-<U1E3F> <m>;<ACA>;<MIN>;IGNORE
-<m'>    <m>;<ACA>;<MIN>;IGNORE
-<m->    <m>;<MAC>;<MIN>;IGNORE
-<m`>    <m>;<GRA>;<MIN>;IGNORE
-reorder-after <U004E>
-<U1E3E> <m>;<ACA>;<CAP>;IGNORE
-<M'>    <m>;<ACA>;<CAP>;IGNORE
-<M->    <m>;<MAC>;<CAP>;IGNORE
-<M`>    <m>;<GRA>;<CAP>;IGNORE
-
-reorder-after <U006E>
-<U0144> <n>;<ACA>;<MIN>;IGNORE
-<n'>    <n>;<ACA>;<MIN>;IGNORE
-<n->    <n>;<MAC>;<MIN>;IGNORE
-<U01F9> <n>;<GRA>;<MIN>;IGNORE
-<n`>    <n>;<GRA>;<MIN>;IGNORE
-reorder-after <U004E>
-<U0143> <n>;<ACA>;<CAP>;IGNORE
-<N'>    <n>;<ACA>;<CAP>;IGNORE
-<N->    <n>;<MAC>;<CAP>;IGNORE
-<U01F8> <n>;<GRA>;<CAP>;IGNORE
-<N`>    <n>;<GRA>;<CAP>;IGNORE
-
-reorder-after <U006F>
-<U00F3> <o>;<ACA>;<MIN>;IGNORE
-<o'>    <o>;<ACA>;<MIN>;IGNORE
-<U00F4> "<o><o>";"<ACA><GRA>";"<MIN><MIN>";IGNORE
-<o/>>   "<o><o>";"<ACA><GRA>";"<MIN><MIN>";IGNORE
-<U00F2> <o>;<GRA>;<MIN>;IGNORE
-<o`>    <o>;<GRA>;<MIN>;IGNORE
-<U01D2> "<o><o>";"<GRA><ACA>";"<MIN><MIN>";IGNORE
-<o<>    "<o><o>";"<GRA><ACA>";"<MIN><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><obelowdot>";"<ACA><GRA>";"<MIN><MIN>";IGNORE
-<o_`>   <obelowdot>;<GRA>;<MIN>;IGNORE
-<o_2`>  <obelowdot>;<GRA>;<MIN>;IGNORE
-<o_<>   "<obelowdot><obelowdot>";"<GRA><ACA>";"<MIN><MIN>";IGNORE
-reorder-after <U004F>
-<U00D3> <o>;<ACA>;<CAP>;IGNORE
-<O'>    <o>;<ACA>;<CAP>;IGNORE
-<U00D4> "<o><o>";"<ACA><GRA>";"<CAP><CAP>";IGNORE
-<O/>>   "<o><o>";"<ACA><GRA>";"<CAP><CAP>";IGNORE
-<U00D2> <o>;<GRA>;<CAP>;IGNORE
-<O`>    <o>;<GRA>;<CAP>;IGNORE
-<U01D1> "<o><o>";"<GRA><ACA>";"<CAP><CAP>";IGNORE
-<O<>    "<o><o>";"<GRA><ACA>";"<CAP><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><obelowdot>";"<ACA><GRA>";"<CAP><CAP>";IGNORE
-<O_`>   <obelowdot>;<GRA>;<CAP>;IGNORE
-<O_2`>  <obelowdot>;<GRA>;<CAP>;IGNORE
-<O_<>   "<obelowdot><obelowdot>";"<GRA><ACA>";"<CAP><CAP>";IGNORE
-
-reorder-after <U0073>
-<U1E63> <sbelowdot>;<BAS>;<MIN>;IGNORE
-<s_>    <sbelowdot>;<BAS>;<MIN>;IGNORE
-reorder-after <U0053>
-<U1E62> <sbelowdot>;<BAS>;<CAP>;IGNORE
-<S_>    <sbelowdot>;<BAS>;<CAP>;IGNORE
-
-reorder-after <U0075>
-<U00FA> <u>;<ACA>;<MIN>;IGNORE
-<u'>    <u>;<ACA>;<MIN>;IGNORE
-<U00FB> "<u><u>";"<ACA><GRA>";"<MIN><MIN>";IGNORE
-<u/>>   "<u><u>";"<ACA><GRA>";"<MIN><MIN>";IGNORE
-<U00F9> <u>;<GRA>;<MIN>;IGNORE
-<u`>    <u>;<GRA>;<MIN>;IGNORE
-<U01D4> "<u><u>";"<GRA><ACA>";"<MIN><MIN>";IGNORE
-<u<>    "<u><u>";"<GRA><ACA>";"<MIN><MIN>";IGNORE
-reorder-after <U0055>
-<U00DA> <u>;<ACA>;<CAP>;IGNORE
-<U'>    <u>;<ACA>;<CAP>;IGNORE
-<U00DB> "<u><u>";"<ACA><GRA>";"<CAP><CAP>";IGNORE
-<U/>>   "<u><u>";"<ACA><GRA>";"<CAP><CAP>";IGNORE
-<U00D9> <u>;<GRA>;<CAP>;IGNORE
-<U`>    <u>;<GRA>;<CAP>;IGNORE
-<U01D3> "<u><u>";"<GRA><ACA>";"<CAP><CAP>";IGNORE
-<U<>    "<u><u>";"<GRA><ACA>";"<CAP><CAP>";IGNORE
+% CLDR collation rules for Yoruba:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/yo.xml)
+%
+% <collation type="standard" references="Nigeria University Press: A dictionary of the Yoruba language ISBN 978-030-760-5">
+%   <cr><![CDATA[
+%     [normalization on]
+%     &E<ẹ<<<Ẹ
+%     &G<gb<<<Gb<<<GB
+%     &O<ọ<<<Ọ
+%     &S<ṣ<<<Ṣ
+%   ]]></cr>
+% </collation>
+%
+% And CLDR also lists the following
+% index characters:
+% (see: https://unicode.org/cldr/trac/browser/trunk/common/main/yo.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]</exemplarCharacters>
+%
+% The list of index characters looks wrong when comparing with the
+% collation rules.
+%
+% The following rules implement the same order for glibc.
+
+collating-symbol <e-dot-below>
+collating-symbol <gb-digraph>
+collating-symbol <o-dot-below>
+collating-symbol <s-dot-below>
+
+collating-element <e-combining-dot-below> from "e<U0323>"
+collating-element <E-combining-dot-below> from "E<U0323>"
+
+collating-element <g-b> from "gb"
+collating-element <g-B> from "gB"
+collating-element <G-b> from "Gb"
+collating-element <G-B> from "GB"
+
+collating-element <o-combining-dot-below> from "o<U0323>"
+collating-element <O-combining-dot-below> from "O<U0323>"
+
+collating-element <s-combining-dot-below> from "s<U0323>"
+collating-element <S-combining-dot-below> from "S<U0323>"
+
+% &E<ẹ<<<Ẹ
+reorder-after <AFTER-E>
+<e-dot-below>
+% &G<gb<<<Gb<<<GB
+reorder-after <AFTER-G>
+<gb-digraph>
+% &O<ọ<<<Ọ
+reorder-after <AFTER-O>
+<o-dot-below>
+% &S<ṣ<<<Ṣ
+reorder-after <AFTER-S>
+<s-dot-below>
+
+% &E<ẹ<<<Ẹ
+<U1EB9> <e-dot-below>;"<BASE><BASE>";"<MIN><MIN>";<VRNT1> % LATIN SMALL LETTER E WITH DOT BELOW
+<e-combining-dot-below> <e-dot-below>;"<BASE><BASE>";"<MIN><MIN>";<VRNT2>
+<U1EB8> <e-dot-below>;"<BASE><BASE>";"<CAP><MIN>";<VRNT1> % LATIN CAPITAL LETTER E WITH DOT BELOW
+<E-combining-dot-below> <e-dot-below>;"<BASE><BASE>";"<CAP><MIN>";<VRNT2>
+
+% &G<gb<<<Gb<<<GB
+<g-b> <gb-digraph>;"<BASE><BASE>";"<MIN><MIN>";IGNORE
+<g-B> <gb-digraph>;"<BASE><BASE>";"<MIN><CAP>";IGNORE
+<G-b> <gb-digraph>;"<BASE><BASE>";"<CAP><MIN>";IGNORE
+<G-B> <gb-digraph>;"<BASE><BASE>";"<CAP><CAP>";IGNORE
+
+% &O<ọ<<<Ọ
+<U1ECD> <o-dot-below>;"<BASE><BASE>";"<MIN><MIN>";<VRNT1> % LATIN SMALL LETTER O WITH DOT BELOW
+<o-combining-dot-below> <o-dot-below>;"<BASE><BASE>";"<MIN><MIN>";<VRNT2>
+<U1ECC> <o-dot-below>;"<BASE><BASE>";"<CAP><MIN>";<VRNT1> % LATIN CAPITAL LETTER O WITH DOT BELOW
+<O-combining-dot-below> <o-dot-below>;"<BASE><BASE>";"<CAP><MIN>";<VRNT2>
+
+% &S<ṣ<<<Ṣ
+<U1E63> <s-dot-below>;"<BASE><BASE>";"<MIN><MIN>";<VRNT1> % LATIN SMALL LETTER S WITH DOT BELOW
+<s-combining-dot-below> <s-dot-below>;"<BASE><BASE>";"<MIN><MIN>";<VRNT2>
+<U1E62> <s-dot-below>;"<BASE><BASE>";"<CAP><MIN>";<VRNT1> % LATIN CAPITAL LETTER S WITH DOT BELOW
+<S-combining-dot-below> <s-dot-below>;"<BASE><BASE>";"<CAP><MIN>";<VRNT2>
 
 reorder-end