16 files changed, 579 insertions, 1007 deletions

diff --git a/AUTHORS.md b/AUTHORS.md
new file mode 100644
index 0000000..2d8eeae
--- /dev/null
+++ b/AUTHORS.md
@@ -0,0 +1,8 @@
+Author of the `arabluatex` package
+==================================
+
+Robert Alessi
+: Personal email: <alessi@robertalessi.net>
+: Institutional email: <robert.alessi@cnrs.fr>
+: Affiliation: [UMR 8167 Orient & Méditerranée (Paris, France)](https://www.orient-mediterranee.com)
+: More information: <https://ctan.org/pkg/arabluatex> or <https://sr.ht/~ralessi/arabluatex>
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..dc34776
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,17 @@
+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.
diff --git a/README.md b/README.md
index e1ccf14..eba493f 100644
--- a/README.md
+++ b/README.md
@@ -1,54 +1,47 @@
----
-author:
-- Robert Alessi
-title: 'The arabluatex package -- README file'
----
-
-Overview 
-========
-
-This package provides for [LuaLaTeX](http://luatex.org) an
-[ArabTeX](http://ctan.org/pkg/arabtex)-like interface to generate Arabic
-writing from an [ascii]{.smallcaps} 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 `.tex` source files, in addition to
-printed books, `TEI xml` compliant critical editions and/or lexicons
-that can be searched, analyzed and correlated in various ways.
-
-License and disclamer 
-=====================
+# Overview 
+
+This package provides for [LuaLaTeX](https://luatex.org) an
+[ArabTeX](https://ctan.org/pkg/arabtex)-like interface to generate
+Arabic writing from an [ascii]{.smallcaps} 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 can also operate with
+the [ekdosis](https://ctan.org/pkg/ekdosis) package to produce from
+`.tex` source files, in addition to printed books, `TEI xml` compliant
+critical editions and/or lexicons that can be searched, analyzed and
+correlated in various ways.
+
+# License and disclamer 
 
 ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
 
-Copyright ⓒ 2016--2022 Robert Alessi
+Copyright ⓒ 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.
 
 Please send error reports and suggestions for improvements to Robert
 Alessi:
 
 -   email: <alessi@robertalessi.net>
 
--   website: <http://www.robertalessi.net/arabluatex>
+-   website: <https://sr.ht/~ralessi/arabluatex>
 
 -   comments, feature requests, bug reports:
-    <https://gitlab.com/ralessi/arabluatex/issues>
-
-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 \<http://www.gnu.org/licenses/\>.
+    <https://todo.sr.ht/~ralessi/arabluatex>
 
 This release of arabluatex consists of the following source files:
 
@@ -66,20 +59,7 @@ This release of arabluatex consists of the following source files:
 
 -   `arabluatex_trans.lua`
 
-License applicable to the documentation 
----------------------------------------
-
-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
-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.
-
-Installation 
-============
+# Installation 
 
 1.  Run `'lualatex arabluatex.ins'` to produce the `arabluatex.sty`
     file;
@@ -106,41 +86,39 @@ Installation
     `arabluatex.el` to their `~/.emacs.d/auctex/auto` local directory.
     This will enable the appropriate hooks for ArabLuaTeX in AUCTeX.
 
-Development, Git Repository 
-===========================
+# Development, Git Repository 
 
-Browse the code 
----------------
+## Browse the code 
 
 You can browse ArabLuaTeX repository on the web:
-<http://git.robertalessi.net/arabluatex>
+<http://git.robertalessi.net/arabluatex>\
+or\
+<https://sr.ht/~ralessi/arabluatex>
 
 From this page, you can download all the releases of ArabLuaTeX. For
 instructions on how to install ArabLuaTeX, please see above.
 
-Comments, Feature requests, Bug Reports 
----------------------------------------
+## Comments, Feature requests, Bug Reports 
 
-<https://gitlab.com/ralessi/arabluatex/issues>
+<https://todo.sr.ht/~ralessi/arabluatex>
 
-Download the repository 
------------------------
+## Download the repository 
 
 ArabLuaTeX development is facilitated by git, a distributed version
-control system. You will need to install git (most GNU/Linux
+control system. You will need to install git (most Unix/Linux
 distributions package it in their repositories).
 
 Use this command to download the repository
 
-    git clone http://git.robertalessi.net/arabluatex
+    git clone https://git.sr.ht/~ralessi/arabluatex
 
 A new directory named arabluatex will have been created, containing
 ArabLuaTeX.
 
-Git hosting 
------------
+## Git hosting 
 
-Make an account on <https://gitlab.com> and navigate (while logged in)
-to <https://gitlab.com/ralessi/arabluatex>. Click *Fork* and you will
-have in your account your own repository of `arabluatex` where you will
-be able to make whatever changes you like to.
+Make an account on <https://sr.ht> and navigate (while logged in) to
+<https://git.sr.ht/~ralessi/arabluatex>. Click *Clone repo to your
+account* and you will have in your account your own repository of
+`arabluatex` where you will be able to make whatever changes you like
+to.
diff --git a/README.tex b/README.tex
index 37ec7c4..dd413d3 100644
--- a/README.tex
+++ b/README.tex
@@ -1,6 +1,6 @@
 % The arabluatex package -- README file
 % Robert Alessi
-% March 18, 2017
+% January 29, 2023
 \documentclass{article}
 
 \usepackage{fontspec}
@@ -16,48 +16,47 @@
 
 \section*{Overview}
 \label{sec:overview}
-This package provides for \href{http://luatex.org}{Lua\LaTeX} an
-\href{http://ctan.org/pkg/arabtex}{Arab\TeX}-like interface to
+This package provides for \href{https://luatex.org}{Lua\LaTeX}
+an \href{https://ctan.org/pkg/arabtex}{Arab\TeX}-like interface to
 generate Arabic writing from an \textsc{ascii} 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
 Arab\TeX\ 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.
+further allows many typographical refinements. It can also operate
+with the \href{https://ctan.org/pkg/ekdosis}{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.
 
 \section*{License and disclamer}
 ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
 
-Copyright ⓒ 2016--2022  Robert Alessi
+Copyright ⓒ  2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023
+Robert Alessi <\verb|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.
 
 Please send error reports and suggestions for improvements to Robert
 Alessi:
 \begin{itemize}
 \item email: \href{mailto:alessi@robertalessi.net}{alessi@robertalessi.net}
-\item website: \url{http://www.robertalessi.net/arabluatex}
+\item website: \url{https://sr.ht/~ralessi/arabluatex}
 \item comments, feature requests, bug reports:
-  \url{https://gitlab.com/ralessi/arabluatex/issues}
+  \url{https://todo.sr.ht/~ralessi/arabluatex}
 \end{itemize}
 
-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
-<http://www.gnu.org/licenses/>.
-
 This release of arabluatex consists of the following
 source files:
 \begin{itemize}
@@ -70,17 +69,6 @@ source files:
 \item \verb|arabluatex_trans.lua|
 \end{itemize}
 
-\subsection*{License applicable to the documentation}
-\label{sec:documentation-license}
-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
-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.
-
 \section*{Installation}
 \label{sec:installation}
 \begin{enumerate}
@@ -111,36 +99,37 @@ Documentation License'' of the documentation.
 \label{sec:browse-code}
 
 You can browse ArabLua\TeX\ repository on the web:
-\url{http://git.robertalessi.net/arabluatex}
+\url{http://git.robertalessi.net/arabluatex}\\
+or\\
+\url{https://sr.ht/~ralessi/arabluatex}
 
 From this page, you can download all the releases of ArabLua\TeX. For
 instructions on how to install ArabLua\TeX, please see above.
 
 \subsection*{Comments, Feature requests, Bug Reports}
 \label{sec:comm-feat-requ}
-\url{https://gitlab.com/ralessi/arabluatex/issues}
+\url{https://todo.sr.ht/~ralessi/arabluatex}
 
 \subsection*{Download the repository}
 \label{sec:download-repository}
 ArabLua\TeX\ development is facilitated by git, a distributed version
-control system. You will need to install git (most GNU/Linux
+control system. You will need to install git (most Unix/Linux
 distributions package it in their repositories).
 
 Use this command to download the repository
 \begin{verbatim}
-git clone http://git.robertalessi.net/arabluatex
+git clone https://git.sr.ht/~ralessi/arabluatex
 \end{verbatim}
 
-
 A new directory named arabluatex will have been created, containing
 ArabLuaTeX.
 
 \subsection*{Git hosting}
 \label{sec:git-hosting}
-Make an account on \url{https://gitlab.com} and navigate (while
-logged in) to \url{https://gitlab.com/ralessi/arabluatex}. Click
-\emph{Fork} and you will have in your account your own repository of
-\verb|arabluatex| where you will be able to make whatever changes you
-like to.
+Make an account on \url{https://sr.ht} and navigate (while logged in)
+to \url{https://git.sr.ht/~ralessi/arabluatex}. Click \emph{Clone repo
+  to your account} and you will have in your account your own
+repository of \verb|arabluatex| where you will be able to make
+whatever changes you like to.
 
 \end{document}
\ No newline at end of file
diff --git a/about.html b/about.html
index af0eb19..d5b5236 100644
--- a/about.html
+++ b/about.html
@@ -1,40 +1,47 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" lang="" xml:lang="">
-<head>
-  <meta charset="utf-8" />
-  <meta name="generator" content="pandoc" />
-  <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>
-    code{white-space: pre-wrap;}
-    span.smallcaps{font-variant: small-caps;}
-    span.underline{text-decoration: underline;}
-    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 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>
-<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 class="unnumbered" id="license-and-disclamer">License and disclamer</h1>
+<p>This package provides for <a href="https://luatex.org">LuaLaTeX</a>
+an <a href="https://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
+can also operate with the <a
+href="https://ctan.org/pkg/ekdosis">ekdosis</a> package 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 class="unnumbered" id="license-and-disclamer">License and
+disclamer</h1>
 <p>ArabLuaTeX – Processing ArabTeX notation under LuaLaTeX</p>
-<p>Copyright ⓒ 2016–2022 Robert Alessi</p>
-<p>Please send error reports and suggestions for improvements to Robert Alessi:</p>
+<p>Copyright ⓒ 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Robert
+Alessi &lt;<code>alessi@robertalessi.net</code>&gt;</p>
+<p>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.</p>
+<p>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.</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">http://www.robertalessi.net/arabluatex</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>
+<li><p>email: <a
+href="mailto:alessi@robertalessi.net">alessi@robertalessi.net</a></p></li>
+<li><p>website: <a href="https://sr.ht/~ralessi/arabluatex"
+class="uri">https://sr.ht/~ralessi/arabluatex</a></p></li>
+<li><p>comments, feature requests, bug reports: <a
+href="https://todo.sr.ht/~ralessi/arabluatex"
+class="uri">https://todo.sr.ht/~ralessi/arabluatex</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>
-<p>You should have received a copy of the GNU General Public License along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.</p>
-<p>This release of arabluatex consists of the following source files:</p>
+<p>This release of arabluatex consists of the following source
+files:</p>
 <ul>
 <li><p><code>arabluatex.ins</code></p></li>
 <li><p><code>arabluatex.dtx</code></p></li>
@@ -44,13 +51,14 @@
 <li><p><code>arabluatex_novoc.lua</code></p></li>
 <li><p><code>arabluatex_trans.lua</code></p></li>
 </ul>
-<h2 class="unnumbered" id="sec:documentation-license">License applicable to the documentation</h2>
-<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 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">https://texfaq.org/FAQ-inst-wlcf</a> for more on this:</p>
+<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>
 <ul>
 <li><p><code>arabluatex.sty</code></p></li>
 <li><p><code>arabluatex-patch.sty</code></p></li>
@@ -60,20 +68,39 @@
 <li><p><code>arabluatex_novoc.lua</code></p></li>
 <li><p><code>arabluatex_trans.lua</code></p></li>
 </ul></li>
-<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>
+<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 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">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 class="unnumbered" id="sec:comm-feat-requ">Comments, Feature requests, Bug Reports</h2>
-<p><a href="https://gitlab.com/ralessi/arabluatex/issues">https://gitlab.com/ralessi/arabluatex/issues</a></p>
-<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>You can browse ArabLuaTeX repository on the web: <a
+href="http://git.robertalessi.net/arabluatex"
+class="uri">http://git.robertalessi.net/arabluatex</a><br />
+or<br />
+<a href="https://sr.ht/~ralessi/arabluatex"
+class="uri">https://sr.ht/~ralessi/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 class="unnumbered" id="sec:comm-feat-requ">Comments, Feature
+requests, Bug Reports</h2>
+<p><a href="https://todo.sr.ht/~ralessi/arabluatex"
+class="uri">https://todo.sr.ht/~ralessi/arabluatex</a></p>
+<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 Unix/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>
+<pre><code>git clone https://git.sr.ht/~ralessi/arabluatex</code></pre>
+<p>A new directory named arabluatex will have been created, containing
+ArabLuaTeX.</p>
 <h2 class="unnumbered" id="sec:git-hosting">Git hosting</h2>
-<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>
+<p>Make an account on <a href="https://sr.ht"
+class="uri">https://sr.ht</a> and navigate (while logged in) to <a
+href="https://git.sr.ht/~ralessi/arabluatex"
+class="uri">https://git.sr.ht/~ralessi/arabluatex</a>. Click <em>Clone
+repo to your account</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>
diff --git a/arabluatex.dtx b/arabluatex.dtx
index 9c2edbb..3b2f4c2 100644
--- a/arabluatex.dtx
+++ b/arabluatex.dtx
@@ -1,23 +1,22 @@
 % \iffalse meta-comment
 % ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-% Copyright (C) 2016--2022  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>
-    [2022/06/15 v1.21-dev 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--2022  Robert Alessi
 %
-% Please send error reports and suggestions for improvements to Robert
-% Alessi <alessi@robertalessi.net>
+% 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>
 
 @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},
@@ -158,7 +166,7 @@
 }
 \end{filecontents}
 \usepackage[letterpaper,margin=1.25in,left=50mm,nohead]{geometry}
-\usepackage[no-math]{fontspec}
+\usepackage{fontspec}
 \defaultfontfeatures{Renderer=Harfbuzz}
 \usepackage[english]{babel}
 %^^A dox does not work with the latest latex-dev:
@@ -169,15 +177,14 @@
   \doxitem{Option}{option}{options}
 \fi
 \usepackage{microtype}
-\babelfont{rm}{Old Standard}
+\babelfont{rm}[RawFeature=onum]{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}[2022/06/15]
+\usepackage{arabluatex}[2023/05/21]
 \SetTranslitConvention{dmg+}
 \SetArbUp{\textsuperscript{\thinspace#1}} % Old Standard needs this
 \usepackage[nopar]{quran}
@@ -187,8 +194,6 @@
 \PassOptionsToPackage{bookmarks=true}{hyperref}
 \usepackage[numbered]{hypdoc}
 \newcommand{\phts}{\phantomsection}
-\usepackage{uri}
-\usepackage[obeyspaces]{xurl}
 \usepackage[loadlang=en]{metastr}
 \hypersetup{
   colorlinks,
@@ -233,18 +238,24 @@
 \metaset{partof}{The arabluatex Package}
 \metaset[print]{partof}{The \textsf{arabluatex} Package}
 \metaset{copyrightowner}{\metapick[#1]{author}}
-\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
-  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
@@ -265,8 +276,6 @@
   label*=\textsc{Rem.} \emph{\alph*},
   left=0.25in,
   before=\smaller}
-\usepackage{multicol}
-\setlength\IndexMin{100pt}
 \usepackage{quoting}
 \quotingsetup{noorphans, rightmargin=0pt}
 \renewcommand*{\quotingfont}{\footnotesize}
@@ -295,7 +304,7 @@
 \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}{%
@@ -305,6 +314,8 @@
   {\marginpar{\hfill\emph{New feature} #1}}%
   \ignorespaces
 }
+\usepackage{uri}
+\usepackage[obeyspaces]{xurl}
 \usepackage{multicol}
 \usepackage{tocloft}
 \renewcommand\cftlotprehook{\begin{multicols}{2}}
@@ -312,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
@@ -423,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}
@@ -2370,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
@@ -2506,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
@@ -4528,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}
@@ -5156,12 +4647,12 @@
 % 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}{2022/06/15}{selects Indian or Arabic numbers}
+% \changes{v1.21}{2023/05/21}{selects Indian or Arabic numbers}
 %    \begin{macrocode}
 \NewDocumentCommand{\SetArbNumbers}{m}{%
   \luadirect{arabluatex.setnums(\luastringN{#1})}%
@@ -5324,7 +4815,7 @@
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\altrfont}
-%   \changes{v1.21}{2022/06/15}{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
@@ -5561,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
@@ -5658,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}%
@@ -5683,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%
 }
@@ -5930,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}
diff --git a/arabluatex.el b/arabluatex.el
index 0cd3fd3..5007675 100644
--- a/arabluatex.el
+++ b/arabluatex.el
@@ -1,8 +1,23 @@
 ;;; arabluatex.el --- AUCTeX style for `arabluatex.sty'
 ;; This file is part of the `arabluatex' package
 
-;; ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-;; Copyright (C) 2016--2022  Robert Alessi
+;; 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.
 
 ;; The author would like to express his grateful thanks to Arash
 ;; Esbati <arash@gnu.org> whose comments helped to improve this file
@@ -11,20 +26,6 @@
 ;; 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.
-
-;; 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
-;; <http://www.gnu.org/licenses/>.
-
 (defvar LaTeX-arabluatex-preamble-options
   '(("voc")
     ("fullvoc")
@@ -124,6 +125,7 @@
       TeX-arg-index)
     "SetHemistichDelim"
     '("bayt" 2)
+    '("bayt+" 2)
     "abjad"
     '("SetArbNumbers" "Indian or Arabic")
     "arbnull"
diff --git a/arabluatex.ins b/arabluatex.ins
index afef368..a8c65c6 100644
--- a/arabluatex.ins
+++ b/arabluatex.ins
@@ -1,24 +1,23 @@
 %% This file is part of the `arabluatex' package
 %%
 %% ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-%% Copyright (C) 2016--2022  Robert Alessi
-%%
-%% Please send error reports and suggestions for improvements to
+%% 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>
 %%
 %% This release of 'arabluatex' consists of the following source files:
 %% - arabluatex.ins
@@ -28,8 +27,6 @@
 %% - arabluatex_fullvoc.lua
 %% - arabluatex_novoc.lua
 %% - arabluatex_trans.lua
-%% 
-
 
 \input docstrip.tex
 \keepsilent
@@ -43,24 +40,23 @@ This is a generated file.
 This file is part of the `arabluatex' package
 
 ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright (C) 2016--2022  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.
-
-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
-<http://www.gnu.org/licenses/>.
+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.
+
+Please send error reports and suggestions for improvements to
+Robert Alessi <alessi@robertalessi.net>
 
 This release of 'arabluatex' consists of the following source files:
 - arabluatex.ins
diff --git a/arabluatex.lua b/arabluatex.lua
index f639770..114a569 100644
--- a/arabluatex.lua
+++ b/arabluatex.lua
@@ -2,24 +2,23 @@
 This file is part of the `arabluatex' package
 
 ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright (C) 2016--2022  Robert Alessi
+Copyright (C) 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023
+Robert Alessi <alessi@robertalessi.net>
 
-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.
+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.
 
-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.
+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>
 --]]
 
 arabluatex = {}
@@ -54,11 +53,26 @@ local cmd = lpeg.Cs(dblbkslash * ascii^1 * cmdstar^-1)
 local rawcmd = lpeg.Cs(dblbkslash * ascii^1)
 local aftercmd = lpeg.Cs(lpeg.S("*[{,.?;:'`\"") + dblbkslash)
 local cmdargs = lpeg.Cs(spce^-1 * bsqbracketsii * bcbracesii * bsqbrackets^-1)
+local cmdargsnobs = lpeg.Cs(spce^-1 * bcbracesii)
 local arbargs = lpeg.Cs(spce^-1 * bsqbrackets^-1 * bcbraces)
 local baytargs = lpeg.Cs(spce * bcbraces * bsqbrackets^-1 * bcbraces)
 local arind = lpeg.Cs(dblbkslash * lpeg.P("arind") * spce^-1 * bsqbracketsii)
 
 local function protectarb(str)
+   -- \App[]{}{}
+   str = string.gsub(str, "(\\App%s?)(%b{})(%b{})", "%1[]%2%3")
+   str = gsub(str, lpeg.P("\\App") * spcenc^-1 * bsqbrackets * bcbraces * bcbraces,
+              function(opt, lem, rdg)
+                 opt = string.sub(opt, 2, -2)
+                 lem = string.sub(lem, 2, -2)
+                 rdg = string.sub(rdg, 2, -2)
+                 if opt == ""
+                 then
+                    return string.format("\\app{%s%s}", lem, rdg)
+                 else
+                    return string.format("\\app[%s]{%s%s}", opt, lem, rdg)
+                 end
+   end)
    str = string.gsub(str, "(\\arb%s?)(%[.-%])(%b{})", "\\al@brk{\\arb%2%3}")
    str = string.gsub(str, "(\\LR%s?)(%b{})", "\\@LR%2")
    str = string.gsub(str, "(\\RL%s?)(%b{})", "\\@RL%2")
@@ -90,7 +104,6 @@ local outofarb = {
 local albrkcmds = {
    "begin",
    "end",
-   "par",
    "LRmarginpar",
    "arbmark",
    "abjad",
@@ -121,13 +134,15 @@ function arabluatex.mkarbbreak(str, opt)
 end
 
 local function breakcmd(str)
+   -- \par
+   str = gsub(str, dblbkslash * lpeg.Cs("par") * cmdargsnobs, "\\al@brk{%1%2%3}")
    -- process \item[], then \item[]
-        str = string.gsub(str, "\\(item.?)(%b[])",
-          function(tag, body)
-          body = string.sub(body, 2, -2)
-          return string.format("\\al@brk{\\item[\\arb{%s}] }", body)
-        end)
-        str = string.gsub(str, "(\\item)(%s+)", "%1{}%2")
+   str = string.gsub(str, "\\(item.?)(%b[])",
+                     function(tag, body)
+                        body = string.sub(body, 2, -2)
+                        return string.format("\\al@brk{\\item[\\arb{%s}] }", body)
+   end)
+   str = string.gsub(str, "(\\item)(%s+)", "%1{}%2")
    -- \textcolor
         str = string.gsub(str, "\\(textcolor%s?)(%b{})(%b{})",
                           function(tag, bodycolor, bodytext)
@@ -189,10 +204,15 @@ local function arbnum(str) -- not used, see below
    return str
 end
 
-local function indnum(str)
-   str = string.gsub(str, "([0-9%,%-%/]+)", function(num)
-        return string.reverse(num)
-   end)
+local function indnum(str, dir)
+   if dir == "ltr"
+   then
+      -- do nothing
+   else
+      str = string.gsub(str, "([0-9%,%-%/]+)", function(num)
+                           return string.reverse(num)
+      end)
+   end
    if indorarbnum == "Indian"
    then
       for i = 1,#numbers do
@@ -820,16 +840,16 @@ local function processarbtoutf(str)
                         end)
                         return string.format("%s{%s}", tag, body)
    end)
-   str = string.gsub(str, "(\\bayt)%s?(%b{})(%b[])(%b{})", function(tag, argi, argii, argiii)
+   str = string.gsub(str, "(\\bayt)%s?(%+?)(%b{})(%b[])(%b{})", function(tag, plus, argi, argii, argiii)
                         argi = string.sub(argi, 2, -2)
                         argii = string.sub(argii, 2, -2)
                         argiii = string.sub(argiii, 2, -2)
-                        return string.format("%s*{\\arb{%s}}[\\arb{%s}]{\\arb{%s}}", tag, argi, argii, argiii)
+                        return string.format("%s%s*{\\arb{%s}}[\\arb{%s}]{\\arb{%s}}", tag, argi, argii, argiii)
    end)
-   str = string.gsub(str, "(\\bayt)%s?(%b{})(%b{})", function(tag, argi, argii)
+   str = string.gsub(str, "(\\bayt)%s?(%+?)(%b{})(%b{})", function(tag, plus, argi, argii)
                         argi = string.sub(argi, 2, -2)
                         argii = string.sub(argii, 2, -2)
-                        return string.format("%s*{\\arb{%s}}{\\arb{%s}}", tag, argi, argii)
+                        return string.format("%s%s*{\\arb{%s}}{\\arb{%s}}", tag, plus, argi, argii)
    end)
    str = string.gsub(str, "(\\prname)%s?(%b{})", function(tag, body)
                         body = string.sub(body, 2, -2)
@@ -1287,7 +1307,9 @@ end
 function arabluatex.ayah(str)
    if tonumber(str) ~= nil and str.len(str) < 4 then
       if tex.textdir == "TRT" then
-         str = indnum(str).."^^^^06dd"
+         -- end of ayah is typeset LTR and the number comes after the
+         -- sign (see https://github.com/aliftype/amiri/issues/263#issuecomment-1872979252)
+         str = "{\\textdir TLT ".."^^^^06dd"..indnum(str, "ltr").."}"
       elseif tex.textdir == "TLT" then
          str = "\\arb[trans]{("..str..")}"
       end
diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index e34f12d..7483734 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -2,24 +2,23 @@
 This file is part of the `arabluatex' package
 
 ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright (C) 2016--2022  Robert Alessi
+Copyright (C) 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023
+Robert Alessi <alessi@robertalessi.net>
 
-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.
+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.
 
-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.
+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>
 --]]
 
 hamzafv = {
diff --git a/arabluatex_novoc.lua b/arabluatex_novoc.lua
index f2d0d5a..1800655 100644
--- a/arabluatex_novoc.lua
+++ b/arabluatex_novoc.lua
@@ -2,24 +2,23 @@
 This file is part of the `arabluatex' package
 
 ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright (C) 2016--2022  Robert Alessi
+Copyright (C) 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023
+Robert Alessi <alessi@robertalessi.net>
 
-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.
+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.
 
-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.
+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>
 --]]
 
 tanwinnv = {
diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua
index 8791b62..c3c21e1 100644
--- a/arabluatex_trans.lua
+++ b/arabluatex_trans.lua
@@ -2,24 +2,23 @@
 This file is part of the `arabluatex' package
 
 ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright (C) 2016--2022  Robert Alessi
+Copyright (C) 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023
+Robert Alessi <alessi@robertalessi.net>
 
-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.
+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.
 
-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.
+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>
 --]]
 
 -- common
diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index 4db5d3a..6211b4b 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -2,24 +2,23 @@
 This file is part of the `arabluatex' package
 
 ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright (C) 2016--2022  Robert Alessi
+Copyright (C) 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023
+Robert Alessi <alessi@robertalessi.net>
 
-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.
+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.
 
-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.
+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>
 --]]
 
 arbmarks = {
diff --git a/makefile b/makefile
index 900ae1d..d88512f 100644
--- a/makefile
+++ b/makefile
@@ -1,5 +1,6 @@
 pkg := arabluatex
-ver  := $(shell ltxfileinfo -v $(pkg).dtx|sed -e 's/^v//')
+#VERS  := $(shell ltxfileinfo -v $(pkg).dtx|sed -e 's/^v//')
+VERS := $(shell typeoutfileinfo $(pkg).dtx | egrep -o '\+.*$$' | awk '{ print $$6 }' | sed -e 's/^v//')
 TEXMFDIR := $(shell kpsewhich -expand-var='$$TEXMFHOME')
 HOMEDIR := $$HOME
 CMP = lualatex-dev
@@ -28,20 +29,20 @@ local: clean sty
         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; \
+        if [ ! -d "$(HOMEDIR)/.emacs.d/auctex/style" ]; then \
+        mkdir -p $(HOMEDIR)/.emacs.d/auctex/style; \
         fi
-        cp $(pkg)*.el $(HOMEDIR)/.emacs.d/auctex/auto
+        cp $(pkg)*.el $(HOMEDIR)/.emacs.d/auctex/style
 
 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; \
+        if [ ! -d "$(HOMEDIR)/.emacs.d/auctex/style" ]; then \
+        mkdir -p $(HOMEDIR)/.emacs.d/auctex/style; \
         fi
-        cp $(pkg)*.el $(HOMEDIR)/.emacs.d/auctex/auto
+        cp $(pkg)*.el $(HOMEDIR)/.emacs.d/auctex/style
         if [ ! -d "$(TEXMFDIR)/doc/lualatex/arabluatex" ]; then \
         mkdir -p $(TEXMFDIR)/doc/lualatex/arabluatex; \
         fi
@@ -49,16 +50,19 @@ inst: doc
         cp -r samples/ $(TEXMFDIR)/doc/lualatex/arabluatex
 
 auctex: clean
-        if [ ! -d "$(HOMEDIR)/.emacs.d/auctex/auto" ]; then \
-        mkdir -p $(HOMEDIR)/.emacs.d/auctex/auto; \
+        if [ ! -d "$(HOMEDIR)/.emacs.d/auctex/style" ]; then \
+        mkdir -p $(HOMEDIR)/.emacs.d/auctex/style; \
         fi
-        cp $(pkg)*.el $(HOMEDIR)/.emacs.d/auctex/auto
+        cp $(pkg)*.el $(HOMEDIR)/.emacs.d/auctex/style
 
 zip: all
         ln -sf . $(pkg)
-        zip -Drq $(PWD)/$(pkg)-$(ver).zip $(pkg)/{samples,README.md,$(pkg)*.{pdf,sty,lua,el}}
+        zip -Drq $(PWD)/$(pkg)-$(VERS).zip $(pkg)/{samples,README.md,$(pkg)*.{pdf,sty,lua,el}}
         rm $(pkg)
 
+hal: clean
+        zip -Drq $(PWD)/$(pkg)-$(VERS).zip *
+
 package: clean all
         mkdir -p arabluatex/samples/
         cp *.{lua,ins,dtx,md,pdf} makefile README.tex arabluatex/ # .bib is in dtx
@@ -71,21 +75,21 @@ package: clean all
         mkdir -p source/lualatex/arabluatex/
         cp *.{ins,dtx,tex,md}  makefile source/lualatex/arabluatex/ # .bib is in dtx
         zip -r arabluatex.tds.zip tex doc source
-        tar czf arabluatex-$(ver).tar.gz arabluatex.tds.zip arabluatex/
+        tar czf arabluatex-$(VERS).tar.gz arabluatex.tds.zip arabluatex/
 
 clean:
         rm -rf $(TEXMFDIR)/{tex,doc}/lualatex/arabluatex/
-        rm -rf $(HOMEDIR)/.emacs.d/auctex/auto/arabluatex*.{el,elc}
+        rm -rf $(HOMEDIR)/.emacs.d/auctex/style/arabluatex*.{el,elc}
         rm -rf tex/ doc/ source/ auto/
         rm -rf arabluatex/
         rm -rf saved/ TMP/ _minted-arabluatex/
         find ./samples/ | grep -v "\./samples/$$" | grep -v ".*tex$$" | xargs rm -rf
         mkdir saved
-        cp *.{lua,ins,dtx,tex,el} makefile saved # .bib is in dtx
+        cp *.{lua,ins,dtx,tex,el} AUTHORS.md LICENSE makefile saved # .bib is in dtx
         rm *.*
         cp saved/* .
         rm -rf saved/
-        pandoc -s README.tex -o README.md && sed -i 's/{#.*}//g' README.md
-        pandoc -s README.tex -o about.html
+        pandoc README.tex -o README.md && sed -i 's/{#.*}//g' README.md
+        pandoc README.tex -o about.html
 
 .PHONY: sty doc all local inst auctex zip package clean
diff --git a/samples/al-Jahiz.tex b/samples/al-Jahiz.tex
index 74d8973..d7dd3f7 100644
--- a/samples/al-Jahiz.tex
+++ b/samples/al-Jahiz.tex
@@ -28,9 +28,9 @@
 \SetArbEasy
 
 \PassOptionsToPackage{pdfa}{hyperref}
-\usepackage{hyperxmp}
 \usepackage{hyperref}
 \hypersetup{colorlinks, linkcolor=blue, pdfauthor={Robert Alessi}}
+\usepackage{hyperxmp}
 
 \begin{document}
 \begin{filecontents*}{dajaja.tex}
diff --git a/samples/exporting.tex b/samples/exporting.tex
index 7f22c2c..16066f0 100644
--- a/samples/exporting.tex
+++ b/samples/exporting.tex
@@ -134,10 +134,10 @@
 {\textquoteright}{\textquoteleft}
 
 \PassOptionsToPackage{pdfa}{hyperref}
-\usepackage{hyperxmp}
 \usepackage{hyperref}
 \hypersetup{colorlinks, linkcolor=blue, pdfauthor={Robert
     Alessi}}
+\usepackage{hyperxmp}
 
 \title{\large Exporting Unicode Arabic to an external
   .tex source file}