X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fmaster-project%2Freport.git;a=blobdiff_plain;f=Utils%2FLambda.tex;h=4aee4faf3a6511baf623eeec61914635b2781206;hp=41977e0175f0c52902dd4aec7b4c376d40659e4b;hb=6b68363b9290e9af6cc711b7620f33195f8431a0;hpb=f60e17f818e16c9c2dd91dbbf2ecc25b802326cf

diff --git a/Utils/Lambda.tex b/Utils/Lambda.tex
index 41977e0..4aee4fa 100644
--- a/Utils/Lambda.tex
+++ b/Utils/Lambda.tex
@@ -112,14 +112,44 @@ draw b;
   \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
+% margin distances, we put our float inside the outer margin. I think we set
+% 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
+
+\setupheads[aligntitle=float]
+
+% A variant of \startquotation that puts a citation directly after the
+% quote.
+\long\def\startcitedquotation[#1]#2\stopcitedquotation
+    {\bgroup \par
+     \startnarrower
+       \symbol[leftquotation]%
+       #2\removeunwantedspaces
+       \symbol[rightquotation]%
+       \mbox{ }\cite[#1]
+     \stopnarrower
+     \par \egroup}
+
+% vim: set sw=2 sts=2 expandtab: