1 files changed, 178 insertions, 177 deletions

diff --git a/Master/texmf-dist/xindy/modules/lang/persian/utf8.xdy b/Master/texmf-dist/xindy/modules/lang/persian/utf8.xdy
index 27d75e7794c..b93bdc1245f 100644
--- a/Master/texmf-dist/xindy/modules/lang/persian/utf8.xdy
+++ b/Master/texmf-dist/xindy/modules/lang/persian/utf8.xdy
@@ -1,184 +1,185 @@
 ;; Rules for xindy; generated by make-rules.pl
 ;; language: Persian
 
-(define-letter-group "ا" :prefixes ("�"))
-(define-letter-group "ب" :after "ا" :prefixes ("�"))
-(define-letter-group "پ" :after "ب" :prefixes ("�"))
-(define-letter-group "ت" :after "پ" :prefixes ("�"))
-(define-letter-group "ث" :after "ت" :prefixes ("�"))
-(define-letter-group "ج" :after "ث" :prefixes ("�"))
-(define-letter-group "چ" :after "ج" :prefixes ("�"))
-(define-letter-group "ح" :after "چ" :prefixes ("�"))
-(define-letter-group "خ" :after "ح" :prefixes ("�"))
-(define-letter-group "د" :after "خ" :prefixes ("�"))
-(define-letter-group "ذ" :after "د" :prefixes ("�"))
-(define-letter-group "ر" :after "ذ" :prefixes ("�"))
-(define-letter-group "ز" :after "ر" :prefixes ("�"))
-(define-letter-group "ژ" :after "ز" :prefixes ("�"))
-(define-letter-group "س" :after "ژ" :prefixes ("�"))
-(define-letter-group "ش" :after "س" :prefixes ("�"))
-(define-letter-group "ص" :after "ش" :prefixes ("�"))
-(define-letter-group "ض" :after "ص" :prefixes ("�"))
-(define-letter-group "ط" :after "ض" :prefixes ("�"))
-(define-letter-group "ظ" :after "ط" :prefixes ("�"))
-(define-letter-group "ع" :after "ظ" :prefixes ("�"))
-(define-letter-group "غ" :after "ع" :prefixes ("�"))
-(define-letter-group "ف" :after "غ" :prefixes ("�"))
-(define-letter-group "ق" :after "ف" :prefixes ("�"))
-(define-letter-group "ک" :after "ق" :prefixes ("�"))
-(define-letter-group "گ" :after "ک" :prefixes ("�"))
-(define-letter-group "ل" :after "گ" :prefixes ("�"))
-(define-letter-group "م" :after "ل" :prefixes ("�"))
-(define-letter-group "ن" :after "م" :prefixes ("�"))
-(define-letter-group "و" :after "ن" :prefixes ("�"))
-(define-letter-group "ه" :after "و" :prefixes ("�"))
-(define-letter-group "ی" :after "ه" :prefixes ("�"))
-(define-letter-group "A" :after "ی" :prefixes ("�"))
-(define-letter-group "B" :after "A" :prefixes ("�"))
-(define-letter-group "C" :after "B" :prefixes ("�"))
-(define-letter-group "D" :after "C" :prefixes ("�"))
-(define-letter-group "E" :after "D" :prefixes ("�"))
-(define-letter-group "F" :after "E" :prefixes ("�"))
-(define-letter-group "G" :after "F" :prefixes ("�"))
-(define-letter-group "H" :after "G" :prefixes ("�"))
-(define-letter-group "I" :after "H" :prefixes ("�"))
-(define-letter-group "J" :after "I" :prefixes ("�"))
-(define-letter-group "K" :after "J" :prefixes ("�"))
-(define-letter-group "L" :after "K" :prefixes ("�"))
-(define-letter-group "M" :after "L" :prefixes ("�"))
-(define-letter-group "N" :after "M" :prefixes ("�"))
-(define-letter-group "O" :after "N" :prefixes ("�"))
-(define-letter-group "P" :after "O" :prefixes ("�"))
-(define-letter-group "Q" :after "P" :prefixes ("�"))
-(define-letter-group "R" :after "Q" :prefixes ("�"))
-(define-letter-group "S" :after "R" :prefixes ("�"))
-(define-letter-group "T" :after "S" :prefixes ("�"))
-(define-letter-group "U" :after "T" :prefixes ("�"))
-(define-letter-group "V" :after "U" :prefixes ("�"))
-(define-letter-group "W" :after "V" :prefixes ("�"))
-(define-letter-group "X" :after "W" :prefixes ("�"))
-(define-letter-group "Y" :after "X" :prefixes ("�"))
-(define-letter-group "Z" :after "Y" :prefixes ("�"))
-(define-letter-group "Þ" :after "Z" :prefixes ("�"))
+(define-letter-group "آ" :prefixes ("�"))
+(define-letter-group "ا" :after "آ" :prefixes ("�"))
+(define-letter-group "ب" :after "ا" :prefixes ("�"))
+(define-letter-group "پ" :after "ب" :prefixes ("�"))
+(define-letter-group "ت" :after "پ" :prefixes ("�"))
+(define-letter-group "ث" :after "ت" :prefixes ("�"))
+(define-letter-group "ج" :after "ث" :prefixes ("�"))
+(define-letter-group "چ" :after "ج" :prefixes ("�"))
+(define-letter-group "ح" :after "چ" :prefixes ("�"))
+(define-letter-group "خ" :after "ح" :prefixes ("�"))
+(define-letter-group "د" :after "خ" :prefixes ("�"))
+(define-letter-group "ذ" :after "د" :prefixes ("�"))
+(define-letter-group "ر" :after "ذ" :prefixes ("�"))
+(define-letter-group "ز" :after "ر" :prefixes ("�"))
+(define-letter-group "ژ" :after "ز" :prefixes ("�"))
+(define-letter-group "س" :after "ژ" :prefixes ("�"))
+(define-letter-group "ش" :after "س" :prefixes ("�"))
+(define-letter-group "ص" :after "ش" :prefixes ("�"))
+(define-letter-group "ض" :after "ص" :prefixes ("�"))
+(define-letter-group "ط" :after "ض" :prefixes ("�"))
+(define-letter-group "ظ" :after "ط" :prefixes ("�"))
+(define-letter-group "ع" :after "ظ" :prefixes ("�"))
+(define-letter-group "غ" :after "ع" :prefixes ("�"))
+(define-letter-group "ف" :after "غ" :prefixes ("�"))
+(define-letter-group "ق" :after "ف" :prefixes ("�"))
+(define-letter-group "ک" :after "ق" :prefixes ("�"))
+(define-letter-group "گ" :after "ک" :prefixes ("�"))
+(define-letter-group "ل" :after "گ" :prefixes ("�"))
+(define-letter-group "م" :after "ل" :prefixes ("�"))
+(define-letter-group "ن" :after "م" :prefixes ("�"))
+(define-letter-group "و" :after "ن" :prefixes ("�"))
+(define-letter-group "ه" :after "و" :prefixes ("�"))
+(define-letter-group "ی" :after "ه" :prefixes ("�"))
+(define-letter-group "A" :after "ی" :prefixes ("�"))
+(define-letter-group "B" :after "A" :prefixes ("�"))
+(define-letter-group "C" :after "B" :prefixes ("�"))
+(define-letter-group "D" :after "C" :prefixes ("�"))
+(define-letter-group "E" :after "D" :prefixes ("�"))
+(define-letter-group "F" :after "E" :prefixes ("�"))
+(define-letter-group "G" :after "F" :prefixes ("�"))
+(define-letter-group "H" :after "G" :prefixes ("�"))
+(define-letter-group "I" :after "H" :prefixes ("�"))
+(define-letter-group "J" :after "I" :prefixes ("�"))
+(define-letter-group "K" :after "J" :prefixes ("�"))
+(define-letter-group "L" :after "K" :prefixes ("�"))
+(define-letter-group "M" :after "L" :prefixes ("�"))
+(define-letter-group "N" :after "M" :prefixes ("�"))
+(define-letter-group "O" :after "N" :prefixes ("�"))
+(define-letter-group "P" :after "O" :prefixes ("�"))
+(define-letter-group "Q" :after "P" :prefixes ("�"))
+(define-letter-group "R" :after "Q" :prefixes ("�"))
+(define-letter-group "S" :after "R" :prefixes ("�"))
+(define-letter-group "T" :after "S" :prefixes ("�"))
+(define-letter-group "U" :after "T" :prefixes ("�"))
+(define-letter-group "V" :after "U" :prefixes ("�"))
+(define-letter-group "W" :after "V" :prefixes ("�"))
+(define-letter-group "X" :after "W" :prefixes ("�"))
+(define-letter-group "Y" :after "X" :prefixes ("�"))
+(define-letter-group "Z" :after "Y" :prefixes ("�"))
+(define-letter-group "Þ" :after "Z" :prefixes ("�"))
 
 (define-rule-set "pe-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)
-           ("Ë" "�" :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)
-           ("D" "�" :string)
-           ("E" "�" :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)
-           ("k" "�" :string)
-           ("L" "�" :string)
-           ("l" "�" :string)
-           ("M" "�" :string)
-           ("m" "�" :string)
-           ("N" "�" :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)
-           ("t" "�" :string)
-           ("u" "�" :string)
-           ("U" "�" :string)
-           ("v" "�" :string)
-           ("V" "�" :string)
-           ("w" "�" :string)
-           ("W" "�" :string)
-           ("X" "�" :string)
-           ("x" "�" :string)
-           ("Y" "�" :string)
-           ("y" "�" :string)
-           ("z" "�" :string)
-           ("Z" "�" :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)
+           ("a" "�" :string)
+           ("A" "�" :string)
+           ("b" "�" :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)
+           ("h" "�" :string)
+           ("I" "�" :string)
+           ("i" "�" :string)
+           ("J" "�" :string)
+           ("j" "�" :string)
+           ("K" "�" :string)
+           ("k" "�" :string)
+           ("L" "�" :string)
+           ("l" "�" :string)
+           ("M" "�" :string)
+           ("m" "�" :string)
+           ("N" "�" :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)
+           ("t" "�" :string)
+           ("u" "�" :string)
+           ("U" "�" :string)
+           ("v" "�" :string)
+           ("V" "�" :string)
+           ("w" "�" :string)
+           ("W" "�" :string)
+           ("X" "�" :string)
+           ("x" "�" :string)
+           ("Y" "�" :string)
+           ("y" "�" :string)
+           ("z" "�" :string)
+           ("Z" "�" :string)
            ))
 
 (define-rule-set "pe-resolve-diacritics"
@@ -303,8 +304,7 @@
 
 (define-rule-set "pe-resolve-case"
 
-  :rules  (("آ" "7" :string)
-           ("Ö" "8" :string)
+  :rules  (("Ö" "8" :string)
            ("Ñ" "8" :string)
            ("ی" "8" :string)
            ("Ô" "8" :string)
@@ -364,6 +364,7 @@
            ("ت" "9" :string)
            ("é" "9" :string)
            ("گ" "9" :string)
+           ("آ" "9" :string)
            ("ژ" "9" :string)
            ("œ" "99" :string)
            ("æ" "99" :string)