X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fmaster-project%2Freport.git;a=blobdiff_plain;f=Utils%2FLambda.tex;h=319b4249697ca79ab4ebad3f806f44f4be00bf05;hp=6ad1fbbd9996524c46c12d931c202dbcbe26972f;hb=b2047c9f1622d62aecc6708dd19c38b14810f275;hpb=8efa6369ca89d10a176f8aa5e10bc257ec3a80b7

diff --git a/Utils/Lambda.tex b/Utils/Lambda.tex
index 6ad1fbb..319b424 100644
--- a/Utils/Lambda.tex
+++ b/Utils/Lambda.tex
@@ -60,7 +60,9 @@ draw b;
 % Install the lambda calculus pretty-printer, as defined in pret-lam.lua.
 \installprettytype [LAM] [LAM]
 % Define \startlambda \stoplambda
-\definetyping[lambda][option=LAM,style=sans,before=\startboxed,after=\stopboxed]
+\definetyping[lambda][option=LAM,style=sans,before=\startboxed,after=\stopboxed,strip=auto]
+% Define \startunboxedlambda \stopunboxedlambda
+\definetyping[unboxedlambda][option=LAM,style=sans,strip=auto]
 
 % Define \lam{} (since \lambda is taken)
 \definetype[lam][option=LAM,style=sans]
@@ -68,12 +70,12 @@ draw b;
 % Install the transformation pretty-printer, as defined in pret-trans.lua.
 \installprettytype [TRANS] [TRANS]
 % Define \starttrans \stoptrans
-\definetyping[trans][option=TRANS,style=normal,before=\startboxed,after=\stopboxed]
+\definetyping[trans][option=TRANS,style=normal,before=\startboxed,after=\stopboxed,strip=auto]
 
 % Install the haskell pretty-printer, as defined in pret-haskell.lua.
 \installprettytype [HASKELL] [HASKELL]
 % Define \starthaskell \stophaskell
-\definetyping[haskell][option=HASKELL,before=\startboxed,after=\stopboxed]
+\definetyping[haskell][option=HASKELL,before=\startboxed,after=\stopboxed,strip=auto]
 % Define \hs
 \definetype[hs][option=HASKELL,style=mono]
 
@@ -82,12 +84,25 @@ 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.
+% e.g., \typebufferhs{buffname}
+\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,strip=auto]
+  \startboxed
+  \typebuffer[#1]
+  \stopboxed
+  % Reset the typing options
+  \setuptyping[option=none,style=\tttf,strip=auto]
 }
 
 % Display a useMPgraphic in a pretty box
@@ -103,3 +118,24 @@ draw b;
 % 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
+
+% 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: