diff options
| author | Vincent Hennebert <vhennebert@apache.org> | 2014-03-27 20:49:11 +0000 |
|---|---|---|
| committer | Vincent Hennebert <vhennebert@apache.org> | 2014-03-27 20:49:11 +0000 |
| commit | f5e524b0b29ee477cbde63f8a946e80ee1134348 (patch) | |
| tree | f75c4c059e5b3145767eeaf3ed42a1515faf4f02 /test/layoutengine | |
| parent | daad32822e9da5a05bb8dbe17878c8e677d0af29 (diff) | |
| download | xmlgraphics-fop-f5e524b0b29ee477cbde63f8a946e80ee1134348.tar.gz xmlgraphics-fop-f5e524b0b29ee477cbde63f8a946e80ee1134348.zip | |
Handle middle-of-the-page case without using a glue.
Using a glue may cause a spurious empty page if the multi-switch is at the end of the flow, with no satisfying way of fixing that.
Patch by Seifeddine Dridi
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_WhitespaceManagement@1582469 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test/layoutengine')
| -rw-r--r-- | test/layoutengine/standard-testcases/multi-switch_best-fit_multiple-variants.xml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/test/layoutengine/standard-testcases/multi-switch_best-fit_multiple-variants.xml b/test/layoutengine/standard-testcases/multi-switch_best-fit_multiple-variants.xml index bb0715fa0..11b3cfe7d 100644 --- a/test/layoutengine/standard-testcases/multi-switch_best-fit_multiple-variants.xml +++ b/test/layoutengine/standard-testcases/multi-switch_best-fit_multiple-variants.xml @@ -106,13 +106,13 @@ <!-- 1. First variant --> <eval expected="3" xpath="count(//pageSequence[1]/pageViewport)"/> <eval expected="Filler" xpath="//pageSequence[1]/pageViewport[2]//flow/block[1]"/> - <eval expected="Variant 1 line 1" xpath="//pageSequence[1]/pageViewport[2]//flow/block[3]/block/block[1]"/> + <eval expected="Variant 1 line 1" xpath="//pageSequence[1]/pageViewport[2]//flow/block[3]"/> <eval expected="This text should be on page 3." xpath="//pageSequence[1]/pageViewport[3]//flow/block[1]"/> <!-- 2. Second variant --> <eval expected="3" xpath="count(//pageSequence[2]/pageViewport)"/> <eval expected="Page 2 line 1" xpath="//pageSequence[2]/pageViewport[2]//flow/block[1]"/> - <eval expected="Variant 2 line 1" xpath="//pageSequence[2]/pageViewport[2]//flow/block[4]/block/block[1]"/> + <eval expected="Variant 2 line 1" xpath="//pageSequence[2]/pageViewport[2]//flow/block[4]"/> <eval expected="This text should be on page 3." xpath="//pageSequence[2]/pageViewport[3]//flow/block[1]"/> <!-- 3. No variant --> @@ -122,8 +122,9 @@ <eval expected="Page 2 line 2" xpath="//pageSequence[3]/pageViewport[2]//flow/block[2]"/> <eval expected="Filler" xpath="//pageSequence[3]/pageViewport[2]//flow/block[3]"/> <eval expected="Before the multi-switch" xpath="//pageSequence[3]/pageViewport[2]//flow/block[4]"/> - <eval expected="2" xpath="count(//pageSequence[3]/pageViewport[3]//flow/block)"/> - <eval expected="Variant 1 line 1" xpath="//pageSequence[3]/pageViewport[3]//flow/block[1]/block/block[1]"/> - <eval expected="This text should be on page 3." xpath="//pageSequence[3]/pageViewport[3]//flow/block[2]"/> + <eval expected="3" xpath="count(//pageSequence[3]/pageViewport[3]//flow/block)"/> + <eval expected="Variant 1 line 1" xpath="//pageSequence[3]/pageViewport[3]//flow/block[1]"/> + <eval expected="Variant 1 line 2" xpath="//pageSequence[3]/pageViewport[3]//flow/block[2]"/> + <eval expected="This text should be on page 3." xpath="//pageSequence[3]/pageViewport[3]//flow/block[3]"/> </checks> </testcase> |