Improve conclusions.

[matthijs/master-project/report.git] / Utils / Lambda.tex

diff --git a/Utils/Lambda.tex b/Utils/Lambda.tex
index 12aea733b3a8b8c61a04ecb24a089c7d62d38bfd..319b4249697ca79ab4ebad3f806f44f4be00bf05 100644 (file)
--- 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,19 @@ 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]
+% vim: set sw=2 sts=2 expandtab: