add \cap{} command; correct transliteration tables

1 files changed, 42 insertions, 8 deletions

diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua
index 8a9aee8..19411f1 100644
--- a/arabluatex_trans.lua
+++ b/arabluatex_trans.lua
@@ -70,14 +70,14 @@ trigraphstrdmg = { -- trigraphs or more
    {a="^'ll(a)([%_]?[dt])", b="'ll%1%2"},
    {a="(%s)'ll(a)([%_]?[dt])", b="%1'll%2%3"},
    -- al- + lām
-   {a="^(a)l%-(l)", b="%1l-%2%2"},
-   {a="(%s)(a)l%-(l)", b="%1%2l-%3%3"},
+   {a="^(a)l%-(l)", b="%1l-%2"},
+   {a="(%s)(a)l%-(l)", b="%1%2l-%3"},
    -- al- + solar consonant
-   {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="%1%2-%2"},
-   {a="(%s)(a)l%-([%_%^%.]?[tdrzsn])", b="%1%2%3-%3"},
+   {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="%1%2-"},
+   {a="(%s)(a)l%-([%_%^%.]?[tdrzsn])", b="%1%2%3-"},
    -- assim. art. + solar consonant
-   {a="^(a)([%_%^%.]?[tdrzsn])%-", b="%1%2-%2"},
-   {a="(%s)(a)([%_%^%.]?[tdrzsn])%-", b="%1%2%3-%3"},
+   {a="^(a)([%_%^%.]?[tdrzsn])%-", b="%1%2-"},
+   {a="(%s)(a)([%_%^%.]?[tdrzsn])%-", b="%1%2%3-"},
    -- al- + initial unstable hamza
    {a="^(a)l%-([uai])", b="%1l-%2"},
    {a="(%s)(a)l%-([uai])", b="%1%2l-%3"},
@@ -231,8 +231,8 @@ trigraphstrloc = { -- trigraphs or more
    {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="%1l-%2"},
    {a="(%s)(a)l%-([%_%^%.]?[tdrzsn])", b="%1%2l-%3"},
    -- assim. art. + solar consonant
-   {a="^(a)([%_%^%.]?[tdrzsn])%-", b="%1l-%2"},
-   {a="(%s)(a)([%_%^%.]?[tdrzsn])%-", b="%1%2l-%3"},
+   {a="^(a)([%_%^%.]?[tdrzsn])%-", b="%1l-"},
+   {a="(%s)(a)([%_%^%.]?[tdrzsn])%-", b="%1%2l-"},
    -- al- + initial unstable hamza
    {a="^(a)l%-([uai])", b="%1l-%2"},
    {a="(%s)(a)l%-([uai])", b="%1%2l-%3"},
@@ -339,6 +339,40 @@ finaltrloc = {
    {a="ʾ", b="'"},
 }
 
+-- cap
+captr = {
+   -- dmg (defaut); loc as well
+   {a="ā", b="Ā"},
+   {a="b", b="B"},
+   {a="t", b="T"},
+   {a="ṯ", b="Ṯ"},
+   {a="ǧ", b="Ǧ"},
+   {a="ḥ", b="Ḥ"},
+   {a="ḫ", b="Ḫ"},
+   {a="d", b="D"},
+   {a="ḏ", b="Ḏ"},
+   {a="r", b="R"},
+   {a="z", b="Z"},
+   {a="s", b="S"},
+   {a="š", b="Š"},
+   {a="ṣ", b="Ṣ"},
+   {a="ḍ", b="Ḍ"},
+   {a="ṭ", b="Ṭ"},
+   {a="ẓ", b="Ẓ"},
+   {a="ġ", b="Ġ"},
+   {a="f", b="F"},
+   {a="q", b="Q"},
+   {a="k", b="K"},
+   {a="l", b="L"},
+   {a="m", b="M"},
+   {a="n", b="N"},
+   {a="h", b="H"},
+   {a="w", b="W"},
+   {a="ū", b="Ū"},
+   {a="y", b="Y"},
+   {a="ī", b="Ī"}
+}
+
 -- return {
 -- raw = raw,
 -- hamza = hamza,