summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/kpathsea/ChangeLog5
-rw-r--r--Build/source/texk/kpathsea/texmf.cnf17
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/tlmgr.pl19
-rw-r--r--Master/texmf-dist/scripts/texlive/NEWS4
-rw-r--r--Master/texmf-dist/web2c/texmf.cnf17
5 files changed, 35 insertions, 27 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 7b38a5539ec..66e2d043bab 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,8 @@
+2023-04-11 Karl Berry <karl@tug.org>
+
+ * texmf.cnf: doc; explicitly mention that all the texmf trees need
+ to follow the TDS.
+
2023-03-09 Karl Berry <karl@tug.org>
* TL'23 release.
diff --git a/Build/source/texk/kpathsea/texmf.cnf b/Build/source/texk/kpathsea/texmf.cnf
index 0927bed4688..ec58bb91b4f 100644
--- a/Build/source/texk/kpathsea/texmf.cnf
+++ b/Build/source/texk/kpathsea/texmf.cnf
@@ -61,6 +61,9 @@
% Sorry for the off-by-one-generation names.
TEXMFROOT = $SELFAUTOPARENT
+% The various texmf trees used by TeX Live, follow.
+% They must must all have the TDS directory structure (https://tug.org/tds).
+
% The main tree of distributed packages and programs:
TEXMFDIST = $TEXMFROOT/texmf-dist
@@ -94,7 +97,7 @@ TEXMFCONFIG = ~/.texlive2023/texmf-config
% value, hence the empty braces.
TEXMFAUXTREES = {}
-% List all the texmf trees. For an explanation of what they are, see the
+% List of all the texmf trees. For an explanation of what they are, see the
% TeX Live manual.
%
% For texconfig to work properly, TEXMFCONFIG and TEXMFVAR should be named
@@ -105,8 +108,8 @@ TEXMFAUXTREES = {}
% generally a source of confusion to have different versions of a
% package installed, whatever the trees, so try to avoid it.
%
-% The odd-looking $TEXMFAUXTREES$TEXMF... construct is so that if no auxtree is
-% ever defined (the 99% common case), no extra elements will be added to
+% The odd-looking $TEXMFAUXTREES$TEXMF... construct is so that if no auxtree
+% is defined (99% common case), no extra elements will be added to
% the search paths. tlmgr takes care to end any value with a trailing comma.
TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST}
@@ -114,7 +117,7 @@ TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFS
% this is all and only the !! elements of TEXMF, so that mktexlsr does not
% create ls-R files in the non-!! elements -- because if an ls-R is
% present, it will be used, and the disk will not (usually) be searched,
-% regardless of !!. Although in principle a directory listed here need
+% regardless of !!. Although in theory a directory listed here need
% not contain an ls-R file, in practice they all should.
TEXMFDBS = {!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST}
@@ -157,9 +160,11 @@ WEB2C = $TEXMF/web2c
% This variable exists only to be redefined; it is used in nearly all
% search paths. If a document has source files not only in the current
% directory but also in subdirectories, it is convenient to set
-% TEXMFDOTDIR=.// so that everything will be searched automatically.
+% TEXMFDOTDIR=.// so that everything will be searched automatically,
+% without the need to set up the TDS directory structure (since this is
+% a "directory" and not a "tree").
% On the other hand, if you never want the current directory to be
-% searched at all, setting TEXMFDOTDIR=/nonesuch should come close.
+% searched at all, setting TEXMFDOTDIR=/nonesuch comes close.
%
TEXMFDOTDIR = .
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index 335c52ef0de..1197e71afe3 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
-# $Id: tlmgr.pl 66457 2023-03-07 23:07:12Z preining $
+# $Id: tlmgr.pl 66798 2023-04-08 00:15:21Z preining $
# Copyright 2008-2023 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
@@ -8,8 +8,8 @@
use strict; use warnings;
-my $svnrev = '$Revision: 66457 $';
-my $datrev = '$Date: 2023-03-08 00:07:12 +0100 (Wed, 08 Mar 2023) $';
+my $svnrev = '$Revision: 66798 $';
+my $datrev = '$Date: 2023-04-08 02:15:21 +0200 (Sat, 08 Apr 2023) $';
my $tlmgrrevision;
my $tlmgrversion;
my $prg;
@@ -892,17 +892,6 @@ sub handle_execute_actions {
if ($::files_changed) {
$errors += do_cmd_and_check("mktexlsr");
- # see comments in install-tl about lmtx.
- my $lmtx = "$bindir/luametatex";
- if (defined($localtlpdb->get_package('context'))
- && (-x "$lmtx" || -x "$lmtx.exe")
- && TeXLive::TLUtils::system_ok("$lmtx --version")
- ) {
- $errors += do_cmd_and_check("mtxrun --generate");
- $errors += do_cmd_and_check("context --luatex --generate");
- } else {
- debug("skipped ConTeXt cache regeneration\n");
- }
$::files_changed = 0;
}
@@ -10254,7 +10243,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 66457 2023-03-07 23:07:12Z preining $
+$Id: tlmgr.pl 66798 2023-04-08 00:15:21Z preining $
=cut
# test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html
diff --git a/Master/texmf-dist/scripts/texlive/NEWS b/Master/texmf-dist/scripts/texlive/NEWS
index 2787d3960ca..b2e14e6231c 100644
--- a/Master/texmf-dist/scripts/texlive/NEWS
+++ b/Master/texmf-dist/scripts/texlive/NEWS
@@ -1,6 +1,10 @@
(This file public domain. Originally written by Norbert Preining and
Karl Berry, 2010.)
+<p><b>tlmgr 66798 (released 11apr23):</b>
+<li>base context cache regeneration on ls-R mtimes.
+<li>support context paper size setting.
+
<p>TeX Live 2022 released.
<p><b>tlmgr 66457 (released 8mar23):</b>
diff --git a/Master/texmf-dist/web2c/texmf.cnf b/Master/texmf-dist/web2c/texmf.cnf
index 0927bed4688..ec58bb91b4f 100644
--- a/Master/texmf-dist/web2c/texmf.cnf
+++ b/Master/texmf-dist/web2c/texmf.cnf
@@ -61,6 +61,9 @@
% Sorry for the off-by-one-generation names.
TEXMFROOT = $SELFAUTOPARENT
+% The various texmf trees used by TeX Live, follow.
+% They must must all have the TDS directory structure (https://tug.org/tds).
+
% The main tree of distributed packages and programs:
TEXMFDIST = $TEXMFROOT/texmf-dist
@@ -94,7 +97,7 @@ TEXMFCONFIG = ~/.texlive2023/texmf-config
% value, hence the empty braces.
TEXMFAUXTREES = {}
-% List all the texmf trees. For an explanation of what they are, see the
+% List of all the texmf trees. For an explanation of what they are, see the
% TeX Live manual.
%
% For texconfig to work properly, TEXMFCONFIG and TEXMFVAR should be named
@@ -105,8 +108,8 @@ TEXMFAUXTREES = {}
% generally a source of confusion to have different versions of a
% package installed, whatever the trees, so try to avoid it.
%
-% The odd-looking $TEXMFAUXTREES$TEXMF... construct is so that if no auxtree is
-% ever defined (the 99% common case), no extra elements will be added to
+% The odd-looking $TEXMFAUXTREES$TEXMF... construct is so that if no auxtree
+% is defined (99% common case), no extra elements will be added to
% the search paths. tlmgr takes care to end any value with a trailing comma.
TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST}
@@ -114,7 +117,7 @@ TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFS
% this is all and only the !! elements of TEXMF, so that mktexlsr does not
% create ls-R files in the non-!! elements -- because if an ls-R is
% present, it will be used, and the disk will not (usually) be searched,
-% regardless of !!. Although in principle a directory listed here need
+% regardless of !!. Although in theory a directory listed here need
% not contain an ls-R file, in practice they all should.
TEXMFDBS = {!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST}
@@ -157,9 +160,11 @@ WEB2C = $TEXMF/web2c
% This variable exists only to be redefined; it is used in nearly all
% search paths. If a document has source files not only in the current
% directory but also in subdirectories, it is convenient to set
-% TEXMFDOTDIR=.// so that everything will be searched automatically.
+% TEXMFDOTDIR=.// so that everything will be searched automatically,
+% without the need to set up the TDS directory structure (since this is
+% a "directory" and not a "tree").
% On the other hand, if you never want the current directory to be
-% searched at all, setting TEXMFDOTDIR=/nonesuch should come close.
+% searched at all, setting TEXMFDOTDIR=/nonesuch comes close.
%
TEXMFDOTDIR = .