X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fmaster-project%2Freport.git;a=blobdiff_plain;f=Utils%2FLambda.tex;h=6ad1fbbd9996524c46c12d931c202dbcbe26972f;hp=1702355a03762dbf7190df03f686fccdc81fe6af;hb=ffd46307f9efcf5b103e76dcc1a13d5fe0fe372a;hpb=d9438a9422e40fc6e88bc69f6b3cc6e41ccb85cc;ds=sidebyside

diff --git a/Utils/Lambda.tex b/Utils/Lambda.tex
index 1702355..6ad1fbb 100644
--- a/Utils/Lambda.tex
+++ b/Utils/Lambda.tex
@@ -8,10 +8,10 @@ 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 a; 
+draw b; 
 \stopuseMPgraphic
 
 % Draw a line with the given options. Accepts only the 'width' option. Be
@@ -22,12 +22,31 @@ draw a;
   {\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; 
@@ -36,11 +55,7 @@ draw b;
 \defineoverlay[box][\useMPgraphic{box}]
 
 % Define \{start,stop}boxed with a nice metapost box around it.
-\defineframedtext[boxed][background=box,frame=off]
-% A boxed variant with the width forced to page width. This is used in
-% \startrans, since the content somehow doesn't scale the box around it
-% properly.
-\defineframedtext[wideboxed][background=box,frame=off,width=\textwidth,offset=.02\textwidth]
+\defineframedtext[boxed][width=fit,background=box,frame=off]
 
 % Install the lambda calculus pretty-printer, as defined in pret-lam.lua.
 \installprettytype [LAM] [LAM]
@@ -53,7 +68,7 @@ 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=\startwideboxed,after=\stopwideboxed]
+\definetyping[trans][option=TRANS,style=normal,before=\startboxed,after=\stopboxed]
 
 % Install the haskell pretty-printer, as defined in pret-haskell.lua.
 \installprettytype [HASKELL] [HASKELL]
@@ -61,3 +76,30 @@ draw b;
 \definetyping[haskell][option=HASKELL,before=\startboxed,after=\stopboxed]
 % Define \hs
 \definetype[hs][option=HASKELL,style=mono]
+
+% Type the given buffer with the lambda typing style.
+% e.g., \typebufferlam{buffname}
+\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=]
+  \startboxed
+  \typebuffer[#1]
+  \stopboxed
+  % Reset the typing options
+  \setuptyping[option=none,style=\tttf]
+}
+
+% Display a useMPgraphic in a pretty box
+\define[1]\boxedgraphic{
+  \startboxed
+  \useMPgraphic{#1}
+  \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]