From 1d2205ff9fe21d21088f9b0c003751da52d0d9ea Mon Sep 17 00:00:00 2001 From: Robert Alessi Date: Tue, 6 Dec 2016 10:50:26 +0100 Subject: =?UTF-8?q?added=20punctuation=20characters=20before=20the=20initi?= =?UTF-8?q?al=20=CA=BEalif=20in=20digraphs=20rules=20as=20well?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arabluatex_fullvoc.lua | 12 ++++++------ arabluatex_voc.lua | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua index 22c3ac4..bb928e4 100644 --- a/arabluatex_fullvoc.lua +++ b/arabluatex_fullvoc.lua @@ -416,7 +416,7 @@ digraphsfvidgham = { -- ʾiʿrāb (end) -- initial straight double quote gives a connective ʾalif {a="^\"[uai]", b="ٱ"}, - {a="([%s%-])\"[uai]", b="%1ٱ"}, + {a="([%p%s%-])\"[uai]", b="%1ٱ"}, --p -- diphthongs to be resolved before ʾalif conjunctionis {a="(aW)(%s)(\"?[uai])", b="awuا%2ٱ"}, {a="(aw)(%s)(\"?[uai])", b="%1u%2ٱ"}, @@ -425,7 +425,7 @@ digraphsfvidgham = { -- initial alif without hamza {a="([%_]?[uaiUAIY])(%s)(\"?[uai])", b="%1%2ٱ"}, {a="^([uai])", b="ا%1"}, -- initial alif without hamza - {a="(%s)([uai])", b="%1ا%2"}, -- initial alif without hamza + {a="([%p%s])([uai])", b="%1ا%2"}, -- initial alif without hamza --p {a="%-%-", b="ـ"}, {a="ؤؤ", b="ؤّ"}, {a="أأ", b="أّ"}, @@ -518,7 +518,7 @@ digraphsfv = { -- ʾiʿrāb (end) -- initial straight double quote gives a connective ʾalif {a="^\"[uai]", b="ٱ"}, - {a="([%s%-])\"[uai]", b="%1ٱ"}, + {a="([%p%s%-])\"[uai]", b="%1ٱ"}, --p -- diphthongs to be resolved before ʾalif conjunctionis {a="(aW)(%s)(\"?[uai])", b="awuا%2ٱ"}, {a="(aw)(%s)(\"?[uai])", b="%1u%2ٱ"}, @@ -527,7 +527,7 @@ digraphsfv = { -- initial alif without hamza {a="([%_]?[uaiUAIY])(%s)(\"?[uai])", b="%1%2ٱ"}, {a="^([uai])", b="ا%1"}, -- initial alif without hamza - {a="(%s)([uai])", b="%1ا%2"}, -- initial alif without hamza + {a="([%p%s])([uai])", b="%1ا%2"}, -- initial alif without hamza --p {a="%-%-", b="ـ"}, {a="ؤؤ", b="ؤّ"}, {a="أأ", b="أّ"}, @@ -620,7 +620,7 @@ digraphsfveasy = { -- see the differences under 'easy' marker below -- ʾiʿrāb (end) -- initial straight double quote gives a connective ʾalif {a="^\"[uai]", b="ٱ"}, - {a="([%s%-])\"[uai]", b="%1ٱ"}, + {a="([%p%s%-])\"[uai]", b="%1ٱ"}, --p -- diphthongs to be resolved before ʾalif conjunctionis {a="(aW)(%s)(\"?[uai])", b="awuا%2ٱ"}, {a="(aw)(%s)(\"?[uai])", b="%1u%2ٱ"}, @@ -629,7 +629,7 @@ digraphsfveasy = { -- see the differences under 'easy' marker below -- initial alif without hamza {a="([%_]?[uaiUAIY])(%s)(\"?[uai])", b="%1%2ٱ"}, {a="^([uai])", b="ا%1"}, -- initial alif without hamza - {a="(%s)([uai])", b="%1ا%2"}, -- initial alif without hamza + {a="([%p%s])([uai])", b="%1ا%2"}, -- initial alif without hamza --p {a="%-%-", b="ـ"}, {a="ؤؤ", b="ؤّ"}, {a="أأ", b="أّ"}, diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua index fb704ea..61e4c4a 100644 --- a/arabluatex_voc.lua +++ b/arabluatex_voc.lua @@ -550,12 +550,12 @@ digraphs = { -- ʾiʿrāb (end) -- initial straight double quote gives a connective ʾalif {a="^\"[uai]", b="ٱ"}, - {a="([%s%-])\"[uai]", b="%1ٱ"}, + {a="([%p%s%-])\"[uai]", b="%1ٱ"}, --p {a="(aW)(%s)([uai])", b="awuا%2%3"}, -- hyphen + initial alif without hamza: {a="(%-)([uai])([%^%_%.%`]?)(%a)", b="%1ا%3%4"}, {a="^([uai])", b="ا%1"}, -- initial alif without hamza - {a="(%s)([uai])", b="%1ا"}, -- initial alif without hamza + {a="([%p%s])([uai])", b="%1ا"}, -- initial alif without hamza --p {a="%-%-", b="ـ"}, {a="ؤؤ", b="ؤّ"}, {a="أأ", b="أّ"}, -- cgit v1.2.3