aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Alessi <alessi@robertalessi.net>2017-07-28 11:15:18 +0200
committerRobert Alessi <alessi@robertalessi.net>2017-07-28 11:15:18 +0200
commitb6175aab1a47746d038a799ea1eb0586fb1621b1 (patch)
treedc6c605cf5f4a435be3756fbdde39633e8b06e8e
parentebd79c76eb6da4498c8b3f4854e990096734586c (diff)
downloadarabluatex-b6175aab1a47746d038a799ea1eb0586fb1621b1.tar.gz
modified 'voc' and 'trans' rules accordingly
-rw-r--r--arabluatex_trans.lua24
-rw-r--r--arabluatex_voc.lua28
2 files changed, 26 insertions, 26 deletions
diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua
index 404ae22..23ecf2c 100644
--- a/arabluatex_trans.lua
+++ b/arabluatex_trans.lua
@@ -136,15 +136,15 @@ hamzatrdmg = {
136 {a="(U)(')", b="%1ʾ"}, 136 {a="(U)(')", b="%1ʾ"},
137 {a="([Iy])(')", b="%1ʾ"}, 137 {a="([Iy])(')", b="%1ʾ"},
138 {a="([^uai])(')([uU])", b="%1ʾ%3"}, 138 {a="([^uai])(')([uU])", b="%1ʾ%3"},
139 {a="([^uai])(')([aA])", b="%1ʾ%3"}, 139 {a="([^uai])(')(%_?[aAY])", b="%1ʾ%3"},
140 {a="([^uai])(')([iI])", b="%1ʾ%3"}, 140 {a="([^uai])(')([iI])", b="%1ʾ%3"},
141 {a="(u)(')([uU])", b="%1ʾ%3"}, 141 {a="(u)(')([uU])", b="%1ʾ%3"},
142 {a="(u)(')([aA])", b="%1ʾ%3"}, 142 {a="(u)(')(%_?[aAY])", b="%1ʾ%3"},
143 {a="(u)(')([iI])", b="%1ʾ%3"}, 143 {a="(u)(')([iI])", b="%1ʾ%3"},
144 {a="(a)(')([aA])", b="%1ʾ%3"}, 144 {a="(a)(')(%_?[aAY])", b="%1ʾ%3"},
145 {a="(a)(')([uU])", b="%1ʾ%3"}, 145 {a="(a)(')([uU])", b="%1ʾ%3"},
146 {a="(a)(')([iI])", b="%1ʾ%3"}, 146 {a="(a)(')([iI])", b="%1ʾ%3"},
147 {a="(i)(')([aA])", b="%1ʾ%3"}, 147 {a="(i)(')(%_?[aAY])", b="%1ʾ%3"},
148 {a="(i)(')([uU])", b="%1ʾ%3"}, 148 {a="(i)(')([uU])", b="%1ʾ%3"},
149 {a="(i)(')([iI])", b="%1ʾ%3"}, 149 {a="(i)(')([iI])", b="%1ʾ%3"},
150 {a="(a)(')([^uaiUAI])", b="%1ʾ%3"}, 150 {a="(a)(')([^uaiUAI])", b="%1ʾ%3"},
@@ -505,15 +505,15 @@ hamzatrloc = {
505 {a="(U)(')", b="%1ʾ"}, 505 {a="(U)(')", b="%1ʾ"},
506 {a="([Iy])(')", b="%1ʾ"}, 506 {a="([Iy])(')", b="%1ʾ"},
507 {a="([^uai])(')([uU])", b="%1ʾ%3"}, 507 {a="([^uai])(')([uU])", b="%1ʾ%3"},
508 {a="([^uai])(')([aA])", b="%1ʾ%3"}, 508 {a="([^uai])(')(%_?[aAY])", b="%1ʾ%3"},
509 {a="([^uai])(')([iI])", b="%1ʾ%3"}, 509 {a="([^uai])(')([iI])", b="%1ʾ%3"},
510 {a="(u)(')([uU])", b="%1ʾ%3"}, 510 {a="(u)(')([uU])", b="%1ʾ%3"},
511 {a="(u)(')([aA])", b="%1ʾ%3"}, 511 {a="(u)(')(%_?[aAY])", b="%1ʾ%3"},
512 {a="(u)(')([iI])", b="%1ʾ%3"}, 512 {a="(u)(')([iI])", b="%1ʾ%3"},
513 {a="(a)(')([aA])", b="%1ʾ%3"}, 513 {a="(a)(')(%_?[aAY])", b="%1ʾ%3"},
514 {a="(a)(')([uU])", b="%1ʾ%3"}, 514 {a="(a)(')([uU])", b="%1ʾ%3"},
515 {a="(a)(')([iI])", b="%1ʾ%3"}, 515 {a="(a)(')([iI])", b="%1ʾ%3"},
516 {a="(i)(')([aA])", b="%1ʾ%3"}, 516 {a="(i)(')(%_?[aAY])", b="%1ʾ%3"},
517 {a="(i)(')([uU])", b="%1ʾ%3"}, 517 {a="(i)(')([uU])", b="%1ʾ%3"},
518 {a="(i)(')([iI])", b="%1ʾ%3"}, 518 {a="(i)(')([iI])", b="%1ʾ%3"},
519 {a="(a)(')([^uaiUAI])", b="%1ʾ%3"}, 519 {a="(a)(')([^uaiUAI])", b="%1ʾ%3"},
@@ -763,15 +763,15 @@ hamzatrarabica = { -- ≠ from hamzatrloc: initial hamza has to be held
763 {a="(U)(')", b="%1ʾ"}, 763 {a="(U)(')", b="%1ʾ"},
764 {a="([Iy])(')", b="%1ʾ"}, 764 {a="([Iy])(')", b="%1ʾ"},
765 {a="([^uai])(')([uU])", b="%1ʾ%3"}, 765 {a="([^uai])(')([uU])", b="%1ʾ%3"},
766 {a="([^uai])(')([aA])", b="%1ʾ%3"}, 766 {a="([^uai])(')(%_?[aAY])", b="%1ʾ%3"},
767 {a="([^uai])(')([iI])", b="%1ʾ%3"}, 767 {a="([^uai])(')([iI])", b="%1ʾ%3"},
768 {a="(u)(')([uU])", b="%1ʾ%3"}, 768 {a="(u)(')([uU])", b="%1ʾ%3"},
769 {a="(u)(')([aA])", b="%1ʾ%3"}, 769 {a="(u)(')(%_?[aAY])", b="%1ʾ%3"},
770 {a="(u)(')([iI])", b="%1ʾ%3"}, 770 {a="(u)(')([iI])", b="%1ʾ%3"},
771 {a="(a)(')([aA])", b="%1ʾ%3"}, 771 {a="(a)(')(%_?[aAY])", b="%1ʾ%3"},
772 {a="(a)(')([uU])", b="%1ʾ%3"}, 772 {a="(a)(')([uU])", b="%1ʾ%3"},
773 {a="(a)(')([iI])", b="%1ʾ%3"}, 773 {a="(a)(')([iI])", b="%1ʾ%3"},
774 {a="(i)(')([aA])", b="%1ʾ%3"}, 774 {a="(i)(')(%_?[aAY])", b="%1ʾ%3"},
775 {a="(i)(')([uU])", b="%1ʾ%3"}, 775 {a="(i)(')([uU])", b="%1ʾ%3"},
776 {a="(i)(')([iI])", b="%1ʾ%3"}, 776 {a="(i)(')([iI])", b="%1ʾ%3"},
777 {a="(a)(')([^uaiUAI])", b="%1ʾ%3"}, 777 {a="(a)(')([^uaiUAI])", b="%1ʾ%3"},
diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index ca1aa99..0913304 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -238,7 +238,7 @@ hamza = {
238-- u 238-- u
239 {a="(u)(')([uai]N?%p?)$", b="%1ؤ%3"}, 239 {a="(u)(')([uai]N?%p?)$", b="%1ؤ%3"},
240 {a="(u)(')([uai]N?)(%p?%s)", b="%1ؤ%3%4"}, 240 {a="(u)(')([uai]N?)(%p?%s)", b="%1ؤ%3%4"},
241 {a="(u)('%p?)$", b="%1ؤ"}, 241 {a="(u)(')(%p?)$", b="%1ؤ%3"},
242 {a="(u)(')(%p?%s)", b="%1ؤ%3"}, 242 {a="(u)(')(%p?%s)", b="%1ؤ%3"},
243-- a 243-- a
244 {a="(a)(')(A%p?)$", b="%1آ"}, 244 {a="(a)(')(A%p?)$", b="%1آ"},
@@ -251,27 +251,27 @@ hamza = {
251 {a="(a)(')(aN)(%p?%s)", b="%1أً%4"}, 251 {a="(a)(')(aN)(%p?%s)", b="%1أً%4"},
252 {a="(a)(')([i]N?%p?)$", b="%1إ%3"}, 252 {a="(a)(')([i]N?%p?)$", b="%1إ%3"},
253 {a="(a)(')([i]N?)(%p?%s)", b="%1إ%3%4"}, 253 {a="(a)(')([i]N?)(%p?%s)", b="%1إ%3%4"},
254 {a="(a)('%p?)$", b="%1أ"}, 254 {a="(a)(')(%p?)$", b="%1أ%3"},
255 {a="(a)(')(%p?%s)", b="%1أ%3"}, 255 {a="(a)(')(%p?%s)", b="%1أ%3"},
256-- i 256-- i
257 {a="(i)(')([uai]N?%p?)$", b="%1ئ%3"}, 257 {a="(i)(')([uai]N?%p?)$", b="%1ئ%3"},
258 {a="(i)(')([uai]N?)(%p?%s)", b="%1ئ%3%4"}, 258 {a="(i)(')([uai]N?)(%p?%s)", b="%1ئ%3%4"},
259 {a="(i)('%p?)$", b="%1ئ"}, 259 {a="(i)(')(%p?)$", b="%1ئ%3"},
260 {a="(i)(')(%p?%s)", b="%1ئ%3"}, 260 {a="(i)(')(%p?%s)", b="%1ئ%3"},
261-- 261--
262 -- middle 262 -- middle
263 {a="(U)(')", b="%1ء"}, 263 {a="(U)(')", b="%1ء"},
264 {a="([Iy])(')", b="%1ئ"}, 264 {a="([Iy])(')", b="%1ئ"},
265 {a="([^uai])(')([uU])", b="%1ؤ%3"}, 265 {a="([^uai])(')([uU])", b="%1ؤ%3"},
266 {a="([^uai])(')([aA])", b="%1أ%3"}, 266 {a="([^uai])(')(%_?[aAY])", b="%1أ%3"},
267 {a="([^uai])(')([iI])", b="%1ئ%3"}, 267 {a="([^uai])(')([iI])", b="%1ئ%3"},
268 {a="(u)(')([uU])", b="%1ؤ%3"}, 268 {a="(u)(')([uU])", b="%1ؤ%3"},
269 {a="(u)(')([aA])", b="%1ؤ%3"}, 269 {a="(u)(')(%_?[aAY])", b="%1ؤ%3"},
270 {a="(u)(')([iI])", b="%1ئ%3"}, 270 {a="(u)(')([iI])", b="%1ئ%3"},
271 {a="(a)(')([aA])", b="%1أ%3"}, 271 {a="(a)(')(%_?[aAY])", b="%1أ%3"},
272 {a="(a)(')([uU])", b="%1ؤ%3"}, 272 {a="(a)(')([uU])", b="%1ؤ%3"},
273 {a="(a)(')([iI])", b="%1ئ%3"}, 273 {a="(a)(')([iI])", b="%1ئ%3"},
274 {a="(i)(')([aA])", b="%1ئ%3"}, 274 {a="(i)(')(%_?[aAY])", b="%1ئ%3"},
275 {a="(i)(')([uU])", b="%1ئ%3"}, 275 {a="(i)(')([uU])", b="%1ئ%3"},
276 {a="(i)(')([iI])", b="%1ئ%3"}, 276 {a="(i)(')([iI])", b="%1ئ%3"},
277 {a="(a)(')([^uaiUAI])", b="%1أ%3"}, 277 {a="(a)(')([^uaiUAI])", b="%1أ%3"},
@@ -352,7 +352,7 @@ hamzaeasy = { -- differences marked below with 'easy'
352-- u 352-- u
353 {a="(u)(')([uai]N?%p?)$", b="%1ؤ%3"}, 353 {a="(u)(')([uai]N?%p?)$", b="%1ؤ%3"},
354 {a="(u)(')([uai]N?)(%p?%s)", b="%1ؤ%3%4"}, 354 {a="(u)(')([uai]N?)(%p?%s)", b="%1ؤ%3%4"},
355 {a="(u)('%p?)$", b="%1ؤ"}, 355 {a="(u)(')(%p?)$", b="%1ؤ%3"},
356 {a="(u)(')(%p?%s)", b="%1ؤ%3"}, 356 {a="(u)(')(%p?%s)", b="%1ؤ%3"},
357-- a 357-- a
358 {a="(a)(')(A%p?)$", b="%1آ"}, 358 {a="(a)(')(A%p?)$", b="%1آ"},
@@ -365,27 +365,27 @@ hamzaeasy = { -- differences marked below with 'easy'
365 {a="(a)(')(aN)(%p?%s)", b="%1أً%4"}, 365 {a="(a)(')(aN)(%p?%s)", b="%1أً%4"},
366 {a="(a)(')([i]N?%p?)$", b="%1إ%3"}, 366 {a="(a)(')([i]N?%p?)$", b="%1إ%3"},
367 {a="(a)(')([i]N?)(%p?%s)", b="%1إ%3%4"}, 367 {a="(a)(')([i]N?)(%p?%s)", b="%1إ%3%4"},
368 {a="(a)('%p?)$", b="%1أ"}, 368 {a="(a)(')(%p?)$", b="%1أ%3"},
369 {a="(a)(')(%p?%s)", b="%1أ%3"}, 369 {a="(a)(')(%p?%s)", b="%1أ%3"},
370-- i 370-- i
371 {a="(i)(')([uai]N?%p?)$", b="%1ئ%3"}, 371 {a="(i)(')([uai]N?%p?)$", b="%1ئ%3"},
372 {a="(i)(')([uai]N?)(%p?%s)", b="%1ئ%3%4"}, 372 {a="(i)(')([uai]N?)(%p?%s)", b="%1ئ%3%4"},
373 {a="(i)('%p?)$", b="%1ئ"}, 373 {a="(i)(')(%p?)$", b="%1ئ%3"},
374 {a="(i)(')(%p?%s)", b="%1ئ%3"}, 374 {a="(i)(')(%p?%s)", b="%1ئ%3"},
375-- 375--
376 -- middle 376 -- middle
377 {a="(U)(')", b="%1ء"}, 377 {a="(U)(')", b="%1ء"},
378 {a="([Iy])(')", b="%1ئ"}, 378 {a="([Iy])(')", b="%1ئ"},
379 {a="([^uai])(')([uU])", b="%1ؤ%3"}, 379 {a="([^uai])(')([uU])", b="%1ؤ%3"},
380 {a="([^uai])(')([aA])", b="%1أ%3"}, 380 {a="([^uai])(')(%_?[aAY])", b="%1أ%3"},
381 {a="([^uai])(')([iI])", b="%1ئ%3"}, 381 {a="([^uai])(')([iI])", b="%1ئ%3"},
382 {a="(u)(')([uU])", b="%1ؤ%3"}, 382 {a="(u)(')([uU])", b="%1ؤ%3"},
383 {a="(u)(')([aA])", b="%1ؤ%3"}, 383 {a="(u)(')(%_?[aAY])", b="%1ؤ%3"},
384 {a="(u)(')([iI])", b="%1ئ%3"}, 384 {a="(u)(')([iI])", b="%1ئ%3"},
385 {a="(a)(')([aA])", b="%1أ%3"}, 385 {a="(a)(')(%_?[aAY])", b="%1أ%3"},
386 {a="(a)(')([uU])", b="%1ؤ%3"}, 386 {a="(a)(')([uU])", b="%1ؤ%3"},
387 {a="(a)(')([iI])", b="%1ئ%3"}, 387 {a="(a)(')([iI])", b="%1ئ%3"},
388 {a="(i)(')([aA])", b="%1ئ%3"}, 388 {a="(i)(')(%_?[aAY])", b="%1ئ%3"},
389 {a="(i)(')([uU])", b="%1ئ%3"}, 389 {a="(i)(')([uU])", b="%1ئ%3"},
390 {a="(i)(')([iI])", b="%1ئ%3"}, 390 {a="(i)(')([iI])", b="%1ئ%3"},
391 {a="(a)(')([^uaiUAI])", b="%1أ%3"}, 391 {a="(a)(')([^uaiUAI])", b="%1أ%3"},