\arbcolor[]{} is now able to colorize everything, down to the diacritics!

1 files changed, 21 insertions, 15 deletions

diff --git a/arabluatex.lua b/arabluatex.lua
index 11a91c3..84562be 100644
--- a/arabluatex.lua
+++ b/arabluatex.lua
@@ -128,15 +128,15 @@ local function breakcmd(str)
                              bodytext = string.sub(bodytext, 2, -2)
                              return string.format("\\al@brk{\\%s{%s}{\\arb{%s}}}", tag, bodycolor, bodytext)
         end)
-   -- \arbcolor
-        str = string.gsub(str, "(.)(\\arbcolor%s?)(%b[])(%b{})(.)",
-                          function (li, tag, opt, body, lii)
-                             li = string.gsub(li, "%+", "‍") -- ^^^^200d
-                             lii = string.gsub(lii, "%+", "‍") -- ^^^^200d
-                             body = string.sub(body, 2, -2)
-                             body = string.gsub(body, "%+", "‍") -- ^^^^200d
-                             return string.format("%s%s%s{%s}%s", li, tag, opt, body, lii)
-        end)
+   -- -- \arbcolor
+   --   str = string.gsub(str, "(.)(\\arbcolor%s?)(%b[])(%b{})(.)",
+   --                     function (li, tag, opt, body, lii)
+   --                        li = string.gsub(li, "%+", "‍") -- ^^^^200d
+   --                        lii = string.gsub(lii, "%+", "‍") -- ^^^^200d
+   --                        body = string.sub(body, 2, -2)
+   --                        body = string.gsub(body, "%+", "‍") -- ^^^^200d
+   --                        return string.format("%s%s%s{%s}%s", li, tag, opt, body, lii)
+   --   end)
    -- commands set by default in outofarb
    for i = 1,#outofarb do
       str = gsub(str, dblbkslash * lpeg.Cs(outofarb[i]) * cmdargs, "}%1%2%3\\arb{")
@@ -308,7 +308,8 @@ local function voc(str, rules)
       inside = string.gsub(inside, null[i].a, null[i].b)
    end
    inside = indnum(inside)
-   return string.format("\\txarb{%s}", inside)
+--   return string.format("\\txarb{%s}", inside)
+   return string.format("%s", inside)
    end)
 return str
 end
@@ -344,7 +345,8 @@ local function voceasy(str)
       inside = string.gsub(inside, null[i].a, null[i].b)
    end
    inside = indnum(inside)
-   return string.format("\\txarb{%s}", inside)
+--   return string.format("\\txarb{%s}", inside)
+   return string.format("%s", inside)
    end)
 return str
 end
@@ -397,7 +399,8 @@ local function fullvoc(str, rules)
       inside = string.gsub(inside, null[i].a, null[i].b)
    end
    inside = indnum(inside)
-   return string.format("\\txarb{%s}", inside)
+--   return string.format("\\txarb{%s}", inside)
+   return string.format("%s", inside)
    end)
 return str
 end
@@ -445,7 +448,8 @@ local function fullvoceasy(str, rules)
       inside = string.gsub(inside, null[i].a, null[i].b)
    end
    inside = indnum(inside)
-   return string.format("\\txarb{%s}", inside)
+--   return string.format("\\txarb{%s}", inside)
+   return string.format("%s", inside)
    end)
 return str
 end
@@ -481,7 +485,8 @@ local function novoc(str)
       inside = string.gsub(inside, null[i].a, null[i].b)
    end
    inside = indnum(inside)
-   return string.format("\\txarb{%s}", inside)
+--   return string.format("\\txarb{%s}", inside)
+   return string.format("%s", inside)
    end)
 return str
 end
@@ -517,7 +522,8 @@ local function novoceasy(str)
       inside = string.gsub(inside, null[i].a, null[i].b)
    end
    inside = indnum(inside)
-   return string.format("\\txarb{%s}", inside)
+--   return string.format("\\txarb{%s}", inside)
+   return string.format("%s", inside)
    end)
 return str
 end