From 17d40a2f1076440fc7a322896d774915ee191b31 Mon Sep 17 00:00:00 2001 From: Robert Alessi Date: Sat, 16 Apr 2016 18:41:17 +0200 Subject: =?UTF-8?q?ta=E1=B8=ABf=C4=ABfu=20'l-hamzati=20was=20missing:=20ad?= =?UTF-8?q?ded=20in=20all=20tables?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arabluatex_fullvoc.lua | 6 +++++- arabluatex_trans.lua | 19 +++++++++++++---- arabluatex_voc.lua | 58 +++++++++++++++++++++++++++----------------------- 3 files changed, 51 insertions(+), 32 deletions(-) diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua index f66ed87..8b94c1e 100644 --- a/arabluatex_fullvoc.lua +++ b/arabluatex_fullvoc.lua @@ -44,8 +44,12 @@ hamzafv = { {a="''([Uu])", b="ؤؤ%1"}, {a="''([Aa])", b="أأ%1"}, {a="''([Ii])", b="ئئ%1"}, - -- initial long u + -- initial long u and i (for a, see below) {a="%'%_U", b="أU"}, + {a="%'%_I", b="إI"}, + -- taḫfīfu 'l-hamza + {a="'u'([^uaiUAI])", b="أU%1"}, + {a="'i'([^uaiUAI])", b="إI%1"}, -- madda (historic writing below) {a="'a'([^uaiUAI])", b="آ%1"}, {a="'a?A([%_%^%.]?[%`%'btjghdrzsfqklmnywAY])", b="آ%1"}, diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua index b61c6db..e8f8825 100644 --- a/arabluatex_trans.lua +++ b/arabluatex_trans.lua @@ -81,8 +81,12 @@ hamzatrdmg = { {a="''([Uu])", b="ʾʾ%1"}, {a="''([Aa])", b="ʾʾ%1"}, {a="''([Ii])", b="ʾʾ%1"}, - -- initial long u + -- initial long u and i (for a, see below) {a="%'%_U", b="ʾU"}, + {a="%'%_I", b="ʾI"}, + -- taḫfīfu 'l-hamza + {a="'u'([^uaiUAI])", b="ʾU%1"}, + {a="'i'([^uaiUAI])", b="ʾI%1"}, -- madda (historic writing below) {a="'a'([^uaiUAI])", b="ʾA%1"}, {a="'a?A", b="ʾA"}, @@ -294,12 +298,19 @@ hamzatrloc = { {a="''([Uu])", b="ʾʾ%1"}, {a="''([Aa])", b="ʾʾ%1"}, {a="''([Ii])", b="ʾʾ%1"}, - -- initial long u + -- initial long u and i (for a, see below) {a="%'%_U", b="U"}, + {a="%'%_I", b="I"}, + -- taḫfīfu 'l-hamza + {a="^'u'([^uaiUAI])", b="U%1"}, + {a="(%W)'u'([^uaiUAI])", b="%1U%2"}, + {a="'u'([^uaiUAI])", b="ʾU"}, + {a="^'i'([^uaiUAI])", b="I%1"}, + {a="(%W)'i'([^uaiUAI])", b="%1I%2"}, + {a="'i'([^uaiUAI])", b="ʾI"}, -- madda (historic writing below) {a="^(')(A)", b="%2"}, - {a="(%W)(')(A)", b="%1%3"}, - + {a="(%W)(')(A)", b="%1%3"}, {a="^'a'([^uaiUAI])", b="A%1"}, {a="(%W)'a'([^uaiUAI])", b="%1A%2"}, {a="'a'([^uaiUAI])", b="A%1"}, diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua index 9724901..0544a63 100644 --- a/arabluatex_voc.lua +++ b/arabluatex_voc.lua @@ -36,32 +36,32 @@ numbers = { } raw = { - {a="A", b="َا"}, - {a="U", b="ُو"}, - {a="I", b="ِي"}, - {a="b", b="ب"}, - {a="t", b="ت"}, - {a="j", b="ج"}, - {a="x", b="خ"}, - {a="d", b="د"}, - {a="r", b="ر"}, - {a="z", b="ز"}, - {a="s", b="س"}, - {a="f", b="ف"}, - {a="`", b="ع"}, - {a="f", b="ف"}, - {a="q", b="ق"}, - {a="k", b="ك"}, - {a="l", b="ل"}, - {a="m", b="م"}, - {a="n", b="ن"}, - {a="h", b="ه"}, - {a="w", b="و"}, - {a="y", b="ي"}, - {a="T", b="ة"}, - {a="u", b="ُ"}, - {a="a", b="َ"}, - {a="i", b="ِ"} + {a="A", b="َا"}, + {a="U", b="ُو"}, + {a="I", b="ِي"}, + {a="b", b="ب"}, + {a="t", b="ت"}, + {a="j", b="ج"}, + {a="x", b="خ"}, + {a="d", b="د"}, + {a="r", b="ر"}, + {a="z", b="ز"}, + {a="s", b="س"}, + {a="f", b="ف"}, + {a="`", b="ع"}, + {a="f", b="ف"}, + {a="q", b="ق"}, + {a="k", b="ك"}, + {a="l", b="ل"}, + {a="m", b="م"}, + {a="n", b="ن"}, + {a="h", b="ه"}, + {a="w", b="و"}, + {a="y", b="ي"}, + {a="T", b="ة"}, + {a="u", b="ُ"}, + {a="a", b="َ"}, + {a="i", b="ِ"} } hamza = { @@ -76,8 +76,12 @@ hamza = { {a="''([Uu])", b="ؤؤ%1"}, {a="''([Aa])", b="أأ%1"}, {a="''([Ii])", b="ئئ%1"}, - -- initial long u + -- initial long u and i (for a, see below) {a="%'%_U", b="أU"}, + {a="%'%_I", b="إI"}, + -- taḫfīfu 'l-hamza + {a="'u'([^uaiUAI])", b="أU%1"}, + {a="'i'([^uaiUAI])", b="إI%1"}, -- madda (historic writing below) {a="'a'([^uaiUAI])", b="آ%1"}, {a="'a?A([%_%^%.]?[%`%'btjghdrzsfqklmnywAY])", b="آ%1"}, -- cgit v1.2.3