From c3602097f2b0c81625317422187e381848d09881 Mon Sep 17 00:00:00 2001 From: Robert Alessi Date: Tue, 6 Dec 2016 11:29:30 +0100 Subject: added punctuation characters in trigraphs rules (dmg mode) before al-; still implementing Arabic verse environment --- arabluatex.dtx | 2 +- arabluatex_trans.lua | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arabluatex.dtx b/arabluatex.dtx index c13d563..7128adf 100644 --- a/arabluatex.dtx +++ b/arabluatex.dtx @@ -2983,7 +2983,7 @@ wa-ya.sIru ta.hta 'l-jild-i \ifx\al@mode\al@mode@trans% \ifal@verse@utf\setRL\else\setLR\fi% \else\setRL\fi% -}{\\\setkeys[al]{verse}[width,utf,mode]{#1}\egroup\par} +}{\newline\null\hfill\setkeys[al]{verse}[width,utf,mode]{#1}\egroup\par} % \end{macrocode} % \end{environment} % \begin{macro}{\abjad} \cs{abjad}\marg{number} expresses its argument diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua index bf6be44..e7087c0 100644 --- a/arabluatex_trans.lua +++ b/arabluatex_trans.lua @@ -165,24 +165,24 @@ tanwintrdmg = { trigraphstrdmg = { -- trigraphs or more -- 'llatI / 'llad_I {a="^'ll(a)([%_]?[dt])", b="'ll%1%2"}, - {a="(%s)'ll(a)([%_]?[dt])", b="%1'll%2%3"}, + {a="([%p%s])'ll(a)([%_]?[dt])", b="%1'll%2%3"}, --p -- al- + lām {a="^(a)l%-(l)", b="%1l-%2"}, - {a="([%s%-])(a)l%-(l)", b="%1%2l-%3"}, + {a="([%p%s%-])(a)l%-(l)", b="%1%2l-%3"}, --p -- al- + solar consonant {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="%1%2-%2"}, - {a="([%s%-])(a)l%-([%_%^%.]?[tdrzsn])", b="%1%2%3-%3"}, + {a="([%p%s%-])(a)l%-([%_%^%.]?[tdrzsn])", b="%1%2%3-%3"}, --p -- assim. art. + solar consonant {a="^(a)([%_%^%.]?[tdrzsn])%-", b="%1%2-"}, - {a="([%s%-])(a)([%_%^%.]?[tdrzsn])%-", b="%1%2%3-"}, + {a="([%p%s%-])(a)([%_%^%.]?[tdrzsn])%-", b="%1%2%3-"}, --p -- al- + initial unstable hamza {a="^(a)l%-(\"?[uai])", b="%1l-%2"}, - {a="([%s%-])(a)l%-(\"?[uai])", b="%1%2l-%3"}, + {a="([%p%s%-])(a)l%-(\"?[uai])", b="%1%2l-%3"}, --p -- li-/la- + art. + initial unstable hamza is a special orthography {a="l([ai])%-l%-([uai])", b="l%1-l-%2"}, -- al- + lunar consonant (i.e. what remains) {a="^(a)l%-", b="%1l-"}, - {a="([%s%-])(a)l%-", b="%1%2l-"}, + {a="([%p%s%-])(a)l%-", b="%1%2l-"}, --p -- diphthongs to be resolved before ʾalif conjunctionis {a="(aw)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1u%2%3"}, {a="(ay)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1i%2%3"}, -- cgit v1.2.3