Put back magins in Postscript BoundingBox. Default now to 5 points.

diff --git a/lib/common/const.h b/lib/common/const.h
index 549ced00fa40338413dd75ba8fa74dd7e2c23d67..12f0d7c582014bb67c2c2a19712e4f419f162934 100644 (file)
--- a/lib/common/const.h
+++ b/lib/common/const.h
@@ -86,7 +86,8 @@
 #define                MIN_RANKSEP             0.02
 
 /* default margin for paged formats such as PostScript */
-#define                DEFAULT_MARGIN  36
+/* #define             DEFAULT_MARGIN  36 */
+#define                DEFAULT_MARGIN  5
 
 /* default margin for embedded formats such as PNG */
 #define                DEFAULT_EMBED_MARGIN    5

diff --git a/lib/common/psgen.c b/lib/common/psgen.c
index aedde1419b074536fdf3f91cd83a706b21548d62..034c25310d6d9b72f4e92d6b5e6c38be054bc9fa 100644 (file)
--- a/lib/common/psgen.c
+++ b/lib/common/psgen.c
@@ -107,12 +107,17 @@ static void ps_comment(char *str)
 static void ps_begin_graph(GVC_t * gvc, graph_t * g, box bb, point pb)
 {
     char *s;
+    point sz;
 
     PB = bb;
+    /* PB (in the case of a single page graph) is the graph bb offset
+     * at PB.LL by the B & L margin width.
+     * The PostScript BoundingBox also needs margin T & R */
+    sz = add_points(PB.LL, PB.UR);
     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);
+               0, 0, sz.x, sz.y);
        fprintf(Output_file, "%%%%EndComments\nsave\n");
        cat_libfile(Output_file, U_lib, ps_txt);
        epsf_define(Output_file);