1 files changed, 8 insertions, 3 deletions

diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index 9a6f35a..e05050f 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -70,20 +70,25 @@ hamzafv = {
    {a="%'%_U", b="أU"},
    -- madda (historic writing below)
    {a="'A", b="آ"},
+   {a="(A)(')(i)$", b="aآء%3"},
+   {a="(A)(')(i)(%W)", b="aآء%3%4"},
+   {a="(A)(')(i)", b="aآئ%3"}, -- historic madda
+   {a="(A)(')", b="aآء"}, -- historic madda
    -- initial (needs both ^ and %W patterns)
    {a="^(')([ua])", b="أ%2"},
    {a="^(')(i)", b="إ%2"},
    {a="(%W)(')([ua])", b="%1أ%3"},
    {a="(%W)(')(i)", b="%1إ%3"},
    -- final
+   {a="([Iy])(')(aN)$", b="%1ئ%3"},
+   {a="([Iy])(')(aN)(%W)", b="%1ئ%3%4"},
    {a="([^uai])(')([uai]N?)$", b="%1ء%3"},
    {a="([^uai])(')([uai]N?)(%W)", b="%1ء%3%4"},
    {a="([UI])(')([uai])$", b="%1ء%3"},
    {a="([UI])(')([uai])(%W)", b="%1ء%3%4"},
    -- middle
-   {a="(A)(')(i)", b="aآئ%3"}, -- historic madda
-   {a="(A)(')", b="aآء"}, -- historic madda
-   {a="([UI])(')", b="%1ء"},
+   {a="(U)(')", b="%1ء"},
+   {a="([Iy])(')", b="%1ئ"},
    {a="([^uai])(')([uU])", b="%1ؤ%3"},
    {a="([^uai])(')([aA])", b="%1أ%3"},
    {a="([^uai])(')([iI])", b="%1ئ%3"},