2 files changed, 94 insertions, 62 deletions

diff --git a/Makefile b/Makefile
index da0eb07..496bc14 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,7 @@ all:	$(NAME).pdf
 $(NAME).pdf: $(NAME).dtx
         lualatex --shell-escape --recorder --interaction=batchmode $(NAME).dtx >/dev/null
         biber $(NAME) >/dev/null
+        lualatex --shell-escape --recorder --interaction=batchmode $(NAME).dtx >/dev/null
         if [ -f $(NAME).glo ]; then makeindex -q -s gglo.ist -o $(NAME).gls $(NAME).glo; fi
         if [ -f $(NAME).idx ]; then makeindex -q -s gind.ist -o $(NAME).ind $(NAME).idx; fi
         if [ -f loccit.idx ]; then texindy -M icite.xdy loccit.idx >/dev/null; fi
@@ -63,4 +64,4 @@ package: distclean all
         tar czf $(NAME)-$(VERS).tar.gz $(NAME).tds.zip $(NAME)/
         rm -rf $(NAME)/
 
-.PHONY: all clean lualatex distclean inst local uninst install uninstall zip package
+.PHONY: all lualatex clean distclean inst local uninst install uninstall zip package
diff --git a/icite.dtx b/icite.dtx
index 829a70d..d3dbd2f 100644
--- a/icite.dtx
+++ b/icite.dtx
@@ -188,7 +188,7 @@ Running "make install" installs the files in the local TeX tree.
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{icite}
 %<*package>
-    [2019/02/22 v1.00 Make Indices locorum citatorum]
+    [2019/03/07 v1.00 Make Indices locorum citatorum]
 %</package>
 %<*driver>
 \documentclass{ltxdoc}
@@ -241,7 +241,7 @@ Running "make install" installs the files in the local TeX tree.
 @MVBook{al-Nadim,
   author =       {\prname{ibn al-nadIm}},
   title =        {\arb[trans]{\uc{f}ihrist}},
-  sortname =     {Nadim},
+  sortname =     {Ibn al-Nadim},
   date =         {1871/1872},
   shorthand =    {\arb[trans]{\uc{f}ihrist}},
   editor =       {Flügel, Gustav},
@@ -251,7 +251,7 @@ Running "make install" installs the files in the local TeX tree.
 }
 
 @Book{al-Qifti,
-  sortname =     {Qifti},
+  sortname =     {Ibn al-Qifti},
   entrysubtype = {classical},
   shorthand =    {\prname{al-qif.tiyy}, \arb[trans]{\uc{t}a'rI_h}},
   location =     {Leipzig},
@@ -318,8 +318,9 @@ Running "make install" installs the files in the local TeX tree.
 \usepackage{arabluatex}
 \SetTranslitConvention{loc}
 \usepackage{varioref}
-\usepackage{hyperxmp}
+\usepackage{xurl}
 \usepackage{uri}
+\usepackage{hyperxmp}
 \usepackage[numbered]{hypdoc}
 \hypersetup{unicode=true, colorlinks, allcolors=blue,
   linktocpage=true, pdfauthor={Robert Alessi}, pdftitle={The
@@ -344,9 +345,6 @@ Running "make install" installs the files in the local TeX tree.
 \makeindex
 \makeindex[name=loccit, title=Index of Passages Cited (modern authors)]
 \makeindex[name=primary, title=\emph{Index locorum citatorum}]
-\usepackage{idxlayout}
-\idxlayout{hangindent=3.5cm, subindent=1em, font=footnotesize,
-  totoc=true}
 \usepackage{tabto}
 \usepackage{classics}
 \newclassic{iau}{\classicsRoman{#1}|, #1|.#1}
@@ -374,10 +372,11 @@ Running "make install" installs the files in the local TeX tree.
 \newcommand{\package}[1]{\textsf{#1}\index{#1=#1 (package)}}
 \usepackage{tikz}
 \usepackage[breakable, skins, xparse, minted]{tcolorbox}
-\tcbset{colback=white, boxrule=.15mm, colframe=red!50!white, left=6mm,
+\tcbset{colback=white, boxrule=.15mm, colframe=red!50!white,
   breakable}
-\newtcblisting{example}{minted options=linenos}
-\newtcblisting{code}{minted options=linenos, listing only}
+\newtcblisting{example}{minted options={linenos, numbersep=0mm}}
+\newtcblisting{code}{minted options={linenos, numbersep=0mm}, listing
+  only}
 \usepackage{etoc}
 \etocsettocdepth{paragraph}
 \newcommand{\icitetableofcontents}{%
@@ -415,7 +414,7 @@ Running "make install" installs the files in the local TeX tree.
 %</driver>
 % \fi
 %
-% \CheckSum{0}
+% \CheckSum{269}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -470,12 +469,12 @@ Running "make install" installs the files in the local TeX tree.
 % \icitetableofcontents
 % \normalsize
 %
-%\changes{v1.00}{2019/02/22}{First public release}
+%\changes{v1.00}{2019/03/07}{First public release}
 %
 % \begin{abstract}
 %   \package{icite} is designed to produce from \hologo{BibTeX} or
-%   Bib\LaTeX\ bibliographic databases the different indices of cited
-%   authors and works which are called \emph{indices locorum
+%   Bib\LaTeX\ bibliographic databases the different indices of
+%   authors and works cited which are called \emph{indices locorum
 %   citatorum}. It relies on a specific \cs{icite} command and can
 %   operate with either \hologo{BibTeX} or Bib\LaTeX.
 % \end{abstract}
@@ -517,6 +516,7 @@ Running "make install" installs the files in the local TeX tree.
 % source files:
 % \begin{itemize}
 % \item |icite.dtx|
+% \item |icite.ins|
 % \item |Makefile|
 % \end{itemize}
 % 
@@ -573,7 +573,7 @@ Running "make install" installs the files in the local TeX tree.
 % \meta{key}$=$\meta{value}. The description of the optional arguments
 % follows:---
 %
-% \DescribeOption{citecmd}
+% \DescribeOption{citecmd}\label{ref:citecmd}
 % |citecmd|$=$\meta{command}\hfill\tcboxverb{Default: cite}\\
 % \meta{command} may be any citation command accepted by
 % \hologo{BibTeX} or Bib\LaTeX. This option is used by the \cs{icite}
@@ -615,10 +615,10 @@ Running "make install" installs the files in the local TeX tree.
 %
 % \paragraph{Styling the titles}
 % \DescribeMacro{\SetTitleStyle} By default, \package{icite} prints
-% the titles of the works in
-% italics. \cs{SetTitleStyle}\marg{for\-matting directives} can be used
-% in the preamble only to customize the way titles are displayed in
-% the indices, like so:--- %
+% the titles of the works cited in italics.\\
+% \cs{SetTitleStyle}\marg{formatting directives} can be used in the
+% preamble only to customize the way titles are displayed in the
+% indices, like so:--- %
 % \iffalse
 %<*example>
 % \fi
@@ -652,9 +652,11 @@ Running "make install" installs the files in the local TeX tree.
 % it may prove useful to define an additional |indexauthor| field to
 % have printed in the index only the relevant part of the name, like
 % so: \\[1ex]%
-% |indexauthor = {|\prname{.hunayn ibn 'is.hAq}|}|\\[1ex]
-% But in the end, the |sortname| field is also needed because the name
-% must be sorted without the diacritics:\\[1ex]%
+% |indexauthor = {|\prname{.hunayn ibn 'is.hAq}|}| or
+% |indexauthor = {|\prname{.hunayn}|}|\\[1ex]
+% But in the end, the |sortname| field is also needed because the
+% diacritics must be discarded so that the name be sorted
+% properly:\\[1ex]%
 % |sortname = {|Hunayn ibn Ishaq|}|
 %
 % \subsection{Titles}
@@ -686,7 +688,7 @@ Running "make install" installs the files in the local TeX tree.
 %<*example>
 % \fi
 \begin{code}
-  \icite[<pre>][<post>]{key}[command]
+  \icite[<pre>][<post>]{<key>}[<command>]
 \end{code}
 % \iffalse
 %</example>
@@ -694,7 +696,8 @@ Running "make install" installs the files in the local TeX tree.
 % Where \oarg{command} can be used as a further optional argument to
 % specify a standard citation command that \cs{icite} should emulate
 % instead of the default \cs{cite} command or any other command set as
-% default in the preamble by means of the |citecmd| global option.
+% default in the preamble by means of the |citecmd| global
+% option.\footnote{See above, \vref{ref:citecmd}.}
 %
 % \paragraph{Example} The following example illustrates how
 % \package{icite} can be used in combination with Bib\LaTeX\ and the
@@ -718,7 +721,7 @@ Running "make install" installs the files in the local TeX tree.
 
  % load imakeidx and use xindy to have the numbers sorted properly
  \usepackage[xindy]{imakeidx}
- \makeindex[name=loccit, title=Index of passages cited]
+ \makeindex[name=loccit, title=Index of Passages Cited (modern authors)]
 \end{code}
 % \iffalse
 %</example>
@@ -728,7 +731,7 @@ Running "make install" installs the files in the local TeX tree.
 % \iffalse
 %<*example>
 % \fi
-\begin{example}
+\begin{code}
   \section*{\cs{icite} in action}
   Let us start with four citations of the same reference, to make sure
   that they are all indexed and sorted properly:
@@ -742,16 +745,33 @@ Running "make install" installs the files in the local TeX tree.
   Finally, let us have \cs{icite} use \cs{textcite} to cite
   \icite[123]{Endress1992}[textcite], and again, this time in a
   footnote\icite[86]{Endress1992}.
-\end{example}
+\end{code}
 % \iffalse
 %</example>
 % \fi
+% 
+% \begin{tcblisting}{text only}
+%   \section*{\cs{icite} in action}
+%   Let us start with four citations of the same reference, to make
+%   sure that they are all indexed and sorted properly:
+%   one\icite[123]{Ullmann1970}, two\icite[231]{Ullmann1970},
+%   three\icite[81]{Ullmann1970} and four\icite[18]{Ullmann1970}.
+%
+%   Let us continue with four other citations out of two other
+%   references: one\icite[90]{Bürgel2016}, two\icite[370]{Dols1987},
+%   three\icite[205]{Bürgel2016} and four\icite[380]{Dols1987}.
 %
+%   Finally, let us have \cs{icite} use \cs{textcite} to cite
+%   \icite[123]{Endress1992}[textcite], and again, this time in a
+%   footnote\icite[86]{Endress1992}.
+% \end{tcblisting}
+% 
 % All indices and the contents of the \hologo{BibTeX} file that has
-% been used can be found below in the appendix (\vref{ref:indices}
-% and \vref{ref:icite-bib} respectively). As can be seen from the
-% bibliography generated in the footnotes, \package{icite} prints as
-% expected the abbridged forms of the titles when they are
+% been used can be found below in the appendix
+% (\vrefrange{ref:indices}{ref:icite-bib} respectively). As can be
+% seen by comparing the bibliography generated in the footnotes with
+% the text printed in the index, \package{icite} prints as expected
+% the abbridged forms of the titles when they are
 % available. Furthermore, as a default citation command set in the
 % preamble, the \enquote*{oxnotes} Bib\LaTeX\ option of
 % \package{biblatex-oxref} style package makes \cs{autocite} behave
@@ -770,7 +790,7 @@ Running "make install" installs the files in the local TeX tree.
 % differentiate between sources by drawing from the bibliographical
 % database the exact string that may be found in the |entrysubtype|
 % entry field. To that end, the \cs{IndexSubtypeAs} command is
-% provided. It takes to madatory arguments, like so:--- %
+% provided. It takes to mandatory arguments, like so:--- %
 % \iffalse
 %<*example>
 % \fi
@@ -841,8 +861,7 @@ Running "make install" installs the files in the local TeX tree.
   \addbibresource{bibliography.bib}
 
   \usepackage[xindy]{imakeidx}
-  \makeindex[name=loccit, title=Index of passages cited (modern
-  authors)]
+  \makeindex[name=loccit, title=Index of passages cited (modern authors)]
   \makeindex[name=primary, title=\emph{Index locorum citatorum}]
 
   \usepackage{classics}
@@ -861,7 +880,7 @@ Running "make install" installs the files in the local TeX tree.
 % \iffalse
 %<*example>
 % \fi
-\begin{example}
+\begin{code}
   \section*{\cs{icite} in action}
   Let us start with four citations of the same reference, to make sure
   that they are all indexed and sorted properly:
@@ -884,41 +903,53 @@ Running "make install" installs the files in the local TeX tree.
   Finally, let us have \cs{icite} use \cs{textcite} to cite
   \icite[123]{Endress1992}[textcite], and again, this time in a
   footnote\icite[86]{Endress1992}.
-\end{example}
+\end{code}
 % \iffalse
 %</example>
 % \fi
-% 
+%
+% \begin{tcblisting}{text only}
+%   \section*{\cs{icite} in action}
+%   Let us start with four citations of the same reference, to make
+%   sure that they are all indexed and sorted properly:
+%   one\icite[123]{Ullmann1970}, two\icite[231]{Ullmann1970},
+%   three\icite[81]{Ullmann1970} and four\icite[18]{Ullmann1970}.
+%
+%   Let us continue with four other citations out of two other
+%   references: one\icite[90]{Bürgel2016}, two\icite[370]{Dols1987},
+%   three\icite[205]{Bürgel2016} and four\icite[380]{Dols1987}.
+%
+%   Before concluding, let us insert a few references to medieval
+%   Arabic authors: one\icite[\iau{1}[81][32]]{IAUMuller},
+%   two\icite[\razi{5}[7--10]]{RaziShukuk},
+%   three\icite[133]{al-Qifti},
+%   four\icite[\nadim{3}[7][286]]{al-Nadim},
+%   five\icite[\iau{2}[214][20]]{IAUMuller},
+%   six\icite[\razi{1}[6--20]]{RaziShukuk},
+%   seven\icite[126.15--20]{al-Qifti} and
+%   eight\icite[\nadim{3}[7][291]]{al-Nadim}.
+%
+%   Finally, let us have \cs{icite} use \cs{textcite} to cite
+%   \icite[123]{Endress1992}[textcite], and again, this time in a
+%   footnote\icite[86]{Endress1992}.
+% \end{tcblisting}
+%
 % As already said above, all indices and the contents of the
 % \hologo{BibTeX} file that has been used can be found below in the
-% appendix (\vref{ref:indices} and \vref{ref:icite-bib}
-% respectively). As one can see, \prname{ibn al-nadIm}, \prname{ibn
-% al-qif.tiyy} and \prname{al-rAziyy} have been sorted under the
-% letters N, Q and R respectively and references to classical works
-% have been formatted properly.
+% appendix (\vrefrange{ref:indices}{ref:icite-bib} respectively). As
+% one can see, \prname{al-rAziyy} has been sorted under the letter R
+% and references to classical works have been formatted properly.
 %
 % \section{Appendix}
 % Designing the layout of indices is out of the scope of this
-% documentation. For information, the \package{idxlayout} and
-% \package{tabto} packages have been used in the preamble like
-% so:--- %
-% \iffalse
-%<*example>
-% \fi
-\begin{code}
-\usepackage{idxlayout}
-\idxlayout{hangindent=3.5cm, subindent=1em, font=footnotesize,
-  totoc=true}
-\usepackage{tabto}
-\end{code}
-% \iffalse
-%</example>
-% \fi
-% In combination with the following |xindy| style file:---
+% documentation. For information, the \package{tabto} package has been
+% used in the preamble in combination with the following |xindy| style
+% file:--- %
 % \iffalse
 %<*example>
 % \fi
-\begin{tcblisting}{minted language=lisp, listing only, title=icite.xdy}
+\begin{tcblisting}{minted language=lisp, listing only,
+    title=icite.xdy}
 (markup-locclass-list :open "\tabto{3.5cm}" :sep ", ")
 \end{tcblisting}
 % \iffalse
@@ -933,8 +964,8 @@ Running "make install" installs the files in the local TeX tree.
 % \subsection{\texorpdfstring{\hologo{BibTeX}
 % file used in this document}{BibTeX file used in this document}}
 % \label{ref:icite-bib}
-% \tcbinputlisting{minted options={linenos}, minted language=bibtex,
-% listing file=icite.bib, listing only}
+% \tcbinputlisting{minted options={linenos, numbersep=1.5mm}, minted
+% language=bibtex, listing file=icite.bib, listing only}
 %
 %\StopEventually{}
 %