1 files changed, 20 insertions, 20 deletions

diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index 5dbc59f..25dd2a1 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -209,29 +209,29 @@ hamza = {
    -- ^say'aN and .zim'aN are special orthographies
    {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?)$", b="%1ء%3"},
+   {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="(u)(')([uai][^%.%^%_]N?)$", b="%1ؤ%3"},
+   {a="(u)(')([uai][^%.%^%_]N?)(%W)", b="%1ؤ%3%4"},
    {a="(u)(')$", b="%1ؤ"},
    {a="(u)(')(%W)", b="%1ؤ%3"},
 -- a
    {a="(a)(')(A)$", b="%1آ"},
    {a="(a)(')(A)(%W)", b="%1آ%4"},
-   {a="(a)(')([u]N?)$", b="%1أ%3"},
-   {a="(a)(')([u]N?)(%W)", b="%1أ%3%4"},
+   {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"},
+   {a="(a)(')([i][^%.%^%_]N?)$", b="%1إ%3"},
+   {a="(a)(')([i][^%.%^%_]N?)(%W)", b="%1إ%3%4"},
    {a="(a)(')$", b="%1أ"},
    {a="(a)(')(%W)", b="%1أ%3"},
 -- i
-   {a="(i)(')([uai]N?)$", b="%1ئ%3"},
-   {a="(i)(')([uai]N?)(%W)", b="%1ئ%3%4"},
+   {a="(i)(')([uai][^%.%^%_]N?)$", b="%1ئ%3"},
+   {a="(i)(')([uai][^%.%^%_]N?)(%W)", b="%1ئ%3%4"},
    {a="(i)(')$", b="%1ئ"},
    {a="(i)(')(%W)", b="%1ئ%3"},
 --
@@ -300,29 +300,29 @@ hamzaeasy = { -- differences marked below with 'easy'
    -- ^say'aN and .zim'aN are special orthographies
    {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?)$", b="%1ء%3"},
+   {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="(u)(')([uai][^%.%^%_]N?)$", b="%1ؤ%3"},
+   {a="(u)(')([uai][^%.%^%_]N?)(%W)", b="%1ؤ%3%4"},
    {a="(u)(')$", b="%1ؤ"},
    {a="(u)(')(%W)", b="%1ؤ%3"},
 -- a
    {a="(a)(')(A)$", b="%1آ"},
    {a="(a)(')(A)(%W)", b="%1آ%4"},
-   {a="(a)(')([u]N?)$", b="%1أ%3"},
-   {a="(a)(')([u]N?)(%W)", b="%1أ%3%4"},
+   {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"},
+   {a="(a)(')([i][^%.%^%_]N?)$", b="%1إ%3"},
+   {a="(a)(')([i][^%.%^%_]N?)(%W)", b="%1إ%3%4"},
    {a="(a)(')$", b="%1أ"},
    {a="(a)(')(%W)", b="%1أ%3"},
 -- i
-   {a="(i)(')([uai]N?)$", b="%1ئ%3"},
-   {a="(i)(')([uai]N?)(%W)", b="%1ئ%3%4"},
+   {a="(i)(')([uai][^%.%^%_]N?)$", b="%1ئ%3"},
+   {a="(i)(')([uai][^%.%^%_]N?)(%W)", b="%1ئ%3%4"},
    {a="(i)(')$", b="%1ئ"},
    {a="(i)(')(%W)", b="%1ئ%3"},
 --