stable 2004.06.10

1 files changed, 258 insertions, 190 deletions

diff --git a/tex/context/base/supp-mps.tex b/tex/context/base/supp-mps.tex
index 80ff1fd6f..b36433be0 100644
--- a/tex/context/base/supp-mps.tex
+++ b/tex/context/base/supp-mps.tex
@@ -16,13 +16,13 @@
 %D integrate \METAPOST\ support int \CONTEXT.  We offer two
 %D tracks:
 %D
-%D \startopsomming
-%D \som generating \METAPOST\ code, running this program from
+%D \startitemize
+%D \item generating \METAPOST\ code, running this program from
 %D      within \TEX\ using \type{\write18}, and importing the
 %D      result
-%D \som generating \METAPOST\ code, processing the code
+%D \item generating \METAPOST\ code, processing the code
 %D      afterward, and importing the result in a second pass
-%D \stopopsomming
+%D \stopitemize
 %D
 %D The first approach uses a non standard \TEX\ feature,
 %D implemented in Web2c. I'm not going to discuss the pros and
@@ -30,9 +30,9 @@
 %D arguments against this can be overcome by implementing a
 %D \TEX\ worthy primitive:
 %D
-%D \starttypen
+%D \starttyping
 %D \excuteMetaPost filename
-%D \stoptypen
+%D \stoptyping
 %D
 %D Ok then, let's start:
 
@@ -56,17 +56,16 @@
 %D From within \TEX\ one can execute \METAPOST\ code by putting
 %D it between the two commands
 %D
-%D \starttypen
+%D \starttyping
 %D \startMPgraphic
 %D \stopMPgraphic
-%D \stoptypen
+%D \stoptyping
 %D
 %D This is implemented as:
 
 \long\def\startMPgraphic#1\stopMPgraphic
-  {\checkMPTEXgraphic{#1}% % potential speedup: pass #1 as macro
-   \startwritingMPgraphic
-   \writeMPgraphic{#1}%
+  {\startwritingMPgraphic
+   \writecheckedMPgraphic{#1}% % potential speedup: pass #1 as macro
    \stopwritingMPgraphic}
 
 %D \macros
@@ -76,15 +75,15 @@
 %D explictly generate a figure in terms of \type{beginfig} and
 %D \type{endfig}, we can use:
 %D
-%D \starttypen
+%D \starttyping
 %D \startMPgraphic
 %D \stopMPgraphic
-%D \stoptypen
+%D \stoptyping
 %D
-%D \starttypen
+%D \starttyping
 %D \startMPrun
 %D \stopMPrun
-%D \stoptypen
+%D \stoptyping
 %D
 %D The next booleans are for internal purposes only.
 
@@ -103,9 +102,8 @@
     {\bgroup
      \MPruntrue
      \doifsomething{#1}{\def\MPgraphicfile{#1}}%
-     \checkMPTEXgraphic{#2}%
      \startwritingMPgraphic
-     \writeMPgraphic{#2}%
+     \writecheckedMPgraphic{#2}%
      \stopwritingMPgraphic
      \egroup}
 
@@ -116,9 +114,8 @@
 
   \long\def\startMPrun#1\stopMPrun
     {\MPruntrue
-     \checkMPTEXgraphic{#1}%
      \startwritingMPgraphic
-     \writeMPgraphic{#1}%
+     \writecheckedMPgraphic{#1}%
      \stopwritingMPgraphic
      \MPrunfalse}
 
@@ -132,7 +129,7 @@
 %D If the writing process is divided into more steps, one can
 %D use the components of this macro directly.
 %D
-%D \starttypen
+%D \starttyping
 %D \startwritingMPgraphic
 %D ...
 %D \writeMPgraphic{...}
@@ -140,7 +137,7 @@
 %D \writeMPgraphic{...}
 %D ...
 %D \stopwritingMPgraphic
-%D \stoptypen
+%D \stoptyping
 
 %D \macros
 %D   {ifrunMPgraphics,ifrunMPTEXgraphics,ifinsertMPgraphics}
@@ -198,27 +195,21 @@
 %D One can include for instance common input commands by
 %D passing them to \type{\MPinclusions}:
 %D
-%D \starttypen
+%D \starttyping
 %D \MPinclusions{input mp-mine}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The token register \type {\MPinitializations} is expanded
-%D before all other inclusions.
+%D before all other inclusions, the extensions are expanded
+%D only once per run.
 
-\newtoks \MPinitializations
+\newtoks \MPinitializations % each graphic
+\newtoks \MPextensions      % once per run (can be multiple graphics)
 
-% buggy
-%
-% \long\def\startMPinclusions#1\stopMPinclusions
-%   {\long\def\theMPinclusions
-%      {% \expanded !
-%       \@EA\expanded\@EA{\@EA\writeMPgraphic\@EA{\the\MPinitializations;}}%
-%       \writeMPgraphic{#1}}}
-
-\long\def\startMPinclusions#1\stopMPinclusions
+\long\def\startMPinclusions#1\stopMPinclusions % document wide
   {\long\def\theMPinclusions
      {% \expanded !
-%      \@EA\expanded\@EA{\@EA\writeMPgraphic\@EA{\the\MPinitializations;}}%
+      \@EA\expanded\@EA{\@EA\writeMPgraphic\@EA{\the\MPextensions;}}% new
       \writeMPgraphic{#1}}}
 
 \long\def\MPinclusions#1%
@@ -249,52 +240,104 @@
    \edef\currentwidth     {\the\hsize       \space}%
    \edef\currentheight    {\the\vsize       \space}}
 
+% \def\writeMPgraphic % no big #1 passing here
+%   {\iflongMPlines
+%      \expandafter\writeMPgraphiclong
+%    \else
+%      \expandafter\writeMPgraphicshort
+%    \fi}
+
+%D The \type {;} aware method (the \type {\else} branch) also
+%D takes care of \type {btex}||\type {etex}, \type
+%D {verbatimtex}||\type {etex}. The space after \type {tex}
+%D is essential, since it protects \type {text}.
+
+\newif\ifMPTEXgraphic
+
 \def\writeMPgraphic % no big #1 passing here
   {\iflongMPlines
-     \expandafter\writeMPgraphiclong
+     \ifMPTEXgraphic
+       \@EAEAEA\writeMPgraphiclongT
+     \else
+       \@EAEAEA\writeMPgraphiclongN
+     \fi
    \else
-     \expandafter\writeMPgraphicshort
+     \ifMPTEXgraphic
+       \@EAEAEA\writeMPgraphicshortT
+     \else
+       \@EAEAEA\writeMPgraphicshortN
+     \fi
    \fi}
 
-\long\def\writeMPgraphiclong#1%
+\long\def\writeMPgraphiclongT#1%
   {\bgroup
-   \presetMPdefinitions
    \let\par\space
-   \longMPflush#1\empty\par\relax\par
+   \longMPflushT#1\empty\par\relax\par
    \egroup}
 
-\long\def\writeMPgraphicshort#1%
+\long\def\writeMPgraphicshortT#1%
   {\bgroup
-   \presetMPdefinitions
    \let\par\space
-   \shortMPflush#1\empty;\relax;%
+   \shortMPflushT#1\empty;\relax;%
    \egroup}
 
-\long\def\longMPflush#1#2\par
+\long\def\longMPflushT#1#2\par
   {\ifx#1\relax \else
-     \immediate\write\MPwrite{#1#2}%
-     \expandafter\longMPflush
+     \dowriteMPgraphicline#1#2tex \relax etex\MPend
+     \expandafter\longMPflushT
    \fi}
 
-\long\def\shortMPflush#1#2;%
+\long\def\shortMPflushT#1#2;%
   {\ifx#1\relax \else
      \dowriteMPgraphicline#1#2tex \relax etex\MPend
-     \expandafter\shortMPflush
+     \expandafter\shortMPflushT
    \fi}
 
-%D The \type {;} aware method (the \type {\else} branch) also
-%D takes care of \type {btex}||\type {etex}, \type
-%D {verbatimtex}||\type {etex}. The space after \type {tex}
-%D is essential, since it protects \type {text}.
+\long\def\writeMPgraphiclongN#1%
+  {\bgroup
+   \let\par\space
+   \longMPflushN#1\empty\par\relax\par
+   \egroup}
 
-\newif\ifMPTEXgraphic
+\long\def\writeMPgraphicshortN#1%
+  {\bgroup
+   \let\par\space
+   \shortMPflushN#1\empty;\relax;%
+   \egroup}
+
+\long\def\longMPflushN#1#2\par
+  {\ifx#1\relax \else
+     \nowriteMPgraphicline#1#2\MPend
+     \expandafter\longMPflushN
+   \fi}
+
+\long\def\shortMPflushN#1#2;%
+  {\ifx#1\relax \else
+     \nowriteMPgraphicline#1#2\MPend
+     \expandafter\shortMPflushN
+   \fi}
+
+\def\dowriteMPgraphicline{\futurelet\next\dodowriteMPgraphicline}
+\def\nowriteMPgraphicline{\futurelet\next\nonowriteMPgraphicline}
 
-\def\dowriteMPgraphicline
-  {\futurelet\next\dodowriteMPgraphicline}
+%D Will move (check if next is needed):
+
+\long\def\nonowriteMPgraphicline#1\MPend
+  {\ifx\next\empty\else\ifx\next\relax\else
+     \bgroup
+     \let\par\space
+     \iflongMPlines
+       \immediate\write\MPwrite{#1;}%
+     \else
+       \long\edef\ascii{#1}%
+       \expandafter\flushMPgraphicline\ascii\empty;\relax;%
+     \fi
+     \egroup
+   \fi\fi}
 
 %D A first version:
 %D
-%D \starttypen
+%D \starttyping
 %D \long\def\dodowriteMPgraphicline#1tex #2#3etex#4\MPend%
 %D   {\ifx\next\empty\else\ifx\next\relax\else
 %D      \bgroup
@@ -310,7 +353,7 @@
 %D        \dowriteMPgraphicline#4tex \relax etex\MPend
 %D      \fi
 %D    \fi\fi}
-%D \stoptypen
+%D \stoptyping
 
 %D The next alternative also handles inclusions well.
 
@@ -320,7 +363,7 @@
 
 %D Before we supported the graph module, we had:
 %D
-%D \starttypen
+%D \starttyping
 %D \convertargument        etex\to\MPasciiB
 %D \convertargument     textext\to\MPasciiC % geen "text"
 %D \convertargument graphictext\to\MPasciiD % geen "text"
@@ -335,21 +378,32 @@
 %D     {\doifstringinstringelse\MPasciiD\MPasciiA{\global\MPTEXgraphictrue}
 %D                                               {\global\MPTEXgraphicfalse}}}%
 %D    \fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The next alternative permits extensions in other modules
 %D without the need to know the details of testing.
 
-\newtoks\MPTEXgrapicchecks
+\newtoks\MPTEXgraphicchecks
 
-\long\def\checkMPTEXgraphic#1%
+% \long\def\checkMPTEXgraphic#1%
+%   {\ifforceMPTEXgraphic
+%      \global\MPTEXgraphictrue
+%    \else
+%      \global\MPTEXgraphicfalse
+%      \expandafter\convertargument#1\to\MPascii
+%      \the\MPTEXgraphicchecks\relax % \relax is end condition!
+%    \fi}
+
+\long\def\writecheckedMPgraphic#1%
   {\ifforceMPTEXgraphic
      \global\MPTEXgraphictrue
    \else
      \global\MPTEXgraphicfalse
      \expandafter\convertargument#1\to\MPascii
-     \the\MPTEXgrapicchecks\relax
-   \fi}
+     \the\MPTEXgraphicchecks\relax % \relax is end condition!
+   \fi
+   \flushMPTEXgraphic % verbatimtex etc
+   \writeMPgraphic{#1}}
 
 %D We could have used a kind of array approach using a
 %D counter appended to \type {MPascii}, but this is an
@@ -362,13 +416,13 @@
    \@EA\appendtoks
      \@EA\doifincsnameelse\csname MPascii#1\endcsname\MPascii
        {\global\MPTEXgraphictrue\gobbleuntil\relax}\donothing
-   \to \MPTEXgrapicchecks}
+   \to \MPTEXgraphicchecks}
 
 \forceMPTEXcheck{etex}
 \forceMPTEXcheck{textext}
 \forceMPTEXcheck{graphictext}
 
-%D \starttypen
+%D \starttyping
 %D \forceMPTEXgraphictrue
 %D
 %D \forceMPTEXcheck{lintext}
@@ -378,12 +432,12 @@
 %D draw hlintext.lft(0, 20,  5, 20cm, "@3e") ;
 %D draw vlogtext.bot(0, 10,  9, 10cm, "@3e") ;
 %D \stopMPcode
-%D \stoptypen
+%D \stoptyping
 
 \def\flushMPTEXgraphic
-  {\ifMPTEXgraphic \ifx\everyMPTEXgraphic\emptytoks \else
+  {\ifMPTEXgraphic
      \immediate\write\MPwrite{verbatimtex \the\everyMPTEXgraphic\space etex;}%
-   \fi \fi}
+   \fi}
 
 \long\def\flushMPgraphicline#1#2;%
   {\ifx#1\relax \else
@@ -437,7 +491,7 @@
      \iflongMPlines
        \immediate\write\MPwrite{#1;}%
      \else
-       \edef\ascii{#1}%
+       \long\edef\ascii{#1}%
        \expandafter\flushMPgraphicline\ascii\empty;\relax;%
      \fi
      \egroup
@@ -544,13 +598,14 @@
 
 \def\startwritingMPgraphic
   {\blabelgroup
-   \global\advance\nofMPgraphics 1
+   \global\advance\nofMPgraphics \plusone
    \ifMPrun \else
      \allocateMPslot\currentMPgraphic
    \fi
    \enableincludeMPgraphics
    \xdef\MPgraphic{\the\currentMPgraphic}%
    \the\everyMPgraphic
+   \presetMPdefinitions % moved to here from \writeMPgraphic
    \ifrunMPgraphics
      \openMPgraphicfile1{runtime}%
      % no reset here !
@@ -558,11 +613,11 @@
      \@EA\expanded\@EA{\@EA\writeMPgraphic\@EA{\the\MPinitializations;}}%
    \else
      \openMPgraphicfile0{collected}%
-      % reset here ! global added (due to adding \blabelgroup)
+     % reset here ! global added (due to adding \blabelgroup)
      \theMPinclusions
      \global\let\theMPinclusions\relax
    \fi
-   \flushMPTEXgraphic
+   %\flushMPTEXgraphic
    \ifMPrun \else
      \immediate\write\MPwrite{let mprunend = end ;}%
      \immediate\write\MPwrite{beginfig(\the\currentMPgraphic);}%
@@ -571,7 +626,7 @@
      \fi
    \fi
    \globallet\flushMPgraphics\closeMPgraphicfiles % \dodostopwritingMPgraphic
-   \globallet\stopwritingMPgraphic=\dostopwritingMPgraphic}
+   \globallet\stopwritingMPgraphic\dostopwritingMPgraphic}
 
 \let\MPgraphicfiles\empty
 
@@ -605,7 +660,7 @@
 \def\dostopwritingMPgraphic
   {\ifMPrun \else
      \immediate\write\MPwrite{endfig;}%
-     \immediate\write\MPwrite{let end = mprunend ;}%
+     \immediate\write\MPwrite{let end=mprunend;}%
    \fi
    \ifrunMPgraphics
      \dodostopwritingMPgraphic
@@ -613,7 +668,7 @@
    \elabelgroup}
 
 \def\dodostopwritingMPgraphic
-  {\ifnum\currentMPgraphic>0
+  {\ifnum\currentMPgraphic>\zerocount
      \donetrue
    \else\ifMPrun
      \donetrue
@@ -645,7 +700,7 @@
 %D By default each graphic gets its own slot (number). Later
 %D on we will define a recycle bin.
 
-\def  \allocateMPslot#1{\global\advance#1 1 }
+\def  \allocateMPslot#1{\global\advance#1\plusone}
 \def\deallocateMPslot#1{}
 
 %D \macros
@@ -653,7 +708,7 @@
 %D
 %D For my polish friends:
 %D
-%D \starttypen
+%D \starttyping
 %D % translate=il2-pl
 %D
 %D \translateMPinput{il2-pl}
@@ -667,7 +722,7 @@
 %D \startMPcode
 %D draw btex MetaPost: ± ¶ etex scaled 5 ;
 %D \stopMPcode
-%D \stoptypen
+%D \stoptyping
 
 \def\translateMPinput#1%
   {\xdef\MPinputtranslation{\letterpercent -translate-file=#1\space}}
@@ -685,8 +740,8 @@
 
 \def\setMPrandomseed
   {\ifsetMPrandomseed \ifx\getrandomnumber\undefined \else
-     \getrandomnumber\localMPseed{0}{4095}%
-     \writeMPgraphic{randomseed := \localMPseed ;}%
+     \getrandomnumber\localMPseed\zerocount{4095}%
+     \writeMPgraphic{randomseed:=\localMPseed;}%
    \fi\fi}
 
 %D This feature has become optional. Thanks to Fabrice Popineau,
@@ -699,9 +754,9 @@
 %D one file. This means that we cannot close this file after
 %D every \type{\stopMPgraphic}. Therefore we need to say:
 %D
-%D \starttypen
+%D \starttyping
 %D \flushMPgraphics
-%D \stoptypen
+%D \stoptyping
 %D
 %D else the file is closed without writing the \METAPOST\ end
 %D command. One will notice this fast enough when in indirect
@@ -715,10 +770,10 @@
 %D
 %D Once defined, we can call for this graphic by saying:
 %D
-%D \starttypen
+%D \starttyping
 %D \loadcurrentMPgraphic{setups}
 %D \placeMPgraphic
-%D \stoptypen
+%D \stoptyping
 %D
 %D This two stage insert permits some intermediate manipulations
 %D of the graphic, which temporary saved in:
@@ -736,15 +791,14 @@
 \fi
 
 \def\loadMPgraphic#1#2%
-  {\setbox\MPgraphicbox=\hbox
-     {\ifinsertMPgraphics\insertMPfile{#1}{#2}\fi}}
+  {\setbox\MPgraphicbox\hbox{\ifinsertMPgraphics\insertMPfile{#1}{#2}\fi}}
 
 \def\MPllx{0}
 \def\MPlly{0}
 
 % \def\placeMPgraphic%
 %  {\ifMPshiftdrawing
-%     \hbox{\hskip\MPllx bp\raise\MPlly bp\box\MPgraphicbox}%
+%     \hbox{\hskip\MPllx\onebasepoint\raise\MPlly\onebasepoint\box\MPgraphicbox}%
 %   \else
 %     \box\MPgraphicbox
 %   \fi}
@@ -758,7 +812,7 @@
         \ht\MPgraphicbox\the\ht\MPgraphicbox
         \dp\MPgraphicbox\the\dp\MPgraphicbox}%
      \setbox\MPgraphicbox\hbox
-       {\hskip\MPllx bp\raise\MPlly bp\box\MPgraphicbox}%
+       {\hskip\MPllx\onebasepoint\raise\MPlly\onebasepoint\box\MPgraphicbox}%
      \next
    \fi
    \box\MPgraphicbox}
@@ -774,7 +828,7 @@
 
 %D We assume that one can set objects:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\douseMPbox#1%
 %D   {\setobject{MP}{#1}\vbox
 %D      {\forgetall
@@ -782,9 +836,9 @@
 %D       \deallocateMPslot\currentMPgraphic
 %D       \placeMPgraphic}%
 %D    \setgvalue{#1}{\getobject{MP}{#1}}}
-%D \stoptypen
+%D \stoptyping
 %D
-%D More save is to use a number for {MP}{#1} which permits
+%D More save is to use a number for \type {{MP}{#1}} which permits
 %D redefinition.
 
 \newcount\MPobjectcounter
@@ -871,7 +925,7 @@
 
 \let\useMPgraphic=\reuseMPgraphic
 
-%D \macro
+%D \macros
 %D   {doifMPgraphicelse}
 %D
 %D For (mainly internal) purposes we provide a test macro.
@@ -891,7 +945,7 @@
 %D In a graphic one can call up another (predefined one)
 %D like:
 %D
-%D \starttypen
+%D \starttyping
 %D \startuseMPgraphic{a}
 %D   fill fullcircle scaled 100 ;
 %D \stopuseMPgraphic
@@ -902,7 +956,7 @@
 %D \stopuseMPgraphic
 %D
 %D \useMPgraphic{b}
-%D \stoptypen
+%D \stoptyping
 
 \def\includeMPgraphic#1%
   {\csname\@@MPG#1\endcsname}
@@ -926,9 +980,9 @@
 %D
 %D For faster running, one can generate a format, saying
 %D
-%D \starttypen
+%D \starttyping
 %D mpost -ini context
-%D \stoptypen
+%D \stoptyping
 %D
 %D (The resulting \type {mem} file should be moved to the
 %D right location. Watch out for misatching \type {progname}
@@ -1003,10 +1057,10 @@
      \else
        \externalfigure
          [#1]
-         [\c!type=\c!mps,\c!object=\v!nee,
-          \c!symbool=\v!ja,\c!reset=\v!ja,
-          \c!maxbreedte=,\c!maxhoogte=,
-          \c!kader=\v!uit,\c!achtergrond=,
+         [\c!type=\c!mps,\c!object=\v!no,
+          \c!symbol=\v!yes,\c!reset=\v!yes,
+          \c!maxwidth=,\c!maxheight=,
+          \c!frame=\v!off,\c!background=,
           #2]%
      \fi}
 
@@ -1020,7 +1074,7 @@
 %D This module can be used in \PLAIN\ \TEX too. When using
 %D \DVIPS, just try to process:
 %D
-%D \starttypen
+%D \starttyping
 %D \input supp-mps
 %D
 %D \runMPgraphicstrue
@@ -1034,15 +1088,15 @@
 %D \stopuseMPgraphic
 %D
 %D \useMPgraphic{1}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Don't forget to enable \type{\write18}. When does not say
 %D \type{\runMPgraphicstrue}, the \METAPOST\ scratch file
 %D must be closed by saying
 %D
-%D \starttypen
+%D \starttyping
 %D \flushMPgraphics
-%D \stoptypen
+%D \stoptyping
 %D
 %D When using the indirect method, one has to process the file
 %D \type{mpgraph.mp} between two successive \TEX\ runs.
@@ -1070,15 +1124,15 @@
 %D The method we use is both robust and simple: one can do
 %D with calling the next macro with the filename as argument:
 %D
-%D \starttypen
+%D \starttyping
 %D \includeMPfonts{filename}
-%D \stoptypen
+%D \stoptyping
 %D
 %D We can turn of this mechanism with:
 %D
-%D \starttypen
+%D \starttyping
 %D \includeMPfontsfalse
-%D \stoptypen
+%D \stoptyping
 %D
 %D {\em Currently this method fails for situations where the
 %D font definition is not on one line, which is he case when
@@ -1096,7 +1150,7 @@
      \endlinechar=-1
      \setMPspecials
      \obeyMPspecials
-     \setbox\scratchbox=\hbox
+     \setbox\scratchbox\hbox
        {\hskip-\maxdimen
         \doprocessfile\scratchread{#1}\handleMPfont}%
      \smashbox\scratchbox
@@ -1116,7 +1170,7 @@
 %D In \CONTEXT\ font handling is intergrated in the figure
 %D inclusion macros. A decent plain \TEX\ alternative is:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\includeMPgraphic#1%
 %D   {\hbox\bgroup
 %D    \includeMPfonts{#1}%
@@ -1134,28 +1188,28 @@
 %D          urx=\EPSurx\space
 %D          ury=\EPSury\space}}%
 %D    \egroup}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This macro needs \type {supp-eps.tex} and provided no
 %D scaling. For \LATEX\ users the next one will do:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\includeMPgraphic#1#%
 %D   {\hbox\bgroup
 %D    \def\includeMPgraphics##1%
 %D      {\includeMPfonts{##1}%
-%D       \includegraphics[type=mps,#1]{##1}%  or whatever type they use
+%D       \includegraphics[typetype=mps,#1]{##1}%  or whatever type they use
 %D       \egroup}%
 %D    \includeMPgraphics}
-%D \stoptypen
+%D \stoptyping
 
 %D We scan the graphics file for the \type{fshow} operator,
 %D that is, lines that start with \type{(}. If found it
 %D interprets the line, which looks like:
 %D
-%D \starttypen
+%D \starttyping
 %D (string ... string) font size fshow
-%D \stoptypen
+%D \stoptyping
 %D
 %D Font definitions specified in the preamble are simply
 %D ignored. Only lines starting with \type{(} are interpreted.
@@ -1203,6 +1257,7 @@
    \catcode`\]=\@@active
    \catcode`\{=\@@active
    \catcode`\}=\@@active
+   \lccode`\-=0 | latex sets this to `\-
    \lccode`\%=`\% | otherwise it's seen as a number
    \def\(B\char40\relax     E|
    \def\)B\char41\relax     E|
@@ -1222,18 +1277,18 @@
 %D The lines starting with \type{(} are interpreted and
 %D handled by
 %D
-%D \starttypen
+%D \starttyping
 %D \def\includeMPcharacters(#1) #2 #3 #4\relax%
 %D   {\font\temp=#2 at #3bp\temp#1}
-%D \stoptypen
+%D \stoptyping
 %D
 %D While processing some \TUG~98 proceedings, I also had to
 %D deal with:
 %D
-%D \starttypen
+%D \starttyping
 %D /nfont {10 div dup scale 10} def
 %D (T) ANTTB 7.13086 nfont fshow
-%D \stoptypen
+%D \stoptyping
 %D
 %D which comes to rounding sizes. This is something
 %D experimental. (The macro in supp-pdf.tex is more
@@ -1244,11 +1299,11 @@
 \def\includeMPcharacters(#1) #2 #3 #4#5#6#7#8#9\relax
   {\edef\temp{#4#5#6#7#8}%
    \ifx\temp\PSnfont % round font size (to pt)
-     \scratchdimen#3pt
-     \ifdim\scratchdimen<1pt
+     \scratchdimen#3\onepoint
+     \ifdim\scratchdimen<\onepoint
        \def\size{1pt}%
      \else
-       \advance\scratchdimen .5pt
+       \advance\scratchdimen .5\onepoint
        \def\size##1.##2\relax{\def\size{##1pt}}%
        \expandafter\size\the\scratchdimen\relax
      \fi
@@ -1266,27 +1321,27 @@
 %D Now let's see if things work all right and show the example
 %D files that are part of the \METAPOST\ distribution:
 %D
-%D \startregelcorrectie
-%D \steluitlijnenin[midden]
+%D \startlinecorrection
+%D \setupalign[middle]
 %D \leavevmode
-%D \startcombinatie[3*3]
-%D   {\externfiguur[mp-exa-1][kader=aan,breedte=.2\hsize]} {}
-%D   {\externfiguur[mp-exa-2][kader=aan,breedte=.2\hsize]} {}
-%D   {\externfiguur[mp-exa-3][kader=aan,breedte=.2\hsize]} {}
-%D   {\externfiguur[mp-exa-4][kader=aan,breedte=.2\hsize]} {}
-%D   {\externfiguur[mp-exa-5][kader=aan,breedte=.2\hsize]} {}
-%D   {\externfiguur[mp-exa-6][kader=aan,breedte=.2\hsize]} {}
-%D   {\externfiguur[mp-exa-7][kader=aan,breedte=.2\hsize]} {}
-%D   {\externfiguur[mp-exa-8][kader=aan,breedte=.2\hsize]} {}
-%D   {\externfiguur[mp-exa-9][kader=aan,breedte=.2\hsize]} {}
-%D \stopcombinatie
-%D \stopregelcorrectie
+%D \startcombination[3*3]
+%D   {\externalfigure[mp-exa-1][frame=on,width=.2\hsize]} {}
+%D   {\externalfigure[mp-exa-2][frame=on,width=.2\hsize]} {}
+%D   {\externalfigure[mp-exa-3][frame=on,width=.2\hsize]} {}
+%D   {\externalfigure[mp-exa-4][frame=on,width=.2\hsize]} {}
+%D   {\externalfigure[mp-exa-5][frame=on,width=.2\hsize]} {}
+%D   {\externalfigure[mp-exa-6][frame=on,width=.2\hsize]} {}
+%D   {\externalfigure[mp-exa-7][frame=on,width=.2\hsize]} {}
+%D   {\externalfigure[mp-exa-8][frame=on,width=.2\hsize]} {}
+%D   {\externalfigure[mp-exa-9][frame=on,width=.2\hsize]} {}
+%D \stopcombination
+%D \stoplinecorrection
 %D
 %D Here we used calls like:
 %D
-%D \starttypen
-%D \externfiguur[mp-exa-1][methode-mps,kader=aan,breedte=.2\hsize]
-%D \stoptypen
+%D \starttyping
+%D \externalfigure[mp-exa-1][methode-mps,frame=on,width=.2\hsize]
+%D \stoptyping
 
 %D \macros
 %D   {convertMPcolors,
@@ -1294,8 +1349,8 @@
 %D
 %D When I told the editors that I wanted to use colored
 %D \METAPOST\ graphics in the color issue of the \MAPS, I was
-%D asked to use the \kap{CMYK} colorspace instead of \kap{RGB}
-%D one. However, \METAPOST\ only supports \kap{RGB} colors. I
+%D asked to use the \cap{CMYK} colorspace instead of \cap{RGB}
+%D one. However, \METAPOST\ only supports \cap{RGB} colors. I
 %D decided to write a utility to convert the \type
 %D {setrgbcolor} operators into \type {setcmykcolor} ones, and
 %D some experiments showed me that I could best let \TEX\ do it
@@ -1310,9 +1365,9 @@
 
 %D The main macro is called as:
 %D
-%D \starttypen
+%D \starttyping
 %D \convertMPcolors{filename}
-%D \stoptypen
+%D \stoptyping
 %D
 %D When active, this macro returns a message saying if indeed
 %D conversion took place. The old file is overwritten! This
@@ -1416,13 +1471,13 @@
 \ifx\convertRGBtoGRAY\undefined
 
   \def\convertRGBtoGRAY#1#2#3%
-    {\scratchdimen#1\s!pt
+    {\scratchdimen#1\onepoint
      \scratchdimen300\scratchdimen
      \scratchcounter\scratchdimen
-     \scratchdimen#2\s!pt
+     \scratchdimen#2\onepoint
      \scratchdimen590\scratchdimen
      \advance\scratchcounter \scratchdimen
-     \scratchdimen#3\s!pt
+     \scratchdimen#3\onepoint
      \scratchdimen110\scratchdimen
      \advance\scratchcounter \scratchdimen
      \advance\scratchcounter \!!medcard
@@ -1439,37 +1494,37 @@
 %D By setting both \type{rgb} and \type{cmyk} to off, we force
 %D conversion to gray scales using:
 %D
-%D \plaatsformule[-]
-%D   \startformule
+%D \placeformula[-]
+%D   \startformula
 %D   G = .30r + .59g + .11b
-%D   \stopformule
+%D   \stopformula
 %D
 %D By using buffers, we keep the \ASCII\ layout clean:
 %D
 %D \startbuffer
 %D \startbuffer[rgb]
-%D   \stelkleurenin[rgb=ja,cmyk=nee,reductie=nee,conversie=nee]
+%D   \setupcolors[rgb=ja,cmyk=nee,reduction=no,conversion=no]
 %D   \useMPgraphic{hans}
 %D \stopbuffer
 %D
 %D \startbuffer[cmyk]
-%D   \stelkleurenin[rgb=nee,cmyk=ja,reductie=nee,conversie=nee]
+%D   \setupcolors[rgb=nee,cmyk=ja,reduction=no,conversion=no]
 %D   \useMPgraphic{hans}
 %D \stopbuffer
 %D
 %D \startbuffer[cmy]
-%D   \stelkleurenin[rgb=nee,cmyk=ja,reductie=ja,conversie=nee]
+%D   \setupcolors[rgb=nee,cmyk=ja,reduction=yes,conversion=no]
 %D   \useMPgraphic{hans}
 %D \stopbuffer
 %D
 %D \startbuffer[gray]
-%D   \stelkleurenin[rgb=nee,cmyk=nee,reductie=nee,conversie=nee]
+%D   \setupcolors[rgb=nee,cmyk=nee,reduction=no,conversion=no]
 %D   \useMPgraphic{hans}
 %D \stopbuffer
 %D \stopbuffer
 %D
 %D \typebuffer
-%D \haalbuffer
+%D \getbuffer
 %D
 %D The graphic is rather simple and is generated each time
 %D it's called:
@@ -1479,7 +1534,7 @@
 %D \startbuffer
 %D \startbuffer[graphic]
 %D   \startuseMPgraphic{hans}
-%D     width  :=\the\tekstbreedte/5;
+%D     width  :=\the\textwidth/5;
 %D     height := width/4;
 %D     fill fullcircle
 %D       xscaled width
@@ -1490,40 +1545,40 @@
 %D \stopbuffer
 %D
 %D \typebuffer
-%D \haalbuffer
+%D \getbuffer
 %D
 %D Next we combine the four alternative interpretations in a
 %D combination:
 %D
 %D \startbuffer
 %D \startbuffer[result]
-%D   \startcombinatie[4]
-%D     {\haalbuffer[rgb]}  {\tfxx original}
-%D     {\haalbuffer[cmyk]} {\ttxx\string\convertMPcolorstrue}
-%D     {\haalbuffer[cmy]}  {\ttxx\string\reduceMPcolorstrue}
-%D     {\haalbuffer[gray]} {\ttxx\string\forcegrayMPcolorstrue}
-%D   \stopcombinatie
+%D   \startcombination[4]
+%D     {\getbuffer[rgb]}  {\tfxx original}
+%D     {\getbuffer[cmyk]} {\ttxx\string\convertMPcolorstrue}
+%D     {\getbuffer[cmy]}  {\ttxx\string\reduceMPcolorstrue}
+%D     {\getbuffer[gray]} {\ttxx\string\forcegrayMPcolorstrue}
+%D   \stopcombination
 %D \stopbuffer
 %D \stopbuffer
 %D
 %D \typebuffer
-%D \haalbuffer
+%D \getbuffer
 %D
 %D Finally we call the buffers, using different setting:
 %D
 %D \startbuffer
-%D \plaatsfiguur
+%D \placefigure
 %D   {\METAPOST\ color conversions}
-%D   {\def\RedGreenBlue{.1,.4,.6}\haalbuffer[graphic]\haalbuffer[result]\vskip6pt
-%D    \def\RedGreenBlue{.1,.6,.4}\haalbuffer[graphic]\haalbuffer[result]\vskip6pt
-%D    \def\RedGreenBlue{.4,.1,.6}\haalbuffer[graphic]\haalbuffer[result]\vskip6pt
-%D    \def\RedGreenBlue{.4,.6,.1}\haalbuffer[graphic]\haalbuffer[result]\vskip6pt
-%D    \def\RedGreenBlue{.6,.1,.4}\haalbuffer[graphic]\haalbuffer[result]\vskip6pt
-%D    \def\RedGreenBlue{.6,.4,.1}\haalbuffer[graphic]\haalbuffer[result]}
+%D   {\def\RedGreenBlue{.1,.4,.6}\getbuffer[graphic]\getbuffer[result]\vskip6pt
+%D    \def\RedGreenBlue{.1,.6,.4}\getbuffer[graphic]\getbuffer[result]\vskip6pt
+%D    \def\RedGreenBlue{.4,.1,.6}\getbuffer[graphic]\getbuffer[result]\vskip6pt
+%D    \def\RedGreenBlue{.4,.6,.1}\getbuffer[graphic]\getbuffer[result]\vskip6pt
+%D    \def\RedGreenBlue{.6,.1,.4}\getbuffer[graphic]\getbuffer[result]\vskip6pt
+%D    \def\RedGreenBlue{.6,.4,.1}\getbuffer[graphic]\getbuffer[result]}
 %D \stopbuffer
 %D
 %D \typebuffer
-%D \haalbuffer
+%D \getbuffer
 %D
 %D By the way, when the \POSTSCRIPT\ file resulting from
 %D this input is converted into \PDF\ and viewed in Acrobat
@@ -1536,7 +1591,7 @@
 %D
 %D Some experimental macros:
 %D
-%D \starttypen
+%D \starttyping
 %D \startMPdrawing
 %D \stopMPdrawing
 %D \pushMPdrawing
@@ -1545,7 +1600,7 @@
 %D \ifMPdrawingdone
 %D \getMPdrawing
 %D \MPdivten[number]
-%D \stoptypen
+%D \stoptyping
 %D
 %D These macros are used in \PPCHTEX.
 
@@ -1558,12 +1613,14 @@
   {\globallet\MPdrawingdata\empty
    \global\MPdrawingdonefalse}
 
+% why global push/pop here?
+
 \def\pushMPdrawing
-  {\pushmacro\MPdrawingdata
+  {\globalpushmacro\MPdrawingdata
    \globallet\MPdrawingdata\empty}
 
 \def\popMPdrawing
-  {\popmacro\MPdrawingdata}
+  {\globalpopmacro\MPdrawingdata}
 
 \def\getMPdrawing
   {\ifMPdrawingdone
@@ -1580,7 +1637,7 @@
   {\relax
    \bgroup
    \enableincludeMPgraphics
-   \presetMPdefinitions
+   \presetMPdefinitions % in case #2 has measures
    \doifelse{#1}{-}
      {\convertargument#2\to\asciiA}
      {\long\def\asciiA{#2}}%
@@ -1616,17 +1673,17 @@
 %D We can use \METAPOST\ to calculate arbitrary clipping
 %D paths. Such a path is defined by (for instance):
 %D
-%D \starttypen
+%D \starttyping
 %D \startMPclip{window}
 %D    clip currentpicture to fullcircle xscaled \width yscaled \height ;
 %D \stopMPclip
-%D \stoptypen
+%D \stoptyping
 %D
 %D Such a path can be extracted (processed) by:
 %D
-%D \starttypen
+%D \starttyping
 %D \grabMPclippath{window}{method}{width}{height}{default path}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Currently only method 1 makes sense; it produces \PDF\
 %D code. This macro only makes sense when hooked into a
@@ -1710,6 +1767,15 @@
 
 \newif    \ifMPstaticgraphic \MPstaticgraphicfalse
 
+\def\locateMPslot#1% slightly faster on one slot, much faster on multiple slots
+  {\ifundefined{\number#1MP}% could be \ifcsname if needed
+     \letgvalueempty{\number#1MP}%
+     \expandafter\gobbletwoarguments
+   \else
+     \global\advance#1\plusone
+   \fi
+   \locateMPslot#1}
+
 \def\allocateMPslot#1%
   {\ifrunMPgraphics
      \ifx\pdfliteral\undefined
@@ -1721,11 +1787,13 @@
      \recycleMPslotsfalse
    \fi
    \ifrecycleMPslots
-     \doloop % slow but used seldom
-       {\doifundefined{\recurselevel MP}
-          {\letgvalueempty{\recurselevel MP}%
-           \global#1=\recurselevel
-           \exitloop}}%
+   % \doloop % slow but used seldom
+   %   {\doifundefined{\recurselevel MP}
+   %      {\letgvalueempty{\recurselevel MP}%
+   %       \global#1\recurselevel
+   %       \exitloop}}%
+     \global#1\plusone
+     \locateMPslot#1%
    % \message{[MP slot + \number#1]%
    \else\ifMPstaticgraphic
      \global#1\maxnofMPgraphics
@@ -1735,7 +1803,7 @@
      \global\advance\minnofMPgraphics \plusone
    \fi\fi
    \ifnum\minnofMPgraphics<\maxnofMPgraphics \else
-     \writestatus{\m!systems}{increase \string\maxnofMPgraphics}%
+     \writestatus\m!systems{increase \string\maxnofMPgraphics}%
    \fi}
 
 \def\deallocateMPslot#1%
@@ -1745,7 +1813,7 @@
      \recycleMPslotsfalse
    \fi
    \ifrecycleMPslots
-     \global\letbeundefined{\number#1MP}%
+    \global\letbeundefined{\number#1MP}%
     %\message{[MP slot - \number#1]}%
    \fi}
 
@@ -1771,9 +1839,9 @@
 %D
 %D We can save some typing with:
 %D
-%D \starttypen
+%D \starttyping
 %D \startMPcode whatever \stopMPcode
-%D \stoptypen
+%D \stoptyping
 %D
 %D this automatically places the graphic