From 386471126f084ad5eca589d6012ca3be43754da8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 14 Jul 2020 21:02:07 +0000 Subject: xindex (14jul20) git-svn-id: svn://tug.org/texlive/trunk@55835 c570f23f-e606-0410-a88d-b1316a301751 --- .../texk/texlive/linked_scripts/xindex/xindex.lua | 4 ++-- Master/texmf-dist/doc/lualatex/xindex/CHANGELOG | 1 + .../texmf-dist/doc/lualatex/xindex/xindex-doc.pdf | Bin 391157 -> 389262 bytes .../texmf-dist/doc/lualatex/xindex/xindex-doc.tex | 13 ++++++++----- Master/texmf-dist/scripts/xindex/xindex.lua | 4 ++-- .../texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua | 2 +- .../tex/lualatex/xindex/xindex-HAdW-eKO.lua | 2 +- .../texmf-dist/tex/lualatex/xindex/xindex-base.lua | 2 +- .../tex/lualatex/xindex/xindex-cfg-common.lua | 2 +- .../tex/lualatex/xindex/xindex-cfg-uca.lua | 2 +- .../texmf-dist/tex/lualatex/xindex/xindex-cfg.lua | 2 +- .../texmf-dist/tex/lualatex/xindex/xindex-dtk.lua | 2 +- .../texmf-dist/tex/lualatex/xindex/xindex-lapp.lua | 2 +- .../texmf-dist/tex/lualatex/xindex/xindex-lib.lua | 2 +- .../tex/lualatex/xindex/xindex-norsk.lua | 2 +- .../tex/lualatex/xindex/xindex-pretty.lua | 2 +- 16 files changed, 24 insertions(+), 20 deletions(-) diff --git a/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua b/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua index 984d6fb8e3b..ef1225b5af5 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.25 + local version = 0.26 xindex.version = version --xindex.self = "xindex" @@ -167,7 +167,7 @@ alphabet_upper_map = CreateCharListMap(alphabet_upper) local esc_char = args.escapechar writeLog(2,"Escapechar = "..esc_char.."\n",1) escape_chars = { -- by default " is the escape char - {esc_char..'"', '//escapedquote//', '\\"{}' }, + {esc_char..'"', '//escapedquote//', '"' }, {esc_char..'@', '//escapedat//', '@' }, {esc_char..'|', '//escapedvert//', '|' }, {esc_char..'!', '//scapedexcl//', '!' }, diff --git a/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG b/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG index 3fa86004d82..787a921c23e 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG +++ b/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG @@ -1,3 +1,4 @@ +0.26 2020-07-14 - fix for quote as escape char 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) diff --git a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf index 86e2c67a825..042f0a67e85 100644 Binary files a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf and b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf differ diff --git a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex index a44a93ad669..f3cd2dc98e9 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex +++ b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex @@ -80,7 +80,7 @@ \def\setVersion#1{\setVVersion#1!!} \def\setVVersion#1=#2!!{\def\xIndexVersion{#2}} -\setVersion{version = 0.25}% can be automatically changed by perl +\setVersion{version = 0.26}% can be automatically changed by perl \setkeys{dtk}{cleanup=true,force=false} @@ -96,6 +96,7 @@ Thanks to: \\ Mark Baudoin; Denis Bitouzé; +Brian Dunn; Michal Hoftich; Heiko Oberdiek; Matteo Paolini; @@ -250,10 +251,12 @@ now defined as: \begin{verbatim} escape_chars = { -- by default " is the escape char - {esc_char..'"', '//escapedquote//', '\\"{}' }, - {esc_char..'@', '//escapedat//', '@' }, - {esc_char..'|', '//escapedvert//', "|" }, - {esc_char..'!', '//scapedexcl//', '!' } + {esc_char..'"', '//escapedquote//', '"' }, + {esc_char..'@', '//escapedat//', '@' }, + {esc_char..'|', '//escapedvert//', '|' }, + {esc_char..'!', '//scapedexcl//', '!' }, + {esc_char..'(', '//escapedparenleft//', '(' }, + {esc_char..')', '//escapedparenright//',')' } } \end{verbatim} diff --git a/Master/texmf-dist/scripts/xindex/xindex.lua b/Master/texmf-dist/scripts/xindex/xindex.lua index 984d6fb8e3b..ef1225b5af5 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.25 + local version = 0.26 xindex.version = version --xindex.self = "xindex" @@ -167,7 +167,7 @@ alphabet_upper_map = CreateCharListMap(alphabet_upper) local esc_char = args.escapechar writeLog(2,"Escapechar = "..esc_char.."\n",1) escape_chars = { -- by default " is the escape char - {esc_char..'"', '//escapedquote//', '\\"{}' }, + {esc_char..'"', '//escapedquote//', '"' }, {esc_char..'@', '//escapedat//', '@' }, {esc_char..'|', '//escapedvert//', '|' }, {esc_char..'!', '//scapedexcl//', '!' }, diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua index 9cb181f1850..3d6b89b6f1e 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.25, + version = 0.26, 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 101094bc8fe..5ad195646f3 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.25, + version = 0.26, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua index 009fad17ae5..e3d91bca240 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.25 } +local info = { version = 0.26 } -- 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 dfe726764ff..f23c6120680 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.25, + version = 0.26, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua index ab7b45f1252..c74915ec343 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua @@ -7,7 +7,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg-lua'] = { - version = 0.25, + version = 0.26, comment = "configuration to xindex-cfg-uca.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 0f98aac51be..2237ca7ce6b 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.25, + version = 0.26, 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 b5a97c82606..152764f139e 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.25, + version = 0.26, 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 c9e65918657..e227e489e24 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.25, + version = 0.26, 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 918ebe773a7..a574ee6bccb 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.25, + version = 0.26, comment = "main library to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua index a59d35d6ae0..2c1b9f9dd92 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua @@ -8,7 +8,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-no'] = { - version = 0.25, + version = 0.26, comment = "configuration 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 6d8ced87ca6..a52957f4585 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.25, + version = 0.26, comment = "dump a Lua table for debugging", author = "Steve Donovan", copyright = "Steve Donovan", -- cgit v1.2.3