summaryrefslogtreecommitdiff
path: root/indexing
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-09-21 03:01:15 +0000
committerNorbert Preining <norbert@preining.info>2022-09-21 03:01:15 +0000
commit447570beca76a6dfe5283e4793fd2bbabe73766b (patch)
treeefd46c488b2b54cc383cef86e0090bf23aabbe54 /indexing
parent7907f67d07d36a7e20421a1ec3a0eceecac4aacd (diff)
CTAN sync 202209210301
Diffstat (limited to 'indexing')
-rw-r--r--indexing/xindex/CHANGELOG2
-rw-r--r--indexing/xindex/doc/xindex-doc.pdfbin459729 -> 459721 bytes
-rw-r--r--indexing/xindex/doc/xindex-doc.tex9
-rw-r--r--indexing/xindex/lualatex/xindex-DIN2.lua2
-rw-r--r--indexing/xindex/lualatex/xindex-HAdW-eKO.lua6
-rw-r--r--indexing/xindex/lualatex/xindex-base.lua2
-rw-r--r--indexing/xindex/lualatex/xindex-baselib.lua2
-rw-r--r--indexing/xindex/lualatex/xindex-cfg-common.lua2
-rw-r--r--indexing/xindex/lualatex/xindex-cfg-uca.lua2
-rw-r--r--indexing/xindex/lualatex/xindex-cfg.lua2
-rw-r--r--indexing/xindex/lualatex/xindex-danteedition.lua2
-rw-r--r--indexing/xindex/lualatex/xindex-dtk.lua10
-rw-r--r--indexing/xindex/lualatex/xindex-lib.lua4
-rw-r--r--indexing/xindex/lualatex/xindex-norsk.lua4
-rw-r--r--indexing/xindex/lualatex/xindex-pretty.lua2
-rw-r--r--indexing/xindex/lualatex/xindex-yannis.lua4
-rwxr-xr-xindexing/xindex/scripts/xindex.lua3
17 files changed, 32 insertions, 26 deletions
diff --git a/indexing/xindex/CHANGELOG b/indexing/xindex/CHANGELOG
index 09d7a7d5fc..e60d4308cb 100644
--- a/indexing/xindex/CHANGELOG
+++ b/indexing/xindex/CHANGELOG
@@ -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
diff --git a/indexing/xindex/doc/xindex-doc.pdf b/indexing/xindex/doc/xindex-doc.pdf
index de46f830d5..243f01e3b5 100644
--- a/indexing/xindex/doc/xindex-doc.pdf
+++ b/indexing/xindex/doc/xindex-doc.pdf
Binary files differ
diff --git a/indexing/xindex/doc/xindex-doc.tex b/indexing/xindex/doc/xindex-doc.tex
index a290cadcc4..6567ab3f17 100644
--- a/indexing/xindex/doc/xindex-doc.tex
+++ b/indexing/xindex/doc/xindex-doc.tex
@@ -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 @@ the \verb|xindex-???| series because uppercase letters are sorted before lowerca
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
diff --git a/indexing/xindex/lualatex/xindex-DIN2.lua b/indexing/xindex/lualatex/xindex-DIN2.lua
index a619a74969..5d9bd56dc8 100644
--- a/indexing/xindex/lualatex/xindex-DIN2.lua
+++ b/indexing/xindex/lualatex/xindex-DIN2.lua
@@ -17,7 +17,7 @@ if not modules then modules = { } end modules ['xindex-DIN2'] = {
}
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"
diff --git a/indexing/xindex/lualatex/xindex-HAdW-eKO.lua b/indexing/xindex/lualatex/xindex-HAdW-eKO.lua
index a7c679773e..8f31687b8e 100644
--- a/indexing/xindex/lualatex/xindex-HAdW-eKO.lua
+++ b/indexing/xindex/lualatex/xindex-HAdW-eKO.lua
@@ -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 @@ if not modules then modules = { } end modules ['xindex-HAdW-eKO'] = {
--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 @@ function replaceRomanB(r)
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 = {}
diff --git a/indexing/xindex/lualatex/xindex-base.lua b/indexing/xindex/lualatex/xindex-base.lua
index ac8a61b676..a7bd416934 100644
--- a/indexing/xindex/lualatex/xindex-base.lua
+++ b/indexing/xindex/lualatex/xindex-base.lua
@@ -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
diff --git a/indexing/xindex/lualatex/xindex-baselib.lua b/indexing/xindex/lualatex/xindex-baselib.lua
index e4cde07be9..bc2c49a59c 100644
--- a/indexing/xindex/lualatex/xindex-baselib.lua
+++ b/indexing/xindex/lualatex/xindex-baselib.lua
@@ -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",
diff --git a/indexing/xindex/lualatex/xindex-cfg-common.lua b/indexing/xindex/lualatex/xindex-cfg-common.lua
index 159dece9ec..23f70745a0 100644
--- a/indexing/xindex/lualatex/xindex-cfg-common.lua
+++ b/indexing/xindex/lualatex/xindex-cfg-common.lua
@@ -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",
diff --git a/indexing/xindex/lualatex/xindex-cfg-uca.lua b/indexing/xindex/lualatex/xindex-cfg-uca.lua
index d78ca129ec..96e7792bd9 100644
--- a/indexing/xindex/lualatex/xindex-cfg-uca.lua
+++ b/indexing/xindex/lualatex/xindex-cfg-uca.lua
@@ -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",
diff --git a/indexing/xindex/lualatex/xindex-cfg.lua b/indexing/xindex/lualatex/xindex-cfg.lua
index df11e062b9..520eb6ca8f 100644
--- a/indexing/xindex/lualatex/xindex-cfg.lua
+++ b/indexing/xindex/lualatex/xindex-cfg.lua
@@ -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",
diff --git a/indexing/xindex/lualatex/xindex-danteedition.lua b/indexing/xindex/lualatex/xindex-danteedition.lua
index 3be7ad294f..e720cfe4a6 100644
--- a/indexing/xindex/lualatex/xindex-danteedition.lua
+++ b/indexing/xindex/lualatex/xindex-danteedition.lua
@@ -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",
diff --git a/indexing/xindex/lualatex/xindex-dtk.lua b/indexing/xindex/lualatex/xindex-dtk.lua
index 2589220bec..347edad833 100644
--- a/indexing/xindex/lualatex/xindex-dtk.lua
+++ b/indexing/xindex/lualatex/xindex-dtk.lua
@@ -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 @@ if not modules then modules = { } end modules ['xindex-cfg'] = {
}
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 @@ function specialItemOutput(last, v, hyperpage)
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
diff --git a/indexing/xindex/lualatex/xindex-lib.lua b/indexing/xindex/lualatex/xindex-lib.lua
index 8f0dca9a8e..67fc733488 100644
--- a/indexing/xindex/lualatex/xindex-lib.lua
+++ b/indexing/xindex/lualatex/xindex-lib.lua
@@ -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 @@ function GenerateSortKey(a)
a["SortKey"] = A
end
end
+ -- print(a["SortKey"])
-- return A
end
@@ -831,6 +832,7 @@ local match = function(expr)
end
local SortStringCache = {}
+
function getSortString(Entry)
local sortString = SortStringCache[Entry]
if sortString ~= nil then
diff --git a/indexing/xindex/lualatex/xindex-norsk.lua b/indexing/xindex/lualatex/xindex-norsk.lua
index 0c65707888..aaf4f212bb 100644
--- a/indexing/xindex/lualatex/xindex-norsk.lua
+++ b/indexing/xindex/lualatex/xindex-norsk.lua
@@ -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 @@ if not modules then modules = { } end modules ['xindex-no'] = {
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 --
diff --git a/indexing/xindex/lualatex/xindex-pretty.lua b/indexing/xindex/lualatex/xindex-pretty.lua
index 95e3a24170..9f097f6285 100644
--- a/indexing/xindex/lualatex/xindex-pretty.lua
+++ b/indexing/xindex/lualatex/xindex-pretty.lua
@@ -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",
diff --git a/indexing/xindex/lualatex/xindex-yannis.lua b/indexing/xindex/lualatex/xindex-yannis.lua
index 335e0a57dd..e7dac7eba5 100644
--- a/indexing/xindex/lualatex/xindex-yannis.lua
+++ b/indexing/xindex/lualatex/xindex-yannis.lua
@@ -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 @@ if not modules then modules = { } end modules ['xindex-yannis'] = {
}
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 --
diff --git a/indexing/xindex/scripts/xindex.lua b/indexing/xindex/scripts/xindex.lua
index b20996aabe..e335dfcc02 100755
--- a/indexing/xindex/scripts/xindex.lua
+++ b/indexing/xindex/scripts/xindex.lua
@@ -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 @@ local args = require ('xindex-lapp') [[
if args.version then
print("xindex version "..xindex.version)
+ os.exit()
end
vlevel = not args.v[1] and 0 or #args.v