From c551da776df046df20669c1af5e0f418878d8549 Mon Sep 17 00:00:00 2001 From: Robert Alessi Date: Fri, 20 Jul 2018 21:50:39 +0200 Subject: remove unwanted \arabicfont in \arb{} and arab environment --- arabluatex.dtx | 20 +++++++++++--------- arabluatex.lua | 14 +++++++------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/arabluatex.dtx b/arabluatex.dtx index 2f6c92a..8ed1f36 100644 --- a/arabluatex.dtx +++ b/arabluatex.dtx @@ -257,7 +257,7 @@ % % \fi % -% \CheckSum{784} +% \CheckSum{0} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -829,6 +829,7 @@ vowels (see ยง~3). % \vref{ref:hamza}.} & \dmg{'u 'a 'i} & % \loc{|'u, |'a, |'i} & \brill{|'u, |'a, |'i} & |'u| or |'a| or |'i| \\ % \arb[novoc]{b} & \dmg{b} & \loc{b} & \brill{b} & |b| \\ +% \pagebreak[1] % \arb[novoc]{t} & \dmg{t} & \loc{t} & \brill{t} & |t| \\ % \arb[novoc]{_t} & \dmg{_t} & \loc{_t} & \brill{_t} & |_t| \\ % \arb[novoc]{j} & \dmg{j} & \loc{j} & \brill{j} & |^g| or |j| \\ @@ -2106,7 +2107,7 @@ word that \cs{arbnull} is applied to. % \arb[novoc]{.k} & \dmg{.k} & \loc{.k} & \brill{.k} & |.k| \\ % \arb[novoc]{.n} & \dmg{.n} & \loc{.n} & \brill{.n} & |.n| \\ % \arb[novoc]{((} & \dmg{((} & \loc{((} & \brill{((} & |((| \\ -% \pagebreak +% \pagebreak[1] % \arb[novoc]{))} & \dmg{))} & \loc{))} & \brill{))} & |))| \\ % \end{longtable} % @@ -3349,13 +3350,14 @@ muhaddamaTaN mi'_danatu-hu}: \arb[trans]{ra'aytu % \arb[novoc]{_d} & \dmg{_d} & \loc{_d} & \brill{_d} & |*| & |V| \\ % \arb[novoc]{r} & \dmg{r} & \loc{r} & \brill{r} & |r| & |r| \\ % \arb[novoc]{z} & \dmg{z} & \loc{z} & \brill{z} & |z| & |z| \\ +% \pagebreak[1] % \arb[novoc]{s} & \dmg{s} & \loc{s} & \brill{s} & |s| & |s| \\ % \arb[novoc]{^s} & \dmg{^s} & \loc{^s} & \brill{^s} & |$| & |c| \\ % \arb[novoc]{.s} & \dmg{.s} & \loc{.s} & \brill{.s} & |S| & |S| \\ -% \pagebreak[1] % \arb[novoc]{.d} & \dmg{.d} & \loc{.d} & \brill{.d} & |D| & |D| \\ % \arb[novoc]{.t} & \dmg{.t} & \loc{.t} & \brill{.t} & |T| & |T| \\ % \arb[novoc]{.z} & \dmg{.z} & \loc{.z} & \brill{.z} & |Z| & |Z| \\ +% \pagebreak[1] % \arb[novoc]{`} & \dmg{`} & \loc{`} & \brill{`} & |E| & |E| \\ % \arb[novoc]{.g} & \dmg{.g} & \loc{.g} & \brill{.g} & |g| & |g| \\ % \arb[novoc]{f} & \dmg{f} & \loc{f} & \brill{f} & |f| & |f| \\ @@ -4338,21 +4340,21 @@ wa-ya.sIru ta.hta 'l-jild-i {\edef\@tempa{#1}% \ifx\@tempa\al@mode@voc% \booltrue{al@rlmode}% - \bgroup\textdir TRT\arabicfont% + \bgroup\textdir TRT% \luadirect{tex.sprint(processvoc(\luastringN{#2}, \luastringO{\al@arb@rules}, \luastringO{\al@input@scheme}))}\egroup% \boolfalse{al@rlmode}% \else% \ifx\@tempa\al@mode@fullvoc% \booltrue{al@rlmode}% - \bgroup\textdir TRT\arabicfont% + \bgroup\textdir TRT% \luadirect{tex.sprint(processfullvoc(\luastringN{#2}, \luastringO{\al@arb@rules}, \luastringO{\al@input@scheme}))}\egroup% \boolfalse{al@rlmode}% \else% \ifx\@tempa\al@mode@novoc% \booltrue{al@rlmode}% - \bgroup\textdir TRT\arabicfont% + \bgroup\textdir TRT% \luadirect{tex.sprint(processnovoc(\luastringN{#2}, \luastringO{\al@arb@rules}, \luastringO{\al@input@scheme}))}\egroup% \boolfalse{al@rlmode}% @@ -4399,19 +4401,19 @@ wa-ya.sIru ta.hta 'l-jild-i {\par\edef\@tempa{#1}% \ifx\@tempa\al@mode@voc% \booltrue{al@rlmode}% - \bgroup\pardir TRT\textdir TRT\arabicfont% + \bgroup\pardir TRT\textdir TRT% \luadirect{tex.sprint(processvoc(\luastringO{\BODY}, \luastringO{\al@arb@rules}, \luastringO{\al@input@scheme}))}\egroup% \else% \ifx\@tempa\al@mode@fullvoc% \booltrue{al@rlmode}% - \bgroup\pardir TRT\textdir TRT\arabicfont% + \bgroup\pardir TRT\textdir TRT% \luadirect{tex.sprint(processfullvoc(\luastringO{\BODY}, \luastringO{\al@arb@rules}, \luastringO{\al@input@scheme}))}\egroup% \else% \ifx\@tempa\al@mode@novoc% \booltrue{al@rlmode}% - \bgroup\pardir TRT\textdir TRT\arabicfont% + \bgroup\pardir TRT\textdir TRT% \luadirect{tex.sprint(processnovoc(\luastringO{\BODY}, \luastringO{\al@arb@rules}, \luastringO{\al@input@scheme}))}\egroup% \else% diff --git a/arabluatex.lua b/arabluatex.lua index 8238236..deb963b 100644 --- a/arabluatex.lua +++ b/arabluatex.lua @@ -301,7 +301,7 @@ local function voc(str, rules) inside = string.gsub(inside, null[i].a, null[i].b) end inside = indnum(inside) - return string.format("\\arabicfont{}%s", inside) + return string.format("\\arabicfont %s", inside) end) return str end @@ -337,7 +337,7 @@ local function voceasy(str) inside = string.gsub(inside, null[i].a, null[i].b) end inside = indnum(inside) - return string.format("\\arabicfont{}%s", inside) + return string.format("\\arabicfont %s", inside) end) return str end @@ -390,7 +390,7 @@ local function fullvoc(str, rules) inside = string.gsub(inside, null[i].a, null[i].b) end inside = indnum(inside) - return string.format("\\arabicfont{}%s", inside) + return string.format("\\arabicfont %s", inside) end) return str end @@ -438,7 +438,7 @@ local function fullvoceasy(str, rules) inside = string.gsub(inside, null[i].a, null[i].b) end inside = indnum(inside) - return string.format("\\arabicfont{}%s", inside) + return string.format("\\arabicfont %s", inside) end) return str end @@ -474,7 +474,7 @@ local function novoc(str) inside = string.gsub(inside, null[i].a, null[i].b) end inside = indnum(inside) - return string.format("\\arabicfont{}%s", inside) + return string.format("\\arabicfont %s", inside) end) return str end @@ -510,7 +510,7 @@ local function novoceasy(str) inside = string.gsub(inside, null[i].a, null[i].b) end inside = indnum(inside) - return string.format("\\arabicfont{}%s", inside) + return string.format("\\arabicfont %s", inside) end) return str end @@ -721,7 +721,7 @@ return str end function newarbmark(abbr, rtlmk, ltrmk) - rtlmk = "\\arabicfont{}"..rtlmk + rtlmk = "\\arabicfont "..rtlmk table.insert(arbmarks, {a = abbr, b = rtlmk, c = ltrmk}) table.sort(arbmarks, function(a ,b) return(#a.a > #b.a) end) return true -- cgit v1.2.3