10 files changed, 75 insertions, 4 deletions

diff --git a/metapost/context/base/mp-mlib.mpiv b/metapost/context/base/mp-mlib.mpiv
index e768efaec..81b09d6dc 100644
--- a/metapost/context/base/mp-mlib.mpiv
+++ b/metapost/context/base/mp-mlib.mpiv
@@ -264,6 +264,37 @@ vardef installlabel@# (expr type, x, y, offset) =
     numeric labyf  @# ; labyf  @# := y ;
 enddef ;
 
+% we save the plain variant
+
+vardef plain_thelabel@#(expr p,z) =
+    if string p :
+        plain_thelabel@#(rawtextext("\definedfont[" & defaultfont & "]" & p) scaled defaultscale,z)
+    else :
+        p shifted (z + labeloffset*laboff@# - (labxf@#*lrcorner p + labyf@#*ulcorner p + (1-labxf@#-labyf@#)*llcorner p))
+    fi
+enddef;
+
+def plain_label = % takes two arguments, contrary to textext that takes one
+    draw plain_thelabel
+enddef ;
+
+let mfun_label    = label ;
+let mfun_thelabel = thelabel ;
+
+def useplainlabels =
+    let label    = plain_label ;
+    let thelabel = plain_thelabel ;
+enddef ;
+
+def usemetafunlabels =
+    let label    = mfun_label ;
+    let thelabel = mfun_thelabel ;
+enddef ;
+
+plain_compatibity_data := plain_compatibity_data & "save label, thelabel ;" & "useplainlabels ;" ;
+
+% next comes own own:
+
 vardef thetextext@#(expr p,z) =
   % interim labeloffset := textextoffset ;
     if string p :
diff --git a/metapost/context/base/mp-tool.mpii b/metapost/context/base/mp-tool.mpii
index 8ec3fab9d..2819a1f66 100644
--- a/metapost/context/base/mp-tool.mpii
+++ b/metapost/context/base/mp-tool.mpii
@@ -98,6 +98,19 @@ vardef ddecimal primary p =
   decimal xpart p & " " & decimal ypart p
 enddef ;
 
+%D Plain compatibility
+
+string plain_compatibity_data ; plain_compatibity_data := "" ;
+
+def startplaincompatibity =
+    begingroup ;
+    scantokens plain_compatibity_data ;
+enddef ;
+
+def stopplaincompatibity =
+    endgroup ;
+enddef ;
+
 % is now built in
 
 % extra_endfig := extra_endfig
diff --git a/metapost/context/base/mp-tool.mpiv b/metapost/context/base/mp-tool.mpiv
index 10549468f..b47f5e8bf 100644
--- a/metapost/context/base/mp-tool.mpiv
+++ b/metapost/context/base/mp-tool.mpiv
@@ -64,6 +64,19 @@ vardef ddecimal primary p =
     decimal xpart p & " " & decimal ypart p
 enddef ;
 
+%D Plain compatibility:
+
+string plain_compatibity_data ; plain_compatibity_data := "" ;
+
+def startplaincompatibity =
+    begingroup ;
+    scantokens plain_compatibity_data ;
+enddef ;
+
+def stopplaincompatibity =
+    endgroup ;
+enddef ;
+
 %D Colors:
 
 newinternal nocolormodel   ; nocolormodel   := 1 ;
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index c10ef048d..418ff8293 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{2013.08.24 01:32}
+\newcontextversion{2013.08.24 02:40}
 
 %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 c72b89b9b..70d529c27 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 68f642e5d..21a921565 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -25,7 +25,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2013.08.24 01:32}
+\edef\contextversion{2013.08.24 02:40}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/node-tra.lua b/tex/context/base/node-tra.lua
index bfdfa543b..b5187e0f6 100644
--- a/tex/context/base/node-tra.lua
+++ b/tex/context/base/node-tra.lua
@@ -571,3 +571,17 @@ end
 function tracers.rule(w,h,d,c,s) -- so some day we can consider using literals (speedup)
     return setproperties(new_rule(w,h,d),c,s)
 end
+
+-- only nodes
+
+local nodestracerpool = { }
+
+tracers.pool = {
+    nodes = nodesstracerpool,
+}
+
+function nodestracerpool.rule(w,h,d,c,s) -- so some day we can consider using literals (speedup)
+    return setproperties(new_rule(w,h,d),c,s)
+end
+
+tracers.rule = nodestracerpool.rule -- for a while
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 97db9541d..465874628 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/status-lua.log b/tex/context/base/status-lua.log
index 6c4402221..4baba1ddb 100644
--- a/tex/context/base/status-lua.log
+++ b/tex/context/base/status-lua.log
@@ -1,6 +1,6 @@
 (cont-yes.mkiv
 
-ConTeXt  ver: 2013.08.24 01:32 MKIV beta  fmt: 2013.8.24  int: english/english
+ConTeXt  ver: 2013.08.24 02:40 MKIV beta  fmt: 2013.8.24  int: english/english
 
 system          > 'cont-new.mkiv' loaded
 (cont-new.mkiv)
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 6662c0a79..c8aaf7959 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  : 08/24/13 01:32:53
+-- merge date  : 08/24/13 02:40:47
 
 do -- begin closure to overcome local limits and interference