From 282b205252b84c03241bf105856617f4fff26303 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 31 Oct 2019 22:21:29 +0000 Subject: xindex (31oct19) git-svn-id: svn://tug.org/texlive/trunk@52587 c570f23f-e606-0410-a88d-b1316a301751 --- .../texk/texlive/linked_scripts/texlive/tlmgr.pl | 30 ++++++++++----- .../texk/texlive/linked_scripts/xindex/xindex.lua | 2 +- Master/texmf-dist/doc/lualatex/xindex/CHANGELOG | 1 + Master/texmf-dist/doc/lualatex/xindex/Makefile | 2 +- Master/texmf-dist/doc/lualatex/xindex/README.md | 1 - .../texmf-dist/doc/lualatex/xindex/xindex-doc.pdf | Bin 377152 -> 375486 bytes .../texmf-dist/doc/lualatex/xindex/xindex-doc.tex | 41 ++++++++++----------- Master/texmf-dist/scripts/xindex/xindex.lua | 2 +- .../texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua | 2 +- .../tex/lualatex/xindex/xindex-HAdW-eKO.lua | 4 +- .../texmf-dist/tex/lualatex/xindex/xindex-base.lua | 2 +- .../tex/lualatex/xindex/xindex-cfg-common.lua | 2 +- .../texmf-dist/tex/lualatex/xindex/xindex-cfg.lua | 13 +++---- .../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 | 10 ++++- .../tex/lualatex/xindex/xindex-pretty.lua | 2 +- .../tex/lualatex/xindex/xindex-yannis.lua | 2 +- 18 files changed, 68 insertions(+), 52 deletions(-) diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index 37f30c9ffe8..81e9936a951 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -1095,9 +1095,10 @@ sub backup_and_remove_package { } if ($opts{"backup"}) { $tlp->make_container($::progs{'compressor'}, $localtlpdb->root, - $opts{"backupdir"}, - "${pkg}.r" . $tlp->revision, - $tlp->relocated); + destdir => $opts{"backupdir"}, + containername => "${pkg}.r" . $tlp->revision, + relative => $tlp->relocated, + user => 1); if ($autobackup) { # in case we do auto backups we remove older backups clear_old_backups($pkg, $opts{"backupdir"}, $autobackup); @@ -2164,7 +2165,9 @@ sub action_backup { $tlp->revision . ".tar.$compressorextension\n"); if (!$opts{"dry-run"}) { $tlp->make_container($::progs{'compressor'}, $localtlpdb->root, - $opts{"backupdir"}, "${pkg}.r" . $tlp->revision); + destdir => $opts{"backupdir"}, + containername => "${pkg}.r" . $tlp->revision, + user => 1); } } } @@ -2280,7 +2283,10 @@ sub write_w32_updater { push (@rst_info, "$pkg ^($oldrev^)"); next if ($opts{"dry-run"}); # create backup; make_container expects file name in a format: some-name.r[0-9]+ - my ($size, undef, $fullname) = $localtlp->make_container("tar", $root, $temp, "__BACKUP_$pkg.r$oldrev"); + my ($size, undef, $fullname) = $localtlp->make_container("tar", $root, + destdir => $temp, + containername => "__BACKUP_$pkg.r$oldrev", + user => 1); if ($size <= 0) { tlwarn("$prg: Creation of backup container of $pkg failed.\n"); return 1; # backup failed? abort @@ -3200,8 +3206,10 @@ sub action_update { if ($opts{"backup"} && !$opts{"dry-run"}) { my $compressorextension = $Compressors{$::progs{'compressor'}}{'extension'}; $tlp->make_container($::progs{'compressor'}, $root, - $opts{"backupdir"}, "${pkg}.r" . $tlp->revision, - $tlp->relocated); + destdir => $opts{"backupdir"}, + containername => "${pkg}.r" . $tlp->revision, + relative => $tlp->relocated, + user => 1); $unwind_package = "$opts{'backupdir'}/${pkg}.r" . $tlp->revision . ".tar.$compressorextension"; @@ -3239,9 +3247,11 @@ sub action_update { # no backup was made, so let us create a temporary .tar file # of the package my $tlp = $localtlpdb->get_package($pkg); - my ($s, undef, $fullname) = $tlp->make_container("tar", $root, $temp, - "__BACKUP_${pkg}.r" . $tlp->revision, - $tlp->relocated); + my ($s, undef, $fullname) = $tlp->make_container("tar", $root, + destdir => $temp, + containername => "__BACKUP_${pkg}.r" . $tlp->revision, + relative => $tlp->relocated, + user => 1); if ($s <= 0) { tlwarn("\n$prg: Creation of backup container of $pkg failed.\n"); tlwarn("$prg: Continuing to update other packages, please retry...\n"); diff --git a/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua b/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua index 8183b32bb5d..8ab76b494d3 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.18 + local version = 0.19 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 0a40bef9163..eb66c0c3694 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG +++ b/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG @@ -1,3 +1,4 @@ +0.19 2019-10-31 - add again missing accented characters 0.18 2019-10-27 - speed up sorting by modifying the code 0.17 2019-10-15 - fixes in cfg file for missing circum 0.16 2019-10-02 - fixes in the documentation diff --git a/Master/texmf-dist/doc/lualatex/xindex/Makefile b/Master/texmf-dist/doc/lualatex/xindex/Makefile index 10d8c8a58ff..7e5529f499b 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/Makefile +++ b/Master/texmf-dist/doc/lualatex/xindex/Makefile @@ -1,7 +1,7 @@ .SUFFIXES : .tex .ltx .dvi .ps .pdf .eps -PACKAGE = xhfill +PACKAGE = xindex MAIN = xindex-doc diff --git a/Master/texmf-dist/doc/lualatex/xindex/README.md b/Master/texmf-dist/doc/lualatex/xindex/README.md index e47187276a6..ec8963c0dae 100644 --- a/Master/texmf-dist/doc/lualatex/xindex/README.md +++ b/Master/texmf-dist/doc/lualatex/xindex/README.md @@ -43,4 +43,3 @@ buch.tex: run ./xindex.lua buch.idx lualatex buch - diff --git a/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf b/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf index 8d2a22e4be5..7ac6e88ac20 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 c4d41aca5ec..0f57fd61f84 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.18}% can be autimatically changed by perl +\setVersion{version = 0.19}% can be autimatically changed by perl \setkeys{dtk}{cleanup=true,force=false} @@ -93,7 +93,7 @@ \vfill Thanks to: \\ -Mark Baudin; +Mark Baudoin; Heiko Oberdiek \clearpage @@ -362,34 +362,33 @@ The default sorting is unicode aware and uses a translation table for accented c \begin{verbatim} alphabet_lower = { -- for sorting { ' ' }, -- only for internal tests - { 'a', 'á', 'à', 'ä', 'â', 'å', 'æ', }, + { 'a', 'á', 'à', 'ä'}, { 'b' }, - { 'c', 'ç' }, + { 'c' }, { 'd' }, - { 'e', 'é', 'è', 'ë', 'ê' }, + { 'e', 'é', 'è', 'ë' }, { 'f' }, { 'g' }, { 'h' }, - { 'i', 'í', 'ì', 'î', 'ï' }, + { 'i', 'í', 'ì', 'ï' }, { 'j' }, { 'k' }, { 'l' }, { 'm' }, { 'n', 'ñ' }, - { 'o', 'ó', 'ò', 'ö', 'ô', 'ø', 'œ', 'ø'}, + { 'o', 'ó', 'ò', 'ö' }, { 'p' }, { 'q' }, { 'r' }, - { 's', 'š', 'ß' }, + { 's' }, { 't' }, - { 'u', 'ú', 'ù', 'ü' , 'û'}, + { 'u', 'ú', 'ù', 'ü' }, { 'v' }, { 'w' }, { 'x' }, - { 'y', 'ý', 'ÿ' }, - { 'z', 'ž' } + { 'y' }, + { 'z' } } - \end{verbatim} There is also a table for the uppercase letters. If it should be edited or extended then copy first the @@ -402,32 +401,32 @@ the umlauts like ö$\rightarrow$oe: \begin{verbatim} alphabet_upper = { -- for sorting { ' ' }, - { 'A', 'Á', 'À', 'Ä', 'Å', 'Æ'}, + { 'A', 'Á', 'À', 'Ä'}, { 'B' }, - { 'C', 'Ç' }, + { 'C' }, { 'D' }, - { 'E', 'È', 'É', 'Ë' }, + { 'E', 'È', 'È', 'ë' }, { 'F' }, { 'G' }, { 'H' }, - { 'I', 'Í', 'Ì', 'Ï' }, + { 'I', 'Í', 'Ì', 'ï' }, { 'J' }, { 'K' }, { 'L' }, { 'M' }, { 'N', 'Ñ' }, - { 'O', 'Ó', 'Ò', 'Ö', 'Ø','Œ', 'Ø' }, + { 'O', 'Ó', 'Ò', 'Ö' }, { 'P' }, { 'Q' }, { 'R' }, - { 'S', 'Š' }, + { 'S' }, { 'T' }, { 'U', 'Ú', 'Ù', 'Ü' }, { 'V' }, { 'W' }, { 'X' }, - { 'Y', 'Ý', 'Ÿ' }, - { 'Z', 'Ž' } + { 'Y' }, + { 'Z' } } \end{verbatim} @@ -1266,7 +1265,7 @@ In the documents preamble there is the definition: ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-header'] = { - version = 0.18, + version = 0.19, comment = "main configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/Master/texmf-dist/scripts/xindex/xindex.lua b/Master/texmf-dist/scripts/xindex/xindex.lua index 8183b32bb5d..8ab76b494d3 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.18 + local version = 0.19 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 48231b1d834..ec5826316b9 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.18, + version = 0.19, 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 7b2dba332cf..0b588ff74eb 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.18, + version = 0.19, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", @@ -62,7 +62,7 @@ alphabet_lower = { -- for sorting { 'p' }, { 'q' }, { 'r' }, - { 's', 'ß' }, + { 's' }, { 't' }, { 'u', 'ú', 'ù', 'ü' }, { 'v' }, diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua index f4155054605..a110a41b00e 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.18 } +local info = { version = 0.19 } -- 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 f44967f63c1..17ce7d27944 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.18, + version = 0.19, 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 89de044ca1e..952aa90169a 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.18, + version = 0.19, comment = "main configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", @@ -60,31 +60,30 @@ alphabet_lower = { -- for sorting } alphabet_upper = { -- for sorting { ' ' }, - { 'A', 'Á', 'À', 'Ä', 'Å', 'Æ'}, + { 'A', 'Á', 'À', 'Ä', 'Å', 'Æ', 'Â' }, { 'B' }, { 'C', 'Ç' }, { 'D' }, - { 'E', 'È', 'É', 'Ë' }, + { 'E', 'È', 'É', 'Ë', 'Ê' }, { 'F' }, { 'G' }, { 'H' }, - { 'I', 'Í', 'Ì', 'Ï' }, + { 'I', 'Í', 'Ì', 'Ï', 'Î' }, { 'J' }, { 'K' }, { 'L' }, { 'M' }, { 'N', 'Ñ' }, - { 'O', 'Ó', 'Ò', 'Ö', 'Ø','Œ', 'Ø' }, + { 'O', 'Ó', 'Ò', 'Ö', 'Ø','Œ', 'Ø', 'Ô'}, { 'P' }, { 'Q' }, { 'R' }, { 'S', 'Š' }, { 'T' }, - { 'U', 'Ú', 'Ù', 'Ü' }, + { 'U', 'Ú', 'Ù', 'Ü', 'Û' }, { 'V' }, { 'W' }, { 'X' }, { 'Y', 'Ý', 'Ÿ' }, { 'Z', 'Ž' } } - diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua index 6c918cc28a4..b363f627aa1 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.18, + version = 0.19, 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 02dea0358bc..5d8dfb9b60f 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.18, + version = 0.19, 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 59193f1d28a..fd36c1560c4 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.18, + version = 0.19, comment = "main library to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", @@ -272,6 +272,14 @@ function replaceVerticalChar(v) end end +--local ignore = "'`'" + +function ignoreLetters( c ) + return (c:gsub("["..ignore.."]+", ""):match("^%s*(.-)%s*$")) +end +-- somestring:match("^%s*(.-)%s*$") --trim function + + function getEntryAndPage(w, nextW, EntryList) -- \indexentry{Aachen, Johann von}{VII/1-215} -- \indexentry {Document@\idxtextClasses !IEEEtran@{\sfffffamily IEEEtran}}{185} diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua index 1165b6a6248..16fea2c99f3 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.18, + version = 0.19, comment = "dump a Lua table for debugging", author = "Steve Donovan", copyright = "Steve Donovan", diff --git a/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua b/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua index 99b8642293e..c77270b16e9 100644 --- a/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua +++ b/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua @@ -7,7 +7,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-yannis'] = { - version = 0.18, + version = 0.19, comment = "main configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", -- cgit v1.2.3