From 32a641f484bf4f20a262ad06facd5bd4d560a001 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 4 Jan 2024 20:33:56 +0000 Subject: l3build (4jan24) git-svn-id: svn://tug.org/texlive/trunk@69300 c570f23f-e606-0410-a88d-b1316a301751 --- .../texlive/linked_scripts/l3build/l3build.lua | 14 ++++------- Master/texmf-dist/doc/latex/l3build/CHANGELOG.md | 10 +++++++- Master/texmf-dist/doc/latex/l3build/README.md | 6 ++--- Master/texmf-dist/doc/latex/l3build/l3build.pdf | Bin 748206 -> 747742 bytes Master/texmf-dist/doc/man/man1/l3build.1 | 6 ++--- Master/texmf-dist/doc/man/man1/l3build.man1.pdf | Bin 14945 -> 14890 bytes .../scripts/l3build/l3build-arguments.lua | 16 ++++++------- Master/texmf-dist/scripts/l3build/l3build-aux.lua | 5 ++-- .../texmf-dist/scripts/l3build/l3build-check.lua | 26 ++++++++++++--------- .../texmf-dist/scripts/l3build/l3build-clean.lua | 2 +- Master/texmf-dist/scripts/l3build/l3build-ctan.lua | 2 +- .../scripts/l3build/l3build-file-functions.lua | 4 +--- Master/texmf-dist/scripts/l3build/l3build-help.lua | 4 ++-- .../texmf-dist/scripts/l3build/l3build-install.lua | 3 +-- .../scripts/l3build/l3build-manifest-setup.lua | 2 +- .../scripts/l3build/l3build-manifest.lua | 4 ++-- .../texmf-dist/scripts/l3build/l3build-stdmain.lua | 22 ++++++++--------- .../texmf-dist/scripts/l3build/l3build-tagging.lua | 2 +- .../scripts/l3build/l3build-typesetting.lua | 17 ++++++++++++-- .../texmf-dist/scripts/l3build/l3build-unpack.lua | 2 +- .../texmf-dist/scripts/l3build/l3build-upload.lua | 14 +++++------ .../scripts/l3build/l3build-variables.lua | 2 +- Master/texmf-dist/scripts/l3build/l3build-zip.lua | 2 +- Master/texmf-dist/scripts/l3build/l3build.lua | 14 ++++------- Master/texmf-dist/source/latex/l3build/l3build.dtx | 8 +++---- Master/texmf-dist/source/latex/l3build/l3build.ins | 4 ++-- .../tex/latex/l3build/regression-test.tex | 2 +- 27 files changed, 103 insertions(+), 90 deletions(-) diff --git a/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua b/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua index 0154019cb99..995eefe533a 100644 --- a/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua +++ b/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua @@ -2,7 +2,7 @@ --[[ -File l3build.lua Copyright (C) 2014-2022 The LaTeX Project +File l3build.lua Copyright (C) 2014-2024 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 @@ -25,14 +25,13 @@ for those people who are interested. --]] -- Version information -release_date = "2023-12-15" +release_date = "2024-01-04" -- File operations are aided by the LuaFileSystem module local lfs = require("lfs") -- Local access to functions -local assert = assert local ipairs = ipairs local insert = table.insert local lookup = kpse.lookup @@ -40,11 +39,8 @@ local match = string.match local gsub = string.gsub local next = next local print = print -local select = select -local tonumber = tonumber local exit = os.exit local open = io.open -local stdout = io.stdout -- l3build setup and functions kpse.set_program_name("kpsewhich") @@ -181,11 +177,11 @@ if #checkconfigs > 1 then exit(2) end for line in f:lines() do - if line == "" then break end - savecmds = savecmds .. " " .. line .. "\n" + if line == "" then break end + savecmds = savecmds .. " " .. line .. "\n" end for line in f:lines() do - recheckcmds = recheckcmds .. " " .. line .. "\n" + recheckcmds = recheckcmds .. " " .. line .. "\n" end f:close() end diff --git a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md index 8d1ec764405..c06b9a380fa 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-01-04] + +### Changed +- Throw warnings on unknown doc name(s) +- Always execute `runtest_tasks()` if set (issue \#327) +- Print failures correctly when these occur in multiple configurations + ## [2023-12-15] ### Fixed @@ -746,7 +753,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-12-15..HEAD +[Unreleased]: https://github.com/latex3/l3build/compare/2024-01-04...HEAD +[2024-01-04]: https://github.com/latex3/l3build/compare/2023-12-15...2024-01-04 [2023-12-15]: https://github.com/latex3/l3build/compare/2023-12-13-2...2023-12-15 [2023-12-13-2]: https://github.com/latex3/l3build/compare/2023-12-13...2023-12-13-2 [2023-12-13]: https://github.com/latex3/l3build/compare/2023-12-12...2023-12-13 diff --git a/Master/texmf-dist/doc/latex/l3build/README.md b/Master/texmf-dist/doc/latex/l3build/README.md index c071c434e64..c2bba6cc5bd 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 2023-12-15 +Release 2024-01-04 Overview -------- @@ -31,6 +31,6 @@ The LaTeX kernel is developed by [The LaTeX Project](https://latex-project.org). ----- -

Copyright (C) 2014-2023 The LaTeX Project
-http://latex-project.org/
+

Copyright (C) 2014-2024 The LaTeX Project
+https://latex-project.org/
All rights reserved.

diff --git a/Master/texmf-dist/doc/latex/l3build/l3build.pdf b/Master/texmf-dist/doc/latex/l3build/l3build.pdf index 7214f3dcea7..763d37dc2d7 100644 Binary files a/Master/texmf-dist/doc/latex/l3build/l3build.pdf and b/Master/texmf-dist/doc/latex/l3build/l3build.pdf differ diff --git a/Master/texmf-dist/doc/man/man1/l3build.1 b/Master/texmf-dist/doc/man/man1/l3build.1 index 6b3699cf127..e6d604b5601 100644 --- a/Master/texmf-dist/doc/man/man1/l3build.1 +++ b/Master/texmf-dist/doc/man/man1/l3build.1 @@ -1,8 +1,8 @@ -.TH l3build 1 "2023-12-15" +.TH l3build 1 "2024-01-04" .SH NAME l3build \- Checking and building packages .SH SYNOPSIS -l3build [] [] +l3build [] [] .SH DESCRIPTION The l3build system is a Lua script for building TeX packages, with particular emphasis on regression testing. It is written in cross-platform Lua code, so @@ -10,7 +10,7 @@ can be used by any modern TeX distribution with the texlua interpreter. A package for building with l3build can be written in any TeX dialect; its defaults are set up for LaTeX packages written in the DocStrip style. .PP -The most commonly used l3build commands are: +The most commonly used l3build targets are: .IP check Run all automated tests .IP clean diff --git a/Master/texmf-dist/doc/man/man1/l3build.man1.pdf b/Master/texmf-dist/doc/man/man1/l3build.man1.pdf index c8dd7a2ade2..5d34b0193cd 100644 Binary files a/Master/texmf-dist/doc/man/man1/l3build.man1.pdf and b/Master/texmf-dist/doc/man/man1/l3build.man1.pdf differ diff --git a/Master/texmf-dist/scripts/l3build/l3build-arguments.lua b/Master/texmf-dist/scripts/l3build/l3build-arguments.lua index 95ed9f59e4d..a1755d693dc 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-arguments.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-arguments.lua @@ -1,6 +1,6 @@ --[[ -File l3build-arguments.lua Copyright (C) 2018-2021,2023 The LaTeX Project +File l3build-arguments.lua Copyright (C) 2018-2024 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 @@ -248,14 +248,14 @@ local function argparse() return { target = "help" } end else - if not optarg then - optarg = arg[i + 1] if not optarg then - stderr:write("Missing value for option " .. a .."\n") - return { target = "help" } + optarg = arg[i + 1] + if not optarg then + stderr:write("Missing value for option " .. a .."\n") + return { target = "help" } + end + i = i + 1 end - i = i + 1 - end end else stderr:write("Unknown option " .. a .."\n") @@ -283,7 +283,7 @@ local function argparse() end end if next(names) then - result["names"] = names + result["names"] = names end return result end diff --git a/Master/texmf-dist/scripts/l3build/l3build-aux.lua b/Master/texmf-dist/scripts/l3build/l3build-aux.lua index 115117c40fb..dd8c410fc09 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-aux.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-aux.lua @@ -1,6 +1,6 @@ --[[ -File l3build-aux.lua Copyright (C) 2018-2021,2023 The LaTeX Project +File l3build-aux.lua Copyright (C) 2018-2024 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 @@ -25,6 +25,7 @@ for those people who are interested. -- local safety guards and shortcuts local match = string.match +local gsub = string.gsub local pairs = pairs local print = print @@ -207,4 +208,4 @@ function runcmd(cmd,dir,vars) end end return run(dir,set_epoch_cmd(epoch, forcedocepoch) .. env .. cmd) -end \ No newline at end of file +end diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua index 65366c91caa..1f2b04ce5a3 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-check.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua @@ -1,6 +1,6 @@ --[[ -File l3build-check.lua Copyright (C) 2018-2023 The LaTeX Project +File l3build-check.lua Copyright (C) 2018-2024 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 @@ -628,10 +628,10 @@ function runcheck(name, hide) end end for i=1, #failedengines do - if failedengines[i] == stdengine then - failedengines = {stdengine} - break - end + if failedengines[i] == stdengine then + failedengines = {stdengine} + break + end end -- Return everything return errorlevel, failedengines @@ -657,7 +657,7 @@ function setup_check(name, engine) end end if found then - return + return end -- Attempt to generate missing reference file from expectation for _, kind in ipairs(test_order) do @@ -674,7 +674,7 @@ function setup_check(name, engine) end end if found then - return + return end print( "Error: failed to find any reference or expectation file for " @@ -824,7 +824,7 @@ function runtest(name, engine, hide, ext, test_type, breakout) ) -- On Windows, concatenating here will suppress any non-zero errorlevel -- from the main run, so we split into two parts. - if errlevels[i] == 0 and runtest_tasks(jobname(lvtfile),i) ~= "" then + if runtest_tasks(jobname(lvtfile),i) ~= "" then local errorlevel = runcmd(preamble .. runtest_tasks(jobname(lvtfile),i),testdir) if errorlevel ~= 0 then errlevels[i] = errorlevel end @@ -922,9 +922,9 @@ local function showsavecommands(failurelist) end f:write"\n" if savecmds[stdengine] then - print("\n Afterwards test for engine specific changes using\n") - print(" " .. checkcmd) - f:write(checkcmd) + print("\n Afterwards test for engine specific changes using\n") + print(" " .. checkcmd) + f:write(checkcmd) end f:close() print("") @@ -1057,6 +1057,10 @@ end -- A short auxiliary to print the list of differences for check function checkdiff(config) + local testdir = testdir + if config then + testdir = testdir .. "-" .. config + end local diff_files = ordered_filelist(testdir, "*" .. os_diffext) if next(diff_files) then if config then diff --git a/Master/texmf-dist/scripts/l3build/l3build-clean.lua b/Master/texmf-dist/scripts/l3build/l3build-clean.lua index e5d5ddec3d7..07c3459fdb2 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-clean.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-clean.lua @@ -1,6 +1,6 @@ --[[ -File l3build-clean.lua Copyright (C) 2018,2020,2021 The LaTeX Project +File l3build-clean.lua Copyright (C) 2018-2024 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 diff --git a/Master/texmf-dist/scripts/l3build/l3build-ctan.lua b/Master/texmf-dist/scripts/l3build/l3build-ctan.lua index b290533b27f..c1feb2564ac 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-ctan.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-ctan.lua @@ -1,6 +1,6 @@ --[[ -File l3build-ctan.lua Copyright (C) 2018-2021 The LaTeX Project +File l3build-ctan.lua Copyright (C) 2018-2024 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 diff --git a/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua b/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua index b5cd9b5f89d..a1b22ce5707 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua @@ -1,6 +1,6 @@ --[[ -File l3build-file-functions.lua Copyright (C) 2018-2023 The LaTeX Project +File l3build-file-functions.lua Copyright (C) 2018-2024 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 @@ -22,7 +22,6 @@ for those people who are interested. --]] -local pairs = pairs local print = print local open = io.open @@ -43,7 +42,6 @@ local luatex_version = status.luatex_version local match = string.match local sub = string.sub -local gmatch = string.gmatch local gsub = string.gsub local insert = table.insert diff --git a/Master/texmf-dist/scripts/l3build/l3build-help.lua b/Master/texmf-dist/scripts/l3build/l3build-help.lua index 3e204df0d65..46b0bc45b39 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-help.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-help.lua @@ -1,6 +1,6 @@ --[[ -File l3build-help.lua Copyright (C) 2018,2020,2021 The LaTeX Project +File l3build-help.lua Copyright (C) 2018-2024 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 @@ -27,7 +27,7 @@ local match = string.match local rep = string.rep local sort = table.sort -local copyright = "Copyright (C) 2014-2021 The LaTeX Project\n" +local copyright = "Copyright (C) 2014-2024 The LaTeX Project\n" function version() print( diff --git a/Master/texmf-dist/scripts/l3build/l3build-install.lua b/Master/texmf-dist/scripts/l3build/l3build-install.lua index ad5aeaaac65..9e2286481ef 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-install.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-install.lua @@ -1,6 +1,6 @@ --[[ -File l3build-install.lua Copyright (C) 2018-2021 The LaTeX Project +File l3build-install.lua Copyright (C) 2018-2024 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 @@ -32,7 +32,6 @@ local var_value = kpse.var_value local gsub = string.gsub local lower = string.lower local match = string.match -local format = string.format local insert = table.insert diff --git a/Master/texmf-dist/scripts/l3build/l3build-manifest-setup.lua b/Master/texmf-dist/scripts/l3build/l3build-manifest-setup.lua index b5c2b317183..8654b3deb52 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-manifest-setup.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-manifest-setup.lua @@ -1,6 +1,6 @@ --[[ -File l3build-manifest-setup.lua Copyright (C) 2018,2020,2021 The LaTeX Project +File l3build-manifest-setup.lua Copyright (C) 2018-2024 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 diff --git a/Master/texmf-dist/scripts/l3build/l3build-manifest.lua b/Master/texmf-dist/scripts/l3build/l3build-manifest.lua index 12b8cdc114f..99a82464b2c 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-manifest.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-manifest.lua @@ -1,6 +1,6 @@ --[[ -File l3build-manifest.lua Copyright (C) 2018,2020,2021 The LaTeX Project +File l3build-manifest.lua Copyright (C) 2018-2024 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 @@ -128,7 +128,7 @@ manifest_build_init = function(entry) Nchar_descr = 11 , -- TODO: generalise } - -- copy default options to each group if necessary + -- copy default options to each group if necessary for kk,ll in pairs(manifest_group_defaults) do if entry[kk] == nil then entry[kk] = ll diff --git a/Master/texmf-dist/scripts/l3build/l3build-stdmain.lua b/Master/texmf-dist/scripts/l3build/l3build-stdmain.lua index 6209dcd2962..d264a78fa48 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-stdmain.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-stdmain.lua @@ -1,6 +1,6 @@ --[[ -File l3build-stdmain.lua Copyright (C) 2018-2021 The LaTeX Project +File l3build-stdmain.lua Copyright (C) 2018-2024 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 @@ -122,12 +122,12 @@ target_list = desc = "Updates release tags in files", func = tag, pre = function(names) - if names and #names > 1 then - print("Too many tags specified; exactly one required") - exit(1) - end - return 0 - end + if names and #names > 1 then + print("Too many tags specified; exactly one required") + exit(1) + end + return 0 + end }, uninstall = { @@ -171,10 +171,10 @@ function main(target,names) end else if target_list[target].pre then - errorlevel = target_list[target].pre(names) - if errorlevel ~= 0 then - exit(1) - end + errorlevel = target_list[target].pre(names) + if errorlevel ~= 0 then + exit(1) + end end errorlevel = target_list[target].func(names) end diff --git a/Master/texmf-dist/scripts/l3build/l3build-tagging.lua b/Master/texmf-dist/scripts/l3build/l3build-tagging.lua index 20ef513f26a..0753123f996 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-tagging.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-tagging.lua @@ -1,6 +1,6 @@ --[[ -File l3build-tagging.lua Copyright (C) 2018-2021 The LaTeX Project +File l3build-tagging.lua Copyright (C) 2018-2024 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 diff --git a/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua b/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua index d3ba3e5b6fc..8de57f3718d 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua @@ -1,6 +1,6 @@ --[[ -File l3build-typesetting.lua Copyright (C) 2018-2021,2023 The LaTeX Project +File l3build-typesetting.lua Copyright (C) 2018-2024 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 @@ -63,7 +63,7 @@ function bibtex(name,dir) if os_type == "windows" then grep = "\\\\" else - grep = "\\\\\\\\" + grep = "\\\\\\\\" end if run(dir, os_grepexe .. " \"^" .. grep .. "citation{\" " .. name .. ".aux > " @@ -184,6 +184,12 @@ function doc(files) local errorlevel = docinit() if errorlevel ~= 0 then return errorlevel end local done = {} + local files_unknown = {} + if files and next(files) then + for _, file in pairs(files) do + files_unknown[file] = true + end + end for _,typesetfiles in ipairs({typesetdemofiles,typesetfiles}) do for _,glob in pairs(typesetfiles) do local destpath,globstub = splitpath(glob) @@ -198,6 +204,7 @@ function doc(files) typeset = false for _,file in pairs(files) do if name == file then + files_unknown[file] = nil typeset = true break end @@ -219,5 +226,11 @@ function doc(files) end end end + if next(files_unknown) then + for file, _ in pairs(files_unknown) do + print("Unknown doc name \"" .. file .. "\"") + end + return 1 + end return 0 end diff --git a/Master/texmf-dist/scripts/l3build/l3build-unpack.lua b/Master/texmf-dist/scripts/l3build/l3build-unpack.lua index 6ce4b3286b2..3c73dc8d143 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-unpack.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-unpack.lua @@ -1,6 +1,6 @@ --[[ -File l3build-unpack.lua Copyright (C) 2018-2021 The LaTeX Project +File l3build-unpack.lua Copyright (C) 2018-2024 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 diff --git a/Master/texmf-dist/scripts/l3build/l3build-upload.lua b/Master/texmf-dist/scripts/l3build/l3build-upload.lua index 180572baf46..87158d1b01d 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-upload.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-upload.lua @@ -1,6 +1,6 @@ --[[ -File l3build-upload.lua Copyright (C) 2018-2021 The LaTeX Project +File l3build-upload.lua Copyright (C) 2018-2024 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 @@ -34,8 +34,6 @@ local popen = io.popen local read = io.read local write = io.write -local os_type = os.type - local len = string.len local lower = string.lower local match = string.match @@ -131,8 +129,8 @@ function upload(tagnames) print("Are you sure you want to continue? [y/n]" ) io.stdout:write("> "):flush() if lower(read(),1,1) ~= "y" then - print'Aborting' - return 1 + print'Aborting' + return 1 end end @@ -247,9 +245,9 @@ function shell(s) local t = assert(h:read('*a')) local success = h:close() if (success) then - return t + return t else - error("\nError from shell command:\n" .. s .. "\n" .. t .. "\n") + error("\nError from shell command:\n" .. s .. "\n" .. t .. "\n") end end @@ -358,7 +356,7 @@ function input_multi_line_field (name) if answer_line~=nil then field = field .. "\n" .. answer_line end - end + end until (return_count==3 or answer_line==nil or answer_line=='\004') return field end diff --git a/Master/texmf-dist/scripts/l3build/l3build-variables.lua b/Master/texmf-dist/scripts/l3build/l3build-variables.lua index 9e0ed9d47ad..123e509a5b9 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-variables.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-variables.lua @@ -1,6 +1,6 @@ --[[ -File l3build-variables.lua Copyright (C) 2018-2023 The LaTeX Project +File l3build-variables.lua Copyright (C) 2018-2024 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 diff --git a/Master/texmf-dist/scripts/l3build/l3build-zip.lua b/Master/texmf-dist/scripts/l3build/l3build-zip.lua index 1fab56cf4bc..51074151733 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-zip.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-zip.lua @@ -1,6 +1,6 @@ --[[ -File l3build-zip.lua Copyright (C) 2021 The LaTeX Project +File l3build-zip.lua Copyright (C) 2021-2024 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 diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua index 0154019cb99..995eefe533a 100755 --- a/Master/texmf-dist/scripts/l3build/l3build.lua +++ b/Master/texmf-dist/scripts/l3build/l3build.lua @@ -2,7 +2,7 @@ --[[ -File l3build.lua Copyright (C) 2014-2022 The LaTeX Project +File l3build.lua Copyright (C) 2014-2024 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 @@ -25,14 +25,13 @@ for those people who are interested. --]] -- Version information -release_date = "2023-12-15" +release_date = "2024-01-04" -- File operations are aided by the LuaFileSystem module local lfs = require("lfs") -- Local access to functions -local assert = assert local ipairs = ipairs local insert = table.insert local lookup = kpse.lookup @@ -40,11 +39,8 @@ local match = string.match local gsub = string.gsub local next = next local print = print -local select = select -local tonumber = tonumber local exit = os.exit local open = io.open -local stdout = io.stdout -- l3build setup and functions kpse.set_program_name("kpsewhich") @@ -181,11 +177,11 @@ if #checkconfigs > 1 then exit(2) end for line in f:lines() do - if line == "" then break end - savecmds = savecmds .. " " .. line .. "\n" + if line == "" then break end + savecmds = savecmds .. " " .. line .. "\n" end for line in f:lines() do - recheckcmds = recheckcmds .. " " .. line .. "\n" + recheckcmds = recheckcmds .. " " .. line .. "\n" end f:close() end diff --git a/Master/texmf-dist/source/latex/l3build/l3build.dtx b/Master/texmf-dist/source/latex/l3build/l3build.dtx index d169f49ccdf..047f43f4df1 100644 --- a/Master/texmf-dist/source/latex/l3build/l3build.dtx +++ b/Master/texmf-dist/source/latex/l3build/l3build.dtx @@ -1,6 +1,6 @@ % \iffalse % -% File l3build.dtx (C) Copyright 2014-2023 The LaTeX Project +% File l3build.dtx Copyright (C) 2014-2024 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 @@ -251,7 +251,7 @@ % }^^A % } % -% \date{Released 2023-12-15} +% \date{Released 2024-01-04} % % \maketitle % \tableofcontents @@ -340,7 +340,7 @@ % process. % %The example scripts given in Section~\vref{sec:examples} largely cover the required knowledge in Lua programing. -% For a more advanced usage, one may consult general Lua documentations including \url{http://www.lua.org/manual/5.3/manual.html} and for the few |texlua| specific additions see section 4.2 of the \LuaTeX{} manual available locally with |texdoc luatex| command line or at \url{https://www.pragma-ade.com/general/manuals/luatex.pdf}. +% For a more advanced usage, one may consult general Lua documentations including \url{https://www.lua.org/manual/5.3/manual.html} and for the few |texlua| specific additions see section 4.2 of the \LuaTeX{} manual available locally with |texdoc luatex| command line or at \url{https://www.pragma-ade.com/general/manuals/luatex.pdf}. % % \subsection{Main build targets} % @@ -714,7 +714,7 @@ % For example, for the core \LaTeXe{} tests the main test files are contained % in a directory |testfiles|. To test font loading for \XeTeX{} and \LuaTeX{} % there are a second set of tests in |testfiles-TU| which use the short -% |build-TU.lua| file shown in Listing~\vref{lst:configs}. To run both sets of +% |config-TU.lua| file shown in Listing~\vref{lst:configs}. To run both sets of % tests, the main |build.lua| file contains the setting % |checkconfigs = {"build", "config-TU"}|. This will cause \pkg{l3build} to run % first using no additional settings (\emph{i.e.}~reading the normal diff --git a/Master/texmf-dist/source/latex/l3build/l3build.ins b/Master/texmf-dist/source/latex/l3build/l3build.ins index c790b35b400..502e505ec85 100644 --- a/Master/texmf-dist/source/latex/l3build/l3build.ins +++ b/Master/texmf-dist/source/latex/l3build/l3build.ins @@ -1,6 +1,6 @@ \iffalse meta-comment -File l3build.ins Copyright (C) 2014-2018,2021 The LaTeX Project +File l3build.ins Copyright (C) 2014-2024 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 @@ -32,7 +32,7 @@ license information is placed in the derived files. \preamble -Copyright (C) 2014-2021 The LaTeX Project +Copyright (C) 2014-2024 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 diff --git a/Master/texmf-dist/tex/latex/l3build/regression-test.tex b/Master/texmf-dist/tex/latex/l3build/regression-test.tex index 933184346d0..033695f75f3 100644 --- a/Master/texmf-dist/tex/latex/l3build/regression-test.tex +++ b/Master/texmf-dist/tex/latex/l3build/regression-test.tex @@ -6,7 +6,7 @@ %% %% l3build.dtx (with options: `package') %% -%% Copyright (C) 2014-2021 The LaTeX Project +%% Copyright (C) 2014-2024 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 -- cgit v1.2.3