ICU-501 Collation enhancement phase 1. Added "override" and "version" tag in "CollationElements".
X-SVN-Rev: 1882
This commit is contained in:
Helena Chapman
parent
49f636fca0
commit
6ca74cacae
@ -10,7 +10,10 @@ ar {
|
||||
"\u0635",
|
||||
"\u0645",
|
||||
}
|
||||
CollationElements { "& \u0361 = \u0640= \u064B= \u064C= \u064D= \u064E= \u064F"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& \u0361 = \u0640= \u064B= \u064C= \u064D= \u064E= \u064F"
|
||||
"= \u0650= \u0652= \u066D= \u06D6= \u06D7= \u06D8= \u06D9= \u06DA= \u06DB= \u06DC"
|
||||
"= \u06DD= \u06DE= \u06DF= \u06E0= \u06E1= \u06E2= \u06E3= \u06E4= \u06E5= \u06E6"
|
||||
"= \u06E7= \u06E8= \u06E9= \u06EA= \u06EB= \u06EC= \u06ED& 0 < \u0660 < \u06F0& "
|
||||
@ -30,7 +33,8 @@ ar {
|
||||
"< \u06AD< \u06AE< \u06B0< \u06B1< \u06B2< \u06B3< \u06B4< \u06B5< \u06B6< \u06B7"
|
||||
"< \u06BA< \u06BB< \u06BC< \u06BD< \u06BE< \u06C0< \u06C1< \u06C2< \u06C3< \u06C4"
|
||||
"< \u06C5< \u06C6< \u06C7< \u06C8< \u06C9< \u06CA< \u06CB< \u06CC< \u06CD< \u06CE"
|
||||
"< \u06D0< \u06D1< \u06D2< \u06D3< \u06D5< \u0651" }
|
||||
"< \u06D0< \u06D1< \u06D2< \u06D3< \u06D5< \u0651"}
|
||||
}
|
||||
Countries {
|
||||
EG { "\u0645\u0635\u0631" }
|
||||
DZ { "\u0627\u0644\u062C\u0632\u0627\u0626\u0631" }
|
||||
|
||||
@ -6,7 +6,10 @@
|
||||
// *******************************************************************************
|
||||
|
||||
be {
|
||||
CollationElements { "& 9 < \u0482 & Z < \u0430 , \u0410< \u0431 , \u0411< \u0432"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& 9 < \u0482 & Z < \u0430 , \u0410< \u0431 , \u0411< \u0432"
|
||||
" , \u0412< \u0433 , \u0413; \u0491 , \u0490; \u0495 , \u0494; \u0453 , \u0403; "
|
||||
"\u0493 , \u0492< \u0434 , \u0414< \u0452 , \u0402< \u0435 , \u0415; \u04BD , \u04BC"
|
||||
"; \u0451 , \u0401; \u04BF , \u04BE< \u0454 , \u0404< \u0436 , \u0416; \u0497 , "
|
||||
@ -26,6 +29,7 @@ be {
|
||||
"< \u0469 , \u0468< \u046B , \u046A< \u046D , \u046C< \u046F , \u046E< \u0471 , "
|
||||
"\u0470< \u0473 , \u0472< \u0475 , \u0474; \u0477 , \u0476< \u0479 , \u0478< \u047B"
|
||||
" , \u047A< \u047D , \u047C< \u047F , \u047E< \u0481 , \u0480" }
|
||||
}
|
||||
Countries {
|
||||
BY { "\u0411\u0435\u043B\u0430\u0440\u0443\u0441\u044C" }
|
||||
}
|
||||
|
||||
@ -6,7 +6,10 @@
|
||||
// *******************************************************************************
|
||||
|
||||
bg {
|
||||
CollationElements { "& 9 < \u0482 & Z < \u0430 , \u0410< \u0431 , \u0411< \u0432"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& 9 < \u0482 & Z < \u0430 , \u0410< \u0431 , \u0411< \u0432"
|
||||
" , \u0412< \u0433 , \u0413; \u0491 , \u0490; \u0495 , \u0494; \u0453 , \u0403; "
|
||||
"\u0493 , \u0492< \u0434 , \u0414< \u0452 , \u0402< \u0435 , \u0415; \u04BD , \u04BC"
|
||||
"; \u0451 , \u0401; \u04BF , \u04BE< \u0454 , \u0404< \u0436 , \u0416; \u0497 , "
|
||||
@ -26,6 +29,7 @@ bg {
|
||||
"< \u0469 , \u0468< \u046B , \u046A< \u046D , \u046C< \u046F , \u046E< \u0471 , "
|
||||
"\u0470< \u0473 , \u0472< \u0475 , \u0474; \u0477 , \u0476< \u0479 , \u0478< \u047B"
|
||||
" , \u047A< \u047D , \u047C< \u047F , \u047E< \u0481 , \u0480" }
|
||||
}
|
||||
Countries {
|
||||
BG { "\u0411\u044A\u043B\u0433\u0430\u0440\u0438\u044F" }
|
||||
}
|
||||
|
||||
@ -6,7 +6,11 @@
|
||||
// *******************************************************************************
|
||||
|
||||
ca {
|
||||
CollationElements { "@" }
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "@" }
|
||||
}
|
||||
Countries {
|
||||
ES { "Espanya" }
|
||||
}
|
||||
|
||||
@ -10,9 +10,13 @@ cs {
|
||||
"dop.",
|
||||
"odp.",
|
||||
}
|
||||
CollationElements { "& \u0361 ; \u0308 = \u030D& C < c\u030C , C\u030C& H < "
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& \u0361 ; \u0308 = \u030D& C < c\u030C , C\u030C& H < "
|
||||
"ch , cH , Ch , CH & R < r\u030C , R\u030C& S < s\u030C , S\u030C& Z < z\u030C ,"
|
||||
" Z\u030C" }
|
||||
}
|
||||
Countries {
|
||||
CZ { "\u010Cesk\u00E1 republika" }
|
||||
}
|
||||
|
||||
@ -6,9 +6,13 @@
|
||||
// *******************************************************************************
|
||||
|
||||
da {
|
||||
CollationElements { "& A < \u00E6\u0301 , \u00C6\u0301& Z < \u00E6 , \u00C6;"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& A < \u00E6\u0301 , \u00C6\u0301& Z < \u00E6 , \u00C6;"
|
||||
" a\u0308 , A\u0308 < \u00F8 , \u00D8 ; o\u0308 , O\u0308 ; o\u030B, O\u030B< a\u030A"
|
||||
" , A\u030A, aa , aA , Aa , AA & V, w, W & Y ; u\u0308 , U\u0308" }
|
||||
}
|
||||
Countries {
|
||||
DK { "Danmark" }
|
||||
}
|
||||
|
||||
@ -10,7 +10,10 @@ el {
|
||||
"\u03C0\u03BC",
|
||||
"\u03BC\u03BC",
|
||||
}
|
||||
CollationElements { "& \u0361 = \u0387 = \u03F3 & \u00B5 < \u0374 < \u0375 <"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& \u0361 = \u0387 = \u03F3 & \u00B5 < \u0374 < \u0375 <"
|
||||
" \u037A < \u037E < \u0384 < \u0385 & Z < \u03B1 , \u0391 ; \u03AC , \u0386 < \u03B2"
|
||||
" , \u0392 ; \u03D0 < \u03B3 , \u0393 < \u03B4 , \u0394 < \u03B5 , \u0395 ; \u03AD"
|
||||
" , \u0388 < \u03B6 , \u0396 < \u03B7 , \u0397 ; \u03AE , \u0389 < \u03B8 , \u0398"
|
||||
@ -23,6 +26,7 @@ el {
|
||||
" ; \u03CE , \u038F , \u03DA , \u03DC , \u03DE , \u03E0 < \u03E3 , \u03E2 < \u03E5"
|
||||
" , \u03E4 < \u03E7 , \u03E6 < \u03E9 , \u03E8 < \u03EB , \u03EA < \u03ED , \u03EC"
|
||||
" < \u03EF , \u03EE & \u03BC = \u00B5 " }
|
||||
}
|
||||
Countries {
|
||||
GR { "\u0395\u03BB\u03BB\u03AC\u03B4\u03B1" }
|
||||
}
|
||||
|
||||
@ -6,12 +6,16 @@
|
||||
// *******************************************************************************
|
||||
|
||||
en_BE {
|
||||
CollationElements { "&u007F,' ','_',\u00AF,\u00AD,'-',',',';',':','!',\u00A1,'?'"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "&u007F,' ','_',\u00AF,\u00AD,'-',',',';',':','!',\u00A1,'?'"
|
||||
",\u00BF,'/','.',\u00B4,'`',\u00AB,\u00BB,'(',')','[',']','{','}',\u00A7,\u00B6,"
|
||||
"\u00A9,\u00AE,'@',\u00A4,\u00A2,'$',\u00A3,\u00A5,'*','\u005C','&','#','%','+',"
|
||||
"\u00B1,\u00F7,\u00D7,'<','=','>',\u00AC,'^',\u00A8,'~',\u00B7,\u00B8,''','\u0022"
|
||||
"','|',\u00A6,\u00B0,\u00B5<\u00A0&0;\u00BC;\u00BD;\u00BE&1,\u00B9&2,\u00B2&3,\u00B3"
|
||||
"&A;\u00AA&O;\u00BA&O\u0337,\u00D8&O\u0337,\u00F8@" }
|
||||
}
|
||||
CurrencyElements {
|
||||
"BF",
|
||||
"BEF ",
|
||||
|
||||
@ -6,7 +6,11 @@
|
||||
// *******************************************************************************
|
||||
|
||||
es {
|
||||
CollationElements { "& N < n\u0303, N\u0303 " }
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& N < n\u0303, N\u0303 " }
|
||||
}
|
||||
Countries {
|
||||
ES { "Espa\u00F1a" }
|
||||
AR { "Argentina" }
|
||||
|
||||
@ -6,9 +6,13 @@
|
||||
// *******************************************************************************
|
||||
|
||||
et {
|
||||
CollationElements { "@& S < s\u030C, S\u030C < z , Z < z\u030C , Z\u030C & V"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "@& S < s\u030C, S\u030C < z , Z < z\u030C , Z\u030C & V"
|
||||
" ; w , W < o\u0303 , O\u0303< a\u0308 , A\u0308 < o\u0308 , O\u0308 ; w\u0302 ,"
|
||||
" W\u0302< u\u0308 , U\u0308& Y < \u01B6 , \u01B5 " }
|
||||
}
|
||||
Countries {
|
||||
EE { "Eesti" }
|
||||
}
|
||||
|
||||
@ -6,9 +6,13 @@
|
||||
// *******************************************************************************
|
||||
|
||||
fi {
|
||||
CollationElements { "& V ; w , W & Z < a\u030A , A\u030A< a\u0308 , A\u0308 "
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& V ; w , W & Z < a\u030A , A\u030A< a\u0308 , A\u0308 "
|
||||
"< o\u0308 , O\u0308< o\u030B , O\u030B ; \u00F8 , \u00D8& Y ; u\u030B, U\u030B"
|
||||
" ; u\u0308 , U\u0308" }
|
||||
}
|
||||
Countries {
|
||||
FI { "Suomi" }
|
||||
}
|
||||
|
||||
@ -6,7 +6,11 @@
|
||||
// *******************************************************************************
|
||||
|
||||
fr {
|
||||
CollationElements { "@" }
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "@" }
|
||||
}
|
||||
Countries {
|
||||
FR { "France" }
|
||||
US { "\u00C9tats-Unis" }
|
||||
|
||||
@ -268,7 +268,9 @@ hi {
|
||||
}
|
||||
|
||||
CollationElements {
|
||||
" < \u0901 < \u0902 < \u0903 < \u0905 < \u0906 < \u0907 < \u0908 < \u0909 "
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { " < \u0901 < \u0902 < \u0903 < \u0905 < \u0906 < \u0907 < \u0908 < \u0909 "
|
||||
"< \u090a < \u090b < \u0960 < \u090e < \u090f < \u090c < \u0961 < \u0910 "
|
||||
"< \u090d < \u0912 < \u0913 < \u0914 < \u0911 < \u0915 < \u0958 < \u0916 "
|
||||
"< \u0959 < \u0917 < \u095a < \u0918 < \u0919 < \u091a < \u091b < \u091c"
|
||||
@ -280,7 +282,7 @@ hi {
|
||||
"< \u0944 < \u0946 < \u0947 < \u0948 < \u0945 < \u094a < \u094b < \u094c"
|
||||
"< \u0949 < \u094d < \u093c < \u093d < \u0950 < \u0951 < \u0952 < \u0953"
|
||||
"< \u0954 < \u0962 < \u0963 < \u0964 < \u0965 < \u0966 < \u0967 < \u0968"
|
||||
"< \u0969 < \u096a < \u096b < \u096c < \u096d < \u096e < \u096f < \u0970"
|
||||
"< \u0969 < \u096a < \u096b < \u096c < \u096d < \u096e < \u096f < \u0970" }
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -6,10 +6,14 @@
|
||||
// *******************************************************************************
|
||||
|
||||
hr {
|
||||
CollationElements { "& \u200F = \u030C & \u0306 = \u030D & C < c\u030C , C\u030C"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& \u200F = \u030C & \u0306 = \u030D & C < c\u030C , C\u030C"
|
||||
" < c\u0301 , C\u0301 & D < \u01F3 , \u01F2 , \u01F1 < dz , dZ , Dz , DZ < \u01C6"
|
||||
" , \u01C5 , \u01C4 < \u0111 , \u0110 & L < lj , lJ , Lj , LJ & N < nj , nJ , Nj"
|
||||
" , NJ & S < s\u030C , S\u030C & Z < z\u030C , Z\u030C " }
|
||||
}
|
||||
Countries {
|
||||
HR { "Hrvatska" }
|
||||
}
|
||||
|
||||
@ -10,10 +10,14 @@ hu {
|
||||
"DE",
|
||||
"DU",
|
||||
}
|
||||
CollationElements { "& C < cs , cS , Cs , CS & D < \u0111, \u0110 & G < gy, "
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& C < cs , cS , Cs , CS & D < \u0111, \u0110 & G < gy, "
|
||||
"Gy, gY, GY & L < ly, Ly, lY, LY & O < o\u0308 , O\u0308 < o\u030B , O\u030B & S"
|
||||
" < sz , sZ , Sz , SZ & U < u\u0308 , U\u0308 < u\u030B , U\u030B & Z < zs , zS "
|
||||
", Zs , ZS " }
|
||||
}
|
||||
Countries {
|
||||
HU { "Magyarorsz\u00E1g" }
|
||||
}
|
||||
|
||||
@ -6,10 +6,14 @@
|
||||
// *******************************************************************************
|
||||
|
||||
is {
|
||||
CollationElements { "@& A < a\u0301, A\u0301 & D < \u00F0, \u00D0& E < e\u0301"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "@& A < a\u0301, A\u0301 & D < \u00F0, \u00D0& E < e\u0301"
|
||||
", E\u0301 & I < i\u0301, I\u0301 & O < o\u0301, O\u0301 & U < u\u0301, U\u0301 "
|
||||
"& Y < y\u0301, Y\u0301 & Z < \u00fe, \u00DE < \u00E6, \u00C6< o\u0308, O\u0308"
|
||||
" ; \u00F8, \u00D8" }
|
||||
}
|
||||
Countries {
|
||||
IS { "\u00CDsland" }
|
||||
}
|
||||
|
||||
@ -6,7 +6,10 @@
|
||||
// *******************************************************************************
|
||||
|
||||
iw {
|
||||
CollationElements { "& \u0361 = \u05C4 & \u030D = \u0591 ; \u0592 ; \u0593 ;"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& \u0361 = \u05C4 & \u030D = \u0591 ; \u0592 ; \u0593 ;"
|
||||
" \u0594 ; \u0595 ; \u0596 ; \u0597 ; \u0598 ; \u0599 & \u0301 = \u059A & \u0300"
|
||||
" = \u059B & \u0307 = \u059C ; \u059D & \u0302 = \u059E & \u0308 = \u059F & \u030C"
|
||||
" = \u05A0 & \u0306 = \u05A1 & \u0304 = \u05A3 ; \u05A4 & \u0303 = \u05A5 & \u030A"
|
||||
@ -18,6 +21,7 @@ iw {
|
||||
"\u05F0 < \u05F1 < \u05D6 < \u05D7 < \u05D8 < \u05D9 < \u05F2 < \u05DA , \u05DB "
|
||||
"< \u05DC < \u05DD , \u05DE < \u05DF , \u05E0 < \u05E1 < \u05E2 < \u05E3 , \u05E4"
|
||||
" < \u05E5 , \u05E6 < \u05E7 < \u05E8 < \u05E9 < \u05EA " }
|
||||
}
|
||||
Countries {
|
||||
IL { "\u05D9\u05E9\u05E8\u05D0\u05DC" }
|
||||
}
|
||||
|
||||
@ -10,7 +10,10 @@ ja {
|
||||
"\u5348\u524D",
|
||||
"\u5348\u5F8C",
|
||||
}
|
||||
CollationElements { "&\u0486;\u30FC;\u3099;\u309A;\u30FB,\u303F&\u2212 <\u309B"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "&\u0486;\u30FC;\u3099;\u309A;\u30FB,\u303F&\u2212 <\u309B"
|
||||
"<\u309C<\u309D,\u30FD<\u309E,\u30FE& Z <\u3042,\u3041,\u30A2,\u30A1<\u3044,\u3043"
|
||||
",\u30A4,\u30A3<\u3046,\u3045,\u30A6,\u30A5<\u3048,\u3047,\u30A8,\u30A7<\u304A,\u3049"
|
||||
",\u30AA,\u30A9<\u304B,\u30AB,\u30F5<\u304D,\u30AD<\u304F,\u30AF<\u3051,\u30B1,\u30F6"
|
||||
@ -787,6 +790,7 @@ ja {
|
||||
" < \u9F5F < \u9F60 < \u9F61 < \u9F66 < \u9F67 < \u9F6C < \u9F6A < \u9F77 < \u9F72"
|
||||
" < \u9F76 < \u9F95 < \u9F9C < \u9FA0 < \u582F < \u69C7 < \u9059 < \u7464 < \u51DC"
|
||||
" < \u7199" }
|
||||
}
|
||||
Countries {
|
||||
JP { "\u65E5\u672C" }
|
||||
}
|
||||
|
||||
@ -10,7 +10,10 @@ ko {
|
||||
"\uC624\uC804",
|
||||
"\uC624\uD6C4",
|
||||
}
|
||||
CollationElements { "& Z < \u3000 < \u3001 < \u3002 < \u30FB< \u2025 < \u2026"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& Z < \u3000 < \u3001 < \u3002 < \u30FB< \u2025 < \u2026"
|
||||
" < \u00A8 < \u3003 < \u2010 < \u2014 < \u2225< \uFF3C < \u301C < \u2018 < \u2019"
|
||||
" < \u201C < \u201D < \u3014< \u3015 < \u3008 < \u3009 < \u300A < \u300B < \u300C"
|
||||
" < \u300D< \u300E < \u300F < \u3010 < \u3011 < \u00B1 < \u00D7 < \u00F7< \u2260"
|
||||
@ -925,6 +928,7 @@ ko {
|
||||
" < \u559C < \u566B < \u56CD< \u59EC < \u5B09 < \u5E0C < \u6199 < \u6198 < \u6231"
|
||||
" < \u665E< \u66E6 < \u7199 < \u71B9 < \u71BA < \u72A7 < \u79A7 < \u7A00< \u7FB2"
|
||||
" < \u8A70 " }
|
||||
}
|
||||
Countries {
|
||||
KR { "\uB300\uD55C\uBBFC\uAD6D" }
|
||||
}
|
||||
|
||||
@ -6,9 +6,13 @@
|
||||
// *******************************************************************************
|
||||
|
||||
lt {
|
||||
CollationElements { "@& C < c\u030C , C\u030C & I ; y = \u0131 , Y = \u0130 "
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "@& C < c\u030C , C\u030C & I ; y = \u0131 , Y = \u0130 "
|
||||
"& S < s\u030C , S\u030C & X < y\u0301, Y\u0301 < y\u0302 , Y\u0302 < y\u0308, Y"
|
||||
"\u0308 & Z < z\u030C , Z\u030C " }
|
||||
}
|
||||
Countries {
|
||||
LT { "Lietuva" }
|
||||
}
|
||||
|
||||
@ -6,9 +6,13 @@
|
||||
// *******************************************************************************
|
||||
|
||||
lv {
|
||||
CollationElements { "@& C < c\u030C , C\u030C & G < g\u0327 , G\u0327 & I < "
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "@& C < c\u030C , C\u030C & G < g\u0327 , G\u0327 & I < "
|
||||
"y, Y& K < k\u0327 , K\u0327 & L < l\u0327 , L\u0327 & N < n\u0327 , N\u0327 & S"
|
||||
" < s\u030C , S\u030C & Z < z\u030C , Z\u030C " }
|
||||
}
|
||||
Countries {
|
||||
LV { "Latvija" }
|
||||
}
|
||||
|
||||
@ -6,7 +6,10 @@
|
||||
// *******************************************************************************
|
||||
|
||||
mk {
|
||||
CollationElements { "& 9 < \u0482 & Z < \u0430 , \u0410< \u0431 , \u0411< \u0432"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& 9 < \u0482 & Z < \u0430 , \u0410< \u0431 , \u0411< \u0432"
|
||||
" , \u0412< \u0433 , \u0413; \u0491 , \u0490; \u0495 , \u0494; \u0453 , \u0403; "
|
||||
"\u0493 , \u0492< \u0434 , \u0414< \u0452 , \u0402< \u0435 , \u0415; \u04BD , \u04BC"
|
||||
"; \u0451 , \u0401; \u04BF , \u04BE< \u0454 , \u0404< \u0436 , \u0416; \u0497 , "
|
||||
@ -26,6 +29,7 @@ mk {
|
||||
"< \u0469 , \u0468< \u046B , \u046A< \u046D , \u046C< \u046F , \u046E< \u0471 , "
|
||||
"\u0470< \u0473 , \u0472< \u0475 , \u0474; \u0477 , \u0476< \u0479 , \u0478< \u047B"
|
||||
" , \u047A< \u047D , \u047C< \u047F , \u047E< \u0481 , \u0480" }
|
||||
}
|
||||
Countries {
|
||||
MK { "\u041C\u0430\u043A\u0435\u0434\u043E\u043D\u0438\u0458\u0430" }
|
||||
}
|
||||
|
||||
@ -246,7 +246,9 @@ mt {
|
||||
|
||||
CollationElements
|
||||
{
|
||||
"& B < c\u0307 , C\u0307 " // c. C.
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& B < c\u0307 , C\u0307 " // c. C.
|
||||
" < c,C"
|
||||
"& F < g\u0307 , G\u0307 " // g. G.
|
||||
" < g,G"
|
||||
@ -254,7 +256,7 @@ mt {
|
||||
"& H < \u0127 , \u0126 " // h/ H/
|
||||
"& I < ie, iE, Ie, IE " // ie is a single letter
|
||||
"& Y < z\u0307 , Z\u0307" // z. Z.
|
||||
" < z,Z"
|
||||
" < z,Z" }
|
||||
}
|
||||
|
||||
// Time zone
|
||||
|
||||
@ -6,9 +6,13 @@
|
||||
// *******************************************************************************
|
||||
|
||||
no {
|
||||
CollationElements { "& Z < \u00E6, \u00C6 < a\u0308, A\u0308< \u00F8, \u00D8"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& Z < \u00E6, \u00C6 < a\u0308, A\u0308< \u00F8, \u00D8"
|
||||
" < o\u0308, O\u0308< o\u030B, O\u030B < a\u030A, A\u030A, aa , aA , Aa , AA & "
|
||||
"V, w, W " }
|
||||
}
|
||||
Countries {
|
||||
NO { "Norge" }
|
||||
}
|
||||
|
||||
@ -6,10 +6,14 @@
|
||||
// *******************************************************************************
|
||||
|
||||
pl {
|
||||
CollationElements { "& A < a\u0328 , A\u0328 & C < c\u0301 , C\u0301 & D < \u0111"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& A < a\u0328 , A\u0328 & C < c\u0301 , C\u0301 & D < \u0111"
|
||||
", \u0110 & E < e\u0328 , E\u0328 & L < \u0142 , \u0141 & N < n\u0301 , N\u0301 "
|
||||
"& O < o\u0301 , O\u0301 & S < s\u0301 , S\u0301 & Z < z\u0301 , Z\u0301 < z\u0307"
|
||||
" , Z\u0307 " }
|
||||
}
|
||||
Countries {
|
||||
PL { "Polska" }
|
||||
}
|
||||
|
||||
@ -6,9 +6,13 @@
|
||||
// *******************************************************************************
|
||||
|
||||
ro {
|
||||
CollationElements { "& A < a\u0306 , A\u0306 & D < \u0111, \u0110 & I < i\u0302"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence {"& A < a\u0306 , A\u0306 & D < \u0111, \u0110 & I < i\u0302"
|
||||
" , I\u0302 & S < s\u0327 , S\u0327 & \u00DE < t\u0327 , T\u0327& Z < z\u0307 , "
|
||||
"Z\u0307 " }
|
||||
}
|
||||
Countries {
|
||||
RO { "Rom\u00E2nia" }
|
||||
}
|
||||
|
||||
@ -6,7 +6,10 @@
|
||||
// *******************************************************************************
|
||||
|
||||
ru {
|
||||
CollationElements { "& 9 < \u0482 & Z < \u0430 , \u0410< \u0431 , \u0411< \u0432"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& 9 < \u0482 & Z < \u0430 , \u0410< \u0431 , \u0411< \u0432"
|
||||
" , \u0412< \u0433 , \u0413; \u0491 , \u0490; \u0495 , \u0494; \u0453 , \u0403; "
|
||||
"\u0493 , \u0492< \u0434 , \u0414< \u0452 , \u0402< \u0435 , \u0415; \u04BD , \u04BC"
|
||||
"; \u0451 , \u0401; \u04BF , \u04BE< \u0454 , \u0404< \u0436 , \u0416; \u0497 , "
|
||||
@ -26,6 +29,7 @@ ru {
|
||||
"< \u0469 , \u0468< \u046B , \u046A< \u046D , \u046C< \u046F , \u046E< \u0471 , "
|
||||
"\u0470< \u0473 , \u0472< \u0475 , \u0474; \u0477 , \u0476< \u0479 , \u0478< \u047B"
|
||||
" , \u047A< \u047D , \u047C< \u047F , \u047E< \u0481 , \u0480" }
|
||||
}
|
||||
Countries {
|
||||
RU { "\u0420\u043E\u0441\u0441\u0438\u044F" }
|
||||
}
|
||||
|
||||
@ -6,8 +6,12 @@
|
||||
// *******************************************************************************
|
||||
|
||||
sh {
|
||||
CollationElements { "& D < dz, Dz, dZ, DZ < \u0111, \u0110& L < lj, Lj, lJ, "
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& D < dz, Dz, dZ, DZ < \u0111, \u0110& L < lj, Lj, lJ, "
|
||||
"LJ < \u0142, \u0141& N < nj, Nj, nJ, NJ& Z < \u017C, \u017B" }
|
||||
}
|
||||
Countries {
|
||||
AF { "Avganistan" }
|
||||
AL { "Albanija" }
|
||||
|
||||
@ -6,10 +6,14 @@
|
||||
// *******************************************************************************
|
||||
|
||||
sk {
|
||||
CollationElements { "& \u0361 ; \u0308 = \u030D & A < a\u0308 , A\u0308 & C "
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& \u0361 ; \u0308 = \u030D & A < a\u0308 , A\u0308 & C "
|
||||
"< c\u030C , C\u030C & D < \u0111, \u0110 & H < ch , cH , Ch , CH & L < \u0142 ,"
|
||||
" \u0141 & O < o\u0302 , O\u0302 & R < r\u030C , R\u030C & S < s\u030C , S\u030C"
|
||||
" & Z < z\u030C , Z\u030C < z\u0307 , Z\u0307 " }
|
||||
}
|
||||
Countries {
|
||||
SK { "Slovensk\u00E1 republika" }
|
||||
}
|
||||
|
||||
@ -6,10 +6,14 @@
|
||||
// *******************************************************************************
|
||||
|
||||
sl {
|
||||
CollationElements { "& C < c\u030C , C\u030C < c\u0301 , C\u0301 & D < \u01F3"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& C < c\u030C , C\u030C < c\u0301 , C\u0301 & D < \u01F3"
|
||||
" , \u01F2 , \u01F1 < \u01C6 , \u01C5 , \u01C4 < \u0111 , \u0110 & L < \u0142 , "
|
||||
"\u0141 & N < nj , nJ , Nj , NJ & S < s\u030C , S\u030C < s\u0301, S\u0301 & Z <"
|
||||
" z\u030C , Z\u030C < z\u0301 , Z\u0301 < z\u0307 , Z\u0307 " }
|
||||
}
|
||||
Countries {
|
||||
SI { "Slovenija" }
|
||||
}
|
||||
|
||||
@ -10,7 +10,11 @@ sq {
|
||||
"PD",
|
||||
"MD",
|
||||
}
|
||||
CollationElements { "@" }
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "@" }
|
||||
}
|
||||
Countries {
|
||||
AL { "Shqip\u00EBria" }
|
||||
}
|
||||
|
||||
@ -6,7 +6,10 @@
|
||||
// *******************************************************************************
|
||||
|
||||
sr {
|
||||
CollationElements { "& 9 < \u0482 & Z < \u0430 , \u0410< \u0431 , \u0411< \u0432"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& 9 < \u0482 & Z < \u0430 , \u0410< \u0431 , \u0411< \u0432"
|
||||
" , \u0412< \u0433 , \u0413; \u0491 , \u0490; \u0495 , \u0494; \u0453 , \u0403; "
|
||||
"\u0493 , \u0492< \u0434 , \u0414< \u0452 , \u0402< \u0435 , \u0415; \u04BD , \u04BC"
|
||||
"; \u0451 , \u0401; \u04BF , \u04BE< \u0454 , \u0404< \u0436 , \u0416; \u0497 , "
|
||||
@ -26,6 +29,7 @@ sr {
|
||||
"< \u0469 , \u0468< \u046B , \u046A< \u046D , \u046C< \u046F , \u046E< \u0471 , "
|
||||
"\u0470< \u0473 , \u0472< \u0475 , \u0474; \u0477 , \u0476< \u0479 , \u0478< \u047B"
|
||||
" , \u047A< \u047D , \u047C< \u047F , \u047E< \u0481 , \u0480" }
|
||||
}
|
||||
Countries {
|
||||
AF { "\u0410\u0432\u0433\u0430\u043D\u0438\u0441\u0442\u0430\u043D" }
|
||||
AL { "\u0410\u043B\u0431\u0430\u043D\u0438\u0458\u0430" }
|
||||
|
||||
@ -6,9 +6,13 @@
|
||||
// *******************************************************************************
|
||||
|
||||
sv {
|
||||
CollationElements { "& Z < \u00E6 , \u00C6 < a\u030A , A\u030A , aa , aA , A"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& Z < \u00E6 , \u00C6 < a\u030A , A\u030A , aa , aA , A"
|
||||
"a , AA< a\u0308 , A\u0308 < o\u0308 , O\u0308 ; u\u030B , U\u030B < o\u030B , O"
|
||||
"\u030B ; \u00F8 , \u00D8 & V ; w , W& Y, u\u0308 , U\u0308" }
|
||||
}
|
||||
Countries {
|
||||
SE { "Sverige" }
|
||||
}
|
||||
|
||||
@ -11,12 +11,14 @@ th {
|
||||
"\u0E01\u0E48\u0E2D\u0E19\u0E40\u0E17\u0E35\u0E48\u0E22\u0E07",
|
||||
"\u0E2B\u0E25\u0E31\u0E07\u0E40\u0E17\u0E35\u0E48\u0E22\u0E07",
|
||||
}
|
||||
// -------------------- ibm.597 --------------------
|
||||
//
|
||||
// First put in all of the consonants, after Z
|
||||
//
|
||||
CollationElements {
|
||||
// -------------------- ibm.597 --------------------
|
||||
//
|
||||
// First put in all of the consonants, after Z
|
||||
//
|
||||
"& Z "
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& Z "
|
||||
"< \u0E01 " // KO KAI
|
||||
"< \u0E02 " // KHO KHAI
|
||||
"< \u0E03 " // KHO KHUAT
|
||||
@ -150,7 +152,8 @@ th {
|
||||
// These are supposed to be ignored, so I'm treating them as controls
|
||||
"& \u0001 "
|
||||
"= \u0E3A " // PHINTHU
|
||||
"= '.' " // period
|
||||
"= '.' " // period
|
||||
}
|
||||
}
|
||||
Countries {
|
||||
TH { "\u0E1B\u0E23\u0E30\u0E40\u0E17\u0E28\u0E44\u0E17\u0E22" }
|
||||
|
||||
@ -6,9 +6,13 @@
|
||||
// *******************************************************************************
|
||||
|
||||
tr {
|
||||
CollationElements { "& A < a\u0308 , A\u0308 & C < c\u0327 , C\u0327 & G < g"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& A < a\u0308 , A\u0308 & C < c\u0327 , C\u0327 & G < g"
|
||||
"\u0306 , G\u0306 & H < \u0131 , I , i , \u0130 < \u0132 , \u0133 & O < o\u0308 "
|
||||
", O\u0308 & S < s\u0327 , S\u0327 & U < u\u0308 , U\u0308 " }
|
||||
}
|
||||
Countries {
|
||||
TR { "T\u00FCrkiye" }
|
||||
}
|
||||
|
||||
@ -6,7 +6,10 @@
|
||||
// *******************************************************************************
|
||||
|
||||
uk {
|
||||
CollationElements { "& 9 < \u0482 & Z< \u0430 , \u0410< \u0431 , \u0411< \u0432"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& 9 < \u0482 & Z< \u0430 , \u0410< \u0431 , \u0411< \u0432"
|
||||
" , \u0412< \u0433 , \u0413; \u0491 , \u0490; \u0495 , \u0494; \u0453 , \u0403; "
|
||||
"\u0493 , \u0492< \u0434 , \u0414< \u0452 , \u0402< \u0435 , \u0415; \u04BD , \u04BC"
|
||||
"; \u0451 , \u0401; \u04BF , \u04BE< \u0454 , \u0404< \u0436 , \u0416; \u0497 , "
|
||||
@ -26,6 +29,7 @@ uk {
|
||||
"< \u0469 , \u0468< \u046B , \u046A< \u046D , \u046C< \u046F , \u046E< \u0471 , "
|
||||
"\u0470< \u0473 , \u0472< \u0475 , \u0474; \u0477 , \u0476< \u0479 , \u0478< \u047B"
|
||||
" , \u047A< \u047D , \u047C< \u047F , \u047E< \u0481 , \u0480" }
|
||||
}
|
||||
Countries {
|
||||
UA { "\u0423\u043A\u0440\u0430\u0457\u043D\u0430" }
|
||||
}
|
||||
|
||||
@ -6,12 +6,16 @@
|
||||
// *******************************************************************************
|
||||
|
||||
vi {
|
||||
CollationElements { "&\u009F,' ','_',\u00AF,\u00AD,'-',',',';',':','!',\u00A1"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "&\u009F,' ','_',\u00AF,\u00AD,'-',',',';',':','!',\u00A1"
|
||||
",'?',\u00BF,'/','.','^','~',\u00B7,''','\u0022',\u00AB,\u00BB,'(',')','[',']','"
|
||||
"{','}',\u00A7,\u00B6,\u00A9,\u00AE,'@',\u00A4,\u00A2,'$',\u00A3,\u00A5,'*','\u005C"
|
||||
"','&','#','%','+',\u00B1,\u00F7,\u00D7,'<','=','>',\u00AC,'|',\u00A6,\u00B0,\u00B5"
|
||||
";\u0300;\u0309;\u0303;\u0301;\u0323;\u0306;\u0302;\u031B<\u00A0&0,\u00BC,\u00BD"
|
||||
",\u00BE&1,\u00B9&2,\u00B2&3,\u00B3&D<\u0111,\u0110" }
|
||||
}
|
||||
DateTimePatterns {
|
||||
"HH:mm:ss z",
|
||||
"HH:mm:ss z",
|
||||
|
||||
@ -10,7 +10,10 @@ zh {
|
||||
"\u4E0A\u5348",
|
||||
"\u4E0B\u5348",
|
||||
}
|
||||
CollationElements { "& Z < \u3000 < \u3001 < \u3002 < \u30FB < \u02C9< \u02C7"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& Z < \u3000 < \u3001 < \u3002 < \u30FB < \u02C9< \u02C7"
|
||||
" < \u3003 < \u3005 < \u2015 < \uFF5E < \u2016< \u2026 < \u2018 < \u2019 < \u201C"
|
||||
" < \u201D < \u3014 < \u3015< \u3008 < \u3009 < \u300A < \u300B < \u300C < \u300D"
|
||||
" < \u300E< \u300F < \u3016 < \u3017 < \u3010 < \u3011< \u2236 < \u2227 < \u2228"
|
||||
@ -832,8 +835,8 @@ zh {
|
||||
" < \u9AF9 < \u9B08 < \u9B0F < \u9B13< \u9B1F < \u9B23 < \u9EBD < \u9EBE < \u7E3B"
|
||||
" < \u9E82 < \u9E87< \u9E88 < \u9E8B < \u9E92 < \u93D6 < \u9E9D < \u9E9F < \u9EDB"
|
||||
"< \u9EDC < \u9EDD < \u9EE0 < \u9EDF < \u9EE2 < \u9EE9 < \u9EE7< \u9EE5 < \u9EEA"
|
||||
" < \u9EEF < \u9F22 < \u9F2C < \u9F2F < \u9F39< \u9F37 < \u9F3D < \u9F3E < \u9F44"
|
||||
"" }
|
||||
" < \u9EEF < \u9F22 < \u9F2C < \u9F2F < \u9F39< \u9F37 < \u9F3D < \u9F3E < \u9F44" }
|
||||
}
|
||||
Countries {
|
||||
CN { "\u4E2D\u83EF\u4EBA\u6C11\u5171\u548C\u570B" }
|
||||
TW { "\u53F0\u6E7E" }
|
||||
|
||||
@ -6,7 +6,10 @@
|
||||
// *******************************************************************************
|
||||
|
||||
zh_TW {
|
||||
CollationElements { " & Z <\u3000<\uFF0C<\u3001<\u3002<\uFF0E<\u2022<\uFF1B<"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { " & Z <\u3000<\uFF0C<\u3001<\u3002<\uFF0E<\u2022<\uFF1B<"
|
||||
"\uFF1A<\uFF1F<\uFF01<\uFE30<\u2026<\u2025<\uFE50<\uFF64<\uFE52<\u00B7<\uFE54<\uFE55"
|
||||
"<\uFE56<\uFE57<\uFF5C<\u2013<\uFE31<\u2014<\uFE33<\uFE34<\uFE4F<\uFF08<\uFF09<\uFE35"
|
||||
"<\uFE36<\uFF5B<\uFF5D<\uFE37<\uFE38<\u3014<\u3015<\uFE39<\uFE3A<\u3010<\u3011<\uFE3B"
|
||||
@ -1149,6 +1152,7 @@ zh_TW {
|
||||
"<\u6207<\u6B1E<\u7227<\u864C<\u8EA8<\u9482<\u9480<\u9481<\u9A69<\u9A68<\u9B2E<\u9E19"
|
||||
"<\u7229<\u864B<\u8B9F<\u9483<\u9C79<\u9EB7<\u7675<\u9A6B<\u9C7A<\u9E1D<\u7069<\u706A"
|
||||
"<\u9EA4<\u9F7E<\u9F49<\u9F98" }
|
||||
}
|
||||
Countries {
|
||||
CN { "\u4E2D\u83EF\u4EBA\u6C11\u5171\u548C\u570B" }
|
||||
TW { "\u4E2D\u83EF\u6C11\u570B" }
|
||||
|
||||
@ -10,7 +10,10 @@ ar {
|
||||
"\u0635",
|
||||
"\u0645",
|
||||
}
|
||||
CollationElements { "& \u0361 = \u0640= \u064B= \u064C= \u064D= \u064E= \u064F"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& \u0361 = \u0640= \u064B= \u064C= \u064D= \u064E= \u064F"
|
||||
"= \u0650= \u0652= \u066D= \u06D6= \u06D7= \u06D8= \u06D9= \u06DA= \u06DB= \u06DC"
|
||||
"= \u06DD= \u06DE= \u06DF= \u06E0= \u06E1= \u06E2= \u06E3= \u06E4= \u06E5= \u06E6"
|
||||
"= \u06E7= \u06E8= \u06E9= \u06EA= \u06EB= \u06EC= \u06ED& 0 < \u0660 < \u06F0& "
|
||||
@ -30,7 +33,8 @@ ar {
|
||||
"< \u06AD< \u06AE< \u06B0< \u06B1< \u06B2< \u06B3< \u06B4< \u06B5< \u06B6< \u06B7"
|
||||
"< \u06BA< \u06BB< \u06BC< \u06BD< \u06BE< \u06C0< \u06C1< \u06C2< \u06C3< \u06C4"
|
||||
"< \u06C5< \u06C6< \u06C7< \u06C8< \u06C9< \u06CA< \u06CB< \u06CC< \u06CD< \u06CE"
|
||||
"< \u06D0< \u06D1< \u06D2< \u06D3< \u06D5< \u0651" }
|
||||
"< \u06D0< \u06D1< \u06D2< \u06D3< \u06D5< \u0651"}
|
||||
}
|
||||
Countries {
|
||||
EG { "\u0645\u0635\u0631" }
|
||||
DZ { "\u0627\u0644\u062C\u0632\u0627\u0626\u0631" }
|
||||
|
||||
@ -6,7 +6,10 @@
|
||||
// *******************************************************************************
|
||||
|
||||
be {
|
||||
CollationElements { "& 9 < \u0482 & Z < \u0430 , \u0410< \u0431 , \u0411< \u0432"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& 9 < \u0482 & Z < \u0430 , \u0410< \u0431 , \u0411< \u0432"
|
||||
" , \u0412< \u0433 , \u0413; \u0491 , \u0490; \u0495 , \u0494; \u0453 , \u0403; "
|
||||
"\u0493 , \u0492< \u0434 , \u0414< \u0452 , \u0402< \u0435 , \u0415; \u04BD , \u04BC"
|
||||
"; \u0451 , \u0401; \u04BF , \u04BE< \u0454 , \u0404< \u0436 , \u0416; \u0497 , "
|
||||
@ -26,6 +29,7 @@ be {
|
||||
"< \u0469 , \u0468< \u046B , \u046A< \u046D , \u046C< \u046F , \u046E< \u0471 , "
|
||||
"\u0470< \u0473 , \u0472< \u0475 , \u0474; \u0477 , \u0476< \u0479 , \u0478< \u047B"
|
||||
" , \u047A< \u047D , \u047C< \u047F , \u047E< \u0481 , \u0480" }
|
||||
}
|
||||
Countries {
|
||||
BY { "\u0411\u0435\u043B\u0430\u0440\u0443\u0441\u044C" }
|
||||
}
|
||||
|
||||
@ -6,7 +6,10 @@
|
||||
// *******************************************************************************
|
||||
|
||||
bg {
|
||||
CollationElements { "& 9 < \u0482 & Z < \u0430 , \u0410< \u0431 , \u0411< \u0432"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& 9 < \u0482 & Z < \u0430 , \u0410< \u0431 , \u0411< \u0432"
|
||||
" , \u0412< \u0433 , \u0413; \u0491 , \u0490; \u0495 , \u0494; \u0453 , \u0403; "
|
||||
"\u0493 , \u0492< \u0434 , \u0414< \u0452 , \u0402< \u0435 , \u0415; \u04BD , \u04BC"
|
||||
"; \u0451 , \u0401; \u04BF , \u04BE< \u0454 , \u0404< \u0436 , \u0416; \u0497 , "
|
||||
@ -26,6 +29,7 @@ bg {
|
||||
"< \u0469 , \u0468< \u046B , \u046A< \u046D , \u046C< \u046F , \u046E< \u0471 , "
|
||||
"\u0470< \u0473 , \u0472< \u0475 , \u0474; \u0477 , \u0476< \u0479 , \u0478< \u047B"
|
||||
" , \u047A< \u047D , \u047C< \u047F , \u047E< \u0481 , \u0480" }
|
||||
}
|
||||
Countries {
|
||||
BG { "\u0411\u044A\u043B\u0433\u0430\u0440\u0438\u044F" }
|
||||
}
|
||||
|
||||
@ -6,7 +6,11 @@
|
||||
// *******************************************************************************
|
||||
|
||||
ca {
|
||||
CollationElements { "@" }
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "@" }
|
||||
}
|
||||
Countries {
|
||||
ES { "Espanya" }
|
||||
}
|
||||
|
||||
@ -10,9 +10,13 @@ cs {
|
||||
"dop.",
|
||||
"odp.",
|
||||
}
|
||||
CollationElements { "& \u0361 ; \u0308 = \u030D& C < c\u030C , C\u030C& H < "
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& \u0361 ; \u0308 = \u030D& C < c\u030C , C\u030C& H < "
|
||||
"ch , cH , Ch , CH & R < r\u030C , R\u030C& S < s\u030C , S\u030C& Z < z\u030C ,"
|
||||
" Z\u030C" }
|
||||
}
|
||||
Countries {
|
||||
CZ { "\u010Cesk\u00E1 republika" }
|
||||
}
|
||||
|
||||
@ -6,9 +6,13 @@
|
||||
// *******************************************************************************
|
||||
|
||||
da {
|
||||
CollationElements { "& A < \u00E6\u0301 , \u00C6\u0301& Z < \u00E6 , \u00C6;"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& A < \u00E6\u0301 , \u00C6\u0301& Z < \u00E6 , \u00C6;"
|
||||
" a\u0308 , A\u0308 < \u00F8 , \u00D8 ; o\u0308 , O\u0308 ; o\u030B, O\u030B< a\u030A"
|
||||
" , A\u030A, aa , aA , Aa , AA & V, w, W & Y ; u\u0308 , U\u0308" }
|
||||
}
|
||||
Countries {
|
||||
DK { "Danmark" }
|
||||
}
|
||||
|
||||
@ -10,7 +10,10 @@ el {
|
||||
"\u03C0\u03BC",
|
||||
"\u03BC\u03BC",
|
||||
}
|
||||
CollationElements { "& \u0361 = \u0387 = \u03F3 & \u00B5 < \u0374 < \u0375 <"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& \u0361 = \u0387 = \u03F3 & \u00B5 < \u0374 < \u0375 <"
|
||||
" \u037A < \u037E < \u0384 < \u0385 & Z < \u03B1 , \u0391 ; \u03AC , \u0386 < \u03B2"
|
||||
" , \u0392 ; \u03D0 < \u03B3 , \u0393 < \u03B4 , \u0394 < \u03B5 , \u0395 ; \u03AD"
|
||||
" , \u0388 < \u03B6 , \u0396 < \u03B7 , \u0397 ; \u03AE , \u0389 < \u03B8 , \u0398"
|
||||
@ -23,6 +26,7 @@ el {
|
||||
" ; \u03CE , \u038F , \u03DA , \u03DC , \u03DE , \u03E0 < \u03E3 , \u03E2 < \u03E5"
|
||||
" , \u03E4 < \u03E7 , \u03E6 < \u03E9 , \u03E8 < \u03EB , \u03EA < \u03ED , \u03EC"
|
||||
" < \u03EF , \u03EE & \u03BC = \u00B5 " }
|
||||
}
|
||||
Countries {
|
||||
GR { "\u0395\u03BB\u03BB\u03AC\u03B4\u03B1" }
|
||||
}
|
||||
|
||||
@ -6,12 +6,16 @@
|
||||
// *******************************************************************************
|
||||
|
||||
en_BE {
|
||||
CollationElements { "&u007F,' ','_',\u00AF,\u00AD,'-',',',';',':','!',\u00A1,'?'"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "&u007F,' ','_',\u00AF,\u00AD,'-',',',';',':','!',\u00A1,'?'"
|
||||
",\u00BF,'/','.',\u00B4,'`',\u00AB,\u00BB,'(',')','[',']','{','}',\u00A7,\u00B6,"
|
||||
"\u00A9,\u00AE,'@',\u00A4,\u00A2,'$',\u00A3,\u00A5,'*','\u005C','&','#','%','+',"
|
||||
"\u00B1,\u00F7,\u00D7,'<','=','>',\u00AC,'^',\u00A8,'~',\u00B7,\u00B8,''','\u0022"
|
||||
"','|',\u00A6,\u00B0,\u00B5<\u00A0&0;\u00BC;\u00BD;\u00BE&1,\u00B9&2,\u00B2&3,\u00B3"
|
||||
"&A;\u00AA&O;\u00BA&O\u0337,\u00D8&O\u0337,\u00F8@" }
|
||||
}
|
||||
CurrencyElements {
|
||||
"BF",
|
||||
"BEF ",
|
||||
|
||||
@ -6,7 +6,11 @@
|
||||
// *******************************************************************************
|
||||
|
||||
es {
|
||||
CollationElements { "& N < n\u0303, N\u0303 " }
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& N < n\u0303, N\u0303 " }
|
||||
}
|
||||
Countries {
|
||||
ES { "Espa\u00F1a" }
|
||||
AR { "Argentina" }
|
||||
|
||||
@ -6,9 +6,13 @@
|
||||
// *******************************************************************************
|
||||
|
||||
et {
|
||||
CollationElements { "@& S < s\u030C, S\u030C < z , Z < z\u030C , Z\u030C & V"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "@& S < s\u030C, S\u030C < z , Z < z\u030C , Z\u030C & V"
|
||||
" ; w , W < o\u0303 , O\u0303< a\u0308 , A\u0308 < o\u0308 , O\u0308 ; w\u0302 ,"
|
||||
" W\u0302< u\u0308 , U\u0308& Y < \u01B6 , \u01B5 " }
|
||||
}
|
||||
Countries {
|
||||
EE { "Eesti" }
|
||||
}
|
||||
|
||||
@ -6,9 +6,13 @@
|
||||
// *******************************************************************************
|
||||
|
||||
fi {
|
||||
CollationElements { "& V ; w , W & Z < a\u030A , A\u030A< a\u0308 , A\u0308 "
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& V ; w , W & Z < a\u030A , A\u030A< a\u0308 , A\u0308 "
|
||||
"< o\u0308 , O\u0308< o\u030B , O\u030B ; \u00F8 , \u00D8& Y ; u\u030B, U\u030B"
|
||||
" ; u\u0308 , U\u0308" }
|
||||
}
|
||||
Countries {
|
||||
FI { "Suomi" }
|
||||
}
|
||||
|
||||
@ -6,7 +6,11 @@
|
||||
// *******************************************************************************
|
||||
|
||||
fr {
|
||||
CollationElements { "@" }
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "@" }
|
||||
}
|
||||
Countries {
|
||||
FR { "France" }
|
||||
US { "\u00C9tats-Unis" }
|
||||
|
||||
@ -268,7 +268,9 @@ hi {
|
||||
}
|
||||
|
||||
CollationElements {
|
||||
" < \u0901 < \u0902 < \u0903 < \u0905 < \u0906 < \u0907 < \u0908 < \u0909 "
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { " < \u0901 < \u0902 < \u0903 < \u0905 < \u0906 < \u0907 < \u0908 < \u0909 "
|
||||
"< \u090a < \u090b < \u0960 < \u090e < \u090f < \u090c < \u0961 < \u0910 "
|
||||
"< \u090d < \u0912 < \u0913 < \u0914 < \u0911 < \u0915 < \u0958 < \u0916 "
|
||||
"< \u0959 < \u0917 < \u095a < \u0918 < \u0919 < \u091a < \u091b < \u091c"
|
||||
@ -280,7 +282,7 @@ hi {
|
||||
"< \u0944 < \u0946 < \u0947 < \u0948 < \u0945 < \u094a < \u094b < \u094c"
|
||||
"< \u0949 < \u094d < \u093c < \u093d < \u0950 < \u0951 < \u0952 < \u0953"
|
||||
"< \u0954 < \u0962 < \u0963 < \u0964 < \u0965 < \u0966 < \u0967 < \u0968"
|
||||
"< \u0969 < \u096a < \u096b < \u096c < \u096d < \u096e < \u096f < \u0970"
|
||||
"< \u0969 < \u096a < \u096b < \u096c < \u096d < \u096e < \u096f < \u0970" }
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -6,10 +6,14 @@
|
||||
// *******************************************************************************
|
||||
|
||||
hr {
|
||||
CollationElements { "& \u200F = \u030C & \u0306 = \u030D & C < c\u030C , C\u030C"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& \u200F = \u030C & \u0306 = \u030D & C < c\u030C , C\u030C"
|
||||
" < c\u0301 , C\u0301 & D < \u01F3 , \u01F2 , \u01F1 < dz , dZ , Dz , DZ < \u01C6"
|
||||
" , \u01C5 , \u01C4 < \u0111 , \u0110 & L < lj , lJ , Lj , LJ & N < nj , nJ , Nj"
|
||||
" , NJ & S < s\u030C , S\u030C & Z < z\u030C , Z\u030C " }
|
||||
}
|
||||
Countries {
|
||||
HR { "Hrvatska" }
|
||||
}
|
||||
|
||||
@ -10,10 +10,14 @@ hu {
|
||||
"DE",
|
||||
"DU",
|
||||
}
|
||||
CollationElements { "& C < cs , cS , Cs , CS & D < \u0111, \u0110 & G < gy, "
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& C < cs , cS , Cs , CS & D < \u0111, \u0110 & G < gy, "
|
||||
"Gy, gY, GY & L < ly, Ly, lY, LY & O < o\u0308 , O\u0308 < o\u030B , O\u030B & S"
|
||||
" < sz , sZ , Sz , SZ & U < u\u0308 , U\u0308 < u\u030B , U\u030B & Z < zs , zS "
|
||||
", Zs , ZS " }
|
||||
}
|
||||
Countries {
|
||||
HU { "Magyarorsz\u00E1g" }
|
||||
}
|
||||
|
||||
@ -6,10 +6,14 @@
|
||||
// *******************************************************************************
|
||||
|
||||
is {
|
||||
CollationElements { "@& A < a\u0301, A\u0301 & D < \u00F0, \u00D0& E < e\u0301"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "@& A < a\u0301, A\u0301 & D < \u00F0, \u00D0& E < e\u0301"
|
||||
", E\u0301 & I < i\u0301, I\u0301 & O < o\u0301, O\u0301 & U < u\u0301, U\u0301 "
|
||||
"& Y < y\u0301, Y\u0301 & Z < \u00fe, \u00DE < \u00E6, \u00C6< o\u0308, O\u0308"
|
||||
" ; \u00F8, \u00D8" }
|
||||
}
|
||||
Countries {
|
||||
IS { "\u00CDsland" }
|
||||
}
|
||||
|
||||
@ -6,7 +6,10 @@
|
||||
// *******************************************************************************
|
||||
|
||||
iw {
|
||||
CollationElements { "& \u0361 = \u05C4 & \u030D = \u0591 ; \u0592 ; \u0593 ;"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& \u0361 = \u05C4 & \u030D = \u0591 ; \u0592 ; \u0593 ;"
|
||||
" \u0594 ; \u0595 ; \u0596 ; \u0597 ; \u0598 ; \u0599 & \u0301 = \u059A & \u0300"
|
||||
" = \u059B & \u0307 = \u059C ; \u059D & \u0302 = \u059E & \u0308 = \u059F & \u030C"
|
||||
" = \u05A0 & \u0306 = \u05A1 & \u0304 = \u05A3 ; \u05A4 & \u0303 = \u05A5 & \u030A"
|
||||
@ -18,6 +21,7 @@ iw {
|
||||
"\u05F0 < \u05F1 < \u05D6 < \u05D7 < \u05D8 < \u05D9 < \u05F2 < \u05DA , \u05DB "
|
||||
"< \u05DC < \u05DD , \u05DE < \u05DF , \u05E0 < \u05E1 < \u05E2 < \u05E3 , \u05E4"
|
||||
" < \u05E5 , \u05E6 < \u05E7 < \u05E8 < \u05E9 < \u05EA " }
|
||||
}
|
||||
Countries {
|
||||
IL { "\u05D9\u05E9\u05E8\u05D0\u05DC" }
|
||||
}
|
||||
|
||||
@ -10,7 +10,10 @@ ja {
|
||||
"\u5348\u524D",
|
||||
"\u5348\u5F8C",
|
||||
}
|
||||
CollationElements { "&\u0486;\u30FC;\u3099;\u309A;\u30FB,\u303F&\u2212 <\u309B"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "&\u0486;\u30FC;\u3099;\u309A;\u30FB,\u303F&\u2212 <\u309B"
|
||||
"<\u309C<\u309D,\u30FD<\u309E,\u30FE& Z <\u3042,\u3041,\u30A2,\u30A1<\u3044,\u3043"
|
||||
",\u30A4,\u30A3<\u3046,\u3045,\u30A6,\u30A5<\u3048,\u3047,\u30A8,\u30A7<\u304A,\u3049"
|
||||
",\u30AA,\u30A9<\u304B,\u30AB,\u30F5<\u304D,\u30AD<\u304F,\u30AF<\u3051,\u30B1,\u30F6"
|
||||
@ -787,6 +790,7 @@ ja {
|
||||
" < \u9F5F < \u9F60 < \u9F61 < \u9F66 < \u9F67 < \u9F6C < \u9F6A < \u9F77 < \u9F72"
|
||||
" < \u9F76 < \u9F95 < \u9F9C < \u9FA0 < \u582F < \u69C7 < \u9059 < \u7464 < \u51DC"
|
||||
" < \u7199" }
|
||||
}
|
||||
Countries {
|
||||
JP { "\u65E5\u672C" }
|
||||
}
|
||||
|
||||
@ -10,7 +10,10 @@ ko {
|
||||
"\uC624\uC804",
|
||||
"\uC624\uD6C4",
|
||||
}
|
||||
CollationElements { "& Z < \u3000 < \u3001 < \u3002 < \u30FB< \u2025 < \u2026"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& Z < \u3000 < \u3001 < \u3002 < \u30FB< \u2025 < \u2026"
|
||||
" < \u00A8 < \u3003 < \u2010 < \u2014 < \u2225< \uFF3C < \u301C < \u2018 < \u2019"
|
||||
" < \u201C < \u201D < \u3014< \u3015 < \u3008 < \u3009 < \u300A < \u300B < \u300C"
|
||||
" < \u300D< \u300E < \u300F < \u3010 < \u3011 < \u00B1 < \u00D7 < \u00F7< \u2260"
|
||||
@ -925,6 +928,7 @@ ko {
|
||||
" < \u559C < \u566B < \u56CD< \u59EC < \u5B09 < \u5E0C < \u6199 < \u6198 < \u6231"
|
||||
" < \u665E< \u66E6 < \u7199 < \u71B9 < \u71BA < \u72A7 < \u79A7 < \u7A00< \u7FB2"
|
||||
" < \u8A70 " }
|
||||
}
|
||||
Countries {
|
||||
KR { "\uB300\uD55C\uBBFC\uAD6D" }
|
||||
}
|
||||
|
||||
@ -6,9 +6,13 @@
|
||||
// *******************************************************************************
|
||||
|
||||
lt {
|
||||
CollationElements { "@& C < c\u030C , C\u030C & I ; y = \u0131 , Y = \u0130 "
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "@& C < c\u030C , C\u030C & I ; y = \u0131 , Y = \u0130 "
|
||||
"& S < s\u030C , S\u030C & X < y\u0301, Y\u0301 < y\u0302 , Y\u0302 < y\u0308, Y"
|
||||
"\u0308 & Z < z\u030C , Z\u030C " }
|
||||
}
|
||||
Countries {
|
||||
LT { "Lietuva" }
|
||||
}
|
||||
|
||||
@ -6,9 +6,13 @@
|
||||
// *******************************************************************************
|
||||
|
||||
lv {
|
||||
CollationElements { "@& C < c\u030C , C\u030C & G < g\u0327 , G\u0327 & I < "
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "@& C < c\u030C , C\u030C & G < g\u0327 , G\u0327 & I < "
|
||||
"y, Y& K < k\u0327 , K\u0327 & L < l\u0327 , L\u0327 & N < n\u0327 , N\u0327 & S"
|
||||
" < s\u030C , S\u030C & Z < z\u030C , Z\u030C " }
|
||||
}
|
||||
Countries {
|
||||
LV { "Latvija" }
|
||||
}
|
||||
|
||||
@ -6,7 +6,10 @@
|
||||
// *******************************************************************************
|
||||
|
||||
mk {
|
||||
CollationElements { "& 9 < \u0482 & Z < \u0430 , \u0410< \u0431 , \u0411< \u0432"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& 9 < \u0482 & Z < \u0430 , \u0410< \u0431 , \u0411< \u0432"
|
||||
" , \u0412< \u0433 , \u0413; \u0491 , \u0490; \u0495 , \u0494; \u0453 , \u0403; "
|
||||
"\u0493 , \u0492< \u0434 , \u0414< \u0452 , \u0402< \u0435 , \u0415; \u04BD , \u04BC"
|
||||
"; \u0451 , \u0401; \u04BF , \u04BE< \u0454 , \u0404< \u0436 , \u0416; \u0497 , "
|
||||
@ -26,6 +29,7 @@ mk {
|
||||
"< \u0469 , \u0468< \u046B , \u046A< \u046D , \u046C< \u046F , \u046E< \u0471 , "
|
||||
"\u0470< \u0473 , \u0472< \u0475 , \u0474; \u0477 , \u0476< \u0479 , \u0478< \u047B"
|
||||
" , \u047A< \u047D , \u047C< \u047F , \u047E< \u0481 , \u0480" }
|
||||
}
|
||||
Countries {
|
||||
MK { "\u041C\u0430\u043A\u0435\u0434\u043E\u043D\u0438\u0458\u0430" }
|
||||
}
|
||||
|
||||
@ -246,7 +246,9 @@ mt {
|
||||
|
||||
CollationElements
|
||||
{
|
||||
"& B < c\u0307 , C\u0307 " // c. C.
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& B < c\u0307 , C\u0307 " // c. C.
|
||||
" < c,C"
|
||||
"& F < g\u0307 , G\u0307 " // g. G.
|
||||
" < g,G"
|
||||
@ -254,7 +256,7 @@ mt {
|
||||
"& H < \u0127 , \u0126 " // h/ H/
|
||||
"& I < ie, iE, Ie, IE " // ie is a single letter
|
||||
"& Y < z\u0307 , Z\u0307" // z. Z.
|
||||
" < z,Z"
|
||||
" < z,Z" }
|
||||
}
|
||||
|
||||
// Time zone
|
||||
|
||||
@ -6,9 +6,13 @@
|
||||
// *******************************************************************************
|
||||
|
||||
no {
|
||||
CollationElements { "& Z < \u00E6, \u00C6 < a\u0308, A\u0308< \u00F8, \u00D8"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& Z < \u00E6, \u00C6 < a\u0308, A\u0308< \u00F8, \u00D8"
|
||||
" < o\u0308, O\u0308< o\u030B, O\u030B < a\u030A, A\u030A, aa , aA , Aa , AA & "
|
||||
"V, w, W " }
|
||||
}
|
||||
Countries {
|
||||
NO { "Norge" }
|
||||
}
|
||||
|
||||
@ -6,10 +6,14 @@
|
||||
// *******************************************************************************
|
||||
|
||||
pl {
|
||||
CollationElements { "& A < a\u0328 , A\u0328 & C < c\u0301 , C\u0301 & D < \u0111"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& A < a\u0328 , A\u0328 & C < c\u0301 , C\u0301 & D < \u0111"
|
||||
", \u0110 & E < e\u0328 , E\u0328 & L < \u0142 , \u0141 & N < n\u0301 , N\u0301 "
|
||||
"& O < o\u0301 , O\u0301 & S < s\u0301 , S\u0301 & Z < z\u0301 , Z\u0301 < z\u0307"
|
||||
" , Z\u0307 " }
|
||||
}
|
||||
Countries {
|
||||
PL { "Polska" }
|
||||
}
|
||||
|
||||
@ -6,9 +6,13 @@
|
||||
// *******************************************************************************
|
||||
|
||||
ro {
|
||||
CollationElements { "& A < a\u0306 , A\u0306 & D < \u0111, \u0110 & I < i\u0302"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence {"& A < a\u0306 , A\u0306 & D < \u0111, \u0110 & I < i\u0302"
|
||||
" , I\u0302 & S < s\u0327 , S\u0327 & \u00DE < t\u0327 , T\u0327& Z < z\u0307 , "
|
||||
"Z\u0307 " }
|
||||
}
|
||||
Countries {
|
||||
RO { "Rom\u00E2nia" }
|
||||
}
|
||||
|
||||
@ -6,7 +6,10 @@
|
||||
// *******************************************************************************
|
||||
|
||||
ru {
|
||||
CollationElements { "& 9 < \u0482 & Z < \u0430 , \u0410< \u0431 , \u0411< \u0432"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& 9 < \u0482 & Z < \u0430 , \u0410< \u0431 , \u0411< \u0432"
|
||||
" , \u0412< \u0433 , \u0413; \u0491 , \u0490; \u0495 , \u0494; \u0453 , \u0403; "
|
||||
"\u0493 , \u0492< \u0434 , \u0414< \u0452 , \u0402< \u0435 , \u0415; \u04BD , \u04BC"
|
||||
"; \u0451 , \u0401; \u04BF , \u04BE< \u0454 , \u0404< \u0436 , \u0416; \u0497 , "
|
||||
@ -26,6 +29,7 @@ ru {
|
||||
"< \u0469 , \u0468< \u046B , \u046A< \u046D , \u046C< \u046F , \u046E< \u0471 , "
|
||||
"\u0470< \u0473 , \u0472< \u0475 , \u0474; \u0477 , \u0476< \u0479 , \u0478< \u047B"
|
||||
" , \u047A< \u047D , \u047C< \u047F , \u047E< \u0481 , \u0480" }
|
||||
}
|
||||
Countries {
|
||||
RU { "\u0420\u043E\u0441\u0441\u0438\u044F" }
|
||||
}
|
||||
|
||||
@ -6,8 +6,12 @@
|
||||
// *******************************************************************************
|
||||
|
||||
sh {
|
||||
CollationElements { "& D < dz, Dz, dZ, DZ < \u0111, \u0110& L < lj, Lj, lJ, "
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& D < dz, Dz, dZ, DZ < \u0111, \u0110& L < lj, Lj, lJ, "
|
||||
"LJ < \u0142, \u0141& N < nj, Nj, nJ, NJ& Z < \u017C, \u017B" }
|
||||
}
|
||||
Countries {
|
||||
AF { "Avganistan" }
|
||||
AL { "Albanija" }
|
||||
|
||||
@ -6,10 +6,14 @@
|
||||
// *******************************************************************************
|
||||
|
||||
sk {
|
||||
CollationElements { "& \u0361 ; \u0308 = \u030D & A < a\u0308 , A\u0308 & C "
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& \u0361 ; \u0308 = \u030D & A < a\u0308 , A\u0308 & C "
|
||||
"< c\u030C , C\u030C & D < \u0111, \u0110 & H < ch , cH , Ch , CH & L < \u0142 ,"
|
||||
" \u0141 & O < o\u0302 , O\u0302 & R < r\u030C , R\u030C & S < s\u030C , S\u030C"
|
||||
" & Z < z\u030C , Z\u030C < z\u0307 , Z\u0307 " }
|
||||
}
|
||||
Countries {
|
||||
SK { "Slovensk\u00E1 republika" }
|
||||
}
|
||||
|
||||
@ -6,10 +6,14 @@
|
||||
// *******************************************************************************
|
||||
|
||||
sl {
|
||||
CollationElements { "& C < c\u030C , C\u030C < c\u0301 , C\u0301 & D < \u01F3"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& C < c\u030C , C\u030C < c\u0301 , C\u0301 & D < \u01F3"
|
||||
" , \u01F2 , \u01F1 < \u01C6 , \u01C5 , \u01C4 < \u0111 , \u0110 & L < \u0142 , "
|
||||
"\u0141 & N < nj , nJ , Nj , NJ & S < s\u030C , S\u030C < s\u0301, S\u0301 & Z <"
|
||||
" z\u030C , Z\u030C < z\u0301 , Z\u0301 < z\u0307 , Z\u0307 " }
|
||||
}
|
||||
Countries {
|
||||
SI { "Slovenija" }
|
||||
}
|
||||
|
||||
@ -10,7 +10,11 @@ sq {
|
||||
"PD",
|
||||
"MD",
|
||||
}
|
||||
CollationElements { "@" }
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "@" }
|
||||
}
|
||||
Countries {
|
||||
AL { "Shqip\u00EBria" }
|
||||
}
|
||||
|
||||
@ -6,7 +6,10 @@
|
||||
// *******************************************************************************
|
||||
|
||||
sr {
|
||||
CollationElements { "& 9 < \u0482 & Z < \u0430 , \u0410< \u0431 , \u0411< \u0432"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& 9 < \u0482 & Z < \u0430 , \u0410< \u0431 , \u0411< \u0432"
|
||||
" , \u0412< \u0433 , \u0413; \u0491 , \u0490; \u0495 , \u0494; \u0453 , \u0403; "
|
||||
"\u0493 , \u0492< \u0434 , \u0414< \u0452 , \u0402< \u0435 , \u0415; \u04BD , \u04BC"
|
||||
"; \u0451 , \u0401; \u04BF , \u04BE< \u0454 , \u0404< \u0436 , \u0416; \u0497 , "
|
||||
@ -26,6 +29,7 @@ sr {
|
||||
"< \u0469 , \u0468< \u046B , \u046A< \u046D , \u046C< \u046F , \u046E< \u0471 , "
|
||||
"\u0470< \u0473 , \u0472< \u0475 , \u0474; \u0477 , \u0476< \u0479 , \u0478< \u047B"
|
||||
" , \u047A< \u047D , \u047C< \u047F , \u047E< \u0481 , \u0480" }
|
||||
}
|
||||
Countries {
|
||||
AF { "\u0410\u0432\u0433\u0430\u043D\u0438\u0441\u0442\u0430\u043D" }
|
||||
AL { "\u0410\u043B\u0431\u0430\u043D\u0438\u0458\u0430" }
|
||||
|
||||
@ -6,9 +6,13 @@
|
||||
// *******************************************************************************
|
||||
|
||||
sv {
|
||||
CollationElements { "& Z < \u00E6 , \u00C6 < a\u030A , A\u030A , aa , aA , A"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& Z < \u00E6 , \u00C6 < a\u030A , A\u030A , aa , aA , A"
|
||||
"a , AA< a\u0308 , A\u0308 < o\u0308 , O\u0308 ; u\u030B , U\u030B < o\u030B , O"
|
||||
"\u030B ; \u00F8 , \u00D8 & V ; w , W& Y, u\u0308 , U\u0308" }
|
||||
}
|
||||
Countries {
|
||||
SE { "Sverige" }
|
||||
}
|
||||
|
||||
@ -11,12 +11,14 @@ th {
|
||||
"\u0E01\u0E48\u0E2D\u0E19\u0E40\u0E17\u0E35\u0E48\u0E22\u0E07",
|
||||
"\u0E2B\u0E25\u0E31\u0E07\u0E40\u0E17\u0E35\u0E48\u0E22\u0E07",
|
||||
}
|
||||
// -------------------- ibm.597 --------------------
|
||||
//
|
||||
// First put in all of the consonants, after Z
|
||||
//
|
||||
CollationElements {
|
||||
// -------------------- ibm.597 --------------------
|
||||
//
|
||||
// First put in all of the consonants, after Z
|
||||
//
|
||||
"& Z "
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& Z "
|
||||
"< \u0E01 " // KO KAI
|
||||
"< \u0E02 " // KHO KHAI
|
||||
"< \u0E03 " // KHO KHUAT
|
||||
@ -150,7 +152,8 @@ th {
|
||||
// These are supposed to be ignored, so I'm treating them as controls
|
||||
"& \u0001 "
|
||||
"= \u0E3A " // PHINTHU
|
||||
"= '.' " // period
|
||||
"= '.' " // period
|
||||
}
|
||||
}
|
||||
Countries {
|
||||
TH { "\u0E1B\u0E23\u0E30\u0E40\u0E17\u0E28\u0E44\u0E17\u0E22" }
|
||||
|
||||
@ -6,9 +6,13 @@
|
||||
// *******************************************************************************
|
||||
|
||||
tr {
|
||||
CollationElements { "& A < a\u0308 , A\u0308 & C < c\u0327 , C\u0327 & G < g"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& A < a\u0308 , A\u0308 & C < c\u0327 , C\u0327 & G < g"
|
||||
"\u0306 , G\u0306 & H < \u0131 , I , i , \u0130 < \u0132 , \u0133 & O < o\u0308 "
|
||||
", O\u0308 & S < s\u0327 , S\u0327 & U < u\u0308 , U\u0308 " }
|
||||
}
|
||||
Countries {
|
||||
TR { "T\u00FCrkiye" }
|
||||
}
|
||||
|
||||
@ -6,7 +6,10 @@
|
||||
// *******************************************************************************
|
||||
|
||||
uk {
|
||||
CollationElements { "& 9 < \u0482 & Z< \u0430 , \u0410< \u0431 , \u0411< \u0432"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& 9 < \u0482 & Z< \u0430 , \u0410< \u0431 , \u0411< \u0432"
|
||||
" , \u0412< \u0433 , \u0413; \u0491 , \u0490; \u0495 , \u0494; \u0453 , \u0403; "
|
||||
"\u0493 , \u0492< \u0434 , \u0414< \u0452 , \u0402< \u0435 , \u0415; \u04BD , \u04BC"
|
||||
"; \u0451 , \u0401; \u04BF , \u04BE< \u0454 , \u0404< \u0436 , \u0416; \u0497 , "
|
||||
@ -26,6 +29,7 @@ uk {
|
||||
"< \u0469 , \u0468< \u046B , \u046A< \u046D , \u046C< \u046F , \u046E< \u0471 , "
|
||||
"\u0470< \u0473 , \u0472< \u0475 , \u0474; \u0477 , \u0476< \u0479 , \u0478< \u047B"
|
||||
" , \u047A< \u047D , \u047C< \u047F , \u047E< \u0481 , \u0480" }
|
||||
}
|
||||
Countries {
|
||||
UA { "\u0423\u043A\u0440\u0430\u0457\u043D\u0430" }
|
||||
}
|
||||
|
||||
@ -6,12 +6,16 @@
|
||||
// *******************************************************************************
|
||||
|
||||
vi {
|
||||
CollationElements { "&\u009F,' ','_',\u00AF,\u00AD,'-',',',';',':','!',\u00A1"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "&\u009F,' ','_',\u00AF,\u00AD,'-',',',';',':','!',\u00A1"
|
||||
",'?',\u00BF,'/','.','^','~',\u00B7,''','\u0022',\u00AB,\u00BB,'(',')','[',']','"
|
||||
"{','}',\u00A7,\u00B6,\u00A9,\u00AE,'@',\u00A4,\u00A2,'$',\u00A3,\u00A5,'*','\u005C"
|
||||
"','&','#','%','+',\u00B1,\u00F7,\u00D7,'<','=','>',\u00AC,'|',\u00A6,\u00B0,\u00B5"
|
||||
";\u0300;\u0309;\u0303;\u0301;\u0323;\u0306;\u0302;\u031B<\u00A0&0,\u00BC,\u00BD"
|
||||
",\u00BE&1,\u00B9&2,\u00B2&3,\u00B3&D<\u0111,\u0110" }
|
||||
}
|
||||
DateTimePatterns {
|
||||
"HH:mm:ss z",
|
||||
"HH:mm:ss z",
|
||||
|
||||
@ -10,7 +10,10 @@ zh {
|
||||
"\u4E0A\u5348",
|
||||
"\u4E0B\u5348",
|
||||
}
|
||||
CollationElements { "& Z < \u3000 < \u3001 < \u3002 < \u30FB < \u02C9< \u02C7"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "& Z < \u3000 < \u3001 < \u3002 < \u30FB < \u02C9< \u02C7"
|
||||
" < \u3003 < \u3005 < \u2015 < \uFF5E < \u2016< \u2026 < \u2018 < \u2019 < \u201C"
|
||||
" < \u201D < \u3014 < \u3015< \u3008 < \u3009 < \u300A < \u300B < \u300C < \u300D"
|
||||
" < \u300E< \u300F < \u3016 < \u3017 < \u3010 < \u3011< \u2236 < \u2227 < \u2228"
|
||||
@ -832,8 +835,8 @@ zh {
|
||||
" < \u9AF9 < \u9B08 < \u9B0F < \u9B13< \u9B1F < \u9B23 < \u9EBD < \u9EBE < \u7E3B"
|
||||
" < \u9E82 < \u9E87< \u9E88 < \u9E8B < \u9E92 < \u93D6 < \u9E9D < \u9E9F < \u9EDB"
|
||||
"< \u9EDC < \u9EDD < \u9EE0 < \u9EDF < \u9EE2 < \u9EE9 < \u9EE7< \u9EE5 < \u9EEA"
|
||||
" < \u9EEF < \u9F22 < \u9F2C < \u9F2F < \u9F39< \u9F37 < \u9F3D < \u9F3E < \u9F44"
|
||||
"" }
|
||||
" < \u9EEF < \u9F22 < \u9F2C < \u9F2F < \u9F39< \u9F37 < \u9F3D < \u9F3E < \u9F44" }
|
||||
}
|
||||
Countries {
|
||||
CN { "\u4E2D\u83EF\u4EBA\u6C11\u5171\u548C\u570B" }
|
||||
TW { "\u53F0\u6E7E" }
|
||||
|
||||
@ -6,7 +6,10 @@
|
||||
// *******************************************************************************
|
||||
|
||||
zh_TW {
|
||||
CollationElements { " & Z <\u3000<\uFF0C<\u3001<\u3002<\uFF0E<\u2022<\uFF1B<"
|
||||
CollationElements {
|
||||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { " & Z <\u3000<\uFF0C<\u3001<\u3002<\uFF0E<\u2022<\uFF1B<"
|
||||
"\uFF1A<\uFF1F<\uFF01<\uFE30<\u2026<\u2025<\uFE50<\uFF64<\uFE52<\u00B7<\uFE54<\uFE55"
|
||||
"<\uFE56<\uFE57<\uFF5C<\u2013<\uFE31<\u2014<\uFE33<\uFE34<\uFE4F<\uFF08<\uFF09<\uFE35"
|
||||
"<\uFE36<\uFF5B<\uFF5D<\uFE37<\uFE38<\u3014<\u3015<\uFE39<\uFE3A<\u3010<\u3011<\uFE3B"
|
||||
@ -1149,6 +1152,7 @@ zh_TW {
|
||||
"<\u6207<\u6B1E<\u7227<\u864C<\u8EA8<\u9482<\u9480<\u9481<\u9A69<\u9A68<\u9B2E<\u9E19"
|
||||
"<\u7229<\u864B<\u8B9F<\u9483<\u9C79<\u9EB7<\u7675<\u9A6B<\u9C7A<\u9E1D<\u7069<\u706A"
|
||||
"<\u9EA4<\u9F7E<\u9F49<\u9F98" }
|
||||
}
|
||||
Countries {
|
||||
CN { "\u4E2D\u83EF\u4EBA\u6C11\u5171\u548C\u570B" }
|
||||
TW { "\u4E2D\u83EF\u6C11\u570B" }
|
||||
|
||||
@ -977,24 +977,25 @@ RuleBasedCollator::constructFromFile( const Locale& locale,
|
||||
|
||||
UnicodeString colString;
|
||||
UErrorCode intStatus = U_ZERO_ERROR;
|
||||
/* REDO */
|
||||
const UnicodeString *t = bundle.getString("CollationElements", intStatus);
|
||||
|
||||
if(t != NULL) {
|
||||
colString = *t;
|
||||
}
|
||||
ResourceBundle colElems = bundle.get("CollationElements", intStatus);
|
||||
if (U_FAILURE(intStatus))
|
||||
{
|
||||
status = U_MISSING_RESOURCE_ERROR;
|
||||
return;
|
||||
}
|
||||
colString = colElems.getStringEx("Sequence", intStatus);
|
||||
|
||||
if(U_FAILURE(intStatus)) {
|
||||
status = U_MISSING_RESOURCE_ERROR;
|
||||
return;
|
||||
}
|
||||
|
||||
if(colString.isBogus()) {
|
||||
status = U_MEMORY_ALLOCATION_ERROR;
|
||||
return;
|
||||
}
|
||||
|
||||
// if this bundle doesn't contain collation data, break out
|
||||
if(U_FAILURE(intStatus)) {
|
||||
status = U_MISSING_RESOURCE_ERROR;
|
||||
return;
|
||||
}
|
||||
|
||||
// Having loaded the collation from the resource bundle text file,
|
||||
// now retrieve the CollationElements tagged data, merged with the
|
||||
// default rules. If that fails, use the default rules alone.
|
||||
|
||||
@ -118,7 +118,7 @@ void TestTertiary( )
|
||||
log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status));
|
||||
}
|
||||
log_verbose("Testing Kanna(Japan) Collation with Tertiary strength\n");
|
||||
ucol_setNormalization(myCollation, UCOL_DECOMP_COMPAT_COMP_CAN);
|
||||
ucol_setNormalization(myCollation, UCOL_DECOMP_COMPAT);
|
||||
ucol_setStrength(myCollation, UCOL_TERTIARY);
|
||||
for (i = 0; i < 11 ; i++)
|
||||
{
|
||||
|
||||
@ -56,7 +56,8 @@ const static char* canonTests[][3] = {
|
||||
{ "\\u30AB\\u3099", "\\u30AB\\u3099", "\\u30AC" }, /*ka + ten*/
|
||||
{ "\\uFF76\\uFF9E", "\\uFF76\\uFF9E", "\\uFF76\\uFF9E" }, /* hw_ka + hw_ten*/
|
||||
{ "\\u30AB\\uFF9E", "\\u30AB\\uFF9E", "\\u30AB\\uFF9E" }, /* ka + hw_ten*/
|
||||
{ "\\uFF76\\u3099", "\\uFF76\\u3099", "\\uFF76\\u3099" } /* hw_ka + ten*/
|
||||
{ "\\uFF76\\u3099", "\\uFF76\\u3099", "\\uFF76\\u3099" }, /* hw_ka + ten*/
|
||||
{ "A\\u0300\\u0316", "A\\u0316\\u0300", "\\u00C0\\u0316" } /* hw_ka + ten*/
|
||||
};
|
||||
|
||||
const static char* compatTests[][3] = {
|
||||
|
||||
@ -197,7 +197,7 @@ void TestNewTypes() {
|
||||
char action[256];
|
||||
char testdatapath[256];
|
||||
const char* directory = ctest_getTestDirectory();
|
||||
UErrorCode expected_status,status = U_ZERO_ERROR,expected_resource_status = U_ZERO_ERROR;
|
||||
UErrorCode status = U_ZERO_ERROR,expected_resource_status = U_ZERO_ERROR;
|
||||
UResourceBundle* res = NULL;
|
||||
uint8_t *binResult = NULL;
|
||||
int32_t len = 0;
|
||||
@ -291,7 +291,7 @@ void TestBinaryCollationData(){
|
||||
coll = ures_getByKey(teRes, "CollationElements", coll, &status);
|
||||
if(U_SUCCESS(status)){
|
||||
CONFIRM_ErrorCode(status, U_ZERO_ERROR);
|
||||
CONFIRM_INT_EQ(ures_getType(coll), RES_STRING);
|
||||
CONFIRM_INT_EQ(ures_getType(coll), RES_TABLE);
|
||||
binColl=ures_getByKey(teRes, "%%Collation", binColl, &status);
|
||||
if(U_SUCCESS(status)){
|
||||
CONFIRM_ErrorCode(status, U_ZERO_ERROR);
|
||||
|
||||
@ -73,7 +73,7 @@ static UnicodeString str(const char *input)
|
||||
}
|
||||
|
||||
|
||||
UnicodeString BasicNormalizerTest::canonTests[23][3];
|
||||
UnicodeString BasicNormalizerTest::canonTests[24][3];
|
||||
|
||||
UnicodeString BasicNormalizerTest::compatTests[11][3];
|
||||
|
||||
@ -128,6 +128,8 @@ BasicNormalizerTest::BasicNormalizerTest()
|
||||
|
||||
canonTests[22][0] = str("\\uFF76\\u3099"); canonTests[22][1] = str("\\uFF76\\u3099"); canonTests[22][2] = str("\\uFF76\\u3099"); // hw_ka + ten
|
||||
|
||||
canonTests[23][0] = str("A\\u0300\\u0316"); canonTests[23][1] = str("A\\u0316\\u0300"); canonTests[23][2] = str("\\u00C0\\u0316");
|
||||
|
||||
/* compatTest */
|
||||
// Input Decomposed Composed
|
||||
compatTests[0][0] = str("cat"); compatTests[0][1] = str("cat"); compatTests[0][2] = str("cat") ;
|
||||
|
||||
6
icu4c/source/test/testdata/te.txt
vendored
6
icu4c/source/test/testdata/te.txt
vendored
@ -90,9 +90,11 @@ te
|
||||
}
|
||||
|
||||
CollationElements
|
||||
{ "& A < a\u0308 , A\u0308 & C < c\u0327 , C\u0327 & G < g"
|
||||
{ Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence {"& A < a\u0308 , A\u0308 & C < c\u0327 , C\u0327 & G < g"
|
||||
"\u0306 , G\u0306 & H < \u0131 , I , i , \u0130 < \u0132 , \u0133 & O < o\u0308 "
|
||||
", O\u0308 & S < s\u0327 , S\u0327 & U < u\u0308 , U\u0308 "
|
||||
", O\u0308 & S < s\u0327 , S\u0327 & U < u\u0308 , U\u0308 " }
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -225,7 +225,9 @@ parse(FileStream *f, const char *cp, const char *inputDir,
|
||||
struct SResource *temp = NULL;
|
||||
struct SResource *temp1 = NULL;
|
||||
struct SResource *temp2 = NULL;
|
||||
UBool colEl = FALSE;
|
||||
UBool colEl = FALSE, colOverride = FALSE;
|
||||
UChar trueValue[] = {0x0054, 0x0052, 0x0055, 0x0045, 0x0000}; /* Just to store "TRUE" and "FALSE" */
|
||||
UChar falseValue[] = {0x0046, 0x0041, 0x004C, 0x0053, 0x0045, 0x0000};
|
||||
|
||||
/* Hashtable for keeping track of seen tag names */
|
||||
struct UHashtable *data;
|
||||
@ -478,6 +480,7 @@ parse(FileStream *f, const char *cp, const char *inputDir,
|
||||
}
|
||||
temp = string_open(bundle, cTag, token.fChars, token.fLength, status);
|
||||
table_add(rootTable, temp, status);
|
||||
#if 0
|
||||
if(colEl == TRUE) {
|
||||
const UChar * defaultRulesArray;
|
||||
UErrorCode intStatus = U_ZERO_ERROR;
|
||||
@ -509,8 +512,8 @@ parse(FileStream *f, const char *cp, const char *inputDir,
|
||||
uprv_free(rules);
|
||||
colEl = FALSE;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
/*uhash_put(data, tag.fChars, status);*/
|
||||
put(data, &tag, status);
|
||||
if(U_FAILURE(*status)) {
|
||||
@ -518,7 +521,6 @@ parse(FileStream *f, const char *cp, const char *inputDir,
|
||||
}
|
||||
temp = NULL;
|
||||
break;
|
||||
|
||||
/* Begin a string list */
|
||||
case eBegList:
|
||||
if(temp != NULL) {
|
||||
@ -625,6 +627,67 @@ parse(FileStream *f, const char *cp, const char *inputDir,
|
||||
if(U_FAILURE(*status)) {
|
||||
goto finish;
|
||||
}
|
||||
/* We have seen the Override tag aleady, now checks if the value is "TRUE" or "FALSE". */
|
||||
if (uprv_strcmp(cSubTag, "Override") == 0)
|
||||
{
|
||||
if (u_strncmp(token.fChars, trueValue, u_strlen(trueValue)) == 0)
|
||||
{
|
||||
colOverride = TRUE;
|
||||
} else {
|
||||
colOverride = FALSE;
|
||||
}
|
||||
}
|
||||
if (colEl && (uprv_strcmp(cSubTag, "Sequence") == 0))
|
||||
{
|
||||
const UChar * defaultRulesArray;
|
||||
UErrorCode intStatus = U_ZERO_ERROR;
|
||||
uint32_t defaultRulesArrayLength = 0;
|
||||
/* do the collation elements */
|
||||
int32_t len = 0;
|
||||
uint8_t *binColData = NULL;
|
||||
UCollator *coll = NULL;
|
||||
UChar *rules = NULL;
|
||||
struct UString newTag;
|
||||
|
||||
if (colOverride == FALSE)
|
||||
{
|
||||
defaultRulesArray = ucol_getDefaultRulesArray(&defaultRulesArrayLength);
|
||||
rules = uprv_malloc(sizeof(defaultRulesArray[0])*(defaultRulesArrayLength + token.fLength));
|
||||
uprv_memcpy(rules, defaultRulesArray, defaultRulesArrayLength*sizeof(defaultRulesArray[0]));
|
||||
uprv_memcpy(rules + defaultRulesArrayLength, token.fChars, token.fLength*sizeof(token.fChars[0]));
|
||||
|
||||
coll = ucol_openRules(rules, defaultRulesArrayLength + token.fLength, UCOL_DECOMP_CAN, 0, &intStatus);
|
||||
} else {
|
||||
coll = ucol_openRules(token.fChars, token.fLength, UCOL_DECOMP_CAN, 0, &intStatus);
|
||||
}
|
||||
|
||||
ucol_setNormalization(coll, UCOL_NO_NORMALIZATION);
|
||||
|
||||
if(U_SUCCESS(intStatus) && coll !=NULL) {
|
||||
binColData = ucol_cloneRuleData(coll, &len, &intStatus);
|
||||
if(U_SUCCESS(*status) && data != NULL) {
|
||||
temp1 = bin_open(bundle, "%%Collation", len, binColData, status);
|
||||
table_add(rootTable, temp1, status);
|
||||
uprv_free(binColData);
|
||||
}
|
||||
ucol_close(coll);
|
||||
} else {
|
||||
setErrorText("Warning: %%Collation could not be constructed from CollationElements - check context!");
|
||||
}
|
||||
uprv_free(rules);
|
||||
colEl = FALSE;
|
||||
colOverride = FALSE;
|
||||
intStatus = U_ZERO_ERROR;
|
||||
ustr_initChars(&newTag, "CollationElements", -1, &intStatus);
|
||||
if(U_FAILURE(intStatus)) {
|
||||
goto finish;
|
||||
}
|
||||
put(data, &newTag, &intStatus);
|
||||
ustr_deinit(&newTag);
|
||||
if(U_FAILURE(intStatus)) {
|
||||
goto finish;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
/* Record the last string as the subtag */
|
||||
|
||||
@ -17,6 +17,7 @@
|
||||
|
||||
#include "ustr.h"
|
||||
#include "cmemory.h"
|
||||
#include "cstring.h"
|
||||
|
||||
/* Protos */
|
||||
static void ustr_resize(struct UString *s, int32_t len, UErrorCode *status);
|
||||
@ -31,6 +32,30 @@ ustr_init(struct UString *s)
|
||||
s->fLength = s->fCapacity = 0;
|
||||
}
|
||||
|
||||
void
|
||||
ustr_initChars(struct UString *s, const char* source, int32_t length, UErrorCode *status)
|
||||
{
|
||||
int i = 0;
|
||||
if (U_FAILURE(*status)) return;
|
||||
s->fChars = 0;
|
||||
s->fLength = s->fCapacity = 0;
|
||||
if (length == -1) length = uprv_strlen(source);
|
||||
if(s->fCapacity < length) {
|
||||
ustr_resize(s, ALLOCATION(length), status);
|
||||
if(U_FAILURE(*status)) return;
|
||||
}
|
||||
for (; i < length; i++)
|
||||
{
|
||||
#if U_CHARSET_FAMILY==U_ASCII_FAMILY
|
||||
ustr_ucat(s, (UChar)(uint8_t)(source[i]), status);
|
||||
#elif U_CHARSET_FAMILY==U_EBCDIC_FAMILY
|
||||
ustr_ucat(s, (UChar)asciiFromEbcdic[(uint8_t)(*cs++)], status);
|
||||
#else
|
||||
# error U_CHARSET_FAMILY is not valid
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
ustr_deinit(struct UString *s)
|
||||
{
|
||||
|
||||
@ -29,6 +29,9 @@ struct UString {
|
||||
|
||||
void ustr_init(struct UString *s);
|
||||
|
||||
void
|
||||
ustr_initChars(struct UString *s, const char* source, int32_t length, UErrorCode *status);
|
||||
|
||||
void ustr_deinit(struct UString *s);
|
||||
|
||||
void ustr_setlen(struct UString *s, int32_t len, UErrorCode *status);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user