stable 2006.08.08 17:52

47 files changed, 697 insertions, 186 deletions

diff --git a/tex/context/base/colo-ini.tex b/tex/context/base/colo-ini.tex
index e6d18ddba..bb0b8c6e8 100644
--- a/tex/context/base/colo-ini.tex
+++ b/tex/context/base/colo-ini.tex
@@ -349,7 +349,7 @@
       \fi}
      {\doifelsenothing\currentpalet
          \donefalse
-        {\doifdefinedelse{\??cr\currentpalet#6}\donetrue\donefalse}
+        {\doifdefinedelse{\??cr\currentpalet#6}\donetrue\donefalse}%
       \ifdone
         \doifnot{#5}{#6}
            {#2{\??cr#5}{\paletcolorspec{#6}}}%
diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex
index 3cab23209..aa48f5866 100644
--- a/tex/context/base/cont-new.tex
+++ b/tex/context/base/cont-new.tex
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2006.08.04 22:23}
+\newcontextversion{2006.08.08 17:52}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex
index 87b47aa46..81605992e 100644
--- a/tex/context/base/context.tex
+++ b/tex/context/base/context.tex
@@ -31,7 +31,7 @@
 %D 2004.8.30 the low level interface is english. Watch out and adapt
 %D your styles an modules.
 
-\def\contextversion{2006.08.04 22:23}
+\def\contextversion{2006.08.08 17:52}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/core-buf.tex b/tex/context/base/core-buf.tex
index 6d93b45bb..73c93b356 100644
--- a/tex/context/base/core-buf.tex
+++ b/tex/context/base/core-buf.tex
@@ -331,7 +331,7 @@
      \setevalue{\e!get#1}%
        {\noexpand\dodoprocessTEXbuffer[#1][def-\nofdefinedbuffers]}%
      \setevalue{\e!type#1}%
-       {\noexpand\dodotypebuffer[#1][def-\nofdefinedbuffers]}%
+       {\noexpand\dotypebuffer[#1][def-\nofdefinedbuffers]}%
      \getparameters[\??bu#1][#2]%
    \fi}
 
@@ -762,8 +762,11 @@
       \c!style=,
       \c!file=\jobname]}
 
+% \def\defineblock
+%   {\dosingleargumentwithset\dodefineblock}
+
 \def\defineblock
-  {\dosingleargumentwithset\dodefineblock}
+  {\dosingleargument\dodefineblock}
 
 \def\dosetupblock[#1][#2]%
   {\getparameters[\??tb#1][#2]}
diff --git a/tex/context/base/core-des.tex b/tex/context/base/core-des.tex
index 195bb01b7..382dc8ca7 100644
--- a/tex/context/base/core-des.tex
+++ b/tex/context/base/core-des.tex
@@ -435,7 +435,7 @@
      [\c!sectionnumber=\descriptionparameter\c!sectionnumber]%
    \if!!donea
      \makeprecedingsectionnumber[\currentdescriptionnumber]%
-     \preparethenumber{\??dd\currentdescription}\precedingsectionnumber\preparednumber
+     \prepareprefixnumber{\??dd\currentdescription}\precedingsectionnumber\preparednumber
      \iftrialtypesetting\startlocal\fi
      \getvalue{\e!next\currentdescription}% tricky but we need the preroll
      \iftrialtypesetting\stoplocal\fi
@@ -445,7 +445,7 @@
        \letvalue{\??dd\currentdescription\c!sectionnumber}\v!yes
        \protectconversion
        \makeprecedingsectionnumber[\currentdescriptionnumber]%
-       \preparethenumber{\??dd\currentdescription}\precedingsectionnumber\preparednumber
+       \prepareprefixnumber{\??dd\currentdescription}\precedingsectionnumber\preparednumber
        \ifcase\descriptioncoupling \or
          \xdef\@@internalenumber{\doshowdnnumber}%
          \rawreference\s!num{#1:\@@internalenumber}{}%
@@ -456,7 +456,7 @@
        \egroup
      \fi
     %\makeprecedingsectionnumber[\currentdescriptionnumber]%
-    %\preparethenumber{\??dd\currentdescription}\precedingsectionnumber\preparednumber
+    %\prepareprefixnumber{\??dd\currentdescription}\precedingsectionnumber\preparednumber
      \disablepseudocaps   % sorry, uppercase causes troubles
      \doattributes        % \nocase primitive needed
        {\??dd\currentdescription}\c!headstyle\c!headcolor % todo: sub as well
@@ -524,7 +524,7 @@
 \def\domakednnumber
   {\descriptionparameter\c!left
    \strut\doshowdnnumber
-   % \descriptionparameter\c!stopper
+   \descriptionparameter\c!stopper
    \descriptionparameter\c!right}
 
 \setvalue{\??dd\s!set\v!sub\s!sub\s!sub\c!number}#1%
diff --git a/tex/context/base/core-fig.tex b/tex/context/base/core-fig.tex
index 7abff75ec..f8d58e038 100644
--- a/tex/context/base/core-fig.tex
+++ b/tex/context/base/core-fig.tex
@@ -128,6 +128,21 @@
       11: including resource --
 \stopmessages
 
+\startmessages  french  library: figures
+   title: figures
+       1: la figure -- ne peut être trouvée
+       2: la figure -- n'est pas pré-sélectionnée
+       3: les dimensions de la figure -- adaptées à partir de --
+       4: les dimensions de -- chargées implicitement à partir du fichier de figure
+       5: les dimensions de -- chargées à partir du fichier de figure --
+       6: les dimensions de -- calculées par TeXUtil
+       7: regénérer le fichier de figure --
+       8: figureobject -- est réutilisé
+       9: la figure -- n'est pas manipulée
+      10: la figure -- a des dimensions nulles
+      11: inclusion de la ressource --
+\stopmessages
+
 %D Due to the mere fact that \DVI|/|\PDF\ drivers differ in their
 %D needs for figure dimensions, we have to provide the width,
 %D height, horizontal and vertical scale. Also we want to
diff --git a/tex/context/base/core-fil.tex b/tex/context/base/core-fil.tex
index b12a78324..c3a7c52d1 100644
--- a/tex/context/base/core-fil.tex
+++ b/tex/context/base/core-fil.tex
@@ -59,11 +59,20 @@
        1: le synonyme de fichier -- est déjà utilisé pour --
 \stopmessages
 
-%D
+%D Files registered as temporary files will be deleted after a
+%D run by texexec:
+
+% \starttext
+%     \immediate\openout\scratchwrite=oeps.tmp
+%     \immediate\write\scratchwrite{oeps}
+%     \immediate\closeout\scratchwrite
+%     \registertempfile{oeps.tmp}
+%     \typefile{oeps.tmp}
+% \stoptext
 
-\let\usedtempfile\gobbleonearguments
+\let\usedtempfile\gobbleoneargument
 
-\def\registertempfile#1{\immediatewriteutilitycommand{\usedtempfile{#1}}}
+\def\registertempfile#1{\immediatewriteutility{f t {#1}}}
 
 %D \macros
 %D   {definefilesynonym}
diff --git a/tex/context/base/core-lst.tex b/tex/context/base/core-lst.tex
index 2d45282c2..8029d4fe1 100644
--- a/tex/context/base/core-lst.tex
+++ b/tex/context/base/core-lst.tex
@@ -141,24 +141,63 @@
 
 \addutilityreset{listentries}
 
-\setvalue{\??li\c!alternative a}% nr - tit - pag
-% {\def\listfill {\hskip 1.75em}% was \hskip.5em\hskip 1.25em
-  {\def\listfill {\hskip .25em}% omdat nu check
-   \def\listskip {0em}%
-   \def\listwidth{2em}}
-
-\setvalue{\??li\c!alternative b}% nr - tit - fill - pag
-  {\def\listfill {\hfill}%  was \hskip.5em\hfill
-   \def\listskip {5em}%
-   \def\listwidth{2em}}
-
-\setvalue{\??li\c!alternative c}% nr - tit - dots - pag
-  {\def\listfill {\hskip.5em\listdots\hskip.5em}%
-   \def\listskip {5em}%
-   \def\listwidth{0pt}}
+% old values:
+%
+% a: \def\listfill {\hskip 1.75em}
+% b: \def\listfill {\hskip.5em\hfill}
+% c: \def\listfill {\hskip.5em\listdots\hskip.5em}
+
+% todo: interface them
+
+% \setvalue{\??li\c!alternative a}% nr - tit - pag
+%   {\def\listfill   {\hskip.25em\relax}%
+%    \def\listskip   {0pt}%
+%    \def\listwidth  {2em}%
+%    \def\liststretch{10em}}
+
+% \setvalue{\??li\c!alternative b}% nr - tit - fill - pag
+%   {\def\listfill   {\hfill}%
+%    \def\listskip   {5em}%
+%    \def\listwidth  {2em}%
+%    \def\liststretch{10em}}
+
+% \setvalue{\??li\c!alternative c}% nr - tit - dots - pag
+%   {\def\listfill   {\hskip.5em\listdots\hskip.5em\relax}%
+%    \def\listskip   {5em}%
+%    \def\listwidth  {0pt}%
+%    \def\liststretch{10em}}
+
+\def\listalternativeparameter#1%
+  {\csname\??li\??li\listparameter\c!alternative#1\endcsname}
+
+\def\setuplistalternative[#1]%
+  {\dodoubleargument\getparameters[\??li\??li#1]}
+
+ % \listfill cum suis will be replaced by the direct call
+
+\def\listfill   {\listalternativeparameter\c!command }
+\def\listskip   {\listalternativeparameter\c!distance}
+\def\listwidth  {\listalternativeparameter\c!width   }
+\def\liststretch{\listalternativeparameter\c!stretch }
+
+% a : nr - tit - pag
+% b : nr - tit - fill - pag
+% c : nr - tit - dots - pag
+
+\setuplistalternative[a][\c!distance=0pt,\c!width=2em,\c!stretch=10em,\c!command=\hskip.25em\relax]
+\setuplistalternative[b][\c!distance=5em,\c!width=2em,\c!stretch=10em,\c!command=\hfill]
+\setuplistalternative[c][\c!distance=5em,\c!width=0pt,\c!stretch=10em,\c!command=\hskip.5em\listdots\hskip.5em\relax]
 
 \def\listdots{\leaders\hbox to .5em{\hss.\hss}\hfill}
 
+% \starttext
+%     \placelist[section][alternative=c]
+%     \setuplistalternative[c][distance=1em,stretch=0em]
+%     \placelist[section][alternative=c]
+%     \section{test}
+%     \section{\readfile{tufte}{}{}}
+% \stoptext
+
 \setvalue{\??li\c!alternative}{\getvalue{\??li\c!alternative b}}
 
 \getvalue{\??li\c!alternative}
@@ -591,17 +630,15 @@
         {\forgetall
          \dostartlistattributes\c!style\c!color\empty
          \!!widthb\hsize
-\doifelse{\listparameter\c!headnumber}\v!yes{%
-         \setbox2\hbox \ifdim\!!widtha>\zeropoint to \!!widtha \fi
-           {\makelistelement\v!sectionnumber
-              {\donestedlistattributes\c!numberstyle\c!numbercolor
-                 {\listparameter\c!numbercommand{\currentlistsymbol}}%
-            \hfill}}%
-}{%
-        \!!widtha\zeropoint
-        \!!widthc\zeropoint
-        \setbox2\hbox{}%
-}%
+         \doifelse{\listparameter\c!headnumber}\v!yes
+           {\setbox2\hbox \ifdim\!!widtha>\zeropoint to \!!widtha \fi
+              {\makelistelement\v!sectionnumber
+                 {\donestedlistattributes\c!numberstyle\c!numbercolor
+                    {\listparameter\c!numbercommand{\currentlistsymbol}}%
+               \hfill}}}
+           {\!!widtha\zeropoint
+            \!!widthc\zeropoint
+            \setbox2\hbox{}}%
          \setbox4\hbox
            {\doif{\listparameter\c!pagenumber}\v!yes
               {\doifsomething{#5}    % \listwidth is new ; temp hack
@@ -625,7 +662,7 @@
                 % we kunnen gewoon afbreken aan het eind
               \else
                 \ifdim\listskip>\zeropoint\relax
-                  \rightskip\listskip\!!plus10em\relax
+                  \rightskip\listskip\!!plus\liststretch\relax
                   \parfillskip-\rightskip
                 \fi
               \fi
diff --git a/tex/context/base/core-mar.tex b/tex/context/base/core-mar.tex
index 5933249e8..257c3dc4c 100644
--- a/tex/context/base/core-mar.tex
+++ b/tex/context/base/core-mar.tex
@@ -327,9 +327,16 @@
 
 % \newtoks \everymarking
 
+% \def\Interesting{\doifmodeelse{*\v!marking}{Interesting}{Boring}}
+% \setupheadertexts[chapter]
+% \starttext
+%     \chapter{This Is \Interesting}
+% \stoptext
+
 \def\dogetmarking[#1][#2][#3]%
   {\doifvalue{\??mk#1\c!state}\v!start
      {\bgroup
+      \setsystemmode\v!marking
       \the\everymarking
      %\def\nomarking##1{\unknown\ }%
       \def\nomarking{\splitsequence{\getvalue{\??mk#1\c!limittext}}}%
diff --git a/tex/context/base/core-mat.tex b/tex/context/base/core-mat.tex
index 2170c44c7..ec6708670 100644
--- a/tex/context/base/core-mat.tex
+++ b/tex/context/base/core-mat.tex
@@ -2147,7 +2147,7 @@
    \tabskip\zeropoint
    \global\eqaligncolumn\plusone
    \halign\bgroup
-        $##$\hfil
+        $\mathcasesparameter\c!style##$\hfil
        &\hskip\mathcasesparameter\c!distance\relax
         \popmacro\docasesNC##\hfil
        &\hskip\mathcasesparameter\c!numberdistance\relax
@@ -2258,12 +2258,14 @@
    \expanded{\scratchtoks{\the\scratchtoks\the\!!toksc }}}
 
 \def\preparemathmatrix
-  {\!!toksa{\strut
-            \firstineqalign\leftofeqalign \span \textineqalign{##}\rightofeqalign}%
+  {\!!toksa{\strut \firstineqalign\leftofeqalign \span
+            \textineqalign{\mathmatrixparameter\c!style ##}\rightofeqalign}%
    \!!toksb{&\hskip\mathmatrixparameter\c!distance
-            \nextineqalign\leftofeqalign \span \textineqalign{##}\rightofeqalign}%
+            \nextineqalign\leftofeqalign \span
+            \textineqalign{\mathmatrixparameter\c!style ##}\rightofeqalign}%
    \!!toksc{&&\hskip\mathmatrixparameter\c!distance
-            \leftofeqalign \span \textineqalign{##}\rightofeqalign}%
+            \leftofeqalign \span
+            \textineqalign{\mathmatrixparameter\c!style ##}\rightofeqalign}%
    \buildmathmatrix
    \halign \@EA \bgroup\the\scratchtoks \crcr}
 
@@ -2281,40 +2283,22 @@
 \def\dodomatrixNC
   {\gdef\domatrixNC{\endmath&}}
 
-% \let\domatrixNR\doalignNR
-
-% \def\dostartmathmatrix[#1][#2]%
-%   {\begingroup
-%    \edef\currentmathmatrix{#1}%
-%    \doifassignmentelse{#2}{\setupmathmatrix[#1][#2]}\donothing
-%    \null
-%    \mathmatrixparameter\c!left
-%    \vcenter\bgroup
-%    \pushmacro\domatrixNC
-%    \let\endmath\relax
-%    \def\NC{\domatrixNC}%
-%    \def\MC{\domatrixNC\ifmmode\else$\def\endmath{$}\fi}%
-%    \global\let\domatrixNC\dodomatrixNC
-%   %\def\NR{\endmath&\global\let\domatrixNC\dodomatrixNC\doxxdoubleempty\domatrixNR}%
-%    \def\NR{\endmath\global\let\domatrixNC\dodomatrixNC\crcr}%
-%    \normalbaselines
-%    \mathsurround\zeropoint
-%    \everycr\emptytoks
-%    \tabskip\zeropoint
-%    \global\eqaligncolumn\plusone
-%    \halign\bgroup
-%       \hfil$##$\hfil
-%     &&\hskip\mathmatrixparameter\c!distance\relax\hfil$##$\hfil\crcr
-%       \mathstrut\crcr
-%       \noalign{\kern-\baselineskip}}
-
 \def\dostartmathmatrix[#1][#2]%
   {\begingroup
    \edef\currentmathmatrix{#1}%
    \doifassignmentelse{#2}{\setupmathmatrix[#1][#2]}\donothing
    \null
    \mathmatrixparameter\c!left
-   \vcenter\bgroup
+   \processaction
+      [\mathmatrixparameter\c!location]
+      [   \v!high=>\let\vchbox\vtop,
+           \v!low=>\let\vchbox\vbox,
+          \v!lohi=>\let\vchbox\vcenter,
+           \v!top=>\let\vchbox\vtop,
+        \v!bottom=>\let\vchbox\vbox,
+       \s!default=>\let\vchbox\vcenter,
+       \s!unknown=>\let\vchbox\vcenter]%
+   \vchbox\bgroup
    \pushmacro\domatrixNC
    \let\endmath\relax
    \def\NC{\domatrixNC}%
@@ -2436,12 +2420,15 @@
 \def\startintertext#1\stopintertext
   {\noalign{\dointertext{#1}}}
 
+\def\intertext#1%
+  {\noalign{\dointertext{#1}}}
+
 \unexpanded\def\dointertext#1%
-    {\penalty\postdisplaypenalty
-     \afterdisplayspace
-     \vbox{\forgetall\noindent#1\par}%
-     \penalty\predisplaypenalty
-     \beforedisplayspace}
+  {\penalty\postdisplaypenalty
+   \afterdisplayspace
+   \vbox{\forgetall\noindent#1\par}%
+   \penalty\predisplaypenalty
+   \beforedisplayspace}
 
 %D \macros
 %D   {substack}
diff --git a/tex/context/base/core-not.tex b/tex/context/base/core-not.tex
index dbbc0cc0c..30f40012b 100644
--- a/tex/context/base/core-not.tex
+++ b/tex/context/base/core-not.tex
@@ -701,7 +701,7 @@
      \fi
      \startpushnote
        {\ifx\lastnotenumber\empty \else
-          \preparethenumber{\??vn\currentnote}\lastnotenumber\preparednumber
+          \preparefullnumber{\??vn\currentnote}\lastnotenumber\preparednumber
           \doifelse{\noteparameter\c!interaction}\v!no
             {\noteparameter\c!numbercommand
                {\preparednumber\domovednote\v!nextpage\v!previouspage}}%
diff --git a/tex/context/base/core-ntb.tex b/tex/context/base/core-ntb.tex
index f440af331..fae7c51d5 100644
--- a/tex/context/base/core-ntb.tex
+++ b/tex/context/base/core-ntb.tex
@@ -1488,6 +1488,8 @@
      \doglobal\increment\currenttbl\relax
    \fi
    \doglobal\increment\TBLlevel\relax
+   \pushcharacteralign
+   \resetcharacteralign
    \ifnum\TBLlevel>\plusone
      \resetallTABLEparameters
      \globalpushmacro\colTBL
@@ -1503,8 +1505,23 @@
    \else
      \global\intablefalse
    \fi
+   \popcharacteralign
    \doglobal\decrement\TBLlevel\relax}
 
+% \bgroup
+% \setupTABLE[column][1][aligncharacter=yes, alignmentcharacter={,}]
+% \bTABLE
+%     \bTR  \bTD  1,2 \eTD  \bTD 2 \eTD \eTR
+%     \bTR  \bTD 11,2 \eTD  \bTD
+%         {\setupTABLE[column][1][aligncharacter=yes, alignmentcharacter={,}]
+%          \bTABLE
+%             \bTR  \bTD 1,2 \eTD  \bTD 2 \eTD \eTR
+%             \bTR  \bTD  11,22 \eTD  \bTD 2 \eTD \eTR
+%             \bTR  \bTD 11,2 \eTD  \bTD 2 \eTD \eTR \eTABLE} \eTD \eTR
+%     \bTR  \bTD  11,22 \eTD  \bTD 2 \eTD \eTR
+% \eTABLE
+% \egroup
+
 \newconditional\resetTABLEmode \settrue\resetTABLEmode
 
 \def\resetallTABLEparameters% moet genest wel werken
diff --git a/tex/context/base/core-pgr.tex b/tex/context/base/core-pgr.tex
index fe82ac643..ea47363a7 100644
--- a/tex/context/base/core-pgr.tex
+++ b/tex/context/base/core-pgr.tex
@@ -1636,18 +1636,40 @@
 
 % todo 1: shift down option
 
-\startuseMPgraphic{mpos:par:columnset}
-  \iftracepositions show_multi_pars \else draw_multi_pars \fi ;
-  path p ; p := boundingbox currentpicture ;
-  currentpicture := currentpicture shifted (0,-StrutDepth/2) ;
-  setbounds currentpicture to p ;
-\stopuseMPgraphic
+% \startuseMPgraphic{mpos:par:columnset}
+%   \iftracepositions show_multi_pars \else draw_multi_pars \fi ;
+%   path p ; p := boundingbox currentpicture ;
+%   currentpicture := currentpicture shifted (0,-StrutDepth/2) ;
+%   setbounds currentpicture to p ;
+% \stopuseMPgraphic
+
+\definetextbackground[underline]    [location=text,alternative=1,background=,frame=off]
+\definetextbackground[overstrike]   [location=text,alternative=2,background=,frame=off]
+\definetextbackground[exlines]      [location=text,alternative=3,background=,frame=off]
+\definetextbackground[strikethrough][location=text,alternative=4,background=,frame=off]
+
+\definestartstop [underline]
+  [before={\starttextbackground[underline]},
+   after=\stoptextbackground]
 
-\setupcolors[state=start]
+\definestartstop
+  [overstrike]
+  [before={\starttextbackground[overstrike]},
+   after=\stoptextbackground]
 
-\definetextbackground[underline][location=text,alternative=1,background=,frame=off,distance=2pt]
+\definestartstop
+  [exlines]
+  [before={\starttextbackground[exlines]},
+   after=\stoptextbackground]
 
 \definestartstop
-  [underline]
-  [before={\starttextbackground[underline]},
+  [strikethrough]
+  [before={\starttextbackground[strikethrough]},
    after=\stoptextbackground]
+
+\starttext
+    \startunderline     \input tufte \stopunderline      \blank
+    \startoverstrike    \input tufte \stopoverstrike     \blank
+    \startexlines       \input tufte \stopexlines        \blank
+    \startstrikethrough \input tufte \stopstrikethrough  \blank
+\stoptext
diff --git a/tex/context/base/core-reg.tex b/tex/context/base/core-reg.tex
index ecfc91e5e..309aee2f9 100644
--- a/tex/context/base/core-reg.tex
+++ b/tex/context/base/core-reg.tex
@@ -1082,6 +1082,9 @@
      \begingroup
      \edef\currentregister{#1}%
      \setupregister[\currentregister][#2]%
+     \doifelse{\registerparameter\c!compress}\v!yes % new
+        {\chardef\collapseregisterpages\plusone}
+        {\chardef\collapseregisterpages\zerocount}%
      \raggedright
      \startcolumns
        [\c!n=\registerparameter\c!n,
@@ -1129,6 +1132,7 @@
       \c!before=\blank,      % binnen kolommen: \blank[\v!line]
       \c!after=,
       \c!symbol=,
+      \c!compress=\v!no,
       \c!interaction=\v!pagenumber,
       \c!alternative=\v!a,
       \c!distance=1em,
diff --git a/tex/context/base/core-sec.tex b/tex/context/base/core-sec.tex
index bfe8364a7..c5fc5db8a 100644
--- a/tex/context/base/core-sec.tex
+++ b/tex/context/base/core-sec.tex
@@ -222,21 +222,66 @@
      {\precedingsectionnumber\convertednumber[#1]}%
    \egroup}
 
-\def\preparethenumber#1#2#3% {\??id#1} \number \result
-  {\doifelsevaluenothing{#1\c!separator}
-     {\let\numberseparator\empty
-      \let#3#2}
-     {% was \unexpanded \edef, but we need it unexpanded !
-      \edef\numberseparator{\spr{\getvalue{#1\c!separator}}}%
-      \doifelsenothing{\executeifdefined{#1\c!suffix}\empty}
-        {\edef#3%
-           {\@EA\separatednumber\@EA{#2}%
-            }}%\stp{\getvalue{#1\c!stopper}}}}
-        {\edef#3%
-           {\@EA\separatednumber\@EA{#2}%
-            \spr{\getvalue{#1\c!separator}}%
-            \getvalue{#1\c!suffix}%
-            \stp{\getvalue{#1\c!stopper}}}}}}
+% \def\preparethenumber#1#2#3% {\??id#1} \number \result
+%   {\doifelsevaluenothing{#1\c!separator}
+%      {\let\numberseparator\empty
+%       \let#3#2}
+%      {% was \unexpanded \edef, but we need it unexpanded !
+%       \edef\numberseparator{\spr{\getvalue{#1\c!separator}}}%
+%       \doifelsenothing{\executeifdefined{#1\c!suffix}\empty}
+%         {\edef#3%
+%            {\@EA\separatednumber\@EA{#2}%
+%             }}%\stp{\getvalue{#1\c!stopper}}}}
+%         {\edef#3%
+%            {\@EA\separatednumber\@EA{#2}%
+%             \spr{\getvalue{#1\c!separator}}%
+%             \getvalue{#1\c!suffix}%
+%             \stp{\getvalue{#1\c!stopper}}}}}}
+%
+% some day we do a real cleanup
+
+\def\analyzenumber#1#2#3% {\??id#1} \(precedingsection)number \result
+  {% was \unexpanded \edef, but we need it unexpanded !
+   \doifelsenothing{\executeifdefined{#1\c!suffix}\empty}
+     {\let \numbersuffix \empty}
+     {\edef\numbersuffix{\spr{\getvalue{#1\c!suffix}}}}%
+   \doifelsenothing{\executeifdefined{#1\c!stopper}\empty}
+     {\let \numberstopper \empty}
+     {\edef\numberstopper{\spr{\getvalue{#1\c!stopper}}}}%
+   \doifelsenothing{\executeifdefined{#1\c!separator}\empty}
+     {\let \numberseparator \empty}
+     {\edef\numberseparator{\spr{\getvalue{#1\c!separator}}}}%
+   \let\numberprefix\empty}
+
+\def\preparefullnumber#1#2#3% {\??id#1} \(precedingsection)number \result
+  {\analyzenumber{#1}#2#3%
+   \ifx\numberseparator\empty
+     \edef\numberprefix{#2}%
+   \else
+     \edef\numberprefix{\@EA\separatednumber\@EA{#2}}%
+   \fi
+   \ifx\numbersuffix\empty
+     \ifx\numberprefix\empty
+        \let #3\empty
+     \else
+        \edef#3{\numberprefix\numberstopper}%
+     \fi
+   \else
+     \ifx\numberprefix\empty
+       \edef#3{\numbersuffix\numberstopper}%
+     \else
+       \edef#3{\numberprefix\numberseparator\numbersuffix\numberstopper}%
+     \fi
+   \fi}
+
+\def\prepareprefixnumber#1#2#3% {\??id#1} \number \result
+  {\analyzenumber{#1}#2#3%
+   \ifx\numberseparator\empty
+     \edef\numberprefix{#2}%
+   \else
+     \edef\numberprefix{\@EA\separatednumber\@EA{#2}}%
+   \fi
+   \let#3\numberprefix}
 
 \def\sectionnumberonly[#1]%
   {\makesectionnumber[#1]%
@@ -1536,7 +1581,8 @@
    \flushingcolumnfloatstrue
    \someheadconversionfalse
    \let\fullsectionnumber\limitedfullsectionnumber
-   \ifdisplaysectionhead\else\expandafter\GotoPar\fi}
+   % ignorespaces prevents spaces creeping in when after=\dontleavehmode
+   \ifdisplaysectionhead\ignorespaces\else\expandafter\GotoPar\fi}
 
 \def\forcesectiontolist#1#2%
   {\ifwritetolist
@@ -2188,7 +2234,7 @@
             % again too confusing
             \c!align,\c!aligntitle,\c!tolerance,\c!grid,\c!hang,\c!strut,
             \c!numbercommand,\c!textcommand,\c!margintext,\c!margin]%
-\getparameters[\??ko#1][\c!expansion=]% iig een value, rather fuzzy
+         \getparameters[\??ko#1][\c!expansion=]% iig een value, rather fuzzy
          \definemarking[#1][#2]%
          \definemarking[#1\v!number][#2\v!number]%
          \doifundefined{\??li#1}{\definelist[#1][#2]}}}%
diff --git a/tex/context/base/core-spa.tex b/tex/context/base/core-spa.tex
index eb86577fc..189d98396 100644
--- a/tex/context/base/core-spa.tex
+++ b/tex/context/base/core-spa.tex
@@ -1971,8 +1971,8 @@
       \stopbaselinecorrection}%
    \vbox}
 
-\def\verticalstrut  {\normalvbox{\hsize\zeropoint\strut}}
-\def\horizontalstrut{\normalhbox                {\strut}}
+\def\verticalstrut  {\normalvbox{\hsize\zeropoint\forgetall\strut}}
+\def\horizontalstrut{\normalhbox                          {\strut}}
 
 % Hieronder volgen enkele instellingen en macro's ten behoeve
 % van de interlinie en \strut. De waarden 2.8, 0.07, 0.72 en
@@ -2629,11 +2629,15 @@
 
 \newif\ifgridsnapping % to be sure
 
-\def\defaultwidowpenalty    {2000} % was: 1000
-\def\defaultclubpenalty     {2000} % was:  800
+\def\defaultwidowpenalty         {2000} % was: 1000
+\def\defaultclubpenalty          {2000} % was:  800
+\def\defaultdisplaywidowpenalty    {50}
+\def\defaultbrokenpenalty         {100}
 
-\def\defaultgridwidowpenalty   {0}
-\def\defaultgridclubpenalty    {0}
+\def\defaultgridwidowpenalty        {0}
+\def\defaultgridclubpenalty         {0}
+\def\defaultgriddisplaywidowpenalty {0}
+\def\defaultgridbrokenpenalty       {0}
 
 % The original approach:
 %
@@ -2673,8 +2677,10 @@
 
   \directsetup{\systemsetupsprefix\s!reset}
 
-  \widowpenalty\defaultwidowpenalty
-  \clubpenalty \defaultclubpenalty
+  \widowpenalty       \defaultwidowpenalty
+  \clubpenalty        \defaultclubpenalty
+  \displaywidowpenalty\defaultdisplaywidowpenalty
+  \brokenpenalty      \defaultbrokenpenalty
 
 \stopsetups
 
@@ -2682,8 +2688,10 @@
 
   \directsetup{\systemsetupsprefix\s!reset}
 
-  \widowpenalty\defaultgridwidowpenalty
-  \clubpenalty \defaultgridclubpenalty
+  \widowpenalty       \defaultgridwidowpenalty
+  \clubpenalty        \defaultgridclubpenalty
+  \displaywidowpenalty\defaultgriddisplaywidowpenalty
+  \brokenpenalty      \defaultgridbrokenpenalty
 
 \stopsetups
 
diff --git a/tex/context/base/core-syn.tex b/tex/context/base/core-syn.tex
index ec866e18c..7e7974d3b 100644
--- a/tex/context/base/core-syn.tex
+++ b/tex/context/base/core-syn.tex
@@ -393,6 +393,33 @@
 \def\definesorting
   {\dotripleempty\dodefinesorting}
 
+%D Here we define a support macro that can sort simple comma
+%D separated lists. It's a multi-list variant of a prototype
+%D written by Taco.
+
+\def\processlistofsorts[#1]%
+  {\doutilities{#1}\jobname{#1}\donothing\donothing}
+
+\newcounter\nofsortedalphalists
+
+\def\sortalphacommacommand#1%
+  {\begingroup
+   \doglobal\increment\nofsortedalphalists
+   \edef\currentsortedalphalist{alpha:\nofsortedalphalists}%
+   \definesorting[\currentsortedalphalist][\currentsortedalphalist]%
+   \processcommacommand[#1]{\getvalue\currentsortedalphalist}%
+   \global\let\sortedcommalist\empty
+   \def\makesortedlist##1{\doglobal\appendtocommalist{##1}\sortedcommalist}%
+   \setupsorting[\currentsortedalphalist][\c!criterium=\v!all,\c!command=\makesortedlist]%
+   \processlistofsorts[\currentsortedalphalist]%
+   \endgroup
+   \dodoglobal\let#1\sortedcommalist}
+
+% \starttext
+%     \def\whatever{a,b,q,d,r,f}       \sortalphacommacommand\whatever \whatever \endgraf
+%     \def\whatever{ax,bx,qx,dx,rx,fx} \sortalphacommacommand\whatever \whatever \endgraf
+% \stoptext
+
 \definesynonyms
   [\v!abbreviation]
   [\v!abbreviations]
diff --git a/tex/context/base/core-tsp.tex b/tex/context/base/core-tsp.tex
index 4568a38a1..dd2b42f61 100644
--- a/tex/context/base/core-tsp.tex
+++ b/tex/context/base/core-tsp.tex
@@ -104,6 +104,8 @@
 
 \def\dosplitfloat[#1]#2% nog dubbele refs
   {\bgroup
+   \global\setfalse\splitfloatdone
+   \aftergroup\checksplitfloat
    \insidefloattrue
    \insidesplitfloattrue
    \getparameters[\??si][#1]%
@@ -118,6 +120,13 @@
    \@@sibefore
    \let\next} % \bgroup
 
+
+\def\checksplitfloat
+  {\ifconditional\splitfloatdone\else
+      \blank{\tttf \getmessage\m!floatblocks{13}\empty}\blank
+      \showmessage\m!floatblocks{13}\empty
+   \fi}
+
 \settrue \onlyonesplitofffloat
 \setfalse\somenextplitofffloat
 
@@ -148,10 +157,13 @@
 %D \dorecurse{10}{\input tufte }
 %D \stoptyping
 
+\newconditional\splitfloatdone
+
 \def\dodowithsplitofffloat
   {\dowithnextbox
      {\forgetall
       \dontcomplain
+      \global\settrue\splitfloatdone
       \chardef\nodelocationmode\zerocount % bypass auto-renumbering
       \incrementnumber[\??si]%
       \ifcase\rawnumber[\??si]\or \ifconditional\onlyonesplitofffloat
diff --git a/tex/context/base/filt-ini.tex b/tex/context/base/filt-ini.tex
index 9827bb21a..d6e03f968 100644
--- a/tex/context/base/filt-ini.tex
+++ b/tex/context/base/filt-ini.tex
@@ -64,7 +64,6 @@
       2: filtre -- inconnu
 \stopmessages
 
-
 %D \macros
 %D   {definefiltersynonym}
 
diff --git a/tex/context/base/font-ini.tex b/tex/context/base/font-ini.tex
index 04b430a72..8e620309e 100644
--- a/tex/context/base/font-ini.tex
+++ b/tex/context/base/font-ini.tex
@@ -235,7 +235,7 @@
       5: le style -- n'est pas défini
       6: -- est chargé
       7: format -- inconnu
-      8: style -- defini
+      8: style -- défini
 %     9: mapping -- is loaded
      10: fichier de police -- inconnu
      14: policecorps -- est défini (une définition globale pourrait être plus adéquat)
diff --git a/tex/context/base/font-uni.tex b/tex/context/base/font-uni.tex
index 026f767f8..3dee48ec4 100644
--- a/tex/context/base/font-uni.tex
+++ b/tex/context/base/font-uni.tex
@@ -46,7 +46,7 @@
 \stopmessages
 
 \startmessages  french  library: fonts
-     21: l'utilisation de (pdf)eTeX est plus économe (more save)
+     21: l'utilisation de (pdf)eTeX est plus économe
 \stopmessages
 
 \unprotect
diff --git a/tex/context/base/m-units.tex b/tex/context/base/m-units.tex
index 3a860ed39..50b1a4899 100644
--- a/tex/context/base/m-units.tex
+++ b/tex/context/base/m-units.tex
@@ -60,7 +60,7 @@
 \stopmessages
 
 \startmessages  french  library: units
-  title: units
+  title: unités
       1: utilisez \string\Degrees\space\string\Celsius\space à la place de \string\Celsius !
 \stopmessages
 
diff --git a/tex/context/base/meta-ini.tex b/tex/context/base/meta-ini.tex
index 1db812d61..3353a9a0b 100644
--- a/tex/context/base/meta-ini.tex
+++ b/tex/context/base/meta-ini.tex
@@ -756,6 +756,10 @@
 \stopMPinitializations
 
 \appendtoks
+    \expanded{\definecolor[currentcolor][\currentcolor]}%
+\to \everyMPgraphic
+
+\appendtoks
   \baselineskip1\baselineskip
   \lineheight  1\lineheight
   \topskip     1\topskip
diff --git a/tex/context/base/meta-pdf.tex b/tex/context/base/meta-pdf.tex
index 6f84e13ba..bddf932ef 100644
--- a/tex/context/base/meta-pdf.tex
+++ b/tex/context/base/meta-pdf.tex
@@ -1923,6 +1923,8 @@
 \def\PDFMPformoffset
   {\ifx\objectoffset\undefined\zeropoint\else\objectoffset\fi}
 
+\chardef\blackoutMPgraphic\plusone % in supp-pdf it's \zerocount
+
 \def\finishMPgraphic
   {\stopMPresources
    \egroup
@@ -1930,6 +1932,7 @@
      {\forgetall
       \hbox
         {\PDFcode{q \MPxscale\space 0 0 \MPyscale\space \MPxoffset\space \MPyoffset\space cm}%
+         \ifcase\blackoutMPgraphic\or\PDFcode{0 g 0 G}\fi
          \lower\MPyshift\box\scratchbox % unscaled shift
          \PDFcode{Q}}}%
    \ht\scratchbox\MPheight
diff --git a/tex/context/base/mult-con.tex b/tex/context/base/mult-con.tex
index 84c956e26..07bbf3994 100644
--- a/tex/context/base/mult-con.tex
+++ b/tex/context/base/mult-con.tex
@@ -524,6 +524,19 @@ subsubsubsubsubsubject: subsubsubsubsubonderwerp                 subsubsubsubsub
                            italian                   romanian
                            french
 
+                 sorttype: sortering                 sorttype
+                           sorttype                  sorttype
+                           sorttype                  sorttype
+                           sorttype
+                 compress: comprimeren               compress
+                           compress                  compress
+                           compress                  compress
+                           compress                  compress
+                           compress
+                 autohang: autohang                  autohang
+                           autohang                  autohang
+                           autohang                  autohang
+                           autohang
                    suffix: suffix                    suffix
                            suffix                    suffix
                            suffix                    suffix
@@ -2427,6 +2440,10 @@ subsubsubsubsubsubject: subsubsubsubsubonderwerp                 subsubsubsubsub
                            smallbodyfont             smallbodyfont
                            piccolofontdelcorpo       smallbodyfont
                            petitepolicecorps
+                    split: splitsen                  split
+                           split                     split
+                           separa                    split
+                           split
                    toggle: toggle                    wissel
                            toggle                    toggle
                            toggle                    toggle
@@ -2535,6 +2552,10 @@ subsubsubsubsubsubject: subsubsubsubsubonderwerp                 subsubsubsubsub
                            mar                       mar
                            mar                       mar
                            mar
+                  marking: markering                 marking
+                           beschriftung              znaceni
+                           marcatura                 marcaje
+                           marquage
                    margin: marge                     margin
                            marginalie                marginalie
                            margine                   margine
diff --git a/tex/context/base/mult-ini.tex b/tex/context/base/mult-ini.tex
index 667a9352e..69ef0a6ac 100644
--- a/tex/context/base/mult-ini.tex
+++ b/tex/context/base/mult-ini.tex
@@ -28,6 +28,11 @@
 %D \NC norwegian  \NC Hans Fredrik Nordhaug \NC yes        \NC no  \NC\NR
 %D \stoptabulate
 
+%D to be translated:
+%D
+%D message   : floatblocks/13
+%D variables : sorttype compress autohang
+
 \writestatus{loading}{Context Multilingual Macros / Initialization}
 
 \unprotect
diff --git a/tex/context/base/mult-sys.tex b/tex/context/base/mult-sys.tex
index 6d3f97138..716c6d6bf 100644
--- a/tex/context/base/mult-sys.tex
+++ b/tex/context/base/mult-sys.tex
@@ -841,7 +841,7 @@
 
 \startmessages  french library: check
   title:  vérification
-      1: missing or ungrouped '=' manquant ou dégroupé après '--' à la ligne --
+      1: manquant ou dégroupé '=' après '--' à la ligne --
       2: -- argument(s) attendu(s) à la ligne --
       3: -- -- remplace une macro, utilisez des MAJUSCULES !
 \stopmessages
diff --git a/tex/context/base/page-flt.tex b/tex/context/base/page-flt.tex
index 1912a0140..a6c39efec 100644
--- a/tex/context/base/page-flt.tex
+++ b/tex/context/base/page-flt.tex
@@ -59,6 +59,7 @@
      10: -- begrensd
      11: geen blok opgegeven
      12: niet gedefinieerd
+     13: er is niets te splitsen
 \stopmessages
 
 \startmessages  english  library: floatblocks
@@ -75,6 +76,7 @@
      10: -- limited
      11: no block given
      12: undefined
+     13: there is nothing to split
 \stopmessages
 
 \startmessages  german  library: floatblocks
@@ -91,6 +93,7 @@
      10: -- begrenzt
      11: kein Block gegeben
      12: undefiniert
+     13: there is nothing to split
 \stopmessages
 
 \startmessages  czech  library: floatblocks
@@ -107,6 +110,7 @@
      10: -- omezeno
      11: nedan zadny blok
      12: nedefinovano
+     13: there is nothing to split
 \stopmessages
 
 \startmessages  italian  library: floatblocks
@@ -123,6 +127,7 @@
      10: -- limitato
      11: nessun oggetto specificato
      12: non definito
+     13: there is nothing to split
 \stopmessages
 
 \startmessages  norwegian  library: floatblocks
@@ -139,6 +144,7 @@
      10: -- begrenset
      11: ingen blokk oppgitt
      12: udefinert
+     13: there is nothing to split
 \stopmessages
 
 \startmessages  romanian  library: floatblocks
@@ -155,6 +161,7 @@
      10: -- limitat
      11: nu este dat nici un bloc
      12: nedefinit
+     13: there is nothing to split
 \stopmessages
 
 \startmessages  french  library: floatblocks
@@ -171,6 +178,7 @@
      10: -- limité
      11: pas de bloc donné
      12: indéfini
+     13: there is nothing to split
 \stopmessages
 
 \def\setupfloats
@@ -196,7 +204,7 @@
 \def\doemptyblock#1%
   {\localframed
      [\??fl#1][\c!frame=\v!on]%
-     {\getmessage\m!floatblocks{12}}}
+     {\getmessage\m!floatblocks{12}\empty}}
 
 % A complication is that we may have to handle a pagebreak
 % first, which in turn may issue a (postponed) float.
@@ -204,6 +212,16 @@
 % we're realy dealing with the float. Some day I'll root out
 % the global settings.
 
+% \def\docomplexplacefloat[#1][#2]% [#3]#4%
+%   {\edef\floattype{#1}%
+%    \doifelsenothing\floattype
+%      {\let\floattype\v!figure}
+%      {\doifundefined{\??fl#1\c!default}{\let\floattype\v!figure}}%
+%    \doifelsenothing{#2}
+%      {\edef\floatlocation{\getvalue{\??fl\floattype\c!default}}}
+%      {\edef\floatlocation{#2}}%
+%    \expanded{\dodocomplexplacefloat[\floattype][\floatlocation]}}
+
 \def\docomplexplacefloat[#1][#2]% [#3]#4%
   {\edef\floattype{#1}%
    \doifelsenothing\floattype
@@ -212,7 +230,12 @@
    \doifelsenothing{#2}
      {\edef\floatlocation{\getvalue{\??fl\floattype\c!default}}}
      {\edef\floatlocation{#2}}%
-   \expanded{\dodocomplexplacefloat[\floattype][\floatlocation]}}
+   \doifinsetelse\v!split{#2}
+     {\expanded{\dodocomplexsplitfloat[\floattype][\floatlocation]}}
+     {\expanded{\dodocomplexplacefloat[\floattype][\floatlocation]}}}
+
+\def\dodocomplexsplitfloat[#1][#2][#3]#4%
+  {\splitfloat{\dodocomplexplacefloat[#1][#2][#3]{#4}}}
 
 \def\flushfloatslist
   {\v!left,\v!right,\v!inner,\v!outer,%
@@ -650,7 +673,7 @@
       \c!distance=\@@kjdistance,
       \c!separator=\@@kjseparator,
       \c!stopper=\@@kjstopper,
-      \c!suffix=\floatcaptionsuffix, % hook
+      \c!suffix=\@@kjsuffix, % hook
       \c!command=\@@kjcommand,
       \c!conversion=\@@kjconversion]%
    \definenumber % \definelabel
@@ -1375,7 +1398,7 @@
         \doifsomething{#2}{\rawreference\s!flt{#2}{{\getvalue{@fl@n@#1}}{\flasciititle}}}%
         \letgvalue{@fl@r@#1}\relax}% nils
      \setgvalue{@fl@t@#1}%
-       {\preparethenumber{\??kj#1}{\getvalue{@fl@n@#1}}\preparednumber
+       {\preparefullnumber{\??kj#1}{\getvalue{@fl@n@#1}}\preparednumber
         \doattributes{\??kj#1}\c!style\c!color
           {\doattributes{\??kj#1}\c!headstyle\c!headcolor
              {\labeltexts{#1}{\preparednumber}}%
@@ -1414,7 +1437,6 @@
    \dostartattributes{\??kj#1}\c!style\c!color\empty
      \ifnofloatnumber
      \else
-%        \hbox{\doattributes{\??kj#1}\c!headstyle\c!headcolor{\strut#2\floatcaptionsuffix\@@kjkjstopper}}%
        \hbox{\doattributes{\??kj#1}\c!headstyle\c!headcolor{\strut#2}}%
        \ifnofloatcaption \else \ifemptyfloatcaption \else
          \ifcase#4\relax
@@ -1820,7 +1842,7 @@
      \edef\@@kjkjminwidth {\getvalue{\??kj#4\c!minwidth}}%   in geval van automatisch
      \edef\@@kjkjdistance {\getvalue{\??kj#4\c!distance}}%
      \edef\@@kjkjalign    {\getvalue{\??kj#4\c!align}}%
-     \def\@@kjkjstopper   {\getvalue{\??kj#4\c!stopper}}%
+      \def\@@kjkjstopper  {\getvalue{\??kj#4\c!stopper}}%
      \edef\@@flfllocation {\getvalue{\??fl#4\c!location}}%
      \ifparfloat
        \@EA\dosetparfloat % {#1}{#2}{#3}{#4}%
@@ -1918,7 +1940,7 @@
 %           \rawreference\s!flt{#2}{{\composedsectionnumber}{\asciititle}}%
 %           \dowritetolist{#3}{\composedsectionnumber}{#6}{#3}}%
 %        \egroup
-%        \preparethenumber{\??kj#1}\composedsectionnumber\preparednumber
+%        \preparefullnumber{\??kj#1}\composedsectionnumber\preparednumber
 %        \dofloat{#4}{\labeltexts{#5}{\preparednumber}}{#6}{#1}%
 %      \fi
 %    \fi
@@ -1961,7 +1983,7 @@
           \rawreference\s!flt{#2}{{\composedsectionnumber}{\asciititle}}%
           \dowritetolist{#3}{\composedsectionnumber}{#6}{#3}}%
        \egroup
-       \preparethenumber{\??kj#1}\composedsectionnumber\preparednumber
+       \preparefullnumber{\??kj#1}\composedsectionnumber\preparednumber
        \dofloat{#4}{\labeltexts{#5}{\preparednumber}}{#6}{#1}%
      \fi
    \fi
@@ -2267,6 +2289,7 @@
    \c!sectionnumber=\@@nrsectionnumber,
    \c!separator=\@@koseparator,
    \c!stopper=\@@kostopper,
+   \c!suffix=\floatcaptionsuffix, % hook
    \c!distance=1em,
    \c!command=,
    \c!conversion=\v!numbers]
diff --git a/tex/context/base/page-ini.tex b/tex/context/base/page-ini.tex
index c29277581..826ecd350 100644
--- a/tex/context/base/page-ini.tex
+++ b/tex/context/base/page-ini.tex
@@ -382,8 +382,8 @@
       6: jeu de souspage -- traité (taille --)
 %      7: calculating logospace
 %      8: calculating backgrounds
-     10: -- and -- don't add up to 1.0
-     11: spacing -- not permitted in gridmode
+     10: -- et -- ne sont pas ajoutés à 1.0
+     11: espacement -- non permis en modegrille
 \stopmessages
 
 \def\m!otr{otr}
@@ -614,7 +614,7 @@
       3: problèmes, désactive l'équilibrage
       4: flottant en partie supérieure pas encore supporté
       5: flottant en partie inférieure pas encore supporté
-      6: -- flottant(s) reporté(s)postponed
+      6: -- flottant(s) reporté(s)
       7: équilibrage abandonné après 100 pas
       8: équilibré en -- pas
       9: vérification des irrégularités
diff --git a/tex/context/base/supp-pdf.tex b/tex/context/base/supp-pdf.tex
index dffe52446..656a8f6fb 100644
--- a/tex/context/base/supp-pdf.tex
+++ b/tex/context/base/supp-pdf.tex
@@ -2150,6 +2150,8 @@
 \def\PDFMPformoffset
   {\ifx\objectoffset\undefined\zeropoint\else\objectoffset\fi}
 
+\chardef\blackoutMPgraphic\zerocount % in ConTeXt \plusone
+
 \def\finishMPgraphic
   {\stopMPresources
    \egroup
@@ -2157,6 +2159,7 @@
      {\forgetall
       \hbox
         {\PDFcode{q \MPxscale\space 0 0 \MPyscale\space \MPxoffset\space \MPyoffset\space cm}%
+         \ifcase\blackoutMPgraphic\or\PDFcode{0 g 0 G}\fi
          \lower\MPyshift\box\scratchbox % unscaled shift
          \PDFcode{Q}}}%
    \ht\scratchbox\MPheight
diff --git a/tex/context/base/syst-gen.tex b/tex/context/base/syst-gen.tex
index a2beceac9..71e156b62 100644
--- a/tex/context/base/syst-gen.tex
+++ b/tex/context/base/syst-gen.tex
@@ -3805,40 +3805,31 @@
 %D Now a whole bunch of variables like \type{\@@xxalfavariable}
 %D and \type{\@@xxbetavariable} is defined.
 
-\def\dosingleargumentwithset#1%
-  {\def\dodosinglewithset[##1]%
-     {\def\dododosinglewithset####1%
-        {#1[####1]}%
-      \processcommalist[##1]\dododosinglewithset}%
-   \dosingleargument\dodosinglewithset}%
+% \def\dosingleargumentwithset#1%
+%   {\def\dodosinglewithset[##1]%
+%      {\def\dododosinglewithset####1{#1[####1]}%
+%       \processcommalist[##1]\dododosinglewithset}%
+%    \dosingleargument\dodosinglewithset}%
 
 \def\dodoublewithset#1#2%
   {\def\dododoublewithset[##1][##2]%
-     {\doifnot{##1}{}
-        {\def\dodododoublewithset####1%
-           {#2[####1][##2]}%
+     {\doifsomething{##1}
+        {\def\dodododoublewithset####1{#2[####1][##2]}%
          \processcommalist[##1]\dodododoublewithset}}%
-   #1\dododoublewithset}%
+   #1\dododoublewithset}
 
-\def\dodoubleemptywithset
-  {\dodoublewithset\dodoubleempty}
-
-\def\dodoubleargumentwithset
-  {\dodoublewithset\dodoubleargument}
+\def\dodoubleemptywithset   {\dodoublewithset\dodoubleempty}
+\def\dodoubleargumentwithset{\dodoublewithset\dodoubleargument}
 
 \def\dotriplewithset#1#2%
   {\def\dodotriplewithset[##1][##2][##3]%
-     {\doifnot{##1}{}
-        {\def\dododotriplewithset####1%
-           {#2[####1][##2][##3]}%
+     {\doifsomething{##1}
+        {\def\dododotriplewithset####1{#2[####1][##2][##3]}%
          \processcommalist[##1]\dododotriplewithset}}%
-   #1\dodotriplewithset}%
-
-\def\dotripleemptywithset%
-  {\dotriplewithset\dotripleempty}
+   #1\dodotriplewithset}
 
-\def\dotripleargumentwithset%
-  {\dotriplewithset\dotripleargument}
+\def\dotripleemptywithset   {\dotriplewithset\dotripleempty}
+\def\dotripleargumentwithset{\dotriplewithset\dotripleargument}
 
 %D \macros
 %D   {strippedcsname}
diff --git a/tex/context/base/type-buy.tex b/tex/context/base/type-buy.tex
index 92b32e0a1..5f10bb95e 100644
--- a/tex/context/base/type-buy.tex
+++ b/tex/context/base/type-buy.tex
@@ -111,16 +111,16 @@
   \definefontsynonym [MathItalic]    [LucidaNewMath-AltDemiItalic]
   \definefontsynonym [MathSymbol]    [LucidaNewMath-Symbol-Demi]
   \definefontsynonym [MathAlpha]     [LucidaNewMath-Arrows-Demi]
-  \definefontsynonym [MathBeta]      [LucidaNewMath-DemiBold]
+  \definefontsynonym [MathBeta]      [LucidaNewMath-Demi]
 \stoptypescript
 
 \starttypescript [bfmath] [lucida] [name]
-  \definefontsynonym [MathRomanBold]     [LucidaNewMath-Demibold]
+  \definefontsynonym [MathRomanBold]     [LucidaNewMath-Demi]
   \definefontsynonym [MathExtensionBold] [LucidaNewMath-Extension]
   \definefontsynonym [MathItalicBold]    [LucidaNewMath-AltDemiItalic]
   \definefontsynonym [MathSymbolBold]    [LucidaNewMath-Symbol-Demi]
   \definefontsynonym [MathAlphaBold]     [LucidaNewMath-Arrows-Demi]
-  \definefontsynonym [MathBetaBold]      [LucidaNewMath-DemiBold] % ??
+  \definefontsynonym [MathBetaBold]      [LucidaNewMath-Demi]
 \stoptypescript
 
 \starttypescript [handwriting] [lucida] [name]
@@ -172,7 +172,7 @@
   \definefontsynonym [LucidaNewMath-AltDemiItalic] [lbmdo]
   \definefontsynonym [LucidaNewMath-Arrows-Demi]   [lbmad]
   \definefontsynonym [LucidaNewMath-Extension]     [lbme]
-  \definefontsynonym [LucidaNewMath-DemiBold]      [lbmd]
+  \definefontsynonym [LucidaNewMath-Demi]          [lbmd]
   \definefontsynonym [LucidaNewMath-DemiItalic]    [lbmdi]
   \definefontsynonym [LucidaNewMath-Symbol-Demi]   [lbmsd]
 \stoptypescript
diff --git a/tex/context/bib/t-bib.tex b/tex/context/bib/t-bib.tex
index 9c77b82a8..3c17a52b7 100644
--- a/tex/context/bib/t-bib.tex
+++ b/tex/context/bib/t-bib.tex
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=t-bib,
-%D        version=2006.08.04,
+%D        version=2006.08.08,
 %D          title=\CONTEXT\ Publication Module,
 %D       subtitle=Publications,
 %D         author=Taco Hoekwater,
@@ -90,6 +90,9 @@
 %D       (4/8/2006)
 %D \item make the bracketed arguments of \type{\artauthor}, \type{\author} 
 %D        and \type{\editor} (bbl commands) optional (4/8/2006)
+%D \item the constants \type{sorttype}, \type{compress} and
+%D        \type{autohang} have moved to the core (8/8/2006)
+%D \item bibtex is now registered as a program to be run by texexec (8/8/2006)
 %D \stopitemize
 %D
 %D \subject{WISHLIST}
@@ -116,7 +119,7 @@
 \startmessages all library: bib
     title: publications
     1: file -- not found, unknown style ignored
-    2: file -- not found, don't forget to run bibtex
+    2: file -- not found, waiting for bibtex
     3: wrote a new auxiliary file \jobname.aux
     4: loading database from --
     5: warning: cite argument -- on \the\inputlineno
@@ -128,9 +131,6 @@
 \startconstants        dutch                english
 
              database: database             database
-             sorttype: sorttype             sorttype
-             compress: compress             compress
-             autohang: autohang             autohang
             artauthor: artauthor            artauthor
                editor: editor               editor
       authoretallimit: authoretallimit      authoretallimit
@@ -312,12 +312,14 @@
 %D \stopitemize
 
 \def\writeauxfile
-  {\openout \scratchwrite \jobname.aux
-   \write   \scratchwrite {\string\citation{*}}%
-   \write   \scratchwrite {\string\bibstyle{\bibstyle}}%
-   \write   \scratchwrite {\string\bibdata{\@@pbdatabase}}%
-   \closeout\scratchwrite
-   \showmessage\m!bib{3}{}}
+  {\doifmode{*first}
+    {\openout \scratchwrite \jobname.aux
+     \write   \scratchwrite {\string\citation{*}}%
+     \write   \scratchwrite {\string\bibstyle{\bibstyle}}%
+     \write   \scratchwrite {\string\bibdata{\@@pbdatabase}}%
+     \closeout\scratchwrite
+     \showmessage\m!bib{3}{}%
+     \installprogram{bibtex \jobname}}}
 
 %D \macros{ifsortbycite,iftypesetall,ifautohang,ifbibcitecompress}
 %D
@@ -1066,7 +1068,7 @@
        }%
        {\def\@@currentalternative{#1}}%
       \expanded{%
-         \processaction[\csname @@pv\@@currentalternative compress\endcsname]}
+         \processaction[\csname @@pv\@@currentalternative \c!compress\endcsname]}
              [    \v!yes=>\bibcitecompresstrue,
                    \v!no=>\bibcitecompressfalse,
               \s!default=>\bibcitecompresstrue,
@@ -1074,7 +1076,7 @@
       \getvalue{bib\@@currentalternative ref}[#2]%
    \else
      \processcommalist[#1]\docitation
-     \expanded{\processaction[\csname @@pv\@@citedefault compress\endcsname]}
+     \expanded{\processaction[\csname @@pv\@@citedefault \c!compress\endcsname]}
        [    \v!yes=>\bibcitecompresstrue,
              \v!no=>\bibcitecompressfalse,
         \s!default=>\bibcitecompresstrue,
diff --git a/tex/context/interface/cont-cz.xml b/tex/context/interface/cont-cz.xml
index c73ccd022..50e15bb31 100644
--- a/tex/context/interface/cont-cz.xml
+++ b/tex/context/interface/cont-cz.xml
@@ -4884,6 +4884,34 @@
   </cd:arguments>
 </cd:command>
 
+<cd:command name="setuplistalternative" file="core-lst.tex">
+  <cd:sequence>
+    <cd:string value="setuplistalternative"/>
+  </cd:sequence>
+  <cd:arguments>
+    <cd:keywords list="no">
+      <cd:constant type="a"/>
+      <cd:constant type="b"/>
+      <cd:constant type="c"/>
+      <!-- cd:constant type="cd:name"/ -->
+    </cd:keywords>
+    <cd:assignments list="yes">
+      <cd:parameter name="prikaz">
+        <cd:constant type="cd:command"/>
+      </cd:parameter>
+      <cd:parameter name="sirka">
+        <cd:constant type="cd:dimension"/>
+      </cd:parameter>
+      <cd:parameter name="natahnout">
+        <cd:constant type="cd:dimension"/>
+      </cd:parameter>
+      <cd:parameter name="vzdalenost">
+        <cd:constant type="cd:dimension"/>
+      </cd:parameter>
+    </cd:assignments>
+  </cd:arguments>
+</cd:command>
+
 <cd:command name="definecombinedlist" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="definujkombinovanyseznam"/>
@@ -6167,6 +6195,10 @@
         <cd:constant type="prvni"/>
         <cd:constant type="zadny"/>
       </cd:parameter>
+      <cd:parameter name="compress">
+        <cd:constant type="ne"/>
+        <cd:constant type="ano"/>
+      </cd:parameter>
       <cd:parameter name="deeptextcommand">
         <cd:constant type="cd:oneargument"/>
       </cd:parameter>
@@ -7229,6 +7261,7 @@
       <cd:constant type="radek"/>
       <cd:constant type="vyska"/>
       <cd:constant type="podlehloubky"/>
+      <cd:constant type="split"/>
     </cd:keywords>
     <cd:reference optional="yes" list="yes"/>
     <cd:content/>
@@ -8616,7 +8649,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="defineinteractionmenu" variant="1" file="core-int.tex">
+<cd:command name="defineinteractionmenu" variant="2" file="core-int.tex">
   <cd:sequence>
     <cd:string value="definujinterakcnimenu"/>
   </cd:sequence>
diff --git a/tex/context/interface/cont-de.xml b/tex/context/interface/cont-de.xml
index d7cf1b21a..21221582c 100644
--- a/tex/context/interface/cont-de.xml
+++ b/tex/context/interface/cont-de.xml
@@ -4884,6 +4884,34 @@
   </cd:arguments>
 </cd:command>
 
+<cd:command name="setuplistalternative" file="core-lst.tex">
+  <cd:sequence>
+    <cd:string value="setuplistalternative"/>
+  </cd:sequence>
+  <cd:arguments>
+    <cd:keywords list="no">
+      <cd:constant type="a"/>
+      <cd:constant type="b"/>
+      <cd:constant type="c"/>
+      <!-- cd:constant type="cd:name"/ -->
+    </cd:keywords>
+    <cd:assignments list="yes">
+      <cd:parameter name="befehl">
+        <cd:constant type="cd:command"/>
+      </cd:parameter>
+      <cd:parameter name="breite">
+        <cd:constant type="cd:dimension"/>
+      </cd:parameter>
+      <cd:parameter name="strecken">
+        <cd:constant type="cd:dimension"/>
+      </cd:parameter>
+      <cd:parameter name="abstand">
+        <cd:constant type="cd:dimension"/>
+      </cd:parameter>
+    </cd:assignments>
+  </cd:arguments>
+</cd:command>
+
 <cd:command name="definecombinedlist" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="definierezusammengestellteliste"/>
@@ -6167,6 +6195,10 @@
         <cd:constant type="erste"/>
         <cd:constant type="kein"/>
       </cd:parameter>
+      <cd:parameter name="compress">
+        <cd:constant type="nein"/>
+        <cd:constant type="ja"/>
+      </cd:parameter>
       <cd:parameter name="deeptextcommand">
         <cd:constant type="cd:oneargument"/>
       </cd:parameter>
@@ -7229,6 +7261,7 @@
       <cd:constant type="zeile"/>
       <cd:constant type="hoehe"/>
       <cd:constant type="tiefe"/>
+      <cd:constant type="split"/>
     </cd:keywords>
     <cd:reference optional="yes" list="yes"/>
     <cd:content/>
@@ -8616,7 +8649,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="defineinteractionmenu" variant="1" file="core-int.tex">
+<cd:command name="defineinteractionmenu" variant="2" file="core-int.tex">
   <cd:sequence>
     <cd:string value="definiereinteraktionsmenue"/>
   </cd:sequence>
diff --git a/tex/context/interface/cont-en.xml b/tex/context/interface/cont-en.xml
index 2efef4f3e..b44992b8f 100644
--- a/tex/context/interface/cont-en.xml
+++ b/tex/context/interface/cont-en.xml
@@ -4884,6 +4884,34 @@
   </cd:arguments>
 </cd:command>
 
+<cd:command name="setuplistalternative" file="core-lst.tex">
+  <cd:sequence>
+    <cd:string value="setuplistalternative"/>
+  </cd:sequence>
+  <cd:arguments>
+    <cd:keywords list="no">
+      <cd:constant type="a"/>
+      <cd:constant type="b"/>
+      <cd:constant type="c"/>
+      <!-- cd:constant type="cd:name"/ -->
+    </cd:keywords>
+    <cd:assignments list="yes">
+      <cd:parameter name="command">
+        <cd:constant type="cd:command"/>
+      </cd:parameter>
+      <cd:parameter name="width">
+        <cd:constant type="cd:dimension"/>
+      </cd:parameter>
+      <cd:parameter name="stretch">
+        <cd:constant type="cd:dimension"/>
+      </cd:parameter>
+      <cd:parameter name="distance">
+        <cd:constant type="cd:dimension"/>
+      </cd:parameter>
+    </cd:assignments>
+  </cd:arguments>
+</cd:command>
+
 <cd:command name="definecombinedlist" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="definecombinedlist"/>
@@ -6167,6 +6195,10 @@
         <cd:constant type="first"/>
         <cd:constant type="none"/>
       </cd:parameter>
+      <cd:parameter name="compress">
+        <cd:constant type="no"/>
+        <cd:constant type="yes"/>
+      </cd:parameter>
       <cd:parameter name="deeptextcommand">
         <cd:constant type="cd:oneargument"/>
       </cd:parameter>
@@ -7229,6 +7261,7 @@
       <cd:constant type="line"/>
       <cd:constant type="height"/>
       <cd:constant type="depth"/>
+      <cd:constant type="split"/>
     </cd:keywords>
     <cd:reference optional="yes" list="yes"/>
     <cd:content/>
@@ -8616,7 +8649,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="defineinteractionmenu" variant="1" file="core-int.tex">
+<cd:command name="defineinteractionmenu" variant="2" file="core-int.tex">
   <cd:sequence>
     <cd:string value="defineinteractionmenu"/>
   </cd:sequence>
diff --git a/tex/context/interface/cont-fr.xml b/tex/context/interface/cont-fr.xml
index a2a87d000..4cacc10a5 100644
--- a/tex/context/interface/cont-fr.xml
+++ b/tex/context/interface/cont-fr.xml
@@ -4884,6 +4884,34 @@
   </cd:arguments>
 </cd:command>
 
+<cd:command name="setuplistalternative" file="core-lst.tex">
+  <cd:sequence>
+    <cd:string value="setuplistalternative"/>
+  </cd:sequence>
+  <cd:arguments>
+    <cd:keywords list="no">
+      <cd:constant type="a"/>
+      <cd:constant type="b"/>
+      <cd:constant type="c"/>
+      <!-- cd:constant type="cd:name"/ -->
+    </cd:keywords>
+    <cd:assignments list="yes">
+      <cd:parameter name="commande">
+        <cd:constant type="cd:command"/>
+      </cd:parameter>
+      <cd:parameter name="largeur">
+        <cd:constant type="cd:dimension"/>
+      </cd:parameter>
+      <cd:parameter name="etire">
+        <cd:constant type="cd:dimension"/>
+      </cd:parameter>
+      <cd:parameter name="distance">
+        <cd:constant type="cd:dimension"/>
+      </cd:parameter>
+    </cd:assignments>
+  </cd:arguments>
+</cd:command>
+
 <cd:command name="definecombinedlist" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="definitlisteimbriquee"/>
@@ -6167,6 +6195,10 @@
         <cd:constant type="premier"/>
         <cd:constant type="rien"/>
       </cd:parameter>
+      <cd:parameter name="compress">
+        <cd:constant type="non"/>
+        <cd:constant type="oui"/>
+      </cd:parameter>
       <cd:parameter name="deeptextcommand">
         <cd:constant type="cd:oneargument"/>
       </cd:parameter>
@@ -7229,6 +7261,7 @@
       <cd:constant type="ligne"/>
       <cd:constant type="hauteur"/>
       <cd:constant type="profondeur"/>
+      <cd:constant type="split"/>
     </cd:keywords>
     <cd:reference optional="yes" list="yes"/>
     <cd:content/>
@@ -8616,7 +8649,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="defineinteractionmenu" variant="1" file="core-int.tex">
+<cd:command name="defineinteractionmenu" variant="2" file="core-int.tex">
   <cd:sequence>
     <cd:string value="definitmenuinteraction"/>
   </cd:sequence>
diff --git a/tex/context/interface/cont-it.xml b/tex/context/interface/cont-it.xml
index c5de370a7..d69165d52 100644
--- a/tex/context/interface/cont-it.xml
+++ b/tex/context/interface/cont-it.xml
@@ -4884,6 +4884,34 @@
   </cd:arguments>
 </cd:command>
 
+<cd:command name="setuplistalternative" file="core-lst.tex">
+  <cd:sequence>
+    <cd:string value="setuplistalternative"/>
+  </cd:sequence>
+  <cd:arguments>
+    <cd:keywords list="no">
+      <cd:constant type="a"/>
+      <cd:constant type="b"/>
+      <cd:constant type="c"/>
+      <!-- cd:constant type="cd:name"/ -->
+    </cd:keywords>
+    <cd:assignments list="yes">
+      <cd:parameter name="comando">
+        <cd:constant type="cd:command"/>
+      </cd:parameter>
+      <cd:parameter name="ampiezza">
+        <cd:constant type="cd:dimension"/>
+      </cd:parameter>
+      <cd:parameter name="dilata">
+        <cd:constant type="cd:dimension"/>
+      </cd:parameter>
+      <cd:parameter name="distanza">
+        <cd:constant type="cd:dimension"/>
+      </cd:parameter>
+    </cd:assignments>
+  </cd:arguments>
+</cd:command>
+
 <cd:command name="definecombinedlist" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="definiscielencocombinato"/>
@@ -6167,6 +6195,10 @@
         <cd:constant type="primo"/>
         <cd:constant type="nessuno"/>
       </cd:parameter>
+      <cd:parameter name="compress">
+        <cd:constant type="no"/>
+        <cd:constant type="si"/>
+      </cd:parameter>
       <cd:parameter name="deeptextcommand">
         <cd:constant type="cd:oneargument"/>
       </cd:parameter>
@@ -7229,6 +7261,7 @@
       <cd:constant type="riga"/>
       <cd:constant type="altezza"/>
       <cd:constant type="profondita"/>
+      <cd:constant type="separa"/>
     </cd:keywords>
     <cd:reference optional="yes" list="yes"/>
     <cd:content/>
@@ -8616,7 +8649,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="defineinteractionmenu" variant="1" file="core-int.tex">
+<cd:command name="defineinteractionmenu" variant="2" file="core-int.tex">
   <cd:sequence>
     <cd:string value="definiscimenuinterazione"/>
   </cd:sequence>
diff --git a/tex/context/interface/cont-nl.xml b/tex/context/interface/cont-nl.xml
index eecb6b7cb..b75ad033b 100644
--- a/tex/context/interface/cont-nl.xml
+++ b/tex/context/interface/cont-nl.xml
@@ -4884,6 +4884,34 @@
   </cd:arguments>
 </cd:command>
 
+<cd:command name="setuplistalternative" file="core-lst.tex">
+  <cd:sequence>
+    <cd:string value="setuplistalternative"/>
+  </cd:sequence>
+  <cd:arguments>
+    <cd:keywords list="no">
+      <cd:constant type="a"/>
+      <cd:constant type="b"/>
+      <cd:constant type="c"/>
+      <!-- cd:constant type="cd:name"/ -->
+    </cd:keywords>
+    <cd:assignments list="yes">
+      <cd:parameter name="commando">
+        <cd:constant type="cd:command"/>
+      </cd:parameter>
+      <cd:parameter name="breedte">
+        <cd:constant type="cd:dimension"/>
+      </cd:parameter>
+      <cd:parameter name="rek">
+        <cd:constant type="cd:dimension"/>
+      </cd:parameter>
+      <cd:parameter name="afstand">
+        <cd:constant type="cd:dimension"/>
+      </cd:parameter>
+    </cd:assignments>
+  </cd:arguments>
+</cd:command>
+
 <cd:command name="definecombinedlist" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="definieersamengesteldelijst"/>
@@ -6167,6 +6195,10 @@
         <cd:constant type="eerste"/>
         <cd:constant type="geen"/>
       </cd:parameter>
+      <cd:parameter name="comprimeren">
+        <cd:constant type="nee"/>
+        <cd:constant type="ja"/>
+      </cd:parameter>
       <cd:parameter name="dieptekstcommando">
         <cd:constant type="cd:oneargument"/>
       </cd:parameter>
@@ -7229,6 +7261,7 @@
       <cd:constant type="regel"/>
       <cd:constant type="hoogte"/>
       <cd:constant type="diepte"/>
+      <cd:constant type="splitsen"/>
     </cd:keywords>
     <cd:reference optional="yes" list="yes"/>
     <cd:content/>
@@ -8616,7 +8649,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="defineinteractionmenu" variant="1" file="core-int.tex">
+<cd:command name="defineinteractionmenu" variant="2" file="core-int.tex">
   <cd:sequence>
     <cd:string value="definieerinteractiemenu"/>
   </cd:sequence>
diff --git a/tex/context/interface/cont-ro.xml b/tex/context/interface/cont-ro.xml
index aa95b9321..9d2eae7fd 100644
--- a/tex/context/interface/cont-ro.xml
+++ b/tex/context/interface/cont-ro.xml
@@ -4884,6 +4884,34 @@
   </cd:arguments>
 </cd:command>
 
+<cd:command name="setuplistalternative" file="core-lst.tex">
+  <cd:sequence>
+    <cd:string value="setuplistalternative"/>
+  </cd:sequence>
+  <cd:arguments>
+    <cd:keywords list="no">
+      <cd:constant type="a"/>
+      <cd:constant type="b"/>
+      <cd:constant type="c"/>
+      <!-- cd:constant type="cd:name"/ -->
+    </cd:keywords>
+    <cd:assignments list="yes">
+      <cd:parameter name="comanda">
+        <cd:constant type="cd:command"/>
+      </cd:parameter>
+      <cd:parameter name="latime">
+        <cd:constant type="cd:dimension"/>
+      </cd:parameter>
+      <cd:parameter name="dilatat">
+        <cd:constant type="cd:dimension"/>
+      </cd:parameter>
+      <cd:parameter name="distanta">
+        <cd:constant type="cd:dimension"/>
+      </cd:parameter>
+    </cd:assignments>
+  </cd:arguments>
+</cd:command>
+
 <cd:command name="definecombinedlist" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="definestelistacombinata"/>
@@ -6167,6 +6195,10 @@
         <cd:constant type="primul"/>
         <cd:constant type="niciunul"/>
       </cd:parameter>
+      <cd:parameter name="compress">
+        <cd:constant type="nu"/>
+        <cd:constant type="da"/>
+      </cd:parameter>
       <cd:parameter name="deeptextcommand">
         <cd:constant type="cd:oneargument"/>
       </cd:parameter>
@@ -7229,6 +7261,7 @@
       <cd:constant type="linie"/>
       <cd:constant type="inaltime"/>
       <cd:constant type="adancime"/>
+      <cd:constant type="split"/>
     </cd:keywords>
     <cd:reference optional="yes" list="yes"/>
     <cd:content/>
@@ -8616,7 +8649,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="defineinteractionmenu" variant="1" file="core-int.tex">
+<cd:command name="defineinteractionmenu" variant="2" file="core-int.tex">
   <cd:sequence>
     <cd:string value="definestemeniuinteractiune"/>
   </cd:sequence>
diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml
index 5c0494c86..8eccb9237 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="2006.08.04 22:23">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2006.08.08 17:52">
 
   <cd:variables>
     <cd:variable name="one" value="jedna"/>
@@ -126,6 +126,9 @@
   </cd:variables>
 
   <cd:constants>
+    <cd:constant name="sorttype" value="sorttype"/>
+    <cd:constant name="compress" value="compress"/>
+    <cd:constant name="autohang" value="autohang"/>
     <cd:constant name="suffix" value="suffix"/>
     <cd:constant name="leftquotation" value="citacevlevo"/>
     <cd:constant name="rightquotation" value="citacevpravo"/>
@@ -599,6 +602,7 @@
     <cd:variable name="smallboldslanted" value="maletucnesklonene"/>
     <cd:variable name="smallbolditalic" value="maletucnekurzivni"/>
     <cd:variable name="smallbodyfont" value="smallbodyfont"/>
+    <cd:variable name="split" value="split"/>
     <cd:variable name="toggle" value="toggle"/>
     <cd:variable name="color" value="barevne"/>
     <cd:variable name="column" value="column"/>
@@ -626,6 +630,7 @@
     <cd:variable name="MONTH" value="MESIC"/>
     <cd:variable name="month" value="mesic"/>
     <cd:variable name="mar" value="mar"/>
+    <cd:variable name="marking" value="znaceni"/>
     <cd:variable name="margin" value="marginalie"/>
     <cd:variable name="max" value="max"/>
     <cd:variable name="min" value="min"/>
diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml
index 81918a0c5..cd5864fa0 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="2006.08.04 22:23">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2006.08.08 17:52">
 
   <cd:variables>
     <cd:variable name="one" value="eins"/>
@@ -126,6 +126,9 @@
   </cd:variables>
 
   <cd:constants>
+    <cd:constant name="sorttype" value="sorttype"/>
+    <cd:constant name="compress" value="compress"/>
+    <cd:constant name="autohang" value="autohang"/>
     <cd:constant name="suffix" value="suffix"/>
     <cd:constant name="leftquotation" value="linkerzitat"/>
     <cd:constant name="rightquotation" value="rechterzitat"/>
@@ -599,6 +602,7 @@
     <cd:variable name="smallboldslanted" value="kleinfettgeneigt"/>
     <cd:variable name="smallbolditalic" value="kleinfettitalic"/>
     <cd:variable name="smallbodyfont" value="smallbodyfont"/>
+    <cd:variable name="split" value="split"/>
     <cd:variable name="toggle" value="toggle"/>
     <cd:variable name="color" value="farbe"/>
     <cd:variable name="column" value="column"/>
@@ -626,6 +630,7 @@
     <cd:variable name="MONTH" value="MONAT"/>
     <cd:variable name="month" value="monat"/>
     <cd:variable name="mar" value="mar"/>
+    <cd:variable name="marking" value="beschriftung"/>
     <cd:variable name="margin" value="marginalie"/>
     <cd:variable name="max" value="max"/>
     <cd:variable name="min" value="min"/>
diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml
index 0a3e62666..048b40878 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="2006.08.04 22:23">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2006.08.08 17:52">
 
   <cd:variables>
     <cd:variable name="one" value="one"/>
@@ -126,6 +126,9 @@
   </cd:variables>
 
   <cd:constants>
+    <cd:constant name="sorttype" value="sorttype"/>
+    <cd:constant name="compress" value="compress"/>
+    <cd:constant name="autohang" value="autohang"/>
     <cd:constant name="suffix" value="suffix"/>
     <cd:constant name="leftquotation" value="leftquotation"/>
     <cd:constant name="rightquotation" value="rightquotation"/>
@@ -599,6 +602,7 @@
     <cd:variable name="smallboldslanted" value="smallboldslanted"/>
     <cd:variable name="smallbolditalic" value="smallbolditalic"/>
     <cd:variable name="smallbodyfont" value="smallbodyfont"/>
+    <cd:variable name="split" value="split"/>
     <cd:variable name="toggle" value="wissel"/>
     <cd:variable name="color" value="color"/>
     <cd:variable name="column" value="column"/>
@@ -626,6 +630,7 @@
     <cd:variable name="MONTH" value="MONTH"/>
     <cd:variable name="month" value="month"/>
     <cd:variable name="mar" value="mar"/>
+    <cd:variable name="marking" value="marking"/>
     <cd:variable name="margin" value="margin"/>
     <cd:variable name="max" value="max"/>
     <cd:variable name="min" value="min"/>
diff --git a/tex/context/interface/keys-fr.xml b/tex/context/interface/keys-fr.xml
index 159e82b91..2dec1b0ff 100644
--- a/tex/context/interface/keys-fr.xml
+++ b/tex/context/interface/keys-fr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="fr" version="2006.08.04 22:23">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="fr" version="2006.08.08 17:52">
 
   <cd:variables>
     <cd:variable name="one" value="un"/>
@@ -126,6 +126,9 @@
   </cd:variables>
 
   <cd:constants>
+    <cd:constant name="sorttype" value="sorttype"/>
+    <cd:constant name="compress" value="compress"/>
+    <cd:constant name="autohang" value="autohang"/>
     <cd:constant name="suffix" value="suffix"/>
     <cd:constant name="leftquotation" value="citationgauche"/>
     <cd:constant name="rightquotation" value="citationdroite"/>
@@ -599,6 +602,7 @@
     <cd:variable name="smallboldslanted" value="inclinegraspetit"/>
     <cd:variable name="smallbolditalic" value="italiquegraspetit"/>
     <cd:variable name="smallbodyfont" value="petitepolicecorps"/>
+    <cd:variable name="split" value="split"/>
     <cd:variable name="toggle" value="toggle"/>
     <cd:variable name="color" value="couleur"/>
     <cd:variable name="column" value="colonne"/>
@@ -626,6 +630,7 @@
     <cd:variable name="MONTH" value="MOIS"/>
     <cd:variable name="month" value="mois"/>
     <cd:variable name="mar" value="mar"/>
+    <cd:variable name="marking" value="marquage"/>
     <cd:variable name="margin" value="marge"/>
     <cd:variable name="max" value="max"/>
     <cd:variable name="min" value="min"/>
diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml
index fcfb6128a..9cdd2bd45 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="2006.08.04 22:23">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2006.08.08 17:52">
 
   <cd:variables>
     <cd:variable name="one" value="uno"/>
@@ -126,6 +126,9 @@
   </cd:variables>
 
   <cd:constants>
+    <cd:constant name="sorttype" value="sorttype"/>
+    <cd:constant name="compress" value="compress"/>
+    <cd:constant name="autohang" value="autohang"/>
     <cd:constant name="suffix" value="suffix"/>
     <cd:constant name="leftquotation" value="citazionesinistra"/>
     <cd:constant name="rightquotation" value="citazionedestra"/>
@@ -599,6 +602,7 @@
     <cd:variable name="smallboldslanted" value="piccolograssettoinclinato"/>
     <cd:variable name="smallbolditalic" value="piccolograssettocorsivo"/>
     <cd:variable name="smallbodyfont" value="piccolofontdelcorpo"/>
+    <cd:variable name="split" value="separa"/>
     <cd:variable name="toggle" value="toggle"/>
     <cd:variable name="color" value="colore"/>
     <cd:variable name="column" value="colonna"/>
@@ -626,6 +630,7 @@
     <cd:variable name="MONTH" value="MESE"/>
     <cd:variable name="month" value="mese"/>
     <cd:variable name="mar" value="mar"/>
+    <cd:variable name="marking" value="marcatura"/>
     <cd:variable name="margin" value="margine"/>
     <cd:variable name="max" value="max"/>
     <cd:variable name="min" value="min"/>
diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml
index baa3013bf..f18ed75d5 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="2006.08.04 22:23">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2006.08.08 17:52">
 
   <cd:variables>
     <cd:variable name="one" value="een"/>
@@ -126,6 +126,9 @@
   </cd:variables>
 
   <cd:constants>
+    <cd:constant name="sorttype" value="sortering"/>
+    <cd:constant name="compress" value="comprimeren"/>
+    <cd:constant name="autohang" value="autohang"/>
     <cd:constant name="suffix" value="suffix"/>
     <cd:constant name="leftquotation" value="linkercitaat"/>
     <cd:constant name="rightquotation" value="rechtercitaat"/>
@@ -599,6 +602,7 @@
     <cd:variable name="smallboldslanted" value="kleinvetschuin"/>
     <cd:variable name="smallbolditalic" value="kleinvetitalic"/>
     <cd:variable name="smallbodyfont" value="kleinkorps"/>
+    <cd:variable name="split" value="splitsen"/>
     <cd:variable name="toggle" value="toggle"/>
     <cd:variable name="color" value="kleur"/>
     <cd:variable name="column" value="kolom"/>
@@ -626,6 +630,7 @@
     <cd:variable name="MONTH" value="MAAND"/>
     <cd:variable name="month" value="maand"/>
     <cd:variable name="mar" value="mar"/>
+    <cd:variable name="marking" value="markering"/>
     <cd:variable name="margin" value="marge"/>
     <cd:variable name="max" value="max"/>
     <cd:variable name="min" value="min"/>
diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml
index 00797e5e1..5d00eed07 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="2006.08.04 22:23">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2006.08.08 17:52">
 
   <cd:variables>
     <cd:variable name="one" value="unu"/>
@@ -126,6 +126,9 @@
   </cd:variables>
 
   <cd:constants>
+    <cd:constant name="sorttype" value="sorttype"/>
+    <cd:constant name="compress" value="compress"/>
+    <cd:constant name="autohang" value="autohang"/>
     <cd:constant name="suffix" value="suffix"/>
     <cd:constant name="leftquotation" value="citatstanga"/>
     <cd:constant name="rightquotation" value="citatdreapta"/>
@@ -599,6 +602,7 @@
     <cd:variable name="smallboldslanted" value="micaldininclinat"/>
     <cd:variable name="smallbolditalic" value="micaldininclinat"/>
     <cd:variable name="smallbodyfont" value="smallbodyfont"/>
+    <cd:variable name="split" value="split"/>
     <cd:variable name="toggle" value="toggle"/>
     <cd:variable name="color" value="culoare"/>
     <cd:variable name="column" value="coloana"/>
@@ -626,6 +630,7 @@
     <cd:variable name="MONTH" value="LUNA"/>
     <cd:variable name="month" value="luna"/>
     <cd:variable name="mar" value="mar"/>
+    <cd:variable name="marking" value="marcaje"/>
     <cd:variable name="margin" value="margine"/>
     <cd:variable name="max" value="max"/>
     <cd:variable name="min" value="min"/>