arabluatex (9sep16)

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

3 files changed, 21 insertions, 19 deletions

diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty
index befb074e3e8..9ef92eab1eb 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}%
-[2016/07/09 v1.4.1 ArabTeX-like interface for LuaLaTeX]
+[2016/09/09 v1.4.2 ArabTeX-like interface for LuaLaTeX]
 \RequirePackage{ifluatex}
 \ifluatex\else
  \PackageError{arabluatex}{lualatex needed}{%
@@ -94,7 +94,7 @@
 \NewDocumentCommand{\SetTranslitStyle}{m}{\def\al@trans@style{#1}}
 \def\al@trans@convention{dmg}
 \NewDocumentCommand{\SetTranslitConvention}{m}{\def\al@trans@convention{#1}}
-\NewDocumentCommand{\al@arbup@dflt}{m}{\textsuperscript{#1}}%
+\NewDocumentCommand{\al@arbup@dflt}{m}{\textsuperscript{\thinspace#1}}%
 \NewDocumentCommand{\al@arbup}{m}{\al@arbup@dflt{#1}}
 \NewDocumentCommand{\arbup}{m}{\al@arbup{#1}}
 \NewDocumentCommand{\ArbUpDflt}{}{\let\al@arbup=\al@arbup@dflt}
diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_trans.lua b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_trans.lua
index 2fdb94ab768..82459e946f4 100644
--- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_trans.lua
+++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_trans.lua
@@ -40,7 +40,7 @@ captr = {
    {a="b", b="B"},
    {a="t", b="T"},
    {a="ṯ", b="Ṯ"},
-   {a="ǧ", b="Ǧ"},
+   {a="ğ", b="Ğ"},
    {a="ḥ", b="Ḥ"},
    {a="ḫ", b="Ḫ"},
    {a="d", b="D"},
@@ -133,23 +133,23 @@ tanwintrdmg = {
    {a="%-?iNI", b="i\\arbup{n}"},
    -- tanwīn preceding ʾalif conjunctionis
    {a="%-?(uN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="\\arbup{uni}%2%3"},
-   {a="%-?(aN)(_A)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ\\arbup{ni}%3%4"},
-   {a="%-?(aN)(Y)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ\\arbup{ni}%3%4"},
+   {a="%-?(aN)(_A)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ\\arbup{ni}%3%4"},
+   {a="%-?(aN)(Y)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ\\arbup{ni}%3%4"},
    {a="(T)%-?(aN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="t\\arbup{ani}%3%4"},
    {a="([^TA])%-?(aN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1\\arbup{ani}%3%4"},
    {a="%-?(iN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="\\arbup{ini}%2%3"},
 -- tanwīn + alif without hamza and kasra (ibn)
    {a="%-?(uN)(%s)(i)", b="\\arbup{uni}%2'"},
-   {a="%-?(aN)(_A)(%s)(i)", b="ạ\\arbup{ni}%3%'"},
-   {a="%-?(aN)(Y)(%s)(i)", b="ạ\\arbup{ni}%3%'"},
+   {a="%-?(aN)(_A)(%s)(i)", b="ạ\\arbup{ni}%3%'"},
+   {a="%-?(aN)(Y)(%s)(i)", b="ạ\\arbup{ni}%3%'"},
    {a="(T)%-?(aN)(%s)(i)", b="t\\arbup{ani}%3%'"},
    {a="([^TA])%-?(aN)(%s)(i)", b="%1\\arbup{ani}%3%'"},
    {a="%-?(iN)(%s)(i)", b="\\arbup{ini}%2%'"},
    --
 -- {a="uN", b="\\arbup{un}"}, (now included in the last line of this table)
    {a="%-?(\"?At)%-?([ui])N", b="\\arbup{%1%2n}"},
-   {a="%-?(aN)(_A)", b="ạ\\arbup{n}"},
-   {a="%-?(aN)(Y)", b="ạ\\arbup{n}"},
+   {a="%-?(aN)(_A)", b="ạ\\arbup{n}"},
+   {a="%-?(aN)(Y)", b="ạ\\arbup{n}"},
    {a="(T)%-?(\"?aN)", b="t\\arbup{an}"},
    {a="([^TA])%-?(\"?aN)", b="%1\\arbup{an}"},
    {a="%-?([ui])N", b="\\arbup{%1n}"}
@@ -272,8 +272,8 @@ digraphstrdmg = {
 -- {a="([%_]?[uaiUAIY])(%s)([uai])", b="%1%2'"}, -- initial alif without hamza
    {a="(aW)(%s)(\"?[uai])", b="awu%2%3"},
    {a="([^%_][uai])(%s)(\"?[uai])", b="%1%2'"},
-   {a="(%_A)(%s)(\"?[uai])", b="ạ%2'"},
-   {a="(Y)(%s)(\"?[uai])", b="ạ%2'"},
+   {a="(%_A)(%s)(\"?[uai])", b="ạ%2'"},
+   {a="(Y)(%s)(\"?[uai])", b="ạ%2'"},
    {a="(%_a)(%s)(\"?[uai])", b="a%2'"},
    {a="(A)(%s)(\"?[uai])", b="a%2'"},
    {a="([%_]?[Uu])(%s)(\"?[uai])", b="u%2'"},
@@ -294,17 +294,17 @@ digraphstrdmg = {
    {a="(U)(A)", b="U"},
    {a="(aW)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="awu%2%3"},
    {a="(%_a)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="a%2%3"},
-   {a="(%_A)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ%2%3"},
+   {a="(%_A)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ%2%3"},
    {a="(A)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="a%2%3"},
-   {a="(Y)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ%2%3"},
+   {a="(Y)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ%2%3"},
    {a="([%_]?[Uu])(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="u%2%3"},
    {a="([%_]?[Ii])(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="i%2%3"},
    {a="%-%-", b=""},
 --   {a="T([^uai])", b="%1"},
-   {a="T(%p?%s)", b="%1"},
-   {a="T(%p?)$", b="%1"},
+   {a="T(%p?%s)", b="h%1"},
+   {a="T(%p?)$", b="h%1"},
    {a="_t", b="ṯ"},
-   {a="%^g", b="ǧ"},
+   {a="%^g", b="ğ"},
    {a="%.h", b="ḥ"},
    {a="_h", b="ḫ"},
    {a="_d", b="ḏ"},
@@ -318,7 +318,7 @@ digraphstrdmg = {
 --   {a="(U)(A)", b="ū"},
    {a="WA", b="w"},
    {a="(a)W", b="%1w"},
-   {a="_A", b="ạ̄"},
+   {a="_A", b="ạ̄"},
    {a="_u", b="ū"},
    {a="_a", b="ā"},
    {a="_i", b="ī"},
@@ -333,7 +333,7 @@ digraphstrdmg = {
 singletrdmg = {
    {a="b", b="b"},
    {a="t", b="t"},
-   {a="j", b="ǧ"},
+   {a="j", b="ğ"},
    {a="x", b="ḫ"},
    {a="d", b="d"},
    {a="r", b="r"},
@@ -358,7 +358,7 @@ longvtrdmg = {
    {a="A", b="ā"},
    {a="U", b="ū"},
    {a="I", b="ī"},
-   {a="Y", b="ạ̄"}
+   {a="Y", b="ạ̄"}
 }
 
 shortvtrdmg = {
diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua
index 20ed016cb1c..e28cd7e6338 100644
--- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua
+++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua
@@ -473,6 +473,8 @@ trigraphs = { -- trigraphs or more
 }
 
 trigraphseasy = { -- differences marked below with 'easy'
+   -- Allah (easy)
+   {a="l%-l_ah", b="l-ll_ah"},
    -- 'llatI / 'llad_I
    {a="^'ll(a)([%_]?[dt])", b="الّ%1%2"},
    {a="([%s%-])'ll(a)([%_]?[dt])", b="%1الّ%2%3"},