1 files changed, 96 insertions, 30 deletions

diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua
index 2b9fcdf..b21397d 100644
--- a/arabluatex_trans.lua
+++ b/arabluatex_trans.lua
@@ -213,12 +213,16 @@ trigraphstrdmg = { -- trigraphs or more
    -- al- + lām
    {a="^(a)l%-(l)", b="%1l-%2"},
    {a="([%(%[%|%<%s%-o])(a)l%-(l)", b="%1%2l-%3"}, --p
-   -- al- + solar consonant
-   {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="%1%2-%2"},
-   {a="([%(%[%|%<%s%-o])(a)l%-([%_%^%.]?[tdrzsn])", b="%1%2%3-%3"}, --p
-   -- assim. art. + solar consonant
-   {a="^(a)([%_%^%.]?[tdrzsn])%-", b="%1%2-"},
-   {a="([%(%[%|%<%s%-o])(a)([%_%^%.]?[tdrzsn])%-", b="%1%2%3-"}, --p
+   -- al- + solar consonant ('c' and '^n' are additional characters)
+   {a="^(a)l%-(%^n)", b="%1l-%2"}, -- ^n is lunar
+   {a="([%(%[%|%<%s%-o])(a)l%-(%^n)", b="%1%2l-%3"}, --^n is lunar --p
+   {a="^(a)l%-([%_%^%.]?[tdrzsnc])", b="%1%2-%2"},
+   {a="([%(%[%|%<%s%-o])(a)l%-([%_%^%.]?[tdrzsnc])", b="%1%2%3-%3"}, --p
+   -- assim. art. + solar consonant ('c' and '^n' are additional characters)
+   {a="^(a)(%^n)%-", b="%1l-"}, -- ^n is lunar
+   {a="([%(%[%|%<%s%-o])(a)(%^n)%-", b="%1%2l-"}, --^n is lunar --p
+   {a="^(a)([%_%^%.]?[tdrzsnc])%-", b="%1%2-"},
+   {a="([%(%[%|%<%s%-o])(a)([%_%^%.]?[tdrzsnc])%-", b="%1%2%3-"}, --p
    -- al- + initial unstable hamza
    {a="^(a)l%-(\"?[uai])", b="%1l-%2"},
    {a="([%(%[%|%<%s%-o])(a)l%-(\"?[uai])", b="%1%2l-%3"}, --p
@@ -235,15 +239,23 @@ trigraphstrdmg = { -- trigraphs or more
    -- art. with waṣla + lām
    {a="'l%-(l)", b="'l-%1"},
    -- art. with waṣla + solar consonant
-   {a="'l%-([%_%^%.]?[tdrzsn])", b="'%1-%1"},
+   -- ('c' and '^n' are additional characters)
+   {a="'l%-(%^n)", b="'l-%1"}, -- ^n is lunar
+   {a="'l%-([%_%^%.]?[tdrzsnc])", b="'%1-%1"},
    -- li-/la- + art. + lām
    {a="l([ai])%-l%-(l)", b="l%1-%2%2"},
    -- assim. art. with waṣla + solar consonant
-   {a="'([%_%^%.]?[tdrzsn])%-", b="'%1-"},
+   -- ('c' and '^n' are additional characters)
+   {a="'(%^n)%-", b="'l-"}, -- ^n is lunar
+   {a="'([%_%^%.]?[tdrzsnc])%-", b="'%1-"},
    -- li-/la- + art. + solar consonant is a special orthography
-   {a="l([ai])%-l%-([%_%^%.]?[tdrzsn])", b="l%1-%2-%2"},
+   -- ('c' and '^n' are additional characters)
+   {a="l([ai])%-l%-(%^n)", b="l%1-l-%2"}, -- ^n is lunar
+   {a="l([ai])%-l%-([%_%^%.]?[tdrzsnc])", b="l%1-%2-%2"},
    -- li-/la- + assim. art. + solar consonant is a special orthography
-   {a="l([ai])%-([%_%^%.]?[tdrzsn])%-([%_%^%.]?[tdrzsn])", b="l%1-%2-%3"},
+   -- ('c' and '^n' are additional characters)
+   {a="l([ai])%-(%^n)%-(%^n)", b="l%1-l-%3"}, -- ^n is lunar
+   {a="l([ai])%-([%_%^%.]?[tdrzsnc])%-([%_%^%.]?[tdrzsnc])", b="l%1-%2-%3"},
    -- art. with waṣla + initial unstable hamza
    {a="'l%-(\"?[uai])", b="'l-%1"},
    -- art. with waṣla + lunar consonant (i.e. what remains)
@@ -353,6 +365,11 @@ digraphstrdmg = {
    {a="%.t", b="ṭ"},
    {a="%.z", b="ẓ"},
    {a="%.g", b="ġ"},
+   -- additional characters (begin)
+   {a="%^c", b="č"},
+   {a="%^z", b="ž"},
+   {a="%^n", b="g"},
+   -- additional characters (end)
    -- the following needs to be moved above shortening rules
 --   {a="(U)(A)", b="ū"},
    {a="WA", b="w"},
@@ -389,6 +406,11 @@ singletrdmg = {
    {a="w", b="w"},
    {a="y", b="y"},
    {a="T", b="t"},
+   -- additional characters (begin)
+   {a="p", b="p"},
+   {a="v", b="v"},
+   {a="g", b="g"}, -- for ^n → g see above
+   -- additional characters (end)
    {a="\"", b=""},
    {a="B", b=""}
 }
@@ -495,12 +517,16 @@ trigraphstrloc = { -- trigraphs or more
    -- al- + lām
    {a="^(a)l%-(l)", b="%1l-%2"},
    {a="(%s)(a)l%-(l)", b="%1%2l-%3"},
-   -- al- + solar consonant
-   {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-"},
-   {a="(%s)(a)([%_%^%.]?[tdrzsn])%-", b="%1%2l-"},
+   -- al- + solar consonant ('c' and '^n' are additional characters)
+   {a="^(a)l%-(%^n)", b="%1l-%2"}, -- ^n is lunar
+   {a="(%s)(a)l%-(%^n)", b="%1%2l-%3"}, -- ^n is lunar
+   {a="^(a)l%-([%_%^%.]?[tdrzsnc])", b="%1l-%2"},
+   {a="(%s)(a)l%-([%_%^%.]?[tdrzsnc])", b="%1%2l-%3"},
+   -- assim. art. + solar consonant ('c' and '^n' are additional characters)
+   {a="^(a)(%^n)%-", b="%1l-"}, -- ^n is lunar
+   {a="(%s)(a)(%^n)%-", b="%1%2l-"}, -- ^n is lunar
+   {a="^(a)([%_%^%.]?[tdrzsnc])%-", b="%1l-"},
+   {a="(%s)(a)([%_%^%.]?[tdrzsnc])%-", b="%1%2l-"},
    -- al- + initial unstable hamza
    {a="^(a)l%-([uai])", b="%1l-%2"},
    {a="(%s)(a)l%-([uai])", b="%1%2l-%3"},
@@ -512,15 +538,23 @@ trigraphstrloc = { -- trigraphs or more
    -- art. with waṣla + lām
    {a="'l%-(l)", b="al-%1"},
    -- art. with waṣla + solar consonant
-   {a="'l%-([%_%^%.]?[tdrzsn])", b="al-%1"},
+   -- ('c' and '^n' are additional characters)
+   {a="'l%-(%^n)", b="al-%1"}, -- ^n is lunar
+   {a="'l%-([%_%^%.]?[tdrzsnc])", b="al-%1"},
    -- li-/la- + art. + lām
    {a="l([ai])%-l%-(l)", b="l%1-l-%2"},
    -- assim. art. with waṣla + solar consonant
-   {a="'([%_%^%.]?[tdrzsn])%-", b="al-"},
+   -- ('c' and '^n' are additional characters)
+   {a="'(%^n)%-", b="al-"}, -- ^n is lunar
+   {a="'([%_%^%.]?[tdrzsnc])%-", b="al-"},
    -- li-/la- + art. + solar consonant is a special orthography
-   {a="l([ai])%-l%-([%_%^%.]?[tdrzsn])", b="l%1-l-%2"},
+   -- ('c' and '^n' are additional characters)
+   {a="l([ai])%-l%-(%^n)", b="l%1-l-%2"}, -- ^n is lunar
+   {a="l([ai])%-l%-([%_%^%.]?[tdrzsnc])", b="l%1-l-%2"},
    -- li-/la- + assim. art. + solar consonant is a special orthography
-   {a="l([ai])%-([%_%^%.]?[tdrzsn])%-([%_%^%.]?[tdrzsn])", b="l%1-l-%3"},
+   -- ('c' and '^n' are additional characters)
+   {a="l([ai])%-(%^n)%-(%^n)", b="l%1-l-%3"}, -- ^n is lunar
+   {a="l([ai])%-([%_%^%.]?[tdrzsnc])%-([%_%^%.]?[tdrzsnc])", b="l%1-l-%3"},
    -- art. with waṣla + initial unstable hamza
    {a="'l%-([uai])", b="al-%1"},   
    -- art. with waṣla + lunar consonant (i.e. what remains)
@@ -576,6 +610,11 @@ digraphstrloc = {
    {a="%.t", b="ṭ"},
    {a="%.z", b="ẓ"},
    {a="%.g", b="gh"},
+   -- additional characters (begin)
+   {a="%^c", b="ch"},
+   {a="%^z", b="zh"},
+   {a="%^n", b="ñ"},
+   -- additional characters (end)
    {a="(U)(A)", b="ū"},
    {a="WA", b="w"},
    {a="(a)W", b="%1w"},
@@ -611,6 +650,11 @@ singletrloc = {
    {a="w", b="w"},
    {a="y", b="y"},
    {a="T", b="t"},
+   -- additional characters (begin)
+   {a="p", b="p"},
+   {a="v", b="v"},
+   {a="g", b="g"},
+   -- additional characters (end)
    {a="\"", b=""},
    {a="B", b=""}
 }
@@ -709,12 +753,16 @@ trigraphstrarabica = { -- trigraphs or more
    -- al- + lām
    {a="^(a)l%-(l)", b="%1l-%2"},
    {a="(%s)(a)l%-(l)", b="%1%2l-%3"},
-   -- al- + solar consonant
-   {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-"},
-   {a="(%s)(a)([%_%^%.]?[tdrzsn])%-", b="%1%2l-"},
+   -- al- + solar consonant ('c' and '^n' are additional characters)
+   {a="^(a)l%-(%^n)", b="%1l-%2"}, -- ^n is lunar
+   {a="(%s)(a)l%-(%^n)", b="%1%2l-%3"}, -- ^n is lunar
+   {a="^(a)l%-([%_%^%.]?[tdrzsnc])", b="%1l-%2"},
+   {a="(%s)(a)l%-([%_%^%.]?[tdrzsnc])", b="%1%2l-%3"},
+   -- assim. art. + solar consonant ('c' and '^n' are additional characters)
+   {a="^(a)(%^n)%-", b="%1l-"}, -- ^n is lunar
+   {a="(%s)(a)(%^n)%-", b="%1%2l-"}, -- ^n is lunar
+   {a="^(a)([%_%^%.]?[tdrzsnc])%-", b="%1l-"},
+   {a="(%s)(a)([%_%^%.]?[tdrzsnc])%-", b="%1%2l-"},
    -- al- + initial unstable hamza
    {a="^(a)l%-([uai])", b="%1l-%2"},
    {a="(%s)(a)l%-([uai])", b="%1%2l-%3"},
@@ -726,15 +774,23 @@ trigraphstrarabica = { -- trigraphs or more
    -- art. with waṣla + lām
    {a="'l%-(l)", b="l-%1"},
    -- art. with waṣla + solar consonant
-   {a="'l%-([%_%^%.]?[tdrzsn])", b="l-%1"},
+   -- ('c' and '^n' are additional characters)
+   {a="'l%-(%^n)", b="l-%1"}, -- ^n is lunar
+   {a="'l%-([%_%^%.]?[tdrzsnc])", b="l-%1"},
    -- li-/la- + art. + lām
    {a="l([ai])%-l%-(l)", b="l%1-l-%2"},
    -- assim. art. with waṣla + solar consonant
-   {a="'([%_%^%.]?[tdrzsn])%-", b="l-"},
+   -- ('c' and '^n' are additional characters)
+   {a="'(%^n)%-", b="l-"}, -- ^n is lunar
+   {a="'([%_%^%.]?[tdrzsnc])%-", b="l-"},
    -- li-/la- + art. + solar consonant is a special orthography
-   {a="l([ai])%-l%-([%_%^%.]?[tdrzsn])", b="l%1-l-%2"},
+   -- ('c' and '^n' are additional characters)
+   {a="l([ai])%-l%-(%^n)", b="l%1-l-%2"}, -- ^n is lunar
+   {a="l([ai])%-l%-([%_%^%.]?[tdrzsnc])", b="l%1-l-%2"},
    -- li-/la- + assim. art. + solar consonant is a special orthography
-   {a="l([ai])%-([%_%^%.]?[tdrzsn])%-([%_%^%.]?[tdrzsn])", b="l%1-l-%3"},
+   -- ('c' and '^n' are additional characters)
+   {a="l([ai])%-(%^n)%-(%^n)", b="l%1-l-%3"}, -- ^n is lunar
+   {a="l([ai])%-([%_%^%.]?[tdrzsnc])%-([%_%^%.]?[tdrzsnc])", b="l%1-l-%3"},
    -- art. with waṣla + initial unstable hamza
    {a="'l%-([uai])", b="l-%1"},   
    -- art. with waṣla + lunar consonant (i.e. what remains)
@@ -790,6 +846,11 @@ digraphstrarabica = {
    {a="%.t", b="ṭ"},
    {a="%.z", b="ẓ"},
    {a="%.g", b="ġ"},
+   -- additional characters (begin)
+   {a="%^c", b="č"},
+   {a="%^z", b="ž"},
+   {a="%^n", b="g"},
+   -- additional characters (end)
    {a="(U)(A)", b="ū"},
    {a="WA", b="w"},
    {a="(a)W", b="%1w"},
@@ -825,6 +886,11 @@ singletrarabica = {
    {a="w", b="w"},
    {a="y", b="y"},
    {a="T", b="t"},
+   -- additional characters (begin)
+   {a="p", b="p"},
+   {a="v", b="v"},
+   {a="g", b="g"}, -- for ^n → g see above
+   -- additional characters (end)
    {a="\"", b=""},
    {a="B", b=""}
 }