2 files changed, 22 insertions, 18 deletions

diff --git a/arabluatex.dtx b/arabluatex.dtx
index 7f7a29b..f6f084a 100644
--- a/arabluatex.dtx
+++ b/arabluatex.dtx
@@ -3513,8 +3513,8 @@ qAla barzawayhi bn-u 'azhar-a, ra's-u 'a.tibbA'-i fAris-a...
 \begin{arabluaverbatim}
 \usepackage{csquotes}
 \DeclareQuoteStyle{arabic}
-{\rmfamily\textquotedblright}{\rmfamily\textquotedblleft}
-{\rmfamily\textquoteright}{\rmfamily\textquoteleft}
+{\textquotedblright}{\textquotedblleft}
+{\textquoteright}{\textquoteleft}
 \end{arabluaverbatim}
 % \iffalse
 %</example>
@@ -3781,7 +3781,7 @@ wa-ya.sIru ta.hta 'l-jild-i
 % is actually coded in Lua.
 % \changes{v1.12}{2018/06/11}{TODO}
 %    \begin{macrocode}
-\DeclareDocumentCommand{\MkArbBreak}{s m}{%
+\NewDocumentCommand{\MkArbBreak}{s m}{%
   \IfBooleanTF{#1}
   {\luadirect{mkarbbreak(\luastringN{#2}, "out")}}
   {\luadirect{mkarbbreak(\luastringN{#2}, "dflt")}}
@@ -3798,12 +3798,12 @@ wa-ya.sIru ta.hta 'l-jild-i
 \AtBeginDocument{\ifdef{\aemph}%
   {\RenewDocumentCommand{\aemph}{s m}{%
       \IfBooleanTF{#1}{%
-        $\overline{\text{#2}}$}
-      {\luadirect{tex.sprint(aemph(\luastringN{#2}))}}}}
+        \luadirect{tex.sprint(aemph(\luastringN{#2}, "over"))}}
+      {\luadirect{tex.sprint(aemph(\luastringN{#2}, "dflt"))}}}}
   {\NewDocumentCommand{\aemph}{s m}{%
       \IfBooleanTF{#1}{%
-        $\overline{\text{#2}}$}
-      {\luadirect{tex.sprint(aemph(\luastringN{#2}))}}}}}
+        \luadirect{tex.sprint(aemph(\luastringN{#2}, "over"))}}
+      {\luadirect{tex.sprint(aemph(\luastringN{#2}, "dflt"))}}}}}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
diff --git a/arabluatex.lua b/arabluatex.lua
index deffac1..3078490 100644
--- a/arabluatex.lua
+++ b/arabluatex.lua
@@ -262,8 +262,8 @@ local function takeoutarb(str)
       end)
    end
    str = string.gsub(str, "(\\arb%s?)(%b{})", function(tag, body)
-                        body = string.sub(body, 2, -2)
-                        return string.format("%s", body)
+                        body = string.sub(body, 2, -2)
+                        return string.format("%s", body)
    end)
    str = string.gsub(str, "\\@rb", "\\arb")
    str = "\\arb{"..str.."}"
@@ -313,7 +313,7 @@ local function voc(str, rules)
    end
    inside = indnum(inside)
 --   return string.format("\\txarb{%s}", inside)
-   return string.format("%s", inside)
+   return string.format("\\arabicfont{}%s", inside)
    end)
 return str
 end
@@ -350,7 +350,7 @@ local function voceasy(str)
    end
    inside = indnum(inside)
 --   return string.format("\\txarb{%s}", inside)
-   return string.format("%s", inside)
+   return string.format("\\arabicfont{}%s", inside)
    end)
 return str
 end
@@ -404,7 +404,7 @@ local function fullvoc(str, rules)
    end
    inside = indnum(inside)
 --   return string.format("\\txarb{%s}", inside)
-   return string.format("%s", inside)
+   return string.format("\\arabicfont{}%s", inside)
    end)
 return str
 end
@@ -453,7 +453,7 @@ local function fullvoceasy(str, rules)
    end
    inside = indnum(inside)
 --   return string.format("\\txarb{%s}", inside)
-   return string.format("%s", inside)
+   return string.format("\\arabicfont{}%s", inside)
    end)
 return str
 end
@@ -490,7 +490,7 @@ local function novoc(str)
    end
    inside = indnum(inside)
 --   return string.format("\\txarb{%s}", inside)
-   return string.format("%s", inside)
+   return string.format("\\arabicfont{}%s", inside)
    end)
 return str
 end
@@ -527,7 +527,7 @@ local function novoceasy(str)
    end
    inside = indnum(inside)
 --   return string.format("\\txarb{%s}", inside)
-   return string.format("%s", inside)
+   return string.format("\\arabicfont{}%s", inside)
    end)
 return str
 end
@@ -862,11 +862,15 @@ function abraces(str)
    return str
 end
 
-function aemph(str)
+function aemph(str, opt)
    if tex.textdir == "TRT" then
-      str = "$\\overline{\\text{"..str.."}}$"
+      str = "$\\overline{\\text{\\textdir TRT{}"..str.."}}$"
    elseif tex.textdir == "TLT" then
-      str = "$\\underline{\\text{"..str.."}}$"
+      if opt == "over" then
+         str = "$\\overline{\\text{"..str.."}}$"
+      else
+         str = "$\\underline{\\text{"..str.."}}$"
+      end
    end
    return str
 end