From 29a130c2612ca597fcf45f1b38e93259358a3f2e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 9 Nov 2018 21:54:51 +0000 Subject: l3build (9nov18) git-svn-id: svn://tug.org/texlive/trunk@49115 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/l3build/CHANGELOG.md | 13 ++++++++++++- Master/texmf-dist/doc/latex/l3build/README.md | 2 +- Master/texmf-dist/doc/latex/l3build/l3build.pdf | Bin 674222 -> 674222 bytes Master/texmf-dist/doc/man/man1/l3build.1 | 2 +- Master/texmf-dist/doc/man/man1/l3build.man1.pdf | Bin 15148 -> 15148 bytes .../texmf-dist/scripts/l3build/l3build-check.lua | 5 +++-- Master/texmf-dist/scripts/l3build/l3build.lua | 5 +++-- Master/texmf-dist/source/latex/l3build/l3build.dtx | 2 +- 8 files changed, 21 insertions(+), 8 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 3d4110a3e13..1b64ee6700d 100644 --- a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md @@ -7,6 +7,16 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2018-11-08] + +### Changed + +- Strip leading spaces from file loading/page number lines (see #78) + +### Fixed + +- Print test failures correctly per-config (see #77) + ## [2018-10-30] ### Fixed @@ -189,7 +199,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/2018-10-30...HEAD +[Unreleased]: https://github.com/latex3/l3build/compare/2018-11-08...HEAD +[2018-11-08]: https://github.com/latex3/l3build/compare/2018-10-30...2018-11-08 [2018-10-30]: https://github.com/latex3/l3build/compare/2018-10-25...2018-10-30 [2018-10-25]: https://github.com/latex3/l3build/compare/2018-09-26...2018-10-25 [2018-09-26]: https://github.com/latex3/l3build/compare/2018-09-23...2018-09-26 diff --git a/Master/texmf-dist/doc/latex/l3build/README.md b/Master/texmf-dist/doc/latex/l3build/README.md index 1292dc8cea3..9fb833e65f3 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 2018-10-30 +Release 2018-11-08 Overview -------- diff --git a/Master/texmf-dist/doc/latex/l3build/l3build.pdf b/Master/texmf-dist/doc/latex/l3build/l3build.pdf index d5297300897..c428631c5af 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 6dce56d5642..bdd309db3aa 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 "2018-10-30" +.TH l3build 1 "2018-11-08" .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 e7a16112c6e..fe10c4b1522 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 416bfb4c994..837b6356cbf 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-check.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua @@ -156,8 +156,9 @@ local function normalize_log(content,engine,errlevels) line = gsub(line,"%d%d%d%d[/%-]%d%d[/%-]%d%d","....-..-..") line = gsub(line,"v%d+%.?%d?%d?%w?","v...") end - -- Deal with the fact that "(.aux)" may have still a leading space - line = gsub(line, "^ %(%.aux%)", "(.aux)") + -- Deal with leading spaces for file and page number lines + line = gsub(line,"^ *%[(%d)","[%1") + line = gsub(line,"^ *%(","(") -- Zap .fd lines: drop the first part, and skip to the end if match(line, "^ *%([%.%/%w]+%.fd[^%)]*$") then return "","",true diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua index ee17fe2ab84..e40b8e6da74 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 = "2018-10-30" +release_date = "2018-11-08" -- File operations are aided by the LuaFileSystem module local lfs = require("lfs") @@ -154,8 +154,9 @@ if options["target"] == "check" then for _,config in ipairs(failed) do print("Failed tests for configuration " .. config .. ":") print("\n Check failed with difference files") + local testdir = testdir if config ~= "build" then - local testdir = testdir .. "-" .. config + testdir = testdir .. "-" .. config end for _,i in ipairs(filelist(testdir,"*" .. os_diffext)) do print(" - " .. testdir .. "/" .. i) diff --git a/Master/texmf-dist/source/latex/l3build/l3build.dtx b/Master/texmf-dist/source/latex/l3build/l3build.dtx index 2ef6165a018..b4b13bf8331 100644 --- a/Master/texmf-dist/source/latex/l3build/l3build.dtx +++ b/Master/texmf-dist/source/latex/l3build/l3build.dtx @@ -223,7 +223,7 @@ % }^^A % } % -% \date{Released 2018-10-30} +% \date{Released 2018-11-08} % % \maketitle % \tableofcontents -- cgit v1.2.3