Reverting changes of rev. 637057. I applied the changes to the 0.95 branch instead so that they make their way into the 0.95 release. I will merge them back to the Trunk via svnmerge

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

src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java

@@ -386,9 +386,6 @@ public class BlockContainerLayoutManager extends BlockStackingLayoutManager
         }
         addKnuthElementsForBorderPaddingAfter(returnList, true);
         addKnuthElementsForSpaceAfter(returnList, alignment);
-
-        //All child content is processed. Only break-after can occur now, so...        
-        context.clearPendingMarks();
         addKnuthElementsForBreakAfter(returnList, context);
 
         setFinished(true);

src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java

@@ -393,9 +393,6 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager
 
         addKnuthElementsForBorderPaddingAfter(returnList, true);
         addKnuthElementsForSpaceAfter(returnList, alignment);
-        
-        //All child content is processed. Only break-after can occur now, so...        
-        context.clearPendingMarks();
         if (forcedBreakAfterLast == null) {
             addKnuthElementsForBreakAfter(returnList, context);
         }

src/java/org/apache/fop/layoutmgr/LayoutContext.java

@@ -285,8 +285,12 @@ public class LayoutContext {
      * Clears all pending marks on the LayoutContext.
      */
     public void clearPendingMarks() {
-        this.pendingBeforeMarks = null;
-        this.pendingAfterMarks = null;
+        if (this.pendingBeforeMarks != null) {
+            this.pendingBeforeMarks.clear();
+        }
+        if (this.pendingAfterMarks != null) {
+            this.pendingAfterMarks.clear();
+        }
     }
     
     /**

status.xml

@@ -52,17 +52,13 @@
   </contexts>
   
   <changes>
-    <release version="FOP Trunk" date="TBD">
+    <!--release version="FOP Trunk" date="TBD"-->
       <!-- change reverted, to be added back later
         <action context="Renderers" dev="AC" importance="high" type="add">
         Added SVG support for AFP (GOCA).
         </action>
       -->
-      <action context="Layout" dev="JM" type="fix" fixes-bug="44412">
-        Bugfix: When there was a forced break after a block with (conditional) borders the
-        border-after wasn't painted.
-      </action>
-    </release>
+    <!--/release-->
     <release version="0.95beta" date="17 March 2008">
       <notes>
         <section>

test/layoutengine/standard-testcases/block-level_break-after_bug44412.xml

@@ -1,112 +0,0 @@
-<?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 Bugzilla #44412 where the border-after of an fo:block wasn't painted in
-      case break-after is present.
-    </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="5in" page-width="5in" margin="20pt">
-          <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>Before the block</fo:block>
-          <fo:block id="b1" border="4pt solid black" break-before="column" break-after="column">A block with
-            borders and break-before and break-after.</fo:block>
-          <fo:block>After the block</fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-      <fo:page-sequence master-reference="page">
-        <fo:flow flow-name="xsl-region-body">
-          <fo:block-container id="bc1" border="4pt solid black" break-after="column">
-            <fo:block>A block-container with borders and break-after.</fo:block>
-          </fo:block-container>
-          <fo:block>After the block-container</fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-      <fo:page-sequence master-reference="page">
-        <fo:flow flow-name="xsl-region-body">
-          <fo:list-block id="lb1" border="4pt solid black" break-after="column">
-            <fo:list-item>
-              <fo:list-item-label end-indent="label-end()">
-                <fo:block>&#x2022;</fo:block>
-              </fo:list-item-label>
-              <fo:list-item-body>
-                <fo:block start-indent="body-start()">Blaaaaaah</fo:block>
-              </fo:list-item-body>
-            </fo:list-item>
-          </fo:list-block>
-          <fo:block>After the list-block</fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-      <fo:page-sequence master-reference="page">
-        <fo:flow flow-name="xsl-region-body">
-          <fo:list-block>
-            <fo:list-item id="li1" border="4pt solid black" break-after="column">
-              <fo:list-item-label end-indent="label-end()">
-                <fo:block>&#x2022;</fo:block>
-              </fo:list-item-label>
-              <fo:list-item-body>
-                <fo:block start-indent="body-start()">Blaaaaaah</fo:block>
-              </fo:list-item-body>
-            </fo:list-item>
-          </fo:list-block>
-          <fo:block>After the list-item</fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-      <fo:page-sequence master-reference="page">
-        <fo:flow flow-name="xsl-region-body">
-          <fo:table table-layout="fixed" width="100%" id="tbl1" border="4pt solid black" break-after="column">
-            <fo:table-column column-width="proportional-column-width(1)"/>
-            <fo:table-body>
-              <fo:table-row>
-                <fo:table-cell>
-                  <fo:block>Blaaaaah</fo:block>
-                </fo:table-cell>
-              </fo:table-row>
-            </fo:table-body>
-          </fo:table>
-          <fo:block>After the table</fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-    </fo:root>
-  </fo>
-  <checks>
-    <eval expected="1" xpath="count(//block[@prod-id = 'b1'])"/>
-    <eval expected="4000 4000 4000 4000" xpath="//block[@prod-id = 'b1']/@bap"/>
-
-    <eval expected="2" xpath="count(//block[@prod-id = 'bc1'])"/> <!-- 2 because viewport/ref pair -->
-    <eval expected="4000 4000 4000 4000" xpath="//block[@prod-id = 'bc1'][1]/@bap"/>
-    
-    <eval expected="1" xpath="count(//block[@prod-id = 'lb1'])"/>
-    <eval expected="4000 4000 4000 4000" xpath="//block[@prod-id = 'lb1']/@bap"/>
-    
-    <eval expected="1" xpath="count(//block[@prod-id = 'li1'])"/>
-    <eval expected="4000 4000 4000 4000" xpath="//block[@prod-id = 'li1']/@bap"/>
-    
-    <eval expected="1" xpath="count(//block[@prod-id = 'tbl1'])"/>
-    <eval expected="4000 4000 4000 4000" xpath="//block[@prod-id = 'tbl1']/block[1]/@bap"/>
-  </checks>
-</testcase>