1 files changed, 20 insertions, 22 deletions
diff --git a/Master/texmf-dist/tex/xelatex/arabxetex/arabxetex.sty b/Master/texmf-dist/tex/xelatex/arabxetex/arabxetex.sty
index 6d64883380d..6afba00b6aa 100644
--- a/Master/texmf-dist/tex/xelatex/arabxetex/arabxetex.sty
+++ b/Master/texmf-dist/tex/xelatex/arabxetex/arabxetex.sty
@@ -8,13 +8,13 @@
 %% 
 %%   ____________________________
 %%   The arabxetex package
-%%   (C) 2007  François Charette
+%%   (C) 2007-2008  François Charette
 %%   License information appended
 %% 
 %% 
 \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}}
 \DeclareOption{novoc}{\def\ax@mode{novoc}}
@@ -46,6 +46,8 @@
 }%
 \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}
@@ -71,7 +73,7 @@
 \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}%
@@ -94,7 +96,7 @@
 \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}%
@@ -116,7 +118,7 @@
 \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}%
@@ -139,7 +141,7 @@
 \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}%
@@ -161,7 +163,7 @@
 \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}%
@@ -183,7 +185,7 @@
 \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}%
@@ -306,13 +308,13 @@
 \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}%
@@ -323,7 +325,7 @@
 \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}
@@ -341,7 +343,7 @@
 \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}
@@ -359,7 +361,7 @@
 \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
@@ -377,7 +379,7 @@
 \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
@@ -395,7 +397,7 @@
 \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}
@@ -472,16 +474,12 @@
 \addfontfeature{Mapping=arabtex-\ax@font@allah-uighur}#2}%
 \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}}}$}
 %% 
-%% 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