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/08/06 11:13:00 UTC
cvs commit: xml-fop/src/org/apache/fop/fo/flow BasicLink.java BidiOverride.java Block.java BlockContainer.java Character.java ExternalGraphic.java Float.java InitialPropertySet.java Inline.java InlineContainer.java InstreamForeignObject.java Leader.java ListBlock.java ListItem.java ListItemBody.java ListItemLabel.java MultiCase.java MultiProperties.java MultiPropertySet.java MultiSwitch.java MultiToggle.java PageNumber.java PageNumberCitation.java Table.java TableAndCaption.java TableBody.java TableCaption.java TableCell.java TableColumn.java TableRow.java
keiron 01/08/06 02:13:00
Modified: src/org/apache/fop/fo FOTreeBuilder.java PropertyList.java
PropertyManager.java Title.java
src/org/apache/fop/fo/flow BasicLink.java BidiOverride.java
Block.java BlockContainer.java Character.java
ExternalGraphic.java Float.java
InitialPropertySet.java Inline.java
InlineContainer.java InstreamForeignObject.java
Leader.java ListBlock.java ListItem.java
ListItemBody.java ListItemLabel.java MultiCase.java
MultiProperties.java MultiPropertySet.java
MultiSwitch.java MultiToggle.java PageNumber.java
PageNumberCitation.java Table.java
TableAndCaption.java TableBody.java
TableCaption.java TableCell.java TableColumn.java
TableRow.java
Added: src/org/apache/fop/fo Unknown.java
Log:
gets all properties specified on each element
adds "Unknown" element for unknown elements or other namespaces
need to get a consistent and easy way to use the property values
Revision Changes Path
1.23 +2 -3 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- FOTreeBuilder.java 2001/08/01 23:08:54 1.22
+++ FOTreeBuilder.java 2001/08/06 09:12:58 1.23
@@ -1,5 +1,5 @@
/*
- * $Id: FOTreeBuilder.java,v 1.22 2001/08/01 23:08:54 gears Exp $
+ * $Id: FOTreeBuilder.java,v 1.23 2001/08/06 09:12:58 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.
@@ -196,9 +196,8 @@
MessageHandler.errorln("WARNING: Unknown formatting object "
+ fullName);
}
- fobjMaker = new FObjMixed.Maker(); // fall back
+ fobjMaker = new Unknown.Maker(); // fall back
}
-
try {
PropertyList list = null;
1.14 +11 -1 xml-fop/src/org/apache/fop/fo/PropertyList.java
Index: PropertyList.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/PropertyList.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- PropertyList.java 2001/07/30 20:29:20 1.13
+++ PropertyList.java 2001/08/06 09:12:58 1.14
@@ -1,5 +1,5 @@
/*
- * $Id: PropertyList.java,v 1.13 2001/07/30 20:29:20 tore Exp $
+ * $Id: PropertyList.java,v 1.14 2001/08/06 09:12:58 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.
@@ -253,6 +253,16 @@
// don't know what to do here
}
}
+/*
+ // if value is inherit then get computed value from
+ // parent
+ // namespaces??
+ if(p != null && "inherit".equals(p.getString())) {
+ if (this.parentPropertyList != null) {
+ p = parentPropertyList.get(propertyName, true, false);
+ }
+ }
+*/
if (subpropName != null && p != null) {
return this.builder.getSubpropValue(namespace, element,
propertyName, p, subpropName);
1.7 +39 -1 xml-fop/src/org/apache/fop/fo/PropertyManager.java
Index: PropertyManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/PropertyManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PropertyManager.java 2001/07/30 20:29:20 1.6
+++ PropertyManager.java 2001/08/06 09:12:58 1.7
@@ -1,5 +1,5 @@
/*
- * $Id: PropertyManager.java,v 1.6 2001/07/30 20:29:20 tore Exp $
+ * $Id: PropertyManager.java,v 1.7 2001/08/06 09:12:58 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.
@@ -12,6 +12,11 @@
import org.apache.fop.layout.BorderAndPadding;
import org.apache.fop.layout.MarginProps;
import org.apache.fop.layout.BackgroundProps;
+import org.apache.fop.layout.MarginInlineProps;
+import org.apache.fop.layout.AccessibilityProps;
+import org.apache.fop.layout.AuralProps;
+import org.apache.fop.layout.RelativePositionProps;
+import org.apache.fop.layout.AbsolutePositionProps;
import org.apache.fop.fo.properties.BreakAfter;
import org.apache.fop.fo.properties.BreakBefore;
import org.apache.fop.fo.properties.Constants;
@@ -209,4 +214,37 @@
return bp;
}
+ public MarginInlineProps getMarginInlineProps() {
+ MarginInlineProps props = new MarginInlineProps();
+ return props;
+ }
+
+ public AccessibilityProps getAccessibilityProps() {
+ AccessibilityProps props = new AccessibilityProps();
+ String str;
+ str = this.properties.get("source-document").getString();
+ if(!"none".equals(str)) {
+ props.sourceDoc = str;
+ }
+ str = this.properties.get("role").getString();
+ if(!"none".equals(str)) {
+ props.role = str;
+ }
+ return props;
+ }
+
+ public AuralProps getAuralProps() {
+ AuralProps props = new AuralProps();
+ return props;
+ }
+
+ public RelativePositionProps getRelativePositionProps() {
+ RelativePositionProps props = new RelativePositionProps();
+ return props;
+ }
+
+ public AbsolutePositionProps getAbsolutePositionProps() {
+ AbsolutePositionProps props = new AbsolutePositionProps();
+ return props;
+ }
}
1.3 +37 -1 xml-fop/src/org/apache/fop/fo/Title.java
Index: Title.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Title.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Title.java 2001/07/30 20:29:20 1.2
+++ Title.java 2001/08/06 09:12:58 1.3
@@ -1,5 +1,5 @@
/*
- * $Id: Title.java,v 1.2 2001/07/30 20:29:20 tore Exp $
+ * $Id: Title.java,v 1.3 2001/08/06 09:12:58 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.
@@ -9,6 +9,8 @@
// FOP
import org.apache.fop.fo.*;
+import org.apache.fop.datatypes.*;
+import org.apache.fop.layout.*;
import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.fo.flow.*;
import org.apache.fop.fo.properties.*;
@@ -37,4 +39,38 @@
this.name = "fo:title";
}
+ public Status layout(Area area) throws FOPException {
+
+ // Common Accessibility Properties
+ AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
+
+ // Common Aural Properties
+ AuralProps mAurProps = propMgr.getAuralProps();
+
+ // Common Border, Padding, and Background Properties
+ BorderAndPadding bap = propMgr.getBorderAndPadding();
+ BackgroundProps bProps = propMgr.getBackgroundProps();
+
+ // Common Font Properties
+ FontState fontState = propMgr.getFontState(area.getFontInfo());
+
+ // Common Margin Properties-Inline
+ MarginInlineProps mProps = propMgr.getMarginInlineProps();
+
+ Property prop;
+ prop = this.properties.get("baseline-shift");
+ if (prop instanceof LengthProperty) {
+ Length bShift = prop.getLength();
+ } else if (prop instanceof EnumProperty) {
+ int bShift = prop.getEnum();
+ }
+ ColorType col = this.properties.get("color").getColorType();
+ Length lHeight = this.properties.get("line-height").getLength();
+ int lShiftAdj = this.properties.get(
+ "line-height-shift-adjustment").getEnum();
+ int vis = this.properties.get("visibility").getEnum();
+ Length zIndex = this.properties.get("z-index").getLength();
+
+ return super.layout(area);
+ }
}
1.1 xml-fop/src/org/apache/fop/fo/Unknown.java
Index: Unknown.java
===================================================================
/*
* $Id: Unknown.java,v 1.1 2001/08/06 09:12:58 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.layout.*;
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;
/**
* This represents an unknown element.
* For example with unsupported namespaces.
* This prevents any further problems arising from the unknown
* data.
*/
public class Unknown extends FObj {
public static class Maker extends FObj.Maker {
public FObj make(FObj parent,
PropertyList propertyList) throws FOPException {
return new Unknown(parent, propertyList);
}
}
public static FObj.Maker maker() {
return new Unknown.Maker();
}
protected Unknown(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
this.name = "unknown";
}
public Status layout(Area area) throws FOPException {
MessageHandler.logln("Layout Unknown element");
return new Status(Status.OK);
}
}
1.7 +36 -1 xml-fop/src/org/apache/fop/fo/flow/BasicLink.java
Index: BasicLink.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/BasicLink.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BasicLink.java 2001/07/30 20:29:22 1.6
+++ BasicLink.java 2001/08/06 09:12:59 1.7
@@ -1,5 +1,5 @@
/*
- * $Id: BasicLink.java,v 1.6 2001/07/30 20:29:22 tore Exp $
+ * $Id: BasicLink.java,v 1.7 2001/08/06 09:12:59 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.
@@ -46,6 +46,41 @@
public Status layout(Area area) throws FOPException {
String destination;
int linkType;
+
+ // Common Accessibility Properties
+ AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
+
+ // Common Aural Properties
+ AuralProps mAurProps = propMgr.getAuralProps();
+
+ // Common Border, Padding, and Background Properties
+ BorderAndPadding bap = propMgr.getBorderAndPadding();
+ BackgroundProps bProps = propMgr.getBackgroundProps();
+
+ // Common Margin Properties-Inline
+ MarginInlineProps mProps = propMgr.getMarginInlineProps();
+
+ // Common Relative Position Properties
+ RelativePositionProps mRelProps = propMgr.getRelativePositionProps();
+
+ // this.properties.get("alignment-adjust");
+ // this.properties.get("alignment-baseline");
+ // this.properties.get("baseline-shift");
+ // this.properties.get("destination-place-offset");
+ // this.properties.get("dominant-baseline");
+ // this.properties.get("external-destination");
+ // this.properties.get("id");
+ // this.properties.get("indicate-destination");
+ // this.properties.get("internal-destination");
+ // this.properties.get("keep-together");
+ // this.properties.get("keep-with-next");
+ // this.properties.get("keep-with-previous");
+ // this.properties.get("line-height");
+ // this.properties.get("line-height-shift-adjustment");
+ // this.properties.get("show-destination");
+ // this.properties.get("target-processing-context");
+ // this.properties.get("target-presentation-context");
+ // this.properties.get("target-stylesheet");
if (!(destination =
this.properties.get("internal-destination").getString()).equals("")) {
1.3 +27 -1 xml-fop/src/org/apache/fop/fo/flow/BidiOverride.java
Index: BidiOverride.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/BidiOverride.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BidiOverride.java 2001/07/30 20:29:22 1.2
+++ BidiOverride.java 2001/08/06 09:12:59 1.3
@@ -1,5 +1,5 @@
/*
- * $Id: BidiOverride.java,v 1.2 2001/07/30 20:29:22 tore Exp $
+ * $Id: BidiOverride.java,v 1.3 2001/08/06 09:12:59 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.
@@ -9,6 +9,7 @@
// FOP
import org.apache.fop.fo.*;
+import org.apache.fop.layout.*;
import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.fo.flow.*;
import org.apache.fop.fo.properties.*;
@@ -37,4 +38,29 @@
this.name = "fo:bidi-override";
}
+ public Status layout(Area area) throws FOPException {
+
+ // Common Aural Properties
+ AuralProps mAurProps = propMgr.getAuralProps();
+
+ // Common Font Properties
+ //this.fontState = propMgr.getFontState(area.getFontInfo());
+
+ // Common Margin Properties-Inline
+ RelativePositionProps mProps = propMgr.getRelativePositionProps();
+
+ // this.properties.get("color");
+ // this.properties.get("direction");
+ // this.properties.get("id");
+ // this.properties.get("letter-spacing");
+ // this.properties.get("line-height");
+ // this.properties.get("line-height-shift-adjustment");
+ // this.properties.get("score-spaces");
+ // this.properties.get("text-shadow");
+ // this.properties.get("text-transform");
+ // this.properties.get("unicode-bidi");
+ // this.properties.get("word-spacing");
+
+ return super.layout(area);
+ }
}
1.40 +51 -1 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.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- Block.java 2001/08/01 23:08:54 1.39
+++ Block.java 2001/08/06 09:12:59 1.40
@@ -1,5 +1,5 @@
/*
- * $Id: Block.java,v 1.39 2001/08/01 23:08:54 gears Exp $
+ * $Id: Block.java,v 1.40 2001/08/06 09:12:59 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.
@@ -84,6 +84,56 @@
}
if (this.marker == START) {
+
+ // Common Accessibility Properties
+ AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
+
+ // Common Aural Properties
+ AuralProps mAurProps = propMgr.getAuralProps();
+
+ // Common Border, Padding, and Background Properties
+ BorderAndPadding bap = propMgr.getBorderAndPadding();
+ BackgroundProps bProps = propMgr.getBackgroundProps();
+
+ // Common Font Properties
+ //this.fontState = propMgr.getFontState(area.getFontInfo());
+
+ // Common Hyphenation Properties
+ HyphenationProps mHyphProps = propMgr.getHyphenationProps();
+
+ // Common Margin Properties-Block
+ MarginProps mProps = propMgr.getMarginProps();
+
+ // Common Relative Position Properties
+ RelativePositionProps mRelProps = propMgr.getRelativePositionProps();
+
+ // this.properties.get("break-after");
+ // this.properties.get("break-before");
+ // this.properties.get("color");
+ // this.properties.get("text-depth");
+ // this.properties.get("text-altitude");
+ // this.properties.get("hyphenation-keep");
+ // this.properties.get("hyphenation-ladder-count");
+ // this.properties.get("id");
+ // this.properties.get("keep-together");
+ // this.properties.get("keep-with-next");
+ // this.properties.get("keep-with-previous");
+ // this.properties.get("last-line-end-indent");
+ // this.properties.get("linefeed-treatment");
+ // this.properties.get("line-height");
+ // this.properties.get("line-height-shift-adjustment");
+ // this.properties.get("line-stacking-strategy");
+ // this.properties.get("orphans");
+ // this.properties.get("space-treatment");
+ // this.properties.get("span");
+ // this.properties.get("text-align");
+ // this.properties.get("text-align-last");
+ // this.properties.get("text-indent");
+ // this.properties.get("visibility");
+ // this.properties.get("white-space-collapse");
+ // this.properties.get("widows");
+ // this.properties.get("wrap-option");
+ // this.properties.get("z-index");
this.align = this.properties.get("text-align").getEnum();
this.alignLast = this.properties.get("text-align-last").getEnum();
1.11 +28 -1 xml-fop/src/org/apache/fop/fo/flow/BlockContainer.java
Index: BlockContainer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/BlockContainer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- BlockContainer.java 2001/07/30 20:29:23 1.10
+++ BlockContainer.java 2001/08/06 09:12:59 1.11
@@ -1,5 +1,5 @@
/*
- * $Id: BlockContainer.java,v 1.10 2001/07/30 20:29:23 tore Exp $
+ * $Id: BlockContainer.java,v 1.11 2001/08/06 09:12:59 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.
@@ -58,6 +58,33 @@
public Status layout(Area area) throws FOPException {
if (this.marker == START) {
+
+ // Common Accessibility Properties
+ AbsolutePositionProps mAbsProps = propMgr.getAbsolutePositionProps();
+
+ // Common Border, Padding, and Background Properties
+ BorderAndPadding bap = propMgr.getBorderAndPadding();
+ BackgroundProps bProps = propMgr.getBackgroundProps();
+
+ // Common Margin-Block Properties
+ MarginProps mProps = propMgr.getMarginProps();
+
+ // this.properties.get("block-progression-dimension");
+ // this.properties.get("break-after");
+ // this.properties.get("break-before");
+ // this.properties.get("clip");
+ // this.properties.get("display-align");
+ // this.properties.get("height");
+ // this.properties.get("id");
+ // this.properties.get("keep-together");
+ // this.properties.get("keep-with-next");
+ // this.properties.get("keep-with-previous");
+ // this.properties.get("overflow");
+ // this.properties.get("reference-orientation");
+ // this.properties.get("span");
+ // this.properties.get("width");
+ // this.properties.get("writing-mode");
+
this.marker = 0;
this.backgroundColor =
1.10 +44 -1 xml-fop/src/org/apache/fop/fo/flow/Character.java
Index: Character.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Character.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Character.java 2001/07/30 20:29:23 1.9
+++ Character.java 2001/08/06 09:12:59 1.10
@@ -1,5 +1,5 @@
/*
- * $Id: Character.java,v 1.9 2001/07/30 20:29:23 tore Exp $
+ * $Id: Character.java,v 1.10 2001/08/06 09:12:59 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.
@@ -65,6 +65,49 @@
}
blockArea = (BlockArea)area;
boolean textDecoration;
+
+ // Common Aural Properties
+ AuralProps mAurProps = propMgr.getAuralProps();
+
+ // Common Border, Padding, and Background Properties
+ BorderAndPadding bap = propMgr.getBorderAndPadding();
+ BackgroundProps bProps = propMgr.getBackgroundProps();
+
+ // Common Font Properties
+ //this.fontState = propMgr.getFontState(area.getFontInfo());
+
+ // Common Hyphenation Properties
+ HyphenationProps mHyphProps = propMgr.getHyphenationProps();
+
+ // Common Margin Properties-Inline
+ MarginInlineProps mProps = propMgr.getMarginInlineProps();
+
+ // Common Relative Position Properties
+ RelativePositionProps mRelProps = propMgr.getRelativePositionProps();
+
+ // this.properties.get("alignment-adjust");
+ // this.properties.get("treat-as-word-space");
+ // this.properties.get("alignment-baseline");
+ // this.properties.get("baseline-shift");
+ // this.properties.get("character");
+ // this.properties.get("color");
+ // this.properties.get("dominant-baseline");
+ // this.properties.get("text-depth");
+ // this.properties.get("text-altitude");
+ // this.properties.get("glyph-orientation-horizontal");
+ // this.properties.get("glyph-orientation-vertical");
+ // this.properties.get("id");
+ // this.properties.get("keep-with-next");
+ // this.properties.get("keep-with-previous");
+ // this.properties.get("letter-spacing");
+ // this.properties.get("line-height");
+ // this.properties.get("line-height-shift-adjustment");
+ // this.properties.get("score-spaces");
+ // this.properties.get("suppress-at-line-break");
+ // this.properties.get("text-decoration");
+ // this.properties.get("text-shadow");
+ // this.properties.get("text-transform");
+ // this.properties.get("word-spacing");
// color properties
ColorType c = this.properties.get("color").getColorType();
1.11 +41 -1 xml-fop/src/org/apache/fop/fo/flow/ExternalGraphic.java
Index: ExternalGraphic.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/ExternalGraphic.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ExternalGraphic.java 2001/07/30 20:29:23 1.10
+++ ExternalGraphic.java 2001/08/06 09:12:59 1.11
@@ -1,5 +1,5 @@
/*
- * $Id: ExternalGraphic.java,v 1.10 2001/07/30 20:29:23 tore Exp $
+ * $Id: ExternalGraphic.java,v 1.11 2001/08/06 09:12:59 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.
@@ -47,6 +47,46 @@
public Status layout(Area area) throws FOPException {
if (this.marker == START) {
+
+ // Common Accessibility Properties
+ AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
+
+ // Common Aural Properties
+ AuralProps mAurProps = propMgr.getAuralProps();
+
+ // Common Border, Padding, and Background Properties
+ BorderAndPadding bap = propMgr.getBorderAndPadding();
+ BackgroundProps bProps = propMgr.getBackgroundProps();
+
+ // Common Margin Properties-Inline
+ MarginInlineProps mProps = propMgr.getMarginInlineProps();
+
+ // Common Relative Position Properties
+ RelativePositionProps mRelProps = propMgr.getRelativePositionProps();
+
+ // this.properties.get("alignment-adjust");
+ // this.properties.get("alignment-baseline");
+ // this.properties.get("baseline-shift");
+ // this.properties.get("block-progression-dimension");
+ // this.properties.get("content-height");
+ // this.properties.get("content-type");
+ // this.properties.get("content-width");
+ // this.properties.get("display-align");
+ // this.properties.get("dominant-baseline");
+ // this.properties.get("height");
+ // this.properties.get("id");
+ // this.properties.get("inline-progression-dimension");
+ // this.properties.get("keep-with-next");
+ // this.properties.get("keep-with-previous");
+ // this.properties.get("line-height");
+ // this.properties.get("line-height-shift-adjustment");
+ // this.properties.get("overflow");
+ // this.properties.get("scaling");
+ // this.properties.get("scaling-method");
+ // this.properties.get("src");
+ // this.properties.get("text-align");
+ // this.properties.get("width");
+
// FIXME
this.align = this.properties.get("text-align").getEnum();
1.3 +9 -2 xml-fop/src/org/apache/fop/fo/flow/Float.java
Index: Float.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Float.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Float.java 2001/07/30 20:29:23 1.2
+++ Float.java 2001/08/06 09:12:59 1.3
@@ -1,5 +1,5 @@
/*
- * $Id: Float.java,v 1.2 2001/07/30 20:29:23 tore Exp $
+ * $Id: Float.java,v 1.3 2001/08/06 09:12:59 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.
@@ -12,7 +12,7 @@
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.layout.*;
import org.apache.fop.apps.FOPException;
/**
@@ -37,4 +37,11 @@
this.name = "fo:float";
}
+ public Status layout(Area area) throws FOPException {
+
+ // this.properties.get("float");
+ // this.properties.get("clear");
+
+ return super.layout(area);
+ }
}
1.3 +33 -1 xml-fop/src/org/apache/fop/fo/flow/InitialPropertySet.java
Index: InitialPropertySet.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/InitialPropertySet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InitialPropertySet.java 2001/07/30 20:29:23 1.2
+++ InitialPropertySet.java 2001/08/06 09:12:59 1.3
@@ -1,5 +1,5 @@
/*
- * $Id: InitialPropertySet.java,v 1.2 2001/07/30 20:29:23 tore Exp $
+ * $Id: InitialPropertySet.java,v 1.3 2001/08/06 09:12:59 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.
@@ -9,6 +9,7 @@
// FOP
import org.apache.fop.fo.*;
+import org.apache.fop.layout.*;
import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.fo.flow.*;
import org.apache.fop.fo.properties.*;
@@ -37,4 +38,35 @@
this.name = "fo:initial-property-set";
}
+ public Status layout(Area area) throws FOPException {
+
+ // Common Accessibility Properties
+ AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
+
+ // Common Aural Properties
+ AuralProps mAurProps = propMgr.getAuralProps();
+
+ // Common Border, Padding, and Background Properties
+ BorderAndPadding bap = propMgr.getBorderAndPadding();
+ BackgroundProps bProps = propMgr.getBackgroundProps();
+
+ // Common Font Properties
+ //this.fontState = propMgr.getFontState(area.getFontInfo());
+
+ // Common Relative Position Properties
+ RelativePositionProps mRelProps = propMgr.getRelativePositionProps();
+
+ // this.properties.get("color");
+ // this.properties.get("id");
+ // this.properties.get("letter-spacing");
+ // this.properties.get("line-height");
+ // this.properties.get("line-height-shift-adjustment");
+ // this.properties.get("score-spaces");
+ // this.properties.get("text-decoration");
+ // this.properties.get("text-shadow");
+ // this.properties.get("text-transform");
+ // this.properties.get("word-spacing");
+
+ return super.layout(area);
+ }
}
1.6 +36 -2 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Inline.java 2001/07/30 20:29:23 1.5
+++ Inline.java 2001/08/06 09:12:59 1.6
@@ -1,5 +1,5 @@
/*
- * $Id: Inline.java,v 1.5 2001/07/30 20:29:23 tore Exp $
+ * $Id: Inline.java,v 1.6 2001/08/06 09:12:59 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.
@@ -9,7 +9,7 @@
// FOP
import org.apache.fop.fo.*;
-import org.apache.fop.layout.Area;
+import org.apache.fop.layout.*;
import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.properties.*;
@@ -40,6 +40,40 @@
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
this.name = "fo:inline";
+
+ // Common Accessibility Properties
+ AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
+
+ // Common Aural Properties
+ AuralProps mAurProps = propMgr.getAuralProps();
+
+ // Common Border, Padding, and Background Properties
+ BorderAndPadding bap = propMgr.getBorderAndPadding();
+ BackgroundProps bProps = propMgr.getBackgroundProps();
+
+ // Common Font Properties
+ //this.fontState = propMgr.getFontState(area.getFontInfo());
+
+ // Common Margin Properties-Inline
+ MarginInlineProps mProps = propMgr.getMarginInlineProps();
+
+ // Common Relative Position Properties
+ RelativePositionProps mRelProps = propMgr.getRelativePositionProps();
+
+ // this.properties.get("alignment-adjust");
+ // this.properties.get("alignment-baseline");
+ // this.properties.get("baseline-shift");
+ // this.properties.get("color");
+ // this.properties.get("dominant-baseline");
+ // this.properties.get("id");
+ // this.properties.get("keep-together");
+ // this.properties.get("keep-with-next");
+ // this.properties.get("keep-with-previous");
+ // this.properties.get("line-height");
+ // this.properties.get("line-height-shift-adjustment");
+ // this.properties.get("text-devoration");
+ // this.properties.get("visibility");
+ // this.properties.get("z-index");
int textDecoration = this.properties.get("text-decoration").getEnum();
1.3 +32 -2 xml-fop/src/org/apache/fop/fo/flow/InlineContainer.java
Index: InlineContainer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/InlineContainer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InlineContainer.java 2001/07/30 20:29:23 1.2
+++ InlineContainer.java 2001/08/06 09:12:59 1.3
@@ -1,5 +1,5 @@
/*
- * $Id: InlineContainer.java,v 1.2 2001/07/30 20:29:23 tore Exp $
+ * $Id: InlineContainer.java,v 1.3 2001/08/06 09:12:59 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.
@@ -12,7 +12,7 @@
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.layout.*;
import org.apache.fop.apps.FOPException;
/**
@@ -35,6 +35,36 @@
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
this.name = "fo:inline-container";
+
+ // Common Border, Padding, and Background Properties
+ BorderAndPadding bap = propMgr.getBorderAndPadding();
+ BackgroundProps bProps = propMgr.getBackgroundProps();
+
+ // Common Margin Properties-Inline
+ MarginInlineProps mProps = propMgr.getMarginInlineProps();
+
+ // Common Relative Position Properties
+ RelativePositionProps mRelProps = propMgr.getRelativePositionProps();
+
+ // this.properties.get("alignment-adjust");
+ // this.properties.get("alignment-baseline");
+ // this.properties.get("baseline-shift");
+ // this.properties.get("block-progression-dimension");
+ // this.properties.get("clip");
+ // this.properties.get("display-align");
+ // this.properties.get("dominant-baseline");
+ // this.properties.get("height");
+ // this.properties.get("id");
+ // this.properties.get("inline-progression-dimension");
+ // this.properties.get("keep-together");
+ // this.properties.get("keep-with-next");
+ // this.properties.get("keep-with-previous");
+ // this.properties.get("line-height");
+ // this.properties.get("line-height-shift-adjustment");
+ // this.properties.get("overflow");
+ // this.properties.get("reference-orientation");
+ // this.properties.get("width");
+ // this.properties.get("writing-mode");
}
}
1.14 +40 -1 xml-fop/src/org/apache/fop/fo/flow/InstreamForeignObject.java
Index: InstreamForeignObject.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/InstreamForeignObject.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- InstreamForeignObject.java 2001/07/30 20:29:23 1.13
+++ InstreamForeignObject.java 2001/08/06 09:12:59 1.14
@@ -1,5 +1,5 @@
/*
- * $Id: InstreamForeignObject.java,v 1.13 2001/07/30 20:29:23 tore Exp $
+ * $Id: InstreamForeignObject.java,v 1.14 2001/08/06 09:12:59 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.
@@ -93,6 +93,45 @@
}
if (this.marker == START) {
+
+ // Common Accessibility Properties
+ AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
+
+ // Common Aural Properties
+ AuralProps mAurProps = propMgr.getAuralProps();
+
+ // Common Border, Padding, and Background Properties
+ BorderAndPadding bap = propMgr.getBorderAndPadding();
+ BackgroundProps bProps = propMgr.getBackgroundProps();
+
+ // Common Margin Properties-Inline
+ MarginInlineProps mProps = propMgr.getMarginInlineProps();
+
+ // Common Relative Position Properties
+ RelativePositionProps mRelProps = propMgr.getRelativePositionProps();
+
+ // this.properties.get("alignment-adjust");
+ // this.properties.get("alignment-baseline");
+ // this.properties.get("baseline-shift");
+ // this.properties.get("block-progression-dimension");
+ // this.properties.get("content-height");
+ // this.properties.get("content-type");
+ // this.properties.get("content-width");
+ // this.properties.get("display-align");
+ // this.properties.get("dominant-baseline");
+ // this.properties.get("height");
+ // this.properties.get("id");
+ // this.properties.get("inline-progression-dimension");
+ // this.properties.get("keep-with-next");
+ // this.properties.get("keep-with-previous");
+ // this.properties.get("line-height");
+ // this.properties.get("line-height-shift-adjustment");
+ // this.properties.get("overflow");
+ // this.properties.get("scaling");
+ // this.properties.get("scaling-method");
+ // this.properties.get("text-align");
+ // this.properties.get("width");
+
/* retrieve properties */
String id = this.properties.get("id").getString();
int align = this.properties.get("text-align").getEnum();
1.9 +43 -2 xml-fop/src/org/apache/fop/fo/flow/Leader.java
Index: Leader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Leader.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Leader.java 2001/07/30 20:29:23 1.8
+++ Leader.java 2001/08/06 09:12:59 1.9
@@ -1,5 +1,5 @@
/*
- * $Id: Leader.java,v 1.8 2001/07/30 20:29:23 tore Exp $
+ * $Id: Leader.java,v 1.9 2001/08/06 09:12:59 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.
@@ -11,7 +11,7 @@
import org.apache.fop.fo.*;
import org.apache.fop.fo.properties.*;
import org.apache.fop.datatypes.*;
-import org.apache.fop.layout.Area;
+import org.apache.fop.layout.*;
import org.apache.fop.layout.BlockArea;
import org.apache.fop.layout.inline.LeaderArea;
import org.apache.fop.layout.LineArea;
@@ -53,6 +53,47 @@
} else {
blockArea = (BlockArea)area;
}
+
+ // Common Accessibility Properties
+ AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
+
+ // Common Aural Properties
+ AuralProps mAurProps = propMgr.getAuralProps();
+
+ // Common Border, Padding, and Background Properties
+ BorderAndPadding bap = propMgr.getBorderAndPadding();
+ BackgroundProps bProps = propMgr.getBackgroundProps();
+
+ // Common Font Properties
+ //this.fontState = propMgr.getFontState(area.getFontInfo());
+
+ // Common Margin Properties-Inline
+ MarginInlineProps mProps = propMgr.getMarginInlineProps();
+
+ // Common Relative Position Properties
+ RelativePositionProps mRelProps = propMgr.getRelativePositionProps();
+
+ // this.properties.get("alignment-adjust");
+ // this.properties.get("alignment-baseline");
+ // this.properties.get("baseline-shift");
+ // this.properties.get("color");
+ // this.properties.get("dominant-baseline");
+ // this.properties.get("text-depth");
+ // this.properties.get("text-altitude");
+ // this.properties.get("id");
+ // this.properties.get("leader-alignment");
+ // this.properties.get("leader-length");
+ // this.properties.get("leader-pattern");
+ // this.properties.get("leader-pattern-width");
+ // this.properties.get("rule-style");
+ // this.properties.get("rule-thickness");
+ // this.properties.get("letter-spacing");
+ // this.properties.get("line-height");
+ // this.properties.get("line-height-shift-adjustment");
+ // this.properties.get("text-shadow");
+ // this.properties.get("visibility");
+ // this.properties.get("word-spacing");
+ // this.properties.get("z-index");
// color properties
ColorType c = this.properties.get("color").getColorType();
1.20 +27 -2 xml-fop/src/org/apache/fop/fo/flow/ListBlock.java
Index: ListBlock.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/ListBlock.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ListBlock.java 2001/07/30 20:29:23 1.19
+++ ListBlock.java 2001/08/06 09:12:59 1.20
@@ -1,5 +1,5 @@
/*
- * $Id: ListBlock.java,v 1.19 2001/07/30 20:29:23 tore Exp $
+ * $Id: ListBlock.java,v 1.20 2001/08/06 09:12:59 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.
@@ -12,7 +12,7 @@
import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.fo.properties.*;
import org.apache.fop.datatypes.*;
-import org.apache.fop.layout.Area;
+import org.apache.fop.layout.*;
import org.apache.fop.layout.BlockArea;
import org.apache.fop.layout.FontState;
import org.apache.fop.apps.FOPException;
@@ -53,6 +53,31 @@
public Status layout(Area area) throws FOPException {
if (this.marker == START) {
+
+ // Common Accessibility Properties
+ AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
+
+ // Common Aural Properties
+ AuralProps mAurProps = propMgr.getAuralProps();
+
+ // Common Border, Padding, and Background Properties
+ BorderAndPadding bap = propMgr.getBorderAndPadding();
+ BackgroundProps bProps = propMgr.getBackgroundProps();
+
+ // Common Margin Properties-Block
+ MarginProps mProps = propMgr.getMarginProps();
+
+ // Common Relative Position Properties
+ RelativePositionProps mRelProps = propMgr.getRelativePositionProps();
+
+ // this.properties.get("break-after");
+ // this.properties.get("break-before");
+ // this.properties.get("id");
+ // this.properties.get("keep-together");
+ // this.properties.get("keep-with-next");
+ // this.properties.get("keep-with-previous");
+ // this.properties.get("provisional-distance-between-starts");
+ // this.properties.get("provisional-label-separation");
this.align = this.properties.get("text-align").getEnum();
this.alignLast = this.properties.get("text-align-last").getEnum();
1.16 +26 -2 xml-fop/src/org/apache/fop/fo/flow/ListItem.java
Index: ListItem.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/ListItem.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ListItem.java 2001/07/30 20:29:23 1.15
+++ ListItem.java 2001/08/06 09:12:59 1.16
@@ -1,5 +1,5 @@
/*
- * $Id: ListItem.java,v 1.15 2001/07/30 20:29:23 tore Exp $
+ * $Id: ListItem.java,v 1.16 2001/08/06 09:12:59 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.
@@ -10,7 +10,7 @@
// FOP
import org.apache.fop.fo.*;
import org.apache.fop.fo.properties.*;
-import org.apache.fop.layout.Area;
+import org.apache.fop.layout.*;
import org.apache.fop.layout.BlockArea;
import org.apache.fop.layout.FontState;
import org.apache.fop.apps.FOPException;
@@ -51,6 +51,30 @@
public Status layout(Area area) throws FOPException {
if (this.marker == START) {
+
+ // Common Accessibility Properties
+ AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
+
+ // Common Aural Properties
+ AuralProps mAurProps = propMgr.getAuralProps();
+
+ // Common Border, Padding, and Background Properties
+ BorderAndPadding bap = propMgr.getBorderAndPadding();
+ BackgroundProps bProps = propMgr.getBackgroundProps();
+
+ // Common Margin Properties-Block
+ MarginProps mProps = propMgr.getMarginProps();
+
+ // Common Relative Position Properties
+ RelativePositionProps mRelProps = propMgr.getRelativePositionProps();
+
+ // this.properties.get("break-after");
+ // this.properties.get("break-before");
+ // this.properties.get("id");
+ // this.properties.get("keep-together");
+ // this.properties.get("keep-with-next");
+ // this.properties.get("keep-with-previous");
+ // this.properties.get("relative-align");
this.align = this.properties.get("text-align").getEnum();
this.alignLast = this.properties.get("text-align-last").getEnum();
1.11 +9 -2 xml-fop/src/org/apache/fop/fo/flow/ListItemBody.java
Index: ListItemBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/ListItemBody.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ListItemBody.java 2001/07/30 20:29:23 1.10
+++ ListItemBody.java 2001/08/06 09:12:59 1.11
@@ -1,5 +1,5 @@
/*
- * $Id: ListItemBody.java,v 1.10 2001/07/30 20:29:23 tore Exp $
+ * $Id: ListItemBody.java,v 1.11 2001/08/06 09:12:59 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.
@@ -10,7 +10,7 @@
// FOP
import org.apache.fop.fo.*;
import org.apache.fop.fo.properties.*;
-import org.apache.fop.layout.Area;
+import org.apache.fop.layout.*;
import org.apache.fop.layout.FontState;
import org.apache.fop.apps.FOPException;
@@ -38,6 +38,13 @@
public Status layout(Area area) throws FOPException {
if (this.marker == START) {
+
+ // Common Accessibility Properties
+ AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
+
+ // this.properties.get("id");
+ // this.properties.get("keep-together");
+
this.marker = 0;
// initialize id
String id = this.properties.get("id").getString();
1.11 +8 -2 xml-fop/src/org/apache/fop/fo/flow/ListItemLabel.java
Index: ListItemLabel.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/ListItemLabel.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ListItemLabel.java 2001/07/30 20:29:23 1.10
+++ ListItemLabel.java 2001/08/06 09:12:59 1.11
@@ -1,5 +1,5 @@
/*
- * $Id: ListItemLabel.java,v 1.10 2001/07/30 20:29:23 tore Exp $
+ * $Id: ListItemLabel.java,v 1.11 2001/08/06 09:12:59 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.
@@ -10,7 +10,7 @@
// FOP
import org.apache.fop.fo.*;
import org.apache.fop.fo.properties.*;
-import org.apache.fop.layout.Area;
+import org.apache.fop.layout.*;
import org.apache.fop.layout.FontState;
import org.apache.fop.apps.FOPException;
@@ -42,6 +42,12 @@
if (numChildren != 1) {
throw new FOPException("list-item-label must have exactly one block in this version of FOP");
}
+
+ // Common Accessibility Properties
+ AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
+
+ // this.properties.get("id");
+ // this.properties.get("keep-together");
// initialize id
String id = this.properties.get("id").getString();
1.3 +14 -2 xml-fop/src/org/apache/fop/fo/flow/MultiCase.java
Index: MultiCase.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/MultiCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MultiCase.java 2001/07/30 20:29:23 1.2
+++ MultiCase.java 2001/08/06 09:12:59 1.3
@@ -1,5 +1,5 @@
/*
- * $Id: MultiCase.java,v 1.2 2001/07/30 20:29:23 tore Exp $
+ * $Id: MultiCase.java,v 1.3 2001/08/06 09:12:59 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.
@@ -12,7 +12,7 @@
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.layout.*;
import org.apache.fop.apps.FOPException;
/**
@@ -37,4 +37,16 @@
this.name = "fo:multi-case";
}
+ public Status layout(Area area) throws FOPException {
+
+ // Common Accessibility Properties
+ AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
+
+ // this.properties.get("id");
+ // this.properties.get("starting-state");
+ // this.properties.get("case-name");
+ // this.properties.get("case-title");
+
+ return super.layout(area);
+ }
}
1.3 +11 -2 xml-fop/src/org/apache/fop/fo/flow/MultiProperties.java
Index: MultiProperties.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/MultiProperties.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MultiProperties.java 2001/07/30 20:29:23 1.2
+++ MultiProperties.java 2001/08/06 09:12:59 1.3
@@ -1,5 +1,5 @@
/*
- * $Id: MultiProperties.java,v 1.2 2001/07/30 20:29:23 tore Exp $
+ * $Id: MultiProperties.java,v 1.3 2001/08/06 09:12:59 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.
@@ -12,7 +12,7 @@
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.layout.*;
import org.apache.fop.apps.FOPException;
/**
@@ -37,4 +37,13 @@
this.name = "fo:multi-properties";
}
+ public Status layout(Area area) throws FOPException {
+
+ // Common Accessibility Properties
+ AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
+
+ // this.properties.get("id");
+
+ return super.layout(area);
+ }
}
1.3 +9 -2 xml-fop/src/org/apache/fop/fo/flow/MultiPropertySet.java
Index: MultiPropertySet.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/MultiPropertySet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MultiPropertySet.java 2001/07/30 20:29:23 1.2
+++ MultiPropertySet.java 2001/08/06 09:12:59 1.3
@@ -1,5 +1,5 @@
/*
- * $Id: MultiPropertySet.java,v 1.2 2001/07/30 20:29:23 tore Exp $
+ * $Id: MultiPropertySet.java,v 1.3 2001/08/06 09:12:59 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.
@@ -12,7 +12,7 @@
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.layout.*;
import org.apache.fop.apps.FOPException;
/**
@@ -37,4 +37,11 @@
this.name = "fo:multi-property-set";
}
+ public Status layout(Area area) throws FOPException {
+
+ // this.properties.get("id");
+ // this.properties.get("active-state");
+
+ return super.layout(area);
+ }
}
1.3 +12 -2 xml-fop/src/org/apache/fop/fo/flow/MultiSwitch.java
Index: MultiSwitch.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/MultiSwitch.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MultiSwitch.java 2001/07/30 20:29:23 1.2
+++ MultiSwitch.java 2001/08/06 09:12:59 1.3
@@ -1,5 +1,5 @@
/*
- * $Id: MultiSwitch.java,v 1.2 2001/07/30 20:29:23 tore Exp $
+ * $Id: MultiSwitch.java,v 1.3 2001/08/06 09:12:59 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.
@@ -12,7 +12,7 @@
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.layout.*;
import org.apache.fop.apps.FOPException;
/**
@@ -37,4 +37,14 @@
this.name = "fo:multi-switch";
}
+ public Status layout(Area area) throws FOPException {
+
+ // Common Accessibility Properties
+ AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
+
+ // this.properties.get("auto-restore");
+ // this.properties.get("id");
+
+ return super.layout(area);
+ }
}
1.3 +12 -2 xml-fop/src/org/apache/fop/fo/flow/MultiToggle.java
Index: MultiToggle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/MultiToggle.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MultiToggle.java 2001/07/30 20:29:23 1.2
+++ MultiToggle.java 2001/08/06 09:12:59 1.3
@@ -1,5 +1,5 @@
/*
- * $Id: MultiToggle.java,v 1.2 2001/07/30 20:29:23 tore Exp $
+ * $Id: MultiToggle.java,v 1.3 2001/08/06 09:12:59 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.
@@ -12,7 +12,7 @@
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.layout.*;
import org.apache.fop.apps.FOPException;
/**
@@ -37,4 +37,14 @@
this.name = "fo:multi-toggle";
}
+ public Status layout(Area area) throws FOPException {
+
+ // Common Accessibility Properties
+ AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
+
+ // this.properties.get("id");
+ // this.properties.get("switch-to");
+
+ return super.layout(area);
+ }
}
1.19 +37 -1 xml-fop/src/org/apache/fop/fo/flow/PageNumber.java
Index: PageNumber.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/PageNumber.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- PageNumber.java 2001/07/30 20:29:23 1.18
+++ PageNumber.java 2001/08/06 09:12:59 1.19
@@ -1,5 +1,5 @@
/*
- * $Id: PageNumber.java,v 1.18 2001/07/30 20:29:23 tore Exp $
+ * $Id: PageNumber.java,v 1.19 2001/08/06 09:12:59 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.
@@ -9,6 +9,7 @@
// FOP
import org.apache.fop.fo.*;
+import org.apache.fop.layout.*;
import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.datatypes.*;
import org.apache.fop.fo.properties.*;
@@ -50,6 +51,41 @@
return new Status(Status.OK);
}
if (this.marker == START) {
+
+ // Common Accessibility Properties
+ AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
+
+ // Common Aural Properties
+ AuralProps mAurProps = propMgr.getAuralProps();
+
+ // Common Border, Padding, and Background Properties
+ BorderAndPadding bap = propMgr.getBorderAndPadding();
+ BackgroundProps bProps = propMgr.getBackgroundProps();
+
+ // Common Font Properties
+ //this.fontState = propMgr.getFontState(area.getFontInfo());
+
+ // Common Margin Properties-Inline
+ MarginInlineProps mProps = propMgr.getMarginInlineProps();
+
+ // Common Relative Position Properties
+ RelativePositionProps mRelProps = propMgr.getRelativePositionProps();
+
+ // this.properties.get("alignment-adjust");
+ // this.properties.get("alignment-baseline");
+ // this.properties.get("baseline-shift");
+ // this.properties.get("dominant-baseline");
+ // this.properties.get("id");
+ // this.properties.get("keep-with-next");
+ // this.properties.get("keep-with-previous");
+ // this.properties.get("letter-spacing");
+ // this.properties.get("line-height");
+ // this.properties.get("line-height-shift-adjustment");
+ // this.properties.get("score-spaces");
+ // this.properties.get("text-decoration");
+ // this.properties.get("text-shadow");
+ // this.properties.get("text-transform");
+ // this.properties.get("word-spacing");
ColorType c = this.properties.get("color").getColorType();
this.red = c.red();
1.17 +37 -1 xml-fop/src/org/apache/fop/fo/flow/PageNumberCitation.java
Index: PageNumberCitation.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/PageNumberCitation.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- PageNumberCitation.java 2001/07/30 20:29:23 1.16
+++ PageNumberCitation.java 2001/08/06 09:12:59 1.17
@@ -1,5 +1,5 @@
/*
- * $Id: PageNumberCitation.java,v 1.16 2001/07/30 20:29:23 tore Exp $
+ * $Id: PageNumberCitation.java,v 1.17 2001/08/06 09:12:59 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.
@@ -112,6 +112,42 @@
IDReferences idReferences = area.getIDReferences();
this.area = area;
if (this.marker == START) {
+
+ // Common Accessibility Properties
+ AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
+
+ // Common Aural Properties
+ AuralProps mAurProps = propMgr.getAuralProps();
+
+ // Common Border, Padding, and Background Properties
+ BorderAndPadding bap = propMgr.getBorderAndPadding();
+ BackgroundProps bProps = propMgr.getBackgroundProps();
+
+ // Common Font Properties
+ //this.fontState = propMgr.getFontState(area.getFontInfo());
+
+ // Common Margin Properties-Inline
+ MarginInlineProps mProps = propMgr.getMarginInlineProps();
+
+ // Common Relative Position Properties
+ RelativePositionProps mRelProps = propMgr.getRelativePositionProps();
+
+ // this.properties.get("alignment-adjust");
+ // this.properties.get("alignment-baseline");
+ // this.properties.get("baseline-shift");
+ // this.properties.get("dominant-baseline");
+ // this.properties.get("id");
+ // this.properties.get("keep-with-next");
+ // this.properties.get("keep-with-previous");
+ // this.properties.get("letter-spacing");
+ // this.properties.get("line-height");
+ // this.properties.get("line-height-shift-adjustment");
+ // this.properties.get("ref-id");
+ // this.properties.get("score-spaces");
+ // this.properties.get("text-decoration");
+ // this.properties.get("text-shadow");
+ // this.properties.get("text-transform");
+ // this.properties.get("word-spacing");
ColorType c = this.properties.get("color").getColorType();
this.red = c.red();
1.33 +38 -1 xml-fop/src/org/apache/fop/fo/flow/Table.java
Index: Table.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Table.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Table.java 2001/07/30 20:29:23 1.32
+++ Table.java 2001/08/06 09:12:59 1.33
@@ -1,5 +1,5 @@
/*
- * -- $Id: Table.java,v 1.32 2001/07/30 20:29:23 tore Exp $ --
+ * -- $Id: Table.java,v 1.33 2001/08/06 09:12:59 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.
@@ -62,6 +62,43 @@
}
if (this.marker == START) {
+ // Common Accessibility Properties
+ AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
+
+ // Common Aural Properties
+ AuralProps mAurProps = propMgr.getAuralProps();
+
+ // Common Border, Padding, and Background Properties
+ BorderAndPadding bap = propMgr.getBorderAndPadding();
+ BackgroundProps bProps = propMgr.getBackgroundProps();
+
+ // Common Margin Properties-Block
+ MarginProps mProps = propMgr.getMarginProps();
+
+ // Common Relative Position Properties
+ RelativePositionProps mRelProps = propMgr.getRelativePositionProps();
+
+ // this.properties.get("block-progression-dimension");
+ // this.properties.get("border-after-precendence");
+ // this.properties.get("border-before-precedence");
+ // this.properties.get("border-collapse");
+ // this.properties.get("border-end-precendence");
+ // this.properties.get("border-separation");
+ // this.properties.get("border-start-precendence");
+ // this.properties.get("break-after");
+ // this.properties.get("break-before");
+ // this.properties.get("id");
+ // this.properties.get("inline-progression-dimension");
+ // this.properties.get("height");
+ // this.properties.get("keep-together");
+ // this.properties.get("keep-with-next");
+ // this.properties.get("keep-with-previous");
+ // this.properties.get("table-layout");
+ // this.properties.get("table-omit-footer-at-break");
+ // this.properties.get("table-omit-header-at-break");
+ // this.properties.get("width");
+ // this.properties.get("writing-mode");
+
this.breakBefore = this.properties.get("break-before").getEnum();
this.breakAfter = this.properties.get("break-after").getEnum();
this.spaceBefore =
1.3 +28 -2 xml-fop/src/org/apache/fop/fo/flow/TableAndCaption.java
Index: TableAndCaption.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableAndCaption.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TableAndCaption.java 2001/07/30 20:29:23 1.2
+++ TableAndCaption.java 2001/08/06 09:12:59 1.3
@@ -1,5 +1,5 @@
/*
- * -- $Id: TableAndCaption.java,v 1.2 2001/07/30 20:29:23 tore Exp $ --
+ * -- $Id: TableAndCaption.java,v 1.3 2001/08/06 09:12:59 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.
@@ -12,7 +12,7 @@
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.layout.*;
import org.apache.fop.apps.FOPException;
/**
@@ -37,4 +37,30 @@
this.name = "fo:table-and-caption";
}
+ public Status layout(Area area) throws FOPException {
+
+ // Common Accessibility Properties
+ AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
+
+ // Common Aural Properties
+ AuralProps mAurProps = propMgr.getAuralProps();
+
+ // Common Border, Padding, and Background Properties
+ BorderAndPadding bap = propMgr.getBorderAndPadding();
+ BackgroundProps bProps = propMgr.getBackgroundProps();
+
+ // Common Margin Properties-Block
+ MarginProps mProps = propMgr.getMarginProps();
+
+ // Common Relative Position Properties
+ RelativePositionProps mRelProps = propMgr.getRelativePositionProps();
+
+ // this.properties.get("caption-side");
+ // this.properties.get("id");
+ // this.properties.get("keep-together");
+ // this.properties.get("keep-with-next");
+ // this.properties.get("keep-with-previous");
+
+ return super.layout(area);
+ }
}
1.38 +16 -1 xml-fop/src/org/apache/fop/fo/flow/TableBody.java
Index: TableBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableBody.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- TableBody.java 2001/07/30 20:29:23 1.37
+++ TableBody.java 2001/08/06 09:12:59 1.38
@@ -1,5 +1,5 @@
/*
- * $Id: TableBody.java,v 1.37 2001/07/30 20:29:23 tore Exp $
+ * $Id: TableBody.java,v 1.38 2001/08/06 09:12:59 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.
@@ -69,6 +69,21 @@
}
if (this.marker == START) {
+
+ // Common Accessibility Properties
+ AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
+
+ // Common Aural Properties
+ AuralProps mAurProps = propMgr.getAuralProps();
+
+ // Common Border, Padding, and Background Properties
+ BorderAndPadding bap = propMgr.getBorderAndPadding();
+ BackgroundProps bProps = propMgr.getBackgroundProps();
+
+ // Common Relative Position Properties
+ RelativePositionProps mRelProps = propMgr.getRelativePositionProps();
+
+ // this.properties.get("id");
this.spaceBefore =
this.properties.get("space-before.optimum").getLength().mvalue();
1.3 +26 -2 xml-fop/src/org/apache/fop/fo/flow/TableCaption.java
Index: TableCaption.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableCaption.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TableCaption.java 2001/07/30 20:29:23 1.2
+++ TableCaption.java 2001/08/06 09:12:59 1.3
@@ -1,5 +1,5 @@
/*
- * -- $Id: TableCaption.java,v 1.2 2001/07/30 20:29:23 tore Exp $ --
+ * -- $Id: TableCaption.java,v 1.3 2001/08/06 09:12:59 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.
@@ -12,7 +12,7 @@
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.layout.*;
import org.apache.fop.apps.FOPException;
/**
@@ -37,4 +37,28 @@
this.name = "fo:table-caption";
}
+ public Status layout(Area area) throws FOPException {
+
+ // Common Accessibility Properties
+ AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
+
+ // Common Aural Properties
+ AuralProps mAurProps = propMgr.getAuralProps();
+
+ // Common Border, Padding, and Background Properties
+ BorderAndPadding bap = propMgr.getBorderAndPadding();
+ BackgroundProps bProps = propMgr.getBackgroundProps();
+
+ // Common Relative Position Properties
+ RelativePositionProps mRelProps = propMgr.getRelativePositionProps();
+
+ // this.properties.get("block-progression-dimension");
+ // this.properties.get("height");
+ // this.properties.get("id");
+ // this.properties.get("inline-progression-dimension");
+ // this.properties.get("keep-togethe");
+ // this.properties.get("width");
+
+ return super.layout(area);
+ }
}
1.38 +31 -1 xml-fop/src/org/apache/fop/fo/flow/TableCell.java
Index: TableCell.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableCell.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- TableCell.java 2001/08/05 15:46:21 1.37
+++ TableCell.java 2001/08/06 09:12:59 1.38
@@ -1,5 +1,5 @@
/*
- * -- $Id: TableCell.java,v 1.37 2001/08/05 15:46:21 klease Exp $ --
+ * -- $Id: TableCell.java,v 1.38 2001/08/06 09:12:59 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.
@@ -122,6 +122,36 @@
public void doSetup() // throws FOPException
{
+ // Common Accessibility Properties
+ AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
+
+ // Common Aural Properties
+ AuralProps mAurProps = propMgr.getAuralProps();
+
+ // Common Border, Padding, and Background Properties
+ BorderAndPadding bap = propMgr.getBorderAndPadding();
+ BackgroundProps bProps = propMgr.getBackgroundProps();
+
+ // Common Relative Position Properties
+ RelativePositionProps mRelProps = propMgr.getRelativePositionProps();
+
+ // this.properties.get("border-after-precedence");
+ // this.properties.get("border-before-precendence");
+ // this.properties.get("border-end-precendence");
+ // this.properties.get("border-start-precendence");
+ // this.properties.get("block-progression-dimension");
+ // this.properties.get("column-number");
+ // this.properties.get("display-align");
+ // this.properties.get("relative-align");
+ // this.properties.get("empty-cells");
+ // this.properties.get("ends-row");
+ // this.properties.get("height");
+ // this.properties.get("id");
+ // this.properties.get("number-columns-spanned");
+ // this.properties.get("number-rows-spanned");
+ // this.properties.get("starts-row");
+ // this.properties.get("width");
+
this.iColNumber =
properties.get("column-number").getNumber().intValue();
if (iColNumber < 0) {
1.18 +14 -1 xml-fop/src/org/apache/fop/fo/flow/TableColumn.java
Index: TableColumn.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableColumn.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- TableColumn.java 2001/07/30 20:29:23 1.17
+++ TableColumn.java 2001/08/06 09:12:59 1.18
@@ -1,5 +1,5 @@
/*
- * $Id: TableColumn.java,v 1.17 2001/07/30 20:29:23 tore Exp $
+ * $Id: TableColumn.java,v 1.18 2001/08/06 09:12:59 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.
@@ -56,6 +56,19 @@
}
public void doSetup(Area area) throws FOPException {
+
+ // Common Border, Padding, and Background Properties
+ // only background apply, border apply if border-collapse
+ // is collapse.
+ BorderAndPadding bap = propMgr.getBorderAndPadding();
+ BackgroundProps bProps = propMgr.getBackgroundProps();
+
+ // this.properties.get("column-number");
+ // this.properties.get("column-width");
+ // this.properties.get("number-columns-repeated");
+ // this.properties.get("number-columns-spanned");
+ // this.properties.get("visibility");
+
this.numColumnsRepeated =
this.properties.get("number-columns-repeated").getNumber().intValue();
1.50 +27 -1 xml-fop/src/org/apache/fop/fo/flow/TableRow.java
Index: TableRow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableRow.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- TableRow.java 2001/07/30 20:29:23 1.49
+++ TableRow.java 2001/08/06 09:12:59 1.50
@@ -1,5 +1,5 @@
/*
- * -- $Id: TableRow.java,v 1.49 2001/07/30 20:29:23 tore Exp $ --
+ * -- $Id: TableRow.java,v 1.50 2001/08/06 09:12:59 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.
@@ -187,6 +187,32 @@
}
public void doSetup(Area area) throws FOPException {
+
+ // Common Accessibility Properties
+ AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
+
+ // this.properties.get("block-progression-dimension");
+
+ // Common Aural Properties
+ AuralProps mAurProps = propMgr.getAuralProps();
+
+ // Common Border, Padding, and Background Properties
+ // only background apply, border apply if border-collapse
+ // is collapse.
+ BorderAndPadding bap = propMgr.getBorderAndPadding();
+ BackgroundProps bProps = propMgr.getBackgroundProps();
+
+ // Common Relative Position Properties
+ RelativePositionProps mRelProps = propMgr.getRelativePositionProps();
+
+ // this.properties.get("break-before");
+ // this.properties.get("break-after");
+ // this.properties.get("id");
+ // this.properties.get("height");
+ // this.properties.get("keep-together");
+ // this.properties.get("keep-with-next");
+ // this.properties.get("keep-with-previous");
+
this.breakAfter = this.properties.get("break-after").getEnum();
this.backgroundColor =
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org