texlive[60248] trunk: xindex (15aug21)
commits+karl at tug.org
commits+karl at tug.org
Sun Aug 15 22:25:47 CEST 2021
Revision: 60248
http://tug.org/svn/texlive?view=revision&revision=60248
Author: karl
Date: 2021-08-15 22:25:47 +0200 (Sun, 15 Aug 2021)
Log Message:
-----------
xindex (15aug21)
Modified Paths:
--------------
trunk/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua
trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
trunk/Master/texmf-dist/doc/lualatex/xindex/README.md
trunk/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.pdf
trunk/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute.pdf
trunk/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute2.pdf
trunk/Master/texmf-dist/doc/lualatex/xindex/tests/buch.ind
trunk/Master/texmf-dist/doc/lualatex/xindex/tests/buch.pdf
trunk/Master/texmf-dist/doc/lualatex/xindex/tests/demo-hyperref.pdf
trunk/Master/texmf-dist/doc/lualatex/xindex/tests/demo.ind
trunk/Master/texmf-dist/doc/lualatex/xindex/tests/demo.pdf
trunk/Master/texmf-dist/doc/lualatex/xindex/tests/demo2.ind
trunk/Master/texmf-dist/doc/lualatex/xindex/tests/demo3.pdf
trunk/Master/texmf-dist/doc/lualatex/xindex/tests/demo4.pdf
trunk/Master/texmf-dist/doc/lualatex/xindex/tests/runTests.sh
trunk/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf
trunk/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex
trunk/Master/texmf-dist/scripts/xindex/xindex.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua
Modified: trunk/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua 2021-08-14 23:48:40 UTC (rev 60247)
+++ trunk/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua 2021-08-15 20:25:47 UTC (rev 60248)
@@ -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,28 +101,25 @@
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
@@ -129,7 +126,7 @@
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 @@
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 @@
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 @@
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)
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG 2021-08-14 23:48:40 UTC (rev 60247)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG 2021-08-15 20:25:47 UTC (rev 60248)
@@ -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
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/xindex/README.md 2021-08-14 23:48:40 UTC (rev 60247)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/README.md 2021-08-15 20:25:47 UTC (rev 60248)
@@ -23,6 +23,7 @@
possible options are (short,long):
+
-q,--quiet
-h,--help
-v... Verbosity level; can be -v, -vv, -vvv
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/tests/HADW.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/tests/Umlaute2.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/tests/buch.ind
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/xindex/tests/buch.ind 2021-08-14 23:48:40 UTC (rev 60247)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/tests/buch.ind 2021-08-15 20:25:47 UTC (rev 60248)
@@ -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}
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/tests/buch.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/tests/demo-hyperref.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/tests/demo.ind
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/xindex/tests/demo.ind 2021-08-14 23:48:40 UTC (rev 60247)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/tests/demo.ind 2021-08-15 20:25:47 UTC (rev 60248)
@@ -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}
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/tests/demo.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/tests/demo2.ind
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/xindex/tests/demo2.ind 2021-08-14 23:48:40 UTC (rev 60247)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/tests/demo2.ind 2021-08-15 20:25:47 UTC (rev 60248)
@@ -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}
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/tests/demo3.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/tests/demo4.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/tests/runTests.sh
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/xindex/tests/runTests.sh 2021-08-14 23:48:40 UTC (rev 60247)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/tests/runTests.sh 2021-08-15 20:25:47 UTC (rev 60248)
@@ -16,8 +16,8 @@
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"
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex 2021-08-14 23:48:40 UTC (rev 60247)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex 2021-08-15 20:25:47 UTC (rev 60248)
@@ -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}
Modified: trunk/Master/texmf-dist/scripts/xindex/xindex.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/xindex/xindex.lua 2021-08-14 23:48:40 UTC (rev 60247)
+++ trunk/Master/texmf-dist/scripts/xindex/xindex.lua 2021-08-15 20:25:47 UTC (rev 60248)
@@ -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,28 +101,25 @@
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
@@ -129,7 +126,7 @@
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 @@
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 @@
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 @@
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)
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua 2021-08-14 23:48:40 UTC (rev 60247)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua 2021-08-15 20:25:47 UTC (rev 60248)
@@ -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 @@
indexOpening = "" -- commands after \begin{theindex}
rangeSymbol = "--"
idxnewletter = "\\textbf" -- Only valid if -n is not set
+envStart = "\\begin{theindex}"
+envStop = "\\end{theindex}"
--[[
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua 2021-08-14 23:48:40 UTC (rev 60247)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua 2021-08-15 20:25:47 UTC (rev 60248)
@@ -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 @@
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 = {
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua 2021-08-14 23:48:40 UTC (rev 60247)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua 2021-08-15 20:25:47 UTC (rev 60248)
@@ -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,"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 at 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 @@
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 @@
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 @@
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)
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua 2021-08-14 23:48:40 UTC (rev 60247)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua 2021-08-15 20:25:47 UTC (rev 60248)
@@ -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",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua 2021-08-14 23:48:40 UTC (rev 60247)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua 2021-08-15 20:25:47 UTC (rev 60248)
@@ -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",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua 2021-08-14 23:48:40 UTC (rev 60247)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua 2021-08-15 20:25:47 UTC (rev 60248)
@@ -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",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua 2021-08-14 23:48:40 UTC (rev 60247)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua 2021-08-15 20:25:47 UTC (rev 60248)
@@ -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 @@
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'.
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua 2021-08-14 23:48:40 UTC (rev 60247)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua 2021-08-15 20:25:47 UTC (rev 60248)
@@ -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",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua 2021-08-14 23:48:40 UTC (rev 60247)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua 2021-08-15 20:25:47 UTC (rev 60248)
@@ -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 @@
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
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua 2021-08-14 23:48:40 UTC (rev 60247)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua 2021-08-15 20:25:47 UTC (rev 60248)
@@ -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 @@
if (vert) then
vertStr = string.sub(str,vert+1)
str = string.sub(str,1,vert-1)
-print(vertStr)
return (vertStr)
else
return ("")
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua 2021-08-14 23:48:40 UTC (rev 60247)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua 2021-08-15 20:25:47 UTC (rev 60248)
@@ -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 @@
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", '\"{}' },
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua 2021-08-14 23:48:40 UTC (rev 60247)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua 2021-08-15 20:25:47 UTC (rev 60248)
@@ -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",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua 2021-08-14 23:48:40 UTC (rev 60247)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua 2021-08-15 20:25:47 UTC (rev 60248)
@@ -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 @@
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}"
--[[
More information about the tex-live-commits
mailing list.