Update xindy modules

git-svn-id: svn://tug.org/texlive/trunk@37002 c570f23f-e606-0410-a88d-b1316a301751

129 files changed, 26089 insertions, 26089 deletions

diff --git a/Master/texmf-dist/xindy/modules/lang/albanian/latin1.xdy b/Master/texmf-dist/xindy/modules/lang/albanian/latin1.xdy
index a14742632bf..192eee67f33 100644
--- a/Master/texmf-dist/xindy/modules/lang/albanian/latin1.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/albanian/latin1.xdy
@@ -47,35 +47,35 @@
            ("Gj" "�" :string)
            ("gj" "�" :string)
            ("GJ" "�" :string)
-           ("ll" "�" :string)
-           ("LL" "�" :string)
            ("Ll" "�" :string)
+           ("LL" "�" :string)
+           ("ll" "�" :string)
            ("nj" "�" :string)
            ("NJ" "�" :string)
            ("Nj" "�" :string)
            ("Rr" "�" :string)
            ("RR" "�" :string)
            ("rr" "�" :string)
-           ("sh" "�" :string)
            ("SH" "�" :string)
            ("Sh" "�" :string)
+           ("sh" "�" :string)
            ("Th" "�" :string)
-           ("th" "�" :string)
            ("TH" "�" :string)
+           ("th" "�" :string)
            ("xh" "�" :string)
-           ("Xh" "�" :string)
            ("XH" "�" :string)
+           ("Xh" "�" :string)
            ("zh" "�" :string)
-           ("Zh" "�" :string)
            ("ZH" "�" :string)
-           ("a" "�" :string)
+           ("Zh" "�" :string)
            ("A" "�" :string)
-           ("B" "�" :string)
+           ("a" "�" :string)
            ("b" "�" :string)
-           ("c" "�" :string)
+           ("B" "�" :string)
            ("C" "�" :string)
-           ("�" "�" :string)
+           ("c" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("d" "�" :string)
            ("D" "�" :string)
            ("E" "�" :string)
@@ -84,319 +84,319 @@
            ("�" "�" :string)
            ("F" "�" :string)
            ("f" "�" :string)
-           ("G" "�" :string)
            ("g" "�" :string)
-           ("H" "�" :string)
+           ("G" "�" :string)
            ("h" "�" :string)
+           ("H" "�" :string)
            ("i" "�" :string)
            ("I" "�" :string)
-           ("j" "�" :string)
            ("J" "�" :string)
-           ("K" "�" :string)
+           ("j" "�" :string)
            ("k" "�" :string)
-           ("L" "�" :string)
+           ("K" "�" :string)
            ("l" "�" :string)
+           ("L" "�" :string)
            ("M" "�" :string)
            ("m" "�" :string)
-           ("N" "�" :string)
            ("n" "�" :string)
+           ("N" "�" :string)
            ("O" "�" :string)
            ("o" "�" :string)
            ("P" "�" :string)
            ("p" "�" :string)
-           ("q" "�" :string)
            ("Q" "�" :string)
+           ("q" "�" :string)
            ("r" "�" :string)
            ("R" "�" :string)
-           ("S" "�" :string)
            ("s" "�" :string)
-           ("T" "�" :string)
+           ("S" "�" :string)
            ("t" "�" :string)
-           ("U" "�" :string)
+           ("T" "�" :string)
            ("u" "�" :string)
-           ("v" "�" :string)
+           ("U" "�" :string)
            ("V" "�" :string)
+           ("v" "�" :string)
            ("w" "�" :string)
            ("W" "�" :string)
            ("x" "�" :string)
            ("X" "�" :string)
-           ("Y" "�" :string)
            ("y" "�" :string)
+           ("Y" "�" :string)
            ("z" "�" :string)
            ("Z" "�" :string)
            ))
 
 (define-rule-set "sq-resolve-diacritics"
 
-  :rules  (("GJ" "�" :string)
-           ("Xh" "�" :string)
-           ("LL" "�" :string)
-           ("rr" "�" :string)
-           ("nj" "�" :string)
-           ("Sh" "�" :string)
-           ("TH" "�" :string)
+  :rules  (("LL" "�" :string)
            ("Nj" "�" :string)
-           ("Ll" "�" :string)
-           ("NJ" "�" :string)
-           ("XH" "�" :string)
-           ("dh" "�" :string)
            ("ZH" "�" :string)
+           ("GJ" "�" :string)
            ("Dh" "�" :string)
-           ("DH" "�" :string)
-           ("zh" "�" :string)
-           ("RR" "�" :string)
+           ("XH" "�" :string)
+           ("sh" "�" :string)
+           ("Zh" "�" :string)
+           ("Sh" "�" :string)
+           ("rr" "�" :string)
+           ("Xh" "�" :string)
+           ("dh" "�" :string)
+           ("ll" "�" :string)
            ("Th" "�" :string)
+           ("Gj" "�" :string)
+           ("RR" "�" :string)
+           ("zh" "�" :string)
            ("Rr" "�" :string)
-           ("sh" "�" :string)
+           ("TH" "�" :string)
+           ("gj" "�" :string)
+           ("Ll" "�" :string)
+           ("DH" "�" :string)
+           ("th" "�" :string)
            ("xh" "�" :string)
            ("SH" "�" :string)
-           ("ll" "�" :string)
-           ("Zh" "�" :string)
-           ("th" "�" :string)
-           ("gj" "�" :string)
-           ("Gj" "�" :string)
-           ("Q" "�" :string)
-           ("R" "�" :string)
+           ("nj" "�" :string)
+           ("NJ" "�" :string)
+           ("I" "�" :string)
+           ("e" "�" :string)
+           ("a" "�" :string)
+           ("t" "�" :string)
+           ("c" "�" :string)
+           ("z" "�" :string)
+           ("f" "�" :string)
+           ("o" "�" :string)
+           ("q" "�" :string)
            ("H" "�" :string)
-           ("T" "�" :string)
-           ("�" "�" :string)
-           ("B" "�" :string)
-           ("l" "�" :string)
-           ("k" "�" :string)
-           ("s" "�" :string)
            ("�" "�" :string)
+           ("R" "�" :string)
+           ("r" "�" :string)
+           ("G" "�" :string)
+           ("K" "�" :string)
            ("L" "�" :string)
-           ("F" "�" :string)
-           ("z" "�" :string)
+           ("g" "�" :string)
+           ("T" "�" :string)
            ("N" "�" :string)
-           ("K" "�" :string)
-           ("r" "�" :string)
-           ("y" "�" :string)
-           ("�" "�" :string)
-           ("X" "�" :string)
-           ("C" "�" :string)
-           ("e" "�" :string)
-           ("f" "�" :string)
-           ("A" "�" :string)
            ("m" "�" :string)
-           ("o" "�" :string)
-           ("a" "�" :string)
+           ("W" "�" :string)
+           ("U" "�" :string)
+           ("v" "�" :string)
            ("Z" "�" :string)
-           ("c" "�" :string)
-           ("x" "�" :string)
-           ("g" "�" :string)
-           ("n" "�" :string)
-           ("b" "�" :string)
-           ("D" "�" :string)
-           ("h" "�" :string)
-           ("t" "�" :string)
-           ("E" "�" :string)
            ("w" "�" :string)
-           ("G" "�" :string)
-           ("I" "�" :string)
-           ("P" "�" :string)
+           ("b" "�" :string)
+           ("V" "�" :string)
+           ("d" "�" :string)
            ("j" "�" :string)
-           ("v" "�" :string)
            ("i" "�" :string)
-           ("Y" "�" :string)
-           ("S" "�" :string)
-           ("q" "�" :string)
-           ("M" "�" :string)
-           ("u" "�" :string)
-           ("J" "�" :string)
-           ("U" "�" :string)
-           ("p" "�" :string)
-           ("d" "�" :string)
-           ("W" "�" :string)
+           ("Q" "�" :string)
+           ("A" "�" :string)
+           ("x" "�" :string)
+           ("h" "�" :string)
            ("�" "�" :string)
-           ("V" "�" :string)
+           ("�" "�" :string)
+           ("P" "�" :string)
            ("O" "�" :string)
+           ("E" "�" :string)
+           ("J" "�" :string)
+           ("F" "�" :string)
+           ("n" "�" :string)
+           ("M" "�" :string)
+           ("C" "�" :string)
+           ("y" "�" :string)
+           ("�" "�" :string)
+           ("s" "�" :string)
+           ("l" "�" :string)
+           ("S" "�" :string)
+           ("Y" "�" :string)
+           ("k" "�" :string)
+           ("B" "�" :string)
+           ("p" "�" :string)
+           ("X" "�" :string)
+           ("u" "�" :string)
+           ("D" "�" :string)
            ))
 
 (define-rule-set "sq-resolve-case"
 
-  :rules  (("DH" "7" :string)
-           ("RR" "7" :string)
+  :rules  (("RR" "7" :string)
+           ("NJ" "7" :string)
            ("SH" "7" :string)
+           ("DH" "7" :string)
            ("TH" "7" :string)
-           ("LL" "7" :string)
+           ("XH" "7" :string)
            ("GJ" "7" :string)
            ("ZH" "7" :string)
-           ("XH" "7" :string)
-           ("NJ" "7" :string)
+           ("LL" "7" :string)
            ("Rr" "8" :string)
-           ("Th" "8" :string)
            ("Gj" "8" :string)
-           ("Zh" "8" :string)
-           ("Sh" "8" :string)
-           ("Xh" "8" :string)
-           ("Dh" "8" :string)
+           ("Th" "8" :string)
            ("Ll" "8" :string)
+           ("Dh" "8" :string)
            ("Nj" "8" :string)
+           ("Xh" "8" :string)
+           ("Zh" "8" :string)
+           ("Sh" "8" :string)
            ("zh" "9" :string)
+           ("nj" "9" :string)
+           ("xh" "9" :string)
            ("th" "9" :string)
            ("gj" "9" :string)
            ("ll" "9" :string)
-           ("xh" "9" :string)
-           ("sh" "9" :string)
-           ("nj" "9" :string)
-           ("rr" "9" :string)
            ("dh" "9" :string)
+           ("rr" "9" :string)
+           ("sh" "9" :string)
+           ("C" "8" :string)
+           ("M" "8" :string)
+           ("F" "8" :string)
+           ("E" "8" :string)
+           ("J" "8" :string)
+           ("O" "8" :string)
            ("P" "8" :string)
-           ("S" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("A" "8" :string)
+           ("Q" "8" :string)
+           ("V" "8" :string)
+           ("D" "8" :string)
+           ("X" "8" :string)
+           ("B" "8" :string)
            ("Y" "8" :string)
-           ("E" "8" :string)
+           ("S" "8" :string)
+           ("H" "8" :string)
            ("I" "8" :string)
-           ("G" "8" :string)
+           ("Z" "8" :string)
            ("U" "8" :string)
-           ("V" "8" :string)
-           ("O" "8" :string)
            ("W" "8" :string)
-           ("�" "8" :string)
-           ("M" "8" :string)
-           ("J" "8" :string)
-           ("K" "8" :string)
            ("N" "8" :string)
-           ("F" "8" :string)
-           ("L" "8" :string)
            ("T" "8" :string)
-           ("�" "8" :string)
-           ("H" "8" :string)
-           ("Q" "8" :string)
+           ("L" "8" :string)
+           ("K" "8" :string)
+           ("G" "8" :string)
            ("R" "8" :string)
-           ("B" "8" :string)
-           ("D" "8" :string)
-           ("A" "8" :string)
-           ("X" "8" :string)
-           ("C" "8" :string)
-           ("Z" "8" :string)
-           ("j" "9" :string)
+           ("�" "9" :string)
+           ("y" "9" :string)
+           ("n" "9" :string)
+           ("h" "9" :string)
+           ("x" "9" :string)
            ("i" "9" :string)
-           ("v" "9" :string)
-           ("w" "9" :string)
+           ("j" "9" :string)
            ("d" "9" :string)
-           ("p" "9" :string)
-           ("q" "9" :string)
+           ("b" "9" :string)
+           ("w" "9" :string)
            ("u" "9" :string)
-           ("r" "9" :string)
-           ("z" "9" :string)
-           ("y" "9" :string)
-           ("�" "9" :string)
-           ("s" "9" :string)
+           ("p" "9" :string)
            ("k" "9" :string)
            ("l" "9" :string)
-           ("n" "9" :string)
-           ("g" "9" :string)
-           ("x" "9" :string)
-           ("t" "9" :string)
-           ("h" "9" :string)
-           ("b" "9" :string)
+           ("s" "9" :string)
+           ("�" "9" :string)
+           ("q" "9" :string)
+           ("o" "9" :string)
            ("f" "9" :string)
-           ("e" "9" :string)
-           ("�" "9" :string)
+           ("z" "9" :string)
            ("c" "9" :string)
            ("a" "9" :string)
-           ("o" "9" :string)
+           ("t" "9" :string)
+           ("e" "9" :string)
+           ("v" "9" :string)
            ("m" "9" :string)
+           ("g" "9" :string)
+           ("r" "9" :string)
            ))
 
 (define-rule-set "sq-ignore-special"
 
-  :rules  (("?" "" :string)
-           ("!" "" :string)
+  :rules  (("-" "" :string)
            ("." "" :string)
+           ("?" "" :string)
+           ("!" "" :string)
            ("'" "" :string)
-           ("-" "" :string)
            ))
 
 (define-rule-set "sq-resolve-special"
 
-  :rules  (("sh" "�" :string)
-           ("xh" "�" :string)
-           ("ll" "�" :string)
-           ("SH" "�" :string)
+  :rules  (("Xh" "�" :string)
+           ("rr" "�" :string)
+           ("dh" "�" :string)
+           ("sh" "�" :string)
+           ("Sh" "�" :string)
            ("Zh" "�" :string)
-           ("th" "�" :string)
-           ("Gj" "�" :string)
-           ("gj" "�" :string)
-           ("DH" "�" :string)
-           ("zh" "�" :string)
-           ("RR" "�" :string)
-           ("Th" "�" :string)
-           ("Rr" "�" :string)
+           ("ll" "�" :string)
            ("Nj" "�" :string)
-           ("Ll" "�" :string)
-           ("NJ" "�" :string)
+           ("LL" "�" :string)
+           ("ZH" "�" :string)
            ("XH" "�" :string)
-           ("dh" "�" :string)
            ("Dh" "�" :string)
-           ("ZH" "�" :string)
            ("GJ" "�" :string)
-           ("LL" "�" :string)
-           ("Xh" "�" :string)
-           ("rr" "�" :string)
-           ("Sh" "�" :string)
-           ("nj" "�" :string)
+           ("xh" "�" :string)
+           ("th" "�" :string)
+           ("DH" "�" :string)
+           ("Ll" "�" :string)
+           ("SH" "�" :string)
+           ("gj" "�" :string)
            ("TH" "�" :string)
+           ("NJ" "�" :string)
+           ("nj" "�" :string)
+           ("Gj" "�" :string)
+           ("Th" "�" :string)
+           ("RR" "�" :string)
+           ("Rr" "�" :string)
+           ("zh" "�" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("q" "�" :string)
-           ("M" "�" :string)
-           ("u" "�" :string)
-           ("J" "�" :string)
+           ("G" "�" :string)
+           ("L" "�" :string)
+           ("K" "�" :string)
+           ("r" "�" :string)
+           ("R" "�" :string)
+           ("v" "�" :string)
+           ("Z" "�" :string)
            ("U" "�" :string)
-           ("d" "�" :string)
-           ("p" "�" :string)
+           ("g" "�" :string)
+           ("T" "�" :string)
            ("W" "�" :string)
-           ("�" "�" :string)
-           ("V" "�" :string)
-           ("O" "�" :string)
-           ("E" "�" :string)
-           ("w" "�" :string)
+           ("N" "�" :string)
+           ("m" "�" :string)
+           ("c" "�" :string)
+           ("z" "�" :string)
+           ("t" "�" :string)
+           ("a" "�" :string)
+           ("e" "�" :string)
            ("I" "�" :string)
-           ("G" "�" :string)
-           ("P" "�" :string)
-           ("j" "�" :string)
-           ("i" "�" :string)
-           ("v" "�" :string)
-           ("Y" "�" :string)
+           ("�" "�" :string)
+           ("H" "�" :string)
+           ("q" "�" :string)
+           ("f" "�" :string)
+           ("o" "�" :string)
+           ("l" "�" :string)
            ("S" "�" :string)
-           ("�" "�" :string)
+           ("s" "�" :string)
+           ("u" "�" :string)
            ("X" "�" :string)
-           ("C" "�" :string)
-           ("e" "�" :string)
-           ("f" "�" :string)
+           ("D" "�" :string)
+           ("Y" "�" :string)
+           ("k" "�" :string)
+           ("p" "�" :string)
+           ("B" "�" :string)
            ("A" "�" :string)
-           ("m" "�" :string)
-           ("Z" "�" :string)
-           ("o" "�" :string)
-           ("a" "�" :string)
-           ("c" "�" :string)
-           ("n" "�" :string)
-           ("g" "�" :string)
+           ("Q" "�" :string)
            ("x" "�" :string)
+           ("V" "�" :string)
            ("b" "�" :string)
-           ("D" "�" :string)
-           ("t" "�" :string)
-           ("h" "�" :string)
-           ("R" "�" :string)
-           ("Q" "�" :string)
-           ("H" "�" :string)
-           ("T" "�" :string)
+           ("w" "�" :string)
+           ("i" "�" :string)
+           ("j" "�" :string)
+           ("d" "�" :string)
+           ("C" "�" :string)
+           ("M" "�" :string)
+           ("n" "�" :string)
+           ("�" "�" :string)
+           ("y" "�" :string)
+           ("O" "�" :string)
+           ("P" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("B" "�" :string)
-           ("l" "�" :string)
-           ("k" "�" :string)
-           ("s" "�" :string)
-           ("�" "�" :string)
-           ("L" "�" :string)
-           ("z" "�" :string)
+           ("h" "�" :string)
            ("F" "�" :string)
-           ("K" "�" :string)
-           ("N" "�" :string)
-           ("r" "�" :string)
-           ("y" "�" :string)
+           ("E" "�" :string)
+           ("J" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/albanian/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/albanian/utf8.xdy
index cf8de916bee..1c6295d2864 100644
--- a/Master/texmf-dist/xindy/modules/lang/albanian/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/albanian/utf8.xdy
@@ -41,362 +41,362 @@
 
 (define-rule-set "sq-alphabetize"
 
-  :rules  (("ç" "�" :string)
-           ("Ç" "�" :string)
+  :rules  (("Ç" "�" :string)
+           ("ç" "�" :string)
            ("dh" "�" :string)
            ("DH" "�" :string)
            ("Dh" "�" :string)
-           ("ë" "�" :string)
            ("Ë" "�" :string)
+           ("ë" "�" :string)
            ("Gj" "�" :string)
            ("GJ" "�" :string)
            ("gj" "�" :string)
            ("LL" "�" :string)
-           ("ll" "�" :string)
            ("Ll" "�" :string)
+           ("ll" "�" :string)
+           ("nj" "�" :string)
            ("Nj" "�" :string)
            ("NJ" "�" :string)
-           ("nj" "�" :string)
-           ("rr" "�" :string)
            ("Rr" "�" :string)
+           ("rr" "�" :string)
            ("RR" "�" :string)
            ("Sh" "�" :string)
-           ("SH" "�" :string)
            ("sh" "�" :string)
-           ("TH" "�" :string)
+           ("SH" "�" :string)
            ("Th" "�" :string)
            ("th" "�" :string)
-           ("XH" "�" :string)
-           ("xh" "�" :string)
+           ("TH" "�" :string)
            ("Xh" "�" :string)
+           ("xh" "�" :string)
+           ("XH" "�" :string)
            ("zh" "�" :string)
            ("Zh" "�" :string)
            ("ZH" "�" :string)
            ("A" "�" :string)
            ("a" "�" :string)
-           ("B" "�" :string)
            ("b" "�" :string)
-           ("C" "�" :string)
+           ("B" "�" :string)
            ("c" "�" :string)
+           ("C" "�" :string)
            ("d" "�" :string)
            ("D" "�" :string)
-           ("e" "�" :string)
            ("E" "�" :string)
+           ("e" "�" :string)
            ("F" "�" :string)
            ("f" "�" :string)
-           ("G" "�" :string)
            ("g" "�" :string)
-           ("h" "�" :string)
+           ("G" "�" :string)
            ("H" "�" :string)
+           ("h" "�" :string)
            ("I" "�" :string)
            ("i" "�" :string)
-           ("J" "�" :string)
            ("j" "�" :string)
-           ("K" "�" :string)
+           ("J" "�" :string)
            ("k" "�" :string)
+           ("K" "�" :string)
            ("L" "�" :string)
            ("l" "�" :string)
            ("m" "�" :string)
            ("M" "�" :string)
-           ("n" "�" :string)
            ("N" "�" :string)
+           ("n" "�" :string)
            ("o" "�" :string)
            ("O" "�" :string)
            ("p" "�" :string)
            ("P" "�" :string)
            ("q" "�" :string)
            ("Q" "�" :string)
-           ("r" "�" :string)
            ("R" "�" :string)
+           ("r" "�" :string)
            ("S" "�" :string)
            ("s" "�" :string)
            ("T" "�" :string)
            ("t" "�" :string)
-           ("u" "�" :string)
            ("U" "�" :string)
-           ("V" "�" :string)
+           ("u" "�" :string)
            ("v" "�" :string)
-           ("W" "�" :string)
+           ("V" "�" :string)
            ("w" "�" :string)
+           ("W" "�" :string)
            ("X" "�" :string)
            ("x" "�" :string)
-           ("y" "�" :string)
            ("Y" "�" :string)
-           ("z" "�" :string)
+           ("y" "�" :string)
            ("Z" "�" :string)
+           ("z" "�" :string)
            ))
 
 (define-rule-set "sq-resolve-diacritics"
 
-  :rules  (("GJ" "�" :string)
-           ("th" "�" :string)
-           ("Dh" "�" :string)
+  :rules  (("ZH" "�" :string)
+           ("ll" "�" :string)
+           ("ç" "�" :string)
+           ("Ll" "�" :string)
+           ("XH" "�" :string)
+           ("LL" "�" :string)
            ("NJ" "�" :string)
-           ("gj" "�" :string)
-           ("Rr" "�" :string)
-           ("nj" "�" :string)
-           ("sh" "�" :string)
            ("Ç" "�" :string)
+           ("TH" "�" :string)
            ("RR" "�" :string)
-           ("Ll" "�" :string)
+           ("xh" "�" :string)
            ("ë" "�" :string)
-           ("TH" "�" :string)
-           ("XH" "�" :string)
-           ("ç" "�" :string)
+           ("Dh" "�" :string)
+           ("gj" "�" :string)
+           ("GJ" "�" :string)
+           ("SH" "�" :string)
+           ("Zh" "�" :string)
+           ("Gj" "�" :string)
+           ("Xh" "�" :string)
+           ("th" "�" :string)
            ("Nj" "�" :string)
-           ("dh" "�" :string)
            ("rr" "�" :string)
+           ("sh" "�" :string)
+           ("Rr" "�" :string)
+           ("nj" "�" :string)
            ("DH" "�" :string)
-           ("LL" "�" :string)
-           ("Sh" "�" :string)
-           ("zh" "�" :string)
-           ("Zh" "�" :string)
            ("Th" "�" :string)
-           ("SH" "�" :string)
-           ("ll" "�" :string)
-           ("Gj" "�" :string)
+           ("zh" "�" :string)
+           ("dh" "�" :string)
+           ("Sh" "�" :string)
            ("Ë" "�" :string)
-           ("ZH" "�" :string)
-           ("Xh" "�" :string)
-           ("xh" "�" :string)
-           ("y" "�" :string)
-           ("u" "�" :string)
-           ("F" "�" :string)
-           ("j" "�" :string)
-           ("a" "�" :string)
+           ("l" "�" :string)
+           ("Q" "�" :string)
            ("D" "�" :string)
-           ("T" "�" :string)
-           ("U" "�" :string)
-           ("N" "�" :string)
-           ("r" "�" :string)
-           ("P" "�" :string)
-           ("X" "�" :string)
-           ("R" "�" :string)
-           ("e" "�" :string)
+           ("W" "�" :string)
+           ("u" "�" :string)
            ("x" "�" :string)
-           ("Y" "�" :string)
-           ("G" "�" :string)
-           ("b" "�" :string)
-           ("K" "�" :string)
-           ("Q" "�" :string)
            ("t" "�" :string)
-           ("H" "�" :string)
-           ("v" "�" :string)
-           ("Z" "�" :string)
-           ("s" "�" :string)
-           ("E" "�" :string)
-           ("f" "�" :string)
+           ("V" "�" :string)
+           ("q" "�" :string)
            ("M" "�" :string)
+           ("m" "�" :string)
+           ("d" "�" :string)
+           ("s" "�" :string)
            ("i" "�" :string)
-           ("g" "�" :string)
-           ("I" "�" :string)
-           ("k" "�" :string)
-           ("W" "�" :string)
-           ("o" "�" :string)
-           ("z" "�" :string)
            ("L" "�" :string)
-           ("C" "�" :string)
-           ("n" "�" :string)
-           ("w" "�" :string)
-           ("A" "�" :string)
+           ("h" "�" :string)
+           ("U" "�" :string)
            ("B" "�" :string)
-           ("m" "�" :string)
-           ("S" "�" :string)
-           ("d" "�" :string)
+           ("w" "�" :string)
+           ("r" "�" :string)
+           ("z" "�" :string)
+           ("T" "�" :string)
+           ("n" "�" :string)
            ("J" "�" :string)
-           ("V" "�" :string)
-           ("l" "�" :string)
-           ("c" "�" :string)
-           ("h" "�" :string)
+           ("e" "�" :string)
+           ("K" "�" :string)
+           ("f" "�" :string)
+           ("R" "�" :string)
+           ("b" "�" :string)
            ("O" "�" :string)
+           ("F" "�" :string)
+           ("G" "�" :string)
+           ("g" "�" :string)
+           ("E" "�" :string)
+           ("y" "�" :string)
+           ("j" "�" :string)
+           ("C" "�" :string)
+           ("Y" "�" :string)
+           ("P" "�" :string)
+           ("c" "�" :string)
+           ("k" "�" :string)
+           ("S" "�" :string)
+           ("v" "�" :string)
+           ("H" "�" :string)
+           ("I" "�" :string)
            ("p" "�" :string)
-           ("q" "�" :string)
+           ("a" "�" :string)
+           ("N" "�" :string)
+           ("A" "�" :string)
+           ("Z" "�" :string)
+           ("X" "�" :string)
+           ("o" "�" :string)
            ))
 
 (define-rule-set "sq-resolve-case"
 
-  :rules  (("SH" "7" :string)
+  :rules  (("DH" "7" :string)
+           ("SH" "7" :string)
+           ("GJ" "7" :string)
+           ("RR" "7" :string)
            ("ZH" "7" :string)
-           ("TH" "7" :string)
-           ("XH" "7" :string)
-           ("DH" "7" :string)
            ("LL" "7" :string)
-           ("RR" "7" :string)
-           ("GJ" "7" :string)
+           ("XH" "7" :string)
            ("NJ" "7" :string)
-           ("Zh" "8" :string)
+           ("TH" "7" :string)
+           ("Rr" "8" :string)
            ("Th" "8" :string)
-           ("Gj" "8" :string)
+           ("Sh" "8" :string)
            ("Ë" "8" :string)
-           ("Xh" "8" :string)
+           ("Zh" "8" :string)
+           ("Gj" "8" :string)
            ("Nj" "8" :string)
-           ("Sh" "8" :string)
-           ("Ç" "8" :string)
-           ("Ll" "8" :string)
+           ("Xh" "8" :string)
            ("Dh" "8" :string)
-           ("Rr" "8" :string)
+           ("Ll" "8" :string)
+           ("Ç" "8" :string)
+           ("nj" "9" :string)
+           ("sh" "9" :string)
            ("zh" "9" :string)
-           ("ll" "9" :string)
-           ("xh" "9" :string)
-           ("ë" "9" :string)
-           ("ç" "9" :string)
            ("dh" "9" :string)
            ("rr" "9" :string)
-           ("nj" "9" :string)
-           ("sh" "9" :string)
            ("th" "9" :string)
+           ("xh" "9" :string)
+           ("ë" "9" :string)
            ("gj" "9" :string)
-           ("S" "8" :string)
-           ("J" "8" :string)
-           ("V" "8" :string)
-           ("O" "8" :string)
-           ("W" "8" :string)
-           ("L" "8" :string)
-           ("C" "8" :string)
-           ("B" "8" :string)
-           ("A" "8" :string)
-           ("Y" "8" :string)
-           ("G" "8" :string)
-           ("Q" "8" :string)
-           ("K" "8" :string)
+           ("ç" "9" :string)
+           ("ll" "9" :string)
            ("H" "8" :string)
+           ("I" "8" :string)
+           ("N" "8" :string)
+           ("A" "8" :string)
+           ("X" "8" :string)
            ("Z" "8" :string)
+           ("R" "8" :string)
            ("E" "8" :string)
-           ("M" "8" :string)
-           ("I" "8" :string)
+           ("O" "8" :string)
            ("F" "8" :string)
-           ("D" "8" :string)
-           ("T" "8" :string)
-           ("U" "8" :string)
-           ("N" "8" :string)
+           ("G" "8" :string)
+           ("C" "8" :string)
+           ("Y" "8" :string)
+           ("S" "8" :string)
            ("P" "8" :string)
-           ("R" "8" :string)
-           ("X" "8" :string)
-           ("m" "9" :string)
-           ("d" "9" :string)
-           ("c" "9" :string)
-           ("l" "9" :string)
-           ("h" "9" :string)
-           ("q" "9" :string)
+           ("B" "8" :string)
+           ("L" "8" :string)
+           ("U" "8" :string)
+           ("J" "8" :string)
+           ("T" "8" :string)
+           ("K" "8" :string)
+           ("Q" "8" :string)
+           ("D" "8" :string)
+           ("W" "8" :string)
+           ("M" "8" :string)
+           ("V" "8" :string)
            ("p" "9" :string)
+           ("a" "9" :string)
            ("o" "9" :string)
-           ("z" "9" :string)
-           ("n" "9" :string)
-           ("w" "9" :string)
+           ("y" "9" :string)
            ("b" "9" :string)
-           ("t" "9" :string)
-           ("v" "9" :string)
-           ("s" "9" :string)
-           ("f" "9" :string)
-           ("i" "9" :string)
            ("g" "9" :string)
-           ("k" "9" :string)
-           ("u" "9" :string)
-           ("y" "9" :string)
-           ("a" "9" :string)
            ("j" "9" :string)
+           ("v" "9" :string)
+           ("c" "9" :string)
+           ("k" "9" :string)
+           ("i" "9" :string)
+           ("d" "9" :string)
+           ("m" "9" :string)
+           ("s" "9" :string)
+           ("w" "9" :string)
+           ("h" "9" :string)
            ("r" "9" :string)
+           ("z" "9" :string)
+           ("n" "9" :string)
+           ("f" "9" :string)
            ("e" "9" :string)
+           ("l" "9" :string)
+           ("u" "9" :string)
            ("x" "9" :string)
+           ("q" "9" :string)
+           ("t" "9" :string)
            ))
 
 (define-rule-set "sq-ignore-special"
 
-  :rules  (("!" "" :string)
-           ("-" "" :string)
-           ("?" "" :string)
-           ("." "" :string)
+  :rules  (("?" "" :string)
            ("'" "" :string)
+           ("!" "" :string)
+           ("." "" :string)
+           ("-" "" :string)
            ))
 
 (define-rule-set "sq-resolve-special"
 
-  :rules  (("Ll" "�" :string)
-           ("RR" "�" :string)
-           ("sh" "�" :string)
-           ("Ç" "�" :string)
-           ("nj" "�" :string)
-           ("th" "�" :string)
-           ("Dh" "�" :string)
-           ("NJ" "�" :string)
-           ("Rr" "�" :string)
-           ("gj" "�" :string)
+  :rules  (("SH" "�" :string)
            ("GJ" "�" :string)
-           ("ZH" "�" :string)
-           ("xh" "�" :string)
-           ("Xh" "�" :string)
-           ("SH" "�" :string)
-           ("ll" "�" :string)
-           ("zh" "�" :string)
            ("Zh" "�" :string)
-           ("Th" "�" :string)
-           ("Ë" "�" :string)
            ("Gj" "�" :string)
+           ("Nj" "�" :string)
+           ("rr" "�" :string)
+           ("Xh" "�" :string)
+           ("th" "�" :string)
+           ("Rr" "�" :string)
+           ("nj" "�" :string)
+           ("sh" "�" :string)
+           ("zh" "�" :string)
            ("DH" "�" :string)
-           ("LL" "�" :string)
+           ("Th" "�" :string)
+           ("dh" "�" :string)
            ("Sh" "�" :string)
+           ("Ë" "�" :string)
            ("ç" "�" :string)
-           ("ë" "�" :string)
-           ("TH" "�" :string)
+           ("Ll" "�" :string)
+           ("ZH" "�" :string)
+           ("ll" "�" :string)
            ("XH" "�" :string)
-           ("rr" "�" :string)
-           ("dh" "�" :string)
-           ("Nj" "�" :string)
+           ("LL" "�" :string)
+           ("NJ" "�" :string)
+           ("TH" "�" :string)
+           ("Ç" "�" :string)
+           ("xh" "�" :string)
+           ("RR" "�" :string)
+           ("Dh" "�" :string)
+           ("ë" "�" :string)
+           ("gj" "�" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
+           ("R" "�" :string)
            ("E" "�" :string)
-           ("f" "�" :string)
-           ("Z" "�" :string)
-           ("s" "�" :string)
-           ("I" "�" :string)
-           ("k" "�" :string)
-           ("M" "�" :string)
-           ("i" "�" :string)
+           ("y" "�" :string)
+           ("O" "�" :string)
+           ("b" "�" :string)
+           ("F" "�" :string)
+           ("G" "�" :string)
            ("g" "�" :string)
-           ("t" "�" :string)
+           ("C" "�" :string)
            ("Y" "�" :string)
-           ("G" "�" :string)
-           ("K" "�" :string)
-           ("b" "�" :string)
-           ("Q" "�" :string)
+           ("j" "�" :string)
+           ("S" "�" :string)
            ("v" "�" :string)
-           ("H" "�" :string)
-           ("T" "�" :string)
-           ("U" "�" :string)
            ("P" "�" :string)
-           ("r" "�" :string)
-           ("X" "�" :string)
-           ("R" "�" :string)
-           ("x" "�" :string)
-           ("e" "�" :string)
+           ("c" "�" :string)
+           ("k" "�" :string)
+           ("H" "�" :string)
+           ("I" "�" :string)
+           ("A" "�" :string)
            ("N" "�" :string)
-           ("y" "�" :string)
-           ("u" "�" :string)
-           ("F" "�" :string)
-           ("j" "�" :string)
+           ("p" "�" :string)
            ("a" "�" :string)
-           ("D" "�" :string)
-           ("h" "�" :string)
+           ("X" "�" :string)
+           ("o" "�" :string)
+           ("Z" "�" :string)
            ("l" "�" :string)
-           ("c" "�" :string)
-           ("O" "�" :string)
-           ("p" "�" :string)
+           ("Q" "�" :string)
+           ("D" "�" :string)
+           ("W" "�" :string)
+           ("u" "�" :string)
+           ("x" "�" :string)
            ("q" "�" :string)
-           ("m" "�" :string)
-           ("J" "�" :string)
+           ("M" "�" :string)
+           ("t" "�" :string)
            ("V" "�" :string)
-           ("S" "�" :string)
+           ("i" "�" :string)
            ("d" "�" :string)
+           ("m" "�" :string)
+           ("s" "�" :string)
+           ("w" "�" :string)
+           ("B" "�" :string)
            ("L" "�" :string)
-           ("o" "�" :string)
+           ("h" "�" :string)
+           ("U" "�" :string)
+           ("J" "�" :string)
            ("z" "�" :string)
-           ("C" "�" :string)
+           ("r" "�" :string)
            ("n" "�" :string)
-           ("w" "�" :string)
-           ("A" "�" :string)
-           ("B" "�" :string)
-           ("W" "�" :string)
+           ("T" "�" :string)
+           ("K" "�" :string)
+           ("f" "�" :string)
+           ("e" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/belarusian/cp1251.xdy b/Master/texmf-dist/xindy/modules/lang/belarusian/cp1251.xdy
index d8242aa0182..3fc235ef9bf 100644
--- a/Master/texmf-dist/xindy/modules/lang/belarusian/cp1251.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/belarusian/cp1251.xdy
@@ -38,38 +38,38 @@
 
 (define-rule-set "be-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)
@@ -78,193 +78,193 @@
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :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 "be-resolve-diacritics"
 
-  :rules  (("�" "�" :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)
            ))
 
 (define-rule-set "be-resolve-case"
 
-  :rules  (("�" "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)
-           ("�" "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)
+           ("�" "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)
            ))
 
 (define-rule-set "be-ignore-special"
 
   :rules  (("'" "" :string)
-           ("." "" :string)
+           ("-" "" :string)
            ("!" "" :string)
            ("?" "" :string)
-           ("-" "" :string)
+           ("." "" :string)
            ))
 
 (define-rule-set "be-resolve-special"
@@ -272,76 +272,76 @@
   :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)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/belarusian/iso88595.xdy b/Master/texmf-dist/xindy/modules/lang/belarusian/iso88595.xdy
index d2c284a3f5e..d6b1c36ebde 100644
--- a/Master/texmf-dist/xindy/modules/lang/belarusian/iso88595.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/belarusian/iso88595.xdy
@@ -42,16 +42,16 @@
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
@@ -62,207 +62,207 @@
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :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 "be-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)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ))
 
 (define-rule-set "be-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)
-           ("�" "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)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :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)
            ))
 
 (define-rule-set "be-ignore-special"
 
-  :rules  (("?" "" :string)
+  :rules  (("!" "" :string)
+           ("?" "" :string)
            ("." "" :string)
-           ("!" "" :string)
            ("'" "" :string)
            ("-" "" :string)
            ))
@@ -272,76 +272,76 @@
   :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)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/belarusian/isoir111.xdy b/Master/texmf-dist/xindy/modules/lang/belarusian/isoir111.xdy
index 6dfe2151096..30575220244 100644
--- a/Master/texmf-dist/xindy/modules/lang/belarusian/isoir111.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/belarusian/isoir111.xdy
@@ -42,66 +42,66 @@
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
@@ -112,158 +112,158 @@
 
 (define-rule-set "be-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)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ))
 
 (define-rule-set "be-resolve-case"
 
-  :rules  (("�" "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)
+           ("�" "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)
+           ("�" "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 "be-ignore-special"
 
-  :rules  (("'" "" :string)
-           ("!" "" :string)
-           ("?" "" :string)
+  :rules  (("!" "" :string)
            ("-" "" :string)
+           ("?" "" :string)
+           ("'" "" :string)
            ("." "" :string)
            ))
 
@@ -272,75 +272,75 @@
   :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)
diff --git a/Master/texmf-dist/xindy/modules/lang/belarusian/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/belarusian/utf8.xdy
index 7a55e0f68f8..e077bf199cd 100644
--- a/Master/texmf-dist/xindy/modules/lang/belarusian/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/belarusian/utf8.xdy
@@ -40,26 +40,26 @@
 
   :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)
@@ -70,20 +70,20 @@
            ("м" "�" :string)
            ("н" "�" :string)
            ("Н" "�" :string)
-           ("о" "�" :string)
            ("О" "�" :string)
+           ("о" "�" :string)
            ("п" "�" :string)
            ("П" "�" :string)
-           ("р" "�" :string)
            ("Р" "�" :string)
-           ("с" "�" :string)
+           ("р" "�" :string)
            ("С" "�" :string)
+           ("с" "�" :string)
            ("Т" "�" :string)
            ("т" "�" :string)
            ("у" "�" :string)
            ("У" "�" :string)
-           ("Ў" "�" :string)
            ("ў" "�" :string)
+           ("Ў" "�" :string)
            ("Ф" "�" :string)
            ("ф" "�" :string)
            ("х" "�" :string)
@@ -94,251 +94,251 @@
            ("ч" "�" :string)
            ("ш" "�" :string)
            ("Ш" "�" :string)
-           ("Щ" "�" :string)
            ("щ" "�" :string)
+           ("Щ" "�" :string)
            ("Ъ" "�" :string)
            ("ъ" "�" :string)
-           ("Ы" "�" :string)
            ("ы" "�" :string)
+           ("Ы" "�" :string)
            ("Ь" "�" :string)
            ("ь" "�" :string)
            ("Э" "�" :string)
            ("э" "�" :string)
-           ("Ю" "�" :string)
            ("ю" "�" :string)
+           ("Ю" "�" :string)
            ("я" "�" :string)
            ("Я" "�" :string)
            ))
 
 (define-rule-set "be-resolve-diacritics"
 
-  :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)
-           ("щ" "�" :string)
+           ("г" "�" :string)
            ("М" "�" :string)
+           ("К" "�" :string)
+           ("ш" "�" :string)
+           ("ў" "�" :string)
            ("й" "�" :string)
-           ("Щ" "�" :string)
-           ("п" "�" :string)
-           ("и" "�" :string)
-           ("у" "�" :string)
-           ("І" "�" :string)
-           ("с" "�" :string)
-           ("Р" "�" :string)
-           ("Б" "�" :string)
-           ("ф" "�" :string)
-           ("в" "�" :string)
-           ("ь" "�" :string)
            ("С" "�" :string)
-           ("А" "�" :string)
-           ("Н" "�" :string)
-           ("д" "�" :string)
-           ("б" "�" :string)
            ("ы" "�" :string)
-           ("ў" "�" :string)
-           ("ч" "�" :string)
-           ("г" "�" :string)
-           ("ъ" "�" :string)
+           ("п" "�" :string)
+           ("я" "�" :string)
            ("Ч" "�" :string)
-           ("У" "�" :string)
+           ("Ь" "�" :string)
+           ("и" "�" :string)
+           ("В" "�" :string)
+           ("Т" "�" :string)
+           ("З" "�" :string)
+           ("т" "�" :string)
            ("а" "�" :string)
            ("Д" "�" :string)
+           ("в" "�" :string)
+           ("Л" "�" :string)
            ("Я" "�" :string)
-           ("Й" "�" :string)
-           ("Ъ" "�" :string)
-           ("ц" "�" :string)
-           ("к" "�" :string)
-           ("т" "�" :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 "be-resolve-case"
 
-  :rules  (("Ф" "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)
            ("Ч" "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)
-           ("з" "9" :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)
-           ("т" "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 "be-ignore-special"
 
-  :rules  (("!" "" :string)
-           ("." "" :string)
+  :rules  (("-" "" :string)
            ("?" "" :string)
-           ("-" "" :string)
            ("'" "" :string)
+           ("!" "" :string)
+           ("." "" :string)
            ))
 
 (define-rule-set "be-resolve-special"
 
-  :rules  (("П" "�" :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)
diff --git a/Master/texmf-dist/xindy/modules/lang/bulgarian/cp1251.xdy b/Master/texmf-dist/xindy/modules/lang/bulgarian/cp1251.xdy
index ebbbcbb41fd..1d90e8f6918 100644
--- a/Master/texmf-dist/xindy/modules/lang/bulgarian/cp1251.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/bulgarian/cp1251.xdy
@@ -40,32 +40,32 @@
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
@@ -78,8 +78,8 @@
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
@@ -88,8 +88,8 @@
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
@@ -98,139 +98,139 @@
 
 (define-rule-set "bg-resolve-diacritics"
 
-  :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)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ))
 
 (define-rule-set "bg-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)
-           ("�" "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)
+           ("�" "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 "bg-ignore-special"
 
-  :rules  (("-" "" :string)
-           ("!" "" :string)
-           ("?" "" :string)
-           ("'" "" :string)
+  :rules  (("?" "" :string)
            ("." "" :string)
+           ("-" "" :string)
+           ("'" "" :string)
+           ("!" "" :string)
            ))
 
 (define-rule-set "bg-resolve-special"
@@ -238,66 +238,66 @@
   :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)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/bulgarian/iso88595.xdy b/Master/texmf-dist/xindy/modules/lang/bulgarian/iso88595.xdy
index bc46fe36796..13f47d6939d 100644
--- a/Master/texmf-dist/xindy/modules/lang/bulgarian/iso88595.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/bulgarian/iso88595.xdy
@@ -36,14 +36,14 @@
 
   :rules  (("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
@@ -56,12 +56,12 @@
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
@@ -72,24 +72,24 @@
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
@@ -98,139 +98,139 @@
 
 (define-rule-set "bg-resolve-diacritics"
 
-  :rules  (("�" "�" :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)
            ))
 
 (define-rule-set "bg-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)
-           ("�" "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)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :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)
            ("�" "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 "bg-ignore-special"
 
-  :rules  (("!" "" :string)
+  :rules  (("'" "" :string)
+           ("-" "" :string)
+           ("!" "" :string)
            ("?" "" :string)
            ("." "" :string)
-           ("-" "" :string)
-           ("'" "" :string)
            ))
 
 (define-rule-set "bg-resolve-special"
@@ -238,66 +238,66 @@
   :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)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/bulgarian/koi8-r.xdy b/Master/texmf-dist/xindy/modules/lang/bulgarian/koi8-r.xdy
index b13fccd9a59..061460d15a9 100644
--- a/Master/texmf-dist/xindy/modules/lang/bulgarian/koi8-r.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/bulgarian/koi8-r.xdy
@@ -34,8 +34,8 @@
 
 (define-rule-set "bg-alphabetize"
 
-  :rules  (("�" "�" :string)
-           ("�" "�" :string)
+  :rules  (("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
@@ -48,8 +48,8 @@
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
@@ -60,36 +60,36 @@
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
@@ -98,139 +98,139 @@
 
 (define-rule-set "bg-resolve-diacritics"
 
-  :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)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ))
 
 (define-rule-set "bg-resolve-case"
 
-  :rules  (("�" "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)
+           ("�" "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)
            ))
 
 (define-rule-set "bg-ignore-special"
 
-  :rules  (("!" "" :string)
-           ("-" "" :string)
-           ("?" "" :string)
+  :rules  (("?" "" :string)
            ("'" "" :string)
+           ("!" "" :string)
            ("." "" :string)
+           ("-" "" :string)
            ))
 
 (define-rule-set "bg-resolve-special"
@@ -238,66 +238,66 @@
   :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)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/bulgarian/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/bulgarian/utf8.xdy
index d4ebce5776c..e4dc601addf 100644
--- a/Master/texmf-dist/xindy/modules/lang/bulgarian/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/bulgarian/utf8.xdy
@@ -35,8 +35,8 @@
 
 (define-rule-set "bg-alphabetize"
 
-  :rules  (("а" "�" :string)
-           ("А" "�" :string)
+  :rules  (("А" "�" :string)
+           ("а" "�" :string)
            ("Б" "�" :string)
            ("б" "�" :string)
            ("в" "�" :string)
@@ -63,18 +63,18 @@
            ("М" "�" :string)
            ("н" "�" :string)
            ("Н" "�" :string)
-           ("О" "�" :string)
            ("о" "�" :string)
+           ("О" "�" :string)
            ("п" "�" :string)
            ("П" "�" :string)
            ("Р" "�" :string)
            ("р" "�" :string)
-           ("с" "�" :string)
            ("С" "�" :string)
-           ("Т" "�" :string)
+           ("с" "�" :string)
            ("т" "�" :string)
-           ("У" "�" :string)
+           ("Т" "�" :string)
            ("у" "�" :string)
+           ("У" "�" :string)
            ("Ф" "�" :string)
            ("ф" "�" :string)
            ("Х" "�" :string)
@@ -83,227 +83,227 @@
            ("Ц" "�" :string)
            ("Ч" "�" :string)
            ("ч" "�" :string)
-           ("ш" "�" :string)
            ("Ш" "�" :string)
+           ("ш" "�" :string)
            ("Щ" "�" :string)
            ("щ" "�" :string)
            ("Ъ" "�" :string)
            ("ъ" "�" :string)
            ("Ь" "�" :string)
            ("ь" "�" :string)
-           ("Ю" "�" :string)
            ("ю" "�" :string)
-           ("Я" "�" :string)
+           ("Ю" "�" :string)
            ("я" "�" :string)
-           ("ѫ" "�" :string)
+           ("Я" "�" :string)
            ("Ѫ" "�" :string)
+           ("ѫ" "�" :string)
            ))
 
 (define-rule-set "bg-resolve-diacritics"
 
-  :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)
            ("Ь" "�" :string)
-           ("Ч" "�" :string)
-           ("У" "�" :string)
-           ("с" "�" :string)
-           ("Я" "�" :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 "bg-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)
-           ("н" "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)
            ("п" "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 "bg-ignore-special"
 
-  :rules  (("'" "" :string)
-           ("-" "" :string)
-           ("." "" :string)
-           ("!" "" :string)
+  :rules  (("-" "" :string)
            ("?" "" :string)
+           ("'" "" :string)
+           ("!" "" :string)
+           ("." "" :string)
            ))
 
 (define-rule-set "bg-resolve-special"
 
-  :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)
-           ("К" "�" :string)
-           ("а" "�" :string)
+           ("с" "�" :string)
+           ("П" "�" :string)
+           ("ь" "�" :string)
            ("Т" "�" :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/croatian/cp1250.xdy b/Master/texmf-dist/xindy/modules/lang/croatian/cp1250.xdy
index cff0d9fe662..68eab9eeb1f 100644
--- a/Master/texmf-dist/xindy/modules/lang/croatian/cp1250.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/croatian/cp1250.xdy
@@ -38,47 +38,47 @@
 
 (define-rule-set "hr-alphabetize"
 
-  :rules  (("d�" "�" :string)
-           ("D�" "�" :string)
+  :rules  (("D�" "�" :string)
            ("D�" "�" :string)
-           ("LJ" "�" :string)
+           ("d�" "�" :string)
            ("Lj" "�" :string)
            ("lj" "�" :string)
-           ("nj" "�" :string)
+           ("LJ" "�" :string)
            ("Nj" "�" :string)
            ("NJ" "�" :string)
+           ("nj" "�" :string)
            ("a" "�" :string)
            ("A" "�" :string)
            ("B" "�" :string)
            ("b" "�" :string)
-           ("c" "�" :string)
            ("C" "�" :string)
+           ("c" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("d" "�" :string)
+           ("�" "�" :string)
            ("D" "�" :string)
-           ("�" "�" :string)
+           ("d" "�" :string)
            ("�" "�" :string)
-           ("e" "�" :string)
+           ("�" "�" :string)
            ("E" "�" :string)
-           ("F" "�" :string)
+           ("e" "�" :string)
            ("f" "�" :string)
+           ("F" "�" :string)
            ("G" "�" :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)
@@ -87,265 +87,265 @@
            ("P" "�" :string)
            ("Q" "�" :string)
            ("q" "�" :string)
-           ("R" "�" :string)
            ("r" "�" :string)
-           ("s" "�" :string)
+           ("R" "�" :string)
            ("S" "�" :string)
-           ("�" "�" :string)
+           ("s" "�" :string)
            ("�" "�" :string)
-           ("T" "�" :string)
+           ("�" "�" :string)
            ("t" "�" :string)
+           ("T" "�" :string)
            ("U" "�" :string)
            ("u" "�" :string)
            ("V" "�" :string)
            ("v" "�" :string)
            ("w" "�" :string)
            ("W" "�" :string)
-           ("X" "�" :string)
            ("x" "�" :string)
-           ("y" "�" :string)
+           ("X" "�" :string)
            ("Y" "�" :string)
+           ("y" "�" :string)
            ("z" "�" :string)
            ("Z" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ))
 
 (define-rule-set "hr-resolve-diacritics"
 
-  :rules  (("Nj" "�" :string)
-           ("nj" "�" :string)
-           ("LJ" "�" :string)
+  :rules  (("LJ" "�" :string)
            ("d�" "�" :string)
            ("NJ" "�" :string)
-           ("lj" "�" :string)
            ("D�" "�" :string)
-           ("D�" "�" :string)
            ("Lj" "�" :string)
+           ("nj" "�" :string)
+           ("lj" "�" :string)
+           ("Nj" "�" :string)
+           ("D�" "�" :string)
+           ("y" "�" :string)
+           ("T" "�" :string)
+           ("W" "�" :string)
+           ("b" "�" :string)
+           ("t" "�" :string)
+           ("g" "�" :string)
+           ("M" "�" :string)
+           ("u" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("K" "�" :string)
+           ("l" "�" :string)
+           ("L" "�" :string)
            ("e" "�" :string)
+           ("v" "�" :string)
+           ("i" "�" :string)
+           ("n" "�" :string)
+           ("F" "�" :string)
            ("Y" "�" :string)
-           ("I" "�" :string)
+           ("w" "�" :string)
+           ("�" "�" :string)
+           ("d" "�" :string)
            ("q" "�" :string)
-           ("Z" "�" :string)
+           ("U" "�" :string)
+           ("H" "�" :string)
+           ("P" "�" :string)
            ("k" "�" :string)
+           ("�" "�" :string)
+           ("G" "�" :string)
+           ("s" "�" :string)
+           ("�" "�" :string)
            ("O" "�" :string)
-           ("W" "�" :string)
-           ("T" "�" :string)
-           ("�" "�" :string)
-           ("d" "�" :string)
-           ("c" "�" :string)
-           ("y" "�" :string)
            ("z" "�" :string)
+           ("I" "�" :string)
+           ("c" "�" :string)
+           ("h" "�" :string)
            ("o" "�" :string)
-           ("G" "�" :string)
            ("A" "�" :string)
-           ("r" "�" :string)
-           ("N" "�" :string)
-           ("�" "�" :string)
-           ("B" "�" :string)
-           ("h" "�" :string)
-           ("�" "�" :string)
-           ("w" "�" :string)
-           ("n" "�" :string)
-           ("Q" "�" :string)
-           ("F" "�" :string)
            ("a" "�" :string)
-           ("V" "�" :string)
-           ("R" "�" :string)
-           ("�" "�" :string)
-           ("u" "�" :string)
-           ("X" "�" :string)
-           ("x" "�" :string)
-           ("�" "�" :string)
-           ("m" "�" :string)
-           ("�" "�" :string)
            ("E" "�" :string)
-           ("C" "�" :string)
-           ("j" "�" :string)
-           ("K" "�" :string)
-           ("U" "�" :string)
-           ("J" "�" :string)
-           ("b" "�" :string)
-           ("i" "�" :string)
+           ("�" "�" :string)
+           ("B" "�" :string)
+           ("Z" "�" :string)
+           ("x" "�" :string)
            ("f" "�" :string)
-           ("P" "�" :string)
+           ("�" "�" :string)
            ("S" "�" :string)
-           ("�" "�" :string)
-           ("l" "�" :string)
-           ("v" "�" :string)
+           ("X" "�" :string)
+           ("R" "�" :string)
+           ("C" "�" :string)
            ("�" "�" :string)
-           ("D" "�" :string)
+           ("m" "�" :string)
+           ("N" "�" :string)
+           ("J" "�" :string)
+           ("V" "�" :string)
+           ("r" "�" :string)
+           ("�" "�" :string)
            ("p" "�" :string)
-           ("t" "�" :string)
-           ("g" "�" :string)
-           ("�" "�" :string)
-           ("M" "�" :string)
-           ("�" "�" :string)
-           ("s" "�" :string)
-           ("L" "�" :string)
-           ("H" "�" :string)
+           ("�" "�" :string)
+           ("D" "�" :string)
+           ("j" "�" :string)
+           ("Q" "�" :string)
            ))
 
 (define-rule-set "hr-resolve-case"
 
-  :rules  (("LJ" "7" :string)
+  :rules  (("D�" "7" :string)
            ("NJ" "7" :string)
-           ("D�" "7" :string)
+           ("LJ" "7" :string)
            ("Nj" "8" :string)
            ("Lj" "8" :string)
            ("D�" "8" :string)
-           ("d�" "9" :string)
            ("nj" "9" :string)
            ("lj" "9" :string)
-           ("F" "8" :string)
+           ("d�" "9" :string)
            ("Q" "8" :string)
+           ("D" "8" :string)
+           ("�" "8" :string)
            ("V" "8" :string)
+           ("J" "8" :string)
+           ("N" "8" :string)
+           ("C" "8" :string)
+           ("X" "8" :string)
            ("R" "8" :string)
-           ("A" "8" :string)
-           ("G" "8" :string)
+           ("S" "8" :string)
+           ("�" "8" :string)
            ("B" "8" :string)
-           ("�" "8" :string)
-           ("N" "8" :string)
            ("Z" "8" :string)
-           ("Y" "8" :string)
            ("I" "8" :string)
-           ("T" "8" :string)
-           ("W" "8" :string)
+           ("�" "8" :string)
+           ("E" "8" :string)
+           ("A" "8" :string)
            ("O" "8" :string)
-           ("D" "8" :string)
-           ("M" "8" :string)
-           ("�" "8" :string)
-           ("L" "8" :string)
-           ("H" "8" :string)
+           ("G" "8" :string)
+           ("�" "8" :string)
+           ("U" "8" :string)
            ("P" "8" :string)
-           ("�" "8" :string)
-           ("S" "8" :string)
+           ("H" "8" :string)
+           ("Y" "8" :string)
+           ("F" "8" :string)
+           ("L" "8" :string)
            ("K" "8" :string)
-           ("J" "8" :string)
-           ("U" "8" :string)
-           ("X" "8" :string)
            ("�" "8" :string)
-           ("E" "8" :string)
-           ("C" "8" :string)
-           ("�" "8" :string)
-           ("a" "9" :string)
-           ("h" "9" :string)
-           ("w" "9" :string)
-           ("�" "9" :string)
+           ("W" "8" :string)
+           ("T" "8" :string)
+           ("M" "8" :string)
+           ("j" "9" :string)
+           ("p" "9" :string)
+           ("�" "9" :string)
            ("r" "9" :string)
-           ("n" "9" :string)
-           ("y" "9" :string)
-           ("d" "9" :string)
-           ("�" "9" :string)
+           ("m" "9" :string)
+           ("�" "9" :string)
+           ("f" "9" :string)
+           ("x" "9" :string)
+           ("h" "9" :string)
            ("c" "9" :string)
            ("z" "9" :string)
+           ("a" "9" :string)
            ("o" "9" :string)
-           ("q" "9" :string)
-           ("k" "9" :string)
-           ("e" "9" :string)
-           ("p" "9" :string)
-           ("g" "9" :string)
-           ("t" "9" :string)
-           ("�" "9" :string)
            ("�" "9" :string)
            ("s" "9" :string)
-           ("f" "9" :string)
+           ("k" "9" :string)
+           ("q" "9" :string)
+           ("n" "9" :string)
+           ("i" "9" :string)
+           ("d" "9" :string)
+           ("�" "9" :string)
+           ("w" "9" :string)
            ("l" "9" :string)
            ("v" "9" :string)
-           ("j" "9" :string)
-           ("i" "9" :string)
-           ("b" "9" :string)
+           ("e" "9" :string)
            ("u" "9" :string)
-           ("�" "9" :string)
-           ("m" "9" :string)
-           ("x" "9" :string)
+           ("�" "9" :string)
+           ("t" "9" :string)
+           ("b" "9" :string)
+           ("y" "9" :string)
+           ("g" "9" :string)
            ))
 
 (define-rule-set "hr-ignore-special"
 
-  :rules  (("'" "" :string)
-           ("?" "" :string)
+  :rules  (("." "" :string)
+           ("'" "" :string)
            ("!" "" :string)
+           ("?" "" :string)
            ("-" "" :string)
-           ("." "" :string)
            ))
 
 (define-rule-set "hr-resolve-special"
 
-  :rules  (("d�" "�" :string)
-           ("nj" "�" :string)
-           ("LJ" "�" :string)
+  :rules  (("D�" "�" :string)
            ("Nj" "�" :string)
+           ("D�" "�" :string)
            ("Lj" "�" :string)
-           ("NJ" "�" :string)
            ("lj" "�" :string)
-           ("D�" "�" :string)
-           ("D�" "�" :string)
+           ("nj" "�" :string)
+           ("NJ" "�" :string)
+           ("LJ" "�" :string)
+           ("d�" "�" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("p" "�" :string)
+           ("D" "�" :string)
+           ("j" "�" :string)
            ("Q" "�" :string)
-           ("F" "�" :string)
-           ("a" "�" :string)
+           ("�" "�" :string)
+           ("m" "�" :string)
+           ("C" "�" :string)
+           ("r" "�" :string)
+           ("N" "�" :string)
+           ("J" "�" :string)
            ("V" "�" :string)
+           ("�" "�" :string)
+           ("S" "�" :string)
+           ("f" "�" :string)
            ("R" "�" :string)
-           ("G" "�" :string)
+           ("X" "�" :string)
            ("A" "�" :string)
-           ("r" "�" :string)
-           ("N" "�" :string)
-           ("B" "�" :string)
-           ("�" "�" :string)
-           ("h" "�" :string)
-           ("�" "�" :string)
-           ("w" "�" :string)
-           ("n" "�" :string)
-           ("�" "�" :string)
-           ("d" "�" :string)
-           ("c" "�" :string)
-           ("y" "�" :string)
-           ("z" "�" :string)
            ("o" "�" :string)
-           ("e" "�" :string)
+           ("a" "�" :string)
+           ("�" "�" :string)
+           ("E" "�" :string)
+           ("z" "�" :string)
+           ("h" "�" :string)
            ("I" "�" :string)
-           ("Y" "�" :string)
+           ("c" "�" :string)
            ("Z" "�" :string)
+           ("x" "�" :string)
+           ("B" "�" :string)
+           ("�" "�" :string)
+           ("G" "�" :string)
            ("k" "�" :string)
-           ("q" "�" :string)
-           ("O" "�" :string)
-           ("W" "�" :string)
-           ("T" "�" :string)
-           ("�" "�" :string)
-           ("D" "�" :string)
-           ("p" "�" :string)
-           ("t" "�" :string)
-           ("g" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("M" "�" :string)
            ("s" "�" :string)
-           ("L" "�" :string)
+           ("�" "�" :string)
+           ("O" "�" :string)
+           ("Y" "�" :string)
+           ("F" "�" :string)
+           ("w" "�" :string)
+           ("�" "�" :string)
+           ("d" "�" :string)
+           ("i" "�" :string)
+           ("n" "�" :string)
            ("H" "�" :string)
-           ("f" "�" :string)
            ("P" "�" :string)
-           ("S" "�" :string)
-           ("�" "�" :string)
-           ("l" "�" :string)
+           ("q" "�" :string)
+           ("U" "�" :string)
+           ("�" "�" :string)
+           ("e" "�" :string)
            ("v" "�" :string)
-           ("j" "�" :string)
            ("K" "�" :string)
-           ("U" "�" :string)
-           ("J" "�" :string)
+           ("l" "�" :string)
+           ("L" "�" :string)
+           ("g" "�" :string)
+           ("M" "�" :string)
+           ("W" "�" :string)
+           ("y" "�" :string)
+           ("T" "�" :string)
            ("b" "�" :string)
-           ("i" "�" :string)
-           ("�" "�" :string)
+           ("t" "�" :string)
+           ("�" "�" :string)
            ("u" "�" :string)
-           ("X" "�" :string)
-           ("x" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("m" "�" :string)
-           ("E" "�" :string)
-           ("C" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/croatian/latin2.xdy b/Master/texmf-dist/xindy/modules/lang/croatian/latin2.xdy
index 3a1ab7b1802..909518b412f 100644
--- a/Master/texmf-dist/xindy/modules/lang/croatian/latin2.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/croatian/latin2.xdy
@@ -38,314 +38,314 @@
 
 (define-rule-set "hr-alphabetize"
 
-  :rules  (("d�" "�" :string)
-           ("D�" "�" :string)
+  :rules  (("D�" "�" :string)
+           ("d�" "�" :string)
            ("D�" "�" :string)
-           ("LJ" "�" :string)
-           ("Lj" "�" :string)
            ("lj" "�" :string)
-           ("Nj" "�" :string)
+           ("Lj" "�" :string)
+           ("LJ" "�" :string)
            ("nj" "�" :string)
+           ("Nj" "�" :string)
            ("NJ" "�" :string)
-           ("a" "�" :string)
            ("A" "�" :string)
+           ("a" "�" :string)
            ("B" "�" :string)
            ("b" "�" :string)
-           ("C" "�" :string)
            ("c" "�" :string)
+           ("C" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("d" "�" :string)
            ("D" "�" :string)
-           ("�" "�" :string)
+           ("d" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("e" "�" :string)
            ("E" "�" :string)
            ("f" "�" :string)
            ("F" "�" :string)
-           ("g" "�" :string)
            ("G" "�" :string)
+           ("g" "�" :string)
            ("H" "�" :string)
            ("h" "�" :string)
-           ("i" "�" :string)
            ("I" "�" :string)
+           ("i" "�" :string)
            ("j" "�" :string)
            ("J" "�" :string)
            ("K" "�" :string)
            ("k" "�" :string)
-           ("l" "�" :string)
            ("L" "�" :string)
-           ("m" "�" :string)
+           ("l" "�" :string)
            ("M" "�" :string)
-           ("N" "�" :string)
+           ("m" "�" :string)
            ("n" "�" :string)
+           ("N" "�" :string)
            ("o" "�" :string)
            ("O" "�" :string)
-           ("p" "�" :string)
            ("P" "�" :string)
-           ("q" "�" :string)
+           ("p" "�" :string)
            ("Q" "�" :string)
+           ("q" "�" :string)
            ("r" "�" :string)
            ("R" "�" :string)
            ("S" "�" :string)
            ("s" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("t" "�" :string)
            ("T" "�" :string)
+           ("t" "�" :string)
            ("U" "�" :string)
            ("u" "�" :string)
-           ("V" "�" :string)
            ("v" "�" :string)
+           ("V" "�" :string)
            ("w" "�" :string)
            ("W" "�" :string)
-           ("x" "�" :string)
            ("X" "�" :string)
-           ("Y" "�" :string)
+           ("x" "�" :string)
            ("y" "�" :string)
-           ("Z" "�" :string)
+           ("Y" "�" :string)
            ("z" "�" :string)
+           ("Z" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ))
 
 (define-rule-set "hr-resolve-diacritics"
 
-  :rules  (("D�" "�" :string)
-           ("NJ" "�" :string)
+  :rules  (("Nj" "�" :string)
+           ("d�" "�" :string)
            ("Lj" "�" :string)
-           ("lj" "�" :string)
            ("D�" "�" :string)
-           ("d�" "�" :string)
-           ("Nj" "�" :string)
            ("nj" "�" :string)
+           ("lj" "�" :string)
+           ("NJ" "�" :string)
            ("LJ" "�" :string)
-           ("P" "�" :string)
-           ("T" "�" :string)
-           ("�" "�" :string)
-           ("G" "�" :string)
-           ("�" "�" :string)
-           ("v" "�" :string)
-           ("X" "�" :string)
-           ("u" "�" :string)
-           ("h" "�" :string)
+           ("D�" "�" :string)
+           ("R" "�" :string)
            ("Q" "�" :string)
            ("f" "�" :string)
-           ("n" "�" :string)
-           ("s" "�" :string)
-           ("p" "�" :string)
-           ("z" "�" :string)
-           ("�" "�" :string)
-           ("O" "�" :string)
-           ("Z" "�" :string)
-           ("V" "�" :string)
-           ("t" "�" :string)
-           ("M" "�" :string)
-           ("b" "�" :string)
-           ("F" "�" :string)
-           ("E" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("o" "�" :string)
+           ("D" "�" :string)
+           ("H" "�" :string)
+           ("I" "�" :string)
+           ("C" "�" :string)
+           ("�" "�" :string)
+           ("w" "�" :string)
+           ("j" "�" :string)
            ("U" "�" :string)
-           ("e" "�" :string)
+           ("k" "�" :string)
+           ("o" "�" :string)
+           ("�" "�" :string)
+           ("F" "�" :string)
+           ("T" "�" :string)
+           ("q" "�" :string)
+           ("M" "�" :string)
            ("S" "�" :string)
-           ("y" "�" :string)
-           ("x" "�" :string)
-           ("J" "�" :string)
-           ("D" "�" :string)
+           ("u" "�" :string)
+           ("B" "�" :string)
+           ("d" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("W" "�" :string)
-           ("N" "�" :string)
-           ("k" "�" :string)
-           ("�" "�" :string)
+           ("n" "�" :string)
            ("r" "�" :string)
-           ("l" "�" :string)
-           ("�" "�" :string)
-           ("C" "�" :string)
+           ("c" "�" :string)
+           ("e" "�" :string)
+           ("�" "�" :string)
+           ("K" "�" :string)
+           ("x" "�" :string)
+           ("v" "�" :string)
+           ("�" "�" :string)
            ("a" "�" :string)
-           ("Y" "�" :string)
-           ("q" "�" :string)
+           ("V" "�" :string)
+           ("s" "�" :string)
            ("g" "�" :string)
-           ("B" "�" :string)
-           ("�" "�" :string)
-           ("R" "�" :string)
-           ("d" "�" :string)
+           ("l" "�" :string)
            ("L" "�" :string)
-           ("H" "�" :string)
+           ("�" "�" :string)
+           ("h" "�" :string)
+           ("b" "�" :string)
+           ("Z" "�" :string)
            ("m" "�" :string)
-           ("i" "�" :string)
-           ("K" "�" :string)
-           ("j" "�" :string)
+           ("t" "�" :string)
            ("A" "�" :string)
-           ("c" "�" :string)
-           ("I" "�" :string)
-           ("�" "�" :string)
-           ("w" "�" :string)
+           ("y" "�" :string)
+           ("N" "�" :string)
+           ("Y" "�" :string)
+           ("z" "�" :string)
+           ("J" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("G" "�" :string)
+           ("X" "�" :string)
+           ("O" "�" :string)
+           ("i" "�" :string)
+           ("E" "�" :string)
+           ("W" "�" :string)
+           ("p" "�" :string)
+           ("P" "�" :string)
            ))
 
 (define-rule-set "hr-resolve-case"
 
-  :rules  (("NJ" "7" :string)
+  :rules  (("LJ" "7" :string)
            ("D�" "7" :string)
-           ("LJ" "7" :string)
+           ("NJ" "7" :string)
+           ("D�" "8" :string)
            ("Nj" "8" :string)
            ("Lj" "8" :string)
-           ("D�" "8" :string)
-           ("d�" "9" :string)
            ("nj" "9" :string)
            ("lj" "9" :string)
-           ("O" "8" :string)
-           ("Z" "8" :string)
+           ("d�" "9" :string)
+           ("�" "8" :string)
+           ("K" "8" :string)
+           ("R" "8" :string)
            ("Q" "8" :string)
-           ("F" "8" :string)
-           ("E" "8" :string)
-           ("�" "8" :string)
-           ("V" "8" :string)
-           ("M" "8" :string)
-           ("T" "8" :string)
-           ("G" "8" :string)
-           ("P" "8" :string)
-           ("�" "8" :string)
-           ("X" "8" :string)
-           ("C" "8" :string)
-           ("Y" "8" :string)
-           ("L" "8" :string)
+           ("D" "8" :string)
            ("H" "8" :string)
-           ("K" "8" :string)
-           ("A" "8" :string)
            ("I" "8" :string)
+           ("C" "8" :string)
+           ("U" "8" :string)
            ("�" "8" :string)
+           ("F" "8" :string)
+           ("T" "8" :string)
+           ("M" "8" :string)
+           ("S" "8" :string)
            ("B" "8" :string)
-           ("�" "8" :string)
-           ("R" "8" :string)
-           ("U" "8" :string)
+           ("�" "8" :string)
+           ("A" "8" :string)
            ("N" "8" :string)
-           ("S" "8" :string)
+           ("Y" "8" :string)
            ("J" "8" :string)
-           ("D" "8" :string)
-           ("�" "8" :string)
+           ("�" "8" :string)
+           ("G" "8" :string)
+           ("X" "8" :string)
+           ("O" "8" :string)
+           ("E" "8" :string)
            ("W" "8" :string)
-           ("f" "9" :string)
+           ("P" "8" :string)
+           ("�" "8" :string)
+           ("V" "8" :string)
+           ("L" "8" :string)
+           ("Z" "8" :string)
            ("n" "9" :string)
-           ("s" "9" :string)
-           ("p" "9" :string)
-           ("�" "9" :string)
-           ("z" "9" :string)
-           ("b" "9" :string)
-           ("t" "9" :string)
-           ("�" "9" :string)
-           ("u" "9" :string)
-           ("h" "9" :string)
-           ("v" "9" :string)
-           ("�" "9" :string)
            ("r" "9" :string)
+           ("c" "9" :string)
+           ("e" "9" :string)
+           ("�" "9" :string)
+           ("f" "9" :string)
            ("�" "9" :string)
-           ("l" "9" :string)
-           ("a" "9" :string)
-           ("m" "9" :string)
-           ("i" "9" :string)
            ("j" "9" :string)
-           ("c" "9" :string)
            ("w" "9" :string)
+           ("k" "9" :string)
+           ("o" "9" :string)
            ("q" "9" :string)
-           ("g" "9" :string)
+           ("u" "9" :string)
            ("d" "9" :string)
-           ("o" "9" :string)
-           ("�" "9" :string)
-           ("k" "9" :string)
-           ("e" "9" :string)
+           ("t" "9" :string)
+           ("m" "9" :string)
            ("y" "9" :string)
+           ("z" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("i" "9" :string)
+           ("p" "9" :string)
            ("x" "9" :string)
+           ("v" "9" :string)
+           ("a" "9" :string)
+           ("s" "9" :string)
+           ("g" "9" :string)
+           ("l" "9" :string)
+           ("�" "9" :string)
+           ("h" "9" :string)
+           ("b" "9" :string)
            ))
 
 (define-rule-set "hr-ignore-special"
 
-  :rules  (("!" "" :string)
-           ("-" "" :string)
-           ("." "" :string)
-           ("'" "" :string)
+  :rules  (("'" "" :string)
            ("?" "" :string)
+           ("." "" :string)
+           ("-" "" :string)
+           ("!" "" :string)
            ))
 
 (define-rule-set "hr-resolve-special"
 
-  :rules  (("LJ" "�" :string)
-           ("Nj" "�" :string)
-           ("nj" "�" :string)
-           ("d�" "�" :string)
-           ("D�" "�" :string)
+  :rules  (("nj" "�" :string)
            ("lj" "�" :string)
+           ("D�" "�" :string)
            ("Lj" "�" :string)
-           ("NJ" "�" :string)
+           ("d�" "�" :string)
+           ("Nj" "�" :string)
            ("D�" "�" :string)
+           ("LJ" "�" :string)
+           ("NJ" "�" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
            ("K" "�" :string)
-           ("A" "�" :string)
-           ("j" "�" :string)
+           ("�" "�" :string)
+           ("n" "�" :string)
+           ("�" "�" :string)
            ("c" "�" :string)
-           ("I" "�" :string)
-           ("w" "�" :string)
+           ("r" "�" :string)
+           ("e" "�" :string)
+           ("S" "�" :string)
+           ("u" "�" :string)
+           ("T" "�" :string)
+           ("q" "�" :string)
+           ("M" "�" :string)
+           ("F" "�" :string)
            ("�" "�" :string)
-           ("L" "�" :string)
-           ("H" "�" :string)
-           ("m" "�" :string)
-           ("i" "�" :string)
-           ("g" "�" :string)
            ("B" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("d" "�" :string)
+           ("D" "�" :string)
+           ("Q" "�" :string)
+           ("f" "�" :string)
            ("R" "�" :string)
-           ("q" "�" :string)
-           ("l" "�" :string)
-           ("�" "�" :string)
+           ("H" "�" :string)
            ("C" "�" :string)
-           ("Y" "�" :string)
-           ("a" "�" :string)
-           ("�" "�" :string)
-           ("r" "�" :string)
-           ("N" "�" :string)
-           ("k" "�" :string)
-           ("W" "�" :string)
-           ("e" "�" :string)
-           ("y" "�" :string)
-           ("x" "�" :string)
-           ("S" "�" :string)
-           ("D" "�" :string)
-           ("J" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("I" "�" :string)
            ("U" "�" :string)
            ("o" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("b" "�" :string)
-           ("F" "�" :string)
+           ("k" "�" :string)
+           ("w" "�" :string)
+           ("j" "�" :string)
+           ("X" "�" :string)
+           ("G" "�" :string)
+           ("�" "�" :string)
+           ("O" "�" :string)
+           ("W" "�" :string)
+           ("P" "�" :string)
+           ("p" "�" :string)
            ("E" "�" :string)
-           ("M" "�" :string)
+           ("i" "�" :string)
+           ("N" "�" :string)
+           ("y" "�" :string)
            ("t" "�" :string)
-           ("V" "�" :string)
-           ("O" "�" :string)
-           ("Z" "�" :string)
+           ("m" "�" :string)
+           ("A" "�" :string)
+           ("Y" "�" :string)
            ("z" "�" :string)
-           ("�" "�" :string)
-           ("f" "�" :string)
-           ("Q" "�" :string)
-           ("n" "�" :string)
+           ("J" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("V" "�" :string)
+           ("a" "�" :string)
+           ("�" "�" :string)
+           ("g" "�" :string)
            ("s" "�" :string)
-           ("p" "�" :string)
-           ("u" "�" :string)
+           ("b" "�" :string)
            ("h" "�" :string)
-           ("X" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("L" "�" :string)
+           ("l" "�" :string)
+           ("Z" "�" :string)
+           ("x" "�" :string)
            ("v" "�" :string)
-           ("T" "�" :string)
-           ("�" "�" :string)
-           ("G" "�" :string)
-           ("P" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/croatian/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/croatian/utf8.xdy
index aa138cadfd7..4be4078147b 100644
--- a/Master/texmf-dist/xindy/modules/lang/croatian/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/croatian/utf8.xdy
@@ -38,75 +38,75 @@
 
 (define-rule-set "hr-alphabetize"
 
-  :rules  (("DŽ" "�" :string)
+  :rules  (("dž" "�" :string)
            ("Dž" "�" :string)
-           ("dž" "�" :string)
+           ("DŽ" "�" :string)
            ("Ḱ" "�" :string)
            ("ḱ" "�" :string)
-           ("À" "�" :string)
-           ("à" "�" :string)
            ("ȁ" "�" :string)
+           ("à" "�" :string)
            ("ȃ" "�" :string)
-           ("Ȃ" "�" :string)
+           ("À" "�" :string)
            ("Ȁ" "�" :string)
-           ("č" "�" :string)
+           ("Ȃ" "�" :string)
            ("Č" "�" :string)
-           ("Ć" "�" :string)
+           ("č" "�" :string)
            ("ć" "�" :string)
-           ("Dz" "��" :string)
+           ("Ć" "�" :string)
            ("dz" "��" :string)
            ("DZ" "��" :string)
-           ("dž" "��" :string)
+           ("Dz" "��" :string)
            ("DŽ" "��" :string)
+           ("dž" "��" :string)
            ("Dž" "��" :string)
            ("Đ" "�" :string)
            ("đ" "�" :string)
-           ("è" "�" :string)
            ("Ȅ" "�" :string)
+           ("è" "�" :string)
            ("Ȇ" "�" :string)
-           ("ȇ" "�" :string)
            ("È" "�" :string)
            ("ȅ" "�" :string)
+           ("ȇ" "�" :string)
            ("Ǵ" "�" :string)
            ("ǵ" "�" :string)
-           ("Ȉ" "�" :string)
            ("ȋ" "�" :string)
-           ("Ì" "�" :string)
            ("ì" "�" :string)
-           ("Ȋ" "�" :string)
+           ("Ȉ" "�" :string)
            ("ȉ" "�" :string)
-           ("Lj" "��" :string)
-           ("LJ" "��" :string)
+           ("Ì" "�" :string)
+           ("Ȋ" "�" :string)
            ("lj" "��" :string)
-           ("lj" "�" :string)
+           ("LJ" "��" :string)
+           ("Lj" "��" :string)
            ("Lj" "�" :string)
+           ("lj" "�" :string)
            ("LJ" "�" :string)
            ("Nj" "��" :string)
            ("NJ" "��" :string)
            ("nj" "��" :string)
+           ("nj" "�" :string)
            ("NJ" "�" :string)
            ("Nj" "�" :string)
-           ("nj" "�" :string)
-           ("Ȏ" "�" :string)
            ("ȍ" "�" :string)
-           ("Ȍ" "�" :string)
-           ("Ò" "�" :string)
            ("ȏ" "�" :string)
            ("ò" "�" :string)
+           ("Ȏ" "�" :string)
+           ("Ȍ" "�" :string)
+           ("Ò" "�" :string)
            ("ȓ" "�" :string)
-           ("ȑ" "�" :string)
            ("Ȑ" "�" :string)
+           ("ȑ" "�" :string)
            ("Ȓ" "�" :string)
            ("Š" "�" :string)
            ("š" "�" :string)
-           ("Ȕ" "�" :string)
-           ("ȕ" "�" :string)
-           ("ȗ" "�" :string)
-           ("Ù" "�" :string)
            ("Ȗ" "�" :string)
+           ("Ù" "�" :string)
            ("ù" "�" :string)
-           ("Ž" "�" :string)
+           ("Ȕ" "�" :string)
+           ("ȗ" "�" :string)
+           ("ȕ" "�" :string)
            ("ž" "�" :string)
+           ("Ž" "�" :string)
            ("A" "�" :string)
            ("a" "�" :string)
            ("B" "�" :string)
@@ -119,10 +119,10 @@
            ("e" "�" :string)
            ("F" "�" :string)
            ("f" "�" :string)
-           ("g" "�" :string)
            ("G" "�" :string)
-           ("H" "�" :string)
+           ("g" "�" :string)
            ("h" "�" :string)
+           ("H" "�" :string)
            ("I" "�" :string)
            ("i" "�" :string)
            ("j" "�" :string)
@@ -133,26 +133,26 @@
            ("l" "�" :string)
            ("m" "�" :string)
            ("M" "�" :string)
-           ("n" "�" :string)
            ("N" "�" :string)
-           ("O" "�" :string)
+           ("n" "�" :string)
            ("o" "�" :string)
-           ("P" "�" :string)
+           ("O" "�" :string)
            ("p" "�" :string)
-           ("Q" "�" :string)
+           ("P" "�" :string)
            ("q" "�" :string)
+           ("Q" "�" :string)
            ("r" "�" :string)
            ("R" "�" :string)
-           ("s" "�" :string)
            ("S" "�" :string)
+           ("s" "�" :string)
            ("t" "�" :string)
            ("T" "�" :string)
            ("u" "�" :string)
            ("U" "�" :string)
            ("V" "�" :string)
            ("v" "�" :string)
-           ("W" "�" :string)
            ("w" "�" :string)
+           ("W" "�" :string)
            ("x" "�" :string)
            ("X" "�" :string)
            ("y" "�" :string)
@@ -163,389 +163,389 @@
 
 (define-rule-set "hr-resolve-diacritics"
 
-  :rules  (("DŽ" "�" :string)
-           ("dž" "�" :string)
+  :rules  (("dž" "�" :string)
+           ("DŽ" "�" :string)
            ("Dž" "�" :string)
            ("Ḱ" "�" :string)
            ("ḱ" "�" :string)
-           ("Š" "�" :string)
-           ("lj" "�" :string)
-           ("Lj" "�" :string)
-           ("LJ" "�" :string)
-           ("Nj" "�" :string)
-           ("NJ" "�" :string)
-           ("Đ" "�" :string)
+           ("Č" "�" :string)
+           ("ć" "�" :string)
            ("Ć" "�" :string)
            ("č" "�" :string)
-           ("Č" "�" :string)
-           ("nj" "�" :string)
            ("ž" "�" :string)
-           ("đ" "�" :string)
-           ("š" "�" :string)
+           ("Lj" "�" :string)
            ("Ž" "�" :string)
-           ("ć" "�" :string)
-           ("Ì" "�" :string)
-           ("Ȑ" "�" :string)
-           ("Ò" "�" :string)
-           ("ǵ" "�" :string)
-           ("à" "�" :string)
-           ("è" "�" :string)
-           ("ȑ" "�" :string)
+           ("LJ" "�" :string)
+           ("Nj" "�" :string)
+           ("š" "�" :string)
+           ("đ" "�" :string)
+           ("nj" "�" :string)
+           ("Đ" "�" :string)
+           ("lj" "�" :string)
+           ("Š" "�" :string)
+           ("NJ" "�" :string)
            ("Ǵ" "�" :string)
-           ("À" "�" :string)
+           ("ì" "�" :string)
            ("ù" "�" :string)
            ("ò" "�" :string)
+           ("à" "�" :string)
            ("Ù" "�" :string)
+           ("è" "�" :string)
+           ("ȑ" "�" :string)
+           ("Ȑ" "�" :string)
+           ("Ò" "�" :string)
+           ("ǵ" "�" :string)
+           ("Ì" "�" :string)
            ("È" "�" :string)
-           ("ì" "�" :string)
-           ("Ȅ" "�" :string)
+           ("À" "�" :string)
            ("Ȉ" "�" :string)
-           ("ȕ" "�" :string)
+           ("Ȅ" "�" :string)
            ("ȁ" "�" :string)
-           ("Ȍ" "�" :string)
-           ("Ȕ" "�" :string)
            ("ȍ" "�" :string)
-           ("ȓ" "�" :string)
            ("Ȓ" "�" :string)
+           ("ȕ" "�" :string)
            ("Ȁ" "�" :string)
-           ("ȅ" "�" :string)
+           ("Ȍ" "�" :string)
+           ("ȓ" "�" :string)
            ("ȉ" "�" :string)
+           ("ȅ" "�" :string)
+           ("Ȕ" "�" :string)
            ("Ȇ" "�" :string)
-           ("ȋ" "�" :string)
-           ("Ȃ" "�" :string)
            ("ȃ" "�" :string)
-           ("Ȏ" "�" :string)
+           ("ȏ" "�" :string)
+           ("ȋ" "�" :string)
            ("Ȗ" "�" :string)
            ("ȇ" "�" :string)
-           ("ȏ" "�" :string)
            ("Ȋ" "�" :string)
+           ("Ȃ" "�" :string)
+           ("Ȏ" "�" :string)
            ("ȗ" "�" :string)
-           ("nj" "�" :string)
-           ("Dz" "�" :string)
-           ("Dž" "�" :string)
-           ("Lj" "�" :string)
            ("DŽ" "�" :string)
-           ("NJ" "�" :string)
-           ("Nj" "�" :string)
-           ("dž" "�" :string)
-           ("LJ" "�" :string)
            ("lj" "�" :string)
-           ("DZ" "�" :string)
+           ("dž" "�" :string)
            ("dz" "�" :string)
-           ("o" "�" :string)
-           ("Y" "�" :string)
-           ("w" "�" :string)
-           ("d" "�" :string)
-           ("B" "�" :string)
-           ("O" "�" :string)
+           ("Dž" "�" :string)
+           ("Dz" "�" :string)
+           ("DZ" "�" :string)
+           ("nj" "�" :string)
+           ("Nj" "�" :string)
+           ("LJ" "�" :string)
+           ("NJ" "�" :string)
+           ("Lj" "�" :string)
+           ("k" "�" :string)
+           ("v" "�" :string)
+           ("x" "�" :string)
            ("m" "�" :string)
-           ("p" "�" :string)
-           ("W" "�" :string)
-           ("P" "�" :string)
+           ("I" "�" :string)
            ("A" "�" :string)
-           ("g" "�" :string)
-           ("y" "�" :string)
-           ("x" "�" :string)
-           ("e" "�" :string)
-           ("R" "�" :string)
-           ("z" "�" :string)
-           ("j" "�" :string)
+           ("T" "�" :string)
            ("J" "�" :string)
-           ("u" "�" :string)
-           ("H" "�" :string)
-           ("L" "�" :string)
-           ("f" "�" :string)
+           ("n" "�" :string)
+           ("P" "�" :string)
+           ("K" "�" :string)
+           ("z" "�" :string)
+           ("t" "�" :string)
            ("F" "�" :string)
-           ("c" "�" :string)
-           ("V" "�" :string)
+           ("o" "�" :string)
+           ("y" "�" :string)
            ("E" "�" :string)
-           ("r" "�" :string)
-           ("C" "�" :string)
-           ("l" "�" :string)
-           ("M" "�" :string)
-           ("S" "�" :string)
-           ("K" "�" :string)
-           ("k" "�" :string)
+           ("d" "�" :string)
+           ("w" "�" :string)
+           ("u" "�" :string)
            ("G" "�" :string)
-           ("D" "�" :string)
+           ("N" "�" :string)
+           ("h" "�" :string)
+           ("B" "�" :string)
+           ("r" "�" :string)
+           ("V" "�" :string)
+           ("p" "�" :string)
+           ("j" "�" :string)
+           ("c" "�" :string)
            ("b" "�" :string)
-           ("U" "�" :string)
-           ("Z" "�" :string)
+           ("Q" "�" :string)
+           ("R" "�" :string)
            ("s" "�" :string)
            ("q" "�" :string)
+           ("a" "�" :string)
+           ("M" "�" :string)
            ("i" "�" :string)
-           ("t" "�" :string)
-           ("I" "�" :string)
-           ("T" "�" :string)
-           ("v" "�" :string)
-           ("Q" "�" :string)
-           ("h" "�" :string)
+           ("Y" "�" :string)
            ("X" "�" :string)
-           ("N" "�" :string)
-           ("n" "�" :string)
-           ("a" "�" :string)
+           ("D" "�" :string)
+           ("l" "�" :string)
+           ("U" "�" :string)
+           ("g" "�" :string)
+           ("H" "�" :string)
+           ("S" "�" :string)
+           ("L" "�" :string)
+           ("C" "�" :string)
+           ("f" "�" :string)
+           ("Z" "�" :string)
+           ("e" "�" :string)
+           ("O" "�" :string)
+           ("W" "�" :string)
            ))
 
 (define-rule-set "hr-resolve-case"
 
   :rules  (("DŽ" "7" :string)
-           ("Ḱ" "8" :string)
            ("Dž" "8" :string)
-           ("dž" "9" :string)
+           ("Ḱ" "8" :string)
            ("ḱ" "9" :string)
-           ("NJ" "7" :string)
+           ("dž" "9" :string)
            ("LJ" "7" :string)
-           ("Đ" "8" :string)
+           ("NJ" "7" :string)
+           ("Ž" "8" :string)
            ("Nj" "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)
            ("Lj" "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)
+           ("DZ" "88" :string)
            ("NJ" "88" :string)
-           ("DŽ" "88" :string)
            ("LJ" "88" :string)
-           ("DZ" "88" :string)
-           ("Nj" "89" :string)
+           ("DŽ" "88" :string)
            ("Dz" "89" :string)
-           ("Lj" "89" :string)
            ("Dž" "89" :string)
-           ("à" "9" :string)
-           ("è" "9" :string)
-           ("ȑ" "9" :string)
-           ("ǵ" "9" :string)
-           ("ȍ" "9" :string)
-           ("ȓ" "9" :string)
-           ("ȃ" "9" :string)
-           ("ȋ" "9" :string)
-           ("ȁ" "9" :string)
-           ("ȕ" "9" :string)
-           ("lj" "9" :string)
+           ("Lj" "89" :string)
+           ("Nj" "89" :string)
+           ("ȇ" "9" :string)
            ("š" "9" :string)
+           ("ǵ" "9" :string)
            ("đ" "9" :string)
+           ("ȑ" "9" :string)
+           ("ȕ" "9" :string)
+           ("ȅ" "9" :string)
+           ("ȗ" "9" :string)
            ("ȉ" "9" :string)
+           ("nj" "9" :string)
+           ("ȓ" "9" :string)
+           ("lj" "9" :string)
+           ("č" "9" :string)
+           ("ù" "9" :string)
+           ("ò" "9" :string)
+           ("ȏ" "9" :string)
+           ("ȃ" "9" :string)
            ("ì" "9" :string)
-           ("ȗ" "9" :string)
            ("ć" "9" :string)
-           ("ȇ" "9" :string)
-           ("ȏ" "9" :string)
-           ("č" "9" :string)
-           ("nj" "9" :string)
+           ("ȍ" "9" :string)
+           ("è" "9" :string)
            ("ž" "9" :string)
-           ("ò" "9" :string)
-           ("ù" "9" :string)
-           ("ȅ" "9" :string)
-           ("dž" "99" :string)
+           ("à" "9" :string)
+           ("ȁ" "9" :string)
+           ("ȋ" "9" :string)
            ("nj" "99" :string)
            ("lj" "99" :string)
+           ("dž" "99" :string)
            ("dz" "99" :string)
-           ("H" "8" :string)
-           ("J" "8" :string)
+           ("M" "8" :string)
            ("R" "8" :string)
-           ("E" "8" :string)
-           ("V" "8" :string)
-           ("C" "8" :string)
-           ("L" "8" :string)
-           ("F" "8" :string)
-           ("Y" "8" :string)
+           ("Q" "8" :string)
+           ("Z" "8" :string)
            ("O" "8" :string)
-           ("B" "8" :string)
-           ("A" "8" :string)
-           ("P" "8" :string)
            ("W" "8" :string)
-           ("T" "8" :string)
-           ("Q" "8" :string)
-           ("I" "8" :string)
-           ("N" "8" :string)
+           ("Y" "8" :string)
            ("X" "8" :string)
+           ("D" "8" :string)
+           ("U" "8" :string)
+           ("C" "8" :string)
+           ("L" "8" :string)
            ("S" "8" :string)
+           ("H" "8" :string)
+           ("T" "8" :string)
+           ("J" "8" :string)
+           ("P" "8" :string)
            ("K" "8" :string)
-           ("M" "8" :string)
+           ("F" "8" :string)
+           ("I" "8" :string)
+           ("A" "8" :string)
+           ("N" "8" :string)
            ("G" "8" :string)
-           ("D" "8" :string)
-           ("Z" "8" :string)
-           ("U" "8" :string)
-           ("u" "9" :string)
-           ("e" "9" :string)
-           ("j" "9" :string)
-           ("z" "9" :string)
+           ("V" "8" :string)
+           ("B" "8" :string)
+           ("E" "8" :string)
+           ("a" "9" :string)
+           ("i" "9" :string)
            ("c" "9" :string)
+           ("b" "9" :string)
+           ("s" "9" :string)
+           ("q" "9" :string)
+           ("f" "9" :string)
+           ("e" "9" :string)
            ("l" "9" :string)
+           ("g" "9" :string)
+           ("n" "9" :string)
+           ("z" "9" :string)
+           ("t" "9" :string)
+           ("k" "9" :string)
+           ("v" "9" :string)
+           ("x" "9" :string)
+           ("m" "9" :string)
+           ("w" "9" :string)
+           ("u" "9" :string)
+           ("h" "9" :string)
            ("r" "9" :string)
-           ("f" "9" :string)
+           ("j" "9" :string)
            ("p" "9" :string)
+           ("y" "9" :string)
            ("o" "9" :string)
-           ("w" "9" :string)
-           ("m" "9" :string)
            ("d" "9" :string)
-           ("g" "9" :string)
-           ("y" "9" :string)
-           ("x" "9" :string)
-           ("v" "9" :string)
-           ("t" "9" :string)
-           ("n" "9" :string)
-           ("a" "9" :string)
-           ("h" "9" :string)
-           ("k" "9" :string)
-           ("q" "9" :string)
-           ("i" "9" :string)
-           ("b" "9" :string)
-           ("s" "9" :string)
            ))
 
 (define-rule-set "hr-ignore-special"
 
-  :rules  (("'" "" :string)
-           ("." "" :string)
-           ("-" "" :string)
+  :rules  (("-" "" :string)
            ("!" "" :string)
            ("?" "" :string)
+           ("'" "" :string)
+           ("." "" :string)
            ))
 
 (define-rule-set "hr-resolve-special"
 
-  :rules  (("Dž" "�" :string)
-           ("ḱ" "�" :string)
+  :rules  (("ḱ" "�" :string)
            ("dž" "�" :string)
-           ("Ḱ" "�" :string)
+           ("Dž" "�" :string)
            ("DŽ" "�" :string)
-           ("ù" "�" :string)
-           ("ȅ" "�" :string)
-           ("ò" "�" :string)
-           ("nj" "�" :string)
-           ("ž" "�" :string)
-           ("č" "�" :string)
+           ("Ḱ" "�" :string)
            ("Ȁ" "�" :string)
+           ("ȕ" "�" :string)
+           ("ȑ" "�" :string)
+           ("Ȑ" "�" :string)
            ("Ȓ" "�" :string)
-           ("Č" "�" :string)
-           ("ȏ" "�" :string)
+           ("Ȃ" "�" :string)
+           ("Ȋ" "�" :string)
+           ("Ȍ" "�" :string)
+           ("đ" "�" :string)
+           ("ǵ" "�" :string)
+           ("š" "�" :string)
+           ("Ò" "�" :string)
+           ("Nj" "�" :string)
+           ("Ž" "�" :string)
            ("ȇ" "�" :string)
+           ("LJ" "�" :string)
+           ("Đ" "�" :string)
            ("È" "�" :string)
+           ("lj" "�" :string)
+           ("ȓ" "�" :string)
+           ("Ȏ" "�" :string)
+           ("nj" "�" :string)
+           ("ȉ" "�" :string)
+           ("Ì" "�" :string)
+           ("À" "�" :string)
+           ("Ȕ" "�" :string)
            ("ȗ" "�" :string)
+           ("NJ" "�" :string)
+           ("Š" "�" :string)
+           ("ȅ" "�" :string)
            ("ć" "�" :string)
+           ("Č" "�" :string)
+           ("Ǵ" "�" :string)
            ("ì" "�" :string)
-           ("Ȋ" "�" :string)
-           ("ȉ" "�" :string)
-           ("Ù" "�" :string)
-           ("đ" "�" :string)
-           ("Ȗ" "�" :string)
-           ("Ž" "�" :string)
-           ("š" "�" :string)
+           ("ȃ" "�" :string)
+           ("Ȇ" "�" :string)
+           ("ȏ" "�" :string)
+           ("ò" "�" :string)
            ("Ȉ" "�" :string)
+           ("ù" "�" :string)
+           ("č" "�" :string)
+           ("Ć" "�" :string)
+           ("Ȗ" "�" :string)
            ("Ȅ" "�" :string)
-           ("Ȑ" "�" :string)
-           ("Ȍ" "�" :string)
-           ("Ȕ" "�" :string)
-           ("lj" "�" :string)
-           ("Lj" "�" :string)
-           ("LJ" "�" :string)
-           ("ȕ" "�" :string)
-           ("ȁ" "�" :string)
-           ("Ò" "�" :string)
-           ("Ȇ" "�" :string)
            ("ȋ" "�" :string)
-           ("ȃ" "�" :string)
-           ("Š" "�" :string)
-           ("Ȃ" "�" :string)
-           ("Ì" "�" :string)
-           ("Ǵ" "�" :string)
-           ("À" "�" :string)
-           ("ȓ" "�" :string)
-           ("Ć" "�" :string)
-           ("Ȏ" "�" :string)
-           ("ǵ" "�" :string)
-           ("NJ" "�" :string)
-           ("ȍ" "�" :string)
-           ("Nj" "�" :string)
-           ("ȑ" "�" :string)
-           ("Đ" "�" :string)
+           ("ȁ" "�" :string)
+           ("Ù" "�" :string)
+           ("ž" "�" :string)
+           ("Lj" "�" :string)
            ("à" "�" :string)
            ("è" "�" :string)
-           ("dz" "��" :string)
-           ("DZ" "��" :string)
-           ("LJ" "��" :string)
-           ("lj" "��" :string)
-           ("DŽ" "��" :string)
+           ("ȍ" "�" :string)
            ("Dž" "��" :string)
-           ("Lj" "��" :string)
-           ("NJ" "��" :string)
            ("nj" "��" :string)
+           ("DZ" "��" :string)
            ("Dz" "��" :string)
+           ("LJ" "��" :string)
            ("Nj" "��" :string)
+           ("Lj" "��" :string)
+           ("NJ" "��" :string)
+           ("DŽ" "��" :string)
            ("dž" "��" :string)
+           ("lj" "��" :string)
+           ("dz" "��" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("U" "�" :string)
-           ("Z" "�" :string)
+           ("q" "�" :string)
            ("s" "�" :string)
-           ("G" "�" :string)
-           ("D" "�" :string)
+           ("R" "�" :string)
+           ("Q" "�" :string)
            ("b" "�" :string)
+           ("c" "�" :string)
            ("i" "�" :string)
-           ("q" "�" :string)
            ("M" "�" :string)
-           ("k" "�" :string)
-           ("S" "�" :string)
-           ("K" "�" :string)
-           ("h" "�" :string)
-           ("n" "�" :string)
            ("a" "�" :string)
+           ("S" "�" :string)
+           ("L" "�" :string)
+           ("H" "�" :string)
+           ("C" "�" :string)
+           ("U" "�" :string)
+           ("g" "�" :string)
+           ("l" "�" :string)
+           ("D" "�" :string)
            ("X" "�" :string)
-           ("N" "�" :string)
+           ("Y" "�" :string)
+           ("W" "�" :string)
+           ("e" "�" :string)
+           ("O" "�" :string)
+           ("Z" "�" :string)
+           ("f" "�" :string)
+           ("A" "�" :string)
            ("I" "�" :string)
-           ("t" "�" :string)
-           ("Q" "�" :string)
+           ("m" "�" :string)
+           ("x" "�" :string)
            ("v" "�" :string)
-           ("T" "�" :string)
-           ("W" "�" :string)
+           ("k" "�" :string)
+           ("t" "�" :string)
+           ("F" "�" :string)
+           ("K" "�" :string)
            ("P" "�" :string)
-           ("y" "�" :string)
-           ("x" "�" :string)
-           ("A" "�" :string)
-           ("g" "�" :string)
-           ("B" "�" :string)
+           ("z" "�" :string)
+           ("J" "�" :string)
+           ("n" "�" :string)
+           ("T" "�" :string)
+           ("E" "�" :string)
            ("d" "�" :string)
-           ("m" "�" :string)
-           ("O" "�" :string)
            ("o" "�" :string)
-           ("w" "�" :string)
-           ("Y" "�" :string)
+           ("y" "�" :string)
            ("p" "�" :string)
-           ("F" "�" :string)
-           ("L" "�" :string)
-           ("f" "�" :string)
+           ("j" "�" :string)
+           ("B" "�" :string)
            ("r" "�" :string)
-           ("C" "�" :string)
-           ("l" "�" :string)
-           ("c" "�" :string)
+           ("h" "�" :string)
            ("V" "�" :string)
-           ("E" "�" :string)
-           ("z" "�" :string)
-           ("j" "�" :string)
-           ("e" "�" :string)
-           ("R" "�" :string)
-           ("J" "�" :string)
+           ("w" "�" :string)
+           ("G" "�" :string)
            ("u" "�" :string)
-           ("H" "�" :string)
+           ("N" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/czech/cp1250.xdy b/Master/texmf-dist/xindy/modules/lang/czech/cp1250.xdy
index 13898da4fe7..e919f509214 100644
--- a/Master/texmf-dist/xindy/modules/lang/czech/cp1250.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/czech/cp1250.xdy
@@ -35,63 +35,63 @@
 
 (define-rule-set "cs-alphabetize"
 
-  :rules  (("CH" "�" :string)
-           ("Ch" "�" :string)
+  :rules  (("Ch" "�" :string)
+           ("CH" "�" :string)
            ("ch" "�" :string)
-           ("a" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("A" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("a" "�" :string)
+           ("A" "�" :string)
            ("B" "�" :string)
            ("b" "�" :string)
-           ("C" "�" :string)
            ("c" "�" :string)
+           ("C" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("d" "�" :string)
-           ("D" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("D" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("e" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("E" "�" :string)
            ("F" "�" :string)
            ("f" "�" :string)
            ("G" "�" :string)
            ("g" "�" :string)
-           ("H" "�" :string)
            ("h" "�" :string)
-           ("i" "�" :string)
-           ("I" "�" :string)
+           ("H" "�" :string)
            ("�" "�" :string)
+           ("I" "�" :string)
+           ("i" "�" :string)
            ("�" "�" :string)
            ("j" "�" :string)
            ("J" "�" :string)
-           ("K" "�" :string)
            ("k" "�" :string)
-           ("L" "�" :string)
+           ("K" "�" :string)
            ("l" "�" :string)
-           ("M" "�" :string)
+           ("L" "�" :string)
            ("m" "�" :string)
+           ("M" "�" :string)
            ("n" "�" :string)
-           ("�" "�" :string)
            ("N" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("o" "�" :string)
+           ("O" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("O" "�" :string)
            ("�" "�" :string)
            ("p" "�" :string)
            ("P" "�" :string)
-           ("q" "�" :string)
            ("Q" "�" :string)
+           ("q" "�" :string)
            ("r" "�" :string)
            ("R" "�" :string)
            ("�" "�" :string)
@@ -101,18 +101,18 @@
            ("�" "��" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("T" "�" :string)
+           ("�" "�" :string)
            ("t" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
            ("u" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("U" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("v" "�" :string)
            ("V" "�" :string)
            ("W" "�" :string)
@@ -125,100 +125,100 @@
            ("�" "�" :string)
            ("Z" "�" :string)
            ("z" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ))
 
 (define-rule-set "cs-resolve-diacritics"
 
-  :rules  (("CH" "�" :string)
-           ("Ch" "�" :string)
+  :rules  (("Ch" "�" :string)
+           ("CH" "�" :string)
            ("ch" "�" :string)
-           ("I" "�" :string)
-           ("P" "�" :string)
-           ("N" "�" :string)
-           ("�" "�" :string)
-           ("Z" "�" :string)
-           ("j" "�" :string)
-           ("M" "�" :string)
-           ("e" "�" :string)
-           ("x" "�" :string)
-           ("a" "�" :string)
-           ("p" "�" :string)
-           ("�" "�" :string)
-           ("d" "�" :string)
-           ("H" "�" :string)
-           ("n" "�" :string)
-           ("v" "�" :string)
+           ("r" "�" :string)
+           ("T" "�" :string)
            ("q" "�" :string)
+           ("y" "�" :string)
+           ("d" "�" :string)
+           ("Z" "�" :string)
            ("F" "�" :string)
            ("X" "�" :string)
+           ("I" "�" :string)
+           ("�" "�" :string)
+           ("R" "�" :string)
+           ("G" "�" :string)
+           ("Y" "�" :string)
+           ("s" "�" :string)
+           ("�" "�" :string)
+           ("v" "�" :string)
+           ("�" "�" :string)
            ("Q" "�" :string)
-           ("W" "�" :string)
+           ("z" "�" :string)
+           ("c" "�" :string)
+           ("l" "�" :string)
+           ("e" "�" :string)
+           ("p" "�" :string)
            ("�" "�" :string)
-           ("D" "�" :string)
-           ("i" "�" :string)
+           ("�" "�" :string)
+           ("n" "�" :string)
+           ("�" "�" :string)
+           ("k" "�" :string)
+           ("u" "�" :string)
+           ("K" "�" :string)
+           ("h" "�" :string)
            ("B" "�" :string)
+           ("g" "�" :string)
+           ("j" "�" :string)
+           ("P" "�" :string)
            ("b" "�" :string)
-           ("G" "�" :string)
-           ("Y" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("L" "�" :string)
            ("O" "�" :string)
-           ("k" "�" :string)
-           ("�" "�" :string)
-           ("g" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("E" "�" :string)
-           ("J" "�" :string)
-           ("c" "�" :string)
            ("C" "�" :string)
-           ("m" "�" :string)
-           ("l" "�" :string)
-           ("S" "�" :string)
+           ("o" "�" :string)
+           ("i" "�" :string)
+           ("W" "�" :string)
+           ("f" "�" :string)
+           ("�" "�" :string)
            ("U" "�" :string)
-           ("V" "�" :string)
-           ("t" "�" :string)
+           ("H" "�" :string)
            ("w" "�" :string)
-           ("R" "�" :string)
+           ("N" "�" :string)
+           ("t" "�" :string)
+           ("S" "�" :string)
+           ("x" "�" :string)
+           ("E" "�" :string)
+           ("D" "�" :string)
            ("A" "�" :string)
-           ("f" "�" :string)
-           ("z" "�" :string)
-           ("o" "�" :string)
-           ("h" "�" :string)
-           ("r" "�" :string)
-           ("u" "�" :string)
-           ("s" "�" :string)
-           ("K" "�" :string)
-           ("T" "�" :string)
-           ("y" "�" :string)
-           ("L" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("V" "�" :string)
+           ("m" "�" :string)
+           ("J" "�" :string)
+           ("�" "�" :string)
+           ("M" "�" :string)
+           ("a" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
@@ -230,202 +230,202 @@
   :rules  (("CH" "7" :string)
            ("Ch" "8" :string)
            ("ch" "9" :string)
-           ("S" "8" :string)
-           ("�" "8" :string)
-           ("V" "8" :string)
-           ("U" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
+           ("�" "8" :string)
            ("O" "8" :string)
-           ("�" "8" :string)
+           ("L" "8" :string)
            ("C" "8" :string)
-           ("J" "8" :string)
-           ("E" "8" :string)
-           ("T" "8" :string)
-           ("K" "8" :string)
+           ("B" "8" :string)
+           ("P" "8" :string)
+           ("H" "8" :string)
+           ("�" "8" :string)
+           ("U" "8" :string)
+           ("N" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
+           ("W" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("L" "8" :string)
-           ("�" "8" :string)
+           ("�" "8" :string)
+           ("D" "8" :string)
            ("A" "8" :string)
-           ("R" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
+           ("�" "8" :string)
+           ("S" "8" :string)
+           ("E" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
            ("M" "8" :string)
-           ("�" "8" :string)
-           ("N" "8" :string)
-           ("�" "8" :string)
-           ("P" "8" :string)
+           ("�" "8" :string)
+           ("V" "8" :string)
+           ("J" "8" :string)
+           ("R" "8" :string)
+           ("T" "8" :string)
            ("I" "8" :string)
-           ("�" "8" :string)
+           ("X" "8" :string)
+           ("F" "8" :string)
            ("Z" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
-           ("D" "8" :string)
-           ("�" "8" :string)
            ("Q" "8" :string)
-           ("W" "8" :string)
-           ("F" "8" :string)
-           ("X" "8" :string)
-           ("Y" "8" :string)
            ("G" "8" :string)
-           ("B" "8" :string)
+           ("�" "8" :string)
+           ("Y" "8" :string)
+           ("�" "8" :string)
+           ("K" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
-           ("H" "8" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("l" "9" :string)
-           ("�" "9" :string)
-           ("m" "9" :string)
-           ("�" "9" :string)
+           ("j" "9" :string)
+           ("g" "9" :string)
+           ("b" "9" :string)
            ("w" "9" :string)
-           ("t" "9" :string)
-           ("�" "9" :string)
+           ("�" "9" :string)
+           ("o" "9" :string)
            ("�" "9" :string)
-           ("g" "9" :string)
-           ("k" "9" :string)
-           ("c" "9" :string)
-           ("�" "9" :string)
-           ("y" "9" :string)
-           ("�" "9" :string)
-           ("s" "9" :string)
-           ("z" "9" :string)
            ("f" "9" :string)
+           ("i" "9" :string)
+           ("�" "9" :string)
+           ("x" "9" :string)
+           ("t" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("a" "9" :string)
+           ("m" "9" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
-           ("u" "9" :string)
+           ("�" "9" :string)
+           ("y" "9" :string)
+           ("q" "9" :string)
            ("r" "9" :string)
-           ("�" "9" :string)
-           ("h" "9" :string)
-           ("o" "9" :string)
            ("�" "9" :string)
-           ("e" "9" :string)
-           ("x" "9" :string)
-           ("a" "9" :string)
-           ("�" "9" :string)
-           ("j" "9" :string)
+           ("d" "9" :string)
+           ("v" "9" :string)
+           ("�" "9" :string)
+           ("s" "9" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
-           ("i" "9" :string)
+           ("e" "9" :string)
            ("�" "9" :string)
-           ("q" "9" :string)
-           ("�" "9" :string)
-           ("b" "9" :string)
+           ("p" "9" :string)
+           ("c" "9" :string)
+           ("z" "9" :string)
+           ("l" "9" :string)
+           ("�" "9" :string)
+           ("u" "9" :string)
+           ("h" "9" :string)
            ("�" "9" :string)
+           ("k" "9" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
-           ("d" "9" :string)
-           ("�" "9" :string)
-           ("p" "9" :string)
-           ("v" "9" :string)
            ("n" "9" :string)
            ("�" "99" :string)
            ))
 
 (define-rule-set "cs-ignore-special"
 
-  :rules  (("-" "" :string)
+  :rules  (("?" "" :string)
            ("." "" :string)
            ("!" "" :string)
+           ("-" "" :string)
            ("'" "" :string)
-           ("?" "" :string)
            ))
 
 (define-rule-set "cs-resolve-special"
 
   :rules  (("CH" "�" :string)
-           ("Ch" "�" :string)
            ("ch" "�" :string)
+           ("Ch" "�" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("�" "�" :string)
-           ("n" "�" :string)
-           ("v" "�" :string)
-           ("H" "�" :string)
-           ("p" "�" :string)
-           ("d" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("Y" "�" :string)
-           ("�" "�" :string)
+           ("j" "�" :string)
+           ("g" "�" :string)
            ("B" "�" :string)
-           ("G" "�" :string)
            ("b" "�" :string)
-           ("D" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("i" "�" :string)
-           ("X" "�" :string)
-           ("F" "�" :string)
-           ("q" "�" :string)
-           ("W" "�" :string)
-           ("Q" "�" :string)
-           ("j" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("Z" "�" :string)
-           ("�" "�" :string)
-           ("N" "�" :string)
-           ("�" "�" :string)
-           ("I" "�" :string)
-           ("�" "�" :string)
            ("P" "�" :string)
-           ("x" "�" :string)
-           ("a" "�" :string)
-           ("�" "�" :string)
-           ("M" "�" :string)
-           ("�" "�" :string)
-           ("e" "�" :string)
-           ("�" "�" :string)
-           ("r" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("u" "�" :string)
+           ("O" "�" :string)
+           ("L" "�" :string)
+           ("C" "�" :string)
            ("o" "�" :string)
-           ("h" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("W" "�" :string)
            ("f" "�" :string)
-           ("�" "�" :string)
-           ("A" "�" :string)
-           ("z" "�" :string)
-           ("R" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("L" "�" :string)
+           ("i" "�" :string)
+           ("H" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("y" "�" :string)
-           ("K" "�" :string)
-           ("s" "�" :string)
-           ("�" "�" :string)
-           ("T" "�" :string)
-           ("�" "�" :string)
-           ("C" "�" :string)
-           ("c" "�" :string)
-           ("E" "�" :string)
-           ("�" "�" :string)
-           ("J" "�" :string)
-           ("g" "�" :string)
-           ("�" "�" :string)
-           ("k" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("O" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("V" "�" :string)
-           ("�" "�" :string)
            ("U" "�" :string)
+           ("N" "�" :string)
            ("w" "�" :string)
+           ("�" "�" :string)
+           ("x" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("t" "�" :string)
            ("S" "�" :string)
-           ("�" "�" :string)
+           ("E" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("A" "�" :string)
+           ("D" "�" :string)
            ("�" "�" :string)
+           ("V" "�" :string)
+           ("J" "�" :string)
            ("m" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("a" "�" :string)
+           ("M" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("q" "�" :string)
+           ("y" "�" :string)
+           ("r" "�" :string)
+           ("T" "�" :string)
+           ("I" "�" :string)
+           ("X" "�" :string)
+           ("�" "�" :string)
+           ("F" "�" :string)
+           ("Z" "�" :string)
+           ("d" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("R" "�" :string)
+           ("G" "�" :string)
+           ("�" "�" :string)
+           ("s" "�" :string)
+           ("�" "�" :string)
+           ("Y" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("v" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("Q" "�" :string)
+           ("�" "�" :string)
+           ("c" "�" :string)
+           ("z" "�" :string)
            ("l" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("e" "�" :string)
+           ("�" "�" :string)
+           ("p" "�" :string)
+           ("�" "�" :string)
+           ("k" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("n" "�" :string)
+           ("�" "�" :string)
+           ("K" "�" :string)
+           ("�" "�" :string)
+           ("u" "�" :string)
+           ("�" "�" :string)
+           ("h" "�" :string)
            ("�" "��" :string)
            ("-" "�" :string)
            ("'" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/czech/latin2.xdy b/Master/texmf-dist/xindy/modules/lang/czech/latin2.xdy
index 57179440e8c..26ded464753 100644
--- a/Master/texmf-dist/xindy/modules/lang/czech/latin2.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/czech/latin2.xdy
@@ -35,190 +35,190 @@
 
 (define-rule-set "cs-alphabetize"
 
-  :rules  (("CH" "�" :string)
-           ("ch" "�" :string)
+  :rules  (("ch" "�" :string)
            ("Ch" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("CH" "�" :string)
            ("A" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("a" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("B" "�" :string)
            ("b" "�" :string)
            ("C" "�" :string)
            ("c" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("D" "�" :string)
            ("d" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("e" "�" :string)
            ("E" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("f" "�" :string)
            ("F" "�" :string)
+           ("f" "�" :string)
            ("g" "�" :string)
            ("G" "�" :string)
            ("h" "�" :string)
            ("H" "�" :string)
-           ("i" "�" :string)
            ("I" "�" :string)
+           ("i" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("j" "�" :string)
            ("J" "�" :string)
-           ("k" "�" :string)
+           ("j" "�" :string)
            ("K" "�" :string)
-           ("L" "�" :string)
+           ("k" "�" :string)
            ("l" "�" :string)
+           ("L" "�" :string)
            ("M" "�" :string)
            ("m" "�" :string)
            ("n" "�" :string)
-           ("�" "�" :string)
            ("N" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("O" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("o" "�" :string)
            ("�" "�" :string)
+           ("O" "�" :string)
+           ("o" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("P" "�" :string)
            ("p" "�" :string)
            ("q" "�" :string)
            ("Q" "�" :string)
-           ("R" "�" :string)
            ("r" "�" :string)
+           ("R" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("S" "�" :string)
            ("s" "�" :string)
+           ("S" "�" :string)
            ("�" "��" :string)
            ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("t" "�" :string)
            ("T" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("u" "�" :string)
+           ("t" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("U" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("v" "�" :string)
+           ("�" "�" :string)
+           ("u" "�" :string)
            ("V" "�" :string)
+           ("v" "�" :string)
            ("W" "�" :string)
            ("w" "�" :string)
-           ("x" "�" :string)
            ("X" "�" :string)
+           ("x" "�" :string)
+           ("�" "�" :string)
            ("Y" "�" :string)
            ("�" "�" :string)
            ("y" "�" :string)
-           ("�" "�" :string)
-           ("Z" "�" :string)
            ("z" "�" :string)
-           ("�" "�" :string)
+           ("Z" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ))
 
 (define-rule-set "cs-resolve-diacritics"
 
-  :rules  (("CH" "�" :string)
-           ("ch" "�" :string)
+  :rules  (("ch" "�" :string)
            ("Ch" "�" :string)
-           ("h" "�" :string)
-           ("q" "�" :string)
-           ("K" "�" :string)
-           ("�" "�" :string)
-           ("R" "�" :string)
-           ("b" "�" :string)
-           ("B" "�" :string)
-           ("u" "�" :string)
-           ("Y" "�" :string)
-           ("Z" "�" :string)
-           ("L" "�" :string)
-           ("O" "�" :string)
-           ("i" "�" :string)
-           ("k" "�" :string)
-           ("f" "�" :string)
-           ("�" "�" :string)
-           ("S" "�" :string)
-           ("N" "�" :string)
-           ("P" "�" :string)
-           ("�" "�" :string)
-           ("I" "�" :string)
-           ("v" "�" :string)
+           ("CH" "�" :string)
            ("M" "�" :string)
-           ("�" "�" :string)
-           ("n" "�" :string)
-           ("�" "�" :string)
-           ("y" "�" :string)
-           ("�" "�" :string)
-           ("A" "�" :string)
-           ("X" "�" :string)
-           ("z" "�" :string)
            ("e" "�" :string)
-           ("Q" "�" :string)
+           ("I" "�" :string)
+           ("P" "�" :string)
+           ("q" "�" :string)
+           ("X" "�" :string)
+           ("A" "�" :string)
+           ("n" "�" :string)
+           ("c" "�" :string)
+           ("h" "�" :string)
+           ("�" "�" :string)
            ("J" "�" :string)
            ("�" "�" :string)
            ("C" "�" :string)
-           ("j" "�" :string)
-           ("T" "�" :string)
-           ("t" "�" :string)
-           ("l" "�" :string)
-           ("g" "�" :string)
-           ("W" "�" :string)
-           ("o" "�" :string)
-           ("H" "�" :string)
-           ("m" "�" :string)
+           ("O" "�" :string)
+           ("i" "�" :string)
            ("U" "�" :string)
+           ("F" "�" :string)
+           ("B" "�" :string)
+           ("o" "�" :string)
+           ("E" "�" :string)
+           ("Y" "�" :string)
+           ("g" "�" :string)
+           ("N" "�" :string)
+           ("a" "�" :string)
+           ("z" "�" :string)
+           ("�" "�" :string)
+           ("l" "�" :string)
+           ("f" "�" :string)
+           ("x" "�" :string)
+           ("K" "�" :string)
+           ("�" "�" :string)
            ("r" "�" :string)
+           ("W" "�" :string)
+           ("Z" "�" :string)
+           ("j" "�" :string)
+           ("d" "�" :string)
            ("D" "�" :string)
-           ("F" "�" :string)
-           ("p" "�" :string)
+           ("L" "�" :string)
            ("�" "�" :string)
-           ("x" "�" :string)
-           ("c" "�" :string)
-           ("w" "�" :string)
-           ("V" "�" :string)
-           ("a" "�" :string)
+           ("�" "�" :string)
+           ("S" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("s" "�" :string)
-           ("E" "�" :string)
+           ("V" "�" :string)
+           ("m" "�" :string)
+           ("H" "�" :string)
+           ("b" "�" :string)
+           ("T" "�" :string)
+           ("p" "�" :string)
+           ("Q" "�" :string)
+           ("R" "�" :string)
+           ("t" "�" :string)
            ("G" "�" :string)
-           ("d" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("u" "�" :string)
+           ("w" "�" :string)
+           ("v" "�" :string)
+           ("y" "�" :string)
+           ("k" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
@@ -230,202 +230,202 @@
   :rules  (("CH" "7" :string)
            ("Ch" "8" :string)
            ("ch" "9" :string)
-           ("E" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("G" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("V" "8" :string)
-           ("W" "8" :string)
-           ("H" "8" :string)
-           ("F" "8" :string)
-           ("D" "8" :string)
-           ("U" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("T" "8" :string)
-           ("X" "8" :string)
-           ("A" "8" :string)
+           ("P" "8" :string)
+           ("I" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
-           ("Q" "8" :string)
-           ("�" "8" :string)
+           ("�" "8" :string)
+           ("M" "8" :string)
+           ("O" "8" :string)
            ("C" "8" :string)
+           ("�" "8" :string)
            ("J" "8" :string)
-           ("M" "8" :string)
-           ("P" "8" :string)
-           ("N" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
+           ("A" "8" :string)
+           ("X" "8" :string)
            ("�" "8" :string)
-           ("I" "8" :string)
-           ("�" "8" :string)
-           ("S" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
+           ("N" "8" :string)
            ("Y" "8" :string)
+           ("E" "8" :string)
+           ("B" "8" :string)
+           ("F" "8" :string)
+           ("U" "8" :string)
            ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
            ("Z" "8" :string)
-           ("O" "8" :string)
-           ("L" "8" :string)
-           ("�" "8" :string)
-           ("B" "8" :string)
+           ("�" "8" :string)
+           ("W" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
            ("K" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
+           ("S" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("L" "8" :string)
+           ("D" "8" :string)
+           ("T" "8" :string)
+           ("�" "8" :string)
+           ("H" "8" :string)
+           ("�" "8" :string)
+           ("V" "8" :string)
+           ("G" "8" :string)
+           ("�" "8" :string)
            ("R" "8" :string)
-           ("d" "9" :string)
-           ("s" "9" :string)
-           ("�" "9" :string)
+           ("Q" "8" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
-           ("a" "9" :string)
+           ("�" "9" :string)
+           ("e" "9" :string)
+           ("i" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("h" "9" :string)
            ("c" "9" :string)
-           ("�" "9" :string)
-           ("w" "9" :string)
-           ("p" "9" :string)
-           ("�" "9" :string)
-           ("x" "9" :string)
-           ("�" "9" :string)
+           ("�" "9" :string)
+           ("n" "9" :string)
+           ("q" "9" :string)
            ("g" "9" :string)
            ("o" "9" :string)
-           ("r" "9" :string)
-           ("m" "9" :string)
-           ("t" "9" :string)
+           ("f" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
            ("l" "9" :string)
            ("z" "9" :string)
-           ("e" "9" :string)
+           ("a" "9" :string)
            ("j" "9" :string)
-           ("�" "9" :string)
-           ("n" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("r" "9" :string)
+           ("x" "9" :string)
+           ("s" "9" :string)
            ("�" "9" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("y" "9" :string)
-           ("v" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("k" "9" :string)
            ("�" "9" :string)
-           ("f" "9" :string)
-           ("�" "9" :string)
-           ("i" "9" :string)
+           ("d" "9" :string)
            ("b" "9" :string)
+           ("m" "9" :string)
+           ("�" "9" :string)
+           ("k" "9" :string)
+           ("y" "9" :string)
+           ("v" "9" :string)
            ("u" "9" :string)
-           ("h" "9" :string)
-           ("q" "9" :string)
+           ("w" "9" :string)
+           ("t" "9" :string)
+           ("�" "9" :string)
+           ("p" "9" :string)
+           ("�" "9" :string)
            ("�" "99" :string)
            ))
 
 (define-rule-set "cs-ignore-special"
 
-  :rules  (("-" "" :string)
-           ("'" "" :string)
+  :rules  (("'" "" :string)
            ("!" "" :string)
-           ("." "" :string)
            ("?" "" :string)
+           ("." "" :string)
+           ("-" "" :string)
            ))
 
 (define-rule-set "cs-resolve-special"
 
-  :rules  (("ch" "�" :string)
-           ("Ch" "�" :string)
+  :rules  (("Ch" "�" :string)
            ("CH" "�" :string)
+           ("ch" "�" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("Z" "�" :string)
+           ("j" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("W" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("x" "�" :string)
-           ("p" "�" :string)
-           ("�" "�" :string)
-           ("U" "�" :string)
-           ("m" "�" :string)
-           ("F" "�" :string)
+           ("K" "�" :string)
+           ("�" "�" :string)
            ("r" "�" :string)
-           ("D" "�" :string)
-           ("o" "�" :string)
-           ("H" "�" :string)
-           ("W" "�" :string)
-           ("g" "�" :string)
-           ("l" "�" :string)
-           ("t" "�" :string)
-           ("T" "�" :string)
-           ("�" "�" :string)
-           ("J" "�" :string)
-           ("j" "�" :string)
-           ("�" "�" :string)
-           ("C" "�" :string)
-           ("e" "�" :string)
-           ("Q" "�" :string)
-           ("z" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("s" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("A" "�" :string)
-           ("X" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("S" "�" :string)
+           ("D" "�" :string)
+           ("L" "�" :string)
            ("d" "�" :string)
-           ("G" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("E" "�" :string)
-           ("s" "�" :string)
-           ("�" "�" :string)
-           ("a" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("T" "�" :string)
+           ("H" "�" :string)
+           ("b" "�" :string)
            ("V" "�" :string)
+           ("�" "�" :string)
+           ("m" "�" :string)
            ("w" "�" :string)
-           ("�" "�" :string)
-           ("c" "�" :string)
-           ("f" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("k" "�" :string)
-           ("i" "�" :string)
-           ("L" "�" :string)
-           ("O" "�" :string)
-           ("Z" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("Y" "�" :string)
            ("u" "�" :string)
-           ("b" "�" :string)
-           ("B" "�" :string)
-           ("�" "�" :string)
-           ("R" "�" :string)
-           ("�" "�" :string)
-           ("q" "�" :string)
-           ("K" "�" :string)
-           ("h" "�" :string)
+           ("v" "�" :string)
            ("y" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("n" "�" :string)
-           ("�" "�" :string)
+           ("k" "�" :string)
+           ("�" "�" :string)
+           ("R" "�" :string)
+           ("�" "�" :string)
+           ("t" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("G" "�" :string)
+           ("p" "�" :string)
+           ("�" "�" :string)
+           ("Q" "�" :string)
+           ("P" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("I" "�" :string)
+           ("e" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("M" "�" :string)
-           ("v" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("J" "�" :string)
            ("�" "�" :string)
-           ("I" "�" :string)
+           ("C" "�" :string)
+           ("O" "�" :string)
+           ("i" "�" :string)
+           ("�" "�" :string)
+           ("c" "�" :string)
+           ("�" "�" :string)
+           ("h" "�" :string)
            ("�" "�" :string)
+           ("n" "�" :string)
+           ("q" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("X" "�" :string)
+           ("A" "�" :string)
+           ("Y" "�" :string)
+           ("g" "�" :string)
            ("N" "�" :string)
-           ("P" "�" :string)
-           ("S" "�" :string)
+           ("B" "�" :string)
+           ("o" "�" :string)
+           ("E" "�" :string)
+           ("F" "�" :string)
+           ("�" "�" :string)
+           ("U" "�" :string)
+           ("f" "�" :string)
+           ("�" "�" :string)
+           ("l" "�" :string)
+           ("�" "�" :string)
+           ("z" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("a" "�" :string)
            ("�" "��" :string)
            ("-" "�" :string)
            ("'" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/czech/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/czech/utf8.xdy
index 5703b56cf9b..9eb9b30bbc2 100644
--- a/Master/texmf-dist/xindy/modules/lang/czech/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/czech/utf8.xdy
@@ -35,23 +35,23 @@
 
 (define-rule-set "cs-alphabetize"
 
-  :rules  (("Ä" "�" :string)
+  :rules  (("ä" "�" :string)
            ("Á" "�" :string)
+           ("Ä" "�" :string)
            ("á" "�" :string)
-           ("ä" "�" :string)
-           ("Č" "�" :string)
            ("č" "�" :string)
+           ("Č" "�" :string)
            ("ď" "�" :string)
            ("Ď" "�" :string)
-           ("é" "�" :string)
            ("É" "�" :string)
+           ("é" "�" :string)
            ("Ě" "�" :string)
            ("ě" "�" :string)
            ("ch" "�" :string)
            ("CH" "�" :string)
            ("Ch" "�" :string)
-           ("í" "�" :string)
            ("Í" "�" :string)
+           ("í" "�" :string)
            ("Ň" "�" :string)
            ("ň" "�" :string)
            ("Ó" "�" :string)
@@ -61,14 +61,14 @@
            ("ř" "�" :string)
            ("Ř" "�" :string)
            ("ß" "��" :string)
-           ("š" "�" :string)
            ("Š" "�" :string)
+           ("š" "�" :string)
            ("Ť" "�" :string)
            ("ť" "�" :string)
            ("ú" "�" :string)
-           ("ü" "�" :string)
-           ("ů" "�" :string)
            ("Ú" "�" :string)
+           ("ů" "�" :string)
+           ("ü" "�" :string)
            ("Ü" "�" :string)
            ("Ů" "�" :string)
            ("Ý" "�" :string)
@@ -77,356 +77,356 @@
            ("Ž" "�" :string)
            ("a" "�" :string)
            ("A" "�" :string)
-           ("B" "�" :string)
            ("b" "�" :string)
-           ("c" "�" :string)
+           ("B" "�" :string)
            ("C" "�" :string)
-           ("d" "�" :string)
+           ("c" "�" :string)
            ("D" "�" :string)
+           ("d" "�" :string)
            ("e" "�" :string)
            ("E" "�" :string)
-           ("F" "�" :string)
            ("f" "�" :string)
+           ("F" "�" :string)
            ("G" "�" :string)
            ("g" "�" :string)
-           ("H" "�" :string)
            ("h" "�" :string)
+           ("H" "�" :string)
            ("i" "�" :string)
            ("I" "�" :string)
            ("j" "�" :string)
            ("J" "�" :string)
-           ("K" "�" :string)
            ("k" "�" :string)
-           ("l" "�" :string)
+           ("K" "�" :string)
            ("L" "�" :string)
-           ("M" "�" :string)
+           ("l" "�" :string)
            ("m" "�" :string)
+           ("M" "�" :string)
            ("N" "�" :string)
            ("n" "�" :string)
-           ("o" "�" :string)
            ("O" "�" :string)
+           ("o" "�" :string)
            ("p" "�" :string)
            ("P" "�" :string)
            ("q" "�" :string)
            ("Q" "�" :string)
            ("R" "�" :string)
            ("r" "�" :string)
-           ("S" "�" :string)
            ("s" "�" :string)
+           ("S" "�" :string)
            ("T" "�" :string)
            ("t" "�" :string)
            ("u" "�" :string)
            ("U" "�" :string)
-           ("V" "�" :string)
            ("v" "�" :string)
-           ("w" "�" :string)
+           ("V" "�" :string)
            ("W" "�" :string)
+           ("w" "�" :string)
            ("X" "�" :string)
            ("x" "�" :string)
-           ("Y" "�" :string)
            ("y" "�" :string)
-           ("z" "�" :string)
+           ("Y" "�" :string)
            ("Z" "�" :string)
+           ("z" "�" :string)
            ))
 
 (define-rule-set "cs-resolve-diacritics"
 
-  :rules  (("Ž" "�" :string)
-           ("Č" "�" :string)
-           ("ž" "�" :string)
+  :rules  (("CH" "�" :string)
+           ("ch" "�" :string)
            ("Š" "�" :string)
-           ("č" "�" :string)
-           ("Ř" "�" :string)
+           ("ř" "�" :string)
+           ("Ž" "�" :string)
            ("Ch" "�" :string)
+           ("ž" "�" :string)
            ("š" "�" :string)
-           ("ř" "�" :string)
-           ("ch" "�" :string)
-           ("CH" "�" :string)
-           ("ý" "�" :string)
-           ("Í" "�" :string)
-           ("ň" "�" :string)
-           ("Ň" "�" :string)
-           ("á" "�" :string)
-           ("Á" "�" :string)
+           ("Č" "�" :string)
+           ("Ř" "�" :string)
+           ("č" "�" :string)
            ("Ť" "�" :string)
-           ("é" "�" :string)
+           ("Ň" "�" :string)
            ("Ó" "�" :string)
+           ("ú" "�" :string)
+           ("Ú" "�" :string)
+           ("Ď" "�" :string)
+           ("É" "�" :string)
            ("ď" "�" :string)
+           ("Á" "�" :string)
+           ("é" "�" :string)
            ("ó" "�" :string)
-           ("Ú" "�" :string)
            ("ť" "�" :string)
            ("í" "�" :string)
+           ("ň" "�" :string)
+           ("ý" "�" :string)
            ("Ý" "�" :string)
-           ("Ď" "�" :string)
-           ("É" "�" :string)
-           ("ú" "�" :string)
-           ("Ö" "�" :string)
-           ("Ů" "�" :string)
+           ("Í" "�" :string)
+           ("á" "�" :string)
            ("ä" "�" :string)
-           ("ě" "�" :string)
-           ("ö" "�" :string)
            ("Ä" "�" :string)
            ("ů" "�" :string)
+           ("ö" "�" :string)
+           ("ě" "�" :string)
+           ("Ö" "�" :string)
+           ("Ů" "�" :string)
            ("Ě" "�" :string)
            ("Ü" "�" :string)
            ("ü" "�" :string)
            ("ß" "�" :string)
+           ("e" "�" :string)
+           ("i" "�" :string)
+           ("N" "�" :string)
            ("E" "�" :string)
-           ("n" "�" :string)
-           ("b" "�" :string)
-           ("I" "�" :string)
            ("A" "�" :string)
-           ("x" "�" :string)
-           ("k" "�" :string)
-           ("z" "�" :string)
-           ("g" "�" :string)
-           ("U" "�" :string)
-           ("j" "�" :string)
-           ("B" "�" :string)
+           ("b" "�" :string)
            ("v" "�" :string)
-           ("m" "�" :string)
-           ("W" "�" :string)
-           ("K" "�" :string)
+           ("h" "�" :string)
+           ("u" "�" :string)
            ("q" "�" :string)
-           ("C" "�" :string)
-           ("Q" "�" :string)
-           ("r" "�" :string)
-           ("J" "�" :string)
+           ("f" "�" :string)
            ("D" "�" :string)
-           ("Z" "�" :string)
            ("y" "�" :string)
+           ("a" "�" :string)
+           ("R" "�" :string)
+           ("H" "�" :string)
+           ("X" "�" :string)
            ("V" "�" :string)
-           ("P" "�" :string)
-           ("i" "�" :string)
-           ("e" "�" :string)
+           ("m" "�" :string)
+           ("p" "�" :string)
+           ("x" "�" :string)
+           ("C" "�" :string)
+           ("U" "�" :string)
+           ("Z" "�" :string)
+           ("T" "�" :string)
+           ("j" "�" :string)
            ("c" "�" :string)
-           ("G" "�" :string)
-           ("a" "�" :string)
-           ("l" "�" :string)
+           ("B" "�" :string)
+           ("d" "�" :string)
            ("O" "�" :string)
+           ("W" "�" :string)
            ("M" "�" :string)
-           ("u" "�" :string)
-           ("o" "�" :string)
-           ("R" "�" :string)
-           ("p" "�" :string)
-           ("Y" "�" :string)
-           ("S" "�" :string)
            ("s" "�" :string)
-           ("f" "�" :string)
-           ("h" "�" :string)
-           ("t" "�" :string)
-           ("w" "�" :string)
-           ("F" "�" :string)
-           ("H" "�" :string)
-           ("N" "�" :string)
            ("L" "�" :string)
-           ("X" "�" :string)
-           ("d" "�" :string)
-           ("T" "�" :string)
+           ("F" "�" :string)
+           ("P" "�" :string)
+           ("K" "�" :string)
+           ("k" "�" :string)
+           ("I" "�" :string)
+           ("l" "�" :string)
+           ("g" "�" :string)
+           ("w" "�" :string)
+           ("J" "�" :string)
+           ("z" "�" :string)
+           ("Q" "�" :string)
+           ("n" "�" :string)
+           ("Y" "�" :string)
+           ("t" "�" :string)
+           ("r" "�" :string)
+           ("S" "�" :string)
+           ("o" "�" :string)
+           ("G" "�" :string)
            ))
 
 (define-rule-set "cs-resolve-case"
 
   :rules  (("CH" "7" :string)
-           ("Ň" "8" :string)
            ("Í" "8" :string)
-           ("Ü" "8" :string)
-           ("Ch" "8" :string)
-           ("Ř" "8" :string)
+           ("Ě" "8" :string)
+           ("Ý" "8" :string)
            ("Ů" "8" :string)
-           ("Š" "8" :string)
+           ("Ř" "8" :string)
+           ("Ö" "8" :string)
            ("Č" "8" :string)
+           ("Ü" "8" :string)
+           ("Ä" "8" :string)
+           ("Ch" "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)
-           ("ú" "9" :string)
-           ("ů" "9" :string)
-           ("í" "9" :string)
+           ("ě" "9" :string)
+           ("ň" "9" :string)
            ("ť" "9" :string)
+           ("í" "9" :string)
+           ("ö" "9" :string)
+           ("š" "9" :string)
            ("ó" "9" :string)
-           ("ch" "9" :string)
-           ("ď" "9" :string)
+           ("ü" "9" :string)
+           ("ů" "9" :string)
+           ("ž" "9" :string)
            ("é" "9" :string)
            ("ř" "9" :string)
-           ("š" "9" :string)
+           ("ď" "9" :string)
+           ("ú" "9" :string)
+           ("ch" "9" :string)
+           ("ä" "9" :string)
            ("ß" "99" :string)
-           ("Z" "8" :string)
-           ("D" "8" :string)
-           ("J" "8" :string)
+           ("G" "8" :string)
+           ("S" "8" :string)
+           ("Y" "8" :string)
            ("Q" "8" :string)
-           ("C" "8" :string)
+           ("J" "8" :string)
+           ("I" "8" :string)
            ("K" "8" :string)
+           ("P" "8" :string)
+           ("F" "8" :string)
+           ("L" "8" :string)
            ("W" "8" :string)
+           ("M" "8" :string)
+           ("O" "8" :string)
            ("B" "8" :string)
-           ("U" "8" :string)
-           ("A" "8" :string)
-           ("I" "8" :string)
-           ("E" "8" :string)
+           ("Z" "8" :string)
            ("T" "8" :string)
+           ("U" "8" :string)
+           ("C" "8" :string)
+           ("V" "8" :string)
            ("X" "8" :string)
-           ("L" "8" :string)
-           ("N" "8" :string)
            ("H" "8" :string)
-           ("F" "8" :string)
-           ("S" "8" :string)
-           ("Y" "8" :string)
            ("R" "8" :string)
-           ("M" "8" :string)
-           ("O" "8" :string)
-           ("G" "8" :string)
-           ("P" "8" :string)
-           ("V" "8" :string)
+           ("D" "8" :string)
+           ("A" "8" :string)
+           ("E" "8" :string)
+           ("N" "8" :string)
+           ("o" "9" :string)
            ("r" "9" :string)
-           ("q" "9" :string)
-           ("m" "9" :string)
-           ("v" "9" :string)
-           ("j" "9" :string)
+           ("n" "9" :string)
+           ("t" "9" :string)
            ("z" "9" :string)
            ("g" "9" :string)
-           ("k" "9" :string)
-           ("x" "9" :string)
-           ("b" "9" :string)
-           ("n" "9" :string)
-           ("d" "9" :string)
            ("w" "9" :string)
-           ("t" "9" :string)
-           ("h" "9" :string)
-           ("f" "9" :string)
+           ("l" "9" :string)
+           ("k" "9" :string)
            ("s" "9" :string)
+           ("d" "9" :string)
+           ("c" "9" :string)
+           ("j" "9" :string)
+           ("x" "9" :string)
            ("p" "9" :string)
-           ("o" "9" :string)
-           ("u" "9" :string)
-           ("l" "9" :string)
+           ("m" "9" :string)
            ("a" "9" :string)
-           ("c" "9" :string)
-           ("e" "9" :string)
-           ("i" "9" :string)
            ("y" "9" :string)
+           ("u" "9" :string)
+           ("q" "9" :string)
+           ("f" "9" :string)
+           ("b" "9" :string)
+           ("v" "9" :string)
+           ("h" "9" :string)
+           ("i" "9" :string)
+           ("e" "9" :string)
            ))
 
 (define-rule-set "cs-ignore-special"
 
-  :rules  (("?" "" :string)
-           ("-" "" :string)
+  :rules  (("." "" :string)
            ("!" "" :string)
-           ("." "" :string)
+           ("-" "" :string)
+           ("?" "" :string)
            ("'" "" :string)
            ))
 
 (define-rule-set "cs-resolve-special"
 
-  :rules  (("Ch" "�" :string)
-           ("Ü" "�" :string)
-           ("ě" "�" :string)
-           ("č" "�" :string)
-           ("Ů" "�" :string)
-           ("Ř" "�" :string)
-           ("ä" "�" :string)
-           ("Ň" "�" :string)
-           ("á" "�" :string)
-           ("ö" "�" :string)
-           ("Í" "�" :string)
-           ("ň" "�" :string)
-           ("Ž" "�" :string)
-           ("Č" "�" :string)
-           ("Ö" "�" :string)
-           ("Š" "�" :string)
+  :rules  (("Ü" "�" :string)
+           ("Ä" "�" :string)
            ("ž" "�" :string)
+           ("Ch" "�" :string)
+           ("é" "�" :string)
+           ("Á" "�" :string)
+           ("Ž" "�" :string)
+           ("ü" "�" :string)
+           ("ů" "�" :string)
            ("ý" "�" :string)
+           ("ň" "�" :string)
+           ("Ö" "�" :string)
+           ("Ř" "�" :string)
+           ("ě" "�" :string)
+           ("ö" "�" :string)
            ("í" "�" :string)
-           ("Ý" "�" :string)
-           ("Ď" "�" :string)
-           ("ů" "�" :string)
-           ("Ě" "�" :string)
+           ("Č" "�" :string)
+           ("ť" "�" :string)
+           ("š" "�" :string)
            ("ó" "�" :string)
+           ("Í" "�" :string)
+           ("á" "�" :string)
+           ("Ě" "�" :string)
+           ("Ý" "�" :string)
+           ("Ů" "�" :string)
+           ("č" "�" :string)
+           ("Ň" "�" :string)
+           ("ä" "�" :string)
+           ("CH" "�" :string)
+           ("Ť" "�" :string)
+           ("ch" "�" :string)
+           ("Ó" "�" :string)
            ("Ú" "�" :string)
-           ("ť" "�" :string)
+           ("Ď" "�" :string)
            ("ú" "�" :string)
-           ("ü" "�" :string)
-           ("É" "�" :string)
-           ("š" "�" :string)
            ("ř" "�" :string)
-           ("é" "�" :string)
-           ("Á" "�" :string)
-           ("Ť" "�" :string)
            ("ď" "�" :string)
-           ("Ó" "�" :string)
-           ("ch" "�" :string)
-           ("Ä" "�" :string)
-           ("CH" "�" :string)
+           ("É" "�" :string)
+           ("Š" "�" :string)
            ("ß" "��" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("C" "�" :string)
-           ("Q" "�" :string)
-           ("Z" "�" :string)
-           ("D" "�" :string)
-           ("J" "�" :string)
-           ("r" "�" :string)
-           ("x" "�" :string)
-           ("k" "�" :string)
-           ("z" "�" :string)
-           ("g" "�" :string)
-           ("U" "�" :string)
-           ("E" "�" :string)
-           ("n" "�" :string)
-           ("b" "�" :string)
-           ("I" "�" :string)
-           ("A" "�" :string)
            ("W" "�" :string)
-           ("K" "�" :string)
-           ("q" "�" :string)
-           ("j" "�" :string)
-           ("B" "�" :string)
-           ("v" "�" :string)
-           ("m" "�" :string)
-           ("h" "�" :string)
-           ("t" "�" :string)
            ("s" "�" :string)
-           ("f" "�" :string)
-           ("T" "�" :string)
-           ("w" "�" :string)
-           ("H" "�" :string)
-           ("F" "�" :string)
-           ("N" "�" :string)
-           ("L" "�" :string)
-           ("X" "�" :string)
+           ("M" "�" :string)
+           ("O" "�" :string)
            ("d" "�" :string)
+           ("B" "�" :string)
+           ("j" "�" :string)
            ("c" "�" :string)
-           ("G" "�" :string)
-           ("a" "�" :string)
-           ("l" "�" :string)
-           ("O" "�" :string)
-           ("M" "�" :string)
-           ("u" "�" :string)
-           ("y" "�" :string)
-           ("V" "�" :string)
+           ("I" "�" :string)
+           ("k" "�" :string)
            ("P" "�" :string)
+           ("K" "�" :string)
+           ("F" "�" :string)
+           ("L" "�" :string)
+           ("w" "�" :string)
+           ("g" "�" :string)
+           ("l" "�" :string)
+           ("o" "�" :string)
+           ("G" "�" :string)
+           ("S" "�" :string)
+           ("r" "�" :string)
+           ("Y" "�" :string)
+           ("t" "�" :string)
+           ("n" "�" :string)
+           ("Q" "�" :string)
+           ("z" "�" :string)
+           ("J" "�" :string)
+           ("A" "�" :string)
+           ("E" "�" :string)
+           ("N" "�" :string)
            ("i" "�" :string)
            ("e" "�" :string)
-           ("Y" "�" :string)
-           ("S" "�" :string)
-           ("o" "�" :string)
            ("R" "�" :string)
+           ("a" "�" :string)
+           ("D" "�" :string)
+           ("y" "�" :string)
+           ("f" "�" :string)
+           ("u" "�" :string)
+           ("q" "�" :string)
+           ("h" "�" :string)
+           ("v" "�" :string)
+           ("b" "�" :string)
+           ("C" "�" :string)
+           ("x" "�" :string)
            ("p" "�" :string)
+           ("V" "�" :string)
+           ("m" "�" :string)
+           ("X" "�" :string)
+           ("H" "�" :string)
+           ("T" "�" :string)
+           ("Z" "�" :string)
+           ("U" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/danish/cp1252.xdy b/Master/texmf-dist/xindy/modules/lang/danish/cp1252.xdy
index 742a0afda14..32366489da5 100644
--- a/Master/texmf-dist/xindy/modules/lang/danish/cp1252.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/danish/cp1252.xdy
@@ -33,100 +33,100 @@
 
 (define-rule-set "da-alphabetize"
 
-  :rules  (("Aa" "�" :string)
+  :rules  (("aa" "�" :string)
            ("AA" "�" :string)
-           ("aa" "�" :string)
-           ("a" "�" :string)
+           ("Aa" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
            ("A" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("a" "�" :string)
            ("B" "�" :string)
            ("b" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
            ("C" "�" :string)
+           ("�" "�" :string)
            ("c" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("D" "�" :string)
            ("d" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("e" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("E" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("E" "�" :string)
+           ("e" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("f" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("F" "�" :string)
-           ("g" "�" :string)
+           ("f" "�" :string)
            ("G" "�" :string)
-           ("h" "�" :string)
+           ("g" "�" :string)
            ("H" "�" :string)
+           ("h" "�" :string)
            ("�" "�" :string)
+           ("i" "�" :string)
            ("�" "�" :string)
            ("I" "�" :string)
-           ("i" "�" :string)
-           ("j" "�" :string)
            ("J" "�" :string)
+           ("j" "�" :string)
            ("K" "�" :string)
            ("k" "�" :string)
-           ("l" "�" :string)
            ("L" "�" :string)
+           ("l" "�" :string)
            ("M" "�" :string)
            ("m" "�" :string)
-           ("N" "�" :string)
            ("n" "�" :string)
-           ("�" "�" :string)
+           ("N" "�" :string)
+           ("o" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("o" "�" :string)
-           ("O" "�" :string)
            ("�" "�" :string)
-           ("P" "�" :string)
+           ("�" "�" :string)
+           ("O" "�" :string)
            ("p" "�" :string)
-           ("q" "�" :string)
+           ("P" "�" :string)
            ("Q" "�" :string)
-           ("r" "�" :string)
+           ("q" "�" :string)
            ("R" "�" :string)
+           ("r" "�" :string)
            ("S" "�" :string)
            ("s" "�" :string)
            ("t" "�" :string)
            ("T" "�" :string)
-           ("�" "ڤ" :string)
            ("�" "ڤ" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("U" "�" :string)
+           ("�" "ڤ" :string)
            ("u" "�" :string)
-           ("V" "�" :string)
+           ("U" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("v" "�" :string)
+           ("V" "�" :string)
            ("w" "�" :string)
            ("W" "�" :string)
-           ("X" "�" :string)
            ("x" "�" :string)
-           ("Y" "�" :string)
+           ("X" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("Y" "�" :string)
            ("�" "�" :string)
-           ("y" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("y" "�" :string)
            ("z" "�" :string)
            ("Z" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
@@ -137,96 +137,96 @@
   :rules  (("aa" "�" :string)
            ("AA" "�" :string)
            ("Aa" "�" :string)
-           ("K" "�" :string)
-           ("U" "�" :string)
-           ("f" "�" :string)
-           ("B" "�" :string)
-           ("F" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("l" "�" :string)
+           ("�" "�" :string)
+           ("k" "�" :string)
+           ("w" "�" :string)
+           ("v" "�" :string)
            ("y" "�" :string)
-           ("n" "�" :string)
-           ("h" "�" :string)
-           ("o" "�" :string)
-           ("q" "�" :string)
-           ("x" "�" :string)
+           ("d" "�" :string)
+           ("j" "�" :string)
+           ("E" "�" :string)
+           ("i" "�" :string)
            ("e" "�" :string)
+           ("p" "�" :string)
            ("�" "�" :string)
-           ("V" "�" :string)
+           ("f" "�" :string)
+           ("N" "�" :string)
+           ("b" "�" :string)
+           ("O" "�" :string)
+           ("z" "�" :string)
+           ("�" "�" :string)
            ("a" "�" :string)
-           ("J" "�" :string)
+           ("m" "�" :string)
+           ("�" "�" :string)
+           ("I" "�" :string)
+           ("r" "�" :string)
+           ("h" "�" :string)
+           ("Z" "�" :string)
+           ("V" "�" :string)
+           ("�" "�" :string)
+           ("c" "�" :string)
            ("P" "�" :string)
-           ("Y" "�" :string)
            ("M" "�" :string)
-           ("z" "�" :string)
-           ("N" "�" :string)
-           ("S" "�" :string)
-           ("j" "�" :string)
-           ("X" "�" :string)
-           ("G" "�" :string)
-           ("R" "�" :string)
-           ("H" "�" :string)
-           ("d" "�" :string)
-           ("c" "�" :string)
-           ("m" "�" :string)
-           ("Q" "�" :string)
-           ("L" "�" :string)
-           ("i" "�" :string)
+           ("�" "�" :string)
            ("W" "�" :string)
-           ("�" "�" :string)
-           ("T" "�" :string)
-           ("k" "�" :string)
-           ("I" "�" :string)
+           ("L" "�" :string)
            ("A" "�" :string)
-           ("t" "�" :string)
+           ("x" "�" :string)
+           ("H" "�" :string)
+           ("C" "�" :string)
+           ("X" "�" :string)
            ("u" "�" :string)
-           ("D" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("O" "�" :string)
-           ("Z" "�" :string)
+           ("o" "�" :string)
+           ("Q" "�" :string)
+           ("B" "�" :string)
+           ("K" "�" :string)
+           ("G" "�" :string)
+           ("t" "�" :string)
            ("g" "�" :string)
-           ("C" "�" :string)
-           ("r" "�" :string)
-           ("b" "�" :string)
-           ("E" "�" :string)
-           ("w" "�" :string)
-           ("p" "�" :string)
-           ("v" "�" :string)
+           ("S" "�" :string)
+           ("F" "�" :string)
            ("s" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("q" "�" :string)
+           ("J" "�" :string)
+           ("R" "�" :string)
+           ("Y" "�" :string)
+           ("U" "�" :string)
+           ("n" "�" :string)
+           ("D" "�" :string)
+           ("T" "�" :string)
+           ("l" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
@@ -238,109 +238,109 @@
   :rules  (("AA" "7" :string)
            ("Aa" "8" :string)
            ("aa" "9" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("K" "8" :string)
-           ("U" "8" :string)
-           ("�" "8" :string)
-           ("B" "8" :string)
            ("F" "8" :string)
-           ("Y" "8" :string)
-           ("M" "8" :string)
-           ("N" "8" :string)
-           ("P" "8" :string)
-           ("X" "8" :string)
            ("S" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("V" "8" :string)
-           ("�" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
+           ("�" "8" :string)
+           ("G" "8" :string)
+           ("Q" "8" :string)
+           ("K" "8" :string)
+           ("B" "8" :string)
+           ("C" "8" :string)
+           ("H" "8" :string)
+           ("X" "8" :string)
+           ("A" "8" :string)
+           ("�" "8" :string)
+           ("L" "8" :string)
+           ("�" "8" :string)
+           ("T" "8" :string)
+           ("D" "8" :string)
+           ("U" "8" :string)
+           ("Y" "8" :string)
+           ("R" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
            ("J" "8" :string)
-           ("L" "8" :string)
-           ("W" "8" :string)
-           ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("E" "8" :string)
            ("�" "8" :string)
-           ("T" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
            ("�" "8" :string)
-           ("R" "8" :string)
-           ("H" "8" :string)
-           ("�" "8" :string)
-           ("G" "8" :string)
-           ("�" "8" :string)
-           ("Q" "8" :string)
-           ("C" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
+           ("W" "8" :string)
+           ("M" "8" :string)
+           ("P" "8" :string)
            ("�" "8" :string)
+           ("V" "8" :string)
            ("Z" "8" :string)
-           ("E" "8" :string)
-           ("D" "8" :string)
+           ("�" "8" :string)
            ("I" "8" :string)
-           ("A" "8" :string)
-           ("O" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("O" "8" :string)
+           ("N" "8" :string)
            ("�" "89" :string)
-           ("y" "9" :string)
-           ("n" "9" :string)
-           ("h" "9" :string)
+           ("s" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("g" "9" :string)
+           ("�" "9" :string)
+           ("t" "9" :string)
            ("o" "9" :string)
-           ("q" "9" :string)
-           ("l" "9" :string)
+           ("u" "9" :string)
+           ("x" "9" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
-           ("f" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
+           ("l" "9" :string)
            ("�" "9" :string)
-           ("z" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("j" "9" :string)
-           ("x" "9" :string)
-           ("e" "9" :string)
-           ("�" "9" :string)
-           ("a" "9" :string)
+           ("n" "9" :string)
+           ("q" "9" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
+           ("p" "9" :string)
+           ("�" "9" :string)
+           ("e" "9" :string)
            ("i" "9" :string)
-           ("�" "9" :string)
-           ("c" "9" :string)
-           ("m" "9" :string)
-           ("�" "9" :string)
+           ("�" "9" :string)
+           ("j" "9" :string)
            ("d" "9" :string)
-           ("�" "9" :string)
-           ("g" "9" :string)
-           ("w" "9" :string)
-           ("p" "9" :string)
+           ("y" "9" :string)
+           ("�" "9" :string)
            ("v" "9" :string)
-           ("s" "9" :string)
-           ("�" "9" :string)
-           ("b" "9" :string)
-           ("r" "9" :string)
-           ("u" "9" :string)
-           ("�" "9" :string)
+           ("w" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
            ("k" "9" :string)
-           ("t" "9" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
+           ("�" "9" :string)
+           ("c" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("h" "9" :string)
+           ("r" "9" :string)
+           ("z" "9" :string)
+           ("m" "9" :string)
+           ("a" "9" :string)
+           ("b" "9" :string)
+           ("f" "9" :string)
            ("�" "99" :string)
            ))
 
 (define-rule-set "da-ignore-special"
 
-  :rules  (("!" "" :string)
-           ("?" "" :string)
-           ("'" "" :string)
-           ("." "" :string)
+  :rules  (("'" "" :string)
            ("-" "" :string)
+           ("." "" :string)
+           ("!" "" :string)
+           ("?" "" :string)
            ))
 
 (define-rule-set "da-resolve-special"
@@ -351,98 +351,98 @@
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("X" "�" :string)
-           ("�" "�" :string)
-           ("S" "�" :string)
-           ("�" "�" :string)
-           ("j" "�" :string)
-           ("z" "�" :string)
+           ("W" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("M" "�" :string)
-           ("�" "�" :string)
-           ("Y" "�" :string)
-           ("N" "�" :string)
            ("P" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("J" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("c" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("V" "�" :string)
+           ("�" "�" :string)
+           ("Z" "�" :string)
+           ("h" "�" :string)
+           ("I" "�" :string)
+           ("r" "�" :string)
+           ("�" "�" :string)
+           ("m" "�" :string)
+           ("�" "�" :string)
            ("a" "�" :string)
+           ("z" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("O" "�" :string)
+           ("b" "�" :string)
+           ("N" "�" :string)
+           ("f" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("V" "�" :string)
-           ("x" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("p" "�" :string)
            ("e" "�" :string)
+           ("i" "�" :string)
+           ("E" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("h" "�" :string)
-           ("n" "�" :string)
+           ("�" "�" :string)
+           ("j" "�" :string)
            ("y" "�" :string)
-           ("�" "�" :string)
-           ("q" "�" :string)
-           ("o" "�" :string)
+           ("d" "�" :string)
+           ("�" "�" :string)
+           ("v" "�" :string)
+           ("w" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("k" "�" :string)
+           ("�" "�" :string)
            ("l" "�" :string)
+           ("�" "�" :string)
+           ("D" "�" :string)
+           ("T" "�" :string)
+           ("n" "�" :string)
+           ("�" "�" :string)
+           ("U" "�" :string)
+           ("Y" "�" :string)
+           ("�" "�" :string)
+           ("R" "�" :string)
+           ("�" "�" :string)
+           ("J" "�" :string)
+           ("q" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("f" "�" :string)
+           ("s" "�" :string)
+           ("�" "�" :string)
            ("F" "�" :string)
+           ("S" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("g" "�" :string)
            ("�" "�" :string)
+           ("t" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("G" "�" :string)
            ("B" "�" :string)
-           ("�" "�" :string)
            ("K" "�" :string)
-           ("U" "�" :string)
-           ("p" "�" :string)
-           ("v" "�" :string)
-           ("w" "�" :string)
-           ("E" "�" :string)
-           ("�" "�" :string)
-           ("s" "�" :string)
-           ("r" "�" :string)
-           ("b" "�" :string)
-           ("C" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("g" "�" :string)
-           ("Z" "�" :string)
-           ("�" "�" :string)
-           ("O" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("Q" "�" :string)
+           ("o" "�" :string)
+           ("X" "�" :string)
            ("u" "�" :string)
-           ("D" "�" :string)
-           ("I" "�" :string)
-           ("�" "�" :string)
-           ("k" "�" :string)
-           ("t" "�" :string)
+           ("H" "�" :string)
+           ("C" "�" :string)
+           ("�" "�" :string)
+           ("x" "�" :string)
            ("A" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("T" "�" :string)
-           ("�" "�" :string)
-           ("W" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("i" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("L" "�" :string)
-           ("�" "�" :string)
-           ("c" "�" :string)
-           ("�" "�" :string)
-           ("m" "�" :string)
-           ("Q" "�" :string)
-           ("d" "�" :string)
-           ("�" "�" :string)
-           ("H" "�" :string)
-           ("R" "�" :string)
-           ("G" "�" :string)
-           ("�" "�" :string)
            ("�" "��" :string)
            ("�" "��" :string)
            ("-" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/danish/latin9.xdy b/Master/texmf-dist/xindy/modules/lang/danish/latin9.xdy
index 5005c2555a2..90e0daff1be 100644
--- a/Master/texmf-dist/xindy/modules/lang/danish/latin9.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/danish/latin9.xdy
@@ -36,201 +36,201 @@
   :rules  (("Aa" "�" :string)
            ("AA" "�" :string)
            ("aa" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("a" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("A" "�" :string)
-           ("b" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("B" "�" :string)
+           ("b" "�" :string)
+           ("c" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("C" "�" :string)
-           ("�" "�" :string)
-           ("c" "�" :string)
-           ("D" "�" :string)
-           ("d" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("d" "�" :string)
+           ("D" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("E" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("e" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("E" "�" :string)
+           ("e" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("f" "�" :string)
            ("F" "�" :string)
-           ("G" "�" :string)
            ("g" "�" :string)
-           ("H" "�" :string)
+           ("G" "�" :string)
            ("h" "�" :string)
+           ("H" "�" :string)
+           ("I" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("i" "�" :string)
-           ("�" "�" :string)
-           ("I" "�" :string)
-           ("J" "�" :string)
            ("j" "�" :string)
-           ("K" "�" :string)
+           ("J" "�" :string)
            ("k" "�" :string)
+           ("K" "�" :string)
            ("l" "�" :string)
            ("L" "�" :string)
            ("M" "�" :string)
            ("m" "�" :string)
-           ("N" "�" :string)
            ("n" "�" :string)
-           ("O" "�" :string)
-           ("�" "�" :string)
-           ("o" "�" :string)
-           ("�" "�" :string)
+           ("N" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("O" "�" :string)
+           ("o" "�" :string)
+           ("�" "�" :string)
            ("p" "�" :string)
            ("P" "�" :string)
            ("q" "�" :string)
            ("Q" "�" :string)
-           ("r" "�" :string)
            ("R" "�" :string)
-           ("S" "�" :string)
+           ("r" "�" :string)
            ("s" "�" :string)
+           ("S" "�" :string)
            ("T" "�" :string)
            ("t" "�" :string)
            ("�" "ڤ" :string)
            ("�" "ڤ" :string)
-           ("�" "�" :string)
-           ("U" "�" :string)
            ("�" "�" :string)
            ("u" "�" :string)
+           ("U" "�" :string)
+           ("�" "�" :string)
            ("V" "�" :string)
            ("v" "�" :string)
            ("W" "�" :string)
            ("w" "�" :string)
-           ("x" "�" :string)
            ("X" "�" :string)
-           ("Y" "�" :string)
+           ("x" "�" :string)
            ("�" "�" :string)
+           ("Y" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("y" "�" :string)
            ("�" "�" :string)
-           ("z" "�" :string)
+           ("�" "�" :string)
            ("Z" "�" :string)
+           ("z" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ))
 
 (define-rule-set "da-resolve-diacritics"
 
-  :rules  (("Aa" "�" :string)
-           ("AA" "�" :string)
+  :rules  (("AA" "�" :string)
            ("aa" "�" :string)
-           ("Y" "�" :string)
-           ("O" "�" :string)
-           ("V" "�" :string)
-           ("M" "�" :string)
-           ("�" "�" :string)
-           ("t" "�" :string)
-           ("T" "�" :string)
-           ("D" "�" :string)
-           ("N" "�" :string)
-           ("K" "�" :string)
-           ("v" "�" :string)
-           ("�" "�" :string)
+           ("Aa" "�" :string)
+           ("m" "�" :string)
            ("q" "�" :string)
-           ("C" "�" :string)
-           ("�" "�" :string)
-           ("i" "�" :string)
            ("b" "�" :string)
-           ("U" "�" :string)
-           ("l" "�" :string)
+           ("P" "�" :string)
            ("d" "�" :string)
+           ("j" "�" :string)
+           ("g" "�" :string)
+           ("e" "�" :string)
+           ("K" "�" :string)
+           ("R" "�" :string)
+           ("Q" "�" :string)
            ("r" "�" :string)
-           ("m" "�" :string)
-           ("J" "�" :string)
+           ("G" "�" :string)
+           ("o" "�" :string)
            ("H" "�" :string)
-           ("S" "�" :string)
-           ("a" "�" :string)
-           ("p" "�" :string)
-           ("j" "�" :string)
+           ("C" "�" :string)
+           ("N" "�" :string)
+           ("x" "�" :string)
+           ("X" "�" :string)
+           ("h" "�" :string)
+           ("i" "�" :string)
+           ("w" "�" :string)
            ("z" "�" :string)
+           ("�" "�" :string)
+           ("J" "�" :string)
+           ("D" "�" :string)
+           ("a" "�" :string)
+           ("l" "�" :string)
+           ("I" "�" :string)
            ("s" "�" :string)
-           ("o" "�" :string)
-           ("P" "�" :string)
-           ("u" "�" :string)
-           ("Q" "�" :string)
-           ("n" "�" :string)
-           ("R" "�" :string)
-           ("�" "�" :string)
-           ("x" "�" :string)
-           ("y" "�" :string)
-           ("W" "�" :string)
-           ("e" "�" :string)
+           ("�" "�" :string)
+           ("Y" "�" :string)
            ("B" "�" :string)
-           ("Z" "�" :string)
-           ("w" "�" :string)
-           ("G" "�" :string)
+           ("O" "�" :string)
            ("f" "�" :string)
-           ("X" "�" :string)
-           ("F" "�" :string)
-           ("L" "�" :string)
-           ("A" "�" :string)
-           ("c" "�" :string)
-           ("�" "�" :string)
-           ("k" "�" :string)
-           ("I" "�" :string)
-           ("g" "�" :string)
            ("�" "�" :string)
-           ("h" "�" :string)
+           ("p" "�" :string)
+           ("c" "�" :string)
+           ("L" "�" :string)
+           ("T" "�" :string)
            ("E" "�" :string)
+           ("M" "�" :string)
+           ("Z" "�" :string)
+           ("u" "�" :string)
+           ("n" "�" :string)
+           ("U" "�" :string)
+           ("k" "�" :string)
+           ("t" "�" :string)
+           ("S" "�" :string)
+           ("�" "�" :string)
+           ("V" "�" :string)
+           ("�" "�" :string)
+           ("v" "�" :string)
+           ("F" "�" :string)
+           ("W" "�" :string)
+           ("�" "�" :string)
+           ("A" "�" :string)
+           ("y" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :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 "da-resolve-case"
@@ -238,211 +238,211 @@
   :rules  (("AA" "7" :string)
            ("Aa" "8" :string)
            ("aa" "9" :string)
-           ("E" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("I" "8" :string)
-           ("�" "8" :string)
-           ("G" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("A" "8" :string)
-           ("�" "8" :string)
-           ("L" "8" :string)
-           ("F" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("D" "8" :string)
+           ("J" "8" :string)
            ("X" "8" :string)
-           ("�" "8" :string)
-           ("Z" "8" :string)
-           ("B" "8" :string)
-           ("�" "8" :string)
-           ("W" "8" :string)
-           ("�" "8" :string)
-           ("R" "8" :string)
+           ("N" "8" :string)
+           ("�" "8" :string)
+           ("H" "8" :string)
+           ("C" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("K" "8" :string)
+           ("�" "8" :string)
+           ("G" "8" :string)
            ("Q" "8" :string)
+           ("�" "8" :string)
+           ("R" "8" :string)
            ("P" "8" :string)
+           ("�" "8" :string)
+           ("W" "8" :string)
+           ("A" "8" :string)
+           ("F" "8" :string)
+           ("V" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
-           ("H" "8" :string)
+           ("�" "8" :string)
            ("S" "8" :string)
-           ("�" "8" :string)
-           ("J" "8" :string)
-           ("�" "8" :string)
-           ("U" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("C" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
-           ("N" "8" :string)
-           ("D" "8" :string)
-           ("K" "8" :string)
-           ("T" "8" :string)
-           ("�" "8" :string)
-           ("Y" "8" :string)
+           ("U" "8" :string)
+           ("M" "8" :string)
+           ("Z" "8" :string)
+           ("E" "8" :string)
+           ("�" "8" :string)
            ("O" "8" :string)
+           ("B" "8" :string)
+           ("�" "8" :string)
+           ("Y" "8" :string)
+           ("L" "8" :string)
+           ("T" "8" :string)
+           ("�" "8" :string)
+           ("I" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
-           ("M" "8" :string)
-           ("V" "8" :string)
-           ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
            ("�" "89" :string)
-           ("�" "9" :string)
+           ("�" "9" :string)
+           ("w" "9" :string)
+           ("�" "9" :string)
+           ("z" "9" :string)
+           ("x" "9" :string)
            ("h" "9" :string)
-           ("c" "9" :string)
-           ("�" "9" :string)
+           ("i" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("o" "9" :string)
            ("g" "9" :string)
+           ("e" "9" :string)
+           ("j" "9" :string)
+           ("r" "9" :string)
+           ("d" "9" :string)
+           ("m" "9" :string)
+           ("q" "9" :string)
+           ("b" "9" :string)
+           ("y" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("v" "9" :string)
+           ("�" "9" :string)
+           ("t" "9" :string)
+           ("�" "9" :string)
            ("k" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("n" "9" :string)
+           ("u" "9" :string)
            ("f" "9" :string)
            ("�" "9" :string)
            ("�" "9" :string)
+           ("c" "9" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
-           ("w" "9" :string)
-           ("y" "9" :string)
-           ("x" "9" :string)
-           ("�" "9" :string)
-           ("e" "9" :string)
-           ("�" "9" :string)
-           ("n" "9" :string)
-           ("�" "9" :string)
-           ("o" "9" :string)
-           ("s" "9" :string)
-           ("z" "9" :string)
-           ("u" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("j" "9" :string)
            ("p" "9" :string)
            ("a" "9" :string)
+           ("s" "9" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
-           ("b" "9" :string)
-           ("i" "9" :string)
-           ("m" "9" :string)
-           ("d" "9" :string)
-           ("r" "9" :string)
            ("l" "9" :string)
-           ("q" "9" :string)
-           ("v" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("t" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
            ("�" "99" :string)
            ))
 
 (define-rule-set "da-ignore-special"
 
-  :rules  (("?" "" :string)
+  :rules  (("!" "" :string)
            ("-" "" :string)
            ("." "" :string)
-           ("!" "" :string)
            ("'" "" :string)
+           ("?" "" :string)
            ))
 
 (define-rule-set "da-resolve-special"
 
-  :rules  (("AA" "�" :string)
+  :rules  (("Aa" "�" :string)
+           ("AA" "�" :string)
            ("aa" "�" :string)
-           ("Aa" "�" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("z" "�" :string)
-           ("s" "�" :string)
-           ("o" "�" :string)
-           ("P" "�" :string)
-           ("u" "�" :string)
-           ("Q" "�" :string)
-           ("a" "�" :string)
-           ("�" "�" :string)
-           ("p" "�" :string)
-           ("j" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("S" "�" :string)
+           ("t" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("U" "�" :string)
+           ("k" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("v" "�" :string)
+           ("�" "�" :string)
+           ("F" "�" :string)
+           ("V" "�" :string)
            ("�" "�" :string)
-           ("x" "�" :string)
-           ("y" "�" :string)
-           ("�" "�" :string)
-           ("e" "�" :string)
+           ("A" "�" :string)
            ("W" "�" :string)
+           ("y" "�" :string)
            ("�" "�" :string)
-           ("B" "�" :string)
-           ("n" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("R" "�" :string)
-           ("�" "�" :string)
-           ("G" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("I" "�" :string)
+           ("s" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("f" "�" :string)
-           ("�" "�" :string)
-           ("X" "�" :string)
-           ("F" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("l" "�" :string)
+           ("a" "�" :string)
            ("L" "�" :string)
-           ("A" "�" :string)
-           ("�" "�" :string)
-           ("Z" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("w" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("h" "�" :string)
-           ("E" "�" :string)
-           ("�" "�" :string)
            ("c" "�" :string)
-           ("�" "�" :string)
-           ("I" "�" :string)
-           ("k" "�" :string)
-           ("�" "�" :string)
-           ("g" "�" :string)
-           ("�" "�" :string)
            ("T" "�" :string)
-           ("t" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("p" "�" :string)
+           ("�" "�" :string)
            ("O" "�" :string)
+           ("f" "�" :string)
+           ("B" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("Y" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("V" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("u" "�" :string)
+           ("n" "�" :string)
+           ("�" "�" :string)
            ("M" "�" :string)
-           ("�" "�" :string)
-           ("v" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("Z" "�" :string)
+           ("E" "�" :string)
            ("�" "�" :string)
-           ("D" "�" :string)
-           ("�" "�" :string)
+           ("C" "�" :string)
+           ("H" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("h" "�" :string)
+           ("i" "�" :string)
+           ("�" "�" :string)
+           ("x" "�" :string)
+           ("X" "�" :string)
            ("N" "�" :string)
-           ("K" "�" :string)
+           ("D" "�" :string)
+           ("J" "�" :string)
+           ("w" "�" :string)
            ("�" "�" :string)
-           ("i" "�" :string)
-           ("U" "�" :string)
+           ("z" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("b" "�" :string)
-           ("l" "�" :string)
-           ("r" "�" :string)
-           ("d" "�" :string)
-           ("�" "�" :string)
-           ("m" "�" :string)
            ("q" "�" :string)
-           ("C" "�" :string)
-           ("H" "�" :string)
+           ("m" "�" :string)
+           ("d" "�" :string)
+           ("P" "�" :string)
+           ("�" "�" :string)
+           ("r" "�" :string)
+           ("Q" "�" :string)
+           ("G" "�" :string)
            ("�" "�" :string)
-           ("S" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("J" "�" :string)
-           ("�" "�" :string)
+           ("R" "�" :string)
+           ("g" "�" :string)
+           ("K" "�" :string)
+           ("e" "�" :string)
+           ("j" "�" :string)
+           ("o" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "��" :string)
            ("�" "��" :string)
            ("-" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/danish/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/danish/utf8.xdy
index 9b7d268b566..2df828c47e2 100644
--- a/Master/texmf-dist/xindy/modules/lang/danish/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/danish/utf8.xdy
@@ -33,442 +33,442 @@
 
 (define-rule-set "da-alphabetize"
 
-  :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)
-           ("AA" "�" :string)
            ("ǻ" "�" :string)
-           ("Aa" "�" :string)
            ("Å" "�" :string)
+           ("AA" "�" :string)
            ("aa" "�" :string)
+           ("Aa" "�" :string)
            ("A" "�" :string)
            ("a" "�" :string)
-           ("b" "�" :string)
            ("B" "�" :string)
+           ("b" "�" :string)
            ("C" "�" :string)
            ("c" "�" :string)
            ("D" "�" :string)
            ("d" "�" :string)
-           ("e" "�" :string)
            ("E" "�" :string)
+           ("e" "�" :string)
            ("f" "�" :string)
            ("F" "�" :string)
-           ("G" "�" :string)
            ("g" "�" :string)
-           ("H" "�" :string)
+           ("G" "�" :string)
            ("h" "�" :string)
-           ("i" "�" :string)
+           ("H" "�" :string)
            ("I" "�" :string)
-           ("J" "�" :string)
+           ("i" "�" :string)
            ("j" "�" :string)
-           ("K" "�" :string)
+           ("J" "�" :string)
            ("k" "�" :string)
-           ("L" "�" :string)
+           ("K" "�" :string)
            ("l" "�" :string)
+           ("L" "�" :string)
            ("m" "�" :string)
            ("M" "�" :string)
-           ("n" "�" :string)
            ("N" "�" :string)
+           ("n" "�" :string)
            ("o" "�" :string)
            ("O" "�" :string)
-           ("p" "�" :string)
            ("P" "�" :string)
+           ("p" "�" :string)
            ("q" "�" :string)
            ("Q" "�" :string)
-           ("r" "�" :string)
            ("R" "�" :string)
+           ("r" "�" :string)
            ("S" "�" :string)
            ("s" "�" :string)
-           ("t" "�" :string)
            ("T" "�" :string)
-           ("U" "�" :string)
+           ("t" "�" :string)
            ("u" "�" :string)
-           ("V" "�" :string)
+           ("U" "�" :string)
            ("v" "�" :string)
+           ("V" "�" :string)
            ("w" "�" :string)
            ("W" "�" :string)
-           ("x" "�" :string)
            ("X" "�" :string)
+           ("x" "�" :string)
            ("Y" "�" :string)
            ("y" "�" :string)
-           ("Z" "�" :string)
            ("z" "�" :string)
+           ("Z" "�" :string)
            ))
 
 (define-rule-set "da-resolve-diacritics"
 
-  :rules  (("æ" "�" :string)
-           ("ø" "�" :string)
+  :rules  (("ø" "�" :string)
            ("Å" "�" :string)
-           ("å" "�" :string)
-           ("Æ" "�" :string)
            ("Ø" "�" :string)
+           ("æ" "�" :string)
+           ("Æ" "�" :string)
+           ("å" "�" :string)
+           ("Ǿ" "�" :string)
+           ("Aa" "�" :string)
+           ("Ð" "�" :string)
+           ("aa" "�" :string)
+           ("É" "�" :string)
+           ("AA" "�" :string)
+           ("á" "�" :string)
+           ("Ç" "�" :string)
+           ("Ó" "�" :string)
+           ("ó" "�" :string)
            ("í" "�" :string)
+           ("ǿ" "�" :string)
+           ("ú" "�" :string)
+           ("Ý" "�" :string)
            ("é" "�" :string)
+           ("ç" "�" :string)
            ("Ǽ" "�" :string)
-           ("ó" "�" :string)
-           ("á" "�" :string)
-           ("Aa" "�" :string)
+           ("ý" "�" :string)
            ("Ú" "�" :string)
-           ("ð" "�" :string)
+           ("ǽ" "�" :string)
            ("Á" "�" :string)
-           ("aa" "�" :string)
-           ("Ǿ" "�" :string)
-           ("ý" "�" :string)
            ("Í" "�" :string)
-           ("ç" "�" :string)
-           ("Ó" "�" :string)
-           ("ǽ" "�" :string)
-           ("Ð" "�" :string)
-           ("É" "�" :string)
-           ("ú" "�" :string)
-           ("Ç" "�" :string)
-           ("Ý" "�" :string)
-           ("AA" "�" :string)
-           ("ǿ" "�" :string)
-           ("ô" "�" :string)
-           ("ǻ" "�" :string)
-           ("Ö" "�" :string)
+           ("ð" "�" :string)
            ("ö" "�" :string)
-           ("ü" "�" :string)
-           ("Ô" "�" :string)
+           ("È" "�" :string)
            ("è" "�" :string)
+           ("ô" "�" :string)
+           ("Ö" "�" :string)
            ("À" "�" :string)
+           ("ǻ" "�" :string)
            ("Ǻ" "�" :string)
            ("Ü" "�" :string)
            ("à" "�" :string)
-           ("È" "�" :string)
-           ("œ" "�" :string)
-           ("Â" "�" :string)
-           ("ê" "�" :string)
+           ("Ô" "�" :string)
+           ("ü" "�" :string)
            ("â" "�" :string)
+           ("Â" "�" :string)
            ("Œ" "�" :string)
+           ("ê" "�" :string)
            ("Ê" "�" :string)
+           ("œ" "�" :string)
            ("Ë" "�" :string)
            ("ë" "�" :string)
            ("Þ" "�" :string)
            ("þ" "�" :string)
-           ("r" "�" :string)
-           ("c" "�" :string)
-           ("E" "�" :string)
-           ("O" "�" :string)
-           ("R" "�" :string)
-           ("m" "�" :string)
-           ("S" "�" :string)
-           ("n" "�" :string)
-           ("I" "�" :string)
+           ("K" "�" :string)
+           ("F" "�" :string)
+           ("t" "�" :string)
+           ("s" "�" :string)
+           ("i" "�" :string)
+           ("e" "�" :string)
+           ("b" "�" :string)
+           ("V" "�" :string)
+           ("P" "�" :string)
+           ("p" "�" :string)
+           ("y" "�" :string)
+           ("B" "�" :string)
+           ("G" "�" :string)
            ("g" "�" :string)
-           ("l" "�" :string)
-           ("q" "�" :string)
-           ("X" "�" :string)
-           ("z" "�" :string)
-           ("Z" "�" :string)
+           ("m" "�" :string)
            ("k" "�" :string)
-           ("u" "�" :string)
            ("M" "�" :string)
            ("a" "�" :string)
-           ("F" "�" :string)
-           ("d" "�" :string)
-           ("b" "�" :string)
-           ("Q" "�" :string)
+           ("I" "�" :string)
+           ("U" "�" :string)
+           ("H" "�" :string)
+           ("Y" "�" :string)
+           ("v" "�" :string)
            ("J" "�" :string)
+           ("u" "�" :string)
+           ("x" "�" :string)
+           ("n" "�" :string)
+           ("h" "�" :string)
            ("j" "�" :string)
-           ("y" "�" :string)
-           ("B" "�" :string)
-           ("s" "�" :string)
-           ("N" "�" :string)
-           ("T" "�" :string)
-           ("p" "�" :string)
-           ("w" "�" :string)
-           ("P" "�" :string)
+           ("Q" "�" :string)
+           ("Z" "�" :string)
            ("L" "�" :string)
-           ("H" "�" :string)
-           ("t" "�" :string)
-           ("V" "�" :string)
+           ("T" "�" :string)
+           ("E" "�" :string)
+           ("X" "�" :string)
+           ("q" "�" :string)
+           ("c" "�" :string)
            ("W" "�" :string)
-           ("K" "�" :string)
-           ("Y" "�" :string)
-           ("o" "�" :string)
+           ("l" "�" :string)
+           ("S" "�" :string)
+           ("O" "�" :string)
+           ("z" "�" :string)
            ("D" "�" :string)
-           ("G" "�" :string)
-           ("v" "�" :string)
+           ("R" "�" :string)
+           ("A" "�" :string)
            ("f" "�" :string)
-           ("x" "�" :string)
-           ("i" "�" :string)
-           ("e" "�" :string)
+           ("r" "�" :string)
+           ("d" "�" :string)
+           ("o" "�" :string)
            ("C" "�" :string)
-           ("h" "�" :string)
-           ("U" "�" :string)
-           ("A" "�" :string)
+           ("N" "�" :string)
+           ("w" "�" :string)
            ))
 
 (define-rule-set "da-resolve-case"
 
   :rules  (("AA" "7" :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)
            ("Aa" "8" :string)
-           ("Ö" "8" :string)
-           ("Ǽ" "8" :string)
            ("Â" "8" :string)
-           ("Ô" "8" :string)
-           ("Á" "8" :string)
-           ("Å" "8" :string)
-           ("Ú" "8" :string)
+           ("É" "8" :string)
            ("Þ" "89" :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)
-           ("aa" "9" :string)
-           ("ê" "9" :string)
-           ("ð" "9" :string)
-           ("ü" "9" :string)
+           ("â" "9" :string)
+           ("ö" "9" :string)
+           ("è" "9" :string)
            ("ø" "9" :string)
+           ("aa" "9" :string)
            ("þ" "99" :string)
-           ("Y" "8" :string)
-           ("D" "8" :string)
-           ("G" "8" :string)
-           ("K" "8" :string)
-           ("L" "8" :string)
-           ("H" "8" :string)
-           ("V" "8" :string)
-           ("W" "8" :string)
-           ("P" "8" :string)
-           ("U" "8" :string)
            ("A" "8" :string)
+           ("R" "8" :string)
+           ("D" "8" :string)
            ("C" "8" :string)
+           ("N" "8" :string)
            ("Z" "8" :string)
            ("X" "8" :string)
-           ("S" "8" :string)
-           ("I" "8" :string)
-           ("O" "8" :string)
-           ("R" "8" :string)
            ("E" "8" :string)
-           ("N" "8" :string)
            ("T" "8" :string)
-           ("B" "8" :string)
+           ("L" "8" :string)
+           ("W" "8" :string)
+           ("O" "8" :string)
+           ("S" "8" :string)
+           ("H" "8" :string)
+           ("U" "8" :string)
+           ("I" "8" :string)
            ("J" "8" :string)
+           ("Y" "8" :string)
            ("Q" "8" :string)
            ("F" "8" :string)
+           ("K" "8" :string)
+           ("V" "8" :string)
+           ("G" "8" :string)
+           ("B" "8" :string)
+           ("P" "8" :string)
            ("M" "8" :string)
-           ("v" "9" :string)
+           ("d" "9" :string)
+           ("r" "9" :string)
            ("f" "9" :string)
            ("o" "9" :string)
-           ("t" "9" :string)
-           ("p" "9" :string)
            ("w" "9" :string)
-           ("h" "9" :string)
-           ("i" "9" :string)
-           ("e" "9" :string)
-           ("x" "9" :string)
-           ("k" "9" :string)
-           ("z" "9" :string)
            ("l" "9" :string)
+           ("c" "9" :string)
            ("q" "9" :string)
-           ("g" "9" :string)
-           ("m" "9" :string)
+           ("z" "9" :string)
+           ("a" "9" :string)
+           ("u" "9" :string)
+           ("v" "9" :string)
+           ("h" "9" :string)
            ("n" "9" :string)
-           ("c" "9" :string)
-           ("r" "9" :string)
-           ("s" "9" :string)
+           ("x" "9" :string)
            ("j" "9" :string)
-           ("y" "9" :string)
-           ("d" "9" :string)
            ("b" "9" :string)
-           ("a" "9" :string)
-           ("u" "9" :string)
+           ("s" "9" :string)
+           ("i" "9" :string)
+           ("e" "9" :string)
+           ("t" "9" :string)
+           ("g" "9" :string)
+           ("y" "9" :string)
+           ("p" "9" :string)
+           ("k" "9" :string)
+           ("m" "9" :string)
            ))
 
 (define-rule-set "da-ignore-special"
 
-  :rules  (("!" "" :string)
-           ("." "" :string)
-           ("-" "" :string)
+  :rules  (("-" "" :string)
            ("'" "" :string)
            ("?" "" :string)
+           ("." "" :string)
+           ("!" "" :string)
            ))
 
 (define-rule-set "da-resolve-special"
 
-  :rules  (("Ü" "�" :string)
-           ("ú" "�" :string)
-           ("Ç" "�" :string)
-           ("ë" "�" :string)
-           ("È" "�" :string)
-           ("ǿ" "�" :string)
-           ("AA" "�" :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)
-           ("aa" "�" :string)
+           ("Ë" "�" :string)
+           ("AA" "�" :string)
+           ("É" "�" :string)
            ("ø" "�" :string)
-           ("Ú" "�" :string)
-           ("ü" "�" :string)
+           ("aa" "�" :string)
+           ("È" "�" :string)
+           ("Aa" "�" :string)
+           ("Ð" "�" :string)
+           ("è" "�" :string)
+           ("Â" "�" :string)
+           ("Ǿ" "�" :string)
+           ("â" "�" :string)
+           ("ö" "�" :string)
+           ("í" "�" :string)
+           ("ú" "�" :string)
+           ("ǿ" "�" :string)
+           ("Ǻ" "�" :string)
+           ("Œ" "�" :string)
            ("ê" "�" :string)
-           ("ð" "�" :string)
-           ("Ǽ" "�" :string)
+           ("Å" "�" :string)
+           ("ǻ" "�" :string)
            ("ó" "�" :string)
+           ("Ó" "�" :string)
+           ("À" "�" :string)
            ("Ö" "�" :string)
-           ("Â" "�" :string)
-           ("ǻ" "�" :string)
-           ("ö" "�" :string)
-           ("æ" "�" :string)
-           ("Aa" "�" :string)
            ("á" "�" :string)
-           ("í" "�" :string)
            ("ô" "�" :string)
-           ("é" "�" :string)
-           ("œ" "�" :string)
+           ("Ç" "�" :string)
            ("þ" "��" :string)
            ("Þ" "��" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("h" "�" :string)
-           ("C" "�" :string)
-           ("e" "�" :string)
-           ("i" "�" :string)
-           ("A" "�" :string)
-           ("U" "�" :string)
-           ("x" "�" :string)
-           ("K" "�" :string)
+           ("O" "�" :string)
+           ("z" "�" :string)
+           ("S" "�" :string)
+           ("l" "�" :string)
+           ("q" "�" :string)
            ("W" "�" :string)
-           ("t" "�" :string)
-           ("V" "�" :string)
-           ("H" "�" :string)
+           ("c" "�" :string)
+           ("E" "�" :string)
+           ("X" "�" :string)
+           ("T" "�" :string)
            ("L" "�" :string)
-           ("f" "�" :string)
-           ("v" "�" :string)
-           ("G" "�" :string)
-           ("Y" "�" :string)
+           ("Z" "�" :string)
+           ("w" "�" :string)
+           ("N" "�" :string)
+           ("C" "�" :string)
            ("o" "�" :string)
+           ("f" "�" :string)
+           ("d" "�" :string)
+           ("r" "�" :string)
            ("D" "�" :string)
-           ("w" "�" :string)
+           ("A" "�" :string)
+           ("R" "�" :string)
+           ("k" "�" :string)
+           ("m" "�" :string)
+           ("M" "�" :string)
+           ("y" "�" :string)
+           ("B" "�" :string)
            ("p" "�" :string)
+           ("g" "�" :string)
+           ("G" "�" :string)
            ("P" "�" :string)
-           ("B" "�" :string)
-           ("y" "�" :string)
+           ("b" "�" :string)
+           ("V" "�" :string)
+           ("s" "�" :string)
+           ("i" "�" :string)
+           ("e" "�" :string)
+           ("t" "�" :string)
+           ("F" "�" :string)
+           ("K" "�" :string)
            ("j" "�" :string)
+           ("Q" "�" :string)
+           ("h" "�" :string)
+           ("x" "�" :string)
+           ("n" "�" :string)
            ("J" "�" :string)
-           ("T" "�" :string)
-           ("N" "�" :string)
-           ("s" "�" :string)
-           ("M" "�" :string)
+           ("v" "�" :string)
            ("u" "�" :string)
-           ("Q" "�" :string)
-           ("b" "�" :string)
-           ("d" "�" :string)
-           ("F" "�" :string)
-           ("a" "�" :string)
-           ("q" "�" :string)
-           ("X" "�" :string)
-           ("l" "�" :string)
-           ("g" "�" :string)
-           ("k" "�" :string)
-           ("Z" "�" :string)
-           ("z" "�" :string)
-           ("E" "�" :string)
-           ("c" "�" :string)
-           ("r" "�" :string)
-           ("S" "�" :string)
+           ("Y" "�" :string)
+           ("H" "�" :string)
            ("I" "�" :string)
-           ("n" "�" :string)
-           ("m" "�" :string)
-           ("R" "�" :string)
-           ("O" "�" :string)
+           ("a" "�" :string)
+           ("U" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/dutch/ij-as-ij-latin1.xdy b/Master/texmf-dist/xindy/modules/lang/dutch/ij-as-ij-latin1.xdy
index e0e11fea3c0..fc537e4254e 100644
--- a/Master/texmf-dist/xindy/modules/lang/dutch/ij-as-ij-latin1.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/dutch/ij-as-ij-latin1.xdy
@@ -30,32 +30,32 @@
 
 (define-rule-set "nl-alphabetize"
 
-  :rules  (("A" "�" :string)
-           ("a" "�" :string)
-           ("�" "�" :string)
+  :rules  (("�" "�" :string)
+           ("A" "�" :string)
            ("�" "�" :string)
-           ("b" "�" :string)
+           ("a" "�" :string)
            ("B" "�" :string)
+           ("b" "�" :string)
            ("c" "�" :string)
            ("C" "�" :string)
            ("D" "�" :string)
            ("d" "�" :string)
-           ("e" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("E" "�" :string)
+           ("e" "�" :string)
            ("F" "�" :string)
            ("f" "�" :string)
-           ("G" "�" :string)
            ("g" "�" :string)
+           ("G" "�" :string)
            ("H" "�" :string)
            ("h" "�" :string)
+           ("�" "�" :string)
            ("i" "�" :string)
            ("I" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("j" "�" :string)
            ("J" "�" :string)
            ("K" "�" :string)
@@ -64,182 +64,182 @@
            ("L" "�" :string)
            ("m" "�" :string)
            ("M" "�" :string)
-           ("n" "�" :string)
            ("N" "�" :string)
-           ("�" "�" :string)
-           ("o" "�" :string)
+           ("n" "�" :string)
            ("O" "�" :string)
            ("�" "�" :string)
-           ("p" "�" :string)
+           ("�" "�" :string)
+           ("o" "�" :string)
            ("P" "�" :string)
-           ("Q" "�" :string)
+           ("p" "�" :string)
            ("q" "�" :string)
-           ("R" "�" :string)
+           ("Q" "�" :string)
            ("r" "�" :string)
-           ("S" "�" :string)
+           ("R" "�" :string)
            ("s" "�" :string)
+           ("S" "�" :string)
            ("T" "�" :string)
            ("t" "�" :string)
-           ("u" "�" :string)
-           ("U" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("v" "�" :string)
+           ("U" "�" :string)
+           ("u" "�" :string)
            ("V" "�" :string)
+           ("v" "�" :string)
            ("W" "�" :string)
            ("w" "�" :string)
-           ("X" "�" :string)
            ("x" "�" :string)
+           ("X" "�" :string)
            ("Y" "�" :string)
            ("y" "�" :string)
-           ("Z" "�" :string)
            ("z" "�" :string)
+           ("Z" "�" :string)
            ))
 
 (define-rule-set "nl-resolve-diacritics"
 
-  :rules  (("L" "�" :string)
-           ("y" "�" :string)
-           ("d" "�" :string)
-           ("O" "�" :string)
+  :rules  (("w" "�" :string)
            ("o" "�" :string)
-           ("z" "�" :string)
-           ("P" "�" :string)
-           ("n" "�" :string)
-           ("V" "�" :string)
-           ("T" "�" :string)
-           ("m" "�" :string)
-           ("v" "�" :string)
-           ("b" "�" :string)
-           ("r" "�" :string)
-           ("B" "�" :string)
-           ("E" "�" :string)
-           ("x" "�" :string)
+           ("e" "�" :string)
+           ("p" "�" :string)
+           ("I" "�" :string)
+           ("k" "�" :string)
+           ("a" "�" :string)
            ("J" "�" :string)
-           ("f" "�" :string)
-           ("M" "�" :string)
-           ("h" "�" :string)
-           ("g" "�" :string)
-           ("G" "�" :string)
-           ("t" "�" :string)
-           ("N" "�" :string)
-           ("D" "�" :string)
+           ("v" "�" :string)
+           ("U" "�" :string)
            ("i" "�" :string)
            ("S" "�" :string)
-           ("A" "�" :string)
-           ("U" "�" :string)
-           ("K" "�" :string)
-           ("W" "�" :string)
-           ("w" "�" :string)
            ("u" "�" :string)
-           ("H" "�" :string)
-           ("Q" "�" :string)
+           ("R" "�" :string)
+           ("L" "�" :string)
            ("j" "�" :string)
-           ("Y" "�" :string)
-           ("l" "�" :string)
-           ("q" "�" :string)
+           ("d" "�" :string)
+           ("b" "�" :string)
+           ("A" "�" :string)
+           ("E" "�" :string)
            ("Z" "�" :string)
-           ("a" "�" :string)
+           ("M" "�" :string)
+           ("W" "�" :string)
+           ("n" "�" :string)
+           ("q" "�" :string)
+           ("l" "�" :string)
+           ("h" "�" :string)
            ("X" "�" :string)
-           ("C" "�" :string)
-           ("R" "�" :string)
-           ("e" "�" :string)
-           ("F" "�" :string)
-           ("k" "�" :string)
-           ("I" "�" :string)
+           ("V" "�" :string)
+           ("Q" "�" :string)
            ("s" "�" :string)
-           ("p" "�" :string)
+           ("P" "�" :string)
+           ("y" "�" :string)
+           ("t" "�" :string)
            ("c" "�" :string)
+           ("r" "�" :string)
+           ("B" "�" :string)
+           ("f" "�" :string)
+           ("z" "�" :string)
+           ("N" "�" :string)
+           ("m" "�" :string)
+           ("C" "�" :string)
+           ("g" "�" :string)
+           ("x" "�" :string)
+           ("T" "�" :string)
+           ("Y" "�" :string)
+           ("O" "�" :string)
+           ("G" "�" :string)
+           ("F" "�" :string)
+           ("K" "�" :string)
+           ("D" "�" :string)
+           ("H" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ))
 
 (define-rule-set "nl-resolve-case"
 
-  :rules  (("U" "8" :string)
-           ("K" "8" :string)
-           ("D" "8" :string)
-           ("A" "8" :string)
-           ("S" "8" :string)
+  :rules  (("D" "8" :string)
            ("H" "8" :string)
-           ("Q" "8" :string)
-           ("W" "8" :string)
-           ("Z" "8" :string)
-           ("C" "8" :string)
-           ("X" "8" :string)
-           ("Y" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("R" "8" :string)
+           ("K" "8" :string)
            ("F" "8" :string)
-           ("I" "8" :string)
-           ("P" "8" :string)
-           ("�" "8" :string)
-           ("V" "8" :string)
-           ("L" "8" :string)
            ("O" "8" :string)
-           ("�" "8" :string)
+           ("G" "8" :string)
+           ("Y" "8" :string)
            ("T" "8" :string)
-           ("J" "8" :string)
+           ("C" "8" :string)
+           ("�" "8" :string)
+           ("N" "8" :string)
            ("B" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("P" "8" :string)
+           ("Q" "8" :string)
+           ("X" "8" :string)
+           ("V" "8" :string)
+           ("W" "8" :string)
+           ("M" "8" :string)
+           ("�" "8" :string)
+           ("A" "8" :string)
+           ("Z" "8" :string)
            ("E" "8" :string)
-           ("G" "8" :string)
-           ("N" "8" :string)
+           ("L" "8" :string)
+           ("R" "8" :string)
+           ("S" "8" :string)
+           ("U" "8" :string)
+           ("J" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
-           ("M" "8" :string)
-           ("�" "8" :string)
-           ("i" "9" :string)
-           ("u" "9" :string)
-           ("�" "9" :string)
-           ("w" "9" :string)
-           ("a" "9" :string)
+           ("I" "8" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
-           ("j" "9" :string)
+           ("x" "9" :string)
+           ("g" "9" :string)
+           ("�" "9" :string)
+           ("m" "9" :string)
+           ("f" "9" :string)
+           ("z" "9" :string)
+           ("r" "9" :string)
+           ("c" "9" :string)
+           ("�" "9" :string)
+           ("t" "9" :string)
+           ("y" "9" :string)
+           ("s" "9" :string)
+           ("h" "9" :string)
            ("l" "9" :string)
            ("q" "9" :string)
-           ("s" "9" :string)
-           ("p" "9" :string)
-           ("c" "9" :string)
-           ("k" "9" :string)
-           ("e" "9" :string)
-           ("o" "9" :string)
-           ("z" "9" :string)
            ("n" "9" :string)
-           ("y" "9" :string)
-           ("d" "9" :string)
-           ("m" "9" :string)
-           ("�" "9" :string)
            ("b" "9" :string)
+           ("j" "9" :string)
+           ("d" "9" :string)
+           ("u" "9" :string)
+           ("i" "9" :string)
            ("v" "9" :string)
+           ("a" "9" :string)
+           ("k" "9" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
-           ("x" "9" :string)
-           ("r" "9" :string)
-           ("g" "9" :string)
-           ("h" "9" :string)
-           ("t" "9" :string)
-           ("�" "9" :string)
-           ("f" "9" :string)
+           ("p" "9" :string)
+           ("e" "9" :string)
+           ("o" "9" :string)
+           ("�" "9" :string)
+           ("w" "9" :string)
            ))
 
 (define-rule-set "nl-ignore-special"
 
-  :rules  (("{" "" :string)
-           ("-" "" :string)
-           ("?" "" :string)
-           ("." "" :string)
-           ("!" "" :string)
+  :rules  (("-" "" :string)
            ("}" "" :string)
+           ("!" "" :string)
+           ("." "" :string)
+           ("?" "" :string)
+           ("{" "" :string)
            ("'" "" :string)
            ))
 
@@ -248,70 +248,70 @@
   :rules  (("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
+           ("P" "�" :string)
+           ("s" "�" :string)
+           ("�" "�" :string)
+           ("y" "�" :string)
+           ("�" "�" :string)
+           ("t" "�" :string)
+           ("�" "�" :string)
+           ("c" "�" :string)
            ("B" "�" :string)
            ("r" "�" :string)
-           ("E" "�" :string)
-           ("x" "�" :string)
-           ("J" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("f" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("M" "�" :string)
-           ("G" "�" :string)
-           ("t" "�" :string)
-           ("h" "�" :string)
-           ("g" "�" :string)
            ("N" "�" :string)
-           ("y" "�" :string)
-           ("L" "�" :string)
-           ("O" "�" :string)
-           ("d" "�" :string)
            ("z" "�" :string)
-           ("o" "�" :string)
-           ("V" "�" :string)
-           ("�" "�" :string)
-           ("P" "�" :string)
-           ("n" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("C" "�" :string)
            ("m" "�" :string)
+           ("x" "�" :string)
+           ("g" "�" :string)
            ("T" "�" :string)
-           ("�" "�" :string)
-           ("v" "�" :string)
-           ("b" "�" :string)
-           ("�" "�" :string)
-           ("l" "�" :string)
            ("Y" "�" :string)
-           ("j" "�" :string)
-           ("�" "�" :string)
-           ("q" "�" :string)
-           ("�" "�" :string)
-           ("a" "�" :string)
-           ("Z" "�" :string)
            ("�" "�" :string)
-           ("X" "�" :string)
-           ("C" "�" :string)
-           ("R" "�" :string)
-           ("I" "�" :string)
-           ("e" "�" :string)
+           ("G" "�" :string)
+           ("O" "�" :string)
            ("F" "�" :string)
-           ("k" "�" :string)
-           ("p" "�" :string)
-           ("s" "�" :string)
-           ("c" "�" :string)
+           ("K" "�" :string)
+           ("�" "�" :string)
+           ("H" "�" :string)
            ("D" "�" :string)
+           ("o" "�" :string)
+           ("�" "�" :string)
+           ("w" "�" :string)
+           ("e" "�" :string)
+           ("p" "�" :string)
+           ("I" "�" :string)
+           ("k" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("a" "�" :string)
+           ("v" "�" :string)
+           ("�" "�" :string)
+           ("J" "�" :string)
            ("S" "�" :string)
-           ("A" "�" :string)
            ("i" "�" :string)
            ("U" "�" :string)
-           ("K" "�" :string)
-           ("W" "�" :string)
-           ("w" "�" :string)
-           ("H" "�" :string)
+           ("L" "�" :string)
            ("u" "�" :string)
+           ("R" "�" :string)
+           ("b" "�" :string)
+           ("A" "�" :string)
+           ("�" "�" :string)
+           ("E" "�" :string)
+           ("Z" "�" :string)
+           ("j" "�" :string)
+           ("d" "�" :string)
+           ("W" "�" :string)
+           ("n" "�" :string)
+           ("M" "�" :string)
+           ("l" "�" :string)
+           ("q" "�" :string)
            ("Q" "�" :string)
-           ("�" "�" :string)
+           ("X" "�" :string)
+           ("h" "�" :string)
+           ("V" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ("{" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/dutch/ij-as-ij-utf8.xdy b/Master/texmf-dist/xindy/modules/lang/dutch/ij-as-ij-utf8.xdy
index f15592a1c36..a37c8571836 100644
--- a/Master/texmf-dist/xindy/modules/lang/dutch/ij-as-ij-utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/dutch/ij-as-ij-utf8.xdy
@@ -32,54 +32,54 @@
 
   :rules  (("Ä" "�" :string)
            ("ä" "�" :string)
-           ("É" "�" :string)
            ("Ë" "�" :string)
            ("é" "�" :string)
            ("ë" "�" :string)
-           ("ï" "�" :string)
+           ("É" "�" :string)
            ("Ï" "�" :string)
+           ("ï" "�" :string)
            ("ij" "��" :string)
            ("IJ" "��" :string)
            ("Ö" "�" :string)
            ("ö" "�" :string)
            ("ü" "�" :string)
            ("Ü" "�" :string)
-           ("a" "�" :string)
            ("A" "�" :string)
+           ("a" "�" :string)
            ("b" "�" :string)
            ("B" "�" :string)
-           ("c" "�" :string)
            ("C" "�" :string)
+           ("c" "�" :string)
            ("d" "�" :string)
            ("D" "�" :string)
            ("e" "�" :string)
            ("E" "�" :string)
-           ("F" "�" :string)
            ("f" "�" :string)
+           ("F" "�" :string)
            ("g" "�" :string)
            ("G" "�" :string)
-           ("H" "�" :string)
            ("h" "�" :string)
+           ("H" "�" :string)
            ("i" "�" :string)
            ("I" "�" :string)
-           ("j" "�" :string)
            ("J" "�" :string)
-           ("k" "�" :string)
+           ("j" "�" :string)
            ("K" "�" :string)
+           ("k" "�" :string)
            ("L" "�" :string)
            ("l" "�" :string)
            ("M" "�" :string)
            ("m" "�" :string)
-           ("n" "�" :string)
            ("N" "�" :string)
+           ("n" "�" :string)
            ("o" "�" :string)
            ("O" "�" :string)
            ("p" "�" :string)
            ("P" "�" :string)
-           ("Q" "�" :string)
            ("q" "�" :string)
-           ("R" "�" :string)
+           ("Q" "�" :string)
            ("r" "�" :string)
+           ("R" "�" :string)
            ("S" "�" :string)
            ("s" "�" :string)
            ("t" "�" :string)
@@ -90,8 +90,8 @@
            ("v" "�" :string)
            ("w" "�" :string)
            ("W" "�" :string)
-           ("x" "�" :string)
            ("X" "�" :string)
+           ("x" "�" :string)
            ("Y" "�" :string)
            ("y" "�" :string)
            ("Z" "�" :string)
@@ -100,226 +100,226 @@
 
 (define-rule-set "nl-resolve-diacritics"
 
-  :rules  (("ü" "�" :string)
-           ("Ä" "�" :string)
-           ("Ï" "�" :string)
-           ("ï" "�" :string)
-           ("Ë" "�" :string)
+  :rules  (("ï" "�" :string)
+           ("ö" "�" :string)
            ("ä" "�" :string)
+           ("Ü" "�" :string)
+           ("Ï" "�" :string)
            ("Ö" "�" :string)
-           ("ö" "�" :string)
+           ("Ä" "�" :string)
            ("ë" "�" :string)
-           ("Ü" "�" :string)
+           ("Ë" "�" :string)
+           ("ü" "�" :string)
            ("É" "�" :string)
            ("é" "�" :string)
-           ("ij" "�" :string)
            ("IJ" "�" :string)
-           ("i" "�" :string)
+           ("ij" "�" :string)
+           ("U" "�" :string)
+           ("H" "�" :string)
+           ("m" "�" :string)
+           ("y" "�" :string)
+           ("W" "�" :string)
+           ("s" "�" :string)
            ("a" "�" :string)
-           ("S" "�" :string)
+           ("D" "�" :string)
+           ("z" "�" :string)
+           ("B" "�" :string)
+           ("v" "�" :string)
+           ("Q" "�" :string)
+           ("c" "�" :string)
+           ("P" "�" :string)
            ("d" "�" :string)
-           ("o" "�" :string)
-           ("A" "�" :string)
-           ("g" "�" :string)
-           ("I" "�" :string)
-           ("L" "�" :string)
-           ("t" "�" :string)
-           ("u" "�" :string)
-           ("x" "�" :string)
-           ("H" "�" :string)
            ("j" "�" :string)
-           ("f" "�" :string)
-           ("l" "�" :string)
-           ("Y" "�" :string)
-           ("n" "�" :string)
-           ("R" "�" :string)
-           ("M" "�" :string)
            ("X" "�" :string)
-           ("v" "�" :string)
+           ("T" "�" :string)
+           ("E" "�" :string)
+           ("I" "�" :string)
            ("Z" "�" :string)
+           ("x" "�" :string)
            ("G" "�" :string)
+           ("w" "�" :string)
+           ("R" "�" :string)
+           ("o" "�" :string)
+           ("C" "�" :string)
+           ("J" "�" :string)
            ("F" "�" :string)
-           ("s" "�" :string)
-           ("T" "�" :string)
            ("V" "�" :string)
-           ("U" "�" :string)
-           ("e" "�" :string)
-           ("w" "�" :string)
-           ("h" "�" :string)
-           ("P" "�" :string)
            ("k" "�" :string)
-           ("K" "�" :string)
-           ("m" "�" :string)
-           ("q" "�" :string)
-           ("c" "�" :string)
-           ("C" "�" :string)
-           ("W" "�" :string)
-           ("E" "�" :string)
-           ("D" "�" :string)
-           ("Q" "�" :string)
-           ("N" "�" :string)
+           ("i" "�" :string)
+           ("M" "�" :string)
+           ("t" "�" :string)
            ("O" "�" :string)
-           ("J" "�" :string)
-           ("r" "�" :string)
+           ("n" "�" :string)
+           ("g" "�" :string)
            ("b" "�" :string)
+           ("q" "�" :string)
+           ("K" "�" :string)
+           ("S" "�" :string)
+           ("L" "�" :string)
+           ("f" "�" :string)
            ("p" "�" :string)
-           ("y" "�" :string)
-           ("B" "�" :string)
-           ("z" "�" :string)
+           ("h" "�" :string)
+           ("r" "�" :string)
+           ("e" "�" :string)
+           ("N" "�" :string)
+           ("l" "�" :string)
+           ("u" "�" :string)
+           ("A" "�" :string)
+           ("Y" "�" :string)
            ))
 
 (define-rule-set "nl-resolve-case"
 
   :rules  (("Ï" "8" :string)
-           ("Ë" "8" :string)
-           ("Ö" "8" :string)
-           ("É" "8" :string)
            ("Ä" "8" :string)
+           ("Ö" "8" :string)
+           ("Ë" "8" :string)
            ("Ü" "8" :string)
+           ("É" "8" :string)
            ("IJ" "89" :string)
-           ("ä" "9" :string)
-           ("ï" "9" :string)
-           ("ö" "9" :string)
            ("ü" "9" :string)
-           ("ë" "9" :string)
            ("é" "9" :string)
+           ("ë" "9" :string)
+           ("ö" "9" :string)
+           ("ï" "9" :string)
+           ("ä" "9" :string)
            ("ij" "99" :string)
+           ("M" "8" :string)
+           ("V" "8" :string)
+           ("O" "8" :string)
+           ("R" "8" :string)
+           ("J" "8" :string)
+           ("F" "8" :string)
+           ("C" "8" :string)
+           ("N" "8" :string)
            ("A" "8" :string)
-           ("I" "8" :string)
-           ("L" "8" :string)
-           ("H" "8" :string)
-           ("S" "8" :string)
+           ("Y" "8" :string)
            ("K" "8" :string)
-           ("P" "8" :string)
-           ("N" "8" :string)
+           ("S" "8" :string)
+           ("L" "8" :string)
+           ("D" "8" :string)
+           ("B" "8" :string)
            ("Q" "8" :string)
-           ("O" "8" :string)
+           ("H" "8" :string)
+           ("U" "8" :string)
            ("W" "8" :string)
+           ("Z" "8" :string)
+           ("G" "8" :string)
+           ("P" "8" :string)
+           ("T" "8" :string)
            ("E" "8" :string)
-           ("D" "8" :string)
-           ("C" "8" :string)
-           ("J" "8" :string)
-           ("B" "8" :string)
-           ("R" "8" :string)
-           ("Y" "8" :string)
+           ("I" "8" :string)
            ("X" "8" :string)
-           ("M" "8" :string)
-           ("T" "8" :string)
-           ("F" "8" :string)
-           ("G" "8" :string)
-           ("Z" "8" :string)
-           ("U" "8" :string)
-           ("V" "8" :string)
-           ("g" "9" :string)
-           ("o" "9" :string)
-           ("u" "9" :string)
-           ("t" "9" :string)
-           ("x" "9" :string)
            ("i" "9" :string)
-           ("d" "9" :string)
-           ("a" "9" :string)
-           ("q" "9" :string)
-           ("m" "9" :string)
            ("k" "9" :string)
-           ("c" "9" :string)
+           ("n" "9" :string)
+           ("t" "9" :string)
+           ("o" "9" :string)
+           ("l" "9" :string)
            ("r" "9" :string)
-           ("z" "9" :string)
-           ("y" "9" :string)
+           ("e" "9" :string)
+           ("u" "9" :string)
+           ("g" "9" :string)
            ("b" "9" :string)
+           ("q" "9" :string)
            ("p" "9" :string)
-           ("n" "9" :string)
-           ("l" "9" :string)
-           ("j" "9" :string)
+           ("h" "9" :string)
            ("f" "9" :string)
-           ("s" "9" :string)
            ("v" "9" :string)
-           ("h" "9" :string)
+           ("z" "9" :string)
+           ("c" "9" :string)
+           ("s" "9" :string)
+           ("a" "9" :string)
+           ("y" "9" :string)
+           ("m" "9" :string)
+           ("x" "9" :string)
            ("w" "9" :string)
-           ("e" "9" :string)
+           ("d" "9" :string)
+           ("j" "9" :string)
            ))
 
 (define-rule-set "nl-ignore-special"
 
-  :rules  (("?" "" :string)
-           ("-" "" :string)
+  :rules  (("'" "" :string)
            ("!" "" :string)
+           ("{" "" :string)
+           ("-" "" :string)
            ("}" "" :string)
+           ("?" "" :string)
            ("." "" :string)
-           ("'" "" :string)
-           ("{" "" :string)
            ))
 
 (define-rule-set "nl-resolve-special"
 
-  :rules  (("Ü" "�" :string)
-           ("ë" "�" :string)
-           ("é" "�" :string)
-           ("Ö" "�" :string)
+  :rules  (("ï" "�" :string)
            ("ö" "�" :string)
+           ("É" "�" :string)
+           ("ä" "�" :string)
+           ("Ü" "�" :string)
            ("Ï" "�" :string)
-           ("ï" "�" :string)
+           ("Ä" "�" :string)
+           ("Ö" "�" :string)
            ("Ë" "�" :string)
-           ("ä" "�" :string)
+           ("é" "�" :string)
+           ("ë" "�" :string)
            ("ü" "�" :string)
-           ("Ä" "�" :string)
-           ("É" "�" :string)
            ("IJ" "��" :string)
            ("ij" "��" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("J" "�" :string)
-           ("r" "�" :string)
-           ("p" "�" :string)
-           ("b" "�" :string)
-           ("z" "�" :string)
-           ("B" "�" :string)
-           ("y" "�" :string)
-           ("P" "�" :string)
-           ("k" "�" :string)
-           ("q" "�" :string)
+           ("H" "�" :string)
+           ("U" "�" :string)
+           ("s" "�" :string)
+           ("a" "�" :string)
            ("m" "�" :string)
-           ("K" "�" :string)
-           ("c" "�" :string)
+           ("y" "�" :string)
            ("W" "�" :string)
+           ("v" "�" :string)
            ("D" "�" :string)
-           ("E" "�" :string)
-           ("O" "�" :string)
+           ("z" "�" :string)
+           ("B" "�" :string)
+           ("c" "�" :string)
            ("Q" "�" :string)
-           ("N" "�" :string)
-           ("C" "�" :string)
+           ("d" "�" :string)
+           ("j" "�" :string)
+           ("P" "�" :string)
+           ("T" "�" :string)
+           ("E" "�" :string)
+           ("I" "�" :string)
+           ("X" "�" :string)
            ("Z" "�" :string)
+           ("x" "�" :string)
            ("G" "�" :string)
-           ("v" "�" :string)
-           ("T" "�" :string)
-           ("F" "�" :string)
-           ("s" "�" :string)
-           ("e" "�" :string)
-           ("U" "�" :string)
-           ("V" "�" :string)
            ("w" "�" :string)
-           ("h" "�" :string)
-           ("l" "�" :string)
-           ("j" "�" :string)
-           ("f" "�" :string)
-           ("n" "�" :string)
+           ("o" "�" :string)
            ("R" "�" :string)
-           ("Y" "�" :string)
+           ("J" "�" :string)
+           ("F" "�" :string)
+           ("C" "�" :string)
+           ("i" "�" :string)
            ("M" "�" :string)
-           ("X" "�" :string)
+           ("V" "�" :string)
+           ("k" "�" :string)
+           ("n" "�" :string)
            ("t" "�" :string)
-           ("u" "�" :string)
-           ("L" "�" :string)
-           ("x" "�" :string)
-           ("H" "�" :string)
-           ("o" "�" :string)
+           ("O" "�" :string)
+           ("K" "�" :string)
+           ("S" "�" :string)
            ("g" "�" :string)
+           ("b" "�" :string)
+           ("q" "�" :string)
+           ("p" "�" :string)
+           ("h" "�" :string)
+           ("L" "�" :string)
+           ("f" "�" :string)
+           ("l" "�" :string)
+           ("r" "�" :string)
+           ("e" "�" :string)
+           ("N" "�" :string)
            ("A" "�" :string)
-           ("I" "�" :string)
-           ("a" "�" :string)
-           ("d" "�" :string)
-           ("S" "�" :string)
-           ("i" "�" :string)
+           ("Y" "�" :string)
+           ("u" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ("{" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/dutch/ij-as-y-utf8.xdy b/Master/texmf-dist/xindy/modules/lang/dutch/ij-as-y-utf8.xdy
index a2f2a651b10..34adb62a4bc 100644
--- a/Master/texmf-dist/xindy/modules/lang/dutch/ij-as-y-utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/dutch/ij-as-y-utf8.xdy
@@ -32,14 +32,14 @@
 
   :rules  (("ä" "�" :string)
            ("Ä" "�" :string)
-           ("É" "�" :string)
-           ("é" "�" :string)
            ("Ë" "�" :string)
+           ("é" "�" :string)
+           ("É" "�" :string)
            ("ë" "�" :string)
-           ("Ï" "�" :string)
            ("ï" "�" :string)
-           ("ö" "�" :string)
+           ("Ï" "�" :string)
            ("Ö" "�" :string)
+           ("ö" "�" :string)
            ("ß" "��" :string)
            ("Ü" "�" :string)
            ("ü" "�" :string)
@@ -47,283 +47,283 @@
            ("ij" "�" :string)
            ("A" "�" :string)
            ("a" "�" :string)
-           ("b" "�" :string)
            ("B" "�" :string)
-           ("C" "�" :string)
+           ("b" "�" :string)
            ("c" "�" :string)
-           ("D" "�" :string)
+           ("C" "�" :string)
            ("d" "�" :string)
-           ("e" "�" :string)
+           ("D" "�" :string)
            ("E" "�" :string)
-           ("F" "�" :string)
+           ("e" "�" :string)
            ("f" "�" :string)
+           ("F" "�" :string)
            ("G" "�" :string)
            ("g" "�" :string)
-           ("H" "�" :string)
            ("h" "�" :string)
+           ("H" "�" :string)
            ("i" "�" :string)
            ("I" "�" :string)
            ("j" "�" :string)
            ("J" "�" :string)
-           ("K" "�" :string)
            ("k" "�" :string)
-           ("L" "�" :string)
+           ("K" "�" :string)
            ("l" "�" :string)
-           ("m" "�" :string)
+           ("L" "�" :string)
            ("M" "�" :string)
+           ("m" "�" :string)
            ("n" "�" :string)
            ("N" "�" :string)
            ("o" "�" :string)
            ("O" "�" :string)
-           ("p" "�" :string)
            ("P" "�" :string)
-           ("Q" "�" :string)
+           ("p" "�" :string)
            ("q" "�" :string)
+           ("Q" "�" :string)
            ("r" "�" :string)
            ("R" "�" :string)
            ("s" "�" :string)
            ("S" "�" :string)
-           ("T" "�" :string)
            ("t" "�" :string)
-           ("u" "�" :string)
+           ("T" "�" :string)
            ("U" "�" :string)
+           ("u" "�" :string)
            ("V" "�" :string)
            ("v" "�" :string)
            ("w" "�" :string)
            ("W" "�" :string)
-           ("X" "�" :string)
            ("x" "�" :string)
+           ("X" "�" :string)
            ("Y" "�" :string)
            ("y" "�" :string)
-           ("Z" "�" :string)
            ("z" "�" :string)
+           ("Z" "�" :string)
            ))
 
 (define-rule-set "nl-resolve-diacritics"
 
   :rules  (("ö" "�" :string)
-           ("IJ" "�" :string)
-           ("Ë" "�" :string)
-           ("ij" "�" :string)
-           ("Ü" "�" :string)
-           ("ï" "�" :string)
-           ("Ö" "�" :string)
-           ("ä" "�" :string)
-           ("Ï" "�" :string)
            ("Ä" "�" :string)
+           ("Ï" "�" :string)
            ("ë" "�" :string)
+           ("ï" "�" :string)
+           ("ä" "�" :string)
            ("ü" "�" :string)
+           ("Ü" "�" :string)
+           ("ij" "�" :string)
+           ("IJ" "�" :string)
+           ("Ö" "�" :string)
+           ("Ë" "�" :string)
            ("É" "�" :string)
            ("é" "�" :string)
            ("ß" "�" :string)
-           ("m" "�" :string)
-           ("A" "�" :string)
-           ("H" "�" :string)
-           ("u" "�" :string)
-           ("F" "�" :string)
-           ("s" "�" :string)
-           ("C" "�" :string)
+           ("y" "�" :string)
+           ("v" "�" :string)
            ("Q" "�" :string)
-           ("Y" "�" :string)
-           ("h" "�" :string)
+           ("H" "�" :string)
+           ("T" "�" :string)
+           ("I" "�" :string)
+           ("g" "�" :string)
            ("p" "�" :string)
-           ("w" "�" :string)
-           ("i" "�" :string)
-           ("Z" "�" :string)
-           ("n" "�" :string)
-           ("V" "�" :string)
-           ("U" "�" :string)
            ("b" "�" :string)
-           ("v" "�" :string)
-           ("x" "�" :string)
            ("X" "�" :string)
-           ("K" "�" :string)
-           ("I" "�" :string)
-           ("y" "�" :string)
-           ("G" "�" :string)
-           ("o" "�" :string)
-           ("M" "�" :string)
-           ("a" "�" :string)
-           ("L" "�" :string)
-           ("c" "�" :string)
+           ("N" "�" :string)
+           ("V" "�" :string)
            ("S" "�" :string)
-           ("D" "�" :string)
-           ("k" "�" :string)
-           ("z" "�" :string)
-           ("T" "�" :string)
-           ("e" "�" :string)
-           ("E" "�" :string)
-           ("B" "�" :string)
-           ("d" "�" :string)
-           ("t" "�" :string)
+           ("m" "�" :string)
            ("W" "�" :string)
-           ("q" "�" :string)
-           ("N" "�" :string)
-           ("O" "�" :string)
+           ("a" "�" :string)
+           ("u" "�" :string)
            ("J" "�" :string)
-           ("r" "�" :string)
+           ("M" "�" :string)
+           ("U" "�" :string)
+           ("Z" "�" :string)
+           ("G" "�" :string)
+           ("t" "�" :string)
+           ("c" "�" :string)
+           ("B" "�" :string)
            ("R" "�" :string)
-           ("g" "�" :string)
+           ("K" "�" :string)
+           ("k" "�" :string)
+           ("L" "�" :string)
+           ("C" "�" :string)
+           ("A" "�" :string)
+           ("Y" "�" :string)
+           ("s" "�" :string)
+           ("n" "�" :string)
+           ("F" "�" :string)
+           ("x" "�" :string)
+           ("i" "�" :string)
+           ("O" "�" :string)
+           ("j" "�" :string)
            ("l" "�" :string)
+           ("q" "�" :string)
+           ("r" "�" :string)
            ("P" "�" :string)
+           ("h" "�" :string)
+           ("w" "�" :string)
+           ("z" "�" :string)
+           ("e" "�" :string)
            ("f" "�" :string)
-           ("j" "�" :string)
+           ("E" "�" :string)
+           ("o" "�" :string)
+           ("d" "�" :string)
+           ("D" "�" :string)
            ))
 
 (define-rule-set "nl-resolve-case"
 
-  :rules  (("Ï" "8" :string)
-           ("Ö" "8" :string)
-           ("Ü" "8" :string)
+  :rules  (("Ö" "8" :string)
            ("Ë" "8" :string)
            ("IJ" "8" :string)
            ("É" "8" :string)
+           ("Ü" "8" :string)
+           ("Ï" "8" :string)
            ("Ä" "8" :string)
-           ("ï" "9" :string)
-           ("ä" "9" :string)
-           ("ij" "9" :string)
-           ("ö" "9" :string)
            ("é" "9" :string)
+           ("ij" "9" :string)
+           ("ï" "9" :string)
            ("ü" "9" :string)
+           ("ä" "9" :string)
            ("ë" "9" :string)
+           ("ö" "9" :string)
            ("ß" "99" :string)
+           ("D" "8" :string)
+           ("E" "8" :string)
+           ("P" "8" :string)
+           ("O" "8" :string)
+           ("A" "8" :string)
+           ("Y" "8" :string)
+           ("F" "8" :string)
+           ("K" "8" :string)
+           ("R" "8" :string)
+           ("L" "8" :string)
+           ("C" "8" :string)
            ("G" "8" :string)
+           ("B" "8" :string)
            ("M" "8" :string)
-           ("L" "8" :string)
-           ("X" "8" :string)
-           ("K" "8" :string)
-           ("I" "8" :string)
-           ("U" "8" :string)
            ("Z" "8" :string)
-           ("V" "8" :string)
-           ("Q" "8" :string)
-           ("C" "8" :string)
-           ("Y" "8" :string)
-           ("F" "8" :string)
-           ("A" "8" :string)
-           ("H" "8" :string)
-           ("P" "8" :string)
+           ("U" "8" :string)
            ("J" "8" :string)
-           ("R" "8" :string)
-           ("O" "8" :string)
-           ("N" "8" :string)
            ("W" "8" :string)
-           ("E" "8" :string)
-           ("B" "8" :string)
-           ("T" "8" :string)
+           ("N" "8" :string)
+           ("V" "8" :string)
            ("S" "8" :string)
-           ("D" "8" :string)
-           ("y" "9" :string)
+           ("X" "8" :string)
+           ("Q" "8" :string)
+           ("T" "8" :string)
+           ("H" "8" :string)
+           ("I" "8" :string)
+           ("f" "9" :string)
+           ("d" "9" :string)
            ("o" "9" :string)
-           ("a" "9" :string)
+           ("z" "9" :string)
+           ("e" "9" :string)
+           ("r" "9" :string)
+           ("w" "9" :string)
+           ("h" "9" :string)
            ("x" "9" :string)
-           ("b" "9" :string)
-           ("v" "9" :string)
            ("i" "9" :string)
+           ("j" "9" :string)
+           ("l" "9" :string)
+           ("q" "9" :string)
            ("n" "9" :string)
            ("s" "9" :string)
-           ("h" "9" :string)
-           ("w" "9" :string)
-           ("p" "9" :string)
+           ("k" "9" :string)
+           ("t" "9" :string)
+           ("c" "9" :string)
+           ("a" "9" :string)
            ("u" "9" :string)
            ("m" "9" :string)
            ("g" "9" :string)
-           ("l" "9" :string)
-           ("f" "9" :string)
-           ("j" "9" :string)
-           ("r" "9" :string)
-           ("q" "9" :string)
-           ("t" "9" :string)
-           ("d" "9" :string)
-           ("e" "9" :string)
-           ("c" "9" :string)
-           ("k" "9" :string)
-           ("z" "9" :string)
+           ("p" "9" :string)
+           ("b" "9" :string)
+           ("v" "9" :string)
+           ("y" "9" :string)
            ))
 
 (define-rule-set "nl-ignore-special"
 
-  :rules  (("?" "" :string)
-           ("'" "" :string)
+  :rules  (("}" "" :string)
            ("{" "" :string)
-           ("}" "" :string)
-           ("." "" :string)
+           ("?" "" :string)
            ("-" "" :string)
            ("!" "" :string)
+           ("." "" :string)
+           ("'" "" :string)
            ))
 
 (define-rule-set "nl-resolve-special"
 
-  :rules  (("ij" "�" :string)
-           ("Ü" "�" :string)
-           ("Ö" "�" :string)
-           ("ï" "�" :string)
-           ("ä" "�" :string)
+  :rules  (("ë" "�" :string)
            ("Ï" "�" :string)
-           ("é" "�" :string)
-           ("É" "�" :string)
+           ("Ä" "�" :string)
            ("ö" "�" :string)
-           ("IJ" "�" :string)
            ("Ë" "�" :string)
+           ("Ö" "�" :string)
+           ("é" "�" :string)
+           ("IJ" "�" :string)
+           ("É" "�" :string)
+           ("ij" "�" :string)
+           ("Ü" "�" :string)
+           ("ä" "�" :string)
            ("ü" "�" :string)
-           ("Ä" "�" :string)
-           ("ë" "�" :string)
+           ("ï" "�" :string)
            ("ß" "��" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
+           ("M" "�" :string)
            ("U" "�" :string)
-           ("b" "�" :string)
-           ("v" "�" :string)
+           ("Z" "�" :string)
+           ("J" "�" :string)
+           ("u" "�" :string)
+           ("a" "�" :string)
+           ("W" "�" :string)
+           ("S" "�" :string)
+           ("m" "�" :string)
+           ("N" "�" :string)
+           ("V" "�" :string)
            ("X" "�" :string)
-           ("x" "�" :string)
-           ("K" "�" :string)
+           ("p" "�" :string)
+           ("g" "�" :string)
+           ("b" "�" :string)
            ("I" "�" :string)
+           ("Q" "�" :string)
+           ("v" "�" :string)
+           ("H" "�" :string)
+           ("T" "�" :string)
            ("y" "�" :string)
-           ("G" "�" :string)
+           ("D" "�" :string)
            ("o" "�" :string)
-           ("M" "�" :string)
-           ("L" "�" :string)
-           ("a" "�" :string)
-           ("m" "�" :string)
-           ("A" "�" :string)
-           ("H" "�" :string)
-           ("u" "�" :string)
-           ("F" "�" :string)
-           ("Q" "�" :string)
-           ("C" "�" :string)
-           ("s" "�" :string)
-           ("Y" "�" :string)
+           ("d" "�" :string)
+           ("f" "�" :string)
+           ("E" "�" :string)
+           ("e" "�" :string)
+           ("z" "�" :string)
            ("h" "�" :string)
-           ("p" "�" :string)
            ("w" "�" :string)
-           ("i" "�" :string)
-           ("Z" "�" :string)
-           ("n" "�" :string)
-           ("V" "�" :string)
-           ("d" "�" :string)
-           ("t" "�" :string)
-           ("W" "�" :string)
-           ("O" "�" :string)
-           ("q" "�" :string)
-           ("N" "�" :string)
-           ("J" "�" :string)
            ("r" "�" :string)
-           ("R" "�" :string)
-           ("g" "�" :string)
-           ("f" "�" :string)
            ("P" "�" :string)
            ("l" "�" :string)
+           ("q" "�" :string)
+           ("x" "�" :string)
+           ("O" "�" :string)
            ("j" "�" :string)
-           ("S" "�" :string)
-           ("c" "�" :string)
+           ("i" "�" :string)
+           ("Y" "�" :string)
+           ("s" "�" :string)
+           ("n" "�" :string)
+           ("F" "�" :string)
+           ("A" "�" :string)
+           ("L" "�" :string)
+           ("C" "�" :string)
+           ("K" "�" :string)
+           ("R" "�" :string)
            ("k" "�" :string)
-           ("D" "�" :string)
-           ("z" "�" :string)
-           ("T" "�" :string)
-           ("e" "�" :string)
-           ("E" "�" :string)
+           ("c" "�" :string)
            ("B" "�" :string)
+           ("G" "�" :string)
+           ("t" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ("{" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/english/cp1252.xdy b/Master/texmf-dist/xindy/modules/lang/english/cp1252.xdy
index 39975546a9d..80e29169c01 100644
--- a/Master/texmf-dist/xindy/modules/lang/english/cp1252.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/english/cp1252.xdy
@@ -31,74 +31,74 @@
 
 (define-rule-set "en-alphabetize"
 
-  :rules  (("�" "�" :string)
-           ("a" "�" :string)
-           ("�" "�" :string)
+  :rules  (("a" "�" :string)
            ("A" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "��" :string)
            ("�" "��" :string)
            ("b" "�" :string)
            ("B" "�" :string)
            ("�" "�" :string)
-           ("C" "�" :string)
            ("c" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("C" "�" :string)
+           ("D" "�" :string)
            ("d" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("D" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("E" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("e" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("E" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("F" "�" :string)
            ("f" "�" :string)
-           ("G" "�" :string)
            ("g" "�" :string)
+           ("G" "�" :string)
            ("h" "�" :string)
            ("H" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("i" "�" :string)
            ("I" "�" :string)
-           ("J" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("j" "�" :string)
-           ("k" "�" :string)
+           ("J" "�" :string)
            ("K" "�" :string)
-           ("L" "�" :string)
+           ("k" "�" :string)
            ("l" "�" :string)
-           ("M" "�" :string)
+           ("L" "�" :string)
            ("m" "�" :string)
-           ("�" "�" :string)
+           ("M" "�" :string)
            ("N" "�" :string)
-           ("�" "�" :string)
            ("n" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("O" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("o" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("O" "�" :string)
-           ("�" "×" :string)
            ("�" "×" :string)
+           ("�" "×" :string)
            ("P" "�" :string)
            ("p" "�" :string)
            ("Q" "�" :string)
            ("q" "�" :string)
-           ("r" "�" :string)
            ("R" "�" :string)
+           ("r" "�" :string)
            ("s" "�" :string)
            ("S" "�" :string)
            ("T" "�" :string)
            ("t" "�" :string)
-           ("U" "�" :string)
            ("u" "�" :string)
+           ("U" "�" :string)
            ("v" "�" :string)
            ("V" "�" :string)
            ("W" "�" :string)
@@ -107,189 +107,189 @@
            ("X" "�" :string)
            ("y" "�" :string)
            ("Y" "�" :string)
-           ("Z" "�" :string)
            ("z" "�" :string)
-           ("�" "�" :string)
+           ("Z" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ))
 
 (define-rule-set "en-resolve-diacritics"
 
-  :rules  (("W" "�" :string)
+  :rules  (("V" "�" :string)
+           ("p" "�" :string)
+           ("o" "�" :string)
            ("Z" "�" :string)
-           ("l" "�" :string)
-           ("a" "�" :string)
-           ("�" "�" :string)
+           ("H" "�" :string)
            ("f" "�" :string)
+           ("L" "�" :string)
+           ("�" "�" :string)
            ("J" "�" :string)
-           ("w" "�" :string)
-           ("i" "�" :string)
-           ("z" "�" :string)
-           ("V" "�" :string)
-           ("y" "�" :string)
-           ("j" "�" :string)
-           ("b" "�" :string)
+           ("C" "�" :string)
+           ("Y" "�" :string)
            ("M" "�" :string)
+           ("c" "�" :string)
+           ("B" "�" :string)
+           ("E" "�" :string)
+           ("b" "�" :string)
            ("F" "�" :string)
-           ("T" "�" :string)
-           ("L" "�" :string)
-           ("Q" "�" :string)
-           ("s" "�" :string)
-           ("x" "�" :string)
-           ("C" "�" :string)
-           ("k" "�" :string)
            ("v" "�" :string)
            ("S" "�" :string)
-           ("P" "�" :string)
+           ("X" "�" :string)
+           ("e" "�" :string)
+           ("k" "�" :string)
            ("A" "�" :string)
-           ("B" "�" :string)
+           ("w" "�" :string)
            ("h" "�" :string)
-           ("p" "�" :string)
+           ("K" "�" :string)
+           ("I" "�" :string)
+           ("U" "�" :string)
+           ("n" "�" :string)
+           ("G" "�" :string)
+           ("W" "�" :string)
+           ("y" "�" :string)
+           ("l" "�" :string)
+           ("g" "�" :string)
            ("N" "�" :string)
-           ("d" "�" :string)
+           ("x" "�" :string)
+           ("j" "�" :string)
+           ("s" "�" :string)
+           ("u" "�" :string)
            ("R" "�" :string)
-           ("g" "�" :string)
            ("D" "�" :string)
-           ("u" "�" :string)
-           ("n" "�" :string)
-           ("�" "�" :string)
-           ("H" "�" :string)
+           ("P" "�" :string)
+           ("d" "�" :string)
+           ("z" "�" :string)
            ("O" "�" :string)
-           ("X" "�" :string)
-           ("E" "�" :string)
+           ("Q" "�" :string)
+           ("T" "�" :string)
+           ("q" "�" :string)
+           ("i" "�" :string)
            ("r" "�" :string)
+           ("�" "�" :string)
            ("t" "�" :string)
-           ("c" "�" :string)
-           ("I" "�" :string)
-           ("e" "�" :string)
-           ("G" "�" :string)
-           ("o" "�" :string)
-           ("K" "�" :string)
-           ("q" "�" :string)
-           ("Y" "�" :string)
+           ("a" "�" :string)
            ("m" "�" :string)
-           ("U" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :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 "en-resolve-case"
 
-  :rules  (("V" "8" :string)
-           ("J" "8" :string)
-           ("�" "8" :string)
+  :rules  (("N" "8" :string)
+           ("G" "8" :string)
            ("W" "8" :string)
-           ("Z" "8" :string)
-           ("S" "8" :string)
-           ("�" "8" :string)
-           ("C" "8" :string)
-           ("Q" "8" :string)
-           ("L" "8" :string)
-           ("�" "8" :string)
-           ("T" "8" :string)
-           ("F" "8" :string)
+           ("U" "8" :string)
            ("�" "8" :string)
+           ("I" "8" :string)
+           ("K" "8" :string)
            ("�" "8" :string)
-           ("M" "8" :string)
-           ("X" "8" :string)
-           ("O" "8" :string)
-           ("H" "8" :string)
            ("�" "8" :string)
+           ("�" "8" :string)
+           ("Q" "8" :string)
+           ("O" "8" :string)
+           ("T" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
+           ("P" "8" :string)
            ("D" "8" :string)
            ("R" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("N" "8" :string)
-           ("B" "8" :string)
-           ("A" "8" :string)
-           ("P" "8" :string)
-           ("U" "8" :string)
+           ("M" "8" :string)
            ("Y" "8" :string)
+           ("�" "8" :string)
+           ("C" "8" :string)
            ("�" "8" :string)
-           ("K" "8" :string)
-           ("G" "8" :string)
-           ("I" "8" :string)
+           ("J" "8" :string)
+           ("L" "8" :string)
+           ("Z" "8" :string)
+           ("H" "8" :string)
+           ("V" "8" :string)
+           ("�" "8" :string)
+           ("A" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("X" "8" :string)
+           ("S" "8" :string)
+           ("F" "8" :string)
            ("E" "8" :string)
-           ("�" "89" :string)
+           ("B" "8" :string)
            ("�" "89" :string)
-           ("b" "9" :string)
+           ("�" "89" :string)
+           ("s" "9" :string)
            ("j" "9" :string)
+           ("x" "9" :string)
+           ("l" "9" :string)
+           ("g" "9" :string)
+           ("�" "9" :string)
            ("y" "9" :string)
-           ("z" "9" :string)
+           ("n" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("h" "9" :string)
+           ("m" "9" :string)
+           ("t" "9" :string)
+           ("a" "9" :string)
            ("i" "9" :string)
-           ("w" "9" :string)
+           ("r" "9" :string)
+           ("q" "9" :string)
+           ("�" "9" :string)
+           ("z" "9" :string)
+           ("d" "9" :string)
+           ("u" "9" :string)
            ("�" "9" :string)
-           ("f" "9" :string)
+           ("c" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
+           ("o" "9" :string)
+           ("f" "9" :string)
+           ("p" "9" :string)
+           ("w" "9" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
-           ("l" "9" :string)
-           ("a" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("v" "9" :string)
            ("k" "9" :string)
-           ("x" "9" :string)
-           ("s" "9" :string)
-           ("�" "9" :string)
-           ("u" "9" :string)
-           ("n" "9" :string)
-           ("g" "9" :string)
-           ("d" "9" :string)
-           ("p" "9" :string)
-           ("h" "9" :string)
-           ("�" "9" :string)
            ("�" "9" :string)
-           ("m" "9" :string)
-           ("q" "9" :string)
-           ("o" "9" :string)
-           ("�" "9" :string)
            ("e" "9" :string)
-           ("c" "9" :string)
-           ("�" "9" :string)
            ("�" "9" :string)
-           ("t" "9" :string)
-           ("r" "9" :string)
+           ("v" "9" :string)
+           ("b" "9" :string)
            ("�" "99" :string)
            ("�" "99" :string)
            ))
 
 (define-rule-set "en-ignore-special"
 
-  :rules  (("{" "" :string)
-           ("!" "" :string)
-           ("-" "" :string)
-           ("?" "" :string)
-           ("'" "" :string)
+  :rules  (("'" "" :string)
            ("." "" :string)
            ("}" "" :string)
+           ("-" "" :string)
+           ("!" "" :string)
+           ("?" "" :string)
+           ("{" "" :string)
            ))
 
 (define-rule-set "en-resolve-special"
@@ -297,85 +297,85 @@
   :rules  (("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("�" "�" :string)
-           ("n" "�" :string)
-           ("u" "�" :string)
-           ("X" "�" :string)
-           ("O" "�" :string)
-           ("H" "�" :string)
-           ("�" "�" :string)
+           ("P" "�" :string)
+           ("d" "�" :string)
            ("D" "�" :string)
            ("R" "�" :string)
-           ("g" "�" :string)
-           ("�" "�" :string)
+           ("u" "�" :string)
+           ("T" "�" :string)
+           ("O" "�" :string)
+           ("z" "�" :string)
+           ("Q" "�" :string)
            ("�" "�" :string)
-           ("N" "�" :string)
-           ("p" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("d" "�" :string)
-           ("A" "�" :string)
-           ("B" "�" :string)
-           ("P" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("r" "�" :string)
+           ("i" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("q" "�" :string)
+           ("m" "�" :string)
+           ("a" "�" :string)
+           ("t" "�" :string)
+           ("�" "�" :string)
            ("h" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("U" "�" :string)
-           ("m" "�" :string)
-           ("Y" "�" :string)
-           ("�" "�" :string)
-           ("o" "�" :string)
-           ("G" "�" :string)
-           ("e" "�" :string)
-           ("�" "�" :string)
-           ("q" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("K" "�" :string)
            ("I" "�" :string)
-           ("c" "�" :string)
-           ("�" "�" :string)
-           ("E" "�" :string)
-           ("t" "�" :string)
-           ("�" "�" :string)
-           ("r" "�" :string)
-           ("y" "�" :string)
-           ("V" "�" :string)
-           ("b" "�" :string)
-           ("j" "�" :string)
-           ("z" "�" :string)
-           ("f" "�" :string)
-           ("�" "�" :string)
-           ("i" "�" :string)
-           ("w" "�" :string)
-           ("�" "�" :string)
-           ("J" "�" :string)
-           ("W" "�" :string)
-           ("Z" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("a" "�" :string)
+           ("g" "�" :string)
            ("l" "�" :string)
-           ("C" "�" :string)
-           ("x" "�" :string)
+           ("y" "�" :string)
+           ("W" "�" :string)
+           ("G" "�" :string)
+           ("n" "�" :string)
            ("s" "�" :string)
+           ("j" "�" :string)
+           ("N" "�" :string)
+           ("x" "�" :string)
+           ("F" "�" :string)
+           ("b" "�" :string)
+           ("E" "�" :string)
+           ("B" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("X" "�" :string)
+           ("e" "�" :string)
            ("S" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("v" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("w" "�" :string)
+           ("A" "�" :string)
+           ("�" "�" :string)
            ("k" "�" :string)
-           ("Q" "�" :string)
-           ("L" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("F" "�" :string)
-           ("�" "�" :string)
-           ("T" "�" :string)
-           ("�" "�" :string)
+           ("V" "�" :string)
+           ("H" "�" :string)
+           ("f" "�" :string)
+           ("Z" "�" :string)
+           ("o" "�" :string)
+           ("p" "�" :string)
+           ("C" "�" :string)
+           ("�" "�" :string)
+           ("J" "�" :string)
+           ("�" "�" :string)
+           ("L" "�" :string)
+           ("c" "�" :string)
+           ("�" "�" :string)
            ("M" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("Y" "�" :string)
+           ("�" "��" :string)
            ("�" "��" :string)
            ("�" "��" :string)
-           ("�" "��" :string)
            ("�" "��" :string)
            ("-" "�" :string)
            ("'" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/english/latin9.xdy b/Master/texmf-dist/xindy/modules/lang/english/latin9.xdy
index e778f48e62c..7499363d4bb 100644
--- a/Master/texmf-dist/xindy/modules/lang/english/latin9.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/english/latin9.xdy
@@ -31,265 +31,265 @@
 
 (define-rule-set "en-alphabetize"
 
-  :rules  (("�" "�" :string)
+  :rules  (("A" "�" :string)
            ("a" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("A" "�" :string)
            ("�" "��" :string)
            ("�" "��" :string)
            ("B" "�" :string)
            ("b" "�" :string)
-           ("C" "�" :string)
            ("c" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("d" "�" :string)
+           ("C" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("D" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("d" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("E" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("e" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("e" "�" :string)
+           ("�" "�" :string)
            ("f" "�" :string)
            ("F" "�" :string)
-           ("G" "�" :string)
            ("g" "�" :string)
-           ("h" "�" :string)
+           ("G" "�" :string)
            ("H" "�" :string)
-           ("I" "�" :string)
+           ("h" "�" :string)
            ("i" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("I" "�" :string)
+           ("�" "�" :string)
            ("j" "�" :string)
            ("J" "�" :string)
-           ("k" "�" :string)
            ("K" "�" :string)
-           ("L" "�" :string)
+           ("k" "�" :string)
            ("l" "�" :string)
+           ("L" "�" :string)
            ("M" "�" :string)
            ("m" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("N" "�" :string)
            ("n" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("o" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("O" "�" :string)
            ("�" "�" :string)
-           ("�" "×" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("o" "�" :string)
            ("�" "×" :string)
-           ("P" "�" :string)
+           ("�" "×" :string)
            ("p" "�" :string)
-           ("Q" "�" :string)
+           ("P" "�" :string)
            ("q" "�" :string)
-           ("r" "�" :string)
+           ("Q" "�" :string)
            ("R" "�" :string)
+           ("r" "�" :string)
            ("S" "�" :string)
            ("s" "�" :string)
-           ("t" "�" :string)
            ("T" "�" :string)
-           ("U" "�" :string)
+           ("t" "�" :string)
            ("u" "�" :string)
-           ("V" "�" :string)
+           ("U" "�" :string)
            ("v" "�" :string)
-           ("W" "�" :string)
+           ("V" "�" :string)
            ("w" "�" :string)
+           ("W" "�" :string)
            ("x" "�" :string)
            ("X" "�" :string)
-           ("y" "�" :string)
            ("Y" "�" :string)
+           ("y" "�" :string)
            ("Z" "�" :string)
            ("z" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ))
 
 (define-rule-set "en-resolve-diacritics"
 
-  :rules  (("V" "�" :string)
-           ("S" "�" :string)
-           ("�" "�" :string)
-           ("k" "�" :string)
-           ("N" "�" :string)
-           ("f" "�" :string)
-           ("C" "�" :string)
-           ("U" "�" :string)
+  :rules  (("d" "�" :string)
+           ("P" "�" :string)
+           ("z" "�" :string)
+           ("t" "�" :string)
+           ("e" "�" :string)
+           ("Z" "�" :string)
            ("I" "�" :string)
-           ("d" "�" :string)
+           ("s" "�" :string)
            ("M" "�" :string)
-           ("A" "�" :string)
-           ("x" "�" :string)
-           ("X" "�" :string)
+           ("F" "�" :string)
+           ("m" "�" :string)
+           ("R" "�" :string)
+           ("b" "�" :string)
+           ("p" "�" :string)
+           ("h" "�" :string)
+           ("o" "�" :string)
+           ("r" "�" :string)
+           ("k" "�" :string)
+           ("C" "�" :string)
+           ("N" "�" :string)
+           ("j" "�" :string)
+           ("J" "�" :string)
            ("l" "�" :string)
-           ("Q" "�" :string)
-           ("T" "�" :string)
-           ("G" "�" :string)
-           ("t" "�" :string)
+           ("n" "�" :string)
            ("L" "�" :string)
-           ("P" "�" :string)
-           ("i" "�" :string)
-           ("c" "�" :string)
+           ("Q" "�" :string)
+           ("x" "�" :string)
+           ("f" "�" :string)
+           ("v" "�" :string)
            ("a" "�" :string)
-           ("o" "�" :string)
-           ("E" "�" :string)
-           ("Z" "�" :string)
-           ("r" "�" :string)
-           ("z" "�" :string)
+           ("i" "�" :string)
+           ("T" "�" :string)
+           ("K" "�" :string)
            ("u" "�" :string)
+           ("U" "�" :string)
+           ("E" "�" :string)
+           ("H" "�" :string)
+           ("q" "�" :string)
+           ("c" "�" :string)
+           ("A" "�" :string)
+           ("W" "�" :string)
+           ("w" "�" :string)
+           ("V" "�" :string)
+           ("�" "�" :string)
+           ("X" "�" :string)
            ("y" "�" :string)
-           ("O" "�" :string)
-           ("R" "�" :string)
            ("D" "�" :string)
-           ("b" "�" :string)
-           ("�" "�" :string)
-           ("e" "�" :string)
-           ("n" "�" :string)
-           ("h" "�" :string)
-           ("p" "�" :string)
-           ("s" "�" :string)
            ("B" "�" :string)
+           ("S" "�" :string)
            ("g" "�" :string)
-           ("K" "�" :string)
-           ("W" "�" :string)
-           ("m" "�" :string)
-           ("F" "�" :string)
            ("Y" "�" :string)
-           ("w" "�" :string)
-           ("j" "�" :string)
-           ("v" "�" :string)
-           ("J" "�" :string)
-           ("q" "�" :string)
-           ("H" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("G" "�" :string)
+           ("O" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :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 "en-resolve-case"
 
-  :rules  (("�" "8" :string)
-           ("�" "8" :string)
+  :rules  (("P" "8" :string)
+           ("Z" "8" :string)
+           ("I" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
-           ("X" "8" :string)
-           ("A" "8" :string)
-           ("G" "8" :string)
+           ("M" "8" :string)
+           ("F" "8" :string)
+           ("R" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("C" "8" :string)
+           ("J" "8" :string)
            ("�" "8" :string)
+           ("N" "8" :string)
            ("Q" "8" :string)
-           ("T" "8" :string)
-           ("�" "8" :string)
-           ("P" "8" :string)
            ("L" "8" :string)
+           ("U" "8" :string)
+           ("K" "8" :string)
            ("�" "8" :string)
-           ("E" "8" :string)
-           ("S" "8" :string)
-           ("V" "8" :string)
-           ("N" "8" :string)
-           ("C" "8" :string)
+           ("T" "8" :string)
            ("�" "8" :string)
-           ("U" "8" :string)
-           ("�" "8" :string)
-           ("I" "8" :string)
-           ("�" "8" :string)
-           ("M" "8" :string)
-           ("Y" "8" :string)
-           ("F" "8" :string)
-           ("J" "8" :string)
-           ("�" "8" :string)
+           ("E" "8" :string)
            ("H" "8" :string)
-           ("Z" "8" :string)
+           ("A" "8" :string)
+           ("W" "8" :string)
+           ("X" "8" :string)
+           ("V" "8" :string)
+           ("B" "8" :string)
+           ("�" "8" :string)
            ("D" "8" :string)
-           ("O" "8" :string)
-           ("R" "8" :string)
-           ("�" "8" :string)
            ("�" "8" :string)
-           ("B" "8" :string)
-           ("W" "8" :string)
-           ("K" "8" :string)
-           ("�" "89" :string)
+           ("Y" "8" :string)
+           ("S" "8" :string)
+           ("�" "8" :string)
+           ("O" "8" :string)
+           ("�" "8" :string)
+           ("G" "8" :string)
            ("�" "89" :string)
-           ("�" "9" :string)
-           ("x" "9" :string)
-           ("l" "9" :string)
+           ("�" "89" :string)
+           ("�" "9" :string)
+           ("d" "9" :string)
+           ("�" "9" :string)
+           ("e" "9" :string)
+           ("�" "9" :string)
+           ("z" "9" :string)
            ("t" "9" :string)
-           ("i" "9" :string)
-           ("�" "9" :string)
-           ("a" "9" :string)
-           ("�" "9" :string)
-           ("c" "9" :string)
+           ("s" "9" :string)
+           ("b" "9" :string)
+           ("p" "9" :string)
+           ("m" "9" :string)
            ("o" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
+           ("h" "9" :string)
+           ("k" "9" :string)
+           ("r" "9" :string)
+           ("l" "9" :string)
+           ("j" "9" :string)
+           ("n" "9" :string)
+           ("v" "9" :string)
            ("f" "9" :string)
+           ("a" "9" :string)
+           ("x" "9" :string)
            ("�" "9" :string)
-           ("k" "9" :string)
+           ("�" "9" :string)
+           ("u" "9" :string)
+           ("i" "9" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
-           ("d" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("m" "9" :string)
            ("w" "9" :string)
-           ("j" "9" :string)
-           ("�" "9" :string)
+           ("�" "9" :string)
+           ("c" "9" :string)
+           ("�" "9" :string)
            ("q" "9" :string)
-           ("�" "9" :string)
-           ("v" "9" :string)
-           ("r" "9" :string)
-           ("u" "9" :string)
-           ("z" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
            ("y" "9" :string)
-           ("b" "9" :string)
-           ("p" "9" :string)
-           ("n" "9" :string)
-           ("e" "9" :string)
-           ("h" "9" :string)
-           ("s" "9" :string)
+           ("�" "9" :string)
            ("g" "9" :string)
-           ("�" "99" :string)
+           ("�" "9" :string)
            ("�" "99" :string)
+           ("�" "99" :string)
            ))
 
 (define-rule-set "en-ignore-special"
 
-  :rules  (("'" "" :string)
-           ("}" "" :string)
-           ("-" "" :string)
-           ("{" "" :string)
+  :rules  (("{" "" :string)
            ("?" "" :string)
-           ("!" "" :string)
            ("." "" :string)
+           ("-" "" :string)
+           ("!" "" :string)
+           ("'" "" :string)
+           ("}" "" :string)
            ))
 
 (define-rule-set "en-resolve-special"
@@ -297,86 +297,86 @@
   :rules  (("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("v" "�" :string)
            ("J" "�" :string)
-           ("�" "�" :string)
-           ("q" "�" :string)
-           ("H" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("j" "�" :string)
-           ("�" "�" :string)
+           ("N" "�" :string)
+           ("l" "�" :string)
+           ("n" "�" :string)
+           ("Q" "�" :string)
+           ("L" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("o" "�" :string)
+           ("h" "�" :string)
+           ("r" "�" :string)
+           ("C" "�" :string)
+           ("k" "�" :string)
            ("F" "�" :string)
-           ("m" "�" :string)
-           ("Y" "�" :string)
-           ("w" "�" :string)
-           ("�" "�" :string)
+           ("M" "�" :string)
            ("s" "�" :string)
-           ("B" "�" :string)
-           ("W" "�" :string)
-           ("K" "�" :string)
-           ("g" "�" :string)
-           ("�" "�" :string)
-           ("h" "�" :string)
-           ("n" "�" :string)
-           ("e" "�" :string)
-           ("p" "�" :string)
-           ("y" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("R" "�" :string)
-           ("O" "�" :string)
-           ("D" "�" :string)
+           ("p" "�" :string)
            ("b" "�" :string)
-           ("r" "�" :string)
-           ("Z" "�" :string)
-           ("u" "�" :string)
-           ("z" "�" :string)
-           ("�" "�" :string)
-           ("c" "�" :string)
-           ("�" "�" :string)
-           ("a" "�" :string)
-           ("E" "�" :string)
-           ("o" "�" :string)
-           ("�" "�" :string)
-           ("t" "�" :string)
-           ("L" "�" :string)
-           ("�" "�" :string)
-           ("i" "�" :string)
+           ("m" "�" :string)
+           ("R" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("P" "�" :string)
-           ("A" "�" :string)
-           ("x" "�" :string)
-           ("X" "�" :string)
-           ("T" "�" :string)
-           ("Q" "�" :string)
-           ("l" "�" :string)
-           ("�" "�" :string)
+           ("d" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("e" "�" :string)
+           ("t" "�" :string)
+           ("z" "�" :string)
+           ("I" "�" :string)
+           ("Z" "�" :string)
+           ("S" "�" :string)
+           ("�" "�" :string)
+           ("Y" "�" :string)
+           ("g" "�" :string)
+           ("�" "�" :string)
            ("G" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("O" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("d" "�" :string)
-           ("M" "�" :string)
+           ("�" "�" :string)
+           ("V" "�" :string)
+           ("y" "�" :string)
            ("�" "�" :string)
-           ("I" "�" :string)
-           ("C" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("U" "�" :string)
+           ("X" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("D" "�" :string)
+           ("B" "�" :string)
+           ("H" "�" :string)
+           ("E" "�" :string)
            ("�" "�" :string)
-           ("V" "�" :string)
+           ("�" "�" :string)
+           ("W" "�" :string)
+           ("A" "�" :string)
+           ("c" "�" :string)
+           ("�" "�" :string)
+           ("q" "�" :string)
+           ("�" "�" :string)
+           ("w" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("S" "�" :string)
-           ("k" "�" :string)
            ("�" "�" :string)
+           ("a" "�" :string)
            ("f" "�" :string)
-           ("N" "�" :string)
+           ("v" "�" :string)
+           ("x" "�" :string)
+           ("�" "�" :string)
+           ("T" "�" :string)
+           ("i" "�" :string)
+           ("U" "�" :string)
+           ("u" "�" :string)
+           ("K" "�" :string)
+           ("�" "��" :string)
            ("�" "��" :string)
            ("�" "��" :string)
            ("�" "��" :string)
-           ("�" "��" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ("{" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/english/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/english/utf8.xdy
index e94a7a7a799..cb264eef62c 100644
--- a/Master/texmf-dist/xindy/modules/lang/english/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/english/utf8.xdy
@@ -33,48 +33,48 @@
 
 (define-rule-set "en-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)
            ("a" "�" :string)
            ("A" "�" :string)
-           ("b" "�" :string)
            ("B" "�" :string)
-           ("C" "�" :string)
+           ("b" "�" :string)
            ("c" "�" :string)
+           ("C" "�" :string)
            ("d" "�" :string)
            ("D" "�" :string)
-           ("e" "�" :string)
            ("E" "�" :string)
+           ("e" "�" :string)
            ("F" "�" :string)
            ("f" "�" :string)
            ("g" "�" :string)
@@ -83,30 +83,30 @@
            ("h" "�" :string)
            ("i" "�" :string)
            ("I" "�" :string)
-           ("j" "�" :string)
            ("J" "�" :string)
+           ("j" "�" :string)
            ("k" "�" :string)
            ("K" "�" :string)
            ("l" "�" :string)
            ("L" "�" :string)
-           ("M" "�" :string)
            ("m" "�" :string)
-           ("N" "�" :string)
+           ("M" "�" :string)
            ("n" "�" :string)
-           ("O" "�" :string)
+           ("N" "�" :string)
            ("o" "�" :string)
+           ("O" "�" :string)
            ("p" "�" :string)
            ("P" "�" :string)
            ("q" "�" :string)
            ("Q" "�" :string)
            ("r" "�" :string)
            ("R" "�" :string)
-           ("S" "�" :string)
            ("s" "�" :string)
+           ("S" "�" :string)
            ("T" "�" :string)
            ("t" "�" :string)
-           ("U" "�" :string)
            ("u" "�" :string)
+           ("U" "�" :string)
            ("V" "�" :string)
            ("v" "�" :string)
            ("w" "�" :string)
@@ -121,280 +121,280 @@
 
 (define-rule-set "en-resolve-diacritics"
 
-  :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)
-           ("o" "�" :string)
-           ("Z" "�" :string)
-           ("h" "�" :string)
-           ("O" "�" :string)
+           ("æ" "�" :string)
+           ("Œ" "�" :string)
+           ("L" "�" :string)
+           ("v" "�" :string)
            ("b" "�" :string)
-           ("P" "�" :string)
-           ("g" "�" :string)
+           ("W" "�" :string)
+           ("t" "�" :string)
+           ("j" "�" :string)
+           ("G" "�" :string)
            ("J" "�" :string)
-           ("Q" "�" :string)
-           ("m" "�" :string)
-           ("L" "�" :string)
+           ("A" "�" :string)
+           ("C" "�" :string)
+           ("a" "�" :string)
            ("l" "�" :string)
-           ("Y" "�" :string)
-           ("G" "�" :string)
-           ("D" "�" :string)
-           ("E" "�" :string)
-           ("K" "�" :string)
-           ("z" "�" :string)
-           ("u" "�" :string)
-           ("B" "�" :string)
-           ("W" "�" :string)
-           ("k" "�" :string)
-           ("v" "�" :string)
+           ("U" "�" :string)
            ("y" "�" :string)
-           ("w" "�" :string)
-           ("c" "�" :string)
-           ("n" "�" :string)
-           ("a" "�" :string)
-           ("C" "�" :string)
-           ("V" "�" :string)
-           ("T" "�" :string)
-           ("q" "�" :string)
-           ("j" "�" :string)
            ("X" "�" :string)
-           ("N" "�" :string)
+           ("c" "�" :string)
            ("x" "�" :string)
-           ("p" "�" :string)
-           ("i" "�" :string)
-           ("r" "�" :string)
-           ("H" "�" :string)
-           ("s" "�" :string)
+           ("f" "�" :string)
+           ("w" "�" :string)
            ("M" "�" :string)
+           ("K" "�" :string)
+           ("h" "�" :string)
+           ("u" "�" :string)
+           ("T" "�" :string)
+           ("Y" "�" :string)
+           ("P" "�" :string)
+           ("R" "�" :string)
+           ("N" "�" :string)
            ("I" "�" :string)
+           ("Q" "�" :string)
            ("S" "�" :string)
-           ("f" "�" :string)
-           ("A" "�" :string)
-           ("d" "�" :string)
+           ("z" "�" :string)
+           ("k" "�" :string)
+           ("p" "�" :string)
+           ("m" "�" :string)
            ("e" "�" :string)
-           ("R" "�" :string)
+           ("V" "�" :string)
+           ("r" "�" :string)
+           ("g" "�" :string)
+           ("s" "�" :string)
+           ("H" "�" :string)
+           ("i" "�" :string)
            ("F" "�" :string)
-           ("U" "�" :string)
-           ("t" "�" :string)
+           ("D" "�" :string)
+           ("E" "�" :string)
+           ("Z" "�" :string)
+           ("O" "�" :string)
+           ("d" "�" :string)
+           ("n" "�" :string)
+           ("B" "�" :string)
+           ("q" "�" :string)
+           ("o" "�" :string)
            ))
 
 (define-rule-set "en-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)
            ("Œ" "89" :string)
            ("Æ" "89" :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)
-           ("œ" "99" :string)
+           ("ï" "9" :string)
+           ("é" "9" :string)
+           ("ö" "9" :string)
            ("æ" "99" :string)
-           ("Z" "8" :string)
-           ("P" "8" :string)
-           ("O" "8" :string)
+           ("œ" "99" :string)
+           ("F" "8" :string)
+           ("H" "8" :string)
+           ("V" "8" :string)
+           ("S" "8" :string)
            ("Q" "8" :string)
-           ("J" "8" :string)
-           ("L" "8" :string)
-           ("Y" "8" :string)
-           ("K" "8" :string)
+           ("B" "8" :string)
+           ("O" "8" :string)
            ("E" "8" :string)
            ("D" "8" :string)
+           ("Z" "8" :string)
+           ("U" "8" :string)
+           ("X" "8" :string)
+           ("J" "8" :string)
            ("G" "8" :string)
-           ("B" "8" :string)
-           ("W" "8" :string)
+           ("A" "8" :string)
            ("C" "8" :string)
+           ("L" "8" :string)
+           ("W" "8" :string)
+           ("P" "8" :string)
+           ("Y" "8" :string)
            ("T" "8" :string)
-           ("V" "8" :string)
-           ("X" "8" :string)
            ("N" "8" :string)
-           ("H" "8" :string)
-           ("S" "8" :string)
+           ("R" "8" :string)
            ("I" "8" :string)
+           ("K" "8" :string)
            ("M" "8" :string)
-           ("A" "8" :string)
-           ("R" "8" :string)
-           ("F" "8" :string)
-           ("U" "8" :string)
-           ("o" "9" :string)
-           ("h" "9" :string)
-           ("b" "9" :string)
-           ("m" "9" :string)
            ("g" "9" :string)
-           ("l" "9" :string)
-           ("u" "9" :string)
-           ("z" "9" :string)
+           ("r" "9" :string)
+           ("i" "9" :string)
+           ("s" "9" :string)
+           ("m" "9" :string)
+           ("e" "9" :string)
            ("k" "9" :string)
-           ("v" "9" :string)
+           ("p" "9" :string)
+           ("z" "9" :string)
+           ("o" "9" :string)
+           ("n" "9" :string)
+           ("q" "9" :string)
+           ("d" "9" :string)
+           ("l" "9" :string)
            ("y" "9" :string)
-           ("w" "9" :string)
            ("a" "9" :string)
-           ("n" "9" :string)
-           ("c" "9" :string)
+           ("t" "9" :string)
            ("j" "9" :string)
-           ("q" "9" :string)
-           ("i" "9" :string)
-           ("p" "9" :string)
+           ("b" "9" :string)
+           ("v" "9" :string)
+           ("h" "9" :string)
+           ("u" "9" :string)
            ("x" "9" :string)
-           ("r" "9" :string)
-           ("s" "9" :string)
+           ("w" "9" :string)
            ("f" "9" :string)
-           ("e" "9" :string)
-           ("d" "9" :string)
-           ("t" "9" :string)
+           ("c" "9" :string)
            ))
 
 (define-rule-set "en-ignore-special"
 
   :rules  (("?" "" :string)
-           ("!" "" :string)
-           ("'" "" :string)
-           ("." "" :string)
            ("}" "" :string)
-           ("{" "" :string)
            ("-" "" :string)
+           ("." "" :string)
+           ("{" "" :string)
+           ("'" "" :string)
+           ("!" "" :string)
            ))
 
 (define-rule-set "en-resolve-special"
 
-  :rules  (("Þ" "�" :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)
-           ("l" "�" :string)
-           ("L" "�" :string)
-           ("Q" "�" :string)
-           ("m" "�" :string)
-           ("g" "�" :string)
-           ("J" "�" :string)
            ("Y" "�" :string)
-           ("Z" "�" :string)
-           ("o" "�" :string)
-           ("b" "�" :string)
+           ("T" "�" :string)
            ("P" "�" :string)
-           ("O" "�" :string)
+           ("I" "�" :string)
+           ("R" "�" :string)
+           ("N" "�" :string)
            ("h" "�" :string)
-           ("v" "�" :string)
-           ("k" "�" :string)
-           ("W" "�" :string)
+           ("u" "�" :string)
+           ("K" "�" :string)
+           ("M" "�" :string)
+           ("f" "�" :string)
+           ("x" "�" :string)
            ("w" "�" :string)
+           ("c" "�" :string)
+           ("l" "�" :string)
+           ("U" "�" :string)
+           ("X" "�" :string)
            ("y" "�" :string)
-           ("E" "�" :string)
-           ("K" "�" :string)
-           ("D" "�" :string)
+           ("J" "�" :string)
            ("G" "�" :string)
-           ("B" "�" :string)
-           ("u" "�" :string)
-           ("z" "�" :string)
-           ("N" "�" :string)
-           ("q" "�" :string)
+           ("A" "�" :string)
+           ("C" "�" :string)
+           ("a" "�" :string)
+           ("t" "�" :string)
            ("j" "�" :string)
-           ("X" "�" :string)
-           ("r" "�" :string)
-           ("x" "�" :string)
-           ("p" "�" :string)
-           ("i" "�" :string)
+           ("L" "�" :string)
+           ("b" "�" :string)
+           ("v" "�" :string)
+           ("W" "�" :string)
+           ("o" "�" :string)
            ("n" "�" :string)
-           ("a" "�" :string)
-           ("c" "�" :string)
-           ("T" "�" :string)
-           ("V" "�" :string)
-           ("C" "�" :string)
-           ("F" "�" :string)
-           ("R" "�" :string)
+           ("q" "�" :string)
+           ("B" "�" :string)
+           ("O" "�" :string)
            ("d" "�" :string)
+           ("D" "�" :string)
+           ("E" "�" :string)
+           ("Z" "�" :string)
+           ("r" "�" :string)
+           ("g" "�" :string)
+           ("H" "�" :string)
+           ("s" "�" :string)
+           ("F" "�" :string)
+           ("i" "�" :string)
+           ("m" "�" :string)
            ("e" "�" :string)
-           ("t" "�" :string)
-           ("U" "�" :string)
-           ("I" "�" :string)
+           ("V" "�" :string)
            ("S" "�" :string)
-           ("f" "�" :string)
-           ("M" "�" :string)
-           ("s" "�" :string)
-           ("H" "�" :string)
-           ("A" "�" :string)
+           ("k" "�" :string)
+           ("p" "�" :string)
+           ("z" "�" :string)
+           ("Q" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ("{" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/esperanto/latin3.xdy b/Master/texmf-dist/xindy/modules/lang/esperanto/latin3.xdy
index ea999b1a38e..d001303aedf 100644
--- a/Master/texmf-dist/xindy/modules/lang/esperanto/latin3.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/esperanto/latin3.xdy
@@ -38,216 +38,216 @@
 
   :rules  (("a" "�" :string)
            ("A" "�" :string)
-           ("B" "�" :string)
            ("b" "�" :string)
+           ("B" "�" :string)
            ("C" "�" :string)
            ("c" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("D" "�" :string)
            ("d" "�" :string)
-           ("e" "�" :string)
            ("E" "�" :string)
-           ("F" "�" :string)
+           ("e" "�" :string)
            ("f" "�" :string)
+           ("F" "�" :string)
            ("G" "�" :string)
            ("g" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("H" "�" :string)
            ("h" "�" :string)
-           ("�" "�" :string)
+           ("H" "�" :string)
            ("�" "�" :string)
-           ("I" "�" :string)
+           ("�" "�" :string)
            ("i" "�" :string)
-           ("J" "�" :string)
+           ("I" "�" :string)
            ("j" "�" :string)
-           ("�" "�" :string)
+           ("J" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("k" "�" :string)
            ("K" "�" :string)
-           ("L" "�" :string)
            ("l" "�" :string)
-           ("m" "�" :string)
+           ("L" "�" :string)
            ("M" "�" :string)
-           ("N" "�" :string)
+           ("m" "�" :string)
            ("n" "�" :string)
-           ("O" "�" :string)
+           ("N" "�" :string)
            ("o" "�" :string)
+           ("O" "�" :string)
            ("p" "�" :string)
            ("P" "�" :string)
-           ("Q" "�" :string)
            ("q" "�" :string)
-           ("R" "�" :string)
+           ("Q" "�" :string)
            ("r" "�" :string)
-           ("s" "�" :string)
+           ("R" "�" :string)
            ("S" "�" :string)
+           ("s" "�" :string)
            ("�" "��" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("t" "�" :string)
+           ("�" "�" :string)
            ("T" "�" :string)
-           ("U" "�" :string)
+           ("t" "�" :string)
            ("u" "�" :string)
+           ("U" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("V" "�" :string)
            ("v" "�" :string)
-           ("W" "�" :string)
+           ("V" "�" :string)
            ("w" "�" :string)
-           ("x" "�" :string)
+           ("W" "�" :string)
            ("X" "�" :string)
-           ("y" "�" :string)
+           ("x" "�" :string)
            ("Y" "�" :string)
-           ("Z" "�" :string)
+           ("y" "�" :string)
            ("z" "�" :string)
+           ("Z" "�" :string)
            ))
 
 (define-rule-set "eo-resolve-diacritics"
 
-  :rules  (("�" "�" :string)
-           ("N" "�" :string)
-           ("D" "�" :string)
-           ("y" "�" :string)
-           ("d" "�" :string)
-           ("k" "�" :string)
-           ("C" "�" :string)
-           ("U" "�" :string)
+  :rules  (("E" "�" :string)
+           ("J" "�" :string)
            ("I" "�" :string)
-           ("i" "�" :string)
-           ("L" "�" :string)
+           ("H" "�" :string)
+           ("m" "�" :string)
            ("Q" "�" :string)
-           ("V" "�" :string)
-           ("W" "�" :string)
-           ("R" "�" :string)
            ("x" "�" :string)
-           ("�" "�" :string)
-           ("J" "�" :string)
-           ("G" "�" :string)
-           ("�" "�" :string)
-           ("q" "�" :string)
+           ("e" "�" :string)
+           ("S" "�" :string)
            ("�" "�" :string)
+           ("A" "�" :string)
+           ("N" "�" :string)
+           ("r" "�" :string)
+           ("B" "�" :string)
            ("Z" "�" :string)
-           ("e" "�" :string)
-           ("m" "�" :string)
-           ("E" "�" :string)
            ("F" "�" :string)
+           ("�" "�" :string)
+           ("g" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("V" "�" :string)
+           ("R" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("U" "�" :string)
+           ("s" "�" :string)
+           ("�" "�" :string)
+           ("M" "�" :string)
+           ("L" "�" :string)
+           ("l" "�" :string)
+           ("�" "�" :string)
            ("v" "�" :string)
-           ("�" "�" :string)
-           ("c" "�" :string)
-           ("p" "�" :string)
-           ("z" "�" :string)
+           ("�" "�" :string)
+           ("T" "�" :string)
+           ("D" "�" :string)
+           ("�" "�" :string)
+           ("i" "�" :string)
+           ("C" "�" :string)
            ("t" "�" :string)
            ("f" "�" :string)
-           ("P" "�" :string)
-           ("�" "�" :string)
+           ("p" "�" :string)
+           ("G" "�" :string)
+           ("h" "�" :string)
            ("O" "�" :string)
-           ("�" "�" :string)
-           ("B" "�" :string)
+           ("o" "�" :string)
+           ("X" "�" :string)
            ("w" "�" :string)
-           ("M" "�" :string)
-           ("r" "�" :string)
+           ("j" "�" :string)
+           ("Y" "�" :string)
+           ("u" "�" :string)
+           ("k" "�" :string)
+           ("c" "�" :string)
            ("b" "�" :string)
-           ("H" "�" :string)
+           ("q" "�" :string)
            ("a" "�" :string)
-           ("n" "�" :string)
-           ("�" "�" :string)
-           ("h" "�" :string)
-           ("g" "�" :string)
-           ("s" "�" :string)
-           ("u" "�" :string)
-           ("S" "�" :string)
-           ("Y" "�" :string)
-           ("A" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("d" "�" :string)
            ("K" "�" :string)
-           ("o" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("j" "�" :string)
-           ("T" "�" :string)
-           ("X" "�" :string)
-           ("l" "�" :string)
+           ("n" "�" :string)
+           ("y" "�" :string)
+           ("z" "�" :string)
+           ("P" "�" :string)
+           ("�" "�" :string)
+           ("W" "�" :string)
            ("�" "�" :string)
            ))
 
 (define-rule-set "eo-resolve-case"
 
-  :rules  (("R" "8" :string)
-           ("W" "8" :string)
-           ("V" "8" :string)
+  :rules  (("S" "8" :string)
+           ("A" "8" :string)
+           ("E" "8" :string)
+           ("I" "8" :string)
+           ("J" "8" :string)
+           ("H" "8" :string)
            ("Q" "8" :string)
-           ("L" "8" :string)
+           ("V" "8" :string)
+           ("R" "8" :string)
+           ("�" "8" :string)
            ("U" "8" :string)
-           ("I" "8" :string)
-           ("C" "8" :string)
-           ("D" "8" :string)
            ("N" "8" :string)
-           ("�" "8" :string)
-           ("F" "8" :string)
-           ("E" "8" :string)
            ("Z" "8" :string)
-           ("�" "8" :string)
-           ("G" "8" :string)
-           ("J" "8" :string)
-           ("H" "8" :string)
-           ("M" "8" :string)
            ("B" "8" :string)
-           ("O" "8" :string)
-           ("P" "8" :string)
+           ("F" "8" :string)
            ("�" "8" :string)
+           ("G" "8" :string)
+           ("O" "8" :string)
            ("X" "8" :string)
-           ("T" "8" :string)
-           ("�" "8" :string)
-           ("K" "8" :string)
+           ("M" "8" :string)
+           ("�" "8" :string)
+           ("L" "8" :string)
            ("�" "8" :string)
+           ("T" "8" :string)
+           ("D" "8" :string)
+           ("C" "8" :string)
            ("�" "8" :string)
-           ("A" "8" :string)
+           ("K" "8" :string)
+           ("P" "8" :string)
+           ("�" "8" :string)
+           ("W" "8" :string)
            ("Y" "8" :string)
-           ("S" "8" :string)
-           ("x" "9" :string)
-           ("i" "9" :string)
-           ("k" "9" :string)
-           ("d" "9" :string)
-           ("y" "9" :string)
-           ("�" "9" :string)
-           ("c" "9" :string)
-           ("v" "9" :string)
-           ("m" "9" :string)
            ("e" "9" :string)
            ("�" "9" :string)
-           ("q" "9" :string)
+           ("m" "9" :string)
+           ("x" "9" :string)
+           ("�" "9" :string)
+           ("g" "9" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
-           ("n" "9" :string)
-           ("a" "9" :string)
-           ("b" "9" :string)
+           ("s" "9" :string)
            ("r" "9" :string)
-           ("w" "9" :string)
-           ("�" "9" :string)
+           ("h" "9" :string)
            ("f" "9" :string)
-           ("z" "9" :string)
            ("t" "9" :string)
            ("p" "9" :string)
-           ("l" "9" :string)
-           ("j" "9" :string)
            ("o" "9" :string)
+           ("j" "9" :string)
+           ("w" "9" :string)
+           ("l" "9" :string)
+           ("v" "9" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
+           ("i" "9" :string)
+           ("d" "9" :string)
+           ("y" "9" :string)
+           ("z" "9" :string)
+           ("n" "9" :string)
+           ("k" "9" :string)
            ("u" "9" :string)
-           ("s" "9" :string)
-           ("h" "9" :string)
-           ("g" "9" :string)
+           ("b" "9" :string)
+           ("c" "9" :string)
+           ("q" "9" :string)
+           ("a" "9" :string)
            ("�" "99" :string)
            ))
 
 (define-rule-set "eo-ignore-special"
 
   :rules  (("!" "" :string)
-           ("'" "" :string)
-           ("." "" :string)
            ("-" "" :string)
+           ("." "" :string)
            ("?" "" :string)
+           ("'" "" :string)
            ))
 
 (define-rule-set "eo-resolve-special"
@@ -255,70 +255,70 @@
   :rules  (("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("t" "�" :string)
-           ("z" "�" :string)
-           ("p" "�" :string)
-           ("f" "�" :string)
-           ("�" "�" :string)
-           ("P" "�" :string)
-           ("O" "�" :string)
-           ("�" "�" :string)
-           ("B" "�" :string)
-           ("M" "�" :string)
-           ("w" "�" :string)
-           ("r" "�" :string)
+           ("q" "�" :string)
            ("b" "�" :string)
-           ("H" "�" :string)
+           ("c" "�" :string)
            ("a" "�" :string)
-           ("�" "�" :string)
-           ("n" "�" :string)
-           ("s" "�" :string)
-           ("h" "�" :string)
-           ("g" "�" :string)
            ("u" "�" :string)
            ("Y" "�" :string)
-           ("S" "�" :string)
-           ("A" "�" :string)
+           ("k" "�" :string)
+           ("n" "�" :string)
+           ("z" "�" :string)
+           ("P" "�" :string)
+           ("y" "�" :string)
+           ("W" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("d" "�" :string)
            ("K" "�" :string)
-           ("�" "�" :string)
-           ("o" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("X" "�" :string)
-           ("l" "�" :string)
            ("T" "�" :string)
-           ("j" "�" :string)
-           ("�" "�" :string)
-           ("N" "�" :string)
+           ("�" "�" :string)
            ("D" "�" :string)
-           ("y" "�" :string)
-           ("d" "�" :string)
-           ("k" "�" :string)
-           ("U" "�" :string)
-           ("I" "�" :string)
            ("i" "�" :string)
            ("C" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("L" "�" :string)
-           ("Q" "�" :string)
-           ("V" "�" :string)
+           ("M" "�" :string)
+           ("l" "�" :string)
+           ("v" "�" :string)
+           ("o" "�" :string)
+           ("X" "�" :string)
+           ("w" "�" :string)
+           ("j" "�" :string)
+           ("p" "�" :string)
+           ("t" "�" :string)
+           ("f" "�" :string)
+           ("G" "�" :string)
+           ("h" "�" :string)
+           ("O" "�" :string)
+           ("B" "�" :string)
+           ("Z" "�" :string)
+           ("�" "�" :string)
+           ("F" "�" :string)
+           ("N" "�" :string)
+           ("r" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("s" "�" :string)
+           ("U" "�" :string)
+           ("�" "�" :string)
+           ("g" "�" :string)
+           ("�" "�" :string)
            ("R" "�" :string)
-           ("W" "�" :string)
+           ("V" "�" :string)
+           ("m" "�" :string)
+           ("H" "�" :string)
            ("x" "�" :string)
-           ("�" "�" :string)
+           ("Q" "�" :string)
+           ("E" "�" :string)
            ("J" "�" :string)
-           ("G" "�" :string)
-           ("�" "�" :string)
-           ("q" "�" :string)
+           ("I" "�" :string)
            ("�" "�" :string)
+           ("A" "�" :string)
+           ("S" "�" :string)
            ("e" "�" :string)
-           ("Z" "�" :string)
-           ("m" "�" :string)
-           ("E" "�" :string)
-           ("F" "�" :string)
-           ("�" "�" :string)
-           ("v" "�" :string)
-           ("c" "�" :string)
            ("�" "��" :string)
            ("-" "�" :string)
            ("'" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/esperanto/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/esperanto/utf8.xdy
index 9e059a4e155..fbc1e2434fe 100644
--- a/Master/texmf-dist/xindy/modules/lang/esperanto/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/esperanto/utf8.xdy
@@ -38,41 +38,41 @@
 
   :rules  (("Ĉ" "�" :string)
            ("ĉ" "�" :string)
-           ("Ĝ" "�" :string)
            ("ĝ" "�" :string)
+           ("Ĝ" "�" :string)
            ("ĥ" "�" :string)
            ("Ĥ" "�" :string)
-           ("ĵ" "�" :string)
            ("Ĵ" "�" :string)
+           ("ĵ" "�" :string)
            ("ß" "��" :string)
-           ("ŝ" "�" :string)
            ("Ŝ" "�" :string)
+           ("ŝ" "�" :string)
            ("Ŭ" "�" :string)
            ("ŭ" "�" :string)
            ("A" "�" :string)
            ("a" "�" :string)
-           ("B" "�" :string)
            ("b" "�" :string)
+           ("B" "�" :string)
            ("C" "�" :string)
            ("c" "�" :string)
-           ("d" "�" :string)
            ("D" "�" :string)
+           ("d" "�" :string)
            ("e" "�" :string)
            ("E" "�" :string)
-           ("f" "�" :string)
            ("F" "�" :string)
+           ("f" "�" :string)
            ("G" "�" :string)
            ("g" "�" :string)
            ("H" "�" :string)
            ("h" "�" :string)
-           ("i" "�" :string)
            ("I" "�" :string)
-           ("j" "�" :string)
+           ("i" "�" :string)
            ("J" "�" :string)
+           ("j" "�" :string)
            ("k" "�" :string)
            ("K" "�" :string)
-           ("l" "�" :string)
            ("L" "�" :string)
+           ("l" "�" :string)
            ("M" "�" :string)
            ("m" "�" :string)
            ("N" "�" :string)
@@ -81,22 +81,22 @@
            ("o" "�" :string)
            ("P" "�" :string)
            ("p" "�" :string)
-           ("Q" "�" :string)
            ("q" "�" :string)
+           ("Q" "�" :string)
            ("R" "�" :string)
            ("r" "�" :string)
-           ("S" "�" :string)
            ("s" "�" :string)
+           ("S" "�" :string)
            ("t" "�" :string)
            ("T" "�" :string)
            ("u" "�" :string)
            ("U" "�" :string)
-           ("v" "�" :string)
            ("V" "�" :string)
+           ("v" "�" :string)
            ("W" "�" :string)
            ("w" "�" :string)
-           ("x" "�" :string)
            ("X" "�" :string)
+           ("x" "�" :string)
            ("y" "�" :string)
            ("Y" "�" :string)
            ("Z" "�" :string)
@@ -105,221 +105,221 @@
 
 (define-rule-set "eo-resolve-diacritics"
 
-  :rules  (("Ĵ" "�" :string)
+  :rules  (("Ŝ" "�" :string)
+           ("Ĉ" "�" :string)
+           ("Ŭ" "�" :string)
+           ("Ĵ" "�" :string)
            ("ŝ" "�" :string)
+           ("ŭ" "�" :string)
+           ("ĥ" "�" :string)
+           ("ĝ" "�" :string)
            ("ĵ" "�" :string)
            ("Ĥ" "�" :string)
            ("Ĝ" "�" :string)
-           ("ĥ" "�" :string)
-           ("Ĉ" "�" :string)
-           ("ŭ" "�" :string)
-           ("Ŝ" "�" :string)
-           ("Ŭ" "�" :string)
            ("ĉ" "�" :string)
-           ("ĝ" "�" :string)
            ("ß" "�" :string)
-           ("g" "�" :string)
-           ("a" "�" :string)
-           ("I" "�" :string)
-           ("e" "�" :string)
-           ("M" "�" :string)
-           ("A" "�" :string)
-           ("j" "�" :string)
-           ("f" "�" :string)
-           ("T" "�" :string)
-           ("c" "�" :string)
-           ("G" "�" :string)
-           ("B" "�" :string)
-           ("t" "�" :string)
-           ("H" "�" :string)
+           ("D" "�" :string)
+           ("R" "�" :string)
            ("O" "�" :string)
            ("L" "�" :string)
-           ("P" "�" :string)
-           ("y" "�" :string)
-           ("l" "�" :string)
-           ("N" "�" :string)
-           ("C" "�" :string)
-           ("i" "�" :string)
-           ("R" "�" :string)
-           ("u" "�" :string)
+           ("t" "�" :string)
+           ("H" "�" :string)
+           ("X" "�" :string)
+           ("F" "�" :string)
+           ("M" "�" :string)
+           ("Z" "�" :string)
            ("V" "�" :string)
-           ("n" "�" :string)
+           ("P" "�" :string)
+           ("J" "�" :string)
+           ("k" "�" :string)
            ("m" "�" :string)
+           ("T" "�" :string)
+           ("r" "�" :string)
+           ("n" "�" :string)
+           ("u" "�" :string)
+           ("h" "�" :string)
+           ("I" "�" :string)
+           ("C" "�" :string)
+           ("z" "�" :string)
            ("q" "�" :string)
-           ("D" "�" :string)
+           ("N" "�" :string)
+           ("G" "�" :string)
+           ("U" "�" :string)
+           ("c" "�" :string)
+           ("s" "�" :string)
            ("v" "�" :string)
            ("Q" "�" :string)
-           ("F" "�" :string)
-           ("X" "�" :string)
-           ("z" "�" :string)
-           ("x" "�" :string)
-           ("s" "�" :string)
+           ("g" "�" :string)
+           ("y" "�" :string)
+           ("j" "�" :string)
            ("Y" "�" :string)
-           ("b" "�" :string)
-           ("Z" "�" :string)
-           ("K" "�" :string)
-           ("r" "�" :string)
-           ("w" "�" :string)
-           ("S" "�" :string)
            ("W" "�" :string)
-           ("h" "�" :string)
-           ("U" "�" :string)
            ("E" "�" :string)
-           ("J" "�" :string)
-           ("p" "�" :string)
-           ("k" "�" :string)
-           ("d" "�" :string)
            ("o" "�" :string)
+           ("d" "�" :string)
+           ("S" "�" :string)
+           ("b" "�" :string)
+           ("B" "�" :string)
+           ("w" "�" :string)
+           ("f" "�" :string)
+           ("l" "�" :string)
+           ("p" "�" :string)
+           ("A" "�" :string)
+           ("i" "�" :string)
+           ("K" "�" :string)
+           ("e" "�" :string)
+           ("a" "�" :string)
+           ("x" "�" :string)
            ))
 
 (define-rule-set "eo-resolve-case"
 
-  :rules  (("Ŭ" "8" :string)
-           ("Ŝ" "8" :string)
-           ("Ĵ" "8" :string)
+  :rules  (("Ĝ" "8" :string)
            ("Ĥ" "8" :string)
+           ("Ĵ" "8" :string)
+           ("Ŭ" "8" :string)
            ("Ĉ" "8" :string)
-           ("Ĝ" "8" :string)
-           ("ŭ" "9" :string)
+           ("Ŝ" "8" :string)
            ("ĉ" "9" :string)
-           ("ĝ" "9" :string)
            ("ĵ" "9" :string)
-           ("ŝ" "9" :string)
+           ("ĝ" "9" :string)
            ("ĥ" "9" :string)
+           ("ŭ" "9" :string)
+           ("ŝ" "9" :string)
            ("ß" "99" :string)
-           ("D" "8" :string)
-           ("V" "8" :string)
            ("K" "8" :string)
-           ("Z" "8" :string)
+           ("A" "8" :string)
+           ("B" "8" :string)
+           ("S" "8" :string)
+           ("E" "8" :string)
+           ("W" "8" :string)
            ("Y" "8" :string)
-           ("X" "8" :string)
-           ("F" "8" :string)
            ("Q" "8" :string)
-           ("E" "8" :string)
+           ("N" "8" :string)
+           ("G" "8" :string)
            ("U" "8" :string)
-           ("W" "8" :string)
-           ("S" "8" :string)
-           ("J" "8" :string)
-           ("A" "8" :string)
-           ("M" "8" :string)
            ("I" "8" :string)
-           ("B" "8" :string)
+           ("C" "8" :string)
+           ("T" "8" :string)
+           ("M" "8" :string)
+           ("F" "8" :string)
+           ("V" "8" :string)
+           ("Z" "8" :string)
+           ("P" "8" :string)
+           ("J" "8" :string)
            ("H" "8" :string)
+           ("X" "8" :string)
            ("O" "8" :string)
-           ("G" "8" :string)
-           ("T" "8" :string)
            ("L" "8" :string)
-           ("P" "8" :string)
+           ("D" "8" :string)
            ("R" "8" :string)
-           ("C" "8" :string)
-           ("N" "8" :string)
-           ("q" "9" :string)
-           ("v" "9" :string)
-           ("m" "9" :string)
-           ("n" "9" :string)
-           ("b" "9" :string)
-           ("s" "9" :string)
-           ("z" "9" :string)
+           ("e" "9" :string)
+           ("a" "9" :string)
            ("x" "9" :string)
-           ("h" "9" :string)
-           ("r" "9" :string)
+           ("l" "9" :string)
+           ("f" "9" :string)
+           ("p" "9" :string)
+           ("i" "9" :string)
+           ("b" "9" :string)
            ("w" "9" :string)
-           ("d" "9" :string)
            ("o" "9" :string)
-           ("k" "9" :string)
-           ("p" "9" :string)
-           ("e" "9" :string)
-           ("a" "9" :string)
-           ("g" "9" :string)
-           ("t" "9" :string)
+           ("d" "9" :string)
+           ("y" "9" :string)
            ("j" "9" :string)
-           ("f" "9" :string)
+           ("g" "9" :string)
+           ("v" "9" :string)
            ("c" "9" :string)
-           ("l" "9" :string)
-           ("y" "9" :string)
+           ("s" "9" :string)
+           ("q" "9" :string)
            ("u" "9" :string)
-           ("i" "9" :string)
+           ("h" "9" :string)
+           ("z" "9" :string)
+           ("r" "9" :string)
+           ("n" "9" :string)
+           ("m" "9" :string)
+           ("k" "9" :string)
+           ("t" "9" :string)
            ))
 
 (define-rule-set "eo-ignore-special"
 
   :rules  (("?" "" :string)
-           ("!" "" :string)
-           ("." "" :string)
            ("'" "" :string)
            ("-" "" :string)
+           ("!" "" :string)
+           ("." "" :string)
            ))
 
 (define-rule-set "eo-resolve-special"
 
-  :rules  (("ĥ" "�" :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)
-           ("i" "�" :string)
-           ("R" "�" :string)
-           ("u" "�" :string)
-           ("N" "�" :string)
-           ("C" "�" :string)
-           ("L" "�" :string)
-           ("P" "�" :string)
-           ("y" "�" :string)
-           ("l" "�" :string)
-           ("G" "�" :string)
-           ("B" "�" :string)
-           ("t" "�" :string)
-           ("H" "�" :string)
-           ("O" "�" :string)
-           ("j" "�" :string)
-           ("f" "�" :string)
            ("c" "�" :string)
-           ("T" "�" :string)
-           ("e" "�" :string)
-           ("M" "�" :string)
-           ("A" "�" :string)
+           ("s" "�" :string)
+           ("v" "�" :string)
+           ("Q" "�" :string)
+           ("Y" "�" :string)
+           ("W" "�" :string)
+           ("j" "�" :string)
+           ("y" "�" :string)
            ("g" "�" :string)
-           ("a" "�" :string)
-           ("I" "�" :string)
-           ("k" "�" :string)
            ("d" "�" :string)
-           ("o" "�" :string)
-           ("J" "�" :string)
-           ("p" "�" :string)
-           ("U" "�" :string)
            ("E" "�" :string)
-           ("r" "�" :string)
+           ("o" "�" :string)
            ("w" "�" :string)
+           ("B" "�" :string)
            ("S" "�" :string)
-           ("h" "�" :string)
-           ("W" "�" :string)
-           ("s" "�" :string)
-           ("Y" "�" :string)
            ("b" "�" :string)
-           ("Z" "�" :string)
-           ("K" "�" :string)
-           ("F" "�" :string)
-           ("Q" "�" :string)
-           ("X" "�" :string)
-           ("z" "�" :string)
+           ("A" "�" :string)
+           ("i" "�" :string)
+           ("l" "�" :string)
+           ("f" "�" :string)
+           ("p" "�" :string)
            ("x" "�" :string)
-           ("m" "�" :string)
-           ("q" "�" :string)
+           ("K" "�" :string)
+           ("e" "�" :string)
+           ("a" "�" :string)
+           ("R" "�" :string)
            ("D" "�" :string)
-           ("v" "�" :string)
+           ("L" "�" :string)
+           ("O" "�" :string)
+           ("H" "�" :string)
+           ("X" "�" :string)
+           ("t" "�" :string)
+           ("P" "�" :string)
+           ("J" "�" :string)
+           ("M" "�" :string)
+           ("F" "�" :string)
            ("V" "�" :string)
+           ("Z" "�" :string)
+           ("T" "�" :string)
+           ("m" "�" :string)
+           ("k" "�" :string)
+           ("r" "�" :string)
            ("n" "�" :string)
+           ("I" "�" :string)
+           ("C" "�" :string)
+           ("z" "�" :string)
+           ("u" "�" :string)
+           ("h" "�" :string)
+           ("U" "�" :string)
+           ("q" "�" :string)
+           ("N" "�" :string)
+           ("G" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/estonian/cp1252.xdy b/Master/texmf-dist/xindy/modules/lang/estonian/cp1252.xdy
index f6884134380..c885d869598 100644
--- a/Master/texmf-dist/xindy/modules/lang/estonian/cp1252.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/estonian/cp1252.xdy
@@ -43,207 +43,207 @@
            ("C" "�" :string)
            ("d" "�" :string)
            ("D" "�" :string)
-           ("e" "�" :string)
            ("E" "�" :string)
-           ("f" "�" :string)
+           ("e" "�" :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)
-           ("N" "�" :string)
+           ("m" "�" :string)
            ("n" "�" :string)
-           ("o" "�" :string)
+           ("N" "�" :string)
            ("O" "�" :string)
+           ("o" "�" :string)
            ("p" "�" :string)
            ("P" "�" :string)
            ("Q" "�" :string)
            ("q" "�" :string)
-           ("R" "�" :string)
            ("r" "�" :string)
+           ("R" "�" :string)
            ("S" "�" :string)
            ("s" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("Z" "�" :string)
+           ("�" "�" :string)
            ("z" "�" :string)
-           ("�" "�" :string)
+           ("Z" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("T" "�" :string)
            ("t" "�" :string)
-           ("u" "�" :string)
            ("U" "�" :string)
+           ("u" "�" :string)
            ("W" "�" :string)
+           ("V" "�" :string)
            ("w" "�" :string)
            ("v" "�" :string)
-           ("V" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("X" "�" :string)
            ("x" "�" :string)
-           ("Y" "�" :string)
            ("y" "�" :string)
+           ("Y" "�" :string)
            ))
 
 (define-rule-set "et-resolve-diacritics"
 
-  :rules  (("Z" "�" :string)
+  :rules  (("g" "�" :string)
+           ("E" "�" :string)
+           ("G" "�" :string)
+           ("z" "�" :string)
+           ("k" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("c" "�" :string)
+           ("l" "�" :string)
+           ("a" "�" :string)
+           ("S" "�" :string)
+           ("�" "�" :string)
            ("r" "�" :string)
-           ("O" "�" :string)
-           ("F" "�" :string)
+           ("M" "�" :string)
+           ("�" "�" :string)
+           ("L" "�" :string)
+           ("T" "�" :string)
            ("p" "�" :string)
+           ("i" "�" :string)
+           ("t" "�" :string)
+           ("Q" "�" :string)
+           ("y" "�" :string)
            ("U" "�" :string)
-           ("J" "�" :string)
-           ("�" "�" :string)
-           ("s" "�" :string)
+           ("e" "�" :string)
+           ("b" "�" :string)
+           ("K" "�" :string)
+           ("�" "�" :string)
+           ("F" "�" :string)
+           ("X" "�" :string)
+           ("�" "�" :string)
            ("H" "�" :string)
-           ("B" "�" :string)
-           ("j" "�" :string)
-           ("P" "�" :string)
-           ("g" "�" :string)
-           ("A" "�" :string)
-           ("q" "�" :string)
-           ("G" "�" :string)
-           ("x" "�" :string)
-           ("�" "�" :string)
-           ("y" "�" :string)
-           ("E" "�" :string)
+           ("o" "�" :string)
            ("n" "�" :string)
-           ("�" "�" :string)
-           ("V" "�" :string)
-           ("�" "�" :string)
-           ("z" "�" :string)
-           ("�" "�" :string)
-           ("v" "�" :string)
+           ("h" "�" :string)
+           ("d" "�" :string)
            ("D" "�" :string)
-           ("e" "�" :string)
+           ("q" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("I" "�" :string)
+           ("V" "�" :string)
+           ("O" "�" :string)
            ("Y" "�" :string)
-           ("t" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("a" "�" :string)
-           ("o" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("T" "�" :string)
+           ("P" "�" :string)
            ("m" "�" :string)
+           ("J" "�" :string)
+           ("B" "�" :string)
+           ("�" "�" :string)
+           ("u" "�" :string)
+           ("j" "�" :string)
+           ("v" "�" :string)
+           ("�" "�" :string)
+           ("A" "�" :string)
+           ("C" "�" :string)
+           ("x" "�" :string)
+           ("R" "�" :string)
            ("N" "�" :string)
            ("f" "�" :string)
-           ("k" "�" :string)
-           ("l" "�" :string)
-           ("i" "�" :string)
-           ("R" "�" :string)
-           ("C" "�" :string)
-           ("S" "�" :string)
-           ("c" "�" :string)
-           ("u" "�" :string)
-           ("�" "�" :string)
-           ("h" "�" :string)
-           ("�" "�" :string)
-           ("Q" "�" :string)
-           ("d" "�" :string)
-           ("I" "�" :string)
-           ("K" "�" :string)
-           ("b" "�" :string)
-           ("M" "�" :string)
-           ("L" "�" :string)
-           ("X" "�" :string)
-           ("�" "�" :string)
-           ("w" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("Z" "�" :string)
+           ("s" "�" :string)
            ("W" "�" :string)
+           ("w" "�" :string)
            ))
 
 (define-rule-set "et-resolve-case"
 
-  :rules  (("W" "8" :string)
-           ("Y" "8" :string)
-           ("T" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("N" "8" :string)
-           ("C" "8" :string)
-           ("R" "8" :string)
-           ("Q" "8" :string)
+  :rules  (("�" "8" :string)
            ("�" "8" :string)
+           ("G" "8" :string)
+           ("E" "8" :string)
+           ("T" "8" :string)
+           ("M" "8" :string)
+           ("L" "8" :string)
            ("S" "8" :string)
+           ("�" "8" :string)
            ("K" "8" :string)
-           ("I" "8" :string)
-           ("�" "8" :string)
-           ("X" "8" :string)
-           ("L" "8" :string)
-           ("M" "8" :string)
-           ("Z" "8" :string)
+           ("Q" "8" :string)
            ("U" "8" :string)
+           ("X" "8" :string)
+           ("H" "8" :string)
            ("F" "8" :string)
-           ("O" "8" :string)
-           ("�" "8" :string)
+           ("W" "8" :string)
+           ("�" "8" :string)
+           ("I" "8" :string)
+           ("D" "8" :string)
+           ("B" "8" :string)
            ("J" "8" :string)
+           ("V" "8" :string)
+           ("Y" "8" :string)
            ("P" "8" :string)
-           ("B" "8" :string)
-           ("H" "8" :string)
-           ("A" "8" :string)
-           ("E" "8" :string)
+           ("O" "8" :string)
+           ("C" "8" :string)
+           ("R" "8" :string)
            ("�" "8" :string)
-           ("G" "8" :string)
-           ("V" "8" :string)
-           ("D" "8" :string)
-           ("t" "9" :string)
-           ("e" "9" :string)
-           ("�" "9" :string)
-           ("o" "9" :string)
-           ("a" "9" :string)
-           ("�" "9" :string)
+           ("A" "8" :string)
+           ("�" "8" :string)
+           ("Z" "8" :string)
+           ("N" "8" :string)
+           ("z" "9" :string)
            ("k" "9" :string)
-           ("f" "9" :string)
-           ("m" "9" :string)
-           ("i" "9" :string)
-           ("l" "9" :string)
-           ("�" "9" :string)
-           ("h" "9" :string)
-           ("u" "9" :string)
+           ("g" "9" :string)
+           ("�" "9" :string)
+           ("r" "9" :string)
            ("c" "9" :string)
-           ("d" "9" :string)
+           ("l" "9" :string)
+           ("a" "9" :string)
+           ("�" "9" :string)
+           ("y" "9" :string)
            ("b" "9" :string)
-           ("r" "9" :string)
+           ("e" "9" :string)
+           ("t" "9" :string)
+           ("i" "9" :string)
            ("p" "9" :string)
-           ("w" "9" :string)
-           ("j" "9" :string)
-           ("s" "9" :string)
-           ("g" "9" :string)
-           ("y" "9" :string)
-           ("x" "9" :string)
+           ("�" "9" :string)
            ("q" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
+           ("�" "9" :string)
+           ("d" "9" :string)
+           ("h" "9" :string)
            ("n" "9" :string)
+           ("o" "9" :string)
+           ("m" "9" :string)
+           ("x" "9" :string)
            ("v" "9" :string)
-           ("�" "9" :string)
-           ("z" "9" :string)
+           ("j" "9" :string)
+           ("�" "9" :string)
+           ("u" "9" :string)
+           ("s" "9" :string)
+           ("�" "9" :string)
+           ("f" "9" :string)
+           ("w" "9" :string)
            ))
 
 (define-rule-set "et-ignore-special"
 
-  :rules  (("." "" :string)
-           ("!" "" :string)
-           ("-" "" :string)
+  :rules  (("!" "" :string)
            ("'" "" :string)
            ("?" "" :string)
+           ("-" "" :string)
+           ("." "" :string)
            ))
 
 (define-rule-set "et-resolve-special"
@@ -251,70 +251,70 @@
   :rules  (("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
+           ("�" "�" :string)
            ("X" "�" :string)
-           ("�" "�" :string)
-           ("L" "�" :string)
+           ("H" "�" :string)
+           ("F" "�" :string)
+           ("W" "�" :string)
+           ("Q" "�" :string)
+           ("U" "�" :string)
+           ("y" "�" :string)
+           ("e" "�" :string)
            ("b" "�" :string)
-           ("M" "�" :string)
            ("K" "�" :string)
-           ("I" "�" :string)
-           ("d" "�" :string)
-           ("�" "�" :string)
-           ("Q" "�" :string)
-           ("c" "�" :string)
-           ("u" "�" :string)
-           ("�" "�" :string)
-           ("h" "�" :string)
-           ("S" "�" :string)
-           ("R" "�" :string)
-           ("C" "�" :string)
+           ("�" "�" :string)
+           ("p" "�" :string)
            ("i" "�" :string)
-           ("l" "�" :string)
-           ("k" "�" :string)
-           ("f" "�" :string)
-           ("m" "�" :string)
-           ("N" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("t" "�" :string)
+           ("�" "�" :string)
+           ("M" "�" :string)
+           ("L" "�" :string)
            ("T" "�" :string)
-           ("o" "�" :string)
+           ("c" "�" :string)
+           ("l" "�" :string)
            ("a" "�" :string)
+           ("S" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("t" "�" :string)
-           ("e" "�" :string)
-           ("Y" "�" :string)
-           ("W" "�" :string)
-           ("D" "�" :string)
-           ("v" "�" :string)
+           ("r" "�" :string)
+           ("G" "�" :string)
            ("z" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("V" "�" :string)
-           ("n" "�" :string)
-           ("�" "�" :string)
+           ("k" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("g" "�" :string)
            ("E" "�" :string)
-           ("y" "�" :string)
-           ("�" "�" :string)
-           ("G" "�" :string)
-           ("q" "�" :string)
+           ("�" "�" :string)
+           ("Z" "�" :string)
+           ("�" "�" :string)
+           ("s" "�" :string)
+           ("w" "�" :string)
+           ("N" "�" :string)
+           ("f" "�" :string)
            ("x" "�" :string)
+           ("C" "�" :string)
+           ("R" "�" :string)
+           ("�" "�" :string)
+           ("u" "�" :string)
+           ("j" "�" :string)
+           ("v" "�" :string)
+           ("�" "�" :string)
            ("A" "�" :string)
-           ("g" "�" :string)
-           ("w" "�" :string)
            ("B" "�" :string)
-           ("j" "�" :string)
+           ("V" "�" :string)
+           ("Y" "�" :string)
            ("P" "�" :string)
-           ("s" "�" :string)
-           ("H" "�" :string)
-           ("�" "�" :string)
-           ("J" "�" :string)
-           ("U" "�" :string)
-           ("F" "�" :string)
-           ("p" "�" :string)
            ("O" "�" :string)
-           ("r" "�" :string)
-           ("Z" "�" :string)
+           ("m" "�" :string)
+           ("J" "�" :string)
+           ("D" "�" :string)
+           ("q" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("I" "�" :string)
+           ("o" "�" :string)
+           ("n" "�" :string)
+           ("d" "�" :string)
+           ("h" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/estonian/latin9.xdy b/Master/texmf-dist/xindy/modules/lang/estonian/latin9.xdy
index 54c0c1de190..9cbb11ac698 100644
--- a/Master/texmf-dist/xindy/modules/lang/estonian/latin9.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/estonian/latin9.xdy
@@ -35,28 +35,28 @@
 
 (define-rule-set "et-alphabetize"
 
-  :rules  (("A" "�" :string)
-           ("a" "�" :string)
-           ("b" "�" :string)
+  :rules  (("a" "�" :string)
+           ("A" "�" :string)
            ("B" "�" :string)
-           ("C" "�" :string)
+           ("b" "�" :string)
            ("c" "�" :string)
+           ("C" "�" :string)
            ("d" "�" :string)
            ("D" "�" :string)
            ("e" "�" :string)
            ("E" "�" :string)
-           ("F" "�" :string)
            ("f" "�" :string)
-           ("G" "�" :string)
+           ("F" "�" :string)
            ("g" "�" :string)
-           ("H" "�" :string)
+           ("G" "�" :string)
            ("h" "�" :string)
-           ("I" "�" :string)
+           ("H" "�" :string)
            ("i" "�" :string)
+           ("I" "�" :string)
            ("J" "�" :string)
            ("j" "�" :string)
-           ("K" "�" :string)
            ("k" "�" :string)
+           ("K" "�" :string)
            ("L" "�" :string)
            ("l" "�" :string)
            ("m" "�" :string)
@@ -69,30 +69,30 @@
            ("p" "�" :string)
            ("Q" "�" :string)
            ("q" "�" :string)
-           ("R" "�" :string)
            ("r" "�" :string)
-           ("s" "�" :string)
+           ("R" "�" :string)
            ("S" "�" :string)
+           ("s" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("z" "�" :string)
            ("Z" "�" :string)
+           ("z" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("T" "�" :string)
            ("t" "�" :string)
+           ("T" "�" :string)
            ("u" "�" :string)
            ("U" "�" :string)
-           ("V" "�" :string)
-           ("w" "�" :string)
            ("W" "�" :string)
            ("v" "�" :string)
+           ("V" "�" :string)
+           ("w" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("x" "�" :string)
@@ -103,146 +103,146 @@
 
 (define-rule-set "et-resolve-diacritics"
 
-  :rules  (("s" "�" :string)
+  :rules  (("k" "�" :string)
            ("Q" "�" :string)
-           ("n" "�" :string)
-           ("�" "�" :string)
-           ("H" "�" :string)
-           ("�" "�" :string)
-           ("J" "�" :string)
-           ("K" "�" :string)
-           ("A" "�" :string)
-           ("I" "�" :string)
-           ("O" "�" :string)
+           ("r" "�" :string)
            ("�" "�" :string)
-           ("R" "�" :string)
-           ("F" "�" :string)
            ("e" "�" :string)
            ("m" "�" :string)
-           ("L" "�" :string)
-           ("l" "�" :string)
-           ("�" "�" :string)
-           ("z" "�" :string)
-           ("�" "�" :string)
-           ("u" "�" :string)
+           ("t" "�" :string)
+           ("q" "�" :string)
+           ("h" "�" :string)
            ("C" "�" :string)
-           ("V" "�" :string)
-           ("�" "�" :string)
-           ("G" "�" :string)
            ("y" "�" :string)
-           ("x" "�" :string)
+           ("B" "�" :string)
+           ("J" "�" :string)
+           ("n" "�" :string)
            ("P" "�" :string)
+           ("c" "�" :string)
+           ("g" "�" :string)
+           ("M" "�" :string)
+           ("�" "�" :string)
+           ("i" "�" :string)
+           ("u" "�" :string)
+           ("a" "�" :string)
+           ("x" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("E" "�" :string)
+           ("L" "�" :string)
+           ("s" "�" :string)
+           ("v" "�" :string)
            ("T" "�" :string)
-           ("d" "�" :string)
+           ("S" "�" :string)
+           ("Z" "�" :string)
+           ("I" "�" :string)
+           ("R" "�" :string)
+           ("z" "�" :string)
+           ("l" "�" :string)
+           ("G" "�" :string)
+           ("F" "�" :string)
+           ("f" "�" :string)
+           ("U" "�" :string)
+           ("�" "�" :string)
+           ("b" "�" :string)
+           ("�" "�" :string)
            ("N" "�" :string)
+           ("H" "�" :string)
+           ("V" "�" :string)
            ("�" "�" :string)
-           ("b" "�" :string)
-           ("�" "�" :string)
-           ("q" "�" :string)
-           ("a" "�" :string)
-           ("�" "�" :string)
-           ("p" "�" :string)
-           ("r" "�" :string)
-           ("�" "�" :string)
-           ("i" "�" :string)
-           ("k" "�" :string)
            ("j" "�" :string)
-           ("o" "�" :string)
-           ("c" "�" :string)
-           ("�" "�" :string)
-           ("Y" "�" :string)
-           ("Z" "�" :string)
-           ("t" "�" :string)
-           ("v" "�" :string)
-           ("B" "�" :string)
-           ("h" "�" :string)
-           ("E" "�" :string)
+           ("A" "�" :string)
+           ("�" "�" :string)
+           ("p" "�" :string)
+           ("d" "�" :string)
            ("X" "�" :string)
-           ("f" "�" :string)
+           ("O" "�" :string)
            ("D" "�" :string)
-           ("S" "�" :string)
-           ("g" "�" :string)
+           ("K" "�" :string)
+           ("Y" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("o" "�" :string)
            ("�" "�" :string)
-           ("M" "�" :string)
-           ("U" "�" :string)
-           ("w" "�" :string)
+           ("�" "�" :string)
            ("W" "�" :string)
+           ("w" "�" :string)
            ))
 
 (define-rule-set "et-resolve-case"
 
-  :rules  (("�" "8" :string)
-           ("�" "8" :string)
+  :rules  (("�" "8" :string)
            ("N" "8" :string)
-           ("B" "8" :string)
-           ("E" "8" :string)
-           ("W" "8" :string)
-           ("Z" "8" :string)
-           ("Y" "8" :string)
-           ("�" "8" :string)
            ("U" "8" :string)
-           ("M" "8" :string)
-           ("�" "8" :string)
-           ("S" "8" :string)
+           ("G" "8" :string)
+           ("F" "8" :string)
+           ("H" "8" :string)
+           ("V" "8" :string)
+           ("�" "8" :string)
            ("D" "8" :string)
+           ("O" "8" :string)
            ("X" "8" :string)
-           ("Q" "8" :string)
+           ("A" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("Y" "8" :string)
            ("K" "8" :string)
-           ("�" "8" :string)
+           ("Q" "8" :string)
+           ("P" "8" :string)
+           ("C" "8" :string)
+           ("B" "8" :string)
            ("J" "8" :string)
-           ("�" "8" :string)
-           ("H" "8" :string)
-           ("L" "8" :string)
-           ("F" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("E" "8" :string)
+           ("M" "8" :string)
            ("R" "8" :string)
-           ("O" "8" :string)
-           ("A" "8" :string)
+           ("Z" "8" :string)
            ("I" "8" :string)
+           ("S" "8" :string)
            ("T" "8" :string)
-           ("P" "8" :string)
-           ("G" "8" :string)
-           ("V" "8" :string)
-           ("C" "8" :string)
-           ("p" "9" :string)
-           ("�" "9" :string)
-           ("a" "9" :string)
-           ("q" "9" :string)
+           ("W" "8" :string)
+           ("L" "8" :string)
+           ("�" "9" :string)
            ("b" "9" :string)
+           ("l" "9" :string)
+           ("f" "9" :string)
+           ("z" "9" :string)
+           ("j" "9" :string)
            ("w" "9" :string)
            ("d" "9" :string)
-           ("o" "9" :string)
-           ("j" "9" :string)
+           ("p" "9" :string)
            ("�" "9" :string)
-           ("k" "9" :string)
-           ("i" "9" :string)
-           ("r" "9" :string)
-           ("v" "9" :string)
-           ("h" "9" :string)
-           ("t" "9" :string)
-           ("c" "9" :string)
-           ("g" "9" :string)
-           ("f" "9" :string)
-           ("s" "9" :string)
-           ("n" "9" :string)
            ("�" "9" :string)
-           ("l" "9" :string)
-           ("m" "9" :string)
+           ("�" "9" :string)
+           ("o" "9" :string)
            ("e" "9" :string)
+           ("m" "9" :string)
+           ("r" "9" :string)
            ("�" "9" :string)
+           ("k" "9" :string)
+           ("c" "9" :string)
+           ("g" "9" :string)
+           ("h" "9" :string)
            ("y" "9" :string)
+           ("n" "9" :string)
+           ("t" "9" :string)
+           ("q" "9" :string)
+           ("a" "9" :string)
            ("x" "9" :string)
-           ("�" "9" :string)
+           ("i" "9" :string)
            ("u" "9" :string)
-           ("z" "9" :string)
-           ("�" "9" :string)
+           ("�" "9" :string)
+           ("s" "9" :string)
+           ("v" "9" :string)
            ))
 
 (define-rule-set "et-ignore-special"
 
-  :rules  (("?" "" :string)
+  :rules  (("." "" :string)
            ("!" "" :string)
-           ("." "" :string)
            ("-" "" :string)
+           ("?" "" :string)
            ("'" "" :string)
            ))
 
@@ -251,70 +251,70 @@
   :rules  (("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
+           ("s" "�" :string)
+           ("T" "�" :string)
+           ("S" "�" :string)
+           ("v" "�" :string)
+           ("L" "�" :string)
+           ("W" "�" :string)
+           ("R" "�" :string)
            ("Z" "�" :string)
-           ("Y" "�" :string)
-           ("�" "�" :string)
-           ("c" "�" :string)
+           ("I" "�" :string)
+           ("u" "�" :string)
+           ("i" "�" :string)
+           ("�" "�" :string)
+           ("M" "�" :string)
+           ("a" "�" :string)
            ("E" "�" :string)
+           ("�" "�" :string)
+           ("x" "�" :string)
+           ("�" "�" :string)
+           ("y" "�" :string)
+           ("C" "�" :string)
            ("h" "�" :string)
+           ("n" "�" :string)
+           ("J" "�" :string)
            ("B" "�" :string)
-           ("v" "�" :string)
-           ("W" "�" :string)
            ("t" "�" :string)
-           ("D" "�" :string)
-           ("f" "�" :string)
-           ("X" "�" :string)
-           ("U" "�" :string)
-           ("M" "�" :string)
-           ("�" "�" :string)
-           ("g" "�" :string)
-           ("S" "�" :string)
            ("q" "�" :string)
-           ("�" "�" :string)
-           ("b" "�" :string)
-           ("�" "�" :string)
-           ("d" "�" :string)
-           ("w" "�" :string)
-           ("N" "�" :string)
-           ("p" "�" :string)
-           ("�" "�" :string)
-           ("a" "�" :string)
-           ("j" "�" :string)
-           ("k" "�" :string)
-           ("i" "�" :string)
-           ("�" "�" :string)
+           ("c" "�" :string)
+           ("g" "�" :string)
+           ("P" "�" :string)
            ("r" "�" :string)
-           ("o" "�" :string)
+           ("Q" "�" :string)
+           ("�" "�" :string)
+           ("k" "�" :string)
            ("e" "�" :string)
            ("m" "�" :string)
-           ("F" "�" :string)
-           ("R" "�" :string)
-           ("O" "�" :string)
-           ("�" "�" :string)
-           ("I" "�" :string)
-           ("A" "�" :string)
+           ("K" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("o" "�" :string)
+           ("Y" "�" :string)
+           ("p" "�" :string)
+           ("A" "�" :string)
+           ("�" "�" :string)
+           ("D" "�" :string)
+           ("O" "�" :string)
+           ("d" "�" :string)
+           ("X" "�" :string)
+           ("j" "�" :string)
+           ("H" "�" :string)
+           ("�" "�" :string)
+           ("V" "�" :string)
+           ("w" "�" :string)
+           ("F" "�" :string)
            ("l" "�" :string)
-           ("L" "�" :string)
-           ("C" "�" :string)
-           ("u" "�" :string)
-           ("�" "�" :string)
-           ("z" "�" :string)
-           ("T" "�" :string)
-           ("P" "�" :string)
-           ("y" "�" :string)
-           ("x" "�" :string)
            ("G" "�" :string)
-           ("�" "�" :string)
-           ("V" "�" :string)
-           ("s" "�" :string)
-           ("Q" "�" :string)
-           ("H" "�" :string)
+           ("f" "�" :string)
+           ("z" "�" :string)
            ("�" "�" :string)
-           ("n" "�" :string)
-           ("K" "�" :string)
-           ("J" "�" :string)
-           ("�" "�" :string)
+           ("N" "�" :string)
+           ("�" "�" :string)
+           ("U" "�" :string)
+           ("b" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/estonian/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/estonian/utf8.xdy
index 209a68bd0e8..cec05563d57 100644
--- a/Master/texmf-dist/xindy/modules/lang/estonian/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/estonian/utf8.xdy
@@ -39,12 +39,12 @@
            ("š" "�" :string)
            ("ž" "�" :string)
            ("Ž" "�" :string)
-           ("Õ" "�" :string)
            ("õ" "�" :string)
+           ("Õ" "�" :string)
            ("ä" "�" :string)
            ("Ä" "�" :string)
-           ("ö" "�" :string)
            ("Ö" "�" :string)
+           ("ö" "�" :string)
            ("ü" "�" :string)
            ("Ü" "�" :string)
            ("a" "�" :string)
@@ -53,20 +53,20 @@
            ("b" "�" :string)
            ("c" "�" :string)
            ("C" "�" :string)
-           ("d" "�" :string)
            ("D" "�" :string)
+           ("d" "�" :string)
            ("e" "�" :string)
            ("E" "�" :string)
-           ("F" "�" :string)
            ("f" "�" :string)
+           ("F" "�" :string)
            ("g" "�" :string)
            ("G" "�" :string)
            ("H" "�" :string)
            ("h" "�" :string)
            ("i" "�" :string)
            ("I" "�" :string)
-           ("j" "�" :string)
            ("J" "�" :string)
+           ("j" "�" :string)
            ("K" "�" :string)
            ("k" "�" :string)
            ("L" "�" :string)
@@ -81,20 +81,20 @@
            ("P" "�" :string)
            ("q" "�" :string)
            ("Q" "�" :string)
-           ("r" "�" :string)
            ("R" "�" :string)
-           ("S" "�" :string)
+           ("r" "�" :string)
            ("s" "�" :string)
-           ("z" "�" :string)
+           ("S" "�" :string)
            ("Z" "�" :string)
-           ("T" "�" :string)
+           ("z" "�" :string)
            ("t" "�" :string)
-           ("u" "�" :string)
+           ("T" "�" :string)
            ("U" "�" :string)
-           ("V" "�" :string)
+           ("u" "�" :string)
            ("w" "�" :string)
-           ("W" "�" :string)
+           ("V" "�" :string)
            ("v" "�" :string)
+           ("W" "�" :string)
            ("X" "�" :string)
            ("x" "�" :string)
            ("Y" "�" :string)
@@ -103,218 +103,218 @@
 
 (define-rule-set "et-resolve-diacritics"
 
-  :rules  (("õ" "�" :string)
+  :rules  (("Š" "�" :string)
            ("ä" "�" :string)
-           ("ö" "�" :string)
-           ("Õ" "�" :string)
-           ("ü" "�" :string)
            ("š" "�" :string)
-           ("Ä" "�" :string)
            ("Ö" "�" :string)
-           ("Š" "�" :string)
            ("ž" "�" :string)
+           ("ö" "�" :string)
+           ("õ" "�" :string)
+           ("ü" "�" :string)
+           ("Õ" "�" :string)
            ("Ü" "�" :string)
            ("Ž" "�" :string)
-           ("p" "�" :string)
+           ("Ä" "�" :string)
            ("U" "�" :string)
-           ("g" "�" :string)
-           ("h" "�" :string)
-           ("M" "�" :string)
-           ("E" "�" :string)
-           ("r" "�" :string)
-           ("X" "�" :string)
-           ("x" "�" :string)
-           ("i" "�" :string)
-           ("o" "�" :string)
-           ("a" "�" :string)
+           ("e" "�" :string)
+           ("f" "�" :string)
+           ("D" "�" :string)
+           ("q" "�" :string)
            ("V" "�" :string)
+           ("o" "�" :string)
+           ("t" "�" :string)
+           ("p" "�" :string)
+           ("Y" "�" :string)
            ("H" "�" :string)
+           ("i" "�" :string)
            ("L" "�" :string)
-           ("j" "�" :string)
            ("u" "�" :string)
-           ("J" "�" :string)
-           ("d" "�" :string)
-           ("B" "�" :string)
-           ("K" "�" :string)
-           ("e" "�" :string)
-           ("q" "�" :string)
-           ("A" "�" :string)
-           ("I" "�" :string)
-           ("Y" "�" :string)
-           ("Z" "�" :string)
-           ("O" "�" :string)
+           ("g" "�" :string)
+           ("X" "�" :string)
+           ("c" "�" :string)
            ("y" "�" :string)
-           ("Q" "�" :string)
-           ("t" "�" :string)
-           ("f" "�" :string)
+           ("I" "�" :string)
+           ("E" "�" :string)
+           ("K" "�" :string)
+           ("F" "�" :string)
            ("G" "�" :string)
-           ("z" "�" :string)
-           ("k" "�" :string)
-           ("T" "�" :string)
-           ("c" "�" :string)
+           ("x" "�" :string)
+           ("v" "�" :string)
+           ("C" "�" :string)
+           ("Z" "�" :string)
            ("n" "�" :string)
+           ("J" "�" :string)
+           ("a" "�" :string)
+           ("M" "�" :string)
+           ("h" "�" :string)
            ("N" "�" :string)
-           ("b" "�" :string)
-           ("S" "�" :string)
-           ("P" "�" :string)
-           ("l" "�" :string)
-           ("m" "�" :string)
-           ("C" "�" :string)
-           ("F" "�" :string)
            ("R" "�" :string)
+           ("l" "�" :string)
+           ("A" "�" :string)
+           ("d" "�" :string)
            ("s" "�" :string)
-           ("v" "�" :string)
-           ("D" "�" :string)
-           ("W" "�" :string)
+           ("Q" "�" :string)
+           ("z" "�" :string)
+           ("B" "�" :string)
+           ("O" "�" :string)
+           ("j" "�" :string)
+           ("r" "�" :string)
+           ("m" "�" :string)
+           ("b" "�" :string)
+           ("k" "�" :string)
+           ("P" "�" :string)
+           ("S" "�" :string)
+           ("T" "�" :string)
            ("w" "�" :string)
+           ("W" "�" :string)
            ))
 
 (define-rule-set "et-resolve-case"
 
-  :rules  (("Ä" "8" :string)
-           ("Ö" "8" :string)
+  :rules  (("Ö" "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)
-           ("Y" "8" :string)
-           ("I" "8" :string)
-           ("A" "8" :string)
-           ("O" "8" :string)
-           ("Z" "8" :string)
-           ("Q" "8" :string)
-           ("G" "8" :string)
-           ("N" "8" :string)
-           ("T" "8" :string)
-           ("R" "8" :string)
-           ("C" "8" :string)
+           ("õ" "9" :string)
            ("F" "8" :string)
-           ("P" "8" :string)
-           ("S" "8" :string)
-           ("D" "8" :string)
-           ("W" "8" :string)
-           ("U" "8" :string)
+           ("G" "8" :string)
+           ("I" "8" :string)
            ("E" "8" :string)
-           ("M" "8" :string)
+           ("K" "8" :string)
            ("X" "8" :string)
+           ("L" "8" :string)
            ("H" "8" :string)
+           ("Y" "8" :string)
+           ("D" "8" :string)
            ("V" "8" :string)
-           ("L" "8" :string)
+           ("U" "8" :string)
+           ("T" "8" :string)
+           ("S" "8" :string)
+           ("P" "8" :string)
+           ("O" "8" :string)
            ("B" "8" :string)
-           ("K" "8" :string)
+           ("Q" "8" :string)
+           ("A" "8" :string)
+           ("N" "8" :string)
+           ("W" "8" :string)
+           ("R" "8" :string)
+           ("M" "8" :string)
            ("J" "8" :string)
+           ("Z" "8" :string)
+           ("C" "8" :string)
+           ("x" "9" :string)
+           ("c" "9" :string)
            ("y" "9" :string)
+           ("u" "9" :string)
+           ("g" "9" :string)
+           ("i" "9" :string)
+           ("p" "9" :string)
+           ("o" "9" :string)
            ("t" "9" :string)
+           ("q" "9" :string)
+           ("w" "9" :string)
            ("f" "9" :string)
-           ("z" "9" :string)
-           ("c" "9" :string)
-           ("n" "9" :string)
+           ("e" "9" :string)
+           ("b" "9" :string)
            ("k" "9" :string)
+           ("j" "9" :string)
+           ("r" "9" :string)
            ("m" "9" :string)
-           ("l" "9" :string)
-           ("b" "9" :string)
+           ("z" "9" :string)
            ("s" "9" :string)
-           ("v" "9" :string)
+           ("d" "9" :string)
+           ("l" "9" :string)
            ("h" "9" :string)
-           ("g" "9" :string)
-           ("p" "9" :string)
-           ("r" "9" :string)
-           ("o" "9" :string)
-           ("x" "9" :string)
-           ("i" "9" :string)
            ("a" "9" :string)
-           ("j" "9" :string)
-           ("d" "9" :string)
-           ("u" "9" :string)
-           ("q" "9" :string)
-           ("e" "9" :string)
-           ("w" "9" :string)
+           ("n" "9" :string)
+           ("v" "9" :string)
            ))
 
 (define-rule-set "et-ignore-special"
 
-  :rules  (("!" "" :string)
-           ("'" "" :string)
-           ("." "" :string)
-           ("?" "" :string)
+  :rules  (("?" "" :string)
            ("-" "" :string)
+           ("!" "" :string)
+           ("." "" :string)
+           ("'" "" :string)
            ))
 
 (define-rule-set "et-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)
+           ("v" "�" :string)
+           ("Z" "�" :string)
+           ("C" "�" :string)
+           ("n" "�" :string)
            ("J" "�" :string)
-           ("u" "�" :string)
-           ("B" "�" :string)
-           ("K" "�" :string)
-           ("d" "�" :string)
-           ("e" "�" :string)
-           ("w" "�" :string)
-           ("q" "�" :string)
            ("a" "�" :string)
-           ("V" "�" :string)
-           ("H" "�" :string)
-           ("L" "�" :string)
-           ("j" "�" :string)
            ("M" "�" :string)
-           ("r" "�" :string)
-           ("E" "�" :string)
-           ("X" "�" :string)
-           ("x" "�" :string)
-           ("i" "�" :string)
-           ("o" "�" :string)
-           ("U" "�" :string)
-           ("p" "�" :string)
+           ("R" "�" :string)
            ("W" "�" :string)
            ("h" "�" :string)
-           ("g" "�" :string)
-           ("b" "�" :string)
-           ("S" "�" :string)
+           ("N" "�" :string)
            ("l" "�" :string)
-           ("P" "�" :string)
-           ("R" "�" :string)
-           ("m" "�" :string)
-           ("C" "�" :string)
-           ("F" "�" :string)
-           ("v" "�" :string)
+           ("A" "�" :string)
+           ("d" "�" :string)
            ("s" "�" :string)
-           ("D" "�" :string)
            ("z" "�" :string)
-           ("T" "�" :string)
-           ("c" "�" :string)
-           ("n" "�" :string)
-           ("k" "�" :string)
-           ("N" "�" :string)
            ("Q" "�" :string)
-           ("t" "�" :string)
-           ("G" "�" :string)
+           ("B" "�" :string)
+           ("O" "�" :string)
+           ("m" "�" :string)
+           ("r" "�" :string)
+           ("j" "�" :string)
+           ("k" "�" :string)
+           ("b" "�" :string)
+           ("P" "�" :string)
+           ("S" "�" :string)
+           ("T" "�" :string)
+           ("e" "�" :string)
+           ("U" "�" :string)
            ("f" "�" :string)
-           ("A" "�" :string)
-           ("I" "�" :string)
+           ("w" "�" :string)
+           ("q" "�" :string)
+           ("V" "�" :string)
+           ("D" "�" :string)
+           ("t" "�" :string)
+           ("o" "�" :string)
+           ("p" "�" :string)
            ("Y" "�" :string)
-           ("O" "�" :string)
-           ("Z" "�" :string)
+           ("H" "�" :string)
+           ("i" "�" :string)
+           ("L" "�" :string)
+           ("g" "�" :string)
+           ("u" "�" :string)
+           ("X" "�" :string)
+           ("E" "�" :string)
+           ("K" "�" :string)
            ("y" "�" :string)
+           ("c" "�" :string)
+           ("I" "�" :string)
+           ("G" "�" :string)
+           ("F" "�" :string)
+           ("x" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/finnish/cp1252.xdy b/Master/texmf-dist/xindy/modules/lang/finnish/cp1252.xdy
index b0b5546df3a..ecfe3114bfb 100644
--- a/Master/texmf-dist/xindy/modules/lang/finnish/cp1252.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/finnish/cp1252.xdy
@@ -32,17 +32,17 @@
 
 (define-rule-set "fi-alphabetize"
 
-  :rules  (("a" "�" :string)
-           ("A" "�" :string)
+  :rules  (("A" "�" :string)
+           ("a" "�" :string)
            ("B" "�" :string)
            ("b" "�" :string)
            ("c" "�" :string)
            ("C" "�" :string)
            ("d" "�" :string)
            ("D" "�" :string)
-           ("�" "�" :string)
-           ("e" "�" :string)
            ("E" "�" :string)
+           ("e" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("f" "�" :string)
            ("F" "�" :string)
@@ -50,135 +50,135 @@
            ("G" "�" :string)
            ("H" "�" :string)
            ("h" "�" :string)
-           ("i" "�" :string)
            ("I" "�" :string)
-           ("j" "�" :string)
+           ("i" "�" :string)
            ("J" "�" :string)
-           ("k" "�" :string)
+           ("j" "�" :string)
            ("K" "�" :string)
-           ("L" "�" :string)
+           ("k" "�" :string)
            ("l" "�" :string)
-           ("M" "�" :string)
+           ("L" "�" :string)
            ("m" "�" :string)
+           ("M" "�" :string)
            ("n" "�" :string)
            ("N" "�" :string)
-           ("O" "�" :string)
            ("o" "�" :string)
+           ("O" "�" :string)
            ("P" "�" :string)
            ("p" "�" :string)
            ("Q" "�" :string)
            ("q" "�" :string)
-           ("r" "�" :string)
            ("R" "�" :string)
+           ("r" "�" :string)
+           ("�" "�" :string)
            ("S" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("s" "�" :string)
            ("�" "��" :string)
-           ("T" "�" :string)
            ("t" "�" :string)
+           ("T" "�" :string)
            ("u" "�" :string)
            ("U" "�" :string)
            ("W" "�" :string)
-           ("V" "�" :string)
            ("v" "�" :string)
            ("w" "�" :string)
-           ("X" "�" :string)
+           ("V" "�" :string)
            ("x" "�" :string)
-           ("Y" "�" :string)
+           ("X" "�" :string)
            ("y" "�" :string)
            ("�" "�" :string)
+           ("Y" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
            ("Z" "�" :string)
            ("z" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ))
 
 (define-rule-set "fi-resolve-diacritics"
 
-  :rules  (("Y" "�" :string)
-           ("F" "�" :string)
+  :rules  (("R" "�" :string)
+           ("�" "�" :string)
+           ("s" "�" :string)
+           ("z" "�" :string)
+           ("i" "�" :string)
+           ("X" "�" :string)
+           ("v" "�" :string)
            ("r" "�" :string)
            ("g" "�" :string)
-           ("P" "�" :string)
-           ("�" "�" :string)
-           ("I" "�" :string)
-           ("B" "�" :string)
-           ("f" "�" :string)
-           ("i" "�" :string)
+           ("C" "�" :string)
+           ("J" "�" :string)
+           ("V" "�" :string)
+           ("�" "�" :string)
+           ("G" "�" :string)
            ("L" "�" :string)
-           ("n" "�" :string)
-           ("q" "�" :string)
-           ("e" "�" :string)
-           ("S" "�" :string)
-           ("�" "�" :string)
-           ("R" "�" :string)
-           ("T" "�" :string)
-           ("Z" "�" :string)
-           ("O" "�" :string)
-           ("�" "�" :string)
+           ("j" "�" :string)
            ("d" "�" :string)
-           ("�" "�" :string)
-           ("u" "�" :string)
            ("l" "�" :string)
-           ("Q" "�" :string)
-           ("X" "�" :string)
-           ("V" "�" :string)
-           ("c" "�" :string)
-           ("v" "�" :string)
-           ("K" "�" :string)
+           ("Y" "�" :string)
+           ("x" "�" :string)
+           ("�" "�" :string)
+           ("U" "�" :string)
+           ("N" "�" :string)
+           ("I" "�" :string)
+           ("Z" "�" :string)
            ("k" "�" :string)
            ("D" "�" :string)
            ("M" "�" :string)
-           ("m" "�" :string)
+           ("a" "�" :string)
+           ("O" "�" :string)
            ("h" "�" :string)
+           ("F" "�" :string)
+           ("t" "�" :string)
+           ("Q" "�" :string)
+           ("q" "�" :string)
+           ("c" "�" :string)
+           ("�" "�" :string)
+           ("u" "�" :string)
+           ("T" "�" :string)
+           ("b" "�" :string)
+           ("E" "�" :string)
            ("H" "�" :string)
-           ("y" "�" :string)
-           ("�" "�" :string)
+           ("e" "�" :string)
+           ("S" "�" :string)
+           ("P" "�" :string)
+           ("m" "�" :string)
            ("A" "�" :string)
-           ("�" "�" :string)
-           ("z" "�" :string)
-           ("E" "�" :string)
-           ("b" "�" :string)
-           ("J" "�" :string)
-           ("C" "�" :string)
-           ("G" "�" :string)
-           ("x" "�" :string)
-           ("N" "�" :string)
+           ("n" "�" :string)
            ("p" "�" :string)
-           ("U" "�" :string)
+           ("B" "�" :string)
+           ("f" "�" :string)
            ("o" "�" :string)
-           ("j" "�" :string)
-           ("a" "�" :string)
-           ("t" "�" :string)
-           ("s" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("y" "�" :string)
+           ("K" "�" :string)
+           ("�" "�" :string)
+           ("w" "�" :string)
            ("�" "�" :string)
-           ("W" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("w" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("W" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
@@ -186,90 +186,90 @@
 
 (define-rule-set "fi-resolve-case"
 
-  :rules  (("u" "0" :string)
-           ("d" "0" :string)
-           ("�" "0" :string)
-           ("l" "0" :string)
-           ("c" "0" :string)
-           ("q" "0" :string)
-           ("�" "0" :string)
-           ("e" "0" :string)
+  :rules  (("h" "0" :string)
+           ("a" "0" :string)
+           ("k" "0" :string)
+           ("x" "0" :string)
            ("�" "0" :string)
-           ("i" "0" :string)
-           ("f" "0" :string)
-           ("n" "0" :string)
-           ("�" "0" :string)
+           ("l" "0" :string)
+           ("d" "0" :string)
+           ("j" "0" :string)
+           ("�" "0" :string)
+           ("�" "0" :string)
            ("�" "0" :string)
-           ("r" "0" :string)
+           ("w" "0" :string)
            ("g" "0" :string)
-           ("o" "0" :string)
-           ("j" "0" :string)
-           ("p" "0" :string)
-           ("t" "0" :string)
-           ("a" "0" :string)
-           ("s" "0" :string)
-           ("�" "0" :string)
-           ("b" "0" :string)
+           ("v" "0" :string)
+           ("r" "0" :string)
+           ("i" "0" :string)
            ("z" "0" :string)
-           ("�" "0" :string)
-           ("x" "0" :string)
-           ("�" "0" :string)
-           ("k" "0" :string)
+           ("s" "0" :string)
+           ("�" "0" :string)
            ("y" "0" :string)
-           ("h" "0" :string)
+           ("�" "0" :string)
+           ("�" "0" :string)
+           ("o" "0" :string)
+           ("f" "0" :string)
+           ("p" "0" :string)
+           ("n" "0" :string)
            ("m" "0" :string)
-           ("v" "0" :string)
-           ("w" "0" :string)
-           ("�" "0" :string)
-           ("�" "0" :string)
+           ("e" "0" :string)
+           ("b" "0" :string)
+           ("�" "0" :string)
+           ("u" "0" :string)
+           ("�" "0" :string)
+           ("q" "0" :string)
+           ("c" "0" :string)
+           ("�" "0" :string)
+           ("t" "0" :string)
            ("�" "00" :string)
-           ("�" "1" :string)
-           ("X" "1" :string)
-           ("Q" "1" :string)
-           ("V" "1" :string)
-           ("�" "1" :string)
-           ("�" "1" :string)
-           ("S" "1" :string)
-           ("T" "1" :string)
-           ("R" "1" :string)
            ("O" "1" :string)
-           ("�" "1" :string)
-           ("Z" "1" :string)
-           ("P" "1" :string)
-           ("L" "1" :string)
-           ("B" "1" :string)
-           ("I" "1" :string)
-           ("Y" "1" :string)
-           ("�" "1" :string)
            ("W" "1" :string)
-           ("F" "1" :string)
-           ("�" "1" :string)
+           ("M" "1" :string)
+           ("�" "1" :string)
+           ("D" "1" :string)
+           ("I" "1" :string)
+           ("N" "1" :string)
+           ("Z" "1" :string)
            ("U" "1" :string)
-           ("�" "1" :string)
-           ("A" "1" :string)
+           ("Y" "1" :string)
+           ("G" "1" :string)
+           ("L" "1" :string)
+           ("�" "1" :string)
            ("�" "1" :string)
            ("J" "1" :string)
-           ("�" "1" :string)
-           ("E" "1" :string)
-           ("G" "1" :string)
+           ("V" "1" :string)
            ("C" "1" :string)
-           ("�" "1" :string)
-           ("N" "1" :string)
-           ("D" "1" :string)
+           ("X" "1" :string)
+           ("�" "1" :string)
+           ("R" "1" :string)
            ("K" "1" :string)
-           ("M" "1" :string)
+           ("�" "1" :string)
+           ("B" "1" :string)
+           ("�" "1" :string)
+           ("A" "1" :string)
+           ("�" "1" :string)
+           ("P" "1" :string)
+           ("�" "1" :string)
+           ("�" "1" :string)
+           ("S" "1" :string)
            ("H" "1" :string)
+           ("E" "1" :string)
+           ("T" "1" :string)
+           ("�" "1" :string)
+           ("Q" "1" :string)
+           ("F" "1" :string)
            ))
 
 (define-rule-set "fi-ignore-special"
 
-  :rules  (("}" "" :string)
-           ("." "" :string)
-           ("?" "" :string)
+  :rules  (("'" "" :string)
            ("-" "" :string)
            ("!" "" :string)
+           ("?" "" :string)
+           ("}" "" :string)
+           ("." "" :string)
            ("{" "" :string)
-           ("'" "" :string)
            ))
 
 (define-rule-set "fi-resolve-special"
@@ -277,78 +277,78 @@
   :rules  (("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("v" "�" :string)
-           ("w" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("D" "�" :string)
-           ("K" "�" :string)
-           ("k" "�" :string)
-           ("M" "�" :string)
-           ("h" "�" :string)
-           ("y" "�" :string)
-           ("H" "�" :string)
-           ("m" "�" :string)
-           ("�" "�" :string)
-           ("A" "�" :string)
-           ("b" "�" :string)
-           ("�" "�" :string)
-           ("J" "�" :string)
-           ("�" "�" :string)
-           ("z" "�" :string)
-           ("E" "�" :string)
-           ("�" "�" :string)
-           ("G" "�" :string)
-           ("x" "�" :string)
-           ("C" "�" :string)
-           ("N" "�" :string)
-           ("�" "�" :string)
-           ("o" "�" :string)
-           ("U" "�" :string)
-           ("j" "�" :string)
-           ("�" "�" :string)
-           ("p" "�" :string)
+           ("F" "�" :string)
            ("t" "�" :string)
-           ("a" "�" :string)
+           ("Q" "�" :string)
+           ("q" "�" :string)
+           ("c" "�" :string)
            ("�" "�" :string)
-           ("s" "�" :string)
-           ("�" "�" :string)
-           ("Y" "�" :string)
+           ("�" "�" :string)
+           ("u" "�" :string)
+           ("T" "�" :string)
+           ("�" "�" :string)
+           ("b" "�" :string)
+           ("�" "�" :string)
+           ("E" "�" :string)
+           ("H" "�" :string)
+           ("e" "�" :string)
+           ("S" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("W" "�" :string)
-           ("F" "�" :string)
-           ("r" "�" :string)
            ("�" "�" :string)
-           ("g" "�" :string)
-           ("�" "�" :string)
            ("P" "�" :string)
-           ("i" "�" :string)
-           ("L" "�" :string)
-           ("I" "�" :string)
+           ("m" "�" :string)
+           ("A" "�" :string)
+           ("n" "�" :string)
+           ("�" "�" :string)
+           ("p" "�" :string)
            ("B" "�" :string)
            ("f" "�" :string)
-           ("n" "�" :string)
+           ("�" "�" :string)
+           ("o" "�" :string)
            ("�" "�" :string)
-           ("q" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("e" "�" :string)
-           ("S" "�" :string)
-           ("T" "�" :string)
+           ("y" "�" :string)
+           ("K" "�" :string)
+           ("�" "�" :string)
            ("R" "�" :string)
-           ("Z" "�" :string)
-           ("O" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("u" "�" :string)
-           ("�" "�" :string)
-           ("d" "�" :string)
-           ("Q" "�" :string)
+           ("s" "�" :string)
+           ("z" "�" :string)
+           ("i" "�" :string)
            ("X" "�" :string)
-           ("l" "�" :string)
-           ("c" "�" :string)
+           ("v" "�" :string)
+           ("r" "�" :string)
+           ("g" "�" :string)
+           ("C" "�" :string)
+           ("J" "�" :string)
+           ("w" "�" :string)
            ("V" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("L" "�" :string)
+           ("G" "�" :string)
+           ("j" "�" :string)
+           ("d" "�" :string)
+           ("l" "�" :string)
+           ("Y" "�" :string)
+           ("x" "�" :string)
+           ("�" "�" :string)
+           ("U" "�" :string)
+           ("N" "�" :string)
+           ("I" "�" :string)
+           ("Z" "�" :string)
+           ("k" "�" :string)
+           ("D" "�" :string)
+           ("W" "�" :string)
+           ("M" "�" :string)
+           ("�" "�" :string)
+           ("a" "�" :string)
+           ("O" "�" :string)
+           ("h" "�" :string)
            ("�" "��" :string)
            ("-" "�" :string)
            ("'" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/finnish/latin9.xdy b/Master/texmf-dist/xindy/modules/lang/finnish/latin9.xdy
index 60e72aadb22..b60c0081d95 100644
--- a/Master/texmf-dist/xindy/modules/lang/finnish/latin9.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/finnish/latin9.xdy
@@ -34,14 +34,14 @@
 
   :rules  (("A" "�" :string)
            ("a" "�" :string)
-           ("b" "�" :string)
            ("B" "�" :string)
+           ("b" "�" :string)
            ("C" "�" :string)
            ("c" "�" :string)
-           ("d" "�" :string)
            ("D" "�" :string)
-           ("�" "�" :string)
+           ("d" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("E" "�" :string)
            ("e" "�" :string)
            ("F" "�" :string)
@@ -54,222 +54,222 @@
            ("i" "�" :string)
            ("j" "�" :string)
            ("J" "�" :string)
-           ("K" "�" :string)
            ("k" "�" :string)
-           ("l" "�" :string)
+           ("K" "�" :string)
            ("L" "�" :string)
+           ("l" "�" :string)
            ("M" "�" :string)
            ("m" "�" :string)
-           ("N" "�" :string)
            ("n" "�" :string)
-           ("O" "�" :string)
+           ("N" "�" :string)
            ("o" "�" :string)
-           ("p" "�" :string)
+           ("O" "�" :string)
            ("P" "�" :string)
-           ("q" "�" :string)
+           ("p" "�" :string)
            ("Q" "�" :string)
+           ("q" "�" :string)
            ("R" "�" :string)
            ("r" "�" :string)
-           ("S" "�" :string)
            ("�" "�" :string)
            ("s" "�" :string)
            ("�" "�" :string)
+           ("S" "�" :string)
            ("�" "��" :string)
            ("T" "�" :string)
            ("t" "�" :string)
-           ("U" "�" :string)
            ("u" "�" :string)
+           ("U" "�" :string)
+           ("w" "�" :string)
+           ("W" "�" :string)
            ("V" "�" :string)
            ("v" "�" :string)
-           ("W" "�" :string)
-           ("w" "�" :string)
            ("x" "�" :string)
            ("X" "�" :string)
-           ("y" "�" :string)
+           ("Y" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("Y" "�" :string)
-           ("�" "�" :string)
-           ("z" "�" :string)
+           ("y" "�" :string)
            ("Z" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("z" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ))
 
 (define-rule-set "fi-resolve-diacritics"
 
-  :rules  (("e" "�" :string)
-           ("p" "�" :string)
-           ("z" "�" :string)
-           ("F" "�" :string)
-           ("s" "�" :string)
+  :rules  (("v" "�" :string)
+           ("k" "�" :string)
+           ("h" "�" :string)
            ("f" "�" :string)
-           ("�" "�" :string)
-           ("O" "�" :string)
-           ("Z" "�" :string)
-           ("u" "�" :string)
-           ("T" "�" :string)
-           ("G" "�" :string)
-           ("g" "�" :string)
-           ("b" "�" :string)
+           ("V" "�" :string)
+           ("�" "�" :string)
+           ("E" "�" :string)
+           ("x" "�" :string)
+           ("�" "�" :string)
+           ("i" "�" :string)
            ("l" "�" :string)
-           ("j" "�" :string)
            ("H" "�" :string)
-           ("P" "�" :string)
-           ("R" "�" :string)
-           ("B" "�" :string)
+           ("F" "�" :string)
+           ("y" "�" :string)
            ("m" "�" :string)
-           ("I" "�" :string)
-           ("i" "�" :string)
-           ("L" "�" :string)
-           ("J" "�" :string)
-           ("�" "�" :string)
+           ("u" "�" :string)
+           ("g" "�" :string)
+           ("R" "�" :string)
+           ("S" "�" :string)
+           ("K" "�" :string)
+           ("U" "�" :string)
+           ("N" "�" :string)
+           ("z" "�" :string)
+           ("e" "�" :string)
            ("r" "�" :string)
-           ("h" "�" :string)
-           ("�" "�" :string)
-           ("Y" "�" :string)
-           ("D" "�" :string)
-           ("o" "�" :string)
-           ("t" "�" :string)
            ("X" "�" :string)
-           ("A" "�" :string)
-           ("U" "�" :string)
-           ("�" "�" :string)
+           ("b" "�" :string)
+           ("O" "�" :string)
+           ("t" "�" :string)
            ("C" "�" :string)
-           ("N" "�" :string)
-           ("V" "�" :string)
-           ("a" "�" :string)
-           ("y" "�" :string)
-           ("c" "�" :string)
-           ("S" "�" :string)
+           ("P" "�" :string)
+           ("D" "�" :string)
            ("M" "�" :string)
+           ("q" "�" :string)
+           ("a" "�" :string)
+           ("Z" "�" :string)
+           ("L" "�" :string)
+           ("�" "�" :string)
+           ("A" "�" :string)
+           ("�" "�" :string)
+           ("j" "�" :string)
+           ("T" "�" :string)
+           ("Q" "�" :string)
+           ("Y" "�" :string)
+           ("B" "�" :string)
            ("d" "�" :string)
-           ("x" "�" :string)
-           ("�" "�" :string)
-           ("K" "�" :string)
+           ("J" "�" :string)
            ("�" "�" :string)
+           ("c" "�" :string)
+           ("o" "�" :string)
            ("n" "�" :string)
-           ("E" "�" :string)
-           ("q" "�" :string)
-           ("v" "�" :string)
-           ("Q" "�" :string)
-           ("k" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("s" "�" :string)
+           ("G" "�" :string)
+           ("p" "�" :string)
+           ("I" "�" :string)
            ("W" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("w" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("w" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ))
 
 (define-rule-set "fi-resolve-case"
 
-  :rules  (("q" "0" :string)
-           ("�" "0" :string)
-           ("�" "0" :string)
+  :rules  (("l" "0" :string)
+           ("i" "0" :string)
+           ("x" "0" :string)
+           ("h" "0" :string)
            ("k" "0" :string)
            ("v" "0" :string)
-           ("�" "0" :string)
+           ("f" "0" :string)
+           ("u" "0" :string)
+           ("�" "0" :string)
+           ("m" "0" :string)
+           ("g" "0" :string)
            ("y" "0" :string)
-           ("c" "0" :string)
+           ("�" "0" :string)
+           ("b" "0" :string)
+           ("r" "0" :string)
+           ("�" "0" :string)
+           ("e" "0" :string)
+           ("z" "0" :string)
+           ("q" "0" :string)
            ("a" "0" :string)
-           ("n" "0" :string)
-           ("d" "0" :string)
-           ("x" "0" :string)
            ("�" "0" :string)
-           ("�" "0" :string)
            ("�" "0" :string)
-           ("r" "0" :string)
-           ("i" "0" :string)
-           ("m" "0" :string)
-           ("o" "0" :string)
            ("t" "0" :string)
-           ("�" "0" :string)
-           ("�" "0" :string)
-           ("h" "0" :string)
-           ("w" "0" :string)
-           ("z" "0" :string)
+           ("�" "0" :string)
            ("�" "0" :string)
-           ("p" "0" :string)
-           ("e" "0" :string)
-           ("l" "0" :string)
            ("j" "0" :string)
-           ("g" "0" :string)
-           ("b" "0" :string)
-           ("u" "0" :string)
+           ("�" "0" :string)
            ("�" "0" :string)
-           ("f" "0" :string)
+           ("c" "0" :string)
+           ("d" "0" :string)
+           ("n" "0" :string)
+           ("o" "0" :string)
+           ("w" "0" :string)
            ("s" "0" :string)
+           ("p" "0" :string)
+           ("�" "0" :string)
            ("�" "00" :string)
            ("E" "1" :string)
-           ("Q" "1" :string)
-           ("�" "1" :string)
+           ("�" "1" :string)
            ("V" "1" :string)
-           ("N" "1" :string)
            ("�" "1" :string)
-           ("C" "1" :string)
+           ("R" "1" :string)
+           ("F" "1" :string)
+           ("H" "1" :string)
+           ("W" "1" :string)
            ("U" "1" :string)
-           ("A" "1" :string)
-           ("�" "1" :string)
+           ("S" "1" :string)
            ("K" "1" :string)
-           ("�" "1" :string)
+           ("�" "1" :string)
+           ("O" "1" :string)
+           ("X" "1" :string)
+           ("N" "1" :string)
+           ("�" "1" :string)
            ("M" "1" :string)
-           ("S" "1" :string)
-           ("J" "1" :string)
-           ("�" "1" :string)
-           ("L" "1" :string)
-           ("�" "1" :string)
-           ("I" "1" :string)
-           ("�" "1" :string)
-           ("R" "1" :string)
-           ("B" "1" :string)
+           ("D" "1" :string)
            ("P" "1" :string)
-           ("X" "1" :string)
+           ("C" "1" :string)
+           ("Z" "1" :string)
+           ("�" "1" :string)
+           ("B" "1" :string)
            ("Y" "1" :string)
-           ("D" "1" :string)
-           ("�" "1" :string)
+           ("T" "1" :string)
            ("�" "1" :string)
-           ("H" "1" :string)
-           ("W" "1" :string)
+           ("Q" "1" :string)
+           ("A" "1" :string)
+           ("�" "1" :string)
+           ("L" "1" :string)
+           ("�" "1" :string)
+           ("J" "1" :string)
+           ("�" "1" :string)
            ("G" "1" :string)
-           ("T" "1" :string)
-           ("Z" "1" :string)
-           ("O" "1" :string)
-           ("F" "1" :string)
-           ("�" "1" :string)
+           ("I" "1" :string)
+           ("�" "1" :string)
            ))
 
 (define-rule-set "fi-ignore-special"
 
-  :rules  (("}" "" :string)
-           ("{" "" :string)
-           ("!" "" :string)
-           ("." "" :string)
-           ("-" "" :string)
+  :rules  (("!" "" :string)
            ("'" "" :string)
+           ("-" "" :string)
+           ("{" "" :string)
+           ("}" "" :string)
            ("?" "" :string)
+           ("." "" :string)
            ))
 
 (define-rule-set "fi-resolve-special"
@@ -277,78 +277,78 @@
   :rules  (("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("Q" "�" :string)
-           ("v" "�" :string)
-           ("k" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("E" "�" :string)
-           ("q" "�" :string)
-           ("�" "�" :string)
-           ("S" "�" :string)
-           ("M" "�" :string)
+           ("e" "�" :string)
+           ("z" "�" :string)
+           ("N" "�" :string)
+           ("O" "�" :string)
+           ("�" "�" :string)
+           ("r" "�" :string)
+           ("b" "�" :string)
+           ("X" "�" :string)
            ("K" "�" :string)
-           ("�" "�" :string)
-           ("n" "�" :string)
-           ("�" "�" :string)
-           ("d" "�" :string)
-           ("x" "�" :string)
+           ("S" "�" :string)
            ("U" "�" :string)
+           ("�" "�" :string)
+           ("W" "�" :string)
+           ("y" "�" :string)
+           ("F" "�" :string)
+           ("H" "�" :string)
+           ("g" "�" :string)
+           ("R" "�" :string)
+           ("�" "�" :string)
+           ("u" "�" :string)
+           ("m" "�" :string)
+           ("f" "�" :string)
+           ("h" "�" :string)
+           ("v" "�" :string)
+           ("k" "�" :string)
+           ("i" "�" :string)
+           ("l" "�" :string)
+           ("x" "�" :string)
            ("�" "�" :string)
-           ("C" "�" :string)
-           ("A" "�" :string)
-           ("a" "�" :string)
+           ("�" "�" :string)
+           ("E" "�" :string)
            ("V" "�" :string)
-           ("c" "�" :string)
-           ("�" "�" :string)
-           ("y" "�" :string)
-           ("�" "�" :string)
-           ("N" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("D" "�" :string)
-           ("Y" "�" :string)
+           ("�" "�" :string)
+           ("I" "�" :string)
+           ("p" "�" :string)
            ("w" "�" :string)
-           ("h" "�" :string)
-           ("X" "�" :string)
-           ("t" "�" :string)
+           ("G" "�" :string)
+           ("s" "�" :string)
+           ("�" "�" :string)
+           ("n" "�" :string)
            ("o" "�" :string)
-           ("m" "�" :string)
+           ("c" "�" :string)
+           ("�" "�" :string)
+           ("d" "�" :string)
+           ("J" "�" :string)
            ("�" "�" :string)
-           ("I" "�" :string)
-           ("P" "�" :string)
+           ("�" "�" :string)
+           ("L" "�" :string)
+           ("�" "�" :string)
+           ("Y" "�" :string)
            ("B" "�" :string)
-           ("R" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("r" "�" :string)
-           ("J" "�" :string)
-           ("�" "�" :string)
-           ("i" "�" :string)
-           ("L" "�" :string)
-           ("O" "�" :string)
-           ("�" "�" :string)
-           ("Z" "�" :string)
-           ("u" "�" :string)
-           ("�" "�" :string)
-           ("f" "�" :string)
-           ("s" "�" :string)
-           ("F" "�" :string)
-           ("W" "�" :string)
-           ("H" "�" :string)
-           ("g" "�" :string)
-           ("b" "�" :string)
-           ("G" "�" :string)
+           ("A" "�" :string)
+           ("Q" "�" :string)
            ("T" "�" :string)
-           ("j" "�" :string)
-           ("l" "�" :string)
-           ("p" "�" :string)
-           ("e" "�" :string)
-           ("z" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("j" "�" :string)
+           ("t" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("Z" "�" :string)
+           ("q" "�" :string)
+           ("a" "�" :string)
+           ("M" "�" :string)
+           ("C" "�" :string)
+           ("D" "�" :string)
+           ("P" "�" :string)
            ("�" "��" :string)
            ("-" "�" :string)
            ("'" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/finnish/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/finnish/utf8.xdy
index aed33bd9a9a..0515961a44f 100644
--- a/Master/texmf-dist/xindy/modules/lang/finnish/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/finnish/utf8.xdy
@@ -34,45 +34,45 @@
 
   :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)
            ("A" "�" :string)
            ("a" "�" :string)
-           ("b" "�" :string)
            ("B" "�" :string)
-           ("C" "�" :string)
+           ("b" "�" :string)
            ("c" "�" :string)
+           ("C" "�" :string)
            ("d" "�" :string)
            ("D" "�" :string)
            ("e" "�" :string)
            ("E" "�" :string)
            ("F" "�" :string)
            ("f" "�" :string)
-           ("g" "�" :string)
            ("G" "�" :string)
+           ("g" "�" :string)
            ("h" "�" :string)
            ("H" "�" :string)
            ("I" "�" :string)
            ("i" "�" :string)
-           ("J" "�" :string)
            ("j" "�" :string)
+           ("J" "�" :string)
            ("k" "�" :string)
            ("K" "�" :string)
            ("L" "�" :string)
@@ -87,269 +87,269 @@
            ("P" "�" :string)
            ("Q" "�" :string)
            ("q" "�" :string)
-           ("R" "�" :string)
            ("r" "�" :string)
+           ("R" "�" :string)
            ("s" "�" :string)
            ("S" "�" :string)
-           ("T" "�" :string)
            ("t" "�" :string)
+           ("T" "�" :string)
            ("u" "�" :string)
            ("U" "�" :string)
-           ("W" "�" :string)
+           ("v" "�" :string)
            ("w" "�" :string)
+           ("W" "�" :string)
            ("V" "�" :string)
-           ("v" "�" :string)
            ("x" "�" :string)
            ("X" "�" :string)
-           ("y" "�" :string)
            ("Y" "�" :string)
+           ("y" "�" :string)
            ("Z" "�" :string)
            ("z" "�" :string)
            ))
 
 (define-rule-set "fi-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)
-           ("b" "�" :string)
-           ("M" "�" :string)
-           ("g" "�" :string)
-           ("h" "�" :string)
-           ("D" "�" :string)
-           ("t" "�" :string)
-           ("E" "�" :string)
-           ("i" "�" :string)
-           ("C" "�" :string)
            ("p" "�" :string)
-           ("R" "�" :string)
-           ("z" "�" :string)
-           ("S" "�" :string)
-           ("A" "�" :string)
+           ("x" "�" :string)
+           ("o" "�" :string)
            ("e" "�" :string)
-           ("F" "�" :string)
-           ("Q" "�" :string)
-           ("s" "�" :string)
-           ("Z" "�" :string)
-           ("d" "�" :string)
-           ("m" "�" :string)
-           ("I" "�" :string)
+           ("O" "�" :string)
+           ("C" "�" :string)
+           ("n" "�" :string)
+           ("j" "�" :string)
            ("f" "�" :string)
+           ("F" "�" :string)
+           ("P" "�" :string)
+           ("N" "�" :string)
            ("T" "�" :string)
-           ("L" "�" :string)
-           ("y" "�" :string)
+           ("u" "�" :string)
            ("v" "�" :string)
+           ("t" "�" :string)
+           ("s" "�" :string)
+           ("Y" "�" :string)
+           ("r" "�" :string)
            ("B" "�" :string)
-           ("O" "�" :string)
+           ("c" "�" :string)
            ("U" "�" :string)
-           ("Y" "�" :string)
-           ("P" "�" :string)
+           ("J" "�" :string)
+           ("b" "�" :string)
+           ("E" "�" :string)
            ("l" "�" :string)
-           ("r" "�" :string)
+           ("m" "�" :string)
+           ("M" "�" :string)
+           ("L" "�" :string)
            ("X" "�" :string)
-           ("n" "�" :string)
-           ("k" "�" :string)
-           ("J" "�" :string)
-           ("c" "�" :string)
            ("q" "�" :string)
-           ("a" "�" :string)
-           ("o" "�" :string)
-           ("N" "�" :string)
+           ("y" "�" :string)
+           ("i" "�" :string)
+           ("V" "�" :string)
+           ("D" "�" :string)
+           ("S" "�" :string)
+           ("I" "�" :string)
+           ("d" "�" :string)
+           ("g" "�" :string)
+           ("R" "�" :string)
+           ("A" "�" :string)
            ("G" "�" :string)
-           ("u" "�" :string)
-           ("x" "�" :string)
+           ("k" "�" :string)
            ("K" "�" :string)
-           ("j" "�" :string)
            ("H" "�" :string)
-           ("V" "�" :string)
+           ("z" "�" :string)
+           ("a" "�" :string)
+           ("h" "�" :string)
+           ("Z" "�" :string)
+           ("Q" "�" :string)
            ("W" "�" :string)
            ("w" "�" :string)
            ))
 
 (define-rule-set "fi-resolve-case"
 
-  :rules  (("æ" "0" :string)
-           ("ø" "0" :string)
+  :rules  (("å" "0" :string)
            ("õ" "0" :string)
-           ("å" "0" :string)
+           ("æ" "0" :string)
+           ("ž" "0" :string)
+           ("ü" "0" :string)
            ("ä" "0" :string)
            ("ö" "0" :string)
-           ("ü" "0" :string)
            ("š" "0" :string)
            ("é" "0" :string)
-           ("ž" "0" :string)
+           ("ø" "0" :string)
            ("ß" "00" :string)
-           ("Ö" "1" :string)
-           ("Š" "1" :string)
+           ("Ž" "1" :string)
+           ("Ä" "1" :string)
+           ("Å" "1" :string)
+           ("Õ" "1" :string)
            ("É" "1" :string)
            ("Ü" "1" :string)
            ("Æ" "1" :string)
-           ("Å" "1" :string)
-           ("Ä" "1" :string)
            ("Ø" "1" :string)
-           ("Ž" "1" :string)
-           ("Õ" "1" :string)
-           ("m" "0" :string)
-           ("d" "0" :string)
-           ("s" "0" :string)
-           ("e" "0" :string)
-           ("y" "0" :string)
-           ("f" "0" :string)
-           ("t" "0" :string)
-           ("i" "0" :string)
-           ("b" "0" :string)
-           ("h" "0" :string)
+           ("Š" "1" :string)
+           ("Ö" "1" :string)
            ("g" "0" :string)
+           ("d" "0" :string)
+           ("k" "0" :string)
+           ("a" "0" :string)
            ("z" "0" :string)
-           ("p" "0" :string)
+           ("h" "0" :string)
+           ("l" "0" :string)
+           ("b" "0" :string)
+           ("m" "0" :string)
+           ("i" "0" :string)
+           ("y" "0" :string)
            ("q" "0" :string)
-           ("c" "0" :string)
-           ("w" "0" :string)
-           ("o" "0" :string)
-           ("a" "0" :string)
-           ("k" "0" :string)
-           ("j" "0" :string)
-           ("x" "0" :string)
            ("u" "0" :string)
+           ("s" "0" :string)
+           ("t" "0" :string)
            ("v" "0" :string)
-           ("n" "0" :string)
+           ("w" "0" :string)
            ("r" "0" :string)
-           ("l" "0" :string)
-           ("Z" "1" :string)
-           ("Q" "1" :string)
-           ("F" "1" :string)
-           ("L" "1" :string)
+           ("c" "0" :string)
+           ("x" "0" :string)
+           ("p" "0" :string)
+           ("e" "0" :string)
+           ("o" "0" :string)
+           ("f" "0" :string)
+           ("n" "0" :string)
+           ("j" "0" :string)
+           ("R" "1" :string)
            ("I" "1" :string)
-           ("T" "1" :string)
-           ("D" "1" :string)
-           ("E" "1" :string)
-           ("M" "1" :string)
-           ("A" "1" :string)
            ("S" "1" :string)
-           ("R" "1" :string)
-           ("W" "1" :string)
-           ("C" "1" :string)
-           ("N" "1" :string)
+           ("K" "1" :string)
+           ("G" "1" :string)
+           ("A" "1" :string)
+           ("H" "1" :string)
+           ("Q" "1" :string)
+           ("Z" "1" :string)
+           ("E" "1" :string)
            ("J" "1" :string)
+           ("L" "1" :string)
+           ("M" "1" :string)
            ("V" "1" :string)
-           ("H" "1" :string)
-           ("G" "1" :string)
-           ("K" "1" :string)
+           ("D" "1" :string)
+           ("X" "1" :string)
+           ("T" "1" :string)
+           ("N" "1" :string)
+           ("Y" "1" :string)
+           ("B" "1" :string)
            ("U" "1" :string)
+           ("W" "1" :string)
+           ("C" "1" :string)
            ("O" "1" :string)
            ("P" "1" :string)
-           ("Y" "1" :string)
-           ("B" "1" :string)
-           ("X" "1" :string)
+           ("F" "1" :string)
            ))
 
 (define-rule-set "fi-ignore-special"
 
-  :rules  (("-" "" :string)
-           ("!" "" :string)
-           ("." "" :string)
+  :rules  (("'" "" :string)
+           ("-" "" :string)
            ("?" "" :string)
            ("}" "" :string)
            ("{" "" :string)
-           ("'" "" :string)
+           ("!" "" :string)
+           ("." "" :string)
            ))
 
 (define-rule-set "fi-resolve-special"
 
-  :rules  (("ž" "�" :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)
-           ("l" "�" :string)
-           ("n" "�" :string)
+           ("q" "�" :string)
            ("X" "�" :string)
-           ("r" "�" :string)
-           ("B" "�" :string)
-           ("v" "�" :string)
-           ("U" "�" :string)
-           ("O" "�" :string)
-           ("P" "�" :string)
-           ("Y" "�" :string)
-           ("x" "�" :string)
-           ("u" "�" :string)
-           ("G" "�" :string)
-           ("K" "�" :string)
+           ("D" "�" :string)
            ("V" "�" :string)
-           ("H" "�" :string)
-           ("j" "�" :string)
-           ("k" "�" :string)
+           ("i" "�" :string)
+           ("y" "�" :string)
+           ("m" "�" :string)
+           ("L" "�" :string)
+           ("M" "�" :string)
            ("J" "�" :string)
-           ("q" "�" :string)
-           ("c" "�" :string)
-           ("w" "�" :string)
-           ("N" "�" :string)
-           ("o" "�" :string)
+           ("l" "�" :string)
+           ("E" "�" :string)
+           ("b" "�" :string)
+           ("Q" "�" :string)
+           ("Z" "�" :string)
+           ("h" "�" :string)
+           ("z" "�" :string)
            ("a" "�" :string)
-           ("C" "�" :string)
-           ("W" "�" :string)
-           ("p" "�" :string)
+           ("H" "�" :string)
+           ("k" "�" :string)
+           ("G" "�" :string)
            ("A" "�" :string)
-           ("S" "�" :string)
-           ("z" "�" :string)
+           ("K" "�" :string)
            ("R" "�" :string)
-           ("b" "�" :string)
-           ("h" "�" :string)
            ("g" "�" :string)
-           ("M" "�" :string)
-           ("t" "�" :string)
-           ("D" "�" :string)
-           ("E" "�" :string)
-           ("i" "�" :string)
-           ("f" "�" :string)
+           ("S" "�" :string)
            ("I" "�" :string)
-           ("T" "�" :string)
-           ("L" "�" :string)
-           ("y" "�" :string)
-           ("Q" "�" :string)
-           ("s" "�" :string)
+           ("d" "�" :string)
            ("F" "�" :string)
+           ("P" "�" :string)
+           ("O" "�" :string)
+           ("f" "�" :string)
+           ("n" "�" :string)
+           ("j" "�" :string)
+           ("C" "�" :string)
+           ("o" "�" :string)
            ("e" "�" :string)
-           ("m" "�" :string)
-           ("Z" "�" :string)
-           ("d" "�" :string)
+           ("p" "�" :string)
+           ("W" "�" :string)
+           ("x" "�" :string)
+           ("c" "�" :string)
+           ("U" "�" :string)
+           ("r" "�" :string)
+           ("w" "�" :string)
+           ("B" "�" :string)
+           ("Y" "�" :string)
+           ("s" "�" :string)
+           ("t" "�" :string)
+           ("v" "�" :string)
+           ("T" "�" :string)
+           ("N" "�" :string)
+           ("u" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ("{" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/french/cp1252.xdy b/Master/texmf-dist/xindy/modules/lang/french/cp1252.xdy
index 77b059643e7..978bb1a6f67 100644
--- a/Master/texmf-dist/xindy/modules/lang/french/cp1252.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/french/cp1252.xdy
@@ -30,64 +30,64 @@
 
 (define-rule-set "fr-alphabetize"
 
-  :rules  (("a" "�" :string)
+  :rules  (("�" "�" :string)
+           ("�" "�" :string)
+           ("a" "�" :string)
            ("�" "�" :string)
-           ("A" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("A" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "��" :string)
            ("�" "��" :string)
+           ("�" "��" :string)
            ("B" "�" :string)
            ("b" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("c" "�" :string)
            ("C" "�" :string)
+           ("c" "�" :string)
            ("d" "�" :string)
            ("D" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("e" "�" :string)
-           ("E" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("f" "�" :string)
+           ("E" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("e" "�" :string)
            ("F" "�" :string)
+           ("f" "�" :string)
            ("G" "�" :string)
            ("g" "�" :string)
-           ("h" "�" :string)
            ("H" "�" :string)
-           ("�" "�" :string)
+           ("h" "�" :string)
+           ("I" "�" :string)
            ("i" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("I" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("J" "�" :string)
            ("j" "�" :string)
-           ("k" "�" :string)
            ("K" "�" :string)
+           ("k" "�" :string)
            ("l" "�" :string)
            ("L" "�" :string)
-           ("M" "�" :string)
            ("m" "�" :string)
-           ("�" "�" :string)
+           ("M" "�" :string)
            ("n" "�" :string)
            ("N" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("o" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("O" "�" :string)
            ("�" "�" :string)
+           ("o" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "×" :string)
            ("�" "×" :string)
            ("p" "�" :string)
@@ -96,227 +96,227 @@
            ("Q" "�" :string)
            ("R" "�" :string)
            ("r" "�" :string)
-           ("s" "�" :string)
            ("S" "�" :string)
+           ("s" "�" :string)
            ("t" "�" :string)
            ("T" "�" :string)
-           ("�" "�" :string)
            ("U" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("u" "�" :string)
            ("�" "�" :string)
-           ("V" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("v" "�" :string)
+           ("V" "�" :string)
            ("w" "�" :string)
            ("W" "�" :string)
-           ("X" "�" :string)
            ("x" "�" :string)
-           ("y" "�" :string)
-           ("Y" "�" :string)
+           ("X" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
+           ("Y" "�" :string)
+           ("y" "�" :string)
            ("z" "�" :string)
            ("Z" "�" :string)
            ))
 
 (define-rule-set "fr-resolve-diacritics"
 
-  :rules  (("G" "�" :string)
-           ("q" "�" :string)
+  :rules  (("e" "�" :string)
+           ("L" "�" :string)
+           ("W" "�" :string)
+           ("y" "�" :string)
+           ("Q" "�" :string)
+           ("b" "�" :string)
+           ("l" "�" :string)
+           ("h" "�" :string)
+           ("s" "�" :string)
+           ("M" "�" :string)
+           ("T" "�" :string)
+           ("B" "�" :string)
+           ("g" "�" :string)
+           ("D" "�" :string)
+           ("Y" "�" :string)
            ("k" "�" :string)
+           ("j" "�" :string)
            ("A" "�" :string)
-           ("p" "�" :string)
-           ("P" "�" :string)
-           ("S" "�" :string)
-           ("i" "�" :string)
-           ("Y" "�" :string)
-           ("g" "�" :string)
            ("f" "�" :string)
-           ("j" "�" :string)
-           ("R" "�" :string)
-           ("o" "�" :string)
-           ("x" "�" :string)
-           ("t" "�" :string)
-           ("X" "�" :string)
-           ("y" "�" :string)
-           ("a" "�" :string)
-           ("s" "�" :string)
-           ("U" "�" :string)
-           ("l" "�" :string)
-           ("d" "�" :string)
-           ("J" "�" :string)
            ("E" "�" :string)
-           ("I" "�" :string)
-           ("e" "�" :string)
-           ("v" "�" :string)
            ("Z" "�" :string)
-           ("H" "�" :string)
-           ("b" "�" :string)
-           ("C" "�" :string)
-           ("W" "�" :string)
-           ("Q" "�" :string)
-           ("c" "�" :string)
-           ("T" "�" :string)
+           ("V" "�" :string)
+           ("X" "�" :string)
+           ("P" "�" :string)
+           ("x" "�" :string)
+           ("a" "�" :string)
+           ("z" "�" :string)
+           ("r" "�" :string)
            ("m" "�" :string)
            ("w" "�" :string)
-           ("r" "�" :string)
-           ("h" "�" :string)
-           ("D" "�" :string)
-           ("L" "�" :string)
-           ("n" "�" :string)
-           ("F" "�" :string)
            ("K" "�" :string)
-           ("V" "�" :string)
+           ("F" "�" :string)
+           ("S" "�" :string)
+           ("t" "�" :string)
+           ("i" "�" :string)
+           ("C" "�" :string)
+           ("c" "�" :string)
+           ("o" "�" :string)
+           ("v" "�" :string)
+           ("q" "�" :string)
+           ("u" "�" :string)
            ("O" "�" :string)
-           ("z" "�" :string)
+           ("J" "�" :string)
            ("N" "�" :string)
-           ("u" "�" :string)
-           ("M" "�" :string)
-           ("B" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("H" "�" :string)
+           ("n" "�" :string)
+           ("U" "�" :string)
+           ("I" "�" :string)
+           ("p" "�" :string)
+           ("R" "�" :string)
+           ("d" "�" :string)
+           ("G" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :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 "fr-resolve-case"
 
-  :rules  (("J" "8" :string)
+  :rules  (("�" "8" :string)
+           ("K" "8" :string)
+           ("�" "8" :string)
+           ("F" "8" :string)
+           ("�" "8" :string)
+           ("S" "8" :string)
+           ("C" "8" :string)
+           ("�" "8" :string)
+           ("J" "8" :string)
+           ("�" "8" :string)
+           ("O" "8" :string)
            ("�" "8" :string)
-           ("U" "8" :string)
-           ("X" "8" :string)
+           ("N" "8" :string)
+           ("H" "8" :string)
+           ("I" "8" :string)
            ("�" "8" :string)
-           ("Y" "8" :string)
            ("�" "8" :string)
-           ("R" "8" :string)
-           ("�" "8" :string)
-           ("S" "8" :string)
-           ("P" "8" :string)
-           ("�" "8" :string)
+           ("U" "8" :string)
            ("G" "8" :string)
-           ("�" "8" :string)
-           ("A" "8" :string)
-           ("�" "8" :string)
-           ("B" "8" :string)
-           ("�" "8" :string)
-           ("M" "8" :string)
-           ("N" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("V" "8" :string)
-           ("K" "8" :string)
-           ("O" "8" :string)
-           ("D" "8" :string)
-           ("F" "8" :string)
+           ("R" "8" :string)
            ("L" "8" :string)
-           ("�" "8" :string)
-           ("Q" "8" :string)
+           ("�" "8" :string)
            ("W" "8" :string)
-           ("C" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
+           ("Q" "8" :string)
+           ("�" "8" :string)
            ("T" "8" :string)
-           ("Z" "8" :string)
-           ("H" "8" :string)
-           ("�" "8" :string)
+           ("M" "8" :string)
+           ("D" "8" :string)
+           ("�" "8" :string)
+           ("B" "8" :string)
+           ("Y" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("A" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
            ("E" "8" :string)
-           ("�" "8" :string)
-           ("I" "8" :string)
+           ("Z" "8" :string)
+           ("V" "8" :string)
+           ("X" "8" :string)
+           ("�" "8" :string)
+           ("P" "8" :string)
+           ("�" "8" :string)
            ("�" "89" :string)
            ("�" "89" :string)
-           ("d" "9" :string)
-           ("�" "9" :string)
-           ("l" "9" :string)
-           ("s" "9" :string)
-           ("a" "9" :string)
-           ("�" "9" :string)
+           ("w" "9" :string)
+           ("m" "9" :string)
            ("t" "9" :string)
-           ("x" "9" :string)
-           ("y" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("g" "9" :string)
-           ("i" "9" :string)
+           ("c" "9" :string)
            ("o" "9" :string)
-           ("j" "9" :string)
-           ("f" "9" :string)
-           ("�" "9" :string)
+           ("i" "9" :string)
+           ("v" "9" :string)
+           ("u" "9" :string)
+           ("q" "9" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
+           ("�" "9" :string)
+           ("n" "9" :string)
            ("p" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("k" "9" :string)
-           ("q" "9" :string)
+           ("d" "9" :string)
+           ("e" "9" :string)
+           ("�" "9" :string)
+           ("y" "9" :string)
+           ("l" "9" :string)
+           ("b" "9" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
-           ("u" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("z" "9" :string)
            ("h" "9" :string)
-           ("r" "9" :string)
-           ("w" "9" :string)
-           ("�" "9" :string)
-           ("n" "9" :string)
-           ("c" "9" :string)
-           ("b" "9" :string)
-           ("m" "9" :string)
+           ("s" "9" :string)
+           ("�" "9" :string)
+           ("g" "9" :string)
+           ("�" "9" :string)
+           ("k" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("j" "9" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("f" "9" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
-           ("e" "9" :string)
-           ("v" "9" :string)
-           ("�" "99" :string)
+           ("�" "9" :string)
+           ("x" "9" :string)
+           ("�" "9" :string)
+           ("r" "9" :string)
+           ("z" "9" :string)
+           ("a" "9" :string)
            ("�" "99" :string)
+           ("�" "99" :string)
            ))
 
 (define-rule-set "fr-ignore-special"
 
-  :rules  (("'" "" :string)
+  :rules  (("!" "" :string)
+           ("-" "" :string)
+           ("'" "" :string)
            ("." "" :string)
-           ("!" "" :string)
            ("?" "" :string)
-           ("-" "" :string)
            ))
 
 (define-rule-set "fr-resolve-special"
@@ -324,95 +324,95 @@
   :rules  (("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("�" "�" :string)
-           ("l" "�" :string)
-           ("�" "�" :string)
-           ("d" "�" :string)
            ("J" "�" :string)
-           ("x" "�" :string)
-           ("t" "�" :string)
-           ("�" "�" :string)
-           ("X" "�" :string)
-           ("�" "�" :string)
-           ("y" "�" :string)
+           ("O" "�" :string)
+           ("�" "�" :string)
+           ("N" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("a" "�" :string)
-           ("s" "�" :string)
-           ("U" "�" :string)
-           ("�" "�" :string)
-           ("P" "�" :string)
-           ("S" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("i" "�" :string)
-           ("Y" "�" :string)
-           ("g" "�" :string)
-           ("�" "�" :string)
-           ("f" "�" :string)
+           ("H" "�" :string)
+           ("n" "�" :string)
+           ("�" "�" :string)
+           ("I" "�" :string)
+           ("U" "�" :string)
            ("�" "�" :string)
+           ("p" "�" :string)
+           ("d" "�" :string)
+           ("G" "�" :string)
            ("R" "�" :string)
-           ("j" "�" :string)
+           ("�" "�" :string)
+           ("m" "�" :string)
+           ("w" "�" :string)
+           ("�" "�" :string)
+           ("K" "�" :string)
+           ("F" "�" :string)
+           ("S" "�" :string)
+           ("t" "�" :string)
+           ("�" "�" :string)
+           ("i" "�" :string)
+           ("C" "�" :string)
            ("o" "�" :string)
-           ("G" "�" :string)
+           ("c" "�" :string)
+           ("�" "�" :string)
+           ("v" "�" :string)
            ("q" "�" :string)
-           ("k" "�" :string)
-           ("A" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("p" "�" :string)
-           ("N" "�" :string)
            ("u" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("M" "�" :string)
-           ("B" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("r" "�" :string)
-           ("w" "�" :string)
-           ("h" "�" :string)
-           ("D" "�" :string)
-           ("F" "�" :string)
-           ("n" "�" :string)
-           ("L" "�" :string)
+           ("j" "�" :string)
+           ("�" "�" :string)
+           ("A" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("O" "�" :string)
-           ("V" "�" :string)
-           ("K" "�" :string)
-           ("z" "�" :string)
+           ("�" "�" :string)
+           ("f" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("E" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("Z" "�" :string)
-           ("�" "�" :string)
-           ("H" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("V" "�" :string)
+           ("X" "�" :string)
+           ("x" "�" :string)
+           ("�" "�" :string)
+           ("P" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("b" "�" :string)
-           ("C" "�" :string)
+           ("�" "�" :string)
+           ("r" "�" :string)
+           ("z" "�" :string)
+           ("a" "�" :string)
+           ("e" "�" :string)
+           ("�" "�" :string)
+           ("L" "�" :string)
            ("W" "�" :string)
+           ("�" "�" :string)
            ("Q" "�" :string)
-           ("�" "�" :string)
-           ("c" "�" :string)
-           ("T" "�" :string)
-           ("�" "�" :string)
-           ("m" "�" :string)
-           ("E" "�" :string)
-           ("I" "�" :string)
-           ("�" "�" :string)
-           ("e" "�" :string)
-           ("v" "�" :string)
+           ("y" "�" :string)
+           ("l" "�" :string)
+           ("�" "�" :string)
+           ("b" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "��" :string)
-           ("�" "��" :string)
+           ("�" "�" :string)
+           ("h" "�" :string)
+           ("T" "�" :string)
+           ("M" "�" :string)
+           ("s" "�" :string)
+           ("D" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("g" "�" :string)
+           ("B" "�" :string)
+           ("�" "�" :string)
+           ("Y" "�" :string)
+           ("�" "�" :string)
+           ("k" "�" :string)
+           ("�" "�" :string)
            ("�" "��" :string)
+           ("�" "��" :string)
+           ("�" "��" :string)
            ("�" "��" :string)
            ("-" "�" :string)
            ("'" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/french/latin9.xdy b/Master/texmf-dist/xindy/modules/lang/french/latin9.xdy
index 2930c7d6f27..35057356731 100644
--- a/Master/texmf-dist/xindy/modules/lang/french/latin9.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/french/latin9.xdy
@@ -30,293 +30,293 @@
 
 (define-rule-set "fr-alphabetize"
 
-  :rules  (("�" "�" :string)
-           ("A" "�" :string)
+  :rules  (("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("a" "�" :string)
-           ("�" "�" :string)
-           ("�" "��" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("A" "�" :string)
+           ("�" "�" :string)
            ("�" "��" :string)
+           ("�" "��" :string)
            ("B" "�" :string)
            ("b" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
            ("c" "�" :string)
            ("C" "�" :string)
+           ("�" "�" :string)
            ("D" "�" :string)
            ("d" "�" :string)
-           ("E" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("e" "�" :string)
+           ("E" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("F" "�" :string)
+           ("e" "�" :string)
            ("f" "�" :string)
-           ("g" "�" :string)
+           ("F" "�" :string)
            ("G" "�" :string)
-           ("H" "�" :string)
+           ("g" "�" :string)
            ("h" "�" :string)
-           ("I" "�" :string)
+           ("H" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("i" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("J" "�" :string)
+           ("�" "�" :string)
+           ("I" "�" :string)
            ("j" "�" :string)
+           ("J" "�" :string)
            ("K" "�" :string)
            ("k" "�" :string)
-           ("L" "�" :string)
            ("l" "�" :string)
-           ("M" "�" :string)
+           ("L" "�" :string)
            ("m" "�" :string)
-           ("�" "�" :string)
+           ("M" "�" :string)
            ("n" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("N" "�" :string)
            ("o" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("O" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "×" :string)
            ("�" "×" :string)
+           ("�" "×" :string)
            ("p" "�" :string)
            ("P" "�" :string)
-           ("q" "�" :string)
            ("Q" "�" :string)
+           ("q" "�" :string)
            ("R" "�" :string)
            ("r" "�" :string)
            ("S" "�" :string)
            ("s" "�" :string)
            ("T" "�" :string)
            ("t" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("u" "�" :string)
-           ("�" "�" :string)
-           ("U" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("U" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("v" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("V" "�" :string)
-           ("w" "�" :string)
+           ("v" "�" :string)
            ("W" "�" :string)
+           ("w" "�" :string)
            ("X" "�" :string)
            ("x" "�" :string)
-           ("Y" "�" :string)
            ("y" "�" :string)
            ("�" "�" :string)
+           ("Y" "�" :string)
            ("�" "�" :string)
-           ("z" "�" :string)
            ("Z" "�" :string)
+           ("z" "�" :string)
            ))
 
 (define-rule-set "fr-resolve-diacritics"
 
-  :rules  (("A" "�" :string)
-           ("i" "�" :string)
-           ("G" "�" :string)
-           ("D" "�" :string)
-           ("Z" "�" :string)
-           ("w" "�" :string)
-           ("y" "�" :string)
+  :rules  (("P" "�" :string)
+           ("C" "�" :string)
+           ("V" "�" :string)
+           ("j" "�" :string)
+           ("m" "�" :string)
+           ("E" "�" :string)
+           ("S" "�" :string)
            ("n" "�" :string)
-           ("x" "�" :string)
+           ("Q" "�" :string)
+           ("o" "�" :string)
+           ("u" "�" :string)
+           ("q" "�" :string)
+           ("a" "�" :string)
            ("t" "�" :string)
-           ("s" "�" :string)
+           ("Z" "�" :string)
            ("l" "�" :string)
-           ("L" "�" :string)
-           ("z" "�" :string)
-           ("J" "�" :string)
-           ("B" "�" :string)
-           ("X" "�" :string)
+           ("y" "�" :string)
            ("T" "�" :string)
-           ("U" "�" :string)
-           ("I" "�" :string)
-           ("H" "�" :string)
-           ("E" "�" :string)
-           ("g" "�" :string)
-           ("o" "�" :string)
-           ("R" "�" :string)
            ("K" "�" :string)
+           ("W" "�" :string)
+           ("D" "�" :string)
+           ("h" "�" :string)
+           ("G" "�" :string)
+           ("c" "�" :string)
+           ("U" "�" :string)
+           ("p" "�" :string)
+           ("e" "�" :string)
            ("v" "�" :string)
-           ("Y" "�" :string)
-           ("u" "�" :string)
            ("O" "�" :string)
-           ("S" "�" :string)
-           ("M" "�" :string)
-           ("P" "�" :string)
-           ("C" "�" :string)
-           ("e" "�" :string)
-           ("N" "�" :string)
-           ("Q" "�" :string)
-           ("a" "�" :string)
-           ("m" "�" :string)
-           ("r" "�" :string)
+           ("d" "�" :string)
+           ("x" "�" :string)
+           ("w" "�" :string)
+           ("g" "�" :string)
+           ("R" "�" :string)
+           ("I" "�" :string)
            ("k" "�" :string)
+           ("b" "�" :string)
+           ("r" "�" :string)
+           ("i" "�" :string)
            ("f" "�" :string)
-           ("W" "�" :string)
+           ("H" "�" :string)
+           ("A" "�" :string)
+           ("M" "�" :string)
+           ("J" "�" :string)
+           ("N" "�" :string)
+           ("s" "�" :string)
+           ("X" "�" :string)
+           ("B" "�" :string)
+           ("L" "�" :string)
+           ("Y" "�" :string)
+           ("z" "�" :string)
            ("F" "�" :string)
-           ("p" "�" :string)
-           ("j" "�" :string)
-           ("c" "�" :string)
-           ("b" "�" :string)
-           ("V" "�" :string)
-           ("d" "�" :string)
-           ("h" "�" :string)
-           ("q" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :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 "fr-resolve-case"
 
-  :rules  (("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("V" "8" :string)
-           ("�" "8" :string)
-           ("Q" "8" :string)
-           ("N" "8" :string)
-           ("P" "8" :string)
-           ("C" "8" :string)
-           ("M" "8" :string)
+  :rules  (("D" "8" :string)
            ("W" "8" :string)
-           ("F" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("O" "8" :string)
-           ("S" "8" :string)
-           ("R" "8" :string)
            ("K" "8" :string)
-           ("Y" "8" :string)
-           ("I" "8" :string)
-           ("U" "8" :string)
-           ("�" "8" :string)
            ("�" "8" :string)
-           ("H" "8" :string)
+           ("�" "8" :string)
+           ("U" "8" :string)
+           ("G" "8" :string)
+           ("�" "8" :string)
+           ("Q" "8" :string)
+           ("�" "8" :string)
+           ("S" "8" :string)
+           ("T" "8" :string)
+           ("�" "8" :string)
+           ("Z" "8" :string)
            ("E" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
-           ("J" "8" :string)
-           ("L" "8" :string)
+           ("�" "8" :string)
+           ("P" "8" :string)
            ("�" "8" :string)
-           ("T" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("V" "8" :string)
+           ("�" "8" :string)
+           ("C" "8" :string)
            ("X" "8" :string)
            ("B" "8" :string)
-           ("�" "8" :string)
-           ("Z" "8" :string)
-           ("G" "8" :string)
+           ("N" "8" :string)
+           ("F" "8" :string)
+           ("�" "8" :string)
+           ("Y" "8" :string)
+           ("L" "8" :string)
+           ("�" "8" :string)
+           ("M" "8" :string)
+           ("�" "8" :string)
            ("A" "8" :string)
-           ("D" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
+           ("H" "8" :string)
+           ("J" "8" :string)
+           ("R" "8" :string)
+           ("I" "8" :string)
+           ("�" "8" :string)
+           ("O" "8" :string)
+           ("�" "8" :string)
            ("�" "89" :string)
            ("�" "89" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("q" "9" :string)
-           ("�" "9" :string)
-           ("h" "9" :string)
-           ("�" "9" :string)
            ("�" "9" :string)
-           ("b" "9" :string)
-           ("j" "9" :string)
-           ("c" "9" :string)
            ("p" "9" :string)
-           ("�" "9" :string)
-           ("d" "9" :string)
-           ("�" "9" :string)
-           ("e" "9" :string)
-           ("�" "9" :string)
-           ("f" "9" :string)
-           ("r" "9" :string)
-           ("k" "9" :string)
-           ("�" "9" :string)
-           ("a" "9" :string)
-           ("m" "9" :string)
-           ("�" "9" :string)
-           ("o" "9" :string)
-           ("�" "9" :string)
-           ("u" "9" :string)
            ("�" "9" :string)
-           ("v" "9" :string)
-           ("g" "9" :string)
-           ("z" "9" :string)
-           ("�" "9" :string)
-           ("w" "9" :string)
-           ("y" "9" :string)
+           ("c" "9" :string)
+           ("h" "9" :string)
+           ("u" "9" :string)
+           ("o" "9" :string)
            ("n" "9" :string)
-           ("i" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("y" "9" :string)
            ("�" "9" :string)
            ("l" "9" :string)
-           ("s" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("t" "9" :string)
            ("�" "9" :string)
+           ("a" "9" :string)
+           ("q" "9" :string)
+           ("m" "9" :string)
+           ("j" "9" :string)
+           ("�" "9" :string)
+           ("s" "9" :string)
+           ("�" "9" :string)
+           ("z" "9" :string)
            ("�" "9" :string)
-           ("t" "9" :string)
+           ("i" "9" :string)
+           ("f" "9" :string)
            ("�" "9" :string)
+           ("�" "9" :string)
+           ("g" "9" :string)
+           ("w" "9" :string)
+           ("r" "9" :string)
+           ("�" "9" :string)
+           ("b" "9" :string)
+           ("k" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("v" "9" :string)
+           ("e" "9" :string)
            ("x" "9" :string)
+           ("d" "9" :string)
            ("�" "99" :string)
            ("�" "99" :string)
            ))
 
 (define-rule-set "fr-ignore-special"
 
-  :rules  (("?" "" :string)
-           ("." "" :string)
+  :rules  (("." "" :string)
+           ("'" "" :string)
            ("-" "" :string)
+           ("?" "" :string)
            ("!" "" :string)
-           ("'" "" :string)
            ))
 
 (define-rule-set "fr-resolve-special"
@@ -324,96 +324,96 @@
   :rules  (("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("h" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("S" "�" :string)
+           ("�" "�" :string)
+           ("u" "�" :string)
+           ("Q" "�" :string)
+           ("o" "�" :string)
+           ("n" "�" :string)
+           ("t" "�" :string)
+           ("�" "�" :string)
+           ("a" "�" :string)
+           ("q" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("q" "�" :string)
+           ("y" "�" :string)
+           ("T" "�" :string)
+           ("Z" "�" :string)
+           ("�" "�" :string)
+           ("l" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("M" "�" :string)
-           ("Q" "�" :string)
-           ("N" "�" :string)
-           ("e" "�" :string)
-           ("�" "�" :string)
-           ("C" "�" :string)
-           ("P" "�" :string)
-           ("�" "�" :string)
-           ("r" "�" :string)
-           ("k" "�" :string)
-           ("m" "�" :string)
-           ("a" "�" :string)
            ("�" "�" :string)
-           ("F" "�" :string)
+           ("�" "�" :string)
+           ("K" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("D" "�" :string)
            ("W" "�" :string)
-           ("f" "�" :string)
+           ("G" "�" :string)
+           ("h" "�" :string)
+           ("�" "�" :string)
            ("p" "�" :string)
-           ("�" "�" :string)
-           ("b" "�" :string)
-           ("�" "�" :string)
+           ("U" "�" :string)
            ("c" "�" :string)
-           ("j" "�" :string)
+           ("�" "�" :string)
+           ("P" "�" :string)
+           ("�" "�" :string)
+           ("C" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("V" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("d" "�" :string)
-           ("U" "�" :string)
-           ("I" "�" :string)
+           ("�" "�" :string)
+           ("j" "�" :string)
+           ("�" "�" :string)
            ("E" "�" :string)
+           ("m" "�" :string)
            ("H" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("g" "�" :string)
-           ("o" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("u" "�" :string)
-           ("�" "�" :string)
-           ("Y" "�" :string)
-           ("v" "�" :string)
-           ("�" "�" :string)
-           ("R" "�" :string)
-           ("K" "�" :string)
-           ("S" "�" :string)
-           ("O" "�" :string)
-           ("n" "�" :string)
-           ("y" "�" :string)
-           ("w" "�" :string)
-           ("Z" "�" :string)
-           ("D" "�" :string)
-           ("�" "�" :string)
            ("i" "�" :string)
+           ("f" "�" :string)
+           ("M" "�" :string)
+           ("�" "�" :string)
            ("A" "�" :string)
-           ("G" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("t" "�" :string)
            ("�" "�" :string)
-           ("x" "�" :string)
-           ("l" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("s" "�" :string)
-           ("L" "�" :string)
            ("J" "�" :string)
-           ("z" "�" :string)
+           ("�" "�" :string)
+           ("N" "�" :string)
            ("B" "�" :string)
-           ("T" "�" :string)
-           ("�" "�" :string)
            ("X" "�" :string)
+           ("�" "�" :string)
+           ("s" "�" :string)
+           ("Y" "�" :string)
+           ("z" "�" :string)
+           ("�" "�" :string)
+           ("L" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("F" "�" :string)
+           ("�" "�" :string)
+           ("O" "�" :string)
+           ("v" "�" :string)
+           ("e" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("d" "�" :string)
+           ("�" "�" :string)
+           ("x" "�" :string)
+           ("�" "�" :string)
+           ("R" "�" :string)
+           ("g" "�" :string)
+           ("w" "�" :string)
+           ("k" "�" :string)
+           ("I" "�" :string)
+           ("r" "�" :string)
+           ("�" "�" :string)
+           ("b" "�" :string)
            ("�" "��" :string)
            ("�" "��" :string)
-           ("�" "��" :string)
            ("�" "��" :string)
+           ("�" "��" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/french/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/french/utf8.xdy
index eec8e87cd4d..84c833ffe12 100644
--- a/Master/texmf-dist/xindy/modules/lang/french/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/french/utf8.xdy
@@ -30,74 +30,74 @@
 
 (define-rule-set "fr-alphabetize"
 
-  :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)
-           ("a" "�" :string)
            ("A" "�" :string)
+           ("a" "�" :string)
            ("b" "�" :string)
            ("B" "�" :string)
-           ("c" "�" :string)
            ("C" "�" :string)
-           ("D" "�" :string)
+           ("c" "�" :string)
            ("d" "�" :string)
+           ("D" "�" :string)
            ("E" "�" :string)
            ("e" "�" :string)
            ("f" "�" :string)
            ("F" "�" :string)
            ("G" "�" :string)
            ("g" "�" :string)
-           ("H" "�" :string)
            ("h" "�" :string)
+           ("H" "�" :string)
            ("I" "�" :string)
            ("i" "�" :string)
-           ("J" "�" :string)
            ("j" "�" :string)
-           ("K" "�" :string)
+           ("J" "�" :string)
            ("k" "�" :string)
+           ("K" "�" :string)
            ("l" "�" :string)
            ("L" "�" :string)
-           ("m" "�" :string)
            ("M" "�" :string)
+           ("m" "�" :string)
            ("n" "�" :string)
            ("N" "�" :string)
-           ("O" "�" :string)
            ("o" "�" :string)
+           ("O" "�" :string)
            ("P" "�" :string)
            ("p" "�" :string)
            ("q" "�" :string)
@@ -106,314 +106,314 @@
            ("R" "�" :string)
            ("s" "�" :string)
            ("S" "�" :string)
-           ("t" "�" :string)
            ("T" "�" :string)
+           ("t" "�" :string)
            ("u" "�" :string)
            ("U" "�" :string)
-           ("V" "�" :string)
            ("v" "�" :string)
+           ("V" "�" :string)
            ("W" "�" :string)
            ("w" "�" :string)
            ("X" "�" :string)
            ("x" "�" :string)
-           ("Y" "�" :string)
            ("y" "�" :string)
+           ("Y" "�" :string)
            ("z" "�" :string)
            ("Z" "�" :string)
            ))
 
 (define-rule-set "fr-resolve-diacritics"
 
-  :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)
+           ("ä" "�" :string)
+           ("ü" "�" :string)
            ("ë" "�" :string)
+           ("Ë" "�" :string)
+           ("Æ" "�" :string)
            ("Œ" "�" :string)
-           ("æ" "�" :string)
            ("œ" "�" :string)
-           ("Æ" "�" :string)
-           ("O" "�" :string)
+           ("æ" "�" :string)
+           ("j" "�" :string)
+           ("n" "�" :string)
+           ("s" "�" :string)
            ("E" "�" :string)
-           ("H" "�" :string)
-           ("x" "�" :string)
-           ("q" "�" :string)
+           ("I" "�" :string)
+           ("u" "�" :string)
+           ("A" "�" :string)
+           ("b" "�" :string)
+           ("U" "�" :string)
+           ("X" "�" :string)
            ("h" "�" :string)
+           ("y" "�" :string)
+           ("z" "�" :string)
            ("o" "�" :string)
-           ("K" "�" :string)
-           ("V" "�" :string)
-           ("X" "�" :string)
-           ("I" "�" :string)
-           ("m" "�" :string)
-           ("M" "�" :string)
-           ("P" "�" :string)
            ("v" "�" :string)
+           ("M" "�" :string)
+           ("m" "�" :string)
            ("G" "�" :string)
-           ("f" "�" :string)
-           ("c" "�" :string)
-           ("z" "�" :string)
-           ("i" "�" :string)
-           ("b" "�" :string)
+           ("J" "�" :string)
+           ("d" "�" :string)
            ("Z" "�" :string)
            ("C" "�" :string)
+           ("r" "�" :string)
+           ("P" "�" :string)
+           ("e" "�" :string)
+           ("a" "�" :string)
+           ("x" "�" :string)
+           ("i" "�" :string)
+           ("B" "�" :string)
            ("R" "�" :string)
+           ("O" "�" :string)
            ("Y" "�" :string)
-           ("U" "�" :string)
+           ("q" "�" :string)
            ("S" "�" :string)
-           ("d" "�" :string)
-           ("w" "�" :string)
-           ("y" "�" :string)
-           ("T" "�" :string)
-           ("Q" "�" :string)
-           ("J" "�" :string)
-           ("s" "�" :string)
-           ("t" "�" :string)
+           ("K" "�" :string)
+           ("W" "�" :string)
            ("k" "�" :string)
-           ("r" "�" :string)
+           ("Q" "�" :string)
            ("D" "�" :string)
+           ("c" "�" :string)
+           ("w" "�" :string)
            ("l" "�" :string)
-           ("u" "�" :string)
-           ("L" "�" :string)
-           ("e" "�" :string)
+           ("g" "�" :string)
            ("p" "�" :string)
-           ("W" "�" :string)
-           ("j" "�" :string)
+           ("T" "�" :string)
+           ("f" "�" :string)
            ("N" "�" :string)
-           ("g" "�" :string)
-           ("n" "�" :string)
-           ("A" "�" :string)
-           ("a" "�" :string)
+           ("L" "�" :string)
            ("F" "�" :string)
-           ("B" "�" :string)
+           ("H" "�" :string)
+           ("t" "�" :string)
+           ("V" "�" :string)
            ))
 
 (define-rule-set "fr-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)
+           ("Û" "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)
-           ("Œ" "89" :string)
+           ("È" "8" :string)
            ("Æ" "89" :string)
+           ("Œ" "89" :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)
            ("æ" "99" :string)
            ("œ" "99" :string)
-           ("X" "8" :string)
-           ("I" "8" :string)
-           ("V" "8" :string)
-           ("G" "8" :string)
-           ("P" "8" :string)
-           ("M" "8" :string)
-           ("E" "8" :string)
-           ("H" "8" :string)
-           ("O" "8" :string)
-           ("K" "8" :string)
+           ("T" "8" :string)
            ("D" "8" :string)
-           ("J" "8" :string)
-           ("A" "8" :string)
-           ("F" "8" :string)
-           ("B" "8" :string)
-           ("N" "8" :string)
-           ("W" "8" :string)
+           ("H" "8" :string)
+           ("V" "8" :string)
            ("L" "8" :string)
+           ("N" "8" :string)
+           ("F" "8" :string)
            ("S" "8" :string)
-           ("Y" "8" :string)
-           ("U" "8" :string)
+           ("K" "8" :string)
+           ("W" "8" :string)
+           ("Q" "8" :string)
+           ("B" "8" :string)
            ("R" "8" :string)
+           ("Y" "8" :string)
+           ("O" "8" :string)
            ("Z" "8" :string)
            ("C" "8" :string)
-           ("T" "8" :string)
-           ("Q" "8" :string)
-           ("m" "9" :string)
-           ("b" "9" :string)
-           ("z" "9" :string)
-           ("i" "9" :string)
-           ("v" "9" :string)
+           ("P" "8" :string)
+           ("X" "8" :string)
+           ("U" "8" :string)
+           ("I" "8" :string)
+           ("E" "8" :string)
+           ("A" "8" :string)
+           ("G" "8" :string)
+           ("J" "8" :string)
+           ("M" "8" :string)
+           ("p" "9" :string)
            ("f" "9" :string)
-           ("c" "9" :string)
-           ("x" "9" :string)
-           ("q" "9" :string)
-           ("o" "9" :string)
-           ("h" "9" :string)
            ("l" "9" :string)
-           ("u" "9" :string)
-           ("s" "9" :string)
+           ("w" "9" :string)
+           ("c" "9" :string)
+           ("g" "9" :string)
            ("t" "9" :string)
+           ("x" "9" :string)
+           ("i" "9" :string)
            ("k" "9" :string)
+           ("q" "9" :string)
            ("r" "9" :string)
-           ("g" "9" :string)
-           ("n" "9" :string)
            ("a" "9" :string)
-           ("j" "9" :string)
            ("e" "9" :string)
-           ("p" "9" :string)
-           ("d" "9" :string)
-           ("w" "9" :string)
            ("y" "9" :string)
+           ("h" "9" :string)
+           ("z" "9" :string)
+           ("j" "9" :string)
+           ("s" "9" :string)
+           ("n" "9" :string)
+           ("b" "9" :string)
+           ("u" "9" :string)
+           ("d" "9" :string)
+           ("o" "9" :string)
+           ("v" "9" :string)
+           ("m" "9" :string)
            ))
 
 (define-rule-set "fr-ignore-special"
 
-  :rules  (("?" "" :string)
+  :rules  (("'" "" :string)
            ("!" "" :string)
            ("." "" :string)
+           ("?" "" :string)
            ("-" "" :string)
-           ("'" "" :string)
            ))
 
 (define-rule-set "fr-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)
            ("Ÿ" "�" :string)
-           ("Ê" "�" :string)
+           ("ä" "�" :string)
+           ("À" "�" :string)
            ("Ü" "�" :string)
-           ("ç" "�" :string)
-           ("Ñ" "�" :string)
+           ("Ê" "�" :string)
            ("ê" "�" :string)
-           ("Ï" "�" :string)
-           ("Ä" "�" :string)
-           ("è" "�" :string)
-           ("ë" "�" :string)
-           ("ñ" "�" :string)
+           ("ü" "�" :string)
+           ("Ö" "�" :string)
+           ("î" "�" :string)
+           ("É" "�" :string)
            ("é" "�" :string)
+           ("Û" "�" :string)
            ("Â" "�" :string)
-           ("ï" "�" :string)
-           ("à" "�" :string)
-           ("ô" "�" :string)
+           ("Ë" "�" :string)
+           ("ñ" "�" :string)
+           ("Ç" "�" :string)
+           ("Æ" "��" :string)
            ("Œ" "��" :string)
-           ("æ" "��" :string)
            ("œ" "��" :string)
-           ("Æ" "��" :string)
+           ("æ" "��" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("h" "�" :string)
-           ("K" "�" :string)
-           ("o" "�" :string)
-           ("O" "�" :string)
-           ("E" "�" :string)
-           ("H" "�" :string)
-           ("x" "�" :string)
-           ("q" "�" :string)
-           ("v" "�" :string)
+           ("C" "�" :string)
+           ("Z" "�" :string)
+           ("r" "�" :string)
+           ("e" "�" :string)
            ("P" "�" :string)
-           ("f" "�" :string)
-           ("G" "�" :string)
-           ("c" "�" :string)
-           ("M" "�" :string)
+           ("a" "�" :string)
+           ("A" "�" :string)
+           ("u" "�" :string)
            ("b" "�" :string)
-           ("z" "�" :string)
-           ("i" "�" :string)
-           ("V" "�" :string)
-           ("m" "�" :string)
-           ("X" "�" :string)
+           ("s" "�" :string)
+           ("n" "�" :string)
+           ("E" "�" :string)
            ("I" "�" :string)
+           ("j" "�" :string)
+           ("z" "�" :string)
+           ("h" "�" :string)
            ("y" "�" :string)
-           ("T" "�" :string)
-           ("Q" "�" :string)
-           ("R" "�" :string)
-           ("Z" "�" :string)
-           ("C" "�" :string)
-           ("S" "�" :string)
+           ("U" "�" :string)
+           ("X" "�" :string)
+           ("M" "�" :string)
+           ("m" "�" :string)
+           ("v" "�" :string)
+           ("o" "�" :string)
            ("d" "�" :string)
+           ("J" "�" :string)
+           ("G" "�" :string)
+           ("g" "�" :string)
+           ("c" "�" :string)
+           ("l" "�" :string)
            ("w" "�" :string)
-           ("Y" "�" :string)
-           ("U" "�" :string)
-           ("W" "�" :string)
-           ("e" "�" :string)
-           ("L" "�" :string)
+           ("D" "�" :string)
+           ("T" "�" :string)
+           ("f" "�" :string)
            ("p" "�" :string)
-           ("g" "�" :string)
-           ("A" "�" :string)
-           ("n" "�" :string)
-           ("a" "�" :string)
            ("F" "�" :string)
-           ("B" "�" :string)
-           ("j" "�" :string)
            ("N" "�" :string)
+           ("L" "�" :string)
+           ("V" "�" :string)
            ("t" "�" :string)
-           ("s" "�" :string)
-           ("r" "�" :string)
+           ("H" "�" :string)
+           ("i" "�" :string)
+           ("x" "�" :string)
+           ("O" "�" :string)
+           ("Y" "�" :string)
+           ("q" "�" :string)
+           ("R" "�" :string)
+           ("B" "�" :string)
            ("k" "�" :string)
-           ("J" "�" :string)
-           ("D" "�" :string)
-           ("l" "�" :string)
-           ("u" "�" :string)
+           ("Q" "�" :string)
+           ("W" "�" :string)
+           ("K" "�" :string)
+           ("S" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/general/cp1252.xdy b/Master/texmf-dist/xindy/modules/lang/general/cp1252.xdy
index 506927517f6..d3757cef513 100644
--- a/Master/texmf-dist/xindy/modules/lang/general/cp1252.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/general/cp1252.xdy
@@ -30,373 +30,373 @@
 
 (define-rule-set "xy-alphabetize"
 
-  :rules  (("�" "�" :string)
+  :rules  (("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("a" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("A" "�" :string)
-           ("�" "��" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("a" "�" :string)
            ("�" "��" :string)
-           ("B" "�" :string)
+           ("�" "��" :string)
            ("b" "�" :string)
+           ("B" "�" :string)
+           ("�" "�" :string)
            ("C" "�" :string)
-           ("�" "�" :string)
            ("c" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("D" "�" :string)
            ("d" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("E" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("e" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("F" "�" :string)
            ("f" "�" :string)
            ("G" "�" :string)
            ("g" "�" :string)
-           ("h" "�" :string)
            ("H" "�" :string)
-           ("I" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("h" "�" :string)
            ("i" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("I" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("J" "�" :string)
+           ("�" "�" :string)
            ("j" "�" :string)
-           ("K" "�" :string)
+           ("J" "�" :string)
            ("k" "�" :string)
+           ("K" "�" :string)
            ("l" "�" :string)
            ("L" "�" :string)
            ("m" "�" :string)
            ("M" "�" :string)
-           ("�" "�" :string)
            ("n" "�" :string)
            ("�" "�" :string)
            ("N" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("o" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("O" "�" :string)
-           ("o" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "×" :string)
            ("�" "×" :string)
-           ("p" "�" :string)
            ("P" "�" :string)
-           ("q" "�" :string)
+           ("p" "�" :string)
            ("Q" "�" :string)
-           ("R" "�" :string)
+           ("q" "�" :string)
            ("r" "�" :string)
-           ("�" "�" :string)
+           ("R" "�" :string)
            ("s" "�" :string)
-           ("S" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("S" "�" :string)
            ("�" "��" :string)
-           ("t" "�" :string)
            ("T" "�" :string)
-           ("�" "�" :string)
-           ("u" "�" :string)
-           ("�" "�" :string)
+           ("t" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("u" "�" :string)
+           ("�" "�" :string)
+           ("U" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("U" "�" :string)
-           ("�" "�" :string)
            ("V" "�" :string)
            ("v" "�" :string)
-           ("w" "�" :string)
            ("W" "�" :string)
-           ("X" "�" :string)
+           ("w" "�" :string)
            ("x" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("Y" "�" :string)
+           ("X" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("y" "�" :string)
+           ("�" "�" :string)
+           ("Y" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("z" "�" :string)
            ("Z" "�" :string)
-           ("�" "�" :string)
            ))
 
 (define-rule-set "xy-resolve-diacritics"
 
-  :rules  (("J" "�" :string)
-           ("s" "�" :string)
-           ("p" "�" :string)
-           ("D" "�" :string)
-           ("G" "�" :string)
-           ("z" "�" :string)
-           ("C" "�" :string)
+  :rules  (("e" "�" :string)
+           ("V" "�" :string)
+           ("v" "�" :string)
+           ("y" "�" :string)
+           ("a" "�" :string)
+           ("Y" "�" :string)
+           ("H" "�" :string)
+           ("S" "�" :string)
+           ("w" "�" :string)
            ("h" "�" :string)
-           ("t" "�" :string)
-           ("F" "�" :string)
+           ("N" "�" :string)
            ("I" "�" :string)
-           ("u" "�" :string)
-           ("w" "�" :string)
-           ("R" "�" :string)
-           ("B" "�" :string)
            ("q" "�" :string)
-           ("g" "�" :string)
-           ("T" "�" :string)
-           ("m" "�" :string)
-           ("L" "�" :string)
-           ("c" "�" :string)
-           ("l" "�" :string)
-           ("V" "�" :string)
+           ("C" "�" :string)
+           ("z" "�" :string)
+           ("A" "�" :string)
+           ("d" "�" :string)
+           ("M" "�" :string)
            ("E" "�" :string)
+           ("t" "�" :string)
            ("X" "�" :string)
+           ("c" "�" :string)
            ("Z" "�" :string)
-           ("K" "�" :string)
-           ("S" "�" :string)
-           ("v" "�" :string)
-           ("o" "�" :string)
-           ("e" "�" :string)
+           ("R" "�" :string)
+           ("O" "�" :string)
+           ("p" "�" :string)
+           ("n" "�" :string)
+           ("u" "�" :string)
+           ("B" "�" :string)
+           ("W" "�" :string)
+           ("x" "�" :string)
            ("k" "�" :string)
+           ("F" "�" :string)
+           ("D" "�" :string)
+           ("U" "�" :string)
+           ("K" "�" :string)
+           ("f" "�" :string)
+           ("g" "�" :string)
+           ("G" "�" :string)
+           ("j" "�" :string)
+           ("s" "�" :string)
            ("Q" "�" :string)
+           ("J" "�" :string)
            ("b" "�" :string)
-           ("d" "�" :string)
-           ("a" "�" :string)
-           ("W" "�" :string)
            ("i" "�" :string)
-           ("O" "�" :string)
-           ("Y" "�" :string)
-           ("P" "�" :string)
-           ("f" "�" :string)
-           ("y" "�" :string)
-           ("x" "�" :string)
-           ("j" "�" :string)
-           ("A" "�" :string)
-           ("H" "�" :string)
+           ("o" "�" :string)
+           ("T" "�" :string)
+           ("l" "�" :string)
+           ("L" "�" :string)
+           ("m" "�" :string)
            ("r" "�" :string)
-           ("n" "�" :string)
-           ("M" "�" :string)
-           ("N" "�" :string)
-           ("U" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("P" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :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 "xy-resolve-case"
 
-  :rules  (("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("A" "8" :string)
-           ("H" "8" :string)
-           ("M" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("U" "8" :string)
-           ("N" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("Q" "8" :string)
-           ("�" "8" :string)
-           ("W" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("P" "8" :string)
-           ("O" "8" :string)
-           ("Y" "8" :string)
-           ("�" "8" :string)
-           ("T" "8" :string)
-           ("L" "8" :string)
-           ("�" "8" :string)
-           ("E" "8" :string)
-           ("�" "8" :string)
-           ("V" "8" :string)
+  :rules  (("W" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("X" "8" :string)
-           ("�" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
-           ("Z" "8" :string)
-           ("�" "8" :string)
-           ("S" "8" :string)
+           ("O" "8" :string)
+           ("B" "8" :string)
+           ("R" "8" :string)
+           ("�" "8" :string)
            ("K" "8" :string)
-           ("�" "8" :string)
-           ("J" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
+           ("U" "8" :string)
            ("D" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("F" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("L" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
+           ("Q" "8" :string)
+           ("J" "8" :string)
+           ("T" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
            ("G" "8" :string)
+           ("P" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("V" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("S" "8" :string)
+           ("�" "8" :string)
+           ("H" "8" :string)
+           ("Y" "8" :string)
+           ("�" "8" :string)
+           ("E" "8" :string)
+           ("M" "8" :string)
+           ("�" "8" :string)
+           ("A" "8" :string)
            ("C" "8" :string)
-           ("I" "8" :string)
-           ("F" "8" :string)
            ("�" "8" :string)
-           ("B" "8" :string)
-           ("�" "8" :string)
-           ("R" "8" :string)
-           ("�" "89" :string)
+           ("N" "8" :string)
+           ("�" "8" :string)
+           ("I" "8" :string)
+           ("Z" "8" :string)
+           ("�" "8" :string)
+           ("X" "8" :string)
            ("�" "89" :string)
-           ("�" "9" :string)
-           ("f" "9" :string)
-           ("�" "9" :string)
-           ("y" "9" :string)
-           ("j" "9" :string)
-           ("x" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("r" "9" :string)
-           ("n" "9" :string)
+           ("�" "89" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
-           ("o" "9" :string)
-           ("�" "9" :string)
-           ("e" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("u" "9" :string)
+           ("n" "9" :string)
+           ("p" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("f" "9" :string)
            ("k" "9" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
-           ("b" "9" :string)
-           ("�" "9" :string)
-           ("d" "9" :string)
-           ("�" "9" :string)
-           ("a" "9" :string)
-           ("i" "9" :string)
-           ("�" "9" :string)
-           ("g" "9" :string)
-           ("q" "9" :string)
-           ("�" "9" :string)
-           ("m" "9" :string)
-           ("c" "9" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
+           ("x" "9" :string)
            ("l" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("v" "9" :string)
+           ("i" "9" :string)
+           ("b" "9" :string)
+           ("o" "9" :string)
+           ("j" "9" :string)
            ("s" "9" :string)
-           ("p" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
+           ("g" "9" :string)
+           ("�" "9" :string)
+           ("m" "9" :string)
+           ("r" "9" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("z" "9" :string)
-           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
-           ("t" "9" :string)
-           ("�" "9" :string)
+           ("�" "9" :string)
+           ("a" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("v" "9" :string)
+           ("e" "9" :string)
+           ("y" "9" :string)
+           ("�" "9" :string)
            ("h" "9" :string)
-           ("�" "9" :string)
-           ("u" "9" :string)
-           ("�" "9" :string)
            ("w" "9" :string)
-           ("�" "99" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("z" "9" :string)
+           ("q" "9" :string)
+           ("d" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("c" "9" :string)
+           ("�" "9" :string)
+           ("t" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
            ("�" "99" :string)
+           ("�" "99" :string)
            ("�" "99" :string)
            ))
 
 (define-rule-set "xy-ignore-special"
 
-  :rules  (("!" "" :string)
+  :rules  (("?" "" :string)
            ("-" "" :string)
            ("." "" :string)
-           ("?" "" :string)
+           ("!" "" :string)
            ("'" "" :string)
            ))
 
@@ -405,122 +405,122 @@
   :rules  (("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("j" "�" :string)
-           ("x" "�" :string)
-           ("�" "�" :string)
+           ("X" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("t" "�" :string)
+           ("Z" "�" :string)
+           ("�" "�" :string)
+           ("c" "�" :string)
+           ("�" "�" :string)
+           ("d" "�" :string)
+           ("�" "�" :string)
+           ("A" "�" :string)
+           ("z" "�" :string)
+           ("q" "�" :string)
+           ("C" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("A" "�" :string)
-           ("�" "�" :string)
-           ("f" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("y" "�" :string)
-           ("�" "�" :string)
-           ("U" "�" :string)
+           ("I" "�" :string)
            ("N" "�" :string)
-           ("H" "�" :string)
-           ("�" "�" :string)
-           ("r" "�" :string)
-           ("�" "�" :string)
+           ("E" "�" :string)
+           ("�" "�" :string)
            ("M" "�" :string)
-           ("n" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("Q" "�" :string)
-           ("b" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("Y" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("h" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("S" "�" :string)
+           ("w" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("H" "�" :string)
            ("�" "�" :string)
-           ("d" "�" :string)
+           ("�" "�" :string)
+           ("y" "�" :string)
+           ("v" "�" :string)
+           ("V" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("o" "�" :string)
-           ("�" "�" :string)
            ("e" "�" :string)
-           ("k" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("a" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("P" "�" :string)
-           ("Y" "�" :string)
-           ("O" "�" :string)
-           ("�" "�" :string)
-           ("a" "�" :string)
-           ("i" "�" :string)
-           ("W" "�" :string)
            ("m" "�" :string)
-           ("�" "�" :string)
-           ("c" "�" :string)
+           ("r" "�" :string)
+           ("�" "�" :string)
+           ("T" "�" :string)
+           ("�" "�" :string)
+           ("o" "�" :string)
            ("�" "�" :string)
-           ("L" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("i" "�" :string)
+           ("J" "�" :string)
+           ("Q" "�" :string)
+           ("b" "�" :string)
+           ("s" "�" :string)
+           ("j" "�" :string)
            ("g" "�" :string)
-           ("q" "�" :string)
-           ("�" "�" :string)
-           ("T" "�" :string)
-           ("�" "�" :string)
-           ("S" "�" :string)
-           ("Z" "�" :string)
-           ("�" "�" :string)
-           ("K" "�" :string)
-           ("�" "�" :string)
-           ("v" "�" :string)
-           ("l" "�" :string)
-           ("�" "�" :string)
-           ("E" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("V" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("X" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("G" "�" :string)
-           ("z" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("s" "�" :string)
-           ("J" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("p" "�" :string)
-           ("�" "�" :string)
+           ("L" "�" :string)
+           ("l" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("F" "�" :string)
+           ("k" "�" :string)
+           ("�" "�" :string)
+           ("x" "�" :string)
+           ("�" "�" :string)
+           ("f" "�" :string)
+           ("K" "�" :string)
+           ("U" "�" :string)
            ("D" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("u" "�" :string)
-           ("�" "�" :string)
-           ("w" "�" :string)
+           ("�" "�" :string)
            ("B" "�" :string)
-           ("�" "�" :string)
+           ("u" "�" :string)
+           ("p" "�" :string)
+           ("O" "�" :string)
+           ("n" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("R" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("t" "�" :string)
-           ("�" "�" :string)
-           ("h" "�" :string)
-           ("C" "�" :string)
-           ("F" "�" :string)
-           ("I" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("W" "�" :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/general/cp850.xdy b/Master/texmf-dist/xindy/modules/lang/general/cp850.xdy
index d41676d5f38..365f0a6a8f9 100644
--- a/Master/texmf-dist/xindy/modules/lang/general/cp850.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/general/cp850.xdy
@@ -30,352 +30,352 @@
 
 (define-rule-set "xy-alphabetize"
 
-  :rules  (("�" "�" :string)
+  :rules  (("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("A" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("a" "�" :string)
            ("�" "�" :string)
-           ("�" "��" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "��" :string)
+           ("�" "��" :string)
            ("B" "�" :string)
            ("b" "�" :string)
-           ("�" "�" :string)
+           ("c" "�" :string)
            ("C" "�" :string)
            ("�" "�" :string)
-           ("c" "�" :string)
+           ("�" "�" :string)
            ("d" "�" :string)
            ("D" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("E" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("e" "�" :string)
-           ("�" "�" :string)
-           ("F" "�" :string)
+           ("�" "�" :string)
            ("f" "�" :string)
-           ("G" "�" :string)
+           ("F" "�" :string)
            ("g" "�" :string)
+           ("G" "�" :string)
            ("h" "�" :string)
            ("H" "�" :string)
-           ("I" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("i" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("i" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("I" "�" :string)
            ("�" "�" :string)
            ("j" "�" :string)
            ("J" "�" :string)
-           ("K" "�" :string)
            ("k" "�" :string)
+           ("K" "�" :string)
            ("l" "�" :string)
            ("L" "�" :string)
            ("M" "�" :string)
            ("m" "�" :string)
-           ("N" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
+           ("N" "�" :string)
            ("n" "�" :string)
-           ("�" "�" :string)
-           ("o" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("O" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("o" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("P" "�" :string)
            ("p" "�" :string)
            ("Q" "�" :string)
            ("q" "�" :string)
-           ("R" "�" :string)
            ("r" "�" :string)
-           ("S" "�" :string)
+           ("R" "�" :string)
            ("s" "�" :string)
+           ("S" "�" :string)
            ("�" "��" :string)
-           ("t" "�" :string)
            ("T" "�" :string)
+           ("t" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("u" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("U" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("U" "�" :string)
            ("v" "�" :string)
            ("V" "�" :string)
-           ("w" "�" :string)
            ("W" "�" :string)
+           ("w" "�" :string)
            ("x" "�" :string)
            ("X" "�" :string)
-           ("�" "�" :string)
            ("y" "�" :string)
-           ("Y" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("z" "�" :string)
+           ("Y" "�" :string)
+           ("�" "�" :string)
            ("Z" "�" :string)
+           ("z" "�" :string)
            ))
 
 (define-rule-set "xy-resolve-diacritics"
 
-  :rules  (("B" "�" :string)
-           ("k" "�" :string)
-           ("r" "�" :string)
+  :rules  (("R" "�" :string)
            ("e" "�" :string)
-           ("W" "�" :string)
-           ("b" "�" :string)
            ("n" "�" :string)
-           ("m" "�" :string)
            ("f" "�" :string)
-           ("a" "�" :string)
-           ("c" "�" :string)
-           ("q" "�" :string)
-           ("h" "�" :string)
+           ("M" "�" :string)
            ("H" "�" :string)
-           ("O" "�" :string)
-           ("u" "�" :string)
-           ("t" "�" :string)
-           ("E" "�" :string)
-           ("A" "�" :string)
-           ("s" "�" :string)
-           ("L" "�" :string)
-           ("g" "�" :string)
-           ("Y" "�" :string)
-           ("V" "�" :string)
-           ("T" "�" :string)
            ("J" "�" :string)
-           ("Z" "�" :string)
+           ("V" "�" :string)
+           ("d" "�" :string)
+           ("m" "�" :string)
            ("U" "�" :string)
+           ("F" "�" :string)
+           ("D" "�" :string)
+           ("b" "�" :string)
+           ("Q" "�" :string)
+           ("o" "�" :string)
+           ("j" "�" :string)
            ("i" "�" :string)
-           ("p" "�" :string)
-           ("v" "�" :string)
-           ("d" "�" :string)
+           ("a" "�" :string)
+           ("N" "�" :string)
+           ("T" "�" :string)
+           ("Y" "�" :string)
+           ("I" "�" :string)
            ("C" "�" :string)
-           ("y" "�" :string)
-           ("R" "�" :string)
-           ("w" "�" :string)
+           ("q" "�" :string)
+           ("t" "�" :string)
            ("S" "�" :string)
-           ("Q" "�" :string)
-           ("l" "�" :string)
-           ("z" "�" :string)
-           ("G" "�" :string)
-           ("D" "�" :string)
-           ("j" "�" :string)
-           ("M" "�" :string)
+           ("E" "�" :string)
            ("K" "�" :string)
-           ("N" "�" :string)
            ("x" "�" :string)
-           ("F" "�" :string)
-           ("o" "�" :string)
-           ("P" "�" :string)
            ("X" "�" :string)
-           ("I" "�" :string)
-           ("�" "�" :string)
+           ("w" "�" :string)
+           ("G" "�" :string)
+           ("u" "�" :string)
+           ("h" "�" :string)
+           ("c" "�" :string)
+           ("z" "�" :string)
+           ("A" "�" :string)
+           ("s" "�" :string)
+           ("B" "�" :string)
+           ("r" "�" :string)
+           ("O" "�" :string)
+           ("P" "�" :string)
+           ("p" "�" :string)
+           ("l" "�" :string)
+           ("y" "�" :string)
+           ("Z" "�" :string)
+           ("k" "�" :string)
+           ("v" "�" :string)
+           ("g" "�" :string)
+           ("L" "�" :string)
+           ("W" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :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 "xy-resolve-case"
 
-  :rules  (("�" "8" :string)
-           ("�" "8" :string)
-           ("U" "8" :string)
-           ("�" "8" :string)
-           ("Z" "8" :string)
-           ("J" "8" :string)
-           ("T" "8" :string)
-           ("V" "8" :string)
-           ("Y" "8" :string)
-           ("L" "8" :string)
+  :rules  (("Q" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
-           ("A" "8" :string)
-           ("E" "8" :string)
-           ("�" "8" :string)
-           ("O" "8" :string)
-           ("H" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("W" "8" :string)
+           ("T" "8" :string)
            ("�" "8" :string)
+           ("N" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("B" "8" :string)
-           ("�" "8" :string)
-           ("X" "8" :string)
            ("I" "8" :string)
-           ("P" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("F" "8" :string)
+           ("�" "8" :string)
+           ("Y" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
-           ("N" "8" :string)
-           ("K" "8" :string)
+           ("C" "8" :string)
+           ("S" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("R" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
            ("M" "8" :string)
-           ("�" "8" :string)
-           ("D" "8" :string)
-           ("G" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
+           ("J" "8" :string)
+           ("H" "8" :string)
+           ("V" "8" :string)
+           ("D" "8" :string)
+           ("U" "8" :string)
+           ("F" "8" :string)
+           ("�" "8" :string)
+           ("P" "8" :string)
+           ("�" "8" :string)
+           ("O" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
-           ("Q" "8" :string)
-           ("S" "8" :string)
-           ("R" "8" :string)
-           ("C" "8" :string)
+           ("Z" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("L" "8" :string)
+           ("W" "8" :string)
+           ("E" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
+           ("�" "8" :string)
+           ("K" "8" :string)
+           ("�" "8" :string)
+           ("G" "8" :string)
+           ("X" "8" :string)
+           ("A" "8" :string)
+           ("�" "8" :string)
+           ("B" "8" :string)
            ("�" "89" :string)
+           ("o" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
            ("i" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("g" "9" :string)
-           ("�" "9" :string)
+           ("j" "9" :string)
+           ("a" "9" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
-           ("s" "9" :string)
-           ("t" "9" :string)
-           ("�" "9" :string)
-           ("u" "9" :string)
-           ("�" "9" :string)
-           ("h" "9" :string)
-           ("�" "9" :string)
            ("q" "9" :string)
-           ("�" "9" :string)
-           ("c" "9" :string)
+           ("�" "9" :string)
+           ("t" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("e" "9" :string)
+           ("�" "9" :string)
+           ("n" "9" :string)
            ("f" "9" :string)
-           ("�" "9" :string)
-           ("a" "9" :string)
+           ("d" "9" :string)
            ("m" "9" :string)
-           ("n" "9" :string)
            ("b" "9" :string)
-           ("e" "9" :string)
-           ("�" "9" :string)
-           ("r" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("p" "9" :string)
+           ("�" "9" :string)
+           ("l" "9" :string)
+           ("�" "9" :string)
+           ("y" "9" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
            ("k" "9" :string)
+           ("�" "9" :string)
+           ("g" "9" :string)
+           ("v" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("o" "9" :string)
            ("x" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("j" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("z" "9" :string)
-           ("l" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
+           ("u" "9" :string)
+           ("w" "9" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
-           ("w" "9" :string)
-           ("y" "9" :string)
-           ("d" "9" :string)
-           ("v" "9" :string)
-           ("p" "9" :string)
-           ("�" "99" :string)
+           ("�" "9" :string)
+           ("h" "9" :string)
+           ("�" "9" :string)
+           ("z" "9" :string)
+           ("�" "9" :string)
+           ("c" "9" :string)
+           ("�" "9" :string)
+           ("r" "9" :string)
+           ("s" "9" :string)
            ("�" "99" :string)
+           ("�" "99" :string)
            ))
 
 (define-rule-set "xy-ignore-special"
 
-  :rules  (("'" "" :string)
-           ("." "" :string)
+  :rules  (("?" "" :string)
            ("-" "" :string)
-           ("?" "" :string)
+           ("'" "" :string)
+           ("." "" :string)
            ("!" "" :string)
            ))
 
@@ -384,116 +384,116 @@
   :rules  (("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("k" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("r" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("B" "�" :string)
+           ("S" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("t" "�" :string)
+           ("�" "�" :string)
            ("q" "�" :string)
            ("�" "�" :string)
-           ("c" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("h" "�" :string)
-           ("H" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("C" "�" :string)
+           ("�" "�" :string)
+           ("I" "�" :string)
+           ("�" "�" :string)
+           ("Y" "�" :string)
+           ("�" "�" :string)
+           ("T" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("N" "�" :string)
+           ("a" "�" :string)
+           ("�" "�" :string)
+           ("j" "�" :string)
+           ("i" "�" :string)
+           ("o" "�" :string)
+           ("�" "�" :string)
+           ("Q" "�" :string)
+           ("�" "�" :string)
            ("b" "�" :string)
+           ("D" "�" :string)
+           ("�" "�" :string)
+           ("U" "�" :string)
+           ("�" "�" :string)
+           ("F" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("n" "�" :string)
-           ("e" "�" :string)
-           ("W" "�" :string)
-           ("�" "�" :string)
+           ("d" "�" :string)
            ("m" "�" :string)
-           ("�" "�" :string)
-           ("a" "�" :string)
+           ("V" "�" :string)
+           ("J" "�" :string)
+           ("H" "�" :string)
+           ("M" "�" :string)
+           ("�" "�" :string)
+           ("n" "�" :string)
            ("f" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("e" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("L" "�" :string)
-           ("�" "�" :string)
-           ("u" "�" :string)
-           ("O" "�" :string)
-           ("s" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("R" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("W" "�" :string)
            ("�" "�" :string)
-           ("E" "�" :string)
-           ("t" "�" :string)
-           ("A" "�" :string)
+           ("L" "�" :string)
+           ("g" "�" :string)
+           ("v" "�" :string)
+           ("k" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("Z" "�" :string)
+           ("y" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("l" "�" :string)
+           ("P" "�" :string)
            ("�" "�" :string)
-           ("U" "�" :string)
-           ("i" "�" :string)
-           ("Y" "�" :string)
-           ("V" "�" :string)
-           ("g" "�" :string)
-           ("J" "�" :string)
+           ("p" "�" :string)
+           ("O" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("r" "�" :string)
+           ("B" "�" :string)
+           ("s" "�" :string)
            ("�" "�" :string)
-           ("Z" "�" :string)
-           ("T" "�" :string)
-           ("w" "�" :string)
-           ("S" "�" :string)
-           ("R" "�" :string)
-           ("�" "�" :string)
-           ("y" "�" :string)
-           ("C" "�" :string)
-           ("�" "�" :string)
-           ("Q" "�" :string)
+           ("A" "�" :string)
+           ("z" "�" :string)
+           ("c" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("h" "�" :string)
+           ("u" "�" :string)
            ("�" "�" :string)
-           ("d" "�" :string)
-           ("p" "�" :string)
-           ("v" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("G" "�" :string)
-           ("D" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("w" "�" :string)
            ("�" "�" :string)
-           ("z" "�" :string)
-           ("�" "�" :string)
-           ("l" "�" :string)
-           ("�" "�" :string)
-           ("N" "�" :string)
+           ("X" "�" :string)
            ("x" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("K" "�" :string)
-           ("F" "�" :string)
-           ("j" "�" :string)
-           ("�" "�" :string)
-           ("M" "�" :string)
-           ("P" "�" :string)
-           ("I" "�" :string)
-           ("X" "�" :string)
-           ("o" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("E" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "��" :string)
-           ("�" "��" :string)
            ("�" "��" :string)
+           ("�" "��" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/general/latin9.xdy b/Master/texmf-dist/xindy/modules/lang/general/latin9.xdy
index 2c9dae447a9..97778df9e62 100644
--- a/Master/texmf-dist/xindy/modules/lang/general/latin9.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/general/latin9.xdy
@@ -30,374 +30,374 @@
 
 (define-rule-set "xy-alphabetize"
 
-  :rules  (("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+  :rules  (("�" "�" :string)
            ("A" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("a" "�" :string)
-           ("�" "�" :string)
-           ("�" "��" :string)
            ("�" "��" :string)
-           ("b" "�" :string)
+           ("�" "��" :string)
            ("B" "�" :string)
+           ("b" "�" :string)
+           ("c" "�" :string)
            ("�" "�" :string)
-           ("C" "�" :string)
            ("�" "�" :string)
-           ("c" "�" :string)
-           ("d" "�" :string)
+           ("C" "�" :string)
            ("D" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("d" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("E" "�" :string)
-           ("�" "�" :string)
-           ("e" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("e" "�" :string)
            ("f" "�" :string)
            ("F" "�" :string)
-           ("G" "�" :string)
            ("g" "�" :string)
+           ("G" "�" :string)
            ("H" "�" :string)
            ("h" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("i" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("I" "�" :string)
-           ("�" "�" :string)
-           ("j" "�" :string)
            ("J" "�" :string)
-           ("K" "�" :string)
+           ("j" "�" :string)
            ("k" "�" :string)
+           ("K" "�" :string)
            ("L" "�" :string)
            ("l" "�" :string)
-           ("m" "�" :string)
            ("M" "�" :string)
-           ("�" "�" :string)
+           ("m" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("N" "�" :string)
            ("n" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("o" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("O" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "×" :string)
            ("�" "×" :string)
-           ("P" "�" :string)
+           ("�" "×" :string)
            ("p" "�" :string)
-           ("q" "�" :string)
+           ("P" "�" :string)
            ("Q" "�" :string)
+           ("q" "�" :string)
            ("R" "�" :string)
            ("r" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("S" "�" :string)
            ("s" "�" :string)
+           ("S" "�" :string)
+           ("�" "�" :string)
            ("�" "��" :string)
            ("T" "�" :string)
            ("t" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("u" "�" :string)
+           ("�" "�" :string)
            ("U" "�" :string)
-           ("V" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("u" "�" :string)
            ("v" "�" :string)
+           ("V" "�" :string)
            ("W" "�" :string)
            ("w" "�" :string)
-           ("X" "�" :string)
            ("x" "�" :string)
+           ("X" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("Y" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
            ("y" "�" :string)
-           ("�" "�" :string)
+           ("Y" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("Z" "�" :string)
+           ("�" "�" :string)
            ("z" "�" :string)
            ))
 
 (define-rule-set "xy-resolve-diacritics"
 
-  :rules  (("g" "�" :string)
-           ("S" "�" :string)
-           ("f" "�" :string)
+  :rules  (("r" "�" :string)
+           ("O" "�" :string)
+           ("o" "�" :string)
+           ("q" "�" :string)
+           ("U" "�" :string)
+           ("l" "�" :string)
+           ("b" "�" :string)
            ("s" "�" :string)
-           ("u" "�" :string)
+           ("S" "�" :string)
+           ("P" "�" :string)
+           ("j" "�" :string)
+           ("V" "�" :string)
+           ("m" "�" :string)
            ("X" "�" :string)
-           ("n" "�" :string)
-           ("Q" "�" :string)
-           ("U" "�" :string)
-           ("v" "�" :string)
-           ("t" "�" :string)
            ("I" "�" :string)
+           ("G" "�" :string)
            ("a" "�" :string)
+           ("g" "�" :string)
+           ("e" "�" :string)
+           ("n" "�" :string)
+           ("K" "�" :string)
+           ("d" "�" :string)
+           ("C" "�" :string)
+           ("h" "�" :string)
+           ("F" "�" :string)
+           ("u" "�" :string)
+           ("z" "�" :string)
+           ("f" "�" :string)
+           ("c" "�" :string)
            ("J" "�" :string)
-           ("D" "�" :string)
-           ("y" "�" :string)
            ("B" "�" :string)
-           ("r" "�" :string)
-           ("Z" "�" :string)
-           ("x" "�" :string)
-           ("c" "�" :string)
-           ("p" "�" :string)
-           ("z" "�" :string)
-           ("F" "�" :string)
-           ("k" "�" :string)
-           ("W" "�" :string)
-           ("o" "�" :string)
+           ("T" "�" :string)
+           ("i" "�" :string)
+           ("M" "�" :string)
+           ("t" "�" :string)
+           ("Y" "�" :string)
            ("N" "�" :string)
-           ("C" "�" :string)
-           ("d" "�" :string)
-           ("V" "�" :string)
            ("R" "�" :string)
-           ("K" "�" :string)
-           ("i" "�" :string)
-           ("T" "�" :string)
-           ("j" "�" :string)
-           ("L" "�" :string)
+           ("x" "�" :string)
+           ("Q" "�" :string)
+           ("k" "�" :string)
+           ("w" "�" :string)
+           ("D" "�" :string)
+           ("p" "�" :string)
+           ("Z" "�" :string)
            ("A" "�" :string)
+           ("W" "�" :string)
            ("H" "�" :string)
-           ("l" "�" :string)
-           ("h" "�" :string)
-           ("m" "�" :string)
-           ("e" "�" :string)
+           ("v" "�" :string)
            ("E" "�" :string)
-           ("G" "�" :string)
-           ("b" "�" :string)
-           ("Y" "�" :string)
-           ("P" "�" :string)
-           ("O" "�" :string)
-           ("M" "�" :string)
-           ("w" "�" :string)
-           ("q" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("L" "�" :string)
+           ("y" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :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 "xy-resolve-case"
 
-  :rules  (("F" "8" :string)
-           ("D" "8" :string)
-           ("Z" "8" :string)
-           ("B" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("J" "8" :string)
-           ("U" "8" :string)
-           ("I" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("Q" "8" :string)
-           ("�" "8" :string)
+  :rules  (("�" "8" :string)
+           ("C" "8" :string)
            ("�" "8" :string)
-           ("X" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("S" "8" :string)
+           ("F" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
-           ("M" "8" :string)
-           ("O" "8" :string)
-           ("P" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
+           ("X" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("I" "8" :string)
            ("G" "8" :string)
-           ("E" "8" :string)
+           ("K" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("V" "8" :string)
+           ("P" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("U" "8" :string)
+           ("�" "8" :string)
+           ("S" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
            ("�" "8" :string)
-           ("Y" "8" :string)
-           ("�" "8" :string)
-           ("A" "8" :string)
            ("�" "8" :string)
+           ("O" "8" :string)
+           ("H" "8" :string)
+           ("�" "8" :string)
+           ("E" "8" :string)
+           ("�" "8" :string)
            ("L" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("D" "8" :string)
+           ("Z" "8" :string)
+           ("A" "8" :string)
+           ("W" "8" :string)
+           ("R" "8" :string)
+           ("Q" "8" :string)
+           ("�" "8" :string)
+           ("M" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
+           ("�" "8" :string)
+           ("Y" "8" :string)
+           ("N" "8" :string)
            ("�" "8" :string)
-           ("H" "8" :string)
-           ("�" "8" :string)
+           ("J" "8" :string)
+           ("B" "8" :string)
            ("T" "8" :string)
-           ("V" "8" :string)
-           ("�" "8" :string)
-           ("K" "8" :string)
-           ("R" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("C" "8" :string)
-           ("N" "8" :string)
-           ("�" "8" :string)
-           ("W" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
            ("�" "89" :string)
            ("�" "89" :string)
-           ("�" "9" :string)
+           ("u" "9" :string)
+           ("�" "9" :string)
            ("z" "9" :string)
-           ("k" "9" :string)
-           ("y" "9" :string)
-           ("�" "9" :string)
-           ("p" "9" :string)
-           ("x" "9" :string)
-           ("c" "9" :string)
-           ("r" "9" :string)
-           ("�" "9" :string)
+           ("h" "9" :string)
+           ("�" "9" :string)
+           ("e" "9" :string)
+           ("g" "9" :string)
            ("a" "9" :string)
-           ("t" "9" :string)
-           ("�" "9" :string)
-           ("v" "9" :string)
-           ("�" "9" :string)
            ("n" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("u" "9" :string)
-           ("�" "9" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
-           ("g" "9" :string)
+           ("d" "9" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
-           ("s" "9" :string)
-           ("f" "9" :string)
-           ("�" "9" :string)
-           ("q" "9" :string)
-           ("w" "9" :string)
-           ("�" "9" :string)
+           ("�" "9" :string)
            ("m" "9" :string)
-           ("e" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("b" "9" :string)
-           ("l" "9" :string)
-           ("�" "9" :string)
-           ("h" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
+           ("�" "9" :string)
            ("j" "9" :string)
-           ("i" "9" :string)
-           ("d" "9" :string)
            ("�" "9" :string)
-           ("o" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
+           ("l" "9" :string)
+           ("b" "9" :string)
+           ("�" "9" :string)
+           ("s" "9" :string)
+           ("�" "9" :string)
+           ("q" "9" :string)
+           ("r" "9" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
+           ("o" "9" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
+           ("v" "9" :string)
+           ("�" "9" :string)
+           ("y" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("w" "9" :string)
+           ("p" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("x" "9" :string)
            ("�" "9" :string)
+           ("�" "9" :string)
+           ("k" "9" :string)
+           ("t" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("i" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("f" "9" :string)
+           ("�" "9" :string)
+           ("c" "9" :string)
+           ("�" "99" :string)
            ("�" "99" :string)
            ("�" "99" :string)
-           ("�" "99" :string)
            ))
 
 (define-rule-set "xy-ignore-special"
 
-  :rules  (("." "" :string)
-           ("!" "" :string)
+  :rules  (("?" "" :string)
+           ("." "" :string)
            ("'" "" :string)
+           ("!" "" :string)
            ("-" "" :string)
-           ("?" "" :string)
            ))
 
 (define-rule-set "xy-resolve-special"
@@ -405,123 +405,123 @@
   :rules  (("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("L" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("c" "�" :string)
+           ("�" "�" :string)
+           ("f" "�" :string)
+           ("�" "�" :string)
+           ("i" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("T" "�" :string)
+           ("J" "�" :string)
+           ("B" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("Q" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("k" "�" :string)
+           ("R" "�" :string)
+           ("x" "�" :string)
+           ("�" "�" :string)
+           ("N" "�" :string)
+           ("Y" "�" :string)
+           ("�" "�" :string)
+           ("t" "�" :string)
+           ("M" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("A" "�" :string)
-           ("�" "�" :string)
+           ("L" "�" :string)
+           ("�" "�" :string)
+           ("y" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("v" "�" :string)
            ("H" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("l" "�" :string)
-           ("h" "�" :string)
-           ("m" "�" :string)
-           ("e" "�" :string)
-           ("G" "�" :string)
-           ("�" "�" :string)
            ("E" "�" :string)
-           ("�" "�" :string)
-           ("b" "�" :string)
-           ("�" "�" :string)
-           ("Y" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("P" "�" :string)
-           ("M" "�" :string)
-           ("O" "�" :string)
+           ("Z" "�" :string)
+           ("p" "�" :string)
+           ("W" "�" :string)
+           ("�" "�" :string)
+           ("A" "�" :string)
+           ("D" "�" :string)
            ("w" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("q" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("o" "�" :string)
+           ("�" "�" :string)
+           ("r" "�" :string)
+           ("O" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("W" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("j" "�" :string)
+           ("�" "�" :string)
+           ("P" "�" :string)
+           ("s" "�" :string)
+           ("�" "�" :string)
+           ("b" "�" :string)
+           ("�" "�" :string)
+           ("S" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("o" "�" :string)
-           ("�" "�" :string)
-           ("N" "�" :string)
-           ("C" "�" :string)
-           ("�" "�" :string)
+           ("l" "�" :string)
+           ("U" "�" :string)
+           ("�" "�" :string)
            ("d" "�" :string)
+           ("n" "�" :string)
+           ("K" "�" :string)
+           ("�" "�" :string)
+           ("X" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("I" "�" :string)
+           ("g" "�" :string)
+           ("G" "�" :string)
+           ("e" "�" :string)
+           ("a" "�" :string)
            ("V" "�" :string)
-           ("R" "�" :string)
-           ("�" "�" :string)
-           ("K" "�" :string)
-           ("�" "�" :string)
+           ("m" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("T" "�" :string)
-           ("i" "�" :string)
-           ("j" "�" :string)
-           ("U" "�" :string)
-           ("v" "�" :string)
-           ("�" "�" :string)
-           ("t" "�" :string)
-           ("I" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("a" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("J" "�" :string)
-           ("D" "�" :string)
-           ("�" "�" :string)
-           ("y" "�" :string)
-           ("r" "�" :string)
-           ("Z" "�" :string)
-           ("B" "�" :string)
-           ("p" "�" :string)
-           ("x" "�" :string)
-           ("c" "�" :string)
+           ("�" "�" :string)
            ("z" "�" :string)
-           ("�" "�" :string)
-           ("F" "�" :string)
-           ("k" "�" :string)
-           ("S" "�" :string)
-           ("g" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("f" "�" :string)
-           ("s" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("u" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("X" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("F" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("n" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("Q" "�" :string)
-           ("�" "��" :string)
+           ("C" "�" :string)
+           ("h" "�" :string)
            ("�" "��" :string)
-           ("�" "��" :string)
+           ("�" "��" :string)
            ("�" "��" :string)
            ("�" "��" :string)
+           ("�" "��" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/general/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/general/utf8.xdy
index a360e2e0083..38b9b5baaef 100644
--- a/Master/texmf-dist/xindy/modules/lang/general/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/general/utf8.xdy
@@ -30,175 +30,175 @@
 
 (define-rule-set "xy-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)
            ("Ę" "�" :string)
-           ("é" "�" :string)
-           ("Ë" "�" :string)
+           ("Ě" "�" :string)
+           ("ë" "�" :string)
            ("ě" "�" :string)
+           ("é" "�" :string)
            ("È" "�" :string)
-           ("Ê" "�" :string)
+           ("Ë" "�" :string)
            ("É" "�" :string)
            ("è" "�" :string)
+           ("Ê" "�" :string)
+           ("ę" "�" :string)
+           ("ĝ" "�" :string)
            ("ğ" "�" :string)
            ("Ğ" "�" :string)
            ("Ĝ" "�" :string)
-           ("ĝ" "�" :string)
-           ("Ĥ" "�" :string)
            ("ĥ" "�" :string)
-           ("í" "�" :string)
+           ("Ĥ" "�" :string)
+           ("Ï" "�" :string)
+           ("Í" "�" :string)
+           ("ï" "�" :string)
+           ("Î" "�" :string)
+           ("î" "�" :string)
            ("ı" "�" :string)
            ("İ" "�" :string)
-           ("î" "�" :string)
+           ("í" "�" :string)
            ("Ì" "�" :string)
-           ("ï" "�" :string)
            ("ì" "�" :string)
-           ("Í" "�" :string)
-           ("Î" "�" :string)
-           ("Ï" "�" :string)
            ("Ĵ" "�" :string)
            ("ĵ" "�" :string)
            ("ł" "�" :string)
            ("Ł" "�" :string)
-           ("Ľ" "�" :string)
            ("ľ" "�" :string)
-           ("ñ" "�" :string)
+           ("Ľ" "�" :string)
            ("ń" "�" :string)
            ("Ń" "�" :string)
+           ("ñ" "�" :string)
            ("ň" "�" :string)
            ("Ñ" "�" :string)
            ("Ň" "�" :string)
+           ("Õ" "�" :string)
+           ("Ő" "�" :string)
+           ("ó" "�" :string)
+           ("ö" "�" :string)
+           ("ô" "�" :string)
+           ("ő" "�" :string)
+           ("Ø" "�" :string)
            ("Ö" "�" :string)
+           ("õ" "�" :string)
+           ("Ô" "�" :string)
            ("ø" "�" :string)
+           ("Ó" "�" :string)
            ("Ò" "�" :string)
            ("ò" "�" :string)
-           ("Ô" "�" :string)
-           ("Õ" "�" :string)
-           ("Ó" "�" :string)
-           ("ő" "�" :string)
-           ("ö" "�" :string)
-           ("õ" "�" :string)
-           ("Ø" "�" :string)
-           ("ô" "�" :string)
-           ("ó" "�" :string)
-           ("Ő" "�" :string)
            ("œ" "×" :string)
            ("Œ" "×" :string)
            ("Ř" "�" :string)
-           ("ŕ" "�" :string)
-           ("Ŕ" "�" :string)
            ("ř" "�" :string)
-           ("Š" "�" :string)
-           ("ș" "�" :string)
-           ("š" "�" :string)
-           ("Ş" "�" :string)
+           ("Ŕ" "�" :string)
+           ("ŕ" "�" :string)
            ("ŝ" "�" :string)
-           ("ś" "�" :string)
            ("Ś" "�" :string)
+           ("ș" "�" :string)
            ("ş" "�" :string)
-           ("Ș" "�" :string)
            ("Ŝ" "�" :string)
+           ("ś" "�" :string)
+           ("Ș" "�" :string)
+           ("š" "�" :string)
+           ("Ş" "�" :string)
+           ("Š" "�" :string)
            ("ß" "��" :string)
            ("Ț" "�" :string)
-           ("ť" "�" :string)
-           ("ț" "�" :string)
            ("Ť" "�" :string)
-           ("ü" "�" :string)
-           ("Û" "�" :string)
-           ("Ů" "�" :string)
+           ("ț" "�" :string)
+           ("ť" "�" :string)
            ("û" "�" :string)
-           ("ú" "�" :string)
+           ("ŭ" "�" :string)
+           ("ů" "�" :string)
+           ("ű" "�" :string)
+           ("ù" "�" :string)
            ("Ŭ" "�" :string)
+           ("Ù" "�" :string)
            ("Ű" "�" :string)
-           ("ů" "�" :string)
-           ("Ú" "�" :string)
-           ("ŭ" "�" :string)
            ("Ü" "�" :string)
-           ("Ù" "�" :string)
-           ("ù" "�" :string)
-           ("ű" "�" :string)
-           ("ý" "�" :string)
-           ("Ý" "�" :string)
+           ("Ů" "�" :string)
+           ("ú" "�" :string)
+           ("Ú" "�" :string)
+           ("Û" "�" :string)
+           ("ü" "�" :string)
            ("ÿ" "�" :string)
+           ("Ý" "�" :string)
            ("Ÿ" "�" :string)
+           ("ý" "�" :string)
            ("Ż" "�" :string)
            ("Ž" "�" :string)
-           ("ź" "�" :string)
            ("Ź" "�" :string)
            ("ž" "�" :string)
            ("ż" "�" :string)
+           ("ź" "�" :string)
            ("a" "�" :string)
            ("A" "�" :string)
            ("b" "�" :string)
            ("B" "�" :string)
-           ("C" "�" :string)
            ("c" "�" :string)
+           ("C" "�" :string)
            ("d" "�" :string)
            ("D" "�" :string)
            ("e" "�" :string)
            ("E" "�" :string)
-           ("f" "�" :string)
            ("F" "�" :string)
-           ("g" "�" :string)
+           ("f" "�" :string)
            ("G" "�" :string)
+           ("g" "�" :string)
            ("H" "�" :string)
            ("h" "�" :string)
            ("i" "�" :string)
            ("I" "�" :string)
            ("J" "�" :string)
            ("j" "�" :string)
-           ("k" "�" :string)
            ("K" "�" :string)
+           ("k" "�" :string)
            ("L" "�" :string)
            ("l" "�" :string)
-           ("m" "�" :string)
            ("M" "�" :string)
-           ("N" "�" :string)
+           ("m" "�" :string)
            ("n" "�" :string)
+           ("N" "�" :string)
            ("O" "�" :string)
            ("o" "�" :string)
-           ("P" "�" :string)
            ("p" "�" :string)
-           ("q" "�" :string)
+           ("P" "�" :string)
            ("Q" "�" :string)
+           ("q" "�" :string)
            ("r" "�" :string)
            ("R" "�" :string)
-           ("s" "�" :string)
            ("S" "�" :string)
-           ("T" "�" :string)
+           ("s" "�" :string)
            ("t" "�" :string)
+           ("T" "�" :string)
            ("u" "�" :string)
            ("U" "�" :string)
            ("v" "�" :string)
@@ -209,574 +209,574 @@
            ("X" "�" :string)
            ("Y" "�" :string)
            ("y" "�" :string)
-           ("Z" "�" :string)
            ("z" "�" :string)
+           ("Z" "�" :string)
            ))
 
 (define-rule-set "xy-resolve-diacritics"
 
-  :rules  (("Ý" "�" :string)
-           ("ú" "�" :string)
-           ("Ž" "�" :string)
-           ("Ó" "�" :string)
-           ("ĥ" "�" :string)
-           ("Ľ" "�" :string)
-           ("Ě" "�" :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)
            ("è" "�" :string)
            ("Ĉ" "�" :string)
-           ("Ñ" "�" :string)
-           ("ĉ" "�" :string)
-           ("Ŝ" "�" :string)
-           ("È" "�" :string)
-           ("Í" "�" :string)
-           ("ô" "�" :string)
-           ("Ă" "�" :string)
-           ("ŭ" "�" :string)
+           ("ă" "�" :string)
+           ("â" "�" :string)
+           ("û" "�" :string)
            ("ê" "�" :string)
            ("Õ" "�" :string)
-           ("Ì" "�" :string)
-           ("û" "�" :string)
+           ("õ" "�" :string)
            ("ș" "�" :string)
-           ("Û" "�" :string)
-           ("Ç" "�" :string)
-           ("â" "�" :string)
+           ("ç" "�" :string)
            ("Â" "�" :string)
-           ("õ" "�" :string)
            ("Ê" "�" :string)
-           ("Ș" "�" :string)
+           ("Û" "�" :string)
+           ("Ç" "�" :string)
            ("ì" "�" :string)
-           ("ç" "�" :string)
-           ("î" "�" :string)
-           ("ë" "�" :string)
+           ("Ì" "�" :string)
+           ("Ș" "�" :string)
+           ("ö" "�" :string)
            ("Ö" "�" :string)
+           ("ş" "�" :string)
+           ("ů" "�" :string)
+           ("ë" "�" :string)
+           ("ã" "�" :string)
+           ("î" "�" :string)
+           ("Î" "�" :string)
+           ("Ã" "�" :string)
            ("Ş" "�" :string)
            ("Ů" "�" :string)
-           ("Î" "�" :string)
-           ("ã" "�" :string)
-           ("ö" "�" :string)
            ("Ë" "�" :string)
-           ("ů" "�" :string)
-           ("Ã" "�" :string)
-           ("ş" "�" :string)
+           ("ï" "�" :string)
+           ("Ő" "�" :string)
+           ("Ï" "�" :string)
            ("Ę" "�" :string)
+           ("ő" "�" :string)
+           ("Ü" "�" :string)
            ("Å" "�" :string)
-           ("ę" "�" :string)
            ("ü" "�" :string)
-           ("Ï" "�" :string)
-           ("Ő" "�" :string)
+           ("ę" "�" :string)
            ("å" "�" :string)
-           ("Ü" "�" :string)
-           ("ï" "�" :string)
-           ("ő" "�" :string)
-           ("ø" "�" :string)
            ("Ä" "�" :string)
-           ("ä" "�" :string)
            ("ű" "�" :string)
            ("Ø" "�" :string)
+           ("ø" "�" :string)
            ("Ű" "�" :string)
+           ("ä" "�" :string)
            ("Ą" "�" :string)
            ("ą" "�" :string)
-           ("Œ" "�" :string)
            ("œ" "�" :string)
            ("ß" "�" :string)
-           ("æ" "�" :string)
            ("Æ" "�" :string)
-           ("z" "�" :string)
-           ("m" "�" :string)
+           ("Œ" "�" :string)
+           ("æ" "�" :string)
+           ("e" "�" :string)
            ("t" "�" :string)
-           ("D" "�" :string)
-           ("o" "�" :string)
-           ("u" "�" :string)
-           ("w" "�" :string)
+           ("L" "�" :string)
            ("Y" "�" :string)
+           ("J" "�" :string)
            ("a" "�" :string)
-           ("Z" "�" :string)
            ("p" "�" :string)
-           ("y" "�" :string)
-           ("b" "�" :string)
-           ("W" "�" :string)
-           ("q" "�" :string)
-           ("d" "�" :string)
-           ("N" "�" :string)
-           ("H" "�" :string)
-           ("T" "�" :string)
-           ("L" "�" :string)
-           ("O" "�" :string)
-           ("x" "�" :string)
-           ("g" "�" :string)
-           ("P" "�" :string)
+           ("u" "�" :string)
            ("j" "�" :string)
-           ("n" "�" :string)
+           ("b" "�" :string)
            ("G" "�" :string)
-           ("Q" "�" :string)
-           ("R" "�" :string)
-           ("X" "�" :string)
-           ("S" "�" :string)
            ("U" "�" :string)
-           ("V" "�" :string)
-           ("c" "�" :string)
-           ("K" "�" :string)
-           ("I" "�" :string)
            ("F" "�" :string)
-           ("E" "�" :string)
-           ("s" "�" :string)
+           ("H" "�" :string)
+           ("i" "�" :string)
+           ("z" "�" :string)
+           ("c" "�" :string)
+           ("l" "�" :string)
            ("A" "�" :string)
-           ("h" "�" :string)
-           ("e" "�" :string)
+           ("Q" "�" :string)
+           ("w" "�" :string)
+           ("D" "�" :string)
+           ("R" "�" :string)
+           ("d" "�" :string)
+           ("s" "�" :string)
            ("r" "�" :string)
-           ("v" "�" :string)
            ("k" "�" :string)
-           ("J" "�" :string)
-           ("i" "�" :string)
-           ("f" "�" :string)
+           ("v" "�" :string)
+           ("m" "�" :string)
+           ("P" "�" :string)
+           ("y" "�" :string)
+           ("K" "�" :string)
+           ("q" "�" :string)
+           ("S" "�" :string)
+           ("I" "�" :string)
+           ("C" "�" :string)
            ("M" "�" :string)
+           ("Z" "�" :string)
+           ("T" "�" :string)
+           ("W" "�" :string)
            ("B" "�" :string)
-           ("l" "�" :string)
-           ("C" "�" :string)
+           ("h" "�" :string)
+           ("x" "�" :string)
+           ("X" "�" :string)
+           ("f" "�" :string)
+           ("E" "�" :string)
+           ("V" "�" :string)
+           ("N" "�" :string)
+           ("O" "�" :string)
+           ("o" "�" :string)
+           ("g" "�" :string)
+           ("n" "�" :string)
            ))
 
 (define-rule-set "xy-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)
+           ("Ș" "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)
-           ("Ñ" "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)
            ("Œ" "89" :string)
            ("Æ" "89" :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)
-           ("ş" "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)
-           ("œ" "99" :string)
            ("æ" "99" :string)
            ("ß" "99" :string)
-           ("H" "8" :string)
-           ("T" "8" :string)
-           ("L" "8" :string)
+           ("œ" "99" :string)
+           ("N" "8" :string)
+           ("V" "8" :string)
            ("O" "8" :string)
+           ("X" "8" :string)
+           ("E" "8" :string)
            ("P" "8" :string)
-           ("W" "8" :string)
-           ("N" "8" :string)
-           ("Y" "8" :string)
+           ("K" "8" :string)
+           ("T" "8" :string)
            ("Z" "8" :string)
-           ("D" "8" :string)
-           ("J" "8" :string)
-           ("B" "8" :string)
-           ("C" "8" :string)
            ("M" "8" :string)
-           ("A" "8" :string)
-           ("S" "8" :string)
-           ("X" "8" :string)
-           ("U" "8" :string)
+           ("C" "8" :string)
            ("I" "8" :string)
-           ("K" "8" :string)
-           ("E" "8" :string)
-           ("F" "8" :string)
-           ("V" "8" :string)
+           ("S" "8" :string)
+           ("B" "8" :string)
+           ("W" "8" :string)
+           ("D" "8" :string)
            ("R" "8" :string)
-           ("G" "8" :string)
+           ("H" "8" :string)
+           ("F" "8" :string)
            ("Q" "8" :string)
+           ("A" "8" :string)
+           ("G" "8" :string)
+           ("U" "8" :string)
+           ("J" "8" :string)
+           ("Y" "8" :string)
+           ("L" "8" :string)
+           ("o" "9" :string)
+           ("n" "9" :string)
            ("g" "9" :string)
            ("x" "9" :string)
-           ("b" "9" :string)
+           ("f" "9" :string)
+           ("y" "9" :string)
            ("q" "9" :string)
-           ("d" "9" :string)
-           ("u" "9" :string)
+           ("h" "9" :string)
            ("w" "9" :string)
-           ("p" "9" :string)
-           ("a" "9" :string)
-           ("y" "9" :string)
-           ("z" "9" :string)
-           ("m" "9" :string)
-           ("t" "9" :string)
-           ("o" "9" :string)
-           ("i" "9" :string)
-           ("l" "9" :string)
-           ("f" "9" :string)
            ("s" "9" :string)
-           ("h" "9" :string)
-           ("e" "9" :string)
-           ("r" "9" :string)
+           ("d" "9" :string)
            ("v" "9" :string)
            ("k" "9" :string)
+           ("r" "9" :string)
+           ("m" "9" :string)
+           ("z" "9" :string)
            ("c" "9" :string)
+           ("i" "9" :string)
+           ("l" "9" :string)
+           ("b" "9" :string)
            ("j" "9" :string)
-           ("n" "9" :string)
+           ("a" "9" :string)
+           ("p" "9" :string)
+           ("u" "9" :string)
+           ("t" "9" :string)
+           ("e" "9" :string)
            ))
 
 (define-rule-set "xy-ignore-special"
 
-  :rules  (("." "" :string)
+  :rules  (("'" "" :string)
+           ("?" "" :string)
+           ("." "" :string)
            ("!" "" :string)
            ("-" "" :string)
-           ("?" "" :string)
-           ("'" "" :string)
            ))
 
 (define-rule-set "xy-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)
-           ("û" "�" :string)
-           ("ø" "�" :string)
-           ("ý" "�" :string)
-           ("ł" "�" :string)
-           ("š" "�" :string)
-           ("Ş" "�" :string)
-           ("ŝ" "�" :string)
-           ("ä" "�" :string)
-           ("ș" "�" :string)
+           ("ž" "�" :string)
+           ("Ø" "�" :string)
+           ("Ŝ" "�" :string)
+           ("ű" "�" :string)
+           ("Č" "�" :string)
            ("ñ" "�" :string)
-           ("Đ" "�" :string)
-           ("ę" "�" :string)
-           ("î" "�" :string)
-           ("Ć" "�" :string)
-           ("ś" "�" :string)
-           ("Ì" "�" :string)
-           ("ë" "�" :string)
+           ("õ" "�" :string)
+           ("Ő" "�" :string)
+           ("ĥ" "�" :string)
+           ("Õ" "�" :string)
+           ("Ę" "�" :string)
+           ("Ï" "�" :string)
+           ("ê" "�" :string)
+           ("À" "�" :string)
+           ("ŝ" "�" :string)
+           ("Ż" "�" :string)
+           ("ĝ" "�" :string)
+           ("Ł" "�" :string)
+           ("û" "�" :string)
+           ("Ă" "�" :string)
            ("ń" "�" :string)
            ("Ě" "�" :string)
-           ("Ò" "�" :string)
+           ("ď" "�" :string)
+           ("ł" "�" :string)
+           ("â" "�" :string)
+           ("ï" "�" :string)
+           ("ö" "�" :string)
+           ("ć" "�" :string)
+           ("Ś" "�" :string)
+           ("ľ" "�" :string)
+           ("Ř" "�" :string)
+           ("Í" "�" :string)
+           ("ó" "�" :string)
+           ("ô" "�" :string)
+           ("ĉ" "�" :string)
+           ("Ĥ" "�" :string)
+           ("Ä" "�" :string)
            ("ú" "�" :string)
+           ("å" "�" :string)
+           ("Ů" "�" :string)
            ("Ý" "�" :string)
-           ("Ę" "�" :string)
-           ("ò" "�" :string)
-           ("Ż" "�" :string)
-           ("ê" "�" :string)
-           ("Ž" "�" :string)
-           ("ț" "�" :string)
-           ("Ł" "�" :string)
-           ("À" "�" :string)
-           ("à" "�" :string)
+           ("É" "�" :string)
+           ("ă" "�" :string)
+           ("Ë" "�" :string)
+           ("Ș" "�" :string)
+           ("Ì" "�" :string)
+           ("ì" "�" :string)
+           ("Ú" "�" :string)
+           ("Ÿ" "�" :string)
+           ("è" "�" :string)
+           ("Ç" "�" :string)
+           ("Ĉ" "�" :string)
+           ("Ŕ" "�" :string)
+           ("ą" "�" :string)
            ("Ľ" "�" :string)
+           ("š" "�" :string)
+           ("ż" "�" :string)
+           ("ä" "�" :string)
+           ("Ĝ" "�" :string)
+           ("Ò" "�" :string)
+           ("ý" "�" :string)
+           ("Ñ" "�" :string)
            ("Ó" "�" :string)
-           ("ĥ" "�" :string)
+           ("ę" "�" :string)
+           ("Ê" "�" :string)
+           ("ü" "�" :string)
+           ("Š" "�" :string)
+           ("Ą" "�" :string)
+           ("Ň" "�" :string)
+           ("ź" "�" :string)
+           ("Û" "�" :string)
+           ("Ş" "�" :string)
+           ("ť" "�" :string)
+           ("ò" "�" :string)
+           ("Ć" "�" :string)
+           ("ĵ" "�" :string)
+           ("ț" "�" :string)
            ("ŕ" "�" :string)
+           ("Á" "�" :string)
            ("é" "�" :string)
-           ("Ô" "�" :string)
-           ("Ŭ" "�" :string)
-           ("Å" "�" :string)
-           ("Õ" "�" :string)
-           ("ź" "�" :string)
-           ("Ś" "�" :string)
-           ("Ń" "�" :string)
            ("Ã" "�" :string)
-           ("ő" "�" :string)
-           ("ą" "�" :string)
-           ("ÿ" "�" :string)
-           ("Ű" "�" :string)
-           ("ï" "�" :string)
-           ("ů" "�" :string)
-           ("ğ" "�" :string)
-           ("Ú" "�" :string)
-           ("ş" "�" :string)
-           ("Ÿ" "�" :string)
-           ("đ" "�" :string)
-           ("ì" "�" :string)
+           ("Ț" "�" :string)
            ("č" "�" :string)
-           ("Ŕ" "�" :string)
-           ("ď" "�" :string)
-           ("Ș" "�" :string)
-           ("ć" "�" :string)
-           ("ç" "�" :string)
-           ("ŭ" "�" :string)
-           ("Ă" "�" :string)
-           ("Ź" "�" :string)
-           ("Ü" "�" :string)
+           ("Å" "�" :string)
            ("ň" "�" :string)
-           ("å" "�" :string)
-           ("Á" "�" :string)
-           ("ř" "�" :string)
-           ("Ø" "�" :string)
-           ("ĉ" "�" :string)
-           ("Ñ" "�" :string)
-           ("ě" "�" :string)
-           ("Ù" "�" :string)
-           ("Ŝ" "�" :string)
-           ("õ" "�" :string)
-           ("Ğ" "�" :string)
-           ("Ĉ" "�" :string)
-           ("ľ" "�" :string)
-           ("Ë" "�" :string)
-           ("ž" "�" :string)
-           ("ö" "�" :string)
-           ("Ê" "�" :string)
-           ("Č" "�" :string)
-           ("ù" "�" :string)
-           ("ô" "�" :string)
-           ("Ĝ" "�" :string)
-           ("È" "�" :string)
-           ("Ť" "�" :string)
-           ("Í" "�" :string)
-           ("É" "�" :string)
-           ("ű" "�" :string)
-           ("ż" "�" :string)
            ("Î" "�" :string)
-           ("Ą" "�" :string)
-           ("Ň" "�" :string)
-           ("ĝ" "�" :string)
-           ("Ő" "�" :string)
+           ("á" "�" :string)
+           ("ù" "�" :string)
+           ("đ" "�" :string)
+           ("Ô" "�" :string)
+           ("İ" "�" :string)
+           ("Ű" "�" :string)
+           ("Ù" "�" :string)
+           ("ğ" "�" :string)
+           ("ı" "�" :string)
+           ("î" "�" :string)
            ("Â" "�" :string)
-           ("ó" "�" :string)
+           ("Ŭ" "�" :string)
            ("ã" "�" :string)
-           ("ĵ" "�" :string)
-           ("Ç" "�" :string)
-           ("â" "�" :string)
-           ("è" "�" :string)
-           ("Ï" "�" :string)
+           ("Ť" "�" :string)
+           ("Ğ" "�" :string)
+           ("ś" "�" :string)
+           ("Ü" "�" :string)
+           ("ø" "�" :string)
+           ("í" "�" :string)
+           ("È" "�" :string)
            ("œ" "��" :string)
-           ("Œ" "��" :string)
            ("æ" "��" :string)
-           ("Æ" "��" :string)
+           ("Œ" "��" :string)
            ("ß" "��" :string)
+           ("Æ" "��" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("x" "�" :string)
-           ("O" "�" :string)
-           ("L" "�" :string)
-           ("g" "�" :string)
-           ("T" "�" :string)
+           ("c" "�" :string)
+           ("z" "�" :string)
+           ("i" "�" :string)
+           ("Q" "�" :string)
+           ("A" "�" :string)
+           ("l" "�" :string)
            ("H" "�" :string)
-           ("P" "�" :string)
-           ("W" "�" :string)
-           ("q" "�" :string)
+           ("F" "�" :string)
+           ("U" "�" :string)
+           ("G" "�" :string)
            ("b" "�" :string)
-           ("N" "�" :string)
-           ("d" "�" :string)
-           ("Y" "�" :string)
-           ("w" "�" :string)
+           ("j" "�" :string)
+           ("p" "�" :string)
            ("u" "�" :string)
-           ("y" "�" :string)
            ("a" "�" :string)
-           ("Z" "�" :string)
-           ("p" "�" :string)
-           ("m" "�" :string)
+           ("J" "�" :string)
+           ("Y" "�" :string)
+           ("L" "�" :string)
            ("t" "�" :string)
-           ("z" "�" :string)
+           ("e" "�" :string)
            ("o" "�" :string)
-           ("D" "�" :string)
-           ("M" "�" :string)
+           ("O" "�" :string)
+           ("g" "�" :string)
+           ("n" "�" :string)
+           ("V" "�" :string)
+           ("N" "�" :string)
+           ("E" "�" :string)
            ("f" "�" :string)
+           ("X" "�" :string)
+           ("x" "�" :string)
+           ("Z" "�" :string)
+           ("T" "�" :string)
+           ("M" "�" :string)
            ("C" "�" :string)
+           ("S" "�" :string)
+           ("I" "�" :string)
            ("B" "�" :string)
-           ("l" "�" :string)
-           ("J" "�" :string)
-           ("i" "�" :string)
-           ("A" "�" :string)
            ("h" "�" :string)
-           ("s" "�" :string)
+           ("W" "�" :string)
+           ("y" "�" :string)
+           ("P" "�" :string)
+           ("q" "�" :string)
+           ("K" "�" :string)
            ("v" "�" :string)
            ("k" "�" :string)
            ("r" "�" :string)
-           ("e" "�" :string)
-           ("U" "�" :string)
-           ("S" "�" :string)
-           ("X" "�" :string)
-           ("c" "�" :string)
-           ("V" "�" :string)
-           ("F" "�" :string)
-           ("E" "�" :string)
-           ("K" "�" :string)
-           ("I" "�" :string)
-           ("n" "�" :string)
-           ("j" "�" :string)
-           ("Q" "�" :string)
-           ("G" "�" :string)
+           ("m" "�" :string)
+           ("D" "�" :string)
+           ("w" "�" :string)
+           ("d" "�" :string)
+           ("s" "�" :string)
            ("R" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/georgian/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/georgian/utf8.xdy
index a325c530794..7c5416a3c3b 100644
--- a/Master/texmf-dist/xindy/modules/lang/georgian/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/georgian/utf8.xdy
@@ -84,139 +84,139 @@
 
 (define-rule-set "ka-resolve-diacritics"
 
-  :rules  (("შ" "�" :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)
            ))
 
 (define-rule-set "ka-resolve-case"
 
-  :rules  (("ტ" "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)
+  :rules  (("პ" "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 "ka-ignore-special"
 
-  :rules  (("\/" "" :string)
-           ("·" "" :string)
-           ("'" "" :string)
-           ("?" "" :string)
+  :rules  (("·" "" :string)
+           ("\/" "" :string)
            (";" "" :string)
-           ("!" "" :string)
-           ("." "" :string)
            ("-" "" :string)
+           ("?" "" :string)
+           ("'" "" :string)
+           ("." "" :string)
+           ("!" "" :string)
            ))
 
 (define-rule-set "ka-resolve-special"
 
-  :rules  (("ჴ" "�" :string)
-           ("ჟ" "�" :string)
-           ("ჱ" "�" :string)
-           ("ი" "�" :string)
-           ("ჳ" "�" :string)
-           ("ყ" "�" :string)
-           ("კ" "�" :string)
-           ("ჭ" "�" :string)
-           ("ო" "�" :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)
diff --git a/Master/texmf-dist/xindy/modules/lang/german/braille-utf8.xdy b/Master/texmf-dist/xindy/modules/lang/german/braille-utf8.xdy
index ff1fe44c89c..bc98012d70e 100644
--- a/Master/texmf-dist/xindy/modules/lang/german/braille-utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/german/braille-utf8.xdy
@@ -51,8 +51,8 @@
            ("⠇" "�" :string)
            ("⠍" "�" :string)
            ("⠝" "�" :string)
-           ("⠕" "�" :string)
            ("⠪" "�" :string)
+           ("⠕" "�" :string)
            ("⠏" "�" :string)
            ("⠟" "�" :string)
            ("⠗" "�" :string)
@@ -72,108 +72,108 @@
 
 (define-rule-set "de-resolve-diacritics"
 
-  :rules  (("⠕" "�" :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)
            ))
 
 (define-rule-set "de-resolve-case"
 
-  :rules  (("⠑" "9" :string)
+  :rules  (("⠅" "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)
-           ("⠩" "99" :string)
+           ("⠕" "9" :string)
+           ("⠭" "9" :string)
+           ("⠍" "9" :string)
            ("⠡" "99" :string)
+           ("⠬" "99" :string)
            ("⠹" "99" :string)
-           ("⠮" "99" :string)
-           ("⠌" "99" :string)
            ("⠣" "99" :string)
            ("⠾" "99" :string)
-           ("⠬" "99" :string)
+           ("⠮" "99" :string)
+           ("⠩" "99" :string)
+           ("⠌" "99" :string)
            ("⠱" "999" :string)
            ))
 
 (define-rule-set "de-ignore-special"
 
   :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)
            ))
 
 (define-rule-set "de-resolve-special"
@@ -190,43 +190,43 @@
            ("⠴" "�" :string)
            ("⠄" "�" :string)
            ("⠤" "�" :string)
-           ("⠽" "�" :string)
-           ("⠞" "�" :string)
-           ("⠊" "�" :string)
-           ("⠗" "�" :string)
-           ("⠵" "�" :string)
+           ("⠁" "�" :string)
+           ("⠏" "�" :string)
            ("⠛" "�" :string)
-           ("⠕" "�" :string)
-           ("⠥" "�" :string)
            ("⠅" "�" :string)
-           ("⠙" "�" :string)
-           ("⠳" "�" :string)
-           ("⠍" "�" :string)
-           ("⠏" "�" :string)
-           ("⠁" "�" :string)
-           ("⠚" "�" :string)
-           ("⠜" "�" :string)
-           ("⠪" "�" :string)
-           ("⠓" "�" :string)
-           ("⠝" "�" :string)
-           ("⠉" "�" :string)
-           ("⠇" "�" :string)
            ("⠟" "�" :string)
+           ("⠚" "�" :string)
            ("⠑" "�" :string)
+           ("⠉" "�" :string)
+           ("⠪" "�" :string)
            ("⠧" "�" :string)
-           ("⠃" "�" :string)
+           ("⠙" "�" :string)
+           ("⠜" "�" :string)
+           ("⠽" "�" :string)
            ("⠎" "�" :string)
            ("⠋" "�" :string)
+           ("⠇" "�" :string)
+           ("⠳" "�" :string)
+           ("⠝" "�" :string)
+           ("⠥" "�" :string)
+           ("⠃" "�" :string)
+           ("⠊" "�" :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/german/din5007-latin1.xdy b/Master/texmf-dist/xindy/modules/lang/german/din5007-latin1.xdy
index 18420c63d2e..e393bf34036 100644
--- a/Master/texmf-dist/xindy/modules/lang/german/din5007-latin1.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/german/din5007-latin1.xdy
@@ -30,208 +30,208 @@
 
 (define-rule-set "de-alphabetize"
 
-  :rules  (("A" "�" :string)
-           ("a" "�" :string)
+  :rules  (("a" "�" :string)
+           ("A" "�" :string)
            ("�" "��" :string)
            ("�" "��" :string)
-           ("B" "�" :string)
            ("b" "�" :string)
-           ("c" "�" :string)
+           ("B" "�" :string)
            ("C" "�" :string)
-           ("D" "�" :string)
+           ("c" "�" :string)
            ("d" "�" :string)
-           ("e" "�" :string)
-           ("�" "�" :string)
+           ("D" "�" :string)
            ("�" "�" :string)
            ("E" "�" :string)
+           ("e" "�" :string)
+           ("�" "�" :string)
            ("F" "�" :string)
            ("f" "�" :string)
-           ("g" "�" :string)
            ("G" "�" :string)
-           ("H" "�" :string)
+           ("g" "�" :string)
            ("h" "�" :string)
+           ("H" "�" :string)
            ("I" "�" :string)
            ("i" "�" :string)
-           ("J" "�" :string)
            ("j" "�" :string)
-           ("K" "�" :string)
+           ("J" "�" :string)
            ("k" "�" :string)
-           ("l" "�" :string)
+           ("K" "�" :string)
            ("L" "�" :string)
+           ("l" "�" :string)
            ("M" "�" :string)
            ("m" "�" :string)
            ("N" "�" :string)
            ("n" "�" :string)
-           ("o" "�" :string)
            ("O" "�" :string)
+           ("o" "�" :string)
            ("�" "×" :string)
            ("�" "×" :string)
-           ("P" "�" :string)
            ("p" "�" :string)
+           ("P" "�" :string)
            ("q" "�" :string)
            ("Q" "�" :string)
            ("R" "�" :string)
            ("r" "�" :string)
-           ("S" "�" :string)
            ("s" "�" :string)
+           ("S" "�" :string)
            ("�" "��" :string)
-           ("T" "�" :string)
            ("t" "�" :string)
+           ("T" "�" :string)
            ("U" "�" :string)
            ("u" "�" :string)
-           ("�" "��" :string)
            ("�" "��" :string)
+           ("�" "��" :string)
            ("v" "�" :string)
            ("V" "�" :string)
            ("W" "�" :string)
            ("w" "�" :string)
-           ("X" "�" :string)
            ("x" "�" :string)
-           ("Y" "�" :string)
+           ("X" "�" :string)
            ("y" "�" :string)
-           ("z" "�" :string)
+           ("Y" "�" :string)
            ("Z" "�" :string)
+           ("z" "�" :string)
            ))
 
 (define-rule-set "de-resolve-diacritics"
 
-  :rules  (("X" "�" :string)
-           ("T" "�" :string)
-           ("K" "�" :string)
-           ("g" "�" :string)
-           ("Y" "�" :string)
-           ("F" "�" :string)
-           ("I" "�" :string)
-           ("M" "�" :string)
-           ("e" "�" :string)
-           ("P" "�" :string)
-           ("U" "�" :string)
-           ("S" "�" :string)
-           ("R" "�" :string)
-           ("v" "�" :string)
-           ("c" "�" :string)
-           ("r" "�" :string)
+  :rules  (("R" "�" :string)
+           ("w" "�" :string)
            ("s" "�" :string)
-           ("G" "�" :string)
-           ("q" "�" :string)
-           ("u" "�" :string)
-           ("Q" "�" :string)
-           ("A" "�" :string)
-           ("J" "�" :string)
-           ("N" "�" :string)
+           ("V" "�" :string)
+           ("t" "�" :string)
+           ("e" "�" :string)
+           ("p" "�" :string)
            ("W" "�" :string)
-           ("z" "�" :string)
-           ("B" "�" :string)
+           ("E" "�" :string)
+           ("I" "�" :string)
+           ("o" "�" :string)
+           ("c" "�" :string)
            ("H" "�" :string)
+           ("l" "�" :string)
+           ("X" "�" :string)
+           ("n" "�" :string)
+           ("k" "�" :string)
+           ("O" "�" :string)
+           ("z" "�" :string)
+           ("v" "�" :string)
            ("h" "�" :string)
-           ("o" "�" :string)
+           ("N" "�" :string)
+           ("Z" "�" :string)
+           ("C" "�" :string)
            ("a" "�" :string)
-           ("l" "�" :string)
-           ("w" "�" :string)
-           ("d" "�" :string)
+           ("L" "�" :string)
+           ("y" "�" :string)
            ("x" "�" :string)
-           ("t" "�" :string)
-           ("C" "�" :string)
+           ("J" "�" :string)
+           ("Y" "�" :string)
+           ("A" "�" :string)
+           ("u" "�" :string)
+           ("j" "�" :string)
+           ("K" "�" :string)
+           ("g" "�" :string)
+           ("Q" "�" :string)
+           ("B" "�" :string)
+           ("b" "�" :string)
            ("D" "�" :string)
            ("m" "�" :string)
-           ("y" "�" :string)
-           ("O" "�" :string)
+           ("d" "�" :string)
+           ("q" "�" :string)
+           ("r" "�" :string)
+           ("G" "�" :string)
+           ("M" "�" :string)
+           ("U" "�" :string)
            ("i" "�" :string)
            ("f" "�" :string)
-           ("n" "�" :string)
-           ("Z" "�" :string)
-           ("j" "�" :string)
-           ("V" "�" :string)
-           ("k" "�" :string)
-           ("E" "�" :string)
-           ("p" "�" :string)
-           ("L" "�" :string)
-           ("b" "�" :string)
-           ("�" "�" :string)
+           ("S" "�" :string)
+           ("F" "�" :string)
+           ("T" "�" :string)
+           ("P" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ))
 
 (define-rule-set "de-resolve-case"
 
-  :rules  (("D" "8" :string)
-           ("C" "8" :string)
-           ("O" "8" :string)
-           ("Z" "8" :string)
-           ("�" "8" :string)
-           ("V" "8" :string)
-           ("L" "8" :string)
-           ("E" "8" :string)
-           ("K" "8" :string)
-           ("X" "8" :string)
-           ("T" "8" :string)
-           ("I" "8" :string)
+  :rules  (("A" "8" :string)
            ("Y" "8" :string)
-           ("F" "8" :string)
-           ("M" "8" :string)
-           ("S" "8" :string)
-           ("R" "8" :string)
-           ("U" "8" :string)
-           ("P" "8" :string)
-           ("G" "8" :string)
            ("J" "8" :string)
-           ("N" "8" :string)
-           ("W" "8" :string)
+           ("D" "8" :string)
            ("Q" "8" :string)
-           ("A" "8" :string)
            ("B" "8" :string)
+           ("K" "8" :string)
+           ("G" "8" :string)
+           ("M" "8" :string)
+           ("F" "8" :string)
+           ("T" "8" :string)
+           ("P" "8" :string)
+           ("S" "8" :string)
+           ("U" "8" :string)
+           ("V" "8" :string)
+           ("R" "8" :string)
+           ("X" "8" :string)
+           ("�" "8" :string)
            ("H" "8" :string)
-           ("�" "89" :string)
+           ("I" "8" :string)
+           ("W" "8" :string)
+           ("E" "8" :string)
+           ("N" "8" :string)
+           ("O" "8" :string)
+           ("L" "8" :string)
+           ("C" "8" :string)
+           ("Z" "8" :string)
            ("�" "89" :string)
            ("�" "89" :string)
-           ("w" "9" :string)
-           ("d" "9" :string)
-           ("x" "9" :string)
-           ("t" "9" :string)
-           ("y" "9" :string)
-           ("m" "9" :string)
-           ("i" "9" :string)
-           ("n" "9" :string)
-           ("f" "9" :string)
+           ("�" "89" :string)
+           ("u" "9" :string)
            ("j" "9" :string)
-           ("k" "9" :string)
-           ("p" "9" :string)
            ("b" "9" :string)
-           ("g" "9" :string)
-           ("e" "9" :string)
            ("�" "9" :string)
-           ("v" "9" :string)
-           ("s" "9" :string)
+           ("g" "9" :string)
            ("r" "9" :string)
+           ("m" "9" :string)
+           ("d" "9" :string)
            ("q" "9" :string)
+           ("i" "9" :string)
+           ("f" "9" :string)
+           ("t" "9" :string)
+           ("e" "9" :string)
+           ("s" "9" :string)
+           ("w" "9" :string)
+           ("n" "9" :string)
            ("c" "9" :string)
-           ("u" "9" :string)
-           ("z" "9" :string)
            ("o" "9" :string)
            ("l" "9" :string)
-           ("a" "9" :string)
+           ("p" "9" :string)
+           ("z" "9" :string)
+           ("v" "9" :string)
            ("h" "9" :string)
+           ("k" "9" :string)
+           ("x" "9" :string)
+           ("y" "9" :string)
+           ("a" "9" :string)
+           ("�" "99" :string)
+           ("�" "99" :string)
            ("�" "99" :string)
            ("�" "99" :string)
-           ("�" "99" :string)
-           ("�" "99" :string)
            ))
 
 (define-rule-set "de-ignore-special"
 
-  :rules  (("." "" :string)
-           ("!" "" :string)
+  :rules  (("!" "" :string)
            ("{" "" :string)
-           ("'" "" :string)
-           ("-" "" :string)
            ("?" "" :string)
+           ("-" "" :string)
            ("}" "" :string)
+           ("'" "" :string)
+           ("." "" :string)
            ))
 
 (define-rule-set "de-resolve-special"
@@ -239,67 +239,67 @@
   :rules  (("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("b" "�" :string)
-           ("p" "�" :string)
-           ("k" "�" :string)
-           ("j" "�" :string)
-           ("f" "�" :string)
-           ("O" "�" :string)
-           ("i" "�" :string)
-           ("m" "�" :string)
-           ("y" "�" :string)
-           ("w" "�" :string)
-           ("d" "�" :string)
-           ("x" "�" :string)
-           ("C" "�" :string)
-           ("l" "�" :string)
-           ("a" "�" :string)
-           ("z" "�" :string)
-           ("H" "�" :string)
-           ("J" "�" :string)
-           ("N" "�" :string)
-           ("G" "�" :string)
-           ("q" "�" :string)
-           ("U" "�" :string)
-           ("R" "�" :string)
            ("M" "�" :string)
+           ("d" "�" :string)
+           ("m" "�" :string)
+           ("P" "�" :string)
+           ("T" "�" :string)
            ("F" "�" :string)
-           ("X" "�" :string)
+           ("U" "�" :string)
+           ("j" "�" :string)
+           ("u" "�" :string)
+           ("A" "�" :string)
+           ("b" "�" :string)
+           ("g" "�" :string)
            ("K" "�" :string)
-           ("E" "�" :string)
+           ("v" "�" :string)
+           ("h" "�" :string)
+           ("z" "�" :string)
+           ("y" "�" :string)
            ("L" "�" :string)
-           ("�" "�" :string)
-           ("V" "�" :string)
-           ("n" "�" :string)
            ("Z" "�" :string)
-           ("t" "�" :string)
-           ("D" "�" :string)
-           ("h" "�" :string)
-           ("o" "�" :string)
-           ("B" "�" :string)
-           ("Q" "�" :string)
-           ("A" "�" :string)
-           ("u" "�" :string)
+           ("a" "�" :string)
+           ("C" "�" :string)
+           ("V" "�" :string)
+           ("s" "�" :string)
+           ("H" "�" :string)
+           ("l" "�" :string)
+           ("�" "�" :string)
+           ("X" "�" :string)
            ("W" "�" :string)
-           ("c" "�" :string)
+           ("G" "�" :string)
            ("r" "�" :string)
-           ("s" "�" :string)
-           ("P" "�" :string)
+           ("q" "�" :string)
            ("S" "�" :string)
-           ("v" "�" :string)
+           ("f" "�" :string)
+           ("i" "�" :string)
+           ("J" "�" :string)
+           ("Y" "�" :string)
+           ("D" "�" :string)
            ("�" "�" :string)
+           ("B" "�" :string)
+           ("Q" "�" :string)
+           ("N" "�" :string)
+           ("k" "�" :string)
+           ("O" "�" :string)
+           ("x" "�" :string)
            ("e" "�" :string)
-           ("Y" "�" :string)
-           ("g" "�" :string)
+           ("t" "�" :string)
+           ("w" "�" :string)
+           ("R" "�" :string)
+           ("c" "�" :string)
+           ("o" "�" :string)
+           ("n" "�" :string)
+           ("p" "�" :string)
+           ("E" "�" :string)
            ("I" "�" :string)
-           ("T" "�" :string)
-           ("�" "��" :string)
            ("�" "��" :string)
-           ("�" "��" :string)
            ("�" "��" :string)
            ("�" "��" :string)
-           ("�" "��" :string)
            ("�" "��" :string)
+           ("�" "��" :string)
+           ("�" "��" :string)
+           ("�" "��" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ("{" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/german/din5007-utf8.xdy b/Master/texmf-dist/xindy/modules/lang/german/din5007-utf8.xdy
index bd212913aad..a2875adca9a 100644
--- a/Master/texmf-dist/xindy/modules/lang/german/din5007-utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/german/din5007-utf8.xdy
@@ -30,23 +30,23 @@
 
 (define-rule-set "de-alphabetize"
 
-  :rules  (("Ä" "��" :string)
-           ("ä" "��" :string)
-           ("é" "�" :string)
+  :rules  (("ä" "��" :string)
+           ("Ä" "��" :string)
            ("É" "�" :string)
-           ("ö" "×" :string)
+           ("é" "�" :string)
            ("Ö" "×" :string)
+           ("ö" "×" :string)
            ("ß" "��" :string)
-           ("ü" "��" :string)
            ("Ü" "��" :string)
-           ("a" "�" :string)
+           ("ü" "��" :string)
            ("A" "�" :string)
-           ("b" "�" :string)
+           ("a" "�" :string)
            ("B" "�" :string)
-           ("C" "�" :string)
+           ("b" "�" :string)
            ("c" "�" :string)
-           ("d" "�" :string)
+           ("C" "�" :string)
            ("D" "�" :string)
+           ("d" "�" :string)
            ("e" "�" :string)
            ("E" "�" :string)
            ("f" "�" :string)
@@ -59,30 +59,30 @@
            ("I" "�" :string)
            ("j" "�" :string)
            ("J" "�" :string)
-           ("K" "�" :string)
            ("k" "�" :string)
+           ("K" "�" :string)
            ("L" "�" :string)
            ("l" "�" :string)
-           ("M" "�" :string)
            ("m" "�" :string)
+           ("M" "�" :string)
            ("n" "�" :string)
            ("N" "�" :string)
-           ("o" "�" :string)
            ("O" "�" :string)
+           ("o" "�" :string)
            ("P" "�" :string)
            ("p" "�" :string)
            ("q" "�" :string)
            ("Q" "�" :string)
-           ("r" "�" :string)
            ("R" "�" :string)
+           ("r" "�" :string)
            ("s" "�" :string)
            ("S" "�" :string)
            ("t" "�" :string)
            ("T" "�" :string)
-           ("U" "�" :string)
            ("u" "�" :string)
-           ("V" "�" :string)
+           ("U" "�" :string)
            ("v" "�" :string)
+           ("V" "�" :string)
            ("w" "�" :string)
            ("W" "�" :string)
            ("X" "�" :string)
@@ -95,211 +95,211 @@
 
 (define-rule-set "de-resolve-diacritics"
 
-  :rules  (("é" "�" :string)
-           ("É" "�" :string)
+  :rules  (("É" "�" :string)
+           ("é" "�" :string)
            ("Ä" "�" :string)
+           ("ü" "�" :string)
+           ("ä" "�" :string)
+           ("ß" "�" :string)
            ("Ö" "�" :string)
            ("ö" "�" :string)
-           ("ß" "�" :string)
-           ("ü" "�" :string)
            ("Ü" "�" :string)
-           ("ä" "�" :string)
-           ("q" "�" :string)
-           ("r" "�" :string)
-           ("O" "�" :string)
-           ("K" "�" :string)
-           ("y" "�" :string)
-           ("w" "�" :string)
-           ("A" "�" :string)
            ("I" "�" :string)
-           ("R" "�" :string)
-           ("d" "�" :string)
-           ("C" "�" :string)
-           ("o" "�" :string)
-           ("a" "�" :string)
-           ("u" "�" :string)
-           ("s" "�" :string)
-           ("i" "�" :string)
-           ("U" "�" :string)
-           ("n" "�" :string)
-           ("e" "�" :string)
-           ("V" "�" :string)
-           ("P" "�" :string)
-           ("t" "�" :string)
-           ("x" "�" :string)
-           ("M" "�" :string)
-           ("G" "�" :string)
            ("N" "�" :string)
-           ("j" "�" :string)
-           ("k" "�" :string)
-           ("p" "�" :string)
+           ("S" "�" :string)
+           ("W" "�" :string)
+           ("V" "�" :string)
+           ("U" "�" :string)
+           ("o" "�" :string)
+           ("O" "�" :string)
            ("z" "�" :string)
+           ("h" "�" :string)
            ("F" "�" :string)
+           ("n" "�" :string)
+           ("r" "�" :string)
+           ("v" "�" :string)
+           ("Q" "�" :string)
            ("Z" "�" :string)
-           ("T" "�" :string)
+           ("s" "�" :string)
+           ("E" "�" :string)
+           ("u" "�" :string)
+           ("b" "�" :string)
            ("l" "�" :string)
+           ("G" "�" :string)
            ("J" "�" :string)
-           ("v" "�" :string)
-           ("L" "�" :string)
-           ("B" "�" :string)
+           ("x" "�" :string)
+           ("H" "�" :string)
+           ("g" "�" :string)
+           ("w" "�" :string)
+           ("i" "�" :string)
+           ("T" "�" :string)
+           ("t" "�" :string)
+           ("p" "�" :string)
+           ("c" "�" :string)
            ("m" "�" :string)
+           ("R" "�" :string)
+           ("K" "�" :string)
+           ("M" "�" :string)
            ("Y" "�" :string)
-           ("E" "�" :string)
+           ("C" "�" :string)
+           ("k" "�" :string)
+           ("A" "�" :string)
+           ("y" "�" :string)
+           ("e" "�" :string)
            ("D" "�" :string)
-           ("b" "�" :string)
-           ("c" "�" :string)
-           ("X" "�" :string)
-           ("S" "�" :string)
-           ("g" "�" :string)
+           ("q" "�" :string)
            ("f" "�" :string)
-           ("H" "�" :string)
-           ("W" "�" :string)
-           ("Q" "�" :string)
-           ("h" "�" :string)
+           ("X" "�" :string)
+           ("P" "�" :string)
+           ("L" "�" :string)
+           ("B" "�" :string)
+           ("d" "�" :string)
+           ("j" "�" :string)
+           ("a" "�" :string)
            ))
 
 (define-rule-set "de-resolve-case"
 
   :rules  (("É" "8" :string)
-           ("Ö" "89" :string)
            ("Ä" "89" :string)
            ("Ü" "89" :string)
+           ("Ö" "89" :string)
            ("é" "9" :string)
            ("ü" "99" :string)
+           ("ä" "99" :string)
            ("ß" "99" :string)
            ("ö" "99" :string)
-           ("ä" "99" :string)
+           ("W" "8" :string)
            ("V" "8" :string)
-           ("P" "8" :string)
            ("U" "8" :string)
-           ("R" "8" :string)
            ("I" "8" :string)
-           ("C" "8" :string)
-           ("A" "8" :string)
-           ("O" "8" :string)
-           ("K" "8" :string)
+           ("N" "8" :string)
            ("S" "8" :string)
-           ("H" "8" :string)
-           ("W" "8" :string)
-           ("Q" "8" :string)
-           ("X" "8" :string)
            ("E" "8" :string)
-           ("D" "8" :string)
-           ("B" "8" :string)
-           ("Y" "8" :string)
-           ("T" "8" :string)
+           ("G" "8" :string)
+           ("O" "8" :string)
+           ("Q" "8" :string)
            ("Z" "8" :string)
-           ("J" "8" :string)
-           ("L" "8" :string)
            ("F" "8" :string)
+           ("R" "8" :string)
+           ("C" "8" :string)
+           ("K" "8" :string)
+           ("Y" "8" :string)
            ("M" "8" :string)
-           ("N" "8" :string)
-           ("G" "8" :string)
-           ("t" "9" :string)
-           ("n" "9" :string)
-           ("e" "9" :string)
+           ("H" "8" :string)
+           ("J" "8" :string)
+           ("T" "8" :string)
+           ("L" "8" :string)
+           ("P" "8" :string)
+           ("B" "8" :string)
+           ("A" "8" :string)
+           ("X" "8" :string)
+           ("D" "8" :string)
+           ("o" "9" :string)
            ("s" "9" :string)
+           ("l" "9" :string)
            ("u" "9" :string)
-           ("i" "9" :string)
-           ("o" "9" :string)
-           ("a" "9" :string)
-           ("d" "9" :string)
-           ("w" "9" :string)
-           ("q" "9" :string)
-           ("r" "9" :string)
-           ("y" "9" :string)
-           ("h" "9" :string)
-           ("g" "9" :string)
-           ("f" "9" :string)
-           ("c" "9" :string)
            ("b" "9" :string)
-           ("m" "9" :string)
-           ("l" "9" :string)
-           ("v" "9" :string)
-           ("k" "9" :string)
+           ("h" "9" :string)
            ("z" "9" :string)
+           ("v" "9" :string)
+           ("n" "9" :string)
+           ("r" "9" :string)
+           ("m" "9" :string)
            ("p" "9" :string)
+           ("c" "9" :string)
+           ("g" "9" :string)
+           ("w" "9" :string)
            ("x" "9" :string)
+           ("t" "9" :string)
+           ("i" "9" :string)
+           ("a" "9" :string)
            ("j" "9" :string)
+           ("d" "9" :string)
+           ("y" "9" :string)
+           ("e" "9" :string)
+           ("k" "9" :string)
+           ("f" "9" :string)
+           ("q" "9" :string)
            ))
 
 (define-rule-set "de-ignore-special"
 
-  :rules  (("-" "" :string)
-           ("!" "" :string)
+  :rules  (("}" "" :string)
            ("'" "" :string)
-           ("}" "" :string)
-           ("?" "" :string)
            ("{" "" :string)
+           ("!" "" :string)
+           ("?" "" :string)
            ("." "" :string)
+           ("-" "" :string)
            ))
 
 (define-rule-set "de-resolve-special"
 
-  :rules  (("é" "�" :string)
-           ("É" "�" :string)
-           ("ß" "��" :string)
-           ("ö" "��" :string)
-           ("ü" "��" :string)
+  :rules  (("É" "�" :string)
+           ("é" "�" :string)
            ("Ö" "��" :string)
-           ("Ä" "��" :string)
-           ("ä" "��" :string)
+           ("ö" "��" :string)
            ("Ü" "��" :string)
+           ("ß" "��" :string)
+           ("ä" "��" :string)
+           ("Ä" "��" :string)
+           ("ü" "��" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("V" "�" :string)
-           ("i" "�" :string)
-           ("s" "�" :string)
-           ("o" "�" :string)
-           ("d" "�" :string)
-           ("R" "�" :string)
-           ("w" "�" :string)
-           ("O" "�" :string)
-           ("h" "�" :string)
-           ("f" "�" :string)
-           ("H" "�" :string)
-           ("W" "�" :string)
+           ("k" "�" :string)
            ("X" "�" :string)
+           ("f" "�" :string)
            ("D" "�" :string)
-           ("Y" "�" :string)
+           ("P" "�" :string)
+           ("a" "�" :string)
+           ("j" "�" :string)
            ("B" "�" :string)
+           ("H" "�" :string)
+           ("g" "�" :string)
+           ("x" "�" :string)
+           ("R" "�" :string)
            ("m" "�" :string)
-           ("T" "�" :string)
-           ("v" "�" :string)
+           ("c" "�" :string)
            ("p" "�" :string)
-           ("z" "�" :string)
-           ("x" "�" :string)
-           ("N" "�" :string)
-           ("t" "�" :string)
-           ("P" "�" :string)
-           ("n" "�" :string)
-           ("e" "�" :string)
-           ("U" "�" :string)
-           ("u" "�" :string)
-           ("a" "�" :string)
            ("C" "�" :string)
-           ("I" "�" :string)
-           ("A" "�" :string)
-           ("y" "�" :string)
-           ("q" "�" :string)
-           ("r" "�" :string)
+           ("M" "�" :string)
            ("K" "�" :string)
+           ("h" "�" :string)
+           ("O" "�" :string)
            ("Q" "�" :string)
-           ("S" "�" :string)
-           ("g" "�" :string)
-           ("c" "�" :string)
-           ("b" "�" :string)
-           ("E" "�" :string)
-           ("L" "�" :string)
            ("Z" "�" :string)
+           ("v" "�" :string)
+           ("r" "�" :string)
+           ("G" "�" :string)
            ("l" "�" :string)
+           ("u" "�" :string)
+           ("S" "�" :string)
+           ("W" "�" :string)
+           ("y" "�" :string)
+           ("e" "�" :string)
+           ("A" "�" :string)
+           ("q" "�" :string)
+           ("L" "�" :string)
+           ("d" "�" :string)
+           ("w" "�" :string)
            ("J" "�" :string)
+           ("t" "�" :string)
+           ("T" "�" :string)
+           ("i" "�" :string)
+           ("Y" "�" :string)
+           ("z" "�" :string)
+           ("n" "�" :string)
            ("F" "�" :string)
-           ("k" "�" :string)
-           ("M" "�" :string)
-           ("j" "�" :string)
-           ("G" "�" :string)
+           ("s" "�" :string)
+           ("E" "�" :string)
+           ("b" "�" :string)
+           ("N" "�" :string)
+           ("I" "�" :string)
+           ("V" "�" :string)
+           ("o" "�" :string)
+           ("U" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ("{" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/german/duden-latin1.xdy b/Master/texmf-dist/xindy/modules/lang/german/duden-latin1.xdy
index 4a10deb32cf..f8e70794f46 100644
--- a/Master/texmf-dist/xindy/modules/lang/german/duden-latin1.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/german/duden-latin1.xdy
@@ -30,44 +30,44 @@
 
 (define-rule-set "de-alphabetize"
 
-  :rules  (("a" "�" :string)
-           ("�" "�" :string)
+  :rules  (("�" "�" :string)
+           ("a" "�" :string)
            ("�" "�" :string)
            ("A" "�" :string)
-           ("B" "�" :string)
            ("b" "�" :string)
+           ("B" "�" :string)
            ("c" "�" :string)
            ("C" "�" :string)
            ("D" "�" :string)
            ("d" "�" :string)
+           ("�" "�" :string)
            ("e" "�" :string)
-           ("�" "�" :string)
            ("E" "�" :string)
-           ("�" "�" :string)
-           ("F" "�" :string)
+           ("�" "�" :string)
            ("f" "�" :string)
-           ("G" "�" :string)
+           ("F" "�" :string)
            ("g" "�" :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)
-           ("�" "�" :string)
-           ("o" "�" :string)
            ("�" "�" :string)
-           ("P" "�" :string)
+           ("o" "�" :string)
+           ("�" "�" :string)
+           ("O" "�" :string)
            ("p" "�" :string)
+           ("P" "�" :string)
            ("q" "�" :string)
            ("Q" "�" :string)
            ("R" "�" :string)
@@ -77,10 +77,10 @@
            ("�" "��" :string)
            ("T" "�" :string)
            ("t" "�" :string)
-           ("�" "�" :string)
-           ("u" "�" :string)
            ("U" "�" :string)
+           ("u" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("V" "�" :string)
            ("v" "�" :string)
            ("W" "�" :string)
@@ -95,143 +95,143 @@
 
 (define-rule-set "de-resolve-diacritics"
 
-  :rules  (("k" "�" :string)
+  :rules  (("f" "�" :string)
+           ("y" "�" :string)
+           ("J" "�" :string)
+           ("j" "�" :string)
+           ("g" "�" :string)
+           ("Y" "�" :string)
+           ("b" "�" :string)
            ("X" "�" :string)
+           ("z" "�" :string)
+           ("v" "�" :string)
+           ("k" "�" :string)
+           ("q" "�" :string)
+           ("a" "�" :string)
+           ("V" "�" :string)
+           ("H" "�" :string)
+           ("W" "�" :string)
+           ("e" "�" :string)
+           ("B" "�" :string)
+           ("Z" "�" :string)
+           ("U" "�" :string)
+           ("p" "�" :string)
+           ("G" "�" :string)
+           ("E" "�" :string)
+           ("M" "�" :string)
            ("l" "�" :string)
+           ("K" "�" :string)
+           ("D" "�" :string)
            ("n" "�" :string)
+           ("u" "�" :string)
            ("P" "�" :string)
-           ("E" "�" :string)
-           ("S" "�" :string)
-           ("j" "�" :string)
-           ("B" "�" :string)
-           ("O" "�" :string)
-           ("D" "�" :string)
-           ("Z" "�" :string)
-           ("a" "�" :string)
-           ("Y" "�" :string)
-           ("H" "�" :string)
-           ("q" "�" :string)
            ("i" "�" :string)
-           ("z" "�" :string)
-           ("W" "�" :string)
-           ("R" "�" :string)
            ("c" "�" :string)
-           ("e" "�" :string)
-           ("F" "�" :string)
+           ("T" "�" :string)
+           ("x" "�" :string)
+           ("Q" "�" :string)
            ("h" "�" :string)
-           ("f" "�" :string)
-           ("g" "�" :string)
            ("w" "�" :string)
-           ("N" "�" :string)
-           ("b" "�" :string)
+           ("d" "�" :string)
+           ("L" "�" :string)
+           ("R" "�" :string)
+           ("t" "�" :string)
            ("o" "�" :string)
+           ("F" "�" :string)
+           ("I" "�" :string)
            ("A" "�" :string)
-           ("Q" "�" :string)
-           ("t" "�" :string)
-           ("K" "�" :string)
-           ("s" "�" :string)
-           ("p" "�" :string)
-           ("C" "�" :string)
-           ("U" "�" :string)
-           ("x" "�" :string)
-           ("v" "�" :string)
-           ("M" "�" :string)
            ("m" "�" :string)
+           ("C" "�" :string)
+           ("S" "�" :string)
+           ("O" "�" :string)
+           ("N" "�" :string)
+           ("s" "�" :string)
            ("r" "�" :string)
-           ("T" "�" :string)
-           ("u" "�" :string)
-           ("d" "�" :string)
-           ("L" "�" :string)
-           ("I" "�" :string)
-           ("G" "�" :string)
-           ("V" "�" :string)
-           ("J" "�" :string)
-           ("y" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ))
 
 (define-rule-set "de-resolve-case"
 
-  :rules  (("W" "8" :string)
-           ("�" "8" :string)
-           ("R" "8" :string)
+  :rules  (("U" "8" :string)
            ("Z" "8" :string)
-           ("Y" "8" :string)
-           ("H" "8" :string)
-           ("O" "8" :string)
-           ("D" "8" :string)
-           ("B" "8" :string)
-           ("P" "8" :string)
            ("E" "8" :string)
-           ("S" "8" :string)
-           ("X" "8" :string)
-           ("�" "8" :string)
-           ("J" "8" :string)
-           ("T" "8" :string)
-           ("L" "8" :string)
            ("G" "8" :string)
-           ("I" "8" :string)
-           ("V" "8" :string)
-           ("�" "8" :string)
            ("M" "8" :string)
-           ("U" "8" :string)
-           ("C" "8" :string)
-           ("Q" "8" :string)
            ("K" "8" :string)
+           ("D" "8" :string)
+           ("J" "8" :string)
+           ("�" "8" :string)
+           ("Y" "8" :string)
+           ("X" "8" :string)
+           ("�" "8" :string)
+           ("H" "8" :string)
+           ("V" "8" :string)
+           ("B" "8" :string)
+           ("W" "8" :string)
+           ("R" "8" :string)
+           ("I" "8" :string)
+           ("F" "8" :string)
            ("A" "8" :string)
            ("N" "8" :string)
+           ("S" "8" :string)
+           ("O" "8" :string)
+           ("C" "8" :string)
+           ("P" "8" :string)
+           ("T" "8" :string)
            ("�" "8" :string)
-           ("F" "8" :string)
-           ("e" "9" :string)
-           ("z" "9" :string)
-           ("c" "9" :string)
-           ("i" "9" :string)
-           ("q" "9" :string)
-           ("a" "9" :string)
-           ("�" "9" :string)
-           ("j" "9" :string)
+           ("Q" "8" :string)
+           ("L" "8" :string)
+           ("�" "8" :string)
+           ("p" "9" :string)
            ("l" "9" :string)
            ("n" "9" :string)
-           ("k" "9" :string)
+           ("�" "9" :string)
+           ("j" "9" :string)
+           ("g" "9" :string)
+           ("b" "9" :string)
+           ("f" "9" :string)
            ("y" "9" :string)
-           ("u" "9" :string)
-           ("d" "9" :string)
-           ("r" "9" :string)
-           ("m" "9" :string)
+           ("a" "9" :string)
+           ("z" "9" :string)
            ("v" "9" :string)
-           ("x" "9" :string)
-           ("�" "9" :string)
+           ("q" "9" :string)
+           ("k" "9" :string)
+           ("e" "9" :string)
+           ("o" "9" :string)
+           ("t" "9" :string)
+           ("m" "9" :string)
            ("�" "9" :string)
+           ("r" "9" :string)
            ("s" "9" :string)
-           ("p" "9" :string)
-           ("t" "9" :string)
-           ("b" "9" :string)
-           ("o" "9" :string)
-           ("g" "9" :string)
-           ("w" "9" :string)
+           ("i" "9" :string)
+           ("u" "9" :string)
            ("�" "9" :string)
-           ("f" "9" :string)
+           ("c" "9" :string)
+           ("w" "9" :string)
+           ("x" "9" :string)
+           ("�" "9" :string)
            ("h" "9" :string)
+           ("d" "9" :string)
            ("�" "99" :string)
            ))
 
 (define-rule-set "de-ignore-special"
 
-  :rules  (("{" "" :string)
-           ("}" "" :string)
-           ("!" "" :string)
+  :rules  (("'" "" :string)
            ("." "" :string)
+           ("{" "" :string)
+           ("!" "" :string)
+           ("}" "" :string)
            ("-" "" :string)
            ("?" "" :string)
-           ("'" "" :string)
            ))
 
 (define-rule-set "de-resolve-special"
@@ -239,66 +239,66 @@
   :rules  (("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("x" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("M" "�" :string)
-           ("C" "�" :string)
-           ("I" "�" :string)
-           ("G" "�" :string)
-           ("J" "�" :string)
-           ("r" "�" :string)
-           ("�" "�" :string)
-           ("F" "�" :string)
-           ("h" "�" :string)
-           ("K" "�" :string)
-           ("p" "�" :string)
+           ("O" "�" :string)
            ("N" "�" :string)
-           ("w" "�" :string)
-           ("b" "�" :string)
-           ("o" "�" :string)
-           ("q" "�" :string)
-           ("e" "�" :string)
-           ("z" "�" :string)
+           ("s" "�" :string)
+           ("r" "�" :string)
+           ("t" "�" :string)
            ("R" "�" :string)
-           ("c" "�" :string)
-           ("X" "�" :string)
-           ("l" "�" :string)
+           ("o" "�" :string)
+           ("I" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("P" "�" :string)
-           ("k" "�" :string)
-           ("�" "�" :string)
+           ("i" "�" :string)
+           ("c" "�" :string)
+           ("�" "�" :string)
+           ("M" "�" :string)
+           ("G" "�" :string)
            ("D" "�" :string)
-           ("Z" "�" :string)
-           ("a" "�" :string)
-           ("H" "�" :string)
+           ("n" "�" :string)
+           ("U" "�" :string)
+           ("p" "�" :string)
            ("v" "�" :string)
+           ("k" "�" :string)
+           ("V" "�" :string)
+           ("e" "�" :string)
+           ("y" "�" :string)
+           ("�" "�" :string)
+           ("Y" "�" :string)
+           ("J" "�" :string)
+           ("j" "�" :string)
+           ("X" "�" :string)
+           ("C" "�" :string)
+           ("S" "�" :string)
+           ("F" "�" :string)
+           ("A" "�" :string)
            ("m" "�" :string)
-           ("�" "�" :string)
-           ("U" "�" :string)
-           ("T" "�" :string)
-           ("d" "�" :string)
+           ("h" "�" :string)
+           ("�" "�" :string)
+           ("Q" "�" :string)
+           ("x" "�" :string)
+           ("w" "�" :string)
            ("L" "�" :string)
+           ("d" "�" :string)
            ("u" "�" :string)
-           ("V" "�" :string)
-           ("y" "�" :string)
            ("�" "�" :string)
-           ("f" "�" :string)
-           ("Q" "�" :string)
-           ("t" "�" :string)
-           ("s" "�" :string)
-           ("g" "�" :string)
-           ("A" "�" :string)
-           ("i" "�" :string)
-           ("W" "�" :string)
-           ("�" "�" :string)
-           ("n" "�" :string)
-           ("S" "�" :string)
+           ("T" "�" :string)
            ("E" "�" :string)
-           ("O" "�" :string)
-           ("Y" "�" :string)
+           ("l" "�" :string)
+           ("K" "�" :string)
            ("�" "�" :string)
-           ("j" "�" :string)
+           ("Z" "�" :string)
+           ("z" "�" :string)
+           ("q" "�" :string)
+           ("H" "�" :string)
+           ("a" "�" :string)
+           ("W" "�" :string)
            ("B" "�" :string)
+           ("f" "�" :string)
+           ("b" "�" :string)
+           ("g" "�" :string)
+           ("�" "�" :string)
            ("�" "��" :string)
            ("-" "�" :string)
            ("'" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/german/duden-utf8.xdy b/Master/texmf-dist/xindy/modules/lang/german/duden-utf8.xdy
index 615d8372391..f37ac673452 100644
--- a/Master/texmf-dist/xindy/modules/lang/german/duden-utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/german/duden-utf8.xdy
@@ -30,29 +30,29 @@
 
 (define-rule-set "de-alphabetize"
 
-  :rules  (("Ä" "�" :string)
-           ("ä" "�" :string)
-           ("é" "�" :string)
+  :rules  (("ä" "�" :string)
+           ("Ä" "�" :string)
            ("É" "�" :string)
-           ("ö" "�" :string)
+           ("é" "�" :string)
            ("Ö" "�" :string)
+           ("ö" "�" :string)
            ("ß" "��" :string)
            ("ü" "�" :string)
            ("Ü" "�" :string)
            ("A" "�" :string)
            ("a" "�" :string)
-           ("b" "�" :string)
            ("B" "�" :string)
-           ("C" "�" :string)
+           ("b" "�" :string)
            ("c" "�" :string)
+           ("C" "�" :string)
            ("D" "�" :string)
            ("d" "�" :string)
            ("E" "�" :string)
            ("e" "�" :string)
-           ("F" "�" :string)
            ("f" "�" :string)
-           ("G" "�" :string)
+           ("F" "�" :string)
            ("g" "�" :string)
+           ("G" "�" :string)
            ("h" "�" :string)
            ("H" "�" :string)
            ("i" "�" :string)
@@ -63,24 +63,24 @@
            ("k" "�" :string)
            ("L" "�" :string)
            ("l" "�" :string)
-           ("m" "�" :string)
            ("M" "�" :string)
+           ("m" "�" :string)
            ("n" "�" :string)
            ("N" "�" :string)
            ("O" "�" :string)
            ("o" "�" :string)
-           ("p" "�" :string)
            ("P" "�" :string)
+           ("p" "�" :string)
            ("Q" "�" :string)
            ("q" "�" :string)
            ("r" "�" :string)
            ("R" "�" :string)
-           ("s" "�" :string)
            ("S" "�" :string)
-           ("T" "�" :string)
+           ("s" "�" :string)
            ("t" "�" :string)
-           ("U" "�" :string)
+           ("T" "�" :string)
            ("u" "�" :string)
+           ("U" "�" :string)
            ("v" "�" :string)
            ("V" "�" :string)
            ("w" "�" :string)
@@ -89,217 +89,217 @@
            ("x" "�" :string)
            ("y" "�" :string)
            ("Y" "�" :string)
-           ("Z" "�" :string)
            ("z" "�" :string)
+           ("Z" "�" :string)
            ))
 
 (define-rule-set "de-resolve-diacritics"
 
-  :rules  (("É" "�" :string)
-           ("é" "�" :string)
-           ("Ü" "�" :string)
-           ("Ö" "�" :string)
-           ("ö" "�" :string)
+  :rules  (("é" "�" :string)
+           ("É" "�" :string)
            ("Ä" "�" :string)
-           ("ä" "�" :string)
+           ("ö" "�" :string)
+           ("Ü" "�" :string)
            ("ü" "�" :string)
+           ("ä" "�" :string)
+           ("Ö" "�" :string)
            ("ß" "�" :string)
-           ("x" "�" :string)
-           ("R" "�" :string)
-           ("b" "�" :string)
            ("s" "�" :string)
-           ("m" "�" :string)
-           ("X" "�" :string)
-           ("j" "�" :string)
-           ("F" "�" :string)
            ("Z" "�" :string)
-           ("z" "�" :string)
+           ("R" "�" :string)
+           ("q" "�" :string)
+           ("n" "�" :string)
+           ("C" "�" :string)
+           ("F" "�" :string)
+           ("m" "�" :string)
            ("Y" "�" :string)
-           ("P" "�" :string)
-           ("L" "�" :string)
-           ("M" "�" :string)
-           ("S" "�" :string)
-           ("a" "�" :string)
-           ("g" "�" :string)
+           ("e" "�" :string)
+           ("j" "�" :string)
            ("N" "�" :string)
-           ("H" "�" :string)
-           ("f" "�" :string)
+           ("V" "�" :string)
            ("l" "�" :string)
-           ("B" "�" :string)
-           ("i" "�" :string)
-           ("q" "�" :string)
-           ("n" "�" :string)
-           ("I" "�" :string)
-           ("t" "�" :string)
-           ("W" "�" :string)
-           ("o" "�" :string)
-           ("p" "�" :string)
+           ("b" "�" :string)
            ("U" "�" :string)
-           ("E" "�" :string)
-           ("d" "�" :string)
+           ("x" "�" :string)
+           ("p" "�" :string)
+           ("K" "�" :string)
+           ("T" "�" :string)
+           ("Q" "�" :string)
            ("w" "�" :string)
-           ("G" "�" :string)
-           ("C" "�" :string)
+           ("o" "�" :string)
+           ("L" "�" :string)
+           ("u" "�" :string)
+           ("k" "�" :string)
+           ("W" "�" :string)
+           ("c" "�" :string)
+           ("t" "�" :string)
+           ("M" "�" :string)
+           ("I" "�" :string)
+           ("O" "�" :string)
            ("J" "�" :string)
-           ("D" "�" :string)
+           ("S" "�" :string)
            ("h" "�" :string)
+           ("E" "�" :string)
            ("v" "�" :string)
-           ("A" "�" :string)
+           ("a" "�" :string)
            ("r" "�" :string)
-           ("k" "�" :string)
-           ("O" "�" :string)
-           ("T" "�" :string)
-           ("c" "�" :string)
-           ("K" "�" :string)
-           ("e" "�" :string)
+           ("P" "�" :string)
+           ("d" "�" :string)
+           ("H" "�" :string)
+           ("z" "�" :string)
+           ("G" "�" :string)
+           ("A" "�" :string)
+           ("X" "�" :string)
            ("y" "�" :string)
-           ("V" "�" :string)
-           ("Q" "�" :string)
-           ("u" "�" :string)
+           ("D" "�" :string)
+           ("B" "�" :string)
+           ("g" "�" :string)
+           ("i" "�" :string)
+           ("f" "�" :string)
            ))
 
 (define-rule-set "de-resolve-case"
 
-  :rules  (("É" "8" :string)
+  :rules  (("Ä" "8" :string)
            ("Ö" "8" :string)
            ("Ü" "8" :string)
-           ("Ä" "8" :string)
-           ("ö" "9" :string)
-           ("ü" "9" :string)
-           ("ä" "9" :string)
+           ("É" "8" :string)
            ("é" "9" :string)
+           ("ä" "9" :string)
+           ("ü" "9" :string)
+           ("ö" "9" :string)
            ("ß" "99" :string)
+           ("W" "8" :string)
+           ("Q" "8" :string)
+           ("T" "8" :string)
+           ("K" "8" :string)
+           ("L" "8" :string)
            ("Y" "8" :string)
+           ("N" "8" :string)
+           ("U" "8" :string)
+           ("V" "8" :string)
+           ("R" "8" :string)
            ("Z" "8" :string)
            ("F" "8" :string)
+           ("C" "8" :string)
            ("X" "8" :string)
-           ("R" "8" :string)
-           ("W" "8" :string)
-           ("I" "8" :string)
+           ("D" "8" :string)
            ("B" "8" :string)
-           ("N" "8" :string)
-           ("H" "8" :string)
-           ("S" "8" :string)
-           ("M" "8" :string)
            ("P" "8" :string)
-           ("L" "8" :string)
            ("A" "8" :string)
-           ("D" "8" :string)
-           ("J" "8" :string)
-           ("C" "8" :string)
+           ("H" "8" :string)
            ("G" "8" :string)
-           ("U" "8" :string)
-           ("E" "8" :string)
-           ("Q" "8" :string)
-           ("V" "8" :string)
-           ("K" "8" :string)
-           ("T" "8" :string)
+           ("I" "8" :string)
+           ("M" "8" :string)
            ("O" "8" :string)
-           ("z" "9" :string)
+           ("E" "8" :string)
+           ("J" "8" :string)
+           ("S" "8" :string)
+           ("k" "9" :string)
+           ("c" "9" :string)
+           ("x" "9" :string)
+           ("p" "9" :string)
+           ("u" "9" :string)
+           ("w" "9" :string)
+           ("o" "9" :string)
            ("j" "9" :string)
            ("m" "9" :string)
-           ("s" "9" :string)
+           ("e" "9" :string)
+           ("l" "9" :string)
            ("b" "9" :string)
-           ("x" "9" :string)
-           ("o" "9" :string)
-           ("p" "9" :string)
-           ("t" "9" :string)
-           ("q" "9" :string)
            ("n" "9" :string)
-           ("i" "9" :string)
+           ("q" "9" :string)
+           ("s" "9" :string)
            ("f" "9" :string)
-           ("l" "9" :string)
            ("g" "9" :string)
-           ("a" "9" :string)
-           ("v" "9" :string)
-           ("h" "9" :string)
-           ("w" "9" :string)
-           ("d" "9" :string)
-           ("u" "9" :string)
+           ("i" "9" :string)
            ("y" "9" :string)
-           ("e" "9" :string)
-           ("c" "9" :string)
-           ("k" "9" :string)
+           ("v" "9" :string)
            ("r" "9" :string)
+           ("a" "9" :string)
+           ("d" "9" :string)
+           ("z" "9" :string)
+           ("t" "9" :string)
+           ("h" "9" :string)
            ))
 
 (define-rule-set "de-ignore-special"
 
-  :rules  (("?" "" :string)
-           ("{" "" :string)
-           ("-" "" :string)
+  :rules  (("." "" :string)
+           ("?" "" :string)
            ("!" "" :string)
-           ("}" "" :string)
-           ("." "" :string)
            ("'" "" :string)
+           ("-" "" :string)
+           ("{" "" :string)
+           ("}" "" :string)
            ))
 
 (define-rule-set "de-resolve-special"
 
-  :rules  (("ü" "�" :string)
+  :rules  (("Ö" "�" :string)
+           ("ü" "�" :string)
            ("É" "�" :string)
-           ("ö" "�" :string)
-           ("Ö" "�" :string)
            ("Ü" "�" :string)
-           ("ä" "�" :string)
+           ("ö" "�" :string)
            ("Ä" "�" :string)
            ("é" "�" :string)
+           ("ä" "�" :string)
            ("ß" "��" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("A" "�" :string)
-           ("D" "�" :string)
-           ("h" "�" :string)
-           ("E" "�" :string)
-           ("Q" "�" :string)
-           ("u" "�" :string)
+           ("c" "�" :string)
+           ("o" "�" :string)
+           ("L" "�" :string)
+           ("x" "�" :string)
+           ("p" "�" :string)
            ("K" "�" :string)
-           ("r" "�" :string)
-           ("k" "�" :string)
-           ("Z" "�" :string)
-           ("z" "�" :string)
-           ("X" "�" :string)
+           ("Q" "�" :string)
+           ("U" "�" :string)
            ("j" "�" :string)
            ("m" "�" :string)
-           ("x" "�" :string)
-           ("R" "�" :string)
-           ("p" "�" :string)
-           ("o" "�" :string)
-           ("i" "�" :string)
-           ("n" "�" :string)
-           ("q" "�" :string)
-           ("I" "�" :string)
+           ("e" "�" :string)
            ("N" "�" :string)
-           ("l" "�" :string)
-           ("f" "�" :string)
-           ("P" "�" :string)
-           ("M" "�" :string)
-           ("a" "�" :string)
-           ("S" "�" :string)
+           ("F" "�" :string)
+           ("n" "�" :string)
            ("g" "�" :string)
-           ("v" "�" :string)
-           ("G" "�" :string)
-           ("C" "�" :string)
-           ("J" "�" :string)
-           ("U" "�" :string)
-           ("d" "�" :string)
-           ("w" "�" :string)
-           ("e" "�" :string)
-           ("V" "�" :string)
            ("y" "�" :string)
-           ("c" "�" :string)
+           ("B" "�" :string)
+           ("H" "�" :string)
+           ("d" "�" :string)
+           ("z" "�" :string)
+           ("a" "�" :string)
+           ("S" "�" :string)
+           ("h" "�" :string)
+           ("M" "�" :string)
            ("O" "�" :string)
+           ("W" "�" :string)
+           ("k" "�" :string)
+           ("w" "�" :string)
+           ("u" "�" :string)
            ("T" "�" :string)
-           ("Y" "�" :string)
-           ("F" "�" :string)
+           ("V" "�" :string)
+           ("l" "�" :string)
            ("b" "�" :string)
+           ("Y" "�" :string)
+           ("C" "�" :string)
            ("s" "�" :string)
+           ("Z" "�" :string)
+           ("R" "�" :string)
+           ("q" "�" :string)
+           ("i" "�" :string)
+           ("f" "�" :string)
+           ("D" "�" :string)
+           ("X" "�" :string)
+           ("G" "�" :string)
+           ("A" "�" :string)
+           ("v" "�" :string)
+           ("r" "�" :string)
+           ("P" "�" :string)
+           ("J" "�" :string)
+           ("E" "�" :string)
+           ("I" "�" :string)
            ("t" "�" :string)
-           ("W" "�" :string)
-           ("H" "�" :string)
-           ("B" "�" :string)
-           ("L" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ("{" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/greek/iso88597.xdy b/Master/texmf-dist/xindy/modules/lang/greek/iso88597.xdy
index dc81413af88..7218ec0cc5b 100644
--- a/Master/texmf-dist/xindy/modules/lang/greek/iso88597.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/greek/iso88597.xdy
@@ -32,61 +32,61 @@
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
@@ -94,155 +94,155 @@
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ))
 
 (define-rule-set "el-resolve-diacritics"
 
-  :rules  (("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :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)
            ))
 
 (define-rule-set "el-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)
-           ("�" "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)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
            ))
 
 (define-rule-set "el-ignore-special"
@@ -250,11 +250,11 @@
   :rules  (("\/" "" :string)
            ("." "" :string)
            ("�" "" :string)
-           ("!" "" :string)
+           ("?" "" :string)
            ("'" "" :string)
            (";" "" :string)
+           ("!" "" :string)
            ("-" "" :string)
-           ("?" "" :string)
            ))
 
 (define-rule-set "el-resolve-special"
@@ -265,75 +265,75 @@
            ("." "�" :string)
            (";" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :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/greek/polytonic-utf8.xdy b/Master/texmf-dist/xindy/modules/lang/greek/polytonic-utf8.xdy
index d0226f410e1..0e8d13997fa 100644
--- a/Master/texmf-dist/xindy/modules/lang/greek/polytonic-utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/greek/polytonic-utf8.xdy
@@ -30,251 +30,251 @@
 
 (define-rule-set "el-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)
+           ("ἐ" "�" :string)
+           ("ἓ" "�" :string)
+           ("Ἓ" "�" :string)
+           ("ἑ" "�" :string)
            ("ὲ" "�" :string)
+           ("ἕ" "�" :string)
            ("Ἔ" "�" :string)
-           ("ἑ" "�" :string)
-           ("Ἕ" "�" :string)
            ("Ἐ" "�" :string)
-           ("ἓ" "�" :string)
-           ("ἒ" "�" :string)
-           ("ἕ" "�" :string)
-           ("ἐ" "�" :string)
-           ("Έ" "�" :string)
            ("Ὲ" "�" :string)
            ("έ" "�" :string)
+           ("ἒ" "�" :string)
            ("Ἑ" "�" :string)
-           ("ἦ" "�" :string)
+           ("Ἕ" "�" :string)
+           ("Έ" "�" :string)
+           ("ἧ" "�" :string)
+           ("ἢ" "�" :string)
+           ("Ὴ" "�" :string)
+           ("ἡ" "�" :string)
+           ("ᾙ" "�" :string)
+           ("ᾝ" "�" :string)
+           ("ᾛ" "�" :string)
+           ("ῄ" "�" :string)
            ("ῂ" "�" :string)
-           ("ἥ" "�" :string)
-           ("ἣ" "�" :string)
            ("ᾔ" "�" :string)
+           ("ᾒ" "�" :string)
+           ("ῌ" "�" :string)
            ("ᾗ" "�" :string)
-           ("Ὴ" "�" :string)
-           ("ᾖ" "�" :string)
-           ("ᾑ" "�" :string)
-           ("Ἤ" "�" :string)
-           ("ᾕ" "�" :string)
-           ("Ἡ" "�" :string)
            ("Ἥ" "�" :string)
-           ("ᾝ" "�" :string)
            ("ᾜ" "�" :string)
            ("ᾟ" "�" :string)
-           ("ᾒ" "�" :string)
-           ("ἠ" "�" :string)
-           ("ἤ" "�" :string)
-           ("ή" "�" :string)
            ("Ἢ" "�" :string)
+           ("ἦ" "�" :string)
+           ("ᾓ" "�" :string)
+           ("ᾚ" "�" :string)
+           ("ἠ" "�" :string)
            ("ὴ" "�" :string)
-           ("ῃ" "�" :string)
+           ("Ἡ" "�" :string)
+           ("ῇ" "�" :string)
+           ("ᾞ" "�" :string)
            ("Ἦ" "�" :string)
-           ("ῄ" "�" :string)
-           ("ᾚ" "�" :string)
+           ("ῃ" "�" :string)
+           ("Ἤ" "�" :string)
            ("Ἣ" "�" :string)
-           ("ἡ" "�" :string)
-           ("ἧ" "�" :string)
-           ("Ἧ" "�" :string)
+           ("ἥ" "�" :string)
+           ("ἣ" "�" :string)
            ("Ή" "�" :string)
-           ("ᾓ" "�" :string)
-           ("ῌ" "�" :string)
-           ("ᾙ" "�" :string)
-           ("ᾘ" "�" :string)
-           ("ᾛ" "�" :string)
-           ("ἢ" "�" :string)
+           ("ἤ" "�" :string)
+           ("ᾑ" "�" :string)
+           ("Ἧ" "�" :string)
            ("ῆ" "�" :string)
-           ("ῇ" "�" :string)
            ("Ἠ" "�" :string)
-           ("ᾞ" "�" :string)
+           ("ᾖ" "�" :string)
+           ("ᾕ" "�" :string)
+           ("ή" "�" :string)
+           ("ᾘ" "�" :string)
            ("ᾐ" "�" :string)
+           ("Ὶ" "�" :string)
+           ("ῑ" "�" :string)
+           ("Ἳ" "�" :string)
            ("ῖ" "�" :string)
            ("ῗ" "�" :string)
+           ("Ἵ" "�" :string)
+           ("ῒ" "�" :string)
            ("ἱ" "�" :string)
+           ("ἲ" "�" :string)
+           ("ΐ" "�" :string)
+           ("ἶ" "�" :string)
+           ("Ῑ" "�" :string)
            ("Ἱ" "�" :string)
+           ("ἴ" "�" :string)
+           ("ἷ" "�" :string)
+           ("Ῐ" "�" :string)
            ("Ἰ" "�" :string)
-           ("ἰ" "�" :string)
-           ("ῒ" "�" :string)
            ("Ἲ" "�" :string)
-           ("ἵ" "�" :string)
-           ("Ῐ" "�" :string)
-           ("Ἵ" "�" :string)
-           ("Ῑ" "�" :string)
-           ("ἲ" "�" :string)
-           ("Ἶ" "�" :string)
-           ("Ὶ" "�" :string)
-           ("ὶ" "�" :string)
+           ("ἰ" "�" :string)
+           ("Ἷ" "�" :string)
            ("ῐ" "�" :string)
-           ("Ἴ" "�" :string)
-           ("ΐ" "�" :string)
-           ("ῑ" "�" :string)
-           ("ἷ" "�" :string)
+           ("ὶ" "�" :string)
+           ("Ἶ" "�" :string)
+           ("ἵ" "�" :string)
            ("ἳ" "�" :string)
-           ("Ἷ" "�" :string)
-           ("ἴ" "�" :string)
-           ("Ἳ" "�" :string)
-           ("ἶ" "�" :string)
-           ("ὂ" "�" :string)
-           ("Ὄ" "�" :string)
-           ("ὄ" "�" :string)
-           ("Ὅ" "�" :string)
-           ("Ὸ" "�" :string)
-           ("ὀ" "�" :string)
+           ("Ἴ" "�" :string)
            ("ό" "�" :string)
-           ("ὁ" "�" :string)
+           ("Ὄ" "�" :string)
+           ("Ὃ" "�" :string)
+           ("ὃ" "�" :string)
            ("Ὂ" "�" :string)
+           ("ὸ" "�" :string)
            ("Ὁ" "�" :string)
-           ("Ὀ" "�" :string)
-           ("Ό" "�" :string)
-           ("ὃ" "�" :string)
-           ("Ὃ" "�" :string)
+           ("ὁ" "�" :string)
+           ("ὄ" "�" :string)
+           ("ὂ" "�" :string)
            ("ὅ" "�" :string)
-           ("ὸ" "�" :string)
+           ("Ὸ" "�" :string)
+           ("Ὅ" "�" :string)
+           ("Ό" "�" :string)
+           ("Ὀ" "�" :string)
+           ("ὀ" "�" :string)
            ("ῥ" "�" :string)
            ("Ῥ" "�" :string)
            ("ῤ" "�" :string)
-           ("ὖ" "�" :string)
-           ("ὓ" "�" :string)
-           ("ὒ" "�" :string)
-           ("ῡ" "�" :string)
            ("ὔ" "�" :string)
-           ("ΰ" "�" :string)
-           ("Ῠ" "�" :string)
-           ("ύ" "�" :string)
-           ("ὺ" "�" :string)
-           ("Ὕ" "�" :string)
-           ("ὑ" "�" :string)
-           ("ῢ" "�" :string)
            ("Ὗ" "�" :string)
-           ("ῠ" "�" :string)
            ("Ὑ" "�" :string)
            ("Ῡ" "�" :string)
-           ("Ὓ" "�" :string)
-           ("Ὺ" "�" :string)
-           ("Ύ" "�" :string)
-           ("ὐ" "�" :string)
+           ("ῢ" "�" :string)
+           ("ὺ" "�" :string)
+           ("ῡ" "�" :string)
            ("ὕ" "�" :string)
+           ("ὐ" "�" :string)
+           ("ΰ" "�" :string)
+           ("ὑ" "�" :string)
            ("ὗ" "�" :string)
-           ("ῶ" "�" :string)
-           ("ὥ" "�" :string)
-           ("Ὦ" "�" :string)
-           ("Ὠ" "�" :string)
-           ("ῲ" "�" :string)
-           ("ᾪ" "�" :string)
+           ("Ύ" "�" :string)
+           ("ῠ" "�" :string)
+           ("ὒ" "�" :string)
+           ("Ῠ" "�" :string)
+           ("Ὓ" "�" :string)
+           ("ὖ" "�" :string)
+           ("ὓ" "�" :string)
+           ("ύ" "�" :string)
+           ("Ὕ" "�" :string)
+           ("Ὺ" "�" :string)
+           ("ᾢ" "�" :string)
+           ("ᾠ" "�" :string)
+           ("ᾥ" "�" :string)
+           ("Ώ" "�" :string)
+           ("ᾮ" "�" :string)
+           ("Ὥ" "�" :string)
+           ("ᾫ" "�" :string)
+           ("ὡ" "�" :string)
            ("ὦ" "�" :string)
-           ("Ὡ" "�" :string)
-           ("ᾭ" "�" :string)
-           ("ᾤ" "�" :string)
-           ("ῴ" "�" :string)
-           ("Ὢ" "�" :string)
-           ("ὼ" "�" :string)
-           ("ᾣ" "�" :string)
-           ("ὠ" "�" :string)
+           ("ᾪ" "�" :string)
            ("ᾧ" "�" :string)
-           ("ᾥ" "�" :string)
-           ("ὧ" "�" :string)
+           ("Ὢ" "�" :string)
+           ("Ὣ" "�" :string)
            ("ᾯ" "�" :string)
-           ("ᾠ" "�" :string)
-           ("Ὼ" "�" :string)
-           ("ᾩ" "�" :string)
+           ("ᾨ" "�" :string)
+           ("ὥ" "�" :string)
            ("ὣ" "�" :string)
-           ("Ὣ" "�" :string)
-           ("Ὧ" "�" :string)
-           ("Ὤ" "�" :string)
-           ("ᾮ" "�" :string)
-           ("ᾦ" "�" :string)
            ("ὤ" "�" :string)
+           ("ῴ" "�" :string)
+           ("ὧ" "�" :string)
+           ("Ὦ" "�" :string)
+           ("ᾭ" "�" :string)
+           ("ῼ" "�" :string)
+           ("Ὼ" "�" :string)
            ("ῳ" "�" :string)
-           ("ᾡ" "�" :string)
-           ("ὡ" "�" :string)
+           ("Ὠ" "�" :string)
+           ("ὠ" "�" :string)
            ("ὢ" "�" :string)
-           ("Ώ" "�" :string)
-           ("ῼ" "�" :string)
-           ("Ὥ" "�" :string)
-           ("ᾫ" "�" :string)
-           ("ᾢ" "�" :string)
-           ("ᾬ" "�" :string)
            ("ώ" "�" :string)
+           ("Ὤ" "�" :string)
+           ("ᾦ" "�" :string)
+           ("ῶ" "�" :string)
+           ("ὼ" "�" :string)
+           ("Ὧ" "�" :string)
+           ("Ὡ" "�" :string)
            ("ῷ" "�" :string)
-           ("ᾨ" "�" :string)
+           ("ᾬ" "�" :string)
+           ("ᾡ" "�" :string)
+           ("ῲ" "�" :string)
+           ("ᾤ" "�" :string)
+           ("ᾣ" "�" :string)
+           ("ᾩ" "�" :string)
            ("α" "�" :string)
            ("Α" "�" :string)
+           ("β" "�" :string)
            ("ϐ" "�" :string)
            ("Β" "�" :string)
-           ("β" "�" :string)
-           ("Γ" "�" :string)
            ("γ" "�" :string)
+           ("Γ" "�" :string)
            ("δ" "�" :string)
            ("Δ" "�" :string)
            ("ε" "�" :string)
+           ("Έ" "�" :string)
            ("έ" "�" :string)
            ("Ε" "�" :string)
-           ("Έ" "�" :string)
-           ("Ζ" "�" :string)
            ("ζ" "�" :string)
+           ("Ζ" "�" :string)
            ("ϝ" "�" :string)
            ("Ϝ" "�" :string)
            ("Η" "�" :string)
            ("η" "�" :string)
-           ("Θ" "�" :string)
            ("θ" "�" :string)
            ("ϑ" "�" :string)
-           ("ι" "�" :string)
-           ("Ι" "�" :string)
-           ("ί" "�" :string)
-           ("ϊ" "�" :string)
+           ("Θ" "�" :string)
+           ("Ϊ" "�" :string)
            ("Ί" "�" :string)
+           ("ϊ" "�" :string)
+           ("Ι" "�" :string)
            ("ΐ" "�" :string)
-           ("Ϊ" "�" :string)
+           ("ί" "�" :string)
+           ("ι" "�" :string)
            ("ϳ" "�" :string)
-           ("Κ" "�" :string)
            ("κ" "�" :string)
+           ("Κ" "�" :string)
            ("λ" "�" :string)
            ("Λ" "�" :string)
            ("μ" "�" :string)
@@ -283,247 +283,247 @@
            ("ν" "�" :string)
            ("ξ" "�" :string)
            ("Ξ" "�" :string)
-           ("ό" "�" :string)
-           ("ο" "�" :string)
            ("Ο" "�" :string)
+           ("ό" "�" :string)
            ("Ό" "�" :string)
-           ("Π" "�" :string)
+           ("ο" "�" :string)
            ("π" "�" :string)
-           ("ρ" "�" :string)
+           ("Π" "�" :string)
            ("Ρ" "�" :string)
-           ("Σ" "�" :string)
+           ("ρ" "�" :string)
            ("σ" "�" :string)
+           ("Σ" "�" :string)
            ("ς" "�" :string)
-           ("Τ" "�" :string)
            ("τ" "�" :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 "el-resolve-diacritics"
 
-  :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)
+           ("ἲ" "�" :string)
+           ("ἀ" "�" :string)
            ("ἢ" "�" :string)
            ("Ὣ" "�" :string)
-           ("Ἢ" "�" :string)
-           ("ὣ" "�" :string)
-           ("ἲ" "�" :string)
-           ("Ὂ" "�" :string)
-           ("Ὗ" "�" :string)
-           ("Ἒ" "�" :string)
+           ("Ὕ" "�" :string)
+           ("Ἲ" "�" :string)
+           ("ὤ" "�" :string)
            ("ἁ" "�" :string)
-           ("ἣ" "�" :string)
-           ("ὗ" "�" :string)
-           ("ἳ" "�" :string)
+           ("Ὗ" "�" :string)
            ("Ὃ" "�" :string)
-           ("ὃ" "�" :string)
+           ("Ἒ" "�" :string)
            ("Ἳ" "�" :string)
-           ("Ὤ" "�" :string)
+           ("ὃ" "�" :string)
+           ("ἳ" "�" :string)
            ("ἒ" "�" :string)
-           ("ὤ" "�" :string)
-           ("Ἣ" "�" :string)
            ("Ἁ" "�" :string)
-           ("ἂ" "�" :string)
+           ("Ὤ" "�" :string)
+           ("ὗ" "�" :string)
+           ("ἣ" "�" :string)
+           ("Ἣ" "�" :string)
+           ("ἓ" "�" :string)
            ("Ἓ" "�" :string)
-           ("Ἤ" "�" :string)
-           ("ὺ" "�" :string)
-           ("Ὅ" "�" :string)
            ("ὥ" "�" :string)
-           ("Ἴ" "�" :string)
+           ("ὺ" "�" :string)
+           ("ὅ" "�" :string)
            ("Ὥ" "�" :string)
+           ("Ἂ" "�" :string)
+           ("Ὅ" "�" :string)
            ("Ὺ" "�" :string)
+           ("Ἴ" "�" :string)
            ("ἴ" "�" :string)
-           ("ὅ" "�" :string)
-           ("Ἂ" "�" :string)
-           ("ἓ" "�" :string)
+           ("Ἤ" "�" :string)
            ("ἤ" "�" :string)
-           ("ἵ" "�" :string)
+           ("ἂ" "�" :string)
+           ("ὸ" "�" :string)
            ("Ἥ" "�" :string)
-           ("ὦ" "�" :string)
            ("Ὦ" "�" :string)
-           ("Ὸ" "�" :string)
-           ("ύ" "�" :string)
            ("ἔ" "�" :string)
-           ("ἥ" "�" :string)
-           ("Ἃ" "�" :string)
-           ("ὸ" "�" :string)
-           ("Ύ" "�" :string)
+           ("ὦ" "�" :string)
+           ("Ἵ" "�" :string)
            ("ἃ" "�" :string)
+           ("ἵ" "�" :string)
+           ("ύ" "�" :string)
+           ("Ἃ" "�" :string)
            ("Ἔ" "�" :string)
-           ("Ἵ" "�" :string)
-           ("Ἄ" "�" :string)
-           ("ῠ" "�" :string)
-           ("Ῠ" "�" :string)
-           ("ἦ" "�" :string)
+           ("Ύ" "�" :string)
+           ("ἥ" "�" :string)
+           ("Ὸ" "�" :string)
+           ("ἄ" "�" :string)
            ("ἶ" "�" :string)
-           ("ἕ" "�" :string)
+           ("ἦ" "�" :string)
+           ("ὧ" "�" :string)
+           ("ό" "�" :string)
            ("Ἶ" "�" :string)
-           ("Ἦ" "�" :string)
            ("Ὧ" "�" :string)
+           ("Ῠ" "�" :string)
+           ("Ἄ" "�" :string)
            ("Ό" "�" :string)
-           ("ό" "�" :string)
-           ("ὧ" "�" :string)
            ("Ἕ" "�" :string)
-           ("ἄ" "�" :string)
-           ("ὼ" "�" :string)
-           ("Ἅ" "�" :string)
-           ("ἅ" "�" :string)
+           ("ἕ" "�" :string)
+           ("Ἦ" "�" :string)
+           ("ῠ" "�" :string)
            ("ῡ" "�" :string)
-           ("ἷ" "�" :string)
-           ("Ἷ" "�" :string)
+           ("Ὼ" "�" :string)
+           ("ἅ" "�" :string)
+           ("ἧ" "�" :string)
            ("Ῡ" "�" :string)
+           ("Ἅ" "�" :string)
            ("Ἧ" "�" :string)
-           ("ἧ" "�" :string)
-           ("Ὼ" "�" :string)
+           ("ἷ" "�" :string)
+           ("ὼ" "�" :string)
+           ("Ἷ" "�" :string)
            ("Ἆ" "�" :string)
-           ("ᾐ" "�" :string)
-           ("ώ" "�" :string)
-           ("Ώ" "�" :string)
            ("ἆ" "�" :string)
-           ("ᾘ" "�" :string)
+           ("Ώ" "�" :string)
            ("Ὶ" "�" :string)
            ("ὶ" "�" :string)
-           ("Ῐ" "�" :string)
+           ("ᾘ" "�" :string)
+           ("ᾐ" "�" :string)
+           ("ώ" "�" :string)
            ("ῢ" "�" :string)
-           ("ᾑ" "�" :string)
            ("ᾨ" "�" :string)
+           ("ᾠ" "�" :string)
            ("ᾙ" "�" :string)
+           ("ᾑ" "�" :string)
            ("ῐ" "�" :string)
-           ("Ἇ" "�" :string)
            ("ἇ" "�" :string)
-           ("ᾠ" "�" :string)
-           ("ᾳ" "�" :string)
+           ("Ῐ" "�" :string)
+           ("Ἇ" "�" :string)
            ("ᾒ" "�" :string)
-           ("ΰ" "�" :string)
+           ("Ῑ" "�" :string)
            ("ᾼ" "�" :string)
            ("ῑ" "�" :string)
+           ("ᾳ" "�" :string)
            ("ᾡ" "�" :string)
-           ("ᾚ" "�" :string)
-           ("Ῑ" "�" :string)
            ("ᾩ" "�" :string)
-           ("ῗ" "�" :string)
-           ("ᾪ" "�" :string)
-           ("ὐ" "�" :string)
+           ("ᾚ" "�" :string)
+           ("ΰ" "�" :string)
            ("ᾢ" "�" :string)
+           ("ᾪ" "�" :string)
            ("ᾛ" "�" :string)
+           ("ῗ" "�" :string)
+           ("ὐ" "�" :string)
            ("ᾓ" "�" :string)
-           ("ᾣ" "�" :string)
-           ("ᾜ" "�" :string)
-           ("ὒ" "�" :string)
-           ("ῖ" "�" :string)
            ("ᾔ" "�" :string)
+           ("ᾜ" "�" :string)
            ("ᾫ" "�" :string)
+           ("ῖ" "�" :string)
+           ("ᾣ" "�" :string)
+           ("ὒ" "�" :string)
            ("ᾶ" "�" :string)
-           ("ᾤ" "�" :string)
+           ("ὔ" "�" :string)
            ("ᾝ" "�" :string)
            ("ᾕ" "�" :string)
-           ("ὔ" "�" :string)
+           ("ᾤ" "�" :string)
            ("ᾬ" "�" :string)
-           ("ᾥ" "�" :string)
            ("ᾭ" "�" :string)
+           ("ᾥ" "�" :string)
            ("ῒ" "�" :string)
-           ("ᾖ" "�" :string)
            ("ὖ" "�" :string)
-           ("ᾞ" "�" :string)
+           ("ᾖ" "�" :string)
            ("ᾷ" "�" :string)
+           ("ᾞ" "�" :string)
+           ("ᾀ" "�" :string)
            ("ᾟ" "�" :string)
-           ("ᾈ" "�" :string)
            ("ᾗ" "�" :string)
-           ("ᾀ" "�" :string)
            ("ΐ" "�" :string)
-           ("ᾦ" "�" :string)
            ("ᾮ" "�" :string)
-           ("ᾧ" "�" :string)
+           ("ᾈ" "�" :string)
+           ("ᾦ" "�" :string)
+           ("ᾯ" "�" :string)
+           ("ῌ" "�" :string)
            ("ᾁ" "�" :string)
+           ("ᾧ" "�" :string)
            ("ᾉ" "�" :string)
-           ("ῌ" "�" :string)
-           ("ᾯ" "�" :string)
            ("ῃ" "�" :string)
-           ("ᾊ" "�" :string)
            ("ῂ" "�" :string)
            ("ᾂ" "�" :string)
-           ("ῼ" "�" :string)
            ("ῳ" "�" :string)
-           ("ῲ" "�" :string)
-           ("ᾋ" "�" :string)
-           ("ῄ" "�" :string)
+           ("ῼ" "�" :string)
+           ("ᾊ" "�" :string)
            ("ᾃ" "�" :string)
-           ("ῴ" "�" :string)
-           ("ᾌ" "�" :string)
+           ("ῄ" "�" :string)
+           ("ᾋ" "�" :string)
+           ("ῲ" "�" :string)
            ("ᾄ" "�" :string)
+           ("ῴ" "�" :string)
            ("ῆ" "�" :string)
-           ("ᾍ" "�" :string)
-           ("ῶ" "�" :string)
+           ("ᾌ" "�" :string)
            ("ῇ" "�" :string)
+           ("ᾍ" "�" :string)
            ("ᾅ" "�" :string)
+           ("ῶ" "�" :string)
            ("ᾎ" "�" :string)
            ("ᾆ" "�" :string)
            ("ῷ" "�" :string)
@@ -531,667 +531,667 @@
            ("ᾏ" "�" :string)
            ("ᾲ" "�" :string)
            ("ᾴ" "�" :string)
-           ("Ξ" "�" :string)
+           ("Δ" "�" :string)
            ("γ" "�" :string)
-           ("ζ" "�" :string)
-           ("Ν" "�" :string)
-           ("κ" "�" :string)
-           ("φ" "�" :string)
-           ("ν" "�" :string)
-           ("Μ" "�" :string)
-           ("Α" "�" :string)
-           ("Χ" "�" :string)
+           ("δ" "�" :string)
+           ("θ" "�" :string)
+           ("λ" "�" :string)
            ("ϳ" "�" :string)
-           ("Π" "�" :string)
-           ("Θ" "�" :string)
-           ("Ε" "�" :string)
-           ("Β" "�" :string)
-           ("Ι" "�" :string)
+           ("Η" "�" :string)
+           ("ε" "�" :string)
+           ("Ω" "�" :string)
+           ("υ" "�" :string)
            ("ϝ" "�" :string)
-           ("μ" "�" :string)
+           ("π" "�" :string)
+           ("Β" "�" :string)
+           ("ν" "�" :string)
+           ("Ν" "�" :string)
+           ("Λ" "�" :string)
+           ("κ" "�" :string)
+           ("β" "�" :string)
            ("σ" "�" :string)
-           ("Ω" "�" :string)
-           ("ι" "�" :string)
            ("ψ" "�" :string)
-           ("Ζ" "�" :string)
-           ("ξ" "�" :string)
            ("α" "�" :string)
-           ("Κ" "�" :string)
-           ("δ" "�" :string)
+           ("Φ" "�" :string)
+           ("Α" "�" :string)
+           ("μ" "�" :string)
+           ("χ" "�" :string)
+           ("Ο" "�" :string)
            ("Σ" "�" :string)
+           ("τ" "�" :string)
+           ("Μ" "�" :string)
            ("ρ" "�" :string)
-           ("Γ" "�" :string)
-           ("ε" "�" :string)
-           ("Ο" "�" :string)
            ("ο" "�" :string)
-           ("λ" "�" :string)
-           ("χ" "�" :string)
-           ("η" "�" :string)
-           ("τ" "�" :string)
-           ("Λ" "�" :string)
-           ("Ψ" "�" :string)
-           ("Υ" "�" :string)
-           ("π" "�" :string)
+           ("Τ" "�" :string)
+           ("Ϝ" "�" :string)
+           ("Ξ" "�" :string)
            ("ω" "�" :string)
+           ("ι" "�" :string)
+           ("Γ" "�" :string)
+           ("Κ" "�" :string)
+           ("Υ" "�" :string)
+           ("Θ" "�" :string)
+           ("φ" "�" :string)
+           ("ζ" "�" :string)
+           ("Ι" "�" :string)
+           ("ξ" "�" :string)
+           ("Ψ" "�" :string)
+           ("η" "�" :string)
+           ("Ζ" "�" :string)
            ("Ρ" "�" :string)
-           ("υ" "�" :string)
-           ("Ϝ" "�" :string)
-           ("Τ" "�" :string)
-           ("β" "�" :string)
-           ("θ" "�" :string)
-           ("Φ" "�" :string)
-           ("Δ" "�" :string)
-           ("Η" "�" :string)
-           ("ί" "�" :string)
-           ("ϕ" "�" :string)
-           ("ό" "�" :string)
-           ("ύ" "�" :string)
+           ("Π" "�" :string)
+           ("Ε" "�" :string)
+           ("Χ" "�" :string)
+           ("Ό" "�" :string)
            ("ϐ" "�" :string)
-           ("Ώ" "�" :string)
+           ("Ύ" "�" :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 "el-resolve-case"
 
-  :rules  (("ᾌ" "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)
-           ("ᾼ" "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)
+           ("Ὴ" "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)
-           ("Ἀ" "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)
-           ("ἁ" "9" :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)
+           ("ᾐ" "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)
-           ("ᾓ" "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)
-           ("ΐ" "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)
-           ("Ω" "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)
-           ("Ν" "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)
            ("ϕ" "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)
-           ("ΐ" "9" :string)
-           ("π" "9" :string)
+           ("δ" "9" :string)
+           ("ε" "9" :string)
+           ("ϐ" "9" :string)
+           ("ϳ" "9" :string)
            ))
 
 (define-rule-set "el-ignore-special"
 
-  :rules  (("·" "" :string)
+  :rules  ((";" "" :string)
+           ("·" "" :string)
            ("\/" "" :string)
-           (";" "" :string)
-           ("-" "" :string)
+           ("!" "" :string)
            ("." "" :string)
+           ("-" "" :string)
            ("?" "" :string)
            ("'" "" :string)
-           ("!" "" :string)
            ))
 
 (define-rule-set "el-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)
-           ("Ὰ" "�" :string)
-           ("ἂ" "�" :string)
-           ("ἅ" "�" :string)
-           ("ᾭ" "�" :string)
-           ("ᾝ" "�" :string)
-           ("ὦ" "�" :string)
-           ("Ἥ" "�" :string)
-           ("Ὡ" "�" :string)
-           ("ᾜ" "�" :string)
-           ("ῴ" "�" :string)
-           ("Ἰ" "�" :string)
-           ("ᾏ" "�" :string)
-           ("Ἱ" "�" :string)
+           ("έ" "�" :string)
+           ("ᾡ" "�" :string)
+           ("Ό" "�" :string)
+           ("Ἃ" "�" :string)
+           ("ᾬ" "�" :string)
+           ("ά" "�" :string)
+           ("ᾳ" "�" :string)
+           ("Ὲ" "�" :string)
+           ("ᾋ" "�" :string)
+           ("ἒ" "�" :string)
+           ("ύ" "�" :string)
+           ("ὓ" "�" :string)
+           ("ᾘ" "�" :string)
            ("ᾤ" "�" :string)
-           ("ἇ" "�" :string)
-           ("Ἇ" "�" :string)
-           ("ὶ" "�" :string)
+           ("ᾈ" "�" :string)
+           ("ᾐ" "�" :string)
+           ("Ἑ" "�" :string)
+           ("Ἁ" "�" :string)
+           ("ᾣ" "�" :string)
+           ("ὀ" "�" :string)
+           ("ᾩ" "�" :string)
            ("Έ" "�" :string)
-           ("ᾓ" "�" :string)
-           ("ἡ" "�" :string)
-           ("ἧ" "�" :string)
-           ("Ἣ" "�" :string)
-           ("Ή" "�" :string)
-           ("ᾮ" "�" :string)
-           ("Ῥ" "�" :string)
+           ("Ἴ" "�" :string)
+           ("Ἕ" "�" :string)
+           ("ᾏ" "�" :string)
+           ("Ὺ" "�" :string)
+           ("Ὕ" "�" :string)
+           ("Ῠ" "�" :string)
+           ("Ὧ" "�" :string)
            ("Ἧ" "�" :string)
-           ("Ό" "�" :string)
-           ("ᾙ" "�" :string)
-           ("ῳ" "�" :string)
-           ("ᾦ" "�" :string)
-           ("ῌ" "�" :string)
-           ("ἃ" "�" :string)
+           ("ᾑ" "�" :string)
            ("ῐ" "�" :string)
-           ("ῤ" "�" :string)
-           ("ὤ" "�" :string)
-           ("Ὤ" "�" :string)
-           ("Ἂ" "�" :string)
-           ("Ἦ" "�" :string)
            ("Ἶ" "�" :string)
-           ("ᾃ" "�" :string)
-           ("ῄ" "�" :string)
-           ("Ὣ" "�" :string)
-           ("ἓ" "�" :string)
-           ("Ῡ" "�" :string)
-           ("Ὧ" "�" :string)
-           ("ἒ" "�" :string)
-           ("Ὀ" "�" :string)
-           ("ᾚ" "�" :string)
-           ("Ὶ" "�" :string)
-           ("ἐ" "�" :string)
-           ("ἕ" "�" :string)
-           ("Ὁ" "�" :string)
-           ("ἄ" "�" :string)
-           ("ᾠ" "�" :string)
-           ("Ὼ" "�" :string)
-           ("Ἕ" "�" :string)
-           ("ὴ" "�" :string)
-           ("Ἵ" "�" :string)
-           ("Ὂ" "�" :string)
-           ("ῃ" "�" :string)
-           ("ὣ" "�" :string)
-           ("ᾩ" "�" :string)
+           ("Ὓ" "�" :string)
+           ("ὶ" "�" :string)
+           ("ᾇ" "�" :string)
+           ("ῷ" "�" :string)
+           ("Ὡ" "�" :string)
+           ("Ἠ" "�" :string)
+           ("ῆ" "�" :string)
+           ("Ὅ" "�" :string)
+           ("ἵ" "�" :string)
            ("ᾱ" "�" :string)
-           ("ἲ" "�" :string)
-           ("Ῑ" "�" :string)
-           ("Ἐ" "�" :string)
-           ("Ἔ" "�" :string)
-           ("ὧ" "�" :string)
-           ("ὁ" "�" :string)
-           ("ἤ" "�" :string)
+           ("ᾷ" "�" :string)
+           ("ᾕ" "�" :string)
            ("ή" "�" :string)
-           ("Ἢ" "�" :string)
+           ("ἃ" "�" :string)
+           ("ὖ" "�" :string)
+           ("ᾖ" "�" :string)
+           ("ἳ" "�" :string)
+           ("Ἄ" "�" :string)
+           ("Ὰ" "�" :string)
+           ("Ῐ" "�" :string)
+           ("ἷ" "�" :string)
+           ("ἣ" "�" :string)
+           ("ἥ" "�" :string)
+           ("Ἤ" "�" :string)
+           ("Ἣ" "�" :string)
+           ("ᾊ" "�" :string)
            ("ᾅ" "�" :string)
-           ("Ἁ" "�" :string)
-           ("ό" "�" :string)
-           ("ᾯ" "�" :string)
-           ("ἑ" "�" :string)
-           ("ὕ" "�" :string)
+           ("Ἦ" "�" :string)
+           ("ῃ" "�" :string)
+           ("Ἲ" "�" :string)
+           ("Ύ" "�" :string)
+           ("Ἰ" "�" :string)
+           ("Ή" "�" :string)
+           ("Ὸ" "�" :string)
+           ("Ἇ" "�" :string)
+           ("Ἐ" "�" :string)
+           ("ἂ" "�" :string)
+           ("ἤ" "�" :string)
+           ("ῠ" "�" :string)
+           ("ᾦ" "�" :string)
+           ("ῶ" "�" :string)
+           ("ἰ" "�" :string)
+           ("ὼ" "�" :string)
+           ("Ἷ" "�" :string)
+           ("ὒ" "�" :string)
+           ("ἕ" "�" :string)
+           ("Ἱ" "�" :string)
+           ("ᾓ" "�" :string)
+           ("Ὠ" "�" :string)
+           ("ὠ" "�" :string)
            ("ᾉ" "�" :string)
-           ("ῷ" "�" :string)
-           ("ᾨ" "�" :string)
-           ("ᾄ" "�" :string)
-           ("ᾲ" "�" :string)
-           ("ὗ" "�" :string)
-           ("ἶ" "�" :string)
-           ("ᾆ" "�" :string)
-           ("ᾢ" "�" :string)
-           ("ᾬ" "�" :string)
+           ("ΰ" "�" :string)
+           ("ὑ" "�" :string)
+           ("ᾚ" "�" :string)
+           ("ᾌ" "�" :string)
+           ("ἇ" "�" :string)
+           ("ἴ" "�" :string)
+           ("ὐ" "�" :string)
+           ("Ῥ" "�" :string)
+           ("ἠ" "�" :string)
+           ("ὴ" "�" :string)
            ("ώ" "�" :string)
-           ("ᾂ" "�" :string)
-           ("Ᾱ" "�" :string)
-           ("ᾀ" "�" :string)
-           ("ᾁ" "�" :string)
-           ("ᾐ" "�" :string)
+           ("ᾍ" "�" :string)
+           ("ὢ" "�" :string)
+           ("Ὤ" "�" :string)
            ("ᾞ" "�" :string)
-           ("ὐ" "�" :string)
-           ("ἴ" "�" :string)
-           ("Ἷ" "�" :string)
-           ("ἆ" "�" :string)
-           ("έ" "�" :string)
-           ("ᾘ" "�" :string)
-           ("ῼ" "�" :string)
-           ("ᾛ" "�" :string)
-           ("ὅ" "�" :string)
-           ("ἢ" "�" :string)
+           ("ὗ" "�" :string)
            ("ῇ" "�" :string)
-           ("ῆ" "�" :string)
-           ("Ἠ" "�" :string)
-           ("Ύ" "�" :string)
-           ("ὸ" "�" :string)
-           ("Ὺ" "�" :string)
-           ("Ὥ" "�" :string)
-           ("ᾫ" "�" :string)
-           ("Ἳ" "�" :string)
-           ("Ἑ" "�" :string)
-           ("ᾷ" "�" :string)
-           ("ᾡ" "�" :string)
-           ("ὃ" "�" :string)
-           ("Ὃ" "�" :string)
-           ("ᾋ" "�" :string)
-           ("ΐ" "�" :string)
-           ("Ἴ" "�" :string)
-           ("Ώ" "�" :string)
-           ("Ἃ" "�" :string)
-           ("ἷ" "�" :string)
-           ("Ὓ" "�" :string)
-           ("ἳ" "�" :string)
-           ("Ἀ" "�" :string)
-           ("Ὲ" "�" :string)
-           ("ὢ" "�" :string)
-           ("ὡ" "�" :string)
-           ("ῑ" "�" :string)
+           ("ᾲ" "�" :string)
+           ("Ἔ" "�" :string)
+           ("Ἡ" "�" :string)
            (";" "�" :string)
            ("·" "�" :string)
-           ("Ζ" "�" :string)
-           ("ξ" "�" :string)
-           ("ψ" "�" :string)
-           ("α" "�" :string)
-           ("ϕ" "�" :string)
-           ("ι" "�" :string)
+           ("Ύ" "�" :string)
+           ("ϝ" "�" :string)
+           ("Β" "�" :string)
+           ("π" "�" :string)
            ("Ω" "�" :string)
-           ("λ" "�" :string)
-           ("ο" "�" :string)
-           ("χ" "�" :string)
-           ("Ώ" "�" :string)
-           ("ϐ" "�" :string)
-           ("Ο" "�" :string)
-           ("ΰ" "�" :string)
-           ("ώ" "�" :string)
-           ("Γ" "�" :string)
-           ("ρ" "�" :string)
+           ("υ" "�" :string)
+           ("Ν" "�" :string)
+           ("Λ" "�" :string)
+           ("ϊ" "�" :string)
+           ("ν" "�" :string)
            ("Ϋ" "�" :string)
-           ("ύ" "�" :string)
-           ("ϋ" "�" :string)
-           ("ε" "�" :string)
-           ("Κ" "�" :string)
+           ("Ό" "�" :string)
+           ("λ" "�" :string)
+           ("Δ" "�" :string)
+           ("γ" "�" :string)
+           ("θ" "�" :string)
            ("δ" "�" :string)
+           ("ε" "�" :string)
+           ("ϐ" "�" :string)
+           ("ϳ" "�" :string)
+           ("Η" "�" :string)
            ("Σ" "�" :string)
+           ("ώ" "�" :string)
+           ("Ο" "�" :string)
+           ("Ί" "�" :string)
+           ("Ϊ" "�" :string)
+           ("τ" "�" :string)
+           ("ς" "�" :string)
            ("ό" "�" :string)
-           ("Μ" "�" :string)
-           ("φ" "�" :string)
+           ("α" "�" :string)
+           ("ύ" "�" :string)
+           ("β" "�" :string)
            ("κ" "�" :string)
-           ("ν" "�" :string)
-           ("γ" "�" :string)
-           ("Ν" "�" :string)
-           ("ζ" "�" :string)
-           ("Ξ" "�" :string)
-           ("ϊ" "�" :string)
-           ("ί" "�" :string)
-           ("Ι" "�" :string)
-           ("Β" "�" :string)
-           ("Ε" "�" :string)
-           ("έ" "�" :string)
+           ("ψ" "�" :string)
            ("σ" "�" :string)
+           ("Α" "�" :string)
            ("μ" "�" :string)
-           ("ϝ" "�" :string)
+           ("χ" "�" :string)
+           ("Φ" "�" :string)
+           ("ϋ" "�" :string)
+           ("ϑ" "�" :string)
+           ("Γ" "�" :string)
+           ("Υ" "�" :string)
+           ("φ" "�" :string)
            ("Θ" "�" :string)
-           ("Π" "�" :string)
-           ("Χ" "�" :string)
-           ("ϳ" "�" :string)
-           ("Α" "�" :string)
+           ("Κ" "�" :string)
            ("Τ" "�" :string)
            ("Ϝ" "�" :string)
-           ("υ" "�" :string)
+           ("ΰ" "�" :string)
+           ("Μ" "�" :string)
+           ("ρ" "�" :string)
+           ("ο" "�" :string)
            ("ω" "�" :string)
-           ("Ρ" "�" :string)
-           ("Ί" "�" :string)
-           ("Η" "�" :string)
-           ("Ύ" "�" :string)
-           ("β" "�" :string)
-           ("Φ" "�" :string)
-           ("Δ" "�" :string)
-           ("θ" "�" :string)
-           ("Έ" "�" :string)
-           ("ς" "�" :string)
-           ("Ϊ" "�" :string)
-           ("η" "�" :string)
-           ("Ό" "�" :string)
-           ("π" "�" :string)
+           ("ι" "�" :string)
+           ("Ξ" "�" :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/greek/translit-latin4.xdy b/Master/texmf-dist/xindy/modules/lang/greek/translit-latin4.xdy
index 7a58c5bff5e..f8c2a9393de 100644
--- a/Master/texmf-dist/xindy/modules/lang/greek/translit-latin4.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/greek/translit-latin4.xdy
@@ -24,155 +24,155 @@
 
 (define-rule-set "el-alphabetize"
 
-  :rules  (("a" "�" :string)
-           ("A" "�" :string)
-           ("b" "�" :string)
+  :rules  (("A" "�" :string)
+           ("a" "�" :string)
            ("B" "�" :string)
-           ("d" "�" :string)
+           ("b" "�" :string)
            ("D" "�" :string)
+           ("d" "�" :string)
            ("E" "�" :string)
-           ("e" "�" :string)
            ("�" "�" :string)
+           ("e" "�" :string)
            ("�" "�" :string)
            ("f" "�" :string)
            ("F" "�" :string)
-           ("g" "�" :string)
            ("G" "�" :string)
-           ("H" "�" :string)
+           ("g" "�" :string)
            ("h" "�" :string)
-           ("i" "�" :string)
+           ("H" "�" :string)
            ("I" "�" :string)
-           ("k" "�" :string)
+           ("i" "�" :string)
            ("K" "�" :string)
+           ("k" "�" :string)
            ("l" "�" :string)
            ("L" "�" :string)
-           ("m" "�" :string)
            ("M" "�" :string)
-           ("N" "�" :string)
+           ("m" "�" :string)
            ("n" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("N" "�" :string)
            ("O" "�" :string)
            ("o" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("p" "�" :string)
            ("P" "�" :string)
            ("r" "�" :string)
            ("R" "�" :string)
            ("s" "�" :string)
            ("S" "�" :string)
-           ("T" "�" :string)
            ("t" "�" :string)
+           ("T" "�" :string)
            ("U" "�" :string)
            ("u" "�" :string)
            ("X" "�" :string)
            ("x" "�" :string)
-           ("z" "�" :string)
            ("Z" "�" :string)
+           ("z" "�" :string)
            ))
 
 (define-rule-set "el-resolve-diacritics"
 
-  :rules  (("F" "�" :string)
-           ("M" "�" :string)
-           ("Z" "�" :string)
-           ("K" "�" :string)
-           ("I" "�" :string)
-           ("P" "�" :string)
-           ("B" "�" :string)
-           ("h" "�" :string)
+  :rules  (("B" "�" :string)
+           ("N" "�" :string)
            ("H" "�" :string)
-           ("R" "�" :string)
+           ("D" "�" :string)
+           ("U" "�" :string)
+           ("t" "�" :string)
+           ("p" "�" :string)
+           ("n" "�" :string)
+           ("d" "�" :string)
            ("A" "�" :string)
-           ("g" "�" :string)
-           ("l" "�" :string)
+           ("h" "�" :string)
+           ("O" "�" :string)
+           ("E" "�" :string)
            ("x" "�" :string)
-           ("e" "�" :string)
+           ("K" "�" :string)
+           ("G" "�" :string)
+           ("r" "�" :string)
+           ("X" "�" :string)
+           ("l" "�" :string)
+           ("I" "�" :string)
+           ("F" "�" :string)
+           ("L" "�" :string)
            ("z" "�" :string)
-           ("E" "�" :string)
+           ("S" "�" :string)
            ("a" "�" :string)
+           ("Z" "�" :string)
+           ("k" "�" :string)
            ("m" "�" :string)
-           ("s" "�" :string)
-           ("X" "�" :string)
-           ("u" "�" :string)
-           ("o" "�" :string)
+           ("g" "�" :string)
            ("f" "�" :string)
-           ("t" "�" :string)
-           ("S" "�" :string)
-           ("p" "�" :string)
-           ("U" "�" :string)
-           ("O" "�" :string)
-           ("r" "�" :string)
-           ("n" "�" :string)
-           ("G" "�" :string)
-           ("k" "�" :string)
-           ("i" "�" :string)
-           ("N" "�" :string)
-           ("L" "�" :string)
-           ("T" "�" :string)
-           ("D" "�" :string)
            ("b" "�" :string)
-           ("d" "�" :string)
-           ("�" "�" :string)
+           ("u" "�" :string)
+           ("T" "�" :string)
+           ("e" "�" :string)
+           ("s" "�" :string)
+           ("i" "�" :string)
+           ("R" "�" :string)
+           ("P" "�" :string)
+           ("o" "�" :string)
+           ("M" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ))
 
 (define-rule-set "el-resolve-case"
 
-  :rules  (("L" "8" :string)
-           ("D" "8" :string)
-           ("T" "8" :string)
-           ("N" "8" :string)
-           ("U" "8" :string)
+  :rules  (("G" "8" :string)
+           ("A" "8" :string)
+           ("E" "8" :string)
            ("O" "8" :string)
-           ("G" "8" :string)
-           ("S" "8" :string)
+           ("K" "8" :string)
+           ("I" "8" :string)
            ("X" "8" :string)
-           ("E" "8" :string)
+           ("N" "8" :string)
+           ("H" "8" :string)
+           ("B" "8" :string)
+           ("U" "8" :string)
+           ("D" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
-           ("A" "8" :string)
+           ("T" "8" :string)
+           ("M" "8" :string)
            ("P" "8" :string)
-           ("B" "8" :string)
            ("R" "8" :string)
-           ("H" "8" :string)
-           ("I" "8" :string)
-           ("M" "8" :string)
-           ("Z" "8" :string)
-           ("K" "8" :string)
+           ("�" "8" :string)
+           ("L" "8" :string)
            ("F" "8" :string)
-           ("d" "9" :string)
-           ("b" "9" :string)
-           ("k" "9" :string)
-           ("i" "9" :string)
-           ("p" "9" :string)
+           ("S" "8" :string)
+           ("Z" "8" :string)
            ("r" "9" :string)
+           ("h" "9" :string)
+           ("x" "9" :string)
+           ("l" "9" :string)
+           ("t" "9" :string)
+           ("�" "9" :string)
+           ("p" "9" :string)
            ("n" "9" :string)
+           ("d" "9" :string)
            ("u" "9" :string)
+           ("e" "9" :string)
            ("o" "9" :string)
-           ("t" "9" :string)
-           ("f" "9" :string)
-           ("m" "9" :string)
            ("s" "9" :string)
-           ("x" "9" :string)
-           ("e" "9" :string)
+           ("i" "9" :string)
            ("z" "9" :string)
-           ("a" "9" :string)
-           ("�" "9" :string)
-           ("l" "9" :string)
+           ("m" "9" :string)
+           ("k" "9" :string)
            ("g" "9" :string)
-           ("�" "9" :string)
-           ("h" "9" :string)
+           ("b" "9" :string)
+           ("f" "9" :string)
+           ("�" "9" :string)
+           ("a" "9" :string)
            ))
 
 (define-rule-set "el-ignore-special"
 
-  :rules  (("'" "" :string)
-           ("?" "" :string)
-           ("-" "" :string)
+  :rules  (("?" "" :string)
            ("." "" :string)
            ("!" "" :string)
+           ("'" "" :string)
+           ("-" "" :string)
            ))
 
 (define-rule-set "el-resolve-special"
@@ -180,50 +180,50 @@
   :rules  (("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("X" "�" :string)
            ("m" "�" :string)
-           ("s" "�" :string)
-           ("x" "�" :string)
-           ("e" "�" :string)
-           ("z" "�" :string)
-           ("a" "�" :string)
-           ("E" "�" :string)
-           ("�" "�" :string)
-           ("l" "�" :string)
-           ("�" "�" :string)
-           ("g" "�" :string)
-           ("L" "�" :string)
-           ("T" "�" :string)
-           ("D" "�" :string)
-           ("b" "�" :string)
-           ("d" "�" :string)
            ("k" "�" :string)
-           ("i" "�" :string)
-           ("N" "�" :string)
-           ("p" "�" :string)
-           ("U" "�" :string)
-           ("O" "�" :string)
-           ("r" "�" :string)
-           ("n" "�" :string)
-           ("G" "�" :string)
-           ("o" "�" :string)
-           ("u" "�" :string)
-           ("t" "�" :string)
+           ("g" "�" :string)
            ("f" "�" :string)
+           ("b" "�" :string)
+           ("�" "�" :string)
+           ("a" "�" :string)
            ("S" "�" :string)
-           ("I" "�" :string)
-           ("M" "�" :string)
            ("Z" "�" :string)
-           ("K" "�" :string)
-           ("F" "�" :string)
-           ("A" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("L" "�" :string)
+           ("z" "�" :string)
+           ("F" "�" :string)
+           ("o" "�" :string)
+           ("M" "�" :string)
+           ("i" "�" :string)
+           ("s" "�" :string)
+           ("R" "�" :string)
            ("P" "�" :string)
+           ("�" "�" :string)
+           ("u" "�" :string)
+           ("T" "�" :string)
+           ("e" "�" :string)
+           ("p" "�" :string)
+           ("t" "�" :string)
+           ("�" "�" :string)
+           ("d" "�" :string)
+           ("n" "�" :string)
+           ("D" "�" :string)
+           ("U" "�" :string)
+           ("N" "�" :string)
+           ("H" "�" :string)
            ("B" "�" :string)
+           ("I" "�" :string)
+           ("X" "�" :string)
+           ("l" "�" :string)
+           ("G" "�" :string)
+           ("r" "�" :string)
+           ("A" "�" :string)
            ("h" "�" :string)
-           ("H" "�" :string)
-           ("R" "�" :string)
+           ("E" "�" :string)
+           ("O" "�" :string)
+           ("x" "�" :string)
+           ("K" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/greek/translit-utf8.xdy b/Master/texmf-dist/xindy/modules/lang/greek/translit-utf8.xdy
index 1693b89c5b0..dbe0bf90909 100644
--- a/Master/texmf-dist/xindy/modules/lang/greek/translit-utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/greek/translit-utf8.xdy
@@ -24,44 +24,44 @@
 
 (define-rule-set "el-alphabetize"
 
-  :rules  (("Ē" "�" :string)
-           ("ē" "�" :string)
-           ("ō" "�" :string)
+  :rules  (("ē" "�" :string)
+           ("Ē" "�" :string)
            ("Ō" "�" :string)
+           ("ō" "�" :string)
            ("A" "�" :string)
            ("a" "�" :string)
            ("B" "�" :string)
            ("b" "�" :string)
-           ("d" "�" :string)
            ("D" "�" :string)
-           ("e" "�" :string)
+           ("d" "�" :string)
            ("E" "�" :string)
+           ("e" "�" :string)
            ("F" "�" :string)
            ("f" "�" :string)
-           ("G" "�" :string)
            ("g" "�" :string)
+           ("G" "�" :string)
            ("H" "�" :string)
            ("h" "�" :string)
            ("I" "�" :string)
            ("i" "�" :string)
-           ("k" "�" :string)
            ("K" "�" :string)
+           ("k" "�" :string)
            ("L" "�" :string)
            ("l" "�" :string)
-           ("M" "�" :string)
            ("m" "�" :string)
-           ("n" "�" :string)
+           ("M" "�" :string)
            ("N" "�" :string)
-           ("o" "�" :string)
+           ("n" "�" :string)
            ("O" "�" :string)
+           ("o" "�" :string)
            ("P" "�" :string)
            ("p" "�" :string)
-           ("r" "�" :string)
            ("R" "�" :string)
+           ("r" "�" :string)
            ("s" "�" :string)
            ("S" "�" :string)
-           ("T" "�" :string)
            ("t" "�" :string)
+           ("T" "�" :string)
            ("U" "�" :string)
            ("u" "�" :string)
            ("x" "�" :string)
@@ -72,158 +72,158 @@
 
 (define-rule-set "el-resolve-diacritics"
 
-  :rules  (("Ō" "�" :string)
+  :rules  (("Ē" "�" :string)
            ("ō" "�" :string)
+           ("Ō" "�" :string)
            ("ē" "�" :string)
-           ("Ē" "�" :string)
-           ("n" "�" :string)
-           ("r" "�" :string)
-           ("Z" "�" :string)
+           ("S" "�" :string)
+           ("b" "�" :string)
+           ("l" "�" :string)
+           ("t" "�" :string)
+           ("X" "�" :string)
+           ("k" "�" :string)
+           ("E" "�" :string)
+           ("H" "�" :string)
            ("e" "�" :string)
-           ("K" "�" :string)
+           ("U" "�" :string)
            ("d" "�" :string)
-           ("L" "�" :string)
-           ("o" "�" :string)
-           ("s" "�" :string)
-           ("H" "�" :string)
+           ("n" "�" :string)
+           ("A" "�" :string)
+           ("h" "�" :string)
            ("a" "�" :string)
-           ("U" "�" :string)
-           ("M" "�" :string)
-           ("k" "�" :string)
+           ("T" "�" :string)
+           ("z" "�" :string)
+           ("r" "�" :string)
+           ("u" "�" :string)
+           ("f" "�" :string)
            ("I" "�" :string)
-           ("A" "�" :string)
+           ("P" "�" :string)
+           ("F" "�" :string)
            ("g" "�" :string)
-           ("t" "�" :string)
-           ("u" "�" :string)
-           ("O" "�" :string)
-           ("E" "�" :string)
            ("i" "�" :string)
-           ("z" "�" :string)
-           ("f" "�" :string)
-           ("b" "�" :string)
-           ("X" "�" :string)
-           ("N" "�" :string)
-           ("G" "�" :string)
-           ("p" "�" :string)
            ("D" "�" :string)
            ("x" "�" :string)
-           ("T" "�" :string)
-           ("P" "�" :string)
-           ("l" "�" :string)
-           ("h" "�" :string)
+           ("N" "�" :string)
+           ("s" "�" :string)
+           ("Z" "�" :string)
            ("m" "�" :string)
-           ("B" "�" :string)
+           ("p" "�" :string)
+           ("L" "�" :string)
+           ("G" "�" :string)
+           ("O" "�" :string)
+           ("M" "�" :string)
            ("R" "�" :string)
-           ("S" "�" :string)
-           ("F" "�" :string)
+           ("B" "�" :string)
+           ("o" "�" :string)
+           ("K" "�" :string)
            ))
 
 (define-rule-set "el-resolve-case"
 
   :rules  (("Ō" "8" :string)
            ("Ē" "8" :string)
-           ("ō" "9" :string)
            ("ē" "9" :string)
-           ("K" "8" :string)
-           ("Z" "8" :string)
-           ("H" "8" :string)
+           ("ō" "9" :string)
+           ("G" "8" :string)
            ("L" "8" :string)
-           ("U" "8" :string)
-           ("M" "8" :string)
-           ("I" "8" :string)
-           ("A" "8" :string)
-           ("E" "8" :string)
            ("O" "8" :string)
-           ("G" "8" :string)
+           ("M" "8" :string)
            ("N" "8" :string)
-           ("X" "8" :string)
-           ("D" "8" :string)
-           ("T" "8" :string)
-           ("P" "8" :string)
+           ("Z" "8" :string)
            ("B" "8" :string)
+           ("K" "8" :string)
+           ("R" "8" :string)
+           ("I" "8" :string)
+           ("P" "8" :string)
            ("F" "8" :string)
+           ("D" "8" :string)
+           ("T" "8" :string)
+           ("X" "8" :string)
            ("S" "8" :string)
-           ("R" "8" :string)
-           ("r" "9" :string)
-           ("n" "9" :string)
-           ("e" "9" :string)
+           ("U" "8" :string)
+           ("A" "8" :string)
+           ("E" "8" :string)
+           ("H" "8" :string)
+           ("p" "9" :string)
+           ("m" "9" :string)
            ("s" "9" :string)
            ("o" "9" :string)
-           ("d" "9" :string)
-           ("a" "9" :string)
-           ("k" "9" :string)
-           ("t" "9" :string)
+           ("x" "9" :string)
            ("g" "9" :string)
+           ("i" "9" :string)
+           ("a" "9" :string)
            ("u" "9" :string)
-           ("b" "9" :string)
            ("f" "9" :string)
            ("z" "9" :string)
-           ("i" "9" :string)
-           ("p" "9" :string)
+           ("r" "9" :string)
            ("l" "9" :string)
-           ("x" "9" :string)
-           ("m" "9" :string)
+           ("t" "9" :string)
+           ("b" "9" :string)
+           ("e" "9" :string)
+           ("d" "9" :string)
+           ("n" "9" :string)
            ("h" "9" :string)
+           ("k" "9" :string)
            ))
 
 (define-rule-set "el-ignore-special"
 
-  :rules  (("!" "" :string)
-           ("." "" :string)
+  :rules  (("." "" :string)
+           ("'" "" :string)
+           ("!" "" :string)
            ("?" "" :string)
            ("-" "" :string)
-           ("'" "" :string)
            ))
 
 (define-rule-set "el-resolve-special"
 
-  :rules  (("Ē" "�" :string)
+  :rules  (("ō" "�" :string)
+           ("Ē" "�" :string)
            ("ē" "�" :string)
-           ("ō" "�" :string)
            ("Ō" "�" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("F" "�" :string)
+           ("r" "�" :string)
+           ("z" "�" :string)
+           ("f" "�" :string)
+           ("u" "�" :string)
+           ("a" "�" :string)
+           ("T" "�" :string)
+           ("H" "�" :string)
+           ("E" "�" :string)
+           ("k" "�" :string)
+           ("h" "�" :string)
+           ("A" "�" :string)
+           ("U" "�" :string)
+           ("n" "�" :string)
+           ("d" "�" :string)
+           ("e" "�" :string)
            ("S" "�" :string)
+           ("b" "�" :string)
+           ("X" "�" :string)
+           ("t" "�" :string)
+           ("l" "�" :string)
            ("R" "�" :string)
+           ("K" "�" :string)
+           ("o" "�" :string)
            ("B" "�" :string)
-           ("m" "�" :string)
-           ("h" "�" :string)
-           ("l" "�" :string)
-           ("x" "�" :string)
-           ("T" "�" :string)
-           ("P" "�" :string)
-           ("D" "�" :string)
+           ("Z" "�" :string)
+           ("s" "�" :string)
+           ("N" "�" :string)
+           ("O" "�" :string)
+           ("M" "�" :string)
            ("p" "�" :string)
+           ("m" "�" :string)
+           ("L" "�" :string)
            ("G" "�" :string)
-           ("X" "�" :string)
-           ("N" "�" :string)
-           ("b" "�" :string)
-           ("f" "�" :string)
-           ("z" "�" :string)
            ("i" "�" :string)
-           ("E" "�" :string)
-           ("u" "�" :string)
-           ("O" "�" :string)
-           ("t" "�" :string)
            ("g" "�" :string)
-           ("A" "�" :string)
+           ("x" "�" :string)
+           ("D" "�" :string)
+           ("F" "�" :string)
+           ("P" "�" :string)
            ("I" "�" :string)
-           ("k" "�" :string)
-           ("M" "�" :string)
-           ("U" "�" :string)
-           ("a" "�" :string)
-           ("H" "�" :string)
-           ("s" "�" :string)
-           ("o" "�" :string)
-           ("d" "�" :string)
-           ("L" "�" :string)
-           ("K" "�" :string)
-           ("e" "�" :string)
-           ("Z" "�" :string)
-           ("r" "�" :string)
-           ("n" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/greek/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/greek/utf8.xdy
index ce22cacb686..a70f8bf9818 100644
--- a/Master/texmf-dist/xindy/modules/lang/greek/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/greek/utf8.xdy
@@ -28,307 +28,307 @@
 
 (define-rule-set "el-alphabetize"
 
-  :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)
            ))
 
 (define-rule-set "el-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)
            ))
 
 (define-rule-set "el-resolve-case"
 
-  :rules  (("Ε" "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)
+           ("Η" "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)
+           ("Ή" "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 "el-ignore-special"
 
   :rules  (("·" "" :string)
            ("\/" "" :string)
-           ("?" "" :string)
            ("." "" :string)
            ("!" "" :string)
-           ("'" "" :string)
-           ("-" "" :string)
            (";" "" :string)
+           ("-" "" :string)
+           ("?" "" :string)
+           ("'" "" :string)
            ))
 
 (define-rule-set "el-resolve-special"
 
   :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)
diff --git a/Master/texmf-dist/xindy/modules/lang/gypsy/northrussian-utf8.xdy b/Master/texmf-dist/xindy/modules/lang/gypsy/northrussian-utf8.xdy
index 0b09e247af5..7ef77465390 100644
--- a/Master/texmf-dist/xindy/modules/lang/gypsy/northrussian-utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/gypsy/northrussian-utf8.xdy
@@ -40,288 +40,288 @@
 
 (define-rule-set "g1-alphabetize"
 
-  :rules  (("I̯" "�" :string)
-           ("i̯" "�" :string)
-           ("ḯ" "�" :string)
+  :rules  (("i̯" "�" :string)
+           ("I̯" "�" :string)
            ("Ḯ" "�" :string)
+           ("ḯ" "�" :string)
            ("Á" "�" :string)
            ("á" "�" :string)
-           ("č" "�" :string)
            ("Č" "�" :string)
-           ("Dz" "�" :string)
+           ("č" "�" :string)
            ("dz" "�" :string)
            ("DZ" "�" :string)
+           ("Dz" "�" :string)
            ("É" "�" :string)
            ("é" "�" :string)
-           ("γ" "�" :string)
            ("Γ" "�" :string)
-           ("Í" "�" :string)
+           ("γ" "�" :string)
            ("í" "�" :string)
+           ("Í" "�" :string)
            ("ï" "�" :string)
            ("Ï" "�" :string)
            ("KH" "�" :string)
            ("kh" "�" :string)
            ("Kh" "�" :string)
-           ("Ó" "�" :string)
            ("ó" "�" :string)
-           ("ph" "�" :string)
-           ("PH" "�" :string)
+           ("Ó" "�" :string)
            ("Ph" "�" :string)
-           ("Š" "�" :string)
+           ("PH" "�" :string)
+           ("ph" "�" :string)
            ("š" "�" :string)
+           ("Š" "�" :string)
            ("Th" "�" :string)
            ("TH" "�" :string)
            ("th" "�" :string)
-           ("ú" "�" :string)
            ("Ú" "�" :string)
+           ("ú" "�" :string)
            ("Ž" "�" :string)
            ("ž" "�" :string)
-           ("a" "�" :string)
            ("A" "�" :string)
-           ("b" "�" :string)
+           ("a" "�" :string)
            ("B" "�" :string)
-           ("c" "�" :string)
+           ("b" "�" :string)
            ("C" "�" :string)
-           ("d" "�" :string)
+           ("c" "�" :string)
            ("D" "�" :string)
+           ("d" "�" :string)
            ("E" "�" :string)
            ("e" "�" :string)
            ("f" "�" :string)
            ("F" "�" :string)
-           ("G" "�" :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)
            ("X" "�" :string)
            ("x" "�" :string)
-           ("l" "�" :string)
            ("L" "�" :string)
+           ("l" "�" :string)
            ("M" "�" :string)
            ("m" "�" :string)
            ("n" "�" :string)
            ("N" "�" :string)
-           ("O" "�" :string)
            ("o" "�" :string)
-           ("P" "�" :string)
+           ("O" "�" :string)
            ("p" "�" :string)
-           ("q" "�" :string)
+           ("P" "�" :string)
            ("Q" "�" :string)
+           ("q" "�" :string)
            ("r" "�" :string)
            ("R" "�" :string)
            ("s" "�" :string)
            ("S" "�" :string)
            ("t" "�" :string)
            ("T" "�" :string)
-           ("U" "�" :string)
            ("u" "�" :string)
-           ("v" "�" :string)
+           ("U" "�" :string)
            ("V" "�" :string)
-           ("W" "�" :string)
+           ("v" "�" :string)
            ("w" "�" :string)
-           ("Y" "�" :string)
+           ("W" "�" :string)
            ("y" "�" :string)
+           ("Y" "�" :string)
            ("z" "�" :string)
            ("Z" "�" :string)
            ))
 
 (define-rule-set "g1-resolve-diacritics"
 
-  :rules  (("i̯" "�" :string)
-           ("I̯" "�" :string)
+  :rules  (("I̯" "�" :string)
+           ("i̯" "�" :string)
            ("ḯ" "�" :string)
            ("Ḯ" "�" :string)
-           ("PH" "�" :string)
+           ("th" "�" :string)
+           ("Kh" "�" :string)
+           ("γ" "�" :string)
+           ("Š" "�" :string)
+           ("Γ" "�" :string)
            ("č" "�" :string)
-           ("Ph" "�" :string)
-           ("ž" "�" :string)
+           ("ph" "�" :string)
+           ("Dz" "�" :string)
            ("DZ" "�" :string)
-           ("Ï" "�" :string)
-           ("Č" "�" :string)
            ("š" "�" :string)
-           ("Γ" "�" :string)
-           ("Dz" "�" :string)
-           ("kh" "�" :string)
            ("TH" "�" :string)
-           ("KH" "�" :string)
+           ("PH" "�" :string)
+           ("dz" "�" :string)
+           ("Č" "�" :string)
+           ("Ï" "�" :string)
            ("Th" "�" :string)
-           ("ph" "�" :string)
-           ("Kh" "�" :string)
-           ("Š" "�" :string)
-           ("γ" "�" :string)
-           ("th" "�" :string)
            ("ï" "�" :string)
-           ("dz" "�" :string)
+           ("kh" "�" :string)
+           ("ž" "�" :string)
+           ("KH" "�" :string)
+           ("Ph" "�" :string)
            ("Ž" "�" :string)
            ("á" "�" :string)
-           ("ó" "�" :string)
-           ("í" "�" :string)
            ("é" "�" :string)
+           ("Í" "�" :string)
+           ("Á" "�" :string)
            ("ú" "�" :string)
-           ("É" "�" :string)
            ("Ó" "�" :string)
            ("Ú" "�" :string)
-           ("Í" "�" :string)
-           ("Á" "�" :string)
-           ("H" "�" :string)
-           ("x" "�" :string)
-           ("o" "�" :string)
-           ("k" "�" :string)
-           ("t" "�" :string)
-           ("B" "�" :string)
-           ("s" "�" :string)
-           ("h" "�" :string)
-           ("w" "�" :string)
-           ("p" "�" :string)
-           ("A" "�" :string)
-           ("T" "�" :string)
-           ("F" "�" :string)
-           ("Z" "�" :string)
-           ("J" "�" :string)
+           ("í" "�" :string)
+           ("É" "�" :string)
+           ("ó" "�" :string)
            ("N" "�" :string)
-           ("j" "�" :string)
+           ("c" "�" :string)
+           ("e" "�" :string)
+           ("P" "�" :string)
+           ("q" "�" :string)
+           ("G" "�" :string)
+           ("v" "�" :string)
+           ("m" "�" :string)
+           ("Q" "�" :string)
+           ("a" "�" :string)
+           ("R" "�" :string)
+           ("h" "�" :string)
+           ("I" "�" :string)
            ("S" "�" :string)
-           ("C" "�" :string)
-           ("D" "�" :string)
            ("g" "�" :string)
-           ("v" "�" :string)
+           ("Y" "�" :string)
            ("r" "�" :string)
+           ("T" "�" :string)
+           ("Z" "�" :string)
            ("U" "�" :string)
-           ("q" "�" :string)
-           ("P" "�" :string)
-           ("d" "�" :string)
-           ("E" "�" :string)
            ("i" "�" :string)
-           ("m" "�" :string)
+           ("J" "�" :string)
+           ("d" "�" :string)
+           ("F" "�" :string)
+           ("k" "�" :string)
+           ("x" "�" :string)
            ("n" "�" :string)
-           ("W" "�" :string)
-           ("Q" "�" :string)
-           ("M" "�" :string)
-           ("G" "�" :string)
+           ("C" "�" :string)
+           ("j" "�" :string)
+           ("K" "�" :string)
            ("z" "�" :string)
-           ("u" "�" :string)
-           ("y" "�" :string)
+           ("l" "�" :string)
            ("b" "�" :string)
-           ("R" "�" :string)
            ("V" "�" :string)
-           ("K" "�" :string)
-           ("L" "�" :string)
-           ("I" "�" :string)
-           ("e" "�" :string)
-           ("l" "�" :string)
-           ("Y" "�" :string)
-           ("c" "�" :string)
            ("O" "�" :string)
+           ("D" "�" :string)
            ("f" "�" :string)
+           ("u" "�" :string)
+           ("H" "�" :string)
+           ("p" "�" :string)
+           ("A" "�" :string)
+           ("y" "�" :string)
            ("X" "�" :string)
-           ("a" "�" :string)
+           ("B" "�" :string)
+           ("M" "�" :string)
+           ("E" "�" :string)
+           ("t" "�" :string)
+           ("s" "�" :string)
+           ("w" "�" :string)
+           ("L" "�" :string)
+           ("W" "�" :string)
+           ("o" "�" :string)
            ))
 
 (define-rule-set "g1-resolve-case"
 
   :rules  (("Ḯ" "8" :string)
            ("I̯" "8" :string)
-           ("ḯ" "9" :string)
            ("i̯" "9" :string)
-           ("DZ" "7" :string)
-           ("PH" "7" :string)
+           ("ḯ" "9" :string)
            ("KH" "7" :string)
+           ("PH" "7" :string)
            ("TH" "7" :string)
-           ("Γ" "8" :string)
-           ("Ï" "8" :string)
-           ("Č" "8" :string)
-           ("Ph" "8" :string)
+           ("DZ" "7" :string)
            ("Ž" "8" :string)
-           ("Í" "8" :string)
-           ("Á" "8" :string)
-           ("Š" "8" :string)
+           ("Ph" "8" :string)
            ("Ú" "8" :string)
-           ("Ó" "8" :string)
            ("É" "8" :string)
-           ("Kh" "8" :string)
-           ("Dz" "8" :string)
            ("Th" "8" :string)
-           ("š" "9" :string)
-           ("í" "9" :string)
-           ("é" "9" :string)
-           ("ó" "9" :string)
+           ("Ó" "8" :string)
+           ("Ï" "8" :string)
+           ("Č" "8" :string)
+           ("Á" "8" :string)
+           ("Í" "8" :string)
+           ("Dz" "8" :string)
+           ("Γ" "8" :string)
+           ("Kh" "8" :string)
+           ("Š" "8" :string)
            ("ž" "9" :string)
-           ("á" "9" :string)
-           ("č" "9" :string)
+           ("ó" "9" :string)
+           ("ï" "9" :string)
+           ("kh" "9" :string)
+           ("í" "9" :string)
+           ("ú" "9" :string)
            ("dz" "9" :string)
+           ("š" "9" :string)
+           ("č" "9" :string)
+           ("ph" "9" :string)
+           ("é" "9" :string)
            ("th" "9" :string)
-           ("ï" "9" :string)
+           ("á" "9" :string)
            ("γ" "9" :string)
-           ("ph" "9" :string)
-           ("ú" "9" :string)
-           ("kh" "9" :string)
-           ("D" "8" :string)
-           ("N" "8" :string)
-           ("S" "8" :string)
-           ("C" "8" :string)
+           ("E" "8" :string)
+           ("M" "8" :string)
+           ("W" "8" :string)
+           ("L" "8" :string)
            ("A" "8" :string)
-           ("T" "8" :string)
-           ("Z" "8" :string)
-           ("J" "8" :string)
-           ("F" "8" :string)
            ("H" "8" :string)
            ("B" "8" :string)
            ("X" "8" :string)
+           ("K" "8" :string)
+           ("C" "8" :string)
+           ("D" "8" :string)
+           ("V" "8" :string)
            ("O" "8" :string)
-           ("I" "8" :string)
+           ("F" "8" :string)
+           ("J" "8" :string)
+           ("U" "8" :string)
+           ("Z" "8" :string)
+           ("T" "8" :string)
            ("Y" "8" :string)
+           ("S" "8" :string)
+           ("I" "8" :string)
            ("R" "8" :string)
-           ("V" "8" :string)
-           ("K" "8" :string)
-           ("L" "8" :string)
-           ("E" "8" :string)
-           ("P" "8" :string)
            ("G" "8" :string)
-           ("M" "8" :string)
-           ("W" "8" :string)
            ("Q" "8" :string)
-           ("U" "8" :string)
-           ("g" "9" :string)
-           ("j" "9" :string)
-           ("p" "9" :string)
-           ("k" "9" :string)
-           ("t" "9" :string)
-           ("x" "9" :string)
+           ("P" "8" :string)
+           ("N" "8" :string)
            ("o" "9" :string)
            ("w" "9" :string)
            ("s" "9" :string)
-           ("h" "9" :string)
-           ("f" "9" :string)
-           ("a" "9" :string)
+           ("t" "9" :string)
            ("y" "9" :string)
-           ("b" "9" :string)
+           ("p" "9" :string)
+           ("l" "9" :string)
            ("z" "9" :string)
+           ("j" "9" :string)
+           ("n" "9" :string)
            ("u" "9" :string)
-           ("l" "9" :string)
-           ("e" "9" :string)
-           ("c" "9" :string)
-           ("i" "9" :string)
+           ("f" "9" :string)
+           ("b" "9" :string)
+           ("k" "9" :string)
            ("d" "9" :string)
-           ("n" "9" :string)
-           ("m" "9" :string)
+           ("x" "9" :string)
+           ("g" "9" :string)
+           ("i" "9" :string)
            ("r" "9" :string)
+           ("a" "9" :string)
+           ("h" "9" :string)
            ("v" "9" :string)
+           ("m" "9" :string)
+           ("e" "9" :string)
+           ("c" "9" :string)
            ("q" "9" :string)
            ))
 
 (define-rule-set "g1-ignore-special"
 
   :rules  (("ˈ" "" :string)
-           ("!" "" :string)
            ("." "" :string)
-           ("-" "" :string)
+           ("!" "" :string)
            ("?" "" :string)
            ("'" "" :string)
+           ("-" "" :string)
            ))
 
 (define-rule-set "g1-resolve-special"
@@ -330,94 +330,94 @@
            ("ḯ" "�" :string)
            ("Ḯ" "�" :string)
            ("i̯" "�" :string)
-           ("Ó" "�" :string)
-           ("Ú" "�" :string)
-           ("γ" "�" :string)
+           ("Γ" "�" :string)
+           ("é" "�" :string)
            ("th" "�" :string)
-           ("ï" "�" :string)
+           ("Kh" "�" :string)
+           ("á" "�" :string)
+           ("γ" "�" :string)
            ("Š" "�" :string)
+           ("DZ" "�" :string)
            ("Á" "�" :string)
+           ("š" "�" :string)
            ("Í" "�" :string)
-           ("dz" "�" :string)
-           ("Ž" "�" :string)
-           ("TH" "�" :string)
-           ("KH" "�" :string)
-           ("Th" "�" :string)
+           ("č" "�" :string)
+           ("ph" "�" :string)
            ("Dz" "�" :string)
-           ("kh" "�" :string)
-           ("Kh" "�" :string)
+           ("Ï" "�" :string)
+           ("Ó" "�" :string)
+           ("Th" "�" :string)
            ("ú" "�" :string)
-           ("É" "�" :string)
-           ("ph" "�" :string)
+           ("dz" "�" :string)
            ("Č" "�" :string)
-           ("é" "�" :string)
-           ("DZ" "�" :string)
-           ("Ï" "�" :string)
-           ("í" "�" :string)
-           ("š" "�" :string)
-           ("Γ" "�" :string)
-           ("č" "�" :string)
-           ("á" "�" :string)
+           ("TH" "�" :string)
            ("PH" "�" :string)
-           ("Ph" "�" :string)
+           ("KH" "�" :string)
            ("ž" "�" :string)
            ("ó" "�" :string)
+           ("Ž" "�" :string)
+           ("Ph" "�" :string)
+           ("ï" "�" :string)
+           ("Ú" "�" :string)
+           ("í" "�" :string)
+           ("kh" "�" :string)
+           ("É" "�" :string)
            ("ˈ" "�" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("L" "�" :string)
-           ("V" "�" :string)
-           ("K" "�" :string)
-           ("R" "�" :string)
-           ("Y" "�" :string)
-           ("c" "�" :string)
-           ("I" "�" :string)
-           ("e" "�" :string)
-           ("l" "�" :string)
-           ("u" "�" :string)
-           ("z" "�" :string)
-           ("b" "�" :string)
-           ("y" "�" :string)
-           ("a" "�" :string)
-           ("f" "�" :string)
-           ("O" "�" :string)
-           ("X" "�" :string)
-           ("U" "�" :string)
-           ("q" "�" :string)
+           ("G" "�" :string)
            ("v" "�" :string)
-           ("r" "�" :string)
-           ("W" "�" :string)
            ("Q" "�" :string)
            ("m" "�" :string)
-           ("n" "�" :string)
-           ("G" "�" :string)
-           ("M" "�" :string)
-           ("d" "�" :string)
+           ("e" "�" :string)
            ("P" "�" :string)
+           ("N" "�" :string)
+           ("c" "�" :string)
+           ("q" "�" :string)
+           ("g" "�" :string)
+           ("U" "�" :string)
            ("i" "�" :string)
-           ("E" "�" :string)
-           ("j" "�" :string)
+           ("Y" "�" :string)
+           ("r" "�" :string)
+           ("T" "�" :string)
+           ("Z" "�" :string)
+           ("a" "�" :string)
+           ("R" "�" :string)
+           ("h" "�" :string)
+           ("I" "�" :string)
            ("S" "�" :string)
+           ("K" "�" :string)
+           ("j" "�" :string)
+           ("z" "�" :string)
+           ("l" "�" :string)
+           ("n" "�" :string)
            ("C" "�" :string)
-           ("N" "�" :string)
+           ("V" "�" :string)
+           ("O" "�" :string)
            ("D" "�" :string)
-           ("g" "�" :string)
-           ("s" "�" :string)
-           ("h" "�" :string)
-           ("B" "�" :string)
+           ("f" "�" :string)
+           ("u" "�" :string)
+           ("b" "�" :string)
+           ("F" "�" :string)
+           ("k" "�" :string)
+           ("J" "�" :string)
+           ("d" "�" :string)
+           ("x" "�" :string)
+           ("E" "�" :string)
+           ("M" "�" :string)
            ("w" "�" :string)
+           ("L" "�" :string)
+           ("W" "�" :string)
            ("o" "�" :string)
-           ("x" "�" :string)
-           ("H" "�" :string)
-           ("k" "�" :string)
            ("t" "�" :string)
-           ("F" "�" :string)
-           ("J" "�" :string)
-           ("Z" "�" :string)
+           ("s" "�" :string)
            ("p" "�" :string)
-           ("T" "�" :string)
            ("A" "�" :string)
+           ("y" "�" :string)
+           ("H" "�" :string)
+           ("B" "�" :string)
+           ("X" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/hausa/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/hausa/utf8.xdy
index bf62221903e..42d5811e831 100644
--- a/Master/texmf-dist/xindy/modules/lang/hausa/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/hausa/utf8.xdy
@@ -34,107 +34,107 @@
 
 (define-rule-set "ha-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)
-           ("A̱" "�" :string)
            ("a̱" "�" :string)
-           ("e̱" "�" :string)
+           ("A̱" "�" :string)
            ("E̱" "�" :string)
-           ("i̱" "�" :string)
+           ("e̱" "�" :string)
            ("I̱" "�" :string)
+           ("i̱" "�" :string)
            ("O̱" "�" :string)
            ("o̱" "�" :string)
-           ("U̱" "�" :string)
            ("u̱" "�" :string)
+           ("U̱" "�" :string)
            ("ʼY" "�" :string)
            ("ʼy" "�" :string)
            ("À" "�" :string)
-           ("ā" "�" :string)
            ("à" "�" :string)
+           ("ā" "�" :string)
            ("Ā" "�" :string)
            ("ɓ" "�" :string)
            ("Ɓ" "�" :string)
            ("ɗ" "�" :string)
            ("Ɗ" "�" :string)
-           ("è" "�" :string)
            ("Ē" "�" :string)
-           ("È" "�" :string)
            ("ē" "�" :string)
+           ("È" "�" :string)
+           ("è" "�" :string)
+           ("Ī" "�" :string)
+           ("ī" "�" :string)
            ("Ì" "�" :string)
            ("ì" "�" :string)
-           ("ī" "�" :string)
-           ("Ī" "�" :string)
-           ("Ƙ" "�" :string)
            ("ƙ" "�" :string)
-           ("ò" "�" :string)
+           ("Ƙ" "�" :string)
+           ("ō" "�" :string)
            ("Ò" "�" :string)
+           ("ò" "�" :string)
            ("Ō" "�" :string)
-           ("ō" "�" :string)
            ("ß" "��" :string)
-           ("Ū" "�" :string)
            ("ū" "�" :string)
-           ("Ù" "�" :string)
+           ("Ū" "�" :string)
            ("ù" "�" :string)
+           ("Ù" "�" :string)
            ("a" "�" :string)
            ("A" "�" :string)
            ("B" "�" :string)
            ("b" "�" :string)
-           ("c" "�" :string)
            ("C" "�" :string)
-           ("d" "�" :string)
+           ("c" "�" :string)
            ("D" "�" :string)
+           ("d" "�" :string)
            ("e" "�" :string)
            ("E" "�" :string)
-           ("F" "�" :string)
            ("f" "�" :string)
+           ("F" "�" :string)
            ("G" "�" :string)
            ("g" "�" :string)
-           ("H" "�" :string)
            ("h" "�" :string)
+           ("H" "�" :string)
            ("i" "�" :string)
            ("I" "�" :string)
            ("J" "�" :string)
            ("j" "�" :string)
            ("k" "�" :string)
            ("K" "�" :string)
-           ("l" "�" :string)
            ("L" "�" :string)
+           ("l" "�" :string)
            ("M" "�" :string)
            ("m" "�" :string)
            ("N" "�" :string)
            ("n" "�" :string)
-           ("O" "�" :string)
            ("o" "�" :string)
+           ("O" "�" :string)
            ("P" "�" :string)
            ("p" "�" :string)
            ("Q" "�" :string)
            ("q" "�" :string)
            ("r" "�" :string)
            ("R" "�" :string)
-           ("s" "�" :string)
            ("S" "�" :string)
-           ("t" "�" :string)
+           ("s" "�" :string)
            ("T" "�" :string)
-           ("u" "�" :string)
+           ("t" "�" :string)
            ("U" "�" :string)
+           ("u" "�" :string)
            ("V" "�" :string)
            ("v" "�" :string)
            ("w" "�" :string)
@@ -143,238 +143,238 @@
            ("x" "�" :string)
            ("y" "�" :string)
            ("Y" "�" :string)
-           ("z" "�" :string)
            ("Z" "�" :string)
+           ("z" "�" :string)
            ))
 
 (define-rule-set "ha-resolve-diacritics"
 
-  :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)
            ("ʼY" "�" :string)
            ("ʼy" "�" :string)
+           ("U̱" "�" :string)
+           ("I̱" "�" :string)
+           ("o̱" "�" :string)
            ("O̱" "�" :string)
-           ("u̱" "�" :string)
-           ("e̱" "�" :string)
            ("A̱" "�" :string)
-           ("o̱" "�" :string)
+           ("u̱" "�" :string)
            ("a̱" "�" :string)
-           ("I̱" "�" :string)
            ("E̱" "�" :string)
-           ("U̱" "�" :string)
+           ("e̱" "�" :string)
            ("i̱" "�" :string)
-           ("ɗ" "�" :string)
+           ("Ƙ" "�" :string)
            ("Ɗ" "�" :string)
-           ("Ɓ" "�" :string)
            ("ƙ" "�" :string)
+           ("Ɓ" "�" :string)
+           ("ɗ" "�" :string)
            ("ɓ" "�" :string)
-           ("Ƙ" "�" :string)
-           ("ō" "�" :string)
-           ("Ī" "�" :string)
-           ("ē" "�" :string)
-           ("Ā" "�" :string)
-           ("ū" "�" :string)
            ("Ū" "�" :string)
+           ("ī" "�" :string)
+           ("ū" "�" :string)
+           ("ē" "�" :string)
+           ("ō" "�" :string)
            ("Ē" "�" :string)
+           ("Ī" "�" :string)
            ("ā" "�" :string)
-           ("ī" "�" :string)
+           ("Ā" "�" :string)
            ("Ō" "�" :string)
-           ("ù" "�" :string)
-           ("È" "�" :string)
+           ("ì" "�" :string)
            ("è" "�" :string)
-           ("ò" "�" :string)
            ("Ì" "�" :string)
            ("Ò" "�" :string)
-           ("ì" "�" :string)
+           ("È" "�" :string)
            ("À" "�" :string)
-           ("à" "�" :string)
+           ("ù" "�" :string)
            ("Ù" "�" :string)
+           ("à" "�" :string)
+           ("ò" "�" :string)
            ("ß" "�" :string)
-           ("u" "�" :string)
-           ("n" "�" :string)
-           ("A" "�" :string)
-           ("D" "�" :string)
-           ("x" "�" :string)
-           ("w" "�" :string)
+           ("X" "�" :string)
+           ("s" "�" :string)
+           ("t" "�" :string)
+           ("h" "�" :string)
+           ("N" "�" :string)
+           ("g" "�" :string)
            ("q" "�" :string)
+           ("C" "�" :string)
+           ("y" "�" :string)
            ("I" "�" :string)
+           ("i" "�" :string)
            ("Q" "�" :string)
-           ("d" "�" :string)
-           ("U" "�" :string)
-           ("B" "�" :string)
-           ("W" "�" :string)
-           ("j" "�" :string)
-           ("Y" "�" :string)
+           ("p" "�" :string)
            ("f" "�" :string)
-           ("S" "�" :string)
            ("b" "�" :string)
-           ("K" "�" :string)
-           ("C" "�" :string)
-           ("E" "�" :string)
-           ("c" "�" :string)
-           ("t" "�" :string)
-           ("l" "�" :string)
-           ("O" "�" :string)
-           ("X" "�" :string)
-           ("V" "�" :string)
-           ("H" "�" :string)
+           ("S" "�" :string)
            ("r" "�" :string)
-           ("a" "�" :string)
-           ("M" "�" :string)
-           ("e" "�" :string)
+           ("P" "�" :string)
+           ("j" "�" :string)
+           ("J" "�" :string)
+           ("k" "�" :string)
            ("G" "�" :string)
+           ("U" "�" :string)
+           ("B" "�" :string)
+           ("u" "�" :string)
+           ("T" "�" :string)
+           ("W" "�" :string)
+           ("o" "�" :string)
+           ("M" "�" :string)
+           ("w" "�" :string)
+           ("O" "�" :string)
+           ("v" "�" :string)
+           ("d" "�" :string)
+           ("R" "�" :string)
+           ("E" "�" :string)
+           ("A" "�" :string)
            ("z" "�" :string)
-           ("i" "�" :string)
+           ("Y" "�" :string)
+           ("l" "�" :string)
+           ("m" "�" :string)
            ("F" "�" :string)
+           ("n" "�" :string)
+           ("c" "�" :string)
            ("Z" "�" :string)
-           ("m" "�" :string)
-           ("v" "�" :string)
-           ("o" "�" :string)
-           ("y" "�" :string)
+           ("V" "�" :string)
+           ("e" "�" :string)
+           ("D" "�" :string)
+           ("H" "�" :string)
+           ("K" "�" :string)
            ("L" "�" :string)
-           ("R" "�" :string)
-           ("g" "�" :string)
-           ("J" "�" :string)
-           ("k" "�" :string)
-           ("P" "�" :string)
-           ("N" "�" :string)
-           ("s" "�" :string)
-           ("p" "�" :string)
-           ("h" "�" :string)
-           ("T" "�" :string)
+           ("a" "�" :string)
+           ("x" "�" :string)
            ))
 
 (define-rule-set "ha-resolve-case"
 
-  :rules  (("Ō̱" "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)
-           ("ē̱" "9" :string)
-           ("ī̱" "9" :string)
-           ("ā̱" "9" :string)
-           ("ō̱" "9" :string)
-           ("ū̀" "9" :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)
            ("A̱" "8" :string)
-           ("ʼY" "8" :string)
            ("O̱" "8" :string)
            ("I̱" "8" :string)
-           ("E̱" "8" :string)
            ("U̱" "8" :string)
+           ("E̱" "8" :string)
+           ("ʼY" "8" :string)
            ("e̱" "9" :string)
-           ("u̱" "9" :string)
            ("ʼy" "9" :string)
-           ("a̱" "9" :string)
-           ("o̱" "9" :string)
            ("i̱" "9" :string)
-           ("Ī" "8" :string)
-           ("È" "8" :string)
-           ("Ɗ" "8" :string)
-           ("Ɓ" "8" :string)
+           ("o̱" "9" :string)
+           ("a̱" "9" :string)
+           ("u̱" "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)
+           ("ƙ" "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)
            ("ß" "99" :string)
-           ("D" "8" :string)
-           ("I" "8" :string)
-           ("Q" "8" :string)
-           ("A" "8" :string)
            ("Y" "8" :string)
-           ("S" "8" :string)
+           ("A" "8" :string)
+           ("E" "8" :string)
+           ("R" "8" :string)
+           ("O" "8" :string)
+           ("L" "8" :string)
            ("K" "8" :string)
+           ("H" "8" :string)
+           ("D" "8" :string)
+           ("V" "8" :string)
+           ("Z" "8" :string)
+           ("F" "8" :string)
+           ("Q" "8" :string)
+           ("I" "8" :string)
            ("C" "8" :string)
-           ("E" "8" :string)
-           ("U" "8" :string)
-           ("W" "8" :string)
-           ("B" "8" :string)
+           ("N" "8" :string)
+           ("X" "8" :string)
            ("M" "8" :string)
+           ("W" "8" :string)
+           ("T" "8" :string)
+           ("U" "8" :string)
            ("G" "8" :string)
-           ("X" "8" :string)
-           ("O" "8" :string)
-           ("V" "8" :string)
-           ("H" "8" :string)
-           ("R" "8" :string)
+           ("B" "8" :string)
            ("J" "8" :string)
            ("P" "8" :string)
-           ("N" "8" :string)
-           ("T" "8" :string)
-           ("Z" "8" :string)
-           ("F" "8" :string)
-           ("L" "8" :string)
-           ("x" "9" :string)
-           ("w" "9" :string)
-           ("q" "9" :string)
+           ("S" "8" :string)
+           ("m" "9" :string)
+           ("l" "9" :string)
+           ("z" "9" :string)
            ("d" "9" :string)
-           ("u" "9" :string)
-           ("n" "9" :string)
-           ("f" "9" :string)
-           ("b" "9" :string)
-           ("j" "9" :string)
-           ("r" "9" :string)
+           ("v" "9" :string)
+           ("x" "9" :string)
            ("a" "9" :string)
            ("e" "9" :string)
-           ("l" "9" :string)
            ("c" "9" :string)
-           ("t" "9" :string)
-           ("g" "9" :string)
-           ("s" "9" :string)
-           ("k" "9" :string)
-           ("h" "9" :string)
+           ("n" "9" :string)
+           ("f" "9" :string)
            ("p" "9" :string)
            ("i" "9" :string)
-           ("z" "9" :string)
-           ("m" "9" :string)
-           ("v" "9" :string)
            ("y" "9" :string)
+           ("q" "9" :string)
+           ("g" "9" :string)
+           ("h" "9" :string)
+           ("t" "9" :string)
+           ("s" "9" :string)
+           ("w" "9" :string)
            ("o" "9" :string)
+           ("u" "9" :string)
+           ("k" "9" :string)
+           ("j" "9" :string)
+           ("r" "9" :string)
+           ("b" "9" :string)
            ))
 
 (define-rule-set "ha-ignore-special"
@@ -382,130 +382,130 @@
   :rules  (("ʼ" "" :string)
            ("?" "" :string)
            ("}" "" :string)
-           ("-" "" :string)
+           ("!" "" :string)
            ("'" "" :string)
+           ("-" "" :string)
            ("." "" :string)
-           ("!" "" :string)
            ("{" "" :string)
            ))
 
 (define-rule-set "ha-resolve-special"
 
   :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)
-           ("U̱" "�" :string)
+           ("ṑ" "�" :string)
+           ("Ā̱" "�" :string)
+           ("Ī̱" "�" :string)
+           ("Ḕ" "�" :string)
+           ("ḕ" "�" :string)
            ("i̱" "�" :string)
            ("e̱" "�" :string)
-           ("u̱" "�" :string)
-           ("O̱" "�" :string)
+           ("ʼy" "�" :string)
+           ("E̱" "�" :string)
            ("ʼY" "�" :string)
+           ("u̱" "�" :string)
+           ("a̱" "�" :string)
            ("A̱" "�" :string)
+           ("O̱" "�" :string)
+           ("U̱" "�" :string)
            ("o̱" "�" :string)
-           ("a̱" "�" :string)
-           ("ʼy" "�" :string)
-           ("E̱" "�" :string)
            ("I̱" "�" :string)
-           ("è" "�" :string)
+           ("Ō" "�" :string)
            ("ò" "�" :string)
-           ("Ū" "�" :string)
-           ("Ì" "�" :string)
-           ("ū" "�" :string)
-           ("Ē" "�" :string)
-           ("ā" "�" :string)
-           ("à" "�" :string)
-           ("À" "�" :string)
-           ("Ƙ" "�" :string)
-           ("ì" "�" :string)
-           ("Ò" "�" :string)
            ("ɓ" "�" :string)
+           ("Ɓ" "�" :string)
+           ("à" "�" :string)
+           ("ɗ" "�" :string)
+           ("ƙ" "�" :string)
+           ("Ɗ" "�" :string)
            ("Ù" "�" :string)
-           ("Ō" "�" :string)
-           ("ī" "�" :string)
+           ("Ƙ" "�" :string)
            ("ù" "�" :string)
+           ("Ā" "�" :string)
+           ("ā" "�" :string)
+           ("À" "�" :string)
+           ("Ē" "�" :string)
            ("ō" "�" :string)
-           ("È" "�" :string)
-           ("ɗ" "�" :string)
            ("Ī" "�" :string)
-           ("Ā" "�" :string)
-           ("Ɓ" "�" :string)
-           ("ƙ" "�" :string)
-           ("Ɗ" "�" :string)
+           ("È" "�" :string)
+           ("Ò" "�" :string)
+           ("Ū" "�" :string)
+           ("ī" "�" :string)
            ("ē" "�" :string)
+           ("ū" "�" :string)
+           ("è" "�" :string)
+           ("Ì" "�" :string)
+           ("ì" "�" :string)
            ("ß" "��" :string)
            ("ʼ" "�" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
+           ("K" "�" :string)
+           ("L" "�" :string)
            ("H" "�" :string)
-           ("V" "�" :string)
-           ("O" "�" :string)
-           ("X" "�" :string)
-           ("t" "�" :string)
+           ("D" "�" :string)
+           ("x" "�" :string)
+           ("a" "�" :string)
            ("c" "�" :string)
-           ("l" "�" :string)
+           ("n" "�" :string)
+           ("F" "�" :string)
            ("e" "�" :string)
+           ("V" "�" :string)
+           ("Z" "�" :string)
+           ("z" "�" :string)
+           ("A" "�" :string)
+           ("E" "�" :string)
+           ("R" "�" :string)
+           ("m" "�" :string)
+           ("l" "�" :string)
+           ("Y" "�" :string)
+           ("v" "�" :string)
+           ("O" "�" :string)
+           ("d" "�" :string)
+           ("o" "�" :string)
+           ("W" "�" :string)
+           ("u" "�" :string)
+           ("T" "�" :string)
+           ("U" "�" :string)
+           ("B" "�" :string)
            ("G" "�" :string)
+           ("w" "�" :string)
            ("M" "�" :string)
-           ("a" "�" :string)
+           ("J" "�" :string)
+           ("j" "�" :string)
            ("r" "�" :string)
-           ("o" "�" :string)
-           ("L" "�" :string)
-           ("y" "�" :string)
-           ("v" "�" :string)
-           ("m" "�" :string)
-           ("F" "�" :string)
-           ("i" "�" :string)
-           ("z" "�" :string)
-           ("Z" "�" :string)
-           ("p" "�" :string)
-           ("T" "�" :string)
-           ("h" "�" :string)
-           ("N" "�" :string)
            ("P" "�" :string)
+           ("S" "�" :string)
+           ("b" "�" :string)
            ("k" "�" :string)
-           ("s" "�" :string)
-           ("J" "�" :string)
-           ("g" "�" :string)
-           ("R" "�" :string)
-           ("A" "�" :string)
-           ("n" "�" :string)
-           ("u" "�" :string)
-           ("d" "�" :string)
-           ("Q" "�" :string)
-           ("q" "�" :string)
            ("I" "�" :string)
-           ("x" "�" :string)
-           ("w" "�" :string)
-           ("D" "�" :string)
-           ("j" "�" :string)
-           ("B" "�" :string)
-           ("W" "�" :string)
-           ("U" "�" :string)
+           ("y" "�" :string)
            ("C" "�" :string)
-           ("E" "�" :string)
-           ("K" "�" :string)
-           ("b" "�" :string)
-           ("S" "�" :string)
+           ("q" "�" :string)
            ("f" "�" :string)
-           ("Y" "�" :string)
+           ("p" "�" :string)
+           ("Q" "�" :string)
+           ("i" "�" :string)
+           ("h" "�" :string)
+           ("t" "�" :string)
+           ("X" "�" :string)
+           ("s" "�" :string)
+           ("g" "�" :string)
+           ("N" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ("{" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/hebrew/iso88598.xdy b/Master/texmf-dist/xindy/modules/lang/hebrew/iso88598.xdy
index 2a686e88cae..ef26b59f9ed 100644
--- a/Master/texmf-dist/xindy/modules/lang/hebrew/iso88598.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/hebrew/iso88598.xdy
@@ -45,8 +45,8 @@
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
@@ -57,73 +57,73 @@
 
 (define-rule-set "iw-resolve-diacritics"
 
-  :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)
            ))
 
 (define-rule-set "iw-resolve-case"
 
   :rules  (("�" "8" :string)
-           ("�" "8" :string)
            ("�" "8" :string)
            ("�" "8" :string)
            ("�" "8" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :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)
            ))
 
 (define-rule-set "iw-ignore-special"
 
   :rules  (("!" "" :string)
-           ("." "" :string)
+           ("-" "" :string)
            ("?" "" :string)
+           ("." "" :string)
            (";" "" :string)
-           ("-" "" :string)
            ("�" "" :string)
            ))
 
@@ -134,33 +134,33 @@
            ("." "�" :string)
            (";" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :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/hebrew/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/hebrew/utf8.xdy
index 3de13cd26d8..a7dfde238ba 100644
--- a/Master/texmf-dist/xindy/modules/lang/hebrew/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/hebrew/utf8.xdy
@@ -29,11 +29,11 @@
   :rules  (("בֵּ" "�" :string)
            ("אֻ" "�" :string)
            ("אֶ" "�" :string)
-           ("בַ" "�" :string)
            ("בָ" "�" :string)
-           ("אָ" "�" :string)
+           ("בַ" "�" :string)
            ("אַ" "�" :string)
            ("אּ" "�" :string)
+           ("אָ" "�" :string)
            ("בּ" "�" :string)
            ("גּ" "�" :string)
            ("דּ" "�" :string)
@@ -53,9 +53,9 @@
            ("צּ" "�" :string)
            ("קּ" "�" :string)
            ("רּ" "�" :string)
-           ("שׂ" "�" :string)
-           ("שׁ" "�" :string)
            ("שּׁ" "�" :string)
+           ("שׁ" "�" :string)
+           ("שׂ" "�" :string)
            ("תּ" "�" :string)
            ("א" "�" :string)
            ("ב" "�" :string)
@@ -73,10 +73,10 @@
            ("ך" "�" :string)
            ("כ" "�" :string)
            ("ל" "�" :string)
-           ("מ" "�" :string)
            ("ם" "�" :string)
-           ("ן" "�" :string)
+           ("מ" "�" :string)
            ("נ" "�" :string)
+           ("ן" "�" :string)
            ("ס" "�" :string)
            ("ע" "�" :string)
            ("פ" "�" :string)
@@ -93,208 +93,208 @@
 
   :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)
            ))
 
 (define-rule-set "iw-resolve-case"
 
   :rules  (("בֵּ" "9" :string)
+           ("אֻ" "9" :string)
            ("בַ" "9" :string)
-           ("בָ" "9" :string)
            ("אֶ" "9" :string)
-           ("אֻ" "9" :string)
-           ("ךּ" "8" :string)
+           ("בָ" "9" :string)
            ("ףּ" "8" :string)
-           ("כּ" "9" :string)
-           ("נּ" "9" :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)
+           ("ך" "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)
+           ("ף" "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)
-           ("ױ" "99" :string)
-           ("ײ" "99" :string)
+           ("ד" "9" :string)
+           ("ש" "9" :string)
+           ("פ" "9" :string)
+           ("ת" "9" :string)
+           ("ר" "9" :string)
+           ("נ" "9" :string)
+           ("ע" "9" :string)
+           ("צ" "9" :string)
            ("װ" "99" :string)
+           ("ײ" "99" :string)
+           ("ױ" "99" :string)
            ))
 
 (define-rule-set "iw-ignore-special"
 
   :rules  (("וֹ" "" :string)
            ("·" "" :string)
+           (";" "" :string)
            ("?" "" :string)
            ("-" "" :string)
            ("." "" :string)
-           (";" "" :string)
            ("!" "" :string)
            ))
 
 (define-rule-set "iw-resolve-special"
 
   :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)
diff --git a/Master/texmf-dist/xindy/modules/lang/hungarian/cp1250.xdy b/Master/texmf-dist/xindy/modules/lang/hungarian/cp1250.xdy
index 6bf297bf3a7..336e73002ce 100644
--- a/Master/texmf-dist/xindy/modules/lang/hungarian/cp1250.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/hungarian/cp1250.xdy
@@ -36,98 +36,98 @@
 
 (define-rule-set "hu-alphabetize"
 
-  :rules  (("dzs" "�" :string)
-           ("DZS" "�" :string)
+  :rules  (("DZs" "�" :string)
            ("Dzs" "�" :string)
-           ("DZs" "�" :string)
-           ("cs" "�" :string)
-           ("Cs" "�" :string)
+           ("DZS" "�" :string)
+           ("dzs" "�" :string)
            ("CS" "�" :string)
-           ("DZ" "�" :string)
-           ("Dz" "�" :string)
+           ("Cs" "�" :string)
+           ("cs" "�" :string)
            ("dz" "�" :string)
+           ("Dz" "�" :string)
+           ("DZ" "�" :string)
            ("GY" "�" :string)
-           ("gy" "�" :string)
            ("Gy" "�" :string)
-           ("ly" "�" :string)
+           ("gy" "�" :string)
            ("Ly" "�" :string)
            ("LY" "�" :string)
+           ("ly" "�" :string)
+           ("Ny" "�" :string)
            ("ny" "�" :string)
            ("NY" "�" :string)
-           ("Ny" "�" :string)
-           ("SZ" "�" :string)
            ("sz" "�" :string)
            ("Sz" "�" :string)
+           ("SZ" "�" :string)
+           ("ty" "�" :string)
            ("TY" "�" :string)
            ("Ty" "�" :string)
-           ("ty" "�" :string)
            ("ZS" "�" :string)
-           ("Zs" "�" :string)
            ("zs" "�" :string)
+           ("Zs" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("a" "�" :string)
            ("A" "�" :string)
-           ("�" "�" :string)
+           ("a" "�" :string)
            ("b" "�" :string)
            ("B" "�" :string)
-           ("C" "�" :string)
            ("c" "�" :string)
+           ("C" "�" :string)
            ("D" "�" :string)
            ("d" "�" :string)
-           ("�" "�" :string)
-           ("e" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("E" "�" :string)
-           ("f" "�" :string)
+           ("e" "�" :string)
            ("F" "�" :string)
+           ("f" "�" :string)
            ("G" "�" :string)
            ("g" "�" :string)
-           ("h" "�" :string)
            ("H" "�" :string)
-           ("i" "�" :string)
-           ("I" "�" :string)
+           ("h" "�" :string)
            ("�" "�" :string)
+           ("i" "�" :string)
            ("�" "�" :string)
-           ("j" "�" :string)
+           ("I" "�" :string)
            ("J" "�" :string)
+           ("j" "�" :string)
            ("k" "�" :string)
            ("K" "�" :string)
-           ("L" "�" :string)
            ("l" "�" :string)
+           ("L" "�" :string)
            ("M" "�" :string)
            ("m" "�" :string)
            ("N" "�" :string)
            ("n" "�" :string)
            ("�" "�" :string)
-           ("O" "�" :string)
            ("�" "�" :string)
+           ("O" "�" :string)
            ("o" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("p" "�" :string)
+           ("�" "�" :string)
            ("P" "�" :string)
+           ("p" "�" :string)
            ("Q" "�" :string)
            ("q" "�" :string)
            ("r" "�" :string)
            ("R" "�" :string)
-           ("S" "�" :string)
            ("s" "�" :string)
-           ("t" "�" :string)
+           ("S" "�" :string)
            ("T" "�" :string)
+           ("t" "�" :string)
            ("u" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("U" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("v" "�" :string)
            ("V" "�" :string)
-           ("W" "�" :string)
            ("w" "�" :string)
+           ("W" "�" :string)
            ("x" "�" :string)
            ("X" "�" :string)
            ("y" "�" :string)
@@ -138,104 +138,104 @@
 
 (define-rule-set "hu-resolve-diacritics"
 
-  :rules  (("dzs" "�" :string)
+  :rules  (("DZs" "�" :string)
            ("DZS" "�" :string)
-           ("DZs" "�" :string)
+           ("dzs" "�" :string)
            ("Dzs" "�" :string)
-           ("cs" "�" :string)
-           ("ZS" "�" :string)
-           ("DZ" "�" :string)
-           ("Dz" "�" :string)
-           ("ny" "�" :string)
+           ("dz" "�" :string)
            ("ly" "�" :string)
-           ("SZ" "�" :string)
            ("CS" "�" :string)
+           ("GY" "�" :string)
            ("ty" "�" :string)
-           ("dz" "�" :string)
-           ("Zs" "�" :string)
+           ("TY" "�" :string)
            ("Cs" "�" :string)
-           ("Ny" "�" :string)
+           ("cs" "�" :string)
+           ("Ly" "�" :string)
            ("LY" "�" :string)
+           ("ZS" "�" :string)
+           ("sz" "�" :string)
+           ("Ny" "�" :string)
+           ("Gy" "�" :string)
+           ("gy" "�" :string)
+           ("NY" "�" :string)
            ("Sz" "�" :string)
+           ("SZ" "�" :string)
+           ("DZ" "�" :string)
            ("Ty" "�" :string)
+           ("ny" "�" :string)
            ("zs" "�" :string)
-           ("Ly" "�" :string)
-           ("GY" "�" :string)
-           ("TY" "�" :string)
-           ("NY" "�" :string)
-           ("sz" "�" :string)
-           ("gy" "�" :string)
-           ("Gy" "�" :string)
-           ("a" "�" :string)
-           ("y" "�" :string)
-           ("�" "�" :string)
+           ("Dz" "�" :string)
+           ("Zs" "�" :string)
+           ("H" "�" :string)
+           ("J" "�" :string)
+           ("f" "�" :string)
+           ("p" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("R" "�" :string)
-           ("Q" "�" :string)
-           ("j" "�" :string)
-           ("�" "�" :string)
-           ("m" "�" :string)
            ("M" "�" :string)
-           ("g" "�" :string)
-           ("O" "�" :string)
-           ("p" "�" :string)
-           ("e" "�" :string)
-           ("v" "�" :string)
-           ("Z" "�" :string)
-           ("N" "�" :string)
-           ("h" "�" :string)
-           ("G" "�" :string)
-           ("i" "�" :string)
-           ("W" "�" :string)
-           ("u" "�" :string)
-           ("D" "�" :string)
-           ("r" "�" :string)
-           ("k" "�" :string)
            ("b" "�" :string)
-           ("I" "�" :string)
-           ("z" "�" :string)
+           ("k" "�" :string)
+           ("C" "�" :string)
+           ("L" "�" :string)
+           ("�" "�" :string)
+           ("A" "�" :string)
+           ("Q" "�" :string)
+           ("w" "�" :string)
            ("E" "�" :string)
-           ("n" "�" :string)
+           ("Z" "�" :string)
+           ("c" "�" :string)
+           ("y" "�" :string)
+           ("u" "�" :string)
+           ("P" "�" :string)
+           ("s" "�" :string)
            ("l" "�" :string)
-           ("o" "�" :string)
+           ("i" "�" :string)
+           ("F" "�" :string)
+           ("N" "�" :string)
+           ("B" "�" :string)
+           ("�" "�" :string)
            ("X" "�" :string)
+           ("t" "�" :string)
+           ("e" "�" :string)
+           ("n" "�" :string)
+           ("W" "�" :string)
+           ("U" "�" :string)
+           ("j" "�" :string)
            ("V" "�" :string)
-           ("C" "�" :string)
-           ("P" "�" :string)
-           ("J" "�" :string)
-           ("c" "�" :string)
-           ("B" "�" :string)
-           ("H" "�" :string)
-           ("q" "�" :string)
            ("Y" "�" :string)
-           ("T" "�" :string)
-           ("w" "�" :string)
-           ("L" "�" :string)
-           ("d" "�" :string)
-           ("f" "�" :string)
-           ("A" "�" :string)
-           ("S" "�" :string)
+           ("o" "�" :string)
+           ("q" "�" :string)
+           ("g" "�" :string)
+           ("D" "�" :string)
+           ("�" "�" :string)
            ("K" "�" :string)
-           ("F" "�" :string)
+           ("G" "�" :string)
+           ("r" "�" :string)
+           ("v" "�" :string)
+           ("S" "�" :string)
+           ("d" "�" :string)
+           ("R" "�" :string)
+           ("m" "�" :string)
+           ("z" "�" :string)
+           ("a" "�" :string)
+           ("O" "�" :string)
            ("x" "�" :string)
-           ("t" "�" :string)
-           ("s" "�" :string)
-           ("U" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("I" "�" :string)
+           ("T" "�" :string)
+           ("h" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ))
 
 (define-rule-set "hu-resolve-case"
@@ -245,213 +245,213 @@
            ("Dzs" "8" :string)
            ("dzs" "9" :string)
            ("DZ" "7" :string)
-           ("ZS" "7" :string)
            ("SZ" "7" :string)
-           ("GY" "7" :string)
            ("NY" "7" :string)
-           ("TY" "7" :string)
            ("LY" "7" :string)
+           ("ZS" "7" :string)
+           ("TY" "7" :string)
+           ("GY" "7" :string)
            ("CS" "7" :string)
+           ("Zs" "8" :string)
            ("Dz" "8" :string)
-           ("Ly" "8" :string)
-           ("Gy" "8" :string)
            ("Ty" "8" :string)
            ("Sz" "8" :string)
+           ("Gy" "8" :string)
            ("Ny" "8" :string)
+           ("Ly" "8" :string)
            ("Cs" "8" :string)
-           ("Zs" "8" :string)
-           ("ly" "9" :string)
+           ("zs" "9" :string)
            ("ny" "9" :string)
-           ("cs" "9" :string)
            ("gy" "9" :string)
            ("sz" "9" :string)
+           ("cs" "9" :string)
            ("ty" "9" :string)
            ("dz" "9" :string)
-           ("zs" "9" :string)
-           ("W" "8" :string)
-           ("G" "8" :string)
-           ("N" "8" :string)
-           ("�" "8" :string)
-           ("I" "8" :string)
-           ("D" "8" :string)
-           ("M" "8" :string)
-           ("�" "8" :string)
-           ("R" "8" :string)
-           ("Q" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("Z" "8" :string)
+           ("ly" "9" :string)
            ("O" "8" :string)
-           ("S" "8" :string)
-           ("A" "8" :string)
-           ("L" "8" :string)
+           ("�" "8" :string)
+           ("T" "8" :string)
+           ("I" "8" :string)
            ("�" "8" :string)
-           ("U" "8" :string)
+           ("R" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
-           ("F" "8" :string)
+           ("G" "8" :string)
+           ("D" "8" :string)
            ("K" "8" :string)
-           ("C" "8" :string)
-           ("�" "8" :string)
-           ("X" "8" :string)
+           ("S" "8" :string)
            ("V" "8" :string)
-           ("�" "8" :string)
-           ("E" "8" :string)
-           ("�" "8" :string)
-           ("T" "8" :string)
            ("Y" "8" :string)
-           ("H" "8" :string)
+           ("X" "8" :string)
+           ("W" "8" :string)
+           ("U" "8" :string)
+           ("N" "8" :string)
            ("B" "8" :string)
+           ("�" "8" :string)
+           ("F" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("Z" "8" :string)
            ("P" "8" :string)
+           ("�" "8" :string)
+           ("Q" "8" :string)
+           ("E" "8" :string)
+           ("A" "8" :string)
+           ("C" "8" :string)
+           ("L" "8" :string)
+           ("�" "8" :string)
+           ("M" "8" :string)
+           ("H" "8" :string)
            ("J" "8" :string)
-           ("u" "9" :string)
-           ("i" "9" :string)
+           ("x" "9" :string)
+           ("a" "9" :string)
            ("h" "9" :string)
-           ("b" "9" :string)
-           ("k" "9" :string)
-           ("�" "9" :string)
-           ("r" "9" :string)
-           ("�" "9" :string)
            ("m" "9" :string)
-           ("j" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("a" "9" :string)
-           ("y" "9" :string)
-           ("�" "9" :string)
-           ("v" "9" :string)
            ("�" "9" :string)
-           ("e" "9" :string)
-           ("p" "9" :string)
-           ("g" "9" :string)
-           ("f" "9" :string)
+           ("�" "9" :string)
+           ("z" "9" :string)
            ("�" "9" :string)
            ("d" "9" :string)
-           ("w" "9" :string)
-           ("�" "9" :string)
-           ("s" "9" :string)
-           ("t" "9" :string)
-           ("x" "9" :string)
-           ("�" "9" :string)
+           ("�" "9" :string)
+           ("r" "9" :string)
+           ("v" "9" :string)
            ("o" "9" :string)
+           ("g" "9" :string)
+           ("q" "9" :string)
+           ("j" "9" :string)
+           ("e" "9" :string)
            ("n" "9" :string)
+           ("t" "9" :string)
+           ("�" "9" :string)
            ("l" "9" :string)
-           ("z" "9" :string)
-           ("q" "9" :string)
+           ("s" "9" :string)
+           ("i" "9" :string)
+           ("�" "9" :string)
            ("c" "9" :string)
+           ("u" "9" :string)
+           ("y" "9" :string)
+           ("w" "9" :string)
+           ("�" "9" :string)
+           ("p" "9" :string)
+           ("f" "9" :string)
+           ("�" "9" :string)
+           ("k" "9" :string)
+           ("b" "9" :string)
+           ("�" "9" :string)
            ))
 
 (define-rule-set "hu-ignore-special"
 
   :rules  (("?" "" :string)
-           ("-" "" :string)
+           ("!" "" :string)
            ("'" "" :string)
+           ("-" "" :string)
            ("." "" :string)
-           ("!" "" :string)
            ))
 
 (define-rule-set "hu-resolve-special"
 
-  :rules  (("dzs" "�" :string)
+  :rules  (("DZs" "�" :string)
            ("Dzs" "�" :string)
-           ("DZs" "�" :string)
            ("DZS" "�" :string)
-           ("cs" "�" :string)
-           ("SZ" "�" :string)
-           ("ny" "�" :string)
-           ("ly" "�" :string)
-           ("ZS" "�" :string)
-           ("DZ" "�" :string)
-           ("Dz" "�" :string)
-           ("zs" "�" :string)
-           ("LY" "�" :string)
-           ("Sz" "�" :string)
+           ("dzs" "�" :string)
            ("Ny" "�" :string)
-           ("Ty" "�" :string)
+           ("LY" "�" :string)
+           ("ZS" "�" :string)
+           ("sz" "�" :string)
+           ("Ly" "�" :string)
+           ("Cs" "�" :string)
+           ("cs" "�" :string)
+           ("TY" "�" :string)
+           ("GY" "�" :string)
            ("ty" "�" :string)
+           ("ly" "�" :string)
            ("dz" "�" :string)
            ("CS" "�" :string)
-           ("Cs" "�" :string)
+           ("Dz" "�" :string)
            ("Zs" "�" :string)
-           ("sz" "�" :string)
-           ("gy" "�" :string)
-           ("Gy" "�" :string)
+           ("zs" "�" :string)
+           ("ny" "�" :string)
+           ("Ty" "�" :string)
+           ("SZ" "�" :string)
+           ("DZ" "�" :string)
            ("NY" "�" :string)
-           ("TY" "�" :string)
-           ("GY" "�" :string)
-           ("Ly" "�" :string)
+           ("Sz" "�" :string)
+           ("Gy" "�" :string)
+           ("gy" "�" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("�" "�" :string)
-           ("e" "�" :string)
-           ("Z" "�" :string)
-           ("v" "�" :string)
-           ("O" "�" :string)
-           ("g" "�" :string)
-           ("p" "�" :string)
-           ("j" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("R" "�" :string)
-           ("Q" "�" :string)
-           ("M" "�" :string)
-           ("�" "�" :string)
-           ("m" "�" :string)
+           ("�" "�" :string)
+           ("F" "�" :string)
+           ("�" "�" :string)
+           ("s" "�" :string)
+           ("l" "�" :string)
            ("�" "�" :string)
+           ("i" "�" :string)
+           ("�" "�" :string)
+           ("c" "�" :string)
+           ("Z" "�" :string)
            ("y" "�" :string)
-           ("a" "�" :string)
+           ("u" "�" :string)
+           ("P" "�" :string)
+           ("�" "�" :string)
+           ("A" "�" :string)
+           ("w" "�" :string)
+           ("Q" "�" :string)
+           ("E" "�" :string)
+           ("L" "�" :string)
+           ("C" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("f" "�" :string)
+           ("p" "�" :string)
            ("�" "�" :string)
+           ("M" "�" :string)
            ("k" "�" :string)
-           ("I" "�" :string)
            ("b" "�" :string)
-           ("D" "�" :string)
-           ("�" "�" :string)
-           ("r" "�" :string)
-           ("W" "�" :string)
-           ("i" "�" :string)
-           ("u" "�" :string)
-           ("G" "�" :string)
-           ("N" "�" :string)
-           ("h" "�" :string)
-           ("�" "�" :string)
-           ("q" "�" :string)
-           ("Y" "�" :string)
+           ("�" "�" :string)
            ("H" "�" :string)
-           ("T" "�" :string)
-           ("c" "�" :string)
+           ("�" "�" :string)
            ("J" "�" :string)
-           ("P" "�" :string)
-           ("B" "�" :string)
-           ("o" "�" :string)
-           ("�" "�" :string)
-           ("C" "�" :string)
+           ("a" "�" :string)
            ("�" "�" :string)
-           ("X" "�" :string)
-           ("V" "�" :string)
+           ("O" "�" :string)
+           ("x" "�" :string)
+           ("I" "�" :string)
+           ("T" "�" :string)
+           ("h" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("R" "�" :string)
+           ("m" "�" :string)
            ("�" "�" :string)
-           ("n" "�" :string)
-           ("l" "�" :string)
            ("z" "�" :string)
-           ("E" "�" :string)
-           ("x" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("U" "�" :string)
-           ("s" "�" :string)
-           ("�" "�" :string)
-           ("t" "�" :string)
-           ("F" "�" :string)
-           ("�" "�" :string)
-           ("K" "�" :string)
-           ("�" "�" :string)
-           ("A" "�" :string)
-           ("f" "�" :string)
-           ("S" "�" :string)
-           ("w" "�" :string)
-           ("L" "�" :string)
            ("�" "�" :string)
            ("d" "�" :string)
+           ("D" "�" :string)
+           ("K" "�" :string)
+           ("�" "�" :string)
+           ("G" "�" :string)
+           ("r" "�" :string)
+           ("v" "�" :string)
+           ("S" "�" :string)
+           ("o" "�" :string)
+           ("q" "�" :string)
+           ("g" "�" :string)
+           ("j" "�" :string)
+           ("V" "�" :string)
+           ("Y" "�" :string)
+           ("t" "�" :string)
+           ("X" "�" :string)
+           ("e" "�" :string)
+           ("n" "�" :string)
+           ("W" "�" :string)
+           ("U" "�" :string)
+           ("N" "�" :string)
+           ("B" "�" :string)
+           ("�" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/hungarian/latin2.xdy b/Master/texmf-dist/xindy/modules/lang/hungarian/latin2.xdy
index df58af95263..c89da179d54 100644
--- a/Master/texmf-dist/xindy/modules/lang/hungarian/latin2.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/hungarian/latin2.xdy
@@ -36,104 +36,104 @@
 
 (define-rule-set "hu-alphabetize"
 
-  :rules  (("Dzs" "�" :string)
+  :rules  (("DZs" "�" :string)
            ("DZS" "�" :string)
-           ("DZs" "�" :string)
+           ("Dzs" "�" :string)
            ("dzs" "�" :string)
-           ("CS" "�" :string)
            ("Cs" "�" :string)
            ("cs" "�" :string)
-           ("DZ" "�" :string)
-           ("Dz" "�" :string)
+           ("CS" "�" :string)
            ("dz" "�" :string)
+           ("Dz" "�" :string)
+           ("DZ" "�" :string)
            ("Gy" "�" :string)
-           ("gy" "�" :string)
            ("GY" "�" :string)
+           ("gy" "�" :string)
            ("LY" "�" :string)
-           ("ly" "�" :string)
            ("Ly" "�" :string)
-           ("ny" "�" :string)
-           ("NY" "�" :string)
+           ("ly" "�" :string)
            ("Ny" "�" :string)
-           ("sz" "�" :string)
+           ("NY" "�" :string)
+           ("ny" "�" :string)
            ("Sz" "�" :string)
+           ("sz" "�" :string)
            ("SZ" "�" :string)
+           ("ty" "�" :string)
            ("TY" "�" :string)
            ("Ty" "�" :string)
-           ("ty" "�" :string)
+           ("Zs" "�" :string)
            ("zs" "�" :string)
            ("ZS" "�" :string)
-           ("Zs" "�" :string)
            ("�" "�" :string)
            ("A" "�" :string)
            ("a" "�" :string)
            ("�" "�" :string)
-           ("B" "�" :string)
            ("b" "�" :string)
-           ("c" "�" :string)
+           ("B" "�" :string)
            ("C" "�" :string)
-           ("d" "�" :string)
+           ("c" "�" :string)
            ("D" "�" :string)
-           ("�" "�" :string)
+           ("d" "�" :string)
+           ("E" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("e" "�" :string)
-           ("E" "�" :string)
-           ("f" "�" :string)
            ("F" "�" :string)
+           ("f" "�" :string)
            ("G" "�" :string)
            ("g" "�" :string)
            ("H" "�" :string)
            ("h" "�" :string)
+           ("I" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("i" "�" :string)
-           ("I" "�" :string)
            ("J" "�" :string)
            ("j" "�" :string)
            ("K" "�" :string)
            ("k" "�" :string)
-           ("l" "�" :string)
            ("L" "�" :string)
+           ("l" "�" :string)
            ("M" "�" :string)
            ("m" "�" :string)
-           ("N" "�" :string)
            ("n" "�" :string)
-           ("�" "�" :string)
-           ("o" "�" :string)
+           ("N" "�" :string)
            ("�" "�" :string)
            ("O" "�" :string)
+           ("o" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("P" "�" :string)
            ("p" "�" :string)
+           ("P" "�" :string)
            ("q" "�" :string)
            ("Q" "�" :string)
            ("R" "�" :string)
            ("r" "�" :string)
            ("S" "�" :string)
            ("s" "�" :string)
-           ("t" "�" :string)
            ("T" "�" :string)
-           ("U" "�" :string)
-           ("u" "�" :string)
+           ("t" "�" :string)
            ("�" "�" :string)
+           ("u" "�" :string)
+           ("U" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("v" "�" :string)
            ("V" "�" :string)
            ("w" "�" :string)
            ("W" "�" :string)
-           ("x" "�" :string)
            ("X" "�" :string)
-           ("Y" "�" :string)
+           ("x" "�" :string)
            ("y" "�" :string)
-           ("Z" "�" :string)
+           ("Y" "�" :string)
            ("z" "�" :string)
+           ("Z" "�" :string)
            ))
 
 (define-rule-set "hu-resolve-diacritics"
@@ -142,100 +142,100 @@
            ("DZs" "�" :string)
            ("DZS" "�" :string)
            ("Dzs" "�" :string)
-           ("ty" "�" :string)
-           ("Zs" "�" :string)
-           ("SZ" "�" :string)
-           ("dz" "�" :string)
-           ("Cs" "�" :string)
-           ("GY" "�" :string)
            ("cs" "�" :string)
+           ("zs" "�" :string)
            ("Ly" "�" :string)
-           ("Dz" "�" :string)
+           ("CS" "�" :string)
+           ("ny" "�" :string)
+           ("Gy" "�" :string)
+           ("sz" "�" :string)
+           ("GY" "�" :string)
+           ("ZS" "�" :string)
+           ("ty" "�" :string)
+           ("ly" "�" :string)
+           ("SZ" "�" :string)
+           ("TY" "�" :string)
+           ("gy" "�" :string)
            ("DZ" "�" :string)
            ("Ty" "�" :string)
-           ("ly" "�" :string)
+           ("dz" "�" :string)
            ("LY" "�" :string)
-           ("Sz" "�" :string)
+           ("Zs" "�" :string)
+           ("Dz" "�" :string)
            ("Ny" "�" :string)
+           ("Cs" "�" :string)
+           ("Sz" "�" :string)
            ("NY" "�" :string)
-           ("gy" "�" :string)
-           ("TY" "�" :string)
-           ("Gy" "�" :string)
-           ("CS" "�" :string)
-           ("ZS" "�" :string)
-           ("sz" "�" :string)
-           ("zs" "�" :string)
-           ("ny" "�" :string)
+           ("w" "�" :string)
+           ("C" "�" :string)
+           ("l" "�" :string)
+           ("e" "�" :string)
            ("�" "�" :string)
-           ("s" "�" :string)
-           ("T" "�" :string)
-           ("O" "�" :string)
-           ("t" "�" :string)
-           ("E" "�" :string)
-           ("X" "�" :string)
+           ("J" "�" :string)
+           ("u" "�" :string)
+           ("G" "�" :string)
+           ("W" "�" :string)
            ("F" "�" :string)
-           ("I" "�" :string)
+           ("o" "�" :string)
+           ("�" "�" :string)
+           ("c" "�" :string)
+           ("U" "�" :string)
            ("j" "�" :string)
-           ("i" "�" :string)
            ("Z" "�" :string)
-           ("z" "�" :string)
-           ("a" "�" :string)
+           ("K" "�" :string)
+           ("t" "�" :string)
            ("m" "�" :string)
+           ("v" "�" :string)
+           ("f" "�" :string)
+           ("g" "�" :string)
            ("k" "�" :string)
-           ("�" "�" :string)
-           ("W" "�" :string)
+           ("Y" "�" :string)
+           ("N" "�" :string)
            ("V" "�" :string)
-           ("S" "�" :string)
-           ("g" "�" :string)
-           ("M" "�" :string)
-           ("�" "�" :string)
-           ("Q" "�" :string)
-           ("v" "�" :string)
+           ("x" "�" :string)
+           ("d" "�" :string)
            ("b" "�" :string)
-           ("u" "�" :string)
-           ("r" "�" :string)
-           ("w" "�" :string)
-           ("e" "�" :string)
-           ("A" "�" :string)
-           ("o" "�" :string)
+           ("D" "�" :string)
+           ("I" "�" :string)
+           ("H" "�" :string)
+           ("S" "�" :string)
            ("n" "�" :string)
-           ("K" "�" :string)
+           ("�" "�" :string)
            ("y" "�" :string)
-           ("G" "�" :string)
-           ("h" "�" :string)
+           ("p" "�" :string)
+           ("T" "�" :string)
            ("q" "�" :string)
-           ("f" "�" :string)
-           ("D" "�" :string)
-           ("C" "�" :string)
-           ("c" "�" :string)
-           ("�" "�" :string)
+           ("X" "�" :string)
+           ("A" "�" :string)
+           ("i" "�" :string)
+           ("E" "�" :string)
+           ("B" "�" :string)
+           ("R" "�" :string)
+           ("Q" "�" :string)
+           ("M" "�" :string)
            ("L" "�" :string)
-           ("Y" "�" :string)
-           ("U" "�" :string)
-           ("d" "�" :string)
-           ("J" "�" :string)
-           ("H" "�" :string)
+           ("a" "�" :string)
+           ("s" "�" :string)
            ("P" "�" :string)
-           ("N" "�" :string)
-           ("R" "�" :string)
-           ("x" "�" :string)
-           ("l" "�" :string)
-           ("p" "�" :string)
-           ("B" "�" :string)
+           ("z" "�" :string)
+           ("r" "�" :string)
+           ("h" "�" :string)
+           ("�" "�" :string)
+           ("O" "�" :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 "hu-resolve-case"
@@ -244,214 +244,214 @@
            ("DZs" "7" :string)
            ("Dzs" "8" :string)
            ("dzs" "9" :string)
-           ("TY" "7" :string)
-           ("NY" "7" :string)
            ("LY" "7" :string)
-           ("ZS" "7" :string)
+           ("NY" "7" :string)
            ("CS" "7" :string)
+           ("TY" "7" :string)
            ("DZ" "7" :string)
-           ("SZ" "7" :string)
            ("GY" "7" :string)
+           ("ZS" "7" :string)
+           ("SZ" "7" :string)
+           ("Dz" "8" :string)
            ("Ny" "8" :string)
+           ("Zs" "8" :string)
            ("Sz" "8" :string)
+           ("Cs" "8" :string)
+           ("Ly" "8" :string)
            ("Gy" "8" :string)
            ("Ty" "8" :string)
-           ("Dz" "8" :string)
-           ("Ly" "8" :string)
-           ("Zs" "8" :string)
-           ("Cs" "8" :string)
-           ("zs" "9" :string)
+           ("dz" "9" :string)
            ("sz" "9" :string)
+           ("cs" "9" :string)
+           ("zs" "9" :string)
            ("ny" "9" :string)
            ("gy" "9" :string)
            ("ly" "9" :string)
            ("ty" "9" :string)
-           ("cs" "9" :string)
-           ("dz" "9" :string)
-           ("Y" "8" :string)
-           ("U" "8" :string)
-           ("L" "8" :string)
-           ("C" "8" :string)
+           ("�" "8" :string)
+           ("T" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
+           ("X" "8" :string)
+           ("A" "8" :string)
+           ("I" "8" :string)
            ("D" "8" :string)
-           ("G" "8" :string)
-           ("B" "8" :string)
-           ("R" "8" :string)
-           ("P" "8" :string)
-           ("N" "8" :string)
            ("H" "8" :string)
-           ("�" "8" :string)
-           ("J" "8" :string)
-           ("�" "8" :string)
            ("�" "8" :string)
-           ("M" "8" :string)
-           ("K" "8" :string)
-           ("�" "8" :string)
-           ("A" "8" :string)
-           ("Q" "8" :string)
-           ("Z" "8" :string)
            ("S" "8" :string)
            ("�" "8" :string)
-           ("V" "8" :string)
-           ("W" "8" :string)
-           ("�" "8" :string)
-           ("T" "8" :string)
-           ("F" "8" :string)
-           ("I" "8" :string)
-           ("X" "8" :string)
+           ("P" "8" :string)
+           ("�" "8" :string)
+           ("O" "8" :string)
            ("E" "8" :string)
+           ("R" "8" :string)
+           ("B" "8" :string)
+           ("�" "8" :string)
+           ("M" "8" :string)
+           ("Q" "8" :string)
+           ("L" "8" :string)
+           ("F" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
-           ("O" "8" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("c" "9" :string)
-           ("h" "9" :string)
+           ("C" "8" :string)
+           ("G" "8" :string)
+           ("J" "8" :string)
+           ("W" "8" :string)
+           ("N" "8" :string)
+           ("Y" "8" :string)
+           ("V" "8" :string)
+           ("U" "8" :string)
+           ("�" "8" :string)
+           ("Z" "8" :string)
+           ("K" "8" :string)
            ("q" "9" :string)
-           ("f" "9" :string)
-           ("p" "9" :string)
-           ("l" "9" :string)
-           ("x" "9" :string)
+           ("i" "9" :string)
+           ("�" "9" :string)
+           ("b" "9" :string)
            ("�" "9" :string)
-           ("d" "9" :string)
-           ("�" "9" :string)
-           ("g" "9" :string)
+           ("p" "9" :string)
            ("y" "9" :string)
-           ("o" "9" :string)
            ("n" "9" :string)
-           ("e" "9" :string)
-           ("�" "9" :string)
-           ("u" "9" :string)
            ("r" "9" :string)
-           ("w" "9" :string)
-           ("b" "9" :string)
-           ("v" "9" :string)
+           ("s" "9" :string)
+           ("�" "9" :string)
            ("a" "9" :string)
            ("z" "9" :string)
-           ("i" "9" :string)
-           ("�" "9" :string)
+           ("h" "9" :string)
+           ("o" "9" :string)
            ("�" "9" :string)
-           ("m" "9" :string)
-           ("k" "9" :string)
+           ("w" "9" :string)
            ("�" "9" :string)
-           ("s" "9" :string)
+           ("u" "9" :string)
+           ("l" "9" :string)
            ("�" "9" :string)
-           ("j" "9" :string)
+           ("e" "9" :string)
            ("t" "9" :string)
+           ("v" "9" :string)
+           ("f" "9" :string)
+           ("m" "9" :string)
+           ("k" "9" :string)
+           ("g" "9" :string)
+           ("d" "9" :string)
+           ("x" "9" :string)
+           ("c" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("j" "9" :string)
+           ("�" "9" :string)
            ))
 
 (define-rule-set "hu-ignore-special"
 
-  :rules  (("'" "" :string)
-           ("?" "" :string)
-           ("-" "" :string)
+  :rules  (("?" "" :string)
            ("!" "" :string)
+           ("'" "" :string)
+           ("-" "" :string)
            ("." "" :string)
            ))
 
 (define-rule-set "hu-resolve-special"
 
-  :rules  (("Dzs" "�" :string)
+  :rules  (("dzs" "�" :string)
+           ("Dzs" "�" :string)
            ("DZS" "�" :string)
            ("DZs" "�" :string)
-           ("dzs" "�" :string)
-           ("zs" "�" :string)
-           ("sz" "�" :string)
-           ("ny" "�" :string)
            ("TY" "�" :string)
-           ("NY" "�" :string)
-           ("Ny" "�" :string)
-           ("gy" "�" :string)
-           ("Sz" "�" :string)
-           ("LY" "�" :string)
-           ("ZS" "�" :string)
-           ("Gy" "�" :string)
-           ("CS" "�" :string)
            ("DZ" "�" :string)
+           ("gy" "�" :string)
            ("Ty" "�" :string)
-           ("Ly" "�" :string)
-           ("Dz" "�" :string)
+           ("GY" "�" :string)
+           ("ZS" "�" :string)
+           ("ty" "�" :string)
            ("ly" "�" :string)
            ("SZ" "�" :string)
-           ("Zs" "�" :string)
-           ("ty" "�" :string)
+           ("sz" "�" :string)
            ("cs" "�" :string)
-           ("GY" "�" :string)
+           ("zs" "�" :string)
+           ("Ly" "�" :string)
+           ("CS" "�" :string)
+           ("Gy" "�" :string)
+           ("ny" "�" :string)
+           ("NY" "�" :string)
+           ("Sz" "�" :string)
            ("Cs" "�" :string)
+           ("Dz" "�" :string)
+           ("Ny" "�" :string)
            ("dz" "�" :string)
+           ("LY" "�" :string)
+           ("Zs" "�" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("�" "�" :string)
-           ("Y" "�" :string)
-           ("U" "�" :string)
-           ("�" "�" :string)
-           ("L" "�" :string)
-           ("D" "�" :string)
-           ("c" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("C" "�" :string)
-           ("G" "�" :string)
+           ("t" "�" :string)
+           ("v" "�" :string)
            ("f" "�" :string)
-           ("h" "�" :string)
-           ("q" "�" :string)
-           ("l" "�" :string)
-           ("p" "�" :string)
-           ("B" "�" :string)
-           ("x" "�" :string)
+           ("m" "�" :string)
+           ("k" "�" :string)
+           ("g" "�" :string)
            ("N" "�" :string)
-           ("�" "�" :string)
-           ("P" "�" :string)
-           ("R" "�" :string)
-           ("�" "�" :string)
+           ("Y" "�" :string)
            ("d" "�" :string)
-           ("J" "�" :string)
-           ("H" "�" :string)
-           ("�" "�" :string)
-           ("M" "�" :string)
-           ("g" "�" :string)
-           ("�" "�" :string)
+           ("V" "�" :string)
+           ("x" "�" :string)
+           ("c" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("y" "�" :string)
-           ("�" "�" :string)
+           ("U" "�" :string)
+           ("�" "�" :string)
+           ("j" "�" :string)
+           ("Z" "�" :string)
+           ("�" "�" :string)
            ("K" "�" :string)
-           ("A" "�" :string)
-           ("e" "�" :string)
-           ("n" "�" :string)
            ("o" "�" :string)
+           ("F" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("w" "�" :string)
+           ("�" "�" :string)
+           ("C" "�" :string)
            ("u" "�" :string)
+           ("J" "�" :string)
+           ("G" "�" :string)
+           ("W" "�" :string)
+           ("l" "�" :string)
+           ("�" "�" :string)
+           ("e" "�" :string)
            ("r" "�" :string)
+           ("s" "�" :string)
+           ("P" "�" :string)
+           ("a" "�" :string)
            ("�" "�" :string)
-           ("v" "�" :string)
-           ("Q" "�" :string)
-           ("b" "�" :string)
            ("z" "�" :string)
-           ("a" "�" :string)
-           ("Z" "�" :string)
+           ("h" "�" :string)
+           ("�" "�" :string)
+           ("O" "�" :string)
+           ("E" "�" :string)
+           ("R" "�" :string)
+           ("B" "�" :string)
+           ("�" "�" :string)
+           ("M" "�" :string)
+           ("Q" "�" :string)
+           ("L" "�" :string)
+           ("�" "�" :string)
+           ("T" "�" :string)
+           ("�" "�" :string)
+           ("q" "�" :string)
+           ("X" "�" :string)
            ("i" "�" :string)
-           ("V" "�" :string)
+           ("A" "�" :string)
+           ("b" "�" :string)
+           ("�" "�" :string)
+           ("D" "�" :string)
+           ("�" "�" :string)
+           ("I" "�" :string)
+           ("H" "�" :string)
+           ("�" "�" :string)
+           ("y" "�" :string)
+           ("p" "�" :string)
            ("S" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("W" "�" :string)
-           ("�" "�" :string)
-           ("k" "�" :string)
-           ("m" "�" :string)
-           ("T" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("s" "�" :string)
-           ("�" "�" :string)
-           ("I" "�" :string)
-           ("F" "�" :string)
-           ("j" "�" :string)
-           ("E" "�" :string)
-           ("X" "�" :string)
-           ("O" "�" :string)
-           ("t" "�" :string)
-           ("�" "�" :string)
+           ("n" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/hungarian/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/hungarian/utf8.xdy
index 766b5aab619..f14024a9852 100644
--- a/Master/texmf-dist/xindy/modules/lang/hungarian/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/hungarian/utf8.xdy
@@ -36,68 +36,68 @@
 
 (define-rule-set "hu-alphabetize"
 
-  :rules  (("dzs" "�" :string)
-           ("DZs" "�" :string)
-           ("Dzs" "�" :string)
+  :rules  (("Dzs" "�" :string)
            ("DZS" "�" :string)
+           ("dzs" "�" :string)
+           ("DZs" "�" :string)
            ("À" "�" :string)
-           ("à" "�" :string)
            ("Á" "�" :string)
            ("á" "�" :string)
-           ("Cs" "�" :string)
-           ("CS" "�" :string)
+           ("à" "�" :string)
            ("cs" "�" :string)
+           ("CS" "�" :string)
+           ("Cs" "�" :string)
+           ("dz" "�" :string)
            ("DZ" "�" :string)
            ("Dz" "�" :string)
-           ("dz" "�" :string)
-           ("é" "�" :string)
            ("É" "�" :string)
-           ("Gy" "�" :string)
+           ("é" "�" :string)
            ("GY" "�" :string)
+           ("Gy" "�" :string)
            ("gy" "�" :string)
-           ("Í" "�" :string)
            ("í" "�" :string)
+           ("Í" "�" :string)
            ("Ly" "�" :string)
-           ("ly" "�" :string)
            ("LY" "�" :string)
-           ("Ny" "�" :string)
-           ("NY" "�" :string)
+           ("ly" "�" :string)
            ("ny" "�" :string)
+           ("NY" "�" :string)
+           ("Ny" "�" :string)
            ("ó" "�" :string)
            ("Ó" "�" :string)
-           ("Ö" "�" :string)
            ("Ő" "�" :string)
-           ("ö" "�" :string)
            ("ő" "�" :string)
+           ("Ö" "�" :string)
+           ("ö" "�" :string)
            ("SZ" "�" :string)
-           ("sz" "�" :string)
            ("Sz" "�" :string)
-           ("Ty" "�" :string)
+           ("sz" "�" :string)
            ("ty" "�" :string)
            ("TY" "�" :string)
+           ("Ty" "�" :string)
            ("Ú" "�" :string)
            ("ú" "�" :string)
-           ("ű" "�" :string)
-           ("Ü" "�" :string)
            ("ü" "�" :string)
+           ("Ü" "�" :string)
+           ("ű" "�" :string)
            ("Ű" "�" :string)
            ("ZS" "�" :string)
-           ("zs" "�" :string)
            ("Zs" "�" :string)
+           ("zs" "�" :string)
            ("a" "�" :string)
            ("A" "�" :string)
            ("B" "�" :string)
            ("b" "�" :string)
-           ("c" "�" :string)
            ("C" "�" :string)
+           ("c" "�" :string)
            ("d" "�" :string)
            ("D" "�" :string)
-           ("e" "�" :string)
            ("E" "�" :string)
-           ("f" "�" :string)
+           ("e" "�" :string)
            ("F" "�" :string)
-           ("g" "�" :string)
+           ("f" "�" :string)
            ("G" "�" :string)
+           ("g" "�" :string)
            ("h" "�" :string)
            ("H" "�" :string)
            ("I" "�" :string)
@@ -106,140 +106,140 @@
            ("J" "�" :string)
            ("k" "�" :string)
            ("K" "�" :string)
-           ("L" "�" :string)
            ("l" "�" :string)
-           ("m" "�" :string)
+           ("L" "�" :string)
            ("M" "�" :string)
+           ("m" "�" :string)
            ("n" "�" :string)
            ("N" "�" :string)
-           ("O" "�" :string)
            ("o" "�" :string)
+           ("O" "�" :string)
            ("p" "�" :string)
            ("P" "�" :string)
            ("Q" "�" :string)
            ("q" "�" :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)
-           ("w" "�" :string)
+           ("v" "�" :string)
            ("W" "�" :string)
-           ("x" "�" :string)
+           ("w" "�" :string)
            ("X" "�" :string)
-           ("Y" "�" :string)
+           ("x" "�" :string)
            ("y" "�" :string)
+           ("Y" "�" :string)
            ("Z" "�" :string)
            ("z" "�" :string)
            ))
 
 (define-rule-set "hu-resolve-diacritics"
 
-  :rules  (("DZS" "�" :string)
-           ("Dzs" "�" :string)
-           ("DZs" "�" :string)
+  :rules  (("DZs" "�" :string)
            ("dzs" "�" :string)
-           ("DZ" "�" :string)
-           ("zs" "�" :string)
-           ("Ly" "�" :string)
-           ("Ty" "�" :string)
-           ("ZS" "�" :string)
+           ("Dzs" "�" :string)
+           ("DZS" "�" :string)
            ("Cs" "�" :string)
            ("Ö" "�" :string)
-           ("GY" "�" :string)
-           ("CS" "�" :string)
-           ("Ü" "�" :string)
-           ("Gy" "�" :string)
-           ("LY" "�" :string)
-           ("ty" "�" :string)
            ("sz" "�" :string)
-           ("ny" "�" :string)
            ("Dz" "�" :string)
+           ("ö" "�" :string)
+           ("ZS" "�" :string)
            ("NY" "�" :string)
+           ("Zs" "�" :string)
+           ("zs" "�" :string)
+           ("Ny" "�" :string)
            ("ly" "�" :string)
+           ("TY" "�" :string)
+           ("Ty" "�" :string)
            ("SZ" "�" :string)
-           ("ö" "�" :string)
-           ("Ny" "�" :string)
-           ("Sz" "�" :string)
            ("dz" "�" :string)
-           ("TY" "�" :string)
+           ("CS" "�" :string)
            ("gy" "�" :string)
-           ("cs" "�" :string)
-           ("Zs" "�" :string)
+           ("ty" "�" :string)
+           ("DZ" "�" :string)
+           ("Sz" "�" :string)
            ("ü" "�" :string)
-           ("Ő" "�" :string)
+           ("Ü" "�" :string)
+           ("GY" "�" :string)
+           ("Ly" "�" :string)
+           ("Gy" "�" :string)
+           ("LY" "�" :string)
+           ("ny" "�" :string)
+           ("cs" "�" :string)
            ("ó" "�" :string)
-           ("É" "�" :string)
-           ("ű" "�" :string)
-           ("í" "�" :string)
-           ("é" "�" :string)
-           ("ú" "�" :string)
-           ("Ú" "�" :string)
-           ("Í" "�" :string)
-           ("ő" "�" :string)
            ("Ó" "�" :string)
            ("Ű" "�" :string)
            ("á" "�" :string)
+           ("Í" "�" :string)
+           ("ű" "�" :string)
+           ("é" "�" :string)
+           ("Ő" "�" :string)
            ("Á" "�" :string)
-           ("À" "�" :string)
+           ("ő" "�" :string)
+           ("í" "�" :string)
+           ("É" "�" :string)
+           ("Ú" "�" :string)
+           ("ú" "�" :string)
            ("à" "�" :string)
-           ("v" "�" :string)
-           ("Y" "�" :string)
-           ("p" "�" :string)
+           ("À" "�" :string)
+           ("l" "�" :string)
+           ("T" "�" :string)
+           ("L" "�" :string)
+           ("A" "�" :string)
+           ("i" "�" :string)
+           ("H" "�" :string)
+           ("g" "�" :string)
+           ("N" "�" :string)
            ("c" "�" :string)
-           ("a" "�" :string)
-           ("j" "�" :string)
-           ("u" "�" :string)
-           ("e" "�" :string)
-           ("R" "�" :string)
-           ("Q" "�" :string)
-           ("d" "�" :string)
-           ("S" "�" :string)
-           ("B" "�" :string)
-           ("I" "�" :string)
            ("f" "�" :string)
-           ("w" "�" :string)
-           ("s" "�" :string)
-           ("O" "�" :string)
-           ("Z" "�" :string)
-           ("M" "�" :string)
-           ("h" "�" :string)
-           ("t" "�" :string)
-           ("b" "�" :string)
+           ("v" "�" :string)
            ("m" "�" :string)
-           ("k" "�" :string)
-           ("L" "�" :string)
+           ("D" "�" :string)
            ("V" "�" :string)
-           ("n" "�" :string)
-           ("J" "�" :string)
-           ("K" "�" :string)
-           ("F" "�" :string)
+           ("S" "�" :string)
+           ("z" "�" :string)
+           ("I" "�" :string)
+           ("a" "�" :string)
            ("r" "�" :string)
-           ("U" "�" :string)
-           ("D" "�" :string)
-           ("G" "�" :string)
-           ("P" "�" :string)
-           ("W" "�" :string)
+           ("e" "�" :string)
            ("o" "�" :string)
-           ("E" "�" :string)
+           ("G" "�" :string)
+           ("O" "�" :string)
            ("x" "�" :string)
-           ("g" "�" :string)
-           ("H" "�" :string)
-           ("A" "�" :string)
-           ("N" "�" :string)
+           ("u" "�" :string)
+           ("w" "�" :string)
            ("C" "�" :string)
+           ("b" "�" :string)
+           ("F" "�" :string)
+           ("E" "�" :string)
            ("q" "�" :string)
-           ("i" "�" :string)
-           ("l" "�" :string)
+           ("j" "�" :string)
+           ("d" "�" :string)
+           ("n" "�" :string)
+           ("J" "�" :string)
+           ("P" "�" :string)
+           ("s" "�" :string)
            ("y" "�" :string)
-           ("z" "�" :string)
+           ("k" "�" :string)
+           ("p" "�" :string)
+           ("h" "�" :string)
            ("X" "�" :string)
-           ("T" "�" :string)
+           ("R" "�" :string)
+           ("K" "�" :string)
+           ("t" "�" :string)
+           ("U" "�" :string)
+           ("Z" "�" :string)
+           ("B" "�" :string)
+           ("W" "�" :string)
+           ("Y" "�" :string)
+           ("Q" "�" :string)
+           ("M" "�" :string)
            ))
 
 (define-rule-set "hu-resolve-case"
@@ -248,218 +248,218 @@
            ("DZs" "7" :string)
            ("Dzs" "8" :string)
            ("dzs" "9" :string)
-           ("SZ" "7" :string)
-           ("LY" "7" :string)
+           ("TY" "7" :string)
            ("NY" "7" :string)
-           ("GY" "7" :string)
-           ("CS" "7" :string)
            ("ZS" "7" :string)
+           ("LY" "7" :string)
+           ("GY" "7" :string)
            ("DZ" "7" :string)
-           ("TY" "7" :string)
+           ("CS" "7" :string)
+           ("SZ" "7" :string)
+           ("Ty" "8" :string)
            ("Ny" "8" :string)
+           ("Zs" "8" :string)
            ("Í" "8" :string)
-           ("Ú" "8" :string)
+           ("Ű" "8" :string)
            ("Dz" "8" :string)
-           ("É" "8" :string)
-           ("Ü" "8" :string)
-           ("Gy" "8" :string)
            ("Ö" "8" :string)
-           ("À" "8" :string)
+           ("Ó" "8" :string)
            ("Cs" "8" :string)
+           ("Gy" "8" :string)
+           ("Ú" "8" :string)
            ("Ly" "8" :string)
-           ("Ty" "8" :string)
-           ("Ő" "8" :string)
-           ("Zs" "8" :string)
-           ("Á" "8" :string)
-           ("Ű" "8" :string)
-           ("Ó" "8" :string)
+           ("É" "8" :string)
+           ("Ü" "8" :string)
            ("Sz" "8" :string)
-           ("ö" "9" :string)
+           ("Á" "8" :string)
+           ("Ő" "8" :string)
+           ("À" "8" :string)
            ("ly" "9" :string)
-           ("ú" "9" :string)
            ("é" "9" :string)
-           ("í" "9" :string)
-           ("ty" "9" :string)
-           ("ny" "9" :string)
-           ("sz" "9" :string)
            ("ű" "9" :string)
-           ("ó" "9" :string)
            ("zs" "9" :string)
-           ("ü" "9" :string)
-           ("cs" "9" :string)
            ("á" "9" :string)
+           ("ö" "9" :string)
+           ("sz" "9" :string)
+           ("à" "9" :string)
+           ("ó" "9" :string)
+           ("cs" "9" :string)
+           ("ú" "9" :string)
+           ("ny" "9" :string)
+           ("ü" "9" :string)
+           ("í" "9" :string)
+           ("ő" "9" :string)
+           ("ty" "9" :string)
            ("gy" "9" :string)
            ("dz" "9" :string)
-           ("ő" "9" :string)
-           ("à" "9" :string)
+           ("O" "8" :string)
+           ("G" "8" :string)
+           ("I" "8" :string)
            ("V" "8" :string)
+           ("S" "8" :string)
+           ("D" "8" :string)
+           ("N" "8" :string)
+           ("H" "8" :string)
+           ("A" "8" :string)
            ("L" "8" :string)
-           ("J" "8" :string)
-           ("Z" "8" :string)
+           ("T" "8" :string)
            ("M" "8" :string)
-           ("O" "8" :string)
-           ("B" "8" :string)
-           ("I" "8" :string)
            ("Q" "8" :string)
-           ("R" "8" :string)
-           ("S" "8" :string)
            ("Y" "8" :string)
-           ("T" "8" :string)
-           ("X" "8" :string)
-           ("C" "8" :string)
-           ("A" "8" :string)
-           ("H" "8" :string)
-           ("N" "8" :string)
            ("W" "8" :string)
-           ("E" "8" :string)
-           ("D" "8" :string)
-           ("G" "8" :string)
+           ("Z" "8" :string)
+           ("B" "8" :string)
            ("U" "8" :string)
-           ("P" "8" :string)
            ("K" "8" :string)
+           ("R" "8" :string)
+           ("X" "8" :string)
+           ("P" "8" :string)
+           ("J" "8" :string)
            ("F" "8" :string)
-           ("m" "9" :string)
-           ("k" "9" :string)
-           ("n" "9" :string)
-           ("h" "9" :string)
-           ("t" "9" :string)
-           ("b" "9" :string)
-           ("w" "9" :string)
-           ("f" "9" :string)
-           ("s" "9" :string)
-           ("u" "9" :string)
+           ("E" "8" :string)
+           ("C" "8" :string)
+           ("o" "9" :string)
            ("e" "9" :string)
-           ("d" "9" :string)
+           ("r" "9" :string)
            ("a" "9" :string)
+           ("z" "9" :string)
+           ("m" "9" :string)
+           ("v" "9" :string)
+           ("f" "9" :string)
            ("c" "9" :string)
+           ("i" "9" :string)
+           ("g" "9" :string)
+           ("l" "9" :string)
+           ("t" "9" :string)
+           ("h" "9" :string)
            ("p" "9" :string)
-           ("j" "9" :string)
-           ("v" "9" :string)
            ("y" "9" :string)
-           ("z" "9" :string)
-           ("i" "9" :string)
+           ("k" "9" :string)
+           ("s" "9" :string)
+           ("n" "9" :string)
+           ("d" "9" :string)
+           ("j" "9" :string)
            ("q" "9" :string)
-           ("l" "9" :string)
-           ("g" "9" :string)
+           ("b" "9" :string)
+           ("w" "9" :string)
+           ("u" "9" :string)
            ("x" "9" :string)
-           ("o" "9" :string)
-           ("r" "9" :string)
            ))
 
 (define-rule-set "hu-ignore-special"
 
-  :rules  (("?" "" :string)
-           ("-" "" :string)
+  :rules  (("'" "" :string)
            ("." "" :string)
            ("!" "" :string)
-           ("'" "" :string)
+           ("?" "" :string)
+           ("-" "" :string)
            ))
 
 (define-rule-set "hu-resolve-special"
 
   :rules  (("DZS" "�" :string)
            ("Dzs" "�" :string)
-           ("DZs" "�" :string)
            ("dzs" "�" :string)
-           ("ő" "�" :string)
-           ("à" "�" :string)
-           ("Ó" "�" :string)
-           ("Sz" "�" :string)
-           ("dz" "�" :string)
-           ("TY" "�" :string)
-           ("Ű" "�" :string)
-           ("gy" "�" :string)
-           ("á" "�" :string)
+           ("DZs" "�" :string)
            ("cs" "�" :string)
-           ("Zs" "�" :string)
+           ("ú" "�" :string)
+           ("LY" "�" :string)
+           ("ny" "�" :string)
+           ("É" "�" :string)
+           ("GY" "�" :string)
+           ("Gy" "�" :string)
+           ("Ú" "�" :string)
+           ("Ly" "�" :string)
            ("ü" "�" :string)
-           ("Á" "�" :string)
-           ("Ő" "�" :string)
-           ("ó" "�" :string)
+           ("í" "�" :string)
+           ("Ü" "�" :string)
+           ("Sz" "�" :string)
+           ("ő" "�" :string)
+           ("ty" "�" :string)
            ("DZ" "�" :string)
-           ("zs" "�" :string)
-           ("Ly" "�" :string)
-           ("Ty" "�" :string)
+           ("SZ" "�" :string)
+           ("Ő" "�" :string)
            ("À" "�" :string)
-           ("ZS" "�" :string)
-           ("Cs" "�" :string)
-           ("Ö" "�" :string)
-           ("GY" "�" :string)
-           ("É" "�" :string)
+           ("gy" "�" :string)
+           ("dz" "�" :string)
            ("CS" "�" :string)
-           ("Ü" "�" :string)
+           ("Á" "�" :string)
+           ("Ty" "�" :string)
            ("ű" "�" :string)
-           ("Gy" "�" :string)
-           ("í" "�" :string)
+           ("ly" "�" :string)
+           ("TY" "�" :string)
            ("é" "�" :string)
-           ("LY" "�" :string)
-           ("ty" "�" :string)
-           ("sz" "�" :string)
-           ("ny" "�" :string)
-           ("Dz" "�" :string)
            ("NY" "�" :string)
-           ("ú" "�" :string)
-           ("ly" "�" :string)
-           ("SZ" "�" :string)
-           ("Ú" "�" :string)
-           ("ö" "�" :string)
-           ("Ny" "�" :string)
+           ("ZS" "�" :string)
            ("Í" "�" :string)
+           ("Ny" "�" :string)
+           ("zs" "�" :string)
+           ("Zs" "�" :string)
+           ("á" "�" :string)
+           ("ö" "�" :string)
+           ("Ű" "�" :string)
+           ("sz" "�" :string)
+           ("Ö" "�" :string)
+           ("Dz" "�" :string)
+           ("Cs" "�" :string)
+           ("Ó" "�" :string)
+           ("ó" "�" :string)
+           ("à" "�" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("K" "�" :string)
-           ("F" "�" :string)
-           ("r" "�" :string)
+           ("M" "�" :string)
+           ("Q" "�" :string)
+           ("B" "�" :string)
+           ("Z" "�" :string)
            ("U" "�" :string)
-           ("G" "�" :string)
-           ("D" "�" :string)
-           ("P" "�" :string)
            ("W" "�" :string)
-           ("o" "�" :string)
-           ("E" "�" :string)
-           ("x" "�" :string)
-           ("g" "�" :string)
-           ("A" "�" :string)
-           ("H" "�" :string)
-           ("N" "�" :string)
-           ("C" "�" :string)
-           ("q" "�" :string)
-           ("l" "�" :string)
-           ("i" "�" :string)
-           ("y" "�" :string)
-           ("z" "�" :string)
-           ("X" "�" :string)
-           ("T" "�" :string)
-           ("v" "�" :string)
            ("Y" "�" :string)
-           ("c" "�" :string)
+           ("X" "�" :string)
+           ("h" "�" :string)
+           ("t" "�" :string)
+           ("R" "�" :string)
+           ("K" "�" :string)
+           ("y" "�" :string)
+           ("k" "�" :string)
            ("p" "�" :string)
-           ("a" "�" :string)
+           ("P" "�" :string)
+           ("J" "�" :string)
+           ("n" "�" :string)
+           ("s" "�" :string)
            ("j" "�" :string)
-           ("e" "�" :string)
-           ("u" "�" :string)
-           ("R" "�" :string)
-           ("Q" "�" :string)
            ("d" "�" :string)
-           ("S" "�" :string)
-           ("B" "�" :string)
-           ("I" "�" :string)
-           ("f" "�" :string)
            ("w" "�" :string)
-           ("s" "�" :string)
-           ("O" "�" :string)
-           ("Z" "�" :string)
-           ("M" "�" :string)
-           ("h" "�" :string)
-           ("t" "�" :string)
+           ("q" "�" :string)
+           ("F" "�" :string)
+           ("E" "�" :string)
+           ("C" "�" :string)
            ("b" "�" :string)
+           ("u" "�" :string)
+           ("x" "�" :string)
+           ("G" "�" :string)
+           ("o" "�" :string)
+           ("O" "�" :string)
+           ("e" "�" :string)
+           ("z" "�" :string)
+           ("S" "�" :string)
+           ("V" "�" :string)
+           ("r" "�" :string)
+           ("I" "�" :string)
+           ("a" "�" :string)
+           ("D" "�" :string)
+           ("v" "�" :string)
            ("m" "�" :string)
-           ("k" "�" :string)
+           ("f" "�" :string)
+           ("c" "�" :string)
+           ("N" "�" :string)
            ("L" "�" :string)
-           ("V" "�" :string)
-           ("n" "�" :string)
-           ("J" "�" :string)
+           ("i" "�" :string)
+           ("g" "�" :string)
+           ("H" "�" :string)
+           ("A" "�" :string)
+           ("l" "�" :string)
+           ("T" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/icelandic/cp1252.xdy b/Master/texmf-dist/xindy/modules/lang/icelandic/cp1252.xdy
index 79abca5a5c8..fdcf45355f4 100644
--- a/Master/texmf-dist/xindy/modules/lang/icelandic/cp1252.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/icelandic/cp1252.xdy
@@ -35,33 +35,33 @@
 
 (define-rule-set "is-alphabetize"
 
-  :rules  (("�" "�" :string)
-           ("a" "�" :string)
+  :rules  (("A" "�" :string)
            ("�" "�" :string)
-           ("A" "�" :string)
+           ("�" "�" :string)
+           ("a" "�" :string)
            ("B" "�" :string)
            ("b" "�" :string)
            ("C" "�" :string)
            ("c" "�" :string)
-           ("d" "�" :string)
            ("D" "�" :string)
-           ("�" "�" :string)
+           ("d" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("e" "�" :string)
+           ("�" "�" :string)
            ("E" "�" :string)
-           ("�" "�" :string)
-           ("f" "�" :string)
+           ("e" "�" :string)
+           ("�" "�" :string)
            ("F" "�" :string)
+           ("f" "�" :string)
            ("G" "�" :string)
            ("g" "�" :string)
-           ("H" "�" :string)
            ("h" "�" :string)
+           ("H" "�" :string)
            ("�" "�" :string)
-           ("i" "�" :string)
            ("�" "�" :string)
+           ("i" "�" :string)
            ("I" "�" :string)
            ("J" "�" :string)
            ("j" "�" :string)
@@ -69,244 +69,244 @@
            ("K" "�" :string)
            ("L" "�" :string)
            ("l" "�" :string)
-           ("M" "�" :string)
            ("m" "�" :string)
+           ("M" "�" :string)
            ("N" "�" :string)
            ("n" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("o" "�" :string)
            ("O" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("p" "�" :string)
            ("P" "�" :string)
            ("Q" "�" :string)
            ("q" "�" :string)
            ("r" "�" :string)
            ("R" "�" :string)
-           ("s" "�" :string)
            ("S" "�" :string)
+           ("s" "�" :string)
            ("�" "��" :string)
            ("T" "�" :string)
            ("t" "�" :string)
+           ("U" "�" :string)
+           ("�" "�" :string)
+           ("u" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("u" "�" :string)
-           ("�" "�" :string)
-           ("U" "�" :string)
-           ("V" "�" :string)
+           ("�" "�" :string)
            ("v" "�" :string)
+           ("V" "�" :string)
            ("W" "�" :string)
            ("w" "�" :string)
            ("x" "�" :string)
            ("X" "�" :string)
-           ("y" "�" :string)
+           ("�" "�" :string)
            ("Y" "�" :string)
+           ("y" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("Z" "�" :string)
            ("z" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ))
 
 (define-rule-set "is-resolve-diacritics"
 
-  :rules  (("w" "�" :string)
-           ("S" "�" :string)
+  :rules  (("�" "�" :string)
+           ("N" "�" :string)
+           ("e" "�" :string)
            ("R" "�" :string)
-           ("K" "�" :string)
-           ("a" "�" :string)
-           ("v" "�" :string)
-           ("U" "�" :string)
-           ("o" "�" :string)
-           ("�" "�" :string)
-           ("J" "�" :string)
-           ("j" "�" :string)
-           ("�" "�" :string)
+           ("t" "�" :string)
            ("H" "�" :string)
+           ("n" "�" :string)
+           ("f" "�" :string)
            ("�" "�" :string)
-           ("h" "�" :string)
-           ("b" "�" :string)
-           ("A" "�" :string)
+           ("a" "�" :string)
+           ("i" "�" :string)
+           ("K" "�" :string)
+           ("d" "�" :string)
            ("X" "�" :string)
-           ("�" "�" :string)
-           ("t" "�" :string)
-           ("P" "�" :string)
-           ("D" "�" :string)
-           ("O" "�" :string)
            ("I" "�" :string)
-           ("z" "�" :string)
+           ("P" "�" :string)
+           ("�" "�" :string)
+           ("Y" "�" :string)
+           ("s" "�" :string)
+           ("M" "�" :string)
            ("�" "�" :string)
-           ("x" "�" :string)
-           ("L" "�" :string)
-           ("G" "�" :string)
-           ("T" "�" :string)
-           ("Q" "�" :string)
-           ("W" "�" :string)
-           ("V" "�" :string)
+           ("j" "�" :string)
+           ("F" "�" :string)
            ("y" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("k" "�" :string)
-           ("d" "�" :string)
-           ("N" "�" :string)
-           ("i" "�" :string)
-           ("B" "�" :string)
-           ("s" "�" :string)
+           ("D" "�" :string)
+           ("A" "�" :string)
+           ("Z" "�" :string)
+           ("m" "�" :string)
+           ("x" "�" :string)
+           ("w" "�" :string)
+           ("J" "�" :string)
            ("g" "�" :string)
-           ("�" "�" :string)
-           ("E" "�" :string)
-           ("q" "�" :string)
-           ("e" "�" :string)
            ("r" "�" :string)
-           ("F" "�" :string)
-           ("m" "�" :string)
-           ("�" "�" :string)
+           ("W" "�" :string)
+           ("o" "�" :string)
+           ("q" "�" :string)
            ("p" "�" :string)
+           ("S" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("z" "�" :string)
+           ("b" "�" :string)
            ("C" "�" :string)
-           ("l" "�" :string)
+           ("V" "�" :string)
+           ("�" "�" :string)
            ("c" "�" :string)
-           ("Z" "�" :string)
-           ("Y" "�" :string)
-           ("f" "�" :string)
-           ("n" "�" :string)
+           ("O" "�" :string)
+           ("l" "�" :string)
+           ("E" "�" :string)
+           ("L" "�" :string)
            ("u" "�" :string)
+           ("�" "�" :string)
+           ("k" "�" :string)
+           ("T" "�" :string)
+           ("�" "�" :string)
+           ("U" "�" :string)
+           ("v" "�" :string)
            ("�" "�" :string)
-           ("M" "�" :string)
-           ("�" "�" :string)
+           ("h" "�" :string)
+           ("G" "�" :string)
+           ("B" "�" :string)
+           ("Q" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :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 "is-resolve-case"
 
-  :rules  (("M" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("Y" "8" :string)
-           ("Z" "8" :string)
-           ("C" "8" :string)
-           ("�" "8" :string)
-           ("F" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("E" "8" :string)
-           ("�" "8" :string)
-           ("B" "8" :string)
-           ("�" "8" :string)
+  :rules  (("G" "8" :string)
            ("�" "8" :string)
-           ("N" "8" :string)
-           ("V" "8" :string)
-           ("W" "8" :string)
-           ("�" "8" :string)
+           ("B" "8" :string)
            ("Q" "8" :string)
-           ("T" "8" :string)
            ("L" "8" :string)
-           ("G" "8" :string)
-           ("�" "8" :string)
+           ("T" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
-           ("I" "8" :string)
+           ("U" "8" :string)
+           ("S" "8" :string)
+           ("�" "8" :string)
+           ("V" "8" :string)
+           ("C" "8" :string)
            ("O" "8" :string)
-           ("D" "8" :string)
+           ("E" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("Z" "8" :string)
+           ("A" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("J" "8" :string)
+           ("W" "8" :string)
            ("�" "8" :string)
+           ("M" "8" :string)
+           ("F" "8" :string)
+           ("D" "8" :string)
+           ("�" "8" :string)
            ("P" "8" :string)
-           ("�" "8" :string)
-           ("X" "8" :string)
-           ("A" "8" :string)
+           ("Y" "8" :string)
            ("�" "8" :string)
-           ("H" "8" :string)
-           ("J" "8" :string)
-           ("�" "8" :string)
-           ("U" "8" :string)
+           ("�" "8" :string)
            ("K" "8" :string)
-           ("R" "8" :string)
+           ("�" "8" :string)
+           ("I" "8" :string)
+           ("X" "8" :string)
            ("�" "8" :string)
-           ("S" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("R" "8" :string)
+           ("N" "8" :string)
+           ("H" "8" :string)
+           ("�" "9" :string)
+           ("h" "9" :string)
            ("u" "9" :string)
-           ("n" "9" :string)
-           ("f" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
+           ("k" "9" :string)
+           ("v" "9" :string)
            ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("p" "9" :string)
+           ("�" "9" :string)
+           ("z" "9" :string)
+           ("b" "9" :string)
            ("l" "9" :string)
            ("c" "9" :string)
            ("m" "9" :string)
-           ("p" "9" :string)
-           ("e" "9" :string)
+           ("�" "9" :string)
+           ("x" "9" :string)
+           ("w" "9" :string)
+           ("�" "9" :string)
            ("r" "9" :string)
-           ("q" "9" :string)
            ("g" "9" :string)
-           ("s" "9" :string)
-           ("�" "9" :string)
-           ("i" "9" :string)
-           ("d" "9" :string)
-           ("�" "9" :string)
-           ("k" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("y" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("x" "9" :string)
+           ("o" "9" :string)
+           ("q" "9" :string)
+           ("j" "9" :string)
            ("�" "9" :string)
-           ("z" "9" :string)
-           ("�" "9" :string)
-           ("t" "9" :string)
-           ("�" "9" :string)
-           ("b" "9" :string)
+           ("y" "9" :string)
            ("�" "9" :string)
-           ("h" "9" :string)
-           ("j" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("o" "9" :string)
-           ("�" "9" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
-           ("v" "9" :string)
+           ("s" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("f" "9" :string)
+           ("n" "9" :string)
+           ("i" "9" :string)
+           ("d" "9" :string)
            ("a" "9" :string)
-           ("w" "9" :string)
+           ("e" "9" :string)
+           ("t" "9" :string)
            ("�" "99" :string)
            ))
 
 (define-rule-set "is-ignore-special"
 
-  :rules  (("?" "" :string)
+  :rules  (("." "" :string)
+           ("!" "" :string)
            ("-" "" :string)
-           ("." "" :string)
+           ("?" "" :string)
            ("'" "" :string)
-           ("!" "" :string)
            ))
 
 (define-rule-set "is-resolve-special"
@@ -314,89 +314,89 @@
   :rules  (("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("a" "�" :string)
-           ("K" "�" :string)
-           ("v" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("U" "�" :string)
-           ("w" "�" :string)
-           ("�" "�" :string)
-           ("S" "�" :string)
-           ("R" "�" :string)
+           ("�" "�" :string)
+           ("v" "�" :string)
+           ("�" "�" :string)
+           ("k" "�" :string)
+           ("T" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("L" "�" :string)
+           ("u" "�" :string)
+           ("Q" "�" :string)
+           ("B" "�" :string)
+           ("�" "�" :string)
+           ("h" "�" :string)
+           ("�" "�" :string)
+           ("G" "�" :string)
            ("o" "�" :string)
-           ("�" "�" :string)
+           ("W" "�" :string)
+           ("q" "�" :string)
            ("J" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("h" "�" :string)
-           ("�" "�" :string)
-           ("b" "�" :string)
+           ("g" "�" :string)
+           ("r" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("x" "�" :string)
+           ("w" "�" :string)
            ("A" "�" :string)
            ("�" "�" :string)
-           ("X" "�" :string)
-           ("�" "�" :string)
-           ("j" "�" :string)
-           ("H" "�" :string)
-           ("�" "�" :string)
-           ("D" "�" :string)
-           ("�" "�" :string)
-           ("I" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("m" "�" :string)
+           ("Z" "�" :string)
+           ("�" "�" :string)
+           ("c" "�" :string)
            ("O" "�" :string)
-           ("�" "�" :string)
+           ("l" "�" :string)
+           ("E" "�" :string)
            ("z" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("t" "�" :string)
+           ("C" "�" :string)
+           ("b" "�" :string)
+           ("V" "�" :string)
+           ("S" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("p" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("Y" "�" :string)
+           ("s" "�" :string)
            ("P" "�" :string)
-           ("Q" "�" :string)
-           ("�" "�" :string)
-           ("W" "�" :string)
-           ("�" "�" :string)
-           ("x" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("L" "�" :string)
-           ("G" "�" :string)
-           ("T" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("d" "�" :string)
+           ("�" "�" :string)
+           ("D" "�" :string)
+           ("�" "�" :string)
+           ("F" "�" :string)
+           ("y" "�" :string)
+           ("M" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("j" "�" :string)
+           ("t" "�" :string)
+           ("H" "�" :string)
            ("N" "�" :string)
-           ("�" "�" :string)
+           ("R" "�" :string)
+           ("e" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("X" "�" :string)
+           ("I" "�" :string)
+           ("�" "�" :string)
+           ("a" "�" :string)
            ("i" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("B" "�" :string)
-           ("s" "�" :string)
-           ("V" "�" :string)
-           ("y" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("k" "�" :string)
-           ("p" "�" :string)
-           ("�" "�" :string)
-           ("m" "�" :string)
-           ("c" "�" :string)
-           ("l" "�" :string)
-           ("C" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("Z" "�" :string)
-           ("�" "�" :string)
-           ("g" "�" :string)
-           ("E" "�" :string)
-           ("�" "�" :string)
-           ("q" "�" :string)
-           ("e" "�" :string)
-           ("r" "�" :string)
-           ("�" "�" :string)
-           ("F" "�" :string)
+           ("d" "�" :string)
+           ("K" "�" :string)
+           ("�" "�" :string)
            ("n" "�" :string)
-           ("u" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("M" "�" :string)
-           ("Y" "�" :string)
            ("f" "�" :string)
            ("�" "��" :string)
            ("-" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/icelandic/latin9.xdy b/Master/texmf-dist/xindy/modules/lang/icelandic/latin9.xdy
index fb40bb36f86..b8e035f8646 100644
--- a/Master/texmf-dist/xindy/modules/lang/icelandic/latin9.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/icelandic/latin9.xdy
@@ -39,8 +39,8 @@
            ("a" "�" :string)
            ("�" "�" :string)
            ("A" "�" :string)
-           ("b" "�" :string)
            ("B" "�" :string)
+           ("b" "�" :string)
            ("C" "�" :string)
            ("c" "�" :string)
            ("D" "�" :string)
@@ -48,39 +48,39 @@
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("e" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("E" "�" :string)
-           ("�" "�" :string)
-           ("f" "�" :string)
            ("F" "�" :string)
-           ("G" "�" :string)
+           ("f" "�" :string)
            ("g" "�" :string)
-           ("H" "�" :string)
+           ("G" "�" :string)
            ("h" "�" :string)
-           ("�" "�" :string)
-           ("i" "�" :string)
+           ("H" "�" :string)
            ("I" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("i" "�" :string)
            ("J" "�" :string)
            ("j" "�" :string)
-           ("k" "�" :string)
            ("K" "�" :string)
-           ("l" "�" :string)
+           ("k" "�" :string)
            ("L" "�" :string)
+           ("l" "�" :string)
            ("M" "�" :string)
            ("m" "�" :string)
            ("N" "�" :string)
            ("n" "�" :string)
-           ("O" "�" :string)
-           ("�" "�" :string)
-           ("o" "�" :string)
            ("�" "�" :string)
-           ("P" "�" :string)
+           ("o" "�" :string)
+           ("�" "�" :string)
+           ("O" "�" :string)
            ("p" "�" :string)
-           ("q" "�" :string)
+           ("P" "�" :string)
            ("Q" "�" :string)
+           ("q" "�" :string)
            ("r" "�" :string)
            ("R" "�" :string)
            ("S" "�" :string)
@@ -88,225 +88,225 @@
            ("�" "��" :string)
            ("t" "�" :string)
            ("T" "�" :string)
-           ("�" "�" :string)
-           ("u" "�" :string)
            ("�" "�" :string)
+           ("u" "�" :string)
+           ("�" "�" :string)
            ("U" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("V" "�" :string)
+           ("�" "�" :string)
            ("v" "�" :string)
+           ("V" "�" :string)
            ("w" "�" :string)
            ("W" "�" :string)
            ("x" "�" :string)
            ("X" "�" :string)
            ("�" "�" :string)
-           ("y" "�" :string)
            ("Y" "�" :string)
+           ("y" "�" :string)
            ("�" "�" :string)
            ("z" "�" :string)
            ("Z" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ))
 
 (define-rule-set "is-resolve-diacritics"
 
-  :rules  (("X" "�" :string)
-           ("C" "�" :string)
+  :rules  (("�" "�" :string)
            ("J" "�" :string)
-           ("�" "�" :string)
-           ("a" "�" :string)
-           ("w" "�" :string)
-           ("S" "�" :string)
-           ("q" "�" :string)
-           ("�" "�" :string)
-           ("k" "�" :string)
-           ("P" "�" :string)
-           ("f" "�" :string)
-           ("O" "�" :string)
-           ("N" "�" :string)
-           ("x" "�" :string)
-           ("G" "�" :string)
-           ("�" "�" :string)
-           ("u" "�" :string)
-           ("�" "�" :string)
-           ("I" "�" :string)
-           ("t" "�" :string)
-           ("z" "�" :string)
-           ("Q" "�" :string)
-           ("b" "�" :string)
+           ("W" "�" :string)
            ("e" "�" :string)
-           ("U" "�" :string)
-           ("i" "�" :string)
-           ("D" "�" :string)
            ("�" "�" :string)
-           ("r" "�" :string)
-           ("c" "�" :string)
-           ("M" "�" :string)
-           ("l" "�" :string)
+           ("Q" "�" :string)
+           ("P" "�" :string)
            ("F" "�" :string)
-           ("h" "�" :string)
-           ("T" "�" :string)
            ("g" "�" :string)
-           ("m" "�" :string)
-           ("�" "�" :string)
-           ("y" "�" :string)
+           ("h" "�" :string)
+           ("B" "�" :string)
+           ("C" "�" :string)
+           ("v" "�" :string)
+           ("S" "�" :string)
+           ("I" "�" :string)
+           ("�" "�" :string)
+           ("w" "�" :string)
+           ("p" "�" :string)
+           ("z" "�" :string)
            ("o" "�" :string)
-           ("d" "�" :string)
-           ("s" "�" :string)
-           ("K" "�" :string)
-           ("H" "�" :string)
+           ("�" "�" :string)
            ("j" "�" :string)
-           ("A" "�" :string)
-           ("p" "�" :string)
-           ("n" "�" :string)
+           ("u" "�" :string)
+           ("�" "�" :string)
+           ("T" "�" :string)
            ("�" "�" :string)
-           ("v" "�" :string)
-           ("R" "�" :string)
-           ("Z" "�" :string)
-           ("B" "�" :string)
-           ("�" "�" :string)
+           ("t" "�" :string)
            ("Y" "�" :string)
-           ("L" "�" :string)
+           ("x" "�" :string)
+           ("a" "�" :string)
+           ("�" "�" :string)
+           ("K" "�" :string)
+           ("R" "�" :string)
+           ("l" "�" :string)
+           ("q" "�" :string)
+           ("f" "�" :string)
+           ("y" "�" :string)
+           ("�" "�" :string)
+           ("U" "�" :string)
+           ("r" "�" :string)
            ("V" "�" :string)
+           ("L" "�" :string)
+           ("Z" "�" :string)
+           ("G" "�" :string)
+           ("D" "�" :string)
+           ("c" "�" :string)
+           ("X" "�" :string)
+           ("b" "�" :string)
+           ("d" "�" :string)
            ("E" "�" :string)
-           ("W" "�" :string)
+           ("k" "�" :string)
+           ("s" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("m" "�" :string)
+           ("i" "�" :string)
+           ("O" "�" :string)
+           ("A" "�" :string)
+           ("n" "�" :string)
+           ("M" "�" :string)
+           ("�" "�" :string)
+           ("N" "�" :string)
+           ("H" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :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 "is-resolve-case"
 
   :rules  (("M" "8" :string)
-           ("�" "8" :string)
-           ("D" "8" :string)
-           ("�" "8" :string)
-           ("U" "8" :string)
-           ("�" "8" :string)
-           ("Q" "8" :string)
-           ("G" "8" :string)
-           ("I" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("O" "8" :string)
            ("N" "8" :string)
-           ("�" "8" :string)
-           ("P" "8" :string)
-           ("�" "8" :string)
-           ("S" "8" :string)
-           ("J" "8" :string)
-           ("�" "8" :string)
+           ("H" "8" :string)
+           ("A" "8" :string)
+           ("O" "8" :string)
            ("X" "8" :string)
-           ("C" "8" :string)
+           ("E" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
-           ("W" "8" :string)
-           ("L" "8" :string)
-           ("�" "8" :string)
+           ("Z" "8" :string)
+           ("�" "8" :string)
+           ("G" "8" :string)
+           ("D" "8" :string)
+           ("�" "8" :string)
            ("V" "8" :string)
-           ("E" "8" :string)
-           ("B" "8" :string)
-           ("Y" "8" :string)
+           ("�" "8" :string)
+           ("L" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("U" "8" :string)
            ("R" "8" :string)
-           ("�" "8" :string)
-           ("Z" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
-           ("A" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
            ("K" "8" :string)
-           ("H" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
-           ("F" "8" :string)
            ("T" "8" :string)
-           ("c" "9" :string)
-           ("l" "9" :string)
-           ("�" "9" :string)
-           ("r" "9" :string)
-           ("i" "9" :string)
-           ("�" "9" :string)
-           ("b" "9" :string)
-           ("e" "9" :string)
-           ("t" "9" :string)
-           ("z" "9" :string)
-           ("�" "9" :string)
-           ("u" "9" :string)
+           ("�" "8" :string)
+           ("Y" "8" :string)
+           ("�" "8" :string)
+           ("I" "8" :string)
+           ("S" "8" :string)
+           ("�" "8" :string)
+           ("F" "8" :string)
+           ("�" "8" :string)
+           ("B" "8" :string)
+           ("C" "8" :string)
+           ("J" "8" :string)
+           ("W" "8" :string)
+           ("Q" "8" :string)
+           ("P" "8" :string)
            ("�" "9" :string)
-           ("x" "9" :string)
-           ("f" "9" :string)
-           ("�" "9" :string)
-           ("k" "9" :string)
-           ("w" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("q" "9" :string)
-           ("a" "9" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("v" "9" :string)
            ("n" "9" :string)
-           ("�" "9" :string)
+           ("�" "9" :string)
+           ("m" "9" :string)
+           ("i" "9" :string)
            ("�" "9" :string)
-           ("p" "9" :string)
-           ("j" "9" :string)
+           ("b" "9" :string)
            ("d" "9" :string)
+           ("k" "9" :string)
+           ("�" "9" :string)
            ("s" "9" :string)
+           ("�" "9" :string)
+           ("c" "9" :string)
+           ("r" "9" :string)
+           ("l" "9" :string)
+           ("f" "9" :string)
+           ("q" "9" :string)
+           ("y" "9" :string)
+           ("x" "9" :string)
+           ("a" "9" :string)
            ("�" "9" :string)
+           ("�" "9" :string)
+           ("t" "9" :string)
            ("o" "9" :string)
-           ("�" "9" :string)
-           ("y" "9" :string)
+           ("�" "9" :string)
+           ("j" "9" :string)
+           ("u" "9" :string)
+           ("w" "9" :string)
+           ("p" "9" :string)
+           ("z" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
            ("h" "9" :string)
-           ("m" "9" :string)
            ("g" "9" :string)
+           ("v" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("e" "9" :string)
+           ("�" "9" :string)
            ("�" "99" :string)
            ))
 
 (define-rule-set "is-ignore-special"
 
-  :rules  (("-" "" :string)
-           ("!" "" :string)
-           ("'" "" :string)
+  :rules  (("'" "" :string)
            ("?" "" :string)
+           ("-" "" :string)
            ("." "" :string)
+           ("!" "" :string)
            ))
 
 (define-rule-set "is-resolve-special"
@@ -314,90 +314,90 @@
   :rules  (("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("o" "�" :string)
+           ("E" "�" :string)
+           ("k" "�" :string)
+           ("�" "�" :string)
+           ("X" "�" :string)
+           ("b" "�" :string)
            ("d" "�" :string)
            ("s" "�" :string)
-           ("K" "�" :string)
-           ("H" "�" :string)
-           ("j" "�" :string)
-           ("A" "�" :string)
-           ("p" "�" :string)
-           ("h" "�" :string)
-           ("F" "�" :string)
-           ("T" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("m" "�" :string)
-           ("g" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("y" "�" :string)
-           ("�" "�" :string)
-           ("B" "�" :string)
-           ("�" "�" :string)
-           ("Y" "�" :string)
-           ("L" "�" :string)
-           ("V" "�" :string)
-           ("�" "�" :string)
-           ("E" "�" :string)
-           ("W" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("n" "�" :string)
-           ("�" "�" :string)
-           ("v" "�" :string)
-           ("R" "�" :string)
-           ("�" "�" :string)
-           ("Z" "�" :string)
-           ("P" "�" :string)
-           ("�" "�" :string)
-           ("f" "�" :string)
-           ("�" "�" :string)
            ("O" "�" :string)
-           ("�" "�" :string)
-           ("N" "�" :string)
-           ("x" "�" :string)
-           ("X" "�" :string)
+           ("i" "�" :string)
            ("�" "�" :string)
-           ("C" "�" :string)
-           ("J" "�" :string)
-           ("�" "�" :string)
-           ("a" "�" :string)
-           ("S" "�" :string)
-           ("w" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("n" "�" :string)
+           ("A" "�" :string)
+           ("�" "�" :string)
+           ("M" "�" :string)
+           ("N" "�" :string)
+           ("H" "�" :string)
            ("q" "�" :string)
-           ("�" "�" :string)
-           ("k" "�" :string)
+           ("f" "�" :string)
+           ("l" "�" :string)
+           ("R" "�" :string)
+           ("y" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("i" "�" :string)
-           ("D" "�" :string)
-           ("�" "�" :string)
+           ("U" "�" :string)
+           ("�" "�" :string)
            ("r" "�" :string)
-           ("c" "�" :string)
-           ("M" "�" :string)
            ("�" "�" :string)
-           ("l" "�" :string)
+           ("V" "�" :string)
+           ("�" "�" :string)
+           ("L" "�" :string)
+           ("�" "�" :string)
+           ("Z" "�" :string)
+           ("D" "�" :string)
+           ("c" "�" :string)
+           ("�" "�" :string)
+           ("G" "�" :string)
+           ("�" "�" :string)
+           ("o" "�" :string)
+           ("j" "�" :string)
+           ("�" "�" :string)
            ("u" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("T" "�" :string)
+           ("Y" "�" :string)
+           ("t" "�" :string)
+           ("�" "�" :string)
+           ("x" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("a" "�" :string)
+           ("K" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("J" "�" :string)
+           ("W" "�" :string)
+           ("e" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("G" "�" :string)
+           ("Q" "�" :string)
+           ("P" "�" :string)
+           ("�" "�" :string)
+           ("h" "�" :string)
+           ("g" "�" :string)
+           ("F" "�" :string)
            ("�" "�" :string)
+           ("C" "�" :string)
+           ("v" "�" :string)
+           ("�" "�" :string)
+           ("B" "�" :string)
+           ("S" "�" :string)
            ("I" "�" :string)
-           ("t" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("w" "�" :string)
+           ("�" "�" :string)
+           ("p" "�" :string)
            ("z" "�" :string)
-           ("Q" "�" :string)
-           ("b" "�" :string)
-           ("e" "�" :string)
-           ("U" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "��" :string)
            ("-" "�" :string)
            ("'" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/icelandic/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/icelandic/utf8.xdy
index 36e7a8331f0..fbd2fafbb9b 100644
--- a/Master/texmf-dist/xindy/modules/lang/icelandic/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/icelandic/utf8.xdy
@@ -37,81 +37,81 @@
 
   :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)
            ("A" "�" :string)
            ("a" "�" :string)
-           ("B" "�" :string)
            ("b" "�" :string)
+           ("B" "�" :string)
            ("C" "�" :string)
            ("c" "�" :string)
-           ("d" "�" :string)
            ("D" "�" :string)
-           ("E" "�" :string)
+           ("d" "�" :string)
            ("e" "�" :string)
-           ("F" "�" :string)
+           ("E" "�" :string)
            ("f" "�" :string)
-           ("G" "�" :string)
+           ("F" "�" :string)
            ("g" "�" :string)
-           ("H" "�" :string)
+           ("G" "�" :string)
            ("h" "�" :string)
-           ("I" "�" :string)
+           ("H" "�" :string)
            ("i" "�" :string)
+           ("I" "�" :string)
            ("J" "�" :string)
            ("j" "�" :string)
-           ("K" "�" :string)
            ("k" "�" :string)
-           ("l" "�" :string)
+           ("K" "�" :string)
            ("L" "�" :string)
-           ("m" "�" :string)
+           ("l" "�" :string)
            ("M" "�" :string)
+           ("m" "�" :string)
            ("N" "�" :string)
            ("n" "�" :string)
-           ("o" "�" :string)
            ("O" "�" :string)
-           ("p" "�" :string)
+           ("o" "�" :string)
            ("P" "�" :string)
+           ("p" "�" :string)
            ("Q" "�" :string)
            ("q" "�" :string)
            ("R" "�" :string)
@@ -124,329 +124,329 @@
            ("U" "�" :string)
            ("v" "�" :string)
            ("V" "�" :string)
-           ("W" "�" :string)
            ("w" "�" :string)
-           ("X" "�" :string)
+           ("W" "�" :string)
            ("x" "�" :string)
-           ("y" "�" :string)
+           ("X" "�" :string)
            ("Y" "�" :string)
+           ("y" "�" :string)
            ("Z" "�" :string)
            ("z" "�" :string)
            ))
 
 (define-rule-set "is-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)
-           ("a" "�" :string)
-           ("X" "�" :string)
-           ("H" "�" :string)
-           ("N" "�" :string)
-           ("m" "�" :string)
+           ("M" "�" :string)
+           ("P" "�" :string)
            ("h" "�" :string)
-           ("n" "�" :string)
-           ("w" "�" :string)
-           ("V" "�" :string)
-           ("T" "�" :string)
-           ("G" "�" :string)
-           ("v" "�" :string)
-           ("o" "�" :string)
-           ("p" "�" :string)
-           ("E" "�" :string)
+           ("Q" "�" :string)
            ("s" "�" :string)
+           ("w" "�" :string)
+           ("K" "�" :string)
+           ("N" "�" :string)
            ("Z" "�" :string)
-           ("A" "�" :string)
-           ("t" "�" :string)
-           ("l" "�" :string)
-           ("e" "�" :string)
-           ("C" "�" :string)
-           ("W" "�" :string)
-           ("r" "�" :string)
+           ("x" "�" :string)
+           ("b" "�" :string)
+           ("i" "�" :string)
            ("g" "�" :string)
-           ("S" "�" :string)
-           ("D" "�" :string)
-           ("L" "�" :string)
            ("J" "�" :string)
-           ("q" "�" :string)
-           ("Q" "�" :string)
-           ("k" "�" :string)
-           ("i" "�" :string)
-           ("b" "�" :string)
-           ("j" "�" :string)
-           ("x" "�" :string)
            ("u" "�" :string)
-           ("F" "�" :string)
-           ("y" "�" :string)
-           ("Y" "�" :string)
-           ("R" "�" :string)
-           ("O" "�" :string)
-           ("z" "�" :string)
-           ("K" "�" :string)
            ("B" "�" :string)
-           ("P" "�" :string)
            ("f" "�" :string)
-           ("M" "�" :string)
+           ("D" "�" :string)
+           ("k" "�" :string)
+           ("I" "�" :string)
+           ("O" "�" :string)
+           ("C" "�" :string)
+           ("t" "�" :string)
+           ("Y" "�" :string)
+           ("l" "�" :string)
+           ("q" "�" :string)
+           ("z" "�" :string)
            ("U" "�" :string)
            ("c" "�" :string)
-           ("I" "�" :string)
+           ("o" "�" :string)
+           ("p" "�" :string)
+           ("G" "�" :string)
            ("d" "�" :string)
+           ("r" "�" :string)
+           ("V" "�" :string)
+           ("v" "�" :string)
+           ("y" "�" :string)
+           ("A" "�" :string)
+           ("a" "�" :string)
+           ("T" "�" :string)
+           ("E" "�" :string)
+           ("m" "�" :string)
+           ("R" "�" :string)
+           ("S" "�" :string)
+           ("j" "�" :string)
+           ("H" "�" :string)
+           ("W" "�" :string)
+           ("n" "�" :string)
+           ("X" "�" :string)
+           ("L" "�" :string)
+           ("e" "�" :string)
+           ("F" "�" :string)
            ))
 
 (define-rule-set "is-resolve-case"
 
   :rules  (("Ǫ́" "8" :string)
            ("Ę́" "8" :string)
-           ("ę́" "9" :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)
-           ("á" "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)
            ("ß" "99" :string)
-           ("W" "8" :string)
-           ("C" "8" :string)
-           ("A" "8" :string)
-           ("Z" "8" :string)
-           ("E" "8" :string)
-           ("V" "8" :string)
-           ("T" "8" :string)
-           ("G" "8" :string)
-           ("X" "8" :string)
-           ("H" "8" :string)
            ("N" "8" :string)
-           ("I" "8" :string)
-           ("U" "8" :string)
+           ("Z" "8" :string)
+           ("K" "8" :string)
+           ("Q" "8" :string)
            ("P" "8" :string)
            ("M" "8" :string)
+           ("C" "8" :string)
+           ("O" "8" :string)
+           ("Y" "8" :string)
+           ("I" "8" :string)
+           ("D" "8" :string)
+           ("J" "8" :string)
            ("B" "8" :string)
            ("R" "8" :string)
-           ("Y" "8" :string)
-           ("O" "8" :string)
-           ("K" "8" :string)
+           ("S" "8" :string)
+           ("A" "8" :string)
+           ("T" "8" :string)
+           ("E" "8" :string)
+           ("G" "8" :string)
+           ("V" "8" :string)
+           ("U" "8" :string)
            ("F" "8" :string)
-           ("Q" "8" :string)
-           ("J" "8" :string)
-           ("D" "8" :string)
+           ("X" "8" :string)
            ("L" "8" :string)
-           ("S" "8" :string)
-           ("l" "9" :string)
-           ("e" "9" :string)
-           ("t" "9" :string)
-           ("s" "9" :string)
-           ("o" "9" :string)
-           ("p" "9" :string)
-           ("v" "9" :string)
-           ("n" "9" :string)
+           ("W" "8" :string)
+           ("H" "8" :string)
+           ("x" "9" :string)
            ("w" "9" :string)
+           ("s" "9" :string)
            ("h" "9" :string)
-           ("m" "9" :string)
-           ("a" "9" :string)
-           ("c" "9" :string)
-           ("d" "9" :string)
+           ("t" "9" :string)
+           ("k" "9" :string)
            ("f" "9" :string)
-           ("z" "9" :string)
-           ("y" "9" :string)
            ("u" "9" :string)
-           ("x" "9" :string)
+           ("g" "9" :string)
            ("i" "9" :string)
            ("b" "9" :string)
-           ("j" "9" :string)
-           ("q" "9" :string)
-           ("k" "9" :string)
-           ("g" "9" :string)
+           ("m" "9" :string)
+           ("a" "9" :string)
+           ("y" "9" :string)
+           ("d" "9" :string)
+           ("v" "9" :string)
            ("r" "9" :string)
+           ("c" "9" :string)
+           ("p" "9" :string)
+           ("o" "9" :string)
+           ("z" "9" :string)
+           ("q" "9" :string)
+           ("l" "9" :string)
+           ("e" "9" :string)
+           ("n" "9" :string)
+           ("j" "9" :string)
            ))
 
 (define-rule-set "is-ignore-special"
 
-  :rules  (("?" "" :string)
-           ("." "" :string)
-           ("-" "" :string)
+  :rules  (("-" "" :string)
            ("!" "" :string)
+           ("." "" :string)
            ("'" "" :string)
+           ("?" "" :string)
            ))
 
 (define-rule-set "is-resolve-special"
 
   :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)
-           ("I" "�" :string)
-           ("d" "�" :string)
-           ("c" "�" :string)
-           ("U" "�" :string)
+           ("K" "�" :string)
+           ("N" "�" :string)
+           ("Z" "�" :string)
+           ("x" "�" :string)
+           ("s" "�" :string)
+           ("w" "�" :string)
+           ("Q" "�" :string)
            ("M" "�" :string)
+           ("h" "�" :string)
            ("P" "�" :string)
-           ("f" "�" :string)
-           ("B" "�" :string)
-           ("K" "�" :string)
-           ("R" "�" :string)
-           ("Y" "�" :string)
+           ("I" "�" :string)
+           ("k" "�" :string)
+           ("D" "�" :string)
            ("O" "�" :string)
-           ("z" "�" :string)
-           ("y" "�" :string)
-           ("F" "�" :string)
+           ("C" "�" :string)
+           ("Y" "�" :string)
+           ("t" "�" :string)
+           ("J" "�" :string)
            ("u" "�" :string)
-           ("x" "�" :string)
+           ("B" "�" :string)
+           ("f" "�" :string)
+           ("g" "�" :string)
            ("b" "�" :string)
-           ("j" "�" :string)
            ("i" "�" :string)
-           ("k" "�" :string)
-           ("q" "�" :string)
-           ("Q" "�" :string)
-           ("J" "�" :string)
-           ("L" "�" :string)
-           ("D" "�" :string)
+           ("m" "�" :string)
+           ("R" "�" :string)
            ("S" "�" :string)
-           ("g" "�" :string)
+           ("G" "�" :string)
+           ("d" "�" :string)
+           ("v" "�" :string)
+           ("V" "�" :string)
            ("r" "�" :string)
-           ("W" "�" :string)
-           ("e" "�" :string)
-           ("C" "�" :string)
-           ("l" "�" :string)
-           ("t" "�" :string)
+           ("y" "�" :string)
            ("A" "�" :string)
-           ("s" "�" :string)
-           ("Z" "�" :string)
+           ("a" "�" :string)
            ("E" "�" :string)
-           ("p" "�" :string)
-           ("o" "�" :string)
            ("T" "�" :string)
-           ("v" "�" :string)
-           ("G" "�" :string)
-           ("V" "�" :string)
-           ("w" "�" :string)
+           ("z" "�" :string)
+           ("U" "�" :string)
+           ("c" "�" :string)
+           ("o" "�" :string)
+           ("p" "�" :string)
+           ("l" "�" :string)
+           ("q" "�" :string)
+           ("e" "�" :string)
+           ("F" "�" :string)
+           ("W" "�" :string)
+           ("H" "�" :string)
            ("n" "�" :string)
-           ("h" "�" :string)
-           ("m" "�" :string)
-           ("a" "�" :string)
            ("X" "�" :string)
-           ("H" "�" :string)
-           ("N" "�" :string)
+           ("L" "�" :string)
+           ("j" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/italian/latin1.xdy b/Master/texmf-dist/xindy/modules/lang/italian/latin1.xdy
index 58d6169fbb6..3652b5bd1dc 100644
--- a/Master/texmf-dist/xindy/modules/lang/italian/latin1.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/italian/latin1.xdy
@@ -30,242 +30,242 @@
 
 (define-rule-set "it-alphabetize"
 
-  :rules  (("A" "�" :string)
-           ("�" "�" :string)
+  :rules  (("�" "�" :string)
            ("a" "�" :string)
-           ("�" "�" :string)
-           ("b" "�" :string)
+           ("�" "�" :string)
+           ("A" "�" :string)
            ("B" "�" :string)
+           ("b" "�" :string)
            ("c" "�" :string)
            ("C" "�" :string)
-           ("D" "�" :string)
            ("d" "�" :string)
-           ("�" "�" :string)
+           ("D" "�" :string)
            ("�" "�" :string)
-           ("E" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("E" "�" :string)
+           ("�" "�" :string)
            ("e" "�" :string)
+           ("�" "�" :string)
            ("f" "�" :string)
            ("F" "�" :string)
            ("g" "�" :string)
            ("G" "�" :string)
            ("h" "�" :string)
            ("H" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("I" "�" :string)
            ("i" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("I" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("J" "�" :string)
+           ("�" "�" :string)
            ("j" "�" :string)
-           ("K" "�" :string)
+           ("J" "�" :string)
            ("k" "�" :string)
+           ("K" "�" :string)
            ("l" "�" :string)
            ("L" "�" :string)
-           ("M" "�" :string)
            ("m" "�" :string)
-           ("N" "�" :string)
+           ("M" "�" :string)
            ("n" "�" :string)
+           ("N" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("O" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("o" "�" :string)
+           ("�" "�" :string)
            ("p" "�" :string)
            ("P" "�" :string)
-           ("q" "�" :string)
            ("Q" "�" :string)
-           ("R" "�" :string)
+           ("q" "�" :string)
            ("r" "�" :string)
+           ("R" "�" :string)
            ("S" "�" :string)
            ("s" "�" :string)
            ("�" "��" :string)
            ("t" "�" :string)
            ("T" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("u" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("U" "�" :string)
+           ("�" "�" :string)
            ("v" "�" :string)
            ("V" "�" :string)
-           ("w" "�" :string)
            ("W" "�" :string)
-           ("x" "�" :string)
+           ("w" "�" :string)
            ("X" "�" :string)
+           ("x" "�" :string)
            ("y" "�" :string)
            ("Y" "�" :string)
-           ("Z" "�" :string)
            ("z" "�" :string)
+           ("Z" "�" :string)
            ))
 
 (define-rule-set "it-resolve-diacritics"
 
-  :rules  (("X" "�" :string)
-           ("x" "�" :string)
-           ("l" "�" :string)
-           ("g" "�" :string)
-           ("d" "�" :string)
-           ("S" "�" :string)
-           ("M" "�" :string)
-           ("h" "�" :string)
-           ("L" "�" :string)
+  :rules  (("k" "�" :string)
+           ("X" "�" :string)
+           ("B" "�" :string)
+           ("y" "�" :string)
            ("c" "�" :string)
-           ("Q" "�" :string)
-           ("i" "�" :string)
+           ("v" "�" :string)
+           ("t" "�" :string)
+           ("h" "�" :string)
+           ("Y" "�" :string)
+           ("O" "�" :string)
+           ("f" "�" :string)
+           ("W" "�" :string)
+           ("g" "�" :string)
+           ("r" "�" :string)
            ("A" "�" :string)
-           ("T" "�" :string)
-           ("J" "�" :string)
-           ("u" "�" :string)
-           ("E" "�" :string)
-           ("Z" "�" :string)
-           ("n" "�" :string)
+           ("C" "�" :string)
+           ("m" "�" :string)
+           ("w" "�" :string)
+           ("a" "�" :string)
            ("R" "�" :string)
-           ("N" "�" :string)
+           ("V" "�" :string)
+           ("E" "�" :string)
+           ("M" "�" :string)
+           ("z" "�" :string)
+           ("l" "�" :string)
+           ("u" "�" :string)
+           ("I" "�" :string)
            ("b" "�" :string)
-           ("D" "�" :string)
-           ("w" "�" :string)
+           ("Q" "�" :string)
+           ("e" "�" :string)
+           ("G" "�" :string)
+           ("p" "�" :string)
+           ("T" "�" :string)
+           ("F" "�" :string)
            ("q" "�" :string)
-           ("y" "�" :string)
-           ("t" "�" :string)
-           ("m" "�" :string)
-           ("j" "�" :string)
            ("o" "�" :string)
+           ("n" "�" :string)
+           ("K" "�" :string)
+           ("J" "�" :string)
            ("H" "�" :string)
-           ("C" "�" :string)
-           ("s" "�" :string)
-           ("z" "�" :string)
-           ("Y" "�" :string)
-           ("V" "�" :string)
-           ("f" "�" :string)
-           ("U" "�" :string)
-           ("G" "�" :string)
-           ("F" "�" :string)
-           ("O" "�" :string)
-           ("k" "�" :string)
-           ("v" "�" :string)
-           ("I" "�" :string)
-           ("p" "�" :string)
-           ("W" "�" :string)
+           ("d" "�" :string)
+           ("L" "�" :string)
            ("P" "�" :string)
-           ("K" "�" :string)
-           ("e" "�" :string)
-           ("r" "�" :string)
-           ("B" "�" :string)
-           ("a" "�" :string)
-           ("�" "�" :string)
+           ("i" "�" :string)
+           ("j" "�" :string)
+           ("U" "�" :string)
+           ("N" "�" :string)
+           ("s" "�" :string)
+           ("Z" "�" :string)
+           ("x" "�" :string)
+           ("D" "�" :string)
+           ("S" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :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 "it-resolve-case"
 
-  :rules  (("O" "8" :string)
-           ("U" "8" :string)
-           ("F" "8" :string)
-           ("G" "8" :string)
-           ("V" "8" :string)
-           ("Y" "8" :string)
+  :rules  (("�" "8" :string)
+           ("A" "8" :string)
            ("C" "8" :string)
-           ("H" "8" :string)
-           ("B" "8" :string)
-           ("K" "8" :string)
-           ("P" "8" :string)
-           ("W" "8" :string)
            ("�" "8" :string)
+           ("R" "8" :string)
+           ("V" "8" :string)
+           ("E" "8" :string)
+           ("M" "8" :string)
            ("�" "8" :string)
            ("I" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("Q" "8" :string)
-           ("M" "8" :string)
-           ("L" "8" :string)
-           ("S" "8" :string)
-           ("�" "8" :string)
            ("X" "8" :string)
-           ("�" "8" :string)
-           ("D" "8" :string)
-           ("N" "8" :string)
+           ("B" "8" :string)
+           ("�" "8" :string)
+           ("Y" "8" :string)
+           ("O" "8" :string)
+           ("W" "8" :string)
+           ("J" "8" :string)
+           ("H" "8" :string)
            ("�" "8" :string)
+           ("L" "8" :string)
+           ("P" "8" :string)
            ("�" "8" :string)
-           ("R" "8" :string)
-           ("E" "8" :string)
+           ("N" "8" :string)
+           ("U" "8" :string)
            ("Z" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("D" "8" :string)
+           ("S" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("Q" "8" :string)
+           ("G" "8" :string)
            ("T" "8" :string)
-           ("J" "8" :string)
-           ("A" "8" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("f" "9" :string)
-           ("s" "9" :string)
-           ("z" "9" :string)
-           ("o" "9" :string)
-           ("j" "9" :string)
+           ("F" "8" :string)
+           ("K" "8" :string)
+           ("�" "9" :string)
            ("m" "9" :string)
+           ("w" "9" :string)
            ("a" "9" :string)
-           ("e" "9" :string)
-           ("r" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("p" "9" :string)
-           ("v" "9" :string)
+           ("�" "9" :string)
+           ("z" "9" :string)
+           ("l" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("u" "9" :string)
+           ("�" "9" :string)
            ("k" "9" :string)
+           ("y" "9" :string)
+           ("c" "9" :string)
            ("�" "9" :string)
-           ("i" "9" :string)
-           ("�" "9" :string)
+           ("v" "9" :string)
+           ("t" "9" :string)
            ("h" "9" :string)
-           ("�" "9" :string)
-           ("c" "9" :string)
-           ("l" "9" :string)
-           ("d" "9" :string)
+           ("�" "9" :string)
+           ("f" "9" :string)
            ("g" "9" :string)
+           ("�" "9" :string)
+           ("r" "9" :string)
+           ("d" "9" :string)
+           ("i" "9" :string)
+           ("j" "9" :string)
+           ("s" "9" :string)
            ("x" "9" :string)
-           ("y" "9" :string)
-           ("t" "9" :string)
-           ("q" "9" :string)
-           ("w" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
            ("b" "9" :string)
+           ("e" "9" :string)
+           ("p" "9" :string)
+           ("q" "9" :string)
+           ("o" "9" :string)
            ("n" "9" :string)
-           ("u" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
            ("�" "99" :string)
            ))
 
 (define-rule-set "it-ignore-special"
 
   :rules  (("'" "" :string)
+           ("?" "" :string)
            ("-" "" :string)
-           ("." "" :string)
            ("!" "" :string)
-           ("?" "" :string)
+           ("." "" :string)
            ))
 
 (define-rule-set "it-resolve-special"
@@ -273,78 +273,78 @@
   :rules  (("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("�" "�" :string)
-           ("b" "�" :string)
-           ("N" "�" :string)
-           ("q" "�" :string)
-           ("D" "�" :string)
-           ("w" "�" :string)
-           ("t" "�" :string)
-           ("y" "�" :string)
-           ("A" "�" :string)
-           ("�" "�" :string)
-           ("J" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("F" "�" :string)
+           ("p" "�" :string)
            ("T" "�" :string)
-           ("R" "�" :string)
            ("n" "�" :string)
-           ("Z" "�" :string)
-           ("u" "�" :string)
-           ("E" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("Q" "�" :string)
-           ("i" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("X" "�" :string)
-           ("x" "�" :string)
+           ("o" "�" :string)
+           ("K" "�" :string)
+           ("q" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("l" "�" :string)
-           ("d" "�" :string)
-           ("g" "�" :string)
+           ("G" "�" :string)
+           ("e" "�" :string)
+           ("Q" "�" :string)
+           ("b" "�" :string)
            ("�" "�" :string)
-           ("c" "�" :string)
-           ("L" "�" :string)
-           ("h" "�" :string)
-           ("M" "�" :string)
+           ("�" "�" :string)
+           ("s" "�" :string)
+           ("x" "�" :string)
+           ("Z" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("S" "�" :string)
-           ("p" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("I" "�" :string)
+           ("D" "�" :string)
+           ("�" "�" :string)
+           ("J" "�" :string)
+           ("H" "�" :string)
+           ("N" "�" :string)
+           ("U" "�" :string)
+           ("j" "�" :string)
+           ("i" "�" :string)
+           ("L" "�" :string)
+           ("d" "�" :string)
+           ("�" "�" :string)
            ("P" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("Y" "�" :string)
+           ("O" "�" :string)
+           ("h" "�" :string)
+           ("r" "�" :string)
+           ("�" "�" :string)
+           ("g" "�" :string)
+           ("f" "�" :string)
            ("W" "�" :string)
-           ("�" "�" :string)
-           ("K" "�" :string)
-           ("a" "�" :string)
            ("B" "�" :string)
-           ("r" "�" :string)
-           ("e" "�" :string)
+           ("y" "�" :string)
+           ("c" "�" :string)
+           ("�" "�" :string)
            ("k" "�" :string)
+           ("X" "�" :string)
            ("�" "�" :string)
+           ("t" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("v" "�" :string)
-           ("C" "�" :string)
-           ("Y" "�" :string)
-           ("z" "�" :string)
-           ("s" "�" :string)
-           ("�" "�" :string)
+           ("l" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("E" "�" :string)
            ("V" "�" :string)
-           ("�" "�" :string)
-           ("f" "�" :string)
-           ("O" "�" :string)
-           ("F" "�" :string)
-           ("G" "�" :string)
-           ("U" "�" :string)
+           ("M" "�" :string)
+           ("z" "�" :string)
+           ("�" "�" :string)
+           ("I" "�" :string)
+           ("u" "�" :string)
+           ("A" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("R" "�" :string)
+           ("a" "�" :string)
+           ("�" "�" :string)
+           ("C" "�" :string)
            ("m" "�" :string)
-           ("o" "�" :string)
-           ("j" "�" :string)
-           ("H" "�" :string)
+           ("w" "�" :string)
            ("�" "��" :string)
            ("-" "�" :string)
            ("'" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/italian/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/italian/utf8.xdy
index 3440edf31de..8fbbd9e6eb4 100644
--- a/Master/texmf-dist/xindy/modules/lang/italian/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/italian/utf8.xdy
@@ -32,41 +32,41 @@
 
   :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)
-           ("a" "�" :string)
+           ("Ú" "�" :string)
+           ("ú" "�" :string)
            ("A" "�" :string)
-           ("B" "�" :string)
+           ("a" "�" :string)
            ("b" "�" :string)
+           ("B" "�" :string)
            ("C" "�" :string)
            ("c" "�" :string)
            ("D" "�" :string)
            ("d" "�" :string)
            ("E" "�" :string)
            ("e" "�" :string)
-           ("F" "�" :string)
            ("f" "�" :string)
+           ("F" "�" :string)
            ("g" "�" :string)
            ("G" "�" :string)
-           ("H" "�" :string)
            ("h" "�" :string)
+           ("H" "�" :string)
            ("i" "�" :string)
            ("I" "�" :string)
            ("J" "�" :string)
@@ -81,271 +81,271 @@
            ("N" "�" :string)
            ("o" "�" :string)
            ("O" "�" :string)
-           ("p" "�" :string)
            ("P" "�" :string)
-           ("q" "�" :string)
+           ("p" "�" :string)
            ("Q" "�" :string)
+           ("q" "�" :string)
            ("r" "�" :string)
            ("R" "�" :string)
            ("S" "�" :string)
            ("s" "�" :string)
            ("t" "�" :string)
            ("T" "�" :string)
-           ("u" "�" :string)
            ("U" "�" :string)
+           ("u" "�" :string)
            ("V" "�" :string)
            ("v" "�" :string)
            ("w" "�" :string)
            ("W" "�" :string)
            ("X" "�" :string)
            ("x" "�" :string)
-           ("y" "�" :string)
            ("Y" "�" :string)
+           ("y" "�" :string)
            ("z" "�" :string)
            ("Z" "�" :string)
            ))
 
 (define-rule-set "it-resolve-diacritics"
 
-  :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)
-           ("U" "�" :string)
-           ("C" "�" :string)
-           ("D" "�" :string)
-           ("Q" "�" :string)
-           ("G" "�" :string)
-           ("H" "�" :string)
-           ("B" "�" :string)
-           ("k" "�" :string)
-           ("O" "�" :string)
-           ("r" "�" :string)
-           ("P" "�" :string)
-           ("W" "�" :string)
            ("Y" "�" :string)
-           ("M" "�" :string)
-           ("f" "�" :string)
-           ("x" "�" :string)
            ("R" "�" :string)
-           ("I" "�" :string)
-           ("s" "�" :string)
-           ("j" "�" :string)
-           ("m" "�" :string)
-           ("v" "�" :string)
-           ("c" "�" :string)
-           ("d" "�" :string)
-           ("h" "�" :string)
-           ("b" "�" :string)
+           ("X" "�" :string)
            ("e" "�" :string)
-           ("l" "�" :string)
+           ("S" "�" :string)
+           ("D" "�" :string)
            ("L" "�" :string)
+           ("i" "�" :string)
+           ("V" "�" :string)
+           ("G" "�" :string)
+           ("h" "�" :string)
+           ("U" "�" :string)
+           ("g" "�" :string)
            ("o" "�" :string)
-           ("F" "�" :string)
-           ("t" "�" :string)
-           ("a" "�" :string)
-           ("J" "�" :string)
+           ("M" "�" :string)
            ("w" "�" :string)
+           ("E" "�" :string)
+           ("r" "�" :string)
+           ("t" "�" :string)
+           ("b" "�" :string)
+           ("Q" "�" :string)
+           ("n" "�" :string)
            ("z" "�" :string)
+           ("A" "�" :string)
+           ("c" "�" :string)
+           ("a" "�" :string)
+           ("P" "�" :string)
+           ("p" "�" :string)
            ("y" "�" :string)
+           ("H" "�" :string)
+           ("O" "�" :string)
+           ("k" "�" :string)
+           ("j" "�" :string)
+           ("m" "�" :string)
+           ("u" "�" :string)
+           ("T" "�" :string)
+           ("x" "�" :string)
            ("Z" "�" :string)
-           ("n" "�" :string)
-           ("V" "�" :string)
-           ("A" "�" :string)
-           ("i" "�" :string)
-           ("X" "�" :string)
+           ("s" "�" :string)
+           ("I" "�" :string)
+           ("v" "�" :string)
+           ("C" "�" :string)
+           ("f" "�" :string)
+           ("q" "�" :string)
+           ("W" "�" :string)
+           ("l" "�" :string)
+           ("F" "�" :string)
+           ("B" "�" :string)
+           ("d" "�" :string)
            ("K" "�" :string)
-           ("T" "�" :string)
-           ("p" "�" :string)
-           ("S" "�" :string)
-           ("E" "�" :string)
            ("N" "�" :string)
-           ("q" "�" :string)
-           ("g" "�" :string)
-           ("u" "�" :string)
+           ("J" "�" :string)
            ))
 
 (define-rule-set "it-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)
+           ("Ì" "8" :string)
            ("É" "8" :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)
            ("ß" "99" :string)
+           ("L" "8" :string)
+           ("S" "8" :string)
+           ("D" "8" :string)
+           ("X" "8" :string)
            ("R" "8" :string)
-           ("I" "8" :string)
            ("Y" "8" :string)
-           ("M" "8" :string)
-           ("H" "8" :string)
-           ("G" "8" :string)
+           ("A" "8" :string)
            ("Q" "8" :string)
+           ("E" "8" :string)
+           ("M" "8" :string)
            ("U" "8" :string)
-           ("C" "8" :string)
-           ("D" "8" :string)
-           ("P" "8" :string)
-           ("W" "8" :string)
+           ("V" "8" :string)
+           ("G" "8" :string)
+           ("Z" "8" :string)
+           ("T" "8" :string)
            ("O" "8" :string)
+           ("P" "8" :string)
+           ("H" "8" :string)
+           ("J" "8" :string)
            ("B" "8" :string)
+           ("F" "8" :string)
            ("K" "8" :string)
-           ("X" "8" :string)
-           ("A" "8" :string)
-           ("S" "8" :string)
            ("N" "8" :string)
-           ("E" "8" :string)
-           ("T" "8" :string)
-           ("F" "8" :string)
-           ("L" "8" :string)
-           ("V" "8" :string)
-           ("Z" "8" :string)
-           ("J" "8" :string)
-           ("v" "9" :string)
-           ("c" "9" :string)
-           ("j" "9" :string)
-           ("m" "9" :string)
-           ("x" "9" :string)
-           ("s" "9" :string)
-           ("f" "9" :string)
+           ("W" "8" :string)
+           ("C" "8" :string)
+           ("I" "8" :string)
+           ("i" "9" :string)
            ("e" "9" :string)
+           ("n" "9" :string)
+           ("z" "9" :string)
+           ("t" "9" :string)
            ("b" "9" :string)
-           ("h" "9" :string)
-           ("d" "9" :string)
            ("r" "9" :string)
-           ("k" "9" :string)
-           ("i" "9" :string)
-           ("u" "9" :string)
-           ("g" "9" :string)
-           ("q" "9" :string)
-           ("p" "9" :string)
-           ("a" "9" :string)
            ("o" "9" :string)
-           ("t" "9" :string)
-           ("l" "9" :string)
-           ("n" "9" :string)
            ("w" "9" :string)
+           ("h" "9" :string)
+           ("g" "9" :string)
+           ("s" "9" :string)
+           ("x" "9" :string)
+           ("j" "9" :string)
+           ("m" "9" :string)
+           ("u" "9" :string)
+           ("k" "9" :string)
+           ("c" "9" :string)
+           ("a" "9" :string)
+           ("p" "9" :string)
            ("y" "9" :string)
-           ("z" "9" :string)
+           ("d" "9" :string)
+           ("l" "9" :string)
+           ("q" "9" :string)
+           ("f" "9" :string)
+           ("v" "9" :string)
            ))
 
 (define-rule-set "it-ignore-special"
 
-  :rules  (("." "" :string)
-           ("!" "" :string)
-           ("-" "" :string)
+  :rules  (("!" "" :string)
+           ("." "" :string)
            ("?" "" :string)
+           ("-" "" :string)
            ("'" "" :string)
            ))
 
 (define-rule-set "it-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)
-           ("W" "�" :string)
-           ("P" "�" :string)
-           ("O" "�" :string)
+           ("t" "�" :string)
+           ("b" "�" :string)
+           ("Q" "�" :string)
            ("r" "�" :string)
-           ("k" "�" :string)
-           ("B" "�" :string)
-           ("H" "�" :string)
-           ("G" "�" :string)
-           ("C" "�" :string)
+           ("A" "�" :string)
+           ("z" "�" :string)
+           ("n" "�" :string)
+           ("h" "�" :string)
            ("U" "�" :string)
+           ("g" "�" :string)
+           ("V" "�" :string)
+           ("G" "�" :string)
+           ("E" "�" :string)
+           ("o" "�" :string)
+           ("M" "�" :string)
+           ("w" "�" :string)
+           ("S" "�" :string)
            ("D" "�" :string)
-           ("Q" "�" :string)
            ("e" "�" :string)
-           ("b" "�" :string)
-           ("h" "�" :string)
+           ("L" "�" :string)
+           ("i" "�" :string)
+           ("Y" "�" :string)
+           ("X" "�" :string)
+           ("R" "�" :string)
+           ("F" "�" :string)
+           ("B" "�" :string)
            ("d" "�" :string)
-           ("c" "�" :string)
+           ("K" "�" :string)
+           ("N" "�" :string)
+           ("l" "�" :string)
+           ("J" "�" :string)
            ("v" "�" :string)
-           ("m" "�" :string)
-           ("j" "�" :string)
            ("I" "�" :string)
-           ("s" "�" :string)
-           ("R" "�" :string)
-           ("x" "�" :string)
-           ("M" "�" :string)
+           ("q" "�" :string)
+           ("W" "�" :string)
            ("f" "�" :string)
-           ("Y" "�" :string)
-           ("V" "�" :string)
-           ("n" "�" :string)
+           ("C" "�" :string)
            ("Z" "�" :string)
-           ("z" "�" :string)
-           ("y" "�" :string)
-           ("w" "�" :string)
-           ("J" "�" :string)
+           ("x" "�" :string)
+           ("s" "�" :string)
+           ("O" "�" :string)
+           ("k" "�" :string)
+           ("c" "�" :string)
+           ("P" "�" :string)
            ("a" "�" :string)
-           ("t" "�" :string)
-           ("F" "�" :string)
-           ("o" "�" :string)
-           ("L" "�" :string)
-           ("l" "�" :string)
-           ("q" "�" :string)
+           ("p" "�" :string)
+           ("H" "�" :string)
+           ("y" "�" :string)
+           ("j" "�" :string)
+           ("m" "�" :string)
            ("u" "�" :string)
-           ("g" "�" :string)
-           ("E" "�" :string)
-           ("N" "�" :string)
-           ("S" "�" :string)
            ("T" "�" :string)
-           ("p" "�" :string)
-           ("K" "�" :string)
-           ("X" "�" :string)
-           ("i" "�" :string)
-           ("A" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/klingon/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/klingon/utf8.xdy
index b74319ad3a5..87155b01757 100644
--- a/Master/texmf-dist/xindy/modules/lang/klingon/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/klingon/utf8.xdy
@@ -60,102 +60,102 @@
 
 (define-rule-set "k1-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)
            ))
 
 (define-rule-set "k1-resolve-case"
 
-  :rules  (("" "0" :string)
-           ("" "0" :string)
-           ("" "0" :string)
-           ("" "0" :string)
-           ("" "0" :string)
-           ("" "0" :string)
-           ("" "0" :string)
+  :rules  (("" "0" :string)
+           ("" "0" :string)
            ("" "0" :string)
-           ("" "0" :string)
-           ("" "0" :string)
+           ("" "0" :string)
            ("" "0" :string)
-           ("" "0" :string)
-           ("" "0" :string)
-           ("" "0" :string)
-           ("" "0" :string)
-           ("" "0" :string)
+           ("" "0" :string)
+           ("" "0" :string)
+           ("" "0" :string)
            ("" "0" :string)
            ("" "0" :string)
-           ("" "0" :string)
-           ("" "0" :string)
+           ("" "0" :string)
+           ("" "0" :string)
+           ("" "0" :string)
+           ("" "0" :string)
            ("" "0" :string)
-           ("" "0" :string)
+           ("" "0" :string)
+           ("" "0" :string)
            ("" "0" :string)
+           ("" "0" :string)
+           ("" "0" :string)
            ("" "0" :string)
+           ("" "0" :string)
            ("" "0" :string)
-           ("" "0" :string)
+           ("" "0" :string)
+           ("" "0" :string)
+           ("" "0" :string)
            ))
 
 (define-rule-set "k1-ignore-special"
 
-  :rules  (("}" "" :string)
+  :rules  (("-" "" :string)
+           ("}" "" :string)
+           ("." "" :string)
            ("{" "" :string)
            ("?" "" :string)
-           ("." "" :string)
-           ("-" "" :string)
            ("!" "" :string)
            ))
 
 (define-rule-set "k1-resolve-special"
 
-  :rules  (("" "�" :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)
diff --git a/Master/texmf-dist/xindy/modules/lang/kurdish/bedirxan-latin5.xdy b/Master/texmf-dist/xindy/modules/lang/kurdish/bedirxan-latin5.xdy
index ab045456401..57f105e0851 100644
--- a/Master/texmf-dist/xindy/modules/lang/kurdish/bedirxan-latin5.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/kurdish/bedirxan-latin5.xdy
@@ -34,10 +34,10 @@
 
 (define-rule-set "ku-alphabetize"
 
-  :rules  (("A" "�" :string)
-           ("a" "�" :string)
-           ("B" "�" :string)
+  :rules  (("a" "�" :string)
+           ("A" "�" :string)
            ("b" "�" :string)
+           ("B" "�" :string)
            ("c" "�" :string)
            ("C" "�" :string)
            ("�" "�" :string)
@@ -48,28 +48,28 @@
            ("e" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("F" "�" :string)
            ("f" "�" :string)
-           ("g" "�" :string)
+           ("F" "�" :string)
            ("G" "�" :string)
+           ("g" "�" :string)
            ("H" "�" :string)
            ("h" "�" :string)
-           ("I" "�" :string)
            ("i" "�" :string)
+           ("I" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("j" "�" :string)
            ("J" "�" :string)
-           ("k" "�" :string)
+           ("j" "�" :string)
            ("K" "�" :string)
+           ("k" "�" :string)
            ("L" "�" :string)
            ("l" "�" :string)
-           ("m" "�" :string)
            ("M" "�" :string)
-           ("N" "�" :string)
+           ("m" "�" :string)
            ("n" "�" :string)
-           ("O" "�" :string)
+           ("N" "�" :string)
            ("o" "�" :string)
+           ("O" "�" :string)
            ("P" "�" :string)
            ("p" "�" :string)
            ("R" "�" :string)
@@ -84,153 +84,153 @@
            ("U" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("V" "�" :string)
            ("v" "�" :string)
-           ("W" "�" :string)
+           ("V" "�" :string)
            ("w" "�" :string)
+           ("W" "�" :string)
            ("X" "�" :string)
            ("x" "�" :string)
            ("Y" "�" :string)
            ("y" "�" :string)
-           ("Z" "�" :string)
            ("z" "�" :string)
+           ("Z" "�" :string)
            ))
 
 (define-rule-set "ku-resolve-diacritics"
 
-  :rules  (("d" "�" :string)
-           ("c" "�" :string)
-           ("G" "�" :string)
-           ("H" "�" :string)
-           ("r" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("w" "�" :string)
-           ("e" "�" :string)
-           ("S" "�" :string)
-           ("�" "�" :string)
+  :rules  (("�" "�" :string)
            ("n" "�" :string)
-           ("D" "�" :string)
-           ("y" "�" :string)
-           ("f" "�" :string)
-           ("h" "�" :string)
-           ("M" "�" :string)
-           ("C" "�" :string)
-           ("U" "�" :string)
+           ("t" "�" :string)
+           ("�" "�" :string)
+           ("z" "�" :string)
+           ("u" "�" :string)
+           ("o" "�" :string)
+           ("K" "�" :string)
+           ("J" "�" :string)
+           ("j" "�" :string)
+           ("S" "�" :string)
            ("s" "�" :string)
+           ("�" "�" :string)
+           ("M" "�" :string)
+           ("L" "�" :string)
+           ("T" "�" :string)
+           ("b" "�" :string)
+           ("�" "�" :string)
+           ("R" "�" :string)
+           ("l" "�" :string)
+           ("r" "�" :string)
+           ("d" "�" :string)
+           ("c" "�" :string)
+           ("v" "�" :string)
            ("V" "�" :string)
+           ("�" "�" :string)
+           ("f" "�" :string)
+           ("Y" "�" :string)
            ("i" "�" :string)
-           ("I" "�" :string)
-           ("�" "�" :string)
-           ("W" "�" :string)
-           ("t" "�" :string)
-           ("E" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("a" "�" :string)
            ("x" "�" :string)
-           ("J" "�" :string)
-           ("K" "�" :string)
-           ("v" "�" :string)
+           ("G" "�" :string)
+           ("y" "�" :string)
+           ("O" "�" :string)
+           ("p" "�" :string)
+           ("N" "�" :string)
+           ("�" "�" :string)
+           ("H" "�" :string)
            ("g" "�" :string)
-           ("u" "�" :string)
-           ("l" "�" :string)
-           ("o" "�" :string)
-           ("m" "�" :string)
-           ("R" "�" :string)
-           ("b" "�" :string)
+           ("A" "�" :string)
            ("�" "�" :string)
+           ("m" "�" :string)
+           ("U" "�" :string)
+           ("B" "�" :string)
+           ("D" "�" :string)
+           ("�" "�" :string)
+           ("W" "�" :string)
+           ("h" "�" :string)
            ("X" "�" :string)
-           ("T" "�" :string)
-           ("k" "�" :string)
-           ("N" "�" :string)
            ("�" "�" :string)
-           ("a" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("F" "�" :string)
-           ("Y" "�" :string)
-           ("A" "�" :string)
-           ("L" "�" :string)
-           ("P" "�" :string)
-           ("O" "�" :string)
-           ("z" "�" :string)
            ("Z" "�" :string)
-           ("B" "�" :string)
-           ("p" "�" :string)
-           ("j" "�" :string)
+           ("w" "�" :string)
+           ("E" "�" :string)
+           ("P" "�" :string)
+           ("I" "�" :string)
+           ("C" "�" :string)
+           ("F" "�" :string)
+           ("k" "�" :string)
+           ("e" "�" :string)
            ))
 
 (define-rule-set "ku-resolve-case"
 
-  :rules  (("�" "8" :string)
-           ("�" "8" :string)
+  :rules  (("Y" "8" :string)
+           ("V" "8" :string)
+           ("�" "8" :string)
+           ("T" "8" :string)
+           ("L" "8" :string)
+           ("R" "8" :string)
            ("S" "8" :string)
-           ("H" "8" :string)
-           ("G" "8" :string)
+           ("�" "8" :string)
            ("M" "8" :string)
-           ("U" "8" :string)
+           ("K" "8" :string)
+           ("J" "8" :string)
+           ("�" "8" :string)
            ("C" "8" :string)
-           ("D" "8" :string)
+           ("F" "8" :string)
+           ("E" "8" :string)
            ("I" "8" :string)
-           ("�" "8" :string)
-           ("V" "8" :string)
-           ("J" "8" :string)
-           ("K" "8" :string)
+           ("P" "8" :string)
+           ("X" "8" :string)
+           ("Z" "8" :string)
+           ("U" "8" :string)
+           ("D" "8" :string)
+           ("B" "8" :string)
            ("W" "8" :string)
            ("�" "8" :string)
-           ("E" "8" :string)
-           ("X" "8" :string)
-           ("T" "8" :string)
-           ("R" "8" :string)
            ("N" "8" :string)
+           ("H" "8" :string)
            ("A" "8" :string)
-           ("L" "8" :string)
-           ("P" "8" :string)
-           ("�" "8" :string)
-           ("Y" "8" :string)
-           ("F" "8" :string)
            ("O" "8" :string)
-           ("Z" "8" :string)
-           ("B" "8" :string)
-           ("w" "9" :string)
-           ("e" "9" :string)
+           ("�" "8" :string)
+           ("G" "8" :string)
+           ("i" "9" :string)
+           ("f" "9" :string)
+           ("v" "9" :string)
+           ("r" "9" :string)
            ("d" "9" :string)
            ("c" "9" :string)
-           ("r" "9" :string)
-           ("h" "9" :string)
+           ("b" "9" :string)
+           ("�" "9" :string)
+           ("l" "9" :string)
+           ("j" "9" :string)
            ("s" "9" :string)
-           ("n" "9" :string)
-           ("�" "9" :string)
-           ("f" "9" :string)
-           ("y" "9" :string)
-           ("i" "9" :string)
-           ("x" "9" :string)
+           ("o" "9" :string)
            ("u" "9" :string)
-           ("g" "9" :string)
-           ("v" "9" :string)
+           ("�" "9" :string)
+           ("n" "9" :string)
            ("t" "9" :string)
+           ("z" "9" :string)
            ("k" "9" :string)
-           ("m" "9" :string)
-           ("o" "9" :string)
-           ("l" "9" :string)
-           ("�" "9" :string)
-           ("b" "9" :string)
+           ("e" "9" :string)
+           ("w" "9" :string)
            ("�" "9" :string)
-           ("a" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
+           ("�" "9" :string)
+           ("m" "9" :string)
+           ("h" "9" :string)
+           ("�" "9" :string)
+           ("g" "9" :string)
+           ("y" "9" :string)
            ("p" "9" :string)
-           ("j" "9" :string)
-           ("z" "9" :string)
+           ("x" "9" :string)
+           ("a" "9" :string)
            ))
 
 (define-rule-set "ku-ignore-special"
 
   :rules  (("'" "" :string)
-           ("-" "" :string)
-           ("!" "" :string)
-           ("?" "" :string)
            ("." "" :string)
+           ("?" "" :string)
+           ("!" "" :string)
+           ("-" "" :string)
            ))
 
 (define-rule-set "ku-resolve-special"
@@ -238,66 +238,66 @@
   :rules  (("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
+           ("P" "�" :string)
+           ("I" "�" :string)
+           ("C" "�" :string)
+           ("k" "�" :string)
+           ("e" "�" :string)
+           ("�" "�" :string)
            ("N" "�" :string)
-           ("a" "�" :string)
-           ("l" "�" :string)
+           ("H" "�" :string)
+           ("g" "�" :string)
            ("�" "�" :string)
-           ("b" "�" :string)
-           ("R" "�" :string)
-           ("k" "�" :string)
-           ("O" "�" :string)
-           ("Z" "�" :string)
-           ("p" "�" :string)
-           ("j" "�" :string)
-           ("�" "�" :string)
-           ("Y" "�" :string)
-           ("F" "�" :string)
-           ("A" "�" :string)
-           ("L" "�" :string)
-           ("�" "�" :string)
-           ("f" "�" :string)
-           ("M" "�" :string)
            ("h" "�" :string)
-           ("s" "�" :string)
-           ("C" "�" :string)
-           ("c" "�" :string)
-           ("r" "�" :string)
            ("W" "�" :string)
            ("�" "�" :string)
-           ("t" "�" :string)
-           ("J" "�" :string)
-           ("u" "�" :string)
+           ("G" "�" :string)
+           ("p" "�" :string)
            ("v" "�" :string)
-           ("g" "�" :string)
-           ("V" "�" :string)
-           ("i" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("o" "�" :string)
-           ("m" "�" :string)
-           ("X" "�" :string)
+           ("Y" "�" :string)
            ("T" "�" :string)
-           ("z" "�" :string)
-           ("B" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("P" "�" :string)
+           ("�" "�" :string)
+           ("R" "�" :string)
+           ("r" "�" :string)
+           ("c" "�" :string)
+           ("d" "�" :string)
+           ("o" "�" :string)
+           ("K" "�" :string)
+           ("s" "�" :string)
+           ("S" "�" :string)
+           ("j" "�" :string)
+           ("�" "�" :string)
+           ("M" "�" :string)
            ("n" "�" :string)
-           ("y" "�" :string)
+           ("u" "�" :string)
+           ("E" "�" :string)
+           ("F" "�" :string)
+           ("X" "�" :string)
+           ("Z" "�" :string)
+           ("w" "�" :string)
+           ("�" "�" :string)
+           ("A" "�" :string)
            ("D" "�" :string)
+           ("B" "�" :string)
+           ("m" "�" :string)
            ("U" "�" :string)
-           ("d" "�" :string)
-           ("H" "�" :string)
-           ("G" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("S" "�" :string)
-           ("w" "�" :string)
-           ("e" "�" :string)
-           ("E" "�" :string)
-           ("K" "�" :string)
+           ("a" "�" :string)
            ("x" "�" :string)
-           ("I" "�" :string)
+           ("y" "�" :string)
+           ("O" "�" :string)
+           ("�" "�" :string)
+           ("V" "�" :string)
+           ("f" "�" :string)
+           ("i" "�" :string)
+           ("L" "�" :string)
+           ("b" "�" :string)
+           ("l" "�" :string)
+           ("J" "�" :string)
+           ("�" "�" :string)
+           ("t" "�" :string)
+           ("�" "�" :string)
+           ("z" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/kurdish/bedirxan-utf8.xdy b/Master/texmf-dist/xindy/modules/lang/kurdish/bedirxan-utf8.xdy
index f0091d1af5a..c0349f562a0 100644
--- a/Master/texmf-dist/xindy/modules/lang/kurdish/bedirxan-utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/kurdish/bedirxan-utf8.xdy
@@ -36,26 +36,26 @@
 
   :rules  (("Ç" "�" :string)
            ("ç" "�" :string)
-           ("Ê" "�" :string)
            ("ê" "�" :string)
+           ("Ê" "�" :string)
            ("î" "�" :string)
            ("Î" "�" :string)
-           ("Ş" "�" :string)
            ("ş" "�" :string)
+           ("Ş" "�" :string)
            ("û" "�" :string)
            ("Û" "�" :string)
-           ("a" "�" :string)
            ("A" "�" :string)
+           ("a" "�" :string)
            ("b" "�" :string)
            ("B" "�" :string)
            ("C" "�" :string)
            ("c" "�" :string)
-           ("D" "�" :string)
            ("d" "�" :string)
-           ("e" "�" :string)
+           ("D" "�" :string)
            ("E" "�" :string)
-           ("f" "�" :string)
+           ("e" "�" :string)
            ("F" "�" :string)
+           ("f" "�" :string)
            ("g" "�" :string)
            ("G" "�" :string)
            ("h" "�" :string)
@@ -68,236 +68,236 @@
            ("K" "�" :string)
            ("L" "�" :string)
            ("l" "�" :string)
-           ("M" "�" :string)
            ("m" "�" :string)
+           ("M" "�" :string)
            ("N" "�" :string)
            ("n" "�" :string)
            ("O" "�" :string)
            ("o" "�" :string)
            ("p" "�" :string)
            ("P" "�" :string)
-           ("r" "�" :string)
            ("R" "�" :string)
-           ("S" "�" :string)
+           ("r" "�" :string)
            ("s" "�" :string)
-           ("T" "�" :string)
+           ("S" "�" :string)
            ("t" "�" :string)
+           ("T" "�" :string)
            ("U" "�" :string)
            ("u" "�" :string)
-           ("v" "�" :string)
            ("V" "�" :string)
+           ("v" "�" :string)
            ("W" "�" :string)
            ("w" "�" :string)
            ("X" "�" :string)
            ("x" "�" :string)
-           ("y" "�" :string)
            ("Y" "�" :string)
+           ("y" "�" :string)
            ("z" "�" :string)
            ("Z" "�" :string)
            ))
 
 (define-rule-set "ku-resolve-diacritics"
 
-  :rules  (("Ê" "�" :string)
-           ("Ç" "�" :string)
-           ("Ş" "�" :string)
-           ("ê" "�" :string)
+  :rules  (("Î" "�" :string)
+           ("Ê" "�" :string)
            ("Û" "�" :string)
-           ("ç" "�" :string)
-           ("Î" "�" :string)
-           ("î" "�" :string)
            ("û" "�" :string)
+           ("Ş" "�" :string)
+           ("î" "�" :string)
+           ("ç" "�" :string)
            ("ş" "�" :string)
-           ("k" "�" :string)
-           ("O" "�" :string)
+           ("Ç" "�" :string)
+           ("ê" "�" :string)
            ("M" "�" :string)
-           ("p" "�" :string)
-           ("b" "�" :string)
-           ("C" "�" :string)
-           ("j" "�" :string)
-           ("D" "�" :string)
-           ("z" "�" :string)
-           ("l" "�" :string)
-           ("a" "�" :string)
-           ("G" "�" :string)
-           ("Y" "�" :string)
-           ("d" "�" :string)
-           ("h" "�" :string)
-           ("g" "�" :string)
-           ("K" "�" :string)
+           ("H" "�" :string)
+           ("o" "�" :string)
+           ("Z" "�" :string)
+           ("y" "�" :string)
+           ("i" "�" :string)
+           ("P" "�" :string)
+           ("v" "�" :string)
+           ("u" "�" :string)
+           ("T" "�" :string)
            ("r" "�" :string)
-           ("W" "�" :string)
-           ("X" "�" :string)
-           ("U" "�" :string)
+           ("w" "�" :string)
+           ("J" "�" :string)
+           ("k" "�" :string)
+           ("B" "�" :string)
            ("I" "�" :string)
+           ("K" "�" :string)
+           ("d" "�" :string)
+           ("h" "�" :string)
+           ("z" "�" :string)
+           ("D" "�" :string)
            ("L" "�" :string)
-           ("y" "�" :string)
-           ("E" "�" :string)
-           ("n" "�" :string)
-           ("S" "�" :string)
-           ("V" "�" :string)
+           ("l" "�" :string)
+           ("X" "�" :string)
+           ("W" "�" :string)
+           ("x" "�" :string)
+           ("g" "�" :string)
            ("f" "�" :string)
-           ("u" "�" :string)
            ("R" "�" :string)
-           ("i" "�" :string)
-           ("H" "�" :string)
+           ("t" "�" :string)
+           ("V" "�" :string)
+           ("a" "�" :string)
+           ("G" "�" :string)
+           ("S" "�" :string)
+           ("A" "�" :string)
+           ("n" "�" :string)
+           ("E" "�" :string)
            ("N" "�" :string)
-           ("w" "�" :string)
-           ("v" "�" :string)
+           ("p" "�" :string)
+           ("s" "�" :string)
+           ("F" "�" :string)
+           ("Y" "�" :string)
+           ("b" "�" :string)
            ("e" "�" :string)
-           ("A" "�" :string)
-           ("Z" "�" :string)
-           ("B" "�" :string)
+           ("U" "�" :string)
+           ("O" "�" :string)
            ("m" "�" :string)
-           ("t" "�" :string)
-           ("J" "�" :string)
-           ("s" "�" :string)
-           ("T" "�" :string)
+           ("C" "�" :string)
+           ("j" "�" :string)
            ("c" "�" :string)
-           ("P" "�" :string)
-           ("o" "�" :string)
-           ("F" "�" :string)
-           ("x" "�" :string)
            ))
 
 (define-rule-set "ku-resolve-case"
 
-  :rules  (("Î" "8" :string)
-           ("Û" "8" :string)
-           ("Ç" "8" :string)
+  :rules  (("Ç" "8" :string)
            ("Ş" "8" :string)
            ("Ê" "8" :string)
+           ("Û" "8" :string)
+           ("Î" "8" :string)
+           ("ê" "9" :string)
            ("ş" "9" :string)
-           ("û" "9" :string)
            ("ç" "9" :string)
            ("î" "9" :string)
-           ("ê" "9" :string)
-           ("T" "8" :string)
-           ("P" "8" :string)
-           ("F" "8" :string)
-           ("J" "8" :string)
-           ("A" "8" :string)
-           ("Z" "8" :string)
-           ("B" "8" :string)
+           ("û" "9" :string)
+           ("U" "8" :string)
+           ("O" "8" :string)
+           ("C" "8" :string)
+           ("E" "8" :string)
            ("N" "8" :string)
-           ("R" "8" :string)
-           ("H" "8" :string)
+           ("F" "8" :string)
+           ("Y" "8" :string)
            ("V" "8" :string)
            ("S" "8" :string)
-           ("E" "8" :string)
+           ("G" "8" :string)
+           ("A" "8" :string)
+           ("R" "8" :string)
            ("W" "8" :string)
            ("X" "8" :string)
-           ("I" "8" :string)
-           ("U" "8" :string)
+           ("D" "8" :string)
            ("L" "8" :string)
            ("K" "8" :string)
-           ("G" "8" :string)
-           ("Y" "8" :string)
-           ("D" "8" :string)
-           ("C" "8" :string)
+           ("I" "8" :string)
+           ("B" "8" :string)
+           ("J" "8" :string)
+           ("T" "8" :string)
+           ("Z" "8" :string)
+           ("P" "8" :string)
            ("M" "8" :string)
-           ("O" "8" :string)
-           ("x" "9" :string)
-           ("s" "9" :string)
+           ("H" "8" :string)
+           ("j" "9" :string)
            ("c" "9" :string)
-           ("o" "9" :string)
-           ("t" "9" :string)
            ("m" "9" :string)
-           ("w" "9" :string)
-           ("v" "9" :string)
+           ("b" "9" :string)
            ("e" "9" :string)
-           ("u" "9" :string)
-           ("i" "9" :string)
-           ("f" "9" :string)
            ("n" "9" :string)
-           ("y" "9" :string)
-           ("r" "9" :string)
-           ("d" "9" :string)
-           ("h" "9" :string)
-           ("g" "9" :string)
-           ("l" "9" :string)
+           ("p" "9" :string)
+           ("s" "9" :string)
            ("a" "9" :string)
-           ("j" "9" :string)
+           ("f" "9" :string)
+           ("t" "9" :string)
+           ("x" "9" :string)
+           ("g" "9" :string)
            ("z" "9" :string)
-           ("p" "9" :string)
-           ("b" "9" :string)
+           ("h" "9" :string)
+           ("l" "9" :string)
+           ("d" "9" :string)
            ("k" "9" :string)
+           ("v" "9" :string)
+           ("u" "9" :string)
+           ("r" "9" :string)
+           ("w" "9" :string)
+           ("o" "9" :string)
+           ("y" "9" :string)
+           ("i" "9" :string)
            ))
 
 (define-rule-set "ku-ignore-special"
 
-  :rules  (("-" "" :string)
-           ("!" "" :string)
+  :rules  (("?" "" :string)
            ("'" "" :string)
-           ("?" "" :string)
+           ("-" "" :string)
            ("." "" :string)
+           ("!" "" :string)
            ))
 
 (define-rule-set "ku-resolve-special"
 
-  :rules  (("Û" "�" :string)
-           ("Î" "�" :string)
+  :rules  (("Ş" "�" :string)
+           ("Û" "�" :string)
            ("û" "�" :string)
-           ("Ş" "�" :string)
-           ("Ç" "�" :string)
-           ("ê" "�" :string)
-           ("î" "�" :string)
            ("ç" "�" :string)
+           ("î" "�" :string)
+           ("ê" "�" :string)
+           ("Ç" "�" :string)
            ("ş" "�" :string)
            ("Ê" "�" :string)
+           ("Î" "�" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("f" "�" :string)
            ("S" "�" :string)
+           ("A" "�" :string)
            ("V" "�" :string)
-           ("H" "�" :string)
-           ("i" "�" :string)
            ("R" "�" :string)
-           ("u" "�" :string)
-           ("v" "�" :string)
-           ("Z" "�" :string)
-           ("J" "�" :string)
-           ("T" "�" :string)
+           ("f" "�" :string)
+           ("g" "�" :string)
            ("c" "�" :string)
-           ("o" "�" :string)
-           ("x" "�" :string)
-           ("O" "�" :string)
+           ("C" "�" :string)
+           ("m" "�" :string)
            ("b" "�" :string)
            ("Y" "�" :string)
-           ("l" "�" :string)
-           ("g" "�" :string)
-           ("h" "�" :string)
-           ("K" "�" :string)
-           ("L" "�" :string)
-           ("U" "�" :string)
-           ("I" "�" :string)
-           ("W" "�" :string)
-           ("X" "�" :string)
-           ("n" "�" :string)
-           ("E" "�" :string)
-           ("e" "�" :string)
-           ("N" "�" :string)
-           ("w" "�" :string)
-           ("B" "�" :string)
-           ("m" "�" :string)
-           ("A" "�" :string)
-           ("t" "�" :string)
-           ("P" "�" :string)
-           ("F" "�" :string)
            ("s" "�" :string)
-           ("k" "�" :string)
+           ("N" "�" :string)
+           ("n" "�" :string)
+           ("J" "�" :string)
+           ("T" "�" :string)
+           ("u" "�" :string)
+           ("i" "�" :string)
+           ("o" "�" :string)
+           ("Z" "�" :string)
            ("M" "�" :string)
-           ("C" "�" :string)
-           ("p" "�" :string)
+           ("L" "�" :string)
+           ("h" "�" :string)
            ("z" "�" :string)
            ("D" "�" :string)
-           ("j" "�" :string)
+           ("k" "�" :string)
            ("G" "�" :string)
            ("a" "�" :string)
-           ("d" "�" :string)
+           ("t" "�" :string)
+           ("x" "�" :string)
+           ("W" "�" :string)
+           ("X" "�" :string)
+           ("j" "�" :string)
+           ("O" "�" :string)
+           ("U" "�" :string)
+           ("e" "�" :string)
+           ("F" "�" :string)
+           ("p" "�" :string)
+           ("E" "�" :string)
+           ("w" "�" :string)
            ("r" "�" :string)
+           ("v" "�" :string)
            ("y" "�" :string)
+           ("P" "�" :string)
+           ("H" "�" :string)
+           ("l" "�" :string)
+           ("d" "�" :string)
+           ("K" "�" :string)
+           ("I" "�" :string)
+           ("B" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/kurdish/turkish-i-latin5.xdy b/Master/texmf-dist/xindy/modules/lang/kurdish/turkish-i-latin5.xdy
index 4f0dc09cdab..71eb869d321 100644
--- a/Master/texmf-dist/xindy/modules/lang/kurdish/turkish-i-latin5.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/kurdish/turkish-i-latin5.xdy
@@ -38,20 +38,20 @@
            ("a" "�" :string)
            ("B" "�" :string)
            ("b" "�" :string)
-           ("C" "�" :string)
            ("c" "�" :string)
+           ("C" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("D" "�" :string)
            ("d" "�" :string)
+           ("D" "�" :string)
            ("e" "�" :string)
            ("E" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("f" "�" :string)
+           ("�" "�" :string)
            ("F" "�" :string)
-           ("G" "�" :string)
+           ("f" "�" :string)
            ("g" "�" :string)
+           ("G" "�" :string)
            ("H" "�" :string)
            ("h" "�" :string)
            ("I" "�" :string)
@@ -60,12 +60,12 @@
            ("�" "�" :string)
            ("J" "�" :string)
            ("j" "�" :string)
-           ("K" "�" :string)
            ("k" "�" :string)
+           ("K" "�" :string)
            ("l" "�" :string)
            ("L" "�" :string)
-           ("m" "�" :string)
            ("M" "�" :string)
+           ("m" "�" :string)
            ("N" "�" :string)
            ("n" "�" :string)
            ("O" "�" :string)
@@ -76,160 +76,160 @@
            ("R" "�" :string)
            ("S" "�" :string)
            ("s" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("t" "�" :string)
            ("T" "�" :string)
-           ("u" "�" :string)
            ("U" "�" :string)
-           ("�" "�" :string)
+           ("u" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("v" "�" :string)
            ("V" "�" :string)
            ("w" "�" :string)
            ("W" "�" :string)
            ("x" "�" :string)
            ("X" "�" :string)
-           ("Y" "�" :string)
            ("y" "�" :string)
+           ("Y" "�" :string)
            ("Z" "�" :string)
            ("z" "�" :string)
            ))
 
 (define-rule-set "ku-resolve-diacritics"
 
-  :rules  (("m" "�" :string)
-           ("v" "�" :string)
-           ("u" "�" :string)
-           ("G" "�" :string)
+  :rules  (("K" "�" :string)
+           ("w" "�" :string)
+           ("m" "�" :string)
+           ("�" "�" :string)
+           ("i" "�" :string)
            ("x" "�" :string)
-           ("O" "�" :string)
-           ("S" "�" :string)
-           ("I" "�" :string)
            ("F" "�" :string)
-           ("h" "�" :string)
-           ("y" "�" :string)
-           ("k" "�" :string)
-           ("t" "�" :string)
-           ("f" "�" :string)
-           ("Y" "�" :string)
-           ("N" "�" :string)
-           ("C" "�" :string)
-           ("e" "�" :string)
-           ("K" "�" :string)
-           ("Z" "�" :string)
-           ("H" "�" :string)
-           ("E" "�" :string)
-           ("r" "�" :string)
-           ("z" "�" :string)
-           ("D" "�" :string)
-           ("�" "�" :string)
-           ("B" "�" :string)
-           ("W" "�" :string)
-           ("d" "�" :string)
-           ("X" "�" :string)
-           ("i" "�" :string)
-           ("R" "�" :string)
-           ("j" "�" :string)
-           ("�" "�" :string)
-           ("a" "�" :string)
-           ("g" "�" :string)
            ("U" "�" :string)
-           ("�" "�" :string)
-           ("c" "�" :string)
+           ("O" "�" :string)
+           ("d" "�" :string)
+           ("G" "�" :string)
            ("M" "�" :string)
-           ("P" "�" :string)
-           ("V" "�" :string)
-           ("b" "�" :string)
-           ("p" "�" :string)
-           ("�" "�" :string)
-           ("J" "�" :string)
-           ("L" "�" :string)
-           ("n" "�" :string)
+           ("A" "�" :string)
+           ("k" "�" :string)
+           ("g" "�" :string)
            ("l" "�" :string)
-           ("w" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("y" "�" :string)
            ("T" "�" :string)
-           ("�" "�" :string)
-           ("s" "�" :string)
+           ("a" "�" :string)
+           ("e" "�" :string)
+           ("N" "�" :string)
            ("�" "�" :string)
+           ("J" "�" :string)
+           ("S" "�" :string)
+           ("v" "�" :string)
+           ("t" "�" :string)
            ("�" "�" :string)
-           ("o" "�" :string)
            ("�" "�" :string)
+           ("V" "�" :string)
+           ("c" "�" :string)
+           ("E" "�" :string)
+           ("I" "�" :string)
+           ("n" "�" :string)
+           ("s" "�" :string)
            ("�" "�" :string)
-           ("A" "�" :string)
+           ("�" "�" :string)
+           ("o" "�" :string)
+           ("p" "�" :string)
+           ("j" "�" :string)
+           ("B" "�" :string)
+           ("b" "�" :string)
+           ("X" "�" :string)
+           ("z" "�" :string)
+           ("L" "�" :string)
+           ("Y" "�" :string)
+           ("R" "�" :string)
+           ("u" "�" :string)
+           ("h" "�" :string)
+           ("H" "�" :string)
+           ("P" "�" :string)
+           ("�" "�" :string)
+           ("W" "�" :string)
+           ("f" "�" :string)
+           ("D" "�" :string)
+           ("C" "�" :string)
+           ("r" "�" :string)
+           ("Z" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ))
 
 (define-rule-set "ku-resolve-case"
 
-  :rules  (("M" "8" :string)
-           ("V" "8" :string)
-           ("P" "8" :string)
-           ("U" "8" :string)
-           ("�" "8" :string)
+  :rules  (("H" "8" :string)
+           ("Y" "8" :string)
            ("R" "8" :string)
-           ("�" "8" :string)
            ("W" "8" :string)
+           ("P" "8" :string)
            ("X" "8" :string)
+           ("L" "8" :string)
+           ("�" "8" :string)
+           ("D" "8" :string)
+           ("Z" "8" :string)
+           ("C" "8" :string)
+           ("I" "8" :string)
            ("�" "8" :string)
+           ("V" "8" :string)
+           ("E" "8" :string)
+           ("�" "8" :string)
+           ("B" "8" :string)
            ("�" "8" :string)
-           ("A" "8" :string)
+           ("N" "8" :string)
+           ("�" "8" :string)
            ("T" "8" :string)
-           ("L" "8" :string)
-           ("�" "8" :string)
            ("J" "8" :string)
-           ("O" "8" :string)
            ("S" "8" :string)
-           ("I" "8" :string)
+           ("O" "8" :string)
+           ("U" "8" :string)
            ("F" "8" :string)
-           ("G" "8" :string)
-           ("B" "8" :string)
-           ("E" "8" :string)
-           ("D" "8" :string)
-           ("H" "8" :string)
-           ("Y" "8" :string)
-           ("N" "8" :string)
-           ("C" "8" :string)
            ("K" "8" :string)
-           ("Z" "8" :string)
-           ("c" "9" :string)
-           ("b" "9" :string)
-           ("g" "9" :string)
-           ("a" "9" :string)
-           ("j" "9" :string)
-           ("d" "9" :string)
-           ("i" "9" :string)
-           ("s" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("o" "9" :string)
-           ("�" "9" :string)
+           ("A" "8" :string)
+           ("M" "8" :string)
+           ("G" "8" :string)
+           ("u" "9" :string)
+           ("h" "9" :string)
            ("�" "9" :string)
+           ("b" "9" :string)
+           ("z" "9" :string)
+           ("f" "9" :string)
+           ("�" "9" :string)
+           ("r" "9" :string)
            ("n" "9" :string)
-           ("l" "9" :string)
-           ("w" "9" :string)
+           ("c" "9" :string)
            ("p" "9" :string)
-           ("h" "9" :string)
+           ("o" "9" :string)
+           ("j" "9" :string)
+           ("s" "9" :string)
+           ("a" "9" :string)
+           ("e" "9" :string)
            ("y" "9" :string)
-           ("k" "9" :string)
+           ("�" "9" :string)
+           ("v" "9" :string)
            ("t" "9" :string)
-           ("f" "9" :string)
-           ("u" "9" :string)
+           ("�" "9" :string)
            ("x" "9" :string)
            ("m" "9" :string)
-           ("v" "9" :string)
-           ("�" "9" :string)
-           ("r" "9" :string)
-           ("z" "9" :string)
-           ("e" "9" :string)
+           ("w" "9" :string)
+           ("�" "9" :string)
+           ("i" "9" :string)
+           ("k" "9" :string)
+           ("g" "9" :string)
+           ("l" "9" :string)
+           ("d" "9" :string)
            ))
 
 (define-rule-set "ku-ignore-special"
 
-  :rules  (("." "" :string)
-           ("?" "" :string)
+  :rules  (("?" "" :string)
            ("'" "" :string)
            ("-" "" :string)
+           ("." "" :string)
            ("!" "" :string)
            ))
 
@@ -238,66 +238,66 @@
   :rules  (("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("h" "�" :string)
-           ("k" "�" :string)
-           ("S" "�" :string)
-           ("G" "�" :string)
-           ("u" "�" :string)
-           ("�" "�" :string)
+           ("X" "�" :string)
+           ("L" "�" :string)
            ("z" "�" :string)
-           ("e" "�" :string)
-           ("K" "�" :string)
-           ("N" "�" :string)
-           ("M" "�" :string)
-           ("V" "�" :string)
-           ("c" "�" :string)
-           ("�" "�" :string)
-           ("g" "�" :string)
-           ("a" "�" :string)
+           ("h" "�" :string)
+           ("H" "�" :string)
            ("R" "�" :string)
-           ("X" "�" :string)
-           ("i" "�" :string)
            ("W" "�" :string)
-           ("d" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("T" "�" :string)
-           ("w" "�" :string)
-           ("L" "�" :string)
-           ("l" "�" :string)
-           ("J" "�" :string)
+           ("�" "�" :string)
+           ("P" "�" :string)
+           ("D" "�" :string)
+           ("C" "�" :string)
+           ("V" "�" :string)
+           ("I" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("j" "�" :string)
            ("y" "�" :string)
+           ("T" "�" :string)
+           ("�" "�" :string)
+           ("S" "�" :string)
            ("t" "�" :string)
+           ("w" "�" :string)
+           ("i" "�" :string)
+           ("U" "�" :string)
+           ("d" "�" :string)
+           ("M" "�" :string)
+           ("A" "�" :string)
+           ("b" "�" :string)
+           ("u" "�" :string)
+           ("Y" "�" :string)
            ("f" "�" :string)
-           ("F" "�" :string)
-           ("I" "�" :string)
-           ("O" "�" :string)
-           ("x" "�" :string)
-           ("m" "�" :string)
-           ("v" "�" :string)
-           ("B" "�" :string)
-           ("D" "�" :string)
-           ("E" "�" :string)
-           ("r" "�" :string)
-           ("H" "�" :string)
-           ("C" "�" :string)
+           ("�" "�" :string)
            ("Z" "�" :string)
-           ("Y" "�" :string)
-           ("P" "�" :string)
-           ("b" "�" :string)
-           ("U" "�" :string)
-           ("j" "�" :string)
+           ("r" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("A" "�" :string)
-           ("s" "�" :string)
-           ("o" "�" :string)
-           ("�" "�" :string)
+           ("E" "�" :string)
+           ("c" "�" :string)
            ("n" "�" :string)
+           ("s" "�" :string)
            ("p" "�" :string)
-           ("�" "�" :string)
+           ("o" "�" :string)
+           ("B" "�" :string)
+           ("�" "�" :string)
+           ("a" "�" :string)
+           ("N" "�" :string)
+           ("e" "�" :string)
+           ("J" "�" :string)
+           ("�" "�" :string)
+           ("v" "�" :string)
+           ("K" "�" :string)
+           ("m" "�" :string)
+           ("�" "�" :string)
+           ("x" "�" :string)
+           ("F" "�" :string)
+           ("O" "�" :string)
+           ("G" "�" :string)
+           ("g" "�" :string)
+           ("k" "�" :string)
+           ("l" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/kurdish/turkish-i-utf8.xdy b/Master/texmf-dist/xindy/modules/lang/kurdish/turkish-i-utf8.xdy
index 64e71bcf64e..5a3b84580ff 100644
--- a/Master/texmf-dist/xindy/modules/lang/kurdish/turkish-i-utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/kurdish/turkish-i-utf8.xdy
@@ -42,18 +42,18 @@
            ("İ" "�" :string)
            ("Ş" "�" :string)
            ("ş" "�" :string)
-           ("û" "�" :string)
            ("Û" "�" :string)
+           ("û" "�" :string)
            ("A" "�" :string)
            ("a" "�" :string)
-           ("B" "�" :string)
            ("b" "�" :string)
+           ("B" "�" :string)
            ("c" "�" :string)
            ("C" "�" :string)
            ("D" "�" :string)
            ("d" "�" :string)
-           ("E" "�" :string)
            ("e" "�" :string)
+           ("E" "�" :string)
            ("f" "�" :string)
            ("F" "�" :string)
            ("g" "�" :string)
@@ -68,236 +68,236 @@
            ("K" "�" :string)
            ("L" "�" :string)
            ("l" "�" :string)
-           ("M" "�" :string)
            ("m" "�" :string)
-           ("n" "�" :string)
+           ("M" "�" :string)
            ("N" "�" :string)
+           ("n" "�" :string)
            ("O" "�" :string)
            ("o" "�" :string)
-           ("P" "�" :string)
            ("p" "�" :string)
+           ("P" "�" :string)
            ("r" "�" :string)
            ("R" "�" :string)
-           ("S" "�" :string)
            ("s" "�" :string)
+           ("S" "�" :string)
            ("t" "�" :string)
            ("T" "�" :string)
            ("u" "�" :string)
            ("U" "�" :string)
-           ("v" "�" :string)
            ("V" "�" :string)
-           ("w" "�" :string)
+           ("v" "�" :string)
            ("W" "�" :string)
+           ("w" "�" :string)
            ("X" "�" :string)
            ("x" "�" :string)
            ("y" "�" :string)
            ("Y" "�" :string)
-           ("z" "�" :string)
            ("Z" "�" :string)
+           ("z" "�" :string)
            ))
 
 (define-rule-set "ku-resolve-diacritics"
 
   :rules  (("ê" "�" :string)
-           ("Ç" "�" :string)
-           ("ç" "�" :string)
            ("Ş" "�" :string)
+           ("Ç" "�" :string)
+           ("Û" "�" :string)
+           ("İ" "�" :string)
            ("û" "�" :string)
-           ("ş" "�" :string)
+           ("ç" "�" :string)
            ("Ê" "�" :string)
+           ("ş" "�" :string)
            ("ı" "�" :string)
-           ("Û" "�" :string)
-           ("İ" "�" :string)
-           ("p" "�" :string)
-           ("B" "�" :string)
+           ("A" "�" :string)
+           ("Z" "�" :string)
+           ("H" "�" :string)
+           ("x" "�" :string)
+           ("f" "�" :string)
            ("L" "�" :string)
            ("h" "�" :string)
-           ("x" "�" :string)
-           ("w" "�" :string)
+           ("y" "�" :string)
+           ("U" "�" :string)
+           ("p" "�" :string)
+           ("e" "�" :string)
            ("r" "�" :string)
-           ("D" "�" :string)
+           ("u" "�" :string)
+           ("g" "�" :string)
+           ("t" "�" :string)
            ("b" "�" :string)
+           ("X" "�" :string)
            ("n" "�" :string)
            ("N" "�" :string)
-           ("F" "�" :string)
-           ("j" "�" :string)
-           ("y" "�" :string)
-           ("t" "�" :string)
+           ("m" "�" :string)
+           ("Y" "�" :string)
            ("P" "�" :string)
-           ("A" "�" :string)
+           ("C" "�" :string)
+           ("s" "�" :string)
            ("S" "�" :string)
+           ("w" "�" :string)
            ("E" "�" :string)
-           ("f" "�" :string)
+           ("J" "�" :string)
+           ("d" "�" :string)
            ("z" "�" :string)
-           ("X" "�" :string)
-           ("u" "�" :string)
            ("I" "�" :string)
+           ("B" "�" :string)
+           ("M" "�" :string)
            ("T" "�" :string)
-           ("Z" "�" :string)
-           ("s" "�" :string)
-           ("e" "�" :string)
-           ("k" "�" :string)
-           ("l" "�" :string)
-           ("Y" "�" :string)
-           ("C" "�" :string)
-           ("G" "�" :string)
-           ("K" "�" :string)
-           ("v" "�" :string)
-           ("d" "�" :string)
+           ("j" "�" :string)
+           ("D" "�" :string)
            ("V" "�" :string)
-           ("c" "�" :string)
-           ("m" "�" :string)
-           ("H" "�" :string)
-           ("M" "�" :string)
-           ("g" "�" :string)
-           ("J" "�" :string)
-           ("W" "�" :string)
+           ("R" "�" :string)
+           ("v" "�" :string)
            ("o" "�" :string)
+           ("G" "�" :string)
+           ("K" "�" :string)
+           ("i" "�" :string)
+           ("k" "�" :string)
+           ("l" "�" :string)
            ("O" "�" :string)
-           ("R" "�" :string)
+           ("W" "�" :string)
+           ("c" "�" :string)
+           ("F" "�" :string)
            ("a" "�" :string)
-           ("U" "�" :string)
-           ("i" "�" :string)
            ))
 
 (define-rule-set "ku-resolve-case"
 
-  :rules  (("Ş" "8" :string)
-           ("Ç" "8" :string)
-           ("İ" "8" :string)
+  :rules  (("Ê" "8" :string)
            ("Û" "8" :string)
-           ("Ê" "8" :string)
-           ("û" "9" :string)
-           ("ç" "9" :string)
-           ("ê" "9" :string)
+           ("İ" "8" :string)
+           ("Ç" "8" :string)
+           ("Ş" "8" :string)
            ("ı" "9" :string)
            ("ş" "9" :string)
-           ("X" "8" :string)
-           ("I" "8" :string)
-           ("T" "8" :string)
-           ("S" "8" :string)
-           ("E" "8" :string)
-           ("P" "8" :string)
-           ("A" "8" :string)
-           ("D" "8" :string)
-           ("N" "8" :string)
-           ("F" "8" :string)
-           ("B" "8" :string)
-           ("L" "8" :string)
-           ("U" "8" :string)
+           ("ç" "9" :string)
+           ("û" "9" :string)
+           ("ê" "9" :string)
            ("O" "8" :string)
-           ("R" "8" :string)
-           ("M" "8" :string)
-           ("J" "8" :string)
            ("W" "8" :string)
-           ("H" "8" :string)
+           ("F" "8" :string)
+           ("G" "8" :string)
            ("K" "8" :string)
+           ("R" "8" :string)
            ("V" "8" :string)
-           ("G" "8" :string)
+           ("D" "8" :string)
+           ("T" "8" :string)
+           ("I" "8" :string)
+           ("B" "8" :string)
+           ("M" "8" :string)
+           ("S" "8" :string)
+           ("J" "8" :string)
+           ("E" "8" :string)
            ("C" "8" :string)
            ("Y" "8" :string)
+           ("P" "8" :string)
+           ("N" "8" :string)
+           ("X" "8" :string)
+           ("U" "8" :string)
+           ("L" "8" :string)
            ("Z" "8" :string)
-           ("u" "9" :string)
-           ("z" "9" :string)
-           ("f" "9" :string)
-           ("t" "9" :string)
-           ("y" "9" :string)
-           ("b" "9" :string)
-           ("w" "9" :string)
-           ("r" "9" :string)
-           ("j" "9" :string)
-           ("n" "9" :string)
-           ("h" "9" :string)
-           ("x" "9" :string)
-           ("p" "9" :string)
-           ("i" "9" :string)
+           ("A" "8" :string)
+           ("H" "8" :string)
            ("a" "9" :string)
-           ("o" "9" :string)
-           ("g" "9" :string)
            ("c" "9" :string)
-           ("m" "9" :string)
+           ("l" "9" :string)
+           ("i" "9" :string)
+           ("k" "9" :string)
+           ("o" "9" :string)
            ("v" "9" :string)
+           ("j" "9" :string)
+           ("z" "9" :string)
+           ("w" "9" :string)
            ("d" "9" :string)
-           ("l" "9" :string)
-           ("e" "9" :string)
            ("s" "9" :string)
-           ("k" "9" :string)
+           ("m" "9" :string)
+           ("n" "9" :string)
+           ("b" "9" :string)
+           ("t" "9" :string)
+           ("g" "9" :string)
+           ("u" "9" :string)
+           ("r" "9" :string)
+           ("e" "9" :string)
+           ("y" "9" :string)
+           ("p" "9" :string)
+           ("h" "9" :string)
+           ("f" "9" :string)
+           ("x" "9" :string)
            ))
 
 (define-rule-set "ku-ignore-special"
 
   :rules  (("'" "" :string)
+           ("-" "" :string)
            ("." "" :string)
-           ("?" "" :string)
            ("!" "" :string)
-           ("-" "" :string)
+           ("?" "" :string)
            ))
 
 (define-rule-set "ku-resolve-special"
 
-  :rules  (("ê" "�" :string)
-           ("ş" "�" :string)
+  :rules  (("İ" "�" :string)
+           ("Ç" "�" :string)
            ("ı" "�" :string)
+           ("ş" "�" :string)
            ("Ê" "�" :string)
-           ("Ş" "�" :string)
-           ("û" "�" :string)
            ("ç" "�" :string)
-           ("Ç" "�" :string)
+           ("û" "�" :string)
            ("Û" "�" :string)
-           ("İ" "�" :string)
+           ("Ş" "�" :string)
+           ("ê" "�" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("E" "�" :string)
-           ("A" "�" :string)
-           ("y" "�" :string)
+           ("O" "�" :string)
+           ("k" "�" :string)
+           ("i" "�" :string)
+           ("v" "�" :string)
+           ("R" "�" :string)
+           ("V" "�" :string)
+           ("j" "�" :string)
            ("I" "�" :string)
-           ("X" "�" :string)
-           ("x" "�" :string)
-           ("L" "�" :string)
-           ("B" "�" :string)
-           ("p" "�" :string)
+           ("z" "�" :string)
+           ("d" "�" :string)
            ("N" "�" :string)
-           ("D" "�" :string)
-           ("b" "�" :string)
-           ("M" "�" :string)
-           ("m" "�" :string)
+           ("y" "�" :string)
+           ("L" "�" :string)
+           ("f" "�" :string)
+           ("A" "�" :string)
+           ("c" "�" :string)
            ("a" "�" :string)
-           ("i" "�" :string)
-           ("R" "�" :string)
+           ("F" "�" :string)
+           ("W" "�" :string)
+           ("l" "�" :string)
            ("o" "�" :string)
-           ("O" "�" :string)
-           ("s" "�" :string)
-           ("Z" "�" :string)
-           ("d" "�" :string)
-           ("v" "�" :string)
+           ("K" "�" :string)
+           ("G" "�" :string)
+           ("D" "�" :string)
+           ("T" "�" :string)
+           ("M" "�" :string)
+           ("B" "�" :string)
+           ("E" "�" :string)
+           ("J" "�" :string)
+           ("w" "�" :string)
            ("S" "�" :string)
-           ("f" "�" :string)
+           ("C" "�" :string)
+           ("s" "�" :string)
            ("P" "�" :string)
+           ("Y" "�" :string)
+           ("m" "�" :string)
+           ("n" "�" :string)
+           ("X" "�" :string)
+           ("b" "�" :string)
            ("t" "�" :string)
+           ("g" "�" :string)
            ("u" "�" :string)
-           ("T" "�" :string)
-           ("z" "�" :string)
-           ("h" "�" :string)
-           ("F" "�" :string)
-           ("n" "�" :string)
-           ("j" "�" :string)
-           ("w" "�" :string)
            ("r" "�" :string)
-           ("W" "�" :string)
-           ("J" "�" :string)
-           ("g" "�" :string)
-           ("H" "�" :string)
-           ("c" "�" :string)
-           ("U" "�" :string)
-           ("k" "�" :string)
            ("e" "�" :string)
-           ("V" "�" :string)
-           ("K" "�" :string)
-           ("C" "�" :string)
-           ("Y" "�" :string)
-           ("l" "�" :string)
-           ("G" "�" :string)
+           ("p" "�" :string)
+           ("U" "�" :string)
+           ("h" "�" :string)
+           ("x" "�" :string)
+           ("Z" "�" :string)
+           ("H" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/latin/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/latin/utf8.xdy
index d1e3a20846f..43a5fc4ecde 100644
--- a/Master/texmf-dist/xindy/modules/lang/latin/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/latin/utf8.xdy
@@ -31,56 +31,56 @@
 (define-rule-set "la-alphabetize"
 
   :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)
            ("a" "�" :string)
            ("A" "�" :string)
-           ("b" "�" :string)
            ("B" "�" :string)
+           ("b" "�" :string)
            ("C" "�" :string)
            ("c" "�" :string)
-           ("D" "�" :string)
            ("d" "�" :string)
-           ("e" "�" :string)
+           ("D" "�" :string)
            ("E" "�" :string)
-           ("F" "�" :string)
+           ("e" "�" :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)
-           ("k" "�" :string)
+           ("J" "�" :string)
            ("K" "�" :string)
+           ("k" "�" :string)
            ("L" "�" :string)
            ("l" "�" :string)
            ("m" "�" :string)
            ("M" "�" :string)
-           ("N" "�" :string)
            ("n" "�" :string)
-           ("o" "�" :string)
+           ("N" "�" :string)
            ("O" "�" :string)
+           ("o" "�" :string)
            ("P" "�" :string)
            ("p" "�" :string)
            ("q" "�" :string)
@@ -89,263 +89,263 @@
            ("R" "�" :string)
            ("s" "�" :string)
            ("S" "�" :string)
-           ("T" "�" :string)
            ("t" "�" :string)
-           ("U" "�" :string)
+           ("T" "�" :string)
            ("u" "�" :string)
+           ("U" "�" :string)
            ("v" "�" :string)
            ("V" "�" :string)
            ("W" "�" :string)
            ("w" "�" :string)
-           ("X" "�" :string)
            ("x" "�" :string)
-           ("Y" "�" :string)
+           ("X" "�" :string)
            ("y" "�" :string)
+           ("Y" "�" :string)
            ("Z" "�" :string)
            ("z" "�" :string)
            ))
 
 (define-rule-set "la-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)
-           ("K" "�" :string)
-           ("k" "�" :string)
-           ("G" "�" :string)
-           ("d" "�" :string)
-           ("q" "�" :string)
-           ("V" "�" :string)
-           ("U" "�" :string)
-           ("w" "�" :string)
-           ("x" "�" :string)
-           ("P" "�" :string)
-           ("I" "�" :string)
-           ("t" "�" :string)
-           ("B" "�" :string)
-           ("E" "�" :string)
-           ("e" "�" :string)
-           ("W" "�" :string)
            ("b" "�" :string)
+           ("A" "�" :string)
            ("M" "�" :string)
-           ("m" "�" :string)
            ("g" "�" :string)
+           ("Q" "�" :string)
+           ("z" "�" :string)
+           ("D" "�" :string)
            ("o" "�" :string)
+           ("X" "�" :string)
            ("T" "�" :string)
-           ("L" "�" :string)
+           ("R" "�" :string)
            ("J" "�" :string)
-           ("N" "�" :string)
-           ("D" "�" :string)
+           ("U" "�" :string)
+           ("p" "�" :string)
+           ("V" "�" :string)
+           ("e" "�" :string)
+           ("F" "�" :string)
+           ("w" "�" :string)
            ("l" "�" :string)
-           ("X" "�" :string)
-           ("v" "�" :string)
-           ("j" "�" :string)
-           ("C" "�" :string)
+           ("k" "�" :string)
+           ("r" "�" :string)
+           ("m" "�" :string)
+           ("G" "�" :string)
            ("a" "�" :string)
-           ("Z" "�" :string)
-           ("p" "�" :string)
-           ("Q" "�" :string)
-           ("s" "�" :string)
+           ("B" "�" :string)
+           ("O" "�" :string)
+           ("C" "�" :string)
+           ("P" "�" :string)
+           ("N" "�" :string)
+           ("K" "�" :string)
+           ("i" "�" :string)
+           ("d" "�" :string)
+           ("y" "�" :string)
+           ("W" "�" :string)
+           ("L" "�" :string)
+           ("Y" "�" :string)
+           ("u" "�" :string)
+           ("q" "�" :string)
            ("c" "�" :string)
+           ("S" "�" :string)
+           ("E" "�" :string)
+           ("j" "�" :string)
+           ("Z" "�" :string)
            ("H" "�" :string)
            ("n" "�" :string)
-           ("z" "�" :string)
-           ("S" "�" :string)
+           ("v" "�" :string)
+           ("s" "�" :string)
+           ("I" "�" :string)
+           ("x" "�" :string)
            ("f" "�" :string)
-           ("A" "�" :string)
-           ("Y" "�" :string)
-           ("r" "�" :string)
-           ("y" "�" :string)
+           ("t" "�" :string)
            ("h" "�" :string)
-           ("O" "�" :string)
-           ("R" "�" :string)
-           ("u" "�" :string)
-           ("F" "�" :string)
-           ("i" "�" :string)
            ))
 
 (define-rule-set "la-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)
+           ("ī" "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)
            ("ß" "99" :string)
-           ("Y" "8" :string)
-           ("A" "8" :string)
+           ("B" "8" :string)
+           ("O" "8" :string)
+           ("G" "8" :string)
+           ("V" "8" :string)
            ("F" "8" :string)
+           ("J" "8" :string)
+           ("U" "8" :string)
+           ("T" "8" :string)
            ("R" "8" :string)
-           ("O" "8" :string)
-           ("H" "8" :string)
+           ("X" "8" :string)
+           ("D" "8" :string)
            ("Q" "8" :string)
+           ("A" "8" :string)
+           ("M" "8" :string)
+           ("I" "8" :string)
            ("Z" "8" :string)
+           ("H" "8" :string)
+           ("E" "8" :string)
            ("S" "8" :string)
-           ("N" "8" :string)
-           ("J" "8" :string)
-           ("L" "8" :string)
-           ("T" "8" :string)
-           ("M" "8" :string)
+           ("Y" "8" :string)
+           ("K" "8" :string)
            ("W" "8" :string)
-           ("C" "8" :string)
-           ("X" "8" :string)
-           ("D" "8" :string)
+           ("L" "8" :string)
            ("P" "8" :string)
-           ("U" "8" :string)
-           ("V" "8" :string)
-           ("G" "8" :string)
-           ("K" "8" :string)
-           ("E" "8" :string)
-           ("B" "8" :string)
-           ("I" "8" :string)
+           ("N" "8" :string)
+           ("C" "8" :string)
+           ("a" "9" :string)
+           ("m" "9" :string)
            ("r" "9" :string)
-           ("i" "9" :string)
-           ("u" "9" :string)
-           ("h" "9" :string)
-           ("y" "9" :string)
-           ("c" "9" :string)
-           ("s" "9" :string)
+           ("k" "9" :string)
+           ("w" "9" :string)
+           ("l" "9" :string)
+           ("e" "9" :string)
            ("p" "9" :string)
-           ("f" "9" :string)
-           ("z" "9" :string)
-           ("n" "9" :string)
            ("o" "9" :string)
-           ("m" "9" :string)
-           ("g" "9" :string)
+           ("z" "9" :string)
            ("b" "9" :string)
-           ("a" "9" :string)
-           ("j" "9" :string)
-           ("v" "9" :string)
-           ("l" "9" :string)
+           ("g" "9" :string)
+           ("h" "9" :string)
+           ("f" "9" :string)
+           ("t" "9" :string)
+           ("s" "9" :string)
            ("x" "9" :string)
-           ("w" "9" :string)
+           ("n" "9" :string)
+           ("v" "9" :string)
+           ("j" "9" :string)
+           ("c" "9" :string)
+           ("u" "9" :string)
            ("q" "9" :string)
            ("d" "9" :string)
-           ("k" "9" :string)
-           ("e" "9" :string)
-           ("t" "9" :string)
+           ("i" "9" :string)
+           ("y" "9" :string)
            ))
 
 (define-rule-set "la-ignore-special"
 
   :rules  (("!" "" :string)
-           ("'" "" :string)
+           ("?" "" :string)
            ("." "" :string)
+           ("'" "" :string)
            ("-" "" :string)
-           ("?" "" :string)
            ))
 
 (define-rule-set "la-resolve-special"
 
-  :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)
-           ("p" "�" :string)
-           ("Q" "�" :string)
-           ("Z" "�" :string)
-           ("H" "�" :string)
+           ("E" "�" :string)
+           ("j" "�" :string)
+           ("u" "�" :string)
+           ("q" "�" :string)
            ("c" "�" :string)
-           ("s" "�" :string)
            ("S" "�" :string)
+           ("d" "�" :string)
+           ("K" "�" :string)
+           ("i" "�" :string)
+           ("y" "�" :string)
+           ("W" "�" :string)
+           ("L" "�" :string)
+           ("Y" "�" :string)
+           ("C" "�" :string)
+           ("P" "�" :string)
+           ("N" "�" :string)
+           ("f" "�" :string)
+           ("t" "�" :string)
+           ("h" "�" :string)
+           ("s" "�" :string)
+           ("I" "�" :string)
+           ("x" "�" :string)
+           ("v" "�" :string)
            ("n" "�" :string)
+           ("Z" "�" :string)
+           ("H" "�" :string)
+           ("T" "�" :string)
+           ("R" "�" :string)
+           ("D" "�" :string)
+           ("o" "�" :string)
+           ("X" "�" :string)
+           ("Q" "�" :string)
            ("z" "�" :string)
-           ("f" "�" :string)
+           ("b" "�" :string)
            ("A" "�" :string)
-           ("r" "�" :string)
-           ("Y" "�" :string)
+           ("M" "�" :string)
+           ("g" "�" :string)
+           ("a" "�" :string)
+           ("B" "�" :string)
            ("O" "�" :string)
-           ("h" "�" :string)
-           ("y" "�" :string)
-           ("F" "�" :string)
-           ("i" "�" :string)
-           ("u" "�" :string)
-           ("R" "�" :string)
-           ("d" "�" :string)
-           ("q" "�" :string)
-           ("k" "�" :string)
+           ("r" "�" :string)
            ("G" "�" :string)
-           ("K" "�" :string)
-           ("U" "�" :string)
+           ("m" "�" :string)
            ("w" "�" :string)
-           ("P" "�" :string)
-           ("x" "�" :string)
+           ("l" "�" :string)
+           ("k" "�" :string)
+           ("J" "�" :string)
+           ("U" "�" :string)
+           ("p" "�" :string)
            ("V" "�" :string)
-           ("I" "�" :string)
-           ("B" "�" :string)
-           ("E" "�" :string)
            ("e" "�" :string)
-           ("t" "�" :string)
-           ("g" "�" :string)
-           ("M" "�" :string)
-           ("m" "�" :string)
-           ("W" "�" :string)
-           ("b" "�" :string)
-           ("N" "�" :string)
-           ("J" "�" :string)
-           ("L" "�" :string)
-           ("o" "�" :string)
-           ("T" "�" :string)
-           ("X" "�" :string)
-           ("v" "�" :string)
-           ("l" "�" :string)
-           ("D" "�" :string)
-           ("C" "�" :string)
-           ("a" "�" :string)
-           ("j" "�" :string)
+           ("F" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/latvian/latin4.xdy b/Master/texmf-dist/xindy/modules/lang/latvian/latin4.xdy
index 5efbe054f86..90a7fe4d5ff 100644
--- a/Master/texmf-dist/xindy/modules/lang/latvian/latin4.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/latvian/latin4.xdy
@@ -37,260 +37,260 @@
 
 (define-rule-set "lv-alphabetize"
 
-  :rules  (("A" "�" :string)
+  :rules  (("�" "�" :string)
            ("�" "�" :string)
+           ("A" "�" :string)
            ("a" "�" :string)
-           ("�" "�" :string)
            ("b" "�" :string)
            ("B" "�" :string)
-           ("C" "�" :string)
            ("c" "�" :string)
+           ("C" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("D" "�" :string)
            ("d" "�" :string)
-           ("e" "�" :string)
-           ("�" "�" :string)
-           ("E" "�" :string)
            ("�" "�" :string)
-           ("f" "�" :string)
+           ("E" "�" :string)
+           ("�" "�" :string)
+           ("e" "�" :string)
            ("F" "�" :string)
+           ("f" "�" :string)
            ("g" "�" :string)
            ("G" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("h" "�" :string)
+           ("�" "�" :string)
            ("H" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("y" "�" :string)
+           ("h" "�" :string)
            ("I" "�" :string)
-           ("i" "�" :string)
            ("Y" "�" :string)
-           ("J" "�" :string)
+           ("i" "�" :string)
+           ("y" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("j" "�" :string)
+           ("J" "�" :string)
            ("K" "�" :string)
            ("k" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("L" "�" :string)
            ("l" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("m" "�" :string)
+           ("�" "�" :string)
            ("M" "�" :string)
-           ("N" "�" :string)
+           ("m" "�" :string)
            ("n" "�" :string)
+           ("N" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("O" "�" :string)
            ("o" "�" :string)
            ("�" "�" :string)
-           ("O" "�" :string)
-           ("�" "�" :string)
-           ("p" "�" :string)
            ("P" "�" :string)
+           ("p" "�" :string)
            ("q" "�" :string)
            ("Q" "�" :string)
            ("r" "�" :string)
            ("R" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("S" "�" :string)
+           ("�" "�" :string)
            ("s" "�" :string)
+           ("S" "�" :string)
            ("�" "��" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("T" "�" :string)
+           ("�" "�" :string)
            ("t" "�" :string)
-           ("�" "�" :string)
-           ("U" "�" :string)
+           ("T" "�" :string)
            ("u" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("U" "�" :string)
            ("v" "�" :string)
            ("V" "�" :string)
-           ("w" "�" :string)
            ("W" "�" :string)
-           ("x" "�" :string)
+           ("w" "�" :string)
            ("X" "�" :string)
-           ("Z" "�" :string)
+           ("x" "�" :string)
            ("z" "�" :string)
+           ("Z" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ))
 
 (define-rule-set "lv-resolve-diacritics"
 
-  :rules  (("j" "�" :string)
+  :rules  (("r" "�" :string)
+           ("w" "�" :string)
+           ("L" "�" :string)
+           ("B" "�" :string)
+           ("T" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("I" "�" :string)
+           ("�" "�" :string)
+           ("z" "�" :string)
            ("c" "�" :string)
-           ("K" "�" :string)
-           ("G" "�" :string)
-           ("P" "�" :string)
-           ("x" "�" :string)
-           ("O" "�" :string)
+           ("D" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("E" "�" :string)
-           ("w" "�" :string)
+           ("�" "�" :string)
+           ("H" "�" :string)
+           ("i" "�" :string)
            ("M" "�" :string)
+           ("F" "�" :string)
+           ("q" "�" :string)
+           ("K" "�" :string)
            ("u" "�" :string)
-           ("�" "�" :string)
-           ("S" "�" :string)
-           ("U" "�" :string)
-           ("�" "�" :string)
-           ("f" "�" :string)
+           ("b" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("W" "�" :string)
-           ("i" "�" :string)
-           ("t" "�" :string)
-           ("B" "�" :string)
-           ("X" "�" :string)
-           ("T" "�" :string)
            ("k" "�" :string)
-           ("l" "�" :string)
+           ("n" "�" :string)
            ("�" "�" :string)
-           ("d" "�" :string)
-           ("�" "�" :string)
-           ("L" "�" :string)
-           ("I" "�" :string)
-           ("V" "�" :string)
-           ("�" "�" :string)
-           ("F" "�" :string)
+           ("v" "�" :string)
            ("s" "�" :string)
-           ("�" "�" :string)
-           ("Q" "�" :string)
-           ("b" "�" :string)
-           ("H" "�" :string)
-           ("z" "�" :string)
-           ("�" "�" :string)
-           ("g" "�" :string)
-           ("q" "�" :string)
-           ("h" "�" :string)
-           ("�" "�" :string)
-           ("A" "�" :string)
+           ("f" "�" :string)
+           ("j" "�" :string)
+           ("t" "�" :string)
+           ("W" "�" :string)
            ("Z" "�" :string)
+           ("d" "�" :string)
+           ("V" "�" :string)
+           ("�" "�" :string)
            ("o" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("m" "�" :string)
-           ("e" "�" :string)
-           ("N" "�" :string)
-           ("�" "�" :string)
+           ("X" "�" :string)
+           ("�" "�" :string)
            ("J" "�" :string)
-           ("�" "�" :string)
-           ("n" "�" :string)
+           ("e" "�" :string)
+           ("U" "�" :string)
+           ("�" "�" :string)
+           ("S" "�" :string)
+           ("C" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("x" "�" :string)
            ("a" "�" :string)
            ("R" "�" :string)
-           ("C" "�" :string)
-           ("D" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("Q" "�" :string)
+           ("G" "�" :string)
+           ("O" "�" :string)
+           ("l" "�" :string)
+           ("�" "�" :string)
+           ("m" "�" :string)
+           ("A" "�" :string)
+           ("g" "�" :string)
+           ("�" "�" :string)
+           ("N" "�" :string)
            ("p" "�" :string)
-           ("r" "�" :string)
-           ("v" "�" :string)
+           ("P" "�" :string)
+           ("h" "�" :string)
+           ("Y" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("y" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("Y" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ))
 
 (define-rule-set "lv-resolve-case"
 
-  :rules  (("L" "8" :string)
+  :rules  (("T" "8" :string)
            ("I" "8" :string)
-           ("V" "8" :string)
-           ("W" "8" :string)
+           ("�" "8" :string)
            ("Y" "8" :string)
+           ("L" "8" :string)
            ("B" "8" :string)
-           ("T" "8" :string)
-           ("X" "8" :string)
-           ("�" "8" :string)
-           ("Q" "8" :string)
-           ("�" "8" :string)
-           ("F" "8" :string)
-           ("O" "8" :string)
-           ("�" "8" :string)
+           ("�" "8" :string)
            ("E" "8" :string)
+           ("H" "8" :string)
            ("M" "8" :string)
-           ("�" "8" :string)
-           ("S" "8" :string)
-           ("�" "8" :string)
+           ("D" "8" :string)
+           ("F" "8" :string)
            ("K" "8" :string)
-           ("G" "8" :string)
-           ("P" "8" :string)
+           ("W" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
+           ("�" "8" :string)
+           ("C" "8" :string)
+           ("S" "8" :string)
+           ("Z" "8" :string)
+           ("V" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("X" "8" :string)
+           ("J" "8" :string)
            ("U" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
            ("�" "8" :string)
+           ("A" "8" :string)
+           ("�" "8" :string)
            ("R" "8" :string)
-           ("C" "8" :string)
-           ("N" "8" :string)
-           ("J" "8" :string)
+           ("�" "8" :string)
+           ("Q" "8" :string)
            ("�" "8" :string)
-           ("D" "8" :string)
-           ("�" "8" :string)
-           ("H" "8" :string)
-           ("�" "8" :string)
-           ("A" "8" :string)
-           ("Z" "8" :string)
-           ("�" "8" :string)
+           ("G" "8" :string)
+           ("O" "8" :string)
+           ("P" "8" :string)
+           ("N" "8" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
-           ("i" "9" :string)
-           ("t" "9" :string)
-           ("l" "9" :string)
-           ("k" "9" :string)
-           ("d" "9" :string)
-           ("s" "9" :string)
-           ("�" "9" :string)
            ("�" "9" :string)
+           ("�" "9" :string)
+           ("r" "9" :string)
+           ("w" "9" :string)
            ("�" "9" :string)
+           ("y" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("i" "9" :string)
+           ("z" "9" :string)
+           ("c" "9" :string)
+           ("b" "9" :string)
            ("�" "9" :string)
-           ("w" "9" :string)
+           ("q" "9" :string)
            ("u" "9" :string)
-           ("j" "9" :string)
-           ("c" "9" :string)
-           ("x" "9" :string)
-           ("y" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
            ("f" "9" :string)
-           ("a" "9" :string)
-           ("�" "9" :string)
+           ("j" "9" :string)
+           ("t" "9" :string)
+           ("k" "9" :string)
            ("n" "9" :string)
-           ("r" "9" :string)
            ("v" "9" :string)
+           ("s" "9" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
-           ("p" "9" :string)
-           ("h" "9" :string)
-           ("�" "9" :string)
-           ("b" "9" :string)
-           ("z" "9" :string)
-           ("g" "9" :string)
-           ("q" "9" :string)
-           ("e" "9" :string)
-           ("o" "9" :string)
            ("�" "9" :string)
+           ("d" "9" :string)
+           ("o" "9" :string)
+           ("�" "9" :string)
+           ("e" "9" :string)
+           ("x" "9" :string)
+           ("a" "9" :string)
+           ("�" "9" :string)
            ("m" "9" :string)
+           ("g" "9" :string)
+           ("l" "9" :string)
+           ("p" "9" :string)
+           ("h" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
            ("�" "99" :string)
            ))
 
 (define-rule-set "lv-ignore-special"
 
-  :rules  (("!" "" :string)
-           ("." "" :string)
+  :rules  (("'" "" :string)
            ("-" "" :string)
+           ("." "" :string)
            ("?" "" :string)
-           ("'" "" :string)
+           ("!" "" :string)
            ))
 
 (define-rule-set "lv-resolve-special"
@@ -298,84 +298,84 @@
   :rules  (("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("�" "�" :string)
-           ("f" "�" :string)
+           ("N" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("U" "�" :string)
-           ("y" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("G" "�" :string)
+           ("�" "�" :string)
+           ("h" "�" :string)
            ("P" "�" :string)
+           ("p" "�" :string)
+           ("l" "�" :string)
+           ("O" "�" :string)
+           ("�" "�" :string)
+           ("Q" "�" :string)
+           ("G" "�" :string)
+           ("�" "�" :string)
+           ("R" "�" :string)
+           ("g" "�" :string)
+           ("�" "�" :string)
+           ("A" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("m" "�" :string)
+           ("a" "�" :string)
+           ("�" "�" :string)
            ("x" "�" :string)
-           ("c" "�" :string)
-           ("K" "�" :string)
-           ("�" "�" :string)
-           ("j" "�" :string)
            ("�" "�" :string)
-           ("S" "�" :string)
-           ("w" "�" :string)
-           ("u" "�" :string)
-           ("M" "�" :string)
+           ("U" "�" :string)
+           ("e" "�" :string)
+           ("�" "�" :string)
+           ("J" "�" :string)
+           ("�" "�" :string)
+           ("o" "�" :string)
+           ("X" "�" :string)
            ("�" "�" :string)
-           ("E" "�" :string)
-           ("�" "�" :string)
-           ("O" "�" :string)
-           ("�" "�" :string)
-           ("F" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("Q" "�" :string)
-           ("s" "�" :string)
-           ("�" "�" :string)
-           ("l" "�" :string)
+           ("�" "�" :string)
+           ("Z" "�" :string)
            ("d" "�" :string)
-           ("k" "�" :string)
-           ("�" "�" :string)
-           ("B" "�" :string)
-           ("X" "�" :string)
-           ("T" "�" :string)
-           ("t" "�" :string)
-           ("Y" "�" :string)
-           ("W" "�" :string)
-           ("i" "�" :string)
            ("V" "�" :string)
-           ("�" "�" :string)
-           ("L" "�" :string)
-           ("I" "�" :string)
-           ("�" "�" :string)
-           ("m" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("Z" "�" :string)
-           ("o" "�" :string)
-           ("A" "�" :string)
-           ("e" "�" :string)
+           ("�" "�" :string)
+           ("S" "�" :string)
+           ("C" "�" :string)
+           ("�" "�" :string)
+           ("v" "�" :string)
+           ("s" "�" :string)
+           ("n" "�" :string)
+           ("k" "�" :string)
+           ("�" "�" :string)
+           ("W" "�" :string)
+           ("t" "�" :string)
+           ("j" "�" :string)
+           ("f" "�" :string)
+           ("u" "�" :string)
+           ("K" "�" :string)
+           ("F" "�" :string)
            ("q" "�" :string)
-           ("g" "�" :string)
-           ("�" "�" :string)
-           ("z" "�" :string)
-           ("H" "�" :string)
+           ("�" "�" :string)
            ("b" "�" :string)
+           ("c" "�" :string)
+           ("z" "�" :string)
+           ("D" "�" :string)
+           ("M" "�" :string)
+           ("i" "�" :string)
            ("�" "�" :string)
-           ("h" "�" :string)
-           ("�" "�" :string)
-           ("p" "�" :string)
+           ("H" "�" :string)
            ("�" "�" :string)
-           ("D" "�" :string)
-           ("�" "�" :string)
-           ("v" "�" :string)
+           ("y" "�" :string)
+           ("E" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("B" "�" :string)
+           ("w" "�" :string)
+           ("L" "�" :string)
            ("r" "�" :string)
-           ("J" "�" :string)
-           ("�" "�" :string)
-           ("n" "�" :string)
-           ("�" "�" :string)
-           ("N" "�" :string)
-           ("R" "�" :string)
-           ("C" "�" :string)
-           ("a" "�" :string)
-           ("�" "�" :string)
+           ("Y" "�" :string)
+           ("�" "�" :string)
+           ("I" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("T" "�" :string)
            ("�" "��" :string)
            ("-" "�" :string)
            ("'" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/latvian/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/latvian/utf8.xdy
index f7824c46278..99aa3915caf 100644
--- a/Master/texmf-dist/xindy/modules/lang/latvian/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/latvian/utf8.xdy
@@ -37,24 +37,24 @@
 
 (define-rule-set "lv-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)
@@ -66,12 +66,12 @@
            ("ž" "�" :string)
            ("A" "�" :string)
            ("a" "�" :string)
-           ("B" "�" :string)
            ("b" "�" :string)
-           ("c" "�" :string)
+           ("B" "�" :string)
            ("C" "�" :string)
-           ("d" "�" :string)
+           ("c" "�" :string)
            ("D" "�" :string)
+           ("d" "�" :string)
            ("E" "�" :string)
            ("e" "�" :string)
            ("F" "�" :string)
@@ -80,303 +80,303 @@
            ("g" "�" :string)
            ("h" "�" :string)
            ("H" "�" :string)
-           ("y" "�" :string)
            ("Y" "�" :string)
            ("i" "�" :string)
            ("I" "�" :string)
-           ("j" "�" :string)
+           ("y" "�" :string)
            ("J" "�" :string)
-           ("k" "�" :string)
+           ("j" "�" :string)
            ("K" "�" :string)
+           ("k" "�" :string)
            ("L" "�" :string)
            ("l" "�" :string)
-           ("m" "�" :string)
            ("M" "�" :string)
+           ("m" "�" :string)
            ("n" "�" :string)
            ("N" "�" :string)
            ("o" "�" :string)
            ("O" "�" :string)
-           ("P" "�" :string)
            ("p" "�" :string)
-           ("q" "�" :string)
+           ("P" "�" :string)
            ("Q" "�" :string)
-           ("R" "�" :string)
+           ("q" "�" :string)
            ("r" "�" :string)
-           ("s" "�" :string)
+           ("R" "�" :string)
            ("S" "�" :string)
-           ("T" "�" :string)
+           ("s" "�" :string)
            ("t" "�" :string)
-           ("U" "�" :string)
+           ("T" "�" :string)
            ("u" "�" :string)
-           ("v" "�" :string)
+           ("U" "�" :string)
            ("V" "�" :string)
-           ("W" "�" :string)
+           ("v" "�" :string)
            ("w" "�" :string)
-           ("X" "�" :string)
+           ("W" "�" :string)
            ("x" "�" :string)
+           ("X" "�" :string)
            ("Z" "�" :string)
            ("z" "�" :string)
            ))
 
 (define-rule-set "lv-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)
+           ("q" "�" :string)
+           ("p" "�" :string)
+           ("C" "�" :string)
+           ("N" "�" :string)
+           ("i" "�" :string)
+           ("H" "�" :string)
+           ("Z" "�" :string)
+           ("b" "�" :string)
+           ("E" "�" :string)
            ("R" "�" :string)
+           ("I" "�" :string)
+           ("P" "�" :string)
            ("m" "�" :string)
+           ("c" "�" :string)
+           ("z" "�" :string)
+           ("v" "�" :string)
+           ("U" "�" :string)
+           ("a" "�" :string)
+           ("B" "�" :string)
+           ("e" "�" :string)
+           ("l" "�" :string)
+           ("V" "�" :string)
+           ("G" "�" :string)
+           ("r" "�" :string)
+           ("Q" "�" :string)
+           ("J" "�" :string)
+           ("u" "�" :string)
            ("D" "�" :string)
+           ("n" "�" :string)
            ("o" "�" :string)
            ("F" "�" :string)
-           ("T" "�" :string)
-           ("t" "�" :string)
-           ("h" "�" :string)
-           ("u" "�" :string)
-           ("U" "�" :string)
-           ("Z" "�" :string)
-           ("d" "�" :string)
-           ("g" "�" :string)
-           ("W" "�" :string)
-           ("c" "�" :string)
-           ("M" "�" :string)
-           ("E" "�" :string)
-           ("x" "�" :string)
-           ("G" "�" :string)
-           ("s" "�" :string)
-           ("H" "�" :string)
-           ("X" "�" :string)
-           ("z" "�" :string)
            ("O" "�" :string)
+           ("g" "�" :string)
            ("j" "�" :string)
            ("w" "�" :string)
-           ("V" "�" :string)
-           ("I" "�" :string)
-           ("B" "�" :string)
-           ("n" "�" :string)
-           ("p" "�" :string)
-           ("v" "�" :string)
-           ("i" "�" :string)
-           ("q" "�" :string)
+           ("S" "�" :string)
+           ("s" "�" :string)
            ("K" "�" :string)
-           ("k" "�" :string)
-           ("P" "�" :string)
+           ("x" "�" :string)
            ("L" "�" :string)
-           ("C" "�" :string)
-           ("f" "�" :string)
-           ("e" "�" :string)
-           ("a" "�" :string)
-           ("S" "�" :string)
-           ("J" "�" :string)
-           ("r" "�" :string)
-           ("Q" "�" :string)
-           ("N" "�" :string)
+           ("t" "�" :string)
+           ("k" "�" :string)
            ("A" "�" :string)
-           ("b" "�" :string)
-           ("l" "�" :string)
-           ("y" "�" :string)
+           ("X" "�" :string)
+           ("h" "�" :string)
+           ("d" "�" :string)
+           ("f" "�" :string)
+           ("T" "�" :string)
+           ("W" "�" :string)
+           ("M" "�" :string)
            ("Y" "�" :string)
+           ("y" "�" :string)
            ))
 
 (define-rule-set "lv-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)
-           ("Ļ" "8" :string)
+           ("Ģ" "8" :string)
            ("Č" "8" :string)
-           ("š" "9" :string)
-           ("ē" "9" :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)
            ("ß" "99" :string)
-           ("M" "8" :string)
-           ("E" "8" :string)
-           ("W" "8" :string)
-           ("H" "8" :string)
+           ("Q" "8" :string)
            ("G" "8" :string)
-           ("X" "8" :string)
+           ("V" "8" :string)
+           ("F" "8" :string)
            ("O" "8" :string)
+           ("J" "8" :string)
            ("D" "8" :string)
-           ("R" "8" :string)
-           ("F" "8" :string)
+           ("A" "8" :string)
+           ("L" "8" :string)
+           ("K" "8" :string)
+           ("S" "8" :string)
            ("T" "8" :string)
-           ("U" "8" :string)
-           ("Z" "8" :string)
+           ("W" "8" :string)
+           ("M" "8" :string)
+           ("X" "8" :string)
+           ("Y" "8" :string)
            ("C" "8" :string)
+           ("H" "8" :string)
+           ("Z" "8" :string)
+           ("E" "8" :string)
            ("N" "8" :string)
-           ("S" "8" :string)
-           ("J" "8" :string)
-           ("Q" "8" :string)
-           ("A" "8" :string)
-           ("V" "8" :string)
+           ("R" "8" :string)
            ("I" "8" :string)
-           ("B" "8" :string)
-           ("K" "8" :string)
            ("P" "8" :string)
-           ("L" "8" :string)
-           ("Y" "8" :string)
-           ("y" "9" :string)
-           ("x" "9" :string)
+           ("B" "8" :string)
+           ("U" "8" :string)
+           ("r" "9" :string)
            ("g" "9" :string)
-           ("c" "9" :string)
-           ("s" "9" :string)
-           ("z" "9" :string)
-           ("m" "9" :string)
-           ("t" "9" :string)
+           ("j" "9" :string)
+           ("w" "9" :string)
            ("o" "9" :string)
-           ("h" "9" :string)
            ("u" "9" :string)
+           ("n" "9" :string)
+           ("k" "9" :string)
+           ("x" "9" :string)
+           ("t" "9" :string)
+           ("s" "9" :string)
            ("d" "9" :string)
-           ("e" "9" :string)
-           ("a" "9" :string)
+           ("h" "9" :string)
            ("f" "9" :string)
-           ("r" "9" :string)
-           ("b" "9" :string)
-           ("l" "9" :string)
-           ("w" "9" :string)
-           ("j" "9" :string)
-           ("v" "9" :string)
-           ("n" "9" :string)
            ("p" "9" :string)
            ("q" "9" :string)
-           ("k" "9" :string)
+           ("b" "9" :string)
            ("i" "9" :string)
+           ("z" "9" :string)
+           ("m" "9" :string)
+           ("c" "9" :string)
+           ("e" "9" :string)
+           ("l" "9" :string)
+           ("a" "9" :string)
+           ("v" "9" :string)
+           ("y" "9" :string)
            ))
 
 (define-rule-set "lv-ignore-special"
 
-  :rules  (("?" "" :string)
+  :rules  (("-" "" :string)
+           ("." "" :string)
            ("!" "" :string)
+           ("?" "" :string)
            ("'" "" :string)
-           ("." "" :string)
-           ("-" "" :string)
            ))
 
 (define-rule-set "lv-resolve-special"
 
-  :rules  (("Ž" "�" :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)
-           ("X" "�" :string)
-           ("O" "�" :string)
-           ("z" "�" :string)
-           ("E" "�" :string)
-           ("M" "�" :string)
-           ("y" "�" :string)
+           ("S" "�" :string)
+           ("s" "�" :string)
+           ("K" "�" :string)
+           ("L" "�" :string)
            ("x" "�" :string)
-           ("g" "�" :string)
-           ("c" "�" :string)
+           ("t" "�" :string)
+           ("k" "�" :string)
+           ("A" "�" :string)
+           ("X" "�" :string)
+           ("h" "�" :string)
+           ("d" "�" :string)
+           ("f" "�" :string)
            ("W" "�" :string)
-           ("s" "�" :string)
-           ("H" "�" :string)
+           ("T" "�" :string)
+           ("M" "�" :string)
+           ("V" "�" :string)
            ("G" "�" :string)
-           ("h" "�" :string)
+           ("r" "�" :string)
+           ("Q" "�" :string)
            ("u" "�" :string)
-           ("d" "�" :string)
-           ("U" "�" :string)
-           ("Z" "�" :string)
-           ("m" "�" :string)
+           ("J" "�" :string)
+           ("n" "�" :string)
            ("D" "�" :string)
-           ("R" "�" :string)
-           ("t" "�" :string)
            ("o" "�" :string)
+           ("O" "�" :string)
            ("F" "�" :string)
-           ("T" "�" :string)
-           ("A" "�" :string)
-           ("b" "�" :string)
+           ("g" "�" :string)
+           ("j" "�" :string)
+           ("w" "�" :string)
+           ("I" "�" :string)
+           ("R" "�" :string)
+           ("P" "�" :string)
+           ("m" "�" :string)
+           ("c" "�" :string)
+           ("z" "�" :string)
+           ("v" "�" :string)
+           ("y" "�" :string)
+           ("U" "�" :string)
+           ("a" "�" :string)
            ("l" "�" :string)
+           ("B" "�" :string)
            ("e" "�" :string)
-           ("a" "�" :string)
+           ("q" "�" :string)
            ("C" "�" :string)
-           ("f" "�" :string)
+           ("p" "�" :string)
+           ("Y" "�" :string)
            ("N" "�" :string)
-           ("S" "�" :string)
-           ("J" "�" :string)
-           ("r" "�" :string)
-           ("Q" "�" :string)
-           ("q" "�" :string)
-           ("K" "�" :string)
-           ("k" "�" :string)
            ("i" "�" :string)
-           ("P" "�" :string)
-           ("L" "�" :string)
-           ("Y" "�" :string)
-           ("V" "�" :string)
-           ("I" "�" :string)
-           ("B" "�" :string)
-           ("w" "�" :string)
-           ("j" "�" :string)
-           ("v" "�" :string)
-           ("n" "�" :string)
-           ("p" "�" :string)
+           ("H" "�" :string)
+           ("E" "�" :string)
+           ("b" "�" :string)
+           ("Z" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/lithuanian/latin4.xdy b/Master/texmf-dist/xindy/modules/lang/lithuanian/latin4.xdy
index 06eb0b3f422..95a7037e947 100644
--- a/Master/texmf-dist/xindy/modules/lang/lithuanian/latin4.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/lithuanian/latin4.xdy
@@ -35,76 +35,76 @@
   :rules  (("ch" "�" :string)
            ("Ch" "�" :string)
            ("CH" "�" :string)
-           ("�" "�" :string)
-           ("a" "�" :string)
            ("�" "�" :string)
+           ("a" "�" :string)
            ("A" "�" :string)
-           ("B" "�" :string)
+           ("�" "�" :string)
            ("b" "�" :string)
+           ("B" "�" :string)
            ("C" "�" :string)
            ("c" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("D" "�" :string)
            ("d" "�" :string)
-           ("E" "�" :string)
+           ("�" "�" :string)
            ("e" "�" :string)
-           ("�" "�" :string)
+           ("E" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("F" "�" :string)
            ("f" "�" :string)
            ("g" "�" :string)
            ("G" "�" :string)
            ("h" "�" :string)
            ("H" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("y" "�" :string)
+           ("Y" "�" :string)
            ("I" "�" :string)
            ("i" "�" :string)
-           ("Y" "�" :string)
-           ("y" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("j" "�" :string)
            ("J" "�" :string)
-           ("k" "�" :string)
            ("K" "�" :string)
+           ("k" "�" :string)
            ("L" "�" :string)
            ("l" "�" :string)
-           ("M" "�" :string)
            ("m" "�" :string)
-           ("N" "�" :string)
+           ("M" "�" :string)
            ("n" "�" :string)
-           ("o" "�" :string)
+           ("N" "�" :string)
            ("O" "�" :string)
-           ("P" "�" :string)
+           ("o" "�" :string)
            ("p" "�" :string)
-           ("q" "�" :string)
+           ("P" "�" :string)
            ("Q" "�" :string)
+           ("q" "�" :string)
            ("R" "�" :string)
            ("r" "�" :string)
-           ("S" "�" :string)
            ("s" "�" :string)
+           ("S" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("t" "�" :string)
            ("T" "�" :string)
+           ("t" "�" :string)
            ("�" "�" :string)
            ("u" "�" :string)
            ("�" "�" :string)
-           ("U" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("U" "�" :string)
            ("v" "�" :string)
            ("V" "�" :string)
-           ("W" "�" :string)
            ("w" "�" :string)
-           ("x" "�" :string)
+           ("W" "�" :string)
            ("X" "�" :string)
-           ("z" "�" :string)
+           ("x" "�" :string)
            ("Z" "�" :string)
-           ("�" "�" :string)
+           ("z" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ))
 
 (define-rule-set "lt-resolve-diacritics"
@@ -112,76 +112,76 @@
   :rules  (("ch" "�" :string)
            ("Ch" "�" :string)
            ("CH" "�" :string)
-           ("�" "�" :string)
-           ("M" "�" :string)
-           ("g" "�" :string)
-           ("j" "�" :string)
-           ("L" "�" :string)
-           ("D" "�" :string)
-           ("B" "�" :string)
-           ("v" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("W" "�" :string)
-           ("s" "�" :string)
-           ("E" "�" :string)
-           ("e" "�" :string)
-           ("S" "�" :string)
-           ("t" "�" :string)
-           ("F" "�" :string)
-           ("x" "�" :string)
-           ("z" "�" :string)
-           ("�" "�" :string)
-           ("u" "�" :string)
-           ("k" "�" :string)
-           ("f" "�" :string)
-           ("V" "�" :string)
-           ("X" "�" :string)
+           ("a" "�" :string)
+           ("A" "�" :string)
+           ("v" "�" :string)
            ("K" "�" :string)
-           ("P" "�" :string)
+           ("�" "�" :string)
+           ("C" "�" :string)
+           ("R" "�" :string)
+           ("O" "�" :string)
            ("I" "�" :string)
            ("T" "�" :string)
-           ("l" "�" :string)
-           ("Z" "�" :string)
+           ("X" "�" :string)
            ("i" "�" :string)
-           ("a" "�" :string)
+           ("E" "�" :string)
            ("�" "�" :string)
-           ("U" "�" :string)
-           ("G" "�" :string)
-           ("C" "�" :string)
+           ("L" "�" :string)
+           ("e" "�" :string)
            ("o" "�" :string)
-           ("b" "�" :string)
-           ("N" "�" :string)
-           ("h" "�" :string)
-           ("R" "�" :string)
            ("m" "�" :string)
+           ("s" "�" :string)
+           ("Z" "�" :string)
+           ("w" "�" :string)
+           ("t" "�" :string)
+           ("h" "�" :string)
+           ("j" "�" :string)
+           ("M" "�" :string)
+           ("H" "�" :string)
+           ("b" "�" :string)
+           ("D" "�" :string)
+           ("u" "�" :string)
            ("d" "�" :string)
-           ("q" "�" :string)
-           ("O" "�" :string)
+           ("W" "�" :string)
+           ("k" "�" :string)
+           ("p" "�" :string)
+           ("J" "�" :string)
            ("Q" "�" :string)
-           ("�" "�" :string)
-           ("H" "�" :string)
-           ("�" "�" :string)
-           ("A" "�" :string)
-           ("r" "�" :string)
+           ("g" "�" :string)
            ("c" "�" :string)
+           ("S" "�" :string)
+           ("r" "�" :string)
+           ("U" "�" :string)
+           ("�" "�" :string)
+           ("l" "�" :string)
+           ("x" "�" :string)
+           ("B" "�" :string)
            ("n" "�" :string)
-           ("J" "�" :string)
-           ("w" "�" :string)
-           ("p" "�" :string)
+           ("F" "�" :string)
+           ("�" "�" :string)
+           ("N" "�" :string)
+           ("f" "�" :string)
+           ("q" "�" :string)
+           ("V" "�" :string)
+           ("P" "�" :string)
+           ("G" "�" :string)
+           ("z" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("y" "�" :string)
            ("Y" "�" :string)
            ("�" "�" :string)
-           ("y" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ))
 
 (define-rule-set "lt-resolve-case"
@@ -189,165 +189,165 @@
   :rules  (("CH" "7" :string)
            ("Ch" "8" :string)
            ("ch" "9" :string)
-           ("K" "8" :string)
-           ("X" "8" :string)
-           ("V" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("F" "8" :string)
-           ("S" "8" :string)
            ("E" "8" :string)
-           ("W" "8" :string)
-           ("B" "8" :string)
-           ("D" "8" :string)
            ("L" "8" :string)
+           ("I" "8" :string)
+           ("T" "8" :string)
+           ("X" "8" :string)
+           ("Z" "8" :string)
+           ("D" "8" :string)
            ("M" "8" :string)
-           ("�" "8" :string)
-           ("J" "8" :string)
-           ("A" "8" :string)
-           ("�" "8" :string)
            ("H" "8" :string)
-           ("Q" "8" :string)
-           ("�" "8" :string)
-           ("O" "8" :string)
+           ("�" "8" :string)
+           ("Y" "8" :string)
+           ("A" "8" :string)
+           ("C" "8" :string)
            ("R" "8" :string)
-           ("N" "8" :string)
+           ("O" "8" :string)
+           ("K" "8" :string)
+           ("�" "8" :string)
+           ("B" "8" :string)
+           ("F" "8" :string)
            ("�" "8" :string)
-           ("C" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("V" "8" :string)
+           ("P" "8" :string)
            ("G" "8" :string)
+           ("N" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
-           ("U" "8" :string)
-           ("Y" "8" :string)
            ("�" "8" :string)
+           ("W" "8" :string)
+           ("J" "8" :string)
+           ("Q" "8" :string)
            ("�" "8" :string)
-           ("Z" "8" :string)
-           ("T" "8" :string)
-           ("I" "8" :string)
-           ("P" "8" :string)
-           ("f" "9" :string)
-           ("k" "9" :string)
-           ("�" "9" :string)
-           ("u" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("z" "9" :string)
-           ("x" "9" :string)
-           ("t" "9" :string)
+           ("U" "8" :string)
+           ("S" "8" :string)
+           ("i" "9" :string)
+           ("�" "9" :string)
            ("e" "9" :string)
-           ("s" "9" :string)
-           ("�" "9" :string)
-           ("v" "9" :string)
-           ("g" "9" :string)
+           ("t" "9" :string)
            ("j" "9" :string)
-           ("p" "9" :string)
+           ("h" "9" :string)
+           ("o" "9" :string)
+           ("m" "9" :string)
+           ("s" "9" :string)
            ("w" "9" :string)
-           ("n" "9" :string)
-           ("c" "9" :string)
-           ("r" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("q" "9" :string)
+           ("b" "9" :string)
+           ("u" "9" :string)
            ("d" "9" :string)
-           ("m" "9" :string)
+           ("�" "9" :string)
            ("y" "9" :string)
-           ("h" "9" :string)
-           ("�" "9" :string)
-           ("b" "9" :string)
-           ("o" "9" :string)
-           ("�" "9" :string)
-           ("i" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
            ("a" "9" :string)
+           ("�" "9" :string)
+           ("v" "9" :string)
+           ("n" "9" :string)
            ("l" "9" :string)
+           ("x" "9" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
+           ("q" "9" :string)
+           ("z" "9" :string)
+           ("f" "9" :string)
+           ("k" "9" :string)
+           ("p" "9" :string)
+           ("g" "9" :string)
+           ("�" "9" :string)
+           ("r" "9" :string)
+           ("�" "9" :string)
+           ("c" "9" :string)
            ))
 
 (define-rule-set "lt-ignore-special"
 
-  :rules  (("?" "" :string)
-           ("." "" :string)
-           ("-" "" :string)
+  :rules  (("-" "" :string)
            ("!" "" :string)
+           ("?" "" :string)
            ("'" "" :string)
+           ("." "" :string)
            ))
 
 (define-rule-set "lt-resolve-special"
 
-  :rules  (("ch" "�" :string)
+  :rules  (("CH" "�" :string)
+           ("ch" "�" :string)
            ("Ch" "�" :string)
-           ("CH" "�" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
            ("x" "�" :string)
-           ("z" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("E" "�" :string)
-           ("e" "�" :string)
-           ("S" "�" :string)
-           ("W" "�" :string)
-           ("�" "�" :string)
-           ("s" "�" :string)
-           ("F" "�" :string)
-           ("t" "�" :string)
-           ("g" "�" :string)
-           ("j" "�" :string)
-           ("L" "�" :string)
-           ("M" "�" :string)
-           ("D" "�" :string)
+           ("l" "�" :string)
+           ("n" "�" :string)
            ("B" "�" :string)
-           ("v" "�" :string)
-           ("�" "�" :string)
-           ("K" "�" :string)
-           ("X" "�" :string)
-           ("k" "�" :string)
+           ("F" "�" :string)
            ("�" "�" :string)
-           ("V" "�" :string)
-           ("f" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("u" "�" :string)
-           ("N" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("f" "�" :string)
+           ("N" "�" :string)
            ("G" "�" :string)
-           ("C" "�" :string)
-           ("b" "�" :string)
-           ("o" "�" :string)
-           ("�" "�" :string)
-           ("U" "�" :string)
-           ("Z" "�" :string)
-           ("�" "�" :string)
-           ("i" "�" :string)
-           ("a" "�" :string)
+           ("z" "�" :string)
+           ("P" "�" :string)
+           ("q" "�" :string)
+           ("V" "�" :string)
+           ("W" "�" :string)
+           ("k" "�" :string)
            ("�" "�" :string)
-           ("Y" "�" :string)
            ("�" "�" :string)
-           ("P" "�" :string)
-           ("I" "�" :string)
-           ("l" "�" :string)
-           ("T" "�" :string)
-           ("�" "�" :string)
-           ("J" "�" :string)
-           ("n" "�" :string)
+           ("�" "�" :string)
            ("p" "�" :string)
-           ("w" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("A" "�" :string)
+           ("Q" "�" :string)
+           ("J" "�" :string)
+           ("�" "�" :string)
+           ("g" "�" :string)
+           ("�" "�" :string)
+           ("S" "�" :string)
            ("c" "�" :string)
+           ("�" "�" :string)
+           ("U" "�" :string)
            ("r" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("Q" "�" :string)
-           ("H" "�" :string)
-           ("R" "�" :string)
+           ("X" "�" :string)
+           ("T" "�" :string)
+           ("I" "�" :string)
+           ("L" "�" :string)
+           ("e" "�" :string)
+           ("�" "�" :string)
+           ("i" "�" :string)
+           ("E" "�" :string)
+           ("w" "�" :string)
+           ("s" "�" :string)
+           ("Z" "�" :string)
+           ("o" "�" :string)
            ("m" "�" :string)
+           ("j" "�" :string)
            ("h" "�" :string)
+           ("t" "�" :string)
+           ("H" "�" :string)
+           ("M" "�" :string)
+           ("D" "�" :string)
+           ("b" "�" :string)
+           ("d" "�" :string)
+           ("u" "�" :string)
+           ("�" "�" :string)
            ("y" "�" :string)
-           ("q" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("a" "�" :string)
+           ("�" "�" :string)
+           ("Y" "�" :string)
+           ("A" "�" :string)
+           ("�" "�" :string)
+           ("K" "�" :string)
+           ("v" "�" :string)
            ("O" "�" :string)
-           ("d" "�" :string)
+           ("�" "�" :string)
+           ("R" "�" :string)
+           ("C" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/lithuanian/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/lithuanian/utf8.xdy
index 79de49a0413..15a2a9ed330 100644
--- a/Master/texmf-dist/xindy/modules/lang/lithuanian/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/lithuanian/utf8.xdy
@@ -32,154 +32,154 @@
 
 (define-rule-set "lt-alphabetize"
 
-  :rules  (("Ą" "�" :string)
-           ("ą" "�" :string)
+  :rules  (("ą" "�" :string)
+           ("Ą" "�" :string)
+           ("Ch" "�" :string)
            ("ch" "�" :string)
            ("CH" "�" :string)
-           ("Ch" "�" :string)
            ("Č" "�" :string)
            ("č" "�" :string)
+           ("ę" "�" :string)
            ("Ę" "�" :string)
-           ("Ė" "�" :string)
            ("ė" "�" :string)
-           ("ę" "�" :string)
+           ("Ė" "�" :string)
            ("Į" "�" :string)
            ("į" "�" :string)
-           ("Š" "�" :string)
            ("š" "�" :string)
-           ("Ų" "�" :string)
+           ("Š" "�" :string)
            ("Ū" "�" :string)
            ("ų" "�" :string)
            ("ū" "�" :string)
+           ("Ų" "�" :string)
            ("Ž" "�" :string)
            ("ž" "�" :string)
            ("A" "�" :string)
            ("a" "�" :string)
            ("b" "�" :string)
            ("B" "�" :string)
-           ("C" "�" :string)
            ("c" "�" :string)
-           ("d" "�" :string)
+           ("C" "�" :string)
            ("D" "�" :string)
-           ("e" "�" :string)
+           ("d" "�" :string)
            ("E" "�" :string)
-           ("F" "�" :string)
+           ("e" "�" :string)
            ("f" "�" :string)
+           ("F" "�" :string)
            ("G" "�" :string)
            ("g" "�" :string)
            ("h" "�" :string)
            ("H" "�" :string)
+           ("i" "�" :string)
            ("Y" "�" :string)
-           ("I" "�" :string)
            ("y" "�" :string)
-           ("i" "�" :string)
+           ("I" "�" :string)
            ("j" "�" :string)
            ("J" "�" :string)
-           ("K" "�" :string)
            ("k" "�" :string)
+           ("K" "�" :string)
            ("l" "�" :string)
            ("L" "�" :string)
-           ("M" "�" :string)
            ("m" "�" :string)
+           ("M" "�" :string)
            ("N" "�" :string)
            ("n" "�" :string)
-           ("o" "�" :string)
            ("O" "�" :string)
+           ("o" "�" :string)
            ("p" "�" :string)
            ("P" "�" :string)
-           ("q" "�" :string)
            ("Q" "�" :string)
-           ("r" "�" :string)
+           ("q" "�" :string)
            ("R" "�" :string)
-           ("s" "�" :string)
+           ("r" "�" :string)
            ("S" "�" :string)
+           ("s" "�" :string)
            ("T" "�" :string)
            ("t" "�" :string)
-           ("U" "�" :string)
            ("u" "�" :string)
-           ("V" "�" :string)
+           ("U" "�" :string)
            ("v" "�" :string)
-           ("W" "�" :string)
+           ("V" "�" :string)
            ("w" "�" :string)
+           ("W" "�" :string)
            ("x" "�" :string)
            ("X" "�" :string)
-           ("z" "�" :string)
            ("Z" "�" :string)
+           ("z" "�" :string)
            ))
 
 (define-rule-set "lt-resolve-diacritics"
 
   :rules  (("Ž" "�" :string)
+           ("š" "�" :string)
            ("ž" "�" :string)
-           ("Š" "�" :string)
            ("Č" "�" :string)
            ("č" "�" :string)
-           ("š" "�" :string)
-           ("CH" "�" :string)
-           ("į" "�" :string)
-           ("ų" "�" :string)
-           ("ch" "�" :string)
-           ("Ę" "�" :string)
-           ("Į" "�" :string)
-           ("Ų" "�" :string)
+           ("Š" "�" :string)
            ("ę" "�" :string)
            ("ą" "�" :string)
-           ("Ą" "�" :string)
+           ("Į" "�" :string)
            ("Ch" "�" :string)
+           ("Ą" "�" :string)
+           ("Ę" "�" :string)
+           ("ų" "�" :string)
+           ("ch" "�" :string)
+           ("CH" "�" :string)
+           ("į" "�" :string)
+           ("Ų" "�" :string)
            ("Ū" "�" :string)
-           ("ū" "�" :string)
            ("ė" "�" :string)
+           ("ū" "�" :string)
            ("Ė" "�" :string)
-           ("Q" "�" :string)
-           ("I" "�" :string)
+           ("R" "�" :string)
+           ("T" "�" :string)
+           ("p" "�" :string)
            ("w" "�" :string)
-           ("d" "�" :string)
-           ("V" "�" :string)
-           ("F" "�" :string)
-           ("M" "�" :string)
-           ("h" "�" :string)
-           ("m" "�" :string)
-           ("E" "�" :string)
-           ("o" "�" :string)
-           ("s" "�" :string)
            ("j" "�" :string)
-           ("e" "�" :string)
-           ("K" "�" :string)
-           ("p" "�" :string)
-           ("T" "�" :string)
-           ("W" "�" :string)
-           ("q" "�" :string)
            ("b" "�" :string)
-           ("C" "�" :string)
+           ("c" "�" :string)
+           ("x" "�" :string)
+           ("i" "�" :string)
+           ("A" "�" :string)
+           ("v" "�" :string)
            ("u" "�" :string)
+           ("W" "�" :string)
+           ("N" "�" :string)
+           ("P" "�" :string)
+           ("m" "�" :string)
+           ("S" "�" :string)
+           ("D" "�" :string)
+           ("Q" "�" :string)
+           ("l" "�" :string)
+           ("X" "�" :string)
            ("n" "�" :string)
+           ("E" "�" :string)
+           ("O" "�" :string)
+           ("r" "�" :string)
+           ("q" "�" :string)
+           ("U" "�" :string)
+           ("B" "�" :string)
+           ("G" "�" :string)
+           ("d" "�" :string)
+           ("k" "�" :string)
+           ("e" "�" :string)
+           ("M" "�" :string)
+           ("g" "�" :string)
+           ("V" "�" :string)
            ("L" "�" :string)
+           ("f" "�" :string)
+           ("o" "�" :string)
+           ("F" "�" :string)
+           ("a" "�" :string)
+           ("I" "�" :string)
+           ("C" "�" :string)
+           ("s" "�" :string)
            ("J" "�" :string)
            ("Z" "�" :string)
-           ("S" "�" :string)
-           ("O" "�" :string)
+           ("K" "�" :string)
+           ("h" "�" :string)
            ("H" "�" :string)
-           ("U" "�" :string)
-           ("D" "�" :string)
-           ("P" "�" :string)
-           ("N" "�" :string)
            ("t" "�" :string)
-           ("a" "�" :string)
-           ("B" "�" :string)
            ("z" "�" :string)
-           ("k" "�" :string)
-           ("R" "�" :string)
-           ("l" "�" :string)
-           ("v" "�" :string)
-           ("f" "�" :string)
-           ("i" "�" :string)
-           ("g" "�" :string)
-           ("G" "�" :string)
-           ("X" "�" :string)
-           ("c" "�" :string)
-           ("r" "�" :string)
-           ("A" "�" :string)
-           ("x" "�" :string)
            ("Y" "�" :string)
            ("y" "�" :string)
            ))
@@ -187,167 +187,167 @@
 (define-rule-set "lt-resolve-case"
 
   :rules  (("CH" "7" :string)
-           ("Ch" "8" :string)
            ("Ė" "8" :string)
-           ("Ą" "8" :string)
-           ("Ž" "8" :string)
+           ("Ų" "8" :string)
            ("Š" "8" :string)
            ("Č" "8" :string)
-           ("Ų" "8" :string)
+           ("Ą" "8" :string)
            ("Ę" "8" :string)
-           ("Ū" "8" :string)
+           ("Ch" "8" :string)
            ("Į" "8" :string)
+           ("Ž" "8" :string)
+           ("Ū" "8" :string)
            ("ū" "9" :string)
-           ("ę" "9" :string)
+           ("į" "9" :string)
            ("č" "9" :string)
+           ("ch" "9" :string)
            ("ė" "9" :string)
-           ("š" "9" :string)
-           ("ą" "9" :string)
-           ("į" "9" :string)
            ("ų" "9" :string)
            ("ž" "9" :string)
-           ("ch" "9" :string)
-           ("N" "8" :string)
-           ("L" "8" :string)
-           ("Z" "8" :string)
-           ("S" "8" :string)
-           ("J" "8" :string)
-           ("O" "8" :string)
+           ("ą" "9" :string)
+           ("š" "9" :string)
+           ("ę" "9" :string)
            ("H" "8" :string)
-           ("U" "8" :string)
-           ("D" "8" :string)
-           ("P" "8" :string)
-           ("G" "8" :string)
-           ("X" "8" :string)
-           ("A" "8" :string)
-           ("B" "8" :string)
-           ("R" "8" :string)
+           ("J" "8" :string)
+           ("Z" "8" :string)
+           ("K" "8" :string)
+           ("C" "8" :string)
+           ("I" "8" :string)
            ("F" "8" :string)
-           ("Y" "8" :string)
            ("M" "8" :string)
+           ("V" "8" :string)
+           ("L" "8" :string)
+           ("G" "8" :string)
+           ("U" "8" :string)
+           ("B" "8" :string)
            ("E" "8" :string)
+           ("O" "8" :string)
+           ("X" "8" :string)
+           ("Y" "8" :string)
            ("Q" "8" :string)
-           ("I" "8" :string)
-           ("V" "8" :string)
-           ("T" "8" :string)
+           ("D" "8" :string)
+           ("P" "8" :string)
+           ("S" "8" :string)
+           ("N" "8" :string)
            ("W" "8" :string)
-           ("C" "8" :string)
-           ("K" "8" :string)
+           ("A" "8" :string)
+           ("T" "8" :string)
+           ("R" "8" :string)
            ("t" "9" :string)
+           ("z" "9" :string)
+           ("h" "9" :string)
+           ("s" "9" :string)
            ("a" "9" :string)
-           ("n" "9" :string)
-           ("u" "9" :string)
+           ("o" "9" :string)
+           ("f" "9" :string)
+           ("g" "9" :string)
+           ("k" "9" :string)
+           ("e" "9" :string)
+           ("d" "9" :string)
            ("r" "9" :string)
-           ("c" "9" :string)
+           ("q" "9" :string)
+           ("n" "9" :string)
            ("y" "9" :string)
-           ("x" "9" :string)
-           ("z" "9" :string)
-           ("k" "9" :string)
            ("l" "9" :string)
+           ("m" "9" :string)
            ("v" "9" :string)
+           ("u" "9" :string)
+           ("c" "9" :string)
+           ("x" "9" :string)
            ("i" "9" :string)
-           ("f" "9" :string)
-           ("g" "9" :string)
-           ("h" "9" :string)
-           ("m" "9" :string)
-           ("o" "9" :string)
-           ("s" "9" :string)
+           ("j" "9" :string)
+           ("b" "9" :string)
            ("w" "9" :string)
-           ("d" "9" :string)
            ("p" "9" :string)
-           ("q" "9" :string)
-           ("b" "9" :string)
-           ("j" "9" :string)
-           ("e" "9" :string)
            ))
 
 (define-rule-set "lt-ignore-special"
 
-  :rules  (("!" "" :string)
+  :rules  (("-" "" :string)
+           ("'" "" :string)
            ("?" "" :string)
-           ("-" "" :string)
            ("." "" :string)
-           ("'" "" :string)
+           ("!" "" :string)
            ))
 
 (define-rule-set "lt-resolve-special"
 
-  :rules  (("ū" "�" :string)
+  :rules  (("Ž" "�" :string)
            ("ę" "�" :string)
-           ("č" "�" :string)
+           ("Ū" "�" :string)
+           ("Į" "�" :string)
+           ("ą" "�" :string)
            ("š" "�" :string)
+           ("č" "�" :string)
+           ("ch" "�" :string)
            ("ė" "�" :string)
-           ("ą" "�" :string)
-           ("Ą" "�" :string)
            ("Ch" "�" :string)
-           ("Ė" "�" :string)
-           ("Ž" "�" :string)
            ("ž" "�" :string)
-           ("CH" "�" :string)
            ("Č" "�" :string)
-           ("Š" "�" :string)
-           ("į" "�" :string)
-           ("ų" "�" :string)
+           ("Ą" "�" :string)
            ("Ę" "�" :string)
-           ("ch" "�" :string)
-           ("Ū" "�" :string)
-           ("Į" "�" :string)
+           ("ų" "�" :string)
+           ("ū" "�" :string)
            ("Ų" "�" :string)
+           ("Ė" "�" :string)
+           ("į" "�" :string)
+           ("CH" "�" :string)
+           ("Š" "�" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("O" "�" :string)
-           ("S" "�" :string)
-           ("Z" "�" :string)
-           ("J" "�" :string)
-           ("n" "�" :string)
-           ("u" "�" :string)
-           ("L" "�" :string)
-           ("D" "�" :string)
-           ("U" "�" :string)
+           ("w" "�" :string)
+           ("j" "�" :string)
+           ("b" "�" :string)
+           ("R" "�" :string)
+           ("p" "�" :string)
+           ("T" "�" :string)
            ("P" "�" :string)
-           ("H" "�" :string)
+           ("m" "�" :string)
+           ("S" "�" :string)
            ("N" "�" :string)
-           ("a" "�" :string)
-           ("t" "�" :string)
-           ("l" "�" :string)
+           ("Q" "�" :string)
+           ("D" "�" :string)
+           ("A" "�" :string)
+           ("c" "�" :string)
+           ("x" "�" :string)
+           ("i" "�" :string)
+           ("W" "�" :string)
            ("v" "�" :string)
-           ("R" "�" :string)
+           ("u" "�" :string)
            ("k" "�" :string)
-           ("z" "�" :string)
-           ("B" "�" :string)
-           ("g" "�" :string)
-           ("f" "�" :string)
-           ("i" "�" :string)
-           ("X" "�" :string)
+           ("e" "�" :string)
            ("G" "�" :string)
-           ("A" "�" :string)
-           ("x" "�" :string)
-           ("r" "�" :string)
-           ("c" "�" :string)
-           ("y" "�" :string)
-           ("I" "�" :string)
-           ("Q" "�" :string)
-           ("V" "�" :string)
-           ("w" "�" :string)
            ("d" "�" :string)
-           ("E" "�" :string)
-           ("m" "�" :string)
-           ("F" "�" :string)
+           ("f" "�" :string)
            ("M" "�" :string)
+           ("g" "�" :string)
+           ("V" "�" :string)
+           ("L" "�" :string)
+           ("X" "�" :string)
+           ("n" "�" :string)
            ("Y" "�" :string)
+           ("y" "�" :string)
+           ("l" "�" :string)
+           ("r" "�" :string)
+           ("U" "�" :string)
+           ("q" "�" :string)
+           ("B" "�" :string)
+           ("E" "�" :string)
+           ("O" "�" :string)
+           ("H" "�" :string)
            ("h" "�" :string)
            ("s" "�" :string)
-           ("o" "�" :string)
-           ("j" "�" :string)
+           ("J" "�" :string)
            ("K" "�" :string)
-           ("e" "�" :string)
-           ("q" "�" :string)
-           ("W" "�" :string)
-           ("T" "�" :string)
-           ("p" "�" :string)
-           ("b" "�" :string)
+           ("Z" "�" :string)
+           ("t" "�" :string)
+           ("z" "�" :string)
+           ("o" "�" :string)
+           ("F" "�" :string)
            ("C" "�" :string)
+           ("I" "�" :string)
+           ("a" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/lower-sorbian/cp1250.xdy b/Master/texmf-dist/xindy/modules/lang/lower-sorbian/cp1250.xdy
index 00d57bf1306..c96b9fa6799 100644
--- a/Master/texmf-dist/xindy/modules/lang/lower-sorbian/cp1250.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/lower-sorbian/cp1250.xdy
@@ -42,160 +42,160 @@
 (define-rule-set "s1-alphabetize"
 
   :rules  (("Ch" "�" :string)
-           ("CH" "�" :string)
            ("ch" "�" :string)
+           ("CH" "�" :string)
            ("a" "�" :string)
            ("A" "�" :string)
            ("B" "�" :string)
            ("b" "�" :string)
            ("C" "�" :string)
            ("c" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("D" "�" :string)
            ("d" "�" :string)
            ("e" "�" :string)
            ("E" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("F" "�" :string)
            ("f" "�" :string)
-           ("g" "�" :string)
+           ("F" "�" :string)
            ("G" "�" :string)
-           ("H" "�" :string)
+           ("g" "�" :string)
            ("h" "�" :string)
-           ("I" "�" :string)
+           ("H" "�" :string)
            ("i" "�" :string)
-           ("j" "�" :string)
+           ("I" "�" :string)
            ("J" "�" :string)
+           ("j" "�" :string)
            ("K" "�" :string)
            ("k" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("L" "�" :string)
            ("l" "�" :string)
+           ("L" "�" :string)
            ("M" "�" :string)
            ("m" "�" :string)
-           ("N" "�" :string)
            ("n" "�" :string)
-           ("�" "�" :string)
+           ("N" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("o" "�" :string)
            ("O" "�" :string)
-           ("p" "�" :string)
            ("P" "�" :string)
-           ("q" "�" :string)
+           ("p" "�" :string)
            ("Q" "�" :string)
-           ("R" "�" :string)
+           ("q" "�" :string)
            ("r" "�" :string)
+           ("R" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("S" "�" :string)
            ("s" "�" :string)
+           ("S" "�" :string)
            ("�" "��" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("T" "�" :string)
+           ("�" "�" :string)
            ("t" "�" :string)
-           ("U" "�" :string)
+           ("T" "�" :string)
            ("u" "�" :string)
-           ("v" "�" :string)
+           ("U" "�" :string)
            ("V" "�" :string)
-           ("W" "�" :string)
+           ("v" "�" :string)
            ("w" "�" :string)
-           ("x" "�" :string)
+           ("W" "�" :string)
            ("X" "�" :string)
-           ("Y" "�" :string)
+           ("x" "�" :string)
            ("y" "�" :string)
+           ("Y" "�" :string)
            ("z" "�" :string)
            ("Z" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ))
 
 (define-rule-set "s1-resolve-diacritics"
 
-  :rules  (("ch" "�" :string)
+  :rules  (("Ch" "�" :string)
            ("CH" "�" :string)
-           ("Ch" "�" :string)
-           ("j" "�" :string)
+           ("ch" "�" :string)
+           ("w" "�" :string)
+           ("I" "�" :string)
+           ("g" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("k" "�" :string)
+           ("n" "�" :string)
+           ("d" "�" :string)
+           ("O" "�" :string)
+           ("�" "�" :string)
+           ("D" "�" :string)
+           ("b" "�" :string)
+           ("N" "�" :string)
+           ("Y" "�" :string)
+           ("�" "�" :string)
+           ("V" "�" :string)
+           ("r" "�" :string)
+           ("�" "�" :string)
+           ("f" "�" :string)
+           ("p" "�" :string)
+           ("U" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("v" "�" :string)
            ("�" "�" :string)
-           ("Z" "�" :string)
-           ("s" "�" :string)
            ("m" "�" :string)
+           ("S" "�" :string)
+           ("�" "�" :string)
+           ("L" "�" :string)
+           ("W" "�" :string)
+           ("q" "�" :string)
+           ("�" "�" :string)
+           ("H" "�" :string)
            ("l" "�" :string)
-           ("F" "�" :string)
            ("T" "�" :string)
-           ("u" "�" :string)
-           ("f" "�" :string)
-           ("g" "�" :string)
-           ("a" "�" :string)
-           ("B" "�" :string)
-           ("�" "�" :string)
+           ("s" "�" :string)
            ("A" "�" :string)
-           ("J" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("b" "�" :string)
            ("c" "�" :string)
+           ("h" "�" :string)
+           ("F" "�" :string)
+           ("Q" "�" :string)
            ("E" "�" :string)
-           ("w" "�" :string)
-           ("G" "�" :string)
-           ("i" "�" :string)
-           ("d" "�" :string)
-           ("t" "�" :string)
-           ("N" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("O" "�" :string)
-           ("�" "�" :string)
-           ("n" "�" :string)
-           ("�" "�" :string)
-           ("I" "�" :string)
+           ("R" "�" :string)
+           ("P" "�" :string)
+           ("�" "�" :string)
+           ("j" "�" :string)
+           ("M" "�" :string)
            ("e" "�" :string)
-           ("L" "�" :string)
            ("K" "�" :string)
-           ("�" "�" :string)
-           ("M" "�" :string)
-           ("y" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("v" "�" :string)
-           ("r" "�" :string)
+           ("a" "�" :string)
+           ("J" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("q" "�" :string)
-           ("x" "�" :string)
-           ("�" "�" :string)
-           ("R" "�" :string)
-           ("Y" "�" :string)
-           ("D" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("P" "�" :string)
-           ("U" "�" :string)
-           ("V" "�" :string)
            ("o" "�" :string)
-           ("�" "�" :string)
-           ("H" "�" :string)
-           ("W" "�" :string)
-           ("S" "�" :string)
-           ("Q" "�" :string)
+           ("i" "�" :string)
+           ("u" "�" :string)
            ("z" "�" :string)
-           ("X" "�" :string)
-           ("h" "�" :string)
-           ("k" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("C" "�" :string)
-           ("p" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("x" "�" :string)
+           ("B" "�" :string)
+           ("G" "�" :string)
+           ("�" "�" :string)
+           ("y" "�" :string)
+           ("t" "�" :string)
+           ("�" "�" :string)
+           ("X" "�" :string)
+           ("Z" "�" :string)
            ("�" "�" :string)
            ))
 
@@ -204,170 +204,170 @@
   :rules  (("CH" "7" :string)
            ("Ch" "8" :string)
            ("ch" "9" :string)
-           ("Y" "8" :string)
-           ("D" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("R" "8" :string)
-           ("M" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("I" "8" :string)
-           ("L" "8" :string)
-           ("K" "8" :string)
+           ("Z" "8" :string)
+           ("X" "8" :string)
+           ("G" "8" :string)
            ("�" "8" :string)
-           ("C" "8" :string)
+           ("B" "8" :string)
            ("�" "8" :string)
-           ("W" "8" :string)
+           ("C" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("K" "8" :string)
+           ("J" "8" :string)
+           ("M" "8" :string)
+           ("P" "8" :string)
+           ("E" "8" :string)
+           ("Q" "8" :string)
+           ("F" "8" :string)
+           ("R" "8" :string)
            ("H" "8" :string)
+           ("T" "8" :string)
+           ("A" "8" :string)
+           ("W" "8" :string)
            ("S" "8" :string)
-           ("Q" "8" :string)
-           ("X" "8" :string)
-           ("P" "8" :string)
-           ("U" "8" :string)
-           ("V" "8" :string)
+           ("L" "8" :string)
            ("�" "8" :string)
-           ("T" "8" :string)
-           ("F" "8" :string)
+           ("U" "8" :string)
            ("�" "8" :string)
-           ("Z" "8" :string)
-           ("N" "8" :string)
-           ("O" "8" :string)
-           ("�" "8" :string)
-           ("E" "8" :string)
-           ("G" "8" :string)
-           ("A" "8" :string)
-           ("J" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
-           ("B" "8" :string)
-           ("�" "9" :string)
+           ("Y" "8" :string)
+           ("V" "8" :string)
+           ("D" "8" :string)
+           ("�" "8" :string)
+           ("O" "8" :string)
+           ("N" "8" :string)
+           ("�" "8" :string)
+           ("I" "8" :string)
+           ("t" "9" :string)
+           ("�" "9" :string)
+           ("y" "9" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
-           ("q" "9" :string)
            ("x" "9" :string)
-           ("y" "9" :string)
-           ("v" "9" :string)
-           ("r" "9" :string)
-           ("�" "9" :string)
-           ("e" "9" :string)
-           ("�" "9" :string)
-           ("p" "9" :string)
-           ("k" "9" :string)
-           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("u" "9" :string)
            ("z" "9" :string)
-           ("h" "9" :string)
            ("o" "9" :string)
-           ("u" "9" :string)
-           ("g" "9" :string)
-           ("f" "9" :string)
-           ("m" "9" :string)
-           ("l" "9" :string)
-           ("s" "9" :string)
-           ("j" "9" :string)
-           ("t" "9" :string)
+           ("i" "9" :string)
+           ("a" "9" :string)
            ("�" "9" :string)
+           ("j" "9" :string)
+           ("e" "9" :string)
+           ("�" "9" :string)
+           ("h" "9" :string)
+           ("c" "9" :string)
+           ("s" "9" :string)
+           ("l" "9" :string)
+           ("�" "9" :string)
+           ("q" "9" :string)
+           ("m" "9" :string)
            ("�" "9" :string)
-           ("n" "9" :string)
-           ("w" "9" :string)
+           ("p" "9" :string)
+           ("f" "9" :string)
+           ("�" "9" :string)
+           ("v" "9" :string)
+           ("r" "9" :string)
            ("d" "9" :string)
-           ("i" "9" :string)
-           ("�" "9" :string)
-           ("c" "9" :string)
            ("b" "9" :string)
-           ("a" "9" :string)
-           ("�" "9" :string)
+           ("�" "9" :string)
+           ("g" "9" :string)
+           ("w" "9" :string)
+           ("n" "9" :string)
+           ("k" "9" :string)
            ("�" "99" :string)
            ))
 
 (define-rule-set "s1-ignore-special"
 
-  :rules  (("." "" :string)
-           ("'" "" :string)
-           ("!" "" :string)
-           ("?" "" :string)
+  :rules  (("'" "" :string)
            ("-" "" :string)
+           ("." "" :string)
+           ("?" "" :string)
+           ("!" "" :string)
            ))
 
 (define-rule-set "s1-resolve-special"
 
-  :rules  (("Ch" "�" :string)
-           ("CH" "�" :string)
+  :rules  (("CH" "�" :string)
            ("ch" "�" :string)
+           ("Ch" "�" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("R" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("q" "�" :string)
+           ("�" "�" :string)
            ("x" "�" :string)
+           ("B" "�" :string)
+           ("�" "�" :string)
+           ("C" "�" :string)
+           ("t" "�" :string)
+           ("�" "�" :string)
+           ("X" "�" :string)
+           ("Z" "�" :string)
+           ("G" "�" :string)
+           ("�" "�" :string)
+           ("y" "�" :string)
+           ("j" "�" :string)
+           ("M" "�" :string)
+           ("e" "�" :string)
+           ("P" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("D" "�" :string)
-           ("Y" "�" :string)
-           ("L" "�" :string)
-           ("e" "�" :string)
-           ("�" "�" :string)
+           ("o" "�" :string)
+           ("i" "�" :string)
+           ("u" "�" :string)
+           ("z" "�" :string)
            ("K" "�" :string)
-           ("I" "�" :string)
+           ("a" "�" :string)
+           ("J" "�" :string)
+           ("�" "�" :string)
+           ("W" "�" :string)
+           ("q" "�" :string)
            ("�" "�" :string)
-           ("r" "�" :string)
-           ("v" "�" :string)
-           ("M" "�" :string)
-           ("y" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("k" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("p" "�" :string)
-           ("C" "�" :string)
-           ("o" "�" :string)
-           ("�" "�" :string)
-           ("U" "�" :string)
-           ("P" "�" :string)
-           ("V" "�" :string)
-           ("X" "�" :string)
-           ("h" "�" :string)
+           ("m" "�" :string)
            ("S" "�" :string)
-           ("W" "�" :string)
-           ("H" "�" :string)
-           ("z" "�" :string)
+           ("L" "�" :string)
+           ("�" "�" :string)
            ("Q" "�" :string)
-           ("l" "�" :string)
            ("F" "�" :string)
-           ("m" "�" :string)
-           ("g" "�" :string)
-           ("f" "�" :string)
-           ("T" "�" :string)
-           ("u" "�" :string)
-           ("Z" "�" :string)
-           ("j" "�" :string)
-           ("�" "�" :string)
+           ("E" "�" :string)
+           ("R" "�" :string)
+           ("H" "�" :string)
            ("s" "�" :string)
+           ("T" "�" :string)
+           ("A" "�" :string)
+           ("l" "�" :string)
+           ("c" "�" :string)
+           ("h" "�" :string)
            ("d" "�" :string)
-           ("i" "�" :string)
-           ("w" "�" :string)
-           ("E" "�" :string)
-           ("G" "�" :string)
            ("O" "�" :string)
-           ("n" "�" :string)
-           ("�" "�" :string)
-           ("t" "�" :string)
+           ("�" "�" :string)
+           ("D" "�" :string)
+           ("b" "�" :string)
            ("N" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("B" "�" :string)
-           ("a" "�" :string)
-           ("�" "�" :string)
-           ("J" "�" :string)
-           ("�" "�" :string)
-           ("c" "�" :string)
+           ("w" "�" :string)
+           ("I" "�" :string)
+           ("�" "�" :string)
+           ("g" "�" :string)
+           ("�" "�" :string)
+           ("k" "�" :string)
+           ("n" "�" :string)
+           ("�" "�" :string)
+           ("f" "�" :string)
+           ("�" "�" :string)
+           ("U" "�" :string)
+           ("p" "�" :string)
+           ("�" "�" :string)
+           ("v" "�" :string)
+           ("�" "�" :string)
+           ("Y" "�" :string)
            ("�" "�" :string)
-           ("b" "�" :string)
-           ("A" "�" :string)
+           ("V" "�" :string)
+           ("r" "�" :string)
            ("�" "��" :string)
            ("-" "�" :string)
            ("'" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/lower-sorbian/latin2.xdy b/Master/texmf-dist/xindy/modules/lang/lower-sorbian/latin2.xdy
index 0146023bd7c..57bf47022da 100644
--- a/Master/texmf-dist/xindy/modules/lang/lower-sorbian/latin2.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/lower-sorbian/latin2.xdy
@@ -48,154 +48,154 @@
            ("a" "�" :string)
            ("B" "�" :string)
            ("b" "�" :string)
-           ("C" "�" :string)
            ("c" "�" :string)
+           ("C" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("d" "�" :string)
            ("D" "�" :string)
-           ("e" "�" :string)
+           ("d" "�" :string)
            ("E" "�" :string)
-           ("�" "�" :string)
+           ("e" "�" :string)
            ("�" "�" :string)
-           ("f" "�" :string)
+           ("�" "�" :string)
            ("F" "�" :string)
+           ("f" "�" :string)
            ("g" "�" :string)
            ("G" "�" :string)
            ("H" "�" :string)
            ("h" "�" :string)
            ("i" "�" :string)
            ("I" "�" :string)
-           ("j" "�" :string)
            ("J" "�" :string)
-           ("K" "�" :string)
+           ("j" "�" :string)
            ("k" "�" :string)
-           ("�" "�" :string)
+           ("K" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("l" "�" :string)
            ("L" "�" :string)
-           ("m" "�" :string)
            ("M" "�" :string)
+           ("m" "�" :string)
            ("N" "�" :string)
            ("n" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("O" "�" :string)
            ("o" "�" :string)
-           ("P" "�" :string)
            ("p" "�" :string)
+           ("P" "�" :string)
            ("q" "�" :string)
            ("Q" "�" :string)
-           ("R" "�" :string)
            ("r" "�" :string)
-           ("�" "�" :string)
+           ("R" "�" :string)
            ("�" "�" :string)
-           ("s" "�" :string)
+           ("�" "�" :string)
            ("S" "�" :string)
+           ("s" "�" :string)
            ("�" "��" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("T" "�" :string)
            ("t" "�" :string)
+           ("T" "�" :string)
            ("U" "�" :string)
            ("u" "�" :string)
            ("V" "�" :string)
            ("v" "�" :string)
-           ("W" "�" :string)
            ("w" "�" :string)
+           ("W" "�" :string)
            ("X" "�" :string)
            ("x" "�" :string)
            ("y" "�" :string)
            ("Y" "�" :string)
-           ("Z" "�" :string)
            ("z" "�" :string)
-           ("�" "�" :string)
+           ("Z" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ))
 
 (define-rule-set "s1-resolve-diacritics"
 
-  :rules  (("CH" "�" :string)
+  :rules  (("Ch" "�" :string)
+           ("CH" "�" :string)
            ("ch" "�" :string)
-           ("Ch" "�" :string)
-           ("M" "�" :string)
-           ("I" "�" :string)
            ("o" "�" :string)
-           ("y" "�" :string)
-           ("v" "�" :string)
-           ("A" "�" :string)
-           ("e" "�" :string)
-           ("a" "�" :string)
-           ("Q" "�" :string)
-           ("b" "�" :string)
-           ("G" "�" :string)
-           ("B" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("h" "�" :string)
-           ("F" "�" :string)
-           ("t" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("X" "�" :string)
-           ("V" "�" :string)
-           ("N" "�" :string)
-           ("p" "�" :string)
-           ("L" "�" :string)
-           ("�" "�" :string)
-           ("P" "�" :string)
            ("z" "�" :string)
-           ("E" "�" :string)
-           ("u" "�" :string)
-           ("Y" "�" :string)
-           ("n" "�" :string)
-           ("�" "�" :string)
+           ("q" "�" :string)
+           ("�" "�" :string)
+           ("S" "�" :string)
+           ("R" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("r" "�" :string)
            ("�" "�" :string)
-           ("x" "�" :string)
+           ("w" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("E" "�" :string)
+           ("J" "�" :string)
            ("W" "�" :string)
+           ("P" "�" :string)
+           ("v" "�" :string)
+           ("�" "�" :string)
+           ("K" "�" :string)
+           ("D" "�" :string)
+           ("V" "�" :string)
+           ("�" "�" :string)
+           ("c" "�" :string)
+           ("O" "�" :string)
+           ("i" "�" :string)
+           ("t" "�" :string)
            ("k" "�" :string)
-           ("s" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("B" "�" :string)
+           ("�" "�" :string)
+           ("N" "�" :string)
+           ("p" "�" :string)
+           ("F" "�" :string)
            ("g" "�" :string)
-           ("�" "�" :string)
-           ("O" "�" :string)
-           ("�" "�" :string)
-           ("K" "�" :string)
+           ("�" "�" :string)
+           ("h" "�" :string)
            ("f" "�" :string)
-           ("R" "�" :string)
-           ("�" "�" :string)
-           ("Z" "�" :string)
+           ("�" "�" :string)
+           ("b" "�" :string)
+           ("m" "�" :string)
+           ("�" "�" :string)
+           ("Y" "�" :string)
            ("T" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("M" "�" :string)
+           ("L" "�" :string)
+           ("Z" "�" :string)
+           ("a" "�" :string)
+           ("I" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("w" "�" :string)
-           ("U" "�" :string)
-           ("j" "�" :string)
+           ("H" "�" :string)
            ("�" "�" :string)
-           ("i" "�" :string)
-           ("J" "�" :string)
-           ("S" "�" :string)
-           ("m" "�" :string)
            ("�" "�" :string)
-           ("H" "�" :string)
-           ("�" "�" :string)
-           ("d" "�" :string)
-           ("q" "�" :string)
-           ("l" "�" :string)
-           ("D" "�" :string)
            ("C" "�" :string)
-           ("�" "�" :string)
-           ("c" "�" :string)
+           ("�" "�" :string)
+           ("l" "�" :string)
+           ("s" "�" :string)
+           ("y" "�" :string)
+           ("e" "�" :string)
+           ("U" "�" :string)
+           ("d" "�" :string)
+           ("u" "�" :string)
+           ("A" "�" :string)
+           ("Q" "�" :string)
+           ("x" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("G" "�" :string)
+           ("j" "�" :string)
+           ("�" "�" :string)
+           ("n" "�" :string)
            ("�" "�" :string)
            ))
 
@@ -204,170 +204,170 @@
   :rules  (("CH" "7" :string)
            ("Ch" "8" :string)
            ("ch" "9" :string)
+           ("�" "8" :string)
+           ("B" "8" :string)
+           ("F" "8" :string)
+           ("N" "8" :string)
+           ("O" "8" :string)
+           ("V" "8" :string)
+           ("K" "8" :string)
            ("D" "8" :string)
-           ("C" "8" :string)
-           ("�" "8" :string)
-           ("H" "8" :string)
+           ("W" "8" :string)
+           ("P" "8" :string)
            ("J" "8" :string)
+           ("E" "8" :string)
+           ("�" "8" :string)
+           ("R" "8" :string)
            ("S" "8" :string)
+           ("�" "8" :string)
+           ("X" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("G" "8" :string)
+           ("Q" "8" :string)
+           ("A" "8" :string)
            ("U" "8" :string)
+           ("H" "8" :string)
            ("�" "8" :string)
-           ("T" "8" :string)
+           ("C" "8" :string)
            ("Z" "8" :string)
+           ("I" "8" :string)
            ("�" "8" :string)
-           ("O" "8" :string)
-           ("R" "8" :string)
-           ("K" "8" :string)
-           ("�" "8" :string)
+           ("L" "8" :string)
+           ("T" "8" :string)
            ("�" "8" :string)
-           ("W" "8" :string)
-           ("E" "8" :string)
-           ("�" "8" :string)
+           ("M" "8" :string)
            ("Y" "8" :string)
            ("�" "8" :string)
-           ("L" "8" :string)
-           ("P" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
-           ("X" "8" :string)
-           ("N" "8" :string)
-           ("V" "8" :string)
-           ("B" "8" :string)
-           ("G" "8" :string)
-           ("�" "8" :string)
-           ("F" "8" :string)
-           ("Q" "8" :string)
-           ("M" "8" :string)
-           ("I" "8" :string)
-           ("A" "8" :string)
-           ("q" "9" :string)
-           ("l" "9" :string)
-           ("c" "9" :string)
-           ("�" "9" :string)
-           ("m" "9" :string)
-           ("d" "9" :string)
-           ("�" "9" :string)
+           ("g" "9" :string)
+           ("p" "9" :string)
+           ("t" "9" :string)
+           ("k" "9" :string)
            ("i" "9" :string)
-           ("w" "9" :string)
-           ("�" "9" :string)
-           ("j" "9" :string)
+           ("c" "9" :string)
            ("�" "9" :string)
+           ("�" "9" :string)
+           ("v" "9" :string)
+           ("�" "9" :string)
+           ("w" "9" :string)
            ("�" "9" :string)
-           ("f" "9" :string)
-           ("�" "9" :string)
-           ("s" "9" :string)
-           ("g" "9" :string)
-           ("k" "9" :string)
+           ("r" "9" :string)
            ("�" "9" :string)
+           ("z" "9" :string)
+           ("q" "9" :string)
+           ("o" "9" :string)
+           ("n" "9" :string)
+           ("�" "9" :string)
+           ("j" "9" :string)
            ("x" "9" :string)
-           ("r" "9" :string)
            ("u" "9" :string)
-           ("�" "9" :string)
-           ("n" "9" :string)
+           ("d" "9" :string)
+           ("e" "9" :string)
+           ("y" "9" :string)
            ("�" "9" :string)
-           ("p" "9" :string)
-           ("z" "9" :string)
-           ("t" "9" :string)
-           ("�" "9" :string)
-           ("h" "9" :string)
+           ("l" "9" :string)
+           ("s" "9" :string)
+           ("�" "9" :string)
            ("a" "9" :string)
-           ("e" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
            ("b" "9" :string)
-           ("y" "9" :string)
-           ("v" "9" :string)
-           ("o" "9" :string)
+           ("m" "9" :string)
+           ("f" "9" :string)
+           ("h" "9" :string)
            ("�" "99" :string)
            ))
 
 (define-rule-set "s1-ignore-special"
 
-  :rules  (("." "" :string)
-           ("!" "" :string)
+  :rules  (("-" "" :string)
            ("'" "" :string)
            ("?" "" :string)
-           ("-" "" :string)
+           ("!" "" :string)
+           ("." "" :string)
            ))
 
 (define-rule-set "s1-resolve-special"
 
-  :rules  (("CH" "�" :string)
+  :rules  (("Ch" "�" :string)
+           ("CH" "�" :string)
            ("ch" "�" :string)
-           ("Ch" "�" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("F" "�" :string)
-           ("�" "�" :string)
-           ("h" "�" :string)
-           ("�" "�" :string)
-           ("G" "�" :string)
-           ("B" "�" :string)
-           ("V" "�" :string)
-           ("N" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("r" "�" :string)
+           ("�" "�" :string)
+           ("w" "�" :string)
+           ("�" "�" :string)
+           ("E" "�" :string)
+           ("v" "�" :string)
+           ("J" "�" :string)
+           ("W" "�" :string)
+           ("P" "�" :string)
            ("X" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("t" "�" :string)
            ("o" "�" :string)
-           ("y" "�" :string)
-           ("v" "�" :string)
-           ("A" "�" :string)
-           ("I" "�" :string)
-           ("M" "�" :string)
-           ("b" "�" :string)
-           ("Q" "�" :string)
-           ("e" "�" :string)
-           ("a" "�" :string)
-           ("r" "�" :string)
-           ("x" "�" :string)
-           ("�" "�" :string)
+           ("q" "�" :string)
            ("z" "�" :string)
-           ("P" "�" :string)
-           ("L" "�" :string)
+           ("�" "�" :string)
+           ("S" "�" :string)
+           ("R" "�" :string)
+           ("i" "�" :string)
+           ("k" "�" :string)
+           ("t" "�" :string)
+           ("N" "�" :string)
+           ("F" "�" :string)
            ("p" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("n" "�" :string)
-           ("Y" "�" :string)
+           ("B" "�" :string)
+           ("�" "�" :string)
+           ("g" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("E" "�" :string)
-           ("u" "�" :string)
+           ("D" "�" :string)
            ("K" "�" :string)
-           ("R" "�" :string)
-           ("f" "�" :string)
+           ("�" "�" :string)
+           ("V" "�" :string)
            ("O" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("Z" "�" :string)
+           ("c" "�" :string)
+           ("M" "�" :string)
+           ("�" "�" :string)
            ("T" "�" :string)
-           ("�" "�" :string)
-           ("k" "�" :string)
-           ("W" "�" :string)
            ("�" "�" :string)
-           ("g" "�" :string)
-           ("s" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("d" "�" :string)
-           ("H" "�" :string)
+           ("L" "�" :string)
+           ("�" "�" :string)
+           ("I" "�" :string)
+           ("Z" "�" :string)
+           ("a" "�" :string)
+           ("h" "�" :string)
+           ("f" "�" :string)
+           ("�" "�" :string)
            ("m" "�" :string)
+           ("�" "�" :string)
+           ("b" "�" :string)
+           ("Y" "�" :string)
+           ("�" "�" :string)
+           ("x" "�" :string)
+           ("G" "�" :string)
+           ("�" "�" :string)
+           ("j" "�" :string)
+           ("�" "�" :string)
+           ("n" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("c" "�" :string)
            ("C" "�" :string)
-           ("q" "�" :string)
-           ("D" "�" :string)
-           ("l" "�" :string)
-           ("j" "�" :string)
+           ("H" "�" :string)
            ("�" "�" :string)
+           ("s" "�" :string)
+           ("l" "�" :string)
+           ("�" "�" :string)
            ("U" "�" :string)
-           ("w" "�" :string)
-           ("�" "�" :string)
-           ("S" "�" :string)
-           ("i" "�" :string)
-           ("J" "�" :string)
+           ("y" "�" :string)
+           ("e" "�" :string)
+           ("A" "�" :string)
+           ("Q" "�" :string)
+           ("d" "�" :string)
+           ("u" "�" :string)
            ("�" "��" :string)
            ("-" "�" :string)
            ("'" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/lower-sorbian/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/lower-sorbian/utf8.xdy
index fd22fa62f19..a83956c4483 100644
--- a/Master/texmf-dist/xindy/modules/lang/lower-sorbian/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/lower-sorbian/utf8.xdy
@@ -41,28 +41,28 @@
 
 (define-rule-set "s1-alphabetize"
 
-  :rules  (("Č" "�" :string)
-           ("č" "�" :string)
-           ("Ć" "�" :string)
+  :rules  (("č" "�" :string)
+           ("Č" "�" :string)
            ("ć" "�" :string)
+           ("Ć" "�" :string)
            ("ě" "�" :string)
            ("Ě" "�" :string)
-           ("CH" "�" :string)
            ("Ch" "�" :string)
            ("ch" "�" :string)
-           ("Ł" "�" :string)
+           ("CH" "�" :string)
            ("ł" "�" :string)
+           ("Ł" "�" :string)
            ("ń" "�" :string)
            ("Ń" "�" :string)
-           ("Ŕ" "�" :string)
            ("ŕ" "�" :string)
+           ("Ŕ" "�" :string)
            ("ß" "��" :string)
-           ("š" "�" :string)
            ("Š" "�" :string)
-           ("ś" "�" :string)
+           ("š" "�" :string)
            ("Ś" "�" :string)
-           ("Ž" "�" :string)
+           ("ś" "�" :string)
            ("ž" "�" :string)
+           ("Ž" "�" :string)
            ("ź" "�" :string)
            ("Ź" "�" :string)
            ("A" "�" :string)
@@ -73,302 +73,302 @@
            ("C" "�" :string)
            ("D" "�" :string)
            ("d" "�" :string)
-           ("E" "�" :string)
            ("e" "�" :string)
-           ("f" "�" :string)
+           ("E" "�" :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)
-           ("k" "�" :string)
            ("K" "�" :string)
+           ("k" "�" :string)
            ("l" "�" :string)
            ("L" "�" :string)
            ("m" "�" :string)
            ("M" "�" :string)
            ("N" "�" :string)
            ("n" "�" :string)
-           ("O" "�" :string)
            ("o" "�" :string)
+           ("O" "�" :string)
            ("p" "�" :string)
            ("P" "�" :string)
            ("Q" "�" :string)
            ("q" "�" :string)
-           ("R" "�" :string)
            ("r" "�" :string)
-           ("S" "�" :string)
+           ("R" "�" :string)
            ("s" "�" :string)
+           ("S" "�" :string)
            ("T" "�" :string)
            ("t" "�" :string)
            ("U" "�" :string)
            ("u" "�" :string)
            ("V" "�" :string)
            ("v" "�" :string)
-           ("w" "�" :string)
            ("W" "�" :string)
-           ("X" "�" :string)
+           ("w" "�" :string)
            ("x" "�" :string)
-           ("Y" "�" :string)
+           ("X" "�" :string)
            ("y" "�" :string)
+           ("Y" "�" :string)
            ("Z" "�" :string)
            ("z" "�" :string)
            ))
 
 (define-rule-set "s1-resolve-diacritics"
 
-  :rules  (("Ź" "�" :string)
-           ("Ł" "�" :string)
-           ("Ž" "�" :string)
-           ("ź" "�" :string)
+  :rules  (("ž" "�" :string)
+           ("š" "�" :string)
+           ("Š" "�" :string)
            ("ć" "�" :string)
+           ("Ž" "�" :string)
+           ("ń" "�" :string)
            ("Ch" "�" :string)
-           ("Ŕ" "�" :string)
-           ("č" "�" :string)
-           ("ł" "�" :string)
-           ("ŕ" "�" :string)
-           ("ž" "�" :string)
+           ("Ć" "�" :string)
            ("ch" "�" :string)
-           ("š" "�" :string)
            ("Ś" "�" :string)
-           ("ś" "�" :string)
-           ("ě" "�" :string)
+           ("Ń" "�" :string)
            ("Č" "�" :string)
            ("CH" "�" :string)
-           ("Š" "�" :string)
-           ("Ć" "�" :string)
-           ("Ń" "�" :string)
            ("Ě" "�" :string)
-           ("ń" "�" :string)
+           ("ź" "�" :string)
+           ("č" "�" :string)
+           ("ě" "�" :string)
+           ("ł" "�" :string)
+           ("ŕ" "�" :string)
+           ("ś" "�" :string)
+           ("Ź" "�" :string)
+           ("Ł" "�" :string)
+           ("Ŕ" "�" :string)
            ("ß" "�" :string)
-           ("n" "�" :string)
-           ("A" "�" :string)
+           ("m" "�" :string)
+           ("D" "�" :string)
+           ("U" "�" :string)
            ("W" "�" :string)
-           ("J" "�" :string)
+           ("l" "�" :string)
+           ("F" "�" :string)
+           ("w" "�" :string)
            ("N" "�" :string)
-           ("O" "�" :string)
+           ("c" "�" :string)
            ("K" "�" :string)
-           ("b" "�" :string)
-           ("C" "�" :string)
-           ("g" "�" :string)
-           ("a" "�" :string)
-           ("F" "�" :string)
-           ("o" "�" :string)
-           ("I" "�" :string)
-           ("B" "�" :string)
+           ("y" "�" :string)
+           ("j" "�" :string)
            ("Q" "�" :string)
-           ("L" "�" :string)
-           ("P" "�" :string)
-           ("s" "�" :string)
-           ("t" "�" :string)
+           ("J" "�" :string)
+           ("T" "�" :string)
+           ("k" "�" :string)
+           ("A" "�" :string)
+           ("M" "�" :string)
+           ("G" "�" :string)
            ("d" "�" :string)
+           ("g" "�" :string)
+           ("r" "�" :string)
+           ("h" "�" :string)
+           ("Y" "�" :string)
+           ("o" "�" :string)
            ("x" "�" :string)
-           ("q" "�" :string)
+           ("n" "�" :string)
            ("V" "�" :string)
-           ("Z" "�" :string)
+           ("C" "�" :string)
+           ("b" "�" :string)
            ("z" "�" :string)
-           ("m" "�" :string)
-           ("S" "�" :string)
-           ("D" "�" :string)
-           ("Y" "�" :string)
-           ("c" "�" :string)
-           ("U" "�" :string)
-           ("k" "�" :string)
+           ("i" "�" :string)
+           ("Z" "�" :string)
            ("p" "�" :string)
-           ("E" "�" :string)
-           ("H" "�" :string)
-           ("j" "�" :string)
-           ("r" "�" :string)
-           ("G" "�" :string)
+           ("s" "�" :string)
+           ("O" "�" :string)
+           ("q" "�" :string)
+           ("t" "�" :string)
+           ("S" "�" :string)
            ("X" "�" :string)
+           ("H" "�" :string)
+           ("e" "�" :string)
            ("R" "�" :string)
-           ("i" "�" :string)
+           ("a" "�" :string)
+           ("I" "�" :string)
+           ("L" "�" :string)
+           ("E" "�" :string)
            ("v" "�" :string)
-           ("h" "�" :string)
-           ("w" "�" :string)
+           ("B" "�" :string)
            ("u" "�" :string)
-           ("l" "�" :string)
-           ("e" "�" :string)
-           ("y" "�" :string)
-           ("M" "�" :string)
-           ("T" "�" :string)
+           ("P" "�" :string)
            ("f" "�" :string)
            ))
 
 (define-rule-set "s1-resolve-case"
 
   :rules  (("CH" "7" :string)
-           ("Ŕ" "8" :string)
-           ("Ch" "8" :string)
-           ("Ł" "8" :string)
-           ("Ź" "8" :string)
-           ("Ž" "8" :string)
-           ("Ě" "8" :string)
+           ("Ś" "8" :string)
            ("Ń" "8" :string)
-           ("Ć" "8" :string)
-           ("Š" "8" :string)
            ("Č" "8" :string)
-           ("Ś" "8" :string)
-           ("ž" "9" :string)
-           ("ch" "9" :string)
+           ("Ě" "8" :string)
+           ("Š" "8" :string)
+           ("Ž" "8" :string)
+           ("Ch" "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)
+           ("ch" "9" :string)
+           ("ł" "9" :string)
+           ("ŕ" "9" :string)
            ("ś" "9" :string)
            ("ß" "99" :string)
-           ("L" "8" :string)
-           ("P" "8" :string)
-           ("I" "8" :string)
+           ("J" "8" :string)
            ("Q" "8" :string)
-           ("B" "8" :string)
+           ("T" "8" :string)
+           ("A" "8" :string)
+           ("M" "8" :string)
+           ("G" "8" :string)
+           ("Y" "8" :string)
+           ("D" "8" :string)
+           ("U" "8" :string)
+           ("W" "8" :string)
            ("F" "8" :string)
-           ("C" "8" :string)
            ("N" "8" :string)
-           ("O" "8" :string)
            ("K" "8" :string)
-           ("W" "8" :string)
-           ("J" "8" :string)
-           ("A" "8" :string)
-           ("M" "8" :string)
-           ("T" "8" :string)
            ("R" "8" :string)
            ("X" "8" :string)
+           ("S" "8" :string)
            ("H" "8" :string)
-           ("U" "8" :string)
            ("E" "8" :string)
-           ("G" "8" :string)
-           ("D" "8" :string)
-           ("Y" "8" :string)
-           ("S" "8" :string)
-           ("Z" "8" :string)
+           ("I" "8" :string)
+           ("L" "8" :string)
+           ("B" "8" :string)
+           ("P" "8" :string)
            ("V" "8" :string)
-           ("x" "9" :string)
-           ("q" "9" :string)
-           ("t" "9" :string)
-           ("s" "9" :string)
+           ("C" "8" :string)
+           ("Z" "8" :string)
+           ("O" "8" :string)
+           ("k" "9" :string)
            ("d" "9" :string)
            ("g" "9" :string)
-           ("a" "9" :string)
+           ("r" "9" :string)
+           ("h" "9" :string)
+           ("x" "9" :string)
            ("o" "9" :string)
-           ("b" "9" :string)
-           ("n" "9" :string)
-           ("f" "9" :string)
+           ("m" "9" :string)
            ("l" "9" :string)
+           ("w" "9" :string)
+           ("c" "9" :string)
            ("y" "9" :string)
+           ("j" "9" :string)
+           ("q" "9" :string)
+           ("t" "9" :string)
            ("e" "9" :string)
-           ("w" "9" :string)
+           ("a" "9" :string)
            ("v" "9" :string)
-           ("h" "9" :string)
+           ("f" "9" :string)
            ("u" "9" :string)
+           ("n" "9" :string)
+           ("b" "9" :string)
+           ("z" "9" :string)
            ("i" "9" :string)
-           ("j" "9" :string)
-           ("c" "9" :string)
-           ("k" "9" :string)
            ("p" "9" :string)
-           ("r" "9" :string)
-           ("m" "9" :string)
-           ("z" "9" :string)
+           ("s" "9" :string)
            ))
 
 (define-rule-set "s1-ignore-special"
 
-  :rules  (("." "" :string)
-           ("'" "" :string)
-           ("?" "" :string)
-           ("!" "" :string)
+  :rules  (("?" "" :string)
            ("-" "" :string)
+           ("." "" :string)
+           ("!" "" :string)
+           ("'" "" :string)
            ))
 
 (define-rule-set "s1-resolve-special"
 
-  :rules  (("ś" "�" :string)
-           ("Ś" "�" :string)
-           ("š" "�" :string)
+  :rules  (("Ź" "�" :string)
+           ("Ł" "�" :string)
+           ("Ŕ" "�" :string)
+           ("ś" "�" :string)
+           ("ŕ" "�" :string)
+           ("ł" "�" :string)
+           ("č" "�" :string)
            ("ě" "�" :string)
-           ("CH" "�" :string)
+           ("ź" "�" :string)
            ("Č" "�" :string)
-           ("Ć" "�" :string)
-           ("Š" "�" :string)
-           ("Ń" "�" :string)
+           ("CH" "�" :string)
            ("Ě" "�" :string)
-           ("ń" "�" :string)
+           ("Ń" "�" :string)
+           ("Ś" "�" :string)
+           ("Ć" "�" :string)
            ("Ž" "�" :string)
-           ("Ł" "�" :string)
-           ("Ź" "�" :string)
-           ("ć" "�" :string)
-           ("ź" "�" :string)
+           ("ń" "�" :string)
            ("Ch" "�" :string)
-           ("č" "�" :string)
-           ("Ŕ" "�" :string)
-           ("ł" "�" :string)
-           ("ŕ" "�" :string)
            ("ch" "�" :string)
+           ("Š" "�" :string)
            ("ž" "�" :string)
+           ("š" "�" :string)
+           ("ć" "�" :string)
            ("ß" "��" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("Z" "�" :string)
-           ("z" "�" :string)
-           ("V" "�" :string)
-           ("D" "�" :string)
-           ("Y" "�" :string)
-           ("m" "�" :string)
-           ("S" "�" :string)
-           ("G" "�" :string)
-           ("r" "�" :string)
-           ("j" "�" :string)
-           ("H" "�" :string)
-           ("U" "�" :string)
-           ("k" "�" :string)
-           ("c" "�" :string)
-           ("p" "�" :string)
+           ("v" "�" :string)
            ("E" "�" :string)
+           ("I" "�" :string)
+           ("L" "�" :string)
+           ("f" "�" :string)
+           ("u" "�" :string)
+           ("P" "�" :string)
+           ("B" "�" :string)
+           ("t" "�" :string)
+           ("q" "�" :string)
+           ("e" "�" :string)
+           ("a" "�" :string)
            ("R" "�" :string)
            ("X" "�" :string)
+           ("S" "�" :string)
+           ("H" "�" :string)
+           ("s" "�" :string)
+           ("O" "�" :string)
+           ("b" "�" :string)
+           ("C" "�" :string)
+           ("n" "�" :string)
+           ("V" "�" :string)
+           ("p" "�" :string)
+           ("Z" "�" :string)
+           ("z" "�" :string)
            ("i" "�" :string)
-           ("u" "�" :string)
-           ("w" "�" :string)
-           ("v" "�" :string)
            ("h" "�" :string)
-           ("y" "�" :string)
-           ("e" "�" :string)
-           ("l" "�" :string)
+           ("Y" "�" :string)
+           ("r" "�" :string)
+           ("x" "�" :string)
+           ("o" "�" :string)
            ("T" "�" :string)
-           ("f" "�" :string)
-           ("M" "�" :string)
-           ("W" "�" :string)
            ("J" "�" :string)
-           ("n" "�" :string)
+           ("Q" "�" :string)
+           ("d" "�" :string)
+           ("g" "�" :string)
            ("A" "�" :string)
-           ("O" "�" :string)
+           ("G" "�" :string)
+           ("M" "�" :string)
+           ("k" "�" :string)
            ("K" "�" :string)
+           ("c" "�" :string)
            ("N" "�" :string)
-           ("C" "�" :string)
-           ("b" "�" :string)
+           ("w" "�" :string)
+           ("j" "�" :string)
+           ("y" "�" :string)
+           ("D" "�" :string)
+           ("U" "�" :string)
+           ("m" "�" :string)
            ("F" "�" :string)
-           ("o" "�" :string)
-           ("g" "�" :string)
-           ("a" "�" :string)
-           ("Q" "�" :string)
-           ("B" "�" :string)
-           ("I" "�" :string)
-           ("P" "�" :string)
-           ("L" "�" :string)
-           ("d" "�" :string)
-           ("t" "�" :string)
-           ("s" "�" :string)
-           ("q" "�" :string)
-           ("x" "�" :string)
+           ("W" "�" :string)
+           ("l" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/macedonian/cp1251.xdy b/Master/texmf-dist/xindy/modules/lang/macedonian/cp1251.xdy
index 31111aa33a3..ad0dd31f977 100644
--- a/Master/texmf-dist/xindy/modules/lang/macedonian/cp1251.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/macedonian/cp1251.xdy
@@ -35,20 +35,20 @@
 
 (define-rule-set "mk-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)
@@ -57,187 +57,187 @@
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :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 "mk-resolve-diacritics"
 
-  :rules  (("�" "�" :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)
            ))
 
 (define-rule-set "mk-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)
-           ("�" "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)
            ))
 
 (define-rule-set "mk-ignore-special"
 
-  :rules  (("'" "" :string)
+  :rules  (("-" "" :string)
+           ("?" "" :string)
+           ("'" "" :string)
            ("." "" :string)
            ("!" "" :string)
-           ("?" "" :string)
-           ("-" "" :string)
            ))
 
 (define-rule-set "mk-resolve-special"
@@ -245,68 +245,68 @@
   :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)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/macedonian/iso88595.xdy b/Master/texmf-dist/xindy/modules/lang/macedonian/iso88595.xdy
index 297e6bc558d..382d1fb5523 100644
--- a/Master/texmf-dist/xindy/modules/lang/macedonian/iso88595.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/macedonian/iso88595.xdy
@@ -39,16 +39,16 @@
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
@@ -61,183 +61,183 @@
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :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 "mk-resolve-diacritics"
 
-  :rules  (("�" "�" :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)
            ))
 
 (define-rule-set "mk-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)
            ("�" "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)
+           ("�" "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)
            ))
 
 (define-rule-set "mk-ignore-special"
 
-  :rules  (("!" "" :string)
-           ("-" "" :string)
-           ("?" "" :string)
-           ("'" "" :string)
+  :rules  (("-" "" :string)
            ("." "" :string)
+           ("'" "" :string)
+           ("?" "" :string)
+           ("!" "" :string)
            ))
 
 (define-rule-set "mk-resolve-special"
@@ -245,68 +245,68 @@
   :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)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/macedonian/isoir111.xdy b/Master/texmf-dist/xindy/modules/lang/macedonian/isoir111.xdy
index b7b9a4b83c3..69662746857 100644
--- a/Master/texmf-dist/xindy/modules/lang/macedonian/isoir111.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/macedonian/isoir111.xdy
@@ -37,8 +37,8 @@
 
   :rules  (("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
@@ -47,197 +47,197 @@
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :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 "mk-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)
            ))
 
 (define-rule-set "mk-resolve-case"
 
-  :rules  (("�" "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)
+           ("�" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :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)
            ))
 
 (define-rule-set "mk-ignore-special"
 
   :rules  (("'" "" :string)
+           ("!" "" :string)
+           ("-" "" :string)
            ("?" "" :string)
            ("." "" :string)
-           ("-" "" :string)
-           ("!" "" :string)
            ))
 
 (define-rule-set "mk-resolve-special"
@@ -245,68 +245,68 @@
   :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)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/macedonian/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/macedonian/utf8.xdy
index b12b96f83c5..b40f6babe58 100644
--- a/Master/texmf-dist/xindy/modules/lang/macedonian/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/macedonian/utf8.xdy
@@ -35,68 +35,68 @@
 
 (define-rule-set "mk-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)
            ("Н" "�" :string)
+           ("н" "�" :string)
            ("Њ" "�" :string)
            ("њ" "�" :string)
-           ("о" "�" :string)
            ("О" "�" :string)
+           ("о" "�" :string)
            ("П" "�" :string)
            ("п" "�" :string)
            ("р" "�" :string)
            ("Р" "�" :string)
            ("с" "�" :string)
            ("С" "�" :string)
-           ("Т" "�" :string)
            ("т" "�" :string)
-           ("ќ" "�" :string)
+           ("Т" "�" :string)
            ("Ќ" "�" :string)
-           ("У" "�" :string)
+           ("ќ" "�" :string)
            ("у" "�" :string)
-           ("Ф" "�" :string)
+           ("У" "�" :string)
            ("ф" "�" :string)
+           ("Ф" "�" :string)
            ("х" "�" :string)
            ("Х" "�" :string)
-           ("ц" "�" :string)
            ("Ц" "�" :string)
-           ("ч" "�" :string)
+           ("ц" "�" :string)
            ("Ч" "�" :string)
+           ("ч" "�" :string)
            ("џ" "�" :string)
            ("Џ" "�" :string)
            ("Ш" "�" :string)
@@ -105,221 +105,221 @@
 
 (define-rule-set "mk-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)
            ))
 
 (define-rule-set "mk-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)
+           ("Л" "8" :string)
+           ("Д" "8" :string)
            ("К" "8" :string)
-           ("а" "9" :string)
-           ("ф" "9" :string)
-           ("њ" "9" :string)
-           ("г" "9" :string)
-           ("в" "9" :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)
            ))
 
 (define-rule-set "mk-ignore-special"
 
-  :rules  (("-" "" :string)
-           ("?" "" :string)
+  :rules  (("?" "" :string)
+           ("-" "" :string)
+           ("!" "" :string)
            ("." "" :string)
            ("'" "" :string)
-           ("!" "" :string)
            ))
 
 (define-rule-set "mk-resolve-special"
 
-  :rules  (("Н" "�" :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)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/mongolian/cyrillic-utf8.xdy b/Master/texmf-dist/xindy/modules/lang/mongolian/cyrillic-utf8.xdy
index f341965248e..faa36520487 100644
--- a/Master/texmf-dist/xindy/modules/lang/mongolian/cyrillic-utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/mongolian/cyrillic-utf8.xdy
@@ -41,56 +41,56 @@
 
   :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)
@@ -109,341 +109,341 @@
            ("Т" "�" :string)
            ("У" "�" :string)
            ("у" "�" :string)
-           ("ү" "�" :string)
            ("Ү" "�" :string)
-           ("ф" "�" :string)
+           ("ү" "�" :string)
            ("Ф" "�" :string)
+           ("ф" "�" :string)
            ("х" "�" :string)
            ("Х" "�" :string)
            ("ц" "�" :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 "mn-resolve-diacritics"
 
-  :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)
+           ("ч" "�" :string)
            ("М" "�" :string)
-           ("в" "�" :string)
-           ("д" "�" :string)
-           ("Н" "�" :string)
-           ("е" "�" :string)
-           ("Л" "�" :string)
-           ("Ю" "�" :string)
-           ("х" "�" :string)
-           ("Т" "�" :string)
-           ("Р" "�" :string)
-           ("Ы" "�" :string)
-           ("Х" "�" :string)
-           ("щ" "�" :string)
+           ("ү" "�" :string)
+           ("Ч" "�" :string)
+           ("к" "�" :string)
+           ("э" "�" :string)
+           ("Е" "�" :string)
+           ("ё" "�" :string)
            ("О" "�" :string)
-           ("а" "�" :string)
-           ("Ж" "�" :string)
-           ("я" "�" :string)
-           ("ф" "�" :string)
-           ("Я" "�" :string)
-           ("З" "�" :string)
            ("Ш" "�" :string)
-           ("С" "�" :string)
-           ("У" "�" :string)
-           ("ъ" "�" :string)
-           ("ш" "�" :string)
-           ("ы" "�" :string)
-           ("п" "�" :string)
-           ("ь" "�" :string)
+           ("В" "�" :string)
+           ("г" "�" :string)
            ("т" "�" :string)
+           ("о" "�" :string)
+           ("Ы" "�" :string)
+           ("Ё" "�" :string)
+           ("р" "�" :string)
+           ("Ъ" "�" :string)
+           ("ъ" "�" :string)
            ("ц" "�" :string)
-           ("ё" "�" :string)
-           ("з" "�" :string)
+           ("К" "�" :string)
+           ("Л" "�" :string)
+           ("ю" "�" :string)
+           ("Д" "�" :string)
+           ("ж" "�" :string)
+           ("Ж" "�" :string)
+           ("Й" "�" :string)
+           ("Ф" "�" :string)
+           ("Г" "�" :string)
            ("м" "�" :string)
-           ("В" "�" :string)
            ("Э" "�" :string)
-           ("ж" "�" :string)
-           ("ю" "�" :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 "mn-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)
-           ("у́" "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)
-           ("Я" "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)
+           ("О" "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)
-           ("т" "9" :string)
-           ("м" "9" :string)
-           ("з" "9" :string)
-           ("ц" "9" :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)
            ))
 
 (define-rule-set "mn-ignore-special"
 
   :rules  (("́" "" :string)
            ("?" "" :string)
-           ("-" "" :string)
            ("." "" :string)
-           ("!" "" :string)
+           ("-" "" :string)
            ("'" "" :string)
+           ("!" "" :string)
            ))
 
 (define-rule-set "mn-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)
-           ("я́" "�" :string)
+           ("ы́" "�" :string)
+           ("е́" "�" :string)
            ("И́" "�" :string)
-           ("ю́" "�" :string)
+           ("я́" "�" :string)
            ("э́" "�" :string)
-           ("о́" "�" :string)
-           ("Ш" "�" :string)
-           ("З" "�" :string)
-           ("С" "�" :string)
+           ("ю́" "�" :string)
+           ("Э́" "�" :string)
+           ("А́" "�" :string)
+           ("Ё́" "�" :string)
+           ("Р" "�" :string)
+           ("й" "�" :string)
+           ("х" "�" :string)
            ("У" "�" :string)
-           ("ъ" "�" :string)
-           ("ш" "�" :string)
-           ("я" "�" :string)
-           ("ф" "�" :string)
            ("Я" "�" :string)
-           ("ч" "�" :string)
-           ("Е" "�" :string)
+           ("ы" "�" :string)
+           ("Ю" "�" :string)
+           ("в" "�" :string)
+           ("ь" "�" :string)
            ("н" "�" :string)
            ("л" "�" :string)
-           ("Г" "�" :string)
-           ("Ө" "�" :string)
-           ("б" "�" :string)
-           ("Ё" "�" :string)
-           ("Й" "�" :string)
-           ("й" "�" :string)
-           ("ү" "�" :string)
-           ("ь" "�" :string)
-           ("ы" "�" :string)
-           ("п" "�" :string)
-           ("т" "�" :string)
-           ("В" "�" :string)
-           ("м" "�" :string)
-           ("ц" "�" :string)
            ("з" "�" :string)
-           ("ё" "�" :string)
+           ("а" "�" :string)
            ("Э" "�" :string)
-           ("Ц" "�" :string)
-           ("ю" "�" :string)
+           ("м" "�" :string)
+           ("Г" "�" :string)
+           ("Ф" "�" :string)
+           ("Й" "�" :string)
+           ("Ж" "�" :string)
            ("ж" "�" :string)
-           ("А" "�" :string)
-           ("с" "�" :string)
-           ("Ү" "�" :string)
-           ("г" "�" :string)
-           ("Ь" "�" :string)
            ("Д" "�" :string)
-           ("Б" "�" :string)
-           ("э" "�" :string)
-           ("о" "�" :string)
-           ("П" "�" :string)
-           ("Ф" "�" :string)
-           ("И" "�" :string)
-           ("р" "�" :string)
-           ("у" "�" :string)
+           ("ю" "�" :string)
            ("К" "�" :string)
-           ("Щ" "�" :string)
-           ("Ъ" "�" :string)
-           ("е" "�" :string)
-           ("Ю" "�" :string)
            ("Л" "�" :string)
-           ("Р" "�" :string)
-           ("Т" "�" :string)
-           ("х" "�" :string)
-           ("Х" "�" :string)
+           ("ц" "�" :string)
+           ("ъ" "�" :string)
+           ("Ъ" "�" :string)
+           ("Ё" "�" :string)
            ("Ы" "�" :string)
-           ("щ" "�" :string)
+           ("р" "�" :string)
+           ("о" "�" :string)
+           ("т" "�" :string)
+           ("г" "�" :string)
+           ("В" "�" :string)
+           ("Ш" "�" :string)
            ("О" "�" :string)
-           ("а" "�" :string)
-           ("Ж" "�" :string)
-           ("ө" "�" :string)
+           ("ё" "�" :string)
+           ("Е" "�" :string)
+           ("э" "�" :string)
            ("к" "�" :string)
-           ("М" "�" :string)
            ("Ч" "�" :string)
+           ("М" "�" :string)
+           ("ү" "�" :string)
+           ("ч" "�" :string)
+           ("Б" "�" :string)
+           ("И" "�" :string)
+           ("А" "�" :string)
+           ("Ц" "�" :string)
+           ("у" "�" :string)
            ("и" "�" :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/norwegian/latin1.xdy b/Master/texmf-dist/xindy/modules/lang/norwegian/latin1.xdy
index 2bcc01e6fba..1c690b23c71 100644
--- a/Master/texmf-dist/xindy/modules/lang/norwegian/latin1.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/norwegian/latin1.xdy
@@ -33,62 +33,62 @@
 
 (define-rule-set "no-alphabetize"
 
-  :rules  (("a" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+  :rules  (("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("A" "�" :string)
            ("�" "�" :string)
+           ("A" "�" :string)
+           ("a" "�" :string)
            ("B" "�" :string)
            ("b" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("C" "�" :string)
-           ("�" "�" :string)
            ("c" "�" :string)
-           ("D" "�" :string)
            ("d" "�" :string)
+           ("D" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("e" "�" :string)
+           ("�" "�" :string)
            ("E" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("F" "�" :string)
            ("f" "�" :string)
-           ("G" "�" :string)
+           ("F" "�" :string)
            ("g" "�" :string)
+           ("G" "�" :string)
            ("h" "�" :string)
            ("H" "�" :string)
-           ("I" "�" :string)
            ("i" "�" :string)
-           ("J" "�" :string)
+           ("I" "�" :string)
            ("j" "�" :string)
+           ("J" "�" :string)
            ("K" "�" :string)
            ("k" "�" :string)
            ("l" "�" :string)
            ("L" "�" :string)
-           ("m" "�" :string)
            ("M" "�" :string)
-           ("N" "�" :string)
+           ("m" "�" :string)
            ("n" "�" :string)
-           ("�" "�" :string)
-           ("O" "�" :string)
+           ("N" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("o" "�" :string)
            ("�" "�" :string)
-           ("P" "�" :string)
+           ("�" "�" :string)
+           ("O" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("p" "�" :string)
-           ("Q" "�" :string)
+           ("P" "�" :string)
            ("q" "�" :string)
+           ("Q" "�" :string)
            ("r" "�" :string)
            ("R" "�" :string)
            ("s" "�" :string)
@@ -96,118 +96,118 @@
            ("�" "��" :string)
            ("T" "�" :string)
            ("t" "�" :string)
-           ("U" "�" :string)
            ("u" "�" :string)
+           ("U" "�" :string)
            ("V" "�" :string)
            ("v" "�" :string)
-           ("W" "�" :string)
            ("w" "�" :string)
-           ("x" "�" :string)
+           ("W" "�" :string)
            ("X" "�" :string)
+           ("x" "�" :string)
+           ("y" "�" :string)
            ("�" "�" :string)
-           ("Y" "�" :string)
            ("�" "�" :string)
-           ("y" "�" :string)
+           ("Y" "�" :string)
            ("Z" "�" :string)
            ("z" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ))
 
 (define-rule-set "no-resolve-diacritics"
 
-  :rules  (("B" "�" :string)
-           ("W" "�" :string)
-           ("N" "�" :string)
+  :rules  (("X" "�" :string)
+           ("B" "�" :string)
+           ("L" "�" :string)
+           ("k" "�" :string)
+           ("z" "�" :string)
+           ("G" "�" :string)
            ("t" "�" :string)
+           ("M" "�" :string)
+           ("u" "�" :string)
+           ("b" "�" :string)
+           ("v" "�" :string)
            ("I" "�" :string)
-           ("h" "�" :string)
+           ("�" "�" :string)
+           ("D" "�" :string)
+           ("q" "�" :string)
+           ("�" "�" :string)
+           ("J" "�" :string)
            ("d" "�" :string)
-           ("�" "�" :string)
-           ("i" "�" :string)
-           ("Z" "�" :string)
-           ("r" "�" :string)
+           ("W" "�" :string)
+           ("c" "�" :string)
+           ("Q" "�" :string)
+           ("H" "�" :string)
            ("C" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("F" "�" :string)
-           ("E" "�" :string)
-           ("k" "�" :string)
-           ("l" "�" :string)
-           ("p" "�" :string)
-           ("s" "�" :string)
-           ("K" "�" :string)
-           ("�" "�" :string)
-           ("O" "�" :string)
            ("U" "�" :string)
-           ("Q" "�" :string)
-           ("g" "�" :string)
-           ("T" "�" :string)
-           ("�" "�" :string)
-           ("V" "�" :string)
-           ("G" "�" :string)
-           ("P" "�" :string)
-           ("D" "�" :string)
            ("m" "�" :string)
+           ("�" "�" :string)
+           ("R" "�" :string)
+           ("a" "�" :string)
            ("x" "�" :string)
+           ("A" "�" :string)
            ("Y" "�" :string)
+           ("K" "�" :string)
            ("e" "�" :string)
-           ("a" "�" :string)
-           ("S" "�" :string)
-           ("L" "�" :string)
+           ("T" "�" :string)
+           ("�" "�" :string)
+           ("V" "�" :string)
+           ("Z" "�" :string)
+           ("w" "�" :string)
+           ("h" "�" :string)
+           ("n" "�" :string)
+           ("s" "�" :string)
            ("o" "�" :string)
-           ("c" "�" :string)
-           ("X" "�" :string)
-           ("R" "�" :string)
-           ("H" "�" :string)
-           ("A" "�" :string)
-           ("z" "�" :string)
-           ("u" "�" :string)
-           ("M" "�" :string)
-           ("q" "�" :string)
-           ("v" "�" :string)
+           ("P" "�" :string)
+           ("p" "�" :string)
+           ("N" "�" :string)
            ("f" "�" :string)
-           ("n" "�" :string)
-           ("j" "�" :string)
+           ("r" "�" :string)
+           ("g" "�" :string)
+           ("S" "�" :string)
+           ("i" "�" :string)
+           ("E" "�" :string)
+           ("l" "�" :string)
            ("y" "�" :string)
-           ("w" "�" :string)
-           ("J" "�" :string)
-           ("b" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("j" "�" :string)
+           ("O" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
@@ -215,102 +215,102 @@
 
 (define-rule-set "no-resolve-case"
 
-  :rules  (("F" "8" :string)
-           ("E" "8" :string)
-           ("C" "8" :string)
-           ("�" "8" :string)
-           ("Z" "8" :string)
-           ("I" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("B" "8" :string)
-           ("N" "8" :string)
-           ("W" "8" :string)
-           ("�" "8" :string)
+  :rules  (("T" "8" :string)
+           ("K" "8" :string)
            ("�" "8" :string)
-           ("Y" "8" :string)
-           ("�" "8" :string)
-           ("D" "8" :string)
-           ("G" "8" :string)
-           ("P" "8" :string)
-           ("T" "8" :string)
-           ("U" "8" :string)
-           ("Q" "8" :string)
-           ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
            ("V" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("Z" "8" :string)
+           ("P" "8" :string)
+           ("N" "8" :string)
+           ("�" "8" :string)
+           ("S" "8" :string)
+           ("E" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
            ("O" "8" :string)
-           ("K" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
-           ("M" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("H" "8" :string)
-           ("A" "8" :string)
-           ("R" "8" :string)
-           ("�" "8" :string)
+           ("B" "8" :string)
            ("X" "8" :string)
            ("L" "8" :string)
-           ("S" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
+           ("G" "8" :string)
+           ("M" "8" :string)
+           ("�" "8" :string)
+           ("D" "8" :string)
+           ("I" "8" :string)
+           ("W" "8" :string)
            ("J" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("s" "9" :string)
-           ("�" "9" :string)
-           ("p" "9" :string)
-           ("l" "9" :string)
-           ("k" "9" :string)
-           ("�" "9" :string)
+           ("Q" "8" :string)
+           ("C" "8" :string)
+           ("H" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("F" "8" :string)
+           ("U" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("R" "8" :string)
+           ("Y" "8" :string)
+           ("A" "8" :string)
+           ("e" "9" :string)
+           ("�" "9" :string)
+           ("w" "9" :string)
            ("�" "9" :string)
+           ("h" "9" :string)
+           ("n" "9" :string)
+           ("s" "9" :string)
            ("�" "9" :string)
+           ("o" "9" :string)
+           ("�" "9" :string)
+           ("f" "9" :string)
+           ("p" "9" :string)
+           ("�" "9" :string)
            ("r" "9" :string)
            ("i" "9" :string)
+           ("g" "9" :string)
+           ("l" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("y" "9" :string)
+           ("j" "9" :string)
            ("�" "9" :string)
-           ("d" "9" :string)
-           ("h" "9" :string)
            ("�" "9" :string)
-           ("t" "9" :string)
-           ("a" "9" :string)
-           ("e" "9" :string)
            ("�" "9" :string)
-           ("x" "9" :string)
-           ("m" "9" :string)
-           ("g" "9" :string)
-           ("�" "9" :string)
-           ("q" "9" :string)
-           ("�" "9" :string)
-           ("u" "9" :string)
            ("z" "9" :string)
+           ("k" "9" :string)
+           ("t" "9" :string)
+           ("b" "9" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
-           ("o" "9" :string)
+           ("u" "9" :string)
+           ("v" "9" :string)
+           ("�" "9" :string)
+           ("d" "9" :string)
+           ("�" "9" :string)
+           ("q" "9" :string)
            ("c" "9" :string)
-           ("�" "9" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("b" "9" :string)
-           ("w" "9" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
+           ("m" "9" :string)
            ("�" "9" :string)
-           ("y" "9" :string)
-           ("n" "9" :string)
-           ("j" "9" :string)
-           ("f" "9" :string)
-           ("v" "9" :string)
+           ("x" "9" :string)
+           ("a" "9" :string)
            ("�" "99" :string)
            ))
 
 (define-rule-set "no-ignore-special"
 
-  :rules  (("'" "" :string)
-           ("?" "" :string)
-           ("." "" :string)
+  :rules  (("." "" :string)
            ("-" "" :string)
+           ("'" "" :string)
            ("!" "" :string)
+           ("?" "" :string)
            ))
 
 (define-rule-set "no-resolve-special"
@@ -318,92 +318,92 @@
   :rules  (("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
+           ("S" "�" :string)
+           ("�" "�" :string)
+           ("i" "�" :string)
+           ("E" "�" :string)
+           ("g" "�" :string)
+           ("�" "�" :string)
+           ("r" "�" :string)
+           ("�" "�" :string)
+           ("p" "�" :string)
+           ("f" "�" :string)
+           ("N" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("J" "�" :string)
-           ("b" "�" :string)
-           ("�" "�" :string)
-           ("w" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("y" "�" :string)
-           ("n" "�" :string)
+           ("P" "�" :string)
            ("j" "�" :string)
-           ("�" "�" :string)
-           ("v" "�" :string)
-           ("f" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("q" "�" :string)
-           ("M" "�" :string)
+           ("O" "�" :string)
+           ("�" "�" :string)
+           ("y" "�" :string)
+           ("�" "�" :string)
+           ("l" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("z" "�" :string)
-           ("u" "�" :string)
-           ("�" "�" :string)
-           ("H" "�" :string)
-           ("A" "�" :string)
-           ("X" "�" :string)
-           ("�" "�" :string)
-           ("R" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("o" "�" :string)
-           ("c" "�" :string)
-           ("L" "�" :string)
-           ("S" "�" :string)
-           ("�" "�" :string)
-           ("a" "�" :string)
-           ("Y" "�" :string)
+           ("�" "�" :string)
+           ("V" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("e" "�" :string)
-           ("�" "�" :string)
-           ("D" "�" :string)
-           ("m" "�" :string)
-           ("x" "�" :string)
-           ("�" "�" :string)
-           ("G" "�" :string)
-           ("P" "�" :string)
-           ("U" "�" :string)
-           ("Q" "�" :string)
-           ("g" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("T" "�" :string)
-           ("�" "�" :string)
-           ("V" "�" :string)
-           ("O" "�" :string)
-           ("�" "�" :string)
            ("K" "�" :string)
+           ("e" "�" :string)
+           ("�" "�" :string)
+           ("o" "�" :string)
            ("s" "�" :string)
-           ("�" "�" :string)
-           ("l" "�" :string)
-           ("p" "�" :string)
-           ("k" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("F" "�" :string)
-           ("�" "�" :string)
-           ("E" "�" :string)
-           ("�" "�" :string)
-           ("i" "�" :string)
+           ("h" "�" :string)
+           ("n" "�" :string)
+           ("�" "�" :string)
+           ("w" "�" :string)
+           ("�" "�" :string)
            ("Z" "�" :string)
-           ("r" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("C" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("I" "�" :string)
-           ("d" "�" :string)
-           ("h" "�" :string)
+           ("H" "�" :string)
+           ("Q" "�" :string)
+           ("c" "�" :string)
+           ("A" "�" :string)
+           ("Y" "�" :string)
+           ("a" "�" :string)
+           ("x" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("R" "�" :string)
+           ("m" "�" :string)
+           ("U" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("F" "�" :string)
+           ("M" "�" :string)
+           ("t" "�" :string)
+           ("z" "�" :string)
+           ("G" "�" :string)
+           ("k" "�" :string)
+           ("L" "�" :string)
+           ("�" "�" :string)
            ("B" "�" :string)
+           ("X" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("t" "�" :string)
            ("W" "�" :string)
-           ("N" "�" :string)
+           ("�" "�" :string)
+           ("q" "�" :string)
+           ("J" "�" :string)
+           ("d" "�" :string)
+           ("D" "�" :string)
+           ("I" "�" :string)
+           ("�" "�" :string)
+           ("v" "�" :string)
+           ("�" "�" :string)
+           ("b" "�" :string)
+           ("u" "�" :string)
+           ("�" "�" :string)
            ("�" "��" :string)
            ("-" "�" :string)
            ("'" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/norwegian/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/norwegian/utf8.xdy
index c7fdb368bb4..06f77c7fba7 100644
--- a/Master/texmf-dist/xindy/modules/lang/norwegian/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/norwegian/utf8.xdy
@@ -34,90 +34,90 @@
 (define-rule-set "no-alphabetize"
 
   :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)
-           ("a" "�" :string)
            ("A" "�" :string)
-           ("b" "�" :string)
+           ("a" "�" :string)
            ("B" "�" :string)
-           ("C" "�" :string)
+           ("b" "�" :string)
            ("c" "�" :string)
-           ("d" "�" :string)
+           ("C" "�" :string)
            ("D" "�" :string)
+           ("d" "�" :string)
            ("E" "�" :string)
            ("e" "�" :string)
-           ("F" "�" :string)
            ("f" "�" :string)
-           ("G" "�" :string)
+           ("F" "�" :string)
            ("g" "�" :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)
-           ("N" "�" :string)
            ("n" "�" :string)
+           ("N" "�" :string)
            ("O" "�" :string)
            ("o" "�" :string)
-           ("P" "�" :string)
            ("p" "�" :string)
+           ("P" "�" :string)
            ("Q" "�" :string)
            ("q" "�" :string)
-           ("r" "�" :string)
            ("R" "�" :string)
+           ("r" "�" :string)
            ("S" "�" :string)
            ("s" "�" :string)
            ("t" "�" :string)
            ("T" "�" :string)
            ("U" "�" :string)
            ("u" "�" :string)
-           ("v" "�" :string)
            ("V" "�" :string)
+           ("v" "�" :string)
            ("w" "�" :string)
            ("W" "�" :string)
-           ("X" "�" :string)
            ("x" "�" :string)
-           ("Y" "�" :string)
+           ("X" "�" :string)
            ("y" "�" :string)
+           ("Y" "�" :string)
            ("Z" "�" :string)
            ("z" "�" :string)
            ))
@@ -125,286 +125,286 @@
 (define-rule-set "no-resolve-diacritics"
 
   :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)
-           ("O" "�" :string)
+           ("u" "�" :string)
+           ("p" "�" :string)
+           ("m" "�" :string)
+           ("i" "�" :string)
+           ("c" "�" :string)
+           ("Z" "�" :string)
+           ("U" "�" :string)
+           ("g" "�" :string)
+           ("Q" "�" :string)
            ("R" "�" :string)
-           ("T" "�" :string)
-           ("s" "�" :string)
-           ("l" "�" :string)
+           ("n" "�" :string)
+           ("b" "�" :string)
            ("B" "�" :string)
-           ("F" "�" :string)
+           ("z" "�" :string)
+           ("A" "�" :string)
            ("t" "�" :string)
-           ("D" "�" :string)
+           ("f" "�" :string)
+           ("s" "�" :string)
            ("E" "�" :string)
-           ("H" "�" :string)
-           ("m" "�" :string)
-           ("v" "�" :string)
+           ("J" "�" :string)
+           ("O" "�" :string)
            ("S" "�" :string)
+           ("h" "�" :string)
+           ("K" "�" :string)
+           ("o" "�" :string)
+           ("e" "�" :string)
+           ("d" "�" :string)
            ("w" "�" :string)
-           ("A" "�" :string)
-           ("j" "�" :string)
-           ("N" "�" :string)
            ("G" "�" :string)
-           ("b" "�" :string)
-           ("d" "�" :string)
-           ("Z" "�" :string)
-           ("Q" "�" :string)
-           ("r" "�" :string)
+           ("M" "�" :string)
+           ("V" "�" :string)
+           ("l" "�" :string)
+           ("y" "�" :string)
+           ("D" "�" :string)
+           ("N" "�" :string)
+           ("H" "�" :string)
+           ("v" "�" :string)
+           ("C" "�" :string)
+           ("Y" "�" :string)
+           ("T" "�" :string)
+           ("k" "�" :string)
            ("a" "�" :string)
-           ("P" "�" :string)
-           ("i" "�" :string)
+           ("W" "�" :string)
            ("X" "�" :string)
-           ("u" "�" :string)
+           ("r" "�" :string)
+           ("F" "�" :string)
+           ("x" "�" :string)
+           ("j" "�" :string)
            ("q" "�" :string)
-           ("W" "�" :string)
-           ("f" "�" :string)
-           ("o" "�" :string)
-           ("n" "�" :string)
            ("L" "�" :string)
-           ("M" "�" :string)
-           ("p" "�" :string)
-           ("k" "�" :string)
-           ("V" "�" :string)
-           ("y" "�" :string)
+           ("P" "�" :string)
            ("I" "�" :string)
-           ("g" "�" :string)
-           ("U" "�" :string)
-           ("e" "�" :string)
-           ("c" "�" :string)
-           ("h" "�" :string)
-           ("J" "�" :string)
-           ("x" "�" :string)
-           ("K" "�" :string)
-           ("z" "�" :string)
-           ("Y" "�" :string)
-           ("C" "�" :string)
            ))
 
 (define-rule-set "no-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)
-           ("Ê" "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)
-           ("á" "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)
            ("ß" "99" :string)
-           ("P" "8" :string)
-           ("Z" "8" :string)
-           ("Q" "8" :string)
-           ("X" "8" :string)
-           ("S" "8" :string)
+           ("K" "8" :string)
            ("G" "8" :string)
-           ("N" "8" :string)
-           ("A" "8" :string)
-           ("F" "8" :string)
-           ("B" "8" :string)
+           ("V" "8" :string)
+           ("M" "8" :string)
            ("H" "8" :string)
-           ("E" "8" :string)
            ("D" "8" :string)
+           ("N" "8" :string)
            ("T" "8" :string)
-           ("R" "8" :string)
-           ("O" "8" :string)
-           ("J" "8" :string)
-           ("C" "8" :string)
            ("Y" "8" :string)
-           ("K" "8" :string)
-           ("U" "8" :string)
-           ("V" "8" :string)
-           ("M" "8" :string)
-           ("I" "8" :string)
+           ("C" "8" :string)
+           ("F" "8" :string)
+           ("X" "8" :string)
            ("W" "8" :string)
+           ("I" "8" :string)
+           ("P" "8" :string)
            ("L" "8" :string)
-           ("a" "9" :string)
-           ("r" "9" :string)
-           ("b" "9" :string)
-           ("d" "9" :string)
-           ("i" "9" :string)
+           ("U" "8" :string)
+           ("Z" "8" :string)
+           ("R" "8" :string)
+           ("Q" "8" :string)
+           ("B" "8" :string)
+           ("A" "8" :string)
+           ("S" "8" :string)
+           ("O" "8" :string)
+           ("J" "8" :string)
+           ("E" "8" :string)
+           ("o" "9" :string)
+           ("e" "9" :string)
+           ("h" "9" :string)
            ("w" "9" :string)
-           ("v" "9" :string)
-           ("j" "9" :string)
-           ("t" "9" :string)
+           ("d" "9" :string)
            ("l" "9" :string)
-           ("m" "9" :string)
-           ("s" "9" :string)
-           ("x" "9" :string)
-           ("h" "9" :string)
-           ("c" "9" :string)
-           ("z" "9" :string)
-           ("e" "9" :string)
            ("y" "9" :string)
            ("k" "9" :string)
-           ("p" "9" :string)
-           ("g" "9" :string)
-           ("f" "9" :string)
+           ("v" "9" :string)
+           ("x" "9" :string)
+           ("r" "9" :string)
+           ("a" "9" :string)
            ("q" "9" :string)
+           ("j" "9" :string)
+           ("m" "9" :string)
+           ("p" "9" :string)
            ("u" "9" :string)
+           ("c" "9" :string)
+           ("i" "9" :string)
+           ("g" "9" :string)
+           ("b" "9" :string)
            ("n" "9" :string)
-           ("o" "9" :string)
+           ("t" "9" :string)
+           ("z" "9" :string)
+           ("s" "9" :string)
+           ("f" "9" :string)
            ))
 
 (define-rule-set "no-ignore-special"
 
-  :rules  (("?" "" :string)
+  :rules  (("!" "" :string)
+           ("?" "" :string)
+           ("'" "" :string)
            ("-" "" :string)
            ("." "" :string)
-           ("'" "" :string)
-           ("!" "" :string)
            ))
 
 (define-rule-set "no-resolve-special"
 
-  :rules  (("Ü" "�" :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)
-           ("t" "�" :string)
-           ("F" "�" :string)
+           ("Z" "�" :string)
+           ("U" "�" :string)
+           ("g" "�" :string)
+           ("Q" "�" :string)
+           ("R" "�" :string)
+           ("u" "�" :string)
+           ("p" "�" :string)
+           ("m" "�" :string)
+           ("i" "�" :string)
+           ("c" "�" :string)
+           ("f" "�" :string)
+           ("s" "�" :string)
+           ("E" "�" :string)
+           ("J" "�" :string)
+           ("O" "�" :string)
+           ("S" "�" :string)
+           ("n" "�" :string)
+           ("b" "�" :string)
            ("B" "�" :string)
+           ("A" "�" :string)
+           ("z" "�" :string)
+           ("t" "�" :string)
+           ("M" "�" :string)
+           ("V" "�" :string)
            ("l" "�" :string)
-           ("E" "�" :string)
+           ("y" "�" :string)
            ("D" "�" :string)
-           ("m" "�" :string)
+           ("N" "�" :string)
            ("H" "�" :string)
-           ("O" "�" :string)
-           ("T" "�" :string)
-           ("R" "�" :string)
-           ("s" "�" :string)
-           ("Z" "�" :string)
-           ("Q" "�" :string)
-           ("b" "�" :string)
+           ("h" "�" :string)
+           ("K" "�" :string)
+           ("o" "�" :string)
+           ("e" "�" :string)
            ("d" "�" :string)
-           ("P" "�" :string)
-           ("a" "�" :string)
-           ("r" "�" :string)
-           ("i" "�" :string)
-           ("X" "�" :string)
-           ("v" "�" :string)
-           ("S" "�" :string)
            ("w" "�" :string)
-           ("A" "�" :string)
            ("G" "�" :string)
-           ("N" "�" :string)
            ("j" "�" :string)
-           ("V" "�" :string)
-           ("k" "�" :string)
-           ("p" "�" :string)
-           ("M" "�" :string)
-           ("y" "�" :string)
-           ("g" "�" :string)
-           ("I" "�" :string)
            ("q" "�" :string)
-           ("u" "�" :string)
-           ("f" "�" :string)
-           ("W" "�" :string)
-           ("o" "�" :string)
            ("L" "�" :string)
-           ("n" "�" :string)
-           ("J" "�" :string)
-           ("h" "�" :string)
-           ("c" "�" :string)
-           ("x" "�" :string)
-           ("z" "�" :string)
-           ("K" "�" :string)
+           ("P" "�" :string)
+           ("I" "�" :string)
            ("C" "�" :string)
+           ("v" "�" :string)
+           ("T" "�" :string)
            ("Y" "�" :string)
-           ("U" "�" :string)
-           ("e" "�" :string)
+           ("k" "�" :string)
+           ("a" "�" :string)
+           ("W" "�" :string)
+           ("r" "�" :string)
+           ("X" "�" :string)
+           ("F" "�" :string)
+           ("x" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/persian/variant1-utf8.xdy b/Master/texmf-dist/xindy/modules/lang/persian/variant1-utf8.xdy
index 214544e3cf4..8654e2b4738 100644
--- a/Master/texmf-dist/xindy/modules/lang/persian/variant1-utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/persian/variant1-utf8.xdy
@@ -99,66 +99,66 @@
            ("ه" "�" :string)
            ("ی" "�" :string)
            ("ئ" "�" :string)
-           ("À" "�" :string)
            ("à" "�" :string)
-           ("æ" "��" :string)
+           ("À" "�" :string)
            ("Æ" "��" :string)
-           ("Ç" "�" :string)
+           ("æ" "��" :string)
            ("ç" "�" :string)
-           ("ð" "�" :string)
+           ("Ç" "�" :string)
            ("Ð" "�" :string)
+           ("ð" "�" :string)
            ("È" "�" :string)
+           ("ë" "�" :string)
+           ("ê" "�" :string)
+           ("é" "�" :string)
+           ("É" "�" :string)
            ("è" "�" :string)
            ("Ê" "�" :string)
-           ("ê" "�" :string)
            ("Ë" "�" :string)
-           ("É" "�" :string)
-           ("é" "�" :string)
-           ("ë" "�" :string)
-           ("ï" "�" :string)
            ("Ï" "�" :string)
-           ("Ñ" "�" :string)
+           ("ï" "�" :string)
            ("ñ" "�" :string)
+           ("Ñ" "�" :string)
+           ("Ô" "�" :string)
            ("Ö" "�" :string)
            ("ö" "�" :string)
            ("ô" "�" :string)
-           ("Ô" "�" :string)
            ("Œ" "��" :string)
            ("œ" "��" :string)
-           ("Þ" "�" :string)
            ("þ" "�" :string)
-           ("a" "�" :string)
+           ("Þ" "�" :string)
            ("A" "�" :string)
+           ("a" "�" :string)
            ("B" "�" :string)
            ("b" "�" :string)
-           ("C" "�" :string)
            ("c" "�" :string)
-           ("d" "�" :string)
+           ("C" "�" :string)
            ("D" "�" :string)
-           ("e" "�" :string)
+           ("d" "�" :string)
            ("E" "�" :string)
-           ("f" "�" :string)
+           ("e" "�" :string)
            ("F" "�" :string)
+           ("f" "�" :string)
            ("G" "�" :string)
            ("g" "�" :string)
            ("H" "�" :string)
            ("h" "�" :string)
-           ("i" "�" :string)
            ("I" "�" :string)
+           ("i" "�" :string)
            ("J" "�" :string)
            ("j" "�" :string)
-           ("k" "�" :string)
            ("K" "�" :string)
+           ("k" "�" :string)
            ("L" "�" :string)
            ("l" "�" :string)
            ("M" "�" :string)
            ("m" "�" :string)
-           ("N" "�" :string)
            ("n" "�" :string)
-           ("o" "�" :string)
+           ("N" "�" :string)
            ("O" "�" :string)
-           ("p" "�" :string)
+           ("o" "�" :string)
            ("P" "�" :string)
+           ("p" "�" :string)
            ("Q" "�" :string)
            ("q" "�" :string)
            ("R" "�" :string)
@@ -167,280 +167,280 @@
            ("s" "�" :string)
            ("T" "�" :string)
            ("t" "�" :string)
-           ("u" "�" :string)
            ("U" "�" :string)
+           ("u" "�" :string)
            ("v" "�" :string)
            ("V" "�" :string)
-           ("W" "�" :string)
            ("w" "�" :string)
-           ("X" "�" :string)
+           ("W" "�" :string)
            ("x" "�" :string)
+           ("X" "�" :string)
            ("Y" "�" :string)
            ("y" "�" :string)
-           ("z" "�" :string)
            ("Z" "�" :string)
+           ("z" "�" :string)
            ))
 
 (define-rule-set "pe-resolve-diacritics"
 
-  :rules  (("ش" "�" :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)
-           ("O" "�" :string)
-           ("D" "�" :string)
-           ("F" "�" :string)
-           ("x" "�" :string)
-           ("y" "�" :string)
-           ("V" "�" :string)
-           ("l" "�" :string)
-           ("A" "�" :string)
-           ("r" "�" :string)
-           ("n" "�" :string)
-           ("g" "�" :string)
+           ("œ" "�" :string)
            ("z" "�" :string)
-           ("w" "�" :string)
-           ("b" "�" :string)
-           ("G" "�" :string)
-           ("M" "�" :string)
-           ("H" "�" :string)
-           ("K" "�" :string)
-           ("h" "�" :string)
-           ("Z" "�" :string)
-           ("m" "�" :string)
-           ("I" "�" :string)
-           ("t" "�" :string)
-           ("q" "�" :string)
            ("C" "�" :string)
-           ("o" "�" :string)
-           ("k" "�" :string)
-           ("f" "�" :string)
-           ("Y" "�" :string)
-           ("L" "�" :string)
-           ("P" "�" :string)
-           ("j" "�" :string)
-           ("W" "�" :string)
+           ("r" "�" :string)
            ("R" "�" :string)
+           ("Z" "�" :string)
+           ("p" "�" :string)
            ("X" "�" :string)
-           ("c" "�" :string)
+           ("b" "�" :string)
            ("s" "�" :string)
-           ("d" "�" :string)
-           ("Q" "�" :string)
+           ("e" "�" :string)
+           ("j" "�" :string)
+           ("a" "�" :string)
+           ("P" "�" :string)
            ("T" "�" :string)
+           ("i" "�" :string)
+           ("d" "�" :string)
+           ("x" "�" :string)
+           ("h" "�" :string)
            ("J" "�" :string)
-           ("S" "�" :string)
-           ("p" "�" :string)
-           ("e" "�" :string)
+           ("V" "�" :string)
+           ("m" "�" :string)
+           ("q" "�" :string)
+           ("Q" "�" :string)
+           ("y" "�" :string)
            ("u" "�" :string)
+           ("g" "�" :string)
+           ("t" "�" :string)
+           ("o" "�" :string)
            ("N" "�" :string)
+           ("M" "�" :string)
+           ("l" "�" :string)
+           ("D" "�" :string)
+           ("c" "�" :string)
+           ("A" "�" :string)
+           ("H" "�" :string)
+           ("U" "�" :string)
+           ("S" "�" :string)
            ("v" "�" :string)
-           ("E" "�" :string)
-           ("i" "�" :string)
-           ("a" "�" :string)
+           ("f" "�" :string)
            ("B" "�" :string)
-           ("U" "�" :string)
+           ("W" "�" :string)
+           ("n" "�" :string)
+           ("L" "�" :string)
+           ("I" "�" :string)
+           ("F" "�" :string)
+           ("E" "�" :string)
+           ("K" "�" :string)
+           ("O" "�" :string)
+           ("G" "�" :string)
+           ("w" "�" :string)
+           ("Y" "�" :string)
+           ("k" "�" :string)
            ))
 
 (define-rule-set "pe-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)
-           ("È" "8" :string)
-           ("Ç" "8" :string)
-           ("Ö" "8" :string)
-           ("Ñ" "8" :string)
            ("Ë" "8" :string)
            ("À" "8" :string)
-           ("Ï" "8" :string)
-           ("ی" "8" :string)
            ("Œ" "89" :string)
            ("Æ" "89" :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)
-           ("م" "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)
            ("œ" "99" :string)
            ("æ" "99" :string)
+           ("Y" "8" :string)
            ("G" "8" :string)
-           ("M" "8" :string)
+           ("O" "8" :string)
+           ("F" "8" :string)
            ("K" "8" :string)
-           ("Z" "8" :string)
-           ("H" "8" :string)
+           ("E" "8" :string)
+           ("L" "8" :string)
            ("I" "8" :string)
-           ("F" "8" :string)
-           ("O" "8" :string)
-           ("D" "8" :string)
-           ("V" "8" :string)
+           ("W" "8" :string)
+           ("B" "8" :string)
+           ("H" "8" :string)
            ("A" "8" :string)
-           ("J" "8" :string)
-           ("T" "8" :string)
-           ("Q" "8" :string)
-           ("E" "8" :string)
-           ("N" "8" :string)
            ("S" "8" :string)
            ("U" "8" :string)
-           ("B" "8" :string)
-           ("C" "8" :string)
+           ("M" "8" :string)
+           ("D" "8" :string)
+           ("N" "8" :string)
+           ("J" "8" :string)
+           ("V" "8" :string)
+           ("Q" "8" :string)
+           ("T" "8" :string)
            ("P" "8" :string)
-           ("L" "8" :string)
-           ("Y" "8" :string)
-           ("R" "8" :string)
-           ("W" "8" :string)
            ("X" "8" :string)
+           ("R" "8" :string)
+           ("Z" "8" :string)
+           ("C" "8" :string)
+           ("k" "9" :string)
            ("w" "9" :string)
-           ("z" "9" :string)
-           ("b" "9" :string)
-           ("h" "9" :string)
-           ("m" "9" :string)
-           ("y" "9" :string)
-           ("x" "9" :string)
+           ("n" "9" :string)
+           ("f" "9" :string)
+           ("v" "9" :string)
            ("l" "9" :string)
+           ("c" "9" :string)
+           ("y" "9" :string)
+           ("o" "9" :string)
+           ("t" "9" :string)
+           ("u" "9" :string)
            ("g" "9" :string)
-           ("n" "9" :string)
-           ("r" "9" :string)
+           ("h" "9" :string)
+           ("m" "9" :string)
+           ("q" "9" :string)
            ("d" "9" :string)
-           ("i" "9" :string)
+           ("x" "9" :string)
            ("a" "9" :string)
-           ("v" "9" :string)
+           ("i" "9" :string)
            ("e" "9" :string)
-           ("p" "9" :string)
-           ("u" "9" :string)
-           ("o" "9" :string)
-           ("q" "9" :string)
-           ("t" "9" :string)
-           ("f" "9" :string)
-           ("k" "9" :string)
            ("j" "9" :string)
-           ("c" "9" :string)
            ("s" "9" :string)
+           ("b" "9" :string)
+           ("p" "9" :string)
+           ("z" "9" :string)
+           ("r" "9" :string)
            ))
 
 (define-rule-set "pe-ignore-special"
 
   :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)
@@ -449,70 +449,70 @@
 (define-rule-set "pe-resolve-special"
 
   :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)
@@ -529,58 +529,58 @@
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("a" "�" :string)
-           ("e" "�" :string)
-           ("U" "�" :string)
-           ("Q" "�" :string)
-           ("j" "�" :string)
-           ("s" "�" :string)
-           ("X" "�" :string)
-           ("o" "�" :string)
-           ("C" "�" :string)
-           ("f" "�" :string)
-           ("Z" "�" :string)
+           ("H" "�" :string)
+           ("S" "�" :string)
+           ("l" "�" :string)
+           ("M" "�" :string)
+           ("B" "�" :string)
+           ("W" "�" :string)
+           ("v" "�" :string)
+           ("F" "�" :string)
            ("K" "�" :string)
-           ("h" "�" :string)
-           ("m" "�" :string)
            ("I" "�" :string)
-           ("w" "�" :string)
-           ("G" "�" :string)
-           ("b" "�" :string)
-           ("V" "�" :string)
-           ("g" "�" :string)
-           ("n" "�" :string)
+           ("R" "�" :string)
+           ("Z" "�" :string)
+           ("C" "�" :string)
            ("r" "�" :string)
-           ("O" "�" :string)
-           ("D" "�" :string)
-           ("i" "�" :string)
-           ("E" "�" :string)
-           ("v" "�" :string)
-           ("N" "�" :string)
-           ("u" "�" :string)
-           ("p" "�" :string)
-           ("S" "�" :string)
-           ("B" "�" :string)
+           ("s" "�" :string)
            ("d" "�" :string)
-           ("J" "�" :string)
+           ("x" "�" :string)
            ("T" "�" :string)
-           ("R" "�" :string)
-           ("W" "�" :string)
-           ("c" "�" :string)
-           ("q" "�" :string)
-           ("t" "�" :string)
            ("P" "�" :string)
+           ("i" "�" :string)
+           ("y" "�" :string)
+           ("J" "�" :string)
+           ("q" "�" :string)
+           ("m" "�" :string)
+           ("A" "�" :string)
+           ("U" "�" :string)
+           ("N" "�" :string)
+           ("D" "�" :string)
+           ("c" "�" :string)
+           ("f" "�" :string)
+           ("E" "�" :string)
            ("L" "�" :string)
-           ("Y" "�" :string)
+           ("n" "�" :string)
            ("k" "�" :string)
-           ("H" "�" :string)
+           ("Y" "�" :string)
+           ("G" "�" :string)
+           ("O" "�" :string)
+           ("w" "�" :string)
            ("z" "�" :string)
-           ("M" "�" :string)
-           ("l" "�" :string)
-           ("A" "�" :string)
-           ("F" "�" :string)
-           ("y" "�" :string)
-           ("x" "�" :string)
+           ("e" "�" :string)
+           ("j" "�" :string)
+           ("b" "�" :string)
+           ("p" "�" :string)
+           ("X" "�" :string)
+           ("a" "�" :string)
+           ("t" "�" :string)
+           ("o" "�" :string)
+           ("u" "�" :string)
+           ("g" "�" :string)
+           ("h" "�" :string)
+           ("V" "�" :string)
+           ("Q" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ("{" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/persian/variant2-utf8.xdy b/Master/texmf-dist/xindy/modules/lang/persian/variant2-utf8.xdy
index 3489d406d77..e0e73044c45 100644
--- a/Master/texmf-dist/xindy/modules/lang/persian/variant2-utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/persian/variant2-utf8.xdy
@@ -95,43 +95,43 @@
            ("ل" "�" :string)
            ("م" "�" :string)
            ("ن" "�" :string)
-           ("و" "�" :string)
            ("ؤ" "�" :string)
+           ("و" "�" :string)
            ("ه" "�" :string)
-           ("ی" "�" :string)
            ("ئ" "�" :string)
-           ("à" "�" :string)
+           ("ی" "�" :string)
            ("À" "�" :string)
-           ("æ" "��" :string)
+           ("à" "�" :string)
            ("Æ" "��" :string)
+           ("æ" "��" :string)
            ("Ç" "�" :string)
            ("ç" "�" :string)
-           ("Ð" "�" :string)
            ("ð" "�" :string)
-           ("é" "�" :string)
+           ("Ð" "�" :string)
            ("è" "�" :string)
-           ("ê" "�" :string)
-           ("Ê" "�" :string)
-           ("ë" "�" :string)
            ("Ë" "�" :string)
-           ("È" "�" :string)
            ("É" "�" :string)
+           ("ë" "�" :string)
+           ("È" "�" :string)
+           ("Ê" "�" :string)
+           ("ê" "�" :string)
+           ("é" "�" :string)
            ("ï" "�" :string)
            ("Ï" "�" :string)
-           ("ñ" "�" :string)
            ("Ñ" "�" :string)
-           ("Ö" "�" :string)
+           ("ñ" "�" :string)
            ("ô" "�" :string)
            ("ö" "�" :string)
+           ("Ö" "�" :string)
            ("Ô" "�" :string)
            ("œ" "��" :string)
            ("Œ" "��" :string)
-           ("þ" "�" :string)
            ("Þ" "�" :string)
+           ("þ" "�" :string)
            ("a" "�" :string)
            ("A" "�" :string)
-           ("B" "�" :string)
            ("b" "�" :string)
+           ("B" "�" :string)
            ("C" "�" :string)
            ("c" "�" :string)
            ("d" "�" :string)
@@ -140,380 +140,380 @@
            ("E" "�" :string)
            ("F" "�" :string)
            ("f" "�" :string)
-           ("G" "�" :string)
            ("g" "�" :string)
-           ("h" "�" :string)
+           ("G" "�" :string)
            ("H" "�" :string)
-           ("I" "�" :string)
+           ("h" "�" :string)
            ("i" "�" :string)
+           ("I" "�" :string)
            ("J" "�" :string)
            ("j" "�" :string)
-           ("k" "�" :string)
            ("K" "�" :string)
-           ("L" "�" :string)
+           ("k" "�" :string)
            ("l" "�" :string)
-           ("M" "�" :string)
+           ("L" "�" :string)
            ("m" "�" :string)
-           ("N" "�" :string)
+           ("M" "�" :string)
            ("n" "�" :string)
-           ("o" "�" :string)
+           ("N" "�" :string)
            ("O" "�" :string)
+           ("o" "�" :string)
            ("P" "�" :string)
            ("p" "�" :string)
            ("q" "�" :string)
            ("Q" "�" :string)
            ("R" "�" :string)
            ("r" "�" :string)
-           ("S" "�" :string)
            ("s" "�" :string)
+           ("S" "�" :string)
            ("T" "�" :string)
            ("t" "�" :string)
            ("u" "�" :string)
            ("U" "�" :string)
            ("V" "�" :string)
            ("v" "�" :string)
-           ("W" "�" :string)
            ("w" "�" :string)
+           ("W" "�" :string)
            ("X" "�" :string)
            ("x" "�" :string)
-           ("y" "�" :string)
            ("Y" "�" :string)
-           ("z" "�" :string)
+           ("y" "�" :string)
            ("Z" "�" :string)
+           ("z" "�" :string)
            ))
 
 (define-rule-set "pe-resolve-diacritics"
 
-  :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)
            ("Ö" "�" :string)
-           ("ï" "�" :string)
-           ("È" "�" :string)
-           ("Ô" "�" :string)
+           ("ñ" "�" :string)
            ("ô" "�" :string)
+           ("È" "�" :string)
            ("è" "�" :string)
+           ("Ô" "�" :string)
            ("ë" "�" :string)
            ("Ë" "�" :string)
            ("ê" "�" :string)
            ("Ê" "�" :string)
            ("Æ" "�" :string)
+           ("œ" "�" :string)
            ("æ" "�" :string)
            ("Œ" "�" :string)
-           ("œ" "�" :string)
-           ("x" "�" :string)
-           ("X" "�" :string)
-           ("N" "�" :string)
-           ("f" "�" :string)
-           ("Y" "�" :string)
-           ("n" "�" :string)
-           ("p" "�" :string)
-           ("Z" "�" :string)
-           ("j" "�" :string)
-           ("r" "�" :string)
-           ("s" "�" :string)
            ("d" "�" :string)
-           ("q" "�" :string)
+           ("i" "�" :string)
            ("K" "�" :string)
-           ("m" "�" :string)
-           ("w" "�" :string)
-           ("P" "�" :string)
-           ("R" "�" :string)
-           ("Q" "�" :string)
-           ("v" "�" :string)
-           ("J" "�" :string)
-           ("D" "�" :string)
+           ("I" "�" :string)
            ("l" "�" :string)
-           ("S" "�" :string)
+           ("M" "�" :string)
+           ("D" "�" :string)
+           ("O" "�" :string)
+           ("a" "�" :string)
+           ("J" "�" :string)
+           ("U" "�" :string)
            ("H" "�" :string)
            ("F" "�" :string)
-           ("z" "�" :string)
-           ("E" "�" :string)
-           ("c" "�" :string)
-           ("I" "�" :string)
-           ("L" "�" :string)
            ("V" "�" :string)
-           ("O" "�" :string)
-           ("A" "�" :string)
-           ("W" "�" :string)
-           ("t" "�" :string)
-           ("U" "�" :string)
-           ("i" "�" :string)
-           ("h" "�" :string)
-           ("g" "�" :string)
-           ("k" "�" :string)
-           ("u" "�" :string)
-           ("C" "�" :string)
-           ("a" "�" :string)
+           ("v" "�" :string)
            ("T" "�" :string)
+           ("q" "�" :string)
+           ("u" "�" :string)
+           ("y" "�" :string)
+           ("m" "�" :string)
+           ("s" "�" :string)
+           ("n" "�" :string)
+           ("Y" "�" :string)
            ("e" "�" :string)
+           ("p" "�" :string)
+           ("W" "�" :string)
            ("B" "�" :string)
-           ("y" "�" :string)
-           ("M" "�" :string)
+           ("c" "�" :string)
+           ("z" "�" :string)
+           ("Q" "�" :string)
+           ("h" "�" :string)
+           ("r" "�" :string)
+           ("C" "�" :string)
+           ("A" "�" :string)
+           ("x" "�" :string)
+           ("G" "�" :string)
            ("o" "�" :string)
+           ("S" "�" :string)
+           ("k" "�" :string)
+           ("t" "�" :string)
+           ("w" "�" :string)
+           ("E" "�" :string)
+           ("f" "�" :string)
+           ("g" "�" :string)
+           ("L" "�" :string)
+           ("N" "�" :string)
+           ("R" "�" :string)
+           ("j" "�" :string)
+           ("X" "�" :string)
+           ("Z" "�" :string)
            ("b" "�" :string)
-           ("G" "�" :string)
+           ("P" "�" :string)
            ))
 
 (define-rule-set "pe-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)
            ("Æ" "89" :string)
            ("Œ" "89" :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)
-           ("ï" "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)
-           ("æ" "99" :string)
+           ("ه" "9" :string)
+           ("é" "9" :string)
            ("œ" "99" :string)
-           ("Z" "8" :string)
-           ("N" "8" :string)
-           ("X" "8" :string)
+           ("æ" "99" :string)
            ("Y" "8" :string)
-           ("D" "8" :string)
-           ("J" "8" :string)
-           ("S" "8" :string)
+           ("V" "8" :string)
            ("F" "8" :string)
+           ("T" "8" :string)
+           ("O" "8" :string)
            ("H" "8" :string)
-           ("K" "8" :string)
-           ("P" "8" :string)
-           ("Q" "8" :string)
-           ("R" "8" :string)
-           ("A" "8" :string)
-           ("W" "8" :string)
            ("U" "8" :string)
+           ("J" "8" :string)
+           ("M" "8" :string)
            ("I" "8" :string)
+           ("K" "8" :string)
+           ("D" "8" :string)
+           ("R" "8" :string)
+           ("P" "8" :string)
+           ("Z" "8" :string)
+           ("X" "8" :string)
+           ("N" "8" :string)
            ("L" "8" :string)
            ("E" "8" :string)
-           ("O" "8" :string)
-           ("V" "8" :string)
-           ("B" "8" :string)
-           ("T" "8" :string)
            ("G" "8" :string)
-           ("M" "8" :string)
+           ("A" "8" :string)
+           ("S" "8" :string)
            ("C" "8" :string)
+           ("Q" "8" :string)
+           ("W" "8" :string)
+           ("B" "8" :string)
+           ("e" "9" :string)
            ("n" "9" :string)
            ("s" "9" :string)
-           ("j" "9" :string)
-           ("p" "9" :string)
-           ("r" "9" :string)
-           ("x" "9" :string)
-           ("f" "9" :string)
-           ("l" "9" :string)
-           ("v" "9" :string)
+           ("y" "9" :string)
            ("m" "9" :string)
+           ("u" "9" :string)
            ("q" "9" :string)
+           ("v" "9" :string)
+           ("a" "9" :string)
+           ("l" "9" :string)
            ("d" "9" :string)
-           ("w" "9" :string)
-           ("h" "9" :string)
-           ("g" "9" :string)
            ("i" "9" :string)
-           ("t" "9" :string)
-           ("z" "9" :string)
-           ("c" "9" :string)
-           ("e" "9" :string)
-           ("y" "9" :string)
-           ("o" "9" :string)
+           ("j" "9" :string)
            ("b" "9" :string)
+           ("g" "9" :string)
+           ("w" "9" :string)
+           ("t" "9" :string)
+           ("f" "9" :string)
+           ("x" "9" :string)
            ("k" "9" :string)
-           ("a" "9" :string)
-           ("u" "9" :string)
+           ("o" "9" :string)
+           ("r" "9" :string)
+           ("h" "9" :string)
+           ("c" "9" :string)
+           ("z" "9" :string)
+           ("p" "9" :string)
            ))
 
 (define-rule-set "pe-ignore-special"
 
   :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)
            ))
 
 (define-rule-set "pe-resolve-special"
 
   :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)
@@ -530,58 +530,58 @@
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("q" "�" :string)
-           ("R" "�" :string)
+           ("c" "�" :string)
+           ("p" "�" :string)
            ("Q" "�" :string)
-           ("S" "�" :string)
-           ("D" "�" :string)
-           ("F" "�" :string)
-           ("x" "�" :string)
-           ("Y" "�" :string)
-           ("n" "�" :string)
+           ("C" "�" :string)
            ("r" "�" :string)
-           ("p" "�" :string)
-           ("j" "�" :string)
+           ("x" "�" :string)
            ("k" "�" :string)
-           ("T" "�" :string)
-           ("B" "�" :string)
-           ("y" "�" :string)
-           ("G" "�" :string)
-           ("c" "�" :string)
-           ("z" "�" :string)
-           ("I" "�" :string)
-           ("V" "�" :string)
-           ("O" "�" :string)
-           ("A" "�" :string)
-           ("d" "�" :string)
-           ("m" "�" :string)
-           ("K" "�" :string)
+           ("o" "�" :string)
            ("w" "�" :string)
-           ("P" "�" :string)
-           ("v" "�" :string)
-           ("J" "�" :string)
-           ("l" "�" :string)
-           ("H" "�" :string)
-           ("X" "�" :string)
+           ("t" "�" :string)
            ("N" "�" :string)
-           ("f" "�" :string)
+           ("R" "�" :string)
+           ("j" "�" :string)
            ("Z" "�" :string)
-           ("s" "�" :string)
-           ("u" "�" :string)
-           ("C" "�" :string)
-           ("a" "�" :string)
-           ("e" "�" :string)
-           ("o" "�" :string)
-           ("b" "�" :string)
+           ("P" "�" :string)
+           ("d" "�" :string)
+           ("I" "�" :string)
            ("M" "�" :string)
+           ("l" "�" :string)
+           ("a" "�" :string)
+           ("U" "�" :string)
+           ("F" "�" :string)
+           ("v" "�" :string)
+           ("T" "�" :string)
+           ("Y" "�" :string)
+           ("z" "�" :string)
+           ("B" "�" :string)
+           ("W" "�" :string)
+           ("h" "�" :string)
+           ("A" "�" :string)
+           ("G" "�" :string)
+           ("S" "�" :string)
+           ("f" "�" :string)
            ("E" "�" :string)
+           ("g" "�" :string)
            ("L" "�" :string)
-           ("W" "�" :string)
-           ("t" "�" :string)
-           ("U" "�" :string)
+           ("b" "�" :string)
+           ("X" "�" :string)
            ("i" "�" :string)
-           ("g" "�" :string)
-           ("h" "�" :string)
+           ("K" "�" :string)
+           ("D" "�" :string)
+           ("O" "�" :string)
+           ("H" "�" :string)
+           ("J" "�" :string)
+           ("V" "�" :string)
+           ("q" "�" :string)
+           ("u" "�" :string)
+           ("y" "�" :string)
+           ("m" "�" :string)
+           ("s" "�" :string)
+           ("n" "�" :string)
+           ("e" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ("{" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/polish/cp1250.xdy b/Master/texmf-dist/xindy/modules/lang/polish/cp1250.xdy
index 17bcae7b1fb..9fd143b3bde 100644
--- a/Master/texmf-dist/xindy/modules/lang/polish/cp1250.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/polish/cp1250.xdy
@@ -39,18 +39,18 @@
 
 (define-rule-set "pl-alphabetize"
 
-  :rules  (("a" "�" :string)
-           ("A" "�" :string)
+  :rules  (("A" "�" :string)
+           ("a" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("b" "�" :string)
            ("B" "�" :string)
+           ("b" "�" :string)
            ("c" "�" :string)
            ("C" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("D" "�" :string)
            ("d" "�" :string)
+           ("D" "�" :string)
            ("E" "�" :string)
            ("e" "�" :string)
            ("�" "�" :string)
@@ -61,10 +61,10 @@
            ("g" "�" :string)
            ("H" "�" :string)
            ("h" "�" :string)
-           ("I" "�" :string)
            ("i" "�" :string)
-           ("J" "�" :string)
+           ("I" "�" :string)
            ("j" "�" :string)
+           ("J" "�" :string)
            ("K" "�" :string)
            ("k" "�" :string)
            ("l" "�" :string)
@@ -83,8 +83,8 @@
            ("�" "�" :string)
            ("p" "�" :string)
            ("P" "�" :string)
-           ("q" "�" :string)
            ("Q" "�" :string)
+           ("q" "�" :string)
            ("r" "�" :string)
            ("R" "�" :string)
            ("s" "�" :string)
@@ -92,18 +92,18 @@
            ("�" "��" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("t" "�" :string)
            ("T" "�" :string)
-           ("U" "�" :string)
+           ("t" "�" :string)
            ("u" "�" :string)
+           ("U" "�" :string)
            ("V" "�" :string)
            ("v" "�" :string)
            ("W" "�" :string)
            ("w" "�" :string)
-           ("x" "�" :string)
            ("X" "�" :string)
-           ("y" "�" :string)
+           ("x" "�" :string)
            ("Y" "�" :string)
+           ("y" "�" :string)
            ("z" "�" :string)
            ("Z" "�" :string)
            ("�" "�" :string)
@@ -114,161 +114,161 @@
 
 (define-rule-set "pl-resolve-diacritics"
 
-  :rules  (("B" "�" :string)
-           ("Z" "�" :string)
+  :rules  (("�" "�" :string)
+           ("C" "�" :string)
            ("L" "�" :string)
-           ("�" "�" :string)
            ("m" "�" :string)
+           ("�" "�" :string)
+           ("o" "�" :string)
            ("x" "�" :string)
-           ("Q" "�" :string)
-           ("�" "�" :string)
-           ("n" "�" :string)
-           ("k" "�" :string)
-           ("�" "�" :string)
-           ("R" "�" :string)
-           ("�" "�" :string)
-           ("K" "�" :string)
-           ("S" "�" :string)
+           ("�" "�" :string)
+           ("D" "�" :string)
+           ("e" "�" :string)
+           ("P" "�" :string)
            ("h" "�" :string)
-           ("N" "�" :string)
-           ("d" "�" :string)
-           ("i" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("k" "�" :string)
            ("w" "�" :string)
-           ("F" "�" :string)
+           ("U" "�" :string)
+           ("�" "�" :string)
+           ("p" "�" :string)
+           ("b" "�" :string)
            ("�" "�" :string)
-           ("T" "�" :string)
-           ("X" "�" :string)
-           ("o" "�" :string)
-           ("P" "�" :string)
-           ("j" "�" :string)
            ("I" "�" :string)
-           ("�" "�" :string)
-           ("r" "�" :string)
-           ("�" "�" :string)
-           ("a" "�" :string)
-           ("J" "�" :string)
-           ("c" "�" :string)
-           ("W" "�" :string)
+           ("S" "�" :string)
+           ("g" "�" :string)
            ("y" "�" :string)
+           ("t" "�" :string)
+           ("i" "�" :string)
+           ("H" "�" :string)
+           ("Z" "�" :string)
+           ("a" "�" :string)
+           ("�" "�" :string)
+           ("T" "�" :string)
+           ("B" "�" :string)
+           ("A" "�" :string)
+           ("n" "�" :string)
            ("s" "�" :string)
-           ("l" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("v" "�" :string)
+           ("N" "�" :string)
            ("�" "�" :string)
-           ("E" "�" :string)
-           ("b" "�" :string)
-           ("�" "�" :string)
+           ("u" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("X" "�" :string)
+           ("F" "�" :string)
            ("M" "�" :string)
-           ("q" "�" :string)
-           ("�" "�" :string)
-           ("V" "�" :string)
-           ("e" "�" :string)
-           ("A" "�" :string)
+           ("f" "�" :string)
            ("Y" "�" :string)
-           ("�" "�" :string)
-           ("u" "�" :string)
-           ("�" "�" :string)
-           ("H" "�" :string)
-           ("O" "�" :string)
-           ("�" "�" :string)
-           ("p" "�" :string)
-           ("g" "�" :string)
-           ("U" "�" :string)
-           ("v" "�" :string)
-           ("G" "�" :string)
-           ("D" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("t" "�" :string)
-           ("C" "�" :string)
+           ("�" "�" :string)
+           ("J" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("R" "�" :string)
+           ("�" "�" :string)
+           ("O" "�" :string)
+           ("K" "�" :string)
+           ("j" "�" :string)
+           ("W" "�" :string)
            ("z" "�" :string)
-           ("f" "�" :string)
+           ("Q" "�" :string)
+           ("q" "�" :string)
+           ("�" "�" :string)
+           ("r" "�" :string)
+           ("G" "�" :string)
+           ("c" "�" :string)
+           ("l" "�" :string)
+           ("d" "�" :string)
+           ("E" "�" :string)
+           ("V" "�" :string)
            ("�" "�" :string)
            ))
 
 (define-rule-set "pl-resolve-case"
 
-  :rules  (("�" "8" :string)
-           ("R" "8" :string)
-           ("�" "8" :string)
-           ("K" "8" :string)
-           ("S" "8" :string)
-           ("N" "8" :string)
-           ("�" "8" :string)
-           ("L" "8" :string)
-           ("B" "8" :string)
-           ("Z" "8" :string)
-           ("Q" "8" :string)
-           ("P" "8" :string)
-           ("X" "8" :string)
-           ("I" "8" :string)
-           ("T" "8" :string)
+  :rules  (("Y" "8" :string)
            ("F" "8" :string)
-           ("E" "8" :string)
-           ("�" "8" :string)
-           ("V" "8" :string)
            ("M" "8" :string)
+           ("X" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("K" "8" :string)
+           ("O" "8" :string)
            ("�" "8" :string)
-           ("J" "8" :string)
+           ("R" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
+           ("J" "8" :string)
+           ("�" "8" :string)
+           ("Q" "8" :string)
+           ("�" "8" :string)
            ("W" "8" :string)
-           ("D" "8" :string)
-           ("U" "8" :string)
+           ("V" "8" :string)
+           ("E" "8" :string)
            ("G" "8" :string)
+           ("�" "8" :string)
+           ("L" "8" :string)
            ("C" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("Y" "8" :string)
+           ("P" "8" :string)
+           ("D" "8" :string)
+           ("�" "8" :string)
            ("H" "8" :string)
+           ("Z" "8" :string)
+           ("S" "8" :string)
+           ("I" "8" :string)
+           ("U" "8" :string)
+           ("N" "8" :string)
+           ("T" "8" :string)
            ("A" "8" :string)
-           ("O" "8" :string)
-           ("�" "8" :string)
-           ("h" "9" :string)
-           ("m" "9" :string)
-           ("x" "9" :string)
-           ("�" "9" :string)
-           ("n" "9" :string)
-           ("k" "9" :string)
-           ("o" "9" :string)
-           ("j" "9" :string)
-           ("i" "9" :string)
-           ("d" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("w" "9" :string)
-           ("b" "9" :string)
-           ("l" "9" :string)
-           ("s" "9" :string)
+           ("B" "8" :string)
+           ("f" "9" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
-           ("q" "9" :string)
-           ("c" "9" :string)
+           ("u" "9" :string)
            ("�" "9" :string)
+           ("�" "9" :string)
+           ("q" "9" :string)
            ("r" "9" :string)
-           ("a" "9" :string)
-           ("y" "9" :string)
-           ("v" "9" :string)
-           ("t" "9" :string)
-           ("f" "9" :string)
            ("z" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("u" "9" :string)
+           ("j" "9" :string)
+           ("l" "9" :string)
+           ("d" "9" :string)
+           ("c" "9" :string)
+           ("x" "9" :string)
            ("�" "9" :string)
+           ("o" "9" :string)
+           ("m" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("h" "9" :string)
            ("e" "9" :string)
-           ("p" "9" :string)
+           ("i" "9" :string)
+           ("a" "9" :string)
+           ("y" "9" :string)
+           ("t" "9" :string)
+           ("�" "9" :string)
            ("g" "9" :string)
+           ("b" "9" :string)
+           ("p" "9" :string)
+           ("�" "9" :string)
+           ("k" "9" :string)
+           ("w" "9" :string)
+           ("v" "9" :string)
+           ("�" "9" :string)
+           ("s" "9" :string)
+           ("n" "9" :string)
            ("�" "99" :string)
            ))
 
 (define-rule-set "pl-ignore-special"
 
-  :rules  (("." "" :string)
+  :rules  (("?" "" :string)
+           ("." "" :string)
            ("-" "" :string)
-           ("!" "" :string)
-           ("?" "" :string)
            ("'" "" :string)
+           ("!" "" :string)
            ))
 
 (define-rule-set "pl-resolve-special"
@@ -276,75 +276,75 @@
   :rules  (("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("C" "�" :string)
-           ("t" "�" :string)
-           ("f" "�" :string)
-           ("z" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("D" "�" :string)
-           ("U" "�" :string)
-           ("G" "�" :string)
-           ("v" "�" :string)
-           ("p" "�" :string)
-           ("g" "�" :string)
-           ("O" "�" :string)
+           ("J" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("u" "�" :string)
-           ("Y" "�" :string)
-           ("H" "�" :string)
-           ("A" "�" :string)
-           ("e" "�" :string)
-           ("V" "�" :string)
-           ("q" "�" :string)
-           ("�" "�" :string)
-           ("M" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("E" "�" :string)
-           ("b" "�" :string)
+           ("�" "�" :string)
+           ("R" "�" :string)
+           ("K" "�" :string)
+           ("O" "�" :string)
+           ("�" "�" :string)
+           ("u" "�" :string)
            ("�" "�" :string)
-           ("s" "�" :string)
+           ("X" "�" :string)
+           ("�" "�" :string)
+           ("F" "�" :string)
+           ("M" "�" :string)
+           ("Y" "�" :string)
+           ("f" "�" :string)
+           ("G" "�" :string)
+           ("c" "�" :string)
+           ("d" "�" :string)
            ("l" "�" :string)
-           ("�" "�" :string)
-           ("y" "�" :string)
+           ("E" "�" :string)
+           ("V" "�" :string)
+           ("j" "�" :string)
            ("W" "�" :string)
-           ("J" "�" :string)
-           ("c" "�" :string)
-           ("�" "�" :string)
+           ("q" "�" :string)
+           ("Q" "�" :string)
+           ("�" "�" :string)
            ("r" "�" :string)
-           ("�" "�" :string)
-           ("a" "�" :string)
-           ("I" "�" :string)
-           ("j" "�" :string)
+           ("z" "�" :string)
+           ("e" "�" :string)
+           ("D" "�" :string)
            ("P" "�" :string)
-           ("X" "�" :string)
+           ("h" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("L" "�" :string)
+           ("C" "�" :string)
+           ("�" "�" :string)
+           ("m" "�" :string)
+           ("x" "�" :string)
+           ("�" "�" :string)
            ("o" "�" :string)
            ("T" "�" :string)
-           ("�" "�" :string)
+           ("A" "�" :string)
+           ("B" "�" :string)
+           ("s" "�" :string)
+           ("n" "�" :string)
+           ("N" "�" :string)
+           ("�" "�" :string)
+           ("v" "�" :string)
+           ("U" "�" :string)
+           ("p" "�" :string)
            ("�" "�" :string)
-           ("F" "�" :string)
+           ("k" "�" :string)
            ("w" "�" :string)
-           ("i" "�" :string)
-           ("d" "�" :string)
-           ("h" "�" :string)
+           ("�" "�" :string)
            ("S" "�" :string)
-           ("N" "�" :string)
-           ("�" "�" :string)
+           ("I" "�" :string)
+           ("g" "�" :string)
+           ("b" "�" :string)
+           ("y" "�" :string)
+           ("t" "�" :string)
            ("�" "�" :string)
-           ("K" "�" :string)
-           ("R" "�" :string)
-           ("�" "�" :string)
-           ("n" "�" :string)
-           ("k" "�" :string)
-           ("Q" "�" :string)
-           ("�" "�" :string)
-           ("L" "�" :string)
-           ("x" "�" :string)
-           ("m" "�" :string)
-           ("B" "�" :string)
+           ("H" "�" :string)
+           ("i" "�" :string)
+           ("a" "�" :string)
            ("Z" "�" :string)
            ("�" "��" :string)
            ("-" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/polish/latin2.xdy b/Master/texmf-dist/xindy/modules/lang/polish/latin2.xdy
index 0c8ce84bfda..c6a43e8518b 100644
--- a/Master/texmf-dist/xindy/modules/lang/polish/latin2.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/polish/latin2.xdy
@@ -43,12 +43,12 @@
            ("a" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("b" "�" :string)
            ("B" "�" :string)
+           ("b" "�" :string)
            ("c" "�" :string)
            ("C" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("D" "�" :string)
            ("d" "�" :string)
            ("e" "�" :string)
@@ -57,36 +57,36 @@
            ("�" "�" :string)
            ("F" "�" :string)
            ("f" "�" :string)
-           ("g" "�" :string)
            ("G" "�" :string)
-           ("h" "�" :string)
+           ("g" "�" :string)
            ("H" "�" :string)
-           ("I" "�" :string)
+           ("h" "�" :string)
            ("i" "�" :string)
+           ("I" "�" :string)
            ("J" "�" :string)
            ("j" "�" :string)
            ("K" "�" :string)
            ("k" "�" :string)
-           ("L" "�" :string)
            ("l" "�" :string)
+           ("L" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("M" "�" :string)
            ("m" "�" :string)
-           ("N" "�" :string)
            ("n" "�" :string)
+           ("N" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("o" "�" :string)
            ("O" "�" :string)
+           ("o" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("p" "�" :string)
            ("P" "�" :string)
-           ("q" "�" :string)
+           ("p" "�" :string)
            ("Q" "�" :string)
-           ("R" "�" :string)
+           ("q" "�" :string)
            ("r" "�" :string)
+           ("R" "�" :string)
            ("S" "�" :string)
            ("s" "�" :string)
            ("�" "��" :string)
@@ -94,16 +94,16 @@
            ("�" "�" :string)
            ("t" "�" :string)
            ("T" "�" :string)
-           ("u" "�" :string)
            ("U" "�" :string)
+           ("u" "�" :string)
            ("V" "�" :string)
            ("v" "�" :string)
-           ("w" "�" :string)
            ("W" "�" :string)
+           ("w" "�" :string)
            ("X" "�" :string)
            ("x" "�" :string)
-           ("y" "�" :string)
            ("Y" "�" :string)
+           ("y" "�" :string)
            ("Z" "�" :string)
            ("z" "�" :string)
            ("�" "�" :string)
@@ -114,160 +114,160 @@
 
 (define-rule-set "pl-resolve-diacritics"
 
-  :rules  (("U" "�" :string)
-           ("h" "�" :string)
-           ("B" "�" :string)
-           ("a" "�" :string)
-           ("J" "�" :string)
-           ("w" "�" :string)
-           ("P" "�" :string)
-           ("�" "�" :string)
-           ("R" "�" :string)
-           ("l" "�" :string)
-           ("f" "�" :string)
-           ("D" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("g" "�" :string)
-           ("Q" "�" :string)
-           ("i" "�" :string)
-           ("�" "�" :string)
-           ("N" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("O" "�" :string)
+  :rules  (("m" "�" :string)
+           ("v" "�" :string)
            ("n" "�" :string)
-           ("j" "�" :string)
-           ("H" "�" :string)
-           ("�" "�" :string)
-           ("W" "�" :string)
+           ("N" "�" :string)
            ("d" "�" :string)
-           ("v" "�" :string)
-           ("r" "�" :string)
-           ("m" "�" :string)
-           ("G" "�" :string)
+           ("u" "�" :string)
+           ("R" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("t" "�" :string)
-           ("�" "�" :string)
-           ("V" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("p" "�" :string)
-           ("b" "�" :string)
+           ("�" "�" :string)
+           ("x" "�" :string)
+           ("Z" "�" :string)
            ("y" "�" :string)
-           ("�" "�" :string)
-           ("S" "�" :string)
-           ("z" "�" :string)
            ("X" "�" :string)
-           ("�" "�" :string)
-           ("Z" "�" :string)
+           ("F" "�" :string)
+           ("f" "�" :string)
+           ("i" "�" :string)
+           ("C" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("o" "�" :string)
+           ("s" "�" :string)
+           ("q" "�" :string)
+           ("E" "�" :string)
+           ("T" "�" :string)
+           ("�" "�" :string)
+           ("h" "�" :string)
            ("I" "�" :string)
+           ("�" "�" :string)
+           ("j" "�" :string)
+           ("�" "�" :string)
+           ("k" "�" :string)
+           ("J" "�" :string)
+           ("z" "�" :string)
            ("c" "�" :string)
+           ("t" "�" :string)
+           ("r" "�" :string)
+           ("W" "�" :string)
+           ("S" "�" :string)
            ("�" "�" :string)
-           ("L" "�" :string)
+           ("V" "�" :string)
            ("M" "�" :string)
            ("K" "�" :string)
-           ("C" "�" :string)
-           ("Y" "�" :string)
-           ("x" "�" :string)
-           ("F" "�" :string)
-           ("k" "�" :string)
-           ("E" "�" :string)
-           ("T" "�" :string)
-           ("o" "�" :string)
+           ("p" "�" :string)
+           ("l" "�" :string)
+           ("�" "�" :string)
+           ("Q" "�" :string)
+           ("�" "�" :string)
+           ("P" "�" :string)
+           ("D" "�" :string)
+           ("�" "�" :string)
+           ("U" "�" :string)
+           ("�" "�" :string)
+           ("B" "�" :string)
            ("e" "�" :string)
+           ("Y" "�" :string)
+           ("L" "�" :string)
+           ("�" "�" :string)
+           ("w" "�" :string)
+           ("g" "�" :string)
+           ("�" "�" :string)
+           ("O" "�" :string)
+           ("a" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("G" "�" :string)
+           ("H" "�" :string)
+           ("b" "�" :string)
            ("A" "�" :string)
-           ("u" "�" :string)
-           ("q" "�" :string)
-           ("s" "�" :string)
            ("�" "�" :string)
            ))
 
 (define-rule-set "pl-resolve-case"
 
-  :rules  (("I" "8" :string)
+  :rules  (("E" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("C" "8" :string)
+           ("J" "8" :string)
+           ("T" "8" :string)
+           ("I" "8" :string)
+           ("�" "8" :string)
+           ("R" "8" :string)
+           ("N" "8" :string)
+           ("F" "8" :string)
+           ("X" "8" :string)
+           ("�" "8" :string)
            ("Z" "8" :string)
-           ("M" "8" :string)
+           ("�" "8" :string)
            ("L" "8" :string)
-           ("�" "8" :string)
-           ("V" "8" :string)
-           ("�" "8" :string)
+           ("O" "8" :string)
            ("�" "8" :string)
-           ("S" "8" :string)
-           ("�" "8" :string)
-           ("X" "8" :string)
            ("A" "8" :string)
-           ("Y" "8" :string)
-           ("C" "8" :string)
+           ("G" "8" :string)
+           ("H" "8" :string)
+           ("M" "8" :string)
            ("K" "8" :string)
-           ("E" "8" :string)
-           ("T" "8" :string)
-           ("F" "8" :string)
-           ("Q" "8" :string)
-           ("�" "8" :string)
-           ("O" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("N" "8" :string)
-           ("J" "8" :string)
+           ("S" "8" :string)
+           ("W" "8" :string)
+           ("V" "8" :string)
            ("P" "8" :string)
+           ("Y" "8" :string)
+           ("�" "8" :string)
            ("U" "8" :string)
            ("B" "8" :string)
-           ("�" "8" :string)
+           ("�" "8" :string)
            ("D" "8" :string)
-           ("R" "8" :string)
-           ("G" "8" :string)
-           ("�" "8" :string)
-           ("H" "8" :string)
-           ("W" "8" :string)
-           ("�" "9" :string)
-           ("c" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("t" "9" :string)
-           ("z" "9" :string)
-           ("y" "9" :string)
-           ("p" "9" :string)
-           ("b" "9" :string)
-           ("e" "9" :string)
-           ("o" "9" :string)
-           ("q" "9" :string)
+           ("�" "8" :string)
+           ("Q" "8" :string)
            ("s" "9" :string)
-           ("u" "9" :string)
-           ("x" "9" :string)
-           ("k" "9" :string)
-           ("i" "9" :string)
-           ("g" "9" :string)
-           ("n" "9" :string)
+           ("q" "9" :string)
+           ("o" "9" :string)
            ("�" "9" :string)
-           ("a" "9" :string)
-           ("�" "9" :string)
-           ("w" "9" :string)
-           ("h" "9" :string)
-           ("�" "9" :string)
+           ("z" "9" :string)
+           ("t" "9" :string)
+           ("c" "9" :string)
            ("�" "9" :string)
+           ("k" "9" :string)
            ("�" "9" :string)
+           ("j" "9" :string)
+           ("h" "9" :string)
+           ("�" "9" :string)
+           ("d" "9" :string)
+           ("n" "9" :string)
+           ("v" "9" :string)
+           ("m" "9" :string)
+           ("u" "9" :string)
            ("f" "9" :string)
+           ("y" "9" :string)
+           ("i" "9" :string)
+           ("x" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("a" "9" :string)
+           ("�" "9" :string)
+           ("g" "9" :string)
+           ("w" "9" :string)
+           ("b" "9" :string)
+           ("p" "9" :string)
            ("l" "9" :string)
-           ("m" "9" :string)
            ("r" "9" :string)
-           ("v" "9" :string)
-           ("�" "9" :string)
-           ("j" "9" :string)
-           ("d" "9" :string)
+           ("�" "9" :string)
+           ("e" "9" :string)
+           ("�" "9" :string)
            ("�" "99" :string)
            ))
 
 (define-rule-set "pl-ignore-special"
 
-  :rules  (("?" "" :string)
-           ("'" "" :string)
+  :rules  (("'" "" :string)
            ("-" "" :string)
            ("!" "" :string)
+           ("?" "" :string)
            ("." "" :string)
            ))
 
@@ -276,76 +276,76 @@
   :rules  (("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("R" "�" :string)
-           ("l" "�" :string)
-           ("f" "�" :string)
-           ("D" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("U" "�" :string)
-           ("h" "�" :string)
-           ("B" "�" :string)
-           ("a" "�" :string)
-           ("J" "�" :string)
-           ("�" "�" :string)
-           ("w" "�" :string)
-           ("P" "�" :string)
-           ("N" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("L" "�" :string)
            ("O" "�" :string)
-           ("n" "�" :string)
            ("g" "�" :string)
-           ("�" "�" :string)
-           ("Q" "�" :string)
-           ("i" "�" :string)
-           ("W" "�" :string)
-           ("d" "�" :string)
-           ("j" "�" :string)
-           ("H" "�" :string)
-           ("�" "�" :string)
+           ("w" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("a" "�" :string)
+           ("�" "�" :string)
            ("G" "�" :string)
-           ("�" "�" :string)
-           ("v" "�" :string)
-           ("r" "�" :string)
-           ("m" "�" :string)
-           ("p" "�" :string)
+           ("H" "�" :string)
            ("b" "�" :string)
-           ("y" "�" :string)
-           ("�" "�" :string)
+           ("A" "�" :string)
+           ("W" "�" :string)
            ("S" "�" :string)
-           ("X" "�" :string)
-           ("z" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("t" "�" :string)
+           ("r" "�" :string)
            ("V" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("c" "�" :string)
-           ("L" "�" :string)
+           ("K" "�" :string)
            ("M" "�" :string)
+           ("p" "�" :string)
+           ("l" "�" :string)
            ("�" "�" :string)
-           ("Z" "�" :string)
-           ("I" "�" :string)
-           ("F" "�" :string)
-           ("k" "�" :string)
-           ("T" "�" :string)
-           ("E" "�" :string)
-           ("K" "�" :string)
-           ("C" "�" :string)
+           ("�" "�" :string)
+           ("Q" "�" :string)
+           ("P" "�" :string)
+           ("e" "�" :string)
            ("Y" "�" :string)
-           ("x" "�" :string)
-           ("u" "�" :string)
-           ("A" "�" :string)
+           ("D" "�" :string)
+           ("U" "�" :string)
+           ("B" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("C" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("o" "�" :string)
            ("q" "�" :string)
            ("s" "�" :string)
-           ("o" "�" :string)
-           ("e" "�" :string)
+           ("E" "�" :string)
+           ("T" "�" :string)
+           ("�" "�" :string)
+           ("j" "�" :string)
+           ("k" "�" :string)
+           ("�" "�" :string)
+           ("h" "�" :string)
+           ("I" "�" :string)
+           ("�" "�" :string)
+           ("z" "�" :string)
+           ("J" "�" :string)
+           ("t" "�" :string)
+           ("c" "�" :string)
+           ("n" "�" :string)
+           ("d" "�" :string)
+           ("N" "�" :string)
+           ("m" "�" :string)
+           ("v" "�" :string)
+           ("u" "�" :string)
+           ("�" "�" :string)
+           ("R" "�" :string)
+           ("x" "�" :string)
+           ("�" "�" :string)
+           ("Z" "�" :string)
+           ("F" "�" :string)
+           ("X" "�" :string)
+           ("f" "�" :string)
+           ("y" "�" :string)
+           ("i" "�" :string)
            ("�" "��" :string)
            ("-" "�" :string)
            ("'" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/polish/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/polish/utf8.xdy
index a1e10f1c002..9b5ba812575 100644
--- a/Master/texmf-dist/xindy/modules/lang/polish/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/polish/utf8.xdy
@@ -41,25 +41,25 @@
 
   :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)
-           ("a" "�" :string)
            ("A" "�" :string)
+           ("a" "�" :string)
            ("B" "�" :string)
            ("b" "�" :string)
            ("c" "�" :string)
@@ -76,34 +76,34 @@
            ("h" "�" :string)
            ("I" "�" :string)
            ("i" "�" :string)
-           ("J" "�" :string)
            ("j" "�" :string)
+           ("J" "�" :string)
            ("k" "�" :string)
            ("K" "�" :string)
-           ("L" "�" :string)
            ("l" "�" :string)
+           ("L" "�" :string)
            ("m" "�" :string)
            ("M" "�" :string)
            ("N" "�" :string)
            ("n" "�" :string)
            ("o" "�" :string)
            ("O" "�" :string)
-           ("p" "�" :string)
            ("P" "�" :string)
-           ("q" "�" :string)
+           ("p" "�" :string)
            ("Q" "�" :string)
+           ("q" "�" :string)
            ("r" "�" :string)
            ("R" "�" :string)
            ("S" "�" :string)
            ("s" "�" :string)
            ("T" "�" :string)
            ("t" "�" :string)
-           ("u" "�" :string)
            ("U" "�" :string)
-           ("V" "�" :string)
+           ("u" "�" :string)
            ("v" "�" :string)
-           ("w" "�" :string)
+           ("V" "�" :string)
            ("W" "�" :string)
+           ("w" "�" :string)
            ("x" "�" :string)
            ("X" "�" :string)
            ("Y" "�" :string)
@@ -114,239 +114,239 @@
 
 (define-rule-set "pl-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)
-           ("m" "�" :string)
-           ("H" "�" :string)
-           ("f" "�" :string)
-           ("a" "�" :string)
-           ("k" "�" :string)
-           ("K" "�" :string)
-           ("L" "�" :string)
-           ("F" "�" :string)
+           ("T" "�" :string)
            ("e" "�" :string)
-           ("d" "�" :string)
-           ("Y" "�" :string)
+           ("m" "�" :string)
            ("q" "�" :string)
-           ("T" "�" :string)
-           ("l" "�" :string)
-           ("Z" "�" :string)
            ("U" "�" :string)
-           ("p" "�" :string)
-           ("N" "�" :string)
-           ("u" "�" :string)
-           ("J" "�" :string)
            ("x" "�" :string)
-           ("c" "�" :string)
+           ("L" "�" :string)
+           ("E" "�" :string)
+           ("B" "�" :string)
+           ("I" "�" :string)
+           ("i" "�" :string)
+           ("r" "�" :string)
+           ("z" "�" :string)
            ("o" "�" :string)
-           ("S" "�" :string)
            ("G" "�" :string)
+           ("k" "�" :string)
+           ("d" "�" :string)
            ("j" "�" :string)
-           ("O" "�" :string)
-           ("V" "�" :string)
-           ("g" "�" :string)
+           ("W" "�" :string)
+           ("K" "�" :string)
+           ("S" "�" :string)
+           ("J" "�" :string)
            ("Q" "�" :string)
-           ("M" "�" :string)
-           ("r" "�" :string)
-           ("I" "�" :string)
-           ("C" "�" :string)
-           ("A" "�" :string)
-           ("v" "�" :string)
-           ("E" "�" :string)
-           ("z" "�" :string)
-           ("y" "�" :string)
-           ("X" "�" :string)
-           ("R" "�" :string)
-           ("B" "�" :string)
+           ("Z" "�" :string)
+           ("l" "�" :string)
+           ("c" "�" :string)
+           ("P" "�" :string)
+           ("N" "�" :string)
+           ("V" "�" :string)
+           ("p" "�" :string)
            ("D" "�" :string)
-           ("n" "�" :string)
-           ("t" "�" :string)
+           ("M" "�" :string)
+           ("b" "�" :string)
            ("w" "�" :string)
-           ("W" "�" :string)
-           ("i" "�" :string)
-           ("P" "�" :string)
            ("s" "�" :string)
-           ("b" "�" :string)
+           ("t" "�" :string)
+           ("y" "�" :string)
+           ("n" "�" :string)
+           ("f" "�" :string)
+           ("a" "�" :string)
+           ("Y" "�" :string)
+           ("F" "�" :string)
+           ("O" "�" :string)
+           ("R" "�" :string)
+           ("H" "�" :string)
+           ("A" "�" :string)
+           ("v" "�" :string)
            ("h" "�" :string)
+           ("X" "�" :string)
+           ("C" "�" :string)
+           ("u" "�" :string)
+           ("g" "�" :string)
            ))
 
 (define-rule-set "pl-resolve-case"
 
-  :rules  (("Ą" "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)
            ("ś" "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)
            ("ß" "99" :string)
-           ("W" "8" :string)
-           ("P" "8" :string)
-           ("B" "8" :string)
-           ("D" "8" :string)
            ("X" "8" :string)
-           ("R" "8" :string)
-           ("E" "8" :string)
-           ("I" "8" :string)
            ("C" "8" :string)
+           ("R" "8" :string)
+           ("H" "8" :string)
            ("A" "8" :string)
-           ("Q" "8" :string)
-           ("M" "8" :string)
-           ("J" "8" :string)
-           ("U" "8" :string)
-           ("N" "8" :string)
            ("O" "8" :string)
+           ("F" "8" :string)
+           ("Y" "8" :string)
+           ("M" "8" :string)
            ("V" "8" :string)
+           ("N" "8" :string)
+           ("D" "8" :string)
+           ("Z" "8" :string)
+           ("J" "8" :string)
+           ("Q" "8" :string)
+           ("P" "8" :string)
+           ("W" "8" :string)
+           ("K" "8" :string)
            ("S" "8" :string)
+           ("B" "8" :string)
+           ("I" "8" :string)
            ("G" "8" :string)
-           ("F" "8" :string)
+           ("U" "8" :string)
+           ("E" "8" :string)
            ("L" "8" :string)
-           ("Y" "8" :string)
-           ("K" "8" :string)
-           ("H" "8" :string)
-           ("Z" "8" :string)
            ("T" "8" :string)
-           ("i" "9" :string)
+           ("u" "9" :string)
+           ("g" "9" :string)
+           ("v" "9" :string)
+           ("h" "9" :string)
+           ("a" "9" :string)
+           ("f" "9" :string)
+           ("y" "9" :string)
+           ("s" "9" :string)
            ("t" "9" :string)
-           ("w" "9" :string)
            ("n" "9" :string)
-           ("y" "9" :string)
-           ("h" "9" :string)
            ("b" "9" :string)
-           ("s" "9" :string)
-           ("g" "9" :string)
-           ("v" "9" :string)
-           ("z" "9" :string)
-           ("r" "9" :string)
-           ("x" "9" :string)
-           ("c" "9" :string)
-           ("o" "9" :string)
-           ("u" "9" :string)
+           ("w" "9" :string)
            ("p" "9" :string)
-           ("j" "9" :string)
-           ("q" "9" :string)
-           ("e" "9" :string)
+           ("l" "9" :string)
+           ("c" "9" :string)
            ("d" "9" :string)
+           ("j" "9" :string)
            ("k" "9" :string)
+           ("r" "9" :string)
+           ("i" "9" :string)
+           ("o" "9" :string)
+           ("z" "9" :string)
+           ("x" "9" :string)
            ("m" "9" :string)
-           ("f" "9" :string)
-           ("a" "9" :string)
-           ("l" "9" :string)
+           ("q" "9" :string)
+           ("e" "9" :string)
            ))
 
 (define-rule-set "pl-ignore-special"
 
-  :rules  (("-" "" :string)
-           ("!" "" :string)
+  :rules  (("!" "" :string)
            ("?" "" :string)
-           ("." "" :string)
            ("'" "" :string)
+           ("-" "" :string)
+           ("." "" :string)
            ))
 
 (define-rule-set "pl-resolve-special"
 
-  :rules  (("Ó" "�" :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)
-           ("N" "�" :string)
+           ("D" "�" :string)
            ("p" "�" :string)
-           ("U" "�" :string)
-           ("u" "�" :string)
-           ("o" "�" :string)
-           ("c" "�" :string)
-           ("x" "�" :string)
-           ("J" "�" :string)
-           ("G" "�" :string)
-           ("S" "�" :string)
-           ("j" "�" :string)
            ("V" "�" :string)
-           ("O" "�" :string)
+           ("N" "�" :string)
+           ("w" "�" :string)
+           ("b" "�" :string)
+           ("M" "�" :string)
+           ("n" "�" :string)
+           ("y" "�" :string)
+           ("t" "�" :string)
+           ("s" "�" :string)
+           ("Y" "�" :string)
            ("a" "�" :string)
            ("f" "�" :string)
-           ("m" "�" :string)
-           ("H" "�" :string)
-           ("K" "�" :string)
-           ("k" "�" :string)
-           ("Y" "�" :string)
-           ("d" "�" :string)
+           ("O" "�" :string)
            ("F" "�" :string)
-           ("L" "�" :string)
-           ("e" "�" :string)
-           ("q" "�" :string)
-           ("T" "�" :string)
-           ("Z" "�" :string)
-           ("l" "�" :string)
+           ("h" "�" :string)
+           ("v" "�" :string)
+           ("A" "�" :string)
+           ("H" "�" :string)
            ("R" "�" :string)
+           ("C" "�" :string)
            ("X" "�" :string)
-           ("y" "�" :string)
-           ("n" "�" :string)
-           ("D" "�" :string)
-           ("B" "�" :string)
-           ("w" "�" :string)
-           ("t" "�" :string)
-           ("i" "�" :string)
-           ("P" "�" :string)
-           ("W" "�" :string)
-           ("s" "�" :string)
-           ("b" "�" :string)
-           ("h" "�" :string)
            ("g" "�" :string)
-           ("M" "�" :string)
-           ("Q" "�" :string)
+           ("u" "�" :string)
+           ("T" "�" :string)
+           ("e" "�" :string)
+           ("q" "�" :string)
+           ("m" "�" :string)
+           ("E" "�" :string)
+           ("L" "�" :string)
+           ("x" "�" :string)
+           ("U" "�" :string)
+           ("o" "�" :string)
+           ("G" "�" :string)
+           ("z" "�" :string)
            ("r" "�" :string)
-           ("A" "�" :string)
-           ("C" "�" :string)
            ("I" "�" :string)
-           ("z" "�" :string)
-           ("E" "�" :string)
-           ("v" "�" :string)
+           ("i" "�" :string)
+           ("B" "�" :string)
+           ("k" "�" :string)
+           ("j" "�" :string)
+           ("d" "�" :string)
+           ("K" "�" :string)
+           ("S" "�" :string)
+           ("W" "�" :string)
+           ("P" "�" :string)
+           ("c" "�" :string)
+           ("l" "�" :string)
+           ("Z" "�" :string)
+           ("Q" "�" :string)
+           ("J" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/portuguese/latin1.xdy b/Master/texmf-dist/xindy/modules/lang/portuguese/latin1.xdy
index 434d79f613c..10e4dee77fe 100644
--- a/Master/texmf-dist/xindy/modules/lang/portuguese/latin1.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/portuguese/latin1.xdy
@@ -31,69 +31,69 @@
 (define-rule-set "pt-alphabetize"
 
   :rules  (("a" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("A" "�" :string)
-           ("�" "��" :string)
+           ("�" "�" :string)
            ("�" "��" :string)
+           ("�" "��" :string)
            ("B" "�" :string)
            ("b" "�" :string)
-           ("C" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("c" "�" :string)
-           ("�" "�" :string)
-           ("d" "�" :string)
+           ("C" "�" :string)
            ("D" "�" :string)
+           ("d" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("E" "�" :string)
+           ("e" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("e" "�" :string)
-           ("�" "�" :string)
-           ("F" "�" :string)
+           ("E" "�" :string)
            ("f" "�" :string)
-           ("G" "�" :string)
+           ("F" "�" :string)
            ("g" "�" :string)
-           ("H" "�" :string)
+           ("G" "�" :string)
            ("h" "�" :string)
-           ("I" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("i" "�" :string)
+           ("H" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("i" "�" :string)
+           ("�" "�" :string)
+           ("I" "�" :string)
            ("j" "�" :string)
            ("J" "�" :string)
-           ("K" "�" :string)
            ("k" "�" :string)
+           ("K" "�" :string)
            ("l" "�" :string)
            ("L" "�" :string)
            ("M" "�" :string)
            ("m" "�" :string)
-           ("n" "�" :string)
            ("N" "�" :string)
-           ("�" "�" :string)
-           ("o" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("n" "�" :string)
            ("�" "�" :string)
-           ("O" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("O" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("p" "�" :string)
+           ("o" "�" :string)
            ("P" "�" :string)
-           ("q" "�" :string)
+           ("p" "�" :string)
            ("Q" "�" :string)
+           ("q" "�" :string)
            ("R" "�" :string)
            ("r" "�" :string)
            ("s" "�" :string)
@@ -101,219 +101,219 @@
            ("�" "��" :string)
            ("T" "�" :string)
            ("t" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("U" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("u" "�" :string)
-           ("U" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("v" "�" :string)
            ("V" "�" :string)
-           ("W" "�" :string)
+           ("v" "�" :string)
            ("w" "�" :string)
+           ("W" "�" :string)
            ("x" "�" :string)
            ("X" "�" :string)
-           ("y" "�" :string)
            ("Y" "�" :string)
+           ("y" "�" :string)
            ("Z" "�" :string)
            ("z" "�" :string)
            ))
 
 (define-rule-set "pt-resolve-diacritics"
 
-  :rules  (("h" "�" :string)
-           ("X" "�" :string)
-           ("g" "�" :string)
-           ("c" "�" :string)
-           ("Y" "�" :string)
-           ("w" "�" :string)
-           ("b" "�" :string)
-           ("r" "�" :string)
-           ("f" "�" :string)
-           ("N" "�" :string)
+  :rules  (("e" "�" :string)
+           ("j" "�" :string)
+           ("J" "�" :string)
+           ("h" "�" :string)
            ("A" "�" :string)
+           ("L" "�" :string)
            ("W" "�" :string)
-           ("Q" "�" :string)
-           ("H" "�" :string)
-           ("e" "�" :string)
-           ("t" "�" :string)
            ("y" "�" :string)
-           ("i" "�" :string)
-           ("O" "�" :string)
-           ("U" "�" :string)
-           ("L" "�" :string)
-           ("J" "�" :string)
-           ("G" "�" :string)
-           ("M" "�" :string)
-           ("n" "�" :string)
-           ("R" "�" :string)
-           ("k" "�" :string)
-           ("E" "�" :string)
-           ("S" "�" :string)
-           ("m" "�" :string)
-           ("x" "�" :string)
-           ("D" "�" :string)
+           ("b" "�" :string)
            ("u" "�" :string)
+           ("o" "�" :string)
+           ("H" "�" :string)
+           ("E" "�" :string)
            ("v" "�" :string)
-           ("s" "�" :string)
-           ("I" "�" :string)
-           ("C" "�" :string)
+           ("K" "�" :string)
+           ("d" "�" :string)
            ("q" "�" :string)
+           ("i" "�" :string)
+           ("n" "�" :string)
+           ("O" "�" :string)
+           ("S" "�" :string)
            ("p" "�" :string)
-           ("o" "�" :string)
+           ("C" "�" :string)
+           ("z" "�" :string)
+           ("X" "�" :string)
+           ("k" "�" :string)
+           ("w" "�" :string)
+           ("I" "�" :string)
+           ("g" "�" :string)
            ("T" "�" :string)
-           ("Z" "�" :string)
+           ("t" "�" :string)
+           ("r" "�" :string)
+           ("x" "�" :string)
            ("a" "�" :string)
+           ("V" "�" :string)
+           ("N" "�" :string)
+           ("D" "�" :string)
+           ("m" "�" :string)
+           ("Z" "�" :string)
            ("F" "�" :string)
-           ("j" "�" :string)
            ("B" "�" :string)
-           ("K" "�" :string)
-           ("l" "�" :string)
-           ("V" "�" :string)
-           ("d" "�" :string)
-           ("z" "�" :string)
+           ("G" "�" :string)
+           ("c" "�" :string)
            ("P" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("s" "�" :string)
+           ("f" "�" :string)
+           ("U" "�" :string)
+           ("Y" "�" :string)
+           ("M" "�" :string)
+           ("R" "�" :string)
+           ("l" "�" :string)
+           ("Q" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :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 "pt-resolve-case"
 
-  :rules  (("�" "8" :string)
-           ("�" "8" :string)
-           ("H" "8" :string)
-           ("Q" "8" :string)
+  :rules  (("H" "8" :string)
+           ("K" "8" :string)
+           ("E" "8" :string)
+           ("�" "8" :string)
            ("W" "8" :string)
+           ("�" "8" :string)
+           ("L" "8" :string)
+           ("A" "8" :string)
            ("�" "8" :string)
-           ("G" "8" :string)
            ("J" "8" :string)
-           ("L" "8" :string)
-           ("U" "8" :string)
-           ("O" "8" :string)
-           ("�" "8" :string)
+           ("�" "8" :string)
+           ("I" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
            ("X" "8" :string)
+           ("�" "8" :string)
+           ("C" "8" :string)
            ("�" "8" :string)
-           ("A" "8" :string)
-           ("N" "8" :string)
+           ("O" "8" :string)
+           ("S" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("Y" "8" :string)
-           ("�" "8" :string)
-           ("Z" "8" :string)
-           ("T" "8" :string)
-           ("C" "8" :string)
-           ("I" "8" :string)
-           ("�" "8" :string)
-           ("P" "8" :string)
-           ("V" "8" :string)
-           ("K" "8" :string)
+           ("�" "8" :string)
+           ("G" "8" :string)
            ("B" "8" :string)
-           ("�" "8" :string)
+           ("�" "8" :string)
            ("F" "8" :string)
-           ("M" "8" :string)
+           ("Z" "8" :string)
+           ("�" "8" :string)
            ("D" "8" :string)
-           ("�" "8" :string)
-           ("S" "8" :string)
-           ("�" "8" :string)
-           ("E" "8" :string)
+           ("N" "8" :string)
+           ("V" "8" :string)
+           ("T" "8" :string)
+           ("Q" "8" :string)
+           ("�" "8" :string)
            ("R" "8" :string)
+           ("M" "8" :string)
+           ("�" "8" :string)
+           ("Y" "8" :string)
+           ("U" "8" :string)
+           ("�" "8" :string)
+           ("P" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
            ("�" "89" :string)
+           ("v" "9" :string)
+           ("o" "9" :string)
+           ("�" "9" :string)
            ("y" "9" :string)
-           ("t" "9" :string)
-           ("e" "9" :string)
-           ("�" "9" :string)
-           ("i" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("c" "9" :string)
-           ("g" "9" :string)
-           ("h" "9" :string)
-           ("�" "9" :string)
-           ("f" "9" :string)
-           ("r" "9" :string)
            ("b" "9" :string)
-           ("w" "9" :string)
-           ("�" "9" :string)
+           ("u" "9" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
-           ("o" "9" :string)
-           ("p" "9" :string)
-           ("q" "9" :string)
-           ("s" "9" :string)
-           ("�" "9" :string)
-           ("v" "9" :string)
            ("�" "9" :string)
+           ("j" "9" :string)
+           ("h" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("e" "9" :string)
+           ("w" "9" :string)
+           ("k" "9" :string)
            ("z" "9" :string)
-           ("d" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
+           ("p" "9" :string)
            ("�" "9" :string)
+           ("n" "9" :string)
+           ("�" "9" :string)
+           ("i" "9" :string)
+           ("q" "9" :string)
+           ("�" "9" :string)
+           ("d" "9" :string)
            ("�" "9" :string)
-           ("l" "9" :string)
-           ("�" "9" :string)
-           ("j" "9" :string)
+           ("c" "9" :string)
+           ("�" "9" :string)
+           ("m" "9" :string)
+           ("�" "9" :string)
            ("a" "9" :string)
-           ("n" "9" :string)
-           ("�" "9" :string)
-           ("u" "9" :string)
-           ("�" "9" :string)
+           ("r" "9" :string)
            ("x" "9" :string)
-           ("m" "9" :string)
-           ("k" "9" :string)
+           ("�" "9" :string)
+           ("g" "9" :string)
+           ("t" "9" :string)
+           ("�" "9" :string)
+           ("l" "9" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
+           ("f" "9" :string)
+           ("s" "9" :string)
+           ("�" "9" :string)
            ("�" "99" :string)
            ("�" "99" :string)
            ))
 
 (define-rule-set "pt-ignore-special"
 
-  :rules  (("'" "" :string)
-           ("." "" :string)
+  :rules  (("." "" :string)
            ("!" "" :string)
            ("-" "" :string)
            ("?" "" :string)
+           ("'" "" :string)
            ))
 
 (define-rule-set "pt-resolve-special"
@@ -321,95 +321,95 @@
   :rules  (("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("m" "�" :string)
-           ("�" "�" :string)
-           ("D" "�" :string)
-           ("�" "�" :string)
-           ("x" "�" :string)
-           ("u" "�" :string)
+           ("Q" "�" :string)
+           ("�" "�" :string)
            ("R" "�" :string)
-           ("k" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("E" "�" :string)
-           ("S" "�" :string)
-           ("M" "�" :string)
-           ("�" "�" :string)
-           ("n" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("l" "�" :string)
-           ("V" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("d" "�" :string)
-           ("P" "�" :string)
-           ("z" "�" :string)
-           ("F" "�" :string)
-           ("a" "�" :string)
-           ("B" "�" :string)
-           ("�" "�" :string)
-           ("j" "�" :string)
-           ("�" "�" :string)
-           ("K" "�" :string)
-           ("p" "�" :string)
-           ("o" "�" :string)
-           ("�" "�" :string)
-           ("T" "�" :string)
-           ("Z" "�" :string)
-           ("�" "�" :string)
-           ("v" "�" :string)
-           ("I" "�" :string)
-           ("C" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("s" "�" :string)
-           ("q" "�" :string)
-           ("r" "�" :string)
-           ("�" "�" :string)
+           ("M" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("P" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("N" "�" :string)
-           ("f" "�" :string)
-           ("A" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("U" "�" :string)
            ("Y" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("w" "�" :string)
+           ("f" "�" :string)
+           ("s" "�" :string)
            ("�" "�" :string)
-           ("b" "�" :string)
-           ("�" "�" :string)
+           ("Z" "�" :string)
+           ("F" "�" :string)
+           ("m" "�" :string)
            ("�" "�" :string)
-           ("g" "�" :string)
+           ("D" "�" :string)
+           ("�" "�" :string)
+           ("G" "�" :string)
+           ("�" "�" :string)
            ("c" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("h" "�" :string)
+           ("�" "�" :string)
+           ("B" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("T" "�" :string)
+           ("g" "�" :string)
+           ("t" "�" :string)
+           ("a" "�" :string)
+           ("N" "�" :string)
+           ("V" "�" :string)
+           ("r" "�" :string)
+           ("x" "�" :string)
+           ("C" "�" :string)
+           ("p" "�" :string)
            ("�" "�" :string)
+           ("O" "�" :string)
+           ("�" "�" :string)
+           ("S" "�" :string)
+           ("�" "�" :string)
+           ("w" "�" :string)
+           ("I" "�" :string)
+           ("�" "�" :string)
+           ("z" "�" :string)
+           ("�" "�" :string)
            ("X" "�" :string)
-           ("i" "�" :string)
+           ("k" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("O" "�" :string)
-           ("L" "�" :string)
-           ("U" "�" :string)
-           ("J" "�" :string)
-           ("G" "�" :string)
+           ("d" "�" :string)
+           ("n" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("t" "�" :string)
-           ("�" "�" :string)
-           ("e" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("q" "�" :string)
+           ("i" "�" :string)
+           ("�" "�" :string)
+           ("b" "�" :string)
            ("y" "�" :string)
+           ("�" "�" :string)
            ("W" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("Q" "�" :string)
+           ("u" "�" :string)
            ("H" "�" :string)
-           ("�" "��" :string)
+           ("K" "�" :string)
+           ("E" "�" :string)
+           ("v" "�" :string)
+           ("o" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("e" "�" :string)
+           ("L" "�" :string)
+           ("�" "�" :string)
+           ("A" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("j" "�" :string)
+           ("J" "�" :string)
+           ("�" "�" :string)
+           ("h" "�" :string)
            ("�" "��" :string)
            ("�" "��" :string)
+           ("�" "��" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/portuguese/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/portuguese/utf8.xdy
index 68ad427729e..d5accf6e0df 100644
--- a/Master/texmf-dist/xindy/modules/lang/portuguese/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/portuguese/utf8.xdy
@@ -30,386 +30,386 @@
 
 (define-rule-set "pt-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)
+           ("Ü" "�" :string)
            ("ü" "�" :string)
-           ("Ù" "�" :string)
-           ("Ú" "�" :string)
-           ("A" "�" :string)
            ("a" "�" :string)
-           ("B" "�" :string)
+           ("A" "�" :string)
            ("b" "�" :string)
-           ("c" "�" :string)
+           ("B" "�" :string)
            ("C" "�" :string)
-           ("d" "�" :string)
+           ("c" "�" :string)
            ("D" "�" :string)
+           ("d" "�" :string)
            ("E" "�" :string)
            ("e" "�" :string)
-           ("f" "�" :string)
            ("F" "�" :string)
+           ("f" "�" :string)
            ("G" "�" :string)
            ("g" "�" :string)
            ("H" "�" :string)
            ("h" "�" :string)
-           ("I" "�" :string)
            ("i" "�" :string)
-           ("J" "�" :string)
+           ("I" "�" :string)
            ("j" "�" :string)
+           ("J" "�" :string)
            ("K" "�" :string)
            ("k" "�" :string)
            ("L" "�" :string)
            ("l" "�" :string)
-           ("M" "�" :string)
            ("m" "�" :string)
-           ("n" "�" :string)
+           ("M" "�" :string)
            ("N" "�" :string)
-           ("o" "�" :string)
+           ("n" "�" :string)
            ("O" "�" :string)
+           ("o" "�" :string)
            ("P" "�" :string)
            ("p" "�" :string)
            ("q" "�" :string)
            ("Q" "�" :string)
            ("r" "�" :string)
            ("R" "�" :string)
-           ("S" "�" :string)
            ("s" "�" :string)
-           ("T" "�" :string)
+           ("S" "�" :string)
            ("t" "�" :string)
-           ("u" "�" :string)
+           ("T" "�" :string)
            ("U" "�" :string)
+           ("u" "�" :string)
            ("V" "�" :string)
            ("v" "�" :string)
-           ("W" "�" :string)
            ("w" "�" :string)
-           ("x" "�" :string)
+           ("W" "�" :string)
            ("X" "�" :string)
-           ("y" "�" :string)
+           ("x" "�" :string)
            ("Y" "�" :string)
-           ("z" "�" :string)
+           ("y" "�" :string)
            ("Z" "�" :string)
+           ("z" "�" :string)
            ))
 
 (define-rule-set "pt-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)
-           ("x" "�" :string)
+           ("b" "�" :string)
+           ("D" "�" :string)
+           ("X" "�" :string)
            ("H" "�" :string)
-           ("G" "�" :string)
-           ("A" "�" :string)
-           ("E" "�" :string)
-           ("z" "�" :string)
-           ("a" "�" :string)
+           ("F" "�" :string)
+           ("j" "�" :string)
+           ("n" "�" :string)
+           ("h" "�" :string)
+           ("M" "�" :string)
+           ("N" "�" :string)
+           ("L" "�" :string)
+           ("m" "�" :string)
+           ("y" "�" :string)
+           ("t" "�" :string)
+           ("Y" "�" :string)
+           ("w" "�" :string)
+           ("P" "�" :string)
            ("T" "�" :string)
-           ("V" "�" :string)
-           ("X" "�" :string)
-           ("u" "�" :string)
+           ("i" "�" :string)
            ("f" "�" :string)
            ("q" "�" :string)
-           ("K" "�" :string)
-           ("y" "�" :string)
-           ("h" "�" :string)
-           ("I" "�" :string)
-           ("P" "�" :string)
-           ("n" "�" :string)
+           ("d" "�" :string)
+           ("G" "�" :string)
+           ("C" "�" :string)
+           ("s" "�" :string)
+           ("r" "�" :string)
+           ("g" "�" :string)
            ("U" "�" :string)
-           ("B" "�" :string)
+           ("p" "�" :string)
+           ("x" "�" :string)
+           ("V" "�" :string)
            ("Z" "�" :string)
-           ("W" "�" :string)
-           ("Q" "�" :string)
            ("c" "�" :string)
-           ("N" "�" :string)
-           ("r" "�" :string)
-           ("Y" "�" :string)
-           ("k" "�" :string)
-           ("b" "�" :string)
+           ("e" "�" :string)
+           ("K" "�" :string)
+           ("E" "�" :string)
+           ("a" "�" :string)
+           ("u" "�" :string)
            ("S" "�" :string)
-           ("i" "�" :string)
-           ("t" "�" :string)
-           ("L" "�" :string)
-           ("v" "�" :string)
-           ("M" "�" :string)
-           ("d" "�" :string)
            ("R" "�" :string)
-           ("o" "�" :string)
-           ("J" "�" :string)
-           ("p" "�" :string)
-           ("s" "�" :string)
-           ("w" "�" :string)
-           ("m" "�" :string)
-           ("F" "�" :string)
-           ("O" "�" :string)
-           ("D" "�" :string)
-           ("e" "�" :string)
-           ("g" "�" :string)
-           ("C" "�" :string)
            ("l" "�" :string)
-           ("j" "�" :string)
+           ("Q" "�" :string)
+           ("v" "�" :string)
+           ("k" "�" :string)
+           ("W" "�" :string)
+           ("I" "�" :string)
+           ("O" "�" :string)
+           ("A" "�" :string)
+           ("z" "�" :string)
+           ("B" "�" :string)
+           ("J" "�" :string)
+           ("o" "�" :string)
            ))
 
 (define-rule-set "pt-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)
+           ("Õ" "8" :string)
+           ("Ã" "8" :string)
+           ("Ì" "8" :string)
            ("Ú" "8" :string)
+           ("Í" "8" :string)
+           ("Ù" "8" :string)
            ("Ç" "8" :string)
-           ("Ó" "8" :string)
-           ("È" "8" :string)
-           ("Õ" "8" :string)
            ("Æ" "89" :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)
-           ("æ" "99" :string)
+           ("â" "9" :string)
+           ("é" "9" :string)
+           ("ó" "9" :string)
+           ("ù" "9" :string)
+           ("á" "9" :string)
+           ("ç" "9" :string)
+           ("à" "9" :string)
            ("ß" "99" :string)
-           ("B" "8" :string)
-           ("U" "8" :string)
-           ("Q" "8" :string)
-           ("W" "8" :string)
-           ("Z" "8" :string)
-           ("N" "8" :string)
+           ("æ" "99" :string)
            ("E" "8" :string)
-           ("A" "8" :string)
-           ("G" "8" :string)
-           ("H" "8" :string)
-           ("X" "8" :string)
-           ("V" "8" :string)
-           ("T" "8" :string)
            ("K" "8" :string)
-           ("P" "8" :string)
+           ("R" "8" :string)
+           ("S" "8" :string)
+           ("O" "8" :string)
            ("I" "8" :string)
+           ("W" "8" :string)
+           ("Q" "8" :string)
            ("J" "8" :string)
+           ("B" "8" :string)
+           ("A" "8" :string)
            ("F" "8" :string)
+           ("H" "8" :string)
+           ("X" "8" :string)
            ("D" "8" :string)
-           ("O" "8" :string)
-           ("C" "8" :string)
            ("Y" "8" :string)
-           ("S" "8" :string)
            ("L" "8" :string)
-           ("R" "8" :string)
+           ("N" "8" :string)
            ("M" "8" :string)
-           ("n" "9" :string)
-           ("c" "9" :string)
-           ("z" "9" :string)
-           ("x" "9" :string)
+           ("C" "8" :string)
+           ("G" "8" :string)
+           ("T" "8" :string)
+           ("P" "8" :string)
+           ("Z" "8" :string)
+           ("V" "8" :string)
+           ("U" "8" :string)
            ("a" "9" :string)
-           ("f" "9" :string)
-           ("q" "9" :string)
+           ("e" "9" :string)
+           ("c" "9" :string)
+           ("l" "9" :string)
            ("u" "9" :string)
+           ("k" "9" :string)
+           ("v" "9" :string)
+           ("o" "9" :string)
+           ("z" "9" :string)
+           ("b" "9" :string)
+           ("w" "9" :string)
+           ("t" "9" :string)
            ("y" "9" :string)
-           ("h" "9" :string)
-           ("p" "9" :string)
            ("m" "9" :string)
-           ("s" "9" :string)
-           ("w" "9" :string)
-           ("g" "9" :string)
-           ("e" "9" :string)
+           ("n" "9" :string)
+           ("h" "9" :string)
            ("j" "9" :string)
-           ("l" "9" :string)
            ("r" "9" :string)
-           ("i" "9" :string)
-           ("b" "9" :string)
-           ("k" "9" :string)
-           ("t" "9" :string)
-           ("o" "9" :string)
+           ("s" "9" :string)
            ("d" "9" :string)
-           ("v" "9" :string)
+           ("q" "9" :string)
+           ("f" "9" :string)
+           ("i" "9" :string)
+           ("p" "9" :string)
+           ("x" "9" :string)
+           ("g" "9" :string)
            ))
 
 (define-rule-set "pt-ignore-special"
 
-  :rules  (("-" "" :string)
-           ("!" "" :string)
+  :rules  (("." "" :string)
            ("?" "" :string)
            ("'" "" :string)
-           ("." "" :string)
+           ("-" "" :string)
+           ("!" "" :string)
            ))
 
 (define-rule-set "pt-resolve-special"
 
-  :rules  (("ü" "�" :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)
-           ("o" "�" :string)
-           ("M" "�" :string)
-           ("v" "�" :string)
-           ("R" "�" :string)
+           ("V" "�" :string)
+           ("Z" "�" :string)
+           ("g" "�" :string)
+           ("U" "�" :string)
+           ("x" "�" :string)
+           ("p" "�" :string)
+           ("G" "�" :string)
+           ("C" "�" :string)
+           ("s" "�" :string)
+           ("r" "�" :string)
+           ("T" "�" :string)
+           ("P" "�" :string)
+           ("i" "�" :string)
+           ("f" "�" :string)
+           ("q" "�" :string)
            ("d" "�" :string)
+           ("N" "�" :string)
            ("L" "�" :string)
+           ("m" "�" :string)
+           ("y" "�" :string)
            ("t" "�" :string)
-           ("b" "�" :string)
-           ("i" "�" :string)
-           ("S" "�" :string)
-           ("k" "�" :string)
-           ("r" "�" :string)
            ("Y" "�" :string)
-           ("l" "�" :string)
-           ("j" "�" :string)
-           ("C" "�" :string)
-           ("g" "�" :string)
-           ("e" "�" :string)
-           ("O" "�" :string)
-           ("D" "�" :string)
-           ("m" "�" :string)
-           ("F" "�" :string)
            ("w" "�" :string)
-           ("s" "�" :string)
-           ("J" "�" :string)
-           ("p" "�" :string)
+           ("j" "�" :string)
+           ("n" "�" :string)
            ("h" "�" :string)
-           ("y" "�" :string)
-           ("P" "�" :string)
-           ("I" "�" :string)
-           ("f" "�" :string)
-           ("q" "�" :string)
-           ("K" "�" :string)
-           ("u" "�" :string)
+           ("M" "�" :string)
+           ("F" "�" :string)
+           ("b" "�" :string)
+           ("D" "�" :string)
            ("X" "�" :string)
-           ("a" "�" :string)
-           ("T" "�" :string)
-           ("V" "�" :string)
-           ("z" "�" :string)
-           ("E" "�" :string)
            ("H" "�" :string)
-           ("x" "�" :string)
+           ("J" "�" :string)
+           ("o" "�" :string)
            ("A" "�" :string)
-           ("G" "�" :string)
-           ("N" "�" :string)
+           ("z" "�" :string)
+           ("B" "�" :string)
+           ("I" "�" :string)
+           ("O" "�" :string)
            ("Q" "�" :string)
+           ("v" "�" :string)
+           ("k" "�" :string)
            ("W" "�" :string)
+           ("R" "�" :string)
+           ("l" "�" :string)
+           ("u" "�" :string)
+           ("S" "�" :string)
+           ("K" "�" :string)
+           ("E" "�" :string)
+           ("a" "�" :string)
+           ("e" "�" :string)
            ("c" "�" :string)
-           ("Z" "�" :string)
-           ("U" "�" :string)
-           ("B" "�" :string)
-           ("n" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/romanian/latin2.xdy b/Master/texmf-dist/xindy/modules/lang/romanian/latin2.xdy
index d0ca91699a4..86eb39ce3f1 100644
--- a/Master/texmf-dist/xindy/modules/lang/romanian/latin2.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/romanian/latin2.xdy
@@ -37,207 +37,207 @@
 
   :rules  (("a" "�" :string)
            ("A" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("b" "�" :string)
            ("B" "�" :string)
-           ("c" "�" :string)
            ("C" "�" :string)
-           ("D" "�" :string)
+           ("c" "�" :string)
            ("d" "�" :string)
-           ("E" "�" :string)
+           ("D" "�" :string)
            ("e" "�" :string)
+           ("E" "�" :string)
            ("F" "�" :string)
            ("f" "�" :string)
            ("g" "�" :string)
            ("G" "�" :string)
-           ("H" "�" :string)
            ("h" "�" :string)
-           ("i" "�" :string)
+           ("H" "�" :string)
            ("I" "�" :string)
+           ("i" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("J" "�" :string)
            ("j" "�" :string)
+           ("J" "�" :string)
            ("K" "�" :string)
            ("k" "�" :string)
-           ("l" "�" :string)
            ("L" "�" :string)
+           ("l" "�" :string)
            ("m" "�" :string)
            ("M" "�" :string)
-           ("N" "�" :string)
            ("n" "�" :string)
+           ("N" "�" :string)
            ("O" "�" :string)
            ("o" "�" :string)
-           ("P" "�" :string)
            ("p" "�" :string)
-           ("Q" "�" :string)
+           ("P" "�" :string)
            ("q" "�" :string)
+           ("Q" "�" :string)
            ("R" "�" :string)
            ("r" "�" :string)
-           ("s" "�" :string)
            ("S" "�" :string)
+           ("s" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("T" "�" :string)
            ("t" "�" :string)
-           ("�" "�" :string)
+           ("T" "�" :string)
            ("�" "�" :string)
-           ("u" "�" :string)
+           ("�" "�" :string)
            ("U" "�" :string)
+           ("u" "�" :string)
            ("v" "�" :string)
            ("V" "�" :string)
-           ("W" "�" :string)
            ("w" "�" :string)
+           ("W" "�" :string)
            ("x" "�" :string)
            ("X" "�" :string)
            ("Y" "�" :string)
            ("y" "�" :string)
-           ("Z" "�" :string)
            ("z" "�" :string)
+           ("Z" "�" :string)
            ))
 
 (define-rule-set "ro-resolve-diacritics"
 
-  :rules  (("c" "�" :string)
-           ("x" "�" :string)
-           ("D" "�" :string)
-           ("K" "�" :string)
-           ("L" "�" :string)
-           ("P" "�" :string)
-           ("m" "�" :string)
-           ("Z" "�" :string)
-           ("u" "�" :string)
-           ("s" "�" :string)
+  :rules  (("u" "�" :string)
            ("l" "�" :string)
-           ("g" "�" :string)
-           ("N" "�" :string)
-           ("W" "�" :string)
-           ("b" "�" :string)
+           ("�" "�" :string)
+           ("X" "�" :string)
+           ("C" "�" :string)
+           ("R" "�" :string)
+           ("S" "�" :string)
+           ("s" "�" :string)
            ("k" "�" :string)
-           ("�" "�" :string)
-           ("H" "�" :string)
-           ("�" "�" :string)
+           ("f" "�" :string)
+           ("q" "�" :string)
            ("E" "�" :string)
-           ("z" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("i" "�" :string)
-           ("F" "�" :string)
-           ("O" "�" :string)
-           ("�" "�" :string)
-           ("R" "�" :string)
+           ("K" "�" :string)
+           ("v" "�" :string)
            ("M" "�" :string)
-           ("a" "�" :string)
+           ("B" "�" :string)
+           ("�" "�" :string)
+           ("r" "�" :string)
+           ("d" "�" :string)
+           ("o" "�" :string)
+           ("�" "�" :string)
+           ("i" "�" :string)
+           ("g" "�" :string)
+           ("c" "�" :string)
+           ("�" "�" :string)
+           ("Q" "�" :string)
+           ("G" "�" :string)
+           ("V" "�" :string)
+           ("W" "�" :string)
            ("J" "�" :string)
-           ("A" "�" :string)
-           ("y" "�" :string)
-           ("q" "�" :string)
-           ("f" "�" :string)
+           ("P" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("D" "�" :string)
+           ("p" "�" :string)
+           ("b" "�" :string)
+           ("L" "�" :string)
+           ("I" "�" :string)
+           ("m" "�" :string)
            ("t" "�" :string)
-           ("C" "�" :string)
-           ("h" "�" :string)
            ("�" "�" :string)
-           ("p" "�" :string)
+           ("a" "�" :string)
+           ("�" "�" :string)
+           ("h" "�" :string)
+           ("n" "�" :string)
+           ("N" "�" :string)
+           ("F" "�" :string)
            ("Y" "�" :string)
-           ("X" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("H" "�" :string)
+           ("A" "�" :string)
+           ("Z" "�" :string)
            ("w" "�" :string)
-           ("Q" "�" :string)
-           ("T" "�" :string)
-           ("d" "�" :string)
-           ("o" "�" :string)
+           ("O" "�" :string)
+           ("x" "�" :string)
+           ("�" "�" :string)
            ("j" "�" :string)
-           ("�" "�" :string)
-           ("G" "�" :string)
            ("U" "�" :string)
-           ("I" "�" :string)
-           ("B" "�" :string)
-           ("S" "�" :string)
-           ("V" "�" :string)
-           ("r" "�" :string)
-           ("v" "�" :string)
            ("e" "�" :string)
-           ("�" "�" :string)
-           ("n" "�" :string)
+           ("z" "�" :string)
+           ("y" "�" :string)
+           ("T" "�" :string)
            ))
 
 (define-rule-set "ro-resolve-case"
 
-  :rules  (("�" "8" :string)
-           ("C" "8" :string)
-           ("A" "8" :string)
-           ("J" "8" :string)
+  :rules  (("E" "8" :string)
+           ("K" "8" :string)
+           ("B" "8" :string)
            ("M" "8" :string)
-           ("T" "8" :string)
-           ("Q" "8" :string)
-           ("�" "8" :string)
            ("X" "8" :string)
-           ("Y" "8" :string)
-           ("V" "8" :string)
-           ("B" "8" :string)
+           ("C" "8" :string)
            ("S" "8" :string)
-           ("I" "8" :string)
-           ("U" "8" :string)
+           ("R" "8" :string)
+           ("Q" "8" :string)
            ("G" "8" :string)
-           ("Z" "8" :string)
+           ("V" "8" :string)
+           ("J" "8" :string)
            ("P" "8" :string)
-           ("L" "8" :string)
-           ("K" "8" :string)
-           ("D" "8" :string)
            ("W" "8" :string)
-           ("N" "8" :string)
-           ("E" "8" :string)
+           ("D" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
-           ("H" "8" :string)
-           ("R" "8" :string)
-           ("O" "8" :string)
            ("�" "8" :string)
+           ("L" "8" :string)
+           ("I" "8" :string)
+           ("�" "8" :string)
+           ("Z" "8" :string)
+           ("O" "8" :string)
+           ("U" "8" :string)
+           ("T" "8" :string)
            ("F" "8" :string)
-           ("�" "8" :string)
-           ("h" "9" :string)
-           ("t" "9" :string)
-           ("y" "9" :string)
+           ("N" "8" :string)
+           ("Y" "8" :string)
+           ("H" "8" :string)
+           ("A" "8" :string)
            ("f" "9" :string)
+           ("k" "9" :string)
+           ("s" "9" :string)
            ("q" "9" :string)
-           ("a" "9" :string)
-           ("o" "9" :string)
-           ("d" "9" :string)
-           ("w" "9" :string)
+           ("v" "9" :string)
+           ("�" "9" :string)
+           ("l" "9" :string)
+           ("u" "9" :string)
            ("�" "9" :string)
-           ("p" "9" :string)
-           ("r" "9" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
-           ("j" "9" :string)
+           ("d" "9" :string)
+           ("r" "9" :string)
+           ("o" "9" :string)
+           ("g" "9" :string)
+           ("i" "9" :string)
+           ("c" "9" :string)
+           ("a" "9" :string)
+           ("h" "9" :string)
            ("n" "9" :string)
-           ("�" "9" :string)
-           ("e" "9" :string)
-           ("v" "9" :string)
-           ("u" "9" :string)
+           ("p" "9" :string)
+           ("b" "9" :string)
            ("m" "9" :string)
+           ("t" "9" :string)
+           ("w" "9" :string)
+           ("j" "9" :string)
+           ("�" "9" :string)
            ("x" "9" :string)
-           ("c" "9" :string)
-           ("b" "9" :string)
-           ("g" "9" :string)
-           ("l" "9" :string)
-           ("s" "9" :string)
+           ("y" "9" :string)
            ("z" "9" :string)
-           ("�" "9" :string)
-           ("k" "9" :string)
-           ("i" "9" :string)
-           ("�" "9" :string)
+           ("e" "9" :string)
            ))
 
 (define-rule-set "ro-ignore-special"
 
-  :rules  (("." "" :string)
-           ("-" "" :string)
+  :rules  (("-" "" :string)
            ("'" "" :string)
-           ("?" "" :string)
            ("!" "" :string)
+           ("?" "" :string)
+           ("." "" :string)
            ))
 
 (define-rule-set "ro-resolve-special"
@@ -245,68 +245,68 @@
   :rules  (("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
+           ("o" "�" :string)
+           ("�" "�" :string)
+           ("r" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("D" "�" :string)
+           ("J" "�" :string)
+           ("P" "�" :string)
+           ("V" "�" :string)
+           ("G" "�" :string)
            ("Q" "�" :string)
-           ("d" "�" :string)
-           ("p" "�" :string)
-           ("Y" "�" :string)
+           ("R" "�" :string)
+           ("S" "�" :string)
+           ("�" "�" :string)
            ("X" "�" :string)
-           ("J" "�" :string)
-           ("h" "�" :string)
-           ("�" "�" :string)
+           ("l" "�" :string)
+           ("B" "�" :string)
+           ("M" "�" :string)
            ("v" "�" :string)
+           ("K" "�" :string)
+           ("q" "�" :string)
+           ("f" "�" :string)
+           ("Y" "�" :string)
+           ("H" "�" :string)
+           ("A" "�" :string)
+           ("F" "�" :string)
+           ("N" "�" :string)
            ("U" "�" :string)
-           ("I" "�" :string)
-           ("W" "�" :string)
+           ("�" "�" :string)
+           ("x" "�" :string)
+           ("O" "�" :string)
+           ("Z" "�" :string)
+           ("t" "�" :string)
            ("b" "�" :string)
-           ("l" "�" :string)
+           ("p" "�" :string)
+           ("n" "�" :string)
+           ("h" "�" :string)
+           ("�" "�" :string)
+           ("c" "�" :string)
+           ("g" "�" :string)
+           ("i" "�" :string)
+           ("d" "�" :string)
+           ("�" "�" :string)
+           ("W" "�" :string)
+           ("�" "�" :string)
+           ("C" "�" :string)
            ("u" "�" :string)
-           ("K" "�" :string)
-           ("O" "�" :string)
-           ("R" "�" :string)
            ("�" "�" :string)
-           ("F" "�" :string)
            ("E" "�" :string)
+           ("s" "�" :string)
            ("k" "�" :string)
-           ("�" "�" :string)
-           ("H" "�" :string)
-           ("�" "�" :string)
-           ("w" "�" :string)
            ("T" "�" :string)
-           ("o" "�" :string)
-           ("�" "�" :string)
-           ("a" "�" :string)
+           ("z" "�" :string)
            ("y" "�" :string)
-           ("q" "�" :string)
-           ("A" "�" :string)
-           ("f" "�" :string)
-           ("C" "�" :string)
-           ("t" "�" :string)
-           ("�" "�" :string)
-           ("M" "�" :string)
            ("e" "�" :string)
-           ("n" "�" :string)
-           ("B" "�" :string)
-           ("S" "�" :string)
-           ("V" "�" :string)
-           ("r" "�" :string)
-           ("�" "�" :string)
            ("j" "�" :string)
-           ("G" "�" :string)
-           ("g" "�" :string)
-           ("N" "�" :string)
-           ("s" "�" :string)
-           ("P" "�" :string)
+           ("w" "�" :string)
+           ("�" "�" :string)
            ("m" "�" :string)
-           ("Z" "�" :string)
-           ("c" "�" :string)
-           ("x" "�" :string)
-           ("D" "�" :string)
+           ("I" "�" :string)
            ("L" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("i" "�" :string)
-           ("�" "�" :string)
-           ("z" "�" :string)
+           ("a" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/romanian/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/romanian/utf8.xdy
index 01d2769452d..ade4b2fa11d 100644
--- a/Master/texmf-dist/xindy/modules/lang/romanian/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/romanian/utf8.xdy
@@ -35,64 +35,64 @@
 
 (define-rule-set "ro-alphabetize"
 
-  :rules  (("Ă" "�" :string)
-           ("ă" "�" :string)
+  :rules  (("ă" "�" :string)
+           ("Ă" "�" :string)
            ("Â" "�" :string)
            ("â" "�" :string)
            ("Î" "�" :string)
            ("î" "�" :string)
            ("ș" "�" :string)
            ("Ș" "�" :string)
-           ("ț" "�" :string)
            ("Ț" "�" :string)
-           ("a" "�" :string)
+           ("ț" "�" :string)
            ("A" "�" :string)
+           ("a" "�" :string)
            ("B" "�" :string)
            ("b" "�" :string)
            ("c" "�" :string)
            ("C" "�" :string)
            ("D" "�" :string)
            ("d" "�" :string)
-           ("E" "�" :string)
            ("e" "�" :string)
-           ("f" "�" :string)
+           ("E" "�" :string)
            ("F" "�" :string)
-           ("g" "�" :string)
+           ("f" "�" :string)
            ("G" "�" :string)
-           ("H" "�" :string)
+           ("g" "�" :string)
            ("h" "�" :string)
-           ("i" "�" :string)
+           ("H" "�" :string)
            ("I" "�" :string)
+           ("i" "�" :string)
            ("J" "�" :string)
            ("j" "�" :string)
-           ("k" "�" :string)
            ("K" "�" :string)
-           ("L" "�" :string)
+           ("k" "�" :string)
            ("l" "�" :string)
+           ("L" "�" :string)
            ("m" "�" :string)
            ("M" "�" :string)
            ("n" "�" :string)
            ("N" "�" :string)
-           ("o" "�" :string)
            ("O" "�" :string)
-           ("p" "�" :string)
+           ("o" "�" :string)
            ("P" "�" :string)
-           ("Q" "�" :string)
+           ("p" "�" :string)
            ("q" "�" :string)
+           ("Q" "�" :string)
            ("R" "�" :string)
            ("r" "�" :string)
            ("s" "�" :string)
            ("S" "�" :string)
            ("T" "�" :string)
            ("t" "�" :string)
-           ("u" "�" :string)
            ("U" "�" :string)
-           ("v" "�" :string)
+           ("u" "�" :string)
            ("V" "�" :string)
-           ("W" "�" :string)
+           ("v" "�" :string)
            ("w" "�" :string)
-           ("x" "�" :string)
+           ("W" "�" :string)
            ("X" "�" :string)
+           ("x" "�" :string)
            ("Y" "�" :string)
            ("y" "�" :string)
            ("Z" "�" :string)
@@ -101,212 +101,212 @@
 
 (define-rule-set "ro-resolve-diacritics"
 
-  :rules  (("Î" "�" :string)
-           ("Ă" "�" :string)
+  :rules  (("Ă" "�" :string)
+           ("â" "�" :string)
+           ("Ț" "�" :string)
            ("Â" "�" :string)
+           ("ă" "�" :string)
            ("Ș" "�" :string)
            ("ț" "�" :string)
-           ("ș" "�" :string)
-           ("â" "�" :string)
-           ("Ț" "�" :string)
            ("î" "�" :string)
-           ("ă" "�" :string)
-           ("R" "�" :string)
-           ("T" "�" :string)
-           ("u" "�" :string)
-           ("g" "�" :string)
-           ("Z" "�" :string)
+           ("Î" "�" :string)
+           ("ș" "�" :string)
+           ("v" "�" :string)
+           ("I" "�" :string)
+           ("N" "�" :string)
            ("Y" "�" :string)
            ("a" "�" :string)
-           ("p" "�" :string)
-           ("N" "�" :string)
-           ("x" "�" :string)
-           ("m" "�" :string)
-           ("c" "�" :string)
-           ("f" "�" :string)
-           ("L" "�" :string)
-           ("n" "�" :string)
-           ("o" "�" :string)
            ("J" "�" :string)
-           ("B" "�" :string)
-           ("l" "�" :string)
-           ("E" "�" :string)
            ("K" "�" :string)
-           ("k" "�" :string)
-           ("i" "�" :string)
-           ("y" "�" :string)
-           ("A" "�" :string)
-           ("F" "�" :string)
-           ("O" "�" :string)
-           ("S" "�" :string)
-           ("b" "�" :string)
-           ("s" "�" :string)
-           ("j" "�" :string)
-           ("h" "�" :string)
-           ("C" "�" :string)
-           ("H" "�" :string)
+           ("e" "�" :string)
+           ("n" "�" :string)
            ("P" "�" :string)
-           ("q" "�" :string)
-           ("v" "�" :string)
+           ("R" "�" :string)
+           ("m" "�" :string)
+           ("L" "�" :string)
            ("Q" "�" :string)
            ("G" "�" :string)
            ("z" "�" :string)
-           ("e" "�" :string)
-           ("I" "�" :string)
-           ("U" "�" :string)
-           ("t" "�" :string)
-           ("w" "�" :string)
-           ("r" "�" :string)
-           ("W" "�" :string)
-           ("M" "�" :string)
            ("X" "�" :string)
+           ("T" "�" :string)
+           ("A" "�" :string)
+           ("s" "�" :string)
            ("V" "�" :string)
+           ("q" "�" :string)
+           ("l" "�" :string)
+           ("w" "�" :string)
+           ("Z" "�" :string)
+           ("h" "�" :string)
+           ("u" "�" :string)
            ("d" "�" :string)
+           ("H" "�" :string)
+           ("W" "�" :string)
+           ("M" "�" :string)
+           ("E" "�" :string)
+           ("g" "�" :string)
+           ("j" "�" :string)
            ("D" "�" :string)
+           ("C" "�" :string)
+           ("f" "�" :string)
+           ("c" "�" :string)
+           ("O" "�" :string)
+           ("b" "�" :string)
+           ("p" "�" :string)
+           ("i" "�" :string)
+           ("y" "�" :string)
+           ("o" "�" :string)
+           ("t" "�" :string)
+           ("k" "�" :string)
+           ("F" "�" :string)
+           ("S" "�" :string)
+           ("r" "�" :string)
+           ("U" "�" :string)
+           ("B" "�" :string)
+           ("x" "�" :string)
            ))
 
 (define-rule-set "ro-resolve-case"
 
-  :rules  (("Î" "8" :string)
+  :rules  (("Ș" "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)
+           ("W" "8" :string)
+           ("M" "8" :string)
+           ("H" "8" :string)
+           ("C" "8" :string)
+           ("D" "8" :string)
            ("E" "8" :string)
-           ("K" "8" :string)
-           ("T" "8" :string)
-           ("R" "8" :string)
+           ("O" "8" :string)
+           ("U" "8" :string)
+           ("B" "8" :string)
+           ("S" "8" :string)
+           ("F" "8" :string)
+           ("I" "8" :string)
            ("Y" "8" :string)
-           ("Z" "8" :string)
            ("N" "8" :string)
-           ("B" "8" :string)
-           ("J" "8" :string)
            ("L" "8" :string)
+           ("R" "8" :string)
            ("Q" "8" :string)
-           ("G" "8" :string)
-           ("I" "8" :string)
-           ("U" "8" :string)
-           ("M" "8" :string)
-           ("W" "8" :string)
-           ("D" "8" :string)
+           ("P" "8" :string)
+           ("K" "8" :string)
+           ("J" "8" :string)
+           ("A" "8" :string)
            ("X" "8" :string)
+           ("T" "8" :string)
+           ("G" "8" :string)
+           ("Z" "8" :string)
            ("V" "8" :string)
-           ("F" "8" :string)
-           ("A" "8" :string)
-           ("S" "8" :string)
-           ("O" "8" :string)
-           ("C" "8" :string)
-           ("P" "8" :string)
-           ("H" "8" :string)
-           ("l" "9" :string)
-           ("k" "9" :string)
-           ("i" "9" :string)
+           ("d" "9" :string)
            ("u" "9" :string)
+           ("j" "9" :string)
            ("g" "9" :string)
-           ("a" "9" :string)
-           ("x" "9" :string)
+           ("t" "9" :string)
+           ("k" "9" :string)
            ("p" "9" :string)
-           ("m" "9" :string)
-           ("c" "9" :string)
+           ("y" "9" :string)
+           ("i" "9" :string)
            ("o" "9" :string)
-           ("n" "9" :string)
+           ("c" "9" :string)
+           ("b" "9" :string)
            ("f" "9" :string)
+           ("x" "9" :string)
+           ("r" "9" :string)
+           ("a" "9" :string)
            ("v" "9" :string)
-           ("q" "9" :string)
-           ("z" "9" :string)
+           ("m" "9" :string)
+           ("n" "9" :string)
            ("e" "9" :string)
-           ("t" "9" :string)
-           ("r" "9" :string)
-           ("w" "9" :string)
-           ("d" "9" :string)
-           ("y" "9" :string)
-           ("b" "9" :string)
            ("s" "9" :string)
-           ("j" "9" :string)
+           ("z" "9" :string)
            ("h" "9" :string)
+           ("q" "9" :string)
+           ("w" "9" :string)
+           ("l" "9" :string)
            ))
 
 (define-rule-set "ro-ignore-special"
 
-  :rules  (("!" "" :string)
-           ("-" "" :string)
-           ("'" "" :string)
-           ("?" "" :string)
+  :rules  (("'" "" :string)
            ("." "" :string)
+           ("?" "" :string)
+           ("-" "" :string)
+           ("!" "" :string)
            ))
 
 (define-rule-set "ro-resolve-special"
 
-  :rules  (("Ă" "�" :string)
+  :rules  (("ș" "�" :string)
            ("î" "�" :string)
+           ("ă" "�" :string)
            ("Â" "�" :string)
-           ("ț" "�" :string)
            ("Ț" "�" :string)
            ("â" "�" :string)
            ("Î" "�" :string)
-           ("ă" "�" :string)
+           ("ț" "�" :string)
            ("Ș" "�" :string)
-           ("ș" "�" :string)
+           ("Ă" "�" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
+           ("U" "�" :string)
+           ("S" "�" :string)
+           ("r" "�" :string)
+           ("F" "�" :string)
            ("k" "�" :string)
-           ("l" "�" :string)
+           ("y" "�" :string)
+           ("b" "�" :string)
+           ("C" "�" :string)
+           ("D" "�" :string)
            ("g" "�" :string)
+           ("W" "�" :string)
+           ("M" "�" :string)
+           ("d" "�" :string)
            ("u" "�" :string)
-           ("a" "�" :string)
-           ("Y" "�" :string)
+           ("h" "�" :string)
            ("Z" "�" :string)
-           ("o" "�" :string)
-           ("n" "�" :string)
-           ("J" "�" :string)
-           ("f" "�" :string)
-           ("c" "�" :string)
-           ("z" "�" :string)
-           ("G" "�" :string)
-           ("t" "�" :string)
-           ("D" "�" :string)
-           ("d" "�" :string)
-           ("F" "�" :string)
-           ("b" "�" :string)
+           ("q" "�" :string)
+           ("l" "�" :string)
            ("s" "�" :string)
-           ("S" "�" :string)
-           ("H" "�" :string)
-           ("h" "�" :string)
-           ("E" "�" :string)
-           ("K" "�" :string)
-           ("i" "�" :string)
            ("T" "�" :string)
-           ("R" "�" :string)
-           ("x" "�" :string)
-           ("N" "�" :string)
-           ("p" "�" :string)
-           ("B" "�" :string)
            ("L" "�" :string)
            ("m" "�" :string)
-           ("v" "�" :string)
-           ("q" "�" :string)
-           ("Q" "�" :string)
-           ("I" "�" :string)
-           ("U" "�" :string)
            ("e" "�" :string)
+           ("a" "�" :string)
+           ("N" "�" :string)
+           ("v" "�" :string)
+           ("x" "�" :string)
+           ("B" "�" :string)
+           ("t" "�" :string)
+           ("p" "�" :string)
+           ("i" "�" :string)
+           ("o" "�" :string)
+           ("c" "�" :string)
+           ("O" "�" :string)
+           ("f" "�" :string)
+           ("j" "�" :string)
+           ("E" "�" :string)
+           ("H" "�" :string)
            ("V" "�" :string)
-           ("X" "�" :string)
-           ("M" "�" :string)
-           ("r" "�" :string)
-           ("W" "�" :string)
            ("w" "�" :string)
-           ("y" "�" :string)
+           ("X" "�" :string)
            ("A" "�" :string)
-           ("j" "�" :string)
-           ("O" "�" :string)
+           ("G" "�" :string)
+           ("z" "�" :string)
+           ("R" "�" :string)
+           ("Q" "�" :string)
            ("P" "�" :string)
-           ("C" "�" :string)
+           ("n" "�" :string)
+           ("K" "�" :string)
+           ("J" "�" :string)
+           ("I" "�" :string)
+           ("Y" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/russian/cp1251.xdy b/Master/texmf-dist/xindy/modules/lang/russian/cp1251.xdy
index e9302639d9d..8be037c2492 100644
--- a/Master/texmf-dist/xindy/modules/lang/russian/cp1251.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/russian/cp1251.xdy
@@ -36,38 +36,38 @@
 
 (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)
@@ -76,20 +76,20 @@
            ("�" "�" :string)
            ("�" "�" :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,150 +106,150 @@
 
 (define-rule-set "ru-resolve-diacritics"
 
-  :rules  (("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :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)
            ))
 
 (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)
-           ("�" "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)
+           ("�" "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)
-           ("�" "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)
+  :rules  (("." "" :string)
            ("?" "" :string)
+           ("'" "" :string)
+           ("!" "" :string)
            ("-" "" :string)
            ))
 
@@ -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 86d93e19f0b..46d00ffa74a 100644
--- a/Master/texmf-dist/xindy/modules/lang/russian/iso88595.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/russian/iso88595.xdy
@@ -40,15 +40,15 @@
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
@@ -58,199 +58,199 @@
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :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)
-           ("�" "�" :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)
-           ("�" "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)
+           ("�" "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)
+  :rules  (("-" "" :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)
            ))
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 41563be3ed6..1fe88d5b5d5 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)
            ("�" "�" :string)
+           ("�" "�" :string)
            ))
 
 (define-rule-set "ru-resolve-diacritics"
 
-  :rules  (("�" "�" :string)
-           ("�" "�" :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)
-           ("�" "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)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :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)
-           ("�" "9" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
            ))
 
 (define-rule-set "ru-ignore-special"
 
-  :rules  (("." "" :string)
-           ("?" "" :string)
-           ("-" "" :string)
-           ("!" "" :string)
+  :rules  (("-" "" :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)
            ))
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 4ced1b99a36..3def9f4af62 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
@@ -27,62 +27,62 @@
 
 (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)
-           ("a" "�" :string)
            ("A" "�" :string)
+           ("a" "�" :string)
            ("B" "�" :string)
            ("b" "�" :string)
-           ("c" "�" :string)
            ("C" "�" :string)
-           ("d" "�" :string)
+           ("c" "�" :string)
            ("D" "�" :string)
+           ("d" "�" :string)
            ("E" "�" :string)
            ("e" "�" :string)
            ("f" "�" :string)
            ("F" "�" :string)
            ("G" "�" :string)
            ("g" "�" :string)
-           ("h" "�" :string)
            ("H" "�" :string)
+           ("h" "�" :string)
            ("I" "�" :string)
            ("i" "�" :string)
            ("J" "�" :string)
            ("j" "�" :string)
-           ("K" "�" :string)
            ("k" "�" :string)
+           ("K" "�" :string)
            ("L" "�" :string)
            ("l" "�" :string)
            ("m" "�" :string)
            ("M" "�" :string)
-           ("N" "�" :string)
            ("n" "�" :string)
+           ("N" "�" :string)
            ("O" "�" :string)
            ("o" "�" :string)
            ("P" "�" :string)
            ("p" "�" :string)
-           ("r" "�" :string)
            ("R" "�" :string)
+           ("r" "�" :string)
            ("s" "�" :string)
            ("S" "�" :string)
-           ("T" "�" :string)
            ("t" "�" :string)
-           ("U" "�" :string)
+           ("T" "�" :string)
            ("u" "�" :string)
+           ("U" "�" :string)
            ("V" "�" :string)
            ("v" "�" :string)
            ("Y" "�" :string)
@@ -93,214 +93,214 @@
 
 (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)
-           ("c" "�" :string)
-           ("u" "�" :string)
-           ("L" "�" :string)
-           ("G" "�" :string)
-           ("p" "�" :string)
-           ("m" "�" :string)
-           ("s" "�" :string)
-           ("T" "�" :string)
-           ("J" "�" :string)
-           ("o" "�" :string)
-           ("h" "�" :string)
+           ("ë" "�" :string)
+           ("V" "�" :string)
            ("I" "�" :string)
-           ("B" "�" :string)
-           ("Y" "�" :string)
+           ("l" "�" :string)
+           ("T" "�" :string)
+           ("b" "�" :string)
+           ("P" "�" :string)
+           ("H" "�" :string)
+           ("v" "�" :string)
+           ("p" "�" :string)
            ("U" "�" :string)
-           ("N" "�" :string)
-           ("K" "�" :string)
-           ("E" "�" :string)
-           ("a" "�" :string)
            ("O" "�" :string)
-           ("P" "�" :string)
-           ("d" "�" :string)
-           ("j" "�" :string)
-           ("b" "�" :string)
-           ("k" "�" :string)
-           ("R" "�" :string)
            ("i" "�" :string)
-           ("e" "�" :string)
-           ("C" "�" :string)
-           ("H" "�" :string)
+           ("d" "�" :string)
+           ("g" "�" :string)
+           ("m" "�" :string)
+           ("c" "�" :string)
+           ("o" "�" :string)
+           ("K" "�" :string)
            ("F" "�" :string)
-           ("S" "�" :string)
            ("M" "�" :string)
+           ("r" "�" :string)
+           ("h" "�" :string)
            ("Z" "�" :string)
-           ("V" "�" :string)
            ("z" "�" :string)
-           ("r" "�" :string)
+           ("E" "�" :string)
+           ("G" "�" :string)
+           ("C" "�" :string)
+           ("u" "�" :string)
+           ("J" "�" :string)
+           ("A" "�" :string)
+           ("B" "�" :string)
+           ("R" "�" :string)
+           ("L" "�" :string)
+           ("Y" "�" :string)
+           ("n" "�" :string)
+           ("N" "�" :string)
+           ("t" "�" :string)
            ("y" "�" :string)
-           ("g" "�" :string)
+           ("a" "�" :string)
+           ("k" "�" :string)
            ("D" "�" :string)
-           ("l" "�" :string)
-           ("v" "�" :string)
+           ("s" "�" :string)
            ("f" "�" :string)
-           ("A" "�" :string)
-           ("t" "�" :string)
-           ("n" "�" :string)
+           ("j" "�" :string)
+           ("e" "�" :string)
+           ("S" "�" :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)
-           ("û" "9" :string)
+           ("č" "9" :string)
            ("ë" "9" :string)
+           ("û" "9" :string)
+           ("â" "9" :string)
            ("ŝ" "9" :string)
-           ("č" "9" :string)
+           ("š" "9" :string)
            ("è" "9" :string)
            ("ž" "9" :string)
-           ("š" "9" :string)
-           ("â" "9" :string)
-           ("I" "8" :string)
            ("J" "8" :string)
-           ("T" "8" :string)
-           ("L" "8" :string)
            ("G" "8" :string)
-           ("P" "8" :string)
-           ("O" "8" :string)
-           ("K" "8" :string)
-           ("N" "8" :string)
-           ("E" "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)
+           ("B" "8" :string)
            ("A" "8" :string)
+           ("Z" "8" :string)
+           ("E" "8" :string)
            ("D" "8" :string)
+           ("S" "8" :string)
+           ("N" "8" :string)
+           ("Y" "8" :string)
+           ("L" "8" :string)
+           ("O" "8" :string)
+           ("U" "8" :string)
            ("V" "8" :string)
+           ("I" "8" :string)
+           ("H" "8" :string)
+           ("T" "8" :string)
+           ("P" "8" :string)
            ("M" "8" :string)
-           ("Z" "8" :string)
-           ("o" "9" :string)
-           ("h" "9" :string)
-           ("p" "9" :string)
-           ("m" "9" :string)
-           ("s" "9" :string)
+           ("F" "8" :string)
+           ("K" "8" :string)
            ("u" "9" :string)
-           ("c" "9" :string)
-           ("d" "9" :string)
-           ("a" "9" :string)
-           ("e" "9" :string)
-           ("j" "9" :string)
+           ("z" "9" :string)
            ("k" "9" :string)
-           ("i" "9" :string)
-           ("b" "9" :string)
-           ("v" "9" :string)
-           ("l" "9" :string)
+           ("s" "9" :string)
+           ("f" "9" :string)
+           ("j" "9" :string)
+           ("e" "9" :string)
            ("t" "9" :string)
            ("n" "9" :string)
-           ("f" "9" :string)
+           ("a" "9" :string)
            ("y" "9" :string)
+           ("p" "9" :string)
+           ("i" "9" :string)
            ("g" "9" :string)
-           ("z" "9" :string)
+           ("d" "9" :string)
+           ("v" "9" :string)
+           ("b" "9" :string)
+           ("l" "9" :string)
            ("r" "9" :string)
+           ("h" "9" :string)
+           ("c" "9" :string)
+           ("m" "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)
-           ("Č" "�" :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)
-           ("I" "�" :string)
-           ("o" "�" :string)
-           ("J" "�" :string)
-           ("s" "�" :string)
-           ("m" "�" :string)
-           ("G" "�" :string)
-           ("u" "�" :string)
-           ("d" "�" :string)
-           ("P" "�" :string)
+           ("h" "�" :string)
+           ("F" "�" :string)
+           ("U" "�" :string)
+           ("i" "�" :string)
            ("O" "�" :string)
-           ("a" "�" :string)
-           ("K" "�" :string)
-           ("N" "�" :string)
-           ("B" "�" :string)
-           ("S" "�" :string)
+           ("b" "�" :string)
+           ("l" "�" :string)
+           ("v" "�" :string)
            ("H" "�" :string)
+           ("V" "�" :string)
+           ("e" "�" :string)
            ("j" "�" :string)
-           ("f" "�" :string)
            ("D" "�" :string)
-           ("g" "�" :string)
-           ("V" "�" :string)
-           ("r" "�" :string)
-           ("M" "�" :string)
-           ("h" "�" :string)
-           ("T" "�" :string)
-           ("p" "�" :string)
+           ("s" "�" :string)
+           ("a" "�" :string)
            ("L" "�" :string)
-           ("c" "�" :string)
-           ("E" "�" :string)
-           ("U" "�" :string)
            ("Y" "�" :string)
-           ("F" "�" :string)
-           ("e" "�" :string)
-           ("C" "�" :string)
-           ("i" "�" :string)
+           ("t" "�" :string)
+           ("N" "�" :string)
+           ("B" "�" :string)
            ("R" "�" :string)
+           ("u" "�" :string)
+           ("C" "�" :string)
+           ("z" "�" :string)
+           ("M" "�" :string)
+           ("r" "�" :string)
+           ("o" "�" :string)
+           ("K" "�" :string)
+           ("m" "�" :string)
+           ("c" "�" :string)
+           ("g" "�" :string)
+           ("d" "�" :string)
+           ("p" "�" :string)
+           ("P" "�" :string)
+           ("T" "�" :string)
+           ("I" "�" :string)
+           ("S" "�" :string)
+           ("f" "�" :string)
            ("k" "�" :string)
-           ("b" "�" :string)
+           ("y" "�" :string)
            ("n" "�" :string)
-           ("t" "�" :string)
            ("A" "�" :string)
-           ("v" "�" :string)
-           ("l" "�" :string)
-           ("y" "�" :string)
-           ("z" "�" :string)
+           ("G" "�" :string)
+           ("J" "�" :string)
+           ("E" "�" :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 0ce9b69df56..8a359966ba2 100644
--- a/Master/texmf-dist/xindy/modules/lang/russian/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/russian/utf8.xdy
@@ -40,58 +40,58 @@
 
 (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)
            ("Ж" "�" :string)
            ("ж" "�" :string)
            ("З" "�" :string)
            ("з" "�" :string)
            ("И" "�" :string)
            ("и" "�" :string)
-           ("і" "�" :string)
            ("І" "�" :string)
-           ("й" "�" :string)
+           ("і" "�" :string)
            ("Й" "�" :string)
-           ("к" "�" :string)
+           ("й" "�" :string)
            ("К" "�" :string)
-           ("л" "�" :string)
+           ("к" "�" :string)
            ("Л" "�" :string)
+           ("л" "�" :string)
            ("м" "�" :string)
            ("М" "�" :string)
            ("н" "�" :string)
@@ -102,26 +102,26 @@
            ("П" "�" :string)
            ("Р" "�" :string)
            ("р" "�" :string)
-           ("с" "�" :string)
            ("С" "�" :string)
-           ("т" "�" :string)
+           ("с" "�" :string)
            ("Т" "�" :string)
+           ("т" "�" :string)
            ("У" "�" :string)
            ("у" "�" :string)
            ("Ф" "�" :string)
            ("ф" "�" :string)
            ("Х" "�" :string)
            ("х" "�" :string)
-           ("Ц" "�" :string)
            ("ц" "�" :string)
+           ("Ц" "�" :string)
            ("Ч" "�" :string)
            ("ч" "�" :string)
-           ("Ш" "�" :string)
            ("ш" "�" :string)
-           ("щ" "�" :string)
+           ("Ш" "�" :string)
            ("Щ" "�" :string)
-           ("ъ" "�" :string)
+           ("щ" "�" :string)
            ("Ъ" "�" :string)
+           ("ъ" "�" :string)
            ("Ы" "�" :string)
            ("ы" "�" :string)
            ("ь" "�" :string)
@@ -130,10 +130,10 @@
            ("ѣ" "�" :string)
            ("э" "�" :string)
            ("Э" "�" :string)
-           ("ю" "�" :string)
            ("Ю" "�" :string)
-           ("я" "�" :string)
+           ("ю" "�" :string)
            ("Я" "�" :string)
+           ("я" "�" :string)
            ("Ѳ" "�" :string)
            ("ѳ" "�" :string)
            ("ѵ" "�" :string)
@@ -142,318 +142,318 @@
 
 (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)
-           ("З" "�" :string)
+           ("Ц" "�" :string)
+           ("Й" "�" :string)
            ("щ" "�" :string)
-           ("в" "�" :string)
-           ("Ж" "�" :string)
-           ("д" "�" :string)
+           ("Ы" "�" :string)
+           ("О" "�" :string)
+           ("Т" "�" :string)
+           ("Ю" "�" :string)
+           ("Ѵ" "�" :string)
+           ("ы" "�" :string)
+           ("У" "�" :string)
            ("э" "�" :string)
-           ("Я" "�" :string)
+           ("І" "�" :string)
+           ("в" "�" :string)
+           ("з" "�" :string)
+           ("л" "�" :string)
+           ("ш" "�" :string)
+           ("И" "�" :string)
+           ("ь" "�" :string)
            ("п" "�" :string)
+           ("и" "�" :string)
+           ("б" "�" :string)
+           ("Ф" "�" :string)
+           ("Г" "�" :string)
+           ("З" "�" :string)
+           ("ѣ" "�" :string)
            ("Ѳ" "�" :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)
-           ("у́" "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)
-           ("І" "8" :string)
-           ("Т" "8" :string)
-           ("Н" "8" :string)
-           ("Б" "8" :string)
-           ("Ё" "8" :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)
-           ("ф" "9" :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)
+           ("е" "9" :string)
+           ("у" "9" :string)
+           ("ф" "9" :string)
            ))
 
 (define-rule-set "ru-ignore-special"
 
   :rules  (("́" "" :string)
-           ("!" "" :string)
            ("'" "" :string)
            ("-" "" :string)
            ("." "" :string)
            ("?" "" :string)
+           ("!" "" :string)
            ))
 
 (define-rule-set "ru-resolve-special"
 
   :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)
diff --git a/Master/texmf-dist/xindy/modules/lang/serbian/cp1251.xdy b/Master/texmf-dist/xindy/modules/lang/serbian/cp1251.xdy
index b7e4cac833e..457ffae24ee 100644
--- a/Master/texmf-dist/xindy/modules/lang/serbian/cp1251.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/serbian/cp1251.xdy
@@ -34,60 +34,60 @@
 
 (define-rule-set "sr-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)
@@ -98,139 +98,139 @@
 
 (define-rule-set "sr-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)
            ))
 
 (define-rule-set "sr-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)
-           ("�" "9" :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)
            ))
 
 (define-rule-set "sr-ignore-special"
 
-  :rules  (("?" "" :string)
+  :rules  (("-" "" :string)
+           ("?" "" :string)
            ("." "" :string)
            ("'" "" :string)
            ("!" "" :string)
-           ("-" "" :string)
            ))
 
 (define-rule-set "sr-resolve-special"
@@ -238,66 +238,66 @@
   :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)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/serbian/iso88595.xdy b/Master/texmf-dist/xindy/modules/lang/serbian/iso88595.xdy
index 4bce1a0ce41..90db1692a62 100644
--- a/Master/texmf-dist/xindy/modules/lang/serbian/iso88595.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/serbian/iso88595.xdy
@@ -34,8 +34,8 @@
 
 (define-rule-set "sr-alphabetize"
 
-  :rules  (("�" "�" :string)
-           ("�" "�" :string)
+  :rules  (("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
@@ -46,12 +46,12 @@
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
@@ -60,177 +60,177 @@
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :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 "sr-resolve-diacritics"
 
-  :rules  (("�" "�" :string)
-           ("�" "�" :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)
            ))
 
 (define-rule-set "sr-resolve-case"
 
-  :rules  (("�" "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)
+           ("�" "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)
-           ("�" "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 "sr-ignore-special"
 
-  :rules  (("." "" :string)
+  :rules  (("'" "" :string)
+           ("-" "" :string)
            ("!" "" :string)
+           ("." "" :string)
            ("?" "" :string)
-           ("-" "" :string)
-           ("'" "" :string)
            ))
 
 (define-rule-set "sr-resolve-special"
@@ -238,66 +238,66 @@
   :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)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/serbian/isoir111.xdy b/Master/texmf-dist/xindy/modules/lang/serbian/isoir111.xdy
index 10ef8946e01..e7ab211ed44 100644
--- a/Master/texmf-dist/xindy/modules/lang/serbian/isoir111.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/serbian/isoir111.xdy
@@ -34,16 +34,16 @@
 
 (define-rule-set "sr-alphabetize"
 
-  :rules  (("�" "�" :string)
-           ("�" "�" :string)
+  :rules  (("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
@@ -52,38 +52,38 @@
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
@@ -92,145 +92,145 @@
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ))
 
 (define-rule-set "sr-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)
            ))
 
 (define-rule-set "sr-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)
-           ("�" "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)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :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)
            ))
 
 (define-rule-set "sr-ignore-special"
 
-  :rules  (("?" "" :string)
-           ("'" "" :string)
+  :rules  (("!" "" :string)
            ("." "" :string)
-           ("!" "" :string)
+           ("'" "" :string)
            ("-" "" :string)
+           ("?" "" :string)
            ))
 
 (define-rule-set "sr-resolve-special"
@@ -238,66 +238,66 @@
   :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)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/serbian/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/serbian/utf8.xdy
index 4c631ac1e5e..4362dcca67f 100644
--- a/Master/texmf-dist/xindy/modules/lang/serbian/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/serbian/utf8.xdy
@@ -34,38 +34,38 @@
 
 (define-rule-set "sr-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)
@@ -74,325 +74,325 @@
            ("е" "�" :string)
            ("Ж" "�" :string)
            ("ж" "�" :string)
-           ("З" "�" :string)
            ("з" "�" :string)
-           ("И" "�" :string)
+           ("З" "�" :string)
            ("и" "�" :string)
+           ("И" "�" :string)
            ("Ј" "�" :string)
            ("ј" "�" :string)
-           ("к" "�" :string)
            ("К" "�" :string)
-           ("Л" "�" :string)
+           ("к" "�" :string)
            ("л" "�" :string)
-           ("љ" "�" :string)
+           ("Л" "�" :string)
            ("Љ" "�" :string)
-           ("м" "�" :string)
+           ("љ" "�" :string)
            ("М" "�" :string)
-           ("н" "�" :string)
+           ("м" "�" :string)
            ("Н" "�" :string)
-           ("њ" "�" :string)
+           ("н" "�" :string)
            ("Њ" "�" :string)
-           ("о" "�" :string)
+           ("њ" "�" :string)
            ("О" "�" :string)
+           ("о" "�" :string)
            ("п" "�" :string)
            ("П" "�" :string)
            ("Р" "�" :string)
            ("р" "�" :string)
-           ("С" "�" :string)
            ("с" "�" :string)
+           ("С" "�" :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 "sr-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)
+           ("н" "�" :string)
+           ("П" "�" :string)
+           ("г" "�" :string)
            ("Л" "�" :string)
-           ("б" "�" :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 "sr-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)
-           ("а̏" "9" :string)
-           ("е̑" "9" :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)
+           ("е̑" "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)
-           ("Ј" "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)
            ("р" "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 "sr-ignore-special"
 
   :rules  (("̏" "" :string)
            ("̑" "" :string)
-           ("." "" :string)
-           ("'" "" :string)
            ("!" "" :string)
-           ("-" "" :string)
            ("?" "" :string)
+           ("'" "" :string)
+           ("." "" :string)
+           ("-" "" :string)
            ))
 
 (define-rule-set "sr-resolve-special"
 
-  :rules  (("а̏" "�" :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)
diff --git a/Master/texmf-dist/xindy/modules/lang/slovak/large-cp1250.xdy b/Master/texmf-dist/xindy/modules/lang/slovak/large-cp1250.xdy
index 65d0d41a22e..5c64cfd2384 100644
--- a/Master/texmf-dist/xindy/modules/lang/slovak/large-cp1250.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/slovak/large-cp1250.xdy
@@ -39,29 +39,29 @@
 
 (define-rule-set "sk-alphabetize"
 
-  :rules  (("CH" "�" :string)
+  :rules  (("ch" "�" :string)
+           ("CH" "�" :string)
            ("Ch" "�" :string)
-           ("ch" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("a" "�" :string)
            ("�" "�" :string)
            ("A" "�" :string)
-           ("B" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("a" "�" :string)
            ("b" "�" :string)
+           ("B" "�" :string)
            ("c" "�" :string)
            ("C" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("D" "�" :string)
            ("d" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("e" "�" :string)
+           ("�" "�" :string)
            ("E" "�" :string)
+           ("�" "�" :string)
            ("F" "�" :string)
            ("f" "�" :string)
            ("G" "�" :string)
@@ -69,163 +69,163 @@
            ("h" "�" :string)
            ("H" "�" :string)
            ("�" "�" :string)
-           ("I" "�" :string)
            ("�" "�" :string)
            ("i" "�" :string)
-           ("J" "�" :string)
+           ("I" "�" :string)
            ("j" "�" :string)
-           ("k" "�" :string)
+           ("J" "�" :string)
            ("K" "�" :string)
+           ("k" "�" :string)
+           ("l" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("l" "�" :string)
            ("L" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("m" "�" :string)
+           ("�" "�" :string)
            ("M" "�" :string)
-           ("n" "�" :string)
+           ("m" "�" :string)
            ("N" "�" :string)
-           ("�" "�" :string)
+           ("n" "�" :string)
            ("�" "�" :string)
-           ("o" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("o" "�" :string)
            ("O" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("p" "�" :string)
+           ("�" "�" :string)
            ("P" "�" :string)
+           ("p" "�" :string)
            ("Q" "�" :string)
            ("q" "�" :string)
            ("�" "�" :string)
+           ("r" "�" :string)
            ("R" "�" :string)
            ("�" "�" :string)
-           ("r" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("s" "�" :string)
            ("S" "�" :string)
+           ("s" "�" :string)
            ("�" "��" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("T" "�" :string)
            ("t" "�" :string)
-           ("�" "�" :string)
+           ("T" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("u" "�" :string)
+           ("�" "�" :string)
            ("U" "�" :string)
+           ("u" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("v" "�" :string)
            ("V" "�" :string)
-           ("W" "�" :string)
            ("w" "�" :string)
-           ("X" "�" :string)
+           ("W" "�" :string)
            ("x" "�" :string)
+           ("X" "�" :string)
            ("y" "�" :string)
+           ("�" "�" :string)
            ("Y" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("z" "�" :string)
            ("Z" "�" :string)
+           ("z" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ))
 
 (define-rule-set "sk-resolve-diacritics"
 
-  :rules  (("Ch" "�" :string)
-           ("CH" "�" :string)
+  :rules  (("CH" "�" :string)
            ("ch" "�" :string)
-           ("�" "�" :string)
+           ("Ch" "�" :string)
+           ("D" "�" :string)
+           ("x" "�" :string)
+           ("r" "�" :string)
+           ("c" "�" :string)
+           ("E" "�" :string)
            ("o" "�" :string)
+           ("J" "�" :string)
+           ("w" "�" :string)
+           ("Q" "�" :string)
            ("�" "�" :string)
-           ("b" "�" :string)
-           ("y" "�" :string)
+           ("N" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("u" "�" :string)
+           ("U" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("i" "�" :string)
+           ("e" "�" :string)
+           ("M" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("A" "�" :string)
+           ("z" "�" :string)
+           ("�" "�" :string)
+           ("l" "�" :string)
+           ("Z" "�" :string)
+           ("j" "�" :string)
+           ("Y" "�" :string)
            ("P" "�" :string)
-           ("F" "�" :string)
+           ("S" "�" :string)
+           ("y" "�" :string)
+           ("�" "�" :string)
+           ("a" "�" :string)
            ("�" "�" :string)
-           ("s" "�" :string)
+           ("�" "�" :string)
+           ("L" "�" :string)
+           ("X" "�" :string)
            ("B" "�" :string)
+           ("m" "�" :string)
+           ("V" "�" :string)
+           ("n" "�" :string)
+           ("T" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("H" "�" :string)
            ("p" "�" :string)
-           ("k" "�" :string)
-           ("c" "�" :string)
-           ("S" "�" :string)
-           ("�" "�" :string)
-           ("X" "�" :string)
-           ("Y" "�" :string)
-           ("z" "�" :string)
-           ("J" "�" :string)
-           ("G" "�" :string)
            ("�" "�" :string)
+           ("h" "�" :string)
+           ("k" "�" :string)
+           ("W" "�" :string)
            ("f" "�" :string)
-           ("�" "�" :string)
-           ("n" "�" :string)
-           ("�" "�" :string)
+           ("I" "�" :string)
            ("R" "�" :string)
+           ("s" "�" :string)
+           ("�" "�" :string)
+           ("F" "�" :string)
            ("C" "�" :string)
-           ("H" "�" :string)
-           ("I" "�" :string)
-           ("v" "�" :string)
-           ("Q" "�" :string)
-           ("O" "�" :string)
-           ("h" "�" :string)
-           ("D" "�" :string)
-           ("U" "�" :string)
-           ("e" "�" :string)
-           ("t" "�" :string)
-           ("�" "�" :string)
-           ("u" "�" :string)
            ("g" "�" :string)
-           ("�" "�" :string)
-           ("T" "�" :string)
-           ("q" "�" :string)
            ("d" "�" :string)
-           ("E" "�" :string)
-           ("l" "�" :string)
-           ("Z" "�" :string)
-           ("L" "�" :string)
-           ("j" "�" :string)
-           ("�" "�" :string)
-           ("A" "�" :string)
-           ("i" "�" :string)
-           ("V" "�" :string)
-           ("N" "�" :string)
-           ("a" "�" :string)
-           ("�" "�" :string)
-           ("x" "�" :string)
-           ("�" "�" :string)
-           ("w" "�" :string)
+           ("v" "�" :string)
            ("K" "�" :string)
-           ("M" "�" :string)
-           ("r" "�" :string)
-           ("W" "�" :string)
-           ("m" "�" :string)
+           ("t" "�" :string)
+           ("O" "�" :string)
+           ("q" "�" :string)
+           ("b" "�" :string)
+           ("G" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ))
 
@@ -234,104 +234,104 @@
   :rules  (("CH" "7" :string)
            ("Ch" "8" :string)
            ("ch" "9" :string)
-           ("�" "8" :string)
-           ("G" "8" :string)
+           ("N" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("E" "8" :string)
+           ("J" "8" :string)
+           ("Q" "8" :string)
+           ("D" "8" :string)
+           ("�" "8" :string)
+           ("U" "8" :string)
            ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("A" "8" :string)
+           ("M" "8" :string)
+           ("�" "8" :string)
+           ("S" "8" :string)
+           ("P" "8" :string)
            ("Y" "8" :string)
-           ("J" "8" :string)
+           ("Z" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
-           ("S" "8" :string)
+           ("B" "8" :string)
            ("X" "8" :string)
-           ("�" "8" :string)
-           ("F" "8" :string)
-           ("P" "8" :string)
+           ("L" "8" :string)
            ("�" "8" :string)
-           ("B" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("M" "8" :string)
-           ("K" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
            ("W" "8" :string)
-           ("V" "8" :string)
-           ("�" "8" :string)
-           ("N" "8" :string)
-           ("�" "8" :string)
-           ("L" "8" :string)
-           ("Z" "8" :string)
-           ("A" "8" :string)
-           ("�" "8" :string)
+           ("H" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
-           ("E" "8" :string)
+           ("V" "8" :string)
+           ("�" "8" :string)
            ("T" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
-           ("O" "8" :string)
-           ("Q" "8" :string)
-           ("U" "8" :string)
-           ("D" "8" :string)
-           ("R" "8" :string)
+           ("�" "8" :string)
            ("C" "8" :string)
+           ("�" "8" :string)
+           ("F" "8" :string)
+           ("R" "8" :string)
            ("I" "8" :string)
-           ("H" "8" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("n" "9" :string)
-           ("f" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("z" "9" :string)
-           ("c" "9" :string)
-           ("�" "9" :string)
-           ("s" "9" :string)
-           ("�" "9" :string)
-           ("p" "9" :string)
-           ("k" "9" :string)
-           ("�" "9" :string)
-           ("b" "9" :string)
-           ("y" "9" :string)
+           ("�" "8" :string)
+           ("G" "8" :string)
+           ("O" "8" :string)
+           ("K" "8" :string)
            ("�" "9" :string)
            ("o" "9" :string)
-           ("�" "9" :string)
+           ("w" "9" :string)
+           ("c" "9" :string)
            ("r" "9" :string)
-           ("m" "9" :string)
-           ("�" "9" :string)
-           ("a" "9" :string)
            ("x" "9" :string)
-           ("�" "9" :string)
-           ("w" "9" :string)
-           ("j" "9" :string)
-           ("l" "9" :string)
+           ("�" "9" :string)
+           ("e" "9" :string)
            ("i" "9" :string)
-           ("q" "9" :string)
-           ("d" "9" :string)
-           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
            ("u" "9" :string)
-           ("g" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("v" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("l" "9" :string)
+           ("z" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("y" "9" :string)
            ("�" "9" :string)
+           ("�" "9" :string)
+           ("j" "9" :string)
+           ("�" "9" :string)
+           ("m" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("a" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("k" "9" :string)
            ("h" "9" :string)
+           ("p" "9" :string)
+           ("�" "9" :string)
+           ("n" "9" :string)
+           ("d" "9" :string)
+           ("g" "9" :string)
+           ("s" "9" :string)
+           ("f" "9" :string)
+           ("q" "9" :string)
+           ("b" "9" :string)
            ("t" "9" :string)
-           ("e" "9" :string)
-           ("�" "9" :string)
+           ("v" "9" :string)
            ("�" "99" :string)
            ))
 
 (define-rule-set "sk-ignore-special"
 
-  :rules  (("!" "" :string)
-           ("?" "" :string)
-           ("-" "" :string)
+  :rules  (("-" "" :string)
            ("." "" :string)
+           ("?" "" :string)
            ("'" "" :string)
+           ("!" "" :string)
            ))
 
 (define-rule-set "sk-resolve-special"
@@ -342,94 +342,94 @@
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("g" "�" :string)
-           ("u" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("T" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("R" "�" :string)
-           ("C" "�" :string)
-           ("I" "�" :string)
-           ("H" "�" :string)
-           ("O" "�" :string)
-           ("v" "�" :string)
-           ("Q" "�" :string)
-           ("U" "�" :string)
-           ("�" "�" :string)
-           ("D" "�" :string)
+           ("W" "�" :string)
+           ("�" "�" :string)
            ("h" "�" :string)
-           ("t" "�" :string)
-           ("e" "�" :string)
+           ("k" "�" :string)
+           ("H" "�" :string)
+           ("p" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("V" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("N" "�" :string)
+           ("T" "�" :string)
+           ("�" "�" :string)
+           ("n" "�" :string)
+           ("�" "�" :string)
+           ("m" "�" :string)
+           ("�" "�" :string)
+           ("B" "�" :string)
+           ("�" "�" :string)
+           ("X" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("L" "�" :string)
+           ("�" "�" :string)
            ("a" "�" :string)
-           ("�" "�" :string)
-           ("x" "�" :string)
-           ("w" "�" :string)
-           ("�" "�" :string)
-           ("M" "�" :string)
-           ("K" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("r" "�" :string)
            ("�" "�" :string)
-           ("m" "�" :string)
-           ("W" "�" :string)
+           ("G" "�" :string)
            ("q" "�" :string)
+           ("b" "�" :string)
+           ("t" "�" :string)
+           ("O" "�" :string)
+           ("K" "�" :string)
+           ("v" "�" :string)
            ("d" "�" :string)
-           ("�" "�" :string)
-           ("E" "�" :string)
-           ("j" "�" :string)
-           ("L" "�" :string)
-           ("l" "�" :string)
-           ("Z" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("g" "�" :string)
+           ("C" "�" :string)
            ("�" "�" :string)
-           ("A" "�" :string)
-           ("i" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("F" "�" :string)
-           ("P" "�" :string)
-           ("�" "�" :string)
+           ("R" "�" :string)
            ("s" "�" :string)
-           ("�" "�" :string)
-           ("p" "�" :string)
-           ("k" "�" :string)
-           ("B" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("o" "�" :string)
-           ("�" "�" :string)
-           ("b" "�" :string)
-           ("y" "�" :string)
-           ("G" "�" :string)
-           ("�" "�" :string)
+           ("I" "�" :string)
            ("f" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("e" "�" :string)
+           ("i" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("u" "�" :string)
+           ("U" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("n" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("N" "�" :string)
+           ("o" "�" :string)
+           ("�" "�" :string)
+           ("E" "�" :string)
+           ("J" "�" :string)
+           ("Q" "�" :string)
+           ("w" "�" :string)
            ("c" "�" :string)
+           ("r" "�" :string)
+           ("x" "�" :string)
+           ("�" "�" :string)
+           ("D" "�" :string)
+           ("�" "�" :string)
+           ("y" "�" :string)
+           ("�" "�" :string)
            ("S" "�" :string)
-           ("X" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("P" "�" :string)
+           ("�" "�" :string)
            ("Y" "�" :string)
+           ("j" "�" :string)
+           ("Z" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("l" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("z" "�" :string)
-           ("J" "�" :string)
+           ("A" "�" :string)
+           ("M" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "��" :string)
            ("-" "�" :string)
            ("'" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/slovak/large-latin2.xdy b/Master/texmf-dist/xindy/modules/lang/slovak/large-latin2.xdy
index 87923c384e9..a64c5fbf035 100644
--- a/Master/texmf-dist/xindy/modules/lang/slovak/large-latin2.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/slovak/large-latin2.xdy
@@ -39,193 +39,193 @@
 
 (define-rule-set "sk-alphabetize"
 
-  :rules  (("ch" "�" :string)
+  :rules  (("CH" "�" :string)
+           ("ch" "�" :string)
            ("Ch" "�" :string)
-           ("CH" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("A" "�" :string)
            ("�" "�" :string)
-           ("a" "�" :string)
            ("�" "�" :string)
-           ("b" "�" :string)
+           ("�" "�" :string)
+           ("a" "�" :string)
+           ("�" "�" :string)
            ("B" "�" :string)
+           ("b" "�" :string)
            ("c" "�" :string)
            ("C" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("d" "�" :string)
            ("D" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("E" "�" :string)
-           ("e" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
+           ("E" "�" :string)
+           ("e" "�" :string)
            ("F" "�" :string)
            ("f" "�" :string)
            ("G" "�" :string)
            ("g" "�" :string)
-           ("H" "�" :string)
            ("h" "�" :string)
-           ("�" "�" :string)
+           ("H" "�" :string)
+           ("i" "�" :string)
            ("I" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("i" "�" :string)
-           ("J" "�" :string)
            ("j" "�" :string)
+           ("J" "�" :string)
            ("k" "�" :string)
            ("K" "�" :string)
-           ("�" "�" :string)
+           ("L" "�" :string)
            ("l" "�" :string)
            ("�" "�" :string)
-           ("L" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("M" "�" :string)
+           ("�" "�" :string)
            ("m" "�" :string)
-           ("n" "�" :string)
+           ("M" "�" :string)
            ("N" "�" :string)
+           ("n" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("O" "�" :string)
-           ("�" "�" :string)
            ("o" "�" :string)
+           ("�" "�" :string)
+           ("O" "�" :string)
+           ("�" "�" :string)
            ("P" "�" :string)
            ("p" "�" :string)
-           ("q" "�" :string)
            ("Q" "�" :string)
-           ("�" "�" :string)
-           ("r" "�" :string)
+           ("q" "�" :string)
            ("R" "�" :string)
+           ("r" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("S" "�" :string)
            ("s" "�" :string)
            ("�" "��" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("t" "�" :string)
+           ("�" "�" :string)
            ("T" "�" :string)
+           ("t" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
+           ("U" "�" :string)
            ("u" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("U" "�" :string)
-           ("v" "�" :string)
+           ("�" "�" :string)
            ("V" "�" :string)
+           ("v" "�" :string)
            ("W" "�" :string)
            ("w" "�" :string)
-           ("X" "�" :string)
            ("x" "�" :string)
+           ("X" "�" :string)
+           ("Y" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("y" "�" :string)
-           ("�" "�" :string)
-           ("Y" "�" :string)
            ("z" "�" :string)
            ("Z" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ))
 
 (define-rule-set "sk-resolve-diacritics"
 
-  :rules  (("ch" "�" :string)
+  :rules  (("CH" "�" :string)
+           ("ch" "�" :string)
            ("Ch" "�" :string)
-           ("CH" "�" :string)
-           ("�" "�" :string)
-           ("R" "�" :string)
-           ("r" "�" :string)
-           ("t" "�" :string)
-           ("v" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("c" "�" :string)
-           ("M" "�" :string)
-           ("u" "�" :string)
-           ("�" "�" :string)
-           ("z" "�" :string)
-           ("k" "�" :string)
-           ("d" "�" :string)
-           ("b" "�" :string)
            ("V" "�" :string)
-           ("e" "�" :string)
-           ("q" "�" :string)
-           ("G" "�" :string)
-           ("F" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("w" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("E" "�" :string)
-           ("C" "�" :string)
-           ("I" "�" :string)
-           ("H" "�" :string)
-           ("J" "�" :string)
-           ("l" "�" :string)
-           ("�" "�" :string)
-           ("m" "�" :string)
-           ("L" "�" :string)
-           ("X" "�" :string)
-           ("N" "�" :string)
-           ("p" "�" :string)
-           ("x" "�" :string)
            ("A" "�" :string)
+           ("�" "�" :string)
+           ("f" "�" :string)
+           ("p" "�" :string)
+           ("�" "�" :string)
+           ("e" "�" :string)
+           ("�" "�" :string)
            ("j" "�" :string)
-           ("S" "�" :string)
-           ("h" "�" :string)
+           ("y" "�" :string)
+           ("M" "�" :string)
            ("P" "�" :string)
-           ("D" "�" :string)
-           ("n" "�" :string)
-           ("K" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("U" "�" :string)
-           ("Q" "�" :string)
+           ("�" "�" :string)
+           ("T" "�" :string)
            ("g" "�" :string)
+           ("q" "�" :string)
+           ("C" "�" :string)
+           ("J" "�" :string)
+           ("a" "�" :string)
            ("Z" "�" :string)
+           ("v" "�" :string)
+           ("t" "�" :string)
+           ("�" "�" :string)
+           ("n" "�" :string)
+           ("c" "�" :string)
            ("O" "�" :string)
+           ("H" "�" :string)
+           ("s" "�" :string)
+           ("�" "�" :string)
+           ("d" "�" :string)
+           ("Q" "�" :string)
+           ("�" "�" :string)
+           ("D" "�" :string)
+           ("K" "�" :string)
+           ("h" "�" :string)
+           ("b" "�" :string)
+           ("U" "�" :string)
+           ("o" "�" :string)
+           ("R" "�" :string)
+           ("i" "�" :string)
+           ("m" "�" :string)
            ("B" "�" :string)
            ("W" "�" :string)
-           ("f" "�" :string)
-           ("w" "�" :string)
-           ("o" "�" :string)
-           ("T" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("N" "�" :string)
            ("Y" "�" :string)
-           ("i" "�" :string)
-           ("s" "�" :string)
-           ("�" "�" :string)
-           ("a" "�" :string)
-           ("�" "�" :string)
-           ("y" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("l" "�" :string)
+           ("k" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("F" "�" :string)
+           ("G" "�" :string)
+           ("E" "�" :string)
+           ("�" "�" :string)
+           ("S" "�" :string)
+           ("u" "�" :string)
+           ("x" "�" :string)
+           ("L" "�" :string)
+           ("r" "�" :string)
+           ("X" "�" :string)
+           ("I" "�" :string)
+           ("z" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ))
 
@@ -234,202 +234,202 @@
   :rules  (("CH" "7" :string)
            ("Ch" "8" :string)
            ("ch" "9" :string)
-           ("K" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
            ("U" "8" :string)
-           ("Q" "8" :string)
-           ("Z" "8" :string)
-           ("O" "8" :string)
-           ("B" "8" :string)
            ("W" "8" :string)
-           ("T" "8" :string)
+           ("B" "8" :string)
+           ("R" "8" :string)
            ("Y" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("L" "8" :string)
-           ("X" "8" :string)
            ("N" "8" :string)
-           ("A" "8" :string)
-           ("�" "8" :string)
-           ("S" "8" :string)
-           ("P" "8" :string)
-           ("�" "8" :string)
-           ("D" "8" :string)
-           ("V" "8" :string)
-           ("G" "8" :string)
-           ("F" "8" :string)
-           ("�" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
            ("E" "8" :string)
-           ("C" "8" :string)
-           ("I" "8" :string)
-           ("H" "8" :string)
-           ("J" "8" :string)
+           ("G" "8" :string)
+           ("F" "8" :string)
+           ("�" "8" :string)
+           ("L" "8" :string)
+           ("S" "8" :string)
            ("�" "8" :string)
+           ("�" "8" :string)
+           ("I" "8" :string)
+           ("X" "8" :string)
+           ("V" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
-           ("R" "8" :string)
+           ("�" "8" :string)
+           ("A" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
            ("�" "8" :string)
+           ("�" "8" :string)
+           ("T" "8" :string)
            ("M" "8" :string)
+           ("P" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("g" "9" :string)
-           ("w" "9" :string)
-           ("f" "9" :string)
-           ("�" "9" :string)
+           ("Z" "8" :string)
+           ("�" "8" :string)
+           ("J" "8" :string)
+           ("C" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("O" "8" :string)
+           ("H" "8" :string)
+           ("K" "8" :string)
+           ("D" "8" :string)
+           ("�" "8" :string)
+           ("Q" "8" :string)
+           ("b" "9" :string)
+           ("h" "9" :string)
            ("o" "9" :string)
-           ("�" "9" :string)
+           ("�" "9" :string)
+           ("m" "9" :string)
            ("i" "9" :string)
-           ("s" "9" :string)
-           ("a" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("y" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("l" "9" :string)
            ("�" "9" :string)
-           ("m" "9" :string)
-           ("p" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("k" "9" :string)
+           ("r" "9" :string)
+           ("u" "9" :string)
            ("x" "9" :string)
-           ("�" "9" :string)
+           ("�" "9" :string)
+           ("z" "9" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
+           ("w" "9" :string)
+           ("p" "9" :string)
+           ("f" "9" :string)
+           ("�" "9" :string)
+           ("e" "9" :string)
            ("�" "9" :string)
+           ("g" "9" :string)
+           ("y" "9" :string)
            ("j" "9" :string)
-           ("h" "9" :string)
+           ("v" "9" :string)
+           ("�" "9" :string)
+           ("a" "9" :string)
+           ("�" "9" :string)
+           ("q" "9" :string)
            ("n" "9" :string)
-           ("d" "9" :string)
-           ("b" "9" :string)
            ("�" "9" :string)
-           ("e" "9" :string)
-           ("q" "9" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
-           ("l" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
-           ("r" "9" :string)
-           ("v" "9" :string)
+           ("�" "9" :string)
            ("t" "9" :string)
-           ("�" "9" :string)
+           ("s" "9" :string)
+           ("�" "9" :string)
            ("c" "9" :string)
-           ("u" "9" :string)
-           ("z" "9" :string)
-           ("k" "9" :string)
+           ("d" "9" :string)
            ("�" "99" :string)
            ))
 
 (define-rule-set "sk-ignore-special"
 
-  :rules  (("." "" :string)
-           ("'" "" :string)
+  :rules  (("'" "" :string)
            ("-" "" :string)
            ("!" "" :string)
            ("?" "" :string)
+           ("." "" :string)
            ))
 
 (define-rule-set "sk-resolve-special"
 
   :rules  (("ch" "�" :string)
-           ("CH" "�" :string)
            ("Ch" "�" :string)
+           ("CH" "�" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("F" "�" :string)
-           ("G" "�" :string)
-           ("q" "�" :string)
-           ("e" "�" :string)
-           ("V" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("b" "�" :string)
-           ("d" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("J" "�" :string)
-           ("H" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("l" "�" :string)
+           ("q" "�" :string)
            ("C" "�" :string)
-           ("E" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("I" "�" :string)
+           ("v" "�" :string)
+           ("Z" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("a" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("R" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("M" "�" :string)
-           ("c" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("k" "�" :string)
-           ("z" "�" :string)
-           ("�" "�" :string)
-           ("u" "�" :string)
-           ("�" "�" :string)
-           ("r" "�" :string)
-           ("�" "�" :string)
-           ("v" "�" :string)
+           ("�" "�" :string)
            ("t" "�" :string)
-           ("�" "�" :string)
-           ("B" "�" :string)
+           ("n" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("O" "�" :string)
-           ("Z" "�" :string)
-           ("�" "�" :string)
-           ("T" "�" :string)
-           ("o" "�" :string)
+           ("H" "�" :string)
+           ("�" "�" :string)
+           ("c" "�" :string)
+           ("�" "�" :string)
+           ("s" "�" :string)
+           ("d" "�" :string)
+           ("D" "�" :string)
+           ("K" "�" :string)
+           ("�" "�" :string)
+           ("Q" "�" :string)
+           ("�" "�" :string)
            ("w" "�" :string)
-           ("W" "�" :string)
-           ("�" "�" :string)
+           ("V" "�" :string)
+           ("A" "�" :string)
+           ("�" "�" :string)
+           ("p" "�" :string)
            ("f" "�" :string)
-           ("�" "�" :string)
-           ("K" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("e" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("y" "�" :string)
+           ("j" "�" :string)
            ("g" "�" :string)
-           ("Q" "�" :string)
-           ("U" "�" :string)
+           ("�" "�" :string)
+           ("T" "�" :string)
+           ("M" "�" :string)
+           ("P" "�" :string)
+           ("l" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("k" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("y" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("s" "�" :string)
+           ("E" "�" :string)
+           ("G" "�" :string)
+           ("F" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("i" "�" :string)
-           ("Y" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("a" "�" :string)
-           ("�" "�" :string)
-           ("X" "�" :string)
-           ("x" "�" :string)
-           ("p" "�" :string)
-           ("N" "�" :string)
-           ("m" "�" :string)
+           ("r" "�" :string)
            ("L" "�" :string)
-           ("h" "�" :string)
+           ("u" "�" :string)
+           ("x" "�" :string)
            ("S" "�" :string)
-           ("n" "�" :string)
-           ("D" "�" :string)
-           ("�" "�" :string)
-           ("P" "�" :string)
-           ("�" "�" :string)
-           ("j" "�" :string)
-           ("�" "�" :string)
+           ("I" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("A" "�" :string)
+           ("X" "�" :string)
+           ("�" "�" :string)
+           ("z" "�" :string)
+           ("�" "�" :string)
+           ("b" "�" :string)
+           ("h" "�" :string)
+           ("�" "�" :string)
+           ("U" "�" :string)
+           ("�" "�" :string)
+           ("o" "�" :string)
+           ("m" "�" :string)
+           ("i" "�" :string)
+           ("R" "�" :string)
+           ("W" "�" :string)
+           ("B" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("Y" "�" :string)
+           ("N" "�" :string)
+           ("�" "�" :string)
            ("�" "��" :string)
            ("-" "�" :string)
            ("'" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/slovak/large-utf8.xdy b/Master/texmf-dist/xindy/modules/lang/slovak/large-utf8.xdy
index dbe8379020d..473c275c0ef 100644
--- a/Master/texmf-dist/xindy/modules/lang/slovak/large-utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/slovak/large-utf8.xdy
@@ -39,86 +39,86 @@
 
 (define-rule-set "sk-alphabetize"
 
-  :rules  (("á" "�" :string)
+  :rules  (("Á" "�" :string)
+           ("á" "�" :string)
            ("ä" "�" :string)
-           ("Á" "�" :string)
            ("Ä" "�" :string)
-           ("Č" "�" :string)
            ("č" "�" :string)
-           ("ď" "�" :string)
+           ("Č" "�" :string)
            ("Ď" "�" :string)
-           ("É" "�" :string)
+           ("ď" "�" :string)
            ("é" "�" :string)
-           ("CH" "�" :string)
+           ("É" "�" :string)
            ("Ch" "�" :string)
            ("ch" "�" :string)
-           ("Í" "�" :string)
+           ("CH" "�" :string)
            ("í" "�" :string)
+           ("Í" "�" :string)
            ("Ĺ" "�" :string)
            ("ĺ" "�" :string)
            ("Ľ" "�" :string)
            ("ľ" "�" :string)
            ("Ň" "�" :string)
            ("ň" "�" :string)
-           ("Ô" "�" :string)
            ("ô" "�" :string)
            ("Ó" "�" :string)
            ("ó" "�" :string)
+           ("Ô" "�" :string)
            ("Ŕ" "�" :string)
            ("ŕ" "�" :string)
-           ("ř" "�" :string)
            ("Ř" "�" :string)
+           ("ř" "�" :string)
            ("ß" "��" :string)
            ("š" "�" :string)
            ("Š" "�" :string)
            ("Ť" "�" :string)
            ("ť" "�" :string)
-           ("Ú" "�" :string)
            ("ú" "�" :string)
-           ("Ý" "�" :string)
+           ("Ú" "�" :string)
            ("ý" "�" :string)
-           ("ž" "�" :string)
+           ("Ý" "�" :string)
            ("Ž" "�" :string)
-           ("a" "�" :string)
+           ("ž" "�" :string)
            ("A" "�" :string)
-           ("b" "�" :string)
+           ("a" "�" :string)
            ("B" "�" :string)
-           ("C" "�" :string)
+           ("b" "�" :string)
            ("c" "�" :string)
-           ("D" "�" :string)
+           ("C" "�" :string)
            ("d" "�" :string)
-           ("e" "�" :string)
+           ("D" "�" :string)
            ("E" "�" :string)
+           ("e" "�" :string)
            ("F" "�" :string)
            ("f" "�" :string)
-           ("g" "�" :string)
            ("G" "�" :string)
+           ("g" "�" :string)
            ("H" "�" :string)
            ("h" "�" :string)
-           ("I" "�" :string)
            ("i" "�" :string)
-           ("j" "�" :string)
+           ("I" "�" :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)
            ("O" "�" :string)
-           ("P" "�" :string)
            ("p" "�" :string)
+           ("P" "�" :string)
            ("Q" "�" :string)
            ("q" "�" :string)
-           ("r" "�" :string)
            ("R" "�" :string)
-           ("s" "�" :string)
+           ("r" "�" :string)
            ("S" "�" :string)
-           ("t" "�" :string)
+           ("s" "�" :string)
            ("T" "�" :string)
+           ("t" "�" :string)
            ("U" "�" :string)
            ("u" "�" :string)
            ("V" "�" :string)
@@ -129,308 +129,308 @@
            ("X" "�" :string)
            ("Y" "�" :string)
            ("y" "�" :string)
-           ("z" "�" :string)
            ("Z" "�" :string)
+           ("z" "�" :string)
            ))
 
 (define-rule-set "sk-resolve-diacritics"
 
-  :rules  (("ľ" "�" :string)
+  :rules  (("Č" "�" :string)
+           ("č" "�" :string)
            ("ť" "�" :string)
-           ("CH" "�" :string)
-           ("Ľ" "�" :string)
-           ("Č" "�" :string)
-           ("Ť" "�" :string)
            ("ď" "�" :string)
+           ("CH" "�" :string)
            ("ř" "�" :string)
-           ("č" "�" :string)
+           ("ň" "�" :string)
+           ("ľ" "�" :string)
+           ("Ť" "�" :string)
            ("Ch" "�" :string)
-           ("Ž" "�" :string)
-           ("Ď" "�" :string)
-           ("ž" "�" :string)
-           ("Ň" "�" :string)
            ("Ř" "�" :string)
-           ("š" "�" :string)
-           ("ň" "�" :string)
+           ("ž" "�" :string)
+           ("Ľ" "�" :string)
            ("ch" "�" :string)
            ("Š" "�" :string)
-           ("á" "�" :string)
-           ("Ý" "�" :string)
-           ("Í" "�" :string)
-           ("Ĺ" "�" :string)
-           ("É" "�" :string)
-           ("Ŕ" "�" :string)
+           ("š" "�" :string)
+           ("Ň" "�" :string)
+           ("Ď" "�" :string)
+           ("Ž" "�" :string)
            ("í" "�" :string)
-           ("Á" "�" :string)
+           ("Í" "�" :string)
+           ("ĺ" "�" :string)
+           ("ó" "�" :string)
            ("ŕ" "�" :string)
+           ("Ý" "�" :string)
+           ("ý" "�" :string)
+           ("É" "�" :string)
+           ("é" "�" :string)
            ("ú" "�" :string)
+           ("Ŕ" "�" :string)
+           ("Ĺ" "�" :string)
            ("Ú" "�" :string)
-           ("é" "�" :string)
            ("Ó" "�" :string)
-           ("ĺ" "�" :string)
-           ("ý" "�" :string)
-           ("ó" "�" :string)
+           ("á" "�" :string)
+           ("Á" "�" :string)
+           ("Ä" "�" :string)
            ("ä" "�" :string)
            ("Ô" "�" :string)
            ("ô" "�" :string)
-           ("Ä" "�" :string)
            ("ß" "�" :string)
-           ("U" "�" :string)
-           ("r" "�" :string)
+           ("a" "�" :string)
+           ("s" "�" :string)
+           ("j" "�" :string)
+           ("h" "�" :string)
            ("t" "�" :string)
+           ("F" "�" :string)
+           ("y" "�" :string)
+           ("l" "�" :string)
+           ("C" "�" :string)
+           ("T" "�" :string)
+           ("P" "�" :string)
+           ("f" "�" :string)
+           ("q" "�" :string)
+           ("L" "�" :string)
+           ("D" "�" :string)
+           ("K" "�" :string)
+           ("W" "�" :string)
            ("b" "�" :string)
-           ("p" "�" :string)
+           ("N" "�" :string)
+           ("r" "�" :string)
            ("M" "�" :string)
-           ("z" "�" :string)
-           ("R" "�" :string)
-           ("P" "�" :string)
+           ("O" "�" :string)
+           ("c" "�" :string)
+           ("J" "�" :string)
+           ("g" "�" :string)
            ("u" "�" :string)
+           ("d" "�" :string)
            ("I" "�" :string)
-           ("F" "�" :string)
+           ("v" "�" :string)
            ("H" "�" :string)
-           ("s" "�" :string)
-           ("i" "�" :string)
-           ("S" "�" :string)
-           ("x" "�" :string)
+           ("p" "�" :string)
            ("V" "�" :string)
-           ("L" "�" :string)
-           ("g" "�" :string)
-           ("j" "�" :string)
            ("m" "�" :string)
-           ("G" "�" :string)
-           ("Q" "�" :string)
-           ("B" "�" :string)
-           ("c" "�" :string)
-           ("J" "�" :string)
-           ("C" "�" :string)
-           ("o" "�" :string)
+           ("z" "�" :string)
+           ("i" "�" :string)
            ("e" "�" :string)
-           ("f" "�" :string)
-           ("X" "�" :string)
-           ("h" "�" :string)
-           ("w" "�" :string)
-           ("k" "�" :string)
-           ("a" "�" :string)
-           ("v" "�" :string)
-           ("l" "�" :string)
-           ("q" "�" :string)
-           ("D" "�" :string)
-           ("Y" "�" :string)
-           ("E" "�" :string)
-           ("d" "�" :string)
+           ("S" "�" :string)
            ("A" "�" :string)
-           ("O" "�" :string)
+           ("k" "�" :string)
            ("Z" "�" :string)
-           ("N" "�" :string)
-           ("y" "�" :string)
-           ("K" "�" :string)
-           ("W" "�" :string)
-           ("T" "�" :string)
+           ("X" "�" :string)
+           ("B" "�" :string)
+           ("Y" "�" :string)
+           ("G" "�" :string)
+           ("U" "�" :string)
+           ("x" "�" :string)
+           ("o" "�" :string)
            ("n" "�" :string)
+           ("w" "�" :string)
+           ("Q" "�" :string)
+           ("R" "�" :string)
+           ("E" "�" :string)
            ))
 
 (define-rule-set "sk-resolve-case"
 
   :rules  (("CH" "7" :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)
+           ("Ch" "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)
-           ("Ch" "8" :string)
-           ("í" "9" :string)
+           ("Ĺ" "8" :string)
+           ("Ú" "8" :string)
+           ("ý" "9" :string)
            ("ž" "9" :string)
-           ("š" "9" :string)
-           ("ň" "9" :string)
-           ("ch" "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)
+           ("ch" "9" :string)
+           ("í" "9" :string)
            ("č" "9" :string)
+           ("ř" "9" :string)
+           ("ň" "9" :string)
+           ("ť" "9" :string)
+           ("ď" "9" :string)
+           ("á" "9" :string)
+           ("ô" "9" :string)
+           ("š" "9" :string)
+           ("ú" "9" :string)
+           ("é" "9" :string)
            ("ß" "99" :string)
-           ("Q" "8" :string)
-           ("G" "8" :string)
-           ("B" "8" :string)
+           ("W" "8" :string)
+           ("K" "8" :string)
+           ("D" "8" :string)
+           ("O" "8" :string)
+           ("M" "8" :string)
+           ("N" "8" :string)
+           ("L" "8" :string)
            ("J" "8" :string)
+           ("F" "8" :string)
+           ("T" "8" :string)
            ("C" "8" :string)
+           ("P" "8" :string)
            ("X" "8" :string)
-           ("Y" "8" :string)
-           ("D" "8" :string)
-           ("A" "8" :string)
-           ("E" "8" :string)
            ("Z" "8" :string)
-           ("N" "8" :string)
-           ("O" "8" :string)
-           ("K" "8" :string)
-           ("W" "8" :string)
-           ("T" "8" :string)
            ("U" "8" :string)
-           ("M" "8" :string)
+           ("B" "8" :string)
+           ("G" "8" :string)
+           ("Y" "8" :string)
            ("R" "8" :string)
-           ("P" "8" :string)
+           ("E" "8" :string)
+           ("Q" "8" :string)
+           ("V" "8" :string)
            ("H" "8" :string)
            ("I" "8" :string)
-           ("F" "8" :string)
+           ("A" "8" :string)
            ("S" "8" :string)
-           ("V" "8" :string)
-           ("L" "8" :string)
+           ("r" "9" :string)
+           ("b" "9" :string)
            ("c" "9" :string)
-           ("f" "9" :string)
-           ("o" "9" :string)
-           ("e" "9" :string)
-           ("w" "9" :string)
+           ("g" "9" :string)
+           ("l" "9" :string)
            ("h" "9" :string)
+           ("t" "9" :string)
+           ("y" "9" :string)
+           ("s" "9" :string)
            ("a" "9" :string)
-           ("k" "9" :string)
-           ("l" "9" :string)
-           ("v" "9" :string)
+           ("j" "9" :string)
+           ("f" "9" :string)
            ("q" "9" :string)
-           ("d" "9" :string)
-           ("y" "9" :string)
            ("n" "9" :string)
-           ("r" "9" :string)
-           ("t" "9" :string)
-           ("b" "9" :string)
-           ("p" "9" :string)
-           ("z" "9" :string)
-           ("u" "9" :string)
-           ("s" "9" :string)
-           ("i" "9" :string)
            ("x" "9" :string)
-           ("g" "9" :string)
+           ("o" "9" :string)
+           ("k" "9" :string)
+           ("w" "9" :string)
            ("m" "9" :string)
-           ("j" "9" :string)
+           ("z" "9" :string)
+           ("i" "9" :string)
+           ("d" "9" :string)
+           ("u" "9" :string)
+           ("v" "9" :string)
+           ("p" "9" :string)
+           ("e" "9" :string)
            ))
 
 (define-rule-set "sk-ignore-special"
 
-  :rules  (("!" "" :string)
-           ("?" "" :string)
+  :rules  (("'" "" :string)
            ("-" "" :string)
+           ("?" "" :string)
            ("." "" :string)
-           ("'" "" :string)
+           ("!" "" :string)
            ))
 
 (define-rule-set "sk-resolve-special"
 
-  :rules  (("Í" "�" :string)
-           ("ď" "�" :string)
-           ("Ý" "�" :string)
-           ("ä" "�" :string)
-           ("Ĺ" "�" :string)
-           ("á" "�" :string)
-           ("ľ" "�" :string)
-           ("ť" "�" :string)
-           ("CH" "�" :string)
+  :rules  (("ž" "�" :string)
            ("Ľ" "�" :string)
+           ("ý" "�" :string)
            ("Ť" "�" :string)
-           ("Č" "�" :string)
-           ("É" "�" :string)
-           ("č" "�" :string)
            ("Ch" "�" :string)
-           ("Ŕ" "�" :string)
-           ("Ô" "�" :string)
-           ("ř" "�" :string)
-           ("Á" "�" :string)
-           ("ň" "�" :string)
-           ("š" "�" :string)
-           ("ch" "�" :string)
-           ("Ď" "�" :string)
-           ("Ž" "�" :string)
-           ("Ň" "�" :string)
+           ("ä" "�" :string)
+           ("Ý" "�" :string)
            ("Ř" "�" :string)
-           ("ž" "�" :string)
-           ("í" "�" :string)
-           ("ý" "�" :string)
            ("ĺ" "�" :string)
+           ("ŕ" "�" :string)
            ("ó" "�" :string)
-           ("Ó" "�" :string)
+           ("ľ" "�" :string)
            ("Ä" "�" :string)
-           ("Š" "�" :string)
+           ("Ô" "�" :string)
+           ("ch" "�" :string)
+           ("Č" "�" :string)
+           ("č" "�" :string)
+           ("í" "�" :string)
+           ("ň" "�" :string)
+           ("ř" "�" :string)
+           ("Í" "�" :string)
+           ("ď" "�" :string)
+           ("CH" "�" :string)
+           ("ť" "�" :string)
+           ("á" "�" :string)
+           ("Á" "�" :string)
+           ("ô" "�" :string)
+           ("Ž" "�" :string)
+           ("š" "�" :string)
            ("é" "�" :string)
+           ("É" "�" :string)
            ("ú" "�" :string)
-           ("ŕ" "�" :string)
+           ("Š" "�" :string)
+           ("Ď" "�" :string)
+           ("Ó" "�" :string)
            ("Ú" "�" :string)
-           ("ô" "�" :string)
+           ("Ĺ" "�" :string)
+           ("Ŕ" "�" :string)
+           ("Ň" "�" :string)
            ("ß" "��" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("z" "�" :string)
-           ("R" "�" :string)
-           ("p" "�" :string)
+           ("N" "�" :string)
+           ("b" "�" :string)
            ("M" "�" :string)
-           ("u" "�" :string)
-           ("I" "�" :string)
-           ("H" "�" :string)
-           ("F" "�" :string)
-           ("P" "�" :string)
-           ("t" "�" :string)
+           ("O" "�" :string)
            ("r" "�" :string)
-           ("U" "�" :string)
-           ("b" "�" :string)
-           ("g" "�" :string)
+           ("K" "�" :string)
+           ("D" "�" :string)
+           ("W" "�" :string)
            ("L" "�" :string)
+           ("g" "�" :string)
+           ("J" "�" :string)
+           ("c" "�" :string)
+           ("C" "�" :string)
+           ("T" "�" :string)
+           ("y" "�" :string)
+           ("h" "�" :string)
+           ("t" "�" :string)
+           ("F" "�" :string)
+           ("l" "�" :string)
            ("j" "�" :string)
-           ("m" "�" :string)
-           ("S" "�" :string)
-           ("i" "�" :string)
+           ("a" "�" :string)
            ("s" "�" :string)
-           ("V" "�" :string)
+           ("P" "�" :string)
+           ("q" "�" :string)
+           ("f" "�" :string)
+           ("o" "�" :string)
            ("x" "�" :string)
-           ("h" "�" :string)
+           ("n" "�" :string)
+           ("Y" "�" :string)
+           ("G" "�" :string)
+           ("B" "�" :string)
+           ("U" "�" :string)
+           ("Z" "�" :string)
+           ("k" "�" :string)
            ("X" "�" :string)
+           ("E" "�" :string)
+           ("R" "�" :string)
            ("w" "�" :string)
-           ("k" "�" :string)
-           ("a" "�" :string)
-           ("c" "�" :string)
-           ("B" "�" :string)
-           ("G" "�" :string)
            ("Q" "�" :string)
-           ("o" "�" :string)
-           ("e" "�" :string)
-           ("f" "�" :string)
-           ("C" "�" :string)
-           ("J" "�" :string)
-           ("K" "�" :string)
-           ("y" "�" :string)
-           ("O" "�" :string)
-           ("N" "�" :string)
-           ("Z" "�" :string)
-           ("n" "�" :string)
-           ("T" "�" :string)
-           ("W" "�" :string)
-           ("q" "�" :string)
+           ("i" "�" :string)
+           ("V" "�" :string)
+           ("z" "�" :string)
+           ("m" "�" :string)
+           ("I" "�" :string)
            ("v" "�" :string)
-           ("l" "�" :string)
+           ("p" "�" :string)
+           ("H" "�" :string)
            ("d" "�" :string)
-           ("E" "�" :string)
+           ("u" "�" :string)
+           ("S" "�" :string)
            ("A" "�" :string)
-           ("D" "�" :string)
-           ("Y" "�" :string)
+           ("e" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/slovak/small-cp1250.xdy b/Master/texmf-dist/xindy/modules/lang/slovak/small-cp1250.xdy
index 749f4f9706e..29b67fb124e 100644
--- a/Master/texmf-dist/xindy/modules/lang/slovak/small-cp1250.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/slovak/small-cp1250.xdy
@@ -32,191 +32,191 @@
 (define-rule-set "sk-alphabetize"
 
   :rules  (("ch" "�" :string)
-           ("Ch" "�" :string)
            ("CH" "�" :string)
+           ("Ch" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("a" "�" :string)
            ("A" "�" :string)
            ("�" "�" :string)
-           ("a" "�" :string)
-           ("B" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("b" "�" :string)
-           ("�" "�" :string)
+           ("B" "�" :string)
+           ("c" "�" :string)
            ("C" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("c" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("D" "�" :string)
            ("d" "�" :string)
+           ("D" "�" :string)
            ("�" "�" :string)
-           ("E" "�" :string)
            ("�" "�" :string)
            ("e" "�" :string)
+           ("E" "�" :string)
            ("f" "�" :string)
            ("F" "�" :string)
-           ("g" "�" :string)
            ("G" "�" :string)
+           ("g" "�" :string)
            ("h" "�" :string)
            ("H" "�" :string)
            ("�" "�" :string)
-           ("i" "�" :string)
            ("I" "�" :string)
+           ("i" "�" :string)
            ("�" "�" :string)
            ("J" "�" :string)
            ("j" "�" :string)
-           ("K" "�" :string)
            ("k" "�" :string)
+           ("K" "�" :string)
+           ("L" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("L" "�" :string)
            ("l" "�" :string)
            ("M" "�" :string)
            ("m" "�" :string)
-           ("N" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("N" "�" :string)
            ("n" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("O" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
            ("o" "�" :string)
-           ("�" "�" :string)
            ("p" "�" :string)
            ("P" "�" :string)
-           ("Q" "�" :string)
            ("q" "�" :string)
+           ("Q" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("r" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
            ("R" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("S" "�" :string)
            ("s" "�" :string)
+           ("S" "�" :string)
+           ("�" "�" :string)
            ("�" "��" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
            ("T" "�" :string)
            ("t" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("u" "�" :string)
-           ("�" "�" :string)
            ("U" "�" :string)
            ("V" "�" :string)
            ("v" "�" :string)
            ("w" "�" :string)
            ("W" "�" :string)
-           ("x" "�" :string)
            ("X" "�" :string)
+           ("x" "�" :string)
+           ("�" "�" :string)
            ("Y" "�" :string)
            ("�" "�" :string)
            ("y" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("z" "�" :string)
            ("Z" "�" :string)
+           ("�" "�" :string)
+           ("z" "�" :string)
            ))
 
 (define-rule-set "sk-resolve-diacritics"
 
-  :rules  (("CH" "�" :string)
+  :rules  (("ch" "�" :string)
+           ("CH" "�" :string)
            ("Ch" "�" :string)
-           ("ch" "�" :string)
-           ("n" "�" :string)
-           ("k" "�" :string)
-           ("l" "�" :string)
-           ("s" "�" :string)
-           ("E" "�" :string)
-           ("P" "�" :string)
-           ("a" "�" :string)
-           ("e" "�" :string)
-           ("Z" "�" :string)
-           ("K" "�" :string)
-           ("C" "�" :string)
-           ("R" "�" :string)
-           ("d" "�" :string)
-           ("T" "�" :string)
-           ("x" "�" :string)
-           ("U" "�" :string)
-           ("c" "�" :string)
-           ("o" "�" :string)
-           ("F" "�" :string)
+           ("q" "�" :string)
+           ("f" "�" :string)
+           ("b" "�" :string)
            ("L" "�" :string)
-           ("t" "�" :string)
            ("X" "�" :string)
-           ("A" "�" :string)
-           ("w" "�" :string)
-           ("y" "�" :string)
+           ("C" "�" :string)
+           ("c" "�" :string)
            ("G" "�" :string)
-           ("i" "�" :string)
-           ("u" "�" :string)
-           ("j" "�" :string)
-           ("S" "�" :string)
-           ("W" "�" :string)
+           ("V" "�" :string)
+           ("N" "�" :string)
            ("I" "�" :string)
-           ("z" "�" :string)
-           ("D" "�" :string)
-           ("O" "�" :string)
+           ("B" "�" :string)
+           ("a" "�" :string)
+           ("i" "�" :string)
+           ("A" "�" :string)
+           ("s" "�" :string)
+           ("h" "�" :string)
            ("p" "�" :string)
-           ("N" "�" :string)
            ("r" "�" :string)
-           ("B" "�" :string)
+           ("w" "�" :string)
+           ("O" "�" :string)
+           ("u" "�" :string)
+           ("Z" "�" :string)
+           ("F" "�" :string)
+           ("R" "�" :string)
+           ("Y" "�" :string)
+           ("g" "�" :string)
            ("J" "�" :string)
+           ("j" "�" :string)
+           ("z" "�" :string)
+           ("d" "�" :string)
+           ("e" "�" :string)
+           ("S" "�" :string)
+           ("n" "�" :string)
+           ("T" "�" :string)
            ("M" "�" :string)
-           ("Q" "�" :string)
+           ("k" "�" :string)
+           ("o" "�" :string)
+           ("E" "�" :string)
            ("m" "�" :string)
-           ("q" "�" :string)
-           ("Y" "�" :string)
-           ("V" "�" :string)
-           ("h" "�" :string)
-           ("b" "�" :string)
-           ("f" "�" :string)
-           ("v" "�" :string)
-           ("g" "�" :string)
+           ("t" "�" :string)
+           ("D" "�" :string)
+           ("U" "�" :string)
+           ("P" "�" :string)
+           ("x" "�" :string)
+           ("Q" "�" :string)
            ("H" "�" :string)
-           ("�" "�" :string)
+           ("W" "�" :string)
+           ("y" "�" :string)
+           ("K" "�" :string)
+           ("v" "�" :string)
+           ("l" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ))
@@ -226,202 +226,202 @@
   :rules  (("CH" "7" :string)
            ("Ch" "8" :string)
            ("ch" "9" :string)
-           ("D" "8" :string)
-           ("I" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
-           ("O" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("S" "8" :string)
-           ("W" "8" :string)
-           ("�" "8" :string)
-           ("G" "8" :string)
            ("V" "8" :string)
-           ("Y" "8" :string)
-           ("�" "8" :string)
-           ("H" "8" :string)
+           ("�" "8" :string)
+           ("N" "8" :string)
+           ("I" "8" :string)
+           ("B" "8" :string)
+           ("A" "8" :string)
            ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
+           ("L" "8" :string)
+           ("�" "8" :string)
+           ("X" "8" :string)
+           ("�" "8" :string)
+           ("C" "8" :string)
+           ("G" "8" :string)
+           ("�" "8" :string)
+           ("T" "8" :string)
            ("M" "8" :string)
-           ("�" "8" :string)
-           ("B" "8" :string)
-           ("J" "8" :string)
-           ("N" "8" :string)
+           ("E" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
+           ("D" "8" :string)
+           ("U" "8" :string)
+           ("P" "8" :string)
+           ("W" "8" :string)
            ("Q" "8" :string)
-           ("�" "8" :string)
+           ("H" "8" :string)
+           ("�" "8" :string)
+           ("K" "8" :string)
            ("�" "8" :string)
            ("Z" "8" :string)
-           ("�" "8" :string)
-           ("P" "8" :string)
-           ("�" "8" :string)
-           ("E" "8" :string)
-           ("L" "8" :string)
-           ("A" "8" :string)
-           ("X" "8" :string)
+           ("O" "8" :string)
            ("F" "8" :string)
-           ("T" "8" :string)
-           ("�" "8" :string)
+           ("Y" "8" :string)
            ("R" "8" :string)
-           ("�" "8" :string)
-           ("K" "8" :string)
-           ("C" "8" :string)
-           ("�" "8" :string)
-           ("U" "8" :string)
-           ("z" "9" :string)
-           ("p" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("w" "9" :string)
-           ("�" "9" :string)
-           ("j" "9" :string)
+           ("J" "8" :string)
+           ("�" "8" :string)
+           ("S" "8" :string)
+           ("�" "8" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("a" "9" :string)
            ("i" "9" :string)
-           ("u" "9" :string)
-           ("y" "9" :string)
-           ("b" "9" :string)
-           ("f" "9" :string)
-           ("�" "9" :string)
-           ("q" "9" :string)
+           ("�" "9" :string)
            ("h" "9" :string)
-           ("�" "9" :string)
-           ("v" "9" :string)
-           ("g" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("r" "9" :string)
-           ("�" "9" :string)
+           ("s" "9" :string)
+           ("p" "9" :string)
+           ("�" "9" :string)
+           ("q" "9" :string)
+           ("f" "9" :string)
+           ("�" "9" :string)
+           ("b" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
+           ("c" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("k" "9" :string)
+           ("o" "9" :string)
            ("m" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
+           ("t" "9" :string)
            ("�" "9" :string)
-           ("a" "9" :string)
-           ("e" "9" :string)
-           ("k" "9" :string)
-           ("n" "9" :string)
+           ("x" "9" :string)
+           ("y" "9" :string)
+           ("v" "9" :string)
            ("l" "9" :string)
-           ("s" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("c" "9" :string)
+           ("r" "9" :string)
+           ("w" "9" :string)
+           ("u" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
-           ("t" "9" :string)
-           ("o" "9" :string)
+           ("�" "9" :string)
+           ("g" "9" :string)
+           ("�" "9" :string)
+           ("j" "9" :string)
+           ("z" "9" :string)
            ("d" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("x" "9" :string)
+           ("�" "9" :string)
+           ("e" "9" :string)
+           ("n" "9" :string)
            ("�" "99" :string)
            ))
 
 (define-rule-set "sk-ignore-special"
 
-  :rules  (("?" "" :string)
-           ("." "" :string)
+  :rules  (("." "" :string)
            ("!" "" :string)
-           ("'" "" :string)
            ("-" "" :string)
+           ("'" "" :string)
+           ("?" "" :string)
            ))
 
 (define-rule-set "sk-resolve-special"
 
-  :rules  (("Ch" "�" :string)
-           ("ch" "�" :string)
+  :rules  (("ch" "�" :string)
+           ("Ch" "�" :string)
            ("CH" "�" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("w" "�" :string)
-           ("S" "�" :string)
-           ("W" "�" :string)
-           ("j" "�" :string)
-           ("G" "�" :string)
-           ("y" "�" :string)
+           ("a" "�" :string)
            ("i" "�" :string)
-           ("u" "�" :string)
-           ("�" "�" :string)
-           ("z" "�" :string)
-           ("D" "�" :string)
+           ("B" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("p" "�" :string)
+           ("�" "�" :string)
+           ("h" "�" :string)
+           ("s" "�" :string)
+           ("A" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("N" "�" :string)
            ("I" "�" :string)
-           ("O" "�" :string)
-           ("�" "�" :string)
-           ("p" "�" :string)
+           ("V" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("b" "�" :string)
+           ("f" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("C" "�" :string)
+           ("c" "�" :string)
+           ("G" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("B" "�" :string)
-           ("J" "�" :string)
-           ("�" "�" :string)
-           ("M" "�" :string)
-           ("N" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("r" "�" :string)
+           ("L" "�" :string)
            ("�" "�" :string)
-           ("m" "�" :string)
-           ("�" "�" :string)
+           ("X" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("Q" "�" :string)
-           ("f" "�" :string)
-           ("b" "�" :string)
-           ("V" "�" :string)
-           ("Y" "�" :string)
-           ("h" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("q" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("g" "�" :string)
-           ("v" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("U" "�" :string)
+           ("P" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("D" "�" :string)
+           ("�" "�" :string)
+           ("v" "�" :string)
+           ("l" "�" :string)
+           ("K" "�" :string)
+           ("x" "�" :string)
+           ("y" "�" :string)
+           ("W" "�" :string)
+           ("Q" "�" :string)
            ("H" "�" :string)
-           ("n" "�" :string)
            ("k" "�" :string)
-           ("P" "�" :string)
-           ("s" "�" :string)
-           ("l" "�" :string)
+           ("T" "�" :string)
+           ("M" "�" :string)
+           ("m" "�" :string)
+           ("t" "�" :string)
            ("E" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("a" "�" :string)
-           ("�" "�" :string)
+           ("o" "�" :string)
+           ("�" "�" :string)
+           ("j" "�" :string)
+           ("z" "�" :string)
+           ("�" "�" :string)
+           ("g" "�" :string)
+           ("�" "�" :string)
+           ("J" "�" :string)
+           ("S" "�" :string)
+           ("�" "�" :string)
+           ("n" "�" :string)
+           ("d" "�" :string)
+           ("�" "�" :string)
            ("e" "�" :string)
-           ("�" "�" :string)
+           ("w" "�" :string)
            ("Z" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("u" "�" :string)
+           ("O" "�" :string)
+           ("r" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("Y" "�" :string)
+           ("�" "�" :string)
            ("R" "�" :string)
-           ("�" "�" :string)
-           ("T" "�" :string)
-           ("d" "�" :string)
-           ("C" "�" :string)
-           ("K" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("U" "�" :string)
-           ("x" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("c" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("F" "�" :string)
-           ("A" "�" :string)
-           ("X" "�" :string)
-           ("t" "�" :string)
-           ("L" "�" :string)
-           ("o" "�" :string)
            ("�" "��" :string)
            ("-" "�" :string)
            ("'" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/slovak/small-latin2.xdy b/Master/texmf-dist/xindy/modules/lang/slovak/small-latin2.xdy
index 7eb0bc3535f..159744a5461 100644
--- a/Master/texmf-dist/xindy/modules/lang/slovak/small-latin2.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/slovak/small-latin2.xdy
@@ -31,15 +31,15 @@
 
 (define-rule-set "sk-alphabetize"
 
-  :rules  (("Ch" "�" :string)
+  :rules  (("CH" "�" :string)
            ("ch" "�" :string)
-           ("CH" "�" :string)
+           ("Ch" "�" :string)
            ("a" "�" :string)
-           ("A" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("A" "�" :string)
+           ("�" "�" :string)
            ("B" "�" :string)
            ("b" "�" :string)
            ("�" "�" :string)
@@ -47,177 +47,177 @@
            ("C" "�" :string)
            ("�" "�" :string)
            ("D" "�" :string)
-           ("d" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("E" "�" :string)
+           ("�" "�" :string)
+           ("d" "�" :string)
            ("e" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("E" "�" :string)
            ("F" "�" :string)
            ("f" "�" :string)
-           ("g" "�" :string)
            ("G" "�" :string)
+           ("g" "�" :string)
            ("H" "�" :string)
            ("h" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("I" "�" :string)
            ("i" "�" :string)
-           ("�" "�" :string)
-           ("j" "�" :string)
            ("J" "�" :string)
+           ("j" "�" :string)
            ("K" "�" :string)
            ("k" "�" :string)
-           ("�" "�" :string)
+           ("L" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("l" "�" :string)
-           ("L" "�" :string)
            ("m" "�" :string)
            ("M" "�" :string)
-           ("n" "�" :string)
-           ("�" "�" :string)
            ("N" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("n" "�" :string)
            ("O" "�" :string)
-           ("�" "�" :string)
-           ("o" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("p" "�" :string)
+           ("�" "�" :string)
+           ("o" "�" :string)
            ("P" "�" :string)
-           ("q" "�" :string)
+           ("p" "�" :string)
            ("Q" "�" :string)
-           ("�" "�" :string)
-           ("R" "�" :string)
+           ("q" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("r" "�" :string)
-           ("�" "�" :string)
-           ("S" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("R" "�" :string)
            ("�" "�" :string)
+           ("S" "�" :string)
+           ("�" "�" :string)
            ("s" "�" :string)
            ("�" "��" :string)
+           ("�" "�" :string)
            ("T" "�" :string)
-           ("t" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("t" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("u" "�" :string)
            ("U" "�" :string)
-           ("�" "�" :string)
-           ("V" "�" :string)
            ("v" "�" :string)
+           ("V" "�" :string)
            ("W" "�" :string)
            ("w" "�" :string)
            ("X" "�" :string)
            ("x" "�" :string)
            ("�" "�" :string)
-           ("y" "�" :string)
            ("�" "�" :string)
+           ("y" "�" :string)
            ("Y" "�" :string)
+           ("�" "�" :string)
            ("Z" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("z" "�" :string)
            ))
 
 (define-rule-set "sk-resolve-diacritics"
 
-  :rules  (("ch" "�" :string)
+  :rules  (("Ch" "�" :string)
+           ("ch" "�" :string)
            ("CH" "�" :string)
-           ("Ch" "�" :string)
-           ("c" "�" :string)
-           ("U" "�" :string)
+           ("Z" "�" :string)
+           ("Q" "�" :string)
            ("u" "�" :string)
-           ("L" "�" :string)
+           ("w" "�" :string)
+           ("S" "�" :string)
+           ("h" "�" :string)
+           ("m" "�" :string)
+           ("B" "�" :string)
+           ("A" "�" :string)
+           ("l" "�" :string)
+           ("v" "�" :string)
            ("f" "�" :string)
-           ("X" "�" :string)
-           ("q" "�" :string)
-           ("j" "�" :string)
-           ("M" "�" :string)
+           ("W" "�" :string)
            ("d" "�" :string)
-           ("J" "�" :string)
-           ("s" "�" :string)
-           ("x" "�" :string)
-           ("Q" "�" :string)
-           ("r" "�" :string)
+           ("V" "�" :string)
+           ("y" "�" :string)
+           ("j" "�" :string)
+           ("o" "�" :string)
+           ("U" "�" :string)
            ("z" "�" :string)
+           ("R" "�" :string)
+           ("Y" "�" :string)
+           ("J" "�" :string)
+           ("t" "�" :string)
            ("k" "�" :string)
+           ("n" "�" :string)
+           ("s" "�" :string)
+           ("q" "�" :string)
+           ("E" "�" :string)
+           ("M" "�" :string)
            ("b" "�" :string)
-           ("B" "�" :string)
-           ("N" "�" :string)
-           ("G" "�" :string)
-           ("v" "�" :string)
-           ("Y" "�" :string)
-           ("C" "�" :string)
-           ("w" "�" :string)
-           ("A" "�" :string)
-           ("S" "�" :string)
-           ("p" "�" :string)
-           ("m" "�" :string)
-           ("W" "�" :string)
-           ("K" "�" :string)
-           ("Z" "�" :string)
+           ("i" "�" :string)
            ("I" "�" :string)
-           ("a" "�" :string)
+           ("x" "�" :string)
+           ("p" "�" :string)
+           ("C" "�" :string)
+           ("P" "�" :string)
            ("H" "�" :string)
-           ("n" "�" :string)
+           ("g" "�" :string)
+           ("a" "�" :string)
+           ("K" "�" :string)
+           ("X" "�" :string)
+           ("G" "�" :string)
            ("O" "�" :string)
-           ("E" "�" :string)
            ("e" "�" :string)
-           ("l" "�" :string)
-           ("V" "�" :string)
+           ("L" "�" :string)
+           ("F" "�" :string)
+           ("r" "�" :string)
+           ("N" "�" :string)
            ("D" "�" :string)
-           ("g" "�" :string)
+           ("c" "�" :string)
            ("T" "�" :string)
-           ("i" "�" :string)
-           ("y" "�" :string)
-           ("P" "�" :string)
-           ("R" "�" :string)
-           ("o" "�" :string)
-           ("h" "�" :string)
-           ("F" "�" :string)
-           ("t" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ))
 
@@ -226,104 +226,104 @@
   :rules  (("CH" "7" :string)
            ("Ch" "8" :string)
            ("ch" "9" :string)
-           ("P" "8" :string)
-           ("�" "8" :string)
+           ("I" "8" :string)
+           ("M" "8" :string)
+           ("�" "8" :string)
+           ("C" "8" :string)
+           ("�" "8" :string)
            ("R" "8" :string)
-           ("F" "8" :string)
-           ("�" "8" :string)
-           ("T" "8" :string)
-           ("D" "8" :string)
-           ("�" "8" :string)
+           ("Y" "8" :string)
+           ("J" "8" :string)
+           ("U" "8" :string)
            ("E" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
            ("V" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("I" "8" :string)
-           ("H" "8" :string)
-           ("O" "8" :string)
-           ("Z" "8" :string)
-           ("�" "8" :string)
+           ("�" "8" :string)
            ("W" "8" :string)
-           ("K" "8" :string)
-           ("�" "8" :string)
-           ("A" "8" :string)
-           ("�" "8" :string)
            ("S" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("Y" "8" :string)
-           ("�" "8" :string)
-           ("C" "8" :string)
-           ("�" "8" :string)
+           ("Z" "8" :string)
+           ("Q" "8" :string)
+           ("A" "8" :string)
+           ("�" "8" :string)
            ("B" "8" :string)
+           ("�" "8" :string)
+           ("D" "8" :string)
+           ("�" "8" :string)
            ("N" "8" :string)
-           ("G" "8" :string)
-           ("�" "8" :string)
-           ("Q" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("T" "8" :string)
+           ("�" "8" :string)
+           ("F" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
-           ("M" "8" :string)
-           ("J" "8" :string)
+           ("O" "8" :string)
+           ("G" "8" :string)
            ("X" "8" :string)
-           ("U" "8" :string)
            ("L" "8" :string)
-           ("o" "9" :string)
-           ("h" "9" :string)
-           ("t" "9" :string)
+           ("�" "8" :string)
+           ("H" "8" :string)
+           ("P" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("K" "8" :string)
+           ("�" "8" :string)
+           ("�" "9" :string)
+           ("b" "9" :string)
+           ("�" "9" :string)
            ("i" "9" :string)
            ("�" "9" :string)
-           ("�" "9" :string)
-           ("y" "9" :string)
            ("�" "9" :string)
-           ("g" "9" :string)
-           ("e" "9" :string)
-           ("�" "9" :string)
-           ("l" "9" :string)
-           ("�" "9" :string)
-           ("a" "9" :string)
-           ("n" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("m" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
            ("p" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("w" "9" :string)
-           ("v" "9" :string)
            ("x" "9" :string)
-           ("�" "9" :string)
            ("z" "9" :string)
-           ("r" "9" :string)
-           ("k" "9" :string)
-           ("b" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("o" "9" :string)
+           ("j" "9" :string)
            ("s" "9" :string)
-           ("�" "9" :string)
-           ("d" "9" :string)
            ("q" "9" :string)
-           ("�" "9" :string)
-           ("j" "9" :string)
+           ("n" "9" :string)
+           ("k" "9" :string)
+           ("t" "9" :string)
+           ("�" "9" :string)
+           ("v" "9" :string)
            ("f" "9" :string)
-           ("c" "9" :string)
+           ("y" "9" :string)
+           ("�" "9" :string)
+           ("d" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("w" "9" :string)
            ("u" "9" :string)
+           ("l" "9" :string)
+           ("m" "9" :string)
+           ("h" "9" :string)
            ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("c" "9" :string)
+           ("r" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("e" "9" :string)
+           ("a" "9" :string)
+           ("g" "9" :string)
            ("�" "99" :string)
            ))
 
 (define-rule-set "sk-ignore-special"
 
-  :rules  (("?" "" :string)
-           ("-" "" :string)
+  :rules  (("-" "" :string)
+           ("." "" :string)
            ("!" "" :string)
            ("'" "" :string)
-           ("." "" :string)
+           ("?" "" :string)
            ))
 
 (define-rule-set "sk-resolve-special"
@@ -334,94 +334,94 @@
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("�" "�" :string)
-           ("K" "�" :string)
-           ("�" "�" :string)
+           ("u" "�" :string)
+           ("w" "�" :string)
+           ("Q" "�" :string)
+           ("Z" "�" :string)
+           ("�" "�" :string)
+           ("S" "�" :string)
+           ("�" "�" :string)
+           ("B" "�" :string)
            ("m" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("W" "�" :string)
-           ("�" "�" :string)
-           ("p" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("h" "�" :string)
+           ("l" "�" :string)
            ("A" "�" :string)
-           ("�" "�" :string)
-           ("S" "�" :string)
-           ("a" "�" :string)
-           ("H" "�" :string)
+           ("�" "�" :string)
+           ("f" "�" :string)
+           ("�" "�" :string)
+           ("v" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("d" "�" :string)
+           ("�" "�" :string)
+           ("W" "�" :string)
+           ("�" "�" :string)
+           ("y" "�" :string)
+           ("V" "�" :string)
+           ("�" "�" :string)
+           ("o" "�" :string)
+           ("U" "�" :string)
+           ("�" "�" :string)
+           ("j" "�" :string)
+           ("z" "�" :string)
+           ("Y" "�" :string)
+           ("J" "�" :string)
+           ("R" "�" :string)
+           ("�" "�" :string)
+           ("k" "�" :string)
+           ("t" "�" :string)
+           ("E" "�" :string)
+           ("q" "�" :string)
+           ("s" "�" :string)
            ("n" "�" :string)
-           ("O" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("i" "�" :string)
+           ("b" "�" :string)
+           ("M" "�" :string)
            ("I" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("Z" "�" :string)
-           ("�" "�" :string)
-           ("g" "�" :string)
            ("�" "�" :string)
-           ("D" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("E" "�" :string)
-           ("e" "�" :string)
-           ("�" "�" :string)
-           ("l" "�" :string)
+           ("�" "�" :string)
+           ("p" "�" :string)
+           ("x" "�" :string)
+           ("�" "�" :string)
+           ("C" "�" :string)
+           ("H" "�" :string)
            ("�" "�" :string)
-           ("V" "�" :string)
-           ("h" "�" :string)
-           ("F" "�" :string)
-           ("t" "�" :string)
-           ("�" "�" :string)
            ("P" "�" :string)
            ("�" "�" :string)
-           ("R" "�" :string)
-           ("o" "�" :string)
-           ("i" "�" :string)
-           ("T" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("y" "�" :string)
-           ("f" "�" :string)
+           ("�" "�" :string)
+           ("g" "�" :string)
+           ("K" "�" :string)
+           ("�" "�" :string)
+           ("a" "�" :string)
            ("X" "�" :string)
+           ("G" "�" :string)
+           ("�" "�" :string)
+           ("O" "�" :string)
            ("L" "�" :string)
-           ("�" "�" :string)
-           ("c" "�" :string)
-           ("U" "�" :string)
-           ("u" "�" :string)
-           ("�" "�" :string)
-           ("M" "�" :string)
-           ("d" "�" :string)
-           ("J" "�" :string)
-           ("j" "�" :string)
-           ("q" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("z" "�" :string)
-           ("k" "�" :string)
+           ("e" "�" :string)
+           ("F" "�" :string)
            ("r" "�" :string)
-           ("b" "�" :string)
-           ("Q" "�" :string)
-           ("x" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("s" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("w" "�" :string)
-           ("�" "�" :string)
-           ("Y" "�" :string)
-           ("�" "�" :string)
-           ("C" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("v" "�" :string)
-           ("B" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("N" "�" :string)
-           ("G" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("D" "�" :string)
+           ("�" "�" :string)
+           ("T" "�" :string)
+           ("c" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "��" :string)
            ("-" "�" :string)
            ("'" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/slovak/small-utf8.xdy b/Master/texmf-dist/xindy/modules/lang/slovak/small-utf8.xdy
index d424423aa83..48c2547062c 100644
--- a/Master/texmf-dist/xindy/modules/lang/slovak/small-utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/slovak/small-utf8.xdy
@@ -31,40 +31,40 @@
 
 (define-rule-set "sk-alphabetize"
 
-  :rules  (("Ä" "�" :string)
-           ("á" "�" :string)
+  :rules  (("ä" "�" :string)
+           ("Ä" "�" :string)
            ("Á" "�" :string)
-           ("ä" "�" :string)
+           ("á" "�" :string)
            ("č" "�" :string)
            ("Č" "�" :string)
-           ("ď" "�" :string)
            ("Ď" "�" :string)
+           ("ď" "�" :string)
            ("é" "�" :string)
            ("É" "�" :string)
-           ("CH" "�" :string)
-           ("Ch" "�" :string)
            ("ch" "�" :string)
-           ("Í" "�" :string)
+           ("Ch" "�" :string)
+           ("CH" "�" :string)
            ("í" "�" :string)
+           ("Í" "�" :string)
+           ("Ĺ" "�" :string)
+           ("ľ" "�" :string)
            ("ĺ" "�" :string)
            ("Ľ" "�" :string)
-           ("ľ" "�" :string)
-           ("Ĺ" "�" :string)
            ("ň" "�" :string)
            ("Ň" "�" :string)
-           ("Ô" "�" :string)
-           ("ó" "�" :string)
            ("Ó" "�" :string)
            ("ô" "�" :string)
-           ("ŕ" "�" :string)
-           ("Ř" "�" :string)
+           ("ó" "�" :string)
+           ("Ô" "�" :string)
            ("ř" "�" :string)
            ("Ŕ" "�" :string)
-           ("Š" "�" :string)
+           ("Ř" "�" :string)
+           ("ŕ" "�" :string)
            ("š" "�" :string)
+           ("Š" "�" :string)
            ("ß" "��" :string)
-           ("Ť" "�" :string)
            ("ť" "�" :string)
+           ("Ť" "�" :string)
            ("Ú" "�" :string)
            ("ú" "�" :string)
            ("ý" "�" :string)
@@ -73,52 +73,52 @@
            ("ž" "�" :string)
            ("a" "�" :string)
            ("A" "�" :string)
-           ("B" "�" :string)
            ("b" "�" :string)
+           ("B" "�" :string)
            ("C" "�" :string)
            ("c" "�" :string)
            ("D" "�" :string)
            ("d" "�" :string)
-           ("e" "�" :string)
            ("E" "�" :string)
+           ("e" "�" :string)
            ("F" "�" :string)
            ("f" "�" :string)
            ("g" "�" :string)
            ("G" "�" :string)
-           ("H" "�" :string)
            ("h" "�" :string)
-           ("I" "�" :string)
+           ("H" "�" :string)
            ("i" "�" :string)
+           ("I" "�" :string)
            ("J" "�" :string)
            ("j" "�" :string)
            ("K" "�" :string)
            ("k" "�" :string)
-           ("L" "�" :string)
            ("l" "�" :string)
+           ("L" "�" :string)
            ("M" "�" :string)
            ("m" "�" :string)
-           ("n" "�" :string)
            ("N" "�" :string)
-           ("o" "�" :string)
+           ("n" "�" :string)
            ("O" "�" :string)
+           ("o" "�" :string)
            ("p" "�" :string)
            ("P" "�" :string)
            ("q" "�" :string)
            ("Q" "�" :string)
-           ("r" "�" :string)
            ("R" "�" :string)
-           ("S" "�" :string)
+           ("r" "�" :string)
            ("s" "�" :string)
-           ("t" "�" :string)
+           ("S" "�" :string)
            ("T" "�" :string)
-           ("U" "�" :string)
+           ("t" "�" :string)
            ("u" "�" :string)
+           ("U" "�" :string)
            ("V" "�" :string)
            ("v" "�" :string)
-           ("w" "�" :string)
            ("W" "�" :string)
-           ("X" "�" :string)
+           ("w" "�" :string)
            ("x" "�" :string)
+           ("X" "�" :string)
            ("y" "�" :string)
            ("Y" "�" :string)
            ("Z" "�" :string)
@@ -130,299 +130,299 @@
   :rules  (("CH" "�" :string)
            ("Ch" "�" :string)
            ("ch" "�" :string)
-           ("Š" "�" :string)
+           ("ó" "�" :string)
            ("ĺ" "�" :string)
-           ("ý" "�" :string)
-           ("Ú" "�" :string)
-           ("ň" "�" :string)
-           ("ú" "�" :string)
+           ("É" "�" :string)
+           ("Č" "�" :string)
+           ("á" "�" :string)
+           ("Ň" "�" :string)
+           ("Ý" "�" :string)
            ("Í" "�" :string)
-           ("ó" "�" :string)
-           ("Ž" "�" :string)
+           ("Š" "�" :string)
            ("ď" "�" :string)
-           ("é" "�" :string)
-           ("í" "�" :string)
-           ("Ý" "�" :string)
            ("Ť" "�" :string)
+           ("š" "�" :string)
+           ("č" "�" :string)
            ("ŕ" "�" :string)
+           ("ú" "�" :string)
+           ("Ó" "�" :string)
            ("ž" "�" :string)
-           ("á" "�" :string)
-           ("É" "�" :string)
-           ("š" "�" :string)
+           ("Á" "�" :string)
+           ("Ž" "�" :string)
            ("Ĺ" "�" :string)
+           ("é" "�" :string)
+           ("í" "�" :string)
            ("ť" "�" :string)
-           ("Ň" "�" :string)
+           ("Ú" "�" :string)
+           ("ň" "�" :string)
+           ("ý" "�" :string)
            ("Ŕ" "�" :string)
-           ("č" "�" :string)
            ("Ď" "�" :string)
-           ("Ó" "�" :string)
-           ("Á" "�" :string)
-           ("Č" "�" :string)
            ("Ľ" "�" :string)
            ("Ô" "�" :string)
+           ("ô" "�" :string)
            ("Ř" "�" :string)
            ("ľ" "�" :string)
-           ("Ä" "�" :string)
-           ("ř" "�" :string)
            ("ä" "�" :string)
-           ("ô" "�" :string)
+           ("ř" "�" :string)
+           ("Ä" "�" :string)
            ("ß" "�" :string)
-           ("F" "�" :string)
-           ("t" "�" :string)
-           ("V" "�" :string)
-           ("K" "�" :string)
-           ("D" "�" :string)
-           ("H" "�" :string)
+           ("P" "�" :string)
+           ("Q" "�" :string)
            ("r" "�" :string)
-           ("f" "�" :string)
-           ("y" "�" :string)
-           ("v" "�" :string)
-           ("R" "�" :string)
-           ("T" "�" :string)
-           ("n" "�" :string)
-           ("o" "�" :string)
-           ("d" "�" :string)
-           ("h" "�" :string)
-           ("U" "�" :string)
-           ("Z" "�" :string)
-           ("g" "�" :string)
+           ("k" "�" :string)
+           ("X" "�" :string)
+           ("G" "�" :string)
+           ("S" "�" :string)
            ("z" "�" :string)
-           ("J" "�" :string)
-           ("B" "�" :string)
+           ("v" "�" :string)
            ("j" "�" :string)
            ("L" "�" :string)
-           ("a" "�" :string)
+           ("I" "�" :string)
+           ("c" "�" :string)
+           ("i" "�" :string)
+           ("K" "�" :string)
+           ("O" "�" :string)
            ("p" "�" :string)
-           ("X" "�" :string)
-           ("M" "�" :string)
-           ("G" "�" :string)
+           ("R" "�" :string)
+           ("B" "�" :string)
+           ("o" "�" :string)
+           ("n" "�" :string)
+           ("J" "�" :string)
+           ("Y" "�" :string)
+           ("s" "�" :string)
+           ("y" "�" :string)
+           ("m" "�" :string)
+           ("F" "�" :string)
+           ("t" "�" :string)
+           ("W" "�" :string)
+           ("b" "�" :string)
+           ("g" "�" :string)
+           ("l" "�" :string)
            ("w" "�" :string)
+           ("x" "�" :string)
            ("C" "�" :string)
-           ("k" "�" :string)
+           ("d" "�" :string)
+           ("H" "�" :string)
+           ("f" "�" :string)
            ("N" "�" :string)
-           ("S" "�" :string)
-           ("u" "�" :string)
-           ("P" "�" :string)
-           ("e" "�" :string)
-           ("x" "�" :string)
-           ("Y" "�" :string)
            ("q" "�" :string)
-           ("m" "�" :string)
-           ("s" "�" :string)
-           ("l" "�" :string)
+           ("h" "�" :string)
+           ("D" "�" :string)
+           ("Z" "�" :string)
+           ("u" "�" :string)
+           ("a" "�" :string)
+           ("T" "�" :string)
            ("E" "�" :string)
-           ("b" "�" :string)
-           ("O" "�" :string)
-           ("I" "�" :string)
-           ("Q" "�" :string)
-           ("W" "�" :string)
+           ("e" "�" :string)
            ("A" "�" :string)
-           ("i" "�" :string)
-           ("c" "�" :string)
+           ("U" "�" :string)
+           ("M" "�" :string)
+           ("V" "�" :string)
            ))
 
 (define-rule-set "sk-resolve-case"
 
   :rules  (("CH" "7" :string)
+           ("Í" "8" :string)
+           ("Ô" "8" :string)
+           ("Ý" "8" :string)
            ("Ň" "8" :string)
-           ("Ŕ" "8" :string)
+           ("Ľ" "8" :string)
+           ("Š" "8" :string)
+           ("É" "8" :string)
+           ("Č" "8" :string)
            ("Ch" "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)
-           ("ch" "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)
+           ("ch" "9" :string)
            ("ň" "9" :string)
-           ("ú" "9" :string)
+           ("ä" "9" :string)
+           ("ť" "9" :string)
+           ("ý" "9" :string)
+           ("ř" "9" :string)
            ("ß" "99" :string)
-           ("E" "8" :string)
-           ("O" "8" :string)
-           ("I" "8" :string)
-           ("Q" "8" :string)
-           ("W" "8" :string)
-           ("A" "8" :string)
-           ("X" "8" :string)
-           ("G" "8" :string)
-           ("M" "8" :string)
-           ("C" "8" :string)
            ("S" "8" :string)
-           ("N" "8" :string)
+           ("G" "8" :string)
+           ("L" "8" :string)
+           ("Q" "8" :string)
            ("P" "8" :string)
+           ("X" "8" :string)
+           ("B" "8" :string)
            ("Y" "8" :string)
-           ("Z" "8" :string)
-           ("U" "8" :string)
            ("J" "8" :string)
-           ("B" "8" :string)
-           ("L" "8" :string)
-           ("F" "8" :string)
+           ("I" "8" :string)
+           ("R" "8" :string)
+           ("O" "8" :string)
            ("K" "8" :string)
-           ("V" "8" :string)
-           ("D" "8" :string)
+           ("C" "8" :string)
+           ("W" "8" :string)
            ("H" "8" :string)
-           ("R" "8" :string)
+           ("F" "8" :string)
+           ("A" "8" :string)
+           ("U" "8" :string)
+           ("V" "8" :string)
+           ("M" "8" :string)
+           ("N" "8" :string)
+           ("E" "8" :string)
            ("T" "8" :string)
-           ("s" "9" :string)
-           ("l" "9" :string)
+           ("Z" "8" :string)
+           ("D" "8" :string)
+           ("z" "9" :string)
+           ("j" "9" :string)
+           ("v" "9" :string)
+           ("r" "9" :string)
+           ("k" "9" :string)
+           ("o" "9" :string)
+           ("y" "9" :string)
            ("m" "9" :string)
-           ("b" "9" :string)
+           ("s" "9" :string)
+           ("n" "9" :string)
            ("c" "9" :string)
            ("i" "9" :string)
            ("p" "9" :string)
-           ("w" "9" :string)
-           ("k" "9" :string)
-           ("u" "9" :string)
+           ("d" "9" :string)
            ("x" "9" :string)
+           ("l" "9" :string)
+           ("w" "9" :string)
+           ("b" "9" :string)
+           ("g" "9" :string)
+           ("f" "9" :string)
+           ("t" "9" :string)
            ("e" "9" :string)
-           ("q" "9" :string)
-           ("d" "9" :string)
            ("h" "9" :string)
-           ("z" "9" :string)
-           ("g" "9" :string)
-           ("j" "9" :string)
+           ("q" "9" :string)
+           ("u" "9" :string)
            ("a" "9" :string)
-           ("t" "9" :string)
-           ("y" "9" :string)
-           ("r" "9" :string)
-           ("f" "9" :string)
-           ("v" "9" :string)
-           ("o" "9" :string)
-           ("n" "9" :string)
            ))
 
 (define-rule-set "sk-ignore-special"
 
-  :rules  (("." "" :string)
-           ("?" "" :string)
-           ("-" "" :string)
+  :rules  (("-" "" :string)
            ("'" "" :string)
            ("!" "" :string)
+           ("." "" :string)
+           ("?" "" :string)
            ))
 
 (define-rule-set "sk-resolve-special"
 
   :rules  (("Ĺ" "�" :string)
-           ("ť" "�" :string)
-           ("š" "�" :string)
-           ("É" "�" :string)
-           ("á" "�" :string)
+           ("Ž" "�" :string)
            ("ľ" "�" :string)
-           ("Ä" "�" :string)
-           ("ž" "�" :string)
-           ("Ť" "�" :string)
-           ("ŕ" "�" :string)
+           ("í" "�" :string)
+           ("é" "�" :string)
            ("Ř" "�" :string)
-           ("ch" "�" :string)
-           ("ô" "�" :string)
-           ("ä" "�" :string)
-           ("Č" "�" :string)
            ("Á" "�" :string)
+           ("Ä" "�" :string)
+           ("ch" "�" :string)
            ("Ď" "�" :string)
-           ("Ó" "�" :string)
-           ("Ch" "�" :string)
-           ("č" "�" :string)
            ("Ŕ" "�" :string)
-           ("CH" "�" :string)
-           ("Ň" "�" :string)
-           ("ř" "�" :string)
-           ("Ô" "�" :string)
-           ("ú" "�" :string)
-           ("Ú" "�" :string)
-           ("Ľ" "�" :string)
            ("ň" "�" :string)
+           ("Ú" "�" :string)
+           ("ť" "�" :string)
+           ("ä" "�" :string)
+           ("ř" "�" :string)
            ("ý" "�" :string)
-           ("ĺ" "�" :string)
-           ("Š" "�" :string)
+           ("Ô" "�" :string)
            ("Ý" "�" :string)
-           ("é" "�" :string)
-           ("í" "�" :string)
+           ("Í" "�" :string)
+           ("Ľ" "�" :string)
+           ("Ň" "�" :string)
            ("ď" "�" :string)
-           ("Ž" "�" :string)
+           ("Š" "�" :string)
+           ("É" "�" :string)
            ("ó" "�" :string)
-           ("Í" "�" :string)
+           ("ĺ" "�" :string)
+           ("CH" "�" :string)
+           ("á" "�" :string)
+           ("Č" "�" :string)
+           ("Ó" "�" :string)
+           ("Ch" "�" :string)
+           ("ž" "�" :string)
+           ("ô" "�" :string)
+           ("š" "�" :string)
+           ("č" "�" :string)
+           ("Ť" "�" :string)
+           ("ú" "�" :string)
+           ("ŕ" "�" :string)
            ("ß" "��" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("q" "�" :string)
-           ("Y" "�" :string)
+           ("C" "�" :string)
            ("x" "�" :string)
+           ("d" "�" :string)
+           ("g" "�" :string)
+           ("W" "�" :string)
+           ("b" "�" :string)
+           ("w" "�" :string)
+           ("l" "�" :string)
+           ("f" "�" :string)
+           ("H" "�" :string)
+           ("F" "�" :string)
+           ("t" "�" :string)
+           ("U" "�" :string)
+           ("A" "�" :string)
            ("e" "�" :string)
-           ("P" "�" :string)
-           ("u" "�" :string)
+           ("V" "�" :string)
+           ("M" "�" :string)
            ("N" "�" :string)
+           ("q" "�" :string)
+           ("h" "�" :string)
+           ("T" "�" :string)
+           ("u" "�" :string)
+           ("a" "�" :string)
+           ("E" "�" :string)
+           ("D" "�" :string)
+           ("Z" "�" :string)
+           ("z" "�" :string)
+           ("G" "�" :string)
            ("S" "�" :string)
-           ("C" "�" :string)
+           ("L" "�" :string)
+           ("v" "�" :string)
+           ("j" "�" :string)
+           ("Q" "�" :string)
            ("k" "�" :string)
-           ("G" "�" :string)
-           ("w" "�" :string)
-           ("M" "�" :string)
-           ("p" "�" :string)
+           ("r" "�" :string)
+           ("P" "�" :string)
            ("X" "�" :string)
-           ("c" "�" :string)
-           ("i" "�" :string)
-           ("W" "�" :string)
-           ("A" "�" :string)
-           ("Q" "�" :string)
-           ("b" "�" :string)
-           ("I" "�" :string)
-           ("O" "�" :string)
-           ("E" "�" :string)
+           ("o" "�" :string)
+           ("B" "�" :string)
            ("s" "�" :string)
+           ("y" "�" :string)
            ("m" "�" :string)
-           ("l" "�" :string)
+           ("J" "�" :string)
            ("n" "�" :string)
-           ("o" "�" :string)
-           ("T" "�" :string)
+           ("Y" "�" :string)
+           ("i" "�" :string)
+           ("c" "�" :string)
+           ("I" "�" :string)
+           ("p" "�" :string)
+           ("O" "�" :string)
            ("R" "�" :string)
-           ("v" "�" :string)
-           ("y" "�" :string)
-           ("r" "�" :string)
-           ("H" "�" :string)
-           ("f" "�" :string)
-           ("D" "�" :string)
-           ("V" "�" :string)
            ("K" "�" :string)
-           ("t" "�" :string)
-           ("F" "�" :string)
-           ("L" "�" :string)
-           ("a" "�" :string)
-           ("j" "�" :string)
-           ("B" "�" :string)
-           ("J" "�" :string)
-           ("z" "�" :string)
-           ("g" "�" :string)
-           ("Z" "�" :string)
-           ("U" "�" :string)
-           ("h" "�" :string)
-           ("d" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/slovenian/cp1250.xdy b/Master/texmf-dist/xindy/modules/lang/slovenian/cp1250.xdy
index c1dd92f7850..bd27c735cf3 100644
--- a/Master/texmf-dist/xindy/modules/lang/slovenian/cp1250.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/slovenian/cp1250.xdy
@@ -33,52 +33,52 @@
 
 (define-rule-set "sl-alphabetize"
 
-  :rules  (("a" "�" :string)
-           ("A" "�" :string)
-           ("B" "�" :string)
+  :rules  (("A" "�" :string)
+           ("a" "�" :string)
            ("b" "�" :string)
+           ("B" "�" :string)
            ("c" "�" :string)
            ("C" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("D" "�" :string)
-           ("�" "�" :string)
-           ("d" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("e" "�" :string)
+           ("d" "�" :string)
+           ("�" "�" :string)
+           ("D" "�" :string)
            ("E" "�" :string)
-           ("F" "�" :string)
+           ("e" "�" :string)
            ("f" "�" :string)
+           ("F" "�" :string)
            ("G" "�" :string)
            ("g" "�" :string)
-           ("H" "�" :string)
            ("h" "�" :string)
-           ("i" "�" :string)
+           ("H" "�" :string)
            ("I" "�" :string)
+           ("i" "�" :string)
            ("J" "�" :string)
            ("j" "�" :string)
-           ("k" "�" :string)
            ("K" "�" :string)
-           ("l" "�" :string)
+           ("k" "�" :string)
            ("L" "�" :string)
-           ("M" "�" :string)
+           ("l" "�" :string)
            ("m" "�" :string)
+           ("M" "�" :string)
            ("n" "�" :string)
            ("N" "�" :string)
-           ("O" "�" :string)
            ("o" "�" :string)
+           ("O" "�" :string)
            ("p" "�" :string)
            ("P" "�" :string)
            ("Q" "�" :string)
            ("q" "�" :string)
            ("r" "�" :string)
            ("R" "�" :string)
-           ("s" "�" :string)
            ("S" "�" :string)
-           ("�" "�" :string)
+           ("s" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("T" "�" :string)
            ("t" "�" :string)
            ("U" "�" :string)
@@ -87,8 +87,8 @@
            ("v" "�" :string)
            ("W" "�" :string)
            ("w" "�" :string)
-           ("x" "�" :string)
            ("X" "�" :string)
+           ("x" "�" :string)
            ("Y" "�" :string)
            ("y" "�" :string)
            ("Z" "�" :string)
@@ -99,143 +99,143 @@
 
 (define-rule-set "sl-resolve-diacritics"
 
-  :rules  (("H" "�" :string)
-           ("S" "�" :string)
+  :rules  (("w" "�" :string)
+           ("H" "�" :string)
+           ("q" "�" :string)
+           ("P" "�" :string)
+           ("C" "�" :string)
+           ("l" "�" :string)
+           ("g" "�" :string)
+           ("M" "�" :string)
            ("�" "�" :string)
-           ("f" "�" :string)
-           ("o" "�" :string)
+           ("a" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("v" "�" :string)
+           ("x" "�" :string)
            ("y" "�" :string)
-           ("s" "�" :string)
-           ("t" "�" :string)
-           ("R" "�" :string)
+           ("B" "�" :string)
            ("�" "�" :string)
-           ("b" "�" :string)
-           ("j" "�" :string)
-           ("I" "�" :string)
-           ("m" "�" :string)
-           ("h" "�" :string)
            ("�" "�" :string)
-           ("u" "�" :string)
-           ("N" "�" :string)
-           ("E" "�" :string)
-           ("v" "�" :string)
-           ("d" "�" :string)
-           ("L" "�" :string)
-           ("a" "�" :string)
-           ("z" "�" :string)
-           ("V" "�" :string)
+           ("j" "�" :string)
            ("n" "�" :string)
-           ("C" "�" :string)
-           ("�" "�" :string)
-           ("i" "�" :string)
-           ("g" "�" :string)
-           ("U" "�" :string)
-           ("M" "�" :string)
+           ("o" "�" :string)
+           ("z" "�" :string)
+           ("W" "�" :string)
            ("F" "�" :string)
-           ("A" "�" :string)
-           ("e" "�" :string)
-           ("K" "�" :string)
+           ("D" "�" :string)
+           ("N" "�" :string)
+           ("V" "�" :string)
+           ("m" "�" :string)
            ("Y" "�" :string)
-           ("k" "�" :string)
-           ("Z" "�" :string)
-           ("X" "�" :string)
+           ("R" "�" :string)
+           ("b" "�" :string)
+           ("e" "�" :string)
+           ("O" "�" :string)
            ("T" "�" :string)
-           ("l" "�" :string)
-           ("w" "�" :string)
-           ("P" "�" :string)
+           ("L" "�" :string)
+           ("E" "�" :string)
+           ("u" "�" :string)
+           ("Z" "�" :string)
            ("p" "�" :string)
-           ("W" "�" :string)
-           ("x" "�" :string)
-           ("O" "�" :string)
-           ("J" "�" :string)
-           ("B" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("D" "�" :string)
-           ("Q" "�" :string)
            ("G" "�" :string)
-           ("q" "�" :string)
+           ("k" "�" :string)
+           ("X" "�" :string)
+           ("s" "�" :string)
+           ("h" "�" :string)
+           ("A" "�" :string)
+           ("i" "�" :string)
+           ("S" "�" :string)
+           ("t" "�" :string)
            ("c" "�" :string)
+           ("d" "�" :string)
+           ("�" "�" :string)
+           ("Q" "�" :string)
+           ("U" "�" :string)
+           ("f" "�" :string)
            ("r" "�" :string)
-           ("�" "�" :string)
+           ("I" "�" :string)
+           ("J" "�" :string)
+           ("K" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ))
 
 (define-rule-set "sl-resolve-case"
 
-  :rules  (("E" "8" :string)
-           ("V" "8" :string)
-           ("L" "8" :string)
-           ("�" "8" :string)
-           ("C" "8" :string)
-           ("U" "8" :string)
-           ("M" "8" :string)
+  :rules  (("W" "8" :string)
+           ("D" "8" :string)
            ("F" "8" :string)
-           ("�" "8" :string)
-           ("A" "8" :string)
-           ("S" "8" :string)
-           ("H" "8" :string)
-           ("R" "8" :string)
-           ("I" "8" :string)
            ("N" "8" :string)
-           ("J" "8" :string)
+           ("V" "8" :string)
            ("O" "8" :string)
-           ("W" "8" :string)
+           ("Y" "8" :string)
+           ("R" "8" :string)
+           ("H" "8" :string)
+           ("C" "8" :string)
+           ("P" "8" :string)
            ("�" "8" :string)
+           ("M" "8" :string)
+           ("�" "8" :string)
            ("B" "8" :string)
            ("�" "8" :string)
-           ("D" "8" :string)
-           ("G" "8" :string)
+           ("U" "8" :string)
+           ("�" "8" :string)
            ("Q" "8" :string)
-           ("Y" "8" :string)
+           ("I" "8" :string)
+           ("J" "8" :string)
            ("K" "8" :string)
-           ("�" "8" :string)
-           ("X" "8" :string)
+           ("E" "8" :string)
+           ("L" "8" :string)
            ("T" "8" :string)
            ("Z" "8" :string)
-           ("P" "8" :string)
-           ("d" "9" :string)
-           ("v" "9" :string)
+           ("G" "8" :string)
+           ("A" "8" :string)
+           ("X" "8" :string)
+           ("�" "8" :string)
+           ("S" "8" :string)
            ("n" "9" :string)
-           ("a" "9" :string)
+           ("o" "9" :string)
            ("z" "9" :string)
-           ("�" "9" :string)
+           ("m" "9" :string)
+           ("b" "9" :string)
+           ("e" "9" :string)
            ("g" "9" :string)
-           ("i" "9" :string)
+           ("l" "9" :string)
+           ("w" "9" :string)
+           ("q" "9" :string)
+           ("a" "9" :string)
            ("�" "9" :string)
-           ("s" "9" :string)
+           ("x" "9" :string)
            ("y" "9" :string)
-           ("t" "9" :string)
-           ("�" "9" :string)
-           ("f" "9" :string)
-           ("o" "9" :string)
-           ("m" "9" :string)
-           ("b" "9" :string)
+           ("v" "9" :string)
            ("j" "9" :string)
-           ("h" "9" :string)
-           ("u" "9" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
-           ("x" "9" :string)
-           ("p" "9" :string)
+           ("f" "9" :string)
+           ("�" "9" :string)
            ("r" "9" :string)
-           ("q" "9" :string)
-           ("c" "9" :string)
-           ("e" "9" :string)
-           ("k" "9" :string)
-           ("l" "9" :string)
            ("�" "9" :string)
-           ("w" "9" :string)
+           ("p" "9" :string)
+           ("k" "9" :string)
+           ("u" "9" :string)
+           ("h" "9" :string)
+           ("s" "9" :string)
+           ("t" "9" :string)
+           ("c" "9" :string)
+           ("d" "9" :string)
+           ("i" "9" :string)
            ))
 
 (define-rule-set "sl-ignore-special"
 
   :rules  (("." "" :string)
+           ("?" "" :string)
            ("-" "" :string)
-           ("!" "" :string)
            ("'" "" :string)
-           ("?" "" :string)
+           ("!" "" :string)
            ))
 
 (define-rule-set "sl-resolve-special"
@@ -243,68 +243,68 @@
   :rules  (("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("M" "�" :string)
-           ("A" "�" :string)
-           ("�" "�" :string)
+           ("D" "�" :string)
            ("F" "�" :string)
-           ("g" "�" :string)
-           ("n" "�" :string)
+           ("W" "�" :string)
            ("z" "�" :string)
-           ("v" "�" :string)
-           ("h" "�" :string)
-           ("I" "�" :string)
-           ("j" "�" :string)
-           ("R" "�" :string)
-           ("t" "�" :string)
-           ("�" "�" :string)
-           ("f" "�" :string)
            ("o" "�" :string)
-           ("S" "�" :string)
-           ("c" "�" :string)
-           ("�" "�" :string)
-           ("B" "�" :string)
            ("O" "�" :string)
-           ("p" "�" :string)
+           ("m" "�" :string)
+           ("e" "�" :string)
+           ("�" "�" :string)
+           ("l" "�" :string)
            ("w" "�" :string)
-           ("X" "�" :string)
-           ("T" "�" :string)
-           ("k" "�" :string)
+           ("q" "�" :string)
+           ("C" "�" :string)
+           ("j" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("B" "�" :string)
+           ("y" "�" :string)
+           ("v" "�" :string)
+           ("r" "�" :string)
            ("U" "�" :string)
            ("�" "�" :string)
-           ("i" "�" :string)
-           ("�" "�" :string)
-           ("C" "�" :string)
-           ("V" "�" :string)
+           ("K" "�" :string)
+           ("�" "�" :string)
+           ("Z" "�" :string)
+           ("G" "�" :string)
+           ("E" "�" :string)
            ("L" "�" :string)
-           ("a" "�" :string)
+           ("t" "�" :string)
            ("d" "�" :string)
-           ("E" "�" :string)
-           ("N" "�" :string)
-           ("u" "�" :string)
-           ("�" "�" :string)
-           ("m" "�" :string)
-           ("b" "�" :string)
-           ("y" "�" :string)
+           ("c" "�" :string)
+           ("i" "�" :string)
+           ("h" "�" :string)
            ("s" "�" :string)
+           ("n" "�" :string)
+           ("Y" "�" :string)
+           ("b" "�" :string)
+           ("R" "�" :string)
+           ("N" "�" :string)
+           ("V" "�" :string)
+           ("a" "�" :string)
+           ("�" "�" :string)
+           ("M" "�" :string)
            ("�" "�" :string)
+           ("g" "�" :string)
            ("H" "�" :string)
-           ("r" "�" :string)
-           ("G" "�" :string)
-           ("Q" "�" :string)
-           ("q" "�" :string)
-           ("D" "�" :string)
-           ("�" "�" :string)
+           ("P" "�" :string)
            ("x" "�" :string)
+           ("�" "�" :string)
+           ("I" "�" :string)
            ("J" "�" :string)
-           ("W" "�" :string)
-           ("�" "�" :string)
-           ("P" "�" :string)
-           ("l" "�" :string)
+           ("f" "�" :string)
+           ("�" "�" :string)
+           ("Q" "�" :string)
+           ("p" "�" :string)
+           ("k" "�" :string)
+           ("u" "�" :string)
+           ("T" "�" :string)
+           ("S" "�" :string)
+           ("A" "�" :string)
+           ("X" "�" :string)
            ("�" "�" :string)
-           ("Z" "�" :string)
-           ("K" "�" :string)
-           ("Y" "�" :string)
-           ("e" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/slovenian/latin2.xdy b/Master/texmf-dist/xindy/modules/lang/slovenian/latin2.xdy
index 042c6a2fdfd..9bc9cded03a 100644
--- a/Master/texmf-dist/xindy/modules/lang/slovenian/latin2.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/slovenian/latin2.xdy
@@ -39,34 +39,34 @@
            ("b" "�" :string)
            ("C" "�" :string)
            ("c" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("d" "�" :string)
+           ("�" "�" :string)
            ("D" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("d" "�" :string)
            ("e" "�" :string)
            ("E" "�" :string)
            ("F" "�" :string)
            ("f" "�" :string)
-           ("G" "�" :string)
            ("g" "�" :string)
-           ("h" "�" :string)
+           ("G" "�" :string)
            ("H" "�" :string)
-           ("i" "�" :string)
+           ("h" "�" :string)
            ("I" "�" :string)
-           ("j" "�" :string)
+           ("i" "�" :string)
            ("J" "�" :string)
-           ("K" "�" :string)
+           ("j" "�" :string)
            ("k" "�" :string)
-           ("L" "�" :string)
+           ("K" "�" :string)
            ("l" "�" :string)
-           ("m" "�" :string)
+           ("L" "�" :string)
            ("M" "�" :string)
-           ("N" "�" :string)
+           ("m" "�" :string)
            ("n" "�" :string)
+           ("N" "�" :string)
            ("O" "�" :string)
            ("o" "�" :string)
            ("P" "�" :string)
@@ -75,164 +75,164 @@
            ("Q" "�" :string)
            ("R" "�" :string)
            ("r" "�" :string)
-           ("S" "�" :string)
            ("s" "�" :string)
+           ("S" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("T" "�" :string)
            ("t" "�" :string)
+           ("T" "�" :string)
            ("u" "�" :string)
            ("U" "�" :string)
-           ("V" "�" :string)
            ("v" "�" :string)
+           ("V" "�" :string)
            ("w" "�" :string)
            ("W" "�" :string)
-           ("X" "�" :string)
            ("x" "�" :string)
+           ("X" "�" :string)
            ("y" "�" :string)
            ("Y" "�" :string)
            ("z" "�" :string)
            ("Z" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ))
 
 (define-rule-set "sl-resolve-diacritics"
 
-  :rules  (("I" "�" :string)
+  :rules  (("�" "�" :string)
+           ("V" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("L" "�" :string)
+           ("n" "�" :string)
+           ("D" "�" :string)
+           ("O" "�" :string)
+           ("Q" "�" :string)
+           ("R" "�" :string)
+           ("�" "�" :string)
+           ("Z" "�" :string)
+           ("r" "�" :string)
+           ("f" "�" :string)
            ("p" "�" :string)
+           ("X" "�" :string)
+           ("h" "�" :string)
+           ("N" "�" :string)
+           ("m" "�" :string)
+           ("i" "�" :string)
+           ("J" "�" :string)
+           ("j" "�" :string)
+           ("K" "�" :string)
+           ("U" "�" :string)
+           ("T" "�" :string)
+           ("F" "�" :string)
            ("o" "�" :string)
+           ("y" "�" :string)
+           ("b" "�" :string)
+           ("I" "�" :string)
+           ("w" "�" :string)
+           ("C" "�" :string)
+           ("k" "�" :string)
+           ("G" "�" :string)
+           ("�" "�" :string)
+           ("d" "�" :string)
            ("P" "�" :string)
-           ("r" "�" :string)
+           ("A" "�" :string)
            ("g" "�" :string)
-           ("R" "�" :string)
-           ("b" "�" :string)
-           ("Z" "�" :string)
-           ("t" "�" :string)
+           ("s" "�" :string)
+           ("H" "�" :string)
+           ("a" "�" :string)
+           ("B" "�" :string)
+           ("E" "�" :string)
            ("Y" "�" :string)
-           ("J" "�" :string)
-           ("i" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("M" "�" :string)
-           ("f" "�" :string)
-           ("n" "�" :string)
-           ("T" "�" :string)
-           ("�" "�" :string)
+           ("t" "�" :string)
+           ("x" "�" :string)
            ("l" "�" :string)
+           ("S" "�" :string)
            ("W" "�" :string)
+           ("v" "�" :string)
            ("c" "�" :string)
-           ("A" "�" :string)
            ("�" "�" :string)
-           ("z" "�" :string)
-           ("Q" "�" :string)
-           ("G" "�" :string)
-           ("L" "�" :string)
-           ("H" "�" :string)
-           ("d" "�" :string)
-           ("v" "�" :string)
-           ("m" "�" :string)
-           ("V" "�" :string)
-           ("�" "�" :string)
-           ("C" "�" :string)
-           ("E" "�" :string)
-           ("x" "�" :string)
-           ("y" "�" :string)
-           ("B" "�" :string)
-           ("q" "�" :string)
-           ("j" "�" :string)
            ("e" "�" :string)
-           ("�" "�" :string)
-           ("a" "�" :string)
-           ("k" "�" :string)
-           ("F" "�" :string)
-           ("s" "�" :string)
-           ("S" "�" :string)
-           ("U" "�" :string)
+           ("z" "�" :string)
            ("u" "�" :string)
-           ("w" "�" :string)
-           ("O" "�" :string)
-           ("X" "�" :string)
-           ("D" "�" :string)
-           ("N" "�" :string)
-           ("h" "�" :string)
-           ("K" "�" :string)
-           ("�" "�" :string)
+           ("q" "�" :string)
+           ("M" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ))
 
 (define-rule-set "sl-resolve-case"
 
-  :rules  (("U" "8" :string)
-           ("S" "8" :string)
-           ("�" "8" :string)
-           ("F" "8" :string)
-           ("N" "8" :string)
-           ("D" "8" :string)
+  :rules  (("N" "8" :string)
+           ("J" "8" :string)
+           ("U" "8" :string)
+           ("T" "8" :string)
            ("K" "8" :string)
-           ("O" "8" :string)
+           ("F" "8" :string)
+           ("Q" "8" :string)
+           ("R" "8" :string)
+           ("�" "8" :string)
+           ("Z" "8" :string)
            ("X" "8" :string)
-           ("H" "8" :string)
            ("L" "8" :string)
+           ("�" "8" :string)
+           ("O" "8" :string)
+           ("D" "8" :string)
+           ("�" "8" :string)
            ("V" "8" :string)
-           ("G" "8" :string)
            ("�" "8" :string)
-           ("Q" "8" :string)
            ("�" "8" :string)
-           ("B" "8" :string)
-           ("�" "8" :string)
-           ("C" "8" :string)
+           ("M" "8" :string)
            ("E" "8" :string)
-           ("�" "8" :string)
+           ("Y" "8" :string)
+           ("S" "8" :string)
            ("W" "8" :string)
-           ("M" "8" :string)
-           ("T" "8" :string)
+           ("P" "8" :string)
            ("A" "8" :string)
+           ("B" "8" :string)
+           ("H" "8" :string)
            ("I" "8" :string)
-           ("P" "8" :string)
-           ("Y" "8" :string)
-           ("Z" "8" :string)
-           ("J" "8" :string)
-           ("R" "8" :string)
-           ("s" "9" :string)
-           ("k" "9" :string)
-           ("a" "9" :string)
-           ("h" "9" :string)
-           ("w" "9" :string)
-           ("u" "9" :string)
-           ("d" "9" :string)
-           ("�" "9" :string)
+           ("G" "8" :string)
+           ("C" "8" :string)
            ("m" "9" :string)
-           ("v" "9" :string)
-           ("z" "9" :string)
-           ("y" "9" :string)
-           ("x" "9" :string)
+           ("h" "9" :string)
            ("j" "9" :string)
-           ("e" "9" :string)
-           ("q" "9" :string)
-           ("�" "9" :string)
-           ("l" "9" :string)
+           ("i" "9" :string)
+           ("o" "9" :string)
+           ("r" "9" :string)
+           ("�" "9" :string)
+           ("p" "9" :string)
            ("f" "9" :string)
-           ("�" "9" :string)
+           ("�" "9" :string)
            ("n" "9" :string)
+           ("�" "9" :string)
+           ("v" "9" :string)
            ("c" "9" :string)
-           ("r" "9" :string)
-           ("o" "9" :string)
-           ("p" "9" :string)
+           ("e" "9" :string)
+           ("z" "9" :string)
+           ("u" "9" :string)
+           ("q" "9" :string)
            ("t" "9" :string)
+           ("l" "9" :string)
+           ("x" "9" :string)
+           ("d" "9" :string)
+           ("�" "9" :string)
+           ("s" "9" :string)
+           ("g" "9" :string)
+           ("a" "9" :string)
            ("b" "9" :string)
-           ("�" "9" :string)
-           ("i" "9" :string)
+           ("y" "9" :string)
+           ("k" "9" :string)
+           ("w" "9" :string)
            ("�" "9" :string)
-           ("g" "9" :string)
            ))
 
 (define-rule-set "sl-ignore-special"
 
-  :rules  (("-" "" :string)
-           ("'" "" :string)
+  :rules  (("'" "" :string)
+           ("-" "" :string)
            ("?" "" :string)
            ("." "" :string)
            ("!" "" :string)
@@ -243,68 +243,68 @@
   :rules  (("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("O" "�" :string)
-           ("�" "�" :string)
-           ("a" "�" :string)
-           ("s" "�" :string)
-           ("C" "�" :string)
-           ("E" "�" :string)
-           ("B" "�" :string)
-           ("e" "�" :string)
-           ("�" "�" :string)
+           ("v" "�" :string)
+           ("�" "�" :string)
            ("z" "�" :string)
-           ("G" "�" :string)
-           ("L" "�" :string)
+           ("q" "�" :string)
+           ("u" "�" :string)
+           ("�" "�" :string)
+           ("M" "�" :string)
+           ("t" "�" :string)
+           ("S" "�" :string)
+           ("l" "�" :string)
            ("d" "�" :string)
-           ("m" "�" :string)
-           ("c" "�" :string)
-           ("A" "�" :string)
-           ("n" "�" :string)
-           ("�" "�" :string)
-           ("W" "�" :string)
+           ("�" "�" :string)
            ("g" "�" :string)
-           ("Z" "�" :string)
-           ("Y" "�" :string)
-           ("t" "�" :string)
-           ("J" "�" :string)
-           ("�" "�" :string)
+           ("s" "�" :string)
+           ("a" "�" :string)
+           ("H" "�" :string)
+           ("b" "�" :string)
+           ("I" "�" :string)
+           ("k" "�" :string)
+           ("C" "�" :string)
            ("�" "�" :string)
-           ("p" "�" :string)
-           ("r" "�" :string)
-           ("u" "�" :string)
-           ("w" "�" :string)
-           ("X" "�" :string)
-           ("D" "�" :string)
            ("N" "�" :string)
            ("h" "�" :string)
+           ("J" "�" :string)
+           ("i" "�" :string)
            ("K" "�" :string)
-           ("F" "�" :string)
-           ("k" "�" :string)
-           ("S" "�" :string)
-           ("U" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("o" "�" :string)
+           ("Q" "�" :string)
+           ("R" "�" :string)
+           ("r" "�" :string)
+           ("X" "�" :string)
+           ("p" "�" :string)
+           ("�" "�" :string)
+           ("L" "�" :string)
            ("�" "�" :string)
-           ("y" "�" :string)
+           ("V" "�" :string)
+           ("c" "�" :string)
+           ("e" "�" :string)
+           ("E" "�" :string)
+           ("Y" "�" :string)
            ("x" "�" :string)
-           ("q" "�" :string)
+           ("W" "�" :string)
+           ("P" "�" :string)
+           ("A" "�" :string)
+           ("B" "�" :string)
+           ("y" "�" :string)
+           ("G" "�" :string)
+           ("w" "�" :string)
+           ("m" "�" :string)
            ("j" "�" :string)
-           ("Q" "�" :string)
-           ("�" "�" :string)
+           ("T" "�" :string)
+           ("U" "�" :string)
+           ("F" "�" :string)
            ("�" "�" :string)
-           ("H" "�" :string)
-           ("v" "�" :string)
-           ("V" "�" :string)
-           ("M" "�" :string)
+           ("Z" "�" :string)
+           ("�" "�" :string)
            ("f" "�" :string)
-           ("T" "�" :string)
-           ("l" "�" :string)
-           ("R" "�" :string)
-           ("b" "�" :string)
-           ("i" "�" :string)
-           ("I" "�" :string)
-           ("o" "�" :string)
-           ("P" "�" :string)
+           ("�" "�" :string)
+           ("n" "�" :string)
+           ("O" "�" :string)
+           ("D" "�" :string)
+           ("�" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/slovenian/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/slovenian/utf8.xdy
index d5ed33a8b7f..81a3dfd7fa2 100644
--- a/Master/texmf-dist/xindy/modules/lang/slovenian/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/slovenian/utf8.xdy
@@ -35,36 +35,36 @@
 
   :rules  (("ḱ" "�" :string)
            ("Ḱ" "�" :string)
-           ("č" "�" :string)
-           ("ć" "�" :string)
            ("Ć" "�" :string)
+           ("ć" "�" :string)
+           ("č" "�" :string)
            ("Č" "�" :string)
-           ("đ" "�" :string)
            ("Đ" "�" :string)
+           ("đ" "�" :string)
+           ("Dz" "��" :string)
            ("dz" "��" :string)
            ("DZ" "��" :string)
-           ("Dz" "��" :string)
-           ("Dž" "��" :string)
            ("dž" "��" :string)
+           ("Dž" "��" :string)
            ("DŽ" "��" :string)
            ("Ǵ" "�" :string)
            ("ǵ" "�" :string)
            ("Lj" "��" :string)
-           ("LJ" "��" :string)
            ("lj" "��" :string)
+           ("LJ" "��" :string)
+           ("nj" "��" :string)
            ("Nj" "��" :string)
            ("NJ" "��" :string)
-           ("nj" "��" :string)
-           ("Š" "�" :string)
            ("š" "�" :string)
+           ("Š" "�" :string)
            ("Ž" "�" :string)
            ("ž" "�" :string)
            ("A" "�" :string)
            ("a" "�" :string)
-           ("B" "�" :string)
            ("b" "�" :string)
-           ("C" "�" :string)
+           ("B" "�" :string)
            ("c" "�" :string)
+           ("C" "�" :string)
            ("D" "�" :string)
            ("d" "�" :string)
            ("E" "�" :string)
@@ -77,8 +77,8 @@
            ("H" "�" :string)
            ("I" "�" :string)
            ("i" "�" :string)
-           ("j" "�" :string)
            ("J" "�" :string)
+           ("j" "�" :string)
            ("K" "�" :string)
            ("k" "�" :string)
            ("L" "�" :string)
@@ -89,286 +89,286 @@
            ("N" "�" :string)
            ("O" "�" :string)
            ("o" "�" :string)
-           ("P" "�" :string)
            ("p" "�" :string)
+           ("P" "�" :string)
            ("Q" "�" :string)
            ("q" "�" :string)
            ("r" "�" :string)
            ("R" "�" :string)
-           ("S" "�" :string)
            ("s" "�" :string)
+           ("S" "�" :string)
            ("t" "�" :string)
            ("T" "�" :string)
            ("u" "�" :string)
            ("U" "�" :string)
-           ("V" "�" :string)
            ("v" "�" :string)
+           ("V" "�" :string)
            ("W" "�" :string)
            ("w" "�" :string)
-           ("X" "�" :string)
            ("x" "�" :string)
+           ("X" "�" :string)
            ("y" "�" :string)
            ("Y" "�" :string)
-           ("Z" "�" :string)
            ("z" "�" :string)
+           ("Z" "�" :string)
            ))
 
 (define-rule-set "sl-resolve-diacritics"
 
   :rules  (("ḱ" "�" :string)
            ("Ḱ" "�" :string)
-           ("č" "�" :string)
-           ("Ž" "�" :string)
            ("ž" "�" :string)
-           ("Š" "�" :string)
+           ("Ž" "�" :string)
            ("š" "�" :string)
+           ("Š" "�" :string)
            ("Č" "�" :string)
-           ("ć" "�" :string)
-           ("Ǵ" "�" :string)
+           ("č" "�" :string)
            ("đ" "�" :string)
            ("Ć" "�" :string)
-           ("ǵ" "�" :string)
+           ("ć" "�" :string)
+           ("Ǵ" "�" :string)
            ("Đ" "�" :string)
-           ("Dž" "�" :string)
+           ("ǵ" "�" :string)
            ("Lj" "�" :string)
-           ("dz" "�" :string)
-           ("dž" "�" :string)
-           ("Nj" "�" :string)
            ("lj" "�" :string)
-           ("DŽ" "�" :string)
            ("nj" "�" :string)
-           ("Dz" "�" :string)
+           ("Dž" "�" :string)
            ("LJ" "�" :string)
+           ("dž" "�" :string)
            ("DZ" "�" :string)
+           ("DŽ" "�" :string)
+           ("dz" "�" :string)
+           ("Nj" "�" :string)
+           ("Dz" "�" :string)
            ("NJ" "�" :string)
-           ("h" "�" :string)
-           ("B" "�" :string)
-           ("C" "�" :string)
-           ("L" "�" :string)
-           ("O" "�" :string)
-           ("P" "�" :string)
-           ("j" "�" :string)
-           ("o" "�" :string)
-           ("r" "�" :string)
-           ("K" "�" :string)
+           ("z" "�" :string)
+           ("n" "�" :string)
            ("f" "�" :string)
-           ("b" "�" :string)
-           ("t" "�" :string)
-           ("D" "�" :string)
-           ("X" "�" :string)
-           ("x" "�" :string)
-           ("T" "�" :string)
+           ("E" "�" :string)
            ("Q" "�" :string)
-           ("J" "�" :string)
-           ("d" "�" :string)
-           ("R" "�" :string)
+           ("s" "�" :string)
+           ("O" "�" :string)
            ("p" "�" :string)
-           ("I" "�" :string)
-           ("Z" "�" :string)
-           ("n" "�" :string)
+           ("u" "�" :string)
+           ("x" "�" :string)
+           ("L" "�" :string)
+           ("b" "�" :string)
+           ("m" "�" :string)
+           ("K" "�" :string)
+           ("r" "�" :string)
+           ("X" "�" :string)
+           ("D" "�" :string)
+           ("G" "�" :string)
+           ("N" "�" :string)
+           ("o" "�" :string)
+           ("C" "�" :string)
+           ("a" "�" :string)
+           ("t" "�" :string)
+           ("l" "�" :string)
            ("A" "�" :string)
+           ("j" "�" :string)
            ("v" "�" :string)
-           ("V" "�" :string)
            ("k" "�" :string)
-           ("m" "�" :string)
-           ("a" "�" :string)
+           ("B" "�" :string)
+           ("T" "�" :string)
+           ("V" "�" :string)
+           ("I" "�" :string)
+           ("F" "�" :string)
+           ("c" "�" :string)
+           ("H" "�" :string)
+           ("R" "�" :string)
+           ("Z" "�" :string)
            ("U" "�" :string)
+           ("g" "�" :string)
+           ("h" "�" :string)
+           ("P" "�" :string)
+           ("w" "�" :string)
+           ("W" "�" :string)
+           ("S" "�" :string)
+           ("d" "�" :string)
+           ("J" "�" :string)
            ("Y" "�" :string)
-           ("G" "�" :string)
            ("y" "�" :string)
-           ("H" "�" :string)
-           ("u" "�" :string)
-           ("s" "�" :string)
-           ("S" "�" :string)
-           ("F" "�" :string)
-           ("N" "�" :string)
-           ("z" "�" :string)
-           ("i" "�" :string)
-           ("l" "�" :string)
-           ("e" "�" :string)
            ("q" "�" :string)
-           ("g" "�" :string)
            ("M" "�" :string)
-           ("E" "�" :string)
-           ("c" "�" :string)
-           ("W" "�" :string)
-           ("w" "�" :string)
+           ("e" "�" :string)
+           ("i" "�" :string)
            ))
 
 (define-rule-set "sl-resolve-case"
 
   :rules  (("Ḱ" "8" :string)
            ("ḱ" "9" :string)
-           ("Ž" "8" :string)
-           ("Š" "8" :string)
            ("Ǵ" "8" :string)
-           ("Ć" "8" :string)
            ("Đ" "8" :string)
+           ("Ž" "8" :string)
+           ("Ć" "8" :string)
            ("Č" "8" :string)
-           ("DŽ" "88" :string)
+           ("Š" "8" :string)
+           ("LJ" "88" :string)
            ("NJ" "88" :string)
            ("DZ" "88" :string)
-           ("LJ" "88" :string)
+           ("DŽ" "88" :string)
            ("Dž" "89" :string)
            ("Lj" "89" :string)
-           ("Nj" "89" :string)
            ("Dz" "89" :string)
-           ("č" "9" :string)
+           ("Nj" "89" :string)
            ("ć" "9" :string)
            ("ž" "9" :string)
+           ("š" "9" :string)
            ("đ" "9" :string)
+           ("č" "9" :string)
            ("ǵ" "9" :string)
-           ("š" "9" :string)
-           ("dz" "99" :string)
            ("dž" "99" :string)
-           ("nj" "99" :string)
            ("lj" "99" :string)
-           ("B" "8" :string)
-           ("O" "8" :string)
-           ("L" "8" :string)
-           ("C" "8" :string)
-           ("P" "8" :string)
+           ("nj" "99" :string)
+           ("dz" "99" :string)
            ("K" "8" :string)
-           ("X" "8" :string)
            ("D" "8" :string)
+           ("X" "8" :string)
+           ("G" "8" :string)
+           ("L" "8" :string)
            ("Q" "8" :string)
-           ("T" "8" :string)
+           ("O" "8" :string)
+           ("E" "8" :string)
+           ("Y" "8" :string)
+           ("M" "8" :string)
+           ("S" "8" :string)
            ("J" "8" :string)
+           ("Z" "8" :string)
+           ("U" "8" :string)
+           ("W" "8" :string)
+           ("P" "8" :string)
+           ("F" "8" :string)
            ("I" "8" :string)
            ("R" "8" :string)
+           ("H" "8" :string)
            ("V" "8" :string)
-           ("Z" "8" :string)
+           ("T" "8" :string)
+           ("B" "8" :string)
            ("A" "8" :string)
-           ("Y" "8" :string)
-           ("U" "8" :string)
-           ("H" "8" :string)
-           ("G" "8" :string)
-           ("S" "8" :string)
-           ("F" "8" :string)
            ("N" "8" :string)
-           ("W" "8" :string)
-           ("E" "8" :string)
-           ("M" "8" :string)
-           ("h" "9" :string)
-           ("o" "9" :string)
-           ("j" "9" :string)
+           ("C" "8" :string)
            ("r" "9" :string)
            ("b" "9" :string)
-           ("f" "9" :string)
+           ("m" "9" :string)
            ("x" "9" :string)
-           ("t" "9" :string)
-           ("d" "9" :string)
+           ("u" "9" :string)
            ("p" "9" :string)
-           ("k" "9" :string)
-           ("v" "9" :string)
+           ("s" "9" :string)
+           ("f" "9" :string)
            ("n" "9" :string)
-           ("a" "9" :string)
-           ("m" "9" :string)
-           ("u" "9" :string)
+           ("z" "9" :string)
+           ("q" "9" :string)
            ("y" "9" :string)
-           ("s" "9" :string)
-           ("l" "9" :string)
            ("i" "9" :string)
-           ("z" "9" :string)
            ("e" "9" :string)
+           ("d" "9" :string)
            ("w" "9" :string)
-           ("c" "9" :string)
-           ("q" "9" :string)
            ("g" "9" :string)
+           ("h" "9" :string)
+           ("c" "9" :string)
+           ("k" "9" :string)
+           ("l" "9" :string)
+           ("a" "9" :string)
+           ("t" "9" :string)
+           ("v" "9" :string)
+           ("j" "9" :string)
+           ("o" "9" :string)
            ))
 
 (define-rule-set "sl-ignore-special"
 
-  :rules  (("-" "" :string)
+  :rules  (("!" "" :string)
+           ("." "" :string)
            ("'" "" :string)
+           ("-" "" :string)
            ("?" "" :string)
-           ("." "" :string)
-           ("!" "" :string)
            ))
 
 (define-rule-set "sl-resolve-special"
 
   :rules  (("Ḱ" "�" :string)
            ("ḱ" "�" :string)
-           ("Š" "�" :string)
-           ("đ" "�" :string)
-           ("Ǵ" "�" :string)
-           ("Ć" "�" :string)
-           ("ǵ" "�" :string)
-           ("š" "�" :string)
-           ("Đ" "�" :string)
            ("Č" "�" :string)
            ("č" "�" :string)
+           ("ǵ" "�" :string)
+           ("Š" "�" :string)
            ("ć" "�" :string)
+           ("Ǵ" "�" :string)
+           ("Đ" "�" :string)
+           ("Ć" "�" :string)
            ("Ž" "�" :string)
            ("ž" "�" :string)
+           ("š" "�" :string)
+           ("đ" "�" :string)
            ("Dz" "��" :string)
-           ("nj" "��" :string)
+           ("NJ" "��" :string)
+           ("Nj" "��" :string)
+           ("DZ" "��" :string)
            ("DŽ" "��" :string)
+           ("dz" "��" :string)
+           ("dž" "��" :string)
            ("lj" "��" :string)
-           ("DZ" "��" :string)
-           ("NJ" "��" :string)
+           ("nj" "��" :string)
            ("LJ" "��" :string)
            ("Dž" "��" :string)
-           ("dz" "��" :string)
            ("Lj" "��" :string)
-           ("dž" "��" :string)
-           ("Nj" "��" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("I" "�" :string)
-           ("R" "�" :string)
-           ("p" "�" :string)
-           ("k" "�" :string)
-           ("V" "�" :string)
-           ("v" "�" :string)
-           ("A" "�" :string)
-           ("Z" "�" :string)
-           ("n" "�" :string)
-           ("U" "�" :string)
-           ("a" "�" :string)
+           ("S" "�" :string)
+           ("d" "�" :string)
+           ("J" "�" :string)
            ("Y" "�" :string)
-           ("m" "�" :string)
-           ("u" "�" :string)
-           ("H" "�" :string)
-           ("G" "�" :string)
+           ("q" "�" :string)
            ("y" "�" :string)
-           ("F" "�" :string)
-           ("S" "�" :string)
-           ("s" "�" :string)
-           ("l" "�" :string)
-           ("z" "�" :string)
-           ("N" "�" :string)
-           ("i" "�" :string)
            ("e" "�" :string)
            ("M" "�" :string)
-           ("E" "�" :string)
+           ("i" "�" :string)
+           ("I" "�" :string)
+           ("F" "�" :string)
            ("c" "�" :string)
+           ("H" "�" :string)
+           ("R" "�" :string)
+           ("U" "�" :string)
+           ("Z" "�" :string)
+           ("P" "�" :string)
            ("g" "�" :string)
-           ("q" "�" :string)
-           ("w" "�" :string)
+           ("h" "�" :string)
            ("W" "�" :string)
+           ("w" "�" :string)
+           ("k" "�" :string)
            ("B" "�" :string)
-           ("h" "�" :string)
-           ("L" "�" :string)
-           ("O" "�" :string)
+           ("V" "�" :string)
+           ("T" "�" :string)
+           ("N" "�" :string)
+           ("o" "�" :string)
            ("C" "�" :string)
+           ("a" "�" :string)
+           ("t" "�" :string)
+           ("l" "�" :string)
+           ("A" "�" :string)
            ("j" "�" :string)
-           ("o" "�" :string)
-           ("P" "�" :string)
-           ("r" "�" :string)
-           ("b" "�" :string)
-           ("f" "�" :string)
+           ("v" "�" :string)
            ("K" "�" :string)
-           ("x" "�" :string)
-           ("X" "�" :string)
-           ("t" "�" :string)
+           ("r" "�" :string)
+           ("G" "�" :string)
            ("D" "�" :string)
+           ("X" "�" :string)
+           ("x" "�" :string)
+           ("L" "�" :string)
+           ("m" "�" :string)
+           ("b" "�" :string)
+           ("s" "�" :string)
            ("Q" "�" :string)
-           ("T" "�" :string)
-           ("d" "�" :string)
-           ("J" "�" :string)
+           ("O" "�" :string)
+           ("p" "�" :string)
+           ("u" "�" :string)
+           ("z" "�" :string)
+           ("n" "�" :string)
+           ("f" "�" :string)
+           ("E" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/spanish/modern-latin1.xdy b/Master/texmf-dist/xindy/modules/lang/spanish/modern-latin1.xdy
index 8365f50d625..fd9cd7b8853 100644
--- a/Master/texmf-dist/xindy/modules/lang/spanish/modern-latin1.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/spanish/modern-latin1.xdy
@@ -31,8 +31,8 @@
 
 (define-rule-set "es-alphabetize"
 
-  :rules  (("�" "�" :string)
-           ("�" "�" :string)
+  :rules  (("�" "�" :string)
+           ("�" "�" :string)
            ("a" "�" :string)
            ("A" "�" :string)
            ("B" "�" :string)
@@ -41,286 +41,286 @@
            ("c" "�" :string)
            ("D" "�" :string)
            ("d" "�" :string)
-           ("E" "�" :string)
-           ("�" "�" :string)
            ("e" "�" :string)
+           ("�" "�" :string)
+           ("E" "�" :string)
            ("�" "�" :string)
            ("f" "�" :string)
            ("F" "�" :string)
-           ("G" "�" :string)
            ("g" "�" :string)
-           ("h" "�" :string)
+           ("G" "�" :string)
            ("H" "�" :string)
-           ("I" "�" :string)
+           ("h" "�" :string)
            ("�" "�" :string)
            ("i" "�" :string)
            ("�" "�" :string)
+           ("I" "�" :string)
            ("J" "�" :string)
            ("j" "�" :string)
-           ("K" "�" :string)
            ("k" "�" :string)
-           ("l" "�" :string)
+           ("K" "�" :string)
            ("L" "�" :string)
+           ("l" "�" :string)
            ("M" "�" :string)
            ("m" "�" :string)
-           ("N" "�" :string)
            ("n" "�" :string)
+           ("N" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
+           ("O" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("o" "�" :string)
-           ("O" "�" :string)
-           ("P" "�" :string)
+           ("�" "�" :string)
            ("p" "�" :string)
+           ("P" "�" :string)
            ("Q" "�" :string)
            ("q" "�" :string)
            ("R" "�" :string)
            ("r" "�" :string)
-           ("S" "�" :string)
            ("s" "�" :string)
+           ("S" "�" :string)
            ("�" "��" :string)
            ("t" "�" :string)
            ("T" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("U" "�" :string)
            ("u" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("v" "�" :string)
            ("V" "�" :string)
-           ("W" "�" :string)
+           ("v" "�" :string)
            ("w" "�" :string)
-           ("X" "�" :string)
+           ("W" "�" :string)
            ("x" "�" :string)
-           ("y" "�" :string)
+           ("X" "�" :string)
            ("Y" "�" :string)
-           ("z" "�" :string)
+           ("y" "�" :string)
            ("Z" "�" :string)
+           ("z" "�" :string)
            ))
 
 (define-rule-set "es-resolve-diacritics"
 
-  :rules  (("r" "�" :string)
-           ("L" "�" :string)
-           ("V" "�" :string)
-           ("m" "�" :string)
-           ("H" "�" :string)
-           ("M" "�" :string)
-           ("j" "�" :string)
+  :rules  (("f" "�" :string)
            ("k" "�" :string)
+           ("B" "�" :string)
            ("b" "�" :string)
-           ("F" "�" :string)
-           ("q" "�" :string)
-           ("n" "�" :string)
-           ("N" "�" :string)
-           ("d" "�" :string)
-           ("Y" "�" :string)
+           ("D" "�" :string)
            ("s" "�" :string)
-           ("�" "�" :string)
-           ("O" "�" :string)
+           ("w" "�" :string)
+           ("Y" "�" :string)
+           ("e" "�" :string)
+           ("V" "�" :string)
            ("x" "�" :string)
-           ("X" "�" :string)
            ("R" "�" :string)
-           ("u" "�" :string)
-           ("l" "�" :string)
-           ("i" "�" :string)
-           ("Z" "�" :string)
-           ("U" "�" :string)
-           ("h" "�" :string)
+           ("t" "�" :string)
+           ("L" "�" :string)
            ("g" "�" :string)
+           ("v" "�" :string)
+           ("M" "�" :string)
+           ("Z" "�" :string)
+           ("d" "�" :string)
+           ("O" "�" :string)
+           ("C" "�" :string)
+           ("S" "�" :string)
+           ("X" "�" :string)
+           ("l" "�" :string)
+           ("J" "�" :string)
            ("z" "�" :string)
-           ("f" "�" :string)
-           ("c" "�" :string)
-           ("D" "�" :string)
+           ("N" "�" :string)
+           ("m" "�" :string)
+           ("n" "�" :string)
+           ("j" "�" :string)
+           ("�" "�" :string)
            ("T" "�" :string)
-           ("w" "�" :string)
-           ("o" "�" :string)
-           ("K" "�" :string)
-           ("p" "�" :string)
-           ("e" "�" :string)
-           ("t" "�" :string)
+           ("Q" "�" :string)
+           ("r" "�" :string)
            ("y" "�" :string)
-           ("J" "�" :string)
-           ("B" "�" :string)
+           ("G" "�" :string)
+           ("K" "�" :string)
+           ("W" "�" :string)
+           ("h" "�" :string)
+           ("H" "�" :string)
+           ("c" "�" :string)
+           ("F" "�" :string)
+           ("U" "�" :string)
+           ("�" "�" :string)
            ("A" "�" :string)
-           ("Q" "�" :string)
+           ("o" "�" :string)
+           ("q" "�" :string)
+           ("u" "�" :string)
+           ("I" "�" :string)
+           ("i" "�" :string)
            ("P" "�" :string)
-           ("W" "�" :string)
            ("E" "�" :string)
            ("a" "�" :string)
-           ("I" "�" :string)
-           ("C" "�" :string)
-           ("v" "�" :string)
-           ("G" "�" :string)
-           ("S" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("p" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ))
 
 (define-rule-set "es-resolve-case"
 
-  :rules  (("�" "0" :string)
+  :rules  (("f" "0" :string)
+           ("k" "0" :string)
+           ("b" "0" :string)
+           ("�" "0" :string)
+           ("s" "0" :string)
            ("w" "0" :string)
-           ("o" "0" :string)
-           ("p" "0" :string)
            ("e" "0" :string)
-           ("y" "0" :string)
+           ("x" "0" :string)
            ("t" "0" :string)
+           ("g" "0" :string)
            ("�" "0" :string)
-           ("�" "0" :string)
-           ("�" "0" :string)
-           ("a" "0" :string)
            ("v" "0" :string)
+           ("d" "0" :string)
            ("�" "0" :string)
-           ("r" "0" :string)
-           ("j" "0" :string)
+           ("l" "0" :string)
+           ("z" "0" :string)
            ("m" "0" :string)
-           ("b" "0" :string)
-           ("k" "0" :string)
-           ("q" "0" :string)
            ("n" "0" :string)
+           ("j" "0" :string)
+           ("r" "0" :string)
+           ("�" "0" :string)
            ("�" "0" :string)
-           ("d" "0" :string)
-           ("s" "0" :string)
+           ("y" "0" :string)
+           ("h" "0" :string)
+           ("c" "0" :string)
+           ("�" "0" :string)
            ("�" "0" :string)
-           ("x" "0" :string)
+           ("q" "0" :string)
+           ("o" "0" :string)
            ("u" "0" :string)
            ("i" "0" :string)
-           ("l" "0" :string)
-           ("h" "0" :string)
-           ("g" "0" :string)
-           ("z" "0" :string)
-           ("f" "0" :string)
-           ("c" "0" :string)
+           ("a" "0" :string)
+           ("p" "0" :string)
            ("�" "00" :string)
-           ("D" "1" :string)
-           ("T" "1" :string)
-           ("K" "1" :string)
-           ("J" "1" :string)
            ("B" "1" :string)
-           ("A" "1" :string)
-           ("Q" "1" :string)
-           ("W" "1" :string)
-           ("P" "1" :string)
-           ("E" "1" :string)
-           ("I" "1" :string)
            ("�" "1" :string)
-           ("C" "1" :string)
-           ("�" "1" :string)
-           ("S" "1" :string)
-           ("G" "1" :string)
-           ("�" "1" :string)
-           ("�" "1" :string)
+           ("D" "1" :string)
+           ("�" "1" :string)
+           ("Y" "1" :string)
            ("V" "1" :string)
+           ("R" "1" :string)
+           ("�" "1" :string)
            ("L" "1" :string)
            ("M" "1" :string)
-           ("H" "1" :string)
-           ("F" "1" :string)
-           ("N" "1" :string)
-           ("�" "1" :string)
-           ("Y" "1" :string)
-           ("�" "1" :string)
+           ("Z" "1" :string)
            ("O" "1" :string)
+           ("C" "1" :string)
+           ("S" "1" :string)
            ("X" "1" :string)
-           ("R" "1" :string)
-           ("�" "1" :string)
-           ("Z" "1" :string)
+           ("J" "1" :string)
+           ("N" "1" :string)
+           ("�" "1" :string)
+           ("T" "1" :string)
+           ("Q" "1" :string)
+           ("G" "1" :string)
+           ("K" "1" :string)
+           ("W" "1" :string)
+           ("H" "1" :string)
            ("U" "1" :string)
+           ("F" "1" :string)
+           ("A" "1" :string)
+           ("�" "1" :string)
+           ("I" "1" :string)
+           ("�" "1" :string)
+           ("P" "1" :string)
+           ("E" "1" :string)
+           ("�" "1" :string)
            ))
 
 (define-rule-set "es-ignore-special"
 
-  :rules  (("?" "" :string)
+  :rules  (("�" "" :string)
+           ("?" "" :string)
+           ("." "" :string)
            ("!" "" :string)
-           ("�" "" :string)
            ("�" "" :string)
-           ("." "" :string)
            ("-" "" :string)
            ("'" "" :string)
            ))
 
 (define-rule-set "es-resolve-special"
 
-  :rules  (("�" "�" :string)
-           ("Y" "�" :string)
-           ("�" "�" :string)
-           ("s" "�" :string)
-           ("�" "�" :string)
-           ("N" "�" :string)
-           ("d" "�" :string)
-           ("�" "�" :string)
-           ("n" "�" :string)
-           ("q" "�" :string)
+  :rules  (("f" "�" :string)
            ("k" "�" :string)
+           ("B" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("D" "�" :string)
            ("b" "�" :string)
-           ("F" "�" :string)
-           ("H" "�" :string)
-           ("m" "�" :string)
-           ("j" "�" :string)
-           ("M" "�" :string)
-           ("L" "�" :string)
+           ("w" "�" :string)
+           ("�" "�" :string)
+           ("s" "�" :string)
+           ("Y" "�" :string)
+           ("e" "�" :string)
            ("V" "�" :string)
-           ("�" "�" :string)
-           ("r" "�" :string)
-           ("c" "�" :string)
-           ("f" "�" :string)
-           ("z" "�" :string)
+           ("t" "�" :string)
            ("g" "�" :string)
-           ("h" "�" :string)
-           ("U" "�" :string)
-           ("Z" "�" :string)
-           ("�" "�" :string)
-           ("i" "�" :string)
-           ("l" "�" :string)
-           ("u" "�" :string)
+           ("L" "�" :string)
+           ("�" "�" :string)
+           ("x" "�" :string)
            ("R" "�" :string)
+           ("�" "�" :string)
+           ("Z" "�" :string)
+           ("d" "�" :string)
+           ("v" "�" :string)
+           ("M" "�" :string)
+           ("C" "�" :string)
+           ("�" "�" :string)
+           ("S" "�" :string)
            ("X" "�" :string)
-           ("x" "�" :string)
            ("O" "�" :string)
-           ("�" "�" :string)
-           ("A" "�" :string)
-           ("B" "�" :string)
-           ("�" "�" :string)
-           ("t" "�" :string)
+           ("z" "�" :string)
+           ("l" "�" :string)
            ("J" "�" :string)
-           ("y" "�" :string)
-           ("p" "�" :string)
-           ("e" "�" :string)
-           ("K" "�" :string)
-           ("o" "�" :string)
-           ("w" "�" :string)
-           ("�" "�" :string)
            ("T" "�" :string)
-           ("D" "�" :string)
+           ("Q" "�" :string)
+           ("m" "�" :string)
+           ("N" "�" :string)
+           ("n" "�" :string)
+           ("j" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("r" "�" :string)
+           ("�" "�" :string)
+           ("W" "�" :string)
+           ("h" "�" :string)
+           ("H" "�" :string)
+           ("y" "�" :string)
            ("G" "�" :string)
-           ("�" "�" :string)
-           ("S" "�" :string)
-           ("�" "�" :string)
-           ("v" "�" :string)
-           ("C" "�" :string)
+           ("K" "�" :string)
+           ("c" "�" :string)
+           ("F" "�" :string)
+           ("U" "�" :string)
+           ("u" "�" :string)
+           ("�" "�" :string)
            ("I" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("A" "�" :string)
+           ("o" "�" :string)
+           ("q" "�" :string)
            ("E" "�" :string)
+           ("�" "�" :string)
            ("a" "�" :string)
-           ("�" "�" :string)
+           ("p" "�" :string)
+           ("i" "�" :string)
            ("P" "�" :string)
-           ("W" "�" :string)
-           ("Q" "�" :string)
            ("�" "��" :string)
            ("." "�" :string)
            ("-" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/spanish/modern-utf8.xdy b/Master/texmf-dist/xindy/modules/lang/spanish/modern-utf8.xdy
index d574ebe7625..bfda867ce94 100644
--- a/Master/texmf-dist/xindy/modules/lang/spanish/modern-utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/spanish/modern-utf8.xdy
@@ -33,39 +33,39 @@
 
   :rules  (("á" "�" :string)
            ("Á" "�" :string)
-           ("É" "�" :string)
            ("é" "�" :string)
+           ("É" "�" :string)
            ("í" "�" :string)
            ("Í" "�" :string)
-           ("Ñ" "�" :string)
            ("ñ" "�" :string)
+           ("Ñ" "�" :string)
            ("Ó" "�" :string)
            ("ó" "�" :string)
            ("ß" "��" :string)
+           ("Ú" "�" :string)
            ("ü" "�" :string)
            ("ú" "�" :string)
-           ("Ú" "�" :string)
            ("Ü" "�" :string)
-           ("a" "�" :string)
            ("A" "�" :string)
+           ("a" "�" :string)
            ("b" "�" :string)
            ("B" "�" :string)
-           ("c" "�" :string)
            ("C" "�" :string)
+           ("c" "�" :string)
            ("d" "�" :string)
            ("D" "�" :string)
-           ("e" "�" :string)
            ("E" "�" :string)
-           ("f" "�" :string)
+           ("e" "�" :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)
@@ -76,24 +76,24 @@
            ("N" "�" :string)
            ("o" "�" :string)
            ("O" "�" :string)
-           ("p" "�" :string)
            ("P" "�" :string)
-           ("Q" "�" :string)
+           ("p" "�" :string)
            ("q" "�" :string)
+           ("Q" "�" :string)
            ("R" "�" :string)
            ("r" "�" :string)
            ("S" "�" :string)
            ("s" "�" :string)
            ("T" "�" :string)
            ("t" "�" :string)
-           ("U" "�" :string)
            ("u" "�" :string)
+           ("U" "�" :string)
            ("V" "�" :string)
            ("v" "�" :string)
-           ("w" "�" :string)
            ("W" "�" :string)
-           ("X" "�" :string)
+           ("w" "�" :string)
            ("x" "�" :string)
+           ("X" "�" :string)
            ("Y" "�" :string)
            ("y" "�" :string)
            ("z" "�" :string)
@@ -102,144 +102,144 @@
 
 (define-rule-set "es-resolve-diacritics"
 
-  :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)
+           ("H" "�" :string)
+           ("p" "�" :string)
+           ("c" "�" :string)
+           ("D" "�" :string)
+           ("I" "�" :string)
            ("C" "�" :string)
+           ("k" "�" :string)
            ("q" "�" :string)
-           ("u" "�" :string)
-           ("l" "�" :string)
-           ("H" "�" :string)
-           ("F" "�" :string)
-           ("B" "�" :string)
-           ("N" "�" :string)
-           ("K" "�" :string)
-           ("t" "�" :string)
+           ("a" "�" :string)
+           ("S" "�" :string)
+           ("w" "�" :string)
+           ("f" "�" :string)
+           ("m" "�" :string)
+           ("G" "�" :string)
+           ("O" "�" :string)
            ("h" "�" :string)
+           ("K" "�" :string)
+           ("B" "�" :string)
+           ("Q" "�" :string)
            ("U" "�" :string)
-           ("T" "�" :string)
            ("s" "�" :string)
-           ("O" "�" :string)
-           ("Z" "�" :string)
-           ("n" "�" :string)
-           ("J" "�" :string)
-           ("x" "�" :string)
-           ("a" "�" :string)
-           ("A" "�" :string)
-           ("v" "�" :string)
-           ("m" "�" :string)
-           ("L" "�" :string)
-           ("r" "�" :string)
-           ("W" "�" :string)
+           ("l" "�" :string)
+           ("j" "�" :string)
            ("E" "�" :string)
-           ("I" "�" :string)
-           ("S" "�" :string)
-           ("y" "�" :string)
-           ("D" "�" :string)
+           ("e" "�" :string)
+           ("J" "�" :string)
+           ("u" "�" :string)
+           ("i" "�" :string)
+           ("M" "�" :string)
            ("V" "�" :string)
-           ("P" "�" :string)
+           ("n" "�" :string)
+           ("L" "�" :string)
            ("Y" "�" :string)
-           ("M" "�" :string)
+           ("z" "�" :string)
+           ("P" "�" :string)
            ("R" "�" :string)
-           ("i" "�" :string)
-           ("k" "�" :string)
-           ("b" "�" :string)
-           ("X" "�" :string)
-           ("Q" "�" :string)
-           ("d" "�" :string)
-           ("c" "�" :string)
-           ("G" "�" :string)
+           ("W" "�" :string)
+           ("F" "�" :string)
+           ("Z" "�" :string)
+           ("v" "�" :string)
            ("g" "�" :string)
-           ("f" "�" :string)
-           ("z" "�" :string)
-           ("w" "�" :string)
            ("o" "�" :string)
-           ("e" "�" :string)
-           ("p" "�" :string)
-           ("j" "�" :string)
+           ("y" "�" :string)
+           ("d" "�" :string)
+           ("t" "�" :string)
+           ("r" "�" :string)
+           ("N" "�" :string)
+           ("b" "�" :string)
+           ("X" "�" :string)
+           ("A" "�" :string)
+           ("x" "�" :string)
+           ("T" "�" :string)
            ))
 
 (define-rule-set "es-resolve-case"
 
-  :rules  (("é" "0" :string)
-           ("ñ" "0" :string)
-           ("ó" "0" :string)
-           ("í" "0" :string)
+  :rules  (("í" "0" :string)
+           ("é" "0" :string)
            ("á" "0" :string)
+           ("ñ" "0" :string)
            ("ü" "0" :string)
+           ("ó" "0" :string)
            ("ú" "0" :string)
            ("ß" "00" :string)
-           ("Í" "1" :string)
+           ("Ú" "1" :string)
            ("Ü" "1" :string)
-           ("Ñ" "1" :string)
            ("Á" "1" :string)
            ("É" "1" :string)
-           ("Ú" "1" :string)
+           ("Í" "1" :string)
            ("Ó" "1" :string)
-           ("q" "0" :string)
-           ("u" "0" :string)
-           ("l" "0" :string)
+           ("Ñ" "1" :string)
+           ("d" "0" :string)
+           ("y" "0" :string)
+           ("r" "0" :string)
            ("t" "0" :string)
-           ("h" "0" :string)
-           ("s" "0" :string)
-           ("n" "0" :string)
-           ("a" "0" :string)
-           ("x" "0" :string)
+           ("o" "0" :string)
+           ("g" "0" :string)
            ("v" "0" :string)
-           ("m" "0" :string)
-           ("r" "0" :string)
-           ("y" "0" :string)
-           ("i" "0" :string)
-           ("k" "0" :string)
+           ("x" "0" :string)
            ("b" "0" :string)
-           ("d" "0" :string)
-           ("c" "0" :string)
-           ("g" "0" :string)
-           ("f" "0" :string)
+           ("i" "0" :string)
+           ("u" "0" :string)
+           ("n" "0" :string)
            ("z" "0" :string)
-           ("w" "0" :string)
+           ("h" "0" :string)
+           ("m" "0" :string)
+           ("j" "0" :string)
            ("e" "0" :string)
-           ("o" "0" :string)
+           ("l" "0" :string)
+           ("s" "0" :string)
+           ("c" "0" :string)
            ("p" "0" :string)
-           ("j" "0" :string)
-           ("C" "1" :string)
-           ("H" "1" :string)
-           ("F" "1" :string)
-           ("B" "1" :string)
-           ("N" "1" :string)
-           ("K" "1" :string)
-           ("U" "1" :string)
-           ("T" "1" :string)
-           ("O" "1" :string)
+           ("w" "0" :string)
+           ("f" "0" :string)
+           ("a" "0" :string)
+           ("q" "0" :string)
+           ("k" "0" :string)
            ("Z" "1" :string)
-           ("J" "1" :string)
            ("A" "1" :string)
-           ("L" "1" :string)
-           ("W" "1" :string)
-           ("E" "1" :string)
-           ("I" "1" :string)
-           ("S" "1" :string)
-           ("D" "1" :string)
+           ("T" "1" :string)
+           ("N" "1" :string)
+           ("X" "1" :string)
+           ("M" "1" :string)
            ("V" "1" :string)
-           ("P" "1" :string)
+           ("J" "1" :string)
+           ("W" "1" :string)
+           ("F" "1" :string)
            ("Y" "1" :string)
-           ("M" "1" :string)
+           ("L" "1" :string)
+           ("P" "1" :string)
            ("R" "1" :string)
-           ("X" "1" :string)
            ("Q" "1" :string)
+           ("K" "1" :string)
+           ("B" "1" :string)
+           ("U" "1" :string)
+           ("O" "1" :string)
            ("G" "1" :string)
+           ("E" "1" :string)
+           ("C" "1" :string)
+           ("H" "1" :string)
+           ("I" "1" :string)
+           ("D" "1" :string)
+           ("S" "1" :string)
            ))
 
 (define-rule-set "es-ignore-special"
@@ -247,82 +247,82 @@
   :rules  (("¡" "" :string)
            ("¿" "" :string)
            ("-" "" :string)
-           ("." "" :string)
            ("?" "" :string)
            ("!" "" :string)
            ("'" "" :string)
+           ("." "" :string)
            ))
 
 (define-rule-set "es-resolve-special"
 
-  :rules  (("í" "�" :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)
-           ("D" "�" :string)
-           ("y" "�" :string)
-           ("k" "�" :string)
-           ("b" "�" :string)
-           ("M" "�" :string)
+           ("F" "�" :string)
+           ("W" "�" :string)
+           ("P" "�" :string)
+           ("z" "�" :string)
            ("R" "�" :string)
-           ("i" "�" :string)
+           ("L" "�" :string)
            ("Y" "�" :string)
-           ("P" "�" :string)
+           ("n" "�" :string)
+           ("M" "�" :string)
            ("V" "�" :string)
-           ("f" "�" :string)
-           ("G" "�" :string)
-           ("g" "�" :string)
+           ("i" "�" :string)
+           ("u" "�" :string)
+           ("J" "�" :string)
+           ("T" "�" :string)
+           ("x" "�" :string)
+           ("A" "�" :string)
+           ("b" "�" :string)
+           ("X" "�" :string)
+           ("N" "�" :string)
+           ("r" "�" :string)
+           ("t" "�" :string)
+           ("y" "�" :string)
            ("d" "�" :string)
+           ("g" "�" :string)
+           ("o" "�" :string)
+           ("v" "�" :string)
+           ("Z" "�" :string)
+           ("f" "�" :string)
+           ("w" "�" :string)
+           ("a" "�" :string)
+           ("S" "�" :string)
+           ("q" "�" :string)
+           ("k" "�" :string)
+           ("C" "�" :string)
+           ("I" "�" :string)
+           ("D" "�" :string)
            ("c" "�" :string)
-           ("X" "�" :string)
-           ("Q" "�" :string)
+           ("H" "�" :string)
            ("p" "�" :string)
-           ("j" "�" :string)
-           ("o" "�" :string)
            ("e" "�" :string)
-           ("w" "�" :string)
-           ("z" "�" :string)
-           ("F" "�" :string)
+           ("E" "�" :string)
+           ("j" "�" :string)
            ("l" "�" :string)
-           ("H" "�" :string)
-           ("u" "�" :string)
-           ("C" "�" :string)
-           ("q" "�" :string)
-           ("t" "�" :string)
+           ("s" "�" :string)
+           ("U" "�" :string)
+           ("Q" "�" :string)
            ("h" "�" :string)
            ("K" "�" :string)
            ("B" "�" :string)
-           ("N" "�" :string)
-           ("x" "�" :string)
-           ("A" "�" :string)
-           ("a" "�" :string)
-           ("v" "�" :string)
-           ("Z" "�" :string)
-           ("n" "�" :string)
-           ("J" "�" :string)
-           ("U" "�" :string)
-           ("T" "�" :string)
-           ("s" "�" :string)
+           ("G" "�" :string)
            ("O" "�" :string)
-           ("I" "�" :string)
-           ("S" "�" :string)
-           ("r" "�" :string)
-           ("W" "�" :string)
-           ("E" "�" :string)
-           ("L" "�" :string)
            ("m" "�" :string)
            ("." "�" :string)
            ("-" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/spanish/traditional-latin1.xdy b/Master/texmf-dist/xindy/modules/lang/spanish/traditional-latin1.xdy
index 04a08033804..102adf790f9 100644
--- a/Master/texmf-dist/xindy/modules/lang/spanish/traditional-latin1.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/spanish/traditional-latin1.xdy
@@ -39,65 +39,65 @@
            ("LL" "�" :string)
            ("ll" "�" :string)
            ("Ll" "�" :string)
+           ("a" "�" :string)
+           ("A" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("A" "�" :string)
-           ("a" "�" :string)
-           ("b" "�" :string)
            ("B" "�" :string)
+           ("b" "�" :string)
            ("C" "�" :string)
            ("c" "�" :string)
            ("d" "�" :string)
            ("D" "�" :string)
+           ("�" "�" :string)
+           ("E" "�" :string)
            ("e" "�" :string)
            ("�" "�" :string)
-           ("E" "�" :string)
-           ("�" "�" :string)
            ("f" "�" :string)
            ("F" "�" :string)
            ("g" "�" :string)
            ("G" "�" :string)
-           ("H" "�" :string)
            ("h" "�" :string)
-           ("�" "�" :string)
+           ("H" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("i" "�" :string)
            ("I" "�" :string)
-           ("J" "�" :string)
            ("j" "�" :string)
+           ("J" "�" :string)
            ("k" "�" :string)
            ("K" "�" :string)
-           ("l" "�" :string)
            ("L" "�" :string)
-           ("m" "�" :string)
+           ("l" "�" :string)
            ("M" "�" :string)
-           ("N" "�" :string)
+           ("m" "�" :string)
            ("n" "�" :string)
-           ("�" "�" :string)
+           ("N" "�" :string)
            ("�" "�" :string)
-           ("o" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("O" "�" :string)
-           ("P" "�" :string)
+           ("�" "�" :string)
+           ("o" "�" :string)
            ("p" "�" :string)
-           ("Q" "�" :string)
+           ("P" "�" :string)
            ("q" "�" :string)
-           ("R" "�" :string)
+           ("Q" "�" :string)
            ("r" "�" :string)
-           ("s" "�" :string)
+           ("R" "�" :string)
            ("S" "�" :string)
+           ("s" "�" :string)
            ("�" "��" :string)
            ("T" "�" :string)
            ("t" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("U" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("u" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("v" "�" :string)
            ("V" "�" :string)
+           ("v" "�" :string)
            ("W" "�" :string)
            ("w" "�" :string)
            ("x" "�" :string)
@@ -110,78 +110,78 @@
 
 (define-rule-set "es-resolve-diacritics"
 
-  :rules  (("Ch" "�" :string)
-           ("ll" "�" :string)
-           ("ch" "�" :string)
-           ("CH" "�" :string)
+  :rules  (("ll" "�" :string)
+           ("Ch" "�" :string)
            ("LL" "�" :string)
+           ("CH" "�" :string)
+           ("ch" "�" :string)
            ("Ll" "�" :string)
-           ("Y" "�" :string)
-           ("v" "�" :string)
-           ("Z" "�" :string)
-           ("y" "�" :string)
-           ("m" "�" :string)
-           ("r" "�" :string)
-           ("f" "�" :string)
-           ("H" "�" :string)
-           ("k" "�" :string)
-           ("M" "�" :string)
-           ("R" "�" :string)
-           ("e" "�" :string)
-           ("o" "�" :string)
-           ("P" "�" :string)
-           ("g" "�" :string)
+           ("L" "�" :string)
+           ("p" "�" :string)
+           ("O" "�" :string)
+           ("q" "�" :string)
+           ("I" "�" :string)
+           ("j" "�" :string)
+           ("�" "�" :string)
            ("s" "�" :string)
-           ("J" "�" :string)
-           ("l" "�" :string)
-           ("S" "�" :string)
-           ("n" "�" :string)
-           ("E" "�" :string)
-           ("�" "�" :string)
+           ("k" "�" :string)
            ("d" "�" :string)
-           ("C" "�" :string)
-           ("G" "�" :string)
-           ("N" "�" :string)
+           ("D" "�" :string)
+           ("K" "�" :string)
+           ("r" "�" :string)
+           ("a" "�" :string)
+           ("g" "�" :string)
+           ("T" "�" :string)
+           ("Z" "�" :string)
+           ("f" "�" :string)
+           ("F" "�" :string)
+           ("h" "�" :string)
            ("W" "�" :string)
+           ("w" "�" :string)
+           ("S" "�" :string)
            ("x" "�" :string)
            ("A" "�" :string)
-           ("Q" "�" :string)
-           ("u" "�" :string)
-           ("h" "�" :string)
-           ("w" "�" :string)
-           ("L" "�" :string)
+           ("G" "�" :string)
+           ("t" "�" :string)
            ("U" "�" :string)
-           ("K" "�" :string)
+           ("i" "�" :string)
            ("c" "�" :string)
+           ("�" "�" :string)
+           ("V" "�" :string)
+           ("u" "�" :string)
+           ("v" "�" :string)
+           ("P" "�" :string)
+           ("Q" "�" :string)
+           ("o" "�" :string)
+           ("J" "�" :string)
+           ("N" "�" :string)
            ("X" "�" :string)
-           ("D" "�" :string)
+           ("y" "�" :string)
+           ("m" "�" :string)
            ("B" "�" :string)
-           ("I" "�" :string)
-           ("F" "�" :string)
-           ("V" "�" :string)
+           ("R" "�" :string)
+           ("l" "�" :string)
+           ("Y" "�" :string)
+           ("M" "�" :string)
+           ("C" "�" :string)
+           ("H" "�" :string)
+           ("n" "�" :string)
            ("z" "�" :string)
-           ("�" "�" :string)
-           ("O" "�" :string)
-           ("j" "�" :string)
-           ("T" "�" :string)
            ("b" "�" :string)
-           ("i" "�" :string)
-           ("t" "�" :string)
-           ("p" "�" :string)
-           ("q" "�" :string)
-           ("a" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("E" "�" :string)
+           ("e" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ))
 
@@ -194,159 +194,159 @@
            ("LL" "2" :string)
            ("CH" "2" :string)
            ("d" "0" :string)
-           ("n" "0" :string)
-           ("�" "0" :string)
-           ("s" "0" :string)
-           ("g" "0" :string)
-           ("l" "0" :string)
-           ("e" "0" :string)
-           ("o" "0" :string)
            ("k" "0" :string)
-           ("v" "0" :string)
+           ("�" "0" :string)
+           ("s" "0" :string)
+           ("�" "0" :string)
            ("r" "0" :string)
-           ("f" "0" :string)
-           ("�" "0" :string)
-           ("y" "0" :string)
-           ("m" "0" :string)
+           ("�" "0" :string)
+           ("q" "0" :string)
            ("p" "0" :string)
-           ("b" "0" :string)
+           ("j" "0" :string)
            ("i" "0" :string)
            ("t" "0" :string)
+           ("f" "0" :string)
+           ("g" "0" :string)
            ("a" "0" :string)
-           ("q" "0" :string)
-           ("j" "0" :string)
-           ("�" "0" :string)
-           ("�" "0" :string)
-           ("z" "0" :string)
-           ("�" "0" :string)
-           ("�" "0" :string)
-           ("c" "0" :string)
-           ("�" "0" :string)
+           ("�" "0" :string)
+           ("x" "0" :string)
+           ("�" "0" :string)
            ("h" "0" :string)
            ("w" "0" :string)
+           ("�" "0" :string)
+           ("o" "0" :string)
+           ("y" "0" :string)
+           ("m" "0" :string)
+           ("�" "0" :string)
+           ("c" "0" :string)
+           ("v" "0" :string)
            ("u" "0" :string)
-           ("x" "0" :string)
+           ("z" "0" :string)
+           ("n" "0" :string)
+           ("e" "0" :string)
+           ("b" "0" :string)
+           ("l" "0" :string)
            ("�" "00" :string)
-           ("N" "1" :string)
-           ("G" "1" :string)
-           ("C" "1" :string)
-           ("W" "1" :string)
-           ("�" "1" :string)
            ("�" "1" :string)
-           ("�" "1" :string)
-           ("�" "1" :string)
-           ("E" "1" :string)
-           ("�" "1" :string)
-           ("S" "1" :string)
+           ("K" "1" :string)
+           ("D" "1" :string)
+           ("�" "1" :string)
+           ("O" "1" :string)
+           ("L" "1" :string)
            ("�" "1" :string)
-           ("J" "1" :string)
-           ("R" "1" :string)
-           ("P" "1" :string)
-           ("M" "1" :string)
-           ("Y" "1" :string)
-           ("H" "1" :string)
+           ("I" "1" :string)
+           ("G" "1" :string)
+           ("A" "1" :string)
+           ("U" "1" :string)
            ("Z" "1" :string)
            ("T" "1" :string)
-           ("O" "1" :string)
+           ("�" "1" :string)
+           ("S" "1" :string)
+           ("W" "1" :string)
            ("F" "1" :string)
+           ("�" "1" :string)
+           ("Q" "1" :string)
+           ("J" "1" :string)
+           ("X" "1" :string)
+           ("�" "1" :string)
+           ("N" "1" :string)
+           ("�" "1" :string)
+           ("P" "1" :string)
            ("V" "1" :string)
-           ("D" "1" :string)
+           ("H" "1" :string)
+           ("E" "1" :string)
+           ("R" "1" :string)
            ("B" "1" :string)
-           ("X" "1" :string)
-           ("I" "1" :string)
-           ("L" "1" :string)
-           ("K" "1" :string)
-           ("U" "1" :string)
-           ("�" "1" :string)
-           ("A" "1" :string)
-           ("Q" "1" :string)
+           ("C" "1" :string)
+           ("M" "1" :string)
+           ("Y" "1" :string)
            ))
 
 (define-rule-set "es-ignore-special"
 
-  :rules  (("!" "" :string)
-           ("�" "" :string)
+  :rules  (("�" "" :string)
+           ("." "" :string)
            ("?" "" :string)
            ("-" "" :string)
-           ("." "" :string)
-           ("�" "" :string)
+           ("�" "" :string)
            ("'" "" :string)
+           ("!" "" :string)
            ))
 
 (define-rule-set "es-resolve-special"
 
-  :rules  (("Ll" "�" :string)
+  :rules  (("Ch" "�" :string)
+           ("ll" "�" :string)
            ("LL" "�" :string)
-           ("CH" "�" :string)
            ("ch" "�" :string)
-           ("ll" "�" :string)
-           ("Ch" "�" :string)
-           ("t" "�" :string)
-           ("b" "�" :string)
-           ("i" "�" :string)
-           ("p" "�" :string)
-           ("q" "�" :string)
-           ("a" "�" :string)
-           ("�" "�" :string)
-           ("O" "�" :string)
+           ("CH" "�" :string)
+           ("Ll" "�" :string)
+           ("d" "�" :string)
+           ("k" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("T" "�" :string)
-           ("j" "�" :string)
-           ("F" "�" :string)
-           ("V" "�" :string)
-           ("z" "�" :string)
-           ("X" "�" :string)
-           ("B" "�" :string)
+           ("s" "�" :string)
+           ("K" "�" :string)
            ("D" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("r" "�" :string)
+           ("L" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("q" "�" :string)
+           ("�" "�" :string)
+           ("O" "�" :string)
+           ("p" "�" :string)
            ("I" "�" :string)
-           ("c" "�" :string)
-           ("�" "�" :string)
-           ("L" "�" :string)
-           ("U" "�" :string)
-           ("K" "�" :string)
+           ("j" "�" :string)
            ("A" "�" :string)
+           ("G" "�" :string)
+           ("U" "�" :string)
+           ("t" "�" :string)
+           ("i" "�" :string)
+           ("a" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("Q" "�" :string)
-           ("u" "�" :string)
-           ("w" "�" :string)
-           ("h" "�" :string)
+           ("Z" "�" :string)
+           ("f" "�" :string)
+           ("g" "�" :string)
+           ("T" "�" :string)
+           ("F" "�" :string)
            ("x" "�" :string)
-           ("G" "�" :string)
-           ("C" "�" :string)
-           ("N" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("W" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("E" "�" :string)
-           ("�" "�" :string)
-           ("d" "�" :string)
            ("S" "�" :string)
-           ("n" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("g" "�" :string)
-           ("s" "�" :string)
-           ("J" "�" :string)
-           ("l" "�" :string)
-           ("R" "�" :string)
+           ("W" "�" :string)
+           ("w" "�" :string)
+           ("h" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("o" "�" :string)
-           ("e" "�" :string)
-           ("P" "�" :string)
-           ("k" "�" :string)
-           ("M" "�" :string)
-           ("Y" "�" :string)
-           ("v" "�" :string)
-           ("Z" "�" :string)
+           ("Q" "�" :string)
+           ("J" "�" :string)
+           ("�" "�" :string)
+           ("N" "�" :string)
            ("m" "�" :string)
            ("y" "�" :string)
-           ("�" "�" :string)
+           ("X" "�" :string)
+           ("c" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("u" "�" :string)
+           ("V" "�" :string)
+           ("P" "�" :string)
+           ("v" "�" :string)
+           ("n" "�" :string)
            ("H" "�" :string)
-           ("f" "�" :string)
-           ("r" "�" :string)
+           ("z" "�" :string)
+           ("b" "�" :string)
+           ("e" "�" :string)
+           ("E" "�" :string)
+           ("B" "�" :string)
+           ("R" "�" :string)
+           ("Y" "�" :string)
+           ("l" "�" :string)
+           ("C" "�" :string)
+           ("M" "�" :string)
            ("�" "��" :string)
            ("." "�" :string)
            ("-" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/spanish/traditional-utf8.xdy b/Master/texmf-dist/xindy/modules/lang/spanish/traditional-utf8.xdy
index 9b2f0090c8e..38288d1316b 100644
--- a/Master/texmf-dist/xindy/modules/lang/spanish/traditional-utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/spanish/traditional-utf8.xdy
@@ -33,75 +33,75 @@
 
 (define-rule-set "es-alphabetize"
 
-  :rules  (("á" "�" :string)
-           ("Á" "�" :string)
-           ("ch" "�" :string)
+  :rules  (("Á" "�" :string)
+           ("á" "�" :string)
            ("CH" "�" :string)
            ("Ch" "�" :string)
+           ("ch" "�" :string)
            ("é" "�" :string)
            ("É" "�" :string)
-           ("Í" "�" :string)
            ("í" "�" :string)
+           ("Í" "�" :string)
            ("LL" "�" :string)
            ("Ll" "�" :string)
            ("ll" "�" :string)
-           ("Ñ" "�" :string)
            ("ñ" "�" :string)
+           ("Ñ" "�" :string)
            ("Ó" "�" :string)
            ("ó" "�" :string)
            ("ß" "��" :string)
            ("ü" "�" :string)
-           ("ú" "�" :string)
            ("Ú" "�" :string)
            ("Ü" "�" :string)
-           ("A" "�" :string)
+           ("ú" "�" :string)
            ("a" "�" :string)
-           ("b" "�" :string)
+           ("A" "�" :string)
            ("B" "�" :string)
+           ("b" "�" :string)
            ("c" "�" :string)
            ("C" "�" :string)
            ("D" "�" :string)
            ("d" "�" :string)
            ("e" "�" :string)
            ("E" "�" :string)
-           ("F" "�" :string)
            ("f" "�" :string)
+           ("F" "�" :string)
            ("G" "�" :string)
            ("g" "�" :string)
-           ("H" "�" :string)
            ("h" "�" :string)
-           ("I" "�" :string)
+           ("H" "�" :string)
            ("i" "�" :string)
-           ("J" "�" :string)
+           ("I" "�" :string)
            ("j" "�" :string)
-           ("k" "�" :string)
+           ("J" "�" :string)
            ("K" "�" :string)
-           ("L" "�" :string)
+           ("k" "�" :string)
            ("l" "�" :string)
+           ("L" "�" :string)
            ("m" "�" :string)
            ("M" "�" :string)
            ("n" "�" :string)
            ("N" "�" :string)
-           ("o" "�" :string)
            ("O" "�" :string)
-           ("P" "�" :string)
+           ("o" "�" :string)
            ("p" "�" :string)
-           ("Q" "�" :string)
+           ("P" "�" :string)
            ("q" "�" :string)
+           ("Q" "�" :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)
            ("W" "�" :string)
            ("w" "�" :string)
-           ("x" "�" :string)
            ("X" "�" :string)
+           ("x" "�" :string)
            ("y" "�" :string)
            ("Y" "�" :string)
            ("Z" "�" :string)
@@ -110,246 +110,246 @@
 
 (define-rule-set "es-resolve-diacritics"
 
-  :rules  (("ll" "�" :string)
+  :rules  (("Ñ" "�" :string)
            ("ñ" "�" :string)
-           ("CH" "�" :string)
+           ("ch" "�" :string)
            ("Ch" "�" :string)
-           ("Ñ" "�" :string)
+           ("CH" "�" :string)
            ("LL" "�" :string)
-           ("ch" "�" :string)
+           ("ll" "�" :string)
            ("Ll" "�" :string)
-           ("Á" "�" :string)
-           ("ó" "�" :string)
-           ("á" "�" :string)
-           ("Ó" "�" :string)
-           ("Í" "�" :string)
            ("é" "�" :string)
-           ("í" "�" :string)
            ("É" "�" :string)
+           ("Á" "�" :string)
            ("Ú" "�" :string)
            ("ú" "�" :string)
-           ("Ü" "�" :string)
+           ("á" "�" :string)
+           ("Ó" "�" :string)
+           ("í" "�" :string)
+           ("Í" "�" :string)
+           ("ó" "�" :string)
            ("ü" "�" :string)
+           ("Ü" "�" :string)
            ("ß" "�" :string)
-           ("U" "�" :string)
-           ("l" "�" :string)
-           ("B" "�" :string)
-           ("p" "�" :string)
-           ("m" "�" :string)
-           ("I" "�" :string)
-           ("H" "�" :string)
-           ("P" "�" :string)
-           ("g" "�" :string)
-           ("j" "�" :string)
-           ("T" "�" :string)
-           ("s" "�" :string)
-           ("C" "�" :string)
-           ("M" "�" :string)
-           ("h" "�" :string)
+           ("v" "�" :string)
+           ("W" "�" :string)
            ("i" "�" :string)
+           ("j" "�" :string)
+           ("U" "�" :string)
+           ("q" "�" :string)
            ("w" "�" :string)
-           ("N" "�" :string)
-           ("S" "�" :string)
+           ("r" "�" :string)
            ("c" "�" :string)
-           ("d" "�" :string)
-           ("O" "�" :string)
-           ("z" "�" :string)
-           ("L" "�" :string)
+           ("e" "�" :string)
+           ("C" "�" :string)
+           ("K" "�" :string)
+           ("s" "�" :string)
+           ("l" "�" :string)
+           ("t" "�" :string)
            ("y" "�" :string)
-           ("b" "�" :string)
+           ("h" "�" :string)
+           ("m" "�" :string)
+           ("R" "�" :string)
+           ("F" "�" :string)
+           ("f" "�" :string)
+           ("n" "�" :string)
+           ("H" "�" :string)
            ("a" "�" :string)
-           ("G" "�" :string)
+           ("V" "�" :string)
+           ("k" "�" :string)
            ("X" "�" :string)
-           ("Y" "�" :string)
+           ("D" "�" :string)
+           ("B" "�" :string)
+           ("O" "�" :string)
            ("u" "�" :string)
-           ("f" "�" :string)
-           ("R" "�" :string)
-           ("x" "�" :string)
-           ("q" "�" :string)
+           ("G" "�" :string)
+           ("P" "�" :string)
+           ("A" "�" :string)
+           ("Z" "�" :string)
            ("J" "�" :string)
-           ("F" "�" :string)
+           ("p" "�" :string)
+           ("x" "�" :string)
+           ("z" "�" :string)
+           ("M" "�" :string)
+           ("b" "�" :string)
+           ("L" "�" :string)
+           ("g" "�" :string)
+           ("T" "�" :string)
+           ("Q" "�" :string)
            ("o" "�" :string)
            ("E" "�" :string)
-           ("D" "�" :string)
-           ("k" "�" :string)
-           ("A" "�" :string)
-           ("Q" "�" :string)
-           ("r" "�" :string)
-           ("K" "�" :string)
-           ("n" "�" :string)
-           ("W" "�" :string)
-           ("V" "�" :string)
-           ("t" "�" :string)
-           ("e" "�" :string)
-           ("Z" "�" :string)
-           ("v" "�" :string)
+           ("I" "�" :string)
+           ("S" "�" :string)
+           ("d" "�" :string)
+           ("N" "�" :string)
+           ("Y" "�" :string)
            ))
 
 (define-rule-set "es-resolve-case"
 
-  :rules  (("á" "0" :string)
-           ("ó" "0" :string)
-           ("ú" "0" :string)
-           ("ü" "0" :string)
+  :rules  (("ñ" "0" :string)
            ("é" "0" :string)
+           ("ü" "0" :string)
+           ("ch" "0" :string)
+           ("ú" "0" :string)
+           ("á" "0" :string)
            ("í" "0" :string)
+           ("ó" "0" :string)
            ("ll" "0" :string)
-           ("ñ" "0" :string)
-           ("ch" "0" :string)
            ("ß" "00" :string)
-           ("Ó" "1" :string)
-           ("Ü" "1" :string)
            ("É" "1" :string)
+           ("Ñ" "1" :string)
            ("Ú" "1" :string)
-           ("Í" "1" :string)
            ("Ch" "1" :string)
            ("Á" "1" :string)
+           ("Ü" "1" :string)
+           ("Ó" "1" :string)
            ("Ll" "1" :string)
-           ("Ñ" "1" :string)
+           ("Í" "1" :string)
            ("CH" "2" :string)
            ("LL" "2" :string)
-           ("o" "0" :string)
            ("q" "0" :string)
-           ("x" "0" :string)
-           ("n" "0" :string)
-           ("r" "0" :string)
-           ("e" "0" :string)
            ("v" "0" :string)
-           ("t" "0" :string)
-           ("k" "0" :string)
-           ("s" "0" :string)
            ("i" "0" :string)
+           ("j" "0" :string)
+           ("e" "0" :string)
+           ("r" "0" :string)
            ("w" "0" :string)
+           ("c" "0" :string)
+           ("m" "0" :string)
+           ("y" "0" :string)
            ("h" "0" :string)
+           ("t" "0" :string)
            ("l" "0" :string)
-           ("p" "0" :string)
-           ("j" "0" :string)
-           ("g" "0" :string)
-           ("m" "0" :string)
+           ("s" "0" :string)
            ("a" "0" :string)
-           ("b" "0" :string)
+           ("n" "0" :string)
            ("f" "0" :string)
            ("u" "0" :string)
-           ("c" "0" :string)
-           ("y" "0" :string)
-           ("d" "0" :string)
+           ("k" "0" :string)
+           ("x" "0" :string)
+           ("p" "0" :string)
+           ("b" "0" :string)
            ("z" "0" :string)
-           ("F" "1" :string)
-           ("D" "1" :string)
-           ("E" "1" :string)
+           ("d" "0" :string)
+           ("o" "0" :string)
+           ("g" "0" :string)
+           ("U" "1" :string)
+           ("W" "1" :string)
            ("R" "1" :string)
-           ("J" "1" :string)
            ("K" "1" :string)
-           ("Q" "1" :string)
-           ("A" "1" :string)
-           ("Z" "1" :string)
-           ("V" "1" :string)
-           ("W" "1" :string)
            ("C" "1" :string)
-           ("T" "1" :string)
-           ("N" "1" :string)
-           ("M" "1" :string)
-           ("B" "1" :string)
-           ("U" "1" :string)
-           ("P" "1" :string)
-           ("I" "1" :string)
+           ("V" "1" :string)
            ("H" "1" :string)
+           ("F" "1" :string)
+           ("O" "1" :string)
+           ("B" "1" :string)
+           ("D" "1" :string)
            ("X" "1" :string)
+           ("J" "1" :string)
+           ("P" "1" :string)
            ("G" "1" :string)
+           ("A" "1" :string)
+           ("Z" "1" :string)
+           ("L" "1" :string)
+           ("M" "1" :string)
            ("Y" "1" :string)
+           ("N" "1" :string)
            ("S" "1" :string)
-           ("L" "1" :string)
-           ("O" "1" :string)
+           ("E" "1" :string)
+           ("I" "1" :string)
+           ("Q" "1" :string)
+           ("T" "1" :string)
            ))
 
 (define-rule-set "es-ignore-special"
 
   :rules  (("¿" "" :string)
            ("¡" "" :string)
-           ("!" "" :string)
-           ("." "" :string)
            ("?" "" :string)
            ("'" "" :string)
+           ("!" "" :string)
+           ("." "" :string)
            ("-" "" :string)
            ))
 
 (define-rule-set "es-resolve-special"
 
-  :rules  (("Í" "�" :string)
-           ("é" "�" :string)
-           ("í" "�" :string)
+  :rules  (("ñ" "�" :string)
            ("É" "�" :string)
-           ("Ú" "�" :string)
+           ("é" "�" :string)
+           ("Ñ" "�" :string)
            ("ü" "�" :string)
-           ("ú" "�" :string)
+           ("Ú" "�" :string)
+           ("CH" "�" :string)
+           ("Ch" "�" :string)
+           ("Á" "�" :string)
            ("Ü" "�" :string)
-           ("ó" "�" :string)
-           ("á" "�" :string)
-           ("Ó" "�" :string)
-           ("Ñ" "�" :string)
-           ("LL" "�" :string)
            ("ch" "�" :string)
+           ("ú" "�" :string)
+           ("LL" "�" :string)
+           ("Ó" "�" :string)
+           ("á" "�" :string)
+           ("í" "�" :string)
            ("Ll" "�" :string)
+           ("ó" "�" :string)
+           ("Í" "�" :string)
            ("ll" "�" :string)
-           ("ñ" "�" :string)
-           ("CH" "�" :string)
-           ("Á" "�" :string)
-           ("Ch" "�" :string)
            ("ß" "��" :string)
            ("¿" "�" :string)
            ("¡" "�" :string)
-           ("k" "�" :string)
-           ("Q" "�" :string)
-           ("r" "�" :string)
-           ("A" "�" :string)
-           ("K" "�" :string)
-           ("n" "�" :string)
-           ("V" "�" :string)
+           ("q" "�" :string)
+           ("U" "�" :string)
+           ("j" "�" :string)
+           ("i" "�" :string)
            ("W" "�" :string)
-           ("t" "�" :string)
-           ("e" "�" :string)
            ("v" "�" :string)
-           ("Z" "�" :string)
-           ("R" "�" :string)
-           ("x" "�" :string)
-           ("q" "�" :string)
-           ("J" "�" :string)
-           ("F" "�" :string)
-           ("o" "�" :string)
-           ("E" "�" :string)
-           ("D" "�" :string)
-           ("S" "�" :string)
+           ("e" "�" :string)
+           ("r" "�" :string)
+           ("w" "�" :string)
            ("c" "�" :string)
-           ("O" "�" :string)
-           ("d" "�" :string)
-           ("z" "�" :string)
-           ("L" "�" :string)
+           ("R" "�" :string)
+           ("m" "�" :string)
            ("y" "�" :string)
-           ("b" "�" :string)
+           ("h" "�" :string)
+           ("t" "�" :string)
+           ("l" "�" :string)
+           ("s" "�" :string)
+           ("K" "�" :string)
+           ("C" "�" :string)
+           ("V" "�" :string)
            ("a" "�" :string)
-           ("X" "�" :string)
-           ("G" "�" :string)
-           ("Y" "�" :string)
+           ("H" "�" :string)
+           ("n" "�" :string)
            ("f" "�" :string)
+           ("F" "�" :string)
            ("u" "�" :string)
+           ("O" "�" :string)
            ("B" "�" :string)
-           ("U" "�" :string)
-           ("l" "�" :string)
+           ("D" "�" :string)
+           ("X" "�" :string)
+           ("k" "�" :string)
+           ("x" "�" :string)
            ("p" "�" :string)
-           ("I" "�" :string)
-           ("m" "�" :string)
-           ("H" "�" :string)
-           ("j" "�" :string)
-           ("g" "�" :string)
+           ("J" "�" :string)
+           ("Z" "�" :string)
            ("P" "�" :string)
-           ("T" "�" :string)
-           ("s" "�" :string)
-           ("C" "�" :string)
+           ("A" "�" :string)
+           ("G" "�" :string)
+           ("L" "�" :string)
+           ("b" "�" :string)
            ("M" "�" :string)
-           ("h" "�" :string)
-           ("i" "�" :string)
+           ("z" "�" :string)
+           ("Y" "�" :string)
            ("N" "�" :string)
-           ("w" "�" :string)
+           ("d" "�" :string)
+           ("S" "�" :string)
+           ("I" "�" :string)
+           ("E" "�" :string)
+           ("o" "�" :string)
+           ("Q" "�" :string)
+           ("T" "�" :string)
+           ("g" "�" :string)
            ("." "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/swedish/cp1252.xdy b/Master/texmf-dist/xindy/modules/lang/swedish/cp1252.xdy
index 70c9387751d..6c68e7d1789 100644
--- a/Master/texmf-dist/xindy/modules/lang/swedish/cp1252.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/swedish/cp1252.xdy
@@ -32,350 +32,350 @@
 
 (define-rule-set "sv-alphabetize"
 
-  :rules  (("�" "�" :string)
-           ("�" "�" :string)
+  :rules  (("�" "�" :string)
+           ("�" "�" :string)
            ("A" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("a" "�" :string)
-           ("�" "�" :string)
-           ("B" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("b" "�" :string)
+           ("B" "�" :string)
+           ("C" "�" :string)
            ("�" "�" :string)
            ("c" "�" :string)
-           ("C" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("D" "�" :string)
            ("d" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("E" "�" :string)
-           ("e" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("e" "�" :string)
            ("�" "�" :string)
+           ("E" "�" :string)
            ("�" "�" :string)
-           ("F" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("f" "�" :string)
-           ("G" "�" :string)
+           ("F" "�" :string)
            ("g" "�" :string)
+           ("G" "�" :string)
            ("H" "�" :string)
            ("h" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("i" "�" :string)
            ("�" "�" :string)
-           ("I" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("i" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("I" "�" :string)
+           ("�" "�" :string)
            ("j" "�" :string)
            ("J" "�" :string)
-           ("K" "�" :string)
            ("k" "�" :string)
-           ("L" "�" :string)
+           ("K" "�" :string)
            ("l" "�" :string)
+           ("L" "�" :string)
            ("m" "�" :string)
            ("M" "�" :string)
-           ("�" "�" :string)
            ("N" "�" :string)
-           ("n" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("O" "�" :string)
-           ("o" "�" :string)
+           ("n" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("o" "�" :string)
+           ("�" "�" :string)
+           ("O" "�" :string)
+           ("�" "�" :string)
            ("P" "�" :string)
            ("p" "�" :string)
            ("Q" "�" :string)
            ("q" "�" :string)
            ("R" "�" :string)
            ("r" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("S" "�" :string)
+           ("�" "�" :string)
            ("s" "�" :string)
+           ("�" "�" :string)
            ("�" "��" :string)
-           ("t" "�" :string)
            ("T" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("t" "�" :string)
+           ("�" "�" :string)
            ("u" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("U" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("U" "�" :string)
+           ("v" "�" :string)
            ("V" "�" :string)
            ("W" "�" :string)
            ("w" "�" :string)
-           ("v" "�" :string)
-           ("x" "�" :string)
            ("X" "�" :string)
-           ("y" "�" :string)
-           ("Y" "�" :string)
-           ("�" "�" :string)
+           ("x" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("Y" "�" :string)
            ("�" "�" :string)
+           ("y" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("z" "�" :string)
            ("Z" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ))
 
 (define-rule-set "sv-resolve-diacritics"
 
-  :rules  (("I" "�" :string)
-           ("h" "�" :string)
-           ("u" "�" :string)
-           ("B" "�" :string)
-           ("�" "�" :string)
-           ("O" "�" :string)
-           ("R" "�" :string)
+  :rules  (("�" "�" :string)
+           ("P" "�" :string)
+           ("k" "�" :string)
            ("G" "�" :string)
-           ("S" "�" :string)
-           ("i" "�" :string)
+           ("u" "�" :string)
+           ("v" "�" :string)
+           ("Z" "�" :string)
+           ("e" "�" :string)
+           ("V" "�" :string)
            ("c" "�" :string)
+           ("o" "�" :string)
+           ("Q" "�" :string)
            ("�" "�" :string)
-           ("m" "�" :string)
            ("K" "�" :string)
-           ("P" "�" :string)
-           ("A" "�" :string)
-           ("Y" "�" :string)
-           ("Z" "�" :string)
-           ("�" "�" :string)
-           ("F" "�" :string)
-           ("y" "�" :string)
-           ("z" "�" :string)
+           ("s" "�" :string)
+           ("l" "�" :string)
+           ("C" "�" :string)
+           ("S" "�" :string)
+           ("N" "�" :string)
+           ("i" "�" :string)
+           ("f" "�" :string)
            ("H" "�" :string)
-           ("V" "�" :string)
-           ("x" "�" :string)
+           ("j" "�" :string)
+           ("L" "�" :string)
            ("X" "�" :string)
+           ("g" "�" :string)
+           ("�" "�" :string)
+           ("z" "�" :string)
+           ("F" "�" :string)
+           ("Y" "�" :string)
+           ("A" "�" :string)
+           ("R" "�" :string)
+           ("t" "�" :string)
+           ("h" "�" :string)
+           ("q" "�" :string)
            ("�" "�" :string)
+           ("J" "�" :string)
+           ("�" "�" :string)
+           ("U" "�" :string)
+           ("B" "�" :string)
+           ("r" "�" :string)
            ("n" "�" :string)
-           ("C" "�" :string)
-           ("v" "�" :string)
-           ("N" "�" :string)
-           ("e" "�" :string)
-           ("l" "�" :string)
            ("b" "�" :string)
+           ("O" "�" :string)
+           ("y" "�" :string)
            ("a" "�" :string)
+           ("p" "�" :string)
+           ("x" "�" :string)
+           ("�" "�" :string)
+           ("I" "�" :string)
            ("d" "�" :string)
-           ("r" "�" :string)
-           ("q" "�" :string)
-           ("t" "�" :string)
            ("T" "�" :string)
-           ("j" "�" :string)
-           ("J" "�" :string)
-           ("L" "�" :string)
-           ("o" "�" :string)
-           ("U" "�" :string)
-           ("g" "�" :string)
-           ("D" "�" :string)
-           ("�" "�" :string)
-           ("s" "�" :string)
-           ("Q" "�" :string)
-           ("k" "�" :string)
-           ("p" "�" :string)
            ("M" "�" :string)
-           ("f" "�" :string)
+           ("m" "�" :string)
            ("E" "�" :string)
-           ("�" "�" :string)
+           ("D" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("W" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("w" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("W" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :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 "sv-resolve-case"
 
-  :rules  (("�" "0" :string)
-           ("�" "0" :string)
-           ("�" "0" :string)
-           ("�" "0" :string)
-           ("y" "0" :string)
-           ("z" "0" :string)
-           ("�" "0" :string)
-           ("x" "0" :string)
+  :rules  (("�" "0" :string)
            ("�" "0" :string)
-           ("�" "0" :string)
-           ("�" "0" :string)
-           ("h" "0" :string)
-           ("�" "0" :string)
-           ("u" "0" :string)
-           ("�" "0" :string)
-           ("�" "0" :string)
-           ("�" "0" :string)
-           ("i" "0" :string)
-           ("c" "0" :string)
            ("�" "0" :string)
-           ("�" "0" :string)
-           ("�" "0" :string)
-           ("�" "0" :string)
-           ("m" "0" :string)
-           ("q" "0" :string)
+           ("�" "0" :string)
            ("t" "0" :string)
-           ("�" "0" :string)
-           ("j" "0" :string)
-           ("o" "0" :string)
-           ("g" "0" :string)
-           ("s" "0" :string)
-           ("�" "0" :string)
-           ("p" "0" :string)
+           ("h" "0" :string)
+           ("�" "0" :string)
+           ("q" "0" :string)
+           ("�" "0" :string)
+           ("n" "0" :string)
+           ("b" "0" :string)
            ("w" "0" :string)
-           ("k" "0" :string)
-           ("�" "0" :string)
-           ("f" "0" :string)
            ("�" "0" :string)
-           ("�" "0" :string)
+           ("�" "0" :string)
+           ("r" "0" :string)
+           ("�" "0" :string)
            ("�" "0" :string)
-           ("�" "0" :string)
+           ("a" "0" :string)
+           ("y" "0" :string)
+           ("�" "0" :string)
+           ("�" "0" :string)
+           ("m" "0" :string)
+           ("�" "0" :string)
+           ("p" "0" :string)
+           ("x" "0" :string)
            ("�" "0" :string)
-           ("n" "0" :string)
-           ("�" "0" :string)
-           ("�" "0" :string)
+           ("�" "0" :string)
+           ("d" "0" :string)
+           ("�" "0" :string)
+           ("u" "0" :string)
+           ("k" "0" :string)
            ("v" "0" :string)
+           ("�" "0" :string)
+           ("o" "0" :string)
+           ("�" "0" :string)
+           ("s" "0" :string)
+           ("�" "0" :string)
+           ("c" "0" :string)
            ("e" "0" :string)
-           ("�" "0" :string)
-           ("�" "0" :string)
+           ("�" "0" :string)
+           ("f" "0" :string)
+           ("j" "0" :string)
+           ("�" "0" :string)
+           ("�" "0" :string)
+           ("�" "0" :string)
            ("l" "0" :string)
-           ("b" "0" :string)
-           ("a" "0" :string)
-           ("d" "0" :string)
-           ("r" "0" :string)
+           ("�" "0" :string)
+           ("�" "0" :string)
+           ("i" "0" :string)
+           ("�" "0" :string)
+           ("g" "0" :string)
+           ("z" "0" :string)
+           ("�" "0" :string)
+           ("�" "0" :string)
            ("�" "00" :string)
-           ("K" "1" :string)
-           ("�" "1" :string)
-           ("P" "1" :string)
-           ("A" "1" :string)
-           ("Y" "1" :string)
-           ("Z" "1" :string)
-           ("�" "1" :string)
-           ("F" "1" :string)
-           ("H" "1" :string)
-           ("�" "1" :string)
-           ("�" "1" :string)
-           ("V" "1" :string)
-           ("�" "1" :string)
-           ("X" "1" :string)
-           ("I" "1" :string)
-           ("�" "1" :string)
+           ("J" "1" :string)
+           ("�" "1" :string)
+           ("�" "1" :string)
+           ("R" "1" :string)
+           ("�" "1" :string)
+           ("�" "1" :string)
            ("�" "1" :string)
-           ("�" "1" :string)
+           ("U" "1" :string)
            ("B" "1" :string)
-           ("�" "1" :string)
            ("O" "1" :string)
-           ("R" "1" :string)
-           ("G" "1" :string)
-           ("S" "1" :string)
-           ("W" "1" :string)
-           ("�" "1" :string)
+           ("�" "1" :string)
            ("�" "1" :string)
-           ("�" "1" :string)
-           ("�" "1" :string)
-           ("T" "1" :string)
            ("�" "1" :string)
-           ("J" "1" :string)
-           ("�" "1" :string)
-           ("L" "1" :string)
-           ("U" "1" :string)
+           ("E" "1" :string)
            ("D" "1" :string)
-           ("Q" "1" :string)
+           ("�" "1" :string)
+           ("W" "1" :string)
+           ("I" "1" :string)
+           ("�" "1" :string)
+           ("T" "1" :string)
            ("M" "1" :string)
            ("�" "1" :string)
-           ("E" "1" :string)
-           ("�" "1" :string)
-           ("�" "1" :string)
-           ("�" "1" :string)
-           ("�" "1" :string)
+           ("G" "1" :string)
            ("�" "1" :string)
-           ("�" "1" :string)
+           ("P" "1" :string)
+           ("�" "1" :string)
+           ("�" "1" :string)
+           ("�" "1" :string)
+           ("Q" "1" :string)
+           ("�" "1" :string)
+           ("K" "1" :string)
+           ("�" "1" :string)
+           ("�" "1" :string)
+           ("V" "1" :string)
+           ("Z" "1" :string)
            ("�" "1" :string)
-           ("�" "1" :string)
-           ("�" "1" :string)
-           ("�" "1" :string)
-           ("C" "1" :string)
-           ("�" "1" :string)
+           ("�" "1" :string)
+           ("�" "1" :string)
+           ("�" "1" :string)
+           ("�" "1" :string)
+           ("H" "1" :string)
+           ("�" "1" :string)
+           ("�" "1" :string)
            ("N" "1" :string)
-           ("�" "1" :string)
+           ("S" "1" :string)
+           ("C" "1" :string)
+           ("F" "1" :string)
+           ("Y" "1" :string)
+           ("A" "1" :string)
+           ("�" "1" :string)
+           ("L" "1" :string)
+           ("X" "1" :string)
+           ("�" "1" :string)
+           ("�" "1" :string)
            ))
 
 (define-rule-set "sv-ignore-special"
 
-  :rules  (("-" "" :string)
+  :rules  (("!" "" :string)
+           ("-" "" :string)
+           ("?" "" :string)
            ("." "" :string)
            ("'" "" :string)
-           ("!" "" :string)
-           ("?" "" :string)
            ))
 
 (define-rule-set "sv-resolve-special"
@@ -383,114 +383,114 @@
   :rules  (("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("G" "�" :string)
-           ("R" "�" :string)
-           ("�" "�" :string)
-           ("c" "�" :string)
-           ("i" "�" :string)
-           ("S" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("W" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("m" "�" :string)
-           ("h" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("I" "�" :string)
-           ("u" "�" :string)
+           ("Y" "�" :string)
+           ("F" "�" :string)
+           ("A" "�" :string)
+           ("L" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("O" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("B" "�" :string)
-           ("V" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("X" "�" :string)
+           ("g" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("z" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("f" "�" :string)
            ("H" "�" :string)
-           ("z" "�" :string)
-           ("y" "�" :string)
-           ("x" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("X" "�" :string)
-           ("�" "�" :string)
+           ("j" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("P" "�" :string)
-           ("K" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("A" "�" :string)
-           ("�" "�" :string)
-           ("Y" "�" :string)
-           ("F" "�" :string)
-           ("�" "�" :string)
-           ("Z" "�" :string)
-           ("v" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("l" "�" :string)
+           ("S" "�" :string)
            ("C" "�" :string)
-           ("�" "�" :string)
            ("N" "�" :string)
-           ("�" "�" :string)
-           ("e" "�" :string)
-           ("d" "�" :string)
-           ("r" "�" :string)
-           ("a" "�" :string)
-           ("�" "�" :string)
-           ("b" "�" :string)
-           ("l" "�" :string)
+           ("i" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("o" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("n" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("Q" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("K" "�" :string)
            ("s" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("Z" "�" :string)
+           ("e" "�" :string)
+           ("�" "�" :string)
+           ("c" "�" :string)
+           ("V" "�" :string)
+           ("G" "�" :string)
+           ("k" "�" :string)
+           ("u" "�" :string)
+           ("v" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("P" "�" :string)
+           ("�" "�" :string)
+           ("m" "�" :string)
+           ("�" "�" :string)
+           ("E" "�" :string)
            ("D" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("f" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("p" "�" :string)
-           ("w" "�" :string)
+           ("x" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("W" "�" :string)
+           ("I" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("M" "�" :string)
-           ("k" "�" :string)
-           ("�" "�" :string)
-           ("E" "�" :string)
            ("T" "�" :string)
-           ("t" "�" :string)
-           ("q" "�" :string)
-           ("J" "�" :string)
-           ("�" "�" :string)
-           ("j" "�" :string)
+           ("d" "�" :string)
+           ("O" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("y" "�" :string)
+           ("a" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("L" "�" :string)
+           ("n" "�" :string)
+           ("�" "�" :string)
+           ("w" "�" :string)
+           ("b" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("U" "�" :string)
-           ("g" "�" :string)
-           ("o" "�" :string)
+           ("B" "�" :string)
+           ("r" "�" :string)
+           ("�" "�" :string)
+           ("J" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("R" "�" :string)
+           ("�" "�" :string)
+           ("t" "�" :string)
+           ("h" "�" :string)
+           ("�" "�" :string)
+           ("q" "�" :string)
+           ("�" "�" :string)
            ("�" "��" :string)
            ("-" "�" :string)
            ("'" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/swedish/latin9.xdy b/Master/texmf-dist/xindy/modules/lang/swedish/latin9.xdy
index 7e25f34d633..f37663974d1 100644
--- a/Master/texmf-dist/xindy/modules/lang/swedish/latin9.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/swedish/latin9.xdy
@@ -33,69 +33,69 @@
 (define-rule-set "sv-alphabetize"
 
   :rules  (("�" "�" :string)
-           ("�" "�" :string)
-           ("A" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("a" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("b" "�" :string)
+           ("�" "�" :string)
+           ("A" "�" :string)
            ("B" "�" :string)
+           ("b" "�" :string)
+           ("C" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("C" "�" :string)
            ("c" "�" :string)
-           ("�" "�" :string)
            ("D" "�" :string)
-           ("d" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("d" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("e" "�" :string)
+           ("E" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("E" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("f" "�" :string)
            ("F" "�" :string)
-           ("G" "�" :string)
            ("g" "�" :string)
+           ("G" "�" :string)
            ("H" "�" :string)
            ("h" "�" :string)
-           ("I" "�" :string)
-           ("�" "�" :string)
-           ("i" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("i" "�" :string)
+           ("�" "�" :string)
+           ("I" "�" :string)
            ("J" "�" :string)
            ("j" "�" :string)
            ("k" "�" :string)
            ("K" "�" :string)
-           ("l" "�" :string)
            ("L" "�" :string)
+           ("l" "�" :string)
            ("M" "�" :string)
            ("m" "�" :string)
-           ("N" "�" :string)
            ("�" "�" :string)
-           ("n" "�" :string)
            ("�" "�" :string)
+           ("n" "�" :string)
+           ("N" "�" :string)
+           ("O" "�" :string)
+           ("�" "�" :string)
+           ("o" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("O" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("o" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("p" "�" :string)
            ("P" "�" :string)
            ("q" "�" :string)
@@ -103,279 +103,279 @@
            ("r" "�" :string)
            ("R" "�" :string)
            ("�" "�" :string)
-           ("s" "�" :string)
-           ("�" "�" :string)
            ("S" "�" :string)
+           ("�" "�" :string)
+           ("s" "�" :string)
            ("�" "��" :string)
-           ("T" "�" :string)
            ("t" "�" :string)
+           ("T" "�" :string)
            ("�" "�" :string)
            ("U" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("u" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("v" "�" :string)
+           ("�" "�" :string)
            ("w" "�" :string)
-           ("W" "�" :string)
+           ("v" "�" :string)
            ("V" "�" :string)
+           ("W" "�" :string)
            ("x" "�" :string)
            ("X" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("Y" "�" :string)
-           ("�" "�" :string)
            ("y" "�" :string)
-           ("Z" "�" :string)
            ("z" "�" :string)
-           ("�" "�" :string)
+           ("Z" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ))
 
 (define-rule-set "sv-resolve-diacritics"
 
-  :rules  (("�" "�" :string)
-           ("K" "�" :string)
-           ("X" "�" :string)
-           ("�" "�" :string)
-           ("g" "�" :string)
+  :rules  (("N" "�" :string)
            ("T" "�" :string)
-           ("P" "�" :string)
            ("F" "�" :string)
-           ("j" "�" :string)
-           ("H" "�" :string)
-           ("Q" "�" :string)
-           ("G" "�" :string)
+           ("�" "�" :string)
+           ("P" "�" :string)
+           ("�" "�" :string)
+           ("f" "�" :string)
            ("s" "�" :string)
-           ("E" "�" :string)
-           ("S" "�" :string)
-           ("�" "�" :string)
-           ("h" "�" :string)
-           ("�" "�" :string)
-           ("B" "�" :string)
-           ("y" "�" :string)
-           ("V" "�" :string)
-           ("�" "�" :string)
-           ("n" "�" :string)
-           ("t" "�" :string)
-           ("u" "�" :string)
-           ("a" "�" :string)
-           ("o" "�" :string)
            ("A" "�" :string)
-           ("Z" "�" :string)
-           ("l" "�" :string)
-           ("�" "�" :string)
-           ("N" "�" :string)
-           ("M" "�" :string)
-           ("q" "�" :string)
            ("I" "�" :string)
-           ("r" "�" :string)
-           ("x" "�" :string)
-           ("p" "�" :string)
-           ("U" "�" :string)
-           ("f" "�" :string)
+           ("y" "�" :string)
+           ("u" "�" :string)
            ("c" "�" :string)
-           ("R" "�" :string)
-           ("L" "�" :string)
-           ("k" "�" :string)
+           ("Z" "�" :string)
+           ("d" "�" :string)
+           ("K" "�" :string)
            ("Y" "�" :string)
+           ("�" "�" :string)
            ("J" "�" :string)
-           ("b" "�" :string)
-           ("v" "�" :string)
-           ("d" "�" :string)
+           ("m" "�" :string)
            ("z" "�" :string)
-           ("O" "�" :string)
+           ("t" "�" :string)
+           ("�" "�" :string)
+           ("G" "�" :string)
+           ("h" "�" :string)
+           ("Q" "�" :string)
+           ("l" "�" :string)
+           ("X" "�" :string)
            ("i" "�" :string)
+           ("V" "�" :string)
+           ("n" "�" :string)
+           ("j" "�" :string)
+           ("g" "�" :string)
+           ("H" "�" :string)
+           ("L" "�" :string)
+           ("e" "�" :string)
+           ("E" "�" :string)
+           ("o" "�" :string)
+           ("U" "�" :string)
+           ("S" "�" :string)
+           ("M" "�" :string)
+           ("b" "�" :string)
+           ("a" "�" :string)
+           ("R" "�" :string)
+           ("q" "�" :string)
+           ("�" "�" :string)
+           ("k" "�" :string)
+           ("p" "�" :string)
            ("D" "�" :string)
-           ("m" "�" :string)
+           ("r" "�" :string)
+           ("O" "�" :string)
+           ("v" "�" :string)
+           ("B" "�" :string)
+           ("�" "�" :string)
            ("C" "�" :string)
-           ("e" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("x" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("W" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("w" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("W" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("w" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :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 "sv-resolve-case"
 
-  :rules  (("�" "0" :string)
-           ("�" "0" :string)
-           ("�" "0" :string)
-           ("�" "0" :string)
-           ("�" "0" :string)
+  :rules  (("h" "0" :string)
+           ("i" "0" :string)
+           ("l" "0" :string)
+           ("n" "0" :string)
            ("g" "0" :string)
            ("j" "0" :string)
-           ("s" "0" :string)
-           ("�" "0" :string)
+           ("z" "0" :string)
            ("�" "0" :string)
-           ("h" "0" :string)
-           ("�" "0" :string)
-           ("�" "0" :string)
+           ("t" "0" :string)
            ("�" "0" :string)
-           ("y" "0" :string)
-           ("�" "0" :string)
-           ("w" "0" :string)
+           ("�" "0" :string)
+           ("m" "0" :string)
            ("�" "0" :string)
-           ("n" "0" :string)
-           ("�" "0" :string)
-           ("t" "0" :string)
+           ("�" "0" :string)
+           ("�" "0" :string)
            ("u" "0" :string)
-           ("�" "0" :string)
            ("�" "0" :string)
-           ("a" "0" :string)
-           ("o" "0" :string)
-           ("�" "0" :string)
-           ("�" "0" :string)
-           ("�" "0" :string)
+           ("c" "0" :string)
+           ("d" "0" :string)
+           ("�" "0" :string)
            ("�" "0" :string)
-           ("l" "0" :string)
-           ("�" "0" :string)
-           ("q" "0" :string)
-           ("r" "0" :string)
+           ("y" "0" :string)
+           ("�" "0" :string)
+           ("�" "0" :string)
+           ("�" "0" :string)
+           ("�" "0" :string)
+           ("�" "0" :string)
+           ("f" "0" :string)
+           ("s" "0" :string)
+           ("�" "0" :string)
+           ("�" "0" :string)
+           ("�" "0" :string)
+           ("�" "0" :string)
+           ("�" "0" :string)
            ("x" "0" :string)
+           ("v" "0" :string)
+           ("�" "0" :string)
            ("p" "0" :string)
-           ("�" "0" :string)
-           ("c" "0" :string)
-           ("f" "0" :string)
-           ("�" "0" :string)
-           ("�" "0" :string)
+           ("r" "0" :string)
+           ("w" "0" :string)
+           ("�" "0" :string)
            ("k" "0" :string)
-           ("d" "0" :string)
-           ("v" "0" :string)
+           ("�" "0" :string)
+           ("�" "0" :string)
+           ("q" "0" :string)
+           ("�" "0" :string)
+           ("�" "0" :string)
            ("b" "0" :string)
-           ("�" "0" :string)
-           ("z" "0" :string)
-           ("i" "0" :string)
-           ("�" "0" :string)
-           ("m" "0" :string)
-           ("�" "0" :string)
-           ("e" "0" :string)
+           ("a" "0" :string)
            ("�" "0" :string)
-           ("�" "0" :string)
+           ("e" "0" :string)
+           ("�" "0" :string)
+           ("�" "0" :string)
+           ("o" "0" :string)
            ("�" "00" :string)
-           ("�" "1" :string)
-           ("K" "1" :string)
-           ("�" "1" :string)
-           ("X" "1" :string)
-           ("�" "1" :string)
-           ("�" "1" :string)
-           ("T" "1" :string)
-           ("F" "1" :string)
-           ("P" "1" :string)
-           ("�" "1" :string)
-           ("H" "1" :string)
-           ("�" "1" :string)
            ("Q" "1" :string)
-           ("G" "1" :string)
-           ("�" "1" :string)
-           ("W" "1" :string)
-           ("S" "1" :string)
-           ("E" "1" :string)
-           ("�" "1" :string)
-           ("�" "1" :string)
            ("�" "1" :string)
-           ("B" "1" :string)
-           ("�" "1" :string)
+           ("�" "1" :string)
+           ("X" "1" :string)
            ("V" "1" :string)
+           ("W" "1" :string)
+           ("�" "1" :string)
+           ("�" "1" :string)
+           ("G" "1" :string)
+           ("�" "1" :string)
+           ("�" "1" :string)
+           ("J" "1" :string)
+           ("�" "1" :string)
+           ("�" "1" :string)
+           ("�" "1" :string)
+           ("Y" "1" :string)
            ("�" "1" :string)
-           ("�" "1" :string)
-           ("�" "1" :string)
-           ("�" "1" :string)
-           ("�" "1" :string)
-           ("A" "1" :string)
-           ("�" "1" :string)
+           ("K" "1" :string)
            ("Z" "1" :string)
-           ("�" "1" :string)
-           ("�" "1" :string)
-           ("�" "1" :string)
-           ("N" "1" :string)
-           ("M" "1" :string)
+           ("�" "1" :string)
+           ("A" "1" :string)
            ("I" "1" :string)
-           ("�" "1" :string)
-           ("�" "1" :string)
-           ("�" "1" :string)
-           ("U" "1" :string)
+           ("P" "1" :string)
+           ("�" "1" :string)
+           ("N" "1" :string)
+           ("F" "1" :string)
+           ("T" "1" :string)
+           ("�" "1" :string)
+           ("C" "1" :string)
            ("�" "1" :string)
-           ("�" "1" :string)
+           ("�" "1" :string)
+           ("B" "1" :string)
+           ("�" "1" :string)
+           ("D" "1" :string)
+           ("O" "1" :string)
+           ("�" "1" :string)
            ("R" "1" :string)
+           ("�" "1" :string)
+           ("U" "1" :string)
+           ("�" "1" :string)
+           ("S" "1" :string)
+           ("M" "1" :string)
            ("L" "1" :string)
-           ("Y" "1" :string)
-           ("J" "1" :string)
+           ("�" "1" :string)
+           ("�" "1" :string)
+           ("�" "1" :string)
            ("�" "1" :string)
-           ("O" "1" :string)
-           ("D" "1" :string)
-           ("C" "1" :string)
-           ("�" "1" :string)
-           ("�" "1" :string)
+           ("E" "1" :string)
+           ("�" "1" :string)
+           ("�" "1" :string)
+           ("�" "1" :string)
+           ("�" "1" :string)
+           ("�" "1" :string)
+           ("H" "1" :string)
            ))
 
 (define-rule-set "sv-ignore-special"
 
-  :rules  (("?" "" :string)
+  :rules  (("!" "" :string)
+           ("?" "" :string)
+           ("-" "" :string)
            ("." "" :string)
            ("'" "" :string)
-           ("!" "" :string)
-           ("-" "" :string)
            ))
 
 (define-rule-set "sv-resolve-special"
@@ -383,114 +383,114 @@
   :rules  (("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("�" "�" :string)
-           ("E" "�" :string)
-           ("S" "�" :string)
-           ("W" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("h" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("V" "�" :string)
-           ("�" "�" :string)
-           ("y" "�" :string)
+           ("�" "�" :string)
+           ("k" "�" :string)
+           ("O" "�" :string)
+           ("w" "�" :string)
+           ("p" "�" :string)
+           ("D" "�" :string)
+           ("r" "�" :string)
+           ("�" "�" :string)
            ("B" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("n" "�" :string)
+           ("�" "�" :string)
+           ("v" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("w" "�" :string)
-           ("u" "�" :string)
-           ("t" "�" :string)
-           ("�" "�" :string)
-           ("o" "�" :string)
-           ("a" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("x" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("K" "�" :string)
+           ("�" "�" :string)
+           ("C" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("H" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("X" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("o" "�" :string)
+           ("E" "�" :string)
+           ("�" "�" :string)
+           ("e" "�" :string)
+           ("�" "�" :string)
+           ("L" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("a" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("U" "�" :string)
            ("�" "�" :string)
-           ("T" "�" :string)
-           ("P" "�" :string)
-           ("j" "�" :string)
-           ("F" "�" :string)
-           ("g" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("H" "�" :string)
-           ("G" "�" :string)
-           ("Q" "�" :string)
-           ("s" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("c" "�" :string)
-           ("f" "�" :string)
-           ("R" "�" :string)
+           ("S" "�" :string)
            ("b" "�" :string)
-           ("v" "�" :string)
-           ("d" "�" :string)
+           ("M" "�" :string)
+           ("�" "�" :string)
+           ("q" "�" :string)
+           ("R" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("Y" "�" :string)
-           ("J" "�" :string)
-           ("k" "�" :string)
-           ("L" "�" :string)
-           ("z" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("D" "�" :string)
-           ("O" "�" :string)
-           ("i" "�" :string)
+           ("K" "�" :string)
+           ("�" "�" :string)
+           ("J" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("C" "�" :string)
+           ("�" "�" :string)
            ("m" "�" :string)
-           ("�" "�" :string)
-           ("e" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("G" "�" :string)
+           ("�" "�" :string)
+           ("z" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("t" "�" :string)
+           ("W" "�" :string)
+           ("n" "�" :string)
+           ("j" "�" :string)
+           ("g" "�" :string)
+           ("�" "�" :string)
+           ("Q" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("Z" "�" :string)
-           ("�" "�" :string)
-           ("A" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("h" "�" :string)
+           ("X" "�" :string)
+           ("i" "�" :string)
+           ("V" "�" :string)
            ("l" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("q" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("N" "�" :string)
-           ("M" "�" :string)
-           ("�" "�" :string)
-           ("r" "�" :string)
+           ("F" "�" :string)
+           ("�" "�" :string)
+           ("T" "�" :string)
+           ("s" "�" :string)
+           ("f" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("P" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("A" "�" :string)
+           ("y" "�" :string)
            ("I" "�" :string)
-           ("�" "�" :string)
-           ("p" "�" :string)
-           ("�" "�" :string)
-           ("x" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("U" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("Z" "�" :string)
+           ("c" "�" :string)
+           ("d" "�" :string)
+           ("�" "�" :string)
+           ("u" "�" :string)
            ("�" "��" :string)
            ("-" "�" :string)
            ("'" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/swedish/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/swedish/utf8.xdy
index d964ea95e7d..ef26632cdd9 100644
--- a/Master/texmf-dist/xindy/modules/lang/swedish/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/swedish/utf8.xdy
@@ -32,109 +32,109 @@
 
 (define-rule-set "sv-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)
-           ("ò" "�" :string)
-           ("ó" "�" :string)
+           ("Ñ" "�" :string)
+           ("ñ" "�" :string)
            ("Ó" "�" :string)
-           ("Ô" "�" :string)
            ("ô" "�" :string)
+           ("Ô" "�" :string)
+           ("ó" "�" :string)
+           ("ò" "�" :string)
            ("Ò" "�" :string)
            ("ř" "�" :string)
            ("Ř" "�" :string)
+           ("ś" "�" :string)
            ("Š" "�" :string)
            ("š" "�" :string)
            ("Ś" "�" :string)
-           ("ś" "�" :string)
            ("ß" "��" :string)
-           ("û" "�" :string)
            ("ù" "�" :string)
-           ("Û" "�" :string)
            ("Ù" "�" :string)
            ("Ú" "�" :string)
            ("ú" "�" :string)
+           ("Û" "�" :string)
+           ("û" "�" :string)
+           ("ü" "�" :string)
+           ("Ü" "�" :string)
            ("ý" "�" :string)
            ("Ý" "�" :string)
-           ("Ü" "�" :string)
-           ("ü" "�" :string)
            ("å" "�" :string)
            ("Å" "�" :string)
-           ("Ä" "�" :string)
-           ("æ" "�" :string)
            ("Æ" "�" :string)
            ("ä" "�" :string)
+           ("Ä" "�" :string)
+           ("æ" "�" :string)
+           ("ø" "�" :string)
            ("ö" "�" :string)
            ("Ø" "�" :string)
            ("Ö" "�" :string)
-           ("ø" "�" :string)
            ("A" "�" :string)
            ("a" "�" :string)
-           ("b" "�" :string)
            ("B" "�" :string)
+           ("b" "�" :string)
            ("C" "�" :string)
            ("c" "�" :string)
            ("D" "�" :string)
            ("d" "�" :string)
-           ("E" "�" :string)
            ("e" "�" :string)
-           ("F" "�" :string)
+           ("E" "�" :string)
            ("f" "�" :string)
+           ("F" "�" :string)
            ("g" "�" :string)
            ("G" "�" :string)
            ("H" "�" :string)
            ("h" "�" :string)
            ("i" "�" :string)
            ("I" "�" :string)
-           ("j" "�" :string)
            ("J" "�" :string)
-           ("k" "�" :string)
+           ("j" "�" :string)
            ("K" "�" :string)
-           ("l" "�" :string)
+           ("k" "�" :string)
            ("L" "�" :string)
-           ("M" "�" :string)
+           ("l" "�" :string)
            ("m" "�" :string)
+           ("M" "�" :string)
            ("N" "�" :string)
            ("n" "�" :string)
-           ("O" "�" :string)
            ("o" "�" :string)
-           ("p" "�" :string)
+           ("O" "�" :string)
            ("P" "�" :string)
-           ("Q" "�" :string)
+           ("p" "�" :string)
            ("q" "�" :string)
+           ("Q" "�" :string)
            ("R" "�" :string)
            ("r" "�" :string)
            ("S" "�" :string)
@@ -143,10 +143,10 @@
            ("t" "�" :string)
            ("U" "�" :string)
            ("u" "�" :string)
-           ("W" "�" :string)
            ("w" "�" :string)
-           ("v" "�" :string)
+           ("W" "�" :string)
            ("V" "�" :string)
+           ("v" "�" :string)
            ("x" "�" :string)
            ("X" "�" :string)
            ("Y" "�" :string)
@@ -158,388 +158,388 @@
 (define-rule-set "sv-resolve-diacritics"
 
   :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)
+           ("A" "�" :string)
            ("f" "�" :string)
-           ("o" "�" :string)
-           ("Z" "�" :string)
-           ("V" "�" :string)
+           ("T" "�" :string)
+           ("D" "�" :string)
+           ("j" "�" :string)
+           ("i" "�" :string)
+           ("M" "�" :string)
            ("I" "�" :string)
+           ("p" "�" :string)
+           ("x" "�" :string)
+           ("o" "�" :string)
+           ("l" "�" :string)
+           ("c" "�" :string)
+           ("g" "�" :string)
+           ("E" "�" :string)
+           ("H" "�" :string)
+           ("C" "�" :string)
            ("P" "�" :string)
-           ("K" "�" :string)
-           ("a" "�" :string)
+           ("U" "�" :string)
+           ("N" "�" :string)
+           ("L" "�" :string)
+           ("R" "�" :string)
+           ("e" "�" :string)
+           ("z" "�" :string)
+           ("m" "�" :string)
            ("B" "�" :string)
-           ("q" "�" :string)
+           ("n" "�" :string)
+           ("J" "�" :string)
+           ("k" "�" :string)
            ("y" "�" :string)
-           ("G" "�" :string)
-           ("t" "�" :string)
-           ("r" "�" :string)
-           ("u" "�" :string)
-           ("R" "�" :string)
            ("Y" "�" :string)
-           ("z" "�" :string)
-           ("L" "�" :string)
-           ("U" "�" :string)
+           ("Z" "�" :string)
+           ("u" "�" :string)
            ("b" "�" :string)
-           ("i" "�" :string)
+           ("q" "�" :string)
+           ("Q" "�" :string)
            ("v" "�" :string)
-           ("N" "�" :string)
-           ("s" "�" :string)
+           ("r" "�" :string)
+           ("t" "�" :string)
+           ("d" "�" :string)
+           ("K" "�" :string)
+           ("S" "�" :string)
+           ("G" "�" :string)
            ("F" "�" :string)
-           ("n" "�" :string)
+           ("V" "�" :string)
            ("X" "�" :string)
-           ("m" "�" :string)
-           ("S" "�" :string)
-           ("l" "�" :string)
-           ("Q" "�" :string)
-           ("T" "�" :string)
-           ("h" "�" :string)
-           ("p" "�" :string)
-           ("M" "�" :string)
-           ("e" "�" :string)
-           ("c" "�" :string)
-           ("H" "�" :string)
-           ("k" "�" :string)
-           ("C" "�" :string)
-           ("d" "�" :string)
-           ("A" "�" :string)
            ("O" "�" :string)
-           ("E" "�" :string)
-           ("g" "�" :string)
-           ("J" "�" :string)
-           ("j" "�" :string)
-           ("D" "�" :string)
-           ("x" "�" :string)
+           ("s" "�" :string)
+           ("h" "�" :string)
+           ("a" "�" :string)
            ("w" "�" :string)
            ("W" "�" :string)
            ))
 
 (define-rule-set "sv-resolve-case"
 
-  :rules  (("ë" "0" :string)
-           ("ô" "0" :string)
-           ("è" "0" :string)
-           ("î" "0" :string)
+  :rules  (("ś" "0" :string)
            ("ü" "0" :string)
-           ("ä" "0" :string)
-           ("ń" "0" :string)
-           ("ð" "0" :string)
-           ("ś" "0" :string)
+           ("ù" "0" :string)
+           ("ř" "0" :string)
+           ("ç" "0" :string)
+           ("ö" "0" :string)
+           ("ø" "0" :string)
+           ("è" "0" :string)
+           ("ë" "0" :string)
            ("à" "0" :string)
            ("ï" "0" :string)
-           ("ú" "0" :string)
-           ("ø" "0" :string)
-           ("ç" "0" :string)
-           ("å" "0" :string)
            ("ý" "0" :string)
-           ("ê" "0" :string)
-           ("ö" "0" :string)
-           ("ñ" "0" :string)
-           ("â" "0" :string)
-           ("ć" "0" :string)
-           ("š" "0" :string)
-           ("ò" "0" :string)
+           ("ń" "0" :string)
            ("č" "0" :string)
-           ("í" "0" :string)
-           ("æ" "0" :string)
-           ("û" "0" :string)
            ("á" "0" :string)
+           ("å" "0" :string)
+           ("ä" "0" :string)
+           ("ô" "0" :string)
+           ("ñ" "0" :string)
            ("ì" "0" :string)
+           ("ð" "0" :string)
+           ("š" "0" :string)
+           ("î" "0" :string)
            ("ł" "0" :string)
-           ("ř" "0" :string)
-           ("ó" "0" :string)
-           ("ù" "0" :string)
+           ("ú" "0" :string)
            ("é" "0" :string)
+           ("ò" "0" :string)
+           ("ć" "0" :string)
+           ("ó" "0" :string)
+           ("æ" "0" :string)
+           ("â" "0" :string)
+           ("í" "0" :string)
+           ("ê" "0" :string)
+           ("û" "0" :string)
            ("ß" "00" :string)
-           ("Ö" "1" :string)
-           ("Ś" "1" :string)
-           ("Æ" "1" :string)
-           ("Ý" "1" :string)
-           ("Ń" "1" :string)
+           ("Ó" "1" :string)
+           ("Ł" "1" :string)
            ("É" "1" :string)
-           ("Â" "1" :string)
+           ("Æ" "1" :string)
            ("Ü" "1" :string)
-           ("Ú" "1" :string)
            ("Ï" "1" :string)
-           ("Ñ" "1" :string)
-           ("Ë" "1" :string)
-           ("Ì" "1" :string)
-           ("Ò" "1" :string)
-           ("È" "1" :string)
-           ("Î" "1" :string)
-           ("Á" "1" :string)
+           ("Ń" "1" :string)
+           ("Ø" "1" :string)
            ("Ð" "1" :string)
+           ("Š" "1" :string)
+           ("Č" "1" :string)
+           ("Ć" "1" :string)
+           ("Ñ" "1" :string)
+           ("Â" "1" :string)
+           ("Ê" "1" :string)
+           ("Ù" "1" :string)
+           ("Ô" "1" :string)
+           ("Ú" "1" :string)
            ("Í" "1" :string)
            ("Ä" "1" :string)
+           ("Î" "1" :string)
+           ("Ö" "1" :string)
            ("Å" "1" :string)
-           ("Š" "1" :string)
+           ("Ì" "1" :string)
            ("À" "1" :string)
-           ("Ø" "1" :string)
-           ("Ê" "1" :string)
-           ("Ł" "1" :string)
-           ("Č" "1" :string)
+           ("Ç" "1" :string)
            ("Û" "1" :string)
-           ("Ô" "1" :string)
-           ("Ó" "1" :string)
+           ("Ë" "1" :string)
            ("Ř" "1" :string)
-           ("Ç" "1" :string)
-           ("Ć" "1" :string)
-           ("Ù" "1" :string)
+           ("È" "1" :string)
+           ("Ò" "1" :string)
+           ("Á" "1" :string)
+           ("Ý" "1" :string)
+           ("Ś" "1" :string)
+           ("z" "0" :string)
            ("m" "0" :string)
-           ("v" "0" :string)
-           ("s" "0" :string)
+           ("e" "0" :string)
            ("n" "0" :string)
-           ("i" "0" :string)
-           ("b" "0" :string)
-           ("z" "0" :string)
-           ("t" "0" :string)
-           ("u" "0" :string)
-           ("r" "0" :string)
-           ("a" "0" :string)
-           ("y" "0" :string)
-           ("q" "0" :string)
+           ("w" "0" :string)
            ("f" "0" :string)
-           ("o" "0" :string)
            ("j" "0" :string)
+           ("i" "0" :string)
+           ("p" "0" :string)
            ("x" "0" :string)
+           ("l" "0" :string)
+           ("o" "0" :string)
            ("g" "0" :string)
-           ("k" "0" :string)
-           ("d" "0" :string)
-           ("p" "0" :string)
            ("c" "0" :string)
-           ("e" "0" :string)
+           ("s" "0" :string)
+           ("a" "0" :string)
            ("h" "0" :string)
-           ("w" "0" :string)
-           ("l" "0" :string)
-           ("X" "1" :string)
-           ("S" "1" :string)
+           ("y" "0" :string)
+           ("k" "0" :string)
+           ("u" "0" :string)
+           ("b" "0" :string)
+           ("q" "0" :string)
+           ("t" "0" :string)
+           ("r" "0" :string)
+           ("v" "0" :string)
+           ("d" "0" :string)
+           ("C" "1" :string)
+           ("H" "1" :string)
            ("N" "1" :string)
-           ("F" "1" :string)
-           ("U" "1" :string)
            ("L" "1" :string)
-           ("Y" "1" :string)
-           ("R" "1" :string)
-           ("G" "1" :string)
-           ("K" "1" :string)
+           ("U" "1" :string)
            ("P" "1" :string)
+           ("R" "1" :string)
            ("B" "1" :string)
-           ("Z" "1" :string)
-           ("V" "1" :string)
-           ("I" "1" :string)
-           ("D" "1" :string)
-           ("E" "1" :string)
            ("J" "1" :string)
-           ("C" "1" :string)
-           ("O" "1" :string)
+           ("T" "1" :string)
            ("A" "1" :string)
-           ("H" "1" :string)
            ("M" "1" :string)
-           ("Q" "1" :string)
+           ("D" "1" :string)
+           ("I" "1" :string)
+           ("E" "1" :string)
+           ("S" "1" :string)
+           ("K" "1" :string)
+           ("G" "1" :string)
+           ("F" "1" :string)
            ("W" "1" :string)
-           ("T" "1" :string)
+           ("O" "1" :string)
+           ("V" "1" :string)
+           ("X" "1" :string)
+           ("Y" "1" :string)
+           ("Z" "1" :string)
+           ("Q" "1" :string)
            ))
 
 (define-rule-set "sv-ignore-special"
 
-  :rules  (("'" "" :string)
-           ("." "" :string)
-           ("?" "" :string)
+  :rules  (("." "" :string)
+           ("'" "" :string)
            ("!" "" :string)
            ("-" "" :string)
+           ("?" "" :string)
            ))
 
 (define-rule-set "sv-resolve-special"
 
-  :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)
-           ("W" "�" :string)
-           ("T" "�" :string)
-           ("h" "�" :string)
+           ("v" "�" :string)
+           ("r" "�" :string)
+           ("t" "�" :string)
            ("Q" "�" :string)
-           ("e" "�" :string)
-           ("c" "�" :string)
-           ("p" "�" :string)
-           ("M" "�" :string)
-           ("l" "�" :string)
-           ("w" "�" :string)
-           ("J" "�" :string)
-           ("g" "�" :string)
-           ("E" "�" :string)
-           ("x" "�" :string)
-           ("j" "�" :string)
-           ("D" "�" :string)
-           ("H" "�" :string)
+           ("q" "�" :string)
            ("d" "�" :string)
-           ("A" "�" :string)
-           ("O" "�" :string)
+           ("y" "�" :string)
            ("k" "�" :string)
-           ("C" "�" :string)
-           ("r" "�" :string)
+           ("Y" "�" :string)
+           ("b" "�" :string)
+           ("Z" "�" :string)
            ("u" "�" :string)
+           ("s" "�" :string)
+           ("X" "�" :string)
+           ("V" "�" :string)
+           ("W" "�" :string)
+           ("O" "�" :string)
+           ("h" "�" :string)
+           ("a" "�" :string)
+           ("S" "�" :string)
+           ("K" "�" :string)
+           ("F" "�" :string)
            ("G" "�" :string)
-           ("t" "�" :string)
-           ("R" "�" :string)
+           ("x" "�" :string)
+           ("l" "�" :string)
            ("o" "�" :string)
-           ("V" "�" :string)
-           ("Z" "�" :string)
-           ("I" "�" :string)
+           ("p" "�" :string)
+           ("c" "�" :string)
+           ("E" "�" :string)
+           ("g" "�" :string)
+           ("D" "�" :string)
+           ("M" "�" :string)
+           ("i" "�" :string)
+           ("j" "�" :string)
+           ("A" "�" :string)
            ("f" "�" :string)
-           ("q" "�" :string)
+           ("T" "�" :string)
+           ("I" "�" :string)
            ("B" "�" :string)
-           ("y" "�" :string)
-           ("K" "�" :string)
-           ("P" "�" :string)
-           ("a" "�" :string)
            ("n" "�" :string)
-           ("s" "�" :string)
-           ("N" "�" :string)
-           ("F" "�" :string)
-           ("v" "�" :string)
-           ("m" "�" :string)
-           ("S" "�" :string)
-           ("X" "�" :string)
-           ("Y" "�" :string)
            ("z" "�" :string)
-           ("L" "�" :string)
+           ("m" "�" :string)
+           ("e" "�" :string)
+           ("w" "�" :string)
+           ("J" "�" :string)
            ("U" "�" :string)
-           ("b" "�" :string)
-           ("i" "�" :string)
+           ("P" "�" :string)
+           ("N" "�" :string)
+           ("L" "�" :string)
+           ("H" "�" :string)
+           ("C" "�" :string)
+           ("R" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/turkish/latin3.xdy b/Master/texmf-dist/xindy/modules/lang/turkish/latin3.xdy
index 6af83ed5751..263c7601bc2 100644
--- a/Master/texmf-dist/xindy/modules/lang/turkish/latin3.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/turkish/latin3.xdy
@@ -36,70 +36,70 @@
 
 (define-rule-set "tr-alphabetize"
 
-  :rules  (("a" "�" :string)
-           ("�" "�" :string)
+  :rules  (("A" "�" :string)
+           ("a" "�" :string)
            ("�" "�" :string)
-           ("A" "�" :string)
-           ("B" "�" :string)
+           ("�" "�" :string)
            ("b" "�" :string)
+           ("B" "�" :string)
            ("c" "�" :string)
            ("C" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("D" "�" :string)
            ("d" "�" :string)
-           ("E" "�" :string)
+           ("D" "�" :string)
            ("e" "�" :string)
+           ("E" "�" :string)
            ("F" "�" :string)
            ("f" "�" :string)
            ("g" "�" :string)
            ("G" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("h" "�" :string)
            ("H" "�" :string)
+           ("h" "�" :string)
            ("I" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("i" "�" :string)
+           ("�" "�" :string)
            ("j" "�" :string)
            ("J" "�" :string)
-           ("k" "�" :string)
            ("K" "�" :string)
-           ("l" "�" :string)
+           ("k" "�" :string)
            ("L" "�" :string)
+           ("l" "�" :string)
            ("M" "�" :string)
            ("m" "�" :string)
-           ("n" "�" :string)
            ("N" "�" :string)
-           ("o" "�" :string)
+           ("n" "�" :string)
            ("O" "�" :string)
+           ("o" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("P" "�" :string)
            ("p" "�" :string)
-           ("Q" "�" :string)
            ("q" "�" :string)
-           ("R" "�" :string)
+           ("Q" "�" :string)
            ("r" "�" :string)
-           ("s" "�" :string)
+           ("R" "�" :string)
            ("S" "�" :string)
+           ("s" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("t" "�" :string)
            ("T" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("t" "�" :string)
            ("U" "�" :string)
+           ("�" "�" :string)
            ("u" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("v" "�" :string)
            ("V" "�" :string)
+           ("v" "�" :string)
            ("W" "�" :string)
            ("w" "�" :string)
-           ("x" "�" :string)
            ("X" "�" :string)
+           ("x" "�" :string)
            ("y" "�" :string)
            ("Y" "�" :string)
            ("z" "�" :string)
@@ -108,154 +108,154 @@
 
 (define-rule-set "tr-resolve-diacritics"
 
-  :rules  (("�" "�" :string)
-           ("�" "�" :string)
-           ("R" "�" :string)
-           ("b" "�" :string)
-           ("W" "�" :string)
-           ("F" "�" :string)
-           ("y" "�" :string)
-           ("B" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("g" "�" :string)
-           ("E" "�" :string)
+  :rules  (("y" "�" :string)
+           ("�" "�" :string)
+           ("U" "�" :string)
+           ("�" "�" :string)
+           ("e" "�" :string)
+           ("u" "�" :string)
+           ("h" "�" :string)
+           ("�" "�" :string)
            ("k" "�" :string)
+           ("s" "�" :string)
+           ("d" "�" :string)
            ("�" "�" :string)
+           ("Y" "�" :string)
+           ("W" "�" :string)
+           ("p" "�" :string)
+           ("G" "�" :string)
+           ("R" "�" :string)
+           ("w" "�" :string)
+           ("C" "�" :string)
+           ("J" "�" :string)
            ("c" "�" :string)
-           ("�" "�" :string)
-           ("h" "�" :string)
-           ("t" "�" :string)
-           ("I" "�" :string)
-           ("D" "�" :string)
-           ("j" "�" :string)
-           ("o" "�" :string)
-           ("v" "�" :string)
+           ("E" "�" :string)
            ("f" "�" :string)
-           ("a" "�" :string)
-           ("�" "�" :string)
-           ("l" "�" :string)
-           ("s" "�" :string)
-           ("T" "�" :string)
-           ("w" "�" :string)
-           ("O" "�" :string)
-           ("Q" "�" :string)
-           ("M" "�" :string)
+           ("�" "�" :string)
+           ("D" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("V" "�" :string)
-           ("C" "�" :string)
-           ("x" "�" :string)
-           ("z" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("e" "�" :string)
-           ("r" "�" :string)
-           ("H" "�" :string)
+           ("m" "�" :string)
+           ("t" "�" :string)
            ("P" "�" :string)
+           ("r" "�" :string)
+           ("X" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("V" "�" :string)
            ("L" "�" :string)
-           ("i" "�" :string)
-           ("K" "�" :string)
-           ("p" "�" :string)
+           ("z" "�" :string)
            ("A" "�" :string)
-           ("X" "�" :string)
-           ("n" "�" :string)
-           ("u" "�" :string)
-           ("U" "�" :string)
+           ("O" "�" :string)
+           ("b" "�" :string)
+           ("M" "�" :string)
+           ("H" "�" :string)
+           ("x" "�" :string)
            ("q" "�" :string)
-           ("Z" "�" :string)
-           ("m" "�" :string)
+           ("�" "�" :string)
+           ("j" "�" :string)
+           ("I" "�" :string)
+           ("K" "�" :string)
            ("N" "�" :string)
+           ("Z" "�" :string)
+           ("T" "�" :string)
+           ("B" "�" :string)
            ("S" "�" :string)
-           ("J" "�" :string)
-           ("d" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("Y" "�" :string)
-           ("G" "�" :string)
-           ("�" "�" :string)
+           ("n" "�" :string)
+           ("l" "�" :string)
+           ("Q" "�" :string)
+           ("o" "�" :string)
+           ("a" "�" :string)
+           ("v" "�" :string)
+           ("F" "�" :string)
+           ("g" "�" :string)
+           ("i" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ))
 
 (define-rule-set "tr-resolve-case"
 
-  :rules  (("X" "8" :string)
-           ("K" "8" :string)
-           ("A" "8" :string)
-           ("U" "8" :string)
-           ("�" "8" :string)
-           ("S" "8" :string)
-           ("J" "8" :string)
-           ("Z" "8" :string)
-           ("N" "8" :string)
-           ("G" "8" :string)
-           ("�" "8" :string)
+  :rules  (("U" "8" :string)
            ("�" "8" :string)
+           ("�" "8" :string)
            ("Y" "8" :string)
-           ("V" "8" :string)
+           ("W" "8" :string)
+           ("G" "8" :string)
+           ("R" "8" :string)
            ("C" "8" :string)
+           ("J" "8" :string)
+           ("�" "8" :string)
+           ("E" "8" :string)
+           ("�" "8" :string)
+           ("D" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
-           ("H" "8" :string)
-           ("L" "8" :string)
            ("P" "8" :string)
-           ("I" "8" :string)
-           ("D" "8" :string)
-           ("O" "8" :string)
-           ("Q" "8" :string)
+           ("X" "8" :string)
+           ("L" "8" :string)
+           ("V" "8" :string)
+           ("A" "8" :string)
            ("M" "8" :string)
+           ("O" "8" :string)
+           ("H" "8" :string)
+           ("�" "8" :string)
+           ("I" "8" :string)
+           ("K" "8" :string)
+           ("N" "8" :string)
+           ("Z" "8" :string)
            ("T" "8" :string)
-           ("F" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("R" "8" :string)
-           ("W" "8" :string)
            ("B" "8" :string)
-           ("E" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("p" "9" :string)
-           ("u" "9" :string)
-           ("n" "9" :string)
-           ("�" "9" :string)
-           ("d" "9" :string)
-           ("q" "9" :string)
-           ("m" "9" :string)
-           ("�" "9" :string)
-           ("x" "9" :string)
-           ("z" "9" :string)
-           ("�" "9" :string)
+           ("S" "8" :string)
+           ("Q" "8" :string)
+           ("F" "8" :string)
+           ("y" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
            ("e" "9" :string)
-           ("r" "9" :string)
-           ("i" "9" :string)
-           ("t" "9" :string)
+           ("u" "9" :string)
            ("�" "9" :string)
            ("h" "9" :string)
-           ("o" "9" :string)
-           ("j" "9" :string)
-           ("f" "9" :string)
-           ("v" "9" :string)
-           ("a" "9" :string)
-           ("�" "9" :string)
-           ("w" "9" :string)
-           ("l" "9" :string)
            ("s" "9" :string)
+           ("d" "9" :string)
+           ("k" "9" :string)
+           ("p" "9" :string)
+           ("w" "9" :string)
+           ("c" "9" :string)
+           ("f" "9" :string)
+           ("�" "9" :string)
+           ("m" "9" :string)
+           ("t" "9" :string)
+           ("r" "9" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
+           ("z" "9" :string)
            ("b" "9" :string)
-           ("�" "9" :string)
-           ("y" "9" :string)
-           ("k" "9" :string)
+           ("q" "9" :string)
+           ("x" "9" :string)
+           ("j" "9" :string)
+           ("l" "9" :string)
+           ("n" "9" :string)
+           ("�" "9" :string)
+           ("o" "9" :string)
+           ("a" "9" :string)
            ("g" "9" :string)
-           ("c" "9" :string)
-           ("�" "9" :string)
+           ("v" "9" :string)
+           ("i" "9" :string)
+           ("�" "9" :string)
            ))
 
 (define-rule-set "tr-ignore-special"
 
-  :rules  (("?" "" :string)
-           ("-" "" :string)
-           ("!" "" :string)
+  :rules  (("!" "" :string)
+           ("?" "" :string)
            ("'" "" :string)
+           ("-" "" :string)
            ("." "" :string)
            ))
 
@@ -264,74 +264,74 @@
   :rules  (("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
+           ("W" "�" :string)
+           ("Y" "�" :string)
+           ("J" "�" :string)
+           ("c" "�" :string)
+           ("w" "�" :string)
+           ("C" "�" :string)
+           ("R" "�" :string)
+           ("G" "�" :string)
+           ("p" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("D" "�" :string)
-           ("j" "�" :string)
-           ("I" "�" :string)
-           ("o" "�" :string)
+           ("E" "�" :string)
+           ("f" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("t" "�" :string)
+           ("m" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("U" "�" :string)
+           ("y" "�" :string)
+           ("�" "�" :string)
+           ("u" "�" :string)
+           ("e" "�" :string)
+           ("k" "�" :string)
+           ("s" "�" :string)
+           ("�" "�" :string)
+           ("d" "�" :string)
            ("h" "�" :string)
            ("�" "�" :string)
-           ("t" "�" :string)
+           ("B" "�" :string)
            ("T" "�" :string)
-           ("s" "�" :string)
+           ("Z" "�" :string)
+           ("N" "�" :string)
+           ("K" "�" :string)
            ("l" "�" :string)
-           ("Q" "�" :string)
-           ("M" "�" :string)
-           ("O" "�" :string)
-           ("w" "�" :string)
-           ("�" "�" :string)
+           ("n" "�" :string)
+           ("S" "�" :string)
            ("a" "�" :string)
-           ("f" "�" :string)
-           ("v" "�" :string)
-           ("y" "�" :string)
+           ("o" "�" :string)
+           ("�" "�" :string)
+           ("Q" "�" :string)
            ("�" "�" :string)
-           ("B" "�" :string)
-           ("b" "�" :string)
-           ("W" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("R" "�" :string)
-           ("�" "�" :string)
+           ("i" "�" :string)
+           ("v" "�" :string)
            ("F" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("c" "�" :string)
            ("g" "�" :string)
-           ("�" "�" :string)
-           ("k" "�" :string)
-           ("E" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("U" "�" :string)
-           ("u" "�" :string)
-           ("n" "�" :string)
-           ("A" "�" :string)
-           ("p" "�" :string)
-           ("K" "�" :string)
+           ("r" "�" :string)
            ("X" "�" :string)
-           ("Y" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("G" "�" :string)
-           ("m" "�" :string)
-           ("N" "�" :string)
-           ("q" "�" :string)
-           ("Z" "�" :string)
-           ("d" "�" :string)
-           ("J" "�" :string)
-           ("S" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("P" "�" :string)
+           ("A" "�" :string)
            ("z" "�" :string)
-           ("x" "�" :string)
-           ("C" "�" :string)
            ("V" "�" :string)
-           ("�" "�" :string)
-           ("P" "�" :string)
-           ("i" "�" :string)
            ("L" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("x" "�" :string)
+           ("�" "�" :string)
+           ("q" "�" :string)
            ("H" "�" :string)
-           ("r" "�" :string)
-           ("e" "�" :string)
+           ("b" "�" :string)
+           ("O" "�" :string)
+           ("M" "�" :string)
+           ("I" "�" :string)
+           ("j" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/turkish/latin5.xdy b/Master/texmf-dist/xindy/modules/lang/turkish/latin5.xdy
index d164d0ea036..59031c78884 100644
--- a/Master/texmf-dist/xindy/modules/lang/turkish/latin5.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/turkish/latin5.xdy
@@ -36,26 +36,26 @@
 
 (define-rule-set "tr-alphabetize"
 
-  :rules  (("�" "�" :string)
-           ("�" "�" :string)
-           ("a" "�" :string)
+  :rules  (("�" "�" :string)
            ("A" "�" :string)
+           ("a" "�" :string)
+           ("�" "�" :string)
            ("B" "�" :string)
            ("b" "�" :string)
            ("c" "�" :string)
            ("C" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("d" "�" :string)
+           ("�" "�" :string)
            ("D" "�" :string)
-           ("E" "�" :string)
+           ("d" "�" :string)
            ("e" "�" :string)
+           ("E" "�" :string)
            ("f" "�" :string)
            ("F" "�" :string)
            ("G" "�" :string)
            ("g" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("h" "�" :string)
            ("H" "�" :string)
            ("�" "�" :string)
@@ -64,10 +64,10 @@
            ("�" "�" :string)
            ("J" "�" :string)
            ("j" "�" :string)
-           ("K" "�" :string)
            ("k" "�" :string)
-           ("l" "�" :string)
+           ("K" "�" :string)
            ("L" "�" :string)
+           ("l" "�" :string)
            ("M" "�" :string)
            ("m" "�" :string)
            ("n" "�" :string)
@@ -76,10 +76,10 @@
            ("O" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("P" "�" :string)
            ("p" "�" :string)
-           ("q" "�" :string)
+           ("P" "�" :string)
            ("Q" "�" :string)
+           ("q" "�" :string)
            ("R" "�" :string)
            ("r" "�" :string)
            ("s" "�" :string)
@@ -89,174 +89,174 @@
            ("t" "�" :string)
            ("T" "�" :string)
            ("U" "�" :string)
-           ("u" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
+           ("u" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("v" "�" :string)
            ("V" "�" :string)
-           ("w" "�" :string)
+           ("v" "�" :string)
            ("W" "�" :string)
-           ("X" "�" :string)
+           ("w" "�" :string)
            ("x" "�" :string)
-           ("y" "�" :string)
+           ("X" "�" :string)
            ("Y" "�" :string)
-           ("z" "�" :string)
+           ("y" "�" :string)
            ("Z" "�" :string)
+           ("z" "�" :string)
            ))
 
 (define-rule-set "tr-resolve-diacritics"
 
-  :rules  (("�" "�" :string)
-           ("M" "�" :string)
-           ("i" "�" :string)
+  :rules  (("J" "�" :string)
+           ("R" "�" :string)
            ("W" "�" :string)
-           ("f" "�" :string)
-           ("w" "�" :string)
-           ("l" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("J" "�" :string)
            ("G" "�" :string)
-           ("v" "�" :string)
            ("�" "�" :string)
-           ("o" "�" :string)
-           ("B" "�" :string)
-           ("t" "�" :string)
-           ("R" "�" :string)
-           ("d" "�" :string)
-           ("L" "�" :string)
-           ("r" "�" :string)
-           ("�" "�" :string)
-           ("u" "�" :string)
-           ("b" "�" :string)
-           ("U" "�" :string)
            ("�" "�" :string)
-           ("E" "�" :string)
-           ("g" "�" :string)
-           ("q" "�" :string)
-           ("�" "�" :string)
+           ("k" "�" :string)
+           ("V" "�" :string)
+           ("m" "�" :string)
+           ("U" "�" :string)
+           ("x" "�" :string)
+           ("M" "�" :string)
+           ("B" "�" :string)
+           ("v" "�" :string)
            ("n" "�" :string)
+           ("c" "�" :string)
+           ("X" "�" :string)
+           ("o" "�" :string)
+           ("s" "�" :string)
+           ("w" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("Q" "�" :string)
+           ("i" "�" :string)
+           ("Z" "�" :string)
+           ("t" "�" :string)
+           ("A" "�" :string)
+           ("q" "�" :string)
+           ("C" "�" :string)
+           ("�" "�" :string)
+           ("b" "�" :string)
+           ("e" "�" :string)
+           ("a" "�" :string)
            ("T" "�" :string)
-           ("D" "�" :string)
-           ("s" "�" :string)
-           ("F" "�" :string)
+           ("S" "�" :string)
+           ("�" "�" :string)
+           ("L" "�" :string)
+           ("p" "�" :string)
+           ("�" "�" :string)
+           ("Y" "�" :string)
+           ("K" "�" :string)
+           ("f" "�" :string)
            ("h" "�" :string)
-           ("H" "�" :string)
-           ("X" "�" :string)
+           ("y" "�" :string)
+           ("g" "�" :string)
+           ("j" "�" :string)
            ("�" "�" :string)
+           ("u" "�" :string)
+           ("d" "�" :string)
+           ("H" "�" :string)
+           ("z" "�" :string)
            ("I" "�" :string)
-           ("c" "�" :string)
+           ("E" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("N" "�" :string)
            ("O" "�" :string)
-           ("K" "�" :string)
-           ("z" "�" :string)
-           ("e" "�" :string)
+           ("D" "�" :string)
+           ("l" "�" :string)
+           ("F" "�" :string)
+           ("r" "�" :string)
            ("�" "�" :string)
-           ("y" "�" :string)
-           ("a" "�" :string)
-           ("j" "�" :string)
-           ("S" "�" :string)
            ("P" "�" :string)
-           ("�" "�" :string)
-           ("N" "�" :string)
-           ("Q" "�" :string)
-           ("A" "�" :string)
-           ("Y" "�" :string)
-           ("x" "�" :string)
-           ("Z" "�" :string)
-           ("C" "�" :string)
-           ("k" "�" :string)
-           ("m" "�" :string)
-           ("p" "�" :string)
-           ("V" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ))
 
 (define-rule-set "tr-resolve-case"
 
-  :rules  (("E" "8" :string)
-           ("�" "8" :string)
+  :rules  (("Q" "8" :string)
            ("�" "8" :string)
-           ("�" "8" :string)
-           ("D" "8" :string)
-           ("T" "8" :string)
-           ("H" "8" :string)
-           ("F" "8" :string)
+           ("Z" "8" :string)
+           ("A" "8" :string)
+           ("�" "8" :string)
            ("X" "8" :string)
-           ("�" "8" :string)
+           ("U" "8" :string)
            ("M" "8" :string)
+           ("B" "8" :string)
            ("W" "8" :string)
+           ("R" "8" :string)
            ("J" "8" :string)
            ("G" "8" :string)
-           ("R" "8" :string)
-           ("B" "8" :string)
-           ("�" "8" :string)
-           ("U" "8" :string)
+           ("V" "8" :string)
+           ("�" "8" :string)
+           ("O" "8" :string)
+           ("D" "8" :string)
+           ("P" "8" :string)
+           ("F" "8" :string)
+           ("I" "8" :string)
+           ("E" "8" :string)
+           ("H" "8" :string)
            ("�" "8" :string)
-           ("L" "8" :string)
-           ("N" "8" :string)
+           ("�" "8" :string)
            ("�" "8" :string)
-           ("P" "8" :string)
+           ("N" "8" :string)
+           ("L" "8" :string)
+           ("K" "8" :string)
            ("Y" "8" :string)
-           ("Q" "8" :string)
-           ("A" "8" :string)
-           ("Z" "8" :string)
-           ("�" "8" :string)
-           ("V" "8" :string)
            ("C" "8" :string)
-           ("I" "8" :string)
-           ("O" "8" :string)
-           ("K" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
            ("S" "8" :string)
-           ("g" "9" :string)
-           ("�" "9" :string)
+           ("T" "8" :string)
+           ("i" "9" :string)
+           ("t" "9" :string)
            ("q" "9" :string)
+           ("c" "9" :string)
            ("n" "9" :string)
-           ("h" "9" :string)
-           ("�" "9" :string)
-           ("s" "9" :string)
-           ("l" "9" :string)
-           ("w" "9" :string)
-           ("�" "9" :string)
-           ("i" "9" :string)
-           ("�" "9" :string)
-           ("f" "9" :string)
            ("v" "9" :string)
-           ("�" "9" :string)
-           ("d" "9" :string)
-           ("t" "9" :string)
            ("o" "9" :string)
-           ("u" "9" :string)
-           ("b" "9" :string)
-           ("r" "9" :string)
+           ("s" "9" :string)
+           ("w" "9" :string)
            ("x" "9" :string)
-           ("�" "9" :string)
-           ("m" "9" :string)
-           ("p" "9" :string)
-           ("k" "9" :string)
            ("�" "9" :string)
-           ("c" "9" :string)
-           ("y" "9" :string)
+           ("k" "9" :string)
+           ("m" "9" :string)
+           ("�" "9" :string)
+           ("l" "9" :string)
+           ("�" "9" :string)
            ("�" "9" :string)
-           ("a" "9" :string)
-           ("e" "9" :string)
+           ("r" "9" :string)
+           ("u" "9" :string)
            ("z" "9" :string)
+           ("d" "9" :string)
+           ("�" "9" :string)
+           ("p" "9" :string)
+           ("g" "9" :string)
+           ("y" "9" :string)
+           ("h" "9" :string)
+           ("f" "9" :string)
+           ("�" "9" :string)
            ("j" "9" :string)
+           ("�" "9" :string)
+           ("b" "9" :string)
+           ("e" "9" :string)
+           ("�" "9" :string)
+           ("a" "9" :string)
            ))
 
 (define-rule-set "tr-ignore-special"
 
   :rules  (("!" "" :string)
+           ("-" "" :string)
            ("." "" :string)
-           ("'" "" :string)
            ("?" "" :string)
-           ("-" "" :string)
+           ("'" "" :string)
            ))
 
 (define-rule-set "tr-resolve-special"
@@ -264,74 +264,74 @@
   :rules  (("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("Y" "�" :string)
-           ("Q" "�" :string)
-           ("A" "�" :string)
-           ("x" "�" :string)
-           ("P" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("N" "�" :string)
-           ("C" "�" :string)
-           ("k" "�" :string)
-           ("m" "�" :string)
-           ("p" "�" :string)
-           ("V" "�" :string)
-           ("�" "�" :string)
-           ("Z" "�" :string)
-           ("�" "�" :string)
-           ("K" "�" :string)
+           ("u" "�" :string)
+           ("d" "�" :string)
+           ("H" "�" :string)
+           ("z" "�" :string)
            ("I" "�" :string)
-           ("c" "�" :string)
+           ("E" "�" :string)
+           ("l" "�" :string)
+           ("P" "�" :string)
+           ("�" "�" :string)
+           ("r" "�" :string)
+           ("F" "�" :string)
+           ("�" "�" :string)
            ("O" "�" :string)
-           ("�" "�" :string)
-           ("j" "�" :string)
+           ("D" "�" :string)
+           ("�" "�" :string)
+           ("T" "�" :string)
+           ("a" "�" :string)
+           ("�" "�" :string)
            ("S" "�" :string)
+           ("C" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("e" "�" :string)
-           ("z" "�" :string)
+           ("b" "�" :string)
+           ("j" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("L" "�" :string)
+           ("p" "�" :string)
+           ("K" "�" :string)
+           ("f" "�" :string)
+           ("Y" "�" :string)
+           ("g" "�" :string)
+           ("h" "�" :string)
            ("y" "�" :string)
-           ("�" "�" :string)
-           ("a" "�" :string)
-           ("�" "�" :string)
-           ("q" "�" :string)
+           ("s" "�" :string)
+           ("w" "�" :string)
            ("n" "�" :string)
+           ("c" "�" :string)
+           ("v" "�" :string)
+           ("X" "�" :string)
+           ("o" "�" :string)
+           ("Z" "�" :string)
+           ("t" "�" :string)
+           ("A" "�" :string)
+           ("q" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("Q" "�" :string)
+           ("i" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("g" "�" :string)
-           ("E" "�" :string)
-           ("s" "�" :string)
-           ("H" "�" :string)
-           ("h" "�" :string)
-           ("F" "�" :string)
-           ("X" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("D" "�" :string)
-           ("T" "�" :string)
+           ("k" "�" :string)
+           ("V" "�" :string)
+           ("m" "�" :string)
+           ("R" "�" :string)
            ("J" "�" :string)
+           ("W" "�" :string)
            ("G" "�" :string)
-           ("v" "�" :string)
-           ("�" "�" :string)
-           ("i" "�" :string)
            ("M" "�" :string)
-           ("�" "�" :string)
-           ("W" "�" :string)
-           ("f" "�" :string)
-           ("l" "�" :string)
-           ("w" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("r" "�" :string)
-           ("�" "�" :string)
-           ("L" "�" :string)
-           ("u" "�" :string)
-           ("U" "�" :string)
-           ("b" "�" :string)
-           ("�" "�" :string)
-           ("o" "�" :string)
-           ("R" "�" :string)
-           ("d" "�" :string)
            ("B" "�" :string)
-           ("t" "�" :string)
+           ("�" "�" :string)
+           ("U" "�" :string)
+           ("x" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/turkish/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/turkish/utf8.xdy
index 0620ee24739..581d73ec0d2 100644
--- a/Master/texmf-dist/xindy/modules/lang/turkish/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/turkish/utf8.xdy
@@ -36,302 +36,302 @@
 
 (define-rule-set "tr-alphabetize"
 
-  :rules  (("â" "�" :string)
-           ("Â" "�" :string)
+  :rules  (("Â" "�" :string)
+           ("â" "�" :string)
            ("ç" "�" :string)
            ("Ç" "�" :string)
            ("ğ" "�" :string)
            ("Ğ" "�" :string)
            ("ı" "�" :string)
            ("İ" "�" :string)
-           ("Ö" "�" :string)
            ("ö" "�" :string)
+           ("Ö" "�" :string)
            ("Ş" "�" :string)
            ("ş" "�" :string)
            ("Û" "�" :string)
            ("û" "�" :string)
-           ("Ü" "�" :string)
            ("ü" "�" :string)
+           ("Ü" "�" :string)
            ("a" "�" :string)
            ("A" "�" :string)
-           ("B" "�" :string)
            ("b" "�" :string)
+           ("B" "�" :string)
            ("C" "�" :string)
            ("c" "�" :string)
            ("d" "�" :string)
            ("D" "�" :string)
-           ("e" "�" :string)
            ("E" "�" :string)
-           ("F" "�" :string)
+           ("e" "�" :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)
+           ("L" "�" :string)
            ("m" "�" :string)
            ("M" "�" :string)
            ("n" "�" :string)
            ("N" "�" :string)
            ("o" "�" :string)
            ("O" "�" :string)
-           ("P" "�" :string)
            ("p" "�" :string)
+           ("P" "�" :string)
            ("Q" "�" :string)
            ("q" "�" :string)
            ("R" "�" :string)
            ("r" "�" :string)
-           ("s" "�" :string)
            ("S" "�" :string)
+           ("s" "�" :string)
            ("t" "�" :string)
            ("T" "�" :string)
            ("u" "�" :string)
            ("U" "�" :string)
-           ("V" "�" :string)
            ("v" "�" :string)
+           ("V" "�" :string)
            ("W" "�" :string)
            ("w" "�" :string)
            ("x" "�" :string)
            ("X" "�" :string)
-           ("y" "�" :string)
            ("Y" "�" :string)
+           ("y" "�" :string)
            ("z" "�" :string)
            ("Z" "�" :string)
            ))
 
 (define-rule-set "tr-resolve-diacritics"
 
-  :rules  (("Ğ" "�" :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)
-           ("A" "�" :string)
+           ("Û" "�" :string)
+           ("â" "�" :string)
+           ("Â" "�" :string)
+           ("R" "�" :string)
+           ("E" "�" :string)
+           ("j" "�" :string)
+           ("B" "�" :string)
+           ("Q" "�" :string)
+           ("F" "�" :string)
+           ("a" "�" :string)
            ("r" "�" :string)
-           ("L" "�" :string)
-           ("s" "�" :string)
+           ("U" "�" :string)
+           ("i" "�" :string)
            ("t" "�" :string)
-           ("S" "�" :string)
-           ("H" "�" :string)
-           ("K" "�" :string)
            ("P" "�" :string)
-           ("l" "�" :string)
-           ("E" "�" :string)
-           ("k" "�" :string)
+           ("D" "�" :string)
+           ("L" "�" :string)
+           ("T" "�" :string)
+           ("X" "�" :string)
+           ("M" "�" :string)
            ("e" "�" :string)
+           ("A" "�" :string)
+           ("g" "�" :string)
+           ("w" "�" :string)
+           ("J" "�" :string)
+           ("q" "�" :string)
+           ("N" "�" :string)
            ("V" "�" :string)
-           ("i" "�" :string)
+           ("I" "�" :string)
            ("C" "�" :string)
+           ("h" "�" :string)
+           ("Y" "�" :string)
+           ("p" "�" :string)
+           ("f" "�" :string)
+           ("Z" "�" :string)
+           ("z" "�" :string)
+           ("l" "�" :string)
            ("x" "�" :string)
-           ("a" "�" :string)
-           ("R" "�" :string)
-           ("X" "�" :string)
-           ("m" "�" :string)
-           ("n" "�" :string)
-           ("Q" "�" :string)
-           ("y" "�" :string)
-           ("F" "�" :string)
            ("d" "�" :string)
+           ("G" "�" :string)
            ("W" "�" :string)
-           ("o" "�" :string)
-           ("J" "�" :string)
-           ("U" "�" :string)
-           ("N" "�" :string)
            ("b" "�" :string)
-           ("Y" "�" :string)
-           ("w" "�" :string)
-           ("B" "�" :string)
-           ("I" "�" :string)
-           ("v" "�" :string)
+           ("m" "�" :string)
+           ("y" "�" :string)
+           ("n" "�" :string)
+           ("k" "�" :string)
            ("u" "�" :string)
+           ("S" "�" :string)
+           ("s" "�" :string)
            ("O" "�" :string)
-           ("D" "�" :string)
-           ("j" "�" :string)
-           ("M" "�" :string)
            ("c" "�" :string)
-           ("G" "�" :string)
-           ("T" "�" :string)
-           ("p" "�" :string)
-           ("h" "�" :string)
-           ("g" "�" :string)
-           ("Z" "�" :string)
-           ("z" "�" :string)
-           ("q" "�" :string)
-           ("f" "�" :string)
+           ("K" "�" :string)
+           ("o" "�" :string)
+           ("v" "�" :string)
+           ("H" "�" :string)
            ))
 
 (define-rule-set "tr-resolve-case"
 
   :rules  (("İ" "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)
            ("ç" "9" :string)
-           ("â" "9" :string)
-           ("ö" "9" :string)
            ("ş" "9" :string)
+           ("ğ" "9" :string)
            ("û" "9" :string)
            ("ı" "9" :string)
+           ("â" "9" :string)
+           ("ö" "9" :string)
            ("ü" "9" :string)
+           ("B" "8" :string)
            ("Q" "8" :string)
            ("F" "8" :string)
-           ("W" "8" :string)
-           ("J" "8" :string)
+           ("U" "8" :string)
            ("R" "8" :string)
-           ("C" "8" :string)
-           ("X" "8" :string)
            ("E" "8" :string)
-           ("V" "8" :string)
+           ("J" "8" :string)
            ("A" "8" :string)
-           ("L" "8" :string)
-           ("H" "8" :string)
-           ("S" "8" :string)
-           ("P" "8" :string)
-           ("K" "8" :string)
-           ("Z" "8" :string)
-           ("T" "8" :string)
-           ("G" "8" :string)
+           ("N" "8" :string)
            ("I" "8" :string)
-           ("B" "8" :string)
+           ("V" "8" :string)
+           ("T" "8" :string)
+           ("X" "8" :string)
+           ("P" "8" :string)
+           ("L" "8" :string)
            ("D" "8" :string)
-           ("O" "8" :string)
            ("M" "8" :string)
-           ("N" "8" :string)
-           ("U" "8" :string)
+           ("W" "8" :string)
+           ("G" "8" :string)
            ("Y" "8" :string)
-           ("y" "9" :string)
-           ("d" "9" :string)
-           ("o" "9" :string)
-           ("a" "9" :string)
-           ("x" "9" :string)
-           ("m" "9" :string)
-           ("n" "9" :string)
-           ("k" "9" :string)
-           ("e" "9" :string)
+           ("C" "8" :string)
+           ("Z" "8" :string)
+           ("O" "8" :string)
+           ("H" "8" :string)
+           ("K" "8" :string)
+           ("S" "8" :string)
            ("i" "9" :string)
            ("t" "9" :string)
-           ("s" "9" :string)
+           ("a" "9" :string)
            ("r" "9" :string)
+           ("j" "9" :string)
+           ("g" "9" :string)
+           ("w" "9" :string)
+           ("q" "9" :string)
+           ("e" "9" :string)
+           ("d" "9" :string)
            ("l" "9" :string)
-           ("h" "9" :string)
+           ("x" "9" :string)
+           ("b" "9" :string)
+           ("m" "9" :string)
+           ("y" "9" :string)
            ("p" "9" :string)
-           ("g" "9" :string)
-           ("z" "9" :string)
+           ("h" "9" :string)
            ("f" "9" :string)
-           ("q" "9" :string)
+           ("z" "9" :string)
            ("c" "9" :string)
+           ("s" "9" :string)
+           ("o" "9" :string)
            ("v" "9" :string)
+           ("n" "9" :string)
+           ("k" "9" :string)
            ("u" "9" :string)
-           ("j" "9" :string)
-           ("b" "9" :string)
-           ("w" "9" :string)
            ))
 
 (define-rule-set "tr-ignore-special"
 
-  :rules  (("!" "" :string)
-           ("." "" :string)
+  :rules  (("-" "" :string)
            ("'" "" :string)
            ("?" "" :string)
-           ("-" "" :string)
+           ("." "" :string)
+           ("!" "" :string)
            ))
 
 (define-rule-set "tr-resolve-special"
 
-  :rules  (("Ç" "�" :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)
-           ("k" "�" :string)
-           ("E" "�" :string)
-           ("e" "�" :string)
-           ("V" "�" :string)
-           ("i" "�" :string)
-           ("A" "�" :string)
-           ("r" "�" :string)
-           ("L" "�" :string)
-           ("t" "�" :string)
-           ("s" "�" :string)
            ("S" "�" :string)
-           ("H" "�" :string)
-           ("l" "�" :string)
-           ("P" "�" :string)
+           ("u" "�" :string)
+           ("k" "�" :string)
+           ("n" "�" :string)
+           ("v" "�" :string)
+           ("o" "�" :string)
            ("K" "�" :string)
-           ("y" "�" :string)
-           ("Q" "�" :string)
-           ("d" "�" :string)
-           ("F" "�" :string)
+           ("H" "�" :string)
+           ("s" "�" :string)
+           ("c" "�" :string)
+           ("O" "�" :string)
+           ("z" "�" :string)
+           ("f" "�" :string)
+           ("Z" "�" :string)
+           ("h" "�" :string)
+           ("C" "�" :string)
+           ("p" "�" :string)
+           ("Y" "�" :string)
            ("W" "�" :string)
-           ("o" "�" :string)
-           ("J" "�" :string)
+           ("G" "�" :string)
+           ("y" "�" :string)
+           ("m" "�" :string)
+           ("b" "�" :string)
            ("x" "�" :string)
-           ("C" "�" :string)
-           ("R" "�" :string)
-           ("a" "�" :string)
+           ("l" "�" :string)
+           ("d" "�" :string)
+           ("M" "�" :string)
+           ("e" "�" :string)
+           ("D" "�" :string)
+           ("L" "�" :string)
+           ("P" "�" :string)
            ("X" "�" :string)
-           ("m" "�" :string)
-           ("n" "�" :string)
-           ("B" "�" :string)
+           ("T" "�" :string)
+           ("V" "�" :string)
            ("I" "�" :string)
-           ("v" "�" :string)
-           ("O" "�" :string)
-           ("u" "�" :string)
-           ("D" "�" :string)
-           ("M" "�" :string)
-           ("j" "�" :string)
            ("N" "�" :string)
-           ("U" "�" :string)
-           ("b" "�" :string)
-           ("Y" "�" :string)
+           ("A" "�" :string)
+           ("q" "�" :string)
+           ("J" "�" :string)
            ("w" "�" :string)
-           ("p" "�" :string)
-           ("h" "�" :string)
            ("g" "�" :string)
-           ("Z" "�" :string)
-           ("z" "�" :string)
-           ("q" "�" :string)
-           ("f" "�" :string)
-           ("c" "�" :string)
-           ("G" "�" :string)
-           ("T" "�" :string)
+           ("E" "�" :string)
+           ("R" "�" :string)
+           ("j" "�" :string)
+           ("a" "�" :string)
+           ("r" "�" :string)
+           ("t" "�" :string)
+           ("i" "�" :string)
+           ("U" "�" :string)
+           ("F" "�" :string)
+           ("B" "�" :string)
+           ("Q" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/ukrainian/cp1251.xdy b/Master/texmf-dist/xindy/modules/lang/ukrainian/cp1251.xdy
index c408eee2687..c97aea7f233 100644
--- a/Master/texmf-dist/xindy/modules/lang/ukrainian/cp1251.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/ukrainian/cp1251.xdy
@@ -42,34 +42,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)
@@ -82,12 +82,12 @@
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
@@ -96,189 +96,189 @@
            ("�" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :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 "uk-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)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ))
 
 (define-rule-set "uk-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)
+           ("�" "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)
+           ("�" "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)
            ))
 
 (define-rule-set "uk-ignore-special"
 
   :rules  (("?" "" :string)
-           ("'" "" :string)
            ("." "" :string)
-           ("!" "" :string)
            ("-" "" :string)
+           ("!" "" :string)
+           ("'" "" :string)
            ))
 
 (define-rule-set "uk-resolve-special"
@@ -286,80 +286,80 @@
   :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)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/ukrainian/koi8-u.xdy b/Master/texmf-dist/xindy/modules/lang/ukrainian/koi8-u.xdy
index 18cd3a3d6f7..67d25897810 100644
--- a/Master/texmf-dist/xindy/modules/lang/ukrainian/koi8-u.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/ukrainian/koi8-u.xdy
@@ -42,243 +42,243 @@
 
   :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)
            ))
 
 (define-rule-set "uk-resolve-diacritics"
 
-  :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)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :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 "uk-resolve-case"
 
-  :rules  (("�" "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)
            ("�" "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)
+           ("�" "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)
            ))
 
 (define-rule-set "uk-ignore-special"
 
-  :rules  (("'" "" :string)
-           ("?" "" :string)
-           ("!" "" :string)
-           ("-" "" :string)
+  :rules  (("-" "" :string)
            ("." "" :string)
+           ("!" "" :string)
+           ("?" "" :string)
+           ("'" "" :string)
            ))
 
 (define-rule-set "uk-resolve-special"
@@ -286,80 +286,80 @@
   :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)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/ukrainian/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/ukrainian/utf8.xdy
index 81fefb20338..9d6a785d1ab 100644
--- a/Master/texmf-dist/xindy/modules/lang/ukrainian/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/ukrainian/utf8.xdy
@@ -40,42 +40,42 @@
 
 (define-rule-set "uk-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)
            ("Н" "�" :string)
            ("н" "�" :string)
            ("О" "�" :string)
@@ -84,30 +84,30 @@
            ("П" "�" :string)
            ("Р" "�" :string)
            ("р" "�" :string)
-           ("с" "�" :string)
            ("С" "�" :string)
-           ("т" "�" :string)
+           ("с" "�" :string)
            ("Т" "�" :string)
-           ("у" "�" :string)
+           ("т" "�" :string)
            ("У" "�" :string)
+           ("у" "�" :string)
            ("Ф" "�" :string)
            ("ф" "�" :string)
-           ("х" "�" :string)
            ("Х" "�" :string)
-           ("ц" "�" :string)
+           ("х" "�" :string)
            ("Ц" "�" :string)
-           ("ч" "�" :string)
+           ("ц" "�" :string)
            ("Ч" "�" :string)
-           ("Ш" "�" :string)
+           ("ч" "�" :string)
            ("ш" "�" :string)
-           ("щ" "�" :string)
+           ("Ш" "�" :string)
            ("Щ" "�" :string)
-           ("ъ" "�" :string)
+           ("щ" "�" :string)
            ("Ъ" "�" :string)
+           ("ъ" "�" :string)
            ("Ы" "�" :string)
            ("ы" "�" :string)
-           ("э" "�" :string)
            ("Э" "�" :string)
+           ("э" "�" :string)
            ("Ю" "�" :string)
            ("ю" "�" :string)
            ("Я" "�" :string)
@@ -118,245 +118,245 @@
 
 (define-rule-set "uk-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)
            ))
 
 (define-rule-set "uk-resolve-case"
 
-  :rules  (("Ф" "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)
-           ("Ц" "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)
+           ("Ц" "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)
+           ("т" "9" :string)
+           ("ч" "9" :string)
+           ("п" "9" :string)
+           ("і" "9" :string)
            ))
 
 (define-rule-set "uk-ignore-special"
 
-  :rules  (("." "" :string)
+  :rules  (("-" "" :string)
            ("!" "" :string)
+           ("." "" :string)
            ("'" "" :string)
            ("?" "" :string)
-           ("-" "" :string)
            ))
 
 (define-rule-set "uk-resolve-special"
 
-  :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)
+           ("є" "�" :string)
            ("Ё" "�" :string)
-           ("Н" "�" :string)
+           ("а" "�" :string)
+           ("с" "�" :string)
            ("й" "�" :string)
-           ("д" "�" :string)
-           ("х" "�" :string)
-           ("Ь" "�" :string)
+           ("Ж" "�" :string)
+           ("л" "�" :string)
            ("Г" "�" :string)
-           ("Ї" "�" :string)
-           ("Й" "�" :string)
-           ("Б" "�" :string)
-           ("Э" "�" :string)
-           ("Ф" "�" :string)
+           ("у" "�" :string)
+           ("ё" "�" :string)
+           ("Д" "�" :string)
            ("э" "�" :string)
-           ("м" "�" :string)
-           ("Т" "�" :string)
-           ("О" "�" :string)
-           ("с" "�" :string)
-           ("ґ" "�" :string)
-           ("Ґ" "�" :string)
-           ("І" "�" :string)
+           ("Э" "�" :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/upper-sorbian/cp1250.xdy b/Master/texmf-dist/xindy/modules/lang/upper-sorbian/cp1250.xdy
index c3d1e30e8d6..a555ce02436 100644
--- a/Master/texmf-dist/xindy/modules/lang/upper-sorbian/cp1250.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/upper-sorbian/cp1250.xdy
@@ -41,163 +41,163 @@
 
 (define-rule-set "s2-alphabetize"
 
-  :rules  (("D�" "�" :string)
+  :rules  (("d�" "�" :string)
            ("D�" "�" :string)
-           ("d�" "�" :string)
+           ("D�" "�" :string)
            ("ch" "�" :string)
            ("CH" "�" :string)
            ("Ch" "�" :string)
-           ("A" "�" :string)
            ("a" "�" :string)
-           ("B" "�" :string)
+           ("A" "�" :string)
            ("b" "�" :string)
-           ("C" "�" :string)
+           ("B" "�" :string)
            ("c" "�" :string)
-           ("�" "�" :string)
+           ("C" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("D" "�" :string)
            ("d" "�" :string)
            ("e" "�" :string)
            ("E" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("f" "�" :string)
            ("F" "�" :string)
+           ("f" "�" :string)
            ("g" "�" :string)
            ("G" "�" :string)
            ("H" "�" :string)
            ("h" "�" :string)
-           ("I" "�" :string)
            ("i" "�" :string)
+           ("I" "�" :string)
            ("j" "�" :string)
            ("J" "�" :string)
-           ("k" "�" :string)
            ("K" "�" :string)
-           ("�" "�" :string)
+           ("k" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("L" "�" :string)
            ("l" "�" :string)
            ("m" "�" :string)
            ("M" "�" :string)
            ("N" "�" :string)
            ("n" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("o" "�" :string)
            ("O" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("p" "�" :string)
            ("P" "�" :string)
-           ("Q" "�" :string)
+           ("p" "�" :string)
            ("q" "�" :string)
+           ("Q" "�" :string)
            ("R" "�" :string)
            ("r" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("S" "�" :string)
            ("s" "�" :string)
            ("�" "��" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("t" "�" :string)
            ("T" "�" :string)
+           ("t" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("u" "�" :string)
            ("U" "�" :string)
-           ("V" "�" :string)
            ("v" "�" :string)
-           ("w" "�" :string)
+           ("V" "�" :string)
            ("W" "�" :string)
+           ("w" "�" :string)
            ("X" "�" :string)
            ("x" "�" :string)
            ("Y" "�" :string)
            ("y" "�" :string)
            ("Z" "�" :string)
            ("z" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ))
 
 (define-rule-set "s2-resolve-diacritics"
 
-  :rules  (("Ch" "�" :string)
-           ("CH" "�" :string)
+  :rules  (("D�" "�" :string)
            ("d�" "�" :string)
+           ("CH" "�" :string)
            ("ch" "�" :string)
-           ("D�" "�" :string)
+           ("Ch" "�" :string)
            ("D�" "�" :string)
+           ("g" "�" :string)
+           ("C" "�" :string)
+           ("J" "�" :string)
+           ("�" "�" :string)
+           ("l" "�" :string)
+           ("o" "�" :string)
            ("i" "�" :string)
-           ("O" "�" :string)
-           ("n" "�" :string)
+           ("j" "�" :string)
+           ("b" "�" :string)
+           ("�" "�" :string)
+           ("t" "�" :string)
+           ("�" "�" :string)
+           ("q" "�" :string)
+           ("U" "�" :string)
+           ("A" "�" :string)
+           ("N" "�" :string)
            ("W" "�" :string)
-           ("a" "�" :string)
-           ("P" "�" :string)
+           ("z" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("Y" "�" :string)
+           ("c" "�" :string)
+           ("�" "�" :string)
+           ("F" "�" :string)
            ("K" "�" :string)
            ("�" "�" :string)
-           ("N" "�" :string)
-           ("L" "�" :string)
-           ("x" "�" :string)
-           ("G" "�" :string)
-           ("l" "�" :string)
-           ("g" "�" :string)
-           ("�" "�" :string)
-           ("h" "�" :string)
+           ("R" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("V" "�" :string)
            ("v" "�" :string)
-           ("�" "�" :string)
-           ("c" "�" :string)
+           ("L" "�" :string)
+           ("Z" "�" :string)
            ("T" "�" :string)
-           ("�" "�" :string)
-           ("y" "�" :string)
-           ("q" "�" :string)
-           ("J" "�" :string)
+           ("D" "�" :string)
+           ("�" "�" :string)
+           ("u" "�" :string)
+           ("P" "�" :string)
+           ("a" "�" :string)
+           ("S" "�" :string)
+           ("Q" "�" :string)
            ("p" "�" :string)
-           ("X" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
+           ("k" "�" :string)
+           ("�" "�" :string)
            ("M" "�" :string)
-           ("z" "�" :string)
-           ("Y" "�" :string)
+           ("�" "�" :string)
+           ("h" "�" :string)
+           ("n" "�" :string)
+           ("E" "�" :string)
+           ("�" "�" :string)
+           ("O" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("A" "�" :string)
-           ("�" "�" :string)
-           ("H" "�" :string)
            ("w" "�" :string)
-           ("t" "�" :string)
            ("m" "�" :string)
-           ("r" "�" :string)
-           ("Z" "�" :string)
-           ("I" "�" :string)
-           ("S" "�" :string)
-           ("d" "�" :string)
-           ("o" "�" :string)
-           ("�" "�" :string)
-           ("E" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("C" "�" :string)
-           ("s" "�" :string)
-           ("R" "�" :string)
+           ("�" "�" :string)
+           ("X" "�" :string)
+           ("x" "�" :string)
            ("B" "�" :string)
-           ("V" "�" :string)
-           ("�" "�" :string)
+           ("f" "�" :string)
+           ("G" "�" :string)
+           ("d" "�" :string)
            ("�" "�" :string)
-           ("b" "�" :string)
-           ("U" "�" :string)
+           ("r" "�" :string)
+           ("I" "�" :string)
+           ("�" "�" :string)
            ("e" "�" :string)
-           ("f" "�" :string)
-           ("�" "�" :string)
-           ("F" "�" :string)
-           ("j" "�" :string)
-           ("�" "�" :string)
-           ("u" "�" :string)
-           ("D" "�" :string)
-           ("k" "�" :string)
-           ("�" "�" :string)
-           ("Q" "�" :string)
-           ("�" "�" :string)
+           ("s" "�" :string)
+           ("�" "�" :string)
+           ("y" "�" :string)
+           ("H" "�" :string)
            ("�" "�" :string)
            ))
 
@@ -205,173 +205,173 @@
 
   :rules  (("D�" "7" :string)
            ("CH" "7" :string)
-           ("D�" "8" :string)
            ("Ch" "8" :string)
+           ("D�" "8" :string)
            ("ch" "9" :string)
            ("d�" "9" :string)
-           ("E" "8" :string)
-           ("�" "8" :string)
-           ("C" "8" :string)
-           ("R" "8" :string)
-           ("S" "8" :string)
-           ("�" "8" :string)
-           ("Z" "8" :string)
-           ("I" "8" :string)
-           ("H" "8" :string)
-           ("D" "8" :string)
-           ("Q" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("F" "8" :string)
-           ("�" "8" :string)
            ("U" "8" :string)
-           ("B" "8" :string)
-           ("V" "8" :string)
-           ("G" "8" :string)
-           ("�" "8" :string)
+           ("W" "8" :string)
+           ("A" "8" :string)
            ("N" "8" :string)
+           ("C" "8" :string)
+           ("J" "8" :string)
+           ("�" "8" :string)
+           ("V" "8" :string)
+           ("�" "8" :string)
+           ("Z" "8" :string)
+           ("T" "8" :string)
            ("L" "8" :string)
+           ("D" "8" :string)
+           ("�" "8" :string)
            ("P" "8" :string)
+           ("S" "8" :string)
+           ("Y" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("F" "8" :string)
            ("K" "8" :string)
+           ("R" "8" :string)
+           ("M" "8" :string)
+           ("�" "8" :string)
+           ("�" "8" :string)
+           ("E" "8" :string)
+           ("�" "8" :string)
            ("O" "8" :string)
-           ("W" "8" :string)
-           ("A" "8" :string)
+           ("Q" "8" :string)
            ("�" "8" :string)
-           ("M" "8" :string)
-           ("Y" "8" :string)
-           ("J" "8" :string)
+           ("H" "8" :string)
+           ("B" "8" :string)
            ("X" "8" :string)
-           ("T" "8" :string)
-           ("�" "8" :string)
-           ("�" "9" :string)
-           ("s" "9" :string)
-           ("d" "9" :string)
-           ("o" "9" :string)
-           ("w" "9" :string)
+           ("I" "8" :string)
+           ("G" "8" :string)
+           ("b" "9" :string)
            ("t" "9" :string)
-           ("m" "9" :string)
-           ("r" "9" :string)
-           ("k" "9" :string)
-           ("e" "9" :string)
-           ("f" "9" :string)
+           ("�" "9" :string)
            ("j" "9" :string)
-           ("u" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("b" "9" :string)
-           ("x" "9" :string)
-           ("l" "9" :string)
+           ("q" "9" :string)
+           ("�" "9" :string)
            ("g" "9" :string)
-           ("h" "9" :string)
-           ("�" "9" :string)
-           ("n" "9" :string)
+           ("l" "9" :string)
+           ("o" "9" :string)
            ("i" "9" :string)
+           ("�" "9" :string)
+           ("v" "9" :string)
+           ("u" "9" :string)
            ("a" "9" :string)
-           ("�" "9" :string)
            ("z" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("q" "9" :string)
+           ("c" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
+           ("n" "9" :string)
+           ("h" "9" :string)
            ("p" "9" :string)
+           ("k" "9" :string)
            ("�" "9" :string)
-           ("v" "9" :string)
-           ("�" "9" :string)
-           ("c" "9" :string)
+           ("e" "9" :string)
+           ("s" "9" :string)
            ("y" "9" :string)
+           ("�" "9" :string)
+           ("m" "9" :string)
+           ("�" "9" :string)
+           ("w" "9" :string)
+           ("x" "9" :string)
+           ("d" "9" :string)
+           ("�" "9" :string)
+           ("r" "9" :string)
+           ("f" "9" :string)
            ("�" "99" :string)
            ))
 
 (define-rule-set "s2-ignore-special"
 
-  :rules  (("!" "" :string)
+  :rules  (("'" "" :string)
            ("." "" :string)
-           ("-" "" :string)
            ("?" "" :string)
-           ("'" "" :string)
+           ("!" "" :string)
+           ("-" "" :string)
            ))
 
 (define-rule-set "s2-resolve-special"
 
   :rules  (("CH" "�" :string)
-           ("Ch" "�" :string)
            ("d�" "�" :string)
-           ("D�" "�" :string)
            ("ch" "�" :string)
+           ("D�" "�" :string)
            ("D�" "�" :string)
+           ("Ch" "�" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("l" "�" :string)
-           ("G" "�" :string)
-           ("�" "�" :string)
-           ("h" "�" :string)
-           ("g" "�" :string)
-           ("x" "�" :string)
-           ("L" "�" :string)
-           ("N" "�" :string)
+           ("�" "�" :string)
+           ("R" "�" :string)
+           ("F" "�" :string)
            ("K" "�" :string)
+           ("z" "�" :string)
+           ("c" "�" :string)
+           ("�" "�" :string)
+           ("Y" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("u" "�" :string)
+           ("�" "�" :string)
+           ("D" "�" :string)
+           ("S" "�" :string)
            ("P" "�" :string)
-           ("�" "�" :string)
            ("a" "�" :string)
-           ("W" "�" :string)
-           ("n" "�" :string)
-           ("O" "�" :string)
+           ("V" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("T" "�" :string)
+           ("Z" "�" :string)
+           ("L" "�" :string)
+           ("v" "�" :string)
+           ("o" "�" :string)
+           ("�" "�" :string)
+           ("l" "�" :string)
            ("i" "�" :string)
-           ("�" "�" :string)
-           ("A" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("Y" "�" :string)
-           ("�" "�" :string)
-           ("M" "�" :string)
-           ("z" "�" :string)
-           ("�" "�" :string)
-           ("X" "�" :string)
-           ("p" "�" :string)
            ("J" "�" :string)
+           ("g" "�" :string)
+           ("C" "�" :string)
+           ("U" "�" :string)
            ("q" "�" :string)
-           ("y" "�" :string)
-           ("T" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("v" "�" :string)
-           ("c" "�" :string)
+           ("�" "�" :string)
+           ("W" "�" :string)
+           ("N" "�" :string)
+           ("A" "�" :string)
+           ("t" "�" :string)
            ("�" "�" :string)
-           ("C" "�" :string)
-           ("s" "�" :string)
-           ("R" "�" :string)
-           ("�" "�" :string)
-           ("E" "�" :string)
-           ("o" "�" :string)
-           ("d" "�" :string)
-           ("�" "�" :string)
-           ("S" "�" :string)
-           ("Z" "�" :string)
-           ("I" "�" :string)
+           ("b" "�" :string)
+           ("j" "�" :string)
+           ("B" "�" :string)
+           ("x" "�" :string)
+           ("X" "�" :string)
            ("r" "�" :string)
-           ("H" "�" :string)
+           ("I" "�" :string)
+           ("�" "�" :string)
+           ("d" "�" :string)
+           ("f" "�" :string)
+           ("G" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("m" "�" :string)
            ("w" "�" :string)
-           ("t" "�" :string)
+           ("y" "�" :string)
+           ("�" "�" :string)
+           ("H" "�" :string)
+           ("e" "�" :string)
+           ("�" "�" :string)
+           ("s" "�" :string)
+           ("k" "�" :string)
+           ("Q" "�" :string)
+           ("p" "�" :string)
            ("�" "�" :string)
+           ("E" "�" :string)
+           ("O" "�" :string)
+           ("M" "�" :string)
            ("�" "�" :string)
-           ("Q" "�" :string)
-           ("D" "�" :string)
-           ("k" "�" :string)
-           ("F" "�" :string)
-           ("u" "�" :string)
-           ("�" "�" :string)
-           ("j" "�" :string)
-           ("e" "�" :string)
+           ("h" "�" :string)
+           ("n" "�" :string)
            ("�" "�" :string)
-           ("f" "�" :string)
-           ("b" "�" :string)
-           ("U" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("V" "�" :string)
-           ("B" "�" :string)
            ("�" "��" :string)
            ("-" "�" :string)
            ("'" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/upper-sorbian/latin2.xdy b/Master/texmf-dist/xindy/modules/lang/upper-sorbian/latin2.xdy
index eef095c0292..4b49a83e22f 100644
--- a/Master/texmf-dist/xindy/modules/lang/upper-sorbian/latin2.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/upper-sorbian/latin2.xdy
@@ -41,337 +41,337 @@
 
 (define-rule-set "s2-alphabetize"
 
-  :rules  (("d�" "�" :string)
+  :rules  (("D�" "�" :string)
+           ("d�" "�" :string)
            ("D�" "�" :string)
-           ("D�" "�" :string)
-           ("Ch" "�" :string)
            ("ch" "�" :string)
+           ("Ch" "�" :string)
            ("CH" "�" :string)
-           ("a" "�" :string)
            ("A" "�" :string)
-           ("b" "�" :string)
+           ("a" "�" :string)
            ("B" "�" :string)
+           ("b" "�" :string)
            ("C" "�" :string)
            ("c" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
+           ("�" "�" :string)
            ("D" "�" :string)
            ("d" "�" :string)
-           ("E" "�" :string)
            ("e" "�" :string)
+           ("E" "�" :string)
            ("�" "�" :string)
            ("�" "�" :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)
-           ("K" "�" :string)
+           ("j" "�" :string)
            ("k" "�" :string)
+           ("K" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("l" "�" :string)
            ("L" "�" :string)
-           ("M" "�" :string)
+           ("l" "�" :string)
            ("m" "�" :string)
+           ("M" "�" :string)
            ("N" "�" :string)
            ("n" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("o" "�" :string)
            ("O" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("P" "�" :string)
+           ("�" "�" :string)
            ("p" "�" :string)
+           ("P" "�" :string)
            ("Q" "�" :string)
            ("q" "�" :string)
            ("r" "�" :string)
            ("R" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
-           ("s" "�" :string)
            ("S" "�" :string)
+           ("s" "�" :string)
            ("�" "��" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ("T" "�" :string)
            ("t" "�" :string)
-           ("�" "�" :string)
            ("�" "�" :string)
-           ("u" "�" :string)
+           ("�" "�" :string)
            ("U" "�" :string)
+           ("u" "�" :string)
            ("v" "�" :string)
            ("V" "�" :string)
-           ("w" "�" :string)
            ("W" "�" :string)
-           ("X" "�" :string)
+           ("w" "�" :string)
            ("x" "�" :string)
-           ("Y" "�" :string)
+           ("X" "�" :string)
            ("y" "�" :string)
-           ("z" "�" :string)
+           ("Y" "�" :string)
            ("Z" "�" :string)
+           ("z" "�" :string)
            ("�" "�" :string)
            ("�" "�" :string)
            ))
 
 (define-rule-set "s2-resolve-diacritics"
 
-  :rules  (("CH" "�" :string)
+  :rules  (("d�" "�" :string)
+           ("Ch" "�" :string)
            ("D�" "�" :string)
            ("ch" "�" :string)
-           ("d�" "�" :string)
-           ("Ch" "�" :string)
+           ("CH" "�" :string)
            ("D�" "�" :string)
-           ("x" "�" :string)
-           ("�" "�" :string)
-           ("B" "�" :string)
-           ("S" "�" :string)
-           ("I" "�" :string)
-           ("R" "�" :string)
-           ("h" "�" :string)
-           ("�" "�" :string)
-           ("W" "�" :string)
-           ("�" "�" :string)
            ("G" "�" :string)
-           ("A" "�" :string)
-           ("g" "�" :string)
-           ("V" "�" :string)
-           ("q" "�" :string)
-           ("�" "�" :string)
-           ("O" "�" :string)
-           ("�" "�" :string)
-           ("y" "�" :string)
-           ("f" "�" :string)
-           ("C" "�" :string)
-           ("�" "�" :string)
-           ("M" "�" :string)
-           ("t" "�" :string)
-           ("b" "�" :string)
-           ("�" "�" :string)
-           ("r" "�" :string)
+           ("Z" "�" :string)
            ("X" "�" :string)
            ("c" "�" :string)
-           ("e" "�" :string)
-           ("L" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("Q" "�" :string)
+           ("�" "�" :string)
+           ("C" "�" :string)
+           ("i" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("H" "�" :string)
-           ("U" "�" :string)
+           ("K" "�" :string)
+           ("o" "�" :string)
+           ("S" "�" :string)
+           ("f" "�" :string)
+           ("O" "�" :string)
+           ("�" "�" :string)
            ("m" "�" :string)
-           ("a" "�" :string)
+           ("z" "�" :string)
+           ("g" "�" :string)
+           ("r" "�" :string)
+           ("J" "�" :string)
            ("�" "�" :string)
+           ("p" "�" :string)
+           ("B" "�" :string)
+           ("A" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("N" "�" :string)
+           ("�" "�" :string)
+           ("k" "�" :string)
            ("D" "�" :string)
-           ("�" "�" :string)
+           ("x" "�" :string)
+           ("h" "�" :string)
+           ("W" "�" :string)
+           ("P" "�" :string)
+           ("u" "�" :string)
+           ("U" "�" :string)
            ("n" "�" :string)
-           ("z" "�" :string)
-           ("Y" "�" :string)
-           ("o" "�" :string)
+           ("�" "�" :string)
            ("T" "�" :string)
-           ("�" "�" :string)
-           ("k" "�" :string)
-           ("�" "�" :string)
-           ("u" "�" :string)
-           ("w" "�" :string)
-           ("p" "�" :string)
-           ("s" "�" :string)
-           ("d" "�" :string)
+           ("I" "�" :string)
+           ("E" "�" :string)
            ("l" "�" :string)
-           ("i" "�" :string)
-           ("Z" "�" :string)
+           ("q" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("j" "�" :string)
-           ("v" "�" :string)
-           ("�" "�" :string)
-           ("F" "�" :string)
            ("�" "�" :string)
-           ("�" "�" :string)
-           ("K" "�" :string)
-           ("P" "�" :string)
-           ("J" "�" :string)
-           ("N" "�" :string)
-           ("E" "�" :string)
-           ("Q" "�" :string)
+           ("Y" "�" :string)
+           ("R" "�" :string)
+           ("H" "�" :string)
+           ("a" "�" :string)
+           ("F" "�" :string)
+           ("t" "�" :string)
+           ("�" "�" :string)
+           ("w" "�" :string)
+           ("�" "�" :string)
+           ("L" "�" :string)
+           ("�" "�" :string)
+           ("d" "�" :string)
+           ("e" "�" :string)
+           ("�" "�" :string)
+           ("V" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("s" "�" :string)
+           ("v" "�" :string)
+           ("y" "�" :string)
+           ("j" "�" :string)
+           ("b" "�" :string)
+           ("M" "�" :string)
            ("�" "�" :string)
            ))
 
 (define-rule-set "s2-resolve-case"
 
-  :rules  (("D�" "7" :string)
-           ("CH" "7" :string)
+  :rules  (("CH" "7" :string)
+           ("D�" "7" :string)
            ("Ch" "8" :string)
            ("D�" "8" :string)
            ("d�" "9" :string)
            ("ch" "9" :string)
-           ("K" "8" :string)
-           ("E" "8" :string)
-           ("N" "8" :string)
-           ("Q" "8" :string)
            ("P" "8" :string)
-           ("J" "8" :string)
-           ("�" "8" :string)
-           ("F" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
-           ("Z" "8" :string)
-           ("D" "8" :string)
+           ("W" "8" :string)
+           ("I" "8" :string)
            ("T" "8" :string)
-           ("�" "8" :string)
-           ("Y" "8" :string)
-           ("L" "8" :string)
-           ("X" "8" :string)
-           ("�" "8" :string)
-           ("�" "8" :string)
+           ("�" "8" :string)
            ("U" "8" :string)
+           ("�" "8" :string)
+           ("Y" "8" :string)
+           ("�" "8" :string)
+           ("E" "8" :string)
+           ("�" "8" :string)
+           ("F" "8" :string)
            ("H" "8" :string)
+           ("R" "8" :string)
            ("�" "8" :string)
-           ("C" "8" :string)
-           ("M" "8" :string)
-           ("A" "8" :string)
+           ("L" "8" :string)
+           ("�" "8" :string)
            ("V" "8" :string)
+           ("M" "8" :string)
+           ("X" "8" :string)
+           ("Z" "8" :string)
            ("G" "8" :string)
+           ("�" "8" :string)
+           ("C" "8" :string)
+           ("Q" "8" :string)
            ("O" "8" :string)
            ("S" "8" :string)
+           ("�" "8" :string)
+           ("K" "8" :string)
+           ("J" "8" :string)
            ("B" "8" :string)
-           ("�" "8" :string)
-           ("W" "8" :string)
-           ("�" "8" :string)
-           ("R" "8" :string)
-           ("I" "8" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("j" "9" :string)
-           ("v" "9" :string)
-           ("s" "9" :string)
+           ("A" "8" :string)
+           ("D" "8" :string)
+           ("N" "8" :string)
+           ("�" "8" :string)
            ("u" "9" :string)
-           ("w" "9" :string)
-           ("p" "9" :string)
-           ("�" "9" :string)
-           ("i" "9" :string)
-           ("l" "9" :string)
-           ("d" "9" :string)
-           ("z" "9" :string)
+           ("h" "9" :string)
            ("n" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
-           ("k" "9" :string)
-           ("o" "9" :string)
-           ("�" "9" :string)
+           ("q" "9" :string)
+           ("l" "9" :string)
+           ("w" "9" :string)
+           ("t" "9" :string)
+           ("a" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
            ("e" "9" :string)
-           ("c" "9" :string)
+           ("d" "9" :string)
+           ("v" "9" :string)
+           ("�" "9" :string)
+           ("s" "9" :string)
+           ("j" "9" :string)
            ("b" "9" :string)
-           ("r" "9" :string)
-           ("a" "9" :string)
+           ("y" "9" :string)
+           ("c" "9" :string)
+           ("i" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
            ("m" "9" :string)
+           ("�" "9" :string)
            ("f" "9" :string)
-           ("t" "9" :string)
-           ("q" "9" :string)
-           ("�" "9" :string)
+           ("o" "9" :string)
+           ("�" "9" :string)
+           ("r" "9" :string)
            ("g" "9" :string)
-           ("y" "9" :string)
-           ("�" "9" :string)
-           ("�" "9" :string)
+           ("z" "9" :string)
+           ("p" "9" :string)
+           ("�" "9" :string)
+           ("�" "9" :string)
            ("x" "9" :string)
-           ("h" "9" :string)
+           ("k" "9" :string)
            ("�" "99" :string)
            ))
 
 (define-rule-set "s2-ignore-special"
 
-  :rules  (("-" "" :string)
-           ("'" "" :string)
-           ("!" "" :string)
-           ("?" "" :string)
+  :rules  (("?" "" :string)
+           ("-" "" :string)
            ("." "" :string)
+           ("!" "" :string)
+           ("'" "" :string)
            ))
 
 (define-rule-set "s2-resolve-special"
 
-  :rules  (("D�" "�" :string)
+  :rules  (("ch" "�" :string)
+           ("D�" "�" :string)
+           ("d�" "�" :string)
+           ("Ch" "�" :string)
            ("CH" "�" :string)
            ("D�" "�" :string)
-           ("Ch" "�" :string)
-           ("d�" "�" :string)
-           ("ch" "�" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("t" "�" :string)
-           ("M" "�" :string)
-           ("�" "�" :string)
-           ("C" "�" :string)
-           ("f" "�" :string)
-           ("�" "�" :string)
-           ("H" "�" :string)
-           ("U" "�" :string)
-           ("a" "�" :string)
-           ("m" "�" :string)
-           ("X" "�" :string)
-           ("b" "�" :string)
-           ("�" "�" :string)
-           ("r" "�" :string)
-           ("L" "�" :string)
-           ("�" "�" :string)
-           ("e" "�" :string)
-           ("c" "�" :string)
-           ("R" "�" :string)
-           ("I" "�" :string)
-           ("W" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("h" "�" :string)
+           ("p" "�" :string)
            ("B" "�" :string)
-           ("�" "�" :string)
+           ("�" "�" :string)
+           ("N" "�" :string)
+           ("k" "�" :string)
+           ("D" "�" :string)
            ("x" "�" :string)
-           ("S" "�" :string)
-           ("�" "�" :string)
-           ("O" "�" :string)
-           ("y" "�" :string)
            ("A" "�" :string)
-           ("g" "�" :string)
-           ("V" "�" :string)
-           ("G" "�" :string)
-           ("q" "�" :string)
-           ("�" "�" :string)
-           ("v" "�" :string)
-           ("�" "�" :string)
-           ("�" "�" :string)
-           ("F" "�" :string)
-           ("�" "�" :string)
-           ("j" "�" :string)
-           ("N" "�" :string)
-           ("E" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
            ("Q" "�" :string)
-           ("P" "�" :string)
-           ("J" "�" :string)
+           ("�" "�" :string)
            ("�" "�" :string)
-           ("K" "�" :string)
-           ("Y" "�" :string)
-           ("o" "�" :string)
-           ("k" "�" :string)
-           ("T" "�" :string)
+           ("C" "�" :string)
            ("�" "�" :string)
-           ("n" "�" :string)
+           ("i" "�" :string)
+           ("G" "�" :string)
+           ("Z" "�" :string)
+           ("X" "�" :string)
+           ("c" "�" :string)
+           ("z" "�" :string)
+           ("g" "�" :string)
+           ("r" "�" :string)
+           ("J" "�" :string)
            ("�" "�" :string)
-           ("D" "�" :string)
+           ("K" "�" :string)
+           ("�" "�" :string)
+           ("o" "�" :string)
+           ("S" "�" :string)
+           ("f" "�" :string)
            ("�" "�" :string)
-           ("z" "�" :string)
-           ("l" "�" :string)
+           ("O" "�" :string)
+           ("m" "�" :string)
            ("d" "�" :string)
-           ("�" "�" :string)
-           ("i" "�" :string)
-           ("Z" "�" :string)
-           ("�" "�" :string)
+           ("e" "�" :string)
+           ("�" "�" :string)
+           ("�" "�" :string)
+           ("L" "�" :string)
+           ("�" "�" :string)
+           ("y" "�" :string)
+           ("b" "�" :string)
+           ("j" "�" :string)
+           ("M" "�" :string)
+           ("V" "�" :string)
+           ("�" "�" :string)
            ("s" "�" :string)
+           ("�" "�" :string)
+           ("v" "�" :string)
+           ("n" "�" :string)
+           ("U" "�" :string)
+           ("�" "�" :string)
+           ("T" "�" :string)
+           ("I" "�" :string)
+           ("h" "�" :string)
+           ("W" "�" :string)
+           ("P" "�" :string)
            ("u" "�" :string)
+           ("R" "�" :string)
+           ("H" "�" :string)
+           ("a" "�" :string)
+           ("F" "�" :string)
+           ("�" "�" :string)
+           ("t" "�" :string)
            ("w" "�" :string)
-           ("p" "�" :string)
+           ("E" "�" :string)
+           ("l" "�" :string)
+           ("�" "�" :string)
+           ("q" "�" :string)
+           ("�" "�" :string)
+           ("Y" "�" :string)
            ("�" "��" :string)
            ("-" "�" :string)
            ("'" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/lang/upper-sorbian/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/upper-sorbian/utf8.xdy
index 317687e6c34..eb174b74678 100644
--- a/Master/texmf-dist/xindy/modules/lang/upper-sorbian/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/upper-sorbian/utf8.xdy
@@ -42,19 +42,19 @@
 (define-rule-set "s2-alphabetize"
 
   :rules  (("DŹ" "�" :string)
-           ("Dź" "�" :string)
            ("dź" "�" :string)
-           ("Č" "�" :string)
+           ("Dź" "�" :string)
            ("č" "�" :string)
+           ("Č" "�" :string)
            ("ě" "�" :string)
            ("Ě" "�" :string)
+           ("ch" "�" :string)
            ("CH" "�" :string)
            ("Ch" "�" :string)
-           ("ch" "�" :string)
            ("Ł" "�" :string)
            ("ł" "�" :string)
-           ("Ń" "�" :string)
            ("ń" "�" :string)
+           ("Ń" "�" :string)
            ("Ó" "�" :string)
            ("ó" "�" :string)
            ("Ř" "�" :string)
@@ -62,143 +62,143 @@
            ("ß" "��" :string)
            ("Š" "�" :string)
            ("š" "�" :string)
-           ("Ć" "�" :string)
            ("ć" "�" :string)
+           ("Ć" "�" :string)
            ("ž" "�" :string)
            ("Ž" "�" :string)
-           ("a" "�" :string)
            ("A" "�" :string)
+           ("a" "�" :string)
            ("b" "�" :string)
            ("B" "�" :string)
-           ("C" "�" :string)
            ("c" "�" :string)
-           ("D" "�" :string)
+           ("C" "�" :string)
            ("d" "�" :string)
-           ("E" "�" :string)
+           ("D" "�" :string)
            ("e" "�" :string)
+           ("E" "�" :string)
            ("F" "�" :string)
            ("f" "�" :string)
-           ("G" "�" :string)
            ("g" "�" :string)
+           ("G" "�" :string)
            ("h" "�" :string)
            ("H" "�" :string)
-           ("I" "�" :string)
            ("i" "�" :string)
+           ("I" "�" :string)
            ("j" "�" :string)
            ("J" "�" :string)
-           ("k" "�" :string)
            ("K" "�" :string)
+           ("k" "�" :string)
            ("L" "�" :string)
            ("l" "�" :string)
-           ("M" "�" :string)
            ("m" "�" :string)
+           ("M" "�" :string)
            ("n" "�" :string)
            ("N" "�" :string)
            ("O" "�" :string)
            ("o" "�" :string)
            ("p" "�" :string)
            ("P" "�" :string)
-           ("q" "�" :string)
            ("Q" "�" :string)
-           ("r" "�" :string)
+           ("q" "�" :string)
            ("R" "�" :string)
+           ("r" "�" :string)
            ("S" "�" :string)
            ("s" "�" :string)
-           ("t" "�" :string)
            ("T" "�" :string)
-           ("u" "�" :string)
+           ("t" "�" :string)
            ("U" "�" :string)
+           ("u" "�" :string)
            ("v" "�" :string)
            ("V" "�" :string)
-           ("w" "�" :string)
            ("W" "�" :string)
-           ("X" "�" :string)
+           ("w" "�" :string)
            ("x" "�" :string)
-           ("y" "�" :string)
+           ("X" "�" :string)
            ("Y" "�" :string)
-           ("z" "�" :string)
+           ("y" "�" :string)
            ("Z" "�" :string)
+           ("z" "�" :string)
            ))
 
 (define-rule-set "s2-resolve-diacritics"
 
   :rules  (("dź" "�" :string)
-           ("DŹ" "�" :string)
            ("Dź" "�" :string)
-           ("Ž" "�" :string)
+           ("DŹ" "�" :string)
+           ("Ch" "�" :string)
+           ("Ě" "�" :string)
            ("ř" "�" :string)
-           ("Ł" "�" :string)
            ("ž" "�" :string)
-           ("š" "�" :string)
-           ("ć" "�" :string)
-           ("ł" "�" :string)
+           ("Ń" "�" :string)
            ("ó" "�" :string)
-           ("Ě" "�" :string)
-           ("ě" "�" :string)
-           ("CH" "�" :string)
-           ("ń" "�" :string)
-           ("ch" "�" :string)
-           ("Ó" "�" :string)
+           ("Ž" "�" :string)
            ("Ć" "�" :string)
-           ("č" "�" :string)
-           ("Š" "�" :string)
            ("Č" "�" :string)
-           ("Ch" "�" :string)
-           ("Ń" "�" :string)
+           ("ł" "�" :string)
+           ("č" "�" :string)
+           ("š" "�" :string)
+           ("CH" "�" :string)
+           ("ć" "�" :string)
            ("Ř" "�" :string)
+           ("ch" "�" :string)
+           ("Ł" "�" :string)
+           ("Š" "�" :string)
+           ("ń" "�" :string)
+           ("ě" "�" :string)
+           ("Ó" "�" :string)
            ("ß" "�" :string)
-           ("m" "�" :string)
-           ("c" "�" :string)
-           ("u" "�" :string)
-           ("l" "�" :string)
-           ("f" "�" :string)
-           ("t" "�" :string)
-           ("X" "�" :string)
            ("N" "�" :string)
-           ("i" "�" :string)
-           ("w" "�" :string)
-           ("C" "�" :string)
-           ("Y" "�" :string)
+           ("E" "�" :string)
+           ("n" "�" :string)
            ("B" "�" :string)
+           ("H" "�" :string)
+           ("r" "�" :string)
+           ("D" "�" :string)
+           ("X" "�" :string)
+           ("s" "�" :string)
            ("o" "�" :string)
-           ("v" "�" :string)
-           ("g" "�" :string)
-           ("R" "�" :string)
-           ("V" "�" :string)
-           ("W" "�" :string)
-           ("T" "�" :string)
-           ("U" "�" :string)
-           ("Z" "�" :string)
-           ("O" "�" :string)
-           ("d" "�" :string)
-           ("x" "�" :string)
            ("K" "�" :string)
-           ("s" "�" :string)
-           ("A" "�" :string)
-           ("j" "�" :string)
-           ("M" "�" :string)
-           ("F" "�" :string)
-           ("I" "�" :string)
+           ("P" "�" :string)
+           ("J" "�" :string)
            ("a" "�" :string)
-           ("z" "�" :string)
-           ("G" "�" :string)
+           ("C" "�" :string)
            ("q" "�" :string)
-           ("P" "�" :string)
-           ("E" "�" :string)
-           ("r" "�" :string)
+           ("u" "�" :string)
+           ("k" "�" :string)
+           ("l" "�" :string)
+           ("f" "�" :string)
+           ("U" "�" :string)
+           ("R" "�" :string)
+           ("w" "�" :string)
+           ("S" "�" :string)
+           ("t" "�" :string)
            ("p" "�" :string)
-           ("H" "�" :string)
-           ("D" "�" :string)
-           ("L" "�" :string)
-           ("J" "�" :string)
            ("Q" "�" :string)
-           ("S" "�" :string)
-           ("n" "�" :string)
+           ("L" "�" :string)
+           ("c" "�" :string)
+           ("M" "�" :string)
+           ("I" "�" :string)
            ("y" "�" :string)
-           ("b" "�" :string)
+           ("z" "�" :string)
+           ("d" "�" :string)
+           ("v" "�" :string)
+           ("V" "�" :string)
            ("e" "�" :string)
+           ("b" "�" :string)
+           ("i" "�" :string)
+           ("A" "�" :string)
+           ("Y" "�" :string)
+           ("j" "�" :string)
+           ("Z" "�" :string)
+           ("T" "�" :string)
+           ("x" "�" :string)
+           ("W" "�" :string)
+           ("g" "�" :string)
            ("h" "�" :string)
-           ("k" "�" :string)
+           ("F" "�" :string)
+           ("m" "�" :string)
+           ("G" "�" :string)
+           ("O" "�" :string)
            ))
 
 (define-rule-set "s2-resolve-case"
@@ -207,88 +207,88 @@
            ("Dź" "8" :string)
            ("dź" "9" :string)
            ("CH" "7" :string)
-           ("Ć" "8" :string)
-           ("Ó" "8" :string)
-           ("Š" "8" :string)
+           ("Ě" "8" :string)
            ("Ch" "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)
            ("ch" "9" :string)
            ("ń" "9" :string)
            ("ě" "9" :string)
-           ("ł" "9" :string)
-           ("ó" "9" :string)
-           ("ř" "9" :string)
-           ("ć" "9" :string)
-           ("š" "9" :string)
-           ("ž" "9" :string)
            ("ß" "99" :string)
-           ("S" "8" :string)
-           ("Q" "8" :string)
-           ("D" "8" :string)
+           ("N" "8" :string)
+           ("E" "8" :string)
+           ("B" "8" :string)
            ("H" "8" :string)
+           ("D" "8" :string)
+           ("X" "8" :string)
+           ("P" "8" :string)
+           ("K" "8" :string)
            ("J" "8" :string)
+           ("C" "8" :string)
+           ("U" "8" :string)
+           ("R" "8" :string)
+           ("S" "8" :string)
            ("L" "8" :string)
-           ("I" "8" :string)
-           ("F" "8" :string)
+           ("Q" "8" :string)
            ("M" "8" :string)
+           ("I" "8" :string)
+           ("V" "8" :string)
            ("A" "8" :string)
-           ("E" "8" :string)
-           ("G" "8" :string)
-           ("P" "8" :string)
-           ("R" "8" :string)
+           ("Y" "8" :string)
            ("T" "8" :string)
-           ("W" "8" :string)
-           ("V" "8" :string)
-           ("B" "8" :string)
-           ("K" "8" :string)
            ("Z" "8" :string)
-           ("U" "8" :string)
+           ("W" "8" :string)
+           ("F" "8" :string)
            ("O" "8" :string)
-           ("X" "8" :string)
-           ("C" "8" :string)
-           ("Y" "8" :string)
-           ("N" "8" :string)
-           ("e" "9" :string)
-           ("k" "9" :string)
-           ("h" "9" :string)
-           ("y" "9" :string)
+           ("G" "8" :string)
            ("n" "9" :string)
-           ("b" "9" :string)
-           ("j" "9" :string)
-           ("p" "9" :string)
            ("r" "9" :string)
+           ("s" "9" :string)
+           ("o" "9" :string)
+           ("a" "9" :string)
+           ("k" "9" :string)
+           ("l" "9" :string)
+           ("f" "9" :string)
+           ("u" "9" :string)
            ("q" "9" :string)
+           ("w" "9" :string)
+           ("t" "9" :string)
+           ("p" "9" :string)
+           ("c" "9" :string)
+           ("y" "9" :string)
            ("z" "9" :string)
-           ("a" "9" :string)
-           ("g" "9" :string)
+           ("d" "9" :string)
            ("v" "9" :string)
-           ("o" "9" :string)
-           ("s" "9" :string)
+           ("b" "9" :string)
+           ("i" "9" :string)
+           ("e" "9" :string)
+           ("j" "9" :string)
            ("x" "9" :string)
-           ("d" "9" :string)
-           ("t" "9" :string)
-           ("f" "9" :string)
-           ("c" "9" :string)
-           ("u" "9" :string)
+           ("g" "9" :string)
+           ("h" "9" :string)
            ("m" "9" :string)
-           ("l" "9" :string)
-           ("i" "9" :string)
-           ("w" "9" :string)
            ))
 
 (define-rule-set "s2-ignore-special"
 
-  :rules  (("'" "" :string)
+  :rules  (("." "" :string)
            ("-" "" :string)
-           ("." "" :string)
-           ("?" "" :string)
            ("!" "" :string)
+           ("'" "" :string)
+           ("?" "" :string)
            ))
 
 (define-rule-set "s2-resolve-special"
@@ -296,83 +296,83 @@
   :rules  (("DŹ" "�" :string)
            ("Dź" "�" :string)
            ("dź" "�" :string)
-           ("Ě" "�" :string)
+           ("Ó" "�" :string)
            ("ě" "�" :string)
-           ("CH" "�" :string)
            ("ń" "�" :string)
+           ("Š" "�" :string)
            ("ch" "�" :string)
-           ("Ó" "�" :string)
-           ("Ć" "�" :string)
+           ("Ł" "�" :string)
+           ("Ř" "�" :string)
+           ("ć" "�" :string)
+           ("CH" "�" :string)
+           ("š" "�" :string)
+           ("ł" "�" :string)
            ("č" "�" :string)
-           ("Š" "�" :string)
+           ("Ć" "�" :string)
            ("Č" "�" :string)
-           ("Ch" "�" :string)
-           ("Ń" "�" :string)
-           ("Ř" "�" :string)
            ("Ž" "�" :string)
+           ("ó" "�" :string)
+           ("Ń" "�" :string)
            ("ř" "�" :string)
-           ("Ł" "�" :string)
            ("ž" "�" :string)
-           ("š" "�" :string)
-           ("ć" "�" :string)
-           ("ł" "�" :string)
-           ("ó" "�" :string)
+           ("Ch" "�" :string)
+           ("Ě" "�" :string)
            ("ß" "��" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("A" "�" :string)
-           ("j" "�" :string)
-           ("M" "�" :string)
+           ("G" "�" :string)
+           ("O" "�" :string)
            ("F" "�" :string)
-           ("I" "�" :string)
-           ("a" "�" :string)
+           ("m" "�" :string)
+           ("h" "�" :string)
+           ("g" "�" :string)
+           ("W" "�" :string)
+           ("x" "�" :string)
+           ("Z" "�" :string)
+           ("T" "�" :string)
+           ("j" "�" :string)
+           ("Y" "�" :string)
+           ("A" "�" :string)
+           ("e" "�" :string)
+           ("i" "�" :string)
+           ("b" "�" :string)
+           ("V" "�" :string)
+           ("v" "�" :string)
+           ("d" "�" :string)
            ("z" "�" :string)
-           ("q" "�" :string)
-           ("G" "�" :string)
-           ("P" "�" :string)
-           ("r" "�" :string)
-           ("E" "�" :string)
+           ("y" "�" :string)
+           ("I" "�" :string)
+           ("M" "�" :string)
+           ("c" "�" :string)
+           ("Q" "�" :string)
            ("p" "�" :string)
-           ("H" "�" :string)
-           ("D" "�" :string)
            ("L" "�" :string)
-           ("J" "�" :string)
-           ("Q" "�" :string)
+           ("t" "�" :string)
            ("S" "�" :string)
-           ("n" "�" :string)
-           ("y" "�" :string)
-           ("b" "�" :string)
-           ("e" "�" :string)
-           ("h" "�" :string)
-           ("k" "�" :string)
-           ("m" "�" :string)
-           ("c" "�" :string)
+           ("w" "�" :string)
+           ("U" "�" :string)
+           ("R" "�" :string)
+           ("q" "�" :string)
            ("u" "�" :string)
-           ("l" "�" :string)
            ("f" "�" :string)
-           ("X" "�" :string)
-           ("t" "�" :string)
-           ("N" "�" :string)
-           ("i" "�" :string)
-           ("w" "�" :string)
+           ("l" "�" :string)
+           ("k" "�" :string)
            ("C" "�" :string)
-           ("Y" "�" :string)
-           ("B" "�" :string)
-           ("o" "�" :string)
-           ("v" "�" :string)
-           ("R" "�" :string)
-           ("g" "�" :string)
-           ("W" "�" :string)
-           ("V" "�" :string)
-           ("T" "�" :string)
-           ("U" "�" :string)
-           ("Z" "�" :string)
-           ("O" "�" :string)
-           ("d" "�" :string)
-           ("x" "�" :string)
+           ("a" "�" :string)
+           ("J" "�" :string)
            ("K" "�" :string)
+           ("P" "�" :string)
+           ("o" "�" :string)
            ("s" "�" :string)
+           ("X" "�" :string)
+           ("D" "�" :string)
+           ("r" "�" :string)
+           ("H" "�" :string)
+           ("B" "�" :string)
+           ("N" "�" :string)
+           ("E" "�" :string)
+           ("n" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/lang/vietnamese/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/vietnamese/utf8.xdy
index 286ce9bc3b2..1db16c0495b 100644
--- a/Master/texmf-dist/xindy/modules/lang/vietnamese/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/vietnamese/utf8.xdy
@@ -37,774 +37,774 @@
 
 (define-rule-set "vi-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)
+           ("ồ" "�" :string)
+           ("ộ" "�" :string)
+           ("Ỗ" "�" :string)
            ("ổ" "�" :string)
-           ("Ợ" "�" :string)
-           ("Ờ" "�" :string)
+           ("ỗ" "�" :string)
            ("ợ" "�" :string)
-           ("ớ" "�" :string)
-           ("ở" "�" :string)
-           ("ờ" "�" :string)
+           ("Ờ" "�" :string)
+           ("Ỡ" "�" :string)
+           ("Ớ" "�" :string)
            ("ỡ" "�" :string)
+           ("ở" "�" :string)
            ("Ở" "�" :string)
-           ("Ớ" "�" :string)
-           ("Ỡ" "�" :string)
+           ("ờ" "�" :string)
+           ("Ợ" "�" :string)
+           ("ớ" "�" :string)
            ("Ủ" "�" :string)
-           ("Ụ" "�" :string)
            ("ụ" "�" :string)
            ("ủ" "�" :string)
-           ("ừ" "�" :string)
-           ("ứ" "�" :string)
+           ("Ụ" "�" :string)
            ("Ữ" "�" :string)
-           ("Ự" "�" :string)
-           ("ử" "�" :string)
-           ("Ứ" "�" :string)
            ("Ừ" "�" :string)
-           ("Ử" "�" :string)
+           ("Ứ" "�" :string)
+           ("ừ" "�" :string)
            ("ữ" "�" :string)
            ("ự" "�" :string)
+           ("Ự" "�" :string)
+           ("Ử" "�" :string)
+           ("ử" "�" :string)
+           ("ứ" "�" :string)
+           ("Ỹ" "�" :string)
            ("Ỳ" "�" :string)
+           ("Ỵ" "�" :string)
            ("ỹ" "�" :string)
-           ("Ỹ" "�" :string)
-           ("ỷ" "�" :string)
            ("ỳ" "�" :string)
            ("ỵ" "�" :string)
-           ("Ỵ" "�" :string)
            ("Ỷ" "�" :string)
-           ("À" "�" :string)
-           ("Á" "�" :string)
-           ("á" "�" :string)
+           ("ỷ" "�" :string)
            ("ã" "�" :string)
-           ("à" "�" :string)
+           ("Á" "�" :string)
+           ("À" "�" :string)
            ("Ã" "�" :string)
-           ("ă" "�" :string)
+           ("à" "�" :string)
+           ("á" "�" :string)
            ("Ă" "�" :string)
-           ("â" "�" :string)
+           ("ă" "�" :string)
            ("Â" "�" :string)
-           ("đ" "�" :string)
+           ("â" "�" :string)
            ("Đ" "�" :string)
+           ("đ" "�" :string)
            ("È" "�" :string)
-           ("é" "�" :string)
-           ("è" "�" :string)
            ("É" "�" :string)
-           ("ê" "�" :string)
+           ("è" "�" :string)
+           ("é" "�" :string)
            ("Ê" "�" :string)
+           ("ê" "�" :string)
            ("Ì" "�" :string)
            ("Í" "�" :string)
-           ("ì" "�" :string)
-           ("í" "�" :string)
            ("Ĩ" "�" :string)
            ("ĩ" "�" :string)
-           ("õ" "�" :string)
+           ("í" "�" :string)
+           ("ì" "�" :string)
            ("Ò" "�" :string)
            ("Õ" "�" :string)
-           ("Ó" "�" :string)
-           ("ó" "�" :string)
            ("ò" "�" :string)
+           ("ó" "�" :string)
+           ("Ó" "�" :string)
+           ("õ" "�" :string)
            ("Ô" "�" :string)
            ("ô" "�" :string)
-           ("Ơ" "�" :string)
            ("ơ" "�" :string)
+           ("Ơ" "�" :string)
            ("Ũ" "�" :string)
-           ("Ú" "�" :string)
-           ("ù" "�" :string)
            ("Ù" "�" :string)
-           ("ũ" "�" :string)
            ("ú" "�" :string)
+           ("ũ" "�" :string)
+           ("ù" "�" :string)
+           ("Ú" "�" :string)
            ("ư" "�" :string)
            ("Ư" "�" :string)
-           ("Ý" "�" :string)
            ("ý" "�" :string)
-           ("a" "�" :string)
+           ("Ý" "�" :string)
            ("A" "�" :string)
-           ("B" "�" :string)
+           ("a" "�" :string)
            ("b" "�" :string)
-           ("C" "�" :string)
+           ("B" "�" :string)
            ("c" "�" :string)
+           ("C" "�" :string)
            ("d" "�" :string)
            ("D" "�" :string)
            ("E" "�" :string)
            ("e" "�" :string)
            ("F" "�" :string)
            ("f" "�" :string)
-           ("G" "�" :string)
            ("g" "�" :string)
-           ("h" "�" :string)
+           ("G" "�" :string)
            ("H" "�" :string)
-           ("i" "�" :string)
+           ("h" "�" :string)
            ("I" "�" :string)
-           ("j" "�" :string)
+           ("i" "�" :string)
            ("J" "�" :string)
-           ("k" "�" :string)
+           ("j" "�" :string)
            ("K" "�" :string)
+           ("k" "�" :string)
            ("l" "�" :string)
            ("L" "�" :string)
-           ("m" "�" :string)
            ("M" "�" :string)
+           ("m" "�" :string)
            ("n" "�" :string)
            ("N" "�" :string)
-           ("O" "�" :string)
            ("o" "�" :string)
-           ("p" "�" :string)
+           ("O" "�" :string)
            ("P" "�" :string)
+           ("p" "�" :string)
            ("Q" "�" :string)
            ("q" "�" :string)
-           ("R" "�" :string)
            ("r" "�" :string)
-           ("S" "�" :string)
+           ("R" "�" :string)
            ("s" "�" :string)
-           ("t" "�" :string)
+           ("S" "�" :string)
            ("T" "�" :string)
-           ("u" "�" :string)
+           ("t" "�" :string)
            ("U" "�" :string)
+           ("u" "�" :string)
            ("v" "�" :string)
            ("V" "�" :string)
-           ("w" "�" :string)
            ("W" "�" :string)
-           ("x" "�" :string)
+           ("w" "�" :string)
            ("X" "�" :string)
-           ("y" "�" :string)
+           ("x" "�" :string)
            ("Y" "�" :string)
-           ("z" "�" :string)
+           ("y" "�" :string)
            ("Z" "�" :string)
+           ("z" "�" :string)
            ))
 
 (define-rule-set "vi-resolve-diacritics"
 
-  :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)
+           ("ẽ" "�" :string)
+           ("Ữ" "�" :string)
+           ("Ẫ" "�" :string)
            ("Ỹ" "�" :string)
-           ("ố" "�" :string)
-           ("Ố" "�" :string)
-           ("Ứ" "�" :string)
-           ("Ắ" "�" :string)
-           ("Ế" "�" :string)
-           ("Ớ" "�" :string)
-           ("ắ" "�" :string)
+           ("Ẽ" "�" :string)
            ("ứ" "�" :string)
            ("ớ" "�" :string)
            ("ấ" "�" :string)
+           ("Ắ" "�" :string)
+           ("Ố" "�" :string)
+           ("Ớ" "�" :string)
            ("ế" "�" :string)
+           ("Ứ" "�" :string)
+           ("ắ" "�" :string)
+           ("Ế" "�" :string)
+           ("ố" "�" :string)
            ("Ấ" "�" :string)
-           ("Ậ" "�" :string)
-           ("ỵ" "�" :string)
-           ("Ạ" "�" :string)
-           ("ặ" "�" :string)
+           ("Ụ" "�" :string)
+           ("Ị" "�" :string)
+           ("Ợ" "�" :string)
+           ("ệ" "�" :string)
+           ("Ệ" "�" :string)
+           ("Ẹ" "�" :string)
            ("ụ" "�" :string)
+           ("ỵ" "�" :string)
+           ("ộ" "�" :string)
+           ("Ự" "�" :string)
+           ("ọ" "�" :string)
            ("ạ" "�" :string)
-           ("ẹ" "�" :string)
-           ("ự" "�" :string)
            ("Ỵ" "�" :string)
-           ("Ợ" "�" :string)
            ("Ộ" "�" :string)
-           ("Ẹ" "�" :string)
-           ("ộ" "�" :string)
-           ("ậ" "�" :string)
+           ("ự" "�" :string)
            ("Ặ" "�" :string)
-           ("ợ" "�" :string)
+           ("ẹ" "�" :string)
+           ("ậ" "�" :string)
            ("Ọ" "�" :string)
-           ("ệ" "�" :string)
-           ("Ự" "�" :string)
-           ("Ụ" "�" :string)
-           ("Ệ" "�" :string)
            ("ị" "�" :string)
-           ("Ị" "�" :string)
-           ("ọ" "�" :string)
+           ("Ậ" "�" :string)
+           ("ặ" "�" :string)
+           ("Ạ" "�" :string)
+           ("ợ" "�" :string)
+           ("đ" "�" :string)
+           ("ê" "�" :string)
            ("Ơ" "�" :string)
-           ("ơ" "�" :string)
            ("Ư" "�" :string)
-           ("ô" "�" :string)
-           ("Ê" "�" :string)
-           ("Ô" "�" :string)
-           ("đ" "�" :string)
-           ("ư" "�" :string)
            ("â" "�" :string)
            ("Ă" "�" :string)
+           ("Đ" "�" :string)
            ("ă" "�" :string)
+           ("ơ" "�" :string)
+           ("Ê" "�" :string)
+           ("ô" "�" :string)
            ("Â" "�" :string)
-           ("ê" "�" :string)
-           ("Đ" "�" :string)
-           ("Ù" "�" :string)
-           ("ò" "�" :string)
-           ("ù" "�" :string)
-           ("È" "�" :string)
-           ("è" "�" :string)
+           ("Ô" "�" :string)
+           ("ư" "�" :string)
+           ("ì" "�" :string)
            ("à" "�" :string)
-           ("Ì" "�" :string)
            ("À" "�" :string)
+           ("ù" "�" :string)
+           ("ò" "�" :string)
+           ("Ù" "�" :string)
+           ("è" "�" :string)
            ("Ò" "�" :string)
-           ("ì" "�" :string)
-           ("Ĩ" "�" :string)
-           ("ũ" "�" :string)
+           ("È" "�" :string)
+           ("Ì" "�" :string)
+           ("õ" "�" :string)
            ("ĩ" "�" :string)
-           ("ã" "�" :string)
            ("Ã" "�" :string)
-           ("Ũ" "�" :string)
-           ("õ" "�" :string)
+           ("ũ" "�" :string)
+           ("Ĩ" "�" :string)
+           ("ã" "�" :string)
            ("Õ" "�" :string)
-           ("é" "�" :string)
-           ("ý" "�" :string)
-           ("Á" "�" :string)
+           ("Ũ" "�" :string)
+           ("Ú" "�" :string)
            ("Ý" "�" :string)
            ("í" "�" :string)
-           ("ú" "�" :string)
-           ("É" "�" :string)
            ("á" "�" :string)
-           ("ó" "�" :string)
            ("Ó" "�" :string)
+           ("é" "�" :string)
+           ("ú" "�" :string)
+           ("ó" "�" :string)
+           ("Á" "�" :string)
            ("Í" "�" :string)
-           ("Ú" "�" :string)
-           ("z" "�" :string)
-           ("S" "�" :string)
-           ("r" "�" :string)
-           ("J" "�" :string)
-           ("c" "�" :string)
-           ("v" "�" :string)
+           ("ý" "�" :string)
+           ("É" "�" :string)
            ("Z" "�" :string)
-           ("X" "�" :string)
            ("N" "�" :string)
-           ("T" "�" :string)
-           ("C" "�" :string)
-           ("B" "�" :string)
-           ("j" "�" :string)
-           ("q" "�" :string)
            ("e" "�" :string)
-           ("y" "�" :string)
+           ("B" "�" :string)
+           ("z" "�" :string)
+           ("x" "�" :string)
+           ("R" "�" :string)
+           ("v" "�" :string)
+           ("m" "�" :string)
            ("L" "�" :string)
-           ("M" "�" :string)
+           ("u" "�" :string)
+           ("q" "�" :string)
+           ("E" "�" :string)
            ("V" "�" :string)
-           ("W" "�" :string)
-           ("Y" "�" :string)
-           ("K" "�" :string)
            ("s" "�" :string)
+           ("i" "�" :string)
+           ("S" "�" :string)
+           ("G" "�" :string)
            ("I" "�" :string)
+           ("c" "�" :string)
+           ("t" "�" :string)
+           ("C" "�" :string)
+           ("n" "�" :string)
+           ("T" "�" :string)
+           ("U" "�" :string)
+           ("h" "�" :string)
            ("f" "�" :string)
+           ("w" "�" :string)
+           ("p" "�" :string)
+           ("l" "�" :string)
+           ("j" "�" :string)
            ("b" "�" :string)
-           ("P" "�" :string)
-           ("D" "�" :string)
+           ("F" "�" :string)
+           ("y" "�" :string)
+           ("Y" "�" :string)
            ("g" "�" :string)
-           ("H" "�" :string)
-           ("h" "�" :string)
-           ("i" "�" :string)
-           ("G" "�" :string)
-           ("a" "�" :string)
+           ("O" "�" :string)
            ("Q" "�" :string)
-           ("n" "�" :string)
-           ("F" "�" :string)
-           ("t" "�" :string)
-           ("k" "�" :string)
-           ("u" "�" :string)
-           ("w" "�" :string)
-           ("o" "�" :string)
            ("d" "�" :string)
-           ("R" "�" :string)
-           ("l" "�" :string)
            ("A" "�" :string)
-           ("U" "�" :string)
-           ("p" "�" :string)
-           ("E" "�" :string)
-           ("x" "�" :string)
-           ("O" "�" :string)
-           ("m" "�" :string)
+           ("k" "�" :string)
+           ("a" "�" :string)
+           ("o" "�" :string)
+           ("r" "�" :string)
+           ("H" "�" :string)
+           ("W" "�" :string)
+           ("D" "�" :string)
+           ("K" "�" :string)
+           ("M" "�" :string)
+           ("J" "�" :string)
+           ("P" "�" :string)
+           ("X" "�" :string)
            ))
 
 (define-rule-set "vi-resolve-case"
 
-  :rules  (("Ỉ" "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)
+           ("Ễ" "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)
+           ("ố" "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)
-           ("ấ" "9" :string)
-           ("ể" "9" :string)
            ("ứ" "9" :string)
+           ("ẻ" "9" :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)
-           ("ã" "9" :string)
-           ("á" "9" :string)
-           ("à" "9" :string)
-           ("è" "9" :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)
-           ("H" "8" :string)
+           ("á" "9" :string)
+           ("ì" "9" :string)
+           ("í" "9" :string)
+           ("õ" "9" :string)
+           ("K" "8" :string)
+           ("M" "8" :string)
+           ("J" "8" :string)
+           ("X" "8" :string)
            ("P" "8" :string)
-           ("D" "8" :string)
+           ("A" "8" :string)
+           ("H" "8" :string)
            ("W" "8" :string)
-           ("M" "8" :string)
-           ("V" "8" :string)
+           ("D" "8" :string)
+           ("F" "8" :string)
+           ("O" "8" :string)
            ("Y" "8" :string)
-           ("K" "8" :string)
+           ("Q" "8" :string)
            ("I" "8" :string)
-           ("B" "8" :string)
            ("C" "8" :string)
-           ("L" "8" :string)
-           ("S" "8" :string)
-           ("Z" "8" :string)
-           ("X" "8" :string)
-           ("N" "8" :string)
            ("T" "8" :string)
-           ("J" "8" :string)
-           ("E" "8" :string)
-           ("A" "8" :string)
            ("U" "8" :string)
-           ("O" "8" :string)
-           ("R" "8" :string)
-           ("F" "8" :string)
            ("G" "8" :string)
-           ("Q" "8" :string)
+           ("S" "8" :string)
+           ("R" "8" :string)
+           ("L" "8" :string)
+           ("E" "8" :string)
+           ("V" "8" :string)
+           ("N" "8" :string)
+           ("Z" "8" :string)
+           ("B" "8" :string)
+           ("d" "9" :string)
+           ("k" "9" :string)
+           ("r" "9" :string)
+           ("o" "9" :string)
+           ("a" "9" :string)
            ("b" "9" :string)
            ("g" "9" :string)
+           ("y" "9" :string)
+           ("h" "9" :string)
+           ("w" "9" :string)
            ("f" "9" :string)
-           ("s" "9" :string)
            ("j" "9" :string)
-           ("q" "9" :string)
-           ("e" "9" :string)
-           ("y" "9" :string)
-           ("z" "9" :string)
-           ("r" "9" :string)
+           ("l" "9" :string)
+           ("p" "9" :string)
+           ("t" "9" :string)
+           ("n" "9" :string)
            ("c" "9" :string)
+           ("s" "9" :string)
+           ("i" "9" :string)
            ("v" "9" :string)
-           ("p" "9" :string)
-           ("x" "9" :string)
            ("m" "9" :string)
-           ("o" "9" :string)
-           ("l" "9" :string)
-           ("d" "9" :string)
-           ("k" "9" :string)
+           ("q" "9" :string)
            ("u" "9" :string)
-           ("t" "9" :string)
-           ("w" "9" :string)
-           ("h" "9" :string)
-           ("i" "9" :string)
-           ("a" "9" :string)
-           ("n" "9" :string)
+           ("e" "9" :string)
+           ("x" "9" :string)
+           ("z" "9" :string)
            ))
 
 (define-rule-set "vi-ignore-special"
 
   :rules  (("!" "" :string)
            ("-" "" :string)
-           ("?" "" :string)
            ("." "" :string)
+           ("?" "" :string)
            ("'" "" :string)
            ))
 
 (define-rule-set "vi-resolve-special"
 
-  :rules  (("Ỉ" "�" :string)
-           ("ổ" "�" :string)
-           ("ẳ" "�" :string)
-           ("Ẳ" "�" :string)
-           ("Ử" "�" :string)
-           ("ẵ" "�" :string)
-           ("Ề" "�" :string)
-           ("Ỵ" "�" :string)
-           ("ữ" "�" :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)
+           ("Ỉ" "�" :string)
+           ("ự" "�" :string)
+           ("ỳ" "�" :string)
+           ("Ằ" "�" :string)
+           ("ả" "�" :string)
+           ("Ỵ" "�" :string)
+           ("Ứ" "�" :string)
+           ("ừ" "�" :string)
+           ("ạ" "�" :string)
+           ("ắ" "�" :string)
+           ("Ộ" "�" :string)
+           ("ế" "�" :string)
+           ("ữ" "�" :string)
            ("ỹ" "�" :string)
-           ("ứ" "�" :string)
+           ("Ế" "�" :string)
+           ("Ủ" "�" :string)
+           ("ợ" "�" :string)
+           ("Ạ" "�" :string)
+           ("Ấ" "�" :string)
            ("Ể" "�" :string)
+           ("Ậ" "�" :string)
+           ("ặ" "�" :string)
+           ("Ồ" "�" :string)
+           ("Ọ" "�" :string)
+           ("Ỏ" "�" :string)
+           ("ẳ" "�" :string)
+           ("ậ" "�" :string)
+           ("Ỳ" "�" :string)
+           ("Ừ" "�" :string)
+           ("ị" "�" :string)
            ("Ữ" "�" :string)
-           ("Ẵ" "�" :string)
+           ("Ẫ" "�" :string)
+           ("Ẽ" "�" :string)
+           ("Ỹ" "�" :string)
            ("á" "�" :string)
-           ("ã" "�" :string)
-           ("Ô" "�" :string)
            ("à" "�" :string)
-           ("è" "�" :string)
-           ("Ã" "�" :string)
-           ("ũ" "�" :string)
-           ("ú" "�" :string)
-           ("ô" "�" :string)
-           ("Ê" "�" :string)
-           ("É" "�" :string)
-           ("ĩ" "�" :string)
-           ("Á" "�" :string)
-           ("Ư" "�" :string)
-           ("È" "�" :string)
-           ("ù" "�" :string)
-           ("Ý" "�" :string)
+           ("đ" "�" :string)
+           ("Ú" "�" :string)
            ("í" "�" :string)
-           ("Ĩ" "�" :string)
-           ("ò" "�" :string)
+           ("ì" "�" :string)
+           ("Ý" "�" :string)
+           ("õ" "�" :string)
+           ("ù" "�" :string)
            ("é" "�" :string)
+           ("Ã" "�" :string)
            ("Ơ" "�" :string)
-           ("Ù" "�" :string)
-           ("ơ" "�" :string)
-           ("ý" "�" :string)
-           ("ì" "�" :string)
-           ("Đ" "�" :string)
+           ("À" "�" :string)
+           ("Ư" "�" :string)
+           ("ĩ" "�" :string)
+           ("Ó" "�" :string)
            ("ê" "�" :string)
-           ("Ă" "�" :string)
            ("ă" "�" :string)
-           ("õ" "�" :string)
-           ("ư" "�" :string)
+           ("ã" "�" :string)
+           ("Ă" "�" :string)
+           ("Đ" "�" :string)
+           ("ò" "�" :string)
+           ("Í" "�" :string)
            ("â" "�" :string)
-           ("Ò" "�" :string)
-           ("Â" "�" :string)
-           ("Õ" "�" :string)
-           ("À" "�" :string)
-           ("Ì" "�" :string)
-           ("Ó" "�" :string)
+           ("Ĩ" "�" :string)
            ("ó" "�" :string)
-           ("đ" "�" :string)
+           ("ũ" "�" :string)
+           ("Á" "�" :string)
+           ("ú" "�" :string)
+           ("È" "�" :string)
+           ("Ì" "�" :string)
+           ("É" "�" :string)
+           ("Ò" "�" :string)
+           ("ư" "�" :string)
            ("Ũ" "�" :string)
-           ("Í" "�" :string)
-           ("Ú" "�" :string)
+           ("Ô" "�" :string)
+           ("ô" "�" :string)
+           ("Õ" "�" :string)
+           ("Ê" "�" :string)
+           ("Â" "�" :string)
+           ("è" "�" :string)
+           ("ý" "�" :string)
+           ("ơ" "�" :string)
+           ("Ù" "�" :string)
            ("?" "�" :string)
            ("!" "�" :string)
            ("." "�" :string)
-           ("b" "�" :string)
-           ("H" "�" :string)
-           ("g" "�" :string)
-           ("P" "�" :string)
-           ("D" "�" :string)
-           ("W" "�" :string)
-           ("V" "�" :string)
-           ("M" "�" :string)
-           ("f" "�" :string)
-           ("K" "�" :string)
-           ("s" "�" :string)
-           ("I" "�" :string)
-           ("Y" "�" :string)
-           ("j" "�" :string)
+           ("E" "�" :string)
            ("q" "�" :string)
-           ("e" "�" :string)
-           ("B" "�" :string)
-           ("C" "�" :string)
+           ("u" "�" :string)
+           ("V" "�" :string)
+           ("R" "�" :string)
+           ("m" "�" :string)
+           ("v" "�" :string)
            ("L" "�" :string)
-           ("y" "�" :string)
-           ("S" "�" :string)
+           ("x" "�" :string)
            ("z" "�" :string)
+           ("e" "�" :string)
+           ("Z" "�" :string)
            ("N" "�" :string)
-           ("X" "�" :string)
+           ("B" "�" :string)
+           ("U" "�" :string)
+           ("I" "�" :string)
+           ("n" "�" :string)
            ("T" "�" :string)
-           ("Z" "�" :string)
-           ("v" "�" :string)
-           ("r" "�" :string)
-           ("J" "�" :string)
+           ("C" "�" :string)
+           ("t" "�" :string)
            ("c" "�" :string)
-           ("p" "�" :string)
-           ("E" "�" :string)
-           ("U" "�" :string)
-           ("A" "�" :string)
-           ("m" "�" :string)
-           ("x" "�" :string)
+           ("i" "�" :string)
+           ("G" "�" :string)
+           ("S" "�" :string)
+           ("s" "�" :string)
+           ("g" "�" :string)
            ("O" "�" :string)
-           ("o" "�" :string)
-           ("R" "�" :string)
-           ("l" "�" :string)
-           ("d" "�" :string)
-           ("u" "�" :string)
-           ("k" "�" :string)
+           ("Y" "�" :string)
+           ("y" "�" :string)
+           ("Q" "�" :string)
+           ("b" "�" :string)
            ("F" "�" :string)
-           ("t" "�" :string)
            ("w" "�" :string)
-           ("G" "�" :string)
-           ("i" "�" :string)
+           ("f" "�" :string)
+           ("j" "�" :string)
+           ("p" "�" :string)
+           ("l" "�" :string)
            ("h" "�" :string)
-           ("n" "�" :string)
+           ("J" "�" :string)
+           ("P" "�" :string)
+           ("X" "�" :string)
+           ("M" "�" :string)
+           ("K" "�" :string)
+           ("r" "�" :string)
            ("a" "�" :string)
-           ("Q" "�" :string)
+           ("o" "�" :string)
+           ("D" "�" :string)
+           ("W" "�" :string)
+           ("H" "�" :string)
+           ("d" "�" :string)
+           ("k" "�" :string)
+           ("A" "�" :string)
            ("-" "�" :string)
            ("'" "�" :string)
            ))
diff --git a/Master/texmf-dist/xindy/modules/tex/inputenc/latin.xdy b/Master/texmf-dist/xindy/modules/tex/inputenc/latin.xdy
index 23205b93c10..38c005553f9 100644
--- a/Master/texmf-dist/xindy/modules/tex/inputenc/latin.xdy
+++ b/Master/texmf-dist/xindy/modules/tex/inputenc/latin.xdy
@@ -1,77 +1,85 @@
 ;; Generated from latin?.xdy
 
 
-(merge-rule "\'A" "�" :string)
-(merge-rule "\'C" "�" :string)
-(merge-rule "\'E" "�" :string)
-(merge-rule "\'I" "�" :string)
-(merge-rule "\'L" "�" :string)
-(merge-rule "\'N" "�" :string)
-(merge-rule "\'O" "�" :string)
-(merge-rule "\'R" "�" :string)
-(merge-rule "\'S" "�" :string)
-(merge-rule "\'U" "�" :string)
-(merge-rule "\'Y" "�" :string)
-(merge-rule "\'Z" "�" :string)
+(merge-rule "{^1}" "�" :string)
+(merge-rule "{^2}" "�" :string)
+(merge-rule "{^3}" "�" :string)
+(merge-rule "\`a" "�" :string)
+(merge-rule "\^a" "�" :string)
+(merge-rule "\~~a" "�" :string)
+(merge-rule "\~"a" "�" :string)
 (merge-rule "\'a" "�" :string)
+(merge-rule "\`A" "�" :string)
+(merge-rule "\^A" "�" :string)
+(merge-rule "\~~A" "�" :string)
+(merge-rule "\~"A" "�" :string)
+(merge-rule "\'A" "�" :string)
+(merge-rule "\c c" "�" :string)
+(merge-rule "\c C" "�" :string)
+(merge-rule "\c s" "�" :string)
+(merge-rule "\c S" "�" :string)
+(merge-rule "\^c" "�" :string)
+(merge-rule "\.c" "�" :string)
 (merge-rule "\'c" "�" :string)
-(merge-rule "\'e" "�" :string)
-(merge-rule "\'l" "�" :string)
-(merge-rule "\'n" "�" :string)
-(merge-rule "\'o" "�" :string)
-(merge-rule "\'r" "�" :string)
-(merge-rule "\'s" "�" :string)
-(merge-rule "\'u" "�" :string)
-(merge-rule "\'y" "�" :string)
-(merge-rule "\'z" "�" :string)
-(merge-rule "\'{}" "�" :string)
+(merge-rule "\^C" "�" :string)
 (merge-rule "\.C" "�" :string)
-(merge-rule "\.G" "�" :string)
-(merge-rule "\.I" "�" :string)
-(merge-rule "\.Z" "�" :string)
-(merge-rule "\.c" "�" :string)
+(merge-rule "\'C" "�" :string)
+(merge-rule "\c t" "�" :string)
+(merge-rule "\c T" "�" :string)
+(merge-rule "\discretionary {-}{}{}" "�" :string)
+(merge-rule "\div " "�" :string)
+(merge-rule "\`e" "�" :string)
+(merge-rule "\^e" "�" :string)
+(merge-rule "\~"e" "�" :string)
+(merge-rule "\'e" "�" :string)
+(merge-rule "\`E" "�" :string)
+(merge-rule "\^E" "�" :string)
+(merge-rule "\~"E" "�" :string)
+(merge-rule "\'E" "�" :string)
+(merge-rule "\^g" "�" :string)
 (merge-rule "\.g" "�" :string)
-(merge-rule "\.z" "�" :string)
-(merge-rule "\.{}" "�" :string)
-(merge-rule "\={}" "�" :string)
-(merge-rule "\H O" "�" :string)
-(merge-rule "\H U" "�" :string)
+(merge-rule "\^G" "�" :string)
+(merge-rule "\.G" "�" :string)
 (merge-rule "\H o" "�" :string)
-(merge-rule "\H u" "�" :string)
+(merge-rule "\H O" "�" :string)
+(merge-rule "\^h" "�" :string)
+(merge-rule "\^H" "�" :string)
 (merge-rule "\H {}" "�" :string)
-(merge-rule "\IeC {\'\i }" "�" :string)
-(merge-rule "\IeC {\AE }" "�" :string)
-(merge-rule "\IeC {\DH }" "�" :string)
-(merge-rule "\IeC {\DJ }" "�" :string)
-(merge-rule "\IeC {\L }" "�" :string)
-(merge-rule "\IeC {\O }" "�" :string)
-(merge-rule "\IeC {\P  }" "�" :string)
-(merge-rule "\IeC {\S  }" "�" :string)
-(merge-rule "\IeC {\TH }" "�" :string)
-(merge-rule "\IeC {\^\i }" "�" :string)
-(merge-rule "\IeC {\^\j }" "�" :string)
-(merge-rule "\IeC {\`\i }" "�" :string)
+(merge-rule "\H u" "�" :string)
+(merge-rule "\H U" "�" :string)
 (merge-rule "\IeC {\ae }" "�" :string)
-(merge-rule "\IeC {\c \ }" "�" :string)
+(merge-rule "\IeC {\AE }" "�" :string)
 (merge-rule "\IeC {\copyright  }" "�" :string)
+(merge-rule "\IeC {\c \ }" "�" :string)
 (merge-rule "\IeC {\dh }" "�" :string)
+(merge-rule "\IeC {\DH }" "�" :string)
 (merge-rule "\IeC {\dj }" "�" :string)
+(merge-rule "\IeC {\DJ }" "�" :string)
 (merge-rule "\IeC {\guillemotleft }" "�" :string)
 (merge-rule "\IeC {\guillemotright }" "�" :string)
+(merge-rule "\IeC {\`\i }" "�" :string)
+(merge-rule "\IeC {\^\i }" "�" :string)
+(merge-rule "\IeC {\~"\i }" "�" :string)
+(merge-rule "\IeC {\'\i }" "�" :string)
 (merge-rule "\IeC {\i }" "�" :string)
+(merge-rule "\IeC {\^\j }" "�" :string)
 (merge-rule "\IeC {\k \ }" "�" :string)
 (merge-rule "\IeC {\l }" "�" :string)
+(merge-rule "\IeC {\L }" "�" :string)
 (merge-rule "\IeC {\nobreakspace  }" "�" :string)
 (merge-rule "\IeC {\o }" "�" :string)
+(merge-rule "\IeC {\O }" "�" :string)
 (merge-rule "\IeC {\pounds  }" "�" :string)
+(merge-rule "\IeC {\P  }" "�" :string)
 (merge-rule "\IeC {\ss }" "�" :string)
+(merge-rule "\IeC {\S  }" "�" :string)
 (merge-rule "\IeC {\textbrokenbar }" "�" :string)
 (merge-rule "\IeC {\textcent }" "�" :string)
 (merge-rule "\IeC {\textcurrency }" "�" :string)
 (merge-rule "\IeC {\textdegree }" "�" :string)
 (merge-rule "\IeC {\textexclamdown }" "�" :string)
-(merge-rule "\IeC {\textmalteseH }" "�" :string)
 (merge-rule "\IeC {\textmalteseh }" "�" :string)
+(merge-rule "\IeC {\textmalteseH }" "�" :string)
 (merge-rule "\IeC {\textonehalf }" "�" :string)
 (merge-rule "\IeC {\textonequarter }" "�" :string)
 (merge-rule "\IeC {\textordfeminine }" "�" :string)
@@ -82,97 +90,89 @@
 (merge-rule "\IeC {\textthreequarters }" "�" :string)
 (merge-rule "\IeC {\textyen }" "�" :string)
 (merge-rule "\IeC {\th }" "�" :string)
-(merge-rule "\IeC {\~"\i }" "�" :string)
-(merge-rule "\^A" "�" :string)
-(merge-rule "\^C" "�" :string)
-(merge-rule "\^E" "�" :string)
-(merge-rule "\^G" "�" :string)
-(merge-rule "\^H" "�" :string)
+(merge-rule "\IeC {\TH }" "�" :string)
+(merge-rule "\`I" "�" :string)
 (merge-rule "\^I" "�" :string)
+(merge-rule "\~"I" "�" :string)
+(merge-rule "\.I" "�" :string)
+(merge-rule "\'I" "�" :string)
 (merge-rule "\^J" "�" :string)
-(merge-rule "\^O" "�" :string)
-(merge-rule "\^S" "�" :string)
-(merge-rule "\^U" "�" :string)
-(merge-rule "\^a" "�" :string)
-(merge-rule "\^c" "�" :string)
-(merge-rule "\^e" "�" :string)
-(merge-rule "\^g" "�" :string)
-(merge-rule "\^h" "�" :string)
-(merge-rule "\^o" "�" :string)
-(merge-rule "\^s" "�" :string)
-(merge-rule "\^u" "�" :string)
-(merge-rule "\`A" "�" :string)
-(merge-rule "\`E" "�" :string)
-(merge-rule "\`I" "�" :string)
-(merge-rule "\`O" "�" :string)
-(merge-rule "\`U" "�" :string)
-(merge-rule "\`a" "�" :string)
-(merge-rule "\`e" "�" :string)
-(merge-rule "\`o" "�" :string)
-(merge-rule "\`u" "�" :string)
-(merge-rule "\c C" "�" :string)
-(merge-rule "\c S" "�" :string)
-(merge-rule "\c T" "�" :string)
-(merge-rule "\c c" "�" :string)
-(merge-rule "\c s" "�" :string)
-(merge-rule "\c t" "�" :string)
-(merge-rule "\discretionary {-}{}{}" "�" :string)
-(merge-rule "\div " "�" :string)
-(merge-rule "\k A" "�" :string)
-(merge-rule "\k E" "�" :string)
 (merge-rule "\k a" "�" :string)
+(merge-rule "\k A" "�" :string)
 (merge-rule "\k e" "�" :string)
+(merge-rule "\k E" "�" :string)
 (merge-rule "\lnot " "�" :string)
+(merge-rule "\'l" "�" :string)
+(merge-rule "\'L" "�" :string)
 (merge-rule "\mu " "�" :string)
+(merge-rule "\~~n" "�" :string)
+(merge-rule "\'n" "�" :string)
+(merge-rule "\~~N" "�" :string)
+(merge-rule "\'N" "�" :string)
+(merge-rule "\`o" "�" :string)
+(merge-rule "\^o" "�" :string)
+(merge-rule "\~~o" "�" :string)
+(merge-rule "\~"o" "�" :string)
+(merge-rule "\'o" "�" :string)
+(merge-rule "\`O" "�" :string)
+(merge-rule "\^O" "�" :string)
+(merge-rule "\~~O" "�" :string)
+(merge-rule "\~"O" "�" :string)
+(merge-rule "\'O" "�" :string)
 (merge-rule "\pm " "�" :string)
-(merge-rule "\r A" "�" :string)
-(merge-rule "\r U" "�" :string)
 (merge-rule "\r a" "�" :string)
+(merge-rule "\r A" "�" :string)
+(merge-rule "\'r" "�" :string)
+(merge-rule "\'R" "�" :string)
 (merge-rule "\r u" "�" :string)
+(merge-rule "\r U" "�" :string)
+(merge-rule "\^s" "�" :string)
+(merge-rule "\'s" "�" :string)
+(merge-rule "\^S" "�" :string)
+(merge-rule "\'S" "�" :string)
+(merge-rule "\~"{}" "�" :string)
+(merge-rule "\={}" "�" :string)
+(merge-rule "\.{}" "�" :string)
+(merge-rule "\'{}" "�" :string)
 (merge-rule "\times " "�" :string)
-(merge-rule "\u A" "�" :string)
-(merge-rule "\u G" "�" :string)
-(merge-rule "\u U" "�" :string)
 (merge-rule "\u a" "�" :string)
+(merge-rule "\u A" "�" :string)
 (merge-rule "\u g" "�" :string)
-(merge-rule "\u u" "�" :string)
+(merge-rule "\u G" "�" :string)
+(merge-rule "\`u" "�" :string)
+(merge-rule "\^u" "�" :string)
+(merge-rule "\~"u" "�" :string)
+(merge-rule "\'u" "�" :string)
 (merge-rule "\u {}" "�" :string)
-(merge-rule "\v C" "�" :string)
-(merge-rule "\v D" "�" :string)
-(merge-rule "\v E" "�" :string)
-(merge-rule "\v L" "�" :string)
-(merge-rule "\v N" "�" :string)
-(merge-rule "\v R" "�" :string)
-(merge-rule "\v S" "�" :string)
-(merge-rule "\v T" "�" :string)
-(merge-rule "\v Z" "�" :string)
+(merge-rule "\`U" "�" :string)
+(merge-rule "\^U" "�" :string)
+(merge-rule "\~"U" "�" :string)
+(merge-rule "\'U" "�" :string)
+(merge-rule "\u u" "�" :string)
+(merge-rule "\u U" "�" :string)
 (merge-rule "\v c" "�" :string)
+(merge-rule "\v C" "�" :string)
 (merge-rule "\v d" "�" :string)
+(merge-rule "\v D" "�" :string)
 (merge-rule "\v e" "�" :string)
+(merge-rule "\v E" "�" :string)
 (merge-rule "\v l" "�" :string)
+(merge-rule "\v L" "�" :string)
 (merge-rule "\v n" "�" :string)
+(merge-rule "\v N" "�" :string)
 (merge-rule "\v r" "�" :string)
+(merge-rule "\v R" "�" :string)
 (merge-rule "\v s" "�" :string)
+(merge-rule "\v S" "�" :string)
+(merge-rule "\v {}" "�" :string)
 (merge-rule "\v t" "�" :string)
+(merge-rule "\v T" "�" :string)
 (merge-rule "\v z" "�" :string)
-(merge-rule "\v {}" "�" :string)
-(merge-rule "\~"A" "�" :string)
-(merge-rule "\~"E" "�" :string)
-(merge-rule "\~"I" "�" :string)
-(merge-rule "\~"O" "�" :string)
-(merge-rule "\~"U" "�" :string)
-(merge-rule "\~"a" "�" :string)
-(merge-rule "\~"e" "�" :string)
-(merge-rule "\~"o" "�" :string)
-(merge-rule "\~"u" "�" :string)
+(merge-rule "\v Z" "�" :string)
 (merge-rule "\~"y" "�" :string)
-(merge-rule "\~"{}" "�" :string)
-(merge-rule "\~~A" "�" :string)
-(merge-rule "\~~N" "�" :string)
-(merge-rule "\~~O" "�" :string)
-(merge-rule "\~~a" "�" :string)
-(merge-rule "\~~n" "�" :string)
-(merge-rule "\~~o" "�" :string)
-(merge-rule "{^1}" "�" :string)
-(merge-rule "{^2}" "�" :string)
-(merge-rule "{^3}" "�" :string)
+(merge-rule "\'y" "�" :string)
+(merge-rule "\'Y" "�" :string)
+(merge-rule "\.z" "�" :string)
+(merge-rule "\'z" "�" :string)
+(merge-rule "\.Z" "�" :string)
+(merge-rule "\'Z" "�" :string)
diff --git a/Master/texmf-dist/xindy/modules/tex/inputenc/utf8.xdy b/Master/texmf-dist/xindy/modules/tex/inputenc/utf8.xdy
index fe43bb3c1f2..4b433c2b175 100644
--- a/Master/texmf-dist/xindy/modules/tex/inputenc/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/tex/inputenc/utf8.xdy
@@ -1,77 +1,85 @@
 ;; Generated from recoded latin?.xdy
 
 
-(merge-rule "\'A" "Á" :string)
-(merge-rule "\'C" "Ć" :string)
-(merge-rule "\'E" "É" :string)
-(merge-rule "\'I" "Í" :string)
-(merge-rule "\'L" "Ĺ" :string)
-(merge-rule "\'N" "Ń" :string)
-(merge-rule "\'O" "Ó" :string)
-(merge-rule "\'R" "Ŕ" :string)
-(merge-rule "\'S" "Ś" :string)
-(merge-rule "\'U" "Ú" :string)
-(merge-rule "\'Y" "Ý" :string)
-(merge-rule "\'Z" "Ź" :string)
+(merge-rule "{^1}" "¹" :string)
+(merge-rule "{^2}" "²" :string)
+(merge-rule "{^3}" "³" :string)
 (merge-rule "\'a" "á" :string)
+(merge-rule "\'A" "Á" :string)
+(merge-rule "\`a" "à" :string)
+(merge-rule "\`A" "À" :string)
+(merge-rule "\^a" "â" :string)
+(merge-rule "\^A" "Â" :string)
+(merge-rule "\~"a" "ä" :string)
+(merge-rule "\~"A" "Ä" :string)
+(merge-rule "\~~a" "ã" :string)
+(merge-rule "\~~A" "Ã" :string)
+(merge-rule "\c c" "ç" :string)
+(merge-rule "\c C" "Ç" :string)
 (merge-rule "\'c" "ć" :string)
-(merge-rule "\'e" "é" :string)
-(merge-rule "\'l" "ĺ" :string)
-(merge-rule "\'n" "ń" :string)
-(merge-rule "\'o" "ó" :string)
-(merge-rule "\'r" "ŕ" :string)
-(merge-rule "\'s" "ś" :string)
-(merge-rule "\'u" "ú" :string)
-(merge-rule "\'y" "ý" :string)
-(merge-rule "\'z" "ź" :string)
-(merge-rule "\'{}" "´" :string)
-(merge-rule "\.C" "Ċ" :string)
-(merge-rule "\.G" "Ġ" :string)
-(merge-rule "\.I" "İ" :string)
-(merge-rule "\.Z" "Ż" :string)
+(merge-rule "\'C" "Ć" :string)
+(merge-rule "\^c" "ĉ" :string)
+(merge-rule "\^C" "Ĉ" :string)
 (merge-rule "\.c" "ċ" :string)
+(merge-rule "\.C" "Ċ" :string)
+(merge-rule "\c s" "ş" :string)
+(merge-rule "\c S" "Ş" :string)
+(merge-rule "\c t" "ţ" :string)
+(merge-rule "\c T" "Ţ" :string)
+(merge-rule "\discretionary {-}{}{}" "­" :string)
+(merge-rule "\div " "÷" :string)
+(merge-rule "\'e" "é" :string)
+(merge-rule "\'E" "É" :string)
+(merge-rule "\`e" "è" :string)
+(merge-rule "\`E" "È" :string)
+(merge-rule "\^e" "ê" :string)
+(merge-rule "\^E" "Ê" :string)
+(merge-rule "\~"e" "ë" :string)
+(merge-rule "\~"E" "Ë" :string)
+(merge-rule "\^g" "ĝ" :string)
+(merge-rule "\^G" "Ĝ" :string)
 (merge-rule "\.g" "ġ" :string)
-(merge-rule "\.z" "ż" :string)
-(merge-rule "\.{}" "˙" :string)
-(merge-rule "\={}" "¯" :string)
-(merge-rule "\H O" "Ő" :string)
-(merge-rule "\H U" "Ű" :string)
+(merge-rule "\.G" "Ġ" :string)
+(merge-rule "\^h" "ĥ" :string)
+(merge-rule "\^H" "Ĥ" :string)
 (merge-rule "\H o" "ő" :string)
-(merge-rule "\H u" "ű" :string)
+(merge-rule "\H O" "Ő" :string)
 (merge-rule "\H {}" "˝" :string)
-(merge-rule "\IeC {\'\i }" "í" :string)
-(merge-rule "\IeC {\AE }" "Æ" :string)
-(merge-rule "\IeC {\DH }" "Ð" :string)
-(merge-rule "\IeC {\DJ }" "Đ" :string)
-(merge-rule "\IeC {\L }" "Ł" :string)
-(merge-rule "\IeC {\O }" "Ø" :string)
-(merge-rule "\IeC {\P  }" "¶" :string)
-(merge-rule "\IeC {\S  }" "§" :string)
-(merge-rule "\IeC {\TH }" "Þ" :string)
-(merge-rule "\IeC {\^\i }" "î" :string)
-(merge-rule "\IeC {\^\j }" "ĵ" :string)
-(merge-rule "\IeC {\`\i }" "ì" :string)
+(merge-rule "\H u" "ű" :string)
+(merge-rule "\H U" "Ű" :string)
 (merge-rule "\IeC {\ae }" "æ" :string)
-(merge-rule "\IeC {\c \ }" "¸" :string)
+(merge-rule "\IeC {\AE }" "Æ" :string)
 (merge-rule "\IeC {\copyright  }" "©" :string)
+(merge-rule "\IeC {\c \ }" "¸" :string)
 (merge-rule "\IeC {\dh }" "ð" :string)
+(merge-rule "\IeC {\DH }" "Ð" :string)
 (merge-rule "\IeC {\dj }" "đ" :string)
+(merge-rule "\IeC {\DJ }" "Đ" :string)
 (merge-rule "\IeC {\guillemotleft }" "«" :string)
 (merge-rule "\IeC {\guillemotright }" "»" :string)
+(merge-rule "\IeC {\'\i }" "í" :string)
+(merge-rule "\IeC {\`\i }" "ì" :string)
+(merge-rule "\IeC {\^\i }" "î" :string)
+(merge-rule "\IeC {\~"\i }" "ï" :string)
 (merge-rule "\IeC {\i }" "ı" :string)
+(merge-rule "\IeC {\^\j }" "ĵ" :string)
 (merge-rule "\IeC {\k \ }" "˛" :string)
 (merge-rule "\IeC {\l }" "ł" :string)
+(merge-rule "\IeC {\L }" "Ł" :string)
 (merge-rule "\IeC {\nobreakspace  }" " " :string)
 (merge-rule "\IeC {\o }" "ø" :string)
+(merge-rule "\IeC {\O }" "Ø" :string)
 (merge-rule "\IeC {\pounds  }" "£" :string)
+(merge-rule "\IeC {\P  }" "¶" :string)
 (merge-rule "\IeC {\ss }" "ß" :string)
+(merge-rule "\IeC {\S  }" "§" :string)
 (merge-rule "\IeC {\textbrokenbar }" "¦" :string)
 (merge-rule "\IeC {\textcent }" "¢" :string)
 (merge-rule "\IeC {\textcurrency }" "¤" :string)
 (merge-rule "\IeC {\textdegree }" "°" :string)
 (merge-rule "\IeC {\textexclamdown }" "¡" :string)
-(merge-rule "\IeC {\textmalteseH }" "Ħ" :string)
 (merge-rule "\IeC {\textmalteseh }" "ħ" :string)
+(merge-rule "\IeC {\textmalteseH }" "Ħ" :string)
 (merge-rule "\IeC {\textonehalf }" "½" :string)
 (merge-rule "\IeC {\textonequarter }" "¼" :string)
 (merge-rule "\IeC {\textordfeminine }" "ª" :string)
@@ -82,97 +90,89 @@
 (merge-rule "\IeC {\textthreequarters }" "¾" :string)
 (merge-rule "\IeC {\textyen }" "¥" :string)
 (merge-rule "\IeC {\th }" "þ" :string)
-(merge-rule "\IeC {\~"\i }" "ï" :string)
-(merge-rule "\^A" "Â" :string)
-(merge-rule "\^C" "Ĉ" :string)
-(merge-rule "\^E" "Ê" :string)
-(merge-rule "\^G" "Ĝ" :string)
-(merge-rule "\^H" "Ĥ" :string)
+(merge-rule "\IeC {\TH }" "Þ" :string)
+(merge-rule "\'I" "Í" :string)
+(merge-rule "\`I" "Ì" :string)
 (merge-rule "\^I" "Î" :string)
+(merge-rule "\~"I" "Ï" :string)
+(merge-rule "\.I" "İ" :string)
 (merge-rule "\^J" "Ĵ" :string)
-(merge-rule "\^O" "Ô" :string)
-(merge-rule "\^S" "Ŝ" :string)
-(merge-rule "\^U" "Û" :string)
-(merge-rule "\^a" "â" :string)
-(merge-rule "\^c" "ĉ" :string)
-(merge-rule "\^e" "ê" :string)
-(merge-rule "\^g" "ĝ" :string)
-(merge-rule "\^h" "ĥ" :string)
-(merge-rule "\^o" "ô" :string)
-(merge-rule "\^s" "ŝ" :string)
-(merge-rule "\^u" "û" :string)
-(merge-rule "\`A" "À" :string)
-(merge-rule "\`E" "È" :string)
-(merge-rule "\`I" "Ì" :string)
-(merge-rule "\`O" "Ò" :string)
-(merge-rule "\`U" "Ù" :string)
-(merge-rule "\`a" "à" :string)
-(merge-rule "\`e" "è" :string)
-(merge-rule "\`o" "ò" :string)
-(merge-rule "\`u" "ù" :string)
-(merge-rule "\c C" "Ç" :string)
-(merge-rule "\c S" "Ş" :string)
-(merge-rule "\c T" "Ţ" :string)
-(merge-rule "\c c" "ç" :string)
-(merge-rule "\c s" "ş" :string)
-(merge-rule "\c t" "ţ" :string)
-(merge-rule "\discretionary {-}{}{}" "­" :string)
-(merge-rule "\div " "÷" :string)
-(merge-rule "\k A" "Ą" :string)
-(merge-rule "\k E" "Ę" :string)
 (merge-rule "\k a" "ą" :string)
+(merge-rule "\k A" "Ą" :string)
 (merge-rule "\k e" "ę" :string)
+(merge-rule "\k E" "Ę" :string)
+(merge-rule "\'l" "ĺ" :string)
+(merge-rule "\'L" "Ĺ" :string)
 (merge-rule "\lnot " "¬" :string)
 (merge-rule "\mu " "µ" :string)
+(merge-rule "\'n" "ń" :string)
+(merge-rule "\'N" "Ń" :string)
+(merge-rule "\~~n" "ñ" :string)
+(merge-rule "\~~N" "Ñ" :string)
+(merge-rule "\'o" "ó" :string)
+(merge-rule "\'O" "Ó" :string)
+(merge-rule "\`o" "ò" :string)
+(merge-rule "\`O" "Ò" :string)
+(merge-rule "\^o" "ô" :string)
+(merge-rule "\^O" "Ô" :string)
+(merge-rule "\~"o" "ö" :string)
+(merge-rule "\~"O" "Ö" :string)
+(merge-rule "\~~o" "õ" :string)
+(merge-rule "\~~O" "Õ" :string)
 (merge-rule "\pm " "±" :string)
-(merge-rule "\r A" "Å" :string)
-(merge-rule "\r U" "Ů" :string)
 (merge-rule "\r a" "å" :string)
+(merge-rule "\r A" "Å" :string)
+(merge-rule "\'r" "ŕ" :string)
+(merge-rule "\'R" "Ŕ" :string)
 (merge-rule "\r u" "ů" :string)
+(merge-rule "\r U" "Ů" :string)
+(merge-rule "\'s" "ś" :string)
+(merge-rule "\'S" "Ś" :string)
+(merge-rule "\^s" "ŝ" :string)
+(merge-rule "\^S" "Ŝ" :string)
+(merge-rule "\~"{}" "¨" :string)
+(merge-rule "\={}" "¯" :string)
+(merge-rule "\.{}" "˙" :string)
+(merge-rule "\'{}" "´" :string)
 (merge-rule "\times " "×" :string)
-(merge-rule "\u A" "Ă" :string)
-(merge-rule "\u G" "Ğ" :string)
-(merge-rule "\u U" "Ŭ" :string)
 (merge-rule "\u a" "ă" :string)
+(merge-rule "\u A" "Ă" :string)
 (merge-rule "\u g" "ğ" :string)
-(merge-rule "\u u" "ŭ" :string)
+(merge-rule "\u G" "Ğ" :string)
 (merge-rule "\u {}" "˘" :string)
-(merge-rule "\v C" "Č" :string)
-(merge-rule "\v D" "Ď" :string)
-(merge-rule "\v E" "Ě" :string)
-(merge-rule "\v L" "Ľ" :string)
-(merge-rule "\v N" "Ň" :string)
-(merge-rule "\v R" "Ř" :string)
-(merge-rule "\v S" "Š" :string)
-(merge-rule "\v T" "Ť" :string)
-(merge-rule "\v Z" "Ž" :string)
+(merge-rule "\'u" "ú" :string)
+(merge-rule "\'U" "Ú" :string)
+(merge-rule "\`u" "ù" :string)
+(merge-rule "\`U" "Ù" :string)
+(merge-rule "\^u" "û" :string)
+(merge-rule "\^U" "Û" :string)
+(merge-rule "\~"u" "ü" :string)
+(merge-rule "\~"U" "Ü" :string)
+(merge-rule "\u u" "ŭ" :string)
+(merge-rule "\u U" "Ŭ" :string)
 (merge-rule "\v c" "č" :string)
+(merge-rule "\v C" "Č" :string)
 (merge-rule "\v d" "ď" :string)
+(merge-rule "\v D" "Ď" :string)
 (merge-rule "\v e" "ě" :string)
+(merge-rule "\v E" "Ě" :string)
 (merge-rule "\v l" "ľ" :string)
+(merge-rule "\v L" "Ľ" :string)
 (merge-rule "\v n" "ň" :string)
+(merge-rule "\v N" "Ň" :string)
 (merge-rule "\v r" "ř" :string)
+(merge-rule "\v R" "Ř" :string)
 (merge-rule "\v s" "š" :string)
+(merge-rule "\v S" "Š" :string)
+(merge-rule "\v {}" "ˇ" :string)
 (merge-rule "\v t" "ť" :string)
+(merge-rule "\v T" "Ť" :string)
 (merge-rule "\v z" "ž" :string)
-(merge-rule "\v {}" "ˇ" :string)
-(merge-rule "\~"A" "Ä" :string)
-(merge-rule "\~"E" "Ë" :string)
-(merge-rule "\~"I" "Ï" :string)
-(merge-rule "\~"O" "Ö" :string)
-(merge-rule "\~"U" "Ü" :string)
-(merge-rule "\~"a" "ä" :string)
-(merge-rule "\~"e" "ë" :string)
-(merge-rule "\~"o" "ö" :string)
-(merge-rule "\~"u" "ü" :string)
+(merge-rule "\v Z" "Ž" :string)
+(merge-rule "\'y" "ý" :string)
+(merge-rule "\'Y" "Ý" :string)
 (merge-rule "\~"y" "ÿ" :string)
-(merge-rule "\~"{}" "¨" :string)
-(merge-rule "\~~A" "Ã" :string)
-(merge-rule "\~~N" "Ñ" :string)
-(merge-rule "\~~O" "Õ" :string)
-(merge-rule "\~~a" "ã" :string)
-(merge-rule "\~~n" "ñ" :string)
-(merge-rule "\~~o" "õ" :string)
-(merge-rule "{^1}" "¹" :string)
-(merge-rule "{^2}" "²" :string)
-(merge-rule "{^3}" "³" :string)
+(merge-rule "\'z" "ź" :string)
+(merge-rule "\'Z" "Ź" :string)
+(merge-rule "\.z" "ż" :string)
+(merge-rule "\.Z" "Ż" :string)