From 72bd1e9c8cc7fb62285350f7a550d3866e5f2a2b Mon Sep 17 00:00:00 2001 From: Context Git Mirror Bot Date: Thu, 26 Mar 2015 23:15:04 +0100 Subject: 2015-03-26 22:54:00 --- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4343 -> 4321 bytes tex/context/base/context.mkiv | 2 +- tex/context/base/mult-low.lua | 4 +++- tex/context/base/mult-prm.lua | 4 ++-- tex/context/base/status-files.pdf | Bin 24664 -> 24664 bytes tex/context/base/status-lua.pdf | Bin 399807 -> 399807 bytes tex/context/base/toks-ini.lua | 2 ++ tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 9 files changed, 10 insertions(+), 6 deletions(-) (limited to 'tex') diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 5835599a0..f266d155c 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{2015.03.26 19:19} +\newcontextversion{2015.03.26 22:52} %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 index 57b949d98..19bc2b33e 100644 Binary files a/tex/context/base/context-version.pdf and b/tex/context/base/context-version.pdf differ diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index c80621cda..ceead82bf 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{2015.03.26 19:19} +\edef\contextversion{2015.03.26 22:52} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/mult-low.lua b/tex/context/base/mult-low.lua index 22bab6f32..625217803 100644 --- a/tex/context/base/mult-low.lua +++ b/tex/context/base/mult-low.lua @@ -31,7 +31,9 @@ return { -- "fmtname", "fmtversion", "texengine", "texenginename", "texengineversion", "luatexengine", "pdftexengine", "xetexengine", "unknownengine", - "etexversion", "pdftexversion", "xetexversion", "xetexrevision", + -- "etexversion", + -- "pdftexversion", "pdftexrevision", + -- "xetexversion", "xetexrevision", -- "activecatcode", -- diff --git a/tex/context/base/mult-prm.lua b/tex/context/base/mult-prm.lua index c1d5f90ee..3b4d84356 100644 --- a/tex/context/base/mult-prm.lua +++ b/tex/context/base/mult-prm.lua @@ -232,7 +232,7 @@ return { "latelua", "luaescapestring", "luastartup", - "luatexdatestamp", + "luatexbanner", "luatexrevision", "luatexversion", "luafunction", @@ -774,7 +774,7 @@ return { "lpcode", "luaescapestring", "luastartup", - "luatexdatestamp", + "luatexbanner", "luatexrevision", "luatexversion", "mag", diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index 0017ae535..493ddbafd 100644 Binary files a/tex/context/base/status-files.pdf and b/tex/context/base/status-files.pdf differ diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf index 90483d642..baf911308 100644 Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ diff --git a/tex/context/base/toks-ini.lua b/tex/context/base/toks-ini.lua index 9fcbd4345..0cd25a36c 100644 --- a/tex/context/base/toks-ini.lua +++ b/tex/context/base/toks-ini.lua @@ -68,6 +68,8 @@ if newtoken then local set_macro = newtoken.set_macro + set_macro = function(k,v) context.setvalue(k,v or '') end + local bits = { escape = 2^ 0, begingroup = 2^ 1, diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 9395a157c..b97021447 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 : 03/26/15 19:19:12 +-- merge date : 03/26/15 22:52:35 do -- begin closure to overcome local limits and interference -- cgit v1.2.3