From 4588ab71394187a697d9218251e6ed886f429aaf Mon Sep 17 00:00:00 2001 From: Robert Alessi Date: Thu, 16 Jun 2022 01:17:15 +0200 Subject: =?UTF-8?q?use=20H=20to=20encode=20the=20t=C4=81=CA=BE=20marb?= =?UTF-8?q?=C5=ABtah=20devoid=20of=20diacritical=20points?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arabluatex.dtx | 8 ++++- arabluatex_fullvoc.lua | 38 +++++++++++---------- arabluatex_novoc.lua | 16 ++++----- arabluatex_trans.lua | 89 ++++++++++++++++++++++++++------------------------ arabluatex_voc.lua | 37 +++++++++++---------- makefile | 7 +++- 6 files changed, 107 insertions(+), 88 deletions(-) diff --git a/arabluatex.dtx b/arabluatex.dtx index c281001..89acc76 100644 --- a/arabluatex.dtx +++ b/arabluatex.dtx @@ -2214,6 +2214,12 @@ % \arb[novoc]{.q} & \dmg{.q} & \loc{.q} & \brill{.q} & |.q| \\ % \arb[novoc]{.k} & \dmg{.k} & \loc{.k} & \brill{.k} & |.k| \\ % \arb[novoc]{.n} & \dmg{.n} & \loc{.n} & \brill{.n} & |.n| \\ +% \arb[novoc]{H} & \dmg{aH} & \loc{aH} & \brill{aH} & +% |H|\footnote{This letter can be used to encode the \arb[trans]{tA' +% marbUtaT} devoid of diacritical points as it is found in some +% manuscripts, with the same \arb[trans]{tanwIn} and the same +% short vowels as the standard \arb[trans]{tA' marbUtaT} with two +% points above, e. g. \arb{al-madInaHa}, \arb{madInaHaN}.} \\ % \arb[novoc]{((} & \dmg{((} & \loc{((} & \brill{((} & |((| \\ % \arb[novoc]{))} & \dmg{))} & \loc{))} & \brill{))} & |))| \\ % \end{longtable} @@ -5144,7 +5150,7 @@ % \end{macrocode} % \end{macro} % \begin{macro}{\SetArbNumbers} -% \changes{v1.21}{2022/06/15}{select Indian or Arabic numbers} +% \changes{v1.21}{2022/06/15}{selects Indian or Arabic numbers} % \begin{macrocode} \NewDocumentCommand{\SetArbNumbers}{m}{% \luadirect{arabluatex.setnums(\luastringN{#1})}% diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua index adfccf4..e34f12d 100644 --- a/arabluatex_fullvoc.lua +++ b/arabluatex_fullvoc.lua @@ -104,7 +104,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 @@ -256,7 +256,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 @@ -351,9 +351,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="ٱ"}, @@ -363,9 +363,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="ٌ"}, @@ -373,15 +373,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="ٍ"} } @@ -405,9 +405,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="ٱ"}, @@ -417,9 +417,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="ٌ"}, @@ -427,15 +427,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="ٍ"} } @@ -1007,6 +1007,7 @@ singlefv = { {a="w", b="و"}, {a="y", b="ي"}, {a="T", b="ة"}, + {a="H", b="ه"}, -- additional characters (begin) {a="p", b="پ"}, {a="v", b="ڤ"}, @@ -1042,6 +1043,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="گ"}, diff --git a/arabluatex_novoc.lua b/arabluatex_novoc.lua index b77cfda..f2d0d5a 100644 --- a/arabluatex_novoc.lua +++ b/arabluatex_novoc.lua @@ -36,9 +36,9 @@ tanwinnv = { -- {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%3%4%4"}, --- {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) -- "quoted" tanwīn (begin) @@ -46,9 +46,9 @@ tanwinnv = { {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=""}, @@ -56,15 +56,15 @@ tanwinnv = { -- 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=""}, -- ʾalif al-waṣl: put it back on with \arbnull {a="(O[%S]-)([%'a]l%-)(O)(\"?[uai])", b="%4"}, diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua index c5c0b05..8791b62 100644 --- a/arabluatex_trans.lua +++ b/arabluatex_trans.lua @@ -301,41 +301,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) @@ -343,13 +343,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}"} } @@ -499,18 +499,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="ḥ"}, @@ -565,6 +567,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"}, @@ -680,13 +683,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 @@ -773,12 +776,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="ḥ"}, @@ -832,6 +835,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"}, @@ -1027,12 +1031,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="ḥ"}, @@ -1086,6 +1090,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"}, diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua index 362c866..4db5d3a 100644 --- a/arabluatex_voc.lua +++ b/arabluatex_voc.lua @@ -243,7 +243,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 @@ -368,7 +368,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 +443,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 +455,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 +465,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 +492,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 +504,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 +514,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 +836,7 @@ single = { {a="y", b="ي"}, {a="T", b="ة"}, -- additional characters (begin) + {a="H", b="ه"}, {a="p", b="پ"}, {a="v", b="ڤ"}, {a="g", b="گ"}, diff --git a/makefile b/makefile index 19012c3..900ae1d 100644 --- a/makefile +++ b/makefile @@ -54,6 +54,11 @@ auctex: clean fi cp $(pkg)*.el $(HOMEDIR)/.emacs.d/auctex/auto +zip: all + ln -sf . $(pkg) + zip -Drq $(PWD)/$(pkg)-$(ver).zip $(pkg)/{samples,README.md,$(pkg)*.{pdf,sty,lua,el}} + rm $(pkg) + package: clean all mkdir -p arabluatex/samples/ cp *.{lua,ins,dtx,md,pdf} makefile README.tex arabluatex/ # .bib is in dtx @@ -83,4 +88,4 @@ clean: pandoc -s README.tex -o README.md && sed -i 's/{#.*}//g' README.md pandoc -s README.tex -o about.html -.PHONY: sty doc all local inst auctex package clean +.PHONY: sty doc all local inst auctex zip package clean -- cgit v1.2.3