From 46b0eb50328de23c333a90378401ade0b13b5329 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 27 Jun 2019 20:59:52 +0000 Subject: l3build (27jun19) git-svn-id: svn://tug.org/texlive/trunk@51492 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/l3build/CHANGELOG.md | 14 +++++++++++++- Master/texmf-dist/doc/latex/l3build/README.md | 2 +- Master/texmf-dist/doc/latex/l3build/l3build.pdf | Bin 700309 -> 700442 bytes Master/texmf-dist/doc/man/man1/l3build.1 | 2 +- Master/texmf-dist/doc/man/man1/l3build.man1.pdf | Bin 15219 -> 15273 bytes .../texmf-dist/scripts/l3build/l3build-check.lua | 6 ++---- Master/texmf-dist/scripts/l3build/l3build.lua | 2 +- Master/texmf-dist/source/latex/l3build/l3build.dtx | 2 +- 8 files changed, 19 insertions(+), 9 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md index 84ca6edfcd3..27ea28f62a6 100644 --- a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md @@ -7,6 +7,17 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2019-06-27] + +### Changed + +- Back out change for normalisation of LuaTeX v1.10 stack information + (timing issue: will reintroduce later) + +### Fixed + +- Correct test for LuaTeX (see #93) + ## [2019-06-26] ### Added @@ -277,7 +288,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/2019-06-26...HEAD +[Unreleased]: https://github.com/latex3/l3build/compare/2019-06-27...HEAD +[2019-06-27]: https://github.com/latex3/l3build/compare/2019-06-26...2019-06-27 [2019-06-26]: https://github.com/latex3/l3build/compare/2019-06-18...2019-06-26 [2019-06-18]: https://github.com/latex3/l3build/compare/2019-02-10...2019-06-18 [2019-02-10]: https://github.com/latex3/l3build/compare/2019-02-06...2019-02-10 diff --git a/Master/texmf-dist/doc/latex/l3build/README.md b/Master/texmf-dist/doc/latex/l3build/README.md index 576614bdfd7..bb8ae1781a7 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 LaTeX3 ================================================= -Release 2019-06-26 +Release 2019-06-27 Overview -------- diff --git a/Master/texmf-dist/doc/latex/l3build/l3build.pdf b/Master/texmf-dist/doc/latex/l3build/l3build.pdf index e51b57752b6..cff29fe6a68 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 82c01e537ff..9067893703b 100644 --- a/Master/texmf-dist/doc/man/man1/l3build.1 +++ b/Master/texmf-dist/doc/man/man1/l3build.1 @@ -1,4 +1,4 @@ -.TH l3build 1 "2019-06-26" +.TH l3build 1 "2019-06-27" .SH NAME l3build \- Checking and building packages .SH SYNOPSIS diff --git a/Master/texmf-dist/doc/man/man1/l3build.man1.pdf b/Master/texmf-dist/doc/man/man1/l3build.man1.pdf index 20b6fe76daa..5261c3aae0a 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-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua index 38e7f88a352..9fcf9885717 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-check.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua @@ -123,9 +123,7 @@ local function normalize_log(content,engine,errlevels) -- do this before wrapping lines line = gsub(line, "^l%.%d+ ", "l. ...") -- Also from lua stack traces. - for str,_ in pairs({"field","function","upvalue"}) do - line = gsub(line, "lua:%d+: in " .. str, "lua:...: in " .. str) - end + line = gsub(line, "lua:%d+: in function", "lua:...: in function") -- Allow for wrapped lines: preserve the content and wrap -- Skip lines that have an explicit marker for truncation if len(line) == maxprintline and @@ -639,7 +637,7 @@ function compare_tlg(name,engine,cleanup) end -- Do additional log formatting if the engine is LuaTeX, there is no -- LuaTeX-specific .tlg file and the default engine is not LuaTeX - if match(engine,"^lua") or match(engine,"harf") + if (match(engine,"^lua") or match(engine,"^harf")) and not match(tlgfile, "%.luatex" .. "%" .. tlgext) and not match(stdengine,"^lua") then diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua index 0f6947cbbd9..eacada0df35 100755 --- a/Master/texmf-dist/scripts/l3build/l3build.lua +++ b/Master/texmf-dist/scripts/l3build/l3build.lua @@ -25,7 +25,7 @@ for those people who are interested. --]] -- Version information -release_date = "2019-06-26" +release_date = "2019-06-27" -- File operations are aided by the LuaFileSystem module local lfs = require("lfs") diff --git a/Master/texmf-dist/source/latex/l3build/l3build.dtx b/Master/texmf-dist/source/latex/l3build/l3build.dtx index fe2d495a14d..4ca84094d6e 100644 --- a/Master/texmf-dist/source/latex/l3build/l3build.dtx +++ b/Master/texmf-dist/source/latex/l3build/l3build.dtx @@ -227,7 +227,7 @@ % }^^A % } % -% \date{Released 2019-06-26} +% \date{Released 2019-06-27} % % \maketitle % \tableofcontents -- cgit v1.2.3