correctly continue lists over page

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

diff --git a/src/org/apache/fop/layoutmgr/list/Item.java b/src/org/apache/fop/layoutmgr/list/Item.java
index 029c864e9804cd752a2917436692e26fcab577fc..d55bd7cf83acc664d9e8c1cde44bded8da98cbcf 100644 (file)
--- a/src/org/apache/fop/layoutmgr/list/Item.java
+++ b/src/org/apache/fop/layoutmgr/list/Item.java
@@ -102,6 +102,7 @@ public class Item extends BlockStackingLayoutManager {
                         } else {
                             curLM.resetPosition(null);
                         }
+                        over = true;
                         break;
                     }
                     stackSize.add(bp.getStackingSize());
@@ -234,6 +235,7 @@ public class Item extends BlockStackingLayoutManager {
         if (resetPos == null) {
             reset(null);
         } else {
+            setFinished(false);
             //reset(resetPos);
         }
     }

diff --git a/src/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java b/src/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
index e495f0c4441ad22f40a12a723ac068d1fac114fc..2b76a860d16e2a1e7f5897db0a0f0e3a5abf1aa6 100644 (file)
--- a/src/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
+++ b/src/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
@@ -35,10 +35,9 @@ public class ListItemLayoutManager extends BlockStackingLayoutManager {
     private Item label;
     private Item body;
 
-    private Block curBlockArea;
+    private Block curBlockArea = null;
 
     private List cellList = null;
-    private List columns = null;
     private int listItemHeight;
     private BorderAndPadding borderProps = null;
     private BackgroundProps backgroundProps;
@@ -171,7 +170,10 @@ public class ListItemLayoutManager extends BlockStackingLayoutManager {
 
         MinOptMax itemSize = new MinOptMax(min, opt, max);
 
-        setFinished(true);
+        if (label.isFinished() && body.isFinished()) {
+            setFinished(true);
+        }
+
         ItemPosition rp = new ItemPosition(this, breakList.size() - 1, breakList);
         BreakPoss breakPoss = new BreakPoss(rp);
         if (over) { 
@@ -217,6 +219,7 @@ public class ListItemLayoutManager extends BlockStackingLayoutManager {
 
         flush();
 
+        curBlockArea = null;
     }
 
     /**