From 30e818377ec27916cedb20ae597b40a60e0b7b96 Mon Sep 17 00:00:00 2001 From: Robert Alessi Date: Fri, 8 Sep 2017 09:46:48 +0200 Subject: such words as hay'At should not have the maddah --- arabluatex_fullvoc.lua | 10 +++++----- arabluatex_voc.lua | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua index cf33a3a..769b841 100644 --- a/arabluatex_fullvoc.lua +++ b/arabluatex_fullvoc.lua @@ -66,7 +66,7 @@ hamzafv = { {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"}, + {a="([^uiyUI])\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="%1آ%2"}, {a="^\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="آ%1"}, {a="(%W)\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="%1آ%2"}, {a="(A)(')(uN?%p?)$", b="aآء%3"}, @@ -129,8 +129,8 @@ hamzafv = { {a="(i)(')(%p?%s)", b="%1ئْ%3"}, -- -- middle - {a="([Uw])(')", b="%1ء"}, --new - {a="([Iy])(')", b="%1ئ"}, + {a="([UIwy])(')", b="%1ء"}, --new + -- {a="([Iy])(')", b="%1ئ"}, --included in the above line {a="([^uai])(')([uU])", b="%1ؤ%3"}, {a="([^uai])(')(%_?[aAY])", b="%1أ%3"}, {a="([^uai])(')([iI])", b="%1ئ%3"}, @@ -192,7 +192,7 @@ hamzafveasy = { -- differences marked below with 'easy' {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"}, + {a="([^uiyUI])\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="%1آ%2"}, {a="^\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="آ%1"}, {a="(%W)\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="%1آ%2"}, --easy (begin) @@ -268,7 +268,7 @@ hamzafveasy = { -- differences marked below with 'easy' -- -- middle {a="([Uw])(')", b="%1ء"}, --new - {a="([Iy])(')", b="%1ئ"}, + {a="([Iy])(')", b="%1ئ"}, --easy {a="([^uai])(')([uU])", b="%1ؤ%3"}, {a="([^uai])(')(%_?[aAY])", b="%1أ%3"}, {a="([^uai])(')([iI])", b="%1ئ%3"}, diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua index 68b290d..4d9473a 100644 --- a/arabluatex_voc.lua +++ b/arabluatex_voc.lua @@ -202,7 +202,7 @@ hamza = { {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"}, + {a="([^uiyUI])\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="%1آ%2"}, {a="^\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="آ%1"}, {a="(%W)\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="%1آ%2"}, {a="(A)(')(uN?%p?)$", b="aآء%3"}, @@ -265,8 +265,8 @@ hamza = { {a="(i)(')(%p?%s)", b="%1ئ%3"}, -- -- middle - {a="([Uw])(')", b="%1ء"}, --new - {a="([Iy])(')", b="%1ئ"}, + {a="([UIwy])(')", b="%1ء"}, --new + -- {a="([Iy])(')", b="%1ئ"}, -- included in the above line {a="([^uai])(')([uU])", b="%1ؤ%3"}, {a="([^uai])(')(%_?[aAY])", b="%1أ%3"}, {a="([^uai])(')([iI])", b="%1ئ%3"}, @@ -319,7 +319,7 @@ hamzaeasy = { -- differences marked below with 'easy' {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"}, + {a="([^uiyUI])\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="%1آ%2"}, {a="^\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="آ%1"}, {a="(%W)\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="%1آ%2"}, --easy (begin) @@ -395,7 +395,7 @@ hamzaeasy = { -- differences marked below with 'easy' -- -- middle {a="([Uw])(')", b="%1ء"}, --new - {a="([Iy])(')", b="%1ئ"}, + {a="([Iy])(')", b="%1ئ"}, --easy {a="([^uai])(')([uU])", b="%1ؤ%3"}, {a="([^uai])(')(%_?[aAY])", b="%1أ%3"}, {a="([^uai])(')([iI])", b="%1ئ%3"}, -- cgit v1.2.3