get rid of useless ui-plan-* testcases in favour of proper dgram-bot*

diff --git a/layout/.cvsignore b/layout/.cvsignore
index 25ac19a1121d911c3752539d658b9b3eea52f594..46c49413fadf2c0f40bdbae88d15a5a84ff8c7b9 100644 (file)
--- a/layout/.cvsignore
+++ b/layout/.cvsignore
@@ -3,6 +3,10 @@ ours-*.ps
 *.dgram-*.p*.segenco.ps
 *.dgram-*.p*.segenco.ppm
 *.dgram-*.plandata.c
+*.dgram-*.crop-info
+*.dgram-*.matrix-info
+*.dgram-*.overlay-info
+*.dgram-*.testui.ppm
 *.new
 *.segcmapreq
 *.segcmap
@@ -14,10 +18,6 @@ u.*
 subseg2display
 compose-segenco
 tmp.*
-ui-plan-*.ppm
-ui-plan-*.crop-info
-ui-plan-*.overlay-info
-ui-plan-*.matrix-info
 parts.ps
 *-a.ps
 ours.graph.c

diff --git a/layout/Makefile b/layout/Makefile
index 5c7c5547e05f658911021b62bfb623673cbab4e3..a92539479ef38c8464006f864719b2958624396d 100644 (file)
--- a/layout/Makefile
+++ b/layout/Makefile
@@ -40,7 +40,7 @@ for-test-ui:  ours.graph.c ours.redactgraph ours.raw.neato.ps \
                ours.redacted.neato.ps ours.redacted.shellvars \
                ours.layout-data.o \
                ours.dgram-bot.segcmap ours.dgram-bot.plandata.c \
-               ours.dgram-bot.plandata.o
+               ours.dgram-bot.plandata.o ours.dgram-bot.overlay-info
 
 layers:                $(LAYERS)
 lpages:                $(LPAGES)
@@ -172,24 +172,6 @@ parts.ps:  showlib.d4 layout
 t.ppm:         ours.dgram-bot.pa.segenco.ppm x.gdb subseg2display
                gdb -x x.gdb
 
-ui-plan-%.matrix-info: ours.dgram-%.p0.segenco.ps matrix-demonstrate.ps
-               sed -n '1,/^%L matrix here/p' matrix-demonstrate.ps >$@.ps.new
-               sed -n '/^%L matrix begin/,/^%L matrix end/p' $< >>$@.ps.new
-               sed -e '1,/^%L matrix here/d' matrix-demonstrate.ps >>$@.ps.new
-               gs -sDEVICE=nullpage -dBATCH=1 -q $@.ps.new $o
-
-ui-plan-%.ppm: ours.dgram-%.pa.segenco.ppm
-               pnmcrop -verbose 2>&1 <$< >$@.1.new | tee ui-plan-$*.crop-info
-               pnmflip <$@.1.new -ccw >$@.2.new
-               pnmpad <$@.2.new -white -l5 -r5 -t5 -b5 $o
-
-ui-plan-%.crop-info: ui-plan-%.ppm
-               @:
-
-ui-plan-%.overlay-info: genoverlayinfo \
-       ui-plan-%.crop-info ours.redacted.for-ui ui-plan-%.matrix-info
-               ./$^ $(PLANUI_HEIGHT) $(PLANUI_PSDPI) $o
-
 subseg2display.o compose-segenco.o: segcmap.h
 
 clean:
@@ -204,8 +186,7 @@ clean:
                -rm -f *.dgram-*.p*.segenco.ps *.dgram-*.p*.segenco.ppm
                -rm -f *.dgram-*.plandata.c ours.graph.c ours.layout-data.c
                -rm -f $(CPROGS) *.o *.d ours.redactgraph *.segjoins
-               -rm -f tmp.* ui-plan-*.ppm ui-plan-*.crop-info
-               -rm -f ui-plan-*.crop-info.raw
+               -rm -f tmp.*
 
 .PRECIOUS:     $(OPRINTS)
 .PRECIOUS:     %.segcmap %.segcmapreq %.segenco.ppm %.d4 %.neato %.raw.neato

diff --git a/layout/genoverlayinfo b/layout/genoverlayinfo
index 69574ea6613342f6b6d53b697172039196495aed..872ea9eef2f7abca9af881dc562c72e56d2d0105 100755 (executable)
--- a/layout/genoverlayinfo
+++ b/layout/genoverlayinfo
@@ -51,8 +51,9 @@ while (<U>) {
     $y *= $psdpi / 72.0;
 
     $y= $height - $y;
-#    $x -= $crop{'left'};
-#    $y -= $crop{'top'};
+
+    $x -= $crop{'left'};
+    $y -= $crop{'top'};
 
     printf "%s %d %d\n", $lhs, $x, $y or die $!;
 }

diff --git a/layout/make-dgram-make b/layout/make-dgram-make
index 18d0b2d0377694b5c9b9f7d5d50e1420725f02dc..f801cb3e9c8bc513d48df29c78d9de04a2fb8cf2 100755 (executable)
--- a/layout/make-dgram-make
+++ b/layout/make-dgram-make
@@ -3,20 +3,35 @@ set -e
 stem=$1
 echo '# autogenerated'
 while read dgram args; do
-       cat <<END
-$stem.dgram-$dgram.run-layout: $stem.d4 layout $stem.dgram.m
-       printf '#!/bin/sh -ex\n\$(LAYOUT) "\$\$@" %s \$<\n' "$args" >\$@.new
-       chmod +x \$@.new && mv -f \$@.new \$@
+       sed -e "
+               s/BASE/STEM.dgram-DGRAM/g;
+               s/STEM/$stem/g;
+               s/DGRAM/$dgram/g;
+               s/ARGS/$args/g;
+       " <<'END'
 
-$stem.dgram-$dgram.matrix-info: \
-  ours.dgram-%.p0.segenco.ps matrix-demonstrate.ps
-END
-       cat <<'END'
+BASE.run-layout:       STEM.d4 layout STEM.dgram.m
+       printf '#!/bin/sh -ex\n$(LAYOUT) "$$@" %s $<\n' "ARGS" >$@.new
+       chmod +x $@.new && mv -f $@.new $@
+
+BASE.matrix-info:      BASE.p0.segenco.ps matrix-demonstrate.ps
                sed -n '1,/^%L matrix here/p' matrix-demonstrate.ps >$@.ps.new
                sed -n '/^%L matrix begin/,/^%L matrix end/p' $< >>$@.ps.new
                sed -e '1,/^%L matrix here/d' matrix-demonstrate.ps >>$@.ps.new
                gs -sDEVICE=nullpage -dBATCH=1 -q $@.ps.new $o
 
+BASE.crop-info:                BASE.testui.ppm
+               @:
+
+BASE.testui.ppm:       BASE.pa.segenco.ppm
+               pnmcrop -verbose 2>&1 <$< >$@.1.new | tee BASE.crop-info
+               pnmflip <$@.1.new -ccw >$@.2.new
+               pnmpad <$@.2.new -white -l5 -r5 -t5 -b5 $o
+
+BASE.overlay-info:     genoverlayinfo \
+       BASE.crop-info STEM.redacted.for-ui BASE.matrix-info
+               ./$^ $(PLANUI_HEIGHT) $(PLANUI_PSDPI) $o
 
 END
+
 done