fix paging

diff --git a/lib/common/emit.c b/lib/common/emit.c
index 259175c84f114462262b7720d3e1ae12016c7c74..e72f4ed2ce0e3f4c2b8e8bd96fd9c91b6a9e6009 100644 (file)
--- a/lib/common/emit.c
+++ b/lib/common/emit.c
@@ -304,7 +304,6 @@ static void firstpage(GVC_t *gvc)
     gvrender_job_t *job = gvc->job;
 
     job->pagesArrayElem = job->pagesArrayFirst;
-    job->pageNum = 1;
 }
 
 static boolean validpage(GVC_t *gvc)
@@ -329,7 +328,6 @@ static void nextpage(GVC_t *gvc)
            job->pagesArrayElem.y = job->pagesArrayFirst.y;
        job->pagesArrayElem = add_points(job->pagesArrayElem, job->pagesArrayMajor);
     }
-    job->pageNum = job->pagesArrayElem.x + job->pagesArrayElem.y * job->pagesArraySize.x + 1;
 }
 
 static boolean write_edge_test(Agraph_t * g, Agedge_t * e)
@@ -411,6 +409,13 @@ static void setup_page(GVC_t * gvc, graph_t * g)
        job->pageOffset.y = -(job->pagesArrayElem.x)     * job->pageSize.x;
     }
 
+#if 0
+fprintf(stderr,"pagesArrayElem = %d,%d pageSize = %g,%g pageOffset = %g,%g\n",
+       job->pagesArrayElem.x, job->pagesArrayElem.y,
+       job->pageSize.x, job->pageSize.y,
+       job->pageOffset.x, job->pageOffset.y);
+#endif
+
     gvrender_begin_page(gvc);
     emit_background(gvc, g);
     emit_defaults(gvc);
@@ -421,6 +426,12 @@ static boolean node_in_pageBox(GVC_t *gvc, node_t * n)
     gvrender_job_t *job = gvc->job;
     boxf nb;
 
+#if 0
+fprintf(stderr,"pageBox = %g,%g,%g,%g\n",
+       job->pageBox.LL.x, job->pageBox.LL.y,
+       job->pageBox.UR.x, job->pageBox.UR.y);
+#endif
+
     if (job->numPages == 1)
        return TRUE;
     nb.LL.x = ND_coord_i(n).x - ND_lw_i(n);
@@ -559,8 +570,16 @@ static void emit_node(GVC_t * gvc, node_t * n)
 
     if (ND_shape(n) == NULL)
        return;
+#if 0
+fprintf(stderr,"node_in_layer %s node_in_pageBox %s state %s\n",
+       node_in_layer(gvc, n->graph, n)?"true":"false",
+       node_in_pageBox(gvc, n)?"true":"false",
+       (ND_state(n) != gvc->pageNum)?"true":"false");
+#endif
 
-    if (node_in_layer(gvc, n->graph, n) && node_in_pageBox(gvc, n) && (ND_state(n) != gvc->layerNum)) {
+    if (node_in_layer(gvc, n->graph, n)
+           && node_in_pageBox(gvc, n)
+           && (ND_state(n) != gvc->pageNum)) {
        gvrender_begin_node(gvc, n);
        if (((s = agget(n, "href")) && s[0])
            || ((s = agget(n, "URL")) && s[0])) {
@@ -575,7 +594,7 @@ static void emit_node(GVC_t * gvc, node_t * n)
        }
        gvrender_begin_context(gvc);
        ND_shape(n)->fns->codefn(gvc, n);
-       ND_state(n) = gvc->layerNum;
+       ND_state(n) = gvc->pageNum;
        gvrender_end_context(gvc);
        if (url) {
            gvrender_end_anchor(gvc);
@@ -709,8 +728,13 @@ static void emit_edge(GVC_t * gvc, edge_t * e)
 
 #define SEP 2.0
 
-    if ((edge_in_pageBox(gvc, e) == FALSE)
-       || (edge_in_layer(gvc, e->head->graph, e) == FALSE))
+#if 0
+fprintf(stderr,"edge_in_layer %s edge_in_pageBox %s\n",
+        edge_in_layer(gvc, e->head->graph, e)?"true":"false",
+        edge_in_pageBox(gvc, e)?"true":"false");
+#endif
+
+    if (! edge_in_pageBox(gvc, e) || ! edge_in_layer(gvc, e->head->graph, e))
        return;
 
     gvrender_begin_edge(gvc, e);
@@ -1027,17 +1051,11 @@ static void init_gvc_from_graph(GVC_t * gvc, graph_t * g)
 static void emit_init_job(GVC_t * gvc, graph_t * g)
 {
     init_gvc_from_graph(gvc, g);
-
     init_layering(gvc, g);
-
     init_job_flags(gvc->job, g);
-
     init_job_margin(gvc);
-
     init_job_viewport(gvc, g);
-
     init_job_pagination(gvc, g);
-
     gvrender_begin_job(gvc);
 }
 
@@ -1098,7 +1116,8 @@ void emit_graph(GVC_t * gvc, graph_t * g)
        }
     }
 
-    /* reset layerNum state - records the last layer that contained the node */
+    /* reset pageNum state - records the last page that contained the node */
+    gvc->pageNum = 0;  /* incremented for each page in each layer */
     for (n = agfstnode(g); n; n = agnxtnode(g, n))
        ND_state(n) = 0;
     /* iterate layers */
@@ -1108,6 +1127,11 @@ void emit_graph(GVC_t * gvc, graph_t * g)
 
        /* iterate pages */
        for (firstpage(gvc); validpage(gvc); nextpage(gvc)) {
+           gvc->pageNum++;
+#if 0
+fprintf(stderr,"pageNum = %d pagesArrayElem = %d,%d\n",
+       gvc->pageNum, gvc->job->pagesArrayElem.x, gvc->job->pagesArrayElem.y);
+#endif
            setup_page(gvc, g);
            Obj = NONE;
            if (((s = agget(g, "href")) && s[0])
@@ -1265,7 +1289,7 @@ void emit_jobs_eof(GVC_t * gvc)
 
     for (job = gvrender_first_job(gvc); job; job = gvrender_next_job(gvc)) {
         if (job->output_file) {
-           if (gvc->job->pageNum > 0) {
+           if (gvc->pageNum > 0) {
                emit_deinit_job(gvc);
                emit_once_reset();
            }

diff --git a/lib/common/psgen.c b/lib/common/psgen.c
index 3ea2d8b07b05264f403a2fe54d43b5acb83fb4f5..189ec22303bb317d3882016bc7ad904180894b78 100644 (file)
--- a/lib/common/psgen.c
+++ b/lib/common/psgen.c
@@ -149,6 +149,7 @@ ps_begin_page(graph_t * g, point page, double scale, int rot, point offset)
     fprintf(Output_file, "gsave\n%d %d %d %d boxprim clip newpath\n",
            0, 0, sz.x, sz.y);
     fprintf(Output_file, "%d %d %d beginpage\n", page.x, page.y, N_pages);
+    fprintf(Output_file, "%d %d translate\n", -offset.x, -offset.y);
     fprintf(Output_file, "%.4f set_scale\n", scale);
     if (rot)
         fprintf(Output_file, "%d rotate %d %d translate\n",

diff --git a/lib/gvc/gvcint.h b/lib/gvc/gvcint.h
index 8de2b248516701373cabeb645107d1238d1661f6..77740aad99d5269455d0a6c4c60728e8febe7f07 100644 (file)
--- a/lib/gvc/gvcint.h
+++ b/lib/gvc/gvcint.h
@@ -98,7 +98,6 @@ extern "C" {
        point   pagesArrayMinor; /* 2D minor increment */
        point   pagesArrayElem;  /* 2D coord of current page - 0,0 based */
         int    numPages;        /* number of pages */
-        int    pageNum;         /* current page - 1 based */
 
         unsigned int width;     /* device width in device units */
         unsigned int height;    /* device height in device units */
@@ -177,6 +176,7 @@ extern "C" {
        char **layerIDs;        /* array of layer names */
        int numLayers;          /* number of layers */
        int layerNum;           /* current layer - 1 based*/
+        int pageNum;           /* current page - 1 based counts pages in all layers*/
 
        /* default font */
        char *defaultfontname;

diff --git a/lib/gvc/gvrender.c b/lib/gvc/gvrender.c
index b787afea4f78bcc3fb9689f5cc7537a1b706ff40..e1e04e8b6b90def1a8d8e5e28092ce1b156c2357 100644 (file)
--- a/lib/gvc/gvrender.c
+++ b/lib/gvc/gvrender.c
@@ -164,7 +164,7 @@ void gvrender_begin_job(GVC_t * gvc)
     else {
        codegen_t *cg = job->codegen;
 
-       if (cg && cg->begin_job && job->pageNum <= 1)
+       if (cg && cg->begin_job)
            cg->begin_job(job->output_file, job->g, gvc->lib, gvc->user,
                          gvc->info, job->pagesArraySize);
     }
@@ -344,9 +344,12 @@ void gvrender_begin_page(GVC_t * gvc)
 #ifndef DISABLE_CODEGENS
     else {
        codegen_t *cg = job->codegen;
+       point offset;
 
+       PF2P(job->pageOffset, offset);
        if (cg && cg->begin_page)
-           cg->begin_page(job->g, job->pagesArrayElem, job->zoom, job->rotation, job->boundingBox.LL);
+           cg->begin_page(job->g, job->pagesArrayElem,
+               job->zoom, job->rotation, offset);
     }
 #endif
 }