1 files changed, 12 insertions, 5 deletions
diff --git a/tex/context/modules/mkiv/m-chart.lua b/tex/context/modules/mkiv/m-chart.lua
index bcf80bdfc..cde563fb3 100644
--- a/tex/context/modules/mkiv/m-chart.lua
+++ b/tex/context/modules/mkiv/m-chart.lua
@@ -926,18 +926,16 @@ local function getchart(settings,forced_x,forced_y,forced_nx,forced_ny)
     return chart
 end
 
-local function makechart(chart)
+local function makechart_indeed(chart)
     local settings      = chart.settings
     local chartsettings = settings.chart
     --
-    context.begingroup()
-    context.forgetall()
-    --
     local g = ctx_startgraphic {
         instance    = "metafun",
         format      = "metafun",
         method      = "scaled",
         definitions = "",
+        wrapped     = true,
     }
     --
     ctx_tographic(g,"if unknown context_flow : input mp-char.mpiv ; fi ;")
@@ -1012,7 +1010,16 @@ local function makechart(chart)
     ctx_tographic(g,"flow_end_chart ;")
     ctx_stopgraphic(g)
     --
-    context.endgroup()
+end
+
+-- We need to wrap because of tex.runtoks!
+
+local function makechart(chart)
+    context.hbox()
+    context.bgroup()
+    context.forgetall()
+    context(function() makechart_indeed(chart) end)
+    context.egroup()
 end
 
 local function splitchart(chart)