aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arabluatex_fullvoc.lua100
-rw-r--r--arabluatex_voc.lua4
2 files changed, 54 insertions, 50 deletions
diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index d5ca11a..7f9d476 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -39,18 +39,18 @@ hamzafv = {
39 {a="i\"'", b="إ"}, 39 {a="i\"'", b="إ"},
40 {a="y\"'", b="ئ"}, 40 {a="y\"'", b="ئ"},
41 -- moved below (end of 'final' section) 41 -- moved below (end of 'final' section)
42 -- {a="ؤ([^uaiUAI])", b="ؤْ%1"}, 42 {a="ؤ([^uaiUAI])", b="ؤْ%1"},
43 -- {a="ؤ(%p*)$", b="ؤْ%1"}, 43 {a="ؤ(%p*)$", b="ؤْ%1"},
44 -- {a="ؤ(%p*%s)", b="ؤْ%1"}, 44 {a="ؤ(%p*%s)", b="ؤْ%1"},
45 -- {a="أ([^uaiUAI])", b="أْ%1"}, 45 {a="أ([^uaiUAI])", b="أْ%1"},
46 -- {a="أ(%p*)$", b="أْ%1"}, 46 {a="أ(%p*)$", b="أْ%1"},
47 -- {a="أ(%p*%s)", b="أْ%1"}, 47 {a="أ(%p*%s)", b="أْ%1"},
48 -- {a="ئ([^uaiUAI])", b="ئْ%1"}, 48 {a="ئ([^uaiUAI])", b="ئْ%1"},
49 -- {a="ئ(%p*)$", b="ئْ%1"}, 49 {a="ئ(%p*)$", b="ئْ%1"},
50 -- {a="ئ(%p*%s)", b="ئْ%1"}, 50 {a="ئ(%p*%s)", b="ئْ%1"},
51 -- {a="ء([^uaiUAI])", b="ءْ%1"}, 51 {a="ء([^uaiUAI])", b="ءْ%1"},
52 -- {a="ء(%p*)$", b="ءْ%1"}, 52 {a="ء(%p*)$", b="ءْ%1"},
53 -- {a="ء(%p*%s)", b="ءْ%1"}, 53 {a="ء(%p*%s)", b="ءْ%1"},
54 -- hamza takes tašdīd too 54 -- hamza takes tašdīd too
55 {a="''([Uu])", b="ؤؤ%1"}, 55 {a="''([Uu])", b="ؤؤ%1"},
56 {a="''([Aa])", b="أأ%1"}, 56 {a="''([Aa])", b="أأ%1"},
@@ -133,19 +133,21 @@ hamzafv = {
133 {a="(i)(')([uai]N?)(%p*%s)", b="%1ئ%3%4"}, 133 {a="(i)(')([uai]N?)(%p*%s)", b="%1ئ%3%4"},
134 {a="(i)(')(%p*)$", b="%1ئْ%3"}, 134 {a="(i)(')(%p*)$", b="%1ئْ%3"},
135 {a="(i)(')(%p*%s)", b="%1ئْ%3"}, 135 {a="(i)(')(%p*%s)", b="%1ئْ%3"},
136-- the following was wrong for it broke the taḫfīfu 'l-hamzati
137-- (look into this later):
136-- moved here from above: 138-- moved here from above:
137 {a="ؤ([^uaiUAI])", b="ؤْ%1"}, 139 -- {a="ؤ([^uaiUAI])", b="ؤْ%1"},
138 {a="ؤ(%p*)$", b="ؤْ%1"}, 140 -- {a="ؤ(%p*)$", b="ؤْ%1"},
139 {a="ؤ(%p*%s)", b="ؤْ%1"}, 141 -- {a="ؤ(%p*%s)", b="ؤْ%1"},
140 {a="أ([^uaiUAI])", b="أْ%1"}, 142 -- {a="أ([^uaiUAI])", b="أْ%1"},
141 {a="أ(%p*)$", b="أْ%1"}, 143 -- {a="أ(%p*)$", b="أْ%1"},
142 {a="أ(%p*%s)", b="أْ%1"}, 144 -- {a="أ(%p*%s)", b="أْ%1"},
143 {a="ئ([^uaiUAI])", b="ئْ%1"}, 145 -- {a="ئ([^uaiUAI])", b="ئْ%1"},
144 {a="ئ(%p*)$", b="ئْ%1"}, 146 -- {a="ئ(%p*)$", b="ئْ%1"},
145 {a="ئ(%p*%s)", b="ئْ%1"}, 147 -- {a="ئ(%p*%s)", b="ئْ%1"},
146 {a="ء([^uaiUAI])", b="ءْ%1"}, 148 -- {a="ء([^uaiUAI])", b="ءْ%1"},
147 {a="ء(%p*)$", b="ءْ%1"}, 149 -- {a="ء(%p*)$", b="ءْ%1"},
148 {a="ء(%p*%s)", b="ءْ%1"}, 150 -- {a="ء(%p*%s)", b="ءْ%1"},
149 -- middle 151 -- middle
150 {a="([UIwy])(')", b="%1ء"}, --new 152 {a="([UIwy])(')", b="%1ء"}, --new
151 -- {a="([Iy])(')", b="%1ئ"}, --included in the above line 153 -- {a="([Iy])(')", b="%1ئ"}, --included in the above line
@@ -187,18 +189,18 @@ hamzafveasy = { -- differences marked below with 'easy'
187 {a="i\"'", b="إ"}, 189 {a="i\"'", b="إ"},
188 {a="y\"'", b="ئ"}, 190 {a="y\"'", b="ئ"},
189 -- moved below (end of 'final' section) 191 -- moved below (end of 'final' section)
190 -- {a="ؤ([^uaiUAI])", b="ؤْ%1"}, 192 {a="ؤ([^uaiUAI])", b="ؤْ%1"},
191 -- {a="ؤ(%p*)$", b="ؤْ%1"}, 193 {a="ؤ(%p*)$", b="ؤْ%1"},
192 -- {a="ؤ(%p*%s)", b="ؤْ%1"}, 194 {a="ؤ(%p*%s)", b="ؤْ%1"},
193 -- {a="أ([^uaiUAI])", b="أْ%1"}, 195 {a="أ([^uaiUAI])", b="أْ%1"},
194 -- {a="أ(%p*)$", b="أْ%1"}, 196 {a="أ(%p*)$", b="أْ%1"},
195 -- {a="أ(%p*%s)", b="أْ%1"}, 197 {a="أ(%p*%s)", b="أْ%1"},
196 -- {a="ئ([^uaiUAI])", b="ئْ%1"}, 198 {a="ئ([^uaiUAI])", b="ئْ%1"},
197 -- {a="ئ(%p*)$", b="ئْ%1"}, 199 {a="ئ(%p*)$", b="ئْ%1"},
198 -- {a="ئ(%p*%s)", b="ئْ%1"}, 200 {a="ئ(%p*%s)", b="ئْ%1"},
199 -- {a="ء([^uaiUAI])", b="ءْ%1"}, 201 {a="ء([^uaiUAI])", b="ءْ%1"},
200 -- {a="ء(%p*)$", b="ءْ%1"}, 202 {a="ء(%p*)$", b="ءْ%1"},
201 -- {a="ء(%p*%s)", b="ءْ%1"}, 203 {a="ء(%p*%s)", b="ءْ%1"},
202 -- hamza takes tašdīd too 204 -- hamza takes tašdīd too
203 {a="''([Uu])", b="ؤؤ%1"}, 205 {a="''([Uu])", b="ؤؤ%1"},
204 {a="''([Aa])", b="أأ%1"}, 206 {a="''([Aa])", b="أأ%1"},
@@ -293,19 +295,21 @@ hamzafveasy = { -- differences marked below with 'easy'
293 {a="(i)(')([uai]N?)(%p*%s)", b="%1ئ%3%4"}, 295 {a="(i)(')([uai]N?)(%p*%s)", b="%1ئ%3%4"},
294 {a="(i)(')(%p*)$", b="%1ئْ%3"}, 296 {a="(i)(')(%p*)$", b="%1ئْ%3"},
295 {a="(i)(')(%p*%s)", b="%1ئْ%3"}, 297 {a="(i)(')(%p*%s)", b="%1ئْ%3"},
298-- the following was wrong for it broke the taḫfīfu 'l-hamzati
299-- (look into this later):
296-- moved here from above: 300-- moved here from above:
297 {a="ؤ([^uaiUAI])", b="ؤْ%1"}, 301 -- {a="ؤ([^uaiUAI])", b="ؤْ%1"},
298 {a="ؤ(%p*)$", b="ؤْ%1"}, 302 -- {a="ؤ(%p*)$", b="ؤْ%1"},
299 {a="ؤ(%p*%s)", b="ؤْ%1"}, 303 -- {a="ؤ(%p*%s)", b="ؤْ%1"},
300 {a="أ([^uaiUAI])", b="أْ%1"}, 304 -- {a="أ([^uaiUAI])", b="أْ%1"},
301 {a="أ(%p*)$", b="أْ%1"}, 305 -- {a="أ(%p*)$", b="أْ%1"},
302 {a="أ(%p*%s)", b="أْ%1"}, 306 -- {a="أ(%p*%s)", b="أْ%1"},
303 {a="ئ([^uaiUAI])", b="ئْ%1"}, 307 -- {a="ئ([^uaiUAI])", b="ئْ%1"},
304 {a="ئ(%p*)$", b="ئْ%1"}, 308 -- {a="ئ(%p*)$", b="ئْ%1"},
305 {a="ئ(%p*%s)", b="ئْ%1"}, 309 -- {a="ئ(%p*%s)", b="ئْ%1"},
306 {a="ء([^uaiUAI])", b="ءْ%1"}, 310 -- {a="ء([^uaiUAI])", b="ءْ%1"},
307 {a="ء(%p*)$", b="ءْ%1"}, 311 -- {a="ء(%p*)$", b="ءْ%1"},
308 {a="ء(%p*%s)", b="ءْ%1"}, 312 -- {a="ء(%p*%s)", b="ءْ%1"},
309-- 313--
310 -- middle 314 -- middle
311 {a="([Uw])(')", b="%1ء"}, --new 315 {a="([Uw])(')", b="%1ء"}, --new
diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index 9b2a31c..995e9b3 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -202,7 +202,7 @@ hamza = {
202 -- taḫfīfu 'l-hamza 202 -- taḫfīfu 'l-hamza
203 {a="'u'([^uaiUAI])", b="أU%1"}, 203 {a="'u'([^uaiUAI])", b="أU%1"},
204 {a="'i'([^uaiUAI])", b="إI%1"}, 204 {a="'i'([^uaiUAI])", b="إI%1"},
205 {a="([wf]a)%-\'([^uaiUAIl][^%-])", b="%1أْ%2"}, 205 {a="([wf]a)%-\'([^uaiUAIl][^%-])", b="%1أ%2"},
206 {a="^u'([^uaiUAI])", b="اU%1"}, 206 {a="^u'([^uaiUAI])", b="اU%1"},
207 {a="([^uaiUAIYN][%s%(%[%<])u'([^uaiUAI])", b="%1اU%2"}, 207 {a="([^uaiUAIYN][%s%(%[%<])u'([^uaiUAI])", b="%1اU%2"},
208 {a="^i'([^uaiUAI])", b="اI%1"}, 208 {a="^i'([^uaiUAI])", b="اI%1"},
@@ -325,7 +325,7 @@ hamzaeasy = { -- differences marked below with 'easy'
325 -- taḫfīfu 'l-hamza 325 -- taḫfīfu 'l-hamza
326 {a="'u'([^uaiUAI])", b="أU%1"}, 326 {a="'u'([^uaiUAI])", b="أU%1"},
327 {a="'i'([^uaiUAI])", b="إI%1"}, 327 {a="'i'([^uaiUAI])", b="إI%1"},
328 {a="([wf]a)%-\'([^uaiUAIl][^%-])", b="%1أْ%2"}, 328 {a="([wf]a)%-\'([^uaiUAIl][^%-])", b="%1أ%2"},
329 {a="^u'([^uaiUAI])", b="اU%1"}, 329 {a="^u'([^uaiUAI])", b="اU%1"},
330 {a="([^uaiUAIYN][%s%(%[%<])u'([^uaiUAI])", b="%1اU%2"}, 330 {a="([^uaiUAIYN][%s%(%[%<])u'([^uaiUAI])", b="%1اU%2"},
331 {a="^i'([^uaiUAI])", b="اI%1"}, 331 {a="^i'([^uaiUAI])", b="اI%1"},