diff options
author | Norbert Preining <norbert@preining.info> | 2023-02-27 03:05:21 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2023-02-27 03:05:21 +0000 |
commit | 86d5a04282aa958addab4585c4df899ec9a92e50 (patch) | |
tree | 7736ac0fb49348cb6ae88770b4b72ed5ee9d8081 /macros/latex/contrib/l3build | |
parent | e7ae872926eddb0de09ecfe1c578e0680033955a (diff) |
CTAN sync 202302270305
Diffstat (limited to 'macros/latex/contrib/l3build')
-rw-r--r-- | macros/latex/contrib/l3build/CHANGELOG.md | 14 | ||||
-rw-r--r-- | macros/latex/contrib/l3build/CONTRIBUTING.md | 52 | ||||
-rw-r--r-- | macros/latex/contrib/l3build/README.md | 4 | ||||
-rw-r--r-- | macros/latex/contrib/l3build/l3build-arguments.lua | 8 | ||||
-rw-r--r-- | macros/latex/contrib/l3build/l3build-check.lua | 2 | ||||
-rw-r--r-- | macros/latex/contrib/l3build/l3build-typesetting.lua | 3 | ||||
-rw-r--r-- | macros/latex/contrib/l3build/l3build-variables.lua | 3 | ||||
-rw-r--r-- | macros/latex/contrib/l3build/l3build.1 | 2 | ||||
-rw-r--r-- | macros/latex/contrib/l3build/l3build.dtx | 2 | ||||
-rwxr-xr-x | macros/latex/contrib/l3build/l3build.lua | 43 | ||||
-rw-r--r-- | macros/latex/contrib/l3build/l3build.pdf | bin | 741730 -> 742105 bytes |
11 files changed, 49 insertions, 84 deletions
diff --git a/macros/latex/contrib/l3build/CHANGELOG.md b/macros/latex/contrib/l3build/CHANGELOG.md index eda72d0a20..d65bbfc7d0 100644 --- a/macros/latex/contrib/l3build/CHANGELOG.md +++ b/macros/latex/contrib/l3build/CHANGELOG.md @@ -7,6 +7,17 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2023-02-26] + +### Changed +- Run engine sanity check per config + +### Fixed +- Restore epoch settings for `dvitopdf()` +- Use plural form of variable `ps2pdfopts` consistently in code and doc, and + retain compatibility with singular form `ps2pdfopt` (issue #275) +- Remove the last trace of dropped variable `stdconfig` + ## [2023-02-20] ### Changed @@ -629,7 +640,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-02-20...HEAD +[Unreleased]: https://github.com/latex3/l3build/compare/2023-02-26...HEAD +[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 [2023-02-16]: https://github.com/latex3/l3build/compare/2022-11-10...2023-02-16 [2022-11-10]: https://github.com/latex3/l3build/compare/2022-09-15...2022-11-10 diff --git a/macros/latex/contrib/l3build/CONTRIBUTING.md b/macros/latex/contrib/l3build/CONTRIBUTING.md deleted file mode 100644 index e85fa762d3..0000000000 --- a/macros/latex/contrib/l3build/CONTRIBUTING.md +++ /dev/null @@ -1,52 +0,0 @@ -Thanks for considering contributing to `l3build`: feedback, fixes and ideas are -all useful. Here, we ([The LaTeX Project](https://www.latex-project.org)) have -collected together a few pointers to help things along. - -## Bugs - -Please log bugs using the [issues](https://github.com/latex3/l3build/issues) -system on GitHub, and choose the 'bug' label. Handy information that you might -include, depending on the nature of the issue, includes - -- Your version of `l3build` (`texlua l3build.lua version`) -- Your TeX system details (for example 'TeX Live 2017') -- Your operating system -- The contents of your `build.lua` file -- An 'ASCII art' explanation of your directory layout - -## Feature requests - -Feature requests are welcome: log them in the same way as bugs and pick -the 'Enhancement' label. We welcome feature requests for the test set up, -the build process, _etc._ - -## Code contributions - -If you want to discuss a possible contribution before (or instead of) -making a pull request, drop a line to -[the team](mailto:latex-team@latex-project.org). - -There are a few things that might look non-standard to most Lua programmers, -which come about as `l3build`'s focus is testing and building LaTeX packages: - -- Our target Lua set up is `texlua` (part of LuaTeX), not standalone `lua` -- The main `l3build.lua` file is self-contained as this helps with - bootstrapping LaTeX: we are aiming to maintain a single file with no - `.lua` dependencies -- The primary documentation is aimed at the TeX world, so is in PDF format - and generated from `l3build.dtx`; documentation in the `.lua` file is - also welcome, but anything for general use does need to be in the `.dtx` -- As far as possible, everything is done within `l3build` itself or tools - directly available in a TeX system or as standard in the supported - systems (Windows, MacOS, Linux) -- The `l3build` interfaces should be platform-agnostic (though it may be - necessary of course to branch inside particular functions) - -If you are submitting a pull request, notice that - -- We use Travis-CI for (light) testing so add `[ci skip]` to documentation-only - commit messages -- We favour a single linear history so will rebase agreed pull requests on to - the `master` branch -- Where a commit fixes or closes an issue, please include this information - in the first line of the commit message diff --git a/macros/latex/contrib/l3build/README.md b/macros/latex/contrib/l3build/README.md index 40741a74ed..d66bf91b0f 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-02-20 +Release 2023-02-26 Overview -------- @@ -31,6 +31,6 @@ The LaTeX kernel is developed by [The LaTeX Project](https://latex-project.org). ----- -<p>Copyright (C) 2014-2022 The LaTeX Project <br /> +<p>Copyright (C) 2014-2023 The LaTeX Project <br /> <a href="http://latex-project.org/">http://latex-project.org/</a> <br /> All rights reserved.</p> diff --git a/macros/latex/contrib/l3build/l3build-arguments.lua b/macros/latex/contrib/l3build/l3build-arguments.lua index 49c80a7596..76b661e26c 100644 --- a/macros/latex/contrib/l3build/l3build-arguments.lua +++ b/macros/latex/contrib/l3build/l3build-arguments.lua @@ -291,16 +291,16 @@ end options = argparse() -- Sanity check -function check_engines() +function check_engines(config) if options["engine"] and not options["force"] then - -- Make a lookup table - local t = { } + -- Make a lookup table + local t = { } for _, engine in pairs(checkengines) do t[engine] = true end for _, engine in pairs(options["engine"]) do if not t[engine] then - print("\n! Error: Engine \"" .. engine .. "\" not set up for testing!") + print("\n! Error: Engine \"" .. engine .. "\" not set up for testing with configuration " .. config .. "!") print("\n Valid values are:") for _, engine in ipairs(checkengines) do print(" - " .. engine) diff --git a/macros/latex/contrib/l3build/l3build-check.lua b/macros/latex/contrib/l3build/l3build-check.lua index b77a7e26cc..8c3afa4a7e 100644 --- a/macros/latex/contrib/l3build/l3build-check.lua +++ b/macros/latex/contrib/l3build/l3build-check.lua @@ -791,7 +791,7 @@ function runtest(name, engine, hide, ext, test_type, breakout) .. (checksearch and os_pathsep or "") .. os_concat .. -- ensure epoch settings - set_epoch_cmd(epoch, forcecheckepoch) .. + set_epoch_cmd(epoch, forcecheckepoch) .. -- Ensure lines are of a known length os_setenv .. " max_print_line=" .. maxprintline .. os_concat .. diff --git a/macros/latex/contrib/l3build/l3build-typesetting.lua b/macros/latex/contrib/l3build/l3build-typesetting.lua index 7f5327b5a2..2a7dbad510 100644 --- a/macros/latex/contrib/l3build/l3build-typesetting.lua +++ b/macros/latex/contrib/l3build/l3build-typesetting.lua @@ -57,10 +57,11 @@ end function dvitopdf(name, dir, engine, hide) runcmd( + set_epoch_cmd(epoch, forcecheckepoch) .. "dvips " .. name .. dviext .. (hide and (" > " .. os_null) or "") .. os_concat .. - "ps2pdf " .. ps2pdfopt .. name .. psext + "ps2pdf " .. ps2pdfopts .. name .. psext .. (hide and (" > " .. os_null) or ""), dir ) diff --git a/macros/latex/contrib/l3build/l3build-variables.lua b/macros/latex/contrib/l3build/l3build-variables.lua index 51f927019a..ce07d1f815 100644 --- a/macros/latex/contrib/l3build/l3build-variables.lua +++ b/macros/latex/contrib/l3build/l3build-variables.lua @@ -193,7 +193,8 @@ if flattentds == nil then end maxprintline = maxprintline or 79 packtdszip = packtdszip or false -ps2pdfopt = ps2pdfopt or "" +-- support "ps2pdfopt" for backward compatibility, gh issue #275 +ps2pdfopts = ps2pdfopts or ps2pdfopt or "" typesetcmds = typesetcmds or "" typesetruns = typesetruns or 3 recordstatus = recordstatus or false diff --git a/macros/latex/contrib/l3build/l3build.1 b/macros/latex/contrib/l3build/l3build.1 index f9738ed8d9..2044b290a6 100644 --- a/macros/latex/contrib/l3build/l3build.1 +++ b/macros/latex/contrib/l3build/l3build.1 @@ -1,4 +1,4 @@ -.TH l3build 1 "2023-02-20" +.TH l3build 1 "2023-02-26" .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 085ac1d022..6df655fb98 100644 --- a/macros/latex/contrib/l3build/l3build.dtx +++ b/macros/latex/contrib/l3build/l3build.dtx @@ -236,7 +236,7 @@ % }^^A % } % -% \date{Released 2023-02-20} +% \date{Released 2023-02-26} % % \maketitle % \tableofcontents diff --git a/macros/latex/contrib/l3build/l3build.lua b/macros/latex/contrib/l3build/l3build.lua index ff80523b17..0aead12f95 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-02-20" +release_date = "2023-02-26" -- File operations are aided by the LuaFileSystem module local lfs = require("lfs") @@ -118,17 +118,14 @@ if options["epoch"] then end epoch = normalise_epoch(epoch) --- Sanity check -check_engines() - -- -- Deal with multiple configs for tests -- -- When we have specific files to deal with, only use explicit configs --- (or just the std one) +-- (or just the default one) if options["names"] then - checkconfigs = options["config"] or {stdconfig} + checkconfigs = options["config"] or {"build"} else checkconfigs = options["config"] or checkconfigs end @@ -205,22 +202,28 @@ if #checkconfigs > 1 then end end if #checkconfigs == 1 and - checkconfigs[1] ~= "build" and (options["target"] == "check" or options["target"] == "save" or options["target"] == "clean") then - local configname = gsub(checkconfigs[1], "%.lua$", "") - local config = "./" .. configname .. ".lua" - if fileexists(config) then - local savedtestfiledir = testfiledir - dofile(config) - testdir = testdir .. "-" .. configname - -- Reset testsuppdir if required - if savedtestfiledir ~= testfiledir and - testsuppdir == savedtestfiledir .. "/support" then - testsuppdir = testfiledir .. "/support" - end + if checkconfigs[1] == "build" then + -- Sanity check for default config + check_engines("build.lua") else - print("Error: Cannot find configuration " .. checkconfigs[1]) - exit(1) + local configname = gsub(checkconfigs[1], "%.lua$", "") + local config = "./" .. configname .. ".lua" + if fileexists(config) then + local savedtestfiledir = testfiledir + dofile(config) + -- Sanity check for non-default config + check_engines(configname .. ".lua") + testdir = testdir .. "-" .. configname + -- Reset testsuppdir if required + if savedtestfiledir ~= testfiledir and + testsuppdir == savedtestfiledir .. "/support" then + testsuppdir = testfiledir .. "/support" + end + else + print("Error: Cannot find configuration " .. configname .. ".lua") + exit(1) + end end end diff --git a/macros/latex/contrib/l3build/l3build.pdf b/macros/latex/contrib/l3build/l3build.pdf Binary files differindex 4afb71bd9b..617ba9b69a 100644 --- a/macros/latex/contrib/l3build/l3build.pdf +++ b/macros/latex/contrib/l3build/l3build.pdf |