1 files changed, 65 insertions, 64 deletions

diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index f9d4e60..e4a9495 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -53,8 +53,9 @@ hamzafv = {
    {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"},
@@ -148,8 +149,9 @@ hamzafveasy = { -- 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"},
@@ -215,73 +217,73 @@ hamzafveasy = { -- differences marked below with 'easy'
 }
 
 tanwinfv = {
-   {a="uNU", b="ٌو"},
-   {a="aNU", b="ًوا"},
-   {a="iNU", b="ٍو"},
-   {a="([uai]N)(%s)([uai])", b="%1%2ٱ"},
-   {a="(aN[%_]?[AY])(%s)([uai])", b="%1%2ٱ"},
+   {a="%-?uNU", b="ٌو"},
+   {a="%-?aNU", b="ًوا"},
+   {a="%-?iNU", b="ٍو"},
+   {a="%-?([uai]N)(%s)([uai])", b="%1%2ٱ"},
+   {a="%-?(aN[%_]?[AY])(%s)([uai])", b="%1%2ٱ"},
    -- 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="ٍ"}
 }
 
 tanwinfveasy = { -- no assimilations (see below)
-   {a="uNU", b="ٌو"},
-   {a="aNU", b="ًوا"},
-   {a="iNU", b="ٍو"},
-   {a="([uai]N)(%s)([uai])", b="%1%2ٱ"},
-   {a="(aN[%_]?[AY])(%s)([uai])", b="%1%2ٱ"},
+   {a="%-?uNU", b="ٌو"},
+   {a="%-?aNU", b="ًوا"},
+   {a="%-?iNU", b="ٍو"},
+   {a="%-?([uai]N)(%s)([uai])", b="%1%2ٱ"},
+   {a="%-?(aN[%_]?[AY])(%s)([uai])", b="%1%2ٱ"},
    -- assimilations (begin)
---easy   {a="(uN)(%s)([rlmnwy])", b="ٌ%2%3%3"},
---easy   {a="(aN)(_A)(%s)([rlmnwy])", b="ًى%3%4%4"},
---easy   {a="(aN)(Y)(%s)([rlmnwy])", b="ًى%3%4%4"},
---easy   {a="(T)(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"},
---easy   {a="(ء)(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"},
---easy   {a="([^TA])(aN)(%s)([rlmnwy])", b="%1ًا%3%4%4"},
---easy   {a="(iN)(%s)([rlmnwy])", b="ٍ%2%3%3"},
+--easy   {a="%-?(uN)(%s)([rlmnwy])", b="ٌ%2%3%3"},
+--easy   {a="%-?(aN)(_A)(%s)([rlmnwy])", b="ًى%3%4%4"},
+--easy   {a="%-?(aN)(Y)(%s)([rlmnwy])", b="ًى%3%4%4"},
+--easy   {a="(T)%-?(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"},
+--easy   {a="(ء)%-?(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"},
+--easy   {a="([^TA])%-?(aN)(%s)([rlmnwy])", b="%1ًا%3%4%4"},
+--easy   {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="ٍ"}
 }
 
 trigraphsfv = { -- trigraphs or more
@@ -457,10 +459,10 @@ digraphsfv = {
    {a="yy", b="يّ"},
    -- sukūn begin
    --tmp: next line is added
-   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])%-(%_?[uaiUAIY])", b="%1%2"},
+   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])%-([uaiUAI])", b="%1%2"},
    {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])$", b="%1ْ"},
    {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])([%s])", b="%1ْ%2"},
-   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])%-(%_?[^uaiUAIًٌٍ])", b="%1ْ%2"},
+   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])([%_]?[^%_uaiUAIYًٌٍ])", b="%1ْ%2"},
    -- take out sukūn in cases of assimilation
    {a="(n)(ْ)(%s)([روي])", b="%1%3%4"},
    {a="(n)(ْ)(%s)([ل])", b="%1%3%4"},
@@ -559,7 +561,7 @@ digraphsfveasy = { -- see the diffenrences under 'easy' marker below
    -- so there be no need to edit them:
    {a="ْ", b=""}, 
    --tmp: next line is added
---   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])%-([uai])", b="%1%2"},
+--   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])%-([uaiUAI])", b="%1%2"},
 --   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])$", b="%1ْ"},
 --   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])([%s])", b="%1ْ%2"},
 --   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])([%_]?[^%_uaiUAIًٌٍ])", b="%1ْ%2"},
@@ -654,4 +656,3 @@ singlefveasy = { -- see the differences under 'easy' tag below
    {a="([^0-9])%-([^0-9])", b="%1%2"},
    {a="B", b="ـ"},
 }
-