aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arabluatex.bib13
-rw-r--r--arabluatex.dtx76
-rw-r--r--arabluatex_fullvoc.lua10
-rw-r--r--arabluatex_novoc.lua10
-rw-r--r--arabluatex_trans.lua10
-rw-r--r--arabluatex_voc.lua10
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 @@
49 year = 1896, 49 year = 1896,
50 editor = {Robertson Smith, W. and de Goeje, M. J.}, 50 editor = {Robertson Smith, W. and de Goeje, M. J.},
51 editortype = {reviser}, 51 editortype = {reviser},
52 foreword = {Cachia, Pierre},
52 edition = 3, 53 edition = 3,
53 volumes = 2, 54 volumes = 2,
54 pagination = {none}, 55 pagination = {none},
@@ -77,3 +78,15 @@
77 {http://www.naher-osten.uni-muenchen.de/studium_lehre/werkzeugkasten/dmgtransliteration.pdf}, 78 {http://www.naher-osten.uni-muenchen.de/studium_lehre/werkzeugkasten/dmgtransliteration.pdf},
78 location = {Leipzig} 79 location = {Leipzig}
79} 80}
81
82@MVBook{Lane,
83 author = {Lane, Edward William},
84 title = {An Arabic-English lexicon},
85 date = {1863/1893},
86 indextitle = {Arabic-English Lexicon, An},
87 volumes = 8,
88 shorthand = {Lane, \emph{Lexicon}},
89 pagination = {none},
90 publisher = {Williams and Norgate},
91 location = {London -- Edinburgh}
92}
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
499% \textsc{Rem.}~\emph{b.} Defective writings, such as 499% \textsc{Rem.}~\emph{b.} Defective writings, such as
500% \arb[novoc]{B_a}, \arb[trans]{al-'alifu 'l-ma.h_dUfaTu}, or 500% \arb[novoc]{B_a}, \arb[trans]{al-'alifu 'l-ma.h_dUfaTu}, or
501% defective writings of \arb[trans]{B_u} and \arb[trans]{B_i} are 501% defective writings of \arb[trans]{B_u} and \arb[trans]{B_i} are
502% encoded |_a| |_u| and |_i| respectively, e.g. |_d_alika| % 502% encoded |_a| |_u| and |_i| respectively, e.g. |_d_alika|
503% \arb[voc]{_d_alika}, |al-mal_a'ikaTu 'l-ra.hm_anu| % 503% \arb[voc]{_d_alika}, |al-mal_a'ikaTu| |'l-ra.hm_anu|
504% \arb[voc]{al-mal_a'ikaTu 'l-ra.hm_anu}, % 504% \arb[voc]{al-mal_a'ikaTu 'l-ra.hm_anu}, |.hu_dayfaTu| |bnu|
505% |.hu_dayfaTu bnu 'l-yamAn_i| % 505% |'l-yamAn_i| \arb[fullvoc]{.hu_dayfaTu bnu 'l-yamAn_i} for
506% \arb[fullvoc]{.hu_dayfaTu bnu 'l-yamAn_i} for
507% \arb[trans]{\cap{.hu_dayfaTu} bnu 'l-\cap{yamAn_i}}, etc. 506% \arb[trans]{\cap{.hu_dayfaTu} bnu 'l-\cap{yamAn_i}}, etc.
508% \end{quoting} 507% \end{quoting}
509% 508%
@@ -611,8 +610,8 @@ consonants, though three of them are also used as vowels
611% \arb[voc]{'il_ahuN} \arb[trans]{'il_ahuN}, |al-ra.hm_anu| 610% \arb[voc]{'il_ahuN} \arb[trans]{'il_ahuN}, |al-ra.hm_anu|
612% \arb[voc]{al-ra.hm_anu} \arb[trans]{al-ra.hm_anu}, |l_akin| 611% \arb[voc]{al-ra.hm_anu} \arb[trans]{al-ra.hm_anu}, |l_akin|
613% \arb[voc]{l_akin} \arb[trans]{l_akin}, |h_ahunA| 612% \arb[voc]{l_akin} \arb[trans]{l_akin}, |h_ahunA|
614% \arb[voc]{h_ahunA} \arb[trans]{h_ahunA}, % 613% \arb[voc]{h_ahunA} \arb[trans]{h_ahunA},
615% |.hunaynu bnu 'is.h_aqa| % 614% |.hunaynu| |bnu| |'is.h_aqa|
616% \arb[voc]{.hunaynu bnu 'is.h_aqa} \arb[trans]{\cap{.hunaynu} bnu 615% \arb[voc]{.hunaynu bnu 'is.h_aqa} \arb[trans]{\cap{.hunaynu} bnu
617% \cap{'is.h_aqa}}, |rabb_i| \arb[voc]{rabb_i} \arb[trans]{rabb_i}, 616% \cap{'is.h_aqa}}, |rabb_i| \arb[voc]{rabb_i} \arb[trans]{rabb_i},
618% |al-`A.s_i| \arb[voc]{al-`A.s_i} \arb[trans]{al-\cap{`A.s_i}}. 617% |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
647% \arb[voc]{`amriNU} \arb[trans]{`amriNU}. 646% \arb[voc]{`amriNU} \arb[trans]{`amriNU}.
648% 647%
649% When the \arb[trans]{tanwIn} falls away \parencite[i. 249 648% When the \arb[trans]{tanwIn} falls away \parencite[i. 249
650% B]{Wright}: % 649% B]{Wright}: |`amruU| |bnu| |mu.hammadiN| \arb[fullvoc]{`amruU bnu
651% |`amruU bnu mu.hammadiN| % 650% mu.hammadiN} \arb[trans]{\cap{`amruU} bnu \cap{mu.hammadiN}},
652% \arb[fullvoc]{`amruU bnu mu.hammadiN} \arb[trans]{\cap{`amruU} bnu 651% |mu.hammadu| |bnu| |`amriU| |bni| |_hAlidiN|
653% \cap{mu.hammadiN}}, %
654% |mu.hammadu bnu `amriU bni _hAlidiN| %
655% \arb[fullvoc]{mu.hammadu bnu `amriU bni _hAlidiN} 652% \arb[fullvoc]{mu.hammadu bnu `amriU bni _hAlidiN}
656% \arb[trans]{\cap{mu.hammadu} bnu \cap{`amriU} bni \cap{_hAlidiN}}. 653% \arb[trans]{\cap{mu.hammadu} bnu \cap{`amriU} bni \cap{_hAlidiN}}.
657% 654%
@@ -681,7 +678,8 @@ consonants, though three of them are also used as vowels
681% \arb[voc]{^say'iN} \arb[trans]{^say'iN}. 678% \arb[voc]{^say'iN} \arb[trans]{^say'iN}.
682% \end{quote} 679% \end{quote}
683% 680%
684%\paragraph{\arb[trans]{tA' marbU.taT}} 681% \subsection{Other orthographic signs}
682% \paragraph{\arb[trans]{tA' marbU.taT}}
685% It is written \meta{T}: 683% It is written \meta{T}:
686% \begin{quote} 684% \begin{quote}
687% |madInaTuN| \arb[voc]{madInaTuN} \arb[trans]{madInaTuN}, 685% |madInaTuN| \arb[voc]{madInaTuN} \arb[trans]{madInaTuN},
@@ -805,9 +803,10 @@ consonants, though three of them are also used as vowels
805% \arb[trans]{murruN} 803% \arb[trans]{murruN}
806% \end{quote} 804% \end{quote}
807% 805%
808% \subparagraph{The euphonic \arb[trans]{ta^sdId}} always follows a 806% \subparagraph{The euphonic \arb[trans]{ta^sdId}}
809% vowelless consonant which is passed over in pronunciation and 807% \label{euphonic-tashdid}
810% assimilated to a following consonant. It may be 808% always follows a vowelless consonant which is passed over in
809% pronunciation and assimilated to a following consonant. It may be
811% found \parencite[i. 15 B--16 C]{Wright}:--- 810% found \parencite[i. 15 B--16 C]{Wright}:---
812% \begin{enumerate}[(a)] 811% \begin{enumerate}[(a)]
813% \item With the \emph{solar} letters \arb[novoc]{t}, \arb[novoc]{_t}, 812% \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
843% Note the absence of \arb[trans]{sukUn} above the passed over 842% Note the absence of \arb[trans]{sukUn} above the passed over
844% \arb[novoc]{n} in the following examples, each of which is 843% \arb[novoc]{n} in the following examples, each of which is
845% accompanied with a consistent transliteration: |min rabbi-hi| 844% accompanied with a consistent transliteration: |min rabbi-hi|
846% \arb[fullvoc]{min rabbi-hi}, \arb[trans]{min rabbi-hi}, % 845% \arb[fullvoc]{min rabbi-hi}, \arb[trans]{min rabbi-hi},
847% |min layliN| \arb[fullvoc]{min layliN} \arb[trans]{min layliN}, % 846% |min| |layliN| \arb[fullvoc]{min layliN} \arb[trans]{min layliN},
848% |'an yaqtula| \arb[fullvoc]{'an yaqtula} \arb[trans]{'an yaqtula}. 847% |'an| |yaqtula| \arb[fullvoc]{'an yaqtula} \arb[trans]{'an yaqtula}.
849% 848%
850% With \arb[trans]{tanwIn}: |kitAbuN mubInuN| % 849% With \arb[trans]{tanwIn}: |kitAbuN| |mubInuN| \arb[voc]{kitAbuN
851% \arb[voc]{kitAbuN mubInuN} \arb[trans]{kitAbuN mubInuN}.% 850% mubInuN} \arb[trans]{kitAbuN mubInuN}.
852% \end{quote} 851% \end{quote}
853% \item With the letter \arb[voc]{t} after the dentals 852% \item With the letter \arb[voc]{t} after the dentals
854% \arb[novoc]{_t}, \arb[novoc]{d}, \arb[novoc]{_d}, \arb[novoc]{.d}, 853% \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
866% (\arb[trans]{'alifu 'l-wa.sli}), the \arb[trans]{hamzaT} is omitted 865% (\arb[trans]{'alifu 'l-wa.sli}), the \arb[trans]{hamzaT} is omitted
867% and only its accompanying vowel is expressed: 866% and only its accompanying vowel is expressed:
868% \begin{quote} 867% \begin{quote}
869% |al-.hamdu li-ll_ahi| \arb[fullvoc]{al-.hamdu li-ll_ahi} 868% |al-.hamdu| |li-l-l_ahi| \arb[fullvoc]{al-.hamdu li-l-l_ahi}
870% \arb[trans]{al-.hamdu li-ll_ahi}. 869% \arb[trans]{al-.hamdu li-l-l_ahi}.
871% \end{quote} 870% \end{quote}
872% As said above in section\vref{fullvoc-mode}, |fullvoc| is the mode 871% As said above in section\vref{fullvoc-mode}, |fullvoc| is the mode
873% in which \package{arabluatex} expresses the \arb[trans]{sukUn} and 872% in which \package{arabluatex} expresses the \arb[trans]{sukUn} and
@@ -1000,6 +999,37 @@ consonants, though three of them are also used as vowels
1000% \arb[trans]{\cap{m}u.hammaduN 'l-nabI}. 999% \arb[trans]{\cap{m}u.hammaduN 'l-nabI}.
1001% \end{quote} 1000% \end{quote}
1002% 1001%
1002% \subsection{Special orthographies}
1003% \paragraph{The name of God}
1004% The name of God, \arb[voc]{al-l_ahu}, is compounded of the article
1005% \arb[fullvoc]{al-}, and \arb[fullvoc]{'ilAhu} (noted
1006% \arb[fullvoc]{'il_ahu} with the defective \arb[trans]{'alif}) so
1007% that it becomes \arb[fullvoc]{al-'ilAhu}; then the
1008% \arb[trans]{hamzaT} is suppressed, its vowel being transferred to
1009% the \arb[novoc]{l} before it, so that there remains
1010% \arb[voc]{alil_ahu} \parencite[I refer to][I. 83
1011% col. 1]{Lane}. Finally, the first \arb[novoc]{l} is made quiescent
1012% and incorporated into the other, hence the \arb[trans]{ta^sdId}
1013% above it. As \package{arabluatex} never requires a solar letter to
1014% be written twice (see above, section\vref{euphonic-tashdid}), the
1015% name of God is therefore encoded |al-l_ahu| or |'l-l_ahu|:---
1016% \begin{quote}
1017% |al-l_ahu| \arb[fullvoc]{al-l_ahu} \arb[trans]{al-l_ahu},
1018% \verb+yA|+ |al-l_ahu| \arb[fullvoc]{yA| al-l_ahu} \arb[trans]{yA|
1019% al-l_ahu}, \verb+'a-fa|-al-l_ahi+ |la-ta.g`alanna|
1020% \arb[fullvoc]{'a-fa|-al-l_ahi la-ta.g`alanna}
1021% \arb[trans]{'a-fa|-al-l_ahi la-ta.g`alanna}, |bi-'l-l_ahi|
1022% \arb[fullvoc]{bi-'l-l_ahi} \arb[trans]{bi-'l-l_ahi}, |wa-'l-l_ahi|
1023% \arb[fullvoc]{wa-'l-l_ahi} \arb[trans]{wa-'l-l_ahi}, |bi-smi|
1024% |'l-l_ahi| \arb[fullvoc]{bi-smi 'l-l_ahi} \arb[trans]{bi-smi
1025% 'l-l_ahi}, |al-.hamdu| |li-l-l_ahi| \arb[fullvoc]{al-.hamdu
1026% li-l-l_ahi} \arb[trans]{al-.hamdu li-l-l_ahi}, |li-l-l_ahi|
1027% |'l-qA'ilu| \arb[fullvoc]{li-l-l_ahi 'l-qA'ilu}
1028% \arb[trans]{li-l-l_ahi 'l-qA'ilu}.
1029% \end{quote}
1030%
1031%
1032%
1003% \StopEventually{} 1033% \StopEventually{}
1004% 1034%
1005% \section{Implementation} 1035% \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
123 {a="(%s)'ll(a)([%_]?[dt])", b="%1ٱلّ%2%3"}, 123 {a="(%s)'ll(a)([%_]?[dt])", b="%1ٱلّ%2%3"},
124 -- al- + lām 124 -- al- + lām
125 {a="^(a)l%-(l)", b="ا%1ل%2%2"}, 125 {a="^(a)l%-(l)", b="ا%1ل%2%2"},
126 {a="(%s)(a)l%-(l)", b="%1ا%2ل%3%3"}, 126 {a="([%s%-])(a)l%-(l)", b="%1ا%2ل%3%3"},
127 -- al- + solar consonant 127 -- al- + solar consonant
128 {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="ا%1ل%2%2"}, 128 {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="ا%1ل%2%2"},
129 {a="(%s)(a)l%-([%_%^%.]?[tdrzsn])", b="%1ا%2ل%3%3"}, 129 {a="([%s%-])(a)l%-([%_%^%.]?[tdrzsn])", b="%1ا%2ل%3%3"},
130 -- assim. art. + solar consonant 130 -- assim. art. + solar consonant
131 {a="^(a)([%_%^%.]?[tdrzsn])%-", b="ا%1ل%2"}, 131 {a="^(a)([%_%^%.]?[tdrzsn])%-", b="ا%1ل%2"},
132 {a="(%s)(a)([%_%^%.]?[tdrzsn])%-", b="%1ا%2ل%3"}, 132 {a="([%s%-])(a)([%_%^%.]?[tdrzsn])%-", b="%1ا%2ل%3"},
133 -- al- + initial unstable hamza 133 -- al- + initial unstable hamza
134 {a="^(a)l%-([uai])", b="ا%1لٱ%2"}, 134 {a="^(a)l%-([uai])", b="ا%1لٱ%2"},
135 {a="(%s)(a)l%-([uai])", b="%1ا%2لٱ%3"}, 135 {a="([%s%-])(a)l%-([uai])", b="%1ا%2لٱ%3"},
136 -- li-/la + art. + initial unstable hamza is a special orthography 136 -- li-/la + art. + initial unstable hamza is a special orthography
137 {a="l([ai])%-l%-([uai])", b="ل%1لٱ%2"}, 137 {a="l([ai])%-l%-([uai])", b="ل%1لٱ%2"},
138 -- al- + lunar consonant (i.e. what remains) 138 -- al- + lunar consonant (i.e. what remains)
139 {a="^(a)l%-", b="ا%1لْ"}, 139 {a="^(a)l%-", b="ا%1لْ"},
140 {a="(%s)(a)l%-", b="%1ا%2لْ"}, 140 {a="([%s%-])(a)l%-", b="%1ا%2لْ"},
141 -- diphthongs to be resolved before ʾalif conjunctionis 141 -- diphthongs to be resolved before ʾalif conjunctionis
142 {a="(aW)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="awuا%2%3"}, 142 {a="(aW)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="awuا%2%3"},
143 {a="(aw)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1u%2%3"}, 143 {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
30 {a="(%s)'ll(a)([%_]?[dt])", b="%1ال%2%3"}, 30 {a="(%s)'ll(a)([%_]?[dt])", b="%1ال%2%3"},
31 -- al- + lām 31 -- al- + lām
32 {a="^(a)l%-(l)", b="ا%1ل%2"}, 32 {a="^(a)l%-(l)", b="ا%1ل%2"},
33 {a="(%s)(a)l%-(l)", b="%1ا%2ل%3"}, 33 {a="([%s%-])(a)l%-(l)", b="%1ا%2ل%3"},
34 -- al- + solar consonant 34 -- al- + solar consonant
35 {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="ا%1ل%2"}, 35 {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="ا%1ل%2"},
36 {a="(%s)(a)l%-([%_%^%.]?[tdrzsn])", b="%1ا%2ل%3"}, 36 {a="([%s%-])(a)l%-([%_%^%.]?[tdrzsn])", b="%1ا%2ل%3"},
37 -- assim. art. + solar consonant 37 -- assim. art. + solar consonant
38 {a="^(a)([%_%^%.]?[tdrzsn])%-", b="ا%1ل"}, 38 {a="^(a)([%_%^%.]?[tdrzsn])%-", b="ا%1ل"},
39 {a="(%s)(a)([%_%^%.]?[tdrzsn])%-", b="%1ا%2ل"}, 39 {a="([%s%-])(a)([%_%^%.]?[tdrzsn])%-", b="%1ا%2ل"},
40 -- al- + initial unstable hamza 40 -- al- + initial unstable hamza
41 {a="^(a)l%-([uai])", b="ا%1لا%2"}, 41 {a="^(a)l%-([uai])", b="ا%1لا%2"},
42 {a="(%s)(a)l%-([uai])", b="%1ا%2لا%3"}, 42 {a="([%s%-])(a)l%-([uai])", b="%1ا%2لا%3"},
43 -- li-/la- + art. + initial unstable hamza is a special orthography 43 -- li-/la- + art. + initial unstable hamza is a special orthography
44 {a="l([ai])%-l%-([uai])", b="ل%1لا%2"}, 44 {a="l([ai])%-l%-([uai])", b="ل%1لا%2"},
45 -- al- + lunar consonant (i.e. what remains) 45 -- al- + lunar consonant (i.e. what remains)
46 {a="^(a)l%-", b="ا%1ل"}, 46 {a="^(a)l%-", b="ا%1ل"},
47 {a="(%s)(a)l%-", b="%1ا%2ل"}, 47 {a="([%s%-])(a)l%-", b="%1ا%2ل"},
48 -- art. with waṣla + lām 48 -- art. with waṣla + lām
49 {a="'l%-(l)", b="ال%1"}, 49 {a="'l%-(l)", b="ال%1"},
50 -- art. with waṣla + solar consonant 50 -- 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
94 {a="(%s)'ll(a)([%_]?[dt])", b="%1'll%2%3"}, 94 {a="(%s)'ll(a)([%_]?[dt])", b="%1'll%2%3"},
95 -- al- + lām 95 -- al- + lām
96 {a="^(a)l%-(l)", b="%1l-%2"}, 96 {a="^(a)l%-(l)", b="%1l-%2"},
97 {a="(%s)(a)l%-(l)", b="%1%2l-%3"}, 97 {a="([%s%-])(a)l%-(l)", b="%1%2l-%3"},
98 -- al- + solar consonant 98 -- al- + solar consonant
99 {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="%1%2-%2"}, 99 {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="%1%2-%2"},
100 {a="(%s)(a)l%-([%_%^%.]?[tdrzsn])", b="%1%2%3-%3"}, 100 {a="([%s%-])(a)l%-([%_%^%.]?[tdrzsn])", b="%1%2%3-%3"},
101 -- assim. art. + solar consonant 101 -- assim. art. + solar consonant
102 {a="^(a)([%_%^%.]?[tdrzsn])%-", b="%1%2-"}, 102 {a="^(a)([%_%^%.]?[tdrzsn])%-", b="%1%2-"},
103 {a="(%s)(a)([%_%^%.]?[tdrzsn])%-", b="%1%2%3-"}, 103 {a="([%s%-])(a)([%_%^%.]?[tdrzsn])%-", b="%1%2%3-"},
104 -- al- + initial unstable hamza 104 -- al- + initial unstable hamza
105 {a="^(a)l%-([uai])", b="%1l-%2"}, 105 {a="^(a)l%-([uai])", b="%1l-%2"},
106 {a="(%s)(a)l%-([uai])", b="%1%2l-%3"}, 106 {a="([%s%-])(a)l%-([uai])", b="%1%2l-%3"},
107 -- li-/la- + art. + initial unstable hamza is a special orthography 107 -- li-/la- + art. + initial unstable hamza is a special orthography
108 {a="l([ai])%-l%-([uai])", b="l%1-l-%2"}, 108 {a="l([ai])%-l%-([uai])", b="l%1-l-%2"},
109 -- al- + lunar consonant (i.e. what remains) 109 -- al- + lunar consonant (i.e. what remains)
110 {a="^(a)l%-", b="%1l-"}, 110 {a="^(a)l%-", b="%1l-"},
111 {a="(%s)(a)l%-", b="%1%2l-"}, 111 {a="([%s%-])(a)l%-", b="%1%2l-"},
112 -- diphthongs to be resolved before ʾalif conjunctionis 112 -- diphthongs to be resolved before ʾalif conjunctionis
113 {a="(aw)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1u%2%3"}, 113 {a="(aw)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1u%2%3"},
114 {a="(ay)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1i%2%3"}, 114 {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
154 {a="(%s)'ll(a)([%_]?[dt])", b="%1الّ%2%3"}, 154 {a="(%s)'ll(a)([%_]?[dt])", b="%1الّ%2%3"},
155 -- al- + lām 155 -- al- + lām
156 {a="^(a)l%-(l)", b="ا%1ل%2%2"}, 156 {a="^(a)l%-(l)", b="ا%1ل%2%2"},
157 {a="(%s)(a)l%-(l)", b="%1ا%2ل%3%3"}, 157 {a="([%s%-])(a)l%-(l)", b="%1ا%2ل%3%3"},
158 -- al- + solar consonant 158 -- al- + solar consonant
159 {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="ا%1ل%2%2"}, 159 {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="ا%1ل%2%2"},
160 {a="(%s)(a)l%-([%_%^%.]?[tdrzsn])", b="%1ا%2ل%3%3"}, 160 {a="([%s%-])(a)l%-([%_%^%.]?[tdrzsn])", b="%1ا%2ل%3%3"},
161 -- assim. art. + solar consonant 161 -- assim. art. + solar consonant
162 {a="^(a)([%_%^%.]?[tdrzsn])%-", b="ا%1ل%2"}, 162 {a="^(a)([%_%^%.]?[tdrzsn])%-", b="ا%1ل%2"},
163 {a="(%s)(a)([%_%^%.]?[tdrzsn])%-", b="%1ا%2ل%3"}, 163 {a="([%s%-])(a)([%_%^%.]?[tdrzsn])%-", b="%1ا%2ل%3"},
164 -- al- + initial unstable hamza 164 -- al- + initial unstable hamza
165 {a="^(a)l%-([uai])", b="ا%1لا%2"}, 165 {a="^(a)l%-([uai])", b="ا%1لا%2"},
166 {a="(%s)(a)l%-([uai])", b="%1ا%2لا%3"}, 166 {a="([%s%-])(a)l%-([uai])", b="%1ا%2لا%3"},
167 -- li-/la- + art. + initial unstable hamza is a special orthography 167 -- li-/la- + art. + initial unstable hamza is a special orthography
168 {a="l([ai])%-l%-([uai])", b="ل%1لا%2"}, 168 {a="l([ai])%-l%-([uai])", b="ل%1لا%2"},
169 -- al- + lunar consonant (i.e. what remains) 169 -- al- + lunar consonant (i.e. what remains)
170 {a="^(a)l%-", b="ا%1ل"}, 170 {a="^(a)l%-", b="ا%1ل"},
171 {a="(%s)(a)l%-", b="%1ا%2ل"}, 171 {a="([%s%-])(a)l%-", b="%1ا%2ل"},
172 -- diphthongs to be resolved before ʾalif conjunctionis 172 -- diphthongs to be resolved before ʾalif conjunctionis
173 {a="(aW)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="awuا%2%3"}, 173 {a="(aW)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="awuا%2%3"},
174 {a="(aw)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1u%2%3"}, 174 {a="(aw)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1u%2%3"},