include the taṭwīl in the rules that generate the sukūn

2 files changed, 11 insertions, 9 deletions

diff --git a/arabluatex.dtx b/arabluatex.dtx
index 0b7b78c..ee80964 100644
--- a/arabluatex.dtx
+++ b/arabluatex.dtx
@@ -1905,7 +1905,8 @@
 %   \arb[fullvoc]{'a`daA"'|"'ikum} \arb[trans]{'a`dA|"'ikum}.
 % \end{quote}
 %
-% \subsection{The \enquote{pipe} character (\textbar)}
+% \subsection{\texorpdfstring{The \enquote{pipe} character
+% (\textbar)}{The ‘pipe’ character (\textbar)}}
 % \label{sec:pipe}
 % In the terminology of Arab\TeX, the \enquote{pipe} character
 % \enquote*{\textbar} is referred to as the \enquote{invisible
@@ -2293,7 +2294,7 @@
 % As one can see, \emph{triple hyphens} have been used. In the
 % \arb[trans]{.sadr}, the first hyphen triggers the rules that are
 % related to the definite article and the \arb[trans]{'alif-u
-% 'l-wa.sl-i},\footnote{See \vref{ref:definite-article}} while the
+% 'l-wa.sl-i},\footnote{See \vref{ref:definite-article}.} while the
 % following two select the figure of the letter \arb[trans]{lAm}
 % connected with a following letter. In the \arb[trans]{`a^guz}, the
 % last two hyphens select the letter \arb[trans]{yA'} connected with a
@@ -2324,7 +2325,7 @@
     gutter=1cm]
     \bayt{.gayra 'annI qad 'asta`Inu `al_A 'l-ha--}[--mmi ]{'i_dA
       _haffa bi-'l-_tawiyyi 'l-na^gA'u}\\
-    \bayt{bi-zaf--UfiN ka-'anna-hA hi{q}--laTuN}[ 'ummu ]{ri'AliN
+    \bayt{bi-zaf--UfiN ka-'anna-hA hiq--laTuN}[ 'ummu ]{ri'AliN
       dawwiyyaTuN saqfA'u}\\
   \end{arabverse}
 \end{example}
@@ -3140,7 +3141,8 @@
 %   \uc{'l-rAziyyu}}.
 % \end{quote}
 %
-% \paragraph{\enquote*{Long} pro\-per names}
+% \paragraph{\texorpdfstring{\enquote*{Long} pro\-per
+% names}{‘Long’ proper names}}
 % \NEWfeature{v1.10} \cs{uc} is also able to process proper names
 % consisting of several subsequent words:---
 % \begin{quote}
@@ -3417,8 +3419,8 @@
 %</example>
 % \fi
 %
-% \paragraph{\enquote*{base}, \enquote*{\texttt{xml}} and
-% \enquote*{safe} schemes}
+% \paragraph{\texorpdfstring{\enquote*{base}, \enquote*{\texttt{xml}}
+% and \enquote*{safe} schemes}{‘base’, ‘xml’ and ‘safe’ schemes}}
 % \package{arabluatex} can use any of the so-called Buckwalter
 % \enquote*{base}, \enquote*{\texttt{xml}} or \enquote*{safe} schemes
 % as they are described in \textcite[25--26]{Habash}.\footnote{I am
diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index f524c3b..9f42ca8 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -645,7 +645,7 @@ digraphsfvidgham = {
    {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])(%p*)$", b="%1ْ%2"},
    {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])(%p*%s)", b="%1ْ%2"},
    {a="([ai]Y)([%_]?[^%_uaiUAIYًٌٍ])", b="%1ْ%2"},
-   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])([%_]?[^%_uaiUAIYًٌٍ])", b="%1ْ%2"},
+   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])([ـ]-[%_]?[^%_uaiUAIYًٌٍ])", b="%1ْ%2"},
    -- take out sukūn in cases of assimilation
    {a="(n)(ْ)(%s)(ر)", b="%1%3%4"},
    {a="(n)(ْ)(%s)(و)", b="%1%3%4"},
@@ -772,7 +772,7 @@ digraphsfv = {
    {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])(%p*)$", b="%1ْ%2"},
    {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])(%p*%s)", b="%1ْ%2"},
    {a="([ai]Y)([%_]?[^%_uaiUAIYًٌٍ])", b="%1ْ%2"},
-   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])([%_]?[^%_uaiUAIYًٌٍ])", b="%1ْ%2"},
+   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])([ـ]-[%_]?[^%_uaiUAIYًٌٍ])", b="%1ْ%2"},
    -- take out sukūn in cases of assimilation
 --   {a="(n)(ْ)(%s)(ر)", b="%1%3%4"},
 --   {a="(n)(ْ)(%s)(و)", b="%1%3%4"},
@@ -902,7 +902,7 @@ digraphsfveasy = { -- see the differences under 'easy' marker below
 --   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])(%p*)$", b="%1ْ%2"},
 --   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])(%p*%s)", b="%1ْ%2"},
 --   {a="([ai]Y)([%_]?[^%_uaiUAIYًٌٍ])", b="%1ْ%2"},
---   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])([%_]?[^%_uaiUAIYًٌٍ])", b="%1ْ%2"},
+--   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])([ـ]-[%_]?[^%_uaiUAIYًٌٍ])", b="%1ْ%2"},
    -- take out sukūn in cases of assimilation
 --   {a="(n)(ْ)(%s)(ر)", b="%1%3%4"},
 --   {a="(n)(ْ)(%s)(و)", b="%1%3%4"},