summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/lualatex/arabluatex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-06-22 22:36:05 +0000
committerKarl Berry <karl@freefriends.org>2017-06-22 22:36:05 +0000
commite143ee177feb9b680290881b3682aa307ab7fee7 (patch)
tree78b2cc9065b24910129e6888a8acc165ae7bed5a /Master/texmf-dist/tex/lualatex/arabluatex
parent8a0cee58cc8a81c1afc562c1644b2356f2dbf84c (diff)
arabluatex (21jun17)
git-svn-id: svn://tug.org/texlive/trunk@44670 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/lualatex/arabluatex')
-rw-r--r--Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty2
-rw-r--r--Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_fullvoc.lua119
-rw-r--r--Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_novoc.lua32
-rw-r--r--Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_trans.lua126
-rw-r--r--Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua87
5 files changed, 284 insertions, 82 deletions
diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty
index d364aa9461b..57ea04b745a 100644
--- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty
+++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty
@@ -41,7 +41,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{arabluatex}%
-[2017/05/06 v1.8.4 An ArabTeX-like interface for LuaLaTeX]
+[2017/06/20 v1.8.5 An ArabTeX-like interface for LuaLaTeX]
\RequirePackage{ifluatex}
\ifluatex\else
\PackageError{arabluatex}{lualatex needed}{%
diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_fullvoc.lua b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_fullvoc.lua
index 6d63192a10a..99efb752791 100644
--- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_fullvoc.lua
+++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_fullvoc.lua
@@ -354,12 +354,16 @@ trigraphsfv = { -- trigraphs or more
-- al- + lām
{a="^(a)l%-(l)", b="ا%1ل%2%2"},
{a="([%(%[%|%<%s%-o])(a)l%-(l)", b="%1ا%2ل%3%3"}, --p
- -- al- + solar consonant
- {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="ا%1ل%2%2"},
- {a="([%(%[%|%<%s%-o])(a)l%-([%_%^%.]?[tdrzsn])", b="%1ا%2ل%3%3"}, --p
- -- assim. art. + solar consonant
- {a="^(a)([%_%^%.]?[tdrzsn])%-", b="ا%1ل%2"},
- {a="([%(%[%|%<%s%-o])(a)([%_%^%.]?[tdrzsn])%-", b="%1ا%2ل%3"}, --p
+ -- al- + solar consonant ('c' and '^n' are additional characters)
+ {a="^(a)l%-(%^n)", b="ا%1ل%2"}, -- ^n is lunar
+ {a="([%(%[%|%<%s%-o])(a)l%-(%^n)", b="%1ا%2ل%3"}, -- ^n is lunar --p
+ {a="^(a)l%-([%_%^%.]?[tdrzsnc])", b="ا%1ل%2%2"},
+ {a="([%(%[%|%<%s%-o])(a)l%-([%_%^%.]?[tdrzsnc])", b="%1ا%2ل%3%3"}, --p
+ -- assim. art. + solar consonant ('c' and '^n' are additional characters)
+ {a="^(a)(%^n)%-", b="ا%1ل"}, -- ^n is lunar
+ {a="([%(%[%|%<%s%-o])(a)(%^n)%-", b="%1ا%2ل"}, -- ^n is lunar --p
+ {a="^(a)([%_%^%.]?[tdrzsnc])%-", b="ا%1ل%2"},
+ {a="([%(%[%|%<%s%-o])(a)([%_%^%.]?[tdrzsnc])%-", b="%1ا%2ل%3"}, --p
-- al- + initial unstable hamza
{a="^(a)l%-(\"?[uai])", b="ا%1ل%2ٱ"},
{a="([%(%[%|%<%s%-o])(a)l%-(\"?[uai])", b="%1ا%2ل%3ٱ"}, --p
@@ -378,15 +382,23 @@ trigraphsfv = { -- trigraphs or more
-- art. with waṣla + lām
{a="'l%-(l)", b="ٱل%1%1"},
-- art. with waṣla + solar consonant
- {a="'l%-([%_%^%.]?[tdrzsn])", b="ٱل%1%1"},
+ -- ('c' and '^n' are additional characters)
+ {a="'l%-(%^n)", b="ٱل%1"}, -- ^n is lunar
+ {a="'l%-([%_%^%.]?[tdrzsnc])", b="ٱل%1%1"},
-- li-/la- + art. + lām
{a="l([ai])%-l%-(l)", b="ل%1%2%2"},
-- assim. art. with waṣla + solar consonant
- {a="'([%_%^%.]?[tdrzsn])%-", b="ٱل%1"},
+ -- ('c' and '^n' are additional characters)
+ {a="'(%^n)%-", b="ٱل"}, -- ^n is lunar
+ {a="'([%_%^%.]?[tdrzsnc])%-", b="ٱل%1"},
-- li-/la- + art. + solar consonant is a special orthography
- {a="l([ai])%-l%-([%_%^%.]?[tdrzsn])", b="ل%1ل%2%2"},
+ -- ('c' and '^n' are additional characters)
+ {a="l([ai])%-l%-(%^n)", b="ل%1ل%2"}, -- ^n is lunar
+ {a="l([ai])%-l%-([%_%^%.]?[tdrzsnc])", b="ل%1ل%2%2"},
-- li-/la- + assim. art. + solar consonant is a special orthography
- {a="l([ai])%-([%_%^%.]?[tdrzsn])%-([%_%^%.]?[tdrzsn])", b="ل%1ل%3%3"},
+ -- ('c' and '^n' are additional characters)
+ {a="l([ai])%-(%^n)%-(%^n)", b="ل%1ل%3"}, -- ^n is lunar
+ {a="l([ai])%-([%_%^%.]?[tdrzsnc])%-([%_%^%.]?[tdrzsnc])", b="ل%1ل%3%3"},
-- art. with waṣla + initial unstable hamza
{a="'l%-(\"?[uai])", b="ٱل%1ٱ"},
-- art. with waṣla + lunar consonant (i.e. what remains)
@@ -423,12 +435,16 @@ trigraphsfveasy = { -- trigraphs or more (see 'easy' tag below for the diffs)
-- al- + lām
{a="^(a)l%-(l)", b="ا%1ل%2%2"},
{a="([%(%[%|%<%s%-o])(a)l%-(l)", b="%1ا%2ل%3%3"}, --p
- -- al- + solar consonant
- {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="ا%1ل%2%2"},
- {a="([%(%[%|%<%s%-o])(a)l%-([%_%^%.]?[tdrzsn])", b="%1ا%2ل%3%3"}, --p
- -- assim. art. + solar consonant
- {a="^(a)([%_%^%.]?[tdrzsn])%-", b="ا%1ل%2"},
- {a="([%(%[%|%<%s%-o])(a)([%_%^%.]?[tdrzsn])%-", b="%1ا%2ل%3"}, --p
+ -- al- + solar consonant ('c' and '^n' are additional characters)
+ {a="^(a)l%-(%^n)", b="ا%1ل%2"}, -- ^n is lunar
+ {a="([%(%[%|%<%s%-o])(a)l%-(%^n)", b="%1ا%2ل%3"}, -- ^n is lunar --p
+ {a="^(a)l%-([%_%^%.]?[tdrzsnc])", b="ا%1ل%2%2"},
+ {a="([%(%[%|%<%s%-o])(a)l%-([%_%^%.]?[tdrzsnc])", b="%1ا%2ل%3%3"}, --p
+ -- assim. art. + solar consonant ('c' and '^n' are additional characters)
+ {a="^(a)(%^n)%-", b="ا%1ل"}, -- ^n is lunar
+ {a="([%(%[%|%<%s%-o])(a)(%^n)%-", b="%1ا%2ل"}, -- ^n is lunar --p
+ {a="^(a)([%_%^%.]?[tdrzsnc])%-", b="ا%1ل%2"},
+ {a="([%(%[%|%<%s%-o])(a)([%_%^%.]?[tdrzsnc])%-", b="%1ا%2ل%3"}, --p
-- al- + initial unstable hamza
{a="^(a)l%-(\"?[uai])", b="ا%1ل%2ٱ"},
{a="([%(%[%|%<%s%-o])(a)l%-(\"?[uai])", b="%1ا%2ل%3ٱ"}, --p
@@ -447,15 +463,23 @@ trigraphsfveasy = { -- trigraphs or more (see 'easy' tag below for the diffs)
-- art. with waṣla + lām
{a="'l%-(l)", b="ٱل%1%1"},
-- art. with waṣla + solar consonant
- {a="'l%-([%_%^%.]?[tdrzsn])", b="ٱل%1%1"},
+ -- ('c' and '^n' are additional characters)
+ {a="'l%-(%^n)", b="ٱل%1"}, -- ^n is lunar
+ {a="'l%-([%_%^%.]?[tdrzsnc])", b="ٱل%1%1"},
-- li-/la- + art. + lām
{a="l([ai])%-l%-(l)", b="ل%1%2%2"},
-- assim. art. with waṣla + solar consonant
- {a="'([%_%^%.]?[tdrzsn])%-", b="ٱل%1"},
+ -- ('c' and '^n' are is an additional characters)
+ {a="'(%^n)%-", b="ٱل"}, -- ^n is lunar
+ {a="'([%_%^%.]?[tdrzsnc])%-", b="ٱل%1"},
-- li-/la- + art. + solar consonant is a special orthography
- {a="l([ai])%-l%-([%_%^%.]?[tdrzsn])", b="ل%1ل%2%2"},
+ -- ('c' and '^n' are additional characters)
+ {a="l([ai])%-l%-(%^n)", b="ل%1ل%2"}, -- ^n is lunar
+ {a="l([ai])%-l%-([%_%^%.]?[tdrzsnc])", b="ل%1ل%2%2"},
-- li-/la- + assim. art. + solar consonant is a special orthography
- {a="l([ai])%-([%_%^%.]?[tdrzsn])%-([%_%^%.]?[tdrzsn])", b="ل%1ل%3%3"},
+ -- ('c and '^n' are additional characters)
+ {a="l([ai])%-(%^n)%-(%^n)", b="ل%1ل%3"}, -- ^n is lunar
+ {a="l([ai])%-([%_%^%.]?[tdrzsnc])%-([%_%^%.]?[tdrzsnc])", b="ل%1ل%3%3"},
-- art. with waṣla + initial unstable hamza
{a="'l%-(\"?[uai])", b="ٱل%1ٱ"},
-- art. with waṣla + lunar consonant (i.e. what remains)
@@ -511,6 +535,8 @@ digraphsfvidgham = {
{a="bb", b="بّ"},
{a="BB", b="ـّ"},
{a="([%_%^%.])([tghdsz])([tghdsz])", b="%1%2|%3"},
+ -- same as above for additional characters:
+ {a="([%_%^%.])([cn])([cn])", b="%1%2|%3"},
{a="tt", b="تّ"},
{a="%_t%_t", b="ثّ"},
{a="jj", b="جّ"},
@@ -539,6 +565,14 @@ digraphsfvidgham = {
{a="hh", b="هّ"},
{a="ww", b="وّ"},
{a="yy", b="يّ"},
+ -- additional characters + šaddah (begin)
+ {a="pp", b="پّ"},
+ {a="vv", b="ڤّ"},
+ {a="gg", b="گّ"},
+ {a="%^c%^c", b="چّ"},
+ {a="%^z%^z", b="ژّ"},
+ {a="%^n%^n", b="ڭّ"},
+ -- additional characters + šaddah (end)
-- sukūn begin
-- first, take out hyphen if any:
{a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])%-([uaiUAI])", b="%1%2"},
@@ -565,6 +599,11 @@ digraphsfvidgham = {
{a="%.t", b="ط"},
{a="%.z", b="ظ"},
{a="%.g", b="غ"},
+ -- additional characters (begin)
+ {a="%^c", b="چ"},
+ {a="%^z", b="ژ"},
+ {a="%^n", b="ڭ"},
+ -- additional characters (end)
{a="(U)(A)", b="%1ا"},
{a="WA", b="وْا"},
{a="(a)W\"", b="%1وا"},
@@ -619,6 +658,8 @@ digraphsfv = {
{a="bb", b="بّ"},
{a="BB", b="ـّ"},
{a="([%_%^%.])([tghdsz])([tghdsz])", b="%1%2|%3"},
+ -- same as above for additional characters:
+ {a="([%_%^%.])([cn])([cn])", b="%1%2|%3"},
{a="tt", b="تّ"},
{a="%_t%_t", b="ثّ"},
{a="jj", b="جّ"},
@@ -647,6 +688,14 @@ digraphsfv = {
{a="hh", b="هّ"},
{a="ww", b="وّ"},
{a="yy", b="يّ"},
+ -- additional characters + šaddah (begin)
+ {a="pp", b="پّ"},
+ {a="vv", b="ڤّ"},
+ {a="gg", b="گّ"},
+ {a="%^c%^c", b="چّ"},
+ {a="%^z%^z", b="ژّ"},
+ {a="%^n%^n", b="ڭّ"},
+ -- additional characters + šaddah (end)
-- sukūn begin
-- first, take out hyphen if any:
{a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])%-([uaiUAI])", b="%1%2"},
@@ -673,6 +722,11 @@ digraphsfv = {
{a="%.t", b="ط"},
{a="%.z", b="ظ"},
{a="%.g", b="غ"},
+ -- additional characters (begin)
+ {a="%^c", b="چ"},
+ {a="%^z", b="ژ"},
+ {a="%^n", b="ڭ"},
+ -- additional characters (end)
{a="(U)(A)", b="%1ا"},
{a="WA", b="وْا"},
{a="(a)W\"", b="%1وا"},
@@ -727,6 +781,8 @@ digraphsfveasy = { -- see the differences under 'easy' marker below
{a="bb", b="بّ"},
{a="BB", b="ـّ"},
{a="([%_%^%.])([tghdsz])([tghdsz])", b="%1%2|%3"},
+ -- same as above for additional characters:
+ {a="([%_%^%.])([cn])([cn])", b="%1%2|%3"},
{a="tt", b="تّ"},
{a="%_t%_t", b="ثّ"},
{a="jj", b="جّ"},
@@ -755,6 +811,14 @@ digraphsfveasy = { -- see the differences under 'easy' marker below
{a="hh", b="هّ"},
{a="ww", b="وّ"},
{a="yy", b="يّ"},
+ -- additional characters + šaddah (begin)
+ {a="pp", b="پّ"},
+ {a="vv", b="ڤّ"},
+ {a="gg", b="گّ"},
+ {a="%^c%^c", b="چّ"},
+ {a="%^z%^z", b="ژّ"},
+ {a="%^n%^n", b="ڭّ"},
+ -- additional characters + šaddah (end)
-- sukūn begin ('easy' needs these rules to be taken out); but
-- first take out every previously generated sukūn by hamza rules,
-- so there be no need to edit them:
@@ -784,6 +848,11 @@ digraphsfveasy = { -- see the differences under 'easy' marker below
{a="%.t", b="ط"},
{a="%.z", b="ظ"},
{a="%.g", b="غ"},
+ -- additional characters (begin)
+ {a="%^c", b="چ"},
+ {a="%^z", b="ژ"},
+ {a="%^n", b="ڭ"},
+ -- additional characters (end)
{a="(U)(A)", b="%1ا"},
{a="WA", b="وْا"},
{a="(a)W\"", b="%1وا"},
@@ -821,6 +890,11 @@ singlefv = {
{a="w", b="و"},
{a="y", b="ي"},
{a="T", b="ة"},
+ -- additional characters (begin)
+ {a="p", b="پ"},
+ {a="v", b="ڤ"},
+ {a="g", b="گ"},
+ -- additional characters (end)
{a="\"$", b=""},
{a="\"(%W)", b="%1"},
{a="\"([^uaiUAI])", b="%1"},
@@ -849,6 +923,11 @@ singlefveasy = { -- see the differences under 'easy' tag below
{a="w", b="و"},
{a="y", b="ي"},
{a="T", b="ة"},
+ -- additional characters (begin)
+ {a="p", b="پ"},
+ {a="v", b="ڤ"},
+ {a="g", b="گ"},
+ -- additional characters (end)
-- easy (begin): \" needs to put back the sukūn
{a="\"$", b="ْ"},
{a="\"(%W)", b="ْ%1"},
diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_novoc.lua b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_novoc.lua
index 55eccdc4b88..caf66f90dfe 100644
--- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_novoc.lua
+++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_novoc.lua
@@ -74,12 +74,16 @@ trigraphsnv = { -- trigraphs or more
-- al- + lām
{a="^(a)l%-(l)", b="ا%1ل%2"},
{a="([%(%[%|%<%s%-])(a)l%-(l)", b="%1ا%2ل%3"}, --p
- -- al- + solar consonant
- {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="ا%1ل%2"},
- {a="([%(%[%|%<%s%-])(a)l%-([%_%^%.]?[tdrzsn])", b="%1ا%2ل%3"}, --p
- -- assim. art. + solar consonant
- {a="^(a)([%_%^%.]?[tdrzsn])%-", b="ا%1ل"},
- {a="([%(%[%|%<%s%-])(a)([%_%^%.]?[tdrzsn])%-", b="%1ا%2ل"}, --p
+ -- al- + solar consonant ('c' and '^n' are additional characters)
+ {a="^(a)l%-(%^n)", b="ا%1ل%2"}, -- ^n is lunar
+ {a="([%(%[%|%<%s%-])(a)l%-(%^n)", b="%1ا%2ل%3"}, -- ^n is lunar --p
+ {a="^(a)l%-([%_%^%.]?[tdrzsnc])", b="ا%1ل%2"},
+ {a="([%(%[%|%<%s%-])(a)l%-([%_%^%.]?[tdrzsnc])", b="%1ا%2ل%3"}, --p
+ -- assim. art. + solar consonant ('c' and '^n' are additional characters)
+ {a="^(a)(%^n)%-", b="ا%1ل"}, -- ^n is lunar
+ {a="([%(%[%|%<%s%-])(a)(%^n)%-", b="%1ا%2ل"}, -- ^n is lunar --p
+ {a="^(a)([%_%^%.]?[tdrzsnc])%-", b="ا%1ل"},
+ {a="([%(%[%|%<%s%-])(a)([%_%^%.]?[tdrzsnc])%-", b="%1ا%2ل"}, --p
-- al- + initial unstable hamza
{a="^(a)l%-(\")([uai])", b="ا%1لٱ%3"},
{a="([%(%[%|%<%s%-])(a)l%-(\")([uai])", b="%1ا%2لٱ%4"}, --p
@@ -94,15 +98,23 @@ trigraphsnv = { -- trigraphs or more
-- art. with waṣla + lām
{a="'l%-(l)", b="ال%1"},
-- art. with waṣla + solar consonant
- {a="'l%-([%_%^%.]?[tdrzsn])", b="ال%1"},
+ -- ('c' and '^n' are additional characters)
+ {a="'l%-(%^n)", b="ال%1"}, -- ^n is lunar
+ {a="'l%-([%_%^%.]?[tdrzsnc])", b="ال%1"},
-- li-/la- + art. + lām
{a="l([ai])%-l%-(l)", b="ل%1%2"},
-- assim. art. with waṣla + solar consonant
- {a="'([%_%^%.]?[tdrzsn])%-", b="ال"},
+ -- ('c' and '^n' are additional characters)
+ {a="'(%^n)%-", b="ال"}, -- ^n is lunar
+ {a="'([%_%^%.]?[tdrzsnc])%-", b="ال"},
-- li-/la- + art. + solar consonant is a special orthography
- {a="l([ai])%-l%-([%_%^%.]?[tdrzsn])", b="ل%1ل%2"},
+ -- ('c' and '^n' are additional characters)
+ {a="l([ai])%-l%-(%^n)", b="ل%1ل%2"}, -- ^n is lunar
+ {a="l([ai])%-l%-([%_%^%.]?[tdrzsnc])", b="ل%1ل%2"},
-- li-/la + assim. art. + solar consonant is a special orthography
- {a="l([ai])%-([%_%^%.]?[tdrzsn])%-([%_%^%.]?[tdrzsn])", b="ل%1ل%3"},
+ -- ('c' and '^n' are additional characters)
+ {a="l([ai])%-(%^n)%-(%^n)", b="ل%1ل%3"}, -- ^n is lunar
+ {a="l([ai])%-([%_%^%.]?[tdrzsnc])%-([%_%^%.]?[tdrzsnc])", b="ل%1ل%3"},
-- art. with waṣla + initial unstable hamza
{a="'l%-(\")([uai])", b="الٱ%2"},
{a="'l%-([uai])", b="الا%1"},
diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_trans.lua b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_trans.lua
index 2b9fcdf0a96..35f4b677cf6 100644
--- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_trans.lua
+++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_trans.lua
@@ -213,12 +213,16 @@ trigraphstrdmg = { -- trigraphs or more
-- al- + lām
{a="^(a)l%-(l)", b="%1l-%2"},
{a="([%(%[%|%<%s%-o])(a)l%-(l)", b="%1%2l-%3"}, --p
- -- al- + solar consonant
- {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="%1%2-%2"},
- {a="([%(%[%|%<%s%-o])(a)l%-([%_%^%.]?[tdrzsn])", b="%1%2%3-%3"}, --p
- -- assim. art. + solar consonant
- {a="^(a)([%_%^%.]?[tdrzsn])%-", b="%1%2-"},
- {a="([%(%[%|%<%s%-o])(a)([%_%^%.]?[tdrzsn])%-", b="%1%2%3-"}, --p
+ -- al- + solar consonant ('c' and '^n' are additional characters)
+ {a="^(a)l%-(%^n)", b="%1l-%2"}, -- ^n is lunar
+ {a="([%(%[%|%<%s%-o])(a)l%-(%^n)", b="%1%2l-%3"}, --^n is lunar --p
+ {a="^(a)l%-([%_%^%.]?[tdrzsnc])", b="%1%2-%2"},
+ {a="([%(%[%|%<%s%-o])(a)l%-([%_%^%.]?[tdrzsnc])", b="%1%2%3-%3"}, --p
+ -- assim. art. + solar consonant ('c' and '^n' are additional characters)
+ {a="^(a)(%^n)%-", b="%1l-"}, -- ^n is lunar
+ {a="([%(%[%|%<%s%-o])(a)(%^n)%-", b="%1%2l-"}, --^n is lunar --p
+ {a="^(a)([%_%^%.]?[tdrzsnc])%-", b="%1%2-"},
+ {a="([%(%[%|%<%s%-o])(a)([%_%^%.]?[tdrzsnc])%-", b="%1%2%3-"}, --p
-- al- + initial unstable hamza
{a="^(a)l%-(\"?[uai])", b="%1l-%2"},
{a="([%(%[%|%<%s%-o])(a)l%-(\"?[uai])", b="%1%2l-%3"}, --p
@@ -235,15 +239,23 @@ trigraphstrdmg = { -- trigraphs or more
-- art. with waṣla + lām
{a="'l%-(l)", b="'l-%1"},
-- art. with waṣla + solar consonant
- {a="'l%-([%_%^%.]?[tdrzsn])", b="'%1-%1"},
+ -- ('c' and '^n' are additional characters)
+ {a="'l%-(%^n)", b="'l-%1"}, -- ^n is lunar
+ {a="'l%-([%_%^%.]?[tdrzsnc])", b="'%1-%1"},
-- li-/la- + art. + lām
{a="l([ai])%-l%-(l)", b="l%1-%2%2"},
-- assim. art. with waṣla + solar consonant
- {a="'([%_%^%.]?[tdrzsn])%-", b="'%1-"},
+ -- ('c' and '^n' are additional characters)
+ {a="'(%^n)%-", b="'l-"}, -- ^n is lunar
+ {a="'([%_%^%.]?[tdrzsnc])%-", b="'%1-"},
-- li-/la- + art. + solar consonant is a special orthography
- {a="l([ai])%-l%-([%_%^%.]?[tdrzsn])", b="l%1-%2-%2"},
+ -- ('c' and '^n' are additional characters)
+ {a="l([ai])%-l%-(%^n)", b="l%1-l-%2"}, -- ^n is lunar
+ {a="l([ai])%-l%-([%_%^%.]?[tdrzsnc])", b="l%1-%2-%2"},
-- li-/la- + assim. art. + solar consonant is a special orthography
- {a="l([ai])%-([%_%^%.]?[tdrzsn])%-([%_%^%.]?[tdrzsn])", b="l%1-%2-%3"},
+ -- ('c' and '^n' are additional characters)
+ {a="l([ai])%-(%^n)%-(%^n)", b="l%1-l-%3"}, -- ^n is lunar
+ {a="l([ai])%-([%_%^%.]?[tdrzsnc])%-([%_%^%.]?[tdrzsnc])", b="l%1-%2-%3"},
-- art. with waṣla + initial unstable hamza
{a="'l%-(\"?[uai])", b="'l-%1"},
-- art. with waṣla + lunar consonant (i.e. what remains)
@@ -353,6 +365,11 @@ digraphstrdmg = {
{a="%.t", b="ṭ"},
{a="%.z", b="ẓ"},
{a="%.g", b="ġ"},
+ -- additional characters (begin)
+ {a="%^c", b="č"},
+ {a="%^z", b="ž"},
+ {a="%^n", b="ñ"},
+ -- additional characters (end)
-- the following needs to be moved above shortening rules
-- {a="(U)(A)", b="ū"},
{a="WA", b="w"},
@@ -389,6 +406,11 @@ singletrdmg = {
{a="w", b="w"},
{a="y", b="y"},
{a="T", b="t"},
+ -- additional characters (begin)
+ {a="p", b="p"},
+ {a="v", b="v"},
+ {a="g", b="g"},
+ -- additional characters (end)
{a="\"", b=""},
{a="B", b=""}
}
@@ -495,12 +517,16 @@ trigraphstrloc = { -- trigraphs or more
-- al- + lām
{a="^(a)l%-(l)", b="%1l-%2"},
{a="(%s)(a)l%-(l)", b="%1%2l-%3"},
- -- al- + solar consonant
- {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="%1l-%2"},
- {a="(%s)(a)l%-([%_%^%.]?[tdrzsn])", b="%1%2l-%3"},
- -- assim. art. + solar consonant
- {a="^(a)([%_%^%.]?[tdrzsn])%-", b="%1l-"},
- {a="(%s)(a)([%_%^%.]?[tdrzsn])%-", b="%1%2l-"},
+ -- al- + solar consonant ('c' and '^n' are additional characters)
+ {a="^(a)l%-(%^n)", b="%1l-%2"}, -- ^n is lunar
+ {a="(%s)(a)l%-(%^n)", b="%1%2l-%3"}, -- ^n is lunar
+ {a="^(a)l%-([%_%^%.]?[tdrzsnc])", b="%1l-%2"},
+ {a="(%s)(a)l%-([%_%^%.]?[tdrzsnc])", b="%1%2l-%3"},
+ -- assim. art. + solar consonant ('c' and '^n' are additional characters)
+ {a="^(a)(%^n)%-", b="%1l-"}, -- ^n is lunar
+ {a="(%s)(a)(%^n)%-", b="%1%2l-"}, -- ^n is lunar
+ {a="^(a)([%_%^%.]?[tdrzsnc])%-", b="%1l-"},
+ {a="(%s)(a)([%_%^%.]?[tdrzsnc])%-", b="%1%2l-"},
-- al- + initial unstable hamza
{a="^(a)l%-([uai])", b="%1l-%2"},
{a="(%s)(a)l%-([uai])", b="%1%2l-%3"},
@@ -512,15 +538,23 @@ trigraphstrloc = { -- trigraphs or more
-- art. with waṣla + lām
{a="'l%-(l)", b="al-%1"},
-- art. with waṣla + solar consonant
- {a="'l%-([%_%^%.]?[tdrzsn])", b="al-%1"},
+ -- ('c' and '^n' are additional characters)
+ {a="'l%-(%^n)", b="al-%1"}, -- ^n is lunar
+ {a="'l%-([%_%^%.]?[tdrzsnc])", b="al-%1"},
-- li-/la- + art. + lām
{a="l([ai])%-l%-(l)", b="l%1-l-%2"},
-- assim. art. with waṣla + solar consonant
- {a="'([%_%^%.]?[tdrzsn])%-", b="al-"},
+ -- ('c' and '^n' are additional characters)
+ {a="'(%^n)%-", b="al-"}, -- ^n is lunar
+ {a="'([%_%^%.]?[tdrzsnc])%-", b="al-"},
-- li-/la- + art. + solar consonant is a special orthography
- {a="l([ai])%-l%-([%_%^%.]?[tdrzsn])", b="l%1-l-%2"},
+ -- ('c' and '^n' are additional characters)
+ {a="l([ai])%-l%-(%^n)", b="l%1-l-%2"}, -- ^n is lunar
+ {a="l([ai])%-l%-([%_%^%.]?[tdrzsnc])", b="l%1-l-%2"},
-- li-/la- + assim. art. + solar consonant is a special orthography
- {a="l([ai])%-([%_%^%.]?[tdrzsn])%-([%_%^%.]?[tdrzsn])", b="l%1-l-%3"},
+ -- ('c' and '^n' are additional characters)
+ {a="l([ai])%-(%^n)%-(%^n)", b="l%1-l-%3"}, -- ^n is lunar
+ {a="l([ai])%-([%_%^%.]?[tdrzsnc])%-([%_%^%.]?[tdrzsnc])", b="l%1-l-%3"},
-- art. with waṣla + initial unstable hamza
{a="'l%-([uai])", b="al-%1"},
-- art. with waṣla + lunar consonant (i.e. what remains)
@@ -576,6 +610,11 @@ digraphstrloc = {
{a="%.t", b="ṭ"},
{a="%.z", b="ẓ"},
{a="%.g", b="gh"},
+ -- additional characters (begin)
+ {a="%^c", b="ch"},
+ {a="%^z", b="zh"},
+ {a="%^n", b="ñ"},
+ -- additional characters (end)
{a="(U)(A)", b="ū"},
{a="WA", b="w"},
{a="(a)W", b="%1w"},
@@ -611,6 +650,11 @@ singletrloc = {
{a="w", b="w"},
{a="y", b="y"},
{a="T", b="t"},
+ -- additional characters (begin)
+ {a="p", b="p"},
+ {a="v", b="v"},
+ {a="g", b="g"},
+ -- additional characters (end)
{a="\"", b=""},
{a="B", b=""}
}
@@ -709,12 +753,16 @@ trigraphstrarabica = { -- trigraphs or more
-- al- + lām
{a="^(a)l%-(l)", b="%1l-%2"},
{a="(%s)(a)l%-(l)", b="%1%2l-%3"},
- -- al- + solar consonant
- {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="%1l-%2"},
- {a="(%s)(a)l%-([%_%^%.]?[tdrzsn])", b="%1%2l-%3"},
- -- assim. art. + solar consonant
- {a="^(a)([%_%^%.]?[tdrzsn])%-", b="%1l-"},
- {a="(%s)(a)([%_%^%.]?[tdrzsn])%-", b="%1%2l-"},
+ -- al- + solar consonant ('c' and '^n' are additional characters)
+ {a="^(a)l%-(%^n)", b="%1l-%2"}, -- ^n is lunar
+ {a="(%s)(a)l%-(%^n)", b="%1%2l-%3"}, -- ^n is lunar
+ {a="^(a)l%-([%_%^%.]?[tdrzsnc])", b="%1l-%2"},
+ {a="(%s)(a)l%-([%_%^%.]?[tdrzsnc])", b="%1%2l-%3"},
+ -- assim. art. + solar consonant ('c' and '^n' are additional characters)
+ {a="^(a)(%^n)%-", b="%1l-"}, -- ^n is lunar
+ {a="(%s)(a)(%^n)%-", b="%1%2l-"}, -- ^n is lunar
+ {a="^(a)([%_%^%.]?[tdrzsnc])%-", b="%1l-"},
+ {a="(%s)(a)([%_%^%.]?[tdrzsnc])%-", b="%1%2l-"},
-- al- + initial unstable hamza
{a="^(a)l%-([uai])", b="%1l-%2"},
{a="(%s)(a)l%-([uai])", b="%1%2l-%3"},
@@ -726,15 +774,23 @@ trigraphstrarabica = { -- trigraphs or more
-- art. with waṣla + lām
{a="'l%-(l)", b="l-%1"},
-- art. with waṣla + solar consonant
- {a="'l%-([%_%^%.]?[tdrzsn])", b="l-%1"},
+ -- ('c' and '^n' are additional characters)
+ {a="'l%-(%^n)", b="l-%1"}, -- ^n is lunar
+ {a="'l%-([%_%^%.]?[tdrzsnc])", b="l-%1"},
-- li-/la- + art. + lām
{a="l([ai])%-l%-(l)", b="l%1-l-%2"},
-- assim. art. with waṣla + solar consonant
- {a="'([%_%^%.]?[tdrzsn])%-", b="l-"},
+ -- ('c' and '^n' are additional characters)
+ {a="'(%^n)%-", b="l-"}, -- ^n is lunar
+ {a="'([%_%^%.]?[tdrzsnc])%-", b="l-"},
-- li-/la- + art. + solar consonant is a special orthography
- {a="l([ai])%-l%-([%_%^%.]?[tdrzsn])", b="l%1-l-%2"},
+ -- ('c' and '^n' are additional characters)
+ {a="l([ai])%-l%-(%^n)", b="l%1-l-%2"}, -- ^n is lunar
+ {a="l([ai])%-l%-([%_%^%.]?[tdrzsnc])", b="l%1-l-%2"},
-- li-/la- + assim. art. + solar consonant is a special orthography
- {a="l([ai])%-([%_%^%.]?[tdrzsn])%-([%_%^%.]?[tdrzsn])", b="l%1-l-%3"},
+ -- ('c' and '^n' are additional characters)
+ {a="l([ai])%-(%^n)%-(%^n)", b="l%1-l-%3"}, -- ^n is lunar
+ {a="l([ai])%-([%_%^%.]?[tdrzsnc])%-([%_%^%.]?[tdrzsnc])", b="l%1-l-%3"},
-- art. with waṣla + initial unstable hamza
{a="'l%-([uai])", b="l-%1"},
-- art. with waṣla + lunar consonant (i.e. what remains)
@@ -790,6 +846,11 @@ digraphstrarabica = {
{a="%.t", b="ṭ"},
{a="%.z", b="ẓ"},
{a="%.g", b="ġ"},
+ -- additional characters (begin)
+ {a="%^c", b="č"},
+ {a="%^z", b="ž"},
+ {a="%^n", b="ñ"},
+ -- additional characters (end)
{a="(U)(A)", b="ū"},
{a="WA", b="w"},
{a="(a)W", b="%1w"},
@@ -825,6 +886,11 @@ singletrarabica = {
{a="w", b="w"},
{a="y", b="y"},
{a="T", b="t"},
+ -- additional characters (begin)
+ {a="p", b="p"},
+ {a="v", b="v"},
+ {a="g", b="g"},
+ -- additional characters (end)
{a="\"", b=""},
{a="B", b=""}
}
diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua
index 073b23f3c76..6c63a883c49 100644
--- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua
+++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua
@@ -471,12 +471,16 @@ trigraphs = { -- trigraphs or more
-- al- + lām
{a="^(a)l%-(l)", b="ا%1ل%2%2"},
{a="([%(%[%|%<%s%-o])(a)l%-(l)", b="%1ا%2ل%3%3"}, --p
- -- al- + solar consonant
- {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="ا%1ل%2%2"},
- {a="([%(%[%|%<%s%-o])(a)l%-([%_%^%.]?[tdrzsn])", b="%1ا%2ل%3%3"}, --p
- -- assim. art. + solar consonant
- {a="^(a)([%_%^%.]?[tdrzsn])%-", b="ا%1ل%2"},
- {a="([%(%[%|%<%s%-o])(a)([%_%^%.]?[tdrzsn])%-", b="%1ا%2ل%3"}, --p
+ -- al- + solar consonant ('c' and '^n' are additional characters)
+ {a="^(a)l%-(%^n)", b="ا%1ل%2"}, -- ^n is lunar
+ {a="([%(%[%|%<%s%-o])(a)l%-(%^n)", b="%1ا%2ل%3"},-- ^n is lunar --p
+ {a="^(a)l%-([%_%^%.]?[tdrzsnc])", b="ا%1ل%2%2"},
+ {a="([%(%[%|%<%s%-o])(a)l%-([%_%^%.]?[tdrzsnc])", b="%1ا%2ل%3%3"}, --p
+ -- assim. art. + solar consonant ('c' and '^n' are additional characters)
+ {a="^(a)(%^n)%-", b="ا%1ل"}, -- ^n is lunar
+ {a="([%(%[%|%<%s%-o])(a)(%^n)%-", b="%1ا%2ل"},-- ^n is lunar --p
+ {a="^(a)([%_%^%.]?[tdrzsnc])%-", b="ا%1ل%2"},
+ {a="([%(%[%|%<%s%-o])(a)([%_%^%.]?[tdrzsnc])%-", b="%1ا%2ل%3"}, --p
-- al- + initial unstable hamza
{a="^(a)l%-(\")([uai])", b="ا%1ل%3ٱ"},
{a="([%(%[%|%<%s%-o])(a)l%-(\")([uai])", b="%1ا%2ل%4ٱ"}, --p
@@ -498,15 +502,23 @@ trigraphs = { -- trigraphs or more
-- art. with waṣla + lām
{a="'l%-(l)", b="ال%1%1"},
-- art. with waṣla + solar consonant
- {a="'l%-([%_%^%.]?[tdrzsn])", b="ال%1%1"},
+ -- ('c' and '^n' are additional characters)
+ {a="'l%-(%^n)", b="ال%1"}, -- ^n is lunar
+ {a="'l%-([%_%^%.]?[tdrzsnc])", b="ال%1%1"},
-- li-/la- + art. + lām
{a="l([ai])%-l%-(l)", b="ل%1%2%2"},
- -- assim. art. with waṣla + solar consonant
- {a="'([%_%^%.]?[tdrzsn])%-", b="ال%1"},
+ -- assim. art. with waṣla + solar consonant ('c' and '^n' are
+ -- additional characters)
+ {a="'(%^n)%-", b="ال"}, -- ^n is lunar
+ {a="'([%_%^%.]?[tdrzsnc])%-", b="ال%1"},
-- li-/la- + art. + solar consonant is a special orthography
- {a="l([ai])%-l%-([%_%^%.]?[tdrzsn])", b="ل%1ل%2%2"},
+ -- ('c' and '^n' are additional characters)
+ {a="l([ai])%-l%-(%^n)", b="ل%1ل%2"}, -- '^n' is lunar
+ {a="l([ai])%-l%-([%_%^%.]?[tdrzsnc])", b="ل%1ل%2%2"},
-- li-/la + assim. art. + solar consonant is a special orthography
- {a="l([ai])%-([%_%^%.]?[tdrzsn])%-([%_%^%.]?[tdrzsn])", b="ل%1ل%3%3"},
+ -- ('c' and '^n' are additional characters)
+ {a="l([ai])%-(%^n)%-(%^n)", b="ل%1ل%3"}, -- ^n is lunar
+ {a="l([ai])%-([%_%^%.]?[tdrzsnc])%-([%_%^%.]?[tdrzsnc])", b="ل%1ل%3%3"},
-- art. with waṣla + initial unstable hamza
{a="'l%-(\")([uai])", b="ال%2ٱ"},
{a="'l%-([uai])", b="ال%1ا"},
@@ -549,12 +561,17 @@ trigraphseasy = { -- differences marked below with 'easy'
-- al- + lām (easy)
{a="^(a)l%-(l)", b="ا%1ل%2"},
{a="([%(%[%|%<%s%-o])(a)l%-(l)", b="%1ا%2ل%3"}, --p
- -- al- + solar consonant (easy)
- {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="ا%1ل%2"},
- {a="([%(%[%|%<%s%-o])(a)l%-([%_%^%.]?[tdrzsn])", b="%1ا%2ل%3"}, --p
- -- assim. art. + solar consonant (easy)
- {a="^(a)([%_%^%.]?[tdrzsn])%-", b="ا%1ل"},
- {a="([%(%[%|%<%s%-o])(a)([%_%^%.]?[tdrzsn])%-", b="%1ا%2ل"}, --p
+ -- al- + solar consonant (easy) ('c' and '^n' are additional characters)
+ {a="^(a)l%-(%^n)", b="ا%1ل%2"}, -- ^n is lunar
+ {a="([%(%[%|%<%s%-o])(a)l%-(%^n)", b="%1ا%2ل%3"}, -- ^n is lunar --p
+ {a="^(a)l%-([%_%^%.]?[tdrzsnc])", b="ا%1ل%2"},
+ {a="([%(%[%|%<%s%-o])(a)l%-([%_%^%.]?[tdrzsnc])", b="%1ا%2ل%3"}, --p
+ -- assim. art. + solar consonant (easy) ('c' and '^n' are
+ -- additional characters)
+ {a="^(a)(%^n)%-", b="ا%1ل"}, -- ^n is lunar
+ {a="([%(%[%|%<%s%-o])(a)(%^n)%-", b="%1ا%2ل"}, -- ^n is lunar --p
+ {a="^(a)([%_%^%.]?[tdrzsnc])%-", b="ا%1ل"},
+ {a="([%(%[%|%<%s%-o])(a)([%_%^%.]?[tdrzsnc])%-", b="%1ا%2ل"}, --p
-- al- + initial unstable hamza
{a="^(a)l%-(\")([uai])", b="ا%1ل%3ٱ"},
{a="([%(%[%|%<%s%-o])(a)l%-(\")([uai])", b="%1ا%2ل%4ٱ"}, --p
@@ -576,15 +593,23 @@ trigraphseasy = { -- differences marked below with 'easy'
-- art. with waṣla + lām (easy)
{a="'l%-(l)", b="ال%1"},
-- art. with waṣla + solar consonant (easy)
- {a="'l%-([%_%^%.]?[tdrzsn])", b="ال%1"},
+ -- ('c' and '^n' are additional characters)
+ {a="'l%-(%^n)", b="ال%1"}, -- ^n is lunar
+ {a="'l%-([%_%^%.]?[tdrzsnc])", b="ال%1"},
-- li-/la- + art. + lām (easy)
{a="l([ai])%-l%-(l)", b="ل%1%2"},
-- assim. art. with waṣla + solar consonant (easy)
- {a="'([%_%^%.]?[tdrzsn])%-", b="ال"},
+ -- ('c' and '^n' are additional characters)
+ {a="'(%^n)%-", b="ال"}, -- ^n is lunar
+ {a="'([%_%^%.]?[tdrzsnc])%-", b="ال"},
-- li-/la- + art. + solar consonant is a special orthography (easy)
- {a="l([ai])%-l%-([%_%^%.]?[tdrzsn])", b="ل%1ل%2"},
+ -- ('c' and '^n' are additional characters)
+ {a="l([ai])%-l%-(%^n)", b="ل%1ل%2"}, -- ^n is lunar
+ {a="l([ai])%-l%-([%_%^%.]?[tdrzsnc])", b="ل%1ل%2"},
-- li-/la + assim. art. + solar consonant is a special orthography (easy)
- {a="l([ai])%-([%_%^%.]?[tdrzsn])%-([%_%^%.]?[tdrzsn])", b="ل%1ل%3"},
+ -- ('c' and '^n' are additional characters)
+ {a="l([ai])%-(%^n)%-(%^n)", b="ل%1ل%3"}, -- ^n is lunar
+ {a="l([ai])%-([%_%^%.]?[tdrzsnc])%-([%_%^%.]?[tdrzsnc])", b="ل%1ل%3"},
-- art. with waṣla + initial unstable hamza
{a="'l%-(\")([uai])", b="ال%2ٱ"},
{a="'l%-([uai])", b="ال%1ا"},
@@ -640,6 +665,8 @@ digraphs = {
{a="bb", b="بّ"},
{a="BB", b="ـّ"},
{a="([%_%^%.])([tghdsz])([tghdsz])", b="%1%2|%3"},
+ -- same as above for additional characters:
+ {a="([%_%^%.])([cn])([cn])", b="%1%2|%3"},
{a="tt", b="تّ"},
{a="%_t%_t", b="ثّ"},
{a="jj", b="جّ"},
@@ -668,6 +695,14 @@ digraphs = {
{a="hh", b="هّ"},
{a="ww", b="وّ"},
{a="yy", b="يّ"},
+ -- additional characters + šaddah (begin)
+ {a="pp", b="پّ"},
+ {a="vv", b="ڤّ"},
+ {a="gg", b="گّ"},
+ {a="%^c%^c", b="چّ"},
+ {a="%^z%^z", b="ژّ"},
+ {a="%^n%^n", b="ڭّ"},
+ -- additional characters + šaddah (end)
{a="_t", b="ث"},
{a="%^g", b="ج"},
{a="%.h", b="ح"},
@@ -679,6 +714,11 @@ digraphs = {
{a="%.t", b="ط"},
{a="%.z", b="ظ"},
{a="%.g", b="غ"},
+ -- additional characters (begin)
+ {a="%^c", b="چ"},
+ {a="%^z", b="ژ"},
+ {a="%^n", b="ڭ"},
+ -- additional characters (end)
{a="(U)(A)", b="%1ا"},
{a="WA", b="وا"},
{a="(a)W\"", b="%1وْا"},
@@ -716,6 +756,11 @@ single = {
{a="w", b="و"},
{a="y", b="ي"},
{a="T", b="ة"},
+ -- additional characters (begin)
+ {a="p", b="پ"},
+ {a="v", b="ڤ"},
+ {a="g", b="گ"},
+ -- additional characters (end)
{a="\"$", b="ْ"},
{a="\"(%W)", b="ْ%1"},
{a="\"([^uaiUAI])", b="ْ%1"},