summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-09-05 22:01:10 +0000
committerKarl Berry <karl@freefriends.org>2015-09-05 22:01:10 +0000
commit412a3bd77bd76014472d93aa65ce8d7b75809ebb (patch)
tree693f23e713a7e26b3e55b5e946da81d9825f67c4
parent72347356254cf3c4b88615a8c0fcf696b21e313f (diff)
arabxetex (4sep15)
git-svn-id: svn://tug.org/texlive/trunk@38299 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/xelatex/arabxetex/README17
-rw-r--r--Master/texmf-dist/doc/xelatex/arabxetex/README.md34
-rw-r--r--Master/texmf-dist/doc/xelatex/arabxetex/arabxetex.pdfbin317330 -> 257265 bytes
-rw-r--r--Master/texmf-dist/doc/xelatex/arabxetex/examples/ednotes_example.pdfbin70740 -> 84684 bytes
-rw-r--r--Master/texmf-dist/doc/xelatex/arabxetex/examples/ednotes_example.tex14
-rw-r--r--Master/texmf-dist/doc/xelatex/arabxetex/examples/minimal.tex6
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-farsi-fullvoc.map (renamed from Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-farsi-fullvoc.map)26
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-farsi-fullvoc.tecbin0 -> 5115 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-farsi-novoc.map (renamed from Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-farsi-novoc.map)26
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-farsi-novoc.tecbin0 -> 4186 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-farsi-voc.map (renamed from Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-farsi-voc.map)26
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-farsi-voc.tecbin0 -> 4234 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-farsi-fullvoc.map495
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-farsi-fullvoc.tecbin5095 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-farsi-novoc.map480
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-farsi-novoc.tecbin4158 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-farsi-voc.map490
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-farsi-voc.tecbin4198 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-fullvoc.map482
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-fullvoc.tecbin4798 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kashmiri-fullvoc.map513
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kashmiri-fullvoc.tecbin5278 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kashmiri-novoc.map498
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kashmiri-novoc.tecbin4312 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kashmiri-voc.map508
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kashmiri-voc.tecbin4326 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kurdish.tecbin2385 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-maghribi-fullvoc.map482
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-maghribi-fullvoc.tecbin4807 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-maghribi-novoc.map465
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-maghribi-novoc.tecbin3838 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-maghribi-voc.map476
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-maghribi-voc.tecbin3910 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-malay-fullvoc.map485
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-malay-fullvoc.tecbin4969 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-malay-novoc.map470
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-malay-novoc.tecbin4053 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-malay-voc.map480
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-malay-voc.tecbin4067 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-novoc.map465
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-novoc.tecbin3828 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-pashto-fullvoc.map491
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-pashto-fullvoc.tecbin5030 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-pashto-novoc.map476
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-pashto-novoc.tecbin4099 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-pashto-voc.map486
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-pashto-voc.tecbin4122 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-sindhi-fullvoc.map461
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-sindhi-fullvoc.tecbin4872 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-sindhi-novoc.map446
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-sindhi-novoc.tecbin3890 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-sindhi-voc.map456
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-sindhi-voc.tecbin3916 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-turk-fullvoc.map485
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-turk-fullvoc.tecbin4957 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-turk-novoc.map470
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-turk-novoc.tecbin4017 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-turk-voc.map480
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-turk-voc.tecbin4047 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-uighur.tecbin2252 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-urdu-fullvoc.map499
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-urdu-fullvoc.tecbin5120 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-urdu-novoc.map484
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-urdu-novoc.tecbin4171 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-urdu-voc.map494
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-urdu-voc.tecbin4181 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-voc.map476
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-voc.tecbin3901 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-farsi-fullvoc.tecbin5100 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-farsi-novoc.tecbin4170 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-farsi-voc.tecbin4194 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-fullvoc.tecbin4799 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kashmiri-fullvoc.tecbin5279 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kashmiri-novoc.tecbin4324 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kashmiri-voc.tecbin4338 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kurdish.map290
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kurdish.tecbin2382 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-maghribi-fullvoc.tecbin4813 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-maghribi-novoc.tecbin3832 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-maghribi-voc.tecbin3931 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-malay-fullvoc.tecbin4956 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-malay-novoc.tecbin4066 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-malay-voc.tecbin4045 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-novoc.tecbin3826 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-pashto-fullvoc.tecbin5026 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-pashto-novoc.tecbin4100 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-pashto-voc.tecbin4111 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-sindhi-fullvoc.tecbin4862 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-sindhi-novoc.tecbin3892 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-sindhi-voc.tecbin3897 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-turk-fullvoc.tecbin4966 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-turk-novoc.tecbin4027 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-turk-voc.tecbin4054 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-uighur.map277
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-uighur.tecbin2257 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-urdu-fullvoc.tecbin5126 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-urdu-novoc.tecbin4169 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-urdu-voc.tecbin4207 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-voc.tecbin3922 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fullvoc.map (renamed from Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-fullvoc.map)27
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fullvoc.tecbin0 -> 4837 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-kashmiri-fullvoc.map (renamed from Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kashmiri-fullvoc.map)26
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-kashmiri-fullvoc.tecbin0 -> 5299 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-kashmiri-novoc.map (renamed from Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kashmiri-novoc.map)26
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-kashmiri-novoc.tecbin0 -> 4343 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-kashmiri-voc.map (renamed from Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kashmiri-voc.map)26
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-kashmiri-voc.tecbin0 -> 4372 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-kurdish.map (renamed from Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kurdish.map)16
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-kurdish.tecbin0 -> 2393 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-maghribi-fullvoc.map (renamed from Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-maghribi-fullvoc.map)27
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-maghribi-fullvoc.tecbin0 -> 4845 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-maghribi-novoc.map (renamed from Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-maghribi-novoc.map)26
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-maghribi-novoc.tecbin0 -> 3857 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-maghribi-voc.map (renamed from Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-maghribi-voc.map)26
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-maghribi-voc.tecbin0 -> 3954 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-malay-fullvoc.map (renamed from Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-malay-fullvoc.map)26
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-malay-fullvoc.tecbin0 -> 4975 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-malay-novoc.map (renamed from Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-malay-novoc.map)26
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-malay-novoc.tecbin0 -> 4100 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-malay-voc.map (renamed from Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-malay-voc.map)26
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-malay-voc.tecbin0 -> 4084 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-novoc.map (renamed from Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-novoc.map)26
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-novoc.tecbin0 -> 3852 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-pashto-fullvoc.map (renamed from Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-pashto-fullvoc.map)26
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-pashto-fullvoc.tecbin0 -> 5043 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-pashto-novoc.map (renamed from Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-pashto-novoc.map)26
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-pashto-novoc.tecbin0 -> 4132 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-pashto-voc.map (renamed from Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-pashto-voc.map)26
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-pashto-voc.tecbin0 -> 4150 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-sindhi-fullvoc.map (renamed from Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-sindhi-fullvoc.map)26
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-sindhi-fullvoc.tecbin0 -> 4887 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-sindhi-novoc.map (renamed from Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-sindhi-novoc.map)26
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-sindhi-novoc.tecbin0 -> 3920 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-sindhi-voc.map (renamed from Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-sindhi-voc.map)26
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-sindhi-voc.tecbin0 -> 3940 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-turk-fullvoc.map (renamed from Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-turk-fullvoc.map)26
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-turk-fullvoc.tecbin0 -> 4979 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-turk-novoc.map (renamed from Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-turk-novoc.map)26
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-turk-novoc.tecbin0 -> 4052 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-turk-voc.map (renamed from Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-turk-voc.map)26
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-turk-voc.tecbin0 -> 4102 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-uighur.map (renamed from Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-uighur.map)16
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-uighur.tecbin0 -> 2256 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-urdu-fullvoc.map (renamed from Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-urdu-fullvoc.map)26
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-urdu-fullvoc.tecbin0 -> 5146 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-urdu-novoc.map (renamed from Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-urdu-novoc.map)26
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-urdu-novoc.tecbin0 -> 4187 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-urdu-voc.map (renamed from Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-urdu-voc.map)26
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-urdu-voc.tecbin0 -> 4251 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-voc.map (renamed from Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-voc.map)26
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-voc.tecbin0 -> 3943 bytes
-rw-r--r--Master/texmf-dist/source/xelatex/arabxetex/arabtex-kurdish.maps294
-rw-r--r--Master/texmf-dist/source/xelatex/arabxetex/arabtex-uighur.maps281
-rw-r--r--Master/texmf-dist/source/xelatex/arabxetex/arabtex.maps35
-rw-r--r--Master/texmf-dist/source/xelatex/arabxetex/arabxetex.dtx543
-rwxr-xr-xMaster/texmf-dist/source/xelatex/arabxetex/makemaps.pl681
-rw-r--r--Master/texmf-dist/tex/xelatex/arabxetex/arabxetex.sty104
157 files changed, 594 insertions, 15711 deletions
diff --git a/Master/texmf-dist/doc/xelatex/arabxetex/README b/Master/texmf-dist/doc/xelatex/arabxetex/README
deleted file mode 100644
index 06ad3a8c06f..00000000000
--- a/Master/texmf-dist/doc/xelatex/arabxetex/README
+++ /dev/null
@@ -1,17 +0,0 @@
---------------------------
-THE ARABXETEX PACKAGE v1.1.4
-
-This package provides a convenient ArabTeX-like user-interface for typesetting
-languages using the Arabic script in XeLaTeX, with flexible access to font
-features. Input in ArabTeX notation can be set in three different
-vocalization modes or in roman transliteration. Direct UTF-8 input is also
-supported. Since most of the ‘real work’ -- namely parsing and converting
-ArabTeX input to Unicode -- is done at the level of TECkit mappings,
-ArabXeTeX is really performant.
-
-The TECkit fontmapping files (*.map and *.tec) should be copied to
-<TEXMF>/fonts/misc/xetex/fontmapping/arabxetex/
-
--------------------------
-François Charette
-© 2007–2010
diff --git a/Master/texmf-dist/doc/xelatex/arabxetex/README.md b/Master/texmf-dist/doc/xelatex/arabxetex/README.md
new file mode 100644
index 00000000000..b862d9669e8
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/arabxetex/README.md
@@ -0,0 +1,34 @@
+# THE ARABXETEX PACKAGE
+## v1.2.1
+
+This package provides a convenient ArabTeX-like user-interface for typesetting
+languages using the Arabic script in XeLaTeX, with flexible access to font
+features. Input in ArabTeX notation can be set in three different vocalization
+modes or in roman transliteration. Direct UTF-8 input is also supported, but
+users not interested in ArabTeX input notation should rather consider the
+package [polyglossia](https://www.ctan.org/pkg/polyglossia). Since most of the
+‘real work’ – namely parsing and converting ArabTeX input to Unicode – is done
+at the level of TECkit mappings, ArabXeTeX is really performant.
+
+The TECkit fontmapping files (`*.map` and `*.tec`) should be copied to
+`<TEXMF>/fonts/misc/xetex/fontmapping/arabxetex/`
+
+
+### Changes from version 1.1.4:
+
+- Fix problem with plain footnotes (Fix provided by [Enrico Gregorio](http://tex.stackexchange.com/questions/223081/arabxetex-and-footnote))
+- Remove obsolete and superfluous parts from documentation
+- Default Arabic font is now [Amiri](http://www.amirifont.org/) instead of Scheherazade and Amiri is also used in the documentation.
+- Include a pull request from Khaled Hosny:
+ * Improves the documentation and notably clears up the confusion around U+FDF2.
+ Consequently the options `fdf2alif` and `fdf2noalif` are now *DEPRECATED*, as well as
+ the commands `\SetAllahWithAlif` and `\SetAllahWithoutAlif`.
+ * Fix placement of tanwin fatah
+ * Fix handling of end of ayeh symbol in mapping
+
+*NB* From a user perspective there is no difference between 1.2.0 and 1.2.1.
+
+---
+François Charette
+© 2007–2015
+
diff --git a/Master/texmf-dist/doc/xelatex/arabxetex/arabxetex.pdf b/Master/texmf-dist/doc/xelatex/arabxetex/arabxetex.pdf
index 5bb140b2bb1..15f890225f9 100644
--- a/Master/texmf-dist/doc/xelatex/arabxetex/arabxetex.pdf
+++ b/Master/texmf-dist/doc/xelatex/arabxetex/arabxetex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/xelatex/arabxetex/examples/ednotes_example.pdf b/Master/texmf-dist/doc/xelatex/arabxetex/examples/ednotes_example.pdf
index c24dbcf774e..bbb8f3037d9 100644
--- a/Master/texmf-dist/doc/xelatex/arabxetex/examples/ednotes_example.pdf
+++ b/Master/texmf-dist/doc/xelatex/arabxetex/examples/ednotes_example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/xelatex/arabxetex/examples/ednotes_example.tex b/Master/texmf-dist/doc/xelatex/arabxetex/examples/ednotes_example.tex
index cc49982f5b1..c335434ae85 100644
--- a/Master/texmf-dist/doc/xelatex/arabxetex/examples/ednotes_example.tex
+++ b/Master/texmf-dist/doc/xelatex/arabxetex/examples/ednotes_example.tex
@@ -11,9 +11,9 @@
%%
\documentclass[12pt,a4paper,oneside]{memoir}
\usepackage{fontspec}
-\setromanfont[Mapping=tex-text]{Junicode}
-\usepackage[novoc,fdf2alif]{arabxetex}
-\newfontfamily\arabicfont[Script=Arabic,Scale=1.2,WordSpace=2]{Scheherazade}
+\setmainfont[Ligatures=TeX]{Junicode}
+\usepackage[novoc]{arabxetex}
+\newfontfamily\arabicfont[Script=Arabic,WordSpace=2]{Amiri}
%% OK, now we load ednotes with appropriate options.
%% For each extra level of notes in the critical apparatus we need to
%% initialize it with the appropriate option, in this case, "Bpara".
@@ -51,7 +51,7 @@
\renewcommand*{\differentlines}[2]{\linesfmt{\RL{#1\textendash#2}}}%
\renewcommand*{\linesfmt}[1]{\raisebox{1ex}{\linenumberfont #1}~}%
\renewcommand{\lemmafmt}[1]{#1~[ }%
-\renewcommand*{\pageandline}[2]{#2.\textlatin{#1}}% #1 page, #2 line.
+\renewcommand*{\pageandline}[2]{#2.\textLR{#1}}% #1 page, #2 line.
% \renewcommand*{\repeatref}[1]{\raisebox{-.5ex}{$\Vert$}}% << not advisable
% \renewcommand{\lemmaellipsis}{\textsymmdots}%
% \renewcommand{\notefmt}[1]{##1}%
@@ -91,9 +91,9 @@
%% The typographical "object" that separates successive variants in one note:
\newcommand{\SEP}{\enskip;\enskip}
%% The typographical "object" that indicates additions in a MS:
-\newcommand{\ADD}{\textlatin{\textbf{+}}\,}%
+\newcommand{\ADD}{\textLR{\textbf{+}}\,}%
%% The typographical "object" that indicates omissions in a MS:
-\newcommand{\OM}{\textlatin{\textbf{–}}\,}%
+\newcommand{\OM}{\textLR{\textbf{–}}\,}%
%% The typographical "object" that indicates a correction not reflected in any MS:
\newcommand{\CORR}{\textarab{.s.h.h-}}%
%% The typographical "object" that indicates illegible passages in a MS:
@@ -105,7 +105,7 @@
%% The typographical "object" that indicates a supralinear passage in a MS:
\newcommand{\SUPERLIN}{\textarab{ta.ht al-sa.tr}}%
%% The typographical "object" in the main text that indicates a lacuna in all MSS:
-\newcommand{\LACUNA}{\textlatin{\textlangle\,\dots\textrangle}}
+\newcommand{\LACUNA}{\textLR{\textlangle\,\dots\textrangle}}
%% The typographical "object" in the main text that indicates a restoration:
\newcommand{\RESTOR}[1]{\}~#1~\{}
%%
diff --git a/Master/texmf-dist/doc/xelatex/arabxetex/examples/minimal.tex b/Master/texmf-dist/doc/xelatex/arabxetex/examples/minimal.tex
index 0244b6bd14d..cafe0418768 100644
--- a/Master/texmf-dist/doc/xelatex/arabxetex/examples/minimal.tex
+++ b/Master/texmf-dist/doc/xelatex/arabxetex/examples/minimal.tex
@@ -1,9 +1,9 @@
\documentclass{minimal}
-\usepackage{arabxetex} % default options are "novoc" and "fdf2alif",
- % other options are "voc", "fullvoc", "utf", "trans" and "fdf2noalif"
+\usepackage{arabxetex} % default option is "novoc"
+ % other options are "voc", "fullvoc", "utf" and "trans"
% arabxetex loads bidi.sty and fontspec.sty
-\newfontfamily\arabicfont[Script=Arabic, Scale=1.5]{Scheherazade}
+\newfontfamily\arabicfont[Script=Arabic]{Amiri}
% you can also define \farsifont, \uighurfont, etc if you want
\begin{document}
This is some text in English with Arabic insertion \textarab{`arabI}.
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-farsi-fullvoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-farsi-fullvoc.map
index f53c3d35d06..f6d3285e711 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-farsi-fullvoc.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-farsi-fullvoc.map
@@ -50,7 +50,7 @@ Define Q U+0022 ;" << QUOTE
Define Z U+002D ;- << HYPHEN
Define BAR U+007C ;|
Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
+Define LLAH U+006C U+006C U+005F U+0061 U+0068 ; ll_ah
;Define NUL U+00A6;
Define Ha U+0623
Define Hi U+0625
@@ -87,20 +87,15 @@ Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
; special ligatures
;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
+;; FDF2 is just used as temporary holder, and is converted back to ligature lam lam hah later (to be taken care of by the font)
;; The BAR is used in the DMG transliteration to suppress the initial A
(a|A) BAR? l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+FDF2 ;; 'll_ah' > U+FDF2
+LLAH > U+FDF2 ;; 'll_ah' -> 'l l h'
;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
- U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+FDF2 ; 'ALLAH'
- U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'LLAH'
+U+004C U+004C U+0048 > U+FDF2 ;; 'LLH' -> 'l l h'
+U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH'
+U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+0644 U+0644 U+0647 ; 'ALLAH'
+U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
@@ -145,8 +140,8 @@ U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
+;; This is to enclose digits within glyph U+06DD
+U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+06DD @dig ; [[digits]]
; vowels
@@ -442,7 +437,7 @@ UL i > U+0650;
Q AN / (A H|Ha) _ > ;
AN / (A H|Ha) _ > U+064B
Q AN > U+0627
-AN > U+0627 U+064B
+AN > U+064B U+0627
Q a >
a > U+064E
Q A > U+0627
@@ -491,5 +486,6 @@ U+064E (U+064A|U+0648)=hc / _ (^[VWLX]|#) > U+064E @hc U+0652 ; ay and aw diphto
U+0627 / # _ U+0644 > U+0627 U+064E ; otherwise initial alif takes fatha
[CONS]=k1 / _ ([CONS]|#) > @k1 U+0652 ; consonant + (consonant or final)
;; [CONS]=k1 / _ # > @k1 U+0652 ; final consonant
+U+FDF2 > U+0644 U+0644 U+0647 ;
Q > ;
Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-farsi-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-farsi-fullvoc.tec
new file mode 100644
index 00000000000..24791521239
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-farsi-fullvoc.tec
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-farsi-novoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-farsi-novoc.map
index a653b5e3d97..dece5f62cc7 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-farsi-novoc.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-farsi-novoc.map
@@ -50,7 +50,7 @@ Define Q U+0022 ;" << QUOTE
Define Z U+002D ;- << HYPHEN
Define BAR U+007C ;|
Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
+Define LLAH U+006C U+006C U+005F U+0061 U+0068 ; ll_ah
;Define NUL U+00A6;
Define Ha U+0623
Define Hi U+0625
@@ -87,20 +87,15 @@ Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
; special ligatures
;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
+;; FDF2 is just used as temporary holder, and is converted back to ligature lam lam hah later (to be taken care of by the font)
;; The BAR is used in the DMG transliteration to suppress the initial A
(a|A) BAR? l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+FDF2 ;; 'll_ah' > U+FDF2
+LLAH > U+FDF2 ;; 'll_ah' -> 'l l h'
;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
- U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+FDF2 ; 'ALLAH'
- U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'LLAH'
+U+004C U+004C U+0048 > U+FDF2 ;; 'LLH' -> 'l l h'
+U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH'
+U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+0644 U+0644 U+0647 ; 'ALLAH'
+U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
@@ -145,8 +140,8 @@ U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
+;; This is to enclose digits within glyph U+06DD
+U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+06DD @dig ; [[digits]]
; vowels
@@ -437,7 +432,7 @@ UL u > ;
UL i > ;
Q AN / (A H|Ha) _ > U+064B
AN / (A H|Ha) _ > ;
-Q AN > U+0627 U+064B
+Q AN > U+064B U+0627
AN > U+0627
Q a > U+064E
Q A > U+064E U+0627
@@ -478,3 +473,4 @@ C > ;^
Z > ;-
BAR > ;|
+U+FDF2 > U+0644 U+0644 U+0647 ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-farsi-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-farsi-novoc.tec
new file mode 100644
index 00000000000..6535412e7ec
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-farsi-novoc.tec
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-farsi-voc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-farsi-voc.map
index 9617d027c28..2b7168aec72 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-farsi-voc.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-farsi-voc.map
@@ -50,7 +50,7 @@ Define Q U+0022 ;" << QUOTE
Define Z U+002D ;- << HYPHEN
Define BAR U+007C ;|
Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
+Define LLAH U+006C U+006C U+005F U+0061 U+0068 ; ll_ah
;Define NUL U+00A6;
Define Ha U+0623
Define Hi U+0625
@@ -87,20 +87,15 @@ Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
; special ligatures
;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
+;; FDF2 is just used as temporary holder, and is converted back to ligature lam lam hah later (to be taken care of by the font)
;; The BAR is used in the DMG transliteration to suppress the initial A
(a|A) BAR? l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+FDF2 ;; 'll_ah' > U+FDF2
+LLAH > U+FDF2 ;; 'll_ah' -> 'l l h'
;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
- U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+FDF2 ; 'ALLAH'
- U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'LLAH'
+U+004C U+004C U+0048 > U+FDF2 ;; 'LLH' -> 'l l h'
+U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH'
+U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+0644 U+0644 U+0647 ; 'ALLAH'
+U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
@@ -145,8 +140,8 @@ U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
+;; This is to enclose digits within glyph U+06DD
+U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+06DD @dig ; [[digits]]
; vowels
@@ -442,7 +437,7 @@ UL i > U+0650;
Q AN / (A H|Ha) _ > ;
AN / (A H|Ha) _ > U+064B
Q AN > U+0627
-AN > U+0627 U+064B
+AN > U+064B U+0627
Q a >
a > U+064E
Q A > U+0627
@@ -487,4 +482,5 @@ pass(Unicode)
Class [CONS] = (U+0621 U+0623 U+0624 U+0626 U+0628 U+062A..U+063A U+0641..U+0647 U+066E U+066F U+0672 U+0675 U+0676 U+0678..U+06BF U+06EE U+06EF U+06FA..U+06FF U+0750..U+076D) ; to be improved: not sure that all glyphs listed (esp for Urdu,Sindhi,etc are really "consonants" in the sense that they can carry a sukun, not to mention that some of these languages may not have a sukun at all ;-)
Class [VWLX] = (U+0627 U+0648..U+065E U+0670) ; long vowels, vowel signs, shadda, sukun etc.
Class [VWL] = (U+0627 U+0648..U+0650 U+0670);
+U+FDF2 > U+0644 U+0644 U+0647 ;
Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-farsi-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-farsi-voc.tec
new file mode 100644
index 00000000000..9c45c4bfd7f
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-farsi-voc.tec
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-farsi-fullvoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-farsi-fullvoc.map
deleted file mode 100644
index 12dbfa01c63..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-farsi-fullvoc.map
+++ /dev/null
@@ -1,495 +0,0 @@
-LHSName "ArabTeX-farsi-fullvocalized"
-RHSName "UNICODE"
-
-Define a U+0061 ;a
-Define b U+0062 ;b
-Define c U+0063 ;c
-Define d U+0064 ;d
-Define e U+0065 ;e
-Define f U+0066 ;f
-Define g U+0067 ;g
-Define h U+0068 ;h
-Define i U+0069 ;i
-Define j U+006A ;j
-Define k U+006B ;k
-Define l U+006C ;l
-Define m U+006D ;m
-Define n U+006E ;n
-Define o U+006F ;o
-Define p U+0070 ;p
-Define q U+0071 ;q
-Define r U+0072 ;r
-Define s U+0073 ;s
-Define t U+0074 ;t
-Define u U+0075 ;u
-Define v U+0076 ;v
-Define w U+0077 ;w
-Define x U+0078 ;x
-Define y U+0079 ;y
-Define z U+007A ;z
-Define A U+0041 ;A
-Define B U+0042 ;B
-Define E U+0045 ;E
-Define G U+0047 ;G
-Define I U+0049 ;I
-Define N U+004E ;N
-Define O U+004F ;O
-Define T U+0054 ;T
-Define U U+0055 ;U
-Define W U+0057 ;W
-Define Y U+0059 ;Y
-Define C U+005E ;^ << CARET
-Define UL U+005F ;_ << UNDERLINE
-Define P U+002E ;. << DOT
-Define V U+002C ;, << COMMA (_V_irgule)
-Define CO U+003A ;: << COLON
-Define SC U+003B ;; << SEMICOLON
-Define Ain U+0060 ;`
-Define H U+0027 ;' << HAMZA
-Define Q U+0022 ;" << QUOTE
-Define Z U+002D ;- << HYPHEN
-Define BAR U+007C ;|
-Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
-;Define NUL U+00A6;
-Define Ha U+0623
-Define Hi U+0625
-Define Hy U+0626
-Define Hw U+0624
-Define Hh U+06C0 ;; = U+0647 U+0654
-Define HA U+0622
-Define HB U+0640 U+0654
-Define HBAR U+0621 ; '|
-
-pass(Unicode)
-
-U+E000 > ; eliminate special code for capitalization in transliterations
-
-pass(Unicode)
-
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [AVWL] = (U+064B..U+0650);
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0047 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;a..z A E I O U B N T Y ^ . _ " "" `
-Class [BRACKETS] = (U+003C U+003E U+00AB U+00BB U+0028 U+0029 U+005B U+005D U+2018 U+2019 U+201C U+201D); < > () « » [ ] ‘ ’ “ ”
-Class [PUNCT] = (V SC P CO)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-Class [Uwu] = (U+0055 U+0077 U+0075) ;(U w u)
-;Class [ae] = (U+0061 U+0065) ;(a e)
-;Class [ou] = (U+0075 U+006F) ;(u o)
-Class [Iyi] = (U+0069 U+0079 U+0049)
-Class [UI] = (U+0049 U+0055) ; U I
-Class [Digits] = (U+0030..U+0039)
-
-Define BEG (#|Z|[BRACKETS])
-Define END (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #)
-Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
-
-; special ligatures
-;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
-;; The BAR is used in the DMG transliteration to suppress the initial A
-(a|A) BAR? l Z LLAH > U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+0644 U+0644 U+0647 ;; 'll_ah' -> 'l l h'
-;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
-U+0041 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'ALLAH'
-U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
-
-U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
-U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
-U+0029 U+0029 > U+FD3E ;; '))' : ornate left par
-U+0052 U+0049 U+0059 U+0041 U+004C > U+FDFC ;; 'RIYAL' : Saudi currency sign
-;; most fonts won't have the following ones:
-U+0053 U+0041 U+004C U+004C U+0041 U+0053 U+0054 U+004F U+0050 > U+FDF0 ;; 'SALLASTOP' (.sallY with "ye-barree", Quranic stop sign)
-U+0051 U+0041 U+004C U+0041 > U+FDF1 ;; 'QALA' : qalY with ye-barree, Quranic stop sign
-U+0041 U+004B U+0042 U+0041 U+0052 > U+FDF3 ;; 'AKBAR'
-U+004D U+0055 U+0048 U+0041 U+004D U+004D U+0041 U+0044 > U+FDF4 ;; 'MUHAMMAD'
-U+0053 U+0041 U+004C U+0041 U+004D > U+FDF5 ;; 'SALAM'
-U+0052 U+0041 U+0053 U+004F ? U+0055 U+004C > U+FDF6 ;; 'RASUL' (also unicode 'RASOUL')
-U+0041 U+004C U+0041 U+0059 U+0048 (U+0049|U+0045) > U+FDF7 ;; 'ALAYHI' (also unicode 'ALAYHE')
-U+0057 U+0041 U+0053 U+0041 U+004C U+004C U+0041 U+004D > U+FDF8 ;; 'WASALLAM'
-U+0053 U+0041 U+004C U+004C U+0041 > U+FDF9 ;; 'SALLA'
-U+004A U+0041 U+004C U+004C U+0041 > U+FDFB ;; 'JALLA' : "jalla jalAluhu"
-U+0042 U+0041 U+0053 U+004D U+0041 U+004C U+0041 > U+FDFD ;; 'BASMALA' : very few fonts have this ligature afaik
-
-U+005E U+0053 U+004C U+0059 > U+06D6 ;; ^SLY
-U+005E U+0051 U+004C U+0059 > U+06D7 ;; ^QLY
-U+005E U+004D U+0049 U+004D > U+06D8 ;; ^MIM-
-U+005E U+004C U+0041 > U+06D9 ;; ^LA
-U+005E U+004A U+0049 U+004D > U+06DA ;; ^JIM
-U+005E U+0044 U+004F U+0054 U+0053 > U+06DB ;; ^DOTS
-U+005E U+0053 U+0049 U+004E > U+06DC ;; ^SIN
-U+0048 U+0049 U+005A U+0042 > U+06DE ;; HIZB
-U+0043 U+0049 U+0052 U+0043 U+005A U+0045 U+0052 U+004F > U+06DF ;; CIRCZERO
-U+0052 U+0045 U+0043 U+0054 U+005A U+0045 U+0052 U+004F > U+06E0 ;; RECTZERO
-U+005E U+004A U+0041 U+005A U+004D > U+06E1 ;; ^JAZM
-U+005E U+004D U+0049 U+004D > U+06E2 ;; ^MIM
-U+005F U+0053 U+0049 U+004E > U+06E3 ;; _SIN
-U+005E U+004D U+0041 U+0044 U+0044 U+0041 > U+06E4 ;; ^MADDA
-U+0057 U+0041 U+0057 > U+06E5 ;; WAW
-U+0059 U+0045 U+0048 > U+06E6 ;; YEH
-U+005E U+0059 U+0045 U+0048 > U+06E7 ;; ^YEH
-U+005E U+004E U+0055 U+004E > U+06E8 ;; ^NUN
-U+0053 U+0041 U+004A U+0044 U+0041 > U+06E9 ;; SAJDA
-U+005F U+0053 U+0054 U+004F U+0050 > U+06EA ;; _STOP
-U+005E U+0053 U+0054 U+004F U+0050 > U+06EB ;; ^STOP
-U+005E U+0052 U+0053 U+0054 U+004F U+0050 > U+06EC ;; ^RSTOP
-U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
-
-U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
-
-
-; vowels
-u u > U
-i i > I
-a a > A
-CO O > U+06FC ;
-a e > a y
-a o > a w
-(o|u)? O / # _ > U+0627 w
-(o|u)? O > w
-CO U > U+06C7 ;
-e > i ;; but not pashto > U+0659 and kashmiri > y + U+0658 (U+06CE is kurdish)
-o > u
-E > I
-I / _ # > i y
-
-
-;; Persian ezafe (ALL BUT ARABIC AND UIGHUR)
-U+0048 Z UL? (Q? (i|e))=vv / _ END > U+06C0 @vv U+200C ;H-i -> heh+hamza final; what about 06C2 in Urdu ?<<<
-U+0048 Z Q?=qq (I|E)=vv / _ END > h U+0020 U+0627 @qq i @vv ; H-I
-Q?=q1 (I|E) Z UL? Q?=q2 (i|e) / _ END > @q1 i U+0626 @q2 i U+200C ; ...I-e
-Z Q?=qq I / (A|U) _ ENDZ > U+0626 @qq i y ; ...A-I or ...U-I
-Z UL? (Q? (i|e))=vv / (A|U) _ END > U+0649 @vv ; ...A-i or ...U-i
-Z Q?=q1 (e|i) / _ ENDZ > @q1 i ; ...-i
-Z / U+0048 _ > U+0020 ;
-b Q?=q1 (e|i) Q?=q2 U / # _ > b @q1 i U+0627 @q2 u w ;; special case of prep be without hyphen
-
-;; initial characters ...
-a l Z / BEG _ > U+0627 l Z
-;; wasla on initial alif : NEW! NOT TESTED!
-H / BEG _ l l > U+0671 ; e.g. alla_dI -> 'lla_dI
-[VWL]=v1 / BEG _ > U+0627 @v1
-A / BEG _ > HA ;; ADD MORE ? <<<
-Q?=q1 U / BEG _ > U+0627 @q1 u w ; -U
-; Q?=q1 I / BEG _ > U+0627 @q1 i y ; -I
-Q?=q1 I / BEG _ ^# > U+0627 @q1 i y ; -I...
-Z Q?=qq (I|E) / _ (#|Z) > @qq i y ;
-UL Q?=q1 U > @q1 U
-Q?=q1 U / # _ # > U+0627 @q1 u w
-Q BAR > U+0020; "| to separate compounds >> IN TRANSLIT THIS WILL BE REMOVED
-
-
-;; Words with anomalous orthography:
-
-; mi'aT -> ماية
-;;; i H / m Q ? _ Q ? a ? (T|t) > i A Hy
-m Q i H Q a / _ (T|t) > m U+0627 Hy
-m Q i H a / _ (T|t) > m U+0627 Hy a
-m i H Q a / _ (T|t) > m i U+0627 Hy
-m i H a / _ (T|t) > m i U+0627 Hy a
-
-
-;; contextual analysis of hamzas
-;; THESE DO NOT APPLY FOR SINDHI
-
-; initial hamzas
-H / (#|^[LTR]) _ Q? [Iyi] > Hi
-H Q A / (#|^[LTR]) _ > HA ; alif madda
-H / (#|^[LTR]) _ Q? [Uwu] > Ha
-H / (#|^[LTR]) _ Q? a > Ha
-Q H / (#|^[LTR]) _ > HB ; quoted isolated hamza at beginning of word
-
-; quoted hamzas in contextual mode, equivalent to verbatim mode
-a Q H > Ha
-i Q H > Hi
-y Q H > Hy
-w Q H > Hw
-h Q H > Hh
-A Q H > HA
-B Q H > HB
-BAR Q H > HBAR
-
-; hamza + fathatan
-H / a _ Q? AN > Ha
-;;H / [Iyi] _ Q? AN > Hy
-H / _ Q? AN > Hy
-
-;final hamzas
-H / A _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Uw] _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Iy] _ Q? (i N?|u N?)? (#|^[LTR]) > HBAR ; not AN ...
-H / a _ Q? (#|^[LTR]) > Ha ; not AN...
-H / a _ Q? (u|i) N? (#|^[LTR]) > Ha ; not AN...
-H / i _ Q? [VWL]? N? (#|^[LTR]) > Hy
-H / u _ Q? [VWL]? N? (#|^[LTR]) > Hw
-
-;;and more hamzas ...
-
-; n°1: kasra/ya
-H / [LTR] _ Q? [Iyi] ^N > Hy
-H / [Iyi] _ > Hy
-
-; n°2: damma/waw
-H / [LTR] _ Q? (U|u) ^N > Hw
-H / (U|u) _ Q? ^[Iyi] > Hw
-H / U _ > HBAR
-
-; n°3: fatha/alif
-H Q? A > HA
-H / A _ Q? a > HBAR
-H / ^[UI] _ Q? a > Ha
-H / a _ Q? ^[UI] > Ha
-
-
-pass(Unicode)
-
-Class [Digits] = (U+0030..U+0039)
-Class [ArDigits] = (U+0660..U+0669)
-Class [ArEasternDigits] = (U+06F0..U+06F9)
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;(a..z A E I O U B N T Y ^ . _ " "" `)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-
-
-
-
-;normal code
-
-
-(P z|U+1E93) (P z|U+1E93) > U+0638 U+0651 ;;SHADDA
-(P z|U+1E93) > U+0638
-C z C z > U+0698 U+0651 ;;SHADDA
-C z > U+0698
-V z V z > U+0696 U+0651 ;;SHADDA
-V z > U+0696 ;pashto
-z z > U+0632 U+0651 ;;SHADDA
-z > U+0632
-Q Y Y > U+0649 U+0651 ;;SHADDA
-Q Y > U+0649
-Y Y > U+064E U+0649 U+0651 ;;SHADDA
-Y > U+064E U+0649
-;; y / _ # > U+0649 ; y final in persian,ottoman,urdu,pashto,kashmiri has no dots
-y y > U+06CC U+0651 ;;SHADDA
-y > U+06CC ; yeh in persian etc. > iso and final shapes have no dots
-v v > U+06A4 U+0651 ;;SHADDA
-v > U+06A4
-W > U+0648 U+0627 ; waw + alif
-C U > U+064F U+0648 U+0653; historical spelling : madda on waw
-C w C w > U+06C9 U+0651 ;;SHADDA
-C w > U+06C9
-CO w CO w > U+06CA U+0651 ;,SHADDA
-CO w > U+06CA
-U A / _ # > U+064F U+0648 U+0627
-Q U [Uw] > U+0648 U+0651 ;;SHADDA
-Q U > U+0648
-U [Uw] > U+064F U+0648 U+0651 ;;SHADDA
-U > U+064F U+0648
-w w > U+0648 U+0651 ;;SHADDA
-w > U+0648
-Q u N? >
-u N > U+064C
-u > U+064F
-V t V t > U+0679 U+0651 ;;SHADDA
-V t > U+0679 ;urdu
-UL (t|s) UL (t|s) > U+062B U+0651 ;;SHADDA
-UL (t|s) > U+062B
-(P t|U+1E6D) (P t|U+1E6D) > U+0637 U+0651 ;;SHADDA
-(P t|U+1E6D) > U+0637
-t t > U+062A U+0651 ;;SHADDA
-t > U+062A
-T T Q AN > U+0629 U+0651 ;;SHADDA
-T Q AN > U+0629
-T AN > U+0629 U+064B
-T T > U+0629 U+0651 ;;SHADDA
-T > U+0629
-C s C s > U+0634 U+0651 ;;SHADDA
-C s > U+0634
-(P s|U+1E63) (P s|U+1E63) > U+0635 U+0651 ;;SHADDA
-(P s|U+1E63) > U+0635
-V s V s > U+069A U+0651 ;;SHADDA
-V s > U+069A ;Pashto
-CO s CO s > U+069B U+0651 ;;SHADDA
-CO s > U+069B ; sin with 3 dots below
-s s > U+0633 U+0651 ;;SHADDA
-s > U+0633
-C r C r > U+06EF U+0651 ;;SHADDA ; missing in ArabTeX <<<
-C r > U+06EF
-CO r CO r > U+0697 U+0651 ;;SHADDA ; missing in ArabTeX <<<
-CO r > U+0697 ; Dargwa language, Dagestan
-P r P r > U+0694 U+0651 ;;SHADDA
-P r > U+0694 ; r with dot below; in Kurdish .r -> 0694
-V r V r > U+0691 U+0651 ;;SHADDA
-V r > U+0691 ;Urdu
-r r > U+0631 U+0651 ;;SHADDA
-r > U+0631
-P q P q > U+066F U+0651 ;;SHADDA
-P q > U+066F
-q q > U+0642 U+0651 ;;SHADDA
-q > U+0642
-p p > U+067E U+0651 ;;SHADDA
-p > U+067E
-CO n CO n > U+06B1 U+0651 ;;SHADDA
-CO n > U+06B1
-C n C n > U+06AD U+0651 ;;SHADDA
-C n > U+06AD
-P n P n > U+06BA U+0651 ;;SHADDA
-P n > U+06BA ; urdu
-V n V n > U+06BC U+0651 ;;SHADDA
-V n > U+06BC ; Pashto
-n n > U+0646 U+0651 ;;SHADDA
-n > U+0646
-m m > U+0645 U+0651 ;;SHADDA
-m > U+0645
-P l P l > U+06B6 U+0651 ;
-P l > U+06B6 ; ADDED <<<
-C l C l > U+06B5 U+0651 ;;SHADDA
-C l > U+06B5 ;kurdish
-l l > U+0644 U+0651 ;;SHADDA
-l > U+0644
-P k P k > U+06A9 U+0651 ;;SHADDA
-P k > U+06A9 ; pashto urdu
-UL k UL k > U+063A U+0651 ;;SHADDA
-UL k > U+063A
-k k > U+0643 U+0651 ;;SHADDA
-k > U+0643
-C g C g > U+062C U+0651 ;;SHADDA
-C g > U+062C
-CO j CO j > U+0684 U+0651 ;;SHADDA
-CO j > U+0684
-j j > U+062C U+0651 ;;SHADDA
-j > U+062C
-Q I > U+064A
-I > U+0650 U+064A
-C I > U+0650 U+064A U+0653 ; historical spelling : madda on ya
-UL I > ; suggestion of O. Smrz (arabtex-plus project) URL = ###
-Q i N? > ;
-i N > U+064D
-i > U+0650
-x x > U+062E U+0651 ;;SHADDA
-x > U+062E
-U+0048 Z > U+0647 U+200C U+0020 ;eH-suffix > eH suffix
-U+0048 > U+0647 U+200C ; H is always heh final
-UL h UL h > U+062E U+0651 ;;SHADDA
-UL h > U+062E
-(P h|U+1E25) (P h|U+1E25) > U+062D U+0651 ;;SHADDA
-(P h|U+1E25) > U+062D
-V h V h > U+06C1 U+0651 ;;SHADDA
-V h > U+06C1
-h h > U+0647 U+0651 ;;SHADDA
-h > U+0647
-CO g CO g > U+06B3 U+0651 ;;SHADDA
-CO g > U+06B3
-V g V g > U+06AC U+0651 ;;SHADDA
-V g > U+06AC ; kaf with dot above
-P g P g > U+063A U+0651 ;;SHADDA
-P g > U+063A
-g g > U+06AF U+0651 ;;SHADDA
-g > U+06AF
-G G > U+06AB U+0651 ;;SHADDA
-G > U+06AB ;pashto
-P f P f > U+06A1 U+0651 ;;SHADDA
-P f > U+06A1
-f f > U+0641 U+0651 ;;SHADDA
-f > U+0641
-V d V d > U+068A U+0651 ;;SHADDA
-V d > U+068A
-P V d P V d > U+068B U+0651 ;;SHADDA
-P V d > U+068B ;; (like U+0688 with dot below, for Lahnda = Western Punjabi)
-C d C d > U+06EE U+0651 ;;SHADDA
-C d > U+06EE ; not defined in ArabTeX
-CO d CO d > U+068F U+0651 ;;SHADDA
-CO d > U+068F
-UL (d|z) UL (d|z) > U+0630 U+0651 ;;SHADDA
-UL (d|z) > U+0630
-(P d|U+1E0D) (P d|U+1E0D) > U+0636 U+0651 ;;SHADDA
-(P d|U+1E0D) > U+0636
-d d > U+062F U+0651 ;;SHADDA
-d > U+062F
-V c V c > U+0685 U+0651 ;;SHADDA
-V c > U+0685 ;pashto
-C c C c > U+0686 U+0651 ;;SHADDA
-C c > U+0686
-P C c P C c > U+06BF U+0651 ;;SHADDA
-P C c > U+06BF ;; cheh with dot above <<<
-c c > U+0681 U+0651 ;;SHADDA
-c > U+0681 ; ح with hamza above
-CO c CO c > U+0682 U+0651 ;;SHADDA
-CO c > U+0682 ; old pashto
-CO b CO b > U+067B U+0651 ;;SHADDA
-CO b > U+067B
-P b P b > U+066E U+0651 ;;SHADDA
-P b > U+066E
-b b > U+0628 U+0651 ;;SHADDA
-b > U+0628
-H A > U+0622
-C A > U+064E U+0622 ; historical spelling
-UL A > U+064E U+0649
-UL a > U+0670
-UL u > U+064F;
-UL i > U+0650;
-Q AN / (A H|Ha) _ > ;
-AN / (A H|Ha) _ > U+064B
-Q AN > U+0627
-AN > U+0627 U+064B
-Q a >
-a > U+064E
-Q A > U+0627
-A > U+064E U+0627
-Ain Ain > U+0639 U+0651 ;;SHADDA
-Ain > U+0639
-H H > U+0621 U+0651 ;;SHADDA
-H > U+0621
-U+002C / [Digits] _ [Digits] > U+002C ; comma in numerical context not an Arabic comma
-Z Z / [Digits] _ [Digits] > U+2013 ; two hyphens in numerical context -> endash
-(Z|U+005D|U+005B|U+0028|U+0029)=xx / [Digits] _ [Digits] > U+202D @xx U+202C ; hyphen or brackets in numerical context: surrounded by LRO & PDF marks
-[Digits] > [ArEasternDigits]
-Z Z Z / # _ # > U+2014
-Z Z / # _ # > U+2013
-Z Z > U+0640
-B > U+0640
-Z / # _ > U+200D ; -x > force initial form with "zero-width joiner"
-Z / _ # > U+200D ; x- > force final form
-U+003C U+003C > U+00BB ;<<
-U+003E U+003E > U+00AB ;>>
-U+00AB > U+00BB
-U+00BB > U+00AB
-UL > U+0640 ;_
-U+003F > U+061F ;?
-U+003B > U+061B ;;
-U+003A U+003A > U+061E ;; '::' ligature 'DOTS' also defined above...
-U+002C > U+060C ;,
-U+005D / [LTR] _ [LTR] > U+200D U+005D U+200D ; keep shaping when inserting ...[...]... ...
-U+005B / [LTR] _ [LTR] > U+200D U+005B U+200D ; (but of course this screws up contextual
- ; analysis, so quoting of hamzas etc may be necessary
-;U+005D > U+005B ;] these are automatically mirrored, following Unicode rules
-;U+005B > U+005D ;[
-Q [VWL] > ;stripoff quoted vowels
-U+00B0 > U+0652 ; °
-N > ;
-C > ;^
-BAR > ;|
-
-pass(Unicode)
-
-Class [CONS] = (U+0621 U+0623 U+0624 U+0626 U+0628 U+062A..U+063A U+0641..U+0647 U+066E U+066F U+0672 U+0675 U+0676 U+0678..U+06BF U+06EE U+06EF U+06FA..U+06FF U+0750..U+076D) ; to be improved: not sure that all glyphs listed (esp for Urdu,Sindhi,etc are really "consonants" in the sense that they can carry a sukun, not to mention that some of these languages may not have a sukun at all ;-)
-Class [VWLX] = (U+0627 U+0648..U+065E U+0670) ; long vowels, vowel signs, shadda, sukun etc.
-Class [VWL] = (U+0627 U+0648..U+0650 U+0670);
-[CONS]=k1 / _ Z? [CONS] ^U+0651 > @k1 U+0652 ; hack: 2nd consonant has no shadda
-U+064E (U+064A|U+0648)=hc / _ (^[VWLX]|#) > U+064E @hc U+0652 ; ay and aw diphtongs
-U+0627 / # _ U+0644 > U+0627 U+064E ; otherwise initial alif takes fatha
-[CONS]=k1 / _ ([CONS]|#) > @k1 U+0652 ; consonant + (consonant or final)
-;; [CONS]=k1 / _ # > @k1 U+0652 ; final consonant
-Q > ;
-Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-farsi-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-farsi-fullvoc.tec
deleted file mode 100644
index 5ea246518ac..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-farsi-fullvoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-farsi-novoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-farsi-novoc.map
deleted file mode 100644
index dfdfa837b35..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-farsi-novoc.map
+++ /dev/null
@@ -1,480 +0,0 @@
-LHSName "ArabTeX-farsi-novowels"
-RHSName "UNICODE"
-
-Define a U+0061 ;a
-Define b U+0062 ;b
-Define c U+0063 ;c
-Define d U+0064 ;d
-Define e U+0065 ;e
-Define f U+0066 ;f
-Define g U+0067 ;g
-Define h U+0068 ;h
-Define i U+0069 ;i
-Define j U+006A ;j
-Define k U+006B ;k
-Define l U+006C ;l
-Define m U+006D ;m
-Define n U+006E ;n
-Define o U+006F ;o
-Define p U+0070 ;p
-Define q U+0071 ;q
-Define r U+0072 ;r
-Define s U+0073 ;s
-Define t U+0074 ;t
-Define u U+0075 ;u
-Define v U+0076 ;v
-Define w U+0077 ;w
-Define x U+0078 ;x
-Define y U+0079 ;y
-Define z U+007A ;z
-Define A U+0041 ;A
-Define B U+0042 ;B
-Define E U+0045 ;E
-Define G U+0047 ;G
-Define I U+0049 ;I
-Define N U+004E ;N
-Define O U+004F ;O
-Define T U+0054 ;T
-Define U U+0055 ;U
-Define W U+0057 ;W
-Define Y U+0059 ;Y
-Define C U+005E ;^ << CARET
-Define UL U+005F ;_ << UNDERLINE
-Define P U+002E ;. << DOT
-Define V U+002C ;, << COMMA (_V_irgule)
-Define CO U+003A ;: << COLON
-Define SC U+003B ;; << SEMICOLON
-Define Ain U+0060 ;`
-Define H U+0027 ;' << HAMZA
-Define Q U+0022 ;" << QUOTE
-Define Z U+002D ;- << HYPHEN
-Define BAR U+007C ;|
-Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
-;Define NUL U+00A6;
-Define Ha U+0623
-Define Hi U+0625
-Define Hy U+0626
-Define Hw U+0624
-Define Hh U+06C0 ;; = U+0647 U+0654
-Define HA U+0622
-Define HB U+0640 U+0654
-Define HBAR U+0621 ; '|
-
-pass(Unicode)
-
-U+E000 > ; eliminate special code for capitalization in transliterations
-
-pass(Unicode)
-
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [AVWL] = (U+064B..U+0650);
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0047 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;a..z A E I O U B N T Y ^ . _ " "" `
-Class [BRACKETS] = (U+003C U+003E U+00AB U+00BB U+0028 U+0029 U+005B U+005D U+2018 U+2019 U+201C U+201D); < > () « » [ ] ‘ ’ “ ”
-Class [PUNCT] = (V SC P CO)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-Class [Uwu] = (U+0055 U+0077 U+0075) ;(U w u)
-;Class [ae] = (U+0061 U+0065) ;(a e)
-;Class [ou] = (U+0075 U+006F) ;(u o)
-Class [Iyi] = (U+0069 U+0079 U+0049)
-Class [UI] = (U+0049 U+0055) ; U I
-Class [Digits] = (U+0030..U+0039)
-
-Define BEG (#|Z|[BRACKETS])
-Define END (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #)
-Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
-
-; special ligatures
-;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
-;; The BAR is used in the DMG transliteration to suppress the initial A
-(a|A) BAR? l Z LLAH > U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+0644 U+0644 U+0647 ;; 'll_ah' -> 'l l h'
-;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
-U+0041 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'ALLAH'
-U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
-
-U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
-U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
-U+0029 U+0029 > U+FD3E ;; '))' : ornate left par
-U+0052 U+0049 U+0059 U+0041 U+004C > U+FDFC ;; 'RIYAL' : Saudi currency sign
-;; most fonts won't have the following ones:
-U+0053 U+0041 U+004C U+004C U+0041 U+0053 U+0054 U+004F U+0050 > U+FDF0 ;; 'SALLASTOP' (.sallY with "ye-barree", Quranic stop sign)
-U+0051 U+0041 U+004C U+0041 > U+FDF1 ;; 'QALA' : qalY with ye-barree, Quranic stop sign
-U+0041 U+004B U+0042 U+0041 U+0052 > U+FDF3 ;; 'AKBAR'
-U+004D U+0055 U+0048 U+0041 U+004D U+004D U+0041 U+0044 > U+FDF4 ;; 'MUHAMMAD'
-U+0053 U+0041 U+004C U+0041 U+004D > U+FDF5 ;; 'SALAM'
-U+0052 U+0041 U+0053 U+004F ? U+0055 U+004C > U+FDF6 ;; 'RASUL' (also unicode 'RASOUL')
-U+0041 U+004C U+0041 U+0059 U+0048 (U+0049|U+0045) > U+FDF7 ;; 'ALAYHI' (also unicode 'ALAYHE')
-U+0057 U+0041 U+0053 U+0041 U+004C U+004C U+0041 U+004D > U+FDF8 ;; 'WASALLAM'
-U+0053 U+0041 U+004C U+004C U+0041 > U+FDF9 ;; 'SALLA'
-U+004A U+0041 U+004C U+004C U+0041 > U+FDFB ;; 'JALLA' : "jalla jalAluhu"
-U+0042 U+0041 U+0053 U+004D U+0041 U+004C U+0041 > U+FDFD ;; 'BASMALA' : very few fonts have this ligature afaik
-
-U+005E U+0053 U+004C U+0059 > U+06D6 ;; ^SLY
-U+005E U+0051 U+004C U+0059 > U+06D7 ;; ^QLY
-U+005E U+004D U+0049 U+004D > U+06D8 ;; ^MIM-
-U+005E U+004C U+0041 > U+06D9 ;; ^LA
-U+005E U+004A U+0049 U+004D > U+06DA ;; ^JIM
-U+005E U+0044 U+004F U+0054 U+0053 > U+06DB ;; ^DOTS
-U+005E U+0053 U+0049 U+004E > U+06DC ;; ^SIN
-U+0048 U+0049 U+005A U+0042 > U+06DE ;; HIZB
-U+0043 U+0049 U+0052 U+0043 U+005A U+0045 U+0052 U+004F > U+06DF ;; CIRCZERO
-U+0052 U+0045 U+0043 U+0054 U+005A U+0045 U+0052 U+004F > U+06E0 ;; RECTZERO
-U+005E U+004A U+0041 U+005A U+004D > U+06E1 ;; ^JAZM
-U+005E U+004D U+0049 U+004D > U+06E2 ;; ^MIM
-U+005F U+0053 U+0049 U+004E > U+06E3 ;; _SIN
-U+005E U+004D U+0041 U+0044 U+0044 U+0041 > U+06E4 ;; ^MADDA
-U+0057 U+0041 U+0057 > U+06E5 ;; WAW
-U+0059 U+0045 U+0048 > U+06E6 ;; YEH
-U+005E U+0059 U+0045 U+0048 > U+06E7 ;; ^YEH
-U+005E U+004E U+0055 U+004E > U+06E8 ;; ^NUN
-U+0053 U+0041 U+004A U+0044 U+0041 > U+06E9 ;; SAJDA
-U+005F U+0053 U+0054 U+004F U+0050 > U+06EA ;; _STOP
-U+005E U+0053 U+0054 U+004F U+0050 > U+06EB ;; ^STOP
-U+005E U+0052 U+0053 U+0054 U+004F U+0050 > U+06EC ;; ^RSTOP
-U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
-
-U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
-
-
-; vowels
-u u > U
-i i > I
-a a > A
-[AVWL] > ; strip off vowels when writing UTF-8 Arabic with novoc mode
-CO O > U+06FC ;
-a e > a y
-a o > a w
-(o|u)? O / # _ > U+0627 w
-(o|u)? O > w
-CO U > U+06C7 ;
-e > i ;; but not pashto > U+0659 and kashmiri > y + U+0658 (U+06CE is kurdish)
-o > u
-E > I
-I / _ # > i y
-
-
-;; Persian ezafe (ALL BUT ARABIC AND UIGHUR)
-U+0048 Z UL? (Q? (i|e))=vv / _ END > U+06C0 @vv U+200C ;H-i -> heh+hamza final; what about 06C2 in Urdu ?<<<
-U+0048 Z Q?=qq (I|E)=vv / _ END > h U+0020 U+0627 @qq i @vv ; H-I
-Q?=q1 (I|E) Z UL? Q?=q2 (i|e) / _ END > @q1 i U+0626 @q2 i U+200C ; ...I-e
-Z Q?=qq I / (A|U) _ ENDZ > U+0626 @qq i y ; ...A-I or ...U-I
-Z UL? (Q? (i|e))=vv / (A|U) _ END > U+0649 @vv ; ...A-i or ...U-i
-Z Q?=q1 (e|i) / _ ENDZ > @q1 i ; ...-i
-Z / U+0048 _ > U+0020 ;
-b Q?=q1 (e|i) Q?=q2 U / # _ > b @q1 i U+0627 @q2 u w ;; special case of prep be without hyphen
-
-;; initial characters ...
-a l Z / BEG _ > U+0627 l Z
-;; wasla on initial alif : NEW! NOT TESTED!
-H / BEG _ l l > U+0627 ;
-[VWL]=v1 / BEG _ > A @v1
-A / BEG _ > HA ;; ADD MORE ? <<<
-Q?=q1 U / BEG _ > A @q1 u w ; -U
-; Q?=q1 I / BEG _ > A @q1 i y ; -I ; but not when I is final FIXME!!!
-Q?=q1 I / BEG _ ^# > A @q1 i y ; -I...
-Z Q?=qq (I|E) / _ (#|Z) > @qq i y ;
-UL Q?=q1 U > @q1 U
-Q?=q1 U / # _ # > U+0627 @q1 u w
-Q BAR > U+0020; "| to separate compounds >> IN TRANSLIT THIS WILL BE REMOVED
-
-
-;; Words with anomalous orthography:
-
-; mi'aT -> ماية
-;;; i H / m Q ? _ Q ? a ? (T|t) > i A Hy
-m Q i H Q a / _ (T|t) > m Q i A Hy Q a
-m Q i H a / _ (T|t) > m Q i A Hy
-m i H Q a / _ (T|t) > m A Hy Q a
-m i H a / _ (T|t) > m A Hy
-
-
-;; contextual analysis of hamzas
-;; THESE DO NOT APPLY FOR SINDHI
-
-; initial hamzas
-H / (#|^[LTR]) _ Q? [Iyi] > Hi
-H Q A / (#|^[LTR]) _ > HA ; alif madda
-H / (#|^[LTR]) _ Q? [Uwu] > Ha
-H / (#|^[LTR]) _ Q? a > Ha
-Q H / (#|^[LTR]) _ > HB ; quoted isolated hamza at beginning of word
-
-; quoted hamzas in contextual mode, equivalent to verbatim mode
-a Q H > Ha
-i Q H > Hi
-y Q H > Hy
-w Q H > Hw
-h Q H > Hh
-A Q H > HA
-B Q H > HB
-BAR Q H > HBAR
-
-; hamza + fathatan
-H / a _ Q? AN > Ha
-;;H / [Iyi] _ Q? AN > Hy
-H / _ Q? AN > Hy
-
-;final hamzas
-H / A _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Uw] _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Iy] _ Q? (i N?|u N?)? (#|^[LTR]) > HBAR ; not AN ...
-H / a _ Q? (#|^[LTR]) > Ha ; not AN...
-H / a _ Q? (u|i) N? (#|^[LTR]) > Ha ; not AN...
-H / i _ Q? [VWL]? N? (#|^[LTR]) > Hy
-H / u _ Q? [VWL]? N? (#|^[LTR]) > Hw
-
-;;and more hamzas ...
-
-; n°1: kasra/ya
-H / [LTR] _ Q? [Iyi] ^N > Hy
-H / [Iyi] _ > Hy
-
-; n°2: damma/waw
-H / [LTR] _ Q? (U|u) ^N > Hw
-H / (U|u) _ Q? ^[Iyi] > Hw
-H / U _ > HBAR
-
-; n°3: fatha/alif
-H Q? A > HA
-H / A _ Q? a > HBAR
-H / ^[UI] _ Q? a > Ha
-H / a _ Q? ^[UI] > Ha
-
-
-pass(Unicode)
-
-Class [Digits] = (U+0030..U+0039)
-Class [ArDigits] = (U+0660..U+0669)
-Class [ArEasternDigits] = (U+06F0..U+06F9)
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;(a..z A E I O U B N T Y ^ . _ " "" `)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-
-
-
-
-;normal code
-
-
-(P z|U+1E93) (P z|U+1E93) > U+0638 U+0651 ;;SHADDA
-(P z|U+1E93) > U+0638
-C z C z > U+0698 U+0651 ;;SHADDA
-C z > U+0698
-V z V z > U+0696 U+0651 ;;SHADDA
-V z > U+0696 ;pashto
-z z > U+0632 U+0651 ;;SHADDA
-z > U+0632
-Y Y > U+0649 U+0651 ;;SHADDA
-Y > U+0649
-;; y / _ # > U+0649 ; y final in persian,ottoman,urdu,pashto,kashmiri has no dots
-y y > U+06CC U+0651 ;;SHADDA
-y > U+06CC ; yeh in persian etc. > iso and final shapes have no dots
-v v > U+06A4 U+0651 ;;SHADDA
-v > U+06A4
-W > U+0648 U+0627 ; waw + alif
-C U > U+064F U+0648 U+0653; historical spelling : madda on waw
-Q U [Uw] > U+064F U+0648 U+0651 ;;SHADDA
-Q U > U+064F U+0648
-[Uw] [Uw] > U+0648 U+0651 ;;SHADDA
-[Uw] > U+0648
-C w C w > U+06C9 U+0651 ;;SHADDA
-C w > U+06C9
-CO w CO w > U+06CA U+0651 ;,SHADDA
-CO w > U+06CA
-Q u N > U+064C
-u N >
-Q u > U+064F
-V t V t > U+0679 U+0651 ;;SHADDA
-V t > U+0679 ;urdu
-UL (t|s) UL (t|s) > U+062B U+0651 ;;SHADDA
-UL (t|s) > U+062B
-(P t|U+1E6D) (P t|U+1E6D) > U+0637 U+0651 ;;SHADDA
-(P t|U+1E6D) > U+0637
-t t > U+062A U+0651 ;;SHADDA
-t > U+062A
-T T Q AN > U+0629 U+0651 U+064B ;;SHADDA
-T Q AN > U+0629 U+064B
-T AN > U+0629
-T T > U+0629 U+0651 ;;SHADDA
-T > U+0629
-C s C s > U+0634 U+0651 ;;SHADDA
-C s > U+0634
-(P s|U+1E63) (P s|U+1E63) > U+0635 U+0651 ;;SHADDA
-(P s|U+1E63) > U+0635
-V s V s > U+069A U+0651 ;;SHADDA
-V s > U+069A ;Pashto
-CO s CO s > U+069B U+0651 ;;SHADDA
-CO s > U+069B ; sin with 3 dots below
-s s > U+0633 U+0651 ;;SHADDA
-s > U+0633
-C r C r > U+06EF U+0651 ;;SHADDA ; missing in ArabTeX <<<
-C r > U+06EF
-CO r CO r > U+0697 U+0651 ;;SHADDA ; missing in ArabTeX <<<
-CO r > U+0697 ; Dargwa language, Dagestan
-P r P r > U+0694 U+0651 ;;SHADDA
-P r > U+0694 ; r with dot below; in Kurdish .r -> 0694
-V r V r > U+0691 U+0651 ;;SHADDA
-V r > U+0691 ;Urdu
-r r > U+0631 U+0651 ;;SHADDA
-r > U+0631
-P q P q > U+066F U+0651 ;;SHADDA
-P q > U+066F
-q q > U+0642 U+0651 ;;SHADDA
-q > U+0642
-p p > U+067E U+0651 ;;SHADDA
-p > U+067E
-CO n CO n > U+06B1 U+0651 ;;SHADDA
-CO n > U+06B1
-C n C n > U+06AD U+0651 ;;SHADDA
-C n > U+06AD
-P n P n > U+06BA U+0651 ;;SHADDA
-P n > U+06BA ; urdu
-V n V n > U+06BC U+0651 ;;SHADDA
-V n > U+06BC ; Pashto
-n n > U+0646 U+0651 ;;SHADDA
-n > U+0646
-m m > U+0645 U+0651 ;;SHADDA
-m > U+0645
-P l P l > U+06B6 U+0651 ;
-P l > U+06B6 ; ADDED <<<
-C l C l > U+06B5 U+0651 ;;SHADDA
-C l > U+06B5 ;kurdish
-l l > U+0644 U+0651 ;;SHADDA
-l > U+0644
-P k P k > U+06A9 U+0651 ;;SHADDA
-P k > U+06A9 ; pashto urdu
-UL k UL k > U+063A U+0651 ;;SHADDA
-UL k > U+063A
-k k > U+0643 U+0651 ;;SHADDA
-k > U+0643
-C g C g > U+062C U+0651 ;;SHADDA
-C g > U+062C
-CO j CO j > U+0684 U+0651 ;;SHADDA
-CO j > U+0684
-j j > U+062C U+0651 ;;SHADDA
-j > U+062C
-Q I > U+0650 U+064A
-C I > U+0650 U+064A U+0653 ; historical spelling : madda on ya
-UL I > ; suggestion of O. Smrz (arabtex-plus project) URL = ###
-I > U+064A
-Q i N > U+064D
-i N > ;
-Q i > U+0650
-x x > U+062E U+0651 ;;SHADDA
-x > U+062E
-U+0048 Z > U+0647 U+200C U+0020 ;eH-suffix > eH suffix
-U+0048 > U+0647 U+200C ; H is always heh final
-UL h UL h > U+062E U+0651 ;;SHADDA
-UL h > U+062E
-(P h|U+1E25) (P h|U+1E25) > U+062D U+0651 ;;SHADDA
-(P h|U+1E25) > U+062D
-V h V h > U+06C1 U+0651 ;;SHADDA
-V h > U+06C1
-h h > U+0647 U+0651 ;;SHADDA
-h > U+0647
-CO g CO g > U+06B3 U+0651 ;;SHADDA
-CO g > U+06B3
-V g V g > U+06AC U+0651 ;;SHADDA
-V g > U+06AC ; kaf with dot above
-P g P g > U+063A U+0651 ;;SHADDA
-P g > U+063A
-g g > U+06AF U+0651 ;;SHADDA
-g > U+06AF
-G G > U+06AB U+0651 ;;SHADDA
-G > U+06AB ;pashto
-P f P f > U+06A1 U+0651 ;;SHADDA
-P f > U+06A1
-f f > U+0641 U+0651 ;;SHADDA
-f > U+0641
-V d V d > U+068A U+0651 ;;SHADDA
-V d > U+068A
-P V d P V d > U+068B U+0651 ;;SHADDA
-P V d > U+068B ;; (like U+0688 with dot below, for Lahnda = Western Punjabi)
-C d C d > U+06EE U+0651 ;;SHADDA
-C d > U+06EE ; not defined in ArabTeX
-CO d CO d > U+068F U+0651 ;;SHADDA
-CO d > U+068F
-UL (d|z) UL (d|z) > U+0630 U+0651 ;;SHADDA
-UL (d|z) > U+0630
-(P d|U+1E0D) (P d|U+1E0D) > U+0636 U+0651 ;;SHADDA
-(P d|U+1E0D) > U+0636
-d d > U+062F U+0651 ;;SHADDA
-d > U+062F
-V c V c > U+0685 U+0651 ;;SHADDA
-V c > U+0685 ;pashto
-C c C c > U+0686 U+0651 ;;SHADDA
-C c > U+0686
-P C c P C c > U+06BF U+0651 ;;SHADDA
-P C c > U+06BF ;; cheh with dot above <<<
-c c > U+0681 U+0651 ;;SHADDA
-c > U+0681 ; ح with hamza above
-CO c CO c > U+0682 U+0651 ;;SHADDA
-CO c > U+0682 ; old pashto
-CO b CO b > U+067B U+0651 ;;SHADDA
-CO b > U+067B
-P b P b > U+066E U+0651 ;;SHADDA
-P b > U+066E
-b b > U+0628 U+0651 ;;SHADDA
-b > U+0628
-H A > U+0622
-C A > U+064E U+0622 ; historical spelling
-UL A > U+0649
-UL a > U+0670
-UL u > ;
-UL i > ;
-Q AN / (A H|Ha) _ > U+064B
-AN / (A H|Ha) _ > ;
-Q AN > U+0627 U+064B
-AN > U+0627
-Q a > U+064E
-Q A > U+064E U+0627
-A > U+0627
-Ain Ain > U+0639 U+0651 ;;SHADDA
-Ain > U+0639
-H H > U+0621 U+0651 ;;SHADDA
-H > U+0621
-U+002C / [Digits] _ [Digits] > U+002C ; comma in numerical context not an Arabic comma
-Z Z / [Digits] _ [Digits] > U+2013 ; two hyphens in numerical context -> endash
-(Z|U+005D|U+005B|U+0028|U+0029)=xx / [Digits] _ [Digits] > U+202D @xx U+202C ; hyphen or brackets in numerical context: surrounded by LRO & PDF marks
-[Digits] > [ArEasternDigits]
-Z Z Z / # _ # > U+2014
-Z Z / # _ # > U+2013
-Z Z > U+0640
-B > U+0640
-Z / # _ > U+200D ; -x > force initial form with "zero-width joiner"
-Z / _ # > U+200D ; x- > force final form
-U+003C U+003C > U+00BB ;<<
-U+003E U+003E > U+00AB ;>>
-U+00AB > U+00BB
-U+00BB > U+00AB
-UL > U+0640 ;_
-U+003F > U+061F ;?
-U+003B > U+061B ;;
-U+003A U+003A > U+061E ;; '::' ligature 'DOTS' also defined above...
-U+002C > U+060C ;,
-U+005D / [LTR] _ [LTR] > U+200D U+005D U+200D ; keep shaping when inserting ...[...]... ...
-U+005B / [LTR] _ [LTR] > U+200D U+005B U+200D ; (but of course this screws up contextual
- ; analysis, so quoting of hamzas etc may be necessary
-;U+005D > U+005B ;] these are automatically mirrored, following Unicode rules
-;U+005B > U+005D ;[
-[VWL] > ;stripoff vowels
-Q > U+0652
-U+00B0 > U+0652 ; °
-N > ;
-C > ;^
-Z > ;-
-BAR > ;|
-
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-farsi-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-farsi-novoc.tec
deleted file mode 100644
index 418f6566e43..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-farsi-novoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-farsi-voc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-farsi-voc.map
deleted file mode 100644
index 35c789edd42..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-farsi-voc.map
+++ /dev/null
@@ -1,490 +0,0 @@
-LHSName "ArabTeX-farsi-vocalized"
-RHSName "UNICODE"
-
-Define a U+0061 ;a
-Define b U+0062 ;b
-Define c U+0063 ;c
-Define d U+0064 ;d
-Define e U+0065 ;e
-Define f U+0066 ;f
-Define g U+0067 ;g
-Define h U+0068 ;h
-Define i U+0069 ;i
-Define j U+006A ;j
-Define k U+006B ;k
-Define l U+006C ;l
-Define m U+006D ;m
-Define n U+006E ;n
-Define o U+006F ;o
-Define p U+0070 ;p
-Define q U+0071 ;q
-Define r U+0072 ;r
-Define s U+0073 ;s
-Define t U+0074 ;t
-Define u U+0075 ;u
-Define v U+0076 ;v
-Define w U+0077 ;w
-Define x U+0078 ;x
-Define y U+0079 ;y
-Define z U+007A ;z
-Define A U+0041 ;A
-Define B U+0042 ;B
-Define E U+0045 ;E
-Define G U+0047 ;G
-Define I U+0049 ;I
-Define N U+004E ;N
-Define O U+004F ;O
-Define T U+0054 ;T
-Define U U+0055 ;U
-Define W U+0057 ;W
-Define Y U+0059 ;Y
-Define C U+005E ;^ << CARET
-Define UL U+005F ;_ << UNDERLINE
-Define P U+002E ;. << DOT
-Define V U+002C ;, << COMMA (_V_irgule)
-Define CO U+003A ;: << COLON
-Define SC U+003B ;; << SEMICOLON
-Define Ain U+0060 ;`
-Define H U+0027 ;' << HAMZA
-Define Q U+0022 ;" << QUOTE
-Define Z U+002D ;- << HYPHEN
-Define BAR U+007C ;|
-Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
-;Define NUL U+00A6;
-Define Ha U+0623
-Define Hi U+0625
-Define Hy U+0626
-Define Hw U+0624
-Define Hh U+06C0 ;; = U+0647 U+0654
-Define HA U+0622
-Define HB U+0640 U+0654
-Define HBAR U+0621 ; '|
-
-pass(Unicode)
-
-U+E000 > ; eliminate special code for capitalization in transliterations
-
-pass(Unicode)
-
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [AVWL] = (U+064B..U+0650);
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0047 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;a..z A E I O U B N T Y ^ . _ " "" `
-Class [BRACKETS] = (U+003C U+003E U+00AB U+00BB U+0028 U+0029 U+005B U+005D U+2018 U+2019 U+201C U+201D); < > () « » [ ] ‘ ’ “ ”
-Class [PUNCT] = (V SC P CO)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-Class [Uwu] = (U+0055 U+0077 U+0075) ;(U w u)
-;Class [ae] = (U+0061 U+0065) ;(a e)
-;Class [ou] = (U+0075 U+006F) ;(u o)
-Class [Iyi] = (U+0069 U+0079 U+0049)
-Class [UI] = (U+0049 U+0055) ; U I
-Class [Digits] = (U+0030..U+0039)
-
-Define BEG (#|Z|[BRACKETS])
-Define END (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #)
-Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
-
-; special ligatures
-;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
-;; The BAR is used in the DMG transliteration to suppress the initial A
-(a|A) BAR? l Z LLAH > U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+0644 U+0644 U+0647 ;; 'll_ah' -> 'l l h'
-;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
-U+0041 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'ALLAH'
-U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
-
-U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
-U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
-U+0029 U+0029 > U+FD3E ;; '))' : ornate left par
-U+0052 U+0049 U+0059 U+0041 U+004C > U+FDFC ;; 'RIYAL' : Saudi currency sign
-;; most fonts won't have the following ones:
-U+0053 U+0041 U+004C U+004C U+0041 U+0053 U+0054 U+004F U+0050 > U+FDF0 ;; 'SALLASTOP' (.sallY with "ye-barree", Quranic stop sign)
-U+0051 U+0041 U+004C U+0041 > U+FDF1 ;; 'QALA' : qalY with ye-barree, Quranic stop sign
-U+0041 U+004B U+0042 U+0041 U+0052 > U+FDF3 ;; 'AKBAR'
-U+004D U+0055 U+0048 U+0041 U+004D U+004D U+0041 U+0044 > U+FDF4 ;; 'MUHAMMAD'
-U+0053 U+0041 U+004C U+0041 U+004D > U+FDF5 ;; 'SALAM'
-U+0052 U+0041 U+0053 U+004F ? U+0055 U+004C > U+FDF6 ;; 'RASUL' (also unicode 'RASOUL')
-U+0041 U+004C U+0041 U+0059 U+0048 (U+0049|U+0045) > U+FDF7 ;; 'ALAYHI' (also unicode 'ALAYHE')
-U+0057 U+0041 U+0053 U+0041 U+004C U+004C U+0041 U+004D > U+FDF8 ;; 'WASALLAM'
-U+0053 U+0041 U+004C U+004C U+0041 > U+FDF9 ;; 'SALLA'
-U+004A U+0041 U+004C U+004C U+0041 > U+FDFB ;; 'JALLA' : "jalla jalAluhu"
-U+0042 U+0041 U+0053 U+004D U+0041 U+004C U+0041 > U+FDFD ;; 'BASMALA' : very few fonts have this ligature afaik
-
-U+005E U+0053 U+004C U+0059 > U+06D6 ;; ^SLY
-U+005E U+0051 U+004C U+0059 > U+06D7 ;; ^QLY
-U+005E U+004D U+0049 U+004D > U+06D8 ;; ^MIM-
-U+005E U+004C U+0041 > U+06D9 ;; ^LA
-U+005E U+004A U+0049 U+004D > U+06DA ;; ^JIM
-U+005E U+0044 U+004F U+0054 U+0053 > U+06DB ;; ^DOTS
-U+005E U+0053 U+0049 U+004E > U+06DC ;; ^SIN
-U+0048 U+0049 U+005A U+0042 > U+06DE ;; HIZB
-U+0043 U+0049 U+0052 U+0043 U+005A U+0045 U+0052 U+004F > U+06DF ;; CIRCZERO
-U+0052 U+0045 U+0043 U+0054 U+005A U+0045 U+0052 U+004F > U+06E0 ;; RECTZERO
-U+005E U+004A U+0041 U+005A U+004D > U+06E1 ;; ^JAZM
-U+005E U+004D U+0049 U+004D > U+06E2 ;; ^MIM
-U+005F U+0053 U+0049 U+004E > U+06E3 ;; _SIN
-U+005E U+004D U+0041 U+0044 U+0044 U+0041 > U+06E4 ;; ^MADDA
-U+0057 U+0041 U+0057 > U+06E5 ;; WAW
-U+0059 U+0045 U+0048 > U+06E6 ;; YEH
-U+005E U+0059 U+0045 U+0048 > U+06E7 ;; ^YEH
-U+005E U+004E U+0055 U+004E > U+06E8 ;; ^NUN
-U+0053 U+0041 U+004A U+0044 U+0041 > U+06E9 ;; SAJDA
-U+005F U+0053 U+0054 U+004F U+0050 > U+06EA ;; _STOP
-U+005E U+0053 U+0054 U+004F U+0050 > U+06EB ;; ^STOP
-U+005E U+0052 U+0053 U+0054 U+004F U+0050 > U+06EC ;; ^RSTOP
-U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
-
-U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
-
-
-; vowels
-u u > U
-i i > I
-a a > A
-CO O > U+06FC ;
-a e > a y
-a o > a w
-(o|u)? O / # _ > U+0627 w
-(o|u)? O > w
-CO U > U+06C7 ;
-e > i ;; but not pashto > U+0659 and kashmiri > y + U+0658 (U+06CE is kurdish)
-o > u
-E > I
-I / _ # > i y
-
-
-;; Persian ezafe (ALL BUT ARABIC AND UIGHUR)
-U+0048 Z UL? (Q? (i|e))=vv / _ END > U+06C0 @vv U+200C ;H-i -> heh+hamza final; what about 06C2 in Urdu ?<<<
-U+0048 Z Q?=qq (I|E)=vv / _ END > h U+0020 U+0627 @qq i @vv ; H-I
-Q?=q1 (I|E) Z UL? Q?=q2 (i|e) / _ END > @q1 i U+0626 @q2 i U+200C ; ...I-e
-Z Q?=qq I / (A|U) _ ENDZ > U+0626 @qq i y ; ...A-I or ...U-I
-Z UL? (Q? (i|e))=vv / (A|U) _ END > U+0649 @vv ; ...A-i or ...U-i
-Z Q?=q1 (e|i) / _ ENDZ > @q1 i ; ...-i
-Z / U+0048 _ > U+0020 ;
-b Q?=q1 (e|i) Q?=q2 U / # _ > b @q1 i U+0627 @q2 u w ;; special case of prep be without hyphen
-
-;; initial characters ...
-a l Z / BEG _ > U+0627 l Z
-;; wasla on initial alif : NEW! NOT TESTED!
-H / BEG _ l l > U+0671 ; e.g. alla_dI -> 'lla_dI
-[VWL]=v1 / BEG _ > U+0627 @v1
-A / BEG _ > HA ;; ADD MORE ? <<<
-Q?=q1 U / BEG _ > U+0627 @q1 u w ; -U
-; Q?=q1 I / BEG _ > U+0627 @q1 i y ; -I
-Q?=q1 I / BEG _ ^# > U+0627 @q1 i y ; -I...
-Z Q?=qq (I|E) / _ (#|Z) > @qq i y ;
-UL Q?=q1 U > @q1 U
-Q?=q1 U / # _ # > U+0627 @q1 u w
-Q BAR > U+0020; "| to separate compounds >> IN TRANSLIT THIS WILL BE REMOVED
-
-
-;; Words with anomalous orthography:
-
-; mi'aT -> ماية
-;;; i H / m Q ? _ Q ? a ? (T|t) > i A Hy
-m Q i H Q a / _ (T|t) > m U+0627 Hy
-m Q i H a / _ (T|t) > m U+0627 Hy a
-m i H Q a / _ (T|t) > m i U+0627 Hy
-m i H a / _ (T|t) > m i U+0627 Hy a
-
-
-;; contextual analysis of hamzas
-;; THESE DO NOT APPLY FOR SINDHI
-
-; initial hamzas
-H / (#|^[LTR]) _ Q? [Iyi] > Hi
-H Q A / (#|^[LTR]) _ > HA ; alif madda
-H / (#|^[LTR]) _ Q? [Uwu] > Ha
-H / (#|^[LTR]) _ Q? a > Ha
-Q H / (#|^[LTR]) _ > HB ; quoted isolated hamza at beginning of word
-
-; quoted hamzas in contextual mode, equivalent to verbatim mode
-a Q H > Ha
-i Q H > Hi
-y Q H > Hy
-w Q H > Hw
-h Q H > Hh
-A Q H > HA
-B Q H > HB
-BAR Q H > HBAR
-
-; hamza + fathatan
-H / a _ Q? AN > Ha
-;;H / [Iyi] _ Q? AN > Hy
-H / _ Q? AN > Hy
-
-;final hamzas
-H / A _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Uw] _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Iy] _ Q? (i N?|u N?)? (#|^[LTR]) > HBAR ; not AN ...
-H / a _ Q? (#|^[LTR]) > Ha ; not AN...
-H / a _ Q? (u|i) N? (#|^[LTR]) > Ha ; not AN...
-H / i _ Q? [VWL]? N? (#|^[LTR]) > Hy
-H / u _ Q? [VWL]? N? (#|^[LTR]) > Hw
-
-;;and more hamzas ...
-
-; n°1: kasra/ya
-H / [LTR] _ Q? [Iyi] ^N > Hy
-H / [Iyi] _ > Hy
-
-; n°2: damma/waw
-H / [LTR] _ Q? (U|u) ^N > Hw
-H / (U|u) _ Q? ^[Iyi] > Hw
-H / U _ > HBAR
-
-; n°3: fatha/alif
-H Q? A > HA
-H / A _ Q? a > HBAR
-H / ^[UI] _ Q? a > Ha
-H / a _ Q? ^[UI] > Ha
-
-
-pass(Unicode)
-
-Class [Digits] = (U+0030..U+0039)
-Class [ArDigits] = (U+0660..U+0669)
-Class [ArEasternDigits] = (U+06F0..U+06F9)
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;(a..z A E I O U B N T Y ^ . _ " "" `)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-
-
-
-
-;normal code
-
-
-(P z|U+1E93) (P z|U+1E93) > U+0638 U+0651 ;;SHADDA
-(P z|U+1E93) > U+0638
-C z C z > U+0698 U+0651 ;;SHADDA
-C z > U+0698
-V z V z > U+0696 U+0651 ;;SHADDA
-V z > U+0696 ;pashto
-z z > U+0632 U+0651 ;;SHADDA
-z > U+0632
-Q Y Y > U+0649 U+0651 ;;SHADDA
-Q Y > U+0649
-Y Y > U+064E U+0649 U+0651 ;;SHADDA
-Y > U+064E U+0649
-;; y / _ # > U+0649 ; y final in persian,ottoman,urdu,pashto,kashmiri has no dots
-y y > U+06CC U+0651 ;;SHADDA
-y > U+06CC ; yeh in persian etc. > iso and final shapes have no dots
-v v > U+06A4 U+0651 ;;SHADDA
-v > U+06A4
-W > U+0648 U+0627 ; waw + alif
-C U > U+064F U+0648 U+0653; historical spelling : madda on waw
-C w C w > U+06C9 U+0651 ;;SHADDA
-C w > U+06C9
-CO w CO w > U+06CA U+0651 ;,SHADDA
-CO w > U+06CA
-U A / _ # > U+064F U+0648 U+0627
-Q U [Uw] > U+0648 U+0651 ;;SHADDA
-Q U > U+0648
-U [Uw] > U+064F U+0648 U+0651 ;;SHADDA
-U > U+064F U+0648
-w w > U+0648 U+0651 ;;SHADDA
-w > U+0648
-Q u N? >
-u N > U+064C
-u > U+064F
-V t V t > U+0679 U+0651 ;;SHADDA
-V t > U+0679 ;urdu
-UL (t|s) UL (t|s) > U+062B U+0651 ;;SHADDA
-UL (t|s) > U+062B
-(P t|U+1E6D) (P t|U+1E6D) > U+0637 U+0651 ;;SHADDA
-(P t|U+1E6D) > U+0637
-t t > U+062A U+0651 ;;SHADDA
-t > U+062A
-T T Q AN > U+0629 U+0651 ;;SHADDA
-T Q AN > U+0629
-T AN > U+0629 U+064B
-T T > U+0629 U+0651 ;;SHADDA
-T > U+0629
-C s C s > U+0634 U+0651 ;;SHADDA
-C s > U+0634
-(P s|U+1E63) (P s|U+1E63) > U+0635 U+0651 ;;SHADDA
-(P s|U+1E63) > U+0635
-V s V s > U+069A U+0651 ;;SHADDA
-V s > U+069A ;Pashto
-CO s CO s > U+069B U+0651 ;;SHADDA
-CO s > U+069B ; sin with 3 dots below
-s s > U+0633 U+0651 ;;SHADDA
-s > U+0633
-C r C r > U+06EF U+0651 ;;SHADDA ; missing in ArabTeX <<<
-C r > U+06EF
-CO r CO r > U+0697 U+0651 ;;SHADDA ; missing in ArabTeX <<<
-CO r > U+0697 ; Dargwa language, Dagestan
-P r P r > U+0694 U+0651 ;;SHADDA
-P r > U+0694 ; r with dot below; in Kurdish .r -> 0694
-V r V r > U+0691 U+0651 ;;SHADDA
-V r > U+0691 ;Urdu
-r r > U+0631 U+0651 ;;SHADDA
-r > U+0631
-P q P q > U+066F U+0651 ;;SHADDA
-P q > U+066F
-q q > U+0642 U+0651 ;;SHADDA
-q > U+0642
-p p > U+067E U+0651 ;;SHADDA
-p > U+067E
-CO n CO n > U+06B1 U+0651 ;;SHADDA
-CO n > U+06B1
-C n C n > U+06AD U+0651 ;;SHADDA
-C n > U+06AD
-P n P n > U+06BA U+0651 ;;SHADDA
-P n > U+06BA ; urdu
-V n V n > U+06BC U+0651 ;;SHADDA
-V n > U+06BC ; Pashto
-n n > U+0646 U+0651 ;;SHADDA
-n > U+0646
-m m > U+0645 U+0651 ;;SHADDA
-m > U+0645
-P l P l > U+06B6 U+0651 ;
-P l > U+06B6 ; ADDED <<<
-C l C l > U+06B5 U+0651 ;;SHADDA
-C l > U+06B5 ;kurdish
-l l > U+0644 U+0651 ;;SHADDA
-l > U+0644
-P k P k > U+06A9 U+0651 ;;SHADDA
-P k > U+06A9 ; pashto urdu
-UL k UL k > U+063A U+0651 ;;SHADDA
-UL k > U+063A
-k k > U+0643 U+0651 ;;SHADDA
-k > U+0643
-C g C g > U+062C U+0651 ;;SHADDA
-C g > U+062C
-CO j CO j > U+0684 U+0651 ;;SHADDA
-CO j > U+0684
-j j > U+062C U+0651 ;;SHADDA
-j > U+062C
-Q I > U+064A
-I > U+0650 U+064A
-C I > U+0650 U+064A U+0653 ; historical spelling : madda on ya
-UL I > ; suggestion of O. Smrz (arabtex-plus project) URL = ###
-Q i N? > ;
-i N > U+064D
-i > U+0650
-x x > U+062E U+0651 ;;SHADDA
-x > U+062E
-U+0048 Z > U+0647 U+200C U+0020 ;eH-suffix > eH suffix
-U+0048 > U+0647 U+200C ; H is always heh final
-UL h UL h > U+062E U+0651 ;;SHADDA
-UL h > U+062E
-(P h|U+1E25) (P h|U+1E25) > U+062D U+0651 ;;SHADDA
-(P h|U+1E25) > U+062D
-V h V h > U+06C1 U+0651 ;;SHADDA
-V h > U+06C1
-h h > U+0647 U+0651 ;;SHADDA
-h > U+0647
-CO g CO g > U+06B3 U+0651 ;;SHADDA
-CO g > U+06B3
-V g V g > U+06AC U+0651 ;;SHADDA
-V g > U+06AC ; kaf with dot above
-P g P g > U+063A U+0651 ;;SHADDA
-P g > U+063A
-g g > U+06AF U+0651 ;;SHADDA
-g > U+06AF
-G G > U+06AB U+0651 ;;SHADDA
-G > U+06AB ;pashto
-P f P f > U+06A1 U+0651 ;;SHADDA
-P f > U+06A1
-f f > U+0641 U+0651 ;;SHADDA
-f > U+0641
-V d V d > U+068A U+0651 ;;SHADDA
-V d > U+068A
-P V d P V d > U+068B U+0651 ;;SHADDA
-P V d > U+068B ;; (like U+0688 with dot below, for Lahnda = Western Punjabi)
-C d C d > U+06EE U+0651 ;;SHADDA
-C d > U+06EE ; not defined in ArabTeX
-CO d CO d > U+068F U+0651 ;;SHADDA
-CO d > U+068F
-UL (d|z) UL (d|z) > U+0630 U+0651 ;;SHADDA
-UL (d|z) > U+0630
-(P d|U+1E0D) (P d|U+1E0D) > U+0636 U+0651 ;;SHADDA
-(P d|U+1E0D) > U+0636
-d d > U+062F U+0651 ;;SHADDA
-d > U+062F
-V c V c > U+0685 U+0651 ;;SHADDA
-V c > U+0685 ;pashto
-C c C c > U+0686 U+0651 ;;SHADDA
-C c > U+0686
-P C c P C c > U+06BF U+0651 ;;SHADDA
-P C c > U+06BF ;; cheh with dot above <<<
-c c > U+0681 U+0651 ;;SHADDA
-c > U+0681 ; ح with hamza above
-CO c CO c > U+0682 U+0651 ;;SHADDA
-CO c > U+0682 ; old pashto
-CO b CO b > U+067B U+0651 ;;SHADDA
-CO b > U+067B
-P b P b > U+066E U+0651 ;;SHADDA
-P b > U+066E
-b b > U+0628 U+0651 ;;SHADDA
-b > U+0628
-H A > U+0622
-C A > U+064E U+0622 ; historical spelling
-UL A > U+064E U+0649
-UL a > U+0670
-UL u > U+064F;
-UL i > U+0650;
-Q AN / (A H|Ha) _ > ;
-AN / (A H|Ha) _ > U+064B
-Q AN > U+0627
-AN > U+0627 U+064B
-Q a >
-a > U+064E
-Q A > U+0627
-A > U+064E U+0627
-Ain Ain > U+0639 U+0651 ;;SHADDA
-Ain > U+0639
-H H > U+0621 U+0651 ;;SHADDA
-H > U+0621
-U+002C / [Digits] _ [Digits] > U+002C ; comma in numerical context not an Arabic comma
-Z Z / [Digits] _ [Digits] > U+2013 ; two hyphens in numerical context -> endash
-(Z|U+005D|U+005B|U+0028|U+0029)=xx / [Digits] _ [Digits] > U+202D @xx U+202C ; hyphen or brackets in numerical context: surrounded by LRO & PDF marks
-[Digits] > [ArEasternDigits]
-Z Z Z / # _ # > U+2014
-Z Z / # _ # > U+2013
-Z Z > U+0640
-B > U+0640
-Z / # _ > U+200D ; -x > force initial form with "zero-width joiner"
-Z / _ # > U+200D ; x- > force final form
-U+003C U+003C > U+00BB ;<<
-U+003E U+003E > U+00AB ;>>
-U+00AB > U+00BB
-U+00BB > U+00AB
-UL > U+0640 ;_
-U+003F > U+061F ;?
-U+003B > U+061B ;;
-U+003A U+003A > U+061E ;; '::' ligature 'DOTS' also defined above...
-U+002C > U+060C ;,
-U+005D / [LTR] _ [LTR] > U+200D U+005D U+200D ; keep shaping when inserting ...[...]... ...
-U+005B / [LTR] _ [LTR] > U+200D U+005B U+200D ; (but of course this screws up contextual
- ; analysis, so quoting of hamzas etc may be necessary
-;U+005D > U+005B ;] these are automatically mirrored, following Unicode rules
-;U+005B > U+005D ;[
-Q [VWL] > ;stripoff quoted vowels
-Q > U+0652
-U+00B0 > U+0652 ; °
-N > ;
-C > ;^
-BAR > ;|
-
-pass(Unicode)
-
-Class [CONS] = (U+0621 U+0623 U+0624 U+0626 U+0628 U+062A..U+063A U+0641..U+0647 U+066E U+066F U+0672 U+0675 U+0676 U+0678..U+06BF U+06EE U+06EF U+06FA..U+06FF U+0750..U+076D) ; to be improved: not sure that all glyphs listed (esp for Urdu,Sindhi,etc are really "consonants" in the sense that they can carry a sukun, not to mention that some of these languages may not have a sukun at all ;-)
-Class [VWLX] = (U+0627 U+0648..U+065E U+0670) ; long vowels, vowel signs, shadda, sukun etc.
-Class [VWL] = (U+0627 U+0648..U+0650 U+0670);
-Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-farsi-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-farsi-voc.tec
deleted file mode 100644
index 8345fe580fe..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-farsi-voc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-fullvoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-fullvoc.map
deleted file mode 100644
index 11bd7a0a39b..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-fullvoc.map
+++ /dev/null
@@ -1,482 +0,0 @@
-LHSName "ArabTeX-fullvocalized"
-RHSName "UNICODE"
-
-Define a U+0061 ;a
-Define b U+0062 ;b
-Define c U+0063 ;c
-Define d U+0064 ;d
-Define e U+0065 ;e
-Define f U+0066 ;f
-Define g U+0067 ;g
-Define h U+0068 ;h
-Define i U+0069 ;i
-Define j U+006A ;j
-Define k U+006B ;k
-Define l U+006C ;l
-Define m U+006D ;m
-Define n U+006E ;n
-Define o U+006F ;o
-Define p U+0070 ;p
-Define q U+0071 ;q
-Define r U+0072 ;r
-Define s U+0073 ;s
-Define t U+0074 ;t
-Define u U+0075 ;u
-Define v U+0076 ;v
-Define w U+0077 ;w
-Define x U+0078 ;x
-Define y U+0079 ;y
-Define z U+007A ;z
-Define A U+0041 ;A
-Define B U+0042 ;B
-Define E U+0045 ;E
-Define G U+0047 ;G
-Define I U+0049 ;I
-Define N U+004E ;N
-Define O U+004F ;O
-Define T U+0054 ;T
-Define U U+0055 ;U
-Define W U+0057 ;W
-Define Y U+0059 ;Y
-Define C U+005E ;^ << CARET
-Define UL U+005F ;_ << UNDERLINE
-Define P U+002E ;. << DOT
-Define V U+002C ;, << COMMA (_V_irgule)
-Define CO U+003A ;: << COLON
-Define SC U+003B ;; << SEMICOLON
-Define Ain U+0060 ;`
-Define H U+0027 ;' << HAMZA
-Define Q U+0022 ;" << QUOTE
-Define Z U+002D ;- << HYPHEN
-Define BAR U+007C ;|
-Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
-;Define NUL U+00A6;
-Define Ha U+0623
-Define Hi U+0625
-Define Hy U+0626
-Define Hw U+0624
-Define Hh U+06C0 ;; = U+0647 U+0654
-Define HA U+0622
-Define HB U+0640 U+0654
-Define HBAR U+0621 ; '|
-
-pass(Unicode)
-
-U+E000 > ; eliminate special code for capitalization in transliterations
-
-pass(Unicode)
-
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [AVWL] = (U+064B..U+0650);
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0047 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;a..z A E I O U B N T Y ^ . _ " "" `
-Class [BRACKETS] = (U+003C U+003E U+00AB U+00BB U+0028 U+0029 U+005B U+005D U+2018 U+2019 U+201C U+201D); < > () « » [ ] ‘ ’ “ ”
-Class [PUNCT] = (V SC P CO)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-Class [Uwu] = (U+0055 U+0077 U+0075) ;(U w u)
-;Class [ae] = (U+0061 U+0065) ;(a e)
-;Class [ou] = (U+0075 U+006F) ;(u o)
-Class [Iyi] = (U+0069 U+0079 U+0049)
-Class [UI] = (U+0049 U+0055) ; U I
-Class [Digits] = (U+0030..U+0039)
-
-Define BEG (#|Z|[BRACKETS])
-Define END (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #)
-Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
-
-; special ligatures
-;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
-;; The BAR is used in the DMG transliteration to suppress the initial A
-(a|A) BAR? l Z LLAH > U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+0644 U+0644 U+0647 ;; 'll_ah' -> 'l l h'
-;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
-U+0041 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'ALLAH'
-U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
-
-U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
-U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
-U+0029 U+0029 > U+FD3E ;; '))' : ornate left par
-U+0052 U+0049 U+0059 U+0041 U+004C > U+FDFC ;; 'RIYAL' : Saudi currency sign
-;; most fonts won't have the following ones:
-U+0053 U+0041 U+004C U+004C U+0041 U+0053 U+0054 U+004F U+0050 > U+FDF0 ;; 'SALLASTOP' (.sallY with "ye-barree", Quranic stop sign)
-U+0051 U+0041 U+004C U+0041 > U+FDF1 ;; 'QALA' : qalY with ye-barree, Quranic stop sign
-U+0041 U+004B U+0042 U+0041 U+0052 > U+FDF3 ;; 'AKBAR'
-U+004D U+0055 U+0048 U+0041 U+004D U+004D U+0041 U+0044 > U+FDF4 ;; 'MUHAMMAD'
-U+0053 U+0041 U+004C U+0041 U+004D > U+FDF5 ;; 'SALAM'
-U+0052 U+0041 U+0053 U+004F ? U+0055 U+004C > U+FDF6 ;; 'RASUL' (also unicode 'RASOUL')
-U+0041 U+004C U+0041 U+0059 U+0048 (U+0049|U+0045) > U+FDF7 ;; 'ALAYHI' (also unicode 'ALAYHE')
-U+0057 U+0041 U+0053 U+0041 U+004C U+004C U+0041 U+004D > U+FDF8 ;; 'WASALLAM'
-U+0053 U+0041 U+004C U+004C U+0041 > U+FDF9 ;; 'SALLA'
-U+004A U+0041 U+004C U+004C U+0041 > U+FDFB ;; 'JALLA' : "jalla jalAluhu"
-U+0042 U+0041 U+0053 U+004D U+0041 U+004C U+0041 > U+FDFD ;; 'BASMALA' : very few fonts have this ligature afaik
-
-U+005E U+0053 U+004C U+0059 > U+06D6 ;; ^SLY
-U+005E U+0051 U+004C U+0059 > U+06D7 ;; ^QLY
-U+005E U+004D U+0049 U+004D > U+06D8 ;; ^MIM-
-U+005E U+004C U+0041 > U+06D9 ;; ^LA
-U+005E U+004A U+0049 U+004D > U+06DA ;; ^JIM
-U+005E U+0044 U+004F U+0054 U+0053 > U+06DB ;; ^DOTS
-U+005E U+0053 U+0049 U+004E > U+06DC ;; ^SIN
-U+0048 U+0049 U+005A U+0042 > U+06DE ;; HIZB
-U+0043 U+0049 U+0052 U+0043 U+005A U+0045 U+0052 U+004F > U+06DF ;; CIRCZERO
-U+0052 U+0045 U+0043 U+0054 U+005A U+0045 U+0052 U+004F > U+06E0 ;; RECTZERO
-U+005E U+004A U+0041 U+005A U+004D > U+06E1 ;; ^JAZM
-U+005E U+004D U+0049 U+004D > U+06E2 ;; ^MIM
-U+005F U+0053 U+0049 U+004E > U+06E3 ;; _SIN
-U+005E U+004D U+0041 U+0044 U+0044 U+0041 > U+06E4 ;; ^MADDA
-U+0057 U+0041 U+0057 > U+06E5 ;; WAW
-U+0059 U+0045 U+0048 > U+06E6 ;; YEH
-U+005E U+0059 U+0045 U+0048 > U+06E7 ;; ^YEH
-U+005E U+004E U+0055 U+004E > U+06E8 ;; ^NUN
-U+0053 U+0041 U+004A U+0044 U+0041 > U+06E9 ;; SAJDA
-U+005F U+0053 U+0054 U+004F U+0050 > U+06EA ;; _STOP
-U+005E U+0053 U+0054 U+004F U+0050 > U+06EB ;; ^STOP
-U+005E U+0052 U+0053 U+0054 U+004F U+0050 > U+06EC ;; ^RSTOP
-U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
-
-U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
-
-
-; vowels
-u u > U
-i i > I
-a a > A
-CO O > U+06FC ;
-a e > a y
-a o > a w
-CO U > U+06C7 ;
-e > i ;; but not pashto > U+0659 and kashmiri > y + U+0658 (U+06CE is kurdish)
-o > u
-E > I
-O > U
-
-
-
-;; initial characters ...
-a l Z / BEG _ > U+0627 l Z
-H l Z / BEG _ > U+0671 l Z ; THIS IS NOT AN ARABTEX CONVENTION! it's a work-around coz pattern-matching across word boundaries does not work in teckit , so min al- must be written mina 'l- in fullvocalize mode
-;; wasla on initial alif : NEW! NOT TESTED!
-[VWL]=v1 Z / BEG _ > @v1 U+0671 ; THIS IS NOT AN ARABTEX CONVENTION! it's a work-around coz pattern-matching across word boundaries does not work in teckit , so huwa irtifA` must be written huwa i-rtifA` in fullvocalize mode
-H / BEG _ l l > U+0671 ; e.g. alla_dI -> 'lla_dI
-[VWL]=v1 / BEG _ > U+0627 @v1
-A / BEG _ > U+0627 a
-Q?=q1 U / BEG _ > U+0627 @q1 u w ; -U
-; Q?=q1 I / BEG _ > U+0627 @q1 i y ; -I
-Q?=q1 I / BEG _ > U+0627 @q1 i y
-
-
-;; Words with anomalous orthography:
-
-; mi'aT -> ماية
-;;; i H / m Q ? _ Q ? a ? (T|t) > i A Hy
-m Q i H Q a / _ (T|t) > m U+0627 Hy
-m Q i H a / _ (T|t) > m U+0627 Hy a
-m i H Q a / _ (T|t) > m i U+0627 Hy
-m i H a / _ (T|t) > m i U+0627 Hy a
-
-
-;; contextual analysis of hamzas
-;; THESE DO NOT APPLY FOR SINDHI
-
-; initial hamzas
-H / (#|^[LTR]) _ Q? [Iyi] > Hi
-H Q A / (#|^[LTR]) _ > HA ; alif madda
-H / (#|^[LTR]) _ Q? [Uwu] > Ha
-H / (#|^[LTR]) _ Q? a > Ha
-Q H / (#|^[LTR]) _ > HB ; quoted isolated hamza at beginning of word
-
-; quoted hamzas in contextual mode, equivalent to verbatim mode
-a Q H > Ha
-i Q H > Hi
-y Q H > Hy
-w Q H > Hw
-h Q H > Hh
-A Q H > HA
-B Q H > HB
-BAR Q H > HBAR
-
-; hamza + fathatan
-H / a _ Q? AN > Ha
-;;H / [Iyi] _ Q? AN > Hy
-H / _ Q? AN > Hy
-
-;final hamzas
-H / A _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Uw] _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Iy] _ Q? (i N?|u N?)? (#|^[LTR]) > HBAR ; not AN ...
-H / a _ Q? (#|^[LTR]) > Ha ; not AN...
-H / a _ Q? (u|i) N? (#|^[LTR]) > Ha ; not AN...
-H / i _ Q? [VWL]? N? (#|^[LTR]) > Hy
-H / u _ Q? [VWL]? N? (#|^[LTR]) > Hw
-
-;;and more hamzas ...
-
-; n°1: kasra/ya
-H / [LTR] _ Q? [Iyi] ^N > Hy
-H / [Iyi] _ > Hy
-
-; n°2: damma/waw
-H / [LTR] _ Q? (U|u) ^N > Hw
-H / (U|u) _ Q? ^[Iyi] > Hw
-H / U _ > HBAR
-
-; n°3: fatha/alif
-H Q? A > HA
-H / A _ Q? a > HBAR
-H / ^[UI] _ Q? a > Ha
-H / a _ Q? ^[UI] > Ha
-
-
-pass(Unicode)
-
-Class [Digits] = (U+0030..U+0039)
-Class [ArDigits] = (U+0660..U+0669)
-Class [ArEasternDigits] = (U+06F0..U+06F9)
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;(a..z A E I O U B N T Y ^ . _ " "" `)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-
-
-
-
-;normal code
-
-
-(P z|U+1E93) (P z|U+1E93) > U+0638 U+0651 ;;SHADDA
-(P z|U+1E93) > U+0638
-C z C z > U+0698 U+0651 ;;SHADDA
-C z > U+0698
-V z V z > U+0696 U+0651 ;;SHADDA
-V z > U+0696 ;pashto
-z z > U+0632 U+0651 ;;SHADDA
-z > U+0632
-Q Y Y > U+0649 U+0651 ;;SHADDA
-Q Y > U+0649
-Y Y > U+064E U+0649 U+0651 ;;SHADDA
-Y > U+064E U+0649
-P I P I / _ # > U+0650 U+06CC U+0651 ;; SHADDA
-P I / _ # > U+0650 U+06CC ;; workaround to have ya without dots in Arabic
-y y > U+064A U+0651 ;;SHADDA
-y > U+064A
-v v > U+06A4 U+0651 ;;SHADDA
-v > U+06A4
-W > U+0648 U+0627 ; waw + alif
-C U > U+064F U+0648 U+0653; historical spelling : madda on waw
-C w C w > U+06C9 U+0651 ;;SHADDA
-C w > U+06C9
-CO w CO w > U+06CA U+0651 ;,SHADDA
-CO w > U+06CA
-U A / _ # > U+064F U+0648 U+0627
-Q U [Uw] > U+0648 U+0651 ;;SHADDA
-Q U > U+0648
-U [Uw] > U+064F U+0648 U+0651 ;;SHADDA
-U > U+064F U+0648
-w w > U+0648 U+0651 ;;SHADDA
-w > U+0648
-Q u N? >
-u N > U+064C
-u > U+064F
-V t V t > U+0679 U+0651 ;;SHADDA
-V t > U+0679 ;urdu
-UL (t|s) UL (t|s) > U+062B U+0651 ;;SHADDA
-UL (t|s) > U+062B
-(P t|U+1E6D) (P t|U+1E6D) > U+0637 U+0651 ;;SHADDA
-(P t|U+1E6D) > U+0637
-t t > U+062A U+0651 ;;SHADDA
-t > U+062A
-T T Q AN > U+0629 U+0651 ;;SHADDA
-T Q AN > U+0629
-T AN > U+0629 U+064B
-T T > U+0629 U+0651 ;;SHADDA
-T > U+0629
-C s C s > U+0634 U+0651 ;;SHADDA
-C s > U+0634
-(P s|U+1E63) (P s|U+1E63) > U+0635 U+0651 ;;SHADDA
-(P s|U+1E63) > U+0635
-V s V s > U+069A U+0651 ;;SHADDA
-V s > U+069A ;Pashto
-CO s CO s > U+069B U+0651 ;;SHADDA
-CO s > U+069B ; sin with 3 dots below
-s s > U+0633 U+0651 ;;SHADDA
-s > U+0633
-C r C r > U+06EF U+0651 ;;SHADDA ; missing in ArabTeX <<<
-C r > U+06EF
-CO r CO r > U+0697 U+0651 ;;SHADDA ; missing in ArabTeX <<<
-CO r > U+0697 ; Dargwa language, Dagestan
-P r P r > U+0694 U+0651 ;;SHADDA
-P r > U+0694 ; r with dot below; in Kurdish .r -> 0694
-V r V r > U+0691 U+0651 ;;SHADDA
-V r > U+0691 ;Urdu
-r r > U+0631 U+0651 ;;SHADDA
-r > U+0631
-P q P q > U+066F U+0651 ;;SHADDA
-P q > U+066F
-q q > U+0642 U+0651 ;;SHADDA
-q > U+0642
-p p > U+067E U+0651 ;;SHADDA
-p > U+067E
-CO n CO n > U+06B1 U+0651 ;;SHADDA
-CO n > U+06B1
-C n C n > U+06AD U+0651 ;;SHADDA
-C n > U+06AD
-P n P n > U+06BA U+0651 ;;SHADDA
-P n > U+06BA ; urdu
-V n V n > U+06BC U+0651 ;;SHADDA
-V n > U+06BC ; Pashto
-n n > U+0646 U+0651 ;;SHADDA
-n > U+0646
-m m > U+0645 U+0651 ;;SHADDA
-m > U+0645
-P l P l > U+06B6 U+0651 ;
-P l > U+06B6 ; ADDED <<<
-C l C l > U+06B5 U+0651 ;;SHADDA
-C l > U+06B5 ;kurdish
-l l > U+0644 U+0651 ;;SHADDA
-l > U+0644
-P k P k > U+06A9 U+0651 ;;SHADDA
-P k > U+06A9 ; pashto urdu
-UL k UL k > U+063A U+0651 ;;SHADDA
-UL k > U+063A
-k k > U+0643 U+0651 ;;SHADDA
-k > U+0643
-C g C g > U+062C U+0651 ;;SHADDA
-C g > U+062C
-CO j CO j > U+0684 U+0651 ;;SHADDA
-CO j > U+0684
-j j > U+062C U+0651 ;;SHADDA
-j > U+062C
-Q I > U+064A
-I > U+0650 U+064A
-C I > U+0650 U+064A U+0653 ; historical spelling : madda on ya
-UL I > ; suggestion of O. Smrz (arabtex-plus project) URL = ###
-Q i N? > ;
-i N > U+064D
-i > U+0650
-x x > U+062E U+0651 ;;SHADDA
-x > U+062E
-UL h UL h > U+062E U+0651 ;;SHADDA
-UL h > U+062E
-(P h|U+1E25) (P h|U+1E25) > U+062D U+0651 ;;SHADDA
-(P h|U+1E25) > U+062D
-V h V h > U+06C1 U+0651 ;;SHADDA
-V h > U+06C1
-h h > U+0647 U+0651 ;;SHADDA
-h > U+0647
-CO g CO g > U+06B3 U+0651 ;;SHADDA
-CO g > U+06B3
-V g V g > U+06AC U+0651 ;;SHADDA
-V g > U+06AC ; kaf with dot above
-P g P g > U+063A U+0651 ;;SHADDA
-P g > U+063A
-g g > U+06AF U+0651 ;;SHADDA
-g > U+06AF
-G G > U+06AB U+0651 ;;SHADDA
-G > U+06AB ;pashto
-P f P f > U+06A1 U+0651 ;;SHADDA
-P f > U+06A1
-f f > U+0641 U+0651 ;;SHADDA
-f > U+0641
-V d V d > U+068A U+0651 ;;SHADDA
-V d > U+068A
-P V d P V d > U+068B U+0651 ;;SHADDA
-P V d > U+068B ;; (like U+0688 with dot below, for Lahnda = Western Punjabi)
-C d C d > U+06EE U+0651 ;;SHADDA
-C d > U+06EE ; not defined in ArabTeX
-CO d CO d > U+068F U+0651 ;;SHADDA
-CO d > U+068F
-UL (d|z) UL (d|z) > U+0630 U+0651 ;;SHADDA
-UL (d|z) > U+0630
-(P d|U+1E0D) (P d|U+1E0D) > U+0636 U+0651 ;;SHADDA
-(P d|U+1E0D) > U+0636
-d d > U+062F U+0651 ;;SHADDA
-d > U+062F
-V c V c > U+0685 U+0651 ;;SHADDA
-V c > U+0685 ;pashto
-C c C c > U+0686 U+0651 ;;SHADDA
-C c > U+0686
-P C c P C c > U+06BF U+0651 ;;SHADDA
-P C c > U+06BF ;; cheh with dot above <<<
-c c > U+0681 U+0651 ;;SHADDA
-c > U+0681 ; ح with hamza above
-CO c CO c > U+0682 U+0651 ;;SHADDA
-CO c > U+0682 ; old pashto
-CO b CO b > U+067B U+0651 ;;SHADDA
-CO b > U+067B
-P b P b > U+066E U+0651 ;;SHADDA
-P b > U+066E
-b b > U+0628 U+0651 ;;SHADDA
-b > U+0628
-H A > U+0622
-C A > U+064E U+0622 ; historical spelling
-UL A > U+064E U+0649
-UL a > U+0670
-UL u > U+0657 ; inverted damma
-UL i > U+0656 ; subscript alif
-Q AN / (A H|Ha) _ > ;
-AN / (A H|Ha) _ > U+064B
-Q AN > U+0627
-AN > U+0627 U+064B
-Q a >
-a > U+064E
-Q A > U+0627
-A > U+064E U+0627
-Ain Ain > U+0639 U+0651 ;;SHADDA
-Ain > U+0639
-H H > U+0621 U+0651 ;;SHADDA
-H > U+0621
-U+002C / [Digits] _ [Digits] > U+002C ; comma in numerical context not an Arabic comma
-Z Z / [Digits] _ [Digits] > U+2013 ; two hyphens in numerical context -> endash
-(Z|U+005D|U+005B|U+0028|U+0029)=xx / [Digits] _ [Digits] > U+202D @xx U+202C ; hyphen or brackets in numerical context: surrounded by LRO & PDF marks
-[Digits] > [ArDigits]
-Z Z Z / # _ # > U+2014
-Z Z / # _ # > U+2013
-Z Z > U+0640
-B > U+0640
-Z / # _ > U+200D ; -x > force initial form with "zero-width joiner"
-Z / _ # > U+200D ; x- > force final form
-U+003C U+003C > U+00BB ;<<
-U+003E U+003E > U+00AB ;>>
-U+00AB > U+00BB
-U+00BB > U+00AB
-UL > U+0640 ;_
-U+003F > U+061F ;?
-U+003B > U+061B ;;
-U+003A U+003A > U+061E ;; '::' ligature 'DOTS' also defined above...
-U+002C > U+060C ;,
-U+005D / [LTR] _ [LTR] > U+200D U+005D U+200D ; keep shaping when inserting ...[...]... ...
-U+005B / [LTR] _ [LTR] > U+200D U+005B U+200D ; (but of course this screws up contextual
- ; analysis, so quoting of hamzas etc may be necessary
-;U+005D > U+005B ;] these are automatically mirrored, following Unicode rules
-;U+005B > U+005D ;[
-Q [VWL] > ;stripoff quoted vowels
-U+00B0 > U+0652 ; °
-N > ;
-C > ;^
-BAR > ;|
-
-pass(Unicode)
-
-Class [CONS] = (U+0621 U+0623 U+0624 U+0626 U+0628 U+062A..U+063A U+0641..U+0647 U+066E U+066F U+0672 U+0675 U+0676 U+0678..U+06BF U+06EE U+06EF U+06FA..U+06FF U+0750..U+076D) ; to be improved: not sure that all glyphs listed (esp for Urdu,Sindhi,etc are really "consonants" in the sense that they can carry a sukun, not to mention that some of these languages may not have a sukun at all ;-)
-Class [VWLX] = (U+0627 U+0648..U+065E U+0670) ; long vowels, vowel signs, shadda, sukun etc.
-Class [VWL] = (U+0627 U+0648..U+0650 U+0670);
-[CONS]=k1 / _ Z? [CONS] ^U+0651 > @k1 U+0652 ; hack: 2nd consonant has no shadda
-U+064E (U+064A|U+0648)=hc / _ (^[VWLX]|#) > U+064E @hc U+0652 ; ay and aw diphtongs
-U+0627 [VWL]? / [VWL] Z _ > U+0671 ; e.g. fa-isti_hraj -> wasla on initial alif
-U+0627 / # _ U+0644 > U+0627 U+064E ; otherwise initial alif takes fatha
-[CONS]=k1 / _ ([CONS]|#) > @k1 U+0652 ; consonant + (consonant or final)
-;; [CONS]=k1 / _ # > @k1 U+0652 ; final consonant
-Q > ;
-Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-fullvoc.tec
deleted file mode 100644
index 46a3e4c598e..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-fullvoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kashmiri-fullvoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kashmiri-fullvoc.map
deleted file mode 100644
index 769b6bde7e8..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kashmiri-fullvoc.map
+++ /dev/null
@@ -1,513 +0,0 @@
-LHSName "ArabTeX-kashmiri-fullvocalized"
-RHSName "UNICODE"
-
-Define a U+0061 ;a
-Define b U+0062 ;b
-Define c U+0063 ;c
-Define d U+0064 ;d
-Define e U+0065 ;e
-Define f U+0066 ;f
-Define g U+0067 ;g
-Define h U+0068 ;h
-Define i U+0069 ;i
-Define j U+006A ;j
-Define k U+006B ;k
-Define l U+006C ;l
-Define m U+006D ;m
-Define n U+006E ;n
-Define o U+006F ;o
-Define p U+0070 ;p
-Define q U+0071 ;q
-Define r U+0072 ;r
-Define s U+0073 ;s
-Define t U+0074 ;t
-Define u U+0075 ;u
-Define v U+0076 ;v
-Define w U+0077 ;w
-Define x U+0078 ;x
-Define y U+0079 ;y
-Define z U+007A ;z
-Define A U+0041 ;A
-Define B U+0042 ;B
-Define E U+0045 ;E
-Define G U+0047 ;G
-Define I U+0049 ;I
-Define N U+004E ;N
-Define O U+004F ;O
-Define T U+0054 ;T
-Define U U+0055 ;U
-Define W U+0057 ;W
-Define Y U+0059 ;Y
-Define C U+005E ;^ << CARET
-Define UL U+005F ;_ << UNDERLINE
-Define P U+002E ;. << DOT
-Define V U+002C ;, << COMMA (_V_irgule)
-Define CO U+003A ;: << COLON
-Define SC U+003B ;; << SEMICOLON
-Define Ain U+0060 ;`
-Define H U+0027 ;' << HAMZA
-Define Q U+0022 ;" << QUOTE
-Define Z U+002D ;- << HYPHEN
-Define BAR U+007C ;|
-Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
-;Define NUL U+00A6;
-Define Ha U+0623
-Define Hi U+0625
-Define Hy U+0626
-Define Hw U+0624
-Define Hh U+06C0 ;; = U+0647 U+0654
-Define HA U+0622
-Define HB U+0640 U+0654
-Define HBAR U+0621 ; '|
-
-pass(Unicode)
-
-U+E000 > ; eliminate special code for capitalization in transliterations
-
-pass(Unicode)
-
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [AVWL] = (U+064B..U+0650);
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0047 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;a..z A E I O U B N T Y ^ . _ " "" `
-Class [BRACKETS] = (U+003C U+003E U+00AB U+00BB U+0028 U+0029 U+005B U+005D U+2018 U+2019 U+201C U+201D); < > () « » [ ] ‘ ’ “ ”
-Class [PUNCT] = (V SC P CO)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-Class [Uwu] = (U+0055 U+0077 U+0075) ;(U w u)
-;Class [ae] = (U+0061 U+0065) ;(a e)
-;Class [ou] = (U+0075 U+006F) ;(u o)
-Class [Iyi] = (U+0069 U+0079 U+0049)
-Class [UI] = (U+0049 U+0055) ; U I
-Class [Digits] = (U+0030..U+0039)
-
-Define BEG (#|Z|[BRACKETS])
-Define END (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #)
-Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
-
-; special ligatures
-;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
-;; The BAR is used in the DMG transliteration to suppress the initial A
-(a|A) BAR? l Z LLAH > U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+0644 U+0644 U+0647 ;; 'll_ah' -> 'l l h'
-;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
-U+0041 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'ALLAH'
-U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
-
-U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
-U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
-U+0029 U+0029 > U+FD3E ;; '))' : ornate left par
-U+0052 U+0049 U+0059 U+0041 U+004C > U+FDFC ;; 'RIYAL' : Saudi currency sign
-;; most fonts won't have the following ones:
-U+0053 U+0041 U+004C U+004C U+0041 U+0053 U+0054 U+004F U+0050 > U+FDF0 ;; 'SALLASTOP' (.sallY with "ye-barree", Quranic stop sign)
-U+0051 U+0041 U+004C U+0041 > U+FDF1 ;; 'QALA' : qalY with ye-barree, Quranic stop sign
-U+0041 U+004B U+0042 U+0041 U+0052 > U+FDF3 ;; 'AKBAR'
-U+004D U+0055 U+0048 U+0041 U+004D U+004D U+0041 U+0044 > U+FDF4 ;; 'MUHAMMAD'
-U+0053 U+0041 U+004C U+0041 U+004D > U+FDF5 ;; 'SALAM'
-U+0052 U+0041 U+0053 U+004F ? U+0055 U+004C > U+FDF6 ;; 'RASUL' (also unicode 'RASOUL')
-U+0041 U+004C U+0041 U+0059 U+0048 (U+0049|U+0045) > U+FDF7 ;; 'ALAYHI' (also unicode 'ALAYHE')
-U+0057 U+0041 U+0053 U+0041 U+004C U+004C U+0041 U+004D > U+FDF8 ;; 'WASALLAM'
-U+0053 U+0041 U+004C U+004C U+0041 > U+FDF9 ;; 'SALLA'
-U+004A U+0041 U+004C U+004C U+0041 > U+FDFB ;; 'JALLA' : "jalla jalAluhu"
-U+0042 U+0041 U+0053 U+004D U+0041 U+004C U+0041 > U+FDFD ;; 'BASMALA' : very few fonts have this ligature afaik
-
-U+005E U+0053 U+004C U+0059 > U+06D6 ;; ^SLY
-U+005E U+0051 U+004C U+0059 > U+06D7 ;; ^QLY
-U+005E U+004D U+0049 U+004D > U+06D8 ;; ^MIM-
-U+005E U+004C U+0041 > U+06D9 ;; ^LA
-U+005E U+004A U+0049 U+004D > U+06DA ;; ^JIM
-U+005E U+0044 U+004F U+0054 U+0053 > U+06DB ;; ^DOTS
-U+005E U+0053 U+0049 U+004E > U+06DC ;; ^SIN
-U+0048 U+0049 U+005A U+0042 > U+06DE ;; HIZB
-U+0043 U+0049 U+0052 U+0043 U+005A U+0045 U+0052 U+004F > U+06DF ;; CIRCZERO
-U+0052 U+0045 U+0043 U+0054 U+005A U+0045 U+0052 U+004F > U+06E0 ;; RECTZERO
-U+005E U+004A U+0041 U+005A U+004D > U+06E1 ;; ^JAZM
-U+005E U+004D U+0049 U+004D > U+06E2 ;; ^MIM
-U+005F U+0053 U+0049 U+004E > U+06E3 ;; _SIN
-U+005E U+004D U+0041 U+0044 U+0044 U+0041 > U+06E4 ;; ^MADDA
-U+0057 U+0041 U+0057 > U+06E5 ;; WAW
-U+0059 U+0045 U+0048 > U+06E6 ;; YEH
-U+005E U+0059 U+0045 U+0048 > U+06E7 ;; ^YEH
-U+005E U+004E U+0055 U+004E > U+06E8 ;; ^NUN
-U+0053 U+0041 U+004A U+0044 U+0041 > U+06E9 ;; SAJDA
-U+005F U+0053 U+0054 U+004F U+0050 > U+06EA ;; _STOP
-U+005E U+0053 U+0054 U+004F U+0050 > U+06EB ;; ^STOP
-U+005E U+0052 U+0053 U+0054 U+004F U+0050 > U+06EC ;; ^RSTOP
-U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
-
-U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
-
-
-; vowels
-u u > U
-i i > I
-a a > A
-CO O > U+06FC ;
-a e > a y
-a o > a w
-(o|u)? O / # _ > U+0627 w
-(o|u)? O > w
-CO U > U+06C7 ;
-e / # _ # > U+0627 U+06D2 U+0658 ; Alif + yeh barree + bow accent
-e / _ # > U+06D2 U+0658 ; yeh barree + bow accent
-e / # _ > U+0627 y U+0658 ; alif + ya + bow accent
-e > y U+0658
-E / # _ # > U+0627 U+06D2 ; Alif + yeh barree
-E / _ # > U+06D2 ; yeh barree
-E / # _ > U+0627 y ; alif + ya
-E > y
-o / # _ > U+0627 U+06C6
-o > U+06C6
-P A > U+0672
-P U > U+0673 ; > this is the initial or lone form, but medial and final require wavy hamza below previous letter (not in Unicode)! Perhaps an OT font could solve this :: in Scheherazade the glyph needed is named _wavyHamza <<<
-P a / # _ > U+0623
-P a > U+0654
-P u > U+0655
-P o / # _ > U+0627 U+06C4
-P o > U+06C4
-P O / # _ > U+0627 U+06C4 U+0627 U+064E
-P O > U+06C4 U+0627 U+064E
-I > y U+0656
-I / _ # > y
-U / _ # > U+0627 w U+0657
-U > w U+0657
-
-
-;; Persian ezafe (ALL BUT ARABIC AND UIGHUR)
-U+0048 Z UL? (Q? (i|e))=vv / _ END > U+06C0 @vv U+200C ;H-i -> heh+hamza final; what about 06C2 in Urdu ?<<<
-U+0048 Z Q?=qq (I|E)=vv / _ END > h U+0020 U+0627 @qq i @vv ; H-I
-Q?=q1 (I|E) Z UL? Q?=q2 (i|e) / _ END > @q1 i U+0626 @q2 i U+200C ; ...I-e
-Z Q?=qq I / (A|U) _ ENDZ > U+0626 @qq i y ; ...A-I or ...U-I
-Z UL? (Q? (i|e))=vv / (A|U) _ END > U+0649 @vv ; ...A-i or ...U-i
-Z Q?=q1 (e|i) / _ ENDZ > @q1 i ; ...-i
-Z / U+0048 _ > U+0020 ;
-b Q?=q1 (e|i) Q?=q2 U / # _ > b @q1 i U+0627 @q2 u w ;; special case of prep be without hyphen
-
-;; initial characters ...
-a l Z / BEG _ > U+0627 l Z
-;; wasla on initial alif : NEW! NOT TESTED!
-H / BEG _ l l > U+0671 ; e.g. alla_dI -> 'lla_dI
-[VWL]=v1 / BEG _ > U+0627 @v1
-Q?=q1 U / BEG _ > U+0627 @q1 u w ; -U
-; Q?=q1 I / BEG _ > U+0627 @q1 i y ; -I
-Q?=q1 I / BEG _ > U+0627 @q1 i y
-
-
-;; Words with anomalous orthography:
-
-; mi'aT -> ماية
-;;; i H / m Q ? _ Q ? a ? (T|t) > i A Hy
-m Q i H Q a / _ (T|t) > m U+0627 Hy
-m Q i H a / _ (T|t) > m U+0627 Hy a
-m i H Q a / _ (T|t) > m i U+0627 Hy
-m i H a / _ (T|t) > m i U+0627 Hy a
-
-
-;; contextual analysis of hamzas
-;; THESE DO NOT APPLY FOR SINDHI
-
-; initial hamzas
-H / (#|^[LTR]) _ Q? [Iyi] > Hi
-H Q A / (#|^[LTR]) _ > HA ; alif madda
-H / (#|^[LTR]) _ Q? [Uwu] > Ha
-H / (#|^[LTR]) _ Q? a > Ha
-Q H / (#|^[LTR]) _ > HB ; quoted isolated hamza at beginning of word
-
-; quoted hamzas in contextual mode, equivalent to verbatim mode
-a Q H > Ha
-i Q H > Hi
-y Q H > Hy
-w Q H > Hw
-h Q H > Hh
-A Q H > HA
-B Q H > HB
-BAR Q H > HBAR
-
-; hamza + fathatan
-H / a _ Q? AN > Ha
-;;H / [Iyi] _ Q? AN > Hy
-H / _ Q? AN > Hy
-
-;final hamzas
-H / A _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Uw] _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Iy] _ Q? (i N?|u N?)? (#|^[LTR]) > HBAR ; not AN ...
-H / a _ Q? (#|^[LTR]) > Ha ; not AN...
-H / a _ Q? (u|i) N? (#|^[LTR]) > Ha ; not AN...
-H / i _ Q? [VWL]? N? (#|^[LTR]) > Hy
-H / u _ Q? [VWL]? N? (#|^[LTR]) > Hw
-
-;;and more hamzas ...
-
-; n°1: kasra/ya
-H / [LTR] _ Q? [Iyi] ^N > Hy
-H / [Iyi] _ > Hy
-
-; n°2: damma/waw
-H / [LTR] _ Q? (U|u) ^N > Hw
-H / (U|u) _ Q? ^[Iyi] > Hw
-H / U _ > HBAR
-
-; n°3: fatha/alif
-H Q? A > HA
-H / A _ Q? a > HBAR
-H / ^[UI] _ Q? a > Ha
-H / a _ Q? ^[UI] > Ha
-
-
-pass(Unicode)
-
-Class [Digits] = (U+0030..U+0039)
-Class [ArDigits] = (U+0660..U+0669)
-Class [ArEasternDigits] = (U+06F0..U+06F9)
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;(a..z A E I O U B N T Y ^ . _ " "" `)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-
-
-
-
-;normal code
-
-
-CO z CO z > U+0636 U+0651 ;;SHADDA
-CO z > U+0636
-(P z|U+1E93) (P z|U+1E93) > U+0638 U+0651 ;;SHADDA
-(P z|U+1E93) > U+0638
-C z C z > U+0698 U+0651 ;;SHADDA
-C z > U+0698
-V z V z > U+0696 U+0651 ;;SHADDA
-V z > U+0696 ;pashto
-z z > U+0632 U+0651 ;;SHADDA
-z > U+0632
-Q Y Y > U+0649 U+0651 ;;SHADDA
-Q Y > U+0649
-Y Y > U+064E U+0649 U+0651 ;;SHADDA
-Y > U+064E U+0649
-;; .b with ring below : FIXME not in Unicode! but U+06EA is a poor replacement:
-P y / # _ # > U+0627 U+06D2 U+06EA
-P y / _ # > U+0649
-P y > U+066E U+06EA
-;; y / _ # > U+0649 ; y final in persian,ottoman,urdu,pashto,kashmiri has no dots
-y y > U+06CC U+0651 ;;SHADDA
-y > U+06CC ; yeh in persian etc. > iso and final shapes have no dots
-v v > U+06A4 U+0651 ;;SHADDA
-v > U+06A4
-W > U+0648 U+0627 ; waw + alif
-C U > U+064F U+0648 U+0653; historical spelling : madda on waw
-C w C w > U+06C9 U+0651 ;;SHADDA
-C w > U+06C9
-CO w CO w > U+06CA U+0651 ;,SHADDA
-CO w > U+06CA
-U A / _ # > U+064F U+0648 U+0627
-Q U [Uw] > U+0648 U+0651 ;;SHADDA
-Q U > U+0648
-U [Uw] > U+064F U+0648 U+0651 ;;SHADDA
-U > U+064F U+0648
-w w > U+0648 U+0651 ;;SHADDA
-w > U+0648
-Q u N? >
-u N > U+064C
-u > U+064F
-V t V t > U+0679 U+0651 ;;SHADDA
-V t > U+0679 ;urdu
-UL (t|s) UL (t|s) > U+062B U+0651 ;;SHADDA
-UL (t|s) > U+062B
-(P t|U+1E6D) (P t|U+1E6D) > U+0637 U+0651 ;;SHADDA
-(P t|U+1E6D) > U+0637
-t t > U+062A U+0651 ;;SHADDA
-t > U+062A
-T T Q AN > U+0629 U+0651 ;;SHADDA
-T Q AN > U+0629
-T AN > U+0629 U+064B
-T T > U+0629 U+0651 ;;SHADDA
-T > U+0629
-C s C s > U+0634 U+0651 ;;SHADDA
-C s > U+0634
-(P s|U+1E63) (P s|U+1E63) > U+0635 U+0651 ;;SHADDA
-(P s|U+1E63) > U+0635
-V s V s > U+069A U+0651 ;;SHADDA
-V s > U+069A ;Pashto
-CO s CO s > U+069B U+0651 ;;SHADDA
-CO s > U+069B ; sin with 3 dots below
-s s > U+0633 U+0651 ;;SHADDA
-s > U+0633
-C r C r > U+06EF U+0651 ;;SHADDA ; missing in ArabTeX <<<
-C r > U+06EF
-CO r CO r > U+0697 U+0651 ;;SHADDA ; missing in ArabTeX <<<
-CO r > U+0697 ; Dargwa language, Dagestan
-P r P r > U+0694 U+0651 ;;SHADDA
-P r > U+0694 ; r with dot below; in Kurdish .r -> 0694
-V r V r > U+0691 U+0651 ;;SHADDA
-V r > U+0691 ;Urdu
-r r > U+0631 U+0651 ;;SHADDA
-r > U+0631
-P q P q > U+066F U+0651 ;;SHADDA
-P q > U+066F
-q q > U+0642 U+0651 ;;SHADDA
-q > U+0642
-p p > U+067E U+0651 ;;SHADDA
-p > U+067E
-CO n CO n > U+06B1 U+0651 ;;SHADDA
-CO n > U+06B1
-C n C n > U+06AD U+0651 ;;SHADDA
-C n > U+06AD
-P n P n > U+06BA U+0651 ;;SHADDA
-P n > U+06BA ; urdu
-V n V n > U+06BC U+0651 ;;SHADDA
-V n > U+06BC ; Pashto
-n n > U+0646 U+0651 ;;SHADDA
-n > U+0646
-m m > U+0645 U+0651 ;;SHADDA
-m > U+0645
-P l P l > U+06B6 U+0651 ;
-P l > U+06B6 ; ADDED <<<
-C l C l > U+06B5 U+0651 ;;SHADDA
-C l > U+06B5 ;kurdish
-l l > U+0644 U+0651 ;;SHADDA
-l > U+0644
-P k P k > U+06A9 U+0651 ;;SHADDA
-P k > U+06A9 ; pashto urdu
-UL k UL k > U+063A U+0651 ;;SHADDA
-UL k > U+063A
-k k > U+0643 U+0651 ;;SHADDA
-k > U+0643
-C g C g > U+062C U+0651 ;;SHADDA
-C g > U+062C
-CO j CO j > U+0684 U+0651 ;;SHADDA
-CO j > U+0684
-j j > U+062C U+0651 ;;SHADDA
-j > U+062C
-Q I > U+064A
-I > U+0650 U+064A
-C I > U+0650 U+064A U+0653 ; historical spelling : madda on ya
-UL I > ; suggestion of O. Smrz (arabtex-plus project) URL = ###
-Q i N? > ;
-i N > U+064D
-i > U+0650
-x x > U+062E U+0651 ;;SHADDA
-x > U+062E
-UL h UL h > U+062E U+0651 ;;SHADDA
-UL h > U+062E
-(P h|U+1E25) (P h|U+1E25) > U+062D U+0651 ;;SHADDA
-(P h|U+1E25) > U+062D
-V h V h > U+06C1 U+0651 ;;SHADDA
-V h > U+06C1
-h h > U+0647 U+0651 ;;SHADDA
-h > U+0647
-CO g CO g > U+06B3 U+0651 ;;SHADDA
-CO g > U+06B3
-V g V g > U+06AC U+0651 ;;SHADDA
-V g > U+06AC ; kaf with dot above
-P g P g > U+063A U+0651 ;;SHADDA
-P g > U+063A
-g g > U+06AF U+0651 ;;SHADDA
-g > U+06AF
-G G > U+06AB U+0651 ;;SHADDA
-G > U+06AB ;pashto
-P f P f > U+06A1 U+0651 ;;SHADDA
-P f > U+06A1
-f f > U+0641 U+0651 ;;SHADDA
-f > U+0641
-V d V d > U+068A U+0651 ;;SHADDA
-V d > U+068A
-P V d P V d > U+068B U+0651 ;;SHADDA
-P V d > U+068B ;; (like U+0688 with dot below, for Lahnda = Western Punjabi)
-C d C d > U+06EE U+0651 ;;SHADDA
-C d > U+06EE ; not defined in ArabTeX
-CO d CO d > U+068F U+0651 ;;SHADDA
-CO d > U+068F
-UL (d|z) UL (d|z) > U+0630 U+0651 ;;SHADDA
-UL (d|z) > U+0630
-(P d|U+1E0D) (P d|U+1E0D) > U+0636 U+0651 ;;SHADDA
-(P d|U+1E0D) > U+0636
-d d > U+062F U+0651 ;;SHADDA
-d > U+062F
-V c V c > U+0685 U+0651 ;;SHADDA
-V c > U+0685 ;pashto
-C c C c > U+0686 U+0651 ;;SHADDA
-C c > U+0686
-P C c P C c > U+06BF U+0651 ;;SHADDA
-P C c > U+06BF ;; cheh with dot above <<<
-c c > U+0681 U+0651 ;;SHADDA
-c > U+0681 ; ح with hamza above
-CO c CO c > U+0682 U+0651 ;;SHADDA
-CO c > U+0682 ; old pashto
-CO b CO b > U+067B U+0651 ;;SHADDA
-CO b > U+067B
-P b P b > U+066E U+0651 ;;SHADDA
-P b > U+066E
-b b > U+0628 U+0651 ;;SHADDA
-b > U+0628
-H A > U+0622
-C A > U+064E U+0622 ; historical spelling
-UL A > U+064E U+0649
-UL a > U+0670
-UL u > U+064F;
-UL i > U+0650;
-Q AN / (A H|Ha) _ > ;
-AN / (A H|Ha) _ > U+064B
-Q AN > U+0627
-AN > U+0627 U+064B
-Q a >
-a > U+064E
-Q A > U+0627
-A > U+064E U+0627
-Ain Ain > U+0639 U+0651 ;;SHADDA
-Ain > U+0639
-H H > U+0621 U+0651 ;;SHADDA
-H > U+0621
-U+002C / [Digits] _ [Digits] > U+002C ; comma in numerical context not an Arabic comma
-Z Z / [Digits] _ [Digits] > U+2013 ; two hyphens in numerical context -> endash
-(Z|U+005D|U+005B|U+0028|U+0029)=xx / [Digits] _ [Digits] > U+202D @xx U+202C ; hyphen or brackets in numerical context: surrounded by LRO & PDF marks
-[Digits] > [ArEasternDigits]
-Z Z Z / # _ # > U+2014
-Z Z / # _ # > U+2013
-Z Z > U+0640
-B > U+0640
-Z / # _ > U+200D ; -x > force initial form with "zero-width joiner"
-Z / _ # > U+200D ; x- > force final form
-U+003C U+003C > U+00BB ;<<
-U+003E U+003E > U+00AB ;>>
-U+00AB > U+00BB
-U+00BB > U+00AB
-UL > U+0640 ;_
-U+003F > U+061F ;?
-U+003B > U+061B ;;
-U+003A U+003A > U+061E ;; '::' ligature 'DOTS' also defined above...
-U+002C > U+060C ;,
-U+005D / [LTR] _ [LTR] > U+200D U+005D U+200D ; keep shaping when inserting ...[...]... ...
-U+005B / [LTR] _ [LTR] > U+200D U+005B U+200D ; (but of course this screws up contextual
- ; analysis, so quoting of hamzas etc may be necessary
-;U+005D > U+005B ;] these are automatically mirrored, following Unicode rules
-;U+005B > U+005D ;[
-Q [VWL] > ;stripoff quoted vowels
-U+00B0 > U+0652 ; °
-N > ;
-C > ;^
-BAR > ;|
-
-pass(Unicode)
-
-Class [CONS] = (U+0621 U+0623 U+0624 U+0626 U+0628 U+062A..U+063A U+0641..U+0647 U+066E U+066F U+0672 U+0675 U+0676 U+0678..U+06BF U+06EE U+06EF U+06FA..U+06FF U+0750..U+076D) ; to be improved: not sure that all glyphs listed (esp for Urdu,Sindhi,etc are really "consonants" in the sense that they can carry a sukun, not to mention that some of these languages may not have a sukun at all ;-)
-Class [VWLX] = (U+0627 U+0648..U+065E U+0670) ; long vowels, vowel signs, shadda, sukun etc.
-Class [VWL] = (U+0627 U+0648..U+0650 U+0670);
-[CONS]=k1 / _ Z? [CONS] ^U+0651 > @k1 U+0652 ; hack: 2nd consonant has no shadda
-U+064E (U+064A|U+0648)=hc / _ (^[VWLX]|#) > U+064E @hc U+0652 ; ay and aw diphtongs
-U+0627 / # _ U+0644 > U+0627 U+064E ; otherwise initial alif takes fatha
-[CONS]=k1 / _ ([CONS]|#) > @k1 U+0652 ; consonant + (consonant or final)
-;; [CONS]=k1 / _ # > @k1 U+0652 ; final consonant
-Q > ;
-Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kashmiri-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kashmiri-fullvoc.tec
deleted file mode 100644
index 7ed4f7bb38c..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kashmiri-fullvoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kashmiri-novoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kashmiri-novoc.map
deleted file mode 100644
index 99b2e76a64d..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kashmiri-novoc.map
+++ /dev/null
@@ -1,498 +0,0 @@
-LHSName "ArabTeX-kashmiri-novowels"
-RHSName "UNICODE"
-
-Define a U+0061 ;a
-Define b U+0062 ;b
-Define c U+0063 ;c
-Define d U+0064 ;d
-Define e U+0065 ;e
-Define f U+0066 ;f
-Define g U+0067 ;g
-Define h U+0068 ;h
-Define i U+0069 ;i
-Define j U+006A ;j
-Define k U+006B ;k
-Define l U+006C ;l
-Define m U+006D ;m
-Define n U+006E ;n
-Define o U+006F ;o
-Define p U+0070 ;p
-Define q U+0071 ;q
-Define r U+0072 ;r
-Define s U+0073 ;s
-Define t U+0074 ;t
-Define u U+0075 ;u
-Define v U+0076 ;v
-Define w U+0077 ;w
-Define x U+0078 ;x
-Define y U+0079 ;y
-Define z U+007A ;z
-Define A U+0041 ;A
-Define B U+0042 ;B
-Define E U+0045 ;E
-Define G U+0047 ;G
-Define I U+0049 ;I
-Define N U+004E ;N
-Define O U+004F ;O
-Define T U+0054 ;T
-Define U U+0055 ;U
-Define W U+0057 ;W
-Define Y U+0059 ;Y
-Define C U+005E ;^ << CARET
-Define UL U+005F ;_ << UNDERLINE
-Define P U+002E ;. << DOT
-Define V U+002C ;, << COMMA (_V_irgule)
-Define CO U+003A ;: << COLON
-Define SC U+003B ;; << SEMICOLON
-Define Ain U+0060 ;`
-Define H U+0027 ;' << HAMZA
-Define Q U+0022 ;" << QUOTE
-Define Z U+002D ;- << HYPHEN
-Define BAR U+007C ;|
-Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
-;Define NUL U+00A6;
-Define Ha U+0623
-Define Hi U+0625
-Define Hy U+0626
-Define Hw U+0624
-Define Hh U+06C0 ;; = U+0647 U+0654
-Define HA U+0622
-Define HB U+0640 U+0654
-Define HBAR U+0621 ; '|
-
-pass(Unicode)
-
-U+E000 > ; eliminate special code for capitalization in transliterations
-
-pass(Unicode)
-
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [AVWL] = (U+064B..U+0650);
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0047 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;a..z A E I O U B N T Y ^ . _ " "" `
-Class [BRACKETS] = (U+003C U+003E U+00AB U+00BB U+0028 U+0029 U+005B U+005D U+2018 U+2019 U+201C U+201D); < > () « » [ ] ‘ ’ “ ”
-Class [PUNCT] = (V SC P CO)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-Class [Uwu] = (U+0055 U+0077 U+0075) ;(U w u)
-;Class [ae] = (U+0061 U+0065) ;(a e)
-;Class [ou] = (U+0075 U+006F) ;(u o)
-Class [Iyi] = (U+0069 U+0079 U+0049)
-Class [UI] = (U+0049 U+0055) ; U I
-Class [Digits] = (U+0030..U+0039)
-
-Define BEG (#|Z|[BRACKETS])
-Define END (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #)
-Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
-
-; special ligatures
-;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
-;; The BAR is used in the DMG transliteration to suppress the initial A
-(a|A) BAR? l Z LLAH > U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+0644 U+0644 U+0647 ;; 'll_ah' -> 'l l h'
-;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
-U+0041 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'ALLAH'
-U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
-
-U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
-U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
-U+0029 U+0029 > U+FD3E ;; '))' : ornate left par
-U+0052 U+0049 U+0059 U+0041 U+004C > U+FDFC ;; 'RIYAL' : Saudi currency sign
-;; most fonts won't have the following ones:
-U+0053 U+0041 U+004C U+004C U+0041 U+0053 U+0054 U+004F U+0050 > U+FDF0 ;; 'SALLASTOP' (.sallY with "ye-barree", Quranic stop sign)
-U+0051 U+0041 U+004C U+0041 > U+FDF1 ;; 'QALA' : qalY with ye-barree, Quranic stop sign
-U+0041 U+004B U+0042 U+0041 U+0052 > U+FDF3 ;; 'AKBAR'
-U+004D U+0055 U+0048 U+0041 U+004D U+004D U+0041 U+0044 > U+FDF4 ;; 'MUHAMMAD'
-U+0053 U+0041 U+004C U+0041 U+004D > U+FDF5 ;; 'SALAM'
-U+0052 U+0041 U+0053 U+004F ? U+0055 U+004C > U+FDF6 ;; 'RASUL' (also unicode 'RASOUL')
-U+0041 U+004C U+0041 U+0059 U+0048 (U+0049|U+0045) > U+FDF7 ;; 'ALAYHI' (also unicode 'ALAYHE')
-U+0057 U+0041 U+0053 U+0041 U+004C U+004C U+0041 U+004D > U+FDF8 ;; 'WASALLAM'
-U+0053 U+0041 U+004C U+004C U+0041 > U+FDF9 ;; 'SALLA'
-U+004A U+0041 U+004C U+004C U+0041 > U+FDFB ;; 'JALLA' : "jalla jalAluhu"
-U+0042 U+0041 U+0053 U+004D U+0041 U+004C U+0041 > U+FDFD ;; 'BASMALA' : very few fonts have this ligature afaik
-
-U+005E U+0053 U+004C U+0059 > U+06D6 ;; ^SLY
-U+005E U+0051 U+004C U+0059 > U+06D7 ;; ^QLY
-U+005E U+004D U+0049 U+004D > U+06D8 ;; ^MIM-
-U+005E U+004C U+0041 > U+06D9 ;; ^LA
-U+005E U+004A U+0049 U+004D > U+06DA ;; ^JIM
-U+005E U+0044 U+004F U+0054 U+0053 > U+06DB ;; ^DOTS
-U+005E U+0053 U+0049 U+004E > U+06DC ;; ^SIN
-U+0048 U+0049 U+005A U+0042 > U+06DE ;; HIZB
-U+0043 U+0049 U+0052 U+0043 U+005A U+0045 U+0052 U+004F > U+06DF ;; CIRCZERO
-U+0052 U+0045 U+0043 U+0054 U+005A U+0045 U+0052 U+004F > U+06E0 ;; RECTZERO
-U+005E U+004A U+0041 U+005A U+004D > U+06E1 ;; ^JAZM
-U+005E U+004D U+0049 U+004D > U+06E2 ;; ^MIM
-U+005F U+0053 U+0049 U+004E > U+06E3 ;; _SIN
-U+005E U+004D U+0041 U+0044 U+0044 U+0041 > U+06E4 ;; ^MADDA
-U+0057 U+0041 U+0057 > U+06E5 ;; WAW
-U+0059 U+0045 U+0048 > U+06E6 ;; YEH
-U+005E U+0059 U+0045 U+0048 > U+06E7 ;; ^YEH
-U+005E U+004E U+0055 U+004E > U+06E8 ;; ^NUN
-U+0053 U+0041 U+004A U+0044 U+0041 > U+06E9 ;; SAJDA
-U+005F U+0053 U+0054 U+004F U+0050 > U+06EA ;; _STOP
-U+005E U+0053 U+0054 U+004F U+0050 > U+06EB ;; ^STOP
-U+005E U+0052 U+0053 U+0054 U+004F U+0050 > U+06EC ;; ^RSTOP
-U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
-
-U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
-
-
-; vowels
-u u > U
-i i > I
-a a > A
-[AVWL] > ; strip off vowels when writing UTF-8 Arabic with novoc mode
-CO O > U+06FC ;
-a e > a y
-a o > a w
-(o|u)? O / # _ > U+0627 w
-(o|u)? O > w
-CO U > U+06C7 ;
-e / # _ # > U+0627 U+06D2 U+0658 ; Alif + yeh barree + bow accent
-e / _ # > U+06D2 U+0658 ; yeh barree + bow accent
-e / # _ > U+0627 y U+0658 ; alif + ya + bow accent
-e > y U+0658
-E / # _ # > U+0627 U+06D2 ; Alif + yeh barree
-E / _ # > U+06D2 ; yeh barree
-E / # _ > U+0627 y ; alif + ya
-E > y
-o / # _ > U+0627 U+06C6
-o > U+06C6
-P A > U+0672
-P U > U+0673 ; > this is the initial or lone form, but medial and final require wavy hamza below previous letter (not in Unicode)! Perhaps an OT font could solve this :: in Scheherazade the glyph needed is named _wavyHamza <<<
-P a / # _ > U+0623
-P a > U+0654
-P u > U+0655
-P o / # _ > U+0627 U+06C4
-P o > U+06C4
-P O / # _ > U+0627 U+06C4 U+0627 U+064E
-P O > U+06C4 U+0627 U+064E
-I > y U+0656
-I / _ # > y
-U / _ # > U+0627 w U+0657
-U > w U+0657
-
-
-;; Persian ezafe (ALL BUT ARABIC AND UIGHUR)
-U+0048 Z UL? (Q? (i|e))=vv / _ END > U+06C0 @vv U+200C ;H-i -> heh+hamza final; what about 06C2 in Urdu ?<<<
-U+0048 Z Q?=qq (I|E)=vv / _ END > h U+0020 U+0627 @qq i @vv ; H-I
-Q?=q1 (I|E) Z UL? Q?=q2 (i|e) / _ END > @q1 i U+0626 @q2 i U+200C ; ...I-e
-Z Q?=qq I / (A|U) _ ENDZ > U+0626 @qq i y ; ...A-I or ...U-I
-Z UL? (Q? (i|e))=vv / (A|U) _ END > U+0649 @vv ; ...A-i or ...U-i
-Z Q?=q1 (e|i) / _ ENDZ > @q1 i ; ...-i
-Z / U+0048 _ > U+0020 ;
-b Q?=q1 (e|i) Q?=q2 U / # _ > b @q1 i U+0627 @q2 u w ;; special case of prep be without hyphen
-
-;; initial characters ...
-a l Z / BEG _ > U+0627 l Z
-;; wasla on initial alif : NEW! NOT TESTED!
-H / BEG _ l l > U+0627 ;
-[VWL]=v1 / BEG _ > A @v1
-Q?=q1 U / BEG _ > A @q1 u w ; -U
-; Q?=q1 I / BEG _ > A @q1 i y ; -I ; but not when I is final FIXME!!!
-Q?=q1 I / BEG _ > A @q1 i y ; except for Persian, coz of ezafe rules
-
-
-;; Words with anomalous orthography:
-
-; mi'aT -> ماية
-;;; i H / m Q ? _ Q ? a ? (T|t) > i A Hy
-m Q i H Q a / _ (T|t) > m Q i A Hy Q a
-m Q i H a / _ (T|t) > m Q i A Hy
-m i H Q a / _ (T|t) > m A Hy Q a
-m i H a / _ (T|t) > m A Hy
-
-
-;; contextual analysis of hamzas
-;; THESE DO NOT APPLY FOR SINDHI
-
-; initial hamzas
-H / (#|^[LTR]) _ Q? [Iyi] > Hi
-H Q A / (#|^[LTR]) _ > HA ; alif madda
-H / (#|^[LTR]) _ Q? [Uwu] > Ha
-H / (#|^[LTR]) _ Q? a > Ha
-Q H / (#|^[LTR]) _ > HB ; quoted isolated hamza at beginning of word
-
-; quoted hamzas in contextual mode, equivalent to verbatim mode
-a Q H > Ha
-i Q H > Hi
-y Q H > Hy
-w Q H > Hw
-h Q H > Hh
-A Q H > HA
-B Q H > HB
-BAR Q H > HBAR
-
-; hamza + fathatan
-H / a _ Q? AN > Ha
-;;H / [Iyi] _ Q? AN > Hy
-H / _ Q? AN > Hy
-
-;final hamzas
-H / A _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Uw] _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Iy] _ Q? (i N?|u N?)? (#|^[LTR]) > HBAR ; not AN ...
-H / a _ Q? (#|^[LTR]) > Ha ; not AN...
-H / a _ Q? (u|i) N? (#|^[LTR]) > Ha ; not AN...
-H / i _ Q? [VWL]? N? (#|^[LTR]) > Hy
-H / u _ Q? [VWL]? N? (#|^[LTR]) > Hw
-
-;;and more hamzas ...
-
-; n°1: kasra/ya
-H / [LTR] _ Q? [Iyi] ^N > Hy
-H / [Iyi] _ > Hy
-
-; n°2: damma/waw
-H / [LTR] _ Q? (U|u) ^N > Hw
-H / (U|u) _ Q? ^[Iyi] > Hw
-H / U _ > HBAR
-
-; n°3: fatha/alif
-H Q? A > HA
-H / A _ Q? a > HBAR
-H / ^[UI] _ Q? a > Ha
-H / a _ Q? ^[UI] > Ha
-
-
-pass(Unicode)
-
-Class [Digits] = (U+0030..U+0039)
-Class [ArDigits] = (U+0660..U+0669)
-Class [ArEasternDigits] = (U+06F0..U+06F9)
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;(a..z A E I O U B N T Y ^ . _ " "" `)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-
-
-
-
-;normal code
-
-
-CO z CO z > U+0636 U+0651 ;;SHADDA
-CO z > U+0636
-(P z|U+1E93) (P z|U+1E93) > U+0638 U+0651 ;;SHADDA
-(P z|U+1E93) > U+0638
-C z C z > U+0698 U+0651 ;;SHADDA
-C z > U+0698
-V z V z > U+0696 U+0651 ;;SHADDA
-V z > U+0696 ;pashto
-z z > U+0632 U+0651 ;;SHADDA
-z > U+0632
-Y Y > U+0649 U+0651 ;;SHADDA
-Y > U+0649
-;; .b with ring below : FIXME not in Unicode! but U+06EA is a poor replacement:
-P y / # _ # > U+0627 U+06D2 U+06EA
-P y / _ # > U+0649
-P y > U+066E U+06EA
-;; y / _ # > U+0649 ; y final in persian,ottoman,urdu,pashto,kashmiri has no dots
-y y > U+06CC U+0651 ;;SHADDA
-y > U+06CC ; yeh in persian etc. > iso and final shapes have no dots
-v v > U+06A4 U+0651 ;;SHADDA
-v > U+06A4
-W > U+0648 U+0627 ; waw + alif
-C U > U+064F U+0648 U+0653; historical spelling : madda on waw
-Q U [Uw] > U+064F U+0648 U+0651 ;;SHADDA
-Q U > U+064F U+0648
-[Uw] [Uw] > U+0648 U+0651 ;;SHADDA
-[Uw] > U+0648
-C w C w > U+06C9 U+0651 ;;SHADDA
-C w > U+06C9
-CO w CO w > U+06CA U+0651 ;,SHADDA
-CO w > U+06CA
-Q u N > U+064C
-u N >
-Q u > U+064F
-V t V t > U+0679 U+0651 ;;SHADDA
-V t > U+0679 ;urdu
-UL (t|s) UL (t|s) > U+062B U+0651 ;;SHADDA
-UL (t|s) > U+062B
-(P t|U+1E6D) (P t|U+1E6D) > U+0637 U+0651 ;;SHADDA
-(P t|U+1E6D) > U+0637
-t t > U+062A U+0651 ;;SHADDA
-t > U+062A
-T T Q AN > U+0629 U+0651 U+064B ;;SHADDA
-T Q AN > U+0629 U+064B
-T AN > U+0629
-T T > U+0629 U+0651 ;;SHADDA
-T > U+0629
-C s C s > U+0634 U+0651 ;;SHADDA
-C s > U+0634
-(P s|U+1E63) (P s|U+1E63) > U+0635 U+0651 ;;SHADDA
-(P s|U+1E63) > U+0635
-V s V s > U+069A U+0651 ;;SHADDA
-V s > U+069A ;Pashto
-CO s CO s > U+069B U+0651 ;;SHADDA
-CO s > U+069B ; sin with 3 dots below
-s s > U+0633 U+0651 ;;SHADDA
-s > U+0633
-C r C r > U+06EF U+0651 ;;SHADDA ; missing in ArabTeX <<<
-C r > U+06EF
-CO r CO r > U+0697 U+0651 ;;SHADDA ; missing in ArabTeX <<<
-CO r > U+0697 ; Dargwa language, Dagestan
-P r P r > U+0694 U+0651 ;;SHADDA
-P r > U+0694 ; r with dot below; in Kurdish .r -> 0694
-V r V r > U+0691 U+0651 ;;SHADDA
-V r > U+0691 ;Urdu
-r r > U+0631 U+0651 ;;SHADDA
-r > U+0631
-P q P q > U+066F U+0651 ;;SHADDA
-P q > U+066F
-q q > U+0642 U+0651 ;;SHADDA
-q > U+0642
-p p > U+067E U+0651 ;;SHADDA
-p > U+067E
-CO n CO n > U+06B1 U+0651 ;;SHADDA
-CO n > U+06B1
-C n C n > U+06AD U+0651 ;;SHADDA
-C n > U+06AD
-P n P n > U+06BA U+0651 ;;SHADDA
-P n > U+06BA ; urdu
-V n V n > U+06BC U+0651 ;;SHADDA
-V n > U+06BC ; Pashto
-n n > U+0646 U+0651 ;;SHADDA
-n > U+0646
-m m > U+0645 U+0651 ;;SHADDA
-m > U+0645
-P l P l > U+06B6 U+0651 ;
-P l > U+06B6 ; ADDED <<<
-C l C l > U+06B5 U+0651 ;;SHADDA
-C l > U+06B5 ;kurdish
-l l > U+0644 U+0651 ;;SHADDA
-l > U+0644
-P k P k > U+06A9 U+0651 ;;SHADDA
-P k > U+06A9 ; pashto urdu
-UL k UL k > U+063A U+0651 ;;SHADDA
-UL k > U+063A
-k k > U+0643 U+0651 ;;SHADDA
-k > U+0643
-C g C g > U+062C U+0651 ;;SHADDA
-C g > U+062C
-CO j CO j > U+0684 U+0651 ;;SHADDA
-CO j > U+0684
-j j > U+062C U+0651 ;;SHADDA
-j > U+062C
-Q I > U+0650 U+064A
-C I > U+0650 U+064A U+0653 ; historical spelling : madda on ya
-UL I > ; suggestion of O. Smrz (arabtex-plus project) URL = ###
-I > U+064A
-Q i N > U+064D
-i N > ;
-Q i > U+0650
-x x > U+062E U+0651 ;;SHADDA
-x > U+062E
-UL h UL h > U+062E U+0651 ;;SHADDA
-UL h > U+062E
-(P h|U+1E25) (P h|U+1E25) > U+062D U+0651 ;;SHADDA
-(P h|U+1E25) > U+062D
-V h V h > U+06C1 U+0651 ;;SHADDA
-V h > U+06C1
-h h > U+0647 U+0651 ;;SHADDA
-h > U+0647
-CO g CO g > U+06B3 U+0651 ;;SHADDA
-CO g > U+06B3
-V g V g > U+06AC U+0651 ;;SHADDA
-V g > U+06AC ; kaf with dot above
-P g P g > U+063A U+0651 ;;SHADDA
-P g > U+063A
-g g > U+06AF U+0651 ;;SHADDA
-g > U+06AF
-G G > U+06AB U+0651 ;;SHADDA
-G > U+06AB ;pashto
-P f P f > U+06A1 U+0651 ;;SHADDA
-P f > U+06A1
-f f > U+0641 U+0651 ;;SHADDA
-f > U+0641
-V d V d > U+068A U+0651 ;;SHADDA
-V d > U+068A
-P V d P V d > U+068B U+0651 ;;SHADDA
-P V d > U+068B ;; (like U+0688 with dot below, for Lahnda = Western Punjabi)
-C d C d > U+06EE U+0651 ;;SHADDA
-C d > U+06EE ; not defined in ArabTeX
-CO d CO d > U+068F U+0651 ;;SHADDA
-CO d > U+068F
-UL (d|z) UL (d|z) > U+0630 U+0651 ;;SHADDA
-UL (d|z) > U+0630
-(P d|U+1E0D) (P d|U+1E0D) > U+0636 U+0651 ;;SHADDA
-(P d|U+1E0D) > U+0636
-d d > U+062F U+0651 ;;SHADDA
-d > U+062F
-V c V c > U+0685 U+0651 ;;SHADDA
-V c > U+0685 ;pashto
-C c C c > U+0686 U+0651 ;;SHADDA
-C c > U+0686
-P C c P C c > U+06BF U+0651 ;;SHADDA
-P C c > U+06BF ;; cheh with dot above <<<
-c c > U+0681 U+0651 ;;SHADDA
-c > U+0681 ; ح with hamza above
-CO c CO c > U+0682 U+0651 ;;SHADDA
-CO c > U+0682 ; old pashto
-CO b CO b > U+067B U+0651 ;;SHADDA
-CO b > U+067B
-P b P b > U+066E U+0651 ;;SHADDA
-P b > U+066E
-b b > U+0628 U+0651 ;;SHADDA
-b > U+0628
-H A > U+0622
-C A > U+064E U+0622 ; historical spelling
-UL A > U+0649
-UL a > U+0670
-UL u > ;
-UL i > ;
-Q AN / (A H|Ha) _ > U+064B
-AN / (A H|Ha) _ > ;
-Q AN > U+0627 U+064B
-AN > U+0627
-Q a > U+064E
-Q A > U+064E U+0627
-A > U+0627
-Ain Ain > U+0639 U+0651 ;;SHADDA
-Ain > U+0639
-H H > U+0621 U+0651 ;;SHADDA
-H > U+0621
-U+002C / [Digits] _ [Digits] > U+002C ; comma in numerical context not an Arabic comma
-Z Z / [Digits] _ [Digits] > U+2013 ; two hyphens in numerical context -> endash
-(Z|U+005D|U+005B|U+0028|U+0029)=xx / [Digits] _ [Digits] > U+202D @xx U+202C ; hyphen or brackets in numerical context: surrounded by LRO & PDF marks
-[Digits] > [ArEasternDigits]
-Z Z Z / # _ # > U+2014
-Z Z / # _ # > U+2013
-Z Z > U+0640
-B > U+0640
-Z / # _ > U+200D ; -x > force initial form with "zero-width joiner"
-Z / _ # > U+200D ; x- > force final form
-U+003C U+003C > U+00BB ;<<
-U+003E U+003E > U+00AB ;>>
-U+00AB > U+00BB
-U+00BB > U+00AB
-UL > U+0640 ;_
-U+003F > U+061F ;?
-U+003B > U+061B ;;
-U+003A U+003A > U+061E ;; '::' ligature 'DOTS' also defined above...
-U+002C > U+060C ;,
-U+005D / [LTR] _ [LTR] > U+200D U+005D U+200D ; keep shaping when inserting ...[...]... ...
-U+005B / [LTR] _ [LTR] > U+200D U+005B U+200D ; (but of course this screws up contextual
- ; analysis, so quoting of hamzas etc may be necessary
-;U+005D > U+005B ;] these are automatically mirrored, following Unicode rules
-;U+005B > U+005D ;[
-[VWL] > ;stripoff vowels
-Q > U+0652
-U+00B0 > U+0652 ; °
-N > ;
-C > ;^
-Z > ;-
-BAR > ;|
-
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kashmiri-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kashmiri-novoc.tec
deleted file mode 100644
index ec6bf0a081d..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kashmiri-novoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kashmiri-voc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kashmiri-voc.map
deleted file mode 100644
index 791aab5df95..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kashmiri-voc.map
+++ /dev/null
@@ -1,508 +0,0 @@
-LHSName "ArabTeX-kashmiri-vocalized"
-RHSName "UNICODE"
-
-Define a U+0061 ;a
-Define b U+0062 ;b
-Define c U+0063 ;c
-Define d U+0064 ;d
-Define e U+0065 ;e
-Define f U+0066 ;f
-Define g U+0067 ;g
-Define h U+0068 ;h
-Define i U+0069 ;i
-Define j U+006A ;j
-Define k U+006B ;k
-Define l U+006C ;l
-Define m U+006D ;m
-Define n U+006E ;n
-Define o U+006F ;o
-Define p U+0070 ;p
-Define q U+0071 ;q
-Define r U+0072 ;r
-Define s U+0073 ;s
-Define t U+0074 ;t
-Define u U+0075 ;u
-Define v U+0076 ;v
-Define w U+0077 ;w
-Define x U+0078 ;x
-Define y U+0079 ;y
-Define z U+007A ;z
-Define A U+0041 ;A
-Define B U+0042 ;B
-Define E U+0045 ;E
-Define G U+0047 ;G
-Define I U+0049 ;I
-Define N U+004E ;N
-Define O U+004F ;O
-Define T U+0054 ;T
-Define U U+0055 ;U
-Define W U+0057 ;W
-Define Y U+0059 ;Y
-Define C U+005E ;^ << CARET
-Define UL U+005F ;_ << UNDERLINE
-Define P U+002E ;. << DOT
-Define V U+002C ;, << COMMA (_V_irgule)
-Define CO U+003A ;: << COLON
-Define SC U+003B ;; << SEMICOLON
-Define Ain U+0060 ;`
-Define H U+0027 ;' << HAMZA
-Define Q U+0022 ;" << QUOTE
-Define Z U+002D ;- << HYPHEN
-Define BAR U+007C ;|
-Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
-;Define NUL U+00A6;
-Define Ha U+0623
-Define Hi U+0625
-Define Hy U+0626
-Define Hw U+0624
-Define Hh U+06C0 ;; = U+0647 U+0654
-Define HA U+0622
-Define HB U+0640 U+0654
-Define HBAR U+0621 ; '|
-
-pass(Unicode)
-
-U+E000 > ; eliminate special code for capitalization in transliterations
-
-pass(Unicode)
-
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [AVWL] = (U+064B..U+0650);
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0047 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;a..z A E I O U B N T Y ^ . _ " "" `
-Class [BRACKETS] = (U+003C U+003E U+00AB U+00BB U+0028 U+0029 U+005B U+005D U+2018 U+2019 U+201C U+201D); < > () « » [ ] ‘ ’ “ ”
-Class [PUNCT] = (V SC P CO)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-Class [Uwu] = (U+0055 U+0077 U+0075) ;(U w u)
-;Class [ae] = (U+0061 U+0065) ;(a e)
-;Class [ou] = (U+0075 U+006F) ;(u o)
-Class [Iyi] = (U+0069 U+0079 U+0049)
-Class [UI] = (U+0049 U+0055) ; U I
-Class [Digits] = (U+0030..U+0039)
-
-Define BEG (#|Z|[BRACKETS])
-Define END (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #)
-Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
-
-; special ligatures
-;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
-;; The BAR is used in the DMG transliteration to suppress the initial A
-(a|A) BAR? l Z LLAH > U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+0644 U+0644 U+0647 ;; 'll_ah' -> 'l l h'
-;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
-U+0041 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'ALLAH'
-U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
-
-U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
-U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
-U+0029 U+0029 > U+FD3E ;; '))' : ornate left par
-U+0052 U+0049 U+0059 U+0041 U+004C > U+FDFC ;; 'RIYAL' : Saudi currency sign
-;; most fonts won't have the following ones:
-U+0053 U+0041 U+004C U+004C U+0041 U+0053 U+0054 U+004F U+0050 > U+FDF0 ;; 'SALLASTOP' (.sallY with "ye-barree", Quranic stop sign)
-U+0051 U+0041 U+004C U+0041 > U+FDF1 ;; 'QALA' : qalY with ye-barree, Quranic stop sign
-U+0041 U+004B U+0042 U+0041 U+0052 > U+FDF3 ;; 'AKBAR'
-U+004D U+0055 U+0048 U+0041 U+004D U+004D U+0041 U+0044 > U+FDF4 ;; 'MUHAMMAD'
-U+0053 U+0041 U+004C U+0041 U+004D > U+FDF5 ;; 'SALAM'
-U+0052 U+0041 U+0053 U+004F ? U+0055 U+004C > U+FDF6 ;; 'RASUL' (also unicode 'RASOUL')
-U+0041 U+004C U+0041 U+0059 U+0048 (U+0049|U+0045) > U+FDF7 ;; 'ALAYHI' (also unicode 'ALAYHE')
-U+0057 U+0041 U+0053 U+0041 U+004C U+004C U+0041 U+004D > U+FDF8 ;; 'WASALLAM'
-U+0053 U+0041 U+004C U+004C U+0041 > U+FDF9 ;; 'SALLA'
-U+004A U+0041 U+004C U+004C U+0041 > U+FDFB ;; 'JALLA' : "jalla jalAluhu"
-U+0042 U+0041 U+0053 U+004D U+0041 U+004C U+0041 > U+FDFD ;; 'BASMALA' : very few fonts have this ligature afaik
-
-U+005E U+0053 U+004C U+0059 > U+06D6 ;; ^SLY
-U+005E U+0051 U+004C U+0059 > U+06D7 ;; ^QLY
-U+005E U+004D U+0049 U+004D > U+06D8 ;; ^MIM-
-U+005E U+004C U+0041 > U+06D9 ;; ^LA
-U+005E U+004A U+0049 U+004D > U+06DA ;; ^JIM
-U+005E U+0044 U+004F U+0054 U+0053 > U+06DB ;; ^DOTS
-U+005E U+0053 U+0049 U+004E > U+06DC ;; ^SIN
-U+0048 U+0049 U+005A U+0042 > U+06DE ;; HIZB
-U+0043 U+0049 U+0052 U+0043 U+005A U+0045 U+0052 U+004F > U+06DF ;; CIRCZERO
-U+0052 U+0045 U+0043 U+0054 U+005A U+0045 U+0052 U+004F > U+06E0 ;; RECTZERO
-U+005E U+004A U+0041 U+005A U+004D > U+06E1 ;; ^JAZM
-U+005E U+004D U+0049 U+004D > U+06E2 ;; ^MIM
-U+005F U+0053 U+0049 U+004E > U+06E3 ;; _SIN
-U+005E U+004D U+0041 U+0044 U+0044 U+0041 > U+06E4 ;; ^MADDA
-U+0057 U+0041 U+0057 > U+06E5 ;; WAW
-U+0059 U+0045 U+0048 > U+06E6 ;; YEH
-U+005E U+0059 U+0045 U+0048 > U+06E7 ;; ^YEH
-U+005E U+004E U+0055 U+004E > U+06E8 ;; ^NUN
-U+0053 U+0041 U+004A U+0044 U+0041 > U+06E9 ;; SAJDA
-U+005F U+0053 U+0054 U+004F U+0050 > U+06EA ;; _STOP
-U+005E U+0053 U+0054 U+004F U+0050 > U+06EB ;; ^STOP
-U+005E U+0052 U+0053 U+0054 U+004F U+0050 > U+06EC ;; ^RSTOP
-U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
-
-U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
-
-
-; vowels
-u u > U
-i i > I
-a a > A
-CO O > U+06FC ;
-a e > a y
-a o > a w
-(o|u)? O / # _ > U+0627 w
-(o|u)? O > w
-CO U > U+06C7 ;
-e / # _ # > U+0627 U+06D2 U+0658 ; Alif + yeh barree + bow accent
-e / _ # > U+06D2 U+0658 ; yeh barree + bow accent
-e / # _ > U+0627 y U+0658 ; alif + ya + bow accent
-e > y U+0658
-E / # _ # > U+0627 U+06D2 ; Alif + yeh barree
-E / _ # > U+06D2 ; yeh barree
-E / # _ > U+0627 y ; alif + ya
-E > y
-o / # _ > U+0627 U+06C6
-o > U+06C6
-P A > U+0672
-P U > U+0673 ; > this is the initial or lone form, but medial and final require wavy hamza below previous letter (not in Unicode)! Perhaps an OT font could solve this :: in Scheherazade the glyph needed is named _wavyHamza <<<
-P a / # _ > U+0623
-P a > U+0654
-P u > U+0655
-P o / # _ > U+0627 U+06C4
-P o > U+06C4
-P O / # _ > U+0627 U+06C4 U+0627 U+064E
-P O > U+06C4 U+0627 U+064E
-I > y U+0656
-I / _ # > y
-U / _ # > U+0627 w U+0657
-U > w U+0657
-
-
-;; Persian ezafe (ALL BUT ARABIC AND UIGHUR)
-U+0048 Z UL? (Q? (i|e))=vv / _ END > U+06C0 @vv U+200C ;H-i -> heh+hamza final; what about 06C2 in Urdu ?<<<
-U+0048 Z Q?=qq (I|E)=vv / _ END > h U+0020 U+0627 @qq i @vv ; H-I
-Q?=q1 (I|E) Z UL? Q?=q2 (i|e) / _ END > @q1 i U+0626 @q2 i U+200C ; ...I-e
-Z Q?=qq I / (A|U) _ ENDZ > U+0626 @qq i y ; ...A-I or ...U-I
-Z UL? (Q? (i|e))=vv / (A|U) _ END > U+0649 @vv ; ...A-i or ...U-i
-Z Q?=q1 (e|i) / _ ENDZ > @q1 i ; ...-i
-Z / U+0048 _ > U+0020 ;
-b Q?=q1 (e|i) Q?=q2 U / # _ > b @q1 i U+0627 @q2 u w ;; special case of prep be without hyphen
-
-;; initial characters ...
-a l Z / BEG _ > U+0627 l Z
-;; wasla on initial alif : NEW! NOT TESTED!
-H / BEG _ l l > U+0671 ; e.g. alla_dI -> 'lla_dI
-[VWL]=v1 / BEG _ > U+0627 @v1
-Q?=q1 U / BEG _ > U+0627 @q1 u w ; -U
-; Q?=q1 I / BEG _ > U+0627 @q1 i y ; -I
-Q?=q1 I / BEG _ > U+0627 @q1 i y
-
-
-;; Words with anomalous orthography:
-
-; mi'aT -> ماية
-;;; i H / m Q ? _ Q ? a ? (T|t) > i A Hy
-m Q i H Q a / _ (T|t) > m U+0627 Hy
-m Q i H a / _ (T|t) > m U+0627 Hy a
-m i H Q a / _ (T|t) > m i U+0627 Hy
-m i H a / _ (T|t) > m i U+0627 Hy a
-
-
-;; contextual analysis of hamzas
-;; THESE DO NOT APPLY FOR SINDHI
-
-; initial hamzas
-H / (#|^[LTR]) _ Q? [Iyi] > Hi
-H Q A / (#|^[LTR]) _ > HA ; alif madda
-H / (#|^[LTR]) _ Q? [Uwu] > Ha
-H / (#|^[LTR]) _ Q? a > Ha
-Q H / (#|^[LTR]) _ > HB ; quoted isolated hamza at beginning of word
-
-; quoted hamzas in contextual mode, equivalent to verbatim mode
-a Q H > Ha
-i Q H > Hi
-y Q H > Hy
-w Q H > Hw
-h Q H > Hh
-A Q H > HA
-B Q H > HB
-BAR Q H > HBAR
-
-; hamza + fathatan
-H / a _ Q? AN > Ha
-;;H / [Iyi] _ Q? AN > Hy
-H / _ Q? AN > Hy
-
-;final hamzas
-H / A _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Uw] _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Iy] _ Q? (i N?|u N?)? (#|^[LTR]) > HBAR ; not AN ...
-H / a _ Q? (#|^[LTR]) > Ha ; not AN...
-H / a _ Q? (u|i) N? (#|^[LTR]) > Ha ; not AN...
-H / i _ Q? [VWL]? N? (#|^[LTR]) > Hy
-H / u _ Q? [VWL]? N? (#|^[LTR]) > Hw
-
-;;and more hamzas ...
-
-; n°1: kasra/ya
-H / [LTR] _ Q? [Iyi] ^N > Hy
-H / [Iyi] _ > Hy
-
-; n°2: damma/waw
-H / [LTR] _ Q? (U|u) ^N > Hw
-H / (U|u) _ Q? ^[Iyi] > Hw
-H / U _ > HBAR
-
-; n°3: fatha/alif
-H Q? A > HA
-H / A _ Q? a > HBAR
-H / ^[UI] _ Q? a > Ha
-H / a _ Q? ^[UI] > Ha
-
-
-pass(Unicode)
-
-Class [Digits] = (U+0030..U+0039)
-Class [ArDigits] = (U+0660..U+0669)
-Class [ArEasternDigits] = (U+06F0..U+06F9)
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;(a..z A E I O U B N T Y ^ . _ " "" `)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-
-
-
-
-;normal code
-
-
-CO z CO z > U+0636 U+0651 ;;SHADDA
-CO z > U+0636
-(P z|U+1E93) (P z|U+1E93) > U+0638 U+0651 ;;SHADDA
-(P z|U+1E93) > U+0638
-C z C z > U+0698 U+0651 ;;SHADDA
-C z > U+0698
-V z V z > U+0696 U+0651 ;;SHADDA
-V z > U+0696 ;pashto
-z z > U+0632 U+0651 ;;SHADDA
-z > U+0632
-Q Y Y > U+0649 U+0651 ;;SHADDA
-Q Y > U+0649
-Y Y > U+064E U+0649 U+0651 ;;SHADDA
-Y > U+064E U+0649
-;; .b with ring below : FIXME not in Unicode! but U+06EA is a poor replacement:
-P y / # _ # > U+0627 U+06D2 U+06EA
-P y / _ # > U+0649
-P y > U+066E U+06EA
-;; y / _ # > U+0649 ; y final in persian,ottoman,urdu,pashto,kashmiri has no dots
-y y > U+06CC U+0651 ;;SHADDA
-y > U+06CC ; yeh in persian etc. > iso and final shapes have no dots
-v v > U+06A4 U+0651 ;;SHADDA
-v > U+06A4
-W > U+0648 U+0627 ; waw + alif
-C U > U+064F U+0648 U+0653; historical spelling : madda on waw
-C w C w > U+06C9 U+0651 ;;SHADDA
-C w > U+06C9
-CO w CO w > U+06CA U+0651 ;,SHADDA
-CO w > U+06CA
-U A / _ # > U+064F U+0648 U+0627
-Q U [Uw] > U+0648 U+0651 ;;SHADDA
-Q U > U+0648
-U [Uw] > U+064F U+0648 U+0651 ;;SHADDA
-U > U+064F U+0648
-w w > U+0648 U+0651 ;;SHADDA
-w > U+0648
-Q u N? >
-u N > U+064C
-u > U+064F
-V t V t > U+0679 U+0651 ;;SHADDA
-V t > U+0679 ;urdu
-UL (t|s) UL (t|s) > U+062B U+0651 ;;SHADDA
-UL (t|s) > U+062B
-(P t|U+1E6D) (P t|U+1E6D) > U+0637 U+0651 ;;SHADDA
-(P t|U+1E6D) > U+0637
-t t > U+062A U+0651 ;;SHADDA
-t > U+062A
-T T Q AN > U+0629 U+0651 ;;SHADDA
-T Q AN > U+0629
-T AN > U+0629 U+064B
-T T > U+0629 U+0651 ;;SHADDA
-T > U+0629
-C s C s > U+0634 U+0651 ;;SHADDA
-C s > U+0634
-(P s|U+1E63) (P s|U+1E63) > U+0635 U+0651 ;;SHADDA
-(P s|U+1E63) > U+0635
-V s V s > U+069A U+0651 ;;SHADDA
-V s > U+069A ;Pashto
-CO s CO s > U+069B U+0651 ;;SHADDA
-CO s > U+069B ; sin with 3 dots below
-s s > U+0633 U+0651 ;;SHADDA
-s > U+0633
-C r C r > U+06EF U+0651 ;;SHADDA ; missing in ArabTeX <<<
-C r > U+06EF
-CO r CO r > U+0697 U+0651 ;;SHADDA ; missing in ArabTeX <<<
-CO r > U+0697 ; Dargwa language, Dagestan
-P r P r > U+0694 U+0651 ;;SHADDA
-P r > U+0694 ; r with dot below; in Kurdish .r -> 0694
-V r V r > U+0691 U+0651 ;;SHADDA
-V r > U+0691 ;Urdu
-r r > U+0631 U+0651 ;;SHADDA
-r > U+0631
-P q P q > U+066F U+0651 ;;SHADDA
-P q > U+066F
-q q > U+0642 U+0651 ;;SHADDA
-q > U+0642
-p p > U+067E U+0651 ;;SHADDA
-p > U+067E
-CO n CO n > U+06B1 U+0651 ;;SHADDA
-CO n > U+06B1
-C n C n > U+06AD U+0651 ;;SHADDA
-C n > U+06AD
-P n P n > U+06BA U+0651 ;;SHADDA
-P n > U+06BA ; urdu
-V n V n > U+06BC U+0651 ;;SHADDA
-V n > U+06BC ; Pashto
-n n > U+0646 U+0651 ;;SHADDA
-n > U+0646
-m m > U+0645 U+0651 ;;SHADDA
-m > U+0645
-P l P l > U+06B6 U+0651 ;
-P l > U+06B6 ; ADDED <<<
-C l C l > U+06B5 U+0651 ;;SHADDA
-C l > U+06B5 ;kurdish
-l l > U+0644 U+0651 ;;SHADDA
-l > U+0644
-P k P k > U+06A9 U+0651 ;;SHADDA
-P k > U+06A9 ; pashto urdu
-UL k UL k > U+063A U+0651 ;;SHADDA
-UL k > U+063A
-k k > U+0643 U+0651 ;;SHADDA
-k > U+0643
-C g C g > U+062C U+0651 ;;SHADDA
-C g > U+062C
-CO j CO j > U+0684 U+0651 ;;SHADDA
-CO j > U+0684
-j j > U+062C U+0651 ;;SHADDA
-j > U+062C
-Q I > U+064A
-I > U+0650 U+064A
-C I > U+0650 U+064A U+0653 ; historical spelling : madda on ya
-UL I > ; suggestion of O. Smrz (arabtex-plus project) URL = ###
-Q i N? > ;
-i N > U+064D
-i > U+0650
-x x > U+062E U+0651 ;;SHADDA
-x > U+062E
-UL h UL h > U+062E U+0651 ;;SHADDA
-UL h > U+062E
-(P h|U+1E25) (P h|U+1E25) > U+062D U+0651 ;;SHADDA
-(P h|U+1E25) > U+062D
-V h V h > U+06C1 U+0651 ;;SHADDA
-V h > U+06C1
-h h > U+0647 U+0651 ;;SHADDA
-h > U+0647
-CO g CO g > U+06B3 U+0651 ;;SHADDA
-CO g > U+06B3
-V g V g > U+06AC U+0651 ;;SHADDA
-V g > U+06AC ; kaf with dot above
-P g P g > U+063A U+0651 ;;SHADDA
-P g > U+063A
-g g > U+06AF U+0651 ;;SHADDA
-g > U+06AF
-G G > U+06AB U+0651 ;;SHADDA
-G > U+06AB ;pashto
-P f P f > U+06A1 U+0651 ;;SHADDA
-P f > U+06A1
-f f > U+0641 U+0651 ;;SHADDA
-f > U+0641
-V d V d > U+068A U+0651 ;;SHADDA
-V d > U+068A
-P V d P V d > U+068B U+0651 ;;SHADDA
-P V d > U+068B ;; (like U+0688 with dot below, for Lahnda = Western Punjabi)
-C d C d > U+06EE U+0651 ;;SHADDA
-C d > U+06EE ; not defined in ArabTeX
-CO d CO d > U+068F U+0651 ;;SHADDA
-CO d > U+068F
-UL (d|z) UL (d|z) > U+0630 U+0651 ;;SHADDA
-UL (d|z) > U+0630
-(P d|U+1E0D) (P d|U+1E0D) > U+0636 U+0651 ;;SHADDA
-(P d|U+1E0D) > U+0636
-d d > U+062F U+0651 ;;SHADDA
-d > U+062F
-V c V c > U+0685 U+0651 ;;SHADDA
-V c > U+0685 ;pashto
-C c C c > U+0686 U+0651 ;;SHADDA
-C c > U+0686
-P C c P C c > U+06BF U+0651 ;;SHADDA
-P C c > U+06BF ;; cheh with dot above <<<
-c c > U+0681 U+0651 ;;SHADDA
-c > U+0681 ; ح with hamza above
-CO c CO c > U+0682 U+0651 ;;SHADDA
-CO c > U+0682 ; old pashto
-CO b CO b > U+067B U+0651 ;;SHADDA
-CO b > U+067B
-P b P b > U+066E U+0651 ;;SHADDA
-P b > U+066E
-b b > U+0628 U+0651 ;;SHADDA
-b > U+0628
-H A > U+0622
-C A > U+064E U+0622 ; historical spelling
-UL A > U+064E U+0649
-UL a > U+0670
-UL u > U+064F;
-UL i > U+0650;
-Q AN / (A H|Ha) _ > ;
-AN / (A H|Ha) _ > U+064B
-Q AN > U+0627
-AN > U+0627 U+064B
-Q a >
-a > U+064E
-Q A > U+0627
-A > U+064E U+0627
-Ain Ain > U+0639 U+0651 ;;SHADDA
-Ain > U+0639
-H H > U+0621 U+0651 ;;SHADDA
-H > U+0621
-U+002C / [Digits] _ [Digits] > U+002C ; comma in numerical context not an Arabic comma
-Z Z / [Digits] _ [Digits] > U+2013 ; two hyphens in numerical context -> endash
-(Z|U+005D|U+005B|U+0028|U+0029)=xx / [Digits] _ [Digits] > U+202D @xx U+202C ; hyphen or brackets in numerical context: surrounded by LRO & PDF marks
-[Digits] > [ArEasternDigits]
-Z Z Z / # _ # > U+2014
-Z Z / # _ # > U+2013
-Z Z > U+0640
-B > U+0640
-Z / # _ > U+200D ; -x > force initial form with "zero-width joiner"
-Z / _ # > U+200D ; x- > force final form
-U+003C U+003C > U+00BB ;<<
-U+003E U+003E > U+00AB ;>>
-U+00AB > U+00BB
-U+00BB > U+00AB
-UL > U+0640 ;_
-U+003F > U+061F ;?
-U+003B > U+061B ;;
-U+003A U+003A > U+061E ;; '::' ligature 'DOTS' also defined above...
-U+002C > U+060C ;,
-U+005D / [LTR] _ [LTR] > U+200D U+005D U+200D ; keep shaping when inserting ...[...]... ...
-U+005B / [LTR] _ [LTR] > U+200D U+005B U+200D ; (but of course this screws up contextual
- ; analysis, so quoting of hamzas etc may be necessary
-;U+005D > U+005B ;] these are automatically mirrored, following Unicode rules
-;U+005B > U+005D ;[
-Q [VWL] > ;stripoff quoted vowels
-Q > U+0652
-U+00B0 > U+0652 ; °
-N > ;
-C > ;^
-BAR > ;|
-
-pass(Unicode)
-
-Class [CONS] = (U+0621 U+0623 U+0624 U+0626 U+0628 U+062A..U+063A U+0641..U+0647 U+066E U+066F U+0672 U+0675 U+0676 U+0678..U+06BF U+06EE U+06EF U+06FA..U+06FF U+0750..U+076D) ; to be improved: not sure that all glyphs listed (esp for Urdu,Sindhi,etc are really "consonants" in the sense that they can carry a sukun, not to mention that some of these languages may not have a sukun at all ;-)
-Class [VWLX] = (U+0627 U+0648..U+065E U+0670) ; long vowels, vowel signs, shadda, sukun etc.
-Class [VWL] = (U+0627 U+0648..U+0650 U+0670);
-Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kashmiri-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kashmiri-voc.tec
deleted file mode 100644
index 03596e0df92..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kashmiri-voc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kurdish.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kurdish.tec
deleted file mode 100644
index 6e09ac77e56..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kurdish.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-maghribi-fullvoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-maghribi-fullvoc.map
deleted file mode 100644
index 70154d32267..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-maghribi-fullvoc.map
+++ /dev/null
@@ -1,482 +0,0 @@
-LHSName "ArabTeX-maghribi-fullvocalized"
-RHSName "UNICODE"
-
-Define a U+0061 ;a
-Define b U+0062 ;b
-Define c U+0063 ;c
-Define d U+0064 ;d
-Define e U+0065 ;e
-Define f U+0066 ;f
-Define g U+0067 ;g
-Define h U+0068 ;h
-Define i U+0069 ;i
-Define j U+006A ;j
-Define k U+006B ;k
-Define l U+006C ;l
-Define m U+006D ;m
-Define n U+006E ;n
-Define o U+006F ;o
-Define p U+0070 ;p
-Define q U+0071 ;q
-Define r U+0072 ;r
-Define s U+0073 ;s
-Define t U+0074 ;t
-Define u U+0075 ;u
-Define v U+0076 ;v
-Define w U+0077 ;w
-Define x U+0078 ;x
-Define y U+0079 ;y
-Define z U+007A ;z
-Define A U+0041 ;A
-Define B U+0042 ;B
-Define E U+0045 ;E
-Define G U+0047 ;G
-Define I U+0049 ;I
-Define N U+004E ;N
-Define O U+004F ;O
-Define T U+0054 ;T
-Define U U+0055 ;U
-Define W U+0057 ;W
-Define Y U+0059 ;Y
-Define C U+005E ;^ << CARET
-Define UL U+005F ;_ << UNDERLINE
-Define P U+002E ;. << DOT
-Define V U+002C ;, << COMMA (_V_irgule)
-Define CO U+003A ;: << COLON
-Define SC U+003B ;; << SEMICOLON
-Define Ain U+0060 ;`
-Define H U+0027 ;' << HAMZA
-Define Q U+0022 ;" << QUOTE
-Define Z U+002D ;- << HYPHEN
-Define BAR U+007C ;|
-Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
-;Define NUL U+00A6;
-Define Ha U+0623
-Define Hi U+0625
-Define Hy U+0626
-Define Hw U+0624
-Define Hh U+06C0 ;; = U+0647 U+0654
-Define HA U+0622
-Define HB U+0640 U+0654
-Define HBAR U+0621 ; '|
-
-pass(Unicode)
-
-U+E000 > ; eliminate special code for capitalization in transliterations
-
-pass(Unicode)
-
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [AVWL] = (U+064B..U+0650);
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0047 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;a..z A E I O U B N T Y ^ . _ " "" `
-Class [BRACKETS] = (U+003C U+003E U+00AB U+00BB U+0028 U+0029 U+005B U+005D U+2018 U+2019 U+201C U+201D); < > () « » [ ] ‘ ’ “ ”
-Class [PUNCT] = (V SC P CO)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-Class [Uwu] = (U+0055 U+0077 U+0075) ;(U w u)
-;Class [ae] = (U+0061 U+0065) ;(a e)
-;Class [ou] = (U+0075 U+006F) ;(u o)
-Class [Iyi] = (U+0069 U+0079 U+0049)
-Class [UI] = (U+0049 U+0055) ; U I
-Class [Digits] = (U+0030..U+0039)
-
-Define BEG (#|Z|[BRACKETS])
-Define END (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #)
-Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
-
-; special ligatures
-;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
-;; The BAR is used in the DMG transliteration to suppress the initial A
-(a|A) BAR? l Z LLAH > U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+0644 U+0644 U+0647 ;; 'll_ah' -> 'l l h'
-;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
-U+0041 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'ALLAH'
-U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
-
-U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
-U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
-U+0029 U+0029 > U+FD3E ;; '))' : ornate left par
-U+0052 U+0049 U+0059 U+0041 U+004C > U+FDFC ;; 'RIYAL' : Saudi currency sign
-;; most fonts won't have the following ones:
-U+0053 U+0041 U+004C U+004C U+0041 U+0053 U+0054 U+004F U+0050 > U+FDF0 ;; 'SALLASTOP' (.sallY with "ye-barree", Quranic stop sign)
-U+0051 U+0041 U+004C U+0041 > U+FDF1 ;; 'QALA' : qalY with ye-barree, Quranic stop sign
-U+0041 U+004B U+0042 U+0041 U+0052 > U+FDF3 ;; 'AKBAR'
-U+004D U+0055 U+0048 U+0041 U+004D U+004D U+0041 U+0044 > U+FDF4 ;; 'MUHAMMAD'
-U+0053 U+0041 U+004C U+0041 U+004D > U+FDF5 ;; 'SALAM'
-U+0052 U+0041 U+0053 U+004F ? U+0055 U+004C > U+FDF6 ;; 'RASUL' (also unicode 'RASOUL')
-U+0041 U+004C U+0041 U+0059 U+0048 (U+0049|U+0045) > U+FDF7 ;; 'ALAYHI' (also unicode 'ALAYHE')
-U+0057 U+0041 U+0053 U+0041 U+004C U+004C U+0041 U+004D > U+FDF8 ;; 'WASALLAM'
-U+0053 U+0041 U+004C U+004C U+0041 > U+FDF9 ;; 'SALLA'
-U+004A U+0041 U+004C U+004C U+0041 > U+FDFB ;; 'JALLA' : "jalla jalAluhu"
-U+0042 U+0041 U+0053 U+004D U+0041 U+004C U+0041 > U+FDFD ;; 'BASMALA' : very few fonts have this ligature afaik
-
-U+005E U+0053 U+004C U+0059 > U+06D6 ;; ^SLY
-U+005E U+0051 U+004C U+0059 > U+06D7 ;; ^QLY
-U+005E U+004D U+0049 U+004D > U+06D8 ;; ^MIM-
-U+005E U+004C U+0041 > U+06D9 ;; ^LA
-U+005E U+004A U+0049 U+004D > U+06DA ;; ^JIM
-U+005E U+0044 U+004F U+0054 U+0053 > U+06DB ;; ^DOTS
-U+005E U+0053 U+0049 U+004E > U+06DC ;; ^SIN
-U+0048 U+0049 U+005A U+0042 > U+06DE ;; HIZB
-U+0043 U+0049 U+0052 U+0043 U+005A U+0045 U+0052 U+004F > U+06DF ;; CIRCZERO
-U+0052 U+0045 U+0043 U+0054 U+005A U+0045 U+0052 U+004F > U+06E0 ;; RECTZERO
-U+005E U+004A U+0041 U+005A U+004D > U+06E1 ;; ^JAZM
-U+005E U+004D U+0049 U+004D > U+06E2 ;; ^MIM
-U+005F U+0053 U+0049 U+004E > U+06E3 ;; _SIN
-U+005E U+004D U+0041 U+0044 U+0044 U+0041 > U+06E4 ;; ^MADDA
-U+0057 U+0041 U+0057 > U+06E5 ;; WAW
-U+0059 U+0045 U+0048 > U+06E6 ;; YEH
-U+005E U+0059 U+0045 U+0048 > U+06E7 ;; ^YEH
-U+005E U+004E U+0055 U+004E > U+06E8 ;; ^NUN
-U+0053 U+0041 U+004A U+0044 U+0041 > U+06E9 ;; SAJDA
-U+005F U+0053 U+0054 U+004F U+0050 > U+06EA ;; _STOP
-U+005E U+0053 U+0054 U+004F U+0050 > U+06EB ;; ^STOP
-U+005E U+0052 U+0053 U+0054 U+004F U+0050 > U+06EC ;; ^RSTOP
-U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
-
-U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
-
-
-; vowels
-u u > U
-i i > I
-a a > A
-CO O > U+06FC ;
-a e > a y
-a o > a w
-CO U > U+06C7 ;
-e > i ;; but not pashto > U+0659 and kashmiri > y + U+0658 (U+06CE is kurdish)
-o > u
-E > I
-O > U
-
-
-
-;; initial characters ...
-a l Z / BEG _ > U+0627 l Z
-H l Z / BEG _ > U+0671 l Z ; THIS IS NOT AN ARABTEX CONVENTION! it's a work-around coz pattern-matching across word boundaries does not work in teckit , so min al- must be written mina 'l- in fullvocalize mode
-;; wasla on initial alif : NEW! NOT TESTED!
-[VWL]=v1 Z / BEG _ > @v1 U+0671 ; THIS IS NOT AN ARABTEX CONVENTION! it's a work-around coz pattern-matching across word boundaries does not work in teckit , so huwa irtifA` must be written huwa i-rtifA` in fullvocalize mode
-H / BEG _ l l > U+0671 ; e.g. alla_dI -> 'lla_dI
-[VWL]=v1 / BEG _ > U+0627 @v1
-A / BEG _ > U+0627 a
-Q?=q1 U / BEG _ > U+0627 @q1 u w ; -U
-; Q?=q1 I / BEG _ > U+0627 @q1 i y ; -I
-Q?=q1 I / BEG _ > U+0627 @q1 i y
-
-
-;; Words with anomalous orthography:
-
-; mi'aT -> ماية
-;;; i H / m Q ? _ Q ? a ? (T|t) > i A Hy
-m Q i H Q a / _ (T|t) > m U+0627 Hy
-m Q i H a / _ (T|t) > m U+0627 Hy a
-m i H Q a / _ (T|t) > m i U+0627 Hy
-m i H a / _ (T|t) > m i U+0627 Hy a
-
-
-;; contextual analysis of hamzas
-;; THESE DO NOT APPLY FOR SINDHI
-
-; initial hamzas
-H / (#|^[LTR]) _ Q? [Iyi] > Hi
-H Q A / (#|^[LTR]) _ > HA ; alif madda
-H / (#|^[LTR]) _ Q? [Uwu] > Ha
-H / (#|^[LTR]) _ Q? a > Ha
-Q H / (#|^[LTR]) _ > HB ; quoted isolated hamza at beginning of word
-
-; quoted hamzas in contextual mode, equivalent to verbatim mode
-a Q H > Ha
-i Q H > Hi
-y Q H > Hy
-w Q H > Hw
-h Q H > Hh
-A Q H > HA
-B Q H > HB
-BAR Q H > HBAR
-
-; hamza + fathatan
-H / a _ Q? AN > Ha
-;;H / [Iyi] _ Q? AN > Hy
-H / _ Q? AN > Hy
-
-;final hamzas
-H / A _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Uw] _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Iy] _ Q? (i N?|u N?)? (#|^[LTR]) > HBAR ; not AN ...
-H / a _ Q? (#|^[LTR]) > Ha ; not AN...
-H / a _ Q? (u|i) N? (#|^[LTR]) > Ha ; not AN...
-H / i _ Q? [VWL]? N? (#|^[LTR]) > Hy
-H / u _ Q? [VWL]? N? (#|^[LTR]) > Hw
-
-;;and more hamzas ...
-
-; n°1: kasra/ya
-H / [LTR] _ Q? [Iyi] ^N > Hy
-H / [Iyi] _ > Hy
-
-; n°2: damma/waw
-H / [LTR] _ Q? (U|u) ^N > Hw
-H / (U|u) _ Q? ^[Iyi] > Hw
-H / U _ > HBAR
-
-; n°3: fatha/alif
-H Q? A > HA
-H / A _ Q? a > HBAR
-H / ^[UI] _ Q? a > Ha
-H / a _ Q? ^[UI] > Ha
-
-
-pass(Unicode)
-
-Class [Digits] = (U+0030..U+0039)
-Class [ArDigits] = (U+0660..U+0669)
-Class [ArEasternDigits] = (U+06F0..U+06F9)
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;(a..z A E I O U B N T Y ^ . _ " "" `)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-
-
-
-
-;normal code
-
-
-(P z|U+1E93) (P z|U+1E93) > U+0638 U+0651 ;;SHADDA
-(P z|U+1E93) > U+0638
-C z C z > U+0698 U+0651 ;;SHADDA
-C z > U+0698
-V z V z > U+0696 U+0651 ;;SHADDA
-V z > U+0696 ;pashto
-z z > U+0632 U+0651 ;;SHADDA
-z > U+0632
-Q Y Y > U+0649 U+0651 ;;SHADDA
-Q Y > U+0649
-Y Y > U+064E U+0649 U+0651 ;;SHADDA
-Y > U+064E U+0649
-P I P I / _ # > U+0650 U+06CC U+0651 ;; SHADDA
-P I / _ # > U+0650 U+06CC ;; workaround to have ya without dots in Arabic
-y y > U+064A U+0651 ;;SHADDA
-y > U+064A
-v v > U+06A5 U+0651 ;;SHADDA
-v > U+06A5 ;; maghribi
-W > U+0648 U+0627 ; waw + alif
-C U > U+064F U+0648 U+0653; historical spelling : madda on waw
-C w C w > U+06C9 U+0651 ;;SHADDA
-C w > U+06C9
-CO w CO w > U+06CA U+0651 ;,SHADDA
-CO w > U+06CA
-U A / _ # > U+064F U+0648 U+0627
-Q U [Uw] > U+0648 U+0651 ;;SHADDA
-Q U > U+0648
-U [Uw] > U+064F U+0648 U+0651 ;;SHADDA
-U > U+064F U+0648
-w w > U+0648 U+0651 ;;SHADDA
-w > U+0648
-Q u N? >
-u N > U+064C
-u > U+064F
-V t V t > U+0679 U+0651 ;;SHADDA
-V t > U+0679 ;urdu
-UL (t|s) UL (t|s) > U+062B U+0651 ;;SHADDA
-UL (t|s) > U+062B
-(P t|U+1E6D) (P t|U+1E6D) > U+0637 U+0651 ;;SHADDA
-(P t|U+1E6D) > U+0637
-t t > U+062A U+0651 ;;SHADDA
-t > U+062A
-T T Q AN > U+0629 U+0651 ;;SHADDA
-T Q AN > U+0629
-T AN > U+0629 U+064B
-T T > U+0629 U+0651 ;;SHADDA
-T > U+0629
-C s C s > U+0634 U+0651 ;;SHADDA
-C s > U+0634
-(P s|U+1E63) (P s|U+1E63) > U+0635 U+0651 ;;SHADDA
-(P s|U+1E63) > U+0635
-V s V s > U+069A U+0651 ;;SHADDA
-V s > U+069A ;Pashto
-CO s CO s > U+069B U+0651 ;;SHADDA
-CO s > U+069B ; sin with 3 dots below
-s s > U+0633 U+0651 ;;SHADDA
-s > U+0633
-C r C r > U+06EF U+0651 ;;SHADDA ; missing in ArabTeX <<<
-C r > U+06EF
-CO r CO r > U+0697 U+0651 ;;SHADDA ; missing in ArabTeX <<<
-CO r > U+0697 ; Dargwa language, Dagestan
-P r P r > U+0694 U+0651 ;;SHADDA
-P r > U+0694 ; r with dot below; in Kurdish .r -> 0694
-V r V r > U+0691 U+0651 ;;SHADDA
-V r > U+0691 ;Urdu
-r r > U+0631 U+0651 ;;SHADDA
-r > U+0631
-P q P q > U+066F U+0651 ;;SHADDA
-P q > U+066F
-q q > U+06A7 U+0651 ;; maghribi
-q > U+06A7 ;; maghribi
-p p > U+067E U+0651 ;;SHADDA
-p > U+067E
-CO n CO n > U+06B1 U+0651 ;;SHADDA
-CO n > U+06B1
-C n C n > U+06AD U+0651 ;;SHADDA
-C n > U+06AD
-P n P n > U+06BA U+0651 ;;SHADDA
-P n > U+06BA ; urdu
-V n V n > U+06BC U+0651 ;;SHADDA
-V n > U+06BC ; Pashto
-n n > U+0646 U+0651 ;;SHADDA
-n > U+0646
-m m > U+0645 U+0651 ;;SHADDA
-m > U+0645
-P l P l > U+06B6 U+0651 ;
-P l > U+06B6 ; ADDED <<<
-C l C l > U+06B5 U+0651 ;;SHADDA
-C l > U+06B5 ;kurdish
-l l > U+0644 U+0651 ;;SHADDA
-l > U+0644
-P k P k > U+06A9 U+0651 ;;SHADDA
-P k > U+06A9 ; pashto urdu
-UL k UL k > U+063A U+0651 ;;SHADDA
-UL k > U+063A
-k k > U+0643 U+0651 ;;SHADDA
-k > U+0643
-C g C g > U+062C U+0651 ;;SHADDA
-C g > U+062C
-CO j CO j > U+0684 U+0651 ;;SHADDA
-CO j > U+0684
-j j > U+062C U+0651 ;;SHADDA
-j > U+062C
-Q I > U+064A
-I > U+0650 U+064A
-C I > U+0650 U+064A U+0653 ; historical spelling : madda on ya
-UL I > ; suggestion of O. Smrz (arabtex-plus project) URL = ###
-Q i N? > ;
-i N > U+064D
-i > U+0650
-x x > U+062E U+0651 ;;SHADDA
-x > U+062E
-UL h UL h > U+062E U+0651 ;;SHADDA
-UL h > U+062E
-(P h|U+1E25) (P h|U+1E25) > U+062D U+0651 ;;SHADDA
-(P h|U+1E25) > U+062D
-V h V h > U+06C1 U+0651 ;;SHADDA
-V h > U+06C1
-h h > U+0647 U+0651 ;;SHADDA
-h > U+0647
-CO g CO g > U+06B3 U+0651 ;;SHADDA
-CO g > U+06B3
-V g V g > U+06AC U+0651 ;;SHADDA
-V g > U+06AC ; kaf with dot above
-P g P g > U+063A U+0651 ;;SHADDA
-P g > U+063A
-g g > U+06AF U+0651 ;;SHADDA
-g > U+06AF
-G G > U+06AB U+0651 ;;SHADDA
-G > U+06AB ;pashto
-P f P f > U+06A1 U+0651 ;;SHADDA
-P f > U+06A1
-f f > U+06A2 U+0651 ;; SHADDA
-f > U+06A2 ;; maghribi
-V d V d > U+068A U+0651 ;;SHADDA
-V d > U+068A
-P V d P V d > U+068B U+0651 ;;SHADDA
-P V d > U+068B ;; (like U+0688 with dot below, for Lahnda = Western Punjabi)
-C d C d > U+06EE U+0651 ;;SHADDA
-C d > U+06EE ; not defined in ArabTeX
-CO d CO d > U+068F U+0651 ;;SHADDA
-CO d > U+068F
-UL (d|z) UL (d|z) > U+0630 U+0651 ;;SHADDA
-UL (d|z) > U+0630
-(P d|U+1E0D) (P d|U+1E0D) > U+0636 U+0651 ;;SHADDA
-(P d|U+1E0D) > U+0636
-d d > U+062F U+0651 ;;SHADDA
-d > U+062F
-V c V c > U+0685 U+0651 ;;SHADDA
-V c > U+0685 ;pashto
-C c C c > U+0686 U+0651 ;;SHADDA
-C c > U+0686
-P C c P C c > U+06BF U+0651 ;;SHADDA
-P C c > U+06BF ;; cheh with dot above <<<
-c c > U+0681 U+0651 ;;SHADDA
-c > U+0681 ; ح with hamza above
-CO c CO c > U+0682 U+0651 ;;SHADDA
-CO c > U+0682 ; old pashto
-CO b CO b > U+067B U+0651 ;;SHADDA
-CO b > U+067B
-P b P b > U+066E U+0651 ;;SHADDA
-P b > U+066E
-b b > U+0628 U+0651 ;;SHADDA
-b > U+0628
-H A > U+0622
-C A > U+064E U+0622 ; historical spelling
-UL A > U+064E U+0649
-UL a > U+0670
-UL u > U+0657 ; inverted damma
-UL i > U+0656 ; subscript alif
-Q AN / (A H|Ha) _ > ;
-AN / (A H|Ha) _ > U+064B
-Q AN > U+0627
-AN > U+0627 U+064B
-Q a >
-a > U+064E
-Q A > U+0627
-A > U+064E U+0627
-Ain Ain > U+0639 U+0651 ;;SHADDA
-Ain > U+0639
-H H > U+0621 U+0651 ;;SHADDA
-H > U+0621
-U+002C / [Digits] _ [Digits] > U+002C ; comma in numerical context not an Arabic comma
-Z Z / [Digits] _ [Digits] > U+2013 ; two hyphens in numerical context -> endash
-(Z|U+005D|U+005B|U+0028|U+0029)=xx / [Digits] _ [Digits] > U+202D @xx U+202C ; hyphen or brackets in numerical context: surrounded by LRO & PDF marks
-[Digits] > [ArDigits]
-Z Z Z / # _ # > U+2014
-Z Z / # _ # > U+2013
-Z Z > U+0640
-B > U+0640
-Z / # _ > U+200D ; -x > force initial form with "zero-width joiner"
-Z / _ # > U+200D ; x- > force final form
-U+003C U+003C > U+00BB ;<<
-U+003E U+003E > U+00AB ;>>
-U+00AB > U+00BB
-U+00BB > U+00AB
-UL > U+0640 ;_
-U+003F > U+061F ;?
-U+003B > U+061B ;;
-U+003A U+003A > U+061E ;; '::' ligature 'DOTS' also defined above...
-U+002C > U+060C ;,
-U+005D / [LTR] _ [LTR] > U+200D U+005D U+200D ; keep shaping when inserting ...[...]... ...
-U+005B / [LTR] _ [LTR] > U+200D U+005B U+200D ; (but of course this screws up contextual
- ; analysis, so quoting of hamzas etc may be necessary
-;U+005D > U+005B ;] these are automatically mirrored, following Unicode rules
-;U+005B > U+005D ;[
-Q [VWL] > ;stripoff quoted vowels
-U+00B0 > U+0652 ; °
-N > ;
-C > ;^
-BAR > ;|
-
-pass(Unicode)
-
-Class [CONS] = (U+0621 U+0623 U+0624 U+0626 U+0628 U+062A..U+063A U+0641..U+0647 U+066E U+066F U+0672 U+0675 U+0676 U+0678..U+06BF U+06EE U+06EF U+06FA..U+06FF U+0750..U+076D) ; to be improved: not sure that all glyphs listed (esp for Urdu,Sindhi,etc are really "consonants" in the sense that they can carry a sukun, not to mention that some of these languages may not have a sukun at all ;-)
-Class [VWLX] = (U+0627 U+0648..U+065E U+0670) ; long vowels, vowel signs, shadda, sukun etc.
-Class [VWL] = (U+0627 U+0648..U+0650 U+0670);
-[CONS]=k1 / _ Z? [CONS] ^U+0651 > @k1 U+0652 ; hack: 2nd consonant has no shadda
-U+064E (U+064A|U+0648)=hc / _ (^[VWLX]|#) > U+064E @hc U+0652 ; ay and aw diphtongs
-U+0627 [VWL]? / [VWL] Z _ > U+0671 ; e.g. fa-isti_hraj -> wasla on initial alif
-U+0627 / # _ U+0644 > U+0627 U+064E ; otherwise initial alif takes fatha
-[CONS]=k1 / _ ([CONS]|#) > @k1 U+0652 ; consonant + (consonant or final)
-;; [CONS]=k1 / _ # > @k1 U+0652 ; final consonant
-Q > ;
-Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-maghribi-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-maghribi-fullvoc.tec
deleted file mode 100644
index f475104efeb..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-maghribi-fullvoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-maghribi-novoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-maghribi-novoc.map
deleted file mode 100644
index 237c45ab8e6..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-maghribi-novoc.map
+++ /dev/null
@@ -1,465 +0,0 @@
-LHSName "ArabTeX-maghribi-novowels"
-RHSName "UNICODE"
-
-Define a U+0061 ;a
-Define b U+0062 ;b
-Define c U+0063 ;c
-Define d U+0064 ;d
-Define e U+0065 ;e
-Define f U+0066 ;f
-Define g U+0067 ;g
-Define h U+0068 ;h
-Define i U+0069 ;i
-Define j U+006A ;j
-Define k U+006B ;k
-Define l U+006C ;l
-Define m U+006D ;m
-Define n U+006E ;n
-Define o U+006F ;o
-Define p U+0070 ;p
-Define q U+0071 ;q
-Define r U+0072 ;r
-Define s U+0073 ;s
-Define t U+0074 ;t
-Define u U+0075 ;u
-Define v U+0076 ;v
-Define w U+0077 ;w
-Define x U+0078 ;x
-Define y U+0079 ;y
-Define z U+007A ;z
-Define A U+0041 ;A
-Define B U+0042 ;B
-Define E U+0045 ;E
-Define G U+0047 ;G
-Define I U+0049 ;I
-Define N U+004E ;N
-Define O U+004F ;O
-Define T U+0054 ;T
-Define U U+0055 ;U
-Define W U+0057 ;W
-Define Y U+0059 ;Y
-Define C U+005E ;^ << CARET
-Define UL U+005F ;_ << UNDERLINE
-Define P U+002E ;. << DOT
-Define V U+002C ;, << COMMA (_V_irgule)
-Define CO U+003A ;: << COLON
-Define SC U+003B ;; << SEMICOLON
-Define Ain U+0060 ;`
-Define H U+0027 ;' << HAMZA
-Define Q U+0022 ;" << QUOTE
-Define Z U+002D ;- << HYPHEN
-Define BAR U+007C ;|
-Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
-;Define NUL U+00A6;
-Define Ha U+0623
-Define Hi U+0625
-Define Hy U+0626
-Define Hw U+0624
-Define Hh U+06C0 ;; = U+0647 U+0654
-Define HA U+0622
-Define HB U+0640 U+0654
-Define HBAR U+0621 ; '|
-
-pass(Unicode)
-
-U+E000 > ; eliminate special code for capitalization in transliterations
-
-pass(Unicode)
-
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [AVWL] = (U+064B..U+0650);
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0047 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;a..z A E I O U B N T Y ^ . _ " "" `
-Class [BRACKETS] = (U+003C U+003E U+00AB U+00BB U+0028 U+0029 U+005B U+005D U+2018 U+2019 U+201C U+201D); < > () « » [ ] ‘ ’ “ ”
-Class [PUNCT] = (V SC P CO)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-Class [Uwu] = (U+0055 U+0077 U+0075) ;(U w u)
-;Class [ae] = (U+0061 U+0065) ;(a e)
-;Class [ou] = (U+0075 U+006F) ;(u o)
-Class [Iyi] = (U+0069 U+0079 U+0049)
-Class [UI] = (U+0049 U+0055) ; U I
-Class [Digits] = (U+0030..U+0039)
-
-Define BEG (#|Z|[BRACKETS])
-Define END (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #)
-Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
-
-; special ligatures
-;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
-;; The BAR is used in the DMG transliteration to suppress the initial A
-(a|A) BAR? l Z LLAH > U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+0644 U+0644 U+0647 ;; 'll_ah' -> 'l l h'
-;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
-U+0041 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'ALLAH'
-U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
-
-U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
-U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
-U+0029 U+0029 > U+FD3E ;; '))' : ornate left par
-U+0052 U+0049 U+0059 U+0041 U+004C > U+FDFC ;; 'RIYAL' : Saudi currency sign
-;; most fonts won't have the following ones:
-U+0053 U+0041 U+004C U+004C U+0041 U+0053 U+0054 U+004F U+0050 > U+FDF0 ;; 'SALLASTOP' (.sallY with "ye-barree", Quranic stop sign)
-U+0051 U+0041 U+004C U+0041 > U+FDF1 ;; 'QALA' : qalY with ye-barree, Quranic stop sign
-U+0041 U+004B U+0042 U+0041 U+0052 > U+FDF3 ;; 'AKBAR'
-U+004D U+0055 U+0048 U+0041 U+004D U+004D U+0041 U+0044 > U+FDF4 ;; 'MUHAMMAD'
-U+0053 U+0041 U+004C U+0041 U+004D > U+FDF5 ;; 'SALAM'
-U+0052 U+0041 U+0053 U+004F ? U+0055 U+004C > U+FDF6 ;; 'RASUL' (also unicode 'RASOUL')
-U+0041 U+004C U+0041 U+0059 U+0048 (U+0049|U+0045) > U+FDF7 ;; 'ALAYHI' (also unicode 'ALAYHE')
-U+0057 U+0041 U+0053 U+0041 U+004C U+004C U+0041 U+004D > U+FDF8 ;; 'WASALLAM'
-U+0053 U+0041 U+004C U+004C U+0041 > U+FDF9 ;; 'SALLA'
-U+004A U+0041 U+004C U+004C U+0041 > U+FDFB ;; 'JALLA' : "jalla jalAluhu"
-U+0042 U+0041 U+0053 U+004D U+0041 U+004C U+0041 > U+FDFD ;; 'BASMALA' : very few fonts have this ligature afaik
-
-U+005E U+0053 U+004C U+0059 > U+06D6 ;; ^SLY
-U+005E U+0051 U+004C U+0059 > U+06D7 ;; ^QLY
-U+005E U+004D U+0049 U+004D > U+06D8 ;; ^MIM-
-U+005E U+004C U+0041 > U+06D9 ;; ^LA
-U+005E U+004A U+0049 U+004D > U+06DA ;; ^JIM
-U+005E U+0044 U+004F U+0054 U+0053 > U+06DB ;; ^DOTS
-U+005E U+0053 U+0049 U+004E > U+06DC ;; ^SIN
-U+0048 U+0049 U+005A U+0042 > U+06DE ;; HIZB
-U+0043 U+0049 U+0052 U+0043 U+005A U+0045 U+0052 U+004F > U+06DF ;; CIRCZERO
-U+0052 U+0045 U+0043 U+0054 U+005A U+0045 U+0052 U+004F > U+06E0 ;; RECTZERO
-U+005E U+004A U+0041 U+005A U+004D > U+06E1 ;; ^JAZM
-U+005E U+004D U+0049 U+004D > U+06E2 ;; ^MIM
-U+005F U+0053 U+0049 U+004E > U+06E3 ;; _SIN
-U+005E U+004D U+0041 U+0044 U+0044 U+0041 > U+06E4 ;; ^MADDA
-U+0057 U+0041 U+0057 > U+06E5 ;; WAW
-U+0059 U+0045 U+0048 > U+06E6 ;; YEH
-U+005E U+0059 U+0045 U+0048 > U+06E7 ;; ^YEH
-U+005E U+004E U+0055 U+004E > U+06E8 ;; ^NUN
-U+0053 U+0041 U+004A U+0044 U+0041 > U+06E9 ;; SAJDA
-U+005F U+0053 U+0054 U+004F U+0050 > U+06EA ;; _STOP
-U+005E U+0053 U+0054 U+004F U+0050 > U+06EB ;; ^STOP
-U+005E U+0052 U+0053 U+0054 U+004F U+0050 > U+06EC ;; ^RSTOP
-U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
-
-U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
-
-
-; vowels
-u u > U
-i i > I
-a a > A
-[AVWL] > ; strip off vowels when writing UTF-8 Arabic with novoc mode
-CO O > U+06FC ;
-a e > a y
-a o > a w
-CO U > U+06C7 ;
-e > i ;; but not pashto > U+0659 and kashmiri > y + U+0658 (U+06CE is kurdish)
-o > u
-E > I
-O > U
-
-
-
-;; initial characters ...
-a l Z / BEG _ > U+0627 l Z
-H l Z / BEG _ > U+0627 l Z
-;; wasla on initial alif : NEW! NOT TESTED!
-H / BEG _ l l > U+0627 ;
-[VWL]=v1 / BEG _ > A @v1
-A / BEG _ > A a
-Q?=q1 U / BEG _ > A @q1 u w ; -U
-; Q?=q1 I / BEG _ > A @q1 i y ; -I ; but not when I is final FIXME!!!
-Q?=q1 I / BEG _ > A @q1 i y ; except for Persian, coz of ezafe rules
-
-
-;; Words with anomalous orthography:
-
-; mi'aT -> ماية
-;;; i H / m Q ? _ Q ? a ? (T|t) > i A Hy
-m Q i H Q a / _ (T|t) > m Q i A Hy Q a
-m Q i H a / _ (T|t) > m Q i A Hy
-m i H Q a / _ (T|t) > m A Hy Q a
-m i H a / _ (T|t) > m A Hy
-
-
-;; contextual analysis of hamzas
-;; THESE DO NOT APPLY FOR SINDHI
-
-; initial hamzas
-H / (#|^[LTR]) _ Q? [Iyi] > Hi
-H Q A / (#|^[LTR]) _ > HA ; alif madda
-H / (#|^[LTR]) _ Q? [Uwu] > Ha
-H / (#|^[LTR]) _ Q? a > Ha
-Q H / (#|^[LTR]) _ > HB ; quoted isolated hamza at beginning of word
-
-; quoted hamzas in contextual mode, equivalent to verbatim mode
-a Q H > Ha
-i Q H > Hi
-y Q H > Hy
-w Q H > Hw
-h Q H > Hh
-A Q H > HA
-B Q H > HB
-BAR Q H > HBAR
-
-; hamza + fathatan
-H / a _ Q? AN > Ha
-;;H / [Iyi] _ Q? AN > Hy
-H / _ Q? AN > Hy
-
-;final hamzas
-H / A _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Uw] _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Iy] _ Q? (i N?|u N?)? (#|^[LTR]) > HBAR ; not AN ...
-H / a _ Q? (#|^[LTR]) > Ha ; not AN...
-H / a _ Q? (u|i) N? (#|^[LTR]) > Ha ; not AN...
-H / i _ Q? [VWL]? N? (#|^[LTR]) > Hy
-H / u _ Q? [VWL]? N? (#|^[LTR]) > Hw
-
-;;and more hamzas ...
-
-; n°1: kasra/ya
-H / [LTR] _ Q? [Iyi] ^N > Hy
-H / [Iyi] _ > Hy
-
-; n°2: damma/waw
-H / [LTR] _ Q? (U|u) ^N > Hw
-H / (U|u) _ Q? ^[Iyi] > Hw
-H / U _ > HBAR
-
-; n°3: fatha/alif
-H Q? A > HA
-H / A _ Q? a > HBAR
-H / ^[UI] _ Q? a > Ha
-H / a _ Q? ^[UI] > Ha
-
-
-pass(Unicode)
-
-Class [Digits] = (U+0030..U+0039)
-Class [ArDigits] = (U+0660..U+0669)
-Class [ArEasternDigits] = (U+06F0..U+06F9)
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;(a..z A E I O U B N T Y ^ . _ " "" `)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-
-
-
-
-;normal code
-
-
-(P z|U+1E93) (P z|U+1E93) > U+0638 U+0651 ;;SHADDA
-(P z|U+1E93) > U+0638
-C z C z > U+0698 U+0651 ;;SHADDA
-C z > U+0698
-V z V z > U+0696 U+0651 ;;SHADDA
-V z > U+0696 ;pashto
-z z > U+0632 U+0651 ;;SHADDA
-z > U+0632
-Y Y > U+0649 U+0651 ;;SHADDA
-Y > U+0649
-P I P I / _ # > U+06CC U+0651 ;; SHADDA
-P I / _ # > U+06CC ;; workaround to have ya without dots in Arabic
-y y > U+064A U+0651 ;;SHADDA
-y > U+064A
-v v > U+06A5 U+0651 ;;SHADDA
-v > U+06A5 ;; maghribi
-W > U+0648 U+0627 ; waw + alif
-C U > U+064F U+0648 U+0653; historical spelling : madda on waw
-Q U [Uw] > U+064F U+0648 U+0651 ;;SHADDA
-Q U > U+064F U+0648
-[Uw] [Uw] > U+0648 U+0651 ;;SHADDA
-[Uw] > U+0648
-C w C w > U+06C9 U+0651 ;;SHADDA
-C w > U+06C9
-CO w CO w > U+06CA U+0651 ;,SHADDA
-CO w > U+06CA
-Q u N > U+064C
-u N >
-Q u > U+064F
-V t V t > U+0679 U+0651 ;;SHADDA
-V t > U+0679 ;urdu
-UL (t|s) UL (t|s) > U+062B U+0651 ;;SHADDA
-UL (t|s) > U+062B
-(P t|U+1E6D) (P t|U+1E6D) > U+0637 U+0651 ;;SHADDA
-(P t|U+1E6D) > U+0637
-t t > U+062A U+0651 ;;SHADDA
-t > U+062A
-T T Q AN > U+0629 U+0651 U+064B ;;SHADDA
-T Q AN > U+0629 U+064B
-T AN > U+0629
-T T > U+0629 U+0651 ;;SHADDA
-T > U+0629
-C s C s > U+0634 U+0651 ;;SHADDA
-C s > U+0634
-(P s|U+1E63) (P s|U+1E63) > U+0635 U+0651 ;;SHADDA
-(P s|U+1E63) > U+0635
-V s V s > U+069A U+0651 ;;SHADDA
-V s > U+069A ;Pashto
-CO s CO s > U+069B U+0651 ;;SHADDA
-CO s > U+069B ; sin with 3 dots below
-s s > U+0633 U+0651 ;;SHADDA
-s > U+0633
-C r C r > U+06EF U+0651 ;;SHADDA ; missing in ArabTeX <<<
-C r > U+06EF
-CO r CO r > U+0697 U+0651 ;;SHADDA ; missing in ArabTeX <<<
-CO r > U+0697 ; Dargwa language, Dagestan
-P r P r > U+0694 U+0651 ;;SHADDA
-P r > U+0694 ; r with dot below; in Kurdish .r -> 0694
-V r V r > U+0691 U+0651 ;;SHADDA
-V r > U+0691 ;Urdu
-r r > U+0631 U+0651 ;;SHADDA
-r > U+0631
-P q P q > U+066F U+0651 ;;SHADDA
-P q > U+066F
-q q > U+06A7 U+0651 ;; maghribi
-q > U+06A7 ;; maghribi
-p p > U+067E U+0651 ;;SHADDA
-p > U+067E
-CO n CO n > U+06B1 U+0651 ;;SHADDA
-CO n > U+06B1
-C n C n > U+06AD U+0651 ;;SHADDA
-C n > U+06AD
-P n P n > U+06BA U+0651 ;;SHADDA
-P n > U+06BA ; urdu
-V n V n > U+06BC U+0651 ;;SHADDA
-V n > U+06BC ; Pashto
-n n > U+0646 U+0651 ;;SHADDA
-n > U+0646
-m m > U+0645 U+0651 ;;SHADDA
-m > U+0645
-P l P l > U+06B6 U+0651 ;
-P l > U+06B6 ; ADDED <<<
-C l C l > U+06B5 U+0651 ;;SHADDA
-C l > U+06B5 ;kurdish
-l l > U+0644 U+0651 ;;SHADDA
-l > U+0644
-P k P k > U+06A9 U+0651 ;;SHADDA
-P k > U+06A9 ; pashto urdu
-UL k UL k > U+063A U+0651 ;;SHADDA
-UL k > U+063A
-k k > U+0643 U+0651 ;;SHADDA
-k > U+0643
-C g C g > U+062C U+0651 ;;SHADDA
-C g > U+062C
-CO j CO j > U+0684 U+0651 ;;SHADDA
-CO j > U+0684
-j j > U+062C U+0651 ;;SHADDA
-j > U+062C
-Q I > U+0650 U+064A
-C I > U+0650 U+064A U+0653 ; historical spelling : madda on ya
-UL I > ; suggestion of O. Smrz (arabtex-plus project) URL = ###
-I > U+064A
-Q i N > U+064D
-i N > ;
-Q i > U+0650
-x x > U+062E U+0651 ;;SHADDA
-x > U+062E
-UL h UL h > U+062E U+0651 ;;SHADDA
-UL h > U+062E
-(P h|U+1E25) (P h|U+1E25) > U+062D U+0651 ;;SHADDA
-(P h|U+1E25) > U+062D
-V h V h > U+06C1 U+0651 ;;SHADDA
-V h > U+06C1
-h h > U+0647 U+0651 ;;SHADDA
-h > U+0647
-CO g CO g > U+06B3 U+0651 ;;SHADDA
-CO g > U+06B3
-V g V g > U+06AC U+0651 ;;SHADDA
-V g > U+06AC ; kaf with dot above
-P g P g > U+063A U+0651 ;;SHADDA
-P g > U+063A
-g g > U+06AF U+0651 ;;SHADDA
-g > U+06AF
-G G > U+06AB U+0651 ;;SHADDA
-G > U+06AB ;pashto
-P f P f > U+06A1 U+0651 ;;SHADDA
-P f > U+06A1
-f f > U+06A2 U+0651 ;; SHADDA
-f > U+06A2 ;; maghribi
-V d V d > U+068A U+0651 ;;SHADDA
-V d > U+068A
-P V d P V d > U+068B U+0651 ;;SHADDA
-P V d > U+068B ;; (like U+0688 with dot below, for Lahnda = Western Punjabi)
-C d C d > U+06EE U+0651 ;;SHADDA
-C d > U+06EE ; not defined in ArabTeX
-CO d CO d > U+068F U+0651 ;;SHADDA
-CO d > U+068F
-UL (d|z) UL (d|z) > U+0630 U+0651 ;;SHADDA
-UL (d|z) > U+0630
-(P d|U+1E0D) (P d|U+1E0D) > U+0636 U+0651 ;;SHADDA
-(P d|U+1E0D) > U+0636
-d d > U+062F U+0651 ;;SHADDA
-d > U+062F
-V c V c > U+0685 U+0651 ;;SHADDA
-V c > U+0685 ;pashto
-C c C c > U+0686 U+0651 ;;SHADDA
-C c > U+0686
-P C c P C c > U+06BF U+0651 ;;SHADDA
-P C c > U+06BF ;; cheh with dot above <<<
-c c > U+0681 U+0651 ;;SHADDA
-c > U+0681 ; ح with hamza above
-CO c CO c > U+0682 U+0651 ;;SHADDA
-CO c > U+0682 ; old pashto
-CO b CO b > U+067B U+0651 ;;SHADDA
-CO b > U+067B
-P b P b > U+066E U+0651 ;;SHADDA
-P b > U+066E
-b b > U+0628 U+0651 ;;SHADDA
-b > U+0628
-H A > U+0622
-C A > U+064E U+0622 ; historical spelling
-UL A > U+0649
-UL a > U+0670
-UL u > U+0657 ; inverted damma
-UL i > U+0656 ; subscript alif
-Q AN / (A H|Ha) _ > U+064B
-AN / (A H|Ha) _ > ;
-Q AN > U+0627 U+064B
-AN > U+0627
-Q a > U+064E
-Q A > U+064E U+0627
-A > U+0627
-Ain Ain > U+0639 U+0651 ;;SHADDA
-Ain > U+0639
-H H > U+0621 U+0651 ;;SHADDA
-H > U+0621
-U+002C / [Digits] _ [Digits] > U+002C ; comma in numerical context not an Arabic comma
-Z Z / [Digits] _ [Digits] > U+2013 ; two hyphens in numerical context -> endash
-(Z|U+005D|U+005B|U+0028|U+0029)=xx / [Digits] _ [Digits] > U+202D @xx U+202C ; hyphen or brackets in numerical context: surrounded by LRO & PDF marks
-[Digits] > [ArDigits]
-Z Z Z / # _ # > U+2014
-Z Z / # _ # > U+2013
-Z Z > U+0640
-B > U+0640
-Z / # _ > U+200D ; -x > force initial form with "zero-width joiner"
-Z / _ # > U+200D ; x- > force final form
-U+003C U+003C > U+00BB ;<<
-U+003E U+003E > U+00AB ;>>
-U+00AB > U+00BB
-U+00BB > U+00AB
-UL > U+0640 ;_
-U+003F > U+061F ;?
-U+003B > U+061B ;;
-U+003A U+003A > U+061E ;; '::' ligature 'DOTS' also defined above...
-U+002C > U+060C ;,
-U+005D / [LTR] _ [LTR] > U+200D U+005D U+200D ; keep shaping when inserting ...[...]... ...
-U+005B / [LTR] _ [LTR] > U+200D U+005B U+200D ; (but of course this screws up contextual
- ; analysis, so quoting of hamzas etc may be necessary
-;U+005D > U+005B ;] these are automatically mirrored, following Unicode rules
-;U+005B > U+005D ;[
-[VWL] > ;stripoff vowels
-Q > U+0652
-U+00B0 > U+0652 ; °
-N > ;
-C > ;^
-Z > ;-
-BAR > ;|
-
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-maghribi-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-maghribi-novoc.tec
deleted file mode 100644
index 2bc13123142..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-maghribi-novoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-maghribi-voc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-maghribi-voc.map
deleted file mode 100644
index c85d129e046..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-maghribi-voc.map
+++ /dev/null
@@ -1,476 +0,0 @@
-LHSName "ArabTeX-maghribi-vocalized"
-RHSName "UNICODE"
-
-Define a U+0061 ;a
-Define b U+0062 ;b
-Define c U+0063 ;c
-Define d U+0064 ;d
-Define e U+0065 ;e
-Define f U+0066 ;f
-Define g U+0067 ;g
-Define h U+0068 ;h
-Define i U+0069 ;i
-Define j U+006A ;j
-Define k U+006B ;k
-Define l U+006C ;l
-Define m U+006D ;m
-Define n U+006E ;n
-Define o U+006F ;o
-Define p U+0070 ;p
-Define q U+0071 ;q
-Define r U+0072 ;r
-Define s U+0073 ;s
-Define t U+0074 ;t
-Define u U+0075 ;u
-Define v U+0076 ;v
-Define w U+0077 ;w
-Define x U+0078 ;x
-Define y U+0079 ;y
-Define z U+007A ;z
-Define A U+0041 ;A
-Define B U+0042 ;B
-Define E U+0045 ;E
-Define G U+0047 ;G
-Define I U+0049 ;I
-Define N U+004E ;N
-Define O U+004F ;O
-Define T U+0054 ;T
-Define U U+0055 ;U
-Define W U+0057 ;W
-Define Y U+0059 ;Y
-Define C U+005E ;^ << CARET
-Define UL U+005F ;_ << UNDERLINE
-Define P U+002E ;. << DOT
-Define V U+002C ;, << COMMA (_V_irgule)
-Define CO U+003A ;: << COLON
-Define SC U+003B ;; << SEMICOLON
-Define Ain U+0060 ;`
-Define H U+0027 ;' << HAMZA
-Define Q U+0022 ;" << QUOTE
-Define Z U+002D ;- << HYPHEN
-Define BAR U+007C ;|
-Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
-;Define NUL U+00A6;
-Define Ha U+0623
-Define Hi U+0625
-Define Hy U+0626
-Define Hw U+0624
-Define Hh U+06C0 ;; = U+0647 U+0654
-Define HA U+0622
-Define HB U+0640 U+0654
-Define HBAR U+0621 ; '|
-
-pass(Unicode)
-
-U+E000 > ; eliminate special code for capitalization in transliterations
-
-pass(Unicode)
-
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [AVWL] = (U+064B..U+0650);
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0047 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;a..z A E I O U B N T Y ^ . _ " "" `
-Class [BRACKETS] = (U+003C U+003E U+00AB U+00BB U+0028 U+0029 U+005B U+005D U+2018 U+2019 U+201C U+201D); < > () « » [ ] ‘ ’ “ ”
-Class [PUNCT] = (V SC P CO)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-Class [Uwu] = (U+0055 U+0077 U+0075) ;(U w u)
-;Class [ae] = (U+0061 U+0065) ;(a e)
-;Class [ou] = (U+0075 U+006F) ;(u o)
-Class [Iyi] = (U+0069 U+0079 U+0049)
-Class [UI] = (U+0049 U+0055) ; U I
-Class [Digits] = (U+0030..U+0039)
-
-Define BEG (#|Z|[BRACKETS])
-Define END (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #)
-Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
-
-; special ligatures
-;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
-;; The BAR is used in the DMG transliteration to suppress the initial A
-(a|A) BAR? l Z LLAH > U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+0644 U+0644 U+0647 ;; 'll_ah' -> 'l l h'
-;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
-U+0041 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'ALLAH'
-U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
-
-U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
-U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
-U+0029 U+0029 > U+FD3E ;; '))' : ornate left par
-U+0052 U+0049 U+0059 U+0041 U+004C > U+FDFC ;; 'RIYAL' : Saudi currency sign
-;; most fonts won't have the following ones:
-U+0053 U+0041 U+004C U+004C U+0041 U+0053 U+0054 U+004F U+0050 > U+FDF0 ;; 'SALLASTOP' (.sallY with "ye-barree", Quranic stop sign)
-U+0051 U+0041 U+004C U+0041 > U+FDF1 ;; 'QALA' : qalY with ye-barree, Quranic stop sign
-U+0041 U+004B U+0042 U+0041 U+0052 > U+FDF3 ;; 'AKBAR'
-U+004D U+0055 U+0048 U+0041 U+004D U+004D U+0041 U+0044 > U+FDF4 ;; 'MUHAMMAD'
-U+0053 U+0041 U+004C U+0041 U+004D > U+FDF5 ;; 'SALAM'
-U+0052 U+0041 U+0053 U+004F ? U+0055 U+004C > U+FDF6 ;; 'RASUL' (also unicode 'RASOUL')
-U+0041 U+004C U+0041 U+0059 U+0048 (U+0049|U+0045) > U+FDF7 ;; 'ALAYHI' (also unicode 'ALAYHE')
-U+0057 U+0041 U+0053 U+0041 U+004C U+004C U+0041 U+004D > U+FDF8 ;; 'WASALLAM'
-U+0053 U+0041 U+004C U+004C U+0041 > U+FDF9 ;; 'SALLA'
-U+004A U+0041 U+004C U+004C U+0041 > U+FDFB ;; 'JALLA' : "jalla jalAluhu"
-U+0042 U+0041 U+0053 U+004D U+0041 U+004C U+0041 > U+FDFD ;; 'BASMALA' : very few fonts have this ligature afaik
-
-U+005E U+0053 U+004C U+0059 > U+06D6 ;; ^SLY
-U+005E U+0051 U+004C U+0059 > U+06D7 ;; ^QLY
-U+005E U+004D U+0049 U+004D > U+06D8 ;; ^MIM-
-U+005E U+004C U+0041 > U+06D9 ;; ^LA
-U+005E U+004A U+0049 U+004D > U+06DA ;; ^JIM
-U+005E U+0044 U+004F U+0054 U+0053 > U+06DB ;; ^DOTS
-U+005E U+0053 U+0049 U+004E > U+06DC ;; ^SIN
-U+0048 U+0049 U+005A U+0042 > U+06DE ;; HIZB
-U+0043 U+0049 U+0052 U+0043 U+005A U+0045 U+0052 U+004F > U+06DF ;; CIRCZERO
-U+0052 U+0045 U+0043 U+0054 U+005A U+0045 U+0052 U+004F > U+06E0 ;; RECTZERO
-U+005E U+004A U+0041 U+005A U+004D > U+06E1 ;; ^JAZM
-U+005E U+004D U+0049 U+004D > U+06E2 ;; ^MIM
-U+005F U+0053 U+0049 U+004E > U+06E3 ;; _SIN
-U+005E U+004D U+0041 U+0044 U+0044 U+0041 > U+06E4 ;; ^MADDA
-U+0057 U+0041 U+0057 > U+06E5 ;; WAW
-U+0059 U+0045 U+0048 > U+06E6 ;; YEH
-U+005E U+0059 U+0045 U+0048 > U+06E7 ;; ^YEH
-U+005E U+004E U+0055 U+004E > U+06E8 ;; ^NUN
-U+0053 U+0041 U+004A U+0044 U+0041 > U+06E9 ;; SAJDA
-U+005F U+0053 U+0054 U+004F U+0050 > U+06EA ;; _STOP
-U+005E U+0053 U+0054 U+004F U+0050 > U+06EB ;; ^STOP
-U+005E U+0052 U+0053 U+0054 U+004F U+0050 > U+06EC ;; ^RSTOP
-U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
-
-U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
-
-
-; vowels
-u u > U
-i i > I
-a a > A
-CO O > U+06FC ;
-a e > a y
-a o > a w
-CO U > U+06C7 ;
-e > i ;; but not pashto > U+0659 and kashmiri > y + U+0658 (U+06CE is kurdish)
-o > u
-E > I
-O > U
-
-
-
-;; initial characters ...
-a l Z / BEG _ > U+0627 l Z
-H l Z / BEG _ > U+0627 l Z
-;; wasla on initial alif : NEW! NOT TESTED!
-H / BEG _ l l > U+0671 ; e.g. alla_dI -> 'lla_dI
-[VWL]=v1 / BEG _ > U+0627 @v1
-A / BEG _ > U+0627 a
-Q?=q1 U / BEG _ > U+0627 @q1 u w ; -U
-; Q?=q1 I / BEG _ > U+0627 @q1 i y ; -I
-Q?=q1 I / BEG _ > U+0627 @q1 i y
-
-
-;; Words with anomalous orthography:
-
-; mi'aT -> ماية
-;;; i H / m Q ? _ Q ? a ? (T|t) > i A Hy
-m Q i H Q a / _ (T|t) > m U+0627 Hy
-m Q i H a / _ (T|t) > m U+0627 Hy a
-m i H Q a / _ (T|t) > m i U+0627 Hy
-m i H a / _ (T|t) > m i U+0627 Hy a
-
-
-;; contextual analysis of hamzas
-;; THESE DO NOT APPLY FOR SINDHI
-
-; initial hamzas
-H / (#|^[LTR]) _ Q? [Iyi] > Hi
-H Q A / (#|^[LTR]) _ > HA ; alif madda
-H / (#|^[LTR]) _ Q? [Uwu] > Ha
-H / (#|^[LTR]) _ Q? a > Ha
-Q H / (#|^[LTR]) _ > HB ; quoted isolated hamza at beginning of word
-
-; quoted hamzas in contextual mode, equivalent to verbatim mode
-a Q H > Ha
-i Q H > Hi
-y Q H > Hy
-w Q H > Hw
-h Q H > Hh
-A Q H > HA
-B Q H > HB
-BAR Q H > HBAR
-
-; hamza + fathatan
-H / a _ Q? AN > Ha
-;;H / [Iyi] _ Q? AN > Hy
-H / _ Q? AN > Hy
-
-;final hamzas
-H / A _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Uw] _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Iy] _ Q? (i N?|u N?)? (#|^[LTR]) > HBAR ; not AN ...
-H / a _ Q? (#|^[LTR]) > Ha ; not AN...
-H / a _ Q? (u|i) N? (#|^[LTR]) > Ha ; not AN...
-H / i _ Q? [VWL]? N? (#|^[LTR]) > Hy
-H / u _ Q? [VWL]? N? (#|^[LTR]) > Hw
-
-;;and more hamzas ...
-
-; n°1: kasra/ya
-H / [LTR] _ Q? [Iyi] ^N > Hy
-H / [Iyi] _ > Hy
-
-; n°2: damma/waw
-H / [LTR] _ Q? (U|u) ^N > Hw
-H / (U|u) _ Q? ^[Iyi] > Hw
-H / U _ > HBAR
-
-; n°3: fatha/alif
-H Q? A > HA
-H / A _ Q? a > HBAR
-H / ^[UI] _ Q? a > Ha
-H / a _ Q? ^[UI] > Ha
-
-
-pass(Unicode)
-
-Class [Digits] = (U+0030..U+0039)
-Class [ArDigits] = (U+0660..U+0669)
-Class [ArEasternDigits] = (U+06F0..U+06F9)
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;(a..z A E I O U B N T Y ^ . _ " "" `)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-
-
-
-
-;normal code
-
-
-(P z|U+1E93) (P z|U+1E93) > U+0638 U+0651 ;;SHADDA
-(P z|U+1E93) > U+0638
-C z C z > U+0698 U+0651 ;;SHADDA
-C z > U+0698
-V z V z > U+0696 U+0651 ;;SHADDA
-V z > U+0696 ;pashto
-z z > U+0632 U+0651 ;;SHADDA
-z > U+0632
-Q Y Y > U+0649 U+0651 ;;SHADDA
-Q Y > U+0649
-Y Y > U+064E U+0649 U+0651 ;;SHADDA
-Y > U+064E U+0649
-P I P I / _ # > U+0650 U+06CC U+0651 ;; SHADDA
-P I / _ # > U+0650 U+06CC ;; workaround to have ya without dots in Arabic
-y y > U+064A U+0651 ;;SHADDA
-y > U+064A
-v v > U+06A5 U+0651 ;;SHADDA
-v > U+06A5 ;; maghribi
-W > U+0648 U+0627 ; waw + alif
-C U > U+064F U+0648 U+0653; historical spelling : madda on waw
-C w C w > U+06C9 U+0651 ;;SHADDA
-C w > U+06C9
-CO w CO w > U+06CA U+0651 ;,SHADDA
-CO w > U+06CA
-U A / _ # > U+064F U+0648 U+0627
-Q U [Uw] > U+0648 U+0651 ;;SHADDA
-Q U > U+0648
-U [Uw] > U+064F U+0648 U+0651 ;;SHADDA
-U > U+064F U+0648
-w w > U+0648 U+0651 ;;SHADDA
-w > U+0648
-Q u N? >
-u N > U+064C
-u > U+064F
-V t V t > U+0679 U+0651 ;;SHADDA
-V t > U+0679 ;urdu
-UL (t|s) UL (t|s) > U+062B U+0651 ;;SHADDA
-UL (t|s) > U+062B
-(P t|U+1E6D) (P t|U+1E6D) > U+0637 U+0651 ;;SHADDA
-(P t|U+1E6D) > U+0637
-t t > U+062A U+0651 ;;SHADDA
-t > U+062A
-T T Q AN > U+0629 U+0651 ;;SHADDA
-T Q AN > U+0629
-T AN > U+0629 U+064B
-T T > U+0629 U+0651 ;;SHADDA
-T > U+0629
-C s C s > U+0634 U+0651 ;;SHADDA
-C s > U+0634
-(P s|U+1E63) (P s|U+1E63) > U+0635 U+0651 ;;SHADDA
-(P s|U+1E63) > U+0635
-V s V s > U+069A U+0651 ;;SHADDA
-V s > U+069A ;Pashto
-CO s CO s > U+069B U+0651 ;;SHADDA
-CO s > U+069B ; sin with 3 dots below
-s s > U+0633 U+0651 ;;SHADDA
-s > U+0633
-C r C r > U+06EF U+0651 ;;SHADDA ; missing in ArabTeX <<<
-C r > U+06EF
-CO r CO r > U+0697 U+0651 ;;SHADDA ; missing in ArabTeX <<<
-CO r > U+0697 ; Dargwa language, Dagestan
-P r P r > U+0694 U+0651 ;;SHADDA
-P r > U+0694 ; r with dot below; in Kurdish .r -> 0694
-V r V r > U+0691 U+0651 ;;SHADDA
-V r > U+0691 ;Urdu
-r r > U+0631 U+0651 ;;SHADDA
-r > U+0631
-P q P q > U+066F U+0651 ;;SHADDA
-P q > U+066F
-q q > U+06A7 U+0651 ;; maghribi
-q > U+06A7 ;; maghribi
-p p > U+067E U+0651 ;;SHADDA
-p > U+067E
-CO n CO n > U+06B1 U+0651 ;;SHADDA
-CO n > U+06B1
-C n C n > U+06AD U+0651 ;;SHADDA
-C n > U+06AD
-P n P n > U+06BA U+0651 ;;SHADDA
-P n > U+06BA ; urdu
-V n V n > U+06BC U+0651 ;;SHADDA
-V n > U+06BC ; Pashto
-n n > U+0646 U+0651 ;;SHADDA
-n > U+0646
-m m > U+0645 U+0651 ;;SHADDA
-m > U+0645
-P l P l > U+06B6 U+0651 ;
-P l > U+06B6 ; ADDED <<<
-C l C l > U+06B5 U+0651 ;;SHADDA
-C l > U+06B5 ;kurdish
-l l > U+0644 U+0651 ;;SHADDA
-l > U+0644
-P k P k > U+06A9 U+0651 ;;SHADDA
-P k > U+06A9 ; pashto urdu
-UL k UL k > U+063A U+0651 ;;SHADDA
-UL k > U+063A
-k k > U+0643 U+0651 ;;SHADDA
-k > U+0643
-C g C g > U+062C U+0651 ;;SHADDA
-C g > U+062C
-CO j CO j > U+0684 U+0651 ;;SHADDA
-CO j > U+0684
-j j > U+062C U+0651 ;;SHADDA
-j > U+062C
-Q I > U+064A
-I > U+0650 U+064A
-C I > U+0650 U+064A U+0653 ; historical spelling : madda on ya
-UL I > ; suggestion of O. Smrz (arabtex-plus project) URL = ###
-Q i N? > ;
-i N > U+064D
-i > U+0650
-x x > U+062E U+0651 ;;SHADDA
-x > U+062E
-UL h UL h > U+062E U+0651 ;;SHADDA
-UL h > U+062E
-(P h|U+1E25) (P h|U+1E25) > U+062D U+0651 ;;SHADDA
-(P h|U+1E25) > U+062D
-V h V h > U+06C1 U+0651 ;;SHADDA
-V h > U+06C1
-h h > U+0647 U+0651 ;;SHADDA
-h > U+0647
-CO g CO g > U+06B3 U+0651 ;;SHADDA
-CO g > U+06B3
-V g V g > U+06AC U+0651 ;;SHADDA
-V g > U+06AC ; kaf with dot above
-P g P g > U+063A U+0651 ;;SHADDA
-P g > U+063A
-g g > U+06AF U+0651 ;;SHADDA
-g > U+06AF
-G G > U+06AB U+0651 ;;SHADDA
-G > U+06AB ;pashto
-P f P f > U+06A1 U+0651 ;;SHADDA
-P f > U+06A1
-f f > U+06A2 U+0651 ;; SHADDA
-f > U+06A2 ;; maghribi
-V d V d > U+068A U+0651 ;;SHADDA
-V d > U+068A
-P V d P V d > U+068B U+0651 ;;SHADDA
-P V d > U+068B ;; (like U+0688 with dot below, for Lahnda = Western Punjabi)
-C d C d > U+06EE U+0651 ;;SHADDA
-C d > U+06EE ; not defined in ArabTeX
-CO d CO d > U+068F U+0651 ;;SHADDA
-CO d > U+068F
-UL (d|z) UL (d|z) > U+0630 U+0651 ;;SHADDA
-UL (d|z) > U+0630
-(P d|U+1E0D) (P d|U+1E0D) > U+0636 U+0651 ;;SHADDA
-(P d|U+1E0D) > U+0636
-d d > U+062F U+0651 ;;SHADDA
-d > U+062F
-V c V c > U+0685 U+0651 ;;SHADDA
-V c > U+0685 ;pashto
-C c C c > U+0686 U+0651 ;;SHADDA
-C c > U+0686
-P C c P C c > U+06BF U+0651 ;;SHADDA
-P C c > U+06BF ;; cheh with dot above <<<
-c c > U+0681 U+0651 ;;SHADDA
-c > U+0681 ; ح with hamza above
-CO c CO c > U+0682 U+0651 ;;SHADDA
-CO c > U+0682 ; old pashto
-CO b CO b > U+067B U+0651 ;;SHADDA
-CO b > U+067B
-P b P b > U+066E U+0651 ;;SHADDA
-P b > U+066E
-b b > U+0628 U+0651 ;;SHADDA
-b > U+0628
-H A > U+0622
-C A > U+064E U+0622 ; historical spelling
-UL A > U+064E U+0649
-UL a > U+0670
-UL u > U+0657 ; inverted damma
-UL i > U+0656 ; subscript alif
-Q AN / (A H|Ha) _ > ;
-AN / (A H|Ha) _ > U+064B
-Q AN > U+0627
-AN > U+0627 U+064B
-Q a >
-a > U+064E
-Q A > U+0627
-A > U+064E U+0627
-Ain Ain > U+0639 U+0651 ;;SHADDA
-Ain > U+0639
-H H > U+0621 U+0651 ;;SHADDA
-H > U+0621
-U+002C / [Digits] _ [Digits] > U+002C ; comma in numerical context not an Arabic comma
-Z Z / [Digits] _ [Digits] > U+2013 ; two hyphens in numerical context -> endash
-(Z|U+005D|U+005B|U+0028|U+0029)=xx / [Digits] _ [Digits] > U+202D @xx U+202C ; hyphen or brackets in numerical context: surrounded by LRO & PDF marks
-[Digits] > [ArDigits]
-Z Z Z / # _ # > U+2014
-Z Z / # _ # > U+2013
-Z Z > U+0640
-B > U+0640
-Z / # _ > U+200D ; -x > force initial form with "zero-width joiner"
-Z / _ # > U+200D ; x- > force final form
-U+003C U+003C > U+00BB ;<<
-U+003E U+003E > U+00AB ;>>
-U+00AB > U+00BB
-U+00BB > U+00AB
-UL > U+0640 ;_
-U+003F > U+061F ;?
-U+003B > U+061B ;;
-U+003A U+003A > U+061E ;; '::' ligature 'DOTS' also defined above...
-U+002C > U+060C ;,
-U+005D / [LTR] _ [LTR] > U+200D U+005D U+200D ; keep shaping when inserting ...[...]... ...
-U+005B / [LTR] _ [LTR] > U+200D U+005B U+200D ; (but of course this screws up contextual
- ; analysis, so quoting of hamzas etc may be necessary
-;U+005D > U+005B ;] these are automatically mirrored, following Unicode rules
-;U+005B > U+005D ;[
-Q [VWL] > ;stripoff quoted vowels
-Q > U+0652
-U+00B0 > U+0652 ; °
-N > ;
-C > ;^
-BAR > ;|
-
-pass(Unicode)
-
-Class [CONS] = (U+0621 U+0623 U+0624 U+0626 U+0628 U+062A..U+063A U+0641..U+0647 U+066E U+066F U+0672 U+0675 U+0676 U+0678..U+06BF U+06EE U+06EF U+06FA..U+06FF U+0750..U+076D) ; to be improved: not sure that all glyphs listed (esp for Urdu,Sindhi,etc are really "consonants" in the sense that they can carry a sukun, not to mention that some of these languages may not have a sukun at all ;-)
-Class [VWLX] = (U+0627 U+0648..U+065E U+0670) ; long vowels, vowel signs, shadda, sukun etc.
-Class [VWL] = (U+0627 U+0648..U+0650 U+0670);
-U+0627 [VWL]? / [VWL] Z _ > U+0627 ; e.g. fa-isti_hraj -> initial alif has no vowel
-Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-maghribi-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-maghribi-voc.tec
deleted file mode 100644
index 5b4893b492a..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-maghribi-voc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-malay-fullvoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-malay-fullvoc.map
deleted file mode 100644
index ff1726ac820..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-malay-fullvoc.map
+++ /dev/null
@@ -1,485 +0,0 @@
-LHSName "ArabTeX-malay-fullvocalized"
-RHSName "UNICODE"
-
-Define a U+0061 ;a
-Define b U+0062 ;b
-Define c U+0063 ;c
-Define d U+0064 ;d
-Define e U+0065 ;e
-Define f U+0066 ;f
-Define g U+0067 ;g
-Define h U+0068 ;h
-Define i U+0069 ;i
-Define j U+006A ;j
-Define k U+006B ;k
-Define l U+006C ;l
-Define m U+006D ;m
-Define n U+006E ;n
-Define o U+006F ;o
-Define p U+0070 ;p
-Define q U+0071 ;q
-Define r U+0072 ;r
-Define s U+0073 ;s
-Define t U+0074 ;t
-Define u U+0075 ;u
-Define v U+0076 ;v
-Define w U+0077 ;w
-Define x U+0078 ;x
-Define y U+0079 ;y
-Define z U+007A ;z
-Define A U+0041 ;A
-Define B U+0042 ;B
-Define E U+0045 ;E
-Define G U+0047 ;G
-Define I U+0049 ;I
-Define N U+004E ;N
-Define O U+004F ;O
-Define T U+0054 ;T
-Define U U+0055 ;U
-Define W U+0057 ;W
-Define Y U+0059 ;Y
-Define C U+005E ;^ << CARET
-Define UL U+005F ;_ << UNDERLINE
-Define P U+002E ;. << DOT
-Define V U+002C ;, << COMMA (_V_irgule)
-Define CO U+003A ;: << COLON
-Define SC U+003B ;; << SEMICOLON
-Define Ain U+0060 ;`
-Define H U+0027 ;' << HAMZA
-Define Q U+0022 ;" << QUOTE
-Define Z U+002D ;- << HYPHEN
-Define BAR U+007C ;|
-Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
-;Define NUL U+00A6;
-Define Ha U+0623
-Define Hi U+0625
-Define Hy U+0626
-Define Hw U+0624
-Define Hh U+06C0 ;; = U+0647 U+0654
-Define HA U+0622
-Define HB U+0640 U+0654
-Define HBAR U+0621 ; '|
-
-pass(Unicode)
-
-U+E000 > ; eliminate special code for capitalization in transliterations
-
-pass(Unicode)
-
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [AVWL] = (U+064B..U+0650);
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0047 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;a..z A E I O U B N T Y ^ . _ " "" `
-Class [BRACKETS] = (U+003C U+003E U+00AB U+00BB U+0028 U+0029 U+005B U+005D U+2018 U+2019 U+201C U+201D); < > () « » [ ] ‘ ’ “ ”
-Class [PUNCT] = (V SC P CO)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-Class [Uwu] = (U+0055 U+0077 U+0075) ;(U w u)
-;Class [ae] = (U+0061 U+0065) ;(a e)
-;Class [ou] = (U+0075 U+006F) ;(u o)
-Class [Iyi] = (U+0069 U+0079 U+0049)
-Class [UI] = (U+0049 U+0055) ; U I
-Class [Digits] = (U+0030..U+0039)
-
-Define BEG (#|Z|[BRACKETS])
-Define END (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #)
-Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
-
-; special ligatures
-;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
-;; The BAR is used in the DMG transliteration to suppress the initial A
-(a|A) BAR? l Z LLAH > U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+0644 U+0644 U+0647 ;; 'll_ah' -> 'l l h'
-;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
-U+0041 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'ALLAH'
-U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
-
-U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
-U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
-U+0029 U+0029 > U+FD3E ;; '))' : ornate left par
-U+0052 U+0049 U+0059 U+0041 U+004C > U+FDFC ;; 'RIYAL' : Saudi currency sign
-;; most fonts won't have the following ones:
-U+0053 U+0041 U+004C U+004C U+0041 U+0053 U+0054 U+004F U+0050 > U+FDF0 ;; 'SALLASTOP' (.sallY with "ye-barree", Quranic stop sign)
-U+0051 U+0041 U+004C U+0041 > U+FDF1 ;; 'QALA' : qalY with ye-barree, Quranic stop sign
-U+0041 U+004B U+0042 U+0041 U+0052 > U+FDF3 ;; 'AKBAR'
-U+004D U+0055 U+0048 U+0041 U+004D U+004D U+0041 U+0044 > U+FDF4 ;; 'MUHAMMAD'
-U+0053 U+0041 U+004C U+0041 U+004D > U+FDF5 ;; 'SALAM'
-U+0052 U+0041 U+0053 U+004F ? U+0055 U+004C > U+FDF6 ;; 'RASUL' (also unicode 'RASOUL')
-U+0041 U+004C U+0041 U+0059 U+0048 (U+0049|U+0045) > U+FDF7 ;; 'ALAYHI' (also unicode 'ALAYHE')
-U+0057 U+0041 U+0053 U+0041 U+004C U+004C U+0041 U+004D > U+FDF8 ;; 'WASALLAM'
-U+0053 U+0041 U+004C U+004C U+0041 > U+FDF9 ;; 'SALLA'
-U+004A U+0041 U+004C U+004C U+0041 > U+FDFB ;; 'JALLA' : "jalla jalAluhu"
-U+0042 U+0041 U+0053 U+004D U+0041 U+004C U+0041 > U+FDFD ;; 'BASMALA' : very few fonts have this ligature afaik
-
-U+005E U+0053 U+004C U+0059 > U+06D6 ;; ^SLY
-U+005E U+0051 U+004C U+0059 > U+06D7 ;; ^QLY
-U+005E U+004D U+0049 U+004D > U+06D8 ;; ^MIM-
-U+005E U+004C U+0041 > U+06D9 ;; ^LA
-U+005E U+004A U+0049 U+004D > U+06DA ;; ^JIM
-U+005E U+0044 U+004F U+0054 U+0053 > U+06DB ;; ^DOTS
-U+005E U+0053 U+0049 U+004E > U+06DC ;; ^SIN
-U+0048 U+0049 U+005A U+0042 > U+06DE ;; HIZB
-U+0043 U+0049 U+0052 U+0043 U+005A U+0045 U+0052 U+004F > U+06DF ;; CIRCZERO
-U+0052 U+0045 U+0043 U+0054 U+005A U+0045 U+0052 U+004F > U+06E0 ;; RECTZERO
-U+005E U+004A U+0041 U+005A U+004D > U+06E1 ;; ^JAZM
-U+005E U+004D U+0049 U+004D > U+06E2 ;; ^MIM
-U+005F U+0053 U+0049 U+004E > U+06E3 ;; _SIN
-U+005E U+004D U+0041 U+0044 U+0044 U+0041 > U+06E4 ;; ^MADDA
-U+0057 U+0041 U+0057 > U+06E5 ;; WAW
-U+0059 U+0045 U+0048 > U+06E6 ;; YEH
-U+005E U+0059 U+0045 U+0048 > U+06E7 ;; ^YEH
-U+005E U+004E U+0055 U+004E > U+06E8 ;; ^NUN
-U+0053 U+0041 U+004A U+0044 U+0041 > U+06E9 ;; SAJDA
-U+005F U+0053 U+0054 U+004F U+0050 > U+06EA ;; _STOP
-U+005E U+0053 U+0054 U+004F U+0050 > U+06EB ;; ^STOP
-U+005E U+0052 U+0053 U+0054 U+004F U+0050 > U+06EC ;; ^RSTOP
-U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
-
-U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
-
-
-; vowels
-u u > U
-i i > I
-a a > A
-CO O > U+06FC ;
-a e > a y
-a o > a w
-CO U > U+06C7 ;
-e > i ;; but not pashto > U+0659 and kashmiri > y + U+0658 (U+06CE is kurdish)
-o > u
-
-
-;; Persian ezafe (ALL BUT ARABIC AND UIGHUR)
-U+0048 Z UL? (Q? (i|e))=vv / _ END > U+06C0 @vv U+200C ;H-i -> heh+hamza final; what about 06C2 in Urdu ?<<<
-U+0048 Z Q?=qq (I|E)=vv / _ END > h U+0020 U+0627 @qq i @vv ; H-I
-Q?=q1 (I|E) Z UL? Q?=q2 (i|e) / _ END > @q1 i U+0626 @q2 i U+200C ; ...I-e
-Z Q?=qq I / (A|U) _ ENDZ > U+0626 @qq i y ; ...A-I or ...U-I
-Z UL? (Q? (i|e))=vv / (A|U) _ END > U+0649 @vv ; ...A-i or ...U-i
-Z Q?=q1 (e|i) / _ ENDZ > @q1 i ; ...-i
-Z / U+0048 _ > U+0020 ;
-b Q?=q1 (e|i) Q?=q2 U / # _ > b @q1 i U+0627 @q2 u w ;; special case of prep be without hyphen
-
-;; initial characters ...
-a l Z / BEG _ > U+0627 l Z
-;; wasla on initial alif : NEW! NOT TESTED!
-H / BEG _ l l > U+0671 ; e.g. alla_dI -> 'lla_dI
-[VWL]=v1 / BEG _ > U+0627 @v1
-Q?=q1 U / BEG _ > U+0627 @q1 u w ; -U
-; Q?=q1 I / BEG _ > U+0627 @q1 i y ; -I
-Q?=q1 I / BEG _ > U+0627 @q1 i y
-
-
-;; Words with anomalous orthography:
-
-; mi'aT -> ماية
-;;; i H / m Q ? _ Q ? a ? (T|t) > i A Hy
-m Q i H Q a / _ (T|t) > m U+0627 Hy
-m Q i H a / _ (T|t) > m U+0627 Hy a
-m i H Q a / _ (T|t) > m i U+0627 Hy
-m i H a / _ (T|t) > m i U+0627 Hy a
-
-
-;; contextual analysis of hamzas
-;; THESE DO NOT APPLY FOR SINDHI
-
-; initial hamzas
-H / (#|^[LTR]) _ Q? [Iyi] > Hi
-H Q A / (#|^[LTR]) _ > HA ; alif madda
-H / (#|^[LTR]) _ Q? [Uwu] > Ha
-H / (#|^[LTR]) _ Q? a > Ha
-Q H / (#|^[LTR]) _ > HB ; quoted isolated hamza at beginning of word
-
-; quoted hamzas in contextual mode, equivalent to verbatim mode
-a Q H > Ha
-i Q H > Hi
-y Q H > Hy
-w Q H > Hw
-h Q H > Hh
-A Q H > HA
-B Q H > HB
-BAR Q H > HBAR
-
-; hamza + fathatan
-H / a _ Q? AN > Ha
-;;H / [Iyi] _ Q? AN > Hy
-H / _ Q? AN > Hy
-
-;final hamzas
-H / A _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Uw] _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Iy] _ Q? (i N?|u N?)? (#|^[LTR]) > HBAR ; not AN ...
-H / a _ Q? (#|^[LTR]) > Ha ; not AN...
-H / a _ Q? (u|i) N? (#|^[LTR]) > Ha ; not AN...
-H / i _ Q? [VWL]? N? (#|^[LTR]) > Hy
-H / u _ Q? [VWL]? N? (#|^[LTR]) > Hw
-
-;;and more hamzas ...
-
-; n°1: kasra/ya
-H / [LTR] _ Q? [Iyi] ^N > Hy
-H / [Iyi] _ > Hy
-
-; n°2: damma/waw
-H / [LTR] _ Q? (U|u) ^N > Hw
-H / (U|u) _ Q? ^[Iyi] > Hw
-H / U _ > HBAR
-
-; n°3: fatha/alif
-H Q? A > HA
-H / A _ Q? a > HBAR
-H / ^[UI] _ Q? a > Ha
-H / a _ Q? ^[UI] > Ha
-
-
-pass(Unicode)
-
-Class [Digits] = (U+0030..U+0039)
-Class [ArDigits] = (U+0660..U+0669)
-Class [ArEasternDigits] = (U+06F0..U+06F9)
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;(a..z A E I O U B N T Y ^ . _ " "" `)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-
-
-
-
-;normal code
-
-
-(P z|U+1E93) (P z|U+1E93) > U+0638 U+0651 ;;SHADDA
-(P z|U+1E93) > U+0638
-C z C z > U+0698 U+0651 ;;SHADDA
-C z > U+0698
-V z V z > U+0696 U+0651 ;;SHADDA
-V z > U+0696 ;pashto
-z z > U+0632 U+0651 ;;SHADDA
-z > U+0632
-Q Y Y > U+0649 U+0651 ;;SHADDA
-Q Y > U+0649
-Y Y > U+064E U+0649 U+0651 ;;SHADDA
-Y > U+064E U+0649
-P I P I / _ # > U+0650 U+06CC U+0651 ;; SHADDA
-P I / _ # > U+0650 U+06CC ;; workaround to have ya without dots in Arabic
-y y > U+064A U+0651 ;;SHADDA
-y > U+064A
-v v > U+06CF U+0651 ;;SHADDA
-v > U+06CF
-W > U+0648 U+0627 ; waw + alif
-C U > U+064F U+0648 U+0653; historical spelling : madda on waw
-C w C w > U+06C9 U+0651 ;;SHADDA
-C w > U+06C9
-CO w CO w > U+06CA U+0651 ;,SHADDA
-CO w > U+06CA
-U A / _ # > U+064F U+0648 U+0627
-Q U [Uw] > U+0648 U+0651 ;;SHADDA
-Q U > U+0648
-U [Uw] > U+064F U+0648 U+0651 ;;SHADDA
-U > U+064F U+0648
-w w > U+0648 U+0651 ;;SHADDA
-w > U+0648
-Q u N? >
-u N > U+064C
-u > U+064F
-V t V t > U+0679 U+0651 ;;SHADDA
-V t > U+0679 ;urdu
-UL (t|s) UL (t|s) > U+062B U+0651 ;;SHADDA
-UL (t|s) > U+062B
-(P t|U+1E6D) (P t|U+1E6D) > U+0637 U+0651 ;;SHADDA
-(P t|U+1E6D) > U+0637
-t t > U+062A U+0651 ;;SHADDA
-t > U+062A
-T T Q AN > U+0629 U+0651 ;;SHADDA
-T Q AN > U+0629
-T AN > U+0629 U+064B
-T T > U+0629 U+0651 ;;SHADDA
-T > U+0629
-C s C s > U+0634 U+0651 ;;SHADDA
-C s > U+0634
-(P s|U+1E63) (P s|U+1E63) > U+0635 U+0651 ;;SHADDA
-(P s|U+1E63) > U+0635
-V s V s > U+069A U+0651 ;;SHADDA
-V s > U+069A ;Pashto
-CO s CO s > U+069B U+0651 ;;SHADDA
-CO s > U+069B ; sin with 3 dots below
-s s > U+0633 U+0651 ;;SHADDA
-s > U+0633
-C r C r > U+06EF U+0651 ;;SHADDA ; missing in ArabTeX <<<
-C r > U+06EF
-CO r CO r > U+0697 U+0651 ;;SHADDA ; missing in ArabTeX <<<
-CO r > U+0697 ; Dargwa language, Dagestan
-P r P r > U+0694 U+0651 ;;SHADDA
-P r > U+0694 ; r with dot below; in Kurdish .r -> 0694
-V r V r > U+0691 U+0651 ;;SHADDA
-V r > U+0691 ;Urdu
-r r > U+0631 U+0651 ;;SHADDA
-r > U+0631
-P q P q > U+066F U+0651 ;;SHADDA
-P q > U+066F
-q q > U+0642 U+0651 ;;SHADDA
-q > U+0642
-p p > U+06A8 U+0651 ;;SHADDA
-p > U+06A8 ;Old malay
-CO n CO n > U+06B1 U+0651 ;;SHADDA
-CO n > U+06B1
-C n C n > U+06BD U+0651 ;;SHADDA
-C n > U+06BD ; <<< ArabTeX yields nūn with three dots below, which is not in Unicode!
-P n P n > U+06BA U+0651 ;;SHADDA
-P n > U+06BA ; urdu
-V n V n > U+06BC U+0651 ;;SHADDA
-V n > U+06BC ; Pashto
-n n > U+0646 U+0651 ;;SHADDA
-n > U+0646
-m m > U+0645 U+0651 ;;SHADDA
-m > U+0645
-P l P l > U+06B6 U+0651 ;
-P l > U+06B6 ; ADDED <<<
-C l C l > U+06B5 U+0651 ;;SHADDA
-C l > U+06B5 ;kurdish
-l l > U+0644 U+0651 ;;SHADDA
-l > U+0644
-P k P k > U+06A9 U+0651 ;;SHADDA
-P k > U+06A9 ; pashto urdu
-UL k UL k > U+063A U+0651 ;;SHADDA
-UL k > U+063A
-k k > U+0643 U+0651 ;;SHADDA
-k > U+0643
-C g C g > U+06A0 U+0651 ;;SHADDA
-C g > U+06A0
-CO j CO j > U+0684 U+0651 ;;SHADDA
-CO j > U+0684
-j j > U+062C U+0651 ;;SHADDA
-j > U+062C
-Q I > U+064A
-I > U+0650 U+064A
-C I > U+0650 U+064A U+0653 ; historical spelling : madda on ya
-UL I > ; suggestion of O. Smrz (arabtex-plus project) URL = ###
-Q i N? > ;
-i N > U+064D
-i > U+0650
-x x > U+062E U+0651 ;;SHADDA
-x > U+062E
-UL h UL h > U+062E U+0651 ;;SHADDA
-UL h > U+062E
-(P h|U+1E25) (P h|U+1E25) > U+062D U+0651 ;;SHADDA
-(P h|U+1E25) > U+062D
-V h V h > U+06C1 U+0651 ;;SHADDA
-V h > U+06C1
-h h > U+0647 U+0651 ;;SHADDA
-h > U+0647
-CO g CO g > U+06B3 U+0651 ;;SHADDA
-CO g > U+06B3
-V g V g > U+06AC U+0651 ;;SHADDA
-V g > U+06AC ; kaf with dot above
-P g P g > U+063A U+0651 ;;SHADDA
-P g > U+063A
-g g > U+0762 U+0651 ;;SHADDA
-g > U+0762
-G G > U+06AB U+0651 ;;SHADDA
-G > U+06AB ;pashto
-P f P f > U+06A1 U+0651 ;;SHADDA
-P f > U+06A1
-f f > U+0641 U+0651 ;;SHADDA
-f > U+0641
-V d V d > U+068A U+0651 ;;SHADDA
-V d > U+068A
-P V d P V d > U+068B U+0651 ;;SHADDA
-P V d > U+068B ;; (like U+0688 with dot below, for Lahnda = Western Punjabi)
-C d C d > U+06EE U+0651 ;;SHADDA
-C d > U+06EE ; not defined in ArabTeX
-CO d CO d > U+068F U+0651 ;;SHADDA
-CO d > U+068F
-UL (d|z) UL (d|z) > U+0630 U+0651 ;;SHADDA
-UL (d|z) > U+0630
-(P d|U+1E0D) (P d|U+1E0D) > U+0636 U+0651 ;;SHADDA
-(P d|U+1E0D) > U+0636
-d d > U+062F U+0651 ;;SHADDA
-d > U+062F
-V c V c > U+0685 U+0651 ;;SHADDA
-V c > U+0685 ;pashto
-C c C c > U+0686 U+0651 ;;SHADDA
-C c > U+0686
-P C c P C c > U+06BF U+0651 ;;SHADDA
-P C c > U+06BF ;; cheh with dot above <<<
-c c > U+0686 U+0651 ;;SHADDA
-c > U+0686
-CO c CO c > U+0682 U+0651 ;;SHADDA
-CO c > U+0682 ; old pashto
-CO b CO b > U+067B U+0651 ;;SHADDA
-CO b > U+067B
-P b P b > U+066E U+0651 ;;SHADDA
-P b > U+066E
-b b > U+0628 U+0651 ;;SHADDA
-b > U+0628
-H A > U+0622
-C A > U+064E U+0622 ; historical spelling
-UL A > U+064E U+0649
-UL a > U+0670
-UL u > U+064F;
-UL i > U+0650;
-Q AN / (A H|Ha) _ > ;
-AN / (A H|Ha) _ > U+064B
-Q AN > U+0627
-AN > U+0627 U+064B
-Q a >
-a > U+064E
-Q A > U+0627
-A > U+064E U+0627
-Ain Ain > U+0639 U+0651 ;;SHADDA
-Ain > U+0639
-H H > U+0621 U+0651 ;;SHADDA
-H > U+0621
-U+002C / [Digits] _ [Digits] > U+002C ; comma in numerical context not an Arabic comma
-Z Z / [Digits] _ [Digits] > U+2013 ; two hyphens in numerical context -> endash
-(Z|U+005D|U+005B|U+0028|U+0029)=xx / [Digits] _ [Digits] > U+202D @xx U+202C ; hyphen or brackets in numerical context: surrounded by LRO & PDF marks
-[Digits] > [ArDigits]
-Z Z Z / # _ # > U+2014
-Z Z / # _ # > U+2013
-Z Z > U+0640
-B > U+0640
-Z / # _ > U+200D ; -x > force initial form with "zero-width joiner"
-Z / _ # > U+200D ; x- > force final form
-U+003C U+003C > U+00BB ;<<
-U+003E U+003E > U+00AB ;>>
-U+00AB > U+00BB
-U+00BB > U+00AB
-UL > U+0640 ;_
-U+003F > U+061F ;?
-U+003B > U+061B ;;
-U+003A U+003A > U+061E ;; '::' ligature 'DOTS' also defined above...
-U+002C > U+060C ;,
-U+005D / [LTR] _ [LTR] > U+200D U+005D U+200D ; keep shaping when inserting ...[...]... ...
-U+005B / [LTR] _ [LTR] > U+200D U+005B U+200D ; (but of course this screws up contextual
- ; analysis, so quoting of hamzas etc may be necessary
-;U+005D > U+005B ;] these are automatically mirrored, following Unicode rules
-;U+005B > U+005D ;[
-Q [VWL] > ;stripoff quoted vowels
-U+00B0 > U+0652 ; °
-N > ;
-C > ;^
-BAR > ;|
-
-pass(Unicode)
-
-Class [CONS] = (U+0621 U+0623 U+0624 U+0626 U+0628 U+062A..U+063A U+0641..U+0647 U+066E U+066F U+0672 U+0675 U+0676 U+0678..U+06BF U+06EE U+06EF U+06FA..U+06FF U+0750..U+076D) ; to be improved: not sure that all glyphs listed (esp for Urdu,Sindhi,etc are really "consonants" in the sense that they can carry a sukun, not to mention that some of these languages may not have a sukun at all ;-)
-Class [VWLX] = (U+0627 U+0648..U+065E U+0670) ; long vowels, vowel signs, shadda, sukun etc.
-Class [VWL] = (U+0627 U+0648..U+0650 U+0670);
-[CONS]=k1 / _ Z? [CONS] ^U+0651 > @k1 U+0652 ; hack: 2nd consonant has no shadda
-U+064E (U+064A|U+0648)=hc / _ (^[VWLX]|#) > U+064E @hc U+0652 ; ay and aw diphtongs
-U+0627 / # _ U+0644 > U+0627 U+064E ; otherwise initial alif takes fatha
-[CONS]=k1 / _ ([CONS]|#) > @k1 U+0652 ; consonant + (consonant or final)
-;; [CONS]=k1 / _ # > @k1 U+0652 ; final consonant
-Q > ;
-Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-malay-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-malay-fullvoc.tec
deleted file mode 100644
index 043262206de..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-malay-fullvoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-malay-novoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-malay-novoc.map
deleted file mode 100644
index 36ab97dcdb2..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-malay-novoc.map
+++ /dev/null
@@ -1,470 +0,0 @@
-LHSName "ArabTeX-malay-novowels"
-RHSName "UNICODE"
-
-Define a U+0061 ;a
-Define b U+0062 ;b
-Define c U+0063 ;c
-Define d U+0064 ;d
-Define e U+0065 ;e
-Define f U+0066 ;f
-Define g U+0067 ;g
-Define h U+0068 ;h
-Define i U+0069 ;i
-Define j U+006A ;j
-Define k U+006B ;k
-Define l U+006C ;l
-Define m U+006D ;m
-Define n U+006E ;n
-Define o U+006F ;o
-Define p U+0070 ;p
-Define q U+0071 ;q
-Define r U+0072 ;r
-Define s U+0073 ;s
-Define t U+0074 ;t
-Define u U+0075 ;u
-Define v U+0076 ;v
-Define w U+0077 ;w
-Define x U+0078 ;x
-Define y U+0079 ;y
-Define z U+007A ;z
-Define A U+0041 ;A
-Define B U+0042 ;B
-Define E U+0045 ;E
-Define G U+0047 ;G
-Define I U+0049 ;I
-Define N U+004E ;N
-Define O U+004F ;O
-Define T U+0054 ;T
-Define U U+0055 ;U
-Define W U+0057 ;W
-Define Y U+0059 ;Y
-Define C U+005E ;^ << CARET
-Define UL U+005F ;_ << UNDERLINE
-Define P U+002E ;. << DOT
-Define V U+002C ;, << COMMA (_V_irgule)
-Define CO U+003A ;: << COLON
-Define SC U+003B ;; << SEMICOLON
-Define Ain U+0060 ;`
-Define H U+0027 ;' << HAMZA
-Define Q U+0022 ;" << QUOTE
-Define Z U+002D ;- << HYPHEN
-Define BAR U+007C ;|
-Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
-;Define NUL U+00A6;
-Define Ha U+0623
-Define Hi U+0625
-Define Hy U+0626
-Define Hw U+0624
-Define Hh U+06C0 ;; = U+0647 U+0654
-Define HA U+0622
-Define HB U+0640 U+0654
-Define HBAR U+0621 ; '|
-
-pass(Unicode)
-
-U+E000 > ; eliminate special code for capitalization in transliterations
-
-pass(Unicode)
-
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [AVWL] = (U+064B..U+0650);
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0047 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;a..z A E I O U B N T Y ^ . _ " "" `
-Class [BRACKETS] = (U+003C U+003E U+00AB U+00BB U+0028 U+0029 U+005B U+005D U+2018 U+2019 U+201C U+201D); < > () « » [ ] ‘ ’ “ ”
-Class [PUNCT] = (V SC P CO)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-Class [Uwu] = (U+0055 U+0077 U+0075) ;(U w u)
-;Class [ae] = (U+0061 U+0065) ;(a e)
-;Class [ou] = (U+0075 U+006F) ;(u o)
-Class [Iyi] = (U+0069 U+0079 U+0049)
-Class [UI] = (U+0049 U+0055) ; U I
-Class [Digits] = (U+0030..U+0039)
-
-Define BEG (#|Z|[BRACKETS])
-Define END (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #)
-Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
-
-; special ligatures
-;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
-;; The BAR is used in the DMG transliteration to suppress the initial A
-(a|A) BAR? l Z LLAH > U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+0644 U+0644 U+0647 ;; 'll_ah' -> 'l l h'
-;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
-U+0041 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'ALLAH'
-U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
-
-U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
-U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
-U+0029 U+0029 > U+FD3E ;; '))' : ornate left par
-U+0052 U+0049 U+0059 U+0041 U+004C > U+FDFC ;; 'RIYAL' : Saudi currency sign
-;; most fonts won't have the following ones:
-U+0053 U+0041 U+004C U+004C U+0041 U+0053 U+0054 U+004F U+0050 > U+FDF0 ;; 'SALLASTOP' (.sallY with "ye-barree", Quranic stop sign)
-U+0051 U+0041 U+004C U+0041 > U+FDF1 ;; 'QALA' : qalY with ye-barree, Quranic stop sign
-U+0041 U+004B U+0042 U+0041 U+0052 > U+FDF3 ;; 'AKBAR'
-U+004D U+0055 U+0048 U+0041 U+004D U+004D U+0041 U+0044 > U+FDF4 ;; 'MUHAMMAD'
-U+0053 U+0041 U+004C U+0041 U+004D > U+FDF5 ;; 'SALAM'
-U+0052 U+0041 U+0053 U+004F ? U+0055 U+004C > U+FDF6 ;; 'RASUL' (also unicode 'RASOUL')
-U+0041 U+004C U+0041 U+0059 U+0048 (U+0049|U+0045) > U+FDF7 ;; 'ALAYHI' (also unicode 'ALAYHE')
-U+0057 U+0041 U+0053 U+0041 U+004C U+004C U+0041 U+004D > U+FDF8 ;; 'WASALLAM'
-U+0053 U+0041 U+004C U+004C U+0041 > U+FDF9 ;; 'SALLA'
-U+004A U+0041 U+004C U+004C U+0041 > U+FDFB ;; 'JALLA' : "jalla jalAluhu"
-U+0042 U+0041 U+0053 U+004D U+0041 U+004C U+0041 > U+FDFD ;; 'BASMALA' : very few fonts have this ligature afaik
-
-U+005E U+0053 U+004C U+0059 > U+06D6 ;; ^SLY
-U+005E U+0051 U+004C U+0059 > U+06D7 ;; ^QLY
-U+005E U+004D U+0049 U+004D > U+06D8 ;; ^MIM-
-U+005E U+004C U+0041 > U+06D9 ;; ^LA
-U+005E U+004A U+0049 U+004D > U+06DA ;; ^JIM
-U+005E U+0044 U+004F U+0054 U+0053 > U+06DB ;; ^DOTS
-U+005E U+0053 U+0049 U+004E > U+06DC ;; ^SIN
-U+0048 U+0049 U+005A U+0042 > U+06DE ;; HIZB
-U+0043 U+0049 U+0052 U+0043 U+005A U+0045 U+0052 U+004F > U+06DF ;; CIRCZERO
-U+0052 U+0045 U+0043 U+0054 U+005A U+0045 U+0052 U+004F > U+06E0 ;; RECTZERO
-U+005E U+004A U+0041 U+005A U+004D > U+06E1 ;; ^JAZM
-U+005E U+004D U+0049 U+004D > U+06E2 ;; ^MIM
-U+005F U+0053 U+0049 U+004E > U+06E3 ;; _SIN
-U+005E U+004D U+0041 U+0044 U+0044 U+0041 > U+06E4 ;; ^MADDA
-U+0057 U+0041 U+0057 > U+06E5 ;; WAW
-U+0059 U+0045 U+0048 > U+06E6 ;; YEH
-U+005E U+0059 U+0045 U+0048 > U+06E7 ;; ^YEH
-U+005E U+004E U+0055 U+004E > U+06E8 ;; ^NUN
-U+0053 U+0041 U+004A U+0044 U+0041 > U+06E9 ;; SAJDA
-U+005F U+0053 U+0054 U+004F U+0050 > U+06EA ;; _STOP
-U+005E U+0053 U+0054 U+004F U+0050 > U+06EB ;; ^STOP
-U+005E U+0052 U+0053 U+0054 U+004F U+0050 > U+06EC ;; ^RSTOP
-U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
-
-U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
-
-
-; vowels
-u u > U
-i i > I
-a a > A
-[AVWL] > ; strip off vowels when writing UTF-8 Arabic with novoc mode
-CO O > U+06FC ;
-a e > a y
-a o > a w
-CO U > U+06C7 ;
-e > i ;; but not pashto > U+0659 and kashmiri > y + U+0658 (U+06CE is kurdish)
-o > u
-
-
-;; Persian ezafe (ALL BUT ARABIC AND UIGHUR)
-U+0048 Z UL? (Q? (i|e))=vv / _ END > U+06C0 @vv U+200C ;H-i -> heh+hamza final; what about 06C2 in Urdu ?<<<
-U+0048 Z Q?=qq (I|E)=vv / _ END > h U+0020 U+0627 @qq i @vv ; H-I
-Q?=q1 (I|E) Z UL? Q?=q2 (i|e) / _ END > @q1 i U+0626 @q2 i U+200C ; ...I-e
-Z Q?=qq I / (A|U) _ ENDZ > U+0626 @qq i y ; ...A-I or ...U-I
-Z UL? (Q? (i|e))=vv / (A|U) _ END > U+0649 @vv ; ...A-i or ...U-i
-Z Q?=q1 (e|i) / _ ENDZ > @q1 i ; ...-i
-Z / U+0048 _ > U+0020 ;
-b Q?=q1 (e|i) Q?=q2 U / # _ > b @q1 i U+0627 @q2 u w ;; special case of prep be without hyphen
-
-;; initial characters ...
-a l Z / BEG _ > U+0627 l Z
-;; wasla on initial alif : NEW! NOT TESTED!
-H / BEG _ l l > U+0627 ;
-[VWL]=v1 / BEG _ > A @v1
-Q?=q1 U / BEG _ > A @q1 u w ; -U
-; Q?=q1 I / BEG _ > A @q1 i y ; -I ; but not when I is final FIXME!!!
-Q?=q1 I / BEG _ > A @q1 i y ; except for Persian, coz of ezafe rules
-
-
-;; Words with anomalous orthography:
-
-; mi'aT -> ماية
-;;; i H / m Q ? _ Q ? a ? (T|t) > i A Hy
-m Q i H Q a / _ (T|t) > m Q i A Hy Q a
-m Q i H a / _ (T|t) > m Q i A Hy
-m i H Q a / _ (T|t) > m A Hy Q a
-m i H a / _ (T|t) > m A Hy
-
-
-;; contextual analysis of hamzas
-;; THESE DO NOT APPLY FOR SINDHI
-
-; initial hamzas
-H / (#|^[LTR]) _ Q? [Iyi] > Hi
-H Q A / (#|^[LTR]) _ > HA ; alif madda
-H / (#|^[LTR]) _ Q? [Uwu] > Ha
-H / (#|^[LTR]) _ Q? a > Ha
-Q H / (#|^[LTR]) _ > HB ; quoted isolated hamza at beginning of word
-
-; quoted hamzas in contextual mode, equivalent to verbatim mode
-a Q H > Ha
-i Q H > Hi
-y Q H > Hy
-w Q H > Hw
-h Q H > Hh
-A Q H > HA
-B Q H > HB
-BAR Q H > HBAR
-
-; hamza + fathatan
-H / a _ Q? AN > Ha
-;;H / [Iyi] _ Q? AN > Hy
-H / _ Q? AN > Hy
-
-;final hamzas
-H / A _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Uw] _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Iy] _ Q? (i N?|u N?)? (#|^[LTR]) > HBAR ; not AN ...
-H / a _ Q? (#|^[LTR]) > Ha ; not AN...
-H / a _ Q? (u|i) N? (#|^[LTR]) > Ha ; not AN...
-H / i _ Q? [VWL]? N? (#|^[LTR]) > Hy
-H / u _ Q? [VWL]? N? (#|^[LTR]) > Hw
-
-;;and more hamzas ...
-
-; n°1: kasra/ya
-H / [LTR] _ Q? [Iyi] ^N > Hy
-H / [Iyi] _ > Hy
-
-; n°2: damma/waw
-H / [LTR] _ Q? (U|u) ^N > Hw
-H / (U|u) _ Q? ^[Iyi] > Hw
-H / U _ > HBAR
-
-; n°3: fatha/alif
-H Q? A > HA
-H / A _ Q? a > HBAR
-H / ^[UI] _ Q? a > Ha
-H / a _ Q? ^[UI] > Ha
-
-
-pass(Unicode)
-
-Class [Digits] = (U+0030..U+0039)
-Class [ArDigits] = (U+0660..U+0669)
-Class [ArEasternDigits] = (U+06F0..U+06F9)
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;(a..z A E I O U B N T Y ^ . _ " "" `)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-
-
-
-
-;normal code
-
-
-(P z|U+1E93) (P z|U+1E93) > U+0638 U+0651 ;;SHADDA
-(P z|U+1E93) > U+0638
-C z C z > U+0698 U+0651 ;;SHADDA
-C z > U+0698
-V z V z > U+0696 U+0651 ;;SHADDA
-V z > U+0696 ;pashto
-z z > U+0632 U+0651 ;;SHADDA
-z > U+0632
-Y Y > U+0649 U+0651 ;;SHADDA
-Y > U+0649
-P I P I / _ # > U+06CC U+0651 ;; SHADDA
-P I / _ # > U+06CC ;; workaround to have ya without dots in Arabic
-y y > U+064A U+0651 ;;SHADDA
-y > U+064A
-v v > U+06CF U+0651 ;;SHADDA
-v > U+06CF
-W > U+0648 U+0627 ; waw + alif
-C U > U+064F U+0648 U+0653; historical spelling : madda on waw
-Q U [Uw] > U+064F U+0648 U+0651 ;;SHADDA
-Q U > U+064F U+0648
-[Uw] [Uw] > U+0648 U+0651 ;;SHADDA
-[Uw] > U+0648
-C w C w > U+06C9 U+0651 ;;SHADDA
-C w > U+06C9
-CO w CO w > U+06CA U+0651 ;,SHADDA
-CO w > U+06CA
-Q u N > U+064C
-u N >
-Q u > U+064F
-V t V t > U+0679 U+0651 ;;SHADDA
-V t > U+0679 ;urdu
-UL (t|s) UL (t|s) > U+062B U+0651 ;;SHADDA
-UL (t|s) > U+062B
-(P t|U+1E6D) (P t|U+1E6D) > U+0637 U+0651 ;;SHADDA
-(P t|U+1E6D) > U+0637
-t t > U+062A U+0651 ;;SHADDA
-t > U+062A
-T T Q AN > U+0629 U+0651 U+064B ;;SHADDA
-T Q AN > U+0629 U+064B
-T AN > U+0629
-T T > U+0629 U+0651 ;;SHADDA
-T > U+0629
-C s C s > U+0634 U+0651 ;;SHADDA
-C s > U+0634
-(P s|U+1E63) (P s|U+1E63) > U+0635 U+0651 ;;SHADDA
-(P s|U+1E63) > U+0635
-V s V s > U+069A U+0651 ;;SHADDA
-V s > U+069A ;Pashto
-CO s CO s > U+069B U+0651 ;;SHADDA
-CO s > U+069B ; sin with 3 dots below
-s s > U+0633 U+0651 ;;SHADDA
-s > U+0633
-C r C r > U+06EF U+0651 ;;SHADDA ; missing in ArabTeX <<<
-C r > U+06EF
-CO r CO r > U+0697 U+0651 ;;SHADDA ; missing in ArabTeX <<<
-CO r > U+0697 ; Dargwa language, Dagestan
-P r P r > U+0694 U+0651 ;;SHADDA
-P r > U+0694 ; r with dot below; in Kurdish .r -> 0694
-V r V r > U+0691 U+0651 ;;SHADDA
-V r > U+0691 ;Urdu
-r r > U+0631 U+0651 ;;SHADDA
-r > U+0631
-P q P q > U+066F U+0651 ;;SHADDA
-P q > U+066F
-q q > U+0642 U+0651 ;;SHADDA
-q > U+0642
-p p > U+06A8 U+0651 ;;SHADDA
-p > U+06A8 ;Old malay
-CO n CO n > U+06B1 U+0651 ;;SHADDA
-CO n > U+06B1
-C n C n > U+06BD U+0651 ;;SHADDA
-C n > U+06BD ; <<< ArabTeX yields nūn with three dots below, which is not in Unicode!
-P n P n > U+06BA U+0651 ;;SHADDA
-P n > U+06BA ; urdu
-V n V n > U+06BC U+0651 ;;SHADDA
-V n > U+06BC ; Pashto
-n n > U+0646 U+0651 ;;SHADDA
-n > U+0646
-m m > U+0645 U+0651 ;;SHADDA
-m > U+0645
-P l P l > U+06B6 U+0651 ;
-P l > U+06B6 ; ADDED <<<
-C l C l > U+06B5 U+0651 ;;SHADDA
-C l > U+06B5 ;kurdish
-l l > U+0644 U+0651 ;;SHADDA
-l > U+0644
-P k P k > U+06A9 U+0651 ;;SHADDA
-P k > U+06A9 ; pashto urdu
-UL k UL k > U+063A U+0651 ;;SHADDA
-UL k > U+063A
-k k > U+0643 U+0651 ;;SHADDA
-k > U+0643
-C g C g > U+06A0 U+0651 ;;SHADDA
-C g > U+06A0
-CO j CO j > U+0684 U+0651 ;;SHADDA
-CO j > U+0684
-j j > U+062C U+0651 ;;SHADDA
-j > U+062C
-Q I > U+0650 U+064A
-C I > U+0650 U+064A U+0653 ; historical spelling : madda on ya
-UL I > ; suggestion of O. Smrz (arabtex-plus project) URL = ###
-I > U+064A
-Q i N > U+064D
-i N > ;
-Q i > U+0650
-x x > U+062E U+0651 ;;SHADDA
-x > U+062E
-UL h UL h > U+062E U+0651 ;;SHADDA
-UL h > U+062E
-(P h|U+1E25) (P h|U+1E25) > U+062D U+0651 ;;SHADDA
-(P h|U+1E25) > U+062D
-V h V h > U+06C1 U+0651 ;;SHADDA
-V h > U+06C1
-h h > U+0647 U+0651 ;;SHADDA
-h > U+0647
-CO g CO g > U+06B3 U+0651 ;;SHADDA
-CO g > U+06B3
-V g V g > U+06AC U+0651 ;;SHADDA
-V g > U+06AC ; kaf with dot above
-P g P g > U+063A U+0651 ;;SHADDA
-P g > U+063A
-g g > U+0762 U+0651 ;;SHADDA
-g > U+0762
-G G > U+06AB U+0651 ;;SHADDA
-G > U+06AB ;pashto
-P f P f > U+06A1 U+0651 ;;SHADDA
-P f > U+06A1
-f f > U+0641 U+0651 ;;SHADDA
-f > U+0641
-V d V d > U+068A U+0651 ;;SHADDA
-V d > U+068A
-P V d P V d > U+068B U+0651 ;;SHADDA
-P V d > U+068B ;; (like U+0688 with dot below, for Lahnda = Western Punjabi)
-C d C d > U+06EE U+0651 ;;SHADDA
-C d > U+06EE ; not defined in ArabTeX
-CO d CO d > U+068F U+0651 ;;SHADDA
-CO d > U+068F
-UL (d|z) UL (d|z) > U+0630 U+0651 ;;SHADDA
-UL (d|z) > U+0630
-(P d|U+1E0D) (P d|U+1E0D) > U+0636 U+0651 ;;SHADDA
-(P d|U+1E0D) > U+0636
-d d > U+062F U+0651 ;;SHADDA
-d > U+062F
-V c V c > U+0685 U+0651 ;;SHADDA
-V c > U+0685 ;pashto
-C c C c > U+0686 U+0651 ;;SHADDA
-C c > U+0686
-P C c P C c > U+06BF U+0651 ;;SHADDA
-P C c > U+06BF ;; cheh with dot above <<<
-c c > U+0686 U+0651 ;;SHADDA
-c > U+0686
-CO c CO c > U+0682 U+0651 ;;SHADDA
-CO c > U+0682 ; old pashto
-CO b CO b > U+067B U+0651 ;;SHADDA
-CO b > U+067B
-P b P b > U+066E U+0651 ;;SHADDA
-P b > U+066E
-b b > U+0628 U+0651 ;;SHADDA
-b > U+0628
-H A > U+0622
-C A > U+064E U+0622 ; historical spelling
-UL A > U+0649
-UL a > U+0670
-UL u > ;
-UL i > ;
-Q AN / (A H|Ha) _ > U+064B
-AN / (A H|Ha) _ > ;
-Q AN > U+0627 U+064B
-AN > U+0627
-Q a > U+064E
-Q A > U+064E U+0627
-A > U+0627
-Ain Ain > U+0639 U+0651 ;;SHADDA
-Ain > U+0639
-H H > U+0621 U+0651 ;;SHADDA
-H > U+0621
-U+002C / [Digits] _ [Digits] > U+002C ; comma in numerical context not an Arabic comma
-Z Z / [Digits] _ [Digits] > U+2013 ; two hyphens in numerical context -> endash
-(Z|U+005D|U+005B|U+0028|U+0029)=xx / [Digits] _ [Digits] > U+202D @xx U+202C ; hyphen or brackets in numerical context: surrounded by LRO & PDF marks
-[Digits] > [ArDigits]
-Z Z Z / # _ # > U+2014
-Z Z / # _ # > U+2013
-Z Z > U+0640
-B > U+0640
-Z / # _ > U+200D ; -x > force initial form with "zero-width joiner"
-Z / _ # > U+200D ; x- > force final form
-U+003C U+003C > U+00BB ;<<
-U+003E U+003E > U+00AB ;>>
-U+00AB > U+00BB
-U+00BB > U+00AB
-UL > U+0640 ;_
-U+003F > U+061F ;?
-U+003B > U+061B ;;
-U+003A U+003A > U+061E ;; '::' ligature 'DOTS' also defined above...
-U+002C > U+060C ;,
-U+005D / [LTR] _ [LTR] > U+200D U+005D U+200D ; keep shaping when inserting ...[...]... ...
-U+005B / [LTR] _ [LTR] > U+200D U+005B U+200D ; (but of course this screws up contextual
- ; analysis, so quoting of hamzas etc may be necessary
-;U+005D > U+005B ;] these are automatically mirrored, following Unicode rules
-;U+005B > U+005D ;[
-[VWL] > ;stripoff vowels
-Q > U+0652
-U+00B0 > U+0652 ; °
-N > ;
-C > ;^
-Z > ;-
-BAR > ;|
-
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-malay-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-malay-novoc.tec
deleted file mode 100644
index 691e4718dd0..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-malay-novoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-malay-voc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-malay-voc.map
deleted file mode 100644
index d73e75b98d0..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-malay-voc.map
+++ /dev/null
@@ -1,480 +0,0 @@
-LHSName "ArabTeX-malay-vocalized"
-RHSName "UNICODE"
-
-Define a U+0061 ;a
-Define b U+0062 ;b
-Define c U+0063 ;c
-Define d U+0064 ;d
-Define e U+0065 ;e
-Define f U+0066 ;f
-Define g U+0067 ;g
-Define h U+0068 ;h
-Define i U+0069 ;i
-Define j U+006A ;j
-Define k U+006B ;k
-Define l U+006C ;l
-Define m U+006D ;m
-Define n U+006E ;n
-Define o U+006F ;o
-Define p U+0070 ;p
-Define q U+0071 ;q
-Define r U+0072 ;r
-Define s U+0073 ;s
-Define t U+0074 ;t
-Define u U+0075 ;u
-Define v U+0076 ;v
-Define w U+0077 ;w
-Define x U+0078 ;x
-Define y U+0079 ;y
-Define z U+007A ;z
-Define A U+0041 ;A
-Define B U+0042 ;B
-Define E U+0045 ;E
-Define G U+0047 ;G
-Define I U+0049 ;I
-Define N U+004E ;N
-Define O U+004F ;O
-Define T U+0054 ;T
-Define U U+0055 ;U
-Define W U+0057 ;W
-Define Y U+0059 ;Y
-Define C U+005E ;^ << CARET
-Define UL U+005F ;_ << UNDERLINE
-Define P U+002E ;. << DOT
-Define V U+002C ;, << COMMA (_V_irgule)
-Define CO U+003A ;: << COLON
-Define SC U+003B ;; << SEMICOLON
-Define Ain U+0060 ;`
-Define H U+0027 ;' << HAMZA
-Define Q U+0022 ;" << QUOTE
-Define Z U+002D ;- << HYPHEN
-Define BAR U+007C ;|
-Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
-;Define NUL U+00A6;
-Define Ha U+0623
-Define Hi U+0625
-Define Hy U+0626
-Define Hw U+0624
-Define Hh U+06C0 ;; = U+0647 U+0654
-Define HA U+0622
-Define HB U+0640 U+0654
-Define HBAR U+0621 ; '|
-
-pass(Unicode)
-
-U+E000 > ; eliminate special code for capitalization in transliterations
-
-pass(Unicode)
-
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [AVWL] = (U+064B..U+0650);
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0047 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;a..z A E I O U B N T Y ^ . _ " "" `
-Class [BRACKETS] = (U+003C U+003E U+00AB U+00BB U+0028 U+0029 U+005B U+005D U+2018 U+2019 U+201C U+201D); < > () « » [ ] ‘ ’ “ ”
-Class [PUNCT] = (V SC P CO)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-Class [Uwu] = (U+0055 U+0077 U+0075) ;(U w u)
-;Class [ae] = (U+0061 U+0065) ;(a e)
-;Class [ou] = (U+0075 U+006F) ;(u o)
-Class [Iyi] = (U+0069 U+0079 U+0049)
-Class [UI] = (U+0049 U+0055) ; U I
-Class [Digits] = (U+0030..U+0039)
-
-Define BEG (#|Z|[BRACKETS])
-Define END (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #)
-Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
-
-; special ligatures
-;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
-;; The BAR is used in the DMG transliteration to suppress the initial A
-(a|A) BAR? l Z LLAH > U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+0644 U+0644 U+0647 ;; 'll_ah' -> 'l l h'
-;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
-U+0041 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'ALLAH'
-U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
-
-U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
-U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
-U+0029 U+0029 > U+FD3E ;; '))' : ornate left par
-U+0052 U+0049 U+0059 U+0041 U+004C > U+FDFC ;; 'RIYAL' : Saudi currency sign
-;; most fonts won't have the following ones:
-U+0053 U+0041 U+004C U+004C U+0041 U+0053 U+0054 U+004F U+0050 > U+FDF0 ;; 'SALLASTOP' (.sallY with "ye-barree", Quranic stop sign)
-U+0051 U+0041 U+004C U+0041 > U+FDF1 ;; 'QALA' : qalY with ye-barree, Quranic stop sign
-U+0041 U+004B U+0042 U+0041 U+0052 > U+FDF3 ;; 'AKBAR'
-U+004D U+0055 U+0048 U+0041 U+004D U+004D U+0041 U+0044 > U+FDF4 ;; 'MUHAMMAD'
-U+0053 U+0041 U+004C U+0041 U+004D > U+FDF5 ;; 'SALAM'
-U+0052 U+0041 U+0053 U+004F ? U+0055 U+004C > U+FDF6 ;; 'RASUL' (also unicode 'RASOUL')
-U+0041 U+004C U+0041 U+0059 U+0048 (U+0049|U+0045) > U+FDF7 ;; 'ALAYHI' (also unicode 'ALAYHE')
-U+0057 U+0041 U+0053 U+0041 U+004C U+004C U+0041 U+004D > U+FDF8 ;; 'WASALLAM'
-U+0053 U+0041 U+004C U+004C U+0041 > U+FDF9 ;; 'SALLA'
-U+004A U+0041 U+004C U+004C U+0041 > U+FDFB ;; 'JALLA' : "jalla jalAluhu"
-U+0042 U+0041 U+0053 U+004D U+0041 U+004C U+0041 > U+FDFD ;; 'BASMALA' : very few fonts have this ligature afaik
-
-U+005E U+0053 U+004C U+0059 > U+06D6 ;; ^SLY
-U+005E U+0051 U+004C U+0059 > U+06D7 ;; ^QLY
-U+005E U+004D U+0049 U+004D > U+06D8 ;; ^MIM-
-U+005E U+004C U+0041 > U+06D9 ;; ^LA
-U+005E U+004A U+0049 U+004D > U+06DA ;; ^JIM
-U+005E U+0044 U+004F U+0054 U+0053 > U+06DB ;; ^DOTS
-U+005E U+0053 U+0049 U+004E > U+06DC ;; ^SIN
-U+0048 U+0049 U+005A U+0042 > U+06DE ;; HIZB
-U+0043 U+0049 U+0052 U+0043 U+005A U+0045 U+0052 U+004F > U+06DF ;; CIRCZERO
-U+0052 U+0045 U+0043 U+0054 U+005A U+0045 U+0052 U+004F > U+06E0 ;; RECTZERO
-U+005E U+004A U+0041 U+005A U+004D > U+06E1 ;; ^JAZM
-U+005E U+004D U+0049 U+004D > U+06E2 ;; ^MIM
-U+005F U+0053 U+0049 U+004E > U+06E3 ;; _SIN
-U+005E U+004D U+0041 U+0044 U+0044 U+0041 > U+06E4 ;; ^MADDA
-U+0057 U+0041 U+0057 > U+06E5 ;; WAW
-U+0059 U+0045 U+0048 > U+06E6 ;; YEH
-U+005E U+0059 U+0045 U+0048 > U+06E7 ;; ^YEH
-U+005E U+004E U+0055 U+004E > U+06E8 ;; ^NUN
-U+0053 U+0041 U+004A U+0044 U+0041 > U+06E9 ;; SAJDA
-U+005F U+0053 U+0054 U+004F U+0050 > U+06EA ;; _STOP
-U+005E U+0053 U+0054 U+004F U+0050 > U+06EB ;; ^STOP
-U+005E U+0052 U+0053 U+0054 U+004F U+0050 > U+06EC ;; ^RSTOP
-U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
-
-U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
-
-
-; vowels
-u u > U
-i i > I
-a a > A
-CO O > U+06FC ;
-a e > a y
-a o > a w
-CO U > U+06C7 ;
-e > i ;; but not pashto > U+0659 and kashmiri > y + U+0658 (U+06CE is kurdish)
-o > u
-
-
-;; Persian ezafe (ALL BUT ARABIC AND UIGHUR)
-U+0048 Z UL? (Q? (i|e))=vv / _ END > U+06C0 @vv U+200C ;H-i -> heh+hamza final; what about 06C2 in Urdu ?<<<
-U+0048 Z Q?=qq (I|E)=vv / _ END > h U+0020 U+0627 @qq i @vv ; H-I
-Q?=q1 (I|E) Z UL? Q?=q2 (i|e) / _ END > @q1 i U+0626 @q2 i U+200C ; ...I-e
-Z Q?=qq I / (A|U) _ ENDZ > U+0626 @qq i y ; ...A-I or ...U-I
-Z UL? (Q? (i|e))=vv / (A|U) _ END > U+0649 @vv ; ...A-i or ...U-i
-Z Q?=q1 (e|i) / _ ENDZ > @q1 i ; ...-i
-Z / U+0048 _ > U+0020 ;
-b Q?=q1 (e|i) Q?=q2 U / # _ > b @q1 i U+0627 @q2 u w ;; special case of prep be without hyphen
-
-;; initial characters ...
-a l Z / BEG _ > U+0627 l Z
-;; wasla on initial alif : NEW! NOT TESTED!
-H / BEG _ l l > U+0671 ; e.g. alla_dI -> 'lla_dI
-[VWL]=v1 / BEG _ > U+0627 @v1
-Q?=q1 U / BEG _ > U+0627 @q1 u w ; -U
-; Q?=q1 I / BEG _ > U+0627 @q1 i y ; -I
-Q?=q1 I / BEG _ > U+0627 @q1 i y
-
-
-;; Words with anomalous orthography:
-
-; mi'aT -> ماية
-;;; i H / m Q ? _ Q ? a ? (T|t) > i A Hy
-m Q i H Q a / _ (T|t) > m U+0627 Hy
-m Q i H a / _ (T|t) > m U+0627 Hy a
-m i H Q a / _ (T|t) > m i U+0627 Hy
-m i H a / _ (T|t) > m i U+0627 Hy a
-
-
-;; contextual analysis of hamzas
-;; THESE DO NOT APPLY FOR SINDHI
-
-; initial hamzas
-H / (#|^[LTR]) _ Q? [Iyi] > Hi
-H Q A / (#|^[LTR]) _ > HA ; alif madda
-H / (#|^[LTR]) _ Q? [Uwu] > Ha
-H / (#|^[LTR]) _ Q? a > Ha
-Q H / (#|^[LTR]) _ > HB ; quoted isolated hamza at beginning of word
-
-; quoted hamzas in contextual mode, equivalent to verbatim mode
-a Q H > Ha
-i Q H > Hi
-y Q H > Hy
-w Q H > Hw
-h Q H > Hh
-A Q H > HA
-B Q H > HB
-BAR Q H > HBAR
-
-; hamza + fathatan
-H / a _ Q? AN > Ha
-;;H / [Iyi] _ Q? AN > Hy
-H / _ Q? AN > Hy
-
-;final hamzas
-H / A _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Uw] _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Iy] _ Q? (i N?|u N?)? (#|^[LTR]) > HBAR ; not AN ...
-H / a _ Q? (#|^[LTR]) > Ha ; not AN...
-H / a _ Q? (u|i) N? (#|^[LTR]) > Ha ; not AN...
-H / i _ Q? [VWL]? N? (#|^[LTR]) > Hy
-H / u _ Q? [VWL]? N? (#|^[LTR]) > Hw
-
-;;and more hamzas ...
-
-; n°1: kasra/ya
-H / [LTR] _ Q? [Iyi] ^N > Hy
-H / [Iyi] _ > Hy
-
-; n°2: damma/waw
-H / [LTR] _ Q? (U|u) ^N > Hw
-H / (U|u) _ Q? ^[Iyi] > Hw
-H / U _ > HBAR
-
-; n°3: fatha/alif
-H Q? A > HA
-H / A _ Q? a > HBAR
-H / ^[UI] _ Q? a > Ha
-H / a _ Q? ^[UI] > Ha
-
-
-pass(Unicode)
-
-Class [Digits] = (U+0030..U+0039)
-Class [ArDigits] = (U+0660..U+0669)
-Class [ArEasternDigits] = (U+06F0..U+06F9)
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;(a..z A E I O U B N T Y ^ . _ " "" `)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-
-
-
-
-;normal code
-
-
-(P z|U+1E93) (P z|U+1E93) > U+0638 U+0651 ;;SHADDA
-(P z|U+1E93) > U+0638
-C z C z > U+0698 U+0651 ;;SHADDA
-C z > U+0698
-V z V z > U+0696 U+0651 ;;SHADDA
-V z > U+0696 ;pashto
-z z > U+0632 U+0651 ;;SHADDA
-z > U+0632
-Q Y Y > U+0649 U+0651 ;;SHADDA
-Q Y > U+0649
-Y Y > U+064E U+0649 U+0651 ;;SHADDA
-Y > U+064E U+0649
-P I P I / _ # > U+0650 U+06CC U+0651 ;; SHADDA
-P I / _ # > U+0650 U+06CC ;; workaround to have ya without dots in Arabic
-y y > U+064A U+0651 ;;SHADDA
-y > U+064A
-v v > U+06CF U+0651 ;;SHADDA
-v > U+06CF
-W > U+0648 U+0627 ; waw + alif
-C U > U+064F U+0648 U+0653; historical spelling : madda on waw
-C w C w > U+06C9 U+0651 ;;SHADDA
-C w > U+06C9
-CO w CO w > U+06CA U+0651 ;,SHADDA
-CO w > U+06CA
-U A / _ # > U+064F U+0648 U+0627
-Q U [Uw] > U+0648 U+0651 ;;SHADDA
-Q U > U+0648
-U [Uw] > U+064F U+0648 U+0651 ;;SHADDA
-U > U+064F U+0648
-w w > U+0648 U+0651 ;;SHADDA
-w > U+0648
-Q u N? >
-u N > U+064C
-u > U+064F
-V t V t > U+0679 U+0651 ;;SHADDA
-V t > U+0679 ;urdu
-UL (t|s) UL (t|s) > U+062B U+0651 ;;SHADDA
-UL (t|s) > U+062B
-(P t|U+1E6D) (P t|U+1E6D) > U+0637 U+0651 ;;SHADDA
-(P t|U+1E6D) > U+0637
-t t > U+062A U+0651 ;;SHADDA
-t > U+062A
-T T Q AN > U+0629 U+0651 ;;SHADDA
-T Q AN > U+0629
-T AN > U+0629 U+064B
-T T > U+0629 U+0651 ;;SHADDA
-T > U+0629
-C s C s > U+0634 U+0651 ;;SHADDA
-C s > U+0634
-(P s|U+1E63) (P s|U+1E63) > U+0635 U+0651 ;;SHADDA
-(P s|U+1E63) > U+0635
-V s V s > U+069A U+0651 ;;SHADDA
-V s > U+069A ;Pashto
-CO s CO s > U+069B U+0651 ;;SHADDA
-CO s > U+069B ; sin with 3 dots below
-s s > U+0633 U+0651 ;;SHADDA
-s > U+0633
-C r C r > U+06EF U+0651 ;;SHADDA ; missing in ArabTeX <<<
-C r > U+06EF
-CO r CO r > U+0697 U+0651 ;;SHADDA ; missing in ArabTeX <<<
-CO r > U+0697 ; Dargwa language, Dagestan
-P r P r > U+0694 U+0651 ;;SHADDA
-P r > U+0694 ; r with dot below; in Kurdish .r -> 0694
-V r V r > U+0691 U+0651 ;;SHADDA
-V r > U+0691 ;Urdu
-r r > U+0631 U+0651 ;;SHADDA
-r > U+0631
-P q P q > U+066F U+0651 ;;SHADDA
-P q > U+066F
-q q > U+0642 U+0651 ;;SHADDA
-q > U+0642
-p p > U+06A8 U+0651 ;;SHADDA
-p > U+06A8 ;Old malay
-CO n CO n > U+06B1 U+0651 ;;SHADDA
-CO n > U+06B1
-C n C n > U+06BD U+0651 ;;SHADDA
-C n > U+06BD ; <<< ArabTeX yields nūn with three dots below, which is not in Unicode!
-P n P n > U+06BA U+0651 ;;SHADDA
-P n > U+06BA ; urdu
-V n V n > U+06BC U+0651 ;;SHADDA
-V n > U+06BC ; Pashto
-n n > U+0646 U+0651 ;;SHADDA
-n > U+0646
-m m > U+0645 U+0651 ;;SHADDA
-m > U+0645
-P l P l > U+06B6 U+0651 ;
-P l > U+06B6 ; ADDED <<<
-C l C l > U+06B5 U+0651 ;;SHADDA
-C l > U+06B5 ;kurdish
-l l > U+0644 U+0651 ;;SHADDA
-l > U+0644
-P k P k > U+06A9 U+0651 ;;SHADDA
-P k > U+06A9 ; pashto urdu
-UL k UL k > U+063A U+0651 ;;SHADDA
-UL k > U+063A
-k k > U+0643 U+0651 ;;SHADDA
-k > U+0643
-C g C g > U+06A0 U+0651 ;;SHADDA
-C g > U+06A0
-CO j CO j > U+0684 U+0651 ;;SHADDA
-CO j > U+0684
-j j > U+062C U+0651 ;;SHADDA
-j > U+062C
-Q I > U+064A
-I > U+0650 U+064A
-C I > U+0650 U+064A U+0653 ; historical spelling : madda on ya
-UL I > ; suggestion of O. Smrz (arabtex-plus project) URL = ###
-Q i N? > ;
-i N > U+064D
-i > U+0650
-x x > U+062E U+0651 ;;SHADDA
-x > U+062E
-UL h UL h > U+062E U+0651 ;;SHADDA
-UL h > U+062E
-(P h|U+1E25) (P h|U+1E25) > U+062D U+0651 ;;SHADDA
-(P h|U+1E25) > U+062D
-V h V h > U+06C1 U+0651 ;;SHADDA
-V h > U+06C1
-h h > U+0647 U+0651 ;;SHADDA
-h > U+0647
-CO g CO g > U+06B3 U+0651 ;;SHADDA
-CO g > U+06B3
-V g V g > U+06AC U+0651 ;;SHADDA
-V g > U+06AC ; kaf with dot above
-P g P g > U+063A U+0651 ;;SHADDA
-P g > U+063A
-g g > U+0762 U+0651 ;;SHADDA
-g > U+0762
-G G > U+06AB U+0651 ;;SHADDA
-G > U+06AB ;pashto
-P f P f > U+06A1 U+0651 ;;SHADDA
-P f > U+06A1
-f f > U+0641 U+0651 ;;SHADDA
-f > U+0641
-V d V d > U+068A U+0651 ;;SHADDA
-V d > U+068A
-P V d P V d > U+068B U+0651 ;;SHADDA
-P V d > U+068B ;; (like U+0688 with dot below, for Lahnda = Western Punjabi)
-C d C d > U+06EE U+0651 ;;SHADDA
-C d > U+06EE ; not defined in ArabTeX
-CO d CO d > U+068F U+0651 ;;SHADDA
-CO d > U+068F
-UL (d|z) UL (d|z) > U+0630 U+0651 ;;SHADDA
-UL (d|z) > U+0630
-(P d|U+1E0D) (P d|U+1E0D) > U+0636 U+0651 ;;SHADDA
-(P d|U+1E0D) > U+0636
-d d > U+062F U+0651 ;;SHADDA
-d > U+062F
-V c V c > U+0685 U+0651 ;;SHADDA
-V c > U+0685 ;pashto
-C c C c > U+0686 U+0651 ;;SHADDA
-C c > U+0686
-P C c P C c > U+06BF U+0651 ;;SHADDA
-P C c > U+06BF ;; cheh with dot above <<<
-c c > U+0686 U+0651 ;;SHADDA
-c > U+0686
-CO c CO c > U+0682 U+0651 ;;SHADDA
-CO c > U+0682 ; old pashto
-CO b CO b > U+067B U+0651 ;;SHADDA
-CO b > U+067B
-P b P b > U+066E U+0651 ;;SHADDA
-P b > U+066E
-b b > U+0628 U+0651 ;;SHADDA
-b > U+0628
-H A > U+0622
-C A > U+064E U+0622 ; historical spelling
-UL A > U+064E U+0649
-UL a > U+0670
-UL u > U+064F;
-UL i > U+0650;
-Q AN / (A H|Ha) _ > ;
-AN / (A H|Ha) _ > U+064B
-Q AN > U+0627
-AN > U+0627 U+064B
-Q a >
-a > U+064E
-Q A > U+0627
-A > U+064E U+0627
-Ain Ain > U+0639 U+0651 ;;SHADDA
-Ain > U+0639
-H H > U+0621 U+0651 ;;SHADDA
-H > U+0621
-U+002C / [Digits] _ [Digits] > U+002C ; comma in numerical context not an Arabic comma
-Z Z / [Digits] _ [Digits] > U+2013 ; two hyphens in numerical context -> endash
-(Z|U+005D|U+005B|U+0028|U+0029)=xx / [Digits] _ [Digits] > U+202D @xx U+202C ; hyphen or brackets in numerical context: surrounded by LRO & PDF marks
-[Digits] > [ArDigits]
-Z Z Z / # _ # > U+2014
-Z Z / # _ # > U+2013
-Z Z > U+0640
-B > U+0640
-Z / # _ > U+200D ; -x > force initial form with "zero-width joiner"
-Z / _ # > U+200D ; x- > force final form
-U+003C U+003C > U+00BB ;<<
-U+003E U+003E > U+00AB ;>>
-U+00AB > U+00BB
-U+00BB > U+00AB
-UL > U+0640 ;_
-U+003F > U+061F ;?
-U+003B > U+061B ;;
-U+003A U+003A > U+061E ;; '::' ligature 'DOTS' also defined above...
-U+002C > U+060C ;,
-U+005D / [LTR] _ [LTR] > U+200D U+005D U+200D ; keep shaping when inserting ...[...]... ...
-U+005B / [LTR] _ [LTR] > U+200D U+005B U+200D ; (but of course this screws up contextual
- ; analysis, so quoting of hamzas etc may be necessary
-;U+005D > U+005B ;] these are automatically mirrored, following Unicode rules
-;U+005B > U+005D ;[
-Q [VWL] > ;stripoff quoted vowels
-Q > U+0652
-U+00B0 > U+0652 ; °
-N > ;
-C > ;^
-BAR > ;|
-
-pass(Unicode)
-
-Class [CONS] = (U+0621 U+0623 U+0624 U+0626 U+0628 U+062A..U+063A U+0641..U+0647 U+066E U+066F U+0672 U+0675 U+0676 U+0678..U+06BF U+06EE U+06EF U+06FA..U+06FF U+0750..U+076D) ; to be improved: not sure that all glyphs listed (esp for Urdu,Sindhi,etc are really "consonants" in the sense that they can carry a sukun, not to mention that some of these languages may not have a sukun at all ;-)
-Class [VWLX] = (U+0627 U+0648..U+065E U+0670) ; long vowels, vowel signs, shadda, sukun etc.
-Class [VWL] = (U+0627 U+0648..U+0650 U+0670);
-Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-malay-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-malay-voc.tec
deleted file mode 100644
index 44b62900a48..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-malay-voc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-novoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-novoc.map
deleted file mode 100644
index 152faffe029..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-novoc.map
+++ /dev/null
@@ -1,465 +0,0 @@
-LHSName "ArabTeX-novowels"
-RHSName "UNICODE"
-
-Define a U+0061 ;a
-Define b U+0062 ;b
-Define c U+0063 ;c
-Define d U+0064 ;d
-Define e U+0065 ;e
-Define f U+0066 ;f
-Define g U+0067 ;g
-Define h U+0068 ;h
-Define i U+0069 ;i
-Define j U+006A ;j
-Define k U+006B ;k
-Define l U+006C ;l
-Define m U+006D ;m
-Define n U+006E ;n
-Define o U+006F ;o
-Define p U+0070 ;p
-Define q U+0071 ;q
-Define r U+0072 ;r
-Define s U+0073 ;s
-Define t U+0074 ;t
-Define u U+0075 ;u
-Define v U+0076 ;v
-Define w U+0077 ;w
-Define x U+0078 ;x
-Define y U+0079 ;y
-Define z U+007A ;z
-Define A U+0041 ;A
-Define B U+0042 ;B
-Define E U+0045 ;E
-Define G U+0047 ;G
-Define I U+0049 ;I
-Define N U+004E ;N
-Define O U+004F ;O
-Define T U+0054 ;T
-Define U U+0055 ;U
-Define W U+0057 ;W
-Define Y U+0059 ;Y
-Define C U+005E ;^ << CARET
-Define UL U+005F ;_ << UNDERLINE
-Define P U+002E ;. << DOT
-Define V U+002C ;, << COMMA (_V_irgule)
-Define CO U+003A ;: << COLON
-Define SC U+003B ;; << SEMICOLON
-Define Ain U+0060 ;`
-Define H U+0027 ;' << HAMZA
-Define Q U+0022 ;" << QUOTE
-Define Z U+002D ;- << HYPHEN
-Define BAR U+007C ;|
-Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
-;Define NUL U+00A6;
-Define Ha U+0623
-Define Hi U+0625
-Define Hy U+0626
-Define Hw U+0624
-Define Hh U+06C0 ;; = U+0647 U+0654
-Define HA U+0622
-Define HB U+0640 U+0654
-Define HBAR U+0621 ; '|
-
-pass(Unicode)
-
-U+E000 > ; eliminate special code for capitalization in transliterations
-
-pass(Unicode)
-
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [AVWL] = (U+064B..U+0650);
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0047 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;a..z A E I O U B N T Y ^ . _ " "" `
-Class [BRACKETS] = (U+003C U+003E U+00AB U+00BB U+0028 U+0029 U+005B U+005D U+2018 U+2019 U+201C U+201D); < > () « » [ ] ‘ ’ “ ”
-Class [PUNCT] = (V SC P CO)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-Class [Uwu] = (U+0055 U+0077 U+0075) ;(U w u)
-;Class [ae] = (U+0061 U+0065) ;(a e)
-;Class [ou] = (U+0075 U+006F) ;(u o)
-Class [Iyi] = (U+0069 U+0079 U+0049)
-Class [UI] = (U+0049 U+0055) ; U I
-Class [Digits] = (U+0030..U+0039)
-
-Define BEG (#|Z|[BRACKETS])
-Define END (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #)
-Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
-
-; special ligatures
-;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
-;; The BAR is used in the DMG transliteration to suppress the initial A
-(a|A) BAR? l Z LLAH > U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+0644 U+0644 U+0647 ;; 'll_ah' -> 'l l h'
-;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
-U+0041 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'ALLAH'
-U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
-
-U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
-U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
-U+0029 U+0029 > U+FD3E ;; '))' : ornate left par
-U+0052 U+0049 U+0059 U+0041 U+004C > U+FDFC ;; 'RIYAL' : Saudi currency sign
-;; most fonts won't have the following ones:
-U+0053 U+0041 U+004C U+004C U+0041 U+0053 U+0054 U+004F U+0050 > U+FDF0 ;; 'SALLASTOP' (.sallY with "ye-barree", Quranic stop sign)
-U+0051 U+0041 U+004C U+0041 > U+FDF1 ;; 'QALA' : qalY with ye-barree, Quranic stop sign
-U+0041 U+004B U+0042 U+0041 U+0052 > U+FDF3 ;; 'AKBAR'
-U+004D U+0055 U+0048 U+0041 U+004D U+004D U+0041 U+0044 > U+FDF4 ;; 'MUHAMMAD'
-U+0053 U+0041 U+004C U+0041 U+004D > U+FDF5 ;; 'SALAM'
-U+0052 U+0041 U+0053 U+004F ? U+0055 U+004C > U+FDF6 ;; 'RASUL' (also unicode 'RASOUL')
-U+0041 U+004C U+0041 U+0059 U+0048 (U+0049|U+0045) > U+FDF7 ;; 'ALAYHI' (also unicode 'ALAYHE')
-U+0057 U+0041 U+0053 U+0041 U+004C U+004C U+0041 U+004D > U+FDF8 ;; 'WASALLAM'
-U+0053 U+0041 U+004C U+004C U+0041 > U+FDF9 ;; 'SALLA'
-U+004A U+0041 U+004C U+004C U+0041 > U+FDFB ;; 'JALLA' : "jalla jalAluhu"
-U+0042 U+0041 U+0053 U+004D U+0041 U+004C U+0041 > U+FDFD ;; 'BASMALA' : very few fonts have this ligature afaik
-
-U+005E U+0053 U+004C U+0059 > U+06D6 ;; ^SLY
-U+005E U+0051 U+004C U+0059 > U+06D7 ;; ^QLY
-U+005E U+004D U+0049 U+004D > U+06D8 ;; ^MIM-
-U+005E U+004C U+0041 > U+06D9 ;; ^LA
-U+005E U+004A U+0049 U+004D > U+06DA ;; ^JIM
-U+005E U+0044 U+004F U+0054 U+0053 > U+06DB ;; ^DOTS
-U+005E U+0053 U+0049 U+004E > U+06DC ;; ^SIN
-U+0048 U+0049 U+005A U+0042 > U+06DE ;; HIZB
-U+0043 U+0049 U+0052 U+0043 U+005A U+0045 U+0052 U+004F > U+06DF ;; CIRCZERO
-U+0052 U+0045 U+0043 U+0054 U+005A U+0045 U+0052 U+004F > U+06E0 ;; RECTZERO
-U+005E U+004A U+0041 U+005A U+004D > U+06E1 ;; ^JAZM
-U+005E U+004D U+0049 U+004D > U+06E2 ;; ^MIM
-U+005F U+0053 U+0049 U+004E > U+06E3 ;; _SIN
-U+005E U+004D U+0041 U+0044 U+0044 U+0041 > U+06E4 ;; ^MADDA
-U+0057 U+0041 U+0057 > U+06E5 ;; WAW
-U+0059 U+0045 U+0048 > U+06E6 ;; YEH
-U+005E U+0059 U+0045 U+0048 > U+06E7 ;; ^YEH
-U+005E U+004E U+0055 U+004E > U+06E8 ;; ^NUN
-U+0053 U+0041 U+004A U+0044 U+0041 > U+06E9 ;; SAJDA
-U+005F U+0053 U+0054 U+004F U+0050 > U+06EA ;; _STOP
-U+005E U+0053 U+0054 U+004F U+0050 > U+06EB ;; ^STOP
-U+005E U+0052 U+0053 U+0054 U+004F U+0050 > U+06EC ;; ^RSTOP
-U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
-
-U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
-
-
-; vowels
-u u > U
-i i > I
-a a > A
-[AVWL] > ; strip off vowels when writing UTF-8 Arabic with novoc mode
-CO O > U+06FC ;
-a e > a y
-a o > a w
-CO U > U+06C7 ;
-e > i ;; but not pashto > U+0659 and kashmiri > y + U+0658 (U+06CE is kurdish)
-o > u
-E > I
-O > U
-
-
-
-;; initial characters ...
-a l Z / BEG _ > U+0627 l Z
-H l Z / BEG _ > U+0627 l Z
-;; wasla on initial alif : NEW! NOT TESTED!
-H / BEG _ l l > U+0627 ;
-[VWL]=v1 / BEG _ > A @v1
-A / BEG _ > A a
-Q?=q1 U / BEG _ > A @q1 u w ; -U
-; Q?=q1 I / BEG _ > A @q1 i y ; -I ; but not when I is final FIXME!!!
-Q?=q1 I / BEG _ > A @q1 i y ; except for Persian, coz of ezafe rules
-
-
-;; Words with anomalous orthography:
-
-; mi'aT -> ماية
-;;; i H / m Q ? _ Q ? a ? (T|t) > i A Hy
-m Q i H Q a / _ (T|t) > m Q i A Hy Q a
-m Q i H a / _ (T|t) > m Q i A Hy
-m i H Q a / _ (T|t) > m A Hy Q a
-m i H a / _ (T|t) > m A Hy
-
-
-;; contextual analysis of hamzas
-;; THESE DO NOT APPLY FOR SINDHI
-
-; initial hamzas
-H / (#|^[LTR]) _ Q? [Iyi] > Hi
-H Q A / (#|^[LTR]) _ > HA ; alif madda
-H / (#|^[LTR]) _ Q? [Uwu] > Ha
-H / (#|^[LTR]) _ Q? a > Ha
-Q H / (#|^[LTR]) _ > HB ; quoted isolated hamza at beginning of word
-
-; quoted hamzas in contextual mode, equivalent to verbatim mode
-a Q H > Ha
-i Q H > Hi
-y Q H > Hy
-w Q H > Hw
-h Q H > Hh
-A Q H > HA
-B Q H > HB
-BAR Q H > HBAR
-
-; hamza + fathatan
-H / a _ Q? AN > Ha
-;;H / [Iyi] _ Q? AN > Hy
-H / _ Q? AN > Hy
-
-;final hamzas
-H / A _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Uw] _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Iy] _ Q? (i N?|u N?)? (#|^[LTR]) > HBAR ; not AN ...
-H / a _ Q? (#|^[LTR]) > Ha ; not AN...
-H / a _ Q? (u|i) N? (#|^[LTR]) > Ha ; not AN...
-H / i _ Q? [VWL]? N? (#|^[LTR]) > Hy
-H / u _ Q? [VWL]? N? (#|^[LTR]) > Hw
-
-;;and more hamzas ...
-
-; n°1: kasra/ya
-H / [LTR] _ Q? [Iyi] ^N > Hy
-H / [Iyi] _ > Hy
-
-; n°2: damma/waw
-H / [LTR] _ Q? (U|u) ^N > Hw
-H / (U|u) _ Q? ^[Iyi] > Hw
-H / U _ > HBAR
-
-; n°3: fatha/alif
-H Q? A > HA
-H / A _ Q? a > HBAR
-H / ^[UI] _ Q? a > Ha
-H / a _ Q? ^[UI] > Ha
-
-
-pass(Unicode)
-
-Class [Digits] = (U+0030..U+0039)
-Class [ArDigits] = (U+0660..U+0669)
-Class [ArEasternDigits] = (U+06F0..U+06F9)
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;(a..z A E I O U B N T Y ^ . _ " "" `)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-
-
-
-
-;normal code
-
-
-(P z|U+1E93) (P z|U+1E93) > U+0638 U+0651 ;;SHADDA
-(P z|U+1E93) > U+0638
-C z C z > U+0698 U+0651 ;;SHADDA
-C z > U+0698
-V z V z > U+0696 U+0651 ;;SHADDA
-V z > U+0696 ;pashto
-z z > U+0632 U+0651 ;;SHADDA
-z > U+0632
-Y Y > U+0649 U+0651 ;;SHADDA
-Y > U+0649
-P I P I / _ # > U+06CC U+0651 ;; SHADDA
-P I / _ # > U+06CC ;; workaround to have ya without dots in Arabic
-y y > U+064A U+0651 ;;SHADDA
-y > U+064A
-v v > U+06A4 U+0651 ;;SHADDA
-v > U+06A4
-W > U+0648 U+0627 ; waw + alif
-C U > U+064F U+0648 U+0653; historical spelling : madda on waw
-Q U [Uw] > U+064F U+0648 U+0651 ;;SHADDA
-Q U > U+064F U+0648
-[Uw] [Uw] > U+0648 U+0651 ;;SHADDA
-[Uw] > U+0648
-C w C w > U+06C9 U+0651 ;;SHADDA
-C w > U+06C9
-CO w CO w > U+06CA U+0651 ;,SHADDA
-CO w > U+06CA
-Q u N > U+064C
-u N >
-Q u > U+064F
-V t V t > U+0679 U+0651 ;;SHADDA
-V t > U+0679 ;urdu
-UL (t|s) UL (t|s) > U+062B U+0651 ;;SHADDA
-UL (t|s) > U+062B
-(P t|U+1E6D) (P t|U+1E6D) > U+0637 U+0651 ;;SHADDA
-(P t|U+1E6D) > U+0637
-t t > U+062A U+0651 ;;SHADDA
-t > U+062A
-T T Q AN > U+0629 U+0651 U+064B ;;SHADDA
-T Q AN > U+0629 U+064B
-T AN > U+0629
-T T > U+0629 U+0651 ;;SHADDA
-T > U+0629
-C s C s > U+0634 U+0651 ;;SHADDA
-C s > U+0634
-(P s|U+1E63) (P s|U+1E63) > U+0635 U+0651 ;;SHADDA
-(P s|U+1E63) > U+0635
-V s V s > U+069A U+0651 ;;SHADDA
-V s > U+069A ;Pashto
-CO s CO s > U+069B U+0651 ;;SHADDA
-CO s > U+069B ; sin with 3 dots below
-s s > U+0633 U+0651 ;;SHADDA
-s > U+0633
-C r C r > U+06EF U+0651 ;;SHADDA ; missing in ArabTeX <<<
-C r > U+06EF
-CO r CO r > U+0697 U+0651 ;;SHADDA ; missing in ArabTeX <<<
-CO r > U+0697 ; Dargwa language, Dagestan
-P r P r > U+0694 U+0651 ;;SHADDA
-P r > U+0694 ; r with dot below; in Kurdish .r -> 0694
-V r V r > U+0691 U+0651 ;;SHADDA
-V r > U+0691 ;Urdu
-r r > U+0631 U+0651 ;;SHADDA
-r > U+0631
-P q P q > U+066F U+0651 ;;SHADDA
-P q > U+066F
-q q > U+0642 U+0651 ;;SHADDA
-q > U+0642
-p p > U+067E U+0651 ;;SHADDA
-p > U+067E
-CO n CO n > U+06B1 U+0651 ;;SHADDA
-CO n > U+06B1
-C n C n > U+06AD U+0651 ;;SHADDA
-C n > U+06AD
-P n P n > U+06BA U+0651 ;;SHADDA
-P n > U+06BA ; urdu
-V n V n > U+06BC U+0651 ;;SHADDA
-V n > U+06BC ; Pashto
-n n > U+0646 U+0651 ;;SHADDA
-n > U+0646
-m m > U+0645 U+0651 ;;SHADDA
-m > U+0645
-P l P l > U+06B6 U+0651 ;
-P l > U+06B6 ; ADDED <<<
-C l C l > U+06B5 U+0651 ;;SHADDA
-C l > U+06B5 ;kurdish
-l l > U+0644 U+0651 ;;SHADDA
-l > U+0644
-P k P k > U+06A9 U+0651 ;;SHADDA
-P k > U+06A9 ; pashto urdu
-UL k UL k > U+063A U+0651 ;;SHADDA
-UL k > U+063A
-k k > U+0643 U+0651 ;;SHADDA
-k > U+0643
-C g C g > U+062C U+0651 ;;SHADDA
-C g > U+062C
-CO j CO j > U+0684 U+0651 ;;SHADDA
-CO j > U+0684
-j j > U+062C U+0651 ;;SHADDA
-j > U+062C
-Q I > U+0650 U+064A
-C I > U+0650 U+064A U+0653 ; historical spelling : madda on ya
-UL I > ; suggestion of O. Smrz (arabtex-plus project) URL = ###
-I > U+064A
-Q i N > U+064D
-i N > ;
-Q i > U+0650
-x x > U+062E U+0651 ;;SHADDA
-x > U+062E
-UL h UL h > U+062E U+0651 ;;SHADDA
-UL h > U+062E
-(P h|U+1E25) (P h|U+1E25) > U+062D U+0651 ;;SHADDA
-(P h|U+1E25) > U+062D
-V h V h > U+06C1 U+0651 ;;SHADDA
-V h > U+06C1
-h h > U+0647 U+0651 ;;SHADDA
-h > U+0647
-CO g CO g > U+06B3 U+0651 ;;SHADDA
-CO g > U+06B3
-V g V g > U+06AC U+0651 ;;SHADDA
-V g > U+06AC ; kaf with dot above
-P g P g > U+063A U+0651 ;;SHADDA
-P g > U+063A
-g g > U+06AF U+0651 ;;SHADDA
-g > U+06AF
-G G > U+06AB U+0651 ;;SHADDA
-G > U+06AB ;pashto
-P f P f > U+06A1 U+0651 ;;SHADDA
-P f > U+06A1
-f f > U+0641 U+0651 ;;SHADDA
-f > U+0641
-V d V d > U+068A U+0651 ;;SHADDA
-V d > U+068A
-P V d P V d > U+068B U+0651 ;;SHADDA
-P V d > U+068B ;; (like U+0688 with dot below, for Lahnda = Western Punjabi)
-C d C d > U+06EE U+0651 ;;SHADDA
-C d > U+06EE ; not defined in ArabTeX
-CO d CO d > U+068F U+0651 ;;SHADDA
-CO d > U+068F
-UL (d|z) UL (d|z) > U+0630 U+0651 ;;SHADDA
-UL (d|z) > U+0630
-(P d|U+1E0D) (P d|U+1E0D) > U+0636 U+0651 ;;SHADDA
-(P d|U+1E0D) > U+0636
-d d > U+062F U+0651 ;;SHADDA
-d > U+062F
-V c V c > U+0685 U+0651 ;;SHADDA
-V c > U+0685 ;pashto
-C c C c > U+0686 U+0651 ;;SHADDA
-C c > U+0686
-P C c P C c > U+06BF U+0651 ;;SHADDA
-P C c > U+06BF ;; cheh with dot above <<<
-c c > U+0681 U+0651 ;;SHADDA
-c > U+0681 ; ح with hamza above
-CO c CO c > U+0682 U+0651 ;;SHADDA
-CO c > U+0682 ; old pashto
-CO b CO b > U+067B U+0651 ;;SHADDA
-CO b > U+067B
-P b P b > U+066E U+0651 ;;SHADDA
-P b > U+066E
-b b > U+0628 U+0651 ;;SHADDA
-b > U+0628
-H A > U+0622
-C A > U+064E U+0622 ; historical spelling
-UL A > U+0649
-UL a > U+0670
-UL u > U+0657 ; inverted damma
-UL i > U+0656 ; subscript alif
-Q AN / (A H|Ha) _ > U+064B
-AN / (A H|Ha) _ > ;
-Q AN > U+0627 U+064B
-AN > U+0627
-Q a > U+064E
-Q A > U+064E U+0627
-A > U+0627
-Ain Ain > U+0639 U+0651 ;;SHADDA
-Ain > U+0639
-H H > U+0621 U+0651 ;;SHADDA
-H > U+0621
-U+002C / [Digits] _ [Digits] > U+002C ; comma in numerical context not an Arabic comma
-Z Z / [Digits] _ [Digits] > U+2013 ; two hyphens in numerical context -> endash
-(Z|U+005D|U+005B|U+0028|U+0029)=xx / [Digits] _ [Digits] > U+202D @xx U+202C ; hyphen or brackets in numerical context: surrounded by LRO & PDF marks
-[Digits] > [ArDigits]
-Z Z Z / # _ # > U+2014
-Z Z / # _ # > U+2013
-Z Z > U+0640
-B > U+0640
-Z / # _ > U+200D ; -x > force initial form with "zero-width joiner"
-Z / _ # > U+200D ; x- > force final form
-U+003C U+003C > U+00BB ;<<
-U+003E U+003E > U+00AB ;>>
-U+00AB > U+00BB
-U+00BB > U+00AB
-UL > U+0640 ;_
-U+003F > U+061F ;?
-U+003B > U+061B ;;
-U+003A U+003A > U+061E ;; '::' ligature 'DOTS' also defined above...
-U+002C > U+060C ;,
-U+005D / [LTR] _ [LTR] > U+200D U+005D U+200D ; keep shaping when inserting ...[...]... ...
-U+005B / [LTR] _ [LTR] > U+200D U+005B U+200D ; (but of course this screws up contextual
- ; analysis, so quoting of hamzas etc may be necessary
-;U+005D > U+005B ;] these are automatically mirrored, following Unicode rules
-;U+005B > U+005D ;[
-[VWL] > ;stripoff vowels
-Q > U+0652
-U+00B0 > U+0652 ; °
-N > ;
-C > ;^
-Z > ;-
-BAR > ;|
-
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-novoc.tec
deleted file mode 100644
index 9e0f4c98f80..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-novoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-pashto-fullvoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-pashto-fullvoc.map
deleted file mode 100644
index 7b4d8a0fcc2..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-pashto-fullvoc.map
+++ /dev/null
@@ -1,491 +0,0 @@
-LHSName "ArabTeX-pashto-fullvocalized"
-RHSName "UNICODE"
-
-Define a U+0061 ;a
-Define b U+0062 ;b
-Define c U+0063 ;c
-Define d U+0064 ;d
-Define e U+0065 ;e
-Define f U+0066 ;f
-Define g U+0067 ;g
-Define h U+0068 ;h
-Define i U+0069 ;i
-Define j U+006A ;j
-Define k U+006B ;k
-Define l U+006C ;l
-Define m U+006D ;m
-Define n U+006E ;n
-Define o U+006F ;o
-Define p U+0070 ;p
-Define q U+0071 ;q
-Define r U+0072 ;r
-Define s U+0073 ;s
-Define t U+0074 ;t
-Define u U+0075 ;u
-Define v U+0076 ;v
-Define w U+0077 ;w
-Define x U+0078 ;x
-Define y U+0079 ;y
-Define z U+007A ;z
-Define A U+0041 ;A
-Define B U+0042 ;B
-Define E U+0045 ;E
-Define G U+0047 ;G
-Define I U+0049 ;I
-Define N U+004E ;N
-Define O U+004F ;O
-Define T U+0054 ;T
-Define U U+0055 ;U
-Define W U+0057 ;W
-Define Y U+0059 ;Y
-Define C U+005E ;^ << CARET
-Define UL U+005F ;_ << UNDERLINE
-Define P U+002E ;. << DOT
-Define V U+002C ;, << COMMA (_V_irgule)
-Define CO U+003A ;: << COLON
-Define SC U+003B ;; << SEMICOLON
-Define Ain U+0060 ;`
-Define H U+0027 ;' << HAMZA
-Define Q U+0022 ;" << QUOTE
-Define Z U+002D ;- << HYPHEN
-Define BAR U+007C ;|
-Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
-;Define NUL U+00A6;
-Define Ha U+0623
-Define Hi U+0625
-Define Hy U+0626
-Define Hw U+0624
-Define Hh U+06C0 ;; = U+0647 U+0654
-Define HA U+0622
-Define HB U+0640 U+0654
-Define HBAR U+0621 ; '|
-
-pass(Unicode)
-
-U+E000 > ; eliminate special code for capitalization in transliterations
-
-pass(Unicode)
-
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [AVWL] = (U+064B..U+0650);
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0047 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;a..z A E I O U B N T Y ^ . _ " "" `
-Class [BRACKETS] = (U+003C U+003E U+00AB U+00BB U+0028 U+0029 U+005B U+005D U+2018 U+2019 U+201C U+201D); < > () « » [ ] ‘ ’ “ ”
-Class [PUNCT] = (V SC P CO)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-Class [Uwu] = (U+0055 U+0077 U+0075) ;(U w u)
-;Class [ae] = (U+0061 U+0065) ;(a e)
-;Class [ou] = (U+0075 U+006F) ;(u o)
-Class [Iyi] = (U+0069 U+0079 U+0049)
-Class [UI] = (U+0049 U+0055) ; U I
-Class [Digits] = (U+0030..U+0039)
-
-Define BEG (#|Z|[BRACKETS])
-Define END (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #)
-Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
-
-; special ligatures
-;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
-;; The BAR is used in the DMG transliteration to suppress the initial A
-(a|A) BAR? l Z LLAH > U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+0644 U+0644 U+0647 ;; 'll_ah' -> 'l l h'
-;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
-U+0041 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'ALLAH'
-U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
-
-U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
-U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
-U+0029 U+0029 > U+FD3E ;; '))' : ornate left par
-U+0052 U+0049 U+0059 U+0041 U+004C > U+FDFC ;; 'RIYAL' : Saudi currency sign
-;; most fonts won't have the following ones:
-U+0053 U+0041 U+004C U+004C U+0041 U+0053 U+0054 U+004F U+0050 > U+FDF0 ;; 'SALLASTOP' (.sallY with "ye-barree", Quranic stop sign)
-U+0051 U+0041 U+004C U+0041 > U+FDF1 ;; 'QALA' : qalY with ye-barree, Quranic stop sign
-U+0041 U+004B U+0042 U+0041 U+0052 > U+FDF3 ;; 'AKBAR'
-U+004D U+0055 U+0048 U+0041 U+004D U+004D U+0041 U+0044 > U+FDF4 ;; 'MUHAMMAD'
-U+0053 U+0041 U+004C U+0041 U+004D > U+FDF5 ;; 'SALAM'
-U+0052 U+0041 U+0053 U+004F ? U+0055 U+004C > U+FDF6 ;; 'RASUL' (also unicode 'RASOUL')
-U+0041 U+004C U+0041 U+0059 U+0048 (U+0049|U+0045) > U+FDF7 ;; 'ALAYHI' (also unicode 'ALAYHE')
-U+0057 U+0041 U+0053 U+0041 U+004C U+004C U+0041 U+004D > U+FDF8 ;; 'WASALLAM'
-U+0053 U+0041 U+004C U+004C U+0041 > U+FDF9 ;; 'SALLA'
-U+004A U+0041 U+004C U+004C U+0041 > U+FDFB ;; 'JALLA' : "jalla jalAluhu"
-U+0042 U+0041 U+0053 U+004D U+0041 U+004C U+0041 > U+FDFD ;; 'BASMALA' : very few fonts have this ligature afaik
-
-U+005E U+0053 U+004C U+0059 > U+06D6 ;; ^SLY
-U+005E U+0051 U+004C U+0059 > U+06D7 ;; ^QLY
-U+005E U+004D U+0049 U+004D > U+06D8 ;; ^MIM-
-U+005E U+004C U+0041 > U+06D9 ;; ^LA
-U+005E U+004A U+0049 U+004D > U+06DA ;; ^JIM
-U+005E U+0044 U+004F U+0054 U+0053 > U+06DB ;; ^DOTS
-U+005E U+0053 U+0049 U+004E > U+06DC ;; ^SIN
-U+0048 U+0049 U+005A U+0042 > U+06DE ;; HIZB
-U+0043 U+0049 U+0052 U+0043 U+005A U+0045 U+0052 U+004F > U+06DF ;; CIRCZERO
-U+0052 U+0045 U+0043 U+0054 U+005A U+0045 U+0052 U+004F > U+06E0 ;; RECTZERO
-U+005E U+004A U+0041 U+005A U+004D > U+06E1 ;; ^JAZM
-U+005E U+004D U+0049 U+004D > U+06E2 ;; ^MIM
-U+005F U+0053 U+0049 U+004E > U+06E3 ;; _SIN
-U+005E U+004D U+0041 U+0044 U+0044 U+0041 > U+06E4 ;; ^MADDA
-U+0057 U+0041 U+0057 > U+06E5 ;; WAW
-U+0059 U+0045 U+0048 > U+06E6 ;; YEH
-U+005E U+0059 U+0045 U+0048 > U+06E7 ;; ^YEH
-U+005E U+004E U+0055 U+004E > U+06E8 ;; ^NUN
-U+0053 U+0041 U+004A U+0044 U+0041 > U+06E9 ;; SAJDA
-U+005F U+0053 U+0054 U+004F U+0050 > U+06EA ;; _STOP
-U+005E U+0053 U+0054 U+004F U+0050 > U+06EB ;; ^STOP
-U+005E U+0052 U+0053 U+0054 U+004F U+0050 > U+06EC ;; ^RSTOP
-U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
-
-U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
-
-
-; vowels
-u u > U
-i i > I
-a a > A
-a e > a U+0626
-E e > U+0659 U+06CD
-e e > U+0659 U+0626
-E > U+0659 U+06D0
-CO O > U+06FC ;
-O > U+0657 w
-o > U+0657
-a o > a w
-CO U > U+06C7 ;
-e > U+0659
-I / _ # > i y
-
-
-;; Persian ezafe (ALL BUT ARABIC AND UIGHUR)
-U+0048 Z UL? (Q? (i|e))=vv / _ END > U+06C0 @vv U+200C ;H-i -> heh+hamza final; what about 06C2 in Urdu ?<<<
-U+0048 Z Q?=qq (I|E)=vv / _ END > h U+0020 U+0627 @qq i @vv ; H-I
-Q?=q1 (I|E) Z UL? Q?=q2 (i|e) / _ END > @q1 i U+0626 @q2 i U+200C ; ...I-e
-Z Q?=qq I / (A|U) _ ENDZ > U+0626 @qq i y ; ...A-I or ...U-I
-Z UL? (Q? (i|e))=vv / (A|U) _ END > U+0649 @vv ; ...A-i or ...U-i
-Z Q?=q1 (e|i) / _ ENDZ > @q1 i ; ...-i
-Z / U+0048 _ > U+0020 ;
-b Q?=q1 (e|i) Q?=q2 U / # _ > b @q1 i U+0627 @q2 u w ;; special case of prep be without hyphen
-
-;; initial characters ...
-a l Z / BEG _ > U+0627 l Z
-;; wasla on initial alif : NEW! NOT TESTED!
-H / BEG _ l l > U+0671 ; e.g. alla_dI -> 'lla_dI
-[VWL]=v1 / BEG _ > U+0627 @v1
-Q?=q1 U / BEG _ > U+0627 @q1 u w ; -U
-; Q?=q1 I / BEG _ > U+0627 @q1 i y ; -I
-Q?=q1 I / BEG _ > U+0627 @q1 i y
-
-
-;; Words with anomalous orthography:
-
-; mi'aT -> ماية
-;;; i H / m Q ? _ Q ? a ? (T|t) > i A Hy
-m Q i H Q a / _ (T|t) > m U+0627 Hy
-m Q i H a / _ (T|t) > m U+0627 Hy a
-m i H Q a / _ (T|t) > m i U+0627 Hy
-m i H a / _ (T|t) > m i U+0627 Hy a
-
-
-;; contextual analysis of hamzas
-;; THESE DO NOT APPLY FOR SINDHI
-
-; initial hamzas
-H / (#|^[LTR]) _ Q? [Iyi] > Hi
-H Q A / (#|^[LTR]) _ > HA ; alif madda
-H / (#|^[LTR]) _ Q? [Uwu] > Ha
-H / (#|^[LTR]) _ Q? a > Ha
-Q H / (#|^[LTR]) _ > HB ; quoted isolated hamza at beginning of word
-
-; quoted hamzas in contextual mode, equivalent to verbatim mode
-a Q H > Ha
-i Q H > Hi
-y Q H > Hy
-w Q H > Hw
-h Q H > Hh
-A Q H > HA
-B Q H > HB
-BAR Q H > HBAR
-
-; hamza + fathatan
-H / a _ Q? AN > Ha
-;;H / [Iyi] _ Q? AN > Hy
-H / _ Q? AN > Hy
-
-;final hamzas
-H / A _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Uw] _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Iy] _ Q? (i N?|u N?)? (#|^[LTR]) > HBAR ; not AN ...
-H / a _ Q? (#|^[LTR]) > Ha ; not AN...
-H / a _ Q? (u|i) N? (#|^[LTR]) > Ha ; not AN...
-H / i _ Q? [VWL]? N? (#|^[LTR]) > Hy
-H / u _ Q? [VWL]? N? (#|^[LTR]) > Hw
-
-;;and more hamzas ...
-
-; n°1: kasra/ya
-H / [LTR] _ Q? [Iyi] ^N > Hy
-H / [Iyi] _ > Hy
-
-; n°2: damma/waw
-H / [LTR] _ Q? (U|u) ^N > Hw
-H / (U|u) _ Q? ^[Iyi] > Hw
-H / U _ > HBAR
-
-; n°3: fatha/alif
-H Q? A > HA
-H / A _ Q? a > HBAR
-H / ^[UI] _ Q? a > Ha
-H / a _ Q? ^[UI] > Ha
-
-
-pass(Unicode)
-
-Class [Digits] = (U+0030..U+0039)
-Class [ArDigits] = (U+0660..U+0669)
-Class [ArEasternDigits] = (U+06F0..U+06F9)
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;(a..z A E I O U B N T Y ^ . _ " "" `)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-
-
-
-
-;normal code
-
-
-(P z|U+1E93) (P z|U+1E93) > U+0638 U+0651 ;;SHADDA
-(P z|U+1E93) > U+0638
-C z C z > U+0698 U+0651 ;;SHADDA
-C z > U+0698
-V z V z > U+0696 U+0651 ;;SHADDA
-V z > U+0696 ;pashto
-z z > U+0632 U+0651 ;;SHADDA
-z > U+0632
-Q Y Y > U+0649 U+0651 ;;SHADDA
-Q Y > U+0649
-Y Y > U+064E U+0649 U+0651 ;;SHADDA
-Y > U+064E U+0649
-;; y / _ # > U+0649 ; y final in persian,ottoman,urdu,pashto,kashmiri has no dots
-y y > U+06CC U+0651 ;;SHADDA
-y > U+06CC ; yeh in persian etc. > iso and final shapes have no dots
-v v > U+06A4 U+0651 ;;SHADDA
-v > U+06A4
-W > U+0648 U+0627 ; waw + alif
-C U > U+064F U+0648 U+0653; historical spelling : madda on waw
-C w C w > U+06C9 U+0651 ;;SHADDA
-C w > U+06C9
-CO w CO w > U+06CA U+0651 ;,SHADDA
-CO w > U+06CA
-U A / _ # > U+064F U+0648 U+0627
-Q U [Uw] > U+0648 U+0651 ;;SHADDA
-Q U > U+0648
-U [Uw] > U+064F U+0648 U+0651 ;;SHADDA
-U > U+064F U+0648
-w w > U+0648 U+0651 ;;SHADDA
-w > U+0648
-Q u N? >
-u N > U+064C
-u > U+064F
-V t V t > U+067C U+0651 ;;SHADDA
-V t > U+067C ; pashto
-UL (t|s) UL (t|s) > U+062B U+0651 ;;SHADDA
-UL (t|s) > U+062B
-(P t|U+1E6D) (P t|U+1E6D) > U+0637 U+0651 ;;SHADDA
-(P t|U+1E6D) > U+0637
-t t > U+062A U+0651 ;;SHADDA
-t > U+062A
-T T Q AN > U+0629 U+0651 ;;SHADDA
-T Q AN > U+0629
-T AN > U+0629 U+064B
-T T > U+0629 U+0651 ;;SHADDA
-T > U+0629
-C s C s > U+0634 U+0651 ;;SHADDA
-C s > U+0634
-(P s|U+1E63) (P s|U+1E63) > U+0635 U+0651 ;;SHADDA
-(P s|U+1E63) > U+0635
-V s V s > U+069A U+0651 ;;SHADDA
-V s > U+069A ;Pashto
-CO s CO s > U+069B U+0651 ;;SHADDA
-CO s > U+069B ; sin with 3 dots below
-s s > U+0633 U+0651 ;;SHADDA
-s > U+0633
-C r C r > U+06EF U+0651 ;;SHADDA ; missing in ArabTeX <<<
-C r > U+06EF
-CO r CO r > U+0697 U+0651 ;;SHADDA ; missing in ArabTeX <<<
-CO r > U+0697 ; Dargwa language, Dagestan
-P r P r > U+0694 U+0651 ;;SHADDA
-P r > U+0694 ; r with dot below; in Kurdish .r -> 0694
-V r V r > U+0693 U+0651 ;;SHADDA
-V r > U+0693 ;Pashto
-r r > U+0631 U+0651 ;;SHADDA
-r > U+0631
-P q P q > U+066F U+0651 ;;SHADDA
-P q > U+066F
-q q > U+0642 U+0651 ;;SHADDA
-q > U+0642
-p p > U+067E U+0651 ;;SHADDA
-p > U+067E
-CO n CO n > U+06B1 U+0651 ;;SHADDA
-CO n > U+06B1
-C n C n > U+06AD U+0651 ;;SHADDA
-C n > U+06AD
-P n P n > U+06BA U+0651 ;;SHADDA
-P n > U+06BA ; urdu
-V n V n > U+06BC U+0651 ;;SHADDA
-V n > U+06BC ; Pashto
-n n > U+0646 U+0651 ;;SHADDA
-n > U+0646
-m m > U+0645 U+0651 ;;SHADDA
-m > U+0645
-P l P l > U+06B6 U+0651 ;
-P l > U+06B6 ; ADDED <<<
-C l C l > U+06B5 U+0651 ;;SHADDA
-C l > U+06B5 ;kurdish
-l l > U+0644 U+0651 ;;SHADDA
-l > U+0644
-P k P k > U+06A9 U+0651 ;;SHADDA
-P k > U+06A9 ; pashto urdu
-UL k UL k > U+063A U+0651 ;;SHADDA
-UL k > U+063A
-k k > U+0643 U+0651 ;;SHADDA
-k > U+0643
-C g C g > U+062C U+0651 ;;SHADDA
-C g > U+062C
-CO j CO j > U+0684 U+0651 ;;SHADDA
-CO j > U+0684
-j j > U+062C U+0651 ;;SHADDA
-j > U+062C
-Q I > U+064A
-I > U+0650 U+064A
-C I > U+0650 U+064A U+0653 ; historical spelling : madda on ya
-UL I > ; suggestion of O. Smrz (arabtex-plus project) URL = ###
-Q i N? > ;
-i N > U+064D
-i > U+0650
-x x > U+062E U+0651 ;;SHADDA
-x > U+062E
-U+0048 Z > U+0647 U+200C U+0020 ;eH-suffix > eH suffix
-U+0048 > U+0647 U+200C ; H is always heh final
-UL h UL h > U+062E U+0651 ;;SHADDA
-UL h > U+062E
-(P h|U+1E25) (P h|U+1E25) > U+062D U+0651 ;;SHADDA
-(P h|U+1E25) > U+062D
-V h V h > U+06C1 U+0651 ;;SHADDA
-V h > U+06C1
-h h > U+0647 U+0651 ;;SHADDA
-h > U+0647
-CO g CO g > U+06B3 U+0651 ;;SHADDA
-CO g > U+06B3
-V g V g > U+06AC U+0651 ;;SHADDA
-V g > U+06AC ; kaf with dot above
-P g P g > U+063A U+0651 ;;SHADDA
-P g > U+063A
-g g > U+06AF U+0651 ;;SHADDA
-g > U+06AF
-G G > U+06AB U+0651 ;;SHADDA
-G > U+06AB ;pashto
-P f P f > U+06A1 U+0651 ;;SHADDA
-P f > U+06A1
-f f > U+0641 U+0651 ;;SHADDA
-f > U+0641
-V d V d > U+0689 U+0651 ;;SHADDA
-V d > U+0689 ;pashto
-P V d P V d > U+068B U+0651 ;;SHADDA
-P V d > U+068B ;; (like U+0688 with dot below, for Lahnda = Western Punjabi)
-C d C d > U+06EE U+0651 ;;SHADDA
-C d > U+06EE ; not defined in ArabTeX
-CO d CO d > U+068F U+0651 ;;SHADDA
-CO d > U+068F
-UL (d|z) UL (d|z) > U+0630 U+0651 ;;SHADDA
-UL (d|z) > U+0630
-(P d|U+1E0D) (P d|U+1E0D) > U+0636 U+0651 ;;SHADDA
-(P d|U+1E0D) > U+0636
-d d > U+062F U+0651 ;;SHADDA
-d > U+062F
-V c V c > U+0685 U+0651 ;;SHADDA
-V c > U+0685 ;pashto
-C c C c > U+0686 U+0651 ;;SHADDA
-C c > U+0686
-P C c P C c > U+06BF U+0651 ;;SHADDA
-P C c > U+06BF ;; cheh with dot above <<<
-c c > U+0681 U+0651 ;;SHADDA
-c > U+0681 ; ح with hamza above
-CO c CO c > U+0682 U+0651 ;;SHADDA
-CO c > U+0682 ; old pashto
-CO b CO b > U+067B U+0651 ;;SHADDA
-CO b > U+067B
-P b P b > U+066E U+0651 ;;SHADDA
-P b > U+066E
-b b > U+0628 U+0651 ;;SHADDA
-b > U+0628
-H A > U+0622
-C A > U+064E U+0622 ; historical spelling
-UL A > U+064E U+0649
-UL a > U+0670
-UL u > U+064F;
-UL i > U+0650;
-Q AN / (A H|Ha) _ > ;
-AN / (A H|Ha) _ > U+064B
-Q AN > U+0627
-AN > U+0627 U+064B
-Q a >
-a > U+064E
-Q A > U+0627
-A > U+064E U+0627
-Ain Ain > U+0639 U+0651 ;;SHADDA
-Ain > U+0639
-H H > U+0621 U+0651 ;;SHADDA
-H > U+0621
-U+002C / [Digits] _ [Digits] > U+002C ; comma in numerical context not an Arabic comma
-Z Z / [Digits] _ [Digits] > U+2013 ; two hyphens in numerical context -> endash
-(Z|U+005D|U+005B|U+0028|U+0029)=xx / [Digits] _ [Digits] > U+202D @xx U+202C ; hyphen or brackets in numerical context: surrounded by LRO & PDF marks
-[Digits] > [ArEasternDigits]
-Z Z Z / # _ # > U+2014
-Z Z / # _ # > U+2013
-Z Z > U+0640
-B > U+0640
-Z / # _ > U+200D ; -x > force initial form with "zero-width joiner"
-Z / _ # > U+200D ; x- > force final form
-U+003C U+003C > U+00BB ;<<
-U+003E U+003E > U+00AB ;>>
-U+00AB > U+00BB
-U+00BB > U+00AB
-UL > U+0640 ;_
-U+003F > U+061F ;?
-U+003B > U+061B ;;
-U+003A U+003A > U+061E ;; '::' ligature 'DOTS' also defined above...
-U+002C > U+060C ;,
-U+005D / [LTR] _ [LTR] > U+200D U+005D U+200D ; keep shaping when inserting ...[...]... ...
-U+005B / [LTR] _ [LTR] > U+200D U+005B U+200D ; (but of course this screws up contextual
- ; analysis, so quoting of hamzas etc may be necessary
-;U+005D > U+005B ;] these are automatically mirrored, following Unicode rules
-;U+005B > U+005D ;[
-Q [VWL] > ;stripoff quoted vowels
-U+00B0 > U+0652 ; °
-N > ;
-C > ;^
-BAR > ;|
-
-pass(Unicode)
-
-Class [CONS] = (U+0621 U+0623 U+0624 U+0626 U+0628 U+062A..U+063A U+0641..U+0647 U+066E U+066F U+0672 U+0675 U+0676 U+0678..U+06BF U+06EE U+06EF U+06FA..U+06FF U+0750..U+076D) ; to be improved: not sure that all glyphs listed (esp for Urdu,Sindhi,etc are really "consonants" in the sense that they can carry a sukun, not to mention that some of these languages may not have a sukun at all ;-)
-Class [VWLX] = (U+0627 U+0648..U+065E U+0670) ; long vowels, vowel signs, shadda, sukun etc.
-Class [VWL] = (U+0627 U+0648..U+0650 U+0670);
-[CONS]=k1 / _ Z? [CONS] ^U+0651 > @k1 U+0652 ; hack: 2nd consonant has no shadda
-U+064E (U+064A|U+0648)=hc / _ (^[VWLX]|#) > U+064E @hc U+0652 ; ay and aw diphtongs
-U+0627 / # _ U+0644 > U+0627 U+064E ; otherwise initial alif takes fatha
-[CONS]=k1 / _ ([CONS]|#) > @k1 U+0652 ; consonant + (consonant or final)
-;; [CONS]=k1 / _ # > @k1 U+0652 ; final consonant
-Q > ;
-Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-pashto-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-pashto-fullvoc.tec
deleted file mode 100644
index b02bb82642f..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-pashto-fullvoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-pashto-novoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-pashto-novoc.map
deleted file mode 100644
index 62536030416..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-pashto-novoc.map
+++ /dev/null
@@ -1,476 +0,0 @@
-LHSName "ArabTeX-pashto-novowels"
-RHSName "UNICODE"
-
-Define a U+0061 ;a
-Define b U+0062 ;b
-Define c U+0063 ;c
-Define d U+0064 ;d
-Define e U+0065 ;e
-Define f U+0066 ;f
-Define g U+0067 ;g
-Define h U+0068 ;h
-Define i U+0069 ;i
-Define j U+006A ;j
-Define k U+006B ;k
-Define l U+006C ;l
-Define m U+006D ;m
-Define n U+006E ;n
-Define o U+006F ;o
-Define p U+0070 ;p
-Define q U+0071 ;q
-Define r U+0072 ;r
-Define s U+0073 ;s
-Define t U+0074 ;t
-Define u U+0075 ;u
-Define v U+0076 ;v
-Define w U+0077 ;w
-Define x U+0078 ;x
-Define y U+0079 ;y
-Define z U+007A ;z
-Define A U+0041 ;A
-Define B U+0042 ;B
-Define E U+0045 ;E
-Define G U+0047 ;G
-Define I U+0049 ;I
-Define N U+004E ;N
-Define O U+004F ;O
-Define T U+0054 ;T
-Define U U+0055 ;U
-Define W U+0057 ;W
-Define Y U+0059 ;Y
-Define C U+005E ;^ << CARET
-Define UL U+005F ;_ << UNDERLINE
-Define P U+002E ;. << DOT
-Define V U+002C ;, << COMMA (_V_irgule)
-Define CO U+003A ;: << COLON
-Define SC U+003B ;; << SEMICOLON
-Define Ain U+0060 ;`
-Define H U+0027 ;' << HAMZA
-Define Q U+0022 ;" << QUOTE
-Define Z U+002D ;- << HYPHEN
-Define BAR U+007C ;|
-Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
-;Define NUL U+00A6;
-Define Ha U+0623
-Define Hi U+0625
-Define Hy U+0626
-Define Hw U+0624
-Define Hh U+06C0 ;; = U+0647 U+0654
-Define HA U+0622
-Define HB U+0640 U+0654
-Define HBAR U+0621 ; '|
-
-pass(Unicode)
-
-U+E000 > ; eliminate special code for capitalization in transliterations
-
-pass(Unicode)
-
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [AVWL] = (U+064B..U+0650);
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0047 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;a..z A E I O U B N T Y ^ . _ " "" `
-Class [BRACKETS] = (U+003C U+003E U+00AB U+00BB U+0028 U+0029 U+005B U+005D U+2018 U+2019 U+201C U+201D); < > () « » [ ] ‘ ’ “ ”
-Class [PUNCT] = (V SC P CO)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-Class [Uwu] = (U+0055 U+0077 U+0075) ;(U w u)
-;Class [ae] = (U+0061 U+0065) ;(a e)
-;Class [ou] = (U+0075 U+006F) ;(u o)
-Class [Iyi] = (U+0069 U+0079 U+0049)
-Class [UI] = (U+0049 U+0055) ; U I
-Class [Digits] = (U+0030..U+0039)
-
-Define BEG (#|Z|[BRACKETS])
-Define END (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #)
-Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
-
-; special ligatures
-;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
-;; The BAR is used in the DMG transliteration to suppress the initial A
-(a|A) BAR? l Z LLAH > U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+0644 U+0644 U+0647 ;; 'll_ah' -> 'l l h'
-;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
-U+0041 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'ALLAH'
-U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
-
-U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
-U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
-U+0029 U+0029 > U+FD3E ;; '))' : ornate left par
-U+0052 U+0049 U+0059 U+0041 U+004C > U+FDFC ;; 'RIYAL' : Saudi currency sign
-;; most fonts won't have the following ones:
-U+0053 U+0041 U+004C U+004C U+0041 U+0053 U+0054 U+004F U+0050 > U+FDF0 ;; 'SALLASTOP' (.sallY with "ye-barree", Quranic stop sign)
-U+0051 U+0041 U+004C U+0041 > U+FDF1 ;; 'QALA' : qalY with ye-barree, Quranic stop sign
-U+0041 U+004B U+0042 U+0041 U+0052 > U+FDF3 ;; 'AKBAR'
-U+004D U+0055 U+0048 U+0041 U+004D U+004D U+0041 U+0044 > U+FDF4 ;; 'MUHAMMAD'
-U+0053 U+0041 U+004C U+0041 U+004D > U+FDF5 ;; 'SALAM'
-U+0052 U+0041 U+0053 U+004F ? U+0055 U+004C > U+FDF6 ;; 'RASUL' (also unicode 'RASOUL')
-U+0041 U+004C U+0041 U+0059 U+0048 (U+0049|U+0045) > U+FDF7 ;; 'ALAYHI' (also unicode 'ALAYHE')
-U+0057 U+0041 U+0053 U+0041 U+004C U+004C U+0041 U+004D > U+FDF8 ;; 'WASALLAM'
-U+0053 U+0041 U+004C U+004C U+0041 > U+FDF9 ;; 'SALLA'
-U+004A U+0041 U+004C U+004C U+0041 > U+FDFB ;; 'JALLA' : "jalla jalAluhu"
-U+0042 U+0041 U+0053 U+004D U+0041 U+004C U+0041 > U+FDFD ;; 'BASMALA' : very few fonts have this ligature afaik
-
-U+005E U+0053 U+004C U+0059 > U+06D6 ;; ^SLY
-U+005E U+0051 U+004C U+0059 > U+06D7 ;; ^QLY
-U+005E U+004D U+0049 U+004D > U+06D8 ;; ^MIM-
-U+005E U+004C U+0041 > U+06D9 ;; ^LA
-U+005E U+004A U+0049 U+004D > U+06DA ;; ^JIM
-U+005E U+0044 U+004F U+0054 U+0053 > U+06DB ;; ^DOTS
-U+005E U+0053 U+0049 U+004E > U+06DC ;; ^SIN
-U+0048 U+0049 U+005A U+0042 > U+06DE ;; HIZB
-U+0043 U+0049 U+0052 U+0043 U+005A U+0045 U+0052 U+004F > U+06DF ;; CIRCZERO
-U+0052 U+0045 U+0043 U+0054 U+005A U+0045 U+0052 U+004F > U+06E0 ;; RECTZERO
-U+005E U+004A U+0041 U+005A U+004D > U+06E1 ;; ^JAZM
-U+005E U+004D U+0049 U+004D > U+06E2 ;; ^MIM
-U+005F U+0053 U+0049 U+004E > U+06E3 ;; _SIN
-U+005E U+004D U+0041 U+0044 U+0044 U+0041 > U+06E4 ;; ^MADDA
-U+0057 U+0041 U+0057 > U+06E5 ;; WAW
-U+0059 U+0045 U+0048 > U+06E6 ;; YEH
-U+005E U+0059 U+0045 U+0048 > U+06E7 ;; ^YEH
-U+005E U+004E U+0055 U+004E > U+06E8 ;; ^NUN
-U+0053 U+0041 U+004A U+0044 U+0041 > U+06E9 ;; SAJDA
-U+005F U+0053 U+0054 U+004F U+0050 > U+06EA ;; _STOP
-U+005E U+0053 U+0054 U+004F U+0050 > U+06EB ;; ^STOP
-U+005E U+0052 U+0053 U+0054 U+004F U+0050 > U+06EC ;; ^RSTOP
-U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
-
-U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
-
-
-; vowels
-u u > U
-i i > I
-a a > A
-[AVWL] > ; strip off vowels when writing UTF-8 Arabic with novoc mode
-a e > a U+0626
-E e > U+0659 U+06CD
-e e > U+0659 U+0626
-E > U+0659 U+06D0
-CO O > U+06FC ;
-O > U+0657 w
-o > U+0657
-a o > a w
-CO U > U+06C7 ;
-e > U+0659
-I / _ # > i y
-
-
-;; Persian ezafe (ALL BUT ARABIC AND UIGHUR)
-U+0048 Z UL? (Q? (i|e))=vv / _ END > U+06C0 @vv U+200C ;H-i -> heh+hamza final; what about 06C2 in Urdu ?<<<
-U+0048 Z Q?=qq (I|E)=vv / _ END > h U+0020 U+0627 @qq i @vv ; H-I
-Q?=q1 (I|E) Z UL? Q?=q2 (i|e) / _ END > @q1 i U+0626 @q2 i U+200C ; ...I-e
-Z Q?=qq I / (A|U) _ ENDZ > U+0626 @qq i y ; ...A-I or ...U-I
-Z UL? (Q? (i|e))=vv / (A|U) _ END > U+0649 @vv ; ...A-i or ...U-i
-Z Q?=q1 (e|i) / _ ENDZ > @q1 i ; ...-i
-Z / U+0048 _ > U+0020 ;
-b Q?=q1 (e|i) Q?=q2 U / # _ > b @q1 i U+0627 @q2 u w ;; special case of prep be without hyphen
-
-;; initial characters ...
-a l Z / BEG _ > U+0627 l Z
-;; wasla on initial alif : NEW! NOT TESTED!
-H / BEG _ l l > U+0627 ;
-[VWL]=v1 / BEG _ > A @v1
-Q?=q1 U / BEG _ > A @q1 u w ; -U
-; Q?=q1 I / BEG _ > A @q1 i y ; -I ; but not when I is final FIXME!!!
-Q?=q1 I / BEG _ > A @q1 i y ; except for Persian, coz of ezafe rules
-
-
-;; Words with anomalous orthography:
-
-; mi'aT -> ماية
-;;; i H / m Q ? _ Q ? a ? (T|t) > i A Hy
-m Q i H Q a / _ (T|t) > m Q i A Hy Q a
-m Q i H a / _ (T|t) > m Q i A Hy
-m i H Q a / _ (T|t) > m A Hy Q a
-m i H a / _ (T|t) > m A Hy
-
-
-;; contextual analysis of hamzas
-;; THESE DO NOT APPLY FOR SINDHI
-
-; initial hamzas
-H / (#|^[LTR]) _ Q? [Iyi] > Hi
-H Q A / (#|^[LTR]) _ > HA ; alif madda
-H / (#|^[LTR]) _ Q? [Uwu] > Ha
-H / (#|^[LTR]) _ Q? a > Ha
-Q H / (#|^[LTR]) _ > HB ; quoted isolated hamza at beginning of word
-
-; quoted hamzas in contextual mode, equivalent to verbatim mode
-a Q H > Ha
-i Q H > Hi
-y Q H > Hy
-w Q H > Hw
-h Q H > Hh
-A Q H > HA
-B Q H > HB
-BAR Q H > HBAR
-
-; hamza + fathatan
-H / a _ Q? AN > Ha
-;;H / [Iyi] _ Q? AN > Hy
-H / _ Q? AN > Hy
-
-;final hamzas
-H / A _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Uw] _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Iy] _ Q? (i N?|u N?)? (#|^[LTR]) > HBAR ; not AN ...
-H / a _ Q? (#|^[LTR]) > Ha ; not AN...
-H / a _ Q? (u|i) N? (#|^[LTR]) > Ha ; not AN...
-H / i _ Q? [VWL]? N? (#|^[LTR]) > Hy
-H / u _ Q? [VWL]? N? (#|^[LTR]) > Hw
-
-;;and more hamzas ...
-
-; n°1: kasra/ya
-H / [LTR] _ Q? [Iyi] ^N > Hy
-H / [Iyi] _ > Hy
-
-; n°2: damma/waw
-H / [LTR] _ Q? (U|u) ^N > Hw
-H / (U|u) _ Q? ^[Iyi] > Hw
-H / U _ > HBAR
-
-; n°3: fatha/alif
-H Q? A > HA
-H / A _ Q? a > HBAR
-H / ^[UI] _ Q? a > Ha
-H / a _ Q? ^[UI] > Ha
-
-
-pass(Unicode)
-
-Class [Digits] = (U+0030..U+0039)
-Class [ArDigits] = (U+0660..U+0669)
-Class [ArEasternDigits] = (U+06F0..U+06F9)
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;(a..z A E I O U B N T Y ^ . _ " "" `)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-
-
-
-
-;normal code
-
-
-(P z|U+1E93) (P z|U+1E93) > U+0638 U+0651 ;;SHADDA
-(P z|U+1E93) > U+0638
-C z C z > U+0698 U+0651 ;;SHADDA
-C z > U+0698
-V z V z > U+0696 U+0651 ;;SHADDA
-V z > U+0696 ;pashto
-z z > U+0632 U+0651 ;;SHADDA
-z > U+0632
-Y Y > U+0649 U+0651 ;;SHADDA
-Y > U+0649
-;; y / _ # > U+0649 ; y final in persian,ottoman,urdu,pashto,kashmiri has no dots
-y y > U+06CC U+0651 ;;SHADDA
-y > U+06CC ; yeh in persian etc. > iso and final shapes have no dots
-v v > U+06A4 U+0651 ;;SHADDA
-v > U+06A4
-W > U+0648 U+0627 ; waw + alif
-C U > U+064F U+0648 U+0653; historical spelling : madda on waw
-Q U [Uw] > U+064F U+0648 U+0651 ;;SHADDA
-Q U > U+064F U+0648
-[Uw] [Uw] > U+0648 U+0651 ;;SHADDA
-[Uw] > U+0648
-C w C w > U+06C9 U+0651 ;;SHADDA
-C w > U+06C9
-CO w CO w > U+06CA U+0651 ;,SHADDA
-CO w > U+06CA
-Q u N > U+064C
-u N >
-Q u > U+064F
-V t V t > U+067C U+0651 ;;SHADDA
-V t > U+067C ; pashto
-UL (t|s) UL (t|s) > U+062B U+0651 ;;SHADDA
-UL (t|s) > U+062B
-(P t|U+1E6D) (P t|U+1E6D) > U+0637 U+0651 ;;SHADDA
-(P t|U+1E6D) > U+0637
-t t > U+062A U+0651 ;;SHADDA
-t > U+062A
-T T Q AN > U+0629 U+0651 U+064B ;;SHADDA
-T Q AN > U+0629 U+064B
-T AN > U+0629
-T T > U+0629 U+0651 ;;SHADDA
-T > U+0629
-C s C s > U+0634 U+0651 ;;SHADDA
-C s > U+0634
-(P s|U+1E63) (P s|U+1E63) > U+0635 U+0651 ;;SHADDA
-(P s|U+1E63) > U+0635
-V s V s > U+069A U+0651 ;;SHADDA
-V s > U+069A ;Pashto
-CO s CO s > U+069B U+0651 ;;SHADDA
-CO s > U+069B ; sin with 3 dots below
-s s > U+0633 U+0651 ;;SHADDA
-s > U+0633
-C r C r > U+06EF U+0651 ;;SHADDA ; missing in ArabTeX <<<
-C r > U+06EF
-CO r CO r > U+0697 U+0651 ;;SHADDA ; missing in ArabTeX <<<
-CO r > U+0697 ; Dargwa language, Dagestan
-P r P r > U+0694 U+0651 ;;SHADDA
-P r > U+0694 ; r with dot below; in Kurdish .r -> 0694
-V r V r > U+0693 U+0651 ;;SHADDA
-V r > U+0693 ;Pashto
-r r > U+0631 U+0651 ;;SHADDA
-r > U+0631
-P q P q > U+066F U+0651 ;;SHADDA
-P q > U+066F
-q q > U+0642 U+0651 ;;SHADDA
-q > U+0642
-p p > U+067E U+0651 ;;SHADDA
-p > U+067E
-CO n CO n > U+06B1 U+0651 ;;SHADDA
-CO n > U+06B1
-C n C n > U+06AD U+0651 ;;SHADDA
-C n > U+06AD
-P n P n > U+06BA U+0651 ;;SHADDA
-P n > U+06BA ; urdu
-V n V n > U+06BC U+0651 ;;SHADDA
-V n > U+06BC ; Pashto
-n n > U+0646 U+0651 ;;SHADDA
-n > U+0646
-m m > U+0645 U+0651 ;;SHADDA
-m > U+0645
-P l P l > U+06B6 U+0651 ;
-P l > U+06B6 ; ADDED <<<
-C l C l > U+06B5 U+0651 ;;SHADDA
-C l > U+06B5 ;kurdish
-l l > U+0644 U+0651 ;;SHADDA
-l > U+0644
-P k P k > U+06A9 U+0651 ;;SHADDA
-P k > U+06A9 ; pashto urdu
-UL k UL k > U+063A U+0651 ;;SHADDA
-UL k > U+063A
-k k > U+0643 U+0651 ;;SHADDA
-k > U+0643
-C g C g > U+062C U+0651 ;;SHADDA
-C g > U+062C
-CO j CO j > U+0684 U+0651 ;;SHADDA
-CO j > U+0684
-j j > U+062C U+0651 ;;SHADDA
-j > U+062C
-Q I > U+0650 U+064A
-C I > U+0650 U+064A U+0653 ; historical spelling : madda on ya
-UL I > ; suggestion of O. Smrz (arabtex-plus project) URL = ###
-I > U+064A
-Q i N > U+064D
-i N > ;
-Q i > U+0650
-x x > U+062E U+0651 ;;SHADDA
-x > U+062E
-U+0048 Z > U+0647 U+200C U+0020 ;eH-suffix > eH suffix
-U+0048 > U+0647 U+200C ; H is always heh final
-UL h UL h > U+062E U+0651 ;;SHADDA
-UL h > U+062E
-(P h|U+1E25) (P h|U+1E25) > U+062D U+0651 ;;SHADDA
-(P h|U+1E25) > U+062D
-V h V h > U+06C1 U+0651 ;;SHADDA
-V h > U+06C1
-h h > U+0647 U+0651 ;;SHADDA
-h > U+0647
-CO g CO g > U+06B3 U+0651 ;;SHADDA
-CO g > U+06B3
-V g V g > U+06AC U+0651 ;;SHADDA
-V g > U+06AC ; kaf with dot above
-P g P g > U+063A U+0651 ;;SHADDA
-P g > U+063A
-g g > U+06AF U+0651 ;;SHADDA
-g > U+06AF
-G G > U+06AB U+0651 ;;SHADDA
-G > U+06AB ;pashto
-P f P f > U+06A1 U+0651 ;;SHADDA
-P f > U+06A1
-f f > U+0641 U+0651 ;;SHADDA
-f > U+0641
-V d V d > U+0689 U+0651 ;;SHADDA
-V d > U+0689 ;pashto
-P V d P V d > U+068B U+0651 ;;SHADDA
-P V d > U+068B ;; (like U+0688 with dot below, for Lahnda = Western Punjabi)
-C d C d > U+06EE U+0651 ;;SHADDA
-C d > U+06EE ; not defined in ArabTeX
-CO d CO d > U+068F U+0651 ;;SHADDA
-CO d > U+068F
-UL (d|z) UL (d|z) > U+0630 U+0651 ;;SHADDA
-UL (d|z) > U+0630
-(P d|U+1E0D) (P d|U+1E0D) > U+0636 U+0651 ;;SHADDA
-(P d|U+1E0D) > U+0636
-d d > U+062F U+0651 ;;SHADDA
-d > U+062F
-V c V c > U+0685 U+0651 ;;SHADDA
-V c > U+0685 ;pashto
-C c C c > U+0686 U+0651 ;;SHADDA
-C c > U+0686
-P C c P C c > U+06BF U+0651 ;;SHADDA
-P C c > U+06BF ;; cheh with dot above <<<
-c c > U+0681 U+0651 ;;SHADDA
-c > U+0681 ; ح with hamza above
-CO c CO c > U+0682 U+0651 ;;SHADDA
-CO c > U+0682 ; old pashto
-CO b CO b > U+067B U+0651 ;;SHADDA
-CO b > U+067B
-P b P b > U+066E U+0651 ;;SHADDA
-P b > U+066E
-b b > U+0628 U+0651 ;;SHADDA
-b > U+0628
-H A > U+0622
-C A > U+064E U+0622 ; historical spelling
-UL A > U+0649
-UL a > U+0670
-UL u > ;
-UL i > ;
-Q AN / (A H|Ha) _ > U+064B
-AN / (A H|Ha) _ > ;
-Q AN > U+0627 U+064B
-AN > U+0627
-Q a > U+064E
-Q A > U+064E U+0627
-A > U+0627
-Ain Ain > U+0639 U+0651 ;;SHADDA
-Ain > U+0639
-H H > U+0621 U+0651 ;;SHADDA
-H > U+0621
-U+002C / [Digits] _ [Digits] > U+002C ; comma in numerical context not an Arabic comma
-Z Z / [Digits] _ [Digits] > U+2013 ; two hyphens in numerical context -> endash
-(Z|U+005D|U+005B|U+0028|U+0029)=xx / [Digits] _ [Digits] > U+202D @xx U+202C ; hyphen or brackets in numerical context: surrounded by LRO & PDF marks
-[Digits] > [ArEasternDigits]
-Z Z Z / # _ # > U+2014
-Z Z / # _ # > U+2013
-Z Z > U+0640
-B > U+0640
-Z / # _ > U+200D ; -x > force initial form with "zero-width joiner"
-Z / _ # > U+200D ; x- > force final form
-U+003C U+003C > U+00BB ;<<
-U+003E U+003E > U+00AB ;>>
-U+00AB > U+00BB
-U+00BB > U+00AB
-UL > U+0640 ;_
-U+003F > U+061F ;?
-U+003B > U+061B ;;
-U+003A U+003A > U+061E ;; '::' ligature 'DOTS' also defined above...
-U+002C > U+060C ;,
-U+005D / [LTR] _ [LTR] > U+200D U+005D U+200D ; keep shaping when inserting ...[...]... ...
-U+005B / [LTR] _ [LTR] > U+200D U+005B U+200D ; (but of course this screws up contextual
- ; analysis, so quoting of hamzas etc may be necessary
-;U+005D > U+005B ;] these are automatically mirrored, following Unicode rules
-;U+005B > U+005D ;[
-[VWL] > ;stripoff vowels
-Q > U+0652
-U+00B0 > U+0652 ; °
-N > ;
-C > ;^
-Z > ;-
-BAR > ;|
-
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-pashto-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-pashto-novoc.tec
deleted file mode 100644
index 14a35b434d8..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-pashto-novoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-pashto-voc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-pashto-voc.map
deleted file mode 100644
index 09ca243a912..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-pashto-voc.map
+++ /dev/null
@@ -1,486 +0,0 @@
-LHSName "ArabTeX-pashto-vocalized"
-RHSName "UNICODE"
-
-Define a U+0061 ;a
-Define b U+0062 ;b
-Define c U+0063 ;c
-Define d U+0064 ;d
-Define e U+0065 ;e
-Define f U+0066 ;f
-Define g U+0067 ;g
-Define h U+0068 ;h
-Define i U+0069 ;i
-Define j U+006A ;j
-Define k U+006B ;k
-Define l U+006C ;l
-Define m U+006D ;m
-Define n U+006E ;n
-Define o U+006F ;o
-Define p U+0070 ;p
-Define q U+0071 ;q
-Define r U+0072 ;r
-Define s U+0073 ;s
-Define t U+0074 ;t
-Define u U+0075 ;u
-Define v U+0076 ;v
-Define w U+0077 ;w
-Define x U+0078 ;x
-Define y U+0079 ;y
-Define z U+007A ;z
-Define A U+0041 ;A
-Define B U+0042 ;B
-Define E U+0045 ;E
-Define G U+0047 ;G
-Define I U+0049 ;I
-Define N U+004E ;N
-Define O U+004F ;O
-Define T U+0054 ;T
-Define U U+0055 ;U
-Define W U+0057 ;W
-Define Y U+0059 ;Y
-Define C U+005E ;^ << CARET
-Define UL U+005F ;_ << UNDERLINE
-Define P U+002E ;. << DOT
-Define V U+002C ;, << COMMA (_V_irgule)
-Define CO U+003A ;: << COLON
-Define SC U+003B ;; << SEMICOLON
-Define Ain U+0060 ;`
-Define H U+0027 ;' << HAMZA
-Define Q U+0022 ;" << QUOTE
-Define Z U+002D ;- << HYPHEN
-Define BAR U+007C ;|
-Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
-;Define NUL U+00A6;
-Define Ha U+0623
-Define Hi U+0625
-Define Hy U+0626
-Define Hw U+0624
-Define Hh U+06C0 ;; = U+0647 U+0654
-Define HA U+0622
-Define HB U+0640 U+0654
-Define HBAR U+0621 ; '|
-
-pass(Unicode)
-
-U+E000 > ; eliminate special code for capitalization in transliterations
-
-pass(Unicode)
-
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [AVWL] = (U+064B..U+0650);
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0047 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;a..z A E I O U B N T Y ^ . _ " "" `
-Class [BRACKETS] = (U+003C U+003E U+00AB U+00BB U+0028 U+0029 U+005B U+005D U+2018 U+2019 U+201C U+201D); < > () « » [ ] ‘ ’ “ ”
-Class [PUNCT] = (V SC P CO)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-Class [Uwu] = (U+0055 U+0077 U+0075) ;(U w u)
-;Class [ae] = (U+0061 U+0065) ;(a e)
-;Class [ou] = (U+0075 U+006F) ;(u o)
-Class [Iyi] = (U+0069 U+0079 U+0049)
-Class [UI] = (U+0049 U+0055) ; U I
-Class [Digits] = (U+0030..U+0039)
-
-Define BEG (#|Z|[BRACKETS])
-Define END (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #)
-Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
-
-; special ligatures
-;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
-;; The BAR is used in the DMG transliteration to suppress the initial A
-(a|A) BAR? l Z LLAH > U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+0644 U+0644 U+0647 ;; 'll_ah' -> 'l l h'
-;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
-U+0041 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'ALLAH'
-U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
-
-U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
-U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
-U+0029 U+0029 > U+FD3E ;; '))' : ornate left par
-U+0052 U+0049 U+0059 U+0041 U+004C > U+FDFC ;; 'RIYAL' : Saudi currency sign
-;; most fonts won't have the following ones:
-U+0053 U+0041 U+004C U+004C U+0041 U+0053 U+0054 U+004F U+0050 > U+FDF0 ;; 'SALLASTOP' (.sallY with "ye-barree", Quranic stop sign)
-U+0051 U+0041 U+004C U+0041 > U+FDF1 ;; 'QALA' : qalY with ye-barree, Quranic stop sign
-U+0041 U+004B U+0042 U+0041 U+0052 > U+FDF3 ;; 'AKBAR'
-U+004D U+0055 U+0048 U+0041 U+004D U+004D U+0041 U+0044 > U+FDF4 ;; 'MUHAMMAD'
-U+0053 U+0041 U+004C U+0041 U+004D > U+FDF5 ;; 'SALAM'
-U+0052 U+0041 U+0053 U+004F ? U+0055 U+004C > U+FDF6 ;; 'RASUL' (also unicode 'RASOUL')
-U+0041 U+004C U+0041 U+0059 U+0048 (U+0049|U+0045) > U+FDF7 ;; 'ALAYHI' (also unicode 'ALAYHE')
-U+0057 U+0041 U+0053 U+0041 U+004C U+004C U+0041 U+004D > U+FDF8 ;; 'WASALLAM'
-U+0053 U+0041 U+004C U+004C U+0041 > U+FDF9 ;; 'SALLA'
-U+004A U+0041 U+004C U+004C U+0041 > U+FDFB ;; 'JALLA' : "jalla jalAluhu"
-U+0042 U+0041 U+0053 U+004D U+0041 U+004C U+0041 > U+FDFD ;; 'BASMALA' : very few fonts have this ligature afaik
-
-U+005E U+0053 U+004C U+0059 > U+06D6 ;; ^SLY
-U+005E U+0051 U+004C U+0059 > U+06D7 ;; ^QLY
-U+005E U+004D U+0049 U+004D > U+06D8 ;; ^MIM-
-U+005E U+004C U+0041 > U+06D9 ;; ^LA
-U+005E U+004A U+0049 U+004D > U+06DA ;; ^JIM
-U+005E U+0044 U+004F U+0054 U+0053 > U+06DB ;; ^DOTS
-U+005E U+0053 U+0049 U+004E > U+06DC ;; ^SIN
-U+0048 U+0049 U+005A U+0042 > U+06DE ;; HIZB
-U+0043 U+0049 U+0052 U+0043 U+005A U+0045 U+0052 U+004F > U+06DF ;; CIRCZERO
-U+0052 U+0045 U+0043 U+0054 U+005A U+0045 U+0052 U+004F > U+06E0 ;; RECTZERO
-U+005E U+004A U+0041 U+005A U+004D > U+06E1 ;; ^JAZM
-U+005E U+004D U+0049 U+004D > U+06E2 ;; ^MIM
-U+005F U+0053 U+0049 U+004E > U+06E3 ;; _SIN
-U+005E U+004D U+0041 U+0044 U+0044 U+0041 > U+06E4 ;; ^MADDA
-U+0057 U+0041 U+0057 > U+06E5 ;; WAW
-U+0059 U+0045 U+0048 > U+06E6 ;; YEH
-U+005E U+0059 U+0045 U+0048 > U+06E7 ;; ^YEH
-U+005E U+004E U+0055 U+004E > U+06E8 ;; ^NUN
-U+0053 U+0041 U+004A U+0044 U+0041 > U+06E9 ;; SAJDA
-U+005F U+0053 U+0054 U+004F U+0050 > U+06EA ;; _STOP
-U+005E U+0053 U+0054 U+004F U+0050 > U+06EB ;; ^STOP
-U+005E U+0052 U+0053 U+0054 U+004F U+0050 > U+06EC ;; ^RSTOP
-U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
-
-U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
-
-
-; vowels
-u u > U
-i i > I
-a a > A
-a e > a U+0626
-E e > U+0659 U+06CD
-e e > U+0659 U+0626
-E > U+0659 U+06D0
-CO O > U+06FC ;
-O > U+0657 w
-o > U+0657
-a o > a w
-CO U > U+06C7 ;
-e > U+0659
-I / _ # > i y
-
-
-;; Persian ezafe (ALL BUT ARABIC AND UIGHUR)
-U+0048 Z UL? (Q? (i|e))=vv / _ END > U+06C0 @vv U+200C ;H-i -> heh+hamza final; what about 06C2 in Urdu ?<<<
-U+0048 Z Q?=qq (I|E)=vv / _ END > h U+0020 U+0627 @qq i @vv ; H-I
-Q?=q1 (I|E) Z UL? Q?=q2 (i|e) / _ END > @q1 i U+0626 @q2 i U+200C ; ...I-e
-Z Q?=qq I / (A|U) _ ENDZ > U+0626 @qq i y ; ...A-I or ...U-I
-Z UL? (Q? (i|e))=vv / (A|U) _ END > U+0649 @vv ; ...A-i or ...U-i
-Z Q?=q1 (e|i) / _ ENDZ > @q1 i ; ...-i
-Z / U+0048 _ > U+0020 ;
-b Q?=q1 (e|i) Q?=q2 U / # _ > b @q1 i U+0627 @q2 u w ;; special case of prep be without hyphen
-
-;; initial characters ...
-a l Z / BEG _ > U+0627 l Z
-;; wasla on initial alif : NEW! NOT TESTED!
-H / BEG _ l l > U+0671 ; e.g. alla_dI -> 'lla_dI
-[VWL]=v1 / BEG _ > U+0627 @v1
-Q?=q1 U / BEG _ > U+0627 @q1 u w ; -U
-; Q?=q1 I / BEG _ > U+0627 @q1 i y ; -I
-Q?=q1 I / BEG _ > U+0627 @q1 i y
-
-
-;; Words with anomalous orthography:
-
-; mi'aT -> ماية
-;;; i H / m Q ? _ Q ? a ? (T|t) > i A Hy
-m Q i H Q a / _ (T|t) > m U+0627 Hy
-m Q i H a / _ (T|t) > m U+0627 Hy a
-m i H Q a / _ (T|t) > m i U+0627 Hy
-m i H a / _ (T|t) > m i U+0627 Hy a
-
-
-;; contextual analysis of hamzas
-;; THESE DO NOT APPLY FOR SINDHI
-
-; initial hamzas
-H / (#|^[LTR]) _ Q? [Iyi] > Hi
-H Q A / (#|^[LTR]) _ > HA ; alif madda
-H / (#|^[LTR]) _ Q? [Uwu] > Ha
-H / (#|^[LTR]) _ Q? a > Ha
-Q H / (#|^[LTR]) _ > HB ; quoted isolated hamza at beginning of word
-
-; quoted hamzas in contextual mode, equivalent to verbatim mode
-a Q H > Ha
-i Q H > Hi
-y Q H > Hy
-w Q H > Hw
-h Q H > Hh
-A Q H > HA
-B Q H > HB
-BAR Q H > HBAR
-
-; hamza + fathatan
-H / a _ Q? AN > Ha
-;;H / [Iyi] _ Q? AN > Hy
-H / _ Q? AN > Hy
-
-;final hamzas
-H / A _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Uw] _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Iy] _ Q? (i N?|u N?)? (#|^[LTR]) > HBAR ; not AN ...
-H / a _ Q? (#|^[LTR]) > Ha ; not AN...
-H / a _ Q? (u|i) N? (#|^[LTR]) > Ha ; not AN...
-H / i _ Q? [VWL]? N? (#|^[LTR]) > Hy
-H / u _ Q? [VWL]? N? (#|^[LTR]) > Hw
-
-;;and more hamzas ...
-
-; n°1: kasra/ya
-H / [LTR] _ Q? [Iyi] ^N > Hy
-H / [Iyi] _ > Hy
-
-; n°2: damma/waw
-H / [LTR] _ Q? (U|u) ^N > Hw
-H / (U|u) _ Q? ^[Iyi] > Hw
-H / U _ > HBAR
-
-; n°3: fatha/alif
-H Q? A > HA
-H / A _ Q? a > HBAR
-H / ^[UI] _ Q? a > Ha
-H / a _ Q? ^[UI] > Ha
-
-
-pass(Unicode)
-
-Class [Digits] = (U+0030..U+0039)
-Class [ArDigits] = (U+0660..U+0669)
-Class [ArEasternDigits] = (U+06F0..U+06F9)
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;(a..z A E I O U B N T Y ^ . _ " "" `)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-
-
-
-
-;normal code
-
-
-(P z|U+1E93) (P z|U+1E93) > U+0638 U+0651 ;;SHADDA
-(P z|U+1E93) > U+0638
-C z C z > U+0698 U+0651 ;;SHADDA
-C z > U+0698
-V z V z > U+0696 U+0651 ;;SHADDA
-V z > U+0696 ;pashto
-z z > U+0632 U+0651 ;;SHADDA
-z > U+0632
-Q Y Y > U+0649 U+0651 ;;SHADDA
-Q Y > U+0649
-Y Y > U+064E U+0649 U+0651 ;;SHADDA
-Y > U+064E U+0649
-;; y / _ # > U+0649 ; y final in persian,ottoman,urdu,pashto,kashmiri has no dots
-y y > U+06CC U+0651 ;;SHADDA
-y > U+06CC ; yeh in persian etc. > iso and final shapes have no dots
-v v > U+06A4 U+0651 ;;SHADDA
-v > U+06A4
-W > U+0648 U+0627 ; waw + alif
-C U > U+064F U+0648 U+0653; historical spelling : madda on waw
-C w C w > U+06C9 U+0651 ;;SHADDA
-C w > U+06C9
-CO w CO w > U+06CA U+0651 ;,SHADDA
-CO w > U+06CA
-U A / _ # > U+064F U+0648 U+0627
-Q U [Uw] > U+0648 U+0651 ;;SHADDA
-Q U > U+0648
-U [Uw] > U+064F U+0648 U+0651 ;;SHADDA
-U > U+064F U+0648
-w w > U+0648 U+0651 ;;SHADDA
-w > U+0648
-Q u N? >
-u N > U+064C
-u > U+064F
-V t V t > U+067C U+0651 ;;SHADDA
-V t > U+067C ; pashto
-UL (t|s) UL (t|s) > U+062B U+0651 ;;SHADDA
-UL (t|s) > U+062B
-(P t|U+1E6D) (P t|U+1E6D) > U+0637 U+0651 ;;SHADDA
-(P t|U+1E6D) > U+0637
-t t > U+062A U+0651 ;;SHADDA
-t > U+062A
-T T Q AN > U+0629 U+0651 ;;SHADDA
-T Q AN > U+0629
-T AN > U+0629 U+064B
-T T > U+0629 U+0651 ;;SHADDA
-T > U+0629
-C s C s > U+0634 U+0651 ;;SHADDA
-C s > U+0634
-(P s|U+1E63) (P s|U+1E63) > U+0635 U+0651 ;;SHADDA
-(P s|U+1E63) > U+0635
-V s V s > U+069A U+0651 ;;SHADDA
-V s > U+069A ;Pashto
-CO s CO s > U+069B U+0651 ;;SHADDA
-CO s > U+069B ; sin with 3 dots below
-s s > U+0633 U+0651 ;;SHADDA
-s > U+0633
-C r C r > U+06EF U+0651 ;;SHADDA ; missing in ArabTeX <<<
-C r > U+06EF
-CO r CO r > U+0697 U+0651 ;;SHADDA ; missing in ArabTeX <<<
-CO r > U+0697 ; Dargwa language, Dagestan
-P r P r > U+0694 U+0651 ;;SHADDA
-P r > U+0694 ; r with dot below; in Kurdish .r -> 0694
-V r V r > U+0693 U+0651 ;;SHADDA
-V r > U+0693 ;Pashto
-r r > U+0631 U+0651 ;;SHADDA
-r > U+0631
-P q P q > U+066F U+0651 ;;SHADDA
-P q > U+066F
-q q > U+0642 U+0651 ;;SHADDA
-q > U+0642
-p p > U+067E U+0651 ;;SHADDA
-p > U+067E
-CO n CO n > U+06B1 U+0651 ;;SHADDA
-CO n > U+06B1
-C n C n > U+06AD U+0651 ;;SHADDA
-C n > U+06AD
-P n P n > U+06BA U+0651 ;;SHADDA
-P n > U+06BA ; urdu
-V n V n > U+06BC U+0651 ;;SHADDA
-V n > U+06BC ; Pashto
-n n > U+0646 U+0651 ;;SHADDA
-n > U+0646
-m m > U+0645 U+0651 ;;SHADDA
-m > U+0645
-P l P l > U+06B6 U+0651 ;
-P l > U+06B6 ; ADDED <<<
-C l C l > U+06B5 U+0651 ;;SHADDA
-C l > U+06B5 ;kurdish
-l l > U+0644 U+0651 ;;SHADDA
-l > U+0644
-P k P k > U+06A9 U+0651 ;;SHADDA
-P k > U+06A9 ; pashto urdu
-UL k UL k > U+063A U+0651 ;;SHADDA
-UL k > U+063A
-k k > U+0643 U+0651 ;;SHADDA
-k > U+0643
-C g C g > U+062C U+0651 ;;SHADDA
-C g > U+062C
-CO j CO j > U+0684 U+0651 ;;SHADDA
-CO j > U+0684
-j j > U+062C U+0651 ;;SHADDA
-j > U+062C
-Q I > U+064A
-I > U+0650 U+064A
-C I > U+0650 U+064A U+0653 ; historical spelling : madda on ya
-UL I > ; suggestion of O. Smrz (arabtex-plus project) URL = ###
-Q i N? > ;
-i N > U+064D
-i > U+0650
-x x > U+062E U+0651 ;;SHADDA
-x > U+062E
-U+0048 Z > U+0647 U+200C U+0020 ;eH-suffix > eH suffix
-U+0048 > U+0647 U+200C ; H is always heh final
-UL h UL h > U+062E U+0651 ;;SHADDA
-UL h > U+062E
-(P h|U+1E25) (P h|U+1E25) > U+062D U+0651 ;;SHADDA
-(P h|U+1E25) > U+062D
-V h V h > U+06C1 U+0651 ;;SHADDA
-V h > U+06C1
-h h > U+0647 U+0651 ;;SHADDA
-h > U+0647
-CO g CO g > U+06B3 U+0651 ;;SHADDA
-CO g > U+06B3
-V g V g > U+06AC U+0651 ;;SHADDA
-V g > U+06AC ; kaf with dot above
-P g P g > U+063A U+0651 ;;SHADDA
-P g > U+063A
-g g > U+06AF U+0651 ;;SHADDA
-g > U+06AF
-G G > U+06AB U+0651 ;;SHADDA
-G > U+06AB ;pashto
-P f P f > U+06A1 U+0651 ;;SHADDA
-P f > U+06A1
-f f > U+0641 U+0651 ;;SHADDA
-f > U+0641
-V d V d > U+0689 U+0651 ;;SHADDA
-V d > U+0689 ;pashto
-P V d P V d > U+068B U+0651 ;;SHADDA
-P V d > U+068B ;; (like U+0688 with dot below, for Lahnda = Western Punjabi)
-C d C d > U+06EE U+0651 ;;SHADDA
-C d > U+06EE ; not defined in ArabTeX
-CO d CO d > U+068F U+0651 ;;SHADDA
-CO d > U+068F
-UL (d|z) UL (d|z) > U+0630 U+0651 ;;SHADDA
-UL (d|z) > U+0630
-(P d|U+1E0D) (P d|U+1E0D) > U+0636 U+0651 ;;SHADDA
-(P d|U+1E0D) > U+0636
-d d > U+062F U+0651 ;;SHADDA
-d > U+062F
-V c V c > U+0685 U+0651 ;;SHADDA
-V c > U+0685 ;pashto
-C c C c > U+0686 U+0651 ;;SHADDA
-C c > U+0686
-P C c P C c > U+06BF U+0651 ;;SHADDA
-P C c > U+06BF ;; cheh with dot above <<<
-c c > U+0681 U+0651 ;;SHADDA
-c > U+0681 ; ح with hamza above
-CO c CO c > U+0682 U+0651 ;;SHADDA
-CO c > U+0682 ; old pashto
-CO b CO b > U+067B U+0651 ;;SHADDA
-CO b > U+067B
-P b P b > U+066E U+0651 ;;SHADDA
-P b > U+066E
-b b > U+0628 U+0651 ;;SHADDA
-b > U+0628
-H A > U+0622
-C A > U+064E U+0622 ; historical spelling
-UL A > U+064E U+0649
-UL a > U+0670
-UL u > U+064F;
-UL i > U+0650;
-Q AN / (A H|Ha) _ > ;
-AN / (A H|Ha) _ > U+064B
-Q AN > U+0627
-AN > U+0627 U+064B
-Q a >
-a > U+064E
-Q A > U+0627
-A > U+064E U+0627
-Ain Ain > U+0639 U+0651 ;;SHADDA
-Ain > U+0639
-H H > U+0621 U+0651 ;;SHADDA
-H > U+0621
-U+002C / [Digits] _ [Digits] > U+002C ; comma in numerical context not an Arabic comma
-Z Z / [Digits] _ [Digits] > U+2013 ; two hyphens in numerical context -> endash
-(Z|U+005D|U+005B|U+0028|U+0029)=xx / [Digits] _ [Digits] > U+202D @xx U+202C ; hyphen or brackets in numerical context: surrounded by LRO & PDF marks
-[Digits] > [ArEasternDigits]
-Z Z Z / # _ # > U+2014
-Z Z / # _ # > U+2013
-Z Z > U+0640
-B > U+0640
-Z / # _ > U+200D ; -x > force initial form with "zero-width joiner"
-Z / _ # > U+200D ; x- > force final form
-U+003C U+003C > U+00BB ;<<
-U+003E U+003E > U+00AB ;>>
-U+00AB > U+00BB
-U+00BB > U+00AB
-UL > U+0640 ;_
-U+003F > U+061F ;?
-U+003B > U+061B ;;
-U+003A U+003A > U+061E ;; '::' ligature 'DOTS' also defined above...
-U+002C > U+060C ;,
-U+005D / [LTR] _ [LTR] > U+200D U+005D U+200D ; keep shaping when inserting ...[...]... ...
-U+005B / [LTR] _ [LTR] > U+200D U+005B U+200D ; (but of course this screws up contextual
- ; analysis, so quoting of hamzas etc may be necessary
-;U+005D > U+005B ;] these are automatically mirrored, following Unicode rules
-;U+005B > U+005D ;[
-Q [VWL] > ;stripoff quoted vowels
-Q > U+0652
-U+00B0 > U+0652 ; °
-N > ;
-C > ;^
-BAR > ;|
-
-pass(Unicode)
-
-Class [CONS] = (U+0621 U+0623 U+0624 U+0626 U+0628 U+062A..U+063A U+0641..U+0647 U+066E U+066F U+0672 U+0675 U+0676 U+0678..U+06BF U+06EE U+06EF U+06FA..U+06FF U+0750..U+076D) ; to be improved: not sure that all glyphs listed (esp for Urdu,Sindhi,etc are really "consonants" in the sense that they can carry a sukun, not to mention that some of these languages may not have a sukun at all ;-)
-Class [VWLX] = (U+0627 U+0648..U+065E U+0670) ; long vowels, vowel signs, shadda, sukun etc.
-Class [VWL] = (U+0627 U+0648..U+0650 U+0670);
-Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-pashto-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-pashto-voc.tec
deleted file mode 100644
index 18cfd87bbd2..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-pashto-voc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-sindhi-fullvoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-sindhi-fullvoc.map
deleted file mode 100644
index 477d056b134..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-sindhi-fullvoc.map
+++ /dev/null
@@ -1,461 +0,0 @@
-LHSName "ArabTeX-sindhi-fullvocalized"
-RHSName "UNICODE"
-
-Define a U+0061 ;a
-Define b U+0062 ;b
-Define c U+0063 ;c
-Define d U+0064 ;d
-Define e U+0065 ;e
-Define f U+0066 ;f
-Define g U+0067 ;g
-Define h U+0068 ;h
-Define i U+0069 ;i
-Define j U+006A ;j
-Define k U+006B ;k
-Define l U+006C ;l
-Define m U+006D ;m
-Define n U+006E ;n
-Define o U+006F ;o
-Define p U+0070 ;p
-Define q U+0071 ;q
-Define r U+0072 ;r
-Define s U+0073 ;s
-Define t U+0074 ;t
-Define u U+0075 ;u
-Define v U+0076 ;v
-Define w U+0077 ;w
-Define x U+0078 ;x
-Define y U+0079 ;y
-Define z U+007A ;z
-Define A U+0041 ;A
-Define B U+0042 ;B
-Define E U+0045 ;E
-Define G U+0047 ;G
-Define I U+0049 ;I
-Define N U+004E ;N
-Define O U+004F ;O
-Define T U+0054 ;T
-Define U U+0055 ;U
-Define W U+0057 ;W
-Define Y U+0059 ;Y
-Define C U+005E ;^ << CARET
-Define UL U+005F ;_ << UNDERLINE
-Define P U+002E ;. << DOT
-Define V U+002C ;, << COMMA (_V_irgule)
-Define CO U+003A ;: << COLON
-Define SC U+003B ;; << SEMICOLON
-Define Ain U+0060 ;`
-Define H U+0027 ;' << HAMZA
-Define Q U+0022 ;" << QUOTE
-Define Z U+002D ;- << HYPHEN
-Define BAR U+007C ;|
-Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
-;Define NUL U+00A6;
-Define Ha U+0623
-Define Hi U+0625
-Define Hy U+0626
-Define Hw U+0624
-Define Hh U+06C0 ;; = U+0647 U+0654
-Define HA U+0622
-Define HB U+0640 U+0654
-Define HBAR U+0621 ; '|
-
-pass(Unicode)
-
-U+E000 > ; eliminate special code for capitalization in transliterations
-
-pass(Unicode)
-
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [AVWL] = (U+064B..U+0650);
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0047 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;a..z A E I O U B N T Y ^ . _ " "" `
-Class [BRACKETS] = (U+003C U+003E U+00AB U+00BB U+0028 U+0029 U+005B U+005D U+2018 U+2019 U+201C U+201D); < > () « » [ ] ‘ ’ “ ”
-Class [PUNCT] = (V SC P CO)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-Class [Uwu] = (U+0055 U+0077 U+0075) ;(U w u)
-;Class [ae] = (U+0061 U+0065) ;(a e)
-;Class [ou] = (U+0075 U+006F) ;(u o)
-Class [Iyi] = (U+0069 U+0079 U+0049)
-Class [UI] = (U+0049 U+0055) ; U I
-Class [Digits] = (U+0030..U+0039)
-
-Define BEG (#|Z|[BRACKETS])
-Define END (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #)
-Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
-
-; special ligatures
-;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
-;; The BAR is used in the DMG transliteration to suppress the initial A
-(a|A) BAR? l Z LLAH > U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+0644 U+0644 U+0647 ;; 'll_ah' -> 'l l h'
-;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
-U+0041 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'ALLAH'
-U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
-
-U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
-U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
-U+0029 U+0029 > U+FD3E ;; '))' : ornate left par
-U+0052 U+0049 U+0059 U+0041 U+004C > U+FDFC ;; 'RIYAL' : Saudi currency sign
-;; most fonts won't have the following ones:
-U+0053 U+0041 U+004C U+004C U+0041 U+0053 U+0054 U+004F U+0050 > U+FDF0 ;; 'SALLASTOP' (.sallY with "ye-barree", Quranic stop sign)
-U+0051 U+0041 U+004C U+0041 > U+FDF1 ;; 'QALA' : qalY with ye-barree, Quranic stop sign
-U+0041 U+004B U+0042 U+0041 U+0052 > U+FDF3 ;; 'AKBAR'
-U+004D U+0055 U+0048 U+0041 U+004D U+004D U+0041 U+0044 > U+FDF4 ;; 'MUHAMMAD'
-U+0053 U+0041 U+004C U+0041 U+004D > U+FDF5 ;; 'SALAM'
-U+0052 U+0041 U+0053 U+004F ? U+0055 U+004C > U+FDF6 ;; 'RASUL' (also unicode 'RASOUL')
-U+0041 U+004C U+0041 U+0059 U+0048 (U+0049|U+0045) > U+FDF7 ;; 'ALAYHI' (also unicode 'ALAYHE')
-U+0057 U+0041 U+0053 U+0041 U+004C U+004C U+0041 U+004D > U+FDF8 ;; 'WASALLAM'
-U+0053 U+0041 U+004C U+004C U+0041 > U+FDF9 ;; 'SALLA'
-U+004A U+0041 U+004C U+004C U+0041 > U+FDFB ;; 'JALLA' : "jalla jalAluhu"
-U+0042 U+0041 U+0053 U+004D U+0041 U+004C U+0041 > U+FDFD ;; 'BASMALA' : very few fonts have this ligature afaik
-
-U+005E U+0053 U+004C U+0059 > U+06D6 ;; ^SLY
-U+005E U+0051 U+004C U+0059 > U+06D7 ;; ^QLY
-U+005E U+004D U+0049 U+004D > U+06D8 ;; ^MIM-
-U+005E U+004C U+0041 > U+06D9 ;; ^LA
-U+005E U+004A U+0049 U+004D > U+06DA ;; ^JIM
-U+005E U+0044 U+004F U+0054 U+0053 > U+06DB ;; ^DOTS
-U+005E U+0053 U+0049 U+004E > U+06DC ;; ^SIN
-U+0048 U+0049 U+005A U+0042 > U+06DE ;; HIZB
-U+0043 U+0049 U+0052 U+0043 U+005A U+0045 U+0052 U+004F > U+06DF ;; CIRCZERO
-U+0052 U+0045 U+0043 U+0054 U+005A U+0045 U+0052 U+004F > U+06E0 ;; RECTZERO
-U+005E U+004A U+0041 U+005A U+004D > U+06E1 ;; ^JAZM
-U+005E U+004D U+0049 U+004D > U+06E2 ;; ^MIM
-U+005F U+0053 U+0049 U+004E > U+06E3 ;; _SIN
-U+005E U+004D U+0041 U+0044 U+0044 U+0041 > U+06E4 ;; ^MADDA
-U+0057 U+0041 U+0057 > U+06E5 ;; WAW
-U+0059 U+0045 U+0048 > U+06E6 ;; YEH
-U+005E U+0059 U+0045 U+0048 > U+06E7 ;; ^YEH
-U+005E U+004E U+0055 U+004E > U+06E8 ;; ^NUN
-U+0053 U+0041 U+004A U+0044 U+0041 > U+06E9 ;; SAJDA
-U+005F U+0053 U+0054 U+004F U+0050 > U+06EA ;; _STOP
-U+005E U+0053 U+0054 U+004F U+0050 > U+06EB ;; ^STOP
-U+005E U+0052 U+0053 U+0054 U+004F U+0050 > U+06EC ;; ^RSTOP
-U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
-
-U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
-
-
-; vowels
-u u > U
-i i > I
-a a > A
-CO O > U+06FC ;
-a e > a y
-a o > a w
-(o|u)? O / # _ > U+0627 w
-(o|u)? O > w
-CO U > U+06C7 ;
-e > i ;; but not pashto > U+0659 and kashmiri > y + U+0658 (U+06CE is kurdish)
-o > u
-
-
-;; Persian ezafe (ALL BUT ARABIC AND UIGHUR)
-U+0048 Z UL? (Q? (i|e))=vv / _ END > U+06C0 @vv U+200C ;H-i -> heh+hamza final; what about 06C2 in Urdu ?<<<
-U+0048 Z Q?=qq (I|E)=vv / _ END > h U+0020 U+0627 @qq i @vv ; H-I
-Q?=q1 (I|E) Z UL? Q?=q2 (i|e) / _ END > @q1 i U+0626 @q2 i U+200C ; ...I-e
-Z Q?=qq I / (A|U) _ ENDZ > U+0626 @qq i y ; ...A-I or ...U-I
-Z UL? (Q? (i|e))=vv / (A|U) _ END > U+0649 @vv ; ...A-i or ...U-i
-Z Q?=q1 (e|i) / _ ENDZ > @q1 i ; ...-i
-Z / U+0048 _ > U+0020 ;
-b Q?=q1 (e|i) Q?=q2 U / # _ > b @q1 i U+0627 @q2 u w ;; special case of prep be without hyphen
-
-;; initial characters ...
-a l Z / BEG _ > U+0627 l Z
-;; wasla on initial alif : NEW! NOT TESTED!
-H / BEG _ l l > U+0671 ; e.g. alla_dI -> 'lla_dI
-[VWL]=v1 / BEG _ > U+0627 @v1
-Q?=q1 U / BEG _ > U+0627 @q1 u w ; -U
-; Q?=q1 I / BEG _ > U+0627 @q1 i y ; -I
-Q?=q1 I / BEG _ > U+0627 @q1 i y
-
-
-;; Words with anomalous orthography:
-
-; mi'aT -> ماية
-;;; i H / m Q ? _ Q ? a ? (T|t) > i A Hy
-m Q i H Q a / _ (T|t) > m U+0627 Hy
-m Q i H a / _ (T|t) > m U+0627 Hy a
-m i H Q a / _ (T|t) > m i U+0627 Hy
-m i H a / _ (T|t) > m i U+0627 Hy a
-
-
-
-pass(Unicode)
-
-Class [Digits] = (U+0030..U+0039)
-Class [ArDigits] = (U+0660..U+0669)
-Class [ArEasternDigits] = (U+06F0..U+06F9)
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;(a..z A E I O U B N T Y ^ . _ " "" `)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-
-
-
-
-;normal code
-
-;; special code for sindhi
-;; U+004D U+0049 U+004E > U+06FE ; define macro \MIN in sindhi env
-P m I N > U+06FE ; .mIN
-;; U+0049 U+004E > U+06FD ; IN define macro \IN in sindhi env
-H BAR I N > U+06FD ; '|IN
-
-(P z|U+1E93) (P z|U+1E93) > U+0638 U+0651 ;;SHADDA
-(P z|U+1E93) > U+0638
-C z C z > U+0698 U+0651 ;;SHADDA
-C z > U+0698
-V z V z > U+0696 U+0651 ;;SHADDA
-V z > U+0696 ;pashto
-z z > U+0632 U+0651 ;;SHADDA
-z > U+0632
-Q Y Y > U+0649 U+0651 ;;SHADDA
-Q Y > U+0649
-Y Y > U+064E U+0649 U+0651 ;;SHADDA
-Y > U+064E U+0649
-P I P I / _ # > U+0650 U+06CC U+0651 ;; SHADDA
-P I / _ # > U+0650 U+06CC ;; workaround to have ya without dots in Arabic
-y y > U+064A U+0651 ;;SHADDA
-y > U+064A
-v v > U+06A4 U+0651 ;;SHADDA
-v > U+06A4
-W > U+0648 U+0627 ; waw + alif
-C U > U+064F U+0648 U+0653; historical spelling : madda on waw
-C w C w > U+06C9 U+0651 ;;SHADDA
-C w > U+06C9
-CO w CO w > U+06CA U+0651 ;,SHADDA
-CO w > U+06CA
-U A / _ # > U+064F U+0648 U+0627
-Q U [Uw] > U+0648 U+0651 ;;SHADDA
-Q U > U+0648
-U [Uw] > U+064F U+0648 U+0651 ;;SHADDA
-U > U+064F U+0648
-w w > U+0648 U+0651 ;;SHADDA
-w > U+0648
-Q u N? >
-u N > U+064C
-u > U+064F
-V t h V t h > U+067A U+0651 ;;SHADDA
-V t h > U+067A
-t h t h > U+067F U+0651 ;;SHADDA
-t h > U+067F
-V t V t > U+067D U+0651 ;;SHADDA
-V t > U+067D
-UL (t|s) UL (t|s) > U+062B U+0651 ;;SHADDA
-UL (t|s) > U+062B
-(P t|U+1E6D) (P t|U+1E6D) > U+0637 U+0651 ;;SHADDA
-(P t|U+1E6D) > U+0637
-t t > U+062A U+0651 ;;SHADDA
-t > U+062A
-T T Q AN > U+0629 U+0651 ;;SHADDA
-T Q AN > U+0629
-T AN > U+0629 U+064B
-T T > U+0629 U+0651 ;;SHADDA
-T > U+0629
-C s C s > U+0634 U+0651 ;;SHADDA
-C s > U+0634
-(P s|U+1E63) (P s|U+1E63) > U+0635 U+0651 ;;SHADDA
-(P s|U+1E63) > U+0635
-V s V s > U+069A U+0651 ;;SHADDA
-V s > U+069A ;Pashto
-CO s CO s > U+069B U+0651 ;;SHADDA
-CO s > U+069B ; sin with 3 dots below
-s s > U+0633 U+0651 ;;SHADDA
-s > U+0633
-C r C r > U+06EF U+0651 ;;SHADDA ; missing in ArabTeX <<<
-C r > U+06EF
-CO r CO r > U+0697 U+0651 ;;SHADDA ; missing in ArabTeX <<<
-CO r > U+0697 ; Dargwa language, Dagestan
-P r P r > U+0694 U+0651 ;;SHADDA
-P r > U+0694 ; r with dot below; in Kurdish .r -> 0694
-V r V r > U+0699 U+0651 ;;SHADDA
-V r > U+0699
-r r > U+0631 U+0651 ;;SHADDA
-r > U+0631
-P q P q > U+066F U+0651 ;;SHADDA
-P q > U+066F
-q q > U+0642 U+0651 ;;SHADDA
-q > U+0642
-p h p h > U+06A6 U+0651 ;;SHADDA
-p h > U+06A6
-p p > U+067E U+0651 ;;SHADDA
-p > U+067E
-CO n CO n > U+06B1 U+0651 ;;SHADDA
-CO n > U+06B1
-C n C n > U+0683 U+0651 ;;SHADDA
-C n > U+0683
-P P n P P n > U+06B2 U+0651 ;;SHADDA
-P P n > U+06B2 ;; old sindhi? (not in ArabTeX) <<<
-P n P n > U+06BA U+0651 ;;SHADDA
-P n > U+06BA ; urdu
-V n V n > U+06BB U+0651 ;;SHADDA
-V n > U+06BB
-n n > U+0646 U+0651 ;;SHADDA
-n > U+0646
-m m > U+0645 U+0651 ;;SHADDA
-m > U+0645
-P l P l > U+06B6 U+0651 ;
-P l > U+06B6 ; ADDED <<<
-C l C l > U+06B5 U+0651 ;;SHADDA
-C l > U+06B5 ;kurdish
-l l > U+0644 U+0651 ;;SHADDA
-l > U+0644
-k h k h > U+06A9 U+0651 ;;SHADDA
-k h > U+06A9
-P k P k > U+06A9 U+0651 ;;SHADDA
-P k > U+06A9 ; pashto urdu
-UL k UL k > U+063A U+0651 ;;SHADDA
-UL k > U+063A
-k k > U+06AA U+0651 ;;SHADDA
-k > U+06AA ; kaf swash
-C g C g > U+062C U+0651 ;;SHADDA
-C g > U+062C
-CO j CO j > U+0684 U+0651 ;;SHADDA
-CO j > U+0684
-j j > U+062C U+0651 ;;SHADDA
-j > U+062C
-Q I > U+064A
-I > U+0650 U+064A
-C I > U+0650 U+064A U+0653 ; historical spelling : madda on ya
-UL I > ; suggestion of O. Smrz (arabtex-plus project) URL = ###
-Q i N? > ;
-i N > U+064D
-i > U+0650
-x x > U+062E U+0651 ;;SHADDA
-x > U+062E
-UL h UL h > U+062E U+0651 ;;SHADDA
-UL h > U+062E
-(P h|U+1E25) (P h|U+1E25) > U+062D U+0651 ;;SHADDA
-(P h|U+1E25) > U+062D
-V h V h > U+06C1 U+0651 ;;SHADDA
-V h > U+06C1
-h h > U+06BE U+0651 ;;SHADDA
-h > U+06BE
-P CO g P CO g > U+06B4 U+0651 ;;SHADDA
-P CO g > U+06B4 ;; old sindhi? (not in ArabTeX) <<<
-CO g CO g > U+06B3 U+0651 ;;SHADDA
-CO g > U+06B3
-V g V g > U+06AC U+0651 ;;SHADDA
-V g > U+06AC ; kaf with dot above
-P g P g > U+063A U+0651 ;;SHADDA
-P g > U+063A
-g g > U+06AF U+0651 ;;SHADDA
-g > U+06AF
-G G > U+06AB U+0651 ;;SHADDA
-G > U+06AB ;pashto
-P f P f > U+06A1 U+0651 ;;SHADDA
-P f > U+06A1
-f f > U+0641 U+0651 ;;SHADDA
-f > U+0641
-V d h V d h > U+068D U+0651 ;;SHADDA
-V d h > U+068D
-V d V d > U+068A U+0651 ;;SHADDA
-V d > U+068A
-P V d P V d > U+068B U+0651 ;;SHADDA
-P V d > U+068B ;; (like U+0688 with dot below, for Lahnda = Western Punjabi)
-d h d h > U+068C U+0651 ;;SHADDA
-d h > U+068C
-C d C d > U+068E ;;SHADDA
-C d > U+068E ; old sindhi: not in ArabTeX
-CO d CO d > U+068F U+0651 ;;SHADDA
-CO d > U+068F
-UL (d|z) UL (d|z) > U+0630 U+0651 ;;SHADDA
-UL (d|z) > U+0630
-(P d|U+1E0D) (P d|U+1E0D) > U+0636 U+0651 ;;SHADDA
-(P d|U+1E0D) > U+0636
-d d > U+062F U+0651 ;;SHADDA
-d > U+062F
-C c h C c h > U+0687 U+0651 ;;SHADDA
-C c h > U+0687
-V c V c > U+0685 U+0651 ;;SHADDA
-V c > U+0685 ;pashto
-C c C c > U+0686 U+0651 ;;SHADDA
-C c > U+0686
-P C c P C c > U+06BF U+0651 ;;SHADDA
-P C c > U+06BF ;; cheh with dot above <<<
-c c > U+0681 U+0651 ;;SHADDA
-c > U+0681 ; ح with hamza above
-CO c CO c > U+0682 U+0651 ;;SHADDA
-CO c > U+0682 ; old pashto
-b h b h > U+0680 U+0651 ;;SHADDA
-b h > U+0680
-CO b CO b > U+067B U+0651 ;;SHADDA
-CO b > U+067B
-P b P b > U+066E U+0651 ;;SHADDA
-P b > U+066E
-b b > U+0628 U+0651 ;;SHADDA
-b > U+0628
-H A > U+0622
-C A > U+064E U+0622 ; historical spelling
-UL A > U+064E U+0649
-UL a > U+0670
-UL u > U+064F;
-UL i > U+0650;
-Q AN / (A H|Ha) _ > ;
-AN / (A H|Ha) _ > U+064B
-Q AN > U+0627
-AN > U+0627 U+064B
-Q a >
-a > U+064E
-Q A > U+0627
-A > U+064E U+0627
-Ain Ain > U+0639 U+0651 ;;SHADDA
-Ain > U+0639
-H H > U+0621 U+0651 ;;SHADDA
-H > U+0621
-U+002C / [Digits] _ [Digits] > U+002C ; comma in numerical context not an Arabic comma
-Z Z / [Digits] _ [Digits] > U+2013 ; two hyphens in numerical context -> endash
-(Z|U+005D|U+005B|U+0028|U+0029)=xx / [Digits] _ [Digits] > U+202D @xx U+202C ; hyphen or brackets in numerical context: surrounded by LRO & PDF marks
-[Digits] > [ArEasternDigits]
-Z Z Z / # _ # > U+2014
-Z Z / # _ # > U+2013
-Z Z > U+0640
-B > U+0640
-Z / # _ > U+200D ; -x > force initial form with "zero-width joiner"
-Z / _ # > U+200D ; x- > force final form
-U+003C U+003C > U+00BB ;<<
-U+003E U+003E > U+00AB ;>>
-U+00AB > U+00BB
-U+00BB > U+00AB
-UL > U+0640 ;_
-U+003F > U+061F ;?
-U+003B > U+061B ;;
-U+003A U+003A > U+061E ;; '::' ligature 'DOTS' also defined above...
-U+002C > U+060C ;,
-U+005D / [LTR] _ [LTR] > U+200D U+005D U+200D ; keep shaping when inserting ...[...]... ...
-U+005B / [LTR] _ [LTR] > U+200D U+005B U+200D ; (but of course this screws up contextual
- ; analysis, so quoting of hamzas etc may be necessary
-;U+005D > U+005B ;] these are automatically mirrored, following Unicode rules
-;U+005B > U+005D ;[
-Q [VWL] > ;stripoff quoted vowels
-U+00B0 > U+0652 ; °
-N > ;
-C > ;^
-BAR > ;|
-
-pass(Unicode)
-
-Class [CONS] = (U+0621 U+0623 U+0624 U+0626 U+0628 U+062A..U+063A U+0641..U+0647 U+066E U+066F U+0672 U+0675 U+0676 U+0678..U+06BF U+06EE U+06EF U+06FA..U+06FF U+0750..U+076D) ; to be improved: not sure that all glyphs listed (esp for Urdu,Sindhi,etc are really "consonants" in the sense that they can carry a sukun, not to mention that some of these languages may not have a sukun at all ;-)
-Class [VWLX] = (U+0627 U+0648..U+065E U+0670) ; long vowels, vowel signs, shadda, sukun etc.
-Class [VWL] = (U+0627 U+0648..U+0650 U+0670);
-[CONS]=k1 / _ Z? [CONS] ^U+0651 > @k1 U+0652 ; hack: 2nd consonant has no shadda
-U+064E (U+064A|U+0648)=hc / _ (^[VWLX]|#) > U+064E @hc U+0652 ; ay and aw diphtongs
-U+0627 / # _ U+0644 > U+0627 U+064E ; otherwise initial alif takes fatha
-[CONS]=k1 / _ ([CONS]|#) > @k1 U+0652 ; consonant + (consonant or final)
-;; [CONS]=k1 / _ # > @k1 U+0652 ; final consonant
-Q > ;
-Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-sindhi-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-sindhi-fullvoc.tec
deleted file mode 100644
index b0c44696c6a..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-sindhi-fullvoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-sindhi-novoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-sindhi-novoc.map
deleted file mode 100644
index 50efef6c46f..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-sindhi-novoc.map
+++ /dev/null
@@ -1,446 +0,0 @@
-LHSName "ArabTeX-sindhi-novowels"
-RHSName "UNICODE"
-
-Define a U+0061 ;a
-Define b U+0062 ;b
-Define c U+0063 ;c
-Define d U+0064 ;d
-Define e U+0065 ;e
-Define f U+0066 ;f
-Define g U+0067 ;g
-Define h U+0068 ;h
-Define i U+0069 ;i
-Define j U+006A ;j
-Define k U+006B ;k
-Define l U+006C ;l
-Define m U+006D ;m
-Define n U+006E ;n
-Define o U+006F ;o
-Define p U+0070 ;p
-Define q U+0071 ;q
-Define r U+0072 ;r
-Define s U+0073 ;s
-Define t U+0074 ;t
-Define u U+0075 ;u
-Define v U+0076 ;v
-Define w U+0077 ;w
-Define x U+0078 ;x
-Define y U+0079 ;y
-Define z U+007A ;z
-Define A U+0041 ;A
-Define B U+0042 ;B
-Define E U+0045 ;E
-Define G U+0047 ;G
-Define I U+0049 ;I
-Define N U+004E ;N
-Define O U+004F ;O
-Define T U+0054 ;T
-Define U U+0055 ;U
-Define W U+0057 ;W
-Define Y U+0059 ;Y
-Define C U+005E ;^ << CARET
-Define UL U+005F ;_ << UNDERLINE
-Define P U+002E ;. << DOT
-Define V U+002C ;, << COMMA (_V_irgule)
-Define CO U+003A ;: << COLON
-Define SC U+003B ;; << SEMICOLON
-Define Ain U+0060 ;`
-Define H U+0027 ;' << HAMZA
-Define Q U+0022 ;" << QUOTE
-Define Z U+002D ;- << HYPHEN
-Define BAR U+007C ;|
-Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
-;Define NUL U+00A6;
-Define Ha U+0623
-Define Hi U+0625
-Define Hy U+0626
-Define Hw U+0624
-Define Hh U+06C0 ;; = U+0647 U+0654
-Define HA U+0622
-Define HB U+0640 U+0654
-Define HBAR U+0621 ; '|
-
-pass(Unicode)
-
-U+E000 > ; eliminate special code for capitalization in transliterations
-
-pass(Unicode)
-
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [AVWL] = (U+064B..U+0650);
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0047 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;a..z A E I O U B N T Y ^ . _ " "" `
-Class [BRACKETS] = (U+003C U+003E U+00AB U+00BB U+0028 U+0029 U+005B U+005D U+2018 U+2019 U+201C U+201D); < > () « » [ ] ‘ ’ “ ”
-Class [PUNCT] = (V SC P CO)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-Class [Uwu] = (U+0055 U+0077 U+0075) ;(U w u)
-;Class [ae] = (U+0061 U+0065) ;(a e)
-;Class [ou] = (U+0075 U+006F) ;(u o)
-Class [Iyi] = (U+0069 U+0079 U+0049)
-Class [UI] = (U+0049 U+0055) ; U I
-Class [Digits] = (U+0030..U+0039)
-
-Define BEG (#|Z|[BRACKETS])
-Define END (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #)
-Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
-
-; special ligatures
-;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
-;; The BAR is used in the DMG transliteration to suppress the initial A
-(a|A) BAR? l Z LLAH > U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+0644 U+0644 U+0647 ;; 'll_ah' -> 'l l h'
-;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
-U+0041 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'ALLAH'
-U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
-
-U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
-U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
-U+0029 U+0029 > U+FD3E ;; '))' : ornate left par
-U+0052 U+0049 U+0059 U+0041 U+004C > U+FDFC ;; 'RIYAL' : Saudi currency sign
-;; most fonts won't have the following ones:
-U+0053 U+0041 U+004C U+004C U+0041 U+0053 U+0054 U+004F U+0050 > U+FDF0 ;; 'SALLASTOP' (.sallY with "ye-barree", Quranic stop sign)
-U+0051 U+0041 U+004C U+0041 > U+FDF1 ;; 'QALA' : qalY with ye-barree, Quranic stop sign
-U+0041 U+004B U+0042 U+0041 U+0052 > U+FDF3 ;; 'AKBAR'
-U+004D U+0055 U+0048 U+0041 U+004D U+004D U+0041 U+0044 > U+FDF4 ;; 'MUHAMMAD'
-U+0053 U+0041 U+004C U+0041 U+004D > U+FDF5 ;; 'SALAM'
-U+0052 U+0041 U+0053 U+004F ? U+0055 U+004C > U+FDF6 ;; 'RASUL' (also unicode 'RASOUL')
-U+0041 U+004C U+0041 U+0059 U+0048 (U+0049|U+0045) > U+FDF7 ;; 'ALAYHI' (also unicode 'ALAYHE')
-U+0057 U+0041 U+0053 U+0041 U+004C U+004C U+0041 U+004D > U+FDF8 ;; 'WASALLAM'
-U+0053 U+0041 U+004C U+004C U+0041 > U+FDF9 ;; 'SALLA'
-U+004A U+0041 U+004C U+004C U+0041 > U+FDFB ;; 'JALLA' : "jalla jalAluhu"
-U+0042 U+0041 U+0053 U+004D U+0041 U+004C U+0041 > U+FDFD ;; 'BASMALA' : very few fonts have this ligature afaik
-
-U+005E U+0053 U+004C U+0059 > U+06D6 ;; ^SLY
-U+005E U+0051 U+004C U+0059 > U+06D7 ;; ^QLY
-U+005E U+004D U+0049 U+004D > U+06D8 ;; ^MIM-
-U+005E U+004C U+0041 > U+06D9 ;; ^LA
-U+005E U+004A U+0049 U+004D > U+06DA ;; ^JIM
-U+005E U+0044 U+004F U+0054 U+0053 > U+06DB ;; ^DOTS
-U+005E U+0053 U+0049 U+004E > U+06DC ;; ^SIN
-U+0048 U+0049 U+005A U+0042 > U+06DE ;; HIZB
-U+0043 U+0049 U+0052 U+0043 U+005A U+0045 U+0052 U+004F > U+06DF ;; CIRCZERO
-U+0052 U+0045 U+0043 U+0054 U+005A U+0045 U+0052 U+004F > U+06E0 ;; RECTZERO
-U+005E U+004A U+0041 U+005A U+004D > U+06E1 ;; ^JAZM
-U+005E U+004D U+0049 U+004D > U+06E2 ;; ^MIM
-U+005F U+0053 U+0049 U+004E > U+06E3 ;; _SIN
-U+005E U+004D U+0041 U+0044 U+0044 U+0041 > U+06E4 ;; ^MADDA
-U+0057 U+0041 U+0057 > U+06E5 ;; WAW
-U+0059 U+0045 U+0048 > U+06E6 ;; YEH
-U+005E U+0059 U+0045 U+0048 > U+06E7 ;; ^YEH
-U+005E U+004E U+0055 U+004E > U+06E8 ;; ^NUN
-U+0053 U+0041 U+004A U+0044 U+0041 > U+06E9 ;; SAJDA
-U+005F U+0053 U+0054 U+004F U+0050 > U+06EA ;; _STOP
-U+005E U+0053 U+0054 U+004F U+0050 > U+06EB ;; ^STOP
-U+005E U+0052 U+0053 U+0054 U+004F U+0050 > U+06EC ;; ^RSTOP
-U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
-
-U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
-
-
-; vowels
-u u > U
-i i > I
-a a > A
-[AVWL] > ; strip off vowels when writing UTF-8 Arabic with novoc mode
-CO O > U+06FC ;
-a e > a y
-a o > a w
-(o|u)? O / # _ > U+0627 w
-(o|u)? O > w
-CO U > U+06C7 ;
-e > i ;; but not pashto > U+0659 and kashmiri > y + U+0658 (U+06CE is kurdish)
-o > u
-
-
-;; Persian ezafe (ALL BUT ARABIC AND UIGHUR)
-U+0048 Z UL? (Q? (i|e))=vv / _ END > U+06C0 @vv U+200C ;H-i -> heh+hamza final; what about 06C2 in Urdu ?<<<
-U+0048 Z Q?=qq (I|E)=vv / _ END > h U+0020 U+0627 @qq i @vv ; H-I
-Q?=q1 (I|E) Z UL? Q?=q2 (i|e) / _ END > @q1 i U+0626 @q2 i U+200C ; ...I-e
-Z Q?=qq I / (A|U) _ ENDZ > U+0626 @qq i y ; ...A-I or ...U-I
-Z UL? (Q? (i|e))=vv / (A|U) _ END > U+0649 @vv ; ...A-i or ...U-i
-Z Q?=q1 (e|i) / _ ENDZ > @q1 i ; ...-i
-Z / U+0048 _ > U+0020 ;
-b Q?=q1 (e|i) Q?=q2 U / # _ > b @q1 i U+0627 @q2 u w ;; special case of prep be without hyphen
-
-;; initial characters ...
-a l Z / BEG _ > U+0627 l Z
-;; wasla on initial alif : NEW! NOT TESTED!
-H / BEG _ l l > U+0627 ;
-[VWL]=v1 / BEG _ > A @v1
-Q?=q1 U / BEG _ > A @q1 u w ; -U
-; Q?=q1 I / BEG _ > A @q1 i y ; -I ; but not when I is final FIXME!!!
-Q?=q1 I / BEG _ > A @q1 i y ; except for Persian, coz of ezafe rules
-
-
-;; Words with anomalous orthography:
-
-; mi'aT -> ماية
-;;; i H / m Q ? _ Q ? a ? (T|t) > i A Hy
-m Q i H Q a / _ (T|t) > m Q i A Hy Q a
-m Q i H a / _ (T|t) > m Q i A Hy
-m i H Q a / _ (T|t) > m A Hy Q a
-m i H a / _ (T|t) > m A Hy
-
-
-
-pass(Unicode)
-
-Class [Digits] = (U+0030..U+0039)
-Class [ArDigits] = (U+0660..U+0669)
-Class [ArEasternDigits] = (U+06F0..U+06F9)
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;(a..z A E I O U B N T Y ^ . _ " "" `)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-
-
-
-
-;normal code
-
-;; special code for sindhi
-;; U+004D U+0049 U+004E > U+06FE ; define macro \MIN in sindhi env
-P m I N > U+06FE ; .mIN
-;; U+0049 U+004E > U+06FD ; IN define macro \IN in sindhi env
-H BAR I N > U+06FD ; '|IN
-
-(P z|U+1E93) (P z|U+1E93) > U+0638 U+0651 ;;SHADDA
-(P z|U+1E93) > U+0638
-C z C z > U+0698 U+0651 ;;SHADDA
-C z > U+0698
-V z V z > U+0696 U+0651 ;;SHADDA
-V z > U+0696 ;pashto
-z z > U+0632 U+0651 ;;SHADDA
-z > U+0632
-Y Y > U+0649 U+0651 ;;SHADDA
-Y > U+0649
-P I P I / _ # > U+06CC U+0651 ;; SHADDA
-P I / _ # > U+06CC ;; workaround to have ya without dots in Arabic
-y y > U+064A U+0651 ;;SHADDA
-y > U+064A
-v v > U+06A4 U+0651 ;;SHADDA
-v > U+06A4
-W > U+0648 U+0627 ; waw + alif
-C U > U+064F U+0648 U+0653; historical spelling : madda on waw
-Q U [Uw] > U+064F U+0648 U+0651 ;;SHADDA
-Q U > U+064F U+0648
-[Uw] [Uw] > U+0648 U+0651 ;;SHADDA
-[Uw] > U+0648
-C w C w > U+06C9 U+0651 ;;SHADDA
-C w > U+06C9
-CO w CO w > U+06CA U+0651 ;,SHADDA
-CO w > U+06CA
-Q u N > U+064C
-u N >
-Q u > U+064F
-V t h V t h > U+067A U+0651 ;;SHADDA
-V t h > U+067A
-t h t h > U+067F U+0651 ;;SHADDA
-t h > U+067F
-V t V t > U+067D U+0651 ;;SHADDA
-V t > U+067D
-UL (t|s) UL (t|s) > U+062B U+0651 ;;SHADDA
-UL (t|s) > U+062B
-(P t|U+1E6D) (P t|U+1E6D) > U+0637 U+0651 ;;SHADDA
-(P t|U+1E6D) > U+0637
-t t > U+062A U+0651 ;;SHADDA
-t > U+062A
-T T Q AN > U+0629 U+0651 U+064B ;;SHADDA
-T Q AN > U+0629 U+064B
-T AN > U+0629
-T T > U+0629 U+0651 ;;SHADDA
-T > U+0629
-C s C s > U+0634 U+0651 ;;SHADDA
-C s > U+0634
-(P s|U+1E63) (P s|U+1E63) > U+0635 U+0651 ;;SHADDA
-(P s|U+1E63) > U+0635
-V s V s > U+069A U+0651 ;;SHADDA
-V s > U+069A ;Pashto
-CO s CO s > U+069B U+0651 ;;SHADDA
-CO s > U+069B ; sin with 3 dots below
-s s > U+0633 U+0651 ;;SHADDA
-s > U+0633
-C r C r > U+06EF U+0651 ;;SHADDA ; missing in ArabTeX <<<
-C r > U+06EF
-CO r CO r > U+0697 U+0651 ;;SHADDA ; missing in ArabTeX <<<
-CO r > U+0697 ; Dargwa language, Dagestan
-P r P r > U+0694 U+0651 ;;SHADDA
-P r > U+0694 ; r with dot below; in Kurdish .r -> 0694
-V r V r > U+0699 U+0651 ;;SHADDA
-V r > U+0699
-r r > U+0631 U+0651 ;;SHADDA
-r > U+0631
-P q P q > U+066F U+0651 ;;SHADDA
-P q > U+066F
-q q > U+0642 U+0651 ;;SHADDA
-q > U+0642
-p h p h > U+06A6 U+0651 ;;SHADDA
-p h > U+06A6
-p p > U+067E U+0651 ;;SHADDA
-p > U+067E
-CO n CO n > U+06B1 U+0651 ;;SHADDA
-CO n > U+06B1
-C n C n > U+0683 U+0651 ;;SHADDA
-C n > U+0683
-P P n P P n > U+06B2 U+0651 ;;SHADDA
-P P n > U+06B2 ;; old sindhi? (not in ArabTeX) <<<
-P n P n > U+06BA U+0651 ;;SHADDA
-P n > U+06BA ; urdu
-V n V n > U+06BB U+0651 ;;SHADDA
-V n > U+06BB
-n n > U+0646 U+0651 ;;SHADDA
-n > U+0646
-m m > U+0645 U+0651 ;;SHADDA
-m > U+0645
-P l P l > U+06B6 U+0651 ;
-P l > U+06B6 ; ADDED <<<
-C l C l > U+06B5 U+0651 ;;SHADDA
-C l > U+06B5 ;kurdish
-l l > U+0644 U+0651 ;;SHADDA
-l > U+0644
-k h k h > U+06A9 U+0651 ;;SHADDA
-k h > U+06A9
-P k P k > U+06A9 U+0651 ;;SHADDA
-P k > U+06A9 ; pashto urdu
-UL k UL k > U+063A U+0651 ;;SHADDA
-UL k > U+063A
-k k > U+06AA U+0651 ;;SHADDA
-k > U+06AA ; kaf swash
-C g C g > U+062C U+0651 ;;SHADDA
-C g > U+062C
-CO j CO j > U+0684 U+0651 ;;SHADDA
-CO j > U+0684
-j j > U+062C U+0651 ;;SHADDA
-j > U+062C
-Q I > U+0650 U+064A
-C I > U+0650 U+064A U+0653 ; historical spelling : madda on ya
-UL I > ; suggestion of O. Smrz (arabtex-plus project) URL = ###
-I > U+064A
-Q i N > U+064D
-i N > ;
-Q i > U+0650
-x x > U+062E U+0651 ;;SHADDA
-x > U+062E
-UL h UL h > U+062E U+0651 ;;SHADDA
-UL h > U+062E
-(P h|U+1E25) (P h|U+1E25) > U+062D U+0651 ;;SHADDA
-(P h|U+1E25) > U+062D
-V h V h > U+06C1 U+0651 ;;SHADDA
-V h > U+06C1
-h h > U+06BE U+0651 ;;SHADDA
-h > U+06BE
-P CO g P CO g > U+06B4 U+0651 ;;SHADDA
-P CO g > U+06B4 ;; old sindhi? (not in ArabTeX) <<<
-CO g CO g > U+06B3 U+0651 ;;SHADDA
-CO g > U+06B3
-V g V g > U+06AC U+0651 ;;SHADDA
-V g > U+06AC ; kaf with dot above
-P g P g > U+063A U+0651 ;;SHADDA
-P g > U+063A
-g g > U+06AF U+0651 ;;SHADDA
-g > U+06AF
-G G > U+06AB U+0651 ;;SHADDA
-G > U+06AB ;pashto
-P f P f > U+06A1 U+0651 ;;SHADDA
-P f > U+06A1
-f f > U+0641 U+0651 ;;SHADDA
-f > U+0641
-V d h V d h > U+068D U+0651 ;;SHADDA
-V d h > U+068D
-V d V d > U+068A U+0651 ;;SHADDA
-V d > U+068A
-P V d P V d > U+068B U+0651 ;;SHADDA
-P V d > U+068B ;; (like U+0688 with dot below, for Lahnda = Western Punjabi)
-d h d h > U+068C U+0651 ;;SHADDA
-d h > U+068C
-C d C d > U+068E ;;SHADDA
-C d > U+068E ; old sindhi: not in ArabTeX
-CO d CO d > U+068F U+0651 ;;SHADDA
-CO d > U+068F
-UL (d|z) UL (d|z) > U+0630 U+0651 ;;SHADDA
-UL (d|z) > U+0630
-(P d|U+1E0D) (P d|U+1E0D) > U+0636 U+0651 ;;SHADDA
-(P d|U+1E0D) > U+0636
-d d > U+062F U+0651 ;;SHADDA
-d > U+062F
-C c h C c h > U+0687 U+0651 ;;SHADDA
-C c h > U+0687
-V c V c > U+0685 U+0651 ;;SHADDA
-V c > U+0685 ;pashto
-C c C c > U+0686 U+0651 ;;SHADDA
-C c > U+0686
-P C c P C c > U+06BF U+0651 ;;SHADDA
-P C c > U+06BF ;; cheh with dot above <<<
-c c > U+0681 U+0651 ;;SHADDA
-c > U+0681 ; ح with hamza above
-CO c CO c > U+0682 U+0651 ;;SHADDA
-CO c > U+0682 ; old pashto
-b h b h > U+0680 U+0651 ;;SHADDA
-b h > U+0680
-CO b CO b > U+067B U+0651 ;;SHADDA
-CO b > U+067B
-P b P b > U+066E U+0651 ;;SHADDA
-P b > U+066E
-b b > U+0628 U+0651 ;;SHADDA
-b > U+0628
-H A > U+0622
-C A > U+064E U+0622 ; historical spelling
-UL A > U+0649
-UL a > U+0670
-UL u > ;
-UL i > ;
-Q AN / (A H|Ha) _ > U+064B
-AN / (A H|Ha) _ > ;
-Q AN > U+0627 U+064B
-AN > U+0627
-Q a > U+064E
-Q A > U+064E U+0627
-A > U+0627
-Ain Ain > U+0639 U+0651 ;;SHADDA
-Ain > U+0639
-H H > U+0621 U+0651 ;;SHADDA
-H > U+0621
-U+002C / [Digits] _ [Digits] > U+002C ; comma in numerical context not an Arabic comma
-Z Z / [Digits] _ [Digits] > U+2013 ; two hyphens in numerical context -> endash
-(Z|U+005D|U+005B|U+0028|U+0029)=xx / [Digits] _ [Digits] > U+202D @xx U+202C ; hyphen or brackets in numerical context: surrounded by LRO & PDF marks
-[Digits] > [ArEasternDigits]
-Z Z Z / # _ # > U+2014
-Z Z / # _ # > U+2013
-Z Z > U+0640
-B > U+0640
-Z / # _ > U+200D ; -x > force initial form with "zero-width joiner"
-Z / _ # > U+200D ; x- > force final form
-U+003C U+003C > U+00BB ;<<
-U+003E U+003E > U+00AB ;>>
-U+00AB > U+00BB
-U+00BB > U+00AB
-UL > U+0640 ;_
-U+003F > U+061F ;?
-U+003B > U+061B ;;
-U+003A U+003A > U+061E ;; '::' ligature 'DOTS' also defined above...
-U+002C > U+060C ;,
-U+005D / [LTR] _ [LTR] > U+200D U+005D U+200D ; keep shaping when inserting ...[...]... ...
-U+005B / [LTR] _ [LTR] > U+200D U+005B U+200D ; (but of course this screws up contextual
- ; analysis, so quoting of hamzas etc may be necessary
-;U+005D > U+005B ;] these are automatically mirrored, following Unicode rules
-;U+005B > U+005D ;[
-[VWL] > ;stripoff vowels
-Q > U+0652
-U+00B0 > U+0652 ; °
-N > ;
-C > ;^
-Z > ;-
-BAR > ;|
-
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-sindhi-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-sindhi-novoc.tec
deleted file mode 100644
index 70837ac2edf..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-sindhi-novoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-sindhi-voc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-sindhi-voc.map
deleted file mode 100644
index 8d8c99e055e..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-sindhi-voc.map
+++ /dev/null
@@ -1,456 +0,0 @@
-LHSName "ArabTeX-sindhi-vocalized"
-RHSName "UNICODE"
-
-Define a U+0061 ;a
-Define b U+0062 ;b
-Define c U+0063 ;c
-Define d U+0064 ;d
-Define e U+0065 ;e
-Define f U+0066 ;f
-Define g U+0067 ;g
-Define h U+0068 ;h
-Define i U+0069 ;i
-Define j U+006A ;j
-Define k U+006B ;k
-Define l U+006C ;l
-Define m U+006D ;m
-Define n U+006E ;n
-Define o U+006F ;o
-Define p U+0070 ;p
-Define q U+0071 ;q
-Define r U+0072 ;r
-Define s U+0073 ;s
-Define t U+0074 ;t
-Define u U+0075 ;u
-Define v U+0076 ;v
-Define w U+0077 ;w
-Define x U+0078 ;x
-Define y U+0079 ;y
-Define z U+007A ;z
-Define A U+0041 ;A
-Define B U+0042 ;B
-Define E U+0045 ;E
-Define G U+0047 ;G
-Define I U+0049 ;I
-Define N U+004E ;N
-Define O U+004F ;O
-Define T U+0054 ;T
-Define U U+0055 ;U
-Define W U+0057 ;W
-Define Y U+0059 ;Y
-Define C U+005E ;^ << CARET
-Define UL U+005F ;_ << UNDERLINE
-Define P U+002E ;. << DOT
-Define V U+002C ;, << COMMA (_V_irgule)
-Define CO U+003A ;: << COLON
-Define SC U+003B ;; << SEMICOLON
-Define Ain U+0060 ;`
-Define H U+0027 ;' << HAMZA
-Define Q U+0022 ;" << QUOTE
-Define Z U+002D ;- << HYPHEN
-Define BAR U+007C ;|
-Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
-;Define NUL U+00A6;
-Define Ha U+0623
-Define Hi U+0625
-Define Hy U+0626
-Define Hw U+0624
-Define Hh U+06C0 ;; = U+0647 U+0654
-Define HA U+0622
-Define HB U+0640 U+0654
-Define HBAR U+0621 ; '|
-
-pass(Unicode)
-
-U+E000 > ; eliminate special code for capitalization in transliterations
-
-pass(Unicode)
-
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [AVWL] = (U+064B..U+0650);
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0047 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;a..z A E I O U B N T Y ^ . _ " "" `
-Class [BRACKETS] = (U+003C U+003E U+00AB U+00BB U+0028 U+0029 U+005B U+005D U+2018 U+2019 U+201C U+201D); < > () « » [ ] ‘ ’ “ ”
-Class [PUNCT] = (V SC P CO)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-Class [Uwu] = (U+0055 U+0077 U+0075) ;(U w u)
-;Class [ae] = (U+0061 U+0065) ;(a e)
-;Class [ou] = (U+0075 U+006F) ;(u o)
-Class [Iyi] = (U+0069 U+0079 U+0049)
-Class [UI] = (U+0049 U+0055) ; U I
-Class [Digits] = (U+0030..U+0039)
-
-Define BEG (#|Z|[BRACKETS])
-Define END (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #)
-Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
-
-; special ligatures
-;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
-;; The BAR is used in the DMG transliteration to suppress the initial A
-(a|A) BAR? l Z LLAH > U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+0644 U+0644 U+0647 ;; 'll_ah' -> 'l l h'
-;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
-U+0041 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'ALLAH'
-U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
-
-U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
-U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
-U+0029 U+0029 > U+FD3E ;; '))' : ornate left par
-U+0052 U+0049 U+0059 U+0041 U+004C > U+FDFC ;; 'RIYAL' : Saudi currency sign
-;; most fonts won't have the following ones:
-U+0053 U+0041 U+004C U+004C U+0041 U+0053 U+0054 U+004F U+0050 > U+FDF0 ;; 'SALLASTOP' (.sallY with "ye-barree", Quranic stop sign)
-U+0051 U+0041 U+004C U+0041 > U+FDF1 ;; 'QALA' : qalY with ye-barree, Quranic stop sign
-U+0041 U+004B U+0042 U+0041 U+0052 > U+FDF3 ;; 'AKBAR'
-U+004D U+0055 U+0048 U+0041 U+004D U+004D U+0041 U+0044 > U+FDF4 ;; 'MUHAMMAD'
-U+0053 U+0041 U+004C U+0041 U+004D > U+FDF5 ;; 'SALAM'
-U+0052 U+0041 U+0053 U+004F ? U+0055 U+004C > U+FDF6 ;; 'RASUL' (also unicode 'RASOUL')
-U+0041 U+004C U+0041 U+0059 U+0048 (U+0049|U+0045) > U+FDF7 ;; 'ALAYHI' (also unicode 'ALAYHE')
-U+0057 U+0041 U+0053 U+0041 U+004C U+004C U+0041 U+004D > U+FDF8 ;; 'WASALLAM'
-U+0053 U+0041 U+004C U+004C U+0041 > U+FDF9 ;; 'SALLA'
-U+004A U+0041 U+004C U+004C U+0041 > U+FDFB ;; 'JALLA' : "jalla jalAluhu"
-U+0042 U+0041 U+0053 U+004D U+0041 U+004C U+0041 > U+FDFD ;; 'BASMALA' : very few fonts have this ligature afaik
-
-U+005E U+0053 U+004C U+0059 > U+06D6 ;; ^SLY
-U+005E U+0051 U+004C U+0059 > U+06D7 ;; ^QLY
-U+005E U+004D U+0049 U+004D > U+06D8 ;; ^MIM-
-U+005E U+004C U+0041 > U+06D9 ;; ^LA
-U+005E U+004A U+0049 U+004D > U+06DA ;; ^JIM
-U+005E U+0044 U+004F U+0054 U+0053 > U+06DB ;; ^DOTS
-U+005E U+0053 U+0049 U+004E > U+06DC ;; ^SIN
-U+0048 U+0049 U+005A U+0042 > U+06DE ;; HIZB
-U+0043 U+0049 U+0052 U+0043 U+005A U+0045 U+0052 U+004F > U+06DF ;; CIRCZERO
-U+0052 U+0045 U+0043 U+0054 U+005A U+0045 U+0052 U+004F > U+06E0 ;; RECTZERO
-U+005E U+004A U+0041 U+005A U+004D > U+06E1 ;; ^JAZM
-U+005E U+004D U+0049 U+004D > U+06E2 ;; ^MIM
-U+005F U+0053 U+0049 U+004E > U+06E3 ;; _SIN
-U+005E U+004D U+0041 U+0044 U+0044 U+0041 > U+06E4 ;; ^MADDA
-U+0057 U+0041 U+0057 > U+06E5 ;; WAW
-U+0059 U+0045 U+0048 > U+06E6 ;; YEH
-U+005E U+0059 U+0045 U+0048 > U+06E7 ;; ^YEH
-U+005E U+004E U+0055 U+004E > U+06E8 ;; ^NUN
-U+0053 U+0041 U+004A U+0044 U+0041 > U+06E9 ;; SAJDA
-U+005F U+0053 U+0054 U+004F U+0050 > U+06EA ;; _STOP
-U+005E U+0053 U+0054 U+004F U+0050 > U+06EB ;; ^STOP
-U+005E U+0052 U+0053 U+0054 U+004F U+0050 > U+06EC ;; ^RSTOP
-U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
-
-U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
-
-
-; vowels
-u u > U
-i i > I
-a a > A
-CO O > U+06FC ;
-a e > a y
-a o > a w
-(o|u)? O / # _ > U+0627 w
-(o|u)? O > w
-CO U > U+06C7 ;
-e > i ;; but not pashto > U+0659 and kashmiri > y + U+0658 (U+06CE is kurdish)
-o > u
-
-
-;; Persian ezafe (ALL BUT ARABIC AND UIGHUR)
-U+0048 Z UL? (Q? (i|e))=vv / _ END > U+06C0 @vv U+200C ;H-i -> heh+hamza final; what about 06C2 in Urdu ?<<<
-U+0048 Z Q?=qq (I|E)=vv / _ END > h U+0020 U+0627 @qq i @vv ; H-I
-Q?=q1 (I|E) Z UL? Q?=q2 (i|e) / _ END > @q1 i U+0626 @q2 i U+200C ; ...I-e
-Z Q?=qq I / (A|U) _ ENDZ > U+0626 @qq i y ; ...A-I or ...U-I
-Z UL? (Q? (i|e))=vv / (A|U) _ END > U+0649 @vv ; ...A-i or ...U-i
-Z Q?=q1 (e|i) / _ ENDZ > @q1 i ; ...-i
-Z / U+0048 _ > U+0020 ;
-b Q?=q1 (e|i) Q?=q2 U / # _ > b @q1 i U+0627 @q2 u w ;; special case of prep be without hyphen
-
-;; initial characters ...
-a l Z / BEG _ > U+0627 l Z
-;; wasla on initial alif : NEW! NOT TESTED!
-H / BEG _ l l > U+0671 ; e.g. alla_dI -> 'lla_dI
-[VWL]=v1 / BEG _ > U+0627 @v1
-Q?=q1 U / BEG _ > U+0627 @q1 u w ; -U
-; Q?=q1 I / BEG _ > U+0627 @q1 i y ; -I
-Q?=q1 I / BEG _ > U+0627 @q1 i y
-
-
-;; Words with anomalous orthography:
-
-; mi'aT -> ماية
-;;; i H / m Q ? _ Q ? a ? (T|t) > i A Hy
-m Q i H Q a / _ (T|t) > m U+0627 Hy
-m Q i H a / _ (T|t) > m U+0627 Hy a
-m i H Q a / _ (T|t) > m i U+0627 Hy
-m i H a / _ (T|t) > m i U+0627 Hy a
-
-
-
-pass(Unicode)
-
-Class [Digits] = (U+0030..U+0039)
-Class [ArDigits] = (U+0660..U+0669)
-Class [ArEasternDigits] = (U+06F0..U+06F9)
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;(a..z A E I O U B N T Y ^ . _ " "" `)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-
-
-
-
-;normal code
-
-;; special code for sindhi
-;; U+004D U+0049 U+004E > U+06FE ; define macro \MIN in sindhi env
-P m I N > U+06FE ; .mIN
-;; U+0049 U+004E > U+06FD ; IN define macro \IN in sindhi env
-H BAR I N > U+06FD ; '|IN
-
-(P z|U+1E93) (P z|U+1E93) > U+0638 U+0651 ;;SHADDA
-(P z|U+1E93) > U+0638
-C z C z > U+0698 U+0651 ;;SHADDA
-C z > U+0698
-V z V z > U+0696 U+0651 ;;SHADDA
-V z > U+0696 ;pashto
-z z > U+0632 U+0651 ;;SHADDA
-z > U+0632
-Q Y Y > U+0649 U+0651 ;;SHADDA
-Q Y > U+0649
-Y Y > U+064E U+0649 U+0651 ;;SHADDA
-Y > U+064E U+0649
-P I P I / _ # > U+0650 U+06CC U+0651 ;; SHADDA
-P I / _ # > U+0650 U+06CC ;; workaround to have ya without dots in Arabic
-y y > U+064A U+0651 ;;SHADDA
-y > U+064A
-v v > U+06A4 U+0651 ;;SHADDA
-v > U+06A4
-W > U+0648 U+0627 ; waw + alif
-C U > U+064F U+0648 U+0653; historical spelling : madda on waw
-C w C w > U+06C9 U+0651 ;;SHADDA
-C w > U+06C9
-CO w CO w > U+06CA U+0651 ;,SHADDA
-CO w > U+06CA
-U A / _ # > U+064F U+0648 U+0627
-Q U [Uw] > U+0648 U+0651 ;;SHADDA
-Q U > U+0648
-U [Uw] > U+064F U+0648 U+0651 ;;SHADDA
-U > U+064F U+0648
-w w > U+0648 U+0651 ;;SHADDA
-w > U+0648
-Q u N? >
-u N > U+064C
-u > U+064F
-V t h V t h > U+067A U+0651 ;;SHADDA
-V t h > U+067A
-t h t h > U+067F U+0651 ;;SHADDA
-t h > U+067F
-V t V t > U+067D U+0651 ;;SHADDA
-V t > U+067D
-UL (t|s) UL (t|s) > U+062B U+0651 ;;SHADDA
-UL (t|s) > U+062B
-(P t|U+1E6D) (P t|U+1E6D) > U+0637 U+0651 ;;SHADDA
-(P t|U+1E6D) > U+0637
-t t > U+062A U+0651 ;;SHADDA
-t > U+062A
-T T Q AN > U+0629 U+0651 ;;SHADDA
-T Q AN > U+0629
-T AN > U+0629 U+064B
-T T > U+0629 U+0651 ;;SHADDA
-T > U+0629
-C s C s > U+0634 U+0651 ;;SHADDA
-C s > U+0634
-(P s|U+1E63) (P s|U+1E63) > U+0635 U+0651 ;;SHADDA
-(P s|U+1E63) > U+0635
-V s V s > U+069A U+0651 ;;SHADDA
-V s > U+069A ;Pashto
-CO s CO s > U+069B U+0651 ;;SHADDA
-CO s > U+069B ; sin with 3 dots below
-s s > U+0633 U+0651 ;;SHADDA
-s > U+0633
-C r C r > U+06EF U+0651 ;;SHADDA ; missing in ArabTeX <<<
-C r > U+06EF
-CO r CO r > U+0697 U+0651 ;;SHADDA ; missing in ArabTeX <<<
-CO r > U+0697 ; Dargwa language, Dagestan
-P r P r > U+0694 U+0651 ;;SHADDA
-P r > U+0694 ; r with dot below; in Kurdish .r -> 0694
-V r V r > U+0699 U+0651 ;;SHADDA
-V r > U+0699
-r r > U+0631 U+0651 ;;SHADDA
-r > U+0631
-P q P q > U+066F U+0651 ;;SHADDA
-P q > U+066F
-q q > U+0642 U+0651 ;;SHADDA
-q > U+0642
-p h p h > U+06A6 U+0651 ;;SHADDA
-p h > U+06A6
-p p > U+067E U+0651 ;;SHADDA
-p > U+067E
-CO n CO n > U+06B1 U+0651 ;;SHADDA
-CO n > U+06B1
-C n C n > U+0683 U+0651 ;;SHADDA
-C n > U+0683
-P P n P P n > U+06B2 U+0651 ;;SHADDA
-P P n > U+06B2 ;; old sindhi? (not in ArabTeX) <<<
-P n P n > U+06BA U+0651 ;;SHADDA
-P n > U+06BA ; urdu
-V n V n > U+06BB U+0651 ;;SHADDA
-V n > U+06BB
-n n > U+0646 U+0651 ;;SHADDA
-n > U+0646
-m m > U+0645 U+0651 ;;SHADDA
-m > U+0645
-P l P l > U+06B6 U+0651 ;
-P l > U+06B6 ; ADDED <<<
-C l C l > U+06B5 U+0651 ;;SHADDA
-C l > U+06B5 ;kurdish
-l l > U+0644 U+0651 ;;SHADDA
-l > U+0644
-k h k h > U+06A9 U+0651 ;;SHADDA
-k h > U+06A9
-P k P k > U+06A9 U+0651 ;;SHADDA
-P k > U+06A9 ; pashto urdu
-UL k UL k > U+063A U+0651 ;;SHADDA
-UL k > U+063A
-k k > U+06AA U+0651 ;;SHADDA
-k > U+06AA ; kaf swash
-C g C g > U+062C U+0651 ;;SHADDA
-C g > U+062C
-CO j CO j > U+0684 U+0651 ;;SHADDA
-CO j > U+0684
-j j > U+062C U+0651 ;;SHADDA
-j > U+062C
-Q I > U+064A
-I > U+0650 U+064A
-C I > U+0650 U+064A U+0653 ; historical spelling : madda on ya
-UL I > ; suggestion of O. Smrz (arabtex-plus project) URL = ###
-Q i N? > ;
-i N > U+064D
-i > U+0650
-x x > U+062E U+0651 ;;SHADDA
-x > U+062E
-UL h UL h > U+062E U+0651 ;;SHADDA
-UL h > U+062E
-(P h|U+1E25) (P h|U+1E25) > U+062D U+0651 ;;SHADDA
-(P h|U+1E25) > U+062D
-V h V h > U+06C1 U+0651 ;;SHADDA
-V h > U+06C1
-h h > U+06BE U+0651 ;;SHADDA
-h > U+06BE
-P CO g P CO g > U+06B4 U+0651 ;;SHADDA
-P CO g > U+06B4 ;; old sindhi? (not in ArabTeX) <<<
-CO g CO g > U+06B3 U+0651 ;;SHADDA
-CO g > U+06B3
-V g V g > U+06AC U+0651 ;;SHADDA
-V g > U+06AC ; kaf with dot above
-P g P g > U+063A U+0651 ;;SHADDA
-P g > U+063A
-g g > U+06AF U+0651 ;;SHADDA
-g > U+06AF
-G G > U+06AB U+0651 ;;SHADDA
-G > U+06AB ;pashto
-P f P f > U+06A1 U+0651 ;;SHADDA
-P f > U+06A1
-f f > U+0641 U+0651 ;;SHADDA
-f > U+0641
-V d h V d h > U+068D U+0651 ;;SHADDA
-V d h > U+068D
-V d V d > U+068A U+0651 ;;SHADDA
-V d > U+068A
-P V d P V d > U+068B U+0651 ;;SHADDA
-P V d > U+068B ;; (like U+0688 with dot below, for Lahnda = Western Punjabi)
-d h d h > U+068C U+0651 ;;SHADDA
-d h > U+068C
-C d C d > U+068E ;;SHADDA
-C d > U+068E ; old sindhi: not in ArabTeX
-CO d CO d > U+068F U+0651 ;;SHADDA
-CO d > U+068F
-UL (d|z) UL (d|z) > U+0630 U+0651 ;;SHADDA
-UL (d|z) > U+0630
-(P d|U+1E0D) (P d|U+1E0D) > U+0636 U+0651 ;;SHADDA
-(P d|U+1E0D) > U+0636
-d d > U+062F U+0651 ;;SHADDA
-d > U+062F
-C c h C c h > U+0687 U+0651 ;;SHADDA
-C c h > U+0687
-V c V c > U+0685 U+0651 ;;SHADDA
-V c > U+0685 ;pashto
-C c C c > U+0686 U+0651 ;;SHADDA
-C c > U+0686
-P C c P C c > U+06BF U+0651 ;;SHADDA
-P C c > U+06BF ;; cheh with dot above <<<
-c c > U+0681 U+0651 ;;SHADDA
-c > U+0681 ; ح with hamza above
-CO c CO c > U+0682 U+0651 ;;SHADDA
-CO c > U+0682 ; old pashto
-b h b h > U+0680 U+0651 ;;SHADDA
-b h > U+0680
-CO b CO b > U+067B U+0651 ;;SHADDA
-CO b > U+067B
-P b P b > U+066E U+0651 ;;SHADDA
-P b > U+066E
-b b > U+0628 U+0651 ;;SHADDA
-b > U+0628
-H A > U+0622
-C A > U+064E U+0622 ; historical spelling
-UL A > U+064E U+0649
-UL a > U+0670
-UL u > U+064F;
-UL i > U+0650;
-Q AN / (A H|Ha) _ > ;
-AN / (A H|Ha) _ > U+064B
-Q AN > U+0627
-AN > U+0627 U+064B
-Q a >
-a > U+064E
-Q A > U+0627
-A > U+064E U+0627
-Ain Ain > U+0639 U+0651 ;;SHADDA
-Ain > U+0639
-H H > U+0621 U+0651 ;;SHADDA
-H > U+0621
-U+002C / [Digits] _ [Digits] > U+002C ; comma in numerical context not an Arabic comma
-Z Z / [Digits] _ [Digits] > U+2013 ; two hyphens in numerical context -> endash
-(Z|U+005D|U+005B|U+0028|U+0029)=xx / [Digits] _ [Digits] > U+202D @xx U+202C ; hyphen or brackets in numerical context: surrounded by LRO & PDF marks
-[Digits] > [ArEasternDigits]
-Z Z Z / # _ # > U+2014
-Z Z / # _ # > U+2013
-Z Z > U+0640
-B > U+0640
-Z / # _ > U+200D ; -x > force initial form with "zero-width joiner"
-Z / _ # > U+200D ; x- > force final form
-U+003C U+003C > U+00BB ;<<
-U+003E U+003E > U+00AB ;>>
-U+00AB > U+00BB
-U+00BB > U+00AB
-UL > U+0640 ;_
-U+003F > U+061F ;?
-U+003B > U+061B ;;
-U+003A U+003A > U+061E ;; '::' ligature 'DOTS' also defined above...
-U+002C > U+060C ;,
-U+005D / [LTR] _ [LTR] > U+200D U+005D U+200D ; keep shaping when inserting ...[...]... ...
-U+005B / [LTR] _ [LTR] > U+200D U+005B U+200D ; (but of course this screws up contextual
- ; analysis, so quoting of hamzas etc may be necessary
-;U+005D > U+005B ;] these are automatically mirrored, following Unicode rules
-;U+005B > U+005D ;[
-Q [VWL] > ;stripoff quoted vowels
-Q > U+0652
-U+00B0 > U+0652 ; °
-N > ;
-C > ;^
-BAR > ;|
-
-pass(Unicode)
-
-Class [CONS] = (U+0621 U+0623 U+0624 U+0626 U+0628 U+062A..U+063A U+0641..U+0647 U+066E U+066F U+0672 U+0675 U+0676 U+0678..U+06BF U+06EE U+06EF U+06FA..U+06FF U+0750..U+076D) ; to be improved: not sure that all glyphs listed (esp for Urdu,Sindhi,etc are really "consonants" in the sense that they can carry a sukun, not to mention that some of these languages may not have a sukun at all ;-)
-Class [VWLX] = (U+0627 U+0648..U+065E U+0670) ; long vowels, vowel signs, shadda, sukun etc.
-Class [VWL] = (U+0627 U+0648..U+0650 U+0670);
-Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-sindhi-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-sindhi-voc.tec
deleted file mode 100644
index eb595c097ff..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-sindhi-voc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-turk-fullvoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-turk-fullvoc.map
deleted file mode 100644
index 06507da1eec..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-turk-fullvoc.map
+++ /dev/null
@@ -1,485 +0,0 @@
-LHSName "ArabTeX-turk-fullvocalized"
-RHSName "UNICODE"
-
-Define a U+0061 ;a
-Define b U+0062 ;b
-Define c U+0063 ;c
-Define d U+0064 ;d
-Define e U+0065 ;e
-Define f U+0066 ;f
-Define g U+0067 ;g
-Define h U+0068 ;h
-Define i U+0069 ;i
-Define j U+006A ;j
-Define k U+006B ;k
-Define l U+006C ;l
-Define m U+006D ;m
-Define n U+006E ;n
-Define o U+006F ;o
-Define p U+0070 ;p
-Define q U+0071 ;q
-Define r U+0072 ;r
-Define s U+0073 ;s
-Define t U+0074 ;t
-Define u U+0075 ;u
-Define v U+0076 ;v
-Define w U+0077 ;w
-Define x U+0078 ;x
-Define y U+0079 ;y
-Define z U+007A ;z
-Define A U+0041 ;A
-Define B U+0042 ;B
-Define E U+0045 ;E
-Define G U+0047 ;G
-Define I U+0049 ;I
-Define N U+004E ;N
-Define O U+004F ;O
-Define T U+0054 ;T
-Define U U+0055 ;U
-Define W U+0057 ;W
-Define Y U+0059 ;Y
-Define C U+005E ;^ << CARET
-Define UL U+005F ;_ << UNDERLINE
-Define P U+002E ;. << DOT
-Define V U+002C ;, << COMMA (_V_irgule)
-Define CO U+003A ;: << COLON
-Define SC U+003B ;; << SEMICOLON
-Define Ain U+0060 ;`
-Define H U+0027 ;' << HAMZA
-Define Q U+0022 ;" << QUOTE
-Define Z U+002D ;- << HYPHEN
-Define BAR U+007C ;|
-Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
-;Define NUL U+00A6;
-Define Ha U+0623
-Define Hi U+0625
-Define Hy U+0626
-Define Hw U+0624
-Define Hh U+06C0 ;; = U+0647 U+0654
-Define HA U+0622
-Define HB U+0640 U+0654
-Define HBAR U+0621 ; '|
-
-pass(Unicode)
-
-U+E000 > ; eliminate special code for capitalization in transliterations
-
-pass(Unicode)
-
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [AVWL] = (U+064B..U+0650);
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0047 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;a..z A E I O U B N T Y ^ . _ " "" `
-Class [BRACKETS] = (U+003C U+003E U+00AB U+00BB U+0028 U+0029 U+005B U+005D U+2018 U+2019 U+201C U+201D); < > () « » [ ] ‘ ’ “ ”
-Class [PUNCT] = (V SC P CO)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-Class [Uwu] = (U+0055 U+0077 U+0075) ;(U w u)
-;Class [ae] = (U+0061 U+0065) ;(a e)
-;Class [ou] = (U+0075 U+006F) ;(u o)
-Class [Iyi] = (U+0069 U+0079 U+0049)
-Class [UI] = (U+0049 U+0055) ; U I
-Class [Digits] = (U+0030..U+0039)
-
-Define BEG (#|Z|[BRACKETS])
-Define END (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #)
-Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
-
-; special ligatures
-;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
-;; The BAR is used in the DMG transliteration to suppress the initial A
-(a|A) BAR? l Z LLAH > U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+0644 U+0644 U+0647 ;; 'll_ah' -> 'l l h'
-;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
-U+0041 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'ALLAH'
-U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
-
-U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
-U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
-U+0029 U+0029 > U+FD3E ;; '))' : ornate left par
-U+0052 U+0049 U+0059 U+0041 U+004C > U+FDFC ;; 'RIYAL' : Saudi currency sign
-;; most fonts won't have the following ones:
-U+0053 U+0041 U+004C U+004C U+0041 U+0053 U+0054 U+004F U+0050 > U+FDF0 ;; 'SALLASTOP' (.sallY with "ye-barree", Quranic stop sign)
-U+0051 U+0041 U+004C U+0041 > U+FDF1 ;; 'QALA' : qalY with ye-barree, Quranic stop sign
-U+0041 U+004B U+0042 U+0041 U+0052 > U+FDF3 ;; 'AKBAR'
-U+004D U+0055 U+0048 U+0041 U+004D U+004D U+0041 U+0044 > U+FDF4 ;; 'MUHAMMAD'
-U+0053 U+0041 U+004C U+0041 U+004D > U+FDF5 ;; 'SALAM'
-U+0052 U+0041 U+0053 U+004F ? U+0055 U+004C > U+FDF6 ;; 'RASUL' (also unicode 'RASOUL')
-U+0041 U+004C U+0041 U+0059 U+0048 (U+0049|U+0045) > U+FDF7 ;; 'ALAYHI' (also unicode 'ALAYHE')
-U+0057 U+0041 U+0053 U+0041 U+004C U+004C U+0041 U+004D > U+FDF8 ;; 'WASALLAM'
-U+0053 U+0041 U+004C U+004C U+0041 > U+FDF9 ;; 'SALLA'
-U+004A U+0041 U+004C U+004C U+0041 > U+FDFB ;; 'JALLA' : "jalla jalAluhu"
-U+0042 U+0041 U+0053 U+004D U+0041 U+004C U+0041 > U+FDFD ;; 'BASMALA' : very few fonts have this ligature afaik
-
-U+005E U+0053 U+004C U+0059 > U+06D6 ;; ^SLY
-U+005E U+0051 U+004C U+0059 > U+06D7 ;; ^QLY
-U+005E U+004D U+0049 U+004D > U+06D8 ;; ^MIM-
-U+005E U+004C U+0041 > U+06D9 ;; ^LA
-U+005E U+004A U+0049 U+004D > U+06DA ;; ^JIM
-U+005E U+0044 U+004F U+0054 U+0053 > U+06DB ;; ^DOTS
-U+005E U+0053 U+0049 U+004E > U+06DC ;; ^SIN
-U+0048 U+0049 U+005A U+0042 > U+06DE ;; HIZB
-U+0043 U+0049 U+0052 U+0043 U+005A U+0045 U+0052 U+004F > U+06DF ;; CIRCZERO
-U+0052 U+0045 U+0043 U+0054 U+005A U+0045 U+0052 U+004F > U+06E0 ;; RECTZERO
-U+005E U+004A U+0041 U+005A U+004D > U+06E1 ;; ^JAZM
-U+005E U+004D U+0049 U+004D > U+06E2 ;; ^MIM
-U+005F U+0053 U+0049 U+004E > U+06E3 ;; _SIN
-U+005E U+004D U+0041 U+0044 U+0044 U+0041 > U+06E4 ;; ^MADDA
-U+0057 U+0041 U+0057 > U+06E5 ;; WAW
-U+0059 U+0045 U+0048 > U+06E6 ;; YEH
-U+005E U+0059 U+0045 U+0048 > U+06E7 ;; ^YEH
-U+005E U+004E U+0055 U+004E > U+06E8 ;; ^NUN
-U+0053 U+0041 U+004A U+0044 U+0041 > U+06E9 ;; SAJDA
-U+005F U+0053 U+0054 U+004F U+0050 > U+06EA ;; _STOP
-U+005E U+0053 U+0054 U+004F U+0050 > U+06EB ;; ^STOP
-U+005E U+0052 U+0053 U+0054 U+004F U+0050 > U+06EC ;; ^RSTOP
-U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
-
-U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
-
-
-; vowels
-u u > U
-i i > I
-a a > A
-CO O > U+06FC ;
-a e > a y
-a o > a w
-CO U > U+06C7 ;
-e > i ;; but not pashto > U+0659 and kashmiri > y + U+0658 (U+06CE is kurdish)
-o > u
-I / _ # > i y
-
-
-;; Persian ezafe (ALL BUT ARABIC AND UIGHUR)
-U+0048 Z UL? (Q? (i|e))=vv / _ END > U+06C0 @vv U+200C ;H-i -> heh+hamza final; what about 06C2 in Urdu ?<<<
-U+0048 Z Q?=qq (I|E)=vv / _ END > h U+0020 U+0627 @qq i @vv ; H-I
-Q?=q1 (I|E) Z UL? Q?=q2 (i|e) / _ END > @q1 i U+0626 @q2 i U+200C ; ...I-e
-Z Q?=qq I / (A|U) _ ENDZ > U+0626 @qq i y ; ...A-I or ...U-I
-Z UL? (Q? (i|e))=vv / (A|U) _ END > U+0649 @vv ; ...A-i or ...U-i
-Z Q?=q1 (e|i) / _ ENDZ > @q1 i ; ...-i
-Z / U+0048 _ > U+0020 ;
-b Q?=q1 (e|i) Q?=q2 U / # _ > b @q1 i U+0627 @q2 u w ;; special case of prep be without hyphen
-
-;; initial characters ...
-a l Z / BEG _ > U+0627 l Z
-;; wasla on initial alif : NEW! NOT TESTED!
-H / BEG _ l l > U+0671 ; e.g. alla_dI -> 'lla_dI
-[VWL]=v1 / BEG _ > U+0627 @v1
-Q?=q1 U / BEG _ > U+0627 @q1 u w ; -U
-; Q?=q1 I / BEG _ > U+0627 @q1 i y ; -I
-Q?=q1 I / BEG _ > U+0627 @q1 i y
-
-
-;; Words with anomalous orthography:
-
-; mi'aT -> ماية
-;;; i H / m Q ? _ Q ? a ? (T|t) > i A Hy
-m Q i H Q a / _ (T|t) > m U+0627 Hy
-m Q i H a / _ (T|t) > m U+0627 Hy a
-m i H Q a / _ (T|t) > m i U+0627 Hy
-m i H a / _ (T|t) > m i U+0627 Hy a
-
-
-;; contextual analysis of hamzas
-;; THESE DO NOT APPLY FOR SINDHI
-
-; initial hamzas
-H / (#|^[LTR]) _ Q? [Iyi] > Hi
-H Q A / (#|^[LTR]) _ > HA ; alif madda
-H / (#|^[LTR]) _ Q? [Uwu] > Ha
-H / (#|^[LTR]) _ Q? a > Ha
-Q H / (#|^[LTR]) _ > HB ; quoted isolated hamza at beginning of word
-
-; quoted hamzas in contextual mode, equivalent to verbatim mode
-a Q H > Ha
-i Q H > Hi
-y Q H > Hy
-w Q H > Hw
-h Q H > Hh
-A Q H > HA
-B Q H > HB
-BAR Q H > HBAR
-
-; hamza + fathatan
-H / a _ Q? AN > Ha
-;;H / [Iyi] _ Q? AN > Hy
-H / _ Q? AN > Hy
-
-;final hamzas
-H / A _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Uw] _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Iy] _ Q? (i N?|u N?)? (#|^[LTR]) > HBAR ; not AN ...
-H / a _ Q? (#|^[LTR]) > Ha ; not AN...
-H / a _ Q? (u|i) N? (#|^[LTR]) > Ha ; not AN...
-H / i _ Q? [VWL]? N? (#|^[LTR]) > Hy
-H / u _ Q? [VWL]? N? (#|^[LTR]) > Hw
-
-;;and more hamzas ...
-
-; n°1: kasra/ya
-H / [LTR] _ Q? [Iyi] ^N > Hy
-H / [Iyi] _ > Hy
-
-; n°2: damma/waw
-H / [LTR] _ Q? (U|u) ^N > Hw
-H / (U|u) _ Q? ^[Iyi] > Hw
-H / U _ > HBAR
-
-; n°3: fatha/alif
-H Q? A > HA
-H / A _ Q? a > HBAR
-H / ^[UI] _ Q? a > Ha
-H / a _ Q? ^[UI] > Ha
-
-
-pass(Unicode)
-
-Class [Digits] = (U+0030..U+0039)
-Class [ArDigits] = (U+0660..U+0669)
-Class [ArEasternDigits] = (U+06F0..U+06F9)
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;(a..z A E I O U B N T Y ^ . _ " "" `)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-
-
-
-
-;normal code
-
-
-(P z|U+1E93) (P z|U+1E93) > U+0638 U+0651 ;;SHADDA
-(P z|U+1E93) > U+0638
-C z C z > U+0698 U+0651 ;;SHADDA
-C z > U+0698
-V z V z > U+0636 U+0651 ;;SHADDA
-V z > U+0636
-z z > U+0632 U+0651 ;;SHADDA
-z > U+0632
-Q Y Y > U+0649 U+0651 ;;SHADDA
-Q Y > U+0649
-Y Y > U+064E U+0649 U+0651 ;;SHADDA
-Y > U+064E U+0649
-;; y / _ # > U+0649 ; y final in persian,ottoman,urdu,pashto,kashmiri has no dots
-y y > U+06CC U+0651 ;;SHADDA
-y > U+06CC ; yeh in persian etc. > iso and final shapes have no dots
-v v > U+06A4 U+0651 ;;SHADDA
-v > U+06A4
-W > U+0648 U+0627 ; waw + alif
-C U > U+064F U+0648 U+0653; historical spelling : madda on waw
-C w C w > U+06C9 U+0651 ;;SHADDA
-C w > U+06C9
-CO w CO w > U+06CA U+0651 ;,SHADDA
-CO w > U+06CA
-U A / _ # > U+064F U+0648 U+0627
-Q U [Uw] > U+0648 U+0651 ;;SHADDA
-Q U > U+0648
-U [Uw] > U+064F U+0648 U+0651 ;;SHADDA
-U > U+064F U+0648
-w w > U+0648 U+0651 ;;SHADDA
-w > U+0648
-Q u N? >
-u N > U+064C
-u > U+064F
-V t V t > U+0679 U+0651 ;;SHADDA
-V t > U+0679 ;urdu
-UL (t|s) UL (t|s) > U+062B U+0651 ;;SHADDA
-UL (t|s) > U+062B
-(P t|U+1E6D) (P t|U+1E6D) > U+0637 U+0651 ;;SHADDA
-(P t|U+1E6D) > U+0637
-t t > U+062A U+0651 ;;SHADDA
-t > U+062A
-T T Q AN > U+0629 U+0651 ;;SHADDA
-T Q AN > U+0629
-T AN > U+0629 U+064B
-T T > U+0629 U+0651 ;;SHADDA
-T > U+0629
-C s C s > U+0634 U+0651 ;;SHADDA
-C s > U+0634
-(P s|U+1E63) (P s|U+1E63) > U+0635 U+0651 ;;SHADDA
-(P s|U+1E63) > U+0635
-V s V s > U+0634 U+0651 ;;SHADDA
-V s > U+0634
-CO s CO s > U+069B U+0651 ;;SHADDA
-CO s > U+069B ; sin with 3 dots below
-s s > U+0633 U+0651 ;;SHADDA
-s > U+0633
-C r C r > U+06EF U+0651 ;;SHADDA ; missing in ArabTeX <<<
-C r > U+06EF
-CO r CO r > U+0697 U+0651 ;;SHADDA ; missing in ArabTeX <<<
-CO r > U+0697 ; Dargwa language, Dagestan
-P r P r > U+0694 U+0651 ;;SHADDA
-P r > U+0694 ; r with dot below; in Kurdish .r -> 0694
-V r V r > U+0691 U+0651 ;;SHADDA
-V r > U+0691 ;Urdu
-r r > U+0631 U+0651 ;;SHADDA
-r > U+0631
-P q P q > U+066F U+0651 ;;SHADDA
-P q > U+066F
-q q > U+0642 U+0651 ;;SHADDA
-q > U+0642
-p p > U+067E U+0651 ;;SHADDA
-p > U+067E
-CO n CO n > U+06B1 U+0651 ;;SHADDA
-CO n > U+06B1
-C n C n > U+06AD U+0651 ;;SHADDA
-C n > U+06AD
-P n P n > U+06BA U+0651 ;;SHADDA
-P n > U+06BA ; urdu
-V n V n > U+06BC U+0651 ;;SHADDA
-V n > U+06BC ; Pashto
-n n > U+0646 U+0651 ;;SHADDA
-n > U+0646
-m m > U+0645 U+0651 ;;SHADDA
-m > U+0645
-P l P l > U+06B6 U+0651 ;
-P l > U+06B6 ; ADDED <<<
-C l C l > U+06B5 U+0651 ;;SHADDA
-C l > U+06B5 ;kurdish
-l l > U+0644 U+0651 ;;SHADDA
-l > U+0644
-P k P k > U+0642 U+0651 ;;SHADDA
-P k > U+0642 ; Ottoman qaf
-UL k UL k > U+063A U+0651 ;;SHADDA
-UL k > U+063A
-k k > U+0643 U+0651 ;;SHADDA
-k > U+0643
-C g C g > U+06A0 U+0651 ;;SHADDA
-C g > U+06A0
-CO j CO j > U+0684 U+0651 ;;SHADDA
-CO j > U+0684
-j j > U+0698 U+0651 ;;SHADDA
-j > U+0698
-Q I > U+064A
-I > U+0650 U+064A
-C I > U+0650 U+064A U+0653 ; historical spelling : madda on ya
-UL I > ; suggestion of O. Smrz (arabtex-plus project) URL = ###
-Q i N? > ;
-i N > U+064D
-i > U+0650
-x x > U+062E U+0651 ;;SHADDA
-x > U+062E
-UL h UL h > U+062E U+0651 ;;SHADDA
-UL h > U+062E
-(P h|U+1E25) (P h|U+1E25) > U+062D U+0651 ;;SHADDA
-(P h|U+1E25) > U+062D
-V h V h > U+06C1 U+0651 ;;SHADDA
-V h > U+06C1
-h h > U+0647 U+0651 ;;SHADDA
-h > U+0647
-CO g CO g > U+06B3 U+0651 ;;SHADDA
-CO g > U+06B3
-V g V g > U+06AC U+0651 ;;SHADDA
-V g > U+06AC ; kaf with dot above
-P g P g > U+063A U+0651 ;;SHADDA
-P g > U+063A
-g g > U+06AF U+0651 ;;SHADDA
-g > U+06AF
-G G > U+06AB U+0651 ;;SHADDA
-G > U+06AB ;pashto
-P f P f > U+06A1 U+0651 ;;SHADDA
-P f > U+06A1
-f f > U+0641 U+0651 ;;SHADDA
-f > U+0641
-V d V d > U+068A U+0651 ;;SHADDA
-V d > U+068A
-P V d P V d > U+068B U+0651 ;;SHADDA
-P V d > U+068B ;; (like U+0688 with dot below, for Lahnda = Western Punjabi)
-C d C d > U+06EE U+0651 ;;SHADDA
-C d > U+06EE ; not defined in ArabTeX
-CO d CO d > U+068F U+0651 ;;SHADDA
-CO d > U+068F
-UL (d|z) UL (d|z) > U+0630 U+0651 ;;SHADDA
-UL (d|z) > U+0630
-(P d|U+1E0D) (P d|U+1E0D) > U+0636 U+0651 ;;SHADDA
-(P d|U+1E0D) > U+0636
-d d > U+062F U+0651 ;;SHADDA
-d > U+062F
-V c V c > U+0686 U+0651 ;;SHADDA
-V c > U+0686 ; Ottoman ç
-C c C c > U+0686 U+0651 ;;SHADDA
-C c > U+0686
-P C c P C c > U+06BF U+0651 ;;SHADDA
-P C c > U+06BF ;; cheh with dot above <<<
-c c > U+062C U+0651 ;;SHADDA
-c > U+062C
-CO c CO c > U+0682 U+0651 ;;SHADDA
-CO c > U+0682 ; old pashto
-CO b CO b > U+067B U+0651 ;;SHADDA
-CO b > U+067B
-P b P b > U+066E U+0651 ;;SHADDA
-P b > U+066E
-b b > U+0628 U+0651 ;;SHADDA
-b > U+0628
-H A > U+0622
-C A > U+064E U+0622 ; historical spelling
-UL A > U+064E U+0649
-UL a > U+0670
-UL u > U+064F;
-UL i > U+0650;
-Q AN / (A H|Ha) _ > ;
-AN / (A H|Ha) _ > U+064B
-Q AN > U+0627
-AN > U+0627 U+064B
-Q a >
-a > U+064E
-Q A > U+0627
-A > U+064E U+0627
-Ain Ain > U+0639 U+0651 ;;SHADDA
-Ain > U+0639
-H H > U+0621 U+0651 ;;SHADDA
-H > U+0621
-U+002C / [Digits] _ [Digits] > U+002C ; comma in numerical context not an Arabic comma
-Z Z / [Digits] _ [Digits] > U+2013 ; two hyphens in numerical context -> endash
-(Z|U+005D|U+005B|U+0028|U+0029)=xx / [Digits] _ [Digits] > U+202D @xx U+202C ; hyphen or brackets in numerical context: surrounded by LRO & PDF marks
-[Digits] > [ArDigits]
-Z Z Z / # _ # > U+2014
-Z Z / # _ # > U+2013
-Z Z > U+0640
-B > U+0640
-Z / # _ > U+200D ; -x > force initial form with "zero-width joiner"
-Z / _ # > U+200D ; x- > force final form
-U+003C U+003C > U+00BB ;<<
-U+003E U+003E > U+00AB ;>>
-U+00AB > U+00BB
-U+00BB > U+00AB
-UL > U+0640 ;_
-U+003F > U+061F ;?
-U+003B > U+061B ;;
-U+003A U+003A > U+061E ;; '::' ligature 'DOTS' also defined above...
-U+002C > U+060C ;,
-U+005D / [LTR] _ [LTR] > U+200D U+005D U+200D ; keep shaping when inserting ...[...]... ...
-U+005B / [LTR] _ [LTR] > U+200D U+005B U+200D ; (but of course this screws up contextual
- ; analysis, so quoting of hamzas etc may be necessary
-;U+005D > U+005B ;] these are automatically mirrored, following Unicode rules
-;U+005B > U+005D ;[
-Q [VWL] > ;stripoff quoted vowels
-U+00B0 > U+0652 ; °
-N > ;
-C > ;^
-BAR > ;|
-
-pass(Unicode)
-
-Class [CONS] = (U+0621 U+0623 U+0624 U+0626 U+0628 U+062A..U+063A U+0641..U+0647 U+066E U+066F U+0672 U+0675 U+0676 U+0678..U+06BF U+06EE U+06EF U+06FA..U+06FF U+0750..U+076D) ; to be improved: not sure that all glyphs listed (esp for Urdu,Sindhi,etc are really "consonants" in the sense that they can carry a sukun, not to mention that some of these languages may not have a sukun at all ;-)
-Class [VWLX] = (U+0627 U+0648..U+065E U+0670) ; long vowels, vowel signs, shadda, sukun etc.
-Class [VWL] = (U+0627 U+0648..U+0650 U+0670);
-[CONS]=k1 / _ Z? [CONS] ^U+0651 > @k1 U+0652 ; hack: 2nd consonant has no shadda
-U+064E (U+064A|U+0648)=hc / _ (^[VWLX]|#) > U+064E @hc U+0652 ; ay and aw diphtongs
-U+0627 / # _ U+0644 > U+0627 U+064E ; otherwise initial alif takes fatha
-[CONS]=k1 / _ ([CONS]|#) > @k1 U+0652 ; consonant + (consonant or final)
-;; [CONS]=k1 / _ # > @k1 U+0652 ; final consonant
-Q > ;
-Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-turk-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-turk-fullvoc.tec
deleted file mode 100644
index b4613e1a9cf..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-turk-fullvoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-turk-novoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-turk-novoc.map
deleted file mode 100644
index 65660b94daf..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-turk-novoc.map
+++ /dev/null
@@ -1,470 +0,0 @@
-LHSName "ArabTeX-turk-novowels"
-RHSName "UNICODE"
-
-Define a U+0061 ;a
-Define b U+0062 ;b
-Define c U+0063 ;c
-Define d U+0064 ;d
-Define e U+0065 ;e
-Define f U+0066 ;f
-Define g U+0067 ;g
-Define h U+0068 ;h
-Define i U+0069 ;i
-Define j U+006A ;j
-Define k U+006B ;k
-Define l U+006C ;l
-Define m U+006D ;m
-Define n U+006E ;n
-Define o U+006F ;o
-Define p U+0070 ;p
-Define q U+0071 ;q
-Define r U+0072 ;r
-Define s U+0073 ;s
-Define t U+0074 ;t
-Define u U+0075 ;u
-Define v U+0076 ;v
-Define w U+0077 ;w
-Define x U+0078 ;x
-Define y U+0079 ;y
-Define z U+007A ;z
-Define A U+0041 ;A
-Define B U+0042 ;B
-Define E U+0045 ;E
-Define G U+0047 ;G
-Define I U+0049 ;I
-Define N U+004E ;N
-Define O U+004F ;O
-Define T U+0054 ;T
-Define U U+0055 ;U
-Define W U+0057 ;W
-Define Y U+0059 ;Y
-Define C U+005E ;^ << CARET
-Define UL U+005F ;_ << UNDERLINE
-Define P U+002E ;. << DOT
-Define V U+002C ;, << COMMA (_V_irgule)
-Define CO U+003A ;: << COLON
-Define SC U+003B ;; << SEMICOLON
-Define Ain U+0060 ;`
-Define H U+0027 ;' << HAMZA
-Define Q U+0022 ;" << QUOTE
-Define Z U+002D ;- << HYPHEN
-Define BAR U+007C ;|
-Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
-;Define NUL U+00A6;
-Define Ha U+0623
-Define Hi U+0625
-Define Hy U+0626
-Define Hw U+0624
-Define Hh U+06C0 ;; = U+0647 U+0654
-Define HA U+0622
-Define HB U+0640 U+0654
-Define HBAR U+0621 ; '|
-
-pass(Unicode)
-
-U+E000 > ; eliminate special code for capitalization in transliterations
-
-pass(Unicode)
-
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [AVWL] = (U+064B..U+0650);
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0047 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;a..z A E I O U B N T Y ^ . _ " "" `
-Class [BRACKETS] = (U+003C U+003E U+00AB U+00BB U+0028 U+0029 U+005B U+005D U+2018 U+2019 U+201C U+201D); < > () « » [ ] ‘ ’ “ ”
-Class [PUNCT] = (V SC P CO)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-Class [Uwu] = (U+0055 U+0077 U+0075) ;(U w u)
-;Class [ae] = (U+0061 U+0065) ;(a e)
-;Class [ou] = (U+0075 U+006F) ;(u o)
-Class [Iyi] = (U+0069 U+0079 U+0049)
-Class [UI] = (U+0049 U+0055) ; U I
-Class [Digits] = (U+0030..U+0039)
-
-Define BEG (#|Z|[BRACKETS])
-Define END (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #)
-Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
-
-; special ligatures
-;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
-;; The BAR is used in the DMG transliteration to suppress the initial A
-(a|A) BAR? l Z LLAH > U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+0644 U+0644 U+0647 ;; 'll_ah' -> 'l l h'
-;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
-U+0041 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'ALLAH'
-U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
-
-U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
-U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
-U+0029 U+0029 > U+FD3E ;; '))' : ornate left par
-U+0052 U+0049 U+0059 U+0041 U+004C > U+FDFC ;; 'RIYAL' : Saudi currency sign
-;; most fonts won't have the following ones:
-U+0053 U+0041 U+004C U+004C U+0041 U+0053 U+0054 U+004F U+0050 > U+FDF0 ;; 'SALLASTOP' (.sallY with "ye-barree", Quranic stop sign)
-U+0051 U+0041 U+004C U+0041 > U+FDF1 ;; 'QALA' : qalY with ye-barree, Quranic stop sign
-U+0041 U+004B U+0042 U+0041 U+0052 > U+FDF3 ;; 'AKBAR'
-U+004D U+0055 U+0048 U+0041 U+004D U+004D U+0041 U+0044 > U+FDF4 ;; 'MUHAMMAD'
-U+0053 U+0041 U+004C U+0041 U+004D > U+FDF5 ;; 'SALAM'
-U+0052 U+0041 U+0053 U+004F ? U+0055 U+004C > U+FDF6 ;; 'RASUL' (also unicode 'RASOUL')
-U+0041 U+004C U+0041 U+0059 U+0048 (U+0049|U+0045) > U+FDF7 ;; 'ALAYHI' (also unicode 'ALAYHE')
-U+0057 U+0041 U+0053 U+0041 U+004C U+004C U+0041 U+004D > U+FDF8 ;; 'WASALLAM'
-U+0053 U+0041 U+004C U+004C U+0041 > U+FDF9 ;; 'SALLA'
-U+004A U+0041 U+004C U+004C U+0041 > U+FDFB ;; 'JALLA' : "jalla jalAluhu"
-U+0042 U+0041 U+0053 U+004D U+0041 U+004C U+0041 > U+FDFD ;; 'BASMALA' : very few fonts have this ligature afaik
-
-U+005E U+0053 U+004C U+0059 > U+06D6 ;; ^SLY
-U+005E U+0051 U+004C U+0059 > U+06D7 ;; ^QLY
-U+005E U+004D U+0049 U+004D > U+06D8 ;; ^MIM-
-U+005E U+004C U+0041 > U+06D9 ;; ^LA
-U+005E U+004A U+0049 U+004D > U+06DA ;; ^JIM
-U+005E U+0044 U+004F U+0054 U+0053 > U+06DB ;; ^DOTS
-U+005E U+0053 U+0049 U+004E > U+06DC ;; ^SIN
-U+0048 U+0049 U+005A U+0042 > U+06DE ;; HIZB
-U+0043 U+0049 U+0052 U+0043 U+005A U+0045 U+0052 U+004F > U+06DF ;; CIRCZERO
-U+0052 U+0045 U+0043 U+0054 U+005A U+0045 U+0052 U+004F > U+06E0 ;; RECTZERO
-U+005E U+004A U+0041 U+005A U+004D > U+06E1 ;; ^JAZM
-U+005E U+004D U+0049 U+004D > U+06E2 ;; ^MIM
-U+005F U+0053 U+0049 U+004E > U+06E3 ;; _SIN
-U+005E U+004D U+0041 U+0044 U+0044 U+0041 > U+06E4 ;; ^MADDA
-U+0057 U+0041 U+0057 > U+06E5 ;; WAW
-U+0059 U+0045 U+0048 > U+06E6 ;; YEH
-U+005E U+0059 U+0045 U+0048 > U+06E7 ;; ^YEH
-U+005E U+004E U+0055 U+004E > U+06E8 ;; ^NUN
-U+0053 U+0041 U+004A U+0044 U+0041 > U+06E9 ;; SAJDA
-U+005F U+0053 U+0054 U+004F U+0050 > U+06EA ;; _STOP
-U+005E U+0053 U+0054 U+004F U+0050 > U+06EB ;; ^STOP
-U+005E U+0052 U+0053 U+0054 U+004F U+0050 > U+06EC ;; ^RSTOP
-U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
-
-U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
-
-
-; vowels
-u u > U
-i i > I
-a a > A
-[AVWL] > ; strip off vowels when writing UTF-8 Arabic with novoc mode
-CO O > U+06FC ;
-a e > a y
-a o > a w
-CO U > U+06C7 ;
-e > i ;; but not pashto > U+0659 and kashmiri > y + U+0658 (U+06CE is kurdish)
-o > u
-I / _ # > i y
-
-
-;; Persian ezafe (ALL BUT ARABIC AND UIGHUR)
-U+0048 Z UL? (Q? (i|e))=vv / _ END > U+06C0 @vv U+200C ;H-i -> heh+hamza final; what about 06C2 in Urdu ?<<<
-U+0048 Z Q?=qq (I|E)=vv / _ END > h U+0020 U+0627 @qq i @vv ; H-I
-Q?=q1 (I|E) Z UL? Q?=q2 (i|e) / _ END > @q1 i U+0626 @q2 i U+200C ; ...I-e
-Z Q?=qq I / (A|U) _ ENDZ > U+0626 @qq i y ; ...A-I or ...U-I
-Z UL? (Q? (i|e))=vv / (A|U) _ END > U+0649 @vv ; ...A-i or ...U-i
-Z Q?=q1 (e|i) / _ ENDZ > @q1 i ; ...-i
-Z / U+0048 _ > U+0020 ;
-b Q?=q1 (e|i) Q?=q2 U / # _ > b @q1 i U+0627 @q2 u w ;; special case of prep be without hyphen
-
-;; initial characters ...
-a l Z / BEG _ > U+0627 l Z
-;; wasla on initial alif : NEW! NOT TESTED!
-H / BEG _ l l > U+0627 ;
-[VWL]=v1 / BEG _ > A @v1
-Q?=q1 U / BEG _ > A @q1 u w ; -U
-; Q?=q1 I / BEG _ > A @q1 i y ; -I ; but not when I is final FIXME!!!
-Q?=q1 I / BEG _ > A @q1 i y ; except for Persian, coz of ezafe rules
-
-
-;; Words with anomalous orthography:
-
-; mi'aT -> ماية
-;;; i H / m Q ? _ Q ? a ? (T|t) > i A Hy
-m Q i H Q a / _ (T|t) > m Q i A Hy Q a
-m Q i H a / _ (T|t) > m Q i A Hy
-m i H Q a / _ (T|t) > m A Hy Q a
-m i H a / _ (T|t) > m A Hy
-
-
-;; contextual analysis of hamzas
-;; THESE DO NOT APPLY FOR SINDHI
-
-; initial hamzas
-H / (#|^[LTR]) _ Q? [Iyi] > Hi
-H Q A / (#|^[LTR]) _ > HA ; alif madda
-H / (#|^[LTR]) _ Q? [Uwu] > Ha
-H / (#|^[LTR]) _ Q? a > Ha
-Q H / (#|^[LTR]) _ > HB ; quoted isolated hamza at beginning of word
-
-; quoted hamzas in contextual mode, equivalent to verbatim mode
-a Q H > Ha
-i Q H > Hi
-y Q H > Hy
-w Q H > Hw
-h Q H > Hh
-A Q H > HA
-B Q H > HB
-BAR Q H > HBAR
-
-; hamza + fathatan
-H / a _ Q? AN > Ha
-;;H / [Iyi] _ Q? AN > Hy
-H / _ Q? AN > Hy
-
-;final hamzas
-H / A _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Uw] _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Iy] _ Q? (i N?|u N?)? (#|^[LTR]) > HBAR ; not AN ...
-H / a _ Q? (#|^[LTR]) > Ha ; not AN...
-H / a _ Q? (u|i) N? (#|^[LTR]) > Ha ; not AN...
-H / i _ Q? [VWL]? N? (#|^[LTR]) > Hy
-H / u _ Q? [VWL]? N? (#|^[LTR]) > Hw
-
-;;and more hamzas ...
-
-; n°1: kasra/ya
-H / [LTR] _ Q? [Iyi] ^N > Hy
-H / [Iyi] _ > Hy
-
-; n°2: damma/waw
-H / [LTR] _ Q? (U|u) ^N > Hw
-H / (U|u) _ Q? ^[Iyi] > Hw
-H / U _ > HBAR
-
-; n°3: fatha/alif
-H Q? A > HA
-H / A _ Q? a > HBAR
-H / ^[UI] _ Q? a > Ha
-H / a _ Q? ^[UI] > Ha
-
-
-pass(Unicode)
-
-Class [Digits] = (U+0030..U+0039)
-Class [ArDigits] = (U+0660..U+0669)
-Class [ArEasternDigits] = (U+06F0..U+06F9)
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;(a..z A E I O U B N T Y ^ . _ " "" `)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-
-
-
-
-;normal code
-
-
-(P z|U+1E93) (P z|U+1E93) > U+0638 U+0651 ;;SHADDA
-(P z|U+1E93) > U+0638
-C z C z > U+0698 U+0651 ;;SHADDA
-C z > U+0698
-V z V z > U+0636 U+0651 ;;SHADDA
-V z > U+0636
-z z > U+0632 U+0651 ;;SHADDA
-z > U+0632
-Y Y > U+0649 U+0651 ;;SHADDA
-Y > U+0649
-;; y / _ # > U+0649 ; y final in persian,ottoman,urdu,pashto,kashmiri has no dots
-y y > U+06CC U+0651 ;;SHADDA
-y > U+06CC ; yeh in persian etc. > iso and final shapes have no dots
-v v > U+06A4 U+0651 ;;SHADDA
-v > U+06A4
-W > U+0648 U+0627 ; waw + alif
-C U > U+064F U+0648 U+0653; historical spelling : madda on waw
-Q U [Uw] > U+064F U+0648 U+0651 ;;SHADDA
-Q U > U+064F U+0648
-[Uw] [Uw] > U+0648 U+0651 ;;SHADDA
-[Uw] > U+0648
-C w C w > U+06C9 U+0651 ;;SHADDA
-C w > U+06C9
-CO w CO w > U+06CA U+0651 ;,SHADDA
-CO w > U+06CA
-Q u N > U+064C
-u N >
-Q u > U+064F
-V t V t > U+0679 U+0651 ;;SHADDA
-V t > U+0679 ;urdu
-UL (t|s) UL (t|s) > U+062B U+0651 ;;SHADDA
-UL (t|s) > U+062B
-(P t|U+1E6D) (P t|U+1E6D) > U+0637 U+0651 ;;SHADDA
-(P t|U+1E6D) > U+0637
-t t > U+062A U+0651 ;;SHADDA
-t > U+062A
-T T Q AN > U+0629 U+0651 U+064B ;;SHADDA
-T Q AN > U+0629 U+064B
-T AN > U+0629
-T T > U+0629 U+0651 ;;SHADDA
-T > U+0629
-C s C s > U+0634 U+0651 ;;SHADDA
-C s > U+0634
-(P s|U+1E63) (P s|U+1E63) > U+0635 U+0651 ;;SHADDA
-(P s|U+1E63) > U+0635
-V s V s > U+0634 U+0651 ;;SHADDA
-V s > U+0634
-CO s CO s > U+069B U+0651 ;;SHADDA
-CO s > U+069B ; sin with 3 dots below
-s s > U+0633 U+0651 ;;SHADDA
-s > U+0633
-C r C r > U+06EF U+0651 ;;SHADDA ; missing in ArabTeX <<<
-C r > U+06EF
-CO r CO r > U+0697 U+0651 ;;SHADDA ; missing in ArabTeX <<<
-CO r > U+0697 ; Dargwa language, Dagestan
-P r P r > U+0694 U+0651 ;;SHADDA
-P r > U+0694 ; r with dot below; in Kurdish .r -> 0694
-V r V r > U+0691 U+0651 ;;SHADDA
-V r > U+0691 ;Urdu
-r r > U+0631 U+0651 ;;SHADDA
-r > U+0631
-P q P q > U+066F U+0651 ;;SHADDA
-P q > U+066F
-q q > U+0642 U+0651 ;;SHADDA
-q > U+0642
-p p > U+067E U+0651 ;;SHADDA
-p > U+067E
-CO n CO n > U+06B1 U+0651 ;;SHADDA
-CO n > U+06B1
-C n C n > U+06AD U+0651 ;;SHADDA
-C n > U+06AD
-P n P n > U+06BA U+0651 ;;SHADDA
-P n > U+06BA ; urdu
-V n V n > U+06BC U+0651 ;;SHADDA
-V n > U+06BC ; Pashto
-n n > U+0646 U+0651 ;;SHADDA
-n > U+0646
-m m > U+0645 U+0651 ;;SHADDA
-m > U+0645
-P l P l > U+06B6 U+0651 ;
-P l > U+06B6 ; ADDED <<<
-C l C l > U+06B5 U+0651 ;;SHADDA
-C l > U+06B5 ;kurdish
-l l > U+0644 U+0651 ;;SHADDA
-l > U+0644
-P k P k > U+0642 U+0651 ;;SHADDA
-P k > U+0642 ; Ottoman qaf
-UL k UL k > U+063A U+0651 ;;SHADDA
-UL k > U+063A
-k k > U+0643 U+0651 ;;SHADDA
-k > U+0643
-C g C g > U+06A0 U+0651 ;;SHADDA
-C g > U+06A0
-CO j CO j > U+0684 U+0651 ;;SHADDA
-CO j > U+0684
-j j > U+0698 U+0651 ;;SHADDA
-j > U+0698
-Q I > U+0650 U+064A
-C I > U+0650 U+064A U+0653 ; historical spelling : madda on ya
-UL I > ; suggestion of O. Smrz (arabtex-plus project) URL = ###
-I > U+064A
-Q i N > U+064D
-i N > ;
-Q i > U+0650
-x x > U+062E U+0651 ;;SHADDA
-x > U+062E
-UL h UL h > U+062E U+0651 ;;SHADDA
-UL h > U+062E
-(P h|U+1E25) (P h|U+1E25) > U+062D U+0651 ;;SHADDA
-(P h|U+1E25) > U+062D
-V h V h > U+06C1 U+0651 ;;SHADDA
-V h > U+06C1
-h h > U+0647 U+0651 ;;SHADDA
-h > U+0647
-CO g CO g > U+06B3 U+0651 ;;SHADDA
-CO g > U+06B3
-V g V g > U+06AC U+0651 ;;SHADDA
-V g > U+06AC ; kaf with dot above
-P g P g > U+063A U+0651 ;;SHADDA
-P g > U+063A
-g g > U+06AF U+0651 ;;SHADDA
-g > U+06AF
-G G > U+06AB U+0651 ;;SHADDA
-G > U+06AB ;pashto
-P f P f > U+06A1 U+0651 ;;SHADDA
-P f > U+06A1
-f f > U+0641 U+0651 ;;SHADDA
-f > U+0641
-V d V d > U+068A U+0651 ;;SHADDA
-V d > U+068A
-P V d P V d > U+068B U+0651 ;;SHADDA
-P V d > U+068B ;; (like U+0688 with dot below, for Lahnda = Western Punjabi)
-C d C d > U+06EE U+0651 ;;SHADDA
-C d > U+06EE ; not defined in ArabTeX
-CO d CO d > U+068F U+0651 ;;SHADDA
-CO d > U+068F
-UL (d|z) UL (d|z) > U+0630 U+0651 ;;SHADDA
-UL (d|z) > U+0630
-(P d|U+1E0D) (P d|U+1E0D) > U+0636 U+0651 ;;SHADDA
-(P d|U+1E0D) > U+0636
-d d > U+062F U+0651 ;;SHADDA
-d > U+062F
-V c V c > U+0686 U+0651 ;;SHADDA
-V c > U+0686 ; Ottoman ç
-C c C c > U+0686 U+0651 ;;SHADDA
-C c > U+0686
-P C c P C c > U+06BF U+0651 ;;SHADDA
-P C c > U+06BF ;; cheh with dot above <<<
-c c > U+062C U+0651 ;;SHADDA
-c > U+062C
-CO c CO c > U+0682 U+0651 ;;SHADDA
-CO c > U+0682 ; old pashto
-CO b CO b > U+067B U+0651 ;;SHADDA
-CO b > U+067B
-P b P b > U+066E U+0651 ;;SHADDA
-P b > U+066E
-b b > U+0628 U+0651 ;;SHADDA
-b > U+0628
-H A > U+0622
-C A > U+064E U+0622 ; historical spelling
-UL A > U+0649
-UL a > U+0670
-UL u > ;
-UL i > ;
-Q AN / (A H|Ha) _ > U+064B
-AN / (A H|Ha) _ > ;
-Q AN > U+0627 U+064B
-AN > U+0627
-Q a > U+064E
-Q A > U+064E U+0627
-A > U+0627
-Ain Ain > U+0639 U+0651 ;;SHADDA
-Ain > U+0639
-H H > U+0621 U+0651 ;;SHADDA
-H > U+0621
-U+002C / [Digits] _ [Digits] > U+002C ; comma in numerical context not an Arabic comma
-Z Z / [Digits] _ [Digits] > U+2013 ; two hyphens in numerical context -> endash
-(Z|U+005D|U+005B|U+0028|U+0029)=xx / [Digits] _ [Digits] > U+202D @xx U+202C ; hyphen or brackets in numerical context: surrounded by LRO & PDF marks
-[Digits] > [ArDigits]
-Z Z Z / # _ # > U+2014
-Z Z / # _ # > U+2013
-Z Z > U+0640
-B > U+0640
-Z / # _ > U+200D ; -x > force initial form with "zero-width joiner"
-Z / _ # > U+200D ; x- > force final form
-U+003C U+003C > U+00BB ;<<
-U+003E U+003E > U+00AB ;>>
-U+00AB > U+00BB
-U+00BB > U+00AB
-UL > U+0640 ;_
-U+003F > U+061F ;?
-U+003B > U+061B ;;
-U+003A U+003A > U+061E ;; '::' ligature 'DOTS' also defined above...
-U+002C > U+060C ;,
-U+005D / [LTR] _ [LTR] > U+200D U+005D U+200D ; keep shaping when inserting ...[...]... ...
-U+005B / [LTR] _ [LTR] > U+200D U+005B U+200D ; (but of course this screws up contextual
- ; analysis, so quoting of hamzas etc may be necessary
-;U+005D > U+005B ;] these are automatically mirrored, following Unicode rules
-;U+005B > U+005D ;[
-[VWL] > ;stripoff vowels
-Q > U+0652
-U+00B0 > U+0652 ; °
-N > ;
-C > ;^
-Z > ;-
-BAR > ;|
-
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-turk-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-turk-novoc.tec
deleted file mode 100644
index b63f2ef8ee8..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-turk-novoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-turk-voc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-turk-voc.map
deleted file mode 100644
index 0ab30050577..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-turk-voc.map
+++ /dev/null
@@ -1,480 +0,0 @@
-LHSName "ArabTeX-turk-vocalized"
-RHSName "UNICODE"
-
-Define a U+0061 ;a
-Define b U+0062 ;b
-Define c U+0063 ;c
-Define d U+0064 ;d
-Define e U+0065 ;e
-Define f U+0066 ;f
-Define g U+0067 ;g
-Define h U+0068 ;h
-Define i U+0069 ;i
-Define j U+006A ;j
-Define k U+006B ;k
-Define l U+006C ;l
-Define m U+006D ;m
-Define n U+006E ;n
-Define o U+006F ;o
-Define p U+0070 ;p
-Define q U+0071 ;q
-Define r U+0072 ;r
-Define s U+0073 ;s
-Define t U+0074 ;t
-Define u U+0075 ;u
-Define v U+0076 ;v
-Define w U+0077 ;w
-Define x U+0078 ;x
-Define y U+0079 ;y
-Define z U+007A ;z
-Define A U+0041 ;A
-Define B U+0042 ;B
-Define E U+0045 ;E
-Define G U+0047 ;G
-Define I U+0049 ;I
-Define N U+004E ;N
-Define O U+004F ;O
-Define T U+0054 ;T
-Define U U+0055 ;U
-Define W U+0057 ;W
-Define Y U+0059 ;Y
-Define C U+005E ;^ << CARET
-Define UL U+005F ;_ << UNDERLINE
-Define P U+002E ;. << DOT
-Define V U+002C ;, << COMMA (_V_irgule)
-Define CO U+003A ;: << COLON
-Define SC U+003B ;; << SEMICOLON
-Define Ain U+0060 ;`
-Define H U+0027 ;' << HAMZA
-Define Q U+0022 ;" << QUOTE
-Define Z U+002D ;- << HYPHEN
-Define BAR U+007C ;|
-Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
-;Define NUL U+00A6;
-Define Ha U+0623
-Define Hi U+0625
-Define Hy U+0626
-Define Hw U+0624
-Define Hh U+06C0 ;; = U+0647 U+0654
-Define HA U+0622
-Define HB U+0640 U+0654
-Define HBAR U+0621 ; '|
-
-pass(Unicode)
-
-U+E000 > ; eliminate special code for capitalization in transliterations
-
-pass(Unicode)
-
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [AVWL] = (U+064B..U+0650);
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0047 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;a..z A E I O U B N T Y ^ . _ " "" `
-Class [BRACKETS] = (U+003C U+003E U+00AB U+00BB U+0028 U+0029 U+005B U+005D U+2018 U+2019 U+201C U+201D); < > () « » [ ] ‘ ’ “ ”
-Class [PUNCT] = (V SC P CO)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-Class [Uwu] = (U+0055 U+0077 U+0075) ;(U w u)
-;Class [ae] = (U+0061 U+0065) ;(a e)
-;Class [ou] = (U+0075 U+006F) ;(u o)
-Class [Iyi] = (U+0069 U+0079 U+0049)
-Class [UI] = (U+0049 U+0055) ; U I
-Class [Digits] = (U+0030..U+0039)
-
-Define BEG (#|Z|[BRACKETS])
-Define END (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #)
-Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
-
-; special ligatures
-;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
-;; The BAR is used in the DMG transliteration to suppress the initial A
-(a|A) BAR? l Z LLAH > U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+0644 U+0644 U+0647 ;; 'll_ah' -> 'l l h'
-;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
-U+0041 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'ALLAH'
-U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
-
-U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
-U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
-U+0029 U+0029 > U+FD3E ;; '))' : ornate left par
-U+0052 U+0049 U+0059 U+0041 U+004C > U+FDFC ;; 'RIYAL' : Saudi currency sign
-;; most fonts won't have the following ones:
-U+0053 U+0041 U+004C U+004C U+0041 U+0053 U+0054 U+004F U+0050 > U+FDF0 ;; 'SALLASTOP' (.sallY with "ye-barree", Quranic stop sign)
-U+0051 U+0041 U+004C U+0041 > U+FDF1 ;; 'QALA' : qalY with ye-barree, Quranic stop sign
-U+0041 U+004B U+0042 U+0041 U+0052 > U+FDF3 ;; 'AKBAR'
-U+004D U+0055 U+0048 U+0041 U+004D U+004D U+0041 U+0044 > U+FDF4 ;; 'MUHAMMAD'
-U+0053 U+0041 U+004C U+0041 U+004D > U+FDF5 ;; 'SALAM'
-U+0052 U+0041 U+0053 U+004F ? U+0055 U+004C > U+FDF6 ;; 'RASUL' (also unicode 'RASOUL')
-U+0041 U+004C U+0041 U+0059 U+0048 (U+0049|U+0045) > U+FDF7 ;; 'ALAYHI' (also unicode 'ALAYHE')
-U+0057 U+0041 U+0053 U+0041 U+004C U+004C U+0041 U+004D > U+FDF8 ;; 'WASALLAM'
-U+0053 U+0041 U+004C U+004C U+0041 > U+FDF9 ;; 'SALLA'
-U+004A U+0041 U+004C U+004C U+0041 > U+FDFB ;; 'JALLA' : "jalla jalAluhu"
-U+0042 U+0041 U+0053 U+004D U+0041 U+004C U+0041 > U+FDFD ;; 'BASMALA' : very few fonts have this ligature afaik
-
-U+005E U+0053 U+004C U+0059 > U+06D6 ;; ^SLY
-U+005E U+0051 U+004C U+0059 > U+06D7 ;; ^QLY
-U+005E U+004D U+0049 U+004D > U+06D8 ;; ^MIM-
-U+005E U+004C U+0041 > U+06D9 ;; ^LA
-U+005E U+004A U+0049 U+004D > U+06DA ;; ^JIM
-U+005E U+0044 U+004F U+0054 U+0053 > U+06DB ;; ^DOTS
-U+005E U+0053 U+0049 U+004E > U+06DC ;; ^SIN
-U+0048 U+0049 U+005A U+0042 > U+06DE ;; HIZB
-U+0043 U+0049 U+0052 U+0043 U+005A U+0045 U+0052 U+004F > U+06DF ;; CIRCZERO
-U+0052 U+0045 U+0043 U+0054 U+005A U+0045 U+0052 U+004F > U+06E0 ;; RECTZERO
-U+005E U+004A U+0041 U+005A U+004D > U+06E1 ;; ^JAZM
-U+005E U+004D U+0049 U+004D > U+06E2 ;; ^MIM
-U+005F U+0053 U+0049 U+004E > U+06E3 ;; _SIN
-U+005E U+004D U+0041 U+0044 U+0044 U+0041 > U+06E4 ;; ^MADDA
-U+0057 U+0041 U+0057 > U+06E5 ;; WAW
-U+0059 U+0045 U+0048 > U+06E6 ;; YEH
-U+005E U+0059 U+0045 U+0048 > U+06E7 ;; ^YEH
-U+005E U+004E U+0055 U+004E > U+06E8 ;; ^NUN
-U+0053 U+0041 U+004A U+0044 U+0041 > U+06E9 ;; SAJDA
-U+005F U+0053 U+0054 U+004F U+0050 > U+06EA ;; _STOP
-U+005E U+0053 U+0054 U+004F U+0050 > U+06EB ;; ^STOP
-U+005E U+0052 U+0053 U+0054 U+004F U+0050 > U+06EC ;; ^RSTOP
-U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
-
-U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
-
-
-; vowels
-u u > U
-i i > I
-a a > A
-CO O > U+06FC ;
-a e > a y
-a o > a w
-CO U > U+06C7 ;
-e > i ;; but not pashto > U+0659 and kashmiri > y + U+0658 (U+06CE is kurdish)
-o > u
-I / _ # > i y
-
-
-;; Persian ezafe (ALL BUT ARABIC AND UIGHUR)
-U+0048 Z UL? (Q? (i|e))=vv / _ END > U+06C0 @vv U+200C ;H-i -> heh+hamza final; what about 06C2 in Urdu ?<<<
-U+0048 Z Q?=qq (I|E)=vv / _ END > h U+0020 U+0627 @qq i @vv ; H-I
-Q?=q1 (I|E) Z UL? Q?=q2 (i|e) / _ END > @q1 i U+0626 @q2 i U+200C ; ...I-e
-Z Q?=qq I / (A|U) _ ENDZ > U+0626 @qq i y ; ...A-I or ...U-I
-Z UL? (Q? (i|e))=vv / (A|U) _ END > U+0649 @vv ; ...A-i or ...U-i
-Z Q?=q1 (e|i) / _ ENDZ > @q1 i ; ...-i
-Z / U+0048 _ > U+0020 ;
-b Q?=q1 (e|i) Q?=q2 U / # _ > b @q1 i U+0627 @q2 u w ;; special case of prep be without hyphen
-
-;; initial characters ...
-a l Z / BEG _ > U+0627 l Z
-;; wasla on initial alif : NEW! NOT TESTED!
-H / BEG _ l l > U+0671 ; e.g. alla_dI -> 'lla_dI
-[VWL]=v1 / BEG _ > U+0627 @v1
-Q?=q1 U / BEG _ > U+0627 @q1 u w ; -U
-; Q?=q1 I / BEG _ > U+0627 @q1 i y ; -I
-Q?=q1 I / BEG _ > U+0627 @q1 i y
-
-
-;; Words with anomalous orthography:
-
-; mi'aT -> ماية
-;;; i H / m Q ? _ Q ? a ? (T|t) > i A Hy
-m Q i H Q a / _ (T|t) > m U+0627 Hy
-m Q i H a / _ (T|t) > m U+0627 Hy a
-m i H Q a / _ (T|t) > m i U+0627 Hy
-m i H a / _ (T|t) > m i U+0627 Hy a
-
-
-;; contextual analysis of hamzas
-;; THESE DO NOT APPLY FOR SINDHI
-
-; initial hamzas
-H / (#|^[LTR]) _ Q? [Iyi] > Hi
-H Q A / (#|^[LTR]) _ > HA ; alif madda
-H / (#|^[LTR]) _ Q? [Uwu] > Ha
-H / (#|^[LTR]) _ Q? a > Ha
-Q H / (#|^[LTR]) _ > HB ; quoted isolated hamza at beginning of word
-
-; quoted hamzas in contextual mode, equivalent to verbatim mode
-a Q H > Ha
-i Q H > Hi
-y Q H > Hy
-w Q H > Hw
-h Q H > Hh
-A Q H > HA
-B Q H > HB
-BAR Q H > HBAR
-
-; hamza + fathatan
-H / a _ Q? AN > Ha
-;;H / [Iyi] _ Q? AN > Hy
-H / _ Q? AN > Hy
-
-;final hamzas
-H / A _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Uw] _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Iy] _ Q? (i N?|u N?)? (#|^[LTR]) > HBAR ; not AN ...
-H / a _ Q? (#|^[LTR]) > Ha ; not AN...
-H / a _ Q? (u|i) N? (#|^[LTR]) > Ha ; not AN...
-H / i _ Q? [VWL]? N? (#|^[LTR]) > Hy
-H / u _ Q? [VWL]? N? (#|^[LTR]) > Hw
-
-;;and more hamzas ...
-
-; n°1: kasra/ya
-H / [LTR] _ Q? [Iyi] ^N > Hy
-H / [Iyi] _ > Hy
-
-; n°2: damma/waw
-H / [LTR] _ Q? (U|u) ^N > Hw
-H / (U|u) _ Q? ^[Iyi] > Hw
-H / U _ > HBAR
-
-; n°3: fatha/alif
-H Q? A > HA
-H / A _ Q? a > HBAR
-H / ^[UI] _ Q? a > Ha
-H / a _ Q? ^[UI] > Ha
-
-
-pass(Unicode)
-
-Class [Digits] = (U+0030..U+0039)
-Class [ArDigits] = (U+0660..U+0669)
-Class [ArEasternDigits] = (U+06F0..U+06F9)
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;(a..z A E I O U B N T Y ^ . _ " "" `)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-
-
-
-
-;normal code
-
-
-(P z|U+1E93) (P z|U+1E93) > U+0638 U+0651 ;;SHADDA
-(P z|U+1E93) > U+0638
-C z C z > U+0698 U+0651 ;;SHADDA
-C z > U+0698
-V z V z > U+0636 U+0651 ;;SHADDA
-V z > U+0636
-z z > U+0632 U+0651 ;;SHADDA
-z > U+0632
-Q Y Y > U+0649 U+0651 ;;SHADDA
-Q Y > U+0649
-Y Y > U+064E U+0649 U+0651 ;;SHADDA
-Y > U+064E U+0649
-;; y / _ # > U+0649 ; y final in persian,ottoman,urdu,pashto,kashmiri has no dots
-y y > U+06CC U+0651 ;;SHADDA
-y > U+06CC ; yeh in persian etc. > iso and final shapes have no dots
-v v > U+06A4 U+0651 ;;SHADDA
-v > U+06A4
-W > U+0648 U+0627 ; waw + alif
-C U > U+064F U+0648 U+0653; historical spelling : madda on waw
-C w C w > U+06C9 U+0651 ;;SHADDA
-C w > U+06C9
-CO w CO w > U+06CA U+0651 ;,SHADDA
-CO w > U+06CA
-U A / _ # > U+064F U+0648 U+0627
-Q U [Uw] > U+0648 U+0651 ;;SHADDA
-Q U > U+0648
-U [Uw] > U+064F U+0648 U+0651 ;;SHADDA
-U > U+064F U+0648
-w w > U+0648 U+0651 ;;SHADDA
-w > U+0648
-Q u N? >
-u N > U+064C
-u > U+064F
-V t V t > U+0679 U+0651 ;;SHADDA
-V t > U+0679 ;urdu
-UL (t|s) UL (t|s) > U+062B U+0651 ;;SHADDA
-UL (t|s) > U+062B
-(P t|U+1E6D) (P t|U+1E6D) > U+0637 U+0651 ;;SHADDA
-(P t|U+1E6D) > U+0637
-t t > U+062A U+0651 ;;SHADDA
-t > U+062A
-T T Q AN > U+0629 U+0651 ;;SHADDA
-T Q AN > U+0629
-T AN > U+0629 U+064B
-T T > U+0629 U+0651 ;;SHADDA
-T > U+0629
-C s C s > U+0634 U+0651 ;;SHADDA
-C s > U+0634
-(P s|U+1E63) (P s|U+1E63) > U+0635 U+0651 ;;SHADDA
-(P s|U+1E63) > U+0635
-V s V s > U+0634 U+0651 ;;SHADDA
-V s > U+0634
-CO s CO s > U+069B U+0651 ;;SHADDA
-CO s > U+069B ; sin with 3 dots below
-s s > U+0633 U+0651 ;;SHADDA
-s > U+0633
-C r C r > U+06EF U+0651 ;;SHADDA ; missing in ArabTeX <<<
-C r > U+06EF
-CO r CO r > U+0697 U+0651 ;;SHADDA ; missing in ArabTeX <<<
-CO r > U+0697 ; Dargwa language, Dagestan
-P r P r > U+0694 U+0651 ;;SHADDA
-P r > U+0694 ; r with dot below; in Kurdish .r -> 0694
-V r V r > U+0691 U+0651 ;;SHADDA
-V r > U+0691 ;Urdu
-r r > U+0631 U+0651 ;;SHADDA
-r > U+0631
-P q P q > U+066F U+0651 ;;SHADDA
-P q > U+066F
-q q > U+0642 U+0651 ;;SHADDA
-q > U+0642
-p p > U+067E U+0651 ;;SHADDA
-p > U+067E
-CO n CO n > U+06B1 U+0651 ;;SHADDA
-CO n > U+06B1
-C n C n > U+06AD U+0651 ;;SHADDA
-C n > U+06AD
-P n P n > U+06BA U+0651 ;;SHADDA
-P n > U+06BA ; urdu
-V n V n > U+06BC U+0651 ;;SHADDA
-V n > U+06BC ; Pashto
-n n > U+0646 U+0651 ;;SHADDA
-n > U+0646
-m m > U+0645 U+0651 ;;SHADDA
-m > U+0645
-P l P l > U+06B6 U+0651 ;
-P l > U+06B6 ; ADDED <<<
-C l C l > U+06B5 U+0651 ;;SHADDA
-C l > U+06B5 ;kurdish
-l l > U+0644 U+0651 ;;SHADDA
-l > U+0644
-P k P k > U+0642 U+0651 ;;SHADDA
-P k > U+0642 ; Ottoman qaf
-UL k UL k > U+063A U+0651 ;;SHADDA
-UL k > U+063A
-k k > U+0643 U+0651 ;;SHADDA
-k > U+0643
-C g C g > U+06A0 U+0651 ;;SHADDA
-C g > U+06A0
-CO j CO j > U+0684 U+0651 ;;SHADDA
-CO j > U+0684
-j j > U+0698 U+0651 ;;SHADDA
-j > U+0698
-Q I > U+064A
-I > U+0650 U+064A
-C I > U+0650 U+064A U+0653 ; historical spelling : madda on ya
-UL I > ; suggestion of O. Smrz (arabtex-plus project) URL = ###
-Q i N? > ;
-i N > U+064D
-i > U+0650
-x x > U+062E U+0651 ;;SHADDA
-x > U+062E
-UL h UL h > U+062E U+0651 ;;SHADDA
-UL h > U+062E
-(P h|U+1E25) (P h|U+1E25) > U+062D U+0651 ;;SHADDA
-(P h|U+1E25) > U+062D
-V h V h > U+06C1 U+0651 ;;SHADDA
-V h > U+06C1
-h h > U+0647 U+0651 ;;SHADDA
-h > U+0647
-CO g CO g > U+06B3 U+0651 ;;SHADDA
-CO g > U+06B3
-V g V g > U+06AC U+0651 ;;SHADDA
-V g > U+06AC ; kaf with dot above
-P g P g > U+063A U+0651 ;;SHADDA
-P g > U+063A
-g g > U+06AF U+0651 ;;SHADDA
-g > U+06AF
-G G > U+06AB U+0651 ;;SHADDA
-G > U+06AB ;pashto
-P f P f > U+06A1 U+0651 ;;SHADDA
-P f > U+06A1
-f f > U+0641 U+0651 ;;SHADDA
-f > U+0641
-V d V d > U+068A U+0651 ;;SHADDA
-V d > U+068A
-P V d P V d > U+068B U+0651 ;;SHADDA
-P V d > U+068B ;; (like U+0688 with dot below, for Lahnda = Western Punjabi)
-C d C d > U+06EE U+0651 ;;SHADDA
-C d > U+06EE ; not defined in ArabTeX
-CO d CO d > U+068F U+0651 ;;SHADDA
-CO d > U+068F
-UL (d|z) UL (d|z) > U+0630 U+0651 ;;SHADDA
-UL (d|z) > U+0630
-(P d|U+1E0D) (P d|U+1E0D) > U+0636 U+0651 ;;SHADDA
-(P d|U+1E0D) > U+0636
-d d > U+062F U+0651 ;;SHADDA
-d > U+062F
-V c V c > U+0686 U+0651 ;;SHADDA
-V c > U+0686 ; Ottoman ç
-C c C c > U+0686 U+0651 ;;SHADDA
-C c > U+0686
-P C c P C c > U+06BF U+0651 ;;SHADDA
-P C c > U+06BF ;; cheh with dot above <<<
-c c > U+062C U+0651 ;;SHADDA
-c > U+062C
-CO c CO c > U+0682 U+0651 ;;SHADDA
-CO c > U+0682 ; old pashto
-CO b CO b > U+067B U+0651 ;;SHADDA
-CO b > U+067B
-P b P b > U+066E U+0651 ;;SHADDA
-P b > U+066E
-b b > U+0628 U+0651 ;;SHADDA
-b > U+0628
-H A > U+0622
-C A > U+064E U+0622 ; historical spelling
-UL A > U+064E U+0649
-UL a > U+0670
-UL u > U+064F;
-UL i > U+0650;
-Q AN / (A H|Ha) _ > ;
-AN / (A H|Ha) _ > U+064B
-Q AN > U+0627
-AN > U+0627 U+064B
-Q a >
-a > U+064E
-Q A > U+0627
-A > U+064E U+0627
-Ain Ain > U+0639 U+0651 ;;SHADDA
-Ain > U+0639
-H H > U+0621 U+0651 ;;SHADDA
-H > U+0621
-U+002C / [Digits] _ [Digits] > U+002C ; comma in numerical context not an Arabic comma
-Z Z / [Digits] _ [Digits] > U+2013 ; two hyphens in numerical context -> endash
-(Z|U+005D|U+005B|U+0028|U+0029)=xx / [Digits] _ [Digits] > U+202D @xx U+202C ; hyphen or brackets in numerical context: surrounded by LRO & PDF marks
-[Digits] > [ArDigits]
-Z Z Z / # _ # > U+2014
-Z Z / # _ # > U+2013
-Z Z > U+0640
-B > U+0640
-Z / # _ > U+200D ; -x > force initial form with "zero-width joiner"
-Z / _ # > U+200D ; x- > force final form
-U+003C U+003C > U+00BB ;<<
-U+003E U+003E > U+00AB ;>>
-U+00AB > U+00BB
-U+00BB > U+00AB
-UL > U+0640 ;_
-U+003F > U+061F ;?
-U+003B > U+061B ;;
-U+003A U+003A > U+061E ;; '::' ligature 'DOTS' also defined above...
-U+002C > U+060C ;,
-U+005D / [LTR] _ [LTR] > U+200D U+005D U+200D ; keep shaping when inserting ...[...]... ...
-U+005B / [LTR] _ [LTR] > U+200D U+005B U+200D ; (but of course this screws up contextual
- ; analysis, so quoting of hamzas etc may be necessary
-;U+005D > U+005B ;] these are automatically mirrored, following Unicode rules
-;U+005B > U+005D ;[
-Q [VWL] > ;stripoff quoted vowels
-Q > U+0652
-U+00B0 > U+0652 ; °
-N > ;
-C > ;^
-BAR > ;|
-
-pass(Unicode)
-
-Class [CONS] = (U+0621 U+0623 U+0624 U+0626 U+0628 U+062A..U+063A U+0641..U+0647 U+066E U+066F U+0672 U+0675 U+0676 U+0678..U+06BF U+06EE U+06EF U+06FA..U+06FF U+0750..U+076D) ; to be improved: not sure that all glyphs listed (esp for Urdu,Sindhi,etc are really "consonants" in the sense that they can carry a sukun, not to mention that some of these languages may not have a sukun at all ;-)
-Class [VWLX] = (U+0627 U+0648..U+065E U+0670) ; long vowels, vowel signs, shadda, sukun etc.
-Class [VWL] = (U+0627 U+0648..U+0650 U+0670);
-Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-turk-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-turk-voc.tec
deleted file mode 100644
index 9ee96c4ac3f..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-turk-voc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-uighur.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-uighur.tec
deleted file mode 100644
index 91d0abeba9e..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-uighur.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-urdu-fullvoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-urdu-fullvoc.map
deleted file mode 100644
index 1a43e25170d..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-urdu-fullvoc.map
+++ /dev/null
@@ -1,499 +0,0 @@
-LHSName "ArabTeX-urdu-fullvocalized"
-RHSName "UNICODE"
-
-Define a U+0061 ;a
-Define b U+0062 ;b
-Define c U+0063 ;c
-Define d U+0064 ;d
-Define e U+0065 ;e
-Define f U+0066 ;f
-Define g U+0067 ;g
-Define h U+0068 ;h
-Define i U+0069 ;i
-Define j U+006A ;j
-Define k U+006B ;k
-Define l U+006C ;l
-Define m U+006D ;m
-Define n U+006E ;n
-Define o U+006F ;o
-Define p U+0070 ;p
-Define q U+0071 ;q
-Define r U+0072 ;r
-Define s U+0073 ;s
-Define t U+0074 ;t
-Define u U+0075 ;u
-Define v U+0076 ;v
-Define w U+0077 ;w
-Define x U+0078 ;x
-Define y U+0079 ;y
-Define z U+007A ;z
-Define A U+0041 ;A
-Define B U+0042 ;B
-Define E U+0045 ;E
-Define G U+0047 ;G
-Define I U+0049 ;I
-Define N U+004E ;N
-Define O U+004F ;O
-Define T U+0054 ;T
-Define U U+0055 ;U
-Define W U+0057 ;W
-Define Y U+0059 ;Y
-Define C U+005E ;^ << CARET
-Define UL U+005F ;_ << UNDERLINE
-Define P U+002E ;. << DOT
-Define V U+002C ;, << COMMA (_V_irgule)
-Define CO U+003A ;: << COLON
-Define SC U+003B ;; << SEMICOLON
-Define Ain U+0060 ;`
-Define H U+0027 ;' << HAMZA
-Define Q U+0022 ;" << QUOTE
-Define Z U+002D ;- << HYPHEN
-Define BAR U+007C ;|
-Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
-;Define NUL U+00A6;
-Define Ha U+0623
-Define Hi U+0625
-Define Hy U+0626
-Define Hw U+0624
-Define Hh U+06C0 ;; = U+0647 U+0654
-Define HA U+0622
-Define HB U+0640 U+0654
-Define HBAR U+0621 ; '|
-
-pass(Unicode)
-
-U+E000 > ; eliminate special code for capitalization in transliterations
-
-pass(Unicode)
-
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [AVWL] = (U+064B..U+0650);
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0047 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;a..z A E I O U B N T Y ^ . _ " "" `
-Class [BRACKETS] = (U+003C U+003E U+00AB U+00BB U+0028 U+0029 U+005B U+005D U+2018 U+2019 U+201C U+201D); < > () « » [ ] ‘ ’ “ ”
-Class [PUNCT] = (V SC P CO)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-Class [Uwu] = (U+0055 U+0077 U+0075) ;(U w u)
-;Class [ae] = (U+0061 U+0065) ;(a e)
-;Class [ou] = (U+0075 U+006F) ;(u o)
-Class [Iyi] = (U+0069 U+0079 U+0049)
-Class [UI] = (U+0049 U+0055) ; U I
-Class [Digits] = (U+0030..U+0039)
-
-Define BEG (#|Z|[BRACKETS])
-Define END (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #)
-Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
-
-; special ligatures
-;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
-;; The BAR is used in the DMG transliteration to suppress the initial A
-(a|A) BAR? l Z LLAH > U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+0644 U+0644 U+0647 ;; 'll_ah' -> 'l l h'
-;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
-U+0041 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'ALLAH'
-U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
-
-U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
-U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
-U+0029 U+0029 > U+FD3E ;; '))' : ornate left par
-U+0052 U+0049 U+0059 U+0041 U+004C > U+FDFC ;; 'RIYAL' : Saudi currency sign
-;; most fonts won't have the following ones:
-U+0053 U+0041 U+004C U+004C U+0041 U+0053 U+0054 U+004F U+0050 > U+FDF0 ;; 'SALLASTOP' (.sallY with "ye-barree", Quranic stop sign)
-U+0051 U+0041 U+004C U+0041 > U+FDF1 ;; 'QALA' : qalY with ye-barree, Quranic stop sign
-U+0041 U+004B U+0042 U+0041 U+0052 > U+FDF3 ;; 'AKBAR'
-U+004D U+0055 U+0048 U+0041 U+004D U+004D U+0041 U+0044 > U+FDF4 ;; 'MUHAMMAD'
-U+0053 U+0041 U+004C U+0041 U+004D > U+FDF5 ;; 'SALAM'
-U+0052 U+0041 U+0053 U+004F ? U+0055 U+004C > U+FDF6 ;; 'RASUL' (also unicode 'RASOUL')
-U+0041 U+004C U+0041 U+0059 U+0048 (U+0049|U+0045) > U+FDF7 ;; 'ALAYHI' (also unicode 'ALAYHE')
-U+0057 U+0041 U+0053 U+0041 U+004C U+004C U+0041 U+004D > U+FDF8 ;; 'WASALLAM'
-U+0053 U+0041 U+004C U+004C U+0041 > U+FDF9 ;; 'SALLA'
-U+004A U+0041 U+004C U+004C U+0041 > U+FDFB ;; 'JALLA' : "jalla jalAluhu"
-U+0042 U+0041 U+0053 U+004D U+0041 U+004C U+0041 > U+FDFD ;; 'BASMALA' : very few fonts have this ligature afaik
-
-U+005E U+0053 U+004C U+0059 > U+06D6 ;; ^SLY
-U+005E U+0051 U+004C U+0059 > U+06D7 ;; ^QLY
-U+005E U+004D U+0049 U+004D > U+06D8 ;; ^MIM-
-U+005E U+004C U+0041 > U+06D9 ;; ^LA
-U+005E U+004A U+0049 U+004D > U+06DA ;; ^JIM
-U+005E U+0044 U+004F U+0054 U+0053 > U+06DB ;; ^DOTS
-U+005E U+0053 U+0049 U+004E > U+06DC ;; ^SIN
-U+0048 U+0049 U+005A U+0042 > U+06DE ;; HIZB
-U+0043 U+0049 U+0052 U+0043 U+005A U+0045 U+0052 U+004F > U+06DF ;; CIRCZERO
-U+0052 U+0045 U+0043 U+0054 U+005A U+0045 U+0052 U+004F > U+06E0 ;; RECTZERO
-U+005E U+004A U+0041 U+005A U+004D > U+06E1 ;; ^JAZM
-U+005E U+004D U+0049 U+004D > U+06E2 ;; ^MIM
-U+005F U+0053 U+0049 U+004E > U+06E3 ;; _SIN
-U+005E U+004D U+0041 U+0044 U+0044 U+0041 > U+06E4 ;; ^MADDA
-U+0057 U+0041 U+0057 > U+06E5 ;; WAW
-U+0059 U+0045 U+0048 > U+06E6 ;; YEH
-U+005E U+0059 U+0045 U+0048 > U+06E7 ;; ^YEH
-U+005E U+004E U+0055 U+004E > U+06E8 ;; ^NUN
-U+0053 U+0041 U+004A U+0044 U+0041 > U+06E9 ;; SAJDA
-U+005F U+0053 U+0054 U+004F U+0050 > U+06EA ;; _STOP
-U+005E U+0053 U+0054 U+004F U+0050 > U+06EB ;; ^STOP
-U+005E U+0052 U+0053 U+0054 U+004F U+0050 > U+06EC ;; ^RSTOP
-U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
-
-U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
-
-
-; vowels
-u u > U
-i i > I
-a a > A
-CO O > U+06FC ;
-H E > U+06D3 ;; hamza + yeh barree
-E / _ # > U+06D2
-E > y
-a e / _ # > a U+06D2
-a e > a y
-a o > a w
-(o|u)? O / # _ > U+0627 w
-(o|u)? O > w
-CO U > U+06C7 ;
-e > i ;; but not pashto > U+0659 and kashmiri > y + U+0658 (U+06CE is kurdish)
-o > u
-I / _ # > i y
-
-
-;; Persian ezafe (ALL BUT ARABIC AND UIGHUR)
-U+0048 Z UL? (Q? (i|e))=vv / _ END > U+06C0 @vv U+200C ;H-i -> heh+hamza final; what about 06C2 in Urdu ?<<<
-U+0048 Z Q?=qq (I|E)=vv / _ END > h U+0020 U+0627 @qq i @vv ; H-I
-Q?=q1 (I|E) Z UL? Q?=q2 (i|e) / _ END > @q1 i U+0626 @q2 i U+200C ; ...I-e
-Z Q?=qq I / (A|U) _ ENDZ > U+0626 @qq i y ; ...A-I or ...U-I
-Z UL? (Q? (i|e))=vv / (A|U) _ END > U+0649 @vv ; ...A-i or ...U-i
-Z Q?=q1 (e|i) / _ ENDZ > @q1 i ; ...-i
-Z / U+0048 _ > U+0020 ;
-b Q?=q1 (e|i) Q?=q2 U / # _ > b @q1 i U+0627 @q2 u w ;; special case of prep be without hyphen
-
-;; initial characters ...
-a l Z / BEG _ > U+0627 l Z
-;; wasla on initial alif : NEW! NOT TESTED!
-H / BEG _ l l > U+0671 ; e.g. alla_dI -> 'lla_dI
-[VWL]=v1 / BEG _ > U+0627 @v1
-A / BEG _ > HA ;; ADD MORE ? <<<
-Q?=q1 U / BEG _ > U+0627 @q1 u w ; -U
-; Q?=q1 I / BEG _ > U+0627 @q1 i y ; -I
-Q?=q1 I / BEG _ > U+0627 @q1 i y
-
-
-;; Words with anomalous orthography:
-
-; mi'aT -> ماية
-;;; i H / m Q ? _ Q ? a ? (T|t) > i A Hy
-m Q i H Q a / _ (T|t) > m U+0627 Hy
-m Q i H a / _ (T|t) > m U+0627 Hy a
-m i H Q a / _ (T|t) > m i U+0627 Hy
-m i H a / _ (T|t) > m i U+0627 Hy a
-
-
-;; contextual analysis of hamzas
-;; THESE DO NOT APPLY FOR SINDHI
-
-; initial hamzas
-H / (#|^[LTR]) _ Q? [Iyi] > Hi
-H Q A / (#|^[LTR]) _ > HA ; alif madda
-H / (#|^[LTR]) _ Q? [Uwu] > Ha
-H / (#|^[LTR]) _ Q? a > Ha
-Q H / (#|^[LTR]) _ > HB ; quoted isolated hamza at beginning of word
-
-; quoted hamzas in contextual mode, equivalent to verbatim mode
-a Q H > Ha
-i Q H > Hi
-y Q H > Hy
-w Q H > Hw
-h Q H > Hh
-A Q H > HA
-B Q H > HB
-BAR Q H > HBAR
-
-; hamza + fathatan
-H / a _ Q? AN > Ha
-;;H / [Iyi] _ Q? AN > Hy
-H / _ Q? AN > Hy
-
-;final hamzas
-H / A _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Uw] _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Iy] _ Q? (i N?|u N?)? (#|^[LTR]) > HBAR ; not AN ...
-H / a _ Q? (#|^[LTR]) > Ha ; not AN...
-H / a _ Q? (u|i) N? (#|^[LTR]) > Ha ; not AN...
-H / i _ Q? [VWL]? N? (#|^[LTR]) > Hy
-H / u _ Q? [VWL]? N? (#|^[LTR]) > Hw
-
-;;and more hamzas ...
-
-; n°1: kasra/ya
-H / [LTR] _ Q? [Iyi] ^N > Hy
-H / [Iyi] _ > Hy
-
-; n°2: damma/waw
-H / [LTR] _ Q? (U|u) ^N > Hw
-H / (U|u) _ Q? ^[Iyi] > Hw
-H / U _ > HBAR
-
-; n°3: fatha/alif
-H Q? A > HA
-H / A _ Q? a > HBAR
-H / ^[UI] _ Q? a > Ha
-H / a _ Q? ^[UI] > Ha
-
-
-pass(Unicode)
-
-Class [Digits] = (U+0030..U+0039)
-Class [ArDigits] = (U+0660..U+0669)
-Class [ArEasternDigits] = (U+06F0..U+06F9)
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;(a..z A E I O U B N T Y ^ . _ " "" `)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-
-
-
-
-;normal code
-
-
-(P z|U+1E93) (P z|U+1E93) > U+0638 U+0651 ;;SHADDA
-(P z|U+1E93) > U+0638
-C z C z > U+0698 U+0651 ;;SHADDA
-C z > U+0698
-V z V z > U+0696 U+0651 ;;SHADDA
-V z > U+0696 ;pashto
-z z > U+0632 U+0651 ;;SHADDA
-z > U+0632
-Q Y Y > U+0649 U+0651 ;;SHADDA
-Q Y > U+0649
-Y Y > U+064E U+0649 U+0651 ;;SHADDA
-Y > U+064E U+0649
-;; y / _ # > U+0649 ; y final in persian,ottoman,urdu,pashto,kashmiri has no dots
-y y > U+06CC U+0651 ;;SHADDA
-y > U+06CC ; yeh in persian etc. > iso and final shapes have no dots
-v v > U+06A4 U+0651 ;;SHADDA
-v > U+06A4
-W > U+0648 U+0627 ; waw + alif
-C U > U+064F U+0648 U+0653; historical spelling : madda on waw
-C w C w > U+06C9 U+0651 ;;SHADDA
-C w > U+06C9
-CO w CO w > U+06CA U+0651 ;,SHADDA
-CO w > U+06CA
-U A / _ # > U+064F U+0648 U+0627
-Q U [Uw] > U+0648 U+0651 ;;SHADDA
-Q U > U+0648
-U [Uw] > U+064F U+0648 U+0651 ;;SHADDA
-U > U+064F U+0648
-w w > U+0648 U+0651 ;;SHADDA
-w > U+0648
-Q u N? >
-u N > U+064C
-u > U+064F
-V t V t > U+0679 U+0651 ;;SHADDA
-V t > U+0679 ;urdu
-UL (t|s) UL (t|s) > U+062B U+0651 ;;SHADDA
-UL (t|s) > U+062B
-(P t|U+1E6D) (P t|U+1E6D) > U+0637 U+0651 ;;SHADDA
-(P t|U+1E6D) > U+0637
-t t > U+062A U+0651 ;;SHADDA
-t > U+062A
-T T Q AN > U+0629 U+0651 ;;SHADDA
-T Q AN > U+0629
-T AN > U+0629 U+064B
-T T > U+0629 U+0651 ;;SHADDA
-T > U+0629
-C s C s > U+0634 U+0651 ;;SHADDA
-C s > U+0634
-(P s|U+1E63) (P s|U+1E63) > U+0635 U+0651 ;;SHADDA
-(P s|U+1E63) > U+0635
-V s V s > U+069A U+0651 ;;SHADDA
-V s > U+069A ;Pashto
-CO s CO s > U+069B U+0651 ;;SHADDA
-CO s > U+069B ; sin with 3 dots below
-s s > U+0633 U+0651 ;;SHADDA
-s > U+0633
-C r C r > U+06EF U+0651 ;;SHADDA ; missing in ArabTeX <<<
-C r > U+06EF
-CO r CO r > U+0697 U+0651 ;;SHADDA ; missing in ArabTeX <<<
-CO r > U+0697 ; Dargwa language, Dagestan
-P r P r > U+0694 U+0651 ;;SHADDA
-P r > U+0694 ; r with dot below; in Kurdish .r -> 0694
-V r V r > U+0691 U+0651 ;;SHADDA
-V r > U+0691 ;Urdu
-r r > U+0631 U+0651 ;;SHADDA
-r > U+0631
-P q P q > U+066F U+0651 ;;SHADDA
-P q > U+066F
-q q > U+0642 U+0651 ;;SHADDA
-q > U+0642
-p p > U+067E U+0651 ;;SHADDA
-p > U+067E
-CO n CO n > U+06B1 U+0651 ;;SHADDA
-CO n > U+06B1
-C n C n > U+06AD U+0651 ;;SHADDA
-C n > U+06AD
-P n P n > U+06BA U+0651 ;;SHADDA
-P n > U+06BA ; urdu
-V n V n > U+06BC U+0651 ;;SHADDA
-V n > U+06BC ; Pashto
-n n > U+0646 U+0651 ;;SHADDA
-n > U+0646
-m m > U+0645 U+0651 ;;SHADDA
-m > U+0645
-P l P l > U+06B6 U+0651 ;
-P l > U+06B6 ; ADDED <<<
-C l C l > U+06B5 U+0651 ;;SHADDA
-C l > U+06B5 ;kurdish
-l l > U+0644 U+0651 ;;SHADDA
-l > U+0644
-P k P k > U+06A9 U+0651 ;;SHADDA
-P k > U+06A9 ; pashto urdu
-UL k UL k > U+063A U+0651 ;;SHADDA
-UL k > U+063A
-k k > U+0643 U+0651 ;;SHADDA
-k > U+0643
-C g C g > U+062C U+0651 ;;SHADDA
-C g > U+062C
-CO j CO j > U+0684 U+0651 ;;SHADDA
-CO j > U+0684
-j j > U+062C U+0651 ;;SHADDA
-j > U+062C
-Q I > U+064A
-I > U+0650 U+064A
-C I > U+0650 U+064A U+0653 ; historical spelling : madda on ya
-UL I > ; suggestion of O. Smrz (arabtex-plus project) URL = ###
-Q i N? > ;
-i N > U+064D
-i > U+0650
-x x > U+062E U+0651 ;;SHADDA
-x > U+062E
-U+0048 > U+06C3
-UL h UL h > U+062E U+0651 ;;SHADDA
-UL h > U+062E
-(P h|U+1E25) (P h|U+1E25) > U+062D U+0651 ;;SHADDA
-(P h|U+1E25) > U+062D
-V h V h > U+06C1 U+0651 ;;SHADDA
-V h > U+06C1
-H H > U+06C1 U+0651 ;;SHADDA
-H > U+06C1
-h h > U+06BE U+0651 ;;SHADDA
-h > U+06BE ; urdu
-;; fix letter+h letter+h > letter+h shadda in URDU <<<
-CO g CO g > U+06B3 U+0651 ;;SHADDA
-CO g > U+06B3
-V g V g > U+06AC U+0651 ;;SHADDA
-V g > U+06AC ; kaf with dot above
-P g P g > U+063A U+0651 ;;SHADDA
-P g > U+063A
-g g > U+06AF U+0651 ;;SHADDA
-g > U+06AF
-G G > U+06AB U+0651 ;;SHADDA
-G > U+06AB ;pashto
-P f P f > U+06A1 U+0651 ;;SHADDA
-P f > U+06A1
-f f > U+0641 U+0651 ;;SHADDA
-f > U+0641
-V d V d > U+0688 U+0651 ;;SHADDA
-V d > U+0688 ;urdu
-P V d P V d > U+068B U+0651 ;;SHADDA
-P V d > U+068B ;; (like U+0688 with dot below, for Lahnda = Western Punjabi)
-C d C d > U+06EE U+0651 ;;SHADDA
-C d > U+06EE ; not defined in ArabTeX
-CO d CO d > U+068F U+0651 ;;SHADDA
-CO d > U+068F
-CO CO d CO CO d > U+0690 U+0651 ;;SHADDA
-CO CO d > U+0690 ; old urdu: not in ArabTeX
-UL (d|z) UL (d|z) > U+0630 U+0651 ;;SHADDA
-UL (d|z) > U+0630
-(P d|U+1E0D) (P d|U+1E0D) > U+0636 U+0651 ;;SHADDA
-(P d|U+1E0D) > U+0636
-d d > U+062F U+0651 ;;SHADDA
-d > U+062F
-V c V c > U+0685 U+0651 ;;SHADDA
-V c > U+0685 ;pashto
-C c C c > U+0686 U+0651 ;;SHADDA
-C c > U+0686
-P C c P C c > U+06BF U+0651 ;;SHADDA
-P C c > U+06BF ;; cheh with dot above <<<
-c c > U+0681 U+0651 ;;SHADDA
-c > U+0681 ; ح with hamza above
-CO c CO c > U+0682 U+0651 ;;SHADDA
-CO c > U+0682 ; old pashto
-CO b CO b > U+067B U+0651 ;;SHADDA
-CO b > U+067B
-P b P b > U+066E U+0651 ;;SHADDA
-P b > U+066E
-b b > U+0628 U+0651 ;;SHADDA
-b > U+0628
-H A > U+0622
-C A > U+064E U+0622 ; historical spelling
-UL A > U+064E U+0649
-UL a > U+0670
-UL u > U+064F;
-UL i > U+0650;
-Q AN / (A H|Ha) _ > ;
-AN / (A H|Ha) _ > U+064B
-Q AN > U+0627
-AN > U+0627 U+064B
-Q a >
-a > U+064E
-Q A > U+0627
-A > U+064E U+0627
-Ain Ain > U+0639 U+0651 ;;SHADDA
-Ain > U+0639
-H H > U+0621 U+0651 ;;SHADDA
-H > U+0621
-U+002C / [Digits] _ [Digits] > U+002C ; comma in numerical context not an Arabic comma
-Z Z / [Digits] _ [Digits] > U+2013 ; two hyphens in numerical context -> endash
-(Z|U+005D|U+005B|U+0028|U+0029)=xx / [Digits] _ [Digits] > U+202D @xx U+202C ; hyphen or brackets in numerical context: surrounded by LRO & PDF marks
-[Digits] > [ArEasternDigits]
-Z Z Z / # _ # > U+2014
-Z Z / # _ # > U+2013
-Z Z > U+0640
-B > U+0640
-Z / # _ > U+200D ; -x > force initial form with "zero-width joiner"
-Z / _ # > U+200D ; x- > force final form
-U+003C U+003C > U+00BB ;<<
-U+003E U+003E > U+00AB ;>>
-U+00AB > U+00BB
-U+00BB > U+00AB
-UL > U+0640 ;_
-U+003F > U+061F ;?
-U+003B > U+061B ;;
-U+003A U+003A > U+061E ;; '::' ligature 'DOTS' also defined above...
-U+002C > U+060C ;,
-U+005D / [LTR] _ [LTR] > U+200D U+005D U+200D ; keep shaping when inserting ...[...]... ...
-U+005B / [LTR] _ [LTR] > U+200D U+005B U+200D ; (but of course this screws up contextual
- ; analysis, so quoting of hamzas etc may be necessary
-;U+005D > U+005B ;] these are automatically mirrored, following Unicode rules
-;U+005B > U+005D ;[
-Q [VWL] > ;stripoff quoted vowels
-U+00B0 > U+0652 ; °
-N > ;
-C > ;^
-BAR > ;|
-P P > U+06D4 ; urdu full stop << check
-
-pass(Unicode)
-
-Class [CONS] = (U+0621 U+0623 U+0624 U+0626 U+0628 U+062A..U+063A U+0641..U+0647 U+066E U+066F U+0672 U+0675 U+0676 U+0678..U+06BF U+06EE U+06EF U+06FA..U+06FF U+0750..U+076D) ; to be improved: not sure that all glyphs listed (esp for Urdu,Sindhi,etc are really "consonants" in the sense that they can carry a sukun, not to mention that some of these languages may not have a sukun at all ;-)
-Class [VWLX] = (U+0627 U+0648..U+065E U+0670) ; long vowels, vowel signs, shadda, sukun etc.
-Class [VWL] = (U+0627 U+0648..U+0650 U+0670);
-[CONS]=k1 / _ Z? [CONS] ^U+0651 > @k1 U+0652 ; hack: 2nd consonant has no shadda
-U+064E (U+064A|U+0648)=hc / _ (^[VWLX]|#) > U+064E @hc U+0652 ; ay and aw diphtongs
-U+0627 / # _ U+0644 > U+0627 U+064E ; otherwise initial alif takes fatha
-[CONS]=k1 / _ ([CONS]|#) > @k1 U+0652 ; consonant + (consonant or final)
-;; [CONS]=k1 / _ # > @k1 U+0652 ; final consonant
-Q > ;
-Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-urdu-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-urdu-fullvoc.tec
deleted file mode 100644
index 4de34ae02d8..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-urdu-fullvoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-urdu-novoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-urdu-novoc.map
deleted file mode 100644
index 5104ee1e2e8..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-urdu-novoc.map
+++ /dev/null
@@ -1,484 +0,0 @@
-LHSName "ArabTeX-urdu-novowels"
-RHSName "UNICODE"
-
-Define a U+0061 ;a
-Define b U+0062 ;b
-Define c U+0063 ;c
-Define d U+0064 ;d
-Define e U+0065 ;e
-Define f U+0066 ;f
-Define g U+0067 ;g
-Define h U+0068 ;h
-Define i U+0069 ;i
-Define j U+006A ;j
-Define k U+006B ;k
-Define l U+006C ;l
-Define m U+006D ;m
-Define n U+006E ;n
-Define o U+006F ;o
-Define p U+0070 ;p
-Define q U+0071 ;q
-Define r U+0072 ;r
-Define s U+0073 ;s
-Define t U+0074 ;t
-Define u U+0075 ;u
-Define v U+0076 ;v
-Define w U+0077 ;w
-Define x U+0078 ;x
-Define y U+0079 ;y
-Define z U+007A ;z
-Define A U+0041 ;A
-Define B U+0042 ;B
-Define E U+0045 ;E
-Define G U+0047 ;G
-Define I U+0049 ;I
-Define N U+004E ;N
-Define O U+004F ;O
-Define T U+0054 ;T
-Define U U+0055 ;U
-Define W U+0057 ;W
-Define Y U+0059 ;Y
-Define C U+005E ;^ << CARET
-Define UL U+005F ;_ << UNDERLINE
-Define P U+002E ;. << DOT
-Define V U+002C ;, << COMMA (_V_irgule)
-Define CO U+003A ;: << COLON
-Define SC U+003B ;; << SEMICOLON
-Define Ain U+0060 ;`
-Define H U+0027 ;' << HAMZA
-Define Q U+0022 ;" << QUOTE
-Define Z U+002D ;- << HYPHEN
-Define BAR U+007C ;|
-Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
-;Define NUL U+00A6;
-Define Ha U+0623
-Define Hi U+0625
-Define Hy U+0626
-Define Hw U+0624
-Define Hh U+06C0 ;; = U+0647 U+0654
-Define HA U+0622
-Define HB U+0640 U+0654
-Define HBAR U+0621 ; '|
-
-pass(Unicode)
-
-U+E000 > ; eliminate special code for capitalization in transliterations
-
-pass(Unicode)
-
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [AVWL] = (U+064B..U+0650);
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0047 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;a..z A E I O U B N T Y ^ . _ " "" `
-Class [BRACKETS] = (U+003C U+003E U+00AB U+00BB U+0028 U+0029 U+005B U+005D U+2018 U+2019 U+201C U+201D); < > () « » [ ] ‘ ’ “ ”
-Class [PUNCT] = (V SC P CO)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-Class [Uwu] = (U+0055 U+0077 U+0075) ;(U w u)
-;Class [ae] = (U+0061 U+0065) ;(a e)
-;Class [ou] = (U+0075 U+006F) ;(u o)
-Class [Iyi] = (U+0069 U+0079 U+0049)
-Class [UI] = (U+0049 U+0055) ; U I
-Class [Digits] = (U+0030..U+0039)
-
-Define BEG (#|Z|[BRACKETS])
-Define END (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #)
-Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
-
-; special ligatures
-;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
-;; The BAR is used in the DMG transliteration to suppress the initial A
-(a|A) BAR? l Z LLAH > U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+0644 U+0644 U+0647 ;; 'll_ah' -> 'l l h'
-;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
-U+0041 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'ALLAH'
-U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
-
-U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
-U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
-U+0029 U+0029 > U+FD3E ;; '))' : ornate left par
-U+0052 U+0049 U+0059 U+0041 U+004C > U+FDFC ;; 'RIYAL' : Saudi currency sign
-;; most fonts won't have the following ones:
-U+0053 U+0041 U+004C U+004C U+0041 U+0053 U+0054 U+004F U+0050 > U+FDF0 ;; 'SALLASTOP' (.sallY with "ye-barree", Quranic stop sign)
-U+0051 U+0041 U+004C U+0041 > U+FDF1 ;; 'QALA' : qalY with ye-barree, Quranic stop sign
-U+0041 U+004B U+0042 U+0041 U+0052 > U+FDF3 ;; 'AKBAR'
-U+004D U+0055 U+0048 U+0041 U+004D U+004D U+0041 U+0044 > U+FDF4 ;; 'MUHAMMAD'
-U+0053 U+0041 U+004C U+0041 U+004D > U+FDF5 ;; 'SALAM'
-U+0052 U+0041 U+0053 U+004F ? U+0055 U+004C > U+FDF6 ;; 'RASUL' (also unicode 'RASOUL')
-U+0041 U+004C U+0041 U+0059 U+0048 (U+0049|U+0045) > U+FDF7 ;; 'ALAYHI' (also unicode 'ALAYHE')
-U+0057 U+0041 U+0053 U+0041 U+004C U+004C U+0041 U+004D > U+FDF8 ;; 'WASALLAM'
-U+0053 U+0041 U+004C U+004C U+0041 > U+FDF9 ;; 'SALLA'
-U+004A U+0041 U+004C U+004C U+0041 > U+FDFB ;; 'JALLA' : "jalla jalAluhu"
-U+0042 U+0041 U+0053 U+004D U+0041 U+004C U+0041 > U+FDFD ;; 'BASMALA' : very few fonts have this ligature afaik
-
-U+005E U+0053 U+004C U+0059 > U+06D6 ;; ^SLY
-U+005E U+0051 U+004C U+0059 > U+06D7 ;; ^QLY
-U+005E U+004D U+0049 U+004D > U+06D8 ;; ^MIM-
-U+005E U+004C U+0041 > U+06D9 ;; ^LA
-U+005E U+004A U+0049 U+004D > U+06DA ;; ^JIM
-U+005E U+0044 U+004F U+0054 U+0053 > U+06DB ;; ^DOTS
-U+005E U+0053 U+0049 U+004E > U+06DC ;; ^SIN
-U+0048 U+0049 U+005A U+0042 > U+06DE ;; HIZB
-U+0043 U+0049 U+0052 U+0043 U+005A U+0045 U+0052 U+004F > U+06DF ;; CIRCZERO
-U+0052 U+0045 U+0043 U+0054 U+005A U+0045 U+0052 U+004F > U+06E0 ;; RECTZERO
-U+005E U+004A U+0041 U+005A U+004D > U+06E1 ;; ^JAZM
-U+005E U+004D U+0049 U+004D > U+06E2 ;; ^MIM
-U+005F U+0053 U+0049 U+004E > U+06E3 ;; _SIN
-U+005E U+004D U+0041 U+0044 U+0044 U+0041 > U+06E4 ;; ^MADDA
-U+0057 U+0041 U+0057 > U+06E5 ;; WAW
-U+0059 U+0045 U+0048 > U+06E6 ;; YEH
-U+005E U+0059 U+0045 U+0048 > U+06E7 ;; ^YEH
-U+005E U+004E U+0055 U+004E > U+06E8 ;; ^NUN
-U+0053 U+0041 U+004A U+0044 U+0041 > U+06E9 ;; SAJDA
-U+005F U+0053 U+0054 U+004F U+0050 > U+06EA ;; _STOP
-U+005E U+0053 U+0054 U+004F U+0050 > U+06EB ;; ^STOP
-U+005E U+0052 U+0053 U+0054 U+004F U+0050 > U+06EC ;; ^RSTOP
-U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
-
-U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
-
-
-; vowels
-u u > U
-i i > I
-a a > A
-[AVWL] > ; strip off vowels when writing UTF-8 Arabic with novoc mode
-CO O > U+06FC ;
-H E > U+06D3 ;; hamza + yeh barree
-E / _ # > U+06D2
-E > y
-a e / _ # > a U+06D2
-a e > a y
-a o > a w
-(o|u)? O / # _ > U+0627 w
-(o|u)? O > w
-CO U > U+06C7 ;
-e > i ;; but not pashto > U+0659 and kashmiri > y + U+0658 (U+06CE is kurdish)
-o > u
-I / _ # > i y
-
-
-;; Persian ezafe (ALL BUT ARABIC AND UIGHUR)
-U+0048 Z UL? (Q? (i|e))=vv / _ END > U+06C0 @vv U+200C ;H-i -> heh+hamza final; what about 06C2 in Urdu ?<<<
-U+0048 Z Q?=qq (I|E)=vv / _ END > h U+0020 U+0627 @qq i @vv ; H-I
-Q?=q1 (I|E) Z UL? Q?=q2 (i|e) / _ END > @q1 i U+0626 @q2 i U+200C ; ...I-e
-Z Q?=qq I / (A|U) _ ENDZ > U+0626 @qq i y ; ...A-I or ...U-I
-Z UL? (Q? (i|e))=vv / (A|U) _ END > U+0649 @vv ; ...A-i or ...U-i
-Z Q?=q1 (e|i) / _ ENDZ > @q1 i ; ...-i
-Z / U+0048 _ > U+0020 ;
-b Q?=q1 (e|i) Q?=q2 U / # _ > b @q1 i U+0627 @q2 u w ;; special case of prep be without hyphen
-
-;; initial characters ...
-a l Z / BEG _ > U+0627 l Z
-;; wasla on initial alif : NEW! NOT TESTED!
-H / BEG _ l l > U+0627 ;
-[VWL]=v1 / BEG _ > A @v1
-A / BEG _ > HA ;; ADD MORE ? <<<
-Q?=q1 U / BEG _ > A @q1 u w ; -U
-; Q?=q1 I / BEG _ > A @q1 i y ; -I ; but not when I is final FIXME!!!
-Q?=q1 I / BEG _ > A @q1 i y ; except for Persian, coz of ezafe rules
-
-
-;; Words with anomalous orthography:
-
-; mi'aT -> ماية
-;;; i H / m Q ? _ Q ? a ? (T|t) > i A Hy
-m Q i H Q a / _ (T|t) > m Q i A Hy Q a
-m Q i H a / _ (T|t) > m Q i A Hy
-m i H Q a / _ (T|t) > m A Hy Q a
-m i H a / _ (T|t) > m A Hy
-
-
-;; contextual analysis of hamzas
-;; THESE DO NOT APPLY FOR SINDHI
-
-; initial hamzas
-H / (#|^[LTR]) _ Q? [Iyi] > Hi
-H Q A / (#|^[LTR]) _ > HA ; alif madda
-H / (#|^[LTR]) _ Q? [Uwu] > Ha
-H / (#|^[LTR]) _ Q? a > Ha
-Q H / (#|^[LTR]) _ > HB ; quoted isolated hamza at beginning of word
-
-; quoted hamzas in contextual mode, equivalent to verbatim mode
-a Q H > Ha
-i Q H > Hi
-y Q H > Hy
-w Q H > Hw
-h Q H > Hh
-A Q H > HA
-B Q H > HB
-BAR Q H > HBAR
-
-; hamza + fathatan
-H / a _ Q? AN > Ha
-;;H / [Iyi] _ Q? AN > Hy
-H / _ Q? AN > Hy
-
-;final hamzas
-H / A _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Uw] _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Iy] _ Q? (i N?|u N?)? (#|^[LTR]) > HBAR ; not AN ...
-H / a _ Q? (#|^[LTR]) > Ha ; not AN...
-H / a _ Q? (u|i) N? (#|^[LTR]) > Ha ; not AN...
-H / i _ Q? [VWL]? N? (#|^[LTR]) > Hy
-H / u _ Q? [VWL]? N? (#|^[LTR]) > Hw
-
-;;and more hamzas ...
-
-; n°1: kasra/ya
-H / [LTR] _ Q? [Iyi] ^N > Hy
-H / [Iyi] _ > Hy
-
-; n°2: damma/waw
-H / [LTR] _ Q? (U|u) ^N > Hw
-H / (U|u) _ Q? ^[Iyi] > Hw
-H / U _ > HBAR
-
-; n°3: fatha/alif
-H Q? A > HA
-H / A _ Q? a > HBAR
-H / ^[UI] _ Q? a > Ha
-H / a _ Q? ^[UI] > Ha
-
-
-pass(Unicode)
-
-Class [Digits] = (U+0030..U+0039)
-Class [ArDigits] = (U+0660..U+0669)
-Class [ArEasternDigits] = (U+06F0..U+06F9)
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;(a..z A E I O U B N T Y ^ . _ " "" `)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-
-
-
-
-;normal code
-
-
-(P z|U+1E93) (P z|U+1E93) > U+0638 U+0651 ;;SHADDA
-(P z|U+1E93) > U+0638
-C z C z > U+0698 U+0651 ;;SHADDA
-C z > U+0698
-V z V z > U+0696 U+0651 ;;SHADDA
-V z > U+0696 ;pashto
-z z > U+0632 U+0651 ;;SHADDA
-z > U+0632
-Y Y > U+0649 U+0651 ;;SHADDA
-Y > U+0649
-;; y / _ # > U+0649 ; y final in persian,ottoman,urdu,pashto,kashmiri has no dots
-y y > U+06CC U+0651 ;;SHADDA
-y > U+06CC ; yeh in persian etc. > iso and final shapes have no dots
-v v > U+06A4 U+0651 ;;SHADDA
-v > U+06A4
-W > U+0648 U+0627 ; waw + alif
-C U > U+064F U+0648 U+0653; historical spelling : madda on waw
-Q U [Uw] > U+064F U+0648 U+0651 ;;SHADDA
-Q U > U+064F U+0648
-[Uw] [Uw] > U+0648 U+0651 ;;SHADDA
-[Uw] > U+0648
-C w C w > U+06C9 U+0651 ;;SHADDA
-C w > U+06C9
-CO w CO w > U+06CA U+0651 ;,SHADDA
-CO w > U+06CA
-Q u N > U+064C
-u N >
-Q u > U+064F
-V t V t > U+0679 U+0651 ;;SHADDA
-V t > U+0679 ;urdu
-UL (t|s) UL (t|s) > U+062B U+0651 ;;SHADDA
-UL (t|s) > U+062B
-(P t|U+1E6D) (P t|U+1E6D) > U+0637 U+0651 ;;SHADDA
-(P t|U+1E6D) > U+0637
-t t > U+062A U+0651 ;;SHADDA
-t > U+062A
-T T Q AN > U+0629 U+0651 U+064B ;;SHADDA
-T Q AN > U+0629 U+064B
-T AN > U+0629
-T T > U+0629 U+0651 ;;SHADDA
-T > U+0629
-C s C s > U+0634 U+0651 ;;SHADDA
-C s > U+0634
-(P s|U+1E63) (P s|U+1E63) > U+0635 U+0651 ;;SHADDA
-(P s|U+1E63) > U+0635
-V s V s > U+069A U+0651 ;;SHADDA
-V s > U+069A ;Pashto
-CO s CO s > U+069B U+0651 ;;SHADDA
-CO s > U+069B ; sin with 3 dots below
-s s > U+0633 U+0651 ;;SHADDA
-s > U+0633
-C r C r > U+06EF U+0651 ;;SHADDA ; missing in ArabTeX <<<
-C r > U+06EF
-CO r CO r > U+0697 U+0651 ;;SHADDA ; missing in ArabTeX <<<
-CO r > U+0697 ; Dargwa language, Dagestan
-P r P r > U+0694 U+0651 ;;SHADDA
-P r > U+0694 ; r with dot below; in Kurdish .r -> 0694
-V r V r > U+0691 U+0651 ;;SHADDA
-V r > U+0691 ;Urdu
-r r > U+0631 U+0651 ;;SHADDA
-r > U+0631
-P q P q > U+066F U+0651 ;;SHADDA
-P q > U+066F
-q q > U+0642 U+0651 ;;SHADDA
-q > U+0642
-p p > U+067E U+0651 ;;SHADDA
-p > U+067E
-CO n CO n > U+06B1 U+0651 ;;SHADDA
-CO n > U+06B1
-C n C n > U+06AD U+0651 ;;SHADDA
-C n > U+06AD
-P n P n > U+06BA U+0651 ;;SHADDA
-P n > U+06BA ; urdu
-V n V n > U+06BC U+0651 ;;SHADDA
-V n > U+06BC ; Pashto
-n n > U+0646 U+0651 ;;SHADDA
-n > U+0646
-m m > U+0645 U+0651 ;;SHADDA
-m > U+0645
-P l P l > U+06B6 U+0651 ;
-P l > U+06B6 ; ADDED <<<
-C l C l > U+06B5 U+0651 ;;SHADDA
-C l > U+06B5 ;kurdish
-l l > U+0644 U+0651 ;;SHADDA
-l > U+0644
-P k P k > U+06A9 U+0651 ;;SHADDA
-P k > U+06A9 ; pashto urdu
-UL k UL k > U+063A U+0651 ;;SHADDA
-UL k > U+063A
-k k > U+0643 U+0651 ;;SHADDA
-k > U+0643
-C g C g > U+062C U+0651 ;;SHADDA
-C g > U+062C
-CO j CO j > U+0684 U+0651 ;;SHADDA
-CO j > U+0684
-j j > U+062C U+0651 ;;SHADDA
-j > U+062C
-Q I > U+0650 U+064A
-C I > U+0650 U+064A U+0653 ; historical spelling : madda on ya
-UL I > ; suggestion of O. Smrz (arabtex-plus project) URL = ###
-I > U+064A
-Q i N > U+064D
-i N > ;
-Q i > U+0650
-x x > U+062E U+0651 ;;SHADDA
-x > U+062E
-U+0048 > U+06C3
-UL h UL h > U+062E U+0651 ;;SHADDA
-UL h > U+062E
-(P h|U+1E25) (P h|U+1E25) > U+062D U+0651 ;;SHADDA
-(P h|U+1E25) > U+062D
-V h V h > U+06C1 U+0651 ;;SHADDA
-V h > U+06C1
-H H > U+06C1 U+0651 ;;SHADDA
-H > U+06C1
-h h > U+06BE U+0651 ;;SHADDA
-h > U+06BE ; urdu
-;; fix letter+h letter+h > letter+h shadda in URDU <<<
-CO g CO g > U+06B3 U+0651 ;;SHADDA
-CO g > U+06B3
-V g V g > U+06AC U+0651 ;;SHADDA
-V g > U+06AC ; kaf with dot above
-P g P g > U+063A U+0651 ;;SHADDA
-P g > U+063A
-g g > U+06AF U+0651 ;;SHADDA
-g > U+06AF
-G G > U+06AB U+0651 ;;SHADDA
-G > U+06AB ;pashto
-P f P f > U+06A1 U+0651 ;;SHADDA
-P f > U+06A1
-f f > U+0641 U+0651 ;;SHADDA
-f > U+0641
-V d V d > U+0688 U+0651 ;;SHADDA
-V d > U+0688 ;urdu
-P V d P V d > U+068B U+0651 ;;SHADDA
-P V d > U+068B ;; (like U+0688 with dot below, for Lahnda = Western Punjabi)
-C d C d > U+06EE U+0651 ;;SHADDA
-C d > U+06EE ; not defined in ArabTeX
-CO d CO d > U+068F U+0651 ;;SHADDA
-CO d > U+068F
-CO CO d CO CO d > U+0690 U+0651 ;;SHADDA
-CO CO d > U+0690 ; old urdu: not in ArabTeX
-UL (d|z) UL (d|z) > U+0630 U+0651 ;;SHADDA
-UL (d|z) > U+0630
-(P d|U+1E0D) (P d|U+1E0D) > U+0636 U+0651 ;;SHADDA
-(P d|U+1E0D) > U+0636
-d d > U+062F U+0651 ;;SHADDA
-d > U+062F
-V c V c > U+0685 U+0651 ;;SHADDA
-V c > U+0685 ;pashto
-C c C c > U+0686 U+0651 ;;SHADDA
-C c > U+0686
-P C c P C c > U+06BF U+0651 ;;SHADDA
-P C c > U+06BF ;; cheh with dot above <<<
-c c > U+0681 U+0651 ;;SHADDA
-c > U+0681 ; ح with hamza above
-CO c CO c > U+0682 U+0651 ;;SHADDA
-CO c > U+0682 ; old pashto
-CO b CO b > U+067B U+0651 ;;SHADDA
-CO b > U+067B
-P b P b > U+066E U+0651 ;;SHADDA
-P b > U+066E
-b b > U+0628 U+0651 ;;SHADDA
-b > U+0628
-H A > U+0622
-C A > U+064E U+0622 ; historical spelling
-UL A > U+0649
-UL a > U+0670
-UL u > ;
-UL i > ;
-Q AN / (A H|Ha) _ > U+064B
-AN / (A H|Ha) _ > ;
-Q AN > U+0627 U+064B
-AN > U+0627
-Q a > U+064E
-Q A > U+064E U+0627
-A > U+0627
-Ain Ain > U+0639 U+0651 ;;SHADDA
-Ain > U+0639
-H H > U+0621 U+0651 ;;SHADDA
-H > U+0621
-U+002C / [Digits] _ [Digits] > U+002C ; comma in numerical context not an Arabic comma
-Z Z / [Digits] _ [Digits] > U+2013 ; two hyphens in numerical context -> endash
-(Z|U+005D|U+005B|U+0028|U+0029)=xx / [Digits] _ [Digits] > U+202D @xx U+202C ; hyphen or brackets in numerical context: surrounded by LRO & PDF marks
-[Digits] > [ArEasternDigits]
-Z Z Z / # _ # > U+2014
-Z Z / # _ # > U+2013
-Z Z > U+0640
-B > U+0640
-Z / # _ > U+200D ; -x > force initial form with "zero-width joiner"
-Z / _ # > U+200D ; x- > force final form
-U+003C U+003C > U+00BB ;<<
-U+003E U+003E > U+00AB ;>>
-U+00AB > U+00BB
-U+00BB > U+00AB
-UL > U+0640 ;_
-U+003F > U+061F ;?
-U+003B > U+061B ;;
-U+003A U+003A > U+061E ;; '::' ligature 'DOTS' also defined above...
-U+002C > U+060C ;,
-U+005D / [LTR] _ [LTR] > U+200D U+005D U+200D ; keep shaping when inserting ...[...]... ...
-U+005B / [LTR] _ [LTR] > U+200D U+005B U+200D ; (but of course this screws up contextual
- ; analysis, so quoting of hamzas etc may be necessary
-;U+005D > U+005B ;] these are automatically mirrored, following Unicode rules
-;U+005B > U+005D ;[
-[VWL] > ;stripoff vowels
-Q > U+0652
-U+00B0 > U+0652 ; °
-N > ;
-C > ;^
-Z > ;-
-BAR > ;|
-P P > U+06D4 ; urdu full stop << check
-
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-urdu-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-urdu-novoc.tec
deleted file mode 100644
index 62a714e8c17..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-urdu-novoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-urdu-voc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-urdu-voc.map
deleted file mode 100644
index f91a76587f0..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-urdu-voc.map
+++ /dev/null
@@ -1,494 +0,0 @@
-LHSName "ArabTeX-urdu-vocalized"
-RHSName "UNICODE"
-
-Define a U+0061 ;a
-Define b U+0062 ;b
-Define c U+0063 ;c
-Define d U+0064 ;d
-Define e U+0065 ;e
-Define f U+0066 ;f
-Define g U+0067 ;g
-Define h U+0068 ;h
-Define i U+0069 ;i
-Define j U+006A ;j
-Define k U+006B ;k
-Define l U+006C ;l
-Define m U+006D ;m
-Define n U+006E ;n
-Define o U+006F ;o
-Define p U+0070 ;p
-Define q U+0071 ;q
-Define r U+0072 ;r
-Define s U+0073 ;s
-Define t U+0074 ;t
-Define u U+0075 ;u
-Define v U+0076 ;v
-Define w U+0077 ;w
-Define x U+0078 ;x
-Define y U+0079 ;y
-Define z U+007A ;z
-Define A U+0041 ;A
-Define B U+0042 ;B
-Define E U+0045 ;E
-Define G U+0047 ;G
-Define I U+0049 ;I
-Define N U+004E ;N
-Define O U+004F ;O
-Define T U+0054 ;T
-Define U U+0055 ;U
-Define W U+0057 ;W
-Define Y U+0059 ;Y
-Define C U+005E ;^ << CARET
-Define UL U+005F ;_ << UNDERLINE
-Define P U+002E ;. << DOT
-Define V U+002C ;, << COMMA (_V_irgule)
-Define CO U+003A ;: << COLON
-Define SC U+003B ;; << SEMICOLON
-Define Ain U+0060 ;`
-Define H U+0027 ;' << HAMZA
-Define Q U+0022 ;" << QUOTE
-Define Z U+002D ;- << HYPHEN
-Define BAR U+007C ;|
-Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
-;Define NUL U+00A6;
-Define Ha U+0623
-Define Hi U+0625
-Define Hy U+0626
-Define Hw U+0624
-Define Hh U+06C0 ;; = U+0647 U+0654
-Define HA U+0622
-Define HB U+0640 U+0654
-Define HBAR U+0621 ; '|
-
-pass(Unicode)
-
-U+E000 > ; eliminate special code for capitalization in transliterations
-
-pass(Unicode)
-
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [AVWL] = (U+064B..U+0650);
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0047 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;a..z A E I O U B N T Y ^ . _ " "" `
-Class [BRACKETS] = (U+003C U+003E U+00AB U+00BB U+0028 U+0029 U+005B U+005D U+2018 U+2019 U+201C U+201D); < > () « » [ ] ‘ ’ “ ”
-Class [PUNCT] = (V SC P CO)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-Class [Uwu] = (U+0055 U+0077 U+0075) ;(U w u)
-;Class [ae] = (U+0061 U+0065) ;(a e)
-;Class [ou] = (U+0075 U+006F) ;(u o)
-Class [Iyi] = (U+0069 U+0079 U+0049)
-Class [UI] = (U+0049 U+0055) ; U I
-Class [Digits] = (U+0030..U+0039)
-
-Define BEG (#|Z|[BRACKETS])
-Define END (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #)
-Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
-
-; special ligatures
-;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
-;; The BAR is used in the DMG transliteration to suppress the initial A
-(a|A) BAR? l Z LLAH > U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+0644 U+0644 U+0647 ;; 'll_ah' -> 'l l h'
-;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
-U+0041 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'ALLAH'
-U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
-
-U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
-U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
-U+0029 U+0029 > U+FD3E ;; '))' : ornate left par
-U+0052 U+0049 U+0059 U+0041 U+004C > U+FDFC ;; 'RIYAL' : Saudi currency sign
-;; most fonts won't have the following ones:
-U+0053 U+0041 U+004C U+004C U+0041 U+0053 U+0054 U+004F U+0050 > U+FDF0 ;; 'SALLASTOP' (.sallY with "ye-barree", Quranic stop sign)
-U+0051 U+0041 U+004C U+0041 > U+FDF1 ;; 'QALA' : qalY with ye-barree, Quranic stop sign
-U+0041 U+004B U+0042 U+0041 U+0052 > U+FDF3 ;; 'AKBAR'
-U+004D U+0055 U+0048 U+0041 U+004D U+004D U+0041 U+0044 > U+FDF4 ;; 'MUHAMMAD'
-U+0053 U+0041 U+004C U+0041 U+004D > U+FDF5 ;; 'SALAM'
-U+0052 U+0041 U+0053 U+004F ? U+0055 U+004C > U+FDF6 ;; 'RASUL' (also unicode 'RASOUL')
-U+0041 U+004C U+0041 U+0059 U+0048 (U+0049|U+0045) > U+FDF7 ;; 'ALAYHI' (also unicode 'ALAYHE')
-U+0057 U+0041 U+0053 U+0041 U+004C U+004C U+0041 U+004D > U+FDF8 ;; 'WASALLAM'
-U+0053 U+0041 U+004C U+004C U+0041 > U+FDF9 ;; 'SALLA'
-U+004A U+0041 U+004C U+004C U+0041 > U+FDFB ;; 'JALLA' : "jalla jalAluhu"
-U+0042 U+0041 U+0053 U+004D U+0041 U+004C U+0041 > U+FDFD ;; 'BASMALA' : very few fonts have this ligature afaik
-
-U+005E U+0053 U+004C U+0059 > U+06D6 ;; ^SLY
-U+005E U+0051 U+004C U+0059 > U+06D7 ;; ^QLY
-U+005E U+004D U+0049 U+004D > U+06D8 ;; ^MIM-
-U+005E U+004C U+0041 > U+06D9 ;; ^LA
-U+005E U+004A U+0049 U+004D > U+06DA ;; ^JIM
-U+005E U+0044 U+004F U+0054 U+0053 > U+06DB ;; ^DOTS
-U+005E U+0053 U+0049 U+004E > U+06DC ;; ^SIN
-U+0048 U+0049 U+005A U+0042 > U+06DE ;; HIZB
-U+0043 U+0049 U+0052 U+0043 U+005A U+0045 U+0052 U+004F > U+06DF ;; CIRCZERO
-U+0052 U+0045 U+0043 U+0054 U+005A U+0045 U+0052 U+004F > U+06E0 ;; RECTZERO
-U+005E U+004A U+0041 U+005A U+004D > U+06E1 ;; ^JAZM
-U+005E U+004D U+0049 U+004D > U+06E2 ;; ^MIM
-U+005F U+0053 U+0049 U+004E > U+06E3 ;; _SIN
-U+005E U+004D U+0041 U+0044 U+0044 U+0041 > U+06E4 ;; ^MADDA
-U+0057 U+0041 U+0057 > U+06E5 ;; WAW
-U+0059 U+0045 U+0048 > U+06E6 ;; YEH
-U+005E U+0059 U+0045 U+0048 > U+06E7 ;; ^YEH
-U+005E U+004E U+0055 U+004E > U+06E8 ;; ^NUN
-U+0053 U+0041 U+004A U+0044 U+0041 > U+06E9 ;; SAJDA
-U+005F U+0053 U+0054 U+004F U+0050 > U+06EA ;; _STOP
-U+005E U+0053 U+0054 U+004F U+0050 > U+06EB ;; ^STOP
-U+005E U+0052 U+0053 U+0054 U+004F U+0050 > U+06EC ;; ^RSTOP
-U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
-
-U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
-
-
-; vowels
-u u > U
-i i > I
-a a > A
-CO O > U+06FC ;
-H E > U+06D3 ;; hamza + yeh barree
-E / _ # > U+06D2
-E > y
-a e / _ # > a U+06D2
-a e > a y
-a o > a w
-(o|u)? O / # _ > U+0627 w
-(o|u)? O > w
-CO U > U+06C7 ;
-e > i ;; but not pashto > U+0659 and kashmiri > y + U+0658 (U+06CE is kurdish)
-o > u
-I / _ # > i y
-
-
-;; Persian ezafe (ALL BUT ARABIC AND UIGHUR)
-U+0048 Z UL? (Q? (i|e))=vv / _ END > U+06C0 @vv U+200C ;H-i -> heh+hamza final; what about 06C2 in Urdu ?<<<
-U+0048 Z Q?=qq (I|E)=vv / _ END > h U+0020 U+0627 @qq i @vv ; H-I
-Q?=q1 (I|E) Z UL? Q?=q2 (i|e) / _ END > @q1 i U+0626 @q2 i U+200C ; ...I-e
-Z Q?=qq I / (A|U) _ ENDZ > U+0626 @qq i y ; ...A-I or ...U-I
-Z UL? (Q? (i|e))=vv / (A|U) _ END > U+0649 @vv ; ...A-i or ...U-i
-Z Q?=q1 (e|i) / _ ENDZ > @q1 i ; ...-i
-Z / U+0048 _ > U+0020 ;
-b Q?=q1 (e|i) Q?=q2 U / # _ > b @q1 i U+0627 @q2 u w ;; special case of prep be without hyphen
-
-;; initial characters ...
-a l Z / BEG _ > U+0627 l Z
-;; wasla on initial alif : NEW! NOT TESTED!
-H / BEG _ l l > U+0671 ; e.g. alla_dI -> 'lla_dI
-[VWL]=v1 / BEG _ > U+0627 @v1
-A / BEG _ > HA ;; ADD MORE ? <<<
-Q?=q1 U / BEG _ > U+0627 @q1 u w ; -U
-; Q?=q1 I / BEG _ > U+0627 @q1 i y ; -I
-Q?=q1 I / BEG _ > U+0627 @q1 i y
-
-
-;; Words with anomalous orthography:
-
-; mi'aT -> ماية
-;;; i H / m Q ? _ Q ? a ? (T|t) > i A Hy
-m Q i H Q a / _ (T|t) > m U+0627 Hy
-m Q i H a / _ (T|t) > m U+0627 Hy a
-m i H Q a / _ (T|t) > m i U+0627 Hy
-m i H a / _ (T|t) > m i U+0627 Hy a
-
-
-;; contextual analysis of hamzas
-;; THESE DO NOT APPLY FOR SINDHI
-
-; initial hamzas
-H / (#|^[LTR]) _ Q? [Iyi] > Hi
-H Q A / (#|^[LTR]) _ > HA ; alif madda
-H / (#|^[LTR]) _ Q? [Uwu] > Ha
-H / (#|^[LTR]) _ Q? a > Ha
-Q H / (#|^[LTR]) _ > HB ; quoted isolated hamza at beginning of word
-
-; quoted hamzas in contextual mode, equivalent to verbatim mode
-a Q H > Ha
-i Q H > Hi
-y Q H > Hy
-w Q H > Hw
-h Q H > Hh
-A Q H > HA
-B Q H > HB
-BAR Q H > HBAR
-
-; hamza + fathatan
-H / a _ Q? AN > Ha
-;;H / [Iyi] _ Q? AN > Hy
-H / _ Q? AN > Hy
-
-;final hamzas
-H / A _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Uw] _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Iy] _ Q? (i N?|u N?)? (#|^[LTR]) > HBAR ; not AN ...
-H / a _ Q? (#|^[LTR]) > Ha ; not AN...
-H / a _ Q? (u|i) N? (#|^[LTR]) > Ha ; not AN...
-H / i _ Q? [VWL]? N? (#|^[LTR]) > Hy
-H / u _ Q? [VWL]? N? (#|^[LTR]) > Hw
-
-;;and more hamzas ...
-
-; n°1: kasra/ya
-H / [LTR] _ Q? [Iyi] ^N > Hy
-H / [Iyi] _ > Hy
-
-; n°2: damma/waw
-H / [LTR] _ Q? (U|u) ^N > Hw
-H / (U|u) _ Q? ^[Iyi] > Hw
-H / U _ > HBAR
-
-; n°3: fatha/alif
-H Q? A > HA
-H / A _ Q? a > HBAR
-H / ^[UI] _ Q? a > Ha
-H / a _ Q? ^[UI] > Ha
-
-
-pass(Unicode)
-
-Class [Digits] = (U+0030..U+0039)
-Class [ArDigits] = (U+0660..U+0669)
-Class [ArEasternDigits] = (U+06F0..U+06F9)
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;(a..z A E I O U B N T Y ^ . _ " "" `)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-
-
-
-
-;normal code
-
-
-(P z|U+1E93) (P z|U+1E93) > U+0638 U+0651 ;;SHADDA
-(P z|U+1E93) > U+0638
-C z C z > U+0698 U+0651 ;;SHADDA
-C z > U+0698
-V z V z > U+0696 U+0651 ;;SHADDA
-V z > U+0696 ;pashto
-z z > U+0632 U+0651 ;;SHADDA
-z > U+0632
-Q Y Y > U+0649 U+0651 ;;SHADDA
-Q Y > U+0649
-Y Y > U+064E U+0649 U+0651 ;;SHADDA
-Y > U+064E U+0649
-;; y / _ # > U+0649 ; y final in persian,ottoman,urdu,pashto,kashmiri has no dots
-y y > U+06CC U+0651 ;;SHADDA
-y > U+06CC ; yeh in persian etc. > iso and final shapes have no dots
-v v > U+06A4 U+0651 ;;SHADDA
-v > U+06A4
-W > U+0648 U+0627 ; waw + alif
-C U > U+064F U+0648 U+0653; historical spelling : madda on waw
-C w C w > U+06C9 U+0651 ;;SHADDA
-C w > U+06C9
-CO w CO w > U+06CA U+0651 ;,SHADDA
-CO w > U+06CA
-U A / _ # > U+064F U+0648 U+0627
-Q U [Uw] > U+0648 U+0651 ;;SHADDA
-Q U > U+0648
-U [Uw] > U+064F U+0648 U+0651 ;;SHADDA
-U > U+064F U+0648
-w w > U+0648 U+0651 ;;SHADDA
-w > U+0648
-Q u N? >
-u N > U+064C
-u > U+064F
-V t V t > U+0679 U+0651 ;;SHADDA
-V t > U+0679 ;urdu
-UL (t|s) UL (t|s) > U+062B U+0651 ;;SHADDA
-UL (t|s) > U+062B
-(P t|U+1E6D) (P t|U+1E6D) > U+0637 U+0651 ;;SHADDA
-(P t|U+1E6D) > U+0637
-t t > U+062A U+0651 ;;SHADDA
-t > U+062A
-T T Q AN > U+0629 U+0651 ;;SHADDA
-T Q AN > U+0629
-T AN > U+0629 U+064B
-T T > U+0629 U+0651 ;;SHADDA
-T > U+0629
-C s C s > U+0634 U+0651 ;;SHADDA
-C s > U+0634
-(P s|U+1E63) (P s|U+1E63) > U+0635 U+0651 ;;SHADDA
-(P s|U+1E63) > U+0635
-V s V s > U+069A U+0651 ;;SHADDA
-V s > U+069A ;Pashto
-CO s CO s > U+069B U+0651 ;;SHADDA
-CO s > U+069B ; sin with 3 dots below
-s s > U+0633 U+0651 ;;SHADDA
-s > U+0633
-C r C r > U+06EF U+0651 ;;SHADDA ; missing in ArabTeX <<<
-C r > U+06EF
-CO r CO r > U+0697 U+0651 ;;SHADDA ; missing in ArabTeX <<<
-CO r > U+0697 ; Dargwa language, Dagestan
-P r P r > U+0694 U+0651 ;;SHADDA
-P r > U+0694 ; r with dot below; in Kurdish .r -> 0694
-V r V r > U+0691 U+0651 ;;SHADDA
-V r > U+0691 ;Urdu
-r r > U+0631 U+0651 ;;SHADDA
-r > U+0631
-P q P q > U+066F U+0651 ;;SHADDA
-P q > U+066F
-q q > U+0642 U+0651 ;;SHADDA
-q > U+0642
-p p > U+067E U+0651 ;;SHADDA
-p > U+067E
-CO n CO n > U+06B1 U+0651 ;;SHADDA
-CO n > U+06B1
-C n C n > U+06AD U+0651 ;;SHADDA
-C n > U+06AD
-P n P n > U+06BA U+0651 ;;SHADDA
-P n > U+06BA ; urdu
-V n V n > U+06BC U+0651 ;;SHADDA
-V n > U+06BC ; Pashto
-n n > U+0646 U+0651 ;;SHADDA
-n > U+0646
-m m > U+0645 U+0651 ;;SHADDA
-m > U+0645
-P l P l > U+06B6 U+0651 ;
-P l > U+06B6 ; ADDED <<<
-C l C l > U+06B5 U+0651 ;;SHADDA
-C l > U+06B5 ;kurdish
-l l > U+0644 U+0651 ;;SHADDA
-l > U+0644
-P k P k > U+06A9 U+0651 ;;SHADDA
-P k > U+06A9 ; pashto urdu
-UL k UL k > U+063A U+0651 ;;SHADDA
-UL k > U+063A
-k k > U+0643 U+0651 ;;SHADDA
-k > U+0643
-C g C g > U+062C U+0651 ;;SHADDA
-C g > U+062C
-CO j CO j > U+0684 U+0651 ;;SHADDA
-CO j > U+0684
-j j > U+062C U+0651 ;;SHADDA
-j > U+062C
-Q I > U+064A
-I > U+0650 U+064A
-C I > U+0650 U+064A U+0653 ; historical spelling : madda on ya
-UL I > ; suggestion of O. Smrz (arabtex-plus project) URL = ###
-Q i N? > ;
-i N > U+064D
-i > U+0650
-x x > U+062E U+0651 ;;SHADDA
-x > U+062E
-U+0048 > U+06C3
-UL h UL h > U+062E U+0651 ;;SHADDA
-UL h > U+062E
-(P h|U+1E25) (P h|U+1E25) > U+062D U+0651 ;;SHADDA
-(P h|U+1E25) > U+062D
-V h V h > U+06C1 U+0651 ;;SHADDA
-V h > U+06C1
-H H > U+06C1 U+0651 ;;SHADDA
-H > U+06C1
-h h > U+06BE U+0651 ;;SHADDA
-h > U+06BE ; urdu
-;; fix letter+h letter+h > letter+h shadda in URDU <<<
-CO g CO g > U+06B3 U+0651 ;;SHADDA
-CO g > U+06B3
-V g V g > U+06AC U+0651 ;;SHADDA
-V g > U+06AC ; kaf with dot above
-P g P g > U+063A U+0651 ;;SHADDA
-P g > U+063A
-g g > U+06AF U+0651 ;;SHADDA
-g > U+06AF
-G G > U+06AB U+0651 ;;SHADDA
-G > U+06AB ;pashto
-P f P f > U+06A1 U+0651 ;;SHADDA
-P f > U+06A1
-f f > U+0641 U+0651 ;;SHADDA
-f > U+0641
-V d V d > U+0688 U+0651 ;;SHADDA
-V d > U+0688 ;urdu
-P V d P V d > U+068B U+0651 ;;SHADDA
-P V d > U+068B ;; (like U+0688 with dot below, for Lahnda = Western Punjabi)
-C d C d > U+06EE U+0651 ;;SHADDA
-C d > U+06EE ; not defined in ArabTeX
-CO d CO d > U+068F U+0651 ;;SHADDA
-CO d > U+068F
-CO CO d CO CO d > U+0690 U+0651 ;;SHADDA
-CO CO d > U+0690 ; old urdu: not in ArabTeX
-UL (d|z) UL (d|z) > U+0630 U+0651 ;;SHADDA
-UL (d|z) > U+0630
-(P d|U+1E0D) (P d|U+1E0D) > U+0636 U+0651 ;;SHADDA
-(P d|U+1E0D) > U+0636
-d d > U+062F U+0651 ;;SHADDA
-d > U+062F
-V c V c > U+0685 U+0651 ;;SHADDA
-V c > U+0685 ;pashto
-C c C c > U+0686 U+0651 ;;SHADDA
-C c > U+0686
-P C c P C c > U+06BF U+0651 ;;SHADDA
-P C c > U+06BF ;; cheh with dot above <<<
-c c > U+0681 U+0651 ;;SHADDA
-c > U+0681 ; ح with hamza above
-CO c CO c > U+0682 U+0651 ;;SHADDA
-CO c > U+0682 ; old pashto
-CO b CO b > U+067B U+0651 ;;SHADDA
-CO b > U+067B
-P b P b > U+066E U+0651 ;;SHADDA
-P b > U+066E
-b b > U+0628 U+0651 ;;SHADDA
-b > U+0628
-H A > U+0622
-C A > U+064E U+0622 ; historical spelling
-UL A > U+064E U+0649
-UL a > U+0670
-UL u > U+064F;
-UL i > U+0650;
-Q AN / (A H|Ha) _ > ;
-AN / (A H|Ha) _ > U+064B
-Q AN > U+0627
-AN > U+0627 U+064B
-Q a >
-a > U+064E
-Q A > U+0627
-A > U+064E U+0627
-Ain Ain > U+0639 U+0651 ;;SHADDA
-Ain > U+0639
-H H > U+0621 U+0651 ;;SHADDA
-H > U+0621
-U+002C / [Digits] _ [Digits] > U+002C ; comma in numerical context not an Arabic comma
-Z Z / [Digits] _ [Digits] > U+2013 ; two hyphens in numerical context -> endash
-(Z|U+005D|U+005B|U+0028|U+0029)=xx / [Digits] _ [Digits] > U+202D @xx U+202C ; hyphen or brackets in numerical context: surrounded by LRO & PDF marks
-[Digits] > [ArEasternDigits]
-Z Z Z / # _ # > U+2014
-Z Z / # _ # > U+2013
-Z Z > U+0640
-B > U+0640
-Z / # _ > U+200D ; -x > force initial form with "zero-width joiner"
-Z / _ # > U+200D ; x- > force final form
-U+003C U+003C > U+00BB ;<<
-U+003E U+003E > U+00AB ;>>
-U+00AB > U+00BB
-U+00BB > U+00AB
-UL > U+0640 ;_
-U+003F > U+061F ;?
-U+003B > U+061B ;;
-U+003A U+003A > U+061E ;; '::' ligature 'DOTS' also defined above...
-U+002C > U+060C ;,
-U+005D / [LTR] _ [LTR] > U+200D U+005D U+200D ; keep shaping when inserting ...[...]... ...
-U+005B / [LTR] _ [LTR] > U+200D U+005B U+200D ; (but of course this screws up contextual
- ; analysis, so quoting of hamzas etc may be necessary
-;U+005D > U+005B ;] these are automatically mirrored, following Unicode rules
-;U+005B > U+005D ;[
-Q [VWL] > ;stripoff quoted vowels
-Q > U+0652
-U+00B0 > U+0652 ; °
-N > ;
-C > ;^
-BAR > ;|
-P P > U+06D4 ; urdu full stop << check
-
-pass(Unicode)
-
-Class [CONS] = (U+0621 U+0623 U+0624 U+0626 U+0628 U+062A..U+063A U+0641..U+0647 U+066E U+066F U+0672 U+0675 U+0676 U+0678..U+06BF U+06EE U+06EF U+06FA..U+06FF U+0750..U+076D) ; to be improved: not sure that all glyphs listed (esp for Urdu,Sindhi,etc are really "consonants" in the sense that they can carry a sukun, not to mention that some of these languages may not have a sukun at all ;-)
-Class [VWLX] = (U+0627 U+0648..U+065E U+0670) ; long vowels, vowel signs, shadda, sukun etc.
-Class [VWL] = (U+0627 U+0648..U+0650 U+0670);
-Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-urdu-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-urdu-voc.tec
deleted file mode 100644
index 07e3b00cfe6..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-urdu-voc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-voc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-voc.map
deleted file mode 100644
index 17f2ea72f33..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-voc.map
+++ /dev/null
@@ -1,476 +0,0 @@
-LHSName "ArabTeX-vocalized"
-RHSName "UNICODE"
-
-Define a U+0061 ;a
-Define b U+0062 ;b
-Define c U+0063 ;c
-Define d U+0064 ;d
-Define e U+0065 ;e
-Define f U+0066 ;f
-Define g U+0067 ;g
-Define h U+0068 ;h
-Define i U+0069 ;i
-Define j U+006A ;j
-Define k U+006B ;k
-Define l U+006C ;l
-Define m U+006D ;m
-Define n U+006E ;n
-Define o U+006F ;o
-Define p U+0070 ;p
-Define q U+0071 ;q
-Define r U+0072 ;r
-Define s U+0073 ;s
-Define t U+0074 ;t
-Define u U+0075 ;u
-Define v U+0076 ;v
-Define w U+0077 ;w
-Define x U+0078 ;x
-Define y U+0079 ;y
-Define z U+007A ;z
-Define A U+0041 ;A
-Define B U+0042 ;B
-Define E U+0045 ;E
-Define G U+0047 ;G
-Define I U+0049 ;I
-Define N U+004E ;N
-Define O U+004F ;O
-Define T U+0054 ;T
-Define U U+0055 ;U
-Define W U+0057 ;W
-Define Y U+0059 ;Y
-Define C U+005E ;^ << CARET
-Define UL U+005F ;_ << UNDERLINE
-Define P U+002E ;. << DOT
-Define V U+002C ;, << COMMA (_V_irgule)
-Define CO U+003A ;: << COLON
-Define SC U+003B ;; << SEMICOLON
-Define Ain U+0060 ;`
-Define H U+0027 ;' << HAMZA
-Define Q U+0022 ;" << QUOTE
-Define Z U+002D ;- << HYPHEN
-Define BAR U+007C ;|
-Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
-;Define NUL U+00A6;
-Define Ha U+0623
-Define Hi U+0625
-Define Hy U+0626
-Define Hw U+0624
-Define Hh U+06C0 ;; = U+0647 U+0654
-Define HA U+0622
-Define HB U+0640 U+0654
-Define HBAR U+0621 ; '|
-
-pass(Unicode)
-
-U+E000 > ; eliminate special code for capitalization in transliterations
-
-pass(Unicode)
-
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [AVWL] = (U+064B..U+0650);
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0047 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;a..z A E I O U B N T Y ^ . _ " "" `
-Class [BRACKETS] = (U+003C U+003E U+00AB U+00BB U+0028 U+0029 U+005B U+005D U+2018 U+2019 U+201C U+201D); < > () « » [ ] ‘ ’ “ ”
-Class [PUNCT] = (V SC P CO)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-Class [Uwu] = (U+0055 U+0077 U+0075) ;(U w u)
-;Class [ae] = (U+0061 U+0065) ;(a e)
-;Class [ou] = (U+0075 U+006F) ;(u o)
-Class [Iyi] = (U+0069 U+0079 U+0049)
-Class [UI] = (U+0049 U+0055) ; U I
-Class [Digits] = (U+0030..U+0039)
-
-Define BEG (#|Z|[BRACKETS])
-Define END (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #)
-Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
-
-; special ligatures
-;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
-;; The BAR is used in the DMG transliteration to suppress the initial A
-(a|A) BAR? l Z LLAH > U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+0644 U+0644 U+0647 ;; 'll_ah' -> 'l l h'
-;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
-U+0041 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'ALLAH'
-U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
-
-U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
-U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
-U+0029 U+0029 > U+FD3E ;; '))' : ornate left par
-U+0052 U+0049 U+0059 U+0041 U+004C > U+FDFC ;; 'RIYAL' : Saudi currency sign
-;; most fonts won't have the following ones:
-U+0053 U+0041 U+004C U+004C U+0041 U+0053 U+0054 U+004F U+0050 > U+FDF0 ;; 'SALLASTOP' (.sallY with "ye-barree", Quranic stop sign)
-U+0051 U+0041 U+004C U+0041 > U+FDF1 ;; 'QALA' : qalY with ye-barree, Quranic stop sign
-U+0041 U+004B U+0042 U+0041 U+0052 > U+FDF3 ;; 'AKBAR'
-U+004D U+0055 U+0048 U+0041 U+004D U+004D U+0041 U+0044 > U+FDF4 ;; 'MUHAMMAD'
-U+0053 U+0041 U+004C U+0041 U+004D > U+FDF5 ;; 'SALAM'
-U+0052 U+0041 U+0053 U+004F ? U+0055 U+004C > U+FDF6 ;; 'RASUL' (also unicode 'RASOUL')
-U+0041 U+004C U+0041 U+0059 U+0048 (U+0049|U+0045) > U+FDF7 ;; 'ALAYHI' (also unicode 'ALAYHE')
-U+0057 U+0041 U+0053 U+0041 U+004C U+004C U+0041 U+004D > U+FDF8 ;; 'WASALLAM'
-U+0053 U+0041 U+004C U+004C U+0041 > U+FDF9 ;; 'SALLA'
-U+004A U+0041 U+004C U+004C U+0041 > U+FDFB ;; 'JALLA' : "jalla jalAluhu"
-U+0042 U+0041 U+0053 U+004D U+0041 U+004C U+0041 > U+FDFD ;; 'BASMALA' : very few fonts have this ligature afaik
-
-U+005E U+0053 U+004C U+0059 > U+06D6 ;; ^SLY
-U+005E U+0051 U+004C U+0059 > U+06D7 ;; ^QLY
-U+005E U+004D U+0049 U+004D > U+06D8 ;; ^MIM-
-U+005E U+004C U+0041 > U+06D9 ;; ^LA
-U+005E U+004A U+0049 U+004D > U+06DA ;; ^JIM
-U+005E U+0044 U+004F U+0054 U+0053 > U+06DB ;; ^DOTS
-U+005E U+0053 U+0049 U+004E > U+06DC ;; ^SIN
-U+0048 U+0049 U+005A U+0042 > U+06DE ;; HIZB
-U+0043 U+0049 U+0052 U+0043 U+005A U+0045 U+0052 U+004F > U+06DF ;; CIRCZERO
-U+0052 U+0045 U+0043 U+0054 U+005A U+0045 U+0052 U+004F > U+06E0 ;; RECTZERO
-U+005E U+004A U+0041 U+005A U+004D > U+06E1 ;; ^JAZM
-U+005E U+004D U+0049 U+004D > U+06E2 ;; ^MIM
-U+005F U+0053 U+0049 U+004E > U+06E3 ;; _SIN
-U+005E U+004D U+0041 U+0044 U+0044 U+0041 > U+06E4 ;; ^MADDA
-U+0057 U+0041 U+0057 > U+06E5 ;; WAW
-U+0059 U+0045 U+0048 > U+06E6 ;; YEH
-U+005E U+0059 U+0045 U+0048 > U+06E7 ;; ^YEH
-U+005E U+004E U+0055 U+004E > U+06E8 ;; ^NUN
-U+0053 U+0041 U+004A U+0044 U+0041 > U+06E9 ;; SAJDA
-U+005F U+0053 U+0054 U+004F U+0050 > U+06EA ;; _STOP
-U+005E U+0053 U+0054 U+004F U+0050 > U+06EB ;; ^STOP
-U+005E U+0052 U+0053 U+0054 U+004F U+0050 > U+06EC ;; ^RSTOP
-U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
-
-U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
-
-
-; vowels
-u u > U
-i i > I
-a a > A
-CO O > U+06FC ;
-a e > a y
-a o > a w
-CO U > U+06C7 ;
-e > i ;; but not pashto > U+0659 and kashmiri > y + U+0658 (U+06CE is kurdish)
-o > u
-E > I
-O > U
-
-
-
-;; initial characters ...
-a l Z / BEG _ > U+0627 l Z
-H l Z / BEG _ > U+0627 l Z
-;; wasla on initial alif : NEW! NOT TESTED!
-H / BEG _ l l > U+0671 ; e.g. alla_dI -> 'lla_dI
-[VWL]=v1 / BEG _ > U+0627 @v1
-A / BEG _ > U+0627 a
-Q?=q1 U / BEG _ > U+0627 @q1 u w ; -U
-; Q?=q1 I / BEG _ > U+0627 @q1 i y ; -I
-Q?=q1 I / BEG _ > U+0627 @q1 i y
-
-
-;; Words with anomalous orthography:
-
-; mi'aT -> ماية
-;;; i H / m Q ? _ Q ? a ? (T|t) > i A Hy
-m Q i H Q a / _ (T|t) > m U+0627 Hy
-m Q i H a / _ (T|t) > m U+0627 Hy a
-m i H Q a / _ (T|t) > m i U+0627 Hy
-m i H a / _ (T|t) > m i U+0627 Hy a
-
-
-;; contextual analysis of hamzas
-;; THESE DO NOT APPLY FOR SINDHI
-
-; initial hamzas
-H / (#|^[LTR]) _ Q? [Iyi] > Hi
-H Q A / (#|^[LTR]) _ > HA ; alif madda
-H / (#|^[LTR]) _ Q? [Uwu] > Ha
-H / (#|^[LTR]) _ Q? a > Ha
-Q H / (#|^[LTR]) _ > HB ; quoted isolated hamza at beginning of word
-
-; quoted hamzas in contextual mode, equivalent to verbatim mode
-a Q H > Ha
-i Q H > Hi
-y Q H > Hy
-w Q H > Hw
-h Q H > Hh
-A Q H > HA
-B Q H > HB
-BAR Q H > HBAR
-
-; hamza + fathatan
-H / a _ Q? AN > Ha
-;;H / [Iyi] _ Q? AN > Hy
-H / _ Q? AN > Hy
-
-;final hamzas
-H / A _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Uw] _ Q? [VWL]? N? (#|^[LTR]) > HBAR
-H / [Iy] _ Q? (i N?|u N?)? (#|^[LTR]) > HBAR ; not AN ...
-H / a _ Q? (#|^[LTR]) > Ha ; not AN...
-H / a _ Q? (u|i) N? (#|^[LTR]) > Ha ; not AN...
-H / i _ Q? [VWL]? N? (#|^[LTR]) > Hy
-H / u _ Q? [VWL]? N? (#|^[LTR]) > Hw
-
-;;and more hamzas ...
-
-; n°1: kasra/ya
-H / [LTR] _ Q? [Iyi] ^N > Hy
-H / [Iyi] _ > Hy
-
-; n°2: damma/waw
-H / [LTR] _ Q? (U|u) ^N > Hw
-H / (U|u) _ Q? ^[Iyi] > Hw
-H / U _ > HBAR
-
-; n°3: fatha/alif
-H Q? A > HA
-H / A _ Q? a > HBAR
-H / ^[UI] _ Q? a > Ha
-H / a _ Q? ^[UI] > Ha
-
-
-pass(Unicode)
-
-Class [Digits] = (U+0030..U+0039)
-Class [ArDigits] = (U+0660..U+0669)
-Class [ArEasternDigits] = (U+06F0..U+06F9)
-Class [VWL] = (U+0061 U+0065 U+0069 U+006F U+0075 ) ;(a e i o u)
-Class [LTR] = (U+0061..U+007A U+0041 U+0045 U+0049 U+004F U+0055 U+0042 U+004E U+0054 U+0059 U+005E U+002E U+005F U+0022 U+0027 U+0060) ;(a..z A E I O U B N T Y ^ . _ " "" `)
-Class [Iy] = (U+0049 U+0079) ;(I y)
-Class [Uw] = (U+0055 U+0077) ;(U w)
-
-
-
-
-;normal code
-
-
-(P z|U+1E93) (P z|U+1E93) > U+0638 U+0651 ;;SHADDA
-(P z|U+1E93) > U+0638
-C z C z > U+0698 U+0651 ;;SHADDA
-C z > U+0698
-V z V z > U+0696 U+0651 ;;SHADDA
-V z > U+0696 ;pashto
-z z > U+0632 U+0651 ;;SHADDA
-z > U+0632
-Q Y Y > U+0649 U+0651 ;;SHADDA
-Q Y > U+0649
-Y Y > U+064E U+0649 U+0651 ;;SHADDA
-Y > U+064E U+0649
-P I P I / _ # > U+0650 U+06CC U+0651 ;; SHADDA
-P I / _ # > U+0650 U+06CC ;; workaround to have ya without dots in Arabic
-y y > U+064A U+0651 ;;SHADDA
-y > U+064A
-v v > U+06A4 U+0651 ;;SHADDA
-v > U+06A4
-W > U+0648 U+0627 ; waw + alif
-C U > U+064F U+0648 U+0653; historical spelling : madda on waw
-C w C w > U+06C9 U+0651 ;;SHADDA
-C w > U+06C9
-CO w CO w > U+06CA U+0651 ;,SHADDA
-CO w > U+06CA
-U A / _ # > U+064F U+0648 U+0627
-Q U [Uw] > U+0648 U+0651 ;;SHADDA
-Q U > U+0648
-U [Uw] > U+064F U+0648 U+0651 ;;SHADDA
-U > U+064F U+0648
-w w > U+0648 U+0651 ;;SHADDA
-w > U+0648
-Q u N? >
-u N > U+064C
-u > U+064F
-V t V t > U+0679 U+0651 ;;SHADDA
-V t > U+0679 ;urdu
-UL (t|s) UL (t|s) > U+062B U+0651 ;;SHADDA
-UL (t|s) > U+062B
-(P t|U+1E6D) (P t|U+1E6D) > U+0637 U+0651 ;;SHADDA
-(P t|U+1E6D) > U+0637
-t t > U+062A U+0651 ;;SHADDA
-t > U+062A
-T T Q AN > U+0629 U+0651 ;;SHADDA
-T Q AN > U+0629
-T AN > U+0629 U+064B
-T T > U+0629 U+0651 ;;SHADDA
-T > U+0629
-C s C s > U+0634 U+0651 ;;SHADDA
-C s > U+0634
-(P s|U+1E63) (P s|U+1E63) > U+0635 U+0651 ;;SHADDA
-(P s|U+1E63) > U+0635
-V s V s > U+069A U+0651 ;;SHADDA
-V s > U+069A ;Pashto
-CO s CO s > U+069B U+0651 ;;SHADDA
-CO s > U+069B ; sin with 3 dots below
-s s > U+0633 U+0651 ;;SHADDA
-s > U+0633
-C r C r > U+06EF U+0651 ;;SHADDA ; missing in ArabTeX <<<
-C r > U+06EF
-CO r CO r > U+0697 U+0651 ;;SHADDA ; missing in ArabTeX <<<
-CO r > U+0697 ; Dargwa language, Dagestan
-P r P r > U+0694 U+0651 ;;SHADDA
-P r > U+0694 ; r with dot below; in Kurdish .r -> 0694
-V r V r > U+0691 U+0651 ;;SHADDA
-V r > U+0691 ;Urdu
-r r > U+0631 U+0651 ;;SHADDA
-r > U+0631
-P q P q > U+066F U+0651 ;;SHADDA
-P q > U+066F
-q q > U+0642 U+0651 ;;SHADDA
-q > U+0642
-p p > U+067E U+0651 ;;SHADDA
-p > U+067E
-CO n CO n > U+06B1 U+0651 ;;SHADDA
-CO n > U+06B1
-C n C n > U+06AD U+0651 ;;SHADDA
-C n > U+06AD
-P n P n > U+06BA U+0651 ;;SHADDA
-P n > U+06BA ; urdu
-V n V n > U+06BC U+0651 ;;SHADDA
-V n > U+06BC ; Pashto
-n n > U+0646 U+0651 ;;SHADDA
-n > U+0646
-m m > U+0645 U+0651 ;;SHADDA
-m > U+0645
-P l P l > U+06B6 U+0651 ;
-P l > U+06B6 ; ADDED <<<
-C l C l > U+06B5 U+0651 ;;SHADDA
-C l > U+06B5 ;kurdish
-l l > U+0644 U+0651 ;;SHADDA
-l > U+0644
-P k P k > U+06A9 U+0651 ;;SHADDA
-P k > U+06A9 ; pashto urdu
-UL k UL k > U+063A U+0651 ;;SHADDA
-UL k > U+063A
-k k > U+0643 U+0651 ;;SHADDA
-k > U+0643
-C g C g > U+062C U+0651 ;;SHADDA
-C g > U+062C
-CO j CO j > U+0684 U+0651 ;;SHADDA
-CO j > U+0684
-j j > U+062C U+0651 ;;SHADDA
-j > U+062C
-Q I > U+064A
-I > U+0650 U+064A
-C I > U+0650 U+064A U+0653 ; historical spelling : madda on ya
-UL I > ; suggestion of O. Smrz (arabtex-plus project) URL = ###
-Q i N? > ;
-i N > U+064D
-i > U+0650
-x x > U+062E U+0651 ;;SHADDA
-x > U+062E
-UL h UL h > U+062E U+0651 ;;SHADDA
-UL h > U+062E
-(P h|U+1E25) (P h|U+1E25) > U+062D U+0651 ;;SHADDA
-(P h|U+1E25) > U+062D
-V h V h > U+06C1 U+0651 ;;SHADDA
-V h > U+06C1
-h h > U+0647 U+0651 ;;SHADDA
-h > U+0647
-CO g CO g > U+06B3 U+0651 ;;SHADDA
-CO g > U+06B3
-V g V g > U+06AC U+0651 ;;SHADDA
-V g > U+06AC ; kaf with dot above
-P g P g > U+063A U+0651 ;;SHADDA
-P g > U+063A
-g g > U+06AF U+0651 ;;SHADDA
-g > U+06AF
-G G > U+06AB U+0651 ;;SHADDA
-G > U+06AB ;pashto
-P f P f > U+06A1 U+0651 ;;SHADDA
-P f > U+06A1
-f f > U+0641 U+0651 ;;SHADDA
-f > U+0641
-V d V d > U+068A U+0651 ;;SHADDA
-V d > U+068A
-P V d P V d > U+068B U+0651 ;;SHADDA
-P V d > U+068B ;; (like U+0688 with dot below, for Lahnda = Western Punjabi)
-C d C d > U+06EE U+0651 ;;SHADDA
-C d > U+06EE ; not defined in ArabTeX
-CO d CO d > U+068F U+0651 ;;SHADDA
-CO d > U+068F
-UL (d|z) UL (d|z) > U+0630 U+0651 ;;SHADDA
-UL (d|z) > U+0630
-(P d|U+1E0D) (P d|U+1E0D) > U+0636 U+0651 ;;SHADDA
-(P d|U+1E0D) > U+0636
-d d > U+062F U+0651 ;;SHADDA
-d > U+062F
-V c V c > U+0685 U+0651 ;;SHADDA
-V c > U+0685 ;pashto
-C c C c > U+0686 U+0651 ;;SHADDA
-C c > U+0686
-P C c P C c > U+06BF U+0651 ;;SHADDA
-P C c > U+06BF ;; cheh with dot above <<<
-c c > U+0681 U+0651 ;;SHADDA
-c > U+0681 ; ح with hamza above
-CO c CO c > U+0682 U+0651 ;;SHADDA
-CO c > U+0682 ; old pashto
-CO b CO b > U+067B U+0651 ;;SHADDA
-CO b > U+067B
-P b P b > U+066E U+0651 ;;SHADDA
-P b > U+066E
-b b > U+0628 U+0651 ;;SHADDA
-b > U+0628
-H A > U+0622
-C A > U+064E U+0622 ; historical spelling
-UL A > U+064E U+0649
-UL a > U+0670
-UL u > U+0657 ; inverted damma
-UL i > U+0656 ; subscript alif
-Q AN / (A H|Ha) _ > ;
-AN / (A H|Ha) _ > U+064B
-Q AN > U+0627
-AN > U+0627 U+064B
-Q a >
-a > U+064E
-Q A > U+0627
-A > U+064E U+0627
-Ain Ain > U+0639 U+0651 ;;SHADDA
-Ain > U+0639
-H H > U+0621 U+0651 ;;SHADDA
-H > U+0621
-U+002C / [Digits] _ [Digits] > U+002C ; comma in numerical context not an Arabic comma
-Z Z / [Digits] _ [Digits] > U+2013 ; two hyphens in numerical context -> endash
-(Z|U+005D|U+005B|U+0028|U+0029)=xx / [Digits] _ [Digits] > U+202D @xx U+202C ; hyphen or brackets in numerical context: surrounded by LRO & PDF marks
-[Digits] > [ArDigits]
-Z Z Z / # _ # > U+2014
-Z Z / # _ # > U+2013
-Z Z > U+0640
-B > U+0640
-Z / # _ > U+200D ; -x > force initial form with "zero-width joiner"
-Z / _ # > U+200D ; x- > force final form
-U+003C U+003C > U+00BB ;<<
-U+003E U+003E > U+00AB ;>>
-U+00AB > U+00BB
-U+00BB > U+00AB
-UL > U+0640 ;_
-U+003F > U+061F ;?
-U+003B > U+061B ;;
-U+003A U+003A > U+061E ;; '::' ligature 'DOTS' also defined above...
-U+002C > U+060C ;,
-U+005D / [LTR] _ [LTR] > U+200D U+005D U+200D ; keep shaping when inserting ...[...]... ...
-U+005B / [LTR] _ [LTR] > U+200D U+005B U+200D ; (but of course this screws up contextual
- ; analysis, so quoting of hamzas etc may be necessary
-;U+005D > U+005B ;] these are automatically mirrored, following Unicode rules
-;U+005B > U+005D ;[
-Q [VWL] > ;stripoff quoted vowels
-Q > U+0652
-U+00B0 > U+0652 ; °
-N > ;
-C > ;^
-BAR > ;|
-
-pass(Unicode)
-
-Class [CONS] = (U+0621 U+0623 U+0624 U+0626 U+0628 U+062A..U+063A U+0641..U+0647 U+066E U+066F U+0672 U+0675 U+0676 U+0678..U+06BF U+06EE U+06EF U+06FA..U+06FF U+0750..U+076D) ; to be improved: not sure that all glyphs listed (esp for Urdu,Sindhi,etc are really "consonants" in the sense that they can carry a sukun, not to mention that some of these languages may not have a sukun at all ;-)
-Class [VWLX] = (U+0627 U+0648..U+065E U+0670) ; long vowels, vowel signs, shadda, sukun etc.
-Class [VWL] = (U+0627 U+0648..U+0650 U+0670);
-U+0627 [VWL]? / [VWL] Z _ > U+0627 ; e.g. fa-isti_hraj -> initial alif has no vowel
-Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-voc.tec
deleted file mode 100644
index 78569e6f549..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-voc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-farsi-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-farsi-fullvoc.tec
deleted file mode 100644
index 2165c5131ef..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-farsi-fullvoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-farsi-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-farsi-novoc.tec
deleted file mode 100644
index fc32f96c9ad..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-farsi-novoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-farsi-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-farsi-voc.tec
deleted file mode 100644
index f0b3adcec46..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-farsi-voc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-fullvoc.tec
deleted file mode 100644
index 6ca10fc26be..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-fullvoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kashmiri-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kashmiri-fullvoc.tec
deleted file mode 100644
index 83e488e9069..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kashmiri-fullvoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kashmiri-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kashmiri-novoc.tec
deleted file mode 100644
index 1c781a55e8f..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kashmiri-novoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kashmiri-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kashmiri-voc.tec
deleted file mode 100644
index 8b417908fcd..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kashmiri-voc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kurdish.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kurdish.map
deleted file mode 100644
index c98b3f38b7d..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kurdish.map
+++ /dev/null
@@ -1,290 +0,0 @@
-LHSName "ArabTeX-Kurdish"
-RHSName "UNICODE"
-
-Define a U+0061 ;a
-Define b U+0062 ;b
-Define c U+0063 ;c
-Define d U+0064 ;d
-Define e U+0065 ;e
-Define f U+0066 ;f
-Define g U+0067 ;g
-Define h U+0068 ;h
-Define i U+0069 ;i
-Define j U+006A ;j
-Define k U+006B ;k
-Define l U+006C ;l
-Define m U+006D ;m
-Define n U+006E ;n
-Define o U+006F ;o
-Define p U+0070 ;p
-Define q U+0071 ;q
-Define r U+0072 ;r
-Define s U+0073 ;s
-Define t U+0074 ;t
-Define u U+0075 ;u
-Define v U+0076 ;v
-Define w U+0077 ;w
-Define x U+0078 ;x
-Define y U+0079 ;y
-Define z U+007A ;z
-Define A U+0041 ;A
-Define B U+0042 ;B
-Define E U+0045 ;E
-Define G U+0047 ;G
-Define I U+0049 ;I
-Define N U+004E ;N
-Define O U+004F ;O
-Define T U+0054 ;T
-Define U U+0055 ;U
-Define Y U+0059 ;Y
-Define C U+005E ;^ << CARET
-Define UL U+005F ;_ << UNDERLINE
-Define P U+002E ;. << DOT
-Define V U+002C ;, << COMMA (_V_irgule)
-Define CO U+003A ;: << COLON
-Define Ain U+0060 ;`
-Define H U+0027 ;' << HAMZA
-Define Q U+0022 ;" << QUOTE
-Define Z U+002D ;- << HYPHEN
-Define BAR U+007C ;|
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
-
-pass(Unicode)
-
-Class [Digits] = (U+0030..U+0039)
-Class [ArDigits] = (U+0660..U+0669)
-
-
-; special ligatures
-;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
-(a|A) l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+FDF2 ;; 'll_ah' > U+FDF2
-;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
- U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+FDF2 ; 'ALLAH'
- U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'LLAH'
-
-U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
-U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
-U+0029 U+0029 > U+FD3E ;; '))' : ornate left par
-U+0052 U+0049 U+0059 U+0041 U+004C > U+FDFC ;; 'RIYAL' : Saudi currency sign
-;; most fonts won't have the following ones:
-U+0053 U+0041 U+004C U+004C U+0041 U+0053 U+0054 U+004F U+0050 > U+FDF0 ;; 'SALLASTOP' (.sallY with "ye-barree", Quranic stop sign)
-U+0051 U+0041 U+004C U+0041 > U+FDF1 ;; 'QALA' : qalY with ye-barree, Quranic stop sign
-U+0041 U+004B U+0042 U+0041 U+0052 > U+FDF3 ;; 'AKBAR'
-U+004D U+0055 U+0048 U+0041 U+004D U+004D U+0041 U+0044 > U+FDF4 ;; 'MUHAMMAD'
-U+0053 U+0041 U+004C U+0041 U+004D > U+FDF5 ;; 'SALAM'
-U+0052 U+0041 U+0053 U+004F ? U+0055 U+004C > U+FDF6 ;; 'RASUL' (also unicode 'RASOUL)'
-U+0041 U+004C U+0041 U+0059 U+0048 (U+0049|U+0045) > U+FDF7 ;; 'ALAYHI' (also unicode 'ALAYHE)'
-U+0057 U+0041 U+0053 U+0041 U+004C U+004C U+0041 U+004D > U+FDF8 ;; 'WASALLAM'
-U+0053 U+0041 U+004C U+004C U+0041 > U+FDF9 ;; 'SALLA'
-U+004A U+0041 U+004C U+004C U+0041 > U+FDFB ;; 'JALLA' : "jalla jalAluhu"
-U+0042 U+0041 U+0053 U+004D U+0041 U+004C U+0041 > U+FDFD ;; 'BASMALA' : very few fonts have this ligature afaik
-
-U+005E U+0053 U+004C U+0059 > U+06D6 ;; ^SLY
-U+005E U+0051 U+004C U+0059 > U+06D7 ;; ^QLY
-U+005E U+004D U+0049 U+004D > U+06D8 ;; ^MIM-
-U+005E U+004C U+0041 > U+06D9 ;; ^LA
-U+005E U+004A U+0049 U+004D > U+06DA ;; ^JIM
-U+005E U+0044 U+004F U+0054 U+0053 > U+06DB ;; ^DOTS
-U+005E U+0053 U+0049 U+004E > U+06DC ;; ^SIN
-U+0048 U+0049 U+005A U+0042 > U+06DE ;; HIZB
-U+0043 U+0049 U+0052 U+0043 U+005A U+0045 U+0052 U+004F > U+06DF ;; CIRCZERO
-U+0052 U+0045 U+0043 U+0054 U+005A U+0045 U+0052 U+004F > U+06E0 ;; RECTZERO
-U+005E U+004A U+0041 U+005A U+004D > U+06E1 ;; ^JAZM
-U+005E U+004D U+0049 U+004D > U+06E2 ;; ^MIM
-U+005F U+0053 U+0049 U+004E > U+06E3 ;; _SIN
-U+005E U+004D U+0041 U+0044 U+0044 U+0041 > U+06E4 ;; ^MADDA
-U+0057 U+0041 U+0057 > U+06E5 ;; WAW
-U+0059 U+0045 U+0048 > U+06E6 ;; YEH
-U+005E U+0059 U+0045 U+0048 > U+06E7 ;; ^YEH
-U+005E U+004E U+0055 U+004E > U+06E8 ;; ^NUN
-U+0053 U+0041 U+004A U+0044 U+0041 > U+06E9 ;; SAJDA
-U+005F U+0053 U+0054 U+004F U+0050 > U+06EA ;; _STOP
-U+005E U+0053 U+0054 U+004F U+0050 > U+06EB ;; ^STOP
-U+005E U+0052 U+0053 U+0054 U+004F U+0050 > U+06EC ;; ^RSTOP
-U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
-
-U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
-
-
-; vowels
-
-E / # _ > U+0626 U+06CE
-E > U+06CE
-e / # _ > U+0626 U+0647 U+200C ; h always final
-e > U+0647 U+200C
-i / # _ > U+0626
-Q i > U+0650
-i > ;
-Q I / # _ > U+0626 U+064A U+0650
-Q I > U+064A U+0650
-I / # _ > U+0626 U+064A
-I > U+064A
-(a|A) / # _ > U+0626 U+0627
-(a|A) > U+0627
-(o|O) / # _ > U+0626 U+06C6
-(o|O) > U+06C6
-u / # _ > U+0626 U+0648
-u > U+0648
-U / # _ > U+0626 U+0648 U+0648
-U > U+0648 U+0648
-Ain e > U+0639 U+0647 U+200C
-
-
-P z P z > U+0638 U+0651 ;;SHADDA
-P z > U+0638
-C z C z > U+0698 U+0651 ;;SHADDA
-C z > U+0698
-V z V z > U+0696 U+0651 ;pashto ;;SHADDA
-V z > U+0696 ;pashto
-z z > U+0632 U+0651 ;;SHADDA
-z > U+0632
-Y Y > U+0649 U+0651 ;;SHADDA
-Y > U+0649
-w w > U+0648 U+0651 ;;SHADDA
-w > U+0648
-y y > U+064A U+0651 ;;SHADDA
-y > U+064A
-v v > U+06A4 U+0651 ;;SHADDA
-v > U+06A4
-V t V t > U+0679 U+0651 ; urdu ;;SHADDA
-V t > U+0679
-UL t UL t > U+062B U+0651 ;;SHADDA
-UL t > U+062B
-P t P t > U+0637 U+0651 ;;SHADDA
-P t > U+0637
-t t > U+062A U+0651 ;;SHADDA
-t > U+062A
-T T > U+0629 U+0651 ;;SHADDA
-T > U+0629
-(C|V) s (C|V) s > U+0634 U+0651 ;;SHADDA
-(C|V) s > U+0634
-P s P s > U+0635 U+0651 ;;SHADDA
-P s > U+0635
-CO s CO s > U+069B U+0651
-CO s > U+069B ; sin with 3 dots below
-s s > U+0633 U+0651 ;;SHADDA
-s > U+0633
-;; also missing U+0694 : r with dot below
-V r V r > U+0694 U+0651 ;Kurdish ;;SHADDA
-V r > U+0694
-C r C r > U+0692 U+0651 ;Kurdish ;;SHADDA ; missing in ArabTeX <<<
-C r > U+0692
-P r P r > U+0695 U+0651 ;Kurdish ;;SHADDA
-P r > U+0695
-r r > U+0631 U+0651 ;;SHADDA
-r > U+0631
-P q P q > U+066F U+0651 ;;SHADDA
-P q > U+066F
-q q > U+0642 U+0651 ;;SHADDA
-q > U+0642
-p p > U+067E U+0651 ;;SHADDA
-p > U+067E
-C n C n > U+06AD U+0651 ;;SHADDA
-C n > U+06AD
-P n P n > U+06BA U+0651 ; urdu ;;SHADDA
-P n > U+06BA ;
-V n V n > U+06BC U+0651 ; Pashto
-V n > U+06BC ; Pashto
-n n > U+0646 U+0651 ;;SHADDA
-n > U+0646
-m m > U+0645 U+0651 ;;SHADDA
-m > U+0645
-P l P l > U+06B6 U+0651 ;
-P l > U+06B6 ; ADDED <<<
-C l C l > U+06B5 U+0651 ;kurdish ;;SHADDA
-C l > U+06B5
-l l > U+0644 U+0651 ;;SHADDA
-l > U+0644
-P k P k > U+06A9 U+0651 ; pashto urdu ;;SHADDA
-P k > U+06A9
-UL k UL k > U+063A U+0651 ;;SHADDA
-UL k > U+063A
-k k > U+0643 U+0651 ;;SHADDA
-k > U+0643
-c c > U+062C U+0651 ;;SHADDA
-c > U+062C
-x x > U+062E U+0651 ;;SHADDA
-x > U+062E
-j j > U+0698 U+0651 ;;SHADDA
-j > U+0698
-UL h UL h > U+062E U+0651 ;;SHADDA
-UL h > U+062E
-P h P h > U+062D U+0651 ;;SHADDA
-P h > U+062D
-V h V h > U+06C1 U+0651
-V h > U+06C1
-h h > U+200C U+06BE U+0651 ;;SHADDA
-h > U+200C U+06BE ; h always initial form
-V g V g > U+06AC U+0651 ;;SHADDA
-V g > U+06AC ; kaf with dot above
-P (g|x) P (g|x) > U+063A U+0651 ;;SHADDA
-P (g|x) > U+063A
-C g C g > U+063A U+0651 ;;SHADDA
-C g > U+063A
-g g > U+06AF U+0651 ;;SHADDA
-g > U+06AF
-G G > U+06AB U+0651 ;pashto ;;SHADDA
-G > U+06AB ;pashto
-P f P f > U+06A1 U+0651 ;;SHADDA
-P f > U+06A1
-f f > U+0641 U+0651 ;;SHADDA
-f > U+0641
-V d V d > U+0688 U+0651 ;urdu ;;SHADDA
-V d > U+0688 ;urdu
-C d C d > U+06EE ; not defined in ArabTeX U+0651 ;;SHADDA
-C d > U+06EE ; not defined in ArabTeX
-UL d UL d > U+0630 U+0651 ;;SHADDA
-UL d > U+0630
-P d P d > U+0636 U+0651 ;;SHADDA
-P d > U+0636
-d d > U+062F U+0651 ;;SHADDA
-d > U+062F
-(C|V) c (C|V) c > U+0686 U+0651 ;;SHADDA
-(C|V) c > U+0686
-P b P b > U+066E U+0651 ;;SHADDA
-P b > U+066E
-b b > U+0628 U+0651 ;;SHADDA
-b > U+0628
-Ain Ain > U+0639 U+0651 ;;SHADDA
-Ain > U+0639
-H > U+0626
-U+002C / [Digits] _ [Digits] > U+002C ; comma in numerical context not an Arabic comma
-Z Z / [Digits] _ [Digits] > U+2013 ; two hyphens in numerical context -> endash
-(Z|U+005D|U+005B|U+0028|U+0029)=xx / [Digits] _ [Digits] > U+202D @xx U+202C ; hyphen or brackets in numerical context: surrounded by LRO & PDF marks
-[Digits] > [ArDigits]
-Z Z Z / # _ # > U+2014
-Z Z / # _ # > U+2013
-Z Z > U+0640
-B > U+0640
-Z / # _ > U+200D ; -x > force initial form with "zero-width joiner"
-Z / _ # > U+200D ; x- > force final form
-U+003C U+003C > U+00BB ;<<
-U+003E U+003E > U+00AB ;>>
-U+00AB > U+00BB
-U+00BB > U+00AB
-UL > U+0640 ;_
-U+003F > U+061F ;?
-U+003B > U+061B ;;
-U+003A U+003A > U+061E ;; '::' ligature 'DOTS' also defined above...
-U+002C > U+060C ;,
-U+005D / . _ . > U+200D U+005D U+200D ; keep shaping when inserting ...[...]...
-U+005B / . _ . > U+200D U+005B U+200D ; ... (but of course this screws up contextual analysis, so quoting of hamzas etc may be necessary)
-Q > ;
-N > ;
-C > ;^
-Z > ;-
-BAR > ;|
-
-
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kurdish.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kurdish.tec
deleted file mode 100644
index 7cd94973133..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kurdish.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-maghribi-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-maghribi-fullvoc.tec
deleted file mode 100644
index 8710e3b387e..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-maghribi-fullvoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-maghribi-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-maghribi-novoc.tec
deleted file mode 100644
index 4541204cd25..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-maghribi-novoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-maghribi-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-maghribi-voc.tec
deleted file mode 100644
index f3088c36a23..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-maghribi-voc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-malay-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-malay-fullvoc.tec
deleted file mode 100644
index c83fa403bd6..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-malay-fullvoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-malay-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-malay-novoc.tec
deleted file mode 100644
index 4a6b8f92a3e..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-malay-novoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-malay-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-malay-voc.tec
deleted file mode 100644
index 1b0f5b2b835..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-malay-voc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-novoc.tec
deleted file mode 100644
index ba62340d6b3..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-novoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-pashto-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-pashto-fullvoc.tec
deleted file mode 100644
index c62c017c0b5..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-pashto-fullvoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-pashto-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-pashto-novoc.tec
deleted file mode 100644
index d05a8143417..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-pashto-novoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-pashto-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-pashto-voc.tec
deleted file mode 100644
index aab09f97ec6..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-pashto-voc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-sindhi-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-sindhi-fullvoc.tec
deleted file mode 100644
index 34b9a0e1d72..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-sindhi-fullvoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-sindhi-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-sindhi-novoc.tec
deleted file mode 100644
index 6e8fc3767c1..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-sindhi-novoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-sindhi-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-sindhi-voc.tec
deleted file mode 100644
index 7583ec76be2..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-sindhi-voc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-turk-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-turk-fullvoc.tec
deleted file mode 100644
index 7182c9ccd7f..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-turk-fullvoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-turk-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-turk-novoc.tec
deleted file mode 100644
index 95903a8c0ab..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-turk-novoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-turk-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-turk-voc.tec
deleted file mode 100644
index bb08e4bfaae..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-turk-voc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-uighur.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-uighur.map
deleted file mode 100644
index 2b3923d1e2a..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-uighur.map
+++ /dev/null
@@ -1,277 +0,0 @@
-LHSName "ArabTeX-Uighur"
-RHSName "UNICODE"
-
-Define a U+0061 ;a
-Define b U+0062 ;b
-Define c U+0063 ;c
-Define d U+0064 ;d
-Define e U+0065 ;e
-Define f U+0066 ;f
-Define g U+0067 ;g
-Define h U+0068 ;h
-Define i U+0069 ;i
-Define j U+006A ;j
-Define k U+006B ;k
-Define l U+006C ;l
-Define m U+006D ;m
-Define n U+006E ;n
-Define o U+006F ;o
-Define p U+0070 ;p
-Define q U+0071 ;q
-Define r U+0072 ;r
-Define s U+0073 ;s
-Define t U+0074 ;t
-Define u U+0075 ;u
-Define v U+0076 ;v
-Define w U+0077 ;w
-Define x U+0078 ;x
-Define y U+0079 ;y
-Define z U+007A ;z
-Define A U+0041 ;A
-Define B U+0042 ;B
-Define E U+0045 ;E
-Define G U+0047 ;G
-Define I U+0049 ;I
-Define N U+004E ;N
-Define O U+004F ;O
-Define T U+0054 ;T
-Define U U+0055 ;U
-Define Y U+0059 ;Y
-Define C U+005E ;^ << CARET
-Define UL U+005F ;_ << UNDERLINE
-Define P U+002E ;. << DOT
-Define V U+002C ;, << COMMA (_V_irgule)
-Define CO U+003A ;: << COLON
-Define Ain U+0060 ;`
-Define H U+0027 ;' << HAMZA
-Define Q U+0022 ;" << QUOTE
-Define Z U+002D ;- << HYPHEN
-Define BAR U+007C ;|
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
-
-pass(Unicode)
-
-Class [Digits] = (U+0030..U+0039)
-Class [ArDigits] = (U+0660..U+0669)
-
-
-; special ligatures
-;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
-(a|A) l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+FDF2 ;; 'll_ah' > U+FDF2
-;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
- U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+FDF2 ; 'ALLAH'
- U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'LLAH'
-
-U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
-U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
-U+0029 U+0029 > U+FD3E ;; '))' : ornate left par
-U+0052 U+0049 U+0059 U+0041 U+004C > U+FDFC ;; 'RIYAL' : Saudi currency sign
-;; most fonts won't have the following ones:
-U+0053 U+0041 U+004C U+004C U+0041 U+0053 U+0054 U+004F U+0050 > U+FDF0 ;; 'SALLASTOP' (.sallY with "ye-barree", Quranic stop sign)
-U+0051 U+0041 U+004C U+0041 > U+FDF1 ;; 'QALA' : qalY with ye-barree, Quranic stop sign
-U+0041 U+004B U+0042 U+0041 U+0052 > U+FDF3 ;; 'AKBAR'
-U+004D U+0055 U+0048 U+0041 U+004D U+004D U+0041 U+0044 > U+FDF4 ;; 'MUHAMMAD'
-U+0053 U+0041 U+004C U+0041 U+004D > U+FDF5 ;; 'SALAM'
-U+0052 U+0041 U+0053 U+004F ? U+0055 U+004C > U+FDF6 ;; 'RASUL' (also unicode 'RASOUL)'
-U+0041 U+004C U+0041 U+0059 U+0048 (U+0049|U+0045) > U+FDF7 ;; 'ALAYHI' (also unicode 'ALAYHE)'
-U+0057 U+0041 U+0053 U+0041 U+004C U+004C U+0041 U+004D > U+FDF8 ;; 'WASALLAM'
-U+0053 U+0041 U+004C U+004C U+0041 > U+FDF9 ;; 'SALLA'
-U+004A U+0041 U+004C U+004C U+0041 > U+FDFB ;; 'JALLA' : "jalla jalAluhu"
-U+0042 U+0041 U+0053 U+004D U+0041 U+004C U+0041 > U+FDFD ;; 'BASMALA' : very few fonts have this ligature afaik
-
-U+005E U+0053 U+004C U+0059 > U+06D6 ;; ^SLY
-U+005E U+0051 U+004C U+0059 > U+06D7 ;; ^QLY
-U+005E U+004D U+0049 U+004D > U+06D8 ;; ^MIM
-U+005E U+004C U+0041 > U+06D9 ;; ^LA
-U+005E U+004A U+0049 U+004D > U+06DA ;; ^JIM
-U+005E U+0044 U+004F U+0054 U+0053 > U+06DB ;; ^DOTS
-U+005E U+0053 U+0049 U+004E > U+06DC ;; ^SIN
-U+0048 U+0049 U+005A U+0042 > U+06DE ;; HIZB
-U+0043 U+0049 U+0052 U+0043 U+005A U+0045 U+0052 U+004F > U+06DF ;; CIRCZERO
-U+0052 U+0045 U+0043 U+0054 U+005A U+0045 U+0052 U+004F > U+06E0 ;; RECTZERO
-U+0053 U+0041 U+004A U+0044 U+0041 > U+06E9 ;; SAJDA
-
-U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
-
-
-; vowels
-
-a / # _ > U+0626 U+0627
-a > U+0627
-(CO a|U+00E4) / # _ > U+0626 U+0647 U+200C
-(CO a|U+00E4) > U+0647 U+200C
-o / # _ > U+0626 U+0648 ;
-o > U+0648 ;
-(CO o|U+00F6) / # _ > U+0626 U+06C6
-(CO o|U+00F6) > U+06C6
-i / # _ # > U+0626 U+0649
-i / # _ > U+0626 U+066E
-i / _ # > U+0649
-i > U+066E
-e / # _ > U+0626 U+06D0
-e > U+06D0
-u / # _ > U+0626 U+06C7 ;
-u > U+06C7 ;
-(CO u|U+00FC) / # _ > U+0626 U+06C8 ;
-(CO u|U+00FC) > U+06C8 ;
-l Q a > U+0644 U+064E U+0627 ;
-l a > U+0644 U+0627 ;
-
-P z P z > U+0638 U+0651 ;;SHADDA
-P z > U+0638
-C z C z > U+0698 U+0651 ;;SHADDA
-C z > U+0698
-V z V z > U+0696 U+0651 ;pashto ;;SHADDA
-V z > U+0696 ;pashto
-z z > U+0632 U+0651 ;;SHADDA
-z > U+0632
-Y Y > U+0649 U+0651 ;;SHADDA
-Y > U+0649
-w w > U+06CB U+0651 ;;SHADDA
-w > U+06CB
-y y > U+064A U+0651 ;;SHADDA
-y > U+064A
-v v > U+06A4 U+0651 ;;SHADDA
-v > U+06A4
-V t V t > U+0679 U+0651 ; urdu ;;SHADDA
-V t > U+0679
-UL t UL t > U+062B U+0651 ;;SHADDA
-UL t > U+062B
-P t P t > U+0637 U+0651 ;;SHADDA
-P t > U+0637
-t t > U+062A U+0651 ;;SHADDA
-t > U+062A
-T T > U+0629 U+0651 ;;SHADDA
-T > U+0629
-C s C s > U+0634 U+0651 ;;SHADDA
-C s > U+0634
-P s P s > U+0635 U+0651 ;;SHADDA
-P s > U+0635
-V s V s > U+069A U+0651 ;Pashto ;;SHADDA
-V s > U+069A ;Pashto
-CO s > U+069B ; sin with 3 dots below
-s s > U+0633 U+0651 ;;SHADDA
-s > U+0633
-C r C r > U+0692 U+0651 ;Kurdish ;;SHADDA ; missing in ArabTeX <<<
-C r > U+0692
-P r P r > U+0695 U+0651 ;Kurdish ;;SHADDA
-P r > U+0695
-V r V r > U+0691 U+0651 ;Urdu ;;SHADDA
-V r > U+0691 ;Urdu
-r r > U+0631 U+0651 ;;SHADDA
-r > U+0631
-P q P q > U+066F U+0651 ;;SHADDA
-P q > U+066F
-q q > U+0642 U+0651 ;;SHADDA
-q > U+0642
-p p > U+067E U+0651 ;;SHADDA
-p > U+067E
-C n C n > U+06AD U+0651 ;;SHADDA
-C n > U+06AD
-P n P n > U+06BA U+0651 ; urdu ;;SHADDA
-P n > U+06BA ;
-V n V n > U+06BC U+0651 ; Pashto
-V n > U+06BC ; Pashto
-n n > U+0646 U+0651 ;;SHADDA
-n > U+0646
-m m > U+0645 U+0651 ;;SHADDA
-m > U+0645
-C l C l > U+06B5 U+0651 ;kurdish ;;SHADDA
-C l > U+06B5
-l l > U+0644 U+0651 ;;SHADDA
-l > U+0644
-P k P k > U+06A9 U+0651 ; pashto urdu ;;SHADDA
-P k > U+06A9
-UL k UL k > U+063A U+0651 ;;SHADDA
-UL k > U+063A
-k k > U+0643 U+0651 ;;SHADDA
-k > U+0643
-j j > U+062C U+0651 ;;SHADDA
-j > U+062C
-x x > U+062E U+0651 ;;SHADDA
-x > U+062E
-UL h UL h > U+062E U+0651 ;;SHADDA
-UL h > U+062E
-P h P h > U+062D U+0651 ;;SHADDA
-P h > U+062D
-V h V h > U+06C1 U+0651
-V h > U+06C1
-h h > U+0647 U+0651 ;;SHADDA
-h > U+0647
-V g V g > U+06AC U+0651 ;;SHADDA
-V g > U+06AC ; kaf with dot above
-P g P g > U+063A U+0651 ;;SHADDA
-P g > U+063A
-C g C g > U+063A U+0651 ;;SHADDA
-C g > U+063A
-g g > U+06AF U+0651 ;;SHADDA
-g > U+06AF
-G G > U+06AB U+0651 ;pashto ;;SHADDA
-G > U+06AB ;pashto
-P f P f > U+06A1 U+0651 ;;SHADDA
-P f > U+06A1
-f f > U+0641 U+0651 ;;SHADDA
-f > U+0641
-V d V d > U+0688 U+0651 ;urdu ;;SHADDA
-V d > U+0688 ;urdu
-C d C d > U+06EE ; not defined in ArabTeX U+0651 ;;SHADDA
-C d > U+06EE ; not defined in ArabTeX
-UL d UL d > U+0630 U+0651 ;;SHADDA
-UL d > U+0630
-P d P d > U+0636 U+0651 ;;SHADDA
-P d > U+0636
-d d > U+062F U+0651 ;;SHADDA
-d > U+062F
-V c V c > U+0685 U+0651 ;pashto ;;SHADDA
-V c > U+0685
-C c C c > U+0686 U+0651 ;;SHADDA
-C c > U+0686
-c c > U+0681 U+0651
-c > U+0681 ; ح with hamza above
-P b P b > U+066E U+0651 ;;SHADDA
-P b > U+066E
-b b > U+0628 U+0651 ;;SHADDA
-b > U+0628
-Ain Ain > U+0639 U+0651 ;;SHADDA
-Ain > U+0639
-H > U+0626
-U+002C / [Digits] _ [Digits] > U+002C ; comma in numerical context not an Arabic comma
-Z Z / [Digits] _ [Digits] > U+2013 ; two hyphens in numerical context -> endash
-(Z|U+005D|U+005B|U+0028|U+0029)=xx / [Digits] _ [Digits] > U+202D @xx U+202C ; hyphen or brackets in numerical context: surrounded by LRO & PDF marks
-[Digits] > [ArDigits]
-Z Z Z / # _ # > U+2014
-Z Z / # _ # > U+2013
-Z Z > U+0640
-B > U+0640
-Z / # _ > U+200D ; -x > force initial form with "zero-width joiner"
-Z / _ # > U+200D ; x- > force final form
-U+003C U+003C > U+00BB ;<<
-U+003E U+003E > U+00AB ;>>
-U+00AB > U+00BB
-U+00BB > U+00AB
-UL > U+0640 ;_
-U+003F > U+061F ;?
-U+003B > U+061B ;;
-U+003A U+003A > U+061E ;; '::' ligature 'DOTS' also defined above...
-U+002C > U+060C ;,
-U+005D / . _ . > U+200D U+005D U+200D ; keep shaping when inserting ...[...]...
-U+005B / . _ . > U+200D U+005B U+200D ; ... (but of course this screws up contextual analysis, so quoting of hamzas etc may be necessary)
-Q > ;
-N > ;
-C > ;^
-Z > ;-
-BAR > ;|
-
-
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-uighur.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-uighur.tec
deleted file mode 100644
index be1845fa6e6..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-uighur.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-urdu-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-urdu-fullvoc.tec
deleted file mode 100644
index 1eeca763f5f..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-urdu-fullvoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-urdu-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-urdu-novoc.tec
deleted file mode 100644
index 91e99f0c3d7..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-urdu-novoc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-urdu-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-urdu-voc.tec
deleted file mode 100644
index bf93543e3fb..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-urdu-voc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-voc.tec
deleted file mode 100644
index cc89d2fea85..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-voc.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-fullvoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fullvoc.map
index f6772aa68c4..23db35b5cde 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-fullvoc.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fullvoc.map
@@ -50,7 +50,7 @@ Define Q U+0022 ;" << QUOTE
Define Z U+002D ;- << HYPHEN
Define BAR U+007C ;|
Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
+Define LLAH U+006C U+006C U+005F U+0061 U+0068 ; ll_ah
;Define NUL U+00A6;
Define Ha U+0623
Define Hi U+0625
@@ -87,20 +87,16 @@ Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
; special ligatures
;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
+;; FDF2 is just used as temporary holder, and is converted back to ligature lam lam hah later (to be taken care of by the font)
+Z (a|A) l Z LLAH > U+0671 U+FDF2 ;; '-al-ll_ah' or '-Al-ll_ah'
;; The BAR is used in the DMG transliteration to suppress the initial A
(a|A) BAR? l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+FDF2 ;; 'll_ah' > U+FDF2
+LLAH > U+FDF2 ;; 'll_ah' -> 'l l h'
;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
- U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+FDF2 ; 'ALLAH'
- U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'LLAH'
+U+004C U+004C U+0048 > U+FDF2 ;; 'LLH' -> 'l l h'
+U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH'
+U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+0644 U+0644 U+0647 ; 'ALLAH'
+U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
@@ -145,8 +141,8 @@ U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
+;; This is to enclose digits within glyph U+06DD
+U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+06DD @dig ; [[digits]]
; vowels
@@ -428,7 +424,7 @@ UL i > U+0656 ; subscript alif
Q AN / (A H|Ha) _ > ;
AN / (A H|Ha) _ > U+064B
Q AN > U+0627
-AN > U+0627 U+064B
+AN > U+064B U+0627
Q a >
a > U+064E
Q A > U+0627
@@ -478,5 +474,6 @@ U+0627 [VWL]? / [VWL] Z _ > U+0671 ; e.g. fa-isti_hraj -> wasla on initial alif
U+0627 / # _ U+0644 > U+0627 U+064E ; otherwise initial alif takes fatha
[CONS]=k1 / _ ([CONS]|#) > @k1 U+0652 ; consonant + (consonant or final)
;; [CONS]=k1 / _ # > @k1 U+0652 ; final consonant
+U+FDF2 > U+0644 U+0644 U+0647 ;
Q > ;
Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fullvoc.tec
new file mode 100644
index 00000000000..21184d712da
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fullvoc.tec
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kashmiri-fullvoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-kashmiri-fullvoc.map
index a2516e210e7..2aba8b33124 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kashmiri-fullvoc.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-kashmiri-fullvoc.map
@@ -50,7 +50,7 @@ Define Q U+0022 ;" << QUOTE
Define Z U+002D ;- << HYPHEN
Define BAR U+007C ;|
Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
+Define LLAH U+006C U+006C U+005F U+0061 U+0068 ; ll_ah
;Define NUL U+00A6;
Define Ha U+0623
Define Hi U+0625
@@ -87,20 +87,15 @@ Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
; special ligatures
;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
+;; FDF2 is just used as temporary holder, and is converted back to ligature lam lam hah later (to be taken care of by the font)
;; The BAR is used in the DMG transliteration to suppress the initial A
(a|A) BAR? l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+FDF2 ;; 'll_ah' > U+FDF2
+LLAH > U+FDF2 ;; 'll_ah' -> 'l l h'
;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
- U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+FDF2 ; 'ALLAH'
- U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'LLAH'
+U+004C U+004C U+0048 > U+FDF2 ;; 'LLH' -> 'l l h'
+U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH'
+U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+0644 U+0644 U+0647 ; 'ALLAH'
+U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
@@ -145,8 +140,8 @@ U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
+;; This is to enclose digits within glyph U+06DD
+U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+06DD @dig ; [[digits]]
; vowels
@@ -460,7 +455,7 @@ UL i > U+0650;
Q AN / (A H|Ha) _ > ;
AN / (A H|Ha) _ > U+064B
Q AN > U+0627
-AN > U+0627 U+064B
+AN > U+064B U+0627
Q a >
a > U+064E
Q A > U+0627
@@ -509,5 +504,6 @@ U+064E (U+064A|U+0648)=hc / _ (^[VWLX]|#) > U+064E @hc U+0652 ; ay and aw diphto
U+0627 / # _ U+0644 > U+0627 U+064E ; otherwise initial alif takes fatha
[CONS]=k1 / _ ([CONS]|#) > @k1 U+0652 ; consonant + (consonant or final)
;; [CONS]=k1 / _ # > @k1 U+0652 ; final consonant
+U+FDF2 > U+0644 U+0644 U+0647 ;
Q > ;
Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-kashmiri-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-kashmiri-fullvoc.tec
new file mode 100644
index 00000000000..9a4872303df
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-kashmiri-fullvoc.tec
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kashmiri-novoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-kashmiri-novoc.map
index b14151f77cd..587599eae51 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kashmiri-novoc.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-kashmiri-novoc.map
@@ -50,7 +50,7 @@ Define Q U+0022 ;" << QUOTE
Define Z U+002D ;- << HYPHEN
Define BAR U+007C ;|
Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
+Define LLAH U+006C U+006C U+005F U+0061 U+0068 ; ll_ah
;Define NUL U+00A6;
Define Ha U+0623
Define Hi U+0625
@@ -87,20 +87,15 @@ Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
; special ligatures
;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
+;; FDF2 is just used as temporary holder, and is converted back to ligature lam lam hah later (to be taken care of by the font)
;; The BAR is used in the DMG transliteration to suppress the initial A
(a|A) BAR? l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+FDF2 ;; 'll_ah' > U+FDF2
+LLAH > U+FDF2 ;; 'll_ah' -> 'l l h'
;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
- U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+FDF2 ; 'ALLAH'
- U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'LLAH'
+U+004C U+004C U+0048 > U+FDF2 ;; 'LLH' -> 'l l h'
+U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH'
+U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+0644 U+0644 U+0647 ; 'ALLAH'
+U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
@@ -145,8 +140,8 @@ U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
+;; This is to enclose digits within glyph U+06DD
+U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+06DD @dig ; [[digits]]
; vowels
@@ -455,7 +450,7 @@ UL u > ;
UL i > ;
Q AN / (A H|Ha) _ > U+064B
AN / (A H|Ha) _ > ;
-Q AN > U+0627 U+064B
+Q AN > U+064B U+0627
AN > U+0627
Q a > U+064E
Q A > U+064E U+0627
@@ -496,3 +491,4 @@ C > ;^
Z > ;-
BAR > ;|
+U+FDF2 > U+0644 U+0644 U+0647 ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-kashmiri-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-kashmiri-novoc.tec
new file mode 100644
index 00000000000..7e85abcae5d
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-kashmiri-novoc.tec
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kashmiri-voc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-kashmiri-voc.map
index ad72262643b..d4421023a9a 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kashmiri-voc.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-kashmiri-voc.map
@@ -50,7 +50,7 @@ Define Q U+0022 ;" << QUOTE
Define Z U+002D ;- << HYPHEN
Define BAR U+007C ;|
Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
+Define LLAH U+006C U+006C U+005F U+0061 U+0068 ; ll_ah
;Define NUL U+00A6;
Define Ha U+0623
Define Hi U+0625
@@ -87,20 +87,15 @@ Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
; special ligatures
;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
+;; FDF2 is just used as temporary holder, and is converted back to ligature lam lam hah later (to be taken care of by the font)
;; The BAR is used in the DMG transliteration to suppress the initial A
(a|A) BAR? l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+FDF2 ;; 'll_ah' > U+FDF2
+LLAH > U+FDF2 ;; 'll_ah' -> 'l l h'
;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
- U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+FDF2 ; 'ALLAH'
- U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'LLAH'
+U+004C U+004C U+0048 > U+FDF2 ;; 'LLH' -> 'l l h'
+U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH'
+U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+0644 U+0644 U+0647 ; 'ALLAH'
+U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
@@ -145,8 +140,8 @@ U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
+;; This is to enclose digits within glyph U+06DD
+U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+06DD @dig ; [[digits]]
; vowels
@@ -460,7 +455,7 @@ UL i > U+0650;
Q AN / (A H|Ha) _ > ;
AN / (A H|Ha) _ > U+064B
Q AN > U+0627
-AN > U+0627 U+064B
+AN > U+064B U+0627
Q a >
a > U+064E
Q A > U+0627
@@ -505,4 +500,5 @@ pass(Unicode)
Class [CONS] = (U+0621 U+0623 U+0624 U+0626 U+0628 U+062A..U+063A U+0641..U+0647 U+066E U+066F U+0672 U+0675 U+0676 U+0678..U+06BF U+06EE U+06EF U+06FA..U+06FF U+0750..U+076D) ; to be improved: not sure that all glyphs listed (esp for Urdu,Sindhi,etc are really "consonants" in the sense that they can carry a sukun, not to mention that some of these languages may not have a sukun at all ;-)
Class [VWLX] = (U+0627 U+0648..U+065E U+0670) ; long vowels, vowel signs, shadda, sukun etc.
Class [VWL] = (U+0627 U+0648..U+0650 U+0670);
+U+FDF2 > U+0644 U+0644 U+0647 ;
Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-kashmiri-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-kashmiri-voc.tec
new file mode 100644
index 00000000000..8aca4e5cd70
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-kashmiri-voc.tec
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kurdish.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-kurdish.map
index 85c3e365354..7e15a75cd4c 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kurdish.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-kurdish.map
@@ -57,18 +57,12 @@ Class [ArDigits] = (U+0660..U+0669)
; special ligatures
;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
-(a|A) l Z LLAH > U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
+(a|A) l Z LLAH > U+0627 U+0644 U+0644 U+0647 ;; 'al-ll_ah' or 'Al-ll_ah'
LLAH > U+0644 U+0644 U+0647 ;; 'll_ah' -> 'l l h'
;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
-U+0041 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'ALLAH'
+U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH'
+U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+0644 U+0644 U+0647 ; 'ALLAH'
U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
@@ -114,8 +108,8 @@ U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
+;; This is to enclose digits within glyph U+06DD
+U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+06DD @dig ; [[digits]]
; vowels
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-kurdish.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-kurdish.tec
new file mode 100644
index 00000000000..a770e1f6ca7
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-kurdish.tec
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-maghribi-fullvoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-maghribi-fullvoc.map
index cb0e146df4f..3b2f8526795 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-maghribi-fullvoc.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-maghribi-fullvoc.map
@@ -50,7 +50,7 @@ Define Q U+0022 ;" << QUOTE
Define Z U+002D ;- << HYPHEN
Define BAR U+007C ;|
Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
+Define LLAH U+006C U+006C U+005F U+0061 U+0068 ; ll_ah
;Define NUL U+00A6;
Define Ha U+0623
Define Hi U+0625
@@ -87,20 +87,16 @@ Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
; special ligatures
;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
+;; FDF2 is just used as temporary holder, and is converted back to ligature lam lam hah later (to be taken care of by the font)
+Z (a|A) l Z LLAH > U+0671 U+FDF2 ;; '-al-ll_ah' or '-Al-ll_ah'
;; The BAR is used in the DMG transliteration to suppress the initial A
(a|A) BAR? l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+FDF2 ;; 'll_ah' > U+FDF2
+LLAH > U+FDF2 ;; 'll_ah' -> 'l l h'
;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
- U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+FDF2 ; 'ALLAH'
- U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'LLAH'
+U+004C U+004C U+0048 > U+FDF2 ;; 'LLH' -> 'l l h'
+U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH'
+U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+0644 U+0644 U+0647 ; 'ALLAH'
+U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
@@ -145,8 +141,8 @@ U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
+;; This is to enclose digits within glyph U+06DD
+U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+06DD @dig ; [[digits]]
; vowels
@@ -428,7 +424,7 @@ UL i > U+0656 ; subscript alif
Q AN / (A H|Ha) _ > ;
AN / (A H|Ha) _ > U+064B
Q AN > U+0627
-AN > U+0627 U+064B
+AN > U+064B U+0627
Q a >
a > U+064E
Q A > U+0627
@@ -478,5 +474,6 @@ U+0627 [VWL]? / [VWL] Z _ > U+0671 ; e.g. fa-isti_hraj -> wasla on initial alif
U+0627 / # _ U+0644 > U+0627 U+064E ; otherwise initial alif takes fatha
[CONS]=k1 / _ ([CONS]|#) > @k1 U+0652 ; consonant + (consonant or final)
;; [CONS]=k1 / _ # > @k1 U+0652 ; final consonant
+U+FDF2 > U+0644 U+0644 U+0647 ;
Q > ;
Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-maghribi-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-maghribi-fullvoc.tec
new file mode 100644
index 00000000000..2c47861c6b5
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-maghribi-fullvoc.tec
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-maghribi-novoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-maghribi-novoc.map
index 304f32cf64a..51d496cbcb7 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-maghribi-novoc.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-maghribi-novoc.map
@@ -50,7 +50,7 @@ Define Q U+0022 ;" << QUOTE
Define Z U+002D ;- << HYPHEN
Define BAR U+007C ;|
Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
+Define LLAH U+006C U+006C U+005F U+0061 U+0068 ; ll_ah
;Define NUL U+00A6;
Define Ha U+0623
Define Hi U+0625
@@ -87,20 +87,15 @@ Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
; special ligatures
;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
+;; FDF2 is just used as temporary holder, and is converted back to ligature lam lam hah later (to be taken care of by the font)
;; The BAR is used in the DMG transliteration to suppress the initial A
(a|A) BAR? l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+FDF2 ;; 'll_ah' > U+FDF2
+LLAH > U+FDF2 ;; 'll_ah' -> 'l l h'
;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
- U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+FDF2 ; 'ALLAH'
- U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'LLAH'
+U+004C U+004C U+0048 > U+FDF2 ;; 'LLH' -> 'l l h'
+U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH'
+U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+0644 U+0644 U+0647 ; 'ALLAH'
+U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
@@ -145,8 +140,8 @@ U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
+;; This is to enclose digits within glyph U+06DD
+U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+06DD @dig ; [[digits]]
; vowels
@@ -422,7 +417,7 @@ UL u > U+0657 ; inverted damma
UL i > U+0656 ; subscript alif
Q AN / (A H|Ha) _ > U+064B
AN / (A H|Ha) _ > ;
-Q AN > U+0627 U+064B
+Q AN > U+064B U+0627
AN > U+0627
Q a > U+064E
Q A > U+064E U+0627
@@ -463,3 +458,4 @@ C > ;^
Z > ;-
BAR > ;|
+U+FDF2 > U+0644 U+0644 U+0647 ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-maghribi-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-maghribi-novoc.tec
new file mode 100644
index 00000000000..762fffbb975
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-maghribi-novoc.tec
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-maghribi-voc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-maghribi-voc.map
index a6f76d42406..313c6646023 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-maghribi-voc.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-maghribi-voc.map
@@ -50,7 +50,7 @@ Define Q U+0022 ;" << QUOTE
Define Z U+002D ;- << HYPHEN
Define BAR U+007C ;|
Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
+Define LLAH U+006C U+006C U+005F U+0061 U+0068 ; ll_ah
;Define NUL U+00A6;
Define Ha U+0623
Define Hi U+0625
@@ -87,20 +87,15 @@ Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
; special ligatures
;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
+;; FDF2 is just used as temporary holder, and is converted back to ligature lam lam hah later (to be taken care of by the font)
;; The BAR is used in the DMG transliteration to suppress the initial A
(a|A) BAR? l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+FDF2 ;; 'll_ah' > U+FDF2
+LLAH > U+FDF2 ;; 'll_ah' -> 'l l h'
;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
- U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+FDF2 ; 'ALLAH'
- U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'LLAH'
+U+004C U+004C U+0048 > U+FDF2 ;; 'LLH' -> 'l l h'
+U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH'
+U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+0644 U+0644 U+0647 ; 'ALLAH'
+U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
@@ -145,8 +140,8 @@ U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
+;; This is to enclose digits within glyph U+06DD
+U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+06DD @dig ; [[digits]]
; vowels
@@ -427,7 +422,7 @@ UL i > U+0656 ; subscript alif
Q AN / (A H|Ha) _ > ;
AN / (A H|Ha) _ > U+064B
Q AN > U+0627
-AN > U+0627 U+064B
+AN > U+064B U+0627
Q a >
a > U+064E
Q A > U+0627
@@ -473,4 +468,5 @@ Class [CONS] = (U+0621 U+0623 U+0624 U+0626 U+0628 U+062A..U+063A U+0641..U+0647
Class [VWLX] = (U+0627 U+0648..U+065E U+0670) ; long vowels, vowel signs, shadda, sukun etc.
Class [VWL] = (U+0627 U+0648..U+0650 U+0670);
U+0627 [VWL]? / [VWL] Z _ > U+0627 ; e.g. fa-isti_hraj -> initial alif has no vowel
+U+FDF2 > U+0644 U+0644 U+0647 ;
Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-maghribi-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-maghribi-voc.tec
new file mode 100644
index 00000000000..3b3356de03d
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-maghribi-voc.tec
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-malay-fullvoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-malay-fullvoc.map
index c1cf78a23a2..2dc9728dac9 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-malay-fullvoc.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-malay-fullvoc.map
@@ -50,7 +50,7 @@ Define Q U+0022 ;" << QUOTE
Define Z U+002D ;- << HYPHEN
Define BAR U+007C ;|
Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
+Define LLAH U+006C U+006C U+005F U+0061 U+0068 ; ll_ah
;Define NUL U+00A6;
Define Ha U+0623
Define Hi U+0625
@@ -87,20 +87,15 @@ Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
; special ligatures
;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
+;; FDF2 is just used as temporary holder, and is converted back to ligature lam lam hah later (to be taken care of by the font)
;; The BAR is used in the DMG transliteration to suppress the initial A
(a|A) BAR? l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+FDF2 ;; 'll_ah' > U+FDF2
+LLAH > U+FDF2 ;; 'll_ah' -> 'l l h'
;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
- U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+FDF2 ; 'ALLAH'
- U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'LLAH'
+U+004C U+004C U+0048 > U+FDF2 ;; 'LLH' -> 'l l h'
+U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH'
+U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+0644 U+0644 U+0647 ; 'ALLAH'
+U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
@@ -145,8 +140,8 @@ U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
+;; This is to enclose digits within glyph U+06DD
+U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+06DD @dig ; [[digits]]
; vowels
@@ -432,7 +427,7 @@ UL i > U+0650;
Q AN / (A H|Ha) _ > ;
AN / (A H|Ha) _ > U+064B
Q AN > U+0627
-AN > U+0627 U+064B
+AN > U+064B U+0627
Q a >
a > U+064E
Q A > U+0627
@@ -481,5 +476,6 @@ U+064E (U+064A|U+0648)=hc / _ (^[VWLX]|#) > U+064E @hc U+0652 ; ay and aw diphto
U+0627 / # _ U+0644 > U+0627 U+064E ; otherwise initial alif takes fatha
[CONS]=k1 / _ ([CONS]|#) > @k1 U+0652 ; consonant + (consonant or final)
;; [CONS]=k1 / _ # > @k1 U+0652 ; final consonant
+U+FDF2 > U+0644 U+0644 U+0647 ;
Q > ;
Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-malay-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-malay-fullvoc.tec
new file mode 100644
index 00000000000..35e99304173
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-malay-fullvoc.tec
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-malay-novoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-malay-novoc.map
index 7e4076dd309..6566602c1a8 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-malay-novoc.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-malay-novoc.map
@@ -50,7 +50,7 @@ Define Q U+0022 ;" << QUOTE
Define Z U+002D ;- << HYPHEN
Define BAR U+007C ;|
Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
+Define LLAH U+006C U+006C U+005F U+0061 U+0068 ; ll_ah
;Define NUL U+00A6;
Define Ha U+0623
Define Hi U+0625
@@ -87,20 +87,15 @@ Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
; special ligatures
;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
+;; FDF2 is just used as temporary holder, and is converted back to ligature lam lam hah later (to be taken care of by the font)
;; The BAR is used in the DMG transliteration to suppress the initial A
(a|A) BAR? l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+FDF2 ;; 'll_ah' > U+FDF2
+LLAH > U+FDF2 ;; 'll_ah' -> 'l l h'
;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
- U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+FDF2 ; 'ALLAH'
- U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'LLAH'
+U+004C U+004C U+0048 > U+FDF2 ;; 'LLH' -> 'l l h'
+U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH'
+U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+0644 U+0644 U+0647 ; 'ALLAH'
+U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
@@ -145,8 +140,8 @@ U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
+;; This is to enclose digits within glyph U+06DD
+U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+06DD @dig ; [[digits]]
; vowels
@@ -427,7 +422,7 @@ UL u > ;
UL i > ;
Q AN / (A H|Ha) _ > U+064B
AN / (A H|Ha) _ > ;
-Q AN > U+0627 U+064B
+Q AN > U+064B U+0627
AN > U+0627
Q a > U+064E
Q A > U+064E U+0627
@@ -468,3 +463,4 @@ C > ;^
Z > ;-
BAR > ;|
+U+FDF2 > U+0644 U+0644 U+0647 ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-malay-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-malay-novoc.tec
new file mode 100644
index 00000000000..4430c39ac2f
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-malay-novoc.tec
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-malay-voc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-malay-voc.map
index 6f0f56dd139..610f8ae21cc 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-malay-voc.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-malay-voc.map
@@ -50,7 +50,7 @@ Define Q U+0022 ;" << QUOTE
Define Z U+002D ;- << HYPHEN
Define BAR U+007C ;|
Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
+Define LLAH U+006C U+006C U+005F U+0061 U+0068 ; ll_ah
;Define NUL U+00A6;
Define Ha U+0623
Define Hi U+0625
@@ -87,20 +87,15 @@ Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
; special ligatures
;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
+;; FDF2 is just used as temporary holder, and is converted back to ligature lam lam hah later (to be taken care of by the font)
;; The BAR is used in the DMG transliteration to suppress the initial A
(a|A) BAR? l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+FDF2 ;; 'll_ah' > U+FDF2
+LLAH > U+FDF2 ;; 'll_ah' -> 'l l h'
;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
- U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+FDF2 ; 'ALLAH'
- U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'LLAH'
+U+004C U+004C U+0048 > U+FDF2 ;; 'LLH' -> 'l l h'
+U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH'
+U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+0644 U+0644 U+0647 ; 'ALLAH'
+U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
@@ -145,8 +140,8 @@ U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
+;; This is to enclose digits within glyph U+06DD
+U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+06DD @dig ; [[digits]]
; vowels
@@ -432,7 +427,7 @@ UL i > U+0650;
Q AN / (A H|Ha) _ > ;
AN / (A H|Ha) _ > U+064B
Q AN > U+0627
-AN > U+0627 U+064B
+AN > U+064B U+0627
Q a >
a > U+064E
Q A > U+0627
@@ -477,4 +472,5 @@ pass(Unicode)
Class [CONS] = (U+0621 U+0623 U+0624 U+0626 U+0628 U+062A..U+063A U+0641..U+0647 U+066E U+066F U+0672 U+0675 U+0676 U+0678..U+06BF U+06EE U+06EF U+06FA..U+06FF U+0750..U+076D) ; to be improved: not sure that all glyphs listed (esp for Urdu,Sindhi,etc are really "consonants" in the sense that they can carry a sukun, not to mention that some of these languages may not have a sukun at all ;-)
Class [VWLX] = (U+0627 U+0648..U+065E U+0670) ; long vowels, vowel signs, shadda, sukun etc.
Class [VWL] = (U+0627 U+0648..U+0650 U+0670);
+U+FDF2 > U+0644 U+0644 U+0647 ;
Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-malay-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-malay-voc.tec
new file mode 100644
index 00000000000..09744fcce1d
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-malay-voc.tec
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-novoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-novoc.map
index 027f959c45f..da2ed9b9ce3 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-novoc.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-novoc.map
@@ -50,7 +50,7 @@ Define Q U+0022 ;" << QUOTE
Define Z U+002D ;- << HYPHEN
Define BAR U+007C ;|
Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
+Define LLAH U+006C U+006C U+005F U+0061 U+0068 ; ll_ah
;Define NUL U+00A6;
Define Ha U+0623
Define Hi U+0625
@@ -87,20 +87,15 @@ Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
; special ligatures
;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
+;; FDF2 is just used as temporary holder, and is converted back to ligature lam lam hah later (to be taken care of by the font)
;; The BAR is used in the DMG transliteration to suppress the initial A
(a|A) BAR? l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+FDF2 ;; 'll_ah' > U+FDF2
+LLAH > U+FDF2 ;; 'll_ah' -> 'l l h'
;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
- U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+FDF2 ; 'ALLAH'
- U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'LLAH'
+U+004C U+004C U+0048 > U+FDF2 ;; 'LLH' -> 'l l h'
+U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH'
+U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+0644 U+0644 U+0647 ; 'ALLAH'
+U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
@@ -145,8 +140,8 @@ U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
+;; This is to enclose digits within glyph U+06DD
+U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+06DD @dig ; [[digits]]
; vowels
@@ -422,7 +417,7 @@ UL u > U+0657 ; inverted damma
UL i > U+0656 ; subscript alif
Q AN / (A H|Ha) _ > U+064B
AN / (A H|Ha) _ > ;
-Q AN > U+0627 U+064B
+Q AN > U+064B U+0627
AN > U+0627
Q a > U+064E
Q A > U+064E U+0627
@@ -463,3 +458,4 @@ C > ;^
Z > ;-
BAR > ;|
+U+FDF2 > U+0644 U+0644 U+0647 ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-novoc.tec
new file mode 100644
index 00000000000..e3b19841c5d
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-novoc.tec
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-pashto-fullvoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-pashto-fullvoc.map
index 0b1057d5908..15bbdb6090c 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-pashto-fullvoc.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-pashto-fullvoc.map
@@ -50,7 +50,7 @@ Define Q U+0022 ;" << QUOTE
Define Z U+002D ;- << HYPHEN
Define BAR U+007C ;|
Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
+Define LLAH U+006C U+006C U+005F U+0061 U+0068 ; ll_ah
;Define NUL U+00A6;
Define Ha U+0623
Define Hi U+0625
@@ -87,20 +87,15 @@ Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
; special ligatures
;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
+;; FDF2 is just used as temporary holder, and is converted back to ligature lam lam hah later (to be taken care of by the font)
;; The BAR is used in the DMG transliteration to suppress the initial A
(a|A) BAR? l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+FDF2 ;; 'll_ah' > U+FDF2
+LLAH > U+FDF2 ;; 'll_ah' -> 'l l h'
;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
- U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+FDF2 ; 'ALLAH'
- U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'LLAH'
+U+004C U+004C U+0048 > U+FDF2 ;; 'LLH' -> 'l l h'
+U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH'
+U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+0644 U+0644 U+0647 ; 'ALLAH'
+U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
@@ -145,8 +140,8 @@ U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
+;; This is to enclose digits within glyph U+06DD
+U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+06DD @dig ; [[digits]]
; vowels
@@ -438,7 +433,7 @@ UL i > U+0650;
Q AN / (A H|Ha) _ > ;
AN / (A H|Ha) _ > U+064B
Q AN > U+0627
-AN > U+0627 U+064B
+AN > U+064B U+0627
Q a >
a > U+064E
Q A > U+0627
@@ -487,5 +482,6 @@ U+064E (U+064A|U+0648)=hc / _ (^[VWLX]|#) > U+064E @hc U+0652 ; ay and aw diphto
U+0627 / # _ U+0644 > U+0627 U+064E ; otherwise initial alif takes fatha
[CONS]=k1 / _ ([CONS]|#) > @k1 U+0652 ; consonant + (consonant or final)
;; [CONS]=k1 / _ # > @k1 U+0652 ; final consonant
+U+FDF2 > U+0644 U+0644 U+0647 ;
Q > ;
Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-pashto-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-pashto-fullvoc.tec
new file mode 100644
index 00000000000..f9962a69912
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-pashto-fullvoc.tec
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-pashto-novoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-pashto-novoc.map
index a3588c87c53..4627fad14ac 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-pashto-novoc.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-pashto-novoc.map
@@ -50,7 +50,7 @@ Define Q U+0022 ;" << QUOTE
Define Z U+002D ;- << HYPHEN
Define BAR U+007C ;|
Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
+Define LLAH U+006C U+006C U+005F U+0061 U+0068 ; ll_ah
;Define NUL U+00A6;
Define Ha U+0623
Define Hi U+0625
@@ -87,20 +87,15 @@ Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
; special ligatures
;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
+;; FDF2 is just used as temporary holder, and is converted back to ligature lam lam hah later (to be taken care of by the font)
;; The BAR is used in the DMG transliteration to suppress the initial A
(a|A) BAR? l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+FDF2 ;; 'll_ah' > U+FDF2
+LLAH > U+FDF2 ;; 'll_ah' -> 'l l h'
;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
- U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+FDF2 ; 'ALLAH'
- U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'LLAH'
+U+004C U+004C U+0048 > U+FDF2 ;; 'LLH' -> 'l l h'
+U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH'
+U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+0644 U+0644 U+0647 ; 'ALLAH'
+U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
@@ -145,8 +140,8 @@ U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
+;; This is to enclose digits within glyph U+06DD
+U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+06DD @dig ; [[digits]]
; vowels
@@ -433,7 +428,7 @@ UL u > ;
UL i > ;
Q AN / (A H|Ha) _ > U+064B
AN / (A H|Ha) _ > ;
-Q AN > U+0627 U+064B
+Q AN > U+064B U+0627
AN > U+0627
Q a > U+064E
Q A > U+064E U+0627
@@ -474,3 +469,4 @@ C > ;^
Z > ;-
BAR > ;|
+U+FDF2 > U+0644 U+0644 U+0647 ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-pashto-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-pashto-novoc.tec
new file mode 100644
index 00000000000..d78fc1dc9d5
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-pashto-novoc.tec
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-pashto-voc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-pashto-voc.map
index e76a8ec86d1..cf1b57075bd 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-pashto-voc.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-pashto-voc.map
@@ -50,7 +50,7 @@ Define Q U+0022 ;" << QUOTE
Define Z U+002D ;- << HYPHEN
Define BAR U+007C ;|
Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
+Define LLAH U+006C U+006C U+005F U+0061 U+0068 ; ll_ah
;Define NUL U+00A6;
Define Ha U+0623
Define Hi U+0625
@@ -87,20 +87,15 @@ Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
; special ligatures
;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
+;; FDF2 is just used as temporary holder, and is converted back to ligature lam lam hah later (to be taken care of by the font)
;; The BAR is used in the DMG transliteration to suppress the initial A
(a|A) BAR? l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+FDF2 ;; 'll_ah' > U+FDF2
+LLAH > U+FDF2 ;; 'll_ah' -> 'l l h'
;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
- U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+FDF2 ; 'ALLAH'
- U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'LLAH'
+U+004C U+004C U+0048 > U+FDF2 ;; 'LLH' -> 'l l h'
+U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH'
+U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+0644 U+0644 U+0647 ; 'ALLAH'
+U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
@@ -145,8 +140,8 @@ U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
+;; This is to enclose digits within glyph U+06DD
+U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+06DD @dig ; [[digits]]
; vowels
@@ -438,7 +433,7 @@ UL i > U+0650;
Q AN / (A H|Ha) _ > ;
AN / (A H|Ha) _ > U+064B
Q AN > U+0627
-AN > U+0627 U+064B
+AN > U+064B U+0627
Q a >
a > U+064E
Q A > U+0627
@@ -483,4 +478,5 @@ pass(Unicode)
Class [CONS] = (U+0621 U+0623 U+0624 U+0626 U+0628 U+062A..U+063A U+0641..U+0647 U+066E U+066F U+0672 U+0675 U+0676 U+0678..U+06BF U+06EE U+06EF U+06FA..U+06FF U+0750..U+076D) ; to be improved: not sure that all glyphs listed (esp for Urdu,Sindhi,etc are really "consonants" in the sense that they can carry a sukun, not to mention that some of these languages may not have a sukun at all ;-)
Class [VWLX] = (U+0627 U+0648..U+065E U+0670) ; long vowels, vowel signs, shadda, sukun etc.
Class [VWL] = (U+0627 U+0648..U+0650 U+0670);
+U+FDF2 > U+0644 U+0644 U+0647 ;
Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-pashto-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-pashto-voc.tec
new file mode 100644
index 00000000000..2037a598246
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-pashto-voc.tec
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-sindhi-fullvoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-sindhi-fullvoc.map
index 8c9fbcc7722..74298ab8bb1 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-sindhi-fullvoc.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-sindhi-fullvoc.map
@@ -50,7 +50,7 @@ Define Q U+0022 ;" << QUOTE
Define Z U+002D ;- << HYPHEN
Define BAR U+007C ;|
Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
+Define LLAH U+006C U+006C U+005F U+0061 U+0068 ; ll_ah
;Define NUL U+00A6;
Define Ha U+0623
Define Hi U+0625
@@ -87,20 +87,15 @@ Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
; special ligatures
;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
+;; FDF2 is just used as temporary holder, and is converted back to ligature lam lam hah later (to be taken care of by the font)
;; The BAR is used in the DMG transliteration to suppress the initial A
(a|A) BAR? l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+FDF2 ;; 'll_ah' > U+FDF2
+LLAH > U+FDF2 ;; 'll_ah' -> 'l l h'
;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
- U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+FDF2 ; 'ALLAH'
- U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'LLAH'
+U+004C U+004C U+0048 > U+FDF2 ;; 'LLH' -> 'l l h'
+U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH'
+U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+0644 U+0644 U+0647 ; 'ALLAH'
+U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
@@ -145,8 +140,8 @@ U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
+;; This is to enclose digits within glyph U+06DD
+U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+06DD @dig ; [[digits]]
; vowels
@@ -408,7 +403,7 @@ UL i > U+0650;
Q AN / (A H|Ha) _ > ;
AN / (A H|Ha) _ > U+064B
Q AN > U+0627
-AN > U+0627 U+064B
+AN > U+064B U+0627
Q a >
a > U+064E
Q A > U+0627
@@ -457,5 +452,6 @@ U+064E (U+064A|U+0648)=hc / _ (^[VWLX]|#) > U+064E @hc U+0652 ; ay and aw diphto
U+0627 / # _ U+0644 > U+0627 U+064E ; otherwise initial alif takes fatha
[CONS]=k1 / _ ([CONS]|#) > @k1 U+0652 ; consonant + (consonant or final)
;; [CONS]=k1 / _ # > @k1 U+0652 ; final consonant
+U+FDF2 > U+0644 U+0644 U+0647 ;
Q > ;
Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-sindhi-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-sindhi-fullvoc.tec
new file mode 100644
index 00000000000..7381d6ff85f
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-sindhi-fullvoc.tec
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-sindhi-novoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-sindhi-novoc.map
index 4e03d67e8cf..e1cf47ef662 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-sindhi-novoc.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-sindhi-novoc.map
@@ -50,7 +50,7 @@ Define Q U+0022 ;" << QUOTE
Define Z U+002D ;- << HYPHEN
Define BAR U+007C ;|
Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
+Define LLAH U+006C U+006C U+005F U+0061 U+0068 ; ll_ah
;Define NUL U+00A6;
Define Ha U+0623
Define Hi U+0625
@@ -87,20 +87,15 @@ Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
; special ligatures
;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
+;; FDF2 is just used as temporary holder, and is converted back to ligature lam lam hah later (to be taken care of by the font)
;; The BAR is used in the DMG transliteration to suppress the initial A
(a|A) BAR? l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+FDF2 ;; 'll_ah' > U+FDF2
+LLAH > U+FDF2 ;; 'll_ah' -> 'l l h'
;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
- U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+FDF2 ; 'ALLAH'
- U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'LLAH'
+U+004C U+004C U+0048 > U+FDF2 ;; 'LLH' -> 'l l h'
+U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH'
+U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+0644 U+0644 U+0647 ; 'ALLAH'
+U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
@@ -145,8 +140,8 @@ U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
+;; This is to enclose digits within glyph U+06DD
+U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+06DD @dig ; [[digits]]
; vowels
@@ -403,7 +398,7 @@ UL u > ;
UL i > ;
Q AN / (A H|Ha) _ > U+064B
AN / (A H|Ha) _ > ;
-Q AN > U+0627 U+064B
+Q AN > U+064B U+0627
AN > U+0627
Q a > U+064E
Q A > U+064E U+0627
@@ -444,3 +439,4 @@ C > ;^
Z > ;-
BAR > ;|
+U+FDF2 > U+0644 U+0644 U+0647 ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-sindhi-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-sindhi-novoc.tec
new file mode 100644
index 00000000000..ac4885e4edb
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-sindhi-novoc.tec
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-sindhi-voc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-sindhi-voc.map
index 7acfe951345..7d9d2b27280 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-sindhi-voc.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-sindhi-voc.map
@@ -50,7 +50,7 @@ Define Q U+0022 ;" << QUOTE
Define Z U+002D ;- << HYPHEN
Define BAR U+007C ;|
Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
+Define LLAH U+006C U+006C U+005F U+0061 U+0068 ; ll_ah
;Define NUL U+00A6;
Define Ha U+0623
Define Hi U+0625
@@ -87,20 +87,15 @@ Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
; special ligatures
;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
+;; FDF2 is just used as temporary holder, and is converted back to ligature lam lam hah later (to be taken care of by the font)
;; The BAR is used in the DMG transliteration to suppress the initial A
(a|A) BAR? l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+FDF2 ;; 'll_ah' > U+FDF2
+LLAH > U+FDF2 ;; 'll_ah' -> 'l l h'
;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
- U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+FDF2 ; 'ALLAH'
- U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'LLAH'
+U+004C U+004C U+0048 > U+FDF2 ;; 'LLH' -> 'l l h'
+U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH'
+U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+0644 U+0644 U+0647 ; 'ALLAH'
+U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
@@ -145,8 +140,8 @@ U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
+;; This is to enclose digits within glyph U+06DD
+U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+06DD @dig ; [[digits]]
; vowels
@@ -408,7 +403,7 @@ UL i > U+0650;
Q AN / (A H|Ha) _ > ;
AN / (A H|Ha) _ > U+064B
Q AN > U+0627
-AN > U+0627 U+064B
+AN > U+064B U+0627
Q a >
a > U+064E
Q A > U+0627
@@ -453,4 +448,5 @@ pass(Unicode)
Class [CONS] = (U+0621 U+0623 U+0624 U+0626 U+0628 U+062A..U+063A U+0641..U+0647 U+066E U+066F U+0672 U+0675 U+0676 U+0678..U+06BF U+06EE U+06EF U+06FA..U+06FF U+0750..U+076D) ; to be improved: not sure that all glyphs listed (esp for Urdu,Sindhi,etc are really "consonants" in the sense that they can carry a sukun, not to mention that some of these languages may not have a sukun at all ;-)
Class [VWLX] = (U+0627 U+0648..U+065E U+0670) ; long vowels, vowel signs, shadda, sukun etc.
Class [VWL] = (U+0627 U+0648..U+0650 U+0670);
+U+FDF2 > U+0644 U+0644 U+0647 ;
Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-sindhi-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-sindhi-voc.tec
new file mode 100644
index 00000000000..d86baa6c769
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-sindhi-voc.tec
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-turk-fullvoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-turk-fullvoc.map
index 62aa619b8e9..1c29e15bfc1 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-turk-fullvoc.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-turk-fullvoc.map
@@ -50,7 +50,7 @@ Define Q U+0022 ;" << QUOTE
Define Z U+002D ;- << HYPHEN
Define BAR U+007C ;|
Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
+Define LLAH U+006C U+006C U+005F U+0061 U+0068 ; ll_ah
;Define NUL U+00A6;
Define Ha U+0623
Define Hi U+0625
@@ -87,20 +87,15 @@ Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
; special ligatures
;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
+;; FDF2 is just used as temporary holder, and is converted back to ligature lam lam hah later (to be taken care of by the font)
;; The BAR is used in the DMG transliteration to suppress the initial A
(a|A) BAR? l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+FDF2 ;; 'll_ah' > U+FDF2
+LLAH > U+FDF2 ;; 'll_ah' -> 'l l h'
;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
- U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+FDF2 ; 'ALLAH'
- U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'LLAH'
+U+004C U+004C U+0048 > U+FDF2 ;; 'LLH' -> 'l l h'
+U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH'
+U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+0644 U+0644 U+0647 ; 'ALLAH'
+U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
@@ -145,8 +140,8 @@ U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
+;; This is to enclose digits within glyph U+06DD
+U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+06DD @dig ; [[digits]]
; vowels
@@ -432,7 +427,7 @@ UL i > U+0650;
Q AN / (A H|Ha) _ > ;
AN / (A H|Ha) _ > U+064B
Q AN > U+0627
-AN > U+0627 U+064B
+AN > U+064B U+0627
Q a >
a > U+064E
Q A > U+0627
@@ -481,5 +476,6 @@ U+064E (U+064A|U+0648)=hc / _ (^[VWLX]|#) > U+064E @hc U+0652 ; ay and aw diphto
U+0627 / # _ U+0644 > U+0627 U+064E ; otherwise initial alif takes fatha
[CONS]=k1 / _ ([CONS]|#) > @k1 U+0652 ; consonant + (consonant or final)
;; [CONS]=k1 / _ # > @k1 U+0652 ; final consonant
+U+FDF2 > U+0644 U+0644 U+0647 ;
Q > ;
Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-turk-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-turk-fullvoc.tec
new file mode 100644
index 00000000000..73bbab84ef7
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-turk-fullvoc.tec
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-turk-novoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-turk-novoc.map
index 824eab5c57d..727f3224048 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-turk-novoc.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-turk-novoc.map
@@ -50,7 +50,7 @@ Define Q U+0022 ;" << QUOTE
Define Z U+002D ;- << HYPHEN
Define BAR U+007C ;|
Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
+Define LLAH U+006C U+006C U+005F U+0061 U+0068 ; ll_ah
;Define NUL U+00A6;
Define Ha U+0623
Define Hi U+0625
@@ -87,20 +87,15 @@ Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
; special ligatures
;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
+;; FDF2 is just used as temporary holder, and is converted back to ligature lam lam hah later (to be taken care of by the font)
;; The BAR is used in the DMG transliteration to suppress the initial A
(a|A) BAR? l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+FDF2 ;; 'll_ah' > U+FDF2
+LLAH > U+FDF2 ;; 'll_ah' -> 'l l h'
;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
- U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+FDF2 ; 'ALLAH'
- U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'LLAH'
+U+004C U+004C U+0048 > U+FDF2 ;; 'LLH' -> 'l l h'
+U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH'
+U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+0644 U+0644 U+0647 ; 'ALLAH'
+U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
@@ -145,8 +140,8 @@ U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
+;; This is to enclose digits within glyph U+06DD
+U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+06DD @dig ; [[digits]]
; vowels
@@ -427,7 +422,7 @@ UL u > ;
UL i > ;
Q AN / (A H|Ha) _ > U+064B
AN / (A H|Ha) _ > ;
-Q AN > U+0627 U+064B
+Q AN > U+064B U+0627
AN > U+0627
Q a > U+064E
Q A > U+064E U+0627
@@ -468,3 +463,4 @@ C > ;^
Z > ;-
BAR > ;|
+U+FDF2 > U+0644 U+0644 U+0647 ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-turk-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-turk-novoc.tec
new file mode 100644
index 00000000000..b624d81122e
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-turk-novoc.tec
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-turk-voc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-turk-voc.map
index 60c1d10e045..8d41171c70e 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-turk-voc.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-turk-voc.map
@@ -50,7 +50,7 @@ Define Q U+0022 ;" << QUOTE
Define Z U+002D ;- << HYPHEN
Define BAR U+007C ;|
Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
+Define LLAH U+006C U+006C U+005F U+0061 U+0068 ; ll_ah
;Define NUL U+00A6;
Define Ha U+0623
Define Hi U+0625
@@ -87,20 +87,15 @@ Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
; special ligatures
;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
+;; FDF2 is just used as temporary holder, and is converted back to ligature lam lam hah later (to be taken care of by the font)
;; The BAR is used in the DMG transliteration to suppress the initial A
(a|A) BAR? l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+FDF2 ;; 'll_ah' > U+FDF2
+LLAH > U+FDF2 ;; 'll_ah' -> 'l l h'
;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
- U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+FDF2 ; 'ALLAH'
- U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'LLAH'
+U+004C U+004C U+0048 > U+FDF2 ;; 'LLH' -> 'l l h'
+U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH'
+U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+0644 U+0644 U+0647 ; 'ALLAH'
+U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
@@ -145,8 +140,8 @@ U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
+;; This is to enclose digits within glyph U+06DD
+U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+06DD @dig ; [[digits]]
; vowels
@@ -432,7 +427,7 @@ UL i > U+0650;
Q AN / (A H|Ha) _ > ;
AN / (A H|Ha) _ > U+064B
Q AN > U+0627
-AN > U+0627 U+064B
+AN > U+064B U+0627
Q a >
a > U+064E
Q A > U+0627
@@ -477,4 +472,5 @@ pass(Unicode)
Class [CONS] = (U+0621 U+0623 U+0624 U+0626 U+0628 U+062A..U+063A U+0641..U+0647 U+066E U+066F U+0672 U+0675 U+0676 U+0678..U+06BF U+06EE U+06EF U+06FA..U+06FF U+0750..U+076D) ; to be improved: not sure that all glyphs listed (esp for Urdu,Sindhi,etc are really "consonants" in the sense that they can carry a sukun, not to mention that some of these languages may not have a sukun at all ;-)
Class [VWLX] = (U+0627 U+0648..U+065E U+0670) ; long vowels, vowel signs, shadda, sukun etc.
Class [VWL] = (U+0627 U+0648..U+0650 U+0670);
+U+FDF2 > U+0644 U+0644 U+0647 ;
Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-turk-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-turk-voc.tec
new file mode 100644
index 00000000000..2ba125e3b92
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-turk-voc.tec
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-uighur.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-uighur.map
index 11c28abd2bc..a1025dc974c 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-uighur.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-uighur.map
@@ -57,18 +57,12 @@ Class [ArDigits] = (U+0660..U+0669)
; special ligatures
;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
-(a|A) l Z LLAH > U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
+(a|A) l Z LLAH > U+0627 U+0644 U+0644 U+0647 ;; 'al-ll_ah' or 'Al-ll_ah'
LLAH > U+0644 U+0644 U+0647 ;; 'll_ah' -> 'l l h'
;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
-U+0041 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'ALLAH'
+U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH'
+U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+0644 U+0644 U+0647 ; 'ALLAH'
U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
@@ -102,8 +96,8 @@ U+0053 U+0041 U+004A U+0044 U+0041 > U+06E9 ;; SAJDA
U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
+;; This is to enclose digits within glyph U+06DD
+U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+06DD @dig ; [[digits]]
; vowels
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-uighur.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-uighur.tec
new file mode 100644
index 00000000000..54df2963345
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-uighur.tec
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-urdu-fullvoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-urdu-fullvoc.map
index 6dcb6cec050..e5b13384734 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-urdu-fullvoc.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-urdu-fullvoc.map
@@ -50,7 +50,7 @@ Define Q U+0022 ;" << QUOTE
Define Z U+002D ;- << HYPHEN
Define BAR U+007C ;|
Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
+Define LLAH U+006C U+006C U+005F U+0061 U+0068 ; ll_ah
;Define NUL U+00A6;
Define Ha U+0623
Define Hi U+0625
@@ -87,20 +87,15 @@ Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
; special ligatures
;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
+;; FDF2 is just used as temporary holder, and is converted back to ligature lam lam hah later (to be taken care of by the font)
;; The BAR is used in the DMG transliteration to suppress the initial A
(a|A) BAR? l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+FDF2 ;; 'll_ah' > U+FDF2
+LLAH > U+FDF2 ;; 'll_ah' -> 'l l h'
;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
- U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+FDF2 ; 'ALLAH'
- U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'LLAH'
+U+004C U+004C U+0048 > U+FDF2 ;; 'LLH' -> 'l l h'
+U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH'
+U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+0644 U+0644 U+0647 ; 'ALLAH'
+U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
@@ -145,8 +140,8 @@ U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
+;; This is to enclose digits within glyph U+06DD
+U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+06DD @dig ; [[digits]]
; vowels
@@ -445,7 +440,7 @@ UL i > U+0650;
Q AN / (A H|Ha) _ > ;
AN / (A H|Ha) _ > U+064B
Q AN > U+0627
-AN > U+0627 U+064B
+AN > U+064B U+0627
Q a >
a > U+064E
Q A > U+0627
@@ -495,5 +490,6 @@ U+064E (U+064A|U+0648)=hc / _ (^[VWLX]|#) > U+064E @hc U+0652 ; ay and aw diphto
U+0627 / # _ U+0644 > U+0627 U+064E ; otherwise initial alif takes fatha
[CONS]=k1 / _ ([CONS]|#) > @k1 U+0652 ; consonant + (consonant or final)
;; [CONS]=k1 / _ # > @k1 U+0652 ; final consonant
+U+FDF2 > U+0644 U+0644 U+0647 ;
Q > ;
Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-urdu-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-urdu-fullvoc.tec
new file mode 100644
index 00000000000..596a5571ecc
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-urdu-fullvoc.tec
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-urdu-novoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-urdu-novoc.map
index e606cd8bcce..f4b1fb4a420 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-urdu-novoc.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-urdu-novoc.map
@@ -50,7 +50,7 @@ Define Q U+0022 ;" << QUOTE
Define Z U+002D ;- << HYPHEN
Define BAR U+007C ;|
Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
+Define LLAH U+006C U+006C U+005F U+0061 U+0068 ; ll_ah
;Define NUL U+00A6;
Define Ha U+0623
Define Hi U+0625
@@ -87,20 +87,15 @@ Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
; special ligatures
;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
+;; FDF2 is just used as temporary holder, and is converted back to ligature lam lam hah later (to be taken care of by the font)
;; The BAR is used in the DMG transliteration to suppress the initial A
(a|A) BAR? l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+FDF2 ;; 'll_ah' > U+FDF2
+LLAH > U+FDF2 ;; 'll_ah' -> 'l l h'
;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
- U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+FDF2 ; 'ALLAH'
- U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'LLAH'
+U+004C U+004C U+0048 > U+FDF2 ;; 'LLH' -> 'l l h'
+U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH'
+U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+0644 U+0644 U+0647 ; 'ALLAH'
+U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
@@ -145,8 +140,8 @@ U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
+;; This is to enclose digits within glyph U+06DD
+U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+06DD @dig ; [[digits]]
; vowels
@@ -440,7 +435,7 @@ UL u > ;
UL i > ;
Q AN / (A H|Ha) _ > U+064B
AN / (A H|Ha) _ > ;
-Q AN > U+0627 U+064B
+Q AN > U+064B U+0627
AN > U+0627
Q a > U+064E
Q A > U+064E U+0627
@@ -482,3 +477,4 @@ Z > ;-
BAR > ;|
P P > U+06D4 ; urdu full stop << check
+U+FDF2 > U+0644 U+0644 U+0647 ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-urdu-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-urdu-novoc.tec
new file mode 100644
index 00000000000..a7b5a04d586
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-urdu-novoc.tec
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-urdu-voc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-urdu-voc.map
index 0a6c00808a0..74de2bc9794 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-urdu-voc.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-urdu-voc.map
@@ -50,7 +50,7 @@ Define Q U+0022 ;" << QUOTE
Define Z U+002D ;- << HYPHEN
Define BAR U+007C ;|
Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
+Define LLAH U+006C U+006C U+005F U+0061 U+0068 ; ll_ah
;Define NUL U+00A6;
Define Ha U+0623
Define Hi U+0625
@@ -87,20 +87,15 @@ Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
; special ligatures
;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
+;; FDF2 is just used as temporary holder, and is converted back to ligature lam lam hah later (to be taken care of by the font)
;; The BAR is used in the DMG transliteration to suppress the initial A
(a|A) BAR? l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+FDF2 ;; 'll_ah' > U+FDF2
+LLAH > U+FDF2 ;; 'll_ah' -> 'l l h'
;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
- U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+FDF2 ; 'ALLAH'
- U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'LLAH'
+U+004C U+004C U+0048 > U+FDF2 ;; 'LLH' -> 'l l h'
+U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH'
+U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+0644 U+0644 U+0647 ; 'ALLAH'
+U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
@@ -145,8 +140,8 @@ U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
+;; This is to enclose digits within glyph U+06DD
+U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+06DD @dig ; [[digits]]
; vowels
@@ -445,7 +440,7 @@ UL i > U+0650;
Q AN / (A H|Ha) _ > ;
AN / (A H|Ha) _ > U+064B
Q AN > U+0627
-AN > U+0627 U+064B
+AN > U+064B U+0627
Q a >
a > U+064E
Q A > U+0627
@@ -491,4 +486,5 @@ pass(Unicode)
Class [CONS] = (U+0621 U+0623 U+0624 U+0626 U+0628 U+062A..U+063A U+0641..U+0647 U+066E U+066F U+0672 U+0675 U+0676 U+0678..U+06BF U+06EE U+06EF U+06FA..U+06FF U+0750..U+076D) ; to be improved: not sure that all glyphs listed (esp for Urdu,Sindhi,etc are really "consonants" in the sense that they can carry a sukun, not to mention that some of these languages may not have a sukun at all ;-)
Class [VWLX] = (U+0627 U+0648..U+065E U+0670) ; long vowels, vowel signs, shadda, sukun etc.
Class [VWL] = (U+0627 U+0648..U+0650 U+0670);
+U+FDF2 > U+0644 U+0644 U+0647 ;
Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-urdu-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-urdu-voc.tec
new file mode 100644
index 00000000000..93aef573b5e
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-urdu-voc.tec
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-voc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-voc.map
index 2555ba6e924..989adb6228c 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-voc.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-voc.map
@@ -50,7 +50,7 @@ Define Q U+0022 ;" << QUOTE
Define Z U+002D ;- << HYPHEN
Define BAR U+007C ;|
Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
+Define LLAH U+006C U+006C U+005F U+0061 U+0068 ; ll_ah
;Define NUL U+00A6;
Define Ha U+0623
Define Hi U+0625
@@ -87,20 +87,15 @@ Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
; special ligatures
;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
+;; FDF2 is just used as temporary holder, and is converted back to ligature lam lam hah later (to be taken care of by the font)
;; The BAR is used in the DMG transliteration to suppress the initial A
(a|A) BAR? l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-LLAH > U+FDF2 ;; 'll_ah' > U+FDF2
+LLAH > U+FDF2 ;; 'll_ah' -> 'l l h'
;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
- U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+FDF2 ; 'ALLAH'
- U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'LLAH'
+U+004C U+004C U+0048 > U+FDF2 ;; 'LLH' -> 'l l h'
+U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH'
+U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+0644 U+0644 U+0647 ; 'ALLAH'
+U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
@@ -145,8 +140,8 @@ U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
+;; This is to enclose digits within glyph U+06DD
+U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+06DD @dig ; [[digits]]
; vowels
@@ -427,7 +422,7 @@ UL i > U+0656 ; subscript alif
Q AN / (A H|Ha) _ > ;
AN / (A H|Ha) _ > U+064B
Q AN > U+0627
-AN > U+0627 U+064B
+AN > U+064B U+0627
Q a >
a > U+064E
Q A > U+0627
@@ -473,4 +468,5 @@ Class [CONS] = (U+0621 U+0623 U+0624 U+0626 U+0628 U+062A..U+063A U+0641..U+0647
Class [VWLX] = (U+0627 U+0648..U+065E U+0670) ; long vowels, vowel signs, shadda, sukun etc.
Class [VWL] = (U+0627 U+0648..U+0650 U+0670);
U+0627 [VWL]? / [VWL] Z _ > U+0627 ; e.g. fa-isti_hraj -> initial alif has no vowel
+U+FDF2 > U+0644 U+0644 U+0647 ;
Z > ;
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-voc.tec
new file mode 100644
index 00000000000..9384beaaec7
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-voc.tec
Binary files differ
diff --git a/Master/texmf-dist/source/xelatex/arabxetex/arabtex-kurdish.maps b/Master/texmf-dist/source/xelatex/arabxetex/arabtex-kurdish.maps
deleted file mode 100644
index 75e4da0ebd0..00000000000
--- a/Master/texmf-dist/source/xelatex/arabxetex/arabtex-kurdish.maps
+++ /dev/null
@@ -1,294 +0,0 @@
-LHSName "ArabTeX-Kurdish"
-RHSName "UNICODE"
-
-Define a U+0061 ;a
-Define b U+0062 ;b
-Define c U+0063 ;c
-Define d U+0064 ;d
-Define e U+0065 ;e
-Define f U+0066 ;f
-Define g U+0067 ;g
-Define h U+0068 ;h
-Define i U+0069 ;i
-Define j U+006A ;j
-Define k U+006B ;k
-Define l U+006C ;l
-Define m U+006D ;m
-Define n U+006E ;n
-Define o U+006F ;o
-Define p U+0070 ;p
-Define q U+0071 ;q
-Define r U+0072 ;r
-Define s U+0073 ;s
-Define t U+0074 ;t
-Define u U+0075 ;u
-Define v U+0076 ;v
-Define w U+0077 ;w
-Define x U+0078 ;x
-Define y U+0079 ;y
-Define z U+007A ;z
-Define A U+0041 ;A
-Define B U+0042 ;B
-Define E U+0045 ;E
-Define G U+0047 ;G
-Define I U+0049 ;I
-Define N U+004E ;N
-Define O U+004F ;O
-Define T U+0054 ;T
-Define U U+0055 ;U
-Define Y U+0059 ;Y
-Define C U+005E ;^ << CARET
-Define UL U+005F ;_ << UNDERLINE
-Define P U+002E ;. << DOT
-Define V U+002C ;, << COMMA (_V_irgule)
-Define CO U+003A ;: << COLON
-Define Ain U+0060 ;`
-Define H U+0027 ;' << HAMZA
-Define Q U+0022 ;" << QUOTE
-Define Z U+002D ;- << HYPHEN
-Define BAR U+007C ;|
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
-
-pass(Unicode)
-
-Class [Digits] = (U+0030..U+0039)
-Class [ArDigits] = (U+0660..U+0669)
-
-
-; special ligatures
-;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
-#0 (a|A) l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-#1 (a|A) l Z LLAH > U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-#0 LLAH > U+FDF2 ;; 'll_ah' > U+FDF2
-#1 LLAH > U+0644 U+0644 U+0647 ;; 'll_ah' -> 'l l h'
-;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
-#0 U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+FDF2 ; 'ALLAH'
-#1 U+0041 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'ALLAH'
-#0 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'LLAH'
-#1 U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
-
-U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
-U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
-U+0029 U+0029 > U+FD3E ;; '))' : ornate left par
-U+0052 U+0049 U+0059 U+0041 U+004C > U+FDFC ;; 'RIYAL' : Saudi currency sign
-;; most fonts won't have the following ones:
-U+0053 U+0041 U+004C U+004C U+0041 U+0053 U+0054 U+004F U+0050 > U+FDF0 ;; 'SALLASTOP' (.sallY with "ye-barree", Quranic stop sign)
-U+0051 U+0041 U+004C U+0041 > U+FDF1 ;; 'QALA' : qalY with ye-barree, Quranic stop sign
-U+0041 U+004B U+0042 U+0041 U+0052 > U+FDF3 ;; 'AKBAR'
-U+004D U+0055 U+0048 U+0041 U+004D U+004D U+0041 U+0044 > U+FDF4 ;; 'MUHAMMAD'
-U+0053 U+0041 U+004C U+0041 U+004D > U+FDF5 ;; 'SALAM'
-U+0052 U+0041 U+0053 U+004F ? U+0055 U+004C > U+FDF6 ;; 'RASUL' (also unicode 'RASOUL)'
-U+0041 U+004C U+0041 U+0059 U+0048 (U+0049|U+0045) > U+FDF7 ;; 'ALAYHI' (also unicode 'ALAYHE)'
-U+0057 U+0041 U+0053 U+0041 U+004C U+004C U+0041 U+004D > U+FDF8 ;; 'WASALLAM'
-U+0053 U+0041 U+004C U+004C U+0041 > U+FDF9 ;; 'SALLA'
-U+004A U+0041 U+004C U+004C U+0041 > U+FDFB ;; 'JALLA' : "jalla jalAluhu"
-U+0042 U+0041 U+0053 U+004D U+0041 U+004C U+0041 > U+FDFD ;; 'BASMALA' : very few fonts have this ligature afaik
-
-U+005E U+0053 U+004C U+0059 > U+06D6 ;; ^SLY
-U+005E U+0051 U+004C U+0059 > U+06D7 ;; ^QLY
-U+005E U+004D U+0049 U+004D > U+06D8 ;; ^MIM-
-U+005E U+004C U+0041 > U+06D9 ;; ^LA
-U+005E U+004A U+0049 U+004D > U+06DA ;; ^JIM
-U+005E U+0044 U+004F U+0054 U+0053 > U+06DB ;; ^DOTS
-U+005E U+0053 U+0049 U+004E > U+06DC ;; ^SIN
-U+0048 U+0049 U+005A U+0042 > U+06DE ;; HIZB
-U+0043 U+0049 U+0052 U+0043 U+005A U+0045 U+0052 U+004F > U+06DF ;; CIRCZERO
-U+0052 U+0045 U+0043 U+0054 U+005A U+0045 U+0052 U+004F > U+06E0 ;; RECTZERO
-U+005E U+004A U+0041 U+005A U+004D > U+06E1 ;; ^JAZM
-U+005E U+004D U+0049 U+004D > U+06E2 ;; ^MIM
-U+005F U+0053 U+0049 U+004E > U+06E3 ;; _SIN
-U+005E U+004D U+0041 U+0044 U+0044 U+0041 > U+06E4 ;; ^MADDA
-U+0057 U+0041 U+0057 > U+06E5 ;; WAW
-U+0059 U+0045 U+0048 > U+06E6 ;; YEH
-U+005E U+0059 U+0045 U+0048 > U+06E7 ;; ^YEH
-U+005E U+004E U+0055 U+004E > U+06E8 ;; ^NUN
-U+0053 U+0041 U+004A U+0044 U+0041 > U+06E9 ;; SAJDA
-U+005F U+0053 U+0054 U+004F U+0050 > U+06EA ;; _STOP
-U+005E U+0053 U+0054 U+004F U+0050 > U+06EB ;; ^STOP
-U+005E U+0052 U+0053 U+0054 U+004F U+0050 > U+06EC ;; ^RSTOP
-U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
-
-U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
-
-
-; vowels
-
-E / # _ > U+0626 U+06CE
-E > U+06CE
-e / # _ > U+0626 U+0647 U+200C ; h always final
-e > U+0647 U+200C
-i / # _ > U+0626
-Q i > U+0650
-i > ;
-Q I / # _ > U+0626 U+064A U+0650
-Q I > U+064A U+0650
-I / # _ > U+0626 U+064A
-I > U+064A
-(a|A) / # _ > U+0626 U+0627
-(a|A) > U+0627
-(o|O) / # _ > U+0626 U+06C6
-(o|O) > U+06C6
-u / # _ > U+0626 U+0648
-u > U+0648
-U / # _ > U+0626 U+0648 U+0648
-U > U+0648 U+0648
-Ain e > U+0639 U+0647 U+200C
-
-
-P z P z > U+0638 U+0651 ;;SHADDA
-P z > U+0638
-C z C z > U+0698 U+0651 ;;SHADDA
-C z > U+0698
-V z V z > U+0696 U+0651 ;pashto ;;SHADDA
-V z > U+0696 ;pashto
-z z > U+0632 U+0651 ;;SHADDA
-z > U+0632
-Y Y > U+0649 U+0651 ;;SHADDA
-Y > U+0649
-w w > U+0648 U+0651 ;;SHADDA
-w > U+0648
-y y > U+064A U+0651 ;;SHADDA
-y > U+064A
-v v > U+06A4 U+0651 ;;SHADDA
-v > U+06A4
-V t V t > U+0679 U+0651 ; urdu ;;SHADDA
-V t > U+0679
-UL t UL t > U+062B U+0651 ;;SHADDA
-UL t > U+062B
-P t P t > U+0637 U+0651 ;;SHADDA
-P t > U+0637
-t t > U+062A U+0651 ;;SHADDA
-t > U+062A
-T T > U+0629 U+0651 ;;SHADDA
-T > U+0629
-(C|V) s (C|V) s > U+0634 U+0651 ;;SHADDA
-(C|V) s > U+0634
-P s P s > U+0635 U+0651 ;;SHADDA
-P s > U+0635
-CO s CO s > U+069B U+0651
-CO s > U+069B ; sin with 3 dots below
-s s > U+0633 U+0651 ;;SHADDA
-s > U+0633
-;; also missing U+0694 : r with dot below
-V r V r > U+0694 U+0651 ;Kurdish ;;SHADDA
-V r > U+0694
-C r C r > U+0692 U+0651 ;Kurdish ;;SHADDA ; missing in ArabTeX <<<
-C r > U+0692
-P r P r > U+0695 U+0651 ;Kurdish ;;SHADDA
-P r > U+0695
-r r > U+0631 U+0651 ;;SHADDA
-r > U+0631
-P q P q > U+066F U+0651 ;;SHADDA
-P q > U+066F
-q q > U+0642 U+0651 ;;SHADDA
-q > U+0642
-p p > U+067E U+0651 ;;SHADDA
-p > U+067E
-C n C n > U+06AD U+0651 ;;SHADDA
-C n > U+06AD
-P n P n > U+06BA U+0651 ; urdu ;;SHADDA
-P n > U+06BA ;
-V n V n > U+06BC U+0651 ; Pashto
-V n > U+06BC ; Pashto
-n n > U+0646 U+0651 ;;SHADDA
-n > U+0646
-m m > U+0645 U+0651 ;;SHADDA
-m > U+0645
-P l P l > U+06B6 U+0651 ;
-P l > U+06B6 ; ADDED <<<
-C l C l > U+06B5 U+0651 ;kurdish ;;SHADDA
-C l > U+06B5
-l l > U+0644 U+0651 ;;SHADDA
-l > U+0644
-P k P k > U+06A9 U+0651 ; pashto urdu ;;SHADDA
-P k > U+06A9
-UL k UL k > U+063A U+0651 ;;SHADDA
-UL k > U+063A
-k k > U+0643 U+0651 ;;SHADDA
-k > U+0643
-c c > U+062C U+0651 ;;SHADDA
-c > U+062C
-x x > U+062E U+0651 ;;SHADDA
-x > U+062E
-j j > U+0698 U+0651 ;;SHADDA
-j > U+0698
-UL h UL h > U+062E U+0651 ;;SHADDA
-UL h > U+062E
-P h P h > U+062D U+0651 ;;SHADDA
-P h > U+062D
-V h V h > U+06C1 U+0651
-V h > U+06C1
-h h > U+200C U+06BE U+0651 ;;SHADDA
-h > U+200C U+06BE ; h always initial form
-V g V g > U+06AC U+0651 ;;SHADDA
-V g > U+06AC ; kaf with dot above
-P (g|x) P (g|x) > U+063A U+0651 ;;SHADDA
-P (g|x) > U+063A
-C g C g > U+063A U+0651 ;;SHADDA
-C g > U+063A
-g g > U+06AF U+0651 ;;SHADDA
-g > U+06AF
-G G > U+06AB U+0651 ;pashto ;;SHADDA
-G > U+06AB ;pashto
-P f P f > U+06A1 U+0651 ;;SHADDA
-P f > U+06A1
-f f > U+0641 U+0651 ;;SHADDA
-f > U+0641
-V d V d > U+0688 U+0651 ;urdu ;;SHADDA
-V d > U+0688 ;urdu
-C d C d > U+06EE ; not defined in ArabTeX U+0651 ;;SHADDA
-C d > U+06EE ; not defined in ArabTeX
-UL d UL d > U+0630 U+0651 ;;SHADDA
-UL d > U+0630
-P d P d > U+0636 U+0651 ;;SHADDA
-P d > U+0636
-d d > U+062F U+0651 ;;SHADDA
-d > U+062F
-(C|V) c (C|V) c > U+0686 U+0651 ;;SHADDA
-(C|V) c > U+0686
-P b P b > U+066E U+0651 ;;SHADDA
-P b > U+066E
-b b > U+0628 U+0651 ;;SHADDA
-b > U+0628
-Ain Ain > U+0639 U+0651 ;;SHADDA
-Ain > U+0639
-H > U+0626
-U+002C / [Digits] _ [Digits] > U+002C ; comma in numerical context not an Arabic comma
-Z Z / [Digits] _ [Digits] > U+2013 ; two hyphens in numerical context -> endash
-(Z|U+005D|U+005B|U+0028|U+0029)=xx / [Digits] _ [Digits] > U+202D @xx U+202C ; hyphen or brackets in numerical context: surrounded by LRO & PDF marks
-[Digits] > [ArDigits]
-Z Z Z / # _ # > U+2014
-Z Z / # _ # > U+2013
-Z Z > U+0640
-B > U+0640
-Z / # _ > U+200D ; -x > force initial form with "zero-width joiner"
-Z / _ # > U+200D ; x- > force final form
-U+003C U+003C > U+00BB ;<<
-U+003E U+003E > U+00AB ;>>
-U+00AB > U+00BB
-U+00BB > U+00AB
-UL > U+0640 ;_
-U+003F > U+061F ;?
-U+003B > U+061B ;;
-U+003A U+003A > U+061E ;; '::' ligature 'DOTS' also defined above...
-U+002C > U+060C ;,
-U+005D / . _ . > U+200D U+005D U+200D ; keep shaping when inserting ...[...]...
-U+005B / . _ . > U+200D U+005B U+200D ; ... (but of course this screws up contextual analysis, so quoting of hamzas etc may be necessary)
-Q > ;
-N > ;
-C > ;^
-Z > ;-
-BAR > ;|
-
-
diff --git a/Master/texmf-dist/source/xelatex/arabxetex/arabtex-uighur.maps b/Master/texmf-dist/source/xelatex/arabxetex/arabtex-uighur.maps
deleted file mode 100644
index 27da35ca0d2..00000000000
--- a/Master/texmf-dist/source/xelatex/arabxetex/arabtex-uighur.maps
+++ /dev/null
@@ -1,281 +0,0 @@
-LHSName "ArabTeX-Uighur"
-RHSName "UNICODE"
-
-Define a U+0061 ;a
-Define b U+0062 ;b
-Define c U+0063 ;c
-Define d U+0064 ;d
-Define e U+0065 ;e
-Define f U+0066 ;f
-Define g U+0067 ;g
-Define h U+0068 ;h
-Define i U+0069 ;i
-Define j U+006A ;j
-Define k U+006B ;k
-Define l U+006C ;l
-Define m U+006D ;m
-Define n U+006E ;n
-Define o U+006F ;o
-Define p U+0070 ;p
-Define q U+0071 ;q
-Define r U+0072 ;r
-Define s U+0073 ;s
-Define t U+0074 ;t
-Define u U+0075 ;u
-Define v U+0076 ;v
-Define w U+0077 ;w
-Define x U+0078 ;x
-Define y U+0079 ;y
-Define z U+007A ;z
-Define A U+0041 ;A
-Define B U+0042 ;B
-Define E U+0045 ;E
-Define G U+0047 ;G
-Define I U+0049 ;I
-Define N U+004E ;N
-Define O U+004F ;O
-Define T U+0054 ;T
-Define U U+0055 ;U
-Define Y U+0059 ;Y
-Define C U+005E ;^ << CARET
-Define UL U+005F ;_ << UNDERLINE
-Define P U+002E ;. << DOT
-Define V U+002C ;, << COMMA (_V_irgule)
-Define CO U+003A ;: << COLON
-Define Ain U+0060 ;`
-Define H U+0027 ;' << HAMZA
-Define Q U+0022 ;" << QUOTE
-Define Z U+002D ;- << HYPHEN
-Define BAR U+007C ;|
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
-
-pass(Unicode)
-
-Class [Digits] = (U+0030..U+0039)
-Class [ArDigits] = (U+0660..U+0669)
-
-
-; special ligatures
-;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
-#0 (a|A) l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-#1 (a|A) l Z LLAH > U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-#0 LLAH > U+FDF2 ;; 'll_ah' > U+FDF2
-#1 LLAH > U+0644 U+0644 U+0647 ;; 'll_ah' -> 'l l h'
-;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
-#0 U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+FDF2 ; 'ALLAH'
-#1 U+0041 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'ALLAH'
-#0 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'LLAH'
-#1 U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
-
-U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
-U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
-U+0029 U+0029 > U+FD3E ;; '))' : ornate left par
-U+0052 U+0049 U+0059 U+0041 U+004C > U+FDFC ;; 'RIYAL' : Saudi currency sign
-;; most fonts won't have the following ones:
-U+0053 U+0041 U+004C U+004C U+0041 U+0053 U+0054 U+004F U+0050 > U+FDF0 ;; 'SALLASTOP' (.sallY with "ye-barree", Quranic stop sign)
-U+0051 U+0041 U+004C U+0041 > U+FDF1 ;; 'QALA' : qalY with ye-barree, Quranic stop sign
-U+0041 U+004B U+0042 U+0041 U+0052 > U+FDF3 ;; 'AKBAR'
-U+004D U+0055 U+0048 U+0041 U+004D U+004D U+0041 U+0044 > U+FDF4 ;; 'MUHAMMAD'
-U+0053 U+0041 U+004C U+0041 U+004D > U+FDF5 ;; 'SALAM'
-U+0052 U+0041 U+0053 U+004F ? U+0055 U+004C > U+FDF6 ;; 'RASUL' (also unicode 'RASOUL)'
-U+0041 U+004C U+0041 U+0059 U+0048 (U+0049|U+0045) > U+FDF7 ;; 'ALAYHI' (also unicode 'ALAYHE)'
-U+0057 U+0041 U+0053 U+0041 U+004C U+004C U+0041 U+004D > U+FDF8 ;; 'WASALLAM'
-U+0053 U+0041 U+004C U+004C U+0041 > U+FDF9 ;; 'SALLA'
-U+004A U+0041 U+004C U+004C U+0041 > U+FDFB ;; 'JALLA' : "jalla jalAluhu"
-U+0042 U+0041 U+0053 U+004D U+0041 U+004C U+0041 > U+FDFD ;; 'BASMALA' : very few fonts have this ligature afaik
-
-U+005E U+0053 U+004C U+0059 > U+06D6 ;; ^SLY
-U+005E U+0051 U+004C U+0059 > U+06D7 ;; ^QLY
-U+005E U+004D U+0049 U+004D > U+06D8 ;; ^MIM
-U+005E U+004C U+0041 > U+06D9 ;; ^LA
-U+005E U+004A U+0049 U+004D > U+06DA ;; ^JIM
-U+005E U+0044 U+004F U+0054 U+0053 > U+06DB ;; ^DOTS
-U+005E U+0053 U+0049 U+004E > U+06DC ;; ^SIN
-U+0048 U+0049 U+005A U+0042 > U+06DE ;; HIZB
-U+0043 U+0049 U+0052 U+0043 U+005A U+0045 U+0052 U+004F > U+06DF ;; CIRCZERO
-U+0052 U+0045 U+0043 U+0054 U+005A U+0045 U+0052 U+004F > U+06E0 ;; RECTZERO
-U+0053 U+0041 U+004A U+0044 U+0041 > U+06E9 ;; SAJDA
-
-U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
-
-
-; vowels
-
-a / # _ > U+0626 U+0627
-a > U+0627
-(CO a|U+00E4) / # _ > U+0626 U+0647 U+200C
-(CO a|U+00E4) > U+0647 U+200C
-o / # _ > U+0626 U+0648 ;
-o > U+0648 ;
-(CO o|U+00F6) / # _ > U+0626 U+06C6
-(CO o|U+00F6) > U+06C6
-i / # _ # > U+0626 U+0649
-i / # _ > U+0626 U+066E
-i / _ # > U+0649
-i > U+066E
-e / # _ > U+0626 U+06D0
-e > U+06D0
-u / # _ > U+0626 U+06C7 ;
-u > U+06C7 ;
-(CO u|U+00FC) / # _ > U+0626 U+06C8 ;
-(CO u|U+00FC) > U+06C8 ;
-l Q a > U+0644 U+064E U+0627 ;
-l a > U+0644 U+0627 ;
-
-P z P z > U+0638 U+0651 ;;SHADDA
-P z > U+0638
-C z C z > U+0698 U+0651 ;;SHADDA
-C z > U+0698
-V z V z > U+0696 U+0651 ;pashto ;;SHADDA
-V z > U+0696 ;pashto
-z z > U+0632 U+0651 ;;SHADDA
-z > U+0632
-Y Y > U+0649 U+0651 ;;SHADDA
-Y > U+0649
-w w > U+06CB U+0651 ;;SHADDA
-w > U+06CB
-y y > U+064A U+0651 ;;SHADDA
-y > U+064A
-v v > U+06A4 U+0651 ;;SHADDA
-v > U+06A4
-V t V t > U+0679 U+0651 ; urdu ;;SHADDA
-V t > U+0679
-UL t UL t > U+062B U+0651 ;;SHADDA
-UL t > U+062B
-P t P t > U+0637 U+0651 ;;SHADDA
-P t > U+0637
-t t > U+062A U+0651 ;;SHADDA
-t > U+062A
-T T > U+0629 U+0651 ;;SHADDA
-T > U+0629
-C s C s > U+0634 U+0651 ;;SHADDA
-C s > U+0634
-P s P s > U+0635 U+0651 ;;SHADDA
-P s > U+0635
-V s V s > U+069A U+0651 ;Pashto ;;SHADDA
-V s > U+069A ;Pashto
-CO s > U+069B ; sin with 3 dots below
-s s > U+0633 U+0651 ;;SHADDA
-s > U+0633
-C r C r > U+0692 U+0651 ;Kurdish ;;SHADDA ; missing in ArabTeX <<<
-C r > U+0692
-P r P r > U+0695 U+0651 ;Kurdish ;;SHADDA
-P r > U+0695
-V r V r > U+0691 U+0651 ;Urdu ;;SHADDA
-V r > U+0691 ;Urdu
-r r > U+0631 U+0651 ;;SHADDA
-r > U+0631
-P q P q > U+066F U+0651 ;;SHADDA
-P q > U+066F
-q q > U+0642 U+0651 ;;SHADDA
-q > U+0642
-p p > U+067E U+0651 ;;SHADDA
-p > U+067E
-C n C n > U+06AD U+0651 ;;SHADDA
-C n > U+06AD
-P n P n > U+06BA U+0651 ; urdu ;;SHADDA
-P n > U+06BA ;
-V n V n > U+06BC U+0651 ; Pashto
-V n > U+06BC ; Pashto
-n n > U+0646 U+0651 ;;SHADDA
-n > U+0646
-m m > U+0645 U+0651 ;;SHADDA
-m > U+0645
-C l C l > U+06B5 U+0651 ;kurdish ;;SHADDA
-C l > U+06B5
-l l > U+0644 U+0651 ;;SHADDA
-l > U+0644
-P k P k > U+06A9 U+0651 ; pashto urdu ;;SHADDA
-P k > U+06A9
-UL k UL k > U+063A U+0651 ;;SHADDA
-UL k > U+063A
-k k > U+0643 U+0651 ;;SHADDA
-k > U+0643
-j j > U+062C U+0651 ;;SHADDA
-j > U+062C
-x x > U+062E U+0651 ;;SHADDA
-x > U+062E
-UL h UL h > U+062E U+0651 ;;SHADDA
-UL h > U+062E
-P h P h > U+062D U+0651 ;;SHADDA
-P h > U+062D
-V h V h > U+06C1 U+0651
-V h > U+06C1
-h h > U+0647 U+0651 ;;SHADDA
-h > U+0647
-V g V g > U+06AC U+0651 ;;SHADDA
-V g > U+06AC ; kaf with dot above
-P g P g > U+063A U+0651 ;;SHADDA
-P g > U+063A
-C g C g > U+063A U+0651 ;;SHADDA
-C g > U+063A
-g g > U+06AF U+0651 ;;SHADDA
-g > U+06AF
-G G > U+06AB U+0651 ;pashto ;;SHADDA
-G > U+06AB ;pashto
-P f P f > U+06A1 U+0651 ;;SHADDA
-P f > U+06A1
-f f > U+0641 U+0651 ;;SHADDA
-f > U+0641
-V d V d > U+0688 U+0651 ;urdu ;;SHADDA
-V d > U+0688 ;urdu
-C d C d > U+06EE ; not defined in ArabTeX U+0651 ;;SHADDA
-C d > U+06EE ; not defined in ArabTeX
-UL d UL d > U+0630 U+0651 ;;SHADDA
-UL d > U+0630
-P d P d > U+0636 U+0651 ;;SHADDA
-P d > U+0636
-d d > U+062F U+0651 ;;SHADDA
-d > U+062F
-V c V c > U+0685 U+0651 ;pashto ;;SHADDA
-V c > U+0685
-C c C c > U+0686 U+0651 ;;SHADDA
-C c > U+0686
-c c > U+0681 U+0651
-c > U+0681 ; ح with hamza above
-P b P b > U+066E U+0651 ;;SHADDA
-P b > U+066E
-b b > U+0628 U+0651 ;;SHADDA
-b > U+0628
-Ain Ain > U+0639 U+0651 ;;SHADDA
-Ain > U+0639
-H > U+0626
-U+002C / [Digits] _ [Digits] > U+002C ; comma in numerical context not an Arabic comma
-Z Z / [Digits] _ [Digits] > U+2013 ; two hyphens in numerical context -> endash
-(Z|U+005D|U+005B|U+0028|U+0029)=xx / [Digits] _ [Digits] > U+202D @xx U+202C ; hyphen or brackets in numerical context: surrounded by LRO & PDF marks
-[Digits] > [ArDigits]
-Z Z Z / # _ # > U+2014
-Z Z / # _ # > U+2013
-Z Z > U+0640
-B > U+0640
-Z / # _ > U+200D ; -x > force initial form with "zero-width joiner"
-Z / _ # > U+200D ; x- > force final form
-U+003C U+003C > U+00BB ;<<
-U+003E U+003E > U+00AB ;>>
-U+00AB > U+00BB
-U+00BB > U+00AB
-UL > U+0640 ;_
-U+003F > U+061F ;?
-U+003B > U+061B ;;
-U+003A U+003A > U+061E ;; '::' ligature 'DOTS' also defined above...
-U+002C > U+060C ;,
-U+005D / . _ . > U+200D U+005D U+200D ; keep shaping when inserting ...[...]...
-U+005B / . _ . > U+200D U+005B U+200D ; ... (but of course this screws up contextual analysis, so quoting of hamzas etc may be necessary)
-Q > ;
-N > ;
-C > ;^
-Z > ;-
-BAR > ;|
-
-
diff --git a/Master/texmf-dist/source/xelatex/arabxetex/arabtex.maps b/Master/texmf-dist/source/xelatex/arabxetex/arabtex.maps
index cc7dec079ba..ffbbb54846a 100644
--- a/Master/texmf-dist/source/xelatex/arabxetex/arabtex.maps
+++ b/Master/texmf-dist/source/xelatex/arabxetex/arabtex.maps
@@ -114,7 +114,7 @@ Define Q U+0022 ;" << QUOTE
Define Z U+002D ;- << HYPHEN
Define BAR U+007C ;|
Define AN U+0061 U+004E ; aN
-Define LLAH U+006C U+006C U+005F U+0061 U+0068
+Define LLAH U+006C U+006C U+005F U+0061 U+0068 ; ll_ah
;Define NUL U+00A6;
Define Ha U+0623
Define Hi U+0625
@@ -151,24 +151,16 @@ Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
; special ligatures
;; 1. Standard ArabTeX input
-;; WARNING! there are, alas, two classes of Arabic fonts:
-;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2
-;; For these the ligature llah can be accessed by the sequence lam-lam-ha
-;; b) Those that do not have the initial alif in U+FDF2
+;; FDF2 is just used as temporary holder, and is converted back to ligature lam lam hah later (to be taken care of by the font)
+#Af Z (a|A) l Z LLAH > U+0671 U+FDF2 ;; '-al-ll_ah' or '-Al-ll_ah'
;; The BAR is used in the DMG transliteration to suppress the initial A
-#0 (a|A) BAR? l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-#1 (a|A) BAR? l Z LLAH > U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-#0 LLAH > U+FDF2 ;; 'll_ah' > U+FDF2
-#1 LLAH > U+0644 U+0644 U+0647 ;; 'll_ah' -> 'l l h'
+(a|A) BAR? l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
+LLAH > U+FDF2 ;; 'll_ah' -> 'l l h'
;; UPPERCASE mnemonics for various ligatures or special glyphs
-;; 2a. custom ArabXeTeX input for ligatures not defined in Unicode
-U+004C U+004C U+0048 > U+0644 U+0644 U+0647 ;; 'LLH' -> 'l l h'
-U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH' : ligature in Adobe Arabic
-;; 2b. Ligatures and glyphs defined in Unicode:
-#0 U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+FDF2 ; 'ALLAH'
-#1 U+0041 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'ALLAH'
-#0 U+004C U+004C U+0041 U+0048 > U+FDF2 ; 'LLAH'
-#1 U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
+U+004C U+004C U+0048 > U+FDF2 ;; 'LLH' -> 'l l h'
+U+0046 U+0041 U+004C U+0049 U+004C U+004C U+0041 U+0048 > U+0641 U+064E U+0644 U+0650 U+0644 U+0647 ;; 'FALILLAH'
+U+0041 U+004C U+004C U+0041 U+0048 > U+0627 U+0644 U+0644 U+0647 ; 'ALLAH'
+U+004C U+004C U+0041 U+0048 > U+0644 U+0644 U+0647 ; 'LLAH'
U+0053 U+004C U+004D > U+FDFA ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
U+0028 U+0028 > U+FD3F ;; '((' : ornate right par
@@ -213,8 +205,8 @@ U+005F U+004D U+0049 U+004D > U+06ED ;; _MIM
U+0044 U+004F U+0054 U+0053 > U+061E ;; DOTS (also possible by typing "::")
-;; This is to enclose digits within glyph U+06DD, see http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=ArabicFonts
-U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+202E U+06DD @dig U+202C ; [[digits]]
+;; This is to enclose digits within glyph U+06DD
+U+005B U+005B ([Digits]+)=dig U+005D U+005D > U+06DD @dig ; [[digits]]
; vowels
@@ -715,13 +707,13 @@ UL a > U+0670
#n AN / (A H|Ha) _ > ;
#v Q AN / (A H|Ha) _ > ;
#v AN / (A H|Ha) _ > U+064B
-#n Q AN > U+0627 U+064B
+#n Q AN > U+064B U+0627
#n AN > U+0627
#n Q a > U+064E
#n Q A > U+064E U+0627
#n A > U+0627
#v Q AN > U+0627
-#v AN > U+0627 U+064B
+#v AN > U+064B U+0627
#v Q a >
#v a > U+064E
#v Q A > U+0627
@@ -781,5 +773,6 @@ BAR > ;|
#f U+0627 / # _ U+0644 > U+0627 U+064E ; otherwise initial alif takes fatha
#f [CONS]=k1 / _ ([CONS]|#) > @k1 U+0652 ; consonant + (consonant or final)
#f ;; [CONS]=k1 / _ # > @k1 U+0652 ; final consonant
+U+FDF2 > U+0644 U+0644 U+0647 ;
#f Q > ;
#v Z > ;
diff --git a/Master/texmf-dist/source/xelatex/arabxetex/arabxetex.dtx b/Master/texmf-dist/source/xelatex/arabxetex/arabxetex.dtx
index 513dc3081cd..dbcaca303db 100644
--- a/Master/texmf-dist/source/xelatex/arabxetex/arabxetex.dtx
+++ b/Master/texmf-dist/source/xelatex/arabxetex/arabxetex.dtx
@@ -2,7 +2,7 @@
%
%!TEX encoding = UTF-8 Unicode
%
-% Copyright © 2007-2010 by François Charette <firmicus at gmx dot net>
+% Copyright © 2007-2015 by François Charette <firmicus04 at gmail dot com>
%
% Distributable under the LaTeX Project Public License,
% version 1.3c or higher (your choice). The latest version of
@@ -24,14 +24,14 @@
____________________________
The arabxetex package
- © 2007–2010 François Charette
+ © 2007–2015 François Charette
License information appended
\endpreamble
\postamble
-Copyright © 2007–2010 by François Charette <firmicus at gmx dot net>
+Copyright © 2007–2015 by François Charette <firmicus04 at gmail dot com>
Distributable under the LaTeX Project Public License,
version 1.3c or higher (your choice). The latest version of
@@ -69,7 +69,7 @@ as well as an extensive collection of TECKit files
%
%<*readme>
--------------------------
-THE ARABXETEX PACKAGE v1.1.4
+THE ARABXETEX PACKAGE v1.2.1
This package provides a convenient ArabTeX-like user-interface for typesetting
languages using the Arabic script in XeLaTeX, with flexible access to font
@@ -84,7 +84,7 @@ The TECkit fontmapping files (*.map and *.tec) should be copied to
-------------------------
François Charette
-© 2007–2010
+© 2007–2015
%</readme>
%
% \fi
@@ -94,7 +94,7 @@ François Charette
%
% \GetFileInfo{\jobname.sty}
%
-% \title{~\hfil {\color{IslamicGreen}\arabxetex \hfil \arabxetexAr}\hfil~\\
+% \title{~\hfil {\color{IslamicGreen}\arabxetex}\hfil~\\
% An \arabtex-like interface for typesetting languages in Arabic script with \XeLaTeX}
% \author{François Charette}
% \date{\filedate \qquad \fileversion}
@@ -119,7 +119,10 @@ François Charette
%
% \section{Introduction}
%
-% Since the early 1990s, \TeX\ users who wished to typeset in Arabic script
+%
+% Since the early 1990s,\footnote{ ^^A
+% This introduction reflects the state of things in 2007 when \arabxetex\ was initially released.}
+% \TeX\ users who wished to typeset in Arabic script
% have relied on Klaus Lagally's excellent \arabtex\ system.\footnote{ ^^A
% \url{ftp://ftp.informatik.uni-stuttgart.de/pub/arabtex/arabtex.htm}.
% Version 2.00 was released in April 1992 and version 3.00 in November of
@@ -144,18 +147,6 @@ François Charette
% (It is only fair to state, however, that Prof.~Lagally has been extremely
% responsive to ideas, suggestions and wishes by users in the past).
%
-% The introduction of Omega in \ca 1996, a \TeX\ extension for multilingual,
-% multidirectional typesetting based on Unicode, raised of course many hopes, but
-% these have by now completely dissipated since the project has been moribund for
-% several years and is now probably defunct. Aleph, a more humble attempt to reach
-% some of the goals set by Omega, has been equally unsuccessful.\footnote{ ^^A
-% Based on Omega 1.15 and \eTeX, Aleph attempted to provide a usable and
-% stable branch. See
-% \url{http://www.tug.org/TUGboat/Articles/tb25-1/bilotta.pdf}.
-% Unfortunately the project is currently dormant.}
-% Both engines suffered of numerous bugs and never reached a stable and usable
-% state, \textit{at least according to my own subjective experience}.
-%
% After completion of the initial alpha version of \arabxetex, I came across the
% package \pkg{Arabi} by Youssef Jabri on CTAN.\footnote{ ^^A
% \url{http://www.ctan.org/tex-archive/language/arabic/arabi/}}
@@ -166,10 +157,9 @@ François Charette
%
% With the availability of Jonathan Kew's \XeTeX, users can now rely on a very
% up-to-date typesetting engine based on the integration of \eTeX, Unicode, and
-% modern font-rendering technology (AAT and ICU), without the complex hassle of
+% modern font-rendering technology, without the complex hassle of
% font installation.\footnote{ ^^A
-% \url{http://scripts.sil.org/xetex}. \XeTeX\ was originally developed
-% for the Mac~OS~X platform, but Linux and WIN32 ports are now available.}
+% \url{http://xetex.sourceforge.net}.}
%
% \section{Description}
%
@@ -184,12 +174,7 @@ François Charette
% \arabxetex\ introduces several additions, and a few minor modifications,
% to \arabtex's conventions. These are documented in tabular form in
% Section~\ref{conventiontable}. \arabxetex\ relies on the package \pkg{bidi}
-% which contains the macros necessary for bidirectional typesetting --
-% using \eTeX's \cmd{\beginR} \ldots \cmd{\endR}, \cmd{\beginL} \ldots \cmd{\endL}
-% primitives. The main code in \pkg{bidi.sty} is essentially borrowed,
-% with minor adaptations, from the file \pkg{rlbabel.def} in the Babel
-% distribution (where it serves for typesetting Hebrew). Some improvements
-% in the beta version were inspired by Youssef Jabri's \pkg{Arabi}.
+% which contains the macros necessary for bidirectional typesetting.
%
% Languages supported at present are the same as in \arabtex, namely: Arabic,
% Maghribi Arabic, Farsi (Persian), Urdu, Sindhi, Kashmiri, Ottoman Turkish,
@@ -206,14 +191,14 @@ François Charette
% can use keymaps or keyboard utilities to achieve the same, so why bother?
% An expert in Arabic mathematical linguistic and author of the Perl module
% \pkg{Encode::Arabic::ArabTeX}, Otakar Srmž, has this to say about the
-% virtues of \arabtex\ \ASCII\ encoding:
+% virtues of \arabtex\ \ASCII\ encoding:\footnote{ ^^A
+% \url{http://search.cpan.org/~smrz/Encode-Arabic/lib/Encode/Arabic/ArabTeX.pm\#DESCRIPTION}.
+% See also \url{http://ufal.mff.cuni.cz/~smrz/ICFP2006/icfp-encode.pdf}.}
% \begin{quote}
% “ArabTeX is an excellent extension to TeX/LaTeX designed for
% typesetting the right-to-left scripts of the Orient. It comes up with
% very intuitive and comprehensible lower \ASCII\ transliterations, the
-% expressive power of which is even better than that of the scripts.”^^A\footnote{ %
-% [Source: \url{http://search.cpan.org/~smrz/Encode-Arabic-1.16/ArabTeX/ArabTeX.pm#DESCRIPTION}.
-% See also \url{http://ufal.mff.cuni.cz/~smrz/ICFP2006/icfp-encode.pdf}]^^A}
+% expressive power of which is even better than that of the scripts.”
% \end{quote}
% There are indeed several advantages in using \arabtex\ input convention for
% typesetting in the Arabic script, besides ease and legibility. First it is
@@ -233,7 +218,7 @@ François Charette
% \DescribeMacro{\textarab}\DescribeMacro{\textfarsi}\marginpar{\raggedleft\small etc.}
% where ¦<language>¦ is one of the following (alternative names are given in brackets):
% \begin{compactitem}[\textbf{·}]
-% \item ¦arab¦ (¦Arabic¦),\footnote{ ^^A
+% \item ¦arab¦ (¦arabic¦),\footnote{ ^^A
% Since the command \cmd\arabic\ is already defined in \LaTeX, we chose
% the environment ¦arab¦ and the command \cmd\textarab\ instead,
% but the equivalent environment ¦Arabic¦ and the command
@@ -276,11 +261,7 @@ François Charette
%
% Left-to-right insertions in Latin script within an Arabic environment
% can be made by means of the \DescribeMacro{\textLR}
-% command \cmd\textLR¦{…}¦.\new{1.1.2}\footnote{ %
-% In version 1.0 this was called \cmd\textlatin, which was renamed \cmd\textroman
-% in version 1.1. But the former conflicted with \pkg{Babel},
-% and the latter with \pkg{Beamer}. Hopefully \cmd\textLR\
-% won't be as short-lived!}
+% command \cmd\textLR¦{…}¦.
% Emphasis in Arabic is traditionally indicated by
% overlining the text, and this can be achieved with the command
% \DescribeMacro{\aemph}
@@ -316,15 +297,17 @@ François Charette
% \newfontfamily\arabicfont[Script=Arabic]{<fontname>}
% \end{Verbatim}
% If not, then a warning is issued and \arabxetex\ will attempt to load
-% the font \textbf{Scheherazade} (designed by Bob Halissy and
-% Jonathan Kew of SIL International).\footnote{
-% Available from \url{http://scripts.sil.org/ArabicFonts}. For
+% the font \textbf{Amiri} (by Khaled Hosny).\footnote{
+% Available from \url{http://www.amirifont.org}.
+% Prior to version 1.2.0, the default font was \textbf{Scheherazade} (designed by Bob Halissy and
+% Jonathan Kew of SIL International),
+% available from \url{http://scripts.sil.org/ArabicFonts}. For
% typesetting Sindhi and Kashmiri, the font \textbf{Lateef}, available at
% the same place, is also recommended.}
-% You can also define specific fonts \new{1.1} for all other languages, by similarly defining
+% You can also define specific fonts for all other languages, by similarly defining
% ¦\<language>font¦, such as for example:
% \begin{Verbatim}[gobble=2,fontsize=\normalsize]
-% \newfontfamily\urdufont[Script=Arabic]{Nafees Pakistani Naskh}
+% \newfontfamily\urdufont[Script=Arabic]{Hussaini Nastaleeq}
% \end{Verbatim}
% So for example if the \cmd\texturdu\ command or the ¦urdu¦ environment is used,
% \arabxetex\ will use the \cmd\urdufont\ if it is defined,
@@ -350,7 +333,7 @@ François Charette
% ^say'uN, ^say'iN, ^say'aN, sA'ala, mas'alaTuN, saw'aTuN, _ha.tI'aTuN,
% jA'a, ridA'uN, ridA'aN, jI'a, radI'iN, sU'uN, .daw'uN, qay'iN, .zim'aN
% , yatasA'alUna, 'a`dA'akum, 'a`dA'ikum, 'a`dA'ukum maqrU'aT, mU'ibAt,
-% taw'am, yas'alu, 'a.sdiq^A$\;$'uh_u, ya^g^I'u, s^U'ila
+% taw'am, yas'alu, 'a.sdiq^A'uh_u, ya^g^I'u, s^U'ila
% \end{arab}
% \end{Verbatim}
%
@@ -361,7 +344,7 @@ François Charette
% ^say'uN, ^say'iN, ^say'aN, sA'ala, mas'alaTuN, saw'aTuN, _ha.tI'aTuN,
% jA'a, ridA'uN, ridA'aN, jI'a, radI'iN, sU'uN, .daw'uN, qay'iN, .zim'aN
% , yatasA'alUna, 'a`dA'akum, 'a`dA'ikum, 'a`dA'ukum maqrU'aT, mU'ibAt,
-% taw'am, yas'alu, 'a.sdiq^A$\;$'uh_u, ya^g^I'u, s^U'ila
+% taw'am, yas'alu, 'a.sdiq^A'uh_u, ya^g^I'u, s^U'ila
% \end{arab}
%
% \subsubsection{Special orthographies}
@@ -386,7 +369,7 @@ François Charette
% \bigskip
%
% \textbf{NB}: For the time being only \textit{miʾa} is supported, but more irregular
-% constructs should be added in later versions.
+% constructs may be added in later versions.
%
% \subsubsection{Typesetting the Holy Qurʾān}
%
@@ -395,62 +378,64 @@ François Charette
% typesetters. Nevertheless, with Open Type fonts that cover the full Unicode range
% for the Arabic script, it is possible to achieve pretty decent results.
% The following examples represent my attempt to reproduce, with the font
-% Scheherazade, the various typographic features of a typical printed edition
-% from Saudi Arabia.
+% Amiri, the various typographic features of a typical printed edition (disregarding those that cannot be achieved
+% by means of Unicode, such as putting the \textit{hamza} directly over the baseline).\footnote{ ^^A
+% In the previous version of the manual, I attempted to mimic that behaviour with a \TeX\ macro \cmd\hamzaB, which happened to work more or less well with the font Scheherazade. With Amiri it does not and I have reverted to standard spellings.}
%
-% In printed Qurʾāns, one frequently encounters typographical oddities that are
-% not taken into account by Unicode, such as the \textit{hamza} placed directly over
-% the baseline instead as over the \textit{alif}.
-% But with a \TeX\ macro it is possible to emulate this rather well:
+% ^^AIn printed Qurʾāns, one frequently encounters typographical oddities that are
+% ^^Anot taken into account by Unicode, such as the \textit{hamza} placed directly over
+% ^^Athe baseline instead as over the \textit{alif}.
+% ^^ABut with a \TeX\ macro it is possible to emulate this rather well:
%
% \begin{Verbatim}[gobble=2,fontsize=\small]
-% \newcommand{\hamzaB}{\char"200D\char"0640\raise-.95ex\hbox{\char"0654}\char"200D}
-%
% \begin{arab}[fullvoc]
-% mina 'l-qur'Ani 'l-karImi, sUraTu 'l-ssajdaTi 15--16:
+% sUraTu 'l-ssajdaTi, 15--16:
%
-% 'innamA yu'minu bi-\hamzaB a|"Ay___atinA 'lla_dIna 'i_dA _dukkirUA bihA
+% 'innamA yu'minu bi-'AyAtinA 'lla_dIna 'i_dA _dukkirUA bihA
% _harrUA sujjadaN wa-sabba.hUA bi-.hamdi rabbihim wa-hum lA yastakbirUna
% SAJDA [[15]] tatajAfY_a junUbuhum `ani 'l-ma.dAji`i yad`Una rabbahum
% _hawfaN wa-.tama`aN wa-mimmA razaqn_ahum yunfiqUna [[16]]
% \end{arab}
%
% \begin{arab}[fullvoc]
-% sUraTu 'l-baqaraTi 71--72:
+% sUraTu 'l-baqaraTi, 71--72:
%
% qAla 'innahu, yaqUlu 'innahA baqaraTuN llA _dalUluN tu_tIru 'l-'ar.da wa-lA
-% tasq.I 'l-.har_ta musallamaTuN llA ^siyaTa fIhA|^JIM qAluW" 'l-\hamzaB a___ana
+% tasq.I 'l-.har_ta musallamaTuN llA ^siyaTa fIhA|^JIM qAluW" 'l-'Ana
% ji'ta bi-'l-.haqqi|^JIM fa_daba.hUhA wa-mA kAdduW" yaf`alUna [[71]] wa-'i_d
-% qataltum nafsaN fa-udda$\,$_ara|'|_i"tum fIhA|^SLY wa-al-ll_ahu mu_hrijuN mmA
+% qataltum nafsaN fa-udda_ara|'|_i"tum fIhA|^SLY wa-al-ll_ahu mu_hrijuN mmA
% kun"tum taktumUna [[72]]
% \end{arab}
% \end{Verbatim}
-%
+% ^^A\let\stdarabicfont\arabicfont
+% ^^A\let\arabicfont\amiriquran
% \begin{arab}[fullvoc]
-% mina 'l-qur'Ani 'l-karImi, sUraTu 'l-ssajdaTi 15--16:
+% sUraTu 'l-ssajdaTi, 15--16:
%
-% 'innamA yu'minu bi-\hamzaB a|"Ay___atinA 'lla_dIna 'i_dA _dukkirUA bihA _harrUA
-% sujjadaN wa-sabba.hUA bi-.hamdi rabbihim wa-hum lA yastakbirUna SAJDA [[15]]
-% tatajAfY_a junUbuhum `ani 'l-ma.dAji`i yad`Una rabbahum _hawfaN wa-.tama`aN
-% wa-mimmA razaqn_ahum yunfiqUna [[16]]
+% 'innamA yu'minu bi-'AyAtinA 'lla_dIna 'i_dA _dukkirUA bihA
+% _harrUA sujjadaN wa-sabba.hUA bi-.hamdi rabbihim wa-hum lA yastakbirUna
+% SAJDA [[15]] tatajAfY_a junUbuhum `ani 'l-ma.dAji`i yad`Una rabbahum
+% _hawfaN wa-.tama`aN wa-mimmA razaqn_ahum yunfiqUna [[16]]
% \end{arab}
-%
+%
+% \bigskip
% \begin{arab}[fullvoc]
-% sUraTu 'l-baqaraTi 71--72:
+% sUraTu 'l-baqaraTi, 71--72:
%
% qAla 'innahu, yaqUlu 'innahA baqaraTuN llA _dalUluN tu_tIru 'l-'ar.da wa-lA
-% tasq.I 'l-.har_ta musallamaTuN llA ^siyaTa fIhA|^JIM qAluW" 'l-\hamzaB a___ana
+% tasq.I 'l-.har_ta musallamaTuN llA ^siyaTa fIhA|^JIM qAluW" 'l-'Ana
% ji'ta bi-'l-.haqqi|^JIM fa_daba.hUhA wa-mA kAdduW" yaf`alUna [[71]] wa-'i_d
-% qataltum nafsaN fa-udda$\,$_ara|'|_i"tum fIhA|^SLY wa-al-ll_ahu mu_hrijuN mmA
+% qataltum nafsaN fa-udda_ara|'|_i"tum fIhA|^SLY wa-al-ll_ahu mu_hrijuN mmA
% kun"tum taktumUna [[72]]
% \end{arab}
-%
+% ^^A\let\arabicfont\stdarabicfont
% \subsubsection{Farsi}
%
% These are some of the Persian examples in the \arabtex\ documentation,
-% typeset with the font Simple Farsi Bold:
+% typeset with the font IranNastaliq:\footnote{ ^^A
+% \url{http://www.scict.ir/portal/File/ShowFile.aspx?ID=29bc4b98-bfd0-428d-b56b-63e36de8c9b5}}
% \begin{Verbatim}[gobble=2,fontsize=\normalsize]
-% \begin{farsi}[voc]
+% \begin{farsi}[novoc]
% _hwAb, xwI^s, _hwod, ^ceH, naH, yal_aH, _hAneH, _hAneHhA, _hAneH-hA,
% ketAb-e, U, rAh-e, t_U, nAmeH-i, man, bInI-e, An, mard, pA-i, In,
% zan, bAzU-i, In, zan, dAr-_i, man, _hU-_i, t_U, nAmeH-_i, sormeH-_i,
@@ -461,7 +446,7 @@ François Charette
% \end{farsi}
% \end{Verbatim}
%
-% \begin{farsi}[voc]
+% \begin{farsi}[novoc]
% _hwAb, xwI^s, _hwod, ^ceH, naH, yal_aH, _hAneH, _hAneHhA, _hAneH-hA,
% ketAb-e, U, rAh-e, t_U, nAmeH-i, man, bInI-e, An, mard, pA-i, In,
% zan, bAzU-i, In, zan, dAr-_i, man, _hU-_i, t_U, nAmeH-_i, sormeH-_i,
@@ -473,8 +458,9 @@ François Charette
%
% \subsubsection{Urdu}
%
-% An Urdu example, typeset with Nafees Pakistani Naskh:\footnote{ ^^A
-% The example is borrowed from
+% An Urdu example, typeset with Hussaini Nastaleeq:\footnote{ ^^A
+% \url{https://github.com/khaledhosny/hussaini-nastaleeq}.
+% The example is borrowed from
% \url{http://tabish.freeshell.org/u-trans/urducode.html}}
% \begin{Verbatim}[gobble=2,fontsize=\normalsize]
% \begin{urdu}[novoc]
@@ -501,127 +487,12 @@ François Charette
% \renewcommand{\urdufont}{\arabicfont}
% \renewcommand{\farsifont}{\arabicfont}
%
-% \subsection{Special considerations}
-% \parindenton
-% \subsubsection{The name of God} \label{allahliga}
-%
-% The glyph \textsf{FDF2}, defined as ‘\textsc{arabic ligature allah isolated form}’
-% by the Unicode Consortium, is a source of great confusion.
-% It is displayed in the Unicode Book with an initial alif and thus represents the
-% name of God, Allāh, which in Arabic is always written as a special ligature
-% (\ie {\tradarabic اﷲ} and not {\arabicfont الله}).\footnote{ ^^A
-% The glyph {\tradarabic اﷲ} is taken from the font Traditional Arabic.
-% In Scheherazade its design is rather suboptimal: {\arabicfont\char"FDF2}.}
-%
-% However, a substantial portion of real-world fonts rather represent that
-% ligature \textit{without} the initial alif.\footnote{ ^^A
-% My research on Arabic fonts available or known to me yields the following picture:
-% The fonts that do not display the initial alif in the ligature \textsf{FDF2}
-% include those provided by \href{http://www.linotype.com/2517/arabicfonts.html}{Linotype};
-% the great majority of those licensed to or developed by
-% \href{http://www.microsoft.com/typography/links/FontPortal.aspx?PID=8}{Microsoft}
-% (I could verify it for Times New Roman, Arial, Courier New, Microsoft Sans Serif,
-% Arabic Transparent, Simplified Arabic, Simplified Arabic Fixed,
-% WinSoft Serif Pro, Traditional Arabic, Andalus, Old Antic Bold,
-% Old Antic Decorated and Farsi Simple Bold); the fonts distributed by
-% \href{http://www.arabeyes.org}{Arabeyes.org};
-% \href{http://scripts.sil.org/ArabicFonts}{SIL}'s Lateef;
-% and the fonts developed by \href{www.crulp.org}{CRULP} in Pakistan.
-% The Unicode-conformant fonts, on the other hand, are:
-% \href{http://scripts.sil.org/ArabicFonts}{SIL}'s Scheherazade,
-% \href{http://www.tdc.org/news/2006Results/AdobeArabic.html}{Adobe Arabic}
-% (distributed with the \href{http://www.adobe.com/ceea/}{Middle-Eastern version}
-% of the latest \href{http://www.adobe.com/products/acrobat/readermain.html}{Adobe Reader 7}),
-% Arial Unicode MS, and \href{http://sakkal.com/type/typesetting.html}{Arabic Typesetting}
-% (distributed with \href{http://www.microsoft.com/typography/VOLT.mspx}{VOLT}
-% and with \href{http://www.microsoft.com/office/editions/prodinfo/language/proofingtools.mspx}{Microsoft Office Proofing Tools 2003}).}
-% The confusion probably has to do with Unicode’s omission to include the ALLAH
-% ligature without the initial alif, which is imperatively required for typesetting
-% expressions like \textit{al-ḥamdu li-llāh} \RL{\tradarabic الحمد ﷲ}.
-% Many fonts code the ligature {\tradarabic ﷲ} in the Private Use Area
-% and make it accessible as a default ligature for the sequence \textit{lām-lām-hāʾ}.
-% In such a case it can be generated from the input ¦\textarab{l|lh}¦
-% (the vertical bar here tells \arabxetex\ not to interpret the sequence ¦ll¦
-% as \textit{lām} with \textit{shadda}).\footnote{ ^^A
-% This currently does not work with Scheharazade, but the
-% developers are aware of the issue.}
-% Besides not being a standard \arabtex\ input sequence, the trouble is that
-% there is no way to know a priori whether the font provides the glyph {\tradarabic ﷲ}
-% at all, and whether it is defined as a default ligature from the above input.
-%
-% To solve this problem with \arabxetex, we had no choice but provide two classes of
-% font mappings, one for each of the above two categories of Arabic fonts.\footnote{ ^^A
-% This has the unfortunate consequence of doubling the number of mappings shipped
-% with \arabxetex. But since their size is small, it is more an esthetic annoyance
-% than a practical one.}
-% By default we assume the canonical situation where \textsf{U+FDF2} corresponds to
-% {\tradarabic اﷲ}, but the user can change this by choosing one of the package options
-% ¦fdf2alif¦ or ¦fdf2noalif¦; it can also be changed locally by means of the commands
-% \DescribeMacro{\SetAllahWithAlif}
-% \DescribeMacro{\SetAllahWithoutAlif}
-% \cmd\SetAllahWithAlif\ and \cmd\SetAllahWithoutAlif\ \textit{before} making use of
-% \cmd\arabicfont. In a future version we might perhaps implement a database of Arabic fonts
-% within \arabxetex, so that this would work automatically in the most common cases.
-%
-% The font Adobe Arabic has in addition the ligature \textit{fa-li-llāh}:
-% \textit{fā fatḥa lām kasra lām hāʾ} $\rightarrow$ {\adobearabic فَلِله}, which can be
-% entered in \arabtex\ notation as ¦\textarab{falilh}¦. In this particular case we also
-% provide the input convention ¦FALILLAH¦.
-%
-%
-% ^^ATEST Scheherazade: \textarab{l|lh}
-% ^^A
-% ^^A\renewcommand{\arabicfont}{\tradarabic}
-% ^^ATEST Trad Arabic: \textarab{l|lh}
-%
-% ^^ALinotype: \\
-% ^^ALotus Linotype {\lotusfont\char"FDF2} ---
-% ^^AAlHarfAlJadid Linotype One {\fontspec[Scale=1.5]{AlHarfAlJadid Linotype One}\char"FDF2} ---
-% ^^AAlHarfAlJadid Linotype Two {\fontspec[Scale=1.5]{AlHarfAlJadid Linotype Two}\char"FDF2} ---
-% ^^AMariam Linotype {\fontspec[Scale=1.5]{Mariam Linotype}\char"FDF2} ---
-% ^^AQadi Linotype {\fontspec[Scale=1.5]{Qadi Linotype}\char"FDF2}
-% ^^A
-% ^^AFonts from or licensed to Microsoft: \\
-% ^^ATimes New Roman {\fontspec[Scale=1.5]{Times New Roman}\char"FDF2} ---
-% ^^AArial {\fontspec[Scale=1.5]{Arial}\char"FDF2} ---
-% ^^ACourier New {\fontspec[Scale=1.5]{Courier New}\char"FDF2} ---
-% ^^AMicrosoft Sans Serif {\fontspec[Scale=1.5]{Microsoft Sans Serif}\char"FDF2} ---
-% ^^AArial Unicode MS {\arialuni\char"FDF2} ---
-% ^^AArabic Transparent {\fontspec[Scale=1.5]{Arabic Transparent}\char"FDF2} ---
-% ^^ASimplified Arabic {\fontspec[Scale=1.5]{Simplified Arabic}\char"FDF2} ---
-% ^^ASimplified Arabic Fixed {\fontspec[Scale=1.5]{Simplified Arabic Fixed}\char"FDF2} ---
-% ^^AWinSoft Serif Pro {\fontspec[Scale=1.5]{WinSoft Serif Pro}\char"FDF2} ---
-% ^^ATraditional Arabic {\fontspec[Scale=1.5]{Traditional Arabic}\char"FDF2} ---
-% ^^AArabic Typesetting {\arabtype\char"FDF2} ---
-% ^^AAndalus {\fontspec[Scale=1.5]{Andalus}\char"FDF2} ---
-% ^^AOld Antic Bold {\fontspec[Scale=1.5]{Old Antic Bold}\char"FDF2} ---
-% ^^AFarsi Simple Bold {\fontspec[Scale=1.5]{Farsi Simple Bold}\char"FDF2}
-% ^^A
-% ^^A
-% ^^AAdobe:\\
-% ^^AAdobe Arabic {\adobearabic\char"FDF2} ---
-% ^^A
-% ^^ASIL: \\
-% ^^AScheherazade {\arabicfont\char"FDF2} ---
-% ^^ALateef {\fontspec{Lateef}\char"FDF2}
-% ^^A
-% ^^A%CRULP:\\
-% ^^A%Nafees Nastaleeq {\fontspec{Nafees Nastaleeq}\char"FDF2} ---
-% ^^A%{\fontspec{Nafees Pakistani Naskh}\char"FDF2}
-% ^^A
-% ^^AArabeyes:\\
-% ^^AKacstBook {\fontspec{KacstBook}\char"FDF2}
-% ^^AKacstFarsi {\fontspec{KacstFarsi}\char"FDF2}
-%
-%
-%
-%
% \subsection{Transliteration}
%
% At the moment transliteration mappings are provided for Arabic, Persian, Urdu,
% Sindhi and Pashto. The rest may be provided in a future version.
% As a rule the default conventions provided are those of the Library of Congress.
-% \new{1.1.2}For Arabic the alternative transliteration of the
+% For Arabic the alternative transliteration of the
% \href{http://www.orientasia.info/download/arab_trans.pdf}{Deutsche Morgenländische Gesellschaft}
% is also available (but should be still considered experimental).
% You can set it with the command \DescribeMacro{\SetTranslitConvention}
@@ -648,10 +519,7 @@ François Charette
% \end{arab}
% Note that the article \textit{al-} is automatically skipped.
% Note also that since the transliteration is coded in Unicode at the level of
-% the font-mapping, it is necessary that the font contains all required glyphs.\footnote{ ^^A
-% See Appendix~\ref{latinextfonts} for a list of recommended Unicode fonts that cover the
-% full \textsc{latin extended additional} plane.}
-%
+% the font-mapping, it is necessary that the font contains all required glyphs.
% ^^AIf your default roman font does not have the required
% ^^Adiacritics, you can declare for instance
% ^^A¦\SetTranslitStyle{\fontspec{Gentium}\itshape}¦.
@@ -939,7 +807,7 @@ François Charette
% ^^A06BC -> 0646 0631
% ^^A0689 -> 0688
% ^^A
-%
+% \newpage
% \section{Unicode-Encoding concordance}
% \parindent 0pt
% \let\oldbaselineskip=\baselineskip
@@ -1217,134 +1085,32 @@ François Charette
% \textsf{076A} \> {\arabicfont\char"076A} \\
% \textsf{076B} \> {\arabicfont\char"076B} \\
% \textsf{076C} \> {\arabicfont\char"076C} \\
-% \textsf{076D} \> {\arabicfont\char"076D} \\
-% \textbf{Presentation Forms} * \\
+% \textsf{076D} \> {\arabicfont\char"076D} \\
+% ~~~ \> ~~~  \\
+% \textbf{Presentation Forms} \\
% \textsf{FD3E} \> {\arabicfont\char"FD3E} \> ¦))¦ \\
% \textsf{FD3F} \> {\arabicfont\char"FD3F} \> ¦((¦ \\
-% \textsf{FDF0} \> {\arialuni\char"FDF0} \> ¦SALLASTOP¦ \\
-% \textsf{FDF1} \> {\arialuni\char"FDF1} \> ¦QALA¦ \\
-% \textsf{FDF2} \> {\arabicfont\char"FDF2} \> ¦al-ll_ah¦ or ¦ALLAH¦ ** \\
-% \textsf{FDF3} \> {\arialuni\char"FDF3} \> ¦AKBAR¦ \\
-% \textsf{FDF4} \> {\arialuni\char"FDF4} \> ¦MUHAMMAD¦ \\
-% \textsf{FDF5} \> {\arialuni\char"FDF5} \> ¦SALAM¦ \\
-% \textsf{FDF6} \> {\arialuni\char"FDF6} \> ¦RASUL¦ or ¦RASOUL¦ \\
-% \textsf{FDF7} \> {\arialuni\char"FDF7} \> ¦ALAYHI¦ or ¦ALAYHE¦ \\
-% \textsf{FDF8} \> {\arialuni\char"FDF8} \> ¦WASALLAM¦ \\
-% \textsf{FDF9} \> {\arialuni\char"FDF9} \> ¦SALLA¦ \\
-% \textsf{FDFA} \> {\adobearabic\char"FDFA} \> ¦SLM¦ \\
-% \textsf{FDFB} \> {\arialuni\char"FDFB} \> ¦JALLA¦ \\
+% \textsf{FDF0} \> {\arabicfont\char"FDF0} \> ¦SALLASTOP¦ \\
+% \textsf{FDF1} \> {\arabicfont\char"FDF1} \> ¦QALA¦ \\
+% \textsf{FDF3} \> {\arabicfont\char"FDF3} \> ¦AKBAR¦ \\
+% \textsf{FDF4} \> {\arabicfont\char"FDF4} \> ¦MUHAMMAD¦ \\
+% \textsf{FDF5} \> {\arabicfont\char"FDF5} \> ¦SALAM¦ \\
+% \textsf{FDF6} \> {\arabicfont\char"FDF6} \> ¦RASUL¦ or ¦RASOUL¦ \\
+% \textsf{FDF7} \> {\arabicfont\char"FDF7} \> ¦ALAYHI¦ or ¦ALAYHE¦ \\
+% \textsf{FDF8} \> {\arabicfont\char"FDF8} \> ¦WASALLAM¦ \\
+% \textsf{FDF9} \> {\arabicfont\char"FDF9} \> ¦SALLA¦ \\
+% \textsf{FDFA} \> {\arabicfont\char"FDFA} \> ¦SLM¦ \\
+% \textsf{FDFB} \> {\arialuni\char"FDFB} \> ¦JALLA¦ \\ ^^A fixme not available in Amiri
% \textsf{FDFC} \> {\arabicfont\char"FDFC} \> ¦RIYAL¦ \\
-% \textsf{FDFD} \> {\Huge\arabesque\char"F050} \> ¦BASMALA¦ \\
-% \textbf{Non-Unicode Ligatures} \\
-% \> {\tradarabic\char"FDF2} \> ¦ll_ah¦ or ¦LLAH¦ ** \\
-% \> {\adobearabic فَلِله} \> ¦FALILLAH¦ ***
+% \textsf{FDFD} \> {\arabicfont\char"FDFD} \>\hspace*{100pt} ¦BASMALA¦ \\
+% \textbf{Special Combinations} \\
+% \> {\arabicfont الله} \> ¦al-ll_ah¦ or ¦ALLAH¦ \\
+% \> {\arabicfont لله} \> ¦ll_ah¦ or ¦LLAH¦ or ¦LLH¦ \\
+% \> {\arabicfont فَلِله} \> ¦FALILLAH¦
% \end{tabbing}
% \end{multicols}
% \parindentoff
%
-% \baselineskip 14pt
-% \textit{Notes}\\
-% * Since most of these glyphs are not present in Scheherazade
-% (and, with a few exceptions, are very rarely featured in other fonts),
-% for illustration purposes we have taken \textsf{FDF0}, \textsf{FDF1},
-% \textsf{FDF3}--\textsf{FDF9} and \textsf{FDFB} from Arial Unicode MS,
-% \textsf{FDFA} from Adobe Arabic, and \textsf{FDFD} from AGA Arabesque.
-%
-% ** See §~\ref{allahliga}
-%
-% *** Specific to the font Adobe Arabic
-%
-% \newpage
-% \appendix
-% \small
-% \section{Notes on available free and commercial fonts for the Perso-Arabic script}
-% \label{arabicfont}
-%
-% \textcolor{red}{NB: This list is incomplete and has not been updated since 2007.}
-%
-% ^^AThere are few free good quality fonts that support the Arabic script.
-% \begin{compactitem}[\textbf{·}]
-% \item ‘Scheherazade’ and ‘Lateef’ from SIL
-%
-% \item ‘Adobe Arabic’
-%
-% \item Free fonts from \href{http://www.arabeyes.org}{Arabeyes.org}
-%
-% \item \ldots
-%
-% ^^AAdobe Arabic, dlig: (discretionary ligatures)
-% ^^A
-% ^^Aﻓ َ ﻠ ِ ﻠ ﻪ falilh > uni0641064E0644065006440647
-% ^^A
-% ^^Aﻟ ﻠ ﻪ l-l-h > uni064406440647
-% ^^A
-% ^^AA-l-l-h > FDF2
-%
-% \item Arabic fonts on Mac~OS~X: ‘Geeza Pro’, ‘DecoType Naskh’, \ldots more?
-%
-% \item ‘Arabic Typesetting’ and other Arabic fonts licensed to Microsoft
-%
-% \item Commercial fonts by vendors:
-% \begin{compactitem}[\textbf{--}]
-% \item Linotype GmbH: \ldots
-% \item AGFA Monotype: \ldots
-% \item ParaType: \ldots
-% \item \ldots
-% \end{compactitem}
-% \end{compactitem}
-%
-%
-%
-% \section{Recommended Unicode fonts for transliterating Oriental languages}
-% \label{latinextfonts}
-%
-% Here follows a list of open source and freeware fonts with full
-% \textsc{Latin Extended Additional} coverage.\footnote{ ^^A
-% See this \href{http://www.alanwood.net/unicode/fonts.html\#general}{webpage} for more details.}
-% \textcolor{red}{NB: This list has not been updated since 2007.}
-% \begin{compactitem}[\textbf{·}]
-% \item Gentium, Doulos, Charis: \url{http://scripts.sil.org/FontDownloads}
-%
-% \item Junicode: \url{http://junicode.sourceforge.net/}
-%
-% \item Libertine: \url{http://linuxlibertine.sourceforge.net/}
-%
-% \item DejaVu Serif / Sans / Sans Mono: \url{http://dejavu.sourceforge.net/wiki/index.php/Main_Page}
-%
-% \item Lucida Grande: Mac~OS~X
-%
-% \item TITUS Cyberbit Basic: \url{http://titus.fkidg1.uni-frankfurt.de/unicode/tituut.asp}
-%
-% \item Thryomanes: \url{ftp://ftp.io.com/pub/usr/hmiller/fonts/Thryomanes12.zip}
-%
-% \item jGaramond: \url{http://www.janthor.de/jGaramond/}
-%
-% \item Everson Mono Unicode (shareware): \url{http://www.evertype.com/emono/}
-%
-% \item Arial Unicode MS: Windows
-%
-% \item Microsoft Sans Serif: Windows
-%
-% \item FreeSerif / FreeSans / FreeMono: \url{http://savannah.nongnu.org/projects/freefont/}
-%
-% \item Roman Unicode: \url{http://everywitchway.net/linguistics/fonts/roman.html}
-%
-% \item Chrisanthi Unicode: \url{http://everywitchway.net/linguistics/fonts/chrysuni.html}
-%
-% \item HindSight Unicode (not very nice): \url{http://dartcanada.tripod.com/Objets/Zips/HindUnic.zip}
-%
-% \item AbRoman: \url{http://www.languagegeek.com/font/fontdownload.html}
-%
-% \item Garava: \url{http://www.aimwell.org/Fonts/fonts.html}
-%
-% \item Verajja (based on Bitstream Vera Sans, so very similar to DejaVu Sans):
-% \url{http://www.aimwell.org/Fonts/fonts.html}
-%
-% \item Legendum: \url{http://home.kabelfoon.nl/~slam/fonts/fonts.html}
-%
-% \item Code2000 (shareware): \url{http://www.code2000.net}
-% \end{compactitem}
-%
%
% \section{Implementation}
%\iffalse
@@ -1353,18 +1119,18 @@ François Charette
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{arabxetex}
- [2010/03/04 v1.1.4 ArabTeX-like interface for XeLaTeX]
+ [2015/09/04 v1.2.1 ArabTeX-like interface for XeLaTeX]
%
\DeclareOption{fullvoc}{\def\ax@mode{fullvoc}}
\DeclareOption{voc}{\def\ax@mode{voc}}
\DeclareOption{novoc}{\def\ax@mode{novoc}}
\DeclareOption{trans}{\def\ax@mode{trans}}
\DeclareOption{utf}{\def\ax@mode{utf}}
-\DeclareOption{fdf2alif}{\def\ax@font@allah{fdf2alif}}
-\DeclareOption{fdf2noalif}{\def\ax@font@allah{fdf2noalif}}
+\DeclareOption{fdf2alif}{} % deprecated
+\DeclareOption{fdf2noalif}{} % deprecated
\newif\ifmirror@punct\mirror@punctfalse
\DeclareOption{mirrorpunct}{\mirror@puncttrue}
-\ExecuteOptions{novoc,fdf2alif}
+\ExecuteOptions{novoc}
\ProcessOptions
\def\ax@mode@fullvoc{fullvoc}
\def\ax@mode@voc{voc}
@@ -1383,14 +1149,14 @@ François Charette
\RequirePackage{fontspec}
\RequirePackage{bidi}
\AtBeginDocument{\ifdefined\arabicfont\relax\else
- \PackageWarning{arabxetex}{\string\arabicfont\ is not defined!^^JI will try to load Scheherazade (scaled 1.5)}%
- \newfontfamily\arabicfont[Script=Arabic,Scale=1.5]{Scheherazade}\fi}%
+ \PackageWarning{arabxetex}{\string\arabicfont\ is not defined!^^JI will try to load Amiri}%
+ \newfontfamily\arabicfont[Script=Arabic]{Amiri}\fi}%
\def\ax@trans@style{\itshape}%
\newcommand{\SetTranslitStyle}[1]{\def\ax@trans@style{#1}}
\newcommand{\SetTranslitConvention}[1]{\def\ax@trans@convention{#1}}
\def\ax@trans@convention{loc}% Library of Congress is default
-\newcommand{\SetAllahWithAlif}{\def\ax@font@allah{fdf2alif}}
-\newcommand{\SetAllahWithoutAlif}{\def\ax@font@allah{fdf2noalif}}
+\newcommand{\SetAllahWithAlif}{} % deprecated
+\newcommand{\SetAllahWithoutAlif}{} % deprecated
\def\utf@fontfeature{\ifmirror@punct\addfontfeature{Mapping=mirrorpunct}\else\relax\fi}
\def\arabtex@codes{\catcode`^=11\relax\catcode`_=11\relax}
\def\UC{\char"E000} % This is used to capitalize the following letter (ignoring
@@ -1421,12 +1187,12 @@ François Charette
\par\setRL\arabicfont\utf@fontfeature%
\else
\par\setRL\arabicfont\arabtex@codes%
- \addfontfeature{Mapping=arabtex-\ax@font@allah-\@tempa}%
+ \addfontfeature{Mapping=arabtex-\@tempa}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
\par\setRL\arabicfont\arabtex@codes%
- \addfontfeature{Mapping=arabtex-\ax@font@allah-\ax@mode}%
+ \addfontfeature{Mapping=arabtex-\ax@mode}%
\fi}
{\ifx\@tempa\ax@mode@trans\relax\else\unsetRL\fi\par}
\let\Arabic=\arab%
@@ -1444,12 +1210,12 @@ François Charette
\par\setRL\ax@maghribi@font\utf@fontfeature%
\else
\par\setRL\ax@maghribi@font\arabtex@codes%
- \addfontfeature{Mapping=arabtex-\ax@font@allah-maghribi-\@tempa}%
+ \addfontfeature{Mapping=arabtex-maghribi-\@tempa}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
\par\setRL\ax@maghribi@font\arabtex@codes%
- \addfontfeature{Mapping=arabtex-\ax@font@allah-maghribi-\ax@mode}%
+ \addfontfeature{Mapping=arabtex-maghribi-\ax@mode}%
\fi}
{\ifx\@tempa\ax@mode@trans\relax\else\unsetRL\fi\par}
%%%
@@ -1466,12 +1232,12 @@ François Charette
\par\setRL\ax@farsi@font\utf@fontfeature%
\else
\par\setRL\ax@farsi@font\arabtex@codes%
- \addfontfeature{Mapping=arabtex-\ax@font@allah-farsi-\@tempa}%
+ \addfontfeature{Mapping=arabtex-farsi-\@tempa}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
\par\setRL\ax@farsi@font\arabtex@codes%
- \addfontfeature{Mapping=arabtex-\ax@font@allah-farsi-\ax@mode}%
+ \addfontfeature{Mapping=arabtex-farsi-\ax@mode}%
\fi}
{\ifx\@tempa\ax@mode@trans\relax\else\unsetRL\fi\par}
\let\persian=\farsi
@@ -1489,12 +1255,12 @@ François Charette
\par\setRL\ax@urdu@font\addfontfeature{Language=Urdu}%Mapping=arabtex-utf}%
\else
\par\setRL\ax@urdu@font\arabtex@codes%
- \addfontfeature{Mapping=arabtex-\ax@font@allah-urdu-\@tempa}%
+ \addfontfeature{Mapping=arabtex-urdu-\@tempa}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
\par\setRL\ax@urdu@font\arabtex@codes%
- \addfontfeature{Mapping=arabtex-\ax@font@allah-urdu-\ax@mode}%
+ \addfontfeature{Mapping=arabtex-urdu-\ax@mode}%
\fi}
{\ifx\@tempa\ax@mode@trans\relax\else\unsetRL\fi\par}
%%%
@@ -1511,12 +1277,12 @@ François Charette
\par\setRL\ax@pashto@font\utf@fontfeature%
\else
\par\setRL\ax@pashto@font\arabtex@codes%
- \addfontfeature{Mapping=arabtex-\ax@font@allah-pashto-\@tempa}%
+ \addfontfeature{Mapping=arabtex-pashto-\@tempa}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
\par\setRL\ax@pashto@font\arabtex@codes%
- \addfontfeature{Mapping=arabtex-\ax@font@allah-pashto-\ax@mode}%
+ \addfontfeature{Mapping=arabtex-pashto-\ax@mode}%
\fi}
{\ifx\@tempa\ax@mode@trans\relax\else\unsetRL\fi\par}
%%%
@@ -1533,12 +1299,12 @@ François Charette
\par\setRL\ax@sindhi@font\addfontfeature{Language=Sindhi}%Mapping=arabtex-utf}%
\else
\par\setRL\ax@sindhi@font\arabtex@codes%
- \addfontfeature{Mapping=arabtex-\ax@font@allah-sindhi-\@tempa,Language=Sindhi}%
+ \addfontfeature{Mapping=arabtex-sindhi-\@tempa,Language=Sindhi}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
\par\setRL\ax@sindhi@font\arabtex@codes%
- \addfontfeature{Mapping=arabtex-\ax@font@allah-sindhi-\ax@mode,Language=Sindhi}%
+ \addfontfeature{Mapping=arabtex-sindhi-\ax@mode,Language=Sindhi}%
\fi}
{\ifx\@tempa\ax@mode@trans\relax\else\unsetRL\fi\par}
%%%
@@ -1555,12 +1321,12 @@ François Charette
\par\setRL\ax@ottoman@font\utf@fontfeature%
\else
\par\setRL\ax@ottoman@font\arabtex@codes%
- \addfontfeature{Mapping=arabtex-\ax@font@allah-turk-\@tempa}%
+ \addfontfeature{Mapping=arabtex-turk-\@tempa}%
\fi%\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
\par\setRL\ax@ottoman@font\arabtex@codes%
- \addfontfeature{Mapping=arabtex-\ax@font@allah-turk-\ax@mode}%
+ \addfontfeature{Mapping=arabtex-turk-\ax@mode}%
\fi}
{%\ifx\@tempa\ax@mode@trans\relax\else
\unsetRL%\fi
@@ -1578,7 +1344,7 @@ François Charette
\par\setRL\ax@kurdish@font\addfontfeature{Language=Kurdish}%Mapping=arabtex-utf}%
\else
\par\setRL\ax@kurdish@font\arabtex@codes%
- \addfontfeature{Mapping=arabtex-\ax@font@allah-kurdish,Language=Kurdish}%
+ \addfontfeature{Mapping=arabtex-kurdish,Language=Kurdish}%
\fi}
{%\ifx\@tempa\ax@mode@trans\relax\else
\unsetRL%\fi
@@ -1591,18 +1357,18 @@ François Charette
\ifax@mode@defined%
%\ifx\@tempa\ax@mode@trans%
% \par\arabtex@codes\ax@trans@style%
- % \addfontfeature{Mapping=arabtex-\ax@font@allah-kashmiri-trans-\ax@trans@convention}%
+ % \addfontfeature{Mapping=arabtex-kashmiri-trans-\ax@trans@convention}%
%\else
\ifx\@tempa\ax@mode@utf%
\par\setRL\ax@kashmiri@font\utf@fontfeature%
\else
\par\setRL\ax@kashmiri@font\arabtex@codes%
- \addfontfeature{Mapping=arabtex-\ax@font@allah-kashmiri-\@tempa}%
+ \addfontfeature{Mapping=arabtex-kashmiri-\@tempa}%
\fi%\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
\par\setRL\ax@kashmiri@font\arabtex@codes%
- \addfontfeature{Mapping=arabtex-\ax@font@allah-kashmiri-\ax@mode}%
+ \addfontfeature{Mapping=arabtex-kashmiri-\ax@mode}%
\fi}
{%\ifx\@tempa\ax@mode@trans\relax\else
\unsetRL%\fi
@@ -1621,12 +1387,12 @@ François Charette
\par\setRL\ax@malay@font\utf@fontfeature%
\else
\par\setRL\ax@malay@font\arabtex@codes%
- \addfontfeature{Mapping=arabtex-\ax@font@allah-malay-\@tempa}%
+ \addfontfeature{Mapping=arabtex-malay-\@tempa}%
\fi%\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
\par\setRL\ax@malay@font\arabtex@codes%
- \addfontfeature{Mapping=arabtex-\ax@font@allah-malay-\ax@mode}%
+ \addfontfeature{Mapping=arabtex-malay-\ax@mode}%
\fi}
{%\ifx\@tempa\ax@mode@trans\relax\else
\unsetRL%\fi
@@ -1644,7 +1410,7 @@ François Charette
\par\setRL\ax@uighur@font\utf@fontfeature%
\else
\par\setRL\ax@uighur@font\arabtex@codes%
- \addfontfeature{Mapping=arabtex-\ax@font@allah-uighur}%
+ \addfontfeature{Mapping=arabtex-uighur}%
\fi}
{%\ifx\@tempa\ax@mode@trans\relax\else
\unsetRL%\fi
@@ -1671,16 +1437,16 @@ François Charette
\ax@ismode@defined{\@tempa}%
\ifax@mode@defined%
\ifx\@tempa\ax@mode@trans%
- {\ax@trans@style\addfontfeature{Mapping=arabtex-trans-\ax@trans@convention}#2}%
+ {\ax@trans@style\addfontfeature{Mapping=arabtex-trans-\ax@trans@convention}\scantokens{#2\noexpand}}%
\else
\ifx\@tempa\ax@mode@utf%
\RL{\arabicfont\utf@fontfeature #2}%
\else
- \RL{\arabicfont\addfontfeature{Mapping=arabtex-\ax@font@allah-\@tempa}#2}%
+ \RL{\arabicfont\addfontfeature{Mapping=arabtex-\@tempa}\scantokens{#2\noexpand}}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
- \RL{\arabicfont\addfontfeature{Mapping=arabtex-\ax@font@allah-\ax@mode}#2}%
+ \RL{\arabicfont\addfontfeature{Mapping=arabtex-\ax@mode}\scantokens{#2\noexpand}}%
\fi\egroup}
\newcommand\text@maghribi[2][\ax@mode]{%
\edef\@tempa{#1}%
@@ -1694,11 +1460,11 @@ François Charette
\RL{\ax@maghribi@font\utf@fontfeature #2}%
\else
\RL{\ax@maghribi@font%
- \addfontfeature{Mapping=arabtex-\ax@font@allah-maghribi-\@tempa}#2}%
+ \addfontfeature{Mapping=arabtex-maghribi-\@tempa}#2}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
- \RL{\ax@maghribi@font\addfontfeature{Mapping=arabtex-\ax@font@allah-maghribi-\ax@mode}#2}%
+ \RL{\ax@maghribi@font\addfontfeature{Mapping=arabtex-maghribi-\ax@mode}#2}%
\fi\egroup}
\newcommand\text@farsi[2][\ax@mode]{%
\edef\@tempa{#1}%
@@ -1712,11 +1478,11 @@ François Charette
\RL{\ax@farsi@font\utf@fontfeature #2}%
\else
\RL{\ax@farsi@font%
- \addfontfeature{Mapping=arabtex-\ax@font@allah-farsi-\@tempa}#2}%
+ \addfontfeature{Mapping=arabtex-farsi-\@tempa}#2}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
- \RL{\ax@farsi@font\addfontfeature{Mapping=arabtex-\ax@font@allah-farsi-\ax@mode}#2}%
+ \RL{\ax@farsi@font\addfontfeature{Mapping=arabtex-farsi-\ax@mode}#2}%
\fi\egroup}
\newcommand\text@urdu[2][\ax@mode]{%
\edef\@tempa{#1}%
@@ -1730,11 +1496,11 @@ François Charette
\RL{\ax@urdu@font\addfontfeature{Language=Urdu}#2}%eventually Mapping=arabtex-utf
\else
\RL{\ax@urdu@font%
- \addfontfeature{Mapping=arabtex-\ax@font@allah-urdu-\@tempa,Language=Urdu}#2}%
+ \addfontfeature{Mapping=arabtex-urdu-\@tempa,Language=Urdu}#2}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
- \RL{\ax@urdu@font\addfontfeature{Mapping=arabtex-\ax@font@allah-urdu-\ax@mode,Language=Urdu}#2}%
+ \RL{\ax@urdu@font\addfontfeature{Mapping=arabtex-urdu-\ax@mode,Language=Urdu}#2}%
\fi\egroup}
\newcommand\text@sindhi[2][\ax@mode]{%
\edef\@tempa{#1}%
@@ -1748,11 +1514,11 @@ François Charette
\RL{\ax@sindhi@font\addfontfeature{Language=Sindhi} #2}%eventually Mapping=arabtex-utf
\else
\RL{\ax@sindhi@font%
- \addfontfeature{Mapping=arabtex-\ax@font@allah-sindhi-\@tempa,Language=Sindhi}#2}%
+ \addfontfeature{Mapping=arabtex-sindhi-\@tempa,Language=Sindhi}#2}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
- \RL{\ax@sindhi@font\addfontfeature{Mapping=arabtex-\ax@font@allah-sindhi-\ax@mode,Language=Sindhi}#2}%
+ \RL{\ax@sindhi@font\addfontfeature{Mapping=arabtex-sindhi-\ax@mode,Language=Sindhi}#2}%
\fi\egroup}
\newcommand\text@pashto[2][\ax@mode]{%
\edef\@tempa{#1}%
@@ -1766,11 +1532,11 @@ François Charette
\RL{\ax@pashto@font\utf@fontfeature #2}%
\else
\RL{\ax@pashto@font%
- \addfontfeature{Mapping=arabtex-\ax@font@allah-pashto-\@tempa}#2}%
+ \addfontfeature{Mapping=arabtex-pashto-\@tempa}#2}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
- \RL{\ax@pashto@font\addfontfeature{Mapping=arabtex-\ax@font@allah-pashto-\ax@mode}#2}%
+ \RL{\ax@pashto@font\addfontfeature{Mapping=arabtex-pashto-\ax@mode}#2}%
\fi\egroup}
\newcommand\text@ottoman[2][\ax@mode]{%
\edef\@tempa{#1}%
@@ -1785,11 +1551,11 @@ François Charette
\RL{\ax@ottoman@font\utf@fontfeature #2}%
\else
\RL{\ax@ottoman@font%
- \addfontfeature{Mapping=arabtex-\ax@font@allah-turk-\@tempa}#2}%
+ \addfontfeature{Mapping=arabtex-turk-\@tempa}#2}%
\fi%\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
- \RL{\ax@ottoman@font\addfontfeature{Mapping=arabtex-\ax@font@allah-turk-\ax@mode}#2}%
+ \RL{\ax@ottoman@font\addfontfeature{Mapping=arabtex-turk-\ax@mode}#2}%
\fi\egroup}
\newcommand\text@kurdish[2][]{%
\edef\@tempa{#1}%
@@ -1802,7 +1568,7 @@ François Charette
\RL{\ax@kurdish@font\utf@fontfeature #2}%
\else
\RL{\ax@kurdish@font%
- \addfontfeature{Mapping=arabtex-\ax@font@allah-kurdish,Language=Kurdish}#2}%
+ \addfontfeature{Mapping=arabtex-kurdish,Language=Kurdish}#2}%
\fi%\fi
\egroup}
\newcommand\text@kashmiri[2][\ax@mode]{%
@@ -1818,11 +1584,11 @@ François Charette
\RL{\ax@kashmiri@font\utf@fontfeature #2}%
\else
\RL{\ax@kashmiri@font%
- \addfontfeature{Mapping=arabtex-\ax@font@allah-kashmiri-\@tempa}#2}%
+ \addfontfeature{Mapping=arabtex-kashmiri-\@tempa}#2}%
\fi%\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
- \RL{\ax@kashmiri@font\addfontfeature{Mapping=arabtex-\ax@font@allah-kashmiri-\ax@mode}#2}%
+ \RL{\ax@kashmiri@font\addfontfeature{Mapping=arabtex-kashmiri-\ax@mode}#2}%
\fi\egroup}
\newcommand\text@malay[2][\ax@mode]{%
\edef\@tempa{#1}%
@@ -1837,11 +1603,11 @@ François Charette
\RL{\ax@malay@font\utf@fontfeature #2}%
\else
\RL{\ax@malay@font%
- \addfontfeature{Mapping=arabtex-\ax@font@allah-malay-\@tempa}#2}%
+ \addfontfeature{Mapping=arabtex-malay-\@tempa}#2}%
\fi%\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \ax@mode}%
- \RL{\ax@malay@font\addfontfeature{Mapping=arabtex-\ax@font@allah-malay-\ax@mode}#2}%
+ \RL{\ax@malay@font\addfontfeature{Mapping=arabtex-malay-\ax@mode}#2}%
\fi\egroup}
\newcommand\text@uighur[2][]{%
\edef\@tempa{#1}%
@@ -1854,12 +1620,12 @@ François Charette
\RL{\ax@uighur@font\utf@fontfeature #2}%
\else
\RL{\ax@uighur@font%
- \addfontfeature{Mapping=arabtex-\ax@font@allah-uighur}#2}%
+ \addfontfeature{Mapping=arabtex-uighur}#2}%
\fi%\fi
\egroup}
%
\newcommand{\textLR}[1]{\LR{\rmfamily #1}}
-\newcommand{\aemph}[1]{%
+\providecommand*{\aemph}[1]{%
\edef\@tempb{\expandafter\noexpand\csname text\ax@lang\endcsname}%
$\overline{\text{\@tempb{#1}}}$}
% \end{macrocode}
@@ -1879,8 +1645,6 @@ François Charette
% ^^A- hamza directly above baseline (for Qur'an) : 0654 is too high!
% ^^A \def\hamzaB{\raisebox[-1ex]{\char"0654} is ok
% ^^A
-% ^^A- U+FDF2: codify the LLAH ligature as well?
-% ^^A Perhaps the FALILLAH ligature could be added as well?
%
% ^^A\clearpage
% ^^A\PrintChanges
@@ -1894,16 +1658,16 @@ François Charette
%<*dtx-style>
% \begin{macrocode}
\ProvidesPackage{arabxetex-dtx-style}
-\usepackage{fontspec,xltxtra}
+\usepackage[silent]{fontspec}
+\usepackage{hologo}
\usepackage{array,supertabular,xspace,multicol,fancyvrb,paralist}
-\usepackage[voc]{arabxetex}
-\usepackage[dvipdfm]{color}
+\usepackage{color}
\definecolor{myblue}{rgb}{0.02,0.04,0.48}
\definecolor{myred}{rgb}{0.65,0.04,0.07}
\definecolor{darkgray}{gray}{0.3}
\definecolor{lightgray}{gray}{0.6}
\definecolor{IslamicGreen}{rgb}{0,.43,0}
-\usepackage[dvipdfm,
+\usepackage[
bookmarks=true,
colorlinks=true,
linkcolor=myblue,
@@ -1912,11 +1676,12 @@ François Charette
hyperindex=false,
hyperfootnotes=false,
pdftitle={The ArabXeTeX package},
- pdfauthor={F Charette <firmicus@gmx.net>},
+ pdfauthor={F Charette <firmicus04@gmail.com>},
pdfsubject={An ArabTeX-like interface for typesetting languages in Arabic script with XeLaTeX},
pdfkeywords={ArabTeX, XeTeX, XeLaTeX, Arabic, Maghribi, Persian, Farsi, Urdu, Sindhi,
Pashto, Turkish, Ottoman, Kurdish, Kashmiri, Malay, Jawi, Uighur}
]{hyperref}
+\usepackage[voc]{arabxetex}
% NB some of this preamble is taken or adapted from fontspec-doc-style.sty
\newcommand*\pkg[1]{\textsf{#1}}
\def\eg{\textit{e.g.,}\xspace}
@@ -1925,19 +1690,13 @@ François Charette
\def\Eg{\textit{E.g.,}\xspace}
\def\Ie{\textit{I.e.,}\xspace}
\def\etc{\@ifnextchar.{\textit{etc}}{\textit{etc.}\@\xspace}}
-
+\def\eTeX{\hologo{eTeX}}
\newlength{\oldparindent}
\newcommand{\parindentoff}{\setlength{\oldparindent}{\parindent} \setlength{\parindent}{0pt}}
\newcommand{\parindenton}{\setlength{\parindent}{\oldparindent}}
-%% LOGOS, tuned for Palatino:
-\makeatletter
-\TeX@logo@spacing{-0.12em}{-0.12em}%
- {0.5ex}{-0.3em}{-0.12em}{-0.1em}
-\makeatother
\def\arabxetex{Arab\XeTeX}
\def\arabtex{Arab\TeX}
-\def\arabxetexAr{\RL{\fontspec[Script=Arabic,Scale=1.5]{DecoType Thuluth} عرب زيتخ}}
\def\MacOSX{Mac~OS~X}
\def\ASCII{\textsc{ascii}} % ii small caps does not work with Junicode!
@@ -1965,21 +1724,15 @@ François Charette
%%%
%% fontspec declarations:
-\setromanfont[Mapping=tex-text]{Junicode}%{FPL Neu}
+\setmainfont[Ligatures=TeX]{Junicode}
\defaultfontfeatures{Scale=MatchLowercase}
-\setmonofont{Inconsolata}%{Latin Modern Typewriter Proportional}%{Luxi Mono}%{Courier New}
+\setmonofont{Consolas}%{Inconsolata}
\setsansfont{Lucida Sans Unicode}
-\newfontfamily\arabicfont[Script=Arabic,Scale=1.5]{Scheherazade}
-\newfontfamily\urdufont[Script=Arabic,Scale=1.2]{Nafees Pakistani Naskh}%Nafees Nastaleeq does not work well
-\newfontfamily\farsifont[Script=Arabic,Scale=1.33]{Farsi Simple Bold}
-\newfontfamily\lateeffont[Script=Arabic,Scale=1.5]{Lateef}
-\newfontfamily\lotusfont[Script=Arabic,Scale=1.5]{Lotus Linotype}
-\newfontfamily\arabtype[Script=Arabic,Scale=1.5]{Arabic Typesetting}
-\newfontfamily\adobearabic[Script=Arabic,Scale=1.5]{Adobe Arabic}
-\newfontfamily\tradarabic[Script=Arabic,Scale=1.5]{Traditional Arabic}
-\newfontfamily\arabesque{AGA Arabesque}
-\newfontfamily\arialuni{Arial Unicode MS}
-\newfontfamily\gentium{Gentium}
+\newfontfamily\arabicfont[Script=Arabic,Scale=1]{Amiri}
+\newfontfamily\amiriquran[Script=Arabic,Scale=1]{Amiri Quran}
+\newfontfamily\arialuni[Script=Arabic,Scale=1]{Arial Unicode MS}
+\newfontfamily\urdufont[Script=Arabic,Scale=1.2]{Hussaini Nastaleeq}
+\newfontfamily\farsifont[Script=Arabic,Scale=1.33]{IranNastaliq}
\linespread{1.05}
\frenchspacing
diff --git a/Master/texmf-dist/source/xelatex/arabxetex/makemaps.pl b/Master/texmf-dist/source/xelatex/arabxetex/makemaps.pl
index 231a6b5c8ea..d93e5c8c300 100755
--- a/Master/texmf-dist/source/xelatex/arabxetex/makemaps.pl
+++ b/Master/texmf-dist/source/xelatex/arabxetex/makemaps.pl
@@ -11,13 +11,9 @@ mkdir("mappings");
#languages = arab maghribi farsi urdu pashto sindhi kashmiri kurdish turk malay uighur
# but kurdish and uighur are coded separately
-# First the mappings for fonts that have the glyph U+FDF2 with initial alif
-
open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2alif-novoc.map";
+open OUTPUT, ">$output-novoc.map";
while (<MAPS>) {
- s/^#1 // ;
- s/^#0.+\n//m ;
s/^\@An // ;
s/^\@.+\n//m ;
s/^#[A-Z]*A[A-Z]*n // ;
@@ -32,10 +28,8 @@ close OUTPUT;
close MAPS;
open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2alif-voc.map";
+open OUTPUT, ">$output-voc.map";
while (<MAPS>) {
- s/^#1 // ;
- s/^#0.+\n//m ;
s/^\@Av // ;
s/^\@v // ;
s/^\@.+\n//m ;
@@ -51,10 +45,8 @@ close OUTPUT;
close MAPS;
open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2alif-fullvoc.map";
+open OUTPUT, ">$output-fullvoc.map";
while (<MAPS>) {
- s/^#1 // ;
- s/^#0.+\n//m ;
s/^\@Af // ;
s/^\@.+\n//m ;
s/^#[A-Z]*A[A-Z]*[vf] // ;
@@ -71,10 +63,8 @@ close MAPS;
## maghribi
open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2alif-maghribi-novoc.map";
+open OUTPUT, ">$output-maghribi-novoc.map";
while (<MAPS>) {
- s/^#1 // ;
- s/^#0.+\n//m ;
s/^\@Bn // ;
s/^\@.+\n//m ;
s/^#[A-Z]*A[A-Z]*n // ;
@@ -91,10 +81,8 @@ close OUTPUT;
close MAPS;
open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2alif-maghribi-voc.map";
+open OUTPUT, ">$output-maghribi-voc.map";
while (<MAPS>) {
- s/^#1 // ;
- s/^#0.+\n//m ;
s/^\@Bv // ;
s/^\@v // ;
s/^\@.+\n//m ;
@@ -112,10 +100,8 @@ close OUTPUT;
close MAPS;
open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2alif-maghribi-fullvoc.map";
+open OUTPUT, ">$output-maghribi-fullvoc.map";
while (<MAPS>) {
- s/^#1 // ;
- s/^#0.+\n//m ;
s/^\@Bf // ;
s/^\@.+\n//m ;
s/^#[A-Z]*A[A-Z]*[vf] // ;
@@ -134,10 +120,8 @@ close MAPS;
### farsi
open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2alif-farsi-novoc.map";
+open OUTPUT, ">$output-farsi-novoc.map";
while (<MAPS>) {
- s/^#1 // ;
- s/^#0.+\n//m ;
s/^\@Pn // ;
s/^\@.+\n//m ;
s/^#[A-Z]*P[A-Z]*n // ;
@@ -152,10 +136,8 @@ close OUTPUT;
close MAPS;
open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2alif-farsi-voc.map";
+open OUTPUT, ">$output-farsi-voc.map";
while (<MAPS>) {
- s/^#1 // ;
- s/^#0.+\n//m ;
s/^\@Pv // ;
s/^\@v // ;
s/^\@.+\n//m ;
@@ -171,10 +153,8 @@ close OUTPUT;
close MAPS;
open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2alif-farsi-fullvoc.map";
+open OUTPUT, ">$output-farsi-fullvoc.map";
while (<MAPS>) {
- s/^#1 // ;
- s/^#0.+\n//m ;
s/^\@Pf // ;
s/^\@.+\n//m ;
s/^#[A-Z]*P[A-Z]*[vf] // ;
@@ -191,10 +171,8 @@ close MAPS;
### urdu
open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2alif-urdu-novoc.map";
+open OUTPUT, ">$output-urdu-novoc.map";
while (<MAPS>) {
- s/^#1 // ;
- s/^#0.+\n//m ;
s/^\@Un // ;
s/^\@.+\n//m ;
s/^#[A-Z]*U[A-Z]*n // ;
@@ -209,10 +187,8 @@ close OUTPUT;
close MAPS;
open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2alif-urdu-voc.map";
+open OUTPUT, ">$output-urdu-voc.map";
while (<MAPS>) {
- s/^#1 // ;
- s/^#0.+\n//m ;
s/^\@Uv // ;
s/^\@v // ;
s/^\@.+\n//m ;
@@ -228,10 +204,8 @@ close OUTPUT;
close MAPS;
open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2alif-urdu-fullvoc.map";
+open OUTPUT, ">$output-urdu-fullvoc.map";
while (<MAPS>) {
- s/^#1 // ;
- s/^#0.+\n//m ;
s/^\@Uf // ;
s/^\@.+\n//m ;
s/^#[A-Z]*U[A-Z]*[vf] // ;
@@ -248,10 +222,8 @@ close MAPS;
###sindhi
open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2alif-sindhi-novoc.map";
+open OUTPUT, ">$output-sindhi-novoc.map";
while (<MAPS>) {
- s/^#1 // ;
- s/^#0.+\n//m ;
s/^\@Sn // ;
s/^\@.+\n//m ;
s/^#[A-Z]*S[A-Z]*n // ;
@@ -266,10 +238,8 @@ close OUTPUT;
close MAPS;
open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2alif-sindhi-voc.map";
+open OUTPUT, ">$output-sindhi-voc.map";
while (<MAPS>) {
- s/^#1 // ;
- s/^#0.+\n//m ;
s/^\@Sv // ;
s/^\@v // ;
s/^\@.+\n//m ;
@@ -285,10 +255,8 @@ close OUTPUT;
close MAPS;
open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2alif-sindhi-fullvoc.map";
+open OUTPUT, ">$output-sindhi-fullvoc.map";
while (<MAPS>) {
- s/^#1 // ;
- s/^#0.+\n//m ;
s/^\@Sf // ;
s/^\@.+\n//m ;
s/^#[A-Z]*S[A-Z]*[vf] // ;
@@ -305,10 +273,8 @@ close MAPS;
###pashto
open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2alif-pashto-novoc.map";
+open OUTPUT, ">$output-pashto-novoc.map";
while (<MAPS>) {
- s/^#1 // ;
- s/^#0.+\n//m ;
s/^\@Tn // ;
s/^\@.+\n//m ;
s/^#[A-Z]*T[A-Z]*n // ;
@@ -324,10 +290,8 @@ close MAPS;
open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2alif-pashto-voc.map";
+open OUTPUT, ">$output-pashto-voc.map";
while (<MAPS>) {
- s/^#1 // ;
- s/^#0.+\n//m ;
s/^\@Tv // ;
s/^\@v // ;
s/^\@.+\n//m ;
@@ -344,10 +308,8 @@ close MAPS;
open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2alif-pashto-fullvoc.map";
+open OUTPUT, ">$output-pashto-fullvoc.map";
while (<MAPS>) {
- s/^#1 // ;
- s/^#0.+\n//m ;
s/^\@Tf // ;
s/^\@.+\n//m ;
s/^#[A-Z]*T[A-Z]*[vf] // ;
@@ -365,10 +327,8 @@ close MAPS;
###turk
open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2alif-turk-novoc.map";
+open OUTPUT, ">$output-turk-novoc.map";
while (<MAPS>) {
- s/^#1 // ;
- s/^#0.+\n//m ;
s/^\@On // ;
s/^\@.+\n//m ;
s/^#[A-Z]*O[A-Z]*n // ;
@@ -384,10 +344,8 @@ close MAPS;
open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2alif-turk-voc.map";
+open OUTPUT, ">$output-turk-voc.map";
while (<MAPS>) {
- s/^#1 // ;
- s/^#0.+\n//m ;
s/^\@Ov // ;
s/^\@v // ;
s/^\@.+\n//m ;
@@ -404,10 +362,8 @@ close MAPS;
open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2alif-turk-fullvoc.map";
+open OUTPUT, ">$output-turk-fullvoc.map";
while (<MAPS>) {
- s/^#1 // ;
- s/^#0.+\n//m ;
s/^\@Of // ;
s/^\@.+\n//m ;
s/^#[A-Z]*O[A-Z]*[vf] // ;
@@ -424,10 +380,8 @@ close MAPS;
###kashmiri
open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2alif-kashmiri-novoc.map";
+open OUTPUT, ">$output-kashmiri-novoc.map";
while (<MAPS>) {
- s/^#1 // ;
- s/^#0.+\n//m ;
s/^\@Kn // ;
s/^\@.+\n//m ;
s/^#[A-Z]*K[A-Z]*n // ;
@@ -443,10 +397,8 @@ close MAPS;
open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2alif-kashmiri-voc.map";
+open OUTPUT, ">$output-kashmiri-voc.map";
while (<MAPS>) {
- s/^#1 // ;
- s/^#0.+\n//m ;
s/^\@Kv // ;
s/^\@v // ;
s/^\@.+\n//m ;
@@ -463,10 +415,8 @@ close MAPS;
open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2alif-kashmiri-fullvoc.map";
+open OUTPUT, ">$output-kashmiri-fullvoc.map";
while (<MAPS>) {
- s/^#1 // ;
- s/^#0.+\n//m ;
s/^\@Kf // ;
s/^\@.+\n//m ;
s/^#[A-Z]*K[A-Z]*[vf] // ;
@@ -483,10 +433,8 @@ close MAPS;
###malay
open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2alif-malay-novoc.map";
+open OUTPUT, ">$output-malay-novoc.map";
while (<MAPS>) {
- s/^#1 // ;
- s/^#0.+\n//m ;
s/^\@Mn // ;
s/^\@.+\n//m ;
s/^#[A-Z]*M[A-Z]*n // ;
@@ -502,10 +450,8 @@ close MAPS;
open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2alif-malay-voc.map";
+open OUTPUT, ">$output-malay-voc.map";
while (<MAPS>) {
- s/^#1 // ;
- s/^#0.+\n//m ;
s/^\@Mv // ;
s/^\@v // ;
s/^\@.+\n//m ;
@@ -522,10 +468,8 @@ close MAPS;
open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2alif-malay-fullvoc.map";
+open OUTPUT, ">$output-malay-fullvoc.map";
while (<MAPS>) {
- s/^#1 // ;
- s/^#0.+\n//m ;
s/^\@Mf // ;
s/^\@.+\n//m ;
s/^#[A-Z]*M[A-Z]*[vf] // ;
@@ -539,577 +483,6 @@ while (<MAPS>) {
close OUTPUT;
close MAPS;
-## Now the mappings for fonts that do not include the initial alif in U+FDF2
-
-
-open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2noalif-novoc.map";
-while (<MAPS>) {
- s/^#0 // ;
- s/^#1.+\n//m ;
- s/^\@An // ;
- s/^\@.+\n//m ;
- s/^#[A-Z]*A[A-Z]*n // ;
- s/^#[A-Z]*A[A-Z]* // ;
- s/^#-[BPUTSKOM]+n // ;
- s/^#-[BPUTSKOM]+ // ;
- s/^#n // ;
- s/^#.+\n//m ;
- print OUTPUT
-} ;
-close OUTPUT;
-close MAPS;
-
-open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2noalif-voc.map";
-while (<MAPS>) {
- s/^#0 // ;
- s/^#1.+\n//m ;
- s/^\@Av // ;
- s/^\@v // ;
- s/^\@.+\n//m ;
- s/^#[A-Z]*A[A-Z]*v // ;
- s/^#[A-Z]*A[A-Z]* // ;
- s/^#-[BPUTSKOM]+v // ;
- s/^#-[BPUTSKOM]+ // ;
- s/^#v // ;
- s/^#.+\n//m ;
- print OUTPUT
-} ;
-close OUTPUT;
-close MAPS;
-
-open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2noalif-fullvoc.map";
-while (<MAPS>) {
- s/^#0 // ;
- s/^#1.+\n//m ;
- s/^\@Af // ;
- s/^\@.+\n//m ;
- s/^#[A-Z]*A[A-Z]*[vf] // ;
- s/^#[A-Z]*A[A-Z]* // ;
- s/^#-[BPUTSKOM]+[vf] // ;
- s/^#-[BPUTSKOM]+ // ;
- s/^#[vf] // ;
- s/^#.+\n//m ;
- print OUTPUT
-} ;
-close OUTPUT;
-close MAPS;
-
-## maghribi
-
-open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2noalif-maghribi-novoc.map";
-while (<MAPS>) {
- s/^#0 // ;
- s/^#1.+\n//m ;
- s/^\@Bn // ;
- s/^\@.+\n//m ;
- s/^#[A-Z]*A[A-Z]*n // ;
- s/^#[A-Z]*A[A-Z]* // ;
- s/^#[A-Z]*B[A-Z]*n // ;
- s/^#[A-Z]*B[A-Z]* // ;
- s/^#-[PUTSKOM]+n // ;
- s/^#-[PUTSKOM]+ // ;
- s/^#n // ;
- s/^#.+\n//m ;
- print OUTPUT
-} ;
-close OUTPUT;
-close MAPS;
-
-open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2noalif-maghribi-voc.map";
-while (<MAPS>) {
- s/^#0 // ;
- s/^#1.+\n//m ;
- s/^\@Bv // ;
- s/^\@v // ;
- s/^\@.+\n//m ;
- s/^#[A-Z]*A[A-Z]*v // ;
- s/^#[A-Z]*A[A-Z]* // ;
- s/^#[A-Z]*B[A-Z]*v // ;
- s/^#[A-Z]*B[A-Z]* // ;
- s/^#-[PUTSKOM]+v // ;
- s/^#-[PUTSKOM]+ // ;
- s/^#v // ;
- s/^#.+\n//m ;
- print OUTPUT
-} ;
-close OUTPUT;
-close MAPS;
-
-open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2noalif-maghribi-fullvoc.map";
-while (<MAPS>) {
- s/^#0 // ;
- s/^#1.+\n//m ;
- s/^\@Bf // ;
- s/^\@.+\n//m ;
- s/^#[A-Z]*A[A-Z]*[vf] // ;
- s/^#[A-Z]*A[A-Z]* // ;
- s/^#[A-Z]*B[A-Z]*[vf] // ;
- s/^#[A-Z]*B[A-Z]* // ;
- s/^#-[PUTSKOM]+[vf] // ;
- s/^#-[PUTSKOM]+ // ;
- s/^#[vf] // ;
- s/^#.+\n//m ;
- print OUTPUT
-} ;
-close OUTPUT;
-close MAPS;
-
-### farsi
-
-open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2noalif-farsi-novoc.map";
-while (<MAPS>) {
- s/^#0 // ;
- s/^#1.+\n//m ;
- s/^\@Pn // ;
- s/^\@.+\n//m ;
- s/^#[A-Z]*P[A-Z]*n // ;
- s/^#[A-Z]*P[A-Z]* // ;
- s/^#-[ABUTSKOM]+n // ;
- s/^#-[ABUTSKOM]+ // ;
- s/^#n // ;
- s/^#.+\n//m ;
- print OUTPUT
-}
-close OUTPUT;
-close MAPS;
-
-open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2noalif-farsi-voc.map";
-while (<MAPS>) {
- s/^#0 // ;
- s/^#1.+\n//m ;
- s/^\@Pv // ;
- s/^\@v // ;
- s/^\@.+\n//m ;
- s/^#[A-Z]*P[A-Z]*v // ;
- s/^#[A-Z]*P[A-Z]* // ;
- s/^#-[ABUTSKOM]+v // ;
- s/^#-[ABUTSKOM]+ // ;
- s/^#v // ;
- s/^#.+\n//m ;
- print OUTPUT
-}
-close OUTPUT;
-close MAPS;
-
-open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2noalif-farsi-fullvoc.map";
-while (<MAPS>) {
- s/^#0 // ;
- s/^#1.+\n//m ;
- s/^\@Pf // ;
- s/^\@.+\n//m ;
- s/^#[A-Z]*P[A-Z]*[vf] // ;
- s/^#[A-Z]*P[A-Z]* // ;
- s/^#-[ABUTSKOM]+[vf] // ;
- s/^#-[ABUTSKOM]+ // ;
- s/^#[vf] // ;
- s/^#.+\n//m ;
- print OUTPUT
-}
-close OUTPUT;
-close MAPS;
-
-### urdu
-
-open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2noalif-urdu-novoc.map";
-while (<MAPS>) {
- s/^#0 // ;
- s/^#1.+\n//m ;
- s/^\@Un // ;
- s/^\@.+\n//m ;
- s/^#[A-Z]*U[A-Z]*n // ;
- s/^#[A-Z]*U[A-Z]* // ;
- s/^#-[ABPTSKOM]+n // ;
- s/^#-[ABPTSKOM]+ // ;
- s/^#n // ;
- s/^#.+\n//m ;
- print OUTPUT
-}
-close OUTPUT;
-close MAPS;
-
-open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2noalif-urdu-voc.map";
-while (<MAPS>) {
- s/^#0 // ;
- s/^#1.+\n//m ;
- s/^\@Uv // ;
- s/^\@v // ;
- s/^\@.+\n//m ;
- s/^#[A-Z]*U[A-Z]*v // ;
- s/^#[A-Z]*U[A-Z]* // ;
- s/^#-[ABPTSKOM]+v // ;
- s/^#-[ABPTSKOM]+ // ;
- s/^#v // ;
- s/^#.+\n//m ;
- print OUTPUT
-}
-close OUTPUT;
-close MAPS;
-
-open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2noalif-urdu-fullvoc.map";
-while (<MAPS>) {
- s/^#0 // ;
- s/^#1.+\n//m ;
- s/^\@Uf // ;
- s/^\@.+\n//m ;
- s/^#[A-Z]*U[A-Z]*[vf] // ;
- s/^#[A-Z]*U[A-Z]* // ;
- s/^#-[ABPTSKOM]+[vf] // ;
- s/^#-[ABPTSKOM]+ // ;
- s/^#[vf] // ;
- s/^#.+\n//m ;
- print OUTPUT
-}
-close OUTPUT;
-close MAPS;
-
-###sindhi
-
-open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2noalif-sindhi-novoc.map";
-while (<MAPS>) {
- s/^#0 // ;
- s/^#1.+\n//m ;
- s/^\@Sn // ;
- s/^\@.+\n//m ;
- s/^#[A-Z]*S[A-Z]*n // ;
- s/^#[A-Z]*S[A-Z]* // ;
- s/^#-[ABPUTKOM]+n // ;
- s/^#-[ABPUTKOM]+ // ;
- s/^#n // ;
- s/^#.+\n//m ;
- print OUTPUT
-}
-close OUTPUT;
-close MAPS;
-
-open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2noalif-sindhi-voc.map";
-while (<MAPS>) {
- s/^#0 // ;
- s/^#1.+\n//m ;
- s/^\@Sv // ;
- s/^\@v // ;
- s/^\@.+\n//m ;
- s/^#[A-Z]*S[A-Z]*v // ;
- s/^#[A-Z]*S[A-Z]* // ;
- s/^#-[ABPUTKOM]+v // ;
- s/^#-[ABPUTKOM]+ // ;
- s/^#v // ;
- s/^#.+\n//m ;
- print OUTPUT
-}
-close OUTPUT;
-close MAPS;
-
-open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2noalif-sindhi-fullvoc.map";
-while (<MAPS>) {
- s/^#0 // ;
- s/^#1.+\n//m ;
- s/^\@Sf // ;
- s/^\@.+\n//m ;
- s/^#[A-Z]*S[A-Z]*[vf] // ;
- s/^#[A-Z]*S[A-Z]* // ;
- s/^#-[ABPUTKOM]+[vf] // ;
- s/^#-[ABPUTKOM]+ // ;
- s/^#[vf] // ;
- s/^#.+\n//m ;
- print OUTPUT
-}
-close OUTPUT;
-close MAPS;
-
-###pashto
-
-open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2noalif-pashto-novoc.map";
-while (<MAPS>) {
- s/^#0 // ;
- s/^#1.+\n//m ;
- s/^\@Tn // ;
- s/^\@.+\n//m ;
- s/^#[A-Z]*T[A-Z]*n // ;
- s/^#[A-Z]*T[A-Z]* // ;
- s/^#-[ABPUSKOM]+n // ;
- s/^#-[ABPUSKOM]+ // ;
- s/^#n // ;
- s/^#.+\n//m ;
- print OUTPUT
-}
-close OUTPUT;
-close MAPS;
-
-
-open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2noalif-pashto-voc.map";
-while (<MAPS>) {
- s/^#0 // ;
- s/^#1.+\n//m ;
- s/^\@Tv // ;
- s/^\@v // ;
- s/^\@.+\n//m ;
- s/^#[A-Z]*T[A-Z]*v // ;
- s/^#[A-Z]*T[A-Z]* // ;
- s/^#-[ABPUSKOM]+v // ;
- s/^#-[ABPUSKOM]+ // ;
- s/^#v // ;
- s/^#.+\n//m ;
- print OUTPUT
-}
-close OUTPUT;
-close MAPS;
-
-
-open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2noalif-pashto-fullvoc.map";
-while (<MAPS>) {
- s/^#0 // ;
- s/^#1.+\n//m ;
- s/^\@Tf // ;
- s/^\@.+\n//m ;
- s/^#[A-Z]*T[A-Z]*[vf] // ;
- s/^#[A-Z]*T[A-Z]* // ;
- s/^#-[ABPUSKOM]+[vf] // ;
- s/^#-[ABPUSKOM]+ // ;
- s/^#[vf] // ;
- s/^#.+\n//m ;
- print OUTPUT
-}
-close OUTPUT;
-close MAPS;
-
-
-###turk
-
-open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2noalif-turk-novoc.map";
-while (<MAPS>) {
- s/^#0 // ;
- s/^#1.+\n//m ;
- s/^\@On // ;
- s/^\@.+\n//m ;
- s/^#[A-Z]*O[A-Z]*n // ;
- s/^#[A-Z]*O[A-Z]* // ;
- s/^#-[ABPUSKTM]+n // ;
- s/^#-[ABPUSKTM]+ // ;
- s/^#n // ;
- s/^#.+\n//m ;
- print OUTPUT
-}
-close OUTPUT;
-close MAPS;
-
-
-open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2noalif-turk-voc.map";
-while (<MAPS>) {
- s/^#0 // ;
- s/^#1.+\n//m ;
- s/^\@Ov // ;
- s/^\@v // ;
- s/^\@.+\n//m ;
- s/^#[A-Z]*O[A-Z]*v // ;
- s/^#[A-Z]*O[A-Z]* // ;
- s/^#-[ABPUSKTM]+v // ;
- s/^#-[ABPUSKTM]+ // ;
- s/^#v // ;
- s/^#.+\n//m ;
- print OUTPUT
-}
-close OUTPUT;
-close MAPS;
-
-
-open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2noalif-turk-fullvoc.map";
-while (<MAPS>) {
- s/^#0 // ;
- s/^#1.+\n//m ;
- s/^\@Of // ;
- s/^\@.+\n//m ;
- s/^#[A-Z]*O[A-Z]*[vf] // ;
- s/^#[A-Z]*O[A-Z]* // ;
- s/^#-[ABPUSKTM]+[vf] // ;
- s/^#-[ABPUSKTM]+ // ;
- s/^#[vf] // ;
- s/^#.+\n//m ;
- print OUTPUT
-}
-close OUTPUT;
-close MAPS;
-
-###kashmiri
-
-open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2noalif-kashmiri-novoc.map";
-while (<MAPS>) {
- s/^#0 // ;
- s/^#1.+\n//m ;
- s/^\@Kn // ;
- s/^\@.+\n//m ;
- s/^#[A-Z]*K[A-Z]*n // ;
- s/^#[A-Z]*K[A-Z]* // ;
- s/^#-[ABPUSOTM]+n // ;
- s/^#-[ABPUSOTM]+ // ;
- s/^#n // ;
- s/^#.+\n//m ;
- print OUTPUT
-}
-close OUTPUT;
-close MAPS;
-
-
-open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2noalif-kashmiri-voc.map";
-while (<MAPS>) {
- s/^#0 // ;
- s/^#1.+\n//m ;
- s/^\@Kv // ;
- s/^\@v // ;
- s/^\@.+\n//m ;
- s/^#[A-Z]*K[A-Z]*v // ;
- s/^#[A-Z]*K[A-Z]* // ;
- s/^#-[ABPUSOTM]+v // ;
- s/^#-[ABPUSOTM]+ // ;
- s/^#v // ;
- s/^#.+\n//m ;
- print OUTPUT
-}
-close OUTPUT;
-close MAPS;
-
-
-open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2noalif-kashmiri-fullvoc.map";
-while (<MAPS>) {
- s/^#0 // ;
- s/^#1.+\n//m ;
- s/^\@Kf // ;
- s/^\@.+\n//m ;
- s/^#[A-Z]*K[A-Z]*[vf] // ;
- s/^#[A-Z]*K[A-Z]* // ;
- s/^#-[ABPUSOTM]+[vf] // ;
- s/^#-[ABPUSOTM]+ // ;
- s/^#[vf] // ;
- s/^#.+\n//m ;
- print OUTPUT
-}
-close OUTPUT;
-close MAPS;
-
-###malay
-
-open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2noalif-malay-novoc.map";
-while (<MAPS>) {
- s/^#0 // ;
- s/^#1.+\n//m ;
- s/^\@Mn // ;
- s/^\@.+\n//m ;
- s/^#[A-Z]*M[A-Z]*n // ;
- s/^#[A-Z]*M[A-Z]* // ;
- s/^#-[ABPUSKOT]+n // ;
- s/^#-[ABPUSKOT]+ // ;
- s/^#n // ;
- s/^#.+\n//m ;
- print OUTPUT
-}
-close OUTPUT;
-close MAPS;
-
-
-open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2noalif-malay-voc.map";
-while (<MAPS>) {
- s/^#0 // ;
- s/^#1.+\n//m ;
- s/^\@Mv // ;
- s/^\@v // ;
- s/^\@.+\n//m ;
- s/^#[A-Z]*M[A-Z]*v // ;
- s/^#[A-Z]*M[A-Z]* // ;
- s/^#-[ABPUSKOT]+v // ;
- s/^#-[ABPUSKOT]+ // ;
- s/^#v // ;
- s/^#.+\n//m ;
- print OUTPUT
-}
-close OUTPUT;
-close MAPS;
-
-
-open MAPS, "<$master" ;
-open OUTPUT, ">$output-fdf2noalif-malay-fullvoc.map";
-while (<MAPS>) {
- s/^#0 // ;
- s/^#1.+\n//m ;
- s/^\@Mf // ;
- s/^\@.+\n//m ;
- s/^#[A-Z]*M[A-Z]*[vf] // ;
- s/^#[A-Z]*M[A-Z]* // ;
- s/^#-[ABPUSKOT]+[vf] // ;
- s/^#-[ABPUSKOT]+ // ;
- s/^#[vf] // ;
- s/^#.+\n//m ;
- print OUTPUT
-}
-close OUTPUT;
-close MAPS;
-
-# Now Kurdish and Uighur...
-
-open MAPS, "<arabtex-kurdish.maps" ;
-open OUTPUT, ">$output-fdf2noalif-kurdish.map";
-while (<MAPS>) {
- s/^#0 // ;
- s/^#1.+\n//m ;
- print OUTPUT
-}
-close OUTPUT;
-close MAPS;
-
-open MAPS, "<arabtex-uighur.maps" ;
-open OUTPUT, ">$output-fdf2noalif-uighur.map";
-while (<MAPS>) {
- s/^#0 // ;
- s/^#1.+\n//m ;
- print OUTPUT
-}
-close OUTPUT;
-close MAPS;
-
-open MAPS, "<arabtex-kurdish.maps" ;
-open OUTPUT, ">$output-fdf2alif-kurdish.map";
-while (<MAPS>) {
- s/^#1 // ;
- s/^#0.+\n//m ;
- print OUTPUT
-}
-close OUTPUT;
-close MAPS;
-
-open MAPS, "<arabtex-uighur.maps" ;
-open OUTPUT, ">$output-fdf2alif-uighur.map";
-while (<MAPS>) {
- s/^#1 // ;
- s/^#0.+\n//m ;
- print OUTPUT
-}
-close OUTPUT;
-close MAPS;
-
# Let's compile them now
system("cp *.map mappings/");
system("for map in mappings/*.map; do echo \"compiling \$map ...\" && teckit_compile \$map; done");
diff --git a/Master/texmf-dist/tex/xelatex/arabxetex/arabxetex.sty b/Master/texmf-dist/tex/xelatex/arabxetex/arabxetex.sty
index 67e8391b58b..489a0245c2c 100644
--- a/Master/texmf-dist/tex/xelatex/arabxetex/arabxetex.sty
+++ b/Master/texmf-dist/tex/xelatex/arabxetex/arabxetex.sty
@@ -8,23 +8,23 @@
%%
%% ____________________________
%% The arabxetex package
-%% © 2007–2010 François Charette
+%% © 2007–2015 François Charette
%% License information appended
%%
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{arabxetex}
- [2010/03/04 v1.1.4 ArabTeX-like interface for XeLaTeX]
+ [2015/09/04 v1.2.1 ArabTeX-like interface for XeLaTeX]
\DeclareOption{fullvoc}{\def\ax@mode{fullvoc}}
\DeclareOption{voc}{\def\ax@mode{voc}}
\DeclareOption{novoc}{\def\ax@mode{novoc}}
\DeclareOption{trans}{\def\ax@mode{trans}}
\DeclareOption{utf}{\def\ax@mode{utf}}
-\DeclareOption{fdf2alif}{\def\ax@font@allah{fdf2alif}}
-\DeclareOption{fdf2noalif}{\def\ax@font@allah{fdf2noalif}}
+\DeclareOption{fdf2alif}{} % deprecated
+\DeclareOption{fdf2noalif}{} % deprecated
\newif\ifmirror@punct\mirror@punctfalse
\DeclareOption{mirrorpunct}{\mirror@puncttrue}
-\ExecuteOptions{novoc,fdf2alif}
+\ExecuteOptions{novoc}
\ProcessOptions
\def\ax@mode@fullvoc{fullvoc}
\def\ax@mode@voc{voc}
@@ -43,14 +43,14 @@
\RequirePackage{fontspec}
\RequirePackage{bidi}
\AtBeginDocument{\ifdefined\arabicfont\relax\else
-\PackageWarning{arabxetex}{\string\arabicfont\ is not defined!^^JI will try to load Scheherazade (scaled 1.5)}%
-\newfontfamily\arabicfont[Script=Arabic,Scale=1.5]{Scheherazade}\fi}%
+\PackageWarning{arabxetex}{\string\arabicfont\ is not defined!^^JI will try to load Amiri}%
+\newfontfamily\arabicfont[Script=Arabic]{Amiri}\fi}%
\def\ax@trans@style{\itshape}%
\newcommand{\SetTranslitStyle}[1]{\def\ax@trans@style{#1}}
\newcommand{\SetTranslitConvention}[1]{\def\ax@trans@convention{#1}}
\def\ax@trans@convention{loc}% Library of Congress is default
-\newcommand{\SetAllahWithAlif}{\def\ax@font@allah{fdf2alif}}
-\newcommand{\SetAllahWithoutAlif}{\def\ax@font@allah{fdf2noalif}}
+\newcommand{\SetAllahWithAlif}{} % deprecated
+\newcommand{\SetAllahWithoutAlif}{} % deprecated
\def\utf@fontfeature{\ifmirror@punct\addfontfeature{Mapping=mirrorpunct}\else\relax\fi}
\def\arabtex@codes{\catcode`^=11\relax\catcode`_=11\relax}
\def\UC{\char"E000} % This is used to capitalize the following letter (ignoring
@@ -81,12 +81,12 @@
\par\setRL\arabicfont\utf@fontfeature%
\else
\par\setRL\arabicfont\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-\@tempa}%
+\addfontfeature{Mapping=arabtex-\@tempa}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
\par\setRL\arabicfont\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-\ax@mode}%
+\addfontfeature{Mapping=arabtex-\ax@mode}%
\fi}
{\ifx\@tempa\ax@mode@trans\relax\else\unsetRL\fi\par}
\let\Arabic=\arab%
@@ -104,12 +104,12 @@
\par\setRL\ax@maghribi@font\utf@fontfeature%
\else
\par\setRL\ax@maghribi@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-maghribi-\@tempa}%
+\addfontfeature{Mapping=arabtex-maghribi-\@tempa}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
\par\setRL\ax@maghribi@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-maghribi-\ax@mode}%
+\addfontfeature{Mapping=arabtex-maghribi-\ax@mode}%
\fi}
{\ifx\@tempa\ax@mode@trans\relax\else\unsetRL\fi\par}
%%%
@@ -126,12 +126,12 @@
\par\setRL\ax@farsi@font\utf@fontfeature%
\else
\par\setRL\ax@farsi@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-farsi-\@tempa}%
+\addfontfeature{Mapping=arabtex-farsi-\@tempa}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
\par\setRL\ax@farsi@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-farsi-\ax@mode}%
+\addfontfeature{Mapping=arabtex-farsi-\ax@mode}%
\fi}
{\ifx\@tempa\ax@mode@trans\relax\else\unsetRL\fi\par}
\let\persian=\farsi
@@ -149,12 +149,12 @@
\par\setRL\ax@urdu@font\addfontfeature{Language=Urdu}%Mapping=arabtex-utf}%
\else
\par\setRL\ax@urdu@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-urdu-\@tempa}%
+\addfontfeature{Mapping=arabtex-urdu-\@tempa}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
\par\setRL\ax@urdu@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-urdu-\ax@mode}%
+\addfontfeature{Mapping=arabtex-urdu-\ax@mode}%
\fi}
{\ifx\@tempa\ax@mode@trans\relax\else\unsetRL\fi\par}
%%%
@@ -171,12 +171,12 @@
\par\setRL\ax@pashto@font\utf@fontfeature%
\else
\par\setRL\ax@pashto@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-pashto-\@tempa}%
+\addfontfeature{Mapping=arabtex-pashto-\@tempa}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
\par\setRL\ax@pashto@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-pashto-\ax@mode}%
+\addfontfeature{Mapping=arabtex-pashto-\ax@mode}%
\fi}
{\ifx\@tempa\ax@mode@trans\relax\else\unsetRL\fi\par}
%%%
@@ -193,12 +193,12 @@
\par\setRL\ax@sindhi@font\addfontfeature{Language=Sindhi}%Mapping=arabtex-utf}%
\else
\par\setRL\ax@sindhi@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-sindhi-\@tempa,Language=Sindhi}%
+\addfontfeature{Mapping=arabtex-sindhi-\@tempa,Language=Sindhi}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
\par\setRL\ax@sindhi@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-sindhi-\ax@mode,Language=Sindhi}%
+\addfontfeature{Mapping=arabtex-sindhi-\ax@mode,Language=Sindhi}%
\fi}
{\ifx\@tempa\ax@mode@trans\relax\else\unsetRL\fi\par}
%%%
@@ -211,12 +211,12 @@
\par\setRL\ax@ottoman@font\utf@fontfeature%
\else
\par\setRL\ax@ottoman@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-turk-\@tempa}%
+\addfontfeature{Mapping=arabtex-turk-\@tempa}%
\fi%\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
\par\setRL\ax@ottoman@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-turk-\ax@mode}%
+\addfontfeature{Mapping=arabtex-turk-\ax@mode}%
\fi}
{%\ifx\@tempa\ax@mode@trans\relax\else
\unsetRL%\fi
@@ -229,7 +229,7 @@
\par\setRL\ax@kurdish@font\addfontfeature{Language=Kurdish}%Mapping=arabtex-utf}%
\else
\par\setRL\ax@kurdish@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-kurdish,Language=Kurdish}%
+\addfontfeature{Mapping=arabtex-kurdish,Language=Kurdish}%
\fi}
{%\ifx\@tempa\ax@mode@trans\relax\else
\unsetRL%\fi
@@ -244,12 +244,12 @@
\par\setRL\ax@kashmiri@font\utf@fontfeature%
\else
\par\setRL\ax@kashmiri@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-kashmiri-\@tempa}%
+\addfontfeature{Mapping=arabtex-kashmiri-\@tempa}%
\fi%\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
\par\setRL\ax@kashmiri@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-kashmiri-\ax@mode}%
+\addfontfeature{Mapping=arabtex-kashmiri-\ax@mode}%
\fi}
{%\ifx\@tempa\ax@mode@trans\relax\else
\unsetRL%\fi
@@ -264,12 +264,12 @@
\par\setRL\ax@malay@font\utf@fontfeature%
\else
\par\setRL\ax@malay@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-malay-\@tempa}%
+\addfontfeature{Mapping=arabtex-malay-\@tempa}%
\fi%\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
\par\setRL\ax@malay@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-malay-\ax@mode}%
+\addfontfeature{Mapping=arabtex-malay-\ax@mode}%
\fi}
{%\ifx\@tempa\ax@mode@trans\relax\else
\unsetRL%\fi
@@ -283,7 +283,7 @@
\par\setRL\ax@uighur@font\utf@fontfeature%
\else
\par\setRL\ax@uighur@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-uighur}%
+\addfontfeature{Mapping=arabtex-uighur}%
\fi}
{%\ifx\@tempa\ax@mode@trans\relax\else
\unsetRL%\fi
@@ -310,16 +310,16 @@
\ax@ismode@defined{\@tempa}%
\ifax@mode@defined%
\ifx\@tempa\ax@mode@trans%
-{\ax@trans@style\addfontfeature{Mapping=arabtex-trans-\ax@trans@convention}#2}%
+{\ax@trans@style\addfontfeature{Mapping=arabtex-trans-\ax@trans@convention}\scantokens{#2\noexpand}}%
\else
\ifx\@tempa\ax@mode@utf%
\RL{\arabicfont\utf@fontfeature #2}%
\else
-\RL{\arabicfont\addfontfeature{Mapping=arabtex-\ax@font@allah-\@tempa}#2}%
+\RL{\arabicfont\addfontfeature{Mapping=arabtex-\@tempa}\scantokens{#2\noexpand}}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
-\RL{\arabicfont\addfontfeature{Mapping=arabtex-\ax@font@allah-\ax@mode}#2}%
+\RL{\arabicfont\addfontfeature{Mapping=arabtex-\ax@mode}\scantokens{#2\noexpand}}%
\fi\egroup}
\newcommand\text@maghribi[2][\ax@mode]{%
\edef\@tempa{#1}%
@@ -333,11 +333,11 @@
\RL{\ax@maghribi@font\utf@fontfeature #2}%
\else
\RL{\ax@maghribi@font%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-maghribi-\@tempa}#2}%
+\addfontfeature{Mapping=arabtex-maghribi-\@tempa}#2}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
-\RL{\ax@maghribi@font\addfontfeature{Mapping=arabtex-\ax@font@allah-maghribi-\ax@mode}#2}%
+\RL{\ax@maghribi@font\addfontfeature{Mapping=arabtex-maghribi-\ax@mode}#2}%
\fi\egroup}
\newcommand\text@farsi[2][\ax@mode]{%
\edef\@tempa{#1}%
@@ -351,11 +351,11 @@
\RL{\ax@farsi@font\utf@fontfeature #2}%
\else
\RL{\ax@farsi@font%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-farsi-\@tempa}#2}%
+\addfontfeature{Mapping=arabtex-farsi-\@tempa}#2}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
-\RL{\ax@farsi@font\addfontfeature{Mapping=arabtex-\ax@font@allah-farsi-\ax@mode}#2}%
+\RL{\ax@farsi@font\addfontfeature{Mapping=arabtex-farsi-\ax@mode}#2}%
\fi\egroup}
\newcommand\text@urdu[2][\ax@mode]{%
\edef\@tempa{#1}%
@@ -369,11 +369,11 @@
\RL{\ax@urdu@font\addfontfeature{Language=Urdu}#2}%eventually Mapping=arabtex-utf
\else
\RL{\ax@urdu@font%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-urdu-\@tempa,Language=Urdu}#2}%
+\addfontfeature{Mapping=arabtex-urdu-\@tempa,Language=Urdu}#2}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
-\RL{\ax@urdu@font\addfontfeature{Mapping=arabtex-\ax@font@allah-urdu-\ax@mode,Language=Urdu}#2}%
+\RL{\ax@urdu@font\addfontfeature{Mapping=arabtex-urdu-\ax@mode,Language=Urdu}#2}%
\fi\egroup}
\newcommand\text@sindhi[2][\ax@mode]{%
\edef\@tempa{#1}%
@@ -387,11 +387,11 @@
\RL{\ax@sindhi@font\addfontfeature{Language=Sindhi} #2}%eventually Mapping=arabtex-utf
\else
\RL{\ax@sindhi@font%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-sindhi-\@tempa,Language=Sindhi}#2}%
+\addfontfeature{Mapping=arabtex-sindhi-\@tempa,Language=Sindhi}#2}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
-\RL{\ax@sindhi@font\addfontfeature{Mapping=arabtex-\ax@font@allah-sindhi-\ax@mode,Language=Sindhi}#2}%
+\RL{\ax@sindhi@font\addfontfeature{Mapping=arabtex-sindhi-\ax@mode,Language=Sindhi}#2}%
\fi\egroup}
\newcommand\text@pashto[2][\ax@mode]{%
\edef\@tempa{#1}%
@@ -405,11 +405,11 @@
\RL{\ax@pashto@font\utf@fontfeature #2}%
\else
\RL{\ax@pashto@font%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-pashto-\@tempa}#2}%
+\addfontfeature{Mapping=arabtex-pashto-\@tempa}#2}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
-\RL{\ax@pashto@font\addfontfeature{Mapping=arabtex-\ax@font@allah-pashto-\ax@mode}#2}%
+\RL{\ax@pashto@font\addfontfeature{Mapping=arabtex-pashto-\ax@mode}#2}%
\fi\egroup}
\newcommand\text@ottoman[2][\ax@mode]{%
\edef\@tempa{#1}%
@@ -420,11 +420,11 @@
\RL{\ax@ottoman@font\utf@fontfeature #2}%
\else
\RL{\ax@ottoman@font%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-turk-\@tempa}#2}%
+\addfontfeature{Mapping=arabtex-turk-\@tempa}#2}%
\fi%\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
-\RL{\ax@ottoman@font\addfontfeature{Mapping=arabtex-\ax@font@allah-turk-\ax@mode}#2}%
+\RL{\ax@ottoman@font\addfontfeature{Mapping=arabtex-turk-\ax@mode}#2}%
\fi\egroup}
\newcommand\text@kurdish[2][]{%
\edef\@tempa{#1}%
@@ -433,7 +433,7 @@
\RL{\ax@kurdish@font\utf@fontfeature #2}%
\else
\RL{\ax@kurdish@font%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-kurdish,Language=Kurdish}#2}%
+\addfontfeature{Mapping=arabtex-kurdish,Language=Kurdish}#2}%
\fi%\fi
\egroup}
\newcommand\text@kashmiri[2][\ax@mode]{%
@@ -445,11 +445,11 @@
\RL{\ax@kashmiri@font\utf@fontfeature #2}%
\else
\RL{\ax@kashmiri@font%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-kashmiri-\@tempa}#2}%
+\addfontfeature{Mapping=arabtex-kashmiri-\@tempa}#2}%
\fi%\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
-\RL{\ax@kashmiri@font\addfontfeature{Mapping=arabtex-\ax@font@allah-kashmiri-\ax@mode}#2}%
+\RL{\ax@kashmiri@font\addfontfeature{Mapping=arabtex-kashmiri-\ax@mode}#2}%
\fi\egroup}
\newcommand\text@malay[2][\ax@mode]{%
\edef\@tempa{#1}%
@@ -460,11 +460,11 @@
\RL{\ax@malay@font\utf@fontfeature #2}%
\else
\RL{\ax@malay@font%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-malay-\@tempa}#2}%
+\addfontfeature{Mapping=arabtex-malay-\@tempa}#2}%
\fi%\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \ax@mode}%
-\RL{\ax@malay@font\addfontfeature{Mapping=arabtex-\ax@font@allah-malay-\ax@mode}#2}%
+\RL{\ax@malay@font\addfontfeature{Mapping=arabtex-malay-\ax@mode}#2}%
\fi\egroup}
\newcommand\text@uighur[2][]{%
\edef\@tempa{#1}%
@@ -473,15 +473,15 @@
\RL{\ax@uighur@font\utf@fontfeature #2}%
\else
\RL{\ax@uighur@font%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-uighur}#2}%
+\addfontfeature{Mapping=arabtex-uighur}#2}%
\fi%\fi
\egroup}
\newcommand{\textLR}[1]{\LR{\rmfamily #1}}
-\newcommand{\aemph}[1]{%
+\providecommand*{\aemph}[1]{%
\edef\@tempb{\expandafter\noexpand\csname text\ax@lang\endcsname}%
$\overline{\text{\@tempb{#1}}}$}
%%
-%% Copyright © 2007–2010 by François Charette <firmicus at gmx dot net>
+%% Copyright © 2007–2015 by François Charette <firmicus04 at gmail dot com>
%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of