1 files changed, 169 insertions, 59 deletions

diff --git a/arabluatex.lua b/arabluatex.lua
index 8897194..114a569 100644
--- a/arabluatex.lua
+++ b/arabluatex.lua
@@ -2,24 +2,23 @@
 This file is part of the `arabluatex' package
 
 ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright (C) 2016--2020  Robert Alessi
+Copyright (C) 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023
+Robert Alessi <alessi@robertalessi.net>
 
-Please send error reports and suggestions for improvements to Robert
-Alessi <alessi@robertalessi.net>
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see
-<http://www.gnu.org/licenses/>.
+Please send error reports and suggestions for improvements to Robert
+Alessi <alessi@robertalessi.net>
 --]]
 
 arabluatex = {}
@@ -54,11 +53,26 @@ local cmd = lpeg.Cs(dblbkslash * ascii^1 * cmdstar^-1)
 local rawcmd = lpeg.Cs(dblbkslash * ascii^1)
 local aftercmd = lpeg.Cs(lpeg.S("*[{,.?;:'`\"") + dblbkslash)
 local cmdargs = lpeg.Cs(spce^-1 * bsqbracketsii * bcbracesii * bsqbrackets^-1)
+local cmdargsnobs = lpeg.Cs(spce^-1 * bcbracesii)
 local arbargs = lpeg.Cs(spce^-1 * bsqbrackets^-1 * bcbraces)
 local baytargs = lpeg.Cs(spce * bcbraces * bsqbrackets^-1 * bcbraces)
 local arind = lpeg.Cs(dblbkslash * lpeg.P("arind") * spce^-1 * bsqbracketsii)
 
 local function protectarb(str)
+   -- \App[]{}{}
+   str = string.gsub(str, "(\\App%s?)(%b{})(%b{})", "%1[]%2%3")
+   str = gsub(str, lpeg.P("\\App") * spcenc^-1 * bsqbrackets * bcbraces * bcbraces,
+              function(opt, lem, rdg)
+                 opt = string.sub(opt, 2, -2)
+                 lem = string.sub(lem, 2, -2)
+                 rdg = string.sub(rdg, 2, -2)
+                 if opt == ""
+                 then
+                    return string.format("\\app{%s%s}", lem, rdg)
+                 else
+                    return string.format("\\app[%s]{%s%s}", opt, lem, rdg)
+                 end
+   end)
    str = string.gsub(str, "(\\arb%s?)(%[.-%])(%b{})", "\\al@brk{\\arb%2%3}")
    str = string.gsub(str, "(\\LR%s?)(%b{})", "\\@LR%2")
    str = string.gsub(str, "(\\RL%s?)(%b{})", "\\@RL%2")
@@ -90,11 +104,11 @@ local outofarb = {
 local albrkcmds = {
    "begin",
    "end",
-   "par",
    "LRmarginpar",
    "arbmark",
    "abjad",
-   "ayah"
+   "ayah",
+   "SetArbNumbers"
 }
 local brkcmds = {}
 
@@ -120,13 +134,15 @@ function arabluatex.mkarbbreak(str, opt)
 end
 
 local function breakcmd(str)
+   -- \par
+   str = gsub(str, dblbkslash * lpeg.Cs("par") * cmdargsnobs, "\\al@brk{%1%2%3}")
    -- process \item[], then \item[]
-        str = string.gsub(str, "\\(item.?)(%b[])",
-          function(tag, body)
-          body = string.sub(body, 2, -2)
-          return string.format("\\al@brk{\\item[\\arb{%s}] }", body)
-        end)
-        str = string.gsub(str, "(\\item)(%s+)", "%1{}%2")
+   str = string.gsub(str, "\\(item.?)(%b[])",
+                     function(tag, body)
+                        body = string.sub(body, 2, -2)
+                        return string.format("\\al@brk{\\item[\\arb{%s}] }", body)
+   end)
+   str = string.gsub(str, "(\\item)(%s+)", "%1{}%2")
    -- \textcolor
         str = string.gsub(str, "\\(textcolor%s?)(%b{})(%b{})",
                           function(tag, bodycolor, bodytext)
@@ -170,19 +186,38 @@ local function holdcmd(str)
    return str
 end
 
-local function arbnum(str)
+local indorarbnum = "Indian"
+
+function arabluatex.setnums(opt)
+   if opt == "Indian"
+   then
+      indorarbnum = "Indian"
+   else
+      indorarbnum = "Arabic"
+   end
+end
+
+local function arbnum(str) -- not used, see below
    str = string.gsub(str, "([0-9%,%-%/]+)", function(num)
         return string.reverse(num)
    end)
    return str
 end
 
-local function indnum(str)
-   str = string.gsub(str, "([0-9%,%-%/]+)", function(num)
-        return string.reverse(num)
-   end)
-   for i = 1,#numbers do
-      str = string.gsub(str, numbers[i].a, numbers[i].b)
+local function indnum(str, dir)
+   if dir == "ltr"
+   then
+      -- do nothing
+   else
+      str = string.gsub(str, "([0-9%,%-%/]+)", function(num)
+                           return string.reverse(num)
+      end)
+   end
+   if indorarbnum == "Indian"
+   then
+      for i = 1,#numbers do
+         str = string.gsub(str, numbers[i].a, numbers[i].b)
+      end
    end
    return str
 end
@@ -276,6 +311,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 +356,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 +400,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 +461,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 +517,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 +561,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 +605,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)
@@ -532,13 +625,19 @@ local function novoceasy(str)
    return str
 end
 
-local trfontinfo = "\\altrfont "
-
-local function transdmg(str, rules)
+local function transdmg(str, mode, rules)
    str = string.gsub(str, "\\arb(%b{})", function(inside)
    inside = string.sub(inside, 2, -2)
-   for i = 1,#hamzatrdmg do
-      inside = string.gsub(inside, hamzatrdmg[i].a, hamzatrdmg[i].b)
+   if mode == "dmg"
+   then
+      for i = 1,#hamzatrnoinitialdmg do
+         inside = string.gsub(inside, hamzatrnoinitialdmg[i].a, hamzatrnoinitialdmg[i].b)
+      end
+   elseif mode == "dmg+"
+   then
+      for i = 1,#hamzatrdmg do
+         inside = string.gsub(inside, hamzatrdmg[i].a, hamzatrdmg[i].b)
+      end
    end
    for i = 1,#tanwintrdmg do
       inside  = string.gsub(inside, tanwintrdmg[i].a, tanwintrdmg[i].b)
@@ -569,7 +668,7 @@ local function transdmg(str, rules)
    for i = 1,#nulltr do
       inside = string.gsub(inside, nulltr[i].a, nulltr[i].b)
    end
-   return string.format("{%s%s}", trfontinfo, inside)
+   return string.format("\\altrfont{}%s", inside)
    end)
    return str
 end
@@ -607,7 +706,7 @@ local function transloc(str)
    for i = 1,#nulltr do
       inside = string.gsub(inside, nulltr[i].a, nulltr[i].b)
    end
-   return string.format("{%s%s}", trfontinfo, inside)
+   return string.format("\\altrfont{}%s", inside)
    end)
    return str
 end
@@ -642,7 +741,7 @@ local function transarabica(str)
    for i = 1,#nulltr do
       inside = string.gsub(inside, nulltr[i].a, nulltr[i].b)
    end
-   return string.format("{%s%s}", trfontinfo, inside)
+   return string.format("\\altrfont{}%s", inside)
    end)
    return str
 end
@@ -741,16 +840,16 @@ local function processarbtoutf(str)
                         end)
                         return string.format("%s{%s}", tag, body)
    end)
-   str = string.gsub(str, "(\\bayt)%s?(%b{})(%b[])(%b{})", function(tag, argi, argii, argiii)
+   str = string.gsub(str, "(\\bayt)%s?(%+?)(%b{})(%b[])(%b{})", function(tag, plus, argi, argii, argiii)
                         argi = string.sub(argi, 2, -2)
                         argii = string.sub(argii, 2, -2)
                         argiii = string.sub(argiii, 2, -2)
-                        return string.format("%s*{\\arb{%s}}[\\arb{%s}]{\\arb{%s}}", tag, argi, argii, argiii)
+                        return string.format("%s%s*{\\arb{%s}}[\\arb{%s}]{\\arb{%s}}", tag, argi, argii, argiii)
    end)
-   str = string.gsub(str, "(\\bayt)%s?(%b{})(%b{})", function(tag, argi, argii)
+   str = string.gsub(str, "(\\bayt)%s?(%+?)(%b{})(%b{})", function(tag, plus, argi, argii)
                         argi = string.sub(argi, 2, -2)
                         argii = string.sub(argii, 2, -2)
-                        return string.format("%s*{\\arb{%s}}{\\arb{%s}}", tag, argi, argii)
+                        return string.format("%s%s*{\\arb{%s}}{\\arb{%s}}", tag, plus, argi, argii)
    end)
    str = string.gsub(str, "(\\prname)%s?(%b{})", function(tag, body)
                         body = string.sub(body, 2, -2)
@@ -843,6 +942,7 @@ function arabluatex.closestream()
    local o = io.open(tex.jobname..utffilesuffix..".tex", "w")
    local t = f:read("*a")
    t = string.gsub(t, "\\arabicfont{}", "")
+   t = string.gsub(t, "\\altrfont{}", "")
    t = string.gsub(t, "\\par ", "\n\n")
    t = string.gsub(t, "(\\@al@ob)", "{")
    t = string.gsub(t, "(\\@al@cb@sp)", "} ")
@@ -1005,8 +1105,8 @@ function arabluatex.processtrans(str, mode, rules, scheme)
    if scheme == "buckwalter" then
       str = processbuckw(str)
    end
-   if mode == "dmg" then
-      str = transdmg(str, rules)
+   if mode == "dmg" or mode == "dmg+" then
+      str = transdmg(str, mode, rules)
    elseif mode == "loc" then
       str = transloc(str)
    elseif mode == "arabica" then
@@ -1082,6 +1182,7 @@ function arabluatex.uc(str)
                         body = string.sub(body, 2, -2)
                         return string.format("%s", body)
    end)
+   str = string.gsub(str, "\\altrfont%s?{}", "")
    str = string.gsub(str, "{", "\\@al@ob")
    str = string.gsub(str, "} ", "\\@al@cb@sp ")
    str = string.gsub(str, "}", "\\@al@cb")
@@ -1136,6 +1237,7 @@ function arabluatex.uc(str)
    str = string.gsub(str, "\\@al@ob", "{")
    str = string.gsub(str, "\\@al@cb@sp ", "} ")
    str = string.gsub(str, "\\@al@cb", "}")
+   str = "\\altrfont{}"..str
    if export_utf == "yes" then
       tofile = str
       arabluatex.tooutfile(tofile)
@@ -1175,8 +1277,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
@@ -1199,7 +1307,9 @@ end
 function arabluatex.ayah(str)
    if tonumber(str) ~= nil and str.len(str) < 4 then
       if tex.textdir == "TRT" then
-         str = indnum(str).."^^^^06dd"
+         -- end of ayah is typeset LTR and the number comes after the
+         -- sign (see https://github.com/aliftype/amiri/issues/263#issuecomment-1872979252)
+         str = "{\\textdir TLT ".."^^^^06dd"..indnum(str, "ltr").."}"
       elseif tex.textdir == "TLT" then
          str = "\\arb[trans]{("..str..")}"
       end