2 files changed, 48 insertions, 8 deletions

diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index 9271417..401d1a5 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -102,8 +102,18 @@ hamzafv = {
    -- take out the following two lines:
    -- {a="(')(I%p?)$", b="إ%2"}, -- affix pr. 1st person sg.
    -- {a="(')(I)(%p?%s)", b="إ%2%3"}, -- affix pr. 1st person sg.
-   {a="([^uai])(')([uai]N?%p?)$", b="%1ء%3"},
-   {a="([^uai])(')([uai]N?)(%p?%s)", b="%1ء%3%4"},
+   --
+   -- The Munjid says that such words as radI'aN do not have the
+   -- hamzah alone on the line so replace the following two lines with
+   -- the next six:
+   -- {a="([^uai])(')([uai]N?%p?)$", b="%1ء%3"},
+   -- {a="([^uai])(')([uai]N?)(%p?%s)", b="%1ء%3%4"},
+   {a="([Iy])(')(aN%p?)$", b="%1ئ%3"},
+   {a="([Iy])(')(aN)(%p?%s)", b="%1ئ%3%4"},
+   {a="([^uai])(')(aN)(%p?)$", b="%1ء%3ا%4"},
+   {a="([^uai])(')(aN)(%p?%s)", b="%1ء%3ا%4"},
+   {a="([^uai])(')([ui]N?%p?)$", b="%1ء%3"},
+   {a="([^uai])(')([ui]N?)(%p?%s)", b="%1ء%3%4"},
 -- u
    {a="(u)(')([uai]N?%p?)$", b="%1ؤ%3"},
    {a="(u)(')([uai]N?)(%p?%s)", b="%1ؤ%3%4"},
@@ -230,8 +240,18 @@ hamzafveasy = { -- differences marked below with 'easy'
    -- take out the following two lines:
    -- {a="(')(I%p?)$", b="إ%2"}, -- affix pr. 1st person sg.
    -- {a="(')(I)(%p?%s)", b="إ%2%3"}, -- affix pr. 1st person sg.
-   {a="([^uai])(')([uai]N?%p?)$", b="%1ء%3"},
-   {a="([^uai])(')([uai]N?)(%p?%s)", b="%1ء%3%4"},
+   --
+   -- The Munjid says that such words as radI'aN do not have the
+   -- hamzah alone on the line so replace the following two lines with
+   -- the next two:
+   -- {a="([^uai])(')([uai]N?%p?)$", b="%1ء%3"},
+   -- {a="([^uai])(')([uai]N?)(%p?%s)", b="%1ء%3%4"},
+   {a="([Iy])(')(aN%p?)$", b="%1ئ%3"},
+   {a="([Iy])(')(aN)(%p?%s)", b="%1ئ%3%4"},
+   {a="([^uai])(')(aN)(%p?)$", b="%1ء%3ا%4"},
+   {a="([^uai])(')(aN)(%p?%s)", b="%1ء%3ا%4"},
+   {a="([^uai])(')([ui]N?%p?)$", b="%1ء%3"},
+   {a="([^uai])(')([ui]N?)(%p?%s)", b="%1ء%3%4"},
 -- u
    {a="(u)(')([uai]N?%p?)$", b="%1ؤ%3"},
    {a="(u)(')([uai]N?)(%p?%s)", b="%1ؤ%3%4"},
diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index 10c7879..39d4bec 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -238,8 +238,18 @@ hamza = {
    -- take out the following two lines:
    -- {a="(')(I%p?)$", b="إ%2"}, -- affix pr. 1st person sg.
    -- {a="(')(I)(%p?%s)", b="إ%2%3"}, -- affix pr. 1st person sg.
-   {a="([^uai])(')([uai]N?%p?)$", b="%1ء%3"},
-   {a="([^uai])(')([uai]N?)(%p?%s)", b="%1ء%3%4"},
+   --
+   -- The Munjid says that such words as radI'aN do not have the
+   -- hamzah alone on the line so replace the following two lines with
+   -- the next two:
+   -- {a="([^uai])(')([uai]N?%p?)$", b="%1ء%3"},
+   -- {a="([^uai])(')([uai]N?)(%p?%s)", b="%1ء%3%4"},
+   {a="([Iy])(')(aN%p?)$", b="%1ئ%3"},
+   {a="([Iy])(')(aN)(%p?%s)", b="%1ئ%3%4"},
+   {a="([^uai])(')(aN)(%p?)$", b="%1ء%3ا%4"},
+   {a="([^uai])(')(aN)(%p?%s)", b="%1ء%3ا%4"},
+   {a="([^uai])(')([ui]N?%p?)$", b="%1ء%3"},
+   {a="([^uai])(')([ui]N?)(%p?%s)", b="%1ء%3%4"},
 -- u
    {a="(u)(')([uai]N?%p?)$", b="%1ؤ%3"},
    {a="(u)(')([uai]N?)(%p?%s)", b="%1ؤ%3%4"},
@@ -357,8 +367,18 @@ hamzaeasy = { -- differences marked below with 'easy'
    -- take out the following two lines:
    -- {a="(')(I%p?)$", b="إ%2"}, -- affix pr. 1st person sg.
    -- {a="(')(I)(%p?%s)", b="إ%2%3"}, -- affix pr. 1st person sg.
-   {a="([^uai])(')([uai]N?%p?)$", b="%1ء%3"},
-   {a="([^uai])(')([uai]N?)(%p?%s)", b="%1ء%3%4"},
+   --
+   -- The Munjid says that such words as radI'aN do not have the
+   -- hamzah alone on the line so replace the following two lines with
+   -- the next two:
+   -- {a="([^uai])(')([uai]N?%p?)$", b="%1ء%3"},
+   -- {a="([^uai])(')([uai]N?)(%p?%s)", b="%1ء%3%4"},
+   {a="([Iy])(')(aN%p?)$", b="%1ئ%3"},
+   {a="([Iy])(')(aN)(%p?%s)", b="%1ئ%3%4"},
+   {a="([^uai])(')(aN)(%p?)$", b="%1ء%3ا%4"},
+   {a="([^uai])(')(aN)(%p?%s)", b="%1ء%3ا%4"},
+   {a="([^uai])(')([ui]N?%p?)$", b="%1ء%3"},
+   {a="([^uai])(')([ui]N?)(%p?%s)", b="%1ء%3%4"},
 -- u
    {a="(u)(')([uai]N?%p?)$", b="%1ؤ%3"},
    {a="(u)(')([uai]N?)(%p?%s)", b="%1ؤ%3%4"},