texlive[59840] trunk: xindex (5jul21)

commits+karl at tug.org commits+karl at tug.org
Mon Jul 5 22:53:08 CEST 2021


Revision: 59840
          http://tug.org/svn/texlive?view=revision&revision=59840
Author:   karl
Date:     2021-07-05 22:53:08 +0200 (Mon, 05 Jul 2021)
Log Message:
-----------
xindex (5jul21)

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/Makefile
    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	2021-07-05 20:52:47 UTC (rev 59839)
+++ trunk/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua	2021-07-05 20:53:08 UTC (rev 59840)
@@ -8,7 +8,7 @@
 -----------------------------------------------------------------------
 
         xindex = xindex or { }
- local version = 0.28
+ local version = 0.29
 xindex.version = version
 --xindex.self = "xindex"
 

Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG	2021-07-05 20:52:47 UTC (rev 59839)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG	2021-07-05 20:53:08 UTC (rev 59840)
@@ -1,3 +1,6 @@
+0.29  2021-07-05 - don't use language specific names for the labels
+                 - use math.max()
+                 - check for language specific folium pages and not only "f", "ff"
 0.28  2020-09-08 - fix for new introduced bug
 0.27  2020-09-01 - fix for identical subentries
 0.26  2020-07-14 - fix for quote as escape char

Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/xindex/Makefile	2021-07-05 20:52:47 UTC (rev 59839)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/Makefile	2021-07-05 20:53:08 UTC (rev 59840)
@@ -23,7 +23,7 @@
 	xindex -a $(MAIN).idx
 #	bibtex $(MAIN)
 	$(LATEX) --shell-escape $(MAIN)
-#	$(LATEX) --shell-escape $(MAIN)
+	$(LATEX) --shell-escape $(MAIN)
 
 clean : 
 	$(RM) *.dvi *.aux *.log  *.xml xindex-?.tex xindex-??.tex *.ind *.idx *.toc *.out *.ilg

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	2021-07-05 20:52:47 UTC (rev 59839)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex	2021-07-05 20:53:08 UTC (rev 59840)
@@ -80,7 +80,7 @@
 \def\setVersion#1{\setVVersion#1!!}
 \def\setVVersion#1=#2!!{\def\xIndexVersion{#2}} 
 
-\setVersion{version = 0.28}%  can be automatically changed by perl
+\setVersion{version = 0.29}%  can be automatically changed by perl
 
 \setkeys{dtk}{cleanup=true,force=false}
 
@@ -217,6 +217,8 @@
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex
+%! xindex
 \documentclass{scrartcl}
 \makeatletter
 \def\theindex{%    only for demonstration
@@ -280,6 +282,7 @@
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex
 \documentclass{scrartcl}
 \makeatletter
 \def\theindex{%    only for demonstration
@@ -341,6 +344,7 @@
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex
 \documentclass{scrartcl}
 \makeatletter
 \def\theindex{%    only for demonstration
@@ -459,6 +463,7 @@
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex
 \documentclass[paper=a5]{scrartcl}
 \usepackage[ngerman]{babel}
 %StartVisiblePreamble
@@ -517,6 +522,7 @@
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex
 \documentclass[paper=a5]{scrartcl}
 \usepackage[ngerman]{babel}
 %StartVisiblePreamble
@@ -600,6 +606,7 @@
   align=\centering,
 %  usefancyvrb,
   lstOptions={fontfamily=helvetica}]{xindex}
+%! lualatex
 \documentclass[a5paper]{article}
 %StartVisiblePreamble
 \usepackage{fontspec}
@@ -654,6 +661,7 @@
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex
 \documentclass[paper=a6]{scrartcl}
 \makeatletter
 \def\theindex{%    only for demonstration
@@ -728,6 +736,7 @@
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex
 \documentclass{scrartcl}
 \makeatletter
 \def\theindex{%    only for demonstration
@@ -775,6 +784,7 @@
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex
 \documentclass[paper=a6]{scrartcl}
 \usepackage{multicol}
 \makeatletter
@@ -835,6 +845,7 @@
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex
 \documentclass{scrartcl}
 \makeatletter
 \def\theindex{%    only for demonstration
@@ -951,6 +962,7 @@
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex
 \RequirePackage{filecontents}
 \begin{filecontents*}{\jobname.idx}
 \indexentry{Aachen, Johannes von}{VII/1-215}
@@ -1072,6 +1084,7 @@
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex
 \RequirePackage{filecontents}
 \begin{filecontents*}{\jobname.idx}
 \indexentry{VoßHerbert at Herbert Voß!Wasgensteig 12\protect \\10127 Potsdam\protect \\\Email {herbert"@xyz.de}}{3}
@@ -1145,6 +1158,7 @@
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex
 \documentclass{article}
 \makeatletter
 \def\theindex{%    only for demonstration
@@ -1220,6 +1234,7 @@
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex --shell-escape
 \documentclass{scrartcl}
 \usepackage{libertinus-otf}
 %StartVisiblePreamble
@@ -1267,6 +1282,7 @@
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex
 \documentclass{scrartcl}
 \makeatletter
 \def\theindex{%    only for demonstration
@@ -1318,6 +1334,7 @@
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex
 \documentclass{scrartcl}
 \usepackage{filecontents}
 \begin{filecontents*}{xindex-header.lua}
@@ -1461,6 +1478,7 @@
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex --shell-escape
 \documentclass{scrartcl}
 \usepackage{libertinus-otf}
 \makeatletter
@@ -1515,6 +1533,7 @@
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex --shell-escape
 \documentclass{scrartcl}
 \usepackage{libertinus-otf}
 \makeatletter
@@ -1572,6 +1591,7 @@
   showFilename,
   align=\centering,
   lstOptions={columns=fixed}]{xindex}
+%! lualatex --shell-escape
 \documentclass{scrartcl}
 \usepackage{libertinus-otf}
 \makeatletter
@@ -1647,6 +1667,7 @@
   align=\centering,
   grfOptions={width=\linewidth},
   lstOptions={columns=fixed}]{xindex}
+%! lualatex --shell-escape
 \documentclass[paper=a5]{scrartcl}
 \usepackage{libertinus-otf}
 \let\NewPage\newpage% only for demo
@@ -1696,6 +1717,7 @@
   align=\centering,
   grfOptions={width=\linewidth},
   lstOptions={columns=fixed}]{xindex}
+%! lualatex --shell-escape
 \documentclass[paper=a5]{scrartcl}
 \usepackage{libertinus-otf}
 \let\NewPage\newpage% only for demo

Modified: trunk/Master/texmf-dist/scripts/xindex/xindex.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/xindex/xindex.lua	2021-07-05 20:52:47 UTC (rev 59839)
+++ trunk/Master/texmf-dist/scripts/xindex/xindex.lua	2021-07-05 20:53:08 UTC (rev 59840)
@@ -8,7 +8,7 @@
 -----------------------------------------------------------------------
 
         xindex = xindex or { }
- local version = 0.28
+ local version = 0.29
 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	2021-07-05 20:52:47 UTC (rev 59839)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua	2021-07-05 20:53:08 UTC (rev 59840)
@@ -7,7 +7,7 @@
 -----------------------------------------------------------------------
 
 if not modules then modules = { } end modules ['xindex-cfg'] = {
-      version = 0.28,
+      version = 0.29,
       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	2021-07-05 20:52:47 UTC (rev 59839)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua	2021-07-05 20:53:08 UTC (rev 59840)
@@ -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.28,
+      version = 0.29,
       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	2021-07-05 20:52:47 UTC (rev 59839)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua	2021-07-05 20:53:08 UTC (rev 59840)
@@ -6,7 +6,7 @@
 --      LICENSE:  LPPL1.3
 -----------------------------------------------------------------------
 
-local info = { version = 0.28 } 
+local info = { version = 0.29 } 
 
 -- check config
 if pageNoPrefixDel ~= "" then 
@@ -209,9 +209,11 @@
         if not no_headings then
           outFile:write("\\par"..idxnewletter.."{"..index_header[1].."}")
           if (labelPrefix == "") then
-            outFile:write("\\label{xindex-"..index_header[1].."}\n\\nopagebreak[4]\n")
+            outFile:write("\\label{xindex-symbols}\n\\nopagebreak[4]\n")
+--            outFile:write("\\label{xindex-"..index_header[1].."}\n\\nopagebreak[4]\n")
           else
-            outFile:write("\\label{"..labelPrefix.."-xindex-"..index_header[1].."}\n\\nopagebreak[4]\n")
+            outFile:write("\\label{"..labelPrefix.."-xindex-symbols}\n\\nopagebreak[4]\n")
+--            outFile:write("\\label{"..labelPrefix.."-xindex-"..index_header[1].."}\n\\nopagebreak[4]\n")
           end
         end
       end
@@ -231,9 +233,11 @@
         if not no_headings  then
           outFile:write(idxnewletter.."{"..index_header[2].."}")
           if (labelPrefix == "") then
-            outFile:write("\\label{xindex-"..index_header[2].."}\n\\nopagebreak[4]\n")
+            outFile:write("\\label{xindex-numbers}\n\\nopagebreak[4]\n")
+--            outFile:write("\\label{xindex-"..index_header[2].."}\n\\nopagebreak[4]\n")
           else
-            outFile:write("\\label{"..labelPrefix.."-xindex-"..index_header[2].."}\n\\nopagebreak[4]\n")
+            outFile:write("\\label{"..labelPrefix.."-xindex-numbers}\n\\nopagebreak[4]\n")
+--            outFile:write("\\label{"..labelPrefix.."-xindex-"..index_header[2].."}\n\\nopagebreak[4]\n")
           end
         end
       end

Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua	2021-07-05 20:52:47 UTC (rev 59839)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua	2021-07-05 20:53:08 UTC (rev 59840)
@@ -7,7 +7,7 @@
 -----------------------------------------------------------------------
 
 if not modules then modules = { } end modules ['xindex-cfg-common'] = {
-      version = 0.28,
+      version = 0.29,
       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	2021-07-05 20:52:47 UTC (rev 59839)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua	2021-07-05 20:53:08 UTC (rev 59840)
@@ -7,7 +7,7 @@
 -----------------------------------------------------------------------
 
 if not modules then modules = { } end modules ['xindex-cfg-lua'] = {
-      version = 0.28,
+      version = 0.29,
       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	2021-07-05 20:52:47 UTC (rev 59839)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua	2021-07-05 20:53:08 UTC (rev 59840)
@@ -7,7 +7,7 @@
 -----------------------------------------------------------------------
 
 if not modules then modules = { } end modules ['xindex-cfg'] = {
-      version = 0.28,
+      version = 0.29,
       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	2021-07-05 20:52:47 UTC (rev 59839)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua	2021-07-05 20:53:08 UTC (rev 59840)
@@ -7,7 +7,7 @@
 -----------------------------------------------------------------------
 
 if not modules then modules = { } end modules ['xindex-cfg'] = {
-      version = 0.28,
+      version = 0.29,
       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	2021-07-05 20:52:47 UTC (rev 59839)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua	2021-07-05 20:53:08 UTC (rev 59840)
@@ -28,7 +28,7 @@
 --~ n       2
 --------------------------------
 if not modules then modules = { } end modules ['xindex-lapp'] = {
-      version = 0.28,
+      version = 0.29,
       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	2021-07-05 20:52:47 UTC (rev 59839)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua	2021-07-05 20:53:08 UTC (rev 59840)
@@ -7,7 +7,7 @@
 -----------------------------------------------------------------------
 
 if not modules then modules = { } end modules ['xindex-lib'] = {
-      version = 0.28,
+      version = 0.29,
       comment = "main library  to xindex.lua",
        author = "Herbert Voss",
     copyright = "Herbert Voss",
@@ -621,11 +621,11 @@
   -- for hyperref: replace  \hyperpage{1\,ff} -> \hyperpage{1\nohyperpage{\,ff}}
   if not p then return p end
   local P = tostring(p)
-  if P:find("ff") then 
-    local str = P:gsub(page_folium[2],'').."\\nohyperpage{"..page_folium[2].."}"
+  if P:find(page_folium[2]) then 
+    local str = P:gsub(page_folium[2],'').."\\nohyperpage{"..page_folium[2].."}"  -- eg ff
     return str
-  elseif P:find("f") then 
-    local str = P:gsub(page_folium[1],'').."\\nohyperpage{"..page_folium[1].."}"
+  elseif P:find(page_folium[1]) then 
+    local str = P:gsub(page_folium[1],'').."\\nohyperpage{"..page_folium[1].."}"  -- eg f
     return str
   else 
     return P

Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua	2021-07-05 20:52:47 UTC (rev 59839)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua	2021-07-05 20:53:08 UTC (rev 59840)
@@ -8,7 +8,7 @@
 -----------------------------------------------------------------------
 
 if not modules then modules = { } end modules ['xindex-no'] = {
-      version = 0.28,
+      version = 0.29,
       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	2021-07-05 20:52:47 UTC (rev 59839)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua	2021-07-05 20:53:08 UTC (rev 59840)
@@ -5,7 +5,7 @@
 --
 
 if not modules then modules = { } end modules ['xindex-pretty'] = {
-      version = 0.28,
+      version = 0.29,
       comment = "dump a Lua table for debugging",
        author = "Steve Donovan",
     copyright = "Steve Donovan",
@@ -31,7 +31,7 @@
     repeat
         _, finish, _, new_equals = s:find(lstring_pat, finish)
         if new_equals then
-            equals = max(equals or 0, #new_equals)
+            equals = math.max(equals or 0, #new_equals)
         end
     until not new_equals
 



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