[latex3-commits] [git/LaTeX3-latex3-latex2e] nfssaxes: More work on shortening log (4b2edcc0)

[Joseph Wright]

Repository : https://github.com/latex3/latex2e
On branch  : nfssaxes
Link       : https://github.com/latex3/latex2e/commit/4b2edcc07b4adffca726829b7f4224888ac65a31

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

commit 4b2edcc07b4adffca726829b7f4224888ac65a31
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue Nov 5 07:26:07 2019 +0000

    More work on shortening log


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

4b2edcc07b4adffca726829b7f4224888ac65a31
 build-config.lua | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/build-config.lua b/build-config.lua
index 086d5af6..fe98d29f 100644
--- a/build-config.lua
+++ b/build-config.lua
@@ -225,28 +225,24 @@ function docinit_hook() return fmt({"pdftex"},typesetdir) end
 -- Somewhat shorten the log
 local function shorttex(file,dir)
   local dir = dir or "."
-  return runcmd(typesetexe .. " -interaction=batchmode \"" .. typesetcmds
+  return runcmd('pdftex -interaction=batchmode "&pdflatex" "' .. typesetcmds
     .. "\\input " .. file .. "\"",
-    dir,{"TEXINPUTS","LUAINPUTS"})
+    dir,{"TEXINPUTS","TEXFORMATS"})
 end
 
-typeset = typeset or function(file,dir)
+function typeset(file,dir)
   dir = dir or "."
-  local errorlevel = shorttex(file,dir)
-  if errorlevel ~= 0 then
-    return errorlevel
-  end
   local name = jobname(file)
-  errorlevel = biber(name,dir) + bibtex(name,dir)
+  local errorlevel = tex(file,dir)
   if errorlevel ~= 0 then
     return errorlevel
   end
-  for i = 2,typesetruns do
+  for i = 2,typesetruns - 1 do
     errorlevel =
       makeindex(name,dir,".glo",".gls",".glg",glossarystyle) +
       makeindex(name,dir,".idx",".ind",".ilg",indexstyle)    +
-      tex(file,dir)
-    if errorlevel ~= 0 then break end
+      shorttex(file,dir)
+    if errorlevel ~= 0 then return errorlevel end
   end
-  return errorlevel
+  return tex(file,dir)
 end