aboutsummaryrefslogtreecommitdiffstats
path: root/test/layoutengine/standard-testcases/block_white-space-treatment_2.xml
diff options
context:
space:
mode:
Diffstat (limited to 'test/layoutengine/standard-testcases/block_white-space-treatment_2.xml')
-rw-r--r--test/layoutengine/standard-testcases/block_white-space-treatment_2.xml72
1 files changed, 41 insertions, 31 deletions
diff --git a/test/layoutengine/standard-testcases/block_white-space-treatment_2.xml b/test/layoutengine/standard-testcases/block_white-space-treatment_2.xml
index fbd993d5b..4efd89209 100644
--- a/test/layoutengine/standard-testcases/block_white-space-treatment_2.xml
+++ b/test/layoutengine/standard-testcases/block_white-space-treatment_2.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2005 The Apache Software Foundation
+ Copyright 2005-2006 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.
@@ -18,10 +18,8 @@
<testcase>
<info>
<p>
- This test checks white space handling for white-space-treatment.
- with white-spcae-collapse="false".
- The test currently fails because white space around formatter generated
- linebreaks is not removed correctly.
+ This test checks white space handling for white-space-treatment
+ with white-space-collapse="false".
</p>
</info>
<fo>
@@ -34,52 +32,64 @@
<fo:page-sequence master-reference="normal" white-space-collapse="false">
<fo:flow flow-name="xsl-region-body">
<fo:block white-space-treatment="ignore-if-surrounding-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt">
- ignore-if-surrounding-linefeed
- all
- spaces
+ ignore-if-surrounding-linefeed
+ all
+ spaces
</fo:block>
<fo:block white-space-treatment="ignore" background-color="silver" margin="1pt 0pt 1pt 0pt">
- ignore
- all
- spaces
+ ignore
+ all
+ spaces
</fo:block>
<fo:block white-space-treatment="preserve" background-color="silver" margin="1pt 0pt 1pt 0pt">
- preserve
- all
- spaces
+ preserve
+ all
+ spaces
</fo:block>
<fo:block white-space-treatment="ignore-if-before-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt">
- ignore-if-before-linefeed
- all
- spaces
+ ignore-if-before-linefeed
+ all
+ spaces
</fo:block>
<fo:block white-space-treatment="ignore-if-after-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt">
- ignore-if-after-linefeed
- all
- spaces
+ ignore-if-after-linefeed
+ all
+ spaces
</fo:block>
</fo:flow>
</fo:page-sequence>
</fo:root>
</fo>
<checks>
- <!-- The tests are currently incomplete but enough to fail -->
- <eval expected="3" xpath="count(//flow/block[1]/lineArea[1]/text/word)"/>
- <eval expected="2" xpath="count(//flow/block[1]/lineArea[1]/text/space)"/>
+ <eval expected="2" xpath="count(//flow/block[1]/lineArea)"/>
+ <eval expected="2" xpath="count(//flow/block[1]/lineArea[1]/text/word)"/>
+ <eval expected="50" xpath="count(//flow/block[1]/lineArea[1]/text/space)"/>
+ <eval expected="1" xpath="count(//flow/block[1]/lineArea[2]/text/word)"/>
+ <eval expected="0" xpath="count(//flow/block[1]/lineArea[2]/text/space)"/>
+ <eval expected="1" xpath="count(//flow/block[2]/lineArea)"/>
<eval expected="1" xpath="count(//flow/block[2]/lineArea[1]/text/word)"/>
<eval expected="0" xpath="count(//flow/block[2]/lineArea[1]/text/space)"/>
- <eval expected="0" xpath="count(//flow/block[3]/lineArea[1]/text)"/>
+ <eval expected="3" xpath="count(//flow/block[3]/lineArea)"/>
+ <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/text/word)"/>
+ <eval expected="90" xpath="count(//flow/block[3]/lineArea[1]/text/space)"/>
<eval expected="1" xpath="count(//flow/block[3]/lineArea[2]/text/word)"/>
- <eval expected="0" xpath="count(//flow/block[3]/lineArea[2]/text/space)"/>
- <eval expected="1" xpath="count(//flow/block[3]/lineArea[3]/text/word)"/>
- <eval expected="0" xpath="count(//flow/block[3]/lineArea[3]/text/space)"/>
- <eval expected="1" xpath="count(//flow/block[3]/lineArea[4]/text/word)"/>
- <eval expected="0" xpath="count(//flow/block[3]/lineArea[4]/text/space)"/>
+ <eval expected="96" xpath="count(//flow/block[3]/lineArea[2]/text/space)"/>
+ <eval expected="0" xpath="count(//flow/block[3]/lineArea[3]/text/word)"/>
+ <eval expected="38" xpath="count(//flow/block[3]/lineArea[3]/text/space)"/>
- <eval expected="1" xpath="count(//flow/block[4]/lineArea[1]/text/word)"/>
- <eval expected="0" xpath="count(//flow/block[4]/lineArea[1]/text/space)"/>
+ <eval expected="2" xpath="count(//flow/block[4]/lineArea)"/>
+ <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text/word)"/>
+ <eval expected="58" xpath="count(//flow/block[4]/lineArea[1]/text/space)"/>
+ <eval expected="1" xpath="count(//flow/block[4]/lineArea[2]/text/word)"/>
+ <eval expected="77" xpath="count(//flow/block[4]/lineArea[2]/text/space)"/>
+
+ <eval expected="2" xpath="count(//flow/block[5]/lineArea)"/>
+ <eval expected="2" xpath="count(//flow/block[5]/lineArea[1]/text/word)"/>
+ <eval expected="56" xpath="count(//flow/block[5]/lineArea[1]/text/space)"/>
+ <eval expected="1" xpath="count(//flow/block[5]/lineArea[2]/text/word)"/>
+ <eval expected="72" xpath="count(//flow/block[5]/lineArea[2]/text/space)"/>
</checks>
</testcase>