1 files changed, 46 insertions, 11 deletions

diff --git a/tex/context/base/core-var.tex b/tex/context/base/core-var.tex
index 7f8c44030..7e67be23a 100644
--- a/tex/context/base/core-var.tex
+++ b/tex/context/base/core-var.tex
@@ -44,11 +44,36 @@
 \newevery \everybeginofpar         \relax
 \newevery \everyendofpar           \relax
 
+%D For shared \type {\everymath} and \type {\everydisplay}:
+
+\newevery \everymathematics        \relax
+
+\prependtoks \the\everymathematics \to \everymath
+\prependtoks \the\everymathematics \to \everydisplay
+
+% \newevery \everyparflush           \relax % collected nodes
+
 %D Experimental (used in xml <p> .. </p>
 
 \def\bpar{\the\everybeginofpar\ignorespaces} % may interfere with \everypar
 \def\epar{\ifhmode\removeunwantedspaces\the\everyendofpar\fi} % test prevents problems with \bpar\epar
 
+%D More generic (used to be pushcolor etc)
+
+\newtoks\everypushproperties
+\newtoks\everypopproperties
+\newtoks\everypopsplitproperties
+
+\newtoks\everystarttextproperties
+\newtoks\everystoptextproperties
+
+\def\pushproperties     {\the\everypushproperties}
+\def\popproperties      {\the\everypopproperties}
+\def\popsplitproperties {\the\everypopsplitproperties}
+
+\def\starttextproperties{\the\everystarttextproperties}
+\def\stoptextproperties {\the\everystoptextproperties}
+
 %D \macros
 %D   {defineinputmode,setinputmode}
 %D
@@ -69,12 +94,13 @@
 %D We disable trial typesetting in the output routine,
 %D just to be sure.
 
-\prependtoks
-  \trialtypesettingfalse
-\to \everybeforepagebody
+\prependtoks \trialtypesettingfalse \to \everybeforepagebody
 
 %D \macros
 %D   {starttextdata}
+%D
+%D This is a user macro (appending to every last shipout is not
+%D really user friendly.
 
 \newtoks \collectedtextdata
 
@@ -82,10 +108,12 @@
   {\doglobal\appendtoks#1\to\collectedtextdata}
 
 \def\flushtextdata
-  {\vsmash{\the\collectedtextdata}%
+  {\vsmashed{\the\collectedtextdata}% all dimensions zero
    \global\collectedtextdata\emptytoks
    \globallet\flushtextdata\donothing}
 
+\prependtoks \flushtextdata \to \everylastshipout
+
 %D \macros
 %D   {ifprocessingXML}
 %D
@@ -124,6 +152,8 @@
 %D The command \type {\fastmode} disables some time consuming
 %D typesetting.
 
+\let\normalwritestatus\writestatus
+
 \newevery \everyfastmode \relax
 
 \newif\iffastmode
@@ -158,12 +188,12 @@
 %D   {setvariables,getvariable,getvariabledefault}
 %D
 %D \starttyping
-%D \setvariables[xx][titel=]
-%D \setvariables[xx][titel=test test]
-%D \setvariables[xx][titel=test $x=1$ test]   % fatal error reported
-%D \setvariables[xx][titel=test {$x=1$} test]
-%D \setvariables[xx][titel]                   % fatal error reported
-%D \setvariables[xx][titel=e]
+%D \setvariables[xx][title=]
+%D \setvariables[xx][title=test test]
+%D \setvariables[xx][title=test $x=1$ test]   % fatal error reported
+%D \setvariables[xx][title=test {$x=1$} test]
+%D \setvariables[xx][title]                   % fatal error reported
+%D \setvariables[xx][titletitel=e]
 %D \stoptyping
 
 \def\??vars{@@vars}
@@ -254,10 +284,15 @@
 %D We store some original meanings, maybe in \type
 %D {math-ini}.
 
+\let\normalat             \at
 \let\normalin             \in
+\let\normalfrom           \from
 \let\normalover           \over
+\let\normalabout          \about
+
 \let\normalabove          \above
 \let\normalatop           \atop
+
 \let\normaloverwithdelims \overwithdelims
 \let\normalabovewithdelims\abovewithdelims
 \let\normalatopwithdelims \atopwithdelims
@@ -267,4 +302,4 @@
 \let\startlayoutcomponent\gobbletwoarguments
 \let\stoplayoutcomponent \relax
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput