texlive[62796] trunk: sync
commits+karl at tug.org
commits+karl at tug.org
Fri Mar 18 23:22:24 CET 2022
Revision: 62796
http://tug.org/svn/texlive?view=revision&revision=62796
Author: karl
Date: 2022-03-18 23:22:23 +0100 (Fri, 18 Mar 2022)
Log Message:
-----------
sync
Modified Paths:
--------------
trunk/Build/source/texk/tests/TeXLive/TLUtils.pm
trunk/Build/source/texk/texlive/tl_support/fmtutil.cnf
trunk/Master/tlpkg/bin/c2lx
Modified: trunk/Build/source/texk/tests/TeXLive/TLUtils.pm
===================================================================
--- trunk/Build/source/texk/tests/TeXLive/TLUtils.pm 2022-03-18 21:44:03 UTC (rev 62795)
+++ trunk/Build/source/texk/tests/TeXLive/TLUtils.pm 2022-03-18 22:22:23 UTC (rev 62796)
@@ -7,7 +7,7 @@
package TeXLive::TLUtils;
-my $svnrev = '$Revision: 62431 $';
+my $svnrev = '$Revision: 62529 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
@@ -259,7 +259,7 @@
@EXPORT = qw(setup_programs download_file process_logging_options
tldie tlwarn info log debug ddebug dddebug debug
debug_hash_str debug_hash
- win32 xchdir xsystem run_cmd system_pipe diskfree sort_archs);
+ win32 xchdir xsystem run_cmd system_pipe sort_archs);
}
use Cwd;
@@ -737,8 +737,9 @@
Run shell command C<$cmd> and captures its output. Returns a list with CMD's
output as the first element and the return value (exit code) as second.
-The C<@envvars> - if given - are variable name / value pairs set for the call
-and reset to their original value (or unset if not defined initially).
+If given, C<@envvars> is a list of environment variable name / value
+pairs set in C<%ENV> for the call and reset to their original value (or
+unset if not defined initially).
=cut
@@ -804,10 +805,10 @@
=item C<diskfree($path)>
-If a POSIX compliant C<df> program is found, returns the number of
-Mb free at C<$path>, otherwise C<-1>. If C<$path> is not existent, go
-back up to two levels and check if any of the parents exists, and use
-the existing one for computing the disk space.
+If a POSIX compliant C<df> program is found, returns the number of Mb
+free at C<$path>, otherwise C<-1>. If C<$path> does not exist, check
+upwards for two levels for an existing parent, and if found, use it for
+computing the disk space.
=cut
@@ -838,9 +839,9 @@
my ($h,$l) = split(/\n/, $output);
my ($fs, $nrb, $used, $avail, @rest) = split(' ', $l);
debug("disk space: used=$used (512-block), avail=$avail (512-block)\n");
- # $avail is in 512 blocks, so we need to device by 2 * 1024 to obtain Mb
- # require that at least 100M remain free
- return (int($avail / 2024));
+ # $avail is in 512-byte blocks, so we need to divide by 2*1024 to
+ # obtain Mb. Require that at least 100M remain free.
+ return (int($avail / 2048));
} else {
# error in running df -P out of whatever reason
return (-1);
@@ -1643,7 +1644,7 @@
return($remtime, $tottime);
}
-
+
=item C<install_packages($from_tlpdb, $media, $to_tlpdb, $what, $opt_src, $opt_doc, $retry, $continue)>
Installs the list of packages found in C<@$what> (a ref to a list) into
@@ -1650,13 +1651,14 @@
the TLPDB given by C<$to_tlpdb>. Information on files are taken from
the TLPDB C<$from_tlpdb>.
-C<$opt_src> and C<$opt_doc> specify whether srcfiles and docfiles should be
-installed (currently implemented only for installation from uncompressed media).
+C<$opt_src> and C<$opt_doc> specify whether srcfiles and docfiles should
+be installed (currently implemented only for installation from
+uncompressed media).
If C<$retry> is trueish, retry failed packages a second time.
If C<$continue> is trueish, installation failure of non-critical packages
-will be ignored.
+will be ignored (success is returned).
Returns 1 on success and 0 on error.
@@ -1663,7 +1665,8 @@
=cut
sub install_packages {
- my ($fromtlpdb,$media,$totlpdb,$what,$opt_src,$opt_doc, $opt_retry, $opt_continue) = @_;
+ my ($fromtlpdb,$media,$totlpdb,$what,
+ $opt_src,$opt_doc,$opt_retry,$opt_continue) = @_;
my $container_src_split = $fromtlpdb->config_src_container;
my $container_doc_split = $fromtlpdb->config_doc_container;
my $root = $fromtlpdb->root;
@@ -1742,7 +1745,7 @@
if (!$fromtlpdb->install_package($package, $totlpdb)) {
if ($opt_continue) {
push @::installation_failed_packages, $package;
- tlwarn("Failed to install $package, but continue anyway!\n");
+ tlwarn("Failed to install $package, but continuing anyway!\n");
} else {
return 0;
}
Modified: trunk/Build/source/texk/texlive/tl_support/fmtutil.cnf
===================================================================
--- trunk/Build/source/texk/texlive/tl_support/fmtutil.cnf 2022-03-18 21:44:03 UTC (rev 62795)
+++ trunk/Build/source/texk/texlive/tl_support/fmtutil.cnf 2022-03-18 22:22:23 UTC (rev 62796)
@@ -1,4 +1,4 @@
-# Generated by /home/texlive/karl/Master/bin/x86_64-linux/tlmgr on Sat Oct 3 02:49:47 2020
+# Generated by /home/texlive/karl/Master/bin/x86_64-linux/tlmgr on Sun Mar 13 01:49:39 2022
# Originally written by Thomas Esser, 1998. Public domain.
#
# For guidance on how to support local formats, see the man
@@ -68,6 +68,10 @@
# from eplain:
eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini
#
+# from hitex:
+hilatex hitex language.dat -etex -ltx hilatex.ini
+hitex hitex language.def -etex -ltx hitex.ini
+#
# from jadetex:
jadetex pdftex language.dat *jadetex.ini
pdfjadetex pdftex language.dat *pdfjadetex.ini
@@ -117,7 +121,7 @@
mptopdf pdftex - -translate-file=cp227.tcx mptopdf.tex
#
# from optex:
-optex luatex hyphen-lan.opm optex.ini
+optex luatex - optex.ini
#
# from pdftex:
etex pdftex language.def -translate-file=cp227.tcx *etex.ini
Modified: trunk/Master/tlpkg/bin/c2lx
===================================================================
--- trunk/Master/tlpkg/bin/c2lx 2022-03-18 21:44:03 UTC (rev 62795)
+++ trunk/Master/tlpkg/bin/c2lx 2022-03-18 22:22:23 UTC (rev 62796)
@@ -30,7 +30,7 @@
elif test "x$1" = xjxu; then
shift; label=jxu
pkgs="beaulivre colorist einfart lebhart mindflow minimalist simplivre"
- pkgs="$pkgs create-theorem crethe projlib"
+ pkgs="$pkgs create-theorem projlib"
elif test "x$1" = xqyi; then
shift; label=qyi
pkgs="easybook spbmark"
More information about the tex-live-commits
mailing list.