al_closestream() gobbled spaces after opening braces. also removed nested \txarb

1 files changed, 2 insertions, 1 deletions

diff --git a/arabluatex.lua b/arabluatex.lua
index 8bb9572..f717cb4 100644
--- a/arabluatex.lua
+++ b/arabluatex.lua
@@ -805,7 +805,7 @@ function al_closestream()
    local t = f:read("*a")
    t = string.gsub(t, "\\arabicfont{}", "")
    t = string.gsub(t, "\\par ", "\n\n")
-   t = string.gsub(t, "(\\@al@ob%s?)", "{")
+   t = string.gsub(t, "(\\@al@ob)", "{")
    t = string.gsub(t, "(\\@al@cb@sp)", "} ")
    t = string.gsub(t, "(\\@al@cb)(%s?)", "}")
    t = gsub(t, lpeg.Cs("\\begin") * spcenc^-1 * bcbraces * cmdargs, "\n%1%2%3\n")
@@ -817,6 +817,7 @@ function al_closestream()
    t = string.gsub(t, "(\\end%s?)(%b{})", "%1%2\n")
    t = string.gsub(t, "([^\n]%s-)(\\end)%s?(%b{})", "%1\n%2%3")
    t = string.gsub(t, "\n\n\n", "\n\n")
+   t = string.gsub(t, "(\\txarb%s?%{)(\\txarb%s?%b{})(%})", "%2")
    if string.find(t, "\\begin%s?{document}.-\\arb%s?[%[%{]") or
       string.find(t, "\\begin%s?{document}.-\\[Uu]c%s?%b{}")
    then