shorter pnames from trivpairnodes

diff --git a/layout/redactgraph.c b/layout/redactgraph.c
index b03df43c715538f3189cf578cc3dcfa8c328f1e4..70953b41215053bdc5ea3ffd7d7cf2e2e0374c9e 100644 (file)
--- a/layout/redactgraph.c
+++ b/layout/redactgraph.c
@@ -1,4 +1,9 @@
-/**/
+/*
+ */
+/* for debugging, runes like
+ *  ./ours.redactgraph consistency movfeatsplitedges consistency movfeatrmstubs consistency movfeatsplitnodes consistency trivpairnodes consistency trivnullnodes consistency printforneato | neato -Tps >u.ps
+ * are often useful.
+ */
 
 #include <stdarg.h>
 #include <string.h>
@@ -529,8 +534,10 @@ static void trivpairnodes(void) {
       continue;
     }
     trace(" yes:\n");
-    rightedge->edge->pname=
-      masprintf("%s+%s", leftedge->edge->pname, rightedge->edge->pname);
+    if (!strchr(rightedge->edge->pname, '+')) {
+      rightedge->edge->pname=
+       masprintf("%s+", rightedge->edge->pname);
+    }
     rightedge->edge->distance += leftedge->edge->distance;
     edgeend_replumb(rightedge, edgeend_otherend(leftedge)->node);
     edge_delete(leftedge);