summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-10-09 20:26:52 +0000
committerKarl Berry <karl@freefriends.org>2018-10-09 20:26:52 +0000
commit815ff6f1c227df5cd720c1db1b0a4b9e6c6398d0 (patch)
tree2dd799a7b09fba1f5f36a99f7e9166c535534901 /Master
parent48ea6378daabbb2e379b09ea33972c665b3b12ec (diff)
arabluatex (9oct18)
git-svn-id: svn://tug.org/texlive/trunk@48868 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdfbin654744 -> 660186 bytes
-rw-r--r--Master/texmf-dist/doc/lualatex/arabluatex/samples/al-Jahiz.pdfbin111577 -> 111741 bytes
-rw-r--r--Master/texmf-dist/doc/lualatex/arabluatex/samples/exporting.pdfbin56438 -> 58498 bytes
-rw-r--r--Master/texmf-dist/doc/lualatex/arabluatex/samples/exporting.tex2
-rw-r--r--Master/texmf-dist/doc/lualatex/arabluatex/samples/template-01.pdfbin64862 -> 64703 bytes
-rw-r--r--Master/texmf-dist/source/lualatex/arabluatex/README.tex2
-rw-r--r--Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx119
-rw-r--r--Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua71
-rw-r--r--Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty18
-rw-r--r--Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua8
10 files changed, 164 insertions, 56 deletions
diff --git a/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf b/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf
index 91c45db77ab..24b582afdaf 100644
--- a/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf
+++ b/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf
Binary files differ
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 05240d86730..9816999622a 100644
--- a/Master/texmf-dist/doc/lualatex/arabluatex/samples/al-Jahiz.pdf
+++ b/Master/texmf-dist/doc/lualatex/arabluatex/samples/al-Jahiz.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/lualatex/arabluatex/samples/exporting.pdf b/Master/texmf-dist/doc/lualatex/arabluatex/samples/exporting.pdf
index adb5a0439da..91001a68616 100644
--- a/Master/texmf-dist/doc/lualatex/arabluatex/samples/exporting.pdf
+++ b/Master/texmf-dist/doc/lualatex/arabluatex/samples/exporting.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/lualatex/arabluatex/samples/exporting.tex b/Master/texmf-dist/doc/lualatex/arabluatex/samples/exporting.tex
index ad2b3e5ba32..7f22c2c0981 100644
--- a/Master/texmf-dist/doc/lualatex/arabluatex/samples/exporting.tex
+++ b/Master/texmf-dist/doc/lualatex/arabluatex/samples/exporting.tex
@@ -15,7 +15,7 @@
% \renewcommand{\txarb}[1]{#1}
% \renewcommand{\txtrans}[1]{\emph{#1}}
-% \renewcommand{\aemph}[1]{#1}
+% \newcommand{\aemph}[1]{#1}
% \renewcommand{\arbup}[1]{\textsuperscript{#1}}
\end{filecontents*}
\begin{filecontents*}{exporting-dajaja.tex}
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 c5f7220c1b9..a88006f2d6e 100644
--- a/Master/texmf-dist/doc/lualatex/arabluatex/samples/template-01.pdf
+++ b/Master/texmf-dist/doc/lualatex/arabluatex/samples/template-01.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/lualatex/arabluatex/README.tex b/Master/texmf-dist/source/lualatex/arabluatex/README.tex
index 24da0c71b8f..26a07c92386 100644
--- a/Master/texmf-dist/source/lualatex/arabluatex/README.tex
+++ b/Master/texmf-dist/source/lualatex/arabluatex/README.tex
@@ -88,7 +88,7 @@ to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
\verb+arabluatex.sty+ file;
\item To finish the installation you have to move the following files
into a directory where LaTeX can find them. See the FAQ on
- \verb|tex.ac.uk| at
+ \verb|texfaq.org| at
\url{https://texfaq.org/FAQ-inst-wlcf} for more on this:
\begin{itemize}
\item \verb|arabluatex.sty|
diff --git a/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx b/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx
index 8fadee2d105..4173695fad5 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/08/29 v1.14 An ArabTeX-like interface for LuaLaTeX]
+ [2018/10/09 v1.15 An ArabTeX-like interface for LuaLaTeX]
%</package-info>
%
%<*driver>
@@ -158,13 +158,14 @@
\usepackage{newunicodechar}
\newunicodechar{ǧ}{ǧ} % Old Standard does not include ǧ/Ǧ
\newunicodechar{Ǧ}{Ǧ} %
-\usepackage{arabluatex}[2018/08/29]
+\usepackage{arabluatex}[2018/10/09]
\usepackage[nopar]{quran}
\usepackage[noindex]{nameauth}
\usepackage{varioref}
\usepackage{hyperxmp}
\PassOptionsToPackage{pdfa}{hyperref}
\usepackage{hypdoc}
+\usepackage{uri}
\usepackage{bookmark}
\usepackage{authblk}
\hypersetup{unicode=true, colorlinks, allcolors=blue,
@@ -203,19 +204,16 @@
\usepackage{needspace}
\usepackage{tikz}
\usepackage[breakable, skins, listings, xparse]{tcolorbox}
-\DeclareTCBListing{arabluacode}{s O{}}{colback=white, boxrule=.15mm,
- colframe=red!50!white, left=6mm, breakable, listing
+\tcbset{colback=white, boxrule=.15mm, colframe=red!50!white, left=6mm,
+ breakable}
+\DeclareTCBListing{arabluacode}{s O{}}{listing
options={style=tcblatex, numbers=left, numberstyle=\tiny},
IfBooleanTF={#1}{listing side text}{#2}}
-\DeclareTCBListing{arabluaverbatim}{}{colback=white, boxrule=.15mm,
- 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}
+\DeclareTCBListing{arabluaverbatim}{}{listing options={style=tcblatex,
+ numbers=left, numberstyle=\tiny}, listing only}
+\DeclareTotalTCBox{\arabluaverb}{v}{verbatim}{#1}
\DeclareTotalTCBox{\arabluabox}{m}{left=0mm, right=0mm, top=0mm,
- bottom=0mm, colback=white, boxrule=.15mm,
- colframe=red!50!white}{#1}
+ bottom=0mm}{#1}
\newcommand{\package}[1]{\textsf{#1}\index{#1=#1 (package)}}
\usepackage{csquotes}
\DeclareQuoteStyle{arabic}
@@ -314,13 +312,13 @@
% \hskip 1sp \marginpar{\small\sffamily\raggedright
% New feature\\#1}}
%
-% \title{\tcbox[enhanced, tikznode, drop lifted shadow, colback=white,
-% boxrule=.25mm]%
+% \title{\tcbox[colframe=black, enhanced, tikznode, drop lifted
+% shadow, colback=white, boxrule=.25mm]%
% {The \textsf{arabluatex} package\\
% \fileversion\ -- \filedate}}
%
% \author{Robert Alessi \\
-% \href{mailto:alessi@robertalessi.net?Subject=arabluatex}%
+% \href{mailto:alessi@robertalessi.net?Subject=arabluatex package}%
% {\texttt{alessi@robertalessi.net}}}
% \date{}
%
@@ -358,8 +356,7 @@
% Please send error reports and suggestions for improvements to Robert
% Alessi:
% \begin{itemize}
-% \item email: <\href{mailto:alessi@robertalessi.net?Subject=arabluatex}%
-% {\texttt{alessi@robertalessi.net}}>
+% \item email: \mailto[arabluatex package]{alessi@roberalessi.net}
% \item website: \url{http://www.robertalessi.net/arabluatex}
% \item development: \url{http://git.robertalessi.net/arabluatex}
% \item comments, feature requests, bug reports:
@@ -2613,6 +2610,68 @@ word that \cs{arbnull} is applied to.
%</example>
% \fi
%
+% \subsection{\texorpdfstring{The \prname{qur'An}}{The Qurʾān}}
+% \label{sec:the-quran}
+% This sub-part is destined to become a part of its own, as fine
+% typesetting of \prname{qur'An}ic text is planned in the versions of
+% \package{arabluatex} to come in the medium-term. New functions and
+% new Arabic modes will be available as \package{arabluatex} will
+% mature.
+%
+% \DescribeMacro{\ayah}\NEWfeature{v1.15}For the time being,
+% \cs{ayah}\marg{3-digit number} is provided so as to typeset the
+% number of the \arb[trans]{'AyaT} that it is referred to inside the
+% dedicated mark---Unicode |U+06DD|: \txarb{^^^^06dd}---in Arabic
+% script or inside parentheses in romanized Arabic:---
+% \begin{quote}
+% |\ayah{123}| \arb{\ayah{123}} \arb[trans]{\ayah{123}}.
+% \end{quote}
+%
+% An example follows:---
+% \iffalse
+%<*example>
+% \fi
+\begin{arabluacode}
+ \SetArbDflt*
+ \newarbmark{alifsp}{^^^^0627}{\arb[trans]{'alif} }
+ \newarbmark{lamsp}{^^^^0644^^^^0653}{\arb[trans]{lAm} }
+ \newarbmark{mim}{^^^^0645^^^^0653}{\arb[trans]{mIm}}
+ \begin{arab}[fullvoc]
+ min ((sUraTi \uc{'l-b}aqaraTi)):
+ \end{arab}
+ \begin{arab}[fullvoc]
+ \arbmark{alifsp}\arbmark{lamsp}\arbmark{mim}~\ayah{1}
+ _d_alika 'l-kit_abu lA rayba fI-hi hudaN_A
+ li-l-muttaqIna~\ayah{2} 'lla_dIna yu'minUna bi-'l-.gaybi
+ wa-yuqImUna 'l-.sal_aUTa wa-mimmA razaqn_a-hum
+ yunfiqUna~\ayah{3}
+ \end{arab}
+\end{arabluacode}
+\begin{arabluacode}[text only]
+ \SetArbDflt*
+ \begin{arab}[trans]
+ min ((sUraTi \uc{'l-b}aqaraTi)):
+ \end{arab}
+ \begin{arab}[trans]
+ \arbmark{alifsp}\arbmark{lamsp}\arbmark{mim}~\ayah{1}
+ _d_alika 'l-kit_abu lA rayba fI-hi hudaN_A
+ li-l-muttaqIna~\ayah{2} 'lla_dIna yu'minUna bi-'l-.gaybi
+ wa-yuqImUna 'l-.sal_aUTa wa-mimmA razaqn_a-hum
+ yunfiqUna~\ayah{3}
+ \end{arab}
+\end{arabluacode}
+% \iffalse
+%</example>
+% \fi
+%
+% \paragraph{Caveat}
+% For some reason, most of the Arabic fonts do not show the number
+% properly: some are only able to display at most two digits, while
+% others display the digits outside the \enquote*{end of
+% \arb[trans]{'AyaT}} sign, let alone those that print the digits
+% stacked. To the knowledge of the writer, this should be reported to
+% the developpers of those fonts.
+%
% \section{Color}
% \label{sec:color}
% \NEWfeature{v1.12}\package{arabluatex} is able to render in color
@@ -4240,7 +4299,7 @@ wa-ya.sIru ta.hta 'l-jild-i
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{arabluatex}%
-[2018/08/29 v1.14 An ArabTeX-like interface for LuaLaTeX]
+[2018/10/09 v1.15 An ArabTeX-like interface for LuaLaTeX]
\RequirePackage{ifluatex}
% \end{macrocode}
% \package{arabluatex} requires \hologo{LuaLaTeX} of course. Issue a
@@ -4566,25 +4625,19 @@ wa-ya.sIru ta.hta 'l-jild-i
\NewDocumentCommand{\arb}{O{\al@mode} +m}%
{\edef\@tempa{#1}%
\ifx\@tempa\al@mode@voc%
- \booltrue{al@rlmode}%
- \bgroup\textdir TRT\arabicfont%
+ \bgroup\booltrue{al@rlmode}\textdir TRT\arabicfont%
\luadirect{tex.sprint(processvoc(\luastringN{#2},
\luastringO{\al@arb@rules}, \luastringO{\al@input@scheme}))}\egroup%
- \boolfalse{al@rlmode}%
\else%
\ifx\@tempa\al@mode@fullvoc%
- \booltrue{al@rlmode}%
- \bgroup\textdir TRT\arabicfont%
+ \bgroup\booltrue{al@rlmode}\textdir TRT\arabicfont%
\luadirect{tex.sprint(processfullvoc(\luastringN{#2},
\luastringO{\al@arb@rules}, \luastringO{\al@input@scheme}))}\egroup%
- \boolfalse{al@rlmode}%
\else%
\ifx\@tempa\al@mode@novoc%
- \booltrue{al@rlmode}%
- \bgroup\textdir TRT\arabicfont%
+ \bgroup\booltrue{al@rlmode}\textdir TRT\arabicfont%
\luadirect{tex.sprint(processnovoc(\luastringN{#2},
\luastringO{\al@arb@rules}, \luastringO{\al@input@scheme}))}\egroup%
- \boolfalse{al@rlmode}%
\else%
\ifx\@tempa\al@mode@trans%
\bgroup\textdir TLT\al@trans@style%
@@ -4794,6 +4847,16 @@ wa-ya.sIru ta.hta 'l-jild-i
\fi}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\ayah}\changes{v1.15}{2018/10/09}{Prints End of Ayah
+% sign}\cs{ayah}\marg{number} prints up to 3-digit numbers inside
+% \enquote*{end of Ayah} sign (|U+06DD|) or inside parentheses
+% depending on the mode which is selected.
+% \begin{macrocode}
+\NewDocumentCommand{\ayah}{m}{%
+ \luadirect{tex.sprint(ayah(\luastringN{#1}))}}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\arbnull}
% \changes{v1.7}{2016/12/24}{New \cs{arbnull} command for putting
% back on any contextual analysis rule broken by other commands.}
@@ -4932,7 +4995,7 @@ wa-ya.sIru ta.hta 'l-jild-i
% right direction.
% \begin{macrocode}
\NewDocumentCommand{\arbpardir}{}{%
- \ifx\al@mode\al@mode@trans\setLR\else\booltrue{al@rlmode}\setRL\fi}
+ \ifx\al@mode\al@mode@trans\setLR\else\setRL\fi}
% \end{macrocode}
% \end{macro}
%
diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua
index 4db23a295ed..862b8aeab37 100644
--- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua
+++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua
@@ -88,7 +88,8 @@ local albrkcmds = {
"par",
"LRmarginpar",
"arbmark",
- "abjad"
+ "abjad",
+ "ayah"
}
local brkcmds = {}
@@ -201,11 +202,19 @@ local function processarbnull(str, scheme)
return str
end
-local function takeoutabjad(str)
+local function takeout_abjad_ayah(str)
str = string.gsub(str, "(\\abjad.?)(%b{})", function(tag, body)
body = string.sub(body, 2, -2)
return string.format("%s", body)
end)
+ str = string.gsub(str, "(\\ayah.?)(%b{})", function(tag, body)
+ body = string.sub(body, 2, -2)
+ if tonumber(body) ~= nil and str.len(body) < 4 then
+ return string.format("(%s)", body)
+ else
+ return "<??>"
+ end
+ end)
return str
end
@@ -675,15 +684,20 @@ local function processarbtoutf(str)
if export_utf ~= "arabverse" then
str = "\\begin{arabexport}"..str
else end
+ --[[ -- of no use, see above takeout_abjad_ayah()
str = string.gsub(str, "(\\txtrans%s?)(%b{})", function(tag, body)
body = string.sub(body, 2, -2)
body = string.gsub(body, "(\\abjad%s?)(%b{})", function(btag, bbody)
bbody = string.sub(bbody, 2, -2)
return string.format("%s", bbody)
end)
+ body = string.gsub(body, "(\\ayah%s?)(%b{})", function(btag, bbody)
+ bbody = string.sub(bbody, 2, -2)
+ return string.format("(%s)", bbody)
+ end)
return string.format("%s{%s}", tag, body)
end)
-
+ --]]
str = string.gsub(str, "(\\txarb%s?)(%b{})", function(tag, body)
body = string.sub(body, 2, -2)
body = string.gsub(body, "(\\abjad%s?)(%b{})", function(btag, bbody)
@@ -699,6 +713,10 @@ local function processarbtoutf(str)
bbody = string.sub(bbody, 2, -2)
return string.format("%s[rl]{%s}", btag, bbody)
end)
+ body = string.gsub(body, "(\\ayah%s?)(%b{})", function(btag, bbody)
+ bbody = string.sub(bbody, 2, -2)
+ return string.format("\\arb[novoc]{%s^^^^06dd}", bbody)
+ end)
return string.format("%s{%s}", tag, body)
end)
str = string.gsub(str, "(\\bayt)%s?(%b{})(%b[])(%b{})", function(tag, argi, argii, argiii)
@@ -813,7 +831,8 @@ function al_closestream()
t = string.gsub(t, "(\\@al@ob)", "{")
t = string.gsub(t, "(\\@al@cb@sp)", "} ")
t = string.gsub(t, "(\\@al@cb)(%s?)", "}")
- t = gsub(t, lpeg.Cs("\\begin") * spcenc^-1 * bcbraces * cmdargs, "\n%1%2%3\n")
+ t = gsub(t, lpeg.Cs("\\begin") * spcenc^-1 * bcbraces * cmdargs,
+ "\n%1%2%3\n")
t = string.gsub(t, "(\\\\)(%s?)", "%1\n")
t = string.gsub(t, "(\\\\)(\n)(\\end%s?)(%b{})", "%1%3%4")
t = string.gsub(t, "%s-\n(\\begin%s?)(%b{})", "\n%1%2")
@@ -822,18 +841,33 @@ function al_closestream()
t = string.gsub(t, "(\\end%s?)(%b{})", "%1%2\n")
t = string.gsub(t, "([^\n]%s-)(\\end)%s?(%b{})", "%1\n%2%3")
t = string.gsub(t, "\n\n\n", "\n\n")
- t = string.gsub(t, "(\\txarb%s?%{)(\\txarb%s?)(%b{})(%})", function(tagio, tagii, body, tagic)
+ t = string.gsub(t, "(\\txarb%s?%{)(\\txarb%s?)(%b{})(%})",
+ function(tagio, tagii, body, tagic)
body = string.sub(body, 2, -2)
- return string.format("%s%s%s", tagio, body, tagic)
+ return
+ string.format("%s%s%s", tagio, body, tagic)
end)
- t = string.gsub(t, "(\\prname%s?%*%{)(\\txtrans%s?)(%b{})(%})", function(tagio, tagii, body, tagic)
+ t = string.gsub(t, "(\\prname%s?%*%{)(\\txtrans%s?)(%b{})(%})",
+ function(tagio, tagii, body, tagic)
body = string.sub(body, 2, -2)
return string.format("%s%s%s", tagio, body, tagic)
end)
- if string.find(t, "\\begin%s?{document}.-\\arb%s?[%[%{]") or
+ if string.find(t, "\\begin%s?{document}.-\\arb%s?[%[%{]")
+ or
string.find(t, "\\begin%s?{document}.-\\[Uu]c%s?%b{}")
- then
- tex.print([[\unexpanded{\PackageWarningNoLine{arabluatex}{There are still 'arabtex' strings to be converted. Please open ]]..tex.jobname..utffilesuffix..".tex"..[[ and compile it one more time}}]])
+ or
+ string.find(t, "\\begin%s?{document}.-\\abjad%s?%b{}")
+ or
+ string.find(t, "\\begin%s?{document}.-\\ayah%s?%b{}")
+ then
+ -- issue a warning:
+ tex.print([[\unexpanded{\PackageWarningNoLine{arabluatex}{]]
+ ..
+ [[There are still 'arabtex' strings to be converted. ]]
+ ..
+ [[Please open ]] .. tex.jobname .. utffilesuffix .. ".tex" ..
+ [[ and compile it one more time}}]])
+ --
else end
t = t.."\n\\end{document}"
io.write(t)
@@ -935,7 +969,7 @@ function processtrans(str, mode, rules, scheme)
str = takeoutarb(str)
str = processdiscretionary(str)
str = processarbnull(str, scheme)
- str = takeoutabjad(str)
+ str = takeout_abjad_ayah(str)
str = protectarb(str)
str = breakcmd(str)
str = holdcmd(str)
@@ -963,6 +997,7 @@ function processtrans(str, mode, rules, scheme)
end
function newarbmark(abbr, rtlmk, ltrmk)
+ abbr = "@"..abbr
rtlmk = "\\arabicfont{}"..rtlmk
table.insert(arbmarks, {a = abbr, b = rtlmk, c = ltrmk})
table.sort(arbmarks, function(a ,b) return(#a.a > #b.a) end)
@@ -979,6 +1014,7 @@ local function isintable(table, element)
end
function processarbmarks(str, dir)
+ str = "@"..str
if not isintable(arbmarks, str) then
str = "\\LR{<??>}"..atletter.."\\al@wrong@mark{}"..atother
else
@@ -1122,3 +1158,16 @@ function aemph(str, opt)
end
return str
end
+
+function ayah(str)
+ if tonumber(str) ~= nil and str.len(str) < 4 then
+ if tex.textdir == "TRT" then
+ str = "\\arb[novoc]{"..str.."^^^^06dd}"
+ elseif tex.textdir == "TLT" then
+ str = "\\arb[trans]{("..str..")}"
+ end
+ return str
+ else
+ return "\\LR{<??>}"
+ end
+end
diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty
index 4a46cfe5665..23ab051531b 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/08/29 v1.14 An ArabTeX-like interface for LuaLaTeX]
+[2018/10/09 v1.15 An ArabTeX-like interface for LuaLaTeX]
\RequirePackage{ifluatex}
\ifluatex\else
\PackageError{arabluatex}{lualatex needed}{%
@@ -148,25 +148,19 @@
\NewDocumentCommand{\arb}{O{\al@mode} +m}%
{\edef\@tempa{#1}%
\ifx\@tempa\al@mode@voc%
- \booltrue{al@rlmode}%
- \bgroup\textdir TRT\arabicfont%
+ \bgroup\booltrue{al@rlmode}\textdir TRT\arabicfont%
\luadirect{tex.sprint(processvoc(\luastringN{#2},
\luastringO{\al@arb@rules}, \luastringO{\al@input@scheme}))}\egroup%
- \boolfalse{al@rlmode}%
\else%
\ifx\@tempa\al@mode@fullvoc%
- \booltrue{al@rlmode}%
- \bgroup\textdir TRT\arabicfont%
+ \bgroup\booltrue{al@rlmode}\textdir TRT\arabicfont%
\luadirect{tex.sprint(processfullvoc(\luastringN{#2},
\luastringO{\al@arb@rules}, \luastringO{\al@input@scheme}))}\egroup%
- \boolfalse{al@rlmode}%
\else%
\ifx\@tempa\al@mode@novoc%
- \booltrue{al@rlmode}%
- \bgroup\textdir TRT\arabicfont%
+ \bgroup\booltrue{al@rlmode}\textdir TRT\arabicfont%
\luadirect{tex.sprint(processnovoc(\luastringN{#2},
\luastringO{\al@arb@rules}, \luastringO{\al@input@scheme}))}\egroup%
- \boolfalse{al@rlmode}%
\else%
\ifx\@tempa\al@mode@trans%
\bgroup\textdir TLT\al@trans@style%
@@ -300,6 +294,8 @@
{\aemph{\luadirect{tex.sprint(abjadify(\luastring{#1}))}}}
{\luadirect{tex.sprint(abjadify(\luastring{#1}))}}}
\fi}
+\NewDocumentCommand{\ayah}{m}{%
+ \luadirect{tex.sprint(ayah(\luastringN{#1}))}}
\NewDocumentCommand{\arbnull}{m}{\relax}
\NewDocumentCommand{\abraces}{+m}{%
\luadirect{tex.sprint(abraces(\luastringN{#1}))}}
@@ -345,7 +341,7 @@
\else\par\BODY\fi\else\par\BODY\fi
}[\par]
\NewDocumentCommand{\arbpardir}{}{%
- \ifx\al@mode\al@mode@trans\setLR\else\booltrue{al@rlmode}\setRL\fi}
+ \ifx\al@mode\al@mode@trans\setLR\else\setRL\fi}
\newcommand{\al@warning}[1]{\PackageWarning{arabluatex}{#1}}
\newcommand{\al@error}[2]{\PackageError{arabluatex}{#1}{#2}}
\newcommand{\al@wrong@nesting}{\al@error{%
diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua
index 842f42b78ee..c70e0557a0d 100644
--- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua
+++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua
@@ -23,10 +23,10 @@ along with this program. If not, see
--]]
arbmarks = {
- {a="bismillah", b="\\arabicfont{}^^^^fdfd", c="\\arb[trans]{bi-ismi \\uc{'l-l_ahi} 'l-ra.hm_ani 'l-ra.hImi}"},
- {a="salam", b="\\arabicfont{}^^^^fdf5", c="\\arb[trans]{.sall_A\\arbnull{'l-l_ahu} \\uc{'l-l_ahu} `alay-hi wa-sallama}"},
- {a="jalla", b="\\arabicfont{}^^^^fdfb", c="\\arb[trans]{^galla ^galAla-hu}"},
- {a="slm", b="\\arabicfont{}^^^^fdfa", c="\\arb[trans]{.sall_A\\arbnull{'l-l_ahu} \\uc{'l-l_ahu} `alay-hi wa-sallama}"}
+ {a="@bismillah", b="\\arabicfont{}^^^^fdfd", c="\\arb[trans]{bi-ismi \\uc{'l-l_ahi} 'l-ra.hm_ani 'l-ra.hImi}"},
+ {a="@salam", b="\\arabicfont{}^^^^fdf5", c="\\arb[trans]{.sall_A\\arbnull{'l-l_ahu} \\uc{'l-l_ahu} `alay-hi wa-sallama}"},
+ {a="@jalla", b="\\arabicfont{}^^^^fdfb", c="\\arb[trans]{^galla ^galAla-hu}"},
+ {a="@slm", b="\\arabicfont{}^^^^fdfa", c="\\arb[trans]{.sall_A\\arbnull{'l-l_ahu} \\uc{'l-l_ahu} `alay-hi wa-sallama}"}
}
abjad = {