3 files changed, 34 insertions, 33 deletions

diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index 75f042d..9757371 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -81,8 +81,8 @@ trigraphsfv = { -- trigraphs or more
    -- al- + initial unstable hamza
    {a="^(a)l%-([uai])", b="ا%1لٱ%2"},
    {a="(%s)(a)l%-([uai])", b="%1ا%2لٱ%3"},
-   -- li- + art. + initial unstable hamza is a special orthography
-   {a="l(i)%-l%-([uai])", b="ل%1لٱ%2"},
+   -- li-/la + art. + initial unstable hamza is a special orthography
+   {a="l([ai])%-l%-([uai])", b="ل%1لٱ%2"},
    -- al- + lunar consonant (i.e. what remains)
    {a="^(a)l%-", b="ا%1لْ"},
    {a="(%s)(a)l%-", b="%1ا%2لْ"},
@@ -90,14 +90,14 @@ trigraphsfv = { -- trigraphs or more
    {a="'l%-(l)", b="ٱل%1%1"},
    -- art. with waṣla + solar consonant
    {a="'l%-([%_%^%.]?[tdrzsn])", b="ٱل%1%1"},
-   -- li- + art. + lām
-   {a="l(i)%-l%-(l)", b="ل%1ل%2%2"},
+   -- li-/la- + art. + lām
+   {a="l([ai])%-l%-(l)", b="ل%1%2%2"},
    -- assim. art. with waṣla + solar consonant
    {a="'([%_%^%.]?[tdrzsn])%-", b="ٱل%1"},
-   -- li- + art. + solar consonant is a special orthography
-   {a="l(i)%-l%-([%_%^%.]?[tdrzsn])", b="ل%1ل%2%2"},
-   -- li- + assim. art. + solar consonant is a special orthography
-   {a="l(i)%-([%_%^%.]?[tdrzsn])%-([%_%^%.]?[tdrzsn])", b="ل%1ل%3%3"},
+   -- li-/la- + art. + solar consonant is a special orthography
+   {a="l([ai])%-l%-([%_%^%.]?[tdrzsn])", b="ل%1ل%2%2"},
+   -- li-/la- + assim. art. + solar consonant is a special orthography
+   {a="l([ai])%-([%_%^%.]?[tdrzsn])%-([%_%^%.]?[tdrzsn])", b="ل%1ل%3%3"},
    -- art. with waṣla + initial unstable hamza
    {a="'l%-([uai])", b="ٱلٱ%1"},   
    -- art. with waṣla + lunar consonant (i.e. what remains)
diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua
index 19411f1..96ef38f 100644
--- a/arabluatex_trans.lua
+++ b/arabluatex_trans.lua
@@ -81,8 +81,8 @@ trigraphstrdmg = { -- trigraphs or more
    -- al- + initial unstable hamza
    {a="^(a)l%-([uai])", b="%1l-%2"},
    {a="(%s)(a)l%-([uai])", b="%1%2l-%3"},
-   -- li- + art. + initial unstable hamza is a special orthography
-   {a="l(i)%-l%-([uai])", b="l%1-l-%2"},
+   -- li-/la- + art. + initial unstable hamza is a special orthography
+   {a="l([ai])%-l%-([uai])", b="l%1-l-%2"},
    -- al- + lunar consonant (i.e. what remains)
    {a="^(a)l%-", b="%1l-"},
    {a="(%s)(a)l%-", b="%1%2l-"},
@@ -90,14 +90,14 @@ trigraphstrdmg = { -- trigraphs or more
    {a="'l%-(l)", b="'l-%1"},
    -- art. with waṣla + solar consonant
    {a="'l%-([%_%^%.]?[tdrzsn])", b="'%1-%1"},
-   -- li- + art. + lām
-   {a="l(i)%-l%-(l)", b="l%1-l-%2%2"},
+   -- 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-"},
-   -- li- + art. + solar consonant is a special orthography
-   {a="l(i)%-l%-([%_%^%.]?[tdrzsn])", b="l%1-%2-%2"},
-   -- li- + assim. art. + solar consonant is a special orthography
-   {a="l(i)%-([%_%^%.]?[tdrzsn])%-([%_%^%.]?[tdrzsn])", b="l%1-%2-%3"},
+   -- li-/la- + art. + solar consonant is a special orthography
+   {a="l([ai])%-l%-([%_%^%.]?[tdrzsn])", 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"},
    -- art. with waṣla + initial unstable hamza
    {a="'l%-([uai])", b="'l-%1"},   
    -- art. with waṣla + lunar consonant (i.e. what remains)
@@ -236,8 +236,8 @@ trigraphstrloc = { -- trigraphs or more
    -- al- + initial unstable hamza
    {a="^(a)l%-([uai])", b="%1l-%2"},
    {a="(%s)(a)l%-([uai])", b="%1%2l-%3"},
-   -- li- + art. + initial unstable hamza is a special orthography
-   {a="l(i)%-l%-([uai])", b="l%1l-%2"},
+   -- li-/la- + art. + initial unstable hamza is a special orthography
+   {a="l([ai])%-l%-([uai])", b="l%1l-%2"},
    -- al- + lunar consonant (i.e. what remains)
    {a="^(a)l%-", b="%1l-"},
    {a="(%s)(a)l%-", b="%1%2l-"},
@@ -245,14 +245,14 @@ trigraphstrloc = { -- trigraphs or more
    {a="'l%-(l)", b="al-%1"},
    -- art. with waṣla + solar consonant
    {a="'l%-([%_%^%.]?[tdrzsn])", b="al-%1"},
-   -- li- + art. + lām
-   {a="l(i)%-l%-(l)", b="l%1l-%2"},
+   -- li-/la- + art. + lām
+   {a="l([ai])%-l%-(l)", b="l%1-%2"},
    -- assim. art. with waṣla + solar consonant
    {a="'([%_%^%.]?[tdrzsn])%-", b="al-"},
-   -- li- + art. + solar consonant is a special orthography
-   {a="l(i)%-l%-([%_%^%.]?[tdrzsn])", b="l%1l-%2"},
-   -- li- + assim. art. + solar consonant is a special orthography
-   {a="l(i)%-([%_%^%.]?[tdrzsn])%-([%_%^%.]?[tdrzsn])", b="l%1l-%3"},
+   -- li-/la- + art. + solar consonant is a special orthography
+   {a="l([ai])%-l%-([%_%^%.]?[tdrzsn])", b="l%1l-%2"},
+   -- li-/la- + assim. art. + solar consonant is a special orthography
+   {a="l([ai])%-([%_%^%.]?[tdrzsn])%-([%_%^%.]?[tdrzsn])", b="l%1l-%3"},
    -- art. with waṣla + initial unstable hamza
    {a="'l%-([uai])", b="al-%1"},   
    -- art. with waṣla + lunar consonant (i.e. what remains)
diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index 9208eed..face931 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -121,8 +121,8 @@ trigraphs = { -- trigraphs or more
    -- al- + initial unstable hamza
    {a="^(a)l%-([uai])", b="ا%1لا%2"},
    {a="(%s)(a)l%-([uai])", b="%1ا%2لا%3"},
-   -- li- + art. + initial unstable hamza is a special orthography
-   {a="l(i)%-l%-([uai])", b="ل%1لا%2"},
+   -- li-/la- + art. + initial unstable hamza is a special orthography
+   {a="l([ai])%-l%-([uai])", b="ل%1لا%2"},
    -- al- + lunar consonant (i.e. what remains)
    {a="^(a)l%-", b="ا%1ل"},
    {a="(%s)(a)l%-", b="%1ا%2ل"},
@@ -130,14 +130,14 @@ trigraphs = { -- trigraphs or more
    {a="'l%-(l)", b="ال%1%1"},
    -- art. with waṣla + solar consonant
    {a="'l%-([%_%^%.]?[tdrzsn])", b="ال%1%1"},
-   -- li- + art. + lām
-   {a="l(i)%-l%-(l)", b="ل%1ل%2%2"},
+   -- li-/la- + art. + lām
+   {a="l([ai])%-l%-(l)", b="ل%1%2%2"},
    -- assim. art. with waṣla + solar consonant
    {a="'([%_%^%.]?[tdrzsn])%-", b="ال%1"},
-   -- li- + art. + solar consonant is a special orthography
-   {a="l(i)%-l%-([%_%^%.]?[tdrzsn])", b="ل%1ل%2%2"},
-   -- li- + assim. art. + solar consonant is a special orthography
-   {a="l(i)%-([%_%^%.]?[tdrzsn])%-([%_%^%.]?[tdrzsn])", b="ل%1ل%3%3"},
+   -- li-/la- + art. + solar consonant is a special orthography
+   {a="l([ai])%-l%-([%_%^%.]?[tdrzsn])", b="ل%1ل%2%2"},
+   -- li-/la + assim. art. + solar consonant is a special orthography
+   {a="l([ai])%-([%_%^%.]?[tdrzsn])%-([%_%^%.]?[tdrzsn])", b="ل%1ل%3%3"},
    -- art. with waṣla + initial unstable hamza
    {a="'l%-([uai])", b="الا%1"},   
    -- art. with waṣla + lunar consonant (i.e. what remains)
@@ -251,7 +251,8 @@ shortv = {
 }
 
 null = {
-        {a="%|", b=""}
+   {a="%|", b=""},
+   {a="([^0-9])(%-)([^0-9])", b="%1%3"}
 }
 
 -- return {