1 files changed, 146 insertions, 57 deletions

diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua
index 63a1956..c3c21e1 100644
--- a/arabluatex_trans.lua
+++ b/arabluatex_trans.lua
@@ -2,24 +2,23 @@
 This file is part of the `arabluatex' package
 
 ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright (C) 2016--2019  Robert Alessi
+Copyright (C) 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023
+Robert Alessi <alessi@robertalessi.net>
 
-Please send error reports and suggestions for improvements to Robert
-Alessi <alessi@robertalessi.net>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
 
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see
-<http://www.gnu.org/licenses/>.
+Please send error reports and suggestions for improvements to Robert
+Alessi <alessi@robertalessi.net>
 --]]
 
 -- common
@@ -202,6 +201,91 @@ hamzatrdmg = {
    {a="(i)(')([^uaiUAI])", b="%1ʾ%3"}
 }
 
+hamzatrnoinitialdmg = {
+   -- 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
+   {a="|\"'", b="ʾ"},
+   {a="A\"'", b="ʾA"},
+   {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 and i (for a, see below)
+   {a="%'%_U", b="||U"},
+   {a="%'%_I", b="||I"},
+   -- taḫfīfu 'l-hamza
+   {a="'u'([^uaiUAI])", b="|U%1"},
+   {a="'i'([^uaiUAI])", b="|I%1"},
+   {a="^u'([^uaiUAI])", b="U%1"},
+   {a="([^uaiUAIYN][%s%(%[%<])u'([^uaiUAI])", b="%1U%2"},
+   {a="^i'([^uaiUAI])", b="I%1"},
+   {a="([^uaiUAIYN][%s%(%[%<])i'([^uaiUAI])", b="%1I%2"},
+   -- madda (historic writing below)
+   {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
+   {a="(A)(')", b="%1ʾ"}, -- historic madda
+   -- initial (needs both ^ and %W patterns)
+   -- 'aw: the diphthong is to be resolved into 'awi' (next 8 lines)
+   {a="^('aw)(O)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-O)", b="%1i"},
+   {a="(%W)('aw)(O)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-O)", b="%1%2i"},
+   {a="^('aw)(O)(\"?[uai])([%S]-O)", b="%1i"},
+   {a="(%W)('aw)(O)(\"?[uai])([%S]-O)", b="%1%2i"},
+   {a="^('aw)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1i%2%3"},
+   {a="(%W)('aw)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1%2i%3%4"},
+   {a="^('aw)(%s)([%(%[%|%<]?\"?[uai])", b="%1i%2%3"}, --p
+   {a="(%W)('aw)(%s)([%(%[%|%<]?\"?[uai])", b="%1%2i%3%4"}, --p
+   -- then the 'initial' rules for the remaining cases
+   {a="^(')([ua])", b="||%2"},
+   {a="^(')(i)", b="||%2"},
+   -- consider replacing initial %W with [%s%(%[%<%-]:
+   --   {a="(%W)(')([ua])", b="%1||%3"},
+   --   {a="(%W)(')(i)", b="%1||%3"},
+   {a="([%s%(%[%<%-])(')([ua])", b="%1||%3"},
+   {a="([%s%(%[%<%-])(')(i)", b="%1||%3"},
+   -- final
+   {a="([Iy])(')(aN)$", b="%1ʾ%3"},
+   {a="([Iy])(')(aN)(%W)", b="%1ʾ%3%4"},
+   {a="([^uai])(')([uai]N?)$", b="%1ʾ%3"},
+   {a="([^uai])(')([uai]N?)(%W)", b="%1ʾ%3%4"},
+   {a="([UI])(')([uai])$", b="%1ʾ%3"},
+   {a="([UI])(')([uai])(%W)", b="%1ʾ%3%4"},
+   -- middle
+   {a="(U)(')", b="%1ʾ"},
+   {a="([Iy])(')", b="%1ʾ"},
+   {a="([^uai])(')([uU])", b="%1ʾ%3"},
+   {a="([^uai])(')(%_?[aAY])", b="%1ʾ%3"},
+   {a="([^uai])(')([iI])", b="%1ʾ%3"},
+   {a="(u)(')([uU])", b="%1ʾ%3"},
+   {a="(u)(')(%_?[aAY])", b="%1ʾ%3"},
+   {a="(u)(')([iI])", b="%1ʾ%3"},
+   {a="(a)(')(%_?[aAY])", b="%1ʾ%3"},
+   {a="(a)(')([uU])", b="%1ʾ%3"},
+   {a="(a)(')([iI])", b="%1ʾ%3"},
+   {a="(i)(')(%_?[aAY])", b="%1ʾ%3"},
+   {a="(i)(')([uU])", b="%1ʾ%3"},
+   {a="(i)(')([iI])", b="%1ʾ%3"},
+   {a="(a)(')([^uaiUAI])", b="%1ʾ%3"},
+   {a="(u)(')([^uaiUAI])", b="%1ʾ%3"},
+   {a="(i)(')([^uaiUAI])", b="%1ʾ%3"}
+}
+
 tanwintrdmg = {
    {a="%-?([uai]NU)(O)([ui])([%S]-O)", b="\\arbup{un%3}"},
    {a="%-?([uai]NU)(%s)([ui])", b="\\arbup{un%3}%2'"},
@@ -216,41 +300,41 @@ tanwintrdmg = {
    {a="%-?(uN)(O)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-O)", b="\\arbup{uni}"},
    {a="%-?(aN)(_A)(O)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-O)", b="ạ\\arbup{ni}"},
    {a="%-?(aN)(Y)(O)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-O)", b="ạ\\arbup{ni}"},
-   {a="(T)%-?(aN)(O)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-O)", b="t\\arbup{ani}"},
-   {a="([^TA])%-?(aN)(O)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-O)", b="%1\\arbup{ani}"},
+   {a="([TH])%-?(aN)(O)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-O)", b="t\\arbup{ani}"},
+   {a="([^TAH])%-?(aN)(O)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-O)", b="%1\\arbup{ani}"},
    {a="%-?(iN)(O)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-O)", b="\\arbup{ini}"},
    {a="%-?(uN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="\\arbup{uni}%2%3"},
    {a="%-?(aN)(_A)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ\\arbup{ni}%3%4"},
    {a="%-?(aN)(Y)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ\\arbup{ni}%3%4"},
-   {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="([TH])%-?(aN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="t\\arbup{ani}%3%4"},
+   {a="([^TAH])%-?(aN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1\\arbup{ani}%3%4"},
    {a="%-?(iN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="\\arbup{ini}%2%3"},
    -- tanwīn preceding 'lla_dI/'llatI
    {a="%-?(uN)(O)('lla[%_]?[dt])([%S]-O)", b="\\arbup{uni}"},
    {a="%-?(aN)(_A)(O)('lla[%_]?[dt])([%S]-O)", b="ạ\\arbup{ni}"},
    {a="%-?(aN)(Y)(O)('lla[%_]?[dt])([%S]-O)", b="ạ\\arbup{ni}"},
-   {a="(T)%-?(aN)(O)('lla[%_]?[dt])([%S]-O)", b="t\\arbup{ani}"},
-   {a="([^TA])%-?(aN)(O)('lla[%_]?[dt])([%S]-O)", b="%1\\arbup{ani}"},
+   {a="([TH])%-?(aN)(O)('lla[%_]?[dt])([%S]-O)", b="t\\arbup{ani}"},
+   {a="([^TAH])%-?(aN)(O)('lla[%_]?[dt])([%S]-O)", b="%1\\arbup{ani}"},
    {a="%-?(iN)(O)('lla[%_]?[dt])([%S]-O)", b="\\arbup{ini}"},
    {a="%-?(uN)(%s)('lla[%_]?[dt])", b="\\arbup{uni}%2%3"},
    {a="%-?(aN)(_A)(%s)('lla[%_]?[dt])", b="ạ\\arbup{ni}%3%4"},
    {a="%-?(aN)(Y)(%s)('lla[%_]?[dt])", b="ạ\\arbup{ni}%3%4"},
-   {a="(T)%-?(aN)(%s)('lla[%_]?[dt])", b="t\\arbup{ani}%3%4"},
-   {a="([^TA])%-?(aN)(%s)('lla[%_]?[dt])", b="%1\\arbup{ani}%3%4"},
+   {a="([TH])%-?(aN)(%s)('lla[%_]?[dt])", b="t\\arbup{ani}%3%4"},
+   {a="([^TAH])%-?(aN)(%s)('lla[%_]?[dt])", b="%1\\arbup{ani}%3%4"},
    {a="%-?(iN)(%s)('lla[%_]?[dt])", b="\\arbup{ini}%2%3"},
    -- tanwīn + alif without hamza and kasra (ibn) or dhamma (uhrub)
    {a="%-?(uN)(O)([ui])([%S]-O)", b="\\arbup{un%3}"},
    {a="%-?(aN)(_A)(O)([ui])([%S]-O)", b="ạ\\arbup{n%4}"},
    {a="%-?(aN)(Y)(O)([ui])([%S]-O)", b="ạ\\arbup{n%4}"},
-   {a="(T)%-?(aN)(O)([ui])([%S]-O)", b="t\\arbup{an%4}"},
-   {a="([^TA])%-?(aN)(O)([ui])([%S]-O)", b="%1\\arbup{an%4}"},
+   {a="([TH])%-?(aN)(O)([ui])([%S]-O)", b="t\\arbup{an%4}"},
+   {a="([^TAH])%-?(aN)(O)([ui])([%S]-O)", b="%1\\arbup{an%4}"},
    {a="%-?(iN)(O)([ui])([%S]-O)", b="\\arbup{in%3}"},
    {a="(O[%S]-)([uai]N)(O)(\"?[ui])", b="'"},
    {a="%-?(uN)(%s)([ui])", b="\\arbup{un%3}%2'"},
    {a="%-?(aN)(_A)(%s)([ui])", b="ạ\\arbup{n%4}%3'"},
    {a="%-?(aN)(Y)(%s)([ui])", b="ạ\\arbup{n%4}%3'"},
-   {a="(T)%-?(aN)(%s)([ui])", b="t\\arbup{an%4}%3'"},
-   {a="([^TA])%-?(aN)(%s)([ui])", b="%1\\arbup{an%4}%3'"},
+   {a="([TH])%-?(aN)(%s)([ui])", b="t\\arbup{an%4}%3'"},
+   {a="([^TAH])%-?(aN)(%s)([ui])", b="%1\\arbup{an%4}%3'"},
    {a="%-?(iN)(%s)([ui])", b="\\arbup{in%3}%2'"},
    --
 -- {a="uN", b="\\arbup{un}"}, (now included in the last line of this table)
@@ -258,13 +342,13 @@ tanwintrdmg = {
    -- needed by \arbcolor:
    {a="%-?(aN)(O[%S]-%_AO)", b="ạ\\arbup{n}"},
    {a="%-?(aN)(O[%S]-YO)", b="ạ\\arbup{n}"},
-   {a="(O[%S]-TO)%-?(\"?aN)", b="\\arbup{an}"},
-   {a="(O[%S]-[^TA]O)%-?(\"?aN)", b="\\arbup{an}"},
+   {a="(O[%S]-[TH]O)%-?(\"?aN)", b="\\arbup{an}"},
+   {a="(O[%S]-[^TAH]O)%-?(\"?aN)", b="\\arbup{an}"},
    --
    {a="%-?(aN)(_A)", b="ạ\\arbup{n}"},
    {a="%-?(aN)(Y)", b="ạ\\arbup{n}"},
-   {a="(T)%-?(\"?aN)", b="t\\arbup{an}"},
-   {a="([^TA])%-?(\"?aN)", b="%1\\arbup{an}"},
+   {a="([TH])%-?(\"?aN)", b="t\\arbup{an}"},
+   {a="([^TAH])%-?(\"?aN)", b="%1\\arbup{an}"},
    {a="%-?([ui])N", b="\\arbup{%1n}"}
 }
 
@@ -414,18 +498,20 @@ 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(%p*)$", b="īyaT%1"},
-   {a="iyyaT(%p*%s)", b="īyaT%1"},
+--   {a="iyyaT(%p*)$", b="īyaT%1"}, -- previously. is now:
+   {a="iyya([TH])(%p*)$", b="īya%1%2"},
+--   {a="iyyaT(%p*%s)", b="īyaT%1"}, -- previously. is now:
+   {a="iyya([TH])(%p*%s)", b="īya%1%2"},
    {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"},
+   --   {a="[TH]([^uai])", b="%1"},
+   {a="[TH](\\arbup)", b="t%1"},
+   {a="([a%'][%_%^%.]?[tdrzsln]%-)(%S-)[TH]([%(%[%|%<%s])(a[%_%^%.]?[tdrzsln]%-)", b="%1%2h%3%4"}, --p
+   {a="[TH]([%(%[%|%<%s])(a[%_%^%.]?[tdrzsln]%-)", b="t%1%2"}, --p
+   {a="[TH]([%|\"])", b="t%1"},
+   {a="[TH](%p*%s)", b="h%1"},
+   {a="[TH](%p*)$", b="h%1"},
+   {a="[TH](%p*)(%W)", b="h%1%2"},
    {a="_t", b="ṯ"},
    {a="%^g", b="ǧ"},
    {a="%.h", b="ḥ"},
@@ -480,6 +566,7 @@ singletrdmg = {
    {a="y", b="y"},
    {a="T", b="t"},
    -- additional characters (begin)
+   {a="H", b="t"},
    {a="p", b="p"},
    {a="v", b="v"},
    {a="g", b="g"},
@@ -595,13 +682,13 @@ tanwintrloc = {
    -- needed by \arbcolor:
    {a="%-?(aN)(O[%S]-%_AO)", b="an"},
    {a="%-?(aN)(O[%S]-YO)", b="an"},
-   {a="(O[%S]-TO)%-?(\"?aN)", b="an"},
-   {a="(O[%S]-[^TA]O)%-?(\"?aN)", b="an"},
+   {a="(O[%S]-[TH]O)%-?(\"?aN)", b="an"},
+   {a="(O[%S]-[^TAH]O)%-?(\"?aN)", b="an"},
    --
    {a="%-?(aN)(_A)", b="an"},
    {a="%-?(aN)(Y)", b="an"},
-   {a="(T)%-?(\"?aN)", b="tan"},
-   {a="([^TA])%-?(\"?aN)", b="%1an"}
+   {a="([TH])%-?(\"?aN)", b="tan"},
+   {a="([^TAH])%-?(\"?aN)", b="%1an"}
 }
 
 trigraphstrloc = { -- trigraphs or more
@@ -688,12 +775,12 @@ digraphstrloc = {
    {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="t%1"},
-   {a="T(%p*)$", b="h%1"},
-   {a="T(%p*%s)", b="h%1"},
+   --   {a="[TH]([^uai])", b="h%1"},
+   {a="([a%']l%-)(%S-)[TH]([%(%[%|%<%s])(al%-)", b="%1%2h%3%4"}, --p
+   {a="[TH]([%(%[%|%<%s])(al%-)", b="t%1%2"}, --p
+   {a="[TH]([%|\"])", b="t%1"},
+   {a="[TH](%p*)$", b="h%1"},
+   {a="[TH](%p*%s)", b="h%1"},
    {a="_t", b="th"},
    {a="%^g", b="j"},
    {a="%.h", b="ḥ"},
@@ -747,6 +834,7 @@ singletrloc = {
    {a="y", b="y"},
    {a="T", b="t"},
    -- additional characters (begin)
+   {a="H", b="t"},
    {a="p", b="p"},
    {a="v", b="v"},
    {a="g", b="g"},
@@ -942,12 +1030,12 @@ digraphstrarabica = {
    {a="%-%-", b=""},
    {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="T([%|\"])", b="t%1"},
-   {a="aT(%p*)$", b="a%1"},
-   {a="aT(%p*%s)", b="a%1"},
+   --   {a="[TH]([^uai])", b="h%1"},
+   {a="([a%']l%-)(%S-)a[TH]([%(%[%|%<%s])(al%-)", b="%1%2a%3%4"}, --p
+   {a="a[TH]([%(%[%|%<%s])(al%-)", b="at%1%2"}, --p
+   {a="[TH]([%|\"])", b="t%1"},
+   {a="a[TH](%p*)$", b="a%1"},
+   {a="a[TH](%p*%s)", b="a%1"},
    {a="_t", b="ṯ"},
    {a="%^g", b="ǧ"},
    {a="%.h", b="ḥ"},
@@ -1001,6 +1089,7 @@ singletrarabica = {
    {a="y", b="y"},
    {a="T", b="t"},
    -- additional characters (begin)
+   {a="H", b="t"},
    {a="p", b="p"},
    {a="v", b="v"},
    {a="g", b="g"},