xindex (5jul21)

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

17 files changed, 53 insertions, 24 deletions

diff --git a/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua b/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua
index a29fdb0d65a..5a3ba4c4b00 100755
--- a/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua
+++ b/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua
@@ -8,7 +8,7 @@
 -----------------------------------------------------------------------
 
         xindex = xindex or { }
- local version = 0.28
+ local version = 0.29
 xindex.version = version
 --xindex.self = "xindex"
 
diff --git a/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG b/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
index 646ca927eb5..bf199a2f3f4 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
+++ b/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
@@ -1,3 +1,6 @@
+0.29  2021-07-05 - don't use language specific names for the labels
+                 - use math.max()
+                 - check for language specific folium pages and not only "f", "ff"
 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
diff --git a/Master/texmf-dist/doc/lualatex/xindex/Makefile b/Master/texmf-dist/doc/lualatex/xindex/Makefile
index 7e5529f499b..e5bddf07a9a 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/Makefile
+++ b/Master/texmf-dist/doc/lualatex/xindex/Makefile
@@ -23,7 +23,7 @@ doc:
 	xindex -a $(MAIN).idx
 #	bibtex $(MAIN)
 	$(LATEX) --shell-escape $(MAIN)
-#	$(LATEX) --shell-escape $(MAIN)
+	$(LATEX) --shell-escape $(MAIN)
 
 clean : 
 	$(RM) *.dvi *.aux *.log  *.xml xindex-?.tex xindex-??.tex *.ind *.idx *.toc *.out *.ilg
diff --git a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf
index e20204c2809..a1e54f4ae4d 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 c890f1b7d98..71f6139d4f5 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.28}%  can be automatically changed by perl
+\setVersion{version = 0.29}%  can be automatically changed by perl
 
 \setkeys{dtk}{cleanup=true,force=false}
 
@@ -217,6 +217,8 @@ are alphabetized.
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex
+%! xindex
 \documentclass{scrartcl}
 \makeatletter
 \def\theindex{%    only for demonstration
@@ -280,6 +282,7 @@ are converted into the internal strings and later back to the origin meaning.
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex
 \documentclass{scrartcl}
 \makeatletter
 \def\theindex{%    only for demonstration
@@ -341,6 +344,7 @@ The following example was run with \verb|xindex -l it <file>.idx|:
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex
 \documentclass{scrartcl}
 \makeatletter
 \def\theindex{%    only for demonstration
@@ -459,6 +463,7 @@ alphabet_upper = { -- for sorting
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex
 \documentclass[paper=a5]{scrartcl}
 \usepackage[ngerman]{babel}
 %StartVisiblePreamble
@@ -517,6 +522,7 @@ the word beginninjg with the letter Ö:
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex
 \documentclass[paper=a5]{scrartcl}
 \usepackage[ngerman]{babel}
 %StartVisiblePreamble
@@ -600,6 +606,7 @@ The following runs with \verb|xindex -l jp <file>|:
   align=\centering,
 %  usefancyvrb,
   lstOptions={fontfamily=helvetica}]{xindex}
+%! lualatex
 \documentclass[a5paper]{article}
 %StartVisiblePreamble
 \usepackage{fontspec}
@@ -654,6 +661,7 @@ by Michal Hoftich's Lua package \texttt{LUA-UCA}, which should be part of any \T
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex
 \documentclass[paper=a6]{scrartcl}
 \makeatletter
 \def\theindex{%    only for demonstration
@@ -728,6 +736,7 @@ folium = {
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex
 \documentclass{scrartcl}
 \makeatletter
 \def\theindex{%    only for demonstration
@@ -775,6 +784,7 @@ Using the package \Lpack{hyperref} is no problem:
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex
 \documentclass[paper=a6]{scrartcl}
 \usepackage{multicol}
 \makeatletter
@@ -835,6 +845,7 @@ of the same type, so we get \texttt{1f} in the output.
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex
 \documentclass{scrartcl}
 \makeatletter
 \def\theindex{%    only for demonstration
@@ -951,6 +962,7 @@ Internally exists a function \verb|compressPageList| which is used if no
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex
 \RequirePackage{filecontents}
 \begin{filecontents*}{\jobname.idx}
 \indexentry{Aachen, Johannes von}{VII/1-215}
@@ -1072,6 +1084,7 @@ The following example runs \verb|xindex -c dtk -l de -n <input>|
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex
 \RequirePackage{filecontents}
 \begin{filecontents*}{\jobname.idx}
 \indexentry{VoßHerbert@Herbert Voß!Wasgensteig 12\protect \\10127 Potsdam\protect \\\Email {herbert"@xyz.de}}{3}
@@ -1145,6 +1158,7 @@ no limit for \Lprog{xindex}.
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex
 \documentclass{article}
 \makeatletter
 \def\theindex{%    only for demonstration
@@ -1220,6 +1234,7 @@ such commands are ignored. In the following example we put an horizontal line af
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex --shell-escape
 \documentclass{scrartcl}
 \usepackage{libertinus-otf}
 %StartVisiblePreamble
@@ -1267,6 +1282,7 @@ the vertical space between different first letters:
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex
 \documentclass{scrartcl}
 \makeatletter
 \def\theindex{%    only for demonstration
@@ -1318,6 +1334,7 @@ In the documents preamble there is the definition:
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex
 \documentclass{scrartcl}
 \usepackage{filecontents}
 \begin{filecontents*}{xindex-header.lua}
@@ -1461,6 +1478,7 @@ the \verb|xindex-???| series because uppercase letters are sorted before lowerca
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex --shell-escape
 \documentclass{scrartcl}
 \usepackage{libertinus-otf}
 \makeatletter
@@ -1515,6 +1533,7 @@ The same example sorted with the \verb|-a| or \verb|--nocasesensitive| has anoth
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex --shell-escape
 \documentclass{scrartcl}
 \usepackage{libertinus-otf}
 \makeatletter
@@ -1572,6 +1591,7 @@ and adds the program \Lprog{xindex} as the default program to  \Lpack{imakeidx}.
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex --shell-escape
 \documentclass{scrartcl}
 \usepackage{libertinus-otf}
 \makeatletter
@@ -1647,6 +1667,7 @@ in the argument of \Lcs{indexentry}.
   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
@@ -1696,6 +1717,7 @@ Duplicate alpha beta gamma.\index{alpha!beta!gamma}
   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
diff --git a/Master/texmf-dist/scripts/xindex/xindex.lua b/Master/texmf-dist/scripts/xindex/xindex.lua
index a29fdb0d65a..5a3ba4c4b00 100755
--- a/Master/texmf-dist/scripts/xindex/xindex.lua
+++ b/Master/texmf-dist/scripts/xindex/xindex.lua
@@ -8,7 +8,7 @@
 -----------------------------------------------------------------------
 
         xindex = xindex or { }
- local version = 0.28
+ local version = 0.29
 xindex.version = version
 --xindex.self = "xindex"
 
diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua
index 91422306ce9..dc782726fe5 100644
--- a/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua
+++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua
@@ -7,7 +7,7 @@
 -----------------------------------------------------------------------
 
 if not modules then modules = { } end modules ['xindex-cfg'] = {
-      version = 0.28,
+      version = 0.29,
       comment = "configuration to xindex.lua",
        author = "Herbert Voss",
     copyright = "Herbert Voss",
diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua
index 9091ac6b371..6b9e3c65a95 100644
--- a/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua
+++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua
@@ -9,7 +9,7 @@
 -- configuration for index files of the Heidelberger Akademie der Wissenschaften
 
 if not modules then modules = { } end modules ['xindex-HAdW-eKO'] = {
-      version = 0.28,
+      version = 0.29,
       comment = "configuration to xindex.lua",
        author = "Herbert Voss",
     copyright = "Herbert Voss",
diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua
index fb11f3539e2..ae77fe93fb0 100644
--- a/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua
+++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua
@@ -6,7 +6,7 @@
 --      LICENSE:  LPPL1.3
 -----------------------------------------------------------------------
 
-local info = { version = 0.28 } 
+local info = { version = 0.29 } 
 
 -- check config
 if pageNoPrefixDel ~= "" then 
@@ -209,9 +209,11 @@ for k=1,#NewIndex do
         if not no_headings then
           outFile:write("\\par"..idxnewletter.."{"..index_header[1].."}")
           if (labelPrefix == "") then
-            outFile:write("\\label{xindex-"..index_header[1].."}\n\\nopagebreak[4]\n")
+            outFile:write("\\label{xindex-symbols}\n\\nopagebreak[4]\n")
+--            outFile:write("\\label{xindex-"..index_header[1].."}\n\\nopagebreak[4]\n")
           else
-            outFile:write("\\label{"..labelPrefix.."-xindex-"..index_header[1].."}\n\\nopagebreak[4]\n")
+            outFile:write("\\label{"..labelPrefix.."-xindex-symbols}\n\\nopagebreak[4]\n")
+--            outFile:write("\\label{"..labelPrefix.."-xindex-"..index_header[1].."}\n\\nopagebreak[4]\n")
           end
         end
       end
@@ -231,9 +233,11 @@ for k=1,#NewIndex do
         if not no_headings  then
           outFile:write(idxnewletter.."{"..index_header[2].."}")
           if (labelPrefix == "") then
-            outFile:write("\\label{xindex-"..index_header[2].."}\n\\nopagebreak[4]\n")
+            outFile:write("\\label{xindex-numbers}\n\\nopagebreak[4]\n")
+--            outFile:write("\\label{xindex-"..index_header[2].."}\n\\nopagebreak[4]\n")
           else
-            outFile:write("\\label{"..labelPrefix.."-xindex-"..index_header[2].."}\n\\nopagebreak[4]\n")
+            outFile:write("\\label{"..labelPrefix.."-xindex-numbers}\n\\nopagebreak[4]\n")
+--            outFile:write("\\label{"..labelPrefix.."-xindex-"..index_header[2].."}\n\\nopagebreak[4]\n")
           end
         end
       end
diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua
index e3d462ef220..c66c70c7169 100644
--- a/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua
+++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua
@@ -7,7 +7,7 @@
 -----------------------------------------------------------------------
 
 if not modules then modules = { } end modules ['xindex-cfg-common'] = {
-      version = 0.28,
+      version = 0.29,
       comment = "configuration to xindex.lua",
        author = "Herbert Voss",
     copyright = "Herbert Voss",
diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua
index 50fdeb8463d..22a5669e112 100644
--- a/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua
+++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua
@@ -7,7 +7,7 @@
 -----------------------------------------------------------------------
 
 if not modules then modules = { } end modules ['xindex-cfg-lua'] = {
-      version = 0.28,
+      version = 0.29,
       comment = "configuration to xindex-cfg-uca.lua",
        author = "Herbert Voss",
     copyright = "Herbert Voss",
diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua
index c82544f4027..e088360fdf5 100644
--- a/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua
+++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua
@@ -7,7 +7,7 @@
 -----------------------------------------------------------------------
 
 if not modules then modules = { } end modules ['xindex-cfg'] = {
-      version = 0.28,
+      version = 0.29,
       comment = "main configuration to xindex.lua",
        author = "Herbert Voss",
     copyright = "Herbert Voss",
diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua
index 9ac0b9a26aa..d479fa02358 100644
--- a/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua
+++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua
@@ -7,7 +7,7 @@
 -----------------------------------------------------------------------
 
 if not modules then modules = { } end modules ['xindex-cfg'] = {
-      version = 0.28,
+      version = 0.29,
       comment = "DTK configuration to xindex.lua",
        author = "Herbert Voss",
     copyright = "Herbert Voss",
diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua
index 4eed37024a3..a9a982c2df2 100644
--- a/Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua
+++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua
@@ -28,7 +28,7 @@
 --~ n       2
 --------------------------------
 if not modules then modules = { } end modules ['xindex-lapp'] = {
-      version = 0.28,
+      version = 0.29,
       comment = "read parameter for xindex.lua",
        author = "Steve Donovan",
     copyright = "Steve Donovan",
diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua
index 31e4d234260..193758deefb 100644
--- a/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua
+++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua
@@ -7,7 +7,7 @@
 -----------------------------------------------------------------------
 
 if not modules then modules = { } end modules ['xindex-lib'] = {
-      version = 0.28,
+      version = 0.29,
       comment = "main library  to xindex.lua",
        author = "Herbert Voss",
     copyright = "Herbert Voss",
@@ -621,11 +621,11 @@ function checkFF(p)
   -- for hyperref: replace  \hyperpage{1\,ff} -> \hyperpage{1\nohyperpage{\,ff}}
   if not p then return p end
   local P = tostring(p)
-  if P:find("ff") then 
-    local str = P:gsub(page_folium[2],'').."\\nohyperpage{"..page_folium[2].."}"
+  if P:find(page_folium[2]) then 
+    local str = P:gsub(page_folium[2],'').."\\nohyperpage{"..page_folium[2].."}"  -- eg ff
     return str
-  elseif P:find("f") then 
-    local str = P:gsub(page_folium[1],'').."\\nohyperpage{"..page_folium[1].."}"
+  elseif P:find(page_folium[1]) then 
+    local str = P:gsub(page_folium[1],'').."\\nohyperpage{"..page_folium[1].."}"  -- eg f
     return str
   else 
     return P
diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua
index 769f91a7a1c..a92f4823f64 100644
--- a/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua
+++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua
@@ -8,7 +8,7 @@
 -----------------------------------------------------------------------
 
 if not modules then modules = { } end modules ['xindex-no'] = {
-      version = 0.28,
+      version = 0.29,
       comment = "configuration to xindex.lua",
        author = "Herbert Voss",
     copyright = "Herbert Voss",
diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua
index 793a434a79e..8f2155c803c 100644
--- a/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua
+++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua
@@ -5,7 +5,7 @@
 --
 
 if not modules then modules = { } end modules ['xindex-pretty'] = {
-      version = 0.28,
+      version = 0.29,
       comment = "dump a Lua table for debugging",
        author = "Steve Donovan",
     copyright = "Steve Donovan",
@@ -31,7 +31,7 @@ local function has_lquote(s)
     repeat
         _, finish, _, new_equals = s:find(lstring_pat, finish)
         if new_equals then
-            equals = max(equals or 0, #new_equals)
+            equals = math.max(equals or 0, #new_equals)
         end
     until not new_equals