undo previous change as it breaks too much

diff --git a/doc/info/attrs.html b/doc/info/attrs.html
index c76ab20adb3fd4eedccf8fd34bd67d44f7933d85..837dca89830f05544498c8a8bbaf17bfa06c19c0 100644 (file)
--- a/doc/info/attrs.html
+++ b/doc/info/attrs.html
@@ -1805,7 +1805,8 @@ the given types.
   dimensions (width and height) of the viewport image, in
   <A HREF=#points>points</A>,
   in the original graph drawing.
-  The optional Z is the zoom factor.  By default, Z is 1.
+  The optional Z is the zoom factor, i.e., the resulting image will be
+  Z*W by Z*H points in size. By default, Z is 1.
   The optional pair (x,y) give the position in the graph, in 
   <A HREF=#points>points</A>, of the center 
   of the viewport. To focus on a particular node, (x,y) can be set to the 

diff --git a/lib/common/emit.c b/lib/common/emit.c
index b20bc11f29eb98f095c9996133468acfd1878109..71e6db278d91e5c8a5963787b71f4c89f99e3b08 100644 (file)
--- a/lib/common/emit.c
+++ b/lib/common/emit.c
@@ -637,7 +637,8 @@ static void init_job_pagination(GVJ_t * job, graph_t *g)
     pointf centering = {0.0, 0.0}; /* centering offset - points */
 
     /* unpaginated image size - in points - in graph orientation */
-    imageSize = job->view;
+    imageSize.x = job->zoom*job->view.x;
+    imageSize.y = job->zoom*job->view.y;
 
     /* rotate imageSize to page orientation */
     if (job->rotation)
@@ -2036,7 +2037,9 @@ static void init_job_viewport(GVJ_t * job, graph_t * g)
 
        /* job->view gives port size in graph units, unscaled or rotated
         * job->focus gives center of port in graph units
-        * job->zoom gives scaling factor for viewpor
+        * job->zoom gives scaling factor for viewport in device; that is,
+        * final image will be (view.x*zoom, view.y*zoom) (possibly
+        * rotated).
         */
     job->view.x = X;
     job->view.y = Y;