arabxetex update (16jul08)

git-svn-id: svn://tug.org/texlive/trunk@9622 c570f23f-e606-0410-a88d-b1316a301751
author: Karl Berry <karl@freefriends.org> 2008-07-17 00:56:24 +0000
committer: Karl Berry <karl@freefriends.org> 2008-07-17 00:56:24 +0000
commit: 48028bc22502c883b08b5ae8fd248054918e01ff (patch)
tree: b8f2f165a9ed68fe5672144f32f6f5a530b6cdaf /Master/texmf-dist/fonts
parent: 33fc230bb96a6ff4189552866e9865db6019c18c (diff)
126 files changed, 192 insertions, 27006 deletions
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabic-novowels.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabic-novowels.map
deleted file mode 100644
index dcb9cc2dbbb..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabic-novowels.map
+++ /dev/null
@@ -1,8 +0,0 @@
-LHSName  "Arab-Unicode"
-RHSName  "Arab-Unicode-novowels"
-
-pass(Unicode)
-Class [VWL]  = (U+064B..U+065E U+0670);
-
-[VWL] > ;
-
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabicdigits.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabicdigits.map
deleted file mode 100644
index 9a6bf63b66f..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabicdigits.map
+++ /dev/null
@@ -1,16 +0,0 @@
-; FC ... 
-LHSName	"Digits"
-RHSName	"ArabicDigits"
-
-pass(Unicode)
-U+0030 <> U+0660 ;
-U+0031 <> U+0661 ;
-U+0032 <> U+0662 ;
-U+0033 <> U+0663 ;
-U+0034 <> U+0664 ;
-U+0035 <> U+0665 ;
-U+0036 <> U+0666 ;
-U+0037 <> U+0667 ;
-U+0038 <> U+0668 ;
-U+0039 <> U+0669 ;
-
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabicfixes.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabicfixes.map
deleted file mode 100644
index f0f69965d02..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabicfixes.map
+++ /dev/null
@@ -1,16 +0,0 @@
-; FC ... 
-LHSName	"LamVowelsAlif"
-RHSName	"LamAlifVowels"
-
-pass(Unicode)
-U+0644 U+0651 U+064E U+0627 <> U+0644 U+0627 U+0651 U+064E ; lam shadda fatha alif -> lam alif shadda fatha 
-U+0644 U+0651 U+0627 <> U+0644 U+0627 U+0651  ; lam shadda alif -> lam alif shadda
-U+0644 U+0652 U+0622 <> U+0644 U+0622 U+0652  ; lam sukun alifmadda -> lam alifmadda sukun 
-U+0644 U+0652 U+0623 <> U+0644 U+0623 U+0652  ; lam sukun alifhamzaabove -> lam alifhamzaabove sukun 
-U+0644 U+0652 U+0625 <> U+0644 U+0625 U+0652  ; lam sukun alifhamzabelow -> lam alifhamzabelow sukun
-U+0644 U+0651 U+064B U+0627 <> U+0644 U+0627 U+0651 U+064b ; lam shadda fathatan alif -> lam alif shadda fathatan
-U+0644 U+064B U+0627 <> U+0644 U+0627 U+064B ; lam fathatan alif -> lam alif fathatan
-
-U+002C <> U+060C ; comma > arabic comma
-U+003F <> U+061F ; question mark -> arabic qm
-U+003B <> U+061B ; semicolon -> arabic semicolon
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-farsi-trans.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-farsi-trans-loc.map
index 89f0d3a79b4..89f0d3a79b4 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-farsi-trans.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-farsi-trans-loc.map
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-farsi-trans.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-farsi-trans-loc.tec
index c5af28bae93..c5af28bae93 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-farsi-trans.tec
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-farsi-trans-loc.tec
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 943684273fd..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-farsi-fullvoc.map
+++ /dev/null
@@ -1,493 +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 [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
-(a|A) 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
-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
index 1d922688073..5ea246518ac 100644
--- 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
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 235f354a3b1..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-farsi-novoc.map
+++ /dev/null
@@ -1,477 +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 [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
-(a|A) 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
-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
index c6e09cf1b7b..8a113805622 100644
--- 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
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 b74ff0ca974..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-farsi-voc.map
+++ /dev/null
@@ -1,488 +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 [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
-(a|A) 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
-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
index 4ea2b097ea5..8345fe580fe 100644
--- 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
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 bd32090f24e..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-fullvoc.map
+++ /dev/null
@@ -1,479 +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 [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
-(a|A) 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
-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
index 3c491312e4f..5973ffd9927 100644
--- 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
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 a87c601a4f6..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kashmiri-fullvoc.map
+++ /dev/null
@@ -1,511 +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 [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
-(a|A) 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
-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
index d7ddf6f8158..7ed4f7bb38c 100644
--- 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
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 c28feca1d99..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kashmiri-novoc.map
+++ /dev/null
@@ -1,495 +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 [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
-(a|A) 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
-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
index b7eb8f058e8..94c4aa3366b 100644
--- 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
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 9f86d34a05d..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kashmiri-voc.map
+++ /dev/null
@@ -1,506 +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 [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
-(a|A) 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
-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
index 6a3fd38e904..03596e0df92 100644
--- 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
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-fdf2alif-kurdish.map
deleted file mode 100644
index 85c3e365354..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-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+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
-
-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-fdf2alif-maghribi-fullvoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-maghribi-fullvoc.map
deleted file mode 100644
index 565b96ffb5e..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-maghribi-fullvoc.map
+++ /dev/null
@@ -1,479 +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 [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
-(a|A) 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
-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
index 794d9a903bc..86c641da78f 100644
--- 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
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 b682ac30fae..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-maghribi-novoc.map
+++ /dev/null
@@ -1,462 +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 [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
-(a|A) 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
-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
index 92e0c87133b..1c14ab69492 100644
--- 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
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 1fd07ce86c6..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-maghribi-voc.map
+++ /dev/null
@@ -1,474 +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 [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
-(a|A) 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
-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
index 8f628396d34..5b4893b492a 100644
--- 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
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 40f2a075de1..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-malay-fullvoc.map
+++ /dev/null
@@ -1,483 +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 [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
-(a|A) 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
-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
index 27b378d5765..043262206de 100644
--- 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
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 5718e9f1c55..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-malay-novoc.map
+++ /dev/null
@@ -1,467 +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 [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
-(a|A) 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
-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
index 07e0739c200..50e772e74e6 100644
--- 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
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 29d13f4aa8e..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-malay-voc.map
+++ /dev/null
@@ -1,478 +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 [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
-(a|A) 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
-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
index b2b2e4a5aed..44b62900a48 100644
--- 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
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 7dc385bd43e..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-novoc.map
+++ /dev/null
@@ -1,462 +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 [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
-(a|A) 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
-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
index 16184d6ee50..779020ebab9 100644
--- 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
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 c5b8be9beee..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-pashto-fullvoc.map
+++ /dev/null
@@ -1,489 +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 [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
-(a|A) 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
-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
index 2e12ed9f965..b02bb82642f 100644
--- 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
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 af71e133e79..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-pashto-novoc.map
+++ /dev/null
@@ -1,473 +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 [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
-(a|A) 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
-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
index b378d09e49a..0f9aac708b3 100644
--- 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
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 5f046f43ff0..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-pashto-voc.map
+++ /dev/null
@@ -1,484 +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 [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
-(a|A) 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
-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
index 1491934d963..18cfd87bbd2 100644
--- 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
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 c6158c867ab..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-sindhi-fullvoc.map
+++ /dev/null
@@ -1,457 +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 [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
-(a|A) 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
-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
index 9f5cc5a7431..14c8f697426 100644
--- 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
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 6e228b80aba..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-sindhi-novoc.map
+++ /dev/null
@@ -1,441 +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 [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
-(a|A) 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
-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
index 084da362b05..e3decd95941 100644
--- 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
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 c05f2ab8e2a..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-sindhi-voc.map
+++ /dev/null
@@ -1,452 +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 [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
-(a|A) 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
-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
index bc4ec5875bc..ad8f5ab63e3 100644
--- 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
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 afbc5b3830f..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-turk-fullvoc.map
+++ /dev/null
@@ -1,483 +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 [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
-(a|A) 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
-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
index fa0cd690920..b4613e1a9cf 100644
--- 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
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 f286237b3c7..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-turk-novoc.map
+++ /dev/null
@@ -1,467 +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 [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
-(a|A) 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
-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
index eb74bd88db9..9102719bfbe 100644
--- 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
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 833c726a9c1..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-turk-voc.map
+++ /dev/null
@@ -1,478 +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 [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
-(a|A) 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
-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
index a7c06cfcf26..9ee96c4ac3f 100644
--- 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
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-fdf2alif-uighur.map
deleted file mode 100644
index 11c28abd2bc..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-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+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+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-fdf2alif-urdu-fullvoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-urdu-fullvoc.map
deleted file mode 100644
index d56b2608a4c..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-urdu-fullvoc.map
+++ /dev/null
@@ -1,495 +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 [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
-(a|A) 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
-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+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
index 6a2c20ccbde..b4e82a0e7e7 100644
--- 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
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 c01d3b35733..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-urdu-novoc.map
+++ /dev/null
@@ -1,479 +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 [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
-(a|A) 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
-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+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
index b9dd309cead..172ba13bca3 100644
--- 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
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 fcbfbb437ac..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-urdu-voc.map
+++ /dev/null
@@ -1,490 +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 [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
-(a|A) 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
-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+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
index afade649507..ff0e8f73555 100644
--- 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
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 81663175d5e..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-voc.map
+++ /dev/null
@@ -1,474 +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 [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
-(a|A) 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
-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
index 6a2eaa5964a..78569e6f549 100644
--- 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
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-fdf2noalif-farsi-fullvoc.map
deleted file mode 100644
index 42327f2afcc..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-farsi-fullvoc.map
+++ /dev/null
@@ -1,493 +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 [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
-(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
-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
-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-fdf2noalif-farsi-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-farsi-fullvoc.tec
index 692e15bfcc9..2165c5131ef 100644
--- 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
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-fdf2noalif-farsi-novoc.map
deleted file mode 100644
index 867eea6e112..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-farsi-novoc.map
+++ /dev/null
@@ -1,477 +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 [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
-(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
-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
-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-fdf2noalif-farsi-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-farsi-novoc.tec
index b385c231d53..71fa206875a 100644
--- 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
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-fdf2noalif-farsi-voc.map
deleted file mode 100644
index 224114309e2..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-farsi-voc.map
+++ /dev/null
@@ -1,488 +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 [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
-(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
-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
-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-fdf2noalif-farsi-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-farsi-voc.tec
index bdeb93250fe..f0b3adcec46 100644
--- 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
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-fdf2noalif-fullvoc.map
deleted file mode 100644
index edd9c060b08..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-fullvoc.map
+++ /dev/null
@@ -1,479 +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 [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
-(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
-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
-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-fdf2noalif-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-fullvoc.tec
index 3d03b2c6088..447243018f9 100644
--- 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
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-fdf2noalif-kashmiri-fullvoc.map
deleted file mode 100644
index a27cccb7534..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kashmiri-fullvoc.map
+++ /dev/null
@@ -1,511 +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 [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
-(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
-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
-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-fdf2noalif-kashmiri-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kashmiri-fullvoc.tec
index f06d1794305..83e488e9069 100644
--- 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
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-fdf2noalif-kashmiri-novoc.map
deleted file mode 100644
index 4916754c0e1..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kashmiri-novoc.map
+++ /dev/null
@@ -1,495 +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 [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
-(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
-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
-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-fdf2noalif-kashmiri-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kashmiri-novoc.tec
index f094274cc60..3522928f864 100644
--- 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
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-fdf2noalif-kashmiri-voc.map
deleted file mode 100644
index e31ea16ca4a..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kashmiri-voc.map
+++ /dev/null
@@ -1,506 +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 [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
-(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
-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
-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-fdf2noalif-kashmiri-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kashmiri-voc.tec
index 9dfc5cc9f68..8b417908fcd 100644
--- 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
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-maghribi-fullvoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-maghribi-fullvoc.map
deleted file mode 100644
index 9eba8a45f72..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-maghribi-fullvoc.map
+++ /dev/null
@@ -1,479 +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 [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
-(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
-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
-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-fdf2noalif-maghribi-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-maghribi-fullvoc.tec
index 1d8eade2d22..a1054efefa8 100644
--- 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
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-fdf2noalif-maghribi-novoc.map
deleted file mode 100644
index aeb74787189..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-maghribi-novoc.map
+++ /dev/null
@@ -1,462 +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 [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
-(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
-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
-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-fdf2noalif-maghribi-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-maghribi-novoc.tec
index fd716768c39..3e073c9d211 100644
--- 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
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-fdf2noalif-maghribi-voc.map
deleted file mode 100644
index faecc44cc17..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-maghribi-voc.map
+++ /dev/null
@@ -1,474 +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 [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
-(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
-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
-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-fdf2noalif-maghribi-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-maghribi-voc.tec
index 06fdd7925ca..f3088c36a23 100644
--- 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
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-fdf2noalif-malay-fullvoc.map
deleted file mode 100644
index 190a47dc863..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-malay-fullvoc.map
+++ /dev/null
@@ -1,483 +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 [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
-(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
-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
-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-fdf2noalif-malay-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-malay-fullvoc.tec
index aa48aec47ba..c83fa403bd6 100644
--- 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
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-fdf2noalif-malay-novoc.map
deleted file mode 100644
index cf1ab76c374..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-malay-novoc.map
+++ /dev/null
@@ -1,467 +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 [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
-(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
-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
-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-fdf2noalif-malay-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-malay-novoc.tec
index 357eda0d98c..06b2d462540 100644
--- 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
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-fdf2noalif-malay-voc.map
deleted file mode 100644
index ac4e08cb2a4..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-malay-voc.map
+++ /dev/null
@@ -1,478 +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 [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
-(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
-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
-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-fdf2noalif-malay-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-malay-voc.tec
index ae0062c9f8c..1b0f5b2b835 100644
--- 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
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-fdf2noalif-novoc.map
deleted file mode 100644
index c4cd5469918..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-novoc.map
+++ /dev/null
@@ -1,462 +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 [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
-(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
-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
-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-fdf2noalif-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-novoc.tec
index 45ac3a8e6d2..9044e5be017 100644
--- 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
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-fdf2noalif-pashto-fullvoc.map
deleted file mode 100644
index 0b5db3167fa..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-pashto-fullvoc.map
+++ /dev/null
@@ -1,489 +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 [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
-(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
-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
-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-fdf2noalif-pashto-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-pashto-fullvoc.tec
index 6dae8e38f9e..c62c017c0b5 100644
--- 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
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-fdf2noalif-pashto-novoc.map
deleted file mode 100644
index 0e728ee7a05..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-pashto-novoc.map
+++ /dev/null
@@ -1,473 +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 [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
-(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
-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
-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-fdf2noalif-pashto-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-pashto-novoc.tec
index c9aec1f60e4..bb6f98c2556 100644
--- 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
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-fdf2noalif-pashto-voc.map
deleted file mode 100644
index 527ba534cf0..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-pashto-voc.map
+++ /dev/null
@@ -1,484 +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 [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
-(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
-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
-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-fdf2noalif-pashto-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-pashto-voc.tec
index f439a4ebc63..aab09f97ec6 100644
--- 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
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-fdf2noalif-sindhi-fullvoc.map
deleted file mode 100644
index c5dc054f1ed..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-sindhi-fullvoc.map
+++ /dev/null
@@ -1,457 +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 [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
-(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
-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
-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-fdf2noalif-sindhi-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-sindhi-fullvoc.tec
index 6791fa2f51b..ec7e77ac20d 100644
--- 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
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-fdf2noalif-sindhi-novoc.map
deleted file mode 100644
index 71cbf311814..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-sindhi-novoc.map
+++ /dev/null
@@ -1,441 +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 [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
-(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
-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
-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-fdf2noalif-sindhi-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-sindhi-novoc.tec
index ddd1ec08d26..50cbd2b3af4 100644
--- 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
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-fdf2noalif-sindhi-voc.map
deleted file mode 100644
index 28637b42540..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-sindhi-voc.map
+++ /dev/null
@@ -1,452 +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 [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
-(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
-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
-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-fdf2noalif-sindhi-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-sindhi-voc.tec
index 41c84e06bd8..2d3266d2610 100644
--- 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
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-fdf2noalif-turk-fullvoc.map
deleted file mode 100644
index dc4d72c8e73..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-turk-fullvoc.map
+++ /dev/null
@@ -1,483 +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 [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
-(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
-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
-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-fdf2noalif-turk-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-turk-fullvoc.tec
index 75d85901102..7182c9ccd7f 100644
--- 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
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-fdf2noalif-turk-novoc.map
deleted file mode 100644
index 36f90a69574..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-turk-novoc.map
+++ /dev/null
@@ -1,467 +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 [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
-(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
-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
-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-fdf2noalif-turk-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-turk-novoc.tec
index a3b600cdb7b..a58c0a010a8 100644
--- 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
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-fdf2noalif-turk-voc.map
deleted file mode 100644
index 7e719cdec48..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-turk-voc.map
+++ /dev/null
@@ -1,478 +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 [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
-(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
-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
-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-fdf2noalif-turk-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-turk-voc.tec
index 00bbf628062..bb08e4bfaae 100644
--- 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
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-urdu-fullvoc.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-urdu-fullvoc.map
deleted file mode 100644
index 96eba02c749..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-urdu-fullvoc.map
+++ /dev/null
@@ -1,495 +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 [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
-(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
-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
-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+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-fdf2noalif-urdu-fullvoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-urdu-fullvoc.tec
index 7076843586a..e413cc0c6b1 100644
--- 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
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-fdf2noalif-urdu-novoc.map
deleted file mode 100644
index 164ca5a64c1..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-urdu-novoc.map
+++ /dev/null
@@ -1,479 +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 [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
-(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
-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
-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+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-fdf2noalif-urdu-novoc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-urdu-novoc.tec
index 6786509fba0..f428d338a11 100644
--- 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
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-fdf2noalif-urdu-voc.map
deleted file mode 100644
index cada96defd7..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-urdu-voc.map
+++ /dev/null
@@ -1,490 +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 [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
-(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
-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
-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+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-fdf2noalif-urdu-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-urdu-voc.tec
index 9d2862a5553..0ca122775fc 100644
--- 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
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-fdf2noalif-voc.map
deleted file mode 100644
index f22b8673cdd..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-voc.map
+++ /dev/null
@@ -1,474 +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 [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
-(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
-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
-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-fdf2noalif-voc.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-voc.tec
index 3cc5afac051..cc89d2fea85 100644
--- 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
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-pashto-trans.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-pashto-trans-loc.map
index 47a3798f047..47a3798f047 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-pashto-trans.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-pashto-trans-loc.map
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-pashto-trans.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-pashto-trans-loc.tec
index e0bcf2b7178..e0bcf2b7178 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-pashto-trans.tec
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-pashto-trans-loc.tec
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-trans-dmg.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-trans-dmg.map
new file mode 100644
index 00000000000..919f75e53ca
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-trans-dmg.map
@@ -0,0 +1,192 @@
+LHSName  "ArabTeX-DMG"
+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 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 [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); < > () « » [ ] ‘ ’ “ ”
+
+Define BEG  (#|Z|[BRACKETS])
+
+; special ligatures
+(a|A) BAR l Z / _ LLAH > ;; 'a|l-ll_ah' or 'A|l-ll_ah' -> llāh
+(a|A) l Z / _ LLAH > A ;; 'al-ll_ah' or 'Al-ll_ah' -> Allāh
+U+0053 U+004C U+004D > U+1E63 U+0061 U+006C U+006C U+0101 U+0020 U+0041 U+006C U+006C U+0101 U+0068 U+0020 U+02BF U+0061 U+006C U+0061 U+0079 U+0068 U+0069 U+0020 U+0077 U+0061 U+002D U+0073 U+0061 U+006C U+006C U+0061 U+006D  ; 'SLM' : .sallY al-ll_ah `alayhi wa-sallam
+U+0052 U+0049 U+0059 U+0041 U+004C > U+0072 U+0069 U+0079 U+0101 U+006C  ;; 'RIYAL' : Saudi currency sign
+U+0053 U+0041 U+004C U+004C U+0041 U+0053 U+0054 U+004F U+0050 > ;; 'SALLASTOP' 
+U+0051 U+0041 U+004C U+0041 > ;; 'QALA' 
+U+0041 U+004B U+0042 U+0041 U+0052 > U+0041 U+006B U+0062 U+0061 U+0072  ;; 'AKBAR'
+U+004D U+0055 U+0048 U+0041 U+004D U+004D U+0041 U+0044 > U+004D U+0075 U+1E25 U+0061 U+006D U+006D U+0061 U+0064  ;; 'MUHAMMAD'
+U+0053 U+0041 U+004C U+0041 U+004D > U+0073 U+0061 U+006C U+0101 U+006D  ;; 'SALAM'
+U+0052 U+0041 U+0053 U+004F ? U+0055 U+004C > U+0072 U+0061 U+0073 U+016B U+006C  ;; 'RASUL' (also unicode 'RASOUL)'
+U+0041 U+004C U+0041 U+0059 U+0048 (U+0049|U+0045) > U+02BF U+0061 U+006C U+0061 U+0079 U+0068 U+0069  ;; 'ALAYHI' (also unicode 'ALAYHE)'
+U+0057 U+0041 U+0053 U+0041 U+004C U+004C U+0041 U+004D > U+0077 U+0061 U+002D U+0073 U+0061 U+006C U+006C U+0061 U+006D  ;; 'WASALLAM' 
+U+0053 U+0041 U+004C U+004C U+0041 > U+1E63 U+0061 U+006C U+006C U+0101  ;; 'SALLA'
+U+004A U+0041 U+004C U+004C U+0041 > U+006A U+0061 U+006C U+006C U+0101  ;; 'JALLA' : 
+U+0042 U+0041 U+0053 U+004D U+0041 U+004C U+0041 > U+0062 U+0069 U+0073 U+006D U+0069 U+0020 U+0041 U+006C U+006C U+0101 U+0068 U+0020 U+0061 U+006C U+002D U+0072 U+0061 U+1E25 U+006D U+0101 U+006E U+0020 U+0061 U+006C U+002D U+0072 U+0061 U+0068 U+012B U+006D  ;; 'BASMALA'
+U+005E U+0053 U+004C U+0059 > ;; ^SLY
+U+005E U+0051 U+004C U+0059 > ;; ^QLY
+U+005E U+004D U+0049 U+004D > ;; ^MIM
+U+005E U+004C U+0041 > ;; ^LA
+U+005E U+004A U+0049 U+004D > ;; ^JIM
+U+005E U+0044 U+004F U+0054 U+0053 > ;; ^DOTS
+U+005E U+0053 U+0049 U+004E > ;; ^SIN
+U+0048 U+0049 U+005A U+0042 > ;; HIZB
+U+0043 U+0049 U+0052 U+0043 U+005A U+0045 U+0052 U+004F > ;; CIRCZERO
+U+0052 U+0045 U+0043 U+0054 U+005A U+0045 U+0052 U+004F > ;; RECTZERO
+U+0053 U+0041 U+004A U+0044 U+0041 > ;; SAJDA
+U+0044 U+004F U+0054 U+0053 > ;; DOTS
+
+
+; general
+
+;persian
+;; #P UL h w > U+1E2B  
+;; #P U+0048 > h ; capital H > h
+;;
+
+; problem of "T": It should be omitted when at end of word and when not
+; the 1st member of a definite construct: al-madInaT al-`a.zImaT > al-madīna al-ʿaẓīma
+; Only solution is to always transliterate to t, except when explicitly "quoted off" with |:
+T BAR / _ # > ;
+T > t
+;;#U T > h
+N > n 
+U+0057 > w
+(U|u u|UL u) > U+016B  
+(A|a a|UL a|UL A) > U+0101  
+i y > U+012B y
+(I|i i|UL i) > U+012B  
+;;#U (E|a e) / _ # > H U+0113  
+;;#T (E|e) e > e y ; pashto
+(E|e e) > U+0113  
+(O|o o) > U+014D  
+C A > U+02BE U+0101 ; historical spelling
+C U > U+02BE U+016B ; historical spelling : madda on waw
+C I > U+02BE U+012B ; historical spelling : madda on ya
+
+P z > U+1E93
+V z > U+017A
+C z > U+017E  ;check
+V t > t U+0301
+P t > U+1E6D
+UL t > U+1E6F  
+C s > U+0161  
+UL s > U+1E6F ; sindhi
+V r > U+0155
+P r > U+1E59; r with dot above 
+P q > q ; ?
+V n > U+0144
+C n  > U+00F1  
+P n > U+1E47 
+CO n > n U+0324
+C l  > l U+0303 ; l + combining tilde
+CO g > g U+0324
+V d > d U+0301
+CO d > d U+0324
+P d > U+1E0D
+V s > U+015B
+P s > U+1E63  
+(j|C g) > U+01E7  ;
+CO j > U+0237 U+0308
+P h > U+1E25  
+V h > h
+(UL h|x) > U+1E2B  
+G > g
+P g > U+0121  
+P f > f ; ?
+UL d > U+1E0F  
+C c > U+010D   ;
+CO b > b U+0324  
+P b > x ; ? undotted (b,t,th,n,y) ... 
+
+Y > U+0101 ;ā -> LOC: á : check DMG
+
+
+Ain	  > U+02BF 
+Z H 	  > Z
+H / # _   > ;
+H         > U+02BE  
+Z Z Z     > ;
+Z Z       > ;
+B         > ;
+U+003C U+003C  > U+00AB ;<<
+U+003E U+003E  > U+00BB ;>>
+UL        >   ;_
+U+003A U+003A > U+2234 ; '::' ??Arabic three dots transliterated by Therefore?? 
+N         >   ;
+C         >   ;^
+Q > ;
+
+pass(Unicode)
+
+Class [LOWERCASE]   = ( U+0061..U+007A U+0101 U+0113 U+012B U+014D U+016B U+1E0D U+1E25 U+1E33 U+1E63 U+1E6D U+1E93 U+1E2B U+1E0F U+1E6F U+0121 U+01E7 )
+Class [UPPERCASE]   = ( U+0041..U+005A U+0100 U+0112 U+012A U+014C U+016A U+1E0C U+1E24 U+1E32 U+1E62 U+1E6C U+1E92 U+1E2A U+1E0E U+1E6E U+0120 U+01E6 )
+Class [LETTER] = (U+0041..U+01FF)
+Class [VWL]         = (U+0061  U+0065  U+0069  U+006F  U+0075) ; (a e i o u) 
+Class [SUNCONS]     = (U+0064 U+1E0F U+0074 U+1E6F U+0072 U+007A U+0073 U+0161 U+1E63 U+1E0D U+1E6D U+1E93 U+006E) 
+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); < > () « » [ ] ‘ ’ “ ”
+
+[LOWERCASE] / U+E000 _ > [UPPERCASE]
+[LOWERCASE] / U+E000 a l Z _ > [UPPERCASE]
+l Z ([SUNCONS]=sc){2,2} > @sc Z @sc  
+l Z [SUNCONS]=sc > @sc Z @sc  
+a / [VWL] Z _ l Z > ;
+;; [VWL] / [VWL] BEG _ ^l > U+2019  ; vowel at beg of word replaced by apostr when prec word end with vowel
+(A|Y|UL A) / _ (N|U|W) > ;
+[LETTER] BAR	  >   ;;
+
+pass(Unicode)
+
+U+E000 > ;
+
+A l Z > a l Z
+
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-trans-dmg.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-trans-dmg.tec
new file mode 100644
index 00000000000..b6fd6c6e5fc
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-trans-dmg.tec
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-trans.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-trans-loc.map
index 03ef6e8f477..03ef6e8f477 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-trans.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-trans-loc.map
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-trans.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-trans-loc.tec
index 238041439f9..238041439f9 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-trans.tec
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-trans-loc.tec
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-urdu-trans.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-urdu-trans-loc.map
index 9acc465eb12..9acc465eb12 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-urdu-trans.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-urdu-trans-loc.map
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-urdu-trans.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-urdu-trans-loc.tec
index 9a6a84253c4..9a6a84253c4 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-urdu-trans.tec
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/arabtex-urdu-trans-loc.tec
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/farsidigits.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/farsidigits.tec
new file mode 100644
index 00000000000..3f09ddc0ae3
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/arabxetex/farsidigits.tec
author	Karl Berry <karl@freefriends.org>	2008-07-17 00:56:24 +0000
committer	Karl Berry <karl@freefriends.org>	2008-07-17 00:56:24 +0000
commit	48028bc22502c883b08b5ae8fd248054918e01ff (patch)
tree	b8f2f165a9ed68fe5672144f32f6f5a530b6cdaf /Master/texmf-dist/fonts
parent	33fc230bb96a6ff4189552866e9865db6019c18c (diff)