From d2f60b95cedce281a8f2da807a7e9688ce69eae0 Mon Sep 17 00:00:00 2001
From: Robert Alessi <alessi@robertalessi.net>
Date: Thu, 6 Jun 2019 18:33:03 +0200
Subject: =?UTF-8?q?moved=20the=20rules=20that=20generate=20suk=C5=ABn=20ov?=
 =?UTF-8?q?er=20final=20hamza=20when=20appropriate=20to=20a=20location=20w?=
 =?UTF-8?q?here=20they=20can=20operate?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 arabluatex.dtx         |  2 +-
 arabluatex_fullvoc.lua | 71 ++++++++++++++++++++++++++++++++++++--------------
 2 files changed, 53 insertions(+), 20 deletions(-)

diff --git a/arabluatex.dtx b/arabluatex.dtx
index f85be27..abbea3f 100644
--- a/arabluatex.dtx
+++ b/arabluatex.dtx
@@ -2325,7 +2325,7 @@
     gutter=1cm]
     \bayt{.gayra 'annI qad 'asta`Inu `al_A 'l-ha--}[--mmi ]{'i_dA
       _haffa bi-'l-_tawiyyi 'l-na^gA'u}\\
-    \bayt{bi-zaf--UfiN ka-'anna-hA hi{q}--laTuN}[ 'ummu ]{ri'AliN
+    \bayt{bi-zaf--UfiN ka-'anna-hA hiq|--laTuN}[ 'ummu ]{ri'AliN
       dawwiyyaTuN saqfA'u}\\
   \end{arabverse}
 \end{example}
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
-- 
cgit v1.2.3