summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts/l3build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-06-27 20:59:52 +0000
committerKarl Berry <karl@freefriends.org>2019-06-27 20:59:52 +0000
commit46b0eb50328de23c333a90378401ade0b13b5329 (patch)
treec04162fb5e4439f44b6c4cd687b1c527ac2566aa /Master/texmf-dist/scripts/l3build
parentbc8b14582c03f4e371434f68219d716477a29ac1 (diff)
l3build (27jun19)
git-svn-id: svn://tug.org/texlive/trunk@51492 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts/l3build')
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-check.lua6
-rwxr-xr-xMaster/texmf-dist/scripts/l3build/l3build.lua2
2 files changed, 3 insertions, 5 deletions
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")