X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fmaster-project%2Freport.git;a=blobdiff_plain;f=Utils%2FLambda.tex;h=ed3cc6f94302e19283c3bc38b300881af1050e76;hp=4aee4faf3a6511baf623eeec61914635b2781206;hb=811d9423a23aa352d7d91573c76283246faab938;hpb=6b68363b9290e9af6cc711b7620f33195f8431a0

diff --git a/Utils/Lambda.tex b/Utils/Lambda.tex
index 4aee4fa..ed3cc6f 100644
--- a/Utils/Lambda.tex
+++ b/Utils/Lambda.tex
@@ -59,8 +59,10 @@ 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,strip=auto]
+% Define \startlambda \stoplambda. Suppress page breaks directly before
+% such a box (\page[no] only works directly after a paragraph break, so
+% insert one).
+\definetyping[lambda][option=LAM,style=sans,before={\par\page[no]\startboxed},after={\stopboxed},strip=auto]
 % Define \startunboxedlambda \stopunboxedlambda
 \definetyping[unboxedlambda][option=LAM,style=sans,strip=auto]
 
@@ -70,15 +72,18 @@ 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,strip=auto]
+\definetyping[trans][option=TRANS,style=normal,before={\par\page[no]\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,strip=auto]
+\definetyping[haskell][option=HASKELL,before={\par\page[no]\startboxed},after={\stopboxed},strip=auto]
 % Define \hs
 \definetype[hs][option=HASKELL,style=mono]
 
+% Define \startvhdl \stopvhdl
+\definetyping[vhdl][numbering=line,before={\startboxed},after={\stopboxed}]
+
 % Type the given buffer with the lambda typing style.
 % e.g., \typebufferlam{buffname}
 \define[1]\typebufferlam{
@@ -105,6 +110,19 @@ draw b;
   \setuptyping[option=none,style=\tttf,strip=auto]
 }
 
+% Type the given buffer with the vhdl typing style.
+% e.g., \typebuffervhdl{buffname}
+\define[1]\typebuffervhdl{
+  % We can't use \startvhdl here defined by definetyping[vhdl] above when
+  % typing buffers, so instead we'll redefine the options here.
+  \setuptyping[style=mono,strip=auto,numbering=line]
+  \startboxed
+  \typebuffer[#1]
+  \stopboxed
+  % Reset the typing options
+  \setuptyping[option=none,style=\tttf,strip=auto]
+}
+
 % Display a useMPgraphic in a pretty box
 \define[1]\boxedgraphic{
   \startboxed
@@ -112,18 +130,22 @@ draw b;
   \stopboxed
 }
 
+\setupcaption[figure][location=top] % Put captions on top
 % 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]
+% Make an example use the same numbering as a figure.
+\definefloat[example][examples][figure]
 \setupcaption[example][location=top] % Put captions on top
 % Define a definition float that shares its numbering and setting with
 % examples.
-\definefloat[definition][definitions][example]
-% Make sure the label really says definition instead of example, this
-% seems to be a bug in ConTeXt (\redodefinefloat in strc-flt.mkiv has
-% \presetlabeltext[#1=\Word{#3}~]% which should reference #1 instead of
-% #3).
-\setuplabeltext[en][definition=Definition]
+\definefloat[definition][definitions][figure]
+\setupcaption[example][location=top] % Put captions on top
+% Make sure the labels really say Definition and Example instead of
+% Figure. This seems to be a bug in ConTeXt (\redodefinefloat in
+% strc-flt.mkiv has \presetlabeltext[#1=\Word{#3}~]% which should
+% reference #1 instead of #3).
+\setuplabeltext[en][definition=Definition~]
+\setuplabeltext[en][example=Example~]
 
 % Margin magic taken from
 % http://www.pragma-ade.com/general/manuals/details.pdf By setting negative
@@ -131,13 +153,14 @@ draw b;
 % 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
-
+% The default= option corresponds to the first option to \placefloat.
+% outer puts it in the outer margin, none means no caption, high means
+% no spacing at the top (placing it high wrt the text) and low means no
+% spacing at the bottom.
+\setupfloat[intermezzo][leftmargindistance=-\leftmarginwidth, rightmargindistance=-\rightmarginwidth, default={outer,none,low,high}]
+
+% Let floats float next to titles, instead of inserting whitespace so a
+% section head comes after a float.
 \setupheads[aligntitle=float]
 
 % A variant of \startquotation that puts a citation directly after the