diff --git a/exercises.tex b/exercises.tex index 58b3b7b..ce64ca4 100644 --- a/exercises.tex +++ b/exercises.tex @@ -259,6 +259,7 @@ %{ %\newgeometry{margin=1cm,tmargin=1cm,top=2cm,left=3.75cm,right=2.5cm,bottom=1.5cm} \includepdf[pages=-]{routing/anbieter-rolle.pdf} + %\includegraphics[page=3]{/home/iorek/EinladungPT15.pdf} %\restoregeometry %} %\clearpage @@ -269,6 +270,5 @@ %{\addcontentsline{toc}{subsubsection}{Rollenbeschreibung Rootserver} \includepdf[doublepages,nup=1x2,frame=true]{routing/rootserver.pdf} \end{exercise} - \end{lecture exercises} diff --git a/kryptoprojekt-script.pdf b/kryptoprojekt-script.pdf index 7f1a713..03ec62e 100644 Binary files a/kryptoprojekt-script.pdf and b/kryptoprojekt-script.pdf differ diff --git a/kryptoprojekt-script.tex b/kryptoprojekt-script.tex index 80d1521..5fb3cf0 100644 --- a/kryptoprojekt-script.tex +++ b/kryptoprojekt-script.tex @@ -40,22 +40,17 @@ \usepackage{beamerarticle} \usepackage{ahilbig-semester} -\usepackage{graphicx} -\usepackage{subcaption} -\usepackage{circuitikz} \input{config.tex} %\DdILogoOptions{width=1.75cm,keepaspectratio=true,digitcolor=ddilogolightgray} -\listfiles +%\listfiles %\newcommand\logobreite{9.2cm} %\newcommand\lgo{\raisebox{-1ex}{\ddiLogo}} -\usepackage{pdfpages} -\usepackage{gincltex} \hypersetup{ pdftitle={Workshop – \lecturename{} – \insertsemester{} – \universitaet}, @@ -89,6 +84,5 @@ \clearpage \InsertLectureAndExercises{kryptoprojekt} % André Hilbig - \end{document} diff --git a/routing/anbieter-rolle.tex b/routing/anbieter-rolle.tex index 5e3a462..c17ef63 100644 --- a/routing/anbieter-rolle.tex +++ b/routing/anbieter-rolle.tex @@ -16,9 +16,9 @@ \documentclass[11pt]{article} -\usepackage[german]{babel} \usepackage[T1]{fontenc} \usepackage[utf8]{inputenc} +\usepackage[german]{babel} \usepackage{geometry} % to change the page dimensions \geometry{a4paper} diff --git a/routing/nutzer-rolle.pdf b/routing/nutzer-rolle.pdf index 928f4c2..eb0a336 100644 Binary files a/routing/nutzer-rolle.pdf and b/routing/nutzer-rolle.pdf differ diff --git a/routing/nutzer-rolle.tex b/routing/nutzer-rolle.tex index a64a760..a9f764a 100644 --- a/routing/nutzer-rolle.tex +++ b/routing/nutzer-rolle.tex @@ -19,7 +19,7 @@ \usepackage[T1]{fontenc} \usepackage[utf8]{inputenc} -\usepackage{geometry} % to change the page dimensions +\usepackage[bottom=2cm]{geometry} % to change the page dimensions \geometry{a5paper,landscape} \usepackage{graphicx} \parindent 0pt