Back out recent GVG_t changes. It broke too much stuff.

diff --git a/cmd/dot/dot.c b/cmd/dot/dot.c
index 79bd29b783e6b54398c12d83bf662271c094026a..d0b94cf26b78a451d6af4192c2979360ee6b94a3 100644 (file)
--- a/cmd/dot/dot.c
+++ b/cmd/dot/dot.c
@@ -168,7 +168,7 @@ int main(int argc, char **argv)
        }
        assert(0);              /* should never exit loop */
     } else {
-       while ((G = gvNextInputGraph(Gvc))) {
+       while ((G = next_input_graph())) {
            if (prev) {
                gvFreeLayout(Gvc, prev);
                agclose(prev);

diff --git a/lib/common/arrows.c b/lib/common/arrows.c
index 44713a88d2bc6fdeab3ec428d7bc9461b094a761..897233eeed4dd26226577a4421ed08c93ede0406 100644 (file)
--- a/lib/common/arrows.c
+++ b/lib/common/arrows.c
@@ -549,13 +549,13 @@ void arrow_newgen(GVJ_t * job, int state, pointf p, pointf u, double scale, int
     int f;
     int oldstate;
 
-    oldstate = job->gvg->emit_state;
-    job->gvg->emit_state = state;
+    oldstate = job->gvc->emit_state;
+    job->gvc->emit_state = state;
 
     /* Dotted and dashed styles on the arrowhead are ugly (dds) */
     /* linewidth needs to be reset */
     gvrender_begin_context(job);
-    gvrender_set_style(job, job->gvg->defaultlinestyle);
+    gvrender_set_style(job, job->gvc->defaultlinestyle);
 
     /* generate arrowhead vector */
     u.x -= p.x;
@@ -578,7 +578,7 @@ void arrow_newgen(GVJ_t * job, int state, pointf p, pointf u, double scale, int
 
     gvrender_end_context(job);
 
-    job->gvg->emit_state = oldstate;
+    job->gvc->emit_state = oldstate;
 }
 
 /* FIXME emit.c and output.c require wrapper for int point coords */

diff --git a/lib/common/diagen.c b/lib/common/diagen.c
index 3812e6f37e5d411818a069d4c147d2ca8b0e245b..b7c31c0ec2150bc287b8662a373b1d8503b367a3 100644 (file)
--- a/lib/common/diagen.c
+++ b/lib/common/diagen.c
@@ -264,7 +264,7 @@ static void dia_end_job(void)
 {
 }
 
-static void dia_begin_graph(GVJ_t * job, graph_t * g, box bb, point pb)
+static void dia_begin_graph(GVC_t * gvc, graph_t * g, box bb, point pb)
 {
     Rootgraph = g;
     PB.LL.x = PB.LL.y = 0;

diff --git a/lib/common/emit.c b/lib/common/emit.c
index fe0b88a10176c11735b8b222697ddf70777f1611..6204aa8d76af75fdaf164b825df9aa15c884f856 100644 (file)
--- a/lib/common/emit.c
+++ b/lib/common/emit.c
@@ -27,38 +27,38 @@ int    emitState;
 
 /* parse_layers:
  * Split input string into tokens, with separators specified by
- * the layersep attribute. Store the values in the gvg->layerIDs array,
+ * the layersep attribute. Store the values in the gvc->layerIDs array,
  * starting at index 1, and return the count.
  * Free previously stored list. Note that there is no mechanism
  * to free the memory before exit.
  */
-static int parse_layers(GVG_t *gvg, graph_t * g, char *p)
+static int parse_layers(GVC_t *gvc, graph_t * g, char *p)
 {
     int ntok;
     char *tok;
     int sz;
 
-    gvg->layerDelims = agget(g, "layersep");
-    if (!gvg->layerDelims)
-        gvg->layerDelims = DEFAULT_LAYERSEP;
+    gvc->layerDelims = agget(g, "layersep");
+    if (!gvc->layerDelims)
+        gvc->layerDelims = DEFAULT_LAYERSEP;
 
     ntok = 0;
     sz = 0;
-    gvg->layers = strdup(p);
+    gvc->layers = strdup(p);
 
-    for (tok = strtok(gvg->layers, gvg->layerDelims); tok;
-         tok = strtok(NULL, gvg->layerDelims)) {
+    for (tok = strtok(gvc->layers, gvc->layerDelims); tok;
+         tok = strtok(NULL, gvc->layerDelims)) {
         ntok++;
         if (ntok > sz) {
             sz += SMALLBUF;
-            gvg->layerIDs = ALLOC(sz, gvg->layerIDs, char *);
+            gvc->layerIDs = ALLOC(sz, gvc->layerIDs, char *);
         }
-        gvg->layerIDs[ntok] = tok;
+        gvc->layerIDs[ntok] = tok;
     }
     if (ntok) {
-        gvg->layerIDs = RALLOC(ntok + 2, gvg->layerIDs, char *);        /* shrink to minimum size */
-        gvg->layerIDs[0] = NULL;
-        gvg->layerIDs[ntok + 1] = NULL;
+        gvc->layerIDs = RALLOC(ntok + 2, gvc->layerIDs, char *);        /* shrink to minimum size */
+        gvc->layerIDs[0] = NULL;
+        gvc->layerIDs[ntok + 1] = NULL;
     }
 
     return ntok;
@@ -121,27 +121,27 @@ static void init_job_flags(GVJ_t * job, graph_t * g)
     }
 }
 
-static void init_layering(GVG_t * gvg, graph_t * g)
+static void init_layering(GVC_t * gvc, graph_t * g)
 {
     char *str;
 
     /* free layer strings and pointers from previous graph */
-    if (gvg->layers)
-       free(gvg->layers);
-    if (gvg->layerIDs)
-       free(gvg->layerIDs);
+    if (gvc->layers)
+       free(gvc->layers);
+    if (gvc->layerIDs)
+       free(gvc->layerIDs);
 
     if ((str = agget(g, "layers")) != 0) {
-       gvg->numLayers = parse_layers(gvg, g, str);
+       gvc->numLayers = parse_layers(gvc, g, str);
     } else {
-       gvg->layerIDs = NULL;
-       gvg->numLayers = 1;
+       gvc->layerIDs = NULL;
+       gvc->numLayers = 1;
     }
 }
 
 static void firstlayer(GVJ_t *job)
 {
-    job->numLayers = job->gvg->numLayers;
+    job->numLayers = job->gvc->numLayers;
     if ((job->numLayers > 1)
                && (! (gvrender_features(job) & GVRENDER_DOES_LAYERS))) {
        agerr(AGWARN, "layers not supported in %s output\n",
@@ -187,7 +187,7 @@ static point pagecode(GVJ_t *job, char c)
 
 static void init_job_pagination(GVJ_t * job, graph_t *g)
 {
-    GVG_t *gvg = job->gvg;
+    GVC_t *gvc = job->gvc;
     point pageSize;    /* page size for the graph - device units */
     point imageSize;   /* image size on one page of the graph - device units */
     point margin;      /* margin for a page of the graph - device units */
@@ -199,10 +199,10 @@ static void init_job_pagination(GVJ_t * job, graph_t *g)
        imageSize = exch_xy(imageSize);
 
     /* determine pagination */
-    if (gvg->graph_sets_pageSize) {
+    if (gvc->graph_sets_pageSize) {
        /* page was set by user */
-       pageSize.x = ROUND(gvg->pageSize.x * job->dpi.x / POINTS_PER_INCH);
-       pageSize.y = ROUND(gvg->pageSize.y * job->dpi.y / POINTS_PER_INCH);
+       pageSize.x = ROUND(gvc->pageSize.x * job->dpi.x / POINTS_PER_INCH);
+       pageSize.y = ROUND(gvc->pageSize.y * job->dpi.y / POINTS_PER_INCH);
 
        /* we don't want graph page to exceed its bounding box */
        pageSize.x = MIN(pageSize.x, imageSize.x);
@@ -267,13 +267,13 @@ fprintf(stderr,"margin = %d,%d  imageSize = %d,%d boundingBox = %d,%d %d,%d\n",
     job->pagesArrayMajor.x = job->pagesArrayMajor.y 
                = job->pagesArrayMinor.x = job->pagesArrayMinor.y = 0;
     job->pagesArrayFirst.x = job->pagesArrayFirst.y = 0;
-    job->pagesArrayMajor = pagecode(job, gvg->pagedir[0]);
-    job->pagesArrayMinor = pagecode(job, gvg->pagedir[1]);
+    job->pagesArrayMajor = pagecode(job, gvc->pagedir[0]);
+    job->pagesArrayMinor = pagecode(job, gvc->pagedir[1]);
     if ((abs(job->pagesArrayMajor.x + job->pagesArrayMinor.x) != 1)
      || (abs(job->pagesArrayMajor.y + job->pagesArrayMinor.y) != 1)) {
        job->pagesArrayMajor = pagecode(job, 'B');
        job->pagesArrayMinor = pagecode(job, 'L');
-       agerr(AGWARN, "pagedir=%s ignored\n", gvg->pagedir);
+       agerr(AGWARN, "pagedir=%s ignored\n", gvc->pagedir);
     }
 
 #if 0
@@ -294,7 +294,7 @@ fprintf(stderr,"width,height = %d,%d (device units)\n",
         job->width,
         job->height);
 fprintf (stderr,"pagedir = %s, pagesArrayMajor = %d,%d pagesArrayMinor = %d,%d\n",
-       gvg->pagedir,
+       gvc->pagedir,
        job->pagesArrayMajor.x,
        job->pagesArrayMajor.y,
        job->pagesArrayMinor.x,
@@ -456,24 +456,25 @@ static bool is_natural_number(char *sstr)
     return TRUE;
 }
 
-static int layer_index(GVG_t *gvg, char *str, int all)
+static int layer_index(GVC_t *gvc, char *str, int all)
 {
+    GVJ_t *job = gvc->job;
     int i;
 
     if (streq(str, "all"))
        return all;
     if (is_natural_number(str))
        return atoi(str);
-    if (gvg->layerIDs)
-       for (i = 1; i <= gvg->numLayers; i++)
-           if (streq(str, gvg->layerIDs[i]))
+    if (gvc->layerIDs)
+       for (i = 1; i <= job->numLayers; i++)
+           if (streq(str, gvc->layerIDs[i]))
                return i;
     return -1;
 }
 
 static bool selectedlayer(GVJ_t *job, char *spec)
 {
-    GVG_t *gvg = job->gvg;
+    GVC_t *gvc = job->gvc;
     int n0, n1;
     unsigned char buf[SMALLBUF];
     char *w0, *w1;
@@ -482,20 +483,20 @@ static bool selectedlayer(GVJ_t *job, char *spec)
 
     agxbinit(&xb, SMALLBUF, buf);
     agxbput(&xb, spec);
-    w1 = w0 = strtok(agxbuse(&xb), gvg->layerDelims);
+    w1 = w0 = strtok(agxbuse(&xb), gvc->layerDelims);
     if (w0)
-       w1 = strtok(NULL, gvg->layerDelims);
+       w1 = strtok(NULL, gvc->layerDelims);
     switch ((w0 != NULL) + (w1 != NULL)) {
     case 0:
        rval = FALSE;
        break;
     case 1:
-       n0 = layer_index(gvg, w0, job->layerNum);
+       n0 = layer_index(gvc, w0, job->layerNum);
        rval = (n0 == job->layerNum);
        break;
     case 2:
-       n0 = layer_index(gvg, w0, 0);
-       n1 = layer_index(gvg, w1, job->numLayers);
+       n0 = layer_index(gvc, w0, 0);
+       n1 = layer_index(gvc, w1, job->numLayers);
        if ((n0 < 0) || (n1 < 0))
            rval = TRUE;
        else if (n0 > n1) {
@@ -579,18 +580,18 @@ static bool node_in_box(node_t *n, boxf b)
 
 static void emit_node(GVJ_t * job, node_t * n)
 {
-    GVG_t *gvg = job->gvg;
+    GVC_t *gvc = job->gvc;
     char *s, *url = NULL, *tooltip = NULL, *target = NULL;
     int oldstate, explicit_tooltip = 0;
 
     if (ND_shape(n) == NULL)
        return;
 
-    oldstate = gvg->emit_state;
-    gvg->emit_state = EMIT_NDRAW;
+    oldstate = gvc->emit_state;
+    gvc->emit_state = EMIT_NDRAW;
     if (node_in_layer(job, n->graph, n)
            && node_in_box(n, job->pageBoxClip)
-           && (ND_state(n) != gvg->viewNum)) {
+           && (ND_state(n) != gvc->viewNum)) {
 
         gvrender_comment(job, n->name);
 
@@ -618,7 +619,7 @@ static void emit_node(GVJ_t * job, node_t * n)
        setColorScheme (agget (n, "colorscheme"));
        gvrender_begin_context(job);
        ND_shape(n)->fns->codefn(job, n);
-       ND_state(n) = gvg->viewNum;
+       ND_state(n) = gvc->viewNum;
        gvrender_end_context(job);
 
        if (url || explicit_tooltip)
@@ -628,7 +629,7 @@ static void emit_node(GVJ_t * job, node_t * n)
        free(target);
        gvrender_end_node(job);
     }
-    gvg->emit_state = oldstate;
+    gvc->emit_state = oldstate;
 }
 
 #define EPSILON .0001
@@ -685,7 +686,7 @@ static void emit_attachment(GVJ_t * job, 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(job, job->gvg->defaultlinestyle);
+    gvrender_set_style(job, job->gvc->defaultlinestyle);
     /* Use font color to draw attachment
        - need something unambiguous in case of multicolored parallel edges
        - defaults to black for html-like labels
@@ -753,8 +754,8 @@ void emit_edge_graphics(GVJ_t * job, edge_t * e)
 
 #define SEP 2.0
 
-    oldstate = job->gvg->emit_state;
-    job->gvg->emit_state = EMIT_EDRAW;
+    oldstate = job->gvc->emit_state;
+    job->gvc->emit_state = EMIT_EDRAW;
     style = late_string(e, E_style, "");
     /* We shortcircuit drawing an invisible edge because the arrowhead
      * code resets the style to solid, and most of the code generators
@@ -952,7 +953,7 @@ void emit_edge_graphics(GVJ_t * job, edge_t * e)
 
     if (saved)
        gvrender_end_context(job);
-    job->gvg->emit_state = oldstate;
+    job->gvc->emit_state = oldstate;
 }
 
 static bool edge_in_box(edge_t *e, boxf b)
@@ -980,8 +981,8 @@ static void emit_edge(GVJ_t * job, edge_t * e)
     if (! edge_in_box(e, job->pageBoxClip) || ! edge_in_layer(job, e->head->graph, e))
        return;
 
-    oldstate = job->gvg->emit_state;
-    job->gvg->emit_state = EMIT_EDRAW;
+    oldstate = job->gvc->emit_state;
+    job->gvc->emit_state = EMIT_EDRAW;
     s = malloc(strlen(e->tail->name) + 2 + strlen(e->head->name) + 1);
     strcpy(s,e->tail->name);
     if (AG_IS_DIRECTED(e->tail->graph))
@@ -1018,77 +1019,77 @@ static void emit_edge(GVJ_t * job, edge_t * e)
     free(tooltip);
     free(target);
     gvrender_end_edge(job);
-    job->gvg->emit_state = oldstate;
+    job->gvc->emit_state = oldstate;
 }
 
-static void init_gvg(GVG_t * gvg, graph_t * g)
+static void init_gvc(GVC_t * gvc, graph_t * g)
 {
     double xf, yf;
     char *p;
     int i;
-    
-    gvg->g = g;
+
+    gvc->g = g;
 
     /* margins */
-    gvg->graph_sets_margin = FALSE;
+    gvc->graph_sets_margin = FALSE;
     if ((p = agget(g, "margin"))) {
         i = sscanf(p, "%lf,%lf", &xf, &yf);
         if (i > 0) {
-            gvg->margin.x = gvg->margin.y = xf * POINTS_PER_INCH;
+            gvc->margin.x = gvc->margin.y = xf * POINTS_PER_INCH;
             if (i > 1)
-                gvg->margin.y = yf * POINTS_PER_INCH;
-            gvg->graph_sets_margin = TRUE;
+                gvc->margin.y = yf * POINTS_PER_INCH;
+            gvc->graph_sets_margin = TRUE;
         }
     }
 
     /* pagesize */
-    gvg->graph_sets_pageSize = FALSE;
-    P2PF(GD_drawing(g)->page, gvg->pageSize);
+    gvc->graph_sets_pageSize = FALSE;
+    P2PF(GD_drawing(g)->page, gvc->pageSize);
     if ((GD_drawing(g)->page.x > 0) && (GD_drawing(g)->page.y > 0)) {
-        gvg->graph_sets_pageSize = TRUE;
+        gvc->graph_sets_pageSize = TRUE;
     }
 
     /* rotation */
     if (GD_drawing(g)->landscape) {
-       gvg->rotation = 90;
+       gvc->rotation = 90;
        /* we expect the user to have swapped x,y coords of pagesize and margin */
-       gvg->pageSize = exch_xyf(gvg->pageSize);
-       gvg->margin = exch_xyf(gvg->margin);
+       gvc->pageSize = exch_xyf(gvc->pageSize);
+       gvc->margin = exch_xyf(gvc->margin);
     }
     else {
-       gvg->rotation = 0;
+       gvc->rotation = 0;
     }
 
     /* pagedir */
-    gvg->pagedir = "BL";
+    gvc->pagedir = "BL";
     if ((p = agget(g, "pagedir")) && p[0])
-            gvg->pagedir = p;
+            gvc->pagedir = p;
 
     /* bounding box */
-    B2BF(GD_bb(g),gvg->bb);
+    B2BF(GD_bb(g),gvc->bb);
 
     /* clusters have peripheries */
     G_peripheries = agfindattr(g, "peripheries");
 
     /* default font */
-    gvg->defaultfontname = late_nnstring(g->proto->n,
+    gvc->defaultfontname = late_nnstring(g->proto->n,
                 N_fontname, DEFAULT_FONTNAME);
-    gvg->defaultfontsize = late_double(g->proto->n,
+    gvc->defaultfontsize = late_double(g->proto->n,
                 N_fontsize, DEFAULT_FONTSIZE, MIN_FONTSIZE);
 
     /* default line style */
-    gvg->defaultlinestyle = defaultlinestyle;
+    gvc->defaultlinestyle = defaultlinestyle;
 
-    gvg->graphname = g->name;
-    gvg->lib = Lib;
+    gvc->graphname = g->name;
+    gvc->lib = Lib;
 }
 
 static void init_job_margin(GVJ_t *job)
 {
-    GVG_t *gvg = job->gvg;
+    GVC_t *gvc = job->gvc;
     
-    if (gvg->graph_sets_margin) {
-       job->margin = gvg->margin;
+    if (gvc->graph_sets_margin) {
+       job->margin = gvc->margin;
     }
     else {
         /* set default margins depending on format */
@@ -1185,7 +1186,7 @@ static void init_job_viewport(GVJ_t * job, graph_t * g)
     job->zoom = Z;              /* scaling factor */
     job->focus.x = x;           /* graph coord of focus - points */
     job->focus.y = y;
-    job->rotation = job->gvg->rotation;
+    job->rotation = job->gvc->rotation;
 
 #if 0
     fprintf(stderr,"bb = %d,%d %d,%d size %d,%d (graph units)\n",
@@ -1249,13 +1250,13 @@ static void emit_colors(GVJ_t * job, graph_t * g)
 
 void emit_view(GVJ_t * job, graph_t * g, int flags)
 {
-    GVG_t * gvg = job->gvg;
+    GVC_t * gvc = job->gvc;
     node_t *n;
     edge_t *e;
     char *s, *url = NULL, *tooltip = NULL, *target = NULL;
     int explicit_tooltip = 0;
 
-    gvg->viewNum++;
+    gvc->viewNum++;
     if (((s = agget(g, "href")) && s[0]) || ((s = agget(g, "URL")) && s[0]))
        url = strdup_and_subst_graph(s, g);
     if ((s = agget(g, "target")) && s[0])
@@ -1337,7 +1338,7 @@ void emit_graph(GVJ_t * job, graph_t * g)
     node_t *n;
     char *s;
     int flags = job->flags;
-    GVG_t *gvg = job->gvg;
+    GVC_t *gvc = job->gvc;
 
     s = late_string(g, agfindattr(g, "comment"), "");
     gvrender_comment(job, s);
@@ -1360,7 +1361,7 @@ void emit_graph(GVJ_t * job, graph_t * g)
            if (job->numLayers == 1)
                emit_background(job, g);
            gvrender_set_pencolor(job, DEFAULT_COLOR);
-           gvrender_set_font(job, gvg->defaultfontname, gvg->defaultfontsize);
+           gvrender_set_font(job, gvc->defaultfontname, gvc->defaultfontsize);
            if (boxf_overlap(job->clip, job->pageBox))
                emit_view(job,g,flags);
        } 
@@ -1415,10 +1416,10 @@ void emit_jobs_eof(GVC_t * gvc)
 
     for (job = gvrender_first_job(gvc); job; job = gvrender_next_job(gvc)) {
         if (job->output_file) {
-           if (job->gvg->viewNum > 0) {
+           if (gvc->viewNum > 0) {
                gvrender_end_job(job);
                emit_once_reset();
-               job->gvg->viewNum = 0;
+               gvc->viewNum = 0;
            }
             fclose(job->output_file);
             job->output_file = NULL;
@@ -1467,8 +1468,8 @@ void emit_clusters(GVJ_t * job, Agraph_t * g, int flags)
     char *s, *url, *tooltip, *target;
     int oldstate, explicit_tooltip;
 
-    oldstate = job->gvg->emit_state;
-    job->gvg->emit_state = EMIT_CDRAW;
+    oldstate = job->gvc->emit_state;
+    job->gvc->emit_state = EMIT_CDRAW;
     for (c = 1; c <= GD_n_cluster(g); c++) {
        sg = GD_clust(g)[c];
        if (clust_in_layer(job, sg) == FALSE)
@@ -1587,7 +1588,7 @@ void emit_clusters(GVJ_t * job, Agraph_t * g, int flags)
        if (!(flags & EMIT_CLUSTERS_LAST))
            emit_clusters(job, sg, flags);
     }
-    job->gvg->emit_state = oldstate;
+    job->gvc->emit_state = oldstate;
 }
 
 static bool is_style_delim(int c)
@@ -1746,7 +1747,7 @@ static void emit_job(GVJ_t * job, graph_t * g)
     init_job_viewport(job, g);
     init_job_pagination(job, g);
 
-    job->gvg->emit_state = EMIT_GDRAW;
+    job->gvc->emit_state = EMIT_GDRAW;
     gvrender_begin_job(job);
 
     switch (job->output_lang) {
@@ -1885,7 +1886,6 @@ extern gvdevice_callbacks_t gvdevice_callbacks;
 int gvRenderJobs (GVC_t * gvc, graph_t * g)
 {
     GVJ_t *job, *prev_job;
-    GVG_t *gvg = gvc->gvg;
 
     if (!GD_drawing(g)) {
         agerr (AGERR, "Layout was not done.  Missing layout plugins? \n");
@@ -1893,12 +1893,12 @@ int gvRenderJobs (GVC_t * gvc, graph_t * g)
     }
 
     init_bb(g);
-    init_gvg(gvg, g);
-    init_layering(gvg, g);
+    init_gvc(gvc, g);
+    init_layering(gvc, g);
 
     gvc->keybindings = gvevent_key_binding;
     gvc->numkeys = gvevent_key_binding_size;
-    gvg->active_jobs = NULL; /* clear active list */
+    gvc->active_jobs = NULL; /* clear active list */
     prev_job = NULL;
     for (job = gvrender_first_job(gvc); job; job = gvrender_next_job(gvc)) {
         if (!job->output_file) {        /* if not yet opened */
@@ -1915,17 +1915,17 @@ int gvRenderJobs (GVC_t * gvc, graph_t * g)
         }
 
        /* if we already have an active job list to a different output device */
-        if (gvg->active_jobs
-       && strcmp(job->output_langname,gvg->active_jobs->output_langname) != 0) {
+        if (gvc->active_jobs
+       && strcmp(job->output_langname,gvc->active_jobs->output_langname) != 0) {
             gvdevice_finalize(gvc); /* finalize previous jobs */
-            gvg->active_jobs = NULL; /* clear active list */
+            gvc->active_jobs = NULL; /* clear active list */
            prev_job = NULL;
         }
 
        if (prev_job)
             prev_job->next_active = job;  /* insert job in active list */
        else
-           gvg->active_jobs = job;   /* first job of new list */
+           gvc->active_jobs = job;   /* first job of new list */
        job->next_active = NULL;      /* terminate active list */
        prev_job = job;
 

diff --git a/lib/common/figgen.c b/lib/common/figgen.c
index f36e00a8c4a2ae68a47dd3b5384697ccd9889a6e..b6087753cb1310d99db3b2adbf8cca6fcd12c9e1 100644 (file)
--- a/lib/common/figgen.c
+++ b/lib/common/figgen.c
@@ -192,7 +192,7 @@ static void fig_end_job(void)
     fprintf(Output_file, "# end of FIG file\n");
 }
 
-static void fig_begin_graph(GVJ_t * job, graph_t * g, box bb, point pb)
+static void fig_begin_graph(GVC_t * gvc, graph_t * g, box bb, point pb)
 {
     PB = bb;
     if (onetime) {

diff --git a/lib/common/gdgen.c b/lib/common/gdgen.c
index 8018e5a751913b81d5caf6aa1abd08b910b2fb56..0ed7bee81ff08d54c3f74f08b998517c1efbfd4a 100644 (file)
--- a/lib/common/gdgen.c
+++ b/lib/common/gdgen.c
@@ -136,19 +136,19 @@ static void gd_end_job(void)
 #endif
 }
 
-static void init1_gd(GVG_t * gvg, graph_t * g, box bb, point pb)
+static void init1_gd(GVC_t * gvc, graph_t * g, box bb, point pb)
 {
     Dpi = GD_drawing(g)->dpi;
     if (Dpi < 1.0)
        Dpi = DEFAULT_DPI;
     DevScale = Dpi / POINTS_PER_INCH;
 
-    Viewport.x = gvg->job->width;
-    Viewport.y = gvg->job->height;
+    Viewport.x = gvc->job->width;
+    Viewport.y = gvc->job->height;
 #if 0
     if (Viewport.x) {
-       Zoom = gvg->job->zoom;
-       GraphFocus = gvg->job->focus;
+       Zoom = gvc->job->zoom;
+       GraphFocus = gvc->job->focus;
     } else {
        Viewport.x =
            (bb.UR.x - bb.LL.x + 2 * GD_drawing(g)->margin.x) * DevScale + 2;
@@ -159,8 +159,8 @@ static void init1_gd(GVG_t * gvg, graph_t * g, box bb, point pb)
        Zoom = 1.0;
     }
 #else
-    Zoom = gvg->job->zoom;
-    GraphFocus = gvg->job->focus;
+    Zoom = gvc->job->zoom;
+    GraphFocus = gvc->job->focus;
 #endif
     CompScale = Zoom * DevScale;
 }
@@ -218,21 +218,20 @@ static bool is_format_truecolor_capable(int Output_lang)
     return rv;
 }
 
-static void gd_begin_graph(GVJ_t * job, graph_t * g, box bb, point pb)
+static void gd_begin_graph(GVC_t * gvc, graph_t * g, box bb, point pb)
 {
     char *bgcolor_str = NULL;
     char *truecolor_str;
     bool truecolor_p = FALSE;  /* try to use cheaper paletted mode */
     bool bg_transparent_p = FALSE;
     int bgcolor;
-    GVG_t *gvg = job->gvg;
 
-    external_surface = gvg->job->external_surface;
+    external_surface = gvc->job->external_surface;
 
-    init1_gd(gvg, g, bb, pb);
+    init1_gd(gvc, g, bb, pb);
 
     if (external_surface) {
-       im = (gdImagePtr)gvg->job->surface;
+       im = (gdImagePtr)gvc->job->surface;
     } else {
         truecolor_str = agget(g, "truecolor"); /* allow user to force truecolor */
         bgcolor_str = agget(g, "bgcolor");

diff --git a/lib/common/hpglgen.c b/lib/common/hpglgen.c
index 18eac463edcf93fc2410e988e981ebbc415b76c6..ff7971065458d958aca660382de1cce936481811 100644 (file)
--- a/lib/common/hpglgen.c
+++ b/lib/common/hpglgen.c
@@ -404,7 +404,7 @@ hpgl_begin_job(FILE * ofp, graph_t * g, char **lib, char *user,
     N_pages = pages.x * pages.y;
 }
 
-static void hpgl_begin_graph(GVJ_t * job, graph_t * g, box bb, point pb)
+static void hpgl_begin_graph(GVC_t * gvc, graph_t * g, box bb, point pb)
 {
     PB = bb;
     PageWidth = pb.x;

diff --git a/lib/common/htmltable.c b/lib/common/htmltable.c
index 0fea27d0c4fbeef5937240e8737833fa54a7671d..61e02ff74ca926c5f2e34166182d11f6615566d3 100644 (file)
--- a/lib/common/htmltable.c
+++ b/lib/common/htmltable.c
@@ -448,7 +448,7 @@ emit_html_label(GVJ_t * job, htmllabel_t * lp, textlabel_t * tp, void *obj)
        /* set basic graphics context */
        gvrender_begin_context(job);
        /* Need to override line style set by node. */
-       gvrender_set_style(job, job->gvg->defaultlinestyle);
+       gvrender_set_style(job, job->gvc->defaultlinestyle);
        if (tbl->data.pencolor)
            gvrender_set_pencolor(job, tbl->data.pencolor);
        else

diff --git a/lib/common/input.c b/lib/common/input.c
index 68a6c1e8aba7b1b46d75176e0cd10f764a1fcd18..77c8de9a530e3baf5980164562df2e428a0e6408 100644 (file)
--- a/lib/common/input.c
+++ b/lib/common/input.c
@@ -296,13 +296,13 @@ void dotneato_args_initialize(GVC_t * gvc, int argc, char **argv)
     }
 
     /* if no -Txxx, then set default format */
-    if (!gvc->gvg->jobs || !gvc->gvg->jobs->output_langname) {
+    if (!gvc->jobs || !gvc->jobs->output_langname) {
        v = gvrender_output_langname_job(gvc, "dot");
        assert(v);  /* "dot" should always be available as an output format */
     }
 
 #if !defined(DISABLE_CODEGENS) && !defined(HAVE_GD_FREETYPE)
-    Output_codegen = gvc->gvg->jobs->codegen;
+    Output_codegen = gvc->jobs->codegen;
 #endif
 
     /* set persistent attributes here (if not already set from command line options) */
@@ -358,7 +358,6 @@ void getdouble(graph_t * g, char *name, double *result)
     }
 }
 
-#if 0
 static FILE *next_input_file(void)
 {
     static int ctr = 0;
@@ -400,7 +399,6 @@ graph_t *next_input_graph(void)
     }
     return g;
 }
-#endif
 
 /* findCharset:
  * Check if the charset attribute is defined for the graph and, if

diff --git a/lib/common/labels.c b/lib/common/labels.c
index 5033fa682e19c5d242c8776f000aaca9d6eafdba..f8d689e2e8ae86682f5b145ee77721552df88d38 100644 (file)
--- a/lib/common/labels.c
+++ b/lib/common/labels.c
@@ -226,8 +226,8 @@ void emit_label(GVJ_t * job, int state, textlabel_t * lp, void *obj)
     pointf p;
     int oldstate;
 
-    oldstate = job->gvg->emit_state;
-    job->gvg->emit_state = state;
+    oldstate = job->gvc->emit_state;
+    job->gvc->emit_state = state;
 
     if (lp->html) {
        emit_html_label(job, lp->u.html, lp, obj);
@@ -246,7 +246,7 @@ void emit_label(GVJ_t * job, int state, textlabel_t * lp, void *obj)
 
     emit_textlines(job, lp->u.txt.nlines, lp->u.txt.line, p,
               halfwidth_x, lp->fontname, lp->fontsize, lp->fontcolor);
-    job->gvg->emit_state = oldstate;
+    job->gvc->emit_state = oldstate;
 }
 
 

diff --git a/lib/common/mapgen.c b/lib/common/mapgen.c
index cb00d332bac9f069b2f1d3408c2fb232a081585b..9532e38dfd1b8e0b90c6bd6df0f54464713b28cd 100644 (file)
--- a/lib/common/mapgen.c
+++ b/lib/common/mapgen.c
@@ -298,18 +298,18 @@ map_begin_job(FILE * ofp, graph_t * g, char **lib, char *user,
     isLatin1 = (GD_charset(g) == CHAR_LATIN1);
 }
 
-static void map_begin_graph(GVJ_t * job, graph_t * g, box bb, point pb)
+static void map_begin_graph(GVC_t * gvc, graph_t * g, box bb, point pb)
 {
     Dpi = GD_drawing(g)->dpi;
     if (Dpi < 1.0)
        Dpi = DEFAULT_DPI;
     DevScale = Dpi / POINTS_PER_INCH;
 
-    Viewport.x = job->width;
-    Viewport.y = job->height;
+    Viewport.x = gvc->job->width;
+    Viewport.y = gvc->job->height;
     if (Viewport.x) {
-       Zoom = job->zoom;
-       GraphFocus = job->focus;
+       Zoom = gvc->job->zoom;
+       GraphFocus = gvc->job->focus;
     } else {
        Viewport.x =
            (bb.UR.x - bb.LL.x + 2 * GD_drawing(g)->margin.x) * DevScale +

diff --git a/lib/common/mifgen.c b/lib/common/mifgen.c
index 7e666fa7eed4e596c7c93aed357fcb4e8306efff..861c91f2011c355d92524cd50f02ecac5fb45966 100644 (file)
--- a/lib/common/mifgen.c
+++ b/lib/common/mifgen.c
@@ -311,7 +311,7 @@ static void mif_end_job(void)
     fprintf(Output_file, "# end of MIFFile\n");
 }
 
-static void mif_begin_graph(GVJ_t * job, graph_t * g, box bb, point pb)
+static void mif_begin_graph(GVC_t * gvc, graph_t * g, box bb, point pb)
 {
     PB = bb;
     if (onetime) {

diff --git a/lib/common/mpgen.c b/lib/common/mpgen.c
index 335910e4dc7d3087149515edfd98ae536f2aa2bc..1496f86d24bce48e98c6bd495d6ee68c04d7a80a 100644 (file)
--- a/lib/common/mpgen.c
+++ b/lib/common/mpgen.c
@@ -80,7 +80,7 @@ static void mp_comment(char *str)
     fprintf(Output_file, "%% %s\n", str);
 }
 
-static void mp_begin_graph(GVJ_t * job, graph_t * g, box bb, point pb)
+static void mp_begin_graph(GVC_t * gvc, graph_t * g, box bb, point pb)
 {
     /* PB = bb; */
     if (onetime) {

diff --git a/lib/common/picgen.c b/lib/common/picgen.c
index cd081ed834dbdaebb7e66e5cdda59eea721e3574..1c694cd5e3c5efe4e6910a770749389ce6217a69 100644 (file)
--- a/lib/common/picgen.c
+++ b/lib/common/picgen.c
@@ -172,7 +172,7 @@ static void pic_begin_job(FILE * ofp, graph_t * g, char **lib, char *user,
     fprintf(Output_file, "%s Title: %s\n", EscComment, g->name);
 }
 
-static void pic_begin_graph(GVJ_t * job, graph_t * g, box bb, point pb)
+static void pic_begin_graph(GVC_t * gvc, graph_t * g, box bb, point pb)
 {
     BB = bb;
 

diff --git a/lib/common/psgen.c b/lib/common/psgen.c
index 6f6f0a21c383c1d6a87c92c35e1c5cb96caecad3..c7cd3825e8b04e8d0fbfface4da58fbab6838b38 100644 (file)
--- a/lib/common/psgen.c
+++ b/lib/common/psgen.c
@@ -109,7 +109,7 @@ static void ps_comment(char *str)
     fprintf(Output_file, "%% %s\n", str);
 }
 
-static void ps_begin_graph(GVJ_t * job, graph_t * g, box bb, point pb)
+static void ps_begin_graph(GVC_t * gvc, graph_t * g, box bb, point pb)
 {
     char *s;
 

diff --git a/lib/common/svggen.c b/lib/common/svggen.c
index 357b856314a111b239f5f9c3a7486db85e827c5c..2a4e0c07edf57a652bad0a55b9a359670fe7ba7c 100644 (file)
--- a/lib/common/svggen.c
+++ b/lib/common/svggen.c
@@ -475,12 +475,12 @@ svg_begin_job(FILE * ofp, graph_t * g, char **lib, char *user,
        svg_fputs(") -->\n");
 }
 
-static void svg_begin_graph(GVJ_t * job, graph_t * g, box bb, point pb)
+static void svg_begin_graph(GVC_t * gvc, graph_t * g, box bb, point pb)
 {
-    Viewport.x = job->width;
-    Viewport.y = job->height;
-    CompScale = job->compscale;
-    Offset = job->offset;
+    Viewport.x = gvc->job->width;
+    Viewport.y = gvc->job->height;
+    CompScale = gvc->job->compscale;
+    Offset = gvc->job->offset;
 
     if (onetime) {
        init_svg();
@@ -490,13 +490,13 @@ static void svg_begin_graph(GVJ_t * job, graph_t * g, box bb, point pb)
     svg_fputs("<!-- Title: ");
     svg_fputs(xml_namestring(g->name));
     svg_printf(" Pages: %d -->\n", N_pages);
-    if (ROUND(job->dpi.x) == POINTS_PER_INCH && ROUND(job->dpi.y) == POINTS_PER_INCH)
+    if (ROUND(gvc->job->dpi.x) == POINTS_PER_INCH && ROUND(gvc->job->dpi.y) == POINTS_PER_INCH)
        svg_printf("<svg width=\"%dpt\" height=\"%dpt\"\n",
                Viewport.x, Viewport.y);
     else
        svg_printf("<svg width=\"%dpx\" height=\"%dpx\"\n",
-               ROUND(job->dpi.x * Viewport.x / POINTS_PER_INCH),
-               ROUND(job->dpi.y * Viewport.y / POINTS_PER_INCH));
+               ROUND(gvc->job->dpi.x * Viewport.x / POINTS_PER_INCH),
+               ROUND(gvc->job->dpi.y * Viewport.y / POINTS_PER_INCH));
     /* establish absolute units in points */
     svg_printf(" viewBox = \"%d %d %d %d\"\n", 0, 0, Viewport.x, Viewport.y);
     /* namespace of svg */

diff --git a/lib/common/types.h b/lib/common/types.h
index 52ac1c1aaa424e3d890ab108338213180c2b95c5..4134ee27b97dc17ca21b2b70928d1eb2dcb25ccb 100644 (file)
--- a/lib/common/types.h
+++ b/lib/common/types.h
@@ -194,7 +194,7 @@ extern "C" {
        void (*begin_job) (FILE * ofp, graph_t * g, char **lib, char *user,
                           char *info[], point pages);
        void (*end_job) (void);
-       void (*begin_graph) (GVJ_t * job, graph_t * g, box bb, point pb);
+       void (*begin_graph) (GVC_t * gvc, graph_t * g, box bb, point pb);
        void (*end_graph) (void);
        void (*begin_page) (graph_t * g, point page, double scale, int rot,
                            point offset);

diff --git a/lib/common/vrmlgen.c b/lib/common/vrmlgen.c
index 70f3ae126af5d495650d2d2f383e5fae12f5774a..04c6f1219d442b64ec7b3c57e8f9c50465d97a11 100644 (file)
--- a/lib/common/vrmlgen.c
+++ b/lib/common/vrmlgen.c
@@ -234,7 +234,7 @@ static void vrml_begin_job(FILE * ofp, graph_t * g, char **lib, char *user,
     fprintf(Output_file, "#VRML V2.0 utf8\n");
 }
 
-static void vrml_begin_graph(GVJ_t * job, graph_t * g, box bb, point pb)
+static void vrml_begin_graph(GVC_t * gvc, graph_t * g, box bb, point pb)
 {
     g = g;
 

diff --git a/lib/common/vtxgen.c b/lib/common/vtxgen.c
index 1e860637198af81fa4e0a39c13be576db3ec69b5..26d36b94c107b8500421b6914011c4b2cdb99bd9 100644 (file)
--- a/lib/common/vtxgen.c
+++ b/lib/common/vtxgen.c
@@ -236,7 +236,7 @@ vtx_begin_job(FILE * ofp, graph_t * g, char **lib, char *user,
     free(date);
 }
 
-static void vtx_begin_graph(GVJ_t * job, graph_t * g, box bb, point pb)
+static void vtx_begin_graph(GVC_t * gvc, graph_t * g, box bb, point pb)
 {
     /* PB = bb; */
     if (onetime) {

diff --git a/lib/common/xdgen.c b/lib/common/xdgen.c
index a66b2bada9dee509b99074b4c4ea091b5ffa4799..bb435861bbf86f7049201b705f35d71da9238d27 100644 (file)
--- a/lib/common/xdgen.c
+++ b/lib/common/xdgen.c
@@ -19,7 +19,7 @@
 
 #define XDOTVERSION "1.1"
 
-static GVG_t *gvg;
+static GVC_t *gvc;
 static agxbuf xbuf0;
 static agxbuf xbuf1;
 static agxbuf xbuf2;
@@ -93,7 +93,7 @@ void extend_attrs(GVJ_t * job, graph_t *g, int s_arrows, int e_arrows)
     unsigned char buf4[BUFSIZ];
     unsigned char buf5[BUFSIZ];
 
-    gvg = job->gvg;
+    gvc = job->gvc;
 
     agsafeset (g, "xdotversion", XDOTVERSION, "");
     if (GD_has_labels(g) & GRAPH_LABEL)
@@ -177,9 +177,9 @@ static void xd_str (char* pfx, char* s)
     char buf[BUFSIZ];
 
     sprintf (buf, "%s%d -", pfx, (int)strlen(s));
-    agxbput(xbufs[gvg->emit_state], buf);
-    agxbput(xbufs[gvg->emit_state], s);
-    agxbputc(xbufs[gvg->emit_state], ' ');
+    agxbput(xbufs[gvc->emit_state], buf);
+    agxbput(xbufs[gvc->emit_state], s);
+    agxbputc(xbufs[gvc->emit_state], ' ');
 }
 
 static void xd_textline(point p, textline_t * line)
@@ -200,7 +200,7 @@ static void xd_textline(point p, textline_t * line)
        break;
     }
     sprintf(buf, "T %d %d %d %d ", p.x, YDIR(p.y), j, (int) line->width);
-    agxbput(xbufs[gvg->emit_state], buf);
+    agxbput(xbufs[gvc->emit_state], buf);
     xd_str ("", line->str);
 }
 
@@ -208,9 +208,9 @@ static void xd_ellipse(point p, int rx, int ry, int filled)
 {
     char buf[BUFSIZ];
 
-    agxbputc(xbufs[gvg->emit_state], (filled ? 'E' : 'e'));
+    agxbputc(xbufs[gvc->emit_state], (filled ? 'E' : 'e'));
     sprintf(buf, " %d %d %d %d ", p.x, YDIR(p.y), rx, ry);
-    agxbput(xbufs[gvg->emit_state], buf);
+    agxbput(xbufs[gvc->emit_state], buf);
 }
 
 static void xd_points(char c, point * A, int n)
@@ -219,13 +219,13 @@ static void xd_points(char c, point * A, int n)
     int i;
     point p;
 
-    agxbputc(xbufs[gvg->emit_state], c);
+    agxbputc(xbufs[gvc->emit_state], c);
     sprintf(buf, " %d ", n);
-    agxbput(xbufs[gvg->emit_state], buf);
+    agxbput(xbufs[gvc->emit_state], buf);
     for (i = 0; i < n; i++) {
        p = A[i];
        sprintf(buf, "%d %d ", p.x, YDIR(p.y));
-       agxbput(xbufs[gvg->emit_state], buf);
+       agxbput(xbufs[gvc->emit_state], buf);
     }
 }
 
@@ -254,7 +254,7 @@ xd_set_font (char *fontname, double fontsize)
     char buf[BUFSIZ];
 
     sprintf(buf, "F %f ", fontsize);
-    agxbput(xbufs[gvg->emit_state], buf);
+    agxbput(xbufs[gvc->emit_state], buf);
     xd_str ("", fontname);
 }
 

diff --git a/lib/gvc/Makefile.am b/lib/gvc/Makefile.am
index a20900888cde2d1aa12334dd0757044d0944c887..d13a90174ab71cf597ede9ec4364efca0ff19956 100644 (file)
--- a/lib/gvc/Makefile.am
+++ b/lib/gvc/Makefile.am
@@ -12,7 +12,7 @@ AM_CPPFLAGS = \
 
 LIBS = $(LIBLTDL) $(SOCKET_LIBS)
 
-pkginclude_HEADERS = gvc.h gvcext.h gvplugin.h gvj.h gvg.h gvcint.h \
+pkginclude_HEADERS = gvc.h gvcext.h gvplugin.h gvcjob.h gvcint.h \
        gvplugin_render.h \
        gvplugin_layout.h \
        gvplugin_textlayout.h \
@@ -27,7 +27,7 @@ libgvc_la_LDFLAGS = ${libgvc_builtins_la_LDFLAGS} -no-undefined
 
 libgvc_builtins_la_SOURCES = gvrender.c gvlayout.c gvtextlayout.c gvdevice.c \
        gvcontext.c gvjobs.c gvevent.c gvplugin.c gvconfig.c gvusershape.c \
-       gvc.c gvgraphs.c
+       gvc.c
 libgvc_la_SOURCES = ${libgvc_builtins_la_SOURCES} no_builtins.c
 
 libgvc_builtins_la_LIBADD = \

diff --git a/lib/gvc/gvc.c b/lib/gvc/gvc.c
index c232741d43117d61b100e4f514291296cb1e3034..ee2be9d8bbc14c5f13cfd9648e246a9211f15756 100644 (file)
--- a/lib/gvc/gvc.c
+++ b/lib/gvc/gvc.c
@@ -97,7 +97,7 @@ int gvRender(GVC_t *gvc, graph_t *g, char *format, FILE *out)
         return -1;
     }
 
-    job = gvc->gvg->job;
+    job = gvc->job;
     job->output_lang = gvrender_select(job, job->output_langname);
     if (!GD_drawing(g) && job->output_lang != CANONICAL_DOT) {
        fprintf(stderr, "Layout was not done\n");
@@ -105,7 +105,7 @@ int gvRender(GVC_t *gvc, graph_t *g, char *format, FILE *out)
     }
     job->output_file = out;
     gvRenderJobs(gvc, g);
-    if (gvc->gvg->active_jobs)
+    if (gvc->active_jobs)
        gvdevice_finalize(gvc);
     gvrender_delete_jobs(gvc);
 
@@ -127,7 +127,7 @@ int gvRenderFilename(GVC_t *gvc, graph_t *g, char *format, char *filename)
        return -1;
     }
 
-    job = gvc->gvg->job;
+    job = gvc->job;
     job->output_lang = gvrender_select(job, job->output_langname);
     if (!GD_drawing(g) && job->output_lang != CANONICAL_DOT) {
        fprintf(stderr, "Layout was not done\n");
@@ -135,7 +135,7 @@ int gvRenderFilename(GVC_t *gvc, graph_t *g, char *format, char *filename)
     }
     gvrender_output_filename_job(gvc, filename);
     gvRenderJobs(gvc, g);
-    if (gvc->gvg->active_jobs)
+    if (gvc->active_jobs)
        gvdevice_finalize(gvc);
     gvrender_delete_jobs(gvc);
 

diff --git a/lib/gvc/gvc.h b/lib/gvc/gvc.h
index 7ce33fc59766e8b4793cccd9e798c9181c03b28d..c4589b6bff58902aae480a63f077b3ec41888a32 100644 (file)
--- a/lib/gvc/gvc.h
+++ b/lib/gvc/gvc.h
@@ -47,11 +47,11 @@ extern "C" {
 
 #define gvCleanup gvCleanup_DEPRECATED_BY_gvFreeContext
 #define dotneato_terminate dotneato_terminate_DEPRECATED_BY_gvFreeContext
-#define next_input_graph next_input_graph_DEPRECATED_BY_gvNextInputGraph
 
 /* misc */
-/* FIXME - this needs eliminating or renaming */
+/* FIXME - these need eliminating or renaming */
 extern void gvToggle(int);
+extern graph_t *next_input_graph(void);
 
 /* set up a graphviz context */
 extern GVC_t *gvNEWcontext(char **info, char *user);
@@ -64,9 +64,6 @@ extern GVC_t *gvContext(void);
 /* parse command line args - minimally argv[0] sets layout engine */
 extern int gvParseArgs(GVC_t *gvc, int argc, char **argv);
 
-/* iterate over input graphs resulting from gvParseArgs() */
-extern graph_t *gvNextInputGraph(GVC_t *gvc);
-
 /* Compute a layout using a specified engine */
 extern int gvLayout(GVC_t *gvc, graph_t *g, char *engine);
 

diff --git a/lib/gvc/gvcext.h b/lib/gvc/gvcext.h
index 3c222191390c36a6c173c71be59684e851dad15d..77bc91c05c69634121c2a6c89fb1842d9ea4e52c 100644 (file)
--- a/lib/gvc/gvcext.h
+++ b/lib/gvc/gvcext.h
@@ -28,9 +28,8 @@ extern "C" {
     typedef struct codegen_info_s codegen_info_t;
 #endif
 
-    typedef struct GVC_s GVC_t;
-    typedef struct GVG_s GVG_t;
     typedef struct GVJ_s GVJ_t;
+    typedef struct GVC_s GVC_t;
 
     typedef struct {
        const char *name;

diff --git a/lib/gvc/gvcint.h b/lib/gvc/gvcint.h
index 565a5ed754e343852ec9f0be9afe2ab26fdd8460..996539d2efd25c46e98ac39cd393083191ded271 100644 (file)
--- a/lib/gvc/gvcint.h
+++ b/lib/gvc/gvcint.h
@@ -23,7 +23,7 @@
 extern "C" {
 #endif
 
-#include "gvg.h"
+#include "gvcjob.h"
 
     typedef struct {
        int flags;
@@ -64,16 +64,27 @@ extern "C" {
                                        or NULL if not yet loaded */
     };
 
+#define MAXNEST 4
+
     struct GVC_s {
        /* gvNEWcontext() */
        char *user;
        char **info;
 
-        void (*errorfn) (char *fmt, ...);
-
        char *config_path;
        bool config_found;
 
+       /* gvrender_config() */
+       GVJ_t *jobs;    /* linked list of jobs */
+       GVJ_t *job;     /* current job */
+       void (*errorfn) (char *fmt, ...);
+
+       int emit_state; /* current emit_state */
+       graph_t *g;     /* current graph */
+       graph_t *sg;    /* current subgraph/cluster */
+       node_t *n;      /* current node */
+       edge_t *e;      /* current edge */
+
        /* plugins */
 #define ELEM(x) +1
        /* APIS expands to "+1 +1 ... +1" to give the number of APIs */
@@ -86,13 +97,45 @@ extern "C" {
        gvplugin_active_usershape_t usershape;
        gvplugin_active_layout_t layout;
 
+       char *graphname;        /* name from graph */
+       GVJ_t *active_jobs;   /* linked list of active jobs */
+
+       char **lib;
+
+       /* pagination */
+       char *pagedir;          /* pagination order */
+       pointf margin;          /* margins in graph units */
+       pointf pageSize;        /* pageSize in graph units, not including margins */
+       point pb;               /* page size - including margins (inches) */
+       boxf bb;                /* graph bb in graph units, not including margins */
+       int rotation;           /* rotation - 0 = portrait, 90 = landscape */
+       bool graph_sets_margin, graph_sets_pageSize, graph_sets_rotation;
+
+       /* layers */
+       char *layerDelims;      /* delimiters in layer names */
+       char *layers;           /* null delimited list of layer names */
+       char **layerIDs;        /* array of layer names */
+       int numLayers;          /* number of layers */
+
+        int viewNum;           /* current view - 1 based count of views,
+                                       all pages in all layers */
+       /* default font */
+       char *defaultfontname;
+       double defaultfontsize;
+
+       /* default line style */
+       char **defaultlinestyle;
+
+       gvstyle_t styles[MAXNEST]; /* style stack - reused by each job */
+       int SP;
+
+       /* render defaults set from graph */
+       gvcolor_t bgcolor;      /* background color */
+
        /* keybindings for keyboard events */
        gvevent_key_binding_t *keybindings;
        int numkeys;
        void *keycodes;
-
-       /* gvrender_config() */
-       GVG_t *gvg;
     };
 
 #ifdef __cplusplus

diff --git a/lib/gvc/gvj.h b/lib/gvc/gvcjob.h
similarity index 98%
rename from lib/gvc/gvj.h
rename to lib/gvc/gvcjob.h
index f13f6065358dde878670ce3edcc185452d0bc10e..eff43f0c945410aa5b8619f30b790475b4d013ad 100644 (file)
--- a/lib/gvc/gvj.h
+++ b/lib/gvc/gvcjob.h
@@ -16,8 +16,8 @@
 
 /* Common header used by both clients and plugins */
 
-#ifndef GVJ_H
-#define GVJ_H
+#ifndef GVCJOB_H
+#define GVCJOB_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -134,7 +134,7 @@ extern "C" {
     } gvevent_key_binding_t;
 
     struct GVJ_s {
-       GVG_t *gvg;             /* parent gvg */
+       GVC_t *gvc;             /* parent gvc */
        GVJ_t *next;            /* linked list of jobs */
        GVJ_t *next_active;     /* linked list of active jobs (e.g. multiple windows) */
        char *output_filename;
@@ -222,4 +222,4 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-#endif                         /* GVJ_H */
+#endif                         /* GVCJOB_H */

diff --git a/lib/gvc/gvcontext.c b/lib/gvc/gvcontext.c
index 1b47ae1543993686e7fe77bafc9bc865877a48d3..c434e65d231ade9049621399ef8d895103c9ae63 100644 (file)
--- a/lib/gvc/gvcontext.c
+++ b/lib/gvc/gvcontext.c
@@ -17,7 +17,7 @@
 /*
     A gvcontext is a single instance of a GVC_t data structure providing
     for a set of plugins for processing one graph at a time, and a job
-    description providing for a sequence of graph jobs.
+    description provividing for a sequence of graph jobs.
 
     Sometime in the future it may become the basis for a thread.
  */
@@ -49,22 +49,18 @@ GVC_t *gvNEWcontext(char **info, char *user)
        gvc->info = info;
        gvc->user = user;
        gvc->errorfn = agerrorf;
-        gvc->gvg = zmalloc(sizeof(GVG_t));   /* FIXME - this will be allocated by the args parser */
-       gvc->gvg->gvc = gvc;  /* link back to parent */
     }
     return gvc;
 }
 
 int gvFreeContext(GVC_t * gvc)
 {
-    if (gvc->gvg->active_jobs)
+    if (gvc->active_jobs)
        gvdevice_finalize(gvc);
     emit_jobs_eof(gvc);
     gvrender_delete_jobs(gvc);
     if (gvc->config_path)
        free(gvc->config_path);
-    if (gvc->gvg)  /* FIXME - this be be a list of gvg's eventually */
-       free(gvc->gvg);
     free(gvc);
     return (graphviz_errors + agerrors());
 }

diff --git a/lib/gvc/gvdevice.c b/lib/gvc/gvdevice.c
index bd04eaa14236bca1a1ffb5da3e26e685ed5cc7f9..4eb0f1d3813c6731c56601af8575a05f89a586cd 100644 (file)
--- a/lib/gvc/gvdevice.c
+++ b/lib/gvc/gvdevice.c
@@ -34,7 +34,7 @@
 
 int gvdevice_select(GVJ_t * job, char *str)
 {
-    GVC_t *gvc = job->gvg->gvc;
+    GVC_t *gvc = job->gvc;
     gvplugin_available_t *plugin;
     gvplugin_installed_t *typeptr;
 #ifndef DISABLE_CODEGENS
@@ -75,7 +75,7 @@ int gvdevice_features(GVJ_t * job)
 
 void gvdevice_finalize(GVC_t * gvc)
 {
-    GVJ_t *firstjob = gvc->gvg->active_jobs;
+    GVJ_t *firstjob = gvc->active_jobs;
     gvdevice_engine_t *gvde = firstjob->device.engine;
 
     if (gvde) {

diff --git a/lib/gvc/gvevent.c b/lib/gvc/gvevent.c
index e0c5499c236bf5670b20dcc53f88fdd159e5fa7b..b6597897f3a41b254b15b235e98749e4b40c7881 100644 (file)
--- a/lib/gvc/gvevent.c
+++ b/lib/gvc/gvevent.c
@@ -174,7 +174,7 @@ static void gv_edge_state(GVJ_t *job, edge_t *e)
 
 static void gvevent_refresh(GVJ_t * job)
 {
-    graph_t *g = job->gvg->g;
+    graph_t *g = job->gvc->g;
 
     if (!job->selected_obj) {
        job->selected_obj = g;
@@ -313,7 +313,7 @@ static void gvevent_find_current_obj(GVJ_t * job, pointf pointer)
     b.LL.x = p.x - closeenough;
     b.LL.y = p.y - closeenough;
 
-    obj = gvevent_find_obj(job->gvg->g, b);
+    obj = gvevent_find_obj(job->gvc->g, b);
     if (obj != job->current_obj) {
        gvevent_leave_obj(job);
        job->current_obj = obj;
@@ -536,30 +536,30 @@ static void gvevent_delete (GVJ_t * job)
 static void gvevent_read (GVJ_t * job, char *filename, char *layout)
 {
     FILE *f;
+    GVC_t *gvc;
     gvlayout_engine_t *gvle;
-    GVG_t *gvg = job->gvg;
-    GVC_t *gvc = gvg->gvc;
 
-    if (gvg->g) {
+    gvc = job->gvc;
+    if (gvc->g) {
        gvle = gvc->layout.engine;
        if (gvle && gvle->cleanup)
-           gvle->cleanup(gvg->g);
-       graph_cleanup(gvg->g);
-       agclose(gvg->g);
+           gvle->cleanup(gvc->g);
+       graph_cleanup(gvc->g);
+       agclose(gvc->g);
     }
     if (!filename) {
-       gvg->g = agopen("G", AGDIGRAPH);
+       gvc->g = agopen("G", AGDIGRAPH);
        job->output_filename = "new.dot";
     }
     else {
        f = fopen(filename, "r");
        if (!f)
                return;   /* FIXME - need some error handling */
-       gvg->g = agread(f);
+       gvc->g = agread(f);
        fclose(f);
     }
-    GD_gvc(gvg->g) = gvc;
-    gvLayout(gvc, gvg->g, layout);
+    GD_gvc(gvc->g) = gvc;
+    gvLayout(gvc, gvc->g, layout);
     job->selected_obj = NULL;
     job->current_obj = NULL;
     job->needs_refresh = 1;
@@ -567,12 +567,12 @@ static void gvevent_read (GVJ_t * job, char *filename, char *layout)
 
 static void gvevent_layout (GVJ_t * job, char *layout)
 {
-    gvLayout(job->gvg->gvc, job->gvg->g, layout);
+    gvLayout(job->gvc, job->gvc->g, layout);
 }
 
 static void gvevent_render (GVJ_t * job, char *format, char *filename)
 {
-    gvRenderFilename(job->gvg->gvc, job->gvg->g, format, filename);
+    gvRenderFilename(job->gvc, job->gvc->g, format, filename);
 }
 
 

diff --git a/lib/gvc/gvg.h b/lib/gvc/gvg.h
deleted file mode 100644 (file)
index 7c40ddc..0000000
--- a/lib/gvc/gvg.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* $Id$ $Revision$ */
-/* vim:set shiftwidth=4 ts=8: */
-
-/**********************************************************
-*      This software is part of the graphviz package      *
-*                http://www.graphviz.org/                 *
-*                                                         *
-*            Copyright (c) 1994-2004 AT&T Corp.           *
-*                and is licensed under the                *
-*            Common Public License, Version 1.0           *
-*                      by AT&T Corp.                      *
-*                                                         *
-*        Information and Software Systems Research        *
-*              AT&T Research, Florham Park NJ             *
-**********************************************************/
-
-/* per graph structure in gvc */
-
-#ifndef GVG_H
-#define GVG_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "gvj.h"
-
-    struct GVG_s {
-
-       GVC_t *gvc;     /* parent gvc */
-       
-       GVJ_t *jobs;    /* linked list of jobs on this graph */
-       GVJ_t *job;     /* current job */
-       GVJ_t *active_jobs; /* linked list of active jobs
-                               (e.g. multiple open windows on same graph) */
-
-       int emit_state; /* current emit_state */
-       graph_t *g;     /* current graph */
-       graph_t *sg;    /* current subgraph/cluster */
-       node_t *n;      /* current node */
-       edge_t *e;      /* current edge */
-
-       char *inputFilename;    /* NULL if from stdin */
-       char *graphname;        /* name from graph */
-
-       char **lib;
-
-       /* pagination */
-       char *pagedir;          /* pagination order */
-       pointf margin;          /* margins in graph units */
-       pointf pageSize;        /* pageSize in graph units, not including margins */
-       point pb;               /* page size - including margins (inches) */
-       boxf bb;                /* graph bb in graph units, not including margins */
-       int rotation;           /* rotation - 0 = portrait, 90 = landscape */
-       bool graph_sets_margin, graph_sets_pageSize, graph_sets_rotation;
-
-       /* layers */
-       char *layerDelims;      /* delimiters in layer names */
-       char *layers;           /* null delimited list of layer names */
-       char **layerIDs;        /* array of layer names */
-       int numLayers;          /* number of layers */
-
-        int viewNum;           /* current view - 1 based count of views,
-                                       all pages in all layers */
-       /* default font */
-       char *defaultfontname;
-       double defaultfontsize;
-
-       /* default line style */
-       char **defaultlinestyle;
-
-#define MAXNEST 4
-
-       gvstyle_t styles[MAXNEST]; /* style stack - reused by each job */
-       int SP;
-
-       /* render defaults set from graph */
-       gvcolor_t bgcolor;      /* background color */
-    };
-
-#ifdef __cplusplus
-}
-#endif
-#endif                         /* GVG_H */

diff --git a/lib/gvc/gvgraphs.c b/lib/gvc/gvgraphs.c
deleted file mode 100644 (file)
index ea1953f..0000000
--- a/lib/gvc/gvgraphs.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/* $Id$ $Revision$ */
-/* vim:set shiftwidth=4 ts=8: */
-
-/**********************************************************
-*      This software is part of the graphviz package      *
-*                http://www.graphviz.org/                 *
-*                                                         *
-*            Copyright (c) 1994-2004 AT&T Corp.           *
-*                and is licensed under the                *
-*            Common Public License, Version 1.0           *
-*                      by AT&T Corp.                      *
-*                                                         *
-*        Information and Software Systems Research        *
-*              AT&T Research, Florham Park NJ             *
-**********************************************************/
-
-/*
-    A gvgraph (GVG_t*) is a single graph within a gvcontext (GVC_t *) 
-    which can support multiple graphs.
-
-    Each gvgraph (GVG_t *) may have multiple gvjobs (GVJ_t *) which correspond
-    to the renderings of that graph.
- */
-
-#include "render.h"
-#include "gvcint.h"
-
-static FILE *gvNextInputFile(GVC_t *gvc)
-{
-    static int ctr = 0;
-    FILE *rv = NULL;
-
-    if (Files[0] == NULL) {
-        if (ctr++ == 0)
-            rv = stdin;
-    } else {
-        rv = NULL;
-        while (Files[ctr]) {
-            if ((rv = fopen(Files[ctr++], "r")))
-                break;
-            else {
-                agerr(AGERR, "%s: can't open %s\n", CmdName,
-                      Files[ctr - 1]);
-                graphviz_errors++;
-            }
-        }
-    }
-    if (rv) {
-        agsetfile(Files[0] ? Files[ctr - 1] : "<stdin>");
-       if (Files[0])
-           gvc->gvg->inputFilename = Files[ctr - 1];
-       else
-           gvc->gvg->inputFilename = NULL;
-    }
-    return rv;
-}
-
-graph_t *gvNextInputGraph(GVC_t *gvc)
-{
-    graph_t *g;
-    static FILE *fp;
-
-    if (fp == NULL)
-        fp = gvNextInputFile(gvc);
-    g = NULL;
-
-    while (fp != NULL) {
-        if ((g = agread(fp)))
-            break;
-        fp = gvNextInputFile(gvc);
-    }
-    return g;
-}
-

diff --git a/lib/gvc/gvjobs.c b/lib/gvc/gvjobs.c
index aeeecec2aecb5af9d396a1d0a51fd9de3a1741c3..9676a0cdcb7a2c4a7a299dbec3022da32b254e75 100644 (file)
--- a/lib/gvc/gvjobs.c
+++ b/lib/gvc/gvjobs.c
@@ -48,14 +48,12 @@ static GVJ_t *output_langname_job;
 /* -o switches */
 void gvrender_output_filename_job(GVC_t * gvc, char *name)
 {
-    GVG_t *gvg = gvc->gvg;
-
-    if (!gvg->jobs) {
-       output_filename_job = gvg->job = gvg->jobs =
+    if (!gvc->jobs) {
+       output_filename_job = gvc->job = gvc->jobs =
            zmalloc(sizeof(GVJ_t));
     } else {
        if (!output_filename_job) {
-           output_filename_job = gvg->jobs;
+           output_filename_job = gvc->jobs;
        } else {
            if (!output_filename_job->next) {
                output_filename_job->next =
@@ -65,20 +63,18 @@ void gvrender_output_filename_job(GVC_t * gvc, char *name)
        }
     }
     output_filename_job->output_filename = name;
-    output_filename_job->gvg = gvg;
+    output_filename_job->gvc = gvc;
 }
 
 /* -T switches */
 bool gvrender_output_langname_job(GVC_t * gvc, char *name)
 {
-    GVG_t *gvg = gvc->gvg;
-
-    if (!gvg->jobs) {
-       output_langname_job = gvg->job = gvg->jobs =
+    if (!gvc->jobs) {
+       output_langname_job = gvc->job = gvc->jobs =
            zmalloc(sizeof(GVJ_t));
     } else {
        if (!output_langname_job) {
-           output_langname_job = gvg->jobs;
+           output_langname_job = gvc->jobs;
        } else {
            if (!output_langname_job->next) {
                output_langname_job->next =
@@ -88,7 +84,7 @@ bool gvrender_output_langname_job(GVC_t * gvc, char *name)
        }
     }
     output_langname_job->output_langname = name;
-    output_langname_job->gvg = gvg;
+    output_langname_job->gvc = gvc;
 
     /* load it now to check that it exists */
     if (gvplugin_load(gvc, API_render, name))
@@ -98,23 +94,20 @@ bool gvrender_output_langname_job(GVC_t * gvc, char *name)
 
 GVJ_t *gvrender_first_job(GVC_t * gvc)
 {
-    GVG_t *gvg = gvc->gvg;
-
-    return (gvg->job = gvg->jobs);
+    return (gvc->job = gvc->jobs);
 }
 
 GVJ_t *gvrender_next_job(GVC_t * gvc)
 {
-    GVG_t *gvg = gvc->gvg;
-    GVJ_t *job = gvg->job->next;
+    GVJ_t *job = gvc->job->next;
 
     if (job) {
        /* if langname not specified, then repeat previous value */
        if (!job->output_langname)
-           job->output_langname = gvg->job->output_langname;
+           job->output_langname = gvc->job->output_langname;
        /* if filename not specified, then leave NULL to indicate stdout */
     }
-    return (gvg->job = job);
+    return (gvc->job = job);
 }
 
 gv_argvlist_t *gvNEWargvlist(void)
@@ -150,9 +143,8 @@ void gv_argvlist_free(gv_argvlist_t *list)
 void gvrender_delete_jobs(GVC_t * gvc)
 {
     GVJ_t *job, *j;
-    GVG_t *gvg = gvc->gvg;
 
-    job = gvg->jobs;
+    job = gvc->jobs;
     while ((j = job)) {
        job = job->next;
        gv_argvlist_reset(&(j->selected_obj_attributes));
@@ -163,6 +155,6 @@ void gvrender_delete_jobs(GVC_t * gvc)
            free(j->selected_href);
        free(j);
     }
-    gvg->jobs = gvg->job = gvg->active_jobs = output_filename_job = output_langname_job =
+    gvc->jobs = gvc->job = gvc->active_jobs = output_filename_job = output_langname_job =
        NULL;
 }

diff --git a/lib/gvc/gvplugin_device.h b/lib/gvc/gvplugin_device.h
index 99b47713ed78d0fff3a4924f27c547e9e83ebe3c..a073ed0c7700e9ae868d87d81c9bc0a12481be65 100644 (file)
--- a/lib/gvc/gvplugin_device.h
+++ b/lib/gvc/gvplugin_device.h
@@ -18,7 +18,7 @@
 #define GVDEVICE_PLUGIN_H
 
 #include "gvplugin.h"
-#include "gvj.h"
+#include "gvcjob.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lib/gvc/gvplugin_render.h b/lib/gvc/gvplugin_render.h
index a7dc1c4e4654b9c7f53b63225102ed98c6225122..aba4aa4b45d159e0f384c1bc138e13ea46e70a24 100644 (file)
--- a/lib/gvc/gvplugin_render.h
+++ b/lib/gvc/gvplugin_render.h
@@ -18,7 +18,7 @@
 #define GVRENDER_PLUGIN_H
 
 #include "gvplugin.h"
-#include "gvj.h"
+#include "gvcjob.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lib/gvc/gvrender.c b/lib/gvc/gvrender.c
index 76f4485f07dc6d9dcd6fd09ed692a26831dc20fd..4bf7a7155d9ea26920efa479eaa59829a85de296 100644 (file)
--- a/lib/gvc/gvrender.c
+++ b/lib/gvc/gvrender.c
@@ -53,7 +53,7 @@ static int sizeA;
 
 int gvrender_select(GVJ_t * job, char *str)
 {
-    GVC_t *gvc = job->gvg->gvc;
+    GVC_t *gvc = job->gvc;
     gvplugin_available_t *plugin;
     gvplugin_installed_t *typeptr;
     char *device;
@@ -124,11 +124,10 @@ int gvrender_features(GVJ_t * job)
 
 void gvrender_begin_job(GVJ_t * job)
 {
-    GVG_t *gvg = job->gvg;
-    GVC_t *gvc = gvg->gvc;
+    GVC_t *gvc = job->gvc;
     gvrender_engine_t *gvre = job->render.engine;
 
-    job->bb = gvg->bb;
+    job->bb = gvc->bb;
     if (gvre) {
         if (gvre->begin_job)
            gvre->begin_job(job);
@@ -138,7 +137,7 @@ void gvrender_begin_job(GVJ_t * job)
        codegen_t *cg = job->codegen;
 
        if (cg && cg->begin_job)
-           cg->begin_job(job->output_file, gvg->g, gvg->lib, gvc->user,
+           cg->begin_job(job->output_file, gvc->g, gvc->lib, gvc->user,
                          gvc->info, job->pagesArraySize);
     }
 #endif
@@ -158,7 +157,7 @@ void gvrender_end_job(GVJ_t * job)
            cg->end_job();
     }
 #endif
-    job->gvg->lib = NULL;
+    job->gvc->lib = NULL;
 }
 
 /* font modifiers */
@@ -228,7 +227,7 @@ static void gvrender_resolve_color(gvrender_features_t * features,
 
 void gvrender_begin_graph(GVJ_t * job, graph_t * g)
 {
-    GVG_t *gvg = job->gvg;
+    GVC_t *gvc = job->gvc;
     gvrender_engine_t *gvre = job->render.engine;
     char *str;
     double sx, sy;
@@ -236,7 +235,7 @@ void gvrender_begin_graph(GVJ_t * job, graph_t * g)
     sx = job->width / (job->zoom * 2.);
     sy = job->height / (job->zoom * 2.);
 
-    gvg->sg = g;  /* current subgraph/cluster */
+    gvc->sg = g;  /* current subgraph/cluster */
     job->compscale.x = job->zoom * job->dpi.x / POINTS_PER_INCH;
     job->compscale.y = job->zoom * job->dpi.y / POINTS_PER_INCH;
     job->compscale.y *= (job->flags & GVRENDER_Y_GOES_DOWN) ? -1. : 1.;
@@ -273,19 +272,19 @@ void gvrender_begin_graph(GVJ_t * job, graph_t * g)
     if (gvre) {
        /* render specific init */
        if (gvre->begin_graph)
-           gvre->begin_graph(job, gvg->graphname);
+           gvre->begin_graph(job, gvc->graphname);
 
        /* background color */
        if (((str = agget(g, "bgcolor")) != 0) && str[0]) {
            gvrender_resolve_color(job->render.features, str,
-                                  &(gvg->bgcolor));
+                                  &(gvc->bgcolor));
            if (gvre->resolve_color)
-               gvre->resolve_color(job, &(gvg->bgcolor));
+               gvre->resolve_color(job, &(gvc->bgcolor));
        }
 
        /* init stack */
-       gvg->SP = 0;
-       job->style = &(gvg->styles[0]);
+       gvc->SP = 0;
+       job->style = &(gvc->styles[0]);
        gvrender_set_pencolor(job, DEFAULT_COLOR);
        gvrender_set_fillcolor(job, DEFAULT_FILL);
        job->style->fontfam = DEFAULT_FONTNAME;
@@ -310,7 +309,7 @@ fprintf(stderr,"pb = %d,%d %d,%d\n",
 #endif
 
        if (cg && cg->begin_graph)
-           cg->begin_graph(job, g, job->boundingBox, gvg->pb);
+           cg->begin_graph(gvc, g, job->boundingBox, gvc->pb);
     }
 #endif
 }
@@ -329,7 +328,7 @@ void gvrender_end_graph(GVJ_t * job)
            cg->end_graph();
     }
 #endif
-    job->gvg->sg = NULL;
+    job->gvc->sg = NULL;
 }
 
 void gvrender_begin_page(GVJ_t * job)
@@ -346,7 +345,7 @@ void gvrender_begin_page(GVJ_t * job)
 
        PF2P(job->pageOffset, offset);
        if (cg && cg->begin_page)
-           cg->begin_page(job->gvg->g, job->pagesArrayElem,
+           cg->begin_page(job->gvc->g, job->pagesArrayElem,
                job->zoom, job->rotation, offset);
     }
 #endif
@@ -373,13 +372,13 @@ void gvrender_begin_layer(GVJ_t * job)
     gvrender_engine_t *gvre = job->render.engine;
 
     if (gvre && gvre->begin_layer)
-       gvre->begin_layer(job, job->gvg->layerIDs[job->layerNum], job->layerNum, job->numLayers);
+       gvre->begin_layer(job, job->gvc->layerIDs[job->layerNum], job->layerNum, job->numLayers);
 #ifndef DISABLE_CODEGENS
     else {
        codegen_t *cg = job->codegen;
 
        if (cg && cg->begin_layer)
-           cg->begin_layer(job->gvg->layerIDs[job->layerNum], job->layerNum, job->numLayers);
+           cg->begin_layer(job->gvc->layerIDs[job->layerNum], job->layerNum, job->numLayers);
     }
 #endif
 }
@@ -404,7 +403,7 @@ void gvrender_begin_cluster(GVJ_t * job, graph_t * sg)
 {
     gvrender_engine_t *gvre = job->render.engine;
 
-    job->gvg->sg = sg;  /* set current cluster graph object */
+    job->gvc->sg = sg;  /* set current cluster graph object */
 #ifndef DISABLE_CODEGENS
     Obj = CLST;
 #endif
@@ -435,7 +434,7 @@ void gvrender_end_cluster(GVJ_t * job, graph_t *g)
     }
     Obj = NONE;
 #endif
-    job->gvg->sg = g;  /* reset current cluster to parent graph or cluster */
+    job->gvc->sg = g;  /* reset current cluster to parent graph or cluster */
 }
 
 void gvrender_begin_nodes(GVJ_t * job)
@@ -509,7 +508,7 @@ void gvrender_begin_node(GVJ_t * job, node_t * n)
 #ifndef DISABLE_CODEGENS
     Obj = NODE;
 #endif
-    job->gvg->n = n; /* set current node */
+    job->gvc->n = n; /* set current node */
     if (gvre && gvre->begin_node)
        gvre->begin_node(job, n->name, n->id);
 #ifndef DISABLE_CODEGENS
@@ -537,7 +536,7 @@ void gvrender_end_node(GVJ_t * job)
     }
     Obj = NONE;
 #endif
-    job->gvg->n = NULL; /* clear current node */
+    job->gvc->n = NULL; /* clear current node */
 }
 
 void gvrender_begin_edge(GVJ_t * job, edge_t * e)
@@ -547,7 +546,7 @@ void gvrender_begin_edge(GVJ_t * job, edge_t * e)
 #ifndef DISABLE_CODEGENS
     Obj = EDGE;
 #endif
-    job->gvg->e = e; /* set current edge */
+    job->gvc->e = e; /* set current edge */
     if (gvre && gvre->begin_edge)
        gvre->begin_edge(job, e->tail->name,
                         e->tail->graph->root->kind & AGFLAG_DIRECTED,
@@ -577,19 +576,19 @@ void gvrender_end_edge(GVJ_t * job)
     }
     Obj = NONE;
 #endif
-    job->gvg->e = NULL; /* clear current edge */
+    job->gvc->e = NULL; /* clear current edge */
 }
 
 void gvrender_begin_context(GVJ_t * job)
 {
-    GVG_t *gvg = job->gvg;
+    GVC_t *gvc = job->gvc;
     gvrender_engine_t *gvre = job->render.engine;
 
     if (gvre) {
-       (gvg->SP)++;
-       assert((gvg->SP) < MAXNEST);
-       gvg->styles[gvg->SP] = gvg->styles[(gvg->SP) - 1];
-       job->style = &(gvg->styles[gvg->SP]);
+       (gvc->SP)++;
+       assert((gvc->SP) < MAXNEST);
+       gvc->styles[gvc->SP] = gvc->styles[(gvc->SP) - 1];
+       job->style = &(gvc->styles[gvc->SP]);
     }
 #ifndef DISABLE_CODEGENS
     else {
@@ -603,13 +602,13 @@ void gvrender_begin_context(GVJ_t * job)
 
 void gvrender_end_context(GVJ_t * job)
 {
-    GVG_t *gvg = job->gvg;
+    GVC_t *gvc = job->gvc;
     gvrender_engine_t *gvre = job->render.engine;
 
     if (gvre) {
-       gvg->SP--;
-       assert(gvg->SP >= 0);
-       job->style = &(gvg->styles[gvg->SP]);
+       gvc->SP--;
+       assert(gvc->SP >= 0);
+       job->style = &(gvc->styles[gvc->SP]);
     }
 #ifndef DISABLE_CODEGENS
     else {

diff --git a/tclpkg/tcldot/tcldot.c b/tclpkg/tcldot/tcldot.c
index f6b711648e68ea5f56438c153004198564847b5a..ca428f264de14cc9ff16e0646656a859d990465f 100644 (file)
--- a/tclpkg/tcldot/tcldot.c
+++ b/tclpkg/tcldot/tcldot.c
@@ -1085,10 +1085,10 @@ static int graphcmd(ClientData clientData, Tcl_Interp * interp,
                                      (char *) 0);
            return TCL_ERROR;
        }
-       gvc->gvg->active_jobs = gvc->gvg->job;
+       gvc->active_jobs = gvc->job;
 
-       gvc->gvg->job->surface = (void *)(&tkgendata);
-       gvc->gvg->job->external_surface = TRUE;
+       gvc->job->surface = (void *)(&tkgendata);
+       gvc->job->external_surface = TRUE;
 
        /* make sure that layout is done */
        g = g->root;
@@ -1116,14 +1116,14 @@ static int graphcmd(ClientData clientData, Tcl_Interp * interp,
                                      (char *) 0);
            return TCL_ERROR;
        }
-       gvc->gvg->active_jobs = gvc->gvg->job;
+       gvc->active_jobs = gvc->job;
 
        if (!  (hdl = tclhandleXlate(GDHandleTable, argv[2]))) {
            Tcl_AppendResult(interp, "GD Image not found.", (char *) NULL);
            return TCL_ERROR;
        }
-       gvc->gvg->job->surface = *hdl;
-       gvc->gvg->job->external_surface = TRUE;
+       gvc->job->surface = *hdl;
+       gvc->job->external_surface = TRUE;
 
        /* make sure that layout is done */
        g = g->root;
@@ -1254,19 +1254,19 @@ static int graphcmd(ClientData clientData, Tcl_Interp * interp,
                "\". Use one of:", s, (char *)NULL);
            return TCL_ERROR;
        }
-       gvc->gvg->active_jobs = gvc->gvg->job;
+       gvc->active_jobs = gvc->job;
 
        /* populate new job struct with output language and output file data */
-       gvc->gvg->job->output_lang =
-            gvrender_select(gvc->gvg->job, gvc->gvg->job->output_langname);
+       gvc->job->output_lang =
+            gvrender_select(gvc->job, gvc->job->output_langname);
 
        if (Tcl_GetOpenFile (interp, argv[2], 1, 1,
-            (ClientData *) &(gvc->gvg->job->output_file)) != TCL_OK)
+            (ClientData *) &(gvc->job->output_file)) != TCL_OK)
            return TCL_ERROR;
 
        /* make sure that layout is done  - unless canonical output */
        if ((!GD_drawing(g) || argc > 4)
-           && gvc->gvg->job->output_lang != CANONICAL_DOT) {
+           && gvc->job->output_lang != CANONICAL_DOT) {
            tcldot_layout(gvc, g, (argc > 4) ? argv[4] : (char *) NULL);
        }
 

diff --git a/tclpkg/tcldot/tkgen.c b/tclpkg/tcldot/tkgen.c
index a7877ea6f43f2a8e767225bbd1ebe2374b4af83a..106d971be59d97d26314bd17e8e8db65778d933b 100644 (file)
--- a/tclpkg/tcldot/tkgen.c
+++ b/tclpkg/tcldot/tkgen.c
@@ -184,21 +184,21 @@ static void tk_end_job(void)
 {
 }
 
-static void tk_begin_graph(GVJ_t * job, graph_t * g, box bb, point pb)
+static void tk_begin_graph(GVC_t * gvc, graph_t * g, box bb, point pb)
 {
     double dpi = GD_drawing(g)->dpi;
 
-    Tkgendata = (tkgendata_t *)job->surface;
+    Tkgendata = (tkgendata_t *)gvc->job->surface;
 
     if (dpi < 1.0)
        dpi = DEFAULT_DPI;
     DevScale = dpi / POINTS_PER_INCH;
 
-    Viewport.x = job->width;
-    Viewport.y = job->height;
+    Viewport.x = gvc->job->width;
+    Viewport.y = gvc->job->height;
     if (Viewport.x) {
-       Zoom = job->zoom;
-       GraphFocus = job->focus;
+       Zoom = gvc->job->zoom;
+       GraphFocus = gvc->job->focus;
     } else {
        Viewport.x =
            (bb.UR.x - bb.LL.x + 2 * GD_drawing(g)->margin.x) * DevScale +