4 files changed, 48 insertions, 0 deletions

diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index d327479..6353f30 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -325,6 +325,13 @@ tanwinfv = { -- with assimilations (\SetArbDflt*)
    -- quoted tanwīn (end)
    {a="%-?(uN)", b="ٌ"},
    {a="(B)%-?(aN)", b="%1ً"},
+   -- ***
+   {a="%-?(aN)(O[%S]-%_AO)", b="ً"},
+   {a="%-?(aN)(O[%S]-YO)", b="ً"},
+   {a="(O[%S]-TO)%-?(aN)", b="ً"},
+   {a="(O[%S]-)([اآ])(ء)(O)%-?(aN)", b="ً"}, --new
+   {a="(O[%S]-[^TA]O)%-?(aN)", b="ًا"},
+   --
    {a="%-?(aN)(_A)", b="ًى"},
    {a="%-?(aN)(Y)", b="ًى"},
    {a="(T)%-?(aN)", b="%1ً"},
@@ -372,6 +379,13 @@ tanwinfveasy = { -- no assimilations (see below)
    -- quoted tanwīn (end)
    {a="%-?(uN)", b="ٌ"},
    {a="(B)%-?(aN)", b="%1ً"},
+   -- ***
+   {a="%-?(aN)(O[%S]-%_AO)", b="ً"},
+   {a="%-?(aN)(O[%S]-YO)", b="ً"},
+   {a="(O[%S]-TO)%-?(aN)", b="ً"},
+   {a="(O[%S]-)([اآ])(ء)(O)%-?(aN)", b="ً"}, --new
+   {a="(O[%S]-[^TA]O)%-?(aN)", b="ًا"},
+   --
    {a="%-?(aN)(_A)", b="ًى"},
    {a="%-?(aN)(Y)", b="ًى"},
    {a="(T)%-?(aN)", b="%1ً"},
diff --git a/arabluatex_novoc.lua b/arabluatex_novoc.lua
index c2ee6f6..cc29371 100644
--- a/arabluatex_novoc.lua
+++ b/arabluatex_novoc.lua
@@ -53,6 +53,13 @@ tanwinnv = {
    -- "quoted" tanwīn (end)
    {a="%-?(uN)", b=""},
    {a="(B)%-?(aN)", b="%1"},
+   -- ***
+   {a="%-?(aN)(O[%S]-%_AO)", b=""},
+   {a="%-?(aN)(O[%S]-YO)", b=""},
+   {a="(O[%S]-TO)%-?(aN)", b=""},
+   {a="(O[%S]-)([اآ])(ء)(O)%-?(aN)", b=""}, --new
+   {a="(O[%S]-[^TA]O)%-?(aN)", b=""},
+   --
    {a="%-?(aN)(_A)", b="ى"},
    {a="%-?(aN)(Y)", b="ى"},
    {a="(T)%-?(aN)", b="%1"},
diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua
index 0adb69e..87f0c47 100644
--- a/arabluatex_trans.lua
+++ b/arabluatex_trans.lua
@@ -31,6 +31,7 @@ punctuationtr = {
 
 nulltr = {
    {a="%|", b=""},
+   {a="o", b=""},
    {a="O[%S]-O", b=""},
    {a="[%^%_](.)", b="<??>%1"}
 }
@@ -254,6 +255,12 @@ tanwintrdmg = {
    --
 -- {a="uN", b="\\arbup{un}"}, (now included in the last line of this table)
    {a="%-?(\"?At)%-?([ui])N", b="\\arbup{%1%2n}"},
+   -- ***
+   {a="%-?(aN)(O[%S]-%_AO)", b="ạ\\arbup{n}"},
+   {a="%-?(aN)(O[%S]-YO)", b="ạ\\arbup{n}"},
+   {a="(O[%S]-TO)%-?(\"?aN)", b="\\arbup{an}"},
+   {a="(O[%S]-[^TA]O)%-?(\"?aN)", b="\\arbup{an}"},
+   --
    {a="%-?(aN)(_A)", b="ạ\\arbup{n}"},
    {a="%-?(aN)(Y)", b="ạ\\arbup{n}"},
    {a="(T)%-?(\"?aN)", b="t\\arbup{an}"},
@@ -584,6 +591,12 @@ tanwintrloc = {
    {a="%-?iNI", b="in"},
    {a="%-?(\"?At)%-?([ui])N", b="%1%2n"},
    {a="%-?([ui])N", b="%1n"},
+   -- ***
+   {a="%-?(aN)(O[%S]-%_AO)", b="an"},
+   {a="%-?(aN)(O[%S]-YO)", b="an"},
+   {a="(O[%S]-TO)%-?(\"?aN)", b="an"},
+   {a="(O[%S]-[^TA]O)%-?(\"?aN)", b="an"},
+   --
    {a="%-?(aN)(_A)", b="an"},
    {a="%-?(aN)(Y)", b="an"},
    {a="(T)%-?(\"?aN)", b="tan"},
diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index 3155f91..e547f6b 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -454,6 +454,13 @@ tanwin = {
    -- quoted tanwīn (end)
    {a="%-?(uN)", b="ٌ"},
    {a="(B)%-?(aN)", b="%1ً"},
+   -- ***
+   {a="%-?(aN)(O[%S]-%_AO)", b="ً"},
+   {a="%-?(aN)(O[%S]-YO)", b="ً"},
+   {a="(O[%S]-TO)%-?(aN)", b="ً"},
+   {a="(O[%S]-)([اآ])(ء)(O)%-?(aN)", b="ً"}, --new
+   {a="(O[%S]-[^TA]O)%-?(aN)", b="ًا"},
+   --
    {a="%-?(aN)(_A)", b="ًى"},
    {a="%-?(aN)(Y)", b="ًى"},
    {a="(T)%-?(aN)", b="%1ً"},
@@ -496,6 +503,13 @@ tanwineasy = { -- 'easy' requires some lines to be taken out:
    -- quoted tanwīn (end)
    {a="%-?(uN)", b="ٌ"},
    {a="(B)%-?(aN)", b="%1ً"},
+   -- ***
+   {a="%-?(aN)(O[%S]-%_AO)", b="ً"},
+   {a="%-?(aN)(O[%S]-YO)", b="ً"},
+   {a="(O[%S]-TO)%-?(aN)", b="ً"},
+   {a="(O[%S]-)([اآ])(ء)(O)%-?(aN)", b="ً"}, --new
+   {a="(O[%S]-[^TA]O)%-?(aN)", b="ًا"},
+   --
    {a="%-?(aN)(_A)", b="ًى"},
    {a="%-?(aN)(Y)", b="ًى"},
    {a="(T)%-?(aN)", b="%1ً"},