From bb3e0c4488db36c2d0a81dc39e90c37bc7adf389 Mon Sep 17 00:00:00 2001 From: Robert Alessi Date: Thu, 30 Mar 2017 18:15:37 +0200 Subject: arabica: removed unnecessary rules and tables --- arabluatex.lua | 19 +++++----- arabluatex_trans.lua | 99 ---------------------------------------------------- 2 files changed, 8 insertions(+), 110 deletions(-) diff --git a/arabluatex.lua b/arabluatex.lua index 722084c..3b76376 100644 --- a/arabluatex.lua +++ b/arabluatex.lua @@ -497,11 +497,11 @@ end local function transarabica(str) str = string.gsub(str, "\\arb(%b{})", function(inside) inside = string.sub(inside, 2, -2) - for i = 1,#hamzatrarabica do - inside = string.gsub(inside, hamzatrarabica[i].a, hamzatrarabica[i].b) + for i = 1,#hamzatrloc do + inside = string.gsub(inside, hamzatrloc[i].a, hamzatrloc[i].b) end - for i = 1,#tanwintrarabica do - inside = string.gsub(inside, tanwintrarabica[i].a, tanwintrarabica[i].b) + for i = 1,#tanwintrloc do + inside = string.gsub(inside, tanwintrloc[i].a, tanwintrloc[i].b) end for i = 1,#trigraphstrarabica do inside = string.gsub(inside, trigraphstrarabica[i].a, trigraphstrarabica[i].b) @@ -512,14 +512,11 @@ local function transarabica(str) for i = 1,#singletrarabica do inside = string.gsub(inside, singletrarabica[i].a, singletrarabica[i].b) end - for i = 1,#longvtrarabica do - inside = string.gsub(inside, longvtrarabica[i].a, longvtrarabica[i].b) - end - for i = 1,#shortvtrarabica do - inside = string.gsub(inside, shortvtrarabica[i].a, shortvtrarabica[i].b) + for i = 1,#longvtrloc do + inside = string.gsub(inside, longvtrloc[i].a, longvtrloc[i].b) end - for i = 1,#finaltrarabica do - inside = string.gsub(inside, finaltrarabica[i].a, finaltrarabica[i].b) + for i = 1,#shortvtrloc do + inside = string.gsub(inside, shortvtrloc[i].a, shortvtrloc[i].b) end for i = 1,#punctuationtr do inside = string.gsub(inside, punctuationtr[i].a, punctuationtr[i].b) diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua index bd2d27a..daf4c91 100644 --- a/arabluatex_trans.lua +++ b/arabluatex_trans.lua @@ -629,86 +629,6 @@ finaltrloc = { -- arabica -hamzatrarabica = { --UNTOUCHED/LOC - -- hard coded hamza - {a="|\"'", b="ʾ"}, - {a="A\"'", b="ʾA"}, - {a="[au]\"'", b="ʾ"}, - {a="w\"'", b="ʾ"}, - {a="i\"'", b="ʾ"}, - {a="y\"'", b="ʾ"}, - -- hamza takes tašdīd too - {a="''([Uu])", b="ʾʾ%1"}, - {a="''([Aa])", b="ʾʾ%1"}, - {a="''([Ii])", b="ʾʾ%1"}, - -- 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="^'a'([^uaiUAI])", b="A%1"}, - {a="(%W)'a'([^uaiUAI])", b="%1A%2"}, - {a="'a'([^uaiUAI])", b="A%1"}, - {a="^'a?A", b="A"}, - {a="(%W)'a?A", b="%1A"}, - {a="'a?A", b="ʾA"}, - {a="(A)(')(i)$", b="%1ʾ%3"}, - {a="(A)(')(i)(%W)", b="%1ʾ%3%4"}, - {a="(A)(')(i)", b="%1ʾ%3"}, -- historic madda - {a="(A)(')", b="%1ʾ"}, -- historic madda - -- initial (needs both ^ and %W patterns) - {a="^(')([ua])", b="%2"}, - {a="^(')(i)", b="%2"}, - {a="(%W)(')([ua])", b="%1%3"}, - {a="(%W)(')(i)", b="%1%3"}, - -- final - {a="([Iy])(')(aN)$", b="%1ʾ%3"}, - {a="([Iy])(')(aN)(%W)", b="%1ʾ%3%4"}, - {a="([^uai])(')([uai]N?)$", b="%1ʾ%3"}, - {a="([^uai])(')([uai]N?)(%W)", b="%1ʾ%3%4"}, - {a="([UI])(')([uai])$", b="%1ʾ%3"}, - {a="([UI])(')([uai])(%W)", b="%1ʾ%3%4"}, - -- middle - {a="(U)(')", b="%1ʾ"}, - {a="([Iy])(')", b="%1ʾ"}, - {a="([^uai])(')([uU])", b="%1ʾ%3"}, - {a="([^uai])(')([aA])", b="%1ʾ%3"}, - {a="([^uai])(')([iI])", b="%1ʾ%3"}, - {a="(u)(')([uU])", b="%1ʾ%3"}, - {a="(u)(')([aA])", b="%1ʾ%3"}, - {a="(u)(')([iI])", b="%1ʾ%3"}, - {a="(a)(')([aA])", b="%1ʾ%3"}, - {a="(a)(')([uU])", b="%1ʾ%3"}, - {a="(a)(')([iI])", b="%1ʾ%3"}, - {a="(i)(')([aA])", b="%1ʾ%3"}, - {a="(i)(')([uU])", b="%1ʾ%3"}, - {a="(i)(')([iI])", b="%1ʾ%3"}, - {a="(a)(')([^uaiUAI])", b="%1ʾ%3"}, - {a="(u)(')([^uaiUAI])", b="%1ʾ%3"}, - {a="(i)(')([^uaiUAI])", b="%1ʾ%3"} -} - -tanwintrarabica = { --UNTOUCHED/LOC - {a="%-?uNU", b="un"}, - {a="%-?aNU", b="an"}, - {a="%-?iNU", b="in"}, - {a="%-?(\"?At)%-?([ui])N", b="%1%2n"}, - {a="%-?([ui])N", b="%1n"}, - {a="%-?(aN)(_A)", b="an"}, - {a="%-?(aN)(Y)", b="an"}, - {a="(T)%-?(\"?aN)", b="tan"}, - {a="([^TA])%-?(\"?aN)", b="%1an"} -} - --- new trigraphstrarabica = { -- trigraphs or more -- 'llatI / 'llad_I {a="^'ll(a)([%_]?[dt])", b="ll%1%2"}, @@ -759,7 +679,6 @@ trigraphstrarabica = { -- trigraphs or more {a="(_a)I", b="A"} } ---new digraphstrarabica = { -- discard the ʾiʿrāb hyphen (begin) {a="(%-)(\"?[UI]na)(%p?%s)", b="%2%3"}, @@ -810,7 +729,6 @@ digraphstrarabica = { {a="%^d", b="d"} } --- new singletrarabica = { {a="b", b="b"}, {a="t", b="t"}, @@ -835,20 +753,3 @@ singletrarabica = { {a="B", b=""} } -longvtrarabica = { - {a="A", b="ā"}, - {a="U", b="ū"}, - {a="I", b="ī"}, - {a="Y", b="á"}, -} - -shortvtrarabica = { - {a="u", b="u"}, - {a="a", b="a"}, - {a="i", b="i"} -} - --- new -finaltrarabica = { --- {a="ʾ", b="'"}, -} -- cgit v1.2.3