1 files changed, 12 insertions, 9 deletions

diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index d1f4bdc..505ac4e 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -132,10 +132,10 @@ 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-/la + art. + initial unstable hamza is a special orthography
-   {a="l([ai])%-l%-([uai])", b="ل%1لٱ%2"},
+   {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لْ"},
@@ -156,7 +156,7 @@ trigraphsfv = { -- 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="ٱلٱ%1"},   
+   {a="'l%-(\"?[uai])", b="ٱلٱ%1"},   
    -- art. with waṣla + lunar consonant (i.e. what remains)
    {a="'l%-", b="ٱلْ"},
    -- the silent wāw
@@ -211,12 +211,15 @@ tanwinfv = {
 
 -- this is new
 digraphsfv = {
+   -- initial straight double quote gives a connective ʾalif
+   {a="^\"[uai]", b="ٱ"},
+   {a="([%s%-])\"[uai]", b="%1ٱ"},
    -- diphthongs to be resolved before ʾalif conjunctionis
-   {a="(aW)(%s)([uai])", b="awuا%2ٱ"},
-   {a="(aw)(%s)([uai])", b="%1u%2ٱ"},
-   {a="(ay)(%s)([uai])", b="%1i%2ٱ"},
-   {a="([uai]%-)([uai])", b="%1ٱ"}, -- hyphen + initial alif without hamza
-   {a="([%_]?[uaiUAIY])(%s)([uai])", b="%1%2ٱ"}, -- initial alif without hamza
+   {a="(aW)(%s)(\"?[uai])", b="awuا%2ٱ"},
+   {a="(aw)(%s)(\"?[uai])", b="%1u%2ٱ"},
+   {a="(ay)(%s)(\"?[uai])", b="%1i%2ٱ"},
+   {a="([uai]%-)(\"?[uai])", b="%1ٱ"}, -- hyphen + initial alif without hamza
+   {a="([%_]?[uaiUAIY])(%s)(\"?[uai])", b="%1%2ٱ"}, -- initial alif without hamza
    {a="^([uai])", b="ا%1"},      -- initial alif without hamza
    {a="(%s)([uai])", b="%1ا%2"}, -- initial alif without hamza
    {a="%-%-", b="ـ"},