You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2005/08/29 16:22:25 UTC

svn commit: r264147 - in /xmlgraphics/fop/trunk/src/java/org/apache/fop/render: AbstractPathOrientedRenderer.java pdf/PDFRenderer.java

Author: jeremias
Date: Mon Aug 29 07:22:21 2005
New Revision: 264147

URL: http://svn.apache.org/viewcvs?rev=264147&view=rev
Log:
Moved renderInlineBlockParent() up to the superclass. Fixes border and background painting for inline block parents in PostScript.

Modified:
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderer.java

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java?rev=264147&r1=264146&r2=264147&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java Mon Aug 29 07:22:21 2005
@@ -29,6 +29,7 @@
 import org.apache.fop.area.RegionViewport;
 import org.apache.fop.area.Trait;
 import org.apache.fop.area.inline.InlineArea;
+import org.apache.fop.area.inline.InlineBlockParent;
 import org.apache.fop.area.inline.Viewport;
 import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.fo.Constants;
@@ -359,6 +360,17 @@
             drawBorderLine(outerx, sy1a, innerx, ey1a, false, true, bpsStart.style, bpsStart.color);
             restoreGraphicsState();
         }
+    }
+    
+    /** @see org.apache.fop.render.AbstractRenderer */
+    protected void renderInlineBlockParent(InlineBlockParent ibp) {
+        float start = currentIPPosition / 1000f;
+        float top = (ibp.getOffset() + currentBPPosition) / 1000f;
+        float width = ibp.getIPD() / 1000f;
+        float height = ibp.getBPD() / 1000f;
+        drawBackAndBorders(ibp, start, top, width, height);
+        
+        super.renderInlineBlockParent(ibp);
     }
     
     /**

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderer.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderer.java?rev=264147&r1=264146&r2=264147&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderer.java Mon Aug 29 07:22:21 2005
@@ -47,7 +47,6 @@
 import org.apache.fop.area.OffDocumentItem;
 import org.apache.fop.area.BookmarkData;
 import org.apache.fop.area.inline.Character;
-import org.apache.fop.area.inline.InlineBlockParent;
 import org.apache.fop.area.inline.TextArea;
 import org.apache.fop.area.inline.ForeignObject;
 import org.apache.fop.area.inline.Image;
@@ -1008,17 +1007,6 @@
         }
     }
 
-    /** @see org.apache.fop.render.AbstractRenderer */
-    protected void renderInlineBlockParent(InlineBlockParent ibp) {
-        float start = currentIPPosition / 1000f;
-        float top = (ibp.getOffset() + currentBPPosition) / 1000f;
-        float width = ibp.getIPD() / 1000f;
-        float height = ibp.getBPD() / 1000f;
-        drawBackAndBorders(ibp, start, top, width, height);
-        
-        super.renderInlineBlockParent(ibp);
-    }
-    
     /**
      * @see org.apache.fop.render.AbstractRenderer#renderCharacter(Character)
      */



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org