From cdeae33d71696bb0e81667d4788d0b38606aefb6 Mon Sep 17 00:00:00 2001 From: Mike FABIAN Date: Thu, 5 Dec 2019 14:21:21 +0100 Subject: [PATCH] Update or_IN collation [BZ #22525] - Add a test file or_IN.UTF-8.in. - Make the collation agree with CLDR. --- localedata/Makefile | 2 + localedata/locales/or_IN | 565 ++++------------------------------------------ localedata/or_IN.UTF-8.in | 145 ++++++++++++ 3 files changed, 186 insertions(+), 526 deletions(-) create mode 100644 localedata/or_IN.UTF-8.in diff --git a/localedata/Makefile b/localedata/Makefile index 75da312..e89bacc 100644 --- a/localedata/Makefile +++ b/localedata/Makefile @@ -92,6 +92,7 @@ test-input := \ nan_TW.UTF-8@latin \ nb_NO.UTF-8 \ om_KE.UTF-8 \ + or_IN.UTF-8 \ os_RU.UTF-8 \ pl_PL.UTF-8 \ ps_AF.UTF-8 \ @@ -258,6 +259,7 @@ LOCALES := \ nl_NL.UTF-8 \ nn_NO.ISO-8859-1 \ om_KE.UTF-8 \ + or_IN.UTF-8 \ os_RU.UTF-8 \ pl_PL.UTF-8 \ ps_AF.UTF-8 \ diff --git a/localedata/locales/or_IN b/localedata/locales/or_IN index 6743423..8c52151 100644 --- a/localedata/locales/or_IN +++ b/localedata/locales/or_IN @@ -68,541 +68,54 @@ END LC_CTYPE %%%%%%%%%%%%% LC_COLLATE -collating-element from "" -collating-element from "" -collating-element from "" +% CLDR collation rules for Odia: +% (see: https://github.com/unicode-org/cldr/blob/master/common/collation/or.xml) +% +% # The following tailoring is an adjustment of the +% # DUCET collation order for CANDRABINDU, ANUSVARA, +% # and VISARGA. Instead of being sorted with secondary +% # weights, they are collated on primary level between +% # the independent vowels and the consonants. +% # +% &ଔ<ଁ<ଂ<ଃ +% # KSSA is sorted after HA. +% &ହ<କ୍ଷ +% # YYA is secondary different from YA. +% &ଯ<<ୟ +% +% The following rules implement the same order for glibc. + +copy "iso14651_t1" -% Define collation weights as symbols +collating-symbol +collating-symbol +collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol +collating-element from "" % କ ୍ ଷ = କ୍ଷ +collating-element from "" % ଡ ଼ = ଡ଼ +collating-element from "" % ଢ ଼ = ଢ଼ -order_start forward;forward;forward;forward +collating-symbol +% &ଔ<ଁ<ଂ<ଃ +reorder-after % ORIYA LETTER AU + + + -% collation weights in order + ;;; % ORIYA SIGN CANDRABINDU + ;;; % ORIYA SIGN ANUSVARA + ;;; % ORIYA SIGN VISARGA - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% &ହ<କ୍ଷ +reorder-after % ORIYA LETTER HA + -% assignment of characters to weights + ;;;"" % କ ୍ ଷ = କ୍ଷ - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;"";"";IGNORE - ;;;IGNORE - ;"";"";IGNORE - ;;;IGNORE - ;"";"";IGNORE - ;;;IGNORE - ;"";"";IGNORE - ;;;IGNORE - ;"";"";IGNORE - ;;;IGNORE - ;"";"";IGNORE - ;;;IGNORE - ;"";"";IGNORE - ;;;IGNORE - ;"";"";IGNORE - ;;;IGNORE - ;"";"";IGNORE - ;;;IGNORE - ;"";"";IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - "";;"";IGNORE - "";;"";"" - "";;"";"" - "";;"";"" - "";;"";"" - "";;"";IGNORE -% FIXME ORIYA_LETTER_WA "";;"";IGNORE -% FIXME ORIYA_LETTER_VA "";;"";IGNORE -% ORIYA_LETTER_WA and ORIYA_LETTER_VA are not defined in unicode 3.0 - "";;"";IGNORE - "";;"";IGNORE - "";;"";IGNORE - "";;"";IGNORE - "";;"";IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE -UNDEFINED IGNORE;IGNORE;IGNORE;%... +% &ଯ<<ୟ + ;"";; % ORIYA LETTER YYA -order_end END LC_COLLATE %%%%%%%%%%%%% diff --git a/localedata/or_IN.UTF-8.in b/localedata/or_IN.UTF-8.in new file mode 100644 index 0000000..c1f6afb --- /dev/null +++ b/localedata/or_IN.UTF-8.in @@ -0,0 +1,145 @@ +0 +୦ +1 +୧ +2 +୨ +3 +୩ +4 +୪ +5 +୫ +6 +୬ +7 +୭ +8 +୮ +9 +୯ +a +A +b +B +c +C +d +D +e +E +f +F +g +G +h +H +i +I +j +J +k +K +l +L +m +M +n +N +o +O +p +P +q +Q +r +R +s +S +t +T +u +U +v +V +w +W +x +X +y +Y +z +Z +ଅ +ଆ +ଇ +ଈ +ଉ +ଊ +ଋ +ୠ +ଌ +ୡ +ଏ +ଐ +ଓ +ଔ +ଁ +ଂ +ଃ +କ +ଖ +ଗ +ଘ +ଙ +ଚ +ଛ +ଜ +ଝ +ଞ +ଟ +ଠ +ଡ +ଡ଼ +ଢ +ଢ଼ +ଢ଼ +ଣ +ତ +ଥ +ଦ +ଧ +ନ +ପ +ଫ +ବ +ଭ +ମ +ଯ +ୟ +ଯଯ +ୟଯ +ର +ଲ +ଳ +ଵ +ୱ +ଶ +ଷ +ସ +ହ +କ୍ଷ +ଽ +ା +ି +ୀ +ୁ +ୂ +ୃ +େ +ୈ +ୋ +ୌ +୍ +ୖ +ୗ -- 2.7.4