1 files changed, 59 insertions, 57 deletions

diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index 0097450..0331794 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -93,8 +93,9 @@ hamza = {
    {a="'i'([^uaiUAI])", b="إI%1"},   
    -- madda (historic writing below)
    {a="'a'([^uaiUAI])", b="آ%1"},
---tmp   {a="'a?A([%_%^%.]?[%`%'btjghdrzsfqklmnywAY])", b="آ%1"},
-   {a="([^UIui])'a?A([%_%^%.]?[%`%'btjghdrzsfqklmnywAY])", b="%1آ%2"},
+   {a="([^uiUI])\'a?A([%_%^%.]?[%`%'btjghdrzsfqklmnywAY])", b="%1آ%2"},
+   {a="^\'a?A([%_%^%.]?[%`%'btjghdrzsfqklmnywAY])", b="آ%1"},
+   {a="(%W)\'a?A([%_%^%.]?[%`%'btjghdrzsfqklmnywAY])", b="%1آ%2"},
    {a="(A)(')(uN?)$", b="aآء%3"},
    {a="(A)(')(uN?)(%W)", b="aآء%3%4"},
    {a="(A)(')(iN?)$", b="aآء%3"},
@@ -179,8 +180,9 @@ hamzaeasy = { -- differences marked below with 'easy'
    {a="'i'([^uaiUAI])", b="إI%1"},   
    -- madda (historic writing below)
    {a="'a'([^uaiUAI])", b="آ%1"},
---tmp   {a="'a?A([%_%^%.]?[%`%'btjghdrzsfqklmnywAY])", b="آ%1"},
-   {a="([^UIui])'a?A([%_%^%.]?[%`%'btjghdrzsfqklmnywAY])", b="%1آ%2"},
+   {a="([^uiUI])\'a?A([%_%^%.]?[%`%'btjghdrzsfqklmnywAY])", b="%1آ%2"},
+   {a="^\'a?A([%_%^%.]?[%`%'btjghdrzsfqklmnywAY])", b="آ%1"},
+   {a="(%W)\'a?A([%_%^%.]?[%`%'btjghdrzsfqklmnywAY])", b="%1آ%2"},
    --easy (begin)
    {a="(A)(')(uN?)$", b="aاء%3"},
    {a="(A)(')(uN?)(%W)", b="aاء%3%4"},
@@ -246,69 +248,69 @@ hamzaeasy = { -- differences marked below with 'easy'
 }
 
 tanwin = {
-   {a="uNU", b="ٌو"},
-   {a="aNU", b="ًوا"},
-   {a="iNU", b="ٍو"},
+   {a="%-?uNU", b="ٌو"},
+   {a="%-?aNU", b="ًوا"},
+   {a="%-?iNU", b="ٍو"},
    -- assimilations (begin)
-   {a="(uN)(%s)([rlmnwy])", b="ٌ%2%3%3"},
-   {a="(aN)(_A)(%s)([rlmnwy])", b="ًى%3%4%4"},
-   {a="(aN)(Y)(%s)([rlmnwy])", b="ًى%3%4%4"},
-   {a="(T)(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"},
-   {a="(ء)(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"},
-   {a="([^TA])(aN)(%s)([rlmnwy])", b="%1ًا%3%4%4"},
-   {a="(iN)(%s)([rlmnwy])", b="ٍ%2%3%3"},
+   {a="%-?(uN)(%s)([rlmnwy])", b="ٌ%2%3%3"},
+   {a="%-?(aN)(_A)(%s)([rlmnwy])", b="ًى%3%4%4"},
+   {a="%-?(aN)(Y)(%s)([rlmnwy])", b="ًى%3%4%4"},
+   {a="(T)%-?(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"},
+   {a="(ء)%-?(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"},
+   {a="([^TA])%-?(aN)(%s)([rlmnwy])", b="%1ًا%3%4%4"},
+   {a="%-?(iNI?)(%s)([rlmnwy])", b="ٍ%2%3%3"},
    -- assimilations (end)
    -- quoted tanwīn (begin)
-   {a="(\"uN)", b=""},
-   {a="(B)(\"aN)", b="%1"},
-   {a="(\"aN)(_A)", b="ى"},
-   {a="(\"aN)(Y)", b="ى"},
-   {a="(T)(\"aN)", b="%1"},
-   {a="(ء)(\"aN)", b="%1"},
-   {a="([^TA])(\"aN)", b="%1ا"},
-   {a="(\"iN)", b=""},
+   {a="%-?(\"uN)", b=""},
+   {a="(B)%-?(\"aN)", b="%1"},
+   {a="%-?(\"aN)(_A)", b="ى"},
+   {a="%-?(\"aN)(Y)", b="ى"},
+   {a="(T)%-?(\"aN)", b="%1"},
+   {a="(ء)%-?(\"aN)", b="%1"},
+   {a="([^TA])%-?(\"aN)", b="%1ا"},
+   {a="%-?(\"iNI?)", b=""},
    -- quoted tanwīn (end)
-   {a="(uN)", b="ٌ"},
-   {a="(B)(aN)", b="%1ً"},
-   {a="(aN)(_A)", b="ًى"},
-   {a="(aN)(Y)", b="ًى"},
-   {a="(T)(aN)", b="%1ً"},
-   {a="(ء)(aN)", b="%1ً"},
-   {a="([^TA])(aN)", b="%1ًا"},
-   {a="(iNI?)", b="ٍ"}
+   {a="%-?(uN)", b="ٌ"},
+   {a="(B)%-?(aN)", b="%1ً"},
+   {a="%-?(aN)(_A)", b="ًى"},
+   {a="%-?(aN)(Y)", b="ًى"},
+   {a="(T)%-?(aN)", b="%1ً"},
+   {a="(ء)%-?(aN)", b="%1ً"},
+   {a="([^TA])%-?(aN)", b="%1ًا"},
+   {a="%-?(iNI?)", b="ٍ"}
 }
 
 tanwineasy = { -- 'easy' requires some lines to be taken out:
-   {a="uNU", b="ٌو"},
-   {a="aNU", b="ًوا"},
-   {a="iNU", b="ٍو"},
+   {a="%-?uNU", b="ٌو"},
+   {a="%-?aNU", b="ًوا"},
+   {a="%-?iNU", b="ٍو"},
    -- assimilations (begin)
---   {a="(uN)(%s)([rlmnwy])", b="ٌ%2%3%3"},
---   {a="(aN)(_A)(%s)([rlmnwy])", b="ًى%3%4%4"},
---   {a="(aN)(Y)(%s)([rlmnwy])", b="ًى%3%4%4"},
---   {a="(T)(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"},
---   {a="(ء)(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"},
---   {a="([^TA])(aN)(%s)([rlmnwy])", b="%1ًا%3%4%4"},
---   {a="(iN)(%s)([rlmnwy])", b="ٍ%2%3%3"},
+--   {a="%-?(uN)(%s)([rlmnwy])", b="ٌ%2%3%3"},
+--   {a="%-?(aN)(_A)(%s)([rlmnwy])", b="ًى%3%4%4"},
+--   {a="%-?(aN)(Y)(%s)([rlmnwy])", b="ًى%3%4%4"},
+--   {a="(T)%-?(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"},
+--   {a="(ء)%-?(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"},
+--   {a="([^TA])%-?(aN)(%s)([rlmnwy])", b="%1ًا%3%4%4"},
+--   {a="%-?(iNI?)(%s)([rlmnwy])", b="ٍ%2%3%3"},
    -- assimilations (end)
    -- quoted tanwīn (begin)
-   {a="(\"uN)", b=""},
-   {a="(B)(\"aN)", b="%1"},
-   {a="(\"aN)(_A)", b="ى"},
-   {a="(\"aN)(Y)", b="ى"},
-   {a="(T)(\"aN)", b="%1"},
-   {a="(ء)(\"aN)", b="%1"},
-   {a="([^TA])(\"aN)", b="%1ا"},
-   {a="(\"iN)", b=""},
+   {a="%-?(\"uN)", b=""},
+   {a="(B)%-?(\"aN)", b="%1"},
+   {a="%-?(\"aN)(_A)", b="ى"},
+   {a="%-?(\"aN)(Y)", b="ى"},
+   {a="(T)%-?(\"aN)", b="%1"},
+   {a="(ء)%-?(\"aN)", b="%1"},
+   {a="([^TA])%-?(\"aN)", b="%1ا"},
+   {a="%-?(\"iNI?)", b=""},
    -- quoted tanwīn (end)
-   {a="(uN)", b="ٌ"},
-   {a="(B)(aN)", b="%1ً"},
-   {a="(aN)(_A)", b="ًى"},
-   {a="(aN)(Y)", b="ًى"},
-   {a="(T)(aN)", b="%1ً"},
-   {a="(ء)(aN)", b="%1ً"},
-   {a="([^TA])(aN)", b="%1ًا"},
-   {a="(iNI?)", b="ٍ"}
+   {a="%-?(uN)", b="ٌ"},
+   {a="(B)%-?(aN)", b="%1ً"},
+   {a="%-?(aN)(_A)", b="ًى"},
+   {a="%-?(aN)(Y)", b="ًى"},
+   {a="(T)%-?(aN)", b="%1ً"},
+   {a="(ء)%-?(aN)", b="%1ً"},
+   {a="([^TA])%-?(aN)", b="%1ًا"},
+   {a="%-?(iNI?)", b="ٍ"}
 }
 
 trigraphs = { -- trigraphs or more
@@ -452,7 +454,7 @@ digraphs = {
    --tmp-added 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ا%2"}, -- initial alif without hamza
+   {a="(%s)([uai])", b="%1ا"}, -- initial alif without hamza
    {a="%-%-", b="ـ"},
    {a="ؤؤ", b="ؤّ"},
    {a="أأ", b="أّ"},