diff options
author | Karl Berry <karl@freefriends.org> | 2014-09-15 22:58:44 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-09-15 22:58:44 +0000 |
commit | 21b7507fd70dbefe4207e9d0dde58c640208095d (patch) | |
tree | f1f3dc5a2397a4addfa5106318633c92748327df /Master/texmf-dist/source/latex/l3build | |
parent | 720ab6d5bd9c366793fd8f03c58aec9b4348bf4d (diff) |
l3 (15sep14)
git-svn-id: svn://tug.org/texlive/trunk@35180 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3build')
-rw-r--r-- | Master/texmf-dist/source/latex/l3build/l3build.dtx | 28 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/l3build/l3build.lua | 14 |
2 files changed, 31 insertions, 11 deletions
diff --git a/Master/texmf-dist/source/latex/l3build/l3build.dtx b/Master/texmf-dist/source/latex/l3build/l3build.dtx index 615aabb1db5..daf670e9666 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{2014/08/25} -\def\ExplFileVersion{5378} +\def\ExplFileDate{2014/09/15} +\def\ExplFileVersion{5423} \documentclass[full]{l3doc} \renewcommand\partname{Part} \usepackage{multicol,needspace} @@ -134,6 +134,7 @@ \luavarset{unpacksearch} {true} {Look in \texttt{tds} dirs for unpacking?} \luavarseparator \luavarset{checkruns} {1} {How many times to run a check file before comparing the log.} +\luavarset{packtdszip} {false} {Build a TDS-style zip file for CTAN?} \luavarset{scriptname} {"build.lua"} {Name of script used in dependencies.} \luavarset{typesetcmds} {""} {Instructions to be passed to \TeX{} when doing typesetting.} } @@ -280,7 +281,6 @@ % \item doc % \item install % \item save \meta{name} [\meta{engine}] -% \item unpack % \end{itemize} % These commands are described below. % @@ -332,9 +332,10 @@ % % % \begin{buildcmd}{ctan} -% Creates an archive of the package and its documentation, suitable for uploading to CTAN including a |.tds.zip| file containing the `\TeX\ Directory Structure' layout of the package or bundle. +% Creates an archive of the package and its documentation, suitable for uploading to CTAN % The archive is compiled in \var{distribdir}, and if the results are successful the resultant |.zip| file is moved into the same directory as the build script. -% The archive therefore contains two `views' of the package: +% If \var{packtdszip} is set true then the building process includes a |.tds.zip| file containing the `\TeX\ Directory Structure' layout of the package or bundle. +% The archive therefore may contain two `views' of the package: % \begin{Verbatim} % abc.zip/ % abc/ @@ -354,6 +355,9 @@ % \end{Verbatim} % The files copied into the archive are controlled by a number of variables. % The `root' of the TDS structure is defined by \var{tdsroot}, which is \luavar{tdsroot} by default. Plain users would redefine this to |"plain"| (or perhaps |"generic"|), for example. +% The build process for a |.tds.zip| file currently assumes a `standard' +% structure in which all extracted files should be places inside the |tex| +% tree in a single directory, as shown above. % % \pagebreak[2] % The |doc| tree is constructed from: @@ -403,7 +407,8 @@ % % % \begin{buildcmd}{unpack} -% Unpacks all files into the directory defined by \var{unpackdir}. This occurs before other build commands such as |doc|, |check|, etc., and should usually not be necessary to perform on its own (except for testing). +% This is an internal target that is normally not needed on user level. +% It unpacks all files into the directory defined by \var{unpackdir}. This occurs before other build commands such as |doc|, |check|, etc. % % The unpacking process is performed by executing the \var{unpackexe} (default \texttt{tex}) with options \var{unpackopts} on all files defined by the \var{unpackfiles} variable; by default, all files that match \luavar{unpackfiles}. % @@ -642,7 +647,7 @@ % \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{TESTREXP} command (based on \cs{romannumeral} expansion) be useful as well? +% TODO: would a \cs{TESTFEXP} command (based on \cs{romannumeral} expansion) be useful as well? % \end{itemize} % An example of some of these commands is shown following. % \begin{Verbatim} @@ -825,6 +830,15 @@ \showboxdepth=\maxdimen % \end{macrocode} % +% The |\showoutput| command of \LaTeX{} calls |\loggingoutput| which in +% turn calls |\errorstopmode| but we want to continue running without +% any stops. +% \begin{macrocode} +\def\loggingoutput{\tracingoutput1 + \showboxbreadth\maxdimen\showboxdepth\maxdimen} +% \end{macrocode} + +% % Set the newline character: \LaTeXe{} does this but plain-based formats % do not. % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/l3build/l3build.lua b/Master/texmf-dist/source/latex/l3build/l3build.lua index 9e6bd7d8c59..3abb619392b 100644 --- a/Master/texmf-dist/source/latex/l3build/l3build.lua +++ b/Master/texmf-dist/source/latex/l3build/l3build.lua @@ -17,8 +17,8 @@ --]] -- Version information: should be identical to that in l3build.dtx -release_date = "2014/08/25" -release_ver = "5378" +release_date = "2014/09/15" +release_ver = "5423" -- "module" is a deprecated function in Lua 5.2: as we want the name -- for other purposes, and it should eventually be 'free', simply @@ -129,6 +129,7 @@ end -- Other required settings checkruns = checkruns or 1 +packtdszip = packtdszip or false -- Not actually needed but clearer scriptname = scriptname or "build.lua" -- Script used in each directory typesetcmds = typesetcmds or "" @@ -472,6 +473,10 @@ function formatlog (logfile, newfile) line = string.gsub ( line, "cm, mm, dd, cc, bp, or sp", "cm, mm, dd, cc, nd, nc, bp, or sp" ) + -- Normalise a case where a LuaTeX bug misprints \csname\endcsname + -- This comes before the normalisation of the appearance of + -- \csname\endcsname in case we alter that! + line = string.gsub (line, "\\ycsnam\\rendcsnam", "\\csname\\endcsname") -- Normalise a case where fixing a TeX bug changes the message text line = string.gsub (line, "\\csname\\endcsname ", "\\csname\\endcsname") -- Zap "on line <num>" and replace with "on line ..." @@ -646,7 +651,6 @@ help = help or function () print " build save <name> - save test log for <name> for all engines " print " build save <name> <engine> - save test log for <name> for <engine> " end - print " build unpack - extract packages " print "" end @@ -817,7 +821,9 @@ function ctan (standalone) end end dirzip (tdsdir, bundle .. ".tds") - cp (bundle .. ".tds.zip", tdsdir, ctandir) + if packtdszip then + cp (bundle .. ".tds.zip", tdsdir, ctandir) + end dirzip (ctandir, bundle) cp (bundle .. ".zip", ctandir, ".") else |