From 8b7b3deafcfe6b1d0258179de4f34c2be18d0a34 Mon Sep 17 00:00:00 2001 From: Gustav Eek Date: Sun, 10 Sep 2017 17:09:38 +0200 Subject: [PATCH] Presentation update --- Makefile | 19 +++++++++++++------ presentation.mdwn | 22 +++++++++++++++++++++- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index c6ee21f..0eb166e 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,21 @@ -all: presentation.pdf +all: presentation.pdf notes.pdf presentation-4.pdf + +notes.pdf: notes.mdwn + pandoc -S -s -f markdown -t latex -o $@ < $< + presentation.pdf: presentation.mdwn $(images) pandoc -S -s -f markdown -t beamer -o $@ < $< images = \ + images/20170908_185031.jpg \ + images/20170908_185054.jpg \ + images/20170908_190111.jpg \ + images/20170908_190056.jpg \ + images/20170908_185911.jpg \ + images/Alvsbyn_SnowShoe-350x290.jpg \ + images/Vandring_paa_Upplandsleden-2.jpg \ images/qgis-topo-och-trafikplatser-uppsala.png \ + images/qgis-endast-tragfikplatser-uppsala.png \ images/contains-uppsala.png \ images/aelvsbyn-trains-code.png \ - images/Alvsbyn_SnowShoe-350x290.jpg \ - images/qgis-endast-tragfikplatser-uppsala.png \ - images/Vandring_paa_Upplandsleden-2.jpg \ - - diff --git a/presentation.mdwn b/presentation.mdwn index 8b60011..7064177 100644 --- a/presentation.mdwn +++ b/presentation.mdwn @@ -2,9 +2,29 @@ % ETI 2 % Trainhack, Göteborg--Luleå--Uppsala, 7--9 sep 2017 +\includegraphics[width = \textwidth, angle = 180, trim = 350 200 250 200, clip = true]{images/20170908_185031.jpg} + +---- + +\includegraphics[width = \textwidth, angle = 180]{images/20170908_185054.jpg} + +---- + +\includegraphics[width = \textwidth, angle = 180]{images/20170908_190111.jpg} + +---- + +\includegraphics[width = \textwidth]{images/20170908_190056.jpg} + +----- + +\includegraphics[angle = -90, trim = 850 0 850 400, clip = true, width = \textwidth]{images/20170908_185911.jpg} + + + # Tekniken -- Vad har vi byggt? -*Platshållare för bilder på telefon* + # Tekniken -- Vad har vi byggt? -- 2.39.2