From: Emden Gansner <erg@research.att.com>
Date: Tue, 15 May 2012 15:37:40 +0000 (-0400)
Subject: Don't do edge xlabels if splines=none
X-Git-Tag: LAST_LIBGRAPH~32^2~418
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ed62b1d65c23087c173024adc6a901eb1fa1041f;p=graphviz

Don't do edge xlabels if splines=none
---

diff --git a/lib/common/postproc.c b/lib/common/postproc.c
index 1c8a0635d..90e28092f 100644
--- a/lib/common/postproc.c
+++ b/lib/common/postproc.c
@@ -418,6 +418,7 @@ static void addXLabels(Agraph_t * gp)
     object_t* objp;
     xlabel_t* xlp;
     Agsym_t* force;
+    int et = EDGE_TYPE(gp);
 
     if (!(GD_has_labels(gp) & NODE_XLABEL) &&
 	!(GD_has_labels(gp) & EDGE_XLABEL) &&
@@ -437,25 +438,25 @@ static void addXLabels(Agraph_t * gp)
 	    if (ED_xlabel(ep)) {
 		if (ED_xlabel(ep)->set)
 		    n_set_lbls++;
-		else
+		else if (et != ET_NONE)
 		    n_elbls++;
 	    }
 	    if (ED_head_label(ep)) {
 		if (ED_head_label(ep)->set)
 		    n_set_lbls++;
-		else
+		else if (et != ET_NONE)
 		    n_elbls++;
 	    }
 	    if (ED_tail_label(ep)) {
 		if (ED_tail_label(ep)->set)
 		    n_set_lbls++;
-		else
+		else if (et != ET_NONE)
 		    n_elbls++;
 	    }
 	    if (ED_label(ep)) {
 		if (ED_label(ep)->set)
 		    n_set_lbls++;
-		else
+		else if (et != ET_NONE)
 		    n_elbls++;
 	    }
 	}
@@ -495,7 +496,7 @@ static void addXLabels(Agraph_t * gp)
 		if (lp->set) {
 		    bb = addLabelObj (lp, objp, bb);
 		}
-		else {
+		else if (et != ET_NONE) {
 		    addXLabel (lp, objp, xlp, 1, edgeMidpoint(gp, ep)); 
 		    xlp++;
 		}
@@ -505,7 +506,7 @@ static void addXLabels(Agraph_t * gp)
 		if (lp->set) {
 		    bb = addLabelObj (lp, objp, bb);
 		}
-		else {
+		else if (et != ET_NONE) {
 		    addXLabel (lp, objp, xlp, 1, edgeTailpoint(ep)); 
 		    xlp++;
 		}
@@ -515,7 +516,7 @@ static void addXLabels(Agraph_t * gp)
 		if (lp->set) {
 		    bb = addLabelObj (lp, objp, bb);
 		}
-		else {
+		else if (et != ET_NONE) {
 		    addXLabel (lp, objp, xlp, 1, edgeHeadpoint(ep)); 
 		    xlp++;
 		}
@@ -525,7 +526,7 @@ static void addXLabels(Agraph_t * gp)
 		if (lp->set) {
 		    bb = addLabelObj (lp, objp, bb);
 		}
-		else {
+		else if (et != ET_NONE) {
 		    addXLabel (lp, objp, xlp, 1, edgeMidpoint(gp, ep)); 
 		    xlp++;
 		}