From 725ce6a3e602c7516d471df841ea433b8c5bcd9d Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 16 Mar 2022 03:01:05 +0000 Subject: CTAN sync 202203160301 --- macros/latex/contrib/l3build/CHANGELOG.md | 13 +++- macros/latex/contrib/l3build/README.md | 2 +- macros/latex/contrib/l3build/l3build-check.lua | 2 +- macros/latex/contrib/l3build/l3build.1 | 2 +- macros/latex/contrib/l3build/l3build.dtx | 83 +++++++++++++------------ macros/latex/contrib/l3build/l3build.lua | 4 +- macros/latex/contrib/l3build/l3build.pdf | Bin 741313 -> 741870 bytes 7 files changed, 61 insertions(+), 45 deletions(-) (limited to 'macros/latex/contrib/l3build') diff --git a/macros/latex/contrib/l3build/CHANGELOG.md b/macros/latex/contrib/l3build/CHANGELOG.md index a8002e8d80..129cdab7b9 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] +## [2022-03-15] + +### Changed +- When `\pdfmeta_set_regression_data:` is defined it is used + to set metadata +- Support multiple configurations in bundles + +### Fixed +- Correctly normalize luaotfload font cache path + ## [2022-02-24] ### Fixed @@ -574,7 +584,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/2022-02-24...HEAD +[Unreleased]: https://github.com/latex3/l3build/compare/2022-03-15...HEAD +[2022-03-15]: https://github.com/latex3/l3build/compare/2022-02-24...2022-03-15 [2022-02-24]: https://github.com/latex3/l3build/compare/2021-12-14...2022-02-24 [2021-12-14]: https://github.com/latex3/l3build/compare/2021-12-09...2021-12-14 [2021-12-09]: https://github.com/latex3/l3build/compare/2021-12-06...2021-12-09 diff --git a/macros/latex/contrib/l3build/README.md b/macros/latex/contrib/l3build/README.md index d2cc67987d..67f37bd53d 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 2022-02-24 +Release 2022-03-15 Overview -------- diff --git a/macros/latex/contrib/l3build/l3build-check.lua b/macros/latex/contrib/l3build/l3build-check.lua index 65ac222271..f016c25a62 100644 --- a/macros/latex/contrib/l3build/l3build-check.lua +++ b/macros/latex/contrib/l3build/l3build-check.lua @@ -147,7 +147,7 @@ local function normalize_log(content,engine,errlevels) -- Images line = gsub(line, "<" .. pattern .. ">", "<../%1>") -- luaotfload files start with keywords - line = gsub(line, "from " .. pattern .. "%(", "from. ./%1(") + line = gsub(line, "from " .. pattern .. "$", "from ../%1") line = gsub(line, ": " .. pattern .. "%)", ": ../%1)") -- Deal with XeTeX specials if match(line, "^%.+\\XeTeX.?.?.?file") then diff --git a/macros/latex/contrib/l3build/l3build.1 b/macros/latex/contrib/l3build/l3build.1 index 1eaa9ca865..2329238b1a 100644 --- a/macros/latex/contrib/l3build/l3build.1 +++ b/macros/latex/contrib/l3build/l3build.1 @@ -1,4 +1,4 @@ -.TH l3build 1 "2022-02-24" +.TH l3build 1 "2022-03-15" .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 df9d152f9e..fbd84ff215 100644 --- a/macros/latex/contrib/l3build/l3build.dtx +++ b/macros/latex/contrib/l3build/l3build.dtx @@ -237,7 +237,7 @@ % }^^A % } % -% \date{Released 2022-02-24} +% \date{Released 2022-03-15} % % \maketitle % \tableofcontents @@ -1545,7 +1545,7 @@ % \meta{package}|-ctan.curlopt|. This is then passed to curl using its % |--config| commandline option. (Using an intermediate file helps % keep \pkg{l3build} portable between systems using different -% commandline quoting conventions. Any backslashes are doubled when writing +% commandline quoting conventions. Any backslashes are doubled when writing % to this file, so they do not need to be doubled in announcement and note texts.) % % By default the file is written into the current directory alongside @@ -2497,48 +2497,53 @@ % environment side (as not all output can be controlled here). % There is a limit to what can be done with the underlying PDF structure so % there is no point entirely suppressing \texttt{Producer}: simply avoid -% any version numbers. +% any version numbers. If the pdfmanagement is loaded we use its function +% if it exists. % \begin{macrocode} -\ifnum 0% - \ifx\pdfoutput\@undefined\else\ifnum\pdfoutput>0 1\fi\fi - \ifx\outputmode\@undefined\else\ifnum\outputmode>0 1\fi\fi - >0 % - \ifx\pdfvariable\@undefined - \pdfinfo{/Producer (\ifx\directlua\@undefined pdf\else Lua\fi TeX)} - \ifx\pdfinfoomitdate\@undefined\else - \pdfinfoomitdate = 1 % - \pdfsuppressptexinfo = \numexpr +\ifcsname pdfmeta_set_regression_data:\endcsname + \csname pdfmeta_set_regression_data:\endcsname +\else + \ifnum 0% + \ifx\pdfoutput\@undefined\else\ifnum\pdfoutput>0 1\fi\fi + \ifx\outputmode\@undefined\else\ifnum\outputmode>0 1\fi\fi + >0 % + \ifx\pdfvariable\@undefined + \pdfinfo{/Producer (\ifx\directlua\@undefined pdf\else Lua\fi TeX)} + \ifx\pdfinfoomitdate\@undefined\else + \pdfinfoomitdate = 1 % + \pdfsuppressptexinfo = \numexpr + 0 + + 1 % PTEX.Fullbanner + + 2 % PTEX.FileName + \relax + \pdftrailerid{} + \fi + \else + \pdfextension info{/Producer (LuaTeX)} + \pdfvariable suppressoptionalinfo \numexpr 0 - + 1 % PTEX.Fullbanner - + 2 % PTEX.FileName + + 1 % PTEX.Fullbanner + + 2 % PTEX.FileName + + 32 % CreationDate + + 64 % ModDate + + 512 % ID \relax - \pdftrailerid{} \fi \else - \pdfextension info{/Producer (LuaTeX)} - \pdfvariable suppressoptionalinfo \numexpr - 0 - + 1 % PTEX.Fullbanner - + 2 % PTEX.FileName - + 32 % CreationDate - + 64 % ModDate - + 512 % ID - \relax - \fi -\else - \ifx\XeTeXversion\@undefined - \special{! <> setpagedevice} - \special{! <> setpagedevice} - \else - \special{% - pdf: docinfo - << - /Creator (TeX) - /CreationDate () - /ModDate () - /Producer (xdvipdfmx) - >> - } + \ifx\XeTeXversion\@undefined + \special{! <> setpagedevice} + \special{! <> setpagedevice} + \else + \special{% + pdf: docinfo + << + /Creator (TeX) + /CreationDate () + /ModDate () + /Producer (xdvipdfmx) + >> + } + \fi \fi \fi % \end{macrocode} diff --git a/macros/latex/contrib/l3build/l3build.lua b/macros/latex/contrib/l3build/l3build.lua index 744f7628b8..80a7b6e3d0 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 = "2022-02-24" +release_date = "2022-03-15" -- File operations are aided by the LuaFileSystem module local lfs = require("lfs") @@ -134,7 +134,7 @@ else end if #checkconfigs > 1 then - if options["target"] == "check" then + if options["target"] == "check" or options["target"] == "bundlecheck" then local errorlevel = 0 local failed = { } for i = 1, #checkconfigs do diff --git a/macros/latex/contrib/l3build/l3build.pdf b/macros/latex/contrib/l3build/l3build.pdf index 9e229e7248..def5d5ec3d 100644 Binary files a/macros/latex/contrib/l3build/l3build.pdf and b/macros/latex/contrib/l3build/l3build.pdf differ -- cgit v1.2.3