From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 27 Jul 2018 14:06:31 +0000 (+0100)
Subject: wip
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=c9b9b16b64b138996b55fe5ef141e399fa00a62b;p=talk-2018-dc18-gdr.git

wip
---

diff --git a/Makefile b/Makefile
index 5791a6b..f2f8a1b 100644
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,24 @@ SLIDES+= dm-1
 SLIDES+= dm-2
 SLIDES+= dm-3
 SLIDES+= dm-4
-SLIDES+= dm-5
 SLIDES+= dm-6
+SLIDES+= dm-wreck # made from 5
 #SLIDES+= manpage
 
+# layers
+#    X0    text
+#    X1    circles
+#    X2    edges
+#   1X0-9  "master" note
+# for
+#    X =
+#      1      [1]
+#      2      [2]
+#      3      [3]
+#      4      [4]
+#      6      [5]
+
+
 SLIDEFILES=$(addsuffix .ps, $(SLIDES))
 
 o= >$@.new && mv -f $@.new $@
@@ -22,6 +36,10 @@ 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$*0:1$*9 <$@.1 $o
 
+dm-wreck.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:59,150:159 <$@.1 $o
+
 %.eps:   %.fig
 	iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1
 	# wtf!
diff --git a/conflict.txt b/conflict.txt
new file mode 100644
index 0000000..36a0f41
--- /dev/null
+++ b/conflict.txt
@@ -0,0 +1,13 @@
+CONFLICT (content): Merge conflict in README.md
+error: Failed to merge in the changes.
+Patch failed at 0002 decruft README for Debian
+The copy of the patch that failed is found in: .git/rebase-apply/patch
+
+When you have resolved this problem, run "git rebase --continue".
+If you prefer to skip this patch, run "git rebase --skip" instead.
+To check out the original branch and stop rebasing, run "git rebase --abort".
+
+git-debrebase: failed command: git rebase --onto 758a5851d24245ad9a0b872785623a3f7318dcdc b2d744310556e48b37cf98d6385c554b5e9a405a
+
+git-debrebase: error: subprocess failed with error exit status 128
+$
diff --git a/txt2ps b/txt2ps
new file mode 100755
index 0000000..b8d9738
--- /dev/null
+++ b/txt2ps
@@ -0,0 +1,23 @@
+#!/usr/bin/perl -w
+
+use strict;
+
+my $fs=11;
+
+print "
+\%!
+ /Courier findfont $fs scalefont setfont
+ 0 800 moveto
+" or die;
+
+print "gsave 1 setgray 0 $fs rlineto stroke grestore\n" or die $!;
+
+while (<STDIN>) {
+    chomp or die;
+    print "gsave (" or die;
+    s/[\\()]/\\$&/g;
+    print or die $!;
+    print ") show grestore 0 -$fs rmoveto\n" or die $!;
+}
+
+print "1 setgray 0 $fs rmoveto 1 1 rlineto stroke showpage\n" or die $!;