Adjustments after bugfixes in table layout. I didn't recognize the wrong page breaks.

Additional constellations for markers (and tables in general) checked.

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

diff --git a/test/layoutengine/testcases/markers8.xml b/test/layoutengine/testcases/markers8.xml
index 2edc56bc9a2c63f4700254aede235271f81b66bc..82dcb7706b53ae482f29c4a5b722d81f41ef24d6 100644 (file)
--- a/test/layoutengine/testcases/markers8.xml
+++ b/test/layoutengine/testcases/markers8.xml
@@ -108,6 +108,7 @@
                 </fo:table-cell>
                 <fo:table-cell>
                   <fo:block>blah</fo:block>
+                  <fo:block>blah</fo:block>
                 </fo:table-cell>
               </fo:table-row>
               <fo:table-row>

diff --git a/test/layoutengine/testcases/markers9.xml b/test/layoutengine/testcases/markers9.xml
index 77440881071c59011804ab1785d5034cb06b1673..e06f1b0d596ad5b5265c677810603c07fff8943a 100644 (file)
--- a/test/layoutengine/testcases/markers9.xml
+++ b/test/layoutengine/testcases/markers9.xml
@@ -108,6 +108,7 @@
                 </fo:table-cell>
                 <fo:table-cell>
                   <fo:block>blah</fo:block>
+                  <fo:block>blah</fo:block>
                 </fo:table-cell>
               </fo:table-row>
               <fo:table-row>
@@ -128,6 +129,63 @@
               </fo:table-row>
             </fo:table-body>
           </fo:table>
+          <fo:table break-before="page">
+            <fo:table-column number-columns-repeated="2"/>
+            <fo:table-body color="black">
+              <fo:marker marker-class-name="test">body5</fo:marker>
+              <fo:table-row>
+                <fo:table-cell>
+                  <fo:block>blah</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>blah</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+            </fo:table-body>
+            <fo:table-body color="green">
+              <fo:marker marker-class-name="test">body6</fo:marker>
+              <fo:table-row>
+                <fo:table-cell number-rows-spanned="3">
+                  <fo:block>blah1</fo:block>
+                  <fo:block>blah2</fo:block>
+                  <fo:block>blah3</fo:block>
+                  <fo:block>blah4</fo:block>
+                  <fo:block>blah5</fo:block>
+                  <fo:block>blah6</fo:block>
+                  <fo:block>blah7</fo:block>
+                  <fo:block>blah8</fo:block>
+                  <fo:block>blah9</fo:block>
+                  <fo:block>blah10</fo:block>
+                  <fo:block>blah11</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>blah</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell>
+                  <fo:block>blah</fo:block>
+                  <fo:block>blah</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <!--fo:table-row>
+                <fo:table-cell>
+                  <fo:block>blah</fo:block>
+                </fo:table-cell>
+              </fo:table-row-->
+            </fo:table-body>
+            <fo:table-body color="black">
+              <fo:marker marker-class-name="test">body7</fo:marker>
+              <fo:table-row>
+                <fo:table-cell>
+                  <fo:block>blah</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>blah</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+            </fo:table-body>
+          </fo:table>
         </fo:flow>
       </fo:page-sequence>
     </fo:root>
@@ -150,7 +208,12 @@
 
     <true xpath="starts-with(//pageViewport[@nr=4]//regionBefore/block[1],'body3')"/>
     <true xpath="starts-with(//pageViewport[@nr=4]//regionBefore/block[2],'body4')"/>
-    <true xpath="starts-with(//pageViewport[@nr=4]//regionAfter/block[1],'body4')"/>
-    <true xpath="starts-with(//pageViewport[@nr=4]//regionAfter/block[2],'body4')"/>
+    <true xpath="starts-with(//pageViewport[@nr=4]//regionAfter/block[1],'body6')"/>
+    <true xpath="starts-with(//pageViewport[@nr=4]//regionAfter/block[2],'body5')"/>
+
+    <true xpath="starts-with(//pageViewport[@nr=5]//regionBefore/block[1],'body6')"/>
+    <true xpath="starts-with(//pageViewport[@nr=5]//regionBefore/block[2],'body6')"/>
+    <true xpath="starts-with(//pageViewport[@nr=5]//regionAfter/block[1],'body6')"/>
+    <true xpath="starts-with(//pageViewport[@nr=5]//regionAfter/block[2],'body6')"/>
   </checks>
 </testcase>