ours.raw.neato.ps from ours.redactgraph

diff --git a/layout/.cvsignore b/layout/.cvsignore
index 4877cda8f842c6e31acb4572db9b1f86a3be633e..87b068e83de46d68759574978a71e9773aed49ee 100644 (file)
--- a/layout/.cvsignore
+++ b/layout/.cvsignore
@@ -17,3 +17,5 @@ parts.ps
 ours.graph.c
 t.*
 ours.redactgraph
+ours.raw.neato.ps
+ours.raw.neato

diff --git a/layout/Makefile b/layout/Makefile
index b4d232f208997c75368b9175cad77f0f5aa2c32b..a5a2d3e9d6f83ac87f0705a0edd841dbad9fa085 100644 (file)
--- a/layout/Makefile
+++ b/layout/Makefile
@@ -22,8 +22,8 @@ CPROGS=               subseg2display compose-segenco
 
 default:       $(CPROGS) for-test-ui
 all:           default lpages layers extras
-for-test-ui:   ours.dgram-bot.segcmap subseg2display \
-               ui-plan-bot.ppm ours.graph.c ours.redactgraph
+for-test-ui:   ours.graph.c ours.redactgraph ours.raw.neato.ps \
+               ours.dgram-bot.segcmap subseg2display ui-plan-bot.ppm
 
 layers:                $(LAYERS)
 lpages:                $(LPAGES)
@@ -48,6 +48,12 @@ subseg2display:      subseg2display.o
 compose-segenco: compose-segenco.o
                $(LINK) $(NETPBM)
 
+%.neato.ps:    %.neato
+               neato -Tps <$< $o
+
+%.raw.neato:   %.redactgraph
+               ./$< printforneato $o
+
 %.redactgraph: %.graph.o redactgraph.o
                $(LINK)
 
@@ -119,4 +125,4 @@ clean:
                -rm -f $(CPROGS) *.o
 
 .PRECIOUS:     $(OPRINTS)
-.PRECIOUS:     %.segcmap %.segcmapreq %.segenco.ppm %.d4
+.PRECIOUS:     %.segcmap %.segcmapreq %.segenco.ppm %.d4 %.neato

diff --git a/layout/redactgraph.c b/layout/redactgraph.c
index 129310efc24151d14ddac3681804fdc7302d1929..a7945bb1e8f3743514d093deb9359012ad05c0fd 100644 (file)
--- a/layout/redactgraph.c
+++ b/layout/redactgraph.c
@@ -239,7 +239,10 @@ static void printforneato(void) {
   output("digraph L {\n");
 
   for (node=all_nodes.head; node; node=node->next) {
-    output("  n%pO -> n%pI [len=0];\n",
+    output("  n%pO [label=\"O\"];\n"
+          "  n%pI [label=\"+\"];\n",
+          node, node);
+    output("  n%pO -> n%pI [len=0.25 arrowsize=0];\n",
           node, node);
     for (side=0; side<2; side++) {
       for (edgeend=node->sides[side].head; edgeend; edgeend=edgeend->next) {