3 files changed, 92 insertions, 15 deletions

diff --git a/arabluatex.dtx b/arabluatex.dtx
index f7278f1..2972c0d 100644
--- a/arabluatex.dtx
+++ b/arabluatex.dtx
@@ -159,11 +159,11 @@
 \end{filecontents}
 \usepackage[letterpaper,margin=1.25in,left=50mm,nohead]{geometry}
 \usepackage{fontspec}
+\defaultfontfeatures{Renderer=Harfbuzz}
 \usepackage[english]{babel}
 \usepackage{dox}
 \doxitem{Option}{option}{options}
 \usepackage{microtype}
-\defaultfontfeatures{Renderer=Harfbuzz}
 \babelfont{rm}{Old Standard}
 \babelfont{sf}{NewComputerModern Sans}
 \babelfont{tt}{NewComputerModern Mono}
diff --git a/arabluatex.lua b/arabluatex.lua
index 7372e86..8e97fa1 100644
--- a/arabluatex.lua
+++ b/arabluatex.lua
@@ -276,6 +276,16 @@ local function takeoutarb(str)
    return str
 end
 
+-- I owe this function to M. Krüger and U. Fischer. Thank to them both.
+local function getrenderer()
+   local a = nil
+   if font.getfont(font.current()).specification
+   then
+      a=font.getfont(font.current()).specification.features.normal.mode
+   end
+   return a
+end
+
 local function voc(str, rules)
    str = string.gsub(str, "\\arb(%b{})", function(inside)
    inside = string.sub(inside, 2, -2)
@@ -311,8 +321,16 @@ local function voc(str, rules)
    for i = 1,#shortv do
       inside = string.gsub(inside, shortv[i].a, shortv[i].b)
    end
-   for i = 1,#punctuation do
-      inside = string.gsub(inside, punctuation[i].a, punctuation[i].b)
+   if getrenderer() == "harf"
+   then
+      for i = 1,#punctuationhb do
+         inside = string.gsub(inside, punctuationhb[i].a,
+                              punctuationhb[i].b)
+      end
+   else
+      for i = 1,#punctuation do
+         inside = string.gsub(inside, punctuation[i].a, punctuation[i].b)
+      end
    end
    for i = 1,#null do
       inside = string.gsub(inside, null[i].a, null[i].b)
@@ -347,8 +365,16 @@ local function voceasy(str)
    for i = 1,#shortv do
       inside = string.gsub(inside, shortv[i].a, shortv[i].b)
    end
-   for i = 1,#punctuation do
-      inside = string.gsub(inside, punctuation[i].a, punctuation[i].b)
+   if getrenderer() == "harf"
+   then
+      for i = 1,#punctuationhb do
+         inside = string.gsub(inside, punctuationhb[i].a,
+                              punctuationhb[i].b)
+      end
+   else
+      for i = 1,#punctuation do
+         inside = string.gsub(inside, punctuation[i].a, punctuation[i].b)
+      end
    end
    for i = 1,#null do
       inside = string.gsub(inside, null[i].a, null[i].b)
@@ -400,8 +426,16 @@ local function fullvoc(str, rules)
    for i = 1,#shortv do
       inside = string.gsub(inside, shortv[i].a, shortv[i].b)
    end
-   for i = 1,#punctuation do
-      inside = string.gsub(inside, punctuation[i].a, punctuation[i].b)
+   if getrenderer() == "harf"
+   then
+      for i = 1,#punctuationhb do
+         inside = string.gsub(inside, punctuationhb[i].a,
+                              punctuationhb[i].b)
+      end
+   else
+      for i = 1,#punctuation do
+         inside = string.gsub(inside, punctuation[i].a, punctuation[i].b)
+      end
    end
    for i = 1,#null do
       inside = string.gsub(inside, null[i].a, null[i].b)
@@ -448,8 +482,16 @@ local function fullvoceasy(str, rules)
    for i = 1,#shortv do
       inside = string.gsub(inside, shortv[i].a, shortv[i].b)
    end
-   for i = 1,#punctuation do
-      inside = string.gsub(inside, punctuation[i].a, punctuation[i].b)
+   if getrenderer() == "harf"
+   then
+      for i = 1,#punctuationhb do
+         inside = string.gsub(inside, punctuationhb[i].a,
+                              punctuationhb[i].b)
+      end
+   else
+      for i = 1,#punctuation do
+         inside = string.gsub(inside, punctuation[i].a, punctuation[i].b)
+      end
    end
    for i = 1,#null do
       inside = string.gsub(inside, null[i].a, null[i].b)
@@ -484,8 +526,16 @@ local function novoc(str)
    for i = 1,#shortvnv do
       inside = string.gsub(inside, shortvnv[i].a, shortvnv[i].b)
    end
-   for i = 1,#punctuation do
-      inside = string.gsub(inside, punctuation[i].a, punctuation[i].b)
+   if getrenderer() == "harf"
+   then
+      for i = 1,#punctuationhb do
+         inside = string.gsub(inside, punctuationhb[i].a,
+                              punctuationhb[i].b)
+      end
+   else
+      for i = 1,#punctuation do
+         inside = string.gsub(inside, punctuation[i].a, punctuation[i].b)
+      end
    end
    for i = 1,#null do
       inside = string.gsub(inside, null[i].a, null[i].b)
@@ -520,8 +570,16 @@ local function novoceasy(str)
    for i = 1,#shortvnv do
       inside = string.gsub(inside, shortvnv[i].a, shortvnv[i].b)
    end
-   for i = 1,#punctuation do
-      inside = string.gsub(inside, punctuation[i].a, punctuation[i].b)
+   if getrenderer() == "harf"
+   then
+      for i = 1,#punctuationhb do
+         inside = string.gsub(inside, punctuationhb[i].a,
+                              punctuationhb[i].b)
+      end
+   else
+      for i = 1,#punctuation do
+         inside = string.gsub(inside, punctuation[i].a, punctuation[i].b)
+      end
    end
    for i = 1,#null do
       inside = string.gsub(inside, null[i].a, null[i].b)
@@ -1174,8 +1232,14 @@ function arabluatex.abjadify(n)
 end
 
 function arabluatex.abraces(str)
-   if tex.textdir == "TRT" then
-      str = "\\}"..str.."\\{"
+   if tex.textdir == "TRT"
+   then
+      if getrenderer() == "harf"
+      then
+         str = "\\{"..str.."\\}"
+      else
+         str = "\\}"..str.."\\{"
+      end
    elseif tex.textdir == "TLT" then
       str = "\\{"..str.."\\}"
    end
diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index 4ec0fe3..7301540 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -873,6 +873,19 @@ shortv = {
    {a="i", b="ِ"}
 }
 
+punctuationhb = {
+   {a="%(%(", b="﴿"},
+   {a="%)%)", b="﴾"},
+   {a="%.", b="."},
+   -- replaced with the next two rules to make the Arabic comma work
+   --   after \abraces{}
+--   {a="([^0-9])%,", b="%1،"},
+   {a="%,", b="،"},
+   {a="([%d])%،", b="%1,"},
+   {a="%?", b="؟"},
+   {a="%;", b="؛"},
+}
+
 punctuation = {
    {a="%(%(", b="﴿"},
    {a="%)%)", b="﴾"},