1 files changed, 10 insertions, 1 deletions

diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index 021d75a..bdab038 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -31,6 +31,15 @@ hamzafv = {
    {a="w\"'", b="ؤ"},
    {a="i\"'", b="إ"},
    {a="y\"'", b="ئ"},
+   {a="ؤ([^uaiUAI])", b="ؤْ%1"},
+   {a="ؤ$", b="ؤْ"},
+   {a="ؤ(%s)", b="ؤْ%1"},
+   {a="أ([^uaiUAI])", b="أْ%1"},
+   {a="أ$", b="أْ"},
+   {a="أ(%s)", b="أْ%1"},
+   {a="ئ([^uaiUAI])", b="ئْ%1"},
+   {a="ئ$", b="ئْ"},
+   {a="ئ(%s)", b="ئْ%1"},
    -- hamza takes tašdīd too
    {a="''([Uu])", b="ؤؤ%1"},
    {a="''([Aa])", b="أأ%1"},
@@ -175,7 +184,7 @@ digraphsfv = {
    -- sukūn begin
    {a="([%_%^%.]?[btjghxdrzs%`fqklmnwy])$", b="%1ْ"},
    {a="([%_%^%.]?[btjghxdrzs%`fqklmnwy])([%s])", b="%1ْ%2"},
-   {a="([%_%^%.]?[btjghxdrzs%`fqklmnwy])([%_]?[^uaiUAIًٌٍ])", b="%1ْ%2"},
+   {a="([%_%^%.]?[btjghxdrzs%`fqklmnwy])([%_]?[^%_uaiUAIًٌٍ])", b="%1ْ%2"},
    {a="ْ\"", b="\""},
    -- sukūn end
    {a="_t", b="ث"},