ICU-22389 Cherry-pick from main to maint-73: CLDR release-43-1-beta2 to ICU main

(cherry picked from commit 388b768262)
This commit is contained in:
Peter Edberg 2023-06-07 09:01:19 -07:00
parent 22d4ba1037
commit bc9909bacb
8 changed files with 406 additions and 396 deletions

File diff suppressed because it is too large Load diff

View file

@ -29,7 +29,10 @@ $descender = ˌ;
$umlaut = \u0308 ;
$macron = \u0304 ;
$breveBelow = \u032E;
# move up so not masked
$ignoreForCase = [‧[:Mn:][:Me:]] ;
$lower = [[:Latin:][:Cyrillic:] & [:Ll:]];
$beforeLower = $ignoreForCase * $lower ;
# Move up so not masked
я ↔ a $hat ; # CYRILLIC SMALL LETTER YA
Я ↔ A $hat ; # CYRILLIC CAPITAL LETTER YA
ч ↔ c $caron ; # CYRILLIC SMALL LETTER CHE
@ -66,6 +69,13 @@ $breveBelow = \u032E;
Ћ ↔ C $acute ; # CYRILLIC CAPITAL LETTER TSHE
џ ↔ d $hat ; # CYRILLIC SMALL LETTER DZHE
Џ ↔ D $hat ; # CYRILLIC CAPITAL LETTER DZHE
х ↔ kh ; # CYRILLIC SMALL LETTER HA
Х } $beforeLower ↔ Kh ;
Х ↔ KH; # CYRILLIC CAPITAL LETTER HA
# Insert separator between K and characters that result in h
# And delete going the other way
[Kk] { } [Һһ] → ‧ ;
← ‧ ;
# Normal order
а ↔ a ; # CYRILLIC SMALL LETTER A
А ↔ A ; # CYRILLIC CAPITAL LETTER A
@ -160,8 +170,6 @@ $breveBelow = \u032E;
# Ѹ ↔ XXX ; # CYRILLIC CAPITAL LETTER UK
ф ↔ f ; # CYRILLIC SMALL LETTER EF
Ф ↔ F ; # CYRILLIC CAPITAL LETTER EF
х ↔ h$breveBelow ; # CYRILLIC SMALL LETTER HA
Х ↔ H$breveBelow; # CYRILLIC CAPITAL LETTER HA
#https://www.eki.ee/wgrs/v2_2/rom2_az.htm
һ ↔ h ; # CYRILLIC SMALL LETTER SHHA
Һ ↔ H ; # CYRILLIC CAPITAL LETTER SHHA
@ -276,7 +284,7 @@ $ignore = [[:Mark:]''] * ;
| ks ← x ;
:: NFC (NFD) ;
# note: a global filter is more efficient, but MUST include all source chars!!
# :: ([\u0000-\u007E ʹ ʺ [:Cyrillic:] [:Latin:] [:nonspacing mark:]]);
# :: ([\u0000-\u007E ʹ ʺ [:Cyrillic:] [:Latin:] [:nonspacing mark:]]);
# MINIMAL FILTER: Latin-Cyrillic
:: ( [ˌ\u0308A-Za-zÀ-ÏÑ-ÖÙ-Ýà-ïñ-öù-ýÿ-ĥĨ-İĴ-ķĹ-ľŃ-ňŌ-őŔ-ťŨ-žƏƠ-ơƯ-ưǍ-ǜǞ-ǣǦ-ǰǴ-ǵǸ-țȞ-ȟȦ-ȳəʹ-ʺ\u0300-\u0302\u0306-\u0307\u030C\u0326\u0331\u0340-\u0341\u0344ʹ΅-ΆΈ-ΊΌΎ-ΐά-ΰό-ώϓЀЃЌ-ЎЙйѐѓќ-ўӁ-ӂӐ-ӑӖ-ӗḀ-ẙẛẠ-ỹἂ-ἅἊ-Ἅἒ-ἕἚ-Ἕἢ-ἥἪ-Ἥἲ-ἵἺ-Ἵὂ-ὅὊ-Ὅὒ-ὕὛὝὢ-ὥὪ-Ὥὰ-ώᾂ-ᾅᾊ-ᾍᾒ-ᾕᾚ-ᾝᾢ-ᾥᾪ-ᾭᾰᾲᾴᾸᾺ-ΆῂῄῈ-Ή῍-῎ῐῒ-ΐῘῚ-Ί῝-῞ῠῢ-ΰῨῪ-Ύ῭-΅ῲῴῸ-ΏK-Å] ) ;
:: ( [ˌ\u0308A-Za-zÀ-ÏÑ-ÖÙ-Ýà-ïñ-öù-ýÿ-ĥĨ-İĴ-ķĹ-ľŃ-ňŌ-őŔ-ťŨ-žƏƠ-ơƯ-ưǍ-ǜǞ-ǣǦ-ǰǴ-ǵǸ-țȞ-ȟȦ-ȳəʹ-ʺ\u0300-\u0302\u0306-\u0307\u030C\u0326\u0331\u0340-\u0341\u0344ʹ΅-ΆΈ-ΊΌΎ-ΐά-ΰό-ώϓЀЃЌ-ЎЙйѐѓќ-ўӁ-ӂӐ-ӑӖ-ӗḀ-ẙẛẠ-ỹἂ-ἅἊ-Ἅἒ-ἕἚ-Ἕἢ-ἥἪ-Ἥἲ-ἵἺ-Ἵὂ-ὅὊ-Ὅὒ-ὕὛὝὢ-ὥὪ-Ὥὰ-ώᾂ-ᾅᾊ-ᾍᾒ-ᾕᾚ-ᾝᾢ-ᾥᾪ-ᾭᾰᾲᾴᾸᾺ-ΆῂῄῈ-Ή῍-῎ῐῒ-ΐῘῚ-Ί῝-῞ῠῢ-ΰῨῪ-Ύ῭-΅ῲῴῸ-ΏK-Å] ) ;

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d0708261eac26a431c294ae8dca6afc127bb3010fa93d24d368af872b7f60a94
size 14330489
oid sha256:e72420a1b0bc195bf6e246bdd7e9399db53b5517e54624720b2ce6ae09e7029d
size 14336061

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:48fecfd7c2bf4ece38cfbafa39528eee0179c5de2a1035467d10f932a7c91dab
oid sha256:ccae7734fba7f3051c35b4443e0365abc3d55a192c3948282562079706ed67a8
size 94829

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1df5fb8965e2fdf52e4589854122a7e577e1008d4caa5bf16d34379d2f9e7224
oid sha256:fab502d8ed5d52c6d0ebdf7cfd20fbb2849fd41d059a292ebd0586bb27888664
size 831982

View file

@ -190,4 +190,4 @@ public class DebugUtilitiesData extends Object {
},
};
}
}