From: Ian Jackson Date: Fri, 27 Jul 2018 12:41:43 +0000 (+0100) Subject: wip X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=37561633a10dda2585b28b08c5efb4d22218f523;p=talk-2018-dc18-gdr.git wip --- diff --git a/Makefile b/Makefile index b8e0ea0..4fc11d6 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ all: slides.pdf talk.ps dm-%.ps: dm.fig iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1 - LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+1:$*9 <$@.1 $o + LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+1:$*9,1$*0:1$*9 <$@.1 $o %.eps: %.fig iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1 diff --git a/dm.fig b/dm.fig index 78ed681..092fac9 100644 --- a/dm.fig +++ b/dm.fig @@ -7,14 +7,14 @@ A4 Single -2 1200 2 -6 5490 -2760 5685 -2610 -4 0 0 30 -1 14 20 0.0000 4 150 195 5490 -2610 e\001 +6 3195 -2805 3390 -2610 +4 0 0 30 -1 14 20 0.0000 4 195 195 3195 -2610 D\001 -6 6 4590 -2820 4785 -2565 -4 0 0 30 -1 14 20 0.0000 4 255 195 4590 -2610 @\001 +4 0 0 40 -1 14 20 0.0000 4 255 195 4590 -2610 @\001 -6 -6 3195 -2805 3390 -2610 -4 0 0 30 -1 14 20 0.0000 4 195 195 3195 -2610 D\001 +6 5490 -2760 5685 -2610 +4 0 0 40 -1 14 20 0.0000 4 150 195 5490 -2610 e\001 -6 1 3 0 2 0 7 11 -1 20 0.000 1 0.0000 900 -2700 225 225 900 -2700 1125 -2700 1 3 0 2 0 7 11 -1 20 0.000 1 0.0000 1800 -2700 225 225 1800 -2700 2025 -2700 @@ -32,14 +32,33 @@ Single 1 3 0 2 0 7 31 -1 20 0.000 1 0.0000 3330 -2700 225 225 3330 -2700 3555 -2700 2 1 0 2 0 7 22 -1 20 0.000 0 0 -1 0 0 2 2340 -4500 2610 -5400 -2 1 0 2 0 7 42 -1 -1 0.000 0 0 7 0 0 3 - 4590 -2700 5580 -2700 6390 -5400 2 1 0 2 0 7 32 -1 -1 0.000 0 0 7 0 0 3 1980 -2700 3330 -2700 4140 -5400 2 1 0 2 0 7 12 -1 -1 0.000 0 0 -1 0 0 3 450 -2700 1800 -2700 2340 -4500 2 1 1 2 0 7 12 -1 -1 6.000 0 0 7 0 0 2 450 -2700 0 -2700 +2 1 0 2 0 7 42 -1 -1 0.000 0 0 7 0 0 2 + 4410 -1800 4664 -2691 +2 1 0 2 0 7 42 -1 -1 0.000 0 0 7 0 0 3 + 3375 -2700 5580 -2700 6390 -5400 +2 2 0 2 0 7 120 -1 -1 0.000 0 0 7 0 0 5 + 1485 -5310 2295 -5310 2295 -5490 1485 -5490 1485 -5310 +2 2 0 2 0 7 130 -1 -1 0.000 0 0 7 0 0 5 + 3015 -5310 3825 -5310 3825 -5490 3015 -5490 3015 -5310 +2 2 0 2 0 7 110 -1 -1 0.000 0 0 7 0 0 5 + 1215 -4410 2025 -4410 2025 -4590 1215 -4590 1215 -4410 +2 2 0 2 0 7 140 -1 -1 0.000 0 0 7 0 0 5 + 5265 -5310 6075 -5310 6075 -5490 5265 -5490 5265 -5310 +3 2 0 2 0 7 42 -1 -1 0.000 0 0 0 3 + 3780 -1575 3195 -1935 2700 -1530 + 0.000 -1.000 0.000 +3 2 0 2 0 7 42 -1 -1 0.000 0 0 0 3 + 2700 -1530 2115 -1890 1620 -1485 + 0.000 -1.000 0.000 +3 2 0 2 0 7 42 -1 20 0.000 0 0 0 3 + 4860 -1620 4275 -1980 3780 -1575 + 0.000 -1.000 0.000 4 0 0 10 -1 14 20 0.0000 4 210 195 2250 -4410 2\001 4 0 0 10 -1 14 20 0.0000 4 195 195 810 -2610 A\001 4 0 0 10 -1 14 20 0.0000 4 195 195 1710 -2610 B\001 @@ -58,3 +77,9 @@ Single 4 0 0 30 -1 14 20 0.0000 4 90 195 3330 -2610 '\001 4 0 0 30 -1 14 20 0.0000 4 210 195 3465 -3510 1\001 4 0 0 30 -1 14 20 0.0000 4 90 195 3555 -3510 '\001 +4 0 0 40 -1 16 20 0.0000 4 315 2895 1710 -1215 Upstream git history\001 +4 0 0 10 -1 16 20 0.0000 4 240 1650 405 -2160 Breakwater\001 +4 0 0 130 -1 14 12 0.0000 4 120 720 3060 -5355 master\001 +4 0 0 120 -1 14 12 0.0000 4 120 720 1530 -5355 master\001 +4 0 0 110 -1 14 12 0.0000 4 120 720 1260 -4455 master\001 +4 0 0 140 -1 14 12 0.0000 4 120 720 5310 -5355 master\001