From 4b795f65d52cde0d136c0175ce20101946378b54 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 5 Feb 2020 03:03:08 +0000 Subject: CTAN sync 202002050303 --- macros/latex/contrib/l3build/CHANGELOG.md | 12 +++++++++++- macros/latex/contrib/l3build/README.md | 2 +- macros/latex/contrib/l3build/l3build-check.lua | 4 ++++ macros/latex/contrib/l3build/l3build-upload.lua | 6 +++++- macros/latex/contrib/l3build/l3build.1 | 2 +- macros/latex/contrib/l3build/l3build.dtx | 4 +++- macros/latex/contrib/l3build/l3build.lua | 2 +- macros/latex/contrib/l3build/l3build.pdf | Bin 704174 -> 703656 bytes 8 files changed, 26 insertions(+), 6 deletions(-) (limited to 'macros/latex/contrib/l3build') diff --git a/macros/latex/contrib/l3build/CHANGELOG.md b/macros/latex/contrib/l3build/CHANGELOG.md index ad3566738c..1c54b0044e 100644 --- a/macros/latex/contrib/l3build/CHANGELOG.md +++ b/macros/latex/contrib/l3build/CHANGELOG.md @@ -7,6 +7,15 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2020-02-03] + +### Changed +- Normalise out DVI header lines + +### Fixed +- Allow announcement field to be empty + (with a warning this suppresses the CTAN announcement) + ## [2020-01-14] ### Fixed @@ -404,7 +413,8 @@ this project uses date-based 'snapshot' version identifiers. - Rationalise short option names: removed `-d`, `-E`, `-r` - Target `cmdcheck`: specific to LaTeX3 kernel work -[Unreleased]: https://github.com/latex3/l3build/compare/2020-01-14...HEAD +[Unreleased]: https://github.com/latex3/l3build/compare/2020-02-03...HEAD +[2020-02-03]: https://github.com/latex3/l3build/compare/2020-01-14...2020-02-03 [2020-01-14]: https://github.com/latex3/l3build/compare/2019-11-27...2020-01-14 [2019-11-27]: https://github.com/latex3/l3build/compare/2019-11-01...2019-11-27 [2019-11-01]: https://github.com/latex3/l3build/compare/2019-10-02...2019-11-01 diff --git a/macros/latex/contrib/l3build/README.md b/macros/latex/contrib/l3build/README.md index 8d85b8aad2..4ff2f712d0 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 LaTeX3 ================================================= -Release 2020-01-14 +Release 2020-02-03 Overview -------- diff --git a/macros/latex/contrib/l3build/l3build-check.lua b/macros/latex/contrib/l3build/l3build-check.lua index ea550327eb..8bafe0591c 100644 --- a/macros/latex/contrib/l3build/l3build-check.lua +++ b/macros/latex/contrib/l3build/l3build-check.lua @@ -227,6 +227,10 @@ local function normalize_log(content,engine,errlevels) -- Remove the \special line that in DVI mode keeps PDFs comparable if match(line, "^%.*\\special%{pdf: docinfo << /Creator") then return "" + end + -- Remove \special lines for DVI .pro files + if match(line, "^%.*\\special%{header=") then + return "" end if match(line, "^%.*\\special%{dvipdfmx:config") then return "" diff --git a/macros/latex/contrib/l3build/l3build-upload.lua b/macros/latex/contrib/l3build/l3build-upload.lua index de1899ad2c..257cce61a3 100644 --- a/macros/latex/contrib/l3build/l3build-upload.lua +++ b/macros/latex/contrib/l3build/l3build-upload.lua @@ -276,7 +276,11 @@ function ctan_single_field(fname,fvalue,max,desc,mandatory) if (fvalue==nil or type(fvalue)~="table") then local vs=trim_space(tostring(fvalue)) if (mandatory==true and (fvalue == nil or vs=="")) then - error("The field " .. fname .. " must contain " .. desc) + if (fname=="announcement") then + print("Empty announcement: No ctan announcement will be made") + else + error("The field " .. fname .. " must contain " .. desc) + end end if (fvalue ~=nil and len(vs) > 0) then if (max > 0 and len(vs) > max) then diff --git a/macros/latex/contrib/l3build/l3build.1 b/macros/latex/contrib/l3build/l3build.1 index 5383db8cf3..e40861b50d 100644 --- a/macros/latex/contrib/l3build/l3build.1 +++ b/macros/latex/contrib/l3build/l3build.1 @@ -1,4 +1,4 @@ -.TH l3build 1 "2020-01-14" +.TH l3build 1 "2020-02-03" .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 c63a4bffa1..b2a981434f 100644 --- a/macros/latex/contrib/l3build/l3build.dtx +++ b/macros/latex/contrib/l3build/l3build.dtx @@ -231,7 +231,7 @@ % }^^A % } % -% \date{Released 2020-01-14} +% \date{Released 2020-02-03} % % \maketitle % \tableofcontents @@ -850,6 +850,8 @@ % \texttt{} % \item Removal of some (u)p\TeX{} data where it is equivalent to % \pdfTeX{} (|yoko direction|, |\displace 0.0|) +% \item Removal of various |\special| lines inserted due to the build +% process % \end{itemize} % % \LuaTeX{} makes several additional changes to the log file. As normalising diff --git a/macros/latex/contrib/l3build/l3build.lua b/macros/latex/contrib/l3build/l3build.lua index 95436dd2e9..2c244c1ea5 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 = "2020-01-14" +release_date = "2020-02-03" -- 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 index c05f53b3c2..271bfb6beb 100644 Binary files a/macros/latex/contrib/l3build/l3build.pdf and b/macros/latex/contrib/l3build/l3build.pdf differ -- cgit v1.2.3