From 3b64a5f55fe9d0bfab8d85b52ceb282204cb7c06 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 8 Jan 2017 22:22:03 +0000 Subject: arabluatex (8jan17) git-svn-id: svn://tug.org/texlive/trunk@42904 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/lualatex/arabluatex/README.tex | 2 +- .../source/lualatex/arabluatex/arabluatex.dtx | 105 +++++++++++---------- .../source/lualatex/arabluatex/arabluatex.ins | 4 +- 3 files changed, 59 insertions(+), 52 deletions(-) (limited to 'Master/texmf-dist/source/lualatex') 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 @@ -27,7 +27,7 @@ %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\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] % % %<*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 @@ -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 @@ -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 -- cgit v1.2.3