Attachment #26704 for bug #50852

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




    private int scaling;
    private int textAlign;
    private Length width;
    private String role;   // used for accessibility
    private String ptr;   // used for accessibility
    private String altText;
    // Unused but valid items, commented out for performance:
    //     private CommonAccessibility commonAccessibility;
    //     private CommonAural commonAural;

        height = pList.get(PR_HEIGHT).getLength();
        id = pList.get(PR_ID).getString();
        ptr = pList.get(PR_X_PTR).getString();   // used for accessibility
        role = pList.get(PR_ROLE).getString(); // used for accessibility
        inlineProgressionDimension = pList.get(PR_INLINE_PROGRESSION_DIMENSION).getLengthRange();
        keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
        keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();

        textAlign = pList.get(PR_TEXT_ALIGN).getEnum();
        width = pList.get(PR_WIDTH).getLength();
        if (getUserAgent().isAccessibilityEnabled()) {
            altText = pList.get(PR_X_ALT_TEXT).getString();
            if (altText.equals("")) {
                getFOValidationEventProducer().altTextMissing(this, getLocalName(), getLocator());
            }

Lines 36-41 import org.apache.fop.fo.properties.KeepProperty; Link Here

(-)a/src/java/org/apache/fop/fo/flow/AbstractListItemPart.java (+2 lines)
36	public abstract class AbstractListItemPart extends FObj {	36	public abstract class AbstractListItemPart extends FObj {
37	// The value of properties relevant for fo:list-item-label and fo:list-item-body.	37	// The value of properties relevant for fo:list-item-label and fo:list-item-body.
38	private KeepProperty keepTogether;	38	private KeepProperty keepTogether;
		39	private String role; // used for accessibility
39	// Valid properties, commented out for performance:	40	// Valid properties, commented out for performance:
40	// private CommonAccessibility commonAccessibility;	41	// private CommonAccessibility commonAccessibility;
41	// End of property values	42	// End of property values
Lines 56-61 public abstract class AbstractListItemPart extends FObj { Link Here
56	public void bind(PropertyList pList) throws FOPException {	57	public void bind(PropertyList pList) throws FOPException {
57	super.bind(pList);	58	super.bind(pList);
58	keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();	59	keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();
		60	role = pList.get(PR_ROLE).getString(); // used for accessibility
59	}	61	}
60		62
61	/**	63	/**

Lines 56-61 public class BlockContainer extends FObj implements BreakPropertySet { Link Here

(-)a/src/java/org/apache/fop/fo/flow/BlockContainer.java (+2 lines)
56	private int span;	56	private int span;
57	private int disableColumnBalancing;	57	private int disableColumnBalancing;
58	private int writingMode;	58	private int writingMode;
		59	private String role; // used for accessibility
59	// Unused but valid items, commented out for performance:	60	// Unused but valid items, commented out for performance:
60	// private int intrusionDisplace;	61	// private int intrusionDisplace;
61	// private Numeric zIndex;	62	// private Numeric zIndex;
Lines 94-99 public class BlockContainer extends FObj implements BreakPropertySet { Link Here
94	span = pList.get(PR_SPAN).getEnum();	95	span = pList.get(PR_SPAN).getEnum();
95	writingMode = pList.get(PR_WRITING_MODE).getEnum();	96	writingMode = pList.get(PR_WRITING_MODE).getEnum();
96	disableColumnBalancing = pList.get(PR_X_DISABLE_COLUMN_BALANCING).getEnum();	97	disableColumnBalancing = pList.get(PR_X_DISABLE_COLUMN_BALANCING).getEnum();
		98	role = pList.get(PR_ROLE).getString(); // used for accessibility
97	}	99	}
98		100
99	/** {@inheritDoc} */	101	/** {@inheritDoc} */

Lines 63-68 public class Character extends FObj implements StructurePointerPropertySet { Link Here

(-)a/src/java/org/apache/fop/fo/flow/Character.java (+2 lines)
63	private CommonTextDecoration textDecoration;	63	private CommonTextDecoration textDecoration;
64	// private ToBeImplementedProperty textShadow;	64	// private ToBeImplementedProperty textShadow;
65	private Property wordSpacing;	65	private Property wordSpacing;
		66	private String role; // used for accessibility
66	private String ptr; // used for accessibility	67	private String ptr; // used for accessibility
67	// Unused but valid items, commented out for performance:	68	// Unused but valid items, commented out for performance:
68	// private CommonAural commonAural;	69	// private CommonAural commonAural;
Lines 111-116 public class Character extends FObj implements StructurePointerPropertySet { Link Here
111	textDecoration = pList.getTextDecorationProps();	112	textDecoration = pList.getTextDecorationProps();
112	wordSpacing = pList.get(PR_WORD_SPACING);	113	wordSpacing = pList.get(PR_WORD_SPACING);
113	ptr = pList.get(PR_X_PTR).getString(); // used for accessibility	114	ptr = pList.get(PR_X_PTR).getString(); // used for accessibility
		115	role = pList.get(PR_ROLE).getString(); // used for accessibility
114	}	116	}
115		117
116	/** {@inheritDoc} */	118	/** {@inheritDoc} */

Lines 33-38 import org.apache.fop.fo.ValidationException; Link Here

(-)a/src/java/org/apache/fop/fo/flow/Float.java (-1 / +2 lines)
33	* <code>fo:float</code></a> object.	33	* <code>fo:float</code></a> object.
34	*/	34	*/
35	public class Float extends FObj {	35	public class Float extends FObj {
		36	private String role; // used for accessibility
36	// The value of properties relevant for fo:float (commented out for performance.	37	// The value of properties relevant for fo:float (commented out for performance.
37	// private int float_;	38	// private int float_;
38	// private int clear;	39	// private int clear;
Lines 57-63 public class Float extends FObj { Link Here
57		58
58	/** {@inheritDoc} */	59	/** {@inheritDoc} */
59	public void bind(PropertyList pList) throws FOPException {	60	public void bind(PropertyList pList) throws FOPException {
60	// No active properties -> Nothing to do.	61	role = pList.get(PR_ROLE).getString(); // used for accessibility
61	}	62	}
62		63
63	/**	64	/**

Lines 32-37 import org.apache.fop.fo.ValidationException; Link Here

(-)a/src/java/org/apache/fop/fo/flow/Footnote.java (-1 / +2 lines)
32	* <code>fo:footnote</code></a> object.	32	* <code>fo:footnote</code></a> object.
33	*/	33	*/
34	public class Footnote extends FObj {	34	public class Footnote extends FObj {
		35	private String role; // used for accessibility
35	// The value of properties relevant for fo:footnote (commented out for performance).	36	// The value of properties relevant for fo:footnote (commented out for performance).
36	// private CommonAccessibility commonAccessibility;	37	// private CommonAccessibility commonAccessibility;
37	// End of property values	38	// End of property values
Lines 51-57 public class Footnote extends FObj { Link Here
51		52
52	/** {@inheritDoc} */	53	/** {@inheritDoc} */
53	public void bind(PropertyList pList) throws FOPException {	54	public void bind(PropertyList pList) throws FOPException {
54	// No active properties -> do nothing.	55	role = pList.get(PR_ROLE).getString(); // used for accessibility
55	}	56	}
56		57
57	/** {@inheritDoc} */	58	/** {@inheritDoc} */

Lines 33-38 import org.apache.fop.fo.ValidationException; Link Here

(-)a/src/java/org/apache/fop/fo/flow/FootnoteBody.java (+2 lines)
33	* <code>fo:footnote-body</code></a> object.	33	* <code>fo:footnote-body</code></a> object.
34	*/	34	*/
35	public class FootnoteBody extends FObj {	35	public class FootnoteBody extends FObj {
		36	private String role; // used for accessibility
36	// The value of properties relevant for fo:footnote-body (commented out for perforance).	37	// The value of properties relevant for fo:footnote-body (commented out for perforance).
37	// private CommonAccessibility commonAccessibility;	38	// private CommonAccessibility commonAccessibility;
38	// End of property values	39	// End of property values
Lines 48-53 public class FootnoteBody extends FObj { Link Here
48		49
49	/** {@inheritDoc} */	50	/** {@inheritDoc} */
50	public void bind(PropertyList pList) throws FOPException {	51	public void bind(PropertyList pList) throws FOPException {
		52	role = pList.get(PR_ROLE).getString(); // used for accessibility
51	}	53	}
52		54
53	/** {@inheritDoc} */	55	/** {@inheritDoc} */

Lines 38-43 public class Inline extends InlineLevel implements StructurePointerPropertySet { Link Here

(-)a/src/java/org/apache/fop/fo/flow/Inline.java (+2 lines)
38	private Length alignmentAdjust;	38	private Length alignmentAdjust;
39	private int alignmentBaseline;	39	private int alignmentBaseline;
40	private Length baselineShift;	40	private Length baselineShift;
		41	private String role; // used for accessibility
41	private String ptr; // used for accessibility	42	private String ptr; // used for accessibility
42	private int dominantBaseline;	43	private int dominantBaseline;
43	// Unused but valid items, commented out for performance:	44	// Unused but valid items, commented out for performance:
Lines 69-74 public class Inline extends InlineLevel implements StructurePointerPropertySet { Link Here
69	baselineShift = pList.get(PR_BASELINE_SHIFT).getLength();	70	baselineShift = pList.get(PR_BASELINE_SHIFT).getLength();
70	dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum();	71	dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum();
71	ptr = pList.get(PR_X_PTR).getString(); // used for accessibility	72	ptr = pList.get(PR_X_PTR).getString(); // used for accessibility
		73	role = pList.get(PR_ROLE).getString(); // used for accessibility
72	}	74	}
73		75
74	/** {@inheritDoc} */	76	/** {@inheritDoc} */

Lines 55-60 public class InlineContainer extends FObj { Link Here

(-)a/src/java/org/apache/fop/fo/flow/InlineContainer.java (+2 lines)
55	private int overflow;	55	private int overflow;
56	private Numeric referenceOrientation;	56	private Numeric referenceOrientation;
57	private int writingMode;	57	private int writingMode;
		58	private String role; // used for accessibility
58	// Unused but valid items, commented out for performance:	59	// Unused but valid items, commented out for performance:
59	// private CommonRelativePosition commonRelativePosition;	60	// private CommonRelativePosition commonRelativePosition;
60	// private int displayAlign;	61	// private int displayAlign;
Lines 93-98 public class InlineContainer extends FObj { Link Here
93	overflow = pList.get(PR_OVERFLOW).getEnum();	94	overflow = pList.get(PR_OVERFLOW).getEnum();
94	referenceOrientation = pList.get(PR_REFERENCE_ORIENTATION).getNumeric();	95	referenceOrientation = pList.get(PR_REFERENCE_ORIENTATION).getNumeric();
95	writingMode = pList.get(PR_WRITING_MODE).getEnum();	96	writingMode = pList.get(PR_WRITING_MODE).getEnum();
		97	role = pList.get(PR_ROLE).getString(); // used for accessibility
96	}	98	}
97		99
98	/**	100	/**

Lines 45-50 public class ListBlock extends FObj implements BreakPropertySet { Link Here

(-)a/src/java/org/apache/fop/fo/flow/ListBlock.java (+2 lines)
45	private KeepProperty keepTogether;	45	private KeepProperty keepTogether;
46	private KeepProperty keepWithNext;	46	private KeepProperty keepWithNext;
47	private KeepProperty keepWithPrevious;	47	private KeepProperty keepWithPrevious;
		48	private String role; // used for accessibility
48	// Unused but valid items, commented out for performance:	49	// Unused but valid items, commented out for performance:
49	// private CommonAccessibility commonAccessibility;	50	// private CommonAccessibility commonAccessibility;
50	// private CommonAural commonAural;	51	// private CommonAural commonAural;
Lines 83-88 public class ListBlock extends FObj implements BreakPropertySet { Link Here
83	//Bind extension properties	84	//Bind extension properties
84	widowContentLimit = pList.get(PR_X_WIDOW_CONTENT_LIMIT).getLength();	85	widowContentLimit = pList.get(PR_X_WIDOW_CONTENT_LIMIT).getLength();
85	orphanContentLimit = pList.get(PR_X_ORPHAN_CONTENT_LIMIT).getLength();	86	orphanContentLimit = pList.get(PR_X_ORPHAN_CONTENT_LIMIT).getLength();
		87	role = pList.get(PR_ROLE).getString(); // used for accessibility
86	}	88	}
87		89
88	/** {@inheritDoc} */	90	/** {@inheritDoc} */

Lines 44-49 public class ListItem extends FObj implements BreakPropertySet { Link Here

(-)a/src/java/org/apache/fop/fo/flow/ListItem.java (+2 lines)
44	private KeepProperty keepTogether;	44	private KeepProperty keepTogether;
45	private KeepProperty keepWithNext;	45	private KeepProperty keepWithNext;
46	private KeepProperty keepWithPrevious;	46	private KeepProperty keepWithPrevious;
		47	private String role; // used for accessibility
47	// Unused but valid items, commented out for performance:	48	// Unused but valid items, commented out for performance:
48	// private CommonAccessibility commonAccessibility;	49	// private CommonAccessibility commonAccessibility;
49	// private CommonAural commonAural;	50	// private CommonAural commonAural;
Lines 74-79 public class ListItem extends FObj implements BreakPropertySet { Link Here
74	keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();	75	keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();
75	keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();	76	keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
76	keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();	77	keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();
		78	role = pList.get(PR_ROLE).getString(); // used for accessibility
77	}	79	}
78		80
79	/** {@inheritDoc} */	81	/** {@inheritDoc} */

Lines 42-47 import org.apache.fop.fo.properties.PropertyCache; Link Here

(-)a/src/java/org/apache/fop/fo/flow/Marker.java (+2 lines)
42	public class Marker extends FObjMixed {	42	public class Marker extends FObjMixed {
43	// The value of properties relevant for fo:marker.	43	// The value of properties relevant for fo:marker.
44	private String markerClassName;	44	private String markerClassName;
		45	private String role; // used for accessibility
45	// End of property values	46	// End of property values
46		47
47	private PropertyListMaker savePropertyListMaker;	48	private PropertyListMaker savePropertyListMaker;
Lines 68-73 public class Marker extends FObjMixed { Link Here
68	if (markerClassName == null \|\| markerClassName.equals("")) {	69	if (markerClassName == null \|\| markerClassName.equals("")) {
69	missingPropertyError("marker-class-name");	70	missingPropertyError("marker-class-name");
70	}	71	}
		72	role = pList.get(PR_ROLE).getString(); // used for accessibility
71	}	73	}
72		74
73	/**	75	/**

Lines 48-53 public class PageNumber extends FObj implements StructurePointerPropertySet { Link Here

(-)a/src/java/org/apache/fop/fo/flow/PageNumber.java (+2 lines)
48	private int alignmentBaseline;	48	private int alignmentBaseline;
49	private Length baselineShift;	49	private Length baselineShift;
50	private int dominantBaseline;	50	private int dominantBaseline;
		51	private String role; // used for accessibility
51	private String ptr; // used for accessibility	52	private String ptr; // used for accessibility
52	// private ToBeImplementedProperty letterSpacing;	53	// private ToBeImplementedProperty letterSpacing;
53	private SpaceProperty lineHeight;	54	private SpaceProperty lineHeight;
Lines 95-100 public class PageNumber extends FObj implements StructurePointerPropertySet { Link Here
95	lineHeight = pList.get(PR_LINE_HEIGHT).getSpace();	96	lineHeight = pList.get(PR_LINE_HEIGHT).getSpace();
96	textDecoration = pList.getTextDecorationProps();	97	textDecoration = pList.getTextDecorationProps();
97	ptr = pList.get(PR_X_PTR).getString(); // used for accessibility	98	ptr = pList.get(PR_X_PTR).getString(); // used for accessibility
		99	role = pList.get(PR_ROLE).getString(); // used for accessibility
98	// textShadow = pList.get(PR_TEXT_SHADOW);	100	// textShadow = pList.get(PR_TEXT_SHADOW);
99		101
100	// implicit properties	102	// implicit properties

Lines 26-31 import org.apache.fop.fo.Constants; Link Here

(-)a/src/java/org/apache/fop/fo/flow/Wrapper.java (+8 lines)
26	import org.apache.fop.fo.FONode;	26	import org.apache.fop.fo.FONode;
27	import org.apache.fop.fo.FOText;	27	import org.apache.fop.fo.FOText;
28	import org.apache.fop.fo.FObjMixed;	28	import org.apache.fop.fo.FObjMixed;
		29	import org.apache.fop.fo.PropertyList;
29	import org.apache.fop.fo.ValidationException;	30	import org.apache.fop.fo.ValidationException;
30		31
31	/**	32	/**
Lines 36-41 import org.apache.fop.fo.ValidationException; Link Here
36	*/	37	*/
37	public class Wrapper extends FObjMixed {	38	public class Wrapper extends FObjMixed {
38	// The value of properties relevant for fo:wrapper.	39	// The value of properties relevant for fo:wrapper.
		40	private String role; // used for accessibility
39	// End of property values	41	// End of property values
40		42
41	// used for FO validation	43	// used for FO validation
Lines 51-56 public class Wrapper extends FObjMixed { Link Here
51	super(parent);	53	super(parent);
52	}	54	}
53		55
		56	/** {@inheritDoc} */
		57	public void bind(PropertyList pList) throws FOPException {
		58	super.bind(pList);
		59	role = pList.get(PR_ROLE).getString(); // used for accessibility
		60	}
		61
54	/**	62	/**
55	* {@inheritDoc}	63	* {@inheritDoc}
56	* <br>XSL Content Model: marker* (#PCDATA\|%inline;\|%block;)*	64	* <br>XSL Content Model: marker* (#PCDATA\|%inline;\|%block;)*

Lines 25-30 import org.xml.sax.Locator; Link Here

(-)a/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java (+8 lines)
25	import org.apache.fop.apps.FOPException;	25	import org.apache.fop.apps.FOPException;
26	import org.apache.fop.fo.FONode;	26	import org.apache.fop.fo.FONode;
27	import org.apache.fop.fo.FObj;	27	import org.apache.fop.fo.FObj;
		28	import org.apache.fop.fo.PropertyList;
28	import org.apache.fop.fo.ValidationException;	29	import org.apache.fop.fo.ValidationException;
29		30
30	/**	31	/**
Lines 35-40 import org.apache.fop.fo.ValidationException; Link Here
35	public class TableAndCaption extends FObj /implements BreakPropertySet/ {	36	public class TableAndCaption extends FObj /implements BreakPropertySet/ {
36	// The value of properties relevant for fo:table-and-caption.	37	// The value of properties relevant for fo:table-and-caption.
37	// Unused but valid items, commented out for performance:	38	// Unused but valid items, commented out for performance:
		39	private String role; // used for accessibility
38	// private CommonAccessibility commonAccessibility;	40	// private CommonAccessibility commonAccessibility;
39	// private CommonAural commonAural;	41	// private CommonAural commonAural;
40	// private CommonBorderPaddingBackground commonBorderPaddingBackground;	42	// private CommonBorderPaddingBackground commonBorderPaddingBackground;
Lines 82-87 public class TableAndCaption extends FObj /implements BreakPropertySet/ { Link Here
82	}	84	}
83	}	85	}
84		86
		87	/** {@inheritDoc} */
		88	public void bind(PropertyList pList) throws FOPException {
		89	super.bind(pList);
		90	role = pList.get(PR_ROLE).getString(); // used for accessibility
		91	}
		92
85	/**	93	/**
86	* {@inheritDoc}	94	* {@inheritDoc}
87	* <br>XSL Content Model: marker* table-caption? table	95	* <br>XSL Content Model: marker* table-caption? table




// XML
import org.xml.sax.Locator;

import org.apache.fop.accessibility.StructureElement;
import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;

public class TableCaption extends FObj {
    // The value of properties relevant for fo:table-caption.
    // Unused but valid items, commented out for performance:
    private String role; // used for accessibility
    //     private CommonAural commonAural;
    //     private CommonRelativePosition commonRelativePosition;
    //     private LengthRangeProperty blockProgressionDimension;

    /** {@inheritDoc} */
    public void bind(PropertyList pList) throws FOPException {
        super.bind(pList);
        role = pList.get(PR_ROLE).getString(); // used for accessibility
    }

    /** {@inheritDoc} */




    private Numeric borderBeforePrecedence;
    private Numeric borderEndPrecedence;
    private Numeric borderStartPrecedence;
    protected String role;
    protected String ptr;

    ConditionalBorder borderBefore;             // CSOK: VisibilityModifier
    ConditionalBorder borderAfter;              // CSOK: VisibilityModifier

        borderEndPrecedence = pList.get(PR_BORDER_END_PRECEDENCE).getNumeric();
        borderStartPrecedence = pList.get(PR_BORDER_START_PRECEDENCE).getNumeric();
        ptr = pList.get(PR_X_PTR).getString();
        role = pList.get(PR_ROLE).getString(); // used for accessibility
        if (getNameId() != FO_TABLE //Separate check for fo:table in Table.java
                && getNameId() != FO_TABLE_CELL
                && getCommonBorderPaddingBackground().hasPadding(
- 

Return to bug 50852

Lines 62-68 public abstract class AbstractGraphics extends FObj Link Here

(-)a/src/java/org/apache/fop/fo/flow/AbstractGraphics.java (-1 / +4 lines)
62	private int scaling;	62	private int scaling;
63	private int textAlign;	63	private int textAlign;
64	private Length width;	64	private Length width;
		65	private String role; // used for accessibility
65	private String ptr; // used for accessibility	66	private String ptr; // used for accessibility
		67	private String altText;
66	// Unused but valid items, commented out for performance:	68	// Unused but valid items, commented out for performance:
67	// private CommonAccessibility commonAccessibility;	69	// private CommonAccessibility commonAccessibility;
68	// private CommonAural commonAural;	70	// private CommonAural commonAural;
Lines 98-103 public abstract class AbstractGraphics extends FObj Link Here
98	height = pList.get(PR_HEIGHT).getLength();	100	height = pList.get(PR_HEIGHT).getLength();
99	id = pList.get(PR_ID).getString();	101	id = pList.get(PR_ID).getString();
100	ptr = pList.get(PR_X_PTR).getString(); // used for accessibility	102	ptr = pList.get(PR_X_PTR).getString(); // used for accessibility
		103	role = pList.get(PR_ROLE).getString(); // used for accessibility
101	inlineProgressionDimension = pList.get(PR_INLINE_PROGRESSION_DIMENSION).getLengthRange();	104	inlineProgressionDimension = pList.get(PR_INLINE_PROGRESSION_DIMENSION).getLengthRange();
102	keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();	105	keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
103	keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();	106	keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();
Lines 107-113 public abstract class AbstractGraphics extends FObj Link Here
107	textAlign = pList.get(PR_TEXT_ALIGN).getEnum();	110	textAlign = pList.get(PR_TEXT_ALIGN).getEnum();
108	width = pList.get(PR_WIDTH).getLength();	111	width = pList.get(PR_WIDTH).getLength();
109	if (getUserAgent().isAccessibilityEnabled()) {	112	if (getUserAgent().isAccessibilityEnabled()) {
110	String altText = pList.get(PR_X_ALT_TEXT).getString();	113	altText = pList.get(PR_X_ALT_TEXT).getString();
111	if (altText.equals("")) {	114	if (altText.equals("")) {
112	getFOValidationEventProducer().altTextMissing(this, getLocalName(), getLocator());	115	getFOValidationEventProducer().altTextMissing(this, getLocalName(), getLocator());
113	}	116	}

Lines 73-78 public class Block extends FObjMixed implements BreakPropertySet, StructurePoint Link Here

(-)a/src/java/org/apache/fop/fo/flow/Block.java (+2 lines)
73	private int lineHeightShiftAdjustment;	73	private int lineHeightShiftAdjustment;
74	private int lineStackingStrategy;	74	private int lineStackingStrategy;
75	private Numeric orphans;	75	private Numeric orphans;
		76	private String role; //used for accessibility
76	private String ptr; //used for accessibility	77	private String ptr; //used for accessibility
77	private int whiteSpaceTreatment;	78	private int whiteSpaceTreatment;
78	private int span;	79	private int span;
Lines 126-131 public class Block extends FObjMixed implements BreakPropertySet, StructurePoint Link Here
126	lineStackingStrategy = pList.get(PR_LINE_STACKING_STRATEGY).getEnum();	127	lineStackingStrategy = pList.get(PR_LINE_STACKING_STRATEGY).getEnum();
127	orphans = pList.get(PR_ORPHANS).getNumeric();	128	orphans = pList.get(PR_ORPHANS).getNumeric();
128	ptr = pList.get(PR_X_PTR).getString(); //used for accessibility	129	ptr = pList.get(PR_X_PTR).getString(); //used for accessibility
		130	role = pList.get(PR_ROLE).getString(); // used for accessibility
129	whiteSpaceTreatment = pList.get(PR_WHITE_SPACE_TREATMENT).getEnum();	131	whiteSpaceTreatment = pList.get(PR_WHITE_SPACE_TREATMENT).getEnum();
130	span = pList.get(PR_SPAN).getEnum();	132	span = pList.get(PR_SPAN).getEnum();
131	textAlign = pList.get(PR_TEXT_ALIGN).getEnum();	133	textAlign = pList.get(PR_TEXT_ALIGN).getEnum();

Lines 22-27 package org.apache.fop.fo.flow.table; Link Here

(-)a/src/java/org/apache/fop/fo/flow/table/TableCaption.java (+3 lines)
22	// XML	22	// XML
23	import org.xml.sax.Locator;	23	import org.xml.sax.Locator;
24		24
		25	import org.apache.fop.accessibility.StructureElement;
25	import org.apache.fop.apps.FOPException;	26	import org.apache.fop.apps.FOPException;
26	import org.apache.fop.fo.FONode;	27	import org.apache.fop.fo.FONode;
27	import org.apache.fop.fo.FObj;	28	import org.apache.fop.fo.FObj;
Lines 36-41 import org.apache.fop.fo.ValidationException; Link Here
36	public class TableCaption extends FObj {	37	public class TableCaption extends FObj {
37	// The value of properties relevant for fo:table-caption.	38	// The value of properties relevant for fo:table-caption.
38	// Unused but valid items, commented out for performance:	39	// Unused but valid items, commented out for performance:
		40	private String role; // used for accessibility
39	// private CommonAural commonAural;	41	// private CommonAural commonAural;
40	// private CommonRelativePosition commonRelativePosition;	42	// private CommonRelativePosition commonRelativePosition;
41	// private LengthRangeProperty blockProgressionDimension;	43	// private LengthRangeProperty blockProgressionDimension;
Lines 69-74 public class TableCaption extends FObj { Link Here
69	/** {@inheritDoc} */	71	/** {@inheritDoc} */
70	public void bind(PropertyList pList) throws FOPException {	72	public void bind(PropertyList pList) throws FOPException {
71	super.bind(pList);	73	super.bind(pList);
		74	role = pList.get(PR_ROLE).getString(); // used for accessibility
72	}	75	}
73		76
74	/** {@inheritDoc} */	77	/** {@inheritDoc} */

Lines 48-54 public abstract class TableFObj extends FObj implements StructurePointerProperty Link Here

(-)a/src/java/org/apache/fop/fo/flow/table/TableFObj.java (-2 / +3 lines)
48	private Numeric borderBeforePrecedence;	48	private Numeric borderBeforePrecedence;
49	private Numeric borderEndPrecedence;	49	private Numeric borderEndPrecedence;
50	private Numeric borderStartPrecedence;	50	private Numeric borderStartPrecedence;
51	private String ptr;	51	protected String role;
		52	protected String ptr;
52		53
53	ConditionalBorder borderBefore; // CSOK: VisibilityModifier	54	ConditionalBorder borderBefore; // CSOK: VisibilityModifier
54	ConditionalBorder borderAfter; // CSOK: VisibilityModifier	55	ConditionalBorder borderAfter; // CSOK: VisibilityModifier
Lines 75-80 public abstract class TableFObj extends FObj implements StructurePointerProperty Link Here
75	borderEndPrecedence = pList.get(PR_BORDER_END_PRECEDENCE).getNumeric();	76	borderEndPrecedence = pList.get(PR_BORDER_END_PRECEDENCE).getNumeric();
76	borderStartPrecedence = pList.get(PR_BORDER_START_PRECEDENCE).getNumeric();	77	borderStartPrecedence = pList.get(PR_BORDER_START_PRECEDENCE).getNumeric();
77	ptr = pList.get(PR_X_PTR).getString();	78	ptr = pList.get(PR_X_PTR).getString();
		79	role = pList.get(PR_ROLE).getString(); // used for accessibility
78	if (getNameId() != FO_TABLE //Separate check for fo:table in Table.java	80	if (getNameId() != FO_TABLE //Separate check for fo:table in Table.java
79	&& getNameId() != FO_TABLE_CELL	81	&& getNameId() != FO_TABLE_CELL
80	&& getCommonBorderPaddingBackground().hasPadding(	82	&& getCommonBorderPaddingBackground().hasPadding(
81	-