X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fmaster-project%2Freport.git;a=blobdiff_plain;f=Utils%2FLambda.tex;h=f88dfb435c3134b24ae0f94a47c846ebdfbdfc80;hp=12aea733b3a8b8c61a04ecb24a089c7d62d38bfd;hb=0ab64c5ce2ab968001c96475b310cf6f020bd475;hpb=42a5dbd086e55750ef22c8c989f2a7ec474815c5

diff --git a/Utils/Lambda.tex b/Utils/Lambda.tex
index 12aea73..f88dfb4 100644
--- a/Utils/Lambda.tex
+++ b/Utils/Lambda.tex
@@ -84,12 +84,12 @@ draw b;
 \define[1]\typebufferlam{
   % We can't use \startlambda here defined by definetyping[lambda] above when
   % typing buffers, so instead we'll redfine the options here.
-  \setuptyping[option=LAM,style=sans,before=,after=]
+  \setuptyping[option=LAM,style=sans,before=,after=,strip=auto]
   \startboxed
   \typebuffer[#1]
   \stopboxed
   % Reset the typing options
-  \setuptyping[option=none,style=\tttf]
+  \setuptyping[option=none,style=\tttf,strip=auto]
 }
 
 % Type the given buffer with the haskell typing style.
@@ -97,12 +97,12 @@ draw b;
 \define[1]\typebufferhs{
   % We can't use \startlambda here defined by definetyping[lambda] above when
   % typing buffers, so instead we'll redfine the options here.
-  \setuptyping[option=HASKELL,style=mono]
+  \setuptyping[option=HASKELL,style=mono,strip=auto]
   \startboxed
   \typebuffer[#1]
   \stopboxed
   % Reset the typing options
-  \setuptyping[option=none,style=\tttf]
+  \setuptyping[option=none,style=\tttf,strip=auto]
 }
 
 % Display a useMPgraphic in a pretty box
@@ -123,3 +123,32 @@ draw b;
 % commonly contain two boxed items (Before / after, code / picture).
 \definefloat[example][examples]
 \setupcaption[example][location=top] % Put captions on top
+
+% 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: