xindex (8sep20)

git-svn-id: svn://tug.org/texlive/trunk@56295 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 96 insertions, 15 deletions

diff --git a/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG b/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
index 556cbc7ee3d..646ca927eb5 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
+++ b/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
@@ -1,5 +1,6 @@
-0.26  2020-07-14 - fix for quote as escape char
+0.28  2020-09-08 - fix for new introduced bug
 0.27  2020-09-01 - fix for identical subentries
+0.26  2020-07-14 - fix for quote as escape char
 0.25  2020-06-11 - fix for correct hyperpage setting for |see{foo}
 0.24  2020-06-07 - fix for correct hyperpage setting with folium pages
 0.23  2020-06-02 - added support for the package LUA-UCA (Unicode Collation Algorithm)
diff --git a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf
index db0c8f01253..e20204c2809 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf
+++ b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf
diff --git a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex
index 42517580502..c890f1b7d98 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex
+++ b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex
@@ -80,7 +80,7 @@
 \def\setVersion#1{\setVVersion#1!!}
 \def\setVVersion#1=#2!!{\def\xIndexVersion{#2}} 
 
-\setVersion{version = 0.27}%  can be automatically changed by perl
+\setVersion{version = 0.28}%  can be automatically changed by perl
 
 \setkeys{dtk}{cleanup=true,force=false}
 
@@ -90,6 +90,8 @@
 \date{}
 \begin{document}
 \maketitle
+\thispagestyle{empty}
+\enlargethispage{1cm}
 \tableofcontents
 
 \vfill
@@ -768,7 +770,7 @@ Using the package \Lpack{hyperref} is no problem:
   crop,
   xindex,
   xindexOptions=-l de,
-  force,
+  force=false,
   runs=2,code,docType=latex,
   showFilename,
   align=\centering,
@@ -828,7 +830,7 @@ of the same type, so we get \texttt{1f} in the output.
   crop,
   xindex,
   xindexOptions=-l de,
-  force=false,
+  force=false,,
   runs=2,code,docType=latex,
   showFilename,
   align=\centering,
@@ -944,7 +946,7 @@ Internally exists a function \verb|compressPageList| which is used if no
   crop,
   xindex,
   xindexOptions=-c HAdW-eKO,
-  force,
+  force=false,
   runs=2,code,docType=latex,
   showFilename,
   align=\centering,
@@ -1065,7 +1067,7 @@ The following example runs \verb|xindex -c dtk -l de -n <input>|
   crop,
   xindex,
   xindexOptions=-c dtk -n -l de,
-  force,
+  force=false,
   runs=2,code,docType=latex,
   showFilename,
   align=\centering,
@@ -1125,7 +1127,7 @@ The following example runs \verb|xindex -c dtk -l de -n <input>|
 \end{externalDocument}
 
 
-\subsection{Sublabels}
+%\subsection{Sublabels}
 There are three predefined sublabels for \Lcs{subitems}. The program itself can handle more, there is
 no limit for \Lprog{xindex}.
 
@@ -1213,7 +1215,7 @@ such commands are ignored. In the following example we put an horizontal line af
   crop,
   xindex,
   xindexOptions=-l de,
-  force,
+  force=false,
   runs=2,code,docType=latex,
   showFilename,
   align=\centering,
@@ -1260,7 +1262,7 @@ the vertical space between different first letters:
   crop,
   xindex,
   xindexOptions=-n,
-  force,
+  force=false,,
   runs=2,code,docType=latex,
   showFilename,
   align=\centering,
@@ -1311,7 +1313,7 @@ In the documents preamble there is the definition:
   crop,
   xindex,
   xindexOptions=-c header,
-  force,
+  force=false,
   runs=2,code,docType=latex,
   showFilename,
   align=\centering,
@@ -1454,7 +1456,7 @@ the \verb|xindex-???| series because uppercase letters are sorted before lowerca
   crop,
   xindex,
 %  xindexOptions=,
-  force,
+  force=false,
   runs=2,code,docType=latex,
   showFilename,
   align=\centering,
@@ -1508,7 +1510,7 @@ The same example sorted with the \verb|-a| or \verb|--nocasesensitive| has anoth
   crop,
   xindex,
   xindexOptions=-a,
-  force,
+  force=false,
   runs=2,code,docType=latex,
   showFilename,
   align=\centering,
@@ -1565,7 +1567,7 @@ and adds the program \Lprog{xindex} as the default program to  \Lpack{imakeidx}.
   crop,
   xindex,
   xindexOptions=-l de,
-  force,
+  force=true,
   runs=2,code,docType=latex,
   showFilename,
   align=\centering,
@@ -1627,12 +1629,90 @@ in the argument of \Lcs{indexentry}.
 \end{itemize}
 
 
+\appendix
+\section{Examples}
 
+\begin{externalDocument}[
+%  grfOptions={width=\dimexpr\linewidth-2\fboxsep-2\fboxrule},
+  mpwidth=0.55\linewidth,
+  pages={2},
+  frame=false,
+  compiler=lualatex --shell-escape, 
+  crop,
+  xindex,
+  xindexOptions=-l de,
+  force,
+  runs=2,code,docType=latex,
+  showFilename,
+  align=\centering,
+  grfOptions={width=\linewidth},
+  lstOptions={columns=fixed}]{xindex}
+\documentclass[paper=a5]{scrartcl}
+\usepackage{libertinus-otf}
+\let\NewPage\newpage% only for demo
+\makeatletter
+\renewcommand\newpage{\NewPage\let\ps@plain\ps@empty}
+\makeatother
+%StartVisiblePreamble
+\usepackage[imakeidx]{xindex}
+\makeindex
+% Brian Dunn
+%StopVisiblePreamble
+\begin{document}
+First level.\index{first level}
+
+First level second level.\index{first level!second level}
+
+Duplicate.\index{first level!second level}
+
+Alpha.\index{alpha}
+
+Alpha beta.\index{alpha!beta}
 
+Alpha beta gamma.\index{alpha!beta!gamma}
+
+Duplicate alpha beta.\index{alpha!beta}
+
+Duplicate alpha beta gamma.\index{alpha!beta!gamma}
+
+\newpage
+\printindex
+\end{document}
+\end{externalDocument}
 
-%\nocite{*}
-%\printbibliography
 
+\begin{externalDocument}[
+%  grfOptions={width=\dimexpr\linewidth-2\fboxsep-2\fboxrule},
+  mpwidth=0.55\linewidth,
+  pages={2},
+  frame=false,
+  compiler=lualatex --shell-escape, 
+  crop,
+  xindex,
+  xindexOptions=-l de,
+  force,
+  runs=2,code,docType=latex,
+  showFilename,
+  align=\centering,
+  grfOptions={width=\linewidth},
+  lstOptions={columns=fixed}]{xindex}
+\documentclass[paper=a5]{scrartcl}
+\usepackage{libertinus-otf}
+\let\NewPage\newpage% only for demo
+\makeatletter
+\renewcommand\newpage{\NewPage\let\ps@plain\ps@empty}
+\makeatother
+%StartVisiblePreamble
+\usepackage[imakeidx]{xindex}
+\makeindex
+% Martin Sievers
+%StopVisiblePreamble
+\begin{document}
+Test \index{A!Test} oder auch \index{B!Test}
+\newpage
+\printindex
+\end{document}
+\end{externalDocument}
 
 \printindex