Test case for space resolution in the footnote area. Currently disabled as the indivi...

Bugfix in PageSequenceLayoutManager: LMs are now informed about space resolution results and the spaces in the element lists don't cause an NPE anymore.
AreaAdditionUtil: the layout manager parameter is now optional so it can be used for footnotes.

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

diff --git a/src/java/org/apache/fop/layoutmgr/AreaAdditionUtil.java b/src/java/org/apache/fop/layoutmgr/AreaAdditionUtil.java
index 653fcab6f6d71c7ace1eec1cf63f0be498e959fd..a210754afd67c999d05ab66a4f29bb432db98be0 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/AreaAdditionUtil.java
+++ b/src/java/org/apache/fop/layoutmgr/AreaAdditionUtil.java
@@ -86,7 +86,7 @@ public class AreaAdditionUtil {
             }
         }
         
-        if (bslm.markers != null) {
+        if (bslm != null && bslm.markers != null) {
             bslm.getCurrentPV().addMarkers(bslm.markers, true, 
                     bslm.isFirst(firstPos), bslm.isLast(lastPos));
         }
@@ -107,7 +107,7 @@ public class AreaAdditionUtil {
             lc.setStackLimit(layoutContext.getStackLimit());
             childLM.addAreas(childPosIter, lc);
         }
-        if (bslm.markers != null) {
+        if (bslm != null && bslm.markers != null) {
             bslm.getCurrentPV().addMarkers(bslm.markers, false, 
                     bslm.isFirst(firstPos), bslm.isLast(lastPos));
         }

diff --git a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
index e56b22b3ea3130811ae500782e59d447e550a377..6dbc997b34755683b3e7e116d62bb71715781e17 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
@@ -402,10 +402,11 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager {
                     int lastIndex = (i == pbp.footnoteLastListIndex 
                             ? pbp.footnoteLastElementIndex : elementList.size() - 1);
 
-                    FootnoteBodyLayoutManager fblm = (FootnoteBodyLayoutManager)
-                            ((KnuthElement) elementList.getFirst()).getLayoutManager();
+                    SpaceResolver.performConditionalsNotification(elementList, 
+                            firstIndex, lastIndex, -1);
                     LayoutContext childLC = new LayoutContext(0);
-                    fblm.addAreas(new KnuthPossPosIter(elementList, firstIndex, lastIndex + 1), 
+                    AreaAdditionUtil.addAreas(null, 
+                            new KnuthPossPosIter(elementList, firstIndex, lastIndex + 1), 
                             childLC);
                 }
                 // set the offset from the top margin

diff --git a/test/layoutengine/disabled-testcases.txt b/test/layoutengine/disabled-testcases.txt
index 665a568c84efeecc82bf74cabac3ecfd7a403585..fe51d05c4c0cf9f06fc7d86779d045a5682eef8d 100644 (file)
--- a/test/layoutengine/disabled-testcases.txt
+++ b/test/layoutengine/disabled-testcases.txt
@@ -6,6 +6,7 @@ block_space-before_space-after_8.xml
 block_word-spacing.xml
 block_word-spacing_text-align_justify.xml
 external-graphic_oversized.xml
+footnote_space-resolution.xml
 inline-block_keep-together.xml
 inline_block_nested_3.xml
 inline_border_padding_block_nested_2.xml

diff --git a/test/layoutengine/testcases/footnote_space-resolution.xml b/test/layoutengine/testcases/footnote_space-resolution.xml
new file mode 100644 (file)
index 0000000..151e276
--- /dev/null
+++ b/test/layoutengine/testcases/footnote_space-resolution.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2005 The Apache Software Foundation
+
+  Licensed 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 space-resolution inside the footnotes area.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="3in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>region-body<fo:footnote>
+              <fo:inline font-size="50%" vertical-align="super">1</fo:inline>
+              <fo:footnote-body>
+                <fo:block space-before="1em" space-after="1em">
+                  <fo:inline font-size="50%" vertical-align="super">1</fo:inline>I'm a footnote!</fo:block>
+              </fo:footnote-body>
+            </fo:footnote>
+            blah<fo:footnote>
+              <fo:inline font-size="50%" vertical-align="super">2</fo:inline>
+              <fo:footnote-body>
+                <fo:block space-before="1em" space-after="1em">
+                  <fo:inline font-size="50%" vertical-align="super">2</fo:inline>I'm a footnote!</fo:block>
+              </fo:footnote-body>
+            </fo:footnote>
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <true xpath="not(boolean(//footnotes/block[1]/@space-before))"/>
+    <true xpath="not(boolean(//footnotes/block[1]/@space-after))"/>
+    <eval expected="12000" xpath="//footnotes/block[2]/@space-before"/>
+    <true xpath="not(boolean(//footnotes/block[2]/@space-after))"/>
+  </checks>
+</testcase>