diff options
author | Norbert Preining <norbert@preining.info> | 2023-09-14 03:01:37 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2023-09-14 03:01:37 +0000 |
commit | 527001b634c06d34f92d1809f507add012c320f6 (patch) | |
tree | 17d54020bd8e320a65d118c5036beed8e4e18cb9 /macros/latex/contrib/l3build | |
parent | de0fb15550a55ba5685a755fec7326e21a79fccd (diff) |
CTAN sync 202309140301
Diffstat (limited to 'macros/latex/contrib/l3build')
-rw-r--r-- | macros/latex/contrib/l3build/CHANGELOG.md | 18 | ||||
-rw-r--r-- | macros/latex/contrib/l3build/README.md | 2 | ||||
-rw-r--r-- | macros/latex/contrib/l3build/l3build-check.lua | 3 | ||||
-rw-r--r-- | macros/latex/contrib/l3build/l3build-install.lua | 1 | ||||
-rw-r--r-- | macros/latex/contrib/l3build/l3build-typesetting.lua | 6 | ||||
-rw-r--r-- | macros/latex/contrib/l3build/l3build-variables.lua | 2 | ||||
-rw-r--r-- | macros/latex/contrib/l3build/l3build.1 | 2 | ||||
-rw-r--r-- | macros/latex/contrib/l3build/l3build.dtx | 21 | ||||
-rwxr-xr-x | macros/latex/contrib/l3build/l3build.lua | 2 | ||||
-rw-r--r-- | macros/latex/contrib/l3build/l3build.pdf | bin | 744608 -> 744760 bytes |
10 files changed, 41 insertions, 16 deletions
diff --git a/macros/latex/contrib/l3build/CHANGELOG.md b/macros/latex/contrib/l3build/CHANGELOG.md index 7c6c7f83c4..f0af1e3c8c 100644 --- a/macros/latex/contrib/l3build/CHANGELOG.md +++ b/macros/latex/contrib/l3build/CHANGELOG.md @@ -7,6 +7,21 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2023-09-13] + +### Added +- Document ConTeXt as supported `checkformat` + +### Changed +- Extend version string normalisation during checks + (see issue \#96) + +- Extend excludefiles to cover `build.lua` (see \#286) +### Fixed +- Return passing errorlevel if BibTeX issues warnings + (see \#260) +- Respect `excludefiles` when doing (local) installation + ## [2023-09-07] ### Changed @@ -697,7 +712,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-09-07...HEAD +[Unreleased]: https://github.com/latex3/l3build/compare/2023-09-13...HEAD +[2023-09-13]: https://github.com/latex3/l3build/compare/2023-09-07...2023-09-13 [2023-09-07]: https://github.com/latex3/l3build/compare/2023-09-05...2023-09-07 [2023-09-05]: https://github.com/latex3/l3build/compare/2023-07-20...2023-09-05 [2023-07-20]: https://github.com/latex3/l3build/compare/2023-07-17...2023-07-20 diff --git a/macros/latex/contrib/l3build/README.md b/macros/latex/contrib/l3build/README.md index 825c32f55b..0b7cfe9f97 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-09-07 +Release 2023-09-13 Overview -------- diff --git a/macros/latex/contrib/l3build/l3build-check.lua b/macros/latex/contrib/l3build/l3build-check.lua index 3e26de429b..3279f2c4a1 100644 --- a/macros/latex/contrib/l3build/l3build-check.lua +++ b/macros/latex/contrib/l3build/l3build-check.lua @@ -171,6 +171,9 @@ local function normalize_log(content,engine,errlevels) -- Deal with dates if match(line, "[^<]%d%d%d%d[/%-]%d%d[/%-]%d%d") then line = gsub(line,"%d%d%d%d[/%-]%d%d[/%-]%d%d","....-..-..") + -- Semantic version-like ones + line = gsub(line,"v%d+%.%d+%.%d+[%d%a.+%-]*","v...") + -- Classical LaTeX version strings line = gsub(line,"v%d+%.?%d?%d?%w?","v...") end -- Deal with leading spaces for file and page number lines diff --git a/macros/latex/contrib/l3build/l3build-install.lua b/macros/latex/contrib/l3build/l3build-install.lua index 64d29fc590..e96259caa3 100644 --- a/macros/latex/contrib/l3build/l3build-install.lua +++ b/macros/latex/contrib/l3build/l3build-install.lua @@ -215,6 +215,7 @@ function install_files(target,full,dry_run) dir = dir or currentdir include = include or { } exclude = exclude or { } + insert(exclude,excludefiles) local excludelist = { } for _,glob_table in pairs(exclude) do for _,glob in pairs(glob_table) do diff --git a/macros/latex/contrib/l3build/l3build-typesetting.lua b/macros/latex/contrib/l3build/l3build-typesetting.lua index d0e491d4c5..c12c544738 100644 --- a/macros/latex/contrib/l3build/l3build-typesetting.lua +++ b/macros/latex/contrib/l3build/l3build-typesetting.lua @@ -72,8 +72,10 @@ function bibtex(name,dir) os_grepexe .. " \"^" .. grep .. "bibdata{\" " .. name .. ".aux > " .. os_null ) == 0 then - return runcmd(bibtexexe .. " " .. bibtexopts .. " " .. name,dir, - {"BIBINPUTS","BSTINPUTS"}) + local errorlevel = runcmd(bibtexexe .. " " .. bibtexopts .. " " .. name, + dir,{"BIBINPUTS","BSTINPUTS"}) + -- BibTeX(8) signals warnings with errorlevel 1 + if errorlevel > 1 then return errorlevel else return 0 end end end return 0 diff --git a/macros/latex/contrib/l3build/l3build-variables.lua b/macros/latex/contrib/l3build/l3build-variables.lua index 204c386f69..bbebf2fd08 100644 --- a/macros/latex/contrib/l3build/l3build-variables.lua +++ b/macros/latex/contrib/l3build/l3build-variables.lua @@ -83,7 +83,7 @@ cleanfiles = cleanfiles or {"*.log", "*.pdf", "*.zip"} demofiles = demofiles or { } docfiles = docfiles or { } dynamicfiles = dynamicfiles or { } -excludefiles = excludefiles or {"*~"} +excludefiles = excludefiles or {"*~","build.lua","config-*.lua"} exefiles = exefiles or { } installfiles = installfiles or {"*.sty","*.cls"} makeindexfiles = makeindexfiles or {"*.ist"} diff --git a/macros/latex/contrib/l3build/l3build.1 b/macros/latex/contrib/l3build/l3build.1 index 87dbac2ce3..fbf4b84fda 100644 --- a/macros/latex/contrib/l3build/l3build.1 +++ b/macros/latex/contrib/l3build/l3build.1 @@ -1,4 +1,4 @@ -.TH l3build 1 "2023-09-07" +.TH l3build 1 "2023-09-13" .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 d8778fcce7..b6787a1044 100644 --- a/macros/latex/contrib/l3build/l3build.dtx +++ b/macros/latex/contrib/l3build/l3build.dtx @@ -88,7 +88,7 @@ \luavarset{demofiles} {\{\}}{Files which show how to use a module} \luavarset{docfiles} {\{\}}{Files which are part of the documentation but should not be typeset} \luavarset{dynamicfiles} {\{ \}}{Secondary files to cleared before each test is run} -\luavarset{excludefiles} {\{"*\string~"\}}{Files to ignore entirely (default for Emacs backup files)} +\luavarset{excludefiles} {\{"*\string~","build.lua","config-*.lua"\}}{Files to ignore entirely (default for Emacs backup files)} \luavarset{installfiles} {\{"*.sty","*.cls"\}}{Files to install to the \texttt{tex} area of the \texttt{texmf} tree} \luavarset{makeindexfiles} {\{"*.ist"\}}{MakeIndex files to be included in a TDS-style zip} \luavarset{scriptfiles} {\{ \}}{Files to install to the \texttt{scripts} area of the \texttt{texmf} tree} @@ -251,7 +251,7 @@ % }^^A % } % -% \date{Released 2023-09-07} +% \date{Released 2023-09-13} % % \maketitle % \tableofcontents @@ -433,11 +433,13 @@ % configurations are used and need adjustment to the standard engine, this does % need to be given explicitly using \var{stdengine}. % The format used for tests can be altered by setting \var{checkformat}: the default setting \texttt{latex} means that tests are run using \emph{e.g.}~\texttt{pdflatex}, whereas setting to \texttt{tex} will run tests using \emph{e.g.}~\texttt{pdftex}. -% (Currently, this should be one of \texttt{latex} or \texttt{tex}.) +% (Currently, this should be one of \texttt{latex}, \texttt{tex}, or +% \texttt{context}.) % To perform the check, the engine typesets each test up to \var{checkruns} times. % More detail on this in the documentation on |save|. -% Options passed to the binary are defined in the variable \var{checkopts}. -% These are applied in addition to any +% Options passed to the binary are those defined in the variable +% \var{checkopts}, followed by the engine-specific ones for the current +% \var{checkformat} (stored in table \var{specialformats}), if exist. % % By default, |texmf| trees are searched for input files when checking. This can be disabled by setting \var{checksearch} to |false|: isolation provides confidence that the tests cannot accidentally be running with incorrect files installed in the main distribution or |hometexmf|. % @@ -819,12 +821,13 @@ % For more complex set ups, \var{specialformats} should be used. This is a % table with one entry per \var{checkformat}. Each entry is itself a table, % and these contain a list of engines and settings for |binary|, |format| -% and |options|. For example, for Con\TeX{}t and appropriate set up is +% and |options|. For example, the set up for Con\TeX{}t in \pkg{l3build} 2023-07-17 is % \begin{verbatim} % specialformats.context = { -% luatex = {binary = "context", format = ""}, -% pdftex = {binary = "texexec", format = ""}, -% xetex = {binary = "texexec", format = "", options = "--xetex"} +% luametatex = {binary = "context", format = ""}, +% luatex = {binary = "context", format = "", options = "--luatex"}, +% pdftex = {binary = "texexec", format = ""}, +% xetex = {binary = "texexec", format = "", options = "--xetex"} % } % \end{verbatim} % Additional tokens can also be injected before the loading of a test file using diff --git a/macros/latex/contrib/l3build/l3build.lua b/macros/latex/contrib/l3build/l3build.lua index 1ac608c971..e520cd1811 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-09-07" +release_date = "2023-09-13" -- 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 Binary files differindex e713477fca..4e7c03759d 100644 --- a/macros/latex/contrib/l3build/l3build.pdf +++ b/macros/latex/contrib/l3build/l3build.pdf |