3 files changed, 5 insertions, 9 deletions

diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index e4a9495..ea7df9f 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -458,7 +458,7 @@ digraphsfv = {
    {a="ww", b="وّ"},
    {a="yy", b="يّ"},
    -- sukūn begin
-   --tmp: next line is added
+   -- first, take out hyphen if any:
    {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])%-([uaiUAI])", b="%1%2"},
    {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])$", b="%1ْ"},
    {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])([%s])", b="%1ْ%2"},
@@ -560,7 +560,7 @@ digraphsfveasy = { -- see the diffenrences under 'easy' marker below
    -- first take out every previously generated sukūn by hamza rules,
    -- so there be no need to edit them:
    {a="ْ", b=""}, 
-   --tmp: next line is added
+   -- first, take out hyphen if any:
 --   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])%-([uaiUAI])", b="%1%2"},
 --   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])$", b="%1ْ"},
 --   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])([%s])", b="%1ْ%2"},
diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua
index 76e297e..b98647d 100644
--- a/arabluatex_trans.lua
+++ b/arabluatex_trans.lua
@@ -138,7 +138,7 @@ tanwintrdmg = {
    {a="(T)%-?(aN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="t\\arbup{ani}%3%4"},
    {a="([^TA])%-?(aN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1\\arbup{ani}%3%4"},
    {a="%-?(iN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="\\arbup{ini}%2%3"},
--- tmp (+ ibn)
+-- tanwīn + alif without hamza and kasra (ibn)
    {a="%-?(uN)(%s)(i)", b="\\arbup{uni}%2'"},
    {a="%-?(aN)(_A)(%s)(i)", b="ạ\\arbup{ni}%3%'"},
    {a="%-?(aN)(Y)(%s)(i)", b="ạ\\arbup{ni}%3%'"},
@@ -146,7 +146,7 @@ tanwintrdmg = {
    {a="([^TA])%-?(aN)(%s)(i)", b="%1\\arbup{ani}%3%'"},
    {a="%-?(iN)(%s)(i)", b="\\arbup{ini}%2%'"},
    --
---   {a="uN", b="\\arbup{un}"}, (now included in the last line of this table)
+-- {a="uN", b="\\arbup{un}"}, (now included in the last line of this table)
    {a="%-?(aN)(_A)", b="ạ\\arbup{n}"},
    {a="%-?(aN)(Y)", b="ạ\\arbup{n}"},
    {a="(T)%-?(\"?aN)", b="t\\arbup{an}"},
@@ -271,8 +271,6 @@ digraphstrdmg = {
 -- {a="([%_]?[uaiUAIY])(%s)([uai])", b="%1%2'"}, -- initial alif without hamza
    {a="(aW)(%s)(\"?[uai])", b="awu%2%3"},
    {a="([^%_][uai])(%s)(\"?[uai])", b="%1%2'"},
---tmp (more complex, see next 4 l.)
--- {a="([%_]?[AYa])(%s)(\"?[uai])", b="a%2'"},
    {a="(%_A)(%s)(\"?[uai])", b="ạ%2'"},
    {a="(Y)(%s)(\"?[uai])", b="ạ%2'"},
    {a="(%_a)(%s)(\"?[uai])", b="a%2'"},
@@ -294,7 +292,6 @@ digraphstrdmg = {
    -- shorten long vowels preceding ʾalif conjunctionis
    {a="(U)(A)", b="U"},
    {a="(aW)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="awu%2%3"},
---tmp {a="([%_]?[AYa])(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="a%2%3"},
    {a="(%_a)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="a%2%3"},
    {a="(%_A)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ%2%3"},
    {a="(A)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="a%2%3"},
diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index 0331794..0e5cfc6 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -450,8 +450,7 @@ digraphs = {
    {a="^\"[uai]", b="ٱ"},
    {a="([%s%-])\"[uai]", b="%1ٱ"},
    {a="(aW)(%s)([uai])", b="awuا%2%3"},
---tmp-out   {a="(%-)([uai])", b="%1ا%2"}, -- hyphen + initial alif without hamza
-   --tmp-added hyphen + initial alif without hamza:
+   -- hyphen + initial alif without hamza:
    {a="(%-)([uai])([%^%_%.%`]?)(%a)", b="%1ا%3%4"},
    {a="^([uai])", b="ا%1"},      -- initial alif without hamza
    {a="(%s)([uai])", b="%1ا"}, -- initial alif without hamza