13 files changed, 21 insertions, 11 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 63801484d..be2e2b1c0 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.09 20:58}
+\newcontextversion{2011.11.11 22:34}
 
 %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 086e7b290..8f40c7498 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.09 20:58}
+\newcontextversion{2011.11.11 22:34}
 
 %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 f66c99244..0f5fb9aac 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 247bab76c..ee811fc26 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
diff --git a/tex/context/base/context.css b/tex/context/base/context.css
index 1214d2cef..8b27046bf 100644
--- a/tex/context/base/context.css
+++ b/tex/context/base/context.css
@@ -130,7 +130,7 @@ p, li {
 	font-size: 16px ;
 	border-style: none ;
 	border-width: 0 ;
-	background-color: <?lua pv('color-background-one')?> ;
+	background-color: <?lua pv('color-background-three')?> ;
 	_margin-left: -15px ;
 }
 #bottom {
@@ -163,7 +163,7 @@ p, li {
 	font-size: 16px ;
 	border-style: none ;
 	border-width: 0 ;
-	background-color: <?lua pv('color-background-two')?> ;
+	background-color: <?lua pv('color-background-four')?> ;
 }
 #top-one {
 	position: absolute ;
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index 8c7f83f76..87728193e 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.09 20:58}
+\edef\contextversion{2011.11.11 22:34}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index f8ebb88ef..052710ebe 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.09 20:58}
+\edef\contextversion{2011.11.11 22:34}
 
 %D For those who want to use this:
 
@@ -82,8 +82,6 @@
 
 \loadmarkfile{cldf-ini}
 
-\nopdfcompression
-
 % From here on we have \unexpanded being \normalprotected, as we
 % already had \unexpanded long before etex came around.
 
diff --git a/tex/context/base/file-job.mkvi b/tex/context/base/file-job.mkvi
index 3c5a60c33..143f96cad 100644
--- a/tex/context/base/file-job.mkvi
+++ b/tex/context/base/file-job.mkvi
@@ -233,7 +233,7 @@
   {}
 
 \def\stopenvironmentindeed
-  {\signalendofinput\v!project}
+  {\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 a21e1d7ce..7a047a26d 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 34ff0d71b..784c4e2d8 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/trac-lmx.lua b/tex/context/base/trac-lmx.lua
index 8e7c60a37..452d03002 100644
--- a/tex/context/base/trac-lmx.lua
+++ b/tex/context/base/trac-lmx.lua
@@ -38,6 +38,9 @@ lmxvariables['color-background-main']   = '#3F3F3F'
 lmxvariables['color-background-one']    = lmxvariables['color-background-green']
 lmxvariables['color-background-two']    = lmxvariables['color-background-blue']
 
+lmxvariables['color-background-three']  = function() return lmxvariables['color-background-one'] end
+lmxvariables['color-background-four']   = function() return lmxvariables['color-background-two'] end
+
 function lmx.set(key, value)
     lmxvariables[key] = value
 end
@@ -74,7 +77,12 @@ local function do_type(str)
 end
 
 local function do_variable(str)
-    return variables[str] or lmxvariables[str] -- or format("<!-- unset lmx instance variable: %s -->",str or "?")
+    local value = variables[str] or lmxvariables[str] -- or format("<!-- unset lmx instance variable: %s -->",str or "?")
+    if type(value) == "function" then
+        return value(str)
+    else
+        return value
+    end
 end
 
 function lmx.loadedfile(name)
diff --git a/tex/context/base/util-sto.lua b/tex/context/base/util-sto.lua
index 052e472cf..42ee6cf00 100644
--- a/tex/context/base/util-sto.lua
+++ b/tex/context/base/util-sto.lua
@@ -125,6 +125,7 @@ function table.setmetatableindex(t,f)
             setmetatable(t,{ __index = f })
         end
     end
+    return t
 end
 
 function table.setmetatablenewindex(t,f)
@@ -142,6 +143,7 @@ function table.setmetatablenewindex(t,f)
             setmetatable(t,{ __newindex = f })
         end
     end
+    return t
 end
 
 function table.setmetatablecall(t,f)
@@ -151,6 +153,7 @@ function table.setmetatablecall(t,f)
     else
         setmetatable(t,{ __call = f })
     end
+    return t
 end
 
 function table.setmetatablekey(t,key,value)
@@ -160,6 +163,7 @@ function table.setmetatablekey(t,key,value)
         setmetatable(t,m)
     end
     m[key] = value
+    return t
 end
 
 function table.getmetatablekey(t,key,value)
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 7c5c03b8a..033e0af0a 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/09/11 20:58:06
+-- merge date  : 11/11/11 22:34:24
 
 do -- begin closure to overcome local limits and interference