beta 2011.11.11 23:29

12 files changed, 74 insertions, 34 deletions

diff --git a/context/data/scite/scite-context-readme.pdf b/context/data/scite/scite-context-readme.pdf
index 6d17a6e90..32c9628b6 100644
--- a/context/data/scite/scite-context-readme.pdf
+++ b/context/data/scite/scite-context-readme.pdf
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index be2e2b1c0..33442ade1 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{2011.11.11 22:34}
+\newcontextversion{2011.11.11 23:29}
 
 %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 8f40c7498..103c44ec5 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{2011.11.11 22:34}
+\newcontextversion{2011.11.11 23:29}
 
 %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 0f5fb9aac..ca744df74 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 ee811fc26..3dae457c1 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 87728193e..403597759 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{2011.11.11 22:34}
+\edef\contextversion{2011.11.11 23:29}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 052710ebe..425092c6c 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2011.11.11 22:34}
+\edef\contextversion{2011.11.11 23:29}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/core-env.mkiv b/tex/context/base/core-env.mkiv
index 5b23ec121..b095008b5 100644
--- a/tex/context/base/core-env.mkiv
+++ b/tex/context/base/core-env.mkiv
@@ -166,17 +166,17 @@
 \def\dodoifnotmode
   {\docheckformode\gobbleoneargument\firstofoneargument}
 
-\long\unexpanded\def\dostartmode[#1]%
+\unexpanded\def\dostartmode[#1]%
   {\docheckformode\donothing\dostopmode{#1}}
 
-\long\def\dostartnotmode[#1]%
+\def\dostartnotmode[#1]%
   {\docheckformode\dostopnotmode\donothing{#1}}
 
 \unexpanded\def\stopmode   {} % no relax
 \unexpanded\def\stopnotmode{} % no relax
 
-\long\def\dostopmode   #1\stopmode   {}
-\long\def\dostopnotmode#1\stopnotmode{}
+\def\dostopmode   #1\stopmode   {}
+\def\dostopnotmode#1\stopnotmode{}
 
 \unexpanded\def\doifallmodeselse{\unprotect\dodoifallmodeselse}
 \unexpanded\def\doifallmodes    {\unprotect\dodoifallmodes}
@@ -193,17 +193,41 @@
 \def\dodoifnotallmodes
   {\docheckforallmodes\gobbleoneargument\firstofoneargument}
 
-\long\def\dostartallmodes[#1]%
+\def\dostartallmodes[#1]%
   {\docheckforallmodes\donothing\dostopallmodes{#1}}
 
-\long\def\dostartnotallmodes[#1]%
+\def\dostartnotallmodes[#1]%
   {\docheckforallmodes\dostopnotallmodes\donothing{#1}}
 
 \unexpanded\def\stopallmodes   {} % no relax
 \unexpanded\def\stopnotallmodes{} % no relax
 
-\long\def\dostopallmodes   #1\stopallmodes   {}
-\long\def\dostopnotallmodes#1\stopnotallmodes{}
+\def\dostopallmodes   #1\stopallmodes   {}
+\def\dostopnotallmodes#1\stopnotallmodes{}
+
+%D Pushing/popping:
+
+\unexpanded\def\pushmode[#1]%
+  {\ifcsname\@mode@#1\endcsname\else\donewmode{#1}\fi
+   \expandafter\edef\csname\@mode@:#1\endcsname{\number\csname\@mode@#1\endcsname}%
+   \expandafter\pushmacro\csname\@mode@:#1\endcsname}
+
+\unexpanded\def\popmode[#1]%
+  {\ifcsname\@mode@:#1\endcsname
+     \expandafter\popmacro\csname\@mode@:#1\endcsname
+     \csname\@mode@#1\endcsname\csname\@mode@:#1\endcsname\relax
+   \fi}
+
+\def\pushsystemmode#1%
+  {\ifcsname\@mode@\systemmodeprefix#1\endcsname\else\donewmode{\systemmodeprefix#1}\fi
+   \expandafter\edef\csname\@mode@:\systemmodeprefix#1\endcsname{\number\csname\@mode@\systemmodeprefix#1\endcsname}%
+   \expandafter\pushmacro\csname\@mode@:\systemmodeprefix#1\endcsname}
+
+\def\resetsystemmode#1%
+  {\ifcsname\@mode@:\systemmodeprefix#1\endcsname
+     \expandafter\popmacro\csname\@mode@:\systemmodeprefix#1\endcsname
+     \csname\@mode@\systemmodeprefix#1\endcsname\csname\@mode@:\systemmodeprefix#1\endcsname\relax
+   \fi}
 
 %D Lets now set a mode:
 
@@ -215,7 +239,7 @@
 \unexpanded\def\stopsetups {} % to please dep checker
 
 \expanded % will become obsolete
-  {\long\def\@EA\noexpand\csname\e!start\v!setups\endcsname
+  {\def\@EA\noexpand\csname\e!start\v!setups\endcsname
      {\begingroup\noexpand\doifnextoptionalelse
         {\noexpand\dostartsetupsA\@EA\noexpand\csname\e!stop\v!setups\endcsname}
         {\noexpand\dostartsetupsB\@EA\noexpand\csname\e!stop\v!setups\endcsname}}}
@@ -347,11 +371,11 @@
 \let\stoplocalsetups            \relax
 \let\stopsetups                 \relax
 
-\def\dodostartluasetups   #1#2#3\stopluasetups  {\endgroup\dodoglobal\long\@EA\def\csname\??su#1:#2\@EA\endcsname\@EA##\@EA1\@EA{#3}}
-\def\dodostartxmlsetups   #1#2#3\stopxmlsetups  {\endgroup\dodoglobal\long\@EA\def\csname\??su#1:#2\@EA\endcsname\@EA##\@EA1\@EA{#3}}
-\def\dodostartrawsetups   #1#2#3\stoprawsetups  {\endgroup\dodoglobal\long\@EA\def\csname\??su#1:#2\@EA\endcsname\@EA##\@EA1\@EA{#3}}
-\def\dodostartlocalsetups #1#2#3\stoplocalsetups{\endgroup\dodoglobal\long\@EA\def\csname\??su#1:#2\@EA\endcsname\@EA##\@EA1\@EA{#3}}
-\def\dodostartsetups      #1#2#3\stopsetups     {\endgroup\dodoglobal\long\@EA\def\csname\??su#1:#2\@EA\endcsname\@EA##\@EA1\@EA{#3}}
+\def\dodostartluasetups   #1#2#3\stopluasetups  {\endgroup\dodoglobal\@EA\def\csname\??su#1:#2\@EA\endcsname\@EA##\@EA1\@EA{#3}}
+\def\dodostartxmlsetups   #1#2#3\stopxmlsetups  {\endgroup\dodoglobal\@EA\def\csname\??su#1:#2\@EA\endcsname\@EA##\@EA1\@EA{#3}}
+\def\dodostartrawsetups   #1#2#3\stoprawsetups  {\endgroup\dodoglobal\@EA\def\csname\??su#1:#2\@EA\endcsname\@EA##\@EA1\@EA{#3}}
+\def\dodostartlocalsetups #1#2#3\stoplocalsetups{\endgroup\dodoglobal\@EA\def\csname\??su#1:#2\@EA\endcsname\@EA##\@EA1\@EA{#3}}
+\def\dodostartsetups      #1#2#3\stopsetups     {\endgroup\dodoglobal\@EA\def\csname\??su#1:#2\@EA\endcsname\@EA##\@EA1\@EA{#3}}
 
 \def\dostartluasetups           {\ifsecondargument\@EA\dostartluasetupsC  \else\@EA\dostartluasetupsD  \fi}
 \def\dostartxmlsetups           {\ifsecondargument\@EA\dostartxmlsetupsC  \else\@EA\dostartxmlsetupsD  \fi}
@@ -434,10 +458,10 @@
       \popmacro\currentvariableclass}%
    \errorisfatalfalse}
 
-\unexpanded\def\setvariable #1#2#3{\long\expandafter\def \csname\??vars:#1:#2\endcsname{#3}}
-\unexpanded\def\setevariable#1#2#3{\long\expandafter\edef\csname\??vars:#1:#2\endcsname{#3}}
-\unexpanded\def\setgvariable#1#2#3{\long\expandafter\gdef\csname\??vars:#1:#2\endcsname{#3}}
-\unexpanded\def\setxvariable#1#2#3{\long\expandafter\xdef\csname\??vars:#1:#2\endcsname{#3}}
+\unexpanded\def\setvariable #1#2#3{\expandafter\def \csname\??vars:#1:#2\endcsname{#3}}
+\unexpanded\def\setevariable#1#2#3{\expandafter\edef\csname\??vars:#1:#2\endcsname{#3}}
+\unexpanded\def\setgvariable#1#2#3{\expandafter\gdef\csname\??vars:#1:#2\endcsname{#3}}
+\unexpanded\def\setxvariable#1#2#3{\expandafter\xdef\csname\??vars:#1:#2\endcsname{#3}}
 
 \def\getvariable#1#2%
   {\csname
@@ -460,14 +484,14 @@
 \def\docheckvariables
   {\dogetparameters\docheckrawvalue}
 
-\long\def\docheckrawvalue#1#2#3%
+\def\docheckrawvalue#1#2#3%
   {\ifcsname\??vars:#1:#2\endcsname
      \edef\checkedrawvalue{\csname\??vars:#1:#2\endcsname}%
      \ifx\checkedrawvalue\empty
-       \long\expandafter\def\csname\??vars:#1:#2\endcsname{#3}%
+       \expandafter\def\csname\??vars:#1:#2\endcsname{#3}%
      \fi
    \else
-     \long\expandafter\def\csname\??vars:#1:#2\endcsname{#3}%
+     \expandafter\def\csname\??vars:#1:#2\endcsname{#3}%
    \fi}
 
 %D \macros
diff --git a/tex/context/base/file-job.mkvi b/tex/context/base/file-job.mkvi
index 143f96cad..8e6f1c41e 100644
--- a/tex/context/base/file-job.mkvi
+++ b/tex/context/base/file-job.mkvi
@@ -206,34 +206,50 @@
 
 %D Wrappers (the signal is a synchronization with lua hack):
 
+\newsystemmode\v!project
+\newsystemmode\v!product
+\newsystemmode\v!component
+\newsystemmode\v!environment
+
 \def\startprojectindeed
-  {\starttext}
+  {\starttext
+   \pushsystemmode\v!project
+   \setsystemmode\v!project}
 
 \def\stopprojectindeed
-  {\stoptext
+  {\popsystemmode\v!project
+   \stoptext
    \signalendofinput\v!project}
 
 \def\startproductindeed
-  {\starttext}
+  {\starttext
+   \pushsystemmode\v!product
+   \setsystemmode\v!product}
 
 \def\stopproductindeed
-  {\stoptext
+  {\popsystemmode\v!product
+   \stoptext
    \signalendofinput\v!product}
 
 \def\startcomponentindeed
   {\starttext
-   \pushreferenceprefix\currentcomponent}
+   \pushreferenceprefix\currentcomponent
+   \pushsystemmode\v!component
+   \setsystemmode\v!component}
 
 \def\stopcomponentindeed
-  {\popreferenceprefix
+  {\popsystemmode\v!component
+   \popreferenceprefix
    \stoptext
    \signalendofinput\v!component}
 
 \def\startenvironmentindeed
-  {}
+  {\pushsystemmode\v!environment
+   \setsystemmode\v!environment}
 
 \def\stopenvironmentindeed
-  {\signalendofinput\v!environment}
+  {\popsystemmode\v!environment
+   \signalendofinput\v!environment}
 
 %D Relatively new (might move as it depends on setups):
 
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 7a047a26d..52b0fad05 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 784c4e2d8..e6cee730c 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 033e0af0a..da0ef8f2e 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  : 11/11/11 22:34:24
+-- merge date  : 11/11/11 23:29:01
 
 do -- begin closure to overcome local limits and interference