2 files changed, 9 insertions, 8 deletions

diff --git a/arabluatex.lua b/arabluatex.lua
index 76d61b3..f1aeda0 100644
--- a/arabluatex.lua
+++ b/arabluatex.lua
@@ -143,8 +143,8 @@ local function fullvoc(str)
         for i = 1,#tanwin do
                 inside  = string.gsub(inside, tanwin[i].a, tanwin[i].b)
         end
-        for i = 1,#trigraphs do
-                inside = string.gsub(inside, trigraphs[i].a, trigraphs[i].b)
+        for i = 1,#trigraphsfv do
+                inside = string.gsub(inside, trigraphsfv[i].a, trigraphsfv[i].b)
         end
         for i = 1,#digraphsfv do
                 inside = string.gsub(inside, digraphsfv[i].a, digraphsfv[i].b)
diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index 1b72388..42063ec 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -64,7 +64,7 @@ raw = {
         {a="i", b="ِ"}
 }
 
--- this will eventually be new
+-- this is new
 hamzafv = {
    -- initial long u
    {a="%'%_U", b="أU"},
@@ -101,12 +101,13 @@ hamzafv = {
    {a="(i)(')([aA])", b="%1ئ%3"},
    {a="(i)(')([uU])", b="%1ئ%3"},
    {a="(i)(')([iI])", b="%1ئ%3"},
-   {a="(a)(')([^uaiUAI])", b="%1أ%3"},
-   {a="(u)(')([^uaiUAI])", b="%1ؤ%3"},
-   {a="(i)(')([^uaiUAI])", b="%1ئ%3"}
+   {a="(a)(')([^uaiUAI])", b="%1أْ%3"},
+   {a="(u)(')([^uaiUAI])", b="%1ؤْ%3"},
+   {a="(i)(')([^uaiUAI])", b="%1ئْ%3"}
 }
 
-trigraphs = { -- trigraphs or more
+-- this is new
+trigraphsfv = { -- trigraphs or more
    -- 'llatI / 'llad_I
    {a="^'ll(a)([%_]?[dt])", b="الّ%1%2"},
    {a="(%s)'ll(a)([%_]?[dt])", b="%1الّ%2%3"},
@@ -188,7 +189,7 @@ digraphsfv = {
    {a="hh", b="هّ"},
    {a="ww", b="وّ"},
    {a="yy", b="يّ"},
-   -- sukūn end
+   -- sukūn begin
    {a="([%_%^%.]?[btjghxdrzs%`fqklmnwy])([%s])", b="%1ْ%2"},
    {a="([%_%^%.]?[btjghxdrzs%`fqklmnwy])([^%_uaiUAIًٌٍ])", b="%1ْ%2"},
    -- sukūn end