diff options
| author | Karen Lease <klease@apache.org> | 2002-02-18 22:49:22 +0000 |
|---|---|---|
| committer | Karen Lease <klease@apache.org> | 2002-02-18 22:49:22 +0000 |
| commit | 915bd9cd20b136de493c54aeea2e7e4a1b8fe5f3 (patch) | |
| tree | f1e10f7069c6516906ca670857975667d917e56e /src/org/apache/fop/fo/pagination | |
| parent | b14573853bdeb5b3a5cd43282a6e4693503a126b (diff) | |
| download | xmlgraphics-fop-915bd9cd20b136de493c54aeea2e7e4a1b8fe5f3.tar.gz xmlgraphics-fop-915bd9cd20b136de493c54aeea2e7e4a1b8fe5f3.zip | |
Fix some bugs in the CTM logic
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@194654 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/org/apache/fop/fo/pagination')
| -rw-r--r-- | src/org/apache/fop/fo/pagination/RegionBody.java | 10 | ||||
| -rw-r--r-- | src/org/apache/fop/fo/pagination/SimplePageMaster.java | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/org/apache/fop/fo/pagination/RegionBody.java b/src/org/apache/fop/fo/pagination/RegionBody.java index 181f6378a..5a6429ed2 100644 --- a/src/org/apache/fop/fo/pagination/RegionBody.java +++ b/src/org/apache/fop/fo/pagination/RegionBody.java @@ -36,9 +36,18 @@ public class RegionBody extends Region { // Need these in writing-mode relative coordinates // Or shall we get absolute and transform to relative using writing mode? MarginProps mProps = propMgr.getMarginProps(); + /** + System.err.println("BodyRegion margin props=" + mProps.startIndent + "," + + mProps.spaceBefore + "," + mProps.endIndent + "," + + mProps.spaceAfter); + return new Rectangle( mProps.startIndent, mProps.spaceBefore, reldims.ipd - mProps.startIndent - mProps.endIndent, reldims.bpd - mProps.spaceBefore - mProps.spaceAfter); + **/ + return new Rectangle( mProps.marginLeft, mProps.marginTop, + reldims.ipd - mProps.marginLeft - mProps.marginRight, + reldims.bpd - mProps.marginTop - mProps.marginBottom); } protected void setRegionTraits(RegionReference r, Rectangle2D absRegVPRect) { @@ -66,6 +75,7 @@ public class RegionBody extends Region { public RegionReference makeRegionReferenceArea(Rectangle2D absRegVPRect) { // Should set some column stuff here I think, or put it elsewhere BodyRegion body = new BodyRegion(); + setRegionTraits(body, absRegVPRect); int columnCount= this.properties.get("column-count").getNumber().intValue(); if ((columnCount > 1) && (overflow == Overflow.SCROLL)) { diff --git a/src/org/apache/fop/fo/pagination/SimplePageMaster.java b/src/org/apache/fop/fo/pagination/SimplePageMaster.java index 42b4c4f0e..9cd1dea09 100644 --- a/src/org/apache/fop/fo/pagination/SimplePageMaster.java +++ b/src/org/apache/fop/fo/pagination/SimplePageMaster.java @@ -85,7 +85,7 @@ public class SimplePageMaster extends FObj { * The media rectangle itself is (0,0,pageWidth,pageHeight). */ Rectangle pageRefRect = - new Rectangle(mProps.marginLeft, mProps.marginBottom, + new Rectangle(mProps.marginLeft, mProps.marginTop, pageWidth - mProps.marginLeft - mProps.marginRight, pageHeight - mProps.marginTop - mProps.marginBottom); |