X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=languages%2Fdata%2FCrhExceptions.php;h=fcba6dc1dc0726244c7928fe59724b9eb776a9c0;hb=32e04d6148b02352fdee4f431f81450487cfd9a3;hp=c7592205a08f3faa4d79f6b401520dd928bc3dd1;hpb=97402532d48de203925a850a4afa2d8f43e3dd9f;p=lhc%2Fweb%2Fwiklou.git

diff --git a/languages/data/CrhExceptions.php b/languages/data/CrhExceptions.php
index c7592205a0..fcba6dc1dc 100644
--- a/languages/data/CrhExceptions.php
+++ b/languages/data/CrhExceptions.php
@@ -126,7 +126,6 @@ class CrhExceptions {
 		'beyude' => 'бейуде', 'beyüde' => 'бейуде',
 		'curat' => 'джурьат', 'cürat' => 'джурьат',
 		'mesul' => 'месуль', 'mesül' => 'месуль',
-		'yetsin' => 'етсин', 'etsin' => 'етсин',
 	];
 
 	# map Cyrillic to Latin and back, simple string match only (no regex)
@@ -367,7 +366,7 @@ class CrhExceptions {
 		'козь' => 'köz', '-юнджи' => '-ünci', '-юнджиде' => '-üncide', '-юнджиден' => '-ünciden',
 
 		# originally L2C, here swapped
-		'етсин' => 'etsin', 'льная' => 'lnaya', 'льное' => 'lnoye', 'льный' => 'lnıy', 'льний' => 'lniy',
+		'льная' => 'lnaya', 'льное' => 'lnoye', 'льный' => 'lnıy', 'льний' => 'lniy',
 		'льская' => 'lskaya', 'льский' => 'lskiy', 'льское' => 'lskoye', 'ополь' => 'opol',
 		'щее' => 'şçeye', 'щий' => 'şçiy', 'щая' => 'şçaya', 'цепс' => 'tseps',
 
@@ -389,8 +388,8 @@ class CrhExceptions {
 		'му([иэИЭ])' => 'mü$1',
 
 		# originally L2C, here swapped
-		'роль$1' => 'rol([^ü])',
-		'усть$1' => 'üst([^ü])',
+		'роль$1' => 'rol([^ü]|'.self::WB.')',
+		'усть$1' => 'üst([^ü]|'.self::WB.')',
 
 		# more prefixes
 		'ком-кок' => 'köm-kök',
@@ -460,6 +459,10 @@ class CrhExceptions {
 			'/'.self::WB.'Джонкю'.self::WB.'/u' => 'Cönkü',
 			'/'.self::WB.'ДЖОНКЮ'.self::WB.'/u' => 'CÖNKÜ',
 
+			'/'.self::WB.'куркчи/u' => 'kürkçi',
+			'/'.self::WB.'Куркчи/u' => 'Kürkçi',
+			'/'.self::WB.'КУРКЧИ/u' => 'KÜRKÇI',
+
 			'/'.self::WB.'устке'.self::WB.'/u' => 'üstke',
 			'/'.self::WB.'Устке'.self::WB.'/u' => 'Üstke',
 			'/'.self::WB.'УСТКЕ'.self::WB.'/u' => 'ÜSTKE',
@@ -615,13 +618,21 @@ class CrhExceptions {
 			'/'.self::WB.'Mer'.self::WB.'/u' => 'Мэр',
 			'/'.self::WB.'MER'.self::WB.'/u' => 'МЭР',
 
-			'/'.self::WB.'джонк/u' => 'cönk',
-			'/'.self::WB.'Джонк/u' => 'Cönk',
-			'/'.self::WB.'ДЖОНК/u' => 'CÖNK',
+			'/'.self::WB.'cönk/u' => 'джонк',
+			'/'.self::WB.'Cönk/u' => 'Джонк',
+			'/'.self::WB.'CÖNK/u' => 'ДЖОНК',
 
-			'/'.self::WB.'куркчи/u' => 'kürkçi',
-			'/'.self::WB.'Куркчи/u' => 'Kürkçi',
-			'/'.self::WB.'КУРКЧИ/u' => 'KÜRKÇI',
+			# (y)etsin -> етсин/этсин
+			# note that target starts with CYRILLIC е/Е!
+			'/yetsin/u' => 'етсин',
+			'/Yetsin/u' => 'Етсин',
+			'/YETSİN/u' => 'ЕТСИН',
+
+			# note that target starts with LATIN e/E!
+			# (other transformations will determine CYRILLIC е/э as needed)
+			'/etsin/u' => 'eтсин',
+			'/Etsin/u' => 'Eтсин',
+			'/ETSİN/u' => 'EТСИН',
 
 			# буква Ё - первый заход
 			# расставляем Ь после согласных
@@ -666,10 +677,6 @@ class CrhExceptions {
 			'/(['.Crh::L_F.'])l(['.Crh::L_CONS_LC.']|'.self::WB.')/u' => '$1ль$2',
 			'/(['.Crh::L_F_UC.'])L(['.Crh::L_CONS.']|'.self::WB.')/u' => '$1ЛЬ$2',
 
-			'/etsin'.self::WB.'/u' => 'етсин',
-			'/Etsin'.self::WB.'/u' => 'Етсин',
-			'/ETSİN'.self::WB.'/u' => 'ЕТСИН',
-
 			# относятся к началу слова
 			'/'.self::WB.'ts/u' => 'ц',
 			'/'.self::WB.'T[sS]/u' => 'Ц',