X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=preamble.tex;h=2606a8c17438373f7b531e52db8a4da4a64bf9b4;hb=3369704052f2381076b72efb24d57a943172e729;hp=ce4ab86a377517255c1baf263b8c85bd0d7436f5;hpb=7160e9f70a126ed1bc41789ade0d91e41cc2db38;p=phd-thesis.git

diff --git a/preamble.tex b/preamble.tex
index ce4ab86..2606a8c 100644
--- a/preamble.tex
+++ b/preamble.tex
@@ -11,15 +11,15 @@
 \usepackage{titlecaps}      % titlecase commands
 \usepackage{amsmath}        % extra math
 \usepackage{amssymb}        % extra math symbols
+\usepackage{wasysym}        % circle symbols
 \usepackage{relsize}        % \smaller command
 \usepackage{siunitx}        % typeset units
 \usepackage{xcolor}         % colors
+\usepackage{fnpct}          % footnotekerning
 \DeclareSIUnit\noop{\relax}
 \DeclareSIUnit\celcius{{}^{\circ}\kern-\scriptspace\mathsf{C}}
-%\usepackage{atveryend}        % \smaller command
 \everymath{\it\/}
 \DeclareMathSymbol{\shortminus}{\mathbin}{AMSa}{"39} %chktex 18
-\newcommand{\dcolon}[0]{\mathbin{::}}
 
 % Internationalisation
 \usepackage[dutch,russian,british]{babel}
@@ -40,13 +40,22 @@
 }
 \usepackage{pdflscape}
 \usepackage{float}
+\usepackage{newfloat}
+\DeclareFloatingEnvironment[
+	fileext=loq,
+	listname={List of definitions},
+	name=Definition,
+	placement=tbp,
+	within=chapter,
+	chapterlistsgaps=on,
+	]{equ}
 \usepackage{fancyhdr} % Custom headers and footers
 %\pagestyle{headings}
 \pagestyle{fancy}
 \fancyhead{}
 \fancyfoot{}
 \setlength{\unitlength}{18mm}
-\newcommand{\blob}{\rule[-.2\unitlength]{2\unitlength}{.5\unitlength}}
+\newcommand{\blob}{{\color{gray}\rule[-.2\unitlength]{2\unitlength}{.5\unitlength}}}
 \fancyhead[RE]{\rightmark}
 \fancyhead[LO]{\leftmark}
 \newcommand{\frontmatterfancy}[0]{
@@ -90,8 +99,8 @@
 % Have better page numbering in chapters
 \patchcmd{\chapter}{plain}{headings}{}{}
 \usepackage{epigraph} % Epigraph
-\renewcommand\partname{Movement}                   % Rename parts to movements (rhapsody uhu)
-\addto\captionsbritish{\renewcommand{\partname}{Movement}}
+\renewcommand\partname{Episode}                   % Rename parts to episodes (rhapsody uhu)
+\addto\captionsbritish{\renewcommand{\partname}{Episode}}
 \usepackage{titlesec}
 \titleformat{\part}[block]
 	{\Huge}
@@ -107,7 +116,7 @@
 \def\part@nostar@nopt#1{\NR@gettitle{#1}\titlesec@part{#1}}
 \def\part@nostar@opt[#1]#2{\NR@gettitle{#1}\titlesec@part[#1]{#2}}
 \makeatother
-\newenvironment{chapterabstract}{\begin{quotation}}{\end{quotation}}
+\newenvironment{chapterabstract}{\begin{quotation}\em}{\end{quotation}} %chktex 6
 
 % Increase the depth for the table of contents
 \setcounter{secnumdepth}{3}
@@ -120,14 +129,28 @@
 \usepackage{appendix}                      % subappendices, appendices per chapter
 
 % Bibliography
-\usepackage{bibentry} % Cite bib entry completely
-\nobibliography*
 \usepackage{natbib} % Cite bib entry completely
 \setlength{\bibsep}{0.0pt}
 \def\bibfont{\small}
 %\bibliographystyle{alpha}
 \bibliographystyle{abbrvnat}
 \apptocmd{\thebibliography}{\raggedright}{}{}
+\usepackage{bibentry} % Cite bib entry completely
+\nobibliography*
+\newcommand{\citeentry}[1]{\begin{NoHyper}\bibentry{#1}\end{NoHyper}. \citep{#1}}
+
+\makeatletter
+\newcommand{\citepage}[1]{p.~#1}
+\newcommand{\citepages}[1]{pp.~#1}
+\newcommand{\citechapter}[1]{\cref@chapter@name~#1}
+\newcommand{\citechapters}[1]{\cref@chapter@name@plural~#1}
+\newcommand{\citesection}[1]{\cref@section@name~#1}
+\newcommand{\citesections}[1]{\cref@section@name@plural~#1}
+%\newcommand{\citesection}[1]{\S.~#1}
+%\newcommand{\citesections}[1]{\S\S.~#1}
+\newcommand{\citeparagraph}[1]{\P.~#1}
+\newcommand{\citeparagraphs}[1]{\P\P.~#1}
+\makeatother
 
 % Graphics
 \usepackage{graphicx} % Images
@@ -147,7 +170,7 @@
 
 % Code
 % Pseudocode
-\usepackage[algochapter]{algorithm2e}
+\usepackage[algochapter,linesnumbered,lined,boxed]{algorithm2e}
 % Fix the algorithm font
 \renewcommand\AlCapFnt{\normalfont}
 \usepackage{listings}
@@ -192,7 +215,9 @@
 \newcommand{\arduinoinline}[1]{\lstinline[language={[Arduino]C++},postbreak=]|#1|}
 \newcommand{\pythoninline}[1]{\lstinline[language=Python,postbreak=]|#1|}
 \newcommand{\cleaninline}[1]{\lstinline[language=Clean,postbreak=]|#1|}
+\newcommand{\cleaninputlisting}[2][]{\renewcommand*{\lstlistingname}{Listing (\gls{CLEAN})}\lstinputlisting[language=Clean,#1]{\subfix{#2}}}
 \newcommand{\haskellinline}[1]{\lstinline[language={[Regular]Haskell},postbreak=]|#1|}
+\newcommand{\haskellinputlisting}[2][]{\renewcommand*{\lstlistingname}{Listing (\gls{HASKELL})}\lstinputlisting[language={[Regular]Haskell},#1]{\subfix{#2}}}
 \newcommand{\haskelllhstexinline}[1]{\lstinline[language={[Lhs2Tex]Haskell},postbreak=]|#1|}
 %For storing listings in footnotes
 \newsavebox{\LstBox}
@@ -221,7 +246,7 @@
 \lstnewenvironment{lstArduino}[1][]
 	{% 
 		\lstset{language={[Arduino]C++}, #1}
-		\renewcommand*{\lstlistingname}{Listing (\gls{ARDUINO})}
+		\renewcommand*{\lstlistingname}{Listing (\gls{CPP})}
 	}
 	{}
 \lstnewenvironment{lstHaskell}[1][]
@@ -239,6 +264,7 @@
 
 % Hyperlinks and metadata
 \usepackage[pdflang={en-GB},pagebackref]{hyperref} % hyperlinks
+\usepackage{xr} % hyperlinks
 \renewcommand*{\backref}[1]{}
 \renewcommand*{\backrefalt}[4]{[{%
 	\ifcase #1 not cited.\or p.~#2.\else pp. #2.\fi%chktex 1
@@ -253,29 +279,33 @@
 \urlstyle{same}
 \usepackage{bookmark}
 \usepackage[noabbrev]{cleveref} % Easy references
-\crefname{part}{movement}{movements}
+\usepackage{crossreftools} % Easy references
+\crefname{equ}{equation}{equations}
+\crefname{part}{episode}{episodes}
 \crefname{lstlisting}{listing}{listings}
+\crefname{equ}{definition}{definition}
 \usepackage{nameref} % to reference names of chapters
-\newcommand{\fullref}[1]{\Cref{#1}: \nameref{#1}}
+\newcommand{\fullref}[1]{\crtcref{#1}: \nameref{#1}}
+\newcommand{\Fullref}[1]{\crtCref{#1}: \nameref{#1}}
+\creflabelformat{equation}{#2\textup{#1}#3}
 
 % Glossaries and acronyms
-\usepackage[nolangwarn,acronym,nonumberlist]{glossaries}
+\usepackage[nolangwarn,abbreviations,nonumberlist,prefix]{glossaries-extra}
+\setabbreviationstyle{long-short}
+\setabbreviationstyle[noexpand]{short-nolong}
 \Addlcwords{of}
-% Titlecase glossary commands
-\newcommand{\glst}[1]{\titlecap{\glsentrylong{#1}}}
-\newcommand{\Glst}[1]{\glst{#1}}
-% Fix gls in hyperlink errors
+\usepackage{glossary-mcols}
 \pdfstringdefDisableCommands{%
-	\def\acrlong#1{}%
-	\def\acrlongpl#1{}%
-	\def\acrshort#1{}%
-	\def\acrshortpl#1{}%
+	\def\glsxtrlong#1{}%
+	\def\glsxtrlongpl#1{}%
+	\def\glsxtrshort#1{}%
+	\def\glsxtrshortpl#1{}%
 	\def\acrfull#1{}%
 	\def\acrfullpl#1{}%
-	\def\Acrlong#1{}%
-	\def\Acrlongpl#1{}%
-	\def\Acrshort#1{}%
-	\def\Acrshortpl#1{}%
+	\def\Glsxtrlong#1{}%
+	\def\Glsxtrlongpl#1{}%
+	\def\Glsxtrshort#1{}%
+	\def\Glsxtrshortpl#1{}%
 	\def\Acrfull#1{}%
 	\def\Acrfullpl#1{}%
 	\def\gls#1{}%
@@ -285,8 +315,8 @@
 	\def\Glspl#1{}%
 	\def\Glsentrytext#1{}%
 	\def\titlecap#1{}%
+	\def\MakeUppercase#1{}%
 }
-\usepackage{glossary-mcols}
 
 % Index
 %\usepackage{makeidx}
@@ -310,14 +340,16 @@
 
 % Custom commands
 \newcommand{\GHCmod}[1]{\texttt{#1}}
-\newcommand{\requiresGHCmod}[2][]{\footnote{Requires \GHCmod{#2} to be enabled. #1}}
-\newcommand{\etc}{{\fontfamily{cmr}\selectfont{\itshape\/\&c}}}
-\newcommand{\rdmentry}[6]{#1: #2 (#3): #4. #5.\ \href{https://doi.org/#6}{#6}}
+\newcommand{\aramsingh}{Ramsingh, A.\ (University of Glasgow)}
+\newcommand{\dcolon}[0]{\mathbin{::}}
+\newcommand{\doifmt}[1]{\href{https://doi.org/#1}{#1}}
+\newcommand{\etc}{{\fontfamily{cmr}\selectfont{\itshape\/\&\kern-0.2em c}}}
+\newcommand{\jsinger}{Singer, dr.\ J.\ (University of Glasgow)}
 \newcommand{\mlubbers}{Lubbers, M.\ (Radboud University)}
 \newcommand{\pkoopman}{Koopman, dr.\ P.\ (Radboud University)}
+\newcommand{\ptrinder}{Trinder, prof.~dr.\ P.\ (University of Glasgow)}
+\newcommand{\rdmentry}[5]{#1 (#2): #3. #4.\ \doifmt{#5}}
+\newcommand{\rewriterate}[2]{\langle{}#1, #2\rangle{}}
+\newcommand{\requiresGHCmod}[2][]{\footnote{Requires \GHCmod{#2} to be enabled. #1}}
 \newcommand{\rplasmeijer}{Plasmeijer, prof.\ dr.\ ir.\ R.\ (Radboud University)}
-
-\newcommand{\mypart}[3]{
-	\part[#2: #3]{#2\\[2ex]\smaller{}#3}%
-	\label{#1}
-}
+\newcommand{\erasmusplus}{ERASMUS\raisebox{.25ex}{+}}