1 files changed, 4 insertions, 8 deletions

diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua
index 23ecf2c..21fbe96 100644
--- a/arabluatex_trans.lua
+++ b/arabluatex_trans.lua
@@ -468,11 +468,9 @@ hamzatrloc = {
    {a="%'%_I", b="I"},
    -- taḫfīfu 'l-hamza
    {a="^'u'([^uaiUAI])", b="U%1"},
-   {a="(%W)'u'([^uaiUAI])", b="%1U%2"},
-   {a="'u'([^uaiUAI])", b="ʾU"},
+   {a="([%s%(%[%<%-])'u'([^uaiUAI])", b="%1U%2"},
    {a="^'i'([^uaiUAI])", b="I%1"},
-   {a="(%W)'i'([^uaiUAI])", b="%1I%2"},
-   {a="'i'([^uaiUAI])", b="ʾI"},
+   {a="([%s%(%[%<%-])'i'([^uaiUAI])", b="%1I%2"},
    -- madda (historic writing below)
    {a="^(')(A)", b="%2"},
    {a="(%W)(')(A)", b="%1%3"},   
@@ -725,11 +723,9 @@ hamzatrarabica = { -- ≠ from hamzatrloc: initial hamza has to be held
    {a="%'%_I", b="I"},
    -- taḫfīfu 'l-hamza
    {a="^'u'([^uaiUAI])", b="U%1"},
-   {a="(%W)'u'([^uaiUAI])", b="%1U%2"},
-   {a="'u'([^uaiUAI])", b="ʾU"},
+   {a="([%s%(%[%<%-])'u'([^uaiUAI])", b="%1U%2"},
    {a="^'i'([^uaiUAI])", b="I%1"},
-   {a="(%W)'i'([^uaiUAI])", b="%1I%2"},
-   {a="'i'([^uaiUAI])", b="ʾI"},
+   {a="([%s%(%[%<%-])'i'([^uaiUAI])", b="%1I%2"},
    -- madda (historic writing below)
    {a="^(')(A)", b="%2"},
    {a="(%W)(')(A)", b="%1%3"},