Author: jeremias
Date: Fri Jun 24 08:08:08 2005
New Revision: 201627
URL: http://svn.apache.org/viewcvs?rev=201627&view=rev
Log:
Check the proper use of the span attribute.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Block.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BlockContainer.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java?rev=201627&r1=201626&r2=201627&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java Fri Jun 24 08:08:08 2005
@@ -27,6 +27,7 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.datatypes.PercentBase;
import org.apache.fop.fo.flow.Marker;
+import org.apache.fop.fo.pagination.Flow;
import org.apache.fop.fo.properties.PropertyMaker;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
@@ -146,6 +147,21 @@
}
}
+ /**
+ * Checks the block-level FO for correct use of the span attribute.
+ * Used by fo:block and fo:block-container.
+ * @param pList the property list to determine if the span is explicit
+ */
+ protected void checkSpanProperty(PropertyList pList) {
+ if (pList.getExplicit(PR_SPAN) != null) {
+ if (!(getParent() instanceof Flow)) {
+ attributeWarning("Ignoring span attribute on " + getName()
+ + " as it's not a direct child of an fo:flow."
+ + " (see XSL 1.0, 7.20.4)");
+ }
+ }
+ }
+
/**
* Returns Out Of Line FO Descendant indicator.
* @return true if Out of Line FO or Out Of Line descendant, false otherwise
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Block.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Block.java?rev=201627&r1=201626&r2=201627&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Block.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Block.java Fri Jun 24 08:08:08 2005
@@ -160,6 +160,8 @@
whiteSpaceCollapse = pList.get(PR_WHITE_SPACE_COLLAPSE).getEnum();
widows = pList.get(PR_WIDOWS).getNumeric();
wrapOption = pList.get(PR_WRAP_OPTION).getEnum();
+
+ checkSpanProperty(pList);
}
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BlockContainer.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BlockContainer.java?rev=201627&r1=201626&r2=201627&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BlockContainer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BlockContainer.java Fri Jun 24 08:08:08 2005
@@ -96,6 +96,8 @@
width = pList.get(PR_WIDTH).getLength();
writingMode = pList.get(PR_WRITING_MODE).getEnum();
zIndex = pList.get(PR_Z_INDEX).getNumeric();
+
+ checkSpanProperty(pList);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org