summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-07-02 00:54:11 +0000
committerKarl Berry <karl@freefriends.org>2016-07-02 00:54:11 +0000
commit454b7b67c9ad40d03c54252e9da17b04a78ef56e (patch)
treeb0534bbff3d916864263a047688d17baa61d528a /Build
parentaf864fc6811880ec8d533d5f5b3fc5ba3e792f62 (diff)
sync
git-svn-id: svn://tug.org/texlive/trunk@41601 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/ChangeLog3
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/fmtutil.pl13
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/updmap.pl68
-rw-r--r--Build/source/utils/devnag/ChangeLog2
4 files changed, 52 insertions, 34 deletions
diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog
index 03076f7b243..50b092be68a 100644
--- a/Build/source/ChangeLog
+++ b/Build/source/ChangeLog
@@ -1,5 +1,8 @@
2016-06-30 Karl Berry <karl@tug.org>
+ * extra/epstopdf/epstopdf.pl: sort debugging lines, history (for
+ release to CTAN)
+
* version.ac (tex_live_version): 2016 => 2017/dev.
* tardate.ac (tex_live_tardate): 2015-05-12 => 2016-05-23.
(Though this is not used for any release.)
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl b/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl
index a317afe661a..0879c69ae00 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
-# $Id: fmtutil.pl 41529 2016-06-23 03:12:14Z preining $
+# $Id: fmtutil.pl 41566 2016-06-29 16:04:35Z karl $
# fmtutil - utility to maintain format files.
# (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.)
#
@@ -24,11 +24,11 @@ BEGIN {
TeX::Update->import();
}
-my $svnid = '$Id: fmtutil.pl 41529 2016-06-23 03:12:14Z preining $';
-my $lastchdate = '$Date: 2016-06-23 05:12:14 +0200 (Thu, 23 Jun 2016) $';
+my $svnid = '$Id: fmtutil.pl 41566 2016-06-29 16:04:35Z karl $';
+my $lastchdate = '$Date: 2016-06-29 18:04:35 +0200 (Wed, 29 Jun 2016) $';
$lastchdate =~ s/^\$Date:\s*//;
$lastchdate =~ s/ \(.*$//;
-my $svnrev = '$Revision: 41529 $';
+my $svnrev = '$Revision: 41566 $';
$svnrev =~ s/^\$Revision:\s*//;
$svnrev =~ s/\s*\$$//;
my $version = "r$svnrev ($lastchdate)";
@@ -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/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl b/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl
index d731507ef90..5502bd33a72 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl
@@ -1,9 +1,9 @@
#!/usr/bin/env perl
-# $Id: updmap.pl 37866 2015-07-17 19:00:04Z preining $
+# $Id: updmap.pl 41566 2016-06-29 16:04:35Z karl $
# 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-17 19:00:04Z preining $';
+my $svnid = '$Id: updmap.pl 41566 2016-06-29 16:04:35Z karl $';
my $TEXMFROOT;
BEGIN {
@@ -27,10 +27,10 @@ BEGIN {
unshift(@INC, "$TEXMFROOT/tlpkg");
}
-my $lastchdate = '$Date: 2015-07-17 21:00:04 +0200 (Fri, 17 Jul 2015) $';
+my $lastchdate = '$Date: 2016-06-29 18:04:35 +0200 (Wed, 29 Jun 2016) $';
$lastchdate =~ s/^\$Date:\s*//;
$lastchdate =~ s/ \(.*$//;
-my $svnrev = '$Revision: 37866 $';
+my $svnrev = '$Revision: 41566 $';
$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/Build/source/utils/devnag/ChangeLog b/Build/source/utils/devnag/ChangeLog
index d3483b3530b..043a2adce6d 100644
--- a/Build/source/utils/devnag/ChangeLog
+++ b/Build/source/utils/devnag/ChangeLog
@@ -1,6 +1,6 @@
2016-06-30 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
- * tests/*.tex: udpate version number.
+ * tests/*.tex: update version number.
2016-05-06 Ken Brown <kbrow1i@gmail.com>