summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-11-24 21:30:05 +0000
committerKarl Berry <karl@freefriends.org>2021-11-24 21:30:05 +0000
commit144c0a923f33ff2c2fc69e52c1959d2b27feeb46 (patch)
tree949f0dd2fa6f1989f9e489cff4b30ff0a4c2f5ce
parent97463c3d441d47bb67305116787a8dd100a38cfe (diff)
l3build (24nov21)
git-svn-id: svn://tug.org/texlive/trunk@61143 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/CHANGELOG.md7
-rw-r--r--Master/texmf-dist/doc/latex/l3build/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/l3build/l3build.pdfbin739966 -> 740125 bytes
-rw-r--r--Master/texmf-dist/doc/man/man1/l3build.12
-rw-r--r--Master/texmf-dist/doc/man/man1/l3build.man1.pdfbin15488 -> 15556 bytes
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-typesetting.lua49
-rwxr-xr-xMaster/texmf-dist/scripts/l3build/l3build.lua2
-rw-r--r--Master/texmf-dist/source/latex/l3build/l3build.dtx2
9 files changed, 36 insertions, 30 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua b/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua
index b48aa306f71..993e5863a92 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 = "2021-11-12"
+release_date = "2021-11-24"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")
diff --git a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md
index c6f67da4b2e..58348513392 100644
--- a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md
@@ -7,6 +7,8 @@ this project uses date-based 'snapshot' version identifiers.
## [Unreleased]
+## [2021-11-24]
+
## [2021-11-12]
### Changed
@@ -14,6 +16,8 @@ this project uses date-based 'snapshot' version identifiers.
### Fixed
- Allow config names ending with 'lua', as long as they don't end with '.lua'
+- All documentation files are build in a consistent environment with support
+ files visible.
## [2021-08-28]
@@ -517,7 +521,8 @@ this project uses date-based 'snapshot' version identifiers.
- Rationalise short option names: removed `-d`, `-E`, `-r`
- Target `cmdcheck`: specific to LaTeX kernel work
-[Unreleased]: https://github.com/latex3/l3build/compare/2021-11-12...HEAD
+[Unreleased]: https://github.com/latex3/l3build/compare/2021-11-24...HEAD
+[2021-11-24]: https://github.com/latex3/l3build/compare/2021-11-12...2021-11-24
[2021-11-12]: https://github.com/latex3/l3build/compare/2021-08-28...2021-11-12
[2021-08-28]: https://github.com/latex3/l3build/compare/2021-08-27...2021-08-28
[2021-08-27]: https://github.com/latex3/l3build/compare/2021-05-06...2021-08-27
diff --git a/Master/texmf-dist/doc/latex/l3build/README.md b/Master/texmf-dist/doc/latex/l3build/README.md
index f75e873dfd1..de540162dda 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 LaTeX
=================================================
-Release 2021-11-12
+Release 2021-11-24
Overview
--------
diff --git a/Master/texmf-dist/doc/latex/l3build/l3build.pdf b/Master/texmf-dist/doc/latex/l3build/l3build.pdf
index 7c23434947d..06ff54ce90b 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 3faa8f04b15..5cf404fdf01 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 "2021-11-12"
+.TH l3build 1 "2021-11-24"
.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 4728154d7db..23a2b540867 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-typesetting.lua b/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua
index 4934c3f4979..1d44a2bc08e 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua
@@ -174,7 +174,12 @@ end
local function docinit()
-- Set up
+ dep_install(typesetdeps)
+ unpack({sourcefiles, typesetsourcefiles}, {sourcefiledir, docfiledir})
cleandir(typesetdir)
+ for _,file in pairs(typesetfiles) do
+ cp(file, unpackdir, typesetdir)
+ end
for _,filetype in pairs(
{bibfiles, docfiles, typesetfiles, typesetdemofiles}
) do
@@ -188,8 +193,6 @@ local function docinit()
for _,file in pairs(typesetsuppfiles) do
cp(file, supportdir, typesetdir)
end
- dep_install(typesetdeps)
- unpack({sourcefiles, typesetsourcefiles}, {sourcefiledir, docfiledir})
-- Main loop for doc creation
local errorlevel = typeset_demo_tasks()
if errorlevel ~= 0 then
@@ -208,30 +211,28 @@ function doc(files)
local done = {}
for _,typesetfiles in ipairs({typesetdemofiles,typesetfiles}) do
for _,glob in pairs(typesetfiles) do
- for _,dir in ipairs({typesetdir,unpackdir}) do
- for _,p in ipairs(tree(dir,glob)) do
- local path,srcname = splitpath(p.cwd)
- local name = jobname(srcname)
- if not done[name] then
- local typeset = true
- -- Allow for command line selection of files
- if files and next(files) then
- typeset = false
- for _,file in pairs(files) do
- if name == file then
- typeset = true
- break
- end
+ for _,p in ipairs(tree(typesetdir,glob)) do
+ local path,srcname = splitpath(p.cwd)
+ local name = jobname(srcname)
+ if not done[name] then
+ local typeset = true
+ -- Allow for command line selection of files
+ if files and next(files) then
+ typeset = false
+ for _,file in pairs(files) do
+ if name == file then
+ typeset = true
+ break
end
end
- -- Now know if we should typeset this source
- if typeset then
- errorlevel = typesetpdf(srcname,path)
- if errorlevel ~= 0 then
- return errorlevel
- else
- done[name] = true
- end
+ end
+ -- Now know if we should typeset this source
+ if typeset then
+ errorlevel = typesetpdf(srcname,path)
+ if errorlevel ~= 0 then
+ return errorlevel
+ else
+ done[name] = true
end
end
end
diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua
index b48aa306f71..993e5863a92 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 = "2021-11-12"
+release_date = "2021-11-24"
-- 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 b0d5aab879b..88cb82e0d4a 100644
--- a/Master/texmf-dist/source/latex/l3build/l3build.dtx
+++ b/Master/texmf-dist/source/latex/l3build/l3build.dtx
@@ -236,7 +236,7 @@
% }^^A
% }
%
-% \date{Released 2021-11-12}
+% \date{Released 2021-11-24}
%
% \maketitle
% \tableofcontents