diff options
-rwxr-xr-x | Build/source/texk/texlive/linked_scripts/xindex/xindex.lua | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/lualatex/xindex/CHANGELOG | 1 | ||||
-rw-r--r-- | Master/texmf-dist/doc/lualatex/xindex/README.md | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf | bin | 331966 -> 332526 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex | 23 | ||||
-rwxr-xr-x | Master/texmf-dist/scripts/xindex/xindex.lua | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua | 11 | ||||
-rw-r--r-- | Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua | 2 |
15 files changed, 35 insertions, 22 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua b/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua index 9730f41544d..4314d1d6fe0 100755 --- a/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua +++ b/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua @@ -8,7 +8,7 @@ ----------------------------------------------------------------------- xindex = xindex or { } - local version = 0.07 + local version = 0.08 xindex.version = version --xindex.self = "xindex" diff --git a/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG b/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG index 9f6f5cf9728..56a09422ac9 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG +++ b/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG @@ -1,3 +1,4 @@ +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 0.06a 2018-12-06 - fixes to documentationO diff --git a/Master/texmf-dist/doc/lualatex/xindex/README.md b/Master/texmf-dist/doc/lualatex/xindex/README.md index 5cce33e9972..c4356291996 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/README.md +++ b/Master/texmf-dist/doc/lualatex/xindex/README.md @@ -1,7 +1,7 @@ # xindex Unicode compatible index programm for LaTeX. It needs Lua 5.3 which -will be included in at least LuaTeX 1.09 +will be included in at least LuaTeX 1.09 (TeXLive 2019) * xindex.lua -- main file diff --git a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf Binary files differindex ab83897387e..77ef224a228 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 ad234f6959d..0ccb7ca90e3 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.07}% can be autimatically changed by perl +\setVersion{version = 0.08}% can be autimatically changed by perl \title{Program and package \texttt{xindex} \\--\\ \normalsize \xIndexVersion\ (\today)} \author{Herbert Voß\thanks{hvoss@tug.org}} @@ -894,14 +894,19 @@ Internally exists a function \verb|compressPageList| which is used if no \indexentry{Abrahamson}{VII/2/1-1156} \indexentry{Adamson}{VII/2/1-1223} \indexentry{Adamson}{IX/1-1228} -\indexentry{Karl V}{VII/1-34} -\indexentry{Karl II}{VII/1-147} -\indexentry{Karl III}{VII/1-149} -\indexentry{Karl VI}{VII/1-296} -\indexentry{Karl IV}{VII/1-34} -\indexentry{Karl IV}{VII/1-147} -\indexentry{Karl X}{VII/1-149} -\indexentry{Karl IX}{VII/1-296} +\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!V., Kaiser}{VI/1-84} +\indexentry{Karl!V., Kaiser}{VI/1-284} +\indexentry{Karl!V., Kaiser}{VI/1-654} +\indexentry{Karl!V., Kaiser}{VI/2-708} +\indexentry{Karl!V., Kaiser}{VI/2-1014} +\indexentry{Karl!V., Kaiser}{VI/2-1043} +\indexentry{Karl!V., Kaiser}{VI/2-1131} +\indexentry{Karl!V., Kaiser}{VI/2-1210} +\indexentry{Braunschweig-Wolfenbüttel!Karl Viktor von, Herzog}{VI/1-83} \indexentry{Schleswig-Holstein!Rudolf von, Herzog}{VII/2/1-758} \indexentry{Schleswig-Holstein!Rudolf von, Herzog}{VII/2/1-759} \indexentry{Schleswig-Holstein!Rudolf von, Herzog}{VII/2/1-760} diff --git a/Master/texmf-dist/scripts/xindex/xindex.lua b/Master/texmf-dist/scripts/xindex/xindex.lua index 9730f41544d..4314d1d6fe0 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.07 + local version = 0.08 xindex.version = version --xindex.self = "xindex" diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua index 8ff26e3974b..2c7cb41c337 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.07, + version = 0.08, 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 a27e1d33c93..c5bed9618b6 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.07, + version = 0.08, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", @@ -208,8 +208,15 @@ function replaceRoman(r) else return r end end +function replaceRomanB(r) + local i = romanToNumber(r) + if i then return "!//"..string.format("%05d",i).."//." + else return r + end +end function SORTprehook(data) -- replace roman with algebraic, eg Karl IX -> Karl // 9// +-- \indexentry{Karl!V., Kaiser}{VI/1-284} must also be catched -- writeLog(1,require 'xindex-pretty'.dump(data),0) -- only for internal dump local entry local elements = {} @@ -224,7 +231,7 @@ function SORTprehook(data) -- replace roman with algebraic, eg Karl IX -> Karl entry = "" for j=1,#elements do entry=entry.." "..elements[j] end -- has leading space else - entry:gsub("!(.-)%p",replaceRoman) + entry = entry:gsub("!(.-)%.",replaceRomanB) -- {Karl!V., Kaiser}{VI/1-284} end data[i]["Entry"] = entry:gsub("^%s*(.-)%s*$", "%1") -- strip leading space end diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua index 955f88e7173..53de3b76663 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.07} +local info = { version = 0.08} -- 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 f84552245e1..feb056daafe 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.07, + version = 0.08, 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 9fce2fb191e..1b4561123b3 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.07, + version = 0.08, 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 afe41e61be8..c9ac3fa12ab 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.07, + version = 0.08, 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 bcb22750c22..121c425fe34 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.07, + version = 0.08, 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 12a58547a25..78787351d45 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.07, + version = 0.08, 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 045425dc838..b503d752c90 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.07, + version = 0.08, comment = "dump a Lua table for debugging", author = "Steve Donovan", copyright = "Steve Donovan", |