Make sure ND_rw value is retored when splines=ortho

diff --git a/lib/dotgen/dotsplines.c b/lib/dotgen/dotsplines.c
index 4bc5304a3e9fe5d75a7880f14f63cd591cb482e8..2b1adeb8574c893d20b2c7a3ccdade2196a7d470 100644 (file)
--- a/lib/dotgen/dotsplines.c
+++ b/lib/dotgen/dotsplines.c
@@ -208,6 +208,26 @@ static void edge_normalize(graph_t * g)
     }
 }
 
+/* resetRW:
+ * In position, each node has its rw stored in mval and,
+ * if a node is part of a loop, rw may be increased to
+ * reflect the loops and associated labels. We restore
+ * the original value here. 
+ */
+static void
+resetRW (graph_t * g)
+{
+    node_t* n;
+
+    for (n = agfstnode(g); n; n = agnxtnode(g,n)) {
+       if (ND_other(n).list) {
+           double tmp = ND_rw(n);
+           ND_rw(n) = ND_mval(n);
+           ND_mval(n) = tmp;
+       }
+    }
+}
+
 /* _dot_splines:
  * Main spline routing code.
  * The normalize parameter allows this function to be called by the
@@ -232,6 +252,7 @@ static void _dot_splines(graph_t * g, int normalize)
     if (et == ET_NONE) return; 
 #ifdef ORTHO
     if (et == ET_ORTHO) {
+       resetRW (g);
        orthoEdges (g, 0);
        goto finish;
     }