Layout changed to account for fo:region-body borders and padding when

determining printable width and height for each page.

Various method nitpicks also fixed.


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196974 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 9 insertions, 9 deletions

diff --git a/src/java/org/apache/fop/render/AbstractRenderer.java b/src/java/org/apache/fop/render/AbstractRenderer.java
index d15895319..39e18e33b 100644
--- a/src/java/org/apache/fop/render/AbstractRenderer.java
+++ b/src/java/org/apache/fop/render/AbstractRenderer.java
@@ -298,15 +298,15 @@ public abstract class AbstractRenderer extends AbstractLogEnabled
         decision is to have fo:region-body on top, hence it is rendered
         last here. */
         RegionViewport viewport;
-        viewport = page.getRegion(Region.BEFORE_CODE);
+        viewport = page.getRegionViewport(Region.BEFORE_CODE);
         renderRegionViewport(viewport);
-        viewport = page.getRegion(Region.START_CODE);
+        viewport = page.getRegionViewport(Region.START_CODE);
         renderRegionViewport(viewport);
-        viewport = page.getRegion(Region.END_CODE);
+        viewport = page.getRegionViewport(Region.END_CODE);
         renderRegionViewport(viewport);
-        viewport = page.getRegion(Region.AFTER_CODE);
+        viewport = page.getRegionViewport(Region.AFTER_CODE);
         renderRegionViewport(viewport);
-        viewport = page.getRegion(Region.BODY_CODE);
+        viewport = page.getRegionViewport(Region.BODY_CODE);
         renderRegionViewport(viewport);
     }
 
diff --git a/src/java/org/apache/fop/render/pdf/PDFRenderer.java b/src/java/org/apache/fop/render/pdf/PDFRenderer.java
index 5fa8ecdcb..d95073372 100644
--- a/src/java/org/apache/fop/render/pdf/PDFRenderer.java
+++ b/src/java/org/apache/fop/render/pdf/PDFRenderer.java
@@ -916,12 +916,12 @@ public class PDFRenderer extends PrintRenderer {
         //  where previous line area failed to take up entire allocated space
         int rx = currentBlockIPPosition + IPMarginOffset;
         int bl = currentBPPosition + BPMarginOffset + text.getOffset();
-
-/*      System.out.println("BlockIP Position: " + currentBlockIPPosition +
+/*
+        System.out.println("\nBlockIP Position: " + currentBlockIPPosition +
             "; currentBPPosition: " + currentBPPosition +
             "; offset: " + text.getOffset() +
-            "; Text = " + text.getTextArea()); */
-
+            "; Text = " + text.getTextArea());
+*/
         // Set letterSpacing
         //float ls = fs.getLetterSpacing() / this.currentFontSize;
         //pdf.append(ls).append(" Tc\n");