2 files changed, 36 insertions, 4 deletions

diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index 3ca9538..4673b32 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -48,7 +48,7 @@ hamzafv = {
    {a="%'%_U", b="أU"},
    -- madda (historic writing below)
    {a="'a'([^uaiUAI])", b="آ%1"},
-   {a="'a?A", b="آ"},
+   {a="'a?A([%_%^%.]?[%`%'btjghdrzsfqklmnywAY])", b="آ%1"},
    {a="(A)(')(iN?)$", b="aآء%3"},
    {a="(A)(')(iN?)(%W)", b="aآء%3%4"},
    {a="(A)(')(i)", b="aآئ%3"}, -- historic madda
@@ -71,7 +71,23 @@ hamzafv = {
    {a="(%^say)(%')(aN)", b="%1ئ%3"},
    {a="(.zi?m)(%')(aN)", b="%1ئ%3"},
    {a="([^uai])(')([uai]N?)$", b="%1ء%3"},
-   {a="([^uai])(')([uai]N?)(%W)", b="%1ء%3%4"},   
+   {a="([^uai])(')([uai]N?)(%W)", b="%1ء%3%4"},
+-- u
+   {a="(u)(')([uai]?N)$", b="%1ؤ%3"},
+   {a="(u)(')([uai]N?)(%W)", b="%1ؤ%3%4"},
+-- a
+   {a="(a)(')([u]N?)$", b="%1أ%3"},
+   {a="(a)(')([u]N?)(%W)", b="%1أ%3%4"},
+   {a="(a)(')(a)$", b="%1أ%3"},
+   {a="(a)(')(a)(%W)", b="%1أ%3%4"},
+   {a="(a)(')(aN)$", b="%1أً"},
+   {a="(a)(')(aN)(%W)", b="%1أً%4"},
+   {a="(a)(')([i]N?)$", b="%1إ%3"},
+   {a="(a)(')([i]N?)(%W)", b="%1إ%3%4"},
+-- i
+   {a="(i)(')([uai]N?)$", b="%1ئ%3"},
+   {a="(i)(')([uai]N?)(%W)", b="%1ئ%3%4"},
+--
    -- middle
    {a="(U)(')", b="%1ء"},
    {a="([Iy])(')", b="%1ئ"},
diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index e38a604..9e0ba85 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -80,7 +80,7 @@ hamza = {
    {a="%'%_U", b="أU"},
    -- madda (historic writing below)
    {a="'a'([^uaiUAI])", b="آ%1"},
-   {a="'a?A", b="آ"},
+   {a="'a?A([%_%^%.]?[%`%'btjghdrzsfqklmnywAY])", b="آ%1"},
    {a="(A)(')(iN?)$", b="aآء%3"},
    {a="(A)(')(iN?)(%W)", b="aآء%3%4"},
    {a="(A)(')(i)", b="aآئ%3"}, -- historic madda
@@ -103,7 +103,23 @@ hamza = {
    {a="(%^say)(%')(aN)", b="%1ئ%3"},
    {a="(.zi?m)(%')(aN)", b="%1ئ%3"},
    {a="([^uai])(')([uai]N?)$", b="%1ء%3"},
-   {a="([^uai])(')([uai]N?)(%W)", b="%1ء%3%4"},   
+   {a="([^uai])(')([uai]N?)(%W)", b="%1ء%3%4"},
+-- u
+   {a="(u)(')([uai]?N)$", b="%1ؤ%3"},
+   {a="(u)(')([uai]N?)(%W)", b="%1ؤ%3%4"},
+-- a
+   {a="(a)(')([u]N?)$", b="%1أ%3"},
+   {a="(a)(')([u]N?)(%W)", b="%1أ%3%4"},
+   {a="(a)(')(a)$", b="%1أ%3"},
+   {a="(a)(')(a)(%W)", b="%1أ%3%4"},
+   {a="(a)(')(aN)$", b="%1أً"},
+   {a="(a)(')(aN)(%W)", b="%1أً%4"},
+   {a="(a)(')([i]N?)$", b="%1إ%3"},
+   {a="(a)(')([i]N?)(%W)", b="%1إ%3%4"},
+-- i
+   {a="(i)(')([uai]N?)$", b="%1ئ%3"},
+   {a="(i)(')([uai]N?)(%W)", b="%1ئ%3%4"},
+--
    -- middle
    {a="(U)(')", b="%1ء"},
    {a="([Iy])(')", b="%1ئ"},