summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-04-17 21:35:25 +0000
committerKarl Berry <karl@freefriends.org>2020-04-17 21:35:25 +0000
commit77b8133a6dc28b8dc69f10c5d2f32fb1c45956f4 (patch)
treee2c379d048e27aa81cead61e001706c6c8115c15
parent5ccd2c08ab341c51d0fffa59b25317003f97f08b (diff)
doc,sync
git-svn-id: svn://tug.org/texlive/trunk@54778 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/tests/TeXLive/TLUtils.pm11
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/tlmgr.pl14
-rw-r--r--Build/source/texk/texlive/tl_support/fmtutil.cnf28
-rwxr-xr-xMaster/tlpkg/bin/c2l3
-rwxr-xr-xMaster/tlpkg/bin/tl-update-tlpdb3
-rw-r--r--Master/tlpkg/doc/releng.txt13
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds5
7 files changed, 45 insertions, 32 deletions
diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm
index 086f5daad57..cda2868c165 100644
--- a/Build/source/texk/tests/TeXLive/TLUtils.pm
+++ b/Build/source/texk/tests/TeXLive/TLUtils.pm
@@ -5,7 +5,7 @@
package TeXLive::TLUtils;
-my $svnrev = '$Revision: 54143 $';
+my $svnrev = '$Revision: 54629 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
@@ -544,7 +544,7 @@ and thus honors various env variables like C<TMPDIR>, C<TMP>, and C<TEMP>.
sub initialize_global_tmpdir {
$::tl_tmpdir = File::Temp::tempdir(CLEANUP => 1);
- ddebug("tl_tempdir: creating global tempdir $::tl_tmpdir\n");
+ ddebug("initialize_global_tmpdir: creating global tempdir $::tl_tmpdir\n");
return ($::tl_tmpdir);
}
@@ -558,7 +558,7 @@ is terminated.
sub tl_tmpdir {
initialize_global_tmpdir() if (!defined($::tl_tmpdir));
my $tmp = File::Temp::tempdir(DIR => $::tl_tmpdir, CLEANUP => 1);
- ddebug("tl_tempdir: creating tempdir $tmp\n");
+ ddebug("tl_tmpdir: creating tempdir $tmp\n");
return ($tmp);
}
@@ -2213,7 +2213,10 @@ sub check_file_and_remove {
if ($tlchecksum ne $checksum) {
tlwarn("TLUtils::check_file: checksums differ for $xzfile:\n");
tlwarn("TLUtils::check_file: tlchecksum=$tlchecksum, arg=$checksum\n");
- $check_file_tmpdir = File::Temp::tempdir("tlcheckfileXXXXXXXX");
+ # on Windows passing a pattern creates the tmpdir in PWD
+ # which means that it will be tried to be created on the DVD
+ # $check_file_tmpdir = File::Temp::tempdir("tlcheckfileXXXXXXXX");
+ $check_file_tmpdir = File::Temp::tempdir();
tlwarn("TLUtils::check_file: removing $xzfile, "
. "but saving copy in $check_file_tmpdir\n");
copy($xzfile, $check_file_tmpdir);
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index ed3c0769072..9190fa952b8 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,12 +1,12 @@
#!/usr/bin/env perl
-# $Id: tlmgr.pl 54643 2020-04-11 00:19:37Z preining $
+# $Id: tlmgr.pl 54766 2020-04-16 11:50:17Z preining $
#
# Copyright 2008-2020 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
-my $svnrev = '$Revision: 54643 $';
-my $datrev = '$Date: 2020-04-11 02:19:37 +0200 (Sat, 11 Apr 2020) $';
+my $svnrev = '$Revision: 54766 $';
+my $datrev = '$Date: 2020-04-16 13:50:17 +0200 (Thu, 16 Apr 2020) $';
my $tlmgrrevision;
my $tlmgrversion;
my $prg;
@@ -7358,6 +7358,9 @@ sub load_options_from_config {
tlwarn("$prg: $fn: unknown value for no-checksums: $val\n");
}
+ } elsif ($key eq "tkfontscale") {
+ $config{'tkfontscale'} = $val;
+
} elsif ($sysmode) {
# keys here are only allowed in sys mode
if ($key eq "allowed-actions") {
@@ -9271,6 +9274,9 @@ command-line option.
=item C<require-verification>, value 0 or 1 (default 0), same as
command-line option.
+=item C<tkfontscale>, value any float.
+Controls the scaling of fonts in the Tk based frontends.
+
=item C<update-exclude>, value: comma-separated list of packages
(no space allowed). Same as the command line option C<--exclude>
for the action C<update>.
@@ -10031,7 +10037,7 @@ This script and its documentation were written for the TeX Live
distribution (L<https://tug.org/texlive>) and both are licensed under the
GNU General Public License Version 2 or later.
-$Id: tlmgr.pl 54643 2020-04-11 00:19:37Z preining $
+$Id: tlmgr.pl 54766 2020-04-16 11:50:17Z preining $
=cut
# test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html
diff --git a/Build/source/texk/texlive/tl_support/fmtutil.cnf b/Build/source/texk/texlive/tl_support/fmtutil.cnf
index b6a50b56f88..89509b69299 100644
--- a/Build/source/texk/texlive/tl_support/fmtutil.cnf
+++ b/Build/source/texk/texlive/tl_support/fmtutil.cnf
@@ -1,4 +1,4 @@
-# Generated by /home/texlive/karl/Master/bin/x86_64-linux/tlmgr on Mon Mar 2 23:04:51 2020
+# Generated by /home/texlive/karl/Master/bin/x86_64-linux/tlmgr on Thu Apr 16 01:56:35 2020
# Originally written by Thomas Esser, 1998. Public domain.
#
# For guidance on how to support local formats, see the man
@@ -61,10 +61,10 @@ pdfcslatex pdftex - -etex cslatex.ini
#
# from csplain:
csplain pdftex - -etex -enc csplain-utf8.ini
-pdfcsplain pdftex - -etex -enc csplain-utf8.ini
luacsplain luatex - -etex csplain.ini
-pdfcsplain xetex - -etex csplain.ini
pdfcsplain luatex - -etex csplain.ini
+pdfcsplain pdftex - -etex -enc csplain-utf8.ini
+pdfcsplain xetex - -etex csplain.ini
#
# from eplain:
eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini
@@ -74,16 +74,16 @@ jadetex pdftex language.dat *jadetex.ini
pdfjadetex pdftex language.dat *pdfjadetex.ini
#
# from latex-bin:
-latex pdftex language.dat -translate-file=cp227.tcx *latex.ini
-pdflatex pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini
dvilualatex luatex language.dat,language.dat.lua dvilualatex.ini
+latex pdftex language.dat -translate-file=cp227.tcx *latex.ini
lualatex luahbtex language.dat,language.dat.lua lualatex.ini
+pdflatex pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini
#
# from latex-bin-dev:
-latex-dev pdftex language.dat -translate-file=cp227.tcx *latex.ini
-pdflatex-dev pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini
dvilualatex-dev luatex language.dat,language.dat.lua dvilualatex.ini
+latex-dev pdftex language.dat -translate-file=cp227.tcx *latex.ini
lualatex-dev luahbtex language.dat,language.dat.lua lualatex.ini
+pdflatex-dev pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini
#
# from lollipop:
lollipop tex - lollipop.ini
@@ -92,12 +92,12 @@ lollipop tex - lollipop.ini
luahbtex luahbtex language.def,language.dat.lua luatex.ini
#
# from luajittex:
-luajittex luajittex language.def,language.dat.lua luatex.ini
luajithbtex luajithbtex language.def,language.dat.lua luatex.ini
+luajittex luajittex language.def,language.dat.lua luatex.ini
#
# from luatex:
-luatex luatex language.def,language.dat.lua luatex.ini
dviluatex luatex language.def,language.dat.lua dviluatex.ini
+luatex luatex language.def,language.dat.lua luatex.ini
#
# from metafont:
mf mf-nowin - -translate-file=cp227.tcx mf.ini
@@ -121,17 +121,17 @@ mptopdf pdftex - -translate-file=cp227.tcx mptopdf.tex
optex luatex hyphen-lan.opm optex.ini
#
# from pdftex:
-pdftex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini
etex pdftex language.def -translate-file=cp227.tcx *etex.ini
pdfetex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini
+pdftex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini
#
# from platex:
platex eptex language.dat *platex.ini
platex-dev eptex language.dat *platex.ini
#
# from ptex:
-ptex ptex - ptex.ini
eptex eptex language.def *eptex.ini
+ptex ptex - ptex.ini
#
# from tex:
tex tex - tex.ini
@@ -144,16 +144,16 @@ uplatex euptex language.dat *uplatex.ini
uplatex-dev euptex language.dat *uplatex.ini
#
# from uptex:
-uptex uptex - uptex.ini
euptex euptex language.def *euptex.ini
+uptex uptex - uptex.ini
#
# from xelatex-dev:
xelatex-dev xetex language.dat -etex xelatex.ini
#
# from xetex:
-xetex xetex language.def -etex xetex.ini
xelatex xetex language.dat -etex xelatex.ini
+xetex xetex language.def -etex xetex.ini
#
# from xmltex:
-xmltex pdftex language.dat *xmltex.ini
pdfxmltex pdftex language.dat *pdfxmltex.ini
+xmltex pdftex language.dat *xmltex.ini
diff --git a/Master/tlpkg/bin/c2l b/Master/tlpkg/bin/c2l
index 77a4439975f..91047a7bca5 100755
--- a/Master/tlpkg/bin/c2l
+++ b/Master/tlpkg/bin/c2l
@@ -87,7 +87,8 @@ sub main {
$ARGV[0] = "-p" if $ARGV[0] eq "p";
print "$0: running ctan2tl @ARGV\n";
- # assume bash until we don't have to.
+ # we want our exit status to be from ctan2tl, not tee, hence the
+ # pipefail bash-ism.
my @lines = `set -o pipefail; ctan2tl @ARGV </dev/null 2>&1 | tee /tmp/cl.out`;
my $status = $?;
diff --git a/Master/tlpkg/bin/tl-update-tlpdb b/Master/tlpkg/bin/tl-update-tlpdb
index e4731c863cc..a6ecc0e1ded 100755
--- a/Master/tlpkg/bin/tl-update-tlpdb
+++ b/Master/tlpkg/bin/tl-update-tlpdb
@@ -357,7 +357,8 @@ sub compare_and_fix_tlpdbs {
if ($do_commit) {
tlwarn("$prg: committing changes to tlpsrc files:\n");
TeXLive::TLUtils::xsystem("svn commit "
- . "-m'($prg) force increased revision after removal of files' "
+ . "-m'($prg) force increased revision after Catalogue change"
+ " or file removal' "
. "@svn_changed_files");
}
diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt
index 9dfbff6ce5f..374ba7a24f8 100644
--- a/Master/tlpkg/doc/releng.txt
+++ b/Master/tlpkg/doc/releng.txt
@@ -487,14 +487,14 @@ mkdir -p $hy/$this/packaging
#
# copy files from DVD:
mount /mnt/tc
-cd /mnt/tc
-cp -R [A-T]* index* setup /home/ftp/historic/systems/texcollection/$this
+cd /mnt/tc # check that it's the current release
+cp -pR [A-T]* index* setup /home/ftp/historic/systems/texcollection/$this
#
# copy ctan snapshot for TUG members:
-ls -l ~www/members/ctan20-*.tar
+ls -l ~www/members/ctan*20*.tar # how many links?
du !$
-rm -i ~www/members/ctan20-*.tar # assuming it's hard-linked, else move!
-nice -19 tar cf ~www/members/ctan`date +%y`-20180414.tar ctan
+rm -i ~www/members/ctan*20*.tar # assuming it's hard-linked, else move!
+nice -19 tar cf ~www/members/ctan`date +%y`-200413.tar ctan # update date!
chmod a=r ~www/members/ctan*.tar
ls -l !$; du !$
# edit members/index.html
@@ -505,7 +505,8 @@ cd && umount /mnt/tc
#
cd $hy/$this/packaging
# copy in files from texcollection svn:
-cp $HOME/src/texcollection/$this/packaging/* .
+svn update ~/src/texcollection/
+cp -p ~/src/texcollection/$this/packaging/* .
#
# make small image for web page:
pdftoppm -gray -r 222 texcoll-cover.pdf temp
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index afaa5eecdfc..8851204aed0 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -2847,7 +2847,8 @@ my $core_latex = "$Master/texmf-dist/tex/latex";
);
$standardinsrunner = "latex";
$standardinsrunner_opt = "-interaction=nonstopmode";
-#
+%specialinsrunner_opt = (); # not yet
+
# We separate the (non)interaction option from the command name
# because we don't ever want interaction, regardless of the command.
#
@@ -4319,7 +4320,7 @@ sub runjob {
# it's too verbose to print the full mf run of every font.
# but if mktextfm failed, show it.
print `cat $Jobid.log` if $status != 0;
- $#status = 0; # do not worry if the bitmap failed, e.g., grtt10.mf.
+ $status = 0; # do not worry if the bitmap failed, e.g., grtt10.mf.
} else {
print `cat $Jobid.log`;
}