diff options
| author | Marius <mariausol@gmail.com> | 2014-01-21 17:00:18 +0200 |
|---|---|---|
| committer | Marius <mariausol@gmail.com> | 2014-01-21 17:00:18 +0200 |
| commit | c9b715ef8332f82ec94a3eff2c60dd6273639f75 (patch) | |
| tree | fecdbc77d96928f02838a10bd0e5221d7a95a9a6 /tex | |
| parent | e1391d4e5204dd3f121abf16e1eb8125696b57e2 (diff) | |
| download | context-c9b715ef8332f82ec94a3eff2c60dd6273639f75.tar.gz | |
beta 2014.01.21 15:48
Diffstat (limited to 'tex')
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4081 -> 4094 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/core-uti.lua | 2 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24816 -> 24814 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 233039 -> 233039 bytes | |||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
7 files changed, 4 insertions, 4 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 622050993..7fdbb59d2 100644 --- a/tex/context/base/cont-new.mkiv +++ b/tex/context/base/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2014.01.21 10:58} +\newcontextversion{2014.01.21 15:48} %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/context-version.pdf b/tex/context/base/context-version.pdf Binary files differindex f473d88cb..efc48c711 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index aea4994d3..63e9de509 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -28,7 +28,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2014.01.21 10:58} +\edef\contextversion{2014.01.21 15:48} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/core-uti.lua b/tex/context/base/core-uti.lua index ef792c1d8..1c230cead 100644 --- a/tex/context/base/core-uti.lua +++ b/tex/context/base/core-uti.lua @@ -323,7 +323,7 @@ if jit 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 kg tree saved by using luajittex",runtime,pages,shipped,persecond,saved) - return format("%s seconds, %i processed pages, %i shipped pages, %.3f pages/second, %f g tree saved by using luajittex",runtime,pages,shipped,persecond,saved*1000) + 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 diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex b44d09fb0..719368b3a 100644 --- a/tex/context/base/status-files.pdf +++ b/tex/context/base/status-files.pdf diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf Binary files differindex 4afc9b492..de843069b 100644 --- a/tex/context/base/status-lua.pdf +++ b/tex/context/base/status-lua.pdf diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index caeccce65..609f3db9c 100644 --- a/tex/generic/context/luatex/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 01/21/14 10:58:12 +-- merge date : 01/21/14 15:48:23 do -- begin closure to overcome local limits and interference |