DO NOT REPLY [Bug 14637] - fo:retrieve-marker is confused by 2-columns reports
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14637. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14637 fo:retrieve-marker is confused by 2-columns reports --- Additional Comments From [EMAIL PROTECTED] 2003-08-25 06:11 --- I'm having a somewhat related problem in that the retrieve-marker attribute is not correctly working with the first-including-carryover in a two-column document. The result is behaving as though the attribute's value is first-starting-within-page. I'm using FOP 0.20.5. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
RE: cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr AddLMVisitor.java
J.Pietschmann wrote: [EMAIL PROTECTED] wrote: 1. move fo/flow/InstreamForeignObject.getInlineArea() to layoutmgr/AddLMVisitor.getIFOInlineArea() I wish this wouldn't get ouf of hand. We have way too much weird acronyms in method and even class names already. I'd rather have lond names instead. Fair enough, and I tend to agree with you. I'll change it momentarily. Victor Mote - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr AddLMVisitor.java
vmote 2003/08/26 09:48:28
Modified:src/java/org/apache/fop/fo/flow PageNumberCitation.java
src/java/org/apache/fop/layoutmgr AddLMVisitor.java
Log:
move fo/flow/PageNumberCitation.getInlineArea() to
layoutmgr/AddLMVisitor.getPageNumberCitationInlineArea()
Revision ChangesPath
1.12 +9 -52 xml-fop/src/java/org/apache/fop/fo/flow/PageNumberCitation.java
Index: PageNumberCitation.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/PageNumberCitation.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PageNumberCitation.java 22 Aug 2003 06:27:34 - 1.11
+++ PageNumberCitation.java 26 Aug 2003 16:48:28 - 1.12
@@ -51,11 +51,6 @@
package org.apache.fop.fo.flow;
// FOP
-import org.apache.fop.area.PageViewport;
-import org.apache.fop.area.Trait;
-import org.apache.fop.area.inline.InlineArea;
-import org.apache.fop.area.inline.UnresolvedPageNumber;
-import org.apache.fop.area.inline.Word;
import org.apache.fop.datatypes.ColorType;
import org.apache.fop.fo.FOTreeVisitor;
import org.apache.fop.fo.FONode;
@@ -93,7 +88,6 @@
private String pageNumber;
private String refId;
private TextState ts;
-private InlineArea inline = null;
private boolean unresolved = false;
/**
@@ -111,52 +105,11 @@
fontInfo = foih.getFontInfo();
}
-// if id can be resolved then simply return a word, otherwise
-// return a resolveable area
-public InlineArea getInlineArea(LayoutProcessor parentLM) {
-if (refId.equals()) {
-getLogger().error(page-number-citation must contain \ref-id\);
-return null;
-}
-PageViewport page = parentLM.resolveRefID(refId);
-if (page != null) {
-String str = page.getPageNumber();
-// get page string from parent, build area
-Word word = new Word();
-inline = word;
-int width = getStringWidth(str);
-word.setWord(str);
-inline.setIPD(width);
-inline.setHeight(fontState.getAscender()
- - fontState.getDescender());
-inline.setOffset(fontState.getAscender());
-
-inline.addTrait(Trait.FONT_NAME, fontState.getFontName());
-inline.addTrait(Trait.FONT_SIZE,
-new Integer(fontState.getFontSize()));
-unresolved = false;
-} else {
-unresolved = true;
-inline = new UnresolvedPageNumber(refId);
-String str = MMM; // reserve three spaces for page number
-int width = getStringWidth(str);
-inline.setIPD(width);
-inline.setHeight(fontState.getAscender()
- - fontState.getDescender());
-inline.setOffset(fontState.getAscender());
-
-inline.addTrait(Trait.FONT_NAME, fontState.getFontName());
-inline.addTrait(Trait.FONT_SIZE,
-new Integer(fontState.getFontSize()));
-}
-return inline;
-}
-
/**
* @param str string to be measured
* @return width (in millipoints ??) of the string
*/
-protected int getStringWidth(String str) {
+public int getStringWidth(String str) {
int width = 0;
for (int count = 0; count str.length(); count++) {
width += CharUtilities.getCharWidth(str.charAt(count),
@@ -222,16 +175,20 @@
return refId;
}
-public InlineArea getInline() {
-return inline;
-}
-
public boolean getUnresolved() {
return unresolved;
}
+public void setUnresolved(boolean isUnresolved) {
+unresolved = isUnresolved;
+}
+
public void acceptVisitor(FOTreeVisitor fotv) {
fotv.serveVisitor(this);
+}
+
+public Font getFontState() {
+return fontState;
}
}
1.12 +48 -3 xml-fop/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java
Index: AddLMVisitor.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AddLMVisitor.java 26 Aug 2003 15:05:33 - 1.11
+++ AddLMVisitor.java 26 Aug 2003 16:48:28 - 1.12
@@ -60,6 +60,7 @@
import org.apache.fop.area.inline.FilledArea;
import org.apache.fop.area.inline.ForeignObject;
import org.apache.fop.area.inline.Space;
+import org.apache.fop.area.inline.UnresolvedPageNumber;
import org.apache.fop.area.inline.Word;
import
cvs commit: xml-fop/src/java/org/apache/fop/fo/flow PageNumber.java
vmote 2003/08/26 08:49:22 Modified:src/java/org/apache/fop/fo/flow PageNumber.java Log: remove unused field Revision ChangesPath 1.12 +0 -3 xml-fop/src/java/org/apache/fop/fo/flow/PageNumber.java Index: PageNumber.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/PageNumber.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- PageNumber.java 22 Aug 2003 06:27:34 - 1.11 +++ PageNumber.java 26 Aug 2003 15:49:22 - 1.12 @@ -60,7 +60,6 @@ import org.apache.fop.fonts.Font; import org.apache.fop.fo.properties.CommonMarginInline; import org.apache.fop.fo.properties.CommonRelativePosition; -import org.apache.fop.layout.TextState; import org.apache.fop.datatypes.ColorType; import org.apache.fop.fo.FONode; @@ -81,7 +80,6 @@ private float green; private float blue; private int wrapOption; -private TextState ts; /** * @param parent FONode that is the parent of this object @@ -142,7 +140,6 @@ this.blue = c.getBlue(); this.wrapOption = this.properties.get(wrap-option).getEnum(); -ts = new TextState(); } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/flow PageNumberCitation.java
vmote 2003/08/26 09:58:57 Modified:src/java/org/apache/fop/fo/flow PageNumberCitation.java Log: remove unused field Revision ChangesPath 1.13 +0 -3 xml-fop/src/java/org/apache/fop/fo/flow/PageNumberCitation.java Index: PageNumberCitation.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/PageNumberCitation.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- PageNumberCitation.java 26 Aug 2003 16:48:28 - 1.12 +++ PageNumberCitation.java 26 Aug 2003 16:58:57 - 1.13 @@ -64,8 +64,6 @@ import org.apache.fop.fonts.Font; import org.apache.fop.fo.properties.CommonMarginInline; import org.apache.fop.fo.properties.CommonRelativePosition; -import org.apache.fop.layout.TextState; -import org.apache.fop.layoutmgr.LayoutProcessor; import org.apache.fop.util.CharUtilities; /** @@ -87,7 +85,6 @@ private int wrapOption; private String pageNumber; private String refId; -private TextState ts; private boolean unresolved = false; /** - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr LayoutManagerLS.java
vmote 2003/08/26 10:15:15
Modified:src/java/org/apache/fop/apps Document.java
src/java/org/apache/fop/fo FOTreeBuilder.java
FOTreeControl.java FOTreeVisitor.java
src/java/org/apache/fop/layoutmgr LayoutManagerLS.java
Log:
move extensions package to fo.extensions (primarily to show that these classes are
only related to the FO Tree itself)
Revision ChangesPath
1.3 +2 -2 xml-fop/src/java/org/apache/fop/apps/Document.java
Index: Document.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Document.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Document.java 20 Aug 2003 19:46:47 - 1.2
+++ Document.java 26 Aug 2003 17:15:14 - 1.3
@@ -58,7 +58,7 @@
import org.apache.fop.area.AreaTree;
import org.apache.fop.area.AreaTreeModel;
-import org.apache.fop.extensions.Bookmarks;
+import org.apache.fop.fo.extensions.Bookmarks;
import org.apache.fop.fo.FOTreeControl;
import org.apache.fop.fo.FOTreeEvent;
import org.apache.fop.fo.FOTreeListener;
1.13 +1 -1 xml-fop/src/java/org/apache/fop/fo/FOTreeBuilder.java
Index: FOTreeBuilder.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOTreeBuilder.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FOTreeBuilder.java22 Aug 2003 17:42:41 - 1.12
+++ FOTreeBuilder.java26 Aug 2003 17:15:14 - 1.13
@@ -163,7 +163,7 @@
private void setupDefaultMappings() {
addElementMapping(org.apache.fop.fo.FOElementMapping);
addElementMapping(org.apache.fop.svg.SVGElementMapping);
-addElementMapping(org.apache.fop.extensions.ExtensionElementMapping);
+addElementMapping(org.apache.fop.fo.extensions.ExtensionElementMapping);
// add mappings from available services
Iterator providers =
1.4 +2 -2 xml-fop/src/java/org/apache/fop/fo/FOTreeControl.java
Index: FOTreeControl.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOTreeControl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FOTreeControl.java20 Aug 2003 19:46:47 - 1.3
+++ FOTreeControl.java26 Aug 2003 17:15:14 - 1.4
@@ -55,7 +55,7 @@
import java.util.Map;
// FOP
-import org.apache.fop.extensions.Bookmarks;
+import org.apache.fop.fo.extensions.Bookmarks;
import org.apache.fop.fonts.FontMetrics;
/**
1.2 +5 -5 xml-fop/src/java/org/apache/fop/fo/FOTreeVisitor.java
Index: FOTreeVisitor.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOTreeVisitor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FOTreeVisitor.java19 Aug 2003 00:53:52 - 1.1
+++ FOTreeVisitor.java26 Aug 2003 17:15:14 - 1.2
@@ -55,10 +55,10 @@
import org.apache.fop.fo.pagination.ColorProfile;
import org.apache.fop.fo.pagination.ConditionalPageMasterReference;
import org.apache.fop.fo.pagination.Declarations;
-import org.apache.fop.extensions.ExtensionObj;
-import org.apache.fop.extensions.Bookmarks;
-import org.apache.fop.extensions.Label;
-import org.apache.fop.extensions.Outline;
+import org.apache.fop.fo.extensions.ExtensionObj;
+import org.apache.fop.fo.extensions.Bookmarks;
+import org.apache.fop.fo.extensions.Label;
+import org.apache.fop.fo.extensions.Outline;
import org.apache.fop.fo.flow.ExternalGraphic;
import org.apache.fop.fo.pagination.Flow;
import org.apache.fop.fo.pagination.StaticContent;
1.9 +3 -2 xml-fop/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java
Index: LayoutManagerLS.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- LayoutManagerLS.java 22 Aug 2003 17:42:41 - 1.8
+++ LayoutManagerLS.java 26 Aug 2003 17:15:14 - 1.9
@@ -51,7 +51,7 @@
package org.apache.fop.layoutmgr;
import org.apache.fop.area.extensions.BookmarkData;
-import org.apache.fop.extensions.Outline;
+import org.apache.fop.fo.extensions.Outline;
import org.apache.fop.apps.Document;
import org.apache.fop.apps.FOPException;
import org.apache.fop.layout.LayoutStrategy;
@@ -60,6 +60,7 @@
import org.apache.fop.fo.pagination.PageSequence;
import org.apache.fop.fo.FOTreeHandler;
cvs commit: xml-fop/src/java/org/apache/fop/fo/extensions - New directory
vmote 2003/08/26 10:17:01 xml-fop/src/java/org/apache/fop/fo/extensions - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/extensions Bookmarks.java ExtensionElementMapping.java ExtensionObj.java Label.java Outline.java
vmote 2003/08/26 10:17:59
Added: src/java/org/apache/fop/fo/extensions Bookmarks.java
ExtensionElementMapping.java ExtensionObj.java
Label.java Outline.java
Removed: src/java/org/apache/fop/extensions Bookmarks.java
ExtensionElementMapping.java ExtensionObj.java
Label.java Outline.java
Log:
move extensions package to fo.extensions (primarily to show that these classes are
only related to the FO Tree itself)
Revision ChangesPath
1.1 xml-fop/src/java/org/apache/fop/fo/extensions/Bookmarks.java
Index: Bookmarks.java
===
/*
* $Id: Bookmarks.java,v 1.1 2003/08/26 17:17:59 vmote Exp $
*
*The Apache Software License, Version 1.1
*
*
* Copyright (C) 1999-2003 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
*[EMAIL PROTECTED]
*
* 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 [EMAIL PROTECTED]. For more information on the Apache
* Software Foundation, please see http://www.apache.org/.
*/
package org.apache.fop.fo.extensions;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FOTreeVisitor;
import java.util.ArrayList;
import org.apache.fop.extensions.*;
/**
* Bookmarks data is the top level element of the pdf bookmark extension.
* This handles the adding of outlines. When the element is ended it
* creates the bookmark data and adds to the area tree.
*/
public class Bookmarks extends ExtensionObj {
private ArrayList outlines = new ArrayList();
/**
* Create a new Bookmarks object.
*
* @param parent the parent fo node
*/
public Bookmarks(FONode parent) {
super(parent);
}
/**
* Add the child to the top level.
* This handles all Outline objects added and ignores others.
*
* @param obj the child to add
*/
protected void addChild(FONode obj) {
if (obj instanceof Outline) {
outlines.add(obj);
}
}
/**
* When this element is finished then it can create
* the bookmark data from the child elements and add
* the extension to the area tree.
*/
public void end() {
getFOTreeControl().setBookmarks(this);
}
public void
cvs commit: xml-fop/src/java/org/apache/fop/fo/extensions Bookmarks.java ExtensionElementMapping.java
vmote 2003/08/26 11:10:59 Modified:src/java/org/apache/fop/fo/extensions Bookmarks.java ExtensionElementMapping.java Log: remove invalid imports Revision ChangesPath 1.2 +1 -2 xml-fop/src/java/org/apache/fop/fo/extensions/Bookmarks.java Index: Bookmarks.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/extensions/Bookmarks.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Bookmarks.java26 Aug 2003 17:17:59 - 1.1 +++ Bookmarks.java26 Aug 2003 18:10:59 - 1.2 @@ -54,7 +54,6 @@ import org.apache.fop.fo.FOTreeVisitor; import java.util.ArrayList; -import org.apache.fop.extensions.*; /** * Bookmarks data is the top level element of the pdf bookmark extension. 1.2 +1 -3 xml-fop/src/java/org/apache/fop/fo/extensions/ExtensionElementMapping.java Index: ExtensionElementMapping.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/extensions/ExtensionElementMapping.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ExtensionElementMapping.java 26 Aug 2003 17:17:59 - 1.1 +++ ExtensionElementMapping.java 26 Aug 2003 18:10:59 - 1.2 @@ -55,8 +55,6 @@ import java.util.HashMap; -import org.apache.fop.extensions.*; - /** * Element mapping for the pdf bookmark extension. * This sets up the mapping for the classes that handle the - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
broken build
I managed to break the build again (for about the past hour). It should be all fixed now. Victor Mote - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr LayoutManagerLS.java
vmote 2003/08/26 12:28:46
Modified:src/java/org/apache/fop/apps Document.java
src/java/org/apache/fop/layoutmgr LayoutManagerLS.java
Log:
don't try to create bookmarks in output unless there are some in the input (getting
NPE)
Revision ChangesPath
1.4 +2 -2 xml-fop/src/java/org/apache/fop/apps/Document.java
Index: Document.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Document.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Document.java 26 Aug 2003 17:15:14 - 1.3
+++ Document.java 26 Aug 2003 19:28:46 - 1.4
@@ -101,7 +101,7 @@
public AreaTree areaTree;
public AreaTreeModel atModel;
-private Bookmarks bookmarks;
+private Bookmarks bookmarks = null;
/**
* Main constructor
1.10 +4 -1 xml-fop/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java
Index: LayoutManagerLS.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- LayoutManagerLS.java 26 Aug 2003 17:15:14 - 1.9
+++ LayoutManagerLS.java 26 Aug 2003 19:28:46 - 1.10
@@ -139,6 +139,9 @@
* the extension to the area tree.
*/
public void addBookmarksToAreaTree() {
+if (document.getBookmarks() == null) {
+return;
+}
document.getDriver().getLogger().debug(adding bookmarks to area tree);
BookmarkData data = new BookmarkData();
for (int count = 0; count document.getBookmarks().getOutlines().size();
count++) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/flow ListItemLabel.java
vmote 2003/08/26 12:31:14 Modified:src/java/org/apache/fop/fo/flow ListItemLabel.java Log: remove unused import Revision ChangesPath 1.8 +0 -1 xml-fop/src/java/org/apache/fop/fo/flow/ListItemLabel.java Index: ListItemLabel.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ListItemLabel.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ListItemLabel.java26 Aug 2003 14:35:42 - 1.7 +++ ListItemLabel.java26 Aug 2003 19:31:14 - 1.8 @@ -55,7 +55,6 @@ import org.apache.fop.fo.FObj; import org.apache.fop.fo.FOTreeVisitor; import org.apache.fop.fo.properties.CommonAccessibility; -import org.apache.fop.layoutmgr.list.Item; /** * Class modelling the fo:list-item-label object. See Sec. 6.8.5 of the XSL-FO - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr AddLMVisitor.java
vmote 2003/08/26 12:51:20
Modified:src/java/org/apache/fop/fo/flow Table.java TableColumn.java
src/java/org/apache/fop/layoutmgr AddLMVisitor.java
Log:
1. make fo/flow/Table.columns store fo columns instead of column layout managers
2. move fo/flow/TableColumn.getLayoutManager() to
layoutmgr/AddLMVisitor.getTableColumnLayoutManager()
3. have layoutmgr/AddLMVisitor.serveVisitor(Table node) loop through the
fo/flow/Table.columns collection and build its layout manager collection from it
Revision ChangesPath
1.6 +1 -1 xml-fop/src/java/org/apache/fop/fo/flow/Table.java
Index: Table.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Table.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Table.java22 Aug 2003 06:27:34 - 1.5
+++ Table.java26 Aug 2003 19:51:20 - 1.6
@@ -115,7 +115,7 @@
if (columns == null) {
columns = new ArrayList();
}
-columns.add(((TableColumn)child).getLayoutManager());
+columns.add(((TableColumn)child));
} else if (child.getName().equals(fo:table-footer)) {
tableFooter = (TableBody)child;
} else if (child.getName().equals(fo:table-header)) {
1.7 +1 -12 xml-fop/src/java/org/apache/fop/fo/flow/TableColumn.java
Index: TableColumn.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableColumn.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TableColumn.java 22 Aug 2003 17:42:41 - 1.6
+++ TableColumn.java 26 Aug 2003 19:51:20 - 1.7
@@ -60,9 +60,6 @@
import org.apache.fop.fo.properties.CommonBackground;
import org.apache.fop.fo.properties.CommonBorderAndPadding;
-import org.apache.fop.layoutmgr.LayoutManager;
-import org.apache.fop.layoutmgr.table.Column;
-import org.apache.fop.apps.*;
/**
* Class modelling the fo:table-column object. See Sec. 6.7.4 of the XSL-FO
@@ -87,14 +84,6 @@
super(parent);
}
-public LayoutManager getLayoutManager() {
-doSetup();
-Column clm = new Column();
-clm.setUserAgent(getUserAgent());
-clm.setFObj(this);
-return clm;
-}
-
/**
* @return Length object containing column width
*/
@@ -132,7 +121,7 @@
return numColumnsRepeated;
}
-private void doSetup() {
+public void doSetup() {
// Common Border, Padding, and Background Properties
// only background apply, border apply if border-collapse
1.13 +17 -2 xml-fop/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java
Index: AddLMVisitor.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AddLMVisitor.java 26 Aug 2003 16:48:28 - 1.12
+++ AddLMVisitor.java 26 Aug 2003 19:51:20 - 1.13
@@ -95,6 +95,7 @@
import org.apache.fop.fo.flow.Table;
import org.apache.fop.fo.flow.TableBody;
import org.apache.fop.fo.flow.TableCell;
+import org.apache.fop.fo.flow.TableColumn;
import org.apache.fop.fo.flow.TableRow;
import org.apache.fop.fo.pagination.Flow;
@@ -108,6 +109,7 @@
import org.apache.fop.layoutmgr.LayoutProcessor;
import org.apache.fop.layoutmgr.LMiter;
import org.apache.fop.layoutmgr.table.Cell;
+import org.apache.fop.layoutmgr.table.Column;
import org.apache.fop.layoutmgr.table.Body;
import org.apache.fop.layoutmgr.table.Row;
import org.apache.fop.layoutmgr.table.TableLayoutManager;
@@ -782,7 +784,12 @@
TableLayoutManager tlm = new TableLayoutManager();
tlm.setUserAgent(node.getUserAgent());
tlm.setFObj(node);
- tlm.setColumns(node.getColumns());
+ ArrayList columnLMs = new ArrayList();
+ ListIterator iter = node.getColumns().listIterator();
+ while (iter.hasNext()) {
+ columnLMs.add(getTableColumnLayoutManager((TableColumn)iter.next()));
+ }
+ tlm.setColumns(columnLMs);
if (node.getTableHeader() != null) {
tlm.setTableHeader(getTableBodyLayoutManager(node.getTableHeader()));
}
@@ -790,6 +797,14 @@
tlm.setTableFooter(getTableBodyLayoutManager(node.getTableFooter()));
}
currentLMList.add(tlm);
+ }
+
+ public LayoutManager getTableColumnLayoutManager(TableColumn node) {
+ node.doSetup();
+ Column clm = new Column();
+
cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr PageLayoutManager.java
vmote 2003/08/26 13:32:26
Modified:src/java/org/apache/fop/fo/pagination PageSequence.java
src/java/org/apache/fop/layoutmgr PageLayoutManager.java
Log:
move fo/pagination/PageSequence.createPage() to layoutmgr/PageLayoutManager
Revision ChangesPath
1.10 +5 -46 xml-fop/src/java/org/apache/fop/fo/pagination/PageSequence.java
Index: PageSequence.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/PageSequence.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PageSequence.java 20 Aug 2003 17:56:24 - 1.9
+++ PageSequence.java 26 Aug 2003 20:32:26 - 1.10
@@ -54,8 +54,6 @@
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.FOTreeVisitor;
-import org.apache.fop.layout.PageMaster;
-import org.apache.fop.area.PageViewport;
import org.apache.fop.apps.FOPException;
// Java
@@ -113,8 +111,6 @@
// state attributes used during layout
//
-private PageViewport currentPage;
-
// page number and related formatting variables
private String ipnValue;
private int currentPageNumber = 0;
@@ -379,48 +375,6 @@
}
/**
- * Called by PageLayoutManager when it needs a new page on which to
- * place content. The PageSequence manages the page number (odd/even),
- * but the PLM tells it if the page is blank or is the last page.
- *
- * @param pageNumber the page number to create page for
- * @param bIsBlank If true, use a master for a blank page.
- * @param firstPage true if this is the first page
- * @param bIsLast If true, use the master for the last page in the sequence.
- * @return the page viewport created for the page number
- * @throws FOPException if there is an error creating page
- */
-public PageViewport createPage(int pageNumber, boolean bIsBlank,
- boolean firstPage, boolean bIsLast)
- throws FOPException {
-if (this.pageSequenceMaster != null) {
-this.currentSimplePageMaster = this.pageSequenceMaster
- .getNextSimplePageMaster(((pageNumber % 2) == 1),
- firstPage,
- bIsBlank);
-}
-Region body = currentSimplePageMaster.getRegion(Region.BODY);
-if (!this.mainFlow.getFlowName().equals(body.getRegionName())) {
- throw new FOPException(Flow ' + this.mainFlow.getFlowName()
- + ' does not map to the region-body in
page-master '
- + currentSimplePageMaster.getMasterName() + ');
-}
-PageMaster pageMaster = this.currentSimplePageMaster.getPageMaster();
-PageViewport p = pageMaster.makePage();
-return p;
-// The page will have a viewport/reference area pair defined
-// for each region in the master.
-// Set up the page itself
-// SKIP ALL THIS FOR NOW!!!
-// //this.root.setRunningPageNumberCounter(this.currentPageNumber);
-
-// this.pageCount++;// used for 'force-page-count' calculations
-
-// handle the 'force-page-count'
-//forcePage(areaTree, firstAvailPageNumber);
-}
-
-/**
* Creates a new page area for the given parameters
* @param areaTree the area tree the page should be contained in
* @param firstAvailPageNumber the page number for this page
@@ -742,6 +696,10 @@
return currentSimplePageMaster;
}
+public void setCurrentSimplePageMaster(SimplePageMaster simplePageMaster) {
+this.currentSimplePageMaster = simplePageMaster;
+}
+
/**
* Get the static content FO node from the flow map.
* This gets the static content flow for the given flow name.
@@ -819,4 +777,5 @@
public Root getRoot() {
return root;
}
+
}
1.4 +55 -11xml-fop/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
Index: PageLayoutManager.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PageLayoutManager.java22 Aug 2003 17:42:41 - 1.3
+++ PageLayoutManager.java26 Aug 2003 20:32:26 - 1.4
@@ -3,34 +3,34 @@
*
*The Apache Software License, Version 1.1
*
- *
+ *
*
cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr PageLayoutManager.java
vmote 2003/08/26 15:11:18
Modified:src/java/org/apache/fop/fo/pagination Region.java
SimplePageMaster.java
src/java/org/apache/fop/layoutmgr PageLayoutManager.java
Log:
move logic from fo/pagination/SimplePageMaster.end() to
layoutmgr/PageLayoutManager.createSimplePageMasterAreas()
Revision ChangesPath
1.7 +1 -1 xml-fop/src/java/org/apache/fop/fo/pagination/Region.java
Index: Region.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Region.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Region.java 24 Aug 2003 18:04:06 - 1.6
+++ Region.java 26 Aug 2003 22:11:17 - 1.7
@@ -204,7 +204,7 @@
* Area tree.
* @return the region area class
*/
-protected abstract int getRegionAreaClass();
+public abstract int getRegionAreaClass();
/**
* Returns the default region name (xsl-region-before, xsl-region-start,
1.7 +5 -67
xml-fop/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java
Index: SimplePageMaster.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SimplePageMaster.java 24 Aug 2003 18:04:06 - 1.6
+++ SimplePageMaster.java 26 Aug 2003 22:11:17 - 1.7
@@ -51,7 +51,6 @@
package org.apache.fop.fo.pagination;
// Java
-import java.awt.Rectangle;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -60,16 +59,12 @@
import org.xml.sax.Attributes;
// FOP
-import org.apache.fop.area.CTM;
-import org.apache.fop.datatypes.FODimension;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.FOTreeVisitor;
import org.apache.fop.area.PageViewport;
import org.apache.fop.area.Page;
-import org.apache.fop.area.RegionViewport;
import org.apache.fop.area.RegionReference;
-import org.apache.fop.fo.properties.CommonMarginBlock;
import org.apache.fop.layout.PageMaster;
import org.apache.fop.apps.FOPException;
@@ -119,67 +114,6 @@
}
/**
- * At the end of this element read all the information and create
- * the page master.
- */
-protected void end() {
-int pageWidth =
-this.properties.get(page-width).getLength().getValue();
-int pageHeight =
-this.properties.get(page-height).getLength().getValue();
-// this.properties.get(reference-orientation);
-// this.properties.get(writing-mode);
-
-// Get absolute margin properties (top, left, bottom, right)
-CommonMarginBlock mProps = propMgr.getMarginProps();
-
-/* Create the page reference area rectangle (0,0 is at top left
-* of the page media and y increases
-* when moving towards the bottom of the page.
-* The media rectangle itself is (0,0,pageWidth,pageHeight).
-*/
-Rectangle pageRefRect =
-new Rectangle(mProps.marginLeft, mProps.marginTop,
-pageWidth - mProps.marginLeft - mProps.marginRight,
-pageHeight - mProps.marginTop - mProps.marginBottom);
-
-// ??? KL shouldn't this take the viewport too???
-Page page = new Page(); // page reference area
-
-// Set up the CTM on the page reference area based on writing-mode
-// and reference-orientation
-FODimension reldims = new FODimension(0, 0);
-CTM pageCTM = CTM.getCTMandRelDims(propMgr.getAbsRefOrient(),
-propMgr.getWritingMode(), pageRefRect, reldims);
-
-// Create a RegionViewport/ reference area pair for each page region
-
-boolean bHasBody = false;
-
-for (Iterator regenum = regions.values().iterator();
- regenum.hasNext();) {
-Region r = (Region)regenum.next();
-RegionViewport rvp = r.makeRegionViewport(reldims, pageCTM);
-rvp.setRegion(r.makeRegionReferenceArea(rvp.getViewArea()));
-page.setRegion(r.getRegionAreaClass(), rvp);
-if (r.getRegionAreaClass() == RegionReference.BODY) {
-bHasBody = true;
-}
-}
-
-if (!bHasBody) {
-getLogger().error(simple-page-master has no region-body);
-}
-
-this.pageMaster = new PageMaster(new PageViewport(page,
-new Rectangle(0, 0, pageWidth, pageHeight)));
-
-// regions = null; // PageSequence access SimplePageMaster
-children =
cvs commit: xml-fop/src/java/org/apache/fop/fo/pagination SimplePageMaster.java
vmote 2003/08/26 15:22:37 Modified:src/java/org/apache/fop/fo/pagination SimplePageMaster.java Log: remove unused imports Revision ChangesPath 1.8 +0 -3 xml-fop/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java Index: SimplePageMaster.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- SimplePageMaster.java 26 Aug 2003 22:11:17 - 1.7 +++ SimplePageMaster.java 26 Aug 2003 22:22:37 - 1.8 @@ -62,9 +62,6 @@ import org.apache.fop.fo.FONode; import org.apache.fop.fo.FObj; import org.apache.fop.fo.FOTreeVisitor; -import org.apache.fop.area.PageViewport; -import org.apache.fop.area.Page; -import org.apache.fop.area.RegionReference; import org.apache.fop.layout.PageMaster; import org.apache.fop.apps.FOPException; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/documentation/content/xdocs compliance.xml
gmazza 2003/08/26 14:56:29 Modified:src/documentation/content/xdocs compliance.xml Log: Update to indicate the border-collapse property is partially implemented (instead of not implemented.) Revision ChangesPath 1.21 +3 -1 xml-fop/src/documentation/content/xdocs/compliance.xml Index: compliance.xml === RCS file: /home/cvs/xml-fop/src/documentation/content/xdocs/compliance.xml,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- compliance.xml24 Aug 2003 17:11:34 - 1.20 +++ compliance.xml26 Aug 2003 21:56:28 - 1.21 @@ -423,7 +423,9 @@ level-2 name=Table Properties citation=§7.26 extURL=slice7.html#section-N52000-Table-Properties ref-name=table level-3 name=border-after-precedence citation=§7.26.1 extURL=slice7.html#border-after-precedence compliance-level=1 comply=no/ level-3 name=border-before-precedence citation=§7.26.2 extURL=slice7.html#border-before-precedence compliance-level=1 comply=no/ - level-3 name=border-collapse citation=§7.26.3 extURL=slice7.html#border-collapse compliance-level=2 comply=no/ + level-3 name=border-collapse citation=§7.26.3 extURL=slice7.html#border-collapse compliance-level=2 comply=partial + commentImplementation of collapsed table model not complete./comment + /level-3 level-3 name=border-end-precedence citation=§7.26.4 extURL=slice7.html#border-end-precedence compliance-level=1 comply=no/ level-3 name=border-separation citation=§7.26.5 extURL=slice7.html#border-separation compliance-level=2 comply=no/ level-3 name=border-start-precedence citation=§7.26.6 extURL=slice7.html#border-start-precedence compliance-level=1 comply=no/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
