[latex3-commits] [git/LaTeX3-latex3-l3build] main: Always typeset in typesetdir (ff20ff2)

[Joseph Wright]

Repository : https://github.com/latex3/l3build
On branch  : main
Link       : https://github.com/latex3/l3build/commit/ff20ff23b3da22bf32530623a5dddbdb08ef6360

>---------------------------------------------------------------

commit ff20ff23b3da22bf32530623a5dddbdb08ef6360
Author: Marcel Fabian Krüger <tex at 2krueger.de>
Date:   Mon Nov 22 22:48:08 2021 +0100

    Always typeset in typesetdir


>---------------------------------------------------------------

ff20ff23b3da22bf32530623a5dddbdb08ef6360
 CHANGELOG.md            |  2 ++
 l3build-typesetting.lua | 11 ++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c6f67da..273c51f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,8 @@ this project uses date-based 'snapshot' version identifiers.
 
 ### Fixed
 - Allow config names ending with 'lua', as long as they don't end with '.lua'
+- All documentation files are build in a consistent environment with support
+  files visible.
 
 ## [2021-08-28]
 
diff --git a/l3build-typesetting.lua b/l3build-typesetting.lua
index 4934c3f..f980578 100644
--- a/l3build-typesetting.lua
+++ b/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,8 +211,7 @@ 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
+        for _,p in ipairs(tree(typesetdir,glob)) do
           local path,srcname = splitpath(p.cwd)
           local name = jobname(srcname)
           if not done[name] then
@@ -235,7 +237,6 @@ function doc(files)
             end
           end
         end
-      end
     end
   end
   return 0