1 files changed, 29 insertions, 14 deletions

diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua
index 4b0fca0..a178cf2 100644
--- a/arabluatex_trans.lua
+++ b/arabluatex_trans.lua
@@ -32,16 +32,21 @@ nulltr = {
 
 hamzatrdmg = {
    -- hard coded hamza
-   {a="|\"'", b="'"},
-   {a="A\"'", b="'"},
-   {a="[au]\"'", b="'"},
-   {a="w\"'", b="'"},
-   {a="i\"'", b="'"},
-   {a="y\"'", b="'"},
+   {a="|\"'", b="ʾ"},
+   {a="A\"'", b="ʾ"},
+   {a="[au]\"'", b="ʾ"},
+   {a="w\"'", b="ʾ"},
+   {a="i\"'", b="ʾ"},
+   {a="y\"'", b="ʾ"},
+   -- hamza takes tašdīd too
+   {a="''([Uu])", b="ʾʾ%1"},
+   {a="''([Aa])", b="ʾʾ%1"},
+   {a="''([Ii])", b="ʾʾ%1"},
    -- initial long u
    {a="%'%_U", b="ʾU"},
    -- madda (historic writing below)
-   {a="'A", b="ʾA"},
+   {a="'a'([^uaiUAI])", b="ʾA%1"},
+   {a="'a?A", b="ʾA"},
    {a="(A)(')(i)$", b="%1ʾ%3"},
    {a="(A)(')(i)(%W)", b="%1ʾ%3%4"},
    {a="(A)(')(i)", b="%1ʾ%3"}, -- historic madda
@@ -192,18 +197,28 @@ shortvtrdmg = {
 
 hamzatrloc = {
    -- hard coded hamza
-   {a="|\"'", b="'"},
-   {a="A\"'", b="'"},
-   {a="[au]\"'", b="'"},
-   {a="w\"'", b="'"},
-   {a="i\"'", b="'"},
-   {a="y\"'", b="'"},
+   {a="|\"'", b="ʾ"},
+   {a="A\"'", b="ʾ"},
+   {a="[au]\"'", b="ʾ"},
+   {a="w\"'", b="ʾ"},
+   {a="i\"'", b="ʾ"},
+   {a="y\"'", b="ʾ"},
+   -- hamza takes tašdīd too
+   {a="''([Uu])", b="ʾʾ%1"},
+   {a="''([Aa])", b="ʾʾ%1"},
+   {a="''([Ii])", b="ʾʾ%1"},
    -- initial long u
    {a="%'%_U", b="U"},
    -- madda (historic writing below)
    {a="^(')(A)", b="%2"},
    {a="(%W)(')(A)", b="%1%3"},
-   {a="'A", b="ʾA"},
+   
+   {a="^'a'([^uaiUAI])", b="A%1"},
+   {a="(%W)'a'([^uaiUAI])", b="%1A%2"},   
+   {a="'a'([^uaiUAI])", b="A%1"},
+   {a="^'a?A", b="A"},
+   {a="(%W)'a?A", b="%1A"},
+   {a="'a?A", b="ʾA"},
    {a="(A)(')(i)$", b="%1ʾ%3"},
    {a="(A)(')(i)(%W)", b="%1ʾ%3%4"},
    {a="(A)(')(i)", b="%1ʾ%3"}, -- historic madda