prevent shorter arbmark ids from being taken as replacement patterns

2 files changed, 6 insertions, 4 deletions

diff --git a/arabluatex.lua b/arabluatex.lua
index 6e40efd..862b8ae 100644
--- a/arabluatex.lua
+++ b/arabluatex.lua
@@ -997,6 +997,7 @@ function processtrans(str, mode, rules, scheme)
 end
 
 function newarbmark(abbr, rtlmk, ltrmk)
+   abbr = "@"..abbr
    rtlmk = "\\arabicfont{}"..rtlmk
    table.insert(arbmarks, {a = abbr, b = rtlmk, c = ltrmk})
    table.sort(arbmarks, function(a ,b) return(#a.a > #b.a) end)
@@ -1013,6 +1014,7 @@ local function isintable(table, element)
 end
 
 function processarbmarks(str, dir)
+   str = "@"..str
    if not isintable(arbmarks, str) then
       str = "\\LR{<??>}"..atletter.."\\al@wrong@mark{}"..atother
    else
diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index 842f42b..c70e055 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -23,10 +23,10 @@ along with this program.  If not, see
 --]]
 
 arbmarks = {
-   {a="bismillah", b="\\arabicfont{}^^^^fdfd", c="\\arb[trans]{bi-ismi \\uc{'l-l_ahi} 'l-ra.hm_ani 'l-ra.hImi}"},
-   {a="salam", b="\\arabicfont{}^^^^fdf5", c="\\arb[trans]{.sall_A\\arbnull{'l-l_ahu} \\uc{'l-l_ahu} `alay-hi wa-sallama}"},
-   {a="jalla", b="\\arabicfont{}^^^^fdfb", c="\\arb[trans]{^galla ^galAla-hu}"},
-   {a="slm", b="\\arabicfont{}^^^^fdfa", c="\\arb[trans]{.sall_A\\arbnull{'l-l_ahu} \\uc{'l-l_ahu} `alay-hi wa-sallama}"}
+   {a="@bismillah", b="\\arabicfont{}^^^^fdfd", c="\\arb[trans]{bi-ismi \\uc{'l-l_ahi} 'l-ra.hm_ani 'l-ra.hImi}"},
+   {a="@salam", b="\\arabicfont{}^^^^fdf5", c="\\arb[trans]{.sall_A\\arbnull{'l-l_ahu} \\uc{'l-l_ahu} `alay-hi wa-sallama}"},
+   {a="@jalla", b="\\arabicfont{}^^^^fdfb", c="\\arb[trans]{^galla ^galAla-hu}"},
+   {a="@slm", b="\\arabicfont{}^^^^fdfa", c="\\arb[trans]{.sall_A\\arbnull{'l-l_ahu} \\uc{'l-l_ahu} `alay-hi wa-sallama}"}
 }
 
 abjad = {