From 82a4715ea19f52a271b7bb0dc00d1c8d03a8d95f Mon Sep 17 00:00:00 2001 From: Robert Alessi Date: Sat, 16 Nov 2019 19:33:13 +0100 Subject: =?UTF-8?q?reverted=20from=20[d2f60b9]=20which=20broke=20the=20ta?= =?UTF-8?q?=E1=B8=ABf=C4=ABf=20al-hamzah?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arabluatex_fullvoc.lua | 100 +++++++++++++++++++++++++------------------------ arabluatex_voc.lua | 4 +- 2 files changed, 54 insertions(+), 50 deletions(-) diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua index d5ca11a..7f9d476 100644 --- a/arabluatex_fullvoc.lua +++ b/arabluatex_fullvoc.lua @@ -39,18 +39,18 @@ hamzafv = { {a="i\"'", b="إ"}, {a="y\"'", b="ئ"}, -- 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"}, + {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"}, @@ -133,19 +133,21 @@ hamzafv = { {a="(i)(')([uai]N?)(%p*%s)", b="%1ئ%3%4"}, {a="(i)(')(%p*)$", b="%1ئْ%3"}, {a="(i)(')(%p*%s)", b="%1ئْ%3"}, +-- the following was wrong for it broke the taḫfīfu 'l-hamzati +-- (look into this later): -- 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"}, + -- {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 @@ -187,18 +189,18 @@ hamzafveasy = { -- differences marked below with 'easy' {a="i\"'", b="إ"}, {a="y\"'", b="ئ"}, -- 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"}, + {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"}, @@ -293,19 +295,21 @@ 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"}, +-- the following was wrong for it broke the taḫfīfu 'l-hamzati +-- (look into this later): -- 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"}, + -- {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 diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua index 9b2a31c..995e9b3 100644 --- a/arabluatex_voc.lua +++ b/arabluatex_voc.lua @@ -202,7 +202,7 @@ hamza = { -- taḫfīfu 'l-hamza {a="'u'([^uaiUAI])", b="أU%1"}, {a="'i'([^uaiUAI])", b="إI%1"}, - {a="([wf]a)%-\'([^uaiUAIl][^%-])", b="%1أْ%2"}, + {a="([wf]a)%-\'([^uaiUAIl][^%-])", b="%1أ%2"}, {a="^u'([^uaiUAI])", b="اU%1"}, {a="([^uaiUAIYN][%s%(%[%<])u'([^uaiUAI])", b="%1اU%2"}, {a="^i'([^uaiUAI])", b="اI%1"}, @@ -325,7 +325,7 @@ hamzaeasy = { -- differences marked below with 'easy' -- taḫfīfu 'l-hamza {a="'u'([^uaiUAI])", b="أU%1"}, {a="'i'([^uaiUAI])", b="إI%1"}, - {a="([wf]a)%-\'([^uaiUAIl][^%-])", b="%1أْ%2"}, + {a="([wf]a)%-\'([^uaiUAIl][^%-])", b="%1أ%2"}, {a="^u'([^uaiUAI])", b="اU%1"}, {a="([^uaiUAIYN][%s%(%[%<])u'([^uaiUAI])", b="%1اU%2"}, {a="^i'([^uaiUAI])", b="اI%1"}, -- cgit v1.2.3