aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arabluatex_fullvoc.lua9
-rw-r--r--arabluatex_trans.lua19
-rw-r--r--arabluatex_voc.lua6
3 files changed, 32 insertions, 2 deletions
diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index 1129911..e6cdb42 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -138,6 +138,10 @@ trigraphsfv = { -- trigraphs or more
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
142 {a="(aW)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="awuا%2%3"},
143 {a="(aw)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1u%2%3"},
144 {a="(ay)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1i%2%3"},
141 -- art. with waṣla + lām 145 -- art. with waṣla + lām
142 {a="'l%-(l)", b="ٱل%1%1"}, 146 {a="'l%-(l)", b="ٱل%1%1"},
143 -- art. with waṣla + solar consonant 147 -- art. with waṣla + solar consonant
@@ -171,6 +175,10 @@ trigraphsfv = { -- trigraphs or more
171 175
172-- this is new 176-- this is new
173digraphsfv = { 177digraphsfv = {
178 -- diphthongs to be resolved before ʾalif conjunctionis
179 {a="(aW)(%s)([uai])", b="awuا%2ٱ"},
180 {a="(aw)(%s)([uai])", b="%1u%2ٱ"},
181 {a="(ay)(%s)([uai])", b="%1i%2ٱ"},
174 {a="([uai]%-)([uai])", b="%1ٱ"}, -- hyphen + initial alif without hamza 182 {a="([uai]%-)([uai])", b="%1ٱ"}, -- hyphen + initial alif without hamza
175 {a="([%_]?[uaiUAIY])(%s)([uai])", b="%1%2ٱ"}, -- initial alif without hamza 183 {a="([%_]?[uaiUAIY])(%s)([uai])", b="%1%2ٱ"}, -- initial alif without hamza
176 {a="^([uai])", b="ا%1"}, -- initial alif without hamza 184 {a="^([uai])", b="ا%1"}, -- initial alif without hamza
@@ -233,6 +241,7 @@ digraphsfv = {
233 {a="%.g", b="غ"}, 241 {a="%.g", b="غ"},
234 {a="(U)(A)", b="%1ا"}, 242 {a="(U)(A)", b="%1ا"},
235 {a="WA", b="وْا"}, 243 {a="WA", b="وْا"},
244 {a="(a)W\"", b="%1وا"},
236 {a="(a)W", b="%1وْا"}, 245 {a="(a)W", b="%1وْا"},
237 {a="_A", b="aى"}, 246 {a="_A", b="aى"},
238 {a="_u", b="ٗ"}, 247 {a="_u", b="ٗ"},
diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua
index f7274c1..cdcc654 100644
--- a/arabluatex_trans.lua
+++ b/arabluatex_trans.lua
@@ -109,6 +109,9 @@ trigraphstrdmg = { -- trigraphs or more
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
113 {a="(aw)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1u%2%3"},
114 {a="(ay)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1i%2%3"},
112 -- art. with waṣla + lām 115 -- art. with waṣla + lām
113 {a="'l%-(l)", b="'l-%1"}, 116 {a="'l%-(l)", b="'l-%1"},
114 -- art. with waṣla + solar consonant 117 -- art. with waṣla + solar consonant
@@ -144,6 +147,14 @@ tanwintrdmg = {
144 {a="uNU", b="un"}, 147 {a="uNU", b="un"},
145 {a="aNU", b="an"}, 148 {a="aNU", b="an"},
146 {a="iNU", b="in"}, 149 {a="iNU", b="in"},
150 -- tanwīn preceding ʾalif conjunctionis
151 {a="(uN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="uni%2%3"},
152 {a="(aN)(_A)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ani%3%4"},
153 {a="(aN)(Y)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ani%3%4"},
154 {a="(T)(aN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="tani%3%4"},
155 {a="([^TA])(aN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1ani%3%4"},
156 {a="(iN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ini%2%3"},
157 --
147 {a="uN", b="un"}, 158 {a="uN", b="un"},
148 {a="(aN)(_A)", b="an"}, 159 {a="(aN)(_A)", b="an"},
149 {a="(aN)(Y)", b="an"}, 160 {a="(aN)(Y)", b="an"},
@@ -155,12 +166,15 @@ tanwintrdmg = {
155digraphstrdmg = { 166digraphstrdmg = {
156 {a="([uai]%-)([uai])", b="%1'"}, -- hyphen + initial alif without hamza 167 {a="([uai]%-)([uai])", b="%1'"}, -- hyphen + initial alif without hamza
157 {a="^([uai])", b="%1"}, -- initial alif without hamza 168 {a="^([uai])", b="%1"}, -- initial alif without hamza
158-- {a="([%_]?[uaiUAIY])(%s)([uai])", b="%1%2'"}, -- initial alif without hamza 169-- {a="([%_]?[uaiUAIY])(%s)([uai])", b="%1%2'"}, -- initial alif without hamza
170 {a="(aW)(%s)([uai])", b="awu%2%3"},
159 {a="([^%_][uai])(%s)([uai])", b="%1%2'"}, 171 {a="([^%_][uai])(%s)([uai])", b="%1%2'"},
160 {a="([%_]?[AYa])(%s)([uai])", b="a%2'"}, 172 {a="([%_]?[AYa])(%s)([uai])", b="a%2'"},
161 {a="([%_]?[Uu])(%s)([uai])", b="u%2'"}, 173 {a="([%_]?[Uu])(%s)([uai])", b="u%2'"},
162 {a="([%_]?[Ii])(%s)([uai])", b="i%2'"}, 174 {a="([%_]?[Ii])(%s)([uai])", b="i%2'"},
163 -- shorten long vowels preceding ʾalif conjunctionis 175 -- shorten long vowels preceding ʾalif conjunctionis
176 {a="(U)(A)", b="U"},
177 {a="(aW)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="awu%2%3"},
164 {a="([%_]?[AYa])(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="a%2%3"}, 178 {a="([%_]?[AYa])(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="a%2%3"},
165 {a="([%_]?[Uu])(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="u%2%3"}, 179 {a="([%_]?[Uu])(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="u%2%3"},
166 {a="([%_]?[Ii])(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="i%2%3"}, 180 {a="([%_]?[Ii])(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="i%2%3"},
@@ -179,7 +193,8 @@ digraphstrdmg = {
179 {a="%.t", b="ṭ"}, 193 {a="%.t", b="ṭ"},
180 {a="%.z", b="ẓ"}, 194 {a="%.z", b="ẓ"},
181 {a="%.g", b="ġ"}, 195 {a="%.g", b="ġ"},
182 {a="(U)(A)", b="ū"}, 196 -- the following needs to be moved above shortening rules
197-- {a="(U)(A)", b="ū"},
183 {a="WA", b="w"}, 198 {a="WA", b="w"},
184 {a="(a)W", b="%1w"}, 199 {a="(a)W", b="%1w"},
185 {a="_A", b="ā"}, 200 {a="_A", b="ā"},
diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index b6dbd12..4d3c656 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -169,6 +169,10 @@ trigraphs = { -- trigraphs or more
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
173 {a="(aW)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="awuا%2%3"},
174 {a="(aw)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1u%2%3"},
175 {a="(ay)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1i%2%3"},
172 -- art. with waṣla + lām 176 -- art. with waṣla + lām
173 {a="'l%-(l)", b="ال%1%1"}, 177 {a="'l%-(l)", b="ال%1%1"},
174 -- art. with waṣla + solar consonant 178 -- art. with waṣla + solar consonant
@@ -224,6 +228,7 @@ tanwin = {
224} 228}
225 229
226digraphs = { 230digraphs = {
231 {a="(aW)(%s)([uai])", b="awuا%2%3"},
227 {a="(%-)([uai])", b="%1ا%2"}, -- hyphen + initial alif without hamza 232 {a="(%-)([uai])", b="%1ا%2"}, -- hyphen + initial alif without hamza
228 {a="^([uai])", b="ا%1"}, -- initial alif without hamza 233 {a="^([uai])", b="ا%1"}, -- initial alif without hamza
229 {a="(%s)([uai])", b="%1ا%2"}, -- initial alif without hamza 234 {a="(%s)([uai])", b="%1ا%2"}, -- initial alif without hamza
@@ -274,6 +279,7 @@ digraphs = {
274 {a="%.g", b="غ"}, 279 {a="%.g", b="غ"},
275 {a="(U)(A)", b="%1ا"}, 280 {a="(U)(A)", b="%1ا"},
276 {a="WA", b="وا"}, 281 {a="WA", b="وا"},
282 {a="(a)W\"", b="%1وْا"},
277 {a="(a)W", b="%1وا"}, 283 {a="(a)W", b="%1وا"},
278 {a="_A", b="aى"}, 284 {a="_A", b="aى"},
279 {a="_u", b="ٗ"}, 285 {a="_u", b="ٗ"},