adjust for printing

[talk-2018-dc18-gdr.git] / Makefile

diff --git a/Makefile b/Makefile
index 9355d1a1240d89407e4368ad1c3003d5ff676203..9521c7784e141a06d580968e46724115b58346f0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,7 @@ SLIDES+= dm-1
 SLIDES+= dm-2
 SLIDES+= dm-rebasing
 SLIDES+= dm-3
+SLIDES+= dm-pre-newups
 SLIDES+= dm-5
 SLIDES+= dm-6
 SLIDES+= dm-zoom # made from 6
@@ -44,7 +45,7 @@ SLIDEFILES=$(addsuffix .ps, $(SLIDES))
 
 o= >$@.new && mv -f $@.new $@
 
-all:   slides.pdf talk.ps
+all:   slides.pdf talk.ps demo.ps
 
 %.ps:   %.fig
        iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1
@@ -78,12 +79,16 @@ dm-post-wreck.ps: dm.fig conflict.txt.eps
        iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1
        LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+4,5,110:139,144:145,230:232,235:239 <$@.1 $o
 
+dm-pre-newups.ps: dm.fig conflict.txt.eps
+       iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1
+       LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+110:139,144:145,230:232,235:239 <$@.1 $o
+
 dm-wreck.ps: dm.fig conflict.txt.eps
        iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1
        LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+1:3,5,144:145,153,+110:149,240:249 <$@.1 $o
 
 helm-rebase-crop.ppm: helm-rebase.png Makefile
-       pngtopnm <$< | pnmcut -right 800 -bottom 300 >$@
+       pngtopnm <$< | pnmcut -right 550 -bottom 300 >$@
 
 %.eps:   %.fig
        iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1
@@ -104,11 +109,19 @@ dm-for-zoom.eps: dm.fig
 slides.ps: $(SLIDEFILES) Makefile
        cat $(SLIDEFILES) $o
 
-slides.pdf:     slides.ps Makefile
+%.pdf:     %.ps Makefile
        ps2pdf $< $@
 
-talk.ps: talk.txt
-       a2ps -1 -o $@ -B talk.txt
+talk.ps demo.ps: %.ps: %.txt Makefile
+       a2ps -1 -o $@.1.tmp -B $<
+       pstops <$@.1.tmp >$@ '0@0.94(7mm,7.5mm)'
+
+usb=/media/usb1
+
+for-printing: talk.pdf demo.pdf
+       mount $(usb)
+       cp $^ $(usb)/.
+       umount $(usb)
 
 install: slides.pdf talk.txt
        rsync -vP $^ ijackson@chiark:public-html/2018/debconf-gdr-talk/