Overview
| Comment: | Rename ``pngs`` to ``imgs``, use PDF for background. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | fosdem-2014 |
| Files: | files | file ages | folders |
| SHA1: |
79f59fb314cc8b0d3a033bf7511f048e |
| User & Date: | ivan on 2014-01-29 14:34:40 |
| Other Links: | branch diff | manifest | tags |
Context
|
2014-01-29
| ||
| 14:36 | Fix makefile dependencies on slides sources, not on script! check-in: da1bc0b5f5 user: ivan tags: fosdem-2014 | |
| 14:34 | Rename ``pngs`` to ``imgs``, use PDF for background. check-in: 79f59fb314 user: ivan tags: fosdem-2014 | |
|
2014-01-28
| ||
| 19:11 | Makefile and LaTeX header to generate Beamer and DZSlides presentations. check-in: ef1e71b301 user: ivan tags: fosdem-2014 | |
Changes
Modified Makefile from [9cd58208c3] to [ead550c968].
1 -PNGS = pngs/network-private.png pngs/network-public.png pngs/network-community.png 2 -PNGS_BEAMER = pngs/confine,background.png 1 +IMGS = imgs/network-private.png imgs/network-public.png imgs/network-community.png 2 +IMGS_BEAMER = imgs/confine,background.pdf 3 3 4 4 .PHONY: clean 5 5 6 6 all: slides,lightning.pdf 7 7 8 -slides,lightning.pdf: script,lightning.txt $(PNGS) slides-header.tex $(PNGS_BEAMER) 8 +slides,lightning.pdf: script,lightning.txt $(IMGS) slides-header.tex $(IMGS_BEAMER) 9 9 pandoc -t beamer -H slides-header.tex slides,lightning.txt -o $@ 10 10 11 -slides,lightning.html: script,lightning.txt $(PNGS) 11 +slides,lightning.html: script,lightning.txt $(IMGS) 12 12 pandoc -t dzslides --self-contained script,lightning.txt -o $@ 13 13 14 -pngs/confine,background.png: logos/confine,logo.svg 15 - inkscape -z -D -e $@ -w 1024 $< 14 +imgs/confine,background.pdf: logos/confine,logo.svg 15 + inkscape -z -D -A $@ $< 16 + 17 +imgs/network-private.png: diagrams/network-private.dia 18 + dia -e $@ -s 1024x $< 16 19 17 -pngs/network-private.png: diagrams/network-private.dia 20 +imgs/network-public.png: diagrams/network-public.dia 18 21 dia -e $@ -s 1024x $< 19 22 20 -pngs/network-public.png: diagrams/network-public.dia 21 - dia -e $@ -s 1024x $< 22 - 23 -pngs/network-community.png: diagrams/network-community.dia 23 +imgs/network-community.png: diagrams/network-community.dia 24 24 dia -e $@ -s 1024x $< 25 25 26 26 clean: 27 - rm -f $(PNGS) $(PNGS_BEAMER) slides,lightning.pdf slides,lightning.html 27 + rm -f $(IMGS) $(IMGS_BEAMER) slides,lightning.pdf slides,lightning.html
Modified slides,lightning.txt from [b8c048444c] to [4acacce749].
10 10 distributed ownership **[#]** 11 11 - Open, Free, neutral networks 12 12 - Mutual agreement texts 13 13 - Key for EU Digital Agenda 14 14 15 15 # CNs / Privately-owned network (1/3) 16 16 17 - 17 + 18 18 19 19 # CNs / Publicly-owned network (2/3) 20 20 21 - 21 + 22 22 23 23 # CNs / Community network (3/3) 24 24 25 - 25 + 26 26 27 27 # Community networks (CNs) 28 28 29 29 - Broadband self-provision 30 30 - Similar to Free software: 31 31 - Open participation & management, 32 32 distributed ownership
Modified slides-header.tex from [ee98e694dd] to [5b9e0324a0].
3 3 \usepackage{tikz} 4 4 \usebackgroundtemplate { 5 5 \vbox to \paperheight { 6 6 \vfil 7 7 \hbox to \paperwidth { 8 8 \hfil 9 9 \tikz\node[opacity=0.25] { 10 - \includegraphics[width=0.75\textwidth]{pngs/confine,background.png} 10 + \includegraphics[width=0.75\textwidth]{imgs/confine,background.pdf} 11 11 }; 12 12 \hfil 13 13 } 14 14 \vfil 15 15 } 16 16 }