cleaned up the lua code

5 files changed, 7 insertions, 24 deletions

diff --git a/arabluatex.lua b/arabluatex.lua
index 9ed37c1..8238236 100644
--- a/arabluatex.lua
+++ b/arabluatex.lua
@@ -85,8 +85,6 @@ local albrkcmds = {
    "end",
    "par",
    "LRmarginpar",
-   "Footnote",
-   "Marginpar",
    "arbmark",
    "abjad"
 }
@@ -128,15 +126,6 @@ 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)
    -- commands set by default in outofarb
    for i = 1,#outofarb do
       str = gsub(str, dblbkslash * lpeg.Cs(outofarb[i]) * cmdargs, "}%1%2%3\\arb{")
@@ -312,7 +301,6 @@ 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("\\arabicfont{}%s", inside)
    end)
 return str
@@ -349,7 +337,6 @@ 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("\\arabicfont{}%s", inside)
    end)
 return str
@@ -403,7 +390,6 @@ 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("\\arabicfont{}%s", inside)
    end)
 return str
@@ -452,7 +438,6 @@ 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("\\arabicfont{}%s", inside)
    end)
 return str
@@ -489,7 +474,6 @@ 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("\\arabicfont{}%s", inside)
    end)
 return str
@@ -526,7 +510,6 @@ 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("\\arabicfont{}%s", inside)
    end)
 return str
diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index 30c5bf7..8d2615e 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -329,7 +329,7 @@ tanwinfv = { -- with assimilations (\SetArbDflt*)
    -- quoted tanwīn (end)
    {a="%-?(uN)", b="ٌ"},
    {a="(B)%-?(aN)", b="%1ً"},
-   -- ***
+   -- needed by \arbcolor:
    {a="%-?(aN)(O[%S]-%_AO)", b="ً"},
    {a="%-?(aN)(O[%S]-YO)", b="ً"},
    {a="(O[%S]-TO)%-?(aN)", b="ً"},
@@ -383,7 +383,7 @@ tanwinfveasy = { -- no assimilations (see below)
    -- quoted tanwīn (end)
    {a="%-?(uN)", b="ٌ"},
    {a="(B)%-?(aN)", b="%1ً"},
-   -- ***
+   -- needed by \arbcolor:
    {a="%-?(aN)(O[%S]-%_AO)", b="ً"},
    {a="%-?(aN)(O[%S]-YO)", b="ً"},
    {a="(O[%S]-TO)%-?(aN)", b="ً"},
diff --git a/arabluatex_novoc.lua b/arabluatex_novoc.lua
index 95a19ef..774b8b3 100644
--- a/arabluatex_novoc.lua
+++ b/arabluatex_novoc.lua
@@ -53,7 +53,7 @@ tanwinnv = {
    -- "quoted" tanwīn (end)
    {a="%-?(uN)", b=""},
    {a="(B)%-?(aN)", b="%1"},
-   -- ***
+   -- needed by \arbcolor:
    {a="%-?(aN)(O[%S]-%_AO)", b=""},
    {a="%-?(aN)(O[%S]-YO)", b=""},
    {a="(O[%S]-TO)%-?(aN)", b=""},
diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua
index d532021..1651418 100644
--- a/arabluatex_trans.lua
+++ b/arabluatex_trans.lua
@@ -255,7 +255,7 @@ tanwintrdmg = {
    --
 -- {a="uN", b="\\arbup{un}"}, (now included in the last line of this table)
    {a="%-?(\"?At)%-?([ui])N", b="\\arbup{%1%2n}"},
-   -- ***
+   -- needed by \arbcolor:
    {a="%-?(aN)(O[%S]-%_AO)", b="ạ\\arbup{n}"},
    {a="%-?(aN)(O[%S]-YO)", b="ạ\\arbup{n}"},
    {a="(O[%S]-TO)%-?(\"?aN)", b="\\arbup{an}"},
@@ -592,7 +592,7 @@ tanwintrloc = {
    {a="%-?iNI", b="in"},
    {a="%-?(\"?At)%-?([ui])N", b="%1%2n"},
    {a="%-?([ui])N", b="%1n"},
-   -- ***
+   -- needed by \arbcolor:
    {a="%-?(aN)(O[%S]-%_AO)", b="an"},
    {a="%-?(aN)(O[%S]-YO)", b="an"},
    {a="(O[%S]-TO)%-?(\"?aN)", b="an"},
diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index 412255c..3f4cce9 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -458,7 +458,7 @@ tanwin = {
    -- quoted tanwīn (end)
    {a="%-?(uN)", b="ٌ"},
    {a="(B)%-?(aN)", b="%1ً"},
-   -- ***
+   -- needed by \arbcolor:
    {a="%-?(aN)(O[%S]-%_AO)", b="ً"},
    {a="%-?(aN)(O[%S]-YO)", b="ً"},
    {a="(O[%S]-TO)%-?(aN)", b="ً"},
@@ -507,7 +507,7 @@ tanwineasy = { -- 'easy' requires some lines to be taken out:
    -- quoted tanwīn (end)
    {a="%-?(uN)", b="ٌ"},
    {a="(B)%-?(aN)", b="%1ً"},
-   -- ***
+   -- needed by \arbcolor:
    {a="%-?(aN)(O[%S]-%_AO)", b="ً"},
    {a="%-?(aN)(O[%S]-YO)", b="ً"},
    {a="(O[%S]-TO)%-?(aN)", b="ً"},