Presentation update

diff --git a/Makefile b/Makefile
index c6ee21f9f7cc0f455b8ddca7d705c6e98d2711a0..0eb166eb3bb13bc4b1db12c282e9345088ca32ad 100644 (file)
--- 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 8b600115bb9adcfff3fbaafe504f0a00292e6ef2..7064177e0a38c0eeebf9c711eeb1e19d88fba058 100644 (file)
--- 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?