From ebd79c76eb6da4498c8b3f4854e990096734586c Mon Sep 17 00:00:00 2001 From: Robert Alessi Date: Fri, 28 Jul 2017 10:53:29 +0200 Subject: =?UTF-8?q?added=20=CA=BEalif=20maq=E1=B9=A3=C5=ABrah=20after=20ha?= =?UTF-8?q?mzah=20in=20the=20fullvoc=20rules?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arabluatex_fullvoc.lua | 52 ++++++++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 23 deletions(-) (limited to 'arabluatex_fullvoc.lua') diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua index 5b1ad20..b7237db 100644 --- a/arabluatex_fullvoc.lua +++ b/arabluatex_fullvoc.lua @@ -102,7 +102,7 @@ hamzafv = { -- u {a="(u)(')([uai]N?%p?)$", b="%1ؤ%3"}, {a="(u)(')([uai]N?)(%p?%s)", b="%1ؤ%3%4"}, - {a="(u)('%p?)$", b="%1ؤْ"}, + {a="(u)(')(%p?)$", b="%1ؤْ%3"}, {a="(u)(')(%p?%s)", b="%1ؤْ%3"}, -- a {a="(a)(')(A%p?)$", b="%1آ"}, @@ -115,27 +115,27 @@ hamzafv = { {a="(a)(')(aN)(%p?%s)", b="%1أً%4"}, {a="(a)(')([i]N?%p?)$", b="%1إ%3"}, {a="(a)(')([i]N?)(%p?%s)", b="%1إ%3%4"}, - {a="(a)('%p?)$", b="%1أْ"}, + {a="(a)(')(%p?)$", b="%1أْ%3"}, {a="(a)(')(%p?%s)", b="%1أْ%3"}, -- i {a="(i)(')([uai]N?%p?)$", b="%1ئ%3"}, {a="(i)(')([uai]N?)(%p?%s)", b="%1ئ%3%4"}, - {a="(i)('%p?)$", b="%1ئْ"}, + {a="(i)(')(%p?)$", b="%1ئْ%3"}, {a="(i)(')(%p?%s)", b="%1ئْ%3"}, -- -- middle {a="(U)(')", b="%1ء"}, {a="([Iy])(')", b="%1ئ"}, {a="([^uai])(')([uU])", b="%1ؤ%3"}, - {a="([^uai])(')([aA])", b="%1أ%3"}, + {a="([^uai])(')(%_?[aAY])", b="%1أ%3"}, {a="([^uai])(')([iI])", b="%1ئ%3"}, {a="(u)(')([uU])", b="%1ؤ%3"}, - {a="(u)(')([aA])", b="%1ؤ%3"}, + {a="(u)(')(%_?[aAY])", b="%1ؤ%3"}, {a="(u)(')([iI])", b="%1ئ%3"}, - {a="(a)(')([aA])", b="%1أ%3"}, + {a="(a)(')(%_?[aAY])", b="%1أ%3"}, {a="(a)(')([uU])", b="%1ؤ%3"}, {a="(a)(')([iI])", b="%1ئ%3"}, - {a="(i)(')([aA])", b="%1ئ%3"}, + {a="(i)(')(%_?[aAY])", b="%1ئ%3"}, {a="(i)(')([uU])", b="%1ئ%3"}, {a="(i)(')([iI])", b="%1ئ%3"}, {a="(a)(')([^uaiUAI])", b="%1أْ%3"}, @@ -225,7 +225,7 @@ hamzafveasy = { -- differences marked below with 'easy' -- u {a="(u)(')([uai]N?%p?)$", b="%1ؤ%3"}, {a="(u)(')([uai]N?)(%p?%s)", b="%1ؤ%3%4"}, - {a="(u)('%p?)$", b="%1ؤْ"}, + {a="(u)(')(%p?)$", b="%1ؤْ%3"}, {a="(u)(')(%p?%s)", b="%1ؤْ%3"}, -- a {a="(a)(')(A%p?)$", b="%1آ"}, @@ -238,27 +238,27 @@ hamzafveasy = { -- differences marked below with 'easy' {a="(a)(')(aN)(%p?%s)", b="%1أً%4"}, {a="(a)(')([i]N?%p?)$", b="%1إ%3"}, {a="(a)(')([i]N?)(%p?%s)", b="%1إ%3%4"}, - {a="(a)('%p?)$", b="%1أْ"}, + {a="(a)(')(%p?)$", b="%1أْ%3"}, {a="(a)(')(%p?%s)", b="%1أْ%3"}, -- i {a="(i)(')([uai]N?%p?)$", b="%1ئ%3"}, {a="(i)(')([uai]N?)(%p?%s)", b="%1ئ%3%4"}, - {a="(i)('%p?)$", b="%1ئْ"}, + {a="(i)(')(%p?)$", b="%1ئْ%3"}, {a="(i)(')(%p?%s)", b="%1ئْ%3"}, -- -- middle {a="(U)(')", b="%1ء"}, {a="([Iy])(')", b="%1ئ"}, {a="([^uai])(')([uU])", b="%1ؤ%3"}, - {a="([^uai])(')([aA])", b="%1أ%3"}, + {a="([^uai])(')(%_?[aAY])", b="%1أ%3"}, {a="([^uai])(')([iI])", b="%1ئ%3"}, {a="(u)(')([uU])", b="%1ؤ%3"}, - {a="(u)(')([aA])", b="%1ؤ%3"}, + {a="(u)(')(%_?[aAY])", b="%1ؤ%3"}, {a="(u)(')([iI])", b="%1ئ%3"}, - {a="(a)(')([aA])", b="%1أ%3"}, + {a="(a)(')(%_?[aAY])", b="%1أ%3"}, {a="(a)(')([uU])", b="%1ؤ%3"}, {a="(a)(')([iI])", b="%1ئ%3"}, - {a="(i)(')([aA])", b="%1ئ%3"}, + {a="(i)(')(%_?[aAY])", b="%1ئ%3"}, {a="(i)(')([uU])", b="%1ئ%3"}, {a="(i)(')([iI])", b="%1ئ%3"}, {a="(a)(')([^uaiUAI])", b="%1أْ%3"}, @@ -597,11 +597,13 @@ digraphsfvidgham = { {a="%^n%^n", b="ڭّ"}, -- additional characters + šaddah (end) -- sukūn begin - -- first, take out hyphen if any: - {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwyY])%-([uaiUAI])", b="%1%2"}, + -- first, take out hyphen if any (next two lines): + {a="([ai]Y)%-([uaiUAI])", b="%1%2"}, + {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])%-([uaiUAI])", b="%1%2"}, {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])(%p?)$", b="%1ْ%2"}, {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])(%p?%s)", b="%1ْ%2"}, - {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwyY])([%_]?[^%_uaiUAIYًٌٍ])", b="%1ْ%2"}, + {a="([ai]Y)([%_]?[^%_uaiUAIYًٌٍ])", b="%1ْ%2"}, + {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])([%_]?[^%_uaiUAIYًٌٍ])", b="%1ْ%2"}, -- take out sukūn in cases of assimilation {a="(n)(ْ)(%s)(ر)", b="%1%3%4"}, {a="(n)(ْ)(%s)(و)", b="%1%3%4"}, @@ -722,11 +724,13 @@ digraphsfv = { {a="%^n%^n", b="ڭّ"}, -- additional characters + šaddah (end) -- sukūn begin - -- first, take out hyphen if any: - {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwyY])%-([uaiUAI])", b="%1%2"}, + -- first, take out hyphen if any (next two lines): + {a="([ai]Y)%-([uaiUAI])", b="%1%2"}, + {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])%-([uaiUAI])", b="%1%2"}, {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])(%p?)$", b="%1ْ%2"}, {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])(%p?%s)", b="%1ْ%2"}, - {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwyY])([%_]?[^%_uaiUAIYًٌٍ])", b="%1ْ%2"}, + {a="([ai]Y)([%_]?[^%_uaiUAIYًٌٍ])", b="%1ْ%2"}, + {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])([%_]?[^%_uaiUAIYًٌٍ])", b="%1ْ%2"}, -- take out sukūn in cases of assimilation -- {a="(n)(ْ)(%s)(ر)", b="%1%3%4"}, -- {a="(n)(ْ)(%s)(و)", b="%1%3%4"}, @@ -850,11 +854,13 @@ digraphsfveasy = { -- see the differences under 'easy' marker below -- first take out every previously generated sukūn by hamza rules, -- so there be no need to edit them: {a="ْ", b=""}, - -- first, take out hyphen if any: --- {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwyY])%-([uaiUAI])", b="%1%2"}, + -- first, take out hyphen if any (next two lines): +-- {a="([ai]Y)%-([uaiUAI])", b="%1%2"}, +-- {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])%-([uaiUAI])", b="%1%2"}, -- {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])(%p?)$", b="%1ْ%2"}, -- {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])(%p?%s)", b="%1ْ%2"}, --- {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwyY])([%_]?[^%_uaiUAIًٌٍ])", b="%1ْ%2"}, +-- {a="([ai]Y)([%_]?[^%_uaiUAIYًٌٍ])", b="%1ْ%2"}, +-- {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])([%_]?[^%_uaiUAIYًٌٍ])", b="%1ْ%2"}, -- take out sukūn in cases of assimilation -- {a="(n)(ْ)(%s)(ر)", b="%1%3%4"}, -- {a="(n)(ْ)(%s)(و)", b="%1%3%4"}, -- cgit v1.2.3