summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-05-10 21:39:27 +0000
committerKarl Berry <karl@freefriends.org>2018-05-10 21:39:27 +0000
commit8c6ec9147394790c16fc597649f905eac2fac3be (patch)
tree00b7ef4983ee6ac90f1d46e5af5ef4b8bcaddc10
parentb598c4bc94f19b893aeae19d89750d57121bf2b5 (diff)
l3build (10may18)
git-svn-id: svn://tug.org/texlive/trunk@47669 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/texlive/linked_scripts/l3build/l3build.lua2
-rw-r--r--Master/texmf-dist/doc/latex/l3build/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/l3build/l3build.pdfbin670759 -> 670208 bytes
-rw-r--r--Master/texmf-dist/doc/man/man1/l3build.12
-rw-r--r--Master/texmf-dist/doc/man/man1/l3build.man1.pdfbin15381 -> 15268 bytes
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-check.lua10
-rwxr-xr-xMaster/texmf-dist/scripts/l3build/l3build.lua2
-rw-r--r--Master/texmf-dist/source/latex/l3build/l3build.dtx6
8 files changed, 13 insertions, 11 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua b/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua
index 8ce5e37d896..1ded83cc5b6 100644
--- a/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua
+++ b/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua
@@ -25,7 +25,7 @@ for those people who are interested.
--]]
-- Version information
-release_date = "2018-05-06"
+release_date = "2018-05-10"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")
diff --git a/Master/texmf-dist/doc/latex/l3build/README.md b/Master/texmf-dist/doc/latex/l3build/README.md
index 810a2e3b5c5..756ce85a42f 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-05-06
+Release 2018-05-10
Overview
--------
diff --git a/Master/texmf-dist/doc/latex/l3build/l3build.pdf b/Master/texmf-dist/doc/latex/l3build/l3build.pdf
index dc5c72f4252..fb2f936ae56 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/doc/man/man1/l3build.1 b/Master/texmf-dist/doc/man/man1/l3build.1
index c6525574cc4..e3cc9f1e933 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-05-06"
+.TH l3build 1 "2018-05-10"
.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 f0c77ad1b49..419d5a2b93e 100644
--- a/Master/texmf-dist/doc/man/man1/l3build.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/l3build.man1.pdf
Binary files differ
diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua
index 0a0caa67c1d..442bd916814 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-check.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua
@@ -89,10 +89,15 @@ local function formatlog(logfile, newfile, engine, errlevels)
maxprintline = maxprintline + 1 -- Deal with an out-by-one error
end
local function killcheck(line)
+ -- Skip lines containing file dates
+ if match(line, "[^<]%d%d%d%d/%d%d/%d%d")
+ or match(line, "[^<]%d%d%d%d%-%d%d%-%d%d") then
+ return true
+ elseif
-- Skip \openin/\openout lines in web2c 7.x
-- As Lua doesn't allow "(in|out)", a slightly complex approach:
-- do a substitution to check the line is exactly what is required!
- if match(
+ match(
gsub(line, "^\\openin", "\\openout"), "^\\openout%d%d? = "
) then
return true
@@ -133,9 +138,6 @@ local function formatlog(logfile, newfile, engine, errlevels)
line = gsub(line, pattern, "../%1")
end
end
- -- Print only 'place-marker' (ISO) dates
- line = gsub(line, "%d%d%d%d%-%d%d%-%d%d", "YYYY-MM-DD")
- line = gsub(line, "%d%d%d%d/%d%d/%d%d", "YYYY-MM-DD")
-- Deal with the fact that "(.aux)" may have still a leading space
line = gsub(line, "^ %(%.aux%)", "(.aux)")
-- Merge all of .fd data into one line so will be removed later
diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua
index 8ce5e37d896..1ded83cc5b6 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-05-06"
+release_date = "2018-05-10"
-- 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 eae219f8b2b..fd2e652347b 100644
--- a/Master/texmf-dist/source/latex/l3build/l3build.dtx
+++ b/Master/texmf-dist/source/latex/l3build/l3build.dtx
@@ -217,7 +217,7 @@
% }^^A
% }
%
-% \date{Released 2018-05-06}
+% \date{Released 2018-05-10}
%
% \maketitle
% \tableofcontents
@@ -749,14 +749,14 @@
% \item Lines before the \cs{START}, after the \cs{END} and within
% \cs{OMIT}/\cs{TIMO} blocks
% \item Entirely blank lines, including those consisting only of spaces.
+% \item Lines containing file dates in format
+% \texttt{\meta{yyyy}/\meta{mm}/\meta{dd}}.
% \item Lines starting \cs{openin} or \cs{openout}.
% \end{itemize}
% Modifications made in lines are:
% \begin{itemize}
% \item Removal spaces at the start of lines.
% \item Removal of |./| at start of file names.
-% \item Conversion of dates (YYYY-MM-DD or YYYY/MM/DD format) to the
-% place-holder |YYYY-MM-DD|
% \item Standardisation of the list of units known to \TeX{} (\pdfTeX{}
% and \LuaTeX{} add a small number of additional units which are not
% known to \TeX90 or \XeTeX{}, (u)p\TeX{} adds some additional non-standard