From: Mart Lubbers <mart@martlubbers.net>
Date: Thu, 8 Jun 2017 12:18:21 +0000 (+0200)
Subject: new titlepage
X-Git-Tag: hand-in~93
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=ab546cf018589757a516121ebfcc78080827bcff;p=msc-thesis1617.git

new titlepage
---

diff --git a/.gitmodules b/.gitmodules
index 7c9bf16..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "rutitlepage"]
-	path = rutitlepage
-	url = https://github.com/dopefishh/rutitlepage
diff --git a/Makefile b/Makefile
index 06f171a..410cb11 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ BIBTEX?=bibtex
 BIBTEXFLAGS:=
 MAKEGL?=makeglossaries
 MAKEGLFLAGS?=
-LATEXFLAGS:=-file-line-error -halt-on-error -no-shell-escape
+LATEXFLAGS:=-file-line-error -halt-on-error #-no-shell-escape
 
 FIGURES:=$(patsubst fig/%.dot,img/%.png,$(wildcard fig/*.dot))
 LISTINGS:=$(wildcard listings/*)
diff --git a/glossaries.tex b/glossaries.tex
index 1e99f7f..c84b0b8 100644
--- a/glossaries.tex
+++ b/glossaries.tex
@@ -32,9 +32,11 @@
 	browsers}}
 \newglossaryentry{LED}{name={LED},
 	description={Lighting Emitting Diode}}
-\newcommand{\newglossacr}[2]{\newglossaryentry{#1}{name={#1},first={%
-	\glsentrylong{#1} (\glsentryname{#1})},firstplural={\glsentrylong{#1}%
-	\glspluralsuffix (\glsentryname{#1}\glspluralsuffix},description={#2}}}
+\newcommand{\newglossacr}[2]{\newglossaryentry{#1}{
+	name={#1},
+	first={#2 (#1)},%
+	firstplural={#2\glspluralsuffix{} (#1\glspluralsuffix)},
+	description={#2}}}
 \newglossacr{GADT}{Generalized Algebraic Data type}
 \newglossacr{GPIO}   {General-Purpose Input/Output}
 \newglossacr{ADT}    {Algebraic Datatype}
diff --git a/img/logo.eps b/img/logo.eps
new file mode 100644
index 0000000..dec954a
Binary files /dev/null and b/img/logo.eps differ
diff --git a/logo.pdf b/logo.pdf
deleted file mode 120000
index 18ed656..0000000
--- a/logo.pdf
+++ /dev/null
@@ -1 +0,0 @@
-rutitlepage/logo.pdf
\ No newline at end of file
diff --git a/results.itasks.tex b/results.itasks.tex
index 4cbc80e..29762cc 100644
--- a/results.itasks.tex
+++ b/results.itasks.tex
@@ -1,8 +1,7 @@
-\subsection{Shares}
+\section{Integration}
+
+\section{Shares}
 \todo{Semantiek van shares, hoe ze in iTasks zijn, hoe typering}
 
-\subsection{Lifting}
+\section{Lifting}
 \todo{Lift mTask taken naar echte taken, hoe werkt dat?}
-
-\section{Demo}
-\todo{Wat voorbeeld code}
diff --git a/rutitlepage b/rutitlepage
deleted file mode 160000
index 32fc745..0000000
--- a/rutitlepage
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 32fc745524953baa115b829fd37a88c934ed1330
diff --git a/thesis.pre b/thesis.pre
index 988e6e0..ffba314 100644
--- a/thesis.pre
+++ b/thesis.pre
@@ -4,7 +4,6 @@
 
 \usepackage{geometry}                % Papersize
 \usepackage[titletoc]{appendix}      % Appendices
-\usepackage{rutitlepage/rutitlepage} % Titlepage
 \usepackage{hyperref}                % Hyperlinks
 \usepackage{booktabs}                % Better looking tables
 \usepackage{todonotes}               % Todo's
@@ -16,6 +15,8 @@
 \usepackage{lmodern}                 % Better teletype fonts
 \usepackage{textcomp}                % Nice listings quotes
 \usepackage{pgf-umlsd}               % Connection diagrams
+\usepackage{graphicx}                % Graphics
+\usepackage{epstopdf}                % Eps graphics
 
 \usetikzlibrary{arrows,shadows}
 
diff --git a/thesis.tex b/thesis.tex
index 7a8e5fa..9059d4c 100644
--- a/thesis.tex
+++ b/thesis.tex
@@ -9,13 +9,7 @@
 \frontmatter{}
 
 %Titlepage
-\maketitleru[
-	pagenr=1,
-	course={Master Thesis},
-	institute={Radboud University Nijmegen},
-	authorstext={Author:},
-	righttextheader={Supervisors:},
-	righttext={prof.~dr.~dr.h.c.~ir.~M.J.~Plasmeijer\\dr.~P.W.M.~Koopman}]
+\input{titlepage}
 \listoftodos[Todo]
 
 \glsaddall{}
@@ -61,13 +55,14 @@
 \chapter{mTask continued}\label{chp:mtaskcont}
 \input{results.mtask}
 
-\chapter{iTasks integration}\label{chp:itasksint}
+\chapter{iTasks}\label{chp:itasksint}
 \input{results.itasks}
 
 \chapter{Conclusion \& Discussion}\label{chp:conclusion}
 \input{conclusion}
 
-\appendix\label{chp:appendix}
+\appendix%
+\label{chp:appendix}
 
 \chapter{Communication protocol}\label{app:communication-protocol}
 \input{appendix-protocol}
diff --git a/titlepage.tex b/titlepage.tex
new file mode 100644
index 0000000..675e7db
--- /dev/null
+++ b/titlepage.tex
@@ -0,0 +1,32 @@
+\makeatletter
+\newgeometry{hmarginratio=1:1}
+\begin{titlepage}
+	\setcounter{page}{1}
+	\begin{center}
+		\textsc{\LARGE Master Thesis}\\[1.5cm]
+		\includegraphics[width=.7\linewidth]{logo.eps}\\[3cm]
+		\hrule
+		\vspace{0.4cm}
+		\textbf{\large\@title}\\[0.4cm]
+		\hrule
+		\vspace{2cm}
+		\begin{minipage}[t]{0.45\textwidth}
+			\begin{flushleft}\large
+				\textit{Author:}\\
+				\@author%
+			\end{flushleft}
+		\end{minipage}
+		\begin{minipage}[t]{0.45\textwidth}
+			\begin{flushright}\large
+				\textit{Supervisors:}\\
+				prof.~dr.~dr.h.c.~ir.~M.J.~Plasmeijer\\
+				dr.~P.W.M.~Koopman
+			\end{flushright}
+		\end{minipage}
+		\vspace{1cm}
+		\vfill
+		{\large\@date}
+	\end{center}
+\end{titlepage}
+\restoregeometry%
+\makeatother