From 144c0a923f33ff2c2fc69e52c1959d2b27feeb46 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 24 Nov 2021 21:30:05 +0000 Subject: l3build (24nov21) git-svn-id: svn://tug.org/texlive/trunk@61143 c570f23f-e606-0410-a88d-b1316a301751 --- .../scripts/l3build/l3build-typesetting.lua | 49 +++++++++++----------- Master/texmf-dist/scripts/l3build/l3build.lua | 2 +- 2 files changed, 26 insertions(+), 25 deletions(-) (limited to 'Master/texmf-dist/scripts') 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") -- cgit v1.2.3