2 files changed, 15 insertions, 6 deletions

diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index b0e00d4..1129911 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -171,9 +171,10 @@ trigraphsfv = { -- trigraphs or more
 
 -- this is new
 digraphsfv = {
-   {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="([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="ـ"},
    {a="ؤؤ", b="ؤّ"},
    {a="أأ", b="أّ"},
diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua
index 1e2d89a..f7274c1 100644
--- a/arabluatex_trans.lua
+++ b/arabluatex_trans.lua
@@ -153,9 +153,17 @@ tanwintrdmg = {
 }
 
 digraphstrdmg = {
-   {a="(%-)([uai])", b="%1'"}, -- hyphen + initial alif without hamza
+   {a="([uai]%-)([uai])", b="%1'"}, -- hyphen + initial alif without hamza
    {a="^([uai])", b="%1"},      -- initial alif without hamza
-   {a="(%s)([uai])", b="%1'"}, -- initial alif without hamza
+--   {a="([%_]?[uaiUAIY])(%s)([uai])", b="%1%2'"}, -- initial alif without hamza
+   {a="([^%_][uai])(%s)([uai])", b="%1%2'"},
+   {a="([%_]?[AYa])(%s)([uai])", b="a%2'"},
+   {a="([%_]?[Uu])(%s)([uai])", b="u%2'"},
+   {a="([%_]?[Ii])(%s)([uai])", b="i%2'"},
+   -- shorten long vowels preceding ʾalif conjunctionis
+   {a="([%_]?[AYa])(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="a%2%3"},
+   {a="([%_]?[Uu])(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="u%2%3"},
+   {a="([%_]?[Ii])(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="i%2%3"},
    {a="%-%-", b=""},
    {a="T([^uai])", b="%1"},
    {a="T(%s)", b="%1"},
@@ -208,7 +216,7 @@ longvtrdmg = {
    {a="A", b="ā"},
    {a="U", b="ū"},
    {a="I", b="ī"},
-   {a="Y", b="ā"},
+   {a="Y", b="ā"}
 }
 
 shortvtrdmg = {