From 2188e8c67c74a7615d16dd072b80c412471b3496 Mon Sep 17 00:00:00 2001 From: Robert Alessi Date: Sat, 24 Dec 2016 11:24:53 +0100 Subject: a bit of tidy-up in the code --- arabluatex_fullvoc.lua | 18 +++++++++--------- arabluatex_voc.lua | 2 +- 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 = { -- hyphen + initial alif without hamza -- {a="([uai]%-)(\"?[uai])", b="%1ٱ"}, {a="([uai]%-)(\"?[uai])([%^%_%.%`]?)(%a)", b="%1ٱ%3%4"}, - -- initial alif without hamza + -- initial alif without hamza (next 4 lines) {a="(o[%S]-)([uaiUAIY])(o)(\"?[uai])", b="ٱ"}, {a="([%_]?[uaiUAIY])(%s[%(%[%|%<]?)(\"?[uai])", b="%1%2ٱ"}, --p - {a="^([%(%[%|%<]?)(\"?[uai])", b="%1ا%2"}, -- initial alif without hamza --p - {a="(%s)([%(%[%|%<]?)(\"?[uai])", b="%1%2ا%3"}, -- initial alif without hamza --p + {a="^([%(%[%|%<]?)(\"?[uai])", b="%1ا%2"}, --p + {a="(%s)([%(%[%|%<]?)(\"?[uai])", b="%1%2ا%3"}, --p {a="%-%-", b="ـ"}, {a="ؤؤ", b="ؤّ"}, {a="أأ", b="أّ"}, @@ -597,11 +597,11 @@ digraphsfv = { -- hyphen + initial alif without hamza -- {a="([uai]%-)(\"?[uai])", b="%1ٱ"}, {a="([uai]%-)(\"?[uai])([%^%_%.%`]?)(%a)", b="%1ٱ%3%4"}, - -- initial alif without hamza + -- initial alif without hamza (next 4 lines) {a="(o[%S]-)([uaiUAIY])(o)(\"?[uai])", b="ٱ"}, {a="([%_]?[uaiUAIY])(%s[%(%[%|%<]?)(\"?[uai])", b="%1%2ٱ"}, --p - {a="^([%(%[%|%<]?)(\"?[uai])", b="%1ا%2"}, -- initial alif without hamza --p - {a="(%s)([%(%[%|%<]?)(\"?[uai])", b="%1%2ا%3"}, -- initial alif without hamza --p + {a="^([%(%[%|%<]?)(\"?[uai])", b="%1ا%2"}, --p + {a="(%s)([%(%[%|%<]?)(\"?[uai])", b="%1%2ا%3"}, --p {a="%-%-", b="ـ"}, {a="ؤؤ", b="ؤّ"}, {a="أأ", b="أّ"}, @@ -705,11 +705,11 @@ digraphsfveasy = { -- see the differences under 'easy' marker below -- hyphen + initial alif without hamza -- {a="([uai]%-)(\"?[uai])", b="%1ٱ"}, {a="([uai]%-)(\"?[uai])([%^%_%.%`]?)(%a)", b="%1ٱ%3%4"}, - -- initial alif without hamza + -- initial alif without hamza (next 4 lines) {a="(o[%S]-)([uaiUAIY])(o)(\"?[uai])", b="ٱ"}, {a="([%_]?[uaiUAIY])(%s[%(%[%|%<]?)(\"?[uai])", b="%1%2ٱ"}, --p - {a="^([%(%[%|%<]?)(\"?[uai])", b="%1ا%2"}, -- initial alif without hamza --p - {a="(%s)([%(%[%|%<]?)(\"?[uai])", b="%1%2ا%3"}, -- initial alif without hamza --p + {a="^([%(%[%|%<]?)(\"?[uai])", b="%1ا%2"}, --p + {a="(%s)([%(%[%|%<]?)(\"?[uai])", b="%1%2ا%3"}, --p {a="%-%-", b="ـ"}, {a="ؤؤ", b="ؤّ"}, {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' {a="(A)(')", b="aاء"}, -- historic madda --easy (end) -- initial (needs both ^ and %W patterns) - -- 'aw: the diphthong is to be resoved into 'awi' (next 8 lines) + -- 'aw: the diphthong is to be resolved into 'awi' (next 8 lines) {a="^('aw)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-o)", b="%1i"}, {a="(%W)('aw)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-o)", b="%1%2i"}, {a="^('aw)(o)(\"?[uai])([%S]-o)", b="%1i"}, -- cgit v1.2.3