aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Alessi <alessi@robertalessi.net>2016-12-24 11:24:53 +0100
committerRobert Alessi <alessi@robertalessi.net>2016-12-24 11:24:53 +0100
commit2188e8c67c74a7615d16dd072b80c412471b3496 (patch)
treeb875ab572adde64294caaa3b308a39e57c191229
parent76a796b5a80d1cb0e63ddbbf00d9dc9507e92dfb (diff)
downloadarabluatex-2188e8c67c74a7615d16dd072b80c412471b3496.tar.gz
a bit of tidy-up in the code
-rw-r--r--arabluatex_fullvoc.lua18
-rw-r--r--arabluatex_voc.lua2
2 files changed, 10 insertions, 10 deletions
diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index 32f53f7..0b558df 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -489,11 +489,11 @@ digraphsfvidgham = {
489 -- hyphen + initial alif without hamza 489 -- hyphen + initial alif without hamza
490 -- {a="([uai]%-)(\"?[uai])", b="%1ٱ"}, 490 -- {a="([uai]%-)(\"?[uai])", b="%1ٱ"},
491 {a="([uai]%-)(\"?[uai])([%^%_%.%`]?)(%a)", b="%1ٱ%3%4"}, 491 {a="([uai]%-)(\"?[uai])([%^%_%.%`]?)(%a)", b="%1ٱ%3%4"},
492 -- initial alif without hamza 492 -- initial alif without hamza (next 4 lines)
493 {a="(o[%S]-)([uaiUAIY])(o)(\"?[uai])", b="ٱ"}, 493 {a="(o[%S]-)([uaiUAIY])(o)(\"?[uai])", b="ٱ"},
494 {a="([%_]?[uaiUAIY])(%s[%(%[%|%<]?)(\"?[uai])", b="%1%2ٱ"}, --p 494 {a="([%_]?[uaiUAIY])(%s[%(%[%|%<]?)(\"?[uai])", b="%1%2ٱ"}, --p
495 {a="^([%(%[%|%<]?)(\"?[uai])", b="%1ا%2"}, -- initial alif without hamza --p 495 {a="^([%(%[%|%<]?)(\"?[uai])", b="%1ا%2"}, --p
496 {a="(%s)([%(%[%|%<]?)(\"?[uai])", b="%1%2ا%3"}, -- initial alif without hamza --p 496 {a="(%s)([%(%[%|%<]?)(\"?[uai])", b="%1%2ا%3"}, --p
497 {a="%-%-", b="ـ"}, 497 {a="%-%-", b="ـ"},
498 {a="ؤؤ", b="ؤّ"}, 498 {a="ؤؤ", b="ؤّ"},
499 {a="أأ", b="أّ"}, 499 {a="أأ", b="أّ"},
@@ -597,11 +597,11 @@ digraphsfv = {
597 -- hyphen + initial alif without hamza 597 -- hyphen + initial alif without hamza
598 -- {a="([uai]%-)(\"?[uai])", b="%1ٱ"}, 598 -- {a="([uai]%-)(\"?[uai])", b="%1ٱ"},
599 {a="([uai]%-)(\"?[uai])([%^%_%.%`]?)(%a)", b="%1ٱ%3%4"}, 599 {a="([uai]%-)(\"?[uai])([%^%_%.%`]?)(%a)", b="%1ٱ%3%4"},
600 -- initial alif without hamza 600 -- initial alif without hamza (next 4 lines)
601 {a="(o[%S]-)([uaiUAIY])(o)(\"?[uai])", b="ٱ"}, 601 {a="(o[%S]-)([uaiUAIY])(o)(\"?[uai])", b="ٱ"},
602 {a="([%_]?[uaiUAIY])(%s[%(%[%|%<]?)(\"?[uai])", b="%1%2ٱ"}, --p 602 {a="([%_]?[uaiUAIY])(%s[%(%[%|%<]?)(\"?[uai])", b="%1%2ٱ"}, --p
603 {a="^([%(%[%|%<]?)(\"?[uai])", b="%1ا%2"}, -- initial alif without hamza --p 603 {a="^([%(%[%|%<]?)(\"?[uai])", b="%1ا%2"}, --p
604 {a="(%s)([%(%[%|%<]?)(\"?[uai])", b="%1%2ا%3"}, -- initial alif without hamza --p 604 {a="(%s)([%(%[%|%<]?)(\"?[uai])", b="%1%2ا%3"}, --p
605 {a="%-%-", b="ـ"}, 605 {a="%-%-", b="ـ"},
606 {a="ؤؤ", b="ؤّ"}, 606 {a="ؤؤ", b="ؤّ"},
607 {a="أأ", b="أّ"}, 607 {a="أأ", b="أّ"},
@@ -705,11 +705,11 @@ digraphsfveasy = { -- see the differences under 'easy' marker below
705 -- hyphen + initial alif without hamza 705 -- hyphen + initial alif without hamza
706 -- {a="([uai]%-)(\"?[uai])", b="%1ٱ"}, 706 -- {a="([uai]%-)(\"?[uai])", b="%1ٱ"},
707 {a="([uai]%-)(\"?[uai])([%^%_%.%`]?)(%a)", b="%1ٱ%3%4"}, 707 {a="([uai]%-)(\"?[uai])([%^%_%.%`]?)(%a)", b="%1ٱ%3%4"},
708 -- initial alif without hamza 708 -- initial alif without hamza (next 4 lines)
709 {a="(o[%S]-)([uaiUAIY])(o)(\"?[uai])", b="ٱ"}, 709 {a="(o[%S]-)([uaiUAIY])(o)(\"?[uai])", b="ٱ"},
710 {a="([%_]?[uaiUAIY])(%s[%(%[%|%<]?)(\"?[uai])", b="%1%2ٱ"}, --p 710 {a="([%_]?[uaiUAIY])(%s[%(%[%|%<]?)(\"?[uai])", b="%1%2ٱ"}, --p
711 {a="^([%(%[%|%<]?)(\"?[uai])", b="%1ا%2"}, -- initial alif without hamza --p 711 {a="^([%(%[%|%<]?)(\"?[uai])", b="%1ا%2"}, --p
712 {a="(%s)([%(%[%|%<]?)(\"?[uai])", b="%1%2ا%3"}, -- initial alif without hamza --p 712 {a="(%s)([%(%[%|%<]?)(\"?[uai])", b="%1%2ا%3"}, --p
713 {a="%-%-", b="ـ"}, 713 {a="%-%-", b="ـ"},
714 {a="ؤؤ", b="ؤّ"}, 714 {a="ؤؤ", b="ؤّ"},
715 {a="أأ", b="أّ"}, 715 {a="أأ", b="أّ"},
diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index 57ab34c..a17a453 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -303,7 +303,7 @@ hamzaeasy = { -- differences marked below with 'easy'
303 {a="(A)(')", b="aاء"}, -- historic madda 303 {a="(A)(')", b="aاء"}, -- historic madda
304 --easy (end) 304 --easy (end)
305 -- initial (needs both ^ and %W patterns) 305 -- initial (needs both ^ and %W patterns)
306 -- 'aw: the diphthong is to be resoved into 'awi' (next 8 lines) 306 -- 'aw: the diphthong is to be resolved into 'awi' (next 8 lines)
307 {a="^('aw)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-o)", b="%1i"}, 307 {a="^('aw)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-o)", b="%1i"},
308 {a="(%W)('aw)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-o)", b="%1%2i"}, 308 {a="(%W)('aw)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-o)", b="%1%2i"},
309 {a="^('aw)(o)(\"?[uai])([%S]-o)", b="%1i"}, 309 {a="^('aw)(o)(\"?[uai])([%S]-o)", b="%1i"},