\cap{} was already defined in math mode, oh dear! replaced with \uc{}

7 files changed, 214 insertions, 212 deletions

diff --git a/arabluatex.dtx b/arabluatex.dtx
index d741c27..17e6ed0 100644
--- a/arabluatex.dtx
+++ b/arabluatex.dtx
@@ -227,7 +227,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{707}
+% \CheckSum{0}
 %
 % \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
@@ -371,7 +371,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
@@ -943,7 +943,7 @@ vowels (see §~3).
 %   \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 +1020,7 @@ vowels (see §~3).
 % \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 +1068,10 @@ vowels (see §~3).
 %   \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 +1092,9 @@ vowels (see §~3).
 %   \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 +1104,11 @@ vowels (see §~3).
 %
 %   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 +1484,21 @@ vowels (see §~3).
 %
 %   \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 +1551,7 @@ vowels (see §~3).
 %   '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 +1561,12 @@ vowels (see §~3).
 % 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 +1636,9 @@ vowels (see §~3).
 % \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 +1708,8 @@ vowels (see §~3).
 %   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 +1732,8 @@ vowels (see §~3).
 %   \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 +1775,8 @@ vowels (see §~3).
 % \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 +1849,8 @@ vowels (see §~3).
 % \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 +1912,14 @@ word that \cs{arbnull} is applied to.
     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 +1936,7 @@ word that \cs{arbnull} is applied to.
 % 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}
@@ -2048,7 +2048,7 @@ word that \cs{arbnull} is applied to.
 % \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 +2061,7 @@ word that \cs{arbnull} is applied to.
 %   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,15 +2257,15 @@ word that \cs{arbnull} is applied to.
 %
 % \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
 % 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 +2273,7 @@ word that \cs{arbnull} is applied to.
 % \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 +2281,8 @@ word that \cs{arbnull} is applied to.
   \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 +2299,7 @@ word that \cs{arbnull} is applied to.
 %</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 +2307,8 @@ word that \cs{arbnull} is applied to.
 %  \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 +2325,7 @@ word that \cs{arbnull} is applied to.
 % \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 +2333,8 @@ word that \cs{arbnull} is applied to.
 %  \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,42 +2469,42 @@ word that \cs{arbnull} is applied to.
 %</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,
 % 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
 % 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,12 +2513,12 @@ word that \cs{arbnull} is applied to.
 % 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-rAziyyu}| \arb{\cap{'abU}
-%   \cap{bakriN} \cap{mu\-.ham\-mad-u} bnu \cap{za\-ka\-riy\-yA'a}
-%   \cap{'l-rAziyyu}} \arb[trans]{\cap{'abU} \cap{bakriN}
-%   \cap{mu\-.ham\-mad-u} bn-u \cap{za\-ka\-riy\-yA'-a}
-%   \cap{'l-rAziyyu}}.
+%   |\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}
 %
 % \subsection{Additional note on \texttt{dmg} convention}
@@ -2528,10 +2528,10 @@ word that \cs{arbnull} is applied to.
 % 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 +2575,8 @@ muhaddamaTaN mi'_danatu-hu}: \arb[trans]{ra'aytu
 %   \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 +2624,7 @@ muhaddamaTaN mi'_danatu-hu}: \arb[trans]{ra'aytu
 %   |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 +2634,9 @@ muhaddamaTaN mi'_danatu-hu}: \arb[trans]{ra'aytu
 %   \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 +2651,20 @@ muhaddamaTaN mi'_danatu-hu}: \arb[trans]{ra'aytu
 % \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 +2672,14 @@ muhaddamaTaN mi'_danatu-hu}: \arb[trans]{ra'aytu
 % \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 +2688,15 @@ muhaddamaTaN mi'_danatu-hu}: \arb[trans]{ra'aytu
 % \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 +2897,10 @@ muhaddamaTaN mi'_danatu-hu}: \arb[trans]{ra'aytu
 % \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 +2952,11 @@ al-muqAtil-Ina.}, wa-kAnat 'ummI min `u.zamA'-i buyUt-i
 %<*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 +3077,13 @@ qAla barzawayhi bn-u 'azhar-a, ra's-u 'a.tibbA'-i fAris-a...
 \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 +3092,7 @@ qAla barzawayhi bn-u 'azhar-a, ra's-u 'a.tibbA'-i fAris-a...
       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 +3116,9 @@ qAla barzawayhi bn-u 'azhar-a, ra's-u 'a.tibbA'-i fAris-a...
  \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 +3227,20 @@ qAla barzawayhi bn-u 'azhar-a, ra's-u 'a.tibbA'-i fAris-a...
 % \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 +3275,13 @@ wa-ya.sIru ta.hta 'l-jild-i
 % \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 +3299,7 @@ wa-ya.sIru ta.hta 'l-jild-i
 % \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
@@ -3578,27 +3578,27 @@ wa-ya.sIru ta.hta 'l-jild-i
 % \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/02}{New command for
@@ -3608,7 +3608,7 @@ wa-ya.sIru ta.hta 'l-jild-i
 % style with its first letter uppercased.
 %    \begin{macrocode}
 \NewDocumentCommand{\prname}{m}{%
-  \bgroup\SetTranslitStyle{\upshape}\arb[trans]{\cap{#1}}\egroup}
+  \bgroup\SetTranslitStyle{\upshape}\arb[trans]{\uc{#1}}\egroup}
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\txarb} \cs{txarb} sets the direction to right-to-left
diff --git a/arabluatex.el b/arabluatex.el
index a3744c1..d91a63a 100644
--- a/arabluatex.el
+++ b/arabluatex.el
@@ -63,7 +63,8 @@
     '("ArbUpDflt" 0)
     '("NoArbUp" 0)
     "SetArbUp"
-    "cap"
+    "uc"
+    "prname"
     "txarb"
     '("arb" [ (TeX-arg-eval completing-read "Mode: "
                             LaTeX-arabluatex-mode-options) ]
diff --git a/arabluatex.lua b/arabluatex.lua
index e763b2a..b539484 100644
--- a/arabluatex.lua
+++ b/arabluatex.lua
@@ -192,10 +192,10 @@ end
 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,7 +665,7 @@ function processtrans(str, mode, rules, scheme)
 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)
diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua
index 78ec4a5..86a55b0 100644
--- a/arabluatex_trans.lua
+++ b/arabluatex_trans.lua
@@ -35,7 +35,7 @@ nulltr = {
    {a="[%^%_](.)", b="<??>%1"}
 }
 
--- cap
+-- cap (legacy)
 captr = {
    -- dmg (defaut); loc as well
    {a="ā", b="Ā"},
@@ -69,6 +69,51 @@ captr = {
    {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 = {
diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index 986ecb5..a0108fe 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -71,50 +71,6 @@ raw = {
    {a="i", b="ِ"}
 }
 
-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
-}
-
 buckwalter = {
    --- hard coded madda: hold it for now
    {a="%|", b="@"},
diff --git a/samples/al-Jahiz.tex b/samples/al-Jahiz.tex
index 7089be5..ff87b2e 100644
--- a/samples/al-Jahiz.tex
+++ b/samples/al-Jahiz.tex
@@ -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 @@ prevent lines from overflowing into the right margin.
 \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}
diff --git a/samples/template-01.tex b/samples/template-01.tex
index 3d5f27d..1a5ea4f 100644
--- a/samples/template-01.tex
+++ b/samples/template-01.tex
@@ -91,7 +91,7 @@ English paragraph: To have the \arb[trans]{sukUn} and the
   \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 @@ English paragraph: To have the \arb[trans]{sukUn} and the
   \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}