1 files changed, 9 insertions, 0 deletions

diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index 1129911..e6cdb42 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -138,6 +138,10 @@ trigraphsfv = { -- 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
@@ -171,6 +175,10 @@ trigraphsfv = { -- trigraphs or more
 
 -- this is new
 digraphsfv = {
+   -- 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="^([uai])", b="ا%1"},      -- initial alif without hamza
@@ -233,6 +241,7 @@ digraphsfv = {
    {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="ٗ"},