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

diff --git a/Utils/Lambda.tex b/Utils/Lambda.tex
index 2172bbc..f88dfb4 100644
--- a/Utils/Lambda.tex
+++ b/Utils/Lambda.tex
@@ -8,7 +8,7 @@ path a, b;
 % Create a rectangle of the full size
 a := origin -- (\MPvar{width}, 0mm);
 % Randomize it a bit
-b := a randomized (\overlaywidth / 25) ;
+b := a randomized (\overlaywidth / 50) ;
 % And draw it
 drawoptions (withpen pencircle scaled .75mm withcolor black) ;
 draw b; 
@@ -22,12 +22,31 @@ draw b;
   {\setupMPvariables[HLine][#1]%
   \useMPgraphic{HLine}}
 
+\startuseMPgraphic{HDLine}
+path a, b;
+% Create a rectangle of the full size
+a := origin -- (\MPvar{width}, 0mm);
+% Randomize it a bit
+b := a randomized (\overlaywidth / 100) ;
+% And draw it
+drawoptions (withpen pencircle scaled .75mm withcolor black dashed evenly) ;
+draw b; 
+\stopuseMPgraphic
+
+% Draw a line with the given options. Accepts only the 'width' option. Be
+% careful that these are metapost options, so use \the\textwidth instead of
+% textwidth, and a metapost expression for arithmethic (e.g. 0.5 *
+% \the\textwidth instead of 0.5\textwidth).
+\def\HDLine[#1]%
+  {\setupMPvariables[HDLine][#1]%
+  \useMPgraphic{HDLine}}
+
 \startuseMPgraphic{box}
 path a, b;
 % Create a rectangle of the full size
 a := unitsquare xyscaled(\overlaywidth,\overlayheight);
 % Randomize it a bit
-b := a randomized (\overlaywidth / 25) ;
+b := a randomized (min(\overlayheight, \overlaywidth) / 25) ;
 % And draw it
 drawoptions (withpen pencircle scaled .75mm withcolor black) ;
 draw b; 
@@ -41,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]
@@ -49,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]
 
@@ -63,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
@@ -78,3 +112,43 @@ 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
+
+% 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: