FOP-2877: Table row was inside footer

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

diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableStepper.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableStepper.java
index 1d41d6cf1f1e4cb76461b8109327a5b80960671d..ff38d692eb3a1309a07b719d5da9a0164d34a6b2 100644 (file)
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableStepper.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableStepper.java
@@ -34,6 +34,7 @@ import org.apache.fop.layoutmgr.BreakElement;
 import org.apache.fop.layoutmgr.Keep;
 import org.apache.fop.layoutmgr.KnuthBlockBox;
 import org.apache.fop.layoutmgr.KnuthBox;
+import org.apache.fop.layoutmgr.KnuthElement;
 import org.apache.fop.layoutmgr.KnuthGlue;
 import org.apache.fop.layoutmgr.KnuthPenalty;
 import org.apache.fop.layoutmgr.LayoutContext;
@@ -275,7 +276,7 @@ public class TableStepper {
             step = getNextStep();
 
             if (penaltyOrGlueLen < 0) {
-                if (step < 0) {
+                if (keep.getPenalty() == KnuthElement.INFINITE) {
                     returnList.add(new KnuthGlue(0, -penaltyOrGlueLen, 0, new Position(null), true));
                 } else {
                     returnList.add(new KnuthGlue(-penaltyOrGlueLen, 0, 0, new Position(null), true));

diff --git a/fop/test/layoutengine/standard-testcases/table_border_padding_3.xml b/fop/test/layoutengine/standard-testcases/table_border_padding_3.xml
index 38a744bb0aefcddd10f2f6a9187b6106fc3e0e62..7fb15a2448cc501d5c843bd4ae9c2947c305a6c8 100644 (file)
--- a/fop/test/layoutengine/standard-testcases/table_border_padding_3.xml
+++ b/fop/test/layoutengine/standard-testcases/table_border_padding_3.xml
@@ -76,6 +76,6 @@
 </fo:root>
   </fo>
   <checks>
-    <eval expected="test2" xpath="//pageViewport[2]//block/block[3]//word"/>
+    <eval expected="test2" xpath="//pageViewport[3]//block/block[1]//word"/>
   </checks>
 </testcase>

diff --git a/fop/test/layoutengine/standard-testcases/table_border_padding_4.xml b/fop/test/layoutengine/standard-testcases/table_border_padding_4.xml
new file mode 100644 (file)
index 0000000..26387f4
--- /dev/null
+++ b/fop/test/layoutengine/standard-testcases/table_border_padding_4.xml
@@ -0,0 +1,664 @@
+<?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 border and padding conditionality on table.
+    </p>
+  </info>
+  <fo>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:fox="http://xmlgraphics.apache.org/fop/extensions">
+
+  <fo:layout-master-set>
+
+    <fo:simple-page-master master-name="Page1" page-width="210mm" page-height="297mm">
+      <fo:region-body margin-bottom="16cm" region-name="PageBody"/>
+
+    </fo:simple-page-master>
+    <fo:simple-page-master master-name="Page2_1" page-width="210mm" page-height="297mm">
+      <fo:region-body region-name="PageBody" margin-bottom="16mm" background-color="yellow"/>
+
+    </fo:simple-page-master>
+    <fo:simple-page-master master-name="Page2_2" page-width="210mm" page-height="297mm">
+      <fo:region-body region-name="PageBody" margin-bottom="16mm" background-color="orange"/>
+
+    </fo:simple-page-master>
+    <fo:simple-page-master master-name="Last Page" page-width="210mm" page-height="297mm">
+      <fo:region-body region-name="PageBody" margin-bottom="16mm" />
+
+    </fo:simple-page-master>
+
+    <fo:page-sequence-master master-name="StatementPages">
+      <fo:repeatable-page-master-reference maximum-repeats="1" master-reference="Page1"/>
+      <fo:repeatable-page-master-reference maximum-repeats="1" master-reference="Page2_1"/>
+      <fo:repeatable-page-master-alternatives>
+        <fo:conditional-page-master-reference page-position="first" master-reference="Page2_2"/>
+        <fo:conditional-page-master-reference page-position="rest" master-reference="Page2_2"/>
+        <fo:conditional-page-master-reference page-position="last" master-reference="Last Page"/>
+      </fo:repeatable-page-master-alternatives>
+    </fo:page-sequence-master>
+  </fo:layout-master-set>
+
+  <fo:page-sequence format="1" id="th_default_sequence2" initial-page-number="auto" force-page-count="auto" master-reference="StatementPages">
+
+    <fo:flow flow-name="PageBody" font-size="12pt">
+
+      <fo:table table-layout="fixed" border-collapse="collapse">
+        <fo:table-column column-width="100%" column-number="1"/>
+        <fo:table-body>
+          <fo:table-row>
+            <fo:table-cell>
+              <fo:block-container margin-bottom="0.5cm">
+                <fo:block>
+
+                  <fo:table table-layout="fixed" width="100%">
+                    <fo:table-column column-width="proportional-column-width(13.8916666666667)" column-number="1"/>
+                    <fo:table-header>
+                      <fo:table-row>
+                        <fo:table-cell border-bottom-color="silver" border-bottom-style="solid" border-bottom-width="1pt">
+                          <fo:block>
+                            <fo:block color="#00A1DE" font-size="8pt" line-height="9pt" padding-top="6pt">Date</fo:block>
+                          </fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-header>
+
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    <fo:table-body>
+                      <fo:table-row>
+                        <fo:table-cell border-top-style="solid">
+                          <fo:block padding-top="4pt">1</fo:block>
+                        </fo:table-cell>
+                      </fo:table-row>
+                    </fo:table-body>
+                    
+
+
+                  </fo:table>
+
+                </fo:block>
+              </fo:block-container>
+            </fo:table-cell>
+          </fo:table-row>
+        </fo:table-body>
+      </fo:table>
+
+
+    </fo:flow>
+  </fo:page-sequence>
+</fo:root>
+  </fo>
+  <checks>
+    <eval expected="41" xpath="count(//pageViewport[2]//word)"/>
+  </checks>
+</testcase>

diff --git a/fop/test/layoutengine/standard-testcases/table_border_padding_5.xml b/fop/test/layoutengine/standard-testcases/table_border_padding_5.xml
new file mode 100644 (file)
index 0000000..748fea1
--- /dev/null
+++ b/fop/test/layoutengine/standard-testcases/table_border_padding_5.xml
@@ -0,0 +1,274 @@
+<?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 border and padding conditionality on table.
+    </p>
+  </info>
+  <fo>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:fox="http://xmlgraphics.apache.org/fop/extensions">
+
+  <fo:layout-master-set>
+
+    <fo:simple-page-master master-name="letterOnePageFront" page-width="210mm" page-height="297mm" margin-bottom="4mm" margin-right="6mm" margin-top="5mm" margin-left="7mm">
+      <fo:region-body margin-bottom="16mm" margin-right="59mm" margin-top="24mm" margin-left="6mm" region-name="letterOnePageBody"/>
+
+
+    </fo:simple-page-master>
+
+    <fo:simple-page-master master-name="letterOnePageRolloverLastNonBlank" page-width="210mm" page-height="297mm" margin-bottom="4mm" margin-right="6mm" margin-top="5mm" margin-left="7mm">
+      <fo:region-body margin-bottom="20mm" background-color="yellow" margin-right="12mm" margin-top="15mm" margin-left="6mm" region-name="letterOnePageBody"/>
+
+    </fo:simple-page-master>
+  
+
+    <fo:page-sequence-master master-name="condLetterOnePage">
+      <fo:repeatable-page-master-alternatives>
+        <fo:conditional-page-master-reference page-position="first" master-reference="letterOnePageFront"/>
+        <fo:conditional-page-master-reference page-position="rest" master-reference="letterOnePageRolloverLastNonBlank"/>
+
+      </fo:repeatable-page-master-alternatives>
+    </fo:page-sequence-master>
+
+  </fo:layout-master-set>
+
+  <fo:page-sequence format="1" id="secondseq" initial-page-number="1" force-page-count="end-on-even" master-reference="condLetterOnePage">
+
+    <fo:flow flow-name="letterOnePageBody">
+
+      <fo:block>
+
+        <fo:block-container height="25cm">
+          <fo:block></fo:block>
+        </fo:block-container>
+
+        <fo:block font-size="13pt" line-height="14pt" margin-top="2mm" keep-with-next="always">Spread the cost with no extra charge </fo:block>
+        
+        <fo:block-container height="12cm">
+          <fo:block></fo:block>
+        </fo:block-container>
+    
+   
+        <fo:table  border-bottom-style="solid" border-bottom-width="0.5pt"  border-left-style="solid" border-left-width="0.5pt" border-right-color="#7F7F7F" border-right-style="solid" border-right-width="0.5pt"  border-top-style="solid" border-top-width="0.5pt" table-layout="fixed" width="100%">
+          <fo:table-column column-width="proportional-column-width(1.14916111238796)" column-number="1"/>
+          <fo:table-column column-width="proportional-column-width(30)" column-number="2"/>
+          <fo:table-column column-width="proportional-column-width(1)" column-number="3"/>
+          <fo:table-column column-width="proportional-column-width(11.33)" column-number="4"/>
+          <fo:table-column column-width="proportional-column-width(11.33)" column-number="5"/>
+          <fo:table-column column-width="proportional-column-width(11.33)" column-number="6"/>
+          <fo:table-column column-width="proportional-column-width(11.33)" column-number="7"/>
+          <fo:table-column column-width="proportional-column-width(11.200838887612)" column-number="8"/>
+          <fo:table-column column-width="proportional-column-width(11.33)" column-number="9"/>
+          <fo:table-body>
+            <fo:table-row>
+              <fo:table-cell>
+                <fo:block>
+                  <fo:block font-size="10pt" line-height="12pt" space-before="1.5mm" space-before.conditionality="retain">
+                    <fo:leader/>
+                  </fo:block>
+                </fo:block>
+              </fo:table-cell>
+              <fo:table-cell>
+                <fo:block>
+                  <fo:block font-size="10pt" line-height="12pt" space-before="1.5mm" space-before.conditionality="retain">
+                    <fo:leader/>
+                  </fo:block>
+                </fo:block>
+              </fo:table-cell>
+              <fo:table-cell>
+                <fo:block>
+                  <fo:block>
+                    <fo:leader/>
+                  </fo:block>
+                </fo:block>
+              </fo:table-cell>
+              <fo:table-cell   border-left-style="solid" border-left-width="0.5pt">
+                <fo:block>
+                  <fo:block font-size="10pt" line-height="12pt" space-before="1.5mm" space-before.conditionality="retain" text-align="center">Monthly/<fo:block/>Quarterly<fo:block/>Direct Debit</fo:block>
+                </fo:block>
+              </fo:table-cell>
+              <fo:table-cell   border-left-style="solid" border-left-width="0.5pt">
+                <fo:block>
+                  <fo:block font-size="10pt" line-height="12pt" space-before="1.5mm" space-before.conditionality="retain" text-align="center">Quarterly Credit/Debit Card</fo:block>
+                </fo:block>
+              </fo:table-cell>
+              <fo:table-cell   border-left-style="solid" border-left-width="0.5pt">
+                <fo:block>
+                  <fo:block font-size="10pt" line-height="12pt" space-before="1.5mm" space-before.conditionality="retain" text-align="center">Annual Direct<fo:block/>Debit</fo:block>
+                </fo:block>
+              </fo:table-cell>
+              <fo:table-cell   border-left-style="solid" border-left-width="0.5pt">
+                <fo:block>
+                  <fo:block font-size="10pt" line-height="12pt" space-before="1.5mm" space-before.conditionality="retain" text-align="center">Annual Credit/<fo:block/>Debit Card</fo:block>
+                </fo:block>
+              </fo:table-cell>
+              <fo:table-cell   border-left-style="solid" border-left-width="0.5pt">
+                <fo:block>
+                  <fo:block font-size="10pt" line-height="12pt" space-before="1.5mm" space-before.conditionality="retain" text-align="center">Credit/<fo:block/>Debit Card</fo:block>
+                </fo:block>
+              </fo:table-cell>
+              <fo:table-cell   border-left-style="solid" border-left-width="0.5pt">
+                <fo:block>
+                  <fo:block font-size="10pt" line-height="12pt" space-before="1.5mm" space-before.conditionality="retain" text-align="center">Cheque</fo:block>
+                </fo:block>
+              </fo:table-cell>
+            </fo:table-row>
+            <fo:table-row>
+              <fo:table-cell>
+                <fo:block>
+                  <fo:block  border-top-style="solid" border-top-width="0.25pt" font-family="ZapfDingbats" font-size="11pt" line-height="13pt" padding-top="2pt" space-before="1.5mm" space-before.conditionality="retain" text-align="right">
+                    <fo:leader/>
+                  </fo:block>
+                </fo:block>
+              </fo:table-cell>
+              <fo:table-cell>
+                <fo:block>
+                  <fo:block  border-top-style="solid" border-top-width="0.25pt" font-size="10pt" line-height="12pt" padding-top="2pt" space-before="1.5mm" space-before.conditionality="retain">
+                    <fo:inline font-size="10pt" line-height="11pt" space-before="0.5mm">
+                      <fo:inline font-weight="bold">Free</fo:inline>
+                    </fo:inline> - we won't charge you any extra in the coming policy year</fo:block>
+                </fo:block>
+              </fo:table-cell>
+
+            </fo:table-row>
+            <fo:table-row height="0.714374989271164cm">
+              <fo:table-cell>
+                <fo:block>
+                  <fo:block  border-top-style="solid" border-top-width="0.25pt" font-family="ZapfDingbats" font-size="11pt" line-height="13pt" padding-top="2pt" space-before="1.5mm" space-before.conditionality="retain" text-align="right">
+                    <fo:leader/>
+                  </fo:block>
+                </fo:block>
+              </fo:table-cell>
+              <fo:table-cell>
+                <fo:block>
+                  <fo:block  border-top-style="solid" border-top-width="0.25pt" font-size="10pt" line-height="12pt" padding-top="2pt" space-before="1.5mm" space-before.conditionality="retain">
+                    <fo:inline font-size="10pt" line-height="11pt" space-before="0.5mm">
+                      <fo:inline font-weight="bold">Convenient</fo:inline>
+                    </fo:inline> - never miss payments</fo:block>
+                </fo:block>
+              </fo:table-cell>
+
+            </fo:table-row>
+            <fo:table-row>
+              <fo:table-cell>
+                <fo:block>
+                  <fo:block  border-top-style="solid" border-top-width="0.25pt" font-family="ZapfDingbats" font-size="11pt" line-height="13pt" padding-top="2pt" space-before="1.5mm" space-before.conditionality="retain" text-align="right">
+                    <fo:leader/>
+                  </fo:block>
+                </fo:block>
+              </fo:table-cell>
+              <fo:table-cell>
+                <fo:block>
+                  <fo:block  border-top-style="solid" border-top-width="0.25pt" font-size="10pt" line-height="12pt" padding-top="2pt" space-before="1.5mm" space-before.conditionality="retain">
+                    <fo:inline font-size="10pt" line-height="11pt" space-before="0.5mm">
+                      <fo:inline font-weight="bold">You're always covered</fo:inline>
+                    </fo:inline> - even if you're away at your renewal date</fo:block>
+                </fo:block>
+              </fo:table-cell>
+
+            </fo:table-row>
+            <fo:table-row>
+              <fo:table-cell>
+                <fo:block>
+                  <fo:block  border-top-style="solid" border-top-width="0.25pt" font-family="ZapfDingbats" font-size="11pt" line-height="13pt" padding-top="2pt" space-before="1.5mm" space-before.conditionality="retain" text-align="right">
+                    <fo:leader/>
+                  </fo:block>
+                </fo:block>
+              </fo:table-cell>
+              <fo:table-cell>
+                <fo:block>
+                  <fo:block  border-top-style="solid" border-top-width="0.25pt" font-size="10pt" line-height="12pt" padding-top="2pt" space-before="1.5mm" space-before.conditionality="retain">
+                    <fo:inline font-size="10pt" line-height="11pt" space-before="0.5mm">
+                      <fo:inline font-weight="bold">Extra security</fo:inline>
+                    </fo:inline> -  payments are backed by the Direct Debit Guarantee</fo:block>
+                </fo:block>
+              </fo:table-cell>
+
+            </fo:table-row>
+            <fo:table-row>
+              <fo:table-cell>
+                <fo:block>
+                  <fo:block  border-top-style="solid" border-top-width="0.25pt" font-family="ZapfDingbats" font-size="11pt" line-height="13pt" padding-top="2pt" space-before="1.5mm" space-before.conditionality="retain" text-align="right">
+                    <fo:leader/>
+                  </fo:block>
+                </fo:block>
+              </fo:table-cell>
+              <fo:table-cell>
+                <fo:block>
+                  <fo:block  border-top-style="solid" border-top-width="0.25pt" font-size="10pt" line-height="12pt" padding-top="2pt" space-before="1.5mm" space-before.conditionality="retain">
+                    <fo:inline font-size="10pt" line-height="11pt" space-before="0.5mm">
+                      <fo:inline font-weight="bold">Easy to budget</fo:inline>
+                    </fo:inline> - spread the payments</fo:block>
+                </fo:block>
+              </fo:table-cell>
+              <fo:table-cell>
+                <fo:block>
+                  <fo:block  border-top-style="solid" border-top-width="0.25pt" font-family="ZapfDingbats" font-size="11pt" line-height="13pt" padding-top="2pt" space-before="1.5mm" space-before.conditionality="retain" text-align="right">
+                    <fo:leader/>
+                  </fo:block>
+                </fo:block>
+              </fo:table-cell>
+
+            </fo:table-row>
+          </fo:table-body>
+        </fo:table>
+        <fo:block color="white" font-size="6pt">
+          <fo:leader/>
+        </fo:block>
+        <fo:table keep-together.within-page="always" table-layout="fixed" width="100%">
+          <fo:table-column column-width="proportional-column-width(23)" column-number="1"/>
+
+          <fo:table-body>
+            <fo:table-row>
+              <fo:table-cell>
+                <fo:block>
+                  <fo:block font-size="1pt" line-height="1pt">
+                    <fo:leader/>
+                  </fo:block>
+                  <fo:block font-size="11pt" line-height="13pt" space-before="1mm" space-before.conditionality="retain" text-align="left" background-color="red">
+                    <fo:external-graphic scaling="uniform" src="url(a)" width="2.9633333333333334cm" content-width="2.9633333333333334cm" height="1.3546666666666667cm" content-height="1.3546666666666667cm"/>
+                  </fo:block>
+                </fo:block>
+              </fo:table-cell>
+
+            </fo:table-row>
+            <fo:table-row>
+              <fo:table-cell>
+                <fo:block>
+                  <fo:block font-size="1pt" line-height="1pt">
+                    <fo:leader/>
+                  </fo:block>
+                  <fo:block font-size="11pt" line-height="13pt" space-before="1mm" space-before.conditionality="retain">As a 1234 customer, you are eligible to join our free membership programme called Possibilities. Possibilities brings you VIP experiences and exclusive access to events and great offers. For more information and to join Possibilities, simply speak to our advisers when you call to renew or visit 1234.co.uk/membership</fo:block>
+                </fo:block>
+              </fo:table-cell>
+
+            </fo:table-row>
+          </fo:table-body>
+        </fo:table>
+      </fo:block>
+
+    </fo:flow>
+  </fo:page-sequence>
+</fo:root>
+  </fo>
+  <checks>
+    <eval expected="Possibilities." xpath="//pageViewport[2]//block[last()]//block[last()]/block[2]//word[15]"/>
+  </checks>
+</testcase>

diff --git a/fop/test/layoutengine/standard-testcases/table_bug44621.xml b/fop/test/layoutengine/standard-testcases/table_bug44621.xml
index f97b8756f2f76a5802fc3c9e7f4ddd10b4d0821d..ae04d1903718095a36d80473e24c45521e94dcbe 100644 (file)
--- a/fop/test/layoutengine/standard-testcases/table_bug44621.xml
+++ b/fop/test/layoutengine/standard-testcases/table_bug44621.xml
@@ -132,7 +132,7 @@
       <skip>6</skip>
       <box w="11000"/>
       <penalty w="0" p="0"/>
-      <glue w="0"/>
+      <glue w="500"/>
       <box w="12000"/>
       <skip>3</skip>
     </element-list>