texlive[56237] trunk: xindex (1sep20)

commits+karl at tug.org commits+karl at tug.org
Tue Sep 1 23:35:17 CEST 2020


Revision: 56237
          http://tug.org/svn/texlive?view=revision&revision=56237
Author:   karl
Date:     2020-09-01 23:35:17 +0200 (Tue, 01 Sep 2020)
Log Message:
-----------
xindex (1sep20)

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-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-uca.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-norsk.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	2020-09-01 21:34:50 UTC (rev 56236)
+++ trunk/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua	2020-09-01 21:35:17 UTC (rev 56237)
@@ -8,7 +8,7 @@
 -----------------------------------------------------------------------
 
         xindex = xindex or { }
- local version = 0.26
+ local version = 0.27
 xindex.version = version
 --xindex.self = "xindex"
 

Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG	2020-09-01 21:34:50 UTC (rev 56236)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG	2020-09-01 21:35:17 UTC (rev 56237)
@@ -1,4 +1,5 @@
 0.26  2020-07-14 - fix for quote as escape char
+0.27  2020-09-01 - fix for identical subentries
 0.25  2020-06-11 - fix for correct hyperpage setting for |see{foo}
 0.24  2020-06-07 - fix for correct hyperpage setting with folium pages
 0.23  2020-06-02 - added support for the package LUA-UCA (Unicode Collation Algorithm)

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	2020-09-01 21:34:50 UTC (rev 56236)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex	2020-09-01 21:35:17 UTC (rev 56237)
@@ -80,7 +80,7 @@
 \def\setVersion#1{\setVVersion#1!!}
 \def\setVVersion#1=#2!!{\def\xIndexVersion{#2}} 
 
-\setVersion{version = 0.26}%  can be automatically changed by perl
+\setVersion{version = 0.27}%  can be automatically changed by perl
 
 \setkeys{dtk}{cleanup=true,force=false}
 
@@ -100,6 +100,7 @@
 Michal Hoftich;
 Heiko Oberdiek;
 Matteo Paolini;
+Martin Sievers;
 Simon Spiegel
 
 \clearpage

Modified: trunk/Master/texmf-dist/scripts/xindex/xindex.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/xindex/xindex.lua	2020-09-01 21:34:50 UTC (rev 56236)
+++ trunk/Master/texmf-dist/scripts/xindex/xindex.lua	2020-09-01 21:35:17 UTC (rev 56237)
@@ -8,7 +8,7 @@
 -----------------------------------------------------------------------
 
         xindex = xindex or { }
- local version = 0.26
+ local version = 0.27
 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	2020-09-01 21:34:50 UTC (rev 56236)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua	2020-09-01 21:35:17 UTC (rev 56237)
@@ -7,7 +7,7 @@
 -----------------------------------------------------------------------
 
 if not modules then modules = { } end modules ['xindex-cfg'] = {
-      version = 0.26,
+      version = 0.27,
       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	2020-09-01 21:34:50 UTC (rev 56236)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua	2020-09-01 21:35:17 UTC (rev 56237)
@@ -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.26,
+      version = 0.27,
       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	2020-09-01 21:34:50 UTC (rev 56236)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua	2020-09-01 21:35:17 UTC (rev 56237)
@@ -6,7 +6,7 @@
 --      LICENSE:  LPPL1.3
 -----------------------------------------------------------------------
 
-local info = { version = 0.26 } 
+local info = { version = 0.27 } 
 
 -- 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	2020-09-01 21:34:50 UTC (rev 56236)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua	2020-09-01 21:35:17 UTC (rev 56237)
@@ -7,7 +7,7 @@
 -----------------------------------------------------------------------
 
 if not modules then modules = { } end modules ['xindex-cfg-common'] = {
-      version = 0.26,
+      version = 0.27,
       comment = "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	2020-09-01 21:34:50 UTC (rev 56236)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua	2020-09-01 21:35:17 UTC (rev 56237)
@@ -7,7 +7,7 @@
 -----------------------------------------------------------------------
 
 if not modules then modules = { } end modules ['xindex-cfg-lua'] = {
-      version = 0.26,
+      version = 0.27,
       comment = "configuration to xindex-cfg-uca.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	2020-09-01 21:34:50 UTC (rev 56236)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua	2020-09-01 21:35:17 UTC (rev 56237)
@@ -7,7 +7,7 @@
 -----------------------------------------------------------------------
 
 if not modules then modules = { } end modules ['xindex-cfg'] = {
-      version = 0.26,
+      version = 0.27,
       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	2020-09-01 21:34:50 UTC (rev 56236)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua	2020-09-01 21:35:17 UTC (rev 56237)
@@ -7,7 +7,7 @@
 -----------------------------------------------------------------------
 
 if not modules then modules = { } end modules ['xindex-cfg'] = {
-      version = 0.26,
+      version = 0.27,
       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	2020-09-01 21:34:50 UTC (rev 56236)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua	2020-09-01 21:35:17 UTC (rev 56237)
@@ -28,7 +28,7 @@
 --~ n       2
 --------------------------------
 if not modules then modules = { } end modules ['xindex-lapp'] = {
-      version = 0.26,
+      version = 0.27,
       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	2020-09-01 21:34:50 UTC (rev 56236)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua	2020-09-01 21:35:17 UTC (rev 56237)
@@ -7,7 +7,7 @@
 -----------------------------------------------------------------------
 
 if not modules then modules = { } end modules ['xindex-lib'] = {
-      version = 0.26,
+      version = 0.27,
       comment = "main library  to xindex.lua",
        author = "Herbert Voss",
     copyright = "Herbert Voss",
@@ -865,8 +865,8 @@
     for i = 1,excl+1 do
       currentItems[i] = getItem(Entry,i-1)  -- 0 ! 1 ! 2 ! ...
       local item = "item"
+      writeLog(1,"itemOutput: currentItems[i]: "..tostring(currentItems[i]).."~= lastItems[i]: "..tostring(lastItems[i]).."\n",2)
       if (currentItems[i] ~= lastItems[i]) then
-        writeLog(1,"itemOutput: currentItems[i]: "..tostring(currentItems[i]).."~= lastItems[i]: "..tostring(lastItems[i]).."\n",2)
         local space = "  "
         for j = 2,i do 
           item = "sub"..item   -- get the sub...subitem
@@ -878,14 +878,16 @@
           str = space.."\\"..item.." "..sublabels[i]..currentItems[i].."\n"
         else
           str = space.."\\"..item.." "..sublabels[i]..currentItems[i]..itemPageDelimiter.." "..getPageList(v,hyperpage).."\n"
+--        set current (sub...)item to empty
+          currentItems[i] = ""
         end  
         for i, str0 in ipairs(escape_chars) do       -- undo the escape char setting
           str = string.gsub(str,str0[2],str0[3])
         end
         outFile:write(str); indLines=indLines+1
-        lastItems[i] = currentItems[i]
       else
         writeLog(1,"itemOutput: currentItems[i]: "..currentItems[i].."= lastItems[i]: "..lastItems[i].."\n",2)
+        lastItems[i] = currentItems[i]
       end
     end
   end

Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua	2020-09-01 21:34:50 UTC (rev 56236)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua	2020-09-01 21:35:17 UTC (rev 56237)
@@ -8,7 +8,7 @@
 -----------------------------------------------------------------------
 
 if not modules then modules = { } end modules ['xindex-no'] = {
-      version = 0.26,
+      version = 0.27,
       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	2020-09-01 21:34:50 UTC (rev 56236)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua	2020-09-01 21:35:17 UTC (rev 56237)
@@ -5,7 +5,7 @@
 --
 
 if not modules then modules = { } end modules ['xindex-pretty'] = {
-      version = 0.26,
+      version = 0.27,
       comment = "dump a Lua table for debugging",
        author = "Steve Donovan",
     copyright = "Steve Donovan",



More information about the tex-live-commits mailing list.