1 files changed, 6 insertions, 0 deletions

diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index b6dbd12..4d3c656 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -169,6 +169,10 @@ trigraphs = { -- trigraphs or more
    -- al- + lunar consonant (i.e. what remains)
    {a="^(a)l%-", b="ا%1ل"},
    {a="(%s)(a)l%-", b="%1ا%2ل"},
+   -- diphthongs to be resolved before ʾalif conjunctionis
+   {a="(aW)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="awuا%2%3"},
+   {a="(aw)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1u%2%3"},
+   {a="(ay)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1i%2%3"},
    -- art. with waṣla + lām
    {a="'l%-(l)", b="ال%1%1"},
    -- art. with waṣla + solar consonant
@@ -224,6 +228,7 @@ tanwin = {
 }
 
 digraphs = {
+   {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
    {a="(%s)([uai])", b="%1ا%2"}, -- initial alif without hamza
@@ -274,6 +279,7 @@ digraphs = {
    {a="%.g", b="غ"},
    {a="(U)(A)", b="%1ا"},
    {a="WA", b="وا"},
+   {a="(a)W\"", b="%1وْا"},
    {a="(a)W", b="%1وا"},
    {a="_A", b="aى"},
    {a="_u", b="ٗ"},