Insert penalties for column breaks, too.

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

diff --git a/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
index 1366f5010d7f730d5be21605c4d03c58eaa2b9cf..6fbfe20eec75441f826c0d135605fc5959e35b0a 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
@@ -205,6 +205,7 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager {
     protected boolean addKnuthElementsForBreakBefore(LinkedList returnList, 
             Position returnPosition, int breakBefore) {
         if (breakBefore == EN_PAGE
+                || breakBefore == EN_COLUMN 
                 || breakBefore == EN_EVEN_PAGE 
                 || breakBefore == EN_ODD_PAGE) {
             // return a penalty element, representing a forced page break
@@ -226,6 +227,7 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager {
     protected boolean addKnuthElementsForBreakAfter(LinkedList returnList, 
             Position returnPosition, int breakAfter) {
         if (breakAfter == EN_PAGE
+                || breakAfter == EN_COLUMN
                 || breakAfter == EN_EVEN_PAGE
                 || breakAfter == EN_ODD_PAGE) {
             // add a penalty element, representing a forced page break