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 ke...@apache.org on 2001/01/11 00:56:21 UTC
cvs commit: xml-fop/src/org/apache/fop/layout BlockArea.java BodyAreaContainer.java Page.java
keiron 01/01/10 15:56:21
Modified: src/org/apache/fop/fo/flow Block.java Flow.java
src/org/apache/fop/fo StandardElementMapping.java
src/org/apache/fop/fo/pagination PageSequence.java
src/org/apache/fop/layout BlockArea.java
BodyAreaContainer.java Page.java
Added: src/org/apache/fop/fo/flow FootnoteBody.java Footnote.java
Log:
adds footnote support
this adds footnotes as they appear and adjusts main area accordingly
multi column support still pending
Code changes sponsored by Dresdner Bank, Germany
Revision Changes Path
1.27 +12 -4 xml-fop/src/org/apache/fop/fo/flow/Block.java
Index: Block.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Block.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Block.java 2000/12/27 03:50:52 1.26
+++ Block.java 2001/01/10 23:56:19 1.27
@@ -1,4 +1,4 @@
-/*-- $Id: Block.java,v 1.26 2000/12/27 03:50:52 arved Exp $ --
+/*-- $Id: Block.java,v 1.27 2001/01/10 23:56:19 keiron Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -259,7 +259,8 @@
startIndent += bodyIndent + distanceBetweenStarts;
}
- area.getIDReferences().createID(id);
+ if(area.getIDReferences() != null)
+ area.getIDReferences().createID(id);
this.marker = 0;
@@ -286,6 +287,10 @@
if (((FOText) fo).willCreateArea()) {
fo.setWidows(blockWidows);
break;
+ } else {
+ children.removeElementAt(i);
+ numChildren = this.children.size();
+ i--;
}
} else {
fo.setWidows(blockWidows);
@@ -293,7 +298,7 @@
}
}
- for (int i = numChildren - 1; i > 0; i--) {
+ for (int i = numChildren - 1; i >= 0; i--) {
FONode fo = (FONode) children.elementAt(i);
if (fo instanceof FOText) {
if (((FOText) fo).willCreateArea()) {
@@ -315,10 +320,11 @@
this.textIndent = 0;
}
- if (marker == 0) {
+ if (marker == 0 && area.getIDReferences() != null) {
area.getIDReferences().configureID(id, area);
}
+ int spaceLeft = area.spaceLeft();
this.blockArea = new BlockArea(fs, area.getAllocationWidth(),
area.spaceLeft(), startIndent, endIndent, textIndent,
align, alignLast, lineHeight);
@@ -367,6 +373,7 @@
if ((i != 0)) {
status = new Status(Status.AREA_FULL_SOME);
area.addChild(blockArea);
+ area.setMaxHeight(area.getMaxHeight() - spaceLeft + blockArea.getMaxHeight());
area.increaseHeight(blockArea.getHeight());
area.setAbsoluteHeight(
blockArea.getAbsoluteHeight());
@@ -382,6 +389,7 @@
//blockArea.end();
area.addChild(blockArea);
+ area.setMaxHeight(area.getMaxHeight() - spaceLeft + blockArea.getMaxHeight());
area.increaseHeight(blockArea.getHeight());
area.setAbsoluteHeight(blockArea.getAbsoluteHeight());
anythingLaidOut = true;
1.16 +13 -3 xml-fop/src/org/apache/fop/fo/flow/Flow.java
Index: Flow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Flow.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Flow.java 2001/01/02 21:42:13 1.15
+++ Flow.java 2001/01/10 23:56:19 1.16
@@ -1,4 +1,4 @@
-/*-- $Id: Flow.java,v 1.15 2001/01/02 21:42:13 klease Exp $ --
+/*-- $Id: Flow.java,v 1.16 2001/01/10 23:56:19 keiron Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -148,9 +148,10 @@
// flow is *always* laid out into a BodyAreaContainer
BodyAreaContainer bac = (BodyAreaContainer)area;
-
+
boolean prevChildMustKeepWithNext = false;
-
+ Vector pageMarker = this.getMarkerSnapshot(new Vector());
+
int numChildren = this.children.size();
for (int i = this.marker; i < numChildren; i++) {
FObj fo = (FObj) children.elementAt(i);
@@ -177,6 +178,15 @@
}
_status = fo.layout(currentArea);
+
+/* if((_status.isPageBreak() || i == numChildren - 1) && bac.needsFootnoteAdjusting()) {
+ bac.adjustFootnoteArea();
+ this.rollback(pageMarker);
+ i = this.marker - 1;
+ Area mainReferenceArea = bac.getMainReferenceArea();
+ // remove areas
+ continue;
+ }*/
if (_status.isIncomplete()) {
if ((prevChildMustKeepWithNext) && (_status.laidOutNone())) {
this.marker = i - 1;
1.1 xml-fop/src/org/apache/fop/fo/flow/FootnoteBody.java
Index: FootnoteBody.java
===================================================================
/*-- $Id: FootnoteBody.java,v 1.1 2001/01/10 23:56:19 keiron Exp $ --
============================================================================
The Apache Software License, Version 1.1
============================================================================
Copyright (C) 1999 The Apache Software Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without modifica-
tion, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
3. The end-user documentation included with the redistribution, if any, must
include the following acknowledgment: "This product includes software
developed by the Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
4. The names "FOP" and "Apache Software Foundation" must not be used to
endorse or promote products derived from this software without prior
written permission. For written permission, please contact
apache@apache.org.
5. Products derived from this software may not be called "Apache", nor may
"Apache" appear in their name, without prior written permission of the
Apache Software Foundation.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
James Tauber <jt...@jtauber.com>. For more information on the Apache
Software Foundation, please see <http://www.apache.org/>.
*/
package org.apache.fop.fo.flow;
// FOP
import org.apache.fop.fo.*;
import org.apache.fop.layout.Area;
import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.properties.*;
import org.apache.fop.layout.*;
// Java
import java.util.Enumeration;
public class FootnoteBody extends FObj {
FontState fs;
int align;
int alignLast;
int lineHeight;
int startIndent;
int endIndent;
int textIndent;
public static class Maker extends FObj.Maker {
public FObj make(FObj parent, PropertyList propertyList)
throws FOPException {
return new FootnoteBody(parent, propertyList);
}
}
public static FObj.Maker maker() {
return new FootnoteBody.Maker();
}
public FootnoteBody(FObj parent, PropertyList propertyList)
throws FOPException {
super(parent, propertyList);
this.name = "fo:footnote-body";
}
public Status layout(Area area) throws FOPException {
if(this.marker == START) {
this.marker = 0;
}
String fontFamily =
this.properties.get("font-family").getString();
String fontStyle =
this.properties.get("font-style").getString();
String fontWeight =
this.properties.get("font-weight").getString();
int fontSize =
this.properties.get("font-size").getLength().mvalue();
FontState fs = new FontState(area.getFontInfo(), fontFamily,
fontStyle, fontWeight, fontSize);
BlockArea blockArea = new BlockArea(fs, area.getAllocationWidth(),
area.spaceLeft(), startIndent, endIndent, textIndent,
align, alignLast, lineHeight);
blockArea.setPage(area.getPage());
blockArea.start();
blockArea.setAbsoluteHeight(area.getAbsoluteHeight());
blockArea.setIDReferences(area.getIDReferences());
blockArea.setTableCellXOffset(area.getTableCellXOffset());
int numChildren = this.children.size();
for ( int i = this.marker; i < numChildren; i++ ) {
FONode fo = (FONode) children.elementAt(i);
Status status;
if ( (status = fo.layout(blockArea)).isIncomplete() ) {
this.resetMarker();
return status;
}
}
blockArea.end();
area.addChild(blockArea);
area.increaseHeight(blockArea.getHeight());
return new Status(Status.OK);
}
}
1.1 xml-fop/src/org/apache/fop/fo/flow/Footnote.java
Index: Footnote.java
===================================================================
/*-- $Id: Footnote.java,v 1.1 2001/01/10 23:56:19 keiron Exp $ --
============================================================================
The Apache Software License, Version 1.1
============================================================================
Copyright (C) 1999 The Apache Software Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without modifica-
tion, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
3. The end-user documentation included with the redistribution, if any, must
include the following acknowledgment: "This product includes software
developed by the Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
4. The names "FOP" and "Apache Software Foundation" must not be used to
endorse or promote products derived from this software without prior
written permission. For written permission, please contact
apache@apache.org.
5. Products derived from this software may not be called "Apache", nor may
"Apache" appear in their name, without prior written permission of the
Apache Software Foundation.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
James Tauber <jt...@jtauber.com>. For more information on the Apache
Software Foundation, please see <http://www.apache.org/>.
*/
package org.apache.fop.fo.flow;
// FOP
import org.apache.fop.fo.*;
import org.apache.fop.layout.*;
import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.properties.*;
import org.apache.fop.messaging.*;
// Java
import java.util.Enumeration;
import java.util.Vector;
public class Footnote extends FObj {
public static class Maker extends FObj.Maker {
public FObj make(FObj parent, PropertyList propertyList)
throws FOPException {
return new Footnote(parent, propertyList);
}
}
public static FObj.Maker maker() {
return new Footnote.Maker();
}
public Footnote(FObj parent, PropertyList propertyList)
throws FOPException {
super(parent, propertyList);
this.name = "fo:footnote";
}
public Status layout(Area area) throws FOPException {
FONode inline = null;
FONode fbody = null;
if(this.marker == START) {
this.marker = 0;
}
int numChildren = this.children.size();
for (int i = this.marker; i < numChildren; i++) {
FONode fo = (FONode) children.elementAt(i);
if(fo instanceof Inline) {
inline = fo;
Status status = fo.layout(area);
if(status.isIncomplete()) {
return status;
}
} else if(inline != null && fo instanceof FootnoteBody) {
// add footnote to current page or next if it can't fit
fbody = fo;
if(area instanceof BlockArea) {
((BlockArea)area).addFootnote((FootnoteBody)fbody);
} else {
Page page = area.getPage();
layoutFootnote(page, (FootnoteBody)fbody, area);
}
}
}
if(fbody == null) {
MessageHandler.errorln("WARNING: no footnote-body in footnote");
}
if (area instanceof BlockArea) {
}
return new Status(Status.OK);
}
public static boolean layoutFootnote(Page p, FootnoteBody fb, Area area)
{
try {
BodyAreaContainer bac = p.getBody();
AreaContainer footArea = bac.getFootnoteReferenceArea();
int basePos = footArea.getCurrentYPosition() - footArea.getHeight();
int oldHeight = footArea.getHeight();
if(area != null) {
footArea.setMaxHeight(area.getMaxHeight() - area.getHeight() + footArea.getHeight());
} else {
footArea.setMaxHeight(bac.getMaxHeight() + footArea.getHeight());
}
Status status = fb.layout(footArea);
if(status.isIncomplete()) {
// add as a pending footnote
return false;
} else {
if(area != null) {
area.setMaxHeight(area.getMaxHeight() - footArea.getHeight());
}
//bac.setMaxHeight(bac.getMaxHeight() - footArea.getHeight() + oldHeight);
if(bac.getFootnoteState() == 0) {
Area ar = bac.getMainReferenceArea();
decreaseMaxHeight(ar, footArea.getHeight() - oldHeight);
footArea.setYPosition(basePos + footArea.getHeight());
}
}
} catch(FOPException fope) {
return false;
}
return true;
}
protected static void decreaseMaxHeight(Area ar, int change) {
ar.setMaxHeight(ar.getMaxHeight() - change);
Vector childs = ar.getChildren();
for(Enumeration en = childs.elements(); en.hasMoreElements(); ) {
Object obj = en.nextElement();
if(obj instanceof Area) {
Area childArea = (Area)obj;
decreaseMaxHeight(childArea, change);
}
}
}
}
1.20 +3 -1 xml-fop/src/org/apache/fop/fo/StandardElementMapping.java
Index: StandardElementMapping.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/StandardElementMapping.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- StandardElementMapping.java 2000/12/15 21:35:36 1.19
+++ StandardElementMapping.java 2001/01/10 23:56:20 1.20
@@ -1,4 +1,4 @@
-/*-- $Id: StandardElementMapping.java,v 1.19 2000/12/15 21:35:36 fotis Exp $ --
+/*-- $Id: StandardElementMapping.java,v 1.20 2001/01/10 23:56:20 keiron Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -108,5 +108,7 @@
builder.addMapping(uri, "instream-foreign-object", InstreamForeignObject.maker());
builder.addMapping(uri, "leader", Leader.maker());
builder.addMapping(uri, "character", org.apache.fop.fo.flow.Character.maker());
+ builder.addMapping(uri, "footnote", Footnote.maker());
+ builder.addMapping(uri, "footnote-body", FootnoteBody.maker());
}
}
1.25 +7 -2 xml-fop/src/org/apache/fop/fo/pagination/PageSequence.java
Index: PageSequence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/PageSequence.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- PageSequence.java 2000/12/29 03:37:07 1.24
+++ PageSequence.java 2001/01/10 23:56:20 1.25
@@ -1,4 +1,4 @@
-/*-- $Id: PageSequence.java,v 1.24 2000/12/29 03:37:07 arved Exp $ --
+/*-- $Id: PageSequence.java,v 1.25 2001/01/10 23:56:20 keiron Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -354,7 +354,12 @@
{
throw new FOPException("page masters exhausted. Cannot recover.");
}
- return pageMaster.makePage(areaTree);
+ Page p = pageMaster.makePage(areaTree);
+ if(currentPage != null) {
+ Vector foots = currentPage.getPendingFootnotes();
+ p.setPendingFootnotes(foots);
+ }
+ return p;
}
/**
1.20 +23 -1 xml-fop/src/org/apache/fop/layout/BlockArea.java
Index: BlockArea.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/BlockArea.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- BlockArea.java 2000/12/20 18:20:17 1.19
+++ BlockArea.java 2001/01/10 23:56:20 1.20
@@ -1,4 +1,4 @@
-/*-- $Id: BlockArea.java,v 1.19 2000/12/20 18:20:17 fotis Exp $ --
+/*-- $Id: BlockArea.java,v 1.20 2001/01/10 23:56:20 keiron Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -52,6 +52,9 @@
// FOP
import org.apache.fop.render.Renderer;
+import org.apache.fop.fo.flow.*;
+import org.apache.fop.fo.*;
+import org.apache.fop.apps.*;
// Java
import java.util.Vector;
@@ -92,6 +95,8 @@
protected String language;
protected String country;
+ protected Vector pendingFootnotes = null;
+
public BlockArea(FontState fontState, int allocationWidth,
int maxHeight, int startIndent, int endIndent,
int textIndent, int align, int alignLastLine, int lineHeight) {
@@ -122,6 +127,17 @@
this.increaseHeight(size);
this.addDisplaySpace(this.halfLeading);
}
+ // add pending footnotes
+ if(pendingFootnotes != null) {
+ for(Enumeration e = pendingFootnotes.elements(); e.hasMoreElements(); ) {
+ FootnoteBody fb = (FootnoteBody)e.nextElement();
+ Page page = getPage();
+ if(!Footnote.layoutFootnote(page, fb, this)) {
+ page.addPendingFootnote(fb);
+ }
+ }
+ pendingFootnotes = null;
+ }
}
public int addPageNumberCitation(FontState fontState, float red,
@@ -369,4 +385,10 @@
this.hyphenationRemainCharacterCount = hyphenationRemainCharacterCount;
}
+ public void addFootnote(FootnoteBody fb) {
+ if(pendingFootnotes == null) {
+ pendingFootnotes = new Vector();
+ }
+ pendingFootnotes.addElement(fb);
+ }
}
1.3 +60 -3 xml-fop/src/org/apache/fop/layout/BodyAreaContainer.java
Index: BodyAreaContainer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/BodyAreaContainer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BodyAreaContainer.java 2001/01/04 03:26:54 1.2
+++ BodyAreaContainer.java 2001/01/10 23:56:20 1.3
@@ -1,4 +1,4 @@
-/*-- $Id: BodyAreaContainer.java,v 1.2 2001/01/04 03:26:54 arved Exp $ --
+/*-- $Id: BodyAreaContainer.java,v 1.3 2001/01/10 23:56:20 keiron Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -92,7 +92,10 @@
// the start FO in case of rollback
private FObj startFO;
private boolean isNewSpanArea;
-
+
+ // keeps track of footnote state for multiple layouts
+ private int footnoteState = 0;
+
public BodyAreaContainer(FontState fontState, int xPosition, int yPosition,
int allocationWidth, int maxHeight, int position,
int columnCount, int columnGap) {
@@ -374,11 +377,65 @@
{
return isNewSpanArea;
}
-
+
public AreaContainer getCurrentColumnArea()
{
Vector spanAreas = this.mainReferenceArea.getChildren();
SpanArea spanArea = (SpanArea)spanAreas.elementAt(spanAreas.size()-1);
return spanArea.getCurrentColumnArea();
}
+
+ public int getFootnoteState()
+ {
+ return footnoteState;
+ }
+
+ public boolean needsFootnoteAdjusting()
+ {
+ footnoteYPosition = footnoteReferenceArea.getYPosition();
+ switch(footnoteState) {
+ case 0:
+ resetHeights();
+ if(footnoteReferenceArea.getHeight() > 0
+ && mainYPosition + mainReferenceArea.getHeight() > footnoteYPosition) {
+ return true;
+ }
+ case 1:
+ break;
+ }
+ return false;
+ }
+
+ public void adjustFootnoteArea()
+ {
+ footnoteState++;
+ if(footnoteState == 1) {
+ mainReferenceArea.setMaxHeight(footnoteReferenceArea.getYPosition() - mainYPosition);
+ footnoteYPosition = footnoteReferenceArea.getYPosition();
+ footnoteReferenceArea.setMaxHeight(footnoteReferenceArea.getHeight());
+
+ Vector childs = footnoteReferenceArea.getChildren();
+ for(Enumeration en = childs.elements(); en.hasMoreElements(); ) {
+ Object obj = en.nextElement();
+ if(obj instanceof Area) {
+ Area childArea = (Area)obj;
+ footnoteReferenceArea.removeChild(childArea);
+ }
+ }
+
+ getPage().setPendingFootnotes(null);
+ }
+ }
+
+ protected static void resetMaxHeight(Area ar, int change) {
+ ar.setMaxHeight(change);
+ Vector childs = ar.getChildren();
+ for(Enumeration en = childs.elements(); en.hasMoreElements(); ) {
+ Object obj = en.nextElement();
+ if(obj instanceof Area) {
+ Area childArea = (Area)obj;
+ resetMaxHeight(childArea, change);
+ }
+ }
+ }
}
1.9 +30 -1 xml-fop/src/org/apache/fop/layout/Page.java
Index: Page.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/Page.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Page.java 2000/12/18 03:29:49 1.8
+++ Page.java 2001/01/10 23:56:20 1.9
@@ -1,4 +1,4 @@
-/*-- $Id: Page.java,v 1.8 2000/12/18 03:29:49 arved Exp $ --
+/*-- $Id: Page.java,v 1.9 2001/01/10 23:56:20 keiron Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -53,6 +53,9 @@
// FOP
import org.apache.fop.render.Renderer;
+import org.apache.fop.fo.flow.*;
+import org.apache.fop.fo.*;
+import org.apache.fop.apps.*;
// Java
import java.util.Vector;
@@ -77,6 +80,8 @@
private Vector idList = new Vector();
+ private Vector footnotes = null;
+
Page(AreaTree areaTree, int height, int width) {
this.areaTree = areaTree;
this.height = height;
@@ -170,5 +175,29 @@
public Vector getIDList(){
return idList;
+ }
+
+ public Vector getPendingFootnotes() {
+ return footnotes;
+ }
+
+ public void setPendingFootnotes(Vector v) {
+ footnotes = v;
+ if(footnotes != null) {
+ for(Enumeration e = footnotes.elements(); e.hasMoreElements(); ) {
+ FootnoteBody fb = (FootnoteBody)e.nextElement();
+ if(!Footnote.layoutFootnote(this, fb, null)) {
+ // footnotes are too large to fit on empty page
+ }
+ }
+ footnotes = null;
+ }
+ }
+
+ public void addPendingFootnote(FootnoteBody fb) {
+ if(footnotes == null) {
+ footnotes = new Vector();
+ }
+ footnotes.addElement(fb);
}
}