Author: lbernardo
Date: Mon Nov 17 15:59:43 2014
New Revision: 1640175
URL: http://svn.apache.org/r1640175
Log:
skip float if inside a table and emit warning
Modified:
xmlgraphics/fop/branches/Temp_BasicSideFloats/src/java/org/apache/fop/fo/flow/Float.java
xmlgraphics/fop/branches/Temp_BasicSideFloats/src/java/org/apache/fop/layoutmgr/inline/FloatLayoutManager.java
Modified:
xmlgraphics/fop/branches/Temp_BasicSideFloats/src/java/org/apache/fop/fo/flow/Float.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_BasicSideFloats/src/java/org/apache/fop/fo/flow/Float.java?rev=1640175&r1=1640174&r2=1640175&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_BasicSideFloats/src/java/org/apache/fop/fo/flow/Float.java
(original)
+++
xmlgraphics/fop/branches/Temp_BasicSideFloats/src/java/org/apache/fop/fo/flow/Float.java
Mon Nov 17 15:59:43 2014
@@ -20,6 +20,7 @@
package org.apache.fop.fo.flow;
// XML
+import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.apache.fop.apps.FOPException;
@@ -38,6 +39,7 @@ public class Float extends FObj {
private int clear;
// End of property values
private boolean inWhiteSpace;
+ private boolean disabled;
/**
* Base constructor
@@ -99,4 +101,18 @@ public class Float extends FObj {
public boolean getInWhiteSpace() {
return inWhiteSpace;
}
+
+ public void processNode(String elementName, Locator locator, Attributes
attlist, PropertyList pList)
+ throws FOPException {
+ if (findAncestor(FO_TABLE) > 0) {
+ disabled = true;
+ getFOValidationEventProducer().unimplementedFeature(this,
"fo:table", getName(), getLocator());
+ } else {
+ super.processNode(elementName, locator, attlist, pList);
+ }
+ }
+
+ public boolean isDisabled() {
+ return disabled;
+ }
}
Modified:
xmlgraphics/fop/branches/Temp_BasicSideFloats/src/java/org/apache/fop/layoutmgr/inline/FloatLayoutManager.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_BasicSideFloats/src/java/org/apache/fop/layoutmgr/inline/FloatLayoutManager.java?rev=1640175&r1=1640174&r2=1640175&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_BasicSideFloats/src/java/org/apache/fop/layoutmgr/inline/FloatLayoutManager.java
(original)
+++
xmlgraphics/fop/branches/Temp_BasicSideFloats/src/java/org/apache/fop/layoutmgr/inline/FloatLayoutManager.java
Mon Nov 17 15:59:43 2014
@@ -53,7 +53,7 @@ public class FloatLayoutManager extends
public LinkedList getNextKnuthElements(LayoutContext context, int
alignment) {
- if (!floatContentAreaAdded) {
+ if (!floatContentAreaAdded && !floatContent.isDisabled()) {
floatContentLM = new FloatContentLayoutManager(floatContent);
floatContentLM.setParent(this);
floatContentLM.initialize();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
