Put spaces in example and definition labels.

[matthijs/master-project/report.git] / Report.tex

diff --git a/Report.tex b/Report.tex
index 3b7a80904dec41a23a4c07ecdfe5f090bfe939e7..1559f4134311e50b47c3cf66d24f5a1ac8d430c4 100644 (file)
--- a/Report.tex
+++ b/Report.tex
@@ -1,6 +1,8 @@
 \mainlanguage [en]
 \setuppapersize[A4][A4]
-\setuppagenumbering[alternative=doublesided]
+% Setup doublesided layout and hide the page number (we will put in the
+% footer)
+\setuppagenumbering[alternative=doublesided,location=]
 % Enable interaction (clickable links), but don't use special link colors or a
 % bold style.
 \setupinteraction[state=start,color=,contrastcolor=,style=normal]
@@ -21,8 +23,21 @@
 
 \usetypescript [Custom]
 
-% Use our custom typeface
+% Use our custom typeface in the body text, header, footer and
+% footnotes. There is probably a more elegant way to change the header
+% etc. fonts, but this works...
 \switchtotypeface [Custom] [10pt]
+\setupheader[style={\switchtotypeface[Custom][12pt]}]
+\setupfooter[style={\switchtotypeface[Custom][12pt]}]
+\setupfootnotes[style={\switchtotypeface[Custom][10pt]\italic},way=bypage]
+
+% Hide header texts and use the header space for text.
+\setuphead[chapter][header=high]
+
+% Insert completely empty pages to put new chapter headers on the right
+% page (i.e., not headers and footers).
+\definepagebreak[emptyright][yes,header,footer,right]
+\setuphead[chapter][page=emptyright]
 
 % Reducing margins (or actually, the spacing in which the margins end up) for
 % 2-up printing and increase font size slightly.
@@ -30,17 +45,30 @@
 %\switchtotypeface [Custom] [10pt]
 
 \starttext
-% TODO: Proper title page
-\title {Haskell as a higher order structural hardware description language.}
-Matthijs Kooijman
-
-\todo{Complete titlepage}
+\startfrontmatter
+\input Titlepage
 
 \completecontent
-\startfrontmatter
+
+% Force a page break so the headers will not apply to the last page of
+% the contents. This page break would otherwise be inserted by the
+% upcoming \chapter.
+\page[emptyright]
+% Set up a simple header and footer for the introduction
+\setupheadertexts[{\getmarking[chapter]}]
+\setupfootertexts[pagenumber]
+
 \input Chapters/Introduction
+% The stopfrontmatter inserts a non-empty right page, it seems
+\page[emptyright]
 \stopfrontmatter
 \startbodymatter
+% Set up a fancy header and footer for the normal chapters. We need to
+% repeat the footer since we switched matters.
+\def\Header{\getmarking[sectionnumber]~—~\getmarking[chapter]~—~\getmarking[section]}
+\setupheadertexts[][\Header]
+\setupfootertexts[pagenumber]
+
 \input Chapters/Context
 \input Chapters/HardwareDescription
 \input Chapters/Prototype
@@ -49,8 +77,9 @@ Matthijs Kooijman
 \input Chapters/Conclusions
 \stopbodymatter
 \startbackmatter
-\todo{The references are not numbered in this list?}
 \completepublications
+% The stopbackmatter inserts a non-empty right page, it seems
+\page[emptyright]
 \stopbackmatter
 \stoptext