From 2bd4f7f317b392c32ce18c70d03fd5ba9ddd9e6d Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 26 Mar 2020 03:02:49 +0000 Subject: CTAN sync 202003260302 --- macros/latex/contrib/l3build/CHANGELOG.md | 9 ++++++- macros/latex/contrib/l3build/README.md | 2 +- macros/latex/contrib/l3build/l3build-clean.lua | 26 +++++++++++++++++---- .../contrib/l3build/l3build-file-functions.lua | 2 +- macros/latex/contrib/l3build/l3build-variables.lua | 7 ++++++ macros/latex/contrib/l3build/l3build.1 | 2 +- macros/latex/contrib/l3build/l3build.dtx | 2 +- macros/latex/contrib/l3build/l3build.lua | 2 +- macros/latex/contrib/l3build/l3build.pdf | Bin 707228 -> 707064 bytes 9 files changed, 41 insertions(+), 11 deletions(-) (limited to 'macros/latex/contrib/l3build') diff --git a/macros/latex/contrib/l3build/CHANGELOG.md b/macros/latex/contrib/l3build/CHANGELOG.md index c7dfda8d22..67509493f3 100644 --- a/macros/latex/contrib/l3build/CHANGELOG.md +++ b/macros/latex/contrib/l3build/CHANGELOG.md @@ -7,6 +7,12 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2020-03-25] + +### Changed +- Exclude `sourcefiles` entries from file clean-up +- Adjust defaults for TeX Live 2020 LuaHBTeX usage + ## [2020-03-16] ### Changed @@ -460,7 +466,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-03-16...HEAD +[Unreleased]: https://github.com/latex3/l3build/compare/2020-03-25...HEAD +[2020-03-25]: https://github.com/latex3/l3build/compare/2020-03-16...2020-03-25 [2020-03-16]: https://github.com/latex3/l3build/compare/2020-03-13...2020-03-16 [2020-03-13]: https://github.com/latex3/l3build/compare/2020-03-12...2020-03-13 [2020-03-12]: https://github.com/latex3/l3build/compare/2020-02-21...2020-03-12 diff --git a/macros/latex/contrib/l3build/README.md b/macros/latex/contrib/l3build/README.md index 49635e3d94..b721010c22 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-03-16 +Release 2020-03-25 Overview -------- diff --git a/macros/latex/contrib/l3build/l3build-clean.lua b/macros/latex/contrib/l3build/l3build-clean.lua index 01927a71d0..27ed42be9c 100644 --- a/macros/latex/contrib/l3build/l3build-clean.lua +++ b/macros/latex/contrib/l3build/l3build-clean.lua @@ -1,6 +1,6 @@ --[[ -File l3build-clean.lua Copyright (C) 2018 The LaTeX3 Project +File l3build-clean.lua Copyright (C) 2018,2020 The LaTeX3 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,12 +34,28 @@ function clean() cleandir(testdir) + cleandir(typesetdir) + cleandir(unpackdir) - for _,i in ipairs(cleanfiles) do - for _,dir in pairs(remove_duplicates({maindir, sourcefiledir, docfiledir})) do - errorlevel = rm(dir, i) + errorlevel + + if errorlevel ~= 0 then return errorlevel end + + local clean_list = { } + for _,dir in pairs(remove_duplicates({maindir,sourcefiledir,docfiledir})) do + for _,glob in pairs(cleanfiles) do + for file,_ in pairs(tree(dir,glob)) do + clean_list[file] = true + end + end + for _,glob in pairs(sourcefiles) do + for file,_ in pairs(tree(dir,glob)) do + clean_list[file] = nil + end + end + for file,_ in pairs(clean_list) do + errorlevel = rm(dir,file) + if errorlevel ~= 0 then return errorlevel end end end - return errorlevel + + return 0 end function bundleclean() diff --git a/macros/latex/contrib/l3build/l3build-file-functions.lua b/macros/latex/contrib/l3build/l3build-file-functions.lua index 6c420f80a2..7d13fc933e 100644 --- a/macros/latex/contrib/l3build/l3build-file-functions.lua +++ b/macros/latex/contrib/l3build/l3build-file-functions.lua @@ -241,7 +241,7 @@ function direxists(dir) errorlevel = execute("if not exist \"" .. unix_to_win(dir) .. "\" exit 1") else - errorlevel = execute("[ -d " .. dir .. " ]") + errorlevel = execute("[ -d '" .. dir .. "' ]") end if errorlevel ~= 0 then return false diff --git a/macros/latex/contrib/l3build/l3build-variables.lua b/macros/latex/contrib/l3build/l3build-variables.lua index dcb2521869..432bfe6b15 100644 --- a/macros/latex/contrib/l3build/l3build-variables.lua +++ b/macros/latex/contrib/l3build/l3build-variables.lua @@ -128,6 +128,13 @@ specialformats.latex = specialformats.latex or { ptex = {binary = "eptex"}, uptex = {binary = "euptex"} } +if not string.find(status.banner,"2019") then + specialformats.latex.luatex = specialformats.latex.luatex or + {binary = "luahbtex",format = "lualatex"} + specialformats["latex-dev"] = specialformats["latex-dev"] or + {luatex = {binary="luahbtex",format = "lualatex-dev"}} +end + stdengine = stdengine or "pdftex" -- The tests themselves diff --git a/macros/latex/contrib/l3build/l3build.1 b/macros/latex/contrib/l3build/l3build.1 index 7271ec549d..776d9e9ede 100644 --- a/macros/latex/contrib/l3build/l3build.1 +++ b/macros/latex/contrib/l3build/l3build.1 @@ -1,4 +1,4 @@ -.TH l3build 1 "2020-03-16" +.TH l3build 1 "2020-03-25" .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 a8d812d6d9..a513e3e6c5 100644 --- a/macros/latex/contrib/l3build/l3build.dtx +++ b/macros/latex/contrib/l3build/l3build.dtx @@ -234,7 +234,7 @@ % }^^A % } % -% \date{Released 2020-03-16} +% \date{Released 2020-03-25} % % \maketitle % \tableofcontents diff --git a/macros/latex/contrib/l3build/l3build.lua b/macros/latex/contrib/l3build/l3build.lua index 63eed70306..083b6b81ba 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-03-16" +release_date = "2020-03-25" -- 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 ea6b310b2f..a3ee41c426 100644 Binary files a/macros/latex/contrib/l3build/l3build.pdf and b/macros/latex/contrib/l3build/l3build.pdf differ -- cgit v1.2.3