diff options
Diffstat (limited to 'src')
3 files changed, 9 insertions, 1 deletions
diff --git a/src/java/org/apache/fop/area/MainReference.java b/src/java/org/apache/fop/area/MainReference.java index 638008587..bdba40f1e 100644 --- a/src/java/org/apache/fop/area/MainReference.java +++ b/src/java/org/apache/fop/area/MainReference.java @@ -51,6 +51,10 @@ public class MainReference extends Area { * @return the created span area. */ public Span createSpan(boolean spanAll) { + if (spanAreas.size() > 0 && getCurrentSpan().getBPD() == 0) { + //Remove the current one if it is empty + spanAreas.remove(spanAreas.size() - 1); + } RegionViewport rv = parent.getRegionViewport(); int ipdWidth = (int) parent.getIPD() - rv.getBorderAndPaddingWidthStart() - rv.getBorderAndPaddingWidthEnd(); diff --git a/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java b/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java index fbac14f38..83f3c3afb 100644 --- a/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java +++ b/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java @@ -439,6 +439,7 @@ public abstract class AbstractBreaker { BlockSequence blockList; if ((returnedList = getNextKnuthElements(childLC, alignment)) != null) { if (returnedList.size() == 0) { + nextSequenceStartsOn = handleSpanChange(childLC, nextSequenceStartsOn); return nextSequenceStartsOn; } blockList = new BlockSequence(nextSequenceStartsOn); diff --git a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java index fce0b4479..9bc09c2f5 100644 --- a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java @@ -29,6 +29,7 @@ import org.apache.fop.area.Footnote; import org.apache.fop.area.PageViewport; import org.apache.fop.area.LineArea; import org.apache.fop.area.Resolvable; +import org.apache.fop.area.Span; import org.apache.fop.fo.Constants; import org.apache.fop.fo.flow.Marker; @@ -326,7 +327,9 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager { + ", new start position: " + newStartPos); //Handle page break right here to avoid any side-effects - handleBreakTrait(EN_PAGE); + if (newStartPos > 0) { + handleBreakTrait(EN_PAGE); + } pageBreakHandled = true; //Update so the available BPD is reported correctly pvProvider.setStartOfNextElementList(currentPageNum, |