From: ellson <devnull@localhost>
Date: Wed, 1 Mar 2006 14:34:06 +0000 (+0000)
Subject: generate %%BoundingBox: (atend) using the "high water mark" of all %%PageBoundingBox:
X-Git-Tag: LAST_LIBGRAPH~32^2~6774
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=57195fc5bdc078b1c05eae5fb357f7887e94dcf7;p=graphviz

generate %%BoundingBox: (atend) using the "high water mark" of all %%PageBoundingBox:
---

diff --git a/lib/common/psgen.c b/lib/common/psgen.c
index 44ca72810..583b12f9c 100644
--- a/lib/common/psgen.c
+++ b/lib/common/psgen.c
@@ -42,6 +42,7 @@ extern gdImagePtr gd_getshapeimage(char *name);
 static int N_pages, Cur_page;
 /* static 	point	Pages; */
 static box PB;
+static box DBB;
 static int onetime = TRUE;
 static int isLatin1;
 static char setupLatin1;
@@ -83,6 +84,9 @@ ps_begin_job(FILE * ofp, graph_t * g, char **lib, char *user, char *info[],
         fprintf(Output_file, "%%%%For: %s\n", user);
         fprintf(Output_file, "%%%%Title: %s\n", g->name);
         fprintf(Output_file, "%%%%Pages: (atend)\n");
+	if (Show_boxes == NULL)
+	    fprintf(Output_file, "%%%%BoundingBox: (atend)\n");
+	fprintf(Output_file, "%%%%EndComments\nsave\n");
     }
 
     /* remainder is emitted by first begin_graph */
@@ -92,6 +96,9 @@ static void ps_end_job(void)
 {
     fprintf(Output_file, "%%%%Trailer\n");
     fprintf(Output_file, "%%%%Pages: %d\n", Cur_page);
+    if (Show_boxes == NULL)
+	fprintf(Output_file, "%%%%BoundingBox: %d %d %d %d\n",
+		DBB.LL.x, DBB.LL.y, DBB.UR.x, DBB.UR.y);
     fprintf(Output_file, "end\nrestore\n");
     fprintf(Output_file, "%%%%EOF\n");
     setupLatin1 = FALSE;
@@ -108,10 +115,6 @@ static void ps_begin_graph(GVC_t * gvc, graph_t * g, box bb, point pb)
 
     PB = bb;
     if (onetime) {
-	if (Show_boxes == NULL)
-	    fprintf(Output_file, "%%%%BoundingBox: %d %d %d %d\n",
-		PB.LL.x, PB.LL.y, PB.UR.x, PB.UR.y);
-	fprintf(Output_file, "%%%%EndComments\nsave\n");
 	cat_libfile(Output_file, U_lib, ps_txt);
 	epsf_define(Output_file);
  	if (Show_boxes) {
@@ -147,17 +150,29 @@ static void
 ps_begin_page(graph_t * g, point page, double scale, int rot, point offset)
 {
     point sz;
+    box pbr;
 
     Cur_page++;
     sz = sub_points(PB.UR,PB.LL);
     fprintf(Output_file, "%%%%Page: %d %d\n", Cur_page, Cur_page);
     if (Show_boxes == NULL) {
-	if (rot)
-	    fprintf(Output_file, "%%%%PageBoundingBox: %d %d %d %d\n",
-	        PB.LL.y, PB.LL.x, PB.UR.y, PB.UR.x);
-	else
-	    fprintf(Output_file, "%%%%PageBoundingBox: %d %d %d %d\n",
-	        PB.LL.x, PB.LL.y, PB.UR.x, PB.UR.y);
+	if (rot) {
+	    pbr.LL.x = PB.LL.y;
+	    pbr.LL.y = PB.LL.x;
+	    pbr.UR.x = PB.LL.y;
+	    pbr.UR.y = PB.LL.x;
+	}
+	else {
+	    pbr = PB;
+	}
+	fprintf(Output_file, "%%%%PageBoundingBox: %d %d %d %d\n",
+	        pbr.LL.x, pbr.LL.y, pbr.UR.x, pbr.UR.y);
+	if (onetime) {
+	    DBB = pbr;
+	}
+	else {
+	    EXPANDBB(DBB, pbr);
+	}
     }
     fprintf(Output_file, "%%%%PageOrientation: %s\n",
 	    (rot ? "Landscape" : "Portrait"));