Bugzilla #50089: Content after forced break in block-container is not rendered

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1049228 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 51 insertions, 1 deletions

diff --git a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
index ee010efe5..877da13dd 100644
--- a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
@@ -323,7 +323,7 @@ public class BlockContainerLayoutManager extends BlockStackingLayoutManager
                     }
                     if (ElementListUtils.endsWithForcedBreak(returnedList)) {
                         // a descendant of this block has break-after
-                        if (curLM.isFinished()) {
+                        if (curLM.isFinished() && !hasNextChildLM()) {
                             // there is no other content in this block;
                             // it's useless to add space after before a page break
                             setFinished(true);
diff --git a/status.xml b/status.xml
index e6cd1589c..2f2608cfd 100644
--- a/status.xml
+++ b/status.xml
@@ -58,6 +58,9 @@
       documents. Example: the fix of marks layering will be such a case when it's done.
     -->
     <release version="FOP Trunk" date="TBD">
+      <action context="Layout" dev="VH" type="fix" fixes-bug="50089">
+        Bugfix: content after forced break in block-container is not rendered.
+      </action>
       <action context="Layout" dev="JM" type="fix" fixes-bug="42034">
         Fixed adjustment of inline parent area for justified text containing a forward page reference.
       </action>
diff --git a/test/layoutengine/standard-testcases/block-container_break.xml b/test/layoutengine/standard-testcases/block-container_break.xml
new file mode 100644
index 000000000..352f755f0
--- /dev/null
+++ b/test/layoutengine/standard-testcases/block-container_break.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+  <info>
+    <p>
+      This test checks that a forced break on a child element of an fo:block-container is honored.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="page"
+          page-height="420pt" page-width="320pt" margin="10pt">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="page">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block-container>
+            <fo:block id="before-break" break-after="page">Before the break.</fo:block>
+            <fo:block id="after-break">After the break.</fo:block>
+          </fo:block-container>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="2" xpath="count(//pageViewport)"/>
+    <eval expected="After the break." xpath="//pageViewport[2]//flow/block/block/block//text"/>
+  </checks>
+</testcase>