diff options
author | Hans Hagen <pragma@wxs.nl> | 2019-01-19 13:13:21 +0100 |
---|---|---|
committer | Context Git Mirror Bot <phg@phi-gamma.net> | 2019-01-19 13:13:21 +0100 |
commit | 3861c9ef2ffeffe824f05a255534d61800e27e7a (patch) | |
tree | 023d3e32dd6d7ef55f3eed41e23e012c32b07894 /tex/context | |
parent | 823bd4a7d8ff32c05807b02e650ecbd60b43e95d (diff) | |
download | context-3861c9ef2ffeffe824f05a255534d61800e27e7a.tar.gz |
2019-01-19 12:15:00
Diffstat (limited to 'tex/context')
-rw-r--r-- | tex/context/base/mkii/cont-new.mkii | 2 | ||||
-rw-r--r-- | tex/context/base/mkii/context.mkii | 2 | ||||
-rw-r--r-- | tex/context/base/mkiv/back-ini.lua | 2 | ||||
-rw-r--r-- | tex/context/base/mkiv/cont-new.mkiv | 2 | ||||
-rw-r--r-- | tex/context/base/mkiv/context.mkiv | 2 | ||||
-rw-r--r-- | tex/context/base/mkiv/core-uti.lua | 17 | ||||
-rw-r--r-- | tex/context/base/mkiv/font-ots.lua | 2 | ||||
-rw-r--r-- | tex/context/base/mkiv/status-files.pdf | bin | 26060 -> 26052 bytes | |||
-rw-r--r-- | tex/context/base/mkiv/status-lua.pdf | bin | 269299 -> 268471 bytes | |||
-rw-r--r-- | tex/context/base/mkiv/trac-inf.lua | 13 | ||||
-rw-r--r-- | tex/context/base/mkiv/util-mrg.lua | 1 | ||||
-rw-r--r-- | tex/context/interface/mkiv/i-context.pdf | bin | 864658 -> 864657 bytes | |||
-rw-r--r-- | tex/context/interface/mkiv/i-readme.pdf | bin | 60769 -> 60773 bytes |
13 files changed, 24 insertions, 19 deletions
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index 30a77ed87..d46a2dc0d 100644 --- a/tex/context/base/mkii/cont-new.mkii +++ b/tex/context/base/mkii/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2019.01.17 22:10} +\newcontextversion{2019.01.19 12:06} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/mkii/context.mkii b/tex/context/base/mkii/context.mkii index df046d115..b3946bb4f 100644 --- a/tex/context/base/mkii/context.mkii +++ b/tex/context/base/mkii/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2019.01.17 22:10} +\edef\contextversion{2019.01.19 12:06} %D For those who want to use this: diff --git a/tex/context/base/mkiv/back-ini.lua b/tex/context/base/mkiv/back-ini.lua index 3d12fe946..e21f0ce6d 100644 --- a/tex/context/base/mkiv/back-ini.lua +++ b/tex/context/base/mkiv/back-ini.lua @@ -62,7 +62,7 @@ backends.tables = { } setmetatableindex(backends.tables, tables backends.current = "unknown" -local lmtx_mode = nil +local lmtx_mode = nil local function lmtxmode() if lmtx_mode == nil then diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index d09b56df9..2de482d5b 100644 --- a/tex/context/base/mkiv/cont-new.mkiv +++ b/tex/context/base/mkiv/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2019.01.17 22:10} +\newcontextversion{2019.01.19 12:06} %D This file is loaded at runtime, thereby providing an excellent place for %D hacks, patches, extensions and new features. diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv index 5d3401226..1ab97d706 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -42,7 +42,7 @@ %D has to match \type {YYYY.MM.DD HH:MM} format. \edef\contextformat {\jobname} -\edef\contextversion{2019.01.17 22:10} +\edef\contextversion{2019.01.19 12:06} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/mkiv/core-uti.lua b/tex/context/base/mkiv/core-uti.lua index 9074d1da9..7c70cee7a 100644 --- a/tex/context/base/mkiv/core-uti.lua +++ b/tex/context/base/mkiv/core-uti.lua @@ -432,6 +432,7 @@ end) -- local used_wood_factor = watts_per_core * kg_per_watt_per_second / speedup_by_other_engine -- local used_wood_factor = (50 / 15000000) / 1.2 + function statistics.formatruntime(runtime) if not environment.initex then -- else error when testing as not counters yet -- stoptiming(statistics) -- to be sure @@ -440,19 +441,15 @@ function statistics.formatruntime(runtime) if pages > shipped then pages = shipped end + runtime = tonumber(runtime) if shipped > 0 or pages > 0 then - runtime = tonumber(runtime) local persecond = (runtime > 0) and (shipped/runtime) or pages - if pages == 0 then pages = shipped end - -- if TEXENGINE == "luajittex" then - -- local saved = watts_per_core * runtime * kg_per_watt_per_second / speedup_by_other_engine - -- local saved = used_wood_factor * runtime - -- return format("%s seconds, %i processed pages, %i shipped pages, %.3f pages/second, %f mg tree saved by using luajittex",runtime,pages,shipped,persecond,saved*1000*1000) - -- else - return format("%s seconds, %i processed pages, %i shipped pages, %.3f pages/second",runtime,pages,shipped,persecond) - -- end + if pages == 0 then + pages = shipped + end + return format("%0.3f seconds, %i processed pages, %i shipped pages, %.3f pages/second",runtime,pages,shipped,persecond) else - return format("%s seconds",runtime) + return format("%0.3f seconds",runtime) end end end diff --git a/tex/context/base/mkiv/font-ots.lua b/tex/context/base/mkiv/font-ots.lua index ea126a755..1c6c30f81 100644 --- a/tex/context/base/mkiv/font-ots.lua +++ b/tex/context/base/mkiv/font-ots.lua @@ -3800,7 +3800,7 @@ do local initialrl = 0 if getid(head) == localpar_code and getsubtype(head) == 0 then - initialrl = pardirstate(start) + initialrl = pardirstate(head) elseif direction == 1 or direction == "TRT" then initialrl = -1 end diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf Binary files differindex d1c0f7bca..d02146c5a 100644 --- a/tex/context/base/mkiv/status-files.pdf +++ b/tex/context/base/mkiv/status-files.pdf diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf Binary files differindex e70941e70..85c6b3477 100644 --- a/tex/context/base/mkiv/status-lua.pdf +++ b/tex/context/base/mkiv/status-lua.pdf diff --git a/tex/context/base/mkiv/trac-inf.lua b/tex/context/base/mkiv/trac-inf.lua index 6c08f34f6..2c1dbbfe7 100644 --- a/tex/context/base/mkiv/trac-inf.lua +++ b/tex/context/base/mkiv/trac-inf.lua @@ -253,16 +253,23 @@ end function statistics.runtime() stoptiming(statistics) -- stoptiming(statistics) -- somehow we can start the timer twice, but where - return statistics.formatruntime(elapsedtime(statistics)) + local runtime = lua.getruntime and lua.getruntime() or elapsedtime(statistics) + return statistics.formatruntime(runtime) end local report = logs.reporter("system") -function statistics.timed(action) +function statistics.timed(action,all) starttiming("run") action() stoptiming("run") - report("total runtime: %s seconds",elapsedtime("run")) + local runtime = tonumber(elapsedtime("run")) + if all then + local alltime = lua.getruntime and lua.getruntime() or elapsedtime(statistics) + report("total runtime: %0.3f seconds of %0.3f seconds",runtime,alltime) + else + report("total runtime: %0.3f seconds",runtime) + end end -- goodie diff --git a/tex/context/base/mkiv/util-mrg.lua b/tex/context/base/mkiv/util-mrg.lua index 690188ef8..bc835bf56 100644 --- a/tex/context/base/mkiv/util-mrg.lua +++ b/tex/context/base/mkiv/util-mrg.lua @@ -113,6 +113,7 @@ local pack = digit * space^1 * operator4 * optionalspacing + optionalspaces * separator * optionalspaces local lines = emptyline^2 / "\n" local spaces = (space * space) / " " +local spaces = (space * space * space * space) / " " ----- spaces = ((space+eol)^1 ) / " " local compact = Cs ( ( diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf Binary files differindex 1809a7c91..cb329ec26 100644 --- a/tex/context/interface/mkiv/i-context.pdf +++ b/tex/context/interface/mkiv/i-context.pdf diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf Binary files differindex 367a76106..46c87adc2 100644 --- a/tex/context/interface/mkiv/i-readme.pdf +++ b/tex/context/interface/mkiv/i-readme.pdf |