2021-02-18 10:24:00

5 files changed, 30 insertions, 38 deletions

diff --git a/scripts/context/lua/mtx-epub.lua b/scripts/context/lua/mtx-epub.lua
index 956ce4931..0109b15c4 100644
--- a/scripts/context/lua/mtx-epub.lua
+++ b/scripts/context/lua/mtx-epub.lua
@@ -497,7 +497,7 @@ function scripts.epub.make(purge,rename,svgmath,svgstyle)
 
     -- end of todo
 
-    local pdftosvg   = os.which("mudraw") and formatters[ [[mudraw -o "%s" "%s" %s]] ]
+    local pdftosvg   = os.which("mutool") and formatters[ [[mutool draw -o "%s" "%s" %s]] ]
 
     local f_svgpage  = formatters["%s-page-%s.svg"]
     local f_svgname  = formatters["%s.svg"]
@@ -509,7 +509,7 @@ function scripts.epub.make(purge,rename,svgmath,svgstyle)
     local newfiles   = { }
 
     if not pdftosvg then
-        report("the %a binary is not present","mudraw")
+        report("the %a binary is not present","mutool")
     end
 
     -- a coverpage file has to be in the root of the export tree
diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index 827242d91..274de2553 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -13581,7 +13581,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["trac-inf"] = package.loaded["trac-inf"] or true
 
--- original size: 9781, stripped down to: 7325
+-- original size: 9740, stripped down to: 7296
 
 if not modules then modules={} end modules ['trac-inf']={
  version=1.001,
@@ -13675,10 +13675,8 @@ local function stoptiming(instance)
    timer.loadtime=timer.loadtime+loadtime
    timer.timing=0
    timer.starttime=0
-   return loadtime
   end
  end
- return 0
 end
 local function benchmarktimer(instance)
  local timer=timers[instance or "notimer"]
@@ -25491,7 +25489,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["luat-fmt"] = package.loaded["luat-fmt"] or true
 
--- original size: 11654, stripped down to: 8311
+-- original size: 11691, stripped down to: 8350
 
 if not modules then modules={} end modules ['luat-fmt']={
  version=1.001,
@@ -25746,9 +25744,9 @@ function environment.run_format(formatname,scriptname,filename,primaryflags,seco
   luafile=quoted(scriptname),
   texfile=filename~="" and quoted(filename) or "",
  }
- statistics.starttiming()
+ statistics.starttiming("make format")
  local result=runner(specification)
- local runtime=statistics.stoptiming()
+ statistics.stoptiming("make format")
  if verbose then
   report_format()
    if binarypath and binarypath~="" then
@@ -25766,7 +25764,7 @@ function environment.run_format(formatname,scriptname,filename,primaryflags,seco
    if secondaryflags~="" then
   report_format("secondary flags  : %s",secondaryflags)
    end
-  report_format("run time         : %.3f seconds",runtime)
+  report_format("run time         : %0.3f seconds",statistics.elapsed("make format"))
   report_format("return value     : %s",result==0 and "okay" or "error")
   report_format()
  end
@@ -25778,8 +25776,8 @@ end -- of closure
 
 -- used libraries    : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua libs-ini.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 1023714
--- stripped bytes    : 404810
+-- original bytes    : 1023710
+-- stripped bytes    : 404796
 
 -- end library merge
 
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index 827242d91..274de2553 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -13581,7 +13581,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["trac-inf"] = package.loaded["trac-inf"] or true
 
--- original size: 9781, stripped down to: 7325
+-- original size: 9740, stripped down to: 7296
 
 if not modules then modules={} end modules ['trac-inf']={
  version=1.001,
@@ -13675,10 +13675,8 @@ local function stoptiming(instance)
    timer.loadtime=timer.loadtime+loadtime
    timer.timing=0
    timer.starttime=0
-   return loadtime
   end
  end
- return 0
 end
 local function benchmarktimer(instance)
  local timer=timers[instance or "notimer"]
@@ -25491,7 +25489,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["luat-fmt"] = package.loaded["luat-fmt"] or true
 
--- original size: 11654, stripped down to: 8311
+-- original size: 11691, stripped down to: 8350
 
 if not modules then modules={} end modules ['luat-fmt']={
  version=1.001,
@@ -25746,9 +25744,9 @@ function environment.run_format(formatname,scriptname,filename,primaryflags,seco
   luafile=quoted(scriptname),
   texfile=filename~="" and quoted(filename) or "",
  }
- statistics.starttiming()
+ statistics.starttiming("make format")
  local result=runner(specification)
- local runtime=statistics.stoptiming()
+ statistics.stoptiming("make format")
  if verbose then
   report_format()
    if binarypath and binarypath~="" then
@@ -25766,7 +25764,7 @@ function environment.run_format(formatname,scriptname,filename,primaryflags,seco
    if secondaryflags~="" then
   report_format("secondary flags  : %s",secondaryflags)
    end
-  report_format("run time         : %.3f seconds",runtime)
+  report_format("run time         : %0.3f seconds",statistics.elapsed("make format"))
   report_format("return value     : %s",result==0 and "okay" or "error")
   report_format()
  end
@@ -25778,8 +25776,8 @@ end -- of closure
 
 -- used libraries    : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua libs-ini.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 1023714
--- stripped bytes    : 404810
+-- original bytes    : 1023710
+-- stripped bytes    : 404796
 
 -- end library merge
 
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index 827242d91..274de2553 100644
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -13581,7 +13581,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["trac-inf"] = package.loaded["trac-inf"] or true
 
--- original size: 9781, stripped down to: 7325
+-- original size: 9740, stripped down to: 7296
 
 if not modules then modules={} end modules ['trac-inf']={
  version=1.001,
@@ -13675,10 +13675,8 @@ local function stoptiming(instance)
    timer.loadtime=timer.loadtime+loadtime
    timer.timing=0
    timer.starttime=0
-   return loadtime
   end
  end
- return 0
 end
 local function benchmarktimer(instance)
  local timer=timers[instance or "notimer"]
@@ -25491,7 +25489,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["luat-fmt"] = package.loaded["luat-fmt"] or true
 
--- original size: 11654, stripped down to: 8311
+-- original size: 11691, stripped down to: 8350
 
 if not modules then modules={} end modules ['luat-fmt']={
  version=1.001,
@@ -25746,9 +25744,9 @@ function environment.run_format(formatname,scriptname,filename,primaryflags,seco
   luafile=quoted(scriptname),
   texfile=filename~="" and quoted(filename) or "",
  }
- statistics.starttiming()
+ statistics.starttiming("make format")
  local result=runner(specification)
- local runtime=statistics.stoptiming()
+ statistics.stoptiming("make format")
  if verbose then
   report_format()
    if binarypath and binarypath~="" then
@@ -25766,7 +25764,7 @@ function environment.run_format(formatname,scriptname,filename,primaryflags,seco
    if secondaryflags~="" then
   report_format("secondary flags  : %s",secondaryflags)
    end
-  report_format("run time         : %.3f seconds",runtime)
+  report_format("run time         : %0.3f seconds",statistics.elapsed("make format"))
   report_format("return value     : %s",result==0 and "okay" or "error")
   report_format()
  end
@@ -25778,8 +25776,8 @@ end -- of closure
 
 -- used libraries    : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua libs-ini.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 1023714
--- stripped bytes    : 404810
+-- original bytes    : 1023710
+-- stripped bytes    : 404796
 
 -- end library merge
 
diff --git a/scripts/context/stubs/win64/mtxrun.lua b/scripts/context/stubs/win64/mtxrun.lua
index 827242d91..274de2553 100644
--- a/scripts/context/stubs/win64/mtxrun.lua
+++ b/scripts/context/stubs/win64/mtxrun.lua
@@ -13581,7 +13581,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["trac-inf"] = package.loaded["trac-inf"] or true
 
--- original size: 9781, stripped down to: 7325
+-- original size: 9740, stripped down to: 7296
 
 if not modules then modules={} end modules ['trac-inf']={
  version=1.001,
@@ -13675,10 +13675,8 @@ local function stoptiming(instance)
    timer.loadtime=timer.loadtime+loadtime
    timer.timing=0
    timer.starttime=0
-   return loadtime
   end
  end
- return 0
 end
 local function benchmarktimer(instance)
  local timer=timers[instance or "notimer"]
@@ -25491,7 +25489,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["luat-fmt"] = package.loaded["luat-fmt"] or true
 
--- original size: 11654, stripped down to: 8311
+-- original size: 11691, stripped down to: 8350
 
 if not modules then modules={} end modules ['luat-fmt']={
  version=1.001,
@@ -25746,9 +25744,9 @@ function environment.run_format(formatname,scriptname,filename,primaryflags,seco
   luafile=quoted(scriptname),
   texfile=filename~="" and quoted(filename) or "",
  }
- statistics.starttiming()
+ statistics.starttiming("make format")
  local result=runner(specification)
- local runtime=statistics.stoptiming()
+ statistics.stoptiming("make format")
  if verbose then
   report_format()
    if binarypath and binarypath~="" then
@@ -25766,7 +25764,7 @@ function environment.run_format(formatname,scriptname,filename,primaryflags,seco
    if secondaryflags~="" then
   report_format("secondary flags  : %s",secondaryflags)
    end
-  report_format("run time         : %.3f seconds",runtime)
+  report_format("run time         : %0.3f seconds",statistics.elapsed("make format"))
   report_format("return value     : %s",result==0 and "okay" or "error")
   report_format()
  end
@@ -25778,8 +25776,8 @@ end -- of closure
 
 -- used libraries    : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua libs-ini.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 1023714
--- stripped bytes    : 404810
+-- original bytes    : 1023710
+-- stripped bytes    : 404796
 
 -- end library merge