xindex (31may20)

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

14 files changed, 81 insertions, 41 deletions

diff --git a/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG b/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
index 59a4bed43db..5278afea3bf 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
+++ b/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
@@ -1,3 +1,5 @@
+0.22  2020-05-30 - added test for correct language with a fallback to english (en)
+                   and also allow de_DE, where only the first two letters are used
 0.21  2020-05-29 - added support for italian language
 0.20  2019-11-22 - fix for |see{foo bar}
 0.19  2019-10-31 - add again missing accented characters
diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.ind b/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.ind
index e69de29bb2d..6cf4e5b449d 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.ind
+++ b/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.ind
@@ -0,0 +1,38 @@
+
+\begin{theindex}
+
+\indexspace
+\textbf{A}\label{L-xindex-A}
+\nopagebreak[4]
+  \item Aachen, Johannes von \dotfill  {\colorbox{black!15}{VII/1}:~215}
+  \item Aarones \dotfill  {\colorbox{black!15}{VII/2/1}:~1003}, {1012}
+  \item Abrahamson \dotfill  {\colorbox{black!15}{VII/2/1}:~864}, {991}, {1048}, {1067}, {1156}
+  \item Adamson \dotfill  {\colorbox{black!15}{VII/2/1}:~1223}, {\colorbox{black!15}{IX/1}:~1228}
+  \item Adrian
+    \subitem -\,Hauster \dotfill  {\colorbox{black!15}{VII/1}:~514}, {\colorbox{black!15}{XI/1}:~515}
+  \item Alting
+    \subitem -\,Mensa \dotfill  {\colorbox{black!15}{VII/1}:~426}, {434}, {453}, {455}, {466f.}
+
+\indexspace
+\textbf{B}\label{L-xindex-B}
+\nopagebreak[4]
+  \item Bremen
+    \subitem -\,Heinz von, Erzbischof \dotfill  \see{Sachsen-Lauenburg}{ }
+
+\indexspace
+\textbf{O}\label{L-xindex-O}
+\nopagebreak[4]
+  \item Osnabrück
+    \subitem -\,Heinz  von, Bischof \dotfill  \see{Sachsen-Lauenburg}{ }
+
+\indexspace
+\textbf{S}\label{L-xindex-S}
+\nopagebreak[4]
+  \item Schleswig-Holstein
+    \subitem -\,Rudolf von, Herzog \dotfill  {\colorbox{black!15}{VII/2/1}:~758--761}, {765}
+
+\indexspace
+\textbf{Z}\label{L-xindex-Z}
+\nopagebreak[4]
+  \item Zwingl, Haldrich \dotfill  {\colorbox{black!15}{IX}:~479}, {692}
+\end{theindex}
diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.pdf
index 001aa105929..2c52208cf43 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/HADW.tex b/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.tex
index 2c26732da25..99c2c177592 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.tex
+++ b/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.tex
@@ -1,10 +1,10 @@
 \documentclass[paper=a4,parskip=half-,ngerman,DIV=13]{scrartcl}
 \usepackage{eurosym}
 \usepackage[silent]{fontspec}
-\usepackage{libertinus-otf}
+\usepackage[nomath]{libertinus-otf}
 \usepackage{babel}
 \usepackage{makeidx}
-\usepackage{dtk-logos}
+\usepackage{dtk-logos,xcolor}
 \makeatletter
 \def\theindex{%    only for demonstration
   \section*{\indexname}
diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/HADW2.ind b/Master/texmf-dist/doc/lualatex/xindex/tests/HADW2.ind
index 04ba01c38b7..d5ba7965fb0 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/tests/HADW2.ind
+++ b/Master/texmf-dist/doc/lualatex/xindex/tests/HADW2.ind
@@ -2,67 +2,63 @@
 \begin{theindex}
 
 \indexspace
-\textbf{K}
+\textbf{A}\label{L-xindex-A}
 \nopagebreak[4]
-  \item  Karl II, {VII/1 147}
-  \item  Karl III, {VII/1 149}
-  \item  Karl IV, {VII/1 147}, {34}
-  \item  Karl V, {VII/1 34}
-  \item  Karl VI, {VII/1 296}
-  \item  Karl IX, {VII/1 296}
-  \item  Karl X, {VII/1 149}
-
-\indexspace
-\textbf{A}
-\nopagebreak[4]
-  \item Aachen, Johannes von, {VII/1 215}
-  \item Aarones, {VII/2/1 1003}, {1012}
-  \item Abrahamson, {VII/2/1 1048}, {1067}, {1156}, {864}, {991}
-  \item Adamson, {VII/2/1 1223}, {IX/1 1228}
+  \item Aachen, Johannes von \dotfill  {\colorbox{black!15}{VII/1}:~215}
+  \item Aarones \dotfill  {\colorbox{black!15}{VII/2/1}:~1003}, {1012}
+  \item Abrahamson \dotfill  {\colorbox{black!15}{VII/2/1}:~864}, {991}, {1048}, {1067}, {1156}
+  \item Adamson \dotfill  {\colorbox{black!15}{VII/2/1}:~1223}, {\colorbox{black!15}{IX/1}:~1228}
   \item Adrian
-    \subitem -\,Hauster, {VII/1 514}, {XI/1 515}
+    \subitem -\,Hauster \dotfill  {\colorbox{black!15}{VII/1}:~514}, {\colorbox{black!15}{XI/1}:~515}
   \item Alting
-    \subitem -\,Mensa, {VII/1 426}, {434}, {453}, {455}, {466f}
+    \subitem -\,Mensa \dotfill  {\colorbox{black!15}{VII/1}:~426}, {434}, {453}, {455}, {466f.}
 
 \indexspace
-\textbf{B}
+\textbf{B}\label{L-xindex-B}
 \nopagebreak[4]
   \item Bremen
-    \subitem -\,Heinz von, Erzbischof, \see{Sachsen-Lauenburg}{}
+    \subitem -\,Heinz von, Erzbischof \dotfill  \see{Sachsen-Lauenburg}{ }
 
 \indexspace
-\textbf{J}
+\textbf{J}\label{L-xindex-J}
 \nopagebreak[4]
   \item Julian
-    \subitem -\,Apostata, römischer Kaiser, {VII/2/1 904}
-  \item Justinian I., byzantinischer Kaiser, {VII/1 326}, {734}, {VII/2/1 1011}
+    \subitem -\,Apostata, römischer Kaiser \dotfill  {\colorbox{black!15}{VII/2/1}:~904}
+  \item Justinian I., byzantinischer Kaiser \dotfill  {\colorbox{black!15}{VII/1}:~326}, {734}, {\colorbox{black!15}{VII/2/1}:~1011}
 
 \indexspace
-\textbf{K}
+\textbf{K}\label{L-xindex-K}
 \nopagebreak[4]
   \item Karl
-    \subitem -\,II., Kaiser, {VII/1 147}
-    \subitem -\,III., Kaiser, {VII/1 149}
-    \subitem -\,IV., Kaiser, {VII/1 147}, {34}
-    \subitem -\,IX., Kaiser, {VII/1 296}
-    \subitem -\,V., Kaiser, {VII/1 34}
-    \subitem -\,VI., Kaiser, {VII/1 296}
-    \subitem -\,X., Kaiser, {VII/1 149}
+    \subitem -\,II., Kaiser \dotfill  {\colorbox{black!15}{VII/1}:~147}
+    \subitem -\,III., Kaiser \dotfill  {\colorbox{black!15}{VII/1}:~149}
+    \subitem -\,IV., Kaiser \dotfill  {\colorbox{black!15}{VII/1}:~147}, {147}
+    \subitem -\,V., Kaiser \dotfill  {\colorbox{black!15}{VII/1}:~34}
+    \subitem -\,VI., Kaiser \dotfill  {\colorbox{black!15}{VII/1}:~296}
+    \subitem -\,IX., Kaiser \dotfill  {\colorbox{black!15}{VII/1}:~296}
+    \subitem -\,X., Kaiser \dotfill  {\colorbox{black!15}{VII/1}:~149}
+  \item Karl II \dotfill  {\colorbox{black!15}{VII/1}:~147}
+  \item Karl III \dotfill  {\colorbox{black!15}{VII/1}:~149}
+  \item Karl IV \dotfill  {\colorbox{black!15}{VII/1}:~147}, {147}
+  \item Karl V \dotfill  {\colorbox{black!15}{VII/1}:~34}
+  \item Karl VI \dotfill  {\colorbox{black!15}{VII/1}:~296}
+  \item Karl IX \dotfill  {\colorbox{black!15}{VII/1}:~296}
+  \item Karl X \dotfill  {\colorbox{black!15}{VII/1}:~149}
 
 \indexspace
-\textbf{O}
+\textbf{O}\label{L-xindex-O}
 \nopagebreak[4]
   \item Osnabrück
-    \subitem -\,Heinz  von, Bischof, \see{Sachsen-Lauenburg}{}
+    \subitem -\,Heinz  von, Bischof \dotfill  \see{Sachsen-Lauenburg}{ }
 
 \indexspace
-\textbf{S}
+\textbf{S}\label{L-xindex-S}
 \nopagebreak[4]
   \item Schleswig-Holstein
-    \subitem -\,Rudolf von, Herzog, {VII/2/1 758--761}, {765}
+    \subitem -\,Rudolf von, Herzog \dotfill  {\colorbox{black!15}{VII/2/1}:~758--761}, {765}
 
 \indexspace
-\textbf{Z}
+\textbf{Z}\label{L-xindex-Z}
 \nopagebreak[4]
-  \item Zwingl, Haldrich, {IX 479}, {692}
+  \item Zwingl, Haldrich \dotfill  {\colorbox{black!15}{IX}:~479}, {692}
 \end{theindex}
diff --git a/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute.pdf
index 08b3a5f0031..1ec481723ea 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 6e0d33f3342..eec56642650 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.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/buch.pdf
index da01fabb6f2..9de350c28f2 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 80305115265..77c6a61daac 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 5447c661eda..5ef1b4633ae 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/demo3.pdf b/Master/texmf-dist/doc/lualatex/xindex/tests/demo3.pdf
index 053a9853cb5..0d71e408732 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/runTests.sh b/Master/texmf-dist/doc/lualatex/xindex/tests/runTests.sh
index 68f6c7850a8..a762d96357c 100755
--- a/Master/texmf-dist/doc/lualatex/xindex/tests/runTests.sh
+++ b/Master/texmf-dist/doc/lualatex/xindex/tests/runTests.sh
@@ -21,8 +21,12 @@ xindex demo-hyperref > /dev/null
 lualatex demo-hyperref > /dev/null
 
 echo "HADW"
-xindex -l de -c HAdW HADW > /dev/null
+xindex -l de -c HAdW-eKO HADW > /dev/null
 lualatex HADW > /dev/null
+lualatex HADW > /dev/null
+
+echo "HADW2"
+xindex -l de --config HAdW-eKO HADW2 > /dev/null
 
 echo "Umlaute"
 xindex -l de Umlaute  > /dev/null
diff --git a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf
index 2de67ba7388..a5ce61fc031 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 1a2c4dc4c1d..6502c3deac3 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.21}%  can be autimatically changed by perl
+\setVersion{version = 0.22}%  can be automatically changed by perl
 
 \setkeys{dtk}{cleanup=true,force=false}