Attachment #19177 for bug #41044

View | Details | Raw Unified | Return to bug 41044
Collapse All | Expand All

Lines 243-248 Link Here

(-)fop (+4 lines)
243		243
244	# Execute FOP using eval/exec to preserve spaces in paths,	244	# Execute FOP using eval/exec to preserve spaces in paths,
245	# java options, and FOP args	245	# java options, and FOP args
		246
		247	# JMP: -Xrunjmp
		248	# Hat: -Xrunhprof:file=dump.hprof,format=b
		249
246	fop_exec_command="exec \"$JAVACMD\" $LOGCHOICE $LOGLEVEL -classpath \"$LOCALCLASSPATH\" $FOP_OPTS org.apache.fop.cli.Main $fop_exec_args"	250	fop_exec_command="exec \"$JAVACMD\" $LOGCHOICE $LOGLEVEL -classpath \"$LOCALCLASSPATH\" $FOP_OPTS org.apache.fop.cli.Main $fop_exec_args"
247	if $fop_exec_debug ; then	251	if $fop_exec_debug ; then
248	echo $fop_exec_command	252	echo $fop_exec_command

Lines 23-28 Link Here

(-)src/java/org/apache/fop/fo/properties/EnumProperty.java (-3 / +33 lines)
23	import org.apache.fop.fo.PropertyList;	23	import org.apache.fop.fo.PropertyList;
24	import org.apache.fop.fo.expr.PropertyException;	24	import org.apache.fop.fo.expr.PropertyException;
25		25
		26	import java.util.Map;
		27	import java.util.WeakHashMap;
		28
26	/**	29	/**
27	* Superclass for properties that wrap an enumeration value	30	* Superclass for properties that wrap an enumeration value
28	*/	31	*/
Lines 62-79 Link Here
62	}	65	}
63	}	66	}
64		67
65	private int value;	68	private static final Map propertyCache = new WeakHashMap();
66	private String text;
67		69
		70	private final int value;
		71	private final String text;
		72
68	/**	73	/**
69	* @param explicitValue enumerated value to be set for this property	74	* @param explicitValue enumerated value to be set for this property
70	* @param text the string value of the enum.	75	* @param text the string value of the enum.
71	*/	76	*/
72	public EnumProperty(int explicitValue, String text) {	77	private EnumProperty(int explicitValue, String text) {
73	this.value = explicitValue;	78	this.value = explicitValue;
74	this.text = text;	79	this.text = text;
75	}	80	}
76		81
		82	public static EnumProperty getInstance(int explicitValue, String text) {
		83	EnumProperty ep = new EnumProperty(explicitValue, text);
		84	EnumProperty cacheEntry = (EnumProperty)propertyCache.get(ep);
		85	if (cacheEntry == null) {
		86	propertyCache.put(ep, ep);
		87	return ep;
		88	} else {
		89	return cacheEntry;
		90	}
		91	}
		92
77	/**	93	/**
78	* @return this.value	94	* @return this.value
79	*/	95	*/
Lines 88-92 Link Here
88	return text;	104	return text;
89	}	105	}
90		106
		107	public boolean equals(Object obj) {
		108	if (obj instanceof EnumProperty) {
		109	EnumProperty ep = (EnumProperty)obj;
		110	return ep.value == this.value &&
		111	((ep.text == null && this.text == null)
		112	\|\| ep.text.equals(this.text));
		113	} else {
		114	return false;
		115	}
		116	}
		117
		118	public int hashCode() {
		119	return value + text.hashCode();
		120	}
91	}	121	}
92		122

Lines 49-59 Link Here

(-)src/java/org/apache/fop/fo/properties/PageBreakShorthandParser.java (-3 / +3 lines)
49	\|\| propId == Constants.PR_BREAK_AFTER) {	49	\|\| propId == Constants.PR_BREAK_AFTER) {
50	switch (property.getEnum()) {	50	switch (property.getEnum()) {
51	case Constants.EN_ALWAYS:	51	case Constants.EN_ALWAYS:
52	return new EnumProperty(Constants.EN_PAGE, "PAGE");	52	return EnumProperty.getInstance(Constants.EN_PAGE, "PAGE");
53	case Constants.EN_LEFT:	53	case Constants.EN_LEFT:
54	return new EnumProperty(Constants.EN_EVEN_PAGE, "EVEN_PAGE");	54	return EnumProperty.getInstance(Constants.EN_EVEN_PAGE, "EVEN_PAGE");
55	case Constants.EN_RIGHT:	55	case Constants.EN_RIGHT:
56	return new EnumProperty(Constants.EN_ODD_PAGE, "ODD_PAGE");	56	return EnumProperty.getInstance(Constants.EN_ODD_PAGE, "ODD_PAGE");
57	case Constants.EN_AVOID:	57	case Constants.EN_AVOID:
58	default:	58	default:
59	//nop;	59	//nop;




            case EN_BASELINE:
                switch (propId) {
                    case PR_ALIGNMENT_BASELINE:
                        return EnumProperty.getInstance(EN_BASELINE, "BASELINE");
                    case PR_ALIGNMENT_ADJUST:
                        return new EnumLength(EnumProperty.getInstance(EN_AUTO, "AUTO"));
                    case PR_BASELINE_SHIFT:
                        return new EnumLength(EnumProperty.getInstance(EN_BASELINE, "BASELINE"));
                    case PR_DOMINANT_BASELINE:
                        return EnumProperty.getInstance(EN_AUTO, "AUTO");
                }
            case EN_TOP:
                switch (propId) {
                    case PR_ALIGNMENT_BASELINE:
                        return EnumProperty.getInstance(EN_BEFORE_EDGE, "BEFORE_EDGE");
                    case PR_ALIGNMENT_ADJUST:
                        return new EnumLength(EnumProperty.getInstance(EN_AUTO, "AUTO"));
                    case PR_BASELINE_SHIFT:
                        return new EnumLength(EnumProperty.getInstance(EN_BASELINE, "BASELINE"));
                    case PR_DOMINANT_BASELINE:
                        return EnumProperty.getInstance(EN_AUTO, "AUTO");
                }
            case EN_TEXT_TOP:
                switch (propId) {
                    case PR_ALIGNMENT_BASELINE:
                        return EnumProperty.getInstance(EN_TEXT_BEFORE_EDGE, "TEXT_BEFORE_EDGE");
                    case PR_ALIGNMENT_ADJUST:
                        return new EnumLength(EnumProperty.getInstance(EN_AUTO, "AUTO"));
                    case PR_BASELINE_SHIFT:
                        return new EnumLength(EnumProperty.getInstance(EN_BASELINE, "BASELINE"));
                    case PR_DOMINANT_BASELINE:
                        return EnumProperty.getInstance(EN_AUTO, "AUTO");
                }
            case EN_MIDDLE:
                switch (propId) {
                    case PR_ALIGNMENT_BASELINE:
                        return EnumProperty.getInstance(EN_MIDDLE, "MIDDLE");
                    case PR_ALIGNMENT_ADJUST:
                        return new EnumLength(EnumProperty.getInstance(EN_AUTO, "AUTO"));
                    case PR_BASELINE_SHIFT:
                        return new EnumLength(EnumProperty.getInstance(EN_BASELINE, "BASELINE"));
                    case PR_DOMINANT_BASELINE:
                        return EnumProperty.getInstance(EN_AUTO, "AUTO");
                }
            case EN_BOTTOM:
                switch (propId) {
                    case PR_ALIGNMENT_BASELINE:
                        return EnumProperty.getInstance(EN_AFTER_EDGE, "AFTER_EDGE");
                    case PR_ALIGNMENT_ADJUST:
                        return new EnumLength(EnumProperty.getInstance(EN_AUTO, "AUTO"));
                    case PR_BASELINE_SHIFT:
                        return new EnumLength(EnumProperty.getInstance(EN_BASELINE, "BASELINE"));
                    case PR_DOMINANT_BASELINE:
                        return EnumProperty.getInstance(EN_AUTO, "AUTO");
                }
            case EN_TEXT_BOTTOM:
                switch (propId) {
                    case PR_ALIGNMENT_BASELINE:
                        return EnumProperty.getInstance(EN_TEXT_AFTER_EDGE, "TEXT_AFTER_EDGE");
                    case PR_ALIGNMENT_ADJUST:
                        return new EnumLength(EnumProperty.getInstance(EN_AUTO, "AUTO"));
                    case PR_BASELINE_SHIFT:
                        return new EnumLength(EnumProperty.getInstance(EN_BASELINE, "BASELINE"));
                    case PR_DOMINANT_BASELINE:
                        return EnumProperty.getInstance(EN_AUTO, "AUTO");
                }
            case EN_SUB:
                switch (propId) {
                    case PR_ALIGNMENT_BASELINE:
                        return EnumProperty.getInstance(EN_BASELINE, "BASELINE");
                    case PR_ALIGNMENT_ADJUST:
                        return new EnumLength(EnumProperty.getInstance(EN_AUTO, "AUTO"));
                    case PR_BASELINE_SHIFT:
                        return new EnumLength(EnumProperty.getInstance(EN_SUB, "SUB"));
                    case PR_DOMINANT_BASELINE:
                        return EnumProperty.getInstance(EN_AUTO, "AUTO");
                }
            case EN_SUPER:
                switch (propId) {
                    case PR_ALIGNMENT_BASELINE:
                        return EnumProperty.getInstance(EN_BASELINE, "BASELINE");
                    case PR_ALIGNMENT_ADJUST:
                        return new EnumLength(EnumProperty.getInstance(EN_AUTO, "AUTO"));
                    case PR_BASELINE_SHIFT:
                        return new EnumLength(EnumProperty.getInstance(EN_SUPER, "SUPER"));
                    case PR_DOMINANT_BASELINE:
                        return EnumProperty.getInstance(EN_AUTO, "AUTO");
                }
            default:
                switch (propId) {
                    case PR_ALIGNMENT_BASELINE:
                        return EnumProperty.getInstance(EN_BASELINE, "BASELINE");
                    case PR_ALIGNMENT_ADJUST:
                        return property;
                    case PR_BASELINE_SHIFT:
                        return new EnumLength(EnumProperty.getInstance(EN_BASELINE, "BASELINE"));
                    case PR_DOMINANT_BASELINE:
                        return EnumProperty.getInstance(EN_AUTO, "AUTO");
                }
        }
        return null;

Lines 19-35 Link Here

(-)src/java/org/apache/fop/fo/properties/EnumNumber.java (-2 / +17 lines)
19		19
20	package org.apache.fop.fo.properties;	20	package org.apache.fop.fo.properties;
21		21
		22	import java.util.Map;
		23	import java.util.WeakHashMap;
		24
22	/**	25	/**
23	* A number quantity in XSL which is specified as an enum, such as "no-limit".	26	* A number quantity in XSL which is specified as an enum, such as "no-limit".
24	*/	27	*/
25	public class EnumNumber extends NumberProperty {	28	public class EnumNumber extends NumberProperty {
26	private Property enumProperty;	29
		30	private static final Map cache = new WeakHashMap();
		31
		32	private final EnumProperty enumProperty;
27		33
28	public EnumNumber(Property enumProperty) {	34	private EnumNumber(EnumProperty enumProperty) {
29	super(null);	35	super(null);
30	this.enumProperty = enumProperty;	36	this.enumProperty = enumProperty;
31	}	37	}
32		38
		39	public static EnumNumber getInstance(Property enumProperty) {
		40	EnumNumber en = (EnumNumber)cache.get(enumProperty);
		41	if (en == null) {
		42	en = new EnumNumber((EnumProperty)enumProperty);
		43	cache.put(enumProperty, en);
		44	}
		45	return en;
		46	}
		47
33	public int getEnum() {	48	public int getEnum() {
34	return enumProperty.getEnum();	49	return enumProperty.getEnum();
35	}	50	}




            switch (propVal) {
            case Constants.EN_STATIC:
            case Constants.EN_RELATIVE:
                return EnumProperty.getInstance(Constants.EN_AUTO, "AUTO");
            case Constants.EN_ABSOLUTE:
                return EnumProperty.getInstance(Constants.EN_ABSOLUTE, "ABSOLUTE");
            case Constants.EN_FIXED:
                return EnumProperty.getInstance(Constants.EN_FIXED, "FIXED");
            default:
                //nop
            }

        if (propId == Constants.PR_RELATIVE_POSITION) {
            switch (propVal) {
            case Constants.EN_STATIC:
                return EnumProperty.getInstance(Constants.EN_STATIC, "STATIC");
            case Constants.EN_RELATIVE:
                return EnumProperty.getInstance(Constants.EN_RELATIVE, "RELATIVE");
            case Constants.EN_ABSOLUTE:
                return EnumProperty.getInstance(Constants.EN_STATIC, "STATIC");
            case Constants.EN_FIXED:
                return EnumProperty.getInstance(Constants.EN_STATIC, "STATIC");
            default:
                //nop
            }

Lines 58-64 Link Here

(-)src/java/org/apache/fop/fo/properties/NumberProperty.java (-1 / +1 lines)
58	return p;	58	return p;
59	}	59	}
60	if (p instanceof EnumProperty) {	60	if (p instanceof EnumProperty) {
61	return new EnumNumber(p);	61	return EnumNumber.getInstance(p);
62	}	62	}
63	Number val = p.getNumber();	63	Number val = p.getNumber();
64	if (val != null) {	64	if (val != null) {

Lines 54-62 Link Here

(-)src/java/org/apache/fop/fo/properties/LineHeightPropertyMaker.java (-2 / +2 lines)
54	*/	54	*/
55	Property p = super.make(propertyList, value, fo);	55	Property p = super.make(propertyList, value, fo);
56	p.getSpace().setConditionality(	56	p.getSpace().setConditionality(
57	new EnumProperty(Constants.EN_RETAIN, "RETAIN"), true);	57	EnumProperty.getInstance(Constants.EN_RETAIN, "RETAIN"), true);
58	p.getSpace().setPrecedence(	58	p.getSpace().setPrecedence(
59	new EnumProperty(Constants.EN_FORCE, "FORCE"), true);	59	EnumProperty.getInstance(Constants.EN_FORCE, "FORCE"), true);
60	return p;	60	return p;
61	}	61	}
62		62

Lines 43-49 Link Here

(-)src/java/org/apache/fop/fo/properties/SpacePropertyMaker.java (-1 / +1 lines)
43	Property prop = super.compute(propertyList);	43	Property prop = super.compute(propertyList);
44	if (prop != null && prop instanceof SpaceProperty) {	44	if (prop != null && prop instanceof SpaceProperty) {
45	((SpaceProperty)prop).setConditionality(	45	((SpaceProperty)prop).setConditionality(
46	new EnumProperty(Constants.EN_RETAIN, "RETAIN"), false);	46	EnumProperty.getInstance(Constants.EN_RETAIN, "RETAIN"), false);
47	}	47	}
48	return prop;	48	return prop;
49	}	49	}




            switch (propId) {
            case Constants.PR_LINEFEED_TREATMENT:
            case Constants.PR_WHITE_SPACE_TREATMENT:
                return EnumProperty.getInstance(Constants.EN_PRESERVE, "PRESERVE");
            case Constants.PR_WHITE_SPACE_COLLAPSE:
                return EnumProperty.getInstance(Constants.EN_FALSE, "FALSE");
            case Constants.PR_WRAP_OPTION:
                return EnumProperty.getInstance(Constants.EN_NO_WRAP, "NO_WRAP");
            default:
                //nop
            }
        case Constants.EN_NO_WRAP:
            if (propId == Constants.PR_WRAP_OPTION) {
                return EnumProperty.getInstance(Constants.EN_NO_WRAP, "NO_WRAP");
            }
        case Constants.EN_NORMAL:
        default:

Lines 265-271 Link Here

(-)src/java/org/apache/fop/fo/FOPropertyMapping.java (-1 / +1 lines)
265	enums = new Property[ENUM_COUNT + 1];	265	enums = new Property[ENUM_COUNT + 1];
266	}	266	}
267	if (enums[enumValue] == null) {	267	if (enums[enumValue] == null) {
268	enums[enumValue] = new EnumProperty(enumValue, text);	268	enums[enumValue] = EnumProperty.getInstance(enumValue, text);
269	}	269	}
270	return enums[enumValue];	270	return enums[enumValue];
271	}	271	}




public class BasicLink extends Inline {
    // The value of properties relevant for fo:basic-link.
    // private ToBeImplementedProperty destinationPlacementOffset;
    private int dominantBaseline;
    private String externalDestination;
    // private ToBeImplementedProperty indicateDestination;
    private String internalDestination;

    // private ToBeImplementedProperty targetProcessingContext;
    // private ToBeImplementedProperty targetPresentationContext;
    // private ToBeImplementedProperty targetStylesheet;
    // Unused but valid items, commented out for performance:
    //     private int dominantBaseline;
    // End of property values

    // used only for FO validation

    public void bind(PropertyList pList) throws FOPException {
        super.bind(pList);
        // destinationPlacementOffset = pList.get(PR_DESTINATION_PLACEMENT_OFFSET);
        dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum();
        externalDestination = pList.get(PR_EXTERNAL_DESTINATION).getString();
        // indicateDestination = pList.get(PR_INDICATE_DESTINATION);
        internalDestination = pList.get(PR_INTERNAL_DESTINATION).getString();




 */
public abstract class AbstractListItemPart extends FObj {
    // The value of properties relevant for fo:list-item-label and fo:list-item-body.
    private CommonAccessibility commonAccessibility;
    private String id;
    private KeepProperty keepTogether;
    // Valid properties, commented out for performance:
    //   private CommonAccessibility commonAccessibility;
    // End of property values

    /** used for FO validation */

     * @see org.apache.fop.fo.FObj#bind(PropertyList)
     */
    public void bind(PropertyList pList) throws FOPException {
        commonAccessibility = pList.getAccessibilityProps();
        id = pList.get(PR_ID).getString();
        keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();
    }

Lines 42-48 Link Here

(-)src/java/org/apache/fop/fo/flow/TableColumn.java (-3 / +3 lines)
42	private Length columnWidth;	42	private Length columnWidth;
43	private int numberColumnsRepeated;	43	private int numberColumnsRepeated;
44	private int numberColumnsSpanned;	44	private int numberColumnsSpanned;
45	private int visibility;	45	// Unused but valid items, commented out for performance:
		46	// private int visibility;
46	// End of property values	47	// End of property values
47		48
48	private boolean defaultColumn;	49	private boolean defaultColumn;
Lines 76-82 Link Here
76	.getNumeric().getValue();	77	.getNumeric().getValue();
77	numberColumnsSpanned = pList.get(PR_NUMBER_COLUMNS_SPANNED)	78	numberColumnsSpanned = pList.get(PR_NUMBER_COLUMNS_SPANNED)
78	.getNumeric().getValue();	79	.getNumeric().getValue();
79	visibility = pList.get(PR_VISIBILITY).getEnum();
80	super.bind(pList);	80	super.bind(pList);
81		81
82	if (numberColumnsRepeated <= 0) {	82	if (numberColumnsRepeated <= 0) {
Lines 238-241 Link Here
238	protected void releasePropertyList() {	238	protected void releasePropertyList() {
239	this.pList = null;	239	this.pList = null;
240	}	240	}
241	}	241	}




    // used for FO validation
    private boolean blockOrInlineItemFound = false;
    private boolean canHaveBlockLevelChildren = true;

    // The value of properties relevant for fo:bidi-override.
    private CommonAural commonAural;
    private CommonFont commonFont;
    private CommonRelativePosition commonRelativePosition;
    private Color prColor;
    // private ToBeImplementedProperty prDirection;
    // private ToBeImplementedProperty prLetterSpacing;
    private SpaceProperty lineHeight;
    // private ToBeImplementedProperty prScoreSpaces;
    // private ToBeImplementedProperty prUnicodeBidi;

    // Unused but valid items, commented out for performance:
    //     private CommonAural commonAural;
    //     private CommonFont commonFont;
    //     private CommonRelativePosition commonRelativePosition;
    //     private Color prColor;
    //     private SpaceProperty prWordSpacing;
    // End of property values

    /**

     * @see org.apache.fop.fo.FObj#bind(PropertyList)
     */
    public void bind(PropertyList pList) throws FOPException {
        commonAural = pList.getAuralProps();
        commonFont = pList.getFontProps();
        commonRelativePosition = pList.getRelativePositionProps();
        prColor = pList.get(PR_COLOR).getColor(getUserAgent());
        // prDirection = pList.get(PR_DIRECTION);
        // prLetterSpacing = pList.get(PR_LETTER_SPACING);
        lineHeight = pList.get(PR_LINE_HEIGHT).getSpace();
        // prScoreSpaces = pList.get(PR_SCORE_SPACES);
        // prUnicodeBidi = pList.get(PR_UNICODE_BIDI);
        prWordSpacing = pList.get(PR_WORD_SPACING).getSpace();
    }

    /**




 */
public class MultiProperties extends FObj {
    // The value of properties relevant for fo:multi-properties.
    private CommonAccessibility commonAccessibility;
    private String id;
    // Unused but valid items, commented out for performance:
    //     private CommonAccessibility commonAccessibility;
    // End of property values

    static boolean notImplementedWarningGiven = false;

     * @see org.apache.fop.fo.FObj#bind(PropertyList)
     */
    public void bind(PropertyList pList) throws FOPException {
        commonAccessibility = pList.getAccessibilityProps();
        id = pList.get(PR_ID).getString();
    }


Lines 33-40 Link Here

(-)src/java/org/apache/fop/fo/flow/FootnoteBody.java (-3 / +2 lines)
33	* Class modelling the fo:footnote-body object.	33	* Class modelling the fo:footnote-body object.
34	*/	34	*/
35	public class FootnoteBody extends FObj {	35	public class FootnoteBody extends FObj {
36	// The value of properties relevant for fo:footnote-body.	36	// The value of properties relevant for fo:footnote-body (commented out for perforance).
37	private CommonAccessibility commonAccessibility;	37	// private CommonAccessibility commonAccessibility;
38	// End of property values	38	// End of property values
39		39
40	/**	40	/**
Lines 48-54 Link Here
48	* @see org.apache.fop.fo.FObj#bind(PropertyList)	48	* @see org.apache.fop.fo.FObj#bind(PropertyList)
49	*/	49	*/
50	public void bind(PropertyList pList) throws FOPException {	50	public void bind(PropertyList pList) throws FOPException {
51	commonAccessibility = pList.getAccessibilityProps();
52	}	51	}
53		52
54	/**	53	/**




    
    // The value of properties relevant for fo:instream-foreign-object
    // and external-graphics.
    private CommonAccessibility commonAccessibility;
    private CommonAural commonAural;
    private CommonBorderPaddingBackground commonBorderPaddingBackground;
    private CommonMarginInline commonMarginInline;
    private CommonRelativePosition commonRelativePosition;
    private Length alignmentAdjust;
    private int alignmentBaseline;
    private Length baselineShift;
    private LengthRangeProperty blockProgressionDimension;
    // private ToBeImplementedProperty clip;
    private Length contentHeight;
    private String contentType;
    private Length contentWidth;
    private int displayAlign;
    private int dominantBaseline;
    private Length height;
    private String id;
    private LengthRangeProperty inlineProgressionDimension;
    private KeepProperty keepWithNext;
    private KeepProperty keepWithPrevious;
    private SpaceProperty lineHeight;
    private int overflow;
    private int scaling;
    private int scalingMethod;
    private int textAlign;
    private Length width;
    // Unused but valid items, commented out for performance:
    //     private CommonAccessibility commonAccessibility;
    //     private CommonAural commonAural;
    //     private CommonMarginInline commonMarginInline;
    //     private CommonRelativePosition commonRelativePosition;
    //     private String contentType;
    //     private KeepProperty keepWithNext;
    //     private KeepProperty keepWithPrevious;
    //     private int scalingMethod;
    // End of property values



    /**
     * constructs an instream-foreign-object object (called by Maker).
     *

     * @see org.apache.fop.fo.FObj#bind(PropertyList)
     */
    public void bind(PropertyList pList) throws FOPException {
        commonAccessibility = pList.getAccessibilityProps();
        commonAural = pList.getAuralProps();
        commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
        commonMarginInline = pList.getMarginInlineProps();
        commonRelativePosition = pList.getRelativePositionProps();
        alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST).getLength();
        alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE).getEnum();
        baselineShift = pList.get(PR_BASELINE_SHIFT).getLength();
        blockProgressionDimension = pList.get(PR_BLOCK_PROGRESSION_DIMENSION).getLengthRange();
        // clip = pList.get(PR_CLIP);
        contentHeight = pList.get(PR_CONTENT_HEIGHT).getLength();
        contentType = pList.get(PR_CONTENT_TYPE).getString();
        contentWidth = pList.get(PR_CONTENT_WIDTH).getLength();
        displayAlign = pList.get(PR_DISPLAY_ALIGN).getEnum();
        dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum();
        height = pList.get(PR_HEIGHT).getLength();
        id = pList.get(PR_ID).getString();
        inlineProgressionDimension = pList.get(PR_INLINE_PROGRESSION_DIMENSION).getLengthRange();
        keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
        keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();
        lineHeight = pList.get(PR_LINE_HEIGHT).getSpace();
        overflow = pList.get(PR_OVERFLOW).getEnum();
        scaling = pList.get(PR_SCALING).getEnum();
        scalingMethod = pList.get(PR_SCALING_METHOD).getEnum();
        textAlign = pList.get(PR_TEXT_ALIGN).getEnum();
        width = pList.get(PR_WIDTH).getLength();
    }




 */
public class PageNumber extends FObj {
    // The value of properties relevant for fo:page-number.
    private CommonAccessibility commonAccessibility;
    private CommonAural commonAural;
    private CommonBorderPaddingBackground commonBorderPaddingBackground;
    private CommonFont commonFont;
    private CommonMarginInline commonMarginInline;
    private CommonRelativePosition commonRelativePosition;
    private Length alignmentAdjust;
    private int alignmentBaseline;
    private Length baselineShift;
    private int dominantBaseline;
    private String id;
    private KeepProperty keepWithNext;
    private KeepProperty keepWithPrevious;
    // private ToBeImplementedProperty letterSpacing;
    private SpaceProperty lineHeight;
    private int scoreSpaces;
    private Length textAltitude;
    /** Holds the text decoration values. May be null */
    private CommonTextDecoration textDecoration;
    private Length textDepth;
    // private ToBeImplementedProperty textShadow;
    // Unused but valid items, commented out for performance:
    //     private CommonAccessibility commonAccessibility;
    //     private CommonAural commonAural;
    //     private CommonMarginInline commonMarginInline;
    //     private CommonRelativePosition commonRelativePosition;
    //     private KeepProperty keepWithNext;
    //     private KeepProperty keepWithPrevious;
    //     private int scoreSpaces;
    //     private Length textAltitude;
    //     private Length textDepth;
    //     private int textTransform;
    //     private int visibility;
    //     private SpaceProperty wordSpacing;
    //     private int wrapOption;
    //  End of property values

    // Properties which are not explicitely listed but are still applicable 

     * @see org.apache.fop.fo.FObj#bind(PropertyList)
     */
    public void bind(PropertyList pList) throws FOPException {
        commonAccessibility = pList.getAccessibilityProps();
        commonAural = pList.getAuralProps();
        commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
        commonFont = pList.getFontProps();
        commonMarginInline = pList.getMarginInlineProps();
        commonRelativePosition = pList.getRelativePositionProps();
        alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST).getLength();
        alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE).getEnum();
        baselineShift = pList.get(PR_BASELINE_SHIFT).getLength();
        dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum();
        id = pList.get(PR_ID).getString();
        keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
        keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();
        // letterSpacing = pList.get(PR_LETTER_SPACING);
        lineHeight = pList.get(PR_LINE_HEIGHT).getSpace();
        scoreSpaces = pList.get(PR_SCORE_SPACES).getEnum();
        textAltitude = pList.get(PR_TEXT_ALTITUDE).getLength();
        textDecoration = pList.getTextDecorationProps();
        textDepth = pList.get(PR_TEXT_DEPTH).getLength();
        // textShadow = pList.get(PR_TEXT_SHADOW);
        textTransform = pList.get(PR_TEXT_TRANSFORM).getEnum();
        visibility = pList.get(PR_VISIBILITY).getEnum();
        wordSpacing = pList.get(PR_WORD_SPACING).getSpace();
        wrapOption = pList.get(PR_WRAP_OPTION).getEnum();

        // implicit properties
        color = pList.get(Constants.PR_COLOR).getColor(getUserAgent());




 */
public class MultiCase extends FObj {
    // The value of properties relevant for fo:multi-case.
    private CommonAccessibility commonAccessibility;
    private String id;
    private int startingState;
    // private ToBeImplementedProperty caseName;
    // private ToBeImplementedProperty caseTitle;
    // Unused but valid items, commented out for performance:
    //     private CommonAccessibility commonAccessibility;
    // End of property values

    static boolean notImplementedWarningGiven = false;

     * @see org.apache.fop.fo.FObj#bind(PropertyList)
     */
    public void bind(PropertyList pList) throws FOPException {
        commonAccessibility = pList.getAccessibilityProps();
        id = pList.get(PR_ID).getString();
        startingState = pList.get(PR_STARTING_STATE).getEnum();
        // caseName = pList.get(PR_CASE_NAME);




public class Table extends TableFObj {
    
    /** properties */
    private CommonAccessibility commonAccessibility;
    private CommonAural commonAural;
    private CommonBorderPaddingBackground commonBorderPaddingBackground;
    private CommonMarginBlock commonMarginBlock;
    private CommonRelativePosition commonRelativePosition;
    private LengthRangeProperty blockProgressionDimension;
    private int borderCollapse;
    private LengthPairProperty borderSeparation;

    private int breakBefore;
    private String id;
    private LengthRangeProperty inlineProgressionDimension;
    private int intrusionDisplace;
    private KeepProperty keepTogether;
    private KeepProperty keepWithNext;
    private KeepProperty keepWithPrevious;
    private int tableLayout;
    private int tableOmitFooterAtBreak;
    private int tableOmitHeaderAtBreak;
    // Unused but valid items, commented out for performance:
    //     private CommonAccessibility commonAccessibility;
    //     private CommonAural commonAural;
    //     private CommonRelativePosition commonRelativePosition;
    //     private int intrusionDisplace;
    //     private int writingMode;
    
    /** extension properties */
    private Length widowContentLimit;

     * @see org.apache.fop.fo.FObj#bind(PropertyList)
     */
    public void bind(PropertyList pList) throws FOPException {
        commonAccessibility = pList.getAccessibilityProps();
        commonAural = pList.getAuralProps();
        commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
        commonMarginBlock = pList.getMarginBlockProps();
        commonRelativePosition = pList.getRelativePositionProps();
        blockProgressionDimension = pList.get(PR_BLOCK_PROGRESSION_DIMENSION).getLengthRange();
        borderCollapse = pList.get(PR_BORDER_COLLAPSE).getEnum();
        borderSeparation = pList.get(PR_BORDER_SEPARATION).getLengthPair();

        breakBefore = pList.get(PR_BREAK_BEFORE).getEnum();
        id = pList.get(PR_ID).getString();
        inlineProgressionDimension = pList.get(PR_INLINE_PROGRESSION_DIMENSION).getLengthRange();
        intrusionDisplace = pList.get(PR_INTRUSION_DISPLACE).getEnum();
        keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();
        keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
        keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();
        tableLayout = pList.get(PR_TABLE_LAYOUT).getEnum();
        tableOmitFooterAtBreak = pList.get(PR_TABLE_OMIT_FOOTER_AT_BREAK).getEnum();
        tableOmitHeaderAtBreak = pList.get(PR_TABLE_OMIT_HEADER_AT_BREAK).getEnum();
        writingMode = pList.get(PR_WRITING_MODE).getEnum();
        super.bind(pList);

        //Bind extension properties

Lines 147-153 Link Here

(-)src/java/org/apache/fop/fo/flow/TableFObj.java (-1 lines)
147	if (getNameId() == FO_TABLE_ROW) {	147	if (getNameId() == FO_TABLE_ROW) {
148		148
149	TableRow row = (TableRow) this;	149	TableRow row = (TableRow) this;
150	TableBody body = (TableBody) parent;
151		150
152	for (i = colSpan; --i >= 0;) {	151	for (i = colSpan; --i >= 0;) {
153	row.pendingSpans.add(null);	152	row.pendingSpans.add(null);

Lines 34-41 Link Here

(-)src/java/org/apache/fop/fo/flow/MultiToggle.java (-3 / +2 lines)
34	* Class modelling the fo:multi-toggle property.	34	* Class modelling the fo:multi-toggle property.
35	*/	35	*/
36	public class MultiToggle extends FObj {	36	public class MultiToggle extends FObj {
37	// The value of properties relevant for fo:multi-toggle.	37	// The value of properties relevant for fo:multi-toggle (commented out for performance).
38	private CommonAccessibility commonAccessibility;	38	// private CommonAccessibility commonAccessibility;
39	// public ToBeImplementedProperty prSwitchTo;	39	// public ToBeImplementedProperty prSwitchTo;
40	// End of property values	40	// End of property values
41		41
Lines 57-63 Link Here
57	* @see org.apache.fop.fo.FObj#bind(PropertyList)	57	* @see org.apache.fop.fo.FObj#bind(PropertyList)
58	*/	58	*/
59	public void bind(PropertyList pList) throws FOPException {	59	public void bind(PropertyList pList) throws FOPException {
60	commonAccessibility = pList.getAccessibilityProps();
61	// prSwitchTo = pList.get(PR_SWITCH_TO);	60	// prSwitchTo = pList.get(PR_SWITCH_TO);
62		61
63	}	62	}




 */
public class TableBody extends TableFObj {
    // The value of properties relevant for fo:table-body.
    private CommonAccessibility commonAccessibility;
    private CommonAural commonAural;
    private CommonBorderPaddingBackground commonBorderPaddingBackground;
    // Unused but valid items, commented out for performance:
    //     private CommonAccessibility commonAccessibility;
    //     private CommonAural commonAural;
    //     private CommonRelativePosition commonRelativePosition;
    //    private int visibility;
    // End of property values
    
    private PropertyList savedPropertyList;

     * @see FObj#bind(PropertyList)
     */
    public void bind(PropertyList pList) throws FOPException {
        commonAccessibility = pList.getAccessibilityProps();
        commonAural = pList.getAuralProps();
        commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
        commonRelativePosition = pList.getRelativePositionProps();
        visibility = pList.get(PR_VISIBILITY).getEnum();
        super.bind(pList);
        //Used by convertCellsToRows()
        savedPropertyList = pList;

     * @throws FOPException if there's a problem binding the TableRow's 
     *         properties.
     */
    // TODO: This is currently unused. Why is it here?
    private void convertCellsToRows() throws FOPException {
        //getLogger().debug("Converting cells to rows...");
        List cells = new java.util.ArrayList(childNodes);




public class TableCaption extends FObj {
    // The value of properties relevant for fo:table-caption.
    private CommonAccessibility commonAccessibility;
    private CommonAural commonAural;
    private CommonBorderPaddingBackground commonBorderPaddingBackground;
    private CommonRelativePosition commonRelativePosition;
    private LengthRangeProperty blockProgressionDimension;
    private Length height;
    private String id;
    // Unused but valid items, commented out for performance:
    //     private CommonAural commonAural;
    //     private CommonRelativePosition commonRelativePosition;
    //     private LengthRangeProperty blockProgressionDimension;
    //     private Length height;
    //     private LengthRangeProperty inlineProgressionDimension;
    //     private int intrusionDisplace;
    //     private KeepProperty keepTogether;
    //     private Length width;
    // End of property values

    /** used for FO validation */

     */
    public void bind(PropertyList pList) throws FOPException {
        commonAccessibility = pList.getAccessibilityProps();
        commonAural = pList.getAuralProps();
        commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
        commonRelativePosition = pList.getRelativePositionProps();
        blockProgressionDimension = pList.get(PR_BLOCK_PROGRESSION_DIMENSION).getLengthRange();
        height = pList.get(PR_HEIGHT).getLength();
        id = pList.get(PR_ID).getString();
        inlineProgressionDimension = pList.get(PR_INLINE_PROGRESSION_DIMENSION).getLengthRange();
        intrusionDisplace = pList.get(PR_INTRUSION_DISPLACE).getEnum();
        keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();
        width = pList.get(PR_WIDTH).getLength();
    }

    /**




 * fo:float element.
 */
public class Float extends FObj {
    // The value of properties relevant for fo:float (commented out for performance.
    //     private int float_;
    //     private int clear;
    // End of property values

    static boolean notImplementedWarningGiven = false;

     * @see org.apache.fop.fo.FObj#bind(PropertyList)
     */
    public void bind(PropertyList pList) throws FOPException {
        // No active properties -> Nothing to do.
        clear = pList.get(PR_CLEAR).getEnum();
    }

    /**




 */
public class InitialPropertySet extends FObj {
    // The value of properties relevant for fo:initial-property-set.
    private CommonAccessibility commonAccessibility;
    private CommonAural commonAural;
    private CommonBorderPaddingBackground commonBorderPaddingBackground;
    private CommonFont commonFont;
    private CommonRelativePosition commonRelativePosition;
    private Color color;
    private String id;
    // private ToBeImplementedProperty letterSpacing;
    private SpaceProperty lineHeight;
    private int scoreSpaces;
    private int textDecoration;
    // private ToBeImplementedProperty textShadow;
    // Unused but valid items, commented out for performance:
    //     private CommonAccessibility commonAccessibility;
    //     private CommonAural commonAural;
    //     private CommonBorderPaddingBackground commonBorderPaddingBackground;
    //     private CommonFont commonFont;
    //     private CommonRelativePosition commonRelativePosition;
    //     private Color color;
    //     private int scoreSpaces;
    //     private int textDecoration;
    //     private int textTransform;
    //     private SpaceProperty wordSpacing;
    // End of property values

    /**

     * @see org.apache.fop.fo.FObj#bind(PropertyList)
     */
    public void bind(PropertyList pList) throws FOPException {
        commonAccessibility = pList.getAccessibilityProps();
        commonAural = pList.getAuralProps();
        commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
        commonFont = pList.getFontProps();
        commonRelativePosition = pList.getRelativePositionProps();
        color = pList.get(PR_COLOR).getColor(getUserAgent());
        id = pList.get(PR_ID).getString();
        // letterSpacing = pList.get(PR_LETTER_SPACING);
        lineHeight = pList.get(PR_LINE_HEIGHT).getSpace();
        scoreSpaces = pList.get(PR_SCORE_SPACES).getEnum();
        textDecoration = pList.get(PR_TEXT_DECORATION).getEnum();
        // textShadow = pList.get(PR_TEXT_SHADOW);
        textTransform = pList.get(PR_TEXT_TRANSFORM).getEnum();
        wordSpacing = pList.get(PR_WORD_SPACING).getSpace();
    }

    /**




 */
public class MultiSwitch extends FObj {
    // The value of properties relevant for fo:multi-switch.
    private CommonAccessibility commonAccessibility;
    // private ToBeImplementedProperty autoRestore;
    private String id;
    // Unused but valid items, commented out for performance:
    //     private CommonAccessibility commonAccessibility;
    // End of property values

    static boolean notImplementedWarningGiven = false;

     * @see org.apache.fop.fo.FObj#bind(PropertyList)
     */
    public void bind(PropertyList pList) throws FOPException {
        commonAccessibility = pList.getAccessibilityProps();
        // autoRestore = pList.get(PR_AUTO_RESTORE);
        id = pList.get(PR_ID).getString();
    }




public class Inline extends InlineLevel {
    // The value of properties relevant for fo:inline.
    // See also superclass InlineLevel
    private CommonRelativePosition commonRelativePosition;
    private Length alignmentAdjust;
    private int alignmentBaseline;
    private Length baselineShift;
    private LengthRangeProperty blockProgressionDimension;
    private int dominantBaseline;
    private Length height;
    private String id;
    // Unused but valid items, commented out for performance:
    //     private CommonRelativePosition commonRelativePosition;
    //     private LengthRangeProperty blockProgressionDimension;
    //     private Length height;
    //     private LengthRangeProperty inlineProgressionDimension;
    //     private KeepProperty keepTogether;
    //     private KeepProperty keepWithNext;
    //     private KeepProperty keepWithPrevious;
    //     private Length width;
    //     private int wrapOption;
    // End of property values

    // used for FO validation
    private boolean blockOrInlineItemFound = false;
    private boolean canHaveBlockLevelChildren = true;

     */
    public void bind(PropertyList pList) throws FOPException {
        super.bind(pList);
        commonRelativePosition = pList.getRelativePositionProps();
        alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST).getLength();
        alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE).getEnum();
        baselineShift = pList.get(PR_BASELINE_SHIFT).getLength();
        blockProgressionDimension = pList.get(PR_BLOCK_PROGRESSION_DIMENSION).getLengthRange();
        dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum();
        height = pList.get(PR_HEIGHT).getLength();
        id = pList.get(PR_ID).getString();
        inlineProgressionDimension = pList.get(PR_INLINE_PROGRESSION_DIMENSION).getLengthRange();
        keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();
        keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
        keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();
        width = pList.get(PR_WIDTH).getLength();
        wrapOption = pList.get(PR_WRAP_OPTION).getEnum();
    }

    /**

Lines 42-52 Link Here

(-)src/java/org/apache/fop/fo/flow/TableRow.java (-8 / +5 lines)
42	*/	42	*/
43	public class TableRow extends TableFObj {	43	public class TableRow extends TableFObj {
44	// The value of properties relevant for fo:table-row.	44	// The value of properties relevant for fo:table-row.
45	private CommonAccessibility commonAccessibility;
46	private LengthRangeProperty blockProgressionDimension;	45	private LengthRangeProperty blockProgressionDimension;
47	private CommonAural commonAural;
48	private CommonBorderPaddingBackground commonBorderPaddingBackground;	46	private CommonBorderPaddingBackground commonBorderPaddingBackground;
49	private CommonRelativePosition commonRelativePosition;
50	private int breakAfter;	47	private int breakAfter;
51	private int breakBefore;	48	private int breakBefore;
52	private Length height;	49	private Length height;
Lines 54-60 Link Here
54	private KeepProperty keepTogether;	51	private KeepProperty keepTogether;
55	private KeepProperty keepWithNext;	52	private KeepProperty keepWithNext;
56	private KeepProperty keepWithPrevious;	53	private KeepProperty keepWithPrevious;
57	private int visibility;	54	// Unused but valid items, commented out for performance:
		55	// private CommonAccessibility commonAccessibility;
		56	// private CommonAural commonAural;
		57	// private CommonRelativePosition commonRelativePosition;
		58	// private int visibility;
58	// End of property values	59	// End of property values
59		60
60	private boolean setup = false;	61	private boolean setup = false;
Lines 74-85 Link Here
74	* @see org.apache.fop.fo.FObj#bind(PropertyList)	75	* @see org.apache.fop.fo.FObj#bind(PropertyList)
75	*/	76	*/
76	public void bind(PropertyList pList) throws FOPException {	77	public void bind(PropertyList pList) throws FOPException {
77	commonAccessibility = pList.getAccessibilityProps();
78	blockProgressionDimension	78	blockProgressionDimension
79	= pList.get(PR_BLOCK_PROGRESSION_DIMENSION).getLengthRange();	79	= pList.get(PR_BLOCK_PROGRESSION_DIMENSION).getLengthRange();
80	commonAural = pList.getAuralProps();
81	commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();	80	commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
82	commonRelativePosition = pList.getRelativePositionProps();
83	breakAfter = pList.get(PR_BREAK_AFTER).getEnum();	81	breakAfter = pList.get(PR_BREAK_AFTER).getEnum();
84	breakBefore = pList.get(PR_BREAK_BEFORE).getEnum();	82	breakBefore = pList.get(PR_BREAK_BEFORE).getEnum();
85	id = pList.get(PR_ID).getString();	83	id = pList.get(PR_ID).getString();
Lines 87-93 Link Here
87	keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();	85	keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();
88	keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();	86	keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
89	keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();	87	keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();
90	visibility = pList.get(PR_VISIBILITY).getEnum();
91	super.bind(pList);	88	super.bind(pList);
92	}	89	}
93		90




 */
public class PageNumberCitation extends FObj {
    // The value of properties relevant for fo:page-number-citation.
    private CommonAccessibility commonAccessibility;
    private CommonAural commonAural;
    private CommonBorderPaddingBackground commonBorderPaddingBackground;
    private CommonFont commonFont;
    private CommonMarginInline commonMarginInline;
    private CommonRelativePosition commonRelativePosition;
    private Length alignmentAdjust;
    private int alignmentBaseline;
    private Length baselineShift;
    private int dominantBaseline;
    private String id;
    private KeepProperty keepWithNext;
    private KeepProperty keepWithPrevious;
    // private ToBeImplementedProperty letterSpacing;
    private SpaceProperty lineHeight;
    private String refId;
    private int scoreSpaces;
    private Length textAltitude;
    /** Holds the text decoration values. May be null */
    private CommonTextDecoration textDecoration;
    private Length textDepth;
    // private ToBeImplementedProperty textShadow;
    // Unused but valid items, commented out for performance:
    //     private CommonAccessibility commonAccessibility;
    //     private CommonAural commonAural;
    //     private CommonMarginInline commonMarginInline;
    //     private CommonRelativePosition commonRelativePosition;
    //     private KeepProperty keepWithNext;
    //     private KeepProperty keepWithPrevious;
    //     private int scoreSpaces;
    //     private Length textAltitude;
    //     private Length textDepth;
    //     private int textTransform;
    //     private int visibility;
    //     private SpaceProperty wordSpacing;
    //     private int wrapOption;
    // End of property values

    // Properties which are not explicitely listed but are still applicable 

     * @see org.apache.fop.fo.FObj#bind(PropertyList)
     */
    public void bind(PropertyList pList) throws FOPException {
        commonAccessibility = pList.getAccessibilityProps();
        commonAural = pList.getAuralProps();
        commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
        commonFont = pList.getFontProps();
        commonMarginInline = pList.getMarginInlineProps();
        commonRelativePosition = pList.getRelativePositionProps();
        alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST).getLength();
        alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE).getEnum();
        baselineShift = pList.get(PR_BASELINE_SHIFT).getLength();
        dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum();
        id = pList.get(PR_ID).getString();
        keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
        keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();
        // letterSpacing = pList.get(PR_LETTER_SPACING);
        lineHeight = pList.get(PR_LINE_HEIGHT).getSpace();
        refId = pList.get(PR_REF_ID).getString();
        scoreSpaces = pList.get(PR_SCORE_SPACES).getEnum();
        textAltitude = pList.get(PR_TEXT_ALTITUDE).getLength();
        textDecoration = pList.getTextDecorationProps();
        textDepth = pList.get(PR_TEXT_DEPTH).getLength();
        // textShadow = pList.get(PR_TEXT_SHADOW);
        textTransform = pList.get(PR_TEXT_TRANSFORM).getEnum();
        visibility = pList.get(PR_VISIBILITY).getEnum();
        wordSpacing = pList.get(PR_WORD_SPACING).getSpace();
        wrapOption = pList.get(PR_WRAP_OPTION).getEnum();
        
        // implicit properties
        color = pList.get(Constants.PR_COLOR).getColor(getUserAgent());




public class InlineContainer extends FObj {
    
    // The value of properties relevant for fo:inline-container.
    private CommonBorderPaddingBackground commonBorderPaddingBackground;
    private CommonMarginInline commonMarginInline;
    private CommonRelativePosition commonRelativePosition;
    private Length alignmentAdjust;
    private int alignmentBaseline;
    private Length baselineShift;
    private LengthRangeProperty blockProgressionDimension;
    // private ToBeImplementedProperty clip;
    private int displayAlign;
    private int dominantBaseline;
    private Length height;
    private String id;
    private LengthRangeProperty inlineProgressionDimension;
    private KeepProperty keepTogether;
    private KeepProperty keepWithNext;
    private KeepProperty keepWithPrevious;
    private SpaceProperty lineHeight;
    // Unused but valid items, commented out for performance:
    //     private CommonBorderPaddingBackground commonBorderPaddingBackground;
    //     private CommonMarginInline commonMarginInline;
    //     private CommonRelativePosition commonRelativePosition;
    //     private LengthRangeProperty blockProgressionDimension;
    //     private int displayAlign;
    //     private Length height;
    //     private LengthRangeProperty inlineProgressionDimension;
    //     private KeepProperty keepTogether;
    //     private KeepProperty keepWithNext;
    //     private KeepProperty keepWithPrevious;
    //     private int overflow;
    //     private Numeric referenceOrientation;
    //     private Length width;
    //     private int writingMode;
    // End of property values

    /** used for FO validation */

     * @see org.apache.fop.fo.FObj#bind(PropertyList)
     */
    public void bind(PropertyList pList) throws FOPException {
        commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
        commonMarginInline = pList.getMarginInlineProps();
        commonRelativePosition = pList.getRelativePositionProps();
        alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST).getLength();
        alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE).getEnum();
        baselineShift = pList.get(PR_BASELINE_SHIFT).getLength();
        blockProgressionDimension = pList.get(PR_BLOCK_PROGRESSION_DIMENSION).getLengthRange();
        // clip = pList.get(PR_CLIP);
        displayAlign = pList.get(PR_DISPLAY_ALIGN).getEnum();
        dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum();
        height = pList.get(PR_HEIGHT).getLength();
        id = pList.get(PR_ID).getString();
        inlineProgressionDimension = pList.get(PR_INLINE_PROGRESSION_DIMENSION).getLengthRange();
        keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();
        keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
        keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();
        lineHeight = pList.get(PR_LINE_HEIGHT).getSpace();
        overflow = pList.get(PR_OVERFLOW).getEnum();
        referenceOrientation = pList.get(PR_REFERENCE_ORIENTATION).getNumeric();
        width = pList.get(PR_WIDTH).getLength();
        writingMode = pList.get(PR_WRITING_MODE).getEnum();
    }

    /**




 */
public class ListBlock extends FObj {
    // The value of properties relevant for fo:list-block.
    private CommonAccessibility commonAccessibility;
    private CommonAural commonAural;
    private CommonBorderPaddingBackground commonBorderPaddingBackground;
    private CommonMarginBlock commonMarginBlock;
    private CommonRelativePosition commonRelativePosition;
    private int breakAfter;
    private int breakBefore;
    private String id;
    private int intrusionDisplace;
    private KeepProperty keepTogether;
    private KeepProperty keepWithNext;
    private KeepProperty keepWithPrevious;
    // Unused but valid items, commented out for performance:
    //     private CommonAccessibility commonAccessibility;
    //     private CommonAural commonAural;
    //     private CommonRelativePosition commonRelativePosition;
    //     private int intrusionDisplace;
    //     private Length provisionalDistanceBetweenStarts;
    //     private Length provisionalLabelSeparation;
    // End of property values

    /** extension properties */

     * @see org.apache.fop.fo.FObj#bind(PropertyList)
     */
    public void bind(PropertyList pList) throws FOPException {
        commonAccessibility = pList.getAccessibilityProps();
        commonAural = pList.getAuralProps();
        commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
        commonMarginBlock = pList.getMarginBlockProps();
        commonRelativePosition = pList.getRelativePositionProps();
        breakAfter = pList.get(PR_BREAK_AFTER).getEnum();
        breakBefore = pList.get(PR_BREAK_BEFORE).getEnum();
        id = pList.get(PR_ID).getString();
        intrusionDisplace = pList.get(PR_INTRUSION_DISPLACE).getEnum();
        keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();
        keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
        keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();
        provisionalDistanceBetweenStarts = pList.get(
                PR_PROVISIONAL_DISTANCE_BETWEEN_STARTS).getLength();
        provisionalLabelSeparation = pList.get(
                PR_PROVISIONAL_LABEL_SEPARATION).getLength();

        //Bind extension properties
        widowContentLimit = pList.get(PR_X_WIDOW_CONTENT_LIMIT).getLength();
        orphanContentLimit = pList.get(PR_X_ORPHAN_CONTENT_LIMIT).getLength();




 */
public class TableCell extends TableFObj {
    // The value of properties relevant for fo:table-cell.
    private CommonAccessibility commonAccessibility;
    private CommonAural commonAural;
    private CommonBorderPaddingBackground commonBorderPaddingBackground;
    private CommonRelativePosition commonRelativePosition;
    private LengthRangeProperty blockProgressionDimension;
    private int columnNumber;
    private int displayAlign;
    private int relativeAlign;
    private int emptyCells;
    private int endsRow;
    private Length height;
    private String id;
    private LengthRangeProperty inlineProgressionDimension;
    private int numberColumnsSpanned;
    private int numberRowsSpanned;
    private int startsRow;
    private Length width;
    // Unused but valid items, commented out for performance:
    //     private CommonAccessibility commonAccessibility;
    //     private CommonAural commonAural;
    //     private CommonRelativePosition commonRelativePosition;
    //     private int relativeAlign;
    //     private Length height;
    //     private LengthRangeProperty inlineProgressionDimension;
    //     private KeepProperty keepTogether;
    //     private KeepProperty keepWithNext;
    //     private KeepProperty keepWithPrevious;
    // End of property values
  
    /** used for FO validation */
    private boolean blockItemFound = false;


     * @see org.apache.fop.fo.FObj#bind(PropertyList)
     */
    public void bind(PropertyList pList) throws FOPException {
        commonAccessibility = pList.getAccessibilityProps();
        commonAural = pList.getAuralProps();
        commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
        commonRelativePosition = pList.getRelativePositionProps();
        blockProgressionDimension = pList.get(PR_BLOCK_PROGRESSION_DIMENSION).getLengthRange();
        displayAlign = pList.get(PR_DISPLAY_ALIGN).getEnum();
        relativeAlign = pList.get(PR_RELATIVE_ALIGN).getEnum();
        emptyCells = pList.get(PR_EMPTY_CELLS).getEnum();
        endsRow = pList.get(PR_ENDS_ROW).getEnum();
        height = pList.get(PR_HEIGHT).getLength();
        id = pList.get(PR_ID).getString();
        inlineProgressionDimension = pList.get(PR_INLINE_PROGRESSION_DIMENSION).getLengthRange();
        columnNumber = pList.get(PR_COLUMN_NUMBER).getNumeric().getValue();
        numberColumnsSpanned = pList.get(PR_NUMBER_COLUMNS_SPANNED).getNumeric().getValue();
        numberRowsSpanned = pList.get(PR_NUMBER_ROWS_SPANNED).getNumeric().getValue();
        startsRow = pList.get(PR_STARTS_ROW).getEnum();
        width = pList.get(PR_WIDTH).getLength();
        keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();
        keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
        keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();
        
        super.bind(pList);
    }




 */
public class TableAndCaption extends FObj {
    // The value of properties relevant for fo:table-and-caption.
    private CommonAccessibility commonAccessibility;
    private CommonAural commonAural;
    private CommonBorderPaddingBackground commonBorderPaddingBackground;
    private CommonMarginBlock commonMarginBlock;
    private CommonRelativePosition commonRelativePosition;
    private int breakAfter;
    private int breakBefore;
    private int captionSide;
    private String id;
    // Unused but valid items, commented out for performance:
    //     private CommonAccessibility commonAccessibility;
    //     private CommonAural commonAural;
    //     private CommonBorderPaddingBackground commonBorderPaddingBackground;
    //     private CommonMarginBlock commonMarginBlock;
    //     private CommonRelativePosition commonRelativePosition;
    //     private int breakAfter;
    //     private int breakBefore;
    //     private int captionSide;
    //     private int intrusionDisplace;
    //     private KeepProperty keepTogether;
    //     private KeepProperty keepWithNext;
    //     private KeepProperty keepWithPrevious;
    //     private int textAlign;
    // End of property values
    
    static boolean notImplementedWarningGiven = false;

     * @see org.apache.fop.fo.FObj#bind(PropertyList)
     */
    public void bind(PropertyList pList) throws FOPException {
        commonAccessibility = pList.getAccessibilityProps();
        commonAural = pList.getAuralProps();
        commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
        commonMarginBlock = pList.getMarginBlockProps();
        commonRelativePosition = pList.getRelativePositionProps();
        breakAfter = pList.get(PR_BREAK_AFTER).getEnum();
        breakBefore = pList.get(PR_BREAK_BEFORE).getEnum();
        captionSide = pList.get(PR_CAPTION_SIDE).getEnum();
        id = pList.get(PR_ID).getString();
        intrusionDisplace = pList.get(PR_INTRUSION_DISPLACE).getEnum();
        keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();
        keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
        keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();
        textAlign = pList.get(PR_TEXT_ALIGN).getEnum();
    }

    /**




 */
public class ListItem extends FObj {
    // The value of properties relevant for fo:list-item.
    private CommonAccessibility commonAccessibility;
    private CommonAural commonAural;
    private CommonBorderPaddingBackground commonBorderPaddingBackground;
    private CommonMarginBlock commonMarginBlock;
    private CommonRelativePosition commonRelativePosition;
    private int breakAfter;
    private int breakBefore;
    private String id;
    private int intrusionDisplace;
    private KeepProperty keepTogether;
    private KeepProperty keepWithNext;
    private KeepProperty keepWithPrevious;
    // Unused but valid items, commented out for performance:
    //     private CommonAccessibility commonAccessibility;
    //     private CommonAural commonAural;
    //     private CommonRelativePosition commonRelativePosition;
    //     private int intrusionDisplace;
    //     private int relativeAlign;
    // End of property values

    private ListItemLabel label = null;

     * @see org.apache.fop.fo.FObj#bind(PropertyList)
     */
    public void bind(PropertyList pList) throws FOPException {
        commonAccessibility = pList.getAccessibilityProps();
        commonAural = pList.getAuralProps();
        commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
        commonMarginBlock = pList.getMarginBlockProps();
        commonRelativePosition = pList.getRelativePositionProps();
        breakAfter = pList.get(PR_BREAK_AFTER).getEnum();
        breakBefore = pList.get(PR_BREAK_BEFORE).getEnum();
        id = pList.get(PR_ID).getString();
        intrusionDisplace = pList.get(PR_INTRUSION_DISPLACE).getEnum();
        keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();
        keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
        keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();
        relativeAlign = pList.get(PR_RELATIVE_ALIGN).getEnum();
    }

    /**

Lines 62-69 Link Here

(-)src/java/org/apache/fop/fo/flow/Block.java (-6 / +4 lines)
62	private int breakAfter;	62	private int breakAfter;
63	private int breakBefore;	63	private int breakBefore;
64	private Color color;	64	private Color color;
65	private Length textDepth;
66	private Length textAltitude;
67	private int hyphenationKeep;	65	private int hyphenationKeep;
68	private Numeric hyphenationLadderCount;	66	private Numeric hyphenationLadderCount;
69	private String id;	67	private String id;
Lines 82-91 Link Here
82	private int textAlign;	80	private int textAlign;
83	private int textAlignLast;	81	private int textAlignLast;
84	private Length textIndent;	82	private Length textIndent;
85	private int visibility;
86	private int whiteSpaceCollapse;	83	private int whiteSpaceCollapse;
87	private Numeric widows;	84	private Numeric widows;
88	private int wrapOption;	85	private int wrapOption;
		86	// Unused but valid items, commented out for performance:
		87	// private Length textDepth;
		88	// private Length textAltitude;
		89	// private int visibility;
89	// End of property values	90	// End of property values
90		91
91	/**	92	/**
Lines 111-118 Link Here
111	breakAfter = pList.get(PR_BREAK_AFTER).getEnum();	112	breakAfter = pList.get(PR_BREAK_AFTER).getEnum();
112	breakBefore = pList.get(PR_BREAK_BEFORE).getEnum();	113	breakBefore = pList.get(PR_BREAK_BEFORE).getEnum();
113	color = pList.get(PR_COLOR).getColor(getUserAgent());	114	color = pList.get(PR_COLOR).getColor(getUserAgent());
114	textDepth = pList.get(PR_TEXT_DEPTH).getLength();
115	textAltitude = pList.get(PR_TEXT_ALTITUDE).getLength();
116	hyphenationKeep = pList.get(PR_HYPHENATION_KEEP).getEnum();	115	hyphenationKeep = pList.get(PR_HYPHENATION_KEEP).getEnum();
117	hyphenationLadderCount = pList.get(PR_HYPHENATION_LADDER_COUNT).getNumeric();	116	hyphenationLadderCount = pList.get(PR_HYPHENATION_LADDER_COUNT).getNumeric();
118	id = pList.get(PR_ID).getString();	117	id = pList.get(PR_ID).getString();
Lines 131-137 Link Here
131	textAlign = pList.get(PR_TEXT_ALIGN).getEnum();	130	textAlign = pList.get(PR_TEXT_ALIGN).getEnum();
132	textAlignLast = pList.get(PR_TEXT_ALIGN_LAST).getEnum();	131	textAlignLast = pList.get(PR_TEXT_ALIGN_LAST).getEnum();
133	textIndent = pList.get(PR_TEXT_INDENT).getLength();	132	textIndent = pList.get(PR_TEXT_INDENT).getLength();
134	visibility = pList.get(PR_VISIBILITY).getEnum();
135	whiteSpaceCollapse = pList.get(PR_WHITE_SPACE_COLLAPSE).getEnum();	133	whiteSpaceCollapse = pList.get(PR_WHITE_SPACE_COLLAPSE).getEnum();
136	widows = pList.get(PR_WIDOWS).getNumeric();	134	widows = pList.get(PR_WIDOWS).getNumeric();
137	wrapOption = pList.get(PR_WRAP_OPTION).getEnum();	135	wrapOption = pList.get(PR_WRAP_OPTION).getEnum();




public class Leader extends InlineLevel {
    // The value of properties relevant for fo:leader.
    // See also superclass InlineLevel
    private CommonRelativePosition commonRelativePosition;
    private Length alignmentAdjust;
    private int alignmentBaseline;
    private Length baselineShift;
    private int dominantBaseline;
    private Length textDepth;
    private Length textAltitude;
    private String id;
    private KeepProperty keepWithNext;
    private KeepProperty keepWithPrevious;
    private int leaderAlignment;
    private LengthRangeProperty leaderLength;
    private int leaderPattern;

    private Length ruleThickness;
    // private ToBeImplementedProperty letterSpacing;
    // private ToBeImplementedProperty textShadow;
    // Unused but valid items, commented out for performance:
    //     private CommonRelativePosition commonRelativePosition;
    //     private Length textDepth;
    //     private Length textAltitude;
    //     private KeepProperty keepWithNext;
    //     private KeepProperty keepWithPrevious;
    //     private SpaceProperty wordSpacing;
    // End of property values

    /**

     */
    public void bind(PropertyList pList) throws FOPException {
        super.bind(pList);
        commonRelativePosition = pList.getRelativePositionProps();
        alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST).getLength();
        alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE).getEnum();
        baselineShift = pList.get(PR_BASELINE_SHIFT).getLength();
        dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum();
        textDepth = pList.get(PR_TEXT_DEPTH).getLength();
        textAltitude = pList.get(PR_TEXT_ALTITUDE).getLength();
        id = pList.get(PR_ID).getString();
        keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
        keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();
        leaderAlignment = pList.get(PR_LEADER_ALIGNMENT).getEnum();
        leaderLength = pList.get(PR_LEADER_LENGTH).getLengthRange();
        leaderPattern = pList.get(PR_LEADER_PATTERN).getEnum();

        }
        // letterSpacing = pList.get(PR_LETTER_SPACING);
        // textShadow = pList.get(PR_TEXT_SHADOW);
        wordSpacing = pList.get(PR_WORD_SPACING).getSpace();
    }

    /**




 */
public class Character extends FObj {
    // The value of properties relevant for fo:character.
    private CommonAural commonAural;
    private CommonBorderPaddingBackground commonBorderPaddingBackground;
    private CommonFont commonFont;
    private CommonHyphenation commonHyphenation;
    private CommonMarginInline commonMarginInline;
    private CommonRelativePosition commonRelativePosition;
    private Length alignmentAdjust;
    private int treatAsWordSpace;
    private int alignmentBaseline;
    private Length baselineShift;
    private char character;
    private Color color;
    private int dominantBaseline;
    private Length textDepth;
    private Length textAltitude;
    // private ToBeImplementedProperty glyphOrientationHorizontal;
    // private ToBeImplementedProperty glyphOrientationVertical;
    private String id;
    private KeepProperty keepWithNext;
    private KeepProperty keepWithPrevious;
    private Property letterSpacing;
    private SpaceProperty lineHeight;
    private int scoreSpaces;
    private int suppressAtLineBreak;
    /** Holds the text decoration values. May be null */
    private CommonTextDecoration textDecoration;
    // private ToBeImplementedProperty textShadow;
    private int textTransform;
    private int visibility;
    private Property wordSpacing;
    // Unused but valid items, commented out for performance:
    //     private CommonAural commonAural;
    //     private CommonMarginInline commonMarginInline;
    //     private CommonRelativePosition commonRelativePosition;
    //     private int treatAsWordSpace;
    //     private Length textDepth;
    //     private Length textAltitude;
    //     private KeepProperty keepWithNext;
    //     private KeepProperty keepWithPrevious;
    //     private int scoreSpaces;
    //     private int suppressAtLineBreak;
    //     private int textTransform;
    //     private int visibility;
    // End of property values

    /** constant indicating that the character is OK */

     * @see org.apache.fop.fo.FObj#bind(PropertyList)
     */
    public void bind(PropertyList pList) throws FOPException {
        commonAural = pList.getAuralProps();
        commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
        commonFont = pList.getFontProps();
        commonHyphenation = pList.getHyphenationProps();
        commonMarginInline = pList.getMarginInlineProps();
        commonRelativePosition = pList.getRelativePositionProps();

        alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST).getLength();
        treatAsWordSpace = pList.get(PR_TREAT_AS_WORD_SPACE).getEnum();
        alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE).getEnum();
        baselineShift = pList.get(PR_BASELINE_SHIFT).getLength();
        character = pList.get(PR_CHARACTER).getCharacter();
        color = pList.get(PR_COLOR).getColor(getUserAgent());
        dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum();
        textDepth = pList.get(PR_TEXT_DEPTH).getLength();
        textAltitude = pList.get(PR_TEXT_ALTITUDE).getLength();
        // glyphOrientationHorizontal = pList.get(PR_GLYPH_ORIENTATION_HORIZONTAL);
        // glyphOrientationVertical = pList.get(PR_GLYPH_ORIENTATION_VERTICAL);
        id = pList.get(PR_ID).getString();
        keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
        keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();
        letterSpacing = pList.get(PR_LETTER_SPACING);
        lineHeight = pList.get(PR_LINE_HEIGHT).getSpace();
        scoreSpaces = pList.get(PR_SCORE_SPACES).getEnum();
        suppressAtLineBreak = pList.get(PR_SUPPRESS_AT_LINE_BREAK).getEnum();
        textDecoration = pList.getTextDecorationProps();
        // textShadow = pList.get(PR_TEXT_SHADOW);
        textTransform = pList.get(PR_TEXT_TRANSFORM).getEnum();
        visibility = pList.get(PR_VISIBILITY).getEnum();
        wordSpacing = pList.get(PR_WORD_SPACING);
    }


Lines 50-56 Link Here

(-)src/java/org/apache/fop/fo/flow/BlockContainer.java (-4 / +3 lines)
50	private Length height;	50	private Length height;
51	private String id;	51	private String id;
52	private LengthRangeProperty inlineProgressionDimension;	52	private LengthRangeProperty inlineProgressionDimension;
53	private int intrusionDisplace;
54	private KeepProperty keepTogether;	53	private KeepProperty keepTogether;
55	private KeepProperty keepWithNext;	54	private KeepProperty keepWithNext;
56	private KeepProperty keepWithPrevious;	55	private KeepProperty keepWithPrevious;
Lines 59-65 Link Here
59	private int span;	58	private int span;
60	private Length width;	59	private Length width;
61	private int writingMode;	60	private int writingMode;
62	private Numeric zIndex;	61	// Unused but valid items, commented out for performance:
		62	// private int intrusionDisplace;
		63	// private Numeric zIndex;
63	// End of property values	64	// End of property values
64		65
65	/** used for FO validation */	66	/** used for FO validation */
Lines 87-93 Link Here
87	height = pList.get(PR_HEIGHT).getLength();	88	height = pList.get(PR_HEIGHT).getLength();
88	id = pList.get(PR_ID).getString();	89	id = pList.get(PR_ID).getString();
89	inlineProgressionDimension = pList.get(PR_INLINE_PROGRESSION_DIMENSION).getLengthRange();	90	inlineProgressionDimension = pList.get(PR_INLINE_PROGRESSION_DIMENSION).getLengthRange();
90	intrusionDisplace = pList.get(PR_INTRUSION_DISPLACE).getEnum();
91	keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();	91	keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();
92	keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();	92	keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
93	keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();	93	keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();
Lines 96-102 Link Here
96	span = pList.get(PR_SPAN).getEnum();	96	span = pList.get(PR_SPAN).getEnum();
97	width = pList.get(PR_WIDTH).getLength();	97	width = pList.get(PR_WIDTH).getLength();
98	writingMode = pList.get(PR_WRITING_MODE).getEnum();	98	writingMode = pList.get(PR_WRITING_MODE).getEnum();
99	zIndex = pList.get(PR_Z_INDEX).getNumeric();
100	}	99	}
101		100
102	/**	101	/**

Lines 32-39 Link Here

(-)src/java/org/apache/fop/fo/flow/Footnote.java (-3 / +3 lines)
32	* Class modelling the fo:footnote object.	32	* Class modelling the fo:footnote object.
33	*/	33	*/
34	public class Footnote extends FObj {	34	public class Footnote extends FObj {
35	// The value of properties relevant for fo:footnote.	35	// The value of properties relevant for fo:footnote (commented out for performance).
36	private CommonAccessibility commonAccessibility;	36	// private CommonAccessibility commonAccessibility;
37	// End of property values	37	// End of property values
38		38
39	private Inline footnoteCitation = null;	39	private Inline footnoteCitation = null;
Lines 50-56 Link Here
50	* @see org.apache.fop.fo.FObj#bind(PropertyList)	50	* @see org.apache.fop.fo.FObj#bind(PropertyList)
51	*/	51	*/
52	public void bind(PropertyList pList) throws FOPException {	52	public void bind(PropertyList pList) throws FOPException {
53	commonAccessibility = pList.getAccessibilityProps();	53	// No active properties -> do nothing.
54	}	54	}
55		55
56	/**	56	/**

Lines 102-108 Link Here

(-)src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java (-1 lines)
102	* @throws PropertyException when an exception occur during evaluation.	102	* @throws PropertyException when an exception occur during evaluation.
103	*/	103	*/
104	private Numeric getResolved(PercentBaseContext context) throws PropertyException {	104	private Numeric getResolved(PercentBaseContext context) throws PropertyException {
105	Numeric n;
106	switch (operation) {	105	switch (operation) {
107	case ADDITION:	106	case ADDITION:
108	return NumericOp.addition2(op1, op2, context);	107	return NumericOp.addition2(op1, op2, context);

Return to bug 41044

Lines 40-140 Link Here

(-)src/java/org/apache/fop/fo/properties/VerticalAlignShorthandParser.java (-35 / +35 lines)
40	case EN_BASELINE:	40	case EN_BASELINE:
41	switch (propId) {	41	switch (propId) {
42	case PR_ALIGNMENT_BASELINE:	42	case PR_ALIGNMENT_BASELINE:
43	return new EnumProperty(EN_BASELINE, "BASELINE");	43	return EnumProperty.getInstance(EN_BASELINE, "BASELINE");
44	case PR_ALIGNMENT_ADJUST:	44	case PR_ALIGNMENT_ADJUST:
45	return new EnumLength(new EnumProperty(EN_AUTO, "AUTO"));	45	return new EnumLength(EnumProperty.getInstance(EN_AUTO, "AUTO"));
46	case PR_BASELINE_SHIFT:	46	case PR_BASELINE_SHIFT:
47	return new EnumLength(new EnumProperty(EN_BASELINE, "BASELINE"));	47	return new EnumLength(EnumProperty.getInstance(EN_BASELINE, "BASELINE"));
48	case PR_DOMINANT_BASELINE:	48	case PR_DOMINANT_BASELINE:
49	return new EnumProperty(EN_AUTO, "AUTO");	49	return EnumProperty.getInstance(EN_AUTO, "AUTO");
50	}	50	}
51	case EN_TOP:	51	case EN_TOP:
52	switch (propId) {	52	switch (propId) {
53	case PR_ALIGNMENT_BASELINE:	53	case PR_ALIGNMENT_BASELINE:
54	return new EnumProperty(EN_BEFORE_EDGE, "BEFORE_EDGE");	54	return EnumProperty.getInstance(EN_BEFORE_EDGE, "BEFORE_EDGE");
55	case PR_ALIGNMENT_ADJUST:	55	case PR_ALIGNMENT_ADJUST:
56	return new EnumLength(new EnumProperty(EN_AUTO, "AUTO"));	56	return new EnumLength(EnumProperty.getInstance(EN_AUTO, "AUTO"));
57	case PR_BASELINE_SHIFT:	57	case PR_BASELINE_SHIFT:
58	return new EnumLength(new EnumProperty(EN_BASELINE, "BASELINE"));	58	return new EnumLength(EnumProperty.getInstance(EN_BASELINE, "BASELINE"));
59	case PR_DOMINANT_BASELINE:	59	case PR_DOMINANT_BASELINE:
60	return new EnumProperty(EN_AUTO, "AUTO");	60	return EnumProperty.getInstance(EN_AUTO, "AUTO");
61	}	61	}
62	case EN_TEXT_TOP:	62	case EN_TEXT_TOP:
63	switch (propId) {	63	switch (propId) {
64	case PR_ALIGNMENT_BASELINE:	64	case PR_ALIGNMENT_BASELINE:
65	return new EnumProperty(EN_TEXT_BEFORE_EDGE, "TEXT_BEFORE_EDGE");	65	return EnumProperty.getInstance(EN_TEXT_BEFORE_EDGE, "TEXT_BEFORE_EDGE");
66	case PR_ALIGNMENT_ADJUST:	66	case PR_ALIGNMENT_ADJUST:
67	return new EnumLength(new EnumProperty(EN_AUTO, "AUTO"));	67	return new EnumLength(EnumProperty.getInstance(EN_AUTO, "AUTO"));
68	case PR_BASELINE_SHIFT:	68	case PR_BASELINE_SHIFT:
69	return new EnumLength(new EnumProperty(EN_BASELINE, "BASELINE"));	69	return new EnumLength(EnumProperty.getInstance(EN_BASELINE, "BASELINE"));
70	case PR_DOMINANT_BASELINE:	70	case PR_DOMINANT_BASELINE:
71	return new EnumProperty(EN_AUTO, "AUTO");	71	return EnumProperty.getInstance(EN_AUTO, "AUTO");
72	}	72	}
73	case EN_MIDDLE:	73	case EN_MIDDLE:
74	switch (propId) {	74	switch (propId) {
75	case PR_ALIGNMENT_BASELINE:	75	case PR_ALIGNMENT_BASELINE:
76	return new EnumProperty(EN_MIDDLE, "MIDDLE");	76	return EnumProperty.getInstance(EN_MIDDLE, "MIDDLE");
77	case PR_ALIGNMENT_ADJUST:	77	case PR_ALIGNMENT_ADJUST:
78	return new EnumLength(new EnumProperty(EN_AUTO, "AUTO"));	78	return new EnumLength(EnumProperty.getInstance(EN_AUTO, "AUTO"));
79	case PR_BASELINE_SHIFT:	79	case PR_BASELINE_SHIFT:
80	return new EnumLength(new EnumProperty(EN_BASELINE, "BASELINE"));	80	return new EnumLength(EnumProperty.getInstance(EN_BASELINE, "BASELINE"));
81	case PR_DOMINANT_BASELINE:	81	case PR_DOMINANT_BASELINE:
82	return new EnumProperty(EN_AUTO, "AUTO");	82	return EnumProperty.getInstance(EN_AUTO, "AUTO");
83	}	83	}
84	case EN_BOTTOM:	84	case EN_BOTTOM:
85	switch (propId) {	85	switch (propId) {
86	case PR_ALIGNMENT_BASELINE:	86	case PR_ALIGNMENT_BASELINE:
87	return new EnumProperty(EN_AFTER_EDGE, "AFTER_EDGE");	87	return EnumProperty.getInstance(EN_AFTER_EDGE, "AFTER_EDGE");
88	case PR_ALIGNMENT_ADJUST:	88	case PR_ALIGNMENT_ADJUST:
89	return new EnumLength(new EnumProperty(EN_AUTO, "AUTO"));	89	return new EnumLength(EnumProperty.getInstance(EN_AUTO, "AUTO"));
90	case PR_BASELINE_SHIFT:	90	case PR_BASELINE_SHIFT:
91	return new EnumLength(new EnumProperty(EN_BASELINE, "BASELINE"));	91	return new EnumLength(EnumProperty.getInstance(EN_BASELINE, "BASELINE"));
92	case PR_DOMINANT_BASELINE:	92	case PR_DOMINANT_BASELINE:
93	return new EnumProperty(EN_AUTO, "AUTO");	93	return EnumProperty.getInstance(EN_AUTO, "AUTO");
94	}	94	}
95	case EN_TEXT_BOTTOM:	95	case EN_TEXT_BOTTOM:
96	switch (propId) {	96	switch (propId) {
97	case PR_ALIGNMENT_BASELINE:	97	case PR_ALIGNMENT_BASELINE:
98	return new EnumProperty(EN_TEXT_AFTER_EDGE, "TEXT_AFTER_EDGE");	98	return EnumProperty.getInstance(EN_TEXT_AFTER_EDGE, "TEXT_AFTER_EDGE");
99	case PR_ALIGNMENT_ADJUST:	99	case PR_ALIGNMENT_ADJUST:
100	return new EnumLength(new EnumProperty(EN_AUTO, "AUTO"));	100	return new EnumLength(EnumProperty.getInstance(EN_AUTO, "AUTO"));
101	case PR_BASELINE_SHIFT:	101	case PR_BASELINE_SHIFT:
102	return new EnumLength(new EnumProperty(EN_BASELINE, "BASELINE"));	102	return new EnumLength(EnumProperty.getInstance(EN_BASELINE, "BASELINE"));
103	case PR_DOMINANT_BASELINE:	103	case PR_DOMINANT_BASELINE:
104	return new EnumProperty(EN_AUTO, "AUTO");	104	return EnumProperty.getInstance(EN_AUTO, "AUTO");
105	}	105	}
106	case EN_SUB:	106	case EN_SUB:
107	switch (propId) {	107	switch (propId) {
108	case PR_ALIGNMENT_BASELINE:	108	case PR_ALIGNMENT_BASELINE:
109	return new EnumProperty(EN_BASELINE, "BASELINE");	109	return EnumProperty.getInstance(EN_BASELINE, "BASELINE");
110	case PR_ALIGNMENT_ADJUST:	110	case PR_ALIGNMENT_ADJUST:
111	return new EnumLength(new EnumProperty(EN_AUTO, "AUTO"));	111	return new EnumLength(EnumProperty.getInstance(EN_AUTO, "AUTO"));
112	case PR_BASELINE_SHIFT:	112	case PR_BASELINE_SHIFT:
113	return new EnumLength(new EnumProperty(EN_SUB, "SUB"));	113	return new EnumLength(EnumProperty.getInstance(EN_SUB, "SUB"));
114	case PR_DOMINANT_BASELINE:	114	case PR_DOMINANT_BASELINE:
115	return new EnumProperty(EN_AUTO, "AUTO");	115	return EnumProperty.getInstance(EN_AUTO, "AUTO");
116	}	116	}
117	case EN_SUPER:	117	case EN_SUPER:
118	switch (propId) {	118	switch (propId) {
119	case PR_ALIGNMENT_BASELINE:	119	case PR_ALIGNMENT_BASELINE:
120	return new EnumProperty(EN_BASELINE, "BASELINE");	120	return EnumProperty.getInstance(EN_BASELINE, "BASELINE");
121	case PR_ALIGNMENT_ADJUST:	121	case PR_ALIGNMENT_ADJUST:
122	return new EnumLength(new EnumProperty(EN_AUTO, "AUTO"));	122	return new EnumLength(EnumProperty.getInstance(EN_AUTO, "AUTO"));
123	case PR_BASELINE_SHIFT:	123	case PR_BASELINE_SHIFT:
124	return new EnumLength(new EnumProperty(EN_SUPER, "SUPER"));	124	return new EnumLength(EnumProperty.getInstance(EN_SUPER, "SUPER"));
125	case PR_DOMINANT_BASELINE:	125	case PR_DOMINANT_BASELINE:
126	return new EnumProperty(EN_AUTO, "AUTO");	126	return EnumProperty.getInstance(EN_AUTO, "AUTO");
127	}	127	}
128	default:	128	default:
129	switch (propId) {	129	switch (propId) {
130	case PR_ALIGNMENT_BASELINE:	130	case PR_ALIGNMENT_BASELINE:
131	return new EnumProperty(EN_BASELINE, "BASELINE");	131	return EnumProperty.getInstance(EN_BASELINE, "BASELINE");
132	case PR_ALIGNMENT_ADJUST:	132	case PR_ALIGNMENT_ADJUST:
133	return property;	133	return property;
134	case PR_BASELINE_SHIFT:	134	case PR_BASELINE_SHIFT:
135	return new EnumLength(new EnumProperty(EN_BASELINE, "BASELINE"));	135	return new EnumLength(EnumProperty.getInstance(EN_BASELINE, "BASELINE"));
136	case PR_DOMINANT_BASELINE:	136	case PR_DOMINANT_BASELINE:
137	return new EnumProperty(EN_AUTO, "AUTO");	137	return EnumProperty.getInstance(EN_AUTO, "AUTO");
138	}	138	}
139	}	139	}
140	return null;	140	return null;

Lines 41-51 Link Here

(-)src/java/org/apache/fop/fo/properties/PositionShorthandParser.java (-7 / +7 lines)
41	switch (propVal) {	41	switch (propVal) {
42	case Constants.EN_STATIC:	42	case Constants.EN_STATIC:
43	case Constants.EN_RELATIVE:	43	case Constants.EN_RELATIVE:
44	return new EnumProperty(Constants.EN_AUTO, "AUTO");	44	return EnumProperty.getInstance(Constants.EN_AUTO, "AUTO");
45	case Constants.EN_ABSOLUTE:	45	case Constants.EN_ABSOLUTE:
46	return new EnumProperty(Constants.EN_ABSOLUTE, "ABSOLUTE");	46	return EnumProperty.getInstance(Constants.EN_ABSOLUTE, "ABSOLUTE");
47	case Constants.EN_FIXED:	47	case Constants.EN_FIXED:
48	return new EnumProperty(Constants.EN_FIXED, "FIXED");	48	return EnumProperty.getInstance(Constants.EN_FIXED, "FIXED");
49	default:	49	default:
50	//nop	50	//nop
51	}	51	}
Lines 53-65 Link Here
53	if (propId == Constants.PR_RELATIVE_POSITION) {	53	if (propId == Constants.PR_RELATIVE_POSITION) {
54	switch (propVal) {	54	switch (propVal) {
55	case Constants.EN_STATIC:	55	case Constants.EN_STATIC:
56	return new EnumProperty(Constants.EN_STATIC, "STATIC");	56	return EnumProperty.getInstance(Constants.EN_STATIC, "STATIC");
57	case Constants.EN_RELATIVE:	57	case Constants.EN_RELATIVE:
58	return new EnumProperty(Constants.EN_RELATIVE, "RELATIVE");	58	return EnumProperty.getInstance(Constants.EN_RELATIVE, "RELATIVE");
59	case Constants.EN_ABSOLUTE:	59	case Constants.EN_ABSOLUTE:
60	return new EnumProperty(Constants.EN_STATIC, "STATIC");	60	return EnumProperty.getInstance(Constants.EN_STATIC, "STATIC");
61	case Constants.EN_FIXED:	61	case Constants.EN_FIXED:
62	return new EnumProperty(Constants.EN_STATIC, "STATIC");	62	return EnumProperty.getInstance(Constants.EN_STATIC, "STATIC");
63	default:	63	default:
64	//nop	64	//nop
65	}	65	}

Lines 36-42 Link Here

(-)src/java/org/apache/fop/fo/flow/BasicLink.java (-2 / +2 lines)
36	public class BasicLink extends Inline {	36	public class BasicLink extends Inline {
37	// The value of properties relevant for fo:basic-link.	37	// The value of properties relevant for fo:basic-link.
38	// private ToBeImplementedProperty destinationPlacementOffset;	38	// private ToBeImplementedProperty destinationPlacementOffset;
39	private int dominantBaseline;
40	private String externalDestination;	39	private String externalDestination;
41	// private ToBeImplementedProperty indicateDestination;	40	// private ToBeImplementedProperty indicateDestination;
42	private String internalDestination;	41	private String internalDestination;
Lines 44-49 Link Here
44	// private ToBeImplementedProperty targetProcessingContext;	43	// private ToBeImplementedProperty targetProcessingContext;
45	// private ToBeImplementedProperty targetPresentationContext;	44	// private ToBeImplementedProperty targetPresentationContext;
46	// private ToBeImplementedProperty targetStylesheet;	45	// private ToBeImplementedProperty targetStylesheet;
		46	// Unused but valid items, commented out for performance:
		47	// private int dominantBaseline;
47	// End of property values	48	// End of property values
48		49
49	// used only for FO validation	50	// used only for FO validation
Lines 62-68 Link Here
62	public void bind(PropertyList pList) throws FOPException {	63	public void bind(PropertyList pList) throws FOPException {
63	super.bind(pList);	64	super.bind(pList);
64	// destinationPlacementOffset = pList.get(PR_DESTINATION_PLACEMENT_OFFSET);	65	// destinationPlacementOffset = pList.get(PR_DESTINATION_PLACEMENT_OFFSET);
65	dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum();
66	externalDestination = pList.get(PR_EXTERNAL_DESTINATION).getString();	66	externalDestination = pList.get(PR_EXTERNAL_DESTINATION).getString();
67	// indicateDestination = pList.get(PR_INDICATE_DESTINATION);	67	// indicateDestination = pList.get(PR_INDICATE_DESTINATION);
68	internalDestination = pList.get(PR_INTERNAL_DESTINATION).getString();	68	internalDestination = pList.get(PR_INTERNAL_DESTINATION).getString();

Lines 34-42 Link Here

(-)src/java/org/apache/fop/fo/flow/AbstractListItemPart.java (-2 / +2 lines)
34	*/	34	*/
35	public abstract class AbstractListItemPart extends FObj {	35	public abstract class AbstractListItemPart extends FObj {
36	// The value of properties relevant for fo:list-item-label and fo:list-item-body.	36	// The value of properties relevant for fo:list-item-label and fo:list-item-body.
37	private CommonAccessibility commonAccessibility;
38	private String id;	37	private String id;
39	private KeepProperty keepTogether;	38	private KeepProperty keepTogether;
		39	// Valid properties, commented out for performance:
		40	// private CommonAccessibility commonAccessibility;
40	// End of property values	41	// End of property values
41		42
42	/** used for FO validation */	43	/** used for FO validation */
Lines 53-59 Link Here
53	* @see org.apache.fop.fo.FObj#bind(PropertyList)	54	* @see org.apache.fop.fo.FObj#bind(PropertyList)
54	*/	55	*/
55	public void bind(PropertyList pList) throws FOPException {	56	public void bind(PropertyList pList) throws FOPException {
56	commonAccessibility = pList.getAccessibilityProps();
57	id = pList.get(PR_ID).getString();	57	id = pList.get(PR_ID).getString();
58	keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();	58	keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();
59	}	59	}

Lines 40-57 Link Here

(-)src/java/org/apache/fop/fo/flow/BidiOverride.java (-11 / +7 lines)
40	// used for FO validation	40	// used for FO validation
41	private boolean blockOrInlineItemFound = false;	41	private boolean blockOrInlineItemFound = false;
42	private boolean canHaveBlockLevelChildren = true;	42	private boolean canHaveBlockLevelChildren = true;
43
44	// The value of properties relevant for fo:bidi-override.	43	// The value of properties relevant for fo:bidi-override.
45	private CommonAural commonAural;
46	private CommonFont commonFont;
47	private CommonRelativePosition commonRelativePosition;
48	private Color prColor;
49	// private ToBeImplementedProperty prDirection;	44	// private ToBeImplementedProperty prDirection;
50	// private ToBeImplementedProperty prLetterSpacing;	45	// private ToBeImplementedProperty prLetterSpacing;
51	private SpaceProperty lineHeight;	46	private SpaceProperty lineHeight;
52	// private ToBeImplementedProperty prScoreSpaces;	47	// private ToBeImplementedProperty prScoreSpaces;
53	// private ToBeImplementedProperty prUnicodeBidi;	48	// private ToBeImplementedProperty prUnicodeBidi;
54	private SpaceProperty prWordSpacing;	49
		50	// Unused but valid items, commented out for performance:
		51	// private CommonAural commonAural;
		52	// private CommonFont commonFont;
		53	// private CommonRelativePosition commonRelativePosition;
		54	// private Color prColor;
		55	// private SpaceProperty prWordSpacing;
55	// End of property values	56	// End of property values
56		57
57	/**	58	/**
Lines 84-99 Link Here
84	* @see org.apache.fop.fo.FObj#bind(PropertyList)	85	* @see org.apache.fop.fo.FObj#bind(PropertyList)
85	*/	86	*/
86	public void bind(PropertyList pList) throws FOPException {	87	public void bind(PropertyList pList) throws FOPException {
87	commonAural = pList.getAuralProps();
88	commonFont = pList.getFontProps();
89	commonRelativePosition = pList.getRelativePositionProps();
90	prColor = pList.get(PR_COLOR).getColor(getUserAgent());
91	// prDirection = pList.get(PR_DIRECTION);	88	// prDirection = pList.get(PR_DIRECTION);
92	// prLetterSpacing = pList.get(PR_LETTER_SPACING);	89	// prLetterSpacing = pList.get(PR_LETTER_SPACING);
93	lineHeight = pList.get(PR_LINE_HEIGHT).getSpace();	90	lineHeight = pList.get(PR_LINE_HEIGHT).getSpace();
94	// prScoreSpaces = pList.get(PR_SCORE_SPACES);	91	// prScoreSpaces = pList.get(PR_SCORE_SPACES);
95	// prUnicodeBidi = pList.get(PR_UNICODE_BIDI);	92	// prUnicodeBidi = pList.get(PR_UNICODE_BIDI);
96	prWordSpacing = pList.get(PR_WORD_SPACING).getSpace();
97	}	93	}
98		94
99	/**	95	/**

Lines 34-41 Link Here

(-)src/java/org/apache/fop/fo/flow/MultiProperties.java (-2 / +2 lines)
34	*/	34	*/
35	public class MultiProperties extends FObj {	35	public class MultiProperties extends FObj {
36	// The value of properties relevant for fo:multi-properties.	36	// The value of properties relevant for fo:multi-properties.
37	private CommonAccessibility commonAccessibility;
38	private String id;	37	private String id;
		38	// Unused but valid items, commented out for performance:
		39	// private CommonAccessibility commonAccessibility;
39	// End of property values	40	// End of property values
40		41
41	static boolean notImplementedWarningGiven = false;	42	static boolean notImplementedWarningGiven = false;
Lines 60-66 Link Here
60	* @see org.apache.fop.fo.FObj#bind(PropertyList)	61	* @see org.apache.fop.fo.FObj#bind(PropertyList)
61	*/	62	*/
62	public void bind(PropertyList pList) throws FOPException {	63	public void bind(PropertyList pList) throws FOPException {
63	commonAccessibility = pList.getAccessibilityProps();
64	id = pList.get(PR_ID).getString();	64	id = pList.get(PR_ID).getString();
65	}	65	}
66		66

Lines 45-75 Link Here

(-)src/java/org/apache/fop/fo/flow/PageNumber.java (-26 / +14 lines)
45	*/	45	*/
46	public class PageNumber extends FObj {	46	public class PageNumber extends FObj {
47	// The value of properties relevant for fo:page-number.	47	// The value of properties relevant for fo:page-number.
48	private CommonAccessibility commonAccessibility;
49	private CommonAural commonAural;
50	private CommonBorderPaddingBackground commonBorderPaddingBackground;	48	private CommonBorderPaddingBackground commonBorderPaddingBackground;
51	private CommonFont commonFont;	49	private CommonFont commonFont;
52	private CommonMarginInline commonMarginInline;
53	private CommonRelativePosition commonRelativePosition;
54	private Length alignmentAdjust;	50	private Length alignmentAdjust;
55	private int alignmentBaseline;	51	private int alignmentBaseline;
56	private Length baselineShift;	52	private Length baselineShift;
57	private int dominantBaseline;	53	private int dominantBaseline;
58	private String id;	54	private String id;
59	private KeepProperty keepWithNext;
60	private KeepProperty keepWithPrevious;
61	// private ToBeImplementedProperty letterSpacing;	55	// private ToBeImplementedProperty letterSpacing;
62	private SpaceProperty lineHeight;	56	private SpaceProperty lineHeight;
63	private int scoreSpaces;
64	private Length textAltitude;
65	/** Holds the text decoration values. May be null */	57	/** Holds the text decoration values. May be null */
66	private CommonTextDecoration textDecoration;	58	private CommonTextDecoration textDecoration;
67	private Length textDepth;
68	// private ToBeImplementedProperty textShadow;	59	// private ToBeImplementedProperty textShadow;
69	private int textTransform;	60	// Unused but valid items, commented out for performance:
70	private int visibility;	61	// private CommonAccessibility commonAccessibility;
71	private SpaceProperty wordSpacing;	62	// private CommonAural commonAural;
72	private int wrapOption;	63	// private CommonMarginInline commonMarginInline;
		64	// private CommonRelativePosition commonRelativePosition;
		65	// private KeepProperty keepWithNext;
		66	// private KeepProperty keepWithPrevious;
		67	// private int scoreSpaces;
		68	// private Length textAltitude;
		69	// private Length textDepth;
		70	// private int textTransform;
		71	// private int visibility;
		72	// private SpaceProperty wordSpacing;
		73	// private int wrapOption;
73	// End of property values	74	// End of property values
74		75
75	// Properties which are not explicitely listed but are still applicable	76	// Properties which are not explicitely listed but are still applicable
Lines 86-115 Link Here
86	* @see org.apache.fop.fo.FObj#bind(PropertyList)	87	* @see org.apache.fop.fo.FObj#bind(PropertyList)
87	*/	88	*/
88	public void bind(PropertyList pList) throws FOPException {	89	public void bind(PropertyList pList) throws FOPException {
89	commonAccessibility = pList.getAccessibilityProps();
90	commonAural = pList.getAuralProps();
91	commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();	90	commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
92	commonFont = pList.getFontProps();	91	commonFont = pList.getFontProps();
93	commonMarginInline = pList.getMarginInlineProps();
94	commonRelativePosition = pList.getRelativePositionProps();
95	alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST).getLength();	92	alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST).getLength();
96	alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE).getEnum();	93	alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE).getEnum();
97	baselineShift = pList.get(PR_BASELINE_SHIFT).getLength();	94	baselineShift = pList.get(PR_BASELINE_SHIFT).getLength();
98	dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum();	95	dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum();
99	id = pList.get(PR_ID).getString();	96	id = pList.get(PR_ID).getString();
100	keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
101	keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();
102	// letterSpacing = pList.get(PR_LETTER_SPACING);	97	// letterSpacing = pList.get(PR_LETTER_SPACING);
103	lineHeight = pList.get(PR_LINE_HEIGHT).getSpace();	98	lineHeight = pList.get(PR_LINE_HEIGHT).getSpace();
104	scoreSpaces = pList.get(PR_SCORE_SPACES).getEnum();
105	textAltitude = pList.get(PR_TEXT_ALTITUDE).getLength();
106	textDecoration = pList.getTextDecorationProps();	99	textDecoration = pList.getTextDecorationProps();
107	textDepth = pList.get(PR_TEXT_DEPTH).getLength();
108	// textShadow = pList.get(PR_TEXT_SHADOW);	100	// textShadow = pList.get(PR_TEXT_SHADOW);
109	textTransform = pList.get(PR_TEXT_TRANSFORM).getEnum();
110	visibility = pList.get(PR_VISIBILITY).getEnum();
111	wordSpacing = pList.get(PR_WORD_SPACING).getSpace();
112	wrapOption = pList.get(PR_WRAP_OPTION).getEnum();
113		101
114	// implicit properties	102	// implicit properties
115	color = pList.get(Constants.PR_COLOR).getColor(getUserAgent());	103	color = pList.get(Constants.PR_COLOR).getColor(getUserAgent());

Lines 31-41 Link Here

(-)src/java/org/apache/fop/fo/flow/MultiCase.java (-2 / +2 lines)
31	*/	31	*/
32	public class MultiCase extends FObj {	32	public class MultiCase extends FObj {
33	// The value of properties relevant for fo:multi-case.	33	// The value of properties relevant for fo:multi-case.
34	private CommonAccessibility commonAccessibility;
35	private String id;	34	private String id;
36	private int startingState;	35	private int startingState;
37	// private ToBeImplementedProperty caseName;	36	// private ToBeImplementedProperty caseName;
38	// private ToBeImplementedProperty caseTitle;	37	// private ToBeImplementedProperty caseTitle;
		38	// Unused but valid items, commented out for performance:
		39	// private CommonAccessibility commonAccessibility;
39	// End of property values	40	// End of property values
40		41
41	static boolean notImplementedWarningGiven = false;	42	static boolean notImplementedWarningGiven = false;
Lines 56-62 Link Here
56	* @see org.apache.fop.fo.FObj#bind(PropertyList)	57	* @see org.apache.fop.fo.FObj#bind(PropertyList)
57	*/	58	*/
58	public void bind(PropertyList pList) throws FOPException {	59	public void bind(PropertyList pList) throws FOPException {
59	commonAccessibility = pList.getAccessibilityProps();
60	id = pList.get(PR_ID).getString();	60	id = pList.get(PR_ID).getString();
61	startingState = pList.get(PR_STARTING_STATE).getEnum();	61	startingState = pList.get(PR_STARTING_STATE).getEnum();
62	// caseName = pList.get(PR_CASE_NAME);	62	// caseName = pList.get(PR_CASE_NAME);

Lines 47-57 Link Here

(-)src/java/org/apache/fop/fo/flow/Table.java (-10 / +6 lines)
47	public class Table extends TableFObj {	47	public class Table extends TableFObj {
48		48
49	/** properties */	49	/** properties */
50	private CommonAccessibility commonAccessibility;
51	private CommonAural commonAural;
52	private CommonBorderPaddingBackground commonBorderPaddingBackground;	50	private CommonBorderPaddingBackground commonBorderPaddingBackground;
53	private CommonMarginBlock commonMarginBlock;	51	private CommonMarginBlock commonMarginBlock;
54	private CommonRelativePosition commonRelativePosition;
55	private LengthRangeProperty blockProgressionDimension;	52	private LengthRangeProperty blockProgressionDimension;
56	private int borderCollapse;	53	private int borderCollapse;
57	private LengthPairProperty borderSeparation;	54	private LengthPairProperty borderSeparation;
Lines 59-72 Link Here
59	private int breakBefore;	56	private int breakBefore;
60	private String id;	57	private String id;
61	private LengthRangeProperty inlineProgressionDimension;	58	private LengthRangeProperty inlineProgressionDimension;
62	private int intrusionDisplace;
63	private KeepProperty keepTogether;	59	private KeepProperty keepTogether;
64	private KeepProperty keepWithNext;	60	private KeepProperty keepWithNext;
65	private KeepProperty keepWithPrevious;	61	private KeepProperty keepWithPrevious;
66	private int tableLayout;	62	private int tableLayout;
67	private int tableOmitFooterAtBreak;	63	private int tableOmitFooterAtBreak;
68	private int tableOmitHeaderAtBreak;	64	private int tableOmitHeaderAtBreak;
69	private int writingMode;	65	// Unused but valid items, commented out for performance:
		66	// private CommonAccessibility commonAccessibility;
		67	// private CommonAural commonAural;
		68	// private CommonRelativePosition commonRelativePosition;
		69	// private int intrusionDisplace;
		70	// private int writingMode;
70		71
71	/** extension properties */	72	/** extension properties */
72	private Length widowContentLimit;	73	private Length widowContentLimit;
Lines 109-119 Link Here
109	* @see org.apache.fop.fo.FObj#bind(PropertyList)	110	* @see org.apache.fop.fo.FObj#bind(PropertyList)
110	*/	111	*/
111	public void bind(PropertyList pList) throws FOPException {	112	public void bind(PropertyList pList) throws FOPException {
112	commonAccessibility = pList.getAccessibilityProps();
113	commonAural = pList.getAuralProps();
114	commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();	113	commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
115	commonMarginBlock = pList.getMarginBlockProps();	114	commonMarginBlock = pList.getMarginBlockProps();
116	commonRelativePosition = pList.getRelativePositionProps();
117	blockProgressionDimension = pList.get(PR_BLOCK_PROGRESSION_DIMENSION).getLengthRange();	115	blockProgressionDimension = pList.get(PR_BLOCK_PROGRESSION_DIMENSION).getLengthRange();
118	borderCollapse = pList.get(PR_BORDER_COLLAPSE).getEnum();	116	borderCollapse = pList.get(PR_BORDER_COLLAPSE).getEnum();
119	borderSeparation = pList.get(PR_BORDER_SEPARATION).getLengthPair();	117	borderSeparation = pList.get(PR_BORDER_SEPARATION).getLengthPair();
Lines 121-134 Link Here
121	breakBefore = pList.get(PR_BREAK_BEFORE).getEnum();	119	breakBefore = pList.get(PR_BREAK_BEFORE).getEnum();
122	id = pList.get(PR_ID).getString();	120	id = pList.get(PR_ID).getString();
123	inlineProgressionDimension = pList.get(PR_INLINE_PROGRESSION_DIMENSION).getLengthRange();	121	inlineProgressionDimension = pList.get(PR_INLINE_PROGRESSION_DIMENSION).getLengthRange();
124	intrusionDisplace = pList.get(PR_INTRUSION_DISPLACE).getEnum();
125	keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();	122	keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();
126	keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();	123	keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
127	keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();	124	keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();
128	tableLayout = pList.get(PR_TABLE_LAYOUT).getEnum();	125	tableLayout = pList.get(PR_TABLE_LAYOUT).getEnum();
129	tableOmitFooterAtBreak = pList.get(PR_TABLE_OMIT_FOOTER_AT_BREAK).getEnum();	126	tableOmitFooterAtBreak = pList.get(PR_TABLE_OMIT_FOOTER_AT_BREAK).getEnum();
130	tableOmitHeaderAtBreak = pList.get(PR_TABLE_OMIT_HEADER_AT_BREAK).getEnum();	127	tableOmitHeaderAtBreak = pList.get(PR_TABLE_OMIT_HEADER_AT_BREAK).getEnum();
131	writingMode = pList.get(PR_WRITING_MODE).getEnum();
132	super.bind(pList);	128	super.bind(pList);
133		129
134	//Bind extension properties	130	//Bind extension properties

Lines 46-56 Link Here

(-)src/java/org/apache/fop/fo/flow/TableBody.java (-8 / +6 lines)
46	*/	46	*/
47	public class TableBody extends TableFObj {	47	public class TableBody extends TableFObj {
48	// The value of properties relevant for fo:table-body.	48	// The value of properties relevant for fo:table-body.
49	private CommonAccessibility commonAccessibility;
50	private CommonAural commonAural;
51	private CommonBorderPaddingBackground commonBorderPaddingBackground;	49	private CommonBorderPaddingBackground commonBorderPaddingBackground;
52	private CommonRelativePosition commonRelativePosition;	50	// Unused but valid items, commented out for performance:
53	private int visibility;	51	// private CommonAccessibility commonAccessibility;
		52	// private CommonAural commonAural;
		53	// private CommonRelativePosition commonRelativePosition;
		54	// private int visibility;
54	// End of property values	55	// End of property values
55		56
56	private PropertyList savedPropertyList;	57	private PropertyList savedPropertyList;
Lines 80-90 Link Here
80	* @see FObj#bind(PropertyList)	81	* @see FObj#bind(PropertyList)
81	*/	82	*/
82	public void bind(PropertyList pList) throws FOPException {	83	public void bind(PropertyList pList) throws FOPException {
83	commonAccessibility = pList.getAccessibilityProps();
84	commonAural = pList.getAuralProps();
85	commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();	84	commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
86	commonRelativePosition = pList.getRelativePositionProps();
87	visibility = pList.get(PR_VISIBILITY).getEnum();
88	super.bind(pList);	85	super.bind(pList);
89	//Used by convertCellsToRows()	86	//Used by convertCellsToRows()
90	savedPropertyList = pList;	87	savedPropertyList = pList;
Lines 240-245 Link Here
240	* @throws FOPException if there's a problem binding the TableRow's	237	* @throws FOPException if there's a problem binding the TableRow's
241	* properties.	238	* properties.
242	*/	239	*/
		240	// TODO: This is currently unused. Why is it here?
243	private void convertCellsToRows() throws FOPException {	241	private void convertCellsToRows() throws FOPException {
244	//getLogger().debug("Converting cells to rows...");	242	//getLogger().debug("Converting cells to rows...");
245	List cells = new java.util.ArrayList(childNodes);	243	List cells = new java.util.ArrayList(childNodes);

Lines 43-58 Link Here

(-)src/java/org/apache/fop/fo/flow/TableCaption.java (-16 / +9 lines)
43	public class TableCaption extends FObj {	43	public class TableCaption extends FObj {
44	// The value of properties relevant for fo:table-caption.	44	// The value of properties relevant for fo:table-caption.
45	private CommonAccessibility commonAccessibility;	45	private CommonAccessibility commonAccessibility;
46	private CommonAural commonAural;
47	private CommonBorderPaddingBackground commonBorderPaddingBackground;	46	private CommonBorderPaddingBackground commonBorderPaddingBackground;
48	private CommonRelativePosition commonRelativePosition;
49	private LengthRangeProperty blockProgressionDimension;
50	private Length height;
51	private String id;	47	private String id;
52	private LengthRangeProperty inlineProgressionDimension;	48	// Unused but valid items, commented out for performance:
53	private int intrusionDisplace;	49	// private CommonAural commonAural;
54	private KeepProperty keepTogether;	50	// private CommonRelativePosition commonRelativePosition;
55	private Length width;	51	// private LengthRangeProperty blockProgressionDimension;
		52	// private Length height;
		53	// private LengthRangeProperty inlineProgressionDimension;
		54	// private int intrusionDisplace;
		55	// private KeepProperty keepTogether;
		56	// private Length width;
56	// End of property values	57	// End of property values
57		58
58	/** used for FO validation */	59	/** used for FO validation */
Lines 77-92 Link Here
77	*/	78	*/
78	public void bind(PropertyList pList) throws FOPException {	79	public void bind(PropertyList pList) throws FOPException {
79	commonAccessibility = pList.getAccessibilityProps();	80	commonAccessibility = pList.getAccessibilityProps();
80	commonAural = pList.getAuralProps();
81	commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();	81	commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
82	commonRelativePosition = pList.getRelativePositionProps();
83	blockProgressionDimension = pList.get(PR_BLOCK_PROGRESSION_DIMENSION).getLengthRange();
84	height = pList.get(PR_HEIGHT).getLength();
85	id = pList.get(PR_ID).getString();	82	id = pList.get(PR_ID).getString();
86	inlineProgressionDimension = pList.get(PR_INLINE_PROGRESSION_DIMENSION).getLengthRange();
87	intrusionDisplace = pList.get(PR_INTRUSION_DISPLACE).getEnum();
88	keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();
89	width = pList.get(PR_WIDTH).getLength();
90	}	83	}
91		84
92	/**	85	/**

Lines 32-40 Link Here

(-)src/java/org/apache/fop/fo/flow/Float.java (-5 / +4 lines)
32	* fo:float element.	32	* fo:float element.
33	*/	33	*/
34	public class Float extends FObj {	34	public class Float extends FObj {
35	// The value of properties relevant for fo:float.	35	// The value of properties relevant for fo:float (commented out for performance.
36	private int float_;	36	// private int float_;
37	private int clear;	37	// private int clear;
38	// End of property values	38	// End of property values
39		39
40	static boolean notImplementedWarningGiven = false;	40	static boolean notImplementedWarningGiven = false;
Lines 55-62 Link Here
55	* @see org.apache.fop.fo.FObj#bind(PropertyList)	55	* @see org.apache.fop.fo.FObj#bind(PropertyList)
56	*/	56	*/
57	public void bind(PropertyList pList) throws FOPException {	57	public void bind(PropertyList pList) throws FOPException {
58	float_ = pList.get(PR_FLOAT).getEnum();	58	// No active properties -> Nothing to do.
59	clear = pList.get(PR_CLEAR).getEnum();
60	}	59	}
61		60
62	/**	61	/**

Lines 41-60 Link Here

(-)src/java/org/apache/fop/fo/flow/InitialPropertySet.java (-20 / +11 lines)
41	*/	41	*/
42	public class InitialPropertySet extends FObj {	42	public class InitialPropertySet extends FObj {
43	// The value of properties relevant for fo:initial-property-set.	43	// The value of properties relevant for fo:initial-property-set.
44	private CommonAccessibility commonAccessibility;
45	private CommonAural commonAural;
46	private CommonBorderPaddingBackground commonBorderPaddingBackground;
47	private CommonFont commonFont;
48	private CommonRelativePosition commonRelativePosition;
49	private Color color;
50	private String id;	44	private String id;
51	// private ToBeImplementedProperty letterSpacing;	45	// private ToBeImplementedProperty letterSpacing;
52	private SpaceProperty lineHeight;	46	private SpaceProperty lineHeight;
53	private int scoreSpaces;
54	private int textDecoration;
55	// private ToBeImplementedProperty textShadow;	47	// private ToBeImplementedProperty textShadow;
56	private int textTransform;	48	// Unused but valid items, commented out for performance:
57	private SpaceProperty wordSpacing;	49	// private CommonAccessibility commonAccessibility;
		50	// private CommonAural commonAural;
		51	// private CommonBorderPaddingBackground commonBorderPaddingBackground;
		52	// private CommonFont commonFont;
		53	// private CommonRelativePosition commonRelativePosition;
		54	// private Color color;
		55	// private int scoreSpaces;
		56	// private int textDecoration;
		57	// private int textTransform;
		58	// private SpaceProperty wordSpacing;
58	// End of property values	59	// End of property values
59		60
60	/**	61	/**
Lines 68-87 Link Here
68	* @see org.apache.fop.fo.FObj#bind(PropertyList)	69	* @see org.apache.fop.fo.FObj#bind(PropertyList)
69	*/	70	*/
70	public void bind(PropertyList pList) throws FOPException {	71	public void bind(PropertyList pList) throws FOPException {
71	commonAccessibility = pList.getAccessibilityProps();
72	commonAural = pList.getAuralProps();
73	commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
74	commonFont = pList.getFontProps();
75	commonRelativePosition = pList.getRelativePositionProps();
76	color = pList.get(PR_COLOR).getColor(getUserAgent());
77	id = pList.get(PR_ID).getString();	72	id = pList.get(PR_ID).getString();
78	// letterSpacing = pList.get(PR_LETTER_SPACING);	73	// letterSpacing = pList.get(PR_LETTER_SPACING);
79	lineHeight = pList.get(PR_LINE_HEIGHT).getSpace();	74	lineHeight = pList.get(PR_LINE_HEIGHT).getSpace();
80	scoreSpaces = pList.get(PR_SCORE_SPACES).getEnum();
81	textDecoration = pList.get(PR_TEXT_DECORATION).getEnum();
82	// textShadow = pList.get(PR_TEXT_SHADOW);	75	// textShadow = pList.get(PR_TEXT_SHADOW);
83	textTransform = pList.get(PR_TEXT_TRANSFORM).getEnum();
84	wordSpacing = pList.get(PR_WORD_SPACING).getSpace();
85	}	76	}
86		77
87	/**	78	/**

Lines 35-43 Link Here

(-)src/java/org/apache/fop/fo/flow/MultiSwitch.java (-2 / +2 lines)
35	*/	35	*/
36	public class MultiSwitch extends FObj {	36	public class MultiSwitch extends FObj {
37	// The value of properties relevant for fo:multi-switch.	37	// The value of properties relevant for fo:multi-switch.
38	private CommonAccessibility commonAccessibility;
39	// private ToBeImplementedProperty autoRestore;	38	// private ToBeImplementedProperty autoRestore;
40	private String id;	39	private String id;
		40	// Unused but valid items, commented out for performance:
		41	// private CommonAccessibility commonAccessibility;
41	// End of property values	42	// End of property values
42		43
43	static boolean notImplementedWarningGiven = false;	44	static boolean notImplementedWarningGiven = false;
Lines 58-64 Link Here
58	* @see org.apache.fop.fo.FObj#bind(PropertyList)	59	* @see org.apache.fop.fo.FObj#bind(PropertyList)
59	*/	60	*/
60	public void bind(PropertyList pList) throws FOPException {	61	public void bind(PropertyList pList) throws FOPException {
61	commonAccessibility = pList.getAccessibilityProps();
62	// autoRestore = pList.get(PR_AUTO_RESTORE);	62	// autoRestore = pList.get(PR_AUTO_RESTORE);
63	id = pList.get(PR_ID).getString();	63	id = pList.get(PR_ID).getString();
64	}	64	}

Lines 38-59 Link Here

(-)src/java/org/apache/fop/fo/flow/Inline.java (-19 / +10 lines)
38	public class Inline extends InlineLevel {	38	public class Inline extends InlineLevel {
39	// The value of properties relevant for fo:inline.	39	// The value of properties relevant for fo:inline.
40	// See also superclass InlineLevel	40	// See also superclass InlineLevel
41	private CommonRelativePosition commonRelativePosition;
42	private Length alignmentAdjust;	41	private Length alignmentAdjust;
43	private int alignmentBaseline;	42	private int alignmentBaseline;
44	private Length baselineShift;	43	private Length baselineShift;
45	private LengthRangeProperty blockProgressionDimension;
46	private int dominantBaseline;	44	private int dominantBaseline;
47	private Length height;
48	private String id;	45	private String id;
49	private LengthRangeProperty inlineProgressionDimension;	46	// Unused but valid items, commented out for performance:
50	private KeepProperty keepTogether;	47	// private CommonRelativePosition commonRelativePosition;
51	private KeepProperty keepWithNext;	48	// private LengthRangeProperty blockProgressionDimension;
52	private KeepProperty keepWithPrevious;	49	// private Length height;
53	private Length width;	50	// private LengthRangeProperty inlineProgressionDimension;
54	private int wrapOption;	51	// private KeepProperty keepTogether;
		52	// private KeepProperty keepWithNext;
		53	// private KeepProperty keepWithPrevious;
		54	// private Length width;
		55	// private int wrapOption;
55	// End of property values	56	// End of property values
56
57	// used for FO validation	57	// used for FO validation
58	private boolean blockOrInlineItemFound = false;	58	private boolean blockOrInlineItemFound = false;
59	private boolean canHaveBlockLevelChildren = true;	59	private boolean canHaveBlockLevelChildren = true;
Lines 70-89 Link Here
70	*/	70	*/
71	public void bind(PropertyList pList) throws FOPException {	71	public void bind(PropertyList pList) throws FOPException {
72	super.bind(pList);	72	super.bind(pList);
73	commonRelativePosition = pList.getRelativePositionProps();
74	alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST).getLength();	73	alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST).getLength();
75	alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE).getEnum();	74	alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE).getEnum();
76	baselineShift = pList.get(PR_BASELINE_SHIFT).getLength();	75	baselineShift = pList.get(PR_BASELINE_SHIFT).getLength();
77	blockProgressionDimension = pList.get(PR_BLOCK_PROGRESSION_DIMENSION).getLengthRange();
78	dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum();	76	dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum();
79	height = pList.get(PR_HEIGHT).getLength();
80	id = pList.get(PR_ID).getString();	77	id = pList.get(PR_ID).getString();
81	inlineProgressionDimension = pList.get(PR_INLINE_PROGRESSION_DIMENSION).getLengthRange();
82	keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();
83	keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
84	keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();
85	width = pList.get(PR_WIDTH).getLength();
86	wrapOption = pList.get(PR_WRAP_OPTION).getEnum();
87	}	78	}
88		79
89	/**	80	/**

Lines 48-79 Link Here

(-)src/java/org/apache/fop/fo/flow/PageNumberCitation.java (-26 / +14 lines)
48	*/	48	*/
49	public class PageNumberCitation extends FObj {	49	public class PageNumberCitation extends FObj {
50	// The value of properties relevant for fo:page-number-citation.	50	// The value of properties relevant for fo:page-number-citation.
51	private CommonAccessibility commonAccessibility;
52	private CommonAural commonAural;
53	private CommonBorderPaddingBackground commonBorderPaddingBackground;	51	private CommonBorderPaddingBackground commonBorderPaddingBackground;
54	private CommonFont commonFont;	52	private CommonFont commonFont;
55	private CommonMarginInline commonMarginInline;
56	private CommonRelativePosition commonRelativePosition;
57	private Length alignmentAdjust;	53	private Length alignmentAdjust;
58	private int alignmentBaseline;	54	private int alignmentBaseline;
59	private Length baselineShift;	55	private Length baselineShift;
60	private int dominantBaseline;	56	private int dominantBaseline;
61	private String id;	57	private String id;
62	private KeepProperty keepWithNext;
63	private KeepProperty keepWithPrevious;
64	// private ToBeImplementedProperty letterSpacing;	58	// private ToBeImplementedProperty letterSpacing;
65	private SpaceProperty lineHeight;	59	private SpaceProperty lineHeight;
66	private String refId;	60	private String refId;
67	private int scoreSpaces;
68	private Length textAltitude;
69	/** Holds the text decoration values. May be null */	61	/** Holds the text decoration values. May be null */
70	private CommonTextDecoration textDecoration;	62	private CommonTextDecoration textDecoration;
71	private Length textDepth;
72	// private ToBeImplementedProperty textShadow;	63	// private ToBeImplementedProperty textShadow;
73	private int textTransform;	64	// Unused but valid items, commented out for performance:
74	private int visibility;	65	// private CommonAccessibility commonAccessibility;
75	private SpaceProperty wordSpacing;	66	// private CommonAural commonAural;
76	private int wrapOption;	67	// private CommonMarginInline commonMarginInline;
		68	// private CommonRelativePosition commonRelativePosition;
		69	// private KeepProperty keepWithNext;
		70	// private KeepProperty keepWithPrevious;
		71	// private int scoreSpaces;
		72	// private Length textAltitude;
		73	// private Length textDepth;
		74	// private int textTransform;
		75	// private int visibility;
		76	// private SpaceProperty wordSpacing;
		77	// private int wrapOption;
77	// End of property values	78	// End of property values
78		79
79	// Properties which are not explicitely listed but are still applicable	80	// Properties which are not explicitely listed but are still applicable
Lines 90-120 Link Here
90	* @see org.apache.fop.fo.FObj#bind(PropertyList)	91	* @see org.apache.fop.fo.FObj#bind(PropertyList)
91	*/	92	*/
92	public void bind(PropertyList pList) throws FOPException {	93	public void bind(PropertyList pList) throws FOPException {
93	commonAccessibility = pList.getAccessibilityProps();
94	commonAural = pList.getAuralProps();
95	commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();	94	commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
96	commonFont = pList.getFontProps();	95	commonFont = pList.getFontProps();
97	commonMarginInline = pList.getMarginInlineProps();
98	commonRelativePosition = pList.getRelativePositionProps();
99	alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST).getLength();	96	alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST).getLength();
100	alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE).getEnum();	97	alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE).getEnum();
101	baselineShift = pList.get(PR_BASELINE_SHIFT).getLength();	98	baselineShift = pList.get(PR_BASELINE_SHIFT).getLength();
102	dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum();	99	dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum();
103	id = pList.get(PR_ID).getString();	100	id = pList.get(PR_ID).getString();
104	keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
105	keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();
106	// letterSpacing = pList.get(PR_LETTER_SPACING);	101	// letterSpacing = pList.get(PR_LETTER_SPACING);
107	lineHeight = pList.get(PR_LINE_HEIGHT).getSpace();	102	lineHeight = pList.get(PR_LINE_HEIGHT).getSpace();
108	refId = pList.get(PR_REF_ID).getString();	103	refId = pList.get(PR_REF_ID).getString();
109	scoreSpaces = pList.get(PR_SCORE_SPACES).getEnum();
110	textAltitude = pList.get(PR_TEXT_ALTITUDE).getLength();
111	textDecoration = pList.getTextDecorationProps();	104	textDecoration = pList.getTextDecorationProps();
112	textDepth = pList.get(PR_TEXT_DEPTH).getLength();
113	// textShadow = pList.get(PR_TEXT_SHADOW);	105	// textShadow = pList.get(PR_TEXT_SHADOW);
114	textTransform = pList.get(PR_TEXT_TRANSFORM).getEnum();
115	visibility = pList.get(PR_VISIBILITY).getEnum();
116	wordSpacing = pList.get(PR_WORD_SPACING).getSpace();
117	wrapOption = pList.get(PR_WRAP_OPTION).getEnum();
118		106
119	// implicit properties	107	// implicit properties
120	color = pList.get(Constants.PR_COLOR).getColor(getUserAgent());	108	color = pList.get(Constants.PR_COLOR).getColor(getUserAgent());

Lines 41-67 Link Here

(-)src/java/org/apache/fop/fo/flow/InlineContainer.java (-28 / +15 lines)
41	public class InlineContainer extends FObj {	41	public class InlineContainer extends FObj {
42		42
43	// The value of properties relevant for fo:inline-container.	43	// The value of properties relevant for fo:inline-container.
44	private CommonBorderPaddingBackground commonBorderPaddingBackground;
45	private CommonMarginInline commonMarginInline;
46	private CommonRelativePosition commonRelativePosition;
47	private Length alignmentAdjust;	44	private Length alignmentAdjust;
48	private int alignmentBaseline;	45	private int alignmentBaseline;
49	private Length baselineShift;	46	private Length baselineShift;
50	private LengthRangeProperty blockProgressionDimension;
51	// private ToBeImplementedProperty clip;	47	// private ToBeImplementedProperty clip;
52	private int displayAlign;
53	private int dominantBaseline;	48	private int dominantBaseline;
54	private Length height;
55	private String id;	49	private String id;
56	private LengthRangeProperty inlineProgressionDimension;
57	private KeepProperty keepTogether;
58	private KeepProperty keepWithNext;
59	private KeepProperty keepWithPrevious;
60	private SpaceProperty lineHeight;	50	private SpaceProperty lineHeight;
61	private int overflow;	51	// Unused but valid items, commented out for performance:
62	private Numeric referenceOrientation;	52	// private CommonBorderPaddingBackground commonBorderPaddingBackground;
63	private Length width;	53	// private CommonMarginInline commonMarginInline;
64	private int writingMode;	54	// private CommonRelativePosition commonRelativePosition;
		55	// private LengthRangeProperty blockProgressionDimension;
		56	// private int displayAlign;
		57	// private Length height;
		58	// private LengthRangeProperty inlineProgressionDimension;
		59	// private KeepProperty keepTogether;
		60	// private KeepProperty keepWithNext;
		61	// private KeepProperty keepWithPrevious;
		62	// private int overflow;
		63	// private Numeric referenceOrientation;
		64	// private Length width;
		65	// private int writingMode;
65	// End of property values	66	// End of property values
66		67
67	/** used for FO validation */	68	/** used for FO validation */
Lines 78-104 Link Here
78	* @see org.apache.fop.fo.FObj#bind(PropertyList)	79	* @see org.apache.fop.fo.FObj#bind(PropertyList)
79	*/	80	*/
80	public void bind(PropertyList pList) throws FOPException {	81	public void bind(PropertyList pList) throws FOPException {
81	commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
82	commonMarginInline = pList.getMarginInlineProps();
83	commonRelativePosition = pList.getRelativePositionProps();
84	alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST).getLength();	82	alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST).getLength();
85	alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE).getEnum();	83	alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE).getEnum();
86	baselineShift = pList.get(PR_BASELINE_SHIFT).getLength();	84	baselineShift = pList.get(PR_BASELINE_SHIFT).getLength();
87	blockProgressionDimension = pList.get(PR_BLOCK_PROGRESSION_DIMENSION).getLengthRange();
88	// clip = pList.get(PR_CLIP);	85	// clip = pList.get(PR_CLIP);
89	displayAlign = pList.get(PR_DISPLAY_ALIGN).getEnum();
90	dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum();	86	dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum();
91	height = pList.get(PR_HEIGHT).getLength();
92	id = pList.get(PR_ID).getString();	87	id = pList.get(PR_ID).getString();
93	inlineProgressionDimension = pList.get(PR_INLINE_PROGRESSION_DIMENSION).getLengthRange();
94	keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();
95	keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
96	keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();
97	lineHeight = pList.get(PR_LINE_HEIGHT).getSpace();	88	lineHeight = pList.get(PR_LINE_HEIGHT).getSpace();
98	overflow = pList.get(PR_OVERFLOW).getEnum();
99	referenceOrientation = pList.get(PR_REFERENCE_ORIENTATION).getNumeric();
100	width = pList.get(PR_WIDTH).getLength();
101	writingMode = pList.get(PR_WRITING_MODE).getEnum();
102	}	89	}
103		90
104	/**	91	/**

Lines 39-58 Link Here

(-)src/java/org/apache/fop/fo/flow/ListBlock.java (-15 / +7 lines)
39	*/	39	*/
40	public class ListBlock extends FObj {	40	public class ListBlock extends FObj {
41	// The value of properties relevant for fo:list-block.	41	// The value of properties relevant for fo:list-block.
42	private CommonAccessibility commonAccessibility;
43	private CommonAural commonAural;
44	private CommonBorderPaddingBackground commonBorderPaddingBackground;	42	private CommonBorderPaddingBackground commonBorderPaddingBackground;
45	private CommonMarginBlock commonMarginBlock;	43	private CommonMarginBlock commonMarginBlock;
46	private CommonRelativePosition commonRelativePosition;
47	private int breakAfter;	44	private int breakAfter;
48	private int breakBefore;	45	private int breakBefore;
49	private String id;	46	private String id;
50	private int intrusionDisplace;
51	private KeepProperty keepTogether;	47	private KeepProperty keepTogether;
52	private KeepProperty keepWithNext;	48	private KeepProperty keepWithNext;
53	private KeepProperty keepWithPrevious;	49	private KeepProperty keepWithPrevious;
54	private Length provisionalDistanceBetweenStarts;	50	// Unused but valid items, commented out for performance:
55	private Length provisionalLabelSeparation;	51	// private CommonAccessibility commonAccessibility;
		52	// private CommonAural commonAural;
		53	// private CommonRelativePosition commonRelativePosition;
		54	// private int intrusionDisplace;
		55	// private Length provisionalDistanceBetweenStarts;
		56	// private Length provisionalLabelSeparation;
56	// End of property values	57	// End of property values
57		58
58	/** extension properties */	59	/** extension properties */
Lines 73-95 Link Here
73	* @see org.apache.fop.fo.FObj#bind(PropertyList)	74	* @see org.apache.fop.fo.FObj#bind(PropertyList)
74	*/	75	*/
75	public void bind(PropertyList pList) throws FOPException {	76	public void bind(PropertyList pList) throws FOPException {
76	commonAccessibility = pList.getAccessibilityProps();
77	commonAural = pList.getAuralProps();
78	commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();	77	commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
79	commonMarginBlock = pList.getMarginBlockProps();	78	commonMarginBlock = pList.getMarginBlockProps();
80	commonRelativePosition = pList.getRelativePositionProps();
81	breakAfter = pList.get(PR_BREAK_AFTER).getEnum();	79	breakAfter = pList.get(PR_BREAK_AFTER).getEnum();
82	breakBefore = pList.get(PR_BREAK_BEFORE).getEnum();	80	breakBefore = pList.get(PR_BREAK_BEFORE).getEnum();
83	id = pList.get(PR_ID).getString();	81	id = pList.get(PR_ID).getString();
84	intrusionDisplace = pList.get(PR_INTRUSION_DISPLACE).getEnum();
85	keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();	82	keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();
86	keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();	83	keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
87	keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();	84	keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();
88	provisionalDistanceBetweenStarts = pList.get(
89	PR_PROVISIONAL_DISTANCE_BETWEEN_STARTS).getLength();
90	provisionalLabelSeparation = pList.get(
91	PR_PROVISIONAL_LABEL_SEPARATION).getLength();
92
93	//Bind extension properties	85	//Bind extension properties
94	widowContentLimit = pList.get(PR_X_WIDOW_CONTENT_LIMIT).getLength();	86	widowContentLimit = pList.get(PR_X_WIDOW_CONTENT_LIMIT).getLength();
95	orphanContentLimit = pList.get(PR_X_ORPHAN_CONTENT_LIMIT).getLength();	87	orphanContentLimit = pList.get(PR_X_ORPHAN_CONTENT_LIMIT).getLength();

Lines 40-67 Link Here

(-)src/java/org/apache/fop/fo/flow/TableCell.java (-19 / +11 lines)
40	*/	40	*/
41	public class TableCell extends TableFObj {	41	public class TableCell extends TableFObj {
42	// The value of properties relevant for fo:table-cell.	42	// The value of properties relevant for fo:table-cell.
43	private CommonAccessibility commonAccessibility;
44	private CommonAural commonAural;
45	private CommonBorderPaddingBackground commonBorderPaddingBackground;	43	private CommonBorderPaddingBackground commonBorderPaddingBackground;
46	private CommonRelativePosition commonRelativePosition;
47	private LengthRangeProperty blockProgressionDimension;	44	private LengthRangeProperty blockProgressionDimension;
48	private int columnNumber;	45	private int columnNumber;
49	private int displayAlign;	46	private int displayAlign;
50	private int relativeAlign;
51	private int emptyCells;	47	private int emptyCells;
52	private int endsRow;	48	private int endsRow;
53	private Length height;
54	private String id;	49	private String id;
55	private LengthRangeProperty inlineProgressionDimension;
56	private int numberColumnsSpanned;	50	private int numberColumnsSpanned;
57	private int numberRowsSpanned;	51	private int numberRowsSpanned;
58	private int startsRow;	52	private int startsRow;
59	private Length width;	53	private Length width;
60	private KeepProperty keepTogether;	54	// Unused but valid items, commented out for performance:
61	private KeepProperty keepWithNext;	55	// private CommonAccessibility commonAccessibility;
62	private KeepProperty keepWithPrevious;	56	// private CommonAural commonAural;
		57	// private CommonRelativePosition commonRelativePosition;
		58	// private int relativeAlign;
		59	// private Length height;
		60	// private LengthRangeProperty inlineProgressionDimension;
		61	// private KeepProperty keepTogether;
		62	// private KeepProperty keepWithNext;
		63	// private KeepProperty keepWithPrevious;
63	// End of property values	64	// End of property values
64		65
65	/** used for FO validation */	66	/** used for FO validation */
66	private boolean blockItemFound = false;	67	private boolean blockItemFound = false;
67		68
Lines 106-131 Link Here
106	* @see org.apache.fop.fo.FObj#bind(PropertyList)	107	* @see org.apache.fop.fo.FObj#bind(PropertyList)
107	*/	108	*/
108	public void bind(PropertyList pList) throws FOPException {	109	public void bind(PropertyList pList) throws FOPException {
109	commonAccessibility = pList.getAccessibilityProps();
110	commonAural = pList.getAuralProps();
111	commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();	110	commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
112	commonRelativePosition = pList.getRelativePositionProps();
113	blockProgressionDimension = pList.get(PR_BLOCK_PROGRESSION_DIMENSION).getLengthRange();	111	blockProgressionDimension = pList.get(PR_BLOCK_PROGRESSION_DIMENSION).getLengthRange();
114	displayAlign = pList.get(PR_DISPLAY_ALIGN).getEnum();	112	displayAlign = pList.get(PR_DISPLAY_ALIGN).getEnum();
115	relativeAlign = pList.get(PR_RELATIVE_ALIGN).getEnum();
116	emptyCells = pList.get(PR_EMPTY_CELLS).getEnum();	113	emptyCells = pList.get(PR_EMPTY_CELLS).getEnum();
117	endsRow = pList.get(PR_ENDS_ROW).getEnum();	114	endsRow = pList.get(PR_ENDS_ROW).getEnum();
118	height = pList.get(PR_HEIGHT).getLength();
119	id = pList.get(PR_ID).getString();	115	id = pList.get(PR_ID).getString();
120	inlineProgressionDimension = pList.get(PR_INLINE_PROGRESSION_DIMENSION).getLengthRange();
121	columnNumber = pList.get(PR_COLUMN_NUMBER).getNumeric().getValue();	116	columnNumber = pList.get(PR_COLUMN_NUMBER).getNumeric().getValue();
122	numberColumnsSpanned = pList.get(PR_NUMBER_COLUMNS_SPANNED).getNumeric().getValue();	117	numberColumnsSpanned = pList.get(PR_NUMBER_COLUMNS_SPANNED).getNumeric().getValue();
123	numberRowsSpanned = pList.get(PR_NUMBER_ROWS_SPANNED).getNumeric().getValue();	118	numberRowsSpanned = pList.get(PR_NUMBER_ROWS_SPANNED).getNumeric().getValue();
124	startsRow = pList.get(PR_STARTS_ROW).getEnum();	119	startsRow = pList.get(PR_STARTS_ROW).getEnum();
125	width = pList.get(PR_WIDTH).getLength();	120	width = pList.get(PR_WIDTH).getLength();
126	keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();
127	keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
128	keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();
129		121
130	super.bind(pList);	122	super.bind(pList);
131	}	123	}

Lines 40-59 Link Here

(-)src/java/org/apache/fop/fo/flow/TableAndCaption.java (-26 / +14 lines)
40	*/	40	*/
41	public class TableAndCaption extends FObj {	41	public class TableAndCaption extends FObj {
42	// The value of properties relevant for fo:table-and-caption.	42	// The value of properties relevant for fo:table-and-caption.
43	private CommonAccessibility commonAccessibility;
44	private CommonAural commonAural;
45	private CommonBorderPaddingBackground commonBorderPaddingBackground;
46	private CommonMarginBlock commonMarginBlock;
47	private CommonRelativePosition commonRelativePosition;
48	private int breakAfter;
49	private int breakBefore;
50	private int captionSide;
51	private String id;	43	private String id;
52	private int intrusionDisplace;	44	// Unused but valid items, commented out for performance:
53	private KeepProperty keepTogether;	45	// private CommonAccessibility commonAccessibility;
54	private KeepProperty keepWithNext;	46	// private CommonAural commonAural;
55	private KeepProperty keepWithPrevious;	47	// private CommonBorderPaddingBackground commonBorderPaddingBackground;
56	private int textAlign;	48	// private CommonMarginBlock commonMarginBlock;
		49	// private CommonRelativePosition commonRelativePosition;
		50	// private int breakAfter;
		51	// private int breakBefore;
		52	// private int captionSide;
		53	// private int intrusionDisplace;
		54	// private KeepProperty keepTogether;
		55	// private KeepProperty keepWithNext;
		56	// private KeepProperty keepWithPrevious;
		57	// private int textAlign;
57	// End of property values	58	// End of property values
58		59
59	static boolean notImplementedWarningGiven = false;	60	static boolean notImplementedWarningGiven = false;
Lines 78-97 Link Here
78	* @see org.apache.fop.fo.FObj#bind(PropertyList)	79	* @see org.apache.fop.fo.FObj#bind(PropertyList)
79	*/	80	*/
80	public void bind(PropertyList pList) throws FOPException {	81	public void bind(PropertyList pList) throws FOPException {
81	commonAccessibility = pList.getAccessibilityProps();
82	commonAural = pList.getAuralProps();
83	commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
84	commonMarginBlock = pList.getMarginBlockProps();
85	commonRelativePosition = pList.getRelativePositionProps();
86	breakAfter = pList.get(PR_BREAK_AFTER).getEnum();
87	breakBefore = pList.get(PR_BREAK_BEFORE).getEnum();
88	captionSide = pList.get(PR_CAPTION_SIDE).getEnum();
89	id = pList.get(PR_ID).getString();	82	id = pList.get(PR_ID).getString();
90	intrusionDisplace = pList.get(PR_INTRUSION_DISPLACE).getEnum();
91	keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();
92	keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
93	keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();
94	textAlign = pList.get(PR_TEXT_ALIGN).getEnum();
95	}	83	}
96		84
97	/**	85	/**

Lines 38-56 Link Here

(-)src/java/org/apache/fop/fo/flow/ListItem.java (-10 / +6 lines)
38	*/	38	*/
39	public class ListItem extends FObj {	39	public class ListItem extends FObj {
40	// The value of properties relevant for fo:list-item.	40	// The value of properties relevant for fo:list-item.
41	private CommonAccessibility commonAccessibility;
42	private CommonAural commonAural;
43	private CommonBorderPaddingBackground commonBorderPaddingBackground;	41	private CommonBorderPaddingBackground commonBorderPaddingBackground;
44	private CommonMarginBlock commonMarginBlock;	42	private CommonMarginBlock commonMarginBlock;
45	private CommonRelativePosition commonRelativePosition;
46	private int breakAfter;	43	private int breakAfter;
47	private int breakBefore;	44	private int breakBefore;
48	private String id;	45	private String id;
49	private int intrusionDisplace;
50	private KeepProperty keepTogether;	46	private KeepProperty keepTogether;
51	private KeepProperty keepWithNext;	47	private KeepProperty keepWithNext;
52	private KeepProperty keepWithPrevious;	48	private KeepProperty keepWithPrevious;
53	private int relativeAlign;	49	// Unused but valid items, commented out for performance:
		50	// private CommonAccessibility commonAccessibility;
		51	// private CommonAural commonAural;
		52	// private CommonRelativePosition commonRelativePosition;
		53	// private int intrusionDisplace;
		54	// private int relativeAlign;
54	// End of property values	55	// End of property values
55		56
56	private ListItemLabel label = null;	57	private ListItemLabel label = null;
Lines 67-85 Link Here
67	* @see org.apache.fop.fo.FObj#bind(PropertyList)	68	* @see org.apache.fop.fo.FObj#bind(PropertyList)
68	*/	69	*/
69	public void bind(PropertyList pList) throws FOPException {	70	public void bind(PropertyList pList) throws FOPException {
70	commonAccessibility = pList.getAccessibilityProps();
71	commonAural = pList.getAuralProps();
72	commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();	71	commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
73	commonMarginBlock = pList.getMarginBlockProps();	72	commonMarginBlock = pList.getMarginBlockProps();
74	commonRelativePosition = pList.getRelativePositionProps();
75	breakAfter = pList.get(PR_BREAK_AFTER).getEnum();	73	breakAfter = pList.get(PR_BREAK_AFTER).getEnum();
76	breakBefore = pList.get(PR_BREAK_BEFORE).getEnum();	74	breakBefore = pList.get(PR_BREAK_BEFORE).getEnum();
77	id = pList.get(PR_ID).getString();	75	id = pList.get(PR_ID).getString();
78	intrusionDisplace = pList.get(PR_INTRUSION_DISPLACE).getEnum();
79	keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();	76	keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();
80	keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();	77	keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
81	keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();	78	keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();
82	relativeAlign = pList.get(PR_RELATIVE_ALIGN).getEnum();
83	}	79	}
84		80
85	/**	81	/**

Lines 37-52 Link Here

(-)src/java/org/apache/fop/fo/flow/Leader.java (-12 / +7 lines)
37	public class Leader extends InlineLevel {	37	public class Leader extends InlineLevel {
38	// The value of properties relevant for fo:leader.	38	// The value of properties relevant for fo:leader.
39	// See also superclass InlineLevel	39	// See also superclass InlineLevel
40	private CommonRelativePosition commonRelativePosition;
41	private Length alignmentAdjust;	40	private Length alignmentAdjust;
42	private int alignmentBaseline;	41	private int alignmentBaseline;
43	private Length baselineShift;	42	private Length baselineShift;
44	private int dominantBaseline;	43	private int dominantBaseline;
45	private Length textDepth;
46	private Length textAltitude;
47	private String id;	44	private String id;
48	private KeepProperty keepWithNext;
49	private KeepProperty keepWithPrevious;
50	private int leaderAlignment;	45	private int leaderAlignment;
51	private LengthRangeProperty leaderLength;	46	private LengthRangeProperty leaderLength;
52	private int leaderPattern;	47	private int leaderPattern;
Lines 55-61 Link Here
55	private Length ruleThickness;	50	private Length ruleThickness;
56	// private ToBeImplementedProperty letterSpacing;	51	// private ToBeImplementedProperty letterSpacing;
57	// private ToBeImplementedProperty textShadow;	52	// private ToBeImplementedProperty textShadow;
58	private SpaceProperty wordSpacing;	53	// Unused but valid items, commented out for performance:
		54	// private CommonRelativePosition commonRelativePosition;
		55	// private Length textDepth;
		56	// private Length textAltitude;
		57	// private KeepProperty keepWithNext;
		58	// private KeepProperty keepWithPrevious;
		59	// private SpaceProperty wordSpacing;
59	// End of property values	60	// End of property values
60		61
61	/**	62	/**
Lines 70-85 Link Here
70	*/	71	*/
71	public void bind(PropertyList pList) throws FOPException {	72	public void bind(PropertyList pList) throws FOPException {
72	super.bind(pList);	73	super.bind(pList);
73	commonRelativePosition = pList.getRelativePositionProps();
74	alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST).getLength();	74	alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST).getLength();
75	alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE).getEnum();	75	alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE).getEnum();
76	baselineShift = pList.get(PR_BASELINE_SHIFT).getLength();	76	baselineShift = pList.get(PR_BASELINE_SHIFT).getLength();
77	dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum();	77	dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum();
78	textDepth = pList.get(PR_TEXT_DEPTH).getLength();
79	textAltitude = pList.get(PR_TEXT_ALTITUDE).getLength();
80	id = pList.get(PR_ID).getString();	78	id = pList.get(PR_ID).getString();
81	keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
82	keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();
83	leaderAlignment = pList.get(PR_LEADER_ALIGNMENT).getEnum();	79	leaderAlignment = pList.get(PR_LEADER_ALIGNMENT).getEnum();
84	leaderLength = pList.get(PR_LEADER_LENGTH).getLengthRange();	80	leaderLength = pList.get(PR_LEADER_LENGTH).getLengthRange();
85	leaderPattern = pList.get(PR_LEADER_PATTERN).getEnum();	81	leaderPattern = pList.get(PR_LEADER_PATTERN).getEnum();
Lines 105-111 Link Here
105	}	101	}
106	// letterSpacing = pList.get(PR_LETTER_SPACING);	102	// letterSpacing = pList.get(PR_LETTER_SPACING);
107	// textShadow = pList.get(PR_TEXT_SHADOW);	103	// textShadow = pList.get(PR_TEXT_SHADOW);
108	wordSpacing = pList.get(PR_WORD_SPACING).getSpace();
109	}	104	}
110		105
111	/**	106	/**

Lines 57-92 Link Here

(-)src/java/org/apache/fop/fo/flow/Character.java (-24 / +13 lines)
57	*/	57	*/
58	public class Character extends FObj {	58	public class Character extends FObj {
59	// The value of properties relevant for fo:character.	59	// The value of properties relevant for fo:character.
60	private CommonAural commonAural;
61	private CommonBorderPaddingBackground commonBorderPaddingBackground;	60	private CommonBorderPaddingBackground commonBorderPaddingBackground;
62	private CommonFont commonFont;	61	private CommonFont commonFont;
63	private CommonHyphenation commonHyphenation;	62	private CommonHyphenation commonHyphenation;
64	private CommonMarginInline commonMarginInline;
65	private CommonRelativePosition commonRelativePosition;
66	private Length alignmentAdjust;	63	private Length alignmentAdjust;
67	private int treatAsWordSpace;
68	private int alignmentBaseline;	64	private int alignmentBaseline;
69	private Length baselineShift;	65	private Length baselineShift;
70	private char character;	66	private char character;
71	private Color color;	67	private Color color;
72	private int dominantBaseline;	68	private int dominantBaseline;
73	private Length textDepth;
74	private Length textAltitude;
75	// private ToBeImplementedProperty glyphOrientationHorizontal;	69	// private ToBeImplementedProperty glyphOrientationHorizontal;
76	// private ToBeImplementedProperty glyphOrientationVertical;	70	// private ToBeImplementedProperty glyphOrientationVertical;
77	private String id;	71	private String id;
78	private KeepProperty keepWithNext;
79	private KeepProperty keepWithPrevious;
80	private Property letterSpacing;	72	private Property letterSpacing;
81	private SpaceProperty lineHeight;	73	private SpaceProperty lineHeight;
82	private int scoreSpaces;
83	private int suppressAtLineBreak;
84	/** Holds the text decoration values. May be null */	74	/** Holds the text decoration values. May be null */
85	private CommonTextDecoration textDecoration;	75	private CommonTextDecoration textDecoration;
86	// private ToBeImplementedProperty textShadow;	76	// private ToBeImplementedProperty textShadow;
87	private int textTransform;
88	private int visibility;
89	private Property wordSpacing;	77	private Property wordSpacing;
		78	// Unused but valid items, commented out for performance:
		79	// private CommonAural commonAural;
		80	// private CommonMarginInline commonMarginInline;
		81	// private CommonRelativePosition commonRelativePosition;
		82	// private int treatAsWordSpace;
		83	// private Length textDepth;
		84	// private Length textAltitude;
		85	// private KeepProperty keepWithNext;
		86	// private KeepProperty keepWithPrevious;
		87	// private int scoreSpaces;
		88	// private int suppressAtLineBreak;
		89	// private int textTransform;
		90	// private int visibility;
90	// End of property values	91	// End of property values
91		92
92	/** constant indicating that the character is OK */	93	/** constant indicating that the character is OK */
Lines 105-139 Link Here
105	* @see org.apache.fop.fo.FObj#bind(PropertyList)	106	* @see org.apache.fop.fo.FObj#bind(PropertyList)
106	*/	107	*/
107	public void bind(PropertyList pList) throws FOPException {	108	public void bind(PropertyList pList) throws FOPException {
108	commonAural = pList.getAuralProps();
109	commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();	109	commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
110	commonFont = pList.getFontProps();	110	commonFont = pList.getFontProps();
111	commonHyphenation = pList.getHyphenationProps();	111	commonHyphenation = pList.getHyphenationProps();
112	commonMarginInline = pList.getMarginInlineProps();
113	commonRelativePosition = pList.getRelativePositionProps();
114		112
115	alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST).getLength();	113	alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST).getLength();
116	treatAsWordSpace = pList.get(PR_TREAT_AS_WORD_SPACE).getEnum();
117	alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE).getEnum();	114	alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE).getEnum();
118	baselineShift = pList.get(PR_BASELINE_SHIFT).getLength();	115	baselineShift = pList.get(PR_BASELINE_SHIFT).getLength();
119	character = pList.get(PR_CHARACTER).getCharacter();	116	character = pList.get(PR_CHARACTER).getCharacter();
120	color = pList.get(PR_COLOR).getColor(getUserAgent());	117	color = pList.get(PR_COLOR).getColor(getUserAgent());
121	dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum();	118	dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum();
122	textDepth = pList.get(PR_TEXT_DEPTH).getLength();
123	textAltitude = pList.get(PR_TEXT_ALTITUDE).getLength();
124	// glyphOrientationHorizontal = pList.get(PR_GLYPH_ORIENTATION_HORIZONTAL);	119	// glyphOrientationHorizontal = pList.get(PR_GLYPH_ORIENTATION_HORIZONTAL);
125	// glyphOrientationVertical = pList.get(PR_GLYPH_ORIENTATION_VERTICAL);	120	// glyphOrientationVertical = pList.get(PR_GLYPH_ORIENTATION_VERTICAL);
126	id = pList.get(PR_ID).getString();	121	id = pList.get(PR_ID).getString();
127	keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
128	keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();
129	letterSpacing = pList.get(PR_LETTER_SPACING);	122	letterSpacing = pList.get(PR_LETTER_SPACING);
130	lineHeight = pList.get(PR_LINE_HEIGHT).getSpace();	123	lineHeight = pList.get(PR_LINE_HEIGHT).getSpace();
131	scoreSpaces = pList.get(PR_SCORE_SPACES).getEnum();
132	suppressAtLineBreak = pList.get(PR_SUPPRESS_AT_LINE_BREAK).getEnum();
133	textDecoration = pList.getTextDecorationProps();	124	textDecoration = pList.getTextDecorationProps();
134	// textShadow = pList.get(PR_TEXT_SHADOW);	125	// textShadow = pList.get(PR_TEXT_SHADOW);
135	textTransform = pList.get(PR_TEXT_TRANSFORM).getEnum();
136	visibility = pList.get(PR_VISIBILITY).getEnum();
137	wordSpacing = pList.get(PR_WORD_SPACING);	126	wordSpacing = pList.get(PR_WORD_SPACING);
138	}	127	}
139		128