1 files changed, 86 insertions, 81 deletions

diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index d5ca11a..7483734 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.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>
+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 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.
+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.
 
-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.
-
-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>
 --]]
 
 hamzafv = {
@@ -39,18 +38,18 @@ hamzafv = {
    {a="i\"'", b="إ"},
    {a="y\"'", b="ئ"},
    -- moved below (end of 'final' section)
-   -- {a="ؤ([^uaiUAI])", b="ؤْ%1"},
-   -- {a="ؤ(%p*)$", b="ؤْ%1"},
-   -- {a="ؤ(%p*%s)", b="ؤْ%1"},
-   -- {a="أ([^uaiUAI])", b="أْ%1"},
-   -- {a="أ(%p*)$", b="أْ%1"},
-   -- {a="أ(%p*%s)", b="أْ%1"},
-   -- {a="ئ([^uaiUAI])", b="ئْ%1"},
-   -- {a="ئ(%p*)$", b="ئْ%1"},
-   -- {a="ئ(%p*%s)", b="ئْ%1"},
-   -- {a="ء([^uaiUAI])", b="ءْ%1"},
-   -- {a="ء(%p*)$", b="ءْ%1"},
-   -- {a="ء(%p*%s)", b="ءْ%1"},
+   {a="ؤ([^uaiUAI])", b="ؤْ%1"},
+   {a="ؤ(%p*)$", b="ؤْ%1"},
+   {a="ؤ(%p*%s)", b="ؤْ%1"},
+   {a="أ([^uaiUAI])", b="أْ%1"},
+   {a="أ(%p*)$", b="أْ%1"},
+   {a="أ(%p*%s)", b="أْ%1"},
+   {a="ئ([^uaiUAI])", b="ئْ%1"},
+   {a="ئ(%p*)$", b="ئْ%1"},
+   {a="ئ(%p*%s)", b="ئْ%1"},
+   {a="ء([^uaiUAI])", b="ءْ%1"},
+   {a="ء(%p*)$", b="ءْ%1"},
+   {a="ء(%p*%s)", b="ءْ%1"},
    -- hamza takes tašdīd too
    {a="''([Uu])", b="ؤؤ%1"},
    {a="''([Aa])", b="أأ%1"},
@@ -104,7 +103,7 @@ hamzafv = {
    -- mi'aT is special orthography (unlike ^say'aN and .zim'aN):
    -- {a="(%^sa%.?[yY])(\"?%|?)(%')(aN)", b="%1%2ئ%4"}, --new
    -- {a="(.zi?m)(%')(aN)", b="%1ئ%3"}, --new
-   {a="(mi)(%')(a[Tt])", b="%1ائ%3"},
+   {a="(mi)(%')(a[TtH])", b="%1ائ%3"},
    {a="(mi)(%')(aN%_?[AY])", b="%1أ%3"},
    -- final hamzah is on the line after a letter of prolongation or a
    -- consonant with sukūn
@@ -133,19 +132,21 @@ hamzafv = {
    {a="(i)(')([uai]N?)(%p*%s)", b="%1ئ%3%4"},
    {a="(i)(')(%p*)$", b="%1ئْ%3"},
    {a="(i)(')(%p*%s)", b="%1ئْ%3"},
+-- the following was wrong for it broke the taḫfīfu 'l-hamzati
+-- (look into this later):
 -- moved here from above:
-   {a="ؤ([^uaiUAI])", b="ؤْ%1"},
-   {a="ؤ(%p*)$", b="ؤْ%1"},
-   {a="ؤ(%p*%s)", b="ؤْ%1"},
-   {a="أ([^uaiUAI])", b="أْ%1"},
-   {a="أ(%p*)$", b="أْ%1"},
-   {a="أ(%p*%s)", b="أْ%1"},
-   {a="ئ([^uaiUAI])", b="ئْ%1"},
-   {a="ئ(%p*)$", b="ئْ%1"},
-   {a="ئ(%p*%s)", b="ئْ%1"},
-   {a="ء([^uaiUAI])", b="ءْ%1"},
-   {a="ء(%p*)$", b="ءْ%1"},
-   {a="ء(%p*%s)", b="ءْ%1"},
+   -- {a="ؤ([^uaiUAI])", b="ؤْ%1"},
+   -- {a="ؤ(%p*)$", b="ؤْ%1"},
+   -- {a="ؤ(%p*%s)", b="ؤْ%1"},
+   -- {a="أ([^uaiUAI])", b="أْ%1"},
+   -- {a="أ(%p*)$", b="أْ%1"},
+   -- {a="أ(%p*%s)", b="أْ%1"},
+   -- {a="ئ([^uaiUAI])", b="ئْ%1"},
+   -- {a="ئ(%p*)$", b="ئْ%1"},
+   -- {a="ئ(%p*%s)", b="ئْ%1"},
+   -- {a="ء([^uaiUAI])", b="ءْ%1"},
+   -- {a="ء(%p*)$", b="ءْ%1"},
+   -- {a="ء(%p*%s)", b="ءْ%1"},
    -- middle
    {a="([UIwy])(')", b="%1ء"}, --new
    -- {a="([Iy])(')", b="%1ئ"}, --included in the above line
@@ -187,18 +188,18 @@ hamzafveasy = { -- differences marked below with 'easy'
    {a="i\"'", b="إ"},
    {a="y\"'", b="ئ"},
    -- moved below (end of 'final' section)
-   -- {a="ؤ([^uaiUAI])", b="ؤْ%1"},
-   -- {a="ؤ(%p*)$", b="ؤْ%1"},
-   -- {a="ؤ(%p*%s)", b="ؤْ%1"},
-   -- {a="أ([^uaiUAI])", b="أْ%1"},
-   -- {a="أ(%p*)$", b="أْ%1"},
-   -- {a="أ(%p*%s)", b="أْ%1"},
-   -- {a="ئ([^uaiUAI])", b="ئْ%1"},
-   -- {a="ئ(%p*)$", b="ئْ%1"},
-   -- {a="ئ(%p*%s)", b="ئْ%1"},
-   -- {a="ء([^uaiUAI])", b="ءْ%1"},
-   -- {a="ء(%p*)$", b="ءْ%1"},
-   -- {a="ء(%p*%s)", b="ءْ%1"},
+   {a="ؤ([^uaiUAI])", b="ؤْ%1"},
+   {a="ؤ(%p*)$", b="ؤْ%1"},
+   {a="ؤ(%p*%s)", b="ؤْ%1"},
+   {a="أ([^uaiUAI])", b="أْ%1"},
+   {a="أ(%p*)$", b="أْ%1"},
+   {a="أ(%p*%s)", b="أْ%1"},
+   {a="ئ([^uaiUAI])", b="ئْ%1"},
+   {a="ئ(%p*)$", b="ئْ%1"},
+   {a="ئ(%p*%s)", b="ئْ%1"},
+   {a="ء([^uaiUAI])", b="ءْ%1"},
+   {a="ء(%p*)$", b="ءْ%1"},
+   {a="ء(%p*%s)", b="ءْ%1"},
    -- hamza takes tašdīd too
    {a="''([Uu])", b="ؤؤ%1"},
    {a="''([Aa])", b="أأ%1"},
@@ -254,7 +255,7 @@ hamzafveasy = { -- differences marked below with 'easy'
    -- mi'aT is special orthography (unlike ^say'aN and .zim'aN)
    -- {a="(%^sa%.?[yY])(\"?%|?)(%')(aN)", b="%1%2ئ%4"}, --new
    -- {a="(.zi?m)(%')(aN)", b="%1ئ%3"}, --new
-   {a="(mi)(%')(a[Tt])", b="%1ائ%3"},
+   {a="(mi)(%')(a[TtH])", b="%1ائ%3"},
    {a="(mi)(%')(aN%_?[AY])", b="%1أ%3"},
    -- easy (begin)
    -- The Munjid says that such words as radI'aN do not have the
@@ -293,19 +294,21 @@ hamzafveasy = { -- differences marked below with 'easy'
    {a="(i)(')([uai]N?)(%p*%s)", b="%1ئ%3%4"},
    {a="(i)(')(%p*)$", b="%1ئْ%3"},
    {a="(i)(')(%p*%s)", b="%1ئْ%3"},
+-- the following was wrong for it broke the taḫfīfu 'l-hamzati
+-- (look into this later):
 -- moved here from above:
-   {a="ؤ([^uaiUAI])", b="ؤْ%1"},
-   {a="ؤ(%p*)$", b="ؤْ%1"},
-   {a="ؤ(%p*%s)", b="ؤْ%1"},
-   {a="أ([^uaiUAI])", b="أْ%1"},
-   {a="أ(%p*)$", b="أْ%1"},
-   {a="أ(%p*%s)", b="أْ%1"},
-   {a="ئ([^uaiUAI])", b="ئْ%1"},
-   {a="ئ(%p*)$", b="ئْ%1"},
-   {a="ئ(%p*%s)", b="ئْ%1"},
-   {a="ء([^uaiUAI])", b="ءْ%1"},
-   {a="ء(%p*)$", b="ءْ%1"},
-   {a="ء(%p*%s)", b="ءْ%1"},
+   -- {a="ؤ([^uaiUAI])", b="ؤْ%1"},
+   -- {a="ؤ(%p*)$", b="ؤْ%1"},
+   -- {a="ؤ(%p*%s)", b="ؤْ%1"},
+   -- {a="أ([^uaiUAI])", b="أْ%1"},
+   -- {a="أ(%p*)$", b="أْ%1"},
+   -- {a="أ(%p*%s)", b="أْ%1"},
+   -- {a="ئ([^uaiUAI])", b="ئْ%1"},
+   -- {a="ئ(%p*)$", b="ئْ%1"},
+   -- {a="ئ(%p*%s)", b="ئْ%1"},
+   -- {a="ء([^uaiUAI])", b="ءْ%1"},
+   -- {a="ء(%p*)$", b="ءْ%1"},
+   -- {a="ء(%p*%s)", b="ءْ%1"},
 --
    -- middle
    {a="([Uw])(')", b="%1ء"}, --new
@@ -347,9 +350,9 @@ tanwinfv = { -- with assimilations (\SetArbDflt*)
    {a="(O[%S]-)(%-?aN)(Y)(O)([rlmnwy])", b="%5%5"},
    {a="%-?(aN)(_A)(%s)([rlmnwy])", b="ًى%3%4%4"},
    {a="%-?(aN)(Y)(%s)([rlmnwy])", b="ًى%3%4%4"},
-   {a="(T)%-?(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"},
+   {a="([TH])%-?(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"},
 --   {a="(ء)%-?(aN)(%s)([rlmnwy])", b="%1%2%3%4%4"}, --new
-   {a="([^TA])%-?(aN)(%s)([rlmnwy])", b="%1ًا%3%4%4"},
+   {a="([^TAH])%-?(aN)(%s)([rlmnwy])", b="%1ًا%3%4%4"},
    {a="%-?(iNI?)(%s)([rlmnwy])", b="ٍ%2%3%3"},
    -- assimilations (end)
    {a="(O[%S]-)(%-?aN)(_A)(O)([uai])", b="ٱ"},
@@ -359,9 +362,9 @@ tanwinfv = { -- with assimilations (\SetArbDflt*)
    {a="(B)%-?(\"aN)", b="%1"},
    {a="%-?(\"aN)(_A)", b="ى"},
    {a="%-?(\"aN)(Y)", b="ى"},
-   {a="(T)%-?(\"aN)", b="%1"},
+   {a="([TH])%-?(\"aN)", b="%1"},
    {a="([اآ])(ء)%-?(\"aN)", b="%1%2"}, --new
-   {a="([^TA])%-?(\"aN)", b="%1ا"},
+   {a="([^TAH])%-?(\"aN)", b="%1ا"},
    {a="%-?(\"iNI?)", b=""},
    -- quoted tanwīn (end)
    {a="%-?(uN)", b="ٌ"},
@@ -369,15 +372,15 @@ tanwinfv = { -- with assimilations (\SetArbDflt*)
    -- needed by \arbcolor:
    {a="%-?(aN)(O[%S]-%_AO)", b="ً"},
    {a="%-?(aN)(O[%S]-YO)", b="ً"},
-   {a="(O[%S]-TO)%-?(aN)", b="ً"},
+   {a="(O[%S]-[TH]O)%-?(aN)", b="ً"},
    {a="(O[%S]-)([اآ])(ء)(O)%-?(aN)", b="ً"}, --new
-   {a="(O[%S]-[^TA]O)%-?(aN)", b="ًا"},
+   {a="(O[%S]-[^TAH]O)%-?(aN)", b="ًا"},
    --
    {a="%-?(aN)(_A)", b="ًى"},
    {a="%-?(aN)(Y)", b="ًى"},
-   {a="(T)%-?(aN)", b="%1ً"},
+   {a="([TH])%-?(aN)", b="%1ً"},
    {a="([اآ])(ء)%-?(aN)", b="%1%2ً"}, --new
-   {a="([^TA])%-?(aN)", b="%1ًا"},
+   {a="([^TAH])%-?(aN)", b="%1ًا"},
    {a="%-?(iNI?)", b="ٍ"}
 }
 
@@ -401,9 +404,9 @@ tanwinfveasy = { -- no assimilations (see below)
 --easy   {a="(O[%S]-)(%-?aN)(Y)(O)([rlmnwy])", b="%5%5"},
 --easy   {a="%-?(aN)(_A)(%s)([rlmnwy])", b="ًى%3%4%4"},
 --easy   {a="%-?(aN)(Y)(%s)([rlmnwy])", b="ًى%3%4%4"},
---easy   {a="(T)%-?(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"},
+--easy   {a="([TH])%-?(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"},
 --easy   {a="(ء)%-?(aN)(%s)([rlmnwy])", b="%1%2%3%4%4"}, --new
---easy   {a="([^TA])%-?(aN)(%s)([rlmnwy])", b="%1ًا%3%4%4"},
+--easy   {a="([^TAH])%-?(aN)(%s)([rlmnwy])", b="%1ًا%3%4%4"},
 --easy   {a="%-?(iNI?)(%s)([rlmnwy])", b="ٍ%2%3%3"},
    -- assimilations (end)
    {a="(O[%S]-)(%-?aN)(_A)(O)([uai])", b="ٱ"},
@@ -413,9 +416,9 @@ tanwinfveasy = { -- no assimilations (see below)
    {a="(B)%-?(\"aN)", b="%1"},
    {a="%-?(\"aN)(_A)", b="ى"},
    {a="%-?(\"aN)(Y)", b="ى"},
-   {a="(T)%-?(\"aN)", b="%1"},
+   {a="([TH])%-?(\"aN)", b="%1"},
    {a="([اآ])(ء)%-?(\"aN)", b="%1%2"}, --new
-   {a="([^TA])%-?(\"aN)", b="%1ا"},
+   {a="([^TAH])%-?(\"aN)", b="%1ا"},
    {a="%-?(\"iNI?)", b=""},
    -- quoted tanwīn (end)
    {a="%-?(uN)", b="ٌ"},
@@ -423,15 +426,15 @@ tanwinfveasy = { -- no assimilations (see below)
    -- needed by \arbcolor:
    {a="%-?(aN)(O[%S]-%_AO)", b="ً"},
    {a="%-?(aN)(O[%S]-YO)", b="ً"},
-   {a="(O[%S]-TO)%-?(aN)", b="ً"},
+   {a="(O[%S]-[TH]O)%-?(aN)", b="ً"},
    {a="(O[%S]-)([اآ])(ء)(O)%-?(aN)", b="ً"}, --new
-   {a="(O[%S]-[^TA]O)%-?(aN)", b="ًا"},
+   {a="(O[%S]-[^TAH]O)%-?(aN)", b="ًا"},
    --
    {a="%-?(aN)(_A)", b="ًى"},
    {a="%-?(aN)(Y)", b="ًى"},
-   {a="(T)%-?(aN)", b="%1ً"},
+   {a="([TH])%-?(aN)", b="%1ً"},
    {a="([اآ])(ء)%-?(aN)", b="%1%2ً"}, --new
-   {a="([^TA])%-?(aN)", b="%1ًا"},
+   {a="([^TAH])%-?(aN)", b="%1ًا"},
    {a="%-?(iNI?)", b="ٍ"}
 }
 
@@ -1003,6 +1006,7 @@ singlefv = {
    {a="w", b="و"},
    {a="y", b="ي"},
    {a="T", b="ة"},
+   {a="H", b="ه"},
    -- additional characters (begin)
    {a="p", b="پ"},
    {a="v", b="ڤ"},
@@ -1038,6 +1042,7 @@ singlefveasy = { -- see the differences under 'easy' tag below
    {a="y", b="ي"},
    {a="T", b="ة"},
    -- additional characters (begin)
+   {a="H", b="ه"},
    {a="p", b="پ"},
    {a="v", b="ڤ"},
    {a="g", b="گ"},