17 files changed, 60 insertions, 39 deletions
diff --git a/doc/context/sources/general/manuals/metafun/metafun-effects.tex b/doc/context/sources/general/manuals/metafun/metafun-effects.tex
index f87334b3e..d63b36bfa 100644
--- a/doc/context/sources/general/manuals/metafun/metafun-effects.tex
+++ b/doc/context/sources/general/manuals/metafun/metafun-effects.tex
@@ -1472,8 +1472,8 @@ graphics in \PNG, \PDF, and \JPG\ format, or more precise: those formats
 supported by \PDFTEX.\pagereference[hacker]
 
 \startbuffer
-draw externalfigure "hacker.png" scaled 5cm shifted (-6cm,0) ;
-draw externalfigure "hacker.png" scaled 5cm slanted .5 ;
+draw externalfigure "hacker.png" xsized 5cm shifted (-6cm,0) ;
+draw externalfigure "hacker.png" xsized 5cm slanted .5 ;
 \stopbuffer
 
 \typebuffer
@@ -1497,7 +1497,7 @@ for i := 1 upto 5 :
   c := .5(s,s) ;                      % center of picture
   d := (2cm*i,.5cm) randomized .5cm ; % displacement
   draw externalfigure "hacker.png"
-    scaled s rotatedaround (c,0 randomized 30) shifted d ;
+    ysized s rotatedaround (c,0 randomized 30) shifted d ;
 endfor ;
 \stopbuffer
 
@@ -1516,7 +1516,7 @@ figure inclusion and shading.
 
 \startbuffer
 picture p ;
-p := externalfigure "hacker.png" scaled 150pt ;
+p := externalfigure "hacker.png" xsized 150pt ;
 clip p to unitcircle scaled 150pt ;
 circular_shade(boundingbox p enlarged 10pt, 0, .2red, .9red) ;
 addto currentpicture also p ;
diff --git a/doc/context/sources/general/manuals/metafun/metafun-environment.tex b/doc/context/sources/general/manuals/metafun/metafun-environment.tex
index ca9fc24b3..20b6920f9 100644
--- a/doc/context/sources/general/manuals/metafun/metafun-environment.tex
+++ b/doc/context/sources/general/manuals/metafun/metafun-environment.tex
@@ -182,24 +182,50 @@
 
 \defineoverlay[titled][\uniqueMPgraphic{titled}]
 
+% \starttexdefinition unexpanded ChapterCommand #1#2
+%     \ifconditional\headshownumber
+%         \ifdim\leftmarginwidth<\rightmarginwidth
+%           \donetrue
+%         \else
+%           \donefalse
+%         \fi
+%         \hskip-\ifdone\leftmargintotal\else\rightmargintotal\fi
+%         \framed [
+%             background=titled,
+%             frame=off,
+%             offset=0pt
+%         ] {
+%             \hbox to \ifdone\leftmarginwidth\else\rightmarginwidth\fi {
+%                 #1
+%                 \hss
+%             }
+%             \hskip\ifdone\leftmargindistance\else\rightmargindistance\fi
+%             #2
+%         }
+%     \else
+%         \framed [
+%             background=titled,
+%             frame=off,
+%             offset=0pt
+%         ] {
+%             #2
+%         }
+%     \fi
+% \stoptexdefinition
+
 \starttexdefinition unexpanded ChapterCommand #1#2
     \ifconditional\headshownumber
-        \ifdim\leftmarginwidth<\rightmarginwidth
-          \donetrue
-        \else
-          \donefalse
-        \fi
-        \hskip-\ifdone\leftmargintotal\else\rightmargintotal\fi
+        \hskip-\leftmargintotal\relax
         \framed [
             background=titled,
             frame=off,
             offset=0pt
         ] {
-            \hbox to \ifdone\leftmarginwidth\else\rightmarginwidth\fi {
+            \hbox to \leftmarginwidth {
                 #1
                 \hss
             }
-            \hskip\ifdone\leftmargindistance\else\rightmargindistance\fi
+            \hskip\leftmargindistance\relax
             #2
         }
     \else
diff --git a/doc/context/sources/general/manuals/metafun/metafun.tex b/doc/context/sources/general/manuals/metafun/metafun.tex
index 8a75be464..963d1fad0 100644
--- a/doc/context/sources/general/manuals/metafun/metafun.tex
+++ b/doc/context/sources/general/manuals/metafun/metafun.tex
@@ -30,24 +30,17 @@
 %             it's actually meant to be read on paper.
 %
 % comment   : Before I started updating the manual to lmtx (luametafun) I made sure that it
-%             processed okay in the february version of lmtx. The runtime for 446 pages is
-%             below 18 seconds and with compact fonts we gain half a second. So we can safely
-%             conclude that we're not worse off wrt performance. (I used the same machine.)
+%             processed okay in the february 2021 version of lmtx. The runtime for 448 pages
+%             (which is 20 more than the previous test) is some 16.5 seconds (just below 16
+%             with compact fonts). So we can safely conclude that we're not worse off with
+%             respect to performance. (I use the same machine.)
 
-% \enabledirectives[hyphenator.optimize]
-% \enabledirectives[hyphenator.flatten]
-% \setuphyphenation[method=traditional]
-
-% \enabletrackers[*defin*]
-
-% \enableexperiments[fonts.compact]
+\enableexperiments[fonts.compact]
 
 % \enablemode[screen]
 \enablemode[print]
 % \enablemode[book]
 
-% \usemodule[luacalls]
-
 % todo: check startintro .. stopintro each chapter
 
 % \showframe
diff --git a/metapost/context/base/mpxl/mp-grph.mpxl b/metapost/context/base/mpxl/mp-grph.mpxl
index 4826e4540..8517293aa 100644
--- a/metapost/context/base/mpxl/mp-grph.mpxl
+++ b/metapost/context/base/mpxl/mp-grph.mpxl
@@ -84,6 +84,7 @@ def loadfigure primary filename =
 enddef ;
 
 def mfun_load_figure (expr filename) text figureattributes =
+    mutable beginfig, endfig ;
     begingroup ;
     save figurenumber, figurepicture, number, fixedplace ;
     numeric figurenumber  ; figurenumber := 0 ;
@@ -114,6 +115,7 @@ def mfun_load_figure (expr filename) text figureattributes =
     addto figurepicture also currentpicture figureattributes ;
     currentpicture := figurepicture  ;
     endgroup ;
+    permanent beginfig, endfig ;
 enddef ;
 
 % We only use the new method now.
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index dd2121312..95611a807 100644
--- a/tex/context/base/mkii/cont-new.mkii
+++ b/tex/context/base/mkii/cont-new.mkii
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2021.02.18 10:21}
+\newcontextversion{2021.02.19 13:12}
 
 %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/mkii/context.mkii b/tex/context/base/mkii/context.mkii
index d35333376..480c9e057 100644
--- a/tex/context/base/mkii/context.mkii
+++ b/tex/context/base/mkii/context.mkii
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2021.02.18 10:21}
+\edef\contextversion{2021.02.19 13:12}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 8c5bfa011..3d6999949 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -13,7 +13,7 @@
 
 % \normalend % uncomment this to get the real base runtime
 
-\newcontextversion{2021.02.18 10:21}
+\newcontextversion{2021.02.19 13:12}
 
 %D This file is loaded at runtime, thereby providing an excellent place for hacks,
 %D patches, extensions and new features. There can be local overloads in cont-loc
diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index 219c00255..cc0f38fe2 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -45,7 +45,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2021.02.18 10:21}
+\edef\contextversion{2021.02.19 13:12}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/meta-fig.mkiv b/tex/context/base/mkiv/meta-fig.mkiv
index e89cb1442..d18adc927 100644
--- a/tex/context/base/mkiv/meta-fig.mkiv
+++ b/tex/context/base/mkiv/meta-fig.mkiv
@@ -65,8 +65,8 @@
    \getfiguredimensions[#1]% [\c!object=\v!no] already set
    \startMPcode
      draw externalfigure "#1"
-       xscaled \the\dimexpr\figurewidth \relax\space % must be points
-       yscaled \the\dimexpr\figureheight\relax\space % must be points
+       xsized \the\dimexpr\figurewidth \relax\space % must be points
+       ysized \the\dimexpr\figureheight\relax\space % must be points
        #2 ;
    \stopMPcode
    \egroup}
diff --git a/tex/context/base/mkiv/mlib-ctx.lua b/tex/context/base/mkiv/mlib-ctx.lua
index a95359b93..24b02f6f6 100644
--- a/tex/context/base/mkiv/mlib-ctx.lua
+++ b/tex/context/base/mkiv/mlib-ctx.lua
@@ -266,10 +266,10 @@ function metapost.getclippath(specification) -- why not a special instance for t
             result = metapost.filterclippath(result)
         end
         stoptiming(metapost)
-        metapost.pushformat()
+        metapost.popformat()
         return result
     else
-        metapost.pushformat()
+        metapost.popformat()
     end
 end
 
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 2e5da9719..3ee668ec7 100644
--- a/tex/context/base/mkiv/status-files.pdf
+++ b/tex/context/base/mkiv/status-files.pdf
diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
index dbed8e590..0b767e574 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/base/mkxl/cont-new.mkxl b/tex/context/base/mkxl/cont-new.mkxl
index 6f7a14b13..e46b5df44 100644
--- a/tex/context/base/mkxl/cont-new.mkxl
+++ b/tex/context/base/mkxl/cont-new.mkxl
@@ -13,7 +13,7 @@
 
 % \normalend % uncomment this to get the real base runtime
 
-\newcontextversion{2021.02.18 10:21}
+\newcontextversion{2021.02.19 13:12}
 
 %D This file is loaded at runtime, thereby providing an excellent place for hacks,
 %D patches, extensions and new features. There can be local overloads in cont-loc
diff --git a/tex/context/base/mkxl/context.mkxl b/tex/context/base/mkxl/context.mkxl
index 89cf5654a..66be150ef 100644
--- a/tex/context/base/mkxl/context.mkxl
+++ b/tex/context/base/mkxl/context.mkxl
@@ -29,7 +29,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \immutable\edef\contextformat {\jobname}
-\immutable\edef\contextversion{2021.02.18 10:21}
+\immutable\edef\contextversion{2021.02.19 13:12}
 
 %overloadmode 1 % check frozen / warning
 %overloadmode 2 % check frozen / error
diff --git a/tex/context/base/mkxl/meta-fig.mkxl b/tex/context/base/mkxl/meta-fig.mkxl
index 4999bc4b2..b8a22f6fe 100644
--- a/tex/context/base/mkxl/meta-fig.mkxl
+++ b/tex/context/base/mkxl/meta-fig.mkxl
@@ -60,8 +60,8 @@
    \getfiguredimensions[#1]% [\c!object=\v!no] already set
    \startMPcode
      draw externalfigure "#1"
-       xscaled \the\dimexpr\figurewidth \relax\space % must be points
-       yscaled \the\dimexpr\figureheight\relax\space % must be points
+       xsized \the\dimexpr\figurewidth \relax\space % must be points
+       ysized \the\dimexpr\figureheight\relax\space % must be points
        #2 ;
    \stopMPcode
    \egroup}
diff --git a/tex/context/base/mkxl/mlib-ctx.lmt b/tex/context/base/mkxl/mlib-ctx.lmt
index a95359b93..24b02f6f6 100644
--- a/tex/context/base/mkxl/mlib-ctx.lmt
+++ b/tex/context/base/mkxl/mlib-ctx.lmt
@@ -266,10 +266,10 @@ function metapost.getclippath(specification) -- why not a special instance for t
             result = metapost.filterclippath(result)
         end
         stoptiming(metapost)
-        metapost.pushformat()
+        metapost.popformat()
         return result
     else
-        metapost.pushformat()
+        metapost.popformat()
     end
 end
 
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 86b9a07f8..f15be4bf6 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 : c:/data/develop/context/sources/luatex-fonts-merged.lua
 -- parent file : c:/data/develop/context/sources/luatex-fonts.lua
--- merge date  : 2021-02-18 10:21
+-- merge date  : 2021-02-19 13:12
 
 do -- begin closure to overcome local limits and interference