6 files changed, 86 insertions, 43 deletions

diff --git a/arabluatex.bib b/arabluatex.bib
index 37e1aaa..4dbcb06 100644
--- a/arabluatex.bib
+++ b/arabluatex.bib
@@ -49,6 +49,7 @@
   year =         1896,
   editor =       {Robertson Smith, W. and de Goeje, M. J.},
   editortype =   {reviser},
+  foreword =     {Cachia, Pierre},
   edition =      3,
   volumes =      2,
   pagination =   {none},
@@ -77,3 +78,15 @@
                   {http://www.naher-osten.uni-muenchen.de/studium_lehre/werkzeugkasten/dmgtransliteration.pdf},
   location =     {Leipzig}
 }
+
+@MVBook{Lane,
+  author =       {Lane, Edward William},
+  title =        {An Arabic-English lexicon},
+  date =         {1863/1893},
+  indextitle =   {Arabic-English Lexicon, An},
+  volumes =      8,
+  shorthand =    {Lane, \emph{Lexicon}},
+  pagination =   {none},
+  publisher =    {Williams and Norgate},
+  location =     {London -- Edinburgh}
+}
diff --git a/arabluatex.dtx b/arabluatex.dtx
index 8ed305c..1a5ac78 100644
--- a/arabluatex.dtx
+++ b/arabluatex.dtx
@@ -499,11 +499,10 @@ consonants, though three of them are also used as vowels
 %   \textsc{Rem.}~\emph{b.} Defective writings, such as
 %   \arb[novoc]{B_a}, \arb[trans]{al-'alifu 'l-ma.h_dUfaTu}, or
 %   defective writings of \arb[trans]{B_u} and \arb[trans]{B_i} are
-%   encoded |_a| |_u| and |_i| respectively, e.g. |_d_alika| %
-%   \arb[voc]{_d_alika}, |al-mal_a'ikaTu 'l-ra.hm_anu| %
-%   \arb[voc]{al-mal_a'ikaTu 'l-ra.hm_anu}, %
-%   |.hu_dayfaTu bnu 'l-yamAn_i| %
-%   \arb[fullvoc]{.hu_dayfaTu bnu 'l-yamAn_i} for
+%   encoded |_a| |_u| and |_i| respectively, e.g. |_d_alika|
+%   \arb[voc]{_d_alika}, |al-mal_a'ikaTu| |'l-ra.hm_anu|
+%   \arb[voc]{al-mal_a'ikaTu 'l-ra.hm_anu}, |.hu_dayfaTu| |bnu|
+%   |'l-yamAn_i| \arb[fullvoc]{.hu_dayfaTu bnu 'l-yamAn_i} for
 %   \arb[trans]{\cap{.hu_dayfaTu} bnu 'l-\cap{yamAn_i}}, etc.
 % \end{quoting}
 % 
@@ -611,8 +610,8 @@ consonants, though three of them are also used as vowels
 %   \arb[voc]{'il_ahuN} \arb[trans]{'il_ahuN}, |al-ra.hm_anu|
 %   \arb[voc]{al-ra.hm_anu} \arb[trans]{al-ra.hm_anu}, |l_akin|
 %   \arb[voc]{l_akin} \arb[trans]{l_akin}, |h_ahunA|
-%   \arb[voc]{h_ahunA} \arb[trans]{h_ahunA}, %
-%   |.hunaynu bnu 'is.h_aqa| %
+%   \arb[voc]{h_ahunA} \arb[trans]{h_ahunA},
+%   |.hunaynu| |bnu| |'is.h_aqa|
 %   \arb[voc]{.hunaynu bnu 'is.h_aqa} \arb[trans]{\cap{.hunaynu} bnu
 %   \cap{'is.h_aqa}}, |rabb_i| \arb[voc]{rabb_i} \arb[trans]{rabb_i},
 %   |al-`A.s_i| \arb[voc]{al-`A.s_i} \arb[trans]{al-\cap{`A.s_i}}.
@@ -647,11 +646,9 @@ consonants, though three of them are also used as vowels
 %   \arb[voc]{`amriNU} \arb[trans]{`amriNU}.
 %
 %   When the \arb[trans]{tanwIn} falls away \parencite[i. 249
-%   B]{Wright}: %
-%   |`amruU bnu mu.hammadiN| %
-%   \arb[fullvoc]{`amruU bnu mu.hammadiN} \arb[trans]{\cap{`amruU} bnu
-%   \cap{mu.hammadiN}}, %
-%   |mu.hammadu bnu `amriU bni _hAlidiN| %
+%   B]{Wright}: |`amruU| |bnu| |mu.hammadiN| \arb[fullvoc]{`amruU bnu
+%   mu.hammadiN} \arb[trans]{\cap{`amruU} bnu \cap{mu.hammadiN}},
+%   |mu.hammadu| |bnu| |`amriU| |bni| |_hAlidiN|
 %   \arb[fullvoc]{mu.hammadu bnu `amriU bni _hAlidiN}
 %   \arb[trans]{\cap{mu.hammadu} bnu \cap{`amriU} bni \cap{_hAlidiN}}.
 %
@@ -681,7 +678,8 @@ consonants, though three of them are also used as vowels
 %   \arb[voc]{^say'iN} \arb[trans]{^say'iN}.
 % \end{quote}
 %
-%\paragraph{\arb[trans]{tA' marbU.taT}}
+% \subsection{Other orthographic signs}
+% \paragraph{\arb[trans]{tA' marbU.taT}}
 % It is written \meta{T}:
 % \begin{quote}
 %   |madInaTuN| \arb[voc]{madInaTuN} \arb[trans]{madInaTuN},
@@ -805,9 +803,10 @@ consonants, though three of them are also used as vowels
 %   \arb[trans]{murruN}
 % \end{quote}
 % 
-% \subparagraph{The euphonic \arb[trans]{ta^sdId}} always follows a
-% vowelless consonant which is passed over in pronunciation and
-% assimilated to a following consonant. It may be
+% \subparagraph{The euphonic \arb[trans]{ta^sdId}}
+% \label{euphonic-tashdid}
+% always follows a vowelless consonant which is passed over in
+% pronunciation and assimilated to a following consonant. It may be
 % found \parencite[i. 15 B--16 C]{Wright}:---
 % \begin{enumerate}[(a)]
 % \item With the \emph{solar} letters \arb[novoc]{t}, \arb[novoc]{_t},
@@ -843,12 +842,12 @@ consonants, though three of them are also used as vowels
 %   Note the absence of \arb[trans]{sukUn} above the passed over
 %   \arb[novoc]{n} in the following examples, each of which is
 %   accompanied with a consistent transliteration: |min rabbi-hi|
-%   \arb[fullvoc]{min rabbi-hi}, \arb[trans]{min rabbi-hi}, %
-%   |min layliN| \arb[fullvoc]{min layliN} \arb[trans]{min layliN}, %
-%   |'an yaqtula| \arb[fullvoc]{'an yaqtula} \arb[trans]{'an yaqtula}.
+%   \arb[fullvoc]{min rabbi-hi}, \arb[trans]{min rabbi-hi},
+%   |min| |layliN| \arb[fullvoc]{min layliN} \arb[trans]{min layliN},
+%   |'an| |yaqtula| \arb[fullvoc]{'an yaqtula} \arb[trans]{'an yaqtula}.
 %   
-%   With \arb[trans]{tanwIn}: |kitAbuN mubInuN| %
-%   \arb[voc]{kitAbuN mubInuN} \arb[trans]{kitAbuN mubInuN}.%
+%   With \arb[trans]{tanwIn}: |kitAbuN| |mubInuN| \arb[voc]{kitAbuN
+%   mubInuN} \arb[trans]{kitAbuN mubInuN}.
 % \end{quote}
 % \item With the letter \arb[voc]{t} after the dentals
 %   \arb[novoc]{_t}, \arb[novoc]{d}, \arb[novoc]{_d}, \arb[novoc]{.d},
@@ -866,8 +865,8 @@ consonants, though three of them are also used as vowels
 % (\arb[trans]{'alifu 'l-wa.sli}), the \arb[trans]{hamzaT} is omitted
 % and only its accompanying vowel is expressed:
 % \begin{quote}
-%   |al-.hamdu li-ll_ahi| \arb[fullvoc]{al-.hamdu li-ll_ahi}
-%   \arb[trans]{al-.hamdu li-ll_ahi}.
+%   |al-.hamdu| |li-l-l_ahi| \arb[fullvoc]{al-.hamdu li-l-l_ahi}
+%   \arb[trans]{al-.hamdu li-l-l_ahi}.
 % \end{quote}
 % As said above in section\vref{fullvoc-mode}, |fullvoc| is the mode
 % in which \package{arabluatex} expresses the \arb[trans]{sukUn} and
@@ -1000,6 +999,37 @@ consonants, though three of them are also used as vowels
 %   \arb[trans]{\cap{m}u.hammaduN 'l-nabI}.
 % \end{quote}
 %
+% \subsection{Special orthographies}
+% \paragraph{The name of God}
+% The name of God, \arb[voc]{al-l_ahu}, is compounded of the article
+% \arb[fullvoc]{al-}, and \arb[fullvoc]{'ilAhu} (noted
+% \arb[fullvoc]{'il_ahu} with the defective \arb[trans]{'alif}) so
+% that it becomes \arb[fullvoc]{al-'ilAhu}; then the
+% \arb[trans]{hamzaT} is suppressed, its vowel being transferred to
+% the \arb[novoc]{l} before it, so that there remains
+% \arb[voc]{alil_ahu} \parencite[I refer to][I. 83
+% col. 1]{Lane}. Finally, the first \arb[novoc]{l} is made quiescent
+% and incorporated into the other, hence the \arb[trans]{ta^sdId}
+% above it. As \package{arabluatex} never requires a solar letter to
+% be written twice (see above, section\vref{euphonic-tashdid}), the
+% name of God is therefore encoded |al-l_ahu| or |'l-l_ahu|:---
+% \begin{quote}
+%   |al-l_ahu| \arb[fullvoc]{al-l_ahu} \arb[trans]{al-l_ahu},
+%   \verb+yA|+ |al-l_ahu| \arb[fullvoc]{yA| al-l_ahu} \arb[trans]{yA|
+%   al-l_ahu}, \verb+'a-fa|-al-l_ahi+ |la-ta.g`alanna|
+%   \arb[fullvoc]{'a-fa|-al-l_ahi la-ta.g`alanna}
+%   \arb[trans]{'a-fa|-al-l_ahi la-ta.g`alanna}, |bi-'l-l_ahi|
+%   \arb[fullvoc]{bi-'l-l_ahi} \arb[trans]{bi-'l-l_ahi}, |wa-'l-l_ahi|
+%   \arb[fullvoc]{wa-'l-l_ahi} \arb[trans]{wa-'l-l_ahi}, |bi-smi|
+%   |'l-l_ahi| \arb[fullvoc]{bi-smi 'l-l_ahi} \arb[trans]{bi-smi
+%   'l-l_ahi}, |al-.hamdu| |li-l-l_ahi| \arb[fullvoc]{al-.hamdu
+%   li-l-l_ahi} \arb[trans]{al-.hamdu li-l-l_ahi}, |li-l-l_ahi|
+%   |'l-qA'ilu| \arb[fullvoc]{li-l-l_ahi 'l-qA'ilu}
+%   \arb[trans]{li-l-l_ahi 'l-qA'ilu}.
+% \end{quote}
+% 
+%
+%
 % \StopEventually{}
 %
 % \section{Implementation}
diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index 8f6ce66..34031b9 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -123,21 +123,21 @@ trigraphsfv = { -- trigraphs or more
    {a="(%s)'ll(a)([%_]?[dt])", b="%1ٱلّ%2%3"},
    -- al- + lām
    {a="^(a)l%-(l)", b="ا%1ل%2%2"},
-   {a="(%s)(a)l%-(l)", b="%1ا%2ل%3%3"},
+   {a="([%s%-])(a)l%-(l)", b="%1ا%2ل%3%3"},
    -- al- + solar consonant
    {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="ا%1ل%2%2"},
-   {a="(%s)(a)l%-([%_%^%.]?[tdrzsn])", b="%1ا%2ل%3%3"},
+   {a="([%s%-])(a)l%-([%_%^%.]?[tdrzsn])", b="%1ا%2ل%3%3"},
    -- assim. art. + solar consonant
    {a="^(a)([%_%^%.]?[tdrzsn])%-", b="ا%1ل%2"},
-   {a="(%s)(a)([%_%^%.]?[tdrzsn])%-", b="%1ا%2ل%3"},
+   {a="([%s%-])(a)([%_%^%.]?[tdrzsn])%-", b="%1ا%2ل%3"},
    -- al- + initial unstable hamza
    {a="^(a)l%-([uai])", b="ا%1لٱ%2"},
-   {a="(%s)(a)l%-([uai])", b="%1ا%2لٱ%3"},
+   {a="([%s%-])(a)l%-([uai])", b="%1ا%2لٱ%3"},
    -- li-/la + art. + initial unstable hamza is a special orthography
    {a="l([ai])%-l%-([uai])", b="ل%1لٱ%2"},
    -- al- + lunar consonant (i.e. what remains)
    {a="^(a)l%-", b="ا%1لْ"},
-   {a="(%s)(a)l%-", b="%1ا%2لْ"},
+   {a="([%s%-])(a)l%-", b="%1ا%2لْ"},
    -- diphthongs to be resolved before ʾalif conjunctionis
    {a="(aW)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="awuا%2%3"},
    {a="(aw)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1u%2%3"},
diff --git a/arabluatex_novoc.lua b/arabluatex_novoc.lua
index 4f08d68..1a5c913 100644
--- a/arabluatex_novoc.lua
+++ b/arabluatex_novoc.lua
@@ -30,21 +30,21 @@ trigraphsnv = { -- trigraphs or more
    {a="(%s)'ll(a)([%_]?[dt])", b="%1ال%2%3"},
    -- al- + lām
    {a="^(a)l%-(l)", b="ا%1ل%2"},
-   {a="(%s)(a)l%-(l)", b="%1ا%2ل%3"},
+   {a="([%s%-])(a)l%-(l)", b="%1ا%2ل%3"},
    -- al- + solar consonant
    {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="ا%1ل%2"},
-   {a="(%s)(a)l%-([%_%^%.]?[tdrzsn])", b="%1ا%2ل%3"},
+   {a="([%s%-])(a)l%-([%_%^%.]?[tdrzsn])", b="%1ا%2ل%3"},
    -- assim. art. + solar consonant
    {a="^(a)([%_%^%.]?[tdrzsn])%-", b="ا%1ل"},
-   {a="(%s)(a)([%_%^%.]?[tdrzsn])%-", b="%1ا%2ل"},
+   {a="([%s%-])(a)([%_%^%.]?[tdrzsn])%-", b="%1ا%2ل"},
    -- al- + initial unstable hamza
    {a="^(a)l%-([uai])", b="ا%1لا%2"},
-   {a="(%s)(a)l%-([uai])", b="%1ا%2لا%3"},
+   {a="([%s%-])(a)l%-([uai])", b="%1ا%2لا%3"},
    -- li-/la- + art. + initial unstable hamza is a special orthography
    {a="l([ai])%-l%-([uai])", b="ل%1لا%2"},
    -- al- + lunar consonant (i.e. what remains)
    {a="^(a)l%-", b="ا%1ل"},
-   {a="(%s)(a)l%-", b="%1ا%2ل"},
+   {a="([%s%-])(a)l%-", b="%1ا%2ل"},
    -- art. with waṣla + lām
    {a="'l%-(l)", b="ال%1"},
    -- art. with waṣla + solar consonant
diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua
index cdcc654..684977a 100644
--- a/arabluatex_trans.lua
+++ b/arabluatex_trans.lua
@@ -94,21 +94,21 @@ trigraphstrdmg = { -- trigraphs or more
    {a="(%s)'ll(a)([%_]?[dt])", b="%1'll%2%3"},
    -- al- + lām
    {a="^(a)l%-(l)", b="%1l-%2"},
-   {a="(%s)(a)l%-(l)", b="%1%2l-%3"},
+   {a="([%s%-])(a)l%-(l)", b="%1%2l-%3"},
    -- al- + solar consonant
    {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="%1%2-%2"},
-   {a="(%s)(a)l%-([%_%^%.]?[tdrzsn])", b="%1%2%3-%3"},
+   {a="([%s%-])(a)l%-([%_%^%.]?[tdrzsn])", b="%1%2%3-%3"},
    -- assim. art. + solar consonant
    {a="^(a)([%_%^%.]?[tdrzsn])%-", b="%1%2-"},
-   {a="(%s)(a)([%_%^%.]?[tdrzsn])%-", b="%1%2%3-"},
+   {a="([%s%-])(a)([%_%^%.]?[tdrzsn])%-", b="%1%2%3-"},
    -- al- + initial unstable hamza
    {a="^(a)l%-([uai])", b="%1l-%2"},
-   {a="(%s)(a)l%-([uai])", b="%1%2l-%3"},
+   {a="([%s%-])(a)l%-([uai])", b="%1%2l-%3"},
    -- 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="([%s%-])(a)l%-", b="%1%2l-"},
    -- 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"},
diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index 4d3c656..a30a2f1 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -154,21 +154,21 @@ trigraphs = { -- trigraphs or more
    {a="(%s)'ll(a)([%_]?[dt])", b="%1الّ%2%3"},
    -- al- + lām
    {a="^(a)l%-(l)", b="ا%1ل%2%2"},
-   {a="(%s)(a)l%-(l)", b="%1ا%2ل%3%3"},
+   {a="([%s%-])(a)l%-(l)", b="%1ا%2ل%3%3"},
    -- al- + solar consonant
    {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="ا%1ل%2%2"},
-   {a="(%s)(a)l%-([%_%^%.]?[tdrzsn])", b="%1ا%2ل%3%3"},
+   {a="([%s%-])(a)l%-([%_%^%.]?[tdrzsn])", b="%1ا%2ل%3%3"},
    -- assim. art. + solar consonant
    {a="^(a)([%_%^%.]?[tdrzsn])%-", b="ا%1ل%2"},
-   {a="(%s)(a)([%_%^%.]?[tdrzsn])%-", b="%1ا%2ل%3"},
+   {a="([%s%-])(a)([%_%^%.]?[tdrzsn])%-", b="%1ا%2ل%3"},
    -- al- + initial unstable hamza
    {a="^(a)l%-([uai])", b="ا%1لا%2"},
-   {a="(%s)(a)l%-([uai])", b="%1ا%2لا%3"},
+   {a="([%s%-])(a)l%-([uai])", b="%1ا%2لا%3"},
    -- li-/la- + art. + initial unstable hamza is a special orthography
    {a="l([ai])%-l%-([uai])", b="ل%1لا%2"},
    -- al- + lunar consonant (i.e. what remains)
    {a="^(a)l%-", b="ا%1ل"},
-   {a="(%s)(a)l%-", b="%1ا%2ل"},
+   {a="([%s%-])(a)l%-", b="%1ا%2ل"},
    -- diphthongs to be resolved before ʾalif conjunctionis
    {a="(aW)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="awuا%2%3"},
    {a="(aw)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1u%2%3"},