1 files changed, 454 insertions, 846 deletions

diff --git a/arabluatex.dtx b/arabluatex.dtx
index 92e04df..3b2f4c2 100644
--- a/arabluatex.dtx
+++ b/arabluatex.dtx
@@ -1,23 +1,22 @@
 % \iffalse meta-comment
 % ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-% Copyright (C) 2016--2020  Robert Alessi
-%
-% Please send error reports and suggestions for improvements to Robert
+% Copyright (C) 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023  Robert
 % Alessi <alessi@robertalessi.net>
 %
-% This program is free software: you can redistribute it and/or modify
-% it under the terms of the GNU General Public License as published by
-% the Free Software Foundation, either version 3 of the License, or
-% (at your option) any later version.
-%
-% This program is distributed in the hope that it will be useful, but
-% WITHOUT ANY WARRANTY; without even the implied warranty of
-% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-% General Public License for more details.
+% Permission to use, copy, modify, and distribute this software for any
+% purpose with or without fee is hereby granted, provided that the above
+% copyright notice and this permission notice appear in all copies.
+% 
+% THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+% WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+% MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+% ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+% WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+% ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+% OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 %
-% You should have received a copy of the GNU General Public License
-% along with this program.  If not, see
-% <http://www.gnu.org/licenses/>.
+% Please send error reports and suggestions for improvements to Robert
+% Alessi <alessi@robertalessi.net>
 % \fi
 %
 % \iffalse
@@ -27,7 +26,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{arabluatex}
 %<*package>
-    [2020/03/23 v1.20 ArabTeX for LuaLaTeX]
+    [2023/05/21 v1.21-dev ArabTeX for LuaLaTeX]
 %</package>
 %
 %<*driver>
@@ -37,24 +36,24 @@
 % This file is part of the `arabluatex' package
 %
 % ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-% Copyright (C) 2016--2020  Robert Alessi
 %
-% Please send error reports and suggestions for improvements to Robert
-% Alessi <alessi@robertalessi.net>
-%
-% This program is free software: you can redistribute it and/or modify
-% it under the terms of the GNU General Public License as published by
-% the Free Software Foundation, either version 3 of the License, or
-% (at your option) any later version.
+% Copyright (C) 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023
+% Robert Alessi <alessi@robertalessi.net>
 %
-% This program is distributed in the hope that it will be useful, but
-% WITHOUT ANY WARRANTY; without even the implied warranty of
-% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-% General Public License for more details.
+% Permission to use, copy, modify, and distribute this software for any
+% purpose with or without fee is hereby granted, provided that the above
+% copyright notice and this permission notice appear in all copies.
+% 
+% THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+% WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+% MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+% ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+% WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+% ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+% OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 %
-% You should have received a copy of the GNU General Public License
-% along with this program.  If not, see
-% <http://www.gnu.org/licenses/>.
+% Please send error reports and suggestions for improvements to Robert
+% Alessi <alessi@robertalessi.net>
 
 @software{pkg:arabtex,
   author =       {Lagally, Klaus},
@@ -78,6 +77,15 @@
   url =          {http://www.amirifont.org/}
 }
 
+@software{pkg:ekdosis,
+  title =        {The Ekdosis package},
+  subtitle =     {Typesetting TEI-xml compliant Critical Editions},
+  author =       {Alessi, Robert},
+  url =          {http://www.ekdosis.org},
+  date =         {2021-11-21},
+  version =      {1.4}
+}
+
 @Book{Habash,
   author =       {Habash, Nizar Y.},
   title =        {Introduction to Arabic Natural Language Processing},
@@ -161,14 +169,23 @@
 \usepackage{fontspec}
 \defaultfontfeatures{Renderer=Harfbuzz}
 \usepackage[english]{babel}
-\usepackage{dox}
-\doxitem{Option}{option}{options}
+%^^A dox does not work with the latest latex-dev:
+\ifdefined\SpecialMacroIndex
+  \NewDocElement{Option}{option}
+\else
+  \usepackage{dox}
+  \doxitem{Option}{option}{options}
+\fi
 \usepackage{microtype}
-\babelfont{rm}{Old Standard}
-\babelfont{sf}{NewComputerModern Sans}
-\babelfont{tt}{NewComputerModern Mono}
+\babelfont{rm}[RawFeature=onum]{Old Standard}
+\babelfont{sf}{NewComputerModernSans10}
+\babelfont{tt}{NewComputerModernMono10}
+\usepackage{manfnt}
+\usepackage{lettrine}
+\newcommand\danger{\lettrine[loversize=-.5]{\textdbend}{\hskip6pt}}
 \usepackage{metalogox}
-\usepackage{arabluatex}[2020/03/23]
+\usepackage{arabluatex}[2023/05/21]
+\SetTranslitConvention{dmg+}
 \SetArbUp{\textsuperscript{\thinspace#1}} % Old Standard needs this
 \usepackage[nopar]{quran}
 \usepackage[noindex]{nameauth}
@@ -176,7 +193,7 @@
 \usepackage{latexcolors}
 \PassOptionsToPackage{bookmarks=true}{hyperref}
 \usepackage[numbered]{hypdoc}
-\usepackage{uri}
+\newcommand{\phts}{\phantomsection}
 \usepackage[loadlang=en]{metastr}
 \hypersetup{
   colorlinks,
@@ -206,6 +223,7 @@
 \metaset[sep]{draft}{ -- }
 \metasetlang{en-US}
 \metaset{title}{arabluatex}
+\metaset[print]{title}{\textsf{arabluatex}}
 \metaset{date}{\filedate}
 \metaset{draft}{\fileversion}
 \metaset{subject}{ArabTeX}
@@ -220,18 +238,24 @@
 \metaset{partof}{The arabluatex Package}
 \metaset[print]{partof}{The \textsf{arabluatex} Package}
 \metaset{copyrightowner}{\metapick[#1]{author}}
-\metaset{copyrightdate}{2016--2020}
-\metaset{licensemessage}{Permission is granted to copy, distribute
-  and/or modify this document under the terms of the GNU Free
-  Documentation License, Version 1.3 or any later version published by
-  the Free Software Foundation; with no Invariant Sections, no
-  Front-Cover Texts, and no Back-Cover Texts.  A copy of the license
-  is included in the section entitled ``GNU Free Documentation
-  License''.}
-\metaset{licenseurl}{https://www.gnu.org/licenses/fdl-1.3.html}
+\metaset{copyrightdate}{2016, 2017, 2018, 2019, 2020, 2021, 2022,
+  2023}
+\metaset{licensemessage}{Permission to use, copy, modify, and
+  distribute this software for any purpose with or without fee is
+  hereby granted, provided that the above copyright notice and this
+  permission notice appear in all copies.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+  WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+  AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+  DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+  OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+  PERFORMANCE OF THIS SOFTWARE.}
+\metaset{licenseurl}{%
+  https://cvsweb.openbsd.org/src/share/misc/license.template?rev=HEAD}
 \metaset[print]{licenseurl}{%
-  \url{https://www.gnu.org/licenses/fdl-1.3.html}}
-\metaset[cmd]{licenselogo}{\includegraphics[scale=0.75]{#1}}
+ \url{https://cvsweb.openbsd.org/src/share/misc/license.template?rev=HEAD}}
 \metawritepdfinfo
 \metawritepdfaux
 \metawritepdfpreamble
@@ -247,8 +271,11 @@
 \setlist[enumerate,2]{label=\roman*.}
 \newlist{enumabjad}{enumerate}{10}
 \setlist[enumabjad]{label={\abjad{\arabic*}}}
-\usepackage{multicol}
-\setlength\IndexMin{100pt}
+\newlist{remarks}{enumerate}{10}
+\setlist[remarks]{
+  label*=\textsc{Rem.} \emph{\alph*},
+  left=0.25in,
+  before=\smaller}
 \usepackage{quoting}
 \quotingsetup{noorphans, rightmargin=0pt}
 \renewcommand*{\quotingfont}{\footnotesize}
@@ -268,15 +295,16 @@
   bottom=0mm}
 \newtcblisting{example}{minted options={linenos, numbersep=0mm,
     fontsize=\smaller}}
-\newtcblisting{code}{minted options={linenos, numbersep=0mm,
+\newtcblisting{alcode}{minted options={linenos, numbersep=0mm,
     fontsize=\smaller}, listing only}
+\VerbatimFootnotes
 \newcommand{\package}[1]{\textsf{#1}\index{#1=#1 (package)}}
 \usepackage[contents]{colordoc}
 \usepackage{csquotes}
 \DeclareQuoteStyle{arabic}
 {\rmfamily\textquotedblright}{\rmfamily\textquotedblleft}
 {\rmfamily\textquoteright}{\rmfamily\textquoteleft}
-\usepackage[style=authoryear, indexing=cite]{biblatex}
+\usepackage[style=oxnotes-inote,indexing=cite]{biblatex}
 \DeclareIndexFieldFormat{indextitle}{\index{#1=\emph{#1}}}
 \addbibresource{arabluatex.bib}
 \NewDocumentCommand{\newfeature}{o}{%
@@ -286,6 +314,8 @@
   {\marginpar{\hfill\emph{New feature} #1}}%
   \ignorespaces
 }
+\usepackage{uri}
+\usepackage[obeyspaces]{xurl}
 \usepackage{multicol}
 \usepackage{tocloft}
 \renewcommand\cftlotprehook{\begin{multicols}{2}}
@@ -293,24 +323,27 @@
 \renewcommand\cftlottitlefont{\Large\bfseries}
 \usepackage{etoc}
 \etocsettocdepth{paragraph}
+\makeatletter
 \newcommand{\altableofcontents}{%
   \begingroup
   \etocsetstyle{section}{}{}
-  {\etocsavedsectiontocline{%
+  {\l@section{%
       \numberline{\etocnumber}\etocname}{\etocpage}}{}
   \etocsetstyle{subsection}{}{}
-  {\etocsavedsubsectiontocline{%
+  {\l@subsection{%
       \numberline{\etocnumber}\etocname}{\etocpage}}{}%
   \etocsetstyle{subsubsection}{}{}
-  {\etocsavedsubsubsectiontocline{%
+  {\l@subsubsection{%
       \numberline{\etocnumber}\etocname}{\etocpage}}{}%
   \etocsetstyle{paragraph}{}{\leftskip2cm\rightskip 2.2em \parfillskip
     0pt plus 1fil\relax \nobreak}
   {\noindent\etocname{} \etocpage{} }{\par}%
   \etocmulticolstyle[2]{\section*{Contents}}
   \pdfbookmark[1]{Contents}{toc}
-  \tableofcontents
+  \etoctoclines
+  \localtableofcontents
   \endgroup}
+\makeatother
 \setlength\IndexMin{100pt}
 \EnableCrossrefs
 \RecordChanges
@@ -392,6 +425,7 @@
 % \altableofcontents
 % \listoftables
 % \normalsize
+% \VerbatimFootnotes
 % 
 % \begin{abstract}
 %   This package provides for {\LuaLaTeX} an Arab{\TeX}-like interface
@@ -403,53 +437,59 @@
 %   input notation. Its output can be set in the same modes of
 %   vocalization as Arab\TeX, or in different roman
 %   transliterations. It further allows many typographical
-%   refinements. It will eventually interact with some other packages
-%   yet to come to produce from \verb|.tex| source files, in addition
-%   to printed books, \texttt{TEI xml} compliant critical editions
-%   and/or lexicons that can be searched, analyzed and correlated in
-%   various ways.
+%   refinements. Furthermore, it can interact with the \pkg{ekdosis}
+%   package to produce from \verb|.tex| source files, in addition to
+%   printed books, \texttt{TEI xml} compliant critical editions and/or
+%   lexicons that can be searched, analyzed and correlated in various
+%   ways.
 % \end{abstract}
 %
 % \section*{License and Disclaimer}
 % \addcontentsline{toc}{section}{License and disclamer}
-% \subsection*{License Applicable to this Document}
-% \pdfbookmark[2]{Licence applicable to this document}{copyright-doc}
-% \leavevmode\marginpar{\hfill\texttt{fdl1.3}}
-% \metapick[print]{rightstext} (See below \vref{sec:fdl}.)
-%
-% \subsection*{License Applicable to the Software}
-% \pdfbookmark[2]{Licence applicable to the software}{copyright-soft}
-% \label{sec:license-software}
+% \leavevmode\marginpar{\hfill\texttt{OpenBSD}} \pkg{arabluatex} is
+% licensed under the terms of the so-called OpenBSD license, as it is
+% modelled after the ISC copyright, which is functionally equivalent
+% to a two-term BSD copyright with language removed that is made
+% unnecessary by the Berne convention.\footnote{More information about
+% the OpenBSD policy to which \pkg{arabluatex} adheres:
+% \url{https://www.openbsd.org/policy.html}.}
 %
-% \package{arabluatex} --- \metapick[print]{subtitle}
-% \metapick[print]{copyrightstatement}
+% \iffalse
+%<*example>
+% \fi
+\begin{minted}[linenos=false]{text}
+arabluatex -- ArabTeX for LuaLaTeX
+----------------------------------------------------------
+
+Copyright (c) 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023
+Robert Alessi <alessi@robertalessi.net>
+
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+\end{minted}
+% \iffalse
+%</example>
+% \fi
 %
 % Please send error reports and suggestions for improvements to Robert
 % Alessi:
 % \begin{itemize}
 % \item email: \mailto[arabluatex package]{alessi@roberalessi.net}
-% \item website: \url{http://www.robertalessi.net/arabluatex}
+% \item website: \url{https://sr.ht/~ralessi/arabluatex/}
 % \item development: \url{http://git.robertalessi.net/arabluatex}
 % \item comments, feature requests, bug reports:
-% \url{https://gitlab.com/ralessi/arabluatex/issues}
+% \url{https://todo.sr.ht/~ralessi/arabluatex}
 % \end{itemize}
 %
-% \leavevmode\marginpar{\hfill\texttt{gpl3+}}
-% This program is free software: you can redistribute it and/or modify
-% it under the terms of the GNU General Public License as published by
-% the Free Software Foundation, either version 3 of the License, or
-% (at your option) any later version.
-%
-% This program is distributed in the hope that it will be useful, but
-% WITHOUT ANY WARRANTY; without even the implied warranty of
-% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-% General Public License for more details.
-%
-% You should have received a copy of the GNU General Public License
-% along with this program.  If not, see
-% \href{http://www.gnu.org/licenses}%
-% {\texttt{<http://www.gnu.org/licenses/>}}.
-%
 % This release of \package{arabluatex} consists of the following
 % source files:
 % \begin{itemize}
@@ -581,21 +621,25 @@
 % issue a warning message and attempt to load the Amiri
 % font\footnote{\textcite{pkg:amiri}.} like so:---\\
 % \tcboxverb{\newfontfamily\arabicfont{Amiri}[Script=Arabic]}
-% \begin{quoting}
-%   \textsc{Rem.} By default Amiri places the \arb[trans]{kasraT} in
-%   combination with the \arb[trans]{ta^sdId} below the consonant,
-%   like so: \arb{BBi}\,. That is correct, as at least in the oldest
+% \begin{remarks}
+% \item By default Amiri places the \arb[trans]{kasraT} in combination
+%   with the \arb[trans]{ta^sdId} below the consonant, like so:
+%   \arb{BBi}\,. That is correct, as at least in the oldest
 %   manuscripts {\renewfontfamily\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
-%   of the \arb[trans]{kasraT} above the consonant may be obtained by
+%   RawFeature={+ss05}]\arb{BBi}} may stand for \arb{BBa} as 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},
 %   \textcite[6]{pkg:amiri}.}\\
 %   \tcboxverb{\newfontfamily\arabicfont{Amiri}[Script=Arabic,RawFeature={+ss05}]}
 %
 %   Other Arabic fonts may behave differently.
-% \end{quoting}
+%
+%   \item \cs{newfontfamily} can be used to have
+%   either Indian of Arabic numbers printed. See
+%   \vpageref{ref:arabic-numbers} for more information.
+% \end{remarks}
 %
 % \subsection{Options}
 % \label{sec:options}
@@ -629,8 +673,8 @@
 % standards. At present, three standards are supported (see below
 % \vref{sec:transliteration} for more details):
 % \begin{description}
-% \item[dmg] \emph{Deutsche Morgenländische Gesellschaft}, which is
-%   selected by default;
+% \item[dmg/dmg+] \emph{Deutsche Morgenländische Gesellschaft} |dmg|
+%   is selected by default;
 % \item[loc] \emph{Library of Congress};
 % \item[arabica] \emph{Arabica}.
 % \end{description}
@@ -797,11 +841,11 @@
 % \iffalse
 %<*example>
 % \fi
-\begin{code}
+\begin{alcode}
   \begin{arab}
   [...]
   \end{arab}
-\end{code}
+\end{alcode}
 % \iffalse
 %</example>
 % \fi
@@ -858,14 +902,14 @@
 % all of the Arabic consonants.
 %
 % \newcommand{\dmg}[1]{%
-%   \SetTranslitConvention{dmg}%
+%   \SetTranslitConvention{dmg+}%
 %   \arb[trans]{#1}}
 % \newcommand{\loc}[1]{%
 %   \SetTranslitConvention{loc}%
-%   \arb[trans]{#1}\SetTranslitConvention{dmg}}
+%   \arb[trans]{#1}\SetTranslitConvention{dmg+}}
 % \newcommand{\brill}[1]{%
 %   \SetTranslitConvention{arabica}%
-%   \arb[trans]{#1}\SetTranslitConvention{dmg}}
+%   \arb[trans]{#1}\SetTranslitConvention{dmg+}}
 % \begin{longtable}{lllll}
 % \bottomrule
 % \caption[]{Standard Arab\TeX\ (consonants)}
@@ -874,19 +918,19 @@
 % \captionlistentry{Standard Arab\TeX\ (consonants)}
 % Letter & \multicolumn{3}{l}{Transliteration\footnotemark}
 % & Arab\TeX\ notation \\
-%        & \texttt{dmg} & \texttt{loc} & \texttt{arabica} & \\ \midrule
+%        & \texttt{dmg+} & \texttt{loc} & \texttt{arabica} & \\ \midrule
 % \endfirsthead
 % \toprule
 % Letter & \multicolumn{3}{l}{Transliteration}
 % & Arab\TeX\ notation \\
-%        & \texttt{dmg} & \texttt{loc} & \texttt{arabica} & \\ \midrule
+%        & \texttt{dmg+} & \texttt{loc} & \texttt{arabica} & \\ \midrule
 % \endhead \footnotetext{See below \vref{sec:transliteration}.}
 % \label{tab:arabtex-consonants}
 % \arb[voc]{'i 'a 'u}\footnote{See below, \emph{Rem{.} a.} For
 % \arb[trans]{'alif} as a consonant, see \textcite[i. 16
 % D]{Wright}. The \arb[trans]{hamzaT} itself is encoded \texttt{<'>}
 % and may be followed by either \meta{u, a} or \meta{i}. See below
-% \vref{ref:hamza}.} & \dmg{'u, 'a, 'i} &
+% \vref{ref:hamza}.} & \dmg{|'u, |'a, |'i} &
 % \loc{|'u, |'a, |'i} & \brill{|'u, |'a, |'i} & |'u| or |'a| or |'i| \\
 % \arb[novoc]{b} & \dmg{b} & \loc{b} & \brill{b} & |b| \\
 % \arb[novoc]{t} & \dmg{t} & \loc{t} & \brill{t} & |t| \\
@@ -917,14 +961,14 @@
 % \arb[novoc]{w} & \dmg{w} & \loc{w} & \brill{w} & |w| \\
 % \arb[novoc]{y} & \dmg{y} & \loc{y} & \brill{y} & |y|\footnote{For
 % the letter \arb[novoc]{.y} with no diacritical points below, see
-% \emph{Rem{.} b.} below.} \\
+% \vref{ref:dotless-ya} below.} \\
 % \arb[novoc]{T} & \dmg{aT} & \loc{aT} & \brill{aT} & |T| \\
 % \end{longtable}
-% \begin{quoting}
-%   \textsc{Rem.}~\emph{a.} Please note that in all cases of elision,
-%   the \arb[trans]{'alifu 'l-wa.sli} is expressed only by the vowel
-%   that accompanies the omitted \arb[trans]{hamzaT}: \meta{u, a, i}
-%   as in |wa-inhazama| \arb[fullvoc]{wa-inhazama}
+% \begin{remarks}
+% \item Please note that in all cases of elision, the
+%   \arb[trans]{'alifu 'l-wa.sli} is expressed only by the vowel that
+%   accompanies the omitted \arb[trans]{hamzaT}: \meta{u, a, i} as in
+%   |wa-inhazama| \arb[fullvoc]{wa-inhazama}
 %   \arb[trans]{wa-inhazama}. For more details on the definite article
 %   and the \arb[trans]{'alifu 'l-wa.sli} see
 %   \vref{ref:definite-article}.
@@ -938,10 +982,10 @@
 %   absence of vowel), |wa-.Aan| \arb{wa-.Aan} \arb[trans]{wa-.Aan},
 %   |wa-.Ain| \arb{wa-.Ain} \arb[trans]{wa-.Ain}.
 %   
-%   \textsc{Rem.}~\emph{b.} The letter \arb[novoc]{y} with two points
-%   below, \arb{al-yA'u 'l-mu_tannATu min ta.hti-hA}, may also be
-%   written without diacritical points as \arb[novoc]{Y}. When it is
-%   used as a consonant, it is encoded |aY|, where |a| recalls the
+% \item \label{ref:dotless-ya}The letter \arb[novoc]{y} with two
+%   points below, \arb{al-yA'u 'l-mu_tannATu min ta.hti-hA}, may also
+%   be written without diacritical points as \arb[novoc]{Y}. When it
+%   is used as a consonant, it is encoded |aY|, where |a| recalls the
 %   \arb[trans]{fat.haT} placed above the preceding letter in
 %   vocalized Arabic, like so: |qaY'uN| \arb{qaY'uN}
 %   \arb[trans]{qaY'uN}, |^saY'uN| \arb{^saY'uN} \arb[trans]{^saY'uN},
@@ -951,14 +995,15 @@
 %   like so: |qa.y'uN| \arb{qa.y'uN} \arb[trans]{qa.y'uN}, |^sa.y'uN|
 %   \arb{^sa.y'uN} \arb[trans]{^sa.y'uN}, |^sa.y'aN|
 %   \arb[trans]{^sa.y'aN} \arb{^sa.y'aN}.
-% \end{quoting}
+% \end{remarks}
 %
 % \subsection{Additional characters}
 % \changes{v1.8.5}{2017/06/20}{Six additional Persian characters are
 % now available}
 % \newfeature[v1.8.5]\Vref{tab:arabtex-additional-characters} gives
 % the Arab\TeX\ equivalents for some additional Persian characters.
-% 
+%
+% \enlargethispage{2\baselineskip}
 % \begin{longtable}{lllll}
 % \bottomrule
 % \caption[]{Standard Arab\TeX\ (additional characters)}
@@ -967,13 +1012,13 @@
 % \captionlistentry{Standard Arab\TeX\ (additional characters)}
 % Letter & \multicolumn{3}{l}{Transliteration\footnotemark}
 % & Arab\TeX\ notation \\
-%        & \texttt{dmg} & \texttt{loc} & \texttt{arabica}\footnotemark
+%        & \texttt{dmg+} & \texttt{loc} & \texttt{arabica}\footnotemark
 %        & \\ \midrule
 % \endfirsthead
 % \toprule
 % Letter & \multicolumn{3}{l}{Transliteration}
 % & Arab\TeX\ notation \\
-%        & \texttt{dmg} & \texttt{loc} & \texttt{arabica} & \\ \midrule
+%        & \texttt{dmg+} & \texttt{loc} & \texttt{arabica} & \\ \midrule
 % \endhead
 % \addtocounter{footnote}{-1}
 % \footnotetext{See below \vref{sec:transliteration}.}
@@ -993,11 +1038,11 @@
 % \arb[novoc]{^n}\footnote{See \vref{fn:not-in-dmg}.} & \dmg{^n} &
 % \loc{^n} & \brill{^n} & \verb|^n| \\
 % \end{longtable}
-% \begin{quoting}
-%   \textsc{Rem.} The alveolar consonants \arb[novoc]{^c} and
+% \begin{remarks}
+% \item[\textsc{Rem.}] The alveolar consonants \arb[novoc]{^c} and
 %   \arb[novoc]{^z} are processed as solar letters by
 %   \package{arabluatex}.
-% \end{quoting}
+% \end{remarks}
 % 
 % \subsection{Vowels}
 % \subsubsection{Long vowels}
@@ -1012,12 +1057,12 @@
 % \captionlistentry{Standard Arab\TeX\ (long vowels)}
 % Letter & \multicolumn{3}{l}{Transliteration\footnotemark}
 % & Arab\TeX\ notation \\
-%        & \texttt{dmg} & \texttt{loc} & \texttt{arabica} & \\ \midrule
+%        & \texttt{dmg+} & \texttt{loc} & \texttt{arabica} & \\ \midrule
 % \endfirsthead
 % \toprule
 % Letter & \multicolumn{3}{l}{Transliteration}
 % & Arab\TeX\ notation \\
-%        & \texttt{dmg} & \texttt{loc} & \texttt{arabica} & \\ \midrule
+%        & \texttt{dmg+} & \texttt{loc} & \texttt{arabica} & \\ \midrule
 % \endhead \footnotetext{See below \vref{sec:transliteration}.}
 % \label{tab:arabtex-long-vowels}
 % \arb[novoc]{A} & \dmg{A} & \loc{A} & \brill{A} & \verb|A| \\
@@ -1032,10 +1077,10 @@
 % \arb[novoc]{B_i} & \dmg{B_i} & \loc{B_i} & \brill{B_i} & \verb|_i| \\
 % \end{longtable}
 %
-% \begin{quoting}
-%   \textsc{Rem.}~\emph{a.} The long vowels \arb[trans]{A, U, I},
-%   otherwise called \arb[trans]{.hurUf-u 'l-madd-i}, \emph{the
-%   letters of prolongation}, involve the placing of the short vowels
+% \begin{remarks}
+% \item The long vowels \arb[trans]{A, U, I}, otherwise called
+%   \arb[trans]{.hurUf-u 'l-madd-i}, \emph{the letters of
+%   prolongation}, involve the placing of the short vowels
 %   \arb[trans]{Ba, Bu, Bi} before the letters \arb[novoc]{A},
 %   \arb[novoc]{U}, \arb[novoc]{I} respectively. \package{arabluatex}
 %   does that automatically in case any from |voc|, |fullvoc| or
@@ -1043,23 +1088,23 @@
 %   \arb[voc]{qIla} \arb[trans]{qIla}, \arb[voc]{yaqUlu}
 %   \arb[trans]{yaqUlu}.
 %
-%   \textsc{Rem.}~\emph{b.} Defective writings, such as
-%   \arb[novoc]{B_a}, \arb[trans]{al-'alif-u 'l-ma.h_dUfaT-u}, or
-%   defective writings of \arb[trans]{B_u} and \arb[trans]{B_i} are
-%   encoded |_a| |_u| and |_i| respectively, e.g. |_d_alika|
-%   \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
+% \item Defective writings, such as \arb[novoc]{B_a},
+%   \arb[trans]{al-'alif-u 'l-ma.h_dUfaT-u}, or defective writings of
+%   \arb[trans]{B_u} and \arb[trans]{B_i} are encoded |_a| |_u| and
+%   |_i| respectively, e.g. |_d_alika| \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]{\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
-%   written without diacritical points as \arb[novoc]{Y}. When it is
-%   used as a long vowel, it is encoded |iY|, where |i| recalls the
+% \item The letter \arb[novoc]{y} with two points below, \arb{al-yA'u
+%   'l-mu_tannATu min ta.hti-hA}, may also be written without
+%   diacritical points as \arb[novoc]{Y}. When it is used as a long
+%   vowel, it is encoded |iY|, where |i| recalls the
 %   \arb[trans]{kasraT} placed below the preceding letter in vocalized
 %   Arabic, like so: |liY| \arb{liY} \arb[trans]{liY}, |yam^siY|
 %   \arb{yam^siY} \arb[trans]{yam^siY}.
-% \end{quoting}
+% \end{remarks}
 % 
 % \subsubsection{Short vowels}
 % \Vref{tab:arabtex-short-vowels} gives the Arab\TeX\ equivalents for
@@ -1073,12 +1118,12 @@
 % \captionlistentry{Standard Arab\TeX\ (short vowels)}
 % Letter & \multicolumn{3}{l}{Transliteration\footnotemark}
 % & Arab\TeX\ notation \\
-%        & \texttt{dmg} & \texttt{loc} & \texttt{arabica} & \\ \midrule
+%        & \texttt{dmg+} & \texttt{loc} & \texttt{arabica} & \\ \midrule
 % \endfirsthead
 % \toprule
 % Letter & \multicolumn{3}{l}{Transliteration}
 % & Arab\TeX\ notation \\
-%        & \texttt{dmg} & \texttt{loc} & \texttt{arabica} & \\ \midrule
+%        & \texttt{dmg+} & \texttt{loc} & \texttt{arabica} & \\ \midrule
 % \endhead \footnotetext{See below \vref{sec:transliteration}.}
 % \label{tab:arabtex-short-vowels}
 % \arb[voc]{Ba} & \dmg{Ba} & \loc{Ba} & \brill{Ba} & \verb|a| \\
@@ -1912,11 +1957,11 @@
 % \captionlistentry{\enquote{Quoted} \arb[trans]{hamzaT}}
 % Letter & \multicolumn{3}{l}{Transliteration\footnotemark}
 % & Arab\TeX\ notation \\
-% & \texttt{dmg} & \texttt{loc} & \texttt{arabica} & \\ \midrule
+% & \texttt{dmg+} & \texttt{loc} & \texttt{arabica} & \\ \midrule
 % \endfirsthead
 % \toprule Letter & \multicolumn{3}{l}{Transliteration}
 % & Arab\TeX\ notation \\
-% & \texttt{dmg} & \texttt{loc} & \texttt{arabica} & \\ \midrule
+% & \texttt{dmg+} & \texttt{loc} & \texttt{arabica} & \\ \midrule
 % \endhead
 % \footnotetext{See below \vref{sec:transliteration}.}
 % \label{tab:quoted-hamza}
@@ -2071,6 +2116,34 @@
 %   |sanaT-i| |1024| \arb[voc]{fI sanaT-i 1024}
 % \end{quote}
 %
+% \needspace{2\baselineskip}
+% \DescribeMacro{\SetArbNumbers}\newfeature[v1.21]
+% \phts\label{ref:arabic-numbers}
+% \cs{SetArbNumbers}\verb+{Indian|Arabic}+ %
+% \hfill\tcboxverb{Default: Indian}\\
+% As described above, \package{arabluatex} prints Indian numbers by
+% default. \cs{SetArbNumbers}|{Arabic}| can be used at any point of
+% the document to have Arabic numbers printed.  Furthermore,
+% \cs{SetArbNumbers}|{Arabic}| gives control over the way numbers are
+% to be printed by means of the |anum| font feature, like so:---
+% 
+% \iffalse
+%<*example>
+% \fi
+\begin{alcode}
+  \usepackage{arabluatex}
+  \SetArbNumbers{Arabic}
+  % use '+anum' for Arabic numbers or '-anum' for Indian numbers:
+  \newfontfamily\arabicfont{Amiri}[Script=Arabic, RawFeature={+anum}]
+\end{alcode}
+% \iffalse
+%</example>
+% \fi
+%
+% \danger \cs{SetArbNumbers} must be used \emph{outside} Arabic
+% environments. Once used, this commands operates on subsequent Arabic
+% environments.
+%
 % \subsubsection{The \emph{abjad}}
 % \label{sec:abjad}
 % The numbers may also be expressed with letters from right to left
@@ -2088,19 +2161,19 @@
 %   kitAbu-hu fI 'l-`AdAt-i} \arb[trans]{\abjad{45} kitAbu-hu fI
 %   'l-`AdAt-i}.
 % \end{quote}
-% \begin{quoting}
-%   \textsc{Rem.}~\emph{a.} As can be seen in the above given example,
+% \begin{remarks}
+% \item As can be seen in the above given example,
 %   \package{arabluatex} expresses the \arb[trans]{'abjad} numbers in
 %   Roman numerals if it finds the \cs{abjad} command in any of the
 %   transliteration modes.
 %
-%   \textsc{Rem.}~\emph{b.} \cs{abjad} may also be found outside
-%   Arabic environments. In that case, \package{arabluatex} does not
-%   print the stroke as a distinctive mark over the number for it is
-%   not surrounded by other Arabic words. In case one nonetheless
-%   wishes to print the stroke, he can either use the \cs{aoline*}
-%   command that is described below in \vref{sec:underlining} or
-%   insert the \arb[trans]{'ab^gad} number in |\arb[novoc]{}|:---
+% \item \cs{abjad} may also be found outside Arabic environments. In
+%   that case, \package{arabluatex} does not print the stroke as a
+%   distinctive mark over the number for it is not surrounded by other
+%   Arabic words. In case one nonetheless wishes to print the stroke,
+%   he can either use the \cs{aoline*} command that is described below
+%   in \vref{sec:underlining} or insert the \arb[trans]{'ab^gad}
+%   number in |\arb[novoc]{}|:---
 %   \begin{quote}
 %     |The| |\arb[trans]{'abjad}| |number| |for| |1874| |is|
 %     |\abjad{1874}| The \arb[trans]{'abjad} number for 1874 is
@@ -2114,7 +2187,7 @@
 %     |\arb[novoc]{\abjad{1874}}| The \arb[trans]{'abjad} number for
 %     1874 is \arb[novoc]{\abjad{1874}}.
 %   \end{quote}
-% \end{quoting}
+% \end{remarks}
 %
 % \newfeature[v1.12]\cs{abjad} may also be used to convert values of
 % counters into \arb[trans]{'ab^gad} numbers, like so:--- %
@@ -2154,12 +2227,12 @@
 % \captionlistentry{Additional Arabic codings}
 % Letter & \multicolumn{3}{l}{Transliteration\footnotemark}
 % & Arab\TeX\ notation \\
-%        & \texttt{dmg} & \texttt{loc} & \texttt{arabica} & \\ \midrule
+%        & \texttt{dmg+} & \texttt{loc} & \texttt{arabica} & \\ \midrule
 % \endfirsthead
 % \toprule
 % Letter & \multicolumn{3}{l}{Transliteration}
 % & Arab\TeX\ notation \\
-%        & \texttt{dmg} & \texttt{loc} & \texttt{arabica} \\ \midrule
+%        & \texttt{dmg+} & \texttt{loc} & \texttt{arabica} \\ \midrule
 % \endhead \footnotetext{See below \vref{sec:transliteration}.}
 % \label{tab:additional-arabic-codings}
 % \arb[novoc]{.b} & \dmg{.b} & \loc{.b} & \brill{.b} & |.b| \\
@@ -2168,6 +2241,15 @@
 % \arb[novoc]{.q} & \dmg{.q} & \loc{.q} & \brill{.q} & |.q| \\
 % \arb[novoc]{.k} & \dmg{.k} & \loc{.k} & \brill{.k} & |.k| \\
 % \arb[novoc]{.n} & \dmg{.n} & \loc{.n} & \brill{.n} & |.n| \\
+% \arb[novoc]{H}  & \dmg{aH}  & \loc{aH}  & \brill{aH}  &
+% |H|\footnote{This letter can be used to encode the \arb[trans]{tA'
+% marbUtaT} devoid of diacritical points as it is found in some
+% manuscripts, with the same \arb[trans]{tanwIn} and the same
+% short vowels as the standard \arb[trans]{tA' marbUtaT} with two
+% points above, e. g. |al-madInaHa|, |madInaHaN|, \arb{al-madInaHa},
+% \arb{madInaHaN}.} \\
+% \arb[novoc]{.y} & \dmg{.y} & \loc{.y} & \brill{.y} &
+% |.y|\footnote{See above \vref{ref:dotless-ya}.} \\
 % \arb[novoc]{((} & \dmg{((} & \loc{((} & \brill{((} & |((| \\
 % \arb[novoc]{))} & \dmg{))} & \loc{))} & \brill{))} & |))| \\
 % \end{longtable}
@@ -2194,18 +2276,18 @@
 %   \arb[trans]{\abjad{45}: kitAbu-hu \aemph{fI 'l-\uc{`AdAt-i}}}.
 % \end{quote}
 % 
-% \begin{quoting}
-%   \textsc{Rem.}~\emph{a.} As the above example shows,
-%   \package{arabluatex} places the horizontal stroke \emph{under} the
-%   emphasized words in any of the transliteration modes.
-%
-%   \textsc{Rem.}~\emph{b.} \newfeature[v1.9.2]\DescribeMacro{\aemph*}
-%   \cs{aemph*} is also provided should one wish to always have the
-%   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-\uc{`AdAt-i}}}.
-% \end{quoting}
+% \begin{remarks}
+% \item As the above example shows, \package{arabluatex} places the
+%   horizontal stroke \emph{under} the emphasized words in any of the
+%   transliteration modes.
+%
+% \item \newfeature[v1.9.2]\DescribeMacro{\aemph*} \cs{aemph*} is also
+%   provided should one wish to always have the 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-\uc{`AdAt-i}}}.
+% \end{remarks}
 %
 % \subsubsection{Underlining words or numbers}
 % \label{sec:underlining}
@@ -2235,11 +2317,11 @@
 % \iffalse
 %<*example>
 % \fi
-\begin{code}
+\begin{alcode}
   \begin{arabverse}[key1=value1, key2=value2, ...]
     <verses>
   \end{arabverse}
-\end{code}
+\end{alcode}
 % \iffalse
 %</example>
 % \fi
@@ -2308,8 +2390,9 @@
 % when \texttt{export} is set to \texttt{true} to instruct some Lua
 % functions that lines of poetry have already been processed. That
 % aside, \cs{bayt} and \cs{bayt*} do the same, and only \cs{bayt}
-% should be used.}  Additionally, every \cs{bayt} command \emph{must}
-% be followed with |\\| like so:---%
+% should be used.} Additionally, every \cs{bayt} command \emph{must}
+% be followed with |\\| like so:---
+%
 % \iffalse
 %<*example>
 % \fi
@@ -2444,6 +2527,16 @@
 % package can also be used for the same effect. However, it must be
 % loaded \emph{after} \package{arabluatex}.}
 %
+% \needspace{3\baselineskip}
+% \paragraph{Critical Notes}
+% \DescribeMacro{\bayt+} \newfeature[v1.21] If the \pkg{ekdosis}
+% package be loaded,\footcite{pkg:ekdosis} the \cs{bayt} command also
+% accepts a |+| optional argument that can be used to let critical
+% notes be inserted in lines of poetry. Details on how to use this
+% command are provided in the relevant section of the documentation of
+% the \pkg{ekdosis} package.\footcite[\nopp see \enquote{Arabic
+% Poetry}]{pkg:ekdosis} 
+%
 % \paragraph{Line numbering}
 % Inside the |arabverse| environment, the |linenumbers| environment of
 % the \package{lineno} package can be used to have the lines of
@@ -2466,7 +2559,7 @@
 % \iffalse
 %<*example>
 % \fi
-\begin{code}
+\begin{alcode}
   \begin{arab}[fullvoc]
     qAla imru'u 'l-\uc{q}aysi fI mu`allaqati-hi:
   \end{arab}
@@ -2475,7 +2568,7 @@
       'l-`arU.di 'l-'_Ul_A mina 'l-.tawIli)}]
     \SetArbDflt*
     \begin{linenumbers*}
-      \bayt{qifA nabki min _dikr_A .habIbiN wa-manzili}{bi-saq.ti
+      \bayt{qifA nabki min _dikr_A .habIbiN wa-manzili}{bi-siq.ti
         '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}\\
@@ -2489,7 +2582,7 @@
         rasmiN dArisiN min mu`awwali}\\
     \end{linenumbers*}
   \end{arabverse}
-\end{code}
+\end{alcode}
 % \iffalse
 %</example>
 % \fi%
@@ -2504,7 +2597,7 @@
 %  'l-`arU.di 'l-'_Ul_A mina 'l-.tawIli)}, width=.25\linewidth]
 %  \SetArbDflt*
 %   \begin{linenumbers*}
-%     \bayt{qifA nabki min _dikr_A .habIbiN wa-manzili}{bi-saq.ti
+%     \bayt{qifA nabki min _dikr_A .habIbiN wa-manzili}{bi-siq.ti
 %     '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}\\
@@ -2529,7 +2622,7 @@
 %  'l-`arU.di 'l-'_Ul_A mina 'l-.tawIli)}, width=.4\linewidth]
 %  \SetArbDflt*
 %   \begin{linenumbers*}
-%     \bayt{qifA nabki min _dikr_A .habIbiN wa-manzili}{bi-saq.ti
+%     \bayt{qifA nabki min _dikr_A .habIbiN wa-manzili}{bi-siq.ti
 %     '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}\\
@@ -2558,7 +2651,7 @@
 %  'l-`arU.di 'l-'_Ul_A mina 'l-.tawIli)}, width=.3\linewidth]
 %  \SetArbDflt*
 %   \begin{linenumbers*}
-%     \bayt{qifA nabki min _dikr_A .habIbiN wa-manzili}{bi-saq.ti
+%     \bayt{qifA nabki min _dikr_A .habIbiN wa-manzili}{bi-siq.ti
 %     '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 mi--n ^gan----UbiN wa-^sam'ali}\\
@@ -2586,7 +2679,7 @@
 %  \SetArbDflt*
 %  \scriptsize
 %   \begin{linenumbers*}
-%     \bayt{qifA nabki min _dikr_A .habIbiN wa-manzili}{bi-saq.ti
+%     \bayt{qifA nabki min _dikr_A .habIbiN wa-manzili}{bi-siq.ti
 %     '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}\\
@@ -2946,12 +3039,12 @@
 % \captionlistentry{Arab\TeX\ diacritics for \cs{arbcolor}}
 % Diacritic & \multicolumn{3}{l}{Transliteration\footnotemark}
 % & Arab\TeX\ notation \\
-%        & \texttt{dmg} & \texttt{loc} & \texttt{arabica} & \\ \midrule
+%        & \texttt{dmg+} & \texttt{loc} & \texttt{arabica} & \\ \midrule
 % \endfirsthead
 % \toprule
 % Diacritic & \multicolumn{3}{l}{Transliteration}
 % & Arab\TeX\ notation \\
-%        & \texttt{dmg} & \texttt{loc} & \texttt{arabica} & \\ \midrule
+%        & \texttt{dmg+} & \texttt{loc} & \texttt{arabica} & \\ \midrule
 % \endhead \footnotetext{See below \vref{sec:transliteration}.}
 % \label{tab:arbcolor-diacritics}
 % \arb{B.a} & \dmg{.a} & \loc{.a} & \brill{.a} & \verb|.a| \\
@@ -3040,8 +3133,8 @@
 %   \arb{^gAmi`aT|\arbcolor[red]{\arbnull{T}aN}}
 %   \arb[trans]{^gAmi`aT|\arbcolor[red]{\arbnull{T}aN}}.
 % \end{quote}
-% \begin{quoting}
-%   \textsc{Rem.} Note that in the last example
+% \begin{remarks}
+% \item[\textsc{Rem.}] Note that in the last example
 %   (\arb[trans]{^gAmi`aT|\arbcolor[red]{\arbnull{T}aN}}), the
 %   \enquote*{pipe} character has been inserted before
 %   \cs{arbcolor}. Otherwise, the |dmg| mode of the transliteration
@@ -3050,7 +3143,7 @@
 %   \txtrans{t}).\footnote{See also \vpageref{ref:ta-marbutah-pipe}
 %   \enquote{Discarding the \arb[trans]{'i`rAb}} for more
 %   information.}
-% \end{quoting}
+% \end{remarks}
 %
 % The \arb[trans]{tanwIn} preceding a \arb[novoc]{_A} conveys even
 % more intricate business to the rendering with the utmost accuracy in
@@ -3107,10 +3200,10 @@
 %</example>
 % \fi%
 % 
-% \begin{quoting}
-%   \textsc{Rem.} In the preceding example, any consonant could have
-%   been passed as argument to the \cs{arbnull} command.
-% \end{quoting}
+% \begin{remarks}
+% \item[\textsc{Rem.}] In the preceding example, any consonant could
+%   have been passed as argument to the \cs{arbnull} command.
+% \end{remarks}
 % 
 % \paragraph{\texorpdfstring{\arb[trans]{^sad\-daT}}{šaddah}}
 % In the following example, it is assumed that the
@@ -3197,6 +3290,9 @@
 % adopted by the International Convention of Orientalist Scholars in
 % Rome in 1935.\footnote{See \textcite{dmg}.} |dmg| transliteration
 % convention is selected by default;
+% \item[dmg+] This is the same as above, with the difference that the
+%   hamza is always printed, even in words preceded by the definite
+%   article, as in \arb[trans]{al-'asadu}.
 % \item[loc] \emph{Library of Congress}: this standard is part of a
 %   large set of standards for romanization of non-roman scripts
 %   adopted by the American Library Association and the Library of
@@ -3219,16 +3315,16 @@
 % transliteration mode, which is set to |dmg| by default, may be
 % changed at any point of the document by the
 % \cs{SetTranslitConvention}\marg{mode} command , where \meta{mode}
-% may be either |dmg|, |loc| or |arabica|. This command is also
+% may be either |dmg|, |dmg+|, |loc| or |arabica|. This command is also
 % accepted in the preamble should one wish to set the transliteration
 % mode globally, e.g.:---%
 % \iffalse
 %<*example>
 % \fi
-\begin{code}
+\begin{alcode}
   \usepackage{arabluatex}
   \SetTranslitConvention{loc}
-\end{code}
+\end{alcode}
 % \iffalse
 %</example>
 % \fi
@@ -3250,10 +3346,10 @@
 % \iffalse
 %<*example>
 % \fi
-\begin{code}
+\begin{alcode}
   \newfontfamily\translitfont{Gentium Plus}[Ligatures=TeX]
   \SetTranslitFont{\translitfont}
-\end{code}
+\end{alcode}
 % \iffalse
 %</example>
 % \fi
@@ -3366,14 +3462,15 @@
 %</example>
 % \fi
 % 
-% \begin{quoting}\label{ref:prname-star}
-%   \textsc{Rem.} \DescribeMacro{\prname*} \package{arabluatex} also
-%   provides \cs{prname*} which only renders in upright roman style
-%   already transliterated proper names without applying any further
+% \begin{remarks}
+% \item[\textsc{Rem.}] \label{ref:prname-star}
+%   \DescribeMacro{\prname*} \package{arabluatex} also provides
+%   \cs{prname*} which only renders in upright roman style already
+%   transliterated proper names without applying any further
 %   processing. It is mostly used internally and applied to proper
 %   names exported in Unicode to an external selected
 %   file.\footnote{See below \vref{sec:arabtex2utf} for more details.}
-% \end{quoting}
+% \end{remarks}
 % 
 % \subsection{Additional note on \texttt{dmg} convention}
 % \label{sec:additional-note-dmg}
@@ -3444,29 +3541,29 @@
 %   \arb[voc]{al-.zulm-Atu} \arb[trans]{al-.zulm-Atu}.
 % \end{quote}
 %
-% \begin{quoting}
-%   \textsc{Rem.}~\emph{a.} As the \arb[trans]{tanwIn} is passed over
-%   in pronunciation when it is followed by the letters
-%   \arb[novoc]{r}, \arb[novoc]{l}, \arb[novoc]{m}, \arb[novoc]{w},
-%   \arb[novoc]{y} (see \vref{ref:assimilation}), it may be desirable
-%   to further distinguish it by putting it above the line, but not to
-%   do the same for \arb[trans]{.gayr mun.sarif} terminations. This
-%   can be achieved by simply omitting the hyphen before any
+% \begin{remarks}
+% \item As the \arb[trans]{tanwIn} is passed over in pronunciation
+%   when it is followed by the letters \arb[novoc]{r}, \arb[novoc]{l},
+%   \arb[novoc]{m}, \arb[novoc]{w}, \arb[novoc]{y} (see
+%   \vref{ref:assimilation}), it may be desirable to further
+%   distinguish it by putting it above the line, but not to do the
+%   same for \arb[trans]{.gayr mun.sarif} terminations. This can be
+%   achieved by simply omitting the hyphen before any
 %   \arb[trans]{.gayr mun.sarif} termination:---\\
 %   |kAna| |.ganiyyaN| |l_akinna-hu| |labisa| |^gubbaTaN| |mumazzaqaN|
 %   |'aydu-hA| \arb[voc]{kAna .ganiyyaN l_akinna-hu labisa ^gubbaTaN
 %   mumazzaqaN 'aydu-hA} \arb[trans]{kAna .ganiyyaN l_akinna-hu labisa
 %   ^gubbaTaN mumazzaqaN 'aydu-hA}.
 %
-%   \textsc{Rem.}~\emph{b.} Although the hyphen before the
-%   \arb[trans]{tanwIn} is optional as \package{arabluatex} always
-%   parses nouns with such termination, it may also be used to mark
+% \item Although the hyphen before the \arb[trans]{tanwIn} is optional
+%   as \package{arabluatex} always parses nouns with such termination,
+%   it may also be used to mark
 %   better the inflectional endings:---\\
 %   |mana`a| |'l-nAs-a| |kAffaT-aN| |min| |mu_hA.tabati-hi|
 %   |'a.had-uN| |bi-sayyidi-nA| \arb[voc]{mana`a 'l-nAs-a kAffaT-aN
 %   min mu_hA.tabati-hi 'a.had-uN bi-sayyidi-nA} \arb[trans]{mana`a
 %   'l-nAs-a kAffaT-aN min mu_hA.tabati-hi 'a.had-uN bi-sayyidi-nA}.
-% \end{quoting}
+% \end{remarks}
 % 
 % \paragraph{\texorpdfstring{Discar\-ding the
 % \arb[trans]{'i`rAb}}{Discarding the ʾiʿrāb}}
@@ -3484,17 +3581,17 @@
 %   state): |.hikmaT| |al-l_ah| \arb[trans]{.hikmaT| \uc{al-l_ah}},
 %   |fi.d.daT| |al-darAhim| \arb[trans]{fi.d.daT al-darAhim}.
 % \end{enumerate}
-% \begin{quoting}
-%   \textsc{Rem.} It may so happen, as in the absence of the article
-%   before the annexed word, that \package{arabluatex} be unable to
-%   determine which of the above two cases the word ending with
-%   \arb[trans]{tA' marbU.taT} falls into. The \enquote*{pipe}
+% \begin{remarks}
+% \item[\textsc{Rem.}] It may so happen, as in the absence of the
+%   article before the annexed word, that \package{arabluatex} be
+%   unable to determine which of the above two cases the word ending
+%   with \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:
 %   |\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}
+%   |\uc{^g}AlInUs| \arb[trans]{\uc{r}isAlaT fI tartIb qirA'aT| kutub
+%   \uc{^g}AlInUs}.
+% \end{remarks}
 % 
 %
 % \paragraph{Uncertain short vowels}
@@ -3511,9 +3608,9 @@
 % \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}
+% \SetTranslitConvention{dmg+}
 % \begin{arab}[trans]
-%   \LR{\textbf{\emph{\enquote*{dmg}} standard:}} 'at_A .sadIquN 'il_A
+%   \LR{\textbf{\emph{\enquote*{dmg+}} standard:}} 'at_A .sadIquN '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 \uc{ju.hA}:
@@ -3540,7 +3637,7 @@
 %   \enquote{.garIbuN 'amru-ka yA .sadIqI 'a-tu.saddiqu 'l-.himAr-a
 %   wa-tuka_d_diba-nI?}
 % \end{arab}
-% \SetTranslitConvention{dmg}
+% \SetTranslitConvention{dmg+}
 %
 % \SetTranslitConvention{arabica}
 % \begin{arab}[trans]
@@ -3556,7 +3653,7 @@
 %   \uc{ju.hA}: \enquote{.garIbuN 'amru-ka yA .sadIqI 'a-tu.saddiqu
 %   'l-.himAr-a wa-tuka_d_diba-nI?}
 % \end{arab}
-% \SetTranslitConvention{dmg}
+% \SetTranslitConvention{dmg+}
 %
 % \section{Buckwalter input scheme}
 % \label{sec:buckwalter-scheme}
@@ -3580,10 +3677,10 @@
 % \iffalse
 %<*example>
 % \fi
-\begin{code}
+\begin{alcode}
   \usepackage{arabluatex}
   \SetInputScheme{buckwalter}
-\end{code}
+\end{alcode}
 % \iffalse
 %</example>
 % \fi
@@ -3616,13 +3713,13 @@
 % \captionlistentry{Buckwalter input scheme}
 % Letter & \multicolumn{3}{l}{Transliteration\footnotemark}
 % & \multicolumn{2}{l}{Buckwalter notation} \\
-% & \texttt{dmg} & \texttt{loc} & \texttt{arabica} & |base/xml| &
+% & \texttt{dmg+} & \texttt{loc} & \texttt{arabica} & |base/xml| &
 % |safe| \\ \midrule
 % \endfirsthead
 % \toprule
 % Letter & \multicolumn{3}{l}{Transliteration}
 % & \multicolumn{2}{l}{Buckwalter notation} \\
-% & \texttt{dmg} & \texttt{loc} & \texttt{arabica} & |base/xml| &
+% & \texttt{dmg+} & \texttt{loc} & \texttt{arabica} & |base/xml| &
 % |safe| \\ \midrule
 % \endhead \footnotetext{See \vref{sec:transliteration}.}
 % \label{tab:buckwalter-scheme}
@@ -3736,11 +3833,11 @@
 % \iffalse
 %<*example>
 % \fi
-\begin{code}
+\begin{alcode}
   \begin{txarab}
     <Unicode Arabic text>
   \end{txarab}
-\end{code}
+\end{alcode}
 % \iffalse
 %</example>
 % \fi
@@ -3839,6 +3936,7 @@
 % for that, but should it happen, it may be necessary to redefine in
 % the preamble the \LaTeX\ macro \cs{thefootnote} like so:---\\
 % \tcboxverb{\renewcommand*{\thefootnote}{\textsuperscript{\LR{\arabic{footnote}}}}}
+% 
 % \DescribeMacro{\FixArbFtnmk} Another solution is to put in the
 % preamble, below the line that loads \package{arabluatex}, the
 % \cs{FixArbFtnmk} command. However, for more control over the layout
@@ -3973,13 +4071,13 @@
 % \iffalse
 %<*example>
 % \fi
-\begin{code}
+\begin{alcode}
   \begin{arab}
     \begin{<environment>}[<options>]
       <Arabic text>
     \end{<environment>}
   \end{arab}
-\end{code}
+\end{alcode}
 % \iffalse
 %</example>
 % \fi
@@ -4076,13 +4174,13 @@
 % \iffalse
 %<*example>
 % \fi
-\begin{code}
+\begin{alcode}
   % preamble:---
   \usepackage{enumitem}
   \newlist{enumabjad}{enumerate}{10}
   \setlist[enumabjad]{nosep, label={\abjad{\arabic*}}}
   \usepackage{multicol}
-\end{code}
+\end{alcode}
 \begin{example}
   From \textcite[i. 29 B--C]{Wright}:--- The derived forms of the
   triliteral verb are usually reckoned fifteen in number, but the
@@ -4125,10 +4223,10 @@
 % \iffalse
 %<*example>
 % \fi
-\begin{code}
+\begin{alcode}
   \usepackage[french]{babel}
   \frenchsetup{StandardLists=true}
-\end{code}
+\end{alcode}
 % \iffalse
 %</example>
 % \fi%
@@ -4146,12 +4244,12 @@
 % \iffalse
 %<*example>
 % \fi
-\begin{code}
+\begin{alcode}
   \usepackage{csquotes}
   \DeclareQuoteStyle{arabic}
   {\textquotedblright}{\textquotedblleft}
   {\textquoteright}{\textquoteleft}
-\end{code}
+\end{alcode}
 % \iffalse
 %</example>
 % \fi
@@ -4170,11 +4268,11 @@
 % \iffalse
 %</example>
 % \fi
-% \begin{quoting}
-%   \textsc{Rem.} Do not forget to set back the quoting style to its
-%   initial state once the Arabic environment is closed. See the last
-%   line in the code above.
-% \end{quoting}
+% \begin{remarks}
+% \item[\textsc{Rem.}] Do not forget to set back the quoting style to
+%   its initial state once the Arabic environment is closed. See the
+%   last line in the code above.
+% \end{remarks}
 %
 % \subsection{Two-argument special commands}
 % \label{sec:two-arg-cmds}
@@ -4223,7 +4321,7 @@
 % \iffalse
 %<*example>
 % \fi
-\begin{code}
+\begin{alcode}
   \beginnumbering
   \pstart
   \begin{arab}
@@ -4232,7 +4330,7 @@
   \end{arab}
   \pend
   \endnumbering
-\end{code}
+\end{alcode}
 % \iffalse
 %</example>
 % \fi
@@ -4257,10 +4355,10 @@
 % \iffalse
 %<*example>
 % \fi
-\begin{code}
+\begin{alcode}
   \usepackage{arabluatex}
   \usepackage[nopar]{quran}
-\end{code}
+\end{alcode}
 % \iffalse
 %</example>
 % \fi
@@ -4299,12 +4397,12 @@
 % \iffalse
 %<*example>
 % \fi
-\begin{code}
+\begin{alcode}
   % preamble
   \usepackage[export]{arabluatex}
   % or:
   \usepackage[export=true]{arabluatex}
-\end{code}
+\end{alcode}
 % \iffalse
 %</example>
 % \fi
@@ -4324,11 +4422,11 @@
 % \iffalse
 %<*example>
 % \fi
-\begin{code}
+\begin{alcode}
   \begin{arabexport}
     <Running paragraphs of either Arabic or non-Arabic text>
   \end{arabexport}
-\end{code}
+\end{alcode}
 % \iffalse
 %</example>
 % \fi
@@ -4386,11 +4484,11 @@
 % \iffalse
 %<*example>
 % \fi
-\begin{code}
+\begin{alcode}
   Package arabluatex Warning: There are still 'arabtex' strings
   to be converted. Please open <jobname><suffix>.tex and compile
   it one more time.
-\end{code}
+\end{alcode}
 % \iffalse
 %</example>
 % \fi
@@ -4408,9 +4506,9 @@
 % \iffalse
 %<*example>
 % \fi
-\begin{code}
+\begin{alcode}
   pandoc file_out.tex -s -o file_out.odt
-\end{code}
+\end{alcode}
 % \iffalse
 %</example>
 % \fi
@@ -4422,7 +4520,7 @@
 % \iffalse
 %<*example>
 % \fi
-\begin{code}
+\begin{alcode}
   % preamble:
   \usepackage{arabluatex} % note that 'export' has been removed
   \renewcommand{\txarb}[1]{#1}
@@ -4432,7 +4530,7 @@
   % be safe to say:
   \renewcommand{\prname}[2]{#2}
   % &c
-\end{code}
+\end{alcode}
 % \iffalse
 %</example>
 % \fi
@@ -4461,546 +4559,6 @@
 %   \end{enumerate}
 % \end{enumerate}
 %
-% \section{GNU Free Documentation License}
-% \label{sec:fdl}
-% \textbf{Version 1.3, 3 November 2008}
-% 
-% \begin{center}
-%   Version 1.3, 3 November 2008
-%   
-%   Copyright \copyright{} 2000, 2001, 2002, 2007, 2008 Free
-%   Software Foundation, Inc.
-%   
-%   \bigskip
-%   
-%   \url{https://fsf.org/}
-%   
-%   \bigskip
-%   
-%   Everyone is permitted to copy and distribute verbatim copies
-%   of this license document, but changing it is not allowed.
-% \end{center}
-% 
-% \needspace{3\baselineskip}
-% \begin{center}
-%   {\bf\large Preamble}
-% \end{center}
-% 
-% The purpose of this License is to make a manual, textbook, or other
-% functional and useful document \enquote{free} in the sense of
-% freedom: to assure everyone the effective freedom to copy and
-% redistribute it, with or without modifying it, either commercially
-% or noncommercially.  Secondarily, this License preserves for the
-% author and publisher a way to get credit for their work, while not
-% being considered responsible for modifications made by others.
-% 
-% This License is a kind of \enquote{copyleft}, which means that
-% derivative works of the document must themselves be free in the same
-% sense.  It complements the GNU General Public License, which is a
-% copyleft license designed for free software.
-% 
-% We have designed this License in order to use it for manuals for
-% free software, because free software needs free documentation: a
-% free program should come with manuals providing the same freedoms
-% that the software does.  But this License is not limited to software
-% manuals; it can be used for any textual work, regardless of subject
-% matter or whether it is published as a printed book.  We recommend
-% this License principally for works whose purpose is instruction or
-% reference.
-% 
-% \needspace{3\baselineskip}
-% \begin{center}
-%   {\large\bf 1. APPLICABILITY AND DEFINITIONS\par}
-% \end{center}
-% 
-% This License applies to any manual or other work, in any medium,
-% that contains a notice placed by the copyright holder saying it can
-% be distributed under the terms of this License.  Such a notice
-% grants a world-wide, royalty-free license, unlimited in duration, to
-% use that work under the conditions stated herein.  The
-% \enquote{\textbf{Document}}, below, refers to any such manual or
-% work.  Any member of the public is a licensee, and is addressed as
-% \enquote{\textbf{you}}.  You accept the license if you copy, modify
-% or distribute the work in a way requiring permission under copyright
-% law.
-% 
-% A \enquote{\textbf{Modified Version}} of the Document means any work
-% containing the Document or a portion of it, either copied verbatim,
-% or with modifications and/or translated into another language.
-% 
-% A \enquote{\textbf{Secondary Section}} is a named appendix or a
-% front-matter section of the Document that deals exclusively with the
-% relationship of the publishers or authors of the Document to the
-% Document's overall subject (or to related matters) and contains
-% nothing that could fall directly within that overall subject.
-% (Thus, if the Document is in part a textbook of mathematics, a
-% Secondary Section may not explain any mathematics.)  The
-% relationship could be a matter of historical connection with the
-% subject or with related matters, or of legal, commercial,
-% philosophical, ethical or political position regarding them.
-% 
-% The \enquote{\textbf{Invariant Sections}} are certain Secondary
-% Sections whose titles are designated, as being those of Invariant
-% Sections, in the notice that says that the Document is released
-% under this License.  If a section does not fit the above definition
-% of Secondary then it is not allowed to be designated as Invariant.
-% The Document may contain zero Invariant Sections.  If the Document
-% does not identify any Invariant Sections then there are none.
-% 
-% The \enquote{\textbf{Cover Texts}} are certain short passages of
-% text that are listed, as Front-Cover Texts or Back-Cover Texts, in
-% the notice that says that the Document is released under this
-% License.  A Front-Cover Text may be at most 5 words, and a
-% Back-Cover Text may be at most 25 words.
-% 
-% A \enquote{\textbf{Transparent}} copy of the Document means a
-% machine-readable copy, represented in a format whose specification
-% is available to the general public, that is suitable for revising
-% the document straightforwardly with generic text editors or (for
-% images composed of pixels) generic paint programs or (for drawings)
-% some widely available drawing editor, and that is suitable for input
-% to text formatters or for automatic translation to a variety of
-% formats suitable for input to text formatters.  A copy made in an
-% otherwise Transparent file format whose markup, or absence of
-% markup, has been arranged to thwart or discourage subsequent
-% modification by readers is not Transparent.  An image format is not
-% Transparent if used for any substantial amount of text.  A copy that
-% is not \enquote{Transparent} is called \enquote{\textbf{Opaque}}.
-% 
-% Examples of suitable formats for Transparent copies include plain
-% ASCII without markup, Texinfo input format, LaTeX input format, SGML
-% or XML using a publicly available DTD, and standard-conforming
-% simple HTML, PostScript or PDF designed for human modification.
-% Examples of transparent image formats include PNG, XCF and JPG.
-% Opaque formats include proprietary formats that can be read and
-% edited only by proprietary word processors, SGML or XML for which
-% the DTD and/or processing tools are not generally available, and the
-% machine-generated HTML, PostScript or PDF produced by some word
-% processors for output purposes only.
-% 
-% The \enquote{\textbf{Title Page}} means, for a printed book, the
-% title page itself, plus such following pages as are needed to hold,
-% legibly, the material this License requires to appear in the title
-% page.  For works in formats which do not have any title page as
-% such, \enquote{Title Page} means the text near the most prominent
-% appearance of the work's title, preceding the beginning of the body
-% of the text.
-% 
-% The \enquote{\textbf{publisher}} means any person or entity that
-% distributes copies of the Document to the public.
-% 
-% A section \enquote{\textbf{Entitled XYZ}} means a named subunit of
-% the Document whose title either is precisely XYZ or contains XYZ in
-% parentheses following text that translates XYZ in another language.
-% (Here XYZ stands for a specific section name mentioned below, such
-% as \enquote{\textbf{Acknowledgements}},
-% \enquote{\textbf{Dedications}}, \enquote{\textbf{Endorsements}}, or
-% \enquote{\textbf{History}}.)  To \enquote{\textbf{Preserve the
-% Title}} of such a section when you modify the Document means that it
-% remains a section \enquote{Entitled XYZ} according to this
-% definition.
-% 
-% The Document may include Warranty Disclaimers next to the notice
-% which states that this License applies to the Document.  These
-% Warranty Disclaimers are considered to be included by reference in
-% this License, but only as regards disclaiming warranties: any other
-% implication that these Warranty Disclaimers may have is void and has
-% no effect on the meaning of this License.
-% 
-% \needspace{3\baselineskip}
-% \begin{center}
-%   {\large\bf 2. VERBATIM COPYING\par}
-% \end{center}
-% 
-% You may copy and distribute the Document in any medium, either
-% commercially or noncommercially, provided that this License, the
-% copyright notices, and the license notice saying this License
-% applies to the Document are reproduced in all copies, and that you
-% add no other conditions whatsoever to those of this License.  You
-% may not use technical measures to obstruct or control the reading or
-% further copying of the copies you make or distribute.  However, you
-% may accept compensation in exchange for copies.  If you distribute a
-% large enough number of copies you must also follow the conditions in
-% section~3.
-% 
-% You may also lend copies, under the same conditions stated above,
-% and you may publicly display copies.
-% 
-% \needspace{3\baselineskip}
-% \begin{center}
-%   {\large\bf 3. COPYING IN QUANTITY\par}
-% \end{center}
-% 
-% If you publish printed copies (or copies in media that commonly have
-% printed covers) of the Document, numbering more than 100, and the
-% Document's license notice requires Cover Texts, you must enclose the
-% copies in covers that carry, clearly and legibly, all these Cover
-% Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
-% the back cover.  Both covers must also clearly and legibly identify
-% you as the publisher of these copies.  The front cover must present
-% the full title with all words of the title equally prominent and
-% visible.  You may add other material on the covers in addition.
-% Copying with changes limited to the covers, as long as they preserve
-% the title of the Document and satisfy these conditions, can be
-% treated as verbatim copying in other respects.
-% 
-% If the required texts for either cover are too voluminous to fit
-% legibly, you should put the first ones listed (as many as fit
-% reasonably) on the actual cover, and continue the rest onto adjacent
-% pages.
-% 
-% If you publish or distribute Opaque copies of the Document numbering
-% more than 100, you must either include a machine-readable
-% Transparent copy along with each Opaque copy, or state in or with
-% each Opaque copy a computer-network location from which the general
-% network-using public has access to download using public-standard
-% network protocols a complete Transparent copy of the Document, free
-% of added material.  If you use the latter option, you must take
-% reasonably prudent steps, when you begin distribution of Opaque
-% copies in quantity, to ensure that this Transparent copy will remain
-% thus accessible at the stated location until at least one year after
-% the last time you distribute an Opaque copy (directly or through
-% your agents or retailers) of that edition to the public.
-% 
-% It is requested, but not required, that you contact the authors of
-% the Document well before redistributing any large number of copies,
-% to give them a chance to provide you with an updated version of the
-% Document.
-% 
-% \needspace{3\baselineskip}
-% \begin{center}
-%   {\large\bf 4. MODIFICATIONS\par}
-% \end{center}
-% 
-% You may copy and distribute a Modified Version of the Document under
-% the conditions of sections 2 and 3 above, provided that you release
-% the Modified Version under precisely this License, with the Modified
-% Version filling the role of the Document, thus licensing
-% distribution and modification of the Modified Version to whoever
-% possesses a copy of it.  In addition, you must do these things in
-% the Modified Version:
-% 
-% \begin{itemize}
-% \item[A.]  Use in the Title Page (and on the covers, if any) a title
-%   distinct from that of the Document, and from those of previous
-%   versions (which should, if there were any, be listed in the
-%   History section of the Document).  You may use the same title as a
-%   previous version if the original publisher of that version gives
-%   permission.
-%    
-%  \item[B.]  List on the Title Page, as authors, one or more persons
-%    or entities responsible for authorship of the modifications in
-%    the Modified Version, together with at least five of the
-%    principal authors of the Document (all of its principal authors,
-%    if it has fewer than five), unless they release you from this
-%    requirement.
-%    
-%  \item[C.]  State on the Title page the name of the publisher of the
-%    Modified Version, as the publisher.
-%    
-%  \item[D.]  Preserve all the copyright notices of the Document.
-%    
-%  \item[E.]  Add an appropriate copyright notice for your
-%    modifications adjacent to the other copyright notices.
-%    
-%  \item[F.]  Include, immediately after the copyright notices, a
-%    license notice giving the public permission to use the Modified
-%    Version under the terms of this License, in the form shown in the
-%    Addendum below.
-%    
-%  \item[G.]  Preserve in that license notice the full lists of
-%    Invariant Sections and required Cover Texts given in the
-%    Document's license notice.
-%    
-%  \item[H.]  Include an unaltered copy of this License.
-%    
-%  \item[I.]  Preserve the section Entitled \enquote{History},
-%    Preserve its Title, and add to it an item stating at least the
-%    title, year, new authors, and publisher of the Modified Version
-%    as given on the Title Page.  If there is no section Entitled
-%    \enquote{History} in the Document, create one stating the title,
-%    year, authors, and publisher of the Document as given on its
-%    Title Page, then add an item describing the Modified Version as
-%    stated in the previous sentence.
-%    
-%  \item[J.]  Preserve the network location, if any, given in the
-%    Document for public access to a Transparent copy of the Document,
-%    and likewise the network locations given in the Document for
-%    previous versions it was based on.  These may be placed in the
-%    \enquote{History} section.  You may omit a network location for a
-%    work that was published at least four years before the Document
-%    itself, or if the original publisher of the version it refers to
-%    gives permission.
-%    
-%  \item[K.]  For any section Entitled \enquote{Acknowledgements} or
-%    \enquote{Dedications}, Preserve the Title of the section, and
-%    preserve in the section all the substance and tone of each of the
-%    contributor acknowledgements and/or dedications given therein.
-%    
-%  \item[L.]  Preserve all the Invariant Sections of the Document,
-%    unaltered in their text and in their titles.  Section numbers or
-%    the equivalent are not considered part of the section titles.
-%    
-%  \item[M.]  Delete any section Entitled \enquote{Endorsements}.
-%    Such a section may not be included in the Modified Version.
-%    
-%  \item[N.]  Do not retitle any existing section to be Entitled
-%    \enquote{Endorsements} or to conflict in title with any Invariant
-%    Section.
-%    
-%  \item[O.]  Preserve any Warranty Disclaimers.
-% \end{itemize}
-% 
-% If the Modified Version includes new front-matter sections or
-% appendices that qualify as Secondary Sections and contain no
-% material copied from the Document, you may at your option designate
-% some or all of these sections as invariant.  To do this, add their
-% titles to the list of Invariant Sections in the Modified Version's
-% license notice.  These titles must be distinct from any other
-% section titles.
-% 
-% You may add a section Entitled \enquote{Endorsements}, provided it
-% contains nothing but endorsements of your Modified Version by
-% various parties---for example, statements of peer review or that the
-% text has been approved by an organization as the authoritative
-% definition of a standard.
-% 
-% You may add a passage of up to five words as a Front-Cover Text, and
-% a passage of up to 25 words as a Back-Cover Text, to the end of the
-% list of Cover Texts in the Modified Version.  Only one passage of
-% Front-Cover Text and one of Back-Cover Text may be added by (or
-% through arrangements made by) any one entity.  If the Document
-% already includes a cover text for the same cover, previously added
-% by you or by arrangement made by the same entity you are acting on
-% behalf of, you may not add another; but you may replace the old one,
-% on explicit permission from the previous publisher that added the
-% old one.
-% 
-% The author(s) and publisher(s) of the Document do not by this
-% License give permission to use their names for publicity for or to
-% assert or imply endorsement of any Modified Version.
-% 
-% \needspace{3\baselineskip}
-% \begin{center}
-%   {\large\bf 5. COMBINING DOCUMENTS\par}
-% \end{center}
-% 
-% You may combine the Document with other documents released under
-% this License, under the terms defined in section~4 above for
-% modified versions, provided that you include in the combination all
-% of the Invariant Sections of all of the original documents,
-% unmodified, and list them all as Invariant Sections of your combined
-% work in its license notice, and that you preserve all their Warranty
-% Disclaimers.
-% 
-% The combined work need only contain one copy of this License, and
-% multiple identical Invariant Sections may be replaced with a single
-% copy.  If there are multiple Invariant Sections with the same name
-% but different contents, make the title of each such section unique
-% by adding at the end of it, in parentheses, the name of the original
-% author or publisher of that section if known, or else a unique
-% number.  Make the same adjustment to the section titles in the list
-% of Invariant Sections in the license notice of the combined work.
-% 
-% In the combination, you must combine any sections Entitled
-% \enquote{History} in the various original documents, forming one
-% section Entitled \enquote{History}; likewise combine any sections
-% Entitled \enquote{Acknowledgements}, and any sections Entitled
-% \enquote{Dedications}.  You must delete all sections Entitled
-% \enquote{Endorsements}.
-% 
-% \needspace{3\baselineskip}
-% \begin{center}
-%   {\large\bf 6. COLLECTIONS OF DOCUMENTS\par}
-% \end{center}
-% 
-% You may make a collection consisting of the Document and other
-% documents released under this License, and replace the individual
-% copies of this License in the various documents with a single copy
-% that is included in the collection, provided that you follow the
-% rules of this License for verbatim copying of each of the documents
-% in all other respects.
-% 
-% You may extract a single document from such a collection, and
-% distribute it individually under this License, provided you insert a
-% copy of this License into the extracted document, and follow this
-% License in all other respects regarding verbatim copying of that
-% document.
-% 
-% \needspace{3\baselineskip}
-% \begin{center}
-% {\large\bf 7. AGGREGATION WITH INDEPENDENT WORKS\par}
-% \end{center}
-% 
-% A compilation of the Document or its derivatives with other separate
-% and independent documents or works, in or on a volume of a storage
-% or distribution medium, is called an \enquote{aggregate} if the
-% copyright resulting from the compilation is not used to limit the
-% legal rights of the compilation's users beyond what the individual
-% works permit.  When the Document is included in an aggregate, this
-% License does not apply to the other works in the aggregate which are
-% not themselves derivative works of the Document.
-% 
-% If the Cover Text requirement of section~3 is applicable to these
-% copies of the Document, then if the Document is less than one half
-% of the entire aggregate, the Document's Cover Texts may be placed on
-% covers that bracket the Document within the aggregate, or the
-% electronic equivalent of covers if the Document is in electronic
-% form.  Otherwise they must appear on printed covers that bracket the
-% whole aggregate.
-% 
-% \needspace{3\baselineskip}
-% \begin{center}
-%   {\large\bf 8. TRANSLATION\par}
-% \end{center}
-% 
-% Translation is considered a kind of modification, so you may
-% distribute translations of the Document under the terms of
-% section~4.  Replacing Invariant Sections with translations requires
-% special permission from their copyright holders, but you may include
-% translations of some or all Invariant Sections in addition to the
-% original versions of these Invariant Sections.  You may include a
-% translation of this License, and all the license notices in the
-% Document, and any Warranty Disclaimers, provided that you also
-% include the original English version of this License and the
-% original versions of those notices and disclaimers.  In case of a
-% disagreement between the translation and the original version of
-% this License or a notice or disclaimer, the original version will
-% prevail.
-% 
-% If a section in the Document is Entitled \enquote{Acknowledgements},
-% \enquote{Dedications}, or \enquote{History}, the requirement
-% (section~4) to Preserve its Title (section~1) will typically require
-% changing the actual title.
-% 
-% \needspace{3\baselineskip}
-% \begin{center}
-%   {\large\bf 9. TERMINATION\par}
-% \end{center}
-% 
-% You may not copy, modify, sublicense, or distribute the Document
-% except as expressly provided under this License.  Any attempt
-% otherwise to copy, modify, sublicense, or distribute it is void, and
-% will automatically terminate your rights under this License.
-% 
-% However, if you cease all violation of this License, then your
-% license from a particular copyright holder is reinstated (a)
-% provisionally, unless and until the copyright holder explicitly and
-% finally terminates your license, and (b) permanently, if the
-% copyright holder fails to notify you of the violation by some
-% reasonable means prior to 60 days after the cessation.
-% 
-% Moreover, your license from a particular copyright holder is
-% reinstated permanently if the copyright holder notifies you of the
-% violation by some reasonable means, this is the first time you have
-% received notice of violation of this License (for any work) from
-% that copyright holder, and you cure the violation prior to 30 days
-% after your receipt of the notice.
-% 
-% Termination of your rights under this section does not terminate the
-% licenses of parties who have received copies or rights from you
-% under this License.  If your rights have been terminated and not
-% permanently reinstated, receipt of a copy of some or all of the same
-% material does not give you any rights to use it.
-% 
-% \needspace{3\baselineskip}
-% \begin{center}
-%   {\large\bf 10. FUTURE REVISIONS OF THIS LICENSE\par}
-% \end{center}
-% 
-% The Free Software Foundation may publish new, revised versions of
-% the GNU Free Documentation License from time to time.  Such new
-% versions will be similar in spirit to the present version, but may
-% differ in detail to address new problems or concerns.  See
-% \url{https://www.gnu.org/licenses/}.
-% 
-% Each version of the License is given a distinguishing version
-% number.  If the Document specifies that a particular numbered
-% version of this License \enquote{or any later version} applies to
-% it, you have the option of following the terms and conditions either
-% of that specified version or of any later version that has been
-% published (not as a draft) by the Free Software Foundation.  If the
-% Document does not specify a version number of this License, you may
-% choose any version ever published (not as a draft) by the Free
-% Software Foundation.  If the Document specifies that a proxy can
-% decide which future versions of this License can be used, that
-% proxy's public statement of acceptance of a version permanently
-% authorizes you to choose that version for the Document.
-% 
-% \needspace{3\baselineskip}
-% \begin{center}
-%   {\large\bf 11. RELICENSING\par}
-% \end{center}
-% 
-% \enquote{Massive Multiauthor Collaboration Site} (or \enquote{MMC
-% Site}) means any World Wide Web server that publishes copyrightable
-% works and also provides prominent facilities for anybody to edit
-% those works.  A public wiki that anybody can edit is an example of
-% such a server.  A \enquote{Massive Multiauthor Collaboration} (or
-% \enquote{MMC}) contained in the site means any set of copyrightable
-% works thus published on the MMC site.
-% 
-% \enquote{CC-BY-SA} means the Creative Commons Attribution-Share
-% Alike 3.0 license published by Creative Commons Corporation, a
-% not-for-profit corporation with a principal place of business in San
-% Francisco, California, as well as future copyleft versions of that
-% license published by that same organization.
-% 
-% \enquote{Incorporate} means to publish or republish a Document, in
-% whole or in part, as part of another Document.
-% 
-% An MMC is \enquote{eligible for relicensing} if it is licensed under
-% this License, and if all works that were first published under this
-% License somewhere other than this MMC, and subsequently incorporated
-% in whole or in part into the MMC, (1) had no cover texts or
-% invariant sections, and (2) were thus incorporated prior to November
-% 1, 2008.
-% 
-% The operator of an MMC Site may republish an MMC contained in the
-% site under CC-BY-SA on the same site at any time before August 1,
-% 2009, provided the MMC is eligible for relicensing.
-% 
-% \needspace{3\baselineskip}
-% \begin{center}
-%   {\large\bf ADDENDUM: How to use this License for your documents\par}
-% \end{center}
-% 
-% To use this License in a document you have written, include a copy
-% of the License in the document and put the following copyright and
-% license notices just after the title page:
-% 
-% \bigskip
-% \begin{quote}
-%   Copyright \copyright{} YEAR YOUR NAME.  Permission is granted to
-%   copy, distribute and/or modify this document under the terms of
-%   the GNU Free Documentation License, Version 1.3 or any later
-%   version published by the Free Software Foundation; with no
-%   Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-%   A copy of the license is included in the section entitled
-%   \enquote{GNU Free Documentation License}.
-% \end{quote}
-% \bigskip
-%     
-% If you have Invariant Sections, Front-Cover Texts and Back-Cover
-% Texts, replace the \enquote{with \dots\ Texts.}\ line with this:
-% 
-% \bigskip
-% \begin{quote}
-%   with the Invariant Sections being LIST THEIR TITLES, with the
-%   Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
-% \end{quote}
-% \bigskip
-%     
-% If you have Invariant Sections without Cover Texts, or some other
-% combination of the three, merge those two alternatives to suit the
-% situation.
-% 
-% If your document contains nontrivial examples of program code, we
-% recommend releasing these examples in parallel under your choice of
-% free software license, such as the GNU General Public License,
-% to permit their use in free software.
-%
-%
 % \StopEventually{}
 %
 % \section{Implementation}
@@ -5089,8 +4647,16 @@
 % it to suit our purpose:
 %    \begin{macrocode}
 \AtBeginDocument{\ifdef{\LR}%
-  {\RenewDocumentCommand{\LR}{m}{\bgroup\textdir TLT\rmfamily#1\egroup}}
-  {\NewDocumentCommand{\LR}{m}{\bgroup\textdir TLT\rmfamily#1\egroup}}}
+  {\RenewDocumentCommand{\LR}{m}{\bgroup\textdir TLT\reset@font#1\egroup}}
+  {\NewDocumentCommand{\LR}{m}{\bgroup\textdir TLT\reset@font#1\egroup}}}
+%    \end{macrocode}
+% \end{macro}
+% \begin{macro}{\SetArbNumbers}
+% \changes{v1.21}{2023/05/21}{selects Indian or Arabic numbers}
+%    \begin{macrocode}
+\NewDocumentCommand{\SetArbNumbers}{m}{%
+  \luadirect{arabluatex.setnums(\luastringN{#1})}%
+}
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\RL} This one typesets its argument from right to
@@ -5249,7 +4815,7 @@
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\altrfont}
-%   \changes{v1.21}{2020/07/13}{new command \cs{altrfont} to store
+%   \changes{v1.21}{2023/05/21}{new command \cs{altrfont} to store
 %   font and shape information (trans mode)} Finally \cs{altrfont}
 %   is used internally by \package{arabluatex} to store family and
 %   shape information about the font to be used for transliterated
@@ -5486,55 +5052,63 @@
 %    \begin{macrocode}
 \newlength{\al@bayt@width}
 \newlength{\al@gutter@width}
+\newlength{\al@verse@twidth}
 \setlength{\al@bayt@width}{.3\textwidth}
 \setlength{\al@gutter@width}{.15\al@bayt@width}
 \define@key[al]{verse}{width}{\setlength{\al@bayt@width}{#1}}
 \define@key[al]{verse}{gutter}{\setlength{\al@gutter@width}{#1}}
-\define@key[al]{verse}{metre}{\arb{#1}}
+\define@key[al]{verse}{metre}{\def\al@verse@metre@value{\arb{#1}}}
 \define@key[al]{verse}{color}[]{\color{#1}}
 \define@boolkey[al]{verse}{utf}[true]{}
 \define@boolkey[al]{verse}{delim}[true]{}
 \define@boolkey[al]{verse}{export}[true]{}
 \define@choicekey[al]{verse}{mode}{fullvoc, voc, novoc,
   trans}{\def\al@mode{#1}}
-\presetkeys[al]{verse}{metre={}, utf=false,
-  delim=false}{}
+\presetkeys[al]{verse}{utf=false, delim=false}{}
 %    \end{macrocode}
 % Then follows the environment itself:
 %    \begin{macrocode}
 \NewDocumentEnvironment{arabverse}{!O{}}%
 {\bgroup\setkeys[al]{verse}[width, gutter, color, utf, delim,
   metre]{#1}%
-  \if@pkg@export\ifal@verse@export%
-  \ArbOutFile{\begin{arabverse}}%
-    % \ifx\al@mode\al@mode@trans%
-    %   \luadirect{arabluatex.tooutfile(\luastringN{[#1]})}%
-    % \else%
-      \IfSubStr[1]{#1}{utf}%
+  \if@pkg@export
+    \ifal@verse@export
+      \ArbOutFile{\begin{arabverse}}%
+        % \ifx\al@mode\al@mode@trans%
+        %   \luadirect{arabluatex.tooutfile(\luastringN{[#1]})}%
+        % \else%
+        \IfSubStr[1]{#1}{utf}%
         {\luadirect{arabluatex.tooutfile(\luastringN{[#1]})}}%
         {\luadirect{arabluatex.tooutfile(\luastringN{[#1, utf]})}}%
-    % \fi
-  \else\fi\else\fi\egroup%
-  \par\centering\noindent\bgroup\setkeys[al]{verse}[metre]{#1}%
-  % \ifx\al@mode\al@mode@trans%
-  %   \ifal@verse@utf\setRL\else\setLR\fi%
-  % \else\setRL\fi%
-  \ifal@verse@utf%
-    \ifx\al@mode\al@mode@trans\setLR\else\setRL\fi%
-    \else%
-    \ifx\al@mode\al@mode@trans\setLR\else\setRL\fi%
-    \fi%
-  \arab@v@export[#1]
+        % \fi
+      \else
+      \fi
+    \else
+    \fi
+    \egroup
+    \centering\noindent\bgroup\setkeys[al]{verse}[metre]{#1}%
+    % \ifx\al@mode\al@mode@trans%
+    %   \ifal@verse@utf\setRL\else\setLR\fi%
+    % \else\setRL\fi%
+    \ifal@verse@utf
+      \ifx\al@mode\al@mode@trans\setLR\else\setRL\fi
+    \else
+      \ifx\al@mode\al@mode@trans\setLR\else\setRL\fi
+    \fi
+    \addtolength{\al@verse@twidth}{2\al@bayt@width}%
+    \addtolength{\al@verse@twidth}{\al@gutter@width}%
+    \arab@v@export[#1]
   }%
   {\endarab@v@export
-    \hfill\setkeys[al]{verse}[width, gutter, color, utf, delim, mode,
+    \setkeys[al]{verse}[width, gutter, color, utf, delim, mode,
     export]{#1}%
-    \egroup\par%
+    \ifdefined\al@verse@metre@value\hfill\al@verse@metre@value\fi
+  \egroup
     \bgroup\setkeys[al]{verse}[width, gutter, color, utf, delim, mode,
     metre]{#1}%
-    \if@pkg@export\ifal@verse@export%
-    \ArbOutFile{\end{arabverse}}
-  \else\fi\else\fi\egroup}
+    \if@pkg@export\ifal@verse@export
+        \ArbOutFile{\end{arabverse}}%
+    \else\fi\else\fi\egroup}
 %    \end{macrocode}
 % \begin{macro}{\bayt}
 %   \changes{v1.6}{2016/12/17}{New macro \cs{bayt} for typesetting
@@ -5583,22 +5157,33 @@
 \def\al@hemistich@delim{*}
 \NewDocumentCommand{\SetHemistichDelim}{m}{\def\al@hemistich@delim{#1}}
 \def\al@verse@stroke{\leavevmode\xleaders\hbox{\arb{--}}\hfill\kern0pt}
-\NewDocumentCommand{\bayt}{s m o m}{%
-  \IfBooleanTF{#1}{\relax}{\relax}%
+\providebool{ekd@state}
+\NewDocumentCommand{\bayt}{t+ s m o m}{%
+  \IfBooleanTF{#1}{%
+    \ifekd@state
+      \leavevmode
+      \stepcounter{ekd@lab}%
+      \zlabel{ekd:\theekd@lab}%
+      \luadirect{ekdosis.storeabspg(
+        \luastring{\zref@extract{ekd:\theekd@lab}{abspage}})}%
+      \add@apparatus
+    \fi    
+  }{\relax}%
+  \IfBooleanTF{#2}{\relax}{\relax}%
   \ifdefined\savenotes\savenotes\else\fi%
   \edef\al@tatweel{--}%
   \ifal@warp@bayt%
-    \adjustbox{width=\al@bayt@width, height=\Height}{\arb@utf{#2}}%
+    \adjustbox{width=\al@bayt@width, height=\Height}{\arb@utf{#3}}%
   \else%
-    \makebox[\al@bayt@width][s]{\arb@utf{#2}}%
+    \makebox[\al@bayt@width][s]{\arb@utf{#3}}%
   \fi%
-  \IfNoValueTF{#3}{%
+  \IfNoValueTF{#4}{%
     \ifal@verse@delim\makebox[\al@gutter@width][c]{\al@hemistich@delim}%
     \else%
     \hspace{\al@gutter@width}%
     \fi
   }{%
-    \edef\@tempa{#3}%
+    \edef\@tempa{#4}%
     \ifx\@tempa\al@tatweel%
     \ifx\al@mode\al@mode@trans%
     \hspace{\al@gutter@width}%
@@ -5608,17 +5193,17 @@
     \else%
     \ifx\al@mode\al@mode@trans%
     \ifal@warp@bayt%
-      \adjustbox{width=\al@gutter@width, height=\Height}{\arb@utf{#3}}%
+      \adjustbox{width=\al@gutter@width, height=\Height}{\arb@utf{#4}}%
     \else%
-      \makebox[\al@gutter@width][s]{\arb@utf{#3}}%
+      \makebox[\al@gutter@width][s]{\arb@utf{#4}}%
     \fi%
     \else%
-    \makebox[\al@gutter@width][s]{\arb@utf{#3}}%
+    \makebox[\al@gutter@width][s]{\arb@utf{#4}}%
     \fi\fi}%
   \ifal@warp@bayt%
-    \adjustbox{width=\al@bayt@width, height=\Height}{\arb@utf{#4}}%
+    \adjustbox{width=\al@bayt@width, height=\Height}{\arb@utf{#5}}%
   \else%
-    \makebox[\al@bayt@width][s]{\arb@utf{#4}}%
+    \makebox[\al@bayt@width][s]{\arb@utf{#5}}%
   \fi%
   \ifdefined\spewnotes\spewnotes\else\fi%
 }
@@ -5855,14 +5440,37 @@
 \NewDocumentEnvironment{arab@v@export}{O{} +b}{%
   \setkeys[al]{verse}[width, gutter, color, utf, delim, mode,
   metre]{#1}
-  \if@pkg@export\ifal@verse@export%
-  \par
-  #2
-  \luadirect{arabluatex.doexport("arabverse")}
-  \luadirect{tex.sprint(arabluatex.arbtoutf(\luastringN{#2}))}
-  \luadirect{arabluatex.doexport("no")}
-  \else\par#2\fi\else\par#2\fi
-}{\par}
+  \if@pkg@export
+    \ifal@verse@export
+      \ifekd@state
+        \begin{ekdverse}[width=\al@verse@twidth]
+          #2
+        \end{ekdverse}
+      \else
+        #2
+      \fi
+      \luadirect{arabluatex.doexport("arabverse")}%
+      \luadirect{tex.sprint(arabluatex.arbtoutf(\luastringN{#2}))}%
+      \luadirect{arabluatex.doexport("no")}%
+    \else
+      \ifekd@state
+        \begin{ekdverse}[width=\al@verse@twidth]
+          #2
+        \end{ekdverse}
+      \else
+        #2
+      \fi
+    \fi
+  \else
+    \ifekd@state
+      \begin{ekdverse}[width=\al@verse@twidth]
+        #2
+      \end{ekdverse}
+    \else
+      #2
+    \fi
+  \fi
+}{}
 %    \end{macrocode}
 % \end{environment}
 % \begin{macro}{\arbpardir}