Fix bug 1713

diff --git a/lib/neatogen/neatosplines.c b/lib/neatogen/neatosplines.c
index 74d5af20d1fd2de88654639fef8242945c0deda9..151546001da41c310ece5e0693397fac5d88c617 100644 (file)
--- a/lib/neatogen/neatosplines.c
+++ b/lib/neatogen/neatosplines.c
@@ -446,7 +446,7 @@ makeStraightEdge(graph_t * g, edge_t * e, int doPolyline)
         perp.x = dumb[0].y - dumb[3].y;
         perp.y = dumb[3].x - dumb[0].x;
        l_perp = LEN(perp.x, perp.y);
-       xstep = GD_nodesep(g);
+       xstep = GD_nodesep(g->root);
        dx = xstep * (e_cnt - 1) / 2;
        dumb[1].x = dumb[0].x + (dx * perp.x) / l_perp;
        dumb[1].y = dumb[0].y + (dx * perp.y) / l_perp;
@@ -819,7 +819,7 @@ static int _spline_edges(graph_t * g, expand_t* pmargin, int edgetype)
                    P = NEW(path);
                    P->boxes = N_NEW(agnnodes(g) + 20 * 2 * 9, boxf);
                }
-               makeSelfArcs(P, e, GD_nodesep(g));
+               makeSelfArcs(P, e, GD_nodesep(g->root));
            } else if (vconfig) { /* ET_SPLINE or ET_PLINE */
 #ifdef HAVE_GTS
                if ((ED_count(e) > 1) || BOUNDARY_PORT(e)) {
@@ -1084,6 +1084,7 @@ static void scaleBB(graph_t * g, double xf, double yf)
 /* _neato_set_aspect;
  * Assume all bounding boxes are correct and
  * that GD_bb(g).LL is at origin.
+ * Also assume g is the root graph
  */
 static void _neato_set_aspect(graph_t * g)
 {
@@ -1173,7 +1174,9 @@ void neato_set_aspect(graph_t * g)
 {
     node_t *n;
 
-    _neato_set_aspect(g);
+       /* setting aspect ratio only makes sense on root graph */
+    if (g->root == g)
+       _neato_set_aspect(g);
     for (n = agfstnode(g); n; n = agnxtnode(g, n)) {
        ND_coord(n).x = POINTS_PER_INCH * (ND_pos(n)[0]);
        ND_coord(n).y = POINTS_PER_INCH * (ND_pos(n)[1]);

diff --git a/lib/twopigen/twopiinit.c b/lib/twopigen/twopiinit.c
index 66c978107f38186d14130dd18508b981de20237a..95075c0867c2980f69c45c441b5fa1db13a9b562 100644 (file)
--- a/lib/twopigen/twopiinit.c
+++ b/lib/twopigen/twopiinit.c
@@ -105,9 +105,9 @@ void twopi_layout(Agraph_t * g)
                nodeInduce(sg);
                circleLayout(sg, c);
                adjustNodes(sg);
+               spline_edges(sg);
            }
            free(ND_alg(agfstnode(g)));
-           spline_edges(g);
            packSubgraphs(ncc, ccs, g, &pinfo);
        }
        for (i = 0; i < ncc; i++) {