From cb7ed171dde8cd527970429e77ff61c77435f3e3 Mon Sep 17 00:00:00 2001
From: Gustav Eek <gustav.eek@etraveli.com>
Date: Wed, 27 Sep 2017 19:05:17 +0200
Subject: [prsnts/common-goods] Makefile added that creates nice notes

The note/script printouts are made very nice with neat
Latex formatting and the pdfinsert package.
---
 presentations/common-goods/Makefile | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 presentations/common-goods/Makefile

(limited to 'presentations/common-goods/Makefile')

diff --git a/presentations/common-goods/Makefile b/presentations/common-goods/Makefile
new file mode 100644
index 0000000..a9a2ed9
--- /dev/null
+++ b/presentations/common-goods/Makefile
@@ -0,0 +1,34 @@
+notes = \
+  eek-2017-09-common-goods-notes-sv.pdf
+
+all: $(notes)
+
+%-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 $<
+	echo '$(tex-includepdf-nup)' | pdflatex -jobname $(basename $@)
+	rm $(basename $<)_.pdf
+
+define tex-includepdf-nup
+\documentclass[a4paper, 11pt]{article}\
+\usepackage[a4paper, margin = 0pt]{geometry}\
+\usepackage{pdfpages}\
+\pagestyle{empty}\
+\begin{document}\
+\includepdf[pages = -, nup = 2x1]{$(basename $<)_.pdf}\
+\end{document}
+endef
+
+clean:
+	rm -f $(notes)
+	rm -f *.aux *.log
+	rm -f *.tex
+	rm -f *.pdf
+	rm -f *~
+
+
+
+SHELL = /bin/bash
+
-- 
cgit v1.2.3


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 +++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)

(limited to 'presentations/common-goods/Makefile')

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
-- 
cgit v1.2.3


From 2a0e99bfd6b73e33843780aaa54ad4a8db4c44dc Mon Sep 17 00:00:00 2001
From: Gustav Eek <gustav.eek@etraveli.com>
Date: Wed, 18 Oct 2017 17:09:14 +0200
Subject: [prsnts/common-goods] Proposal separated by language

The common proposal *proposal.mdwn* containing two languages is
separated into *proposal-sv.mdwn* and *proposal-en.mdwn*. *Makefile*
for PDF production etc. is ofcourse updated. Also the *README*.
---
 presentations/common-goods/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'presentations/common-goods/Makefile')

diff --git a/presentations/common-goods/Makefile b/presentations/common-goods/Makefile
index 71d92d0..68df7fe 100644
--- a/presentations/common-goods/Makefile
+++ b/presentations/common-goods/Makefile
@@ -2,7 +2,8 @@ notes = \
   eek-2017-09-common-goods-notes-sv.pdf
 
 other = \
-  proposal.pdf \
+  proposal-en.pdf \
+  proposal-sv.pdf \
   script.pdf
 
 all: $(notes) $(other)
@@ -42,7 +43,7 @@ script-sv_.tex: script-sv.mdwn 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" \
+          -V "geometry=hmargin=35mm,top=20mm,bottom=15mm,includefoot" \
           -o $(basename $<).pdf $<
 
 clean:
@@ -50,8 +51,7 @@ clean:
 	rm -f *.aux *.log
 	rm -f *.tex
 	rm -f *.pdf
-	rm -f *~
-
+	rm -f *~ *_.* *_
 
 
 SHELL = /bin/bash
-- 
cgit v1.2.3