1 files changed, 35 insertions, 21 deletions

diff --git a/Master/texmf-dist/doc/latex/icite/samples/icite-biblatex.tex b/Master/texmf-dist/doc/latex/icite/samples/icite-biblatex.tex
index e52cb8b9d6a..b49bc3491cb 100644
--- a/Master/texmf-dist/doc/latex/icite/samples/icite-biblatex.tex
+++ b/Master/texmf-dist/doc/latex/icite/samples/icite-biblatex.tex
@@ -1,3 +1,8 @@
+\RequirePackage{filecontents}
+\begin{filecontents*}{\jobname.xdy}
+(merge-rule "\*" "" :eregexp)
+(markup-locclass-list :open ": " :sep ", ")
+\end{filecontents*}
 % Compile with --shell-escape
 \documentclass{article}
 \usepackage[english]{babel}
@@ -17,11 +22,15 @@
 \setlist[enumerate,2]{label=\roman*.}
 
 \usepackage[citecmd=autocite, defaultindex=none]{icite}
-\IndexSubtypeAs{ancient}{pr-sources}
+\IndexSubtypeAs{ancient}{\jobname-primary}
 \bibinput{bibsample}
 
-\usepackage[xindy]{imakeidx}
-\makeindex[name=pr-sources, title={Index locorum citatorum}]
+\usepackage{classics}
+\newclassic{plat}{#1|#1|#1}
+\newclassic{arist}{#1|\textit{#1}|#1}
+
+\usepackage[xindy,nonewpage]{imakeidx}
+\makeindex[name=\jobname-primary, title={Index locorum citatorum}]
 
 \usepackage[style=oxnotes]{biblatex}
 \addbibresource{bibsample.bib}
@@ -40,11 +49,15 @@ index of passages cited in combination with Bib\LaTeX.
 The relevant part of the preamble which is used here follows:
 \begin{Verbatim}
 \usepackage[citecmd=autocite, defaultindex=none]{icite}
-\IndexSubtypeAs{ancient}{pr-sources}
+\IndexSubtypeAs{ancient}{icite-biblatex-primary}
 \bibinput{bibsample}
 
+\usepackage{classics}
+\newclassic{plat}{#1|#1|#1}
+\newclassic{arist}{#1|\textit{#1}|#1}
+
 \usepackage[xindy]{imakeidx}
-\makeindex[name=pr-sources, title={Index locorum citatorum}]
+\makeindex[name=icite-biblatex-primary, title={Index locorum citatorum}]
 
 \usepackage[style=oxnotes]{biblatex}
 \addbibresource{bibsample.bib}
@@ -55,33 +68,34 @@ The relevant part of the preamble which is used here follows:
 \item |citecmd=autocite| instructs \textsf{icite} to use the
   |\autocite| command to insert the citations in the body text.
 \item |defaultindex=none| disables indexing by default.
-\item |\IndexSubtypeAs{ancient}{pr-sources}| makes an exception for
-  authors whose |entrysubtype| field matches the string |ancient| and
-  instructs \textsf{icite} to have them indexed in an index named
-  |pr-sources|.
-\item To actually produce the index, |\printindex[pr-sources]| is needed
-  at the end of the document.
+\item |\IndexSubtypeAs{ancient}{icite-biblatex-primary}| makes an
+  exception for authors whose |entrysubtype| field matches the string
+  |ancient| and instructs \textsf{icite} to have them indexed in an
+  index named\\ |icite-biblatex-primary|.
+\item To actually produce the index,
+  |\printindex[icite-biblatex-primary]| is needed at the end of the
+  document.
 \end{enumerate}
 
 \section*{Body text}
 Plato, \emph{Laches}: first
-citation\icite[179a1--4]{Plato:Laches}. And
-another\icite[179c5--180a1]{Plato:Laches}, and
-another\icite[181b5--181c3]{Plato:Laches}.
+citation\icite[\plat{179}[a][1--4]]{Plato:Laches}. And
+another\icite[\plat*{179}[c][5]{180}[a][1]]{Plato:Laches}, and
+another\icite[\plat*{181}[b][5]{181}[c][3]]{Plato:Laches}.
 
 Plato, \emph{Theaetetus}: first
-citation\icite[142c2--142d3]{Plato:Theaetetus}. And
-another\icite[142d4--5]{Plato:Theaetetus}, and
-another\icite[143b5]{Plato:Theaetetus}.
+citation\icite[\plat*{142}[c][2]{142}[d][3]]{Plato:Theaetetus}. And
+another\icite[\plat{142}[d][4--5]]{Plato:Theaetetus}, and
+another\icite[\plat{143}[b][5]]{Plato:Theaetetus}.
 
 Aristotle, \emph{Politica}: first
-citation\icite[1252a25--1252.b27]{Aristotle:Politica}. And
-another\icite[1253a5]{Aristotle:Politica}, and
-another\icite[1253a30--39]{Aristotle:Politica}.
+citation\icite[\arist*{1252}[a][25]{1252}[b][27]]{Aristotle:Politica}. And
+another\icite[\arist{1253}[a][5]]{Aristotle:Politica}, and
+another\icite[\arist{1253}[a][30--39]]{Aristotle:Politica}.
 
 This passage should not be indexed\icite[44--78]{Reynolds.Wilson1994}.
 
-\printindex[pr-sources]
+\printindex[\jobname-primary]
 
 \section*{Bibliographical database}
 \VerbatimInput{bibsample.bib}