1 files changed, 6 insertions, 9 deletions

diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua
index 0868262..b29ae37 100644
--- a/arabluatex_trans.lua
+++ b/arabluatex_trans.lua
@@ -140,6 +140,7 @@ hamzatrdmg = {
 tanwintrdmg = {
    {a="%-?([uai]NU)(o)([ui])([%S]-o)", b="\\arbup{un%3}"},
    {a="%-?([uai]NU)(%s)([ui])", b="\\arbup{un%3}%2'"},
+   {a="(o[%S]-)([uai]N[UI])(o)(\"?[ui])", b="'"},
    {a="%-?uNU", b="\\arbup{un}"},
    {a="%-?aNU", b="\\arbup{an}"},
    {a="%-?iNU", b="\\arbup{in}"},
@@ -209,30 +210,26 @@ trigraphstrdmg = { -- trigraphs or more
    {a="(%W)(law)(%s)([%(%[%|%<]?\"?[uai])", b="%1%2i%3%4"}, --p
    -- al- + lām
    {a="^(a)l%-(l)", b="%1l-%2"},
-   {a="([%(%[%|%<%s%-])(a)l%-(l)", b="%1%2l-%3"}, --p
+   {a="([%(%[%|%<%s%-o])(a)l%-(l)", b="%1%2l-%3"}, --p
    -- al- + solar consonant
    {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="%1%2-%2"},
-   {a="([%(%[%|%<%s%-])(a)l%-([%_%^%.]?[tdrzsn])", b="%1%2%3-%3"}, --p
+   {a="([%(%[%|%<%s%-o])(a)l%-([%_%^%.]?[tdrzsn])", b="%1%2%3-%3"}, --p
    -- assim. art. + solar consonant
    {a="^(a)([%_%^%.]?[tdrzsn])%-", b="%1%2-"},
-   {a="([%(%[%|%<%s%-])(a)([%_%^%.]?[tdrzsn])%-", b="%1%2%3-"}, --p
+   {a="([%(%[%|%<%s%-o])(a)([%_%^%.]?[tdrzsn])%-", b="%1%2%3-"}, --p
    -- al- + initial unstable hamza
    {a="^(a)l%-(\"?[uai])", b="%1l-%2"},
-   {a="([%(%[%|%<%s%-])(a)l%-(\"?[uai])", b="%1%2l-%3"}, --p
+   {a="([%(%[%|%<%s%-o])(a)l%-(\"?[uai])", b="%1%2l-%3"}, --p
    -- li-/la- + art. + initial unstable hamza is a special orthography
    {a="l([ai])%-l%-([uai])", b="l%1-l-%2"},
    -- al- + lunar consonant (i.e. what remains)
    {a="^(a)l%-", b="%1l-"},
-   {a="([%(%[%|%<%s%-])(a)l%-", b="%1%2l-"}, --p
+   {a="([%(%[%|%<%s%-o])(a)l%-", b="%1%2l-"}, --p
    -- diphthongs to be resolved before ʾalif conjunctionis
    {a="(aw)(o)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-o)", b="%1u"},
    {a="(ay)(o)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-o)", b="%1i"},
-   {a="(aw)(o)(\"?[uai])([%S]-o)", b="%1u"},
-   {a="(ay)(o)(\"?[uai])([%S]-o)", b="%1i"},
    {a="(aw)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1u%2%3"},
    {a="(ay)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1i%2%3"},
-   {a="(aw)(%s)([%(%[%|%<]?\"?[uai])", b="%1u%2%3"}, --p
-   {a="(ay)(%s)([%(%[%|%<]?\"?[uai])", b="%1i%2%3"}, --p
    -- art. with waṣla + lām
    {a="'l%-(l)", b="'l-%1"},
    -- art. with waṣla + solar consonant