From a9cb00276fab1f821b3e237270769b74ee44b2bd Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Wed, 25 Nov 2020 22:14:58 +0100 Subject: 2020-11-25 21:42:00 --- tex/context/base/mkii/cont-new.mkii | 2 +- tex/context/base/mkii/context.mkii | 2 +- tex/context/base/mkiv/cont-new.mkiv | 2 +- tex/context/base/mkiv/context.mkiv | 2 +- tex/context/base/mkiv/status-files.pdf | Bin 26171 -> 26172 bytes tex/context/base/mkiv/status-lua.pdf | Bin 256373 -> 256353 bytes tex/context/base/mkxl/cont-new.mkxl | 2 +- tex/context/base/mkxl/context.mkxl | 2 +- tex/context/base/mkxl/strc-mat.mkxl | 4 ++-- tex/context/base/mkxl/trac-inf.lmt | 7 ++++--- tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 11 files changed, 13 insertions(+), 12 deletions(-) diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index 8850e72b4..3be6c8c18 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{2020.11.25 19:15} +\newcontextversion{2020.11.25 21:39} %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 f78f5091b..870deb804 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{2020.11.25 19:15} +\edef\contextversion{2020.11.25 21:39} %D For those who want to use this: diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 4de3b29d1..71f3cfd7b 100644 --- a/tex/context/base/mkiv/cont-new.mkiv +++ b/tex/context/base/mkiv/cont-new.mkiv @@ -13,7 +13,7 @@ % \normalend % uncomment this to get the real base runtime -\newcontextversion{2020.11.25 19:15} +\newcontextversion{2020.11.25 21:39} %D This file is loaded at runtime, thereby providing an excellent place for hacks, %D patches, extensions and new features. There can be local overloads in cont-loc diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv index ae19843a1..f1f119f8b 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -45,7 +45,7 @@ %D {YYYY.MM.DD HH:MM} format. \edef\contextformat {\jobname} -\edef\contextversion{2020.11.25 19:15} +\edef\contextversion{2020.11.25 21:39} %D Kind of special: diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf index 562e5aaf1..f35a6a3c2 100644 Binary files a/tex/context/base/mkiv/status-files.pdf and b/tex/context/base/mkiv/status-files.pdf differ diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf index d1d6664ec..a1c0cf575 100644 Binary files a/tex/context/base/mkiv/status-lua.pdf and b/tex/context/base/mkiv/status-lua.pdf differ diff --git a/tex/context/base/mkxl/cont-new.mkxl b/tex/context/base/mkxl/cont-new.mkxl index d06f31f89..027e63333 100644 --- a/tex/context/base/mkxl/cont-new.mkxl +++ b/tex/context/base/mkxl/cont-new.mkxl @@ -13,7 +13,7 @@ % \normalend % uncomment this to get the real base runtime -\newcontextversion{2020.11.25 19:15} +\newcontextversion{2020.11.25 21:39} %D This file is loaded at runtime, thereby providing an excellent place for hacks, %D patches, extensions and new features. There can be local overloads in cont-loc diff --git a/tex/context/base/mkxl/context.mkxl b/tex/context/base/mkxl/context.mkxl index ee7d92bee..9d40abfde 100644 --- a/tex/context/base/mkxl/context.mkxl +++ b/tex/context/base/mkxl/context.mkxl @@ -29,7 +29,7 @@ %D {YYYY.MM.DD HH:MM} format. \edef\contextformat {\jobname} -\edef\contextversion{2020.11.25 19:15} +\edef\contextversion{2020.11.25 21:39} %overloadmode 1 % check frozen / warning %overloadmode 2 % check frozen / error diff --git a/tex/context/base/mkxl/strc-mat.mkxl b/tex/context/base/mkxl/strc-mat.mkxl index a9efa8d25..8ebd79a73 100644 --- a/tex/context/base/mkxl/strc-mat.mkxl +++ b/tex/context/base/mkxl/strc-mat.mkxl @@ -1157,8 +1157,8 @@ {\def\currentformulareference{#1}% \strc_formulas_place_number_in_box} -\permanent\protected\def\placeformula {\global\settrue\c_strc_formulas_inside_place} -\permanent\protected\def\placesubformula{\global\settrue\c_strc_formulas_inside_place_sub} +\permanent\protected\def\placeformula {\global\settrue\c_strc_formulas_inside_place \strc_formulas_place} +\permanent\protected\def\placesubformula{\global\settrue\c_strc_formulas_inside_place_sub\strc_formulas_place} \tolerant\protected\def\strc_formulas_place[#1]% {\def\currentplaceformulareference{#1}% diff --git a/tex/context/base/mkxl/trac-inf.lmt b/tex/context/base/mkxl/trac-inf.lmt index 9207d5b45..23000b7d0 100644 --- a/tex/context/base/mkxl/trac-inf.lmt +++ b/tex/context/base/mkxl/trac-inf.lmt @@ -186,10 +186,11 @@ function statistics.show() register("callbacks", statistics.callbacks) -- so far register("lua properties",function() - local hash = lua.gethashchars() + -- local hash = lua.gethashchars() local mask = load([[τεχ = 1]]) and "utf" or "ascii" - return format("engine: %s %s, used memory: %s, hash chars: min(%i,40), symbol mask: %s (%s)", - "lua", LUAVERSION, statistics.memused(), hash, mask, mask == "utf" and "τεχ" or "tex") + -- return format("engine: %s %s, used memory: %s, hash chars: min(%i,40), symbol mask: %s (%s)", + return format("engine: %s %s, used memory: %s, symbol mask: %s (%s)", + "lua", LUAVERSION, statistics.memused(), mask, mask == "utf" and "τεχ" or "tex") end) register("runtime",statistics.runtime) logs.newline() -- initial newline diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 55b49886a..ddedfd3f7 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 : c:/data/develop/context/sources/luatex-fonts-merged.lua -- parent file : c:/data/develop/context/sources/luatex-fonts.lua --- merge date : 2020-11-25 19:15 +-- merge date : 2020-11-25 21:39 do -- begin closure to overcome local limits and interference -- cgit v1.2.3