From f834a10091f280040b067af3829375f87e7d7657 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 29 Jul 2018 10:02:25 +0100 Subject: [PATCH] wip rebase -i slide --- .gitignore | 1 + Makefile | 8 ++++++++ dm.fig | 3 +++ helm-rebase.png | Bin 0 -> 11434 bytes 4 files changed, 12 insertions(+) create mode 100644 helm-rebase.png diff --git a/.gitignore b/.gitignore index cdeb732..281dee4 100644 --- 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 9d45b7d..4240b22 100644 --- 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 d90c2a8..3c96b85 100644 --- 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 index 0000000000000000000000000000000000000000..c2f122d8c00cf3ccd9e588c8ee21b81377f7f329 GIT binary patch literal 11434 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%0Dl_2k~1;q5mxrG{|2%S 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 f7>%PeF^JRD_JPyq7B}+FU