xindex (25mar19)

git-svn-id: svn://tug.org/texlive/trunk@50588 c570f23f-e606-0410-a88d-b1316a301751

15 files changed, 37 insertions, 38 deletions

diff --git a/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG b/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
index 56a09422ac9..2dc03455b30 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
+++ b/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
@@ -1,3 +1,4 @@
+0.09  2019-03-25 - fix for HAdW config file
 0.08  2019-03-06 - fix for config file HAdW
 0.07  2019-02-05 - fix for wrong version number
 0.06b 2019-01-30 - use another monospace font to allow copy and paste
diff --git a/Master/texmf-dist/doc/lualatex/xindex/Makefile b/Master/texmf-dist/doc/lualatex/xindex/Makefile
index 8b199ac06f7..d0e8fd6fd72 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/Makefile
+++ b/Master/texmf-dist/doc/lualatex/xindex/Makefile
@@ -27,7 +27,7 @@ doc:
 #	$(LATEX) --shell-escape $(MAIN)
 
 clean : 
-	$(RM) *.dvi *.aux *.log  *.xml xindex-?.tex xindex-??.tex *.ind *.idx *.toc *.out *.ilg
+	$(RM) *.dvi *.aux *.log  *.xml xindex-?.tex xindex-??.tex *.ind *.idx *.toc *.out *.ilg *.adx
 
 veryclean : clean
 	$(RM) *.pdf 
diff --git a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf
index 77ef224a228..21f94fd67d0 100644
--- a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf
+++ b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf
diff --git a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex
index 0ccb7ca90e3..7c852354725 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.08}%  can be autimatically changed by perl
+\setVersion{version = 0.09}%  can be autimatically changed by perl
 
 \title{Program and package \texttt{xindex} \\--\\ \normalsize \xIndexVersion\ (\today)}
 \author{Herbert Voß\thanks{hvoss@tug.org}}
@@ -828,7 +828,7 @@ For example:
 function specialCompressPageList(pages)
   if (pages[1]["number"] == "") then pages[1]["number"] = " " end
   if (#pages <= 1) then 
-    pages[1]["number"] = pages[1]["number"]:gsub('(.-)-',colorBox)-- replace "-" with ":\\ "
+    pages[1]["number"] = pages[1]["number"]:gsub('-',':~')-- replace "-" with ":~"
     return pages 
   end  -- only one pageno
   local sortPages = {}
@@ -837,30 +837,26 @@ function specialCompressPageList(pages)
   local page
   local i
   for i=1,#pages do
-     roman = string.gsub(pages[i]["number"],'%U*','') -- only uppercase to catch VII123f (folium pages)
+     roman = string.gsub(pages[i]["number"],'%U*','') -- only uppercase to catch VII/1-123f and VII/3-123ff (folium pages)
      if romanToNumber(roman) then
-       roman = string.format("%05d",tonumber(romanToNumber(roman)))
+       roman = string.format("%05d",tonumber(romanToNumber(roman))) -- only roman part VII
      else
        roman = ""
      end
-     volume = string.gsub(pages[i]["number"],'%a*','')
-     if volume then volume = volume:gsub('-%d*','') end
+     volume = string.gsub(pages[i]["number"],'%a*','') -- only the number /2 123 or /2-123
+     if volume then volume = volume:gsub('-%d*','') end -- delete - char to get /2
      page = string.gsub(pages[i]["number"],'.*-','')
      page = string.format("%5s",page)
      sortPages[#sortPages+1] = {
-     origin = pages[i],
-     sort = roman..volume.." "..page }  -- no minus between Roman/Volume and first page
+       origin = pages[i],
+       sort = roman..volume.." "..page }  -- no minus between Roman/Volume and first page
    end
--- sort the page list  
   table.sort(sortPages, function(a,b) return a["sort"] < b["sort"] end )
-  local Pages = {}
-  for i=1,#sortPages do    -- use the sorted origin table
-    Pages[#Pages+1] = sortPages[i]["origin"]
-  end
 
 [...]
 
-return pages
+    return pages
+  end
 end
 \end{verbatim}
 
@@ -897,7 +893,7 @@ Internally exists a function \verb|compressPageList| which is used if no
 \indexentry{Karl!der Große, Kaiser}{VI/2-987}
 \indexentry{Karl!der Große, Kaiser}{VI/2-989}
 \indexentry{Karl!der Große, Kaiser}{VI/2-1028}
-\indexentry{Karl!IV., Kaiser}{VI/1-XII}
+\indexentry{Karl!IV., Kaiser}{VI/1-12}
 \indexentry{Karl!V., Kaiser}{VI/1-84}
 \indexentry{Karl!V., Kaiser}{VI/1-284}
 \indexentry{Karl!V., Kaiser}{VI/1-654}
diff --git a/Master/texmf-dist/scripts/xindex/xindex.lua b/Master/texmf-dist/scripts/xindex/xindex.lua
index 4314d1d6fe0..77804a94dad 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.08
+ local version = 0.09
 xindex.version = version
 --xindex.self = "xindex"
 
diff --git a/Master/texmf-dist/tex/latex/xindex/xindex.sty b/Master/texmf-dist/tex/latex/xindex/xindex.sty
index 58afc99c20d..65799577dc9 100644
--- a/Master/texmf-dist/tex/latex/xindex/xindex.sty
+++ b/Master/texmf-dist/tex/latex/xindex/xindex.sty
@@ -1,6 +1,6 @@
 %% This is file `xindex.sty',
 %%
-%% Copyright (C) 2018
+%% Copyright (C) 2019-
 %% Herbert Voss
 %%
 %% It may be distributed and/or modified under the
diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua
index 2c7cb41c337..dae45fa7fb7 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.08,
+      version = 0.09,
       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 c5bed9618b6..1ceade22381 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.08,
+      version = 0.09,
       comment = "configuration to xindex.lua",
        author = "Herbert Voss",
     copyright = "Herbert Voss",
@@ -98,7 +98,7 @@ alphabet_upper = { -- for sorting
 --\indexentry{Bremen!Adalbert I. von, Erzbischof}{VII/1-50}
 
 function specialCompressPageList(pages)
---print(#pages..".. number:|"..pages[1]["number"].."| Special:"..pages[1]["special"])
+--  print(#pages..".. number:|"..pages[1]["number"].."| Special:"..pages[1]["special"])
   if (pages[1]["number"] == "") then pages[1]["number"] = " " end
   if (#pages <= 1) then 
     pages[1]["number"] = pages[1]["number"]:gsub('-',':~')-- replace "-" with ":~"
@@ -118,24 +118,25 @@ sortPages = {{ origin = { number=VII/1-715, special="" },
   local i
 --print("----------------------------------------")
   for i=1,#pages do
-     roman = string.gsub(pages[i]["number"],'%U*','') -- only uppercase to catch VII123f (folium pages)
+     roman = string.gsub(pages[i]["number"],'%U*','') -- only uppercase to catch VII/1-123f and VII/3-123ff (folium pages)
      if romanToNumber(roman) then
-       roman = string.format("%05d",tonumber(romanToNumber(roman)))
+       roman = string.format("%05d",tonumber(romanToNumber(roman))) -- only roman part VII
      else
        roman = ""
      end
-     volume = string.gsub(pages[i]["number"],'%a*','')
-     if volume then volume = volume:gsub('-%d*','') end
+     volume = string.gsub(pages[i]["number"],'%a*','') -- only the number /2 123 or /2-123
+     if volume then volume = volume:gsub('-%d*','') end -- delete - char to get /2
      page = string.gsub(pages[i]["number"],'.*-','')
      page = string.format("%5s",page)
      sortPages[#sortPages+1] = {
-     origin = pages[i],
-     sort = roman..volume.." "..page }  -- no minus between Roman/Volume and first page
+       origin = pages[i],
+       sort = roman..volume.." "..page }  -- no minus between Roman/Volume and first page
 --print(roman..volume.." "..page.." Special:"..pages[i]["special"])
    end
 -- sort the page list  
   table.sort(sortPages, function(a,b) return a["sort"] < b["sort"] end )
   local Pages = {}
+--  writeLog(1,print(getRawPagesP(sortPages)),2)
   for i=1,#sortPages do    -- use the sorted origin table
     Pages[#Pages+1] = sortPages[i]["origin"]
   end
@@ -143,7 +144,8 @@ sortPages = {{ origin = { number=VII/1-715, special="" },
 -- test if two or more pages in the list
   if #Pages == 2 then  -- only two pages
     local page1 = string.gsub(Pages[1]["number"],'%A*','')  -- get prefix1
-    local page2 = string.gsub(Pages[2]["number"],'%A*','')  -- ger prefix2
+    local page2 = string.gsub(Pages[2]["number"],'%A*','')  -- get prefix2
+    print(page1,Pages[1]["number"],page2,Pages[2]["number"])
     if (page1 == page2) then  -- same prefix
       page1 = string.gsub(Pages[1]["number"],'.*-','') -- get page1
       page2 = string.gsub(Pages[2]["number"],'.*-','') -- get page2
@@ -157,9 +159,9 @@ sortPages = {{ origin = { number=VII/1-715, special="" },
         Pages[2]["number"] = string.gsub(Pages[2]["number"],'.*-','') -- use only number -> same prefix
         return Pages  -- Pages[1] is the same
       end
-    else
-      Pages[1]["number"] = pages[1]["number"]:gsub('-',':~')
-      Pages[2]["number"] = pages[2]["number"]:gsub('-',':~')
+    else -- different prefixes
+      Pages[1]["number"] = Pages[1]["number"]:gsub('-',':~')
+      Pages[2]["number"] = Pages[2]["number"]:gsub('-',':~')
       return Pages  -- different prefix -> simple return of the two pages
     end
   else   -- more than two pages
diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua
index 53de3b76663..0588651541e 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.08}
+local info = { version = 0.09}
 
 -- 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 feb056daafe..db8c81f6ade 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.08,
+      version = 0.09,
       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 1b4561123b3..3ceea684e8e 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.08,
+      version = 0.09,
       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 c9ac3fa12ab..f04c359c663 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.08,
+      version = 0.09,
       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 121c425fe34..5c7c8cd7715 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.08,
+      version = 0.09,
       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 78787351d45..b9464eb1f5f 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.08,
+      version = 0.09,
       comment = "main library  to xindex.lua",
        author = "Herbert Voss",
     copyright = "Herbert Voss",
diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua
index b503d752c90..84754c18ce1 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.08,
+      version = 0.09,
       comment = "dump a Lua table for debugging",
        author = "Steve Donovan",
     copyright = "Steve Donovan",