[latex3-commits] [git/LaTeX3-latex3-latex3] main: Better specialformats support (50aa1c9a8)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : main
Link       : https://github.com/latex3/latex3/commit/50aa1c9a84a85af2bb57bcc965e8cf6963825de9

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

commit 50aa1c9a84a85af2bb57bcc965e8cf6963825de9
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Mon Dec 13 10:29:54 2021 +0000

    Better specialformats support
    
    There's an issue in l3build's defaults here: I'll fix that
    for the long-term.


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

50aa1c9a84a85af2bb57bcc965e8cf6963825de9
 build-config.lua                | 12 ++----------
 l3experimental/l3draw/build.lua |  7 +++++--
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/build-config.lua b/build-config.lua
index 08a76255f..bc86a1a59 100644
--- a/build-config.lua
+++ b/build-config.lua
@@ -86,14 +86,9 @@ end
 -- Need to build format files
 local function fmt(engines,dest)
   local function mkfmt(engine)
-    -- Standard (u)pTeX engines don't have e-TeX
     local cmd = engine
-    if string.match(engine,"uptex") then
-      cmd = "euptex"
-    elseif string.match(engine,"ptex") then
-      cmd = "eptex"
-    elseif string.match(engine,"luatex") then
-      cmd = "luahbtex"
+    if specialformats.latex[engine] then
+      cmd = specialformats.latex[engine].binary
     end
     -- Use .ini files if available
     local src = "latex.ltx"
@@ -137,9 +132,6 @@ local function fmt(engines,dest)
 
   local errorlevel
   for _,engine in pairs(engines) do
-    if specialformats.latex[engine] then
-      engine = specialformats.latex[engine].binary
-    end
     errorlevel = mkfmt(engine)
     if errorlevel ~= 0 then return errorlevel end
   end
diff --git a/l3experimental/l3draw/build.lua b/l3experimental/l3draw/build.lua
index 64f46a92a..36c36a811 100644
--- a/l3experimental/l3draw/build.lua
+++ b/l3experimental/l3draw/build.lua
@@ -14,9 +14,12 @@ typesetfiles = {"l3draw.dtx", "l3draw-code.tex"}
 
 -- Set up to allow testing dvips, etc.
 specialformats = specialformats or {}
-specialformats["latex"] = specialformats["latex"] or
+specialformats.latex =
   {
-    ["etex-dvips"] = {binary = "etex", format = "latex"},
+    luatex = {binary = "luahbtex",format = "lualatex"},
+    ptex  = {binary = "eptex"},
+    uptex = {binary = "euptex"},
+    ["etex-dvips"] = {binary = "etex", format = "latex"}
   }
 checkengines = {"pdftex", "luatex", "xetex", "etex-dvips", "ptex", "uptex"}