arabxetex update (16jul08)

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

6 files changed, 80 insertions, 75 deletions

diff --git a/Master/texmf-dist/doc/xelatex/arabxetex/README b/Master/texmf-dist/doc/xelatex/arabxetex/README
index 895211cb311..5a0b68f143f 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.1
+THE ARABXETEX PACKAGE v1.1.2
 
 This package provides a convenient ArabTeX-like user-interface for typesetting
 languages using the Arabic script in XeLaTeX, with flexible access to font
@@ -12,10 +12,6 @@ ArabXeTeX is really performant.
 The TECkit fontmapping files (*.map and *.tec) should be copied to
 <TEXMF>/fonts/misc/xetex/fontmapping/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
-2007
+2007-2008
diff --git a/Master/texmf-dist/doc/xelatex/arabxetex/arabtex.maps b/Master/texmf-dist/doc/xelatex/arabxetex/arabtex.maps
index 909a1ba8356..a71c56292f8 100644
--- a/Master/texmf-dist/doc/xelatex/arabxetex/arabtex.maps
+++ b/Master/texmf-dist/doc/xelatex/arabxetex/arabtex.maps
@@ -154,8 +154,9 @@ Define ENDZ (#|[BRACKETS]|[PUNCT] U+0020|[PUNCT] #|Z)
 ;; a) Those that are Unicode-compliant and include the initial alif in glyph U+FDF2 
 ;;    For these the ligature llah can be accessed by the sequence lam-lam-ha
 ;; b) Those that do not have the initial alif in U+FDF2
-#0 (a|A) l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
-#1 (a|A) l Z LLAH > U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
+;; The BAR is used in the DMG transliteration to suppress the initial A
+#0 (a|A) BAR? l Z LLAH > U+0627 U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
+#1 (a|A) BAR? l Z LLAH > U+FDF2 ;; 'al-ll_ah' or 'Al-ll_ah'
 #0 LLAH > U+FDF2 ;; 'll_ah' > U+FDF2
 #1 LLAH > U+0644 U+0644 U+0647  ;; 'll_ah' -> 'l l h'
 ;; UPPERCASE mnemonics for various ligatures or special glyphs
diff --git a/Master/texmf-dist/doc/xelatex/arabxetex/arabxetex.dtx b/Master/texmf-dist/doc/xelatex/arabxetex/arabxetex.dtx
index ca0ffaacbe6..24ee9fe8ed5 100644
--- a/Master/texmf-dist/doc/xelatex/arabxetex/arabxetex.dtx
+++ b/Master/texmf-dist/doc/xelatex/arabxetex/arabxetex.dtx
@@ -2,7 +2,7 @@
 %
 %!TEX encoding = UTF-8 Unicode
 %
-% Copyright (C) 2007 by François Charette <firmicus at gmx dot net>
+% Copyright (C) 2007-2008 by François Charette <firmicus at gmx dot net>
 % 
 % Distributable under the LaTeX Project Public License,
 % version 1.3c or higher (your choice). The latest version of
@@ -23,14 +23,14 @@
 
   ____________________________
   The arabxetex package         
-  (C) 2007  François Charette    
+  (C) 2007-2008  François Charette    
   License information appended
 
 
 \endpreamble
 \postamble
 
-Copyright (C) 2007 by François Charette <firmicus at gmx dot net>
+Copyright (C) 2007-2008 by François Charette <firmicus at gmx dot net>
 
 Distributable under the LaTeX Project Public License,
 version 1.3c or higher (your choice). The latest version of
@@ -68,7 +68,7 @@ as well as an extensive collection of TECKit files
 %
 %<*readme>
 --------------------------
-THE ARABXETEX PACKAGE v1.1.1
+THE ARABXETEX PACKAGE v1.1.2
 
 This package provides a convenient ArabTeX-like user-interface for typesetting
 languages using the Arabic script in XeLaTeX, with flexible access to font
@@ -83,7 +83,7 @@ The TECkit fontmapping files (*.map and *.tec) should be copied to
 
 -------------------------
 François Charette
-2007
+2007-2008
 %</readme>
 %
 % \fi
@@ -273,19 +273,20 @@ François Charette
 % ¦novoc¦, ¦voc¦ and ¦fullvoc¦ modes) even with UTF-8 encoding, as it provides
 % easy access to special glyphs and some useful features. See further below.
 % 
-% Latin (LR) insertions within Arabic environment can be made by means of the
-% \DescribeMacro{\textroman} 
-% command \cmd\textroman¦{…}¦.\new{1.1}\footnote{ %
-%	In version 1.0 this was called \cmd\textlatin. The latter still works 
-%	but its usage is deprecated, because \pkg{babel} defines a command 
-%	of the same name.}
+% Left-to-right insertions in Latin script within an Arabic environment 
+% can be made by means of the \DescribeMacro{\textLR} 
+% command \cmd\textLR¦{…}¦.\new{1.1.2}\footnote{ %
+%	In version 1.0 this was called \cmd\textlatin, which was renamed \cmd\textroman
+%	in version 1.1. But the former conflicted with \pkg{Babel}, 
+%	and the latter with \pkg{Beamer}. Hopefully \cmd\textLR\ 
+%	won't be as short-lived!}
 % Emphasis in Arabic is traditionally indicated by
 % overlining the text, and this can be achieved with the command
 % \DescribeMacro{\aemph} 
 % \cmd\aemph:\footnote{ ^^A
 % 	This macro makes use of the mathematical command \cmd\overline,
 % 	which explains why \pkg{arabxetex} requires the \pkg{amsmath} package.
-% 	I welcome any suggestion that would make it possible to circumvent this
+% 	I welcome any suggestion that would make it possible to circumvent this dependency
 % 	by emulating \cmd\overline\ directly.}
 % 
 % \parindentoff
@@ -511,7 +512,7 @@ François Charette
 % 	The glyph {\tradarabic اﷲ} is taken from the font Traditional Arabic.
 % 	In Scheherazade its design is rather suboptimal: {\arabicfont\char"FDF2}.}
 % 
-% However, the majority of real-world fonts rather represent that 
+% However, a substantial portion of real-world fonts rather represent that 
 % ligature \textit{without} the initial alif.\footnote{ ^^A
 % 	My research on Arabic fonts available or known to me yields the following picture: 
 % 	The fonts that do not display the initial alif in the ligature \textsf{FDF2} 
@@ -529,7 +530,8 @@ François Charette
 % 	\href{http://scripts.sil.org/ArabicFonts}{SIL}'s Scheherazade, 
 % 	\href{http://www.tdc.org/news/2006Results/AdobeArabic.html}{Adobe Arabic} 
 % 	(distributed with the \href{http://www.adobe.com/ceea/}{Middle-Eastern version} 
-% 	of the latest \href{http://www.adobe.com/products/acrobat/readermain.html}{Adobe Reader 7}),  	    Arial Unicode MS, and \href{http://sakkal.com/type/typesetting.html}{Arabic Typesetting}
+% 	of the latest \href{http://www.adobe.com/products/acrobat/readermain.html}{Adobe Reader 7}),
+% 	Arial Unicode MS, and \href{http://sakkal.com/type/typesetting.html}{Arabic Typesetting}
 % 	(distributed with \href{http://www.microsoft.com/typography/VOLT.mspx}{VOLT} 
 % 	and with \href{http://www.microsoft.com/office/editions/prodinfo/language/proofingtools.mspx}{Microsoft Office Proofing Tools 2003}).}
 % The confusion probably has to do with Unicode’s omission to include the ALLAH
@@ -616,9 +618,19 @@ François Charette
 % \subsection{Transliteration}
 % 
 % At the moment transliteration mappings are provided for Arabic, Persian, Urdu, 
-% Sindhi and Pashto. The rest will be provided in a forthcoming version.
-% It is also planned to implement alternative transliteration conventions
-% for each language, as with \arabtex, \eg ZDMG, Encyclopedia Iranica, etc.
+% Sindhi and Pashto. The rest may be provided in a future version.
+% As a rule the default conventions provided are those of the Library of Congress.
+% \new{1.1.2}For Arabic the alternative transliteration of the 
+% \href{http://www.orientasia.info/download/arab_trans.pdf}{Deutsche Morgenländische Gesellschaft}
+% is also available (but should be still considered experimental). 
+% You can set it with the command \DescribeMacro{\SetTranslitConvention}
+% ¦\SetTranslitConvention{dmg}¦.
+% To switch back to the Library of Congress transliteration, type
+% ¦\SetTranslitConvention{loc}¦.
+% Additional conventions for other languages, as with \arabtex, \eg 
+% Encyclopedia of Islam, Encyclopedia Iranica, etc., might be added later.\footnote{ %
+%     It is suggested that you contact the author if you have such needs.}
+%
 % Transliteration is set in italics by default. This can be changed by declaring, e.g.,
 % \DescribeMacro{\SetTranslitStyle}
 % ¦\SetTranslitStyle{\upshape}¦.
@@ -639,8 +651,7 @@ François Charette
 % 	See Appendix~\ref{latinextfonts} for a list of recommended Unicode fonts that cover the 
 % 	full \textsc{latin extended additional} plane.}
 % 
-% ^^AThe above example was set in Gentium (since FPL Neu does not provide all
-% ^^Arequired glyphs) If your default roman font does not have the required
+% ^^AIf your default roman font does not have the required
 % ^^Adiacritics, you can declare for instance
 % ^^A¦\SetTranslitStyle{\fontspec{Gentium}\itshape}¦.
 % 
@@ -1296,27 +1307,17 @@ François Charette
 % 
 % \item  Junicode: \url{http://junicode.sourceforge.net/}
 % 
-% \item  jGaramond: \url{http://www.janthor.de/jGaramond/}
-% 
-% \item  LinuxLibertine: \url{http://linuxlibertine.sourceforge.net/}
-% 
-% \item  Roman Unicode: \url{http://everywitchway.net/linguistics/fonts/roman.html}
-% 
-% \item  Chrisanthi Unicode: \url{http://everywitchway.net/linguistics/fonts/chrysuni.html}
+% \item  Libertine: \url{http://linuxlibertine.sourceforge.net/}
 % 
 % \item  DejaVu Serif / Sans / Sans Mono: \url{http://dejavu.sourceforge.net/wiki/index.php/Main_Page}
 % 
 % \item  Lucida Grande: Mac~OS~X
 % 
-% \item  FreeSerif / FreeSans / FreeMono: \url{http://savannah.nongnu.org/projects/freefont/}
+% \item  TITUS Cyberbit Basic: \url{http://titus.fkidg1.uni-frankfurt.de/unicode/tituut.asp}
 % 
 % \item  Thryomanes: \url{ftp://ftp.io.com/pub/usr/hmiller/fonts/Thryomanes12.zip}
 % 
-% \item  HindSight Unicode (not very nice): \url{http://dartcanada.tripod.com/Objets/Zips/HindUnic.zip}
-% 
-% \item  TITUS Cyberbit Basic: \url{http://titus.fkidg1.uni-frankfurt.de/unicode/tituut.asp}
-% 
-% \item  AbRoman: \url{http://www.languagegeek.com/font/fontdownload.html}
+% \item  jGaramond: \url{http://www.janthor.de/jGaramond/}
 % 
 % \item  Everson Mono Unicode (shareware): \url{http://www.evertype.com/emono/}
 % 
@@ -1324,6 +1325,16 @@ François Charette
 % 
 % \item  Microsoft Sans Serif: Windows
 % 
+% \item  FreeSerif / FreeSans / FreeMono: \url{http://savannah.nongnu.org/projects/freefont/}
+% 
+% \item  Roman Unicode: \url{http://everywitchway.net/linguistics/fonts/roman.html}
+% 
+% \item  Chrisanthi Unicode: \url{http://everywitchway.net/linguistics/fonts/chrysuni.html}
+% 
+% \item  HindSight Unicode (not very nice): \url{http://dartcanada.tripod.com/Objets/Zips/HindUnic.zip}
+% 
+% \item  AbRoman: \url{http://www.languagegeek.com/font/fontdownload.html}
+% 
 % \item  Garava: \url{http://www.aimwell.org/Fonts/fonts.html}
 % 
 % \item  Verajja (based on Bitstream Vera Sans, so very similar to DejaVu Sans): 
@@ -1342,7 +1353,7 @@ François Charette
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{arabxetex}
-  [2007/11/08 v1.1.1 ArabTeX-like interface for XeLaTeX]
+  [2008/07/16 v1.1.2 ArabTeX-like interface for XeLaTeX]
 %
 \DeclareOption{fullvoc}{\def\ax@mode{fullvoc}}
 \DeclareOption{voc}{\def\ax@mode{voc}}
@@ -1375,6 +1386,8 @@ François Charette
 	}%
 \def\ax@trans@style{\itshape}%
 \newcommand{\SetTranslitStyle}[1]{\def\ax@trans@style{#1}}
+\newcommand{\SetTranslitConvention}[1]{\def\ax@trans@convention{#1}}
+\def\ax@trans@convention{loc}% Library of Congress is default
 \newcommand{\SetAllahWithAlif}{\def\ax@font@allah{fdf2alif}}
 \newcommand{\SetAllahWithoutAlif}{\def\ax@font@allah{fdf2noalif}}
 \def\arabtex@codes{\catcode`^=11\relax\catcode`_=11\relax}
@@ -1400,7 +1413,7 @@ François Charette
 \ifax@mode@defined%
 	\ifx\@tempa\ax@mode@trans%
 		\par\arabtex@codes\ax@trans@style%
-		\addfontfeature{Mapping=arabtex-trans}%
+		\addfontfeature{Mapping=arabtex-trans-\ax@trans@convention}%
 	\else%
 	\ifx\@tempa\ax@mode@utf%
 		\par\setRL\arabicfont\addfontfeature{Mapping=arabicfixes}%
@@ -1423,7 +1436,7 @@ François Charette
 \ifax@mode@defined%
 	\ifx\@tempa\ax@mode@trans%
 		\par\arabtex@codes\ax@trans@style%
-		\addfontfeature{Mapping=arabtex-trans}%
+		\addfontfeature{Mapping=arabtex-trans-\ax@trans@convention}%
 	\else%
 	\ifx\@tempa\ax@mode@utf%
 		\par\setRL\ax@maghribi@font\addfontfeature{Mapping=arabicfixes}%
@@ -1445,7 +1458,7 @@ François Charette
 \ifax@mode@defined%
 	\ifx\@tempa\ax@mode@trans%
 		\par\arabtex@codes\ax@trans@style%
-		\addfontfeature{Mapping=arabtex-farsi-trans}%
+		\addfontfeature{Mapping=arabtex-farsi-trans-\ax@trans@convention}%
 	\else%
 	\ifx\@tempa\ax@mode@utf%
 		\par\setRL\ax@farsi@font\addfontfeature{Mapping=arabicfixes}%
@@ -1468,7 +1481,7 @@ François Charette
 \ifax@mode@defined%
 	\ifx\@tempa\ax@mode@trans%
 		\par\arabtex@codes\ax@trans@style%
-		\addfontfeature{Mapping=arabtex-urdu-trans}%
+		\addfontfeature{Mapping=arabtex-urdu-trans-\ax@trans@convention}%
 	\else%
 	\ifx\@tempa\ax@mode@utf%
 		\par\setRL\ax@urdu@font\addfontfeature{Language=Urdu}%Mapping=arabtex-utf}%
@@ -1490,7 +1503,7 @@ François Charette
 \ifax@mode@defined%
 	\ifx\@tempa\ax@mode@trans%
 		\par\arabtex@codes\ax@trans@style%
-		\addfontfeature{Mapping=arabtex-pashto-trans}%
+		\addfontfeature{Mapping=arabtex-pashto-trans-\ax@trans@convention}%
 	\else%
 	\ifx\@tempa\ax@mode@utf%
 		\par\setRL\ax@pashto@font\addfontfeature{Mapping=arabicfixes}%
@@ -1512,7 +1525,7 @@ François Charette
 \ifax@mode@defined%
 	\ifx\@tempa\ax@mode@trans%
 		\par\arabtex@codes\ax@trans@style%
-		\addfontfeature{Mapping=arabtex-sindhi-trans}%
+		\addfontfeature{Mapping=arabtex-sindhi-trans-\ax@trans@convention}%
 	\else%
 	\ifx\@tempa\ax@mode@utf%
 		\par\setRL\ax@sindhi@font\addfontfeature{Language=Sindhi}%Mapping=arabtex-utf}%
@@ -1534,7 +1547,7 @@ François Charette
 \ifax@mode@defined%
 	%\ifx\@tempa\ax@mode@trans%
 	%	\par\arabtex@codes\ax@trans@style%
-	%	\addfontfeature{Mapping=arabtex-turk-trans}%
+	%	\addfontfeature{Mapping=arabtex-turk-trans-\ax@trans@convention}%
 	%\else%
 	\ifx\@tempa\ax@mode@utf%
 		\par\setRL\ax@ottoman@font\addfontfeature{Mapping=arabicfixes}%
@@ -1557,7 +1570,7 @@ François Charette
 %\edef\@tempa{#1}%
 %\ifx\@tempa\ax@mode@trans%
 %	\par\arabtex@codes\ax@trans@style%
-%	\addfontfeature{Mapping=arabtex-kurdish-trans}%
+%	\addfontfeature{Mapping=arabtex-kurdish-trans-\ax@trans@convention}%
 %\else%
 \ifx\@tempa\ax@mode@utf%
 	\par\setRL\ax@kurdish@font\addfontfeature{Language=Kurdish}%Mapping=arabtex-utf}%
@@ -1576,7 +1589,7 @@ François Charette
 \ifax@mode@defined%
 	%\ifx\@tempa\ax@mode@trans%
 	%	\par\arabtex@codes\ax@trans@style%
-	%	\addfontfeature{Mapping=arabtex-\ax@font@allah-kashmiri-trans}%
+	%	\addfontfeature{Mapping=arabtex-\ax@font@allah-kashmiri-trans-\ax@trans@convention}%
 	%\else%
 	\ifx\@tempa\ax@mode@utf%
 		\par\setRL\ax@kashmiri@font\addfontfeature{Mapping=arabicfixes}%
@@ -1600,7 +1613,7 @@ François Charette
 \ifax@mode@defined%
 	%\ifx\@tempa\ax@mode@trans%
 	%	\par\arabtex@codes\ax@trans@style%
-	%	\addfontfeature{Mapping=arabtex-malay-trans}%
+	%	\addfontfeature{Mapping=arabtex-malay-trans-\ax@trans@convention}%
 	%\else%
 	\ifx\@tempa\ax@mode@utf%
 		\par\setRL\ax@malay@font\addfontfeature{Mapping=arabicfixes}%
@@ -1623,7 +1636,7 @@ François Charette
 \def\ax@lang{uighur}%
 %\ifx\@tempa\ax@mode@trans%
 %	\par\arabtex@codes\ax@trans@style%
-%	\addfontfeature{Mapping=arabtex-uighur-trans}%
+%	\addfontfeature{Mapping=arabtex-uighur-trans-\ax@trans@convention}%
 %\else%
 \ifx\@tempa\ax@mode@utf%
 	\par\setRL\ax@uighur@font\addfontfeature{Mapping=arabicfixes}%
@@ -1656,13 +1669,13 @@ François Charette
 	\ax@ismode@defined{\@tempa}%
 	\ifax@mode@defined%
 		\ifx\@tempa\ax@mode@trans%
-			{\ax@trans@style\addfontfeature{Mapping=arabtex-trans}#2}%
+			{\ax@trans@style\addfontfeature{Mapping=arabtex-trans-\ax@trans@convention}#2}%
 		\else%
 		\ifx\@tempa\ax@mode@utf%
-			\RL{\arabicfont\addfontfeature{Mapping=arabicfixes} #2}
+			\RL{\arabicfont\addfontfeature{Mapping=arabicfixes} #2}%
 		\else%
 			\RL{\arabicfont\addfontfeature{Mapping=arabtex-\ax@font@allah-\@tempa}#2}%
-		\fi\fi
+		\fi\fi%
 	\else%
 	\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
 	\RL{\arabicfont\addfontfeature{Mapping=arabtex-\ax@font@allah-\ax@mode}#2}%
@@ -1673,7 +1686,7 @@ François Charette
 	\ax@ismode@defined{\@tempa}%
 	\ifax@mode@defined%
 		\ifx\@tempa\ax@mode@trans%
-			{\ax@trans@style\addfontfeature{Mapping=arabtex-trans}#2}%
+			{\ax@trans@style\addfontfeature{Mapping=arabtex-trans-\ax@trans@convention}#2}%
 		\else%
 		\ifx\@tempa\ax@mode@utf%
 			\RL{\ax@maghribi@font\addfontfeature{Mapping=arabicfixes} #2}%evtl {Mapping=arabtex-utf}
@@ -1691,7 +1704,7 @@ François Charette
 	\ax@ismode@defined{\@tempa}%
 	\ifax@mode@defined%
 		\ifx\@tempa\ax@mode@trans%
-			{\ax@trans@style\addfontfeature{Mapping=arabtex-farsi-trans}#2}%
+			{\ax@trans@style\addfontfeature{Mapping=arabtex-farsi-trans-\ax@trans@convention}#2}%
 		\else%
 		\ifx\@tempa\ax@mode@utf%
 			\RL{\ax@farsi@font\addfontfeature{Mapping=arabicfixes} #2}%evtl {Mapping=arabtex-utf}
@@ -1709,7 +1722,7 @@ François Charette
 	\ax@ismode@defined{\@tempa}%
 	\ifax@mode@defined%
 		\ifx\@tempa\ax@mode@trans%
-			{\ax@trans@style\addfontfeature{Mapping=arabtex-urdu-trans}#2}%
+			{\ax@trans@style\addfontfeature{Mapping=arabtex-urdu-trans-\ax@trans@convention}#2}%
 		\else%
 		\ifx\@tempa\ax@mode@utf%
 			\RL{\ax@urdu@font\addfontfeature{Language=Urdu}#2}%eventually Mapping=arabtex-utf
@@ -1727,7 +1740,7 @@ François Charette
 	\ax@ismode@defined{\@tempa}%
 	\ifax@mode@defined%
 		\ifx\@tempa\ax@mode@trans%
-			{\ax@trans@style\addfontfeature{Mapping=arabtex-sindhi-trans}#2}%
+			{\ax@trans@style\addfontfeature{Mapping=arabtex-sindhi-trans-\ax@trans@convention}#2}%
 		\else%
 		\ifx\@tempa\ax@mode@utf%
 			\RL{\ax@sindhi@font\addfontfeature{Language=Sindhi} #2}%eventually Mapping=arabtex-utf
@@ -1745,7 +1758,7 @@ François Charette
 	\ax@ismode@defined{\@tempa}%
 	\ifax@mode@defined%
 		\ifx\@tempa\ax@mode@trans%
-			{\ax@trans@style\addfontfeature{Mapping=arabtex-pashto-trans}#2}%
+			{\ax@trans@style\addfontfeature{Mapping=arabtex-pashto-trans-\ax@trans@convention}#2}%
 		\else%
 		\ifx\@tempa\ax@mode@utf%
 			\RL{\ax@pashto@font\addfontfeature{Mapping=arabicfixes} #2}%evtl {Mapping=arabtex-utf}
@@ -1764,7 +1777,7 @@ François Charette
 	\ifax@mode@defined%
 		% UNCOMMENT when transliteration mapping is done
 		%\ifx\@tempa\ax@mode@trans%
-		%	{\ax@trans@style\addfontfeature{Mapping=arabtex-turk-trans}#2}%
+		%	{\ax@trans@style\addfontfeature{Mapping=arabtex-turk-trans-\ax@trans@convention}#2}%
 		%\else%
 		\ifx\@tempa\ax@mode@utf%
 			\RL{\ax@ottoman@font\addfontfeature{Mapping=arabicfixes} #2}%evtl {Mapping=arabtex-utf}
@@ -1781,7 +1794,7 @@ François Charette
 	\def\ax@lang{kurdish}%
 		% UNCOMMENT when transliteration mapping is done
 		%\ifx\@tempa\ax@mode@trans%
-		%	{\ax@trans@style\addfontfeature{Mapping=arabtex-kurdish-trans}#2}%
+		%	{\ax@trans@style\addfontfeature{Mapping=arabtex-kurdish-trans-\ax@trans@convention}#2}%
 		%\else%
 		\ifx\@tempa\ax@mode@utf%
 			\RL{\ax@kurdish@font\addfontfeature{Mapping=arabicfixes} #2}%evtl {Mapping=arabtex-utf}
@@ -1797,7 +1810,7 @@ François Charette
 	\ifax@mode@defined%
 		% UNCOMMENT when transliteration mapping is done
 		%\ifx\@tempa\ax@mode@trans%
-		%	{\ax@trans@style\addfontfeature{Mapping=arabtex-kashmiri-trans}#2}%
+		%	{\ax@trans@style\addfontfeature{Mapping=arabtex-kashmiri-trans-\ax@trans@convention}#2}%
 		%\else%
 		\ifx\@tempa\ax@mode@utf%
 			\RL{\ax@kashmiri@font\addfontfeature{Mapping=arabicfixes} #2}%evtl {Mapping=arabtex-utf}
@@ -1816,7 +1829,7 @@ François Charette
 	\ifax@mode@defined%
 		% UNCOMMENT when transliteration mapping is done
 		%\ifx\@tempa\ax@mode@trans%
-		%	{\ax@trans@style\addfontfeature{Mapping=arabtex-malay-trans}#2}%
+		%	{\ax@trans@style\addfontfeature{Mapping=arabtex-malay-trans-\ax@trans@convention}#2}%
 		%\else%
 		\ifx\@tempa\ax@mode@utf%
 			\RL{\ax@malay@font\addfontfeature{Mapping=arabicfixes} #2}%evtl {Mapping=arabtex-utf}
@@ -1833,7 +1846,7 @@ François Charette
 	\def\ax@lang{uighur}%
 		% UNCOMMENT when transliteration mapping is done
 		%\ifx\@tempa\ax@mode@trans%
-		%	{\ax@trans@style\addfontfeature{Mapping=arabtex-uighur-trans}#2}%
+		%	{\ax@trans@style\addfontfeature{Mapping=arabtex-uighur-trans-\ax@trans@convention}#2}%
 		%\else%
 		\ifx\@tempa\ax@mode@utf%
 			\RL{\ax@uighur@font\addfontfeature{Mapping=arabicfixes} #2}%evtl {Mapping=arabtex-utf}
@@ -1843,11 +1856,7 @@ François Charette
 		\fi%\fi%
 	\egroup}
 %
-\newcommand{\textroman}[1]{\LR{\rmfamily #1}}
-\@ifpackageloaded{babel}{%
-	\renewcommand{\textlatin}[1]{\textroman{#1}}
-	\PackageWarning{babel}{You have loaded Babel. ArabXeTeX has now redefined \textlatin !}}%
-	{\newcommand{\textlatin}[1]{\textroman{#1}}}%
+\newcommand{\textLR}[1]{\LR{\rmfamily #1}}
 \newcommand{\aemph}[1]{%
   \edef\@tempb{\expandafter\noexpand\csname text\ax@lang\endcsname}%
   $\overline{\text{\@tempb{#1}}}$}
@@ -1881,9 +1890,8 @@ François Charette
 % ^^A- hamza directly above baseline (for Qur'an) : 0654 is too high!
 % ^^A  \def\hamzaB{\raisebox[-1ex]{\char"0654} is ok
 % ^^A
-% ^^A- Clarify the U+FDF2 mess: OK to leave it as is, but it would be advisable to 
-% ^^A  codify the LLAH ligature as well: leaving it in the Private Use Area is really 
-% ^^A  a bad idea! Perhaps the FALILLAH ligature could be added as well.
+% ^^A- U+FDF2: codify the LLAH ligature as well?
+% ^^A          Perhaps the FALILLAH ligature could be added as well?
 %
 % ^^A\clearpage
 % ^^A\PrintChanges
diff --git a/Master/texmf-dist/doc/xelatex/arabxetex/arabxetex.pdf b/Master/texmf-dist/doc/xelatex/arabxetex/arabxetex.pdf
index 8fad206f7e2..2041a6d0a8c 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 fccf1b58bab..c24dbcf774e 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/ednotes_example.tex b/Master/texmf-dist/doc/xelatex/arabxetex/ednotes_example.tex
index c22b964fbc1..cc49982f5b1 100644
--- a/Master/texmf-dist/doc/xelatex/arabxetex/ednotes_example.tex
+++ b/Master/texmf-dist/doc/xelatex/arabxetex/ednotes_example.tex
@@ -12,8 +12,8 @@
 \documentclass[12pt,a4paper,oneside]{memoir}
 \usepackage{fontspec}
 \setromanfont[Mapping=tex-text]{Junicode}
-\usepackage[novoc,fdf2noalif]{arabxetex}
-\newfontinstance\arabicfont[Script=Arabic,Scale=1.2,WordSpace=2]{Lotus Linotype}
+\usepackage[novoc,fdf2alif]{arabxetex}
+\newfontfamily\arabicfont[Script=Arabic,Scale=1.2,WordSpace=2]{Scheherazade}
 %% OK, now we load ednotes with appropriate options. 
 %% For each extra level of notes in the critical apparatus we need to 
 %% initialize it with the appropriate option, in this case, "Bpara".