7 files changed, 42 insertions, 16 deletions
diff --git a/Master/texmf-dist/doc/xelatex/arabxetex/README b/Master/texmf-dist/doc/xelatex/arabxetex/README
index 8ea6b913ff2..895211cb311 100644
--- a/Master/texmf-dist/doc/xelatex/arabxetex/README
+++ b/Master/texmf-dist/doc/xelatex/arabxetex/README
@@ -1,5 +1,5 @@
 --------------------------
-THE ARABXETEX PACKAGE v1.1
+THE ARABXETEX PACKAGE v1.1.1
 
 This package provides a convenient ArabTeX-like user-interface for typesetting
 languages using the Arabic script in XeLaTeX, with flexible access to font
@@ -9,13 +9,12 @@ supported.  Since most of the ‘real work’ -- namely parsing and converting
 ArabTeX input to Unicode -- is done at the level of TECkit mappings,
 ArabXeTeX is really performant.
 
-* Installation:
-
 The TECkit fontmapping files (*.map and *.tec) should be copied to
 <TEXMF>/fonts/misc/xetex/fontmapping/arabxetex/
 
-arabxetex.sty should be copied to 
-<TEXMF>/tex/xelatex/arabxetex/
+Version 1.1.1 is a bugfix release. No new functionality was added since version 1.1.
+A minimal example is now under doc/examples, together with the more complex
+demonstration of an Arabic critical edition with ednotes.
 
 -------------------------
 François Charette
diff --git a/Master/texmf-dist/doc/xelatex/arabxetex/arabtex.maps b/Master/texmf-dist/doc/xelatex/arabxetex/arabtex.maps
index e195cd98bf2..909a1ba8356 100644
--- a/Master/texmf-dist/doc/xelatex/arabxetex/arabtex.maps
+++ b/Master/texmf-dist/doc/xelatex/arabxetex/arabtex.maps
@@ -146,6 +146,7 @@ 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
@@ -269,12 +270,13 @@ CO U > U+06C7 ;
 #-A U+0048 Z UL? (Q? (i|e))=vv / _ END > U+06C0 @vv U+200C ;H-i -> heh+hamza final; what about 06C2 in Urdu ?<<<
 #-A U+0048 Z Q?=qq (I|E)=vv / _ END > h U+0020 U+0627 @qq i @vv ; H-I
 #-A Q?=q1 (I|E) Z UL? Q?=q2 (i|e) / _ END > @q1 i U+0626 @q2 i U+200C ; ...I-e
-#-A Z Q?=qq I  / (A|U) _ (Z|END) > U+0626 @qq i y ; ...A-I or ...U-I
+#-A Z Q?=qq I  / (A|U) _ ENDZ > U+0626 @qq i y ; ...A-I or ...U-I
 #-A Z UL? (Q? (i|e))=vv / (A|U) _ END >  U+0649 @vv ; ...A-i or ...U-i
-#-A Z Q?=q1 (e|i) / _ (END|Z) > @q1 i ; ...-i
+#-A Z Q?=q1 (e|i) / _ ENDZ > @q1 i ; ...-i
 #-A Z / U+0048 _ > U+0020 ;
 #-A 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
 #An H l Z / BEG _ > U+0627 l Z
 @Av H l Z / BEG _ > U+0627 l Z
@@ -344,7 +346,8 @@ a l Z / BEG _ > U+0627 l Z
 #-S H / A _ Q? [VWL]? N? (#|^[LTR]) > HBAR
 #-S H / [Uw] _ Q? [VWL]? N? (#|^[LTR]) > HBAR
 #-S H / [Iy] _ Q? (i N?|u N?)? (#|^[LTR]) > HBAR ; not AN ...
-#-S H / a _ Q? (i N?|u N?)? (#|^[LTR]) > HBAR ; not AN... 
+#-S H / a _ Q? (#|^[LTR]) > Ha ; not AN... 
+#-S H / a _ Q? (u|i) N? (#|^[LTR]) > Ha ; not AN... 
 #-S H / i _ Q? [VWL]? N? (#|^[LTR]) > Hy
 #-S H / u _ Q? [VWL]? N? (#|^[LTR]) > Hw
 #-S 
@@ -590,6 +593,7 @@ CO j > U+0684
 #v Q I       > U+064A
 #v 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 = ###
 #n I         > U+064A
 #n Q i N     > U+064D 
 #n i N       >  ;
@@ -739,8 +743,9 @@ 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)
+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  ;[
 #n [VWL]    >   ;stripoff vowels
@@ -761,7 +766,7 @@ BAR       >   ;|
 #v Class [VWL]  = (U+0627 U+0648..U+0650 U+0670);
 #v
 #f [CONS]=k1 / _ Z? [CONS] ^U+0651 > @k1 U+0652  ; hack: 2nd consonant has no shadda
-#f U+064E (U+064A|U+0648|U+0649)=hc / _ (^[VWLX]|#) > U+064E @hc U+0652 ; ay and aw diphtongs
+#f U+064E (U+064A|U+0648)=hc / _ (^[VWLX]|#) > U+064E @hc U+0652 ; ay and aw diphtongs
 @Av U+0627 [VWL]?  / [VWL] Z _ > U+0627 ; e.g. fa-isti_hraj -> initial alif has no vowel 
 @Bv U+0627 [VWL]?  / [VWL] Z _ > U+0627 ; e.g. fa-isti_hraj -> initial alif has no vowel 
 #Af U+0627 [VWL]?  / [VWL] Z _ > U+0671 ; e.g. fa-isti_hraj -> wasla on initial alif 
diff --git a/Master/texmf-dist/doc/xelatex/arabxetex/arabxetex.dtx b/Master/texmf-dist/doc/xelatex/arabxetex/arabxetex.dtx
index fa6f619778a..ca0ffaacbe6 100644
--- a/Master/texmf-dist/doc/xelatex/arabxetex/arabxetex.dtx
+++ b/Master/texmf-dist/doc/xelatex/arabxetex/arabxetex.dtx
@@ -68,7 +68,7 @@ as well as an extensive collection of TECKit files
 %
 %<*readme>
 --------------------------
-THE ARABXETEX PACKAGE v1.1
+THE ARABXETEX PACKAGE v1.1.1
 
 This package provides a convenient ArabTeX-like user-interface for typesetting
 languages using the Arabic script in XeLaTeX, with flexible access to font
@@ -1342,7 +1342,7 @@ François Charette
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{arabxetex}
-  [2007/05/10 v1.1 ArabTeX-like interface for XeLaTeX]
+  [2007/11/08 v1.1.1 ArabTeX-like interface for XeLaTeX]
 %
 \DeclareOption{fullvoc}{\def\ax@mode{fullvoc}}
 \DeclareOption{voc}{\def\ax@mode{voc}}
@@ -1370,7 +1370,7 @@ François Charette
 \RequirePackage{amsmath}%because of macro \overline used in \aemph
 \RequirePackage{fontspec}
 \AtBeginDocument{\ifdefined\arabicfont\relax\else%
-	\PackageWarning{arabxetex}{\arabicfont is not defined! I will try to load Scheherazade}%
+	\PackageWarning{arabxetex}{\string\arabicfont\ is not defined!^^JI will try to load Scheherazade}%
 	\newfontfamily\arabicfont[Script=Arabic,Scale=2]{Scheherazade}\fi
 	}%
 \def\ax@trans@style{\itshape}%
diff --git a/Master/texmf-dist/doc/xelatex/arabxetex/arabxetex.pdf b/Master/texmf-dist/doc/xelatex/arabxetex/arabxetex.pdf
index f483cf4884f..8fad206f7e2 100644
--- a/Master/texmf-dist/doc/xelatex/arabxetex/arabxetex.pdf
+++ b/Master/texmf-dist/doc/xelatex/arabxetex/arabxetex.pdf
diff --git a/Master/texmf-dist/doc/xelatex/arabxetex/ednotes_example.pdf b/Master/texmf-dist/doc/xelatex/arabxetex/ednotes_example.pdf
index a4fbafa7184..fccf1b58bab 100644
--- a/Master/texmf-dist/doc/xelatex/arabxetex/ednotes_example.pdf
+++ b/Master/texmf-dist/doc/xelatex/arabxetex/ednotes_example.pdf
diff --git a/Master/texmf-dist/doc/xelatex/arabxetex/makemaps.pl b/Master/texmf-dist/doc/xelatex/arabxetex/makemaps.pl
index b375752271c..231a6b5c8ea 100644
--- a/Master/texmf-dist/doc/xelatex/arabxetex/makemaps.pl
+++ b/Master/texmf-dist/doc/xelatex/arabxetex/makemaps.pl
@@ -1111,7 +1111,7 @@ close OUTPUT;
 close MAPS;
 
 # Let's compile them now
-
-system("for map in $output*.map; do echo \"compiling \$map ...\" && teckit_compile \$map; done");
+system("cp *.map mappings/");
+system("for map in mappings/*.map; do echo \"compiling \$map ...\" && teckit_compile \$map; done");
 
 
diff --git a/Master/texmf-dist/doc/xelatex/arabxetex/minimal.tex b/Master/texmf-dist/doc/xelatex/arabxetex/minimal.tex
new file mode 100644
index 00000000000..88c3923dcf2
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/arabxetex/minimal.tex
@@ -0,0 +1,22 @@
+\documentclass{minimal}
+\usepackage{arabxetex} % default options are "novoc" and "fdf2alif", 
+                       % other options are "voc", "fullvoc", "utf", "trans" and "fdf2noalif"
+% arabxetex loads bidi.sty and fontspec.sty		       
+ 
+\newfontfamily\arabicfont[Script=Arabic, Scale=1.5]{Scheherazade}
+% you can also define \farsifont, \uighurfont, etc if you want
+\begin{document}
+This is some text in English with Arabic insertion \textarab{`arabI}.
+
+This is some text in English with Arabic insertion \textarab[utf]{عربي}.
+
+This is some text in English with Arabic insertion \textarab[voc]{`arabI}.
+
+\begin{arab}
+wa-ha_dihi fiqraT"uN bi-al-`arabiyaT ma`a kalimaT inklIziyaT (\textroman{English}).
+\end{arab}
+
+\begin{arab}[utf]
+وهذه فقرةٌ بالعربية مع كلمة انكليزية (\textroman{English}).
+\end{arab}
+\end{document}