arved 02/04/23 15:25:25
Modified: src/org/apache/fop/fo/pagination Tag: fop-0_20_2-maintain
RegionAfter.java RegionBefore.java RegionBody.java
RegionEnd.java RegionStart.java
Log:
support for background-image (all renderers)
author: Michael Gratton
Revision Changes Path
No revision
No revision
1.9.2.1 +7 -5 xml-fop/src/org/apache/fop/fo/pagination/RegionAfter.java
Index: RegionAfter.java
===================================================================
RCS file: /x1/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/RegionAfter.java,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- RegionAfter.java 30 Jul 2001 20:29:25 -0000 1.9
+++ RegionAfter.java 23 Apr 2002 22:25:25 -0000 1.9.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: RegionAfter.java,v 1.9 2001/07/30 20:29:25 tore Exp $
+ * $Id: RegionAfter.java,v 1.9.2.1 2002/04/23 22:25:25 arved Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -57,10 +57,12 @@
// this.properties.get("reference-orientation");
// this.properties.get("writing-mode");
- return new RegionArea(allocationRectangleXPosition,
- allocationRectangleYPosition
- - allocationRectangleHeight + extent,
- allocationRectangleWidth, extent);
+ RegionArea area = new RegionArea(allocationRectangleXPosition,
+ allocationRectangleYPosition
+ - allocationRectangleHeight + extent,
+ allocationRectangleWidth, extent);
+ area.setBackground(bProps);
+ return area;
}
1.9.2.1 +6 -4 xml-fop/src/org/apache/fop/fo/pagination/RegionBefore.java
Index: RegionBefore.java
===================================================================
RCS file: /x1/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/RegionBefore.java,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- RegionBefore.java 30 Jul 2001 20:29:25 -0000 1.9
+++ RegionBefore.java 23 Apr 2002 22:25:25 -0000 1.9.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: RegionBefore.java,v 1.9 2001/07/30 20:29:25 tore Exp $
+ * $Id: RegionBefore.java,v 1.9.2.1 2002/04/23 22:25:25 arved Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -58,9 +58,11 @@
// this.properties.get("reference-orientation");
// this.properties.get("writing-mode");
- return new RegionArea(allocationRectangleXPosition,
- allocationRectangleYPosition,
- allocationRectangleWidth, extent);
+ RegionArea area = new RegionArea(allocationRectangleXPosition,
+ allocationRectangleYPosition,
+ allocationRectangleWidth, extent);
+ area.setBackground(bProps);
+ return area;
}
1.11.2.1 +3 -9 xml-fop/src/org/apache/fop/fo/pagination/RegionBody.java
Index: RegionBody.java
===================================================================
RCS file: /x1/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/RegionBody.java,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- RegionBody.java 20 Aug 2001 11:19:24 -0000 1.11
+++ RegionBody.java 23 Apr 2002 22:25:25 -0000 1.11.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: RegionBody.java,v 1.11 2001/08/20 11:19:24 keiron Exp $
+ * $Id: RegionBody.java,v 1.11.2.1 2002/04/23 22:25:25 arved Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -11,7 +11,6 @@
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.properties.Overflow;
-import org.apache.fop.datatypes.ColorType;
import org.apache.fop.apps.FOPException;
import org.apache.fop.layout.RegionArea;
import org.apache.fop.layout.BodyRegionArea;
@@ -36,8 +35,6 @@
public static final String REGION_CLASS = "body";
- ColorType backgroundColor;
-
protected RegionBody(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
@@ -61,9 +58,6 @@
// this.properties.get("reference-orientation");
// this.properties.get("writing-mode");
- this.backgroundColor =
- this.properties.get("background-color").getColorType();
-
BodyRegionArea body = new BodyRegionArea(allocationRectangleXPosition
+ mProps.marginLeft,
allocationRectangleYPosition
@@ -75,6 +69,8 @@
- mProps.marginTop
- mProps.marginBottom);
+ body.setBackground(propMgr.getBackgroundProps());
+
int overflow = this.properties.get("overflow").getEnum();
String columnCountAsString =
this.properties.get("column-count").getString();
@@ -97,8 +93,6 @@
int columnGap =
this.properties.get("column-gap").getLength().mvalue();
body.setColumnGap(columnGap);
-
- body.setBackgroundColor(backgroundColor);
return body;
}
1.3.2.1 +7 -4 xml-fop/src/org/apache/fop/fo/pagination/RegionEnd.java
Index: RegionEnd.java
===================================================================
RCS file: /x1/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/RegionEnd.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- RegionEnd.java 30 Jul 2001 20:29:25 -0000 1.3
+++ RegionEnd.java 23 Apr 2002 22:25:25 -0000 1.3.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: RegionEnd.java,v 1.3 2001/07/30 20:29:25 tore Exp $
+ * $Id: RegionEnd.java,v 1.3.2.1 2002/04/23 22:25:25 arved Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -55,9 +55,12 @@
}
if (afterPrecedence)
startH -= afterHeight;
- return new RegionArea(allocationRectangleXPosition
- + allocationRectangleWidth - extent, startY,
- extent, startH);
+ RegionArea area = new RegionArea(allocationRectangleXPosition
+ + allocationRectangleWidth - extent,
+ startY, extent, startH);
+ area.setBackground(propMgr.getBackgroundProps());
+ return area;
+
}
RegionArea makeRegionArea(int allocationRectangleXPosition,
1.3.2.1 +5 -3 xml-fop/src/org/apache/fop/fo/pagination/RegionStart.java
Index: RegionStart.java
===================================================================
RCS file: /x1/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/RegionStart.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- RegionStart.java 30 Jul 2001 20:29:25 -0000 1.3
+++ RegionStart.java 23 Apr 2002 22:25:25 -0000 1.3.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: RegionStart.java,v 1.3 2001/07/30 20:29:25 tore Exp $
+ * $Id: RegionStart.java,v 1.3.2.1 2002/04/23 22:25:25 arved Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources."
@@ -55,8 +55,10 @@
}
if (afterPrecedence)
startH -= afterHeight;
- return new RegionArea(allocationRectangleXPosition, startY, extent,
- startH);
+ RegionArea area = new RegionArea(allocationRectangleXPosition,
+ startY, extent, startH);
+ area.setBackground(propMgr.getBackgroundProps());
+ return area;
}
RegionArea makeRegionArea(int allocationRectangleXPosition,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
