From eed9a77e80f4cee79c50da62f93914d64768048f Mon Sep 17 00:00:00 2001
From: Gustav Eek <gustav.eek@etraveli.com>
Date: Fri, 29 Sep 2017 16:28:55 +0200
Subject: [prsnts/common-goods] Update to PDF and Makefile

---
 presentations/common-goods/Makefile      | 40 +++++++++++++++++++++++++-------
 presentations/common-goods/proposal.mdwn |  6 ++---
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/presentations/common-goods/Makefile b/presentations/common-goods/Makefile
index a9a2ed9..71d92d0 100644
--- a/presentations/common-goods/Makefile
+++ b/presentations/common-goods/Makefile
@@ -1,15 +1,15 @@
 notes = \
   eek-2017-09-common-goods-notes-sv.pdf
 
-all: $(notes)
+other = \
+  proposal.pdf \
+  script.pdf
 
-%-notes-sv.pdf: script-sv.mdwn
-	pandoc -s -S -f markdown -t latex \
-          -V "classoption=a4paper,12pt" \
-          -V "geometry=paperwidth=.5\paperwidth,hmargin=8mm,top=10mm,bottom=15mm,includefoot" \
-          -o $(basename $<)_.pdf $<
+all: $(notes) $(other)
+
+
+%-notes-sv.pdf: script-sv_.pdf
 	echo '$(tex-includepdf-nup)' | pdflatex -jobname $(basename $@)
-	rm $(basename $<)_.pdf
 
 define tex-includepdf-nup
 \documentclass[a4paper, 11pt]{article}\
@@ -17,10 +17,34 @@ define tex-includepdf-nup
 \usepackage{pdfpages}\
 \pagestyle{empty}\
 \begin{document}\
-\includepdf[pages = -, nup = 2x1]{$(basename $<)_.pdf}\
+\includepdf[pages = -, nup = 2x1]{$(basename $<).pdf}\
 \end{document}
 endef
 
+script-sv_.pdf: script-sv_.tex
+	jobname=$(basename $@) ;\
+	echo "Rerun right" >> $(basename $@).log ;\
+	for i in {0..4}; do \
+          if grep -q 'Rerun.*right' $(basename $@).log; then \
+	    pdflatex -jobname $(basename $@) $<;\
+          fi ;\
+        done
+
+script-sv_.tex: script-sv.mdwn latex.sed
+	pandoc -s -S -f markdown -t latex \
+          -V "classoption=a4paper,12pt" \
+          -V "geometry=paperwidth=.5\paperwidth,hmargin=10mm,top=15mm,bottom=15mm,includefoot" \
+          < $< \
+          | sed -f latex.sed > $@
+
+
+
+$(other): %.pdf: %.mdwn
+	pandoc -s -S -f markdown -t latex \
+          -V "classoption=a4paper,12pt" \
+          -V "geometry=hmargin=20mm,top=20mm,bottom=15mm,includefoot" \
+          -o $(basename $<).pdf $<
+
 clean:
 	rm -f $(notes)
 	rm -f *.aux *.log
diff --git a/presentations/common-goods/proposal.mdwn b/presentations/common-goods/proposal.mdwn
index b58ba6d..b0519a5 100644
--- a/presentations/common-goods/proposal.mdwn
+++ b/presentations/common-goods/proposal.mdwn
@@ -1,7 +1,7 @@
 ---
-title: (*en* Communication infrastructure – a form of resistance? *en*)(*sv* Kommunikationsinfrastruktur – en motståndsform? *sv*)
-subtitle: (*en* Fripost: digital technology as a common good for user freedom and control *en*)(*sv* Fripost: digital teknik som gemensam nyttighet för användarfrihet och -kontroll *sv*)
-author: Gustav Eek <gustav@fripost.org>
+title: '(*en* Communication infrastructure – a form of resistance? *en*)(*sv* Kommunikationsinfrastruktur – en motståndsform? *sv*)'
+subtitle: '(*en* Fripost: digital technology as a common good for user freedom and control *en*)(*sv* Fripost: digital teknik som gemensam nyttighet för användarfrihet och -kontroll *sv*)'
+author: 'Gustav Eek <gustav@fripost.org>'
 date: tor 13 jul 2017 20:18:26 CEST
 ...
 
-- 
cgit v1.2.3