beta 2012.12.03 20:57

13 files changed, 26 insertions, 7 deletions

diff --git a/tex/context/base/chem-str.lua b/tex/context/base/chem-str.lua
index 8c154cc36..0ca82d2e1 100644
--- a/tex/context/base/chem-str.lua
+++ b/tex/context/base/chem-str.lua
@@ -577,7 +577,11 @@ function chemistry.stop()
     if trace_metapost then
         report_chemistry("metapost code:\n%s", mpcode)
     end
+    if metapost.instance(chemistry.instance) then
+        t_initialize = ""
+    end
     metapost.graphic(chemistry.instance,chemistry.format,mpcode,"","",t_initialize)
+    t_initialize = ""
     metacode = nil
 end
 
diff --git a/tex/context/base/chem-str.mkiv b/tex/context/base/chem-str.mkiv
index 0fc2a2bee..a2b0f135f 100644
--- a/tex/context/base/chem-str.mkiv
+++ b/tex/context/base/chem-str.mkiv
@@ -62,6 +62,15 @@
 %D a historical and practical reason (like shared keys with different meaning
 %D that could clash, e.g.\ align).
 
+
+\defineMPinstance
+  [chemistry]
+  [\s!format=metafun]
+
+\startMPdefinitions{chemistry}
+    input mp-chem.mpiv ;
+\stopMPdefinitions
+
 \defineframed
   [\??chemicalframed]
   [\c!align=\v!normal,
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index dfa0c04a8..35dbc92d2 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.12.03 20:04}
+\newcontextversion{2012.12.03 20:57}
 
 %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 94c45f8f3..e294d9e0a 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.12.03 20:04}
+\newcontextversion{2012.12.03 20:57}
 
 %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 4f4f7a4d8..92465ce97 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 bb7d07636..86464708b 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 e052354aa..a5fcad1af 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.12.03 20:04}
+\edef\contextversion{2012.12.03 20:57}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 01f8969fe..c1480397d 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{2012.12.03 20:04}
+\edef\contextversion{2012.12.03 20:57}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/meta-ini.mkiv b/tex/context/base/meta-ini.mkiv
index e81206cd1..55080c78c 100644
--- a/tex/context/base/meta-ini.mkiv
+++ b/tex/context/base/meta-ini.mkiv
@@ -122,9 +122,11 @@
    \ifx\currentMPgraphicname\empty
      \edef\currentMPgraphicname{#1}%
      \let\currentMPinstance\defaultMPinstance
-   \else
+   \else\ifcsname\??mpinstancetokens#1\endcsname
      \edef\currentMPinstance{#1}%
-   \fi
+   \else
+     \let\currentMPinstance\defaultMPinstance
+   \fi\fi
    \edef\currentMPformat{\MPinstanceparameter\s!format}}
 
 \def\currentMPinstance{\defaultMPinstance}
diff --git a/tex/context/base/mlib-run.lua b/tex/context/base/mlib-run.lua
index 25e74790a..62203e95e 100644
--- a/tex/context/base/mlib-run.lua
+++ b/tex/context/base/mlib-run.lua
@@ -354,6 +354,10 @@ function metapost.format(instance,name)
     return mpx
 end
 
+function metapost.instance(instance)
+    return mpxformats[instance]
+end
+
 function metapost.reset(mpx)
     if not mpx then
         -- nothing
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 905dd140f..5b7000428 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 cdc59418d..f7d44e59f 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 e2bf1f807..5ff674552 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  : 12/03/12 20:04:01
+-- merge date  : 12/03/12 20:57:03
 
 do -- begin closure to overcome local limits and interference