summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-01-08 22:22:03 +0000
committerKarl Berry <karl@freefriends.org>2017-01-08 22:22:03 +0000
commit3b64a5f55fe9d0bfab8d85b52ceb282204cb7c06 (patch)
tree6e2034ad846a21db87691df03cfc2f18a13c8f36 /Master
parent43176833ef1c95a19d7198d8e63751badc665b74 (diff)
arabluatex (8jan17)
git-svn-id: svn://tug.org/texlive/trunk@42904 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdfbin424809 -> 425532 bytes
-rw-r--r--Master/texmf-dist/source/lualatex/arabluatex/README.tex2
-rw-r--r--Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx105
-rw-r--r--Master/texmf-dist/source/lualatex/arabluatex/arabluatex.ins4
-rw-r--r--Master/texmf-dist/tex/lualatex/arabluatex/arabluatex-patch.sty2
-rw-r--r--Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua2
-rw-r--r--Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty4
-rw-r--r--Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_fullvoc.lua172
-rw-r--r--Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_novoc.lua14
-rw-r--r--Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_trans.lua34
-rw-r--r--Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua134
11 files changed, 244 insertions, 229 deletions
diff --git a/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf b/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf
index 1552f8b1213..1155f97d9bc 100644
--- a/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf
+++ b/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/lualatex/arabluatex/README.tex b/Master/texmf-dist/source/lualatex/arabluatex/README.tex
index 2ee1c501799..65d1518be49 100644
--- a/Master/texmf-dist/source/lualatex/arabluatex/README.tex
+++ b/Master/texmf-dist/source/lualatex/arabluatex/README.tex
@@ -34,7 +34,7 @@ searched, analyzed and correlated in various ways.
\section*{License and disclamer}
ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright ⓒ 2016 Robert Alessi
+Copyright ⓒ 2016--2017 Robert Alessi
Please send error reports and suggestions for improvements to Robert
Alessi:
diff --git a/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx b/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx
index 22d17fa2314..85fe9036b79 100644
--- a/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx
+++ b/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
% ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-% Copyright (C) 2016 Robert Alessi
+% Copyright (C) 2016--2017 Robert Alessi
%
% Please send error reports and suggestions for improvements to Robert
% Alessi <alessi@robertalessi.net>
@@ -27,7 +27,7 @@
%<package-info>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package-info>\ProvidesPackage{arabluatex}
%<*package-info>
- [2016/12/24 v1.7 An ArabTeX-like interface for LuaLaTeX]
+ [2017/01/08 v1.7.1 An ArabTeX-like interface for LuaLaTeX]
%</package-info>
%
%<*driver>
@@ -37,7 +37,7 @@
% This file is part of the `arabluatex' package
%
% ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-% Copyright (C) 2016 Robert Alessi
+% Copyright (C) 2016--2017 Robert Alessi
%
% Please send error reports and suggestions for improvements to Robert
% Alessi <alessi@robertalessi.net>
@@ -145,7 +145,7 @@
\defaultfontfeatures{RawFeature={+liga}}
\setmainfont{Old Standard}[SmallCapsFont={Latin Modern Roman Caps},
RawFeature={+mark;+ccmp;+ss05;+ss06}]
-\usepackage{arabluatex}[2016/12/24]
+\usepackage{arabluatex}[2017/01/08]
\usepackage[nopar]{quran}
\usepackage{varioref}
\usepackage{hypdoc}
@@ -276,7 +276,7 @@
% \end{abstract}
%
% \section*{License and disclamer}
-% Copyright \textcopyright\ 2016 Robert Alessi
+% Copyright \textcopyright\ 2016--2017 Robert Alessi
%
% \addcontentsline{toc}{section}{License and disclamer} Please send
% error reports and suggestions for improvements to Robert Alessi:
@@ -1019,7 +1019,9 @@ vowels (see §~3).
%
% \arb[trans]{hamzaT} followed by the long vowel \arb[novoc]{I} is
% encoded |'_I|: |'_ImAnuN| \arb[voc]{'_ImAnuN}
-% \arb[trans]{'_ImA\-nuN}.
+% \arb[trans]{'_ImA\-nuN}\footnote{For another way of encoding the
+% initial \arb[trans]{hamzaT} followed by a long vowel, see the
+% \arb[trans]{ta_hfIf-u 'l-hamzaT-i}\vpageref{ref:taxfif-hamzah}.}.
%
% \textbf{Middle \arb[trans]{hamzaT}}: |xA.ti'-Ina|
% \arb[voc]{xA.ti'-Ina} \arb[trans]{xA.ti'-Ina}, |ru'UsuN|
@@ -1032,9 +1034,11 @@ vowels (see §~3).
% \arb[voc]{yatasA'alUna}\linebreak \arb[trans]{yatasA'alUna},
% |murU'aTuN| \arb[voc]{murU'aTuN} \arb[trans]{murU'aTuN},
% |ta'xIruN| \arb[fullvoc]{ta'xIruN} \arb[trans]{ta'xIruN},
-% |ta'axxara| \arb[voc]{ta'axxara} \arb[trans]{ta'axxara},
-% |ji'tu-ka| \arb[voc]{ji'tu-ka} \arb[trans]{ji'tu-ka}, |qA'iluN|
-% \arb[voc]{qA'iluN} \arb[trans]{qA'iluN}.
+% |ta'ax|\allowbreak|xara| \arb[voc]{ta'axxara}
+% \arb[trans]{ta'axxara}, |ji'tu-ka| \arb[voc]{ji'tu-ka}
+% \arb[trans]{ji'tu-ka}, |qA'iluN| \arb[voc]{qA'iluN}
+% \arb[trans]{qA'iluN}, |.hIna'i_diN| \arb[trans]{.hIna'i_diN}
+% \arb[voc]{.hIna'i_diN}.
%
% From \textcite[i. 14 B]{Wright}:--- All consonants, whatsoever,
% not even \arb[trans]{'alif} \emph{hèmzatum} excepted, admit of
@@ -1061,7 +1065,8 @@ vowels (see §~3).
% \arb[trans]{radI'iN}, |sU'uN| \arb[voc]{sU'uN} \arb[trans]{sU'uN},
% |.daw'uN| \arb[voc]{.daw'uN} \arb[trans]{.daw'uN}, |qay'iN|
% \arb[voc]{qay'iN} \arb[trans]{qay'iN}, |^sifA'I|
-% \arb[voc]{^sifA'I} \arb[trans]{^sifA'I}.
+% \arb[voc]{^sifA'I} \arb[trans]{^sifA'I}, |man^sa'I|
+% \arb[trans]{man^sa'I} \arb[voc]{man^sa'I}.
%
% |^say'uN| \arb[voc]{^say'uN} \arb[trans]{^say'uN}, |^say'aN|
% \arb[voc]{^say'aN} \arb[trans]{^say'aN}, |^say'iN|
@@ -1071,6 +1076,7 @@ vowels (see §~3).
% \arb[voc]{'a^syA'-a} \arb[trans]{'a^syA'-a}, |.zim'aN|
% \arb[voc]{.zim'aN} \arb[trans]{.zim'aN}.
%
+% \label{ref:taxfif-hamzah}
% \textbf{\arb[trans]{ta_hfIf-u 'l-hamzaT-i}}: if the
% \arb[trans]{hamzaT} has \arb[trans]{jazmaT} and is preceded by
% \emph{\arb[trans]{'alif} hamzatum}, it must be changed into the
@@ -1234,12 +1240,12 @@ vowels (see §~3).
% \end{compactenum}
% \begin{quote}
% \textbf{Article}: |bAb-u| |'l-madrasaT-i| \arb[fullvoc]{bAb-u
-% 'l-madrasaT-i} \arb[trans]{bAb-u 'l-madrasaT-i}, |al-maqAlaT-u|
-% |'l-'_Ul_A| \arb[fullvoc]{al-maqAlaT-u 'l-'_Ul_A}
-% \arb[trans]{al-maqAlaT-u 'l-'_Ul_A}, |al-lu.gaT-u|
-% |'l-`arabiyyaT-u| \arb[fullvoc]{al-lu.gaT-u 'l-`arabiyyaT-u}
-% \arb[trans]{al-lu.gaT-u 'l-`arabiyyaT-u}, |fI| |.sinA`aT-i|
-% |'l-.tibb-i| \arb[fullvoc]{fI .sinA`aT-i 'l-.tibb-i}
+% 'l-madrasaT-i} \arb[trans]{bAb-u 'l-madrasaT-i},
+% |al-maqA|\allowbreak|laT-u| |'l-'_Ul_A| \arb[fullvoc]{al-maqAlaT-u
+% 'l-'_Ul_A} \arb[trans]{al-maqAlaT-u 'l-'_Ul_A}, |al-lu.gaT-u|
+% |'l-`ara|\allowbreak|biyyaT-u| \arb[fullvoc]{al-lu.gaT-u
+% 'l-`arabiyyaT-u} \arb[trans]{al-lu.gaT-u 'l-`arabiyyaT-u}, |fI|
+% |.sinA`aT-i| |'l-.tibb-i| \arb[fullvoc]{fI .sinA`aT-i 'l-.tibb-i}
% \arb[trans]{fI .sinA`aT-i 'l-.tibb-i}, |'il_A| |'l-intiqA.d-i|
% \arb[fullvoc]{'il_A 'l-intiqA.d-i} \arb[trans]{'il_A
% 'l-intiqA.d-i}, |fI| |'l-ibtidA'-i| \arb[fullvoc]{fI 'l-ibtidA'-i}
@@ -1263,10 +1269,10 @@ vowels (see §~3).
% particle \arb[fullvoc]{la}: |la-l-.haqq-u|
% \arb[fullvoc]{la-l-.haqq-u} \arb[trans]{la-l-.haqq-u}.
% \item With the other particles, \arb[trans]{'alif-u 'l-wa.sl-i} is
-% expressed: |fI| |'l-madInaT-i| \arb[fullvoc]{fI 'l-madInaT-i}
-% \arb[trans]{fI 'l-madInaT-i}, |wa-'l-rajul-u|
+% expressed: |fI| |'l-madIna|\allowbreak|T-i| \arb[fullvoc]{fI
+% 'l-madInaT-i} \arb[trans]{fI 'l-madInaT-i}, |wa-'l-rajul-u|
% \arb[fullvoc]{wa-'l-rajul-u} \arb[trans]{wa-'l-rajul-u},
-% |bi-'l-qalam-i| \arb[fullvoc]{bi-'l-qalam-i}
+% |bi-'l-|\allowbreak|qalam-i| \arb[fullvoc]{bi-'l-qalam-i}
% \arb[trans]{bi-'l-qalam-i}, |bi-'l-ru`b-i|
% \arb[fullvoc]{bi-'l-ru`b-i} \arb[trans]{bi-'l-ru`b-i}.
% \end{compactenum}
@@ -1279,9 +1285,9 @@ vowels (see §~3).
% \arb[trans]{wa-ustu`mila}, |qad-i| |in.sarafa| \arb[fullvoc]{qadi
% in.sarafa} \arb[trans]{qadi in.sarafa}, |al-iqtidAr-u|
% \arb[fullvoc]{al-iqtidAr-u} \arb[trans]{al-iqtidAr-u}, |'il_A|
-% |'l-intiqA.d-i| \arb[fullvoc]{'il_A 'l-intiqA.d-i}
-% \arb[trans]{'il_A 'l-intiqA.d-i}, |lawi| |istaqbala|
-% \arb[fullvoc]{lawi istaqbala} \arb[trans]{lawi istaqbala}.
+% |'l-inti|\allowbreak|qA.d-i| \arb[fullvoc]{'il_A 'l-intiqA.d-i}
+% \arb[trans]{'il_A 'l-intiqA.d-i}, |law| |istaqbala|
+% \arb[fullvoc]{law istaqbala} \arb[trans]{law istaqbala}.
%
% \textbf{Other cases}: |'awi| |ismu-hu| \arb[fullvoc]{'awi ismu-hu}
% \arb[trans]{'awi ismu-hu}, |zayduN| |ibn-u| |`amriNU|
@@ -1327,15 +1333,16 @@ vowels (see §~3).
% this rule applies:---
% \begin{quote}
% |fI| |`aynay| |'l-malik-i| \arb[fullvoc]{fI `aynay 'l-malik-i}
-% \arb[trans]{fI `aynay 'l-malik-i}, |ix^say| |'l-qawm-a|
-% \arb[fullvoc]{ix^say 'l-qawm-a} \arb[trans]{ix^say 'l-qawm-a},
-% |mu.s.tafaw| |'l-l_ah-i| \arb[fullvoc]{mu.s.tafaw 'l-l_ah-i}
-% \arb[trans]{mu.s.tafaw 'l-l_ah-i}.
+% \arb[trans]{fI `aynay 'l-malik-i}, |ix^say|
+% |'l-qaw|\allowbreak|m-a| \arb[fullvoc]{ix^say 'l-qawm-a}
+% \arb[trans]{ix^say 'l-qawm-a}, |mu.s.tafaw| |'l-l_ah-i|
+% \arb[fullvoc]{mu.s.tafaw 'l-l_ah-i} \arb[trans]{mu.s.ta\-faw
+% 'l-l_ah-i}.
%
% |ramaW| |'l-.hijAraT-a| \arb[fullvoc]{ramaW 'l-.hijAraT-a}
-% \arb[trans]{ramaW 'l-.hijAraT-a}, |fa-lammA| |ra'aW | |'l-najm-a|
-% \arb[fullvoc]{fa-lammA ra'aW 'l-najm-a} \arb[trans]{fa-lammA ra'aW
-% 'l-najm-a}.
+% \arb[trans]{ramaW 'l-.hijAraT-a}, |fa-lammA| |ra'aW |\allowbreak{}
+% |'l-najm-a| \arb[fullvoc]{fa-lammA ra'aW 'l-najm-a}
+% \arb[trans]{fa-lammA ra'aW 'l-najm-a}.
% \end{quote}
%
% \subparagraph{\arb[trans]{'alif-u 'l-wa.sl-i} preceded by a consonant
@@ -1396,17 +1403,17 @@ vowels (see §~3).
% \enquote{pipe} and \vref{sec:transliteration} on |dmg| mode.}
% |al-l_ah-u| \arb[fullvoc]{yA| al-l_ah-u} \arb[trans]{yA|
% al-l_ah-u}, \verb+'a-fa|+\footnote{\label{fn:pipe-allah-02}See
-% \cref{fn:pipe-allah-01}.}|-al-l_ah-i| |la-ta.g`alanna|
-% \arb[fullvoc]{'a-fa|-al-l_ah-i la-ta.g`alanna}
-% \arb[trans]{'a-fa|-al-l_ah-i la-ta.g`alanna}, |bi-'l-l_ah-i|
-% \arb[fullvoc]{bi-'l-l_ah-i} \arb[trans]{bi-'l-l_ah-i},
-% |wa-'l-l_ah-i| \arb[fullvoc]{wa-'l-l_ah-i}
-% \arb[trans]{wa-'l-l_ah-i}, |bi-sm-i| |'l-l_ah-i|
-% \arb[fullvoc]{bi-sm-i 'l-l_ah-i} \arb[trans]{bi-sm-i 'l-l_ah-i},
-% |al-.hamd-u| |li-l-l_ah-i| \arb[fullvoc]{al-.hamd-u li-l-l_ah-i}
-% \arb[trans]{al-.hamd-u li-l-l_ah-i}, |li-l-l_ah-i| |'l-qA'il-u|
-% \arb[fullvoc]{li-l-l_ah-i 'l-qA'il-u} \arb[trans]{li-l-l_ah-i
-% 'l-qA'il-u}.
+% \cref{fn:pipe-allah-01}.}|-al-|\allowbreak|l_ah-i|
+% |la-ta.g`alanna| \arb[fullvoc]{'a-fa|-al-l_ah-i la-ta.g`alanna}
+% \arb[trans]{'a-fa|-al-l_ah-i la-ta.g`alanna},
+% |bi-'l-|\allowbreak|l_ah-i| \arb[fullvoc]{bi-'l-l_ah-i}
+% \arb[trans]{bi-'l-l_ah-i}, |wa-'l-l_ah-i|
+% \arb[fullvoc]{wa-'l-l_ah-i} \arb[trans]{wa-'l-l_ah-i}, |bi-sm-i|
+% |'l-l_ah-i| \arb[fullvoc]{bi-sm-i 'l-l_ah-i} \arb[trans]{bi-sm-i
+% 'l-l_ah-i}, |al-.hamd-u| |li-l-l_ah-i| \arb[fullvoc]{al-.hamd-u
+% li-l-l_ah-i} \arb[trans]{al-.hamd-u li-l-l_ah-i}, |li-l-l_ah-i|
+% |'l-qA'il-u| \arb[fullvoc]{li-l-l_ah-i 'l-qA'il-u}
+% \arb[trans]{li-l-l_ah-i 'l-qA'il-u}.
% \end{quote}
%
% \paragraph{The conjunctive \arb[voc]{alla_dI}}
@@ -1552,9 +1559,9 @@ vowels (see §~3).
% \begin{quote}
% |fI "istisqA'-a| \arb[voc]{fI "istisqA'-a} \arb[trans]{fI
% "istisqA'-a}, |wa-"istisqA'-u| \arb[voc]{wa-"istisqA'-u}
-% \arb[trans]{wa-"istisqA'-u}, |qAla| |"uhrub| |fa-lan| |tuqtala|
-% \arb[voc]{qAla "uhrub fa-lan tuqtala} \arb[trans]{qAla "uhrub
-% fa-lan tuqtala}.
+% \arb[trans]{wa-"is\-tisqA'-u}, |qAla| |"uhrub| |fa-lan|
+% |tuqtala| \arb[voc]{qAla "uhrub fa-lan tuqtala} \arb[trans]{qAla
+% "uhrub fa-lan tuqtala}.
% \end{quote}
% \item \arb[trans]{sukUn}:---
% \begin{quote}
@@ -2258,11 +2265,11 @@ word that \cs{arbnull} is applied to.
% |\cap{`u_tm_an-u}| \arb[voc]{\cap{`u_tm_an-u}}
% \arb[trans]{\cap{`u_tm_an-u}}, |.daraba| |\cap{zayd-u}| |bn-u|
% |\cap{_h_alidiN}| |\cap{sa`d-a}| |bn-a| |\cap{`awf-i}| |bn-i|
-% |\cap{`abd-i}| |\cap{'l-l_ah-i}| \arb[fullvoc]{.daraba
-% \cap{zayd-u} bn-u \cap{_h_alidiN} \cap{sa`d-a} bn-a \cap{`awf-i}
-% bn-i \cap{`abd-i} \cap{'l-l_ah-i}} \arb[trans]{.daraba
-% \cap{zayd-u} bn-u \cap{_h_alidiN} \cap{sa`d-a} bn-a \cap{`awf-i}
-% bn-i \cap{`abd-i} \cap{'l-l_ah-i}}.
+% |\cap{|\allowbreak|`abd-i}| |\cap{'l-l_ah-i}|
+% \arb[fullvoc]{.daraba \cap{zayd-u} bn-u \cap{_h_alidiN}
+% \cap{sa`d-a} bn-a \cap{`awf-i} bn-i \cap{`abd-i} \cap{'l-l_ah-i}}
+% \arb[trans]{.daraba \cap{zayd-u} bn-u \cap{_h_alidiN} \cap{sa`d-a}
+% bn-a \cap{`awf-i} bn-i \cap{`abd-i} \cap{'l-l_ah-i}}.
% \end{quote}
% However, \cs{cap} must be used cautiously in some very particular
% cases, for the closing brace of its argument may prevent a rule from
@@ -3009,7 +3016,7 @@ wa-ya.sIru ta.hta 'l-jild-i
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{arabluatex}%
-[2016/12/24 v1.7 An ArabTeX-like interface for LuaLaTeX]
+[2017/01/08 v1.7.1 An ArabTeX-like interface for LuaLaTeX]
\RequirePackage{ifluatex}
% \end{macrocode}
% \package{arabluatex} requires \LuaLaTeX\ of course. Issue a warning
diff --git a/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.ins b/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.ins
index 5cf1bad48f2..ea362861ddd 100644
--- a/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.ins
+++ b/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.ins
@@ -1,7 +1,7 @@
%% This file is part of the `arabluatex' package
%%
%% ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-%% Copyright (C) 2016 Robert Alessi
+%% Copyright (C) 2016--2017 Robert Alessi
%%
%% Please send error reports and suggestions for improvements to
%% Robert Alessi <alessi@robertalessi.net>
@@ -43,7 +43,7 @@ This is a generated file.
This file is part of the `arabluatex' package
ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright (C) 2016 Robert Alessi
+Copyright (C) 2016--2017 Robert Alessi
Please send error reports and suggestions for improvements to Robert
Alessi <alessi@robertalessi.net>
diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex-patch.sty b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex-patch.sty
index 68f05a3b05a..410924e409c 100644
--- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex-patch.sty
+++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex-patch.sty
@@ -11,7 +11,7 @@
%% This file is part of the `arabluatex' package
%%
%% ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-%% Copyright (C) 2016 Robert Alessi
+%% Copyright (C) 2016--2017 Robert Alessi
%%
%% Please send error reports and suggestions for improvements to Robert
%% Alessi <alessi@robertalessi.net>
diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua
index 3b552b6749e..91932b78213 100644
--- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua
+++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua
@@ -2,7 +2,7 @@
This file is part of the `arabluatex' package
ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright (C) 2016 Robert Alessi
+Copyright (C) 2016--2017 Robert Alessi
Please send error reports and suggestions for improvements to Robert
Alessi <alessi@robertalessi.net>
diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty
index cc194e834cf..1a8666ba9cf 100644
--- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty
+++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty
@@ -11,7 +11,7 @@
%% This file is part of the `arabluatex' package
%%
%% ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-%% Copyright (C) 2016 Robert Alessi
+%% Copyright (C) 2016--2017 Robert Alessi
%%
%% Please send error reports and suggestions for improvements to Robert
%% Alessi <alessi@robertalessi.net>
@@ -41,7 +41,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{arabluatex}%
-[2016/12/24 v1.7 An ArabTeX-like interface for LuaLaTeX]
+[2017/01/08 v1.7.1 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 31956a65db5..097aa5deb31 100644
--- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_fullvoc.lua
+++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_fullvoc.lua
@@ -2,7 +2,7 @@
This file is part of the `arabluatex' package
ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright (C) 2016 Robert Alessi
+Copyright (C) 2016--2017 Robert Alessi
Please send error reports and suggestions for improvements to Robert
Alessi <alessi@robertalessi.net>
@@ -33,14 +33,14 @@ hamzafv = {
{a="i\"'", b="إ"},
{a="y\"'", b="ئ"},
{a="ؤ([^uaiUAI])", b="ؤْ%1"},
- {a="ؤ$", b="ؤْ"},
- {a="ؤ(%s)", b="ؤْ%1"},
+ {a="ؤ(%p?)$", b="ؤْ%1"},
+ {a="ؤ(%p?%s)", b="ؤْ%1"},
{a="أ([^uaiUAI])", b="أْ%1"},
- {a="أ$", b="أْ"},
- {a="أ(%s)", b="أْ%1"},
+ {a="أ(%p?)$", b="أْ%1"},
+ {a="أ(%p?%s)", b="أْ%1"},
{a="ئ([^uaiUAI])", b="ئْ%1"},
- {a="ئ$", b="ئْ"},
- {a="ئ(%s)", 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"},
@@ -58,10 +58,10 @@ hamzafv = {
{a="([^uiUI])\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="%1آ%2"},
{a="^\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="آ%1"},
{a="(%W)\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="%1آ%2"},
- {a="(A)(')(uN?)$", b="aآء%3"},
- {a="(A)(')(uN?)(%W)", b="aآء%3%4"},
- {a="(A)(')(iN?)$", b="aآء%3"},
- {a="(A)(')(iN?)(%W)", b="aآء%3%4"},
+ {a="(A)(')(uN?%p?)$", b="aآء%3"},
+ {a="(A)(')(uN?)(%p?%s)", b="aآء%3%4"},
+ {a="(A)(')(iN?%p?)$", b="aآء%3"},
+ {a="(A)(')(iN?)(%p?%s)", b="aآء%3%4"},
{a="(A)(')([iI])", b="aآئ%3"}, -- historic madda
{a="(A)(')(u)", b="aآؤ%3"}, -- historic madda
{a="(A)(')", b="aآء"}, -- historic madda
@@ -84,31 +84,33 @@ hamzafv = {
-- ^say'aN and .zim'aN are special orthographies
{a="(%^say)(%')(aN)", b="%1ئ%3"},
{a="(.zi?m)(%')(aN)", b="%1ئ%3"},
- {a="([^uai])(')([uai][^%.%^%_]N?)$", b="%1ء%3"},
- {a="([^uai])(')([uai][^%.%^%_]N?)(%W)", b="%1ء%3%4"},
+ {a="(')(I%p?)$", b="إ%2"}, -- affix pr. 1st person sg.
+ {a="(')(I)(%p?%s)", b="إ%2%3"}, -- affix pr. 1st person sg.
+ {a="([^uai])(')([uai]N?%p?)$", b="%1ء%3"},
+ {a="([^uai])(')([uai]N?)(%p?%s)", b="%1ء%3%4"},
-- u
- {a="(u)(')([uai][^%.%^%_]N?)$", b="%1ؤ%3"},
- {a="(u)(')([uai][^%.%^%_]N?)(%W)", b="%1ؤ%3%4"},
- {a="(u)(')$", b="%1ؤْ"},
- {a="(u)(')(%W)", b="%1ؤْ%3"},
+ {a="(u)(')([uai]N?%p?)$", b="%1ؤ%3"},
+ {a="(u)(')([uai]N?)(%p?%s)", b="%1ؤ%3%4"},
+ {a="(u)('%p?)$", b="%1ؤْ"},
+ {a="(u)(')(%p?%s)", b="%1ؤْ%3"},
-- a
- {a="(a)(')(A)$", b="%1آ"},
- {a="(a)(')(A)(%W)", b="%1آ%4"},
- {a="(a)(')([u][^%.%^%_]N?)$", b="%1أ%3"},
- {a="(a)(')([u][^%.%^%_]N?)(%W)", b="%1أ%3%4"},
- {a="(a)(')(a)$", b="%1أ%3"},
- {a="(a)(')(a)(%W)", b="%1أ%3%4"},
- {a="(a)(')(aN)$", b="%1أً"},
- {a="(a)(')(aN)(%W)", b="%1أً%4"},
- {a="(a)(')([i][^%.%^%_]N?)$", b="%1إ%3"},
- {a="(a)(')([i][^%.%^%_]N?)(%W)", b="%1إ%3%4"},
- {a="(a)(')$", b="%1أْ"},
- {a="(a)(')(%W)", b="%1أْ%3"},
+ {a="(a)(')(A%p?)$", b="%1آ"},
+ {a="(a)(')(A)(%p?%s)", b="%1آ%4"},
+ {a="(a)(')([u]N?%p?)$", b="%1أ%3"},
+ {a="(a)(')([u]N?)(%p?%s)", b="%1أ%3%4"},
+ {a="(a)(')(a%p?)$", b="%1أ%3"},
+ {a="(a)(')(a)(%p?%s)", b="%1أ%3%4"},
+ {a="(a)(')(aN%p?)$", b="%1أً"},
+ {a="(a)(')(aN)(%p?%s)", b="%1أً%4"},
+ {a="(a)(')([i]N?%p?)$", b="%1إ%3"},
+ {a="(a)(')([i]N?)(%p?%s)", b="%1إ%3%4"},
+ {a="(a)('%p?)$", b="%1أْ"},
+ {a="(a)(')(%p?%s)", b="%1أْ%3"},
-- i
- {a="(i)(')([uai][^%.%^%_]N?)$", b="%1ئ%3"},
- {a="(i)(')([uai][^%.%^%_]N?)(%W)", b="%1ئ%3%4"},
- {a="(i)(')$", b="%1ئْ"},
- {a="(i)(')(%W)", b="%1ئْ%3"},
+ {a="(i)(')([uai]N?%p?)$", b="%1ئ%3"},
+ {a="(i)(')([uai]N?)(%p?%s)", b="%1ئ%3%4"},
+ {a="(i)('%p?)$", b="%1ئْ"},
+ {a="(i)(')(%p?%s)", b="%1ئْ%3"},
--
-- middle
{a="(U)(')", b="%1ء"},
@@ -141,14 +143,14 @@ hamzafveasy = { -- differences marked below with 'easy'
{a="i\"'", b="إ"},
{a="y\"'", b="ئ"},
{a="ؤ([^uaiUAI])", b="ؤْ%1"},
- {a="ؤ$", b="ؤْ"},
- {a="ؤ(%s)", b="ؤْ%1"},
+ {a="ؤ(%p?)$", b="ؤْ%1"},
+ {a="ؤ(%p?%s)", b="ؤْ%1"},
{a="أ([^uaiUAI])", b="أْ%1"},
- {a="أ$", b="أْ"},
- {a="أ(%s)", b="أْ%1"},
+ {a="أ(%p?)$", b="أْ%1"},
+ {a="أ(%p?%s)", b="أْ%1"},
{a="ئ([^uaiUAI])", b="ئْ%1"},
- {a="ئ$", b="ئْ"},
- {a="ئ(%s)", 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"},
@@ -167,10 +169,10 @@ hamzafveasy = { -- differences marked below with 'easy'
{a="^\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="آ%1"},
{a="(%W)\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="%1آ%2"},
--easy (begin)
- {a="(A)(')(uN?)$", b="aاء%3"},
- {a="(A)(')(uN?)(%W)", b="aاء%3%4"},
- {a="(A)(')(iN?)$", b="aاء%3"},
- {a="(A)(')(iN?)(%W)", b="aاء%3%4"},
+ {a="(A)(')(uN?%p?)$", b="aاء%3"},
+ {a="(A)(')(uN?)(%p?%s)", b="aاء%3%4"},
+ {a="(A)(')(iN?%p?)$", b="aاء%3"},
+ {a="(A)(')(iN?)(%p?%s)", b="aاء%3%4"},
{a="(A)(')([iI])", b="aائ%3"}, -- historic madda
{a="(A)(')(u)", b="aاؤ%3"}, -- historic madda
{a="(A)(')", b="aاء"}, -- historic madda
@@ -194,31 +196,33 @@ hamzafveasy = { -- differences marked below with 'easy'
-- ^say'aN and .zim'aN are special orthographies
{a="(%^say)(%')(aN)", b="%1ئ%3"},
{a="(.zi?m)(%')(aN)", b="%1ئ%3"},
- {a="([^uai])(')([uai][^%.%^%_]N?)$", b="%1ء%3"},
- {a="([^uai])(')([uai][^%.%^%_]N?)(%W)", b="%1ء%3%4"},
+ {a="(')(I%p?)$", b="إ%2"}, -- affix pr. 1st person sg.
+ {a="(')(I)(%p?%s)", b="إ%2%3"}, -- affix pr. 1st person sg.
+ {a="([^uai])(')([uai]N?%p?)$", b="%1ء%3"},
+ {a="([^uai])(')([uai]N?)(%p?%s)", b="%1ء%3%4"},
-- u
- {a="(u)(')([uai][^%.%^%_]N?)$", b="%1ؤ%3"},
- {a="(u)(')([uai][^%.%^%_]N?)(%W)", b="%1ؤ%3%4"},
- {a="(u)(')$", b="%1ؤْ"},
- {a="(u)(')(%W)", b="%1ؤْ%3"},
+ {a="(u)(')([uai]N?%p?)$", b="%1ؤ%3"},
+ {a="(u)(')([uai]N?)(%p?%s)", b="%1ؤ%3%4"},
+ {a="(u)('%p?)$", b="%1ؤْ"},
+ {a="(u)(')(%p?%s)", b="%1ؤْ%3"},
-- a
- {a="(a)(')(A)$", b="%1آ"},
- {a="(a)(')(A)(%W)", b="%1آ%4"},
- {a="(a)(')([u][^%.%^%_]N?)$", b="%1أ%3"},
- {a="(a)(')([u][^%.%^%_]N?)(%W)", b="%1أ%3%4"},
- {a="(a)(')(a)$", b="%1أ%3"},
- {a="(a)(')(a)(%W)", b="%1أ%3%4"},
- {a="(a)(')(aN)$", b="%1أً"},
- {a="(a)(')(aN)(%W)", b="%1أً%4"},
- {a="(a)(')([i][^%.%^%_]N?)$", b="%1إ%3"},
- {a="(a)(')([i][^%.%^%_]N?)(%W)", b="%1إ%3%4"},
- {a="(a)(')$", b="%1أْ"},
- {a="(a)(')(%W)", b="%1أْ%3"},
+ {a="(a)(')(A%p?)$", b="%1آ"},
+ {a="(a)(')(A)(%p?%s)", b="%1آ%4"},
+ {a="(a)(')([u]N?%p?)$", b="%1أ%3"},
+ {a="(a)(')([u]N?)(%p?%s)", b="%1أ%3%4"},
+ {a="(a)(')(a%p?)$", b="%1أ%3"},
+ {a="(a)(')(a)(%p?%s)", b="%1أ%3%4"},
+ {a="(a)(')(aN%p?)$", b="%1أً"},
+ {a="(a)(')(aN)(%p?%s)", b="%1أً%4"},
+ {a="(a)(')([i]N?%p?)$", b="%1إ%3"},
+ {a="(a)(')([i]N?)(%p?%s)", b="%1إ%3%4"},
+ {a="(a)('%p?)$", b="%1أْ"},
+ {a="(a)(')(%p?%s)", b="%1أْ%3"},
-- i
- {a="(i)(')([uai][^%.%^%_]N?)$", b="%1ئ%3"},
- {a="(i)(')([uai][^%.%^%_]N?)(%W)", b="%1ئ%3%4"},
- {a="(i)(')$", b="%1ئْ"},
- {a="(i)(')(%W)", b="%1ئْ%3"},
+ {a="(i)(')([uai]N?%p?)$", b="%1ئ%3"},
+ {a="(i)(')([uai]N?)(%p?%s)", b="%1ئ%3%4"},
+ {a="(i)('%p?)$", b="%1ئْ"},
+ {a="(i)(')(%p?%s)", b="%1ئْ%3"},
--
-- middle
{a="(U)(')", b="%1ء"},
@@ -388,12 +392,12 @@ trigraphsfv = { -- trigraphs or more
-- art. with waṣla + lunar consonant (i.e. what remains)
{a="'l%-", b="ٱلْ"},
-- the silent wāw
- {a="uU$", b="uو"},
- {a="uU(%W)", b="uو%1"},
- {a="aU$", b="aو"},
- {a="aU(%W)", b="aو%1"},
- {a="iU$", b="iو"},
- {a="iU(%W)", b="iو%1"},
+ {a="uU(%p?)$", b="uو%1"},
+ {a="uU(%p?%s)", b="uو%1"},
+ {a="aU(%p?)$", b="aو%1"},
+ {a="aU(%p?%s)", b="aو%1"},
+ {a="iU(%p?)$", b="iو%1"},
+ {a="iU(%p?%s)", b="iو%1"},
-- words ending in -āT with silent wāw/yāʾ
{a="(_a)UA", b="%1وا"},
{a="(_a)U", b="%1و"},
@@ -457,12 +461,12 @@ trigraphsfveasy = { -- trigraphs or more (see 'easy' tag below for the diffs)
-- art. with waṣla + lunar consonant (i.e. what remains)
{a="'l%-", b="ٱلْ"},
-- the silent wāw
- {a="uU$", b="uو"},
- {a="uU(%W)", b="uو%1"},
- {a="aU$", b="aو"},
- {a="aU(%W)", b="aو%1"},
- {a="iU$", b="iو"},
- {a="iU(%W)", b="iو%1"},
+ {a="uU(%p?)$", b="uو%1"},
+ {a="uU(%p?%s)", b="uو%1"},
+ {a="aU(%p?)$", b="aو%1"},
+ {a="aU(%p?%s)", b="aو%1"},
+ {a="iU(%p?)$", b="iو%1"},
+ {a="iU(%p?%s)", b="iو%1"},
-- words ending in -āT with silent wāw/yāʾ
{a="(_a)UA", b="%1وا"},
{a="(_a)U", b="%1و"},
@@ -538,8 +542,8 @@ digraphsfvidgham = {
-- sukūn begin
-- first, take out hyphen if any:
{a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])%-([uaiUAI])", b="%1%2"},
- {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])$", b="%1ْ"},
- {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])([%s])", b="%1ْ%2"},
+ {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy]%p?)$", b="%1ْ"},
+ {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])(%p?%s)", b="%1ْ%2"},
{a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])([%_]?[^%_uaiUAIYًٌٍ])", b="%1ْ%2"},
-- take out sukūn in cases of assimilation
{a="(n)(ْ)(%s)(ر)", b="%1%3%4"},
@@ -646,8 +650,8 @@ digraphsfv = {
-- sukūn begin
-- first, take out hyphen if any:
{a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])%-([uaiUAI])", b="%1%2"},
- {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])$", b="%1ْ"},
- {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])([%s])", b="%1ْ%2"},
+ {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy]%p?)$", b="%1ْ"},
+ {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])(%p?%s)", b="%1ْ%2"},
{a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])([%_]?[^%_uaiUAIYًٌٍ])", b="%1ْ%2"},
-- take out sukūn in cases of assimilation
-- {a="(n)(ْ)(%s)(ر)", b="%1%3%4"},
@@ -656,7 +660,7 @@ digraphsfv = {
-- {a="(n)(ْ)(%s)(ل)", b="%1%3%4"},
-- {a="(n)(ْ)(%s)(م)", b="%1%3%4"},
-- {a="(n)(ْ)(%s)(ن)", b="%1%3%4"},
--- {a="ْ\"", b="\""},
+ {a="ْ\"", b="\""},
-- sukūn end
{a="_t", b="ث"},
{a="%^g", b="ج"},
@@ -757,8 +761,8 @@ digraphsfveasy = { -- see the differences under 'easy' marker below
{a="ْ", b=""},
-- first, take out hyphen if any:
-- {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])%-([uaiUAI])", b="%1%2"},
--- {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])$", b="%1ْ"},
--- {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])([%s])", b="%1ْ%2"},
+-- {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy]%p?)$", b="%1ْ"},
+-- {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])(%p?%s)", b="%1ْ%2"},
-- {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])([%_]?[^%_uaiUAIًٌٍ])", b="%1ْ%2"},
-- take out sukūn in cases of assimilation
-- {a="(n)(ْ)(%s)(ر)", b="%1%3%4"},
diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_novoc.lua b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_novoc.lua
index a79be821028..55eccdc4b88 100644
--- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_novoc.lua
+++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_novoc.lua
@@ -2,7 +2,7 @@
This file is part of the `arabluatex' package
ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright (C) 2016 Robert Alessi
+Copyright (C) 2016--2017 Robert Alessi
Please send error reports and suggestions for improvements to Robert
Alessi <alessi@robertalessi.net>
@@ -109,12 +109,12 @@ trigraphsnv = { -- trigraphs or more
-- art. with waṣla + lunar consonant (i.e. what remains)
{a="'l%-", b="ال"},
-- the silent wāw
- {a="uU$", b="uو"},
- {a="uU(%W)", b="uو%1"},
- {a="aU$", b="aو"},
- {a="aU(%W)", b="aو%1"},
- {a="iU$", b="iو"},
- {a="iU(%W)", b="iو%1"},
+ {a="uU(%p?)$", b="uو%1"},
+ {a="uU(%p?%s)", b="uو%1"},
+ {a="aU(%p?)$", b="aو%1"},
+ {a="aU(%p?%s)", b="aو%1"},
+ {a="iU(%p?)$", b="iو%1"},
+ {a="iU(%p?%s)", b="iو%1"},
-- words ending in -āT with silent wāw/yāʾ
{a="(_a)UA", b="%1وا"},
{a="(_a)U", 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 c420f6f62ee..5e7dbe5dda6 100644
--- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_trans.lua
+++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_trans.lua
@@ -2,7 +2,7 @@
This file is part of the `arabluatex' package
ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright (C) 2016 Robert Alessi
+Copyright (C) 2016--2017 Robert Alessi
Please send error reports and suggestions for improvements to Robert
Alessi <alessi@robertalessi.net>
@@ -309,24 +309,24 @@ digraphstrdmg = {
{a="(%-)(\"?ayni)(%p?)$", b="\\arbup{%2}%3"},
{a="(%-)(\"?[uai])(%p?%s)", b="\\arbup{%2}%3"},
{a="(%-)(\"?[uai])(%p?)$", b="\\arbup{%2}%3"},
- -- ʾiʿrāb hyphen (end)
- -- shorten long vowels preceding ʾalif conjunctionis
+ -- ʾiʿrāb hyphen (end) shorten long vowels preceding ʾalif
+ -- conjunctionis—without forgetting 'lla_dI
{a="(U)(A)", b="U"},
- {a="(aW)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-o)", b="awu"},
- {a="(%_a)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-o)", b="a"},
- {a="(%_A)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-o)", b="ạ"},
- {a="(A)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-o)", b="a"},
- {a="(Y)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-o)", b="ạ"},
- {a="([%_]?[Uu])(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-o)", b="u"},
- {a="([%_]?[Ii])(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-o)", b="i"},
+ {a="(aW)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])([%S]-o)", b="awu"},
+ {a="(%_a)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])([%S]-o)", b="a"},
+ {a="(%_A)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])([%S]-o)", b="ạ"},
+ {a="(A)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])([%S]-o)", b="a"},
+ {a="(Y)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])([%S]-o)", b="ạ"},
+ {a="([%_]?[Uu])(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])([%S]-o)", b="u"},
+ {a="([%_]?[Ii])(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])([%S]-o)", b="i"},
--p (next 7 lines, just after %s)
- {a="(aW)(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="awu%2%3"},
- {a="(%_a)(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="a%2%3"},
- {a="(%_A)(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ%2%3"},
- {a="(A)(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="a%2%3"},
- {a="(Y)(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ%2%3"},
- {a="([%_]?[Uu])(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="u%2%3"},
- {a="([%_]?[Ii])(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="i%2%3"},
+ {a="(aW)(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])", b="awu%2%3"},
+ {a="(%_a)(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])", b="a%2%3"},
+ {a="(%_A)(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])", b="ạ%2%3"},
+ {a="(A)(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])", b="a%2%3"},
+ {a="(Y)(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])", b="ạ%2%3"},
+ {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="T([^uai])", b="%1"},
{a="T(%p?%s)", b="h%1"},
diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua
index 6be30d12f99..106bf9908b0 100644
--- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua
+++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua
@@ -2,7 +2,7 @@
This file is part of the `arabluatex' package
ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright (C) 2016 Robert Alessi
+Copyright (C) 2016--2017 Robert Alessi
Please send error reports and suggestions for improvements to Robert
Alessi <alessi@robertalessi.net>
@@ -194,10 +194,10 @@ hamza = {
{a="([^uiUI])\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="%1آ%2"},
{a="^\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="آ%1"},
{a="(%W)\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="%1آ%2"},
- {a="(A)(')(uN?)$", b="aآء%3"},
- {a="(A)(')(uN?)(%W)", b="aآء%3%4"},
- {a="(A)(')(iN?)$", b="aآء%3"},
- {a="(A)(')(iN?)(%W)", b="aآء%3%4"},
+ {a="(A)(')(uN?%p?)$", b="aآء%3"},
+ {a="(A)(')(uN?)(%p?%s)", b="aآء%3%4"},
+ {a="(A)(')(iN?%p?)$", b="aآء%3"},
+ {a="(A)(')(iN?)(%p?%s)", b="aآء%3%4"},
{a="(A)(')([iI])", b="aآئ%3"}, -- historic madda
{a="(A)(')(u)", b="aآؤ%3"}, -- historic madda
{a="(A)(')", b="aآء"}, -- historic madda
@@ -220,31 +220,33 @@ hamza = {
-- ^say'aN and .zim'aN are special orthographies
{a="(%^say)(%')(aN)", b="%1ئ%3"},
{a="(.zi?m)(%')(aN)", b="%1ئ%3"},
- {a="([^uai])(')([uai][^%.%^%_]N?)$", b="%1ء%3"},
- {a="([^uai])(')([uai][^%.%^%_]N?)(%W)", b="%1ء%3%4"},
+ {a="(')(I%p?)$", b="إ%2"}, -- affix pr. 1st person sg.
+ {a="(')(I)(%p?%s)", b="إ%2%3"}, -- affix pr. 1st person sg.
+ {a="([^uai])(')([uai]N?%p?)$", b="%1ء%3"},
+ {a="([^uai])(')([uai]N?)(%p?%s)", b="%1ء%3%4"},
-- u
- {a="(u)(')([uai][^%.%^%_]N?)$", b="%1ؤ%3"},
- {a="(u)(')([uai][^%.%^%_]N?)(%W)", b="%1ؤ%3%4"},
- {a="(u)(')$", b="%1ؤ"},
- {a="(u)(')(%W)", b="%1ؤ%3"},
+ {a="(u)(')([uai]N?%p?)$", b="%1ؤ%3"},
+ {a="(u)(')([uai]N?)(%p?%s)", b="%1ؤ%3%4"},
+ {a="(u)('%p?)$", b="%1ؤ"},
+ {a="(u)(')(%p?%s)", b="%1ؤ%3"},
-- a
- {a="(a)(')(A)$", b="%1آ"},
- {a="(a)(')(A)(%W)", b="%1آ%4"},
- {a="(a)(')([u][^%.%^%_]N?)$", b="%1أ%3"},
- {a="(a)(')([u][^%.%^%_]N?)(%W)", b="%1أ%3%4"},
- {a="(a)(')(a)$", b="%1أ%3"},
- {a="(a)(')(a)(%W)", b="%1أ%3%4"},
- {a="(a)(')(aN)$", b="%1أً"},
- {a="(a)(')(aN)(%W)", b="%1أً%4"},
- {a="(a)(')([i][^%.%^%_]N?)$", b="%1إ%3"},
- {a="(a)(')([i][^%.%^%_]N?)(%W)", b="%1إ%3%4"},
- {a="(a)(')$", b="%1أ"},
- {a="(a)(')(%W)", b="%1أ%3"},
+ {a="(a)(')(A%p?)$", b="%1آ"},
+ {a="(a)(')(A)(%p?%s)", b="%1آ%4"},
+ {a="(a)(')([u]N?%p?)$", b="%1أ%3"},
+ {a="(a)(')([u]N?)(%p?%s)", b="%1أ%3%4"},
+ {a="(a)(')(a%p?)$", b="%1أ%3"},
+ {a="(a)(')(a)(%p?%s)", b="%1أ%3%4"},
+ {a="(a)(')(aN%p?)$", b="%1أً"},
+ {a="(a)(')(aN)(%p?%s)", b="%1أً%4"},
+ {a="(a)(')([i]N?%p?)$", b="%1إ%3"},
+ {a="(a)(')([i]N?)(%p?%s)", b="%1إ%3%4"},
+ {a="(a)('%p?)$", b="%1أ"},
+ {a="(a)(')(%p?%s)", b="%1أ%3"},
-- i
- {a="(i)(')([uai][^%.%^%_]N?)$", b="%1ئ%3"},
- {a="(i)(')([uai][^%.%^%_]N?)(%W)", b="%1ئ%3%4"},
- {a="(i)(')$", b="%1ئ"},
- {a="(i)(')(%W)", b="%1ئ%3"},
+ {a="(i)(')([uai]N?%p?)$", b="%1ئ%3"},
+ {a="(i)(')([uai]N?)(%p?%s)", b="%1ئ%3%4"},
+ {a="(i)('%p?)$", b="%1ئ"},
+ {a="(i)(')(%p?%s)", b="%1ئ%3"},
--
-- middle
{a="(U)(')", b="%1ء"},
@@ -294,10 +296,10 @@ hamzaeasy = { -- differences marked below with 'easy'
{a="^\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="آ%1"},
{a="(%W)\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="%1آ%2"},
--easy (begin)
- {a="(A)(')(uN?)$", b="aاء%3"},
- {a="(A)(')(uN?)(%W)", b="aاء%3%4"},
- {a="(A)(')(iN?)$", b="aاء%3"},
- {a="(A)(')(iN?)(%W)", b="aاء%3%4"},
+ {a="(A)(')(uN?%p?)$", b="aاء%3"},
+ {a="(A)(')(uN?)(%p?%s)", b="aاء%3%4"},
+ {a="(A)(')(iN?%p?)$", b="aاء%3"},
+ {a="(A)(')(iN?)(%p?%s)", b="aاء%3%4"},
{a="(A)(')([iI])", b="aائ%3"}, -- historic madda
{a="(A)(')(u)", b="aاؤ%3"}, -- historic madda
{a="(A)(')", b="aاء"}, -- historic madda
@@ -321,31 +323,33 @@ hamzaeasy = { -- differences marked below with 'easy'
-- ^say'aN and .zim'aN are special orthographies
{a="(%^say)(%')(aN)", b="%1ئ%3"},
{a="(.zi?m)(%')(aN)", b="%1ئ%3"},
- {a="([^uai])(')([uai][^%.%^%_]N?)$", b="%1ء%3"},
- {a="([^uai])(')([uai][^%.%^%_]N?)(%W)", b="%1ء%3%4"},
+ {a="(')(I%p?)$", b="إ%2"}, -- affix pr. 1st person sg.
+ {a="(')(I)(%p?%s)", b="إ%2%3"}, -- affix pr. 1st person sg.
+ {a="([^uai])(')([uai]N?%p?)$", b="%1ء%3"},
+ {a="([^uai])(')([uai]N?)(%p?%s)", b="%1ء%3%4"},
-- u
- {a="(u)(')([uai][^%.%^%_]N?)$", b="%1ؤ%3"},
- {a="(u)(')([uai][^%.%^%_]N?)(%W)", b="%1ؤ%3%4"},
- {a="(u)(')$", b="%1ؤ"},
- {a="(u)(')(%W)", b="%1ؤ%3"},
+ {a="(u)(')([uai]N?%p?)$", b="%1ؤ%3"},
+ {a="(u)(')([uai]N?)(%p?%s)", b="%1ؤ%3%4"},
+ {a="(u)('%p?)$", b="%1ؤ"},
+ {a="(u)(')(%p?%s)", b="%1ؤ%3"},
-- a
- {a="(a)(')(A)$", b="%1آ"},
- {a="(a)(')(A)(%W)", b="%1آ%4"},
- {a="(a)(')([u][^%.%^%_]N?)$", b="%1أ%3"},
- {a="(a)(')([u][^%.%^%_]N?)(%W)", b="%1أ%3%4"},
- {a="(a)(')(a)$", b="%1أ%3"},
- {a="(a)(')(a)(%W)", b="%1أ%3%4"},
- {a="(a)(')(aN)$", b="%1أً"},
- {a="(a)(')(aN)(%W)", b="%1أً%4"},
- {a="(a)(')([i][^%.%^%_]N?)$", b="%1إ%3"},
- {a="(a)(')([i][^%.%^%_]N?)(%W)", b="%1إ%3%4"},
- {a="(a)(')$", b="%1أ"},
- {a="(a)(')(%W)", b="%1أ%3"},
+ {a="(a)(')(A%p?)$", b="%1آ"},
+ {a="(a)(')(A)(%p?%s)", b="%1آ%4"},
+ {a="(a)(')([u]N?%p?)$", b="%1أ%3"},
+ {a="(a)(')([u]N?)(%p?%s)", b="%1أ%3%4"},
+ {a="(a)(')(a%p?)$", b="%1أ%3"},
+ {a="(a)(')(a)(%p?%s)", b="%1أ%3%4"},
+ {a="(a)(')(aN%p?)$", b="%1أً"},
+ {a="(a)(')(aN)(%p?%s)", b="%1أً%4"},
+ {a="(a)(')([i]N?%p?)$", b="%1إ%3"},
+ {a="(a)(')([i]N?)(%p?%s)", b="%1إ%3%4"},
+ {a="(a)('%p?)$", b="%1أ"},
+ {a="(a)(')(%p?%s)", b="%1أ%3"},
-- i
- {a="(i)(')([uai][^%.%^%_]N?)$", b="%1ئ%3"},
- {a="(i)(')([uai][^%.%^%_]N?)(%W)", b="%1ئ%3%4"},
- {a="(i)(')$", b="%1ئ"},
- {a="(i)(')(%W)", b="%1ئ%3"},
+ {a="(i)(')([uai]N?%p?)$", b="%1ئ%3"},
+ {a="(i)(')([uai]N?)(%p?%s)", b="%1ئ%3%4"},
+ {a="(i)('%p?)$", b="%1ئ"},
+ {a="(i)(')(%p?%s)", b="%1ئ%3"},
--
-- middle
{a="(U)(')", b="%1ء"},
@@ -509,12 +513,12 @@ trigraphs = { -- trigraphs or more
-- art. with waṣla + lunar consonant (i.e. what remains)
{a="'l%-", b="ال"},
-- the silent wāw
- {a="uU$", b="uو"},
- {a="uU(%W)", b="uو%1"},
- {a="aU$", b="aو"},
- {a="aU(%W)", b="aو%1"},
- {a="iU$", b="iو"},
- {a="iU(%W)", b="iو%1"},
+ {a="uU(%p?)$", b="uو%1"},
+ {a="uU(%p?%s)", b="uو%1"},
+ {a="aU(%p?)$", b="aو%1"},
+ {a="aU(%p?%s)", b="aو%1"},
+ {a="iU(%p?)$", b="iو%1"},
+ {a="iU(%p?%s)", b="iو%1"},
-- words ending in -āT with silent wāw/yāʾ
{a="(_a)UA", b="%1وا"},
{a="(_a)U", b="%1و"},
@@ -587,12 +591,12 @@ trigraphseasy = { -- differences marked below with 'easy'
-- art. with waṣla + lunar consonant (i.e. what remains)
{a="'l%-", b="ال"},
-- the silent wāw
- {a="uU$", b="uو"},
- {a="uU(%W)", b="uو%1"},
- {a="aU$", b="aو"},
- {a="aU(%W)", b="aو%1"},
- {a="iU$", b="iو"},
- {a="iU(%W)", b="iو%1"},
+ {a="uU(%p?)$", b="uو%1"},
+ {a="uU(%p?%s)", b="uو%1"},
+ {a="aU(%p?)$", b="aو%1"},
+ {a="aU(%p?%s)", b="aو%1"},
+ {a="iU(%p?)$", b="iو%1"},
+ {a="iU(%p?%s)", b="iو%1"},
-- words ending in -āT with silent wāw/yāʾ
{a="(_a)UA", b="%1وا"},
{a="(_a)U", b="%1و"},