diff options
Diffstat (limited to 'Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua')
-rw-r--r-- | Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua | 86 |
1 files changed, 53 insertions, 33 deletions
diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua index 09133043bef..4d9473a4eed 100644 --- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua +++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua @@ -194,10 +194,15 @@ 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="([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"}, + {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"}, @@ -226,15 +231,15 @@ hamza = { {a="([%s%(%[%<%-])(')([ua])", b="%1أ%3"}, {a="([%s%(%[%<%-])(')(i)", b="%1إ%3"}, -- final - -- ^say'aN and .zim'aN are special orthographies - {a="(%^sa%.?[yY])(\"?%|?)(%')(aN)", b="%1%2ئ%4"}, - {a="(.zi?m)(%')(aN)", b="%1ئ%3"}, - -- hamzah + pr. suffix: the carrier passes into yāʾ before ī so - -- take out the following two lines: - -- {a="(')(I%p?)$", b="إ%2"}, -- affix pr. 1st person sg. - -- {a="(')(I)(%p?%s)", b="إ%2%3"}, -- affix pr. 1st person sg. - {a="([^uai])(')([uai]N?%p?)$", b="%1ء%3"}, - {a="([^uai])(')([uai]N?)(%p?%s)", b="%1ء%3%4"}, + -- mi'aT is special orthography (unlike ^say'aN and .zim'aN): + -- {a="(%^sa%.?[yY])(\"?%|?)(%')(aN)", b="%1%2ئ%4"}, --new + -- {a="(.zi?m)(%')(aN)", b="%1ئ%3"}, --new + {a="(mi)(%')(a[Tt])", b="%1ائ%3"}, + {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"}, -- u {a="(u)(')([uai]N?%p?)$", b="%1ؤ%3"}, {a="(u)(')([uai]N?)(%p?%s)", b="%1ؤ%3%4"}, @@ -260,8 +265,8 @@ hamza = { {a="(i)(')(%p?%s)", b="%1ئ%3"}, -- -- middle - {a="(U)(')", b="%1ء"}, - {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"}, @@ -306,10 +311,15 @@ 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="([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"}, + {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) @@ -340,15 +350,25 @@ hamzaeasy = { -- differences marked below with 'easy' {a="([%s%(%[%<%-])(')([ua])", b="%1أ%3"}, {a="([%s%(%[%<%-])(')(i)", b="%1إ%3"}, -- final - -- ^say'aN and .zim'aN are special orthographies - {a="(%^sa%.?[yY])(\"?%|?)(%')(aN)", b="%1%2ئ%4"}, - {a="(.zi?m)(%')(aN)", b="%1ئ%3"}, - -- hamzah + pr. suffix: the carrier passes into yāʾ before ī so - -- take out the following two lines: - -- {a="(')(I%p?)$", b="إ%2"}, -- affix pr. 1st person sg. - -- {a="(')(I)(%p?%s)", b="إ%2%3"}, -- affix pr. 1st person sg. - {a="([^uai])(')([uai]N?%p?)$", b="%1ء%3"}, - {a="([^uai])(')([uai]N?)(%p?%s)", b="%1ء%3%4"}, + -- mi'aT is special orthography (unlike ^say'aN and .zim'aN) + -- {a="(%^sa%.?[yY])(\"?%|?)(%')(aN)", b="%1%2ئ%4"}, --new + -- {a="(.zi?m)(%')(aN)", b="%1ئ%3"}, --new + {a="(mi)(%')(a[Tt])", b="%1ائ%3"}, + {a="(mi)(%')(aN%_?[AY])", b="%1أ%3"}, + -- easy (begin) + -- The Munjid says that such words as radI'aN do not have the + -- 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 + --easy (end) -- u {a="(u)(')([uai]N?%p?)$", b="%1ؤ%3"}, {a="(u)(')([uai]N?)(%p?%s)", b="%1ؤ%3%4"}, @@ -374,8 +394,8 @@ hamzaeasy = { -- differences marked below with 'easy' {a="(i)(')(%p?%s)", b="%1ئ%3"}, -- -- middle - {a="(U)(')", b="%1ء"}, - {a="([Iy])(')", b="%1ئ"}, + {a="([Uw])(')", b="%1ء"}, --new + {a="([Iy])(')", b="%1ئ"}, --easy {a="([^uai])(')([uU])", b="%1ؤ%3"}, {a="([^uai])(')(%_?[aAY])", b="%1أ%3"}, {a="([^uai])(')([iI])", b="%1ئ%3"}, @@ -409,7 +429,7 @@ tanwin = { {a="%-?(aN)(_A)(%s)([rlmnwy])", b="ًى%3%4%4"}, {a="%-?(aN)(Y)(%s)([rlmnwy])", b="ًى%3%4%4"}, {a="(T)%-?(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"}, - {a="(ء)%-?(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"}, + {a="(ء)%-?(aN)(%s)([rlmnwy])", b="%1%2%3%4%4"}, --new {a="([^TA])%-?(aN)(%s)([rlmnwy])", b="%1ًا%3%4%4"}, {a="%-?(iNI?)(%s)([rlmnwy])", b="ٍ%2%3%3"}, -- assimilations (end) @@ -421,7 +441,7 @@ tanwin = { {a="%-?(\"aN)(_A)", b="ى"}, {a="%-?(\"aN)(Y)", b="ى"}, {a="(T)%-?(\"aN)", b="%1"}, - {a="(ء)%-?(\"aN)", b="%1"}, + {a="([اآ])(ء)%-?(\"aN)", b="%1%2"}, --new {a="([^TA])%-?(\"aN)", b="%1ا"}, {a="%-?(\"iNI?)", b=""}, -- quoted tanwīn (end) @@ -430,7 +450,7 @@ tanwin = { {a="%-?(aN)(_A)", b="ًى"}, {a="%-?(aN)(Y)", b="ًى"}, {a="(T)%-?(aN)", b="%1ً"}, - {a="(ء)%-?(aN)", b="%1ً"}, + {a="([اآ])(ء)%-?(aN)", b="%1%2ً"}, --new {a="([^TA])%-?(aN)", b="%1ًا"}, {a="%-?(iNI?)", b="ٍ"} } @@ -451,7 +471,7 @@ tanwineasy = { -- 'easy' requires some lines to be taken out: -- {a="%-?(aN)(_A)(%s)([rlmnwy])", b="ًى%3%4%4"}, -- {a="%-?(aN)(Y)(%s)([rlmnwy])", b="ًى%3%4%4"}, -- {a="(T)%-?(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"}, --- {a="(ء)%-?(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"}, +-- {a="(ء)%-?(aN)(%s)([rlmnwy])", b="%1%2%3%4%4"}, --new -- {a="([^TA])%-?(aN)(%s)([rlmnwy])", b="%1ًا%3%4%4"}, -- {a="%-?(iNI?)(%s)([rlmnwy])", b="ٍ%2%3%3"}, -- assimilations (end) @@ -463,7 +483,7 @@ tanwineasy = { -- 'easy' requires some lines to be taken out: {a="%-?(\"aN)(_A)", b="ى"}, {a="%-?(\"aN)(Y)", b="ى"}, {a="(T)%-?(\"aN)", b="%1"}, - {a="(ء)%-?(\"aN)", b="%1"}, + {a="([اآ])(ء)%-?(\"aN)", b="%1%2"}, --new {a="([^TA])%-?(\"aN)", b="%1ا"}, {a="%-?(\"iNI?)", b=""}, -- quoted tanwīn (end) @@ -472,7 +492,7 @@ tanwineasy = { -- 'easy' requires some lines to be taken out: {a="%-?(aN)(_A)", b="ًى"}, {a="%-?(aN)(Y)", b="ًى"}, {a="(T)%-?(aN)", b="%1ً"}, - {a="(ء)%-?(aN)", b="%1ً"}, + {a="([اآ])(ء)%-?(aN)", b="%1%2ً"}, --new {a="([^TA])%-?(aN)", b="%1ًا"}, {a="%-?(iNI?)", b="ٍ"} } @@ -674,7 +694,7 @@ digraphs = { {a="(ay)(o)(\"?[uai])([%S]-o)", b="%1i"}, {a="(ay)(%s)([%(%[%|%<]?)(\"?[uai])", b="%1i%2%3ا"}, --p -- hyphen + initial alif without hamza: - {a="([uai]%-)(\"?[uai])([%^%_%.%`]?)(%a)", b="%1ا%3%4"}, + {a="([uai]%-)(\"?[uai])([%^%_%.%`]?)([%aإأؤئ])", b="%1ا%3%4"}, -- initial alif without hamza {a="^([%(%[%|%<]?)(\"?[uai])", b="%1ا%2"}, --p -- initial alif without hamza |