\stopboxed
}
-% Define a "definition" float. We would like some more backgroundoffset, but
-% this offset doesn't move the caption, causing the border to cross the
-% caption... Also, centering the content didn't seem to work...
-% TODO: Make more pretty.
-\definefloat[definition][definitions]
-\setupfloat[definition][background=box,backgroundoffset=1mm]
-
% Define an "example" float. Don't add box around it, since an example will
% commonly contain two boxed items (Before / after, code / picture).
\definefloat[example][examples]
\setupcaption[example][location=top] % Put captions on top
+% Define a definition float that shares its numbering and setting with
+% examples.
+\definefloat[definition][definitions][example]
+% Make sure the label really says definition instead of example, this
+% seems to be a bug in ConTeXt (\redodefinefloat in strc-flt.mkiv has
+% \presetlabeltext[#1=\Word{#3}~]% which should reference #1 instead of
+% #3).
+\setuplabeltext[en][definition=Definition]
% Margin magic taken from
% http://www.pragma-ade.com/general/manuals/details.pdf By setting negative
% both left and right margin distance, because we don't know what will be the
% outer margin (and it will probably only use the distance of the margin it's
% actually aligning against).
-% We also set an offset, to prevent protruding text (overfull hboxes) from
-% jamming into the intermezzo. Also, some extra space is easier on the eye
-% (However, the intermezzo is moved to the right by this offset, instead of
-% moving the text to left. We can't increase the offset by much...)
-\setupfloat[intermezzo][offset=.3cm,leftmargindistance=-\leftmarginwidth, rightmargindistance=-\rightmarginwidth, default={outer}]
-\setupcaption[intermezzo][location=top,number=no] % Put captions on top
-
+% The default= option corresponds to the first option to \placefloat.
+% outer puts it in the outer margin, none means no caption, high means
+% no spacing at the top (placing it high wrt the text) and low means no
+% spacing at the bottom.
+\setupfloat[intermezzo][leftmargindistance=-\leftmarginwidth, rightmargindistance=-\rightmarginwidth, default={outer,none,low,high}]
+
+% Let floats float next to titles, instead of inserting whitespace so a
+% section head comes after a float.
\setupheads[aligntitle=float]
% A variant of \startquotation that puts a citation directly after the