arved 01/07/16 20:14:29
Modified: src/org/apache/fop/fo/flow FootnoteBody.java Marker.java
StaticContent.java
Log:
AHS: improving area information
Revision Changes Path
1.4 +4 -1 xml-fop/src/org/apache/fop/fo/flow/FootnoteBody.java
Index: FootnoteBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/FootnoteBody.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FootnoteBody.java 2001/03/04 21:34:51 1.3
+++ FootnoteBody.java 2001/07/17 03:14:29 1.4
@@ -1,4 +1,4 @@
-/*-- $Id: FootnoteBody.java,v 1.3 2001/03/04 21:34:51 klease Exp $ --
+/*-- $Id: FootnoteBody.java,v 1.4 2001/07/17 03:14:29 arved Exp $ --
============================================================================
The Apache
Software License, Version 1.1
@@ -54,6 +54,7 @@
// FOP
import org.apache.fop.fo.*;
import org.apache.fop.layout.Area;
+import org.apache.fop.layout.AreaClass;
import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.properties.*;
import org.apache.fop.layout.*;
@@ -85,6 +86,7 @@
throws FOPException {
super(parent, propertyList);
this.name = "fo:footnote-body";
+ this.areaClass = AreaClass.setAreaClass(AreaClass.XSL_FOOTNOTE);
}
public Status layout(Area area) throws FOPException {
@@ -96,6 +98,7 @@
area.getAllocationWidth(),
area.spaceLeft(), startIndent, endIndent, textIndent,
align, alignLast, lineHeight);
+ blockArea.generatedBy = this;
blockArea.setPage(area.getPage());
blockArea.start();
1.3 +2 -1 xml-fop/src/org/apache/fop/fo/flow/Marker.java
Index: Marker.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Marker.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Marker.java 2001/07/16 10:43:40 1.2
+++ Marker.java 2001/07/17 03:14:29 1.3
@@ -1,4 +1,4 @@
-/*-- $Id: Marker.java,v 1.2 2001/07/16 10:43:40 arved Exp $-- */
+/*-- $Id: Marker.java,v 1.3 2001/07/17 03:14:29 arved Exp $-- */
/*
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
@@ -50,6 +50,7 @@
public Status layout(Area area) throws FOPException {
// no layout action desired
this.registryArea = area;
+ area.addMarker(this);
area.getPage().registerMarker(this);
// System.out.println("Marker being registered in area '" + area +
"'");
return new Status(Status.OK);
1.14 +4 -1 xml-fop/src/org/apache/fop/fo/flow/StaticContent.java
Index: StaticContent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/StaticContent.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- StaticContent.java 2001/05/16 09:27:27 1.13
+++ StaticContent.java 2001/07/17 03:14:29 1.14
@@ -1,4 +1,4 @@
-/*-- $Id: StaticContent.java,v 1.13 2001/05/16 09:27:27 keiron Exp $ --
+/*-- $Id: StaticContent.java,v 1.14 2001/07/17 03:14:29 arved Exp $ --
*
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
@@ -62,6 +62,9 @@
}
+ if (area instanceof org.apache.fop.layout.AreaContainer)
+
((org.apache.fop.layout.AreaContainer)area).setAreaName(regionClass);
+
if (regionClass.equals(RegionBefore.REGION_CLASS)) {
area.setAbsoluteHeight(-area.getMaxHeight());
} else if (regionClass.equals(RegionAfter.REGION_CLASS)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
