Revision of refinement white-space handling (cfr. Bugzilla 37639)

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

3 files changed, 17 insertions, 21 deletions

diff --git a/test/layoutengine/standard-testcases/block_white-space-collapse_2.xml b/test/layoutengine/standard-testcases/block_white-space-collapse_2.xml
index 4f72ba7b9..cf5f4cc0d 100644
--- a/test/layoutengine/standard-testcases/block_white-space-collapse_2.xml
+++ b/test/layoutengine/standard-testcases/block_white-space-collapse_2.xml
@@ -41,7 +41,7 @@
             word  <fo:character character="&#xa;" />
 <fo:character character=" " /><fo:character character=" " />          and  
             linefeeds<fo:character character=" " /><fo:character character=" " />
-            everywhere<fo:character character=" " /> 
+            everywhere<fo:character character=" " />          
           </fo:block>
           <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">  
             <fo:block background-color="orange">
@@ -102,10 +102,6 @@
   </fo>
   <checks>
     <!-- The tests are currently incomplete but enough to fail -->
-    <eval expected="8" xpath="count(//flow/block[1]/lineArea[1]/text/word)"/>
-    <eval expected="35" 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="60" xpath="count(//flow/block[1]/lineArea[1]/text/space)"/>
   </checks>
 </testcase>
diff --git a/test/layoutengine/standard-testcases/leader_text-align.xml b/test/layoutengine/standard-testcases/leader_text-align.xml
index 086090f28..70c91bb9a 100644
--- a/test/layoutengine/standard-testcases/leader_text-align.xml
+++ b/test/layoutengine/standard-testcases/leader_text-align.xml
@@ -112,27 +112,27 @@
     <eval expected="12000" xpath="//flow/block[4]/lineArea/inlineparent/@ipd"/>
 
     <eval expected="360000" xpath="//flow/block[5]/lineArea/@ipd"/>
-    <eval expected="215456" xpath="//flow/block[5]/lineArea/inlineparent/@ipd"/>
+    <eval expected="211186" xpath="//flow/block[5]/lineArea/inlineparent/@ipd"/>
 
     <eval expected="360000" xpath="//flow/block[6]/lineArea/@ipd"/>
-    <eval expected="178155" xpath="//flow/block[6]/lineArea/leader/@ipd"/>
+    <eval expected="174081" xpath="//flow/block[6]/lineArea/leader/@ipd"/>
 
     <eval expected="360000" xpath="//flow/block[7]/lineArea/@ipd"/>
-    <eval expected="206165" xpath="//flow/block[7]/lineArea/space/@ipd"/>
+    <eval expected="201939" xpath="//flow/block[7]/lineArea/space/@ipd"/>
 
     <eval expected="360000" xpath="//flow/block[8]/lineArea/@ipd"/>
     <eval expected="161589" xpath="//flow/block[8]/lineArea/inlineparent/@ipd"/>
 
     <eval expected="360000" xpath="//flow/block[9]/lineArea/@ipd"/>
-    <eval expected="215088" xpath="//flow/block[9]/lineArea/@start-indent"/>
+    <eval expected="211752" xpath="//flow/block[9]/lineArea/@start-indent"/>
     <eval expected="12000" xpath="//flow/block[9]/lineArea/inlineparent/@ipd"/>
 
     <eval expected="360000" xpath="//flow/block[10]/lineArea/@ipd"/>
-    <eval expected="178404" xpath="//flow/block[10]/lineArea/@start-indent"/>
+    <eval expected="175068" xpath="//flow/block[10]/lineArea/@start-indent"/>
     <eval expected="12000" xpath="//flow/block[10]/lineArea/leader/@ipd"/>
 
     <eval expected="360000" xpath="//flow/block[11]/lineArea/@ipd"/>
-    <eval expected="205752" xpath="//flow/block[11]/lineArea/@start-indent"/>
+    <eval expected="202416" xpath="//flow/block[11]/lineArea/@start-indent"/>
     <eval expected="12000" xpath="//flow/block[11]/lineArea/space/@ipd"/>
 
     <eval expected="360000" xpath="//flow/block[12]/lineArea/@ipd"/>
@@ -140,15 +140,15 @@
     <eval expected="12000" xpath="//flow/block[12]/lineArea/inlineparent/@ipd"/>
 
     <eval expected="360000" xpath="//flow/block[13]/lineArea/@ipd"/>
-    <eval expected="100878" xpath="//flow/block[13]/lineArea/@start-indent"/>
+    <eval expected="99210" xpath="//flow/block[13]/lineArea/@start-indent"/>
     <eval expected="12000" xpath="//flow/block[13]/lineArea/inlineparent/@ipd"/>
 
     <eval expected="360000" xpath="//flow/block[14]/lineArea/@ipd"/>
-    <eval expected="82536" xpath="//flow/block[14]/lineArea/@start-indent"/>
+    <eval expected="80868" xpath="//flow/block[14]/lineArea/@start-indent"/>
     <eval expected="12000" xpath="//flow/block[14]/lineArea/leader/@ipd"/>
 
     <eval expected="360000" xpath="//flow/block[15]/lineArea/@ipd"/>
-    <eval expected="96210" xpath="//flow/block[15]/lineArea/@start-indent"/>
+    <eval expected="94542" xpath="//flow/block[15]/lineArea/@start-indent"/>
     <eval expected="12000" xpath="//flow/block[15]/lineArea/space/@ipd"/>
 
     <eval expected="360000" xpath="//flow/block[16]/lineArea/@ipd"/>
diff --git a/test/layoutengine/standard-testcases/leader_toc.xml b/test/layoutengine/standard-testcases/leader_toc.xml
index c8b85ce1b..1ac421de9 100644
--- a/test/layoutengine/standard-testcases/leader_toc.xml
+++ b/test/layoutengine/standard-testcases/leader_toc.xml
@@ -122,32 +122,32 @@
   <checks>
     <eval expected="11100" xpath="//flow/block[1]/lineArea/@bpd"/>
     <eval expected="360000" xpath="//flow/block[1]/lineArea/@ipd"/>
-    <eval expected="268268" xpath="//flow/block[1]/lineArea/inlineparent[2]/@ipd"/>
+    <eval expected="263812" xpath="//flow/block[1]/lineArea/inlineparent[2]/@ipd"/>
     <eval expected="5280" xpath="//flow/block[1]/lineArea/inlineparent[2]/@offset"/>
 
     <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/>
     <eval expected="331654" xpath="//flow/block[2]/lineArea/@ipd"/>
-    <eval expected="236051" xpath="//flow/block[2]/lineArea/inlineparent[2]/@ipd"/>
+    <eval expected="231669" xpath="//flow/block[2]/lineArea/inlineparent[2]/@ipd"/>
     <eval expected="5280" xpath="//flow/block[2]/lineArea/inlineparent[2]/@offset"/>
 
     <eval expected="11100" xpath="//flow/block[3]/lineArea/@bpd"/>
     <eval expected="331654" xpath="//flow/block[3]/lineArea/@ipd"/>
-    <eval expected="236051" xpath="//flow/block[3]/lineArea/inlineparent[2]/@ipd"/>
+    <eval expected="231669" xpath="//flow/block[3]/lineArea/inlineparent[2]/@ipd"/>
     <eval expected="5280" xpath="//flow/block[3]/lineArea/inlineparent[2]/@offset"/>
 
     <eval expected="11100" xpath="//flow/block[4]/lineArea/@bpd"/>
     <eval expected="360000" xpath="//flow/block[4]/lineArea/@ipd"/>
-    <eval expected="268268" xpath="//flow/block[4]/lineArea/inlineparent[2]/@ipd"/>
+    <eval expected="263812" xpath="//flow/block[4]/lineArea/inlineparent[2]/@ipd"/>
     <eval expected="5280" xpath="//flow/block[4]/lineArea/inlineparent[2]/@offset"/>
 
     <eval expected="11100" xpath="//flow/block[5]/lineArea/@bpd"/>
     <eval expected="331654" xpath="//flow/block[5]/lineArea/@ipd"/>
-    <eval expected="236051" xpath="//flow/block[5]/lineArea/inlineparent[2]/@ipd"/>
+    <eval expected="231669" xpath="//flow/block[5]/lineArea/inlineparent[2]/@ipd"/>
     <eval expected="5280" xpath="//flow/block[5]/lineArea/inlineparent[2]/@offset"/>
 
     <eval expected="11100" xpath="//flow/block[6]/lineArea/@bpd"/>
     <eval expected="331654" xpath="//flow/block[6]/lineArea/@ipd"/>
-    <eval expected="236051" xpath="//flow/block[6]/lineArea/inlineparent[2]/@ipd"/>
+    <eval expected="231669" xpath="//flow/block[6]/lineArea/inlineparent[2]/@ipd"/>
     <eval expected="5280" xpath="//flow/block[6]/lineArea/inlineparent[2]/@offset"/>
   </checks>
 </testcase>