12 files changed, 311 insertions, 128 deletions
diff --git a/README.md b/README.md
index e110efd..e1ccf14 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,6 @@ author:
 title: 'The arabluatex package -- README file'
 ---
-\maketitle
 Overview 
 ========
@@ -26,7 +25,7 @@ License and disclamer
 ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright ⓒ 2016--2020 Robert Alessi
+Copyright ⓒ 2016--2022 Robert Alessi
 Please send error reports and suggestions for improvements to Robert
 Alessi:
@@ -70,7 +69,7 @@ This release of arabluatex consists of the following source files:
 License applicable to the documentation 
 ---------------------------------------
-Copyright ⓒ 2016--2020 Robert Alessi
+Copyright ⓒ 2016--2022 Robert Alessi
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/README.tex b/README.tex
index 3bec1cb..37ec7c4 100644
--- a/README.tex
+++ b/README.tex
@@ -33,7 +33,7 @@ searched, analyzed and correlated in various ways.
 \section*{License and disclamer}
 ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright ⓒ 2016--2020  Robert Alessi
+Copyright ⓒ 2016--2022  Robert Alessi
 Please send error reports and suggestions for improvements to Robert
 Alessi:
@@ -72,7 +72,7 @@ source files:
 \subsection*{License applicable to the documentation}
 \label{sec:documentation-license}
-Copyright ⓒ 2016--2020  Robert Alessi
+Copyright ⓒ 2016--2022  Robert Alessi
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/about.html b/about.html
index a718fa2..af0eb19 100644
--- a/about.html
+++ b/about.html
@@ -6,29 +6,30 @@
  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
  <meta name="author" content="Robert Alessi" />
  <title>The arabluatex package – README file</title>
-  <style type="text/css">
+  <style>
-      code{white-space: pre-wrap;}
+    code{white-space: pre-wrap;}
-      span.smallcaps{font-variant: small-caps;}
+    span.smallcaps{font-variant: small-caps;}
-      span.underline{text-decoration: underline;}
+    span.underline{text-decoration: underline;}
-      div.column{display: inline-block; vertical-align: top; width: 50%;}
+    div.column{display: inline-block; vertical-align: top; width: 50%;}
+    div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
+    ul.task-list{list-style: none;}
  </style>
 </head>
 <body>
-<header>
+<header id="title-block-header">
 <h1 class="title">The arabluatex package – README file</h1>
 <p class="author">Robert Alessi</p>
 </header>
+<h1 class="unnumbered" id="sec:overview">Overview</h1>
-<h1 id="sec:overview" class="unnumbered unnumbered">Overview</h1>
 <p>This package provides for <a href="http://luatex.org">LuaLaTeX</a> an <a href="http://ctan.org/pkg/arabtex">ArabTeX</a>-like interface to generate Arabic writing from an <span class="smallcaps">ascii</span> transliteration. It is particularly well-suited for complex documents such as technical documents or critical editions where a lot of left-to-right commands intertwine with Arabic writing. arabluatex is able to process any ArabTeX input notation. Its output can be set in the same modes of vocalization as ArabTeX, 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 <code>.tex</code> source files, in addition to printed books, <code>TEI xml</code> compliant critical editions and/or lexicons that can be searched, analyzed and correlated in various ways.</p>
-<h1 id="license-and-disclamer" class="unnumbered unnumbered">License and disclamer</h1>
+<h1 class="unnumbered" id="license-and-disclamer">License and disclamer</h1>
 <p>ArabLuaTeX – Processing ArabTeX notation under LuaLaTeX</p>
-<p>Copyright ⓒ 2016–2020 Robert Alessi</p>
+<p>Copyright ⓒ 2016–2022 Robert Alessi</p>
 <p>Please send error reports and suggestions for improvements to Robert Alessi:</p>
 <ul>
 <li><p>email: <a href="mailto:alessi@robertalessi.net">alessi@robertalessi.net</a></p></li>
-<li><p>website: <a href="http://www.robertalessi.net/arabluatex" class="uri">http://www.robertalessi.net/arabluatex</a></p></li>
+<li><p>website: <a href="http://www.robertalessi.net/arabluatex">http://www.robertalessi.net/arabluatex</a></p></li>
-<li><p>comments, feature requests, bug reports: <a href="https://gitlab.com/ralessi/arabluatex/issues" class="uri">https://gitlab.com/ralessi/arabluatex/issues</a></p></li>
+<li><p>comments, feature requests, bug reports: <a href="https://gitlab.com/ralessi/arabluatex/issues">https://gitlab.com/ralessi/arabluatex/issues</a></p></li>
 </ul>
 <p>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.</p>
 <p>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.</p>
@@ -43,13 +44,13 @@
 <li><p><code>arabluatex_novoc.lua</code></p></li>
 <li><p><code>arabluatex_trans.lua</code></p></li>
 </ul>
-<h2 id="sec:documentation-license" class="unnumbered unnumbered">License applicable to the documentation</h2>
+<h2 class="unnumbered" id="sec:documentation-license">License applicable to the documentation</h2>
-<p>Copyright ⓒ 2016–2020 Robert Alessi</p>
+<p>Copyright ⓒ 2016–2022 Robert Alessi</p>
 <p>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” of the documentation.</p>
-<h1 id="sec:installation" class="unnumbered unnumbered">Installation</h1>
+<h1 class="unnumbered" id="sec:installation">Installation</h1>
 <ol>
 <li><p>Run <code>'lualatex arabluatex.ins'</code> to produce the <code>arabluatex.sty</code> file;</p></li>
-<li><p>To finish the installation you have to move the following files into a directory where LaTeX can find them. See the FAQ on <code>texfaq.org</code> at <a href="https://texfaq.org/FAQ-inst-wlcf" class="uri">https://texfaq.org/FAQ-inst-wlcf</a> for more on this:</p>
+<li><p>To finish the installation you have to move the following files into a directory where LaTeX can find them. See the FAQ on <code>texfaq.org</code> at <a href="https://texfaq.org/FAQ-inst-wlcf">https://texfaq.org/FAQ-inst-wlcf</a> for more on this:</p>
 <ul>
 <li><p><code>arabluatex.sty</code></p></li>
 <li><p><code>arabluatex-patch.sty</code></p></li>
@@ -62,17 +63,17 @@
 <li><p>Additionally, those who use emacs with AUCTeX may copy <code>arabluatex.el</code> to their <code>~/.emacs.d/auctex/auto</code> local directory. This will enable the appropriate hooks for ArabLuaTeX in AUCTeX.</p></li>
 </ol>
 <h1 id="sec:devel-git-repos">Development, Git Repository</h1>
-<h2 id="sec:browse-code" class="unnumbered unnumbered">Browse the code</h2>
+<h2 class="unnumbered" id="sec:browse-code">Browse the code</h2>
-<p>You can browse ArabLuaTeX repository on the web: <a href="http://git.robertalessi.net/arabluatex" class="uri">http://git.robertalessi.net/arabluatex</a></p>
+<p>You can browse ArabLuaTeX repository on the web: <a href="http://git.robertalessi.net/arabluatex">http://git.robertalessi.net/arabluatex</a></p>
 <p>From this page, you can download all the releases of ArabLuaTeX. For instructions on how to install ArabLuaTeX, please see above.</p>
-<h2 id="sec:comm-feat-requ" class="unnumbered unnumbered">Comments, Feature requests, Bug Reports</h2>
+<h2 class="unnumbered" id="sec:comm-feat-requ">Comments, Feature requests, Bug Reports</h2>
-<p><a href="https://gitlab.com/ralessi/arabluatex/issues" class="uri">https://gitlab.com/ralessi/arabluatex/issues</a></p>
+<p><a href="https://gitlab.com/ralessi/arabluatex/issues">https://gitlab.com/ralessi/arabluatex/issues</a></p>
-<h2 id="sec:download-repository" class="unnumbered unnumbered">Download the repository</h2>
+<h2 class="unnumbered" id="sec:download-repository">Download the repository</h2>
 <p>ArabLuaTeX development is facilitated by git, a distributed version control system. You will need to install git (most GNU/Linux distributions package it in their repositories).</p>
 <p>Use this command to download the repository</p>
 <pre><code>git clone http://git.robertalessi.net/arabluatex</code></pre>
 <p>A new directory named arabluatex will have been created, containing ArabLuaTeX.</p>
-<h2 id="sec:git-hosting" class="unnumbered unnumbered">Git hosting</h2>
+<h2 class="unnumbered" id="sec:git-hosting">Git hosting</h2>
-<p>Make an account on <a href="https://gitlab.com" class="uri">https://gitlab.com</a> and navigate (while logged in) to <a href="https://gitlab.com/ralessi/arabluatex" class="uri">https://gitlab.com/ralessi/arabluatex</a>. Click <em>Fork</em> and you will have in your account your own repository of <code>arabluatex</code> where you will be able to make whatever changes you like to.</p>
+<p>Make an account on <a href="https://gitlab.com">https://gitlab.com</a> and navigate (while logged in) to <a href="https://gitlab.com/ralessi/arabluatex">https://gitlab.com/ralessi/arabluatex</a>. Click <em>Fork</em> and you will have in your account your own repository of <code>arabluatex</code> where you will be able to make whatever changes you like to.</p>
 </body>
 </html>
diff --git a/arabluatex.dtx b/arabluatex.dtx
index 22c5099..c281001 100644
--- a/arabluatex.dtx
+++ b/arabluatex.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 % ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-% Copyright (C) 2016--2020  Robert Alessi
+% Copyright (C) 2016--2022  Robert Alessi
 %
 % Please send error reports and suggestions for improvements to Robert
 % Alessi <alessi@robertalessi.net>
@@ -27,7 +27,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{arabluatex}
 %<*package>
-    [2020/03/23 v1.20 ArabTeX for LuaLaTeX]
+    [2022/06/15 v1.21-dev ArabTeX for LuaLaTeX]
 %</package>
 %
 %<*driver>
@@ -37,7 +37,7 @@
 % This file is part of the `arabluatex' package
 %
 % ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-% Copyright (C) 2016--2020  Robert Alessi
+% Copyright (C) 2016--2022  Robert Alessi
 %
 % Please send error reports and suggestions for improvements to Robert
 % Alessi <alessi@robertalessi.net>
@@ -158,16 +158,27 @@
 }
 \end{filecontents}
 \usepackage[letterpaper,margin=1.25in,left=50mm,nohead]{geometry}
-\usepackage{fontspec}
+\usepackage[no-math]{fontspec}
-\usepackage[default]{fontsetup}
 \defaultfontfeatures{Renderer=Harfbuzz}
 \usepackage[english]{babel}
-\usepackage{dox}
+%^^A dox does not work with the latest latex-dev:
-\doxitem{Option}{option}{options}
+\ifdefined\SpecialMacroIndex
+  \NewDocElement{Option}{option}
+\else
+  \usepackage{dox}
+  \doxitem{Option}{option}{options}
+\fi
 \usepackage{microtype}
 \babelfont{rm}{Old Standard}
+\babelfont{sf}{NewComputerModernSans10}
+\babelfont{tt}{NewComputerModernMono10}
+\usepackage[Old Standard]{mathfont}
+\usepackage{manfnt}
+\usepackage{lettrine}
+\newcommand\danger{\lettrine[loversize=-.5]{\textdbend}{\hskip6pt}}
 \usepackage{metalogox}
-\usepackage{arabluatex}[2020/03/23]
+\usepackage{arabluatex}[2022/06/15]
+\SetTranslitConvention{dmg+}
 \SetArbUp{\textsuperscript{\thinspace#1}} % Old Standard needs this
 \usepackage[nopar]{quran}
 \usepackage[noindex]{nameauth}
@@ -175,7 +186,9 @@
 \usepackage{latexcolors}
 \PassOptionsToPackage{bookmarks=true}{hyperref}
 \usepackage[numbered]{hypdoc}
+\newcommand{\phts}{\phantomsection}
 \usepackage{uri}
+\usepackage[obeyspaces]{xurl}
 \usepackage[loadlang=en]{metastr}
 \hypersetup{
  colorlinks,
@@ -205,6 +218,7 @@
 \metaset[sep]{draft}{ -- }
 \metasetlang{en-US}
 \metaset{title}{arabluatex}
+\metaset[print]{title}{\textsf{arabluatex}}
 \metaset{date}{\filedate}
 \metaset{draft}{\fileversion}
 \metaset{subject}{ArabTeX}
@@ -219,7 +233,7 @@
 \metaset{partof}{The arabluatex Package}
 \metaset[print]{partof}{The \textsf{arabluatex} Package}
 \metaset{copyrightowner}{\metapick[#1]{author}}
-\metaset{copyrightdate}{2016--2020}
+\metaset{copyrightdate}{2016--2022}
 \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
@@ -267,7 +281,7 @@
  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}
 \newcommand{\package}[1]{\textsf{#1}\index{#1=#1 (package)}}
 \usepackage[contents]{colordoc}
@@ -581,7 +595,7 @@
 % 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
+%   \textsc{Rem.~1} 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,
@@ -594,6 +608,10 @@
 %   \tcboxverb{\newfontfamily\arabicfont{Amiri}[Script=Arabic,RawFeature={+ss05}]}
 %
 %   Other Arabic fonts may behave differently.
+%
+%   \noindent\textsc{Rem.~2} \cs{newfontfamily} can be used to have
+%   either Indian of Arabic numbers printed. See
+%   \vpageref{ref:arabic-numbers} for more information.
 % \end{quoting}
 %
 % \subsection{Options}
@@ -628,8 +646,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
+% \item[dmg/dmg+] \emph{Deutsche Morgenländische Gesellschaft} |dmg|
-%   selected by default;
+%   is selected by default;
 % \item[loc] \emph{Library of Congress};
 % \item[arabica] \emph{Arabica}.
 % \end{description}
@@ -796,11 +814,11 @@
 % \iffalse
 %<*example>
 % \fi
-\begin{code}
+\begin{alcode}
  \begin{arab}
  [...]
  \end{arab}
-\end{code}
+\end{alcode}
 % \iffalse
 %</example>
 % \fi
@@ -857,14 +875,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)}
@@ -873,19 +891,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| \\
@@ -957,7 +975,8 @@
 % 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)}
@@ -966,13 +985,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}.}
@@ -1011,12 +1030,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| \\
@@ -1072,12 +1091,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| \\
@@ -1911,11 +1930,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}
@@ -2070,6 +2089,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
@@ -2153,12 +2200,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| \\
@@ -2234,11 +2281,11 @@
 % \iffalse
 %<*example>
 % \fi
-\begin{code}
+\begin{alcode}
  \begin{arabverse}[key1=value1, key2=value2, ...]
    <verses>
  \end{arabverse}
-\end{code}
+\end{alcode}
 % \iffalse
 %</example>
 % \fi
@@ -2465,7 +2512,7 @@
 % \iffalse
 %<*example>
 % \fi
-\begin{code}
+\begin{alcode}
  \begin{arab}[fullvoc]
    qAla imru'u 'l-\uc{q}aysi fI mu`allaqati-hi:
  \end{arab}
@@ -2474,7 +2521,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}\\
@@ -2488,7 +2535,7 @@
        rasmiN dArisiN min mu`awwali}\\
    \end{linenumbers*}
  \end{arabverse}
-\end{code}
+\end{alcode}
 % \iffalse
 %</example>
 % \fi%
@@ -2503,7 +2550,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}\\
@@ -2528,7 +2575,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}\\
@@ -2557,7 +2604,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}\\
@@ -2585,7 +2632,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}\\
@@ -2945,12 +2992,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| \\
@@ -3196,6 +3243,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
@@ -3218,16 +3268,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
@@ -3249,10 +3299,10 @@
 % \iffalse
 %<*example>
 % \fi
-\begin{code}
+\begin{alcode}
  \newfontfamily\translitfont{Gentium Plus}[Ligatures=TeX]
  \SetTranslitFont{\translitfont}
-\end{code}
+\end{alcode}
 % \iffalse
 %</example>
 % \fi
@@ -3510,9 +3560,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}:
@@ -3539,7 +3589,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]
@@ -3555,7 +3605,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}
@@ -3579,10 +3629,10 @@
 % \iffalse
 %<*example>
 % \fi
-\begin{code}
+\begin{alcode}
  \usepackage{arabluatex}
  \SetInputScheme{buckwalter}
-\end{code}
+\end{alcode}
 % \iffalse
 %</example>
 % \fi
@@ -3615,13 +3665,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}
@@ -3735,11 +3785,11 @@
 % \iffalse
 %<*example>
 % \fi
-\begin{code}
+\begin{alcode}
  \begin{txarab}
    <Unicode Arabic text>
  \end{txarab}
-\end{code}
+\end{alcode}
 % \iffalse
 %</example>
 % \fi
@@ -3838,6 +3888,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
@@ -3972,13 +4023,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
@@ -4075,13 +4126,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
@@ -4124,10 +4175,10 @@
 % \iffalse
 %<*example>
 % \fi
-\begin{code}
+\begin{alcode}
  \usepackage[french]{babel}
  \frenchsetup{StandardLists=true}
-\end{code}
+\end{alcode}
 % \iffalse
 %</example>
 % \fi%
@@ -4145,12 +4196,12 @@
 % \iffalse
 %<*example>
 % \fi
-\begin{code}
+\begin{alcode}
  \usepackage{csquotes}
  \DeclareQuoteStyle{arabic}
  {\textquotedblright}{\textquotedblleft}
  {\textquoteright}{\textquoteleft}
-\end{code}
+\end{alcode}
 % \iffalse
 %</example>
 % \fi
@@ -4222,7 +4273,7 @@
 % \iffalse
 %<*example>
 % \fi
-\begin{code}
+\begin{alcode}
  \beginnumbering
  \pstart
  \begin{arab}
@@ -4231,7 +4282,7 @@
  \end{arab}
  \pend
  \endnumbering
-\end{code}
+\end{alcode}
 % \iffalse
 %</example>
 % \fi
@@ -4256,10 +4307,10 @@
 % \iffalse
 %<*example>
 % \fi
-\begin{code}
+\begin{alcode}
  \usepackage{arabluatex}
  \usepackage[nopar]{quran}
-\end{code}
+\end{alcode}
 % \iffalse
 %</example>
 % \fi
@@ -4298,12 +4349,12 @@
 % \iffalse
 %<*example>
 % \fi
-\begin{code}
+\begin{alcode}
  % preamble
  \usepackage[export]{arabluatex}
  % or:
  \usepackage[export=true]{arabluatex}
-\end{code}
+\end{alcode}
 % \iffalse
 %</example>
 % \fi
@@ -4323,11 +4374,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
@@ -4385,11 +4436,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
@@ -4407,9 +4458,9 @@
 % \iffalse
 %<*example>
 % \fi
-\begin{code}
+\begin{alcode}
  pandoc file_out.tex -s -o file_out.odt
-\end{code}
+\end{alcode}
 % \iffalse
 %</example>
 % \fi
@@ -4421,7 +4472,7 @@
 % \iffalse
 %<*example>
 % \fi
-\begin{code}
+\begin{alcode}
  % preamble:
  \usepackage{arabluatex} % note that 'export' has been removed
  \renewcommand{\txarb}[1]{#1}
@@ -4431,7 +4482,7 @@
  % be safe to say:
  \renewcommand{\prname}[2]{#2}
  % &c
-\end{code}
+\end{alcode}
 % \iffalse
 %</example>
 % \fi
@@ -5092,6 +5143,14 @@
  {\NewDocumentCommand{\LR}{m}{\bgroup\textdir TLT\rmfamily#1\egroup}}}
 %    \end{macrocode}
 % \end{macro}
+% \begin{macro}{\SetArbNumbers}
+% \changes{v1.21}{2022/06/15}{select 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
 % left. Same remark as above regarding the need of redefinition.
 %    \begin{macrocode}
@@ -5248,7 +5307,7 @@
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\altrfont}
-%   \changes{v1.21}{2020/07/13}{new command \cs{altrfont} to store
+%   \changes{v1.21}{2022/06/15}{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
diff --git a/arabluatex.el b/arabluatex.el
index 063fa61..0cd3fd3 100644
--- a/arabluatex.el
+++ b/arabluatex.el
@@ -2,7 +2,7 @@
 ;; This file is part of the `arabluatex' package
 ;; ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-;; Copyright (C) 2016--2020  Robert Alessi
+;; Copyright (C) 2016--2022  Robert Alessi
 ;; The author would like to express his grateful thanks to Arash
 ;; Esbati <arash@gnu.org> whose comments helped to improve this file
@@ -125,6 +125,7 @@
    "SetHemistichDelim"
    '("bayt" 2)
    "abjad"
+    '("SetArbNumbers" "Indian or Arabic")
    "arbnull"
    "abraces"
    "LR"
diff --git a/arabluatex.ins b/arabluatex.ins
index f51c46d..afef368 100644
--- a/arabluatex.ins
+++ b/arabluatex.ins
@@ -1,7 +1,7 @@
 %% This file is part of the `arabluatex' package
 %%
 %% ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-%% Copyright (C) 2016--2020  Robert Alessi
+%% Copyright (C) 2016--2022  Robert Alessi
 %%
 %% Please send error reports and suggestions for improvements to
 %% Robert Alessi <alessi@robertalessi.net>
@@ -43,7 +43,7 @@ This is a generated file.
 This file is part of the `arabluatex' package
 ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright (C) 2016--2020  Robert Alessi
+Copyright (C) 2016--2022  Robert Alessi
 Please send error reports and suggestions for improvements to Robert
 Alessi <alessi@robertalessi.net>
diff --git a/arabluatex.lua b/arabluatex.lua
index 72b1e38..f639770 100644
--- a/arabluatex.lua
+++ b/arabluatex.lua
@@ -2,7 +2,7 @@
 This file is part of the `arabluatex' package
 ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright (C) 2016--2020  Robert Alessi
+Copyright (C) 2016--2022  Robert Alessi
 Please send error reports and suggestions for improvements to Robert
 Alessi <alessi@robertalessi.net>
@@ -94,7 +94,8 @@ local albrkcmds = {
   "LRmarginpar",
   "arbmark",
   "abjad",
-   "ayah"
+   "ayah",
+   "SetArbNumbers"
 }
 local brkcmds = {}
@@ -170,7 +171,18 @@ local function holdcmd(str)
   return str
 end
-local function arbnum(str)
+local indorarbnum = "Indian"
+function arabluatex.setnums(opt)
+   if opt == "Indian"
+   then
+      indorarbnum = "Indian"
+   else
+      indorarbnum = "Arabic"
+   end
+end
+local function arbnum(str) -- not used, see below
   str = string.gsub(str, "([0-9%,%-%/]+)", function(num)
        return string.reverse(num)
   end)
@@ -181,8 +193,11 @@ local function indnum(str)
   str = string.gsub(str, "([0-9%,%-%/]+)", function(num)
        return string.reverse(num)
   end)
-   for i = 1,#numbers do
+   if indorarbnum == "Indian"
-      str = string.gsub(str, numbers[i].a, numbers[i].b)
+   then
+      for i = 1,#numbers do
+         str = string.gsub(str, numbers[i].a, numbers[i].b)
+      end
   end
   return str
 end
@@ -590,11 +605,19 @@ local function novoceasy(str)
   return str
 end
-local function transdmg(str, rules)
+local function transdmg(str, mode, rules)
   str = string.gsub(str, "\\arb(%b{})", function(inside)
   inside = string.sub(inside, 2, -2)
-   for i = 1,#hamzatrdmg do
+   if mode == "dmg"
-      inside = string.gsub(inside, hamzatrdmg[i].a, hamzatrdmg[i].b)
+   then
+      for i = 1,#hamzatrnoinitialdmg do
+         inside = string.gsub(inside, hamzatrnoinitialdmg[i].a, hamzatrnoinitialdmg[i].b)
+      end
+   elseif mode == "dmg+"
+   then
+      for i = 1,#hamzatrdmg do
+         inside = string.gsub(inside, hamzatrdmg[i].a, hamzatrdmg[i].b)
+      end
   end
   for i = 1,#tanwintrdmg do
      inside  = string.gsub(inside, tanwintrdmg[i].a, tanwintrdmg[i].b)
@@ -1062,8 +1085,8 @@ function arabluatex.processtrans(str, mode, rules, scheme)
   if scheme == "buckwalter" then
      str = processbuckw(str)
   end
-   if mode == "dmg" then
+   if mode == "dmg" or mode == "dmg+" then
-      str = transdmg(str, rules)
+      str = transdmg(str, mode, rules)
   elseif mode == "loc" then
      str = transloc(str)
   elseif mode == "arabica" then
diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index a53adce..adfccf4 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -2,7 +2,7 @@
 This file is part of the `arabluatex' package
 ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright (C) 2016--2020  Robert Alessi
+Copyright (C) 2016--2022  Robert Alessi
 Please send error reports and suggestions for improvements to Robert
 Alessi <alessi@robertalessi.net>
diff --git a/arabluatex_novoc.lua b/arabluatex_novoc.lua
index f3410e7..b77cfda 100644
--- a/arabluatex_novoc.lua
+++ b/arabluatex_novoc.lua
@@ -2,7 +2,7 @@
 This file is part of the `arabluatex' package
 ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright (C) 2016--2020  Robert Alessi
+Copyright (C) 2016--2022  Robert Alessi
 Please send error reports and suggestions for improvements to Robert
 Alessi <alessi@robertalessi.net>
diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua
index 455b57b..c5c0b05 100644
--- a/arabluatex_trans.lua
+++ b/arabluatex_trans.lua
@@ -2,7 +2,7 @@
 This file is part of the `arabluatex' package
 ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright (C) 2016--2020  Robert Alessi
+Copyright (C) 2016--2022  Robert Alessi
 Please send error reports and suggestions for improvements to Robert
 Alessi <alessi@robertalessi.net>
@@ -202,6 +202,91 @@ hamzatrdmg = {
   {a="(i)(')([^uaiUAI])", b="%1ʾ%3"}
 }
+hamzatrnoinitialdmg = {
+   -- next lines for ʾalif alone
+   {a="(%.A)l%-(%^n)", b=".|l-%2"}, --additional (^n is lunar)
+   {a="([%(%[%|%<%s%-O])(%.A)l%-(%^n)", b="%1.|l-%3"}, --additional (^n is lunar) --p
+   {a="(%.A)l%-([%_%^%.]?[tdrzsnc])", b=".|%2-%2"},
+   {a="([%(%[%|%<%s%-O])(%.A)l%-([%_%^%.]?[tdrzsnc])", b="%1.|%3-%3"}, --p
+   {a="(%.A)([uai])l%-(%^n)", b="||%2l-%3"}, --additional (^n is lunar)
+   {a="([%(%[%|%<%s%-O])(%.A)([uai])l%-(%^n)", b="%1||%3l-%4"}, --additional (^n is lunar) --p
+   {a="(%.A)([uai])l%-([%_%^%.]?[tdrzsnc])", b="||%2%3-%3"},
+   {a="([%(%[%|%<%s%-O])(%.A)([uai])l%-([%_%^%.]?[tdrzsnc])", b="%1||%3%4-%4"}, --p
+   {a="(%.A)([^uai])", b=".|%2"},
+   {a="(%.A)([uai])", b="||%2"},
+   -- hard coded hamza
+   {a="|\"'", b="ʾ"},
+   {a="A\"'", b="ʾA"},
+   {a="[au]\"'", b="ʾ"},
+   {a="w\"'", b="ʾ"},
+   {a="i\"'", b="ʾ"},
+   {a="y\"'", b="ʾ"},
+   -- hamza takes tašdīd too
+   {a="''([Uu])", b="ʾʾ%1"},
+   {a="''([Aa])", b="ʾʾ%1"},
+   {a="''([Ii])", b="ʾʾ%1"},
+   -- initial long u and i (for a, see below)
+   {a="%'%_U", b="||U"},
+   {a="%'%_I", b="||I"},
+   -- taḫfīfu 'l-hamza
+   {a="'u'([^uaiUAI])", b="|U%1"},
+   {a="'i'([^uaiUAI])", b="|I%1"},
+   {a="^u'([^uaiUAI])", b="U%1"},
+   {a="([^uaiUAIYN][%s%(%[%<])u'([^uaiUAI])", b="%1U%2"},
+   {a="^i'([^uaiUAI])", b="I%1"},
+   {a="([^uaiUAIYN][%s%(%[%<])i'([^uaiUAI])", b="%1I%2"},
+   -- madda (historic writing below)
+   {a="'a'([^uaiUAI])", b="ʾA%1"},
+   {a="'a?A", b="ʾA"},
+   {a="(A)(')(i)$", b="%1ʾ%3"},
+   {a="(A)(')(i)(%W)", b="%1ʾ%3%4"},
+   {a="(A)(')(i)", b="%1ʾ%3"}, -- historic madda
+   {a="(A)(')", b="%1ʾ"}, -- historic madda
+   -- initial (needs both ^ and %W patterns)
+   -- 'aw: the diphthong is to be resolved into 'awi' (next 8 lines)
+   {a="^('aw)(O)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-O)", b="%1i"},
+   {a="(%W)('aw)(O)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-O)", b="%1%2i"},
+   {a="^('aw)(O)(\"?[uai])([%S]-O)", b="%1i"},
+   {a="(%W)('aw)(O)(\"?[uai])([%S]-O)", b="%1%2i"},
+   {a="^('aw)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1i%2%3"},
+   {a="(%W)('aw)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1%2i%3%4"},
+   {a="^('aw)(%s)([%(%[%|%<]?\"?[uai])", b="%1i%2%3"}, --p
+   {a="(%W)('aw)(%s)([%(%[%|%<]?\"?[uai])", b="%1%2i%3%4"}, --p
+   -- then the 'initial' rules for the remaining cases
+   {a="^(')([ua])", b="||%2"},
+   {a="^(')(i)", b="||%2"},
+   -- consider replacing initial %W with [%s%(%[%<%-]:
+   --   {a="(%W)(')([ua])", b="%1||%3"},
+   --   {a="(%W)(')(i)", b="%1||%3"},
+   {a="([%s%(%[%<%-])(')([ua])", b="%1||%3"},
+   {a="([%s%(%[%<%-])(')(i)", b="%1||%3"},
+   -- final
+   {a="([Iy])(')(aN)$", b="%1ʾ%3"},
+   {a="([Iy])(')(aN)(%W)", b="%1ʾ%3%4"},
+   {a="([^uai])(')([uai]N?)$", b="%1ʾ%3"},
+   {a="([^uai])(')([uai]N?)(%W)", b="%1ʾ%3%4"},
+   {a="([UI])(')([uai])$", b="%1ʾ%3"},
+   {a="([UI])(')([uai])(%W)", b="%1ʾ%3%4"},
+   -- middle
+   {a="(U)(')", b="%1ʾ"},
+   {a="([Iy])(')", b="%1ʾ"},
+   {a="([^uai])(')([uU])", b="%1ʾ%3"},
+   {a="([^uai])(')(%_?[aAY])", b="%1ʾ%3"},
+   {a="([^uai])(')([iI])", b="%1ʾ%3"},
+   {a="(u)(')([uU])", b="%1ʾ%3"},
+   {a="(u)(')(%_?[aAY])", b="%1ʾ%3"},
+   {a="(u)(')([iI])", b="%1ʾ%3"},
+   {a="(a)(')(%_?[aAY])", b="%1ʾ%3"},
+   {a="(a)(')([uU])", b="%1ʾ%3"},
+   {a="(a)(')([iI])", b="%1ʾ%3"},
+   {a="(i)(')(%_?[aAY])", b="%1ʾ%3"},
+   {a="(i)(')([uU])", b="%1ʾ%3"},
+   {a="(i)(')([iI])", b="%1ʾ%3"},
+   {a="(a)(')([^uaiUAI])", b="%1ʾ%3"},
+   {a="(u)(')([^uaiUAI])", b="%1ʾ%3"},
+   {a="(i)(')([^uaiUAI])", b="%1ʾ%3"}
+}
 tanwintrdmg = {
   {a="%-?([uai]NU)(O)([ui])([%S]-O)", b="\\arbup{un%3}"},
   {a="%-?([uai]NU)(%s)([ui])", b="\\arbup{un%3}%2'"},
diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index 7301540..362c866 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -2,7 +2,7 @@
 This file is part of the `arabluatex' package
 ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright (C) 2016--2020  Robert Alessi
+Copyright (C) 2016--2022  Robert Alessi
 Please send error reports and suggestions for improvements to Robert
 Alessi <alessi@robertalessi.net>
diff --git a/makefile b/makefile
index d6a1e7d..19012c3 100644
--- a/makefile
+++ b/makefile
@@ -33,6 +33,21 @@ local: clean sty
        fi
        cp $(pkg)*.el $(HOMEDIR)/.emacs.d/auctex/auto
+inst: doc
+        if [ ! -d "$(TEXMFDIR)/tex/lualatex/arabluatex" ]; then \
+        mkdir -p $(TEXMFDIR)/tex/lualatex/arabluatex; \
+        fi
+        cp $(pkg)*.{sty,lua} $(TEXMFDIR)/tex/lualatex/arabluatex
+        if [ ! -d "$(HOMEDIR)/.emacs.d/auctex/auto" ]; then \
+        mkdir -p $(HOMEDIR)/.emacs.d/auctex/auto; \
+        fi
+        cp $(pkg)*.el $(HOMEDIR)/.emacs.d/auctex/auto
+        if [ ! -d "$(TEXMFDIR)/doc/lualatex/arabluatex" ]; then \
+        mkdir -p $(TEXMFDIR)/doc/lualatex/arabluatex; \
+        fi
+        cp $(pkg).pdf $(TEXMFDIR)/doc/lualatex/arabluatex
+        cp -r samples/ $(TEXMFDIR)/doc/lualatex/arabluatex
 auctex: clean
        if [ ! -d "$(HOMEDIR)/.emacs.d/auctex/auto" ]; then \
        mkdir -p $(HOMEDIR)/.emacs.d/auctex/auto; \
@@ -54,7 +69,7 @@ package: clean all
        tar czf arabluatex-$(ver).tar.gz arabluatex.tds.zip arabluatex/
 clean:
-        rm -rf $(TEXMFDIR)/tex/lualatex/arabluatex/
+        rm -rf $(TEXMFDIR)/{tex,doc}/lualatex/arabluatex/
        rm -rf $(HOMEDIR)/.emacs.d/auctex/auto/arabluatex*.{el,elc}
        rm -rf tex/ doc/ source/ auto/
        rm -rf arabluatex/
@@ -68,4 +83,4 @@ clean:
        pandoc -s README.tex -o README.md && sed -i 's/{#.*}//g' README.md
        pandoc -s README.tex -o about.html
-.PHONY: sty doc all local auctex package clean
+.PHONY: sty doc all local inst auctex package clean