doc/test updates.

dvips.texi: remov 
fmtutil.pl: return status, --no-strict wording.
updmap.pl: main output first.
TLPDB.pm (not_virtual_install_package): variables in diagnostics.
tl-update-containers: multi-arg xsystem call.


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

7 files changed, 92 insertions, 85 deletions

diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog
index 5bd3504bc22..361307213ad 100644
--- a/Build/source/texk/dvipsk/ChangeLog
+++ b/Build/source/texk/dvipsk/ChangeLog
@@ -1,3 +1,7 @@
+2016-06-29  Karl Berry  <karl@tug.org>
+
+	* dvips.texi: remove idvi reference, long gone.
+
 2016-05-20  Karl Berry  <karl@tug.org>
 
 	* Version 5.996 for TeX Live 2016.
diff --git a/Build/source/texk/dvipsk/dvips.info b/Build/source/texk/dvipsk/dvips.info
index 22cbb6e4fdf..fa897a5595b 100644
--- a/Build/source/texk/dvipsk/dvips.info
+++ b/Build/source/texk/dvipsk/dvips.info
@@ -2278,13 +2278,7 @@ first place are available from 'CTAN:/support/hypertex'.  For CTAN info,
    This hypertext support (and original form of the documentation) was
 written by Mark Doyle and Tanmoy Bhattacharya as the 'dvihps' program.
 You can retrieve their software and additional documentation via the
-CTAN reference above.  You may also be interested in the Java previewer
-IDVI, available at <http://www.win.tue.nl/~dickie/idvi>, and/or in
-<http://www.emrg.com/texpdf.html>, which describes the process of making
-PDF files from TeX files in more detail.
-
-   Mail archives for the original project are at
-<http://math.albany.edu:8800/hm/ht/>.
+CTAN reference above.
 
 * Menu:
 
@@ -2351,7 +2345,7 @@ PostScript fonts use this character code for characters other than space
 (notably the Greek letter psi in the 'Symbol' font), and so these
 characters are dropped.  This bug is fixed in version 2.1.
 
-   If you can't upgrade, One workaround is to change all the trailing
+   If you can't upgrade, one workaround is to change all the trailing
 blanks in strings to a character code that isn't in the font.  This
 works because the default behavior is to substitute a blank for a
 missing character, i.e., the distiller is fooled into substituting the
@@ -4666,35 +4660,35 @@ Node: Literal headers89784
 Node: PostScript hooks90493
 Node: Literal examples92589
 Node: Hypertext94043
-Node: Hypertext caveats95591
-Node: Hypertext specials99979
-Node: PostScript fonts102613
-Node: Font concepts103730
-Node: Metric files104897
-Node: Glyph files107677
-Node: Virtual fonts110036
-Node: Encodings111862
-Node: PostScript typesetting114265
-Node: Making a font available117350
-Node: Invoking afm2tfm122384
-Node: Changing font encodings123401
-Node: Changing TeX encodings124192
-Node: Changing PostScript encodings125294
-Node: Changing both encodings126638
-Node: Reencoding with Afm2tfm127312
-Node: Encoding file format130415
-Node: Special font effects134619
-Node: Afm2tfm options136879
-Node: psfonts.map140404
-Node: Color145134
-Node: Color macro files146178
-Node: User-definable colors149371
-Node: Color subtleties150647
-Node: Ted Turner152299
-Node: Color device configuration153524
-Node: Color support details155968
-Node: Color specifications156346
-Node: Color specials157750
-Node: Index159879
+Node: Hypertext caveats95272
+Node: Hypertext specials99660
+Node: PostScript fonts102294
+Node: Font concepts103411
+Node: Metric files104578
+Node: Glyph files107358
+Node: Virtual fonts109717
+Node: Encodings111543
+Node: PostScript typesetting113946
+Node: Making a font available117031
+Node: Invoking afm2tfm122065
+Node: Changing font encodings123082
+Node: Changing TeX encodings123873
+Node: Changing PostScript encodings124975
+Node: Changing both encodings126319
+Node: Reencoding with Afm2tfm126993
+Node: Encoding file format130096
+Node: Special font effects134300
+Node: Afm2tfm options136560
+Node: psfonts.map140085
+Node: Color144815
+Node: Color macro files145859
+Node: User-definable colors149052
+Node: Color subtleties150328
+Node: Ted Turner151980
+Node: Color device configuration153205
+Node: Color support details155649
+Node: Color specifications156027
+Node: Color specials157431
+Node: Index159560
 
 End Tag Table
diff --git a/Build/source/texk/dvipsk/dvips.texi b/Build/source/texk/dvipsk/dvips.texi
index 882ef45697e..0ab9951a4ff 100644
--- a/Build/source/texk/dvipsk/dvips.texi
+++ b/Build/source/texk/dvipsk/dvips.texi
@@ -2877,13 +2877,7 @@ CTAN info, @pxref{unixtex.ftp,,, kpathsea, Kpathsea}.
 This hypertext support (and original form of the documentation) was
 written by Mark Doyle and Tanmoy Bhattacharya as the @samp{dvihps}
 program. You can retrieve their software and additional documentation
-via the CTAN reference above.  You may also be interested in the Java
-previewer IDVI, available at @url{http://www.win.tue.nl/~dickie/idvi},
-and/or in @url{http://www.emrg.com/texpdf.html}, which describes
-the process of making PDF files from TeX files in more detail.
-
-Mail archives for the original project are at
-@url{http://math.albany.edu:8800/hm/ht/}.
+via the CTAN reference above.
 
 
 @menu
@@ -2962,7 +2956,7 @@ use this character code for characters other than space (notably the
 Greek letter psi in the @code{Symbol} font), and so these characters are
 dropped.  This bug is fixed in version 2.1.
 
-If you can't upgrade, One workaround is to change all the trailing
+If you can't upgrade, one workaround is to change all the trailing
 blanks in strings to a character code that isn't in the font. This works
 because the default behavior is to substitute a blank for a missing
 character, i.e., the distiller is fooled into substituting the right
diff --git a/Master/texmf-dist/scripts/texlive/fmtutil.pl b/Master/texmf-dist/scripts/texlive/fmtutil.pl
index b163cda5774..cd8d314bb2e 100755
--- a/Master/texmf-dist/scripts/texlive/fmtutil.pl
+++ b/Master/texmf-dist/scripts/texlive/fmtutil.pl
@@ -1271,6 +1271,9 @@ If not operating in mktexfmt mode, exactly one command must be given,
 extensions should generally not be specified, no non-option arguments
 are allowed, and multiple formats can be generated, as follows.
 
+By default, the return status is zero if all formats requested are
+successfully built, else nonzero.
+
 Options:
   --sys                   use TEXMFSYS{VAR,CONFIG} instead of TEXMF{VAR,CONFIG}
   --cnffile FILE          read FILE instead of fmtutil.cnf
@@ -1282,7 +1285,7 @@ Options:
   --no-error-if-no-engine=ENGINE1,ENGINE2,...
                           exit successfully even if a required engine
                            is missing, if it is included in the list.
-  --no-strict             don't exit with bad status if a format fails to build
+  --no-strict             exit successfully even if a format fails to build
   --nohash                don't update ls-R files
   --recorder              pass the -recorder option and save .fls files
   --quiet                 be silent
diff --git a/Master/texmf-dist/scripts/texlive/updmap.pl b/Master/texmf-dist/scripts/texlive/updmap.pl
index 88b1ce28bc6..c4ccbfffdda 100755
--- a/Master/texmf-dist/scripts/texlive/updmap.pl
+++ b/Master/texmf-dist/scripts/texlive/updmap.pl
@@ -1,9 +1,9 @@
 #!/usr/bin/env perl
-# $Id: updmap.pl 37076 2015-04-27 17:08:10Z karl $
+# $Id$
 # updmap - maintain map files for outline fonts.
 # (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.)
 # 
-# Copyright 2011-2015 Norbert Preining
+# Copyright 2011-2016 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 #
@@ -14,7 +14,7 @@
 # the original versions were licensed under the following agreement:
 # Anyone may freely use, modify, and/or distribute this file, without
 
-my $svnid = '$Id: updmap.pl 37866 2015-07-18 17:08:10Z preining $';
+my $svnid = '$Id$';
 
 my $TEXMFROOT;
 BEGIN {
@@ -27,10 +27,10 @@ BEGIN {
   unshift(@INC, "$TEXMFROOT/tlpkg");
 }
 
-my $lastchdate = '$Date: 2015-04-27 19:08:10 +0200 (Mon, 27 Apr 2015) $';
+my $lastchdate = '$Date$';
 $lastchdate =~ s/^\$Date:\s*//;
 $lastchdate =~ s/ \(.*$//;
-my $svnrev = '$Revision: 37076 $';
+my $svnrev = '$Revision$';
 $svnrev =~ s/^\$Revision:\s*//;
 $svnrev =~ s/\s*\$$//;
 my $version = "r$svnrev ($lastchdate)";
@@ -1457,7 +1457,6 @@ sub enable_disable_maps {
   my $tc = $alldata->{'changes_config'};
   die "$prg: top config file $tc has not been read."
     if (!defined($alldata->{'updmap'}{$tc}));
-  my $changed = 0;
 
   for my $w (@what) {
     if ($w =~ m/=/) {
@@ -2247,12 +2246,39 @@ Commands:
   --listavailablemaps       list available maps (details below)
   --syncwithtrees           disable unavailable map files in updmap.cfg
 
-Explanation of the map types: the (only) difference between Map and
-MixedMap is that MixedMap entries are not added to psfonts_pk.map.
-The purpose is to help users with devices that render Type 1 outline
-fonts worse than mode-tuned Type 1 bitmap fonts.  So, MixedMap is used
-for fonts that are available as both Type 1 and Metafont.
-KanjiMap entries are added to psfonts_t1.map and kanjix.map.
+The main output:
+
+  The main output of updmap is the files containing the individual font
+  map lines which the drivers (dvips, pdftex, etc.) read to handle fonts.
+  
+  The map files for dvips (psfonts.map) and pdftex and dvipdfmx
+  (pdftex.map) are written to TEXMFVAR/fonts/map/updmap/{dvips,pdftex}/.
+  
+  In addition, information about Kanji fonts is written to
+  TEXMFVAR/fonts/map/updmap/dvipdfmx/kanjix.map, and optionally to 
+  TEXMFVAR/fonts/map/updmap/pxdvi/xdvi-ptex.map.  These are for Kanji
+  only and are not like other map files.  dvipdfmx reads pdftex.map for
+  the map entries for non-Kanji fonts.
+  
+  If no option is given, so the invocation is just "updmap" or
+  "updmap-sys", these output files are always recreated.
+
+  Otherwise, if an option such as --enable or --disable is given, the
+  output files are recreated if the list of enabled map files (from
+  updmap.cfg) has changed.  The --force option overrides this,
+  always recreating the output files.
+  
+Explanation of the map types:
+
+  The normal type is Map.
+  
+  The only difference between Map and MixedMap is that MixedMap entries
+  are not added to psfonts_pk.map.  The purpose is to help users with
+  devices that render Type 1 outline fonts worse than mode-tuned Type 1
+  bitmap fonts.  So, MixedMap is used for fonts that are available as
+  both Type 1 and Metafont.
+
+  KanjiMap entries are added to psfonts_t1.map and kanjix.map.
 
 Explanation of the OPTION names for --showoptions, --showoption, --setoption:
 
@@ -2329,7 +2355,7 @@ Where and which updmap.cfg changes are saved:
   specified that an updmap.cfg needs to be updated.  In this case:
 
   1) If config files are given on the command line, then the first one
-  given will be used to save any such changes.
+  given is used to save any such changes.
   
   2) If the config files are taken from kpsewhich output, then the
   algorithm is more complex:
@@ -2376,20 +2402,6 @@ Disabling maps:
     Map mt-yy.map
   and call $prg.
 
-The main output:
-
-  The main output of updmap is the files containing the individual font
-  map lines which the drivers (dvips, pdftex, etc.) read to handle fonts.
-  
-  The map files for dvips (psfonts.map) and pdftex (pdftex.map) are
-  written to TEXMFVAR/fonts/map/updmap/{dvips,pdftex}/.
-  
-  In addition, information about Kanji fonts is written to
-  TEXMFVAR/fonts/map/updmap/dvipdfmx/kanjix.map, and optionally to 
-  TEXMFVAR/fonts/map/updmap/pxdvi/xdvi-ptex.map.  These are for Kanji
-  only and are not like other map files.  dvipdfmx reads pdftex.map for
-  the map entries for non-Kanji fonts.
-
 Listing of maps:
 
   The two options --listmaps and --listavailablemaps list all maps
@@ -2420,7 +2432,7 @@ The log file is written to TEXMFVAR/web2c/updmap.log.
 
 For step-by-step instructions on making new fonts known to TeX, read
 http://tug.org/fonts/fontinstall.html.  For even more terse
-instructions, read the beginning of the main updmap.cfg.
+instructions, read the beginning of the main updmap.cfg file.
 
 Report bugs to: tex-live\@tug.org
 TeX Live home page: <http://tug.org/texlive/>
diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm
index 48f95e6f260..32119ea0f75 100644
--- a/Master/tlpkg/TeXLive/TLPDB.pm
+++ b/Master/tlpkg/TeXLive/TLPDB.pm
@@ -243,7 +243,8 @@ sub remove_tlpobj {
 The C<from_file> function initializes the C<TLPDB> if the root was not
 given at generation time.  See L<TLPDB::new> for more information.
 
-It returns the actual number of packages (TLPOBJs) read from C<$filename>.
+It returns the actual number of packages (TLPOBJs) read from
+C<$filename>, and zero if there are problems (and gives warnings).
 
 =cut
 
@@ -290,9 +291,8 @@ sub from_file {
     } elsif (-d "$rootpath/$Archive") {
       $media = 'local_compressed';
     } else {
-      # we cannot find the right type, return undefined, that should
-      # make people notice
-      tlwarn("Cannot determine type of tlpdb!\n");
+      # we cannot find the right type, return zero, hope people notice
+      tlwarn("Cannot determine type of tlpdb from $rootpath!\n");
       return 0;
     }
   }
@@ -1706,9 +1706,10 @@ sub not_virtual_install_package {
     # we have to write out the tlpobj file since it is contained in the
     # archives (.tar.xz) but at DVD install time we don't have them
     my $tlpod = $totlpdb->root . "/tlpkg/tlpobj";
-    mkdirhier( $tlpod );
+    mkdirhier($tlpod);
     my $count = 0;
-    until (open(TMP,">$tlpod/".$tlpobj->name.".tlpobj")) {
+    my $tlpobj_file = ">$tlpod/" . $tlpobj->name . ".tlpobj";
+    until (open(TMP, $tlpobj_file)) {
       # The open might fail for no good reason on Windows.
       # Try again for a while, but not forever.
       if ($count++ == 100) { die "$0: open($tlpobj_file) failed: $!"; }
diff --git a/Master/tlpkg/bin/tl-update-containers b/Master/tlpkg/bin/tl-update-containers
index 18396811f20..42f39eeac66 100755
--- a/Master/tlpkg/bin/tl-update-containers
+++ b/Master/tlpkg/bin/tl-update-containers
@@ -405,10 +405,9 @@ sub main {
     xsystem("$TeXLive::TLConfig::ChecksumProgram texlive.tlpdb > texlive.tlpdb.$TeXLive::TLConfig::ChecksumExtension");
     # remove signature, otherwise gpg breaks
     xsystem("rm -f texlive.tlpdb.$TeXLive::TLConfig::ChecksumExtension.asc");
-    if (!$opt_nosign) {
-      # the following somehow needs to be on one line, otherwise the shell
-      # expansion is strange!
-      xsystem("$opt_gpgcmd texlive.tlpdb.$TeXLive::TLConfig::ChecksumExtension");
+    if (! $opt_nosign) {
+      xsystem($opt_gpgcmd, 
+              "texlive.tlpdb.$TeXLive::TLConfig::ChecksumExtension");
     }
     xchdir($olddir);
   } else {