summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/xelatex/arabxetex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-09-05 22:01:10 +0000
committerKarl Berry <karl@freefriends.org>2015-09-05 22:01:10 +0000
commit412a3bd77bd76014472d93aa65ce8d7b75809ebb (patch)
tree693f23e713a7e26b3e55b5e946da81d9825f67c4 /Master/texmf-dist/tex/xelatex/arabxetex
parent72347356254cf3c4b88615a8c0fcf696b21e313f (diff)
arabxetex (4sep15)
git-svn-id: svn://tug.org/texlive/trunk@38299 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/xelatex/arabxetex')
-rw-r--r--Master/texmf-dist/tex/xelatex/arabxetex/arabxetex.sty104
1 files changed, 52 insertions, 52 deletions
diff --git a/Master/texmf-dist/tex/xelatex/arabxetex/arabxetex.sty b/Master/texmf-dist/tex/xelatex/arabxetex/arabxetex.sty
index 67e8391b58b..489a0245c2c 100644
--- a/Master/texmf-dist/tex/xelatex/arabxetex/arabxetex.sty
+++ b/Master/texmf-dist/tex/xelatex/arabxetex/arabxetex.sty
@@ -8,23 +8,23 @@
%%
%% ____________________________
%% The arabxetex package
-%% © 2007–2010 François Charette
+%% © 2007–2015 François Charette
%% License information appended
%%
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{arabxetex}
- [2010/03/04 v1.1.4 ArabTeX-like interface for XeLaTeX]
+ [2015/09/04 v1.2.1 ArabTeX-like interface for XeLaTeX]
\DeclareOption{fullvoc}{\def\ax@mode{fullvoc}}
\DeclareOption{voc}{\def\ax@mode{voc}}
\DeclareOption{novoc}{\def\ax@mode{novoc}}
\DeclareOption{trans}{\def\ax@mode{trans}}
\DeclareOption{utf}{\def\ax@mode{utf}}
-\DeclareOption{fdf2alif}{\def\ax@font@allah{fdf2alif}}
-\DeclareOption{fdf2noalif}{\def\ax@font@allah{fdf2noalif}}
+\DeclareOption{fdf2alif}{} % deprecated
+\DeclareOption{fdf2noalif}{} % deprecated
\newif\ifmirror@punct\mirror@punctfalse
\DeclareOption{mirrorpunct}{\mirror@puncttrue}
-\ExecuteOptions{novoc,fdf2alif}
+\ExecuteOptions{novoc}
\ProcessOptions
\def\ax@mode@fullvoc{fullvoc}
\def\ax@mode@voc{voc}
@@ -43,14 +43,14 @@
\RequirePackage{fontspec}
\RequirePackage{bidi}
\AtBeginDocument{\ifdefined\arabicfont\relax\else
-\PackageWarning{arabxetex}{\string\arabicfont\ is not defined!^^JI will try to load Scheherazade (scaled 1.5)}%
-\newfontfamily\arabicfont[Script=Arabic,Scale=1.5]{Scheherazade}\fi}%
+\PackageWarning{arabxetex}{\string\arabicfont\ is not defined!^^JI will try to load Amiri}%
+\newfontfamily\arabicfont[Script=Arabic]{Amiri}\fi}%
\def\ax@trans@style{\itshape}%
\newcommand{\SetTranslitStyle}[1]{\def\ax@trans@style{#1}}
\newcommand{\SetTranslitConvention}[1]{\def\ax@trans@convention{#1}}
\def\ax@trans@convention{loc}% Library of Congress is default
-\newcommand{\SetAllahWithAlif}{\def\ax@font@allah{fdf2alif}}
-\newcommand{\SetAllahWithoutAlif}{\def\ax@font@allah{fdf2noalif}}
+\newcommand{\SetAllahWithAlif}{} % deprecated
+\newcommand{\SetAllahWithoutAlif}{} % deprecated
\def\utf@fontfeature{\ifmirror@punct\addfontfeature{Mapping=mirrorpunct}\else\relax\fi}
\def\arabtex@codes{\catcode`^=11\relax\catcode`_=11\relax}
\def\UC{\char"E000} % This is used to capitalize the following letter (ignoring
@@ -81,12 +81,12 @@
\par\setRL\arabicfont\utf@fontfeature%
\else
\par\setRL\arabicfont\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-\@tempa}%
+\addfontfeature{Mapping=arabtex-\@tempa}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
\par\setRL\arabicfont\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-\ax@mode}%
+\addfontfeature{Mapping=arabtex-\ax@mode}%
\fi}
{\ifx\@tempa\ax@mode@trans\relax\else\unsetRL\fi\par}
\let\Arabic=\arab%
@@ -104,12 +104,12 @@
\par\setRL\ax@maghribi@font\utf@fontfeature%
\else
\par\setRL\ax@maghribi@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-maghribi-\@tempa}%
+\addfontfeature{Mapping=arabtex-maghribi-\@tempa}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
\par\setRL\ax@maghribi@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-maghribi-\ax@mode}%
+\addfontfeature{Mapping=arabtex-maghribi-\ax@mode}%
\fi}
{\ifx\@tempa\ax@mode@trans\relax\else\unsetRL\fi\par}
%%%
@@ -126,12 +126,12 @@
\par\setRL\ax@farsi@font\utf@fontfeature%
\else
\par\setRL\ax@farsi@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-farsi-\@tempa}%
+\addfontfeature{Mapping=arabtex-farsi-\@tempa}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
\par\setRL\ax@farsi@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-farsi-\ax@mode}%
+\addfontfeature{Mapping=arabtex-farsi-\ax@mode}%
\fi}
{\ifx\@tempa\ax@mode@trans\relax\else\unsetRL\fi\par}
\let\persian=\farsi
@@ -149,12 +149,12 @@
\par\setRL\ax@urdu@font\addfontfeature{Language=Urdu}%Mapping=arabtex-utf}%
\else
\par\setRL\ax@urdu@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-urdu-\@tempa}%
+\addfontfeature{Mapping=arabtex-urdu-\@tempa}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
\par\setRL\ax@urdu@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-urdu-\ax@mode}%
+\addfontfeature{Mapping=arabtex-urdu-\ax@mode}%
\fi}
{\ifx\@tempa\ax@mode@trans\relax\else\unsetRL\fi\par}
%%%
@@ -171,12 +171,12 @@
\par\setRL\ax@pashto@font\utf@fontfeature%
\else
\par\setRL\ax@pashto@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-pashto-\@tempa}%
+\addfontfeature{Mapping=arabtex-pashto-\@tempa}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
\par\setRL\ax@pashto@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-pashto-\ax@mode}%
+\addfontfeature{Mapping=arabtex-pashto-\ax@mode}%
\fi}
{\ifx\@tempa\ax@mode@trans\relax\else\unsetRL\fi\par}
%%%
@@ -193,12 +193,12 @@
\par\setRL\ax@sindhi@font\addfontfeature{Language=Sindhi}%Mapping=arabtex-utf}%
\else
\par\setRL\ax@sindhi@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-sindhi-\@tempa,Language=Sindhi}%
+\addfontfeature{Mapping=arabtex-sindhi-\@tempa,Language=Sindhi}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
\par\setRL\ax@sindhi@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-sindhi-\ax@mode,Language=Sindhi}%
+\addfontfeature{Mapping=arabtex-sindhi-\ax@mode,Language=Sindhi}%
\fi}
{\ifx\@tempa\ax@mode@trans\relax\else\unsetRL\fi\par}
%%%
@@ -211,12 +211,12 @@
\par\setRL\ax@ottoman@font\utf@fontfeature%
\else
\par\setRL\ax@ottoman@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-turk-\@tempa}%
+\addfontfeature{Mapping=arabtex-turk-\@tempa}%
\fi%\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
\par\setRL\ax@ottoman@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-turk-\ax@mode}%
+\addfontfeature{Mapping=arabtex-turk-\ax@mode}%
\fi}
{%\ifx\@tempa\ax@mode@trans\relax\else
\unsetRL%\fi
@@ -229,7 +229,7 @@
\par\setRL\ax@kurdish@font\addfontfeature{Language=Kurdish}%Mapping=arabtex-utf}%
\else
\par\setRL\ax@kurdish@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-kurdish,Language=Kurdish}%
+\addfontfeature{Mapping=arabtex-kurdish,Language=Kurdish}%
\fi}
{%\ifx\@tempa\ax@mode@trans\relax\else
\unsetRL%\fi
@@ -244,12 +244,12 @@
\par\setRL\ax@kashmiri@font\utf@fontfeature%
\else
\par\setRL\ax@kashmiri@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-kashmiri-\@tempa}%
+\addfontfeature{Mapping=arabtex-kashmiri-\@tempa}%
\fi%\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
\par\setRL\ax@kashmiri@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-kashmiri-\ax@mode}%
+\addfontfeature{Mapping=arabtex-kashmiri-\ax@mode}%
\fi}
{%\ifx\@tempa\ax@mode@trans\relax\else
\unsetRL%\fi
@@ -264,12 +264,12 @@
\par\setRL\ax@malay@font\utf@fontfeature%
\else
\par\setRL\ax@malay@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-malay-\@tempa}%
+\addfontfeature{Mapping=arabtex-malay-\@tempa}%
\fi%\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
\par\setRL\ax@malay@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-malay-\ax@mode}%
+\addfontfeature{Mapping=arabtex-malay-\ax@mode}%
\fi}
{%\ifx\@tempa\ax@mode@trans\relax\else
\unsetRL%\fi
@@ -283,7 +283,7 @@
\par\setRL\ax@uighur@font\utf@fontfeature%
\else
\par\setRL\ax@uighur@font\arabtex@codes%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-uighur}%
+\addfontfeature{Mapping=arabtex-uighur}%
\fi}
{%\ifx\@tempa\ax@mode@trans\relax\else
\unsetRL%\fi
@@ -310,16 +310,16 @@
\ax@ismode@defined{\@tempa}%
\ifax@mode@defined%
\ifx\@tempa\ax@mode@trans%
-{\ax@trans@style\addfontfeature{Mapping=arabtex-trans-\ax@trans@convention}#2}%
+{\ax@trans@style\addfontfeature{Mapping=arabtex-trans-\ax@trans@convention}\scantokens{#2\noexpand}}%
\else
\ifx\@tempa\ax@mode@utf%
\RL{\arabicfont\utf@fontfeature #2}%
\else
-\RL{\arabicfont\addfontfeature{Mapping=arabtex-\ax@font@allah-\@tempa}#2}%
+\RL{\arabicfont\addfontfeature{Mapping=arabtex-\@tempa}\scantokens{#2\noexpand}}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
-\RL{\arabicfont\addfontfeature{Mapping=arabtex-\ax@font@allah-\ax@mode}#2}%
+\RL{\arabicfont\addfontfeature{Mapping=arabtex-\ax@mode}\scantokens{#2\noexpand}}%
\fi\egroup}
\newcommand\text@maghribi[2][\ax@mode]{%
\edef\@tempa{#1}%
@@ -333,11 +333,11 @@
\RL{\ax@maghribi@font\utf@fontfeature #2}%
\else
\RL{\ax@maghribi@font%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-maghribi-\@tempa}#2}%
+\addfontfeature{Mapping=arabtex-maghribi-\@tempa}#2}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
-\RL{\ax@maghribi@font\addfontfeature{Mapping=arabtex-\ax@font@allah-maghribi-\ax@mode}#2}%
+\RL{\ax@maghribi@font\addfontfeature{Mapping=arabtex-maghribi-\ax@mode}#2}%
\fi\egroup}
\newcommand\text@farsi[2][\ax@mode]{%
\edef\@tempa{#1}%
@@ -351,11 +351,11 @@
\RL{\ax@farsi@font\utf@fontfeature #2}%
\else
\RL{\ax@farsi@font%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-farsi-\@tempa}#2}%
+\addfontfeature{Mapping=arabtex-farsi-\@tempa}#2}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
-\RL{\ax@farsi@font\addfontfeature{Mapping=arabtex-\ax@font@allah-farsi-\ax@mode}#2}%
+\RL{\ax@farsi@font\addfontfeature{Mapping=arabtex-farsi-\ax@mode}#2}%
\fi\egroup}
\newcommand\text@urdu[2][\ax@mode]{%
\edef\@tempa{#1}%
@@ -369,11 +369,11 @@
\RL{\ax@urdu@font\addfontfeature{Language=Urdu}#2}%eventually Mapping=arabtex-utf
\else
\RL{\ax@urdu@font%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-urdu-\@tempa,Language=Urdu}#2}%
+\addfontfeature{Mapping=arabtex-urdu-\@tempa,Language=Urdu}#2}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
-\RL{\ax@urdu@font\addfontfeature{Mapping=arabtex-\ax@font@allah-urdu-\ax@mode,Language=Urdu}#2}%
+\RL{\ax@urdu@font\addfontfeature{Mapping=arabtex-urdu-\ax@mode,Language=Urdu}#2}%
\fi\egroup}
\newcommand\text@sindhi[2][\ax@mode]{%
\edef\@tempa{#1}%
@@ -387,11 +387,11 @@
\RL{\ax@sindhi@font\addfontfeature{Language=Sindhi} #2}%eventually Mapping=arabtex-utf
\else
\RL{\ax@sindhi@font%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-sindhi-\@tempa,Language=Sindhi}#2}%
+\addfontfeature{Mapping=arabtex-sindhi-\@tempa,Language=Sindhi}#2}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
-\RL{\ax@sindhi@font\addfontfeature{Mapping=arabtex-\ax@font@allah-sindhi-\ax@mode,Language=Sindhi}#2}%
+\RL{\ax@sindhi@font\addfontfeature{Mapping=arabtex-sindhi-\ax@mode,Language=Sindhi}#2}%
\fi\egroup}
\newcommand\text@pashto[2][\ax@mode]{%
\edef\@tempa{#1}%
@@ -405,11 +405,11 @@
\RL{\ax@pashto@font\utf@fontfeature #2}%
\else
\RL{\ax@pashto@font%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-pashto-\@tempa}#2}%
+\addfontfeature{Mapping=arabtex-pashto-\@tempa}#2}%
\fi\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
-\RL{\ax@pashto@font\addfontfeature{Mapping=arabtex-\ax@font@allah-pashto-\ax@mode}#2}%
+\RL{\ax@pashto@font\addfontfeature{Mapping=arabtex-pashto-\ax@mode}#2}%
\fi\egroup}
\newcommand\text@ottoman[2][\ax@mode]{%
\edef\@tempa{#1}%
@@ -420,11 +420,11 @@
\RL{\ax@ottoman@font\utf@fontfeature #2}%
\else
\RL{\ax@ottoman@font%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-turk-\@tempa}#2}%
+\addfontfeature{Mapping=arabtex-turk-\@tempa}#2}%
\fi%\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
-\RL{\ax@ottoman@font\addfontfeature{Mapping=arabtex-\ax@font@allah-turk-\ax@mode}#2}%
+\RL{\ax@ottoman@font\addfontfeature{Mapping=arabtex-turk-\ax@mode}#2}%
\fi\egroup}
\newcommand\text@kurdish[2][]{%
\edef\@tempa{#1}%
@@ -433,7 +433,7 @@
\RL{\ax@kurdish@font\utf@fontfeature #2}%
\else
\RL{\ax@kurdish@font%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-kurdish,Language=Kurdish}#2}%
+\addfontfeature{Mapping=arabtex-kurdish,Language=Kurdish}#2}%
\fi%\fi
\egroup}
\newcommand\text@kashmiri[2][\ax@mode]{%
@@ -445,11 +445,11 @@
\RL{\ax@kashmiri@font\utf@fontfeature #2}%
\else
\RL{\ax@kashmiri@font%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-kashmiri-\@tempa}#2}%
+\addfontfeature{Mapping=arabtex-kashmiri-\@tempa}#2}%
\fi%\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \@ax@mode}%
-\RL{\ax@kashmiri@font\addfontfeature{Mapping=arabtex-\ax@font@allah-kashmiri-\ax@mode}#2}%
+\RL{\ax@kashmiri@font\addfontfeature{Mapping=arabtex-kashmiri-\ax@mode}#2}%
\fi\egroup}
\newcommand\text@malay[2][\ax@mode]{%
\edef\@tempa{#1}%
@@ -460,11 +460,11 @@
\RL{\ax@malay@font\utf@fontfeature #2}%
\else
\RL{\ax@malay@font%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-malay-\@tempa}#2}%
+\addfontfeature{Mapping=arabtex-malay-\@tempa}#2}%
\fi%\fi
\else
\PackageWarning{arabxetex}{Mode \@tempa\ not defined, defaulting to \ax@mode}%
-\RL{\ax@malay@font\addfontfeature{Mapping=arabtex-\ax@font@allah-malay-\ax@mode}#2}%
+\RL{\ax@malay@font\addfontfeature{Mapping=arabtex-malay-\ax@mode}#2}%
\fi\egroup}
\newcommand\text@uighur[2][]{%
\edef\@tempa{#1}%
@@ -473,15 +473,15 @@
\RL{\ax@uighur@font\utf@fontfeature #2}%
\else
\RL{\ax@uighur@font%
-\addfontfeature{Mapping=arabtex-\ax@font@allah-uighur}#2}%
+\addfontfeature{Mapping=arabtex-uighur}#2}%
\fi%\fi
\egroup}
\newcommand{\textLR}[1]{\LR{\rmfamily #1}}
-\newcommand{\aemph}[1]{%
+\providecommand*{\aemph}[1]{%
\edef\@tempb{\expandafter\noexpand\csname text\ax@lang\endcsname}%
$\overline{\text{\@tempb{#1}}}$}
%%
-%% Copyright © 2007–2010 by François Charette <firmicus at gmx dot net>
+%% Copyright © 2007–2015 by François Charette <firmicus04 at gmail dot com>
%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of