stable 2005.03.16

60 files changed, 1322 insertions, 593 deletions

diff --git a/tex/context/base/colo-ini.tex b/tex/context/base/colo-ini.tex
index de0806a39..34e8a3494 100644
--- a/tex/context/base/colo-ini.tex
+++ b/tex/context/base/colo-ini.tex
@@ -252,6 +252,7 @@
 % p n d f : spot
 % h       : hexadecimal
 % t a     : transparency
+% e       : equivalent (spotcolors)
 
 \def\@@resetcolorparameters
   {\let\@@cl@@r\@@cl@@z \let\@@cl@@g\@@cl@@z \let\@@cl@@b\@@cl@@z
@@ -259,8 +260,11 @@
    \let\@@cl@@s\@@cl@@z
    \let\@@cl@@p\@@cl@@o \let\@@cl@@n\empty \let\@@cl@@d\empty \let\@@cl@@f\@@cl@@o
    \let\@@cl@@h\empty
+   \let\@@cl@@e\empty
    \let\@@cl@@t\@@cl@@z \let\@@cl@@a\@@cl@@z}
 
+\@@resetcolorparameters
+
 \def\@@cl@@A{\@@cl@@a} % a hook for symbolic conversion, see below
 
 %D Handling a few nested \type{\cs}'s is no problem (\type
@@ -347,6 +351,10 @@
           {#3{\??cr#5}{\colorRpattern}}%
       \else
         \setxvalue{\??cr#5}{\colorHpattern}%
+      \fi
+      % new: e=external spot color name
+      \ifx\@@cl@@e\empty \else
+        \doregisterspotcolorname{#5}\@@cl@@e
       \fi}
      {\doifdefinedelse{\??cr#6}
         {\doifelse{#5}{#6}
@@ -444,6 +452,7 @@
      \lccode`\-=`\_%
      \lccode`\*=`\_%
      \lccode`\/=`\_%
+%      \lccode`\_=`\_%
      % not needed, other attribute in driver:
      %
      % \@@resetcolorparameters
@@ -451,11 +460,11 @@
      % \ifx\@@cl@@t\@@cl@@z\else
      %   \edef\@@cl@@cl@@N{\@@cl@@cl@@N_\@@cl@@t_\@@cl@@a}%
      % \fi
-     \lowercase\@EA{\@EA\xdef\@EA\multitonecolor\@EA{\@@cl@@cl@@N}}%
+     \lowercase\@EA{\@EA\xdef\@EA\@@cleancolor\@EA{\@@cl@@cl@@N}}%
    \egroup
-   \setxvalue{\??cl\multitonecolor\s!check}{\noexpand\docheckmultitonecolor{\@@cl@@cl@@D}}%
-   \expanded{\defineglobalcolor[\multitonecolor][#3,#4]}%
-   \expanded{\definespotcolor[#1][\multitonecolor][#4,f=\the\scratchcounter,p={\@@cl@@cl@@P},d={\@@cl@@cl@@D}]}}
+   \setxvalue{\??cl\@@cleancolor\s!check}{\noexpand\docheckmultitonecolor{\@@cl@@cl@@D}}%
+   \expanded{\defineglobalcolor[\@@cleancolor][#3,#4]}%
+   \expanded{\definespotcolor[#1][\@@cleancolor][#4,f=\the\scratchcounter,p={\@@cl@@cl@@P},d={\@@cl@@cl@@D}]}}
 
 \def\docheckmultitonecolor#1%
   {\flushatshipout
diff --git a/tex/context/base/cont-log.tex b/tex/context/base/cont-log.tex
index 5bbe8b284..6400a15c8 100644
--- a/tex/context/base/cont-log.tex
+++ b/tex/context/base/cont-log.tex
@@ -112,7 +112,6 @@
 
 %D Alternative \CONTEXT\ logo, first Idris S.~Hamid's version:
 %D
-%D
 %D \def\Context
 %D   {{\sc C\kern -.0667emo\kern -.0667emn\kern -.0549emt\kern
 %D    -.1667em\lower.5ex\hbox {e}\kern -.125emx\kern -.0549emt}}
diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex
index 9a8665eb9..351300864 100644
--- a/tex/context/base/cont-new.tex
+++ b/tex/context/base/cont-new.tex
@@ -15,15 +15,228 @@
 %D excellent place for hacks, patches, extensions and new
 %D features.
 
+% \font\f=dummyfont  \rpcode\f0=500 \hbox{..}\char0
+
 % todo: mp-new
 % caption: grid=top|bottom in xml defs
 
 \unprotect
 
-\writestatus{\m!systems}{beware: some patches loaded from cont-new.tex!}
+\writestatus{\m!systems}{beware: some patches loaded from cont-new.tex}
 
 \ifx\normalcompound\undefined \let\normalcompound=| \fi
 
+\def\stoplocalframed
+  {\dontshowcomposition
+   \@@stopframedorientation
+   \ifboxhasformat
+     \ifx\localwidth\v!fit
+       \ifreshapeframebox\doreshapeframedbox\fi
+       \boxhaswidthfalse
+     \else\ifx\localwidth\v!fixed
+       \boxhaswidthfalse
+     \else
+       \resetshapeframebox
+     \fi\fi
+   \else
+     \resetshapeframebox
+   \fi
+   \ifboxhaswidth
+     \wd\framebox\!!widtha
+   \fi
+   \ifboxhasheight
+     \ht\framebox\!!heighta
+   \fi
+   \doifvalue{\@@framed\c!empty}\v!yes
+     {\setbox\scratchbox\null
+      \wd\scratchbox\wd\framebox
+      \ht\scratchbox\ht\framebox
+      \dp\scratchbox\dp\framebox
+      \setbox\framebox\box\scratchbox}%
+   \stopregistercolor
+   \docolorframebox
+   \ifboxhasoffset
+     \dooffsetframebox
+   \fi
+   \ifboxisoverlaid \else
+     \dolocateframebox
+   \fi
+   \ifx\postprocessframebox\relax \else
+     \let\next\postprocessframebox
+     \let\postprocessframebox\relax % prevent nesting
+     \next\framebox
+   \fi
+   \edef\overlaylinecolor{\framedparameter\c!framecolor}%
+   \edef\overlaylinewidth{\the\ruledlinewidth}% \@@...
+   \ifboxhasframe % real or invisible frame
+     \doframedbox
+   \fi
+   \doifvaluesomething{\@@framed\c!background}\dobackedbox
+   \handleframedlocator\@@locallocation
+   \box\framebox
+   \egroup
+   \egroup}
+
+\def\installframedlocator#1#2%
+  {\setvalue{\??ol:\c!location:#1}{#2}}
+
+\def\handleframedlocator#1%
+  {\getvalue{\??ol:\c!location:#1}}
+
+\def\doprelocframedbox#1%
+  {\scratchdimen#1\relax
+   \advance\scratchdimen \ruledlinewidth
+   \ifboxhasoffset
+     \advance\scratchdimen \framedparameter\c!offset
+   \fi
+   \scratchskip\ht\framebox
+   \advance\scratchskip-\scratchdimen}
+
+\installframedlocator \v!hanging % best with strut=no
+  {\dp\framebox\ht\framebox
+   \ht\framebox\zeropoint}
+
+\installframedlocator \v!depth
+  {\scratchdimen\ht\framebox
+   \advance\scratchdimen -\strutdp
+   \ht\framebox\scratchdimen
+   \dp\framebox\strutdp
+   \box\framebox}
+
+\installframedlocator \v!height
+  {\scratchdimen\ht\framebox
+   \advance\scratchdimen -\strutht
+   \ht\framebox\strutht
+   \dp\framebox\scratchdimen
+   \box\framebox}
+
+\installframedlocator \v!high
+  {\doprelocframedbox\strutht
+   \setbox\framebox\hbox{\lower\scratchskip\box\framebox}%
+   \ht\framebox\strutht
+   \dp\framebox\strutdp
+   \hbox{\box\framebox}}
+
+\installframedlocator \v!line
+  {\setbox\framebox\hbox{\lower.5\ht\framebox\box\framebox}%
+   \ht\framebox.5\lineheight
+   \dp\framebox.5\lineheight
+   \hbox{\box\framebox}}
+
+\installframedlocator \v!low
+  {\doprelocframedbox\strutdp
+   \setbox\framebox\hbox{\lower\scratchdimen\box\framebox}%
+   \ht\framebox\strutht
+   \dp\framebox\strutdp
+   \box\framebox}
+
+\installframedlocator \v!top
+  {\doprelocframedbox\strutht
+   \setbox\framebox\hbox{\lower\scratchskip\box\framebox}%
+   \ht\framebox\scratchdimen
+   \dp\framebox\scratchskip
+   \hbox{\box\framebox}}
+
+\installframedlocator \v!middle
+  {\scratchdimen.5\ht\framebox
+   \setbox\framebox\hbox{\lower\scratchdimen\box\framebox}%
+   \ht\framebox\scratchdimen
+   \dp\framebox\scratchdimen
+   \hbox{\box\framebox}}
+
+\installframedlocator \v!lohi
+  {\handleframedlocator\v!middle}
+
+\installframedlocator \v!bottom
+  {\doprelocframedbox\strutdp
+   \setbox\framebox\hbox{\lower\scratchdimen\box\framebox}%
+   \ht\framebox\scratchskip
+   \dp\framebox\scratchdimen
+   \hbox{\box\framebox}}
+
+% \starttext
+% \ruledhbox
+%   {A
+%    \framed[width=2cm,align=middle,location=hanging]{location\\equals\\hanging}
+%    \framed[width=2cm,align=middle,location=depth]  {location\\equals\\depth}
+%    \framed[width=2cm,align=middle,location=height] {location\\equals\\height}
+%    B}
+% \vskip2cm
+% \ruledhbox
+%   {A
+%    \framed[width=2cm,align=middle,location=low]    {location\\equals\\low}
+%    \framed[width=2cm,align=middle,location=line]   {location\\equals\\line}
+%    \framed[width=2cm,align=middle,location=high]   {location\\equals\\high}
+%    B}
+% \vskip2cm
+% \ruledhbox
+%  {A
+%   \framed[width=2cm,align=middle,location=top]    {location\\equals\\top}
+%   \framed[width=2cm,align=middle,location=bottom] {location\\equals\\bottom}
+%   \framed[width=2cm,align=middle,location=lohi]   {location\\equals\\lohi}
+%   \framed[width=2cm,align=middle,location=middle] {location\\equals\\middle}
+%   B}
+% \stoptext
+
+% experimental so this may change
+
+\def\startdescriptions
+  {\dosingleempty\dostartdescriptions}
+
+\def\dostartdescriptions[#1]%
+  {\begingroup
+   \def\item{\getvalue{#1}}%
+   \let\dostoppairdescription \donothing
+   \let\@@description         \dostartpairdescription
+   \let\@@startsomedescription\dostartsomedescription}
+
+\def\stopdescriptions
+  {\dostoppairdescription
+   \endgroup}
+
+\def\dostartpairdescription[#1][#2]%
+  {\dostoppairdescription
+   \def\dostoppairdescription{\@@stopdescription{#1}}%
+   \bgroup
+   \def\currentdescription{#1}%
+   \doifelse{\descriptionparameter{\s!do\c!state}}\v!start
+     {\@@makedescription{#1}[#2]{}}
+     {\@@makedescription{#1}[#2]}}
+
+\def\dostartsomedescription% #1[#2]#3%
+  {\bgroup
+   \@@makedescription} % {#1}[#2]{#3}}
+
+% \starttext
+%
+% \definedescription[test]
+%
+% \startdescriptions
+% \test{Foo} Bar bar bar
+% \test{Foo} Bar bar bar
+% \test{Foo} Bar bar bar
+% \stopdescriptions
+%
+% \startdescriptions[test]
+% \item{Foo} Bar bar bar
+% \item{Foo} Bar bar bar
+% \item{Foo} Bar bar bar
+% \stopdescriptions
+%
+% \startdescriptions
+% \starttest{Foo} Bar bar bar \stoptest
+% \starttest{Foo} Bar bar bar \stoptest
+% \starttest{Foo} Bar bar bar \stoptest
+% \stopdescriptions
+%
+% \startdescriptions[test]
+% \item{Foo} Bar bar bar
+% \item{Foo} Bar bar bar
+% \item{Foo} Bar bar bar
+% \stopdescriptions
+%
+% \stoptext
+
 % to do:
 %
 % \def\defineshapesynonym
diff --git a/tex/context/base/cont-sys.ori b/tex/context/base/cont-sys.ori
index 6a9e7eec3..eaed591fd 100644
--- a/tex/context/base/cont-sys.ori
+++ b/tex/context/base/cont-sys.ori
@@ -60,7 +60,7 @@
 
 % You can let \CONTEXT\ load the map files for \PDFTEX.
 
-\autoloadmapfilestrue
+\resetmapfiles \autoloadmapfilestrue
 
 % (1) you can prevent loading with:
 %
diff --git a/tex/context/base/core-fig.tex b/tex/context/base/core-fig.tex
index 60db851bd..2a5a4deac 100644
--- a/tex/context/base/core-fig.tex
+++ b/tex/context/base/core-fig.tex
@@ -12,6 +12,8 @@
 %C details.
 
 % error in calculations : .25% (too much: 1.5pt over full page)
+%
+% this module will be reimplemented(read: cleaned up)
 
 \writestatus{loading}{Context Core Macros / Figure Inclusion}
 
@@ -279,10 +281,7 @@
      \def\@@efcurrentpath{#1}%
      \sanitizefilename#1\to\@@efcurrentpath
      \doiffileinsertionsupportedelse\@@efcurrenttype
-       {\assignfullfilename % needed
-          {\@@efcurrentpath}%
-          {\@@effilename.\figureextension{\@@efcurrenttype}}%
-          \to\@@efcurrentfile
+       {\assignfullfilename{\@@efcurrentpath}{\@@effilename.\figureextension{\@@efcurrenttype}}\to\@@efcurrentfile
         \dodododoanalyzefigurefiles}
        \donothing
    \fi}
@@ -344,9 +343,7 @@
 
 \def\getfiguredimensionsA
   {\ifcase\figurestatus
-     \@@eftrace{analyzing \@@efcurrentfile\space
-                       on \@@efcurrentpath\space
-                       as \@@efcurrenttype}%
+     \@@eftrace{analyzing \@@efcurrentfile\space on \@@efcurrentpath\space as \@@efcurrenttype}%
      \!!widthb\zeropoint % ?
      \doifdefinedelse{\@@dogetfiguresize\@@efcurrenttype}
        {\executedtrue
@@ -410,12 +407,9 @@
   {\ifcase\figurestatus\ifcase\figurefilemode\else
 \doifsomething\@@efcurrentpath
 {%
-    %\def\@@efloadname{\@@efcurrentpath\f!pathseparator\@@exfile}%
      \assignfullfilename\@@efcurrentpath\@@exfile\to\@@efloadname
      \edef\@@effilenametype{\@@effilename.\@@efcurrenttype}%
-     \@@eftrace{analyzing \@@efloadname\space
-                       on \@@efcurrentpath\space
-                      for \@@effilenametype}%
+     \@@eftrace{analyzing \@@efloadname\space on \@@efcurrentpath\space for \@@effilenametype}%
      \pushendofline
      \startreadingfile
      \let\presetfigure\presetfigureA
@@ -448,8 +442,7 @@
             {\edef\@@effilenametype{\@@effilename.\@@efcurrenttype}%
              \@@eftrace{running texutil on \@@effilenametype}%
              \def\@@efloadname{\f!utilityfilename.\f!temporaryextension}%
-             \executesystemcommand
-               {texutil --fig --out=\@@efloadname\space\@@effilenametype}%
+             \executesystemcommand{texutil --fig --out=\@@efloadname\space\@@effilenametype}%
              \@@eftrace{analyzing \@@efloadname\space on \@@effilenametype}%
              \pushendofline
              \startreadingfile
@@ -476,12 +469,9 @@
   {\ifconsultutilityfile\ifcase\figurestatus\ifcase\figurefilemode\else
 \doifsomething\@@efcurrentpath
 {%
-    %\def\@@efloadname{\@@efcurrentpath\f!pathseparator\@@exfile}%
      \assignfullfilename\@@efcurrentpath\@@exfile\to\@@efloadname
      \edef\@@effilenametype{\@@effilename.\figureextension{\@@efcurrenttype}}%
-     \@@eftrace{analyzing \@@efloadname\space
-                       on \@@efcurrentpath\space
-                      for \@@effilenametype}%
+     \@@eftrace{analyzing \@@efloadname\space on \@@efcurrentpath\space for \@@effilenametype}%
      \pushendofline
      \startreadingfile
      \let\presetfigure\presetfigureC
@@ -511,11 +501,8 @@
   {\ifconsultutilityfile\ifcase\figurestatus\ifcase\figurefilemode\else
 \doifsomething\@@efcurrentpath
 {%
-    %\def\@@efloadname{\@@efcurrentpath\f!pathseparator\@@exfile}%
      \assignfullfilename\@@efcurrentpath\@@exfile\to\@@efloadname
-     \@@eftrace{analyzing \@@efloadname\space
-                       on \@@efcurrentpath\space
-                      for \@@effilename.* surrogate}%
+     \@@eftrace{analyzing \@@efloadname\space on \@@efcurrentpath\space for \@@effilename.* surrogate}%
      \pushendofline
      \startreadingfile
      \let\presetfigure\presetfigureD
@@ -533,7 +520,7 @@
         \ExpandBothAfter\doifinsetelse\@@epe\@@efcurrenttype
           {\chardef\figurestatus4
            \let\@@eftype\@@efcurrenttype
-           \let\@@effullname\@@efcurrentfile}
+           \let\@@effullname\@@efcurrentfile}%
           \donothing}
        \donothing
    \else
@@ -567,14 +554,12 @@
 \def\dodolocatepresetfigurefiles#1%
   {\ifcase\figurestatus
      \doiffileinsertionsupportedelse\@@efcurrenttype
-       {\assignfullfilename
-          {#1}{\@@effilename.\figureextension{\@@efcurrenttype}}%
-          \to\@@efcurrentfile
+       {\assignfullfilename{#1}{\@@effilename.\figureextension{\@@efcurrenttype}}\to\@@efcurrentfile
         \@@eftrace{only searching for \@@efcurrentfile}%
         \doiffileelse\@@efcurrentfile
           {\chardef\figurestatus\plusone
            \let\@@eftype\@@efcurrenttype
-           \let\@@effullname\@@efcurrentfile}
+           \let\@@effullname\@@efcurrentfile}%
           \donothing}
        \donothing
    \fi}
@@ -977,9 +962,7 @@
    % nil path search in case of path spec
    \expanded{\checkfilename{\expandedfigurename}}%
    \ifcase\kindoffile\else \let\figurepathlist\empty \fi
-%    \expandafter\beforesplitstring\expandedfigurename\at.\to\@@effilename
-%    \expandafter\aftersplitstring \expandedfigurename\at.\to\@@efextension
-\greedysplitstring\expandedfigurename\at.\to\@@effilename\and\@@efextension
+   \greedysplitstring\expandedfigurename\at.\to\@@effilename\and\@@efextension
    \doifelse\@@effilename{mprun}
      {\edef\@@effilepref{\bufferprefix}}
      {\let \@@effilepref\empty}%
@@ -1005,12 +988,16 @@
       \c!maxwidth=\@@exmaxwidth,\c!maxheight=\@@exmaxheight,
       \c!scale=,\c!width=,\c!height=,\c!display=,\c!lines=,\c!grid=,
      %\c!foregroundcolor=,
-      \c!color=,
+      \c!color=,\c!conversion=,\c!prefix=,
       \c!factor=,\c!hfactor=,\c!wfactor=]%
    \doif\@@efextension\c!mov\presetfiguremov
    \doif\@@efextension\c!avi\presetfigureavi
    \doif\@@efextension\c!svg\presetfiguresvg
    #1[#4][#5][#6]%
+   % prefix in runs > 1
+   % prefix in runs > 1
+\doifnotmode{\systemmodeprefix\v!first}
+  {\doifsomething\@@efprefix{\edef\@@effilename{\@@efprefix\@@effilename}}}%
    % new, somehow needed when \textwidth is used:
    \doifsomething\@@efmaxwidth {\freezedimenmacro\@@efmaxwidth }%
    \doifsomething\@@efmaxheight{\freezedimenmacro\@@efmaxheight}%
@@ -1138,7 +1125,6 @@
         \fi
         \doifelse{#2}\s!figurepreset
           {\chardef\figurestatus4
-          %\def\@@efloadname{\f!currentpath\f!pathseparator\@@exfile}%
            \assignfullfilename\f!currentpath\@@exfile\to\@@efloadname
            \let\@@eftype\@@epe}
           {\chardef\figurestatus\zerocount
@@ -1225,9 +1211,9 @@
    \doifelsenothing\@@efpage % NIEUW ??
      {\let\@@efoptions\empty}
      {\let\@@efoptions\@@efpage}%
-   \doif\@@efpreview\v!yes{\addtocommalist\v!preview\@@efoptions}%
+   \doif\@@efpreview \v!yes{\addtocommalist\v!preview \@@efoptions}%
    \doif\@@efcontrols\v!yes{\addtocommalist\v!controls\@@efoptions}%
-   \doif\@@efrepeat\v!yes{\addtocommalist\v!repeat\@@efoptions}%
+   \doif\@@efrepeat  \v!yes{\addtocommalist\v!repeat  \@@efoptions}%
    \doif\@@eftype\c!mps
      {\ifcase\EPSspecial\else\ifinobject\else
         \@@eftrace{special mps, object forced}%
@@ -1322,6 +1308,7 @@
 \let\figurefilename\empty
 \let\figurefiletype\empty
 \let\figurefilepage\empty
+\let\figurefilepath\empty
 
 \def\finalizeexternalfigure#1#2%
   {\globalpushmacro\figurewidth
@@ -1330,12 +1317,21 @@
    \globalpushmacro\figurefilename
    \globalpushmacro\figurefiletype
    \globalpushmacro\figurefilepage
-   \xdef\figurewidth   {\the\figwid}%
-   \xdef\figureheight  {\the\fighei}%
-   \xdef\figurelabel   {#1}%
-   \xdef\figurefilename{#2}%
-   \xdef\figurefiletype{\@@eftype}%
-   \xdef\figurefilepage{\@@efpage}%
+   \globalpushmacro\figurefileconversion
+   \globalpushmacro\figurefileprefix
+   \globalpushmacro\figurefilepath
+   \xdef\figurewidth         {\the\figwid}%
+   \xdef\figureheight        {\the\fighei}%
+   \xdef\figurelabel         {#1}%
+   \xdef\figurefilename      {#2}%
+   \xdef\figurefiletype      {\@@eftype}%
+   \xdef\figurefilepage      {\@@efpage}%
+   \xdef\figurefileconversion{\@@efconversion}%
+   \xdef\figurefileprefix    {\@@efprefix}%
+   \xdef\figurefilepath      {\@@efcurrentpath}%
+   \doifmodeelse{\systemmodeprefix\v!first}
+     {\let\figurefullname\figurefilename}%
+     {\def\figurefullname{\figurefileprefix\figurefilename}}% no \edef
    \global\setbox\foundexternalfigure\vbox
      {\forgetall
       \ifcase\figurestatus
@@ -1347,7 +1343,7 @@
       \ifconditional\externalfigurelevel % probably background
         \ifskipexternalfigures
           % nothing
-\fakebox\foundexternalfigure
+          \fakebox\foundexternalfigure
         \else\ifcase\figurestatus
           % nothing
         \else\ifnum\splitexternalfigure=2\else
@@ -1358,9 +1354,9 @@
         \feedbackexternalfigure
         \settrue\externalfigurelevel
         \ifskipexternalfigures
-          \externalfigurereplacement{#1}{#2}{skipped}%
+          \externalfigurereplacement\figurelabel\figurefullname{skipped}%
         \else\ifcase\figurestatus
-          \externalfigurereplacement{#1}{#2}{unknown}%
+          \externalfigurereplacement\figurelabel\figurefullname{unknown}%
         \else\ifnum\splitexternalfigure=2
           \backgroundline[\@@efsplitcolor]
             {\fakebox\foundexternalfigure}%
@@ -1387,6 +1383,9 @@
                 \fi}}%
         \fi\fi\fi
       \fi}%
+   \globalpopmacro\figurefilepath
+   \globalpopmacro\figurefileprefix
+   \globalpopmacro\figurefileconversion
    \globalpopmacro\figurefilepage
    \globalpopmacro\figurefiletype
    \globalpopmacro\figurefilename
@@ -1427,7 +1426,6 @@
 \def\appliedfigurefullname  {\@@efcurrentfile}
 \def\appliedfigureidentifier{\@@efobjectname}
 \def\appliedfigureoptions   {\@@efoption}
-
 \def\appliedfigurefilesuffix{\figureextension{\@@efcurrenttype}}
 
 %D In \PDF\ one can specify an alternative graphic. This means
@@ -2100,7 +2098,6 @@
 
 \def\dotypesetbuffer[#1][#2]% beware: this will mix up the mp graphics
   {\bgroup
-   %\def\bufferprefix{\ifprotectbuffers\jobname-\fi typeset-}%
    \def\TEXbufferfile##1{\bufferprefix##1.tex}%
    \expanded{\setbuffer[typeset]%
      \def\noexpand\bufferprefix{\ifprotectbuffers\jobname-\fi typeset-}}%
@@ -2110,7 +2107,7 @@
    \endbuffer
    \doglobal\increment\noftypesetbuffers
    % batch is needed
-   \executesystemcommand{texexec --batch --pdf --result=\bufferprefix typeset-\noftypesetbuffers\space \bufferprefix typeset.tex}%
+   \executesystemcommand{texmfstart texexec --batch --pdf --result=\bufferprefix typeset-\noftypesetbuffers\space \bufferprefix typeset.tex}%
    %\externalfigure[\bufferprefix typeset-\noftypesetbuffers.pdf][\c!object=\v!no,#2]%
    \externalfigure[\bufferprefix typeset-\noftypesetbuffers.pdf][#2]%
    \egroup}
diff --git a/tex/context/base/core-grd.tex b/tex/context/base/core-grd.tex
index a1ff8cd50..929ee06a4 100644
--- a/tex/context/base/core-grd.tex
+++ b/tex/context/base/core-grd.tex
@@ -752,6 +752,8 @@
      \normalstartbaselinecorrection
    \fi}
 
+\chardef\gridboxlinenomode\plusone
+
 \def\setgridbox#1#2#3%
   {\setbox#1\ruledvbox to #3 % given size
      {\forgetall
@@ -767,10 +769,15 @@
          \dorecurse\noflines
            {\strut
             \hskip-.5\lineheight
-            \rlap
-              {\hskip\scratchdimen
-               \hskip2pt\infofont
-               \hbox to 1em{\hss\recurselevel}}%
+            \ifcase\gridboxlinenomode\or
+              \rlap
+                {\hskip.2\bodyfontsize\hskip\scratchdimen
+                 \infofont\hbox to 1em{\hss\recurselevel}}%
+            \or
+              \llap
+                {\infofont\hbox to 1em{\hss\recurselevel}%
+                 \hskip.2\bodyfontsize}%
+            \fi
             \vrule
               \!!height .5\testrulewidth
               \!!depth  .5\testrulewidth
diff --git a/tex/context/base/core-int.tex b/tex/context/base/core-int.tex
index 64fd9a8aa..6402d9664 100644
--- a/tex/context/base/core-int.tex
+++ b/tex/context/base/core-int.tex
@@ -967,10 +967,10 @@
   \let\do@@ammenuposition\gobbleoneargument % hook for positional thingies
 \fi
 
-\setvalue{\??am\s!do\v!right}{\@@amvbox{\dodummypageskip\v!right}\rightedgewidth}
-\setvalue{\??am\s!do\v!left }{\@@amvbox{\dodummypageskip\v!left}\leftedgewidth}
-\setvalue{\??am\s!do\v!top }{\@@amhbox{\dodummypageskip\v!top}\topheight}
-\setvalue{\??am\s!do\v!bottom }{\@@amhbox{\dodummypageskip\v!bottom}\bottomheight}
+\setvalue{\??am\s!do\v!right }{\@@amvbox{\dodummypageskip\v!right }\rightedgewidth}
+\setvalue{\??am\s!do\v!left  }{\@@amvbox{\dodummypageskip\v!left  }\leftedgewidth }
+\setvalue{\??am\s!do\v!top   }{\@@amhbox{\dodummypageskip\v!top   }\topheight     }
+\setvalue{\??am\s!do\v!bottom}{\@@amhbox{\dodummypageskip\v!bottom}\bottomheight  }
 
 \def\dointeractionmenu#1#2%
   {\getvalue{\??am\s!do\getvalue{\??am#1\c!location}}{#1}{#2}}
@@ -1333,7 +1333,7 @@
      {\dimen0=\wd0
       \divide\dimen0 3
       \multiply\dimen0 ##2\relax
-      \dimen2=.25em
+      \dimen2=.25em % brrr
       \advance\dimen0 -##3\dimen2
       %\gotodestination
       %  {}{#1}{\syncprefix:##1}{}
diff --git a/tex/context/base/core-lnt.tex b/tex/context/base/core-lnt.tex
index ed03672ad..9c215c992 100644
--- a/tex/context/base/core-lnt.tex
+++ b/tex/context/base/core-lnt.tex
@@ -29,25 +29,15 @@
   \global\collectedlinenotes\emptytoks
 \to \beforeeverylinenumbering
 
-% \def\dohandlelinenote#1#2#3%
-%   {\bgroup
-%    \expanded{\beforesplitstring#2}\at--\to\linenotelinenumber
-%    \ifnum\linenotelinenumber=\linenumber\relax
-%      % todo: \onlyfootnote{#2}{#3}% == configurable
-%      \setupnote[#1][\c!nummercommando=\gobbleoneargument]%
-%      \setnotetext[#1]{#2: #3}%
-%    \fi
-%    \egroup}
-
 \def\dohandlelinenote#1#2#3%
   {\bgroup
    \expanded{\beforesplitstring#2}\at--\to\linenotelinenumber
    \ifnum\linenotelinenumber=\linenumber\relax
-     % todo: \onlyfootnote{#2}{#3}% == configurable
+    % todo: \onlyfootnote{#2}{#3}% == configurable
     % \setupnote[#1][\c!numbercommand=\gobbleoneargument]%
     % \setnotetext[#1]{\rawreference\s!fnt{\s!fnt:f:\internalfootreference}{}#2: #3}%
       \def\linenotelinenumber##1{#2}%
-      \setupnote[#1][\c!numbercommand=\linenotelinenumber]%
+      \setupnote[#1][\c!numbercommand=\linenotelinenumber,\c!textcommand=\gobbleoneargument]%
       \setnote[#1]{#3}%
    \fi
    \egroup}
diff --git a/tex/context/base/core-not.tex b/tex/context/base/core-not.tex
index 410626a66..4ad15f68c 100644
--- a/tex/context/base/core-not.tex
+++ b/tex/context/base/core-not.tex
@@ -822,6 +822,7 @@
      \egroup
    \fi
    \insert\currentnoteins\bgroup\unvbox\localpostponednotes\egroup}
+% \fi} is better
 
 \def\doflushnotes % also called directly, \ifvoid is needed !
   {\ifconditional\processingnote \else \ifconditional\postponednote
@@ -957,7 +958,7 @@
 
 \def\doplacelocalnotes[#1][#2]%
   {\bgroup
-   \dolocalsetupnotes{#1}{#2}
+   \dolocalsetupnotes{#1}{#2}%
    \processnotes
      {\ExpandBothAfter\doifinsetelse\v!none{\noteparameter\c!location}
         \placenotesasnone\placenotesintext\localpostponednotes}%
@@ -1018,7 +1019,7 @@
 
 \def\doplacenotes[#1][#2]%
   {\bgroup
-   \dolocalsetupnotes{#1}{#2}
+   \dolocalsetupnotes{#1}{#2}%
    \processnotes\dodoplacenotes
    \egroup}
 
diff --git a/tex/context/base/core-ntb.tex b/tex/context/base/core-ntb.tex
index 0e1d90e04..8f8af34c5 100644
--- a/tex/context/base/core-ntb.tex
+++ b/tex/context/base/core-ntb.tex
@@ -1031,10 +1031,12 @@
           \global\pagegoal\scratchdimen
         \fi
         % brrr
-        \beforeTABLEsplitbox
-        \box\finaltblbox
-        \afterTABLEsplitbox
-        \@@tblsplitafter
+        \ifdim\ht\finaltblbox>\zeropoint
+          \beforeTABLEsplitbox
+          \box\finaltblbox
+          \afterTABLEsplitbox
+          \@@tblsplitafter
+        \fi
         \pagina
       \fi}}
 
diff --git a/tex/context/base/core-ref.tex b/tex/context/base/core-ref.tex
index cfa3d92b1..0b36fd5b8 100644
--- a/tex/context/base/core-ref.tex
+++ b/tex/context/base/core-ref.tex
@@ -1669,14 +1669,15 @@
 \def\reportreferenceerror#1#2%
   {\bgroup
    \the\everyreference % cleanup : etc in french
-   \ifvoorlopig\ifinpagebody\else
-     \doifsomething{#2}
-       {\inleft
-          {\infofont
-           \scratchdimen\leftmarginwidth
-           \advance\scratchdimen -2em
-           \doboundtext{#2}\scratchdimen{..}->}}%
-   \fi\fi
+   \ifinpagebody\else
+     \doifconcepttracing
+       {\doifsomething{#2}
+          {\inleft
+             {\infofont
+              \scratchdimen\leftmarginwidth
+              \advance\scratchdimen -2em
+              \doboundtext{#2}\scratchdimen{..}->}}}%
+   \fi
    \doifpredefinedreferenceelse
      \donothing
      {\predefinereference
diff --git a/tex/context/base/core-spa.tex b/tex/context/base/core-spa.tex
index 9193a96f6..9ccbdff3e 100644
--- a/tex/context/base/core-spa.tex
+++ b/tex/context/base/core-spa.tex
@@ -2344,7 +2344,7 @@
   {\setvalue{hbox#1}##1%
      {\hbox to #2{\begstrut##1\endstrut\hss}}}
 
-\def\definehbox%
+\def\definehbox
   {\dodoubleargument\dodefinehbox}
 
 \def\iobox#1#2#3#% here #3# is not really needed
@@ -3815,12 +3815,21 @@
      \hspace[][\s!default]%
    \fi\fi}
 
-\def\dodohspace[#1][#2#3]%
+% \def\dodohspace[#1][#2#3]%
+%   {\ifhmode
+%      \removeunwantedspaces
+%      \doifelse{#2}{-}
+%        {{\scratchskip\hspaceamount{#1}{#3}\hskip-\scratchskip}}
+%        {\hskip\hspaceamount{#1}{#2#3}}%
+%      \expandafter\ignorespaces
+%     \fi}
+%
+% not needed, tex handles -- as +
+
+\def\dodohspace[#1][#2]%
   {\ifhmode
      \removeunwantedspaces
-     \doifelse{#2}{-}
-       {{\scratchskip\hspaceamount{#1}{#3}\hskip-\scratchskip}}
-       {\hskip\hspaceamount{#1}{#2#3}}%
+     \hskip\hspaceamount{#1}{#2}%
      \expandafter\ignorespaces
     \fi}
 
@@ -3832,8 +3841,8 @@
 
 \definehspace [\v!small]   [.25\emspaceamount]
 \definehspace [\v!medium]  [.5\emspaceamount]
-\definehspace [\v!big]   [1\emspaceamount]
-\definehspace [\v!normal] [1\spaceamount]
+\definehspace [\v!big]     [1\emspaceamount]
+\definehspace [\v!normal]  [1\spaceamount]
 \definehspace [\v!default] [\spaceamount]
 
 %D Taken from Taco's math module (cq. \AMS\ macros), but
diff --git a/tex/context/base/core-uti.tex b/tex/context/base/core-uti.tex
index 6ea2c1812..7e8d995f5 100644
--- a/tex/context/base/core-uti.tex
+++ b/tex/context/base/core-uti.tex
@@ -299,11 +299,10 @@
    \ifutilitydone\else
      \doifsomething{#3}
        {\showmessage\m!systems9{{#3}}%
-        \ifvoorlopig
-          \blank
-          \type{[\currentmessagetext]}%
-          \blank
-        \fi}%
+        \doifconcepttracing
+          {\blank
+           \type{[\currentmessagetext]}%
+           \blank}}%
    \fi
    \disableinitializevariables
    \endgroup}
diff --git a/tex/context/base/enco-agr.tex b/tex/context/base/enco-agr.tex
index 941a2dc2c..f0464bbb7 100644
--- a/tex/context/base/enco-agr.tex
+++ b/tex/context/base/enco-agr.tex
@@ -115,7 +115,7 @@
 \definecharacter greekpsi                          121
 \definecharacter greekzeta                         122
 \definecharacter floorleft                         123
-\definecharacter bar                               124
+\definecharacter textbar                           124
 \definecharacter floorright                        125
 \definecharacter perispomeni                       126
 
diff --git a/tex/context/base/enco-ini.tex b/tex/context/base/enco-ini.tex
index 68b4e34c8..f53ee1670 100644
--- a/tex/context/base/enco-ini.tex
+++ b/tex/context/base/enco-ini.tex
@@ -780,31 +780,55 @@
 \def\startencoding
   {\dodoubleempty\dostartencoding}
 
+% \def\dostartencoding[#1][#2]% encoding regime
+%   {\doifelsenothing{#1}
+%      {\let\stopencoding\relax}
+%      {%\protectfontcharacters % problematic in language loading
+%       %\showmessage\m!encodings1{#1}%
+%       \pushmacro\dohandleaccent              % still needed?
+%       \pushmacro\dohandlecommand             % still needed?
+%       \pushmacro\definesortkey
+%       \pushmacro\characterregime
+%       \pushmacro\doautosetregime
+%       \let\dohandleaccent\donthandleaccent   % still needed?
+%       \let\dohandlecommand\donthandlecommand % still needed?
+%       \let\definesortkey\savesortkey
+%       \doifelsenothing{#2}%
+%         {\let\doautosetregime\gobbletwoarguments}
+%         {\def\characterregime{@#2@}}%
+%       \enableencoding[#1]%
+%       \def\stopencoding%
+%         {\popmacro\doautosetregime
+%          \popmacro\characterregime
+%          \popmacro\definesortkey
+%          \popmacro\dohandlecommand           % still needed?
+%          \popmacro\dohandleaccent            % still needed?
+%          \enableencoding[\s!default]%
+%          }}}% \unprotectfontcharacters}}} % ??
+
 \def\dostartencoding[#1][#2]% encoding regime
-  {\doifelsenothing{#1}
-     {\let\stopencoding\relax}
-     {%\protectfontcharacters % problematic in language loading
-      %\showmessage\m!encodings1{#1}%
-      \pushmacro\dohandleaccent              % still needed?
-      \pushmacro\dohandlecommand             % still needed?
-      \pushmacro\definesortkey
-      \pushmacro\characterregime
-      \pushmacro\doautosetregime
-      \let\dohandleaccent\donthandleaccent   % still needed?
-      \let\dohandlecommand\donthandlecommand % still needed?
-      \let\definesortkey\savesortkey
-      \doifelsenothing{#2}%
-        {\let\doautosetregime\gobbletwoarguments}
-        {\def\characterregime{@#2@}}%
-      \enableencoding[#1]%
-      \def\stopencoding%
-        {\popmacro\doautosetregime
-         \popmacro\characterregime
-         \popmacro\definesortkey
-         \popmacro\dohandlecommand           % still needed?
-         \popmacro\dohandleaccent            % still needed?
-         \enableencoding[\s!default]%
-         }}}% \unprotectfontcharacters}}} % ??
+  {%\showmessage\m!encodings1{#1}%
+   \pushmacro\characterencoding
+   \pushmacro\characterregime
+   \pushmacro\dohandleaccent              % still needed?
+   \pushmacro\dohandlecommand             % still needed?
+   \pushmacro\definesortkey
+   \pushmacro\doautosetregime
+   \let\dohandleaccent\donthandleaccent   % still needed?
+   \let\dohandlecommand\donthandlecommand % still needed?
+   \let\definesortkey\savesortkey
+   \edef\characterencoding{@#1@}%
+   \doifelsenothing{#2}%
+     {\let\doautosetregime\gobbletwoarguments}
+     {\def\characterregime{@#2@}}}
+
+\def\stopencoding%
+  {\popmacro\doautosetregime
+   \popmacro\definesortkey
+   \popmacro\dohandlecommand           % still needed?
+   \popmacro\dohandleaccent            % still needed?
+   \popmacro\characterregime
+   \popmacro\characterencoding}
 
 % probably obsolete (hm, not yet)
 
diff --git a/tex/context/base/font-ini.tex b/tex/context/base/font-ini.tex
index 12797b2c3..eb496ec94 100644
--- a/tex/context/base/font-ini.tex
+++ b/tex/context/base/font-ini.tex
@@ -1159,6 +1159,8 @@
 
 \let\stylelist=\empty
 
+\def\fontsizelist{\s!text,\s!script,\s!scriptscript,\c!x,\c!xx,\c!big,\c!small}
+
 %D \macros
 %D   {magfactor,magfactorhalf}
 %D
@@ -2070,7 +2072,7 @@
         \@EA\dododefinebodyfontenvironment\@EA[\tempbodyfontsize][#1][#3]}%
      \@@endfontdef
    \else
-     \definebodyfontenvironment[\fontclass][#1][#2]% changed
+     \definebodyfontenvironment[\fontclass][#1][#2]% change */*
    \fi}
 
 \def\dododefinebodyfontenvironment[#1][#2][#3]% size class settings
@@ -2081,9 +2083,7 @@
          \scratchdimen\csname\??ft\s!default##1\endcsname\scratchdimen
          \normalizebodyfontsize\scratchdimen\to\tempbodyfontsize
          \setevalue{\??ft#2#1##1}{\tempbodyfontsize}}%
-     \processcommalist
-       [\s!text,\s!script,\s!scriptscript,\c!x,\c!xx,\c!big,\c!small]
-       \docommando
+     \processcommacommand[\fontsizelist]\docommando
      \copyparameters
        [\??ft#2#1][\??ft\s!default]
        [\c!interlinespace,\c!em]}%
@@ -2410,41 +2410,87 @@
 
 \newif\ifdefiningunknownfont
 
+% \def\defineunknownfont#1%
+%   {\let\c!savedtext\c!text
+%    \let\c!text\s!text
+%    \donefalse
+%    \def\docommando##1%
+%      {\doifdefined{\??ft\s!default##1}
+%         {\donetrue
+%          \scratchdimen#1\relax
+%          \scratchdimen\csname\??ft\s!default##1\endcsname\scratchdimen
+%          \normalizebodyfontsize\scratchdimen\to\!!stringa
+%          \letvalue{\??ft#1##1}\!!stringa}}%
+%    \processcommacommand[\fontsizelist]\docommando
+%    \let\c!text\c!savedtext
+%    \ifdone
+%      \donefalse
+%      \def\defineunknownbodyfont##1% see ***
+%        %{\doifdefined{\s!default##1}
+%        %   {\donetrue\getvalue{\s!default##1}{#1}}}%
+%        {\doifdefined{\s!default\s!default##1}
+%           {\donetrue\getvalue{\s!default\s!default##1}{#1}{##1}}}%
+%      \processcommacommand
+%        [\stylelist]
+%        \defineunknownbodyfont
+%      \ifdone
+%        \setvalue{\@size@#1}{\docompletefontswitch[#1]}%
+%        \ifdefiningunknownfont \else
+%          \definingunknownfonttrue
+%          \def\defineunknownsubfont##1%
+%            {\doifundefined{\@size@\getvalue{\??ft#1##1}}
+%               {\defineunknownfont{\getvalue{\??ft#1##1}}}}%
+%          \processcommacommand[\fontsizelist]\defineunknownsubfont
+%          \definingunknownfontfalse
+%        \fi
+%      \fi
+%      \ifdone
+%        \showmessage\m!fonts{14}{#1}%
+%      \fi
+%    \fi}
+
+\def\dodefineunknownfont#1#2%
+  {\doifdefined{\??ft\s!default#2}
+     {\donetrue
+      \scratchdimen#1\relax
+      \scratchdimen\csname\??ft\s!default#2\endcsname\scratchdimen
+      \normalizebodyfontsize\scratchdimen\to\!!stringa
+      \letvalue{\??ft#1#2}\!!stringa}}
+
+\def\dodefineunknownbodyfont#1#2% see ***
+  {\doifdefined{\s!default\s!default#2}
+     {\donetrue
+      \getvalue{\s!default\s!default#2}{#1}{#2}}}
+
+% needs to be as follows, but test first:
+%
+% \def\dodefineunknownbodyfont#1#2% see ***
+%   {\doifdefined{\s!default\fontclass#2}% was \s!default\s!default (related to change */*)
+%      {\donetrue
+%       \getvalue{\s!default\fontclass#2}{#1}{#2}}}
+
+\def\dodefineunknownsubfont#1#2%
+  {\doifundefined{\@size@\getvalue{\??ft#1#2}}
+     {\donetrue
+      \defineunknownfont{\getvalue{\??ft#1#2}}}}
+
 \def\defineunknownfont#1%
   {\let\c!savedtext\c!text
    \let\c!text\s!text
    \donefalse
-   \def\docommando##1%
-     {\doifdefined{\??ft\s!default##1}
-        {\donetrue
-         \scratchdimen#1\relax
-         \scratchdimen\csname\??ft\s!default##1\endcsname\scratchdimen
-         \normalizebodyfontsize\scratchdimen\to\!!stringa
-         \letvalue{\??ft#1##1}\!!stringa}}%
-   \processcommalist
-     [\s!text,\s!script,\s!scriptscript,\c!x,\c!xx,\c!big,\c!small]
-     \docommando
+   \processcommacommand[\fontsizelist]{\dodefineunknownfont{#1}}%
    \let\c!text\c!savedtext
    \ifdone
      \donefalse
-     \def\defineunknownbodyfont##1% see ***
-       %{\doifdefined{\s!default##1}
-       %   {\donetrue\getvalue{\s!default##1}{#1}}}%
-       {\doifdefined{\s!default\s!default##1}
-          {\donetrue\getvalue{\s!default\s!default##1}{#1}{##1}}}%
      \processcommacommand
        [\stylelist]
-       \defineunknownbodyfont
+       {\dodefineunknownbodyfont{#1}}%
      \ifdone
+     \donefalse
        \setvalue{\@size@#1}{\docompletefontswitch[#1]}%
        \ifdefiningunknownfont \else
          \definingunknownfonttrue
-         \def\defineunknownsubfont##1%
-           {\doifundefined{\@size@\getvalue{\??ft#1##1}}
-              {\defineunknownfont{\getvalue{\??ft#1##1}}}}%
-         \processcommalist
-           [\s!text,\s!script,\s!scriptscript,\c!x,\c!xx,\c!big,\c!small]
-           \defineunknownsubfont
+         \processcommacommand[\fontsizelist]{\dodefineunknownsubfont{#1}}%
          \definingunknownfontfalse
        \fi
      \fi
@@ -2453,10 +2499,10 @@
      \fi
    \fi}
 
-\def\defineunknownfontstyles#1%
-  {\def\defineunknownbodyfont##1% see ***
-     {\executeifdefined{\s!default\s!default##1}\gobbletwoarguments{#1}{##1}}%
-   \rawprocesscommacommand[\stylelist]\defineunknownbodyfont}
+% \def\defineunknownfontstyles#1%
+%   {\def\defineunknownbodyfont##1% see ***
+%      {\executeifdefined{\s!default\s!default##1}\gobbletwoarguments{#1}{##1}}%
+%    \rawprocesscommacommand[\stylelist]\defineunknownbodyfont}
 
 %D These macros show that quite some definitions take place.
 %D Fonts are not loaded yet! This means that at format
@@ -2637,6 +2683,22 @@
            {\showmessage\m!fonts3{#2}}}%
       \stopreadingfile}}
 
+% \def\doreadfontdefinitionfile#1#2% #1 = set/switch state
+%   {\doifundefined{\c!file\f!fontprefix#2}%
+%      {\ifloadfontfileonce
+%         \letvalue{\c!file\f!fontprefix#2}\empty
+%       \fi
+%       \startreadingfile
+%       \readsysfile{\truefilename{\f!fontprefix#2}}
+%         {\showmessage\m!fonts2}
+%         {\makeshortfilename[\truefilename{\f!fontprefix#2}]%
+%          \readsysfile\shortfilename
+%            {\showmessage\m!fonts2}
+%            {\showmessage\m!fonts3}}%
+%         {#2}% argument to \showmessage
+%       \stopreadingfile}}
+
+
 %D When \type {\loadfontfileoncetrue}, such files are
 %D only loaded once! This permits redundant loading, but at
 %D the same time forced grouping when we want continuously mix
@@ -2726,6 +2788,8 @@
    \the\everybodyfont
    \global\let\preloadfonts\relax}
 
+% \prependtoks \preloadfonts \to \everydump % saves .1 s on a DELL P60 - 2GHZ
+
 %D Here comes the main font switching macros. These macros
 %D handle changes in size as well as returning to the global
 %D bodyfont size.
@@ -4268,9 +4332,9 @@
                  *=\currentfontscale, % wildcard
               \c!x=0.8,
              \c!xx=0.6,
-          \c!big=1.2,
+            \c!big=1.2,
           \c!small=0.8,
-     \c!interlinespace=,
+ \c!interlinespace=,
              \c!em=\v!slanted]
 
 \definebodyfontenvironment
@@ -4280,7 +4344,7 @@
    \s!scriptscript=\!!twelvepoint,
               \c!x=17.3pt,
              \c!xx=\!!fourteenpointfour,
-          \c!big=20.7pt,    % !!!!
+            \c!big=20.7pt,    % !!!!
           \c!small=17.3pt]
 
 \definebodyfontenvironment
@@ -4290,7 +4354,7 @@
    \s!scriptscript=\!!tenpoint,
               \c!x=\!!fourteenpointfour,
              \c!xx=\!!twelvepoint,
-          \c!big=20.7pt,
+            \c!big=20.7pt,
           \c!small=\!!fourteenpointfour]
 
 \definebodyfontenvironment
@@ -4300,7 +4364,7 @@
    \s!scriptscript=\!!ninepoint,
               \c!x=\!!twelvepoint,
              \c!xx=\!!tenpoint,
-          \c!big=17.3pt,
+            \c!big=17.3pt,
           \c!small=\!!twelvepoint]
 
 \definebodyfontenvironment
@@ -4310,7 +4374,7 @@
    \s!scriptscript=\!!sevenpoint,
               \c!x=\!!tenpoint,
              \c!xx=\!!eightpoint,
-          \c!big=\!!fourteenpointfour,
+            \c!big=\!!fourteenpointfour,
           \c!small=\!!tenpoint]
 
 \definebodyfontenvironment
@@ -4320,7 +4384,7 @@
    \s!scriptscript=\!!sixpoint,
               \c!x=\!!ninepoint,
              \c!xx=\!!sevenpoint,
-          \c!big=\!!twelvepoint,
+            \c!big=\!!twelvepoint,
           \c!small=\!!ninepoint]
 
 \definebodyfontenvironment
@@ -4330,7 +4394,7 @@
    \s!scriptscript=\!!fivepoint,
               \c!x=\!!eightpoint,
              \c!xx=\!!sixpoint,
-          \c!big=\!!twelvepoint,
+            \c!big=\!!twelvepoint,
           \c!small=\!!eightpoint]
 
 \definebodyfontenvironment
@@ -4340,7 +4404,7 @@
    \s!scriptscript=\!!fivepoint,
               \c!x=\!!sevenpoint,
              \c!xx=\!!fivepoint,
-          \c!big=\!!elevenpoint,
+            \c!big=\!!elevenpoint,
           \c!small=\!!sevenpoint]
 
 \definebodyfontenvironment
@@ -4350,7 +4414,7 @@
    \s!scriptscript=\!!fivepoint,
               \c!x=\!!sixpoint,
              \c!xx=\!!fivepoint,
-          \c!big=\!!tenpoint,
+            \c!big=\!!tenpoint,
           \c!small=\!!sixpoint]
 
 \definebodyfontenvironment
@@ -4360,7 +4424,7 @@
    \s!scriptscript=\!!fivepoint,
               \c!x=\!!sixpoint,
              \c!xx=\!!fivepoint,
-          \c!big=\!!ninepoint,
+            \c!big=\!!ninepoint,
           \c!small=\!!fivepoint]
 
 \definebodyfontenvironment
@@ -4370,7 +4434,7 @@
    \s!scriptscript=\!!fivepoint,
               \c!x=\!!fivepoint,
              \c!xx=\!!fivepoint,
-          \c!big=\!!eightpoint,
+            \c!big=\!!eightpoint,
           \c!small=\!!fivepoint]
 
 \definebodyfontenvironment
@@ -4380,7 +4444,7 @@
    \s!scriptscript=\!!fivepoint,
               \c!x=\!!fivepoint,
              \c!xx=\!!fivepoint,
-          \c!big=\!!sevenpoint,
+            \c!big=\!!sevenpoint,
           \c!small=\!!fivepoint]
 
 \definebodyfontenvironment
@@ -4390,7 +4454,7 @@
    \s!scriptscript=\!!fourpoint,
               \c!x=\!!fourpoint,
              \c!xx=\!!fourpoint,
-          \c!big=\!!sixpoint,
+            \c!big=\!!sixpoint,
           \c!small=\!!fourpoint]
 
 \definebodyfontswitch [fourteenpointfour] [\!!fourteenpointfour]
diff --git a/tex/context/base/lang-all.xml b/tex/context/base/lang-all.xml
new file mode 100644
index 000000000..f0a371163
--- /dev/null
+++ b/tex/context/base/lang-all.xml
@@ -0,0 +1,340 @@
+<?xml version='1.0' standalone='yes'?>
+
+<!-- author: Willy Egger -->
+
+<descriptions>
+
+<description language='ba'>
+    <sourcefile>bahyph.tex</sourcefile>
+    <title>TeX hyphenation patterns for the  Basque language</title>
+    <copyright>
+        <year>1991</year>
+        <owner>Julio Sanchez (jsanchez@gmv.es)</owner>
+        <comment>These patterns have been derived from "On Word Division in Spanish"
+			Jos'e A. Ma~nas</comment>
+    </copyright>
+    <copyright>
+        <year>1997</year>
+        <owner>Juan M. Aguirregabiria (wtpagagj@lg.ehu.es)</owner>
+        <comment>Adaption to TeX based on shyphen.sh</comment>
+    </copyright>
+</description>
+
+<description language='ca'>
+    <sourcefile>cahyph.tex</sourcefile>
+    <title>TeX hyphenation patterns for the Catalan language</title>
+    <remarks>Version 1.11</remarks>
+    <copyright>
+        <year>1991-1995 </year>
+        <owner>Gon\c{c}al Badenes,Francina Turon</owner>
+    </copyright>
+    <copyright>
+        <year>1991-2003</year>
+        <owner>Gon\c{c}al Badenes</owner>
+    </copyright>
+</description>
+
+<description language='cy'>
+    <sourcefile>cyhyph.tex</sourcefile>
+    <title>TeX hyphenation patterns for the Welsh Language</title>
+    <remarks>v3,GNU General Public License</remarks>
+    <copyright>
+        <year>1996</year>
+        <owner>Yannis Haralambous</owner>
+        <comment>Inputs cathyph.tex, patterns in EC/DC encoding</comment>
+    </copyright>
+</description>
+
+<description language='cz'>
+    <sourcefile>czhyphen.tex</sourcefile>
+    <title>TeX hyphenation patterns for the Czech language</title>
+    <copyright>
+        <year>1991</year>
+        <owner>Karel Horak</owner>
+        <comment>List of exceptions</comment>
+    </copyright>
+    <copyright>
+        <year>1995</year>
+        <owner>Pavel Sevecek (\v{S}eve\v{c}ek) (pavel@lingea.cz)</owner>
+        <comment>Macros, adaption for TeX 2</comment>
+    </copyright>
+    <!-- samples>
+        <sample>au-to-ma-tic-ký</sample>
+        <sample>bram-bo-rák</sample>
+        <sample>da-ta-bá-ze</sample>
+        <sample>kr-ka-vec</sample>
+        <sample>Kro-me-ríš</sample>
+        <sample>ob-hos-po-da-ro-vat</sample>
+        <sample>rem-dich</sample>
+        <sample>scvrk-nout</sample>
+        <sample>za-les-nit</sample>
+        <sample>že-žu-lic-ka</sample>
+    </samples -->
+</description>
+
+<description language='da'>
+    <sourcefile>dkspecial.tex dkcommon.tex</sourcefile>
+    <title>TeX hyphenation patterns for the Danish language</title>
+    <copyright/>
+</description>
+
+<description language='de'>
+    <sourcefile>dehyphn.tex</sourcefile>
+    <title>TeX hyphenation patterns for the German language (new orthography)</title>
+    <copyright>
+        <year>1988, 1991</year>
+        <owner>Rechenzentrum der Ruhr-Universitaet Bochum</owner>
+        <comment>German hyphen patterns</comment>
+    </copyright>
+    <copyright>
+        <year>1993, 1994, 1999</year>
+        <owner>Bernd Raichle/DANTE e.V.</owner>
+        <comment>Macros, adaption for TeX 2</comment>
+    </copyright>
+    <copyright>
+        <year>1998-2001</year>
+        <owner>Walter Schmidt</owner>
+        <comment>Adaption to new German orthography</comment>
+    </copyright>
+</description>
+
+<description language='de'>
+    <sourcefile>dehypht.tex</sourcefile>
+    <title>TeX hyphenation patterns for the German language (traditional orthography)</title>
+    <copyright>
+        <year>1988, 1991</year>
+        <owner>Rechenzentrum der Ruhr-Universitaet Bochum</owner>
+        <comment>German hyphen patterns</comment>
+    </copyright>
+    <copyright>
+        <year>1993, 1994, 1999</year>
+        <owner>Bernd Raichle/DANTE e.V.</owner>
+        <comment>Macros, adaption for TeX 2</comment>
+    </copyright>
+</description>
+
+<description language='en'>
+    <sourcefile>hyphen.tex</sourcefile>
+    <title>Plain TeX hyphenation patterns for the English language (US) </title>
+    <remarks>[NOT TO BE CHANGED IN ANY WAY!]</remarks>
+    <copyright/>
+</description>
+
+<description language='es'>
+    <sourcefile>eshyph.tex</sourcefile>
+    <title>TeX hyphenation patterns for the Spanish language</title>
+    <copyright>
+        <year>1993</year>
+        <owner>Francesc Carmona (franc@porthos.bio.ub.es)</owner>
+    </copyright>
+</description>
+
+<description language='fi'>
+    <sourcefile>fihyph.tex</sourcefile>
+    <title>TeX hyphenation patterns for the Finnish language</title>
+    <copyright>
+        <year>1986</year>
+        <owner>Kauko Saarinen</owner>
+        <comment>First release</comment>
+    </copyright>
+    <copyright>
+        <year>1988</year>
+        <owner>Fred Karlsson</owner>
+        <comment>Completely rewritten patterns</comment>
+    </copyright>
+	    <copyright>
+        <year>1989</year>
+        <owner>Fred Karlsson</owner>
+        <comment>Some vowel tripples added</comment>
+    </copyright>
+	<copyright>
+        <year>1995</year>
+        <owner>Thomas Esser</owner>
+        <comment>Added \uccode and \lccode </comment>
+    </copyright>
+</description>
+
+<description language='fr'>
+    <sourcefile>frhyph.tex</sourcefile>
+    <title>TeX hyphenation patterns for the French language</title>
+    <remarks>V2.11</remarks>
+    <copyright>
+        <owner>Jacques Desarmenien, Norman Buckle, Michael Ferguson, Justin Bur, Daniel Flipo and Bernard Gaulle</owner>
+    </copyright>
+    <copyright>
+        <year>1996</year>
+        <owner>Bernd Raichle/DANTE e.V.</owner>
+        <comment>Adaption for TeX 3.x and MLTeX 3.x (2.x)</comment>
+    </copyright>
+</description>
+
+<description language='hr'>
+    <sourcefile> hrhyph.tex</sourcefile>
+    <title>TeX hyphenation patterns for the Croatian language</title>
+    <copyright>
+        <year>1994, 1996</year>
+        <owner>Marinovi\'c Igor (migor@student.math.hr)</owner>
+    </copyright>
+</description>
+
+<description language='hu'>
+    <sourcefile> huhyphn.tex</sourcefile>
+    <title>TeX hyphenation patterns for the Hungarian language</title>
+</description>
+
+<description language='is'>
+    <sourcefile>dehyphn.tex</sourcefile>
+    <title>Plain TeX hyphenation patterns for the Icelandic language</title>
+    <remarks>[NOT TO BE CHANGED IN ANY WAY!]</remarks>
+    <copyright>
+        <year>1987</year>
+        <owner>Jorgen Pind</owner>
+    </copyright>
+</description>
+
+<description language='it'>
+    <sourcefile>ithyph.tex</sourcefile>
+    <title>TeX hyphenation patterns for the Italian language</title>
+    <remarks>v4.8d</remarks>
+    <copyright>
+        <year>1998, 2001</year>
+        <owner>Claudio Beccari</owner>
+    </copyright>
+    <copyright>
+        <year>1993, 1994, 1999</year>
+        <owner>Bernd Raichle/DANTE e.V.</owner>
+        <comment>Macros, adaption for TeX 2</comment>
+    </copyright>
+</description>
+
+<description language='la`'>
+    <sourcefile>lahyph.tex</sourcefile>
+    <title>TeX hyphenation patterns for the Latin language</title>
+    <remarks>v3.0b</remarks>
+    <copyright>
+        <year>1999-2001</year>
+        <owner>Claudio Beccari</owner>
+    </copyright>
+    <copyright>
+        <year>1993, 1994, 1998, 1999</year>
+        <owner>Bernd Raichle/DANTE e.V.</owner>
+        <comment>Macro code in 'dehypht.tex'</comment>
+    </copyright>
+</description>
+
+<description language='nl'>
+    <sourcefile>nehyph96.tex</sourcefile>
+    <title>TeX hyphenation patterns for the Dutch language</title>
+    <copyright>
+        <year>1996</year>
+        <owner> Piet Tutelaers (P.T.H.Tutelaers@tue.nl)</owner>
+        <comment>8-bit hyphenation patterns for TeX based upon the new Dutch
+          spelling, officially since 1 August 1996. These patterns follow
+          the new hyphenation rules in the `Woordenlijst Nederlandse
+          Taal, SDU Uitgevers, Den Haag 1995' (the so called `Groene
+          Boekje') described in section 5.2 (Het afbreekteken)</comment>
+    </copyright>
+</description>
+
+<description language='no'>
+    <sourcefile>nohyph.tex</sourcefile>
+    <title>TeX hyphenation patterns for the Norwegian language</title>
+    <copyright>
+        <year>1992,1993</year>
+        <owner>Ivar Aavatsmark</owner>
+        <comment>nohyphen.tex based on danhyph.tex</comment>
+    </copyright>
+    <copyright>
+        <year>1994</year>
+        <owner>Preben Randhol, Jon Martin Solaas</owner>
+    </copyright>
+    <copyright>
+        <year>1995</year>
+        <owner>Thomas Esser (te@dbs.uni-hannover.de)</owner>
+        <comment>Make patterns work with non-T1 encoding</comment>
+    </copyright>
+</description>
+
+<description language='pl'>
+    <sourcefile>plhyph.tex</sourcefile>
+    <title>TeX hyphenation patterns for the Polish language</title>
+    <copyright/>
+</description>
+
+<description language='pt'>
+    <sourcefile>pthyph.tex</sourcefile>
+    <title>TeX hyphenation patterns for the Portuguese language</title>
+    <copyright/>
+</description>
+
+<description language='ro'>
+    <sourcefile>rohyph.tex</sourcefile>
+    <title>TeX hyphenation patterns for the Romanian language</title>
+    <copyright/>
+</description>
+
+<description language='sk'>
+    <sourcefile>skhyphen.tex skhyphen.ex</sourcefile>
+    <title>TeX hyphenation patterns for the Slovakian language</title>
+    <copyright>
+        <year>1992</year>
+        <owner>Jana Chlebikova</owner>
+    </copyright>
+    <copyright>
+        <year>1991</year>
+        <owner>Karel Horak</owner>
+        <comment>List of exceptions</comment>
+    </copyright>
+</description>
+
+<description language='sl'>
+    <sourcefile>sihyph.tex</sourcefile>
+    <title>TeX hyphenation patterns for the Slovenian language</title>
+    <copyright>
+        <year>1990</year>
+        <owner>TeXCeX (SLO),TeXCeH Norbert Schwarz</owner>
+    </copyright>
+	<copyright>
+        <year>1994</year>
+        <owner>Leon "Zlajpah (leon.zlajpah@ijs.si)</owner>
+        <comment>Use of code page 852 in patterns</comment>
+    </copyright>
+    <copyright>
+        <year>1995,1997</year>
+        <owner>Leon "Zlajpah (leon.zlajpah@ijs.si)</owner>
+        <comment>Adaptaion of Slovenian hyphenation pattens, macros</comment>
+    </copyright>
+</description>
+
+<description language='sv'>
+    <sourcefile>svhyph.tex</sourcefile>
+    <title>TeX hyphenation patterns for the Swedish language</title>
+    <copyright>
+        <year>1991,1994</year>
+        <owner>Jan Michael Rynning</owner>
+    </copyright>
+</description>
+
+<description language='tk'>
+    <sourcefile>tkhyph.tex</sourcefile>
+    <title>TeX hyphenation patterns for the modern Turkish language</title>
+    <copyright>
+        <year>1996</year>
+        <owner>Yannis Haralambous</owner>
+        <comment>A mechanically generated Turkish Hyphenation table for TeX,
+			using the University of Washington diacritical coding
+			developed by P. A. MacKay for the Ottoman Texts Project</comment>
+    </copyright>
+</description>
+
+<description language='uk'>
+    <sourcefile>ukhyphen.tex</sourcefile>
+    <title>TeX hyphenation patterns for the English language (UK)</title>
+    <copyright/>
+</description>
+
+<description language='vn'>
+    <comment>Vietnamese needs no patterns.</comment>
+</description>
+
+</descriptions>
diff --git a/tex/context/base/m-arabtex.tex b/tex/context/base/m-arabtex.tex
index 36cdc197c..6220835f5 100644
--- a/tex/context/base/m-arabtex.tex
+++ b/tex/context/base/m-arabtex.tex
@@ -395,13 +395,13 @@
 \unexpanded\def\pheb  {\sethebrewfont\s!Regular}
 \unexpanded\def\phebbf{\sethebrewfont\s!Bold}
 
-\startloadingARABTEX
+% \startloadingARABTEX
 
-  \ReadFile{hebtex.sty}
-  \ReadFile{apatch.sty}
-  \ReadFile{hepatch.sty}
+%   \ReadFile{hebtex.sty}
+%   \ReadFile{apatch.sty}
+%   \ReadFile{hepatch.sty}
 
-\stoploadingARABTEX
+% \stoploadingARABTEX
 
 \definefontsynonym [HebrewRegular] [hclassic]
 \definefontsynonym [HebrewBold]    [hcaption]
diff --git a/tex/context/base/m-chart.tex b/tex/context/base/m-chart.tex
index b5defdc8f..cc9114ff6 100644
--- a/tex/context/base/m-chart.tex
+++ b/tex/context/base/m-chart.tex
@@ -160,13 +160,8 @@
   {\gdef\FLOWoverlay{#1}\ignorespaces}
 
 \def\doFLOWfigure#1%
-  {\defineoverlay
-     [\s!dummy]
-     [{\externalfigure
-         [#1]
-         [\c!width=\overlaywidth,
-          \c!height=\overlayheight]}]%
-   \overlay{\s!dummy}}
+  {\defineoverlay[\s!dummy][\overlayfigure{#1}]%
+   \overlay\s!dummy}
 
 \def\doFLOWtext
   {\dosingleempty\dodoFLOWtext}
@@ -218,8 +213,7 @@
 \def\preparenextFLOWchart#1#2%
   {\doglobal\increment\nofFLOWcharts
    \flowchart{#1}%
-   \setxvalue{\@FLOW@-#1}%
-     {\noexpand\dohandleflowchart[\nofFLOWcharts][#2]}}
+   \setxvalue{\@FLOW@-#1}{\noexpand\dohandleflowchart[\nofFLOWcharts][#2]}}
 
 \def\setupFLOWcharts{\dodoubleargument\getparameters[\@@FLOW]}
 \def\setupFLOWlines {\dodoubleargument\getparameters[\@@FLOL]}
@@ -284,7 +278,7 @@
 \newcounter\includeFLOWx
 \newcounter\includeFLOWy
 
-\def\includeFLOWchart%
+\def\includeFLOWchart
   {\dodoubleempty\doincludeFLOWchart}
 
 \def\doincludeFLOWchart[#1][#2]%
@@ -311,7 +305,7 @@
 %  \scratchcounter=0#2\advance\scratchcounter\includeFLOWy
 %  \xdef\FLOWlocation{\FLOWlocation,\the\scratchcounter}}
 
-\def\resetFLOWlocation%
+\def\resetFLOWlocation
   {\gdef\lastFLOWx{0}%
    \gdef\lastFLOWy{0}}
 
@@ -541,9 +535,11 @@
       \s!unknown=>\startMPdrawing
                     show_\@@FLOWdot_points := true ;
                   \stopMPdrawing]%
+\doglobal\newcounter\FLOWcomment
    \let\startFLOWcell\startFLOWcellB
    \resetFLOWlocation
    \processFLOWbuffer\currentFLOWnumber
+\doglobal\newcounter\FLOWcomment
    \let\startFLOWcell\startFLOWcellC
    \resetFLOWlocation
    \processFLOWbuffer\currentFLOWnumber
@@ -756,7 +752,7 @@
 
 % Pass D
 
-\long\def\startFLOWcellD#1\stopFLOWcell%
+\long\def\startFLOWcellD#1\stopFLOWcell
   {\resetFLOWcell
 \pushmacro\lastFLOWx
 \pushmacro\lastFLOWy
@@ -805,12 +801,13 @@
              \dimen2=\clipMPury
              \advance\dimen2 -\@@FLOW@@offset
              \advance\dimen2 -\getvalue{\@@MPy\FLOWcomment}\s!bp
-             \setbox0=\hbox{\strut#2}%
-             \boxoffset=.5\bodyfontsize
-             \setbox0=\hbox
-               {\hskip\dimen0\lower\dimen2\getvalue{FLOW#1}{\box0}}%
-             \wd0=\zeropoint\ht0=\zeropoint\dp0=\zeropoint
-             \box0
+             \setbox\scratchbox\hbox{\strut#2}%
+             \boxoffset.5\bodyfontsize
+             \setbox\scratchbox\hbox{\hskip\dimen0\lower\dimen2\getvalue{FLOW#1}{\box\scratchbox}}%
+             \smashbox\scratchbox
+             \box\scratchbox
+             \boxoffset\zeropoint
+             \nointerlineskip % really needed
            \fi
          \fi
        \fi
@@ -891,6 +888,9 @@
    \ifdone
      \dophasetwoFLOWcellX
      \doglobal\addtocommalist\FLOWcell\FLOWcells
+     \def\FLOWx{#1}%
+     \def\FLOWy{#2}%
+     \directsetup{flowcell}%
      \setbox0\hbox
        {\ifx\FLOWalign\empty\else
           \setupframed
@@ -906,10 +906,9 @@
         \fi
         \doifelse\FLOWshape{none} % {\v!none}
           {\setupframed[\c!offset=\v!overlay]}
-         %{\setupframed[\c!offset=.5\bodyfontsize]}%
           {\setupframed[\c!offset=\@@FLOSoffset]}%
         \framed
-          [\c!frame=\v!off,
+          [\c!frame=\v!off,\c!background=flowcell,
            \c!width=\FLOWshapewidth,\c!height=\FLOWshapeheight]
           {\FLOWtext}}%
        \showFLOWhelp0
@@ -921,7 +920,7 @@
      \positionFLOWzero
      \dimen0=\FLOWshapewidth \dimen2=.5\dimen0
      \dimen4=\FLOWshapeheight\dimen6=.5\dimen4
-     \boxoffset=.5\bodyfontsize
+     \boxoffset.5\bodyfontsize
      \doFLOWtlabel   \righttopbox0\tFLOWlabel
      \doFLOWblabel\rightbottombox0\bFLOWlabel
      \doFLOWllabel    \lefttopbox0\lFLOWlabel
@@ -934,8 +933,23 @@
      \ifnum#1=\!!countc      \doFLOWrlabel  \rightbox1\rFLOWexit \fi
      \ifnum#2=\@@FLOWy\relax \doFLOWtlabel    \topbox1\tFLOWexit \fi
      \ifnum#2=\!!countd      \doFLOWblabel \bottombox1\bFLOWexit \fi
+     \boxoffset\zeropoint
    \fi}
 
+% For Willy Egger:
+%
+% \startsetups flowcell
+%   \definelayer
+%     [flowcell]
+%     [width=\FLOWshapewidth,
+%      height=\FLOWshapeheight]
+%   \setlayerframed
+%     [flowcell]
+%     [preset=rightbottom,offset=1ex]
+%     [frame=off]
+%     {\tx(\FLOWx,\FLOWy)}
+% \stopsetups
+
 % Pass E
 
 \long\def\startFLOWcellE#1\stopFLOWcell
@@ -944,120 +958,6 @@
    \let\doprocessFLOWcell\doprocessFLOWcellE
    \expandafter\doprocessFLOWcell\FLOWlocation\end}
 
-\def\dophaseoneFLOWcellX#1#2%
-  {\!!counta#1\relax
-   \!!countb#2\relax
-   \!!countc\@@FLOWx
-   \!!countd\@@FLOWy
-   \advance\!!countc \@@FLOWnx
-   \advance\!!countd \@@FLOWny
-   \advance\!!countc \minusone
-   \advance\!!countd \minusone
-        \ifnum\!!counta<\@@FLOWx\relax  \donefalse
-   \else\ifnum\!!counta>\!!countc       \donefalse
-   \else\ifnum\!!countb<\@@FLOWy\relax  \donefalse
-   \else\ifnum\!!countb>\!!countd       \donefalse
-   \else                                \donetrue
-   \fi\fi\fi\fi}
-
-\def\dophasetwoFLOWcellX
-  {\advance\!!counta -\@@FLOWx
-   \advance\!!counta \plusone
-   \advance\!!countb -\@@FLOWy
-   \advance\!!countb \plusone
-   \dimen0=\FLOWgridwidth
-   \dimen0=\!!counta\dimen0
-   \advance\dimen0 -\FLOWgridwidth
-   \dimen4=\FLOWgridwidth
-   \advance\dimen4 -\FLOWshapewidth
-   \advance\dimen0 .5\dimen4
-   \dimen2=\FLOWgridheight
-   \dimen2=\!!countb\dimen2
-   \dimen4=\FLOWgridheight
-   \advance\dimen4 -\FLOWshapeheight
-   \advance\dimen2 -.5\dimen4
-   \edef\FLOWdx{\the\dimen0}%
-   \edef\FLOWdy{\the\dimen2}}
-
-\def\positionFLOWzero% assumes \FLOWdx and \FLOWdy are set
-  {\setbox0\hbox{\hskip\FLOWdx\lower\FLOWdy\box0}%
-   \smashbox0\box0
-   \nointerlineskip}%
-
-\def\doFLOWtlabel#1#2#3%
-  {\scratchdimen\ifcase#2 \zeropoint\else\@@FLOWdy\fi
-   \setbox0\hbox{\hskip\dimen2\raise\scratchdimen
-     \hbox{\raise\dimen4\hbox{#1{\strut#3}}}}%
-   \positionFLOWzero}%
-
-\def\doFLOWblabel#1#2#3%
-  {\scratchdimen\ifcase#2 \zeropoint\else\@@FLOWdy\fi
-   \setbox0\hbox{\hskip\dimen2\raise-\scratchdimen
-     \hbox{#1{\strut#3}}}%
-   \positionFLOWzero}%
-
-\def\doFLOWllabel#1#2#3%
-  {\scratchdimen\ifcase#2 \zeropoint\else\@@FLOWdx\fi
-   \setbox0\hbox{\hskip-\scratchdimen\raise\dimen6
-     \hbox{#1{\strut#3}}}%
-   \positionFLOWzero}%
-
-\def\doFLOWrlabel#1#2#3%
-  {\scratchdimen\ifcase#2 \zeropoint\else\@@FLOWdx\fi
-   \setbox0\hbox{\hskip\dimen0\hskip\scratchdimen
-   \hbox{\raise\dimen6\hbox{#1{\strut#3}}}}%
-   \positionFLOWzero}
-
-\def\doprocessFLOWcellD#1,#2\end
-  {\dophaseoneFLOWcellX{#1}{#2}%
-   \ifdone
-     \dophasetwoFLOWcellX
-     \doglobal\addtocommalist\FLOWcell\FLOWcells
-     \setbox0\hbox
-       {\ifx\FLOWalign\empty\else
-          \setupframed
-            [\c!align=\v!normal,\c!bottom=\vfill,\c!top=\vfill]%
-          \@EA\processallactionsinset\@EA
-            [\FLOWalign]
-            [t=>{\setupframed[\c!bottom=\vfill,\c!top=]},
-             b=>{\setupframed[\c!bottom=,\c!top=\vfill]},
-             l=>{\setupframed[\c!align=\v!right]},
-             r=>{\setupframed[\c!align=\v!left]},
-             m=>{\setupframed[\c!align=\v!middle]},
-             c=>{\setupframed[\c!align=\v!middle]}]%
-        \fi
-        \doifelse\FLOWshape{none} % {\v!none}
-          {\setupframed[\c!offset=\v!overlay]}
-         %{\setupframed[\c!offset=.5\bodyfontsize]}%
-          {\setupframed[\c!offset=\@@FLOSoffset]}%
-        \framed
-          [\c!frame=\v!off,
-           \c!width=\FLOWshapewidth,\c!height=\FLOWshapeheight]
-          {\FLOWtext}}%
-       \showFLOWhelp0
-       \ifx\FLOWdestination\empty\else
-         \setbox0\hbox
-           {\setupinteraction[\c!color=,\c!contrastcolor=]%
-            \gotobox{\box0}[\FLOWdestination]}%
-       \fi
-     \positionFLOWzero
-     \dimen0=\FLOWshapewidth \dimen2=.5\dimen0
-     \dimen4=\FLOWshapeheight\dimen6=.5\dimen4
-     \boxoffset=.5\bodyfontsize
-     \doFLOWtlabel   \righttopbox0\tFLOWlabel
-     \doFLOWblabel\rightbottombox0\bFLOWlabel
-     \doFLOWllabel    \lefttopbox0\lFLOWlabel
-     \doFLOWrlabel   \righttopbox0\rFLOWlabel
-     \doFLOWtlabel        \topbox0\tcFLOWlabel % for me only
-     \doFLOWblabel     \bottombox0\bcFLOWlabel % for me only
-     \doFLOWllabel       \leftbox0\lcFLOWlabel % for me only
-     \doFLOWrlabel      \rightbox0\rcFLOWlabel % for me only
-     \ifnum#1=\@@FLOWx\relax \doFLOWllabel   \leftbox1\lFLOWexit \fi
-     \ifnum#1=\!!countc      \doFLOWrlabel  \rightbox1\rFLOWexit \fi
-     \ifnum#2=\@@FLOWy\relax \doFLOWtlabel    \topbox1\tFLOWexit \fi
-     \ifnum#2=\!!countd      \doFLOWblabel \bottombox1\bFLOWexit \fi
-   \fi}
-
 \def\doprocessFLOWcellE#1,#2\end  % redundant
   {\ifx\FLOWoverlay\empty \else
      \dophaseoneFLOWcellX{#1}{#2}%
diff --git a/tex/context/base/m-quest.tex b/tex/context/base/m-quest.tex
index 7627a1bc3..d20c86c93 100644
--- a/tex/context/base/m-quest.tex
+++ b/tex/context/base/m-quest.tex
@@ -168,14 +168,16 @@
      \global\advance\invulput \plusone
      \setgvalue{\r!fillin\the\invulput}{\simpleinvulwoord{#2}}%
    \fi
-   \ifvoorlopig \ifnum\invulput>0
-     \setbox\scratchbox=\hbox{~\ttx(\the\invulput)}%
-     \wd\scratchbox=\!!zeropoint
-     \box\scratchbox \par
-   \fi \fi}
+   \doifconcepttracing
+     {\ifnum\invulput>\zerocount
+        \setbox\scratchbox\hbox{~\ttx(\the\invulput)}%
+        \wd\scratchbox\zeropoint
+        \box\scratchbox
+        \par
+      \fi}}
 
 \def\dosimpleinvulwoord#1%
-  {\ifnum\@@ivnumber>0 \advance\invulteller \plusone \fi
+  {\ifnum\@@ivnumber>\zerocount \advance\invulteller \plusone \fi
    \ifnum\invulteller=\@@ivnumber\relax
      \bgroup
      \doconvertfont\@@ivstyle
diff --git a/tex/context/base/mult-con.tex b/tex/context/base/mult-con.tex
index a263cbaa3..5ad24a0d4 100644
--- a/tex/context/base/mult-con.tex
+++ b/tex/context/base/mult-con.tex
@@ -229,6 +229,9 @@
                  footnote: voetnoot                  footnote
                            fussnote                  poznamkapodcarou
                            notapdp                   notasubsol
+                  endnote: eindnoot                  endnote
+                           endnote                   endnote
+                           endnote                   endnote
                    system: systeem                   system
                            systeme                   system
                            sistema                   sistem
diff --git a/tex/context/base/page-flt.tex b/tex/context/base/page-flt.tex
index 35872eceb..76e9e66ad 100644
--- a/tex/context/base/page-flt.tex
+++ b/tex/context/base/page-flt.tex
@@ -1603,10 +1603,8 @@
      \doifnotinset\v!margin{#1} % gaat namelijk nog fout
        {\setbox\floatbox\vbox
           {\parindent\zeropoint
-           \ifvoorlopig
-             \inleftmargin{\framed{\infofont\the\totalnoffloats}}%
-           \fi
-          \box\floatbox}}%
+           \doifconcepttracing{\inleftmargin{\framed{\infofont\the\totalnoffloats}}}%
+           \box\floatbox}}%
      \wd\floatbox\floatwidth
      \dimen0=\floatheight
      \advance\dimen0 \lineheight
diff --git a/tex/context/base/page-ini.tex b/tex/context/base/page-ini.tex
index 9f7fe60ed..886d7c795 100644
--- a/tex/context/base/page-ini.tex
+++ b/tex/context/base/page-ini.tex
@@ -1002,64 +1002,61 @@
 
 % will be installable tracer; better use chardef
 
-\newif\ifvoorlopig \voorlopigfalse
+% this needs a real cleanup
 
 \chardef\conceptmode\zerocount
 
-\def\doplaatsversieaanduiding#1#2%
+\def\doifconcepttracing
+  {\ifnum\conceptmode>\plustwo
+     \expandafter\firstofoneargument
+   \else
+     \expandafter\gobbleoneargument
+   \fi}
+
+\def\doplaceversiontext#1#2%
   {\doifsomething{#2}
      {\@EA\convertargument#2\to\ascii
-      \ #1: \ascii\
+      \space#1:\space\ascii\space
       \!!doneatrue}}
 
-\def\plaatsversieaanduiding% nog engels maken
+\def\placeversioninfo % nog engels maken
   {\ifcase\conceptmode
-     % nothing
+     % 0 : nothing
    \or
-     % simple
+     % 1 : simple
      \vskip\!!sixpoint
      \hbox to \makeupwidth
        {\infofont
-        Concept: \currentdate
+        \v!concept:\space\currentdate
         \hss\reportpagedimensions}%
-   \or
-     % extensive
+   \else
+     % 2/3 : extensive
      \vskip\!!sixpoint
      \hbox to \makeupwidth
        {\infofont
-        \getmessage\m!systems{27}: \currentdate\
-        \doplaatsversieaanduiding{Project}\currentproject
-        \doplaatsversieaanduiding{Produkt}\currentproduct
-        \doplaatsversieaanduiding{Onderdeel}\currentcomponent
-        \if!!donea\else\ File: \jobname\fi
+        \getmessage\m!systems{27}:\space\currentdate\space
+        \doplaceversiontext\v!project  \currentproject
+        \doplaceversiontext\v!product  \currentproduct
+        \doplaceversiontext\v!component\currentcomponent
+        \if!!donea\else\space\v!file:\space\jobname\fi
         \hss\reportpagedimensions}%
    \fi}
 
 % tot hier
 
 \def\doversion[#1]%
-  {\voorlopigfalse
-   \chardef\conceptmode\zerocount
+  {\chardef\conceptmode\zerocount
    \overfullrule\zeropoint
    \processaction % \v!final=>
      [#1]
-     [  \v!concept=>\chardef\conceptmode\plusone,% simple banner
-           \v!file=>\chardef\conceptmode\plustwo,% full banner
-      \v!temporary=>\chardef\conceptmode\plustwo % full banner plus
-                    \overfullrule5\points]}      % info in the margin
+     [  \v!concept=>\chardef\conceptmode\plusone,  % simple banner
+           \v!file=>\chardef\conceptmode\plustwo,  % full banner
+      \v!temporary=>\chardef\conceptmode\plusthree % full banner plus
+                    \overfullrule5\points]}        % info in the margin
 
 \def\version
   {\dosingleargument\doversion}
 
-%\def\addstatusinfo
-%  {\ifvoorlopig
-%     \@EA\doaddstatusinfo
-%   \else\ifcase\conceptmode
-%     \@EAEAEA\gobbleoneargument
-%   \else
-%     \@EAEAEA\doaddstatusinfo
-%   \fi\fi}
-
 \def\addstatusinfo
   {\ifcase\conceptmode
      \@EA\gobbleoneargument
@@ -1075,23 +1072,22 @@
       \hsize\paperwidth
       \hfill\hbox{\placetestinfo\hskip.5cm}\vss
       \settexthoffset\hskip\texthoffset % brrrr
-     %\tlap{\plaatsversieaanduiding}\vskip.5cm}}
-      \vbox to 1cm{\vss\plaatsversieaanduiding\vss}}}
+     %\tlap{\placeversioninfo}\vskip.5cm}}
+      \vbox to 1cm{\vss\placeversioninfo\vss}}}
 
 \def\dotestinfo#1#2#3%
-  {\ifvoorlopig\ifinpagebody\else
+  {\ifinpagebody\else\ifnum\conceptmode=\plusthree
      \begingroup
        \@EA\convertargument#3\to\ascii
        \xdef\extratestinfo
-         {#2 \ascii}%
+         {#2\space\ascii}%
        \gdef\totaltestinfo
          {\global\setbox#1\vbox
             {\unvbox#1\relax
              \infofont \setupinterlinespace
              \hbox
                {\strut
-                \expandafter\doboundtext\expandafter
-                   {\extratestinfo}{12em}{..}%
+                \expanded{\doboundtext{\extratestinfo}{12em}{..}}%
                 \quad}}}%
      \endgroup
      \ifinner
@@ -1116,30 +1112,28 @@
 \def\floatinfo     {\dotestinfo\floatinfobox}
 
 \def\placetestinfo
-  {\ifvoorlopig
-     \vbox to \makeupheight
-       {\forgetall
-        \infofont
-        \hsize10em
-        \ifvoid\floatinfobox\else
-          \strut \getmessage\m!systems{24}%
-          \vskip\!!sixpoint
-          \unvbox\floatinfobox
-          \vskip\!!twelvepoint
-        \fi
-        \ifvoid\referentieinfobox\else
-          \strut \getmessage\m!systems{25}%
-          \vskip\!!sixpoint
-          \unvbox\referentieinfobox
-          \vskip\!!twelvepoint
-        \fi
-        \ifvoid\registerinfobox\else
-          \strut \getmessage\m!systems{26}%
-          \vskip\!!sixpoint
-          \unvbox\registerinfobox
-        \fi
-        \vss}
-   \fi}
+  {\vbox to \makeupheight
+     {\forgetall
+      \infofont
+      \hsize10em
+      \ifvoid\floatinfobox\else
+        \strut \getmessage\m!systems{24}%
+        \vskip\!!sixpoint
+        \unvbox\floatinfobox
+        \vskip\!!twelvepoint
+      \fi
+      \ifvoid\referentieinfobox\else
+        \strut \getmessage\m!systems{25}%
+        \vskip\!!sixpoint
+        \unvbox\referentieinfobox
+        \vskip\!!twelvepoint
+      \fi
+      \ifvoid\registerinfobox\else
+        \strut \getmessage\m!systems{26}%
+        \vskip\!!sixpoint
+        \unvbox\registerinfobox
+      \fi
+      \vss}}
 
 \version[\v!final]
 
diff --git a/tex/context/base/page-lay.tex b/tex/context/base/page-lay.tex
index 1fac6fc99..bfce0b410 100644
--- a/tex/context/base/page-lay.tex
+++ b/tex/context/base/page-lay.tex
@@ -1080,42 +1080,40 @@
      \@EA\firstoftwoarguments
    \fi}
 
-\def\outermarginwidth   {\rightorleftpageaction\rightmarginwidth\leftmarginwidth }
-\def\innermarginwidth   {\rightorleftpageaction\leftmarginwidth \rightmarginwidth}
+\def\outermarginwidth   {\rightorleftpageaction\rightmarginwidth   \leftmarginwidth }
+\def\innermarginwidth   {\rightorleftpageaction\leftmarginwidth    \rightmarginwidth}
 \def\outermargindistance{\rightorleftpageaction\rightmargindistance\leftmargindistance }
 \def\innermargindistance{\rightorleftpageaction\leftmargindistance \rightmargindistance}
 
-\def\outeredgewidth     {\rightorleftpageaction\rightedgewidth\leftedgewidth }
-\def\inneredgewidth     {\rightorleftpageaction\leftedgewidth \rightedgewidth}
+\def\outeredgewidth     {\rightorleftpageaction\rightedgewidth   \leftedgewidth }
+\def\inneredgewidth     {\rightorleftpageaction\leftedgewidth    \rightedgewidth}
 \def\outeredgedistance  {\rightorleftpageaction\rightedgedistance\leftedgedistance }
 \def\inneredgedistance  {\rightorleftpageaction\leftedgedistance \rightedgedistance}
 
-\def\outerspacewidth    {\rightorleftpageaction\cutspace\backspace }
-\def\innerspacewidth    {\rightorleftpageaction\backspace \cutspace}
+\def\outerspacewidth    {\rightorleftpageaction\cutspace \backspace }
+\def\innerspacewidth    {\rightorleftpageaction\backspace\cutspace}
 
 \beginETEX \dimexpr
 
-  \def\leftmargintotal {\dimexpr(\leftmarginwidth +\leftmargindistance )}
-  \def\rightmargintotal{\dimexpr(\rightmarginwidth+\rightmargindistance)}
-  \def\leftedgetotal   {\dimexpr(\leftedgewidth  +\leftedgedistance  )}
-  \def\rightedgetotal  {\dimexpr(\rightedgewidth +\rightedgedistance )}
-
-  \def\leftsidetotal   {\dimexpr(\leftmarginwidth +\leftedgetotal )}
-  \def\rightsidetotal  {\dimexpr(\rightmarginwidth+\rightedgetotal)}
-
-  \def\leftcombitotal  {\dimexpr(\leftmargintotal +\leftedgetotal )}
-  \def\rightcombitotal {\dimexpr(\rightmargintotal+\rightedgetotal)}
-
-  \def\innermargintotal{\dimexpr(\innermarginwidth+\innermargindistance)}
-  \def\outermargintotal{\dimexpr(\outermarginwidth+\outermargindistance)}
-  \def\inneredgetotal  {\dimexpr(\inneredgewidth  +\inneredgedistance  )}
-  \def\outeredgetotal  {\dimexpr(\outeredgewidth  +\outeredgedistance  )}
-
-  \def\innercombitotal {\dimexpr(\innermargintotal+\inneredgetotal)}
-  \def\outercombitotal {\dimexpr(\outermargintotal+\outeredgetotal)}
-
-  \def\innersidetotal  {\dimexpr(\innermarginwidth+\inneredgetotal)}
-  \def\outersidetotal  {\dimexpr(\outermarginwidth+\outeredgetotal)}
+  \def\leftmargintotal {\dimexpr\leftmarginwidth +\leftmargindistance \relax}
+  \def\rightmargintotal{\dimexpr\rightmarginwidth+\rightmargindistance\relax}
+  \def\leftedgetotal   {\dimexpr\leftedgewidth   +\leftedgedistance   \relax}
+  \def\rightedgetotal  {\dimexpr\rightedgewidth  +\rightedgedistance  \relax}
+
+  \def\leftsidetotal   {\dimexpr\leftmarginwidth +\leftedgetotal \relax}
+  \def\rightsidetotal  {\dimexpr\rightmarginwidth+\rightedgetotal\relax}
+  \def\leftcombitotal  {\dimexpr\leftmargintotal +\leftedgetotal \relax}
+  \def\rightcombitotal {\dimexpr\rightmargintotal+\rightedgetotal\relax}
+
+  \def\innermargintotal{\dimexpr\innermarginwidth+\innermargindistance\relax}
+  \def\outermargintotal{\dimexpr\outermarginwidth+\outermargindistance\relax}
+  \def\inneredgetotal  {\dimexpr\inneredgewidth  +\inneredgedistance  \relax}
+  \def\outeredgetotal  {\dimexpr\outeredgewidth  +\outeredgedistance  \relax}
+
+  \def\innercombitotal {\dimexpr\innermargintotal+\inneredgetotal\relax}
+  \def\outercombitotal {\dimexpr\outermargintotal+\outeredgetotal\relax}
+  \def\innersidetotal  {\dimexpr\innermarginwidth+\inneredgetotal\relax}
+  \def\outersidetotal  {\dimexpr\outermarginwidth+\outeredgetotal\relax}
 
 \endETEX
 
diff --git a/tex/context/base/page-lyr.tex b/tex/context/base/page-lyr.tex
index cbef613c7..5b082e3ff 100644
--- a/tex/context/base/page-lyr.tex
+++ b/tex/context/base/page-lyr.tex
@@ -33,6 +33,8 @@
 %D will go in. This means that we can move an overlay from one
 %D background to the other using the dimensions of the parent.
 
+%D ! ! ! ! to be documented ! ! ! !
+
 \ifx\undefined\defineoverlay \message{loaded to early} \wait \fi
 
 \def\defineoverlay
diff --git a/tex/context/base/page-txt.tex b/tex/context/base/page-txt.tex
index 2c2e65363..2d71a3bf5 100644
--- a/tex/context/base/page-txt.tex
+++ b/tex/context/base/page-txt.tex
@@ -421,11 +421,11 @@
             {\dorecurse\layoutcolumns
                {\hskip\layoutcolumnwidth
                 \ifnum\recurselevel<\layoutcolumns
-                \vrule
-                  \!!height\ht\scratchbox
-                  \!!depth\dp\scratchbox
-                  \!!width\layoutcolumndistance
-              \fi}}%
+                  \vrule
+                    \!!height\ht\scratchbox
+                    \!!depth\dp\scratchbox
+                    \!!width\layoutcolumndistance
+                \fi}}%
           \hskip-\makeupwidth
         \fi
         \stoplayoutcomponent
diff --git a/tex/context/base/s-fnt-02.tex b/tex/context/base/s-fnt-02.tex
index 5e7171a32..c3ffeb9b4 100644
--- a/tex/context/base/s-fnt-02.tex
+++ b/tex/context/base/s-fnt-02.tex
@@ -62,7 +62,9 @@
     {\doiffontcharelse{\getvariable{glyphs}{name-1}}{\recurselevel}
        {\doiffontcharelse{\getvariable{glyphs}{name-2}}{\recurselevel}
           {\startstandardmakeup
-           \boxrulewidth=2pt
+           \doifelse{\getvariable{glyphs}{frame}}{on} % too many box calculations when off, but who cares
+             {\boxrulewidth=2pt}
+             {\boxrulewidth=0pt}
            \setbox 0=\hbox{\white\ruledhbox{\FontOne \char\recurselevel}}
            \setbox 2=\hbox{\white\ruledhbox{\FontTwo \char\recurselevel}}
            \setbox 4=\hbox{\FontOne \ColorOne \char\recurselevel}
@@ -70,9 +72,7 @@
            \setbox 8=\hbox{\BackOne \ruledhbox{\FontOne \phantom{\char\recurselevel}}}
            \setbox10=\hbox{\BackTwo \ruledhbox{\FontTwo \phantom{\char\recurselevel}}}
            \vfill
-           \doifelse{\getvariable{glyphs}{frame}}{on} % too many box calculations when off, but who cares
-             {\hbox{\dostepwiserecurse{0}{10}{2}{\hbox to \hsize{\hss\box\recurselevel\hss}\hskip-\hsize}}}
-             {\hbox{\dostepwiserecurse{4} {6}{2}{\hbox to \hsize{\hss\box\recurselevel\hss}\hskip-\hsize}}}
+           \hbox{\dostepwiserecurse{0}{10}{2}{\hbox to \hsize{\hss\box\recurselevel\hss}\hskip-\hsize}}
            \vfill
            \tttf
            \setstrut
@@ -90,6 +90,17 @@
 
 \starttext
 
+  \setupencoding[default=ec]
+
+  \loadmapline [=][aer10                  <cmr10.pfb]
+  \loadmapline [=][\defaultencoding-lmr10 <\defaultencoding.enc <lmr10.pfb]
+
+  \setvariables
+    [glyphs]
+    [frame=on,
+     name-1=aer10,
+     name-2=\defaultencoding-lmr10]
+
   \setups[show-glyphs]
 
-\stoptext
\ No newline at end of file
+\stoptext
diff --git a/tex/context/base/s-pre-60.tex b/tex/context/base/s-pre-60.tex
index f6ed92f59..8170e5a22 100644
--- a/tex/context/base/s-pre-60.tex
+++ b/tex/context/base/s-pre-60.tex
@@ -48,7 +48,9 @@
 
 % todo: roll back blank
 
-\def\StepLayer{step:\StepCounter}
+\def\StepLayer     {step:\StepCounter}
+\def\NextStepLayer {step:\the\numexpr\StepCounter+1\relax}
+\def\FirstStepLayer{step:1}
 
 \def\StartStep
   {\ifvmode
@@ -66,8 +68,8 @@
    \stopproperty}
 
 \def\StartSteps{\iftrialtypesetting\else\ResetStep\NextStep\StartStep\fi}
-\def\StopSteps {\iftrialtypesetting\else\StopStep\PrevStep\fi}
-\def\FlushStep {\iftrialtypesetting\else\StopStep\NextStep\StartStep\fi}
+\def\StopSteps {\iftrialtypesetting\else\StopStep \PrevStep          \fi}
+\def\FlushStep {\iftrialtypesetting\else\StopStep \NextStep\StartStep\fi}
 
 \appendtoks
   \ResetStep
diff --git a/tex/context/base/s-pre-61.tex b/tex/context/base/s-pre-61.tex
index 905b07363..59c21202e 100644
--- a/tex/context/base/s-pre-61.tex
+++ b/tex/context/base/s-pre-61.tex
@@ -11,6 +11,8 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
+%D Optima
+
 \usemodule[pre-60]
 
 \usetypescriptfile[type-ghz]
@@ -176,7 +178,7 @@
 
 \def\doTitlePage#1#2#3%
   {\startstandardmakeup[headerstate=high]
-     \def\\{\def\\{\endgraf\quad\quad}\endgraf\quad#2}%
+     \def\\{\def\\{\endgraf\quad\quad}\endgraf\quad\ignorespaces#2}%
      #1\setstrut\setupinterlinespace\vfil#3\vfil\vfil
    \stopstandardmakeup}
 
diff --git a/tex/context/base/spec-tpd.tex b/tex/context/base/spec-tpd.tex
index 1cb264174..e3002040b 100644
--- a/tex/context/base/spec-tpd.tex
+++ b/tex/context/base/spec-tpd.tex
@@ -403,6 +403,25 @@
 
 \ifx\@@DriverImageBox\undefined \def\@@DriverImageBox{artbox} \fi
 
+% \def\doguessTPDimagesize#1% does not work as expected
+%   {\ifx\@@DriverImageBox\empty
+%      \global\setbox\foundexternalfigure\hbox{\pdfximage \pdfimagepagenumber ArtBox {#1}\pdfrefximage\pdflastximage}%
+%      \ifdim\ht\foundexternalfigure>\zeropoint
+%        \def\@@DriverImageBox{ArtBox}%
+%      \else
+%        \global\setbox\foundexternalfigure\hbox{\pdfximage \pdfimagepagenumber TrimBox {#1}\pdfrefximage\pdflastximage}%
+%        \ifdim\ht\foundexternalfigure>\zeropoint
+%          \def\@@DriverImageBox{TrimBox}%
+%        \else
+%          \global\setbox\foundexternalfigure\hbox{\pdfximage \pdfimagepagenumber CropBox {#1}\pdfrefximage\pdflastximage}%
+%          \ifdim\ht\foundexternalfigure>\zeropoint
+%            \def\@@DriverImageBox{CropBox}%
+%          \fi
+%        \fi
+%      \fi
+%    \fi
+%    \@@DriverImageBox}
+
 \ifnum\pdftexversion>13
 
 \def\checkpdfimageattributes
@@ -575,13 +594,13 @@
    \let\ascii\empty
    \def\docommand##1%
      {\edef\ascii{\ascii
-       \ifx\nexthandledtoken\space
-         \letterhash20%
-       \else\ifx\nexthandledtoken\blankspace
-         \letterhash20%
-       \else
-         ##1%
-       \fi\fi}}%
+      \ifx\nexthandledtoken\space
+        \letterhash20%
+      \else\ifx\nexthandledtoken\blankspace
+        \letterhash20%
+      \else
+        ##1%
+      \fi\fi}}%
    \expanded{\handletokens#2}\with\docommand
    \letgvalue{@@pdf@@scn@@#1}\ascii
    \egroup}
diff --git a/tex/context/base/syst-xtx.tex b/tex/context/base/syst-xtx.tex
index 1593e5eb0..7466725c7 100644
--- a/tex/context/base/syst-xtx.tex
+++ b/tex/context/base/syst-xtx.tex
@@ -18,6 +18,16 @@
 %D For the moment, the only thing needed is to load are the
 %D mappings from lower to uppercase characters.
 
-\input xplain.tex
+\ifx\scratchread\undefined \newread\scratchread \fi
+
+\immediate\openin\scratchread=unicode-letters.tex \ifeof\scratchread
+  \immediate\openin\scratchread=xplain.tex \ifeof\scratchread
+    % no initialization file
+  \else
+    \input xplain.tex
+  \fi
+\else
+  \input unicode-letters.tex
+\fi
 
 \protect \endinput
diff --git a/tex/context/base/type-buy.tex b/tex/context/base/type-buy.tex
index 0ac312ca3..7200a64d4 100644
--- a/tex/context/base/type-buy.tex
+++ b/tex/context/base/type-buy.tex
@@ -17,6 +17,8 @@
 
 \starttypescriptcollection[commercial fonts]
 
+% temporary code, replaced by setups
+
 \starttypescript [serif] [fallback]
 
   \definefontsynonym [SerifBold]        [Serif]
diff --git a/tex/context/base/type-def.tex b/tex/context/base/type-def.tex
index 0443ec99c..b7943042c 100644
--- a/tex/context/base/type-def.tex
+++ b/tex/context/base/type-def.tex
@@ -37,10 +37,30 @@
   \definefontsynonym [Mono]            [DefaultFont]
   \definefontsynonym [MonoBold]        [Mono]
   \definefontsynonym [MonoItalic]      [Mono]
-  \definefontsynonym [MonoSlanted]     [Mono]
+  \definefontsynonym [MonoSlanted]     [MonoItalic]
   \definefontsynonym [MonoBoldItalic]  [Mono]
   \definefontsynonym [MonoBoldSlanted] [MonoBoldItalic]
   \definefontsynonym [MonoCaps]        [Mono]
 \stopsetups
 
+\startsetups [font:allbold:serif]
+  \definefontsynonym [SerifBold]        [DefaultFont]
+  \definefontsynonym [SerifBoldItalic]  [SerifBold]
+  \definefontsynonym [SerifBoldSlanted] [SerifBoldItalic]
+  \definefontsynonym [Serif]            [SerifBold]
+  \definefontsynonym [SerifItalic]      [SerifBoldItalic]
+  \definefontsynonym [SerifSlanted]     [SerifBoldSlanted]
+  \definefontsynonym [SerifCaps]        [SerifBold]
+\stopsetups
+
+\startsetups [font:allbold:sans]
+  \definefontsynonym [SansBold]        [DefaultFont]
+  \definefontsynonym [SansBoldItalic]  [SansBold]
+  \definefontsynonym [SansBoldSlanted] [SansBoldItalic]
+  \definefontsynonym [Sans]            [SansBold]
+  \definefontsynonym [SansItalic]      [SansBoldItalic]
+  \definefontsynonym [SansSlanted]     [SansBoldSlanted]
+  \definefontsynonym [SansCaps]        [SansBold]
+\stopsetups
+
 \endinput
diff --git a/tex/context/base/type-dis.tex b/tex/context/base/type-dis.tex
index e086a7595..bd385db08 100644
--- a/tex/context/base/type-dis.tex
+++ b/tex/context/base/type-dis.tex
@@ -17,67 +17,13 @@
 
 \starttypescriptcollection[distributed fonts]
 
-\starttypescript[all][latin-modern,computer-modern][ec]
-
-  \definefontsynonym[ec-lmb10]   [cork-lmb10]   [encoding=ec]
-  \definefontsynonym[ec-lmbo10]  [cork-lmbo10]  [encoding=ec]
-  \definefontsynonym[ec-lmbx10]  [cork-lmbx10]  [encoding=ec]
-  \definefontsynonym[ec-lmbx12]  [cork-lmbx12]  [encoding=ec]
-  \definefontsynonym[ec-lmbx5]   [cork-lmbx5]   [encoding=ec]
-  \definefontsynonym[ec-lmbx6]   [cork-lmbx6]   [encoding=ec]
-  \definefontsynonym[ec-lmbx7]   [cork-lmbx7]   [encoding=ec]
-  \definefontsynonym[ec-lmbx8]   [cork-lmbx8]   [encoding=ec]
-  \definefontsynonym[ec-lmbx9]   [cork-lmbx9]   [encoding=ec]
-  \definefontsynonym[ec-lmbxi10] [cork-lmbxi10] [encoding=ec]
-  \definefontsynonym[ec-lmbxo10] [cork-lmbxo10] [encoding=ec]
-  \definefontsynonym[ec-lmcsc10] [cork-lmcsc10] [encoding=ec]
-  \definefontsynonym[ec-lmcsco10][cork-lmcsco10][encoding=ec]
-  \definefontsynonym[ec-lmr10]   [cork-lmr10]   [encoding=ec]
-  \definefontsynonym[ec-lmr12]   [cork-lmr12]   [encoding=ec]
-  \definefontsynonym[ec-lmr17]   [cork-lmr17]   [encoding=ec]
-  \definefontsynonym[ec-lmr5]    [cork-lmr5]    [encoding=ec]
-  \definefontsynonym[ec-lmr6]    [cork-lmr6]    [encoding=ec]
-  \definefontsynonym[ec-lmr7]    [cork-lmr7]    [encoding=ec]
-  \definefontsynonym[ec-lmr8]    [cork-lmr8]    [encoding=ec]
-  \definefontsynonym[ec-lmr9]    [cork-lmr9]    [encoding=ec]
-  \definefontsynonym[ec-lmri10]  [cork-lmri10]  [encoding=ec]
-  \definefontsynonym[ec-lmri12]  [cork-lmri12]  [encoding=ec]
-  \definefontsynonym[ec-lmri7]   [cork-lmri7]   [encoding=ec]
-  \definefontsynonym[ec-lmri8]   [cork-lmri8]   [encoding=ec]
-  \definefontsynonym[ec-lmri9]   [cork-lmri9]   [encoding=ec]
-  \definefontsynonym[ec-lmro10]  [cork-lmro10]  [encoding=ec]
-  \definefontsynonym[ec-lmro12]  [cork-lmro12]  [encoding=ec]
-  \definefontsynonym[ec-lmro8]   [cork-lmro8]   [encoding=ec]
-  \definefontsynonym[ec-lmro9]   [cork-lmro9]   [encoding=ec]
-  \definefontsynonym[ec-lmss10]  [cork-lmss10]  [encoding=ec]
-  \definefontsynonym[ec-lmss12]  [cork-lmss12]  [encoding=ec]
-  \definefontsynonym[ec-lmss17]  [cork-lmss17]  [encoding=ec]
-  \definefontsynonym[ec-lmss8]   [cork-lmss8]   [encoding=ec]
-  \definefontsynonym[ec-lmss9]   [cork-lmss9]   [encoding=ec]
-  \definefontsynonym[ec-lmssbo10][cork-lmssbo10][encoding=ec]
-  \definefontsynonym[ec-lmssbx10][cork-lmssbx10][encoding=ec]
-  \definefontsynonym[ec-lmssdc10][cork-lmssdc10][encoding=ec]
-  \definefontsynonym[ec-lmssdo10][cork-lmssdo10][encoding=ec]
-  \definefontsynonym[ec-lmsso10] [cork-lmsso10] [encoding=ec]
-  \definefontsynonym[ec-lmsso12] [cork-lmsso12] [encoding=ec]
-  \definefontsynonym[ec-lmsso17] [cork-lmsso17] [encoding=ec]
-  \definefontsynonym[ec-lmsso8]  [cork-lmsso8]  [encoding=ec]
-  \definefontsynonym[ec-lmsso9]  [cork-lmsso9]  [encoding=ec]
-  \definefontsynonym[ec-lmssq8]  [cork-lmssq8]  [encoding=ec]
-  \definefontsynonym[ec-lmssqbo8][cork-lmssqbo8][encoding=ec]
-  \definefontsynonym[ec-lmssqbx8][cork-lmssqbx8][encoding=ec]
-  \definefontsynonym[ec-lmssqo8] [cork-lmssqo8] [encoding=ec]
-  \definefontsynonym[ec-lmtcsc10][cork-lmtcsc10][encoding=ec]
-  \definefontsynonym[ec-lmtt10]  [cork-lmtt10]  [encoding=ec]
-  \definefontsynonym[ec-lmtt12]  [cork-lmtt12]  [encoding=ec]
-  \definefontsynonym[ec-lmtt8]   [cork-lmtt8]   [encoding=ec]
-  \definefontsynonym[ec-lmtt9]   [cork-lmtt9]   [encoding=ec]
-  \definefontsynonym[ec-lmtti10] [cork-lmtti10] [encoding=ec]
-  \definefontsynonym[ec-lmtto10] [cork-lmtto10] [encoding=ec]
-  \definefontsynonym[ec-lmvtt10] [cork-lmvtt10] [encoding=ec]
-  \definefontsynonym[ec-lmvtto10][cork-lmvtto10][encoding=ec]
-
-\stoptypescript
+% obsolete: cork- is now ec- in latin modern
+%
+% \starttypescript[all][latin-modern,computer-modern][ec]
+%
+%   \definefontsynonym[ec-lmb10]   [cork-lmb10]   [encoding=ec]
+%
+% \stoptypescript
 
 \starttypescript[all][latin-modern,computer-modern][pl0]
 
diff --git a/tex/context/base/type-enc.tex b/tex/context/base/type-enc.tex
index 75485af10..85220f8f7 100644
--- a/tex/context/base/type-enc.tex
+++ b/tex/context/base/type-enc.tex
@@ -1035,7 +1035,7 @@
   \definefontsynonym [AntykwaTorunska-CondItalic]     [\typescriptthree-anttcri]   [encoding=\typescriptthree]
 \stoptypescript
 
-\starttypescript [serif] [antykwa-torunska,antykwa-torunska-light,antykwa-torunska-cond,antykwa-torunska-lightcond] [texnansi,qx,t5]
+\starttypescript [serif] [antykwa-torunska,antykwa-torunska-light,antykwa-torunska-cond,antykwa-torunska-lightcond] [texnansi,qx,t5,ec]
   \definefontsynonym [AntykwaTorunska-BoldCap]           [\typescriptthree-anttbcap]   [encoding=\typescriptthree]
   \definefontsynonym [AntykwaTorunska-BoldItalicCap]     [\typescriptthree-anttbicap]  [encoding=\typescriptthree]
   \definefontsynonym [AntykwaTorunska-LightCap]          [\typescriptthree-anttlcap]   [encoding=\typescriptthree]
@@ -1054,41 +1054,6 @@
   \definefontsynonym [AntykwaTorunska-CondItalicCap]     [\typescriptthree-anttcricap] [encoding=\typescriptthree]
 \stoptypescript
 
-\starttypescript [serif] [antykwa-torunska,antykwa-torunska-light,antykwa-torunska-cond,antykwa-torunska-lightcond] [ec]
-  \definefontsynonym [AntykwaTorunska-Bold]              [cork-anttb]      [encoding=ec]
-  \definefontsynonym [AntykwaTorunska-BoldItalic]        [cork-anttbi]     [encoding=ec]
-  \definefontsynonym [AntykwaTorunska-Light]             [cork-anttl]      [encoding=ec]
-  \definefontsynonym [AntykwaTorunska-LightItalic]       [cork-anttli]     [encoding=ec]
-  \definefontsynonym [AntykwaTorunska-Medium]            [cork-anttm]      [encoding=ec]
-  \definefontsynonym [AntykwaTorunska-MedItalic]         [cork-anttmi]     [encoding=ec]
-  \definefontsynonym [AntykwaTorunska-Regular]           [cork-anttr]      [encoding=ec]
-  \definefontsynonym [AntykwaTorunska-Italic]            [cork-anttri]     [encoding=ec]
-  \definefontsynonym [AntykwaTorunska-BoldCap]           [cork-anttbcap]   [encoding=ec]
-  \definefontsynonym [AntykwaTorunska-BoldItalicCap]     [cork-anttbicap]  [encoding=ec]
-  \definefontsynonym [AntykwaTorunska-LightCap]          [cork-anttlcap]   [encoding=ec]
-  \definefontsynonym [AntykwaTorunska-LightItalicCap]    [cork-anttlicap]  [encoding=ec]
-  \definefontsynonym [AntykwaTorunska-MedCap]            [cork-anttmcap]   [encoding=ec]
-  \definefontsynonym [AntykwaTorunska-MedItalicCap]      [cork-anttmicap]  [encoding=ec]
-  \definefontsynonym [AntykwaTorunska-Cap]               [cork-anttrcap]   [encoding=ec]
-  \definefontsynonym [AntykwaTorunska-ItalicCap]         [cork-anttricap]  [encoding=ec]
-  \definefontsynonym [AntykwaTorunska-CondBold]          [cork-anttcb]     [encoding=ec]
-  \definefontsynonym [AntykwaTorunska-CondBoldItalic]    [cork-anttcbi]    [encoding=ec]
-  \definefontsynonym [AntykwaTorunska-CondLight]         [cork-anttcl]     [encoding=ec]
-  \definefontsynonym [AntykwaTorunska-CondLightItalic]   [cork-anttcli]    [encoding=ec]
-  \definefontsynonym [AntykwaTorunska-CondMedium]        [cork-anttcm]     [encoding=ec]
-  \definefontsynonym [AntykwaTorunska-CondMedItalic]     [cork-anttcmi]    [encoding=ec]
-  \definefontsynonym [AntykwaTorunska-CondRegular]       [cork-anttcr]     [encoding=ec]
-  \definefontsynonym [AntykwaTorunska-CondItalic]        [cork-anttcri]    [encoding=ec]
-  \definefontsynonym [AntykwaTorunska-CondBoldCap]       [cork-anttcbcap]  [encoding=ec]
-  \definefontsynonym [AntykwaTorunska-CondBoldItalicCap] [cork-anttcbicap] [encoding=ec]
-  \definefontsynonym [AntykwaTorunska-CondLightCap]      [cork-anttclcap]  [encoding=ec]
-  \definefontsynonym [AntykwaTorunska-CondLightItalicCap][cork-anttclicap] [encoding=ec]
-  \definefontsynonym [AntykwaTorunska-CondMedCap]        [cork-anttcmcap]  [encoding=ec]
-  \definefontsynonym [AntykwaTorunska-CondMedItalicCap]  [cork-anttcmicap] [encoding=ec]
-  \definefontsynonym [AntykwaTorunska-CondCap]           [cork-anttcrcap]  [encoding=ec]
-  \definefontsynonym [AntykwaTorunska-CondItalicCap]     [cork-anttcricap] [encoding=ec]
-\stoptypescript
-
 % duplicates ? ?
 
 \starttypescript [serif] [antykwa-torunska,antykwa-torunska-light,antykwa-torunska-cond,antykwa-torunska-lightcond] [t2a,t2b,t2c]
@@ -1129,7 +1094,7 @@
   \definefontsynonym [AntykwaTorunska-CondItalicCap]     [\typescriptthree-anttcri] [encoding=\typescriptthree]
 \stoptypescript
 
-% Antykwa Polstawskiego (GUST)
+% Antykwa Poltawskiego (GUST)
 
 \starttypescript [serif] [antykwa-poltawskiego] [texnansi,ec,8r]
   \definefontsynonym [AntykwaPoltawskiego-Regular]    [\typescriptthree-antpr]  [encoding=\typescriptthree]
diff --git a/tex/context/base/type-ghz.tex b/tex/context/base/type-ghz.tex
index 49bd8ffd9..1551fe895 100644
--- a/tex/context/base/type-ghz.tex
+++ b/tex/context/base/type-ghz.tex
@@ -58,7 +58,6 @@
 
 \stoptypescript
 
-
 \starttypescript [map] [optima,optima-nova] [texnansi,ec,8r]
 
   \loadmapfile[\typescriptthree-linotype-optima.map]
@@ -137,4 +136,38 @@
 
 \stoptypescriptcollection
 
+% melior
+
+\starttypescript [serif] [melior] [name]
+
+  \definefontsynonym [MeliorLT-Roman]   [MeliorLT]
+
+  \definefontsynonym [Serif]            [MeliorLT-Roman]
+  \definefontsynonym [SerifItalic]      [MeliorLT-Italic]
+  \definefontsynonym [SerifBold]        [MeliorLT-Bold]
+  \definefontsynonym [SerifBoldItalic]  [MeliorLT-BoldItalic]
+
+  \definefontsynonym [SerifSlanted]     [SerifItalic]
+  \definefontsynonym [SerifBoldSlanted] [SerifBoldItalic]
+
+  \definefontsynonym [SerifCaps]        [Serif]
+
+\stoptypescript
+
+\starttypescript [serif] [melior] [texnansi,ec,8r]
+
+  \loadmapfile[\typescriptthree-linotype-melior.map]
+
+  \definefontsynonym [MeliorLT]            [texnansi-lte50062] [encoding=\typescriptthree]
+  \definefontsynonym [MeliorLT-Italic]     [texnansi-lte50063] [encoding=\typescriptthree]
+  \definefontsynonym [MeliorLT-Bold]       [texnansi-lte50064] [encoding=\typescriptthree]
+  \definefontsynonym [MeliorLT-BoldItalic] [texnansi-lte50065] [encoding=\typescriptthree]
+
+\stoptypescript
+
+\starttypescript [map] [melior] [texnansi,ec,8r]
+  \loadmapfile[\typescriptthree-linotype-melior.map]
+\stoptypescript
+
+
 \endinput
diff --git a/tex/context/base/type-ini.tex b/tex/context/base/type-ini.tex
index c580399db..e778602ce 100644
--- a/tex/context/base/type-ini.tex
+++ b/tex/context/base/type-ini.tex
@@ -624,16 +624,16 @@
   {\ifundefined{\??tf#2\c!default}%
      \pushmacro\fontclass
      \setcurrentfontclass\empty
-     \pushmacro\@@typescriptone \edef\@@typescriptone {\truetypescript{#2}}
+     \pushmacro\@@typescriptone \edef\@@typescriptone {\truetypescript{#2}}%
      \pushmacro\@@typescripttwo  \let\@@typescripttwo  \empty
      \pushmacro\@@typescriptthree\let\@@typescriptthree\empty
      \typescriptfoundfalse
-     \dododousetypescript{\f!typeprefix pre}
+     \dododousetypescript{\f!typeprefix pre}%
      \popmacro\@@typescriptthree
      \popmacro\@@typescripttwo
      \popmacro\@@typescriptone
      \iftypescriptfound \else
-       \normaldoreadfontdefinitionfile{#1}{#2}
+       \normaldoreadfontdefinitionfile{#1}{#2}%
      \fi
      \setcurrentfontclass\empty
      \popmacro\fontclass
diff --git a/tex/context/base/type-map.tex b/tex/context/base/type-map.tex
index b441e7094..fca16e513 100644
--- a/tex/context/base/type-map.tex
+++ b/tex/context/base/type-map.tex
@@ -132,13 +132,15 @@
 %   \loadmapfile[\typescriptthree-public-antt.map]
 % \stoptypescript
 
-\starttypescript [map] [antykwa-torunska,antykwa-torunska-light,antykwa-torunska-cond,antykwa-torunska-lightcond] [texnansi,qx,t5,t2a,t2b,t2c]
+\starttypescript [map] [antykwa-torunska,antykwa-torunska-light,antykwa-torunska-cond,antykwa-torunska-lightcond] [texnansi,ec,qx,t5,t2a,t2b,t2c]
   \loadmapfile[\typescriptthree-antt.map]
 \stoptypescript
 
-\starttypescript [map] [antykwa-torunska,antykwa-torunska-light,antykwa-torunska-cond,antykwa-torunska-lightcond] [ec]
-  \loadmapfile[cork-antt.map]
-\stoptypescript
+% obsolete
+%
+% \starttypescript [map] [antykwa-torunska,antykwa-torunska-light,antykwa-torunska-cond,antykwa-torunska-lightcond] [ec]
+%   \loadmapfile[cork-antt.map]
+% \stoptypescript
 
 \starttypescript [map] [antykwa-poltawskiego] [ec,texnansi,t5,8r]
   \loadmapfile[\typescriptthree-public-antp.map]
diff --git a/tex/context/base/type-siz.tex b/tex/context/base/type-siz.tex
index 37bb1f9c8..a9ef1b976 100644
--- a/tex/context/base/type-siz.tex
+++ b/tex/context/base/type-siz.tex
@@ -125,6 +125,23 @@
     [\s!text=16pt,\s!script=12pt,\s!scriptscript=9pt,
      \c!x=13pt,\c!xx=11pt,\c!big=18pt,\c!small=14pt]
 
+  % suboptimal math sizes
+
+  \definebodyfontenvironment
+    [18pt]
+    [\s!text=18pt,\s!script=16pt,\s!scriptscript=14pt,
+     \c!x=16pt,\c!xx=14pt,\c!big=22pt,\c!small=16pt]
+
+  \definebodyfontenvironment
+    [22pt]
+    [\s!text=22pt,\s!script=22pt,\s!scriptscript=18pt,
+     \c!x=18pt,\c!xx=16pt,\c!big=28pt,\c!small=18pt]
+
+  \definebodyfontenvironment
+    [28pt]
+    [\s!text=28pt,\s!script=22pt,\s!scriptscript=18pt,
+     \c!x=22pt,\c!xx=18pt,\c!big=28pt,\c!small=22pt]
+
 \stoptypescript
 
 \starttypescript [serif] [dtp] [size]
diff --git a/tex/context/base/type-syn.tex b/tex/context/base/type-syn.tex
index a28b9e129..d750e3106 100644
--- a/tex/context/base/type-syn.tex
+++ b/tex/context/base/type-syn.tex
@@ -578,7 +578,7 @@
   \definefontsynonym [MonoCaps]        [Courier]
 \stoptypescript
 
-% Palatino : Hermann Zapf / UWR
+% Palatino : Hermann Zapf / URW
 
 \starttypescript [serif] [palatino] [name]
   \definefontsynonym [Serif]            [Palatino]
diff --git a/tex/context/base/x-res-08.tex b/tex/context/base/x-res-08.tex
index 74f8a7068..9abc97200 100644
--- a/tex/context/base/x-res-08.tex
+++ b/tex/context/base/x-res-08.tex
@@ -27,6 +27,8 @@
 %D </rl:library>
 %D \stoptyping
 
+\doifnotmode{\systemmodeprefix\v!first}{\endinput}
+
 \unprotect
 
 \def\XMLrlprefix{rl:}
@@ -34,58 +36,52 @@
 \newwrite\XMLrllog
 
 \def\openXMLresourcelog
-  {%\global\let\openXMLresourcelog\relax
-   \immediate\openout\XMLrllog\jobname.rlg\relax
-   \immediate\write\XMLrllog{\XMLbanner\empty}%
+  {\immediate\openout\XMLrllog\jobname.rlg\relax
+   \immediate\write\XMLrllog{\XMLbanner{standalone='yes'}}%
    \immediate\write\XMLrllog{\writtenXMLstart{\XMLrlprefix library}}}
 
 \def\closeXMLresourcelog
-  {%\global\let\closeXMLresourcelog\relax
-   \immediate\write\XMLrllog{\writtenXMLend{\XMLrlprefix library}}%
+  {\immediate\write\XMLrllog{\writtenXMLend{\XMLrlprefix library}}%
    \immediate\closeout\XMLrllog}
 
-\let\figurefilelabel   \empty
-\let\figurefileoriginal\empty
-\let\figurefilefile    \empty
+\let\figurefilelabel     \empty
+\let\figurefileoriginal  \empty
+\let\figurefilefile      \empty
+\let\figurefilepath      \empty
+\let\figurefileconversion\empty
+\let\figurefileprefix    \empty
 
 \def\XMLfeedbackresource#1#2%
   {\convertcommand\currentresourcecomment\to\currentresourcecomment
    \immediate\write\XMLrllog
      {\writtenXMLelement{\XMLrlprefix usage}%
-        {\writtenXMLelement{\XMLrlprefix type}{#2}%
-         \writtenXMLelement{\XMLrlprefix state}{#1}%
+        {\writtenXMLelement{\XMLrlprefix         type}{#2}%
+         \writtenXMLelement{\XMLrlprefix        state}{#1}%
          \ifx\figurefilelabel\empty
-           \ifx\figurelabel\s!dummy
-             % label equals filename
-           \else
-             \writtenXMLelement{\XMLrlprefix label}{\figurelabel}%
-           \fi
-           \writtenXMLelement{\XMLrlprefix file}{\figurefilename}%
-           \ifx\figurefiletype\empty\else
-             \writtenXMLelement{\XMLrlprefix suffix}{\figurefiletype}%
+           \ifx\figurelabel\s!dummy \else % otherwise label equals filename
+             \writtenXMLelementcs{\XMLrlprefix  label}\figurelabel
            \fi
+           \writtenXMLelementcs{\XMLrlprefix     file}\figurefilename
+           \writtenXMLelementcs{\XMLrlprefix   suffix}\figurefiletype
          \else
            % \figurefilelabel is set in x-res-04 and since
            % we fetch from this base using the normal
            % \externalfigure macro, the label becomes the
            % name of the figurebase
-           \writtenXMLelement{\XMLrlprefix base}{\figurefilename}%
-           \writtenXMLelement{\XMLrlprefix label}{\figurefilelabel}%
-\ifx\figurefilefile\empty\else
-  \writtenXMLelement{\XMLrlprefix file}{\figurefilefile}%
-\fi
-\ifx\figurefileoriginal\empty\else
-  \writtenXMLelement{\XMLrlprefix original}{\figurefileoriginal}%
-\fi
+           \writtenXMLelementcs{\XMLrlprefix     base}\figurefilename
+           \writtenXMLelementcs{\XMLrlprefix    label}\figurefilelabel
+           \writtenXMLelementcs{\XMLrlprefix     file}\figurefilefile
          \fi
+         \writtenXMLelementcs{\XMLrlprefix       path}\figurefilepath
+         \writtenXMLelementcs{\XMLrlprefix   original}\figurefileoriginal
+         \writtenXMLelementcs{\XMLrlprefix conversion}\figurefileconversion
+         \writtenXMLelementcs{\XMLrlprefix     prefix}\figurefileprefix
          \ifnum\figurefilepage>\zerocount
-           \writtenXMLelement{\XMLrlprefix page}{\figurefilepage}%
+           \writtenXMLelement{\XMLrlprefix       page}\figurefilepage
          \fi
-\ifx\currentresourcecomment\empty\else
-  \writtenXMLelement{\XMLrlprefix comment}{\currentresourcecomment}%
-\fi
-         \writtenXMLelement{\XMLrlprefix width}{\figurewidth}%
-         \writtenXMLelement{\XMLrlprefix height}{\figureheight}}}}
+         \writtenXMLelementcs{\XMLrlprefix    comment}\currentresourcecomment
+         \writtenXMLelementcs{\XMLrlprefix      width}\figurewidth
+         \writtenXMLelementcs{\XMLrlprefix     height}\figureheight}}}
 
 \def\XMLfeedbackexternalfigure
   {\doifmodeelse{*\v!figure}%
diff --git a/tex/context/base/xtag-ext.tex b/tex/context/base/xtag-ext.tex
index 9dc0adea3..6d882a67b 100644
--- a/tex/context/base/xtag-ext.tex
+++ b/tex/context/base/xtag-ext.tex
@@ -271,9 +271,13 @@
 \def\potentialXMLentity#1%
   {\doifXMLentityelse{#1}{\getXMLentity{#1}}{#1}}
 
-\def\writtenXMLelement#1#2{<#1>#2</#1>}
-\def\writtenXMLstart    #1{<#1>}
-\def\writtenXMLend      #1{</#1>}
-\def\writtenXMLempty    #1{<#1/>}
+% \def\XMLnoschema{standalone='yes'}
+
+\def\writtenXMLelement  #1#2{<#1>#2</#1>}
+\def\writtenXMLstart      #1{<#1>}
+\def\writtenXMLend        #1{</#1>}
+\def\writtenXMLempty      #1{<#1/>}
+\def\writtenXMLelementcs#1#2{\ifx#2\empty\else<#1>#2</#1>\fi}
+\def\writtenXMLemptycs  #1#2{\ifx#2\empty<#1/>\else<#1>#2</#1>\fi}
 
 \protect \endinput
diff --git a/tex/context/base/xtag-hyp.tex b/tex/context/base/xtag-hyp.tex
index a805be9d1..821705f7b 100644
--- a/tex/context/base/xtag-hyp.tex
+++ b/tex/context/base/xtag-hyp.tex
@@ -24,6 +24,18 @@
    \enableencoding[\XMLop{encoding}]}
   {\stopnointerference}
 
+\defineXMLsingular [hyphenate]
+  {\-}
+
+\defineXMLgrouped [language] [code=\currentlanguage,scope=local]
+  {\doifelse{\XMLop{scope}}{global}\mainlanguage\language[\XMLop{code}]}
+
+\defineXMLsingular [language] [code=\currentlanguage]
+  {\doifelse{\XMLop{scope}}{global}\mainlanguage\language[\XMLop{code}]}
+
+\defineXMLsingular [compound] [token=-]
+  {\expanded{\directdiscretionary{\XMLop{token}}}}
+
 \endinput
 
 % \mainlanguage[nl] \setupbodyfont[pos] \useXMLfilter[utf,hyp]
diff --git a/tex/context/base/xtag-ini.tex b/tex/context/base/xtag-ini.tex
index 06e236f46..aa5132c8f 100644
--- a/tex/context/base/xtag-ini.tex
+++ b/tex/context/base/xtag-ini.tex
@@ -2554,6 +2554,10 @@
 \def\doifXMLownvalelse{\doifXMLvalelse{\rawXMLnamespace\rawXMLidentifier}}
 \def\doifXMLownparelse{\doifXMLparelse{\rawXMLnamespace\rawXMLidentifier}}
 
+\def\letXMLpar #1#2{\@EA \let\csname\@@XMLvariable:#1:#2\endcsname}
+\def\setXMLpar #1#2{\@EA \def\csname\@@XMLvariable:#1:#2\endcsname}
+\def\setXMLepar#1#2{\@EA\edef\csname\@@XMLvariable:#1:#2\endcsname}
+
 \def\ownXMLelement{\rawXMLnamespace\rawXMLidentifier}
 
 \def\XMLop#1% ownpar
diff --git a/tex/context/bib/t-bib.tex b/tex/context/bib/t-bib.tex
index d9beb6e75..53cc1b91b 100644
--- a/tex/context/bib/t-bib.tex
+++ b/tex/context/bib/t-bib.tex
@@ -156,7 +156,7 @@
 \def\bibdoifnot#1%
   {\ifx#1\relax
      \@EA\firstofoneargument
-   \else\ifx#1\empty
+   \else\ifx\#1\empty
      \@EAEAEA\firstofoneargument
    \else
      \@EAEAEA\gobbleoneargument
@@ -516,9 +516,9 @@
 %D
 
 \def\invertedauthor#1#2#3#4#5%
-  {\bibdoif{#2}{#2\bibalternative\c!vonsep}%
+  {\def\tempraa{#2}\bibdoif\tempraa{#2\bibalternative\c!vonsep}%
    #3\bibalternative\c!surnamesep
-   \bibdoif{#5}{#5\bibalternative\c!juniorsep}%
+   \def\tempraa{#5}\bibdoif\tempraa{\bibalternative\c!juniorsep#5}%
    \bibdoif{#1}{#1\unskip}}
 
 \def\normalauthor#1#2#3#4#5%
@@ -528,9 +528,9 @@
    \bibdoif{#5}{#5\unskip}}
 
 \def\invertedshortauthor#1#2#3#4#5%
-  {\bibdoif{#2}{#2\bibalternative\c!vonsep}%
+  {\def\tempraa{#2}\bibdoif\tempraa{#2\bibalternative\c!vonsep}%
    #3\bibalternative\c!surnamesep
-   \bibdoif{#5}{#5\bibalternative\c!juniorsep}%
+   \def\tempraa{#5}\bibdoif\tempraa{\bibalternative\c!juniorsep#5}%
    \bibdoif{#4}{#4\unskip}}
 
 \def\normalshortauthor#1#2#3#4#5%
@@ -1175,3 +1175,4 @@
 %D \completepublications
 
 \protect \endinput
+
diff --git a/tex/context/foxet/fo-0601.fo b/tex/context/foxet/fo-0601.fo
index 325240510..1e291f278 100644
--- a/tex/context/foxet/fo-0601.fo
+++ b/tex/context/foxet/fo-0601.fo
@@ -6,12 +6,15 @@
 
     <fo:layout-master-set>
         <fo:simple-page-master master-name='test'
-                margin-top='1cm' margin-bottom='2cm' margin-left='3cm' margin-right='4cm'>
-            <fo:region-body   margin='2cm' background-color='gray'  />
+                margin-top='1cm'
+                margin-bottom='2cm'
+                margin-left='3cm'
+                margin-right='4cm'>
             <fo:region-before extent='1cm' background-color='red'   />
             <fo:region-after  extent='1cm' background-color='green' />
             <fo:region-start  extent='1cm' background-color='blue'  />
             <fo:region-end    extent='1cm' background-color='yellow'/>
+            <fo:region-body   margin='2cm' background-color='gray'  />
         </fo:simple-page-master>
     </fo:layout-master-set>
 
diff --git a/tex/context/foxet/fo-0621.fo b/tex/context/foxet/fo-0621.fo
index b46f82477..554fcc4a0 100644
--- a/tex/context/foxet/fo-0621.fo
+++ b/tex/context/foxet/fo-0621.fo
@@ -2,7 +2,9 @@
 
 <!-- foxet test file - Hans Hagen - PRAGMA ADE - www.pragma-ade.com -->
 
-<fo:root xmlns:fo='http://www.w3.org/1999/XSL/Format' xmlns:fe='http://www.pragma-ade.com/schemas/foxet.rng'>
+<fo:root
+    xmlns:fo='http://www.w3.org/1999/XSL/Format'
+    xmlns:fe='http://www.pragma-ade.com/schemas/foxet.rng'>
 
     <fo:layout-master-set>
         <fo:simple-page-master master-name='any' margin='2cm'>
@@ -83,7 +85,7 @@
         </fo:flow>
     </fo:page-sequence>
 
-    <fo:page-sequence master-reference='demo' force-page-count='end-on-even'>
+    <fo:page-sequence master-reference='demo' force-page-count='end-on-odd'>
         <fe:message>starting page sequence 'demo'</fe:message>
         <fo:flow flow-name='xsl-region-body'>
             <fo:block>
@@ -92,7 +94,7 @@
         </fo:flow>
     </fo:page-sequence>
 
-    <fo:page-sequence master-reference='omed' force-page-count='end-on-even'>
+    <fo:page-sequence master-reference='omed' force-page-count='end-on-odd'>
         <fe:message>starting page sequence 'omed'</fe:message>
         <fo:flow flow-name='xsl-region-body'>
             <fo:block>
diff --git a/tex/context/interface/cont-cz.xml b/tex/context/interface/cont-cz.xml
index 22a004bb0..95ed07149 100644
--- a/tex/context/interface/cont-cz.xml
+++ b/tex/context/interface/cont-cz.xml
@@ -481,6 +481,21 @@
       <cd:parameter name="s">
         <cd:constant type="cd:text"/>
       </cd:parameter>
+      <cd:parameter name="h">
+        <cd:constant type="cd:text"/>
+      </cd:parameter>
+      <cd:parameter name="t">
+        <cd:constant type="cd:text"/>
+      </cd:parameter>
+      <cd:parameter name="a">
+        <cd:constant type="cd:text"/>
+      </cd:parameter>
+      <cd:parameter name="p">
+        <cd:constant type="cd:text"/>
+      </cd:parameter>
+      <cd:parameter name="e">
+        <cd:constant type="cd:text"/>
+      </cd:parameter>
     </cd:assignments>
   </cd:arguments>
 </cd:command>
@@ -1578,9 +1593,14 @@
         <cd:constant type="cd:dimension"/>
       </cd:parameter>
       <cd:parameter name="misto">
-        <cd:constant type="nizko"/>
         <cd:constant type="podlehloubky"/>
         <cd:constant type="visici"/>
+        <cd:constant type="vysoko"/>
+        <cd:constant type="nivy"/>
+        <cd:constant type="nizko"/>
+        <cd:constant type="vrsek"/>
+        <cd:constant type="nastred"/>
+        <cd:constant type="spodek"/>
       </cd:parameter>
       <cd:parameter name="volba">
         <cd:constant type="zadny"/>
diff --git a/tex/context/interface/cont-de.xml b/tex/context/interface/cont-de.xml
index e153b9687..28122177a 100644
--- a/tex/context/interface/cont-de.xml
+++ b/tex/context/interface/cont-de.xml
@@ -481,6 +481,21 @@
       <cd:parameter name="s">
         <cd:constant type="cd:text"/>
       </cd:parameter>
+      <cd:parameter name="h">
+        <cd:constant type="cd:text"/>
+      </cd:parameter>
+      <cd:parameter name="t">
+        <cd:constant type="cd:text"/>
+      </cd:parameter>
+      <cd:parameter name="a">
+        <cd:constant type="cd:text"/>
+      </cd:parameter>
+      <cd:parameter name="p">
+        <cd:constant type="cd:text"/>
+      </cd:parameter>
+      <cd:parameter name="e">
+        <cd:constant type="cd:text"/>
+      </cd:parameter>
     </cd:assignments>
   </cd:arguments>
 </cd:command>
@@ -1578,9 +1593,14 @@
         <cd:constant type="cd:dimension"/>
       </cd:parameter>
       <cd:parameter name="platz">
-        <cd:constant type="tief"/>
         <cd:constant type="tiefe"/>
         <cd:constant type="haengend"/>
+        <cd:constant type="hoch"/>
+        <cd:constant type="hoti"/>
+        <cd:constant type="tief"/>
+        <cd:constant type="oben"/>
+        <cd:constant type="mittig"/>
+        <cd:constant type="unten"/>
       </cd:parameter>
       <cd:parameter name="option">
         <cd:constant type="kein"/>
diff --git a/tex/context/interface/cont-en.xml b/tex/context/interface/cont-en.xml
index 8f36ebe59..7e52b5185 100644
--- a/tex/context/interface/cont-en.xml
+++ b/tex/context/interface/cont-en.xml
@@ -481,6 +481,21 @@
       <cd:parameter name="s">
         <cd:constant type="cd:text"/>
       </cd:parameter>
+      <cd:parameter name="h">
+        <cd:constant type="cd:text"/>
+      </cd:parameter>
+      <cd:parameter name="t">
+        <cd:constant type="cd:text"/>
+      </cd:parameter>
+      <cd:parameter name="a">
+        <cd:constant type="cd:text"/>
+      </cd:parameter>
+      <cd:parameter name="p">
+        <cd:constant type="cd:text"/>
+      </cd:parameter>
+      <cd:parameter name="e">
+        <cd:constant type="cd:text"/>
+      </cd:parameter>
     </cd:assignments>
   </cd:arguments>
 </cd:command>
@@ -1578,9 +1593,14 @@
         <cd:constant type="cd:dimension"/>
       </cd:parameter>
       <cd:parameter name="location">
-        <cd:constant type="low"/>
         <cd:constant type="depth"/>
         <cd:constant type="hanging"/>
+        <cd:constant type="high"/>
+        <cd:constant type="lohi"/>
+        <cd:constant type="low"/>
+        <cd:constant type="top"/>
+        <cd:constant type="middle"/>
+        <cd:constant type="bottom"/>
       </cd:parameter>
       <cd:parameter name="option">
         <cd:constant type="none"/>
diff --git a/tex/context/interface/cont-it.xml b/tex/context/interface/cont-it.xml
index 1aba3fe85..c6ad32006 100644
--- a/tex/context/interface/cont-it.xml
+++ b/tex/context/interface/cont-it.xml
@@ -481,6 +481,21 @@
       <cd:parameter name="s">
         <cd:constant type="cd:text"/>
       </cd:parameter>
+      <cd:parameter name="h">
+        <cd:constant type="cd:text"/>
+      </cd:parameter>
+      <cd:parameter name="t">
+        <cd:constant type="cd:text"/>
+      </cd:parameter>
+      <cd:parameter name="a">
+        <cd:constant type="cd:text"/>
+      </cd:parameter>
+      <cd:parameter name="p">
+        <cd:constant type="cd:text"/>
+      </cd:parameter>
+      <cd:parameter name="e">
+        <cd:constant type="cd:text"/>
+      </cd:parameter>
     </cd:assignments>
   </cd:arguments>
 </cd:command>
@@ -1578,9 +1593,14 @@
         <cd:constant type="cd:dimension"/>
       </cd:parameter>
       <cd:parameter name="luogo">
-        <cd:constant type="basso"/>
         <cd:constant type="profondita"/>
         <cd:constant type="sospeso"/>
+        <cd:constant type="alto"/>
+        <cd:constant type="pedap"/>
+        <cd:constant type="basso"/>
+        <cd:constant type="cima"/>
+        <cd:constant type="centro"/>
+        <cd:constant type="fondo"/>
       </cd:parameter>
       <cd:parameter name="opzione">
         <cd:constant type="nessuno"/>
diff --git a/tex/context/interface/cont-nl.xml b/tex/context/interface/cont-nl.xml
index 4e6858787..bb687b141 100644
--- a/tex/context/interface/cont-nl.xml
+++ b/tex/context/interface/cont-nl.xml
@@ -481,6 +481,21 @@
       <cd:parameter name="s">
         <cd:constant type="cd:text"/>
       </cd:parameter>
+      <cd:parameter name="h">
+        <cd:constant type="cd:text"/>
+      </cd:parameter>
+      <cd:parameter name="t">
+        <cd:constant type="cd:text"/>
+      </cd:parameter>
+      <cd:parameter name="a">
+        <cd:constant type="cd:text"/>
+      </cd:parameter>
+      <cd:parameter name="p">
+        <cd:constant type="cd:text"/>
+      </cd:parameter>
+      <cd:parameter name="e">
+        <cd:constant type="cd:text"/>
+      </cd:parameter>
     </cd:assignments>
   </cd:arguments>
 </cd:command>
@@ -1578,9 +1593,14 @@
         <cd:constant type="cd:dimension"/>
       </cd:parameter>
       <cd:parameter name="plaats">
-        <cd:constant type="laag"/>
         <cd:constant type="diepte"/>
         <cd:constant type="hangend"/>
+        <cd:constant type="hoog"/>
+        <cd:constant type="laho"/>
+        <cd:constant type="laag"/>
+        <cd:constant type="boven"/>
+        <cd:constant type="midden"/>
+        <cd:constant type="onder"/>
       </cd:parameter>
       <cd:parameter name="optie">
         <cd:constant type="geen"/>
diff --git a/tex/context/interface/cont-ro.xml b/tex/context/interface/cont-ro.xml
index 5efcf4248..10df28f3f 100644
--- a/tex/context/interface/cont-ro.xml
+++ b/tex/context/interface/cont-ro.xml
@@ -481,6 +481,21 @@
       <cd:parameter name="s">
         <cd:constant type="cd:text"/>
       </cd:parameter>
+      <cd:parameter name="h">
+        <cd:constant type="cd:text"/>
+      </cd:parameter>
+      <cd:parameter name="t">
+        <cd:constant type="cd:text"/>
+      </cd:parameter>
+      <cd:parameter name="a">
+        <cd:constant type="cd:text"/>
+      </cd:parameter>
+      <cd:parameter name="p">
+        <cd:constant type="cd:text"/>
+      </cd:parameter>
+      <cd:parameter name="e">
+        <cd:constant type="cd:text"/>
+      </cd:parameter>
     </cd:assignments>
   </cd:arguments>
 </cd:command>
@@ -1578,9 +1593,14 @@
         <cd:constant type="cd:dimension"/>
       </cd:parameter>
       <cd:parameter name="locatie">
-        <cd:constant type="jos"/>
         <cd:constant type="adancime"/>
         <cd:constant type="suspendat"/>
+        <cd:constant type="inalt"/>
+        <cd:constant type="lohi"/>
+        <cd:constant type="jos"/>
+        <cd:constant type="sus"/>
+        <cd:constant type="centru"/>
+        <cd:constant type="subsol"/>
       </cd:parameter>
       <cd:parameter name="optiune">
         <cd:constant type="niciunul"/>
diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml
index 7f3585bae..7282d1d09 100644
--- a/tex/context/interface/keys-cz.xml
+++ b/tex/context/interface/keys-cz.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2005.03.02">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2005.03.16">
 
   <cd:variables>
     <cd:variable name="one" value="jedna"/>
@@ -67,6 +67,7 @@
     <cd:variable name="backpart" value="epilog"/>
     <cd:variable name="backmatter" value="epilogy"/>
     <cd:variable name="footnote" value="poznamkapodcarou"/>
+    <cd:variable name="endnote" value="endnote"/>
     <cd:variable name="system" value="system"/>
   </cd:variables>
 
diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml
index 02ee63bb4..6425379cc 100644
--- a/tex/context/interface/keys-de.xml
+++ b/tex/context/interface/keys-de.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2005.03.02">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2005.03.16">
 
   <cd:variables>
     <cd:variable name="one" value="eins"/>
@@ -67,6 +67,7 @@
     <cd:variable name="backpart" value="epilog"/>
     <cd:variable name="backmatter" value="epiloge"/>
     <cd:variable name="footnote" value="fussnote"/>
+    <cd:variable name="endnote" value="endnote"/>
     <cd:variable name="system" value="systeme"/>
   </cd:variables>
 
diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml
index 21ae0cc84..0352684ca 100644
--- a/tex/context/interface/keys-en.xml
+++ b/tex/context/interface/keys-en.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2005.03.02">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2005.03.16">
 
   <cd:variables>
     <cd:variable name="one" value="one"/>
@@ -67,6 +67,7 @@
     <cd:variable name="backpart" value="backpart"/>
     <cd:variable name="backmatter" value="backmatter"/>
     <cd:variable name="footnote" value="footnote"/>
+    <cd:variable name="endnote" value="endnote"/>
     <cd:variable name="system" value="system"/>
   </cd:variables>
 
diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml
index 6e1e560ff..2b0c2cae0 100644
--- a/tex/context/interface/keys-it.xml
+++ b/tex/context/interface/keys-it.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2005.03.02">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2005.03.16">
 
   <cd:variables>
     <cd:variable name="one" value="uno"/>
@@ -67,6 +67,7 @@
     <cd:variable name="backpart" value="postfazione"/>
     <cd:variable name="backmatter" value="postambolo"/>
     <cd:variable name="footnote" value="notapdp"/>
+    <cd:variable name="endnote" value="endnote"/>
     <cd:variable name="system" value="sistema"/>
   </cd:variables>
 
diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml
index 4fc5c175c..76873b3a5 100644
--- a/tex/context/interface/keys-nl.xml
+++ b/tex/context/interface/keys-nl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2005.03.02">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2005.03.16">
 
   <cd:variables>
     <cd:variable name="one" value="een"/>
@@ -67,6 +67,7 @@
     <cd:variable name="backpart" value="uitleiding"/>
     <cd:variable name="backmatter" value="uitleidingen"/>
     <cd:variable name="footnote" value="voetnoot"/>
+    <cd:variable name="endnote" value="eindnoot"/>
     <cd:variable name="system" value="systeem"/>
   </cd:variables>
 
diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml
index 7ade7d1b3..5bed817c4 100644
--- a/tex/context/interface/keys-ro.xml
+++ b/tex/context/interface/keys-ro.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2005.03.02">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2005.03.16">
 
   <cd:variables>
     <cd:variable name="one" value="unu"/>
@@ -67,6 +67,7 @@
     <cd:variable name="backpart" value="epilog"/>
     <cd:variable name="backmatter" value="epilogul"/>
     <cd:variable name="footnote" value="notasubsol"/>
+    <cd:variable name="endnote" value="endnote"/>
     <cd:variable name="system" value="sistem"/>
   </cd:variables>
 
diff --git a/tex/context/user/cont-sys.rme b/tex/context/user/cont-sys.rme
index 6a9e7eec3..eaed591fd 100644
--- a/tex/context/user/cont-sys.rme
+++ b/tex/context/user/cont-sys.rme
@@ -60,7 +60,7 @@
 
 % You can let \CONTEXT\ load the map files for \PDFTEX.
 
-\autoloadmapfilestrue
+\resetmapfiles \autoloadmapfilestrue
 
 % (1) you can prevent loading with:
 %