wip rebase -i slide

diff --git a/.gitignore b/.gitignore
index cdeb73254cb7f77126ff6ffa1dd14e733f0ab7cb..281dee42ebdd10689ad2d81401aacbf7d9051aca 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ dm-*.ps
 usp-*.ps
 zoom.ps
 refs.ps
+helm-rebase-crop.ppm
 context.ps
 slides.pdf
 slides.ps

diff --git a/Makefile b/Makefile
index 9d45b7d47615e0a6aa7ad98d8934f8ce593cf1ff..4240b221776967620ceb4278009d729fb4120df6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@ SLIDES+= usp-2
 SLIDES+= usp-3
 SLIDES+= dm-1
 SLIDES+= dm-2
+SLIDES+= dm-before-rebase
 SLIDES+= dm-3
 SLIDES+= dm-5
 SLIDES+= dm-6
@@ -56,6 +57,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+110:1$*9,2$*0:2$*9 <$@.1 $o
 
+dm-before-rebase.ps: dm.fig
+       iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1
+       LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+24,110:129,220:229 <$@.1 $o
+
 dm-rebase-again.ps: dm.fig conflict.txt.eps
        ./greyout <$< >$@.fig.tmp
        iconv <$@.fig.tmp >$@.1 -f UTF-8 -t ISO-8859-1
@@ -77,6 +82,9 @@ 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 >$@
+
 %.eps:   %.fig
        iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1
        # wtf!

diff --git a/dm.fig b/dm.fig
index d90c2a8d39a558cfc81e131c107132ab10d2ebee..3c96b85f94d89ce91d063c3da40a9fd26899dd17 100644 (file)
--- a/dm.fig
+++ b/dm.fig
@@ -114,6 +114,9 @@ Single
         -675 -7020 1080 -7020 1080 -7200 -675 -7200 -675 -7020
 2 2 0 2 7 7 999 -1 -1 0.000 0 0 -1 0 0 5
         -1080 -450 10170 -450 10170 -8235 -1080 -8235 -1080 -450
+2 5 0 1 0 -1 24 -1 -1 0.000 0 0 -1 0 0 5
+       0 helm-rebase-crop.ppm
+        3124 -4830 9990 -4830 9990 -2250 3124 -2250 3124 -4830
 3 2 0 2 0 7 144 -1 -1 0.000 0 0 0 3
         3510 -1260 2925 -1620 2430 -1215
         0.000 -1.000 0.000

diff --git a/helm-rebase.png b/helm-rebase.png
new file mode 100644 (file)
index 0000000..c2f122d
Binary files /dev/null and b/helm-rebase.png differ