Merge branch 'master' into master

This commit is contained in:
Florian Walch
2017-05-13 21:18:58 +02:00
committed by GitHub
5 changed files with 16 additions and 10 deletions

View File

@@ -1,14 +1,18 @@
FILE := main FILE := main
OUT := build OUT := build
.PHONY: pdf
pdf: pdf:
# Also see .latexmkrc latexmk -interaction=nonstopmode -outdir=$(OUT) -pdf -halt-on-error $(FILE)
latexmk -outdir=$(OUT) -pdf $(FILE)
.PHONY: watch
watch:
latexmk -interaction=nonstopmode -outdir=$(OUT) -pdf -pvc -halt-on-error $(FILE)
.PHONY: clean
clean: clean:
rm -rf $(filter-out $(OUT)/$(FILE).pdf, $(wildcard $(OUT)/*)) rm -rf $(filter-out $(OUT)/$(FILE).pdf, $(wildcard $(OUT)/*))
.PHONY: purge
purge: purge:
rm -rf $(OUT) rm -rf $(OUT)
.PHONY: latexmk clean purge

Binary file not shown.

View File

@@ -31,7 +31,7 @@
{\LARGE \getAuthor{}} {\LARGE \getAuthor{}}
\IfFileExists{logos/faculty.pdf}{% \IfFileExists{logos/faculty.pdf}{%
\vspace{20mm} \vfill{}
\includegraphics[height=20mm]{logos/faculty.pdf} \includegraphics[height=20mm]{logos/faculty.pdf}
}{} }{}
\end{titlepage} \end{titlepage}

View File

@@ -26,12 +26,14 @@
\usepackage{caption} \usepackage{caption}
\usepackage[hidelinks]{hyperref} % hidelinks removes colored boxes around references and links \usepackage[hidelinks]{hyperref} % hidelinks removes colored boxes around references and links
\bibliography{bibliography} \bibliography{bibliography}
\setkomafont{disposition}{\normalfont\bfseries} % use serif font for headings \setkomafont{disposition}{\normalfont\bfseries} % use serif font for headings
\linespread{1.05} % adjust line spread for mathpazo font \linespread{1.05} % adjust line spread for mathpazo font
% Add table of contents to PDF bookmarks
\BeforeTOCHead[toc]{{\cleardoublepage\pdfbookmark[0]{\contentsname}{toc}}}
% Define TUM corporate design colors % Define TUM corporate design colors
% Taken from http://portal.mytum.de/corporatedesign/index_print/vorlagen/index_farben % Taken from http://portal.mytum.de/corporatedesign/index_print/vorlagen/index_farben
\definecolor{TUMBlue}{HTML}{0065BD} \definecolor{TUMBlue}{HTML}{0065BD}
@@ -49,7 +51,7 @@
\definecolor{TUMAccentBlue}{HTML}{64A0C8} \definecolor{TUMAccentBlue}{HTML}{64A0C8}
% Settings for pgfplots % Settings for pgfplots
\pgfplotsset{compat=1.9} % TODO: adjust to your installed version \pgfplotsset{compat=newest}
\pgfplotsset{ \pgfplotsset{
% For available color names, see http://www.latextemplates.com/svgnames-colors % For available color names, see http://www.latextemplates.com/svgnames-colors
cycle list={TUMBlue\\TUMAccentOrange\\TUMAccentGreen\\TUMSecondaryBlue2\\TUMDarkGray\\}, cycle list={TUMBlue\\TUMAccentOrange\\TUMAccentGreen\\TUMSecondaryBlue2\\TUMDarkGray\\},