arabluatex (12feb18)

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

6 files changed, 33 insertions, 30 deletions

diff --git a/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf b/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf
index 488aadc4fba..b6f9e4b792a 100644
--- a/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf
+++ b/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf
diff --git a/Master/texmf-dist/doc/lualatex/arabluatex/samples/al-Jahiz.pdf b/Master/texmf-dist/doc/lualatex/arabluatex/samples/al-Jahiz.pdf
index 68dc66ce00d..9c1f20f8aae 100644
--- a/Master/texmf-dist/doc/lualatex/arabluatex/samples/al-Jahiz.pdf
+++ b/Master/texmf-dist/doc/lualatex/arabluatex/samples/al-Jahiz.pdf
diff --git a/Master/texmf-dist/doc/lualatex/arabluatex/samples/template-01.pdf b/Master/texmf-dist/doc/lualatex/arabluatex/samples/template-01.pdf
index f2186a26781..1aa6fa638d8 100644
--- a/Master/texmf-dist/doc/lualatex/arabluatex/samples/template-01.pdf
+++ b/Master/texmf-dist/doc/lualatex/arabluatex/samples/template-01.pdf
diff --git a/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx b/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx
index 163f13cae9f..b97ce4ed023 100644
--- a/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx
+++ b/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx
@@ -27,7 +27,7 @@
 %<package-info>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package-info>\ProvidesPackage{arabluatex}
 %<*package-info>
-    [2018/01/04 v1.10.2 An ArabTeX-like interface for LuaLaTeX]
+    [2018/02/12 v1.10.3 An ArabTeX-like interface for LuaLaTeX]
 %</package-info>
 %
 %<*driver>
@@ -155,7 +155,7 @@
 \defaultfontfeatures{RawFeature={+liga}}
 \setmainfont{Old Standard}[SmallCapsFont={Latin Modern Roman Caps},
   RawFeature={+mark;+ccmp;+ss05;+ss06}]
-\usepackage{arabluatex}[2018/01/04]
+\usepackage{arabluatex}[2018/02/12]
 \usepackage[nopar]{quran}
 \usepackage[noindex]{nameauth}
 \usepackage{varioref}
@@ -192,12 +192,13 @@
 \usepackage{tikz}
 \usepackage[breakable, skins, listings, xparse]{tcolorbox}
 \DeclareTCBListing{arabluacode}{s O{}}{colback=white, boxrule=.15mm,
-  colframe=red!50!white, breakable, listing options={style=tcblatex,
-    numbers=left, numberstyle=\tiny}, IfBooleanTF={#1}{listing side
-    text}{#2}}
+  colframe=red!50!white, left=6mm, breakable, listing
+  options={style=tcblatex, numbers=left, numberstyle=\tiny},
+  IfBooleanTF={#1}{listing side text}{#2}}
 \DeclareTCBListing{arabluaverbatim}{}{colback=white, boxrule=.15mm,
-  colframe=red!50!white, breakable, listing options={style=tcblatex,
-    numbers=left, numberstyle=\tiny}, listing only}
+  colframe=red!50!white, left=6mm, breakable, listing
+  options={style=tcblatex, numbers=left, numberstyle=\tiny}, listing
+  only}
 \DeclareTotalTCBox{\arabluaverb}{v}{verbatim, colback=white,
     boxrule=.15mm, colframe=red!50!white}{#1}
 \DeclareTotalTCBox{\arabluabox}{m}{left=0mm, right=0mm, top=0mm,
@@ -2581,11 +2582,10 @@ From \textcite[i. 23 C]{Wright}:--- If the name following
 \begin{arabluacode}
 \begin{nameauth}
   \< Hunayn & \prname{'abU zayd} & \prname{.hunayn}, \prname{{i}bn
-    'is.h_aq al-`ibAdiyy} &  > %
-  \< Razi & & \prname{al-rAziyy}, \prname{'abU bakr mu.hammad ibn
-    zakariyyA'} & > %
+    'is.h_aq al-`ibAdiyy} & > %
+  \< Razi & \prname{'abU bakr mu.hammad ibn zakariyyA'} &
+  \prname{al-rAziyy} & > %
 \end{nameauth}
-\pretocmd{\Razi}{\RevName}{}{}
 
 On first occurrence, proper names are printed as \Hunayn, \Razi.
 Then as \Hunayn, \Razi.
@@ -2697,7 +2697,7 @@ muhaddamaTaN mi'_danatu-hu}: \arb[trans]{ra'aytu
 %   |kabIraT| \arb[trans]{madInaT kabIraT}, |al-madInaT| |al-kabIraT|
 %   \arb[trans]{al-madInaT al-kabIraT}.
 % \item Nouns followed by another noun in the genitive (contruct
-%   state): |.hikmaT| |al-l_ah| \arb[trans]{.hikmaT al-\uc{l}_ah},
+%   state): |.hikmaT| |al-l_ah| \arb[trans]{.hikmaT| \uc{al-l_ah}},
 %   |fi.d.daT| |al-darAhim| \arb[trans]{fi.d.daT al-darAhim}.
 % \end{compactenum}
 % \begin{quoting}
@@ -3371,8 +3371,8 @@ wa-ya.sIru ta.hta 'l-jild-i
 %</example>
 % \fi
 %
-% As an example, the following code will typeset the \arb[trans]{sUraT}
-% \arb[trans]{al-\uc{fAti.haT}}:---
+% As an example, the following code will typeset the \arb[trans]{sUraT
+% al-\uc{fAti.haT}}:---
 % \iffalse
 %<*example>
 % \fi
@@ -3423,7 +3423,7 @@ wa-ya.sIru ta.hta 'l-jild-i
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{arabluatex}%
-[2018/01/04 v1.10.2 An ArabTeX-like interface for LuaLaTeX]
+[2018/02/12 v1.10.3 An ArabTeX-like interface for LuaLaTeX]
 \RequirePackage{ifluatex}
 %    \end{macrocode}
 % \package{arabluatex} requires \LuaLaTeX\ of course. Issue a warning
@@ -3439,12 +3439,13 @@ wa-ya.sIru ta.hta 'l-jild-i
 %    \end{macrocode}
 % Declare the global options, and define them:
 %    \begin{macrocode}
-\DeclareOption{voc}{\def\al@mode{voc}}
-\DeclareOption{fullvoc}{\def\al@mode{fullvoc}}
-\DeclareOption{novoc}{\def\al@mode{novoc}}
-\DeclareOption{trans}{\def\al@mode{trans}}
-\ExecuteOptions{voc}
-\ProcessOptions\relax
+\RequirePackage{xkeyval}
+\DeclareOptionX{voc}{\def\al@mode{voc}}
+\DeclareOptionX{fullvoc}{\def\al@mode{fullvoc}}
+\DeclareOptionX{novoc}{\def\al@mode{novoc}}
+\DeclareOptionX{trans}{\def\al@mode{trans}}
+\ExecuteOptionsX{voc}
+\ProcessOptionsX\relax
 \def\al@mode@voc{voc}
 \def\al@mode@fullvoc{fullvoc}
 \def\al@mode@novoc{novoc}
@@ -3460,7 +3461,6 @@ wa-ya.sIru ta.hta 'l-jild-i
 \RequirePackage{xparse}
 \RequirePackage{environ}
 \RequirePackage{adjustbox}
-\RequirePackage{xkeyval}
 %    \end{macrocode}
 % The following boolean will be set to |true| in |RL| mode:
 %    \begin{macrocode}
diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua
index 088d241240a..2b1360c4454 100644
--- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua
+++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua
@@ -670,6 +670,9 @@ function uc(str)
 			body = string.sub(body, 2, -2)
 			return string.format("%s", body)
    end)
+   -- Allah and ibn
+   str = string.gsub(str, "(al%-lāh)([uai]?)", "{Allāh%2}")
+   str = string.gsub(str, "([%'%-]?)(l%-lāh)([uai]?)", "%1{Llāh%3}")
    str = string.gsub(str, "(%s[%(%<%[]?)([i%']?b[n%.])", "%1{%2}")
    for i = 1,#lcuc do
       str = string.gsub(str, "^([%S]-%-[`']?)"..lcuc[i].a, "{%1"..lcuc[i].b.."}")
diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty
index 2d7ba78e620..db42721afa5 100644
--- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty
+++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty
@@ -41,7 +41,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{arabluatex}%
-[2018/01/04 v1.10.2 An ArabTeX-like interface for LuaLaTeX]
+[2018/02/12 v1.10.3 An ArabTeX-like interface for LuaLaTeX]
 \RequirePackage{ifluatex}
 \ifluatex\else
  \PackageError{arabluatex}{lualatex needed}{%
@@ -50,12 +50,13 @@
   See documentation of `arabluatex' for further information.}%
   \expandafter\expandafter\expandafter\csname endinput\endcsname
 \fi
-\DeclareOption{voc}{\def\al@mode{voc}}
-\DeclareOption{fullvoc}{\def\al@mode{fullvoc}}
-\DeclareOption{novoc}{\def\al@mode{novoc}}
-\DeclareOption{trans}{\def\al@mode{trans}}
-\ExecuteOptions{voc}
-\ProcessOptions\relax
+\RequirePackage{xkeyval}
+\DeclareOptionX{voc}{\def\al@mode{voc}}
+\DeclareOptionX{fullvoc}{\def\al@mode{fullvoc}}
+\DeclareOptionX{novoc}{\def\al@mode{novoc}}
+\DeclareOptionX{trans}{\def\al@mode{trans}}
+\ExecuteOptionsX{voc}
+\ProcessOptionsX\relax
 \def\al@mode@voc{voc}
 \def\al@mode@fullvoc{fullvoc}
 \def\al@mode@novoc{novoc}
@@ -68,7 +69,6 @@
 \RequirePackage{xparse}
 \RequirePackage{environ}
 \RequirePackage{adjustbox}
-\RequirePackage{xkeyval}
 \newbool{al@rlmode}
 \luadirect{dofile(kpse.find_file("arabluatex.lua"))}
 \luadirect{tex.enableprimitives("luatex",tex.extraprimitives("omega"))}