[latex3-commits] [git/LaTeX3-latex3-l3build] master: Simplify dvitopdf (4c0c61f)

[Joseph Wright]

Repository : https://github.com/latex3/l3build
On branch  : master
Link       : https://github.com/latex3/l3build/commit/4c0c61f0bb728774ded7a236bd82b4070b190108

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

commit 4c0c61f0bb728774ded7a236bd82b4070b190108
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Wed Mar 11 21:52:02 2020 +0000

    Simplify dvitopdf


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

4c0c61f0bb728774ded7a236bd82b4070b190108
 l3build-typesetting.lua | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/l3build-typesetting.lua b/l3build-typesetting.lua
index d0bec11..837443b 100644
--- a/l3build-typesetting.lua
+++ b/l3build-typesetting.lua
@@ -36,24 +36,15 @@ local match = string.match
 local os_type = os.type
 
 function dvitopdf(name, dir, engine, hide)
-  if match(engine, "^u?ptex$") then
-    run(
-      dir,
-      (forcecheckepoch and setepoch() or "") ..
-     "dvipdfmx  " .. name .. dviext
-       .. (hide and (" > " .. os_null) or "")
-    )
-  else
-    run(
-      dir,
-      (forcecheckepoch and setepoch() or "") ..
-     "dvips " .. name .. dviext
-       .. (hide and (" > " .. os_null) or "")
-       .. os_concat ..
-     "ps2pdf " .. ps2pdfopt .. name .. psext
-        .. (hide and (" > " .. os_null) or "")
-    )
-  end
+  run(
+    dir,
+    (forcecheckepoch and setepoch() or "") ..
+    "dvips " .. name .. dviext
+      .. (hide and (" > " .. os_null) or "")
+      .. os_concat ..
+   "ps2pdf " .. ps2pdfopt .. name .. psext
+      .. (hide and (" > " .. os_null) or "")
+  )
 end
 
 -- An auxiliary used to set up the environmental variables