diff options
author | Karl Berry <karl@freefriends.org> | 2024-02-08 21:40:37 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-02-08 21:40:37 +0000 |
commit | 9d23ed3a23e5528a676afa7840e9cd7e72226aa4 (patch) | |
tree | 2db5f620bda2528f5e975c3ce3118526e6821e0f /Master | |
parent | 828746d2f0d7a079dd70c4bf48586ef70fed5a47 (diff) |
l3build (8feb24)
git-svn-id: svn://tug.org/texlive/trunk@69748 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/latex/l3build/CHANGELOG.md | 10 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/l3build/README.md | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/l3build/l3build.pdf | bin | 749769 -> 750889 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/man/man1/l3build.1 | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/man/man1/l3build.man1.pdf | bin | 15787 -> 15764 bytes | |||
-rw-r--r-- | Master/texmf-dist/scripts/l3build/l3build-arguments.lua | 2 | ||||
-rw-r--r-- | Master/texmf-dist/scripts/l3build/l3build-check.lua | 4 | ||||
-rw-r--r-- | Master/texmf-dist/scripts/l3build/l3build-manifest.lua | 2 | ||||
-rwxr-xr-x | Master/texmf-dist/scripts/l3build/l3build.lua | 2 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/l3build/l3build.dtx | 43 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/l3build/regression-test.tex | 3 |
11 files changed, 49 insertions, 23 deletions
diff --git a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md index 2f5f843086b..ea466dfcccd 100644 --- a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md @@ -7,6 +7,13 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2024-02-08] + +### Changed +- Extend normalization of line numbers to include those wrapped by LaTeX in + text `on line ...` +- Suppress `l3msg` message wrapping + ## [2024-01-18] ### Added @@ -769,7 +776,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/2024-01-18...HEAD +[Unreleased]: https://github.com/latex3/l3build/compare/2024-02-08...HEAD +[2024-02-08]: https://github.com/latex3/l3build/compare/2024-01-18...2024-02-08 [2024-01-18]: https://github.com/latex3/l3build/compare/2024-01-09...2024-01-18 [2024-01-09]: https://github.com/latex3/l3build/compare/2024-01-04...2024-01-09 [2024-01-04]: https://github.com/latex3/l3build/compare/2023-12-15...2024-01-04 diff --git a/Master/texmf-dist/doc/latex/l3build/README.md b/Master/texmf-dist/doc/latex/l3build/README.md index 1dfdc42d523..b5172bbf210 100644 --- a/Master/texmf-dist/doc/latex/l3build/README.md +++ b/Master/texmf-dist/doc/latex/l3build/README.md @@ -1,7 +1,7 @@ l3build: a testing and building system for LaTeX ================================================= -Release 2024-01-18 +Release 2024-02-08 Overview -------- diff --git a/Master/texmf-dist/doc/latex/l3build/l3build.pdf b/Master/texmf-dist/doc/latex/l3build/l3build.pdf Binary files differindex 54b3c2c198b..af2c8688f0b 100644 --- a/Master/texmf-dist/doc/latex/l3build/l3build.pdf +++ b/Master/texmf-dist/doc/latex/l3build/l3build.pdf diff --git a/Master/texmf-dist/doc/man/man1/l3build.1 b/Master/texmf-dist/doc/man/man1/l3build.1 index c558ee000e5..b983494b73d 100644 --- a/Master/texmf-dist/doc/man/man1/l3build.1 +++ b/Master/texmf-dist/doc/man/man1/l3build.1 @@ -1,4 +1,4 @@ -.TH l3build 1 "2024-01-18" +.TH l3build 1 "2024-02-08" .SH NAME l3build \- Checking and building packages .SH SYNOPSIS @@ -76,7 +76,7 @@ Shows the invocation to update failing .tlg files .IP --shuffle Shuffles order of tests .IP --stdengine|-s -Run tests only with the standard engine (which may vary between configs) +Run tests with the std engine (config dependent) .IP --texmfhome Location of user texmf tree .IP --version diff --git a/Master/texmf-dist/doc/man/man1/l3build.man1.pdf b/Master/texmf-dist/doc/man/man1/l3build.man1.pdf Binary files differindex 5d3a2ab1eef..76bd5b2e58c 100644 --- a/Master/texmf-dist/doc/man/man1/l3build.man1.pdf +++ b/Master/texmf-dist/doc/man/man1/l3build.man1.pdf diff --git a/Master/texmf-dist/scripts/l3build/l3build-arguments.lua b/Master/texmf-dist/scripts/l3build/l3build-arguments.lua index ec3b5335d38..b7687a71a9d 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-arguments.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-arguments.lua @@ -146,7 +146,7 @@ option_list = }, stdengine = { - desc = "Run tests only with the standard engine (which may vary between configs)", + desc = "Run tests with the std engine (config dependent)", short = "s", type = "boolean" }, diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua index 9bfb09971a7..812187123a4 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-check.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua @@ -200,6 +200,10 @@ local function normalize_log(content,engine,errlevels) -- Two similar cases, Lua patterns mean we need to do them separately line = gsub(line, "on line %d*", "on line ...") line = gsub(line, "on input line %d*", "on input line ...") + -- And the case where LaTeX has wrapped + if match(line,"^%(%w+%)%s+%d+%.$") then + line = gsub(line,"%((%w+)%)(%s+)%d+%.", "(%1)%2....") + end -- Tidy up to ^^ notation for i = 0, 31 do line = gsub(line, char(i), "^^" .. char(64 + i)) diff --git a/Master/texmf-dist/scripts/l3build/l3build-manifest.lua b/Master/texmf-dist/scripts/l3build/l3build-manifest.lua index 99a82464b2c..aa5a061bd3a 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-manifest.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-manifest.lua @@ -136,7 +136,7 @@ manifest_build_init = function(entry) -- can't use "entry[kk] = entry[kk] or ll" because false/nil are indistinguishable! end - -- initialisation for internal data + -- initialization for internal data for kk,ll in pairs(manifest_group_init) do entry[kk] = ll end diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua index 5575dc9b909..5b40bc51115 100755 --- a/Master/texmf-dist/scripts/l3build/l3build.lua +++ b/Master/texmf-dist/scripts/l3build/l3build.lua @@ -25,7 +25,7 @@ for those people who are interested. --]] -- Version information -release_date = "2024-01-18" +release_date = "2024-02-08" -- File operations are aided by the LuaFileSystem module local lfs = require("lfs") diff --git a/Master/texmf-dist/source/latex/l3build/l3build.dtx b/Master/texmf-dist/source/latex/l3build/l3build.dtx index 28b06030c90..96c1f0ead88 100644 --- a/Master/texmf-dist/source/latex/l3build/l3build.dtx +++ b/Master/texmf-dist/source/latex/l3build/l3build.dtx @@ -251,7 +251,7 @@ % }^^A % } % -% \date{Released 2024-01-18} +% \date{Released 2024-02-08} % % \maketitle % \tableofcontents @@ -559,7 +559,7 @@ % This file is then used in all subsequent checks against the \texttt{\meta{name}.lvt} test. % % If the |--engine| (or |-e|) is specified (one of |pdftex|, |xetex|, or |luatex|), the saved output is stored in \texttt{\meta{name}.\meta{engine}.tlg}. This is necessary if running the test through a different engine produces a different output. -% A normalisation process is performed when checking to avoid common differences such as register allocation; full details are listed in Section~\vref{sec:norm}. +% A normalization process is performed when checking to avoid common differences such as register allocation; full details are listed in Section~\vref{sec:norm}. % % If the \var{recordstatus} variable is set \var{true}, additional information % will be added to the \texttt{.tlg} to record the \enquote{exit status} of the @@ -671,7 +671,7 @@ % % \subsection{Variables} % -% This section lists all variables defined in the |l3build.lua| script that are available for customisation. +% This section lists all variables defined in the |l3build.lua| script that are available for customization. % % \luavartypeset % @@ -839,13 +839,13 @@ % the |tokens| entry: this might for example be used to select a graphics driver % with a DVI-based route. % -% \subsection{Output normalisation} +% \subsection{Output normalization} % \label{sec:norm} % % To allow test files to be used between different systems (\emph{e.g.}~when % multiple developers are involved in a project), the log files are normalised % before comparison during checking. This removes some system-dependent -% data but also some variations due to different engines. This normalisation +% data but also some variations due to different engines. This normalization % consists of two parts: removing (\enquote{ignoring}) some lines and modifying % others to give consistent test. Currently, the following types of line are % ignored: @@ -861,11 +861,11 @@ % \begin{itemize} % \item Removal spaces at the start of lines. % \item Removal of |./| at start of file names. -% \item Standardisation of the list of units known to \TeX{} (\pdfTeX{} +% \item Standardization of the list of units known to \TeX{} (\pdfTeX{} % and \LuaTeX{} add a small number of additional units which are not % known to \TeX90 or \XeTeX{}, (u)p\TeX{} adds some additional non-standard % ones) -% \item Standardisation of \verb*|\csname\endcsname | to |\csname\endcsname| +% \item Standardization of \verb*|\csname\endcsname | to |\csname\endcsname| % (the former is formally correct, but the latter was produced for many % years due to a \TeX{} bug). % \item Conversion of \texttt{on line \meta{number}} to \texttt{on line ...} @@ -890,11 +890,11 @@ % these may not be desirable in all cases, they are handled separately. % When creating \LuaTeX{}-specific test files (either with \LuaTeX{} as % the standard engine or saving a \LuaTeX{}-specific |.tlg| file) no further -% normalisation is undertaken. On the other hand, for cross-engine comparison -% the following normalisation is applied: +% normalization is undertaken. On the other hand, for cross-engine comparison +% the following normalization is applied: % \begin{itemize} % \item Removal of additional (unused) |\discretionary| points. -% \item Normalisation of some |\discretionary| data to a \TeX{}90 form. +% \item normalization of some |\discretionary| data to a \TeX{}90 form. % \item Removal of |U+...| notation for missing characters. % \item Removal of |display| for display math boxes % (included by \TeX90/\pdfTeX{}/\XeTeX). @@ -912,7 +912,7 @@ % dependent on the active code page). This may be controlled using the % |asciiengines| option. Any engines named here will use a |.tcx| file to % produce only ASCII chars in the log output, whilst for other engines -% normalisation is carried out from UTF-8 to ASCII. If the option is set to +% normalization is carried out from UTF-8 to ASCII. If the option is set to % an empty table the latter process is skipped: suitable for cases where only % Unicode engines are in use. % @@ -920,16 +920,21 @@ % % 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 +% normalization 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 2024-02-08} +% +% Wrapping of messages by \pkg{l3msg} is now suppressed, aligning with the +% approach to \var{maxprintline}. +% % \subsubsection{Release 2023-03-22} % % This release changes the standard value of \var{maxprintline} from $79$ to -% $9999$, to suppress line wrapping in the log. This makes normalisation of +% $9999$, to suppress line wrapping in the log. This makes normalization 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 @@ -939,7 +944,7 @@ % \label{sec:writing-tests} % % Test files are written in a \TeX{} dialect using the support file |regression-test.tex|, which should be |\input| at the very beginning of each test. -% Additional customisations to this driver can be included in a local |regression-test.cfg| file, which will be loaded automatically if found. +% Additional customizations to this driver can be included in a local |regression-test.cfg| file, which will be loaded automatically if found. % % The macros loaded by |regression-test.tex| set up the test system and provide a number of commands to aid the production of a structured test suite. % The basis of the test suite is to output material into the |.log| file, from which a normalised test output (|.tlg|) file is produced by the build command |save|. @@ -1432,7 +1437,7 @@ % % For package authors who have more complex requirements than those covered % by the standard set up, the Lua script offers the possibility for -% customisation. The Lua function \texttt{typeset} may be defined before +% customization. The Lua function \texttt{typeset} may be defined before % reading \texttt{l3build.lua} and should take one argument, the name of % the file to be typeset. Within this function, the auxiliary Lua % functions \texttt{biber}, \texttt{bibtex}, \texttt{makeindex} and @@ -1995,7 +2000,7 @@ % the inclusion of one-line descriptions for each file (Section~\vref{sec:manifest-desc}), % and the details of the formatting of each entry (Section~\vref{sec:manifest-formatting}). % -% To perform such customisations, either include the re-definitions directly within your +% To perform such customizations, either include the re-definitions directly within your % package's |build.lua| file, or make a copy of |l3build-manifest-setup.lua|, rename it, % and load it within your |build.lua| using |dofile()|. % @@ -2588,6 +2593,12 @@ \fi % \end{macrocode} % +% \begin{macrocode} +\ifcsname\detokenize{l_iow_line_count_int}\endcsname + \csname \detokenize{l_iow_line_count_int}\endcsname=9999 % +\fi +% \end{macrocode} +% % Finish up. % \begin{macrocode} \reset@catcodes diff --git a/Master/texmf-dist/tex/latex/l3build/regression-test.tex b/Master/texmf-dist/tex/latex/l3build/regression-test.tex index 033695f75f3..513dc8771ec 100644 --- a/Master/texmf-dist/tex/latex/l3build/regression-test.tex +++ b/Master/texmf-dist/tex/latex/l3build/regression-test.tex @@ -296,6 +296,9 @@ \AddToHook{enddocument/info}[kernel/testmode]{} \DeclareHookRule{enddocument/info}{kernel/testmode}{voids}{kernel/release} \fi +\ifcsname\detokenize{l_iow_line_count_int}\endcsname + \csname \detokenize{l_iow_line_count_int}\endcsname=9999 % +\fi \reset@catcodes %% %% |