1 files changed, 30 insertions, 18 deletions

diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index 99efb75..8379693 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -78,11 +78,14 @@ hamzafv = {
    -- then the 'initial' rules for the remaining cases
    {a="^(')([ua])", b="أ%2"},
    {a="^(')(i)", b="إ%2"},
-   {a="(%W)(')([ua])", b="%1أ%3"},
-   {a="(%W)(')(i)", b="%1إ%3"},
+   -- consider replacing initial %W with [%s%(%[%<]:
+   --   {a="(%W)(')([ua])", b="%1أ%3"},
+   --   {a="(%W)(')(i)", b="%1إ%3"},
+   {a="([%s%(%[%<])(')([ua])", b="%1أ%3"},
+   {a="([%s%(%[%<])(')(i)", b="%1إ%3"},
    -- final
    -- ^say'aN and .zim'aN are special orthographies
-   {a="(%^say)(%')(aN)", b="%1ئ%3"},
+   {a="(%^sa%.?[yY])(\"?%|?)(%')(aN)", b="%1%2ئ%4"},
    {a="(.zi?m)(%')(aN)", b="%1ئ%3"},
    {a="(')(I%p?)$", b="إ%2"}, -- affix pr. 1st person sg.
    {a="(')(I)(%p?%s)", b="إ%2%3"}, -- affix pr. 1st person sg.
@@ -190,11 +193,14 @@ hamzafveasy = { -- differences marked below with 'easy'
    -- then the 'initial' rules for the remaining cases
    {a="^(')([ua])", b="أ%2"},
    {a="^(')(i)", b="إ%2"},
-   {a="(%W)(')([ua])", b="%1أ%3"},
-   {a="(%W)(')(i)", b="%1إ%3"},
+   -- consider replacing initial %W with [%s%(%[%<]:
+   --   {a="(%W)(')([ua])", b="%1أ%3"},
+   --   {a="(%W)(')(i)", b="%1إ%3"},
+   {a="([%s%(%[%<])(')([ua])", b="%1أ%3"},
+   {a="([%s%(%[%<])(')(i)", b="%1إ%3"},
    -- final
    -- ^say'aN and .zim'aN are special orthographies
-   {a="(%^say)(%')(aN)", b="%1ئ%3"},
+   {a="(%^sa%.?[yY])(\"?%|?)(%')(aN)", b="%1%2ئ%4"},
    {a="(.zi?m)(%')(aN)", b="%1ئ%3"},
    {a="(')(I%p?)$", b="إ%2"}, -- affix pr. 1st person sg.
    {a="(')(I)(%p?%s)", b="إ%2%3"}, -- affix pr. 1st person sg.
@@ -565,6 +571,7 @@ digraphsfvidgham = {
    {a="hh", b="هّ"},
    {a="ww", b="وّ"},
    {a="yy", b="يّ"},
+   {a="%.y%.y", b="ىّ"},
    -- additional characters + šaddah (begin)
    {a="pp", b="پّ"},
    {a="vv", b="ڤّ"},
@@ -575,10 +582,10 @@ digraphsfvidgham = {
    -- additional characters + šaddah (end)
    -- sukūn begin
    -- first, take out hyphen if any:
-   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])%-([uaiUAI])", b="%1%2"},
-   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy]%p?)$", b="%1ْ"},
-   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])(%p?%s)", b="%1ْ%2"},
-   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])([%_]?[^%_uaiUAIYًٌٍ])", b="%1ْ%2"},
+   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwyY])%-([uaiUAI])", b="%1%2"},
+   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwyY]%p?)$", b="%1ْ"},
+   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwyY])(%p?%s)", b="%1ْ%2"},
+   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwyY])([%_]?[^%_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"},
@@ -599,6 +606,7 @@ digraphsfvidgham = {
    {a="%.t", b="ط"},
    {a="%.z", b="ظ"},
    {a="%.g", b="غ"},
+   {a="%.y", b="ى"},
    -- additional characters (begin)
    {a="%^c", b="چ"},
    {a="%^z", b="ژ"},
@@ -688,6 +696,7 @@ digraphsfv = {
    {a="hh", b="هّ"},
    {a="ww", b="وّ"},
    {a="yy", b="يّ"},
+   {a="%.y%.y", b="ىّ"},
    -- additional characters + šaddah (begin)
    {a="pp", b="پّ"},
    {a="vv", b="ڤّ"},
@@ -698,10 +707,10 @@ digraphsfv = {
    -- additional characters + šaddah (end)
    -- sukūn begin
    -- first, take out hyphen if any:
-   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])%-([uaiUAI])", b="%1%2"},
-   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy]%p?)$", b="%1ْ"},
-   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])(%p?%s)", b="%1ْ%2"},
-   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])([%_]?[^%_uaiUAIYًٌٍ])", b="%1ْ%2"},
+   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwyY])%-([uaiUAI])", b="%1%2"},
+   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwyY]%p?)$", b="%1ْ"},
+   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwyY])(%p?%s)", b="%1ْ%2"},
+   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwyY])([%_]?[^%_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"},
@@ -722,6 +731,7 @@ digraphsfv = {
    {a="%.t", b="ط"},
    {a="%.z", b="ظ"},
    {a="%.g", b="غ"},
+   {a="%.y", b="ى"},
    -- additional characters (begin)
    {a="%^c", b="چ"},
    {a="%^z", b="ژ"},
@@ -811,6 +821,7 @@ digraphsfveasy = { -- see the differences under 'easy' marker below
    {a="hh", b="هّ"},
    {a="ww", b="وّ"},
    {a="yy", b="يّ"},
+   {a="%.y%.y", b="ىّ"},
    -- additional characters + šaddah (begin)
    {a="pp", b="پّ"},
    {a="vv", b="ڤّ"},
@@ -824,10 +835,10 @@ digraphsfveasy = { -- see the differences under 'easy' marker below
    -- so there be no need to edit them:
    {a="ْ", b=""}, 
    -- first, take out hyphen if any:
---   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])%-([uaiUAI])", b="%1%2"},
---   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy]%p?)$", b="%1ْ"},
---   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])(%p?%s)", b="%1ْ%2"},
---   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])([%_]?[^%_uaiUAIًٌٍ])", b="%1ْ%2"},
+--   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwyY])%-([uaiUAI])", b="%1%2"},
+--   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwyY]%p?)$", b="%1ْ"},
+--   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwyY])(%p?%s)", b="%1ْ%2"},
+--   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwyY])([%_]?[^%_uaiUAIًٌٍ])", 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"},
@@ -848,6 +859,7 @@ digraphsfveasy = { -- see the differences under 'easy' marker below
    {a="%.t", b="ط"},
    {a="%.z", b="ظ"},
    {a="%.g", b="غ"},
+   {a="%.y", b="ى"},
    -- additional characters (begin)
    {a="%^c", b="چ"},
    {a="%^z", b="ژ"},