xindex (19jan23)

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

14 files changed, 100 insertions, 35 deletions

diff --git a/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG b/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
index e60d4308cb3..cc12a7f3b3d 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
+++ b/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
@@ -1,3 +1,6 @@
+0.46  2023-01-18 - fix for Czech character ch
+                 - fix for wrong Upper/Lowercase sorting
+                 - fix for detect language from aux file
 0.45  2022-09-20 - exit xindex after printing version information
 0.44  2022-09-09 - ---
 0.43  2022-09-01 - print warning if no input file is defined.
diff --git a/Master/texmf-dist/doc/lualatex/xindex/README.md b/Master/texmf-dist/doc/lualatex/xindex/README.md
index 38dae0bdd00..97d44cc56bf 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/README.md
+++ b/Master/texmf-dist/doc/lualatex/xindex/README.md
@@ -1,6 +1,12 @@
 # xindex
 
-Copyright 2019-2022 Herbert Voß
+Copyright 2019-2023 Herbert Voß
+These files are provided under the terms of the LPPL v1.3 or
+later as printed in full text in the manual (xindex.pdf).
+\url{https://ctan.org/license/lppl1.3}.
+
+Report bugs to
+    \url{https://gitlab.com/hvoss49/xindex/issues}.
 
 Unicode compatible index programm for LaTeX. It needs Lua 5.3 which
 will be included in at least LuaTeX 1.09 (TeXLive 2019)
@@ -35,6 +41,7 @@ possible options are (short,long):
     -a,--no_casesensitive
     -b,--no_labels
     -o,--output (default "")
+    -k,--checklang
     -l,--language (default en)
     -p,--prefix (default L)
     -u,--use_UCA
diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.pdf
index 909517a46fd..c1ddc640f56 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.pdf
+++ b/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.pdf
diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute.pdf
index dca73ca414d..671b16dba8e 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute.pdf
+++ b/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute.pdf
diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute2.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute2.pdf
index f63a171c110..2b37bbd8899 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute2.pdf
+++ b/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute2.pdf
diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/buch.ind b/Master/texmf-dist/doc/lualatex/xindex/tests/buch.ind
index 048cf758351..19b401d948f 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/tests/buch.ind
+++ b/Master/texmf-dist/doc/lualatex/xindex/tests/buch.ind
@@ -37,8 +37,8 @@
   \item Anhang, {62}
   \item Atom, {400f}
   \item Autor, {54}
+  \item Autor"=Jahr"=Schema, {544}
   \item Autor-Stil, {586}
-  \item Autor(=Jahr(=Schema, {544}
 
 \indexspace
 \textbf{B}\label{L-xindex-B}
diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/buch.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/buch.pdf
index b7bbc6a9504..90ce8da0a77 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/tests/buch.pdf
+++ b/Master/texmf-dist/doc/lualatex/xindex/tests/buch.pdf
diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/demo-hyperref.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/demo-hyperref.pdf
index 680acbc892c..5cc99006629 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/tests/demo-hyperref.pdf
+++ b/Master/texmf-dist/doc/lualatex/xindex/tests/demo-hyperref.pdf
diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/demo.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/demo.pdf
index 1b1b2888f0d..8ee6506f672 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/tests/demo.pdf
+++ b/Master/texmf-dist/doc/lualatex/xindex/tests/demo.pdf
diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/demo2.ind b/Master/texmf-dist/doc/lualatex/xindex/tests/demo2.ind
index 6bd956f8c66..a2bfb309fc2 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/tests/demo2.ind
+++ b/Master/texmf-dist/doc/lualatex/xindex/tests/demo2.ind
@@ -9,7 +9,7 @@
 \indexspace
 \textbf{D}\label{L-xindex-D}
 \nopagebreak[4]
-  \item {Downes}, Michael, {xxxvi}, {xxxvii}
+  \item {Downes}, Michael, {xxxvif}
 
 \indexspace
 \textbf{F}\label{L-xindex-F}
diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/demo3.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/demo3.pdf
index 91cfbb71343..2d72ee52ebe 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/tests/demo3.pdf
+++ b/Master/texmf-dist/doc/lualatex/xindex/tests/demo3.pdf
diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/demo4.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/demo4.pdf
index f17c7cdf92a..7db4dc7fd29 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/tests/demo4.pdf
+++ b/Master/texmf-dist/doc/lualatex/xindex/tests/demo4.pdf
diff --git a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf
index 243f01e3b5f..35bd80e916f 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 6567ab3f173..69ecf8f0013 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex
+++ b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex
@@ -81,9 +81,9 @@
 \def\setVersion#1{\setVVersion#1!!}
 \def\setVVersion#1=#2!!{\def\xIndexVersion{#2}} 
 
-\setVersion{version = 0.45}%  can be automatically changed by perl
+\setVersion{version = 0.46}%  can be automatically changed by perl
 
-\setkeys{hv}{cleanup=true,force=true}
+\setkeys{hv}{cleanup=true,force=false}
 
 
 \title{Program and package \texttt{xindex} \\--\\ \normalsize \xIndexVersion\ (\today)}
@@ -273,7 +273,7 @@ are alphabetized.
   compiler=lualatex,
   crop,
   xindex,
-  force=true,
+  force=false,
   runs=2,code,docType=latex,
   showFilename,
   align=\centering,
@@ -308,7 +308,7 @@ run \texttt{xindex <file.idx>}\index{<file.idx>}\index{123}
 \end{externalDocument}
 
 
-For the German language the double quote is an active character and it makes live easier
+For the German language the double quote is an active character and it makes life easier
 if one chooses another character.
 The escape character can be changed easily by the optional argument \verb|-e "<char>"| or 
 \verb|--escapechar "<char">|. The following example shows how
@@ -336,7 +336,7 @@ are converted into the internal strings and later back to the origin meaning.
   crop,
   xindex,
   xindexOptions=-e ">",
-  force=true,
+  force=false,
   runs=2,code,docType=latex,
   showFilename,
   align=\centering,
@@ -401,7 +401,7 @@ The following example was run with \verb|xindex -l it <file>.idx|:
   crop,
   xindex,
   xindexOptions=-l it -e ">",
-  force=true,
+  force=false,
   runs=2,code,docType=latex,
   showFilename,
   align=\centering,
@@ -435,8 +435,8 @@ Run \texttt{xindex} with \texttt{xindex -l it -e ">"}\index{123}
 \end{externalDocument}
 
 
-The following example was run with \verb|xindex -l "*" <file>.idx|. Then the language is detected from
-the \Lfile{aux} file. This is only possible if  package \Lpack{babel} or \Lpack{polyglossia} are used.
+The following example was run with \verb|xindex -k <file>.idx|. In this case \verb|xindex| tries to detect the language  from
+the \Lfile{aux} file(s). This is only possible if  package \Lpack{babel} or \Lpack{polyglossia} are used.
 
 \begin{externalDocument}[
 %  grfOptions={width=\dimexpr\linewidth-2\fboxsep-2\fboxrule},
@@ -445,8 +445,8 @@ the \Lfile{aux} file. This is only possible if  package \Lpack{babel} or \Lpack{
   compiler=lualatex,
   crop,
   xindex,
-  xindexOptions=-l "*" -e "?",
-  force=true,
+  xindexOptions=-k -e "?",
+  force=false,
   runs=2,code,docType=latex,
   showFilename,
   align=\centering,
@@ -460,7 +460,7 @@ the \Lfile{aux} file. This is only possible if  package \Lpack{babel} or \Lpack{
   \let\item\@idxitem}
 \makeatother
 %StartVisiblePreamble
-\usepackage[canadien]{babel}
+\usepackage[dutch]{babel}
 \usepackage{makeidx}\makeindex
 %StopVisiblePreamble
 \pagestyle{empty}
@@ -479,7 +479,7 @@ Run \texttt{xindex} with \texttt{xindex -l "*" -e "?"}\index{123}
 \end{document}
 \end{externalDocument}
 
-Instead of using \verb|-l *| one can also use the parameter \verb|-k| or \verb|--checklang|.
+%Instead of using \verb|-l *| one can also use the parameter \verb|-k| or \verb|--checklang|.
 
 
 
@@ -570,7 +570,7 @@ alphabet_upper = { -- for sorting
   crop,
   xindex,
   xindexOptions=-l de,
-  force=true,
+  force=false,
   runs=2,code,docType=latex,
   showFilename,
   align=\centering,
@@ -629,7 +629,7 @@ the word beginning with the letter Ö:
   crop,
   xindex,
   xindexOptions=-c DIN2 -l DE,
-  force=true,
+  force=false,
   runs=2,code,docType=latex,
   showFilename,
   align=\centering,
@@ -710,7 +710,7 @@ The following runs with \verb|xindex -l jp <file>|:
   crop,
   xindex,
   xindexOptions=-l jp,
-  force=true,
+  force=false,
   runs=2,
   code=false,
   docType=latex,
@@ -768,7 +768,7 @@ by Michal Hoftich's Lua package \texttt{LUA-UCA}, which should be part of any \T
   crop,
   xindex,
   xindexOptions=-u -l cs,
-  force=true,
+  force=false,
   runs=2,code,docType=latex,
   showFilename,
   align=\centering,
@@ -818,7 +818,7 @@ the \verb|xindex-???| series because uppercase letters are sorted before lowerca
   crop,
   xindex,
 %  xindexOptions=,
-  force=true,
+  force=false,
   runs=2,code,docType=latex,
   showFilename,
   align=\centering,
@@ -874,7 +874,7 @@ The same example sorted with the \verb|-a| or \verb|--no_casesensitive| has anot
   crop,
   xindex,
   xindexOptions=-a,
-  force=true,
+  force=false,
   runs=2,code,docType=latex,
   showFilename,
   align=\centering,
@@ -932,7 +932,7 @@ By default \textsf{alpha sort} will be sorted \emph{before} \textsf{alphaA}:
   crop,
   xindex,
 %  xindexOptions=,
-  force=true,
+  force=false,
   runs=2,code,docType=latex,
   showFilename,
   align=\centering,
@@ -971,7 +971,7 @@ This can be changed with the optional argument \verb|-i| or \verb|--ignoreSpace|
   crop,
   xindex,
   xindexOptions=-i,
-  force=true,
+  force=false,
   runs=2,code,docType=latex,
   showFilename,
   align=\centering,
@@ -1039,7 +1039,7 @@ folium = {
   crop,
   xindex,
   xindexOptions=-l fr,
-  force=true,
+  force=false,
   runs=2,code,docType=latex,
   showFilename,
   align=\centering,
@@ -1093,7 +1093,7 @@ of the same type, so we get \texttt{1f} in the output.
   crop,
   xindex,
   xindexOptions=-l de,
-  force=true,,
+  force=false,,
   runs=2,code,docType=latex,
   showFilename,
   align=\centering,
@@ -1212,7 +1212,7 @@ Internally exists a function \verb|compressPageList| which is used if no
   crop,
   xindex,
   xindexOptions=-c HAdW-eKO,
-  force=true,
+  force=false,
   runs=2,code,docType=latex,
   showFilename,
   align=\centering,
@@ -1333,7 +1333,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,
@@ -1406,7 +1406,7 @@ no limit for \Lprog{xindex}.
   crop,
   xindex,
 %  xindexOptions=,
-  force=true,
+  force=false,
   runs=2,code,docType=latex,
   showFilename,
   align=\centering,
@@ -1458,7 +1458,7 @@ Using the package \Lpack{hyperref} is no problem:
   crop,
   xindex,
   xindexOptions=-l de,
-  force=true,
+  force=false,
   runs=2,code,docType=latex,
   showFilename,
   align=\centering,
@@ -1535,7 +1535,7 @@ such commands are ignored. In the following example we put an horizontal line af
   crop,
   xindex,
   xindexOptions=-l de,
-  force=true,
+  force=false,
   runs=2,code,docType=latex,
   showFilename,
   align=\centering,
@@ -1583,7 +1583,7 @@ the vertical space between different first letters:
   crop,
   xindex,
   xindexOptions=-n,
-  force=true,,
+  force=false,,
   runs=2,code,docType=latex,
   showFilename,
   align=\centering,
@@ -1635,7 +1635,7 @@ In the documents preamble there is the definition:
   crop,
   xindex,
   xindexOptions=-c header,
-  force=true,
+  force=false,
   runs=2,code,docType=latex,
   showFilename,
   align=\centering,
@@ -1781,7 +1781,7 @@ and adds the program \Lprog{xindex} as the default program to  \Lpack{imakeidx}.
   crop,
   xindex,
   xindexOptions=-l de,
-  force=true,
+  force=false,
   runs=2,code,docType=latex,
   showFilename,
   align=\centering,
@@ -1883,7 +1883,7 @@ in the argument of \Lcs{indexentry}.
   crop,
   xindex,
   xindexOptions=-l de,
-  force,
+  force=false,
   runs=2,code,docType=latex,
   showFilename,
   align=\centering,
@@ -1933,7 +1933,7 @@ Duplicate alpha beta gamma.\index{alpha!beta!gamma}
   crop,
   xindex,
   xindexOptions=-l de,
-  force,
+  force=false,
   runs=2,code,docType=latex,
   showFilename,
   align=\centering,
@@ -1958,6 +1958,61 @@ Test \index{A!Test} oder auch \index{B!Test}
 \end{document}
 \end{externalDocument}
 
+
+\clearpage
+
+
+\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=false,
+  runs=2,code,docType=latex,
+  showFilename,
+  align=\centering,
+%  grfOptions={width=\linewidth},
+  lstOptions={columns=fixed}]{xindex}
+%! lualatex --shell-escape
+\documentclass[paper=a5]{scrartcl}
+\usepackage{libertinus-otf}
+\let\NewPage\newpage% only for demo
+\makeatletter
+\renewcommand\newpage{\NewPage\let\ps@plain\ps@empty}
+\makeatother
+%StartVisiblePreamble
+%% Denis Bitouzé
+\usepackage{makeidx}\makeindex
+%StopVisiblePreamble
+\begin{document}
+Foo\index{foo!bar1!baz1}
+Foo\index{foo!bar1!baz2}
+Foo\index{foo!bar2!baz1}
+Foo\index{foo!bar2!baz2}
+\printindex
+\end{document}
+\end{externalDocument}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \printindex
 
 \end{document}