modified 'voc' and 'trans' rules accordingly

2 files changed, 26 insertions, 26 deletions

diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua
index 404ae22..23ecf2c 100644
--- a/arabluatex_trans.lua
+++ b/arabluatex_trans.lua
@@ -136,15 +136,15 @@ hamzatrdmg = {
    {a="(U)(')", b="%1ʾ"},
    {a="([Iy])(')", b="%1ʾ"},
    {a="([^uai])(')([uU])", b="%1ʾ%3"},
-   {a="([^uai])(')([aA])", b="%1ʾ%3"},
+   {a="([^uai])(')(%_?[aAY])", b="%1ʾ%3"},
    {a="([^uai])(')([iI])", b="%1ʾ%3"},
    {a="(u)(')([uU])", b="%1ʾ%3"},
-   {a="(u)(')([aA])", b="%1ʾ%3"},
+   {a="(u)(')(%_?[aAY])", b="%1ʾ%3"},
    {a="(u)(')([iI])", b="%1ʾ%3"},
-   {a="(a)(')([aA])", b="%1ʾ%3"},
+   {a="(a)(')(%_?[aAY])", b="%1ʾ%3"},
    {a="(a)(')([uU])", b="%1ʾ%3"},
    {a="(a)(')([iI])", b="%1ʾ%3"},
-   {a="(i)(')([aA])", b="%1ʾ%3"},
+   {a="(i)(')(%_?[aAY])", b="%1ʾ%3"},
    {a="(i)(')([uU])", b="%1ʾ%3"},
    {a="(i)(')([iI])", b="%1ʾ%3"},
    {a="(a)(')([^uaiUAI])", b="%1ʾ%3"},
@@ -505,15 +505,15 @@ hamzatrloc = {
    {a="(U)(')", b="%1ʾ"},
    {a="([Iy])(')", b="%1ʾ"},
    {a="([^uai])(')([uU])", b="%1ʾ%3"},
-   {a="([^uai])(')([aA])", b="%1ʾ%3"},
+   {a="([^uai])(')(%_?[aAY])", b="%1ʾ%3"},
    {a="([^uai])(')([iI])", b="%1ʾ%3"},
    {a="(u)(')([uU])", b="%1ʾ%3"},
-   {a="(u)(')([aA])", b="%1ʾ%3"},
+   {a="(u)(')(%_?[aAY])", b="%1ʾ%3"},
    {a="(u)(')([iI])", b="%1ʾ%3"},
-   {a="(a)(')([aA])", b="%1ʾ%3"},
+   {a="(a)(')(%_?[aAY])", b="%1ʾ%3"},
    {a="(a)(')([uU])", b="%1ʾ%3"},
    {a="(a)(')([iI])", b="%1ʾ%3"},
-   {a="(i)(')([aA])", b="%1ʾ%3"},
+   {a="(i)(')(%_?[aAY])", b="%1ʾ%3"},
    {a="(i)(')([uU])", b="%1ʾ%3"},
    {a="(i)(')([iI])", b="%1ʾ%3"},
    {a="(a)(')([^uaiUAI])", b="%1ʾ%3"},
@@ -763,15 +763,15 @@ hamzatrarabica = { -- ≠ from hamzatrloc: initial hamza has to be held
    {a="(U)(')", b="%1ʾ"},
    {a="([Iy])(')", b="%1ʾ"},
    {a="([^uai])(')([uU])", b="%1ʾ%3"},
-   {a="([^uai])(')([aA])", b="%1ʾ%3"},
+   {a="([^uai])(')(%_?[aAY])", b="%1ʾ%3"},
    {a="([^uai])(')([iI])", b="%1ʾ%3"},
    {a="(u)(')([uU])", b="%1ʾ%3"},
-   {a="(u)(')([aA])", b="%1ʾ%3"},
+   {a="(u)(')(%_?[aAY])", b="%1ʾ%3"},
    {a="(u)(')([iI])", b="%1ʾ%3"},
-   {a="(a)(')([aA])", b="%1ʾ%3"},
+   {a="(a)(')(%_?[aAY])", b="%1ʾ%3"},
    {a="(a)(')([uU])", b="%1ʾ%3"},
    {a="(a)(')([iI])", b="%1ʾ%3"},
-   {a="(i)(')([aA])", b="%1ʾ%3"},
+   {a="(i)(')(%_?[aAY])", b="%1ʾ%3"},
    {a="(i)(')([uU])", b="%1ʾ%3"},
    {a="(i)(')([iI])", b="%1ʾ%3"},
    {a="(a)(')([^uaiUAI])", b="%1ʾ%3"},
diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index ca1aa99..0913304 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -238,7 +238,7 @@ hamza = {
 -- u
    {a="(u)(')([uai]N?%p?)$", b="%1ؤ%3"},
    {a="(u)(')([uai]N?)(%p?%s)", b="%1ؤ%3%4"},
-   {a="(u)('%p?)$", b="%1ؤ"},
+   {a="(u)(')(%p?)$", b="%1ؤ%3"},
    {a="(u)(')(%p?%s)", b="%1ؤ%3"},
 -- a
    {a="(a)(')(A%p?)$", b="%1آ"},
@@ -251,27 +251,27 @@ hamza = {
    {a="(a)(')(aN)(%p?%s)", b="%1أً%4"},
    {a="(a)(')([i]N?%p?)$", b="%1إ%3"},
    {a="(a)(')([i]N?)(%p?%s)", b="%1إ%3%4"},
-   {a="(a)('%p?)$", b="%1أ"},
+   {a="(a)(')(%p?)$", b="%1أ%3"},
    {a="(a)(')(%p?%s)", b="%1أ%3"},
 -- i
    {a="(i)(')([uai]N?%p?)$", b="%1ئ%3"},
    {a="(i)(')([uai]N?)(%p?%s)", b="%1ئ%3%4"},
-   {a="(i)('%p?)$", b="%1ئ"},
+   {a="(i)(')(%p?)$", b="%1ئ%3"},
    {a="(i)(')(%p?%s)", b="%1ئ%3"},
 --
    -- middle
    {a="(U)(')", b="%1ء"},
    {a="([Iy])(')", b="%1ئ"},
    {a="([^uai])(')([uU])", b="%1ؤ%3"},
-   {a="([^uai])(')([aA])", b="%1أ%3"},
+   {a="([^uai])(')(%_?[aAY])", b="%1أ%3"},
    {a="([^uai])(')([iI])", b="%1ئ%3"},
    {a="(u)(')([uU])", b="%1ؤ%3"},
-   {a="(u)(')([aA])", b="%1ؤ%3"},
+   {a="(u)(')(%_?[aAY])", b="%1ؤ%3"},
    {a="(u)(')([iI])", b="%1ئ%3"},
-   {a="(a)(')([aA])", b="%1أ%3"},
+   {a="(a)(')(%_?[aAY])", b="%1أ%3"},
    {a="(a)(')([uU])", b="%1ؤ%3"},
    {a="(a)(')([iI])", b="%1ئ%3"},
-   {a="(i)(')([aA])", b="%1ئ%3"},
+   {a="(i)(')(%_?[aAY])", b="%1ئ%3"},
    {a="(i)(')([uU])", b="%1ئ%3"},
    {a="(i)(')([iI])", b="%1ئ%3"},
    {a="(a)(')([^uaiUAI])", b="%1أ%3"},
@@ -352,7 +352,7 @@ hamzaeasy = { -- differences marked below with 'easy'
 -- u
    {a="(u)(')([uai]N?%p?)$", b="%1ؤ%3"},
    {a="(u)(')([uai]N?)(%p?%s)", b="%1ؤ%3%4"},
-   {a="(u)('%p?)$", b="%1ؤ"},
+   {a="(u)(')(%p?)$", b="%1ؤ%3"},
    {a="(u)(')(%p?%s)", b="%1ؤ%3"},
 -- a
    {a="(a)(')(A%p?)$", b="%1آ"},
@@ -365,27 +365,27 @@ hamzaeasy = { -- differences marked below with 'easy'
    {a="(a)(')(aN)(%p?%s)", b="%1أً%4"},
    {a="(a)(')([i]N?%p?)$", b="%1إ%3"},
    {a="(a)(')([i]N?)(%p?%s)", b="%1إ%3%4"},
-   {a="(a)('%p?)$", b="%1أ"},
+   {a="(a)(')(%p?)$", b="%1أ%3"},
    {a="(a)(')(%p?%s)", b="%1أ%3"},
 -- i
    {a="(i)(')([uai]N?%p?)$", b="%1ئ%3"},
    {a="(i)(')([uai]N?)(%p?%s)", b="%1ئ%3%4"},
-   {a="(i)('%p?)$", b="%1ئ"},
+   {a="(i)(')(%p?)$", b="%1ئ%3"},
    {a="(i)(')(%p?%s)", b="%1ئ%3"},
 --
    -- middle
    {a="(U)(')", b="%1ء"},
    {a="([Iy])(')", b="%1ئ"},
    {a="([^uai])(')([uU])", b="%1ؤ%3"},
-   {a="([^uai])(')([aA])", b="%1أ%3"},
+   {a="([^uai])(')(%_?[aAY])", b="%1أ%3"},
    {a="([^uai])(')([iI])", b="%1ئ%3"},
    {a="(u)(')([uU])", b="%1ؤ%3"},
-   {a="(u)(')([aA])", b="%1ؤ%3"},
+   {a="(u)(')(%_?[aAY])", b="%1ؤ%3"},
    {a="(u)(')([iI])", b="%1ئ%3"},
-   {a="(a)(')([aA])", b="%1أ%3"},
+   {a="(a)(')(%_?[aAY])", b="%1أ%3"},
    {a="(a)(')([uU])", b="%1ؤ%3"},
    {a="(a)(')([iI])", b="%1ئ%3"},
-   {a="(i)(')([aA])", b="%1ئ%3"},
+   {a="(i)(')(%_?[aAY])", b="%1ئ%3"},
    {a="(i)(')([uU])", b="%1ئ%3"},
    {a="(i)(')([iI])", b="%1ئ%3"},
    {a="(a)(')([^uaiUAI])", b="%1أ%3"},