From 441ccbc2b3f9ddbd45202ac2d7269fd85ef0f4d0 Mon Sep 17 00:00:00 2001
From: Context Git Mirror Bot <phg42.2a@gmail.com>
Date: Mon, 21 Dec 2015 17:15:06 +0100
Subject: 2015-12-21 16:31:00

---
 tex/context/base/cont-new.mkiv                     |   2 +-
 tex/context/base/context-version.pdf               | Bin 4182 -> 4178 bytes
 tex/context/base/context.mkiv                      |   2 +-
 tex/context/base/math-ini.mkiv                     |   1 -
 tex/context/base/mult-prm.lua                      |   2 --
 tex/context/base/status-files.pdf                  | Bin 25691 -> 25677 bytes
 tex/context/base/status-lua.pdf                    | Bin 267119 -> 267122 bytes
 tex/context/base/syst-ini.mkiv                     |   5 +----
 tex/generic/context/luatex/luatex-fonts-merged.lua |   2 +-
 9 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'tex')

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
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 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
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 ebbf024c8..a7e40c861 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/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
 
-- 
cgit v1.2.3