@@ -4,7 +4,12 @@ setMethod("getPoints", "xyPoint", function(object) c(object@x, object@y))

 setMethod("show", "xyPoint", function(object)

           cat(paste("x: ", object@x, ", y: ", object@y, "\n", sep="")))

-setMethod("labelText", "AgTextLabel", function(object) object@labelText)

+setMethod("labelText", "AgTextLabel", function(object) {

+    text <- object@labelText

+    text <- gsub('\\n', '\n', text, fixed=T)

+    text <- gsub('\\r', '\r', text, fixed=T) # only these two as per Graphviz lib/common/labels.c:make_simple_label

+    return(text)

+})

 setMethod("labelColor", "AgTextLabel", function(object) object@labelColor)

 setMethod("labelLoc", "AgTextLabel", function(object) object@labelLoc)

 setMethod("labelJust", "AgTextLabel", function(object) object@labelJust)

@@ -116,7 +116,7 @@ SEXP getEdgeLocs(Agraph_t *g) {

             if (edge->u.label != NULL) {

                 PROTECT(curLab = NEW_OBJECT(labClass));

                 SET_SLOT(curLab, Rf_install("labelText"),

-                         Rgraphviz_ScalarStringOrNull(ED_label(edge)->u.txt.para->str));

+                         Rgraphviz_ScalarStringOrNull(ED_label(edge)->text));

                 /* Get the X/Y location of the label */

                 PROTECT(curXY = NEW_OBJECT(xyClass));

 #if GRAPHVIZ_MAJOR == 2 && GRAPHVIZ_MINOR > 20

@@ -196,10 +196,10 @@ SEXP getNodeLayouts(Agraph_t *g) {

         PROTECT(curLab = NEW_OBJECT(labClass));

-	if (ND_label(node)  == NULL) {

-	} else if (ND_label(node)->u.txt.para != NULL) {

+        if (ND_label(node)  == NULL) {

+        } else if (ND_label(node)->u.txt.para != NULL) {

             SET_SLOT(curLab, Rf_install("labelText"),

-                     Rgraphviz_ScalarStringOrNull(ND_label(node)->u.txt.para->str));

+                     Rgraphviz_ScalarStringOrNull(ND_label(node)->text));

             snprintf(tmpString, 2, "%c",ND_label(node)->u.txt.para->just);

             SET_SLOT(curLab, Rf_install("labelJust"), Rgraphviz_ScalarStringOrNull(tmpString));