diff options
| -rw-r--r-- | src/java/org/apache/fop/fo/FObjMixed.java | 11 | ||||
| -rw-r--r-- | src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java | 7 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/java/org/apache/fop/fo/FObjMixed.java b/src/java/org/apache/fop/fo/FObjMixed.java index 4b8bdde73..c1fcfe4ff 100644 --- a/src/java/org/apache/fop/fo/FObjMixed.java +++ b/src/java/org/apache/fop/fo/FObjMixed.java @@ -68,8 +68,7 @@ public abstract class FObjMixed extends FObj { flushText(); if (!inMarker() || getNameId() == FO_MARKER) { - getBuilderContext().whiteSpaceHandler - .handleWhiteSpace(this, currentTextNode); + handleWhiteSpaceFor(this, null); } super.endOfNode(); } @@ -81,10 +80,11 @@ public abstract class FObjMixed extends FObj { * to trigger 'end-of-node' white-space handling) * * @param fobj the node for which to handle white-space + * @param nextChild the next child to be added */ - protected static void handleWhiteSpaceFor(FObjMixed fobj) { + protected static void handleWhiteSpaceFor(FObjMixed fobj, FONode nextChild) { fobj.getBuilderContext().getXMLWhiteSpaceHandler() - .handleWhiteSpace(fobj, fobj.currentTextNode); + .handleWhiteSpace(fobj, fobj.currentTextNode, nextChild); } /** @@ -159,8 +159,7 @@ public abstract class FObjMixed extends FObj { } } else { // handle white-space for all text up to here - getBuilderContext().whiteSpaceHandler - .handleWhiteSpace(this, currentTextNode, child); + handleWhiteSpaceFor(this, child); currentTextNode = null; } } diff --git a/src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java b/src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java index a276e4214..ae06d8399 100644 --- a/src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java +++ b/src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java @@ -111,7 +111,7 @@ public abstract class AbstractRetrieveMarker extends FObjMixed { addChildTo(newChild, (FObj) newParent); if (newChild.getNameId() == FO_TABLE) { Table t = (Table) child; - cloneSubtree(t.getColumns().listIterator(), + cloneSubtree(t.getColumns().iterator(), newChild, marker, newPropertyList); cloneSingleNode(t.getTableHeader(), newChild, marker, newPropertyList); @@ -129,8 +129,9 @@ public abstract class AbstractRetrieveMarker extends FObjMixed { ft.bind(parentPropertyList); addChildTo(newChild, (FObj) newParent); } + // trigger 'end-of-node' white-space handling if (newChild instanceof FObjMixed) { - handleWhiteSpaceFor((FObjMixed) newChild); + handleWhiteSpaceFor((FObjMixed) newChild, null); } } } @@ -169,7 +170,7 @@ public abstract class AbstractRetrieveMarker extends FObjMixed { } cloneSubtree(marker.getChildNodes(), this, marker, propertyList); - handleWhiteSpaceFor(this); + handleWhiteSpaceFor(this, null); } /** |