Add penwidth edge attribute.

diff --git a/lib/common/emit.c b/lib/common/emit.c
index 7c15cd2e3f0e52536c33fb1e741f229d59d029e4..9a8ff0b5c90dea5bffc3620d0bfe443b02e7bd8b 100644 (file)
--- a/lib/common/emit.c
+++ b/lib/common/emit.c
@@ -1271,6 +1271,7 @@ static void emit_edge_graphics(GVJ_t * job, edge_t * e)
     splinesf offspl, tmpspl;
     pointf pf0, pf1, pf2 = { 0, 0 }, pf3, *offlist, *tmplist;
     double scale, numc2;
+    double penwidth;
     char *p;
 
 #define SEP 2.0
@@ -1293,10 +1294,8 @@ static void emit_edge_graphics(GVJ_t * job, edge_t * e)
        scale = late_double(e, E_arrowsz, 1.0, 0.0);
        color = late_string(e, E_color, "");
 
-       if (color[0] || styles) {
-           if (styles)
-               gvrender_set_style(job, styles);
-       }
+       if (styles) gvrender_set_style(job, styles);
+
        /* need to know how many colors separated by ':' */
        for (p = color; *p; p++)
            if (*p == ':')
@@ -1323,6 +1322,10 @@ static void emit_edge_graphics(GVJ_t * job, edge_t * e)
                        default_pencolor(pencolor, DEFAULT_VISITEDPENCOLOR));
            fillcolor = late_nnstring(e, E_visitedfillcolor, DEFAULT_VISITEDFILLCOLOR);
        }
+       if (E_penwidth && agxget(e,E_penwidth->index)) {
+           penwidth = late_double(e, E_penwidth, 1.0, 0.0);
+           gvrender_set_penwidth(job, penwidth);
+       }
        if (pencolor != color)
            gvrender_set_pencolor(job, pencolor);
        if (fillcolor != color)

diff --git a/lib/common/globals.h b/lib/common/globals.h
index be887a4d81cd663fd560fea0c001965d9d1c1a6f..78b62d78984edf76fa96c39da59bb4c90691df1a 100644 (file)
--- a/lib/common/globals.h
+++ b/lib/common/globals.h
@@ -116,7 +116,8 @@ extern "C" {
        *E_headlabel, *E_taillabel,
        *E_labelfontsize, *E_labelfontname, *E_labelfontcolor,
        *E_labeldistance, *E_labelangle,
-       *E_tailclip, *E_headclip;
+       *E_tailclip, *E_headclip,
+       *E_penwidth;
 
     EXTERN fdpParms_t fdp_parms;
 

diff --git a/lib/common/input.c b/lib/common/input.c
index 207ddf4257dd929d938dadecfe871a3507d17995..ca3d195be950b85bd033c82117b22aa8761856f4 100644 (file)
--- a/lib/common/input.c
+++ b/lib/common/input.c
@@ -712,6 +712,7 @@ void graph_init(graph_t * g, boolean use_rankdir)
     E_comment = agfindattr(g->proto->e, "comment");
     E_tailclip = agfindattr(g->proto->e, "tailclip");
     E_headclip = agfindattr(g->proto->e, "headclip");
+    E_penwidth = agfindattr(g->proto->e, "penwidth");
 }
 
 void graph_cleanup(graph_t *g)

diff --git a/lib/common/types.h b/lib/common/types.h
index 4ba0dda8d9d59742ce3228cb42a3af4ba69ac6b7..7fb9f83fbcdcef6cd9154b5f3c7571ac2546ab3c 100644 (file)
--- a/lib/common/types.h
+++ b/lib/common/types.h
@@ -228,6 +228,7 @@ extern "C" {
        boolean bezier_has_arrows;
        void (*comment) (char *str);
        void (*usershape) (usershape_t *us, boxf b, point * A, int sides, boolean filled);
+       void (*set_penwidth) (double penwidth);
     };
 
     struct codegen_info_s {

diff --git a/lib/gvc/gvrender.c b/lib/gvc/gvrender.c
index 17a0a0755eba7e17fca9e4221e89fe69f81214ee..048d918cc36e409a25a6b46615ec96d13a45e92c 100644 (file)
--- a/lib/gvc/gvrender.c
+++ b/lib/gvc/gvrender.c
@@ -700,7 +700,7 @@ void gvrender_set_style(GVJ_t * job, char **s)
 
     obj->rawstyle = s;
     if (gvre) {
-       while ((p = line = *s++)) {
+       if (s) while ((p = line = *s++)) {
            if (streq(line, "solid"))
                obj->pen = PEN_SOLID;
            else if (streq(line, "dashed"))
@@ -990,3 +990,21 @@ void gvrender_usershape(GVJ_t * job, char *name, pointf * a, int n, boolean fill
     }
 #endif
 }
+
+void gvrender_set_penwidth(GVJ_t * job, double penwidth)
+{
+    gvrender_engine_t *gvre = job->render.engine;
+
+    if (gvre) {
+       job->obj->penwidth = penwidth;
+       /*if (gvre->set_penwidth) gvre->set_penwidth(job, penwidth);*/
+    }
+#ifdef WITH_CODEGENS
+    else {
+       codegen_t *cg = job->codegen;
+
+       if (cg && cg->set_penwidth)
+           cg->set_penwidth(penwidth);
+    }
+#endif
+}