texlive[51340] trunk: xindex (7jun19)
commits+karl at tug.org
commits+karl at tug.org
Fri Jun 7 23:07:10 CEST 2019
Revision: 51340
http://tug.org/svn/texlive?view=revision&revision=51340
Author: karl
Date: 2019-06-07 23:07:10 +0200 (Fri, 07 Jun 2019)
Log Message:
-----------
xindex (7jun19)
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/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-cfg-common.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-pretty.lua
Modified: trunk/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua 2019-06-07 21:06:52 UTC (rev 51339)
+++ trunk/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua 2019-06-07 21:07:10 UTC (rev 51340)
@@ -8,7 +8,7 @@
-----------------------------------------------------------------------
xindex = xindex or { }
- local version = 0.12
+ local version = 0.13
xindex.version = version
--xindex.self = "xindex"
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG 2019-06-07 21:06:52 UTC (rev 51339)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG 2019-06-07 21:07:10 UTC (rev 51340)
@@ -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
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/xindex/README.md 2019-06-07 21:06:52 UTC (rev 51339)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/README.md 2019-06-07 21:07:10 UTC (rev 51340)
@@ -17,15 +17,16 @@
xindex [options] <inputfile>[.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)
<input> (string)
Testfiles:
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 2019-06-07 21:06:52 UTC (rev 51339)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex 2019-06-07 21:07:10 UTC (rev 51340)
@@ -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 at tug.org}}
@@ -152,6 +152,7 @@
[-n,--noheadings ] default is false
[-o,--output ] default is <input>.ind
[-l,--language ] default is en
+ [-p,--prefix] default L
<input file>
\end{verbatim}
@@ -810,6 +811,7 @@
-- 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 @@
\begin{filecontents*}{\jobname.idx}
\indexentry{VoßHerbert at Herbert Voß!Wasgenstraße 121\protect \\10127 Potsdam\protect \\\Email {herbert"@xyz.de}}{3}
\indexentry{SeversMartin at Martin Severs!siehe Seite~\protect \pageref {president}}{4}
-\indexentry{VoßHerbert at Herbert Voß!Wasgenstraße 121\protect \\10127 Potsdam\protect \\\Email {herbert"@xyz.de}}{5}
-\indexentry{ZiegendatenUwe at Uwe Ziegendaten!Lokostr. 19 \protect \\ 20713 Kalln \protect \\\Email {ziegendaten"@mail.com}}{9}
-\indexentry{BährendtsenDoris at Doris Baehrendtsen!\Email {dori"@xyz.de}}{14}
+\indexentry{VoßHerbert at Herbert Voß!Wasgensteig 12\protect \\10127 Potsdam\protect \\\Email {herbert"@xyz.de}}{5}
+\indexentry{ZiegendatenMichael at Michael Ziegendaten!Lokostr. 19 \protect \\ 20713 Kalln \protect \\\Email {ziegendaten"@mail.com}}{9}
+\indexentry{BährendtsenElke at Elke Baehrendtsen!\Email {dori"@xyz.de}}{14}
\indexentry{JacekJonasson Jared at Jonasson Jared Jazek!\Email {mail"@jones.net}}{20}
-\indexentry{KoomerMarkus at Martin Koomer!Freiherr-von-Stein-Weg~16\protect \\ 15525~Erdingen-Neckar\protect \\ \Email {kooma"@xyz.info}}{24}
-\indexentry{KoomerMarkus at Martin Koomer!Freiherr-von-Stein-Weg~16\protect \\ 15525~Erdingen-Neckar\protect \\ \Email {kooma"@xyz.info}}{31}
+\indexentry{KoomerMartin at Martin Koomer!Freiherr-von-Stein-Weg~16\protect \\ 15525~Erdingen-Neckar\protect \\ \Email {kooma"@xyz.info}}{24}
+\indexentry{KoomerMartin at Martin Koomer!Freiherr-von-Stein-Weg~16\protect \\ 15525~Erdingen-Neckar\protect \\ \Email {kooma"@xyz.info}}{31}
\indexentry{SchusterEike at Eike Schuster!Haussteig~15\protect \\ 36396~Stuttens\protect \\ \Email {elke.schuster"@kabelxyz.de}}{40}
-\indexentry{FanntJürgen at Jürgen Fannt!Friedrichallee 74\protect \\13233 Neu-Isenburg\protect \\\Email {juergen.fannt"@gmxnet.de}}{48}
+\indexentry{FanntHorst at 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 @@
%StopVisiblePreamble
\pagestyle{empty}
\begin{document}
-\mbox{}\printindex
+\mbox{}\ref{president}
+\printindex
\end{document}
\end{externalDocument}
Modified: trunk/Master/texmf-dist/scripts/xindex/xindex.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/xindex/xindex.lua 2019-06-07 21:06:52 UTC (rev 51339)
+++ trunk/Master/texmf-dist/scripts/xindex/xindex.lua 2019-06-07 21:07:10 UTC (rev 51340)
@@ -8,7 +8,7 @@
-----------------------------------------------------------------------
xindex = xindex or { }
- local version = 0.12
+ local version = 0.13
xindex.version = version
--xindex.self = "xindex"
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua 2019-06-07 21:06:52 UTC (rev 51339)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua 2019-06-07 21:07:10 UTC (rev 51340)
@@ -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",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua 2019-06-07 21:06:52 UTC (rev 51339)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua 2019-06-07 21:07:10 UTC (rev 51340)
@@ -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",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua 2019-06-07 21:06:52 UTC (rev 51339)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua 2019-06-07 21:07:10 UTC (rev 51340)
@@ -6,7 +6,7 @@
-- LICENSE: LPPL1.3
-----------------------------------------------------------------------
-local info = { version = 0.12 }
+local info = { version = 0.13 }
-- check config
if pageNoPrefixDel ~= "" then
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua 2019-06-07 21:06:52 UTC (rev 51339)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua 2019-06-07 21:07:10 UTC (rev 51340)
@@ -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",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua 2019-06-07 21:06:52 UTC (rev 51339)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua 2019-06-07 21:07:10 UTC (rev 51340)
@@ -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",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua 2019-06-07 21:06:52 UTC (rev 51339)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua 2019-06-07 21:07:10 UTC (rev 51340)
@@ -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",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua 2019-06-07 21:06:52 UTC (rev 51339)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua 2019-06-07 21:07:10 UTC (rev 51340)
@@ -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",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua 2019-06-07 21:06:52 UTC (rev 51339)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua 2019-06-07 21:07:10 UTC (rev 51340)
@@ -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 @@
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 @@
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
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua 2019-06-07 21:06:52 UTC (rev 51339)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua 2019-06-07 21:07:10 UTC (rev 51340)
@@ -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",
More information about the tex-live-commits
mailing list