summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-06-29 16:04:35 +0000
committerKarl Berry <karl@freefriends.org>2016-06-29 16:04:35 +0000
commit2597736aa760a011c7f8f0b9061139ba1131ac73 (patch)
tree12b69a6bb1bbc4d031d196c99b1e535b6f2097c6 /Master
parent4cba201476cfd2785bcb999d7dd7eed0abcbdeff (diff)
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
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/fmtutil.pl5
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/updmap.pl68
-rw-r--r--Master/tlpkg/TeXLive/TLPDB.pm13
-rwxr-xr-xMaster/tlpkg/bin/tl-update-containers7
4 files changed, 54 insertions, 39 deletions
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 {