updated checksum to v1.13. arabtex2utf: instruct processarbtoutf() not to process non-numeric strings in \abjad{}

2 files changed, 25 insertions, 14 deletions

diff --git a/arabluatex.dtx b/arabluatex.dtx
index 8bebc86..8605219 100644
--- a/arabluatex.dtx
+++ b/arabluatex.dtx
@@ -27,7 +27,7 @@
 %<package-info>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package-info>\ProvidesPackage{arabluatex}
 %<*package-info>
-    [2018/06/24 v1.12 An ArabTeX-like interface for LuaLaTeX]
+    [2018/08/27 v1.13 An ArabTeX-like interface for LuaLaTeX]
 %</package-info>
 %
 %<*driver>
@@ -158,7 +158,7 @@
 \usepackage{newunicodechar}
 \newunicodechar{ǧ}{ǧ} % Old Standard does not include ǧ/Ǧ
 \newunicodechar{Ǧ}{Ǧ} %
-\usepackage{arabluatex}[2018/06/24]
+\usepackage{arabluatex}[2018/08/27]
 \usepackage[nopar]{quran}
 \usepackage[noindex]{nameauth}
 \usepackage{varioref}
@@ -260,7 +260,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{0}
+% \CheckSum{890}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -2222,6 +2222,11 @@ word that \cs{arbnull} is applied to.
 % environment instead of \textsc{ascii} Arab\TeX\ or Buckwalter input
 % schemes. See \vref{sec:unicode-input} for more details.
 %
+% \DescribeOption{color} |color|$=$\meta{color name}
+% \hfill\arabluaverb{Default: not set}\\
+% \NEWfeature{v1.13} The color in which lines of poetry are to be
+% rendered.
+%
 % \label{ref:poetry-export}
 % \DescribeOption{export} |export|$=$|true|\verb+|+|false|
 % \hfill\arabluaverb{Default: false}\\
@@ -2693,7 +2698,8 @@ word that \cs{arbnull} is applied to.
 %
 % \Cref{tab:arbcolor-diacritics} gives the Arab\TeX\ equivalents for
 % the diacritics to be printed inside or just after \cs{arbcolor}.
-% 
+%
+% \needspace{7\baselineskip}
 % \begin{longtable}{lllll}
 % \bottomrule
 % \caption*{\Cref*{tab:arbcolor-diacritics}: Arab\TeX\ diacritics
@@ -4233,7 +4239,7 @@ wa-ya.sIru ta.hta 'l-jild-i
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{arabluatex}%
-[2018/06/24 v1.12 An ArabTeX-like interface for LuaLaTeX]
+[2018/08/27 v1.13 An ArabTeX-like interface for LuaLaTeX]
 \RequirePackage{ifluatex}
 %    \end{macrocode}
 % \package{arabluatex} requires \hologo{LuaLaTeX} of course. Issue a
@@ -4511,7 +4517,7 @@ wa-ya.sIru ta.hta 'l-jild-i
 % to be used outside Arabic environments for proper names. It takes as
 % argument one or more Arabic words, each of which will be rendered in
 % upright roman style with its first letter uppercased.
-% \begin{macro}{\prname*}\changes{v1.13}{2018/08/26}{Renders proper
+% \begin{macro}{\prname*}\changes{v1.13}{2018/08/27}{Renders proper
 % names already converted to Unicode in upright roman style}
 % Unlike \cs{prname}, \cs{prname*} does not take |arabtex| or
 % |buckwalter| input as argument, but already Unicode converted
@@ -4593,7 +4599,7 @@ wa-ya.sIru ta.hta 'l-jild-i
 %   marks in Arabic environments}
 %   \cs{arbmark}\oarg{rl\textbar{}lr}\marg{shorthand} takes one
 %   argument from a list of defined elements.
-%   \changes{v1.13}{2018/08/26}{New optional argument: either
+%   \changes{v1.13}{2018/08/27}{New optional argument: either
 %   \texttt{rl} or \texttt{lr}} The mark to be inserted is determined
 %   by contextual analysis or by an optional argument, either |rl| or
 %   |lr|. This command is coded in Lua.
@@ -4657,7 +4663,7 @@ wa-ya.sIru ta.hta 'l-jild-i
 %   different options: |mode|, |width|, |gutter|, |metre|, |color|,
 %   |utf|, |delim| and |export|; all of them are defined here just
 %   before the |arabverse|
-%   environment. \changes{v1.13}{2018/08/26}{New options
+%   environment. \changes{v1.13}{2018/08/27}{New options
 %   \texttt{color} and \texttt{export} to \texttt{arabverse}
 %   environment.}
 %    \begin{macrocode}
@@ -4846,7 +4852,7 @@ wa-ya.sIru ta.hta 'l-jild-i
 % 
 % \paragraph*{Exporting Unicode Arabic to external file}
 % \begin{macro}{\SetArbOutSuffix}
-% \changes{v1.13}{2018/08/26}{Sets a suffix to be appended to the
+% \changes{v1.13}{2018/08/27}{Sets a suffix to be appended to the
 % filename of the external Unicode file.}By default, |_out| is the
 % suffix to be appended to the external file in which
 % \package{arabluatex} exports Unicode in place of
@@ -4858,7 +4864,7 @@ wa-ya.sIru ta.hta 'l-jild-i
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\ArbOutFile}
-%   \changes{v1.13}{2018/08/26}{Silently exports its argument in the
+%   \changes{v1.13}{2018/08/27}{Silently exports its argument in the
 %   selected external file.}
 %   \cs{ArbOutFile}\oarg{newline}\marg{string} silently exports
 %   \meta{string} to the external selected file. It may take |newline|
@@ -4879,7 +4885,7 @@ wa-ya.sIru ta.hta 'l-jild-i
 % \end{macro}
 % \end{macro}
 % \begin{environment}{arabexport}
-%   \changes{v1.13}{2018/08/26}{Processes and print its argument in
+%   \changes{v1.13}{2018/08/27}{Processes and print its argument in
 %   the current file and exports it in full Unicode in the external
 %   selected \texttt{.tex} file.} The |arabexport| environment
 %   processes and prints its argument unchanged to the current |.pdf|
@@ -4917,7 +4923,7 @@ wa-ya.sIru ta.hta 'l-jild-i
 %    \end{macrocode}
 % \end{environment}
 % \begin{macro}{\arbpardir}
-% \changes{v1.13}{2018/08/26}{Sets the direction of Arabic paragraphs
+% \changes{v1.13}{2018/08/27}{Sets the direction of Arabic paragraphs
 % once they are converted to Unicode.} \cs{arbpardir} is automatically
 % inserted by \package{arabluatex} at the beginning of Arabic
 % paragraphs converted to Unicode so that they are printed in the
diff --git a/arabluatex.lua b/arabluatex.lua
index 8fc31bc..4db23a2 100644
--- a/arabluatex.lua
+++ b/arabluatex.lua
@@ -683,12 +683,17 @@ local function processarbtoutf(str)
                         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)
                                               bbody = string.sub(bbody, 2, -2)
-                                              bbody = abjadify(bbody)
-                                              return string.format("\\aemph{\\arb[novoc]{%s}}", bbody)
+                                              if tonumber(bbody) ~= nil then
+                                                 bbody = abjadify(bbody)
+                                                 return string.format("\\aemph{\\arb[novoc]{%s}}", bbody)
+                                              else
+                                                 return string.format("%s{%s}", btag, bbody)
+                                              end
                         end)
                         body = string.gsub(body, "(\\arbmark%s?)(%b{})", function(btag, bbody)
                                               bbody = string.sub(bbody, 2, -2)