Merge branch 'main' into #351

CHANGELOG.md

@@ -7,9 +7,13 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+### Changed
+- Respect `--reun` in `doc` target (issue \#112)
+
 ### Fixed
 - Skip unknown engines correctly in `l3build save`
 - global `typesetopts` no longer ignored for `luatex` and `lualatex`
+- Handling of environment settings in some cases (issue \#353)
 
 ## [2024-02-08]
 

l3build-aux.lua

@@ -189,9 +189,9 @@ function runcmd(cmd,dir,vars)
   dir = abspath(dir)
   vars = vars or {}
   -- Allow for local texmf files
-  local env = ""
-  if not match(checkformat,"^context$")  then
-    env = os_setenv .. " TEXMFCNF=." .. os_pathsep .. os_concat
+  local env
+  if checkformat ~= "context" then
+    env = os_setenv .. " TEXMFCNF=." .. os_pathsep
   end
   local envpaths = "." .. localtexmf() .. os_pathsep
     .. abspath(localdir) .. os_pathsep
@@ -201,11 +201,9 @@ function runcmd(cmd,dir,vars)
     envpaths = gsub(envpaths,'"','')
   end
   for _,var in pairs(vars) do
-    if env ~= "" then
-      env = env .. os_setenv .. " " .. var .. "=" .. envpaths .. os_concat
-    else
-      env = os_setenv .. " " .. var .. "=" .. envpaths
-    end
+    env = (env and (env .. os_concat) or "")
+      .. os_setenv .. " " .. var .. "=" .. envpaths
   end
-  return run(dir,set_epoch_cmd(epoch, forcedocepoch) .. env .. cmd)
+  return run(dir,set_epoch_cmd(epoch, forcedocepoch)
+    .. (env and (env .. os_concat) or "") .. cmd)
 end

l3build-check.lua

@@ -778,7 +778,7 @@ function runtest(name, engine, hide, ext, test_type, breakout)
   local function setup(file)
     return " -jobname=" .. name .. tokens .. ' "\\input ' .. file .. '" '
   end
-  if match(checkformat,"^context$") then
+  if  checkformat == "context" then
     function setup(file) return tokens .. ' "' .. file .. '" '  end
   end
   if match(binary,"make4ht") then

l3build-typesetting.lua

@@ -181,7 +181,10 @@ function docinit_hook() return 0 end
 -- Typeset all required documents
 -- Uses a set of dedicated auxiliaries that need to be available to others
 function doc(files)
-  local errorlevel = docinit()
+  local errorlevel = 0
+  if not options["rerun"] then
+    errorlevel = docinit()
+  end
   if errorlevel ~= 0 then return errorlevel end
   local done = {}
   local files_unknown = {}

l3build.dtx

@@ -1227,9 +1227,9 @@
 % \subsection{Settings in \texttt{texmf.cnf}}
 %
 % To allow application of non-standard \TeX{} trees or similar non-standard
-% settings, \pkg{l3build} enables searching for a \texttt{texmf.cnf} file
-% by setting the envirnmental variable \texttt{TEXMFCNF}. This might
-% for example be used with a file containing
+% settings, \pkg{l3build} sets the environment variable \texttt{TEXMFCNF}
+% to allow reading of any \texttt{texmf.cnf} file present in the support folder.
+% This might for example be used with a file containing
 % \begin{verbatim}
 % TEXMFAUXTREES = ../../texmf,
 % \end{verbatim}

testfiles-pdf/00-test-2.xetex.tpf

@@ -16,7 +16,7 @@ endobj
 <</Type/Pages/Count 1/Kids[3 0 R]/MediaBox[0 0 595.28 841.89]>>
 endobj
 2 0 obj
-<</Creator(TeX)/Producer(xdvipdfmx)/CreationDate(D:20160520090000-00'00')>>
+<</Creator(TeX)/Producer(xdvipdfmx)/CreationDate(D:20160520090000Z)>>
 endobj
 1 0 obj
 <</Pages 8 0 R/Type/Catalog>>
@@ -76,22 +76,22 @@ endobj
 xref
 0 14
 0000000000 65535 f 
-0000000519 00000 n 
+0000000513 00000 n 
 0000000428 00000 n 
 0000000274 00000 n 
-0000002870 00000 n 
-0000002423 00000 n 
+0000002864 00000 n 
+0000002417 00000 n 
 0000000015 00000 n 
 0000000196 00000 n 
 0000000349 00000 n 
-0000000564 00000 n 
-0000002611 00000 n 
-0000001010 00000 n 
-0000002316 00000 n 
-0000002363 00000 n 
+0000000558 00000 n 
+0000002605 00000 n 
+0000001004 00000 n 
+0000002310 00000 n 
+0000002357 00000 n 
 trailer
 <</ID[<ID-STRING><ID-STRING>]/Root
 1 0 R/Info 2 0 R/Size 14>>
 startxref
-3017
+3011
 %%EOF