1 files changed, 15 insertions, 6 deletions

diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index 9182e52..9251ee9 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -214,11 +214,14 @@ hamza = {
    -- 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.
@@ -317,11 +320,14 @@ hamzaeasy = { -- 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.
@@ -695,6 +701,7 @@ digraphs = {
    {a="hh", b="هّ"},
    {a="ww", b="وّ"},
    {a="yy", b="يّ"},
+   {a="%.y%.y", b="ىّ"},
    -- additional characters + šaddah (begin)
    {a="pp", b="پّ"},
    {a="vv", b="ڤّ"},
@@ -714,6 +721,7 @@ digraphs = {
    {a="%.t", b="ط"},
    {a="%.z", b="ظ"},
    {a="%.g", b="غ"},
+   {a="%.y", b="ى"},
    -- additional characters (begin)
    {a="%^c", b="چ"},
    {a="%^z", b="ژ"},
@@ -776,6 +784,7 @@ longv = {
    {a="A", b="َا"},
    {a="U", b="ُو"},
    {a="I", b="ِي"},
+   {a="aY", b="aى"},
    {a="iY", b="iى"},
    {a="Y", b="aى"}
 }