5 files changed, 149 insertions, 148 deletions

diff --git a/arabluatex.dtx b/arabluatex.dtx
index 52ae732..e194185 100644
--- a/arabluatex.dtx
+++ b/arabluatex.dtx
@@ -1389,9 +1389,9 @@ consonants, though three of them are also used as vowels
 % \arb[trans]{'abjad} numbers are usually distinguished from the
 % surrounding words by a stroke placed over them.
 %
-% For time being, \package{arabluatex} inserts those numbers with the
-% help of \package{polyglossia}. If you wish to use the
-% \arb[trans]{abjad} system, put in your preamble:---
+% For the time being, \package{arabluatex} inserts those numbers with the
+% help of \package{polyglossia}. If one wishes to use the
+% \arb[trans]{abjad} system, he may put in his preamble:---
 % \iffalse
 %<*example>
 % \fi
@@ -1403,7 +1403,7 @@ consonants, though three of them are also used as vowels
 % \iffalse
 %</example>
 % \fi %
-% \DescribeMacro{\abjad} Then you may use the command
+% \DescribeMacro{\abjad} Then one may use the command
 % \cs{abjad}\marg{number} in any of the |voc|, |fullvoc| and |novoc|
 % modes, where \meta{number} may be any number between 1 and 1999,
 % like so:---
@@ -1667,10 +1667,11 @@ al-muqAtilIna.}, wa-kAnat 'ummI min `u.zamA'i buyUti
 % \DescribeMacro{\LR} \cs{LR}\marg{arg} is designed to typeset its
 % argument from left to right. It may be used in an Arabic
 % environment, either \cs{arb}\marg{Arabic text} or \cs{begin}|{arab}|
-% \meta{Arabic text} \cs{end}|{arab}|, for short insertions of left to
-% right text, or to insert any \LaTeX\ command that would otherwise be
-% rejected by \package{arabluatex}, such as commands the argument of
-% which is expected to be a dimension or a unit of measurement.
+% \meta{Arabic text} \cs{end}|{arab}|, for short insertions of
+% left-to-right text, or to insert any \LaTeX\ command that would
+% otherwise be rejected by \package{arabluatex}, such as commands the
+% argument of which is expected to be a dimension or a unit of
+% measurement.
 %
 % \DescribeMacro{\RL} \cs{RL}\marg{arg} does the same as
 % \cs{LR}\marg{arg}, but typesets its argument from left to right. Even
@@ -1871,7 +1872,7 @@ wa-ya.sIru ta.hta 'l-jildi
 % and attempt to load the Amiri font which is included in \TeX{}live:
 %    \begin{macrocode}
 \AtBeginDocument{\ifdefined\arabicfont\relax\else
-\PackageWarning{arabluatex}{\string\arabicfont\ is not defined!^^JI
+\PackageWarning{arabluatex}{\string\arabicfont\ is not defined.^^JI
   will try to load Amiri}%
 \newfontfamily\arabicfont[Script=Arabic]{Amiri}\fi}%
 %    \end{macrocode}
@@ -1921,8 +1922,8 @@ wa-ya.sIru ta.hta 'l-jildi
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\SetTranslitConvention}
-% \cs{SetTranslitConvention}\marg{convention} may be used to change
-% the convention, which is |dmg| by default:
+%   \cs{SetTranslitConvention}\marg{convention} may be used to change
+%   the transliteration convention, which is |dmg| by default:
 %    \begin{macrocode}
 \def\al@trans@convention{dmg}
 \NewDocumentCommand{\SetTranslitConvention}{m}{\def\al@trans@convention{#1}}
diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index b157653..f66ed87 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -111,6 +111,41 @@ hamzafv = {
    {a="(i)(')([^uaiUAI])", b="%1ئْ%3"}
 }
 
+tanwinfv = {
+   {a="uNU", b="ٌو"},
+   {a="aNU", b="ًوا"},
+   {a="iNU", b="ٍو"},
+   {a="([uai]N)(%s)([uai])", b="%1%2ٱ"},
+   {a="(aN[%_]?[AY])(%s)([uai])", b="%1%2ٱ"},
+   -- assimilations (begin)
+   {a="(uN)(%s)([rlmnwy])", b="ٌ%2%3%3"},
+   {a="(aN)(_A)(%s)([rlmnwy])", b="ًى%3%4%4"},
+   {a="(aN)(Y)(%s)([rlmnwy])", b="ًى%3%4%4"},
+   {a="(T)(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"},
+   {a="(ء)(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"},
+   {a="([^TA])(aN)(%s)([rlmnwy])", b="%1ًا%3%4%4"},
+   {a="(iN)(%s)([rlmnwy])", b="ٍ%2%3%3"},
+   -- assimilations (end)
+   -- quoted tanwīn (begin)
+   {a="(\"uN)", b=""},
+   {a="(B)(\"aN)", b="%1"},
+   {a="(\"aN)(_A)", b="ى"},
+   {a="(\"aN)(Y)", b="ى"},
+   {a="(T)(\"aN)", b="%1"},
+   {a="(ء)(\"aN)", b="%1"},
+   {a="([^TA])(\"aN)", b="%1ا"},
+   {a="(\"iN)", b=""},
+   -- quoted tanwīn (end)
+   {a="(uN)", b="ٌ"},
+   {a="(B)(aN)", b="%1ً"},
+   {a="(aN)(_A)", b="ًى"},
+   {a="(aN)(Y)", b="ًى"},
+   {a="(T)(aN)", b="%1ً"},
+   {a="(ء)(aN)", b="%1ً"},
+   {a="([^TA])(aN)", b="%1ًا"},
+   {a="(iN)", b="ٍ"}
+}
+
 -- this is new
 trigraphsfv = { -- trigraphs or more
    -- 'llatI / 'llad_I
@@ -168,41 +203,6 @@ trigraphsfv = { -- trigraphs or more
    {a="(n)(%s)([rlmnwy])", b="%1%2%3%3"}
 }
 
-tanwinfv = {
-   {a="uNU", b="ٌو"},
-   {a="aNU", b="ًوا"},
-   {a="iNU", b="ٍو"},
-   {a="([uai]N)(%s)([uai])", b="%1%2ٱ"},
-   {a="(aN[%_]?[AY])(%s)([uai])", b="%1%2ٱ"},
-   -- assimilations (begin)
-   {a="(uN)(%s)([rlmnwy])", b="ٌ%2%3%3"},
-   {a="(aN)(_A)(%s)([rlmnwy])", b="ًى%3%4%4"},
-   {a="(aN)(Y)(%s)([rlmnwy])", b="ًى%3%4%4"},
-   {a="(T)(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"},
-   {a="(ء)(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"},
-   {a="([^TA])(aN)(%s)([rlmnwy])", b="%1ًا%3%4%4"},
-   {a="(iN)(%s)([rlmnwy])", b="ٍ%2%3%3"},
-   -- assimilations (end)
-   -- quoted tanwīn (begin)
-   {a="(\"uN)", b=""},
-   {a="(B)(\"aN)", b="%1"},
-   {a="(\"aN)(_A)", b="ى"},
-   {a="(\"aN)(Y)", b="ى"},
-   {a="(T)(\"aN)", b="%1"},
-   {a="(ء)(\"aN)", b="%1"},
-   {a="([^TA])(\"aN)", b="%1ا"},
-   {a="(\"iN)", b=""},
-   -- quoted tanwīn (end)
-   {a="(uN)", b="ٌ"},
-   {a="(B)(aN)", b="%1ً"},
-   {a="(aN)(_A)", b="ًى"},
-   {a="(aN)(Y)", b="ًى"},
-   {a="(T)(aN)", b="%1ً"},
-   {a="(ء)(aN)", b="%1ً"},
-   {a="([^TA])(aN)", b="%1ًا"},
-   {a="(iN)", b="ٍ"}
-}
-
 -- this is new
 digraphsfv = {
    -- initial straight double quote gives a connective ʾalif
diff --git a/arabluatex_novoc.lua b/arabluatex_novoc.lua
index d8e1248..deb5d3e 100644
--- a/arabluatex_novoc.lua
+++ b/arabluatex_novoc.lua
@@ -22,6 +22,43 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 --]]
 
+tanwinnv = {
+   {a="uNU", b="و"},
+   {a="aNU", b="وا"},
+   {a="iNU", b="و"},
+   -- assimilations (begin). These are good but may not apply here.
+--   {a="(uN)(%s)([rlmnwy])", b="|%2%3%3"},
+--   {a="(aN)(_A)(%s)([rlmnwy])", b="ى%3%4%4"},
+--   {a="(aN)(Y)(%s)([rlmnwy])", b="ى%3%4%4"},
+--   {a="(T)(aN)(%s)([rlmnwy])", b="%1%3%4%4"},
+--   {a="(ء)(aN)(%s)([rlmnwy])", b="%1%3%4%4"},
+--   {a="([^TA])(aN)(%s)([rlmnwy])", b="%1ا%3%4%4"},
+--   {a="(iN)(%s)([rlmnwy])", b="|%2%3%3"},
+   -- assimilations (end)
+   -- "quoted" tanwīn (begin)
+   {a="(\"uN)", b="ٌ"},
+   {a="(B)(\"aN)", b="%1ً"},
+   {a="(\"aN)(_A)", b="ًى"},
+   {a="(\"aN)(Y)", b="ًى"},
+   {a="(T)(\"aN)", b="%1ً"},
+   {a="(ء)(\"aN)", b="%1ً"},
+   {a="([^TA])(\"aN)", b="%1ًا"},
+   {a="(\"iN)", b="ٍ"},
+   -- "quoted" tanwīn (end)
+   {a="(uN)", b=""},
+   {a="(B)(aN)", b="%1"},
+   {a="(aN)(_A)", b="ى"},
+   {a="(aN)(Y)", b="ى"},
+   {a="(T)(aN)", b="%1"},
+   {a="(ء)(aN)", b="%1"},
+   {a="([^TA])(aN)", b="%1ا"},
+   {a="(iN)", b=""},
+   -- initial straight double quote gives a connective ʾalif. This has
+   -- nothing to do with the tanwīn, but I put it here for time being.
+   {a="^\"", b="ٱ"},
+   {a="([%s%-])\"", b="%1ٱ"}
+}
+
 trigraphsnv = { -- trigraphs or more
    -- Allah
    {a="l%-l_ah", b="l-ll_ah"},
@@ -78,43 +115,6 @@ trigraphsnv = { -- trigraphs or more
    {a="(_a)I", b="%1ي"}
 }
 
-tanwinnv = {
-   {a="uNU", b="و"},
-   {a="aNU", b="وا"},
-   {a="iNU", b="و"},
-   -- assimilations (begin). These are good but may not apply here.
---   {a="(uN)(%s)([rlmnwy])", b="|%2%3%3"},
---   {a="(aN)(_A)(%s)([rlmnwy])", b="ى%3%4%4"},
---   {a="(aN)(Y)(%s)([rlmnwy])", b="ى%3%4%4"},
---   {a="(T)(aN)(%s)([rlmnwy])", b="%1%3%4%4"},
---   {a="(ء)(aN)(%s)([rlmnwy])", b="%1%3%4%4"},
---   {a="([^TA])(aN)(%s)([rlmnwy])", b="%1ا%3%4%4"},
---   {a="(iN)(%s)([rlmnwy])", b="|%2%3%3"},
-   -- assimilations (end)
-   -- "quoted" tanwīn (begin)
-   {a="(\"uN)", b="ٌ"},
-   {a="(B)(\"aN)", b="%1ً"},
-   {a="(\"aN)(_A)", b="ًى"},
-   {a="(\"aN)(Y)", b="ًى"},
-   {a="(T)(\"aN)", b="%1ً"},
-   {a="(ء)(\"aN)", b="%1ً"},
-   {a="([^TA])(\"aN)", b="%1ًا"},
-   {a="(\"iN)", b="ٍ"},
-   -- "quoted" tanwīn (end)
-   {a="(uN)", b=""},
-   {a="(B)(aN)", b="%1"},
-   {a="(aN)(_A)", b="ى"},
-   {a="(aN)(Y)", b="ى"},
-   {a="(T)(aN)", b="%1"},
-   {a="(ء)(aN)", b="%1"},
-   {a="([^TA])(aN)", b="%1ا"},
-   {a="(iN)", b=""},
-   -- initial straight double quote gives a connective ʾalif. This has
-   -- nothing to do with the tanwīn, but I put it here for time being.
-   {a="^\"", b="ٱ"},
-   {a="([%s%-])\"", b="%1ٱ"}
-}
-
 longvnv = {
    {a="\"A", b="َا"},
    {a="\"U", b="ُو"},
diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua
index 99d3712..b61c6db 100644
--- a/arabluatex_trans.lua
+++ b/arabluatex_trans.lua
@@ -122,6 +122,26 @@ hamzatrdmg = {
    {a="(i)(')([^uaiUAI])", b="%1ʾ%3"}
 }
 
+tanwintrdmg = {
+   {a="uNU", b="un"},
+   {a="aNU", b="an"},
+   {a="iNU", b="in"},
+   -- tanwīn preceding ʾalif conjunctionis
+   {a="(uN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="uni%2%3"},
+   {a="(aN)(_A)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ani%3%4"},
+   {a="(aN)(Y)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ani%3%4"},
+   {a="(T)(aN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="tani%3%4"},
+   {a="([^TA])(aN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1ani%3%4"},
+   {a="(iN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ini%2%3"},
+   --
+   {a="uN", b="un"},
+   {a="(aN)(_A)", b="an"},
+   {a="(aN)(Y)", b="an"},
+   {a="(T)(\"?aN)", b="tan"},
+   {a="([^TA])(\"?aN)", b="%1an"},
+   {a="iN", b="in"}
+}
+
 trigraphstrdmg = { -- trigraphs or more
    -- 'llatI / 'llad_I
    {a="^'ll(a)([%_]?[dt])", b="'ll%1%2"},
@@ -177,26 +197,6 @@ trigraphstrdmg = { -- trigraphs or more
    {a="(n)(%s)([rlmnwy])", b="%3%2%3"}
 }
 
-tanwintrdmg = {
-   {a="uNU", b="un"},
-   {a="aNU", b="an"},
-   {a="iNU", b="in"},
-   -- tanwīn preceding ʾalif conjunctionis
-   {a="(uN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="uni%2%3"},
-   {a="(aN)(_A)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ani%3%4"},
-   {a="(aN)(Y)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ani%3%4"},
-   {a="(T)(aN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="tani%3%4"},
-   {a="([^TA])(aN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1ani%3%4"},
-   {a="(iN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ini%2%3"},
-   --
-   {a="uN", b="un"},
-   {a="(aN)(_A)", b="an"},
-   {a="(aN)(Y)", b="an"},
-   {a="(T)(\"?aN)", b="tan"},
-   {a="([^TA])(\"?aN)", b="%1an"},
-   {a="iN", b="in"}
-}
-
 digraphstrdmg = {
    {a="([uai]%-)(\"?[uai])", b="%1'"}, -- hyphen + initial alif without hamza
    {a="^(\"?[uai])", b="%1"},      -- initial alif without hamza
@@ -342,6 +342,18 @@ hamzatrloc = {
    {a="(i)(')([^uaiUAI])", b="%1ʾ%3"}
 }
 
+tanwintrloc = {
+   {a="uNU", b="un"},
+   {a="aNU", b="an"},
+   {a="iNU", b="in"},
+   {a="uN", b="un"},
+   {a="(aN)(_A)", b="an"},
+   {a="(aN)(Y)", b="an"},
+   {a="(T)(\"?aN)", b="tan"},
+   {a="([^TA])(\"?aN)", b="%1an"},
+   {a="iN", b="in"}
+}
+
 trigraphstrloc = { -- trigraphs or more
    -- 'llatI / 'llad_I
    {a="^'ll(a)([%_]?[dt])", b="all%1%2"},
@@ -392,18 +404,6 @@ trigraphstrloc = { -- trigraphs or more
    {a="(_a)I", b="A"}
 }
 
-tanwintrloc = {
-   {a="uNU", b="un"},
-   {a="aNU", b="an"},
-   {a="iNU", b="in"},
-   {a="uN", b="un"},
-   {a="(aN)(_A)", b="an"},
-   {a="(aN)(Y)", b="an"},
-   {a="(T)(\"?aN)", b="tan"},
-   {a="([^TA])(\"?aN)", b="%1an"},
-   {a="iN", b="in"}
-}
-
 digraphstrloc = {
    {a="(%-)([uai])", b="%1%2"}, -- hyphen + initial alif without hamza
    {a="^([uai])", b="%1"},      -- initial alif without hamza
diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index 5989898..9724901 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -143,6 +143,39 @@ hamza = {
    {a="(i)(')([^uaiUAI])", b="%1ئ%3"}
 }
 
+tanwin = {
+   {a="uNU", b="ٌو"},
+   {a="aNU", b="ًوا"},
+   {a="iNU", b="ٍو"},
+   -- assimilations (begin)
+   {a="(uN)(%s)([rlmnwy])", b="ٌ%2%3%3"},
+   {a="(aN)(_A)(%s)([rlmnwy])", b="ًى%3%4%4"},
+   {a="(aN)(Y)(%s)([rlmnwy])", b="ًى%3%4%4"},
+   {a="(T)(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"},
+   {a="(ء)(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"},
+   {a="([^TA])(aN)(%s)([rlmnwy])", b="%1ًا%3%4%4"},
+   {a="(iN)(%s)([rlmnwy])", b="ٍ%2%3%3"},
+   -- assimilations (end)
+   -- quoted tanwīn (begin)
+   {a="(\"uN)", b=""},
+   {a="(B)(\"aN)", b="%1"},
+   {a="(\"aN)(_A)", b="ى"},
+   {a="(\"aN)(Y)", b="ى"},
+   {a="(T)(\"aN)", b="%1"},
+   {a="(ء)(\"aN)", b="%1"},
+   {a="([^TA])(\"aN)", b="%1ا"},
+   {a="(\"iN)", b=""},
+   -- quoted tanwīn (end)
+   {a="(uN)", b="ٌ"},
+   {a="(B)(aN)", b="%1ً"},
+   {a="(aN)(_A)", b="ًى"},
+   {a="(aN)(Y)", b="ًى"},
+   {a="(T)(aN)", b="%1ً"},
+   {a="(ء)(aN)", b="%1ً"},
+   {a="([^TA])(aN)", b="%1ًا"},
+   {a="(iN)", b="ٍ"}
+}
+
 trigraphs = { -- trigraphs or more
    -- 'llatI / 'llad_I
    {a="^'ll(a)([%_]?[dt])", b="الّ%1%2"},
@@ -203,39 +236,6 @@ trigraphs = { -- trigraphs or more
    {a="(n)(%s)([rlmnwy])", b="%1%2%3%3"}
 }
 
-tanwin = {
-   {a="uNU", b="ٌو"},
-   {a="aNU", b="ًوا"},
-   {a="iNU", b="ٍو"},
-   -- assimilations (begin)
-   {a="(uN)(%s)([rlmnwy])", b="ٌ%2%3%3"},
-   {a="(aN)(_A)(%s)([rlmnwy])", b="ًى%3%4%4"},
-   {a="(aN)(Y)(%s)([rlmnwy])", b="ًى%3%4%4"},
-   {a="(T)(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"},
-   {a="(ء)(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"},
-   {a="([^TA])(aN)(%s)([rlmnwy])", b="%1ًا%3%4%4"},
-   {a="(iN)(%s)([rlmnwy])", b="ٍ%2%3%3"},
-   -- assimilations (end)
-   -- quoted tanwīn (begin)
-   {a="(\"uN)", b=""},
-   {a="(B)(\"aN)", b="%1"},
-   {a="(\"aN)(_A)", b="ى"},
-   {a="(\"aN)(Y)", b="ى"},
-   {a="(T)(\"aN)", b="%1"},
-   {a="(ء)(\"aN)", b="%1"},
-   {a="([^TA])(\"aN)", b="%1ا"},
-   {a="(\"iN)", b=""},
-   -- quoted tanwīn (end)
-   {a="(uN)", b="ٌ"},
-   {a="(B)(aN)", b="%1ً"},
-   {a="(aN)(_A)", b="ًى"},
-   {a="(aN)(Y)", b="ًى"},
-   {a="(T)(aN)", b="%1ً"},
-   {a="(ء)(aN)", b="%1ً"},
-   {a="([^TA])(aN)", b="%1ًا"},
-   {a="(iN)", b="ٍ"}
-}
-
 digraphs = {
    -- initial straight double quote gives a connective ʾalif
    {a="^\"[uai]", b="ٱ"},