make \aemph use ulem instead of \overline and \underline

2 files changed, 21 insertions, 9 deletions

diff --git a/arabluatex.dtx b/arabluatex.dtx
index 5ccf530..89ab60a 100644
--- a/arabluatex.dtx
+++ b/arabluatex.dtx
@@ -2053,8 +2053,9 @@ word that \cs{arbnull} is applied to.
 %   Arabic environments. In that case, \package{arabluatex} does not
 %   print the stroke as a distinctive mark over the number for it is
 %   not surrounded by other Arabic words. In case one nonetheless
-%   wishes to print the stroke, he can use the \cs{aemph} command that
-%   is described below in \vref{sec:emphasis}:---
+%   wishes to print the stroke, he can either use the \cs{aemph}
+%   command that is described below in \vref{sec:emphasis} or insert
+%   the \arb[trans]{'ab^gad} number in |\arb[novoc]{}|:---
 %   \begin{quote}
 %     |The| |\arb[trans]{'abjad}| |number| |for| |1874| |is|
 %     |\abjad{1874}| The \arb[trans]{'abjad} number for 1874 is
@@ -2063,6 +2064,10 @@ word that \cs{arbnull} is applied to.
 %     |The| |\arb[trans]{'abjad}| |number| |for| |1874| |is|
 %     |\aemph*{\abjad{1874}}| The \arb[trans]{'abjad} number for 1874
 %     is \aemph*{\abjad{1874}}.
+%     
+%     |The| |\arb[trans]{'abjad}| |number| |for| |1874| |is|
+%     |\arb[novoc]{\abjad{1874}}| The \arb[trans]{'abjad} number for
+%     1874 is \arb[novoc]{\abjad{1874}}.
 %   \end{quote}
 % \end{quoting}
 %
@@ -4349,6 +4354,7 @@ wa-ya.sIru ta.hta 'l-jild-i
 \RequirePackage{environ}
 \RequirePackage{adjustbox}
 \RequirePackage{xstring}
+\RequirePackage[normalem]{ulem}
 %    \end{macrocode}
 % The following boolean will be set to |true| in |RL| mode:
 %    \begin{macrocode}
@@ -4420,11 +4426,17 @@ wa-ya.sIru ta.hta 'l-jild-i
 % \end{macro}
 % \begin{macro}{\aemph} Arabic emphasis. Needs to be redefined as
 %   well. The function is actually coded in Lua.
+%   \changes{v1.16}{2018/11/06}{Now uses \textsf{ulem}}
 % \begin{macro}{\aemph*} The \enquote*{starred} version of this
 %   command alway puts the stroke over its argument.
 %   \changes{v1.9.2}{2017/10/24}{Starred version which always puts the
-%   stroke over its argument}
+%   stroke over its argument}As of v1.16 \package{arabluatex} uses
+%   \package{ulem} to render the strokes, thus allowing line breaks
+%   and manual hyphenation for transliterated Arabic.
 %    \begin{macrocode}
+\def\oline{\@ifstar\@oline\@@oline}
+\newcommand{\@oline}[1]{$\overline{\text{#1}}$}
+\def\@@oline{\bgroup \ULdepth=-3ex \ULset}
 \AtBeginDocument{\ifdef{\aemph}%
   {\RenewDocumentCommand{\aemph}{s m}{%
       \IfBooleanTF{#1}{%
@@ -4845,12 +4857,12 @@ wa-ya.sIru ta.hta 'l-jild-i
   \ifdefined\abjad%
   \RenewDocumentCommand{\abjad}{m}%
   {\ifbool{al@rlmode}%
-    {\aemph{\luadirect{tex.sprint(abjadify(\luastring{#1}))}}}
+    {\oline*{\luadirect{tex.sprint(abjadify(\luastring{#1}))}}}
     {\luadirect{tex.sprint(abjadify(\luastring{#1}))}}}
   \else%
   \NewDocumentCommand{\abjad}{m}%
   {\ifbool{al@rlmode}%
-    {\aemph{\luadirect{tex.sprint(abjadify(\luastring{#1}))}}}
+    {\oline*{\luadirect{tex.sprint(abjadify(\luastring{#1}))}}}
     {\luadirect{tex.sprint(abjadify(\luastring{#1}))}}}
   \fi}
 %    \end{macrocode}
diff --git a/arabluatex.lua b/arabluatex.lua
index 66bbbde..43167eb 100644
--- a/arabluatex.lua
+++ b/arabluatex.lua
@@ -705,7 +705,7 @@ local function processarbtoutf(str)
                                               bbody = string.sub(bbody, 2, -2)
                                               if tonumber(bbody) ~= nil then
                                                  bbody = abjadify(bbody)
-                                                 return string.format("\\aemph{\\arb[novoc]{%s}}", bbody)
+                                                 return string.format("\\oline*{\\arb[novoc]{%s}}", bbody)
                                               else
                                                  return string.format("%s{%s}", btag, bbody)
                                               end
@@ -1149,12 +1149,12 @@ end
 
 function aemph(str, opt)
    if tex.textdir == "TRT" then
-      str = "$\\overline{\\text{\\textdir TRT{}"..str.."}}$"
+      str = "\\oline{\\textdir TRT{}"..str.."}"
    elseif tex.textdir == "TLT" then
       if opt == "over" then
-         str = "$\\overline{\\text{"..str.."}}$"
+         str = "\\oline{"..str.."}"
       else
-         str = "$\\underline{\\text{"..str.."}}$"
+         str = "\\uline{"..str.."}"
       end
    end
    return str