From 7505e4e41b8f39a1b0869f6296bf66490f572a35 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 7 Jun 2019 21:07:10 +0000 Subject: xindex (7jun19) git-svn-id: svn://tug.org/texlive/trunk@51340 c570f23f-e606-0410-a88d-b1316a301751 --- .../texk/texlive/linked_scripts/xindex/xindex.lua | 2 +- Master/texmf-dist/doc/lualatex/xindex/CHANGELOG | 4 ++++ Master/texmf-dist/doc/lualatex/xindex/README.md | 5 +++-- .../texmf-dist/doc/lualatex/xindex/xindex-doc.pdf | Bin 358616 -> 359030 bytes .../texmf-dist/doc/lualatex/xindex/xindex-doc.tex | 19 +++++++++++-------- Master/texmf-dist/scripts/xindex/xindex.lua | 2 +- .../texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua | 2 +- .../tex/lualatex/xindex/xindex-HAdW-eKO.lua | 2 +- .../texmf-dist/tex/lualatex/xindex/xindex-base.lua | 2 +- .../tex/lualatex/xindex/xindex-cfg-common.lua | 2 +- .../texmf-dist/tex/lualatex/xindex/xindex-cfg.lua | 2 +- .../texmf-dist/tex/lualatex/xindex/xindex-dtk.lua | 2 +- .../texmf-dist/tex/lualatex/xindex/xindex-lapp.lua | 2 +- .../texmf-dist/tex/lualatex/xindex/xindex-lib.lua | 16 ++++++++++------ .../tex/lualatex/xindex/xindex-pretty.lua | 2 +- 15 files changed, 38 insertions(+), 26 deletions(-) diff --git a/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua b/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua index 3b195991621..74f4edaa21f 100755 --- a/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua +++ b/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua @@ -8,7 +8,7 @@ ----------------------------------------------------------------------- xindex = xindex or { } - local version = 0.12 + local version = 0.13 xindex.version = version --xindex.self = "xindex" diff --git a/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG b/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG index f40f2d532ca..ca08cd5a9ba 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG +++ b/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG @@ -1,3 +1,7 @@ +0.13 2019-06-07 - fix for minCompress < 2 +0.12 2019-06-05 - fix for fCompress=false + - added rangeSymbol to the config files +0.11 2019-04-10 - config script for Yannis 0.10 2019-04-07 - fix for case sensitive sorting 0.09 2019-03-25 - fix for HAdW config file 0.08 2019-03-06 - fix for config file HAdW diff --git a/Master/texmf-dist/doc/lualatex/xindex/README.md b/Master/texmf-dist/doc/lualatex/xindex/README.md index c4356291996..e47187276a6 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/README.md +++ b/Master/texmf-dist/doc/lualatex/xindex/README.md @@ -17,15 +17,16 @@ The syntax of `xindex` xindex [options] [.idx] possible options are (short,long): - -q,--quiet -h,--help - -v + -v... Verbosity level; can be -v, -vv, -vvv -c,--config (default cfg) -e,--escapechar (default ") -n,--noheadings + -a,--no_casesensitive -o,--output (default "") -l,--language (default en) + -p,--prefix (default L) (string) Testfiles: diff --git a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf index 45f4e12f916..84fcec9a5ed 100644 Binary files a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf and b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf differ diff --git a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex index 9bc834d1131..b7870604a7e 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex +++ b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex @@ -79,7 +79,7 @@ \def\setVersion#1{\setVVersion#1!!} \def\setVVersion#1=#2!!{\def\xIndexVersion{#2}} -\setVersion{version = 0.10}% can be autimatically changed by perl +\setVersion{version = 0.13}% can be autimatically changed by perl \title{Program and package \texttt{xindex} \\--\\ \normalsize \xIndexVersion\ (\today)} \author{Herbert Voß\thanks{hvoss@tug.org}} @@ -152,6 +152,7 @@ xindex [-n,--noheadings ] default is false [-o,--output ] default is .ind [-l,--language ] default is en + [-p,--prefix] default L \end{verbatim} @@ -810,6 +811,7 @@ compressPages = true -- something like 12--15, instaead 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 +rangeSymbol = "--" numericPage = true -- for non numerical pagenumbers, like "VI-17" sublabels = {"", "-\\-", "--\\-", "---\\-"} -- for the sub(sub(sub-items, first one is empty @@ -1004,14 +1006,14 @@ The following example runs \verb|xindex -c dtk -l de -n | \begin{filecontents*}{\jobname.idx} \indexentry{VoßHerbert@Herbert Voß!Wasgenstraße 121\protect \\10127 Potsdam\protect \\\Email {herbert"@xyz.de}}{3} \indexentry{SeversMartin@Martin Severs!siehe Seite~\protect \pageref {president}}{4} -\indexentry{VoßHerbert@Herbert Voß!Wasgenstraße 121\protect \\10127 Potsdam\protect \\\Email {herbert"@xyz.de}}{5} -\indexentry{ZiegendatenUwe@Uwe Ziegendaten!Lokostr. 19 \protect \\ 20713 Kalln \protect \\\Email {ziegendaten"@mail.com}}{9} -\indexentry{BährendtsenDoris@Doris Baehrendtsen!\Email {dori"@xyz.de}}{14} +\indexentry{VoßHerbert@Herbert Voß!Wasgensteig 12\protect \\10127 Potsdam\protect \\\Email {herbert"@xyz.de}}{5} +\indexentry{ZiegendatenMichael@Michael Ziegendaten!Lokostr. 19 \protect \\ 20713 Kalln \protect \\\Email {ziegendaten"@mail.com}}{9} +\indexentry{BährendtsenElke@Elke Baehrendtsen!\Email {dori"@xyz.de}}{14} \indexentry{JacekJonasson Jared@Jonasson Jared Jazek!\Email {mail"@jones.net}}{20} -\indexentry{KoomerMarkus@Martin Koomer!Freiherr-von-Stein-Weg~16\protect \\ 15525~Erdingen-Neckar\protect \\ \Email {kooma"@xyz.info}}{24} -\indexentry{KoomerMarkus@Martin Koomer!Freiherr-von-Stein-Weg~16\protect \\ 15525~Erdingen-Neckar\protect \\ \Email {kooma"@xyz.info}}{31} +\indexentry{KoomerMartin@Martin Koomer!Freiherr-von-Stein-Weg~16\protect \\ 15525~Erdingen-Neckar\protect \\ \Email {kooma"@xyz.info}}{24} +\indexentry{KoomerMartin@Martin Koomer!Freiherr-von-Stein-Weg~16\protect \\ 15525~Erdingen-Neckar\protect \\ \Email {kooma"@xyz.info}}{31} \indexentry{SchusterEike@Eike Schuster!Haussteig~15\protect \\ 36396~Stuttens\protect \\ \Email {elke.schuster"@kabelxyz.de}}{40} -\indexentry{FanntJürgen@Jürgen Fannt!Friedrichallee 74\protect \\13233 Neu-Isenburg\protect \\\Email {juergen.fannt"@gmxnet.de}}{48} +\indexentry{FanntHorst@Horst Fannt!Friedrichallee 74\protect \\13233 Neu-Isenburg\protect \\\Email {juergen.fannt"@gmxnet.de}}{48} \end{filecontents*} \documentclass{article} \usepackage{url} @@ -1049,7 +1051,8 @@ The following example runs \verb|xindex -c dtk -l de -n | %StopVisiblePreamble \pagestyle{empty} \begin{document} -\mbox{}\printindex +\mbox{}\ref{president} +\printindex \end{document} \end{externalDocument} diff --git a/Master/texmf-dist/scripts/xindex/xindex.lua b/Master/texmf-dist/scripts/xindex/xindex.lua index 3b195991621..74f4edaa21f 100755 --- a/Master/texmf-dist/scripts/xindex/xindex.lua +++ b/Master/texmf-dist/scripts/xindex/xindex.lua @@ -8,7 +8,7 @@ ----------------------------------------------------------------------- xindex = xindex or { } - local version = 0.12 + local version = 0.13 xindex.version = version --xindex.self = "xindex" diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua index d79c2cc8e2e..601b977f8eb 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua @@ -7,7 +7,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg'] = { - version = 0.12, + version = 0.13, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", 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 7e2b9cf7408..4601cccef59 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua @@ -9,7 +9,7 @@ -- configuration for index files of the Heidelberger Akademie der Wissenschaften if not modules then modules = { } end modules ['xindex-HAdW-eKO'] = { - version = 0.12, + version = 0.13, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua index 51b40cfb547..c2647f2df22 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua @@ -6,7 +6,7 @@ -- LICENSE: LPPL1.3 ----------------------------------------------------------------------- -local info = { version = 0.12 } +local info = { version = 0.13 } -- check config if pageNoPrefixDel ~= "" then 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 7f84d4e8670..d98adb6b926 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua @@ -7,7 +7,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg-common'] = { - version = 0.12, + version = 0.13, comment = "configuration to xindex.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 0670c1f4d39..a9e7213ddad 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua @@ -7,7 +7,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg'] = { - version = 0.12, + version = 0.13, comment = "main configuration to xindex.lua", 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 7b4f6b18c8a..cb38541fa27 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua @@ -7,7 +7,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg'] = { - version = 0.12, + version = 0.13, comment = "DTK configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua index 45c7fdec7dd..3912740ef78 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua @@ -28,7 +28,7 @@ --~ n 2 -------------------------------- if not modules then modules = { } end modules ['xindex-lapp'] = { - version = 0.12, + version = 0.13, comment = "read parameter for xindex.lua", author = "Steve Donovan", copyright = "Steve Donovan", diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua index a8227ce7cfb..b1cfaabcb59 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua @@ -7,7 +7,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-lib'] = { - version = 0.12, + version = 0.13, comment = "main library to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", @@ -370,10 +370,14 @@ function compressPageList(pages) -- called with (v["pages"]) end -- only one pageno if #pages == 2 then -- only two pages if tonumber(pages[1]["number"]) and tonumber(pages[2]["number"]) then - if fCompress and ((tonumber(pages[2]["number"]) - tonumber(pages[1]["number"])) == 1) and - (pages[1]["special"] == pages[2]["special"]) then - pages[1]["number"] = pages[1]["number"].."f" - pages[2] = nil + if ((tonumber(pages[2]["number"]) - tonumber(pages[1]["number"])) == 1) and (pages[1]["special"] == pages[2]["special"]) then + if fCompress then + pages[1]["number"] = pages[1]["number"]..page_folium[1] + pages[2] = nil + elseif minCompress == 1 then + pages[1]["number"] = pages[1]["number"]..rangeSymbol..pages[2]["number"] + pages[2] = nil + end -- elseif (pages[1]["number"] == pages[2]["number"]) and -- (pages[1]["special"] == pages[2]["special"]) then -- pages[2] = nil @@ -386,7 +390,7 @@ function compressPageList(pages) -- called with (v["pages"]) local startIndex local newPages = {} -- { pages[1], pages[2], ... } local series = {} -- { pages[1], pages[2], ... } - if tonumber(pages[1]["number"]) then -- if a number we start with seconf page + if tonumber(pages[1]["number"]) then -- if a number we start with second page newPages = {} series = {pages[1]} startIndex = 2 diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua index 3e252581fc7..569974ecfa8 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua @@ -5,7 +5,7 @@ -- if not modules then modules = { } end modules ['xindex-pretty'] = { - version = 0.12, + version = 0.13, comment = "dump a Lua table for debugging", author = "Steve Donovan", copyright = "Steve Donovan", -- cgit v1.2.3