update makefile and improve document structure

diff --git a/Makefile b/Makefile
index a352d3a..7df5468 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,10 @@
 DOCS:=thesis
-LATEX:=pdflatex
-BIBTEX:=bibtex
+GREP?=grep
+LATEX?=pdflatex
+BIBTEX?=bibtex
 BIBTEXFLAGS:=
+MAKEGLOSSARIES?=makeglossaries
+MAKEGLOSSARIESFLAGS?=makeglossaries
 LATEXFLAGS:=-file-line-error -halt-on-error -no-shell-escape
 
 .PHONY: all clean
@@ -13,13 +16,15 @@ all: $(addsuffix .pdf,$(DOCS))
        $(LATEX) $(LATEXFLAGS) -ini -jobname="$(basename $@)" "&$(LATEX) $<\dump"
 
 %.pdf: %.mlog
-       grep -iFq 'Rerun to get' $< && $(LATEX) $(LATEXFLAGS) $(basename $<) || true
+       $(GREP) -iFq 'Rerun to get' $< && $(LATEX) $(LATEXFLAGS) $(basename $<) || true
 
 %.mlog: %.tex %.fmt $(wildcard *.bib) $(wildcard *.tex)
        $(LATEX) $(LATEXFLAGS) $<
-       grep -q '^\\bibdata{' $(basename $<).aux && $(BIBTEX) $(BIBTEXFLAGS) $(basename $<) || true
-       grep -q '\@istfilename' $(basename $<).aux && makeglossaries $(basename $<)
+       $(GREP) -q '^\\bibdata{' $(basename $<).aux && $(BIBTEX) $(BIBTEXFLAGS) $(basename $<) || true
+       $(GREP) -q '\@istfilename' $(basename $<).aux && $(MAKEGLOSSARIES) $(MAKEGLOSSARIESFLAGSFLAGS) $(basename $<)
        $(LATEX) $(LATEXFLAGS) $< | tee $@
 
 clean:
-       $(RM) $(foreach DOC,$(DOCS),$(addprefix $(DOC).,aux log fmt toc bbl blg run.xml out pdf snm nav snm vrb glo tdo alg acn acr glg gls xdy))
+       $(RM) $(foreach DOC,$(DOCS),$(addprefix $(DOC).,\
+               acn acr alg aux bbl blg fmt glg glo gls log nav out pdf run.xml snm\
+               tdo toc vrb xdy))

diff --git a/abstract.tex b/abstract.tex
index c8e6ed7..f6276be 100644 (file)
--- a/abstract.tex
+++ b/abstract.tex
@@ -1,9 +1 @@
-\chapter*{\centering Abstract}
-\begin{quotation}
-       \centering\it\noindent
-       Okay.
-
-       hallo
-
-       hoi
-\end{quotation}
+\lipsum[1]

diff --git a/introduction.tex b/introduction.tex
new file mode 100644 (file)
index 0000000..70a36b3
--- /dev/null
+++ b/introduction.tex
@@ -0,0 +1,2 @@
+\todo{What am I doing}
+\todo{Structure of the thesis}

diff --git a/methods.tex b/methods.tex
new file mode 100644 (file)
index 0000000..c38fcfc
--- /dev/null
+++ b/methods.tex
@@ -0,0 +1,2 @@
+\todo{What is IoT}
+\todo{What is top}

diff --git a/thesis.pre b/thesis.pre
index fbecc6c..80c2932 100644 (file)
--- a/thesis.pre
+++ b/thesis.pre
@@ -10,6 +10,7 @@
 \usepackage{todonotes}               % Todo's
 \usepackage{caption}                 % Captions
 \usepackage{subcaption}              % Subcaptions
+\usepackage{lipsum}                  % dummy text
 
 \urlstyle{same}
 \hypersetup{%

diff --git a/thesis.tex b/thesis.tex
index 2123c65..84d6343 100644 (file)
--- a/thesis.tex
+++ b/thesis.tex
@@ -1,9 +1,16 @@
 %&thesis
-\usepackage[xindy={codepage=utf-8},nonumberlist,acronyms]{glossaries}     % Acronyms
+\usepackage[xindy,nonumberlist,acronyms]{glossaries}     % Acronyms
 \makeglossaries%
 \newacronym{sds}{SDS}{Shared Data Source}
+\newacronym{iot}{IoT}{Internet of Things}
+\newacronym{top}{TOP}{Task Oriented Programming}
+
 \begin{document}
+\frontmatter{}
+
+%Titlepage
 \maketitleru[
+       pagenr=1,
        course={Master Thesis},
        institute={Radboud University Nijmegen},
        authorstext={Author:},
@@ -11,20 +18,33 @@
        righttext={prof.~dr.~dr.h.c.~ir.~M.J.~Plasmeijer\\dr.~P.W.M.~Koopman}]
 \listoftodos[Todo]
 
-\input{abstract.tex}
+%Abstract
+\chapter*{\centering Abstract}
+\begin{quotation}
+       \centering\it\noindent
+       \input{abstract.tex}
+\end{quotation}
 
+%Table of contents
 \tableofcontents
 
+%Glossaries
+\glsaddall{}
 \printglossaries%
+
+\mainmatter{}
 \chapter{Introduction}
+\input{introduction.tex}
+
 \chapter{Methods}
+\input{methods.tex}
+
 \chapter{Results}
 \chapter{Conclusion \& Discussion}
 
-\begin{appendices}
-       \chapter{Communication protocol}
-       \input{appendix-protocol.tex}
-\end{appendices}
+\appendix
+\chapter{Communication protocol}
+\input{appendix-protocol.tex}
 
 \bibliographystyle{ieeetr}
 \bibliography{thesis}