eliminate BaseLineStyle global. keep default linestyle in gvc.

diff --git a/lib/common/arrows.c b/lib/common/arrows.c
index 7528a4ef8d4f92717ee4b496aae73969b03cf12f..3268bd91455f73d8c418cafe8e859ba78f268311 100644 (file)
--- a/lib/common/arrows.c
+++ b/lib/common/arrows.c
@@ -516,7 +516,7 @@ void arrow_newgen(GVC_t * gvc, pointf p, pointf u, double scale, int flag)
     /* Dotted and dashed styles on the arrowhead are ugly (dds) */
     /* linewidth needs to be reset */
     gvrender_begin_context(gvc);
-    gvrender_set_style(gvc, BaseLineStyle);
+    gvrender_set_style(gvc, gvc->defaultlinestyle);
 
     /* generate arrowhead vector */
     u.x -= p.x;

diff --git a/lib/common/emit.c b/lib/common/emit.c
index 88b269214afd928c18cf9b4d20e63064e9c386df..239a3b1515b48a9fc5e89a6a67b9bdf0d956d11a 100644 (file)
--- a/lib/common/emit.c
+++ b/lib/common/emit.c
@@ -31,7 +31,7 @@
 
 #define MAX_CODEGENS 100
 
-char *BaseLineStyle[3] = { "solid\0", "setlinewidth\0001\0", 0 };
+static char *defaultlinestyle[3] = { "solid\0", "setlinewidth\0001\0", 0 };
 int Obj;
 static attrsym_t *G_peripheries;
 
@@ -659,7 +659,7 @@ void emit_attachment(GVC_t * gvc, textlabel_t * lp, splines * spl)
     A[1] = pointof(A[0].x - sz.x, A[0].y);
     A[2] = dotneato_closest(spl, lp->p);
     /* Don't use edge style to draw attachment */
-    gvrender_set_style(gvc, BaseLineStyle);
+    gvrender_set_style(gvc, gvc->defaultlinestyle);
     /* Use font color to draw attachment
        - need something unambiguous in case of multicolored parallel edges
        - defaults to black for html-like labels
@@ -1015,6 +1015,9 @@ static void init_gvc_from_graph(GVC_t * gvc, graph_t * g)
     gvc->defaultfontsize = late_double(g->proto->n, N_fontsize, DEFAULT_FONTSIZE,
                    MIN_FONTSIZE);
 
+    /* default line style */
+    gvc->defaultlinestyle = defaultlinestyle;
+
     gvc->graphname = g->name;
     gvc->lib = Lib;
 }

diff --git a/lib/common/globals.h b/lib/common/globals.h
index 022eaef871ab29db4a0ebc4b7a95cc329a0d4a1b..c8b7d1a64af2d03bdc1bd1cd8d003849785c8206 100644 (file)
--- a/lib/common/globals.h
+++ b/lib/common/globals.h
@@ -102,7 +102,6 @@ extern "C" {
     EXTERN double yf_off;               /* y_off in inches */
     EXTERN attrsym_t *g_draw;
     EXTERN attrsym_t *g_l_draw;
-    external char *BaseLineStyle[];    /* solid, width = 1 */
 
     EXTERN attrsym_t
        * N_height, *N_width, *N_shape, *N_color, *N_fillcolor,

diff --git a/lib/common/htmltable.c b/lib/common/htmltable.c
index 1c4db36e5ed2be1715e28b4960c037294a79a202..b9c442292b2cc4437747cbd1bb1b41f3dcefe0e6 100644 (file)
--- a/lib/common/htmltable.c
+++ b/lib/common/htmltable.c
@@ -376,7 +376,7 @@ emit_html_label(GVC_t * gvc, htmllabel_t * lp, textlabel_t * tp, void *obj)
        /* set basic graphics context */
        gvrender_begin_context(gvc);
        /* Need to override line style set by node. */
-       gvrender_set_style(gvc, BaseLineStyle);
+       gvrender_set_style(gvc, gvc->defaultlinestyle);
        if (tbl->data.pencolor)
            gvrender_set_pencolor(gvc, tbl->data.pencolor);
        else

diff --git a/lib/gvc/gvcint.h b/lib/gvc/gvcint.h
index 6f2e1778f32ff7b025ed6c205555f2451b5ba901..2aa538945ea5e701adcca4709f09e1f65b902f01 100644 (file)
--- a/lib/gvc/gvcint.h
+++ b/lib/gvc/gvcint.h
@@ -180,6 +180,9 @@ extern "C" {
        char *defaultfontname;
        double defaultfontsize;
 
+       /* default line style */
+       char **defaultlinestyle;
+
        gvstyle_t styles[MAXNEST]; /* style stack - reused by each job */
        int SP;