summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-06-25 22:46:52 +0000
committerKarl Berry <karl@freefriends.org>2015-06-25 22:46:52 +0000
commit82c343765eddc8cbfddfd4219a761e9d3b3ebc35 (patch)
tree6df69c0e2c72467dbc5308f3f13634318527710d
parentc99c030a40ffa83e2e61195f64664d617a6b61c0 (diff)
l3build (25jun15)
git-svn-id: svn://tug.org/texlive/trunk@37679 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/l3build/l3build.pdfbin548486 -> 548940 bytes
-rw-r--r--Master/texmf-dist/source/latex/l3build/l3build.dtx8
-rw-r--r--Master/texmf-dist/tex/latex/l3build/l3build.lua32
3 files changed, 29 insertions, 11 deletions
diff --git a/Master/texmf-dist/doc/latex/l3build/l3build.pdf b/Master/texmf-dist/doc/latex/l3build/l3build.pdf
index 0677673e2e4..377c010a10d 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 f3fae6b0e79..cec0ac6dda6 100644
--- a/Master/texmf-dist/source/latex/l3build/l3build.dtx
+++ b/Master/texmf-dist/source/latex/l3build/l3build.dtx
@@ -39,8 +39,8 @@
\RequirePackage{expl3}
\def\ExplFileName{l3build}
\def\ExplFileDescription{L3 Regression test suite}
-\def\ExplFileDate{2015/04/30}
-\def\ExplFileVersion{5602}
+\def\ExplFileDate{2015/06/25}
+\def\ExplFileVersion{5639}
\documentclass[full]{l3doc}
\renewcommand\partname{Part}
\usepackage{multicol,needspace}
@@ -99,8 +99,9 @@
\luavarset{checkfiles} {\{~\}}{Extra files unpacked purely for tests}
\luavarset{checksuppfiles} { }{Files needed for performing regression tests.}
\luavarset{cmdchkfiles} {\{~\}}{Files need to perform command checking (\cls{l3doc}-based documentation only).}
-\luavarset{demofiles} {\{~\}}{Files which show how to use a module.}
\luavarset{cleanfiles} {\{"*.log", "*.pdf", "*.zip"\}}{Files to delete when cleaning.}
+\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{makeindexfiles} {\{"*.ist"\}}{MakeIndex files to be included in a TDS-style zip}
@@ -388,6 +389,7 @@
% The |doc| tree is constructed from:
% \begin{itemize}
% \item all files matched by \var{demofiles},
+% \item all files matched by \var{docfiles},
% \item all files matched by \var{typesetfiles} with their extension replaced with |.pdf|,
% \item all files matched by \var{textfiles},
% \item all files matched by \var{readmefiles}, but when copied their extension is entirely removed (e.g., |README.markdown| is copied as just |README|), and
diff --git a/Master/texmf-dist/tex/latex/l3build/l3build.lua b/Master/texmf-dist/tex/latex/l3build/l3build.lua
index dd98915e7a7..4fa185b6f55 100644
--- a/Master/texmf-dist/tex/latex/l3build/l3build.lua
+++ b/Master/texmf-dist/tex/latex/l3build/l3build.lua
@@ -17,8 +17,8 @@
--]]
-- Version information: should be identical to that in l3build.dtx
-release_date = "2015/04/30"
-release_ver = "5602"
+release_date = "2015/06/25"
+release_ver = "5639"
-- "module" is a deprecated function in Lua 5.2: as we want the name
-- for other purposes, and it should eventually be 'free', simply
@@ -86,8 +86,9 @@ bstfiles = bstfiles or {"*.bst"}
checkfiles = checkfiles or { }
checksuppfiles = checksuppfiles or { }
cmdchkfiles = cmdchkfiles or { }
-demofiles = demofiles or { }
cleanfiles = cleanfiles or {"*.log", "*.pdf", "*.zip"}
+demofiles = demofiles or { }
+docfiles = docfiles or { }
excludefiles = excludefiles or {"*~"}
installfiles = installfiles or {"*.sty"}
makeindexfiles = makeindexfiles or {"*.ist"}
@@ -461,7 +462,15 @@ end
function copyctan ()
-- Do all of the copying in one go
for _,i in ipairs (
- {bibfiles, demofiles, pdffiles, sourcefiles, textfiles, typesetlist}
+ {
+ bibfiles,
+ demofiles,
+ docfiles,
+ pdffiles,
+ sourcefiles,
+ textfiles,
+ typesetlist
+ }
) do
for _,j in ipairs (i) do
cp (j, ".", ctandir .. "/" .. ctanpkg)
@@ -504,7 +513,11 @@ function copytds ()
end
end
end
- install (".", "doc", {bibfiles, demofiles, pdffiles, textfiles, typesetlist})
+ install (
+ ".",
+ "doc",
+ {bibfiles, demofiles, docfiles, pdffiles, textfiles, typesetlist}
+ )
install (unpackdir, "makeindex", {makeindexfiles}, true)
install (unpackdir, "bibtex/bst", {bstfiles}, true)
install (".", "source", {sourcelist})
@@ -871,6 +884,10 @@ function bibtex (name)
typesetdir,
os_grepexe .. " \"^" .. grep .. "citation{\" " .. name .. ".aux > "
.. os_null
+ ) + run (
+ typesetdir,
+ os_grepexe .. " \"^" .. grep .. "bibdata{\" " .. name .. ".aux > "
+ .. os_null
) == 0 then
return (
-- Cheat slightly as we need to set two variables
@@ -1188,8 +1205,7 @@ function bundlectan ()
end
for _,i in ipairs (include) do
for _,j in ipairs (filelist (".", i)) do
- if excludelist[j] then
- else
+ if not excludelist[j] then
table.insert (includelist, j)
end
end
@@ -1219,7 +1235,7 @@ end
function doc ()
-- Set up
cleandir (typesetdir)
- for _,i in ipairs ({bibfiles, sourcefiles, typesetfiles}) do
+ for _,i in ipairs ({bibfiles, docfiles, sourcefiles, typesetfiles}) do
for _,j in ipairs (i) do
cp (j, ".", typesetdir)
end