'Default' rules: leave hamzah alone in the middle of words after letters of prolongation or sukūn

2 files changed, 22 insertions, 14 deletions

diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index ca62308..d5ca11a 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -149,18 +149,22 @@ hamzafv = {
    -- middle
    {a="([UIwy])(')", b="%1ء"}, --new
    -- {a="([Iy])(')", b="%1ئ"}, --included in the above line
-   {a="([^uai])(')([uU])", b="%1ؤ%3"},
-   {a="([^uai])(')(%_?[aAY])", b="%1أ%3"},
-   {a="([^uai])(')([iI])", b="%1ئ%3"},
-   {a="(u)(')([uU])", b="%1ؤ%3"},
+   -- hamza is alone after letters of prolongation or sukūn
+   -- {a="([^uai])(')([uU])", b="%1ؤ%3"},
+   -- {a="([^uai])(')(%_?[aAY])", b="%1أ%3"},
+   -- {a="([^uai])(')([iI])", b="%1ئ%3"},
+   {a="([^uai])(')(%_?[uaiUAYI])", b="%1ء%3"},
+   {a="(u)(')([UI])", b="%1ء%3"},
+   {a="(u)(')([u])", b="%1ؤ%3"},
    {a="(u)(')(%_?[aAY])", b="%1ؤ%3"},
-   {a="(u)(')([iI])", b="%1ئ%3"},
+   {a="(u)(')([i])", b="%1ئ%3"},
    {a="(a)(')(%_?[aAY])", b="%1أ%3"},
    {a="(a)(')([uU])", b="%1ؤ%3"},
    {a="(a)(')([iI])", b="%1ئ%3"},
+   {a="(i)(')([UI])", b="%1ء%3"},
    {a="(i)(')(%_?[aAY])", b="%1ئ%3"},
-   {a="(i)(')([uU])", b="%1ئ%3"},
-   {a="(i)(')([iI])", b="%1ئ%3"},
+   {a="(i)(')([u])", b="%1ئ%3"},
+   {a="(i)(')([i])", b="%1ئ%3"},
    {a="(a)(')([^uaiUAI])", b="%1أْ%3"},
    {a="(u)(')([^uaiUAI])", b="%1ؤْ%3"},
    {a="(i)(')([^uaiUAI])", b="%1ئْ%3"}
diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index 54c324c..9b2a31c 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -276,18 +276,22 @@ hamza = {
    -- middle
    {a="([UIwy])(')", b="%1ء"}, --new
    -- {a="([Iy])(')", b="%1ئ"}, -- included in the above line
-   {a="([^uai])(')([uU])", b="%1ؤ%3"},
-   {a="([^uai])(')(%_?[aAY])", b="%1أ%3"},
-   {a="([^uai])(')([iI])", b="%1ئ%3"},
-   {a="(u)(')([uU])", b="%1ؤ%3"},
+   -- hamza is alone after letters of prolongation or sukūn
+   -- {a="([^uai])(')([uU])", b="%1ؤ%3"},
+   -- {a="([^uai])(')(%_?[aAY])", b="%1أ%3"},
+   -- {a="([^uai])(')([iI])", b="%1ئ%3"},
+   {a="([^uai])(')(%_?[uaiUAYI])", b="%1ء%3"},
+   {a="(u)(')([UI])", b="%1ء%3"},
+   {a="(u)(')([u])", b="%1ؤ%3"},
    {a="(u)(')(%_?[aAY])", b="%1ؤ%3"},
-   {a="(u)(')([iI])", b="%1ئ%3"},
+   {a="(u)(')([i])", b="%1ئ%3"},
    {a="(a)(')(%_?[aAY])", b="%1أ%3"},
    {a="(a)(')([uU])", b="%1ؤ%3"},
    {a="(a)(')([iI])", b="%1ئ%3"},
+   {a="(i)(')([UI])", b="%1ء%3"},
    {a="(i)(')(%_?[aAY])", b="%1ئ%3"},
-   {a="(i)(')([uU])", b="%1ئ%3"},
-   {a="(i)(')([iI])", b="%1ئ%3"},
+   {a="(i)(')([u])", b="%1ئ%3"},
+   {a="(i)(')([i])", b="%1ئ%3"},
    {a="(a)(')([^uaiUAI])", b="%1أ%3"},
    {a="(u)(')([^uaiUAI])", b="%1ؤ%3"},
    {a="(i)(')([^uaiUAI])", b="%1ئ%3"}