diff options
author | Keiron Liddle <keiron@apache.org> | 2001-08-06 09:12:59 +0000 |
---|---|---|
committer | Keiron Liddle <keiron@apache.org> | 2001-08-06 09:12:59 +0000 |
commit | c928a8eadc5d7e48771fd91f56abfdb889fe2f61 (patch) | |
tree | 7d8e86ef766807e49de04591ccce869ace9ef52e /src/org/apache | |
parent | 87849d314529a8d87a310bc4120f72446c5cc17a (diff) | |
download | xmlgraphics-fop-c928a8eadc5d7e48771fd91f56abfdb889fe2f61.tar.gz xmlgraphics-fop-c928a8eadc5d7e48771fd91f56abfdb889fe2f61.zip |
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
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@194394 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/org/apache')
35 files changed, 906 insertions, 17 deletions
diff --git a/src/org/apache/fop/fo/FOTreeBuilder.java b/src/org/apache/fop/fo/FOTreeBuilder.java index 4c137658f..94e431f52 100644 --- a/src/org/apache/fop/fo/FOTreeBuilder.java +++ b/src/org/apache/fop/fo/FOTreeBuilder.java @@ -196,10 +196,9 @@ public class FOTreeBuilder extends DefaultHandler implements TreeBuilder { MessageHandler.errorln("WARNING: Unknown formatting object " + fullName); } - fobjMaker = new FObjMixed.Maker(); // fall back + fobjMaker = new Unknown.Maker(); // fall back } - try { PropertyList list = null; if (currentListBuilder != null) { diff --git a/src/org/apache/fop/fo/PropertyList.java b/src/org/apache/fop/fo/PropertyList.java index 90cf310d8..f6cd8747f 100644 --- a/src/org/apache/fop/fo/PropertyList.java +++ b/src/org/apache/fop/fo/PropertyList.java @@ -253,6 +253,16 @@ public class PropertyList extends Hashtable { // 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); diff --git a/src/org/apache/fop/fo/PropertyManager.java b/src/org/apache/fop/fo/PropertyManager.java index 753cafd98..dfbabd383 100644 --- a/src/org/apache/fop/fo/PropertyManager.java +++ b/src/org/apache/fop/fo/PropertyManager.java @@ -12,6 +12,11 @@ import org.apache.fop.layout.FontInfo; 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 @@ public class PropertyManager { 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; + } } diff --git a/src/org/apache/fop/fo/Title.java b/src/org/apache/fop/fo/Title.java index dbe258ca4..10c3387af 100644 --- a/src/org/apache/fop/fo/Title.java +++ b/src/org/apache/fop/fo/Title.java @@ -9,6 +9,8 @@ package org.apache.fop.fo; // 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 @@ public class Title extends ToBeImplementedElement { 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); + } } diff --git a/src/org/apache/fop/fo/Unknown.java b/src/org/apache/fop/fo/Unknown.java new file mode 100644 index 000000000..bc5049211 --- /dev/null +++ b/src/org/apache/fop/fo/Unknown.java @@ -0,0 +1,49 @@ +/* + * $Id$ + * 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); + } +} diff --git a/src/org/apache/fop/fo/flow/BasicLink.java b/src/org/apache/fop/fo/flow/BasicLink.java index 7de5f71f2..c06c507c8 100644 --- a/src/org/apache/fop/fo/flow/BasicLink.java +++ b/src/org/apache/fop/fo/flow/BasicLink.java @@ -47,6 +47,41 @@ public class BasicLink extends FObjMixed { 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("")) { linkType = LinkSet.INTERNAL; diff --git a/src/org/apache/fop/fo/flow/BidiOverride.java b/src/org/apache/fop/fo/flow/BidiOverride.java index c6d7a1ba3..ea1566cc7 100644 --- a/src/org/apache/fop/fo/flow/BidiOverride.java +++ b/src/org/apache/fop/fo/flow/BidiOverride.java @@ -9,6 +9,7 @@ package org.apache.fop.fo.flow; // 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 @@ public class BidiOverride extends ToBeImplementedElement { 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); + } } diff --git a/src/org/apache/fop/fo/flow/Block.java b/src/org/apache/fop/fo/flow/Block.java index 8b8de35b3..7ba0bed04 100644 --- a/src/org/apache/fop/fo/flow/Block.java +++ b/src/org/apache/fop/fo/flow/Block.java @@ -85,6 +85,56 @@ public class Block extends FObjMixed { 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(); this.breakAfter = this.properties.get("break-after").getEnum(); diff --git a/src/org/apache/fop/fo/flow/BlockContainer.java b/src/org/apache/fop/fo/flow/BlockContainer.java index 4d565a8a0..563fbbfcc 100644 --- a/src/org/apache/fop/fo/flow/BlockContainer.java +++ b/src/org/apache/fop/fo/flow/BlockContainer.java @@ -58,6 +58,33 @@ public class BlockContainer extends FObj { 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 = diff --git a/src/org/apache/fop/fo/flow/Character.java b/src/org/apache/fop/fo/flow/Character.java index 5701792b8..eea3c77d2 100644 --- a/src/org/apache/fop/fo/flow/Character.java +++ b/src/org/apache/fop/fo/flow/Character.java @@ -66,6 +66,49 @@ public class Character extends FObj { 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(); float red = c.red(); diff --git a/src/org/apache/fop/fo/flow/ExternalGraphic.java b/src/org/apache/fop/fo/flow/ExternalGraphic.java index 802db0e25..4647ce846 100644 --- a/src/org/apache/fop/fo/flow/ExternalGraphic.java +++ b/src/org/apache/fop/fo/flow/ExternalGraphic.java @@ -47,6 +47,46 @@ public class ExternalGraphic extends FObj { 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(); diff --git a/src/org/apache/fop/fo/flow/Float.java b/src/org/apache/fop/fo/flow/Float.java index 3fb948c40..c5eb15188 100644 --- a/src/org/apache/fop/fo/flow/Float.java +++ b/src/org/apache/fop/fo/flow/Float.java @@ -12,7 +12,7 @@ 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.layout.*; import org.apache.fop.apps.FOPException; /** @@ -37,4 +37,11 @@ public class Float extends ToBeImplementedElement { this.name = "fo:float"; } + public Status layout(Area area) throws FOPException { + + // this.properties.get("float"); + // this.properties.get("clear"); + + return super.layout(area); + } } diff --git a/src/org/apache/fop/fo/flow/InitialPropertySet.java b/src/org/apache/fop/fo/flow/InitialPropertySet.java index 63746b12e..7406146d2 100644 --- a/src/org/apache/fop/fo/flow/InitialPropertySet.java +++ b/src/org/apache/fop/fo/flow/InitialPropertySet.java @@ -9,6 +9,7 @@ package org.apache.fop.fo.flow; // 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 @@ public class InitialPropertySet extends ToBeImplementedElement { 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); + } } diff --git a/src/org/apache/fop/fo/flow/Inline.java b/src/org/apache/fop/fo/flow/Inline.java index 0f37ed191..100bb4947 100644 --- a/src/org/apache/fop/fo/flow/Inline.java +++ b/src/org/apache/fop/fo/flow/Inline.java @@ -9,7 +9,7 @@ package org.apache.fop.fo.flow; // 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.*; @@ -41,6 +41,40 @@ public class Inline extends FObjMixed { 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(); if (textDecoration == TextDecoration.UNDERLINE) { diff --git a/src/org/apache/fop/fo/flow/InlineContainer.java b/src/org/apache/fop/fo/flow/InlineContainer.java index 31bfd008c..5332a2dc6 100644 --- a/src/org/apache/fop/fo/flow/InlineContainer.java +++ b/src/org/apache/fop/fo/flow/InlineContainer.java @@ -12,7 +12,7 @@ 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.layout.*; import org.apache.fop.apps.FOPException; /** @@ -35,6 +35,36 @@ public class InlineContainer extends ToBeImplementedElement { 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"); } } diff --git a/src/org/apache/fop/fo/flow/InstreamForeignObject.java b/src/org/apache/fop/fo/flow/InstreamForeignObject.java index b8273206b..27f9dc1c4 100644 --- a/src/org/apache/fop/fo/flow/InstreamForeignObject.java +++ b/src/org/apache/fop/fo/flow/InstreamForeignObject.java @@ -93,6 +93,45 @@ public class InstreamForeignObject extends FObj { } 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(); diff --git a/src/org/apache/fop/fo/flow/Leader.java b/src/org/apache/fop/fo/flow/Leader.java index 6447d0082..97d1e00c8 100644 --- a/src/org/apache/fop/fo/flow/Leader.java +++ b/src/org/apache/fop/fo/flow/Leader.java @@ -11,7 +11,7 @@ package org.apache.fop.fo.flow; 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; @@ -54,6 +54,47 @@ public class Leader extends FObjMixed { 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(); float red = c.red(); diff --git a/src/org/apache/fop/fo/flow/ListBlock.java b/src/org/apache/fop/fo/flow/ListBlock.java index 6b7534da8..3b93659d3 100644 --- a/src/org/apache/fop/fo/flow/ListBlock.java +++ b/src/org/apache/fop/fo/flow/ListBlock.java @@ -12,7 +12,7 @@ import org.apache.fop.fo.*; 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; @@ -54,6 +54,31 @@ public class ListBlock extends FObj { 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(); this.lineHeight = diff --git a/src/org/apache/fop/fo/flow/ListItem.java b/src/org/apache/fop/fo/flow/ListItem.java index 08d268853..683a2b024 100644 --- a/src/org/apache/fop/fo/flow/ListItem.java +++ b/src/org/apache/fop/fo/flow/ListItem.java @@ -10,7 +10,7 @@ package org.apache.fop.fo.flow; // 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; @@ -52,6 +52,30 @@ public class ListItem extends FObj { 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(); this.lineHeight = diff --git a/src/org/apache/fop/fo/flow/ListItemBody.java b/src/org/apache/fop/fo/flow/ListItemBody.java index d39cbe82f..fa00c4b4d 100644 --- a/src/org/apache/fop/fo/flow/ListItemBody.java +++ b/src/org/apache/fop/fo/flow/ListItemBody.java @@ -10,7 +10,7 @@ package org.apache.fop.fo.flow; // 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 class ListItemBody extends FObj { 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(); diff --git a/src/org/apache/fop/fo/flow/ListItemLabel.java b/src/org/apache/fop/fo/flow/ListItemLabel.java index b044e29bd..a649459d3 100644 --- a/src/org/apache/fop/fo/flow/ListItemLabel.java +++ b/src/org/apache/fop/fo/flow/ListItemLabel.java @@ -10,7 +10,7 @@ package org.apache.fop.fo.flow; // 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; @@ -43,6 +43,12 @@ public class ListItemLabel extends FObj { 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(); area.getIDReferences().initializeID(id, area); diff --git a/src/org/apache/fop/fo/flow/MultiCase.java b/src/org/apache/fop/fo/flow/MultiCase.java index 6f9ca52bf..9cd7a1073 100644 --- a/src/org/apache/fop/fo/flow/MultiCase.java +++ b/src/org/apache/fop/fo/flow/MultiCase.java @@ -12,7 +12,7 @@ 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.layout.*; import org.apache.fop.apps.FOPException; /** @@ -37,4 +37,16 @@ public class MultiCase extends ToBeImplementedElement { 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); + } } diff --git a/src/org/apache/fop/fo/flow/MultiProperties.java b/src/org/apache/fop/fo/flow/MultiProperties.java index ab6df05e7..03a42b289 100644 --- a/src/org/apache/fop/fo/flow/MultiProperties.java +++ b/src/org/apache/fop/fo/flow/MultiProperties.java @@ -12,7 +12,7 @@ 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.layout.*; import org.apache.fop.apps.FOPException; /** @@ -37,4 +37,13 @@ public class MultiProperties extends ToBeImplementedElement { 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); + } } diff --git a/src/org/apache/fop/fo/flow/MultiPropertySet.java b/src/org/apache/fop/fo/flow/MultiPropertySet.java index 739dbf0d6..7263f702d 100644 --- a/src/org/apache/fop/fo/flow/MultiPropertySet.java +++ b/src/org/apache/fop/fo/flow/MultiPropertySet.java @@ -12,7 +12,7 @@ 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.layout.*; import org.apache.fop.apps.FOPException; /** @@ -37,4 +37,11 @@ public class MultiPropertySet extends ToBeImplementedElement { 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); + } } diff --git a/src/org/apache/fop/fo/flow/MultiSwitch.java b/src/org/apache/fop/fo/flow/MultiSwitch.java index a68380f8d..42e6e185a 100644 --- a/src/org/apache/fop/fo/flow/MultiSwitch.java +++ b/src/org/apache/fop/fo/flow/MultiSwitch.java @@ -12,7 +12,7 @@ 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.layout.*; import org.apache.fop.apps.FOPException; /** @@ -37,4 +37,14 @@ public class MultiSwitch extends ToBeImplementedElement { 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); + } } diff --git a/src/org/apache/fop/fo/flow/MultiToggle.java b/src/org/apache/fop/fo/flow/MultiToggle.java index 97da2ea9f..8fce89f14 100644 --- a/src/org/apache/fop/fo/flow/MultiToggle.java +++ b/src/org/apache/fop/fo/flow/MultiToggle.java @@ -12,7 +12,7 @@ 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.layout.*; import org.apache.fop.apps.FOPException; /** @@ -37,4 +37,14 @@ public class MultiToggle extends ToBeImplementedElement { 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); + } } diff --git a/src/org/apache/fop/fo/flow/PageNumber.java b/src/org/apache/fop/fo/flow/PageNumber.java index fc830df1e..ddfb60473 100644 --- a/src/org/apache/fop/fo/flow/PageNumber.java +++ b/src/org/apache/fop/fo/flow/PageNumber.java @@ -9,6 +9,7 @@ package org.apache.fop.fo.flow; // 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.*; @@ -51,6 +52,41 @@ public class PageNumber extends FObj { } 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(); this.green = c.green(); diff --git a/src/org/apache/fop/fo/flow/PageNumberCitation.java b/src/org/apache/fop/fo/flow/PageNumberCitation.java index 78ec9f0ff..95d93b627 100644 --- a/src/org/apache/fop/fo/flow/PageNumberCitation.java +++ b/src/org/apache/fop/fo/flow/PageNumberCitation.java @@ -113,6 +113,42 @@ public class PageNumberCitation extends FObj { 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(); this.green = c.green(); diff --git a/src/org/apache/fop/fo/flow/Table.java b/src/org/apache/fop/fo/flow/Table.java index 68d459d16..4f67da52b 100644 --- a/src/org/apache/fop/fo/flow/Table.java +++ b/src/org/apache/fop/fo/flow/Table.java @@ -62,6 +62,43 @@ public class Table extends FObj { } 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 = diff --git a/src/org/apache/fop/fo/flow/TableAndCaption.java b/src/org/apache/fop/fo/flow/TableAndCaption.java index 9f28d6633..b9243aeea 100644 --- a/src/org/apache/fop/fo/flow/TableAndCaption.java +++ b/src/org/apache/fop/fo/flow/TableAndCaption.java @@ -12,7 +12,7 @@ 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.layout.*; import org.apache.fop.apps.FOPException; /** @@ -37,4 +37,30 @@ public class TableAndCaption extends ToBeImplementedElement { 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); + } } diff --git a/src/org/apache/fop/fo/flow/TableBody.java b/src/org/apache/fop/fo/flow/TableBody.java index ca9cee8f4..7ca06d172 100644 --- a/src/org/apache/fop/fo/flow/TableBody.java +++ b/src/org/apache/fop/fo/flow/TableBody.java @@ -70,6 +70,21 @@ public class TableBody extends FObj { 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(); this.spaceAfter = diff --git a/src/org/apache/fop/fo/flow/TableCaption.java b/src/org/apache/fop/fo/flow/TableCaption.java index 0c617f471..93712f309 100644 --- a/src/org/apache/fop/fo/flow/TableCaption.java +++ b/src/org/apache/fop/fo/flow/TableCaption.java @@ -12,7 +12,7 @@ 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.layout.*; import org.apache.fop.apps.FOPException; /** @@ -37,4 +37,28 @@ public class TableCaption extends ToBeImplementedElement { 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); + } } diff --git a/src/org/apache/fop/fo/flow/TableCell.java b/src/org/apache/fop/fo/flow/TableCell.java index eeaa99cf6..24d5d12d4 100644 --- a/src/org/apache/fop/fo/flow/TableCell.java +++ b/src/org/apache/fop/fo/flow/TableCell.java @@ -122,6 +122,36 @@ public class TableCell extends FObj { 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) { diff --git a/src/org/apache/fop/fo/flow/TableColumn.java b/src/org/apache/fop/fo/flow/TableColumn.java index d3c05fe80..2afe6cafc 100644 --- a/src/org/apache/fop/fo/flow/TableColumn.java +++ b/src/org/apache/fop/fo/flow/TableColumn.java @@ -57,6 +57,19 @@ public class TableColumn extends FObj { 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(); diff --git a/src/org/apache/fop/fo/flow/TableRow.java b/src/org/apache/fop/fo/flow/TableRow.java index 9fb0038bc..d2d879c97 100644 --- a/src/org/apache/fop/fo/flow/TableRow.java +++ b/src/org/apache/fop/fo/flow/TableRow.java @@ -188,6 +188,32 @@ public class TableRow extends FObj { 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 = this.properties.get("background-color").getColorType(); |