bugfix: -ī/-īyah were not parsed correctly in 'dmg' mode. 'loc' and 'arabica' rules needed to be more robust as well

1 files changed, 13 insertions, 12 deletions

diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua
index bd59332..e12eaa0 100644
--- a/arabluatex_trans.lua
+++ b/arabluatex_trans.lua
@@ -328,14 +328,15 @@ 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="iyyaT(%p?)$", b="īyaT%1"},
+   {a="iyyaT(%p?%s)", b="īyaT%1"},
+   {a="iyy(%p?)$", b="ī%1"},
+   {a="iyy(%p?%s)", b="ī%1"},
    --   {a="T([^uai])", b="%1"},
    {a="T(\\arbup)", b="t%1"},
    {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([%|\"])", b="t%1"},
    {a="T(%p?%s)", b="h%1"},
    {a="T(%p?)$", b="h%1"},
    {a="T(%p?)(%W)", b="h%1%2"},
@@ -552,15 +553,15 @@ digraphstrloc = {
    {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(%p?)$", b="ī%1"},
+   {a="iyy(%p?%s)", b="ī%1"},
    {a="iyy", b="īy"},
    {a="([tkdsg])(h)", b="%1'%2"},
    --   {a="T([^uai])", b="h%1"},
    {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"},
+   {a="T(%p?)$", b="h%1"},
+   {a="T(%p?%s)", b="h%1"},
    {a="_t", b="th"},
    {a="%^g", b="j"},
    {a="%.h", b="ḥ"},
@@ -697,13 +698,13 @@ digraphstrarabica = {
    {a="^(\"?[uai])", b="%1"},      -- initial alif without hamza
    {a="(%s)([uai])", b="%1%2"}, -- initial alif without hamza
    {a="%-%-", b=""},
-   {a="iyy$", b="ī"},
-   {a="iyy(%W)", b="ī%1"},
+   {a="iyy(%p?)$", b="ī%1"},
+   {a="iyy(%p?%s)", b="ī%1"},
    --   {a="T([^uai])", b="h%1"},
    {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="aT(%p?)$", b="a%1"},
+   {a="aT(%p?%s)", b="a%1"},
    {a="_t", b="ṯ"},
    {a="%^g", b="ğ"},
    {a="%.h", b="ḥ"},