summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4182 -> 4178 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/math-ini.mkiv1
-rw-r--r--tex/context/base/mult-prm.lua2
-rw-r--r--tex/context/base/status-files.pdfbin25691 -> 25677 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin267119 -> 267122 bytes
-rw-r--r--tex/context/base/syst-ini.mkiv5
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
9 files changed, 4 insertions, 10 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 9cc00b4fd..52790b33e 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.12.21 12:16}
+\newcontextversion{2015.12.21 16:29}
%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 c04d6d81e..5380d3d71 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
Binary files differ
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 22790129c..57f384207 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -39,7 +39,7 @@
%D up and the dependencies are more consistent.
\edef\contextformat {\jobname}
-\edef\contextversion{2015.12.21 12:16}
+\edef\contextversion{2015.12.21 16:29}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/math-ini.mkiv b/tex/context/base/math-ini.mkiv
index 96f55100f..0cbfd6fc4 100644
--- a/tex/context/base/math-ini.mkiv
+++ b/tex/context/base/math-ini.mkiv
@@ -2007,7 +2007,6 @@
\lastnamedcs
\else
\math_style_set_mathstyle_mathstylecache
- \??mathstylecache
\fi}
\def\math_style_set_mathstyle_mathstylecache
diff --git a/tex/context/base/mult-prm.lua b/tex/context/base/mult-prm.lua
index a39f4b09e..9a91d9a4e 100644
--- a/tex/context/base/mult-prm.lua
+++ b/tex/context/base/mult-prm.lua
@@ -272,7 +272,6 @@ return {
"localrightbox",
"lpcode",
"luaescapestring",
- "luastartup",
"luatexbanner",
"luatexrevision",
"luatexversion",
@@ -887,7 +886,6 @@ return {
"lowercase",
"lpcode",
"luaescapestring",
- "luastartup",
"luatexbanner",
"luatexrevision",
"luatexversion",
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index da6055405..f17d6c679 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
Binary files differ
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index ebbf024c8..a7e40c861 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/context/base/syst-ini.mkiv b/tex/context/base/syst-ini.mkiv
index decd4c095..c09e3f15b 100644
--- a/tex/context/base/syst-ini.mkiv
+++ b/tex/context/base/syst-ini.mkiv
@@ -957,11 +957,8 @@
\def\space{ }
\def\empty{}
-%def\null {\hbox{}}
-\newbox\syst_nullbox \let\nullbox\syst_nullbox
-
-\normalprotected\def\null{\copy\nullbox}
+\normalprotected\def\null{\hpack{}}
%D The following two might be overloaded later on but some modules need then
%D earlier. These functionality is reflected in the name and will not change.
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index ab54a24ff..46de1d0c0 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 : 12/21/15 12:16:50
+-- merge date : 12/21/15 16:29:15
do -- begin closure to overcome local limits and interference