Say University of Twente instead Twente University.

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

diff --git a/Utils/Lambda.tex b/Utils/Lambda.tex
index 2b790d040ed187eb1defcf6c5e096e615288ed05..ed3cc6f94302e19283c3bc38b300881af1050e76 100644 (file)
--- 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]
 
 % 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]
 
 % Define \startunboxedlambda \stopunboxedlambda
 \definetyping[unboxedlambda][option=LAM,style=sans,strip=auto]
 


@@ -70,12 +72,12 @@ draw b;
 % Install the transformation pretty-printer, as defined in pret-trans.lua.
 \installprettytype [TRANS] [TRANS]
 % Define \starttrans \stoptrans
 % 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
 
 % 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 \hs
 \definetype[hs][option=HASKELL,style=mono]
 


@@ -142,8 +144,8 @@ draw b;
 % 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).
 % 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]
+\setuplabeltext[en][definition=Definition~]
+\setuplabeltext[en][example=Example~]

 
 % Margin magic taken from
 % http://www.pragma-ade.com/general/manuals/details.pdf By setting negative
 
 % Margin magic taken from
 % http://www.pragma-ade.com/general/manuals/details.pdf By setting negative