put '.A[uai]?l-' into the lunar/solar mechanism

3 files changed, 31 insertions, 7 deletions

diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index e1252e5..f687c5f 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -25,7 +25,11 @@ along with this program.  If not, see
 hamzafv = {
    -- next line for ʾiʿrāb hyphen
    {a="(')(%-)([uaiUAI])", b="%1%3"},
-   -- next line for ʾalif alone
+   -- next lines for ʾalif alone
+   {a="(%.A)([uai]?)l%-(%^n)", b="ا%2ل%3"}, --additional (^n is lunar)
+   {a="([%(%[%|%<%s%-o])(%.A)([uai]?)l%-(%^n)", b="%1ا%3%4"}, --additional (^n is lunar) --p
+   {a="(%.A)([uai]?)l%-([%_%^%.]?[tdrzsnc])", b="ا%2ل%3%3"},
+   {a="([%(%[%|%<%s%-o])(%.A)([uai]?)l%-([%_%^%.]?[tdrzsnc])", b="%1ا%3ل%4%4"}, --p
    {a="%.A", b="ا"},
    -- hard coded hamza
    {a="|\"'", b="ء"},
@@ -140,7 +144,11 @@ hamzafv = {
 hamzafveasy = { -- differences marked below with 'easy'
    -- next line for ʾiʿrāb hyphen
    {a="(')(%-)([uaiUAI])", b="%1%3"},
-   -- next line for ʾalif alone
+   -- next lines for ʾalif alone
+   {a="(%.A)([uai]?)l%-(%^n)", b="ا%2ل%3"}, --additional (^n is lunar)
+   {a="([%(%[%|%<%s%-o])(%.A)([uai]?)l%-(%^n)", b="%1ا%3%4"}, --additional (^n is lunar) --p
+   {a="(%.A)([uai]?)l%-([%_%^%.]?[tdrzsnc])", b="ا%2ل%3%3"},
+   {a="([%(%[%|%<%s%-o])(%.A)([uai]?)l%-([%_%^%.]?[tdrzsnc])", b="%1ا%3ل%4%4"}, --p
    {a="%.A", b="ا"},
    -- hard coded hamza
    {a="|\"'", b="ء"},
diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua
index 1043f37..defb3b4 100644
--- a/arabluatex_trans.lua
+++ b/arabluatex_trans.lua
@@ -71,7 +71,15 @@ captr = {
 -- dmg
 
 hamzatrdmg = {
-   -- next line for ʾalif alone
+   -- next lines for ʾalif alone
+   {a="(%.A)l%-(%^n)", b=".|l-%2"}, --additional (^n is lunar)
+   {a="([%(%[%|%<%s%-o])(%.A)l%-(%^n)", b="%1.|l-%3"}, --additional (^n is lunar) --p
+   {a="(%.A)l%-([%_%^%.]?[tdrzsnc])", b=".|%2-%2"},
+   {a="([%(%[%|%<%s%-o])(%.A)l%-([%_%^%.]?[tdrzsnc])", b="%1.|%3-%3"}, --p
+   {a="(%.A)([uai])l%-(%^n)", b="||%2l-%3"}, --additional (^n is lunar)
+   {a="([%(%[%|%<%s%-o])(%.A)([uai])l%-(%^n)", b="%1||%3l-%4"}, --additional (^n is lunar) --p
+   {a="(%.A)([uai])l%-([%_%^%.]?[tdrzsnc])", b="||%2%3-%3"},
+   {a="([%(%[%|%<%s%-o])(%.A)([uai])l%-([%_%^%.]?[tdrzsnc])", b="%1||%3%4-%4"}, --p
    {a="(%.A)([^uai])", b=".|%2"},
    {a="(%.A)([uai])", b="||%2"},
    -- hard coded hamza
@@ -440,7 +448,7 @@ shortvtrdmg = {
 -- loc
 
 hamzatrloc = {
-   -- next line for ʾalif alone
+   -- next lines for ʾalif alone
    {a="(%.A)([^uai])", b=".|%2"},
    {a="(%.A)([uai])", b="||%2"},
    -- hard coded hamza
@@ -697,7 +705,7 @@ finaltrloc = {
 -- arabica
 
 hamzatrarabica = { -- ≠ from hamzatrloc: initial hamza has to be held
-   -- next line for ʾalif alone
+   -- next lines for ʾalif alone
    {a="(%.A)([^uai])", b=".|%2"},
    {a="(%.A)([uai])", b="||%2"},
    -- hard coded hamza
diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index d3e32c3..f3f093b 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -170,7 +170,11 @@ buckwalter = {
 hamza = {
    -- next line for ʾiʿrāb hyphen
    {a="(')(%-)([uaiUAI])", b="%1%3"},
-   -- next line for ʾalif alone
+   -- next lines for ʾalif alone
+   {a="(%.A)([uai]?)l%-(%^n)", b="ا%2ل%3"}, --additional (^n is lunar)
+   {a="([%(%[%|%<%s%-o])(%.A)([uai]?)l%-(%^n)", b="%1ا%3%4"}, --additional (^n is lunar) --p
+   {a="(%.A)([uai]?)l%-([%_%^%.]?[tdrzsnc])", b="ا%2ل%3%3"},
+   {a="([%(%[%|%<%s%-o])(%.A)([uai]?)l%-([%_%^%.]?[tdrzsnc])", b="%1ا%3ل%4%4"}, --p
    {a="%.A", b="ا"},
    -- hard coded hamza
    {a="|\"'", b="ء"},
@@ -276,7 +280,11 @@ hamza = {
 hamzaeasy = { -- differences marked below with 'easy'
    -- next line for ʾiʿrāb hyphen
    {a="(')(%-)([uaiUAI])", b="%1%3"},
-   -- next line for ʾalif alone
+   -- next lines for ʾalif alone (easy)
+   {a="(%.A)([uai]?)l%-(%^n)", b="ا%2ل%3"}, --additional (^n is lunar)
+   {a="([%(%[%|%<%s%-o])(%.A)([uai]?)l%-(%^n)", b="%1ا%3%4"}, --additional (^n is lunar) --p
+   {a="(%.A)([uai]?)l%-([%_%^%.]?[tdrzsnc])", b="ا%2ل%3"},
+   {a="([%(%[%|%<%s%-o])(%.A)([uai]?)l%-([%_%^%.]?[tdrzsnc])", b="%1ا%3ل%4"}, --p
    {a="%.A", b="ا"},
    -- hard coded hamza
    {a="|\"'", b="ء"},