diff options
author | Karl Berry <karl@freefriends.org> | 2022-09-20 19:54:23 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-09-20 19:54:23 +0000 |
commit | 93afd31b3d1a970cd5f584038bc1a3224432f41a (patch) | |
tree | bc930371533944d270ca8b5a62882492079849b2 /Master/texmf-dist/tex/lualatex | |
parent | b0e5e5f9f570ed7bfd34211190a0fc88628b824c (diff) |
xindex (20sep22)
git-svn-id: svn://tug.org/texlive/trunk@64453 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/lualatex')
13 files changed, 23 insertions, 21 deletions
diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua index a619a749690..5d9bd56dc85 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/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/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua index a7c679773e2..8f31687b8e6 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/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/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua index ac8a61b676c..a7bd4169348 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/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/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua index e4cde07be90..bc2c49a59cf 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/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/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua index 159dece9ec2..23f70745a06 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/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/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua index d78ca129ecd..96e7792bd90 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/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/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua index df11e062b9e..520eb6ca8fd 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/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/Master/texmf-dist/tex/lualatex/xindex/xindex-danteedition.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-danteedition.lua index 3be7ad294f3..e720cfe4a6f 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-danteedition.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/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/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua index 2589220bece..347edad8338 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/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/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua index 8f0dca9a8e7..67fc733488b 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/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/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua index 0c65707888e..aaf4f212bba 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/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/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua index 95e3a241701..9f097f62858 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/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/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua index 335e0a57ddd..e7dac7eba5d 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/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 -- |