summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/l3build/l3build-typesetting.lua
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-05-06 03:00:58 +0000
committerNorbert Preining <norbert@preining.info>2021-05-06 03:00:58 +0000
commit25f20b6d8ccd4edcdfec23c1a3c908516076ee06 (patch)
treef889e071118d7d2db80066d14d14b020c50a2238 /macros/latex/contrib/l3build/l3build-typesetting.lua
parent75db33dc347ec9cfbaa2f3ec538a2697351f571b (diff)
CTAN sync 202105060300
Diffstat (limited to 'macros/latex/contrib/l3build/l3build-typesetting.lua')
-rw-r--r--macros/latex/contrib/l3build/l3build-typesetting.lua41
1 files changed, 20 insertions, 21 deletions
diff --git a/macros/latex/contrib/l3build/l3build-typesetting.lua b/macros/latex/contrib/l3build/l3build-typesetting.lua
index 540ac3f384..716648f7fd 100644
--- a/macros/latex/contrib/l3build/l3build-typesetting.lua
+++ b/macros/latex/contrib/l3build/l3build-typesetting.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-typesetting.lua Copyright (C) 2018-2020 The LaTeX3 Project
+File l3build-typesetting.lua Copyright (C) 2018-2020 The LaTeX Project
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -38,20 +38,20 @@ local os_type = os.type
function dvitopdf(name, dir, engine, hide)
run(
dir,
- (forcecheckepoch and setepoch() or "") ..
+ set_epoch_cmd(epoch, forcecheckepoch) ..
"dvips " .. name .. dviext
.. (hide and (" > " .. os_null) or "")
.. os_concat ..
- "ps2pdf " .. ps2pdfopt .. name .. psext
+ "ps2pdf " .. ps2pdfopt .. name .. psext
.. (hide and (" > " .. os_null) or "")
)
end
-- An auxiliary used to set up the environmental variables
function runcmd(cmd,dir,vars)
- local dir = dir or "."
- local dir = abspath(dir)
- local vars = vars or {}
+ dir = dir or "."
+ dir = abspath(dir)
+ vars = vars or {}
-- Allow for local texmf files
local env = os_setenv .. " TEXMFCNF=." .. os_pathsep
local localtexmf = ""
@@ -68,7 +68,7 @@ function runcmd(cmd,dir,vars)
for _,var in pairs(vars) do
env = env .. os_concat .. os_setenv .. " " .. var .. "=" .. envpaths
end
- return run(dir,(forcedocepoch and setepoch() or "") .. env .. os_concat .. cmd)
+ return run(dir,set_epoch_cmd(epoch, forcedocepoch) .. env .. os_concat .. cmd)
end
function biber(name,dir)
@@ -80,7 +80,7 @@ function biber(name,dir)
end
function bibtex(name,dir)
- local dir = dir or "."
+ dir = dir or "."
if fileexists(dir .. "/" .. name .. ".aux") then
-- LaTeX always generates an .aux file, so there is a need to
-- look inside it for a \citation line
@@ -105,7 +105,7 @@ function bibtex(name,dir)
end
function makeindex(name,dir,inext,outext,logext,style)
- local dir = dir or "."
+ dir = dir or "."
if fileexists(dir .. "/" .. name .. inext) then
if style == "" then style = nil end
return runcmd(makeindexexe .. " " .. makeindexopts
@@ -119,15 +119,15 @@ function makeindex(name,dir,inext,outext,logext,style)
end
function tex(file,dir,cmd)
- local dir = dir or "."
- local cmd = cmd or typesetexe .. typesetopts
+ dir = dir or "."
+ cmd = cmd or typesetexe .. " " .. typesetopts
return runcmd(cmd .. " \"" .. typesetcmds
.. "\\input " .. file .. "\"",
dir,{"TEXINPUTS","LUAINPUTS"})
end
local function typesetpdf(file,dir)
- local dir = dir or "."
+ dir = dir or "."
local name = jobname(file)
print("Typesetting " .. name)
local fn = typeset
@@ -141,12 +141,12 @@ local function typesetpdf(file,dir)
print(" ! Compilation failed")
return errorlevel
end
- pdfname = name .. pdfext
+ local pdfname = name .. pdfext
rm(docfiledir,pdfname)
return cp(pdfname,dir,docfiledir)
end
-typeset = typeset or function(file,dir,exe)
+function typeset(file,dir,exe)
dir = dir or "."
local errorlevel = tex(file,dir,exe)
if errorlevel ~= 0 then
@@ -168,7 +168,7 @@ typeset = typeset or function(file,dir,exe)
end
-- A hook to allow additional typesetting of demos
-typeset_demo_tasks = typeset_demo_tasks or function()
+function typeset_demo_tasks()
return 0
end
@@ -188,7 +188,7 @@ local function docinit()
for _,file in pairs(typesetsuppfiles) do
cp(file, supportdir, typesetdir)
end
- depinstall(typesetdeps)
+ dep_install(typesetdeps)
unpack({sourcefiles, typesetsourcefiles}, {sourcefiledir, docfiledir})
-- Main loop for doc creation
local errorlevel = typeset_demo_tasks()
@@ -198,7 +198,7 @@ local function docinit()
return docinit_hook()
end
-docinit_hook = docinit_hook or function() return 0 end
+function docinit_hook() return 0 end
-- Typeset all required documents
-- Uses a set of dedicated auxiliaries that need to be available to others
@@ -209,8 +209,8 @@ function doc(files)
for _,typesetfiles in ipairs({typesetdemofiles,typesetfiles}) do
for _,glob in pairs(typesetfiles) do
for _,dir in ipairs({typesetdir,unpackdir}) do
- for _,file in pairs(tree(dir,glob)) do
- local path,srcname = splitpath(file)
+ 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
@@ -226,7 +226,7 @@ function doc(files)
end
-- Now know if we should typeset this source
if typeset then
- local errorlevel = typesetpdf(srcname,path)
+ errorlevel = typesetpdf(srcname,path)
if errorlevel ~= 0 then
return errorlevel
else
@@ -240,4 +240,3 @@ function doc(files)
end
return 0
end
-