2 files changed, 43 insertions, 3 deletions

diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index cd7ed0f..e0ffbce 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -45,6 +45,8 @@ hamzafv = {
    {a="''([Uu])", b="ؤؤ%1"},
    {a="''([Aa])", b="أأ%1"},
    {a="''([Ii])", b="ئئ%1"},
+   -- inseparable adverbial particle 'a- + 'a
+   {a="\'(a)%-\'(a)", b="أ%1اأ%2"},
    -- initial long u and i (for a, see below)
    {a="%'%_U", b="أU"},
    {a="%'%_I", b="إI"},
@@ -141,6 +143,8 @@ hamzafveasy = { -- differences marked below with 'easy'
    {a="''([Uu])", b="ؤؤ%1"},
    {a="''([Aa])", b="أأ%1"},
    {a="''([Ii])", b="ئئ%1"},
+   -- inseparable adverbial particle 'a- + 'a
+   {a="\'(a)%-\'(a)", b="أ%1اأ%2"},
    -- initial long u and i (for a, see below)
    {a="%'%_U", b="أU"},
    {a="%'%_I", b="إI"},
diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index 1a64109..b295254 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -72,12 +72,44 @@ raw = {
 }
 
 buckwalter = {
---   {a="\'", b="|\"\'"},
+   -- trigraphs
+   {a="^Aal", b="al-"},
+   {a="(%W)Aal", b="%1al-"},
+   {a="([%-%s])Al", b="%1\'l-"},
+--   {a="([uai])Al", b="%1-\'l-"},
+   {a="(al%-[%a])(%~)", b="%1"},
+   {a="(\'l%-[%a])(%~)", b="%1"},
+   -- šadda
+   {a="([%a])(%~)", b="%1%1"},
+   -- digraphs begin
+   {a="aA", b="A"},
+   {a="uw", b="U"},
+   {a="iy", b="I"},
+   -- digraphs end
+   -- hamza begin
    {a="%>", b="a\"\'"},
    {a="%&", b="w\"\'"},
    {a="%<", b="i\"\'"},
-   {a="%}", b="y\"\'"},
-   {a="p", b="T"}
+   {a="%]", b="y\"\'"},
+   -- hamza end
+   {a="v", b="_t"},
+   {a="H", b=".h"},
+   {a="%*", b="_d"},
+   {a="%$", b="^s"},
+   {a="S", b=".s"},
+   {a="D", b=".d"},
+   {a="T", b=".t"},
+   {a="Z", b=".z"},
+   {a="E", b="`"},
+   {a="g", b=".g"},
+   {a="p", b="T"},
+   {a="N", b="uN"},
+   {a="F", b="aN"},
+   {a="K", b="iN"},
+   {a="o", b="\""},
+   -- hard-coded connective alif
+   {a="%[", b="ٱ"},
+--   {a="%_", b="--"},
 }
 
 hamza = {
@@ -94,6 +126,8 @@ hamza = {
    {a="''([Uu])", b="ؤؤ%1"},
    {a="''([Aa])", b="أأ%1"},
    {a="''([Ii])", b="ئئ%1"},
+   -- inseparable adverbial particle 'a- + 'a
+   {a="\'(a)%-\'(a)", b="أ%1اأ%2"},
    -- initial long u and i (for a, see below)
    {a="%'%_U", b="أU"},
    {a="%'%_I", b="إI"},
@@ -181,6 +215,8 @@ hamzaeasy = { -- differences marked below with 'easy'
    {a="''([Uu])", b="ؤؤ%1"},
    {a="''([Aa])", b="أأ%1"},
    {a="''([Ii])", b="ئئ%1"},
+   -- inseparable adverbial particle 'a- + 'a
+   {a="\'(a)%-\'(a)", b="أ%1اأ%2"},
    -- initial long u and i (for a, see below)
    {a="%'%_U", b="أU"},
    {a="%'%_I", b="إI"},