You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2005/03/21 16:35:43 UTC
cvs commit: xml-fop/test/layoutengine/testcases keep-with-previous1.xml keep-together1.xml keep-with-next1.xml
jeremias 2005/03/21 07:35:43
Modified: test/layoutengine/testcases Tag: Temp_KnuthStylePageBreaking
keep-together1.xml keep-with-next1.xml
Added: test/layoutengine/testcases Tag: Temp_KnuthStylePageBreaking
keep-with-previous1.xml
Log:
First test case for keep-with-previous.
Added checks for the "within-column" part for all three test cases.
Revision Changes Path
No revision
No revision
1.1.2.2 +52 -19 xml-fop/test/layoutengine/testcases/Attic/keep-together1.xml
Index: keep-together1.xml
===================================================================
RCS file: /home/cvs/xml-fop/test/layoutengine/testcases/Attic/keep-together1.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- keep-together1.xml 21 Mar 2005 12:41:53 -0000 1.1.2.1
+++ keep-together1.xml 21 Mar 2005 15:35:42 -0000 1.1.2.2
@@ -57,26 +57,48 @@
<fo:flow flow-name="xsl-region-body">
<fo:block>block11</fo:block>
<fo:block>block12</fo:block>
- <fo:block-container keep-together.within-page="always">
- <fo:block>block13</fo:block>
- <fo:block>block14</fo:block>
- <fo:block>block15</fo:block>
- </fo:block-container>
- <fo:block>block16</fo:block>
+ <fo:block keep-together.within-column="always">block13
+ <fo:inline font-style="italic">
+ The quick brown fox jumps over the lazy dog.
+ The quick brown fox jumps over the lazy dog.
+ The quick brown fox jumps over the lazy dog.
+ </fo:inline>
+ </fo:block>
+ <fo:block>block14</fo:block>
+ <fo:block>block15</fo:block>
+ <fo:block keep-together.within-column="always">
+ <fo:block>block16</fo:block>
+ <fo:block>block17</fo:block>
+ <fo:block>block18</fo:block>
+ <fo:block>block19</fo:block>
+ </fo:block>
+ <fo:block>block20</fo:block>
</fo:flow>
</fo:page-sequence>
<fo:page-sequence master-reference="normal">
<fo:flow flow-name="xsl-region-body">
<fo:block>block21</fo:block>
<fo:block>block22</fo:block>
+ <fo:block-container keep-together.within-page="always">
+ <fo:block>block23</fo:block>
+ <fo:block>block24</fo:block>
+ <fo:block>block25</fo:block>
+ </fo:block-container>
+ <fo:block>block26</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ <fo:page-sequence master-reference="normal">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>block31</fo:block>
+ <fo:block>block32</fo:block>
<fo:block keep-together.within-page="always">
<fo:block-container>
- <fo:block>block23</fo:block>
+ <fo:block>block33</fo:block>
</fo:block-container>
- <fo:block>block24</fo:block>
- <fo:block>block25</fo:block>
+ <fo:block>block34</fo:block>
+ <fo:block>block35</fo:block>
</fo:block>
- <fo:block>block26</fo:block>
+ <fo:block>block36</fo:block>
</fo:flow>
</fo:page-sequence>
</fo:root>
@@ -97,14 +119,25 @@
<eval expected="6" xpath="//lineArea[starts-with(., 'block12')]/ancestor::pageViewport/@nr"/>
<eval expected="7" xpath="//lineArea[starts-with(., 'block13')]/ancestor::pageViewport/@nr"/>
<eval expected="7" xpath="//lineArea[starts-with(., 'block14')]/ancestor::pageViewport/@nr"/>
- <eval expected="7" xpath="//lineArea[starts-with(., 'block15')]/ancestor::pageViewport/@nr"/>
- <eval expected="7" xpath="//lineArea[starts-with(., 'block16')]/ancestor::pageViewport/@nr"/>
+ <eval expected="8" xpath="//lineArea[starts-with(., 'block15')]/ancestor::pageViewport/@nr"/>
+ <eval expected="9" xpath="//lineArea[starts-with(., 'block16')]/ancestor::pageViewport/@nr"/>
+ <eval expected="9" xpath="//lineArea[starts-with(., 'block17')]/ancestor::pageViewport/@nr"/>
+ <eval expected="9" xpath="//lineArea[starts-with(., 'block18')]/ancestor::pageViewport/@nr"/>
+ <eval expected="9" xpath="//lineArea[starts-with(., 'block19')]/ancestor::pageViewport/@nr"/>
+ <eval expected="10" xpath="//lineArea[starts-with(., 'block20')]/ancestor::pageViewport/@nr"/>
+
+ <eval expected="11" xpath="//lineArea[starts-with(., 'block21')]/ancestor::pageViewport/@nr"/>
+ <eval expected="11" xpath="//lineArea[starts-with(., 'block22')]/ancestor::pageViewport/@nr"/>
+ <eval expected="12" xpath="//lineArea[starts-with(., 'block23')]/ancestor::pageViewport/@nr"/>
+ <eval expected="12" xpath="//lineArea[starts-with(., 'block24')]/ancestor::pageViewport/@nr"/>
+ <eval expected="12" xpath="//lineArea[starts-with(., 'block25')]/ancestor::pageViewport/@nr"/>
+ <eval expected="12" xpath="//lineArea[starts-with(., 'block26')]/ancestor::pageViewport/@nr"/>
- <eval expected="8" xpath="//lineArea[starts-with(., 'block21')]/ancestor::pageViewport/@nr"/>
- <eval expected="8" xpath="//lineArea[starts-with(., 'block22')]/ancestor::pageViewport/@nr"/>
- <eval expected="9" xpath="//lineArea[starts-with(., 'block23')]/ancestor::pageViewport/@nr"/>
- <eval expected="9" xpath="//lineArea[starts-with(., 'block24')]/ancestor::pageViewport/@nr"/>
- <eval expected="9" xpath="//lineArea[starts-with(., 'block25')]/ancestor::pageViewport/@nr"/>
- <eval expected="9" xpath="//lineArea[starts-with(., 'block26')]/ancestor::pageViewport/@nr"/>
+ <eval expected="13" xpath="//lineArea[starts-with(., 'block31')]/ancestor::pageViewport/@nr"/>
+ <eval expected="13" xpath="//lineArea[starts-with(., 'block32')]/ancestor::pageViewport/@nr"/>
+ <eval expected="14" xpath="//lineArea[starts-with(., 'block33')]/ancestor::pageViewport/@nr"/>
+ <eval expected="14" xpath="//lineArea[starts-with(., 'block34')]/ancestor::pageViewport/@nr"/>
+ <eval expected="14" xpath="//lineArea[starts-with(., 'block35')]/ancestor::pageViewport/@nr"/>
+ <eval expected="14" xpath="//lineArea[starts-with(., 'block36')]/ancestor::pageViewport/@nr"/>
</checks>
</testcase>
1.1.2.2 +30 -1 xml-fop/test/layoutengine/testcases/Attic/keep-with-next1.xml
Index: keep-with-next1.xml
===================================================================
RCS file: /home/cvs/xml-fop/test/layoutengine/testcases/Attic/keep-with-next1.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- keep-with-next1.xml 21 Mar 2005 13:22:07 -0000 1.1.2.1
+++ keep-with-next1.xml 21 Mar 2005 15:35:43 -0000 1.1.2.2
@@ -48,6 +48,23 @@
<fo:block>block11</fo:block>
</fo:flow>
</fo:page-sequence>
+ <fo:page-sequence master-reference="normal">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>block21</fo:block>
+ <fo:block>block22</fo:block>
+ <fo:block keep-with-next.within-column="always">block23</fo:block>
+ <fo:block keep-with-next.within-column="always">block24</fo:block>
+ <fo:block>block25</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block>block26</fo:block>
+ <fo:block>block27</fo:block>
+ <fo:block>block28</fo:block>
+ <fo:block>block29</fo:block>
+ <fo:block>block30</fo:block>
+ </fo:block>
+ <fo:block>block31</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
</fo:root>
</fo>
<checks>
@@ -62,5 +79,17 @@
<eval expected="3" xpath="//lineArea[starts-with(., 'block9')]/ancestor::pageViewport/@nr"/>
<eval expected="4" xpath="//lineArea[starts-with(., 'block10')]/ancestor::pageViewport/@nr"/>
<eval expected="4" xpath="//lineArea[starts-with(., 'block11')]/ancestor::pageViewport/@nr"/>
+
+ <eval expected="5" xpath="//lineArea[starts-with(., 'block21')]/ancestor::pageViewport/@nr"/>
+ <eval expected="5" xpath="//lineArea[starts-with(., 'block22')]/ancestor::pageViewport/@nr"/>
+ <eval expected="6" xpath="//lineArea[starts-with(., 'block23')]/ancestor::pageViewport/@nr"/>
+ <eval expected="6" xpath="//lineArea[starts-with(., 'block24')]/ancestor::pageViewport/@nr"/>
+ <eval expected="6" xpath="//lineArea[starts-with(., 'block25')]/ancestor::pageViewport/@nr"/>
+ <eval expected="6" xpath="//lineArea[starts-with(., 'block26')]/ancestor::pageViewport/@nr"/>
+ <eval expected="7" xpath="//lineArea[starts-with(., 'block27')]/ancestor::pageViewport/@nr"/>
+ <eval expected="7" xpath="//lineArea[starts-with(., 'block28')]/ancestor::pageViewport/@nr"/>
+ <eval expected="7" xpath="//lineArea[starts-with(., 'block29')]/ancestor::pageViewport/@nr"/>
+ <eval expected="8" xpath="//lineArea[starts-with(., 'block30')]/ancestor::pageViewport/@nr"/>
+ <eval expected="8" xpath="//lineArea[starts-with(., 'block31')]/ancestor::pageViewport/@nr"/>
</checks>
</testcase>
No revision
Index: keep-with-next1.xml
===================================================================
RCS file: /home/cvs/xml-fop/test/layoutengine/testcases/Attic/keep-with-next1.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- keep-with-next1.xml 21 Mar 2005 13:22:07 -0000 1.1.2.1
+++ keep-with-next1.xml 21 Mar 2005 15:35:43 -0000 1.1.2.2
@@ -48,6 +48,23 @@
<fo:block>block11</fo:block>
</fo:flow>
</fo:page-sequence>
+ <fo:page-sequence master-reference="normal">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>block21</fo:block>
+ <fo:block>block22</fo:block>
+ <fo:block keep-with-next.within-column="always">block23</fo:block>
+ <fo:block keep-with-next.within-column="always">block24</fo:block>
+ <fo:block>block25</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block>block26</fo:block>
+ <fo:block>block27</fo:block>
+ <fo:block>block28</fo:block>
+ <fo:block>block29</fo:block>
+ <fo:block>block30</fo:block>
+ </fo:block>
+ <fo:block>block31</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
</fo:root>
</fo>
<checks>
@@ -62,5 +79,17 @@
<eval expected="3" xpath="//lineArea[starts-with(., 'block9')]/ancestor::pageViewport/@nr"/>
<eval expected="4" xpath="//lineArea[starts-with(., 'block10')]/ancestor::pageViewport/@nr"/>
<eval expected="4" xpath="//lineArea[starts-with(., 'block11')]/ancestor::pageViewport/@nr"/>
+
+ <eval expected="5" xpath="//lineArea[starts-with(., 'block21')]/ancestor::pageViewport/@nr"/>
+ <eval expected="5" xpath="//lineArea[starts-with(., 'block22')]/ancestor::pageViewport/@nr"/>
+ <eval expected="6" xpath="//lineArea[starts-with(., 'block23')]/ancestor::pageViewport/@nr"/>
+ <eval expected="6" xpath="//lineArea[starts-with(., 'block24')]/ancestor::pageViewport/@nr"/>
+ <eval expected="6" xpath="//lineArea[starts-with(., 'block25')]/ancestor::pageViewport/@nr"/>
+ <eval expected="6" xpath="//lineArea[starts-with(., 'block26')]/ancestor::pageViewport/@nr"/>
+ <eval expected="7" xpath="//lineArea[starts-with(., 'block27')]/ancestor::pageViewport/@nr"/>
+ <eval expected="7" xpath="//lineArea[starts-with(., 'block28')]/ancestor::pageViewport/@nr"/>
+ <eval expected="7" xpath="//lineArea[starts-with(., 'block29')]/ancestor::pageViewport/@nr"/>
+ <eval expected="8" xpath="//lineArea[starts-with(., 'block30')]/ancestor::pageViewport/@nr"/>
+ <eval expected="8" xpath="//lineArea[starts-with(., 'block31')]/ancestor::pageViewport/@nr"/>
</checks>
</testcase>
No revision
Index: keep-with-next1.xml
===================================================================
RCS file: /home/cvs/xml-fop/test/layoutengine/testcases/Attic/keep-with-next1.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- keep-with-next1.xml 21 Mar 2005 13:22:07 -0000 1.1.2.1
+++ keep-with-next1.xml 21 Mar 2005 15:35:43 -0000 1.1.2.2
@@ -48,6 +48,23 @@
<fo:block>block11</fo:block>
</fo:flow>
</fo:page-sequence>
+ <fo:page-sequence master-reference="normal">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>block21</fo:block>
+ <fo:block>block22</fo:block>
+ <fo:block keep-with-next.within-column="always">block23</fo:block>
+ <fo:block keep-with-next.within-column="always">block24</fo:block>
+ <fo:block>block25</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block>block26</fo:block>
+ <fo:block>block27</fo:block>
+ <fo:block>block28</fo:block>
+ <fo:block>block29</fo:block>
+ <fo:block>block30</fo:block>
+ </fo:block>
+ <fo:block>block31</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
</fo:root>
</fo>
<checks>
@@ -62,5 +79,17 @@
<eval expected="3" xpath="//lineArea[starts-with(., 'block9')]/ancestor::pageViewport/@nr"/>
<eval expected="4" xpath="//lineArea[starts-with(., 'block10')]/ancestor::pageViewport/@nr"/>
<eval expected="4" xpath="//lineArea[starts-with(., 'block11')]/ancestor::pageViewport/@nr"/>
+
+ <eval expected="5" xpath="//lineArea[starts-with(., 'block21')]/ancestor::pageViewport/@nr"/>
+ <eval expected="5" xpath="//lineArea[starts-with(., 'block22')]/ancestor::pageViewport/@nr"/>
+ <eval expected="6" xpath="//lineArea[starts-with(., 'block23')]/ancestor::pageViewport/@nr"/>
+ <eval expected="6" xpath="//lineArea[starts-with(., 'block24')]/ancestor::pageViewport/@nr"/>
+ <eval expected="6" xpath="//lineArea[starts-with(., 'block25')]/ancestor::pageViewport/@nr"/>
+ <eval expected="6" xpath="//lineArea[starts-with(., 'block26')]/ancestor::pageViewport/@nr"/>
+ <eval expected="7" xpath="//lineArea[starts-with(., 'block27')]/ancestor::pageViewport/@nr"/>
+ <eval expected="7" xpath="//lineArea[starts-with(., 'block28')]/ancestor::pageViewport/@nr"/>
+ <eval expected="7" xpath="//lineArea[starts-with(., 'block29')]/ancestor::pageViewport/@nr"/>
+ <eval expected="8" xpath="//lineArea[starts-with(., 'block30')]/ancestor::pageViewport/@nr"/>
+ <eval expected="8" xpath="//lineArea[starts-with(., 'block31')]/ancestor::pageViewport/@nr"/>
</checks>
</testcase>
1.1.2.1 +95 -0 xml-fop/test/layoutengine/testcases/Attic/keep-with-previous1.xml
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org