1 files changed, 15 insertions, 0 deletions

diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index 836ee4b..a573f07 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -102,11 +102,13 @@ buckwalter = {
    {a="ww", b="w|w"},
    {a="yy", b="y|y"},
    -- hamza begin
+   {a="A\'", b="@@"}, -- hold this (classic madda)
    {a="\'", b="|\"\'"},
    {a="%>", b="a\"\'"},
    {a="%&", b="w\"\'"},
    {a="%<", b="i\"\'"},
    {a="%]", b="y\"\'"},
+   {a="@@", b="A\'"}, -- give back classic madda
    -- hamza end
    -- trigraphs
    {a="^Aal%-?", b="al-"},
@@ -130,6 +132,7 @@ buckwalter = {
    {a="%@", b="A\"\'"},
    -- šadda:
    {a="([%g])(%~)", b="%1%1"},
+   {a="%`", b="_a"},
    {a="v", b="_t"},
    {a="H", b=".h"},
    {a="%*", b="_d"},
@@ -401,23 +404,29 @@ trigraphs = { -- trigraphs or more
    {a="^'ll(a)([%_]?[dt])", b="الّ%1%2"},
    {a="([%s%-])'ll(a)([%_]?[dt])", b="%1الّ%2%3"},
    -- al- + lām
+   {a="([%s%-])(\"a)l%-(l)", b="%1ٱ%2ل%3%3"},
    {a="^(a)l%-(l)", b="ا%1ل%2%2"},
    {a="([%s%-])(a)l%-(l)", b="%1ا%2ل%3%3"},
    -- al- + solar consonant
+   {a="([%s%-])(\"a)l%-([%_%^%.]?[tdrzsn])", b="%1ٱ%2ل%3%3"},
    {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="ا%1ل%2%2"},
    {a="([%s%-])(a)l%-([%_%^%.]?[tdrzsn])", b="%1ا%2ل%3%3"},
    -- assim. art. + solar consonant
+   {a="([%s%-])(\"a)([%_%^%.]?[tdrzsn])%-", b="%1ٱ%2ل%3"},
    {a="^(a)([%_%^%.]?[tdrzsn])%-", b="ا%1ل%2"},
    {a="([%s%-])(a)([%_%^%.]?[tdrzsn])%-", b="%1ا%2ل%3"},
    -- al- + initial unstable hamza
+   {a="([%s%-])(\"a)l%-(\")([uai])", b="%1ٱ%2ل%4ٱ"},
    {a="^(a)l%-(\")([uai])", b="ا%1ل%3ٱ"},
    {a="([%s%-])(a)l%-(\")([uai])", b="%1ا%2ل%4ٱ"},
+   {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ل%3ٱ"},
    {a="l([ai])%-l%-([uai])", b="ل%1ل%2ا"},
    -- al- + lunar consonant (i.e. what remains)
+   {a="([%s%-])(\"a)l%-", b="%1ٱ%2ل"},
    {a="^(a)l%-", b="ا%1ل"},
    {a="([%s%-])(a)l%-", b="%1ا%2ل"},
    -- diphthongs to be resolved before ʾalif conjunctionis
@@ -461,23 +470,29 @@ trigraphseasy = { -- differences marked below with 'easy'
    {a="^'ll(a)([%_]?[dt])", b="الّ%1%2"},
    {a="([%s%-])'ll(a)([%_]?[dt])", b="%1الّ%2%3"},
    -- al- + lām (easy)
+   {a="([%s%-])(\"a)l%-(l)", b="%1ٱ%2ل%3"},
    {a="^(a)l%-(l)", b="ا%1ل%2"},
    {a="([%s%-])(a)l%-(l)", b="%1ا%2ل%3"},
    -- al- + solar consonant (easy)
+   {a="([%s%-])(\"a)l%-([%_%^%.]?[tdrzsn])", b="%1ٱ%2ل%3"},
    {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="ا%1ل%2"},
    {a="([%s%-])(a)l%-([%_%^%.]?[tdrzsn])", b="%1ا%2ل%3"},
    -- assim. art. + solar consonant (easy)
+   {a="([%s%-])(\"a)([%_%^%.]?[tdrzsn])%-", b="%1ٱ%2ل"},
    {a="^(a)([%_%^%.]?[tdrzsn])%-", b="ا%1ل"},
    {a="([%s%-])(a)([%_%^%.]?[tdrzsn])%-", b="%1ا%2ل"},
    -- al- + initial unstable hamza
+   {a="([%s%-])(\"a)l%-(\")([uai])", b="%1ٱ%2ل%4ٱ"},
    {a="^(a)l%-(\")([uai])", b="ا%1ل%3ٱ"},
    {a="([%s%-])(a)l%-(\")([uai])", b="%1ا%2ل%4ٱ"},
+   {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ل%3ٱ"},
    {a="l([ai])%-l%-([uai])", b="ل%1ل%2ا"},
    -- al- + lunar consonant (i.e. what remains)
+   {a="([%s%-])(\"a)l%-", b="%1ٱ%2ل"},
    {a="^(a)l%-", b="ا%1ل"},
    {a="([%s%-])(a)l%-", b="%1ا%2ل"},
    -- diphthongs to be resolved before ʾalif conjunctionis