texlive[52587] trunk: xindex (31oct19)
commits+karl at tug.org
commits+karl at tug.org
Thu Oct 31 23:21:30 CET 2019
Revision: 52587
http://tug.org/svn/texlive?view=revision&revision=52587
Author: karl
Date: 2019-10-31 23:21:29 +0100 (Thu, 31 Oct 2019)
Log Message:
-----------
xindex (31oct19)
Modified Paths:
--------------
trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
trunk/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua
trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
trunk/Master/texmf-dist/doc/lualatex/xindex/Makefile
trunk/Master/texmf-dist/doc/lualatex/xindex/README.md
trunk/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf
trunk/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex
trunk/Master/texmf-dist/scripts/xindex/xindex.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua
Modified: trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl 2019-10-31 21:16:27 UTC (rev 52586)
+++ trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl 2019-10-31 22:21:29 UTC (rev 52587)
@@ -1095,9 +1095,10 @@
}
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 @@
$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 @@
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 @@
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 @@
# 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");
Modified: trunk/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua 2019-10-31 21:16:27 UTC (rev 52586)
+++ trunk/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua 2019-10-31 22:21:29 UTC (rev 52587)
@@ -8,7 +8,7 @@
-----------------------------------------------------------------------
xindex = xindex or { }
- local version = 0.18
+ local version = 0.19
xindex.version = version
--xindex.self = "xindex"
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG 2019-10-31 21:16:27 UTC (rev 52586)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG 2019-10-31 22:21:29 UTC (rev 52587)
@@ -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
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/xindex/Makefile 2019-10-31 21:16:27 UTC (rev 52586)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/Makefile 2019-10-31 22:21:29 UTC (rev 52587)
@@ -1,7 +1,7 @@
.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps
-PACKAGE = xhfill
+PACKAGE = xindex
MAIN = xindex-doc
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/xindex/README.md 2019-10-31 21:16:27 UTC (rev 52586)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/README.md 2019-10-31 22:21:29 UTC (rev 52587)
@@ -43,4 +43,3 @@
./xindex.lua buch.idx
lualatex buch
-
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex 2019-10-31 21:16:27 UTC (rev 52586)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex 2019-10-31 22:21:29 UTC (rev 52587)
@@ -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 @@
\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 @@
\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 @@
-----------------------------------------------------------------------
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",
Modified: trunk/Master/texmf-dist/scripts/xindex/xindex.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/xindex/xindex.lua 2019-10-31 21:16:27 UTC (rev 52586)
+++ trunk/Master/texmf-dist/scripts/xindex/xindex.lua 2019-10-31 22:21:29 UTC (rev 52587)
@@ -8,7 +8,7 @@
-----------------------------------------------------------------------
xindex = xindex or { }
- local version = 0.18
+ local version = 0.19
xindex.version = version
--xindex.self = "xindex"
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua 2019-10-31 21:16:27 UTC (rev 52586)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua 2019-10-31 22:21:29 UTC (rev 52587)
@@ -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",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua 2019-10-31 21:16:27 UTC (rev 52586)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua 2019-10-31 22:21:29 UTC (rev 52587)
@@ -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 @@
{ 'p' },
{ 'q' },
{ 'r' },
- { 's', 'ß' },
+ { 's' },
{ 't' },
{ 'u', 'ú', 'ù', 'ü' },
{ 'v' },
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua 2019-10-31 21:16:27 UTC (rev 52586)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua 2019-10-31 22:21:29 UTC (rev 52587)
@@ -6,7 +6,7 @@
-- LICENSE: LPPL1.3
-----------------------------------------------------------------------
-local info = { version = 0.18 }
+local info = { version = 0.19 }
-- check config
if pageNoPrefixDel ~= "" then
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua 2019-10-31 21:16:27 UTC (rev 52586)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua 2019-10-31 22:21:29 UTC (rev 52587)
@@ -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",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua 2019-10-31 21:16:27 UTC (rev 52586)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua 2019-10-31 22:21:29 UTC (rev 52587)
@@ -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,27 +60,27 @@
}
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' },
@@ -87,4 +87,3 @@
{ 'Y', 'Ý', 'Ÿ' },
{ 'Z', 'Ž' }
}
-
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua 2019-10-31 21:16:27 UTC (rev 52586)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua 2019-10-31 22:21:29 UTC (rev 52587)
@@ -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",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua 2019-10-31 21:16:27 UTC (rev 52586)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua 2019-10-31 22:21:29 UTC (rev 52587)
@@ -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",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua 2019-10-31 21:16:27 UTC (rev 52586)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua 2019-10-31 22:21:29 UTC (rev 52587)
@@ -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 @@
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}
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua 2019-10-31 21:16:27 UTC (rev 52586)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua 2019-10-31 22:21:29 UTC (rev 52587)
@@ -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",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua 2019-10-31 21:16:27 UTC (rev 52586)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua 2019-10-31 22:21:29 UTC (rev 52587)
@@ -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",
More information about the tex-live-commits
mailing list