improved quoting feature in all modes; still documenting

1 files changed, 22 insertions, 1 deletions

diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index ecdb067..f40c405 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -162,9 +162,12 @@ trigraphs = { -- 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لٱ%3"},
+   {a="([%s%-])(a)l%-(\")([uai])", b="%1ا%2لٱ%4"},
    {a="^(a)l%-([uai])", b="ا%1لا%2"},
    {a="([%s%-])(a)l%-([uai])", b="%1ا%2لا%3"},
    -- li-/la- + art. + initial unstable hamza is a special orthography
+   {a="l([ai])%-l%-(\")([uai])", b="ل%1لٱ%3"},
    {a="l([ai])%-l%-([uai])", b="ل%1لا%2"},
    -- al- + lunar consonant (i.e. what remains)
    {a="^(a)l%-", b="ا%1ل"},
@@ -186,6 +189,7 @@ trigraphs = { -- trigraphs or more
    -- 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="الٱ%2"},   
    {a="'l%-([uai])", b="الا%1"},   
    -- art. with waṣla + lunar consonant (i.e. what remains)
    {a="'l%-", b="ال"},
@@ -217,6 +221,16 @@ tanwin = {
    {a="([^TA])(aN)(%s)([rlmnwy])", b="%1ًا%3%4%4"},
    {a="(iN)(%s)([rlmnwy])", b="ٍ%2%3%3"},
    -- assimilations (end)
+   -- quoted tanwīn (begin)
+   {a="(\"uN)", b=""},
+   {a="(B)(\"aN)", b="%1"},
+   {a="(\"aN)(_A)", b="ى"},
+   {a="(\"aN)(Y)", b="ى"},
+   {a="(T)(\"aN)", b="%1"},
+   {a="(ء)(\"aN)", b="%1"},
+   {a="([^TA])(\"aN)", b="%1ا"},
+   {a="(\"iN)", b=""},
+   -- quoted tanwīn (end)
    {a="(uN)", b="ٌ"},
    {a="(B)(aN)", b="%1ً"},
    {a="(aN)(_A)", b="ًى"},
@@ -228,6 +242,9 @@ tanwin = {
 }
 
 digraphs = {
+   -- initial straight double quote gives a connective ʾalif
+   {a="^\"[uai]", b="ٱ"},
+   {a="([%s%-])\"[uai]", b="%1ٱ"},
    {a="(aW)(%s)([uai])", b="awuا%2%3"},
    {a="(%-)([uai])", b="%1ا%2"}, -- hyphen + initial alif without hamza
    {a="^([uai])", b="ا%1"},      -- initial alif without hamza
@@ -320,10 +337,14 @@ single = {
 }
 
 longv = {
+   {a="\"A", b="ا"},
+   {a="\"U", b="و"},
+   {a="\"I", b="ي"},
+   {a="\"Y", b="ى"},
    {a="A", b="َا"},
    {a="U", b="ُو"},
    {a="I", b="ِي"},
-   {a="Y", b="aى"},
+   {a="Y", b="aى"}
 }
 
 shortv = {