implementation of fullvoc tables

2 files changed, 16 insertions, 14 deletions

diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index 42063ec..9a24d0a 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -109,8 +109,8 @@ hamzafv = {
 -- this is new
 trigraphsfv = { -- trigraphs or more
    -- 'llatI / 'llad_I
-   {a="^'ll(a)([%_]?[dt])", b="الّ%1%2"},
-   {a="(%s)'ll(a)([%_]?[dt])", b="%1الّ%2%3"},
+   {a="^'ll(a)([%_]?[dt])", b="����ّ%1%2"},
+   {a="(%s)'ll(a)([%_]?[dt])", b="%1����ّ%2%3"},
    -- al- + lām
    {a="^(a)l%-(l)", b="ا%1ل%2%2"},
    {a="(%s)(a)l%-(l)", b="%1ا%2ل%3%3"},
@@ -121,29 +121,29 @@ trigraphsfv = { -- trigraphs or more
    {a="^(a)([%_%^%.]?[tdrzsn])%-", b="ا%1ل%2"},
    {a="(%s)(a)([%_%^%.]?[tdrzsn])%-", b="%1ا%2ل%3"},
    -- al- + initial unstable hamza
-   {a="^(a)l%-([uai])", b="ا%1لا%2"},
-   {a="(%s)(a)l%-([uai])", b="%1ا%2لا%3"},
+   {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"},
+   {a="l(i)%-l%-([uai])", b="ل%1لٱ%2"},
    -- al- + lunar consonant (i.e. what remains)
-   {a="^(a)l%-", b="ا%1ل"},
-   {a="(%s)(a)l%-", b="%1ا%2ل"},
+   {a="^(a)l%-", b="ا%1لْ"},
+   {a="(%s)(a)l%-", b="%1ا%2لْ"},
    -- art. with waṣla + lām
-   {a="'l%-(l)", b="ال%1%1"},
+   {a="'l%-(l)", b="����%1%1"},
    -- art. with waṣla + solar consonant
-   {a="'l%-([%_%^%.]?[tdrzsn])", b="ال%1%1"},
+   {a="'l%-([%_%^%.]?[tdrzsn])", b="����%1%1"},
    -- li- + art. + lām
    {a="l(i)%-l%-(l)", b="ل%1ل%2%2"},
    -- assim. art. with waṣla + solar consonant
-   {a="'([%_%^%.]?[tdrzsn])%-", b="ال%1"},
+   {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"},
    -- art. with waṣla + initial unstable hamza
-   {a="'l%-([uai])", b="الا%1"},   
+   {a="'l%-([uai])", b="����ٱ%1"},   
    -- art. with waṣla + lunar consonant (i.e. what remains)
-   {a="'l%-", b="ال"}
+   {a="'l%-", b="����ْ"}
 }
 
 tanwin = {
@@ -157,8 +157,9 @@ tanwin = {
 
 -- this is new
 digraphsfv = {
-   {a="^([uai])", b="ا%1"},      -- initial alif without hamza
-   {a="(%s)([uai])", b="%1ا%2"}, -- initial alif without hamza
+   {a="(%-)([uai])", b="%1ٱ"}, -- hyphen + initial alif without hamza
+   {a="^([uai])", b="ٱ"},      -- initial alif without hamza
+   {a="(%s)([uai])", b="%1ٱ"}, -- initial alif without hamza
    {a="%-%-", b="ـ"},
    {a="bb", b="بّ"},
    {a="BB", b="ـّ"},
diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index 00cdd1e..9208eed 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -154,6 +154,7 @@ tanwin = {
 }
 
 digraphs = {
+   {a="(%-)([uai])", b="%1ا%2"}, -- hyphen + initial alif without hamza
    {a="^([uai])", b="ا%1"},      -- initial alif without hamza
    {a="(%s)([uai])", b="%1ا%2"}, -- initial alif without hamza
    {a="%-%-", b="ـ"},