generate ui-plan-*.overlay-info

diff --git a/layout/.cvsignore b/layout/.cvsignore
index 2bec486a322b011b194f7dcd83d37acf749bd453..bf50641248768de5a1b073c928f650139446d9ab 100644 (file)
--- a/layout/.cvsignore
+++ b/layout/.cvsignore
@@ -16,6 +16,7 @@ compose-segenco
 tmp.*
 ui-plan-*.ppm
 ui-plan-*.crop-info
+ui-plan-*.overlay-info
 parts.ps
 *-a.ps
 ours.graph.c

diff --git a/layout/Makefile b/layout/Makefile
index 2af037c4f0832e16a0f2d42d29abeb64239650eb..e7c74fe60829e936cb7d90aa32e025db378125f4 100644 (file)
--- a/layout/Makefile
+++ b/layout/Makefile
@@ -87,6 +87,9 @@ compose-segenco: compose-segenco.o
 %.redacted.segjoins: %.redactgraph
                ./$< $(REDACT) consistency printforlayoutsegjoins $o
 
+%.redacted.for-ui: %.redactgraph
+               ./$< consistency trivpairnodes trivnullnodes printforui $o
+
 %.layout-data.c: data2safety %.wiring %.redacted.forsafety \
                        reversers.pin-info detectors.pin-info
                ./$(filter-out %.pin-info, $^) $o
@@ -175,6 +178,13 @@ ui-plan-%.ppm:     ours.dgram-%.pa.segenco.ppm Makefile
 ui-plan-%.crop-info: ui-plan-%.ppm
                @:
 
+ui-plan-%.overlay-info: ui-plan-%.crop-info ours.redacted.for-ui Makefile
+               perl -ne 'm/^pnmcrop: cropping (\d+) \w+ off the (\w+)$$/' \
+                     -e ' and print "layout-dgram-cropped $$2 $$1\n";' \
+                       <ui-plan-$*.crop-info >$@.new
+               egrep '^[^#]' <ours.redacted.for-ui >>$@.new
+               mv -f $@.new $@
+
 subseg2display.o compose-segenco.o: segcmap.h
 
 clean:
@@ -189,7 +199,8 @@ 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
+               -rm -f tmp.* ui-plan-*.ppm ui-plan-*.crop-info
+               -rm -f ui-plan-*.crop-info.raw
 
 .PRECIOUS:     $(OPRINTS)
 .PRECIOUS:     %.segcmap %.segcmapreq %.segenco.ppm %.d4 %.neato %.raw.neato