texlive[72605] trunk: xindex (20oct24)
commits+karl at tug.org
commits+karl at tug.org
Sun Oct 20 22:22:32 CEST 2024
Revision: 72605
https://tug.org/svn/texlive?view=revision&revision=72605
Author: karl
Date: 2024-10-20 22:22:32 +0200 (Sun, 20 Oct 2024)
Log Message:
-----------
xindex (20oct24)
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-AU.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-RU.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-no_uca.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.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 2024-10-20 20:22:19 UTC (rev 72604)
+++ trunk/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua 2024-10-20 20:22:32 UTC (rev 72605)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
xindex = xindex or { }
- local version = 0.61
+ local version = 0.62
xindex.version = version
--xindex.self = "xindex"
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG 2024-10-20 20:22:19 UTC (rev 72604)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG 2024-10-20 20:22:32 UTC (rev 72605)
@@ -1,3 +1,4 @@
+0.62 2024-10-19 - fix for page intervall, eg. |(9-9|)->9
0.61 2024-09-22 - fix for hyperref with \see and \seealso
0.60 2024-05-16 - more fixes for UCA as default mode
0.59 2024-05-13 - removed the xindex-cfg.lua
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 2024-10-20 20:22:19 UTC (rev 72604)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex 2024-10-20 20:22:32 UTC (rev 72605)
@@ -81,7 +81,7 @@
\def\setVersion#1{\setVVersion#1!!}
\def\setVVersion#1=#2!!{\def\xIndexVersion{#2}}
-\setVersion{version = 0.61}% can be automatically changed by perl
+\setVersion{version = 0.62}% can be automatically changed by perl
Modified: trunk/Master/texmf-dist/scripts/xindex/xindex.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/xindex/xindex.lua 2024-10-20 20:22:19 UTC (rev 72604)
+++ trunk/Master/texmf-dist/scripts/xindex/xindex.lua 2024-10-20 20:22:32 UTC (rev 72605)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
xindex = xindex or { }
- local version = 0.61
+ local version = 0.62
xindex.version = version
--xindex.self = "xindex"
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-AU.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-AU.lua 2024-10-20 20:22:19 UTC (rev 72604)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-AU.lua 2024-10-20 20:22:32 UTC (rev 72605)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-AU'] = {
- version = 0.61,
+ version = 0.62,
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 2024-10-20 20:22:19 UTC (rev 72604)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua 2024-10-20 20:22:32 UTC (rev 72605)
@@ -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.61,
+ version = 0.62,
comment = "configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-RU.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-RU.lua 2024-10-20 20:22:19 UTC (rev 72604)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-RU.lua 2024-10-20 20:22:32 UTC (rev 72605)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-RU'] = {
- version = 0.61,
+ version = 0.62,
comment = "configuration to xindex.lua",
author = "Alexey Kuznetzov",
copyright = "Herbert Voß",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua 2024-10-20 20:22:19 UTC (rev 72604)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua 2024-10-20 20:22:32 UTC (rev 72605)
@@ -8,7 +8,7 @@
-- $Id: xindex-base.lua 22 2022-02-07 12:18:15Z hvoss $
-----------------------------------------------------------------------
-local info = { version = 0.61 }
+local info = { version = 0.62 }
-- 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 2024-10-20 20:22:19 UTC (rev 72604)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-baselib.lua 2024-10-20 20:22:32 UTC (rev 72605)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-baselib'] = {
- version = 0.61,
+ version = 0.62,
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 2024-10-20 20:22:19 UTC (rev 72604)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua 2024-10-20 20:22:32 UTC (rev 72605)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg-common'] = {
- version = 0.61,
+ version = 0.62,
comment = "configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-no_uca.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-no_uca.lua 2024-10-20 20:22:19 UTC (rev 72604)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-no_uca.lua 2024-10-20 20:22:32 UTC (rev 72605)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg'] = {
- version = 0.61,
+ version = 0.62,
comment = "main 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 2024-10-20 20:22:19 UTC (rev 72604)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua 2024-10-20 20:22:32 UTC (rev 72605)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg-lua'] = {
- version = 0.61,
+ version = 0.62,
comment = "configuration to xindex-cfg-uca.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 2024-10-20 20:22:19 UTC (rev 72604)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-danteedition.lua 2024-10-20 20:22:32 UTC (rev 72605)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg'] = {
- version = 0.61,
+ version = 0.62,
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 2024-10-20 20:22:19 UTC (rev 72604)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua 2024-10-20 20:22:32 UTC (rev 72605)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg'] = {
- version = 0.61,
+ version = 0.62,
comment = "DTK configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua 2024-10-20 20:22:19 UTC (rev 72604)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua 2024-10-20 20:22:32 UTC (rev 72605)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-lib'] = {
- version = 0.61,
+ version = 0.62,
comment = "main library to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
@@ -238,12 +238,22 @@
firstPage = v["pages"][1]["number"]
elseif paraClose then
lastPage = v["pages"][1]["number"]
- newEntries[#newEntries+1] = { Entry = v["Entry"],
- pages = {{ number = firstPage..rangeSymbol..lastPage,
+ if (firstPage == 0) or (firstPage == lastPage) then
+ newEntries[#newEntries+1] = { Entry = v["Entry"],
+ pages = {{ number = lastPage,
special = deleteOpenClose(v["pages"][1]["special"])}},
sortChar= v["sortChar"],
Macro = v["Macro"]
}
+ else
+ newEntries[#newEntries+1] = { Entry = v["Entry"],
+ pages = {{ number = firstPage..rangeSymbol..lastPage,
+ special = deleteOpenClose(v["pages"][1]["special"])}},
+ sortChar= v["sortChar"],
+ Macro = v["Macro"]
+ }
+ end
+ print("firstPage = "..firstPage)
firstPage = 0
elseif ((firstPage == 0) and not paraClose) then
newEntries[#newEntries+1] = v -- same Entry with greater page or new entry
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua 2024-10-20 20:22:19 UTC (rev 72604)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua 2024-10-20 20:22:32 UTC (rev 72605)
@@ -10,7 +10,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-no'] = {
- version = 0.61,
+ version = 0.62,
comment = "configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua 2024-10-20 20:22:19 UTC (rev 72604)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua 2024-10-20 20:22:32 UTC (rev 72605)
@@ -7,7 +7,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-pretty'] = {
- version = 0.61,
+ version = 0.62,
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 2024-10-20 20:22:19 UTC (rev 72604)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua 2024-10-20 20:22:32 UTC (rev 72605)
@@ -9,7 +9,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-yannis'] = {
- version = 0.61,
+ version = 0.62,
comment = "main configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
More information about the tex-live-commits
mailing list.