1 files changed, 49 insertions, 35 deletions

diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index 9b2a31c..6211b4b 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.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>
 --]]
 
 arbmarks = {
@@ -202,7 +201,7 @@ hamza = {
    -- taḫfīfu 'l-hamza
    {a="'u'([^uaiUAI])", b="أU%1"},
    {a="'i'([^uaiUAI])", b="إI%1"},
-   {a="([wf]a)%-\'([^uaiUAIl][^%-])", b="%1أْ%2"},
+   {a="([wf]a)%-\'([^uaiUAIl][^%-])", b="%1أ%2"},
    {a="^u'([^uaiUAI])", b="اU%1"},
    {a="([^uaiUAIYN][%s%(%[%<])u'([^uaiUAI])", b="%1اU%2"},
    {a="^i'([^uaiUAI])", b="اI%1"},
@@ -243,7 +242,7 @@ hamza = {
    -- 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
@@ -325,7 +324,7 @@ hamzaeasy = { -- differences marked below with 'easy'
    -- taḫfīfu 'l-hamza
    {a="'u'([^uaiUAI])", b="أU%1"},
    {a="'i'([^uaiUAI])", b="إI%1"},
-   {a="([wf]a)%-\'([^uaiUAIl][^%-])", b="%1أْ%2"},
+   {a="([wf]a)%-\'([^uaiUAIl][^%-])", b="%1أ%2"},
    {a="^u'([^uaiUAI])", b="اU%1"},
    {a="([^uaiUAIYN][%s%(%[%<])u'([^uaiUAI])", b="%1اU%2"},
    {a="^i'([^uaiUAI])", b="اI%1"},
@@ -368,7 +367,7 @@ hamzaeasy = { -- 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
@@ -443,9 +442,9 @@ tanwin = {
    {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="%5"},
@@ -455,9 +454,9 @@ tanwin = {
    {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="ٌ"},
@@ -465,15 +464,15 @@ tanwin = {
    -- 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="ٍ"}
 }
 
@@ -492,9 +491,9 @@ tanwineasy = { -- 'easy' requires some lines to be taken out:
 --   {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="%5"},
@@ -504,9 +503,9 @@ tanwineasy = { -- 'easy' requires some lines to be taken out:
    {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="ٌ"},
@@ -514,15 +513,15 @@ tanwineasy = { -- 'easy' requires some lines to be taken out:
    -- 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="ٍ"}
 }
 
@@ -836,6 +835,7 @@ single = {
    {a="y", b="ي"},
    {a="T", b="ة"},
    -- additional characters (begin)
+   {a="H", b="ه"},
    {a="p", b="پ"},
    {a="v", b="ڤ"},
    {a="g", b="گ"},
@@ -873,6 +873,19 @@ shortv = {
    {a="i", b="ِ"}
 }
 
+punctuationhb = {
+   {a="%(%(", b="﴿"},
+   {a="%)%)", b="﴾"},
+   {a="%.", b="."},
+   -- replaced with the next two rules to make the Arabic comma work
+   --   after \abraces{}
+--   {a="([^0-9])%,", b="%1،"},
+   {a="%,", b="،"},
+   {a="([%d])%،", b="%1,"},
+   {a="%?", b="؟"},
+   {a="%;", b="؛"},
+}
+
 punctuation = {
    {a="%(%(", b="﴿"},
    {a="%)%)", b="﴾"},
@@ -899,6 +912,7 @@ punctuation = {
 }
 
 null = {
+   {a="%&", b="‍"}, -- That is ^^^^200d, the zero-width joiner
    {a="%|", b=""},
    {a="^%-", b=""},
    {a="([^0-9])(%-)", b="%1"},