done implementing ʾiʿrāb ġayr munṣarif, done documenting. getting close to v1.3

1 files changed, 20 insertions, 3 deletions

diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua
index 45fd3d5..76e297e 100644
--- a/arabluatex_trans.lua
+++ b/arabluatex_trans.lua
@@ -138,8 +138,15 @@ tanwintrdmg = {
    {a="(T)%-?(aN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="t\\arbup{ani}%3%4"},
    {a="([^TA])%-?(aN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1\\arbup{ani}%3%4"},
    {a="%-?(iN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="\\arbup{ini}%2%3"},
+-- tmp (+ ibn)
+   {a="%-?(uN)(%s)(i)", b="\\arbup{uni}%2'"},
+   {a="%-?(aN)(_A)(%s)(i)", b="ạ\\arbup{ni}%3%'"},
+   {a="%-?(aN)(Y)(%s)(i)", b="ạ\\arbup{ni}%3%'"},
+   {a="(T)%-?(aN)(%s)(i)", b="t\\arbup{ani}%3%'"},
+   {a="([^TA])%-?(aN)(%s)(i)", b="%1\\arbup{ani}%3%'"},
+   {a="%-?(iN)(%s)(i)", b="\\arbup{ini}%2%'"},
    --
---   {a="uN", b="\\arbup{un}"}, (now included in last line in this table)
+--   {a="uN", b="\\arbup{un}"}, (now included in the last line of this table)
    {a="%-?(aN)(_A)", b="ạ\\arbup{n}"},
    {a="%-?(aN)(Y)", b="ạ\\arbup{n}"},
    {a="(T)%-?(\"?aN)", b="t\\arbup{an}"},
@@ -260,10 +267,16 @@ trigraphstrdmgeasy = { -- see the differences below under 'easy' tag
 digraphstrdmg = {
    {a="([uai]%-)(\"?[uai])", b="%1'"}, -- hyphen + initial alif without hamza
    {a="^(\"?[uai])", b="%1"},      -- initial alif without hamza
+   -- this is not necessary, take out for now:
 -- {a="([%_]?[uaiUAIY])(%s)([uai])", b="%1%2'"}, -- initial alif without hamza
    {a="(aW)(%s)(\"?[uai])", b="awu%2%3"},
    {a="([^%_][uai])(%s)(\"?[uai])", b="%1%2'"},
-   {a="([%_]?[AYa])(%s)(\"?[uai])", b="a%2'"},
+--tmp (more complex, see next 4 l.)
+-- {a="([%_]?[AYa])(%s)(\"?[uai])", b="a%2'"},
+   {a="(%_A)(%s)(\"?[uai])", b="ạ%2'"},
+   {a="(Y)(%s)(\"?[uai])", b="ạ%2'"},
+   {a="(%_a)(%s)(\"?[uai])", b="a%2'"},
+   {a="(A)(%s)(\"?[uai])", b="a%2'"},
    {a="([%_]?[Uu])(%s)(\"?[uai])", b="u%2'"},
    {a="([%_]?[Ii])(%s)(\"?[uai])", b="i%2'"},
    -- ʾiʿrāb hyphen (begin)
@@ -281,7 +294,11 @@ digraphstrdmg = {
    -- shorten long vowels preceding ʾalif conjunctionis
    {a="(U)(A)", b="U"},
    {a="(aW)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="awu%2%3"},
-   {a="([%_]?[AYa])(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="a%2%3"},
+--tmp {a="([%_]?[AYa])(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="a%2%3"},
+   {a="(%_a)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="a%2%3"},
+   {a="(%_A)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ%2%3"},
+   {a="(A)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="a%2%3"},
+   {a="(Y)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ%2%3"},
    {a="([%_]?[Uu])(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="u%2%3"},
    {a="([%_]?[Ii])(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="i%2%3"},
    {a="%-%-", b=""},