5 files changed, 908 insertions, 908 deletions
diff --git a/Master/texmf-dist/xindy/modules/lang/russian/cp1251.xdy b/Master/texmf-dist/xindy/modules/lang/russian/cp1251.xdy
index 036da0bebd8..e9302639d9d 100644
--- a/Master/texmf-dist/xindy/modules/lang/russian/cp1251.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/russian/cp1251.xdy
@@ -36,34 +36,34 @@
 
 (define-rule-set "ru-alphabetize"
 
-  :rules  (("À" "€" :string)
-           ("à" "€" :string)
+  :rules  (("à" "€" :string)
+           ("À" "€" :string)
            ("Á" "" :string)
            ("á" "" :string)
            ("Â" "‚" :string)
            ("â" "‚" :string)
-           ("Ã" "ƒ" :string)
            ("ã" "ƒ" :string)
-           ("Ä" "…" :string)
+           ("Ã" "ƒ" :string)
            ("ä" "…" :string)
+           ("Ä" "…" :string)
            ("¨" "ˆ" :string)
-           ("Å" "ˆ" :string)
            ("¸" "ˆ" :string)
+           ("Å" "ˆ" :string)
            ("å" "ˆ" :string)
            ("æ" "‹" :string)
            ("Æ" "‹" :string)
-           ("Ç" "Œ" :string)
            ("ç" "Œ" :string)
-           ("È" "Ž" :string)
+           ("Ç" "Œ" :string)
            ("è" "Ž" :string)
+           ("È" "Ž" :string)
            ("É" "‘" :string)
            ("é" "‘" :string)
            ("ê" "“" :string)
            ("Ê" "“" :string)
            ("ë" "”" :string)
            ("Ë" "”" :string)
-           ("ì" "–" :string)
            ("Ì" "–" :string)
+           ("ì" "–" :string)
            ("Í" "—" :string)
            ("í" "—" :string)
            ("Î" "™" :string)
@@ -96,161 +96,161 @@
            ("Û" "¬" :string)
            ("ü" "" :string)
            ("Ü" "" :string)
-           ("Ý" "¯" :string)
            ("ý" "¯" :string)
+           ("Ý" "¯" :string)
            ("Þ" "°" :string)
            ("þ" "°" :string)
-           ("ÿ" "±" :string)
            ("ß" "±" :string)
+           ("ÿ" "±" :string)
            ))
 
 (define-rule-set "ru-resolve-diacritics"
 
-  :rules  (("õ" "¢" :string)
-           ("Ô" "¢" :string)
-           ("Ï" "¢" :string)
-           ("ê" "¢" :string)
-           ("Á" "¢" :string)
-           ("Â" "¢" :string)
-           ("ë" "¢" :string)
-           ("Î" "¢" :string)
-           ("Í" "¢" :string)
-           ("Ã" "¢" :string)
-           ("ì" "¢" :string)
-           ("Ú" "¢" :string)
-           ("Ý" "¢" :string)
+  :rules  (("í" "¢" :string)
+           ("À" "¢" :string)
+           ("ó" "¢" :string)
+           ("î" "¢" :string)
+           ("ø" "¢" :string)
+           ("ö" "¢" :string)
+           ("Û" "¢" :string)
+           ("Ø" "¢" :string)
+           ("Õ" "¢" :string)
+           ("Ò" "¢" :string)
+           ("â" "¢" :string)
+           ("é" "¢" :string)
+           ("ô" "¢" :string)
+           ("Ð" "¢" :string)
+           ("å" "¢" :string)
+           ("×" "¢" :string)
            ("ò" "¢" :string)
+           ("Ñ" "¢" :string)
+           ("û" "¢" :string)
            ("ÿ" "¢" :string)
-           ("Ö" "¢" :string)
-           ("í" "¢" :string)
-           ("ã" "¢" :string)
-           ("Ì" "¢" :string)
-           ("æ" "¢" :string)
+           ("Ô" "¢" :string)
+           ("Á" "¢" :string)
+           ("ß" "¢" :string)
+           ("Ë" "¢" :string)
            ("Ç" "¢" :string)
+           ("ð" "¢" :string)
+           ("Ã" "¢" :string)
+           ("ú" "¢" :string)
+           ("ù" "¢" :string)
            ("É" "¢" :string)
-           ("ç" "¢" :string)
-           ("È" "¢" :string)
-           ("ô" "¢" :string)
-           ("À" "¢" :string)
-           ("ñ" "¢" :string)
-           ("Ê" "¢" :string)
+           ("á" "¢" :string)
+           ("÷" "¢" :string)
+           ("Â" "¢" :string)
+           ("à" "¢" :string)
            ("Æ" "¢" :string)
-           ("Ë" "¢" :string)
-           ("Å" "¢" :string)
-           ("ø" "¢" :string)
-           ("â" "¢" :string)
+           ("È" "¢" :string)
+           ("õ" "¢" :string)
            ("Ä" "¢" :string)
-           ("ð" "¢" :string)
-           ("ú" "¢" :string)
-           ("Þ" "¢" :string)
-           ("ü" "¢" :string)
-           ("Ó" "¢" :string)
-           ("Ù" "¢" :string)
            ("ä" "¢" :string)
-           ("ù" "¢" :string)
-           ("ß" "¢" :string)
+           ("Ó" "¢" :string)
+           ("Ö" "¢" :string)
+           ("Å" "¢" :string)
+           ("ã" "¢" :string)
            ("ï" "¢" :string)
-           ("é" "¢" :string)
-           ("û" "¢" :string)
-           ("Ò" "¢" :string)
-           ("î" "¢" :string)
-           ("Ð" "¢" :string)
-           ("Ñ" "¢" :string)
-           ("ý" "¢" :string)
-           ("Û" "¢" :string)
-           ("è" "¢" :string)
-           ("Ø" "¢" :string)
-           ("å" "¢" :string)
-           ("÷" "¢" :string)
-           ("ö" "¢" :string)
-           ("Õ" "¢" :string)
            ("þ" "¢" :string)
+           ("ë" "¢" :string)
+           ("ì" "¢" :string)
+           ("ñ" "¢" :string)
+           ("Þ" "¢" :string)
+           ("Ú" "¢" :string)
+           ("Ï" "¢" :string)
+           ("ý" "¢" :string)
+           ("æ" "¢" :string)
            ("Ü" "¢" :string)
-           ("à" "¢" :string)
-           ("ó" "¢" :string)
-           ("á" "¢" :string)
-           ("×" "¢" :string)
+           ("Ì" "¢" :string)
+           ("Ù" "¢" :string)
+           ("ü" "¢" :string)
+           ("Í" "¢" :string)
+           ("Î" "¢" :string)
+           ("Ý" "¢" :string)
+           ("ç" "¢" :string)
+           ("Ê" "¢" :string)
+           ("ê" "¢" :string)
+           ("è" "¢" :string)
            ("¨" "£" :string)
            ("¸" "£" :string)
            ))
 
 (define-rule-set "ru-resolve-case"
 
-  :rules  (("¨" "8" :string)
-           ("Ô" "8" :string)
+  :rules  (("Ý" "8" :string)
+           ("Ê" "8" :string)
+           ("Ü" "8" :string)
+           ("Ì" "8" :string)
            ("Ï" "8" :string)
-           ("Á" "8" :string)
-           ("Â" "8" :string)
-           ("Î" "8" :string)
            ("Í" "8" :string)
-           ("Ã" "8" :string)
+           ("Î" "8" :string)
+           ("Ù" "8" :string)
+           ("¨" "8" :string)
            ("Ú" "8" :string)
-           ("Ý" "8" :string)
+           ("Þ" "8" :string)
+           ("Ä" "8" :string)
+           ("Å" "8" :string)
+           ("Ó" "8" :string)
            ("Ö" "8" :string)
-           ("Ì" "8" :string)
-           ("Ç" "8" :string)
            ("É" "8" :string)
+           ("Â" "8" :string)
+           ("Ã" "8" :string)
            ("È" "8" :string)
-           ("À" "8" :string)
-           ("Ê" "8" :string)
            ("Æ" "8" :string)
-           ("Ë" "8" :string)
-           ("Å" "8" :string)
-           ("Ä" "8" :string)
-           ("Þ" "8" :string)
-           ("Ó" "8" :string)
-           ("Ù" "8" :string)
+           ("Á" "8" :string)
            ("ß" "8" :string)
-           ("Ò" "8" :string)
-           ("Ð" "8" :string)
-           ("Ñ" "8" :string)
+           ("Ë" "8" :string)
+           ("Ç" "8" :string)
            ("Û" "8" :string)
            ("Ø" "8" :string)
            ("Õ" "8" :string)
-           ("Ü" "8" :string)
+           ("Ò" "8" :string)
+           ("Ô" "8" :string)
+           ("Ð" "8" :string)
            ("×" "8" :string)
-           ("õ" "9" :string)
-           ("ê" "9" :string)
-           ("ë" "9" :string)
-           ("ì" "9" :string)
-           ("ò" "9" :string)
-           ("ÿ" "9" :string)
-           ("í" "9" :string)
-           ("ã" "9" :string)
-           ("æ" "9" :string)
+           ("Ñ" "8" :string)
+           ("À" "8" :string)
            ("ç" "9" :string)
-           ("ô" "9" :string)
-           ("ñ" "9" :string)
-           ("ø" "9" :string)
-           ("â" "9" :string)
-           ("ð" "9" :string)
            ("¸" "9" :string)
-           ("ú" "9" :string)
+           ("ê" "9" :string)
+           ("è" "9" :string)
+           ("æ" "9" :string)
+           ("ý" "9" :string)
            ("ü" "9" :string)
+           ("þ" "9" :string)
+           ("ì" "9" :string)
+           ("ë" "9" :string)
+           ("ï" "9" :string)
+           ("ñ" "9" :string)
+           ("õ" "9" :string)
+           ("ã" "9" :string)
            ("ä" "9" :string)
            ("ù" "9" :string)
-           ("ï" "9" :string)
+           ("á" "9" :string)
+           ("÷" "9" :string)
+           ("ú" "9" :string)
+           ("à" "9" :string)
+           ("ð" "9" :string)
+           ("â" "9" :string)
            ("é" "9" :string)
+           ("ô" "9" :string)
+           ("ö" "9" :string)
            ("û" "9" :string)
-           ("î" "9" :string)
-           ("ý" "9" :string)
-           ("è" "9" :string)
+           ("ÿ" "9" :string)
            ("å" "9" :string)
-           ("÷" "9" :string)
-           ("ö" "9" :string)
-           ("þ" "9" :string)
-           ("à" "9" :string)
+           ("ò" "9" :string)
+           ("í" "9" :string)
+           ("ø" "9" :string)
            ("ó" "9" :string)
-           ("á" "9" :string)
+           ("î" "9" :string)
            ))
 
 (define-rule-set "ru-ignore-special"
 
-  :rules  (("-" "" :string)
+  :rules  (("'" "" :string)
+           ("." "" :string)
            ("!" "" :string)
-           ("'" "" :string)
            ("?" "" :string)
-           ("." "" :string)
+           ("-" "" :string)
            ))
 
 (define-rule-set "ru-resolve-special"
@@ -258,72 +258,72 @@
   :rules  (("?" "¡" :string)
            ("!" "¢" :string)
            ("." "£" :string)
-           ("õ" "¤" :string)
-           ("¨" "¤" :string)
+           ("ø" "¤" :string)
+           ("ó" "¤" :string)
+           ("î" "¤" :string)
+           ("À" "¤" :string)
+           ("í" "¤" :string)
+           ("û" "¤" :string)
            ("Ô" "¤" :string)
-           ("Ï" "¤" :string)
-           ("ê" "¤" :string)
-           ("Á" "¤" :string)
-           ("Â" "¤" :string)
-           ("ë" "¤" :string)
-           ("Î" "¤" :string)
-           ("Í" "¤" :string)
-           ("Ã" "¤" :string)
-           ("ì" "¤" :string)
-           ("Ú" "¤" :string)
-           ("Ý" "¤" :string)
-           ("ò" "¤" :string)
            ("ÿ" "¤" :string)
-           ("Ö" "¤" :string)
-           ("í" "¤" :string)
-           ("ã" "¤" :string)
-           ("Ì" "¤" :string)
-           ("æ" "¤" :string)
+           ("×" "¤" :string)
+           ("ò" "¤" :string)
+           ("å" "¤" :string)
+           ("Ð" "¤" :string)
+           ("Ñ" "¤" :string)
+           ("é" "¤" :string)
+           ("â" "¤" :string)
+           ("ô" "¤" :string)
+           ("Û" "¤" :string)
+           ("ö" "¤" :string)
+           ("Ò" "¤" :string)
+           ("Õ" "¤" :string)
+           ("Ø" "¤" :string)
+           ("ð" "¤" :string)
            ("Ç" "¤" :string)
-           ("É" "¤" :string)
-           ("ç" "¤" :string)
+           ("Ë" "¤" :string)
+           ("Á" "¤" :string)
+           ("ß" "¤" :string)
+           ("à" "¤" :string)
            ("È" "¤" :string)
-           ("ô" "¤" :string)
-           ("À" "¤" :string)
-           ("ñ" "¤" :string)
-           ("Ê" "¤" :string)
            ("Æ" "¤" :string)
-           ("Ë" "¤" :string)
+           ("ù" "¤" :string)
+           ("Â" "¤" :string)
+           ("÷" "¤" :string)
+           ("á" "¤" :string)
+           ("É" "¤" :string)
+           ("Ã" "¤" :string)
+           ("ú" "¤" :string)
+           ("ã" "¤" :string)
            ("Å" "¤" :string)
-           ("ø" "¤" :string)
-           ("â" "¤" :string)
+           ("Ó" "¤" :string)
+           ("ä" "¤" :string)
+           ("Ö" "¤" :string)
            ("Ä" "¤" :string)
-           ("ð" "¤" :string)
-           ("¸" "¤" :string)
-           ("ú" "¤" :string)
+           ("õ" "¤" :string)
+           ("Ú" "¤" :string)
+           ("ñ" "¤" :string)
            ("Þ" "¤" :string)
+           ("þ" "¤" :string)
+           ("ì" "¤" :string)
+           ("ë" "¤" :string)
+           ("ï" "¤" :string)
+           ("Í" "¤" :string)
+           ("Î" "¤" :string)
            ("ü" "¤" :string)
-           ("Ó" "¤" :string)
+           ("¨" "¤" :string)
            ("Ù" "¤" :string)
-           ("ä" "¤" :string)
-           ("ù" "¤" :string)
-           ("ß" "¤" :string)
-           ("ï" "¤" :string)
-           ("é" "¤" :string)
-           ("û" "¤" :string)
-           ("Ò" "¤" :string)
-           ("î" "¤" :string)
-           ("Ð" "¤" :string)
-           ("Ñ" "¤" :string)
+           ("Ü" "¤" :string)
+           ("æ" "¤" :string)
+           ("Ì" "¤" :string)
+           ("Ï" "¤" :string)
            ("ý" "¤" :string)
-           ("Û" "¤" :string)
+           ("¸" "¤" :string)
+           ("ê" "¤" :string)
            ("è" "¤" :string)
-           ("Ø" "¤" :string)
-           ("å" "¤" :string)
-           ("÷" "¤" :string)
-           ("ö" "¤" :string)
-           ("Õ" "¤" :string)
-           ("þ" "¤" :string)
-           ("Ü" "¤" :string)
-           ("à" "¤" :string)
-           ("ó" "¤" :string)
-           ("á" "¤" :string)
-           ("×" "¤" :string)
+           ("Ý" "¤" :string)
+           ("ç" "¤" :string)
+           ("Ê" "¤" :string)
            ("-" "¥" :string)
            ("'" "¦" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/russian/iso88595.xdy b/Master/texmf-dist/xindy/modules/lang/russian/iso88595.xdy
index 59d95bad28a..86d93e19f0b 100644
--- a/Master/texmf-dist/xindy/modules/lang/russian/iso88595.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/russian/iso88595.xdy
@@ -38,34 +38,34 @@
 
   :rules  (("Ð" "€" :string)
            ("°" "€" :string)
-           ("±" "" :string)
            ("Ñ" "" :string)
-           ("²" "‚" :string)
+           ("±" "" :string)
            ("Ò" "‚" :string)
-           ("³" "ƒ" :string)
+           ("²" "‚" :string)
            ("Ó" "ƒ" :string)
+           ("³" "ƒ" :string)
            ("Ô" "…" :string)
            ("´" "…" :string)
+           ("Õ" "ˆ" :string)
+           ("ñ" "ˆ" :string)
            ("µ" "ˆ" :string)
            ("¡" "ˆ" :string)
-           ("ñ" "ˆ" :string)
-           ("Õ" "ˆ" :string)
-           ("Ö" "‹" :string)
            ("¶" "‹" :string)
+           ("Ö" "‹" :string)
            ("·" "Œ" :string)
            ("×" "Œ" :string)
            ("¸" "Ž" :string)
            ("Ø" "Ž" :string)
-           ("Ù" "‘" :string)
            ("¹" "‘" :string)
+           ("Ù" "‘" :string)
            ("Ú" "“" :string)
            ("º" "“" :string)
-           ("»" "”" :string)
            ("Û" "”" :string)
+           ("»" "”" :string)
            ("¼" "–" :string)
            ("Ü" "–" :string)
-           ("Ý" "—" :string)
            ("½" "—" :string)
+           ("Ý" "—" :string)
            ("Þ" "™" :string)
            ("¾" "™" :string)
            ("ß" "›" :string)
@@ -80,22 +80,22 @@
            ("ã" "¡" :string)
            ("Ä" "¤" :string)
            ("ä" "¤" :string)
-           ("Å" "¥" :string)
            ("å" "¥" :string)
+           ("Å" "¥" :string)
            ("æ" "¦" :string)
            ("Æ" "¦" :string)
-           ("Ç" "§" :string)
            ("ç" "§" :string)
-           ("È" "©" :string)
+           ("Ç" "§" :string)
            ("è" "©" :string)
-           ("É" "ª" :string)
+           ("È" "©" :string)
            ("é" "ª" :string)
-           ("ê" "«" :string)
+           ("É" "ª" :string)
            ("Ê" "«" :string)
-           ("ë" "¬" :string)
+           ("ê" "«" :string)
            ("Ë" "¬" :string)
-           ("ì" "" :string)
+           ("ë" "¬" :string)
            ("Ì" "" :string)
+           ("ì" "" :string)
            ("Í" "¯" :string)
            ("í" "¯" :string)
            ("Î" "°" :string)
@@ -106,151 +106,151 @@
 
 (define-rule-set "ru-resolve-diacritics"
 
-  :rules  (("Ô" "¢" :string)
-           ("Ï" "¢" :string)
-           ("ê" "¢" :string)
-           ("Á" "¢" :string)
+  :rules  (("µ" "¢" :string)
+           ("Ê" "¢" :string)
+           ("Î" "¢" :string)
+           ("»" "¢" :string)
            ("Â" "¢" :string)
-           ("²" "¢" :string)
+           ("ç" "¢" :string)
+           ("¶" "¢" :string)
            ("ë" "¢" :string)
-           ("Î" "¢" :string)
+           ("·" "¢" :string)
+           ("é" "¢" :string)
+           ("Ñ" "¢" :string)
+           ("¿" "¢" :string)
+           ("Ä" "¢" :string)
+           ("æ" "¢" :string)
+           ("Ú" "¢" :string)
+           ("Õ" "¢" :string)
+           ("Û" "¢" :string)
+           ("Ó" "¢" :string)
+           ("½" "¢" :string)
+           ("º" "¢" :string)
+           ("Ü" "¢" :string)
+           ("¹" "¢" :string)
+           ("¼" "¢" :string)
+           ("è" "¢" :string)
+           ("Æ" "¢" :string)
+           ("ß" "¢" :string)
+           ("Á" "¢" :string)
            ("Í" "¢" :string)
-           ("Ã" "¢" :string)
+           ("Ë" "¢" :string)
+           ("Ò" "¢" :string)
+           ("Ô" "¢" :string)
+           ("¾" "¢" :string)
+           ("í" "¢" :string)
+           ("Ï" "¢" :string)
            ("´" "¢" :string)
-           ("ì" "¢" :string)
-           ("»" "¢" :string)
-           ("±" "¢" :string)
-           ("Ú" "¢" :string)
-           ("Ý" "¢" :string)
+           ("Å" "¢" :string)
            ("Ö" "¢" :string)
-           ("í" "¢" :string)
-           ("ã" "¢" :string)
-           ("Ì" "¢" :string)
-           ("æ" "¢" :string)
-           ("µ" "¢" :string)
-           ("Ç" "¢" :string)
            ("É" "¢" :string)
-           ("³" "¢" :string)
-           ("ç" "¢" :string)
+           ("Ý" "¢" :string)
+           ("à" "¢" :string)
+           ("ï" "¢" :string)
+           ("ê" "¢" :string)
+           ("Ç" "¢" :string)
+           ("ä" "¢" :string)
+           ("ã" "¢" :string)
+           ("²" "¢" :string)
+           ("×" "¢" :string)
+           ("Ð" "¢" :string)
            ("È" "¢" :string)
-           ("¼" "¢" :string)
            ("À" "¢" :string)
-           ("½" "¢" :string)
-           ("Ê" "¢" :string)
-           ("Æ" "¢" :string)
-           ("Ë" "¢" :string)
-           ("Å" "¢" :string)
+           ("Ã" "¢" :string)
+           ("³" "¢" :string)
            ("â" "¢" :string)
-           ("Ä" "¢" :string)
-           ("¸" "¢" :string)
-           ("Þ" "¢" :string)
-           ("Ó" "¢" :string)
-           ("Ù" "¢" :string)
-           ("ä" "¢" :string)
-           ("¹" "¢" :string)
-           ("ß" "¢" :string)
-           ("ï" "¢" :string)
-           ("é" "¢" :string)
-           ("Ò" "¢" :string)
+           ("å" "¢" :string)
+           ("±" "¢" :string)
            ("î" "¢" :string)
-           ("¶" "¢" :string)
-           ("Ð" "¢" :string)
-           ("·" "¢" :string)
-           ("Ñ" "¢" :string)
-           ("¿" "¢" :string)
-           ("Û" "¢" :string)
-           ("è" "¢" :string)
-           ("º" "¢" :string)
+           ("ì" "¢" :string)
            ("°" "¢" :string)
-           ("å" "¢" :string)
+           ("Þ" "¢" :string)
+           ("Ì" "¢" :string)
+           ("Ù" "¢" :string)
            ("Ø" "¢" :string)
-           ("¾" "¢" :string)
-           ("Õ" "¢" :string)
-           ("à" "¢" :string)
-           ("Ü" "¢" :string)
            ("á" "¢" :string)
-           ("×" "¢" :string)
-           ("¡" "£" :string)
+           ("¸" "¢" :string)
            ("ñ" "£" :string)
+           ("¡" "£" :string)
            ))
 
 (define-rule-set "ru-resolve-case"
 
-  :rules  (("Ï" "8" :string)
+  :rules  (("Ä" "8" :string)
+           ("¼" "8" :string)
+           ("º" "8" :string)
+           ("¹" "8" :string)
+           ("½" "8" :string)
            ("Á" "8" :string)
-           ("Â" "8" :string)
-           ("²" "8" :string)
-           ("Î" "8" :string)
            ("Í" "8" :string)
-           ("Ã" "8" :string)
-           ("´" "8" :string)
-           ("»" "8" :string)
-           ("±" "8" :string)
-           ("Ì" "8" :string)
+           ("Ë" "8" :string)
+           ("Æ" "8" :string)
+           ("Î" "8" :string)
            ("µ" "8" :string)
-           ("Ç" "8" :string)
-           ("É" "8" :string)
-           ("³" "8" :string)
-           ("¡" "8" :string)
-           ("È" "8" :string)
-           ("¼" "8" :string)
-           ("À" "8" :string)
-           ("½" "8" :string)
            ("Ê" "8" :string)
-           ("Æ" "8" :string)
-           ("Ë" "8" :string)
-           ("Å" "8" :string)
-           ("Ä" "8" :string)
-           ("¸" "8" :string)
-           ("¹" "8" :string)
+           ("Â" "8" :string)
+           ("»" "8" :string)
            ("¶" "8" :string)
-           ("·" "8" :string)
            ("¿" "8" :string)
-           ("º" "8" :string)
+           ("·" "8" :string)
+           ("¡" "8" :string)
+           ("²" "8" :string)
+           ("³" "8" :string)
+           ("Ã" "8" :string)
+           ("À" "8" :string)
+           ("È" "8" :string)
            ("°" "8" :string)
+           ("±" "8" :string)
+           ("¸" "8" :string)
+           ("Ì" "8" :string)
+           ("Ï" "8" :string)
            ("¾" "8" :string)
-           ("Ô" "9" :string)
-           ("ê" "9" :string)
-           ("ë" "9" :string)
-           ("ì" "9" :string)
+           ("Å" "8" :string)
+           ("´" "8" :string)
+           ("É" "8" :string)
+           ("Ç" "8" :string)
            ("Ú" "9" :string)
-           ("Ý" "9" :string)
-           ("Ö" "9" :string)
-           ("í" "9" :string)
-           ("ã" "9" :string)
-           ("æ" "9" :string)
-           ("ç" "9" :string)
            ("ñ" "9" :string)
-           ("â" "9" :string)
-           ("Þ" "9" :string)
+           ("æ" "9" :string)
+           ("Û" "9" :string)
+           ("Õ" "9" :string)
+           ("è" "9" :string)
+           ("Ü" "9" :string)
            ("Ó" "9" :string)
-           ("Ù" "9" :string)
-           ("ä" "9" :string)
+           ("Ô" "9" :string)
+           ("Ò" "9" :string)
            ("ß" "9" :string)
-           ("ï" "9" :string)
+           ("ç" "9" :string)
+           ("ë" "9" :string)
+           ("Ñ" "9" :string)
            ("é" "9" :string)
-           ("Ò" "9" :string)
-           ("î" "9" :string)
            ("Ð" "9" :string)
-           ("Ñ" "9" :string)
-           ("Û" "9" :string)
-           ("è" "9" :string)
+           ("×" "9" :string)
+           ("ã" "9" :string)
+           ("ì" "9" :string)
+           ("î" "9" :string)
+           ("â" "9" :string)
            ("å" "9" :string)
+           ("á" "9" :string)
            ("Ø" "9" :string)
-           ("Õ" "9" :string)
+           ("Þ" "9" :string)
+           ("Ù" "9" :string)
+           ("í" "9" :string)
            ("à" "9" :string)
-           ("Ü" "9" :string)
-           ("á" "9" :string)
-           ("×" "9" :string)
+           ("Ý" "9" :string)
+           ("Ö" "9" :string)
+           ("ä" "9" :string)
+           ("ê" "9" :string)
+           ("ï" "9" :string)
            ))
 
 (define-rule-set "ru-ignore-special"
 
-  :rules  (("-" "" :string)
+  :rules  (("'" "" :string)
            ("!" "" :string)
-           ("'" "" :string)
-           ("?" "" :string)
            ("." "" :string)
+           ("-" "" :string)
+           ("?" "" :string)
            ))
 
 (define-rule-set "ru-resolve-special"
@@ -259,71 +259,71 @@
            ("!" "¢" :string)
            ("." "£" :string)
            ("Ô" "¤" :string)
-           ("Ï" "¤" :string)
-           ("ê" "¤" :string)
            ("Á" "¤" :string)
-           ("Â" "¤" :string)
-           ("²" "¤" :string)
-           ("ë" "¤" :string)
-           ("Î" "¤" :string)
            ("Í" "¤" :string)
-           ("Ã" "¤" :string)
-           ("´" "¤" :string)
-           ("ì" "¤" :string)
-           ("»" "¤" :string)
-           ("±" "¤" :string)
+           ("Ë" "¤" :string)
+           ("Ò" "¤" :string)
+           ("ß" "¤" :string)
+           ("Æ" "¤" :string)
+           ("è" "¤" :string)
+           ("¼" "¤" :string)
+           ("Ü" "¤" :string)
+           ("º" "¤" :string)
+           ("¹" "¤" :string)
+           ("½" "¤" :string)
+           ("Ó" "¤" :string)
+           ("Û" "¤" :string)
+           ("Õ" "¤" :string)
            ("Ú" "¤" :string)
-           ("Ý" "¤" :string)
-           ("Ö" "¤" :string)
-           ("í" "¤" :string)
-           ("ã" "¤" :string)
-           ("Ì" "¤" :string)
            ("æ" "¤" :string)
-           ("µ" "¤" :string)
-           ("Ç" "¤" :string)
-           ("É" "¤" :string)
-           ("³" "¤" :string)
-           ("¡" "¤" :string)
-           ("ç" "¤" :string)
-           ("È" "¤" :string)
-           ("¼" "¤" :string)
-           ("À" "¤" :string)
            ("ñ" "¤" :string)
-           ("½" "¤" :string)
-           ("Ê" "¤" :string)
-           ("Æ" "¤" :string)
-           ("Ë" "¤" :string)
-           ("Å" "¤" :string)
-           ("â" "¤" :string)
            ("Ä" "¤" :string)
-           ("¸" "¤" :string)
-           ("Þ" "¤" :string)
-           ("Ó" "¤" :string)
-           ("Ù" "¤" :string)
-           ("ä" "¤" :string)
-           ("¹" "¤" :string)
-           ("ß" "¤" :string)
-           ("ï" "¤" :string)
+           ("¿" "¤" :string)
+           ("Ñ" "¤" :string)
            ("é" "¤" :string)
-           ("Ò" "¤" :string)
-           ("î" "¤" :string)
-           ("¶" "¤" :string)
-           ("Ð" "¤" :string)
            ("·" "¤" :string)
-           ("Ñ" "¤" :string)
-           ("¿" "¤" :string)
-           ("Û" "¤" :string)
-           ("è" "¤" :string)
-           ("º" "¤" :string)
+           ("ë" "¤" :string)
+           ("¶" "¤" :string)
+           ("ç" "¤" :string)
+           ("Â" "¤" :string)
+           ("»" "¤" :string)
+           ("Î" "¤" :string)
+           ("Ê" "¤" :string)
+           ("µ" "¤" :string)
+           ("¸" "¤" :string)
+           ("á" "¤" :string)
+           ("Ø" "¤" :string)
+           ("Ì" "¤" :string)
+           ("Ù" "¤" :string)
+           ("Þ" "¤" :string)
+           ("ì" "¤" :string)
            ("°" "¤" :string)
+           ("î" "¤" :string)
+           ("±" "¤" :string)
            ("å" "¤" :string)
-           ("Ø" "¤" :string)
-           ("¾" "¤" :string)
-           ("Õ" "¤" :string)
-           ("à" "¤" :string)
-           ("Ü" "¤" :string)
-           ("á" "¤" :string)
+           ("â" "¤" :string)
+           ("³" "¤" :string)
+           ("Ã" "¤" :string)
+           ("À" "¤" :string)
+           ("È" "¤" :string)
+           ("¡" "¤" :string)
+           ("Ð" "¤" :string)
            ("×" "¤" :string)
+           ("²" "¤" :string)
+           ("ã" "¤" :string)
+           ("ä" "¤" :string)
+           ("Ç" "¤" :string)
+           ("ê" "¤" :string)
+           ("ï" "¤" :string)
+           ("à" "¤" :string)
+           ("Ý" "¤" :string)
+           ("É" "¤" :string)
+           ("Ö" "¤" :string)
+           ("Å" "¤" :string)
+           ("´" "¤" :string)
+           ("Ï" "¤" :string)
+           ("í" "¤" :string)
+           ("¾" "¤" :string)
            ("-" "¥" :string)
            ("'" "¦" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/russian/koi8-r.xdy b/Master/texmf-dist/xindy/modules/lang/russian/koi8-r.xdy
index c456a2e01e4..41563be3ed6 100644
--- a/Master/texmf-dist/xindy/modules/lang/russian/koi8-r.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/russian/koi8-r.xdy
@@ -36,221 +36,221 @@
 
 (define-rule-set "ru-alphabetize"
 
-  :rules  (("Á" "€" :string)
-           ("á" "€" :string)
-           ("Â" "" :string)
+  :rules  (("á" "€" :string)
+           ("Á" "€" :string)
            ("â" "" :string)
-           ("÷" "‚" :string)
+           ("Â" "" :string)
            ("×" "‚" :string)
-           ("Ç" "ƒ" :string)
+           ("÷" "‚" :string)
            ("ç" "ƒ" :string)
+           ("Ç" "ƒ" :string)
            ("Ä" "…" :string)
            ("ä" "…" :string)
-           ("³" "ˆ" :string)
            ("Å" "ˆ" :string)
            ("£" "ˆ" :string)
+           ("³" "ˆ" :string)
            ("å" "ˆ" :string)
            ("Ö" "‹" :string)
            ("ö" "‹" :string)
-           ("Ú" "Œ" :string)
            ("ú" "Œ" :string)
+           ("Ú" "Œ" :string)
            ("É" "Ž" :string)
            ("é" "Ž" :string)
            ("ê" "‘" :string)
            ("Ê" "‘" :string)
-           ("ë" "“" :string)
            ("Ë" "“" :string)
-           ("ì" "”" :string)
+           ("ë" "“" :string)
            ("Ì" "”" :string)
+           ("ì" "”" :string)
            ("Í" "–" :string)
            ("í" "–" :string)
-           ("Î" "—" :string)
            ("î" "—" :string)
+           ("Î" "—" :string)
            ("Ï" "™" :string)
            ("ï" "™" :string)
            ("ð" "›" :string)
            ("Ð" "›" :string)
-           ("ò" "œ" :string)
            ("Ò" "œ" :string)
-           ("Ó" "" :string)
+           ("ò" "œ" :string)
            ("ó" "" :string)
-           ("Ô" "ž" :string)
+           ("Ó" "" :string)
            ("ô" "ž" :string)
+           ("Ô" "ž" :string)
            ("õ" "¡" :string)
            ("Õ" "¡" :string)
            ("æ" "¤" :string)
            ("Æ" "¤" :string)
-           ("È" "¥" :string)
            ("è" "¥" :string)
+           ("È" "¥" :string)
            ("Ã" "¦" :string)
            ("ã" "¦" :string)
-           ("Þ" "§" :string)
            ("þ" "§" :string)
+           ("Þ" "§" :string)
            ("û" "©" :string)
            ("Û" "©" :string)
-           ("Ý" "ª" :string)
            ("ý" "ª" :string)
+           ("Ý" "ª" :string)
            ("ÿ" "«" :string)
            ("ß" "«" :string)
-           ("Ù" "¬" :string)
            ("ù" "¬" :string)
+           ("Ù" "¬" :string)
            ("ø" "" :string)
            ("Ø" "" :string)
-           ("ü" "¯" :string)
            ("Ü" "¯" :string)
-           ("À" "°" :string)
+           ("ü" "¯" :string)
            ("à" "°" :string)
+           ("À" "°" :string)
            ("ñ" "±" :string)
            ("Ñ" "±" :string)
            ))
 
 (define-rule-set "ru-resolve-diacritics"
 
-  :rules  (("õ" "¢" :string)
+  :rules  (("ñ" "¢" :string)
+           ("ó" "¢" :string)
+           ("î" "¢" :string)
+           ("Í" "¢" :string)
+           ("õ" "¢" :string)
+           ("Å" "¢" :string)
+           ("ô" "¢" :string)
+           ("÷" "¢" :string)
+           ("û" "¢" :string)
            ("Ô" "¢" :string)
-           ("Ï" "¢" :string)
-           ("ê" "¢" :string)
-           ("Á" "¢" :string)
-           ("Â" "¢" :string)
            ("ë" "¢" :string)
-           ("Î" "¢" :string)
-           ("Ã" "¢" :string)
-           ("Í" "¢" :string)
+           ("Ì" "¢" :string)
+           ("ý" "¢" :string)
+           ("à" "¢" :string)
            ("ì" "¢" :string)
-           ("Ú" "¢" :string)
-           ("Ý" "¢" :string)
-           ("ò" "¢" :string)
-           ("ÿ" "¢" :string)
-           ("Ö" "¢" :string)
-           ("í" "¢" :string)
-           ("ã" "¢" :string)
+           ("ê" "¢" :string)
+           ("Ü" "¢" :string)
+           ("Ä" "¢" :string)
            ("æ" "¢" :string)
-           ("Ì" "¢" :string)
-           ("Ç" "¢" :string)
-           ("É" "¢" :string)
-           ("ç" "¢" :string)
-           ("È" "¢" :string)
-           ("ô" "¢" :string)
-           ("À" "¢" :string)
-           ("ñ" "¢" :string)
-           ("Ê" "¢" :string)
-           ("Æ" "¢" :string)
+           ("ò" "¢" :string)
            ("Ë" "¢" :string)
-           ("Å" "¢" :string)
-           ("ø" "¢" :string)
+           ("É" "¢" :string)
+           ("Ï" "¢" :string)
+           ("Ö" "¢" :string)
+           ("ú" "¢" :string)
+           ("×" "¢" :string)
+           ("Ò" "¢" :string)
+           ("ù" "¢" :string)
            ("â" "¢" :string)
-           ("Ä" "¢" :string)
            ("ð" "¢" :string)
-           ("ú" "¢" :string)
-           ("Þ" "¢" :string)
-           ("ü" "¢" :string)
-           ("Ó" "¢" :string)
+           ("Ã" "¢" :string)
+           ("Ú" "¢" :string)
            ("Ù" "¢" :string)
-           ("ä" "¢" :string)
-           ("ù" "¢" :string)
-           ("ß" "¢" :string)
-           ("ï" "¢" :string)
+           ("è" "¢" :string)
+           ("È" "¢" :string)
            ("é" "¢" :string)
-           ("û" "¢" :string)
-           ("Ò" "¢" :string)
-           ("î" "¢" :string)
+           ("Â" "¢" :string)
+           ("Ý" "¢" :string)
+           ("ç" "¢" :string)
+           ("Î" "¢" :string)
+           ("ÿ" "¢" :string)
+           ("å" "¢" :string)
+           ("ß" "¢" :string)
+           ("Æ" "¢" :string)
+           ("Ø" "¢" :string)
+           ("Ç" "¢" :string)
+           ("À" "¢" :string)
+           ("ä" "¢" :string)
            ("Ð" "¢" :string)
+           ("þ" "¢" :string)
            ("Ñ" "¢" :string)
-           ("ý" "¢" :string)
-           ("Û" "¢" :string)
-           ("è" "¢" :string)
-           ("Ø" "¢" :string)
-           ("å" "¢" :string)
-           ("÷" "¢" :string)
-           ("ö" "¢" :string)
            ("Õ" "¢" :string)
-           ("þ" "¢" :string)
-           ("à" "¢" :string)
-           ("Ü" "¢" :string)
-           ("ó" "¢" :string)
+           ("ø" "¢" :string)
+           ("ö" "¢" :string)
+           ("Ê" "¢" :string)
+           ("Û" "¢" :string)
+           ("Þ" "¢" :string)
+           ("ã" "¢" :string)
            ("á" "¢" :string)
-           ("×" "¢" :string)
+           ("Á" "¢" :string)
+           ("í" "¢" :string)
+           ("ü" "¢" :string)
+           ("Ó" "¢" :string)
+           ("ï" "¢" :string)
            ("³" "£" :string)
            ("£" "£" :string)
            ))
 
 (define-rule-set "ru-resolve-case"
 
-  :rules  (("õ" "8" :string)
-           ("ê" "8" :string)
-           ("ë" "8" :string)
-           ("ì" "8" :string)
-           ("ò" "8" :string)
-           ("ÿ" "8" :string)
-           ("í" "8" :string)
-           ("ã" "8" :string)
-           ("æ" "8" :string)
-           ("³" "8" :string)
-           ("ç" "8" :string)
-           ("ô" "8" :string)
-           ("ñ" "8" :string)
+  :rules  (("þ" "8" :string)
            ("ø" "8" :string)
-           ("â" "8" :string)
-           ("ð" "8" :string)
-           ("ú" "8" :string)
+           ("ö" "8" :string)
+           ("á" "8" :string)
+           ("ã" "8" :string)
            ("ü" "8" :string)
-           ("ä" "8" :string)
-           ("ù" "8" :string)
            ("ï" "8" :string)
+           ("í" "8" :string)
+           ("³" "8" :string)
            ("é" "8" :string)
-           ("û" "8" :string)
-           ("î" "8" :string)
-           ("ý" "8" :string)
            ("è" "8" :string)
+           ("ç" "8" :string)
+           ("ÿ" "8" :string)
+           ("ä" "8" :string)
            ("å" "8" :string)
+           ("ù" "8" :string)
+           ("ú" "8" :string)
+           ("ð" "8" :string)
+           ("â" "8" :string)
+           ("î" "8" :string)
+           ("ó" "8" :string)
+           ("ñ" "8" :string)
+           ("û" "8" :string)
            ("÷" "8" :string)
-           ("ö" "8" :string)
-           ("þ" "8" :string)
+           ("ô" "8" :string)
+           ("õ" "8" :string)
+           ("ê" "8" :string)
            ("à" "8" :string)
-           ("ó" "8" :string)
-           ("á" "8" :string)
-           ("Ô" "9" :string)
-           ("Ï" "9" :string)
+           ("ì" "8" :string)
+           ("ý" "8" :string)
+           ("ë" "8" :string)
+           ("ò" "8" :string)
+           ("æ" "8" :string)
+           ("Õ" "9" :string)
+           ("Ñ" "9" :string)
+           ("Ð" "9" :string)
+           ("Þ" "9" :string)
+           ("Û" "9" :string)
+           ("Ê" "9" :string)
            ("Á" "9" :string)
-           ("Â" "9" :string)
-           ("Î" "9" :string)
-           ("Ã" "9" :string)
-           ("Í" "9" :string)
-           ("Ú" "9" :string)
+           ("Ó" "9" :string)
+           ("£" "9" :string)
            ("Ý" "9" :string)
-           ("Ö" "9" :string)
-           ("Ì" "9" :string)
-           ("Ç" "9" :string)
-           ("É" "9" :string)
+           ("Â" "9" :string)
            ("È" "9" :string)
+           ("Î" "9" :string)
            ("À" "9" :string)
-           ("Ê" "9" :string)
+           ("Ç" "9" :string)
+           ("Ø" "9" :string)
            ("Æ" "9" :string)
-           ("Ë" "9" :string)
-           ("Å" "9" :string)
-           ("Ä" "9" :string)
-           ("Þ" "9" :string)
-           ("Ó" "9" :string)
-           ("Ù" "9" :string)
-           ("£" "9" :string)
            ("ß" "9" :string)
+           ("Ö" "9" :string)
+           ("Ï" "9" :string)
+           ("É" "9" :string)
+           ("Ë" "9" :string)
            ("Ò" "9" :string)
-           ("Ð" "9" :string)
-           ("Ñ" "9" :string)
-           ("Û" "9" :string)
-           ("Ø" "9" :string)
-           ("Õ" "9" :string)
-           ("Ü" "9" :string)
            ("×" "9" :string)
+           ("Ù" "9" :string)
+           ("Ú" "9" :string)
+           ("Ã" "9" :string)
+           ("Í" "9" :string)
+           ("Å" "9" :string)
+           ("Ü" "9" :string)
+           ("Ì" "9" :string)
+           ("Ô" "9" :string)
+           ("Ä" "9" :string)
            ))
 
 (define-rule-set "ru-ignore-special"
 
-  :rules  (("-" "" :string)
+  :rules  (("." "" :string)
+           ("?" "" :string)
+           ("-" "" :string)
            ("!" "" :string)
            ("'" "" :string)
-           ("?" "" :string)
-           ("." "" :string)
            ))
 
 (define-rule-set "ru-resolve-special"
@@ -258,72 +258,72 @@
   :rules  (("?" "¡" :string)
            ("!" "¢" :string)
            ("." "£" :string)
-           ("õ" "¤" :string)
-           ("Ô" "¤" :string)
-           ("Ï" "¤" :string)
-           ("ê" "¤" :string)
-           ("Á" "¤" :string)
-           ("Â" "¤" :string)
-           ("ë" "¤" :string)
+           ("ç" "¤" :string)
            ("Î" "¤" :string)
-           ("Ã" "¤" :string)
-           ("Í" "¤" :string)
-           ("ì" "¤" :string)
-           ("Ú" "¤" :string)
+           ("Â" "¤" :string)
            ("Ý" "¤" :string)
-           ("ò" "¤" :string)
-           ("ÿ" "¤" :string)
-           ("Ö" "¤" :string)
-           ("í" "¤" :string)
-           ("ã" "¤" :string)
-           ("æ" "¤" :string)
-           ("Ì" "¤" :string)
-           ("Ç" "¤" :string)
-           ("É" "¤" :string)
-           ("³" "¤" :string)
-           ("ç" "¤" :string)
+           ("è" "¤" :string)
            ("È" "¤" :string)
-           ("ô" "¤" :string)
-           ("À" "¤" :string)
-           ("ñ" "¤" :string)
-           ("Ê" "¤" :string)
+           ("é" "¤" :string)
+           ("³" "¤" :string)
            ("Æ" "¤" :string)
-           ("Ë" "¤" :string)
-           ("Å" "¤" :string)
-           ("ø" "¤" :string)
-           ("â" "¤" :string)
-           ("Ä" "¤" :string)
-           ("ð" "¤" :string)
-           ("ú" "¤" :string)
-           ("Þ" "¤" :string)
-           ("ü" "¤" :string)
-           ("Ó" "¤" :string)
-           ("Ù" "¤" :string)
+           ("Ø" "¤" :string)
+           ("Ç" "¤" :string)
+           ("À" "¤" :string)
            ("ä" "¤" :string)
-           ("£" "¤" :string)
-           ("ù" "¤" :string)
+           ("å" "¤" :string)
            ("ß" "¤" :string)
-           ("ï" "¤" :string)
-           ("é" "¤" :string)
-           ("û" "¤" :string)
-           ("Ò" "¤" :string)
-           ("î" "¤" :string)
-           ("Ð" "¤" :string)
-           ("Ñ" "¤" :string)
-           ("ý" "¤" :string)
+           ("ÿ" "¤" :string)
            ("Û" "¤" :string)
-           ("è" "¤" :string)
-           ("Ø" "¤" :string)
-           ("å" "¤" :string)
-           ("÷" "¤" :string)
+           ("Þ" "¤" :string)
+           ("ø" "¤" :string)
            ("ö" "¤" :string)
+           ("Ê" "¤" :string)
+           ("Ñ" "¤" :string)
            ("Õ" "¤" :string)
+           ("Ð" "¤" :string)
            ("þ" "¤" :string)
-           ("à" "¤" :string)
-           ("Ü" "¤" :string)
-           ("ó" "¤" :string)
+           ("£" "¤" :string)
+           ("ü" "¤" :string)
+           ("Ó" "¤" :string)
+           ("ï" "¤" :string)
+           ("í" "¤" :string)
            ("á" "¤" :string)
+           ("Á" "¤" :string)
+           ("ã" "¤" :string)
+           ("÷" "¤" :string)
+           ("û" "¤" :string)
+           ("Å" "¤" :string)
+           ("õ" "¤" :string)
+           ("ô" "¤" :string)
+           ("Í" "¤" :string)
+           ("ñ" "¤" :string)
+           ("ó" "¤" :string)
+           ("î" "¤" :string)
+           ("Ä" "¤" :string)
+           ("æ" "¤" :string)
+           ("ò" "¤" :string)
+           ("ê" "¤" :string)
+           ("Ü" "¤" :string)
+           ("ë" "¤" :string)
+           ("Ô" "¤" :string)
+           ("Ì" "¤" :string)
+           ("ì" "¤" :string)
+           ("à" "¤" :string)
+           ("ý" "¤" :string)
+           ("Ò" "¤" :string)
+           ("ù" "¤" :string)
+           ("ú" "¤" :string)
            ("×" "¤" :string)
+           ("É" "¤" :string)
+           ("Ï" "¤" :string)
+           ("Ö" "¤" :string)
+           ("Ë" "¤" :string)
+           ("Ú" "¤" :string)
+           ("Ù" "¤" :string)
+           ("Ã" "¤" :string)
+           ("â" "¤" :string)
+           ("ð" "¤" :string)
            ("-" "¥" :string)
            ("'" "¦" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/russian/translit-iso-utf8.xdy b/Master/texmf-dist/xindy/modules/lang/russian/translit-iso-utf8.xdy
index 11321d02b28..4ced1b99a36 100644
--- a/Master/texmf-dist/xindy/modules/lang/russian/translit-iso-utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/russian/translit-iso-utf8.xdy
@@ -31,16 +31,16 @@
            ("Ã¢" "€" :string)
            ("ÄŒ" "†" :string)
            ("Ä" "†" :string)
-           ("Ã‹" "—" :string)
-           ("Ã¨" "—" :string)
            ("Ã«" "—" :string)
+           ("Ã‹" "—" :string)
            ("Ãˆ" "—" :string)
+           ("Ã¨" "—" :string)
+           ("Å " "Ð" :string)
            ("Å¡" "Ð" :string)
-           ("Å" "Ð" :string)
            ("Åœ" "Ð" :string)
-           ("Å " "Ð" :string)
-           ("Ã›" "à" :string)
+           ("Å" "Ð" :string)
            ("Ã»" "à" :string)
+           ("Ã›" "à" :string)
            ("Å½" "ð" :string)
            ("Å¾" "ð" :string)
            ("a" "€" :string)
@@ -53,22 +53,22 @@
            ("D" "" :string)
            ("E" "—" :string)
            ("e" "—" :string)
-           ("F" "œ" :string)
            ("f" "œ" :string)
-           ("g" "" :string)
+           ("F" "œ" :string)
            ("G" "" :string)
-           ("H" "¤" :string)
+           ("g" "" :string)
            ("h" "¤" :string)
+           ("H" "¤" :string)
            ("I" "¨" :string)
            ("i" "¨" :string)
-           ("j" "¬" :string)
            ("J" "¬" :string)
+           ("j" "¬" :string)
            ("K" "®" :string)
            ("k" "®" :string)
            ("L" "´" :string)
            ("l" "´" :string)
-           ("M" "»" :string)
            ("m" "»" :string)
+           ("M" "»" :string)
            ("N" "¼" :string)
            ("n" "¼" :string)
            ("O" "Ã" :string)
@@ -77,14 +77,14 @@
            ("p" "È" :string)
            ("r" "Ë" :string)
            ("R" "Ë" :string)
-           ("S" "Ð" :string)
            ("s" "Ð" :string)
+           ("S" "Ð" :string)
            ("T" "Ú" :string)
            ("t" "Ú" :string)
-           ("u" "à" :string)
            ("U" "à" :string)
-           ("v" "å" :string)
+           ("u" "à" :string)
            ("V" "å" :string)
+           ("v" "å" :string)
            ("Y" "í" :string)
            ("y" "í" :string)
            ("Z" "ð" :string)
@@ -93,215 +93,215 @@
 
 (define-rule-set "ru-resolve-diacritics"
 
-  :rules  (("Å¡" "£" :string)
+  :rules  (("ÄŒ" "£" :string)
            ("Ã‚" "£" :string)
+           ("Å " "£" :string)
            ("Å½" "£" :string)
-           ("Ã¢" "£" :string)
-           ("Ã›" "£" :string)
-           ("Ã¨" "£" :string)
-           ("ÄŒ" "£" :string)
-           ("Ä" "£" :string)
            ("Ã»" "£" :string)
            ("Å¾" "£" :string)
-           ("Å " "£" :string)
+           ("Ä" "£" :string)
+           ("Ã¨" "£" :string)
+           ("Ã›" "£" :string)
+           ("Ã¢" "£" :string)
            ("Ãˆ" "£" :string)
-           ("Å" "¤" :string)
+           ("Å¡" "£" :string)
            ("Ã‹" "¤" :string)
            ("Ã«" "¤" :string)
            ("Åœ" "¤" :string)
-           ("S" "¢" :string)
+           ("Å" "¤" :string)
+           ("c" "¢" :string)
+           ("u" "¢" :string)
+           ("L" "¢" :string)
+           ("G" "¢" :string)
+           ("p" "¢" :string)
+           ("m" "¢" :string)
+           ("s" "¢" :string)
            ("T" "¢" :string)
-           ("a" "¢" :string)
+           ("J" "¢" :string)
+           ("o" "¢" :string)
+           ("h" "¢" :string)
+           ("I" "¢" :string)
+           ("B" "¢" :string)
+           ("Y" "¢" :string)
+           ("U" "¢" :string)
            ("N" "¢" :string)
            ("K" "¢" :string)
-           ("d" "¢" :string)
-           ("Y" "¢" :string)
            ("E" "¢" :string)
+           ("a" "¢" :string)
+           ("O" "¢" :string)
+           ("P" "¢" :string)
+           ("d" "¢" :string)
            ("j" "¢" :string)
-           ("Z" "¢" :string)
-           ("y" "¢" :string)
-           ("u" "¢" :string)
+           ("b" "¢" :string)
            ("k" "¢" :string)
-           ("g" "¢" :string)
-           ("t" "¢" :string)
+           ("R" "¢" :string)
+           ("i" "¢" :string)
            ("e" "¢" :string)
-           ("J" "¢" :string)
-           ("v" "¢" :string)
-           ("s" "¢" :string)
-           ("B" "¢" :string)
+           ("C" "¢" :string)
            ("H" "¢" :string)
-           ("c" "¢" :string)
-           ("D" "¢" :string)
-           ("b" "¢" :string)
-           ("I" "¢" :string)
-           ("G" "¢" :string)
-           ("z" "¢" :string)
-           ("U" "¢" :string)
            ("F" "¢" :string)
-           ("r" "¢" :string)
-           ("V" "¢" :string)
+           ("S" "¢" :string)
            ("M" "¢" :string)
-           ("h" "¢" :string)
-           ("C" "¢" :string)
-           ("L" "¢" :string)
+           ("Z" "¢" :string)
+           ("V" "¢" :string)
+           ("z" "¢" :string)
+           ("r" "¢" :string)
+           ("y" "¢" :string)
+           ("g" "¢" :string)
+           ("D" "¢" :string)
+           ("l" "¢" :string)
+           ("v" "¢" :string)
            ("f" "¢" :string)
-           ("i" "¢" :string)
            ("A" "¢" :string)
-           ("O" "¢" :string)
+           ("t" "¢" :string)
            ("n" "¢" :string)
-           ("P" "¢" :string)
-           ("m" "¢" :string)
-           ("l" "¢" :string)
-           ("p" "¢" :string)
-           ("R" "¢" :string)
-           ("o" "¢" :string)
            ))
 
 (define-rule-set "ru-resolve-case"
 
-  :rules  (("Ã‚" "8" :string)
-           ("Å½" "8" :string)
-           ("Ã›" "8" :string)
+  :rules  (("Å½" "8" :string)
+           ("Å " "8" :string)
            ("Ã‹" "8" :string)
            ("ÄŒ" "8" :string)
+           ("Ã‚" "8" :string)
+           ("Ã›" "8" :string)
            ("Åœ" "8" :string)
-           ("Å " "8" :string)
            ("Ãˆ" "8" :string)
-           ("Å¡" "9" :string)
-           ("Ã¢" "9" :string)
-           ("Å" "9" :string)
-           ("Ã¨" "9" :string)
+           ("Ã»" "9" :string)
            ("Ã«" "9" :string)
+           ("Å" "9" :string)
            ("Ä" "9" :string)
-           ("Ã»" "9" :string)
+           ("Ã¨" "9" :string)
            ("Å¾" "9" :string)
-           ("S" "8" :string)
+           ("Å¡" "9" :string)
+           ("Ã¢" "9" :string)
+           ("I" "8" :string)
+           ("J" "8" :string)
            ("T" "8" :string)
-           ("N" "8" :string)
+           ("L" "8" :string)
+           ("G" "8" :string)
+           ("P" "8" :string)
+           ("O" "8" :string)
            ("K" "8" :string)
-           ("Y" "8" :string)
+           ("N" "8" :string)
            ("E" "8" :string)
-           ("Z" "8" :string)
-           ("J" "8" :string)
+           ("Y" "8" :string)
+           ("U" "8" :string)
            ("B" "8" :string)
+           ("F" "8" :string)
            ("H" "8" :string)
+           ("S" "8" :string)
+           ("C" "8" :string)
+           ("R" "8" :string)
+           ("A" "8" :string)
            ("D" "8" :string)
-           ("I" "8" :string)
-           ("G" "8" :string)
-           ("U" "8" :string)
-           ("F" "8" :string)
            ("V" "8" :string)
            ("M" "8" :string)
-           ("C" "8" :string)
-           ("L" "8" :string)
-           ("A" "8" :string)
-           ("O" "8" :string)
-           ("P" "8" :string)
-           ("R" "8" :string)
-           ("a" "9" :string)
+           ("Z" "8" :string)
+           ("o" "9" :string)
+           ("h" "9" :string)
+           ("p" "9" :string)
+           ("m" "9" :string)
+           ("s" "9" :string)
+           ("u" "9" :string)
+           ("c" "9" :string)
            ("d" "9" :string)
+           ("a" "9" :string)
+           ("e" "9" :string)
            ("j" "9" :string)
-           ("y" "9" :string)
-           ("u" "9" :string)
            ("k" "9" :string)
-           ("g" "9" :string)
-           ("t" "9" :string)
-           ("e" "9" :string)
-           ("v" "9" :string)
-           ("s" "9" :string)
-           ("c" "9" :string)
+           ("i" "9" :string)
            ("b" "9" :string)
+           ("v" "9" :string)
+           ("l" "9" :string)
+           ("t" "9" :string)
+           ("n" "9" :string)
+           ("f" "9" :string)
+           ("y" "9" :string)
+           ("g" "9" :string)
            ("z" "9" :string)
            ("r" "9" :string)
-           ("h" "9" :string)
-           ("f" "9" :string)
-           ("i" "9" :string)
-           ("n" "9" :string)
-           ("m" "9" :string)
-           ("l" "9" :string)
-           ("p" "9" :string)
-           ("o" "9" :string)
            ))
 
 (define-rule-set "ru-ignore-special"
 
   :rules  (("Êº" "" :string)
            ("Ê¹" "" :string)
-           ("?" "" :string)
+           ("!" "" :string)
            ("-" "" :string)
            ("." "" :string)
-           ("!" "" :string)
+           ("?" "" :string)
            ))
 
 (define-rule-set "ru-resolve-special"
 
-  :rules  (("Ã‚" "¤" :string)
-           ("Å½" "¤" :string)
+  :rules  (("Ã»" "¤" :string)
+           ("Å " "¤" :string)
+           ("ÄŒ" "¤" :string)
            ("Ã›" "¤" :string)
+           ("Ã¨" "¤" :string)
+           ("Å¾" "¤" :string)
+           ("Ã¢" "¤" :string)
+           ("Å½" "¤" :string)
+           ("Ã‹" "¤" :string)
+           ("Ã‚" "¤" :string)
+           ("Ã«" "¤" :string)
            ("Å" "¤" :string)
            ("Ä" "¤" :string)
            ("Åœ" "¤" :string)
-           ("Ã»" "¤" :string)
-           ("Å " "¤" :string)
-           ("Ãˆ" "¤" :string)
            ("Å¡" "¤" :string)
-           ("Ã¢" "¤" :string)
-           ("Ã‹" "¤" :string)
-           ("Ã¨" "¤" :string)
-           ("ÄŒ" "¤" :string)
-           ("Ã«" "¤" :string)
-           ("Å¾" "¤" :string)
+           ("Ãˆ" "¤" :string)
            ("Êº" "¥" :string)
            ("Ê¹" "¦" :string)
            ("?" "¡" :string)
            ("!" "¢" :string)
            ("." "£" :string)
-           ("S" "¤" :string)
-           ("K" "¤" :string)
-           ("d" "¤" :string)
-           ("Y" "¤" :string)
-           ("E" "¤" :string)
-           ("y" "¤" :string)
-           ("g" "¤" :string)
-           ("e" "¤" :string)
+           ("I" "¤" :string)
+           ("o" "¤" :string)
            ("J" "¤" :string)
-           ("D" "¤" :string)
-           ("b" "¤" :string)
-           ("z" "¤" :string)
-           ("M" "¤" :string)
-           ("C" "¤" :string)
-           ("L" "¤" :string)
+           ("s" "¤" :string)
+           ("m" "¤" :string)
+           ("G" "¤" :string)
+           ("u" "¤" :string)
+           ("d" "¤" :string)
            ("P" "¤" :string)
+           ("O" "¤" :string)
            ("a" "¤" :string)
-           ("T" "¤" :string)
+           ("K" "¤" :string)
            ("N" "¤" :string)
-           ("j" "¤" :string)
-           ("Z" "¤" :string)
-           ("u" "¤" :string)
-           ("k" "¤" :string)
-           ("t" "¤" :string)
-           ("v" "¤" :string)
            ("B" "¤" :string)
-           ("s" "¤" :string)
+           ("S" "¤" :string)
            ("H" "¤" :string)
+           ("j" "¤" :string)
+           ("f" "¤" :string)
+           ("D" "¤" :string)
+           ("g" "¤" :string)
+           ("V" "¤" :string)
+           ("r" "¤" :string)
+           ("M" "¤" :string)
+           ("h" "¤" :string)
+           ("T" "¤" :string)
+           ("p" "¤" :string)
+           ("L" "¤" :string)
            ("c" "¤" :string)
-           ("I" "¤" :string)
-           ("G" "¤" :string)
+           ("E" "¤" :string)
            ("U" "¤" :string)
+           ("Y" "¤" :string)
            ("F" "¤" :string)
-           ("r" "¤" :string)
-           ("V" "¤" :string)
-           ("h" "¤" :string)
-           ("f" "¤" :string)
+           ("e" "¤" :string)
+           ("C" "¤" :string)
            ("i" "¤" :string)
-           ("A" "¤" :string)
+           ("R" "¤" :string)
+           ("k" "¤" :string)
+           ("b" "¤" :string)
            ("n" "¤" :string)
-           ("O" "¤" :string)
-           ("m" "¤" :string)
+           ("t" "¤" :string)
+           ("A" "¤" :string)
+           ("v" "¤" :string)
            ("l" "¤" :string)
-           ("p" "¤" :string)
-           ("R" "¤" :string)
-           ("o" "¤" :string)
+           ("y" "¤" :string)
+           ("z" "¤" :string)
+           ("Z" "¤" :string)
            ("-" "§" :string)
            ))
 
diff --git a/Master/texmf-dist/xindy/modules/lang/russian/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/russian/utf8.xdy
index c6c8ea7ca5c..0ce9b69df56 100644
--- a/Master/texmf-dist/xindy/modules/lang/russian/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/russian/utf8.xdy
@@ -40,43 +40,43 @@
 
 (define-rule-set "ru-alphabetize"
 
-  :rules  (("ÐÌ" "€" :string)
-           ("Ð°Ì" "€" :string)
+  :rules  (("Ð°Ì" "€" :string)
+           ("ÐÌ" "€" :string)
            ("Ð•Ì" "ˆ" :string)
            ("Ñ‘Ì" "ˆ" :string)
            ("ÐµÌ" "ˆ" :string)
            ("ÐÌ" "ˆ" :string)
-           ("Ð¸Ì" "Ž" :string)
            ("Ð˜Ì" "Ž" :string)
-           ("Ñ–Ì" "" :string)
+           ("Ð¸Ì" "Ž" :string)
            ("Ð†Ì" "" :string)
+           ("Ñ–Ì" "" :string)
            ("Ð™Ì" "‘" :string)
            ("Ð¹Ì" "‘" :string)
            ("ÐžÌ" "™" :string)
            ("Ð¾Ì" "™" :string)
            ("Ð£Ì" "¡" :string)
            ("ÑƒÌ" "¡" :string)
-           ("Ñ‹Ì" "¬" :string)
            ("Ð«Ì" "¬" :string)
+           ("Ñ‹Ì" "¬" :string)
            ("ÐÌ" "¯" :string)
            ("ÑÌ" "¯" :string)
-           ("ÑŽÌ" "°" :string)
            ("Ð®Ì" "°" :string)
-           ("Ð¯Ì" "±" :string)
+           ("ÑŽÌ" "°" :string)
            ("ÑÌ" "±" :string)
-           ("Ð°" "€" :string)
+           ("Ð¯Ì" "±" :string)
            ("Ð" "€" :string)
-           ("Ð±" "" :string)
+           ("Ð°" "€" :string)
            ("Ð‘" "" :string)
+           ("Ð±" "" :string)
            ("Ð²" "‚" :string)
            ("Ð’" "‚" :string)
            ("Ð³" "ƒ" :string)
            ("Ð“" "ƒ" :string)
            ("Ð”" "…" :string)
            ("Ð´" "…" :string)
+           ("Ñ‘" "ˆ" :string)
            ("Ðµ" "ˆ" :string)
            ("Ð" "ˆ" :string)
-           ("Ñ‘" "ˆ" :string)
            ("Ð•" "ˆ" :string)
            ("Ð–" "‹" :string)
            ("Ð¶" "‹" :string)
@@ -84,46 +84,46 @@
            ("Ð·" "Œ" :string)
            ("Ð˜" "Ž" :string)
            ("Ð¸" "Ž" :string)
-           ("Ð†" "" :string)
            ("Ñ–" "" :string)
+           ("Ð†" "" :string)
            ("Ð¹" "‘" :string)
            ("Ð™" "‘" :string)
            ("Ðº" "“" :string)
            ("Ðš" "“" :string)
-           ("Ð›" "”" :string)
            ("Ð»" "”" :string)
-           ("Ðœ" "–" :string)
+           ("Ð›" "”" :string)
            ("Ð¼" "–" :string)
-           ("Ð" "—" :string)
+           ("Ðœ" "–" :string)
            ("Ð½" "—" :string)
-           ("Ð¾" "™" :string)
+           ("Ð" "—" :string)
            ("Ðž" "™" :string)
+           ("Ð¾" "™" :string)
            ("Ð¿" "›" :string)
            ("ÐŸ" "›" :string)
-           ("Ñ€" "œ" :string)
            ("Ð " "œ" :string)
-           ("Ð¡" "" :string)
+           ("Ñ€" "œ" :string)
            ("Ñ" "" :string)
+           ("Ð¡" "" :string)
            ("Ñ‚" "ž" :string)
            ("Ð¢" "ž" :string)
-           ("Ñƒ" "¡" :string)
            ("Ð£" "¡" :string)
-           ("Ñ„" "¤" :string)
+           ("Ñƒ" "¡" :string)
            ("Ð¤" "¤" :string)
-           ("Ñ…" "¥" :string)
+           ("Ñ„" "¤" :string)
            ("Ð¥" "¥" :string)
-           ("Ñ†" "¦" :string)
+           ("Ñ…" "¥" :string)
            ("Ð¦" "¦" :string)
-           ("Ñ‡" "§" :string)
+           ("Ñ†" "¦" :string)
            ("Ð§" "§" :string)
+           ("Ñ‡" "§" :string)
            ("Ð¨" "©" :string)
            ("Ñˆ" "©" :string)
-           ("Ð©" "ª" :string)
            ("Ñ‰" "ª" :string)
+           ("Ð©" "ª" :string)
            ("ÑŠ" "«" :string)
            ("Ðª" "«" :string)
-           ("Ñ‹" "¬" :string)
            ("Ð«" "¬" :string)
+           ("Ñ‹" "¬" :string)
            ("ÑŒ" "" :string)
            ("Ð¬" "" :string)
            ("Ñ¢" "®" :string)
@@ -132,328 +132,328 @@
            ("Ð" "¯" :string)
            ("ÑŽ" "°" :string)
            ("Ð®" "°" :string)
-           ("Ð¯" "±" :string)
            ("Ñ" "±" :string)
-           ("Ñ³" "´" :string)
+           ("Ð¯" "±" :string)
            ("Ñ²" "´" :string)
+           ("Ñ³" "´" :string)
            ("Ñµ" "µ" :string)
            ("Ñ´" "µ" :string)
            ))
 
 (define-rule-set "ru-resolve-diacritics"
 
-  :rules  (("Ð¸Ì" "£" :string)
-           ("Ð£Ì" "£" :string)
-           ("ÑƒÌ" "£" :string)
-           ("ÑŽÌ" "£" :string)
-           ("ÐÌ" "£" :string)
-           ("Ð®Ì" "£" :string)
-           ("Ñ‹Ì" "£" :string)
-           ("ÐžÌ" "£" :string)
+  :rules  (("Ñ‹Ì" "£" :string)
            ("ÐÌ" "£" :string)
-           ("Ð•Ì" "£" :string)
            ("Ñ–Ì" "£" :string)
-           ("Ð¯Ì" "£" :string)
+           ("ÑŽÌ" "£" :string)
            ("Ð¾Ì" "£" :string)
+           ("ÑƒÌ" "£" :string)
+           ("ÑÌ" "£" :string)
+           ("Ð•Ì" "£" :string)
            ("Ð°Ì" "£" :string)
+           ("Ð¹Ì" "£" :string)
            ("Ð™Ì" "£" :string)
+           ("Ð®Ì" "£" :string)
            ("ÑÌ" "£" :string)
-           ("Ð†Ì" "£" :string)
-           ("Ð«Ì" "£" :string)
-           ("Ð¹Ì" "£" :string)
+           ("Ð¯Ì" "£" :string)
            ("Ð˜Ì" "£" :string)
+           ("Ð†Ì" "£" :string)
            ("ÐµÌ" "£" :string)
-           ("ÑÌ" "£" :string)
-           ("Ñ‘Ì" "¥" :string)
+           ("ÐžÌ" "£" :string)
+           ("Ð«Ì" "£" :string)
+           ("Ð¸Ì" "£" :string)
+           ("Ð£Ì" "£" :string)
+           ("ÐÌ" "£" :string)
            ("ÐÌ" "¥" :string)
-           ("Ñ¢" "¢" :string)
-           ("Ð¿" "¢" :string)
-           ("Ñ£" "¢" :string)
-           ("Ñ‡" "¢" :string)
+           ("Ñ‘Ì" "¥" :string)
+           ("Ð¹" "¢" :string)
+           ("Ðº" "¢" :string)
            ("Ðµ" "¢" :string)
-           ("Ð±" "¢" :string)
-           ("Ñƒ" "¢" :string)
            ("Ð˜" "¢" :string)
-           ("Ð¹" "¢" :string)
-           ("Ñµ" "¢" :string)
+           ("Ð¤" "¢" :string)
            ("Ñ€" "¢" :string)
-           ("Ðº" "¢" :string)
-           ("Ñ‚" "¢" :string)
-           ("ÐŸ" "¢" :string)
-           ("Ñ†" "¢" :string)
-           ("Ð›" "¢" :string)
-           ("Ð–" "¢" :string)
-           ("Ð¾" "¢" :string)
-           ("Ð”" "¢" :string)
-           ("ÑŠ" "¢" :string)
-           ("Ð" "¢" :string)
+           ("Ð¶" "¢" :string)
+           ("Ñƒ" "¢" :string)
            ("Ð¸" "¢" :string)
-           ("Ñ„" "¢" :string)
-           ("Ð¨" "¢" :string)
-           ("Ð»" "¢" :string)
-           ("Ð©" "¢" :string)
-           ("Ðš" "¢" :string)
-           ("Ð™" "¢" :string)
-           ("Ñ³" "¢" :string)
-           ("Ð‘" "¢" :string)
-           ("Ð³" "¢" :string)
-           ("Ñ" "¢" :string)
-           ("Ñ…" "¢" :string)
-           ("Ñ‹" "¢" :string)
+           ("Ð·" "¢" :string)
+           ("Ð®" "¢" :string)
            ("Ñ´" "¢" :string)
-           ("Ð¯" "¢" :string)
-           ("Ñˆ" "¢" :string)
+           ("Ð¼" "¢" :string)
+           ("Ð¾" "¢" :string)
+           ("Ðš" "¢" :string)
+           ("Ñ‚" "¢" :string)
+           ("Ð" "¢" :string)
+           ("Ñ¢" "¢" :string)
            ("Ð§" "¢" :string)
-           ("Ð " "¢" :string)
-           ("Ñ‰" "¢" :string)
-           ("Ð´" "¢" :string)
+           ("Ð©" "¢" :string)
+           ("Ñ" "¢" :string)
+           ("Ð“" "¢" :string)
+           ("Ñ³" "¢" :string)
+           ("Ð›" "¢" :string)
            ("Ðœ" "¢" :string)
-           ("ÑŒ" "¢" :string)
-           ("Ð¢" "¢" :string)
-           ("Ð—" "¢" :string)
-           ("Ð²" "¢" :string)
-           ("Ð¦" "¢" :string)
            ("Ð¡" "¢" :string)
-           ("Ð¤" "¢" :string)
-           ("Ð°" "¢" :string)
-           ("Ð†" "¢" :string)
-           ("Ð’" "¢" :string)
-           ("Ðž" "¢" :string)
-           ("Ð½" "¢" :string)
+           ("Ñ‡" "¢" :string)
            ("Ð¥" "¢" :string)
-           ("Ð¼" "¢" :string)
-           ("Ð·" "¢" :string)
-           ("Ð¶" "¢" :string)
-           ("Ñ–" "¢" :string)
-           ("Ñ²" "¢" :string)
-           ("Ñ" "¢" :string)
+           ("Ð™" "¢" :string)
+           ("Ð•" "¢" :string)
+           ("Ðª" "¢" :string)
+           ("Ð†" "¢" :string)
+           ("Ñ„" "¢" :string)
+           ("Ñ†" "¢" :string)
+           ("Ð¢" "¢" :string)
+           ("Ð" "¢" :string)
+           ("Ñ£" "¢" :string)
+           ("Ñ…" "¢" :string)
+           ("Ð±" "¢" :string)
+           ("Ð‘" "¢" :string)
+           ("Ð«" "¢" :string)
+           ("Ð»" "¢" :string)
            ("Ð£" "¢" :string)
            ("Ñ" "¢" :string)
-           ("Ð“" "¢" :string)
-           ("Ð¬" "¢" :string)
+           ("Ð”" "¢" :string)
            ("Ð" "¢" :string)
-           ("Ð«" "¢" :string)
-           ("Ð•" "¢" :string)
-           ("Ð" "¢" :string)
-           ("Ðª" "¢" :string)
+           ("Ñˆ" "¢" :string)
+           ("ÑŒ" "¢" :string)
+           ("Ð " "¢" :string)
+           ("Ð¨" "¢" :string)
            ("ÑŽ" "¢" :string)
-           ("Ð®" "¢" :string)
+           ("Ðž" "¢" :string)
+           ("Ð½" "¢" :string)
+           ("Ñµ" "¢" :string)
+           ("Ð¬" "¢" :string)
+           ("Ð—" "¢" :string)
+           ("Ñ‰" "¢" :string)
+           ("Ð²" "¢" :string)
+           ("Ð–" "¢" :string)
+           ("Ð´" "¢" :string)
+           ("Ñ" "¢" :string)
+           ("Ð¯" "¢" :string)
+           ("Ð¿" "¢" :string)
+           ("Ñ²" "¢" :string)
+           ("Ð°" "¢" :string)
+           ("ÑŠ" "¢" :string)
+           ("ÐŸ" "¢" :string)
+           ("Ñ‹" "¢" :string)
+           ("Ð¦" "¢" :string)
+           ("Ð³" "¢" :string)
+           ("Ñ–" "¢" :string)
+           ("Ð’" "¢" :string)
            ("Ð" "¤" :string)
            ("Ñ‘" "¤" :string)
            ))
 
 (define-rule-set "ru-resolve-case"
 
-  :rules  (("Ð£Ì" "8" :string)
-           ("ÐÌ" "8" :string)
-           ("Ð®Ì" "8" :string)
-           ("ÐžÌ" "8" :string)
+  :rules  (("ÐÌ" "8" :string)
            ("ÐÌ" "8" :string)
-           ("Ð•Ì" "8" :string)
-           ("Ð¯Ì" "8" :string)
-           ("Ð™Ì" "8" :string)
-           ("Ð†Ì" "8" :string)
+           ("ÐžÌ" "8" :string)
            ("Ð«Ì" "8" :string)
+           ("Ð£Ì" "8" :string)
+           ("ÐÌ" "8" :string)
+           ("Ð¯Ì" "8" :string)
            ("Ð˜Ì" "8" :string)
-           ("ÐÌ" "8" :string)
-           ("Ð¸Ì" "9" :string)
+           ("Ð†Ì" "8" :string)
+           ("Ð™Ì" "8" :string)
+           ("Ð®Ì" "8" :string)
+           ("Ð•Ì" "8" :string)
            ("ÑƒÌ" "9" :string)
+           ("ÑÌ" "9" :string)
+           ("Ð¾Ì" "9" :string)
            ("ÑŽÌ" "9" :string)
            ("Ñ‹Ì" "9" :string)
-           ("Ñ‘Ì" "9" :string)
            ("Ñ–Ì" "9" :string)
-           ("Ð¾Ì" "9" :string)
+           ("Ð¸Ì" "9" :string)
+           ("ÐµÌ" "9" :string)
            ("Ð°Ì" "9" :string)
-           ("ÑÌ" "9" :string)
            ("Ð¹Ì" "9" :string)
-           ("ÐµÌ" "9" :string)
-           ("ÑÌ" "9" :string)
-           ("Ñ¢" "8" :string)
-           ("Ð˜" "8" :string)
-           ("ÐŸ" "8" :string)
-           ("Ð›" "8" :string)
-           ("Ð–" "8" :string)
-           ("Ð”" "8" :string)
+           ("Ñ‘Ì" "9" :string)
+           ("ÑÌ" "9" :string)
+           ("Ð†" "8" :string)
+           ("Ð¢" "8" :string)
            ("Ð" "8" :string)
-           ("Ð¨" "8" :string)
-           ("Ð©" "8" :string)
-           ("Ðš" "8" :string)
-           ("Ð™" "8" :string)
            ("Ð‘" "8" :string)
-           ("Ñ´" "8" :string)
-           ("Ð¯" "8" :string)
-           ("Ð§" "8" :string)
-           ("Ð " "8" :string)
-           ("Ðœ" "8" :string)
-           ("Ð¢" "8" :string)
-           ("Ð—" "8" :string)
-           ("Ð¦" "8" :string)
+           ("Ð" "8" :string)
+           ("Ð›" "8" :string)
            ("Ð¡" "8" :string)
+           ("Ðœ" "8" :string)
+           ("Ð¥" "8" :string)
+           ("Ð™" "8" :string)
+           ("Ð•" "8" :string)
+           ("Ðª" "8" :string)
+           ("Ðš" "8" :string)
+           ("Ñ¢" "8" :string)
+           ("Ð" "8" :string)
+           ("Ð©" "8" :string)
+           ("Ð§" "8" :string)
+           ("Ð“" "8" :string)
            ("Ð¤" "8" :string)
-           ("Ð†" "8" :string)
+           ("Ð˜" "8" :string)
+           ("Ñ´" "8" :string)
+           ("Ð®" "8" :string)
+           ("ÐŸ" "8" :string)
+           ("Ð¦" "8" :string)
            ("Ð’" "8" :string)
-           ("Ðž" "8" :string)
-           ("Ð¥" "8" :string)
+           ("Ð–" "8" :string)
+           ("Ð¯" "8" :string)
            ("Ñ²" "8" :string)
-           ("Ð£" "8" :string)
-           ("Ð" "8" :string)
-           ("Ð“" "8" :string)
+           ("Ðž" "8" :string)
            ("Ð¬" "8" :string)
-           ("Ð" "8" :string)
+           ("Ð—" "8" :string)
            ("Ð«" "8" :string)
-           ("Ð•" "8" :string)
-           ("Ð" "8" :string)
-           ("Ðª" "8" :string)
-           ("Ð®" "8" :string)
-           ("Ð¿" "9" :string)
+           ("Ð”" "8" :string)
+           ("Ð£" "8" :string)
+           ("Ð" "8" :string)
+           ("Ð¨" "8" :string)
+           ("Ð " "8" :string)
+           ("Ñ„" "9" :string)
+           ("Ñ†" "9" :string)
+           ("Ð±" "9" :string)
+           ("Ñ…" "9" :string)
            ("Ñ£" "9" :string)
+           ("Ñ³" "9" :string)
            ("Ñ‡" "9" :string)
-           ("Ðµ" "9" :string)
-           ("Ð±" "9" :string)
-           ("Ñƒ" "9" :string)
+           ("Ð¼" "9" :string)
+           ("Ð¾" "9" :string)
+           ("Ñ‚" "9" :string)
+           ("Ñ" "9" :string)
            ("Ð¹" "9" :string)
-           ("Ñµ" "9" :string)
-           ("Ñ€" "9" :string)
            ("Ðº" "9" :string)
-           ("Ñ‚" "9" :string)
-           ("Ñ†" "9" :string)
-           ("Ð¾" "9" :string)
-           ("ÑŠ" "9" :string)
+           ("Ðµ" "9" :string)
+           ("Ñ€" "9" :string)
            ("Ð¸" "9" :string)
-           ("Ñ„" "9" :string)
-           ("Ð»" "9" :string)
-           ("Ñ³" "9" :string)
-           ("Ð³" "9" :string)
-           ("Ñ" "9" :string)
-           ("Ñ…" "9" :string)
+           ("Ð·" "9" :string)
+           ("Ð¶" "9" :string)
+           ("Ñƒ" "9" :string)
+           ("Ñ‘" "9" :string)
            ("Ñ‹" "9" :string)
-           ("Ñˆ" "9" :string)
+           ("Ñ–" "9" :string)
+           ("Ð³" "9" :string)
            ("Ñ‰" "9" :string)
            ("Ð´" "9" :string)
-           ("ÑŒ" "9" :string)
+           ("Ñ" "9" :string)
            ("Ð²" "9" :string)
+           ("ÑŠ" "9" :string)
            ("Ð°" "9" :string)
+           ("Ð¿" "9" :string)
+           ("ÑŽ" "9" :string)
            ("Ð½" "9" :string)
-           ("Ð¼" "9" :string)
-           ("Ð·" "9" :string)
-           ("Ð¶" "9" :string)
-           ("Ñ–" "9" :string)
-           ("Ñ" "9" :string)
+           ("Ñµ" "9" :string)
+           ("Ð»" "9" :string)
            ("Ñ" "9" :string)
-           ("Ñ‘" "9" :string)
-           ("ÑŽ" "9" :string)
+           ("Ñˆ" "9" :string)
+           ("ÑŒ" "9" :string)
            ))
 
 (define-rule-set "ru-ignore-special"
 
   :rules  (("Ì" "" :string)
-           ("-" "" :string)
            ("!" "" :string)
            ("'" "" :string)
-           ("?" "" :string)
+           ("-" "" :string)
            ("." "" :string)
+           ("?" "" :string)
            ))
 
 (define-rule-set "ru-resolve-special"
 
-  :rules  (("Ð¸Ì" "¤" :string)
+  :rules  (("ÐµÌ" "¤" :string)
+           ("Ð†Ì" "¤" :string)
+           ("Ð˜Ì" "¤" :string)
+           ("Ð¯Ì" "¤" :string)
+           ("Ð¸Ì" "¤" :string)
            ("Ð£Ì" "¤" :string)
-           ("ÑƒÌ" "¤" :string)
-           ("ÑŽÌ" "¤" :string)
            ("ÐÌ" "¤" :string)
-           ("Ð®Ì" "¤" :string)
-           ("Ñ‹Ì" "¤" :string)
            ("ÐžÌ" "¤" :string)
-           ("ÐÌ" "¤" :string)
-           ("Ñ‘Ì" "¤" :string)
+           ("Ð«Ì" "¤" :string)
            ("Ð•Ì" "¤" :string)
-           ("Ñ–Ì" "¤" :string)
-           ("Ð¯Ì" "¤" :string)
-           ("Ð¾Ì" "¤" :string)
-           ("Ð°Ì" "¤" :string)
-           ("Ð™Ì" "¤" :string)
            ("ÑÌ" "¤" :string)
-           ("Ð†Ì" "¤" :string)
-           ("Ð«Ì" "¤" :string)
+           ("Ñ‘Ì" "¤" :string)
+           ("Ð®Ì" "¤" :string)
            ("Ð¹Ì" "¤" :string)
-           ("Ð˜Ì" "¤" :string)
-           ("ÐµÌ" "¤" :string)
+           ("Ð™Ì" "¤" :string)
+           ("Ð°Ì" "¤" :string)
            ("ÑÌ" "¤" :string)
+           ("ÑƒÌ" "¤" :string)
            ("ÐÌ" "¤" :string)
-           ("Ñ¢" "¤" :string)
+           ("Ñ–Ì" "¤" :string)
+           ("Ñ‹Ì" "¤" :string)
+           ("ÐÌ" "¤" :string)
+           ("ÑŽÌ" "¤" :string)
+           ("Ð¾Ì" "¤" :string)
            ("Ð¿" "¤" :string)
-           ("Ñ£" "¤" :string)
-           ("Ñ‡" "¤" :string)
-           ("Ðµ" "¤" :string)
-           ("Ð±" "¤" :string)
-           ("Ñƒ" "¤" :string)
-           ("Ð˜" "¤" :string)
-           ("Ð¹" "¤" :string)
-           ("Ñµ" "¤" :string)
-           ("Ñ€" "¤" :string)
-           ("Ðº" "¤" :string)
-           ("Ñ‚" "¤" :string)
-           ("ÐŸ" "¤" :string)
-           ("Ñ†" "¤" :string)
-           ("Ð›" "¤" :string)
-           ("Ð–" "¤" :string)
-           ("Ð¾" "¤" :string)
-           ("Ð”" "¤" :string)
+           ("Ñ²" "¤" :string)
            ("ÑŠ" "¤" :string)
-           ("Ð" "¤" :string)
-           ("Ð¸" "¤" :string)
-           ("Ñ„" "¤" :string)
-           ("Ð¨" "¤" :string)
-           ("Ð»" "¤" :string)
-           ("Ð©" "¤" :string)
-           ("Ðš" "¤" :string)
-           ("Ð™" "¤" :string)
-           ("Ñ³" "¤" :string)
-           ("Ð‘" "¤" :string)
-           ("Ð³" "¤" :string)
-           ("Ñ" "¤" :string)
-           ("Ñ…" "¤" :string)
-           ("Ñ‹" "¤" :string)
-           ("Ñ´" "¤" :string)
+           ("Ð°" "¤" :string)
            ("Ð¯" "¤" :string)
-           ("Ñˆ" "¤" :string)
-           ("Ð§" "¤" :string)
-           ("Ð " "¤" :string)
-           ("Ñ‰" "¤" :string)
-           ("Ð´" "¤" :string)
-           ("Ðœ" "¤" :string)
-           ("ÑŒ" "¤" :string)
-           ("Ð¢" "¤" :string)
-           ("Ð—" "¤" :string)
+           ("Ð–" "¤" :string)
            ("Ð²" "¤" :string)
-           ("Ð¦" "¤" :string)
-           ("Ð¡" "¤" :string)
-           ("Ð¤" "¤" :string)
-           ("Ð°" "¤" :string)
-           ("Ð†" "¤" :string)
+           ("Ð´" "¤" :string)
+           ("Ñ" "¤" :string)
+           ("Ñ‰" "¤" :string)
            ("Ð’" "¤" :string)
-           ("Ðž" "¤" :string)
-           ("Ð½" "¤" :string)
-           ("Ð¥" "¤" :string)
-           ("Ð¼" "¤" :string)
-           ("Ð·" "¤" :string)
-           ("Ð¶" "¤" :string)
+           ("Ð³" "¤" :string)
            ("Ñ–" "¤" :string)
-           ("Ñ²" "¤" :string)
-           ("Ñ" "¤" :string)
-           ("Ð£" "¤" :string)
-           ("Ñ" "¤" :string)
-           ("Ð" "¤" :string)
-           ("Ð“" "¤" :string)
-           ("Ð¬" "¤" :string)
+           ("Ñ‹" "¤" :string)
            ("Ñ‘" "¤" :string)
+           ("Ð¦" "¤" :string)
+           ("ÐŸ" "¤" :string)
+           ("ÑŒ" "¤" :string)
+           ("Ð " "¤" :string)
+           ("Ð¨" "¤" :string)
            ("Ð" "¤" :string)
+           ("Ñˆ" "¤" :string)
+           ("Ð£" "¤" :string)
+           ("Ñ" "¤" :string)
+           ("Ð”" "¤" :string)
            ("Ð«" "¤" :string)
+           ("Ð»" "¤" :string)
+           ("Ñµ" "¤" :string)
+           ("Ð—" "¤" :string)
+           ("Ð¬" "¤" :string)
+           ("Ðž" "¤" :string)
+           ("Ð½" "¤" :string)
+           ("ÑŽ" "¤" :string)
            ("Ð•" "¤" :string)
-           ("Ð" "¤" :string)
            ("Ðª" "¤" :string)
-           ("ÑŽ" "¤" :string)
+           ("Ñ‡" "¤" :string)
+           ("Ð¥" "¤" :string)
+           ("Ð™" "¤" :string)
+           ("Ðœ" "¤" :string)
+           ("Ð¡" "¤" :string)
+           ("Ð" "¤" :string)
+           ("Ñ³" "¤" :string)
+           ("Ð›" "¤" :string)
+           ("Ñ£" "¤" :string)
+           ("Ñ…" "¤" :string)
+           ("Ð±" "¤" :string)
+           ("Ð‘" "¤" :string)
+           ("Ñ†" "¤" :string)
+           ("Ð¢" "¤" :string)
+           ("Ð" "¤" :string)
+           ("Ð†" "¤" :string)
+           ("Ñ„" "¤" :string)
            ("Ð®" "¤" :string)
+           ("Ñ´" "¤" :string)
+           ("Ð¶" "¤" :string)
+           ("Ñƒ" "¤" :string)
+           ("Ð·" "¤" :string)
+           ("Ð¸" "¤" :string)
+           ("Ðµ" "¤" :string)
+           ("Ñ€" "¤" :string)
+           ("Ð¤" "¤" :string)
+           ("Ð˜" "¤" :string)
+           ("Ð¹" "¤" :string)
+           ("Ðº" "¤" :string)
+           ("Ð“" "¤" :string)
+           ("Ð§" "¤" :string)
+           ("Ð©" "¤" :string)
+           ("Ñ" "¤" :string)
+           ("Ñ‚" "¤" :string)
+           ("Ð" "¤" :string)
+           ("Ñ¢" "¤" :string)
+           ("Ð¼" "¤" :string)
+           ("Ð¾" "¤" :string)
+           ("Ðš" "¤" :string)
            ("Ì" "§" :string)
            ("?" "¡" :string)
            ("!" "¢" :string)