Index: Makefile ================================================================== --- Makefile +++ Makefile @@ -1,27 +1,27 @@ -PNGS = pngs/network-private.png pngs/network-public.png pngs/network-community.png -PNGS_BEAMER = pngs/confine,background.png +IMGS = imgs/network-private.png imgs/network-public.png imgs/network-community.png +IMGS_BEAMER = imgs/confine,background.pdf .PHONY: clean all: slides,lightning.pdf -slides,lightning.pdf: script,lightning.txt $(PNGS) slides-header.tex $(PNGS_BEAMER) +slides,lightning.pdf: script,lightning.txt $(IMGS) slides-header.tex $(IMGS_BEAMER) pandoc -t beamer -H slides-header.tex slides,lightning.txt -o $@ -slides,lightning.html: script,lightning.txt $(PNGS) +slides,lightning.html: script,lightning.txt $(IMGS) pandoc -t dzslides --self-contained script,lightning.txt -o $@ -pngs/confine,background.png: logos/confine,logo.svg - inkscape -z -D -e $@ -w 1024 $< +imgs/confine,background.pdf: logos/confine,logo.svg + inkscape -z -D -A $@ $< + +imgs/network-private.png: diagrams/network-private.dia + dia -e $@ -s 1024x $< -pngs/network-private.png: diagrams/network-private.dia +imgs/network-public.png: diagrams/network-public.dia dia -e $@ -s 1024x $< -pngs/network-public.png: diagrams/network-public.dia - dia -e $@ -s 1024x $< - -pngs/network-community.png: diagrams/network-community.dia +imgs/network-community.png: diagrams/network-community.dia dia -e $@ -s 1024x $< clean: - rm -f $(PNGS) $(PNGS_BEAMER) slides,lightning.pdf slides,lightning.html + rm -f $(IMGS) $(IMGS_BEAMER) slides,lightning.pdf slides,lightning.html Index: slides,lightning.txt ================================================================== --- slides,lightning.txt +++ slides,lightning.txt @@ -12,19 +12,19 @@ - Mutual agreement texts - Key for EU Digital Agenda # CNs / Privately-owned network (1/3) -![Private network and private services](pngs/network-private.png) +![Private network and private services](imgs/network-private.png) # CNs / Publicly-owned network (2/3) -![Public network and private services](pngs/network-public.png) +![Public network and private services](imgs/network-public.png) # CNs / Community network (3/3) -![Community network and private services](pngs/network-community.png) +![Community network and private services](imgs/network-community.png) # Community networks (CNs) - Broadband self-provision - Similar to Free software: Index: slides-header.tex ================================================================== --- slides-header.tex +++ slides-header.tex @@ -5,12 +5,12 @@ \vbox to \paperheight { \vfil \hbox to \paperwidth { \hfil \tikz\node[opacity=0.25] { - \includegraphics[width=0.75\textwidth]{pngs/confine,background.png} + \includegraphics[width=0.75\textwidth]{imgs/confine,background.pdf} }; \hfil } \vfil } }