2021-02-19 13:15:00

3 files changed, 43 insertions, 24 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