1 files changed, 52 insertions, 19 deletions

diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index f524c3b..ca62308 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -38,15 +38,19 @@ hamzafv = {
    {a="w\"'", b="ؤ"},
    {a="i\"'", b="إ"},
    {a="y\"'", b="ئ"},
-   {a="ؤ([^uaiUAI])", b="ؤْ%1"},
-   {a="ؤ(%p*)$", b="ؤْ%1"},
-   {a="ؤ(%p*%s)", b="ؤْ%1"},
-   {a="أ([^uaiUAI])", b="أْ%1"},
-   {a="أ(%p*)$", b="أْ%1"},
-   {a="أ(%p*%s)", b="أْ%1"},
-   {a="ئ([^uaiUAI])", b="ئْ%1"},
-   {a="ئ(%p*)$", b="ئْ%1"},
-   {a="ئ(%p*%s)", b="ئْ%1"},
+   -- moved below (end of 'final' section)
+   -- {a="ؤ([^uaiUAI])", b="ؤْ%1"},
+   -- {a="ؤ(%p*)$", b="ؤْ%1"},
+   -- {a="ؤ(%p*%s)", b="ؤْ%1"},
+   -- {a="أ([^uaiUAI])", b="أْ%1"},
+   -- {a="أ(%p*)$", b="أْ%1"},
+   -- {a="أ(%p*%s)", b="أْ%1"},
+   -- {a="ئ([^uaiUAI])", b="ئْ%1"},
+   -- {a="ئ(%p*)$", b="ئْ%1"},
+   -- {a="ئ(%p*%s)", b="ئْ%1"},
+   -- {a="ء([^uaiUAI])", b="ءْ%1"},
+   -- {a="ء(%p*)$", b="ءْ%1"},
+   -- {a="ء(%p*%s)", b="ءْ%1"},
    -- hamza takes tašdīd too
    {a="''([Uu])", b="ؤؤ%1"},
    {a="''([Aa])", b="أأ%1"},
@@ -129,7 +133,19 @@ hamzafv = {
    {a="(i)(')([uai]N?)(%p*%s)", b="%1ئ%3%4"},
    {a="(i)(')(%p*)$", b="%1ئْ%3"},
    {a="(i)(')(%p*%s)", b="%1ئْ%3"},
---
+-- moved here from above:
+   {a="ؤ([^uaiUAI])", b="ؤْ%1"},
+   {a="ؤ(%p*)$", b="ؤْ%1"},
+   {a="ؤ(%p*%s)", b="ؤْ%1"},
+   {a="أ([^uaiUAI])", b="أْ%1"},
+   {a="أ(%p*)$", b="أْ%1"},
+   {a="أ(%p*%s)", b="أْ%1"},
+   {a="ئ([^uaiUAI])", b="ئْ%1"},
+   {a="ئ(%p*)$", b="ئْ%1"},
+   {a="ئ(%p*%s)", b="ئْ%1"},
+   {a="ء([^uaiUAI])", b="ءْ%1"},
+   {a="ء(%p*)$", b="ءْ%1"},
+   {a="ء(%p*%s)", b="ءْ%1"},
    -- middle
    {a="([UIwy])(')", b="%1ء"}, --new
    -- {a="([Iy])(')", b="%1ئ"}, --included in the above line
@@ -166,15 +182,19 @@ hamzafveasy = { -- differences marked below with 'easy'
    {a="w\"'", b="ؤ"},
    {a="i\"'", b="إ"},
    {a="y\"'", b="ئ"},
-   {a="ؤ([^uaiUAI])", b="ؤْ%1"},
-   {a="ؤ(%p*)$", b="ؤْ%1"},
-   {a="ؤ(%p*%s)", b="ؤْ%1"},
-   {a="أ([^uaiUAI])", b="أْ%1"},
-   {a="أ(%p*)$", b="أْ%1"},
-   {a="أ(%p*%s)", b="أْ%1"},
-   {a="ئ([^uaiUAI])", b="ئْ%1"},
-   {a="ئ(%p*)$", b="ئْ%1"},
-   {a="ئ(%p*%s)", b="ئْ%1"},
+   -- moved below (end of 'final' section)
+   -- {a="ؤ([^uaiUAI])", b="ؤْ%1"},
+   -- {a="ؤ(%p*)$", b="ؤْ%1"},
+   -- {a="ؤ(%p*%s)", b="ؤْ%1"},
+   -- {a="أ([^uaiUAI])", b="أْ%1"},
+   -- {a="أ(%p*)$", b="أْ%1"},
+   -- {a="أ(%p*%s)", b="أْ%1"},
+   -- {a="ئ([^uaiUAI])", b="ئْ%1"},
+   -- {a="ئ(%p*)$", b="ئْ%1"},
+   -- {a="ئ(%p*%s)", b="ئْ%1"},
+   -- {a="ء([^uaiUAI])", b="ءْ%1"},
+   -- {a="ء(%p*)$", b="ءْ%1"},
+   -- {a="ء(%p*%s)", b="ءْ%1"},
    -- hamza takes tašdīd too
    {a="''([Uu])", b="ؤؤ%1"},
    {a="''([Aa])", b="أأ%1"},
@@ -269,6 +289,19 @@ hamzafveasy = { -- differences marked below with 'easy'
    {a="(i)(')([uai]N?)(%p*%s)", b="%1ئ%3%4"},
    {a="(i)(')(%p*)$", b="%1ئْ%3"},
    {a="(i)(')(%p*%s)", b="%1ئْ%3"},
+-- moved here from above:
+   {a="ؤ([^uaiUAI])", b="ؤْ%1"},
+   {a="ؤ(%p*)$", b="ؤْ%1"},
+   {a="ؤ(%p*%s)", b="ؤْ%1"},
+   {a="أ([^uaiUAI])", b="أْ%1"},
+   {a="أ(%p*)$", b="أْ%1"},
+   {a="أ(%p*%s)", b="أْ%1"},
+   {a="ئ([^uaiUAI])", b="ئْ%1"},
+   {a="ئ(%p*)$", b="ئْ%1"},
+   {a="ئ(%p*%s)", b="ئْ%1"},
+   {a="ء([^uaiUAI])", b="ءْ%1"},
+   {a="ء(%p*)$", b="ءْ%1"},
+   {a="ء(%p*%s)", b="ءْ%1"},
 --
    -- middle
    {a="([Uw])(')", b="%1ء"}, --new