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_voc.lua | 160 ++++++++++++++++++++++++++--------------------------- 1 file changed, 80 insertions(+), 80 deletions(-) (limited to 'arabluatex_voc.lua') 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