more work on the rules of taḫfīf al-hamzah

2 files changed, 18 insertions, 2 deletions

diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index e55f16d..1ad4bb8 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -59,6 +59,10 @@ hamzafv = {
    -- taḫfīfu 'l-hamza
    {a="'u'([^uaiUAI])", b="أU%1"},
    {a="'i'([^uaiUAI])", b="إI%1"},   
+   {a="^u'([^uaiUAI])", b="اU%1"},
+   {a="([^uaiUAIYN][%s%(%[%<])u'([^uaiUAI])", b="%1اU%2"},
+   {a="^i'([^uaiUAI])", b="اI%1"},
+   {a="([^uaiUAIYN][%s%(%[%<])i'([^uaiUAI])", b="%1اI%2"},
    -- madda (historic writing below)
    {a="'a'([^uaiUAI])", b="آ%1"},
    {a="([^uiUI])\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="%1آ%2"},
@@ -180,6 +184,10 @@ hamzafveasy = { -- differences marked below with 'easy'
    -- taḫfīfu 'l-hamza
    {a="'u'([^uaiUAI])", b="أU%1"},
    {a="'i'([^uaiUAI])", b="إI%1"},   
+   {a="^u'([^uaiUAI])", b="اU%1"},
+   {a="([^uaiUAIYN][%s%(%[%<])u'([^uaiUAI])", b="%1اU%2"},
+   {a="^i'([^uaiUAI])", b="اI%1"},
+   {a="([^uaiUAIYN][%s%(%[%<])i'([^uaiUAI])", b="%1اI%2"},
    -- madda (historic writing below)
    {a="'a'([^uaiUAI])", b="آ%1"},
    {a="([^uiUI])\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="%1آ%2"},
diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index 3639480..135a757 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -194,7 +194,11 @@ hamza = {
    {a="%'%_I", b="إI"},
    -- taḫfīfu 'l-hamza
    {a="'u'([^uaiUAI])", b="أU%1"},
-   {a="'i'([^uaiUAI])", b="إI%1"},   
+   {a="'i'([^uaiUAI])", b="إI%1"},
+   {a="^u'([^uaiUAI])", b="اU%1"},
+   {a="([^uaiUAIYN][%s%(%[%<])u'([^uaiUAI])", b="%1اU%2"},
+   {a="^i'([^uaiUAI])", b="اI%1"},
+   {a="([^uaiUAIYN][%s%(%[%<])i'([^uaiUAI])", b="%1اI%2"},
    -- madda (historic writing below)
    {a="'a'([^uaiUAI])", b="آ%1"},
    {a="([^uiUI])\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="%1آ%2"},
@@ -306,7 +310,11 @@ hamzaeasy = { -- differences marked below with 'easy'
    {a="%'%_I", b="إI"},
    -- taḫfīfu 'l-hamza
    {a="'u'([^uaiUAI])", b="أU%1"},
-   {a="'i'([^uaiUAI])", b="إI%1"},   
+   {a="'i'([^uaiUAI])", b="إI%1"},
+   {a="^u'([^uaiUAI])", b="اU%1"},
+   {a="([^uaiUAIYN][%s%(%[%<])u'([^uaiUAI])", b="%1اU%2"},
+   {a="^i'([^uaiUAI])", b="اI%1"},
+   {a="([^uaiUAIYN][%s%(%[%<])i'([^uaiUAI])", b="%1اI%2"},
    -- madda (historic writing below)
    {a="'a'([^uaiUAI])", b="آ%1"},
    {a="([^uiUI])\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="%1آ%2"},