X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=thesis.pre;h=896e0c55b34973bce36d90a973777f93f22bb306;hb=d118ff9d857683084065145df45135ef6fa06711;hp=9c362f9407f648a2c4ce2c4796e06119e7bafbca;hpb=8c6f463e3da3f3a2469b44f17705d633c988fee6;p=msc-thesis1617.git

diff --git a/thesis.pre b/thesis.pre
index 9c362f9..896e0c5 100644
--- a/thesis.pre
+++ b/thesis.pre
@@ -13,10 +13,12 @@
 \usepackage{lipsum}                  % dummy text
 \usepackage{listings}                % source code
 \usepackage{float}                   % floating images
+\usepackage{lmodern}                 % Better teletype fonts
+\usepackage{textcomp}                % Nice listings quotes
 
 \graphicspath{{img/}}
 
-\urlstyle{same}
+\urlstyle{tt}
 \hypersetup{%
 	pdftitle={iTasks and the Internet of Things},
 	pdfauthor={Mart Lubbers},
@@ -29,6 +31,7 @@
 
 \pdfstringdefDisableCommands{%
 	\def\acrlong#1{}%
+	\def\acrlongpl#1{}%
 	\def\acrshort#1{}%
 	\def\acrfull#1{}%
 	\def\gls#1{}%
@@ -40,7 +43,7 @@
 \lstdefinelanguage{Clean}{%
 	alsoletter={ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_`1234567890},
 	alsoletter={~!@\#$\%^\&*-+=?<>:|\\.},
-	morekeywords={generic,implementation,definition,dynamic,module,import,from,where,in,of,case,let,infix,infixr,infixl,class,instance,with,if,derive},
+	morekeywords={generic,implementation,definition,dynamic,module,import,from,where,in,of,case,let,infix,infixr,infixl,class,instance,with,if,derive,::},
 	sensitive=true,
 	morecomment=[l]{//},
 	morecomment=[n]{/*}{*/},
@@ -50,56 +53,57 @@
 	basewidth=0.45em,
 	columns=[c]fixed,
 	texcl=true,
+	upquote=true,
 	literate=%
 		% Basic Clean constructs
 		{\\}{{$\lambda\:$}}1
 		{A.}{{$\forall\;\,$}}1
 		{E.}{{$\exists\;\,$}}1
-		{>}{{$>$}}1
-		{<}{{$<$}}1
-		{<=}{{$\leq$}}1
-		{>=}{{$\geq$}}1
-		{<>}{{$\neq$}}1
-		{->}{{$\rightarrow$}}2
-		{<-}{{$\leftarrow$}}1
-		{=}{{$=$}}1
-		{~}{{$\sim$}}1
-		{\#}{{$\sharp$}}1
-		{\{|}{{$\{\!|\!$}}1
-		{|\}}{{$\!|\!\}$}}1
-		{:=}{{$:=$}}2
-		{==}{{$==$}}2
-		{++}{{$+\!\!+$}}2
-		{+++}{{$+\!\!\!\!+\!\!\!\!+$}}2
-		{:==}{{$:==$}}3
-		{\{|*|\}}{{$\{\!|\!\!\star\!\!|\!\}$}}3
+%		{>}{{$>$}}1
+%		{<}{{$<$}}1
+%		{<=}{{$\leq$}}1
+%		{>=}{{$\geq$}}1
+%		{<>}{{$\neq$}}1
+%		{->}{{$\rightarrow$}}2
+%		{<-}{{$\leftarrow$}}1
+%		{=}{{$=$}}1
+%		{~}{{$\sim$}}1
+%		{\#}{{$\sharp$}}1
+%		{\{|}{{$\{\!|\!$}}1
+%		{|\}}{{$\!|\!\}$}}1
+%		{:=}{{$:=$}}2
+%		{==}{{$==$}}2
+%		{++}{{$+\!\!+$}}2
+%		{+++}{{$+\!\!\!\!+\!\!\!\!+$}}2
+%		{:==}{{$:==$}}3
+%		{\{|*|\}}{{$\{\!|\!\!\star\!\!|\!\}$}}3
 		%
 		% Basic iTask constructs
-		{>||>}{{$\triangleright\triangleright$}}2
-		{>>=}{{\texttt{>>=}}}3
-		{>>|}{{\texttt{>>|}}}3
-		{?>>}{{\texttt{?>>}}}3
-		{!>>}{{\texttt{!>>}}}3
-		{-||-}{{\texttt{-||-}}}4
-		{.||.}{{\texttt{.||.}}}4
-		{.&&.}{{\texttt{.\&\&.}}}4
+%		{>||>}{{$\triangleright\triangleright$}}2
+%		{>>=}{{\texttt{>>=}}}3
+%		{>>|}{{\texttt{>>|}}}3
+%		{?>>}{{\texttt{?>>}}}3
+%		{!>>}{{\texttt{!>>}}}3
+%		{-||-}{{\texttt{-||-}}}4
+%		{.||.}{{\texttt{.||.}}}4
+%		{.&&.}{{\texttt{.\&\&.}}}4
 }
 
-\newcommand{\CI}[1]{\lstinline[language=Clean]|#1|}
+\newcommand{\CI}[1]{\lstinline[language=Clean,basicstyle=\ttfamily\fontseries{l}\normalsize]|#1|}
 
 \lstset{%
-	breakatwhitespace=false,         % sets if automatic breaks should only happen at whitespace
-	breaklines=true,                 % sets automatic line breaking
-	captionpos=b,                    % sets the caption-position to bottom
-	keepspaces=true,                 % keeps spaces in text, useful for keeping indentation of code (possibly needs columns=flexible)
-	basicstyle=\ttfamily\footnotesize,        % the size of the fonts that are used for the code
-	commentstyle=\itshape,           % comment style
-	keywordstyle=\bfseries,          % keyword style
-	stringstyle=\ttfamily,           % string literal style
-	showspaces=false,                % show spaces everywhere adding particular underscores; it overrides 'showstringspaces'
-	showstringspaces=false,          % underline spaces within strings only
-	showtabs=false,                  % show tabs within strings adding particular underscores
-	tabsize=4,                       % sets default tabsize to 2 spaces
+	breakatwhitespace=false,                        % sets if automatic breaks should only happen at whitespace
+	breaklines=true,                                % sets automatic line breaking
+	captionpos=b,                                   % sets the caption-position to bottom
+	keepspaces=true,                                % keeps spaces in text, useful for keeping indentation of code (possibly needs columns=flexible)
+	basicstyle=\ttfamily\fontseries{l}\footnotesize,% the size of the fonts that are used for the code
+	commentstyle=\itshape\fontseries{m},            % comment style
+	keywordstyle=\bfseries\fontseries{b},           % keyword style
+	stringstyle=\ttfamily,                          % string literal style
+	showspaces=false,                               % show spaces everywhere adding particular underscores; it overrides 'showstringspaces'
+	showstringspaces=false,                         % underline spaces within strings only
+	showtabs=false,                                 % show tabs within strings adding particular underscores
+	tabsize=4,                                      % sets default tabsize to 2 spaces
 	frame=L
 }