summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-11-25 20:58:47 +0000
committerKarl Berry <karl@freefriends.org>2017-11-25 20:58:47 +0000
commit2f6ef1426efcea1eafdd9ca9d5cbd08e0e9726d5 (patch)
tree063769eed870f93683e85dbe3fe04a852f36e43d
parent68725e4c00f7540a73778ba91bdbe68dd135f01c (diff)
l3build (25nov17)
git-svn-id: svn://tug.org/texlive/trunk@45905 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/l3build/CONTRIBUTING.md5
-rw-r--r--Master/texmf-dist/doc/latex/l3build/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/l3build/l3build.pdfbin634377 -> 633630 bytes
-rw-r--r--Master/texmf-dist/source/latex/l3build/l3build.dtx6
-rw-r--r--Master/texmf-dist/tex/latex/l3build/l3build.lua20
5 files changed, 23 insertions, 10 deletions
diff --git a/Master/texmf-dist/doc/latex/l3build/CONTRIBUTING.md b/Master/texmf-dist/doc/latex/l3build/CONTRIBUTING.md
index 67869125e1b..a152299e83e 100644
--- a/Master/texmf-dist/doc/latex/l3build/CONTRIBUTING.md
+++ b/Master/texmf-dist/doc/latex/l3build/CONTRIBUTING.md
@@ -31,10 +31,11 @@ which come about as `l3build`'s focus is testing and building LaTeX packages:
- Our target Lua set up is `texlua` (part of LuaTeX), not standalone `lua`
- The main `l3build.lua` file is self-contained as this helps with
- bootstrapping LaTeX: we are aiming to maintain a single file with
+ bootstrapping LaTeX: we are aiming to maintain a single file with no
`.lua` dependencies
- The primary documentation is aimed at the TeX world, so is in PDF format
- and generated from `l3build.dtx`
+ and generated from `l3build.dtx`; documentation in the `.lua` file is
+ also welcome, but anything for general use does need to be in the `.dtx`
- As far as possible, everything is done within `l3build` itself or tools
directly available in a TeX system or as standard in the supported
systems (Windows, MacOS, Linux)
diff --git a/Master/texmf-dist/doc/latex/l3build/README.md b/Master/texmf-dist/doc/latex/l3build/README.md
index 84774ab6dc2..8624e438fa1 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 2017/09/12
+Release 2017/11/25
Overview
--------
diff --git a/Master/texmf-dist/doc/latex/l3build/l3build.pdf b/Master/texmf-dist/doc/latex/l3build/l3build.pdf
index 93743bc6fc4..a52f815993e 100644
--- a/Master/texmf-dist/doc/latex/l3build/l3build.pdf
+++ b/Master/texmf-dist/doc/latex/l3build/l3build.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/l3build/l3build.dtx b/Master/texmf-dist/source/latex/l3build/l3build.dtx
index 5a7e4a6e735..d894295b15c 100644
--- a/Master/texmf-dist/source/latex/l3build/l3build.dtx
+++ b/Master/texmf-dist/source/latex/l3build/l3build.dtx
@@ -82,7 +82,7 @@
\luavarset{demofiles} {\{~\}}{Files which show how to use a module.}
\luavarset{docfiles} {\{~\}}{Files which are part of the documentation but should not be typeset.}
\luavarset{excludefiles} {\{"*\string~"\}} {Files to ignore entirely (default for Emacs backup files).}
-\luavarset{installfiles} {\{"*.sty"\}} {Files to install to the \TeX{} tree and similar tasks.}
+\luavarset{installfiles} {\{"*.sty","*.cls"\}} {Files to install to the \TeX{} tree and similar tasks.}
\luavarset{makeindexfiles} {\{"*.ist"\}}{MakeIndex files to be included in a TDS-style zip}
\luavarset{sourcefiles} {\{"*.dtx", "*.ins"\}}{Files to copy for unpacking.}
\luavarset{textfiles} {\{"*.md", "*.txt"\}}{Plain text files to send to CTAN as-is.}
@@ -208,7 +208,7 @@
% }^^A
% }
%
-% \date{Released 2017/09/12}
+% \date{Released 2017/11/25}
%
% \maketitle
% \tableofcontents
@@ -292,10 +292,12 @@
% \item check \meta{name(s)}
% \item cmdcheck
% \item clean
+% \item ctan
% \item doc \meta{name(s)}
% \item install
% \item save \meta{name(s)}
% \item setversion
+% \item unpack
% \end{itemize}
% These commands are described below.
%
diff --git a/Master/texmf-dist/tex/latex/l3build/l3build.lua b/Master/texmf-dist/tex/latex/l3build/l3build.lua
index bb4bf12df5f..9fd1faa3f40 100644
--- a/Master/texmf-dist/tex/latex/l3build/l3build.lua
+++ b/Master/texmf-dist/tex/latex/l3build/l3build.lua
@@ -23,7 +23,7 @@ for those people who are interested.
--]]
-- Version information
-release_date = "2017/09/12"
+release_date = "2017/11/25"
-- "module" is a deprecated function in Lua 5.2: as we want the name
-- for other purposes, and it should eventually be 'free', simply
@@ -102,7 +102,7 @@ cleanfiles = cleanfiles or {"*.log", "*.pdf", "*.zip"}
demofiles = demofiles or { }
docfiles = docfiles or { }
excludefiles = excludefiles or {"*~"}
-installfiles = installfiles or {"*.sty"}
+installfiles = installfiles or {"*.sty","*.cls"}
makeindexfiles = makeindexfiles or {"*.ist"}
sourcefiles = sourcefiles or {"*.dtx", "*.ins"}
textfiles = textfiles or {"*.md", "*.txt"}
@@ -286,7 +286,7 @@ local option_list =
},
rerun =
{
- desc = "Suppresses TeX output when unpacking",
+ desc = "Skip setup: simply rerun tests",
short = "r",
type = "boolean"
},
@@ -984,6 +984,10 @@ local function formatlog(logfile, newfile, engine, errlevels)
-- 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
end
-- Deal with the fact that "(.aux)" may have still a leading space
line = gsub(line, "^ %(%.aux%)", "(.aux)")
@@ -1051,7 +1055,8 @@ local function formatlog(logfile, newfile, engine, errlevels)
for line in gmatch(contents, "([^\n]*)\n") do
if line == "START-TEST-LOG" then
prestart = false
- elseif line == "END-TEST-LOG" then
+ elseif line == "END-TEST-LOG" or
+ match(line, "^Here is how much of .?.?.?TeX\'s memory you used:") then
break
elseif line == "OMIT" then
skipping = true
@@ -1070,7 +1075,7 @@ local function formatlog(logfile, newfile, engine, errlevels)
if recordstatus then
write('***************\n')
for i = 1, checkruns do
- write('Compilation ' .. i .. ' of test file completed with exit status ' .. errlevels[i] )
+ write('Compilation ' .. i .. ' of test file completed with exit status ' .. errlevels[i] '\n')
end
end
close(newfile)
@@ -1134,6 +1139,9 @@ local function formatlualog(logfile, newfile)
"Missing character: There is no (%^%^..) %(U%+(....)%)",
"Missing character: There is no %1"
)
+ -- The first time a new font is used, it shows up
+ -- as being cached
+ line = gsub(line, "(save cache:", "(load cache:")
-- A function to handle the box prefix part
local function boxprefix(s)
return gsub(match(s, "^(%.+)"), "%.", "%%.")
@@ -1825,6 +1833,8 @@ function check(names)
return 1
else
errorlevel = 1
+ -- visually show that something has failed
+ print(" --> failed\n")
end
end
end