Skip to content

Commit

Permalink
Merge branch 'master' into build/work000 r71539 #158
Browse files Browse the repository at this point in the history
  • Loading branch information
t-tk committed Jun 16, 2024
2 parents d01cd42 + 4ca6e61 commit 88ff26e
Show file tree
Hide file tree
Showing 36 changed files with 1,806 additions and 1,457 deletions.
4 changes: 2 additions & 2 deletions source/build-aux/depcomp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects

scriptversion=2023-11-23.18; # UTC
scriptversion=2024-06-07.03; # UTC

# Copyright (C) 1999-2024 Free Software Foundation, Inc.

Expand Down Expand Up @@ -129,7 +129,7 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}

rm -f "$tmpdepfile"

# Avoid interferences from the environment.
# Avoid interference from the environment.
gccflag= dashmflag=

# Some modes work just like other modes, but use different flags. We
Expand Down
6 changes: 3 additions & 3 deletions source/build-aux/install-sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile

scriptversion=2023-11-23.18; # UTC
scriptversion=2024-06-07.14; # UTC

# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
Expand Down Expand Up @@ -345,15 +345,15 @@ do
' 0

# Because "mkdir -p" follows existing symlinks and we likely work
# directly in world-writeable /tmp, make sure that the '$tmpdir'
# directly in world-writable /tmp, make sure that the '$tmpdir'
# directory is successfully created first before we actually test
# 'mkdir -p'.
if (umask $mkdir_umask &&
$mkdirprog $mkdir_mode "$tmpdir" &&
exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
then
if test -z "$dir_arg" || {
# Check for POSIX incompatibilities with -m.
# Check for POSIX incompatibility with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
# other-writable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
Expand Down
6 changes: 3 additions & 3 deletions source/libs/icu/icu-src/source/install-sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile

scriptversion=2023-11-23.18; # UTC
scriptversion=2024-06-07.14; # UTC

# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
Expand Down Expand Up @@ -345,15 +345,15 @@ do
' 0

# Because "mkdir -p" follows existing symlinks and we likely work
# directly in world-writeable /tmp, make sure that the '$tmpdir'
# directly in world-writable /tmp, make sure that the '$tmpdir'
# directory is successfully created first before we actually test
# 'mkdir -p'.
if (umask $mkdir_umask &&
$mkdirprog $mkdir_mode "$tmpdir" &&
exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
then
if test -z "$dir_arg" || {
# Check for POSIX incompatibilities with -m.
# Check for POSIX incompatibility with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
# other-writable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
Expand Down
2 changes: 1 addition & 1 deletion source/texk/README
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ afm2pl - maintained here
bibtex-x - maintained here, contains
bibtex8, bibtexu

chktex 1.7.8 - checked 15dec22
chktex 1.7.9 - checked 12jun24
https://mirror.ctan.org/support/chktex/
https://download.savannah.gnu.org/releases/chktex/

Expand Down
5 changes: 5 additions & 0 deletions source/texk/kpathsea/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2024-06-04 Karl Berry <[email protected]>

* texmf.cnf (MKTEXPK, etc.): adjust values shown to the
compile-time defaults, as given in kpathsea/ac/mktex.ac.

2024-03-17 Karl Berry <[email protected]>

* texmf.cnf (shell_escape_commands): add l3sys-query
Expand Down
18 changes: 9 additions & 9 deletions source/texk/kpathsea/texmf.cnf
Original file line number Diff line number Diff line change
Expand Up @@ -738,21 +738,21 @@ log_openout.initex = f
file_line_error_style = f
% Enable the mktex... scripts by default? These must be set to 0 or 1.
% Particular programs can and do override these settings, for example
% dvips's -M option. Your first chance to specify whether the scripts
% are invoked by default is at configure time.
% The values shown here are the compile-time defaults for original TeX Live;
% they can be overridden at compile time with configure options,
% or at runtime with environment variables or program options.
%
% These values are ignored if the script names are changed; e.g., if you
% set DVIPSMAKEPK to `foo', what counts is the value of the environment
% variable/config value `FOO', not the `MKTEXPK' value.
%
%MKTEXTEX = 0
%MKTEXPK = 0
%MKTEXMF = 0
%MKTEXTFM = 0
%MKTEXFMT = 0
%MKOCP = 0
%MKOFM = 0
%MKTEXPK = 1
%MKTEXMF = 1
%MKTEXTFM = 1
%MKTEXFMT = 1
%MKOCP = 1
%MKOFM = 1

% Used by makempx to run TeX. We use "etex" because MetaPost is
% expecting DVI, and not "tex" because we want first line parsing.
Expand Down
33 changes: 33 additions & 0 deletions source/texk/web2c/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,36 @@
2024-06-15 Andreas Scherer <https://ascherer.github.io>

* tests/fix-changefile-lines.py,
* dvicopy.ch: Output '@x' with optional information.

2024-06-05 Andreas Scherer <https://ascherer.github.io>

* tests/fix-changefile-lines.py,
* tangle.ch,
* weave.ch: Correctly count section start markers.
* mf.ch,
* tex.ch: Recount parts and sections.

2024-06-03 David Fuchs <[email protected]>

* tex.ch (check_outer_validity): don't check unless OK_to_interrupt,
to avoid getting into an erroneous state if an \outer token
is deleted interactively.
Report from Tyge Thiessen:
https://tug.org/pipermail/tex-k/2024-March/004021.html
DEK bug entry: https://tug.org/texmfbug/newbug.html#B142outer

2024-06-03 Karl Berry <[email protected]>

* tests/fix-changefile-lines.py: new script from Tyge Thiessen
to update the chapter/section/line numbers in a .ch file,
following my request:
https://tug.org/pipermail/tex-k/2024-June/004064.html
* tex.ch,
* mf.ch: update with the script.

* unbalanced-braces.ch: tweak text.

2024-04-28 Luigi Scarso <[email protected]>

* configure.ac (LUA53_DEFINES, LUA52_DEFINES, LUAJIT_DEFINES):
Expand Down
Loading

0 comments on commit 88ff26e

Please sign in to comment.