12 files changed, 27 insertions, 14 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 80af70a20..86e6a0374 100644
--- a/tex/context/base/cont-new.mkii
+++ b/tex/context/base/cont-new.mkii
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2012.01.11 10:58}
+\newcontextversion{2012.01.11 14:58}
 
 %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/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 2627ecaee..89a754665 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{2012.01.11 10:58}
+\newcontextversion{2012.01.11 14:58}
 
 %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/context-version.pdf b/tex/context/base/context-version.pdf
index 93246db30..edaaa063f 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index 3a5ddbd44..4a65db342 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index f27cee9bc..cefbf66b7 100644
--- a/tex/context/base/context.mkii
+++ b/tex/context/base/context.mkii
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2012.01.11 10:58}
+\edef\contextversion{2012.01.11 14:58}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 1f34408c8..65423c066 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -23,7 +23,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2012.01.11 10:58}
+\edef\contextversion{2012.01.11 14:58}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/core-sys.mkiv b/tex/context/base/core-sys.mkiv
index dc346c3fa..88e0ebf23 100644
--- a/tex/context/base/core-sys.mkiv
+++ b/tex/context/base/core-sys.mkiv
@@ -213,9 +213,9 @@
      {\dostoptagged}}
 
 \unexpanded\def\define
-  {\doifnextoptionalelse\syst_basics_define\def}
+  {\doifnextoptionalelse\syst_basics_define_yes\syst_basics_define_nop}
 
-\unexpanded\def\syst_basics_define[#1]#2#3%
+\unexpanded\def\syst_basics_define_yes[#1]#2#3%
   {\ifdefined#2%
      \showmessage\m!system4{\string#2}%
    \fi
@@ -232,6 +232,12 @@
      \def#2##1##2##3##4##5##6##7##8##9{#3}\else
      \def#2{#3}\fi}
 
+\unexpanded\def\syst_basics_define_nop#1#2%
+  {\ifdefined#1%
+     \showmessage\m!system4{\string#1}%
+   \fi
+   \def#1{#2}}
+
 % \startluacode
 %     local contextsprint, ctxcatcodes = context.sprint, tex.ctxcatcodes
 %     local format, match, gmatch, rep = string.format, string.match, string.gmatch, string.rep
diff --git a/tex/context/base/font-ini.mkvi b/tex/context/base/font-ini.mkvi
index 2bf4c49dd..ee50e664a 100644
--- a/tex/context/base/font-ini.mkvi
+++ b/tex/context/base/font-ini.mkvi
@@ -2478,14 +2478,17 @@
    \endgroup}
 
 \appendtoks
-    \everyhbox{\font_preloads_zero_stage}
-    \everyvbox{\font_preloads_zero_stage}
+    \everyhbox{\font_preloads_zero_stage}%
+    \everyvbox{\font_preloads_zero_stage}%
 \to \everydump
 
 \def\font_preloads_at_every_job {\font_preloads_first_stage }
 \def\font_preloads_at_start_text{\font_preloads_second_stage}
 \def\font_preloads_at_stop_text {\font_preloads_fourth_stage}
 
+% \unexpanded\def\checkpreloadedbodyfont % no \let here
+%   {\font_preloads_at_start_text}
+
 %D Here comes the main font switching macros. These macros
 %D handle changes in size as well as returning to the global
 %D bodyfont size.
@@ -3003,6 +3006,10 @@
 %D default typeface and also set the font specific parameters
 %D assigned to \type{\everybodyfont}
 
+\def\textface        {\bodyfontvariable\s!text        }
+\def\scriptface      {\bodyfontvariable\s!script      }
+\def\scriptscriptface{\bodyfontvariable\s!scriptscript}
+
 \unexpanded\def\font_basics_complete_switch[#size]%
   {\bodyfontsize#size\relax
    \dimensiontocount\bodyfontsize\bodyfontpoints % rounded, still used in m-chart
diff --git a/tex/context/base/page-run.mkiv b/tex/context/base/page-run.mkiv
index 72c02e4f8..62b1030ee 100644
--- a/tex/context/base/page-run.mkiv
+++ b/tex/context/base/page-run.mkiv
@@ -15,7 +15,10 @@
 
 \unprotect
 
-\gdef\doshowprint[#1][#2][#3]% only english
+\gdef\showprint
+  {\dotripleempty\page_layouts_show_print}
+
+\gdef\page_layouts_show_print[#1][#2][#3]% only english
   {\setbuffer[crap]%
       \unprotect
         \definepapersize[X][\c!width=4em, \c!height=6em]
@@ -31,9 +34,6 @@
    \endbuffer
    \framed[\c!offset=\v!overlay,\c!strut=\v!no]{\typesetbuffer[crap]}}
 
-\gdef\showprint
-  {\dotripleempty\doshowprint}
-
 % \switchtobodyfont[8pt]
 %
 % \startcombination[4*4]
@@ -288,5 +288,5 @@ end
    \NC outer margin \NC \the\outermarginwidth               \NC \NR
    \NC inner margin \NC \the\innermarginwidth               \NC \NR
    \stoptabulate}
-
+
 \protect \endinput
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 7a563bdfe..cf02f71fc 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
index ad9ae6bab..da0b60f3f 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 491bb9873..50eb86f93 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/11/12 10:58:01
+-- merge date  : 01/11/12 14:58:36
 
 do -- begin closure to overcome local limits and interference