texlive[46217] Master/texmf-dist: arabluatex (4jan18)
commits+karl at tug.org
commits+karl at tug.org
Fri Jan 5 00:45:58 CET 2018
Revision: 46217
http://tug.org/svn/texlive?view=revision&revision=46217
Author: karl
Date: 2018-01-05 00:45:57 +0100 (Fri, 05 Jan 2018)
Log Message:
-----------
arabluatex (4jan18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.el
trunk/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf
trunk/Master/texmf-dist/doc/lualatex/arabluatex/samples/al-Jahiz.pdf
trunk/Master/texmf-dist/doc/lualatex/arabluatex/samples/al-Jahiz.tex
trunk/Master/texmf-dist/doc/lualatex/arabluatex/samples/template-01.pdf
trunk/Master/texmf-dist/doc/lualatex/arabluatex/samples/template-01.tex
trunk/Master/texmf-dist/source/lualatex/arabluatex/README.tex
trunk/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx
trunk/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.ins
trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex-patch.sty
trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua
trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty
trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_fullvoc.lua
trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_novoc.lua
trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_trans.lua
trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua
Modified: trunk/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.el
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.el 2018-01-04 23:45:44 UTC (rev 46216)
+++ trunk/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.el 2018-01-04 23:45:57 UTC (rev 46217)
@@ -2,7 +2,7 @@
;; This file is part of the `arabluatex' package
;; ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-;; Copyright (C) 2016--2017 Robert Alessi
+;; Copyright (C) 2016--2018 Robert Alessi
;; Please send error reports and suggestions for improvements to Robert
;; Alessi <alessi at robertalessi.net>
@@ -63,7 +63,8 @@
'("ArbUpDflt" 0)
'("NoArbUp" 0)
"SetArbUp"
- "cap"
+ "uc"
+ "prname"
"txarb"
'("arb" [ (TeX-arg-eval completing-read "Mode: "
LaTeX-arabluatex-mode-options) ]
Modified: trunk/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/lualatex/arabluatex/samples/al-Jahiz.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/lualatex/arabluatex/samples/al-Jahiz.tex
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/arabluatex/samples/al-Jahiz.tex 2018-01-04 23:45:44 UTC (rev 46216)
+++ trunk/Master/texmf-dist/doc/lualatex/arabluatex/samples/al-Jahiz.tex 2018-01-04 23:45:57 UTC (rev 46217)
@@ -34,30 +34,30 @@
\begin{filecontents*}{dajaja.tex}
\begin{linenumbers*}
\begin{arab}
- kAna \cap{'a}bU 'l-\cap{h}u_dayli 'ahd_A 'il_A \cap{m}uwaysiN
+ kAna \uc{'a}bU 'l-\uc{h}u_dayli 'ahd_A 'il_A \uc{m}uwaysiN
dajAjaTaN. wa-kAnat dajAjatu-hu 'llatI 'ahdA-hA dUna mA kAna
- yuttaxa_du li-\cap{m}uwaysiN. wa-l_akinna-hu bi-karami-hi
+ yuttaxa_du li-\uc{m}uwaysiN. wa-l_akinna-hu bi-karami-hi
wa-bi-.husni _hu\-luqi-hi 'a.zhara 'l-ta`ajjuba min simani-hA
- wa-.tIbi la.hmi-hA. wa-kAna <\cap{'a}bU 'l-\cap{h}u_dayli>
+ wa-.tIbi la.hmi-hA. wa-kAna <\uc{'a}bU 'l-\uc{h}u_dayli>
yu`rafu bi-'l-'imsAki 'l-^sadIdi. fa-qAla: \enquote{wa-kayfa
- ra'ayta yA \cap{'a}bA \cap{`i}mrAna tilka 'l-dajA\-jaTa?}
+ ra'ayta yA \uc{'a}bA \uc{`i}mrAna tilka 'l-dajA\-jaTa?}
qAla: \enquote{kAnat `ajabaN mina 'l-`ajabi!} fa-yaqUlu:
\enquote{wa-tadrI mA jinsu-hA? wa-tadrI mA sinnu-hA? fa-'inna
'l-dajAjaTa 'inna-mA ta.tIbu bi-'l-jinsi wa-'l-sinni. wa-tadrI
bi-'ayyi ^say'iN kunnA nusamminu-hA? wa-fI 'ayyi makAniN kunnA
na`lifu-hA?} fa-lA yazAlu fI h_a_dA wa-'l-'A_haru ya.d.haku
- .da.hkaN na`rifu-hu na.hnu wa-lA ya`rifu-hu \cap{'a}bU
- 'l-\cap{h}u_dayli.
+ .da.hkaN na`rifu-hu na.hnu wa-lA ya`rifu-hu \uc{'a}bU
+ 'l-\uc{h}u_dayli.
\end{arab}
\begin{arab}
- wa-kAna \cap{'a}bU 'l-\cap{h}u_dayli 'aslama 'l-nAsi .sadraN
+ wa-kAna \uc{'a}bU 'l-\uc{h}u_dayli 'aslama 'l-nAsi .sadraN
wa-'awsa`a-hum _huluqaN wa-'ashala-hum suhUlaTaN. fa-'in _dakarUA
- dajAjaTaN, qAla: \enquote{'ayna kAnat yA \cap{'a}bA \cap{`i}mrAna
+ dajAjaTaN, qAla: \enquote{'ayna kAnat yA \uc{'a}bA \uc{`i}mrAna
min tilka 'l-dajA\-jaTi?} fa-'in _dakarUA ba.t.taTaN 'aw `anAqaN
'aw jazUraN 'aw baqaraTaN, qAla: \enquote{fa-'ayna kAnat h_a_dihi
'l-jazUru fI 'l-juzuri min tilka 'l-dajAjaTi fI 'l-dajAji!}
- wa-'ini istasmana \cap{'a}bU 'l-\cap{h}u_dayli ^say'aN mina
+ wa-'ini istasmana \uc{'a}bU 'l-\uc{h}u_dayli ^say'aN mina
'l-.tayri wa-'l-bahA'imi, qAla: \enquote{lA wa-'l-l_ahi wa-lA tilka
'l-dajAjaTu!} wa-'in _dakarUA `u_dUbaTa 'l-^sa.hmi, qAla:
\enquote{`u_dUbaTu 'l-^sa.hmi fI 'l-baqari wa-'l-ba.t.ti wa-bu.tUni
@@ -73,12 +73,12 @@
\bigskip
\begin{arab}
- \cap{al-jA.hi.zu}, \aemph{\cap{k}itAbu 'l-\cap{b}u_halA'i}
+ \uc{al-jA.hi.zu}, \aemph{\uc{k}itAbu 'l-\uc{b}u_halA'i}
\end{arab}
\end{filecontents*}
-\title{\large\arb{dajAjaTu \cap{'a}bI 'l-\cap{h}u_dayli
- 'l-\cap{`a}llAfi}}
+\title{\large\arb{dajAjaTu \uc{'a}bI 'l-\uc{h}u_dayli
+ 'l-\uc{`a}llAfi}}
\author{}
\date{}
@@ -167,7 +167,7 @@
\SetTranslitConvention{dmg} % 'dmg', 'loc' or 'arabica'
\SetArbEasy % ie. discard 'classic' maddah
-\title{\arb{dajAjaTu \cap{'a}bI 'l-\cap{h}u_dayli 'l-\cap{`a}llAfi}}
+\title{\arb{dajAjaTu \uc{'a}bI 'l-\uc{h}u_dayli 'l-\uc{`a}llAfi}}
\end{minted}
\textbf{\texttt{document:}}
\inputminted[linenos, firstnumber=last, bgcolor=bg]{latex}{TMP/dajaja.tex}
Modified: trunk/Master/texmf-dist/doc/lualatex/arabluatex/samples/template-01.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/lualatex/arabluatex/samples/template-01.tex
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/arabluatex/samples/template-01.tex 2018-01-04 23:45:44 UTC (rev 46216)
+++ trunk/Master/texmf-dist/doc/lualatex/arabluatex/samples/template-01.tex 2018-01-04 23:45:57 UTC (rev 46217)
@@ -91,7 +91,7 @@
\arb[trans]{wa.slaT} expressed...
\begin{arab}[trans] % Arabic paragraph
- 'at_A .sadIquN 'il_A \cap{j}u.hA ya.tlubu min-hu .himAra-hu
+ 'at_A .sadIquN 'il_A \uc{j}u.hA ya.tlubu min-hu .himAra-hu
li-yarkaba-hu fI safraTiN qa.sIraTiN fa-qAla la-hu: sawfa 'u`Idu-hu
'ilay-ka fI 'l-masA'-i wa-'adfa`u la-ka 'ujraTaN.
\end{arab}
@@ -101,7 +101,7 @@
\arb[trans]{wa.slaT} expressed...
\begin{arab}[trans] % Arabic paragraph
- 'at_A .sadIquN 'il_A \cap{j}u.hA ya.tlubu min-hu .himAra-hu
+ 'at_A .sadIquN 'il_A \uc{j}u.hA ya.tlubu min-hu .himAra-hu
li-yarkaba-hu fI safraTiN qa.sIraTiN fa-qAla la-hu: sawfa 'u`Idu-hu
'ilay-ka fI 'l-masA'-i wa-'adfa`u la-ka 'ujraTaN.
\end{arab}
Modified: trunk/Master/texmf-dist/source/lualatex/arabluatex/README.tex
===================================================================
--- trunk/Master/texmf-dist/source/lualatex/arabluatex/README.tex 2018-01-04 23:45:44 UTC (rev 46216)
+++ trunk/Master/texmf-dist/source/lualatex/arabluatex/README.tex 2018-01-04 23:45:57 UTC (rev 46217)
@@ -33,7 +33,7 @@
\section*{License and disclamer}
ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright ⓒ 2016--2017 Robert Alessi
+Copyright ⓒ 2016--2018 Robert Alessi
Please send error reports and suggestions for improvements to Robert
Alessi:
@@ -72,7 +72,7 @@
\subsection*{License applicable to the documentation}
\label{sec:documentation-license}
-Copyright ⓒ 2016--2017 Robert Alessi
+Copyright ⓒ 2016--2018 Robert Alessi
The documentation file \verb|arabluatex.pdf| that is generated from
the \verb|arabluatex.dtx| source is licensed under the Creative
Modified: trunk/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx
===================================================================
--- trunk/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx 2018-01-04 23:45:44 UTC (rev 46216)
+++ trunk/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx 2018-01-04 23:45:57 UTC (rev 46217)
@@ -1,6 +1,6 @@
% \iffalse meta-comment
% ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-% Copyright (C) 2016--2017 Robert Alessi
+% Copyright (C) 2016--2018 Robert Alessi
%
% Please send error reports and suggestions for improvements to Robert
% Alessi <alessi at robertalessi.net>
@@ -27,7 +27,7 @@
%<package-info>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package-info>\ProvidesPackage{arabluatex}
%<*package-info>
- [2017/10/24 v1.9.2 An ArabTeX-like interface for LuaLaTeX]
+ [2018/01/03 v1.10 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--2017 Robert Alessi
+% Copyright (C) 2016--2018 Robert Alessi
%
% Please send error reports and suggestions for improvements to Robert
% Alessi <alessi at robertalessi.net>
@@ -150,13 +150,14 @@
\usepackage[english]{babel}
\usepackage{dox}
\doxitem{Option}{option}{options}
-\def\actualchar{ =} % there's a bug in doxitem; quick fix.
+%\def\actualchar{ =} % there's a bug in doxitem; quick fix.
\usepackage{fontspec,luatextra}
\defaultfontfeatures{RawFeature={+liga}}
\setmainfont{Old Standard}[SmallCapsFont={Latin Modern Roman Caps},
RawFeature={+mark;+ccmp;+ss05;+ss06}]
-\usepackage{arabluatex}[2017/10/24]
+\usepackage{arabluatex}[2018/01/03]
\usepackage[nopar]{quran}
+\usepackage[noindex]{nameauth}
\usepackage{varioref}
\usepackage{hyperxmp}
\PassOptionsToPackage{pdfa}{hyperref}
@@ -166,7 +167,7 @@
linktocpage=true, pdfauthor={Robert Alessi}, pdftitle={The
arabluatex package}, pdfcontactemail={alessi at robertalessi.net},
pdfcontacturl={http://www.robertalessi.net/arabluatex},
- pdfcopyright={Copyright (C) 2016--2017 Robert Alessi
+ pdfcopyright={Copyright (C) 2016--2018 Robert Alessi
<alessi at robertalessi.net>. This document is licensed under the
Creative Commons Attribution-ShareAlike 4.0 International
License. To view a copy of this license, visit
@@ -227,7 +228,7 @@
%</driver>
% \fi
%
-% \CheckSum{707}
+% \CheckSum{715}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -245,6 +246,22 @@
% Grave accent \` Left brace \{ Vertical bar \|
% Right brace \} Tilde \~}
%
+% \makeatletter
+% \let\org at changes@\changes@
+% \def\my at changes v#1.#2.#3\@nil{%
+% \org at changes@{v#1.\six at digits{#2}.#3=v#1.#2.#3}%
+% }%
+% \newcommand*{\six at digits}[1]{%
+% \ifnum#1<100000 0\fi
+% \ifnum#1<10000 0\fi
+% \ifnum#1<1000 0\fi
+% \ifnum#1<100 0\fi
+% \two at digits{#1}%
+% }%
+% \renewcommand*{\changes@}[1]{%
+% \my at changes#1.\@nil
+% }%
+% \makeatother
%
% \changes{v1.0}{2016/03/29}{Initial release}
% \changes{v1.0.1}{2016/03/31}{Minor update of the documentation}
@@ -308,7 +325,7 @@
% \label{sec:license-software}
%
% \package{arabluatex} --- Processing Arab\TeX\ notation under Lua\LaTeX.\\
-% Copyright \textcopyright\ 2016--2017 Robert Alessi
+% Copyright \textcopyright\ 2016--2018 Robert Alessi
%
% Please send error reports and suggestions for improvements to Robert
% Alessi:
@@ -351,7 +368,7 @@
%
% \subsection*{License applicable to this document}
% \label{sec:documentation-license}
-% Copyright \textcopyright\ 2016--2017 Robert Alessi
+% Copyright \textcopyright\ 2016--2018 Robert Alessi
%
% \ccbysa\marginpar{\texttt{CC BY-SA 4.0}}
% This document is licensed under the Creative Commons
@@ -371,7 +388,7 @@
% \package{arabtex} dates back to 1992. As far as I know, it was then
% the first and only way to typeset Arabic texts with \TeX\ and
% \LaTeX. To achieve that, \package{arabtex} provided---and still
-% does---an Arabic font in \arb[trans]{\cap{nasxI}} style and a macro
+% does---an Arabic font in \arb[trans]{\uc{nasxI}} style and a macro
% package that defined its own input notation which was, as the author
% stated, \enquote{both machine, and human, readable, and suited for
% electronic transmission and e-mail
@@ -485,7 +502,7 @@
% like so: \arb{BBi}\,. That is correct, as at least in the oldest
% manuscripts {\newfontfamily\arabicfont{Amiri}[Script=Arabic,
% RawFeature={+ss05}]\arb{BBi}} may stand for \arb{BBa} as
-% well as \arb{BBi}\,. See \textcite[i.14.C--D]{Wright}. The placement
+% well as \arb{BBi}\,. See \textcite[i. 14 C--D]{Wright}. The placement
% of the \arb[trans]{kasraT} above the consonant may be obtained by
% selecting the |ss05| feature of the Amiri font, like
% so:---\footnote{See the documentation of \package{amiri},
@@ -561,7 +578,7 @@
% \item In such words as \arb{^say'aN}, \arb{.zim'aN} and the like,
% the \arb[trans]{hamzaT} alone is not written over the letter
% \arb[trans]{yA'} with no diacritical points below as in
-% \arb{sayy"'aN}, \arb{.zimy"'aN}, but over a horizontal stroke
+% \arb{^sayy"'aN}, \arb{.zimy"'aN}, but over a horizontal stroke
% placed in the continuation of the preceding letter. %
% \iffalse
%<*example>
@@ -943,7 +960,7 @@
% \arb[voc]{_d_alika}, |al-mal_a'ikaT-u| |'l-ra.hm_an-u|
% \arb[voc]{al-mal_a'ikaT-u 'l-ra.hm_an-u}, |.hu_dayfaT-u| |bn-u|
% |'l-yamAn_i| \arb[fullvoc]{.hu_dayfaT-u bn-u 'l-yamAn_i} for
-% \arb[trans]{\cap{.hu_dayfaT-u} bn-u 'l-\cap{yamAn_i}}, etc.
+% \arb[trans]{\uc{.hu_dayfaT-u} bn-u 'l-\uc{yamAn_i}}, etc.
%
% \textsc{Rem.}~\emph{c.} The letter \arb[novoc]{y} with two points
% below, \arb{al-yA'u 'l-mu_tannATu min ta.hti-hA}, may also be
@@ -1020,7 +1037,7 @@
% \begin{quote}
% |_halaqa| (or |xalaqa|) \arb[voc]{xalaqa} \arb[trans]{xalaqa},
% |^samsuN| \arb[voc]{^samsuN} \arb[trans]{^samsuN}, |karImuN|
-% \arb[voc]{karImuN} \arb[trans]{\cap{karImuN}}.
+% \arb[voc]{karImuN} \arb[trans]{\uc{karImuN}}.
%
% |bi-hi| \arb[voc]{bi-hi} \arb[trans]{bi-hi}, |'aqi.tuN|
% \arb[voc]{'aqi.tuN} \arb[trans]{'aqi.tuN}.
@@ -1068,10 +1085,10 @@
% \arb[trans]{al-ra.hm_an-u}, |l_akin| \arb[voc]{l_akin}
% \arb[trans]{l_akin}, |h_ahunA| \arb[voc]{h_ahunA}
% \arb[trans]{h_ahunA}, |.hunayn-u| |bn-u| |'is.h_aq-a|
-% \arb[voc]{.hunayn-u bn-u 'is.h_aq-a} \arb[trans]{\cap{.hunayn}-u
-% bn-u \cap{'is.h_aq-a}}, |rabb_i| \arb[voc]{rabb_i}
+% \arb[voc]{.hunayn-u bn-u 'is.h_aq-a} \arb[trans]{\uc{.hunayn}-u
+% bn-u \uc{'is.h_aq-a}}, |rabb_i| \arb[voc]{rabb_i}
% \arb[trans]{rabb_i}, |al-`A.s_i| \arb[voc]{al-`A.s_i}
-% \arb[trans]{al-\cap{`A.s_i}}.
+% \arb[trans]{al-\uc{`A.s_i}}.
% \end{quote}
%
% \paragraph{Silent \arb[novoc]{U}/\arb[novoc]{I}}
@@ -1092,9 +1109,9 @@
% \arb[trans]{al-rib_aIT-u}.
% \end{quote}
%
-% \paragraph{\arb[trans]{\cap{`amruNU}}, and the silent
+% \paragraph{\arb[trans]{\uc{`amruNU}}, and the silent
% \arb[novoc]{U}} To that name a silent \arb[novoc]{U} is added to
-% distinguish it from \arb[trans]{\cap{`umar-u}}: see \textcite[i. 12
+% distinguish it from \arb[trans]{\uc{`umar-u}}: see \textcite[i. 12
% C]{Wright}. In no way this affects the sound of the
% \arb[trans]{tanwIn}, so it has to be discarded in |trans| mode:
% \begin{quote}
@@ -1104,11 +1121,11 @@
%
% When the \arb[trans]{tanwIn} falls away \parencite[i. 249
% B]{Wright}: |`amr-uU| |bn-u| |mu.hammadiN| \arb[fullvoc]{`amr-uU
-% bnu mu.hammadiN} \arb[trans]{\cap{`amr-uU} bn-u
-% \cap{mu.hammadiN}}, |mu.hammad-u| |bn-u| |`amr-iU| |bn-i|
+% bnu mu.hammadiN} \arb[trans]{\uc{`amr-uU} bn-u
+% \uc{mu.hammadiN}}, |mu.hammad-u| |bn-u| |`amr-iU| |bn-i|
% |_hAlidiN| \arb[fullvoc]{mu.hammad-u bn-u `amr-iU bn-i _hAlidiN}
-% \arb[trans]{\cap{mu.hammad-u} bn-u \cap{`amr-iU} bn-i
-% \cap{_hAlidiN}}.
+% \arb[trans]{\uc{mu.hammad-u} bn-u \uc{`amr-iU} bn-i
+% \uc{_hAlidiN}}.
%
% And so also: |al-rib_aUA| \arb[voc]{al-rib_aUA}
% \arb[trans]{al-rib_aUA}, |ribaNU| \arb[voc]{ribaNU}
@@ -1484,21 +1501,21 @@
%
% \textbf{Other cases}: |'awi| |ismu-hu| \arb[fullvoc]{'awi ismu-hu}
% \arb[trans]{'awi ismu-hu}, |zayduN| |ibn-u| |`amriNU|
-% \arb[fullvoc]{\cap{z}ayduN ibn-u \cap{`amriNU}}
-% \arb[trans]{\cap{z}ayduN ibn-u
-% \cap{`amriNU}},\footnote{\label{fn:zayd-is-son}%
-% \enquote{\arb[trans]{\cap{z}ayd} is the son of
-% \arb[trans]{\cap{`a}mr}}: the second noun is not in apposition to
+% \arb[fullvoc]{\uc{z}ayduN ibn-u \uc{`amriNU}}
+% \arb[trans]{\uc{z}ayduN ibn-u
+% \uc{`amriNU}},\footnote{\label{fn:zayd-is-son}%
+% \enquote{\arb[trans]{\uc{z}ayd} is the son of
+% \arb[trans]{\uc{`a}mr}}: the second noun is not in apposition to
% the first, but forms part of the predicate. Hence \arb[voc]{zayduN
% ibn-u `amriNU} and not \arb[voc]{zayd-u bn-u `amriNU},
% \enquote{Zayd, son of ʿAmr}.} |`umar-u| |ibn-u| |'l-_ha.t.tAb-i|
-% \arb[fullvoc]{\cap{`umar}-u ibn-u \cap{'l-_ha.t.tAb-i}}
-% \arb[trans]{\cap{`umar}-u ibn-u
-% \cap{'l-_ha.t.tAb-i}},\footnote{\enquote{\arb[trans]{\cap{`umar}}
-% is the son of \arb[trans]{\cap{al-_ha.t.tAb}}} (see
+% \arb[fullvoc]{\uc{`umar}-u ibn-u \uc{'l-_ha.t.tAb-i}}
+% \arb[trans]{\uc{`umar}-u ibn-u
+% \uc{'l-_ha.t.tAb-i}},\footnote{\enquote{\arb[trans]{\uc{`umar}}
+% is the son of \arb[trans]{\uc{al-_ha.t.tAb}}} (see
% \vref{fn:zayd-is-son}).} |imru'-u| |'l-qays-i|
-% \arb[fullvoc]{imru'-u 'l-qays-i} \arb[trans]{\cap{i}mru'-u
-% \cap{'l-qays-i}}, |la-aymun-u| |'l-l_ah-i|
+% \arb[fullvoc]{imru'-u 'l-qays-i} \arb[trans]{\uc{i}mru'-u
+% \uc{'l-qays-i}}, |la-aymun-u| |'l-l_ah-i|
% \arb[fullvoc]{la-aymun-u 'l-l_ah-i} \arb[trans]{la-aymun-u
% 'l-l_ah-i}.
% \end{quote}
@@ -1551,7 +1568,7 @@
% 'l-rajul-a}, |mani| |'l-ka_d_dAb-u| \arb[fullvoc]{mani
% 'l-ka_d_dAb-u} \arb[trans]{mani 'l-ka_d_dAb-u}, |qatalati|
% |'l-rUm-u| \arb[fullvoc]{qatalati 'l-rUm-u} \arb[trans]{qatalati
-% \cap{'l-rUm-u}}.
+% \uc{'l-rUm-u}}.
% \end{quote}
% \label{ref:muhammaduni}
% However, the Arabic script does not show the \arb[trans]{kasraT} or
@@ -1561,12 +1578,12 @@
% takes care of that automatically:---
% \begin{quote}
% |mu.hammaduN| |'l-nabI| \arb[fullvoc]{mu.hammaduN 'l-nabI}
-% \arb[trans]{\cap{m}u.hammaduN 'l-nabI}, |salAmuN| |ud_hulUA|
+% \arb[trans]{\uc{m}u.hammaduN 'l-nabI}, |salAmuN| |ud_hulUA|
% \arb[fullvoc]{salAmuN ud_hulUA} \arb[trans]{salAmuN ud_hulUA},
-% |qa.sIdata-hu| |fI| |qatl-i| |\cap{'a}bI| |\cap{m}uslimiN|
+% |qa.sIdata-hu| |fI| |qatl-i| |\uc{'a}bI| |\uc{m}uslimiN|
% |'llatI| |yaqUlu| |fI-hA| \arb[fullvoc]{qa.sIdata-hu fI qatl-i
-% \cap{'a}bI \cap{m}uslimiN 'llatI yaqUlu fI-hA}
-% \arb[trans]{qa.sIdata-hu fI qatl-i \cap{'a}bI \cap{m}uslimiN
+% \uc{'a}bI \uc{m}uslimiN 'llatI yaqUlu fI-hA}
+% \arb[trans]{qa.sIdata-hu fI qatl-i \uc{'a}bI \uc{m}uslimiN
% 'llatI yaqUlu fI-hA}.
% \end{quote}
%
@@ -1636,9 +1653,9 @@
% \begin{quote}
% |fa-'innA| |na_dkuru| |'l-.sawt-ayni| |'l-la_dayni| |rawaynA-humA|
% |`an| |ja.h.zaT-a| \arb[fullvoc]{fa-'innA na_dkuru 'l-.sawt-ayni
-% 'l-la_dayni rawaynA-humA `an \cap{ja.h.zaT-a}}
+% 'l-la_dayni rawaynA-humA `an \uc{ja.h.zaT-a}}
% \arb[trans]{fa-'innA na_dkuru 'l-.sawt-ayni 'l-la_dayni
-% rawaynA-humA `an \cap{ja.h.zaT-a}}.
+% rawaynA-humA `an \uc{ja.h.zaT-a}}.
%
% And also: |al-la_dAni| \arb[fullvoc]{al-la_dAni}
% \arb[trans]{al-la_dAni}, |al-la_dayni| \arb[fullvoc]{al-la_dayni}
@@ -1708,8 +1725,8 @@
% consonant:---
% \begin{quote}
% |qAla isma`"| \arb[novoc]{qAla isma`"} \arb[trans]{qAla isma`"},
-% |jA'at"| |hinduN| \arb[voc]{jA'at" \cap{hinduN}}
-% \arb[trans]{jA'at" \cap{hinduN}}, |^sabIhuN| |bi-man| |q"u.ti`at"|
+% |jA'at"| |hinduN| \arb[voc]{jA'at" \uc{hinduN}}
+% \arb[trans]{jA'at" \uc{hinduN}}, |^sabIhuN| |bi-man| |q"u.ti`at"|
% |qadamA-hu| \arb[novoc]{^sabIhuN bi-man q"u.ti`at" qadamA-hu}
% \arb[trans]{^sabIhuN bi-man q"u.ti`at" qadamA-hu}.
% \end{quote}
@@ -1732,8 +1749,8 @@
% \begin{quote}
% |q"Ala q"A'iluN| \arb[voc]{q"Ala q"A'iluN} \arb[trans]{q"Ala
% q"A'iluN}, |ibn-u 'abI 'u.saybi`aT-"a| \arb[voc]{ibn-u 'abI
-% 'u.saybi`aT-"a} \arb[trans]{\cap{ibn-u} \cap{'abI}
-% \cap{'u.saybi`aT-"a}}.
+% 'u.saybi`aT-"a} \arb[trans]{\uc{ibn-u} \uc{'abI}
+% \uc{'u.saybi`aT-"a}}.
% \end{quote}
% \item \arb[trans]{tanwIn}:---
% \begin{quote}
@@ -1775,8 +1792,8 @@
% \begin{quote}\label{ref:qrannun-full}
% |al-jamr-u| |'l-.sayfiyy-u| |'lla_dI| |kAna|
% \verb+bi-q"rAn"|nUn-a+ \arb[fullvoc]{al-jamr-u 'l-.sayfiyy-u
-% 'lla_dI kAna \cap{bi-q"rAn"|nUn-a}} \arb[trans]{al-jamr-u
-% 'l-.sayfiyy-u 'lla_dI kAna \cap{bi-q"rAn"|nUn-a}}.
+% 'lla_dI kAna \uc{bi-q"rAn"|nUn-a}} \arb[trans]{al-jamr-u
+% 'l-.sayfiyy-u 'lla_dI kAna \uc{bi-q"rAn"|nUn-a}}.
% \end{quote}
%
% \subsubsection{\texorpdfstring{Quoting the
@@ -1849,8 +1866,8 @@
% \vref{fn:pipe-allah-01} and in \vref{fn:pipe-madda}. One more example
% follows:---
% \begin{quote}
-% \verb+bi-qrAn|nUn-a+ \arb[voc]{\cap{bi-qrAn|nUn-a}}
-% \arb[trans]{\cap{bi-qrAn|nUn-a}}, \enquote{in Crannon} (Thessaly,
+% \verb+bi-qrAn|nUn-a+ \arb[voc]{\uc{bi-qrAn|nUn-a}}
+% \arb[trans]{\uc{bi-qrAn|nUn-a}}, \enquote{in Crannon} (Thessaly,
% Greece).\footnote{See more context \vpageref{ref:qrannun-full}.}
% \end{quote}
% As one can see, the \enquote{pipe} character between the two
@@ -1912,14 +1929,14 @@
qAla\LRfootnote{A footnote that interferes with the contextual
analysis.} \arbnull{qAla}uhrub fa-lan tuqtala.
- \cap{z}ayduN\arbnull{ibnu}\LRfootnote{A footnote that interferes
+ \uc{z}ayduN\arbnull{ibnu}\LRfootnote{A footnote that interferes
with the contextual analysis.} \arbnull{zayduN}ibn-u
- \cap{`a}mriNU.\LRfootnote{See \vref{fn:zayd-is-son}.}
+ \uc{`a}mriNU.\LRfootnote{See \vref{fn:zayd-is-son}.}
\end{arab}
\begin{arab}[trans]
- \cap{z}ayduN\arbnull{ibnu}\LRfootnote{A footnote that interferes
+ \uc{z}ayduN\arbnull{ibnu}\LRfootnote{A footnote that interferes
with the contextual analysis.} \arbnull{zayduN}ibn-u
- \cap{`a}mriNU.\LRfootnote{See \vref{fn:zayd-is-son}.}
+ \uc{`a}mriNU.\LRfootnote{See \vref{fn:zayd-is-son}.}
\end{arab}
\end{arabluacode}
% \iffalse
@@ -1936,7 +1953,7 @@
% stand one above the other:--
% \begin{quote}
% |.hunayn-u| |bn-u| |'is.h--_aq-a| \arb[voc]{.hunayn-u bn-u
-% 'is.h--_aq-a} \arb[trans]{\cap{.hunayn-u} bn-u \cap{'is.h--_aq-a}}
+% 'is.h--_aq-a} \arb[trans]{\uc{.hunayn-u} bn-u \uc{'is.h--_aq-a}}
% \end{quote}
%
% \subsection{Digits}
@@ -1986,8 +2003,8 @@
% \abjad{1874}.
%
% |The| |\arb[trans]{'abjad}| |number| |for| |1874| |is|
-% |\aemph{\abjad{1874}}| The \arb[trans]{'abjad} number for 1874
-% is \aemph{\abjad{1874}}.
+% |\aemph*{\abjad{1874}}| The \arb[trans]{'abjad} number for 1874
+% is \aemph*{\abjad{1874}}.
% \end{quote}
% \end{quoting}
%
@@ -2048,7 +2065,7 @@
% \begin{quote}
% |\abjad{45}:| |kitAbu-hu| |\aemph{fI| |'l-`AdAt-i}|
% \arb[voc]{\abjad{45}: kitAbu-hu \aemph{fI 'l-`AdAt-i}}
-% \arb[trans]{\abjad{45}: kitAbu-hu \aemph{fI 'l-\cap{`AdAt-i}}}.
+% \arb[trans]{\abjad{45}: kitAbu-hu \aemph{fI 'l-\uc{`AdAt-i}}}.
% \end{quote}
%
% \begin{quoting}
@@ -2061,7 +2078,7 @@
% horizontal stroke printed over the emphasized words, like so:
% |\abjad{45}:| |kitAbu-hu| |\aemph*{fI| |'l-`AdAt-i}|
% \arb[voc]{\abjad{45}: kitAbu-hu \aemph*{fI 'l-`AdAt-i}}
-% \arb[trans]{\abjad{45}: kitAbu-hu \aemph*{fI 'l-\cap{`AdAt-i}}}.
+% \arb[trans]{\abjad{45}: kitAbu-hu \aemph*{fI 'l-\uc{`AdAt-i}}}.
% \end{quoting}
%
% \section{Arabic poetry}
@@ -2257,8 +2274,8 @@
%
% \subsection{Example}
% \label{sec:poetry-example}
-% Here follow the first lines of \arb[trans]{\upshape{}\cap{i}mru'u
-% 'l-\cap{q}aysi}'s \arb[trans]{\cap{m}u`allaqaT}. In this example,
+% Here follow the first lines of \arb[trans]{\upshape{}\uc{i}mru'u
+% 'l-\uc{q}aysi}'s \arb[trans]{\uc{m}u`allaqaT}. In this example,
% \cs{SetArbDflt*} has been selected so as to mark the
% \arb[trans]{'id.gAm} that is fit to this declamatory
% poetry:---\footnote{Please note that for the time being only the
@@ -2265,7 +2282,7 @@
% assimilation rules that are laid on \vref{ref:assimilation} are
% applied. See \vref{sec:classic-modern-typesetting} for more
% information. None of the editions of the
-% \arb[trans]{\cap{M}u`allaqAt} that I know of feature the
+% \arb[trans]{\uc{M}u`allaqAt} that I know of feature the
% \arb[trans]{'id.gAm} in the Arabic text, although it is often
% strongly marked in declamation.}%
% \iffalse
@@ -2273,7 +2290,7 @@
% \fi
\begin{arabluaverbatim}
\begin{arab}[fullvoc]
- qAla \cap{i}mru'u 'l-\cap{q}aysi fI mu`allaqati-hi:
+ qAla \uc{i}mru'u 'l-\uc{q}aysi fI mu`allaqati-hi:
\end{arab}
\begin{arabverse}[mode=fullvoc, metre={(al-.darbu 'l-_tAnI mina
@@ -2281,8 +2298,8 @@
\SetArbDflt*
\begin{linenumbers*}
\bayt{qifA nabki min _dikr_A .habIbiN wa-manzili}{bi-saq.ti
- 'l-liw_A bayna \cap{'l-d}a_hUli fa-\cap{.h}awmali}\\
- \bayt{fa-\cap{t}U.di.ha fa-'l-\cap{m}iqrATi lam ya`fu
+ 'l-liw_A bayna \uc{'l-d}a_hUli fa-\uc{.h}awmali}\\
+ \bayt{fa-\uc{t}U.di.ha fa-'l-\uc{m}iqrATi lam ya`fu
rasmu-hA}{limA nasa^gat-hA min ^ganUbiN wa-^sam'ali}\\
\bayt{tar_A ba`ara 'l-'ar'Ami fI `ara.sAti-hA}{wa-qI`Ani-hA
ka-'anna-hu .habbu fulfuli}\\
@@ -2299,7 +2316,7 @@
%</example>
% \fi%
% \begin{arab}[fullvoc]
-% qAla \cap{i}mru'u 'l-\cap{q}aysi fI mu`allaqati-hi:
+% qAla \uc{i}mru'u 'l-\uc{q}aysi fI mu`allaqati-hi:
% \end{arab}
%
% \begin{arabverse}[mode=fullvoc, metre={(al-.darbu 'l-_tAnI mina
@@ -2307,8 +2324,8 @@
% \SetArbDflt*
% \begin{linenumbers*}
% \bayt{qifA nabki min _dikr_A .habIbiN wa-manzili}{bi-saq.ti
-% 'l-liw_A bayna \cap{'l-d}a_hUli fa-\cap{.h}awmali}\\
-% \bayt{fa-\cap{t}U.di.ha fa-'l-\cap{m}iqrATi lam ya`fu
+% 'l-liw_A bayna \uc{'l-d}a_hUli fa-\uc{.h}awmali}\\
+% \bayt{fa-\uc{t}U.di.ha fa-'l-\uc{m}iqrATi lam ya`fu
% rasmu-hA}{limA nasa^gat-hA min ^ganUbiN wa-^sam'ali}\\
% \bayt{tar_A ba`ara 'l-'ar'Ami fI `ara.sAti-hA}{wa-qI`Ani-hA
% ka-'anna-hu .habbu fulfuli}\\
@@ -2325,7 +2342,7 @@
% \medskip
%
% \begin{arab}[trans]
-% qAla \cap{i}mru'u 'l-\cap{q}aysi fI mu`allaqati-hi:
+% qAla \uc{i}mru'u 'l-\uc{q}aysi fI mu`allaqati-hi:
% \end{arab}
%
% \begin{arabverse}[mode=trans, metre={(al-.darbu 'l-_tAnI mina
@@ -2333,8 +2350,8 @@
% \SetArbDflt*
% \begin{linenumbers*}
% \bayt{qifA nabki min _dikr_A .habIbiN wa-manzili}{bi-saq.ti
-% 'l-liw_A bayna \cap{'l-d}a_hUli fa-\cap{.h}awmali}\\
-% \bayt{fa-\cap{t}U.di.ha fa-'l-\cap{m}iqrATi lam ya`fu
+% 'l-liw_A bayna \uc{'l-d}a_hUli fa-\uc{.h}awmali}\\
+% \bayt{fa-\uc{t}U.di.ha fa-'l-\uc{m}iqrATi lam ya`fu
% rasmu-hA}{limA nasa^gat-hA min ^ganUbiN wa-^sam'ali}\\
% \bayt{tar_A ba`ara 'l-'ar'Ami fI `ara.sAti-hA}{wa-qI`Ani-hA
% ka-'anna-hu .habbu fulfuli}\\
@@ -2469,9 +2486,9 @@
%</example>
% \fi
%
-% \paragraph{Proper names} \DescribeMacro{\cap} Proper names or book
+% \paragraph{Proper names} \DescribeMacro{\uc} Proper names or book
% titles that must have their first letters uppercased may be passed
-% as arguments to the \cs{cap}\marg{word} command. \cs{cap} is a
+% as arguments to the \cs{uc}\marg{word} command. \cs{uc} is a
% clever command, for it will give the definite article
% \arb[trans]{al-} in lower case in all positions. Moreover, if the
% inital letter, apart from the article, cannot be uppercased,
@@ -2478,33 +2495,33 @@
% viz. \arb[trans]{|"'} or \arb[trans]{`}, the letter next to it will be
% uppercased:---
% \begin{quote}
-% |\cap{.hunayn-u}| |bn-u| |\cap{'is.h_aq-a}|
-% \arb[voc]{\cap{.hunayn-u} bn-u \cap{'is.h_aq-a}}
-% \arb[trans]{\cap{.hunayn-u} bn-u \cap{'is.h_aq-a}},
-% |\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{|\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}}.
+% |\uc{.hunayn-u}| |bn-u| |\uc{'is.h_aq-a}|
+% \arb[voc]{\uc{.hunayn-u} bn-u \uc{'is.h_aq-a}}
+% \arb[trans]{\uc{.hunayn-u} bn-u \uc{'is.h_aq-a}},
+% |\uc{`u_tm_an-u}| \arb[voc]{\uc{`u_tm_an-u}}
+% \arb[trans]{\uc{`u_tm_an-u}}, |.daraba| |\uc{zayd-u}| |bn-u|
+% |\uc{_h_alidiN}| |\uc{sa`d-a}| |bn-a| |\uc{`awf-i}| |bn-i|
+% |\uc{|\allowbreak|`abd-i}| |\uc{'l-l_ah-i}|
+% \arb[fullvoc]{.daraba \uc{zayd-u} bn-u \uc{_h_alidiN}
+% \uc{sa`d-a} bn-a \uc{`awf-i} bn-i \uc{`abd-i} \uc{'l-l_ah-i}}
+% \arb[trans]{.daraba \uc{zayd-u} bn-u \uc{_h_alidiN} \uc{sa`d-a}
+% bn-a \uc{`awf-i} bn-i \uc{`abd-i} \uc{'l-l_ah-i}}.
% \end{quote}
-% However, \cs{cap} must be used cautiously in some very particular
+% However, \cs{uc} must be used cautiously in some very particular
% cases, for the closing brace of its argument may prevent a rule from
% being applied. To take an example, as seen above
% \vpageref{ref:muhammaduni}, the transliteration of
-% \arb[fullvoc]{\cap{m}u.hammaduN 'l-nabI} must be
-% \arb[trans]{\cap{m}u.hammaduN 'l-nabI}, as nouns having the
+% \arb[fullvoc]{\uc{m}u.hammaduN 'l-nabI} must be
+% \arb[trans]{\uc{m}u.hammaduN 'l-nabI}, as nouns having the
% \arb[trans]{tanwIn} take a \arb[trans]{kasraT} in pronunciation
% before \arb[trans]{'alifu 'l-wa.sli}. In that case, encoding
-% \arb[fullvoc]{mu.hammaduN} like so: |\cap{mu.hammaduN}| is wrong,
+% \arb[fullvoc]{mu.hammaduN} like so: |\uc{mu.hammaduN}| is wrong,
% because the closing brace would prevent \package{arabluatex} from
% detecting the sequence \meta{-uN} immediately followed by
-% \meta{'-l}. Fortunately, this can be circumvented in a
+% \meta{'l-}. Fortunately, this can be circumvented in a
% straightforward way by inserting only part of the noun in the
-% argument of \cs{cap} vz. up to the first letter that is to be
-% uppercased, like so: |\cap{m}u.hammaduN|.
+% argument of \cs{uc} vz. up to the first letter that is to be
+% uppercased, like so: |\uc{m}u.hammaduN|.
%
% \paragraph{Hyphenation}
% In case transliterated Arabic words break the \TeX\ hyphenation
@@ -2513,14 +2530,70 @@
% of \package{arabluatex}, but will be processed by any of the
% transliteration modes:---
% \begin{quote}
-% |\cap{'abU}| |\cap{bakriN}| |\cap{mu\-.ham\-madu}| |bnu|
-% |\cap{za\-ka| |\-riy\-yA'a}| |\cap{'l-rAzI}| \arb{\cap{'abU}
-% \cap{bakriN} \cap{mu\-.ham\-mad-u} bnu \cap{za\-ka\-riy\-yA'a}
-% \cap{'l-rAzI}} \arb[trans]{\cap{'abU} \cap{bakriN}
-% \cap{mu\-.ham\-mad-u} bn-u \cap{za\-ka\-riy\-yA'-a}
-% \cap{'l-rAzI}}.
+% |\uc{'abU}| |\uc{bakriN}| |\uc{mu\-.ham\-madu}| |bnu|
+% |\uc{za\-ka| |\-riy\-yA'a}| |\uc{'l-rAziyyu}| \arb{\uc{'abU}
+% \uc{bakriN} \uc{mu\-.ham\-mad-u} bnu \uc{za\-ka\-riy\-yA'a}
+% \uc{'l-rAziyyu}} \arb[trans]{\uc{'abU} \uc{bakriN}
+% \uc{mu\-.ham\-mad-u} bn-u \uc{za\-ka\-riy\-yA'-a}
+% \uc{'l-rAziyyu}}.
% \end{quote}
%
+% \paragraph{\enquote*{Long} proper names}
+% \NEWfeature{v1.10} \cs{uc} is also able to process proper names
+% consisting of several subsequent words:---
+% \begin{quote}
+% |\arb[trans]{\uc{'abU| |zaydiN| |.hunaynu| |bnu| |'is.h_aqa|
+% |'l-`ibAdiyyu}}| \arb[trans]{\uc{'abU zaydiN .hunaynu bnu
+% 'is.h_aqa 'l-`ibAdiyyu}}.
+% \end{quote}
+%
+% \paragraph{Proper names outside Arabic environments}
+% \changes{v1.10}{2018/01/03}{\cs{uc} supersedes \cs{cap}}
+% \DescribeMacro{\prname}\NEWfeature{v1.10} Transliterated proper
+% names inserted in paragraphs of English text should be printed in
+% the same typeface as the surrounding text. \cs{prname}\marg{Arabic
+% proper name} is provided to that effect:\footnote{Just as \cs{uc},
+% \cs{prname} is also able to process proper names consisting of
+% several subsequent words.}---
+%\iffalse
+%<*example>
+% \fi
+\begin{arabluacode}
+From \textcite[i. 23 C]{Wright}:--- If the name following
+\arb[fullvoc]{ibnuN} be that of the mother or the grandfather, the
+\arb[fullvoc]{"a} is retained; as \arb[fullvoc]{`Is_A ibnu maryama},
+ \enquote{Jesus the son of Mary}; \arb[fullvoc]{`ammAru ibnu
+ man.sUriN}, \enquote{\prname{`ammAr} the (grand)son of
+ \prname{man.sUr}}.
+\end{arabluacode}
+% \iffalse
+%</example>
+% \fi
+%
+% The following example shows how \cs{prname} can be used in
+% conjunction with the \package{nameauth} package to have Arabic
+% proper names printed first in full then in partial
+% forms:\footnote{See the documentation of \package{nameauth} for more
+% details: \url{https://ctan.org/pkg/nameauth}}--- %
+%\iffalse
+%<*example>
+% \fi
+\begin{arabluacode}
+\begin{nameauth}
+ \< Hunayn & \prname{'abU zayd} & \prname{.hunayn}, \prname{ibn
+ 'is.h_aq al-`ibAdiyy} & > %
+ \< Razi & & \prname{al-rAziyy}, \prname{'abu bark mu.hammad ibn
+ zakariyyA'} & > %
+\end{nameauth}
+\pretocmd{\Razi}{\RevName}{}{}
+
+On first occurrence, proper names are printed as \Hunayn, \Razi.
+Then as \Hunayn, \Razi.
+\end{arabluacode}
+% \iffalse
+%</example>
+% \fi
+%
% \subsection{Additional note on \texttt{dmg} convention}
% \label{sec:additional-note-dmg}
% \NEWfeature{v1.3} According to \textcite[6]{dmg}, Arabic
@@ -2528,10 +2601,10 @@
% ways:
% \begin{compactenum}[(a)]
% \item \label{ref:dmg-full-rend}In full:
-% \NoArbUp\arb[trans]{\cap{`amruNU}}\ArbUpDflt\,;
+% \NoArbUp\arb[trans]{\uc{`amruNU}}\ArbUpDflt\,;
% \item \label{ref:dmg-up-rend}As superscript text:
-% \arb[trans]{\cap{`amruNU}}\,;
-% \item \label{ref:irab-discarded}Discarded: \arb[trans]{\cap{`amr}}.
+% \arb[trans]{\uc{`amruNU}}\,;
+% \item \label{ref:irab-discarded}Discarded: \arb[trans]{\uc{`amr}}.
% \end{compactenum}
% \DescribeMacro{\arbup} By default, \package{arabluatex} applies rule
% \ref{ref:dmg-up-rend}. Once delimited by a set of Lua functions,
@@ -2575,8 +2648,8 @@
% \arb[trans]{\textbf{mun.sarif}}: |mu`allimuN|
% \arb[voc]{mu`allimuN} \arb[trans]{mu`allimuN}, |kA'inuN|
% \arb[voc]{kA'inuN} \arb[trans]{kA'inuN}, |kA'inAtuN|
-% \arb[voc]{kA'inAtuN} \arb[trans]{kA'inAtuN}, |\cap{`amraNU}|
-% \arb[voc]{\cap{`amraNU}} \arb[trans]{\cap{`amraNU}}, |fataN_A|
+% \arb[voc]{kA'inAtuN} \arb[trans]{kA'inAtuN}, |\uc{`amraNU}|
+% \arb[voc]{\uc{`amraNU}} \arb[trans]{\uc{`amraNU}}, |fataN_A|
% \arb[voc]{fataN_A} \arb[trans]{fataN_A}, |qA.diNI| \arb{qA.diNI}
% \arb[trans]{qA.diNI}.
%
@@ -2624,7 +2697,7 @@
% |kabIraT| \arb[trans]{madInaT kabIraT}, |al-madInaT| |al-kabIraT|
% \arb[trans]{al-madInaT al-kabIraT}.
% \item Nouns followed by another noun in the genitive (contruct
-% state): |.hikmaT| |al-l_ah| \arb[trans]{.hikmaT al-\cap{l}_ah},
+% state): |.hikmaT| |al-l_ah| \arb[trans]{.hikmaT al-\uc{l}_ah},
% |fi.d.daT| |al-darAhim| \arb[trans]{fi.d.daT al-darAhim}.
% \end{compactenum}
% \begin{quoting}
@@ -2634,9 +2707,9 @@
% \arb[trans]{tA' marbU.taT} falls into. The \enquote*{pipe}
% character (see \vref{sec:pipe}) may be appended to that word to
% indicate that what follows is in the construct state:
-% |\cap{r}isAlaT| |fI| |tartIb| \verb+qirA'aT|+ |kutub|
-% |\cap{^g}AlInUs| \arb[trans]{\cap{r}isAlaT fI tartIb qirA'aT|
-% kutub \cap{^g}AlInUs}.
+% |\uc{r}isAlaT| |fI| |tartIb| \verb+qirA'aT|+ |kutub|
+% |\uc{^g}AlInUs| \arb[trans]{\uc{r}isAlaT fI tartIb qirA'aT|
+% kutub \uc{^g}AlInUs}.
% \end{quoting}
%
%
@@ -2651,20 +2724,20 @@
% \subsection{Examples}
% \label{sec:examples-translit}
% Here follows in transliteration the story of
-% \arb[trans]{\cap{ju.hA}} and his donkey (\arb[voc]{\cap{ju.hA
+% \arb[trans]{\uc{ju.hA}} and his donkey (\arb[voc]{\uc{ju.hA
% wa-.himAru-hu}}). See the code \vpageref{ref:juha-code}:---
%
% \SetTranslitConvention{dmg}
% \begin{arab}[trans]
% \LR{\textbf{\emph{\enquote*{dmg}} standard:}} 'at_A .sadIquN 'il_A
-% \cap{ju.hA} ya.tlubu min-hu .himAra-hu li-yarkaba-hu fI safraTiN
+% \uc{ju.hA} ya.tlubu min-hu .himAra-hu li-yarkaba-hu fI safraTiN
% qa.sIraTiN fa-qAla la-hu: \enquote{sawfa 'u`Idu-hu 'ilay-ka fI
-% 'l-masA'-i wa-'adfa`u la-ka 'ujraTaN.} fa-qAla \cap{ju.hA}:
+% 'l-masA'-i wa-'adfa`u la-ka 'ujraTaN.} fa-qAla \uc{ju.hA}:
% \enquote{'anA 'AsifuN jiddaN 'annI lA 'asta.tI`u 'an 'u.haqqiqa
% la-ka ra.gbata-ka fa-'l-.himAr-u laysa hunA 'l-yawm-a.} wa-qabla
-% 'an yutimma \cap{ju.hA} kalAma-hu bada'a 'l-.himAr-u yanhaqu fI
+% 'an yutimma \uc{ju.hA} kalAma-hu bada'a 'l-.himAr-u yanhaqu fI
% 'i.s.tabli-hi. fa-qAla la-hu .sadIqu-hu: \enquote{'innI 'asma`u
-% .himAra-ka yA \cap{ju.hA} yanhaqu.} fa-qAla la-hu \cap{ju.hA}:
+% .himAra-ka yA \uc{ju.hA} yanhaqu.} fa-qAla la-hu \uc{ju.hA}:
% \enquote{.garIbuN 'amru-ka yA .sadIqI 'a-tu.saddiqu 'l-.himAr-a
% wa-tuka_d_diba-nI?}
% \end{arab}
@@ -2672,14 +2745,14 @@
% \SetTranslitConvention{loc}
% \begin{arab}[trans]
% \LR{\textbf{\emph{\enquote*{loc}} standard:}} 'at_A .sadIquN 'il_A
-% \cap{ju.hA} ya.tlubu min-hu .himAra-hu li-yarkaba-hu fI safraTiN
+% \uc{ju.hA} ya.tlubu min-hu .himAra-hu li-yarkaba-hu fI safraTiN
% qa.sIraTiN fa-qAla la-hu: \enquote{sawfa 'u`Idu-hu 'ilay-ka fI
-% 'l-masA'-i wa-'adfa`u la-ka 'ujraTaN.} fa-qAla \cap{ju.hA}:
+% 'l-masA'-i wa-'adfa`u la-ka 'ujraTaN.} fa-qAla \uc{ju.hA}:
% \enquote{'anA 'AsifuN jiddaN 'annI lA 'asta.tI`u 'an 'u.haqqiqa
% la-ka ra.gbata-ka fa-'l-.himAr-u laysa hunA 'l-yawm-a.} wa-qabla
-% 'an yutimma \cap{ju.hA} kalAma-hu bada'a 'l-.himAr-u yanhaqu fI
+% 'an yutimma \uc{ju.hA} kalAma-hu bada'a 'l-.himAr-u yanhaqu fI
% 'i.s.tabli-hi. fa-qAla la-hu .sadIqu-hu: \enquote{'innI 'asma`u
-% .himAra-ka yA \cap{ju.hA} yanhaqu.} fa-qAla la-hu \cap{ju.hA}:
+% .himAra-ka yA \uc{ju.hA} yanhaqu.} fa-qAla la-hu \uc{ju.hA}:
% \enquote{.garIbuN 'amru-ka yA .sadIqI 'a-tu.saddiqu 'l-.himAr-a
% wa-tuka_d_diba-nI?}
% \end{arab}
@@ -2688,15 +2761,15 @@
% \SetTranslitConvention{arabica}
% \begin{arab}[trans]
% \LR{\textbf{\emph{\enquote*{arabica}} standard:}} 'at_A .sadIquN
-% 'il_A \cap{ju.hA} ya.tlubu min-hu .himAra-hu li-yarkaba-hu fI
+% 'il_A \uc{ju.hA} ya.tlubu min-hu .himAra-hu li-yarkaba-hu fI
% safraTiN qa.sIraTiN fa-qAla la-hu: \enquote{sawfa 'u`Idu-hu
% 'ilay-ka fI 'l-masA'-i wa-'adfa`u la-ka 'ujraTaN.} fa-qAla
-% \cap{ju.hA}: \enquote{'anA 'AsifuN jiddaN 'annI lA 'asta.tI`u 'an
+% \uc{ju.hA}: \enquote{'anA 'AsifuN jiddaN 'annI lA 'asta.tI`u 'an
% 'u.haqqiqa la-ka ra.gbata-ka fa-'l-.himAr-u laysa hunA 'l-yawm-a.}
-% wa-qabla 'an yutimma \cap{ju.hA} kalAma-hu bada'a 'l-.himAr-u
+% wa-qabla 'an yutimma \uc{ju.hA} kalAma-hu bada'a 'l-.himAr-u
% yanhaqu fI 'i.s.tabli-hi. fa-qAla la-hu .sadIqu-hu: \enquote{'innI
-% 'asma`u .himAra-ka yA \cap{ju.hA} yanhaqu.} fa-qAla la-hu
-% \cap{ju.hA}: \enquote{.garIbuN 'amru-ka yA .sadIqI 'a-tu.saddiqu
+% 'asma`u .himAra-ka yA \uc{ju.hA} yanhaqu.} fa-qAla la-hu
+% \uc{ju.hA}: \enquote{.garIbuN 'amru-ka yA .sadIqI 'a-tu.saddiqu
% 'l-.himAr-a wa-tuka_d_diba-nI?}
% \end{arab}
% \SetTranslitConvention{dmg}
@@ -2897,10 +2970,10 @@
% \cs{textbf}\marg{text} and the like, are assumed to have Arabic text
% as their arguments:---
% \begin{quote}
-% |\abjad{45}| |kitAbu-hu| |\emph{fI| |'l-\cap{`AdAt-i}}|
-% \arb[voc]{\abjad{45} kitAbu-hu \emph{fI 'l-\cap{`AdAt-i}}}
+% |\abjad{45}| |kitAbu-hu| |\emph{fI| |'l-\uc{`AdAt-i}}|
+% \arb[voc]{\abjad{45} kitAbu-hu \emph{fI 'l-\uc{`AdAt-i}}}
% \arb[trans]{\abjad{45} kitAbu-hu \emph{fI
-% 'l-\cap{`AdAt-i}}}.\footnote{This is odd in Arabic script, but
+% 'l-\uc{`AdAt-i}}}.\footnote{This is odd in Arabic script, but
% using such features as \cs{emph} or \cs{textbf} is a matter of
% personal taste.}
% \end{quote}
@@ -2952,11 +3025,11 @@
%<*example>
% \fi
\begin{arabluacode}
-\arb[fullvoc]{\cap{z}ayd-uN\LRfootnote{%
-\enquote{\arb[trans]{\cap{z}ayd} is the son of
-\arb[trans]{\cap{`a}mr}}: the second
+\arb[fullvoc]{\uc{z}ayd-uN\LRfootnote{%
+\enquote{\arb[trans]{\uc{z}ayd} is the son of
+\arb[trans]{\uc{`a}mr}}: the second
noun is not in apposition to the first, but forms
-part of the predicate\ldots} "ibn-u \cap{`a}mr-iNU}
+part of the predicate\ldots} "ibn-u \uc{`a}mr-iNU}
\end{arabluacode}
% \iffalse
%</example>
@@ -3077,13 +3150,13 @@
\begin{arabluacode}
\setquotestyle{arabic}
\begin{arab}[fullvoc]
- kAna \cap{'abU} \cap{'l-hu_dayli} 'ahd_A 'il_A \cap{muwaysiN}
+ kAna \uc{'abU} \uc{'l-hu_dayli} 'ahd_A 'il_A \uc{muwaysiN}
dajAjaTaN. wa-kAnat dajAjatu-hu 'llatI 'ahdA-hA dUna mA kAna
- yuttaxa_du li-\cap{muwaysiN}. wa-l_akinna-hu bi-karami-hi
+ yuttaxa_du li-\uc{muwaysiN}. wa-l_akinna-hu bi-karami-hi
wa-bi-.husni xuluqi-hi 'a.zhara 'l-ta`ajjuba min simani-hA
- wa-.tIbi la.hmi-hA. wa-kAna <\cap{'abU} \cap{'l-hu_dayli}> yu`rafu
+ wa-.tIbi la.hmi-hA. wa-kAna <\uc{'abU} \uc{'l-hu_dayli}> yu`rafu
bi-'l-'imsAki 'l-^sadIdi. fa-qAla: \enquote{wa-kayfa ra'ayta yA
- \cap{'abA} \cap{`imrAna} tilka 'l-dajAjaTa?} qAla:
+ \uc{'abA} \uc{`imrAna} tilka 'l-dajAjaTa?} qAla:
\enquote{kAnat `ajabaN mina 'l-`ajabi!} fa-yaqUlu:
\begin{quoting}[begintext=», endtext=«]
wa-tadrI mA jinsu-hA? wa-tadrI mA sinnu-hA? fa-'inna
@@ -3092,7 +3165,7 @@
na`lifu-hA?
\end{quoting}
fa-lA yazAlu fI h_a_dA wa-'l-'A_haru ya.d.haku .da.hkaN na`rifu-hu
- na.hnu wa-lA ya`rifu-hu \cap{'abU} \cap{'l-hu_dayli}.
+ na.hnu wa-lA ya`rifu-hu \uc{'abU} \uc{'l-hu_dayli}.
\end{arab}
\end{arabluacode}
% \iffalse
@@ -3116,9 +3189,9 @@
\setRL\paragraph{\arb[novoc]{rumUzi 'l-kitAbi}}\setLR
\begin{arab}[novoc]
\begin{description}
- \item[b] max.tU.tu 'l-maktabaTi 'l-'ahliyyaTi bi-\cap{bArIs} 2860
+ \item[b] max.tU.tu 'l-maktabaTi 'l-'ahliyyaTi bi-\uc{bArIs} 2860
`arabiyyuN.
- \item[s] max.tU.tu 'l-maktabaTi 'l-'ahliyyaTi bi-\cap{bArIs} 2859
+ \item[s] max.tU.tu 'l-maktabaTi 'l-'ahliyyaTi bi-\uc{bArIs} 2859
`arabiyyuN.
\item[m] max.tU.tu majlisi \arb[novoc]{^sUrAY malY} .tahrAna 521.
\end{description}
@@ -3227,20 +3300,20 @@
% \fi
\begin{arabluacode}
\begin{arab}
- \textcolor{red}{\cap{m}uha_d_dabu \cap{'l-d}Ini \cap{`a}bdu
- \cap{'l-r}a.hImi bnu \cap{`a}liyyiN} huwa ^say_hu-nA 'l-'imAmu
- 'l-.sadru 'l-kabIru 'l-`Alimu 'l-fA.dilu \cap{m}uha_d_dabu
- \cap{'l-d}Ini \cap{'a}bU \cap{m}u.hammadiN \cap{`a}bdu
- \cap{'l-r}a.hImi bnu \cap{`a}liyyi bni \cap{.h}AmidiN wa-yu`rafu
- bi-\cap{'l-d}a_hwari.
+ \textcolor{red}{\uc{m}uha_d_dabu \uc{'l-d}Ini \uc{`a}bdu
+ \uc{'l-r}a.hImi bnu \uc{`a}liyyiN} huwa ^say_hu-nA 'l-'imAmu
+ 'l-.sadru 'l-kabIru 'l-`Alimu 'l-fA.dilu \uc{m}uha_d_dabu
+ \uc{'l-d}Ini \uc{'a}bU \uc{m}u.hammadiN \uc{`a}bdu
+ \uc{'l-r}a.hImi bnu \uc{`a}liyyi bni \uc{.h}AmidiN wa-yu`rafu
+ bi-\uc{'l-d}a_hwari.
\end{arab}
\begin{arab}[trans]
- \textcolor{red}{\cap{m}uha_d_dabu \cap{'l-d}Ini \cap{`a}bdu
- \cap{'l-r}a.hImi bnu \cap{`a}liyyiN} huwa ^say_hu-nA 'l-'imAmu
- 'l-.sadru 'l-kabIru 'l-`Alimu 'l-fA.dilu \cap{m}uha_d_dabu
- \cap{'l-d}Ini \cap{'a}bU \cap{m}u.hammadiN \cap{`a}bdu
- \cap{'l-r}a.hImi bnu \cap{`a}liyyi bni \cap{.h}AmidiN wa-yu`rafu
- bi-\cap{'l-d}a_hwari.
+ \textcolor{red}{\uc{m}uha_d_dabu \uc{'l-d}Ini \uc{`a}bdu
+ \uc{'l-r}a.hImi bnu \uc{`a}liyyiN} huwa ^say_hu-nA 'l-'imAmu
+ 'l-.sadru 'l-kabIru 'l-`Alimu 'l-fA.dilu \uc{m}uha_d_dabu
+ \uc{'l-d}Ini \uc{'a}bU \uc{m}u.hammadiN \uc{`a}bdu
+ \uc{'l-r}a.hImi bnu \uc{`a}liyyi bni \uc{.h}AmidiN wa-yu`rafu
+ bi-\uc{'l-d}a_hwari.
\end{arab}
\end{arabluacode}
% \iffalse
@@ -3275,13 +3348,13 @@
% \changes{v1.5}{2016/11/14}{Compatibility with the \textsf{quran}
% package} \package{arabluatex} is compatible with the \package{quran}
% package so that both can be used in conjunction with one another for
-% typesetting the \arb[trans]{\cap{qur'An}}. As \package{quran} draws
-% the text of the \arb[trans]{\cap{qur'An}} from a unicode encoded
+% typesetting the \arb[trans]{\uc{qur'An}}. As \package{quran} draws
+% the text of the \arb[trans]{\uc{qur'An}} from a unicode encoded
% database, its commands have to be passed as arguments to the
% \cs{txarb} command for short insertions in left-to-right paragraphs,
% or inserted inside the \index{txarab=txarab (environment)}|txarab|
% environment for typesetting running paragraphs of
-% \arb[trans]{\cap{qur'An}}\emph{ic} text (see above
+% \arb[trans]{\uc{qur'An}}\emph{ic} text (see above
% \vref{sec:unicode-input} for more details). Please note that
% \package{arabluatex} takes care of formatting the Arabic: therefore,
% it is recommended to load the \package{quran} package with the
@@ -3299,7 +3372,7 @@
% \fi
%
% As an example, the following code will typeset the \arb[trans]{sUraT}
-% \arb[trans]{al-\cap{fAti.haT}}:---
+% \arb[trans]{al-\uc{fAti.haT}}:---
% \iffalse
%<*example>
% \fi
@@ -3350,7 +3423,7 @@
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{arabluatex}%
-[2017/10/24 v1.9.2 An ArabTeX-like interface for LuaLaTeX]
+[2018/01/03 v1.10 An ArabTeX-like interface for LuaLaTeX]
\RequirePackage{ifluatex}
% \end{macrocode}
% \package{arabluatex} requires \LuaLaTeX\ of course. Issue a warning
@@ -3578,29 +3651,39 @@
% \end{macro}
% \end{macro}
% \end{macro}
-% \begin{macro}{\cap} Proper Arabic names or book titles should be
-% passed to the \cs{cap} command so that they have their first letters
-% uppercased. \cs{cap} is actually coded in Lua.
+% \begin{macro}{\uc} Proper Arabic names or book titles should be
+% passed to the \cs{uc} command so that they have their first letters
+% uppercased. \cs{uc} is actually coded in Lua.
% \begin{macrocode}
-\DeclareDocumentCommand{\cap}{m}%
- {\luadirect{tex.sprint(cap(\luastringN{#1}))}}
+\NewDocumentCommand{\uc}{m}%
+ {\luadirect{tex.sprint(uc(\luastringN{#1}))}}
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\Cap} \cs{cap} may be used safely in all of the modes
+% \begin{macro}{\Uc} \cs{uc} may be used safely in all of the modes
% that are provided by \package{arabluatex} as any of the |voc|,
% |fullvoc| and |novoc| modes discard it on top of any other
-% functions to be run. \cs{Cap} does the same as \cs{cap} except
-% that \emph{it is never discarded}. For that reason, \cs{Cap}
+% functions to be run. \cs{Uc} does the same as \cs{uc} except
+% that \emph{it is never discarded}. For that reason, \cs{Uc}
% \emph{should never be used outside the} |trans|
-% \emph{mode}. \package{arabluatex} uses \cs{Cap} internally so as
-% to prevent \cs{cap} from being discarded in case words that are to
+% \emph{mode}. \package{arabluatex} uses \cs{Uc} internally so as
+% to prevent \cs{uc} from being discarded in case words that are to
% be transliterated are inserted into Arabic commands or
% environments where transliteration is not required. Therefore, it
% is not documented.
% \begin{macrocode}
-\let\Cap\cap
+\let\Uc\uc
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\prname}\changes{v1.10}{2018/01/03}{New command for
+% typesetting Arabic proper names in transliteration} \cs{prname} is
+% to be used outside Arabic environments for proper names. It takes as
+% argument one or more Arabic words, each of which will be rendered in
+% upright roman style with its first letter uppercased.
+% \begin{macrocode}
+\NewDocumentCommand{\prname}{m}{%
+ \bgroup\SetTranslitStyle{\relax}\arb[trans]{\uc{#1}}\egroup}
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\txarb} \cs{txarb} sets the direction to right-to-left
% and selects the Arabic font. It is used internally by several Lua
% functions, but available to the user should he wish to insert
Modified: trunk/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.ins
===================================================================
--- trunk/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.ins 2018-01-04 23:45:44 UTC (rev 46216)
+++ trunk/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.ins 2018-01-04 23:45:57 UTC (rev 46217)
@@ -1,7 +1,7 @@
%% This file is part of the `arabluatex' package
%%
%% ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-%% Copyright (C) 2016--2017 Robert Alessi
+%% Copyright (C) 2016--2018 Robert Alessi
%%
%% Please send error reports and suggestions for improvements to
%% Robert Alessi <alessi at robertalessi.net>
@@ -43,7 +43,7 @@
This file is part of the `arabluatex' package
ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright (C) 2016--2017 Robert Alessi
+Copyright (C) 2016--2018 Robert Alessi
Please send error reports and suggestions for improvements to Robert
Alessi <alessi at robertalessi.net>
Modified: trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex-patch.sty
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex-patch.sty 2018-01-04 23:45:44 UTC (rev 46216)
+++ trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex-patch.sty 2018-01-04 23:45:57 UTC (rev 46217)
@@ -11,7 +11,7 @@
%% This file is part of the `arabluatex' package
%%
%% ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-%% Copyright (C) 2016--2017 Robert Alessi
+%% Copyright (C) 2016--2018 Robert Alessi
%%
%% Please send error reports and suggestions for improvements to Robert
%% Alessi <alessi at robertalessi.net>
Modified: trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua 2018-01-04 23:45:44 UTC (rev 46216)
+++ trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua 2018-01-04 23:45:57 UTC (rev 46217)
@@ -2,7 +2,7 @@
This file is part of the `arabluatex' package
ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright (C) 2016--2017 Robert Alessi
+Copyright (C) 2016--2018 Robert Alessi
Please send error reports and suggestions for improvements to Robert
Alessi <alessi at robertalessi.net>
@@ -192,10 +192,10 @@
local function takeoutcapetc(str)
str = string.gsub(str, "(\\arb.?%[trans%])(%b{})", function(tag, body)
body = string.sub(body, 2, -2)
- body = string.gsub(body, "(\\cap%s?)(%b{})", "\\Cap%2")
+ body = string.gsub(body, "(\\uc%s?)(%b{})", "\\Uc%2")
return string.format("%s{%s}", tag, body)
end)
- str = string.gsub(str, "(\\cap.?)(%b{})", function(tag, body)
+ str = string.gsub(str, "(\\uc.?)(%b{})", function(tag, body)
body = string.sub(body, 2, -2)
return string.format("%s", body)
end)
@@ -665,25 +665,55 @@
return str
end
-function cap(str)
+function uc(str)
str = string.gsub(str, "(\\txtrans.?)(%b{})", function(tag, body)
body = string.sub(body, 2, -2)
return string.format("%s", body)
end)
- if string.find(str, "[^\\]%-['`ʾʿ]") then
- str = string.gsub(str, "([^\\]%-['`])", "%1\\MakeUppercase ")
- str = string.gsub(str, "([^\\]%-ʿ)", "%1\\MakeUppercase ")
- str = string.gsub(str, "([^\\]%-ʾ)", "%1\\MakeUppercase ")
- elseif string.find(str, "[^\\]%-[^'`ʾʿ]") then
- str = string.gsub(str, "([^\\]%-)", "%1\\MakeUppercase ")
- elseif string.find(str, "^['`ʾʿ]") then
- str = string.gsub(str, "^(['`])", "%1\\MakeUppercase ")
- str = string.gsub(str, "^(ʿ)", "%1\\MakeUppercase ")
- str = string.gsub(str, "^(ʾ)", "%1\\MakeUppercase ")
- else
- str = "\\MakeUppercase "..str
+ str = string.gsub(str, "(%s[%(%<%[]?)(bn)", "%1{%2}")
+ for i = 1,#lcuc do
+ str = string.gsub(str, "^([%S]-%-[`']?)"..lcuc[i].a, "{%1"..lcuc[i].b.."}")
end
-return "\\txtrans{"..str.."}"
+ for i = 1,#lcuc do
+ str = string.gsub(str, "(%s[%(%<%[]?)([%S]-%-[`']?)"..lcuc[i].a, "%1{%2"..lcuc[i].b.."}")
+ end
+ for i = 1,#lcuc do
+ str = string.gsub(str, "^([%S]-%-ʿ)"..lcuc[i].a, "{%1"..lcuc[i].b.."}")
+ end
+ for i = 1,#lcuc do
+ str = string.gsub(str, "(%s[%(%<%[]?)([%S]-%-ʿ)"..lcuc[i].a, "%1{%2"..lcuc[i].b.."}")
+ end
+ for i = 1,#lcuc do
+ str = string.gsub(str, "^([%S]-%-ʾ)"..lcuc[i].a, "{%1"..lcuc[i].b.."}")
+ end
+ for i = 1,#lcuc do
+ str = string.gsub(str, "(%s[%(%<%[]?)([%S]-%-ʾ)"..lcuc[i].a, "%1{%2"..lcuc[i].b.."}")
+ end
+ for i = 1,#lcuc do
+ str = string.gsub(str, "^([`'])"..lcuc[i].a, "{%1"..lcuc[i].b.."}")
+ end
+ for i = 1,#lcuc do
+ str = string.gsub(str, "(%s[%(%<%[]?)([`'])"..lcuc[i].a, "%1{%2"..lcuc[i].b.."}")
+ end
+ for i = 1,#lcuc do
+ str = string.gsub(str, "^(ʾ)"..lcuc[i].a, "{%1"..lcuc[i].b.."}")
+ end
+ for i = 1,#lcuc do
+ str = string.gsub(str, "(%s[%(%<%[]?)(ʾ)"..lcuc[i].a, "%1{%2"..lcuc[i].b.."}")
+ end
+ for i = 1,#lcuc do
+ str = string.gsub(str, "^(ʿ)"..lcuc[i].a, "{%1"..lcuc[i].b.."}")
+ end
+ for i = 1,#lcuc do
+ str = string.gsub(str, "(%s[%(%<%[]?)(ʿ)"..lcuc[i].a, "%1{%2"..lcuc[i].b.."}")
+ end
+ for i = 1,#lcuc do
+ str = string.gsub(str, "^"..lcuc[i].a, lcuc[i].b)
+ end
+ for i = 1,#lcuc do
+ str = string.gsub(str, "(%s[%(%<%[]?)"..lcuc[i].a, "%1"..lcuc[i].b)
+ end
+ return "\\txtrans{"..str.."}"
end
-- this function is adapted from an 'obsolete project' of Khaled
Modified: trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty 2018-01-04 23:45:44 UTC (rev 46216)
+++ trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty 2018-01-04 23:45:57 UTC (rev 46217)
@@ -11,7 +11,7 @@
%% This file is part of the `arabluatex' package
%%
%% ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-%% Copyright (C) 2016--2017 Robert Alessi
+%% Copyright (C) 2016--2018 Robert Alessi
%%
%% Please send error reports and suggestions for improvements to Robert
%% Alessi <alessi at robertalessi.net>
@@ -41,7 +41,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{arabluatex}%
-[2017/10/24 v1.9.2 An ArabTeX-like interface for LuaLaTeX]
+[2018/01/03 v1.10 An ArabTeX-like interface for LuaLaTeX]
\RequirePackage{ifluatex}
\ifluatex\else
\PackageError{arabluatex}{lualatex needed}{%
@@ -118,9 +118,11 @@
\NewDocumentCommand{\ArbUpDflt}{}{\let\al at arbup=\al at arbup@dflt}
\NewDocumentCommand{\NoArbUp}{}{\RenewDocumentCommand{\al at arbup}{m}{##1}}
\NewDocumentCommand{\SetArbUp}{m}{\RenewDocumentCommand{\al at arbup}{m}{#1}}
-\DeclareDocumentCommand{\cap}{m}%
- {\luadirect{tex.sprint(cap(\luastringN{#1}))}}
-\let\Cap\cap
+\NewDocumentCommand{\uc}{m}%
+ {\luadirect{tex.sprint(uc(\luastringN{#1}))}}
+\let\Uc\uc
+\NewDocumentCommand{\prname}{m}{%
+ \bgroup\SetTranslitStyle{\relax}\arb[trans]{\uc{#1}}\egroup}
\DeclareDocumentCommand{\txarb}{+m}{\bgroup\textdir
TRT\arabicfont#1\egroup}
\DeclareDocumentCommand{\txtrans}{+m}{\bgroup\textdir
Modified: trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_fullvoc.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_fullvoc.lua 2018-01-04 23:45:44 UTC (rev 46216)
+++ trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_fullvoc.lua 2018-01-04 23:45:57 UTC (rev 46217)
@@ -2,7 +2,7 @@
This file is part of the `arabluatex' package
ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright (C) 2016--2017 Robert Alessi
+Copyright (C) 2016--2018 Robert Alessi
Please send error reports and suggestions for improvements to Robert
Alessi <alessi at robertalessi.net>
Modified: trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_novoc.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_novoc.lua 2018-01-04 23:45:44 UTC (rev 46216)
+++ trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_novoc.lua 2018-01-04 23:45:57 UTC (rev 46217)
@@ -2,7 +2,7 @@
This file is part of the `arabluatex' package
ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright (C) 2016--2017 Robert Alessi
+Copyright (C) 2016--2018 Robert Alessi
Please send error reports and suggestions for improvements to Robert
Alessi <alessi at robertalessi.net>
Modified: trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_trans.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_trans.lua 2018-01-04 23:45:44 UTC (rev 46216)
+++ trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_trans.lua 2018-01-04 23:45:57 UTC (rev 46217)
@@ -2,7 +2,7 @@
This file is part of the `arabluatex' package
ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright (C) 2016--2017 Robert Alessi
+Copyright (C) 2016--2018 Robert Alessi
Please send error reports and suggestions for improvements to Robert
Alessi <alessi at robertalessi.net>
@@ -35,7 +35,7 @@
{a="[%^%_](.)", b="<??>%1"}
}
--- cap
+-- cap (legacy)
captr = {
-- dmg (defaut); loc as well
{a="ā", b="Ā"},
@@ -69,6 +69,51 @@
{a="ī", b="Ī"}
}
+-- uc
+lcuc = {
+ {a="b", b="B"},
+ {a="t", b="T"},
+ {a="ṯ", b="Ṯ"},
+ {a="ǧ", b="Ǧ"},
+ {a="j", b="J"},
+ {a="ḥ", b="Ḥ"},
+ {a="ḫ", b="Ḫ"},
+ {a="d", b="D"},
+ {a="ḏ", b="Ḏ"},
+ {a="r", b="R"},
+ {a="z", b="Z"},
+ {a="s", b="S"},
+ {a="š", b="Š"},
+ {a="ṣ", b="Ṣ"},
+ {a="ḍ", b="Ḍ"},
+ {a="ṭ", b="Ṭ"},
+ {a="ẓ", b="Ẓ"},
+ {a="ġ", b="Ġ"},
+ {a="f", b="F"},
+ {a="q", b="Q"},
+ {a="k", b="K"},
+ {a="l", b="L"},
+ {a="m", b="M"},
+ {a="n", b="N"},
+ {a="h", b="H"},
+ {a="w", b="W"},
+ {a="y", b="Y"},
+ {a="u", b="U"},
+ {a="a", b="A"},
+ {a="i", b="I"},
+ {a="ū", b="Ū"},
+ {a="ā", b="Ā"},
+ {a="ī", b="Ī"},
+ -- additional characters
+ {a="p", b="P"},
+ {a="č", b="Č"},
+ {a="ž", b="Ž"},
+ {a="v", b="V"},
+ {a="g", b="G"},
+ {a="ñ", b="Ñ"},
+ {a="ch", b="Ch"}, -- loc
+}
+
-- dmg
hamzatrdmg = {
Modified: trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua 2018-01-04 23:45:44 UTC (rev 46216)
+++ trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua 2018-01-04 23:45:57 UTC (rev 46217)
@@ -2,7 +2,7 @@
This file is part of the `arabluatex' package
ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright (C) 2016--2017 Robert Alessi
+Copyright (C) 2016--2018 Robert Alessi
Please send error reports and suggestions for improvements to Robert
Alessi <alessi at robertalessi.net>
More information about the tex-live-commits
mailing list