summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/l3build
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-03-23 03:01:33 +0000
committerNorbert Preining <norbert@preining.info>2023-03-23 03:01:33 +0000
commit46b6c321a2ff14698b756600bffb54d5d5fc3772 (patch)
tree58acb1cf61c15d3dcb1fe3e4bb9d8b823dabe412 /macros/latex/contrib/l3build
parentcbbc6dbdbf08b70a7e7d8d184ca51c57c835415a (diff)
CTAN sync 202303230301
Diffstat (limited to 'macros/latex/contrib/l3build')
-rw-r--r--macros/latex/contrib/l3build/CHANGELOG.md13
-rw-r--r--macros/latex/contrib/l3build/README.md2
-rw-r--r--macros/latex/contrib/l3build/l3build-check.lua5
-rw-r--r--macros/latex/contrib/l3build/l3build-variables.lua4
-rw-r--r--macros/latex/contrib/l3build/l3build.12
-rw-r--r--macros/latex/contrib/l3build/l3build.dtx23
-rwxr-xr-xmacros/latex/contrib/l3build/l3build.lua2
-rw-r--r--macros/latex/contrib/l3build/l3build.pdfbin742027 -> 743297 bytes
8 files changed, 42 insertions, 9 deletions
diff --git a/macros/latex/contrib/l3build/CHANGELOG.md b/macros/latex/contrib/l3build/CHANGELOG.md
index 39389f6fb8..b08104f693 100644
--- a/macros/latex/contrib/l3build/CHANGELOG.md
+++ b/macros/latex/contrib/l3build/CHANGELOG.md
@@ -7,6 +7,16 @@ this project uses date-based 'snapshot' version identifiers.
## [Unreleased]
+## [2023-03-22]
+
+### Changed
+- Default value of `maxprintline` is now `9999`
+ (may require `.tlg` updates: see docs)
+
+### Fixed
+- Apply needed luatex-specific log normalization, even when `--rerun` is used
+ (issue #291)
+
## [2023-03-08]
### Changed
@@ -647,7 +657,8 @@ this project uses date-based 'snapshot' version identifiers.
- Rationalise short option names: removed `-d`, `-E`, `-r`
- Target `cmdcheck`: specific to LaTeX kernel work
-[Unreleased]: https://github.com/latex3/l3build/compare/2023-03-08...HEAD
+[Unreleased]: https://github.com/latex3/l3build/compare/2023-03-22...HEAD
+[2023-03-22]: https://github.com/latex3/l3build/compare/2023-03-08...2023-03-22
[2023-03-08]: https://github.com/latex3/l3build/compare/2023-02-26...2023-03-08
[2023-02-26]: https://github.com/latex3/l3build/compare/2023-02-20...2023-02-26
[2023-02-20]: https://github.com/latex3/l3build/compare/2023-02-16...2023-02-20
diff --git a/macros/latex/contrib/l3build/README.md b/macros/latex/contrib/l3build/README.md
index e1e5a05212..d07f186a6f 100644
--- a/macros/latex/contrib/l3build/README.md
+++ b/macros/latex/contrib/l3build/README.md
@@ -1,7 +1,7 @@
l3build: a testing and building system for LaTeX
=================================================
-Release 2023-03-08
+Release 2023-03-22
Overview
--------
diff --git a/macros/latex/contrib/l3build/l3build-check.lua b/macros/latex/contrib/l3build/l3build-check.lua
index e7569b69d2..e7bc388bd1 100644
--- a/macros/latex/contrib/l3build/l3build-check.lua
+++ b/macros/latex/contrib/l3build/l3build-check.lua
@@ -697,8 +697,11 @@ function compare_tlg(difffile, tlgfile, logfile, cleanup, name, engine)
local testname = name .. "." .. engine
-- Do additional log formatting if the engine is LuaTeX, there is no
-- engine-specific .tlg file and the default engine is not LuaTeX
+ local has_engine_specific_tlg =
+ match(tlgfile, "%." .. engine .. "%" .. tlgext)
+ and locate({ testfiledir, unpackdir }, { tlgfile })
if (match(engine,"^lua") or match(engine,"^harf"))
- and not match(tlgfile, "%." .. engine .. "%" .. tlgext)
+ and not has_engine_specific_tlg
and not match(stdengine,"^lua")
then
local lualogfile = logfile
diff --git a/macros/latex/contrib/l3build/l3build-variables.lua b/macros/latex/contrib/l3build/l3build-variables.lua
index ce07d1f815..576fb15e82 100644
--- a/macros/latex/contrib/l3build/l3build-variables.lua
+++ b/macros/latex/contrib/l3build/l3build-variables.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-variables.lua Copyright (C) 2018-2022 The LaTeX Project
+File l3build-variables.lua Copyright (C) 2018-2023 The LaTeX Project
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -191,7 +191,7 @@ end
if flattentds == nil then
flattentds = true
end
-maxprintline = maxprintline or 79
+maxprintline = maxprintline or 9999
packtdszip = packtdszip or false
-- support "ps2pdfopt" for backward compatibility, gh issue #275
ps2pdfopts = ps2pdfopts or ps2pdfopt or ""
diff --git a/macros/latex/contrib/l3build/l3build.1 b/macros/latex/contrib/l3build/l3build.1
index 746b894acc..07f2caa08a 100644
--- a/macros/latex/contrib/l3build/l3build.1
+++ b/macros/latex/contrib/l3build/l3build.1
@@ -1,4 +1,4 @@
-.TH l3build 1 "2023-03-08"
+.TH l3build 1 "2023-03-22"
.SH NAME
l3build \- Checking and building packages
.SH SYNOPSIS
diff --git a/macros/latex/contrib/l3build/l3build.dtx b/macros/latex/contrib/l3build/l3build.dtx
index 8ab6295ccb..761ee55c67 100644
--- a/macros/latex/contrib/l3build/l3build.dtx
+++ b/macros/latex/contrib/l3build/l3build.dtx
@@ -152,7 +152,7 @@
\luavarset{epoch} {1463734800} {Epoch (Unix date) to set for test runs}
\luavarset{flatten} {true} {Switch to flatten any source structure when sending to CTAN}
\luavarset{flattentds} {true} {Switch to flatten any source structure when creating a TDS structure}
-\luavarset{maxprintline}{79} {Length of line to use in log files}
+\luavarset{maxprintline}{9999} {Length of line to use in log files}
\luavarset{packtdszip} {false} {Switch to build a TDS-style zip file for CTAN}
\luavarset{ps2pdfopts} {""} {Options for \texttt{ps2pdf}}
\luavarset{typesetcmds} {""} {Instructions to be passed to \TeX{} when doing typesetting}
@@ -236,7 +236,7 @@
% }^^A
% }
%
-% \date{Released 2023-03-08}
+% \date{Released 2023-03-22}
%
% \maketitle
% \tableofcontents
@@ -896,6 +896,25 @@
% an empty table the latter process is skipped: suitable for cases where only
% Unicode engines are in use.
%
+% \subsection{Breaking changes}
+%
+% Very occasionally, it is necessary to make changes to \pkg{l3build} that
+% change the \texttt{.tlg} file results. This is typically when additional
+% normalisation is required. When this is the case, you should first verify
+% that \texttt{.tlg} files pass with the older \pkg{l3build}, then update only
+% \pkg{l3build}, re-check the files and save the results. Where possible,
+% we provide a mechanism to run with older setting to allow this process to
+% take place smoothly.
+%
+% \subsubsection{Release 2023-03-22}
+%
+% This release changes the standard value of \var{maxprintline} for $79$ to
+% $9999$, to suppress line wrapping in the log. This makes normalisation of
+% for example file paths more reliable. To check that \texttt{.tlg} files
+% are correct, you can set \var{maxprintline} in your \texttt{build.lua} file
+% explicitly to the old default, check that tests pass, then remove this
+% line and re-check.
+%
% \section{Writing test files}
% \label{sec:writing-tests}
%
diff --git a/macros/latex/contrib/l3build/l3build.lua b/macros/latex/contrib/l3build/l3build.lua
index 55d6999808..a9a4a316c5 100755
--- a/macros/latex/contrib/l3build/l3build.lua
+++ b/macros/latex/contrib/l3build/l3build.lua
@@ -25,7 +25,7 @@ for those people who are interested.
--]]
-- Version information
-release_date = "2023-03-08"
+release_date = "2023-03-22"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")
diff --git a/macros/latex/contrib/l3build/l3build.pdf b/macros/latex/contrib/l3build/l3build.pdf
index da58149a23..a7119ae790 100644
--- a/macros/latex/contrib/l3build/l3build.pdf
+++ b/macros/latex/contrib/l3build/l3build.pdf
Binary files differ