summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-03-26 15:39:45 +0000
committerKarl Berry <karl@freefriends.org>2024-03-26 15:39:45 +0000
commit9f509b2d634f95e3b4973d83905365561bb78096 (patch)
tree09b19c31535e1d39afbc24ec2dd98cac53724c9d
parent4e2372e78667aa348bf1c6918511e7929d349aa2 (diff)
doc,sync
git-svn-id: svn://tug.org/texlive/trunk@70774 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/updmap.pl35
-rw-r--r--Build/source/texk/web2c/tests/aftergroupout.tex4
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm2
-rwxr-xr-xMaster/tlpkg/bin/tl-update-bindir10
-rw-r--r--Master/tlpkg/dev/profiles/TLctx.pro8
-rw-r--r--Master/tlpkg/doc/releng.txt1
6 files changed, 37 insertions, 23 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl b/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl
index 56caf2e85c9..e2f456ed5be 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 65932 2023-02-19 20:49:48Z siepo $
+# $Id: updmap.pl 70707 2024-03-19 22:03:22Z karl $
# updmap - maintain map files for outline fonts.
# (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.)
#
-# Copyright 2011-2022 Norbert Preining
+# Copyright 2011-2024 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
#
@@ -13,7 +13,7 @@
# later adaptions by Reinhard Kotucha, and Karl Berry.
# The current implementation is a complete rewrite.
-my $svnid = '$Id: updmap.pl 65932 2023-02-19 20:49:48Z siepo $';
+my $svnid = '$Id: updmap.pl 70707 2024-03-19 22:03:22Z karl $';
my $TEXMFROOT;
BEGIN {
@@ -26,10 +26,10 @@ BEGIN {
unshift(@INC, "$TEXMFROOT/tlpkg");
}
-my $lastchdate = '$Date: 2023-02-19 21:49:48 +0100 (Sun, 19 Feb 2023) $';
+my $lastchdate = '$Date: 2024-03-19 23:03:22 +0100 (Tue, 19 Mar 2024) $';
$lastchdate =~ s/^\$Date:\s*//;
$lastchdate =~ s/ \(.*$//;
-my $svnrev = '$Revision: 65932 $';
+my $svnrev = '$Revision: 70707 $';
$svnrev =~ s/^\$Revision:\s*//;
$svnrev =~ s/\s*\$$//;
my $version = "r$svnrev ($lastchdate)";
@@ -66,7 +66,8 @@ if (wndws()) {
my $texmfconfig = $TEXMFCONFIG;
my $texmfvar = $TEXMFVAR;
-my %opts = ( quiet => 0, nohash => 0, nomkmap => 0 );
+# copy by default for portability.
+my %opts = ( quiet => 0, nohash => 0, nomkmap => 0, copy => 1 );
my $alldata;
my $updLSR;
@@ -75,12 +76,12 @@ my @cmdline_options = (
"user",
"listfiles",
"cnffile=s@",
- "copy",
+ "copy!",
"disable=s@",
"dvipdfmoutputdir=s",
"dvipdfmxoutputdir=s",
"dvipsoutputdir=s",
- # the following does not work, Getopt::Long looses the first
+ # the following does not work, Getopt::Long loses the first
# entry in a multi setting, treat it separately in processOptions
# furthermore, it is not supported by older perls, so do it differently
#"enable=s{1,2}",
@@ -88,8 +89,8 @@ my @cmdline_options = (
"force",
"listavailablemaps",
"listmaps|l",
- "nohash",
- "nomkmap",
+ "nohash!",
+ "nomkmap!",
"dry-run|n",
"outputdir=s",
"pdftexoutputdir=s",
@@ -2272,6 +2273,10 @@ Among other things, these map files are used to determine which fonts
should be used as bitmaps and which as outlines, and to determine which
font files are included, typically subsetted, in the PDF or PostScript output.
+These maps are for fonts installed within the TeX hierarchy, and are not
+related to any system font lookups. They are primarily used for Type 1
+fonts, though a few OpenType and TrueType fonts are involved also.
+
updmap-sys (or updmap -sys) is intended to affect the system-wide
configuration, while updmap-user (or updmap -user) affects personal
configuration files only, overriding the system files.
@@ -2281,7 +2286,8 @@ running updmap-sys no longer has any effect. updmap-sys issues a
warning about this, since it is rarely desirable.
See https://tug.org/texlive/scripts-sys-user.html for details.
-By default, the TeX filename database (ls-R) is also updated.
+By default, the TeX filename database (ls-R) is also updated; use
+--nohash to skip that step.
The updmap system is regrettably complicated, for both inherent and
historical reasons. A general overview:
@@ -2290,8 +2296,8 @@ historical reasons. A general overview:
font-specific .maps, in which each line gives information about a
different TeX (.tfm) font.
- updmap reads the updmap.cfg files and then concatenates the
- contents of those .map files into the main output files: psfonts.map
- for dvips and pdftex.map for pdftex and dvipdfmx.
+ contents of those .map files into the main output files, generically
+ named: psfonts.map for dvips, and pdftex.map for pdftex and dvipdfmx.
- The updmap.cfg files themselves are created and updated at package
installation time, by the system installer or the package manager or
by hand, and not (by default) by updmap.
@@ -2305,7 +2311,8 @@ Options:
--pdftexoutputdir DIR specify output directory (pdftex syntax)
--pxdvioutputdir DIR specify output directory (pxdvi syntax)
--outputdir DIR specify output directory (for all files)
- --copy cp generic files rather than using symlinks
+ --[no-]copy create generic files as copies (default);
+ with -no-copy, create symlinks
--force recreate files even if config hasn't changed
--nomkmap do not recreate map files
--nohash do not run mktexlsr (a.k.a. texhash)
diff --git a/Build/source/texk/web2c/tests/aftergroupout.tex b/Build/source/texk/web2c/tests/aftergroupout.tex
index 7be0466a022..9e2d47a96df 100644
--- a/Build/source/texk/web2c/tests/aftergroupout.tex
+++ b/Build/source/texk/web2c/tests/aftergroupout.tex
@@ -2,6 +2,8 @@
% Public domain. Based on a post by David Carlisle to tex-live,
% https://tug.org/pipermail/tex-live/2024-March/050292.html
%
+% See ./unbalanced-braces.tex for background.
+%
\catcode`\{=1 \catcode`\}=2
\pdfoutput = 1
\pdfmapline{cmr10 CMR10 <cmr10.pfb}
@@ -11,7 +13,7 @@
\parfillskip=0pt plus1fil
% with original TL24 binaries, \aftergroup on the \output routine didn't work.
-\def\xxx{\aftergroup should-appear!\global\let\xxx\relax}
+\def\xxx{\aftergroup A\global\let\xxx\relax}
\output{\xxx\global\advance\count0 by 1 \shipout\box255}
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index b6bbdb7875e..cc5d4ec90a7 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -2268,7 +2268,7 @@ Run the ConTeXt cache generation commands, using C<$bindir> and
C<$progext> to check if commands can be run. Use the function reference
C<$run_postinst_cmd> to actually run the commands. The return status is
zero if all succeeded, nonzero otherwise. If the main ConTeXt program
-(C<luametatex>) cannot be run at all, the return status is status.
+(C<luametatex>) cannot be run at all, the return status is zero.
Functions C<info> and C<debug> are called with status reports.
diff --git a/Master/tlpkg/bin/tl-update-bindir b/Master/tlpkg/bin/tl-update-bindir
index 6f4bd6b6888..edcd6916e7d 100755
--- a/Master/tlpkg/bin/tl-update-bindir
+++ b/Master/tlpkg/bin/tl-update-bindir
@@ -157,7 +157,8 @@ for tlplat in $tlplats; do
case $tlplat in
aarch64-linux)
# cg build is much much faster than gh, so use it while it works.
- do_download ${cgurl}/${cgbranch}$tlplat.tar.xz;;
+ #do_download ${cgurl}/${cgbranch}$tlplat.tar.xz;;
+ do_download `github_url $tlplat`;;
amd64-freebsd)
do_download `github_url $tlplat`;;
@@ -168,7 +169,9 @@ for tlplat in $tlplats; do
do_download http://www.babafou.eu.org/texlive-netbsd/x86_64-netbsd.tar.xz;;
armhf-linux)
- do_download ${cgurl}/${cgbranch}$tlplat.tar.xz;; # see armhf comments above
+ # as with aarch.
+ #do_download ${cgurl}/${cgbranch}$tlplat.tar.xz;;
+ do_download `github_url $tlplat`;;
#do_download `github_url $tlplat`;;
#remurl=http://dl.contextgarden.net/build/texlive/${cgbranch}$tlplat.tar.xz
#do_download $remurl;;
@@ -211,7 +214,8 @@ for tlplat in $tlplats; do
# Then https://github.com/TeX-Live/texlive-source/releases
# "Draft a new release".
# "Choose a tag -> "find or create a new tag" -> "svnNNNNN"
- # "Target:trunk" should already be there,
+ # "Target:trunk" should already be there
+ # (or set Target to, e.g., "branch2024", if building from branch),
# "rNNNNN and perhaps brief msg from commits in "title",
# and anything relevant for "description", or leave it blank;
# check pre-release box (always),
diff --git a/Master/tlpkg/dev/profiles/TLctx.pro b/Master/tlpkg/dev/profiles/TLctx.pro
index 351134f43b8..acad38b7b41 100644
--- a/Master/tlpkg/dev/profiles/TLctx.pro
+++ b/Master/tlpkg/dev/profiles/TLctx.pro
@@ -10,7 +10,7 @@ TEXMFLOCAL /tmp/ki/texmf-local
TEXMFSYSCONFIG /tmp/ki/sys/conf
TEXMFSYSVAR /tmp/ki/sys/var
TEXMFVAR /tmp/ki/user/var
-binary_i386-linux 1
+binary_x86_64-linux 1
collection-basic 1
collection-context 1
option_desktop_integration 1
@@ -21,8 +21,8 @@ option_letter 0
option_path 0
option_post_code 1
option_src 0
-option_sys_bin /usr/local/bin
-option_sys_info /usr/local/info
-option_sys_man /usr/local/man
+option_sys_bin /tmp/ki/local/bin
+option_sys_info /tmp/ki/local/info
+option_sys_man /tmp/ki/local/man
option_w32_multi_user 0
option_write18_restricted 1
diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt
index 380244c7522..565c9b53195 100644
--- a/Master/tlpkg/doc/releng.txt
+++ b/Master/tlpkg/doc/releng.txt
@@ -626,6 +626,7 @@ tail out
make another tag:
brev=nnnnn # branch commit revision, e.g., 51236
btag=yyyy.n # next branch tag, e.g., 2021.3
+ when ready:
#svn copy -r $brev -m"texlive-$btag tag based on r$brev, with <whatever> fix" \
# svn://tug.org/texlive/branches/branch2021 \
# svn://tug.org/texlive/tags/texlive-$btag