xindex (25mar19)

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

4 files changed, 13 insertions, 16 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}