Removed property values as discussed: http://marc.theaimsgroup.com/?t=112985465700004&r=1&w=2

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

5 files changed, 164 insertions, 72 deletions

diff --git a/test/layoutengine/testcases/block_line-stacking-strategy_1.xml b/test/layoutengine/testcases/block_line-stacking-strategy_1.xml
new file mode 100755
index 000000000..8de776c30
--- /dev/null
+++ b/test/layoutengine/testcases/block_line-stacking-strategy_1.xml
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2005 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.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+  <info>
+    <p>
+      This test checks line-stacking-strategy font-height against inlines of different sizes.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">
+            Before
+            <fo:inline font-size="20pt" 
+                background-color="yellow">bigger
+            </fo:inline>
+            After
+          </fo:block>
+          <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">
+            Before
+            <fo:inline font-size="20pt"
+                border="solid 2pt red"
+                padding="3pt"
+                background-color="yellow">bigger with b &amp; p
+            </fo:inline>
+            After
+          </fo:block>
+          <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">
+            Before
+            <fo:inline font-size="10pt" 
+                baseline-shift="sub" 
+                background-color="yellow">sub
+              <fo:inline font-size="8pt" 
+                  baseline-shift="sub" 
+                  background-color="red">sub
+              </fo:inline>sub
+            </fo:inline>
+            After
+          </fo:block>
+          <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">
+            Before
+            <fo:inline font-size="10pt" 
+                baseline-shift="super" 
+                background-color="yellow">super
+              <fo:inline font-size="8pt" 
+                  baseline-shift="super" 
+                  background-color="red">super
+              </fo:inline>super
+            </fo:inline>
+            After
+          </fo:block>
+          <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">
+            Before
+            <fo:inline font-size="18pt" 
+                baseline-shift="super" 
+                background-color="yellow">super
+              <fo:inline font-size="24pt" 
+                  baseline-shift="sub" 
+                  background-color="red">sub
+                <fo:inline font-size="30pt" 
+                    baseline-shift="super" 
+                    background-color="green">super
+                </fo:inline>sub
+              </fo:inline>super
+            </fo:inline>
+            After
+          </fo:block>
+          <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">
+            Before
+            <fo:inline font-size="18pt" 
+                baseline-shift="sub" 
+                background-color="yellow">sub
+              <fo:inline font-size="24pt" 
+                  baseline-shift="super" 
+                  background-color="red">super
+                <fo:inline font-size="36pt" 
+                    baseline-shift="sub" 
+                    background-color="green">sub
+                </fo:inline>super
+              </fo:inline>sub
+            </fo:inline>
+            After
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="12950" xpath="//flow/block[1]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="-4308" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="12950" xpath="//flow/block[2]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="-4308" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="12950" xpath="//flow/block[3]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="5487" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="3528" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="12950" xpath="//flow/block[4]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="-4450" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="-3794" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="12950" xpath="//flow/block[5]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="-10194" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="1968" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>
+    <eval expected="-16860" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/text[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="12950" xpath="//flow/block[6]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="1835" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="-13722" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>
+    <eval expected="798" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/testcases/inline_alignment-adjust_1.xml b/test/layoutengine/testcases/inline_alignment-adjust_1.xml
index 1ad390a53..ca2cfde50 100755
--- a/test/layoutengine/testcases/inline_alignment-adjust_1.xml
+++ b/test/layoutengine/testcases/inline_alignment-adjust_1.xml
@@ -69,18 +69,6 @@
           <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
             Before <fo:inline font-size="10pt" alignment-adjust="mathematical" background-color="yellow">alignment-adjust="mathematical"</fo:inline> After
           </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-adjust="top" background-color="yellow">alignment-adjust="top"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-adjust="bottom" background-color="yellow">alignment-adjust="bottom"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-adjust="text-top" background-color="yellow">alignment-adjust="text-top"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-adjust="text-bottom" background-color="yellow">alignment-adjust="text-bottom"</fo:inline> After
-          </fo:block>
         </fo:flow>
       </fo:page-sequence>
     </fo:root>
@@ -99,9 +87,5 @@
     <eval expected="2872" xpath="//flow/block[11]/lineArea[1]/inlineparent/@offset"/>
     <eval expected="8616" xpath="//flow/block[12]/lineArea[1]/inlineparent/@offset"/>
     <eval expected="6462" xpath="//flow/block[13]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="10052" xpath="//flow/block[14]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="802" xpath="//flow/block[15]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="10052" xpath="//flow/block[16]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="802" xpath="//flow/block[17]/lineArea[1]/inlineparent/@offset"/>
   </checks>
 </testcase>
diff --git a/test/layoutengine/testcases/inline_alignment-baseline_1.xml b/test/layoutengine/testcases/inline_alignment-baseline_1.xml
index 9b514c7f4..0e1ae430d 100755
--- a/test/layoutengine/testcases/inline_alignment-baseline_1.xml
+++ b/test/layoutengine/testcases/inline_alignment-baseline_1.xml
@@ -69,18 +69,6 @@
           <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
             Before <fo:inline font-size="10pt" alignment-baseline="mathematical" background-color="yellow">alignment-baseline="mathematical"</fo:inline> After
           </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-baseline="top" background-color="yellow">alignment-baseline="top"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-baseline="bottom" background-color="yellow">alignment-baseline="bottom"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-baseline="text-top" background-color="yellow">alignment-baseline="text-top"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-baseline="text-bottom" background-color="yellow">alignment-baseline="text-bottom"</fo:inline> After
-          </fo:block>
         </fo:flow>
       </fo:page-sequence>
     </fo:root>
@@ -99,9 +87,5 @@
     <eval expected="2872" xpath="//flow/block[11]/lineArea[1]/inlineparent/@offset"/>
     <eval expected="574" xpath="//flow/block[12]/lineArea[1]/inlineparent/@offset"/>
     <eval expected="1436" xpath="//flow/block[13]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="0" xpath="//flow/block[14]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="3700" xpath="//flow/block[15]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="0" xpath="//flow/block[16]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="3700" xpath="//flow/block[17]/lineArea[1]/inlineparent/@offset"/>
   </checks>
 </testcase>
diff --git a/test/layoutengine/testcases/inline_alignment-baseline_2.xml b/test/layoutengine/testcases/inline_alignment-baseline_2.xml
index 591ee2c9b..2fc852a76 100755
--- a/test/layoutengine/testcases/inline_alignment-baseline_2.xml
+++ b/test/layoutengine/testcases/inline_alignment-baseline_2.xml
@@ -69,18 +69,6 @@
           <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
             Before <fo:inline font-size="14pt" alignment-baseline="mathematical" background-color="yellow">alignment-baseline="mathematical"</fo:inline> After
           </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
-            Before <fo:inline font-size="14pt" alignment-baseline="top" background-color="yellow">alignment-baseline="top"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
-            Before <fo:inline font-size="14pt" alignment-baseline="bottom" background-color="yellow">alignment-baseline="bottom"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
-            Before <fo:inline font-size="14pt" alignment-baseline="text-top" background-color="yellow">alignment-baseline="text-top"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
-            Before <fo:inline font-size="14pt" alignment-baseline="text-bottom" background-color="yellow">alignment-baseline="text-bottom"</fo:inline> After
-          </fo:block>
         </fo:flow>
       </fo:page-sequence>
     </fo:root>
@@ -124,17 +112,5 @@
 
     <eval expected="1436" xpath="//flow/block[13]/lineArea[1]/text[1]/@offset"/>
     <eval expected="1436" xpath="//flow/block[13]/lineArea[1]/text[2]/@offset"/>
-
-    <eval expected="0" xpath="//flow/block[14]/lineArea[1]/text[1]/@offset"/>
-    <eval expected="0" xpath="//flow/block[14]/lineArea[1]/text[2]/@offset"/>
-
-    <eval expected="0" xpath="//flow/block[15]/lineArea[1]/text[1]/@offset"/>
-    <eval expected="0" xpath="//flow/block[15]/lineArea[1]/text[2]/@offset"/>
-
-    <eval expected="0" xpath="//flow/block[16]/lineArea[1]/text[1]/@offset"/>
-    <eval expected="0" xpath="//flow/block[16]/lineArea[1]/text[2]/@offset"/>
-
-    <eval expected="3700" xpath="//flow/block[17]/lineArea[1]/text[1]/@offset"/>
-    <eval expected="3700" xpath="//flow/block[17]/lineArea[1]/text[2]/@offset"/>
   </checks>
 </testcase>
diff --git a/test/layoutengine/testcases/inline_alignment-baseline_3.xml b/test/layoutengine/testcases/inline_alignment-baseline_3.xml
index 3d32b3595..3359f862d 100755
--- a/test/layoutengine/testcases/inline_alignment-baseline_3.xml
+++ b/test/layoutengine/testcases/inline_alignment-baseline_3.xml
@@ -69,18 +69,6 @@
           <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
             <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="mathematical" background-color="yellow">alignment-baseline="mathematical"</fo:inline> After
           </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
-            <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="top" background-color="yellow">alignment-baseline="top"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
-            <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="bottom" background-color="yellow">alignment-baseline="bottom"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
-            <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="text-top" background-color="yellow">alignment-baseline="text-top"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
-            <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="text-bottom" background-color="yellow">alignment-baseline="text-bottom"</fo:inline> After
-          </fo:block>
         </fo:flow>
       </fo:page-sequence>
     </fo:root>
@@ -99,9 +87,5 @@
     <eval expected="2872" xpath="//flow/block[11]/lineArea[1]/inlineparent[2]/@offset"/>
     <eval expected="1723" xpath="//flow/block[12]/lineArea[1]/inlineparent[2]/@offset"/>
     <eval expected="2154" xpath="//flow/block[13]/lineArea[1]/inlineparent[2]/@offset"/>
-    <eval expected="0" xpath="//flow/block[14]/lineArea[1]/inlineparent[2]/@offset"/>
-    <eval expected="3700" xpath="//flow/block[15]/lineArea[1]/inlineparent[2]/@offset"/>
-    <eval expected="1436" xpath="//flow/block[16]/lineArea[1]/inlineparent[2]/@offset"/>
-    <eval expected="3286" xpath="//flow/block[17]/lineArea[1]/inlineparent[2]/@offset"/>
   </checks>
 </testcase>