From: Mart Lubbers <mart@martlubbers.net>
Date: Mon, 10 Oct 2016 17:45:20 +0000 (+0200)
Subject: Merge branch 'master' of gitlab.science:mlubbers/ssproject1617
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=6e5db13cb9fd5b7bb29f9cff186e0d0046affa98;hp=5675de2255bdfceb293ed7418a0478bc0af7cd75;p=ssproject1617.git

Merge branch 'master' of gitlab.science:mlubbers/ssproject1617
---

diff --git a/report/.gitignore b/report/.gitignore
index 30d00fd..ec22c8a 100644
--- a/report/.gitignore
+++ b/report/.gitignore
@@ -10,3 +10,4 @@
 *.pdf
 *-blx.bib
 logo.png
+!logo.pdf
diff --git a/report/Makefile b/report/Makefile
index a4ec3a0..9ba9f50 100644
--- a/report/Makefile
+++ b/report/Makefile
@@ -6,11 +6,10 @@ LATEXFLAGS:=-file-line-error -halt-on-error -no-shell-escape
 TEXS:=$(wildcard *.tex)
 
 .PHONY: all
-.SECONDARY: $(DOC).fmt logo.png
 
 all: $(DOC).pdf
 
-%.fmt: preamble.tex logo.png
+%.fmt: preamble.tex logo.pdf
 	$(LATEX) $(LATEXFLAGS) -ini -jobname="$(basename $@)" "&$(LATEX) $<\dump"
 
 %.pdf: %.tex %.fmt $(TEXS)
@@ -20,9 +19,6 @@ all: $(DOC).pdf
 	grep -qF 'Please rerun LaTeX.' $(basename $<).mlog &&\
 		$(LATEX) $(LATEXFLAGS) $< || true
 
-%.png: %.eps
-	convert -density 300 $< -resize x1000 $@
-
 clean:
 	$(RM) $(addprefix $(DOC).,aux log fmt toc bbl blg mlog run.xml pdf out)\
 		$(DOC)-blx.bib logo.png
diff --git a/report/logo.pdf b/report/logo.pdf
new file mode 100644
index 0000000..d92241c
Binary files /dev/null and b/report/logo.pdf differ
diff --git a/report/rutitlepage.sty b/report/rutitlepage.sty
index f1f330e..b739a94 100644
--- a/report/rutitlepage.sty
+++ b/report/rutitlepage.sty
@@ -20,14 +20,14 @@
 	authorstext={Authors:},
 	righttextheader={},
 	righttext={}
-}	
+}
 \newcommand{\maketitleru}[1][]{
 	\setkeys{maketitleru}{#1}
 	\begin{titlepage}
 		\makeatletter
 		\begin{center}
 			\textsc{\LARGE\@rutitlecourse}\\[1.5cm]
-			\ifpdf\includegraphics[height=150pt]{logo.png}\\
+			\ifpdf\includegraphics[height=150pt]{logo.pdf}\\
 			\else\includegraphics[height=150pt]{logo.eps}\\
 			\fi
 			\vspace{0.4cm}