From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 28 Jul 2018 07:09:02 +0000 (+0100)
Subject: wip zoom
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=10007f809c40f28f9e550099d14bd8cc53fc5029;p=talk-2018-dc18-gdr.git

wip zoom
---

diff --git a/.gitignore b/.gitignore
index a5d594e..fde9a91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 dm-*.ps
-dm-*.ps.1
 slides.pdf
 slides.ps
 conflict.txt.eps
+dm-for-zoom.eps
 *.tmp
+*.1
diff --git a/Makefile b/Makefile
index 03c68f0..666a906 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,7 @@ SLIDES+= dm-pre-wreck
 SLIDES+= dm-wreck # made from 4
 SLIDES+= dm-post-wreck
 SLIDES+= dm-6
+# dm-for-zoom is made from 6
 #SLIDES+= manpage
 
 # layers
@@ -20,6 +21,7 @@ SLIDES+= dm-6
 #   1X0-9  "master" note
 #   1X3    not included in pre-wreck
 #   151    included in rebase-again
+#    19    not in zoom
 # for
 #    X =
 #      1      [1]
@@ -66,6 +68,11 @@ dm-wreck.ps: dm.fig conflict.txt.eps
 	# wtf!
 	LC_CTYPE=en_GB fig2dev -L eps <$@.1 $o
 
+dm-for-zoom.eps: dm.fig
+	iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1
+	# wtf!
+	LC_CTYPE=en_GB fig2dev -L eps -D+10:18,20:69,160:168  <$@.1 $o
+
 manpage.ps: dgit.1-manpage Makefile
 	man -Tps -l $< >$@.1
 	pstops -pa3 '100:0@1.7(-4cm,-47cm)' <$@.1 >$@.2
diff --git a/dm.fig b/dm.fig
index eb89322..ad2079f 100644
--- a/dm.fig
+++ b/dm.fig
@@ -163,8 +163,8 @@ Single
 4 0 0 1 -1 14 24 0.0000 4 255 480 5895 -4410 X3\001
 4 0 0 1 -1 16 24 0.0000 4 300 2340 6660 -7920 failed rebase\001
 4 0 0 150 -1 16 24 0.0000 4 375 3540 6255 -7920 after new-upstream\001
-4 0 0 10 -1 16 24 0.0000 4 390 7260 -900 -7920 git-debrebase - commit history structure\001
-4 0 0 160 -1 16 24 0.0000 4 375 2160 6255 -7920 after upload\001
+4 0 0 19 -1 16 24 0.0000 4 390 7260 -900 -7920 git-debrebase - commit history structure\001
+4 0 0 169 -1 16 24 0.0000 4 375 2160 6255 -7920 after upload\001
 4 0 0 133 -1 16 24 0.0000 4 390 3435 6255 -7920 after git-debrebase\001
 4 0 0 4 -1 16 24 0.0000 4 300 2745 6255 -7920 aborted rebase\001
 4 0 0 61 -1 0 15 0.0000 4 225 1290 5490 -7110 pseudomerge\001
diff --git a/zoom.fig b/zoom.fig
new file mode 100644
index 0000000..544832b
--- /dev/null
+++ b/zoom.fig
@@ -0,0 +1,13 @@
+#FIG 3.2  Produced by xfig version 3.2.6a
+Landscape
+Center
+Metric
+A4
+100.00
+Single
+-2
+1200 2
+0 32 #888888
+2 5 0 1 0 -1 50 -1 -1 0.000 0 0 -1 0 0 5
+	0 dm-5.ps
+	 5175 -8220 1568 -8220 1568 -5671 5175 -5671 5175 -8220