bugfixes: 'quoting' after a consonant did not take away the sukūn in 'default' fullvoc mode; long vowels were not shortened before 'llaḏī in dmg mode; a bit of tidy-up in the documentationv1.7.1

3 files changed, 56 insertions, 55 deletions

diff --git a/arabluatex.dtx b/arabluatex.dtx
index 6b498fc..85fe903 100644
--- a/arabluatex.dtx
+++ b/arabluatex.dtx
@@ -1240,12 +1240,12 @@ vowels (see §~3).
 % \end{compactenum}
 % \begin{quote}
 %   \textbf{Article}: |bAb-u| |'l-madrasaT-i| \arb[fullvoc]{bAb-u
-%   'l-madrasaT-i} \arb[trans]{bAb-u 'l-madrasaT-i}, |al-maqAlaT-u|
-%   |'l-'_Ul_A| \arb[fullvoc]{al-maqAlaT-u 'l-'_Ul_A}
-%   \arb[trans]{al-maqAlaT-u 'l-'_Ul_A}, |al-lu.gaT-u|
-%   |'l-`arabiyyaT-u| \arb[fullvoc]{al-lu.gaT-u 'l-`arabiyyaT-u}
-%   \arb[trans]{al-lu.gaT-u 'l-`arabiyyaT-u}, |fI| |.sinA`aT-i|
-%   |'l-.tibb-i| \arb[fullvoc]{fI .sinA`aT-i 'l-.tibb-i}
+%   'l-madrasaT-i} \arb[trans]{bAb-u 'l-madrasaT-i},
+%   |al-maqA|\allowbreak|laT-u| |'l-'_Ul_A| \arb[fullvoc]{al-maqAlaT-u
+%   'l-'_Ul_A} \arb[trans]{al-maqAlaT-u 'l-'_Ul_A}, |al-lu.gaT-u|
+%   |'l-`ara|\allowbreak|biyyaT-u| \arb[fullvoc]{al-lu.gaT-u
+%   'l-`arabiyyaT-u} \arb[trans]{al-lu.gaT-u 'l-`arabiyyaT-u}, |fI|
+%   |.sinA`aT-i| |'l-.tibb-i| \arb[fullvoc]{fI .sinA`aT-i 'l-.tibb-i}
 %   \arb[trans]{fI .sinA`aT-i 'l-.tibb-i}, |'il_A| |'l-intiqA.d-i|
 %   \arb[fullvoc]{'il_A 'l-intiqA.d-i} \arb[trans]{'il_A
 %   'l-intiqA.d-i}, |fI| |'l-ibtidA'-i| \arb[fullvoc]{fI 'l-ibtidA'-i}
@@ -1269,10 +1269,10 @@ vowels (see §~3).
 %   particle \arb[fullvoc]{la}: |la-l-.haqq-u|
 %   \arb[fullvoc]{la-l-.haqq-u} \arb[trans]{la-l-.haqq-u}.
 % \item With the other particles, \arb[trans]{'alif-u 'l-wa.sl-i} is
-%   expressed: |fI| |'l-madInaT-i| \arb[fullvoc]{fI 'l-madInaT-i}
-%   \arb[trans]{fI 'l-madInaT-i}, |wa-'l-rajul-u|
+%   expressed: |fI| |'l-madIna|\allowbreak|T-i| \arb[fullvoc]{fI
+%   'l-madInaT-i} \arb[trans]{fI 'l-madInaT-i}, |wa-'l-rajul-u|
 %   \arb[fullvoc]{wa-'l-rajul-u} \arb[trans]{wa-'l-rajul-u},
-%   |bi-'l-qalam-i| \arb[fullvoc]{bi-'l-qalam-i}
+%   |bi-'l-|\allowbreak|qalam-i| \arb[fullvoc]{bi-'l-qalam-i}
 %   \arb[trans]{bi-'l-qalam-i}, |bi-'l-ru`b-i|
 %   \arb[fullvoc]{bi-'l-ru`b-i} \arb[trans]{bi-'l-ru`b-i}.
 %   \end{compactenum}
@@ -1285,9 +1285,9 @@ vowels (see §~3).
 %   \arb[trans]{wa-ustu`mila}, |qad-i| |in.sarafa| \arb[fullvoc]{qadi
 %   in.sarafa} \arb[trans]{qadi in.sarafa}, |al-iqtidAr-u|
 %   \arb[fullvoc]{al-iqtidAr-u} \arb[trans]{al-iqtidAr-u}, |'il_A|
-%   |'l-intiqA.d-i| \arb[fullvoc]{'il_A 'l-intiqA.d-i}
-%   \arb[trans]{'il_A 'l-intiqA.d-i}, |lawi| |istaqbala|
-%   \arb[fullvoc]{lawi istaqbala} \arb[trans]{lawi istaqbala}.
+%   |'l-inti|\allowbreak|qA.d-i| \arb[fullvoc]{'il_A 'l-intiqA.d-i}
+%   \arb[trans]{'il_A 'l-intiqA.d-i}, |law| |istaqbala|
+%   \arb[fullvoc]{law istaqbala} \arb[trans]{law istaqbala}.
 %
 %   \textbf{Other cases}: |'awi| |ismu-hu| \arb[fullvoc]{'awi ismu-hu}
 %   \arb[trans]{'awi ismu-hu}, |zayduN| |ibn-u| |`amriNU|
@@ -1333,15 +1333,16 @@ vowels (see §~3).
 % this rule applies:---
 % \begin{quote}
 %   |fI| |`aynay| |'l-malik-i| \arb[fullvoc]{fI `aynay 'l-malik-i}
-%   \arb[trans]{fI `aynay 'l-malik-i}, |ix^say| |'l-qawm-a|
-%   \arb[fullvoc]{ix^say 'l-qawm-a} \arb[trans]{ix^say 'l-qawm-a},
-%   |mu.s.tafaw| |'l-l_ah-i| \arb[fullvoc]{mu.s.tafaw 'l-l_ah-i}
-%   \arb[trans]{mu.s.tafaw 'l-l_ah-i}.
+%   \arb[trans]{fI `aynay 'l-malik-i}, |ix^say|
+%   |'l-qaw|\allowbreak|m-a| \arb[fullvoc]{ix^say 'l-qawm-a}
+%   \arb[trans]{ix^say 'l-qawm-a}, |mu.s.tafaw| |'l-l_ah-i|
+%   \arb[fullvoc]{mu.s.tafaw 'l-l_ah-i} \arb[trans]{mu.s.ta\-faw
+%   'l-l_ah-i}.
 %
 %   |ramaW| |'l-.hijAraT-a| \arb[fullvoc]{ramaW 'l-.hijAraT-a}
-%   \arb[trans]{ramaW 'l-.hijAraT-a}, |fa-lammA| |ra'aW | |'l-najm-a|
-%   \arb[fullvoc]{fa-lammA ra'aW 'l-najm-a} \arb[trans]{fa-lammA ra'aW
-%   'l-najm-a}.
+%   \arb[trans]{ramaW 'l-.hijAraT-a}, |fa-lammA| |ra'aW |\allowbreak{}
+%   |'l-najm-a| \arb[fullvoc]{fa-lammA ra'aW 'l-najm-a}
+%   \arb[trans]{fa-lammA ra'aW 'l-najm-a}.
 % \end{quote}
 %
 % \subparagraph{\arb[trans]{'alif-u 'l-wa.sl-i} preceded by a consonant
@@ -1402,17 +1403,17 @@ vowels (see §~3).
 %   \enquote{pipe} and \vref{sec:transliteration} on |dmg| mode.}
 %   |al-l_ah-u| \arb[fullvoc]{yA| al-l_ah-u} \arb[trans]{yA|
 %   al-l_ah-u}, \verb+'a-fa|+\footnote{\label{fn:pipe-allah-02}See
-%   \cref{fn:pipe-allah-01}.}|-al-l_ah-i| |la-ta.g`alanna|
-%   \arb[fullvoc]{'a-fa|-al-l_ah-i la-ta.g`alanna}
-%   \arb[trans]{'a-fa|-al-l_ah-i la-ta.g`alanna}, |bi-'l-l_ah-i|
-%   \arb[fullvoc]{bi-'l-l_ah-i} \arb[trans]{bi-'l-l_ah-i},
-%   |wa-'l-l_ah-i| \arb[fullvoc]{wa-'l-l_ah-i}
-%   \arb[trans]{wa-'l-l_ah-i}, |bi-sm-i| |'l-l_ah-i|
-%   \arb[fullvoc]{bi-sm-i 'l-l_ah-i} \arb[trans]{bi-sm-i 'l-l_ah-i},
-%   |al-.hamd-u| |li-l-l_ah-i| \arb[fullvoc]{al-.hamd-u li-l-l_ah-i}
-%   \arb[trans]{al-.hamd-u li-l-l_ah-i}, |li-l-l_ah-i| |'l-qA'il-u|
-%   \arb[fullvoc]{li-l-l_ah-i 'l-qA'il-u} \arb[trans]{li-l-l_ah-i
-%   'l-qA'il-u}.
+%   \cref{fn:pipe-allah-01}.}|-al-|\allowbreak|l_ah-i|
+%   |la-ta.g`alanna| \arb[fullvoc]{'a-fa|-al-l_ah-i la-ta.g`alanna}
+%   \arb[trans]{'a-fa|-al-l_ah-i la-ta.g`alanna},
+%   |bi-'l-|\allowbreak|l_ah-i| \arb[fullvoc]{bi-'l-l_ah-i}
+%   \arb[trans]{bi-'l-l_ah-i}, |wa-'l-l_ah-i|
+%   \arb[fullvoc]{wa-'l-l_ah-i} \arb[trans]{wa-'l-l_ah-i}, |bi-sm-i|
+%   |'l-l_ah-i| \arb[fullvoc]{bi-sm-i 'l-l_ah-i} \arb[trans]{bi-sm-i
+%   'l-l_ah-i}, |al-.hamd-u| |li-l-l_ah-i| \arb[fullvoc]{al-.hamd-u
+%   li-l-l_ah-i} \arb[trans]{al-.hamd-u li-l-l_ah-i}, |li-l-l_ah-i|
+%   |'l-qA'il-u| \arb[fullvoc]{li-l-l_ah-i 'l-qA'il-u}
+%   \arb[trans]{li-l-l_ah-i 'l-qA'il-u}.
 % \end{quote}
 %
 % \paragraph{The conjunctive \arb[voc]{alla_dI}}
@@ -1558,9 +1559,9 @@ vowels (see §~3).
 %   \begin{quote}
 %     |fI "istisqA'-a| \arb[voc]{fI "istisqA'-a} \arb[trans]{fI
 %     "istisqA'-a}, |wa-"istisqA'-u| \arb[voc]{wa-"istisqA'-u}
-%     \arb[trans]{wa-"istisqA'-u}, |qAla| |"uhrub| |fa-lan| |tuqtala|
-%     \arb[voc]{qAla "uhrub fa-lan tuqtala} \arb[trans]{qAla "uhrub
-%     fa-lan tuqtala}.
+%     \arb[trans]{wa-"is\-tisqA'-u}, |qAla| |"uhrub| |fa-lan|
+%     |tuqtala| \arb[voc]{qAla "uhrub fa-lan tuqtala} \arb[trans]{qAla
+%     "uhrub fa-lan tuqtala}.
 %   \end{quote}
 % \item \arb[trans]{sukUn}:---
 %   \begin{quote}
@@ -2264,11 +2265,11 @@ word that \cs{arbnull} is applied to.
 %   |\cap{`u_tm_an-u}| \arb[voc]{\cap{`u_tm_an-u}}
 %   \arb[trans]{\cap{`u_tm_an-u}}, |.daraba| |\cap{zayd-u}| |bn-u|
 %   |\cap{_h_alidiN}| |\cap{sa`d-a}| |bn-a| |\cap{`awf-i}| |bn-i|
-%   |\cap{`abd-i}| |\cap{'l-l_ah-i}| \arb[fullvoc]{.daraba
-%   \cap{zayd-u} bn-u \cap{_h_alidiN} \cap{sa`d-a} bn-a \cap{`awf-i}
-%   bn-i \cap{`abd-i} \cap{'l-l_ah-i}} \arb[trans]{.daraba
-%   \cap{zayd-u} bn-u \cap{_h_alidiN} \cap{sa`d-a} bn-a \cap{`awf-i}
-%   bn-i \cap{`abd-i} \cap{'l-l_ah-i}}.
+%   |\cap{|\allowbreak|`abd-i}| |\cap{'l-l_ah-i}|
+%   \arb[fullvoc]{.daraba \cap{zayd-u} bn-u \cap{_h_alidiN}
+%   \cap{sa`d-a} bn-a \cap{`awf-i} bn-i \cap{`abd-i} \cap{'l-l_ah-i}}
+%   \arb[trans]{.daraba \cap{zayd-u} bn-u \cap{_h_alidiN} \cap{sa`d-a}
+%   bn-a \cap{`awf-i} bn-i \cap{`abd-i} \cap{'l-l_ah-i}}.
 % \end{quote}
 % However, \cs{cap} must be used cautiously in some very particular
 % cases, for the closing brace of its argument may prevent a rule from
diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index 8e5671d..097aa5d 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -660,7 +660,7 @@ digraphsfv = {
 --   {a="(n)(ْ)(%s)(ل)", b="%1%3%4"},
 --   {a="(n)(ْ)(%s)(م)", b="%1%3%4"},
 --   {a="(n)(ْ)(%s)(ن)", b="%1%3%4"},
---   {a="ْ\"", b="\""},
+   {a="ْ\"", b="\""},
    -- sukūn end
    {a="_t", b="ث"},
    {a="%^g", b="ج"},
diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua
index c216017..5e7dbe5 100644
--- a/arabluatex_trans.lua
+++ b/arabluatex_trans.lua
@@ -309,24 +309,24 @@ digraphstrdmg = {
    {a="(%-)(\"?ayni)(%p?)$", b="\\arbup{%2}%3"},
    {a="(%-)(\"?[uai])(%p?%s)", b="\\arbup{%2}%3"},
    {a="(%-)(\"?[uai])(%p?)$", b="\\arbup{%2}%3"},
-   -- ʾiʿrāb hyphen (end)
-   -- shorten long vowels preceding ʾalif conjunctionis
+   -- ʾiʿrāb hyphen (end) shorten long vowels preceding ʾalif
+   -- conjunctionis—without forgetting 'lla_dI
    {a="(U)(A)", b="U"},
-   {a="(aW)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-o)", b="awu"},
-   {a="(%_a)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-o)", b="a"},
-   {a="(%_A)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-o)", b="ạ"},
-   {a="(A)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-o)", b="a"},
-   {a="(Y)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-o)", b="ạ"},
-   {a="([%_]?[Uu])(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-o)", b="u"},
-   {a="([%_]?[Ii])(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-o)", b="i"},
+   {a="(aW)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])([%S]-o)", b="awu"},
+   {a="(%_a)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])([%S]-o)", b="a"},
+   {a="(%_A)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])([%S]-o)", b="ạ"},
+   {a="(A)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])([%S]-o)", b="a"},
+   {a="(Y)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])([%S]-o)", b="ạ"},
+   {a="([%_]?[Uu])(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])([%S]-o)", b="u"},
+   {a="([%_]?[Ii])(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])([%S]-o)", b="i"},
    --p (next 7 lines, just after %s)
-   {a="(aW)(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="awu%2%3"},
-   {a="(%_a)(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="a%2%3"},
-   {a="(%_A)(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ%2%3"},
-   {a="(A)(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="a%2%3"},
-   {a="(Y)(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ%2%3"},
-   {a="([%_]?[Uu])(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="u%2%3"},
-   {a="([%_]?[Ii])(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="i%2%3"},
+   {a="(aW)(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])", b="awu%2%3"},
+   {a="(%_a)(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])", b="a%2%3"},
+   {a="(%_A)(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])", b="ạ%2%3"},
+   {a="(A)(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])", b="a%2%3"},
+   {a="(Y)(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])", b="ạ%2%3"},
+   {a="([%_]?[Uu])(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])", b="u%2%3"},
+   {a="([%_]?[Ii])(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])", b="i%2%3"},
    {a="%-%-", b=""},
 --   {a="T([^uai])", b="%1"},
    {a="T(%p?%s)", b="h%1"},