arabluatex (9jul16)

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

3 files changed, 23 insertions, 9 deletions

diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua
index b21ee63dee8..c0e02324e07 100644
--- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua
+++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua
@@ -129,6 +129,7 @@ local function takeoutcapetc(str)
 			return string.format("%s", body)
    end)
    str = string.gsub(str, "\\linebreak", "")
+   str = string.gsub(str, "\\%-", "")
    return str
 end
 
@@ -548,12 +549,12 @@ function cap(str)
 			body = string.sub(body, 2, -2)
 			return string.format("%s", body)
    end)
-   if string.find(str, "%-['`ʾʿ]") then
-      str = string.gsub(str, "(%-['`])", "%1\\MakeUppercase ")
-      str = string.gsub(str, "(%-ʿ)", "%1\\MakeUppercase ")
-      str = string.gsub(str, "(%-ʾ)", "%1\\MakeUppercase ")
-   elseif string.find(str, "%-[^'`ʾʿ]") then
-      str = string.gsub(str, "(%-)", "%1\\MakeUppercase ")
+   if string.find(str, "[^\\]%-['`ʾʿ]") then
+      str = string.gsub(str, "([^\\]%-['`])", "%1\\MakeUppercase ")
+      str = string.gsub(str, "([^\\]%-ʿ)", "%1\\MakeUppercase ")
+      str = string.gsub(str, "([^\\]%-ʾ)", "%1\\MakeUppercase ")
+   elseif string.find(str, "[^\\]%-[^'`ʾʿ]") then
+      str = string.gsub(str, "([^\\]%-)", "%1\\MakeUppercase ")
    elseif string.find(str, "^['`ʾʿ]") then
       str = string.gsub(str, "^(['`])", "%1\\MakeUppercase ")
       str = string.gsub(str, "^(ʿ)", "%1\\MakeUppercase ")
diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty
index ae362ea5923..befb074e3e8 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/05 v1.4 ArabTeX-like interface for LuaLaTeX]
+[2016/07/09 v1.4.1 ArabTeX-like interface for LuaLaTeX]
 \RequirePackage{ifluatex}
 \ifluatex\else
  \PackageError{arabluatex}{lualatex needed}{%
diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua
index 39da99ec563..20ed016cb1c 100644
--- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua
+++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua
@@ -74,6 +74,8 @@ raw = {
 buckwalter = {
    --- hard coded madda: hold it for now
    {a="%|", b="@"},
+   {a="M", b="@"}, -- BW safe
+   {a="%_", b="--"}, -- taṭwīl
    -- prevent any unwanted šadda from being generated
    {a="bb", b="b|b"},
    {a="tt", b="t|t"},
@@ -82,10 +84,12 @@ buckwalter = {
    {a="HH", b="H|H"},
    {a="xx", b="x|x"},
    {a="dd", b="d|d"},
-   {a="%*|%*", b="*|*"},
+   {a="%*%*", b="*|*"},
+   {a="VV", b="V|V"}, -- BW safe
    {a="rr", b="r|r"},
    {a="ss", b="s|s"},
    {a="%$%$", b="$|$"},
+   {a="cc", b="c|c"}, -- BW safe
    {a="SS", b="S|S"},
    {a="DD", b="D|D"},
    {a="TT", b="T|T"},
@@ -107,10 +111,15 @@ buckwalter = {
 --   {a="%>a\'([^uai])", b="@@@%1"}, -- hold this (madda)
    {a="a?A\'", b="@@"}, -- hold this (classic madda)
    {a="\'", b="|\"\'"},
+   {a="C", b="|\"\'"}, -- BW safe
    {a="%>", b="a\"\'"},
+   {a="O", b="a\"\'"}, -- BW safe
    {a="%&", b="w\"\'"},
+   {a="W", b="w\"\'"}, -- BW safe
    {a="%<", b="i\"\'"},
+   {a="I", b="i\"\'"}, -- BW safe
    {a="%]", b="y\"\'"},
+   {a="Q", b="y\"\'"},
    -- hamza end
    -- trigraphs
    {a="^Aal%-?", b="al-"},
@@ -134,10 +143,13 @@ buckwalter = {
    -- šadda:
    {a="([%g])(%~)", b="%1%1"},
    {a="%`", b="_a"},
+   {a="e", b="_a"}, -- BW safe
    {a="v", b="_t"},
    {a="H", b=".h"},
    {a="%*", b="_d"},
+   {a="V", b="_d"}, -- BW safe
    {a="%$", b="^s"},
+   {a="c", b="^s"}, -- BW safe
    {a="S", b=".s"},
    {a="D", b=".d"},
    {a="T", b=".t"},
@@ -150,7 +162,8 @@ buckwalter = {
    {a="K", b="iN"},
    {a="o", b="\""},
    -- hard-coded connective alif
-   {a="%[", b="ٱ"}
+   {a="%[", b="ٱ"},
+   {a="L", b="ٱ"} -- BW safe
 }
 
 hamza = {