1 files changed, 36 insertions, 26 deletions

diff --git a/arabluatex.dtx b/arabluatex.dtx
index fb96ad5..e4ecaa0 100644
--- a/arabluatex.dtx
+++ b/arabluatex.dtx
@@ -151,7 +151,8 @@
 \usepackage{dox}
 \doxitem{Option}{option}{options}
 %\def\actualchar{ =} % there's a bug in doxitem; quick fix.
-\usepackage{fontspec,luatextra}
+\usepackage{fontspec}
+\usepackage{hologo}
 \defaultfontfeatures{RawFeature={+liga}}
 \setmainfont{Old Standard}[SmallCapsFont={Latin Modern Roman Caps},
   RawFeature={+mark;+ccmp;+ss05;+ss06}]
@@ -310,7 +311,7 @@
 % \normalsize
 % 
 % \begin{abstract}
-%   This package provides for \LuaLaTeX\ an Arab{\TeX}-like interface
+%   This package provides for \hologo{LuaLaTeX} an 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
@@ -387,10 +388,10 @@
 %
 % \section{Introduction}
 % In comparison to Prof. Lagally's outstanding Arab\TeX,\footnote{See
-% \url{http://ctan.org/pkg/arabtex}} Arab\LuaTeX\ is at present
+% \url{http://ctan.org/pkg/arabtex}} Arab\hologo{LuaTeX} is at present
 % nothing more than a modest piece of software. Hopefully---if I may
 % say so---it will eventually provide all of its valuable qualities to
-% the \LuaLaTeX\ users.
+% the \hologo{LuaLaTeX} users.
 %
 % \package{arabtex} dates back to 1992. As far as I know, it was then
 % the first and only way to typeset Arabic texts with \TeX\ and
@@ -451,18 +452,18 @@
 % lexicons that can be searched, analyzed and correlated in various
 % ways.
 %
-%\subsection{\package{arabluatex} is for \LuaLaTeX}
+%\subsection{\package{arabluatex} is for \hologo{LuaLaTeX}}
 % It goes without saying that \package{arabluatex} requires
-% \LuaLaTeX. \TeX\ and \LaTeX\ have \package{arabtex}, and \XeLaTeX\
-% has \package{arabxetex}. Both of them are much more advanced than
-% \package{arabluatex}, as they can process a number of different
-% languages,\footnote{\label{fn:arabtex-languages}To date, both
-% packages support Arabic, Maghribi, Urdu, Pashto, Sindhi, Kashmiri,
-% Uighuric and Old Malay; in addition to these, \package{arabtex} also
-% has a Hebrew mode, including Judeo-Arabic and Yiddish.} whereas
-% \package{arabluatex} can process only Arabic for the time
-% being. More languages will be included in future releases of
-% \package{arabluatex}.
+% \hologo{LuaLaTeX}. \TeX\ and \LaTeX\ have \package{arabtex}, and
+% \hologo{XeLaTeX} has \package{arabxetex}. Both of them are much more
+% advanced than \package{arabluatex}, as they can process a number of
+% different languages,\footnote{\label{fn:arabtex-languages}To date,
+% both packages support Arabic, Maghribi, Urdu, Pashto, Sindhi,
+% Kashmiri, Uighuric and Old Malay; in addition to these,
+% \package{arabtex} also has a Hebrew mode, including Judeo-Arabic and
+% Yiddish.} whereas \package{arabluatex} can process only Arabic for
+% the time being. More languages will be included in future releases
+% of \package{arabluatex}.
 %
 % In comparison to \package{arabxetex}, \package{arabluatex} works in
 % a very different way. The former relies on the
@@ -484,8 +485,8 @@
 % \subsection{Activating \package{arabluatex}}
 % As usual put in your preamble:\\
 % \arabluaverb{\usepackage{arabluatex}}\\
-% The only requirement of \package{arabluatex} is \LuaLaTeX; it will
-% complain if you try to compile your document with another
+% The only requirement of \package{arabluatex} is \hologo{LuaLaTeX};
+% it will complain if you try to compile your document with another
 % engine. That aside, \package{arabluatex} does not load packages such
 % as \package{polyglossia} or \package{luabidi}. It can work with
 % \package{polyglossia} though, but does not require it.
@@ -3085,10 +3086,11 @@ muhaddamaTaN mi'_danatu-hu}: \arb[trans]{ra'aytu
 % \label{sec:commands-in-arb}
 % \paragraph{General principle} \label{ref:cmd-inside-arabic}\LaTeX\
 % commands are accepted in Arabic environments. The general principle
-% which applies is that single-argument commands
-% (\cs{command}\marg{arg}) such as \cs{emph}\marg{text},
-% \cs{textbf}\marg{text} and the like, are assumed to have Arabic text
-% as their arguments:---
+% which applies is that any single-argument command with up to
+% \emph{two optional arguments}
+% (\cs{command}\oarg{opt1}\oarg{opt2}\marg{arg}) such as
+% \cs{emph}\marg{text}, \cs{textbf}\marg{text} and the like, is
+% assumed to have Arabic text in its mandatory argument:---
 % \begin{quote}
 %   |\abjad{45}| |kitAbu-hu| |\emph{fI| |'l-\uc{`AdAt-i}}|
 %   \arb[voc]{\abjad{45} kitAbu-hu \emph{fI 'l-\uc{`AdAt-i}}}
@@ -3096,6 +3098,9 @@ muhaddamaTaN mi'_danatu-hu}: \arb[trans]{ra'aytu
 %   'l-\uc{`AdAt-i}}}.\footnote{This is odd in Arabic script, but
 %   using such features as \cs{emph} or \cs{textbf} is a matter of
 %   personal taste.}
+%
+%   |\arb{\abjad{45} \framebox[1in][s]{kitAbu-hu fI 'l-`AdAti}}|\\
+%   \arb{\abjad{45} \framebox[1in][s]{kitAbu-hu fI 'l-`AdAti}}
 % \end{quote}
 % 
 % The same applies to footnotes:---
@@ -3246,7 +3251,8 @@ qAla barzawayhi bn-u 'azhar-a, ra's-u 'a.tibbA'-i fAris-a...
 % \package{arabluatex}. Therefore, as in the previous example, any of
 % their argument to be rendered in Arabic must be inserted again in
 % \cs{arb}. \NEWfeature{v1.12}These commands themselves may have up to
-% two optional and/or mandatory arguments, like so:---
+% two optional and/or mandatory arguments followed by one optional
+% argument, like so:---
 % \begin{enumerate}
 % \item \cs{command} (no argument, lowermost combination)
 % \item \cs{command}\oarg{opt1} (one optional argument)
@@ -3255,9 +3261,13 @@ qAla barzawayhi bn-u 'azhar-a, ra's-u 'a.tibbA'-i fAris-a...
 %   mandatory argument)
 % \item{} [\ldots]
 % \item \cs{command}\oarg{opt1}\oarg{opt2}\marg{arg1}\marg{arg2}
-% (uppermost combination)
+% \item
+%   \cs{command}\oarg{opt1}\oarg{opt2}\marg{arg1}\marg{arg2}\oarg{opt3}
+%   (uppermost combination)
 % \end{enumerate}
 %
+% \DescribeMacro{\MkArbBreak*}\NEWfeature{v1.12} As said above,
+% \cs{MkArbBreak}
 %
 % \subsection{Environments}
 % \label{sec:environments}
@@ -3615,8 +3625,8 @@ wa-ya.sIru ta.hta 'l-jild-i
 [2018/03/31 v1.11 An ArabTeX-like interface for LuaLaTeX]
 \RequirePackage{ifluatex}
 %    \end{macrocode}
-% \package{arabluatex} requires \LuaLaTeX\ of course. Issue a warning
-% if the document is processed with another engine.
+% \package{arabluatex} requires \hologo{LuaLaTeX} of course. Issue a
+% warning if the document is processed with another engine.
 %    \begin{macrocode}
 \ifluatex\else
  \PackageError{arabluatex}{lualatex needed}{%
@@ -4194,7 +4204,7 @@ wa-ya.sIru ta.hta 'l-jild-i
 %
 % The following is taken from |latex.ltx|. I had to make this patch
 % for I could not find a way to process the list environments in
-% right-to-left mode. The \LuaTeX\ primitives \cs{bodydir} and
+% right-to-left mode. The \hologo{LuaTeX} primitives \cs{bodydir} and
 % \cs{pagedir} will eventually allow us to get rid of this:
 %    \begin{macrocode}
 \def\list#1#2{%