summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/lualatex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-09-28 22:19:34 +0000
committerKarl Berry <karl@freefriends.org>2016-09-28 22:19:34 +0000
commitd2436f368c34455ebfcc7d630701e8ab11162ddd (patch)
treee8d8cedb43065d83f3181c3519def156079cea61 /Master/texmf-dist/tex/lualatex
parent39423c7609af97d780fc0830ddd09a16a2d025c2 (diff)
arabluatex (28sep16)
git-svn-id: svn://tug.org/texlive/trunk@42174 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/lualatex')
-rw-r--r--Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua22
-rw-r--r--Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty7
-rw-r--r--Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_fullvoc.lua2
3 files changed, 21 insertions, 10 deletions
diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua
index 35dccff7485..956f796bdfc 100644
--- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua
+++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua
@@ -241,7 +241,7 @@ local function fullvoc(str)
return str
end
-local function fullvoceasy(str)
+local function fullvoceasy(str, opt)
str = string.gsub(str, "\\arb(%b{})", function(inside)
inside = string.sub(inside, 2, -2)
for i = 1,#hamzafveasy do
@@ -253,8 +253,14 @@ local function fullvoceasy(str)
for i = 1,#trigraphsfveasy do
inside = string.gsub(inside, trigraphsfveasy[i].a, trigraphsfveasy[i].b)
end
- for i = 1,#digraphsfveasy do
- inside = string.gsub(inside, digraphsfveasy[i].a, digraphsfveasy[i].b)
+ if opt == "nosukun" then
+ for i = 1,#digraphsfveasy do
+ inside = string.gsub(inside, digraphsfveasy[i].a, digraphsfveasy[i].b)
+ end
+ else
+ for i = 1,#digraphsfv do
+ inside = string.gsub(inside, digraphsfv[i].a, digraphsfv[i].b)
+ end
end
for i = 1,#singlefveasy do
inside = string.gsub(inside, singlefveasy[i].a, singlefveasy[i].b)
@@ -477,7 +483,7 @@ function processvoc(str, rules, scheme)
if scheme == "buckwalter" then
str = processbuckw(str)
else end
- if rules == "easy" then
+ if rules == "easy" or rules == "easynosukun" then
str = voceasy(str)
elseif rules == "dflt" then
str = voc(str)
@@ -496,7 +502,9 @@ function processfullvoc(str, rules, scheme)
str = processbuckw(str)
else end
if rules == "easy" then
- str = fullvoceasy(str)
+ str = fullvoceasy(str, "sukun")
+ elseif rules == "easynosukun" then
+ str = fullvoceasy(str, "nosukun")
elseif rules == "dflt" then
str = fullvoc(str)
else end
@@ -513,7 +521,7 @@ function processnovoc(str, rules, scheme)
if scheme == "buckwalter" then
str = processbuckw(str)
else end
- if rules == "easy" then
+ if rules == "easy" or rules == "easynosukun" then
str = novoceasy(str)
elseif rules == "dflt" then
str = novoc(str)
@@ -532,7 +540,7 @@ function processtrans(str, mode, rules, scheme)
str = processbuckw(str)
else end
if mode == "dmg" then
- if rules == "easy" then
+ if rules == "easy" or rules == "easynosukun" then
str = transdmgeasy(str)
elseif rules == "dflt" then
str = transdmg(str)
diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty
index 705bf4592b6..170ba5b2f0b 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/09/14 v1.4.3 ArabTeX-like interface for LuaLaTeX]
+[2016/09/28 v1.4.4 ArabTeX-like interface for LuaLaTeX]
\RequirePackage{ifluatex}
\ifluatex\else
\PackageError{arabluatex}{lualatex needed}{%
@@ -86,7 +86,10 @@
\def\al@input@scheme{arabtex}
\NewDocumentCommand{\SetInputScheme}{m}{\def\al@input@scheme{#1}}
\def\al@arb@rules{dflt}
-\NewDocumentCommand{\SetArbEasy}{}{\def\al@arb@rules{easy}}
+\NewDocumentCommand{\SetArbEasy}{s}{%
+ \IfBooleanTF{#1}
+ {\def\al@arb@rules{easynosukun}}
+ {\def\al@arb@rules{easy}}}
\NewDocumentCommand{\SetArbDflt}{}{\def\al@arb@rules{dflt}}
\def\al@trans@font{\rmfamily}%
\NewDocumentCommand{\SetTranslitFont}{m}{\def\al@trans@font{#1}}
diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_fullvoc.lua b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_fullvoc.lua
index ae0dc4e29bf..af7dd9e7b2b 100644
--- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_fullvoc.lua
+++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_fullvoc.lua
@@ -503,7 +503,7 @@ digraphsfv = {
{a="%^d", b="ڊ"}
}
-digraphsfveasy = { -- see the diffenrences under 'easy' marker below
+digraphsfveasy = { -- see the differences under 'easy' marker below
-- iʿrāb: straight double quote must be discarded
{a="(%-)(\"?[UI]na)(%p?%s)", b="%2%3"},
{a="(%-)(\"?[UI]na)(%p?)$", b="%2%3"},