From 82a7066d1d16922036c67f11b2d05921cb7aaf8c Mon Sep 17 00:00:00 2001 From: Robert Alessi Date: Sat, 31 Mar 2018 00:05:24 +0200 Subject: %p? was not enough as a word boundary. replaced with %p* --- arabluatex_fullvoc.lua | 236 ++++++++++++++++++++++++------------------------- arabluatex_novoc.lua | 12 +-- arabluatex_trans.lua | 90 +++++++++---------- arabluatex_voc.lua | 160 ++++++++++++++++----------------- 4 files changed, 249 insertions(+), 249 deletions(-) diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua index 7b8d410..fd09169 100644 --- a/arabluatex_fullvoc.lua +++ b/arabluatex_fullvoc.lua @@ -39,14 +39,14 @@ hamzafv = { {a="i\"'", b="إ"}, {a="y\"'", b="ئ"}, {a="ؤ([^uaiUAI])", b="ؤْ%1"}, - {a="ؤ(%p?)$", b="ؤْ%1"}, - {a="ؤ(%p?%s)", 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="أ(%p*)$", b="أْ%1"}, + {a="أ(%p*%s)", b="أْ%1"}, {a="ئ([^uaiUAI])", b="ئْ%1"}, - {a="ئ(%p?)$", b="ئْ%1"}, - {a="ئ(%p?%s)", 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"}, @@ -69,10 +69,10 @@ hamzafv = { {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"}, - {a="(A)(')(uN?)(%p?%s)", b="aآء%3%4"}, - {a="(A)(')(iN?%p?)$", b="aآء%3"}, - {a="(A)(')(iN?)(%p?%s)", b="aآء%3%4"}, + {a="(A)(')(uN?%p*)$", b="aآء%3"}, + {a="(A)(')(uN?)(%p*%s)", b="aآء%3%4"}, + {a="(A)(')(iN?%p*)$", b="aآء%3"}, + {a="(A)(')(iN?)(%p*%s)", b="aآء%3%4"}, {a="(A)(')([iI])", b="aآئ%3"}, -- historic madda {a="(A)(')(u)", b="aآؤ%3"}, -- historic madda {a="(A)(')", b="aآء"}, -- historic madda @@ -102,31 +102,31 @@ hamzafv = { {a="(mi)(%')(aN%_?[AY])", b="%1أ%3"}, -- final hamzah is on the line after a letter of prolongation or a -- consonant with sukūn - {a="([^Auai])(')(\"?[uai]N?)(%p?)$", b="%1ء%3%4"}, --new - {a="([^Auai])(')(\"?[uai]N?)(%p?%s)", b="%1ء%3%4"}, + {a="([^Auai])(')(\"?[uai]N?)(%p*)$", b="%1ء%3%4"}, --new + {a="([^Auai])(')(\"?[uai]N?)(%p*%s)", b="%1ء%3%4"}, -- u - {a="(u)(')([uai]N?%p?)$", b="%1ؤ%3"}, - {a="(u)(')([uai]N?)(%p?%s)", b="%1ؤ%3%4"}, - {a="(u)(')(%p?)$", b="%1ؤْ%3"}, - {a="(u)(')(%p?%s)", b="%1ؤْ%3"}, + {a="(u)(')([uai]N?%p*)$", b="%1ؤ%3"}, + {a="(u)(')([uai]N?)(%p*%s)", b="%1ؤ%3%4"}, + {a="(u)(')(%p*)$", b="%1ؤْ%3"}, + {a="(u)(')(%p*%s)", b="%1ؤْ%3"}, -- a - {a="(a)(')(A%p?)$", b="%1آ"}, - {a="(a)(')(A)(%p?%s)", b="%1آ%4"}, - {a="(a)(')([u]N?%p?)$", b="%1أ%3"}, - {a="(a)(')([u]N?)(%p?%s)", b="%1أ%3%4"}, - {a="(a)(')(a%p?)$", b="%1أ%3"}, - {a="(a)(')(a)(%p?%s)", b="%1أ%3%4"}, - {a="(a)(')(aN%p?)$", b="%1أً"}, - {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أْ%3"}, - {a="(a)(')(%p?%s)", b="%1أْ%3"}, + {a="(a)(')(A%p*)$", b="%1آ"}, + {a="(a)(')(A)(%p*%s)", b="%1آ%4"}, + {a="(a)(')([u]N?%p*)$", b="%1أ%3"}, + {a="(a)(')([u]N?)(%p*%s)", b="%1أ%3%4"}, + {a="(a)(')(a%p*)$", b="%1أ%3"}, + {a="(a)(')(a)(%p*%s)", b="%1أ%3%4"}, + {a="(a)(')(aN%p*)$", b="%1أً"}, + {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أْ%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ئْ%3"}, - {a="(i)(')(%p?%s)", b="%1ئْ%3"}, + {a="(i)(')([uai]N?%p*)$", b="%1ئ%3"}, + {a="(i)(')([uai]N?)(%p*%s)", b="%1ئ%3%4"}, + {a="(i)(')(%p*)$", b="%1ئْ%3"}, + {a="(i)(')(%p*%s)", b="%1ئْ%3"}, -- -- middle {a="([UIwy])(')", b="%1ء"}, --new @@ -165,14 +165,14 @@ hamzafveasy = { -- differences marked below with 'easy' {a="i\"'", b="إ"}, {a="y\"'", b="ئ"}, {a="ؤ([^uaiUAI])", b="ؤْ%1"}, - {a="ؤ(%p?)$", b="ؤْ%1"}, - {a="ؤ(%p?%s)", 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="أ(%p*)$", b="أْ%1"}, + {a="أ(%p*%s)", b="أْ%1"}, {a="ئ([^uaiUAI])", b="ئْ%1"}, - {a="ئ(%p?)$", b="ئْ%1"}, - {a="ئ(%p?%s)", 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"}, @@ -196,10 +196,10 @@ hamzafveasy = { -- differences marked below with 'easy' {a="^\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="آ%1"}, {a="(%W)\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="%1آ%2"}, --easy (begin) - {a="(A)(')(uN?%p?)$", b="aاء%3"}, - {a="(A)(')(uN?)(%p?%s)", b="aاء%3%4"}, - {a="(A)(')(iN?%p?)$", b="aاء%3"}, - {a="(A)(')(iN?)(%p?%s)", b="aاء%3%4"}, + {a="(A)(')(uN?%p*)$", b="aاء%3"}, + {a="(A)(')(uN?)(%p*%s)", b="aاء%3%4"}, + {a="(A)(')(iN?%p*)$", b="aاء%3"}, + {a="(A)(')(iN?)(%p*%s)", b="aاء%3%4"}, {a="(A)(')([iI])", b="aائ%3"}, -- historic madda {a="(A)(')(u)", b="aاؤ%3"}, -- historic madda {a="(A)(')", b="aاء"}, -- historic madda @@ -233,38 +233,38 @@ hamzafveasy = { -- differences marked below with 'easy' -- hamzah alone on the line, so take out the following two lines -- (final hamzah is on the line after a letter of prolongation or a -- consonant with sukūn) - -- {a="([^Auai])(')(\"?[uai]N?)(%p?)$", b="%1ء%3%4"}, --new - -- {a="([^Auai])(')(\"?[uai]N?)(%p?%s)", b="%1ء%3%4"}, - {a="([^Auai])(')(\"?aN)(%p?)$", b="%1ئ%3%4"}, --new - {a="([^Auai])(')(\"?aN)(%p?%s)", b="%1ئ%3%4"}, --new - {a="([^uai])(')(\"?a)(%p?)$", b="%1ء%3%4"}, --new - {a="([^uai])(')(\"?a)(%p?%s)", b="%1ء%3%4"}, --new - {a="([^uai])(')(\"?[ui]N?)(%p?)$", b="%1ء%3%4"}, --new - {a="([^uai])(')(\"?[ui]N?)(%p?%s)", b="%1ء%3%4"}, --new + -- {a="([^Auai])(')(\"?[uai]N?)(%p*)$", b="%1ء%3%4"}, --new + -- {a="([^Auai])(')(\"?[uai]N?)(%p*%s)", b="%1ء%3%4"}, + {a="([^Auai])(')(\"?aN)(%p*)$", b="%1ئ%3%4"}, --new + {a="([^Auai])(')(\"?aN)(%p*%s)", b="%1ئ%3%4"}, --new + {a="([^uai])(')(\"?a)(%p*)$", b="%1ء%3%4"}, --new + {a="([^uai])(')(\"?a)(%p*%s)", b="%1ء%3%4"}, --new + {a="([^uai])(')(\"?[ui]N?)(%p*)$", b="%1ء%3%4"}, --new + {a="([^uai])(')(\"?[ui]N?)(%p*%s)", b="%1ء%3%4"}, --new --easy (end) -- u - {a="(u)(')([uai]N?%p?)$", b="%1ؤ%3"}, - {a="(u)(')([uai]N?)(%p?%s)", b="%1ؤ%3%4"}, - {a="(u)(')(%p?)$", b="%1ؤْ%3"}, - {a="(u)(')(%p?%s)", b="%1ؤْ%3"}, + {a="(u)(')([uai]N?%p*)$", b="%1ؤ%3"}, + {a="(u)(')([uai]N?)(%p*%s)", b="%1ؤ%3%4"}, + {a="(u)(')(%p*)$", b="%1ؤْ%3"}, + {a="(u)(')(%p*%s)", b="%1ؤْ%3"}, -- a - {a="(a)(')(A%p?)$", b="%1آ"}, - {a="(a)(')(A)(%p?%s)", b="%1آ%4"}, - {a="(a)(')([u]N?%p?)$", b="%1أ%3"}, - {a="(a)(')([u]N?)(%p?%s)", b="%1أ%3%4"}, - {a="(a)(')(a%p?)$", b="%1أ%3"}, - {a="(a)(')(a)(%p?%s)", b="%1أ%3%4"}, - {a="(a)(')(aN%p?)$", b="%1أً"}, - {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أْ%3"}, - {a="(a)(')(%p?%s)", b="%1أْ%3"}, + {a="(a)(')(A%p*)$", b="%1آ"}, + {a="(a)(')(A)(%p*%s)", b="%1آ%4"}, + {a="(a)(')([u]N?%p*)$", b="%1أ%3"}, + {a="(a)(')([u]N?)(%p*%s)", b="%1أ%3%4"}, + {a="(a)(')(a%p*)$", b="%1أ%3"}, + {a="(a)(')(a)(%p*%s)", b="%1أ%3%4"}, + {a="(a)(')(aN%p*)$", b="%1أً"}, + {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أْ%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ئْ%3"}, - {a="(i)(')(%p?%s)", b="%1ئْ%3"}, + {a="(i)(')([uai]N?%p*)$", b="%1ئ%3"}, + {a="(i)(')([uai]N?)(%p*%s)", b="%1ئ%3%4"}, + {a="(i)(')(%p*)$", b="%1ئْ%3"}, + {a="(i)(')(%p*%s)", b="%1ئْ%3"}, -- -- middle {a="([Uw])(')", b="%1ء"}, --new @@ -446,12 +446,12 @@ trigraphsfv = { -- trigraphs or more -- art. with waṣla + lunar consonant (i.e. what remains) {a="'l%-", b="ٱلْ"}, -- the silent wāw - {a="uU(%p?)$", b="uو%1"}, - {a="uU(%p?%s)", b="uو%1"}, - {a="aU(%p?)$", b="aو%1"}, - {a="aU(%p?%s)", b="aو%1"}, - {a="iU(%p?)$", b="iو%1"}, - {a="iU(%p?%s)", b="iو%1"}, + {a="uU(%p*)$", b="uو%1"}, + {a="uU(%p*%s)", b="uو%1"}, + {a="aU(%p*)$", b="aو%1"}, + {a="aU(%p*%s)", b="aو%1"}, + {a="iU(%p*)$", b="iو%1"}, + {a="iU(%p*%s)", b="iو%1"}, -- words ending in -āT with silent wāw/yāʾ {a="(_a)UA", b="%1وا"}, {a="(_a)U", b="%1و"}, @@ -527,12 +527,12 @@ trigraphsfveasy = { -- trigraphs or more (see 'easy' tag below for the diffs) -- art. with waṣla + lunar consonant (i.e. what remains) {a="'l%-", b="ٱلْ"}, -- the silent wāw - {a="uU(%p?)$", b="uو%1"}, - {a="uU(%p?%s)", b="uو%1"}, - {a="aU(%p?)$", b="aو%1"}, - {a="aU(%p?%s)", b="aو%1"}, - {a="iU(%p?)$", b="iو%1"}, - {a="iU(%p?%s)", b="iو%1"}, + {a="uU(%p*)$", b="uو%1"}, + {a="uU(%p*%s)", b="uو%1"}, + {a="aU(%p*)$", b="aو%1"}, + {a="aU(%p*%s)", b="aو%1"}, + {a="iU(%p*)$", b="iو%1"}, + {a="iU(%p*%s)", b="iو%1"}, -- words ending in -āT with silent wāw/yāʾ {a="(_a)UA", b="%1وا"}, {a="(_a)U", b="%1و"}, @@ -541,16 +541,16 @@ trigraphsfveasy = { -- trigraphs or more (see 'easy' tag below for the diffs) digraphsfvidgham = { -- ʾiʿrāb: straight double quote must be discarded - {a="(%-)(\"?[UI]na)(%p?%s)", b="%2%3"}, - {a="(%-)(\"?[UI]na)(%p?)$", b="%2%3"}, - {a="(%-)(\"?At[ui])(%p?%s)", b="%2%3"}, - {a="(%-)(\"?At[ui])(%p?)$", b="%2%3"}, - {a="(%-)(\"?Ani)(%p?%s)", b="%2%3"}, - {a="(%-)(\"?Ani)(%p?)$", b="%2%3"}, - {a="(%-)(\"?ayni)(%p?%s)", b="%2%3"}, - {a="(%-)(\"?ayni)(%p?)$", b="%2%3"}, - {a="(%-)(\"?[uai])(%p?%s)", b="%2%3"}, - {a="(%-)(\"?[uai])(%p?)$", b="%2%3"}, + {a="(%-)(\"?[UI]na)(%p*%s)", b="%2%3"}, + {a="(%-)(\"?[UI]na)(%p*)$", b="%2%3"}, + {a="(%-)(\"?At[ui])(%p*%s)", b="%2%3"}, + {a="(%-)(\"?At[ui])(%p*)$", b="%2%3"}, + {a="(%-)(\"?Ani)(%p*%s)", b="%2%3"}, + {a="(%-)(\"?Ani)(%p*)$", b="%2%3"}, + {a="(%-)(\"?ayni)(%p*%s)", b="%2%3"}, + {a="(%-)(\"?ayni)(%p*)$", b="%2%3"}, + {a="(%-)(\"?[uai])(%p*%s)", b="%2%3"}, + {a="(%-)(\"?[uai])(%p*)$", b="%2%3"}, -- ʾiʿrāb (end) -- initial straight double quote gives a connective ʾalif {a="^\"[uai]", b="ٱ"}, @@ -620,8 +620,8 @@ digraphsfvidgham = { -- 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%`fqklmnwy])(%p*)$", b="%1ْ%2"}, + {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])(%p*%s)", 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 @@ -668,16 +668,16 @@ digraphsfvidgham = { digraphsfv = { -- iʿrāb: straight double quote must be discarded - {a="(%-)(\"?[UI]na)(%p?%s)", b="%2%3"}, - {a="(%-)(\"?[UI]na)(%p?)$", b="%2%3"}, - {a="(%-)(\"?At[ui])(%p?%s)", b="%2%3"}, - {a="(%-)(\"?At[ui])(%p?)$", b="%2%3"}, - {a="(%-)(\"?Ani)(%p?%s)", b="%2%3"}, - {a="(%-)(\"?Ani)(%p?)$", b="%2%3"}, - {a="(%-)(\"?ayni)(%p?%s)", b="%2%3"}, - {a="(%-)(\"?ayni)(%p?)$", b="%2%3"}, - {a="(%-)(\"?[uai])(%p?%s)", b="%2%3"}, - {a="(%-)(\"?[uai])(%p?)$", b="%2%3"}, + {a="(%-)(\"?[UI]na)(%p*%s)", b="%2%3"}, + {a="(%-)(\"?[UI]na)(%p*)$", b="%2%3"}, + {a="(%-)(\"?At[ui])(%p*%s)", b="%2%3"}, + {a="(%-)(\"?At[ui])(%p*)$", b="%2%3"}, + {a="(%-)(\"?Ani)(%p*%s)", b="%2%3"}, + {a="(%-)(\"?Ani)(%p*)$", b="%2%3"}, + {a="(%-)(\"?ayni)(%p*%s)", b="%2%3"}, + {a="(%-)(\"?ayni)(%p*)$", b="%2%3"}, + {a="(%-)(\"?[uai])(%p*%s)", b="%2%3"}, + {a="(%-)(\"?[uai])(%p*)$", b="%2%3"}, -- ʾiʿrāb (end) -- initial straight double quote gives a connective ʾalif {a="^\"[uai]", b="ٱ"}, @@ -747,8 +747,8 @@ digraphsfv = { -- 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%`fqklmnwy])(%p*)$", b="%1ْ%2"}, + {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])(%p*%s)", 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 @@ -795,16 +795,16 @@ digraphsfv = { digraphsfveasy = { -- see the differences under 'easy' marker below -- ʾiʿrāb: straight double quote must be discarded - {a="(%-)(\"?[UI]na)(%p?%s)", b="%2%3"}, - {a="(%-)(\"?[UI]na)(%p?)$", b="%2%3"}, - {a="(%-)(\"?At[ui])(%p?%s)", b="%2%3"}, - {a="(%-)(\"?At[ui])(%p?)$", b="%2%3"}, - {a="(%-)(\"?Ani)(%p?%s)", b="%2%3"}, - {a="(%-)(\"?Ani)(%p?)$", b="%2%3"}, - {a="(%-)(\"?ayni)(%p?%s)", b="%2%3"}, - {a="(%-)(\"?ayni)(%p?)$", b="%2%3"}, - {a="(%-)(\"?[uai])(%p?%s)", b="%2%3"}, - {a="(%-)(\"?[uai])(%p?)$", b="%2%3"}, + {a="(%-)(\"?[UI]na)(%p*%s)", b="%2%3"}, + {a="(%-)(\"?[UI]na)(%p*)$", b="%2%3"}, + {a="(%-)(\"?At[ui])(%p*%s)", b="%2%3"}, + {a="(%-)(\"?At[ui])(%p*)$", b="%2%3"}, + {a="(%-)(\"?Ani)(%p*%s)", b="%2%3"}, + {a="(%-)(\"?Ani)(%p*)$", b="%2%3"}, + {a="(%-)(\"?ayni)(%p*%s)", b="%2%3"}, + {a="(%-)(\"?ayni)(%p*)$", b="%2%3"}, + {a="(%-)(\"?[uai])(%p*%s)", b="%2%3"}, + {a="(%-)(\"?[uai])(%p*)$", b="%2%3"}, -- ʾiʿrāb (end) -- initial straight double quote gives a connective ʾalif {a="^\"[uai]", b="ٱ"}, @@ -877,8 +877,8 @@ digraphsfveasy = { -- see the differences under 'easy' marker below -- 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%`fqklmnwy])(%p*)$", b="%1ْ%2"}, +-- {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])(%p*%s)", 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 diff --git a/arabluatex_novoc.lua b/arabluatex_novoc.lua index 0bbd6ad..09f4903 100644 --- a/arabluatex_novoc.lua +++ b/arabluatex_novoc.lua @@ -121,12 +121,12 @@ trigraphsnv = { -- trigraphs or more -- art. with waṣla + lunar consonant (i.e. what remains) {a="'l%-", b="ال"}, -- the silent wāw - {a="uU(%p?)$", b="uو%1"}, - {a="uU(%p?%s)", b="uو%1"}, - {a="aU(%p?)$", b="aو%1"}, - {a="aU(%p?%s)", b="aو%1"}, - {a="iU(%p?)$", b="iو%1"}, - {a="iU(%p?%s)", b="iو%1"}, + {a="uU(%p*)$", b="uو%1"}, + {a="uU(%p*%s)", b="uو%1"}, + {a="aU(%p*)$", b="aو%1"}, + {a="aU(%p*%s)", b="aو%1"}, + {a="iU(%p*)$", b="iو%1"}, + {a="iU(%p*%s)", b="iو%1"}, -- words ending in -āT with silent wāw/yāʾ {a="(_a)UA", b="%1وا"}, {a="(_a)U", b="%1و"}, diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua index e758d77..61c989a 100644 --- a/arabluatex_trans.lua +++ b/arabluatex_trans.lua @@ -377,16 +377,16 @@ digraphstrdmg = { {a="([%_]?[Uu])(%s)([%(%[%|%<]?)(\"?[uai])", b="u%2%3'"}, --p {a="([%_]?[Ii])(%s)([%(%[%|%<]?)(\"?[uai])", b="i%2%3'"}, --p -- ʾiʿrāb hyphen (begin) - {a="(%-)(\"?[UI]na)(%p?%s)", b="\\arbup{%2}%3"}, - {a="(%-)(\"?[UI]na)(%p?)$", b="\\arbup{%2}%3"}, - {a="(%-)(\"?At[ui])(%p?%s)", b="\\arbup{%2}%3"}, - {a="(%-)(\"?At[ui])(%p?)$", b="\\arbup{%2}%3"}, - {a="(%-)(\"?Ani)(%p?%s)", b="\\arbup{%2}%3"}, - {a="(%-)(\"?Ani)(%p?)$", b="\\arbup{%2}%3"}, - {a="(%-)(\"?ayni)(%p?%s)", b="\\arbup{%2}%3"}, - {a="(%-)(\"?ayni)(%p?)$", b="\\arbup{%2}%3"}, - {a="(%-)(\"?[uai])(%p?%s)", b="\\arbup{%2}%3"}, - {a="(%-)(\"?[uai])(%p?)$", b="\\arbup{%2}%3"}, + {a="(%-)(\"?[UI]na)(%p*%s)", b="\\arbup{%2}%3"}, + {a="(%-)(\"?[UI]na)(%p*)$", b="\\arbup{%2}%3"}, + {a="(%-)(\"?At[ui])(%p*%s)", b="\\arbup{%2}%3"}, + {a="(%-)(\"?At[ui])(%p*)$", b="\\arbup{%2}%3"}, + {a="(%-)(\"?Ani)(%p*%s)", b="\\arbup{%2}%3"}, + {a="(%-)(\"?Ani)(%p*)$", b="\\arbup{%2}%3"}, + {a="(%-)(\"?ayni)(%p*%s)", b="\\arbup{%2}%3"}, + {a="(%-)(\"?ayni)(%p*)$", b="\\arbup{%2}%3"}, + {a="(%-)(\"?[uai])(%p*%s)", b="\\arbup{%2}%3"}, + {a="(%-)(\"?[uai])(%p*)$", b="\\arbup{%2}%3"}, -- ʾiʿrāb hyphen (end) shorten long vowels preceding ʾalif -- conjunctionis—without forgetting 'lla_dI {a="(U)(A)", b="U"}, @@ -406,18 +406,18 @@ digraphstrdmg = { {a="([%_]?[Uu])(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])", b="u%2%3"}, {a="([%_]?[Ii])(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])", b="i%2%3"}, {a="%-%-", b=""}, - {a="iyyaT(%p?)$", b="īyaT%1"}, - {a="iyyaT(%p?%s)", b="īyaT%1"}, - {a="iyy(%p?)$", b="ī%1"}, - {a="iyy(%p?%s)", b="ī%1"}, + {a="iyyaT(%p*)$", b="īyaT%1"}, + {a="iyyaT(%p*%s)", b="īyaT%1"}, + {a="iyy(%p*)$", b="ī%1"}, + {a="iyy(%p*%s)", b="ī%1"}, -- {a="T([^uai])", b="%1"}, {a="T(\\arbup)", b="t%1"}, {a="([a%'][%_%^%.]?[tdrzsln]%-)(%S-)T([%(%[%|%<%s])(a[%_%^%.]?[tdrzsln]%-)", b="%1%2h%3%4"}, --p {a="T([%(%[%|%<%s])(a[%_%^%.]?[tdrzsln]%-)", b="t%1%2"}, --p {a="T([%|\"])", b="t%1"}, - {a="T(%p?%s)", b="h%1"}, - {a="T(%p?)$", b="h%1"}, - {a="T(%p?)(%W)", b="h%1%2"}, + {a="T(%p*%s)", b="h%1"}, + {a="T(%p*)$", b="h%1"}, + {a="T(%p*)(%W)", b="h%1%2"}, {a="_t", b="ṯ"}, {a="%^g", b="ǧ"}, {a="%.h", b="ḥ"}, @@ -651,32 +651,32 @@ trigraphstrloc = { -- trigraphs or more digraphstrloc = { -- discard the ʾiʿrāb hyphen (begin) - {a="(%-)(\"?[UI]na)(%p?%s)", b="%2%3"}, - {a="(%-)(\"?[UI]na)(%p?)$", b="%2%3"}, - {a="(%-)(\"?At[ui])(%p?%s)", b="%2%3"}, - {a="(%-)(\"?At[ui])(%p?)$", b="%2%3"}, - {a="(%-)(\"?Ani)(%p?%s)", b="%2%3"}, - {a="(%-)(\"?Ani)(%p?)$", b="%2%3"}, - {a="(%-)(\"?ayni)(%p?%s)", b="%2%3"}, - {a="(%-)(\"?ayni)(%p?)$", b="%2%3"}, - {a="(%-)([uai])(%p?%s)", b="%2%3"}, - {a="(%-)([uai])(%p?)$", b="%2%3"}, + {a="(%-)(\"?[UI]na)(%p*%s)", b="%2%3"}, + {a="(%-)(\"?[UI]na)(%p*)$", b="%2%3"}, + {a="(%-)(\"?At[ui])(%p*%s)", b="%2%3"}, + {a="(%-)(\"?At[ui])(%p*)$", b="%2%3"}, + {a="(%-)(\"?Ani)(%p*%s)", b="%2%3"}, + {a="(%-)(\"?Ani)(%p*)$", b="%2%3"}, + {a="(%-)(\"?ayni)(%p*%s)", b="%2%3"}, + {a="(%-)(\"?ayni)(%p*)$", b="%2%3"}, + {a="(%-)([uai])(%p*%s)", b="%2%3"}, + {a="(%-)([uai])(%p*)$", b="%2%3"}, -- discard the ʾiʿrāb hyphen (end) {a="(%-)(\"?[uai])", b="%1%2"}, -- hyphen + initial alif without hamza {a="^(\"?[uai])", b="%1"}, -- initial alif without hamza {a="(%s)([uai])", b="%1%2"}, -- initial alif without hamza {a="%-%-", b=""}, {a="uww", b="ūw"}, - {a="iyy(%p?)$", b="ī%1"}, - {a="iyy(%p?%s)", b="ī%1"}, + {a="iyy(%p*)$", b="ī%1"}, + {a="iyy(%p*%s)", b="ī%1"}, {a="iyy", b="īy"}, {a="([tkdsg])(h)", b="%1'%2"}, -- {a="T([^uai])", b="h%1"}, {a="([a%']l%-)(%S-)T([%(%[%|%<%s])(al%-)", b="%1%2h%3%4"}, --p {a="T([%(%[%|%<%s])(al%-)", b="t%1%2"}, --p {a="T([%|\"])", b="t%1"}, - {a="T(%p?)$", b="h%1"}, - {a="T(%p?%s)", b="h%1"}, + {a="T(%p*)$", b="h%1"}, + {a="T(%p*%s)", b="h%1"}, {a="_t", b="th"}, {a="%^g", b="j"}, {a="%.h", b="ḥ"}, @@ -905,29 +905,29 @@ digraphstrarabica = { {a="(o[%S]-)([UAIuai])(o)(\"?[uai])", b=""}, {a="@", b=""}, -- remove the tag before the former hamza -- discard the ʾiʿrāb hyphen (begin) - {a="(%-)(\"?[UI]na)(%p?%s)", b="%2%3"}, - {a="(%-)(\"?[UI]na)(%p?)$", b="%2%3"}, - {a="(%-)(\"?At[ui])(%p?%s)", b="%2%3"}, - {a="(%-)(\"?At[ui])(%p?)$", b="%2%3"}, - {a="(%-)(\"?Ani)(%p?%s)", b="%2%3"}, - {a="(%-)(\"?Ani)(%p?)$", b="%2%3"}, - {a="(%-)(\"?ayni)(%p?%s)", b="%2%3"}, - {a="(%-)(\"?ayni)(%p?)$", b="%2%3"}, - {a="(%-)([uai])(%p?%s)", b="%2%3"}, - {a="(%-)([uai])(%p?)$", b="%2%3"}, + {a="(%-)(\"?[UI]na)(%p*%s)", b="%2%3"}, + {a="(%-)(\"?[UI]na)(%p*)$", b="%2%3"}, + {a="(%-)(\"?At[ui])(%p*%s)", b="%2%3"}, + {a="(%-)(\"?At[ui])(%p*)$", b="%2%3"}, + {a="(%-)(\"?Ani)(%p*%s)", b="%2%3"}, + {a="(%-)(\"?Ani)(%p*)$", b="%2%3"}, + {a="(%-)(\"?ayni)(%p*%s)", b="%2%3"}, + {a="(%-)(\"?ayni)(%p*)$", b="%2%3"}, + {a="(%-)([uai])(%p*%s)", b="%2%3"}, + {a="(%-)([uai])(%p*)$", b="%2%3"}, -- discard the ʾiʿrāb hyphen (end) {a="(%-)(\"?[uai])", b="%1%2"}, -- hyphen + initial alif without hamza {a="^(\"?[uai])", b="%1"}, -- initial alif without hamza {a="(%s)([uai])", b="%1%2"}, -- initial alif without hamza {a="%-%-", b=""}, - {a="iyy(%p?)$", b="ī%1"}, - {a="iyy(%p?%s)", b="ī%1"}, + {a="iyy(%p*)$", b="ī%1"}, + {a="iyy(%p*%s)", b="ī%1"}, -- {a="T([^uai])", b="h%1"}, {a="([a%']l%-)(%S-)aT([%(%[%|%<%s])(al%-)", b="%1%2a%3%4"}, --p {a="aT([%(%[%|%<%s])(al%-)", b="at%1%2"}, --p {a="T([%|\"])", b="t%1"}, - {a="aT(%p?)$", b="a%1"}, - {a="aT(%p?%s)", b="a%1"}, + {a="aT(%p*)$", b="a%1"}, + {a="aT(%p*%s)", b="a%1"}, {a="_t", b="ṯ"}, {a="%^g", b="ǧ"}, {a="%.h", b="ḥ"}, diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua index ac26c13..606a43b 100644 --- a/arabluatex_voc.lua +++ b/arabluatex_voc.lua @@ -212,10 +212,10 @@ hamza = { {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"}, - {a="(A)(')(uN?)(%p?%s)", b="aآء%3%4"}, - {a="(A)(')(iN?%p?)$", b="aآء%3"}, - {a="(A)(')(iN?)(%p?%s)", b="aآء%3%4"}, + {a="(A)(')(uN?%p*)$", b="aآء%3"}, + {a="(A)(')(uN?)(%p*%s)", b="aآء%3%4"}, + {a="(A)(')(iN?%p*)$", b="aآء%3"}, + {a="(A)(')(iN?)(%p*%s)", b="aآء%3%4"}, {a="(A)(')([iI])", b="aآئ%3"}, -- historic madda {a="(A)(')(u)", b="aآؤ%3"}, -- historic madda {a="(A)(')", b="aآء"}, -- historic madda @@ -245,31 +245,31 @@ hamza = { {a="(mi)(%')(aN%_?[AY])", b="%1أ%3"}, -- final hamzah is on the line after a letter of prolongation or a -- consonant with sukūn - {a="([^Auai])(')(\"?[uai]N?)(%p?)$", b="%1ء%3%4"}, --new - {a="([^Auai])(')(\"?[uai]N?)(%p?%s)", b="%1ء%3%4"}, + {a="([^Auai])(')(\"?[uai]N?)(%p*)$", b="%1ء%3%4"}, --new + {a="([^Auai])(')(\"?[uai]N?)(%p*%s)", b="%1ء%3%4"}, -- u - {a="(u)(')([uai]N?%p?)$", b="%1ؤ%3"}, - {a="(u)(')([uai]N?)(%p?%s)", b="%1ؤ%3%4"}, - {a="(u)(')(%p?)$", b="%1ؤ%3"}, - {a="(u)(')(%p?%s)", b="%1ؤ%3"}, + {a="(u)(')([uai]N?%p*)$", b="%1ؤ%3"}, + {a="(u)(')([uai]N?)(%p*%s)", b="%1ؤ%3%4"}, + {a="(u)(')(%p*)$", b="%1ؤ%3"}, + {a="(u)(')(%p*%s)", b="%1ؤ%3"}, -- a - {a="(a)(')(A%p?)$", b="%1آ"}, - {a="(a)(')(A)(%p?%s)", b="%1آ%4"}, - {a="(a)(')([u]N?%p?)$", b="%1أ%3"}, - {a="(a)(')([u]N?)(%p?%s)", b="%1أ%3%4"}, - {a="(a)(')(a%p?)$", b="%1أ%3"}, - {a="(a)(')(a)(%p?%s)", b="%1أ%3%4"}, - {a="(a)(')(aN%p?)$", b="%1أً"}, - {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أ%3"}, - {a="(a)(')(%p?%s)", b="%1أ%3"}, + {a="(a)(')(A%p*)$", b="%1آ"}, + {a="(a)(')(A)(%p*%s)", b="%1آ%4"}, + {a="(a)(')([u]N?%p*)$", b="%1أ%3"}, + {a="(a)(')([u]N?)(%p*%s)", b="%1أ%3%4"}, + {a="(a)(')(a%p*)$", b="%1أ%3"}, + {a="(a)(')(a)(%p*%s)", b="%1أ%3%4"}, + {a="(a)(')(aN%p*)$", b="%1أً"}, + {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أ%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ئ%3"}, - {a="(i)(')(%p?%s)", b="%1ئ%3"}, + {a="(i)(')([uai]N?%p*)$", b="%1ئ%3"}, + {a="(i)(')([uai]N?)(%p*%s)", b="%1ئ%3%4"}, + {a="(i)(')(%p*)$", b="%1ئ%3"}, + {a="(i)(')(%p*%s)", b="%1ئ%3"}, -- -- middle {a="([UIwy])(')", b="%1ء"}, --new @@ -330,10 +330,10 @@ hamzaeasy = { -- differences marked below with 'easy' {a="^\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="آ%1"}, {a="(%W)\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="%1آ%2"}, --easy (begin) - {a="(A)(')(uN?%p?)$", b="aاء%3"}, - {a="(A)(')(uN?)(%p?%s)", b="aاء%3%4"}, - {a="(A)(')(iN?%p?)$", b="aاء%3"}, - {a="(A)(')(iN?)(%p?%s)", b="aاء%3%4"}, + {a="(A)(')(uN?%p*)$", b="aاء%3"}, + {a="(A)(')(uN?)(%p*%s)", b="aاء%3%4"}, + {a="(A)(')(iN?%p*)$", b="aاء%3"}, + {a="(A)(')(iN?)(%p*%s)", b="aاء%3%4"}, {a="(A)(')([iI])", b="aائ%3"}, -- historic madda {a="(A)(')(u)", b="aاؤ%3"}, -- historic madda {a="(A)(')", b="aاء"}, -- historic madda @@ -367,38 +367,38 @@ hamzaeasy = { -- differences marked below with 'easy' -- hamzah alone on the line, so take out the following two lines -- (final hamzah is on the line after a letter of prolongation or a -- consonant with sukūn) - -- {a="([^Auai])(')(\"?[uai]N?)(%p?)$", b="%1ء%3%4"}, --new - -- {a="([^Auai])(')(\"?[uai]N?)(%p?%s)", b="%1ء%3%4"}, - {a="([^Auai])(')(\"?aN)(%p?)$", b="%1ئ%3%4"}, --new - {a="([^Auai])(')(\"?aN)(%p?%s)", b="%1ئ%3%4"}, --new - {a="([^uai])(')(\"?a)(%p?)$", b="%1ء%3%4"}, --new - {a="([^uai])(')(\"?a)(%p?%s)", b="%1ء%3%4"}, --new - {a="([^uai])(')(\"?[ui]N?)(%p?)$", b="%1ء%3%4"}, --new - {a="([^uai])(')(\"?[ui]N?)(%p?%s)", b="%1ء%3%4"}, --new + -- {a="([^Auai])(')(\"?[uai]N?)(%p*)$", b="%1ء%3%4"}, --new + -- {a="([^Auai])(')(\"?[uai]N?)(%p*%s)", b="%1ء%3%4"}, + {a="([^Auai])(')(\"?aN)(%p*)$", b="%1ئ%3%4"}, --new + {a="([^Auai])(')(\"?aN)(%p*%s)", b="%1ئ%3%4"}, --new + {a="([^uai])(')(\"?a)(%p*)$", b="%1ء%3%4"}, --new + {a="([^uai])(')(\"?a)(%p*%s)", b="%1ء%3%4"}, --new + {a="([^uai])(')(\"?[ui]N?)(%p*)$", b="%1ء%3%4"}, --new + {a="([^uai])(')(\"?[ui]N?)(%p*%s)", b="%1ء%3%4"}, --new --easy (end) -- u - {a="(u)(')([uai]N?%p?)$", b="%1ؤ%3"}, - {a="(u)(')([uai]N?)(%p?%s)", b="%1ؤ%3%4"}, - {a="(u)(')(%p?)$", b="%1ؤ%3"}, - {a="(u)(')(%p?%s)", b="%1ؤ%3"}, + {a="(u)(')([uai]N?%p*)$", b="%1ؤ%3"}, + {a="(u)(')([uai]N?)(%p*%s)", b="%1ؤ%3%4"}, + {a="(u)(')(%p*)$", b="%1ؤ%3"}, + {a="(u)(')(%p*%s)", b="%1ؤ%3"}, -- a - {a="(a)(')(A%p?)$", b="%1آ"}, - {a="(a)(')(A)(%p?%s)", b="%1آ%4"}, - {a="(a)(')([u]N?%p?)$", b="%1أ%3"}, - {a="(a)(')([u]N?)(%p?%s)", b="%1أ%3%4"}, - {a="(a)(')(a%p?)$", b="%1أ%3"}, - {a="(a)(')(a)(%p?%s)", b="%1أ%3%4"}, - {a="(a)(')(aN%p?)$", b="%1أً"}, - {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أ%3"}, - {a="(a)(')(%p?%s)", b="%1أ%3"}, + {a="(a)(')(A%p*)$", b="%1آ"}, + {a="(a)(')(A)(%p*%s)", b="%1آ%4"}, + {a="(a)(')([u]N?%p*)$", b="%1أ%3"}, + {a="(a)(')([u]N?)(%p*%s)", b="%1أ%3%4"}, + {a="(a)(')(a%p*)$", b="%1أ%3"}, + {a="(a)(')(a)(%p*%s)", b="%1أ%3%4"}, + {a="(a)(')(aN%p*)$", b="%1أً"}, + {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أ%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ئ%3"}, - {a="(i)(')(%p?%s)", b="%1ئ%3"}, + {a="(i)(')([uai]N?%p*)$", b="%1ئ%3"}, + {a="(i)(')([uai]N?)(%p*%s)", b="%1ئ%3%4"}, + {a="(i)(')(%p*)$", b="%1ئ%3"}, + {a="(i)(')(%p*%s)", b="%1ئ%3"}, -- -- middle {a="([Uw])(')", b="%1ء"}, --new @@ -574,12 +574,12 @@ trigraphs = { -- trigraphs or more -- art. with waṣla + lunar consonant (i.e. what remains) {a="'l%-", b="ال"}, -- the silent wāw - {a="uU(%p?)$", b="uو%1"}, - {a="uU(%p?%s)", b="uو%1"}, - {a="aU(%p?)$", b="aو%1"}, - {a="aU(%p?%s)", b="aو%1"}, - {a="iU(%p?)$", b="iو%1"}, - {a="iU(%p?%s)", b="iو%1"}, + {a="uU(%p*)$", b="uو%1"}, + {a="uU(%p*%s)", b="uو%1"}, + {a="aU(%p*)$", b="aو%1"}, + {a="aU(%p*%s)", b="aو%1"}, + {a="iU(%p*)$", b="iو%1"}, + {a="iU(%p*%s)", b="iو%1"}, -- words ending in -āT with silent wāw/yāʾ {a="(_a)UA", b="%1وا"}, {a="(_a)U", b="%1و"}, @@ -665,12 +665,12 @@ trigraphseasy = { -- differences marked below with 'easy' -- art. with waṣla + lunar consonant (i.e. what remains) {a="'l%-", b="ال"}, -- the silent wāw - {a="uU(%p?)$", b="uو%1"}, - {a="uU(%p?%s)", b="uو%1"}, - {a="aU(%p?)$", b="aو%1"}, - {a="aU(%p?%s)", b="aو%1"}, - {a="iU(%p?)$", b="iو%1"}, - {a="iU(%p?%s)", b="iو%1"}, + {a="uU(%p*)$", b="uو%1"}, + {a="uU(%p*%s)", b="uو%1"}, + {a="aU(%p*)$", b="aو%1"}, + {a="aU(%p*%s)", b="aو%1"}, + {a="iU(%p*)$", b="iو%1"}, + {a="iU(%p*%s)", b="iو%1"}, -- words ending in -āT with silent wāw/yāʾ {a="(_a)UA", b="%1وا"}, {a="(_a)U", b="%1و"}, @@ -679,16 +679,16 @@ trigraphseasy = { -- differences marked below with 'easy' digraphs = { -- ʾiʿrāb: straight double quote must be discarded - {a="(%-)(\"?[UI]na)(%p?%s)", b="%2%3"}, - {a="(%-)(\"?[UI]na)(%p?)$", b="%2%3"}, - {a="(%-)(\"?At[ui])(%p?%s)", b="%2%3"}, - {a="(%-)(\"?At[ui])(%p?)$", b="%2%3"}, - {a="(%-)(\"?Ani)(%p?%s)", b="%2%3"}, - {a="(%-)(\"?Ani)(%p?)$", b="%2%3"}, - {a="(%-)(\"?ayni)(%p?%s)", b="%2%3"}, - {a="(%-)(\"?ayni)(%p?)$", b="%2%3"}, - {a="(%-)(\"?[uai])(%p?%s)", b="%2%3"}, - {a="(%-)(\"?[uai])(%p?)$", b="%2%3"}, + {a="(%-)(\"?[UI]na)(%p*%s)", b="%2%3"}, + {a="(%-)(\"?[UI]na)(%p*)$", b="%2%3"}, + {a="(%-)(\"?At[ui])(%p*%s)", b="%2%3"}, + {a="(%-)(\"?At[ui])(%p*)$", b="%2%3"}, + {a="(%-)(\"?Ani)(%p*%s)", b="%2%3"}, + {a="(%-)(\"?Ani)(%p*)$", b="%2%3"}, + {a="(%-)(\"?ayni)(%p*%s)", b="%2%3"}, + {a="(%-)(\"?ayni)(%p*)$", b="%2%3"}, + {a="(%-)(\"?[uai])(%p*%s)", b="%2%3"}, + {a="(%-)(\"?[uai])(%p*)$", b="%2%3"}, -- ʾiʿrāb (end) -- initial straight double quote gives a connective ʾalif {a="^\"[uai]", b="ٱ"}, -- cgit v1.2.3