From b90f4668198eb701d5524b8f93f50f0d26c7bea2 Mon Sep 17 00:00:00 2001 From: Robert Alessi Date: Wed, 25 May 2016 21:39:23 +0200 Subject: =?UTF-8?q?=CA=BEalifu=20'l-wa=E1=B9=A3li=20was=20many=20times=20v?= =?UTF-8?q?ocalized,=20which=20is=20wrong.=20corrected.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arabluatex_fullvoc.lua | 16 ++++++++-------- arabluatex_voc.lua | 34 +++++++++++++++++----------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua index 991db22..f9d4e60 100644 --- a/arabluatex_fullvoc.lua +++ b/arabluatex_fullvoc.lua @@ -298,10 +298,10 @@ trigraphsfv = { -- trigraphs or more {a="^(a)([%_%^%.]?[tdrzsn])%-", b="ا%1ل%2"}, {a="([%s%-])(a)([%_%^%.]?[tdrzsn])%-", b="%1ا%2ل%3"}, -- al- + initial unstable hamza - {a="^(a)l%-(\"?[uai])", b="ا%1لٱ%2"}, - {a="([%s%-])(a)l%-(\"?[uai])", b="%1ا%2لٱ%3"}, + {a="^(a)l%-(\"?[uai])", b="ا%1ل%2ٱ"}, + {a="([%s%-])(a)l%-(\"?[uai])", b="%1ا%2ل%3ٱ"}, -- li-/la + art. + initial unstable hamza is a special orthography - {a="l([ai])%-l%-(\"?[uai])", b="ل%1لٱ%2"}, + {a="l([ai])%-l%-(\"?[uai])", b="ل%1ل%2ٱ"}, -- al- + lunar consonant (i.e. what remains) {a="^(a)l%-", b="ا%1لْ"}, {a="([%s%-])(a)l%-", b="%1ا%2لْ"}, @@ -322,7 +322,7 @@ trigraphsfv = { -- trigraphs or more -- li-/la- + assim. art. + solar consonant is a special orthography {a="l([ai])%-([%_%^%.]?[tdrzsn])%-([%_%^%.]?[tdrzsn])", b="ل%1ل%3%3"}, -- art. with waṣla + initial unstable hamza - {a="'l%-(\"?[uai])", b="ٱلٱ%1"}, + {a="'l%-(\"?[uai])", b="ٱل%1ٱ"}, -- art. with waṣla + lunar consonant (i.e. what remains) {a="'l%-", b="ٱلْ"}, -- the silent wāw @@ -354,10 +354,10 @@ trigraphsfveasy = { -- trigraphs or more (see 'easy' tag below for the diffs) {a="^(a)([%_%^%.]?[tdrzsn])%-", b="ا%1ل%2"}, {a="([%s%-])(a)([%_%^%.]?[tdrzsn])%-", b="%1ا%2ل%3"}, -- al- + initial unstable hamza - {a="^(a)l%-(\"?[uai])", b="ا%1لٱ%2"}, - {a="([%s%-])(a)l%-(\"?[uai])", b="%1ا%2لٱ%3"}, + {a="^(a)l%-(\"?[uai])", b="ا%1ل%2ٱ"}, + {a="([%s%-])(a)l%-(\"?[uai])", b="%1ا%2ل%3ٱ"}, -- li-/la + art. + initial unstable hamza is a special orthography - {a="l([ai])%-l%-(\"?[uai])", b="ل%1لٱ%2"}, + {a="l([ai])%-l%-(\"?[uai])", b="ل%1ل%2ٱ"}, -- al- + lunar consonant (i.e. what remains) {a="^(a)l%-", b="ا%1لْ"}, {a="([%s%-])(a)l%-", b="%1ا%2لْ"}, @@ -378,7 +378,7 @@ trigraphsfveasy = { -- trigraphs or more (see 'easy' tag below for the diffs) -- li-/la- + assim. art. + solar consonant is a special orthography {a="l([ai])%-([%_%^%.]?[tdrzsn])%-([%_%^%.]?[tdrzsn])", b="ل%1ل%3%3"}, -- art. with waṣla + initial unstable hamza - {a="'l%-(\"?[uai])", b="ٱلٱ%1"}, + {a="'l%-(\"?[uai])", b="ٱل%1ٱ"}, -- art. with waṣla + lunar consonant (i.e. what remains) {a="'l%-", b="ٱلْ"}, -- the silent wāw diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua index b7550e5..0097450 100644 --- a/arabluatex_voc.lua +++ b/arabluatex_voc.lua @@ -325,13 +325,13 @@ trigraphs = { -- trigraphs or more {a="^(a)([%_%^%.]?[tdrzsn])%-", b="ا%1ل%2"}, {a="([%s%-])(a)([%_%^%.]?[tdrzsn])%-", b="%1ا%2ل%3"}, -- al- + initial unstable hamza - {a="^(a)l%-(\")([uai])", b="ا%1لٱ%3"}, - {a="([%s%-])(a)l%-(\")([uai])", b="%1ا%2لٱ%4"}, - {a="^(a)l%-([uai])", b="ا%1لا%2"}, - {a="([%s%-])(a)l%-([uai])", b="%1ا%2لا%3"}, + {a="^(a)l%-(\")([uai])", b="ا%1ل%3ٱ"}, + {a="([%s%-])(a)l%-(\")([uai])", b="%1ا%2ل%4ٱ"}, + {a="^(a)l%-([uai])", b="ا%1ل%2ا"}, + {a="([%s%-])(a)l%-([uai])", b="%1ا%2ل%3ا"}, -- li-/la- + art. + initial unstable hamza is a special orthography - {a="l([ai])%-l%-(\")([uai])", b="ل%1لٱ%3"}, - {a="l([ai])%-l%-([uai])", b="ل%1لا%2"}, + {a="l([ai])%-l%-(\")([uai])", b="ل%1ل%3ٱ"}, + {a="l([ai])%-l%-([uai])", b="ل%1ل%2ا"}, -- al- + lunar consonant (i.e. what remains) {a="^(a)l%-", b="ا%1ل"}, {a="([%s%-])(a)l%-", b="%1ا%2ل"}, @@ -352,8 +352,8 @@ trigraphs = { -- trigraphs or more -- li-/la + assim. art. + solar consonant is a special orthography {a="l([ai])%-([%_%^%.]?[tdrzsn])%-([%_%^%.]?[tdrzsn])", b="ل%1ل%3%3"}, -- art. with waṣla + initial unstable hamza - {a="'l%-(\")([uai])", b="الٱ%2"}, - {a="'l%-([uai])", b="الا%1"}, + {a="'l%-(\")([uai])", b="ال%2ٱ"}, + {a="'l%-([uai])", b="ال%1ا"}, -- art. with waṣla + lunar consonant (i.e. what remains) {a="'l%-", b="ال"}, -- the silent wāw @@ -385,13 +385,13 @@ trigraphseasy = { -- differences marked below with 'easy' {a="^(a)([%_%^%.]?[tdrzsn])%-", b="ا%1ل"}, {a="([%s%-])(a)([%_%^%.]?[tdrzsn])%-", b="%1ا%2ل"}, -- al- + initial unstable hamza - {a="^(a)l%-(\")([uai])", b="ا%1لٱ%3"}, - {a="([%s%-])(a)l%-(\")([uai])", b="%1ا%2لٱ%4"}, - {a="^(a)l%-([uai])", b="ا%1لا%2"}, - {a="([%s%-])(a)l%-([uai])", b="%1ا%2لا%3"}, + {a="^(a)l%-(\")([uai])", b="ا%1ل%3ٱ"}, + {a="([%s%-])(a)l%-(\")([uai])", b="%1ا%2ل%4ٱ"}, + {a="^(a)l%-([uai])", b="ا%1ل%2ا"}, + {a="([%s%-])(a)l%-([uai])", b="%1ا%2ل%3ا"}, -- li-/la- + art. + initial unstable hamza is a special orthography - {a="l([ai])%-l%-(\")([uai])", b="ل%1لٱ%3"}, - {a="l([ai])%-l%-([uai])", b="ل%1لا%2"}, + {a="l([ai])%-l%-(\")([uai])", b="ل%1ل%3ٱ"}, + {a="l([ai])%-l%-([uai])", b="ل%1ل%2ا"}, -- al- + lunar consonant (i.e. what remains) {a="^(a)l%-", b="ا%1ل"}, {a="([%s%-])(a)l%-", b="%1ا%2ل"}, @@ -412,8 +412,8 @@ trigraphseasy = { -- differences marked below with 'easy' -- li-/la + assim. art. + solar consonant is a special orthography (easy) {a="l([ai])%-([%_%^%.]?[tdrzsn])%-([%_%^%.]?[tdrzsn])", b="ل%1ل%3"}, -- art. with waṣla + initial unstable hamza - {a="'l%-(\")([uai])", b="الٱ%2"}, - {a="'l%-([uai])", b="الا%1"}, + {a="'l%-(\")([uai])", b="ال%2ٱ"}, + {a="'l%-([uai])", b="ال%1ا"}, -- art. with waṣla + lunar consonant (i.e. what remains) {a="'l%-", b="ال"}, -- the silent wāw @@ -450,7 +450,7 @@ digraphs = { {a="(aW)(%s)([uai])", b="awuا%2%3"}, --tmp-out {a="(%-)([uai])", b="%1ا%2"}, -- hyphen + initial alif without hamza --tmp-added hyphen + initial alif without hamza: - {a="(%-)([uai])([%^%_%.%`]?)(%a)", b="%1ا%2%3%4"}, + {a="(%-)([uai])([%^%_%.%`]?)(%a)", b="%1ا%3%4"}, {a="^([uai])", b="ا%1"}, -- initial alif without hamza {a="(%s)([uai])", b="%1ا%2"}, -- initial alif without hamza {a="%-%-", b="ـ"}, -- cgit v1.2.3