arabluatex (12feb18)

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

2 files changed, 11 insertions, 8 deletions

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"))}