xindex (15aug21)

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

16 files changed, 53 insertions, 8 deletions

diff --git a/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG b/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
index a8a1703f225..5af214405d7 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
+++ b/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
@@ -1,3 +1,5 @@
+0.33  2021-08-15 - fix for filename->outfilename
+0.32  2021-08-15 - fix for multiple input files
 0.31  2021-08-13 - fix introduced bug for roman page numbers
                  - add optional argument -s for standard input
                  - allow piping with standard input
diff --git a/Master/texmf-dist/doc/lualatex/xindex/README.md b/Master/texmf-dist/doc/lualatex/xindex/README.md
index 1a75b7aad77..6ddb92f8324 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/README.md
+++ b/Master/texmf-dist/doc/lualatex/xindex/README.md
@@ -23,6 +23,7 @@ The syntax of `xindex`
 
 
 possible options are (short,long):
+
     -q,--quiet
     -h,--help
     -v...          Verbosity level; can be -v, -vv, -vvv
diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.pdf
index 44577111ea0..f3f41d33816 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 2c353bfa291..572ba0c9593 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 5803dc5eb78..d600be96f26 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 d03eb1dbc9e..048cf758351 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/tests/buch.ind
+++ b/Master/texmf-dist/doc/lualatex/xindex/tests/buch.ind
@@ -1,6 +1,6 @@
 
 \begin{theindex}
-\par\textbf{Symbols}\label{L-xindex-symbols}
+\textbf{Symbols}\label{L-xindex-symbols}
 \nopagebreak[4]
   \item \texttt{""}, {79}
   \item \texttt{"=}, {79}
diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/buch.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/buch.pdf
index 02c8d5b81bf..d0d2969adf0 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 0317664d465..8d070a27a0d 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.ind b/Master/texmf-dist/doc/lualatex/xindex/tests/demo.ind
index ff3bc67f4ea..7e1983dbcda 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/tests/demo.ind
+++ b/Master/texmf-dist/doc/lualatex/xindex/tests/demo.ind
@@ -1,11 +1,11 @@
 
 \begin{theindex}
-\par\textbf{Symbols}\label{L-xindex-symbols}
+\textbf{Symbole}\label{L-xindex-symbols}
 \nopagebreak[4]
   \item  \textbackslash , {1}
 
 \indexspace
-\textbf{Numbers}\label{L-xindex-numbers}
+\textbf{Zahlen}\label{L-xindex-numbers}
 \nopagebreak[4]
   \item 4711, {1}
 
@@ -85,7 +85,6 @@
   \item Festakt, {19}
   \item Flaggen, {36}
   \item Flüchtlinge, {11}
-  \item foo, {1}, \textit{1f}, \see{bar}{2}, {2}, \textbf{3}, {3f}
   \item Frust, {17}
   \item für, {10}, {26}
 
diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/demo.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/demo.pdf
index 4aa6b007df2..db949abf943 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 1461b309fed..6bd956f8c66 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/tests/demo2.ind
+++ b/Master/texmf-dist/doc/lualatex/xindex/tests/demo2.ind
@@ -2,7 +2,50 @@
 \begin{theindex}
 
 \indexspace
+\textbf{B}\label{L-xindex-B}
+\nopagebreak[4]
+  \item {Beeton}, Barbara, {xxxvi}
+
+\indexspace
+\textbf{D}\label{L-xindex-D}
+\nopagebreak[4]
+  \item {Downes}, Michael, {xxxvi}, {xxxvii}
+
+\indexspace
 \textbf{F}\label{L-xindex-F}
 \nopagebreak[4]
-  \item foo, {1}, \textit{1}, \see{bar}{2}, {3}, \textbf{3}
+  \item foo, {1}, \textit{1f}, \see{bar}{2}, {2}, \textbf{3}, {3f}
+
+\indexspace
+\textbf{G}\label{L-xindex-G}
+\nopagebreak[4]
+  \item {Gordon}, Peter, {xxxvi}
+
+\indexspace
+\textbf{K}\label{L-xindex-K}
+\nopagebreak[4]
+  \item {Knuth}, Donald, {1f}
+
+\indexspace
+\textbf{L}\label{L-xindex-L}
+\nopagebreak[4]
+  \item {Lamport}, Leslie, {xxxvi}, {2}
+
+\indexspace
+\textbf{R}\label{L-xindex-R}
+\nopagebreak[4]
+  \item {Rhead}, David, {xxxvi}
+  \item {Rowley}, Chris, {xxxvii}
+  \item {Ryan}, Elizabeth, {xxxvi}
+
+\indexspace
+\textbf{V}\label{L-xindex-V}
+\nopagebreak[4]
+  \item {Vulis}, Michael, {xxxvii}
+
+\indexspace
+\textbf{W}\label{L-xindex-W}
+\nopagebreak[4]
+  \item {Wetmore}, Alan, {xxxvii}
+  \item {Wong}, Wai, {xxxvii}
 \end{theindex}
diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/demo3.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/demo3.pdf
index 76466c1cfa5..cf5e5dc1ae7 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 066fba32940..637852a00ea 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/tests/runTests.sh b/Master/texmf-dist/doc/lualatex/xindex/tests/runTests.sh
index d0c5961407f..a8a8b5fe6d1 100755
--- a/Master/texmf-dist/doc/lualatex/xindex/tests/runTests.sh
+++ b/Master/texmf-dist/doc/lualatex/xindex/tests/runTests.sh
@@ -16,8 +16,8 @@ lualatex demo3 > /dev/null
 xindex -l de demo3 > /dev/null
 lualatex demo3 > /dev/null
 
-echo "demo4"
-xindex demo4 > /dev/null
+echo "demo4 with multiple input files"
+xindex demo2 demo3.idx demo4 > /dev/null
 lualatex demo4 > /dev/null
 
 echo "demo-hyperref"
diff --git a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf
index f182c409f4e..110ff029731 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 25c8c052ca8..70a8ada370a 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.31}%  can be automatically changed by perl
+\setVersion{version = 0.33}%  can be automatically changed by perl
 
 \setkeys{dtk}{cleanup=true,force}