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/07/13 14:36:42 UTC
cvs commit: xml-fop/src/org/apache/fop/fo/flow BidiOverride.java Float.java InitialPropertySet.java InlineContainer.java Marker.java MultiCase.java MultiProperties.java MultiPropertySet.java MultiSwitch.java MultiToggle.java RetrieveMarker.java TableAndCaption.java TableCaption.java Inline.java Wrapper.java DisplaySequence.java InlineGraphic.java
keiron 01/07/13 05:36:40
Modified: src/org/apache/fop/fo FOTreeBuilder.java FObjMixed.java
StandardElementMapping.java
src/org/apache/fop/fo/flow Inline.java Wrapper.java
Added: src/org/apache/fop/fo ColorProfile.java Declarations.java
Title.java ToBeImplementedElement.java
src/org/apache/fop/fo/flow BidiOverride.java Float.java
InitialPropertySet.java InlineContainer.java
Marker.java MultiCase.java MultiProperties.java
MultiPropertySet.java MultiSwitch.java
MultiToggle.java RetrieveMarker.java
TableAndCaption.java TableCaption.java
Removed: src/org/apache/fop/fo/flow DisplaySequence.java
InlineGraphic.java
Log:
added all remaining elements
currently are indicated as not implemented.
removed old elements
Revision Changes Path
1.19 +32 -104 xml-fop/src/org/apache/fop/fo/FOTreeBuilder.java
Index: FOTreeBuilder.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FOTreeBuilder.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- FOTreeBuilder.java 2001/06/18 17:39:53 1.18
+++ FOTreeBuilder.java 2001/07/13 12:35:21 1.19
@@ -1,7 +1,7 @@
-/* $Id: FOTreeBuilder.java,v 1.18 2001/06/18 17:39:53 kellyc Exp $
+/* $Id: FOTreeBuilder.java,v 1.19 2001/07/13 12:35:21 keiron 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."
+ * For details on use and redistribution please refer to the
+ * LICENSE file included with these sources.
*/
package org.apache.fop.fo;
@@ -52,81 +52,30 @@
protected FObj rootFObj = null;
public BufferManager bufferManager;
-
- /**
+
+ /**
* set of names of formatting objects encountered but unknown
*/
protected Hashtable unknownFOs = new Hashtable();
- // namespace implementation ideas pinched from John Cowan
- // protected static class NSMap {
- // String prefix;
- // String uri;
- // int level;
-
- // NSMap(String prefix, String uri, int level) {
- // this.prefix = prefix;
- // this.uri = uri;
- // this.level = level;
- // }
- // }
-
- // protected int level = 0;
- // protected Stack namespaceStack = new Stack();
-
- // {
- // namespaceStack.push(new NSMap("xml",
- // "http://www.w3.org/XML/1998/namespace",
- // -1));
- // namespaceStack.push(new NSMap("", "", -1));
- // }
-
- // protected String findURI(String prefix) {
- // for (int i = namespaceStack.size() - 1; i >= 0; i--) {
- // NSMap nsMap = (NSMap) (namespaceStack.elementAt(i));
- // if (prefix.equals(nsMap.prefix)) return nsMap.uri;
- // }
- // return null;
- // }
-
- // protected String mapName(String name)
- // throws SAXException {
- // int colon = name.indexOf(':');
- // String prefix = "";
- // String localPart = name;
- // if (colon != -1) {
- // prefix = name.substring(0, colon);
- // localPart = name.substring(colon + 1);
- // }
- // String uri = findURI(prefix);
- // if (uri == null) {
- // if (prefix.equals("")) {
- // return name;
- // } else {
- // throw new SAXException(new FOPException("Unknown namespace prefix " + prefix));
- // }
- // }
- // return uri + "^" + localPart;
- // }
-
/**
* add a mapping from element name to maker.
*
* @param namespaceURI namespace URI of formatting object element
* @param localName local name of formatting object element
* @param maker Maker for class representing formatting object
- */
+ */
public void addMapping(String namespaceURI, String localName,
FObj.Maker maker) {
this.fobjTable.put(namespaceURI + "^" + localName, maker);
}
/**
- * add a mapping from element name to maker.
- *
- * @param namespaceURI namespace URI of formatting object element
- * @param localName local name of formatting object element
- * @param maker Maker for class representing formatting object
+ * add a mapping from element name to maker.
+ *
+ * @param namespaceURI namespace URI of formatting object element
+ * @param localName local name of formatting object element
+ * @param maker Maker for class representing formatting object
*/
public void addPropertyList(String namespaceURI, Hashtable list) {
PropertyListBuilder plb;
@@ -142,11 +91,11 @@
}
/**
- * add a mapping from element name to maker.
- *
- * @param namespaceURI namespace URI of formatting object element
- * @param localName local name of formatting object element
- * @param maker Maker for class representing formatting object
+ * add a mapping from element name to maker.
+ *
+ * @param namespaceURI namespace URI of formatting object element
+ * @param localName local name of formatting object element
+ * @param maker Maker for class representing formatting object
*/
public void addElementPropertyList(String namespaceURI,
String localName, Hashtable list) {
@@ -171,15 +120,11 @@
public void endElement(String uri, String localName, String rawName) {
currentFObj.end();
currentFObj = (FObj) currentFObj.getParent();
- // level--;
- // while (((NSMap) namespaceStack.peek()).level > level) {
- // namespaceStack.pop();
- // }
}
/** SAX Handler for the start of the document */
public void startDocument() {
- rootFObj = null; // allows FOTreeBuilder to be reused
+ rootFObj = null; // allows FOTreeBuilder to be reused
MessageHandler.logln("building formatting object tree");
}
@@ -192,21 +137,6 @@
/* the maker for the formatting object started */
FObj.Maker fobjMaker;
- // level++;
- // int length = attlist.getLength();
- // for (int i = 0; i < length; i++) {
- // String att = attlist.getQName(i);
- // if (att.equals("xmlns")) {
- // namespaceStack.push( new NSMap("",
- // attlist.getValue(i),
- // level));
- // } else if (att.startsWith("xmlns:")) {
- // String value = attlist.getValue(i);
- // namespaceStack.push(new NSMap(att.substring(6), value,
- // level));
- // }
- // }
-
//String fullName = mapName(rawName);
String fullName = uri + "^" + localName;
fobjMaker = (FObj.Maker) fobjTable.get(fullName);
@@ -238,7 +168,7 @@
if (rootFObj == null) {
rootFObj = fobj;
- rootFObj.setBufferManager(this.bufferManager);
+ rootFObj.setBufferManager(this.bufferManager);
if (!fobj.getName().equals("fo:root")) {
throw new SAXException(
new FOPException("Root element must" +
@@ -252,28 +182,26 @@
}
/**
- * format this formatting object tree
- *
- * @param areaTree the area tree to format into
- */
+ * format this formatting object tree
+ *
+ * @param areaTree the area tree to format into
+ */
public void format(AreaTree areaTree) throws FOPException {
MessageHandler.logln("formatting FOs into areas");
- this.bufferManager.readComplete();
+ this.bufferManager.readComplete();
((Root) this.rootFObj).format(areaTree);
}
- public void reset()
- {
- currentFObj = null;
- rootFObj = null;
- }
-
- public boolean hasData()
- {
- return (rootFObj != null);
+ public void reset() {
+ currentFObj = null;
+ rootFObj = null;
}
+ public boolean hasData() {
+ return (rootFObj != null);
+ }
+
public void setBufferManager(BufferManager bufferManager) {
- this.bufferManager = bufferManager;
- }
+ this.bufferManager = bufferManager;
+ }
}
1.10 +4 -49 xml-fop/src/org/apache/fop/fo/FObjMixed.java
Index: FObjMixed.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FObjMixed.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FObjMixed.java 2000/08/11 00:56:46 1.9
+++ FObjMixed.java 2001/07/13 12:35:24 1.10
@@ -1,52 +1,7 @@
-/*-- $Id: FObjMixed.java,v 1.9 2000/08/11 00:56:46 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/>.
-
+/* $Id: FObjMixed.java,v 1.10 2001/07/13 12:35:24 keiron 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.
*/
package org.apache.fop.fo;
1.24 +55 -27 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- StandardElementMapping.java 2001/07/12 13:03:14 1.23
+++ StandardElementMapping.java 2001/07/13 12:35:28 1.24
@@ -1,4 +1,4 @@
-/*-- $Id: StandardElementMapping.java,v 1.23 2001/07/12 13:03:14 keiron Exp $ --
+/*-- $Id: StandardElementMapping.java,v 1.24 2001/07/13 12:35:28 keiron 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.
@@ -19,60 +19,88 @@
String uri = "http://www.w3.org/1999/XSL/Format";
+ // Declarations and Pagination and Layout Formatting Objects
builder.addMapping(uri, "root", Root.maker());
+ builder.addMapping(uri, "declarations", Declarations.maker());
+ builder.addMapping(uri, "color-profile", ColorProfile.maker());
+ builder.addMapping(uri, "page-sequence", PageSequence.maker());
builder.addMapping(uri, "layout-master-set",
LayoutMasterSet.maker());
- builder.addMapping(uri, "simple-page-master",
- SimplePageMaster.maker());
- builder.addMapping(uri, "region-body", RegionBody.maker());
- builder.addMapping(uri, "region-before", RegionBefore.maker());
- builder.addMapping(uri, "region-after", RegionAfter.maker());
- builder.addMapping(uri, "region-start", RegionStart.maker());
- builder.addMapping(uri, "region-end", RegionEnd.maker());
- builder.addMapping(uri, "page-sequence", PageSequence.maker());
builder.addMapping(uri, "page-sequence-master",
PageSequenceMaster.maker());
builder.addMapping(uri, "single-page-master-reference",
SinglePageMasterReference.maker());
builder.addMapping(uri, "repeatable-page-master-reference",
RepeatablePageMasterReference.maker());
- builder.addMapping(uri, "conditional-page-master-reference",
- ConditionalPageMasterReference.maker());
builder.addMapping(uri, "repeatable-page-master-alternatives",
RepeatablePageMasterAlternatives.maker());
+ builder.addMapping(uri, "conditional-page-master-reference",
+ ConditionalPageMasterReference.maker());
+ builder.addMapping(uri, "simple-page-master",
+ SimplePageMaster.maker());
+ builder.addMapping(uri, "region-body", RegionBody.maker());
+ builder.addMapping(uri, "region-before", RegionBefore.maker());
+ builder.addMapping(uri, "region-after", RegionAfter.maker());
+ builder.addMapping(uri, "region-start", RegionStart.maker());
+ builder.addMapping(uri, "region-end", RegionEnd.maker());
builder.addMapping(uri, "flow", Flow.maker());
builder.addMapping(uri, "static-content", StaticContent.maker());
+ builder.addMapping(uri, "title", Title.maker());
+
+ // Block-level Formatting Objects
builder.addMapping(uri, "block", Block.maker());
builder.addMapping(uri, "block-container", BlockContainer.maker());
- builder.addMapping(uri, "list-block", ListBlock.maker());
- builder.addMapping(uri, "list-item", ListItem.maker());
- builder.addMapping(uri, "list-item-label", ListItemLabel.maker());
- builder.addMapping(uri, "list-item-body", ListItemBody.maker());
+
+ // Inline-level Formatting Objects
+ builder.addMapping(uri, "bidi-override", BidiOverride.maker());
+ builder.addMapping(uri, "character",
+ org.apache.fop.fo.flow.Character.maker());
+ builder.addMapping(uri, "initial-property-set", InitialPropertySet.maker());
+ builder.addMapping(uri, "external-graphic",
+ ExternalGraphic.maker());
+ builder.addMapping(uri, "instream-foreign-object",
+ InstreamForeignObject.maker());
+ builder.addMapping(uri, "inline", Inline.maker());
+ builder.addMapping(uri, "inline-container", InlineContainer.maker());
+ builder.addMapping(uri, "leader", Leader.maker());
builder.addMapping(uri, "page-number", PageNumber.maker());
builder.addMapping(uri, "page-number-citation",
PageNumberCitation.maker());
- builder.addMapping(uri, "display-sequence",
- DisplaySequence.maker());
- builder.addMapping(uri, "inline", Inline.maker());
- builder.addMapping(uri, "external-graphic",
- ExternalGraphic.maker());
+
+ // Formatting Objects for Tables
+ builder.addMapping(uri, "table-and-caption", TableAndCaption.maker());
builder.addMapping(uri, "table", Table.maker());
builder.addMapping(uri, "table-column", TableColumn.maker());
+ builder.addMapping(uri, "table-caption", TableCaption.maker());
builder.addMapping(uri, "table-header", TableHeader.maker());
- builder.addMapping(uri, "table-body", TableBody.maker());
builder.addMapping(uri, "table-footer", TableFooter.maker());
+ builder.addMapping(uri, "table-body", TableBody.maker());
builder.addMapping(uri, "table-row", TableRow.maker());
builder.addMapping(uri, "table-cell", TableCell.maker());
+
+ // Formatting Objects for Lists
+ builder.addMapping(uri, "list-block", ListBlock.maker());
+ builder.addMapping(uri, "list-item", ListItem.maker());
+ builder.addMapping(uri, "list-item-body", ListItemBody.maker());
+ builder.addMapping(uri, "list-item-label", ListItemLabel.maker());
+
+ // Dynamic Effects: Link and Multi Formatting Objects
builder.addMapping(uri, "basic-link", BasicLink.maker());
- 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, "multi-switch", MultiSwitch.maker());
+ builder.addMapping(uri, "multi-case", MultiCase.maker());
+ builder.addMapping(uri, "multi-toggle", MultiToggle.maker());
+ builder.addMapping(uri, "multi-properties", MultiProperties.maker());
+ builder.addMapping(uri, "multi-property-set", MultiPropertySet.maker());
+
+ // Out-of-Line Formatting Objects
+ builder.addMapping(uri, "float", org.apache.fop.fo.flow.Float.maker());
builder.addMapping(uri, "footnote", Footnote.maker());
builder.addMapping(uri, "footnote-body", FootnoteBody.maker());
- builder.addMapping(uri, "wrapper", Wrapper.maker());
+ // Other Formatting Objects
+ builder.addMapping(uri, "wrapper", Wrapper.maker());
+ builder.addMapping(uri, "marker", Marker.maker());
+ builder.addMapping(uri, "retrieve-marker", RetrieveMarker.maker());
builder.addPropertyList(uri,
FOPropertyMapping.getGenericMappings());
1.1 xml-fop/src/org/apache/fop/fo/ColorProfile.java
Index: ColorProfile.java
===================================================================
/*-- $Id: ColorProfile.java,v 1.1 2001/07/13 12:35:18 keiron 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.
*/
package org.apache.fop.fo;
// FOP
import org.apache.fop.fo.*;
import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.fo.flow.*;
import org.apache.fop.fo.properties.*;
import org.apache.fop.layout.AreaTree;
import org.apache.fop.apps.FOPException;
/**
* The fo:root formatting object. Contains page masters, root extensions,
* page-sequences.
*/
public class ColorProfile extends ToBeImplementedElement {
public static class Maker extends FObj.Maker {
public FObj make(FObj parent,
PropertyList propertyList) throws FOPException {
return new ColorProfile(parent, propertyList);
}
}
public static FObj.Maker maker() {
return new ColorProfile.Maker();
}
protected ColorProfile(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
this.name = "fo:color-profile";
}
}
1.1 xml-fop/src/org/apache/fop/fo/Declarations.java
Index: Declarations.java
===================================================================
/*-- $Id: Declarations.java,v 1.1 2001/07/13 12:35:20 keiron 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.
*/
package org.apache.fop.fo;
// FOP
import org.apache.fop.fo.*;
import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.fo.flow.*;
import org.apache.fop.fo.properties.*;
import org.apache.fop.layout.AreaTree;
import org.apache.fop.apps.FOPException;
/**
*/
public class Declarations extends ToBeImplementedElement {
public static class Maker extends FObj.Maker {
public FObj make(FObj parent,
PropertyList propertyList) throws FOPException {
return new Declarations(parent, propertyList);
}
}
public static FObj.Maker maker() {
return new Declarations.Maker();
}
protected Declarations(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
this.name = "fo:declarations";
}
}
1.1 xml-fop/src/org/apache/fop/fo/Title.java
Index: Title.java
===================================================================
/*-- $Id: Title.java,v 1.1 2001/07/13 12:35:32 keiron 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.
*/
package org.apache.fop.fo;
// FOP
import org.apache.fop.fo.*;
import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.fo.flow.*;
import org.apache.fop.fo.properties.*;
import org.apache.fop.layout.AreaTree;
import org.apache.fop.apps.FOPException;
/**
*/
public class Title extends ToBeImplementedElement {
public static class Maker extends FObj.Maker {
public FObj make(FObj parent,
PropertyList propertyList) throws FOPException {
return new Title(parent, propertyList);
}
}
public static FObj.Maker maker() {
return new Title.Maker();
}
protected Title(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
this.name = "fo:title";
}
}
1.1 xml-fop/src/org/apache/fop/fo/ToBeImplementedElement.java
Index: ToBeImplementedElement.java
===================================================================
/*-- $Id: ToBeImplementedElement.java,v 1.1 2001/07/13 12:35:34 keiron 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.
*/
package org.apache.fop.fo;
// FOP
import org.apache.fop.fo.*;
import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.fo.flow.*;
import org.apache.fop.fo.properties.*;
import org.apache.fop.layout.Area;
import org.apache.fop.apps.FOPException;
/**
*/
public class ToBeImplementedElement extends FObj {
protected ToBeImplementedElement(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
}
public Status layout(Area area) throws FOPException {
MessageHandler.logln("This element \"" + this.name + "\" is not yet implemented.");
return new Status(Status.OK);
}
}
1.4 +4 -49 xml-fop/src/org/apache/fop/fo/flow/Inline.java
Index: Inline.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Inline.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Inline.java 2001/02/01 21:38:01 1.3
+++ Inline.java 2001/07/13 12:35:55 1.4
@@ -1,52 +1,7 @@
-/*-- $Id: Inline.java,v 1.3 2001/02/01 21:38:01 klease 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/>.
-
+/* $Id: Inline.java,v 1.4 2001/07/13 12:35:55 keiron 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.
*/
package org.apache.fop.fo.flow;
1.2 +11 -70 xml-fop/src/org/apache/fop/fo/flow/Wrapper.java
Index: Wrapper.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Wrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Wrapper.java 2001/02/04 03:23:10 1.1
+++ Wrapper.java 2001/07/13 12:36:18 1.2
@@ -1,54 +1,9 @@
-/*
- ============================================================================
- 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/>.
-
+/* $Id: Wrapper.java,v 1.2 2001/07/13 12:36:18 keiron 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.
*/
-
package org.apache.fop.fo.flow;
// FOP
@@ -61,8 +16,10 @@
* Implementation for fo:wrapper formatting object.
* The wrapper object serves as
* a property holder for it's children objects.
+ *
+ * Content: (#PCDATA|%inline;|%block;)*
+ * Properties: id
*/
-
public class Wrapper extends FObjMixed {
public static class Maker extends FObj.Maker {
@@ -82,26 +39,10 @@
super(parent, propertyList);
// check that this occurs inside an fo:flow
}
-
-
- public Status layout(Area area)
- throws FOPException
- {
- int numChildren = this.children.size();
- for (int i=((marker != START)?marker:0) ; i < numChildren; i++) {
- FONode child= (FONode)children.elementAt(i);
- if ((child instanceof FObj)) {
- Status status = ((FObj)child).layout(area);
- if (status.isIncomplete()) {
- this.marker = i;
- return status;
- }
- }
- }
- return new Status(Status.OK);
-
- }
-
+ protected void addCharacters(char data[], int start, int length) {
+ FOText ft = new FOText(data,start,length, this);
+ children.addElement(ft);
+ }
}
1.1 xml-fop/src/org/apache/fop/fo/flow/BidiOverride.java
Index: BidiOverride.java
===================================================================
/*-- $Id: BidiOverride.java,v 1.1 2001/07/13 12:35:48 keiron 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.
*/
package org.apache.fop.fo.flow;
// FOP
import org.apache.fop.fo.*;
import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.fo.flow.*;
import org.apache.fop.fo.properties.*;
import org.apache.fop.layout.AreaTree;
import org.apache.fop.apps.FOPException;
/**
*/
public class BidiOverride extends ToBeImplementedElement {
public static class Maker extends FObj.Maker {
public FObj make(FObj parent,
PropertyList propertyList) throws FOPException {
return new BidiOverride(parent, propertyList);
}
}
public static FObj.Maker maker() {
return new BidiOverride.Maker();
}
protected BidiOverride(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
this.name = "fo:bidi-override";
}
}
1.1 xml-fop/src/org/apache/fop/fo/flow/Float.java
Index: Float.java
===================================================================
/*-- $Id: Float.java,v 1.1 2001/07/13 12:35:53 keiron 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.
*/
package org.apache.fop.fo.flow;
// FOP
import org.apache.fop.fo.*;
import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.fo.flow.*;
import org.apache.fop.fo.properties.*;
import org.apache.fop.layout.AreaTree;
import org.apache.fop.apps.FOPException;
/**
*/
public class Float extends ToBeImplementedElement {
public static class Maker extends FObj.Maker {
public FObj make(FObj parent,
PropertyList propertyList) throws FOPException {
return new Float(parent, propertyList);
}
}
public static FObj.Maker maker() {
return new Float.Maker();
}
protected Float(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
this.name = "fo:float";
}
}
1.1 xml-fop/src/org/apache/fop/fo/flow/InitialPropertySet.java
Index: InitialPropertySet.java
===================================================================
/*-- $Id: InitialPropertySet.java,v 1.1 2001/07/13 12:35:55 keiron 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.
*/
package org.apache.fop.fo.flow;
// FOP
import org.apache.fop.fo.*;
import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.fo.flow.*;
import org.apache.fop.fo.properties.*;
import org.apache.fop.layout.AreaTree;
import org.apache.fop.apps.FOPException;
/**
*/
public class InitialPropertySet extends ToBeImplementedElement {
public static class Maker extends FObj.Maker {
public FObj make(FObj parent,
PropertyList propertyList) throws FOPException {
return new InitialPropertySet(parent, propertyList);
}
}
public static FObj.Maker maker() {
return new InitialPropertySet.Maker();
}
protected InitialPropertySet(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
this.name = "fo:initial-property-set";
}
}
1.1 xml-fop/src/org/apache/fop/fo/flow/InlineContainer.java
Index: InlineContainer.java
===================================================================
/*-- $Id: InlineContainer.java,v 1.1 2001/07/13 12:36:01 keiron 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.
*/
package org.apache.fop.fo.flow;
// FOP
import org.apache.fop.fo.*;
import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.fo.flow.*;
import org.apache.fop.fo.properties.*;
import org.apache.fop.layout.AreaTree;
import org.apache.fop.apps.FOPException;
/**
*/
public class InlineContainer extends ToBeImplementedElement {
public static class Maker extends FObj.Maker {
public FObj make(FObj parent,
PropertyList propertyList) throws FOPException {
return new InlineContainer(parent, propertyList);
}
}
public static FObj.Maker maker() {
return new InlineContainer.Maker();
}
protected InlineContainer(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
this.name = "fo:inline-container";
}
}
1.1 xml-fop/src/org/apache/fop/fo/flow/Marker.java
Index: Marker.java
===================================================================
/*-- $Id: Marker.java,v 1.1 2001/07/13 12:36:09 keiron 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.
*/
package org.apache.fop.fo.flow;
// FOP
import org.apache.fop.fo.*;
import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.fo.flow.*;
import org.apache.fop.fo.properties.*;
import org.apache.fop.layout.AreaTree;
import org.apache.fop.apps.FOPException;
/**
*/
public class Marker extends ToBeImplementedElement {
public static class Maker extends FObj.Maker {
public FObj make(FObj parent,
PropertyList propertyList) throws FOPException {
return new Marker(parent, propertyList);
}
}
public static FObj.Maker maker() {
return new Marker.Maker();
}
protected Marker(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
this.name = "fo:marker";
}
}
1.1 xml-fop/src/org/apache/fop/fo/flow/MultiCase.java
Index: MultiCase.java
===================================================================
/*-- $Id: MultiCase.java,v 1.1 2001/07/13 12:36:10 keiron 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.
*/
package org.apache.fop.fo.flow;
// FOP
import org.apache.fop.fo.*;
import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.fo.flow.*;
import org.apache.fop.fo.properties.*;
import org.apache.fop.layout.AreaTree;
import org.apache.fop.apps.FOPException;
/**
*/
public class MultiCase extends ToBeImplementedElement {
public static class Maker extends FObj.Maker {
public FObj make(FObj parent,
PropertyList propertyList) throws FOPException {
return new MultiCase(parent, propertyList);
}
}
public static FObj.Maker maker() {
return new MultiCase.Maker();
}
protected MultiCase(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
this.name = "fo:multi-case";
}
}
1.1 xml-fop/src/org/apache/fop/fo/flow/MultiProperties.java
Index: MultiProperties.java
===================================================================
/*-- $Id: MultiProperties.java,v 1.1 2001/07/13 12:36:11 keiron 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.
*/
package org.apache.fop.fo.flow;
// FOP
import org.apache.fop.fo.*;
import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.fo.flow.*;
import org.apache.fop.fo.properties.*;
import org.apache.fop.layout.AreaTree;
import org.apache.fop.apps.FOPException;
/**
*/
public class MultiProperties extends ToBeImplementedElement {
public static class Maker extends FObj.Maker {
public FObj make(FObj parent,
PropertyList propertyList) throws FOPException {
return new MultiProperties(parent, propertyList);
}
}
public static FObj.Maker maker() {
return new MultiProperties.Maker();
}
protected MultiProperties(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
this.name = "fo:multi-properties";
}
}
1.1 xml-fop/src/org/apache/fop/fo/flow/MultiPropertySet.java
Index: MultiPropertySet.java
===================================================================
/*-- $Id: MultiPropertySet.java,v 1.1 2001/07/13 12:36:11 keiron 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.
*/
package org.apache.fop.fo.flow;
// FOP
import org.apache.fop.fo.*;
import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.fo.flow.*;
import org.apache.fop.fo.properties.*;
import org.apache.fop.layout.AreaTree;
import org.apache.fop.apps.FOPException;
/**
*/
public class MultiPropertySet extends ToBeImplementedElement {
public static class Maker extends FObj.Maker {
public FObj make(FObj parent,
PropertyList propertyList) throws FOPException {
return new MultiPropertySet(parent, propertyList);
}
}
public static FObj.Maker maker() {
return new MultiPropertySet.Maker();
}
protected MultiPropertySet(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
this.name = "fo:multi-property-set";
}
}
1.1 xml-fop/src/org/apache/fop/fo/flow/MultiSwitch.java
Index: MultiSwitch.java
===================================================================
/*-- $Id: MultiSwitch.java,v 1.1 2001/07/13 12:36:12 keiron 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.
*/
package org.apache.fop.fo.flow;
// FOP
import org.apache.fop.fo.*;
import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.fo.flow.*;
import org.apache.fop.fo.properties.*;
import org.apache.fop.layout.AreaTree;
import org.apache.fop.apps.FOPException;
/**
*/
public class MultiSwitch extends ToBeImplementedElement {
public static class Maker extends FObj.Maker {
public FObj make(FObj parent,
PropertyList propertyList) throws FOPException {
return new MultiSwitch(parent, propertyList);
}
}
public static FObj.Maker maker() {
return new MultiSwitch.Maker();
}
protected MultiSwitch(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
this.name = "fo:multi-switch";
}
}
1.1 xml-fop/src/org/apache/fop/fo/flow/MultiToggle.java
Index: MultiToggle.java
===================================================================
/*-- $Id: MultiToggle.java,v 1.1 2001/07/13 12:36:14 keiron 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.
*/
package org.apache.fop.fo.flow;
// FOP
import org.apache.fop.fo.*;
import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.fo.flow.*;
import org.apache.fop.fo.properties.*;
import org.apache.fop.layout.AreaTree;
import org.apache.fop.apps.FOPException;
/**
*/
public class MultiToggle extends ToBeImplementedElement {
public static class Maker extends FObj.Maker {
public FObj make(FObj parent,
PropertyList propertyList) throws FOPException {
return new MultiToggle(parent, propertyList);
}
}
public static FObj.Maker maker() {
return new MultiToggle.Maker();
}
protected MultiToggle(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
this.name = "fo:multi-toggle";
}
}
1.1 xml-fop/src/org/apache/fop/fo/flow/RetrieveMarker.java
Index: RetrieveMarker.java
===================================================================
/*-- $Id: RetrieveMarker.java,v 1.1 2001/07/13 12:36:16 keiron 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.
*/
package org.apache.fop.fo.flow;
// FOP
import org.apache.fop.fo.*;
import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.fo.flow.*;
import org.apache.fop.fo.properties.*;
import org.apache.fop.layout.AreaTree;
import org.apache.fop.apps.FOPException;
/**
*/
public class RetrieveMarker extends ToBeImplementedElement {
public static class Maker extends FObj.Maker {
public FObj make(FObj parent,
PropertyList propertyList) throws FOPException {
return new RetrieveMarker(parent, propertyList);
}
}
public static FObj.Maker maker() {
return new RetrieveMarker.Maker();
}
protected RetrieveMarker(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
this.name = "fo:retrieve-marker";
}
}
1.1 xml-fop/src/org/apache/fop/fo/flow/TableAndCaption.java
Index: TableAndCaption.java
===================================================================
/*-- $Id: TableAndCaption.java,v 1.1 2001/07/13 12:36:17 keiron 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.
*/
package org.apache.fop.fo.flow;
// FOP
import org.apache.fop.fo.*;
import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.fo.flow.*;
import org.apache.fop.fo.properties.*;
import org.apache.fop.layout.AreaTree;
import org.apache.fop.apps.FOPException;
/**
*/
public class TableAndCaption extends ToBeImplementedElement {
public static class Maker extends FObj.Maker {
public FObj make(FObj parent,
PropertyList propertyList) throws FOPException {
return new TableAndCaption(parent, propertyList);
}
}
public static FObj.Maker maker() {
return new TableAndCaption.Maker();
}
protected TableAndCaption(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
this.name = "fo:table-and-caption";
}
}
1.1 xml-fop/src/org/apache/fop/fo/flow/TableCaption.java
Index: TableCaption.java
===================================================================
/*-- $Id: TableCaption.java,v 1.1 2001/07/13 12:36:18 keiron 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.
*/
package org.apache.fop.fo.flow;
// FOP
import org.apache.fop.fo.*;
import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.fo.flow.*;
import org.apache.fop.fo.properties.*;
import org.apache.fop.layout.AreaTree;
import org.apache.fop.apps.FOPException;
/**
*/
public class TableCaption extends ToBeImplementedElement {
public static class Maker extends FObj.Maker {
public FObj make(FObj parent,
PropertyList propertyList) throws FOPException {
return new TableCaption(parent, propertyList);
}
}
public static FObj.Maker maker() {
return new TableCaption.Maker();
}
protected TableCaption(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
this.name = "fo:table-caption";
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org