1 files changed, 20 insertions, 18 deletions

diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua
index f6c90f7..bd2d27a 100644
--- a/arabluatex_trans.lua
+++ b/arabluatex_trans.lua
@@ -328,8 +328,12 @@ digraphstrdmg = {
    {a="([%_]?[Uu])(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])", b="u%2%3"},
    {a="([%_]?[Ii])(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])", b="i%2%3"},
    {a="%-%-", b=""},
+   {a="iyyaT$", b="īyaT"},
+   {a="iyyaT(%W)", b="īyaT%1"},
+   {a="iyy$", b="ī"},
+   {a="iyy(%W)", b="ī%1"},
 --   {a="T([^uai])", b="%1"},
-   {a="([a%'][%_%^%.]?[tdrzsln]%-)(.-)T([%(%[%|%<%s])(a[%_%^%.]?[tdrzsln]%-)", b="%1%2h%3%4"}, --p
+   {a="([a%'][%_%^%.]?[tdrzsln]%-)(%S-)T([%(%[%|%<%s])(a[%_%^%.]?[tdrzsln]%-)", b="%1%2h%3%4"}, --p
    {a="T([%(%[%|%<%s])(a[%_%^%.]?[tdrzsln]%-)", b="t%1%2"}, --p
    {a="T(%p?%s)", b="h%1"},
    {a="T(%p?)$", b="h%1"},
@@ -552,7 +556,7 @@ digraphstrloc = {
    {a="iyy", b="īy"},
    {a="([tkdsg])(h)", b="%1'%2"},
    --   {a="T([^uai])", b="h%1"},
-   {a="([a%']l%-)(.-)T([%(%[%|%<%s])(al%-)", b="%1%2h%3%4"}, --p
+   {a="([a%']l%-)(%S-)T([%(%[%|%<%s])(al%-)", b="%1%2h%3%4"}, --p
    {a="T([%(%[%|%<%s])(al%-)", b="t%1%2"}, --p
    {a="T$", b="h"},
    {a="T(%W)", b="h%1"},
@@ -755,6 +759,7 @@ trigraphstrarabica = { -- trigraphs or more
    {a="(_a)I", b="A"}
 }
 
+--new
 digraphstrarabica = {
    -- discard the ʾiʿrāb hyphen (begin)
    {a="(%-)(\"?[UI]na)(%p?%s)", b="%2%3"},
@@ -772,31 +777,28 @@ digraphstrarabica = {
    {a="^(\"?[uai])", b="%1"},      -- initial alif without hamza
    {a="(%s)([uai])", b="%1%2"}, -- initial alif without hamza
    {a="%-%-", b=""},
-   {a="uww", b="ūw"},
    {a="iyy$", b="ī"},
    {a="iyy(%W)", b="ī%1"},
-   {a="iyy", b="īy"},
-   {a="([tkdsg])(h)", b="%1'%2"},
    --   {a="T([^uai])", b="h%1"},
-   {a="([a%']l%-)(.-)T([%(%[%|%<%s])(al%-)", b="%1%2h%3%4"}, --p
-   {a="T([%(%[%|%<%s])(al%-)", b="t%1%2"}, --p
-   {a="T$", b="h"},
-   {a="T(%W)", b="h%1"},
-   {a="_t", b="th"},
-   {a="%^g", b="j"},
+   {a="([a%']l%-)(%S-)aT([%(%[%|%<%s])(al%-)", b="%1%2a%3%4"}, --p
+   {a="aT([%(%[%|%<%s])(al%-)", b="at%1%2"}, --p
+   {a="aT$", b="a"},
+   {a="aT(%W)", b="a%1"},
+   {a="_t", b="ṯ"},
+   {a="%^g", b="ğ"},
    {a="%.h", b="ḥ"},
-   {a="_h", b="kh"},
-   {a="_d", b="dh"},
-   {a="%^s", b="sh"},
+   {a="_h", b="ḫ"},
+   {a="_d", b="ḏ"},
+   {a="%^s", b="š"},
    {a="%.s", b="ṣ"},
    {a="%.d", b="ḍ"},
    {a="%.t", b="ṭ"},
    {a="%.z", b="ẓ"},
-   {a="%.g", b="gh"},
+   {a="%.g", b="ġ"},
    {a="(U)(A)", b="ū"},
    {a="WA", b="w"},
    {a="(a)W", b="%1w"},
-   {a="_A", b="á"},
+   {a="_A", b="ā"},
    {a="_u", b="ū"},
    {a="_a", b="ā"},
    {a="_i", b="ī"},
@@ -812,8 +814,8 @@ digraphstrarabica = {
 singletrarabica = {
    {a="b", b="b"},
    {a="t", b="t"},
-   {a="j", b="j"},
-   {a="x", b="kh"},
+   {a="j", b="ğ"},
+   {a="x", b="ḫ"},
    {a="d", b="d"},
    {a="r", b="r"},
    {a="z", b="z"},