CTAN sync 202108160300

30 files changed, 125 insertions, 69 deletions

diff --git a/indexing/xindex/CHANGELOG b/indexing/xindex/CHANGELOG
index a8a1703f22..5af214405d 100644
--- a/indexing/xindex/CHANGELOG
+++ b/indexing/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/indexing/xindex/README.md b/indexing/xindex/README.md
index 1a75b7aad7..6ddb92f832 100644
--- a/indexing/xindex/README.md
+++ b/indexing/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/indexing/xindex/doc/tests/HADW.pdf b/indexing/xindex/doc/tests/HADW.pdf
index 44577111ea..f3f41d3381 100644
--- a/indexing/xindex/doc/tests/HADW.pdf
+++ b/indexing/xindex/doc/tests/HADW.pdf
diff --git a/indexing/xindex/doc/tests/Umlaute.pdf b/indexing/xindex/doc/tests/Umlaute.pdf
index 2c353bfa29..572ba0c959 100644
--- a/indexing/xindex/doc/tests/Umlaute.pdf
+++ b/indexing/xindex/doc/tests/Umlaute.pdf
diff --git a/indexing/xindex/doc/tests/Umlaute2.pdf b/indexing/xindex/doc/tests/Umlaute2.pdf
index 5803dc5eb7..d600be96f2 100644
--- a/indexing/xindex/doc/tests/Umlaute2.pdf
+++ b/indexing/xindex/doc/tests/Umlaute2.pdf
diff --git a/indexing/xindex/doc/tests/buch.ind b/indexing/xindex/doc/tests/buch.ind
index d03eb1dbc9..048cf75835 100644
--- a/indexing/xindex/doc/tests/buch.ind
+++ b/indexing/xindex/doc/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/indexing/xindex/doc/tests/buch.pdf b/indexing/xindex/doc/tests/buch.pdf
index 02c8d5b81b..d0d2969adf 100644
--- a/indexing/xindex/doc/tests/buch.pdf
+++ b/indexing/xindex/doc/tests/buch.pdf
diff --git a/indexing/xindex/doc/tests/demo-hyperref.pdf b/indexing/xindex/doc/tests/demo-hyperref.pdf
index 0317664d46..8d070a27a0 100644
--- a/indexing/xindex/doc/tests/demo-hyperref.pdf
+++ b/indexing/xindex/doc/tests/demo-hyperref.pdf
diff --git a/indexing/xindex/doc/tests/demo.ind b/indexing/xindex/doc/tests/demo.ind
index ff3bc67f4e..7e1983dbcd 100644
--- a/indexing/xindex/doc/tests/demo.ind
+++ b/indexing/xindex/doc/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/indexing/xindex/doc/tests/demo.pdf b/indexing/xindex/doc/tests/demo.pdf
index 4aa6b007df..db949abf94 100644
--- a/indexing/xindex/doc/tests/demo.pdf
+++ b/indexing/xindex/doc/tests/demo.pdf
diff --git a/indexing/xindex/doc/tests/demo2.ind b/indexing/xindex/doc/tests/demo2.ind
index 1461b309fe..6bd956f8c6 100644
--- a/indexing/xindex/doc/tests/demo2.ind
+++ b/indexing/xindex/doc/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/indexing/xindex/doc/tests/demo3.pdf b/indexing/xindex/doc/tests/demo3.pdf
index 76466c1cfa..cf5e5dc1ae 100644
--- a/indexing/xindex/doc/tests/demo3.pdf
+++ b/indexing/xindex/doc/tests/demo3.pdf
diff --git a/indexing/xindex/doc/tests/demo4.pdf b/indexing/xindex/doc/tests/demo4.pdf
index 066fba3294..637852a00e 100644
--- a/indexing/xindex/doc/tests/demo4.pdf
+++ b/indexing/xindex/doc/tests/demo4.pdf
diff --git a/indexing/xindex/doc/tests/runTests.sh b/indexing/xindex/doc/tests/runTests.sh
index d0c5961407..a8a8b5fe6d 100755
--- a/indexing/xindex/doc/tests/runTests.sh
+++ b/indexing/xindex/doc/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/indexing/xindex/doc/xindex-doc.pdf b/indexing/xindex/doc/xindex-doc.pdf
index f182c409f4..110ff02973 100644
--- a/indexing/xindex/doc/xindex-doc.pdf
+++ b/indexing/xindex/doc/xindex-doc.pdf
diff --git a/indexing/xindex/doc/xindex-doc.tex b/indexing/xindex/doc/xindex-doc.tex
index 25c8c052ca..70a8ada370 100644
--- a/indexing/xindex/doc/xindex-doc.tex
+++ b/indexing/xindex/doc/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}
 
diff --git a/indexing/xindex/lualatex/xindex-DIN2.lua b/indexing/xindex/lualatex/xindex-DIN2.lua
index 22167d63c9..1c13afc242 100644
--- a/indexing/xindex/lualatex/xindex-DIN2.lua
+++ b/indexing/xindex/lualatex/xindex-DIN2.lua
@@ -5,11 +5,11 @@
 --       AUTHOR:  Herbert Voß
 --      LICENSE:  LPPL1.3
 --
--- $Id: xindex-DIN2.lua 6 2021-08-13 07:08:46Z hvoss $
+-- $Id: xindex-DIN2.lua 12 2021-08-15 09:28:32Z hvoss $
 -----------------------------------------------------------------------
 
 if not modules then modules = { } end modules ['xindex-cfg'] = {
-      version = 0.31,
+      version = 0.33,
       comment = "configuration to xindex.lua",
        author = "Herbert Voss",
     copyright = "Herbert Voss",
@@ -35,6 +35,8 @@ pageNoPrefixDel   = ""     -- a delimiter for page numbers like "VI-17"
 indexOpening      = ""     -- commands after \begin{theindex}
 rangeSymbol       = "--"
 idxnewletter      = "\\textbf"  -- Only valid if -n is not set
+envStart          = "\\begin{theindex}"  
+envStop           = "\\end{theindex}"
 
 
 --[[
diff --git a/indexing/xindex/lualatex/xindex-HAdW-eKO.lua b/indexing/xindex/lualatex/xindex-HAdW-eKO.lua
index 5a9b114a35..49852aa89b 100644
--- a/indexing/xindex/lualatex/xindex-HAdW-eKO.lua
+++ b/indexing/xindex/lualatex/xindex-HAdW-eKO.lua
@@ -5,13 +5,13 @@
 --       AUTHOR:  Herbert Voß
 --      LICENSE:  LPPL1.3
 --
--- $Id: xindex-HAdW-eKO.lua 6 2021-08-13 07:08:46Z hvoss $
+-- $Id: xindex-HAdW-eKO.lua 12 2021-08-15 09:28:32Z hvoss $
 -----------------------------------------------------------------------
 --
 -- configuration for index files of the Heidelberger Akademie der Wissenschaften
 
 if not modules then modules = { } end modules ['xindex-HAdW-eKO'] = {
-      version = 0.31,
+      version = 0.33,
       comment = "configuration to xindex.lua",
        author = "Herbert Voss",
     copyright = "Herbert Voss",
@@ -30,7 +30,8 @@ pageNoPrefixDel   = ""     -- a delimiter for page numbers like "VI-17"
 indexOpening      = ""     -- commands after \begin{theindex}
 rangeSymbol       = "--"
 idxnewletter      = "\\textbf"  -- Only valid if -n is not set
-
+envStart          = "\\begin{theindex}"  
+envStop           = "\\end{theindex}"
 case_sensitive    = false  -- speeds up running
 
 folium = { 
diff --git a/indexing/xindex/lualatex/xindex-base.lua b/indexing/xindex/lualatex/xindex-base.lua
index 6df683605f..13e4db70f7 100644
--- a/indexing/xindex/lualatex/xindex-base.lua
+++ b/indexing/xindex/lualatex/xindex-base.lua
@@ -5,10 +5,10 @@
 --       AUTHOR:  Herbert Voß
 --      LICENSE:  LPPL1.3
 --
--- $Id: xindex-base.lua 9 2021-08-13 19:42:48Z hvoss $
+-- $Id: xindex-base.lua 12 2021-08-15 09:28:32Z hvoss $
 -----------------------------------------------------------------------
 
-local info = { version = 0.31 } 
+local info = { version = 0.33 } 
 
 -- check config
 if pageNoPrefixDel ~= "" then 
@@ -116,13 +116,13 @@ writeLog(2,"done\n",0)
 
 writeLog(2,"Replace @-operator ...\n",0)
 writeLog(1,"------------------ Start list before compressEntryList(Index)------------\n",1)
-writeLog(1,require 'xindex-pretty'.dump(Index),3)   -- only for internal dump
+--writeLog(1,require 'xindex-pretty'.dump(Index),3)   -- only for internal dump
 
 local NewIndex = {}
 NewIndex = compressEntryList(Index)   -- replaces also foo@bar -> bar
 
 -- for i=1,#NewIndex do print(NewIndex[i]["Entry"],NewIndex[i]["pages"][1]["number"],NewIndex[i]["pages"][1]["special"]) end
-writeLog(1,require 'xindex-pretty'.dump(NewIndex),3)   -- only for internal dump
+--writeLog(1,require 'xindex-pretty'.dump(NewIndex),3)   -- only for internal dump
 printList(NewIndex,2)
 writeLog(1,"------------------ End list after compressEntryList(Index)------------\n",1)
 writeLog(2,"done\n",0)
@@ -156,7 +156,7 @@ if SORTendhook then
 end
 
 outFile:write("\n")
-outFile:write("\\begin{theindex}\n")
+outFile:write(envStart.."\n")
 
 if indexOpening ~= "" then   -- commands after \begin{theindex}
   outFile:write(indexOpening) 
@@ -221,7 +221,8 @@ for k=1,#NewIndex do
       if firstSLine then
         firstSLine = false
         if not no_headings then
-          outFile:write("\\par"..idxnewletter.."{"..index_header[1].."}")
+          outFile:write(idxnewletter.."{"..index_header[1].."}")
+--          outFile:write("\\par"..idxnewletter.."{"..index_header[1].."}")
           if no_labels then
             outFile:write("\n\\nopagebreak[4]\n")
           else
@@ -294,8 +295,8 @@ for k=1,#NewIndex do
     if v["Macro"]  then outFile:write(v["Macro"].."\n") end
   end
 end
-outFile:write("\\end{theindex}\n")
-writeLog(2,indLines.." lines of data wrote into the .ind file\n",0)
+outFile:write(envStop.."\n")
+writeLog(2,indLines.." lines of data wrote into the "..outfilename.." file\n",0)
 outFile:close()
 
 writeLog(2,"\ndone! closing program\n",0)
diff --git a/indexing/xindex/lualatex/xindex-baselib.lua b/indexing/xindex/lualatex/xindex-baselib.lua
index ba1e0d27cc..5dd579a19f 100644
--- a/indexing/xindex/lualatex/xindex-baselib.lua
+++ b/indexing/xindex/lualatex/xindex-baselib.lua
@@ -5,11 +5,11 @@
 --       AUTHOR:  Herbert Voß
 --      LICENSE:  LPPL1.3
 --
--- $Id: xindex-baselib.lua 11 2021-08-14 09:46:46Z hvoss $
+-- $Id: xindex-baselib.lua 12 2021-08-15 09:28:32Z hvoss $
 -----------------------------------------------------------------------
 
 if not modules then modules = { } end modules ['xindex-baselib'] = {
-      version = 0.31,
+      version = 0.33,
       comment = "base library  to xindex.lua",
        author = "Herbert Voss",
     copyright = "Herbert Voss",
diff --git a/indexing/xindex/lualatex/xindex-cfg-common.lua b/indexing/xindex/lualatex/xindex-cfg-common.lua
index 18c97ade80..eba315f21f 100644
--- a/indexing/xindex/lualatex/xindex-cfg-common.lua
+++ b/indexing/xindex/lualatex/xindex-cfg-common.lua
@@ -5,11 +5,11 @@
 --       AUTHOR:  Herbert Voß
 --      LICENSE:  LPPL1.3
 --
--- $Id: xindex-cfg-common.lua 6 2021-08-13 07:08:46Z hvoss $
+-- $Id: xindex-cfg-common.lua 12 2021-08-15 09:28:32Z hvoss $
 -----------------------------------------------------------------------
 
 if not modules then modules = { } end modules ['xindex-cfg-common'] = {
-      version = 0.31,
+      version = 0.33,
       comment = "configuration to xindex.lua",
        author = "Herbert Voss",
     copyright = "Herbert Voss",
diff --git a/indexing/xindex/lualatex/xindex-cfg-uca.lua b/indexing/xindex/lualatex/xindex-cfg-uca.lua
index 57fb142d74..b2ed04dbc9 100644
--- a/indexing/xindex/lualatex/xindex-cfg-uca.lua
+++ b/indexing/xindex/lualatex/xindex-cfg-uca.lua
@@ -5,11 +5,11 @@
 --       AUTHOR:  Herbert Voß
 --      LICENSE:  LPPL1.3
 --
--- $Id: xindex-cfg-uca.lua 6 2021-08-13 07:08:46Z hvoss $
+-- $Id: xindex-cfg-uca.lua 12 2021-08-15 09:28:32Z hvoss $
 -----------------------------------------------------------------------
 
 if not modules then modules = { } end modules ['xindex-cfg-lua'] = {
-      version = 0.31,
+      version = 0.33,
       comment = "configuration to xindex-cfg-uca.lua",
        author = "Herbert Voss",
     copyright = "Herbert Voss",
diff --git a/indexing/xindex/lualatex/xindex-cfg.lua b/indexing/xindex/lualatex/xindex-cfg.lua
index 5824d12d91..3b7bb06c25 100644
--- a/indexing/xindex/lualatex/xindex-cfg.lua
+++ b/indexing/xindex/lualatex/xindex-cfg.lua
@@ -5,11 +5,11 @@
 --       AUTHOR:  Herbert Voß
 --      LICENSE:  LPPL1.3
 --
--- $Id: xindex-cfg.lua 6 2021-08-13 07:08:46Z hvoss $
+-- $Id: xindex-cfg.lua 12 2021-08-15 09:28:32Z hvoss $
 -----------------------------------------------------------------------
 
 if not modules then modules = { } end modules ['xindex-cfg'] = {
-      version = 0.31,
+      version = 0.33,
       comment = "main configuration to xindex.lua",
        author = "Herbert Voss",
     copyright = "Herbert Voss",
@@ -24,8 +24,10 @@ rangeSymbol       = "--"
 numericPage       = true    -- for non numerical pagenumbers, like "VI-17"
 sublabels         = {"", "-\\,", "--\\,", "---\\,"} -- for the (sub(sub(sub-items  first one is for item
 pageNoPrefixDel   = ""     -- a delimiter for page numbers like "VI-17"  -- not used !!!
-indexOpening      = ""     -- commands after \begin{theindex}
+indexOpening      = ""     -- commands after envStart
 idxnewletter      = "\\textbf"  -- Only valid if -n is not set
+envStart          = "\\begin{theindex}"  
+envStop           = "\\end{theindex}"
 
 --[[
     Each character's position in this array-like table determines its 'priority'.
diff --git a/indexing/xindex/lualatex/xindex-dtk.lua b/indexing/xindex/lualatex/xindex-dtk.lua
index 662a0deb9d..446cc5bc7f 100644
--- a/indexing/xindex/lualatex/xindex-dtk.lua
+++ b/indexing/xindex/lualatex/xindex-dtk.lua
@@ -5,11 +5,11 @@
 --       AUTHOR:  Herbert Voß
 --      LICENSE:  LPPL1.3
 --
--- $Id: xindex-dtk.lua 6 2021-08-13 07:08:46Z hvoss $
+-- $Id: xindex-dtk.lua 12 2021-08-15 09:28:32Z hvoss $
 -----------------------------------------------------------------------
 
 if not modules then modules = { } end modules ['xindex-cfg'] = {
-      version = 0.31,
+      version = 0.33,
       comment = "DTK configuration to xindex.lua",
        author = "Herbert Voss",
     copyright = "Herbert Voss",
diff --git a/indexing/xindex/lualatex/xindex-lapp.lua b/indexing/xindex/lualatex/xindex-lapp.lua
index cb79a0d550..e380413336 100644
--- a/indexing/xindex/lualatex/xindex-lapp.lua
+++ b/indexing/xindex/lualatex/xindex-lapp.lua
@@ -1,7 +1,7 @@
 -- lapp.lua
 -- Simple command-line parsing using human-readable specification
 --
--- $Id: xindex-lapp.lua 9 2021-08-13 19:42:48Z hvoss $
+-- $Id: xindex-lapp.lua 12 2021-08-15 09:28:32Z hvoss $
 -----------------------------
 --~ -- args.lua
 --~ local args = require ('lapp') [[
@@ -78,13 +78,18 @@ local function trim(s)
     return ltrim(rtrim(s))
 end
 
-local function open (file,opt)
+--- open a file.
+-- This will quit on error, and keep a list of file objects for later cleanup.
+-- @string file filename
+-- @string[opt] opt same as second parameter of `io.open`
+function open (file,opt)
     local val,err = io.open(file,opt)
     if not val then 
-	val,err = io.open(file..".idx",opt)
-        if not val then
-          error(err,true) 
-        end
+        file = file..".idx"
+	val,err = io.open(file,opt)
+	if not val then
+	    error(err,true) 
+	end
     end
     append(open_files,val)
     return val
diff --git a/indexing/xindex/lualatex/xindex-lib.lua b/indexing/xindex/lualatex/xindex-lib.lua
index 906ea00b69..a7936ffb0f 100644
--- a/indexing/xindex/lualatex/xindex-lib.lua
+++ b/indexing/xindex/lualatex/xindex-lib.lua
@@ -5,11 +5,11 @@
 --       AUTHOR:  Herbert Voß
 --      LICENSE:  LPPL1.3
 --
--- $Id: xindex-lib.lua 9 2021-08-13 19:42:48Z hvoss $
+-- $Id: xindex-lib.lua 12 2021-08-15 09:28:32Z hvoss $
 -----------------------------------------------------------------------
 
 if not modules then modules = { } end modules ['xindex-lib'] = {
-      version = 0.31,
+      version = 0.33,
       comment = "main library  to xindex.lua",
        author = "Herbert Voss",
     copyright = "Herbert Voss",
@@ -142,7 +142,6 @@ function checkVert(str) -- get the | part
   if (vert) then 
     vertStr = string.sub(str,vert+1)
     str = string.sub(str,1,vert-1)
-print(vertStr)
     return (vertStr)
   else
    return ("")
diff --git a/indexing/xindex/lualatex/xindex-norsk.lua b/indexing/xindex/lualatex/xindex-norsk.lua
index c33b89cda3..82e443d17a 100644
--- a/indexing/xindex/lualatex/xindex-norsk.lua
+++ b/indexing/xindex/lualatex/xindex-norsk.lua
@@ -6,11 +6,11 @@
 --     MODIFIED:  Sveinung Heggen (2020-01-02)
 --      LICENSE:  LPPL1.3
 --
--- $Id: xindex-norsk.lua 6 2021-08-13 07:08:46Z hvoss $
+-- $Id: xindex-norsk.lua 12 2021-08-15 09:28:32Z hvoss $
 -----------------------------------------------------------------------
 
 if not modules then modules = { } end modules ['xindex-no'] = {
-      version = 0.31,
+      version = 0.33,
       comment = "configuration to xindex.lua",
        author = "Herbert Voss",
     copyright = "Herbert Voss",
@@ -28,6 +28,8 @@ sublabels         = {"", "-\\,", "--\\,", "---\\,"} -- for the (sub(sub(sub-item
 pageNoPrefixDel   = ""     -- a delimiter for page numbers like "VI-17"  -- not used !!!
 indexOpening      = ""     -- commands after \begin{theindex}
 idxnewletter      = "\\textbf"  -- Only valid if -n is not set
+envStart          = "\\begin{theindex}"  
+envStop           = "\\end{theindex}"
 
 escape_chars = { -- by default " is the escape char
   {'""', "\\escapedquote",      '\"{}' },
diff --git a/indexing/xindex/lualatex/xindex-pretty.lua b/indexing/xindex/lualatex/xindex-pretty.lua
index e50e6f0ff8..e27bedaf5a 100644
--- a/indexing/xindex/lualatex/xindex-pretty.lua
+++ b/indexing/xindex/lualatex/xindex-pretty.lua
@@ -3,11 +3,11 @@
 -- Also provides a sandboxed Lua table reader and
 -- a function to present large numbers in human-friendly format.
 --
--- $Id: xindex-pretty.lua 6 2021-08-13 07:08:46Z hvoss $
+-- $Id: xindex-pretty.lua 12 2021-08-15 09:28:32Z hvoss $
 -----------------------------------------------------------------------
 
 if not modules then modules = { } end modules ['xindex-pretty'] = {
-      version = 0.31,
+      version = 0.33,
       comment = "dump a Lua table for debugging",
        author = "Steve Donovan",
     copyright = "Steve Donovan",
diff --git a/indexing/xindex/lualatex/xindex-yannis.lua b/indexing/xindex/lualatex/xindex-yannis.lua
index 4b1565b2a5..e2b69ac148 100644
--- a/indexing/xindex/lualatex/xindex-yannis.lua
+++ b/indexing/xindex/lualatex/xindex-yannis.lua
@@ -5,11 +5,11 @@
 --       AUTHOR:  Herbert Voß
 --      LICENSE:  LPPL1.3
 --
--- $Id: xindex-yannis.lua 6 2021-08-13 07:08:46Z hvoss $
+-- $Id: xindex-yannis.lua 12 2021-08-15 09:28:32Z hvoss $
 -----------------------------------------------------------------------
 
 if not modules then modules = { } end modules ['xindex-yannis'] = {
-      version = 0.31,
+      version = 0.33,
       comment = "main configuration to xindex.lua",
        author = "Herbert Voss",
     copyright = "Herbert Voss",
@@ -26,6 +26,8 @@ sublabels         = {"", "-\\,", "--\\,", "---\\,"} -- for the (sub(sub(sub-item
 pageNoPrefixDel   = ""     -- a delimiter for page numbers like "VI-17"  -- not used !!!
 indexOpening      = ""     -- commands after \begin{theindex}
 idxnewletter      = "\\textbf"  -- Only valid if -n is not set
+envStart          = "\\begin{theindex}"  
+envStop           = "\\end{theindex}"
 
 
 --[[
diff --git a/indexing/xindex/scripts/xindex.lua b/indexing/xindex/scripts/xindex.lua
index 3a9655c61d..4fb757b86c 100755
--- a/indexing/xindex/scripts/xindex.lua
+++ b/indexing/xindex/scripts/xindex.lua
@@ -6,11 +6,11 @@
 --       AUTHOR:  Herbert Voß
 --      LICENSE:  LPPL 1.3
 --
--- $Id: xindex.lua 10 2021-08-14 07:50:17Z hvoss $
+-- $Id: xindex.lua 13 2021-08-15 10:49:40Z hvoss $
 -----------------------------------------------------------------------
 
         xindex = xindex or { }
- local version = 0.31
+ local version = 0.33
 xindex.version = version
 --xindex.self = "xindex"
 
@@ -101,35 +101,32 @@ if not useStdInput then
   inFiles = {}    --args.files as strings
   for i = 1,nInFiles do
     local file = args.files_name[i]
---    test for extension is in xindex-lapp
---    if not file_exists(file) then
---      if file_exists(file..".idx") then
---        inFiles[#inFiles+1] = file..".idx"
---      else
---        print("Inputfile "..file.." or "..file..".idx not found!\n")
---      end
---    else
+    if not file_exists(file) then
+      if file_exists(file..".idx") then
+        inFiles[#inFiles+1] = file..".idx"
+      end
+    else
       inFiles[#inFiles+1] = file
---    end
+    end
   end  
 end
 
 -- print ("Check Logfile:")
 
-local filename
+outfilename = ""
 logfilename = ""
 
 if args["output"] == '""' then
   if not useStdInput then
     if inFiles[1]:sub(inFiles[1]:len()-3,inFiles[1]:len()) == ".idx" then 
-      filename = inFiles[1]:sub(1,inFiles[1]:len()-3).."ind"
+      outfilename = inFiles[1]:sub(1,inFiles[1]:len()-3).."ind"
       if nInFiles > 1 then
         logfilename = "xindex.ilg"
       else 
         logfilename = inFiles[1]:sub(1,inFiles[1]:len()-3).."ilg"
       end
     else
-      filename = inFiles[1]..".ind"
+      outfilename = inFiles[1]..".ind"
       if nInFiles > 1 then
         logfilename = "xindex.ilg"
       else 
@@ -137,15 +134,15 @@ if args["output"] == '""' then
       end
     end
   else
-    filename = "xindex.ind"
+    outfilename = "xindex.ind"
     logfilename = "xindex.ilg"
   end
 else
-  filename = args.output
+  outfilename = args.output
   if nInFiles > 1 or useStdInput then
     logfilename = "xindex.ilg"
   else 
-    logfilename = filename:gsub('%p...','')..".ilg"
+    logfilename = outfilename:gsub('%p...','')..".ilg"
   end
 end
 
@@ -156,10 +153,10 @@ require('xindex-lib')
 
 writeLog(2,"xindex v."..version.." (c) Herbert Voß\n",-1)
 writeLog(1,"Verbose level = "..vlevel.."\n",1)
-writeLog(2,"Logfile:",logfilename,1)
+writeLog(2,"Logfile:"..logfilename,1)
 
-writeLog(2,"Open outputfile "..filename,0)
-outFile = io.open(filename,"w+")
+writeLog(2,"Open outputfile "..outfilename,0)
+outFile = io.open(outfilename,"w+")
 writeLog(2," ... done\n",0)
 
 if vlevel > 0 then
@@ -275,8 +272,8 @@ else
   writeLog(1,"Index with labels\n",1)
 end
 
-writeLog(2,"Open outputfile "..filename,0)
-outFile = io.open(filename,"w+")
+writeLog(2,"Open outputfile "..outfilename,0)
+outFile = io.open(outfilename,"w+")
 writeLog(2,"... done\n",0)
 
 writeLog(1,"Starting base file ... \n",2)