doc,sync

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

4 files changed, 91 insertions, 30 deletions

diff --git a/Build/source/texk/tests/TeXLive/TLConfig.pm b/Build/source/texk/tests/TeXLive/TLConfig.pm
index 5c19a1ec38c..afafeea13c3 100644
--- a/Build/source/texk/tests/TeXLive/TLConfig.pm
+++ b/Build/source/texk/tests/TeXLive/TLConfig.pm
@@ -1,4 +1,4 @@
-# $Id: TLConfig.pm 47834 2018-05-25 03:40:14Z preining $
+# $Id: TLConfig.pm 47938 2018-06-06 01:35:10Z preining $
 # TeXLive::TLConfig.pm - module exporting configuration values
 # Copyright 2007-2018 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
@@ -6,7 +6,7 @@
 
 package TeXLive::TLConfig;
 
-my $svnrev = '$Revision: 47834 $';
+my $svnrev = '$Revision: 47938 $';
 my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
 sub module_revision { return $_modulerevision; }
 
@@ -119,11 +119,13 @@ if ($^O =~ /^MSWin/i) {
 
 #
 our $DefaultFallbackDownloader = "wget";
-our @AcceptedFallbackDownloaders = qw/wget curl/;
+our @AcceptedFallbackDownloaders = qw/curl wget/;
 our %FallbackDownloaderProgram = ( 'wget' => 'wget', 'curl' => 'curl');
 our %FallbackDownloaderArgs = (
-  'wget' => ['--user-agent=texlive/wget', '--tries=10', "--timeout=$NetworkTimeout", '-q', '-O'],
-  'curl' => ['--user-agent', 'texlive/curl', '--retry', '10', '--connect-timeout', "$NetworkTimeout", '--silent', '--output']
+  'curl' => ['--user-agent', 'texlive/curl', '--retry', '10',
+             '--connect-timeout', "$NetworkTimeout", '--silent', '--output'],
+  'wget' => ['--user-agent=texlive/wget', '--tries=10',
+             "--timeout=$NetworkTimeout", '-q', '-O'],
 );
 # the way we package things on the web
 our $DefaultCompressorFormat = "xz";
@@ -133,7 +135,7 @@ our @AcceptedCompressors = qw/lz4 gzip xz/;
 our $AcceptedCompressorsRegexp = "(xz|lz4|gzip)";
 our %CompressorProgram   = ( 'xz' => 'xz',     'gzip' => 'gzip',   'lz4' => 'lz4');
 our %CompressorExtension = ( 'xz' => 'xz',     'gzip' => 'gz',     'lz4' => 'lz4');
-our %CompressorArgs      = ( 'xz' => ['-zf'],  'gzip' => [ '-f' ], 'lz4' => ['-zf', '--rm', '-q']);
+our %CompressorArgs      = ( 'xz' => ['-zf'],  'gzip' => [ '-f' ], 'lz4' => ['-zfm', '--rm', '-q']);
 our %DecompressorProgram = ( 'xz' => 'xz',     'gzip' => 'gzip',   'lz4' => 'lz4');
 our %DecompressorArgs    = ( 'xz' => ['-dcf'], 'gzip' => ['-dcf'], 'lz4' => ['-dcf']);
 
diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm
index 0d4575959ce..0c3f8419fcc 100644
--- a/Build/source/texk/tests/TeXLive/TLUtils.pm
+++ b/Build/source/texk/tests/TeXLive/TLUtils.pm
@@ -1,4 +1,4 @@
-# $Id: TLUtils.pm 47847 2018-05-26 16:05:46Z karl $
+# $Id: TLUtils.pm 47887 2018-05-31 16:50:47Z karl $
 # TeXLive::TLUtils.pm - the inevitable utilities for TeX Live.
 # Copyright 2007-2018 Norbert Preining, Reinhard Kotucha
 # This file is licensed under the GNU General Public License version 2
@@ -6,7 +6,7 @@
 
 package TeXLive::TLUtils;
 
-my $svnrev = '$Revision: 47847 $';
+my $svnrev = '$Revision: 47887 $';
 my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
 sub module_revision { return $_modulerevision; }
 
@@ -2318,12 +2318,15 @@ sub read_file_ignore_cr {
 =item C<setup_programs($bindir, $platform)>
 
 Populate the global C<$::progs> hash containing the paths to the
-programs C<wget>, C<tar>, C<xz>. The C<$bindir> argument specifies
+programs C<lz4>, C<tar>, C<wget>, C<xz>. The C<$bindir> argument specifies
 the path to the location of the C<xz> binaries, the C<$platform>
 gives the TeX Live platform name, used as the extension on our
 executables.  If a program is not present in the TeX Live tree, we also
 check along PATH (without the platform extension.)
 
+Check many different downloads and compressors to determine what is
+working.
+
 Return 0 if failure, nonzero if success.
 
 =cut
@@ -2408,13 +2411,14 @@ END_COMPRESSOR_BAD
     $::progs{'compressor'} = $ENV{'TEXLIVE_COMPRESSOR'};
   }
 
-  if ($::opt_verbosity >= 1) {
+  if ($::opt_verbosity >= 2) {
     require Data::Dumper;
     use vars qw($Data::Dumper::Indent $Data::Dumper::Sortkeys
                 $Data::Dumper::Purity); # -w pain
     $Data::Dumper::Indent = 1;
     $Data::Dumper::Sortkeys = 1;  # stable output
     $Data::Dumper::Purity = 1; # recursive structures must be safe
+    print STDERR "DD:dumping ";
     print STDERR Data::Dumper->Dump([\%::progs], [qw(::progs)]);
   }
   return $ok;
@@ -2444,7 +2448,7 @@ sub setup_windows_one {
       system("$prog $arg");
     }
   } else {
-    debug("Default progrma $def not readable?\n");
+    debug("Default program $def not readable?\n");
   }
   return($ready) if ($ready);
   # still here, try plain name without any specification
@@ -2573,13 +2577,14 @@ Try to download the file given in C<$relpath> from C<$TeXLiveURL>
 into C<$destination>, which can be either
 a filename of simply C<|>. In the latter case a file handle is returned.
 
-Downloading honors two environment variables: C<TL_DOWNLOAD_PROGRAM> and
-C<TL_DOWNLOAD_ARGS>. The former overrides the above specification
-devolving to C<wget>, and the latter overrides the default wget
-arguments.
+Downloading first checks for the environment variable C<TEXLIVE_DOWNLOADER>,
+which takes various built-in values. If not set, the next check is fr
+C<TL_DOWNLOAD_PROGRAM> and C<TL_DOWNLOAD_ARGS>. The former overrides the
+above specification devolving to C<wget>, and the latter overrides the
+default wget arguments.
 
 C<TL_DOWNLOAD_ARGS> must be defined so that the file the output goes to
-is the first argument after the C<TL_DOWNLOAD_ARGS>.  Thus, typically it
+is the first argument after the C<TL_DOWNLOAD_ARGS>.  Thus, for wget it
 would end in C<-O>.  Use with care.
 
 =cut
@@ -2618,7 +2623,7 @@ sub download_file {
     } else {
       $downdest = $dest;
     }
-    # massage ssh:// into the scp acceptable scp://
+    # massage ssh:// into the scp-acceptable scp://
     $relpath =~ s!^ssh://!scp://!;
     my $retval = system("scp", "-q", $relpath, $downdest);
     if ($retval != 0) {
@@ -4327,7 +4332,7 @@ sub repository_to_array {
   my $r = shift;
   my %r;
   die "internal error, repository_to_array passed nothing (caller="
-      . caller . ")";
+      . caller . ")" if (!$r);
   my @repos = split (' ', $r);
   if ($#repos == 0) {
     # only one repo, this is the main one!
diff --git a/Master/texmf-dist/bibtex/bib/beebe/typeset.bib b/Master/texmf-dist/bibtex/bib/beebe/typeset.bib
index 67cc12e9bca..3eddbbb9579 100644
--- a/Master/texmf-dist/bibtex/bib/beebe/typeset.bib
+++ b/Master/texmf-dist/bibtex/bib/beebe/typeset.bib
@@ -2,9 +2,9 @@
 %%% ====================================================================
 %%%  BibTeX-file{
 %%%     author          = "Nelson H. F. Beebe",
-%%%     version         = "2.48",
-%%%     date            = "12 February 2018",
-%%%     time            = "06:02:51 MST",
+%%%     version         = "2.50",
+%%%     date            = "07 June 2018",
+%%%     time            = "18:15:12 MDT",
 %%%     filename        = "typeset.bib",
 %%%     address         = "University of Utah
 %%%                        Department of Mathematics, 110 LCB
@@ -14,7 +14,7 @@
 %%%     telephone       = "+1 801 581 5254",
 %%%     FAX             = "+1 801 581 4148",
 %%%     URL             = "http://www.math.utah.edu/~beebe",
-%%%     checksum        = "62589 23099 108892 1027676",
+%%%     checksum        = "16268 23147 109103 1029702",
 %%%     email           = "beebe at math.utah.edu, beebe at acm.org,
 %%%                        beebe at computer.org (Internet)",
 %%%     codetable       = "ISO/ASCII",
@@ -39,7 +39,7 @@
 %%%                        and PDF (Portable Document Format), and
 %%%                        sgml.bib covers SGML and HTML.
 %%%
-%%%                        At version 2.48, the year coverage looked
+%%%                        At version 2.50, the year coverage looked
 %%%                        like this:
 %%%
 %%%                             1881 (   1)    1927 (   0)    1973 (  10)
@@ -68,12 +68,12 @@
 %%%                             1904 (   0)    1950 (   1)    1996 (  24)
 %%%                             1905 (   0)    1951 (   0)    1997 (   8)
 %%%                             1906 (   1)    1952 (   2)    1998 (  12)
-%%%                             1907 (   0)    1953 (   0)    1999 (  10)
+%%%                             1907 (   0)    1953 (   0)    1999 (  11)
 %%%                             1908 (   0)    1954 (   3)    2000 (   8)
 %%%                             1909 (   0)    1955 (   1)    2001 (   5)
 %%%                             1910 (   0)    1956 (   0)    2002 (  13)
 %%%                             1911 (   0)    1957 (   0)    2003 (   4)
-%%%                             1912 (   0)    1958 (   1)    2004 (   1)
+%%%                             1912 (   0)    1958 (   1)    2004 (   2)
 %%%                             1913 (   0)    1959 (   1)    2005 (   7)
 %%%                             1914 (   0)    1960 (   0)    2006 (   2)
 %%%                             1915 (   0)    1961 (   2)    2007 (   3)
@@ -92,7 +92,7 @@
 %%%                             20xx (   2)
 %%%
 %%%                             Article:        322
-%%%                             Book:           308
+%%%                             Book:           310
 %%%                             InCollection:     5
 %%%                             InProceedings:   54
 %%%                             Manual:          42
@@ -103,7 +103,7 @@
 %%%                             Proceedings:     33
 %%%                             TechReport:      34
 %%%
-%%%                             Total entries:  851
+%%%                             Total entries:  853
 %%%
 %%%                        This bibliography has been collected from
 %%%                        bibliographies in the author's personal
@@ -496,6 +496,9 @@
 @String{pub-ENH                 = "Elsevier North-Holland, Inc."}
 @String{pub-ENH:adr             = "New York, NY, USA"}
 
+@String{pub-FABER-FABER         = "Faber and Faber"}
+@String{pub-FABER-FABER:adr     = "London, UK"}
+
 @String{pub-GRAPHICS-PRESS      = "Graphics Press"}
 @String{pub-GRAPHICS-PRESS:adr  = "Box 430, Cheshire, CT 06410, USA"}
 
@@ -2054,8 +2057,8 @@
 @Book{Cave:1971:PPa,
   author =       "Roderick Cave",
   title =        "The private press",
-  publisher =    "Faber and Faber Ltd.",
-  address =      "London (3 Queen Sq., WC1N 3AU), England",
+  publisher =    pub-FABER-FABER,
+  address =      pub-FABER-FABER:adr,
   pages =        "376",
   year =         "1971",
   ISBN =         "0-571-09443-0",
@@ -20218,6 +20221,30 @@
   acknowledgement = ack-nhfb,
 }
 
+@Book{Hutner:1999:CCF,
+  author =       "Martin Hutner and Jerry Kelly",
+  title =        "A century for the century: fine printed books from
+                 1900 to 1999",
+  publisher =    "Grolier Club",
+  address =      "New York, NY, USA",
+  pages =        "xxx + 110",
+  year =         "1999",
+  ISBN =         "0-910672-29-6 (paperback), 0-910672-28-8",
+  ISBN-13 =      "978-0-910672-29-0 (paperback), 978-0-910672-28-3",
+  LCCN =         "Z1033.F5 H87 1999",
+  bibdate =      "Wed Jun 6 18:50:09 MDT 2018",
+  bibsource =    "http://www.math.utah.edu/pub/tex/bib/typeset.bib;
+                 z3950.loc.gov:7090/Voyager",
+  acknowledgement = ack-nhfb,
+  remark =       "One thousand copies have been printed \ldots{} at the
+                 Stinehour Press. Two hundred and fifty of these have
+                 been case bound, and fifty contain original leaves from
+                 some of the books and are signed by the authors
+                 [colophon].",
+  subject =      "Fine books; Europe; Bibliography; Exhibitions; United
+                 States; Private press books",
+}
+
 @Book{Knuth:1999:DT,
   author =       "Donald E. Knuth",
   title =        "Digital Typography",
@@ -21114,6 +21141,27 @@
   acknowledgement = ack-nhfb,
 }
 
+@Book{Hutner:2004:CCF,
+  author =       "Martin Hutner and Jerry Kelly",
+  title =        "A century for the century: fine printed books from
+                 1900 to 1999",
+  publisher =    "Grolier Club",
+  address =      "Danbury, CT, USA",
+  edition =      "Revised and enlarged",
+  pages =        "lxii + 110",
+  year =         "2004",
+  ISBN =         "1-56792-220-1 (hardcover)",
+  ISBN-13 =      "978-1-56792-220-2 (hardcover)",
+  LCCN =         "Z1033.F5 H87 2004",
+  bibdate =      "Wed Jun 6 18:50:09 MDT 2018",
+  bibsource =    "http://www.math.utah.edu/pub/tex/bib/typeset.bib;
+                 z3950.loc.gov:7090/Voyager",
+  URL =          "http://www.loc.gov/catdir/toc/ecip0421/2004019023.html",
+  acknowledgement = ack-nhfb,
+  subject =      "Fine books; Europe; Bibliography; Exhibitions; United
+                 States; Private press books",
+}
+
 @TechReport{NIST:2004:SUR,
   author =       "{NIST}",
   title =        "{SI} Unit rules and style conventions: Check List for
diff --git a/Master/texmf-dist/scripts/texlive/NEWS b/Master/texmf-dist/scripts/texlive/NEWS
index de2bd9c20f1..a862306ecdf 100644
--- a/Master/texmf-dist/scripts/texlive/NEWS
+++ b/Master/texmf-dist/scripts/texlive/NEWS
@@ -1,7 +1,13 @@
 (This file public domain.  Originally written by Norbert Preining and
 Karl Berry, 2010.)
 
-<p><b>tlmgr XXXXX (released DDmmm18):</b>
+<p><b>tlmgr 47951 (released 07jun18):</b>
+<li>Backup removal for non-xz.
+
+<p><b>tlmgr 47935 (released 05-06jun18):</b>
+<li>Bug fix for lz4 backups (need <tt>-m</tt> for normal behavior).
+
+<p><b>tlmgr 47907 (released 03jun18):</b>
 <li>support for curl as a download program, and new default behavior for
 choosing. In this order:
   <ol>