From 86bfea5faac983d15c47eec27f43ec56e75c69ef Mon Sep 17 00:00:00 2001
From: Hans Hagen <pragma@wxs.nl>
Date: Fri, 8 Jun 2018 10:23:49 +0200
Subject: 2018-06-08 09:38:00

---
 tex/context/base/mkiv/meta-ini.mkiv | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

(limited to 'tex/context/base/mkiv/meta-ini.mkiv')

diff --git a/tex/context/base/mkiv/meta-ini.mkiv b/tex/context/base/mkiv/meta-ini.mkiv
index 00010f52a..63e9542b8 100644
--- a/tex/context/base/mkiv/meta-ini.mkiv
+++ b/tex/context/base/mkiv/meta-ini.mkiv
@@ -211,6 +211,7 @@
 \def\currentMPformat     {\currentMPinstance}
 
 \defineMPinstance[metafun]    [\s!format=metafun,\s!extensions=\v!yes,\s!initializations=\v!yes]
+\defineMPinstance[minifun]    [\s!format=minifun]
 \defineMPinstance[extrafun]   [\s!format=metafun,\s!extensions=\v!yes,\s!initializations=\v!yes]
 \defineMPinstance[lessfun]    [\s!format=metafun]
 \defineMPinstance[doublefun]  [\s!format=metafun,\s!extensions=\v!yes,\s!initializations=\v!yes,\c!method=\s!double]
@@ -275,11 +276,13 @@
    \endgroup}
 
 \def\meta_process_graphic_start
-  {\setbox\b_meta_graphic\hpack\bgroup}
+  {\pushMPboundingbox
+   \setbox\b_meta_graphic\hpack\bgroup}
 
 \def\meta_process_graphic_stop
   {\egroup
-   \meta_place_graphic}
+   \meta_place_graphic
+   \popMPboundingbox}
 
 \unexpanded\def\meta_process_graphic_instance#1%
   {\edef\currentMPinstance{#1}%
@@ -785,11 +788,28 @@
 \unexpanded\def\useMPgraphic
   {\dodoublegroupempty\meta_use_graphic}
 
+% \def\meta_use_graphic#1#2%
+%   {\meta_begin_graphic_group{#1}%
+%   %\doifsomething{#2}{\setupMPvariables[\currentMPgraphicname][#2]}%
+%    \doifsomething{#2}{\setupMPvariables[#1][#2]}%
+%    \csname\??mpgraphic#1\endcsname\empty
+%    \meta_end_graphic_group}
+
 \def\meta_use_graphic#1#2%
   {\meta_begin_graphic_group{#1}%
-%    \doifsomething{#2}{\setupMPvariables[\currentMPgraphicname][#2]}%
-   \doifsomething{#2}{\setupMPvariables[#1][#2]}%
-   \csname\??mpgraphic#1\endcsname\empty
+   \ifcsname\??mpgraphic#1\endcsname
+     \edef\usedMPgraphicname{#1}%
+   \else\ifcsname\??mpgraphic\currentMPgraphicname\endcsname
+     \let\usedMPgraphicname\currentMPgraphicname
+   \else
+     \let\usedMPgraphicname\empty
+   \fi\fi
+   \ifx\usedMPgraphicname\empty
+     % message
+   \else
+     \doifsomething{#2}{\setupMPvariables[\usedMPgraphicname][#2]}%
+     \csname\??mpgraphic\usedMPgraphicname\endcsname
+   \fi
    \meta_end_graphic_group}
 
 \let\reuseMPgraphic   \useMPgraphic   % we can save a setup here if needed
-- 
cgit v1.2.3