Fix bug 2211 and warn about orthogonal edges not handling edge labels.

diff --git a/lib/dotgen/dotsplines.c b/lib/dotgen/dotsplines.c
index a573c722a0100ce332c8f7f9268e3e3727579908..0e69e8e5a051af7be3a5d37a77669e833c33ae01 100644 (file)
--- a/lib/dotgen/dotsplines.c
+++ b/lib/dotgen/dotsplines.c
@@ -252,7 +252,7 @@ setEdgeLabelPos (graph_t * g)
            else if ((l = ND_label(n))) {// label of regular edge
                place_vnlabel(n);
            }
-           updateBB(g, l);
+           if (l) updateBB(g, l);
        }
     }
 }

diff --git a/lib/ortho/ortho.c b/lib/ortho/ortho.c
index b8cfbdd43a8554f3f23d477590fa0873165c9313..e0ddbe2c1864c6ef8a44055b12ce4da308e0e622 100644 (file)
--- a/lib/ortho/ortho.c
+++ b/lib/ortho/ortho.c
@@ -1284,6 +1284,10 @@ orthoEdges (Agraph_t* g, int doLbls)
        }
     }
 #endif
+    if (doLbls) {
+       agerr(AGWARN, "Orthogonal edges do not currently handle edge labels. Try using xlabels.\n");
+       doLbls = 0;
+    }
     mp = mkMaze (g, doLbls);
     sg = mp->sg;
 #ifdef DEBUG