Index: src/java/org/apache/fop/layoutmgr/inline/WrapperLayoutManager.java
===================================================================
--- src/java/org/apache/fop/layoutmgr/inline/WrapperLayoutManager.java (revision 1067688)
+++ src/java/org/apache/fop/layoutmgr/inline/WrapperLayoutManager.java (working copy)
@@ -24,10 +24,16 @@
import org.apache.fop.fo.flow.Wrapper;
import org.apache.fop.layoutmgr.BlockLayoutManager;
import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
+import org.apache.fop.layoutmgr.KnuthBox;
+import org.apache.fop.layoutmgr.KnuthSequence;
import org.apache.fop.layoutmgr.LayoutContext;
+import org.apache.fop.layoutmgr.ListElement;
import org.apache.fop.layoutmgr.PositionIterator;
import org.apache.fop.layoutmgr.TraitSetter;
+import java.util.LinkedList;
+import java.util.List;
+
/**
* This is the layout manager for the fo:wrapper formatting object.
*/
@@ -54,14 +60,39 @@
return area;
}
+
/**
+ * Overridden to generate a proper {@link ListElement}, if the parent
+ * requires it (i.e. is a block-container, list-item-body...)
+ * If the parent is a block, the line LM will take care of properly
+ * wrapping the sequence in a line box.
+ * {@inheritDoc}
+ */
+ @Override
+ public List getNextKnuthElements(LayoutContext context, int alignment) {
+ List returnList = super.getNextKnuthElements(context, alignment);
+ KnuthSequence seq = (KnuthSequence) returnList.get(0);
+ ListElement tempElement = (ListElement) seq.get(0);
+ if (parentLayoutManager instanceof BlockStackingLayoutManager
+ && !(parentLayoutManager instanceof BlockLayoutManager)) {
+ // replace inline box with a block box
+ returnList = new LinkedList();
+ KnuthBox auxiliaryBox = new KnuthBox(0, tempElement.getPosition(), true);
+ returnList.add(auxiliaryBox);
+ } else {
+ // make sure the inline box is an auxiliary one
+ seq.set(0, new KnuthInlineBox(0, null, tempElement.getPosition(), true));
+ }
+ return returnList;
+ }
+
+ /**
* Add the area for this layout manager.
* This adds the dummy area to the parent, *if* it has an id
* - otherwise it serves no purpose.
- *
- * @param posIter the position iterator
- * @param context the layout context for adding the area
+ * {@inheritDoc}
*/
+ @Override
public void addAreas(PositionIterator posIter, LayoutContext context) {
if (fobj.hasId()) {
addId();
Index: test/layoutengine/standard-testcases/wrapper_block.xml
===================================================================
--- test/layoutengine/standard-testcases/wrapper_block.xml (revision 1067111)
+++ test/layoutengine/standard-testcases/wrapper_block.xml (working copy)
@@ -23,7 +23,7 @@
-
+
@@ -31,21 +31,92 @@
-
- block content.
+
+ w-1
+
+
+
+ w-2
+
+
+
+
+ w-3
+
+
+
+
+
+
+
+ w-4
+
+
+
+
+ w-5
+ w-5
+ w-5
+
+
+
+
+
+
+
+
+
+ w-6
+ w-6
+
+
+
+
-
-
- 2
-
- 3
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+