summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts/l3build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-10-02 21:17:45 +0000
committerKarl Berry <karl@freefriends.org>2019-10-02 21:17:45 +0000
commitcef9a194c05e1e055145f052ca24508842c4fbc9 (patch)
tree8ee7e1f71fb1771810d36aad52b961c805e5d23f /Master/texmf-dist/scripts/l3build
parent232a9e8c131c4a36b549eace3512642e409a233a (diff)
l3build (2oct19)
git-svn-id: svn://tug.org/texlive/trunk@52258 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts/l3build')
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-check.lua30
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-typesetting.lua14
-rwxr-xr-xMaster/texmf-dist/scripts/l3build/l3build.lua2
3 files changed, 26 insertions, 20 deletions
diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua
index aad03281034..e2cdd655bf8 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-check.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua
@@ -137,22 +137,20 @@ local function normalize_log(content,engine,errlevels)
lastline = ""
-- Zap ./ at begin of filename
line = gsub(line, "%(%.%/", "(")
- -- Zap paths if places other than 'here' are accessible
- if checksearch then
- -- The pattern excludes < and > as the image part can have
- -- several entries on one line
- local pattern = "%w?:?/[^ %<%>]*/([^/%(%)]*%.%w*)"
- -- Files loaded from TeX: all start ( -- )
- line = gsub(line, "%(" .. pattern, "(../%1")
- -- Images
- line = gsub(line, "<" .. pattern .. ">", "<../%1>")
- -- luaotfload files start with keywords
- line = gsub(line, "from " .. pattern .. "%(", "from. ./%1(")
- line = gsub(line, ": " .. pattern .. "%)", ": ../%1)")
- -- Deal with XeTeX specials
- if match(line, "^%.+\\XeTeX.?.?.?file") then
- line = gsub(line, pattern, "../%1")
- end
+ -- Zap paths
+ -- The pattern excludes < and > as the image part can have
+ -- several entries on one line
+ local pattern = "%w?:?/[^ %<%>]*/([^/%(%)]*%.%w*)"
+ -- Files loaded from TeX: all start ( -- )
+ line = gsub(line, "%(" .. pattern, "(../%1")
+ -- Images
+ line = gsub(line, "<" .. pattern .. ">", "<../%1>")
+ -- luaotfload files start with keywords
+ line = gsub(line, "from " .. pattern .. "%(", "from. ./%1(")
+ line = gsub(line, ": " .. pattern .. "%)", ": ../%1)")
+ -- Deal with XeTeX specials
+ if match(line, "^%.+\\XeTeX.?.?.?file") then
+ line = gsub(line, pattern, "../%1")
end
-- Deal with dates
if match(line, "[^<]%d%d%d%d[/%-]%d%d[/%-]%d%d") then
diff --git a/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua b/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua
index 7f588a7c239..fe6a6a58dcc 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua
@@ -174,9 +174,7 @@ typeset_demo_tasks = typeset_demo_tasks or function()
return 0
end
--- Typeset all required documents
--- Uses a set of dedicated auxiliaries that need to be available to others
-function doc(files)
+local function docinit()
-- Set up
cleandir(typesetdir)
for _,filetype in pairs(
@@ -199,6 +197,16 @@ function doc(files)
if errorlevel ~= 0 then
return errorlevel
end
+ return docinit_hook()
+end
+
+docinit_hook = docinit_hook or function() return 0 end
+
+-- Typeset all required documents
+-- Uses a set of dedicated auxiliaries that need to be available to others
+function doc(files)
+ local errorlevel = docinit()
+ if errorlevel ~= 0 then return errorlevel end
local done = {}
for _,typesetfiles in ipairs({typesetdemofiles,typesetfiles}) do
for _,glob in pairs(typesetfiles) do
diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua
index 7f0f9dced92..d9f4fe23f8e 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-09-30"
+release_date = "2019-10-02"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")