texlive[64453] trunk: xindex (20sep22)
commits+karl at tug.org
commits+karl at tug.org
Tue Sep 20 21:54:23 CEST 2022
Revision: 64453
http://tug.org/svn/texlive?view=revision&revision=64453
Author: karl
Date: 2022-09-20 21:54:23 +0200 (Tue, 20 Sep 2022)
Log Message:
-----------
xindex (20sep22)
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/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-danteedition.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.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 2022-09-20 19:53:50 UTC (rev 64452)
+++ trunk/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua 2022-09-20 19:54:23 UTC (rev 64453)
@@ -10,7 +10,7 @@
-----------------------------------------------------------------------
xindex = xindex or { }
- local version = 0.43
+ local version = 0.45
xindex.version = version
--xindex.self = "xindex"
@@ -69,6 +69,7 @@
if args.version then
print("xindex version "..xindex.version)
+ os.exit()
end
vlevel = not args.v[1] and 0 or #args.v
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG 2022-09-20 19:53:50 UTC (rev 64452)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG 2022-09-20 19:54:23 UTC (rev 64453)
@@ -1,3 +1,5 @@
+0.45 2022-09-20 - exit xindex after printing version information
+0.44 2022-09-09 - ---
0.43 2022-09-01 - print warning if no input file is defined.
0.42 2022-08-28 - added -V|--version
0.41 2022-03-08 - fix for empty idx files
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 2022-09-20 19:53:50 UTC (rev 64452)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex 2022-09-20 19:54:23 UTC (rev 64453)
@@ -41,7 +41,7 @@
\usepackage{xltabular}
\usepackage{hvlogos} % for Wikipedia W
\usepackage{listings}
-\usepackage{hvextern} % for Wikipedia W
+\usepackage{hvextern}
\lstset{basicstyle=\ttfamily\small,language=[LaTeX]TeX}
\usepackage{ragged2e}
\usepackage{makeidx}\makeindex
@@ -81,7 +81,7 @@
\def\setVersion#1{\setVVersion#1!!}
\def\setVVersion#1=#2!!{\def\xIndexVersion{#2}}
-\setVersion{version = 0.43}% can be automatically changed by perl
+\setVersion{version = 0.45}% can be automatically changed by perl
\setkeys{hv}{cleanup=true,force=true}
@@ -822,8 +822,9 @@
runs=2,code,docType=latex,
showFilename,
align=\centering,
- lstOptions={columns=fixed}]{xindex}
-%! lualatex --shell-escape
+ lstOptions={columns=fixed}
+]{xindex}
+%%! lualatex --shell-escape
\documentclass{scrartcl}
\usepackage{libertinus-otf}
\makeatletter
Modified: trunk/Master/texmf-dist/scripts/xindex/xindex.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/xindex/xindex.lua 2022-09-20 19:53:50 UTC (rev 64452)
+++ trunk/Master/texmf-dist/scripts/xindex/xindex.lua 2022-09-20 19:54:23 UTC (rev 64453)
@@ -10,7 +10,7 @@
-----------------------------------------------------------------------
xindex = xindex or { }
- local version = 0.43
+ local version = 0.45
xindex.version = version
--xindex.self = "xindex"
@@ -69,6 +69,7 @@
if args.version then
print("xindex version "..xindex.version)
+ os.exit()
end
vlevel = not args.v[1] and 0 or #args.v
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua 2022-09-20 19:53:50 UTC (rev 64452)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua 2022-09-20 19:54:23 UTC (rev 64453)
@@ -17,7 +17,7 @@
}
itemPageDelimiter = "," -- Hello, 14
-compressPages = true -- something like 12--15, instaead of 12,13,14,15. the |( ... |) syntax is still valid
+compressPages = true -- something like 12--15, instead of 12,13,14,15. the |( ... |) syntax is still valid
fCompress = true -- 3f -> page 3, 4 and 3ff -> page 3, 4, 5
minCompress = 3 -- 14--17 or
numericPage = true -- for non numerical pagenumbers, like "VI-17"
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua 2022-09-20 19:53:50 UTC (rev 64452)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua 2022-09-20 19:54:23 UTC (rev 64453)
@@ -11,7 +11,7 @@
-- configuration for index files of the Heidelberger Akademie der Wissenschaften
if not modules then modules = { } end modules ['xindex-HAdW-eKO'] = {
- version = 0.41,
+ version = 0.45,
comment = "configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
@@ -21,7 +21,7 @@
--local version = "0.01"
itemPageDelimiter = " \\dotfill " -- Hello ..... 14
-compressPages = true -- something like 12--15, instaead of 12,13,14,15. the |( ... |) syntax is still valid
+compressPages = true -- something like 12--15, instead of 12,13,14,15. the |( ... |) syntax is still valid
fCompress = true -- 3f -> page 3, 4 and 3ff -> page 3, 4, 5
minCompress = 3 -- 14--17 or
numericPage = false -- for non numerical pagenumbers, like "VI-17"
@@ -232,7 +232,7 @@
end
function SORTprehook(data) -- replace roman with algebraic, eg Karl IX -> Karl // 9//
--- \indexentry{Karl!V., Kaiser}{VI/1-284} must also be catched
+-- \indexentry{Karl!V., Kaiser}{VI/1-284} must also be caught
-- writeLog(1,require 'xindex-pretty'.dump(data),0) -- only for internal dump
local entry
local elements = {}
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua 2022-09-20 19:53:50 UTC (rev 64452)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua 2022-09-20 19:54:23 UTC (rev 64453)
@@ -8,7 +8,7 @@
-- $Id: xindex-base.lua 22 2022-02-07 12:18:15Z hvoss $
-----------------------------------------------------------------------
-local info = { version = 0.41 }
+local info = { version = 0.45 }
-- check config
if pageNoPrefixDel ~= "" then
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua 2022-09-20 19:53:50 UTC (rev 64452)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua 2022-09-20 19:54:23 UTC (rev 64453)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-baselib'] = {
- version = 0.41,
+ version = 0.45,
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 2022-09-20 19:53:50 UTC (rev 64452)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua 2022-09-20 19:54:23 UTC (rev 64453)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg-common'] = {
- version = 0.41,
+ version = 0.45,
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 2022-09-20 19:53:50 UTC (rev 64452)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua 2022-09-20 19:54:23 UTC (rev 64453)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg-lua'] = {
- version = 0.41,
+ version = 0.45,
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 2022-09-20 19:53:50 UTC (rev 64452)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua 2022-09-20 19:54:23 UTC (rev 64453)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg'] = {
- version = 0.41,
+ version = 0.45,
comment = "main configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-danteedition.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-danteedition.lua 2022-09-20 19:53:50 UTC (rev 64452)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-danteedition.lua 2022-09-20 19:54:23 UTC (rev 64453)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg'] = {
- version = 0.41,
+ version = 0.45,
comment = "configuration file for the DANTE Edition",
author = "Herbert Voss",
copyright = "Herbert Voss",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua 2022-09-20 19:53:50 UTC (rev 64452)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua 2022-09-20 19:54:23 UTC (rev 64453)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg'] = {
- version = 0.41,
+ version = 0.45,
comment = "DTK configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
@@ -17,11 +17,11 @@
}
itemPageDelimiter = "" -- Hello, 14
-compressPages = true -- something like 12--15, instaead of 12,13,14,15. the |( ... |) syntax is still valid
+compressPages = true -- something like 12--15, instead of 12,13,14,15. the |( ... |) syntax is still valid
fCompress = true -- 3f -> page 3, 4 and 3ff -> page 3, 4, 5
minCompress = 3 -- 14--17 or
numericPage = true -- for non numerical pagenumbers, like "VI-17"
-sublabels = {"","","",""} -- for the sub(sub(sub-items
+sublabels = {"-","--","---",""} -- for the sub(sub(sub-items
pageNoPrefixDel = "" -- a delimiter for page numbers like "VI-17" -- not used !!!
rangeSymbol = "--"
indexOpening = "" --[[\providecommand*\lettergroupDefault[1]{}
@@ -149,9 +149,9 @@
local currentItems = {}
local Entry = v["Entry"]
local name = getItem(Entry,0)
- local adress = getItem(Entry,1)
+ local address = getItem(Entry,1)
outFile:write(" \\item "..name..itemPageDelimiter.."\n")
- str = " \\subitem "..itemPageDelimiter.." "..adress..getPageList(v,hyperpage).."\n"
+ str = " \\subitem "..itemPageDelimiter.." "..address..getPageList(v,hyperpage).."\n"
for i, str0 in ipairs(escape_chars) do -- undo the escape char setting
str = str:gsub(str0[2],str0[3])
end
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua 2022-09-20 19:53:50 UTC (rev 64452)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua 2022-09-20 19:54:23 UTC (rev 64453)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-lib'] = {
- version = 0.41,
+ version = 0.45,
comment = "main library to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
@@ -542,6 +542,7 @@
a["SortKey"] = A
end
end
+ -- print(a["SortKey"])
-- return A
end
@@ -831,6 +832,7 @@
end
local SortStringCache = {}
+
function getSortString(Entry)
local sortString = SortStringCache[Entry]
if sortString ~= nil then
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua 2022-09-20 19:53:50 UTC (rev 64452)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua 2022-09-20 19:54:23 UTC (rev 64453)
@@ -10,7 +10,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-no'] = {
- version = 0.41,
+ version = 0.45,
comment = "configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
@@ -19,7 +19,7 @@
itemPageDelimiter = "," -- Hello, 14
-compressPages = true -- something like 12--15, instaead of 12,13,14,15. the |( ... |) syntax is still valid
+compressPages = true -- something like 12--15, instead of 12,13,14,15. the |( ... |) syntax is still valid
fCompress = false -- 3f -> page 3, 4 and 3ff -> page 3, 4, 5
minCompress = 2 -- 14--17 or
rangeSymbol = "-" -- 14-17 instead of --
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua 2022-09-20 19:53:50 UTC (rev 64452)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua 2022-09-20 19:54:23 UTC (rev 64453)
@@ -7,7 +7,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-pretty'] = {
- version = 0.41,
+ version = 0.45,
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 2022-09-20 19:53:50 UTC (rev 64452)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua 2022-09-20 19:54:23 UTC (rev 64453)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-yannis'] = {
- version = 0.41,
+ version = 0.45,
comment = "main configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
@@ -17,7 +17,7 @@
}
itemPageDelimiter = "," -- Hello, 14
-compressPages = true -- something like 12--15, instaead of 12,13,14,15. the |( ... |) syntax is still valid
+compressPages = true -- something like 12--15, instead of 12,13,14,15. the |( ... |) syntax is still valid
fCompress = false -- 3f -> page 3, 4 and 3ff -> page 3, 4, 5
minCompress = 2 -- 14--17 or
rangeSymbol = "-" -- 14-17 instead of --
More information about the tex-live-commits
mailing list.