From bb5325dae4202b519b7210a338651301e048998d Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 18 Feb 2020 03:02:28 +0000 Subject: CTAN sync 202002180302 --- macros/latex/contrib/l3build/CHANGELOG.md | 16 ++++- macros/latex/contrib/l3build/README.md | 2 +- macros/latex/contrib/l3build/l3build-arguments.lua | 8 ++- macros/latex/contrib/l3build/l3build-aux.lua | 2 +- macros/latex/contrib/l3build/l3build-check.lua | 13 ++-- macros/latex/contrib/l3build/l3build-ctan.lua | 6 +- macros/latex/contrib/l3build/l3build-help.lua | 17 +++-- .../contrib/l3build/l3build-manifest-setup.lua | 2 +- macros/latex/contrib/l3build/l3build-manifest.lua | 2 +- macros/latex/contrib/l3build/l3build-stdmain.lua | 2 +- macros/latex/contrib/l3build/l3build-tagging.lua | 2 +- .../latex/contrib/l3build/l3build-typesetting.lua | 19 +++-- macros/latex/contrib/l3build/l3build-unpack.lua | 2 +- macros/latex/contrib/l3build/l3build-upload.lua | 2 +- macros/latex/contrib/l3build/l3build-variables.lua | 4 +- macros/latex/contrib/l3build/l3build.1 | 2 +- macros/latex/contrib/l3build/l3build.dtx | 79 ++++++++++++++------- macros/latex/contrib/l3build/l3build.lua | 2 +- macros/latex/contrib/l3build/l3build.pdf | Bin 703656 -> 706057 bytes 19 files changed, 124 insertions(+), 58 deletions(-) (limited to 'macros/latex/contrib/l3build') diff --git a/macros/latex/contrib/l3build/CHANGELOG.md b/macros/latex/contrib/l3build/CHANGELOG.md index 1c54b0044e..8b1ddb26ee 100644 --- a/macros/latex/contrib/l3build/CHANGELOG.md +++ b/macros/latex/contrib/l3build/CHANGELOG.md @@ -7,6 +7,19 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2020-02-17] + +### Added +- Variable `textfiledir` +- Table `specialtypesetting` and support data + +### Changed +- Documentation improvements + +### Fixed +- When `checkruns` > 1 and `recordstatus=true`, testing code would crash + (issue #90) + ## [2020-02-03] ### Changed @@ -413,7 +426,8 @@ this project uses date-based 'snapshot' version identifiers. - Rationalise short option names: removed `-d`, `-E`, `-r` - Target `cmdcheck`: specific to LaTeX3 kernel work -[Unreleased]: https://github.com/latex3/l3build/compare/2020-02-03...HEAD +[Unreleased]: https://github.com/latex3/l3build/compare/2020-02-17...HEAD +[2020-02-17]: https://github.com/latex3/l3build/compare/2020-02-03...2020-02-17 [2020-02-03]: https://github.com/latex3/l3build/compare/2020-01-14...2020-02-03 [2020-01-14]: https://github.com/latex3/l3build/compare/2019-11-27...2020-01-14 [2019-11-27]: https://github.com/latex3/l3build/compare/2019-11-01...2019-11-27 diff --git a/macros/latex/contrib/l3build/README.md b/macros/latex/contrib/l3build/README.md index 4ff2f712d0..80c039a813 100644 --- a/macros/latex/contrib/l3build/README.md +++ b/macros/latex/contrib/l3build/README.md @@ -1,7 +1,7 @@ l3build: a testing and building system for LaTeX3 ================================================= -Release 2020-02-03 +Release 2020-02-17 Overview -------- diff --git a/macros/latex/contrib/l3build/l3build-arguments.lua b/macros/latex/contrib/l3build/l3build-arguments.lua index cbf68c6254..aa2f086d61 100644 --- a/macros/latex/contrib/l3build/l3build-arguments.lua +++ b/macros/latex/contrib/l3build/l3build-arguments.lua @@ -1,6 +1,6 @@ --[[ -File l3build-arguments.lua Copyright (C) 2018 The LaTeX3 Project +File l3build-arguments.lua Copyright (C) 2018-2020 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this @@ -108,6 +108,7 @@ option_list = }, help = { + desc = "Print this message and exit", short = "h", type = "boolean" }, @@ -147,6 +148,11 @@ option_list = { desc = "Location of user texmf tree", type = "string" + }, + version = + { + desc = "Print version information and exit", + type = "boolean" } } diff --git a/macros/latex/contrib/l3build/l3build-aux.lua b/macros/latex/contrib/l3build/l3build-aux.lua index 2146d9a142..8fa4b0cd82 100644 --- a/macros/latex/contrib/l3build/l3build-aux.lua +++ b/macros/latex/contrib/l3build/l3build-aux.lua @@ -1,6 +1,6 @@ --[[ -File l3build-aux.lua Copyright (C) 2018 The LaTeX3 Project +File l3build-aux.lua Copyright (C) 2018-2020 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this diff --git a/macros/latex/contrib/l3build/l3build-check.lua b/macros/latex/contrib/l3build/l3build-check.lua index 8bafe0591c..17e6321787 100644 --- a/macros/latex/contrib/l3build/l3build-check.lua +++ b/macros/latex/contrib/l3build/l3build-check.lua @@ -1,6 +1,6 @@ --[[ -File l3build-check.lua Copyright (C) 2018,2019 The LaTeX3 Project +File l3build-check.lua Copyright (C) 2018-2020 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this @@ -292,9 +292,14 @@ local function normalize_log(content,engine,errlevels) if recordstatus then new_content = new_content .. '***************' .. os_newline for i = 1, checkruns do - new_content = new_content .. - 'Compilation ' .. i .. ' of test file completed with exit status ' .. - errlevels[i] .. os_newline + if (errlevels[i]==nil) then + new_content = new_content .. + 'Compilation ' .. i .. ' of test file skipped ' .. os_newline + else + new_content = new_content .. + 'Compilation ' .. i .. ' of test file completed with exit status ' .. + errlevels[i] .. os_newline + end end end return new_content diff --git a/macros/latex/contrib/l3build/l3build-ctan.lua b/macros/latex/contrib/l3build/l3build-ctan.lua index 09b10e0eca..df1daf9728 100644 --- a/macros/latex/contrib/l3build/l3build-ctan.lua +++ b/macros/latex/contrib/l3build/l3build-ctan.lua @@ -1,6 +1,6 @@ --[[ -File l3build-ctan.lua Copyright (C) 2018 The LaTeX3 Project +File l3build-ctan.lua Copyright (C) 2018-2020 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this @@ -54,7 +54,7 @@ function copyctan() end copyfiles(sourcefiles,sourcefiledir) for _,file in pairs(textfiles) do - cp(file, currentdir, ctandir .. "/" .. ctanpkg) + cp(file, textfiledir, ctandir .. "/" .. ctanpkg) end end @@ -127,7 +127,7 @@ function ctan() end if errorlevel == 0 then for _,i in ipairs(textfiles) do - for _,j in pairs({unpackdir, currentdir}) do + for _,j in pairs({unpackdir, textfiledir}) do cp(i, j, ctandir .. "/" .. ctanpkg) cp(i, j, tdsdir .. "/doc/" .. tdsroot .. "/" .. bundle) end diff --git a/macros/latex/contrib/l3build/l3build-help.lua b/macros/latex/contrib/l3build/l3build-help.lua index 8c3877595f..055fc1a918 100644 --- a/macros/latex/contrib/l3build/l3build-help.lua +++ b/macros/latex/contrib/l3build/l3build-help.lua @@ -1,6 +1,6 @@ --[[ -File l3build-help.lua Copyright (C) 2018 The LaTeX3 Project +File l3build-help.lua Copyright (C) 2018,2020 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this @@ -31,7 +31,8 @@ function version() print( "\n" .. "l3build: A testing and building system for LaTeX\n\n" .. - "Release " .. release_date + "Release " .. release_date .. "\n" .. + "Copyright (C) 2014-2020 The LaTeX3 Project" ) end @@ -53,12 +54,12 @@ function help() end local scriptname = "l3build" - if not match(arg[0], "l3build(%.lua)$") then + if not (match(arg[0], "l3build%.lua$") or match(arg[0],"l3build$")) then scriptname = arg[0] end - print("usage: " .. scriptname .. " [] []") + print("usage: " .. scriptname .. " [] []") print("") - print("Valid commands are:") + print("Valid targets are:") local longest,t = setup_list(target_list) for _,k in ipairs(t) do local target = target_list[k] @@ -82,5 +83,9 @@ function help() end end print("") - print("See l3build.pdf for further details.") + print("Full manual available via 'texdoc l3build'.") + print("") + print("Repository : https://github.com/latex3/l3build") + print("Bug tracker : https://github.com/latex3/l3build/issues") + print("Copyright (C) 2014-2020 The LaTeX3 Project") end diff --git a/macros/latex/contrib/l3build/l3build-manifest-setup.lua b/macros/latex/contrib/l3build/l3build-manifest-setup.lua index fb46eb1d36..26bf1ca008 100644 --- a/macros/latex/contrib/l3build/l3build-manifest-setup.lua +++ b/macros/latex/contrib/l3build/l3build-manifest-setup.lua @@ -1,6 +1,6 @@ --[[ -File l3build-manifest-setup.lua Copyright (C) 2017-2018 The LaTeX3 Project +File l3build-manifest-setup.lua Copyright (C) 2018,2020 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this diff --git a/macros/latex/contrib/l3build/l3build-manifest.lua b/macros/latex/contrib/l3build/l3build-manifest.lua index 3b899d55fd..dc5138952c 100644 --- a/macros/latex/contrib/l3build/l3build-manifest.lua +++ b/macros/latex/contrib/l3build/l3build-manifest.lua @@ -1,6 +1,6 @@ --[[ -File l3build-manifest.lua Copyright (C) 2017-2018 The LaTeX3 Project +File l3build-manifest.lua Copyright (C) 2018,2020 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this diff --git a/macros/latex/contrib/l3build/l3build-stdmain.lua b/macros/latex/contrib/l3build/l3build-stdmain.lua index 9123349ee0..10303b71f7 100644 --- a/macros/latex/contrib/l3build/l3build-stdmain.lua +++ b/macros/latex/contrib/l3build/l3build-stdmain.lua @@ -1,6 +1,6 @@ --[[ -File l3build-stdmain.lua Copyright (C) 2018 The LaTeX3 Project +File l3build-stdmain.lua Copyright (C) 2018-2020 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this diff --git a/macros/latex/contrib/l3build/l3build-tagging.lua b/macros/latex/contrib/l3build/l3build-tagging.lua index 2c0c1641a4..a00180b34c 100644 --- a/macros/latex/contrib/l3build/l3build-tagging.lua +++ b/macros/latex/contrib/l3build/l3build-tagging.lua @@ -1,6 +1,6 @@ --[[ -File l3build-tagging.lua Copyright (C) 2018 The LaTeX3 Project +File l3build-tagging.lua Copyright (C) 2018-2020 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this diff --git a/macros/latex/contrib/l3build/l3build-typesetting.lua b/macros/latex/contrib/l3build/l3build-typesetting.lua index fe6a6a58dc..b76edd913b 100644 --- a/macros/latex/contrib/l3build/l3build-typesetting.lua +++ b/macros/latex/contrib/l3build/l3build-typesetting.lua @@ -127,9 +127,10 @@ function makeindex(name,dir,inext,outext,logext,style) return 0 end -function tex(file,dir) +function tex(file,dir,cmd) local dir = dir or "." - return runcmd(typesetexe .. " " .. typesetopts .. " \"" .. typesetcmds + local cmd = cmd or typesetexe .. typesetopts + return runcmd(cmd .. " \"" .. typesetcmds .. "\\input " .. file .. "\"", dir,{"TEXINPUTS","LUAINPUTS"}) end @@ -138,7 +139,13 @@ local function typesetpdf(file,dir) local dir = dir or "." local name = jobname(file) print("Typesetting " .. name) - local errorlevel = typeset(file,dir) + local fn = typeset + local cmd = typesetexe .. " " .. typesetopts + if specialtypesetting and specialtypesetting[file] then + fn = specialtypesetting[file].func or fn + cmd = specialtypesetting[file].cmd or cmd + end + local errorlevel = fn(file,dir,cmd) if errorlevel ~= 0 then print(" ! Compilation failed") return errorlevel @@ -148,9 +155,9 @@ local function typesetpdf(file,dir) return cp(pdfname,dir,docfiledir) end -typeset = typeset or function(file,dir) +typeset = typeset or function(file,dir,exe) dir = dir or "." - local errorlevel = tex(file,dir) + local errorlevel = tex(file,dir,exe) if errorlevel ~= 0 then return errorlevel end @@ -163,7 +170,7 @@ typeset = typeset or function(file,dir) errorlevel = makeindex(name,dir,".glo",".gls",".glg",glossarystyle) + makeindex(name,dir,".idx",".ind",".ilg",indexstyle) + - tex(file,dir) + tex(file,dir,exe) if errorlevel ~= 0 then break end end return errorlevel diff --git a/macros/latex/contrib/l3build/l3build-unpack.lua b/macros/latex/contrib/l3build/l3build-unpack.lua index 89bbfaa17f..47aaca7ca7 100644 --- a/macros/latex/contrib/l3build/l3build-unpack.lua +++ b/macros/latex/contrib/l3build/l3build-unpack.lua @@ -1,6 +1,6 @@ --[[ -File l3build-unpack.lua Copyright (C) 2018 The LaTeX3 Project +File l3build-unpack.lua Copyright (C) 2018-2020 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this diff --git a/macros/latex/contrib/l3build/l3build-upload.lua b/macros/latex/contrib/l3build/l3build-upload.lua index 257cce61a3..fc25d5d6ac 100644 --- a/macros/latex/contrib/l3build/l3build-upload.lua +++ b/macros/latex/contrib/l3build/l3build-upload.lua @@ -1,6 +1,6 @@ --[[ -File l3build-upload.lua Copyright (C) 2018 The LaTeX3 Project +File l3build-upload.lua Copyright (C) 2018-2020 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this diff --git a/macros/latex/contrib/l3build/l3build-variables.lua b/macros/latex/contrib/l3build/l3build-variables.lua index 06cfdd34af..e69eb5aff1 100644 --- a/macros/latex/contrib/l3build/l3build-variables.lua +++ b/macros/latex/contrib/l3build/l3build-variables.lua @@ -1,6 +1,6 @@ --[[ -File l3build-variables.lua Copyright (C) 2018,2019 The LaTeX3 Project +File l3build-variables.lua Copyright (C) 2018-2020 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,6 +43,7 @@ maindir = maindir or currentdir -- Substructure for file locations docfiledir = docfiledir or currentdir sourcefiledir = sourcefiledir or currentdir +textfiledir = textfiledir or currentdir supportdir = supportdir or maindir .. "/support" testfiledir = testfiledir or currentdir .. "/testfiles" testsuppdir = testsuppdir or testfiledir .. "/support" @@ -151,6 +152,7 @@ end -- Additional settings to fine-tune typesetting glossarystyle = glossarystyle or "gglo.ist" indexstyle = indexstyle or "gind.ist" +specialtypesetting = specialtypesetting or { } -- Supporting binaries and options biberexe = biberexe or "biber" diff --git a/macros/latex/contrib/l3build/l3build.1 b/macros/latex/contrib/l3build/l3build.1 index e40861b50d..f771558386 100644 --- a/macros/latex/contrib/l3build/l3build.1 +++ b/macros/latex/contrib/l3build/l3build.1 @@ -1,4 +1,4 @@ -.TH l3build 1 "2020-02-03" +.TH l3build 1 "2020-02-17" .SH NAME l3build \- Checking and building packages .SH SYNOPSIS diff --git a/macros/latex/contrib/l3build/l3build.dtx b/macros/latex/contrib/l3build/l3build.dtx index b2a981434f..f00774cada 100644 --- a/macros/latex/contrib/l3build/l3build.dtx +++ b/macros/latex/contrib/l3build/l3build.dtx @@ -64,6 +64,7 @@ \luavarset{testfiledir}{"./testfiles"} {Directory containing test files} \luavarset{testsuppdir}{testfiledir .. "/support"}{Directory containing test-specific support files} \luavarset{texmfdir}{maindir .. "/texmf"}{Directory containing support files in tree form} +\luavarset{textfiledir}{"."} {Directory containing plain text files} \luavarseparator \luavarset{builddir} {maindir .. "/build"} {Directory for building and testing} \luavarset{distribdir}{builddir .. "/distrib"}{Directory for generating distribution structure} @@ -137,6 +138,7 @@ \luavarseparator \luavarset{glossarystyle}{"gglo.ist"}{MakeIndex style file for glossary/changes creation} \luavarset{indexstyle} {"gind.ist"}{MakeIndex style for index creation} +\luavarset{specialtypesetting}{\meta{table}} {Non-standard typesetting combinations} \luavarseparator \luavarset{forcecheckepoch}{"true"} {Force epoch when running tests} \luavarset{forcedocepoch} {"false"} {Force epoch when typesetting} @@ -231,7 +233,7 @@ % }^^A % } % -% \date{Released 2020-02-03} +% \date{Released 2020-02-17} % % \maketitle % \tableofcontents @@ -310,13 +312,22 @@ % For a module, this build folder can be in the main directory of the package itself, but for a bundle it should be common for the bundle itself and for all modules within that bundle. % A |build/| folder can be safety deleted; all material within is re-generated for each command of the \pkg{l3build} system. % -% \subsection{Main build commands} +% \subsection{The \texttt{build.lua} file} +% +% The \texttt{build.lua} file used to control \pkg{l3build} is a simple Lua file +% which is read during execution. In the current release of \pkg{l3build}, +% \texttt{build.lua} is read automatically and can access all of the global +% functions provided by the script. Thus it may contain a simple list of +% variable settings \emph{or} additionally custom code to change the build +% process. A number of example scripts are given in Section~\ref{sec:examples}. +% +% \subsection{Main build targets} % % In the working directory of a bundle or module, \pkg{l3build} is run by executing % \begin{center} -% \texttt{l3build \meta{command} [\meta{option(s)}]} +% \texttt{l3build \meta{targets} [\meta{option(s)}]} % \end{center} -% where \texttt{\meta{command}} can be one of the following: +% where \texttt{\meta{targets}} can be one of the following: % \begin{itemize}[noitemsep]\ttfamily % \item check % \item check \meta{name(s)} @@ -333,9 +344,9 @@ % \item upload % \item upload \meta{tag} % \end{itemize} -% These commands are described below. +% These targets are described below. % -% As well as these commands, the system recognises the options +% As well as these targets, the system recognises the options % \begin{itemize} % \item |--config| (|-c|) Configuration(s) to use for testing % \item |--date| Date to use when tagging data @@ -510,7 +521,7 @@ % % \begin{buildcmd}{install} % Copies all package files (defined by \var{installfiles}) into the user's home \texttt{texmf} tree in the form of the \TeX\ Directory Structure. -% The location of the user tree can be adjusted using the |--texmfhome| swtich: +% The location of the user tree can be adjusted using the |--texmfhome| switch: % the standard setting is the location set as |TEXMFHOME|. % \end{buildcmd} % @@ -584,15 +595,6 @@ % See Section~\ref{sec:upload} for full details on this feature. % \end{buildcmd} % -% \subsection{The \texttt{build.lua} file} -% -% The \texttt{build.lua} file used to control \pkg{l3build} is a simple Lua file -% which is read during execution. In the current release of \pkg{l3build}, -% \texttt{build.lua} is read automatically and can access all of the global -% functions provided by the script. Thus it may contain a simple list of -% variable settings \emph{or} additionally custom code to change the build -% process. A number of example scripts are given in Section~\ref{sec:examples}. -% % \subsection{Example build scripts} % \label{sec:examples} % @@ -649,10 +651,13 @@ % \label{fig:module} % \end{figure} % +% A collection of full examples (source files in various layouts) are available +% at \url{https://github.com/latex3/l3build/tree/master/examples}. +% % \subsection{Backwards compatibility} % % Earlier releases of \pkg{l3build} required that the last line of -% \texttt{build.lua} ran the main script, \emph{i.e.}~ that \texttt{build.lua} +% \texttt{build.lua} ran the main script, \emph{i.e.}~that \texttt{build.lua} % was what the user called rather than \texttt{l3build.lua}. To allow scripts % to support both forms \emph{for the transition}, a simple test may be % included as showing in Figure~\ref{fig:build-compat}. @@ -770,7 +775,8 @@ % A variety of source layouts are supported. In general, a \enquote{flat} % layout with all source files \enquote{here} is most convenient. However, % \pkg{l3build} supports placement of both code and documentation source -% files in other locations using the \var{sourcefiledir} and \var{docfiledir} +% files in other locations using the \var{sourcefiledir}, \var{docfiledir} +% and \var{textfiledir} % variables. For pre-built trees, the glob syntax \texttt{**/*.\meta{ext}} may % be useful in these cases: this enables recursive searching in the appropriate % tree locations. With the standard settings, this structure will be removed @@ -778,6 +784,11 @@ % used to control this behavior. The \var{flattentds} setting controls % the same concept for TDS creation. % +% Notice that text files are treated separately from documentation files when +% splitting trees: this is to allow for the common case where files such +% as |README| and |LICENSE| are at the top level even when other documentation +% files are in a sub-directory. +% % A series of example layouts and matching |build.lua| files are available from % \url{https://github.com/latex3/l3build/tree/master/examples}. % @@ -924,8 +935,6 @@ % \item % \cs{TESTEXP} surrounds its contents with \cs{TYPE} and formatting to match \cs{TEST}; this can be used as a shorthand to test expandable commands. % \item -% TODO: would a \cs{TESTFEXP} command (based on \cs{romannumeral} expansion) be useful as well? -% \item % \cs{BEGINTEST}\marg{title} \dots \cs{ENDTEST} is an environment form of % \cs{TEST}, allowing verbatim material, \emph{etc.} to appear. % \item @@ -1263,7 +1272,7 @@ % tree, one might use the set up shown in Figure~\ref{fig:tds}. % \begin{figure} % \begin{lstlisting}[frame=single,language={[5.2]Lua},gobble = 6] -% tdslocations = +% tdslocations = % { % "tex/generic/mypkg/*.generic.tex" , % "tex/plain/mypkg/*.plain.tex" , @@ -1355,7 +1364,8 @@ % copying files to the typesetting location but before the main typesetting % run. This may be used for example to script a very large number of % demonstrations using a single source (see the \pkg{beamer} package -% for an example of this). +% for an example of this). Note that this hook is intended for use files +% \emph{not} listed in \var{typesetfiles} or \var{typesetdemofiles}. % % \begin{figure}[!b] % \begin{lstlisting}[frame=single,language={[5.2]Lua},gobble = 6] @@ -1391,6 +1401,22 @@ % to be executed once all standard set up is complete but before any typesetting % is run. % +% \subsection{Non-standard typesetting} +% +% To allow non-standard typesetting combinations, for example per-file +% choice of engines, the table \var{specialtypesetting} may be used. +% This is a table with one entry per file. Each entry is itself a table, +% and these contain a list of engines and settings for |cmd| and |func|. +% For example, to choose to use \LuaTeX{} for one file when \var{typesetexe} +% is |pdftex| +% \begin{verbatim} +% specialtypesetting.foo = {cmd = "luatex -interaction=nonstopmode"} +% \end{verbatim} +% or to select an entirely different typesetting function +% \begin{verbatim} +% specialtypesetting.foo = {func = typeset_foo} +% \end{verbatim} +% % \subsection{Automated upload to CTAN} % \label{sec:upload} % @@ -1790,7 +1816,7 @@ % \end{syntax} % Runs Biber on the \meta{name} (\emph{i.e.}~a jobname lacking any % extension) inside the \meta{dir}. If there is no |.bcf| file then -% no action is taken with a return value of $0$. +% no action is taken with a return value of $0$. % \end{function} % % \begin{function}{bibtex()} @@ -1799,7 +1825,7 @@ % \end{syntax} % Runs Bib\TeX{} on the \meta{name} (\emph{i.e.}~a jobname lacking any % extension) inside the \meta{dir}. If there are no |\citation| lines in -% the |.aux| file then no action is taken with a return value of $0$. +% the |.aux| file then no action is taken with a return value of $0$. % \end{function} % % \begin{function}{makeindex()} @@ -1813,9 +1839,10 @@ % % \begin{function}{tex()} % \begin{syntax} -% |tex(|\meta{file},\meta{dir}|)| +% |tex(|\meta{file},\meta{dir},\meta{cmd}|)| % \end{syntax} -% Runs \luavar{typesetexe} on the \meta{name} inside the \meta{dir}. +% Runs \meta{cmd} (by default \luavar{typesetexe} \luavar{typesetopts}) on the +% \meta{name} inside the \meta{dir}. % \end{function} % % \begin{function}{runcmd()} diff --git a/macros/latex/contrib/l3build/l3build.lua b/macros/latex/contrib/l3build/l3build.lua index 2c244c1ea5..03521ce612 100755 --- a/macros/latex/contrib/l3build/l3build.lua +++ b/macros/latex/contrib/l3build/l3build.lua @@ -25,7 +25,7 @@ for those people who are interested. --]] -- Version information -release_date = "2020-02-03" +release_date = "2020-02-17" -- File operations are aided by the LuaFileSystem module local lfs = require("lfs") diff --git a/macros/latex/contrib/l3build/l3build.pdf b/macros/latex/contrib/l3build/l3build.pdf index 271bfb6beb..2eaeda6f10 100644 Binary files a/macros/latex/contrib/l3build/l3build.pdf and b/macros/latex/contrib/l3build/l3build.pdf differ -- cgit v1.2.3