Patch supplied by Manuel Mall in bugzilla 36036 with minor modifications

Submitted by: Manuel Mall <mm.at.arcus.com.au>

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

3 files changed, 103 insertions, 73 deletions

diff --git a/test/layoutengine/disabled-testcases.txt b/test/layoutengine/disabled-testcases.txt
index 1827ae21f..ead0ff473 100644
--- a/test/layoutengine/disabled-testcases.txt
+++ b/test/layoutengine/disabled-testcases.txt
@@ -14,5 +14,4 @@ table-border-collapse1.xml
 table-border-collapse2.xml
 table-column4.xml
 table-fixed2.xml
-font-size-absolute.xml
 font-size-relative.xml
diff --git a/test/layoutengine/testcases/font-size-absolute.xml b/test/layoutengine/testcases/font-size-absolute.xml
index 9415f71da..d5af4c49d 100644
--- a/test/layoutengine/testcases/font-size-absolute.xml
+++ b/test/layoutengine/testcases/font-size-absolute.xml
@@ -77,5 +77,33 @@
     <eval expected="14400" xpath="//flow/block[5]/lineArea/text/@font-size"/>
     <eval expected="17280" xpath="//flow/block[6]/lineArea/text/@font-size"/>
     <eval expected="20736" xpath="//flow/block[7]/lineArea/text/@font-size"/>
+    <eval expected="6944" xpath="//flow/block[8]/lineArea/text/@font-size"/>
+    <eval expected="8333" xpath="//flow/block[9]/lineArea/text/@font-size"/>
+    <eval expected="10000" xpath="//flow/block[10]/lineArea/text/@font-size"/>
+    <eval expected="12000" xpath="//flow/block[11]/lineArea/text/@font-size"/>
+    <eval expected="14400" xpath="//flow/block[12]/lineArea/text/@font-size"/>
+    <eval expected="17280" xpath="//flow/block[13]/lineArea/text/@font-size"/>
+    <eval expected="20736" xpath="//flow/block[14]/lineArea/text/@font-size"/>
+    <eval expected="6944" xpath="//flow/block[15]/lineArea/text/@font-size"/>
+    <eval expected="8333" xpath="//flow/block[16]/lineArea/text/@font-size"/>
+    <eval expected="10000" xpath="//flow/block[17]/lineArea/text/@font-size"/>
+    <eval expected="12000" xpath="//flow/block[18]/lineArea/text/@font-size"/>
+    <eval expected="14400" xpath="//flow/block[19]/lineArea/text/@font-size"/>
+    <eval expected="17280" xpath="//flow/block[20]/lineArea/text/@font-size"/>
+    <eval expected="20736" xpath="//flow/block[21]/lineArea/text/@font-size"/>
+    <eval expected="6944" xpath="//flow/block[22]/lineArea/text/@font-size"/>
+    <eval expected="8333" xpath="//flow/block[23]/lineArea/text/@font-size"/>
+    <eval expected="10000" xpath="//flow/block[24]/lineArea/text/@font-size"/>
+    <eval expected="12000" xpath="//flow/block[25]/lineArea/text/@font-size"/>
+    <eval expected="14400" xpath="//flow/block[26]/lineArea/text/@font-size"/>
+    <eval expected="17280" xpath="//flow/block[27]/lineArea/text/@font-size"/>
+    <eval expected="20736" xpath="//flow/block[28]/lineArea/text/@font-size"/>
+    <eval expected="6944" xpath="//flow/block[29]/lineArea/text/@font-size"/>
+    <eval expected="8333" xpath="//flow/block[30]/lineArea/text/@font-size"/>
+    <eval expected="10000" xpath="//flow/block[31]/lineArea/text/@font-size"/>
+    <eval expected="12000" xpath="//flow/block[32]/lineArea/text/@font-size"/>
+    <eval expected="14400" xpath="//flow/block[33]/lineArea/text/@font-size"/>
+    <eval expected="17280" xpath="//flow/block[34]/lineArea/text/@font-size"/>
+    <eval expected="20736" xpath="//flow/block[35]/lineArea/text/@font-size"/>
   </checks>
 </testcase>
diff --git a/test/layoutengine/testcases/font-size-relative.xml b/test/layoutengine/testcases/font-size-relative.xml
index 5917f4d9f..a46cb0f7b 100644
--- a/test/layoutengine/testcases/font-size-relative.xml
+++ b/test/layoutengine/testcases/font-size-relative.xml
@@ -30,90 +30,72 @@
       </fo:layout-master-set>
       <fo:page-sequence master-reference="normal" white-space-collapse="true">
         <fo:flow flow-name="xsl-region-body">
-          <fo:block font-family="serif" font-size="24pt"> font-family="serif" font-size="24pt"
+          <fo:block font-family="serif"> font-family="serif" font-size not specified
             <fo:block font-family="serif" font-size="smaller"> font-family="serif" font-size="smaller"
               <fo:block font-family="serif" font-size="smaller"> font-family="serif" font-size="smaller"
                 <fo:block font-family="serif" font-size="smaller"> font-family="serif" font-size="smaller"
                   <fo:block font-family="serif" font-size="smaller"> font-family="serif" font-size="smaller"
                     <fo:block font-family="serif" font-size="smaller"> font-family="serif" font-size="smaller"
-                      <fo:block font-family="serif" font-size="smaller"> font-family="serif" font-size="smaller"
-                        <fo:block font-family="serif" font-size="smaller"> font-family="serif" font-size="smaller"
-                          <fo:block font-family="serif" font-size="larger"> font-family="serif" font-size="larger"
-                            <fo:block font-family="serif" font-size="larger"> font-family="serif" font-size="larger"
-                              <fo:block font-family="serif" font-size="larger"> font-family="serif" font-size="larger"
-                                <fo:block font-family="serif" font-size="larger"> font-family="serif" font-size="larger"
-                                  <fo:block font-family="serif" font-size="larger"> font-family="serif" font-size="larger"
-                                    <fo:block font-family="serif" font-size="larger"> font-family="serif" font-size="larger"
-                                      <fo:block font-family="serif" font-size="larger"> font-family="serif" font-size="larger"
-                                      </fo:block>
-                                    </fo:block>
-                                  </fo:block>
-                                </fo:block>
-                              </fo:block>
-                            </fo:block>
-                          </fo:block>
-                        </fo:block>
-                      </fo:block>
                     </fo:block>
                   </fo:block>
                 </fo:block>
               </fo:block>
             </fo:block>
           </fo:block>
-          <fo:block font-family="sans-serif" font-size="24pt"> font-family="sans-serif" font-size="24pt"
+          <fo:block font-family="serif"> font-family="serif" font-size not specified
+            <fo:block font-family="serif" font-size="larger"> font-family="serif" font-size="larger"
+              <fo:block font-family="serif" font-size="larger"> font-family="serif" font-size="larger"
+                <fo:block font-family="serif" font-size="larger"> font-family="serif" font-size="larger"
+                  <fo:block font-family="serif" font-size="larger"> font-family="serif" font-size="larger"
+                    <fo:block font-family="serif" font-size="larger"> font-family="serif" font-size="larger"
+                    </fo:block>
+                  </fo:block>
+                </fo:block>
+              </fo:block>
+            </fo:block>
+          </fo:block>
+          <fo:block font-family="sans-serif"> font-family="sans-serif" font-size not specified
             <fo:block font-family="sans-serif" font-size="smaller"> font-family="sans-serif" font-size="smaller"
               <fo:block font-family="sans-serif" font-size="smaller"> font-family="sans-serif" font-size="smaller"
                 <fo:block font-family="sans-serif" font-size="smaller"> font-family="sans-serif" font-size="smaller"
                   <fo:block font-family="sans-serif" font-size="smaller"> font-family="sans-serif" font-size="smaller"
                     <fo:block font-family="sans-serif" font-size="smaller"> font-family="sans-serif" font-size="smaller"
-                      <fo:block font-family="sans-serif" font-size="smaller"> font-family="sans-serif" font-size="smaller"
-                        <fo:block font-family="sans-serif" font-size="smaller"> font-family="sans-serif" font-size="smaller"
-                          <fo:block font-family="sans-serif" font-size="larger"> font-family="sans-serif" font-size="larger"
-                            <fo:block font-family="sans-serif" font-size="larger"> font-family="sans-serif" font-size="larger"
-                              <fo:block font-family="sans-serif" font-size="larger"> font-family="sans-serif" font-size="larger"
-                                <fo:block font-family="sans-serif" font-size="larger"> font-family="sans-serif" font-size="larger"
-                                  <fo:block font-family="sans-serif" font-size="larger"> font-family="sans-serif" font-size="larger"
-                                    <fo:block font-family="sans-serif" font-size="larger"> font-family="sans-serif" font-size="larger"
-                                      <fo:block font-family="sans-serif" font-size="larger"> font-family="sans-serif" font-size="larger"
-                                      </fo:block>
-                                    </fo:block>
-                                  </fo:block>
-                                </fo:block>
-                              </fo:block>
-                            </fo:block>
-                          </fo:block>
-                        </fo:block>
-                      </fo:block>
                     </fo:block>
                   </fo:block>
                 </fo:block>
               </fo:block>
             </fo:block>
           </fo:block>
-          <fo:block font-family="monospace" font-size="24pt"> font-family="monospace" font-size="24pt"
+          <fo:block font-family="sans-serif"> font-family="sans-serif" font-size not specified
+            <fo:block font-family="sans-serif" font-size="larger"> font-family="sans-serif" font-size="larger"
+              <fo:block font-family="sans-serif" font-size="larger"> font-family="sans-serif" font-size="larger"
+                <fo:block font-family="sans-serif" font-size="larger"> font-family="sans-serif" font-size="larger"
+                  <fo:block font-family="sans-serif" font-size="larger"> font-family="sans-serif" font-size="larger"
+                    <fo:block font-family="sans-serif" font-size="larger"> font-family="sans-serif" font-size="larger"
+                    </fo:block>
+                  </fo:block>
+                </fo:block>
+              </fo:block>
+            </fo:block>
+          </fo:block>
+          <fo:block font-family="monospace"> font-family="monospace" font-size not specified
             <fo:block font-family="monospace" font-size="smaller"> font-family="monospace" font-size="smaller"
               <fo:block font-family="monospace" font-size="smaller"> font-family="monospace" font-size="smaller"
                 <fo:block font-family="monospace" font-size="smaller"> font-family="monospace" font-size="smaller"
                   <fo:block font-family="monospace" font-size="smaller"> font-family="monospace" font-size="smaller"
                     <fo:block font-family="monospace" font-size="smaller"> font-family="monospace" font-size="smaller"
-                      <fo:block font-family="monospace" font-size="smaller"> font-family="monospace" font-size="smaller"
-                        <fo:block font-family="monospace" font-size="smaller"> font-family="monospace" font-size="smaller"
-                          <fo:block font-family="monospace" font-size="larger"> font-family="monospace" font-size="larger"
-                            <fo:block font-family="monospace" font-size="larger"> font-family="monospace" font-size="larger"
-                              <fo:block font-family="monospace" font-size="larger"> font-family="monospace" font-size="larger"
-                                <fo:block font-family="monospace" font-size="larger"> font-family="monospace" font-size="larger"
-                                  <fo:block font-family="monospace" font-size="larger"> font-family="monospace" font-size="larger"
-                                    <fo:block font-family="monospace" font-size="larger"> font-family="monospace" font-size="larger"
-                                      <fo:block font-family="monospace" font-size="larger"> font-family="monospace" font-size="larger"
-                                      </fo:block>
-                                    </fo:block>
-                                  </fo:block>
-                                </fo:block>
-                              </fo:block>
-                            </fo:block>
-                          </fo:block>
-                        </fo:block>
-                      </fo:block>
+                    </fo:block>
+                  </fo:block>
+                </fo:block>
+              </fo:block>
+            </fo:block>
+          </fo:block>
+          <fo:block font-family="monospace"> font-family="monospace" font-size not specified
+            <fo:block font-family="monospace" font-size="larger"> font-family="monospace" font-size="larger"
+              <fo:block font-family="monospace" font-size="larger"> font-family="monospace" font-size="larger"
+                <fo:block font-family="monospace" font-size="larger"> font-family="monospace" font-size="larger"
+                  <fo:block font-family="monospace" font-size="larger"> font-family="monospace" font-size="larger"
+                    <fo:block font-family="monospace" font-size="larger"> font-family="monospace" font-size="larger"
                     </fo:block>
                   </fo:block>
                 </fo:block>
@@ -125,20 +107,41 @@
     </fo:root>
   </fo>
   <checks>
-    <eval expected="24000" xpath="//flow/block[1]/lineArea/text/@font-size"/>
-    <eval expected="20000" xpath="//flow/block[1]/block/lineArea/text/@font-size"/>
-    <eval expected="16666" xpath="//flow/block[1]/block/block/lineArea/text/@font-size"/>
-    <eval expected="13888" xpath="//flow/block[1]/block/block/block/lineArea/text/@font-size"/>
-    <eval expected="11573" xpath="//flow/block[1]/block/block/block/block/lineArea/text/@font-size"/>
-    <eval expected="9644" xpath="//flow/block[1]/block/block/block/block/block/lineArea/text/@font-size"/>
-    <eval expected="8036" xpath="//flow/block[1]/block/block/block/block/block/block/lineArea/text/@font-size"/>
-    <eval expected="6696" xpath="//flow/block[1]/block/block/block/block/block/block/block/lineArea/text/@font-size"/>
-    <eval expected="8035" xpath="//flow/block[1]/block/block/block/block/block/block/block/block/lineArea/text/@font-size"/>
-    <eval expected="9642" xpath="//flow/block[1]/block/block/block/block/block/block/block/block/block/lineArea/text/@font-size"/>
-    <eval expected="11570" xpath="//flow/block[1]/block/block/block/block/block/block/block/block/block/block/lineArea/text/@font-size"/>
-    <eval expected="13884" xpath="//flow/block[1]/block/block/block/block/block/block/block/block/block/block/block/lineArea/text/@font-size"/>
-    <eval expected="16660" xpath="//flow/block[1]/block/block/block/block/block/block/block/block/block/block/block/block/lineArea/text/@font-size"/>
-    <eval expected="19992" xpath="//flow/block[1]/block/block/block/block/block/block/block/block/block/block/block/block/block/lineArea/text/@font-size"/>
-    <eval expected="23990" xpath="//flow/block[1]/block/block/block/block/block/block/block/block/block/block/block/block/block/block/lineArea/text/@font-size"/>
+    <eval expected="12000" xpath="//flow/block[1]/lineArea/text/@font-size"/>
+    <eval expected="9999" xpath="//flow/block[1]/block/lineArea/text/@font-size"/>
+    <eval expected="8332" xpath="//flow/block[1]/block/block/lineArea/text/@font-size"/>
+    <eval expected="6943" xpath="//flow/block[1]/block/block/block/lineArea/text/@font-size"/>
+    <eval expected="5785" xpath="//flow/block[1]/block/block/block/block/lineArea/text/@font-size"/>
+    <eval expected="4820" xpath="//flow/block[1]/block/block/block/block/block/lineArea/text/@font-size"/>
+    <eval expected="12000" xpath="//flow/block[2]/lineArea/text/@font-size"/>
+    <eval expected="14400" xpath="//flow/block[2]/block/lineArea/text/@font-size"/>
+    <eval expected="17280" xpath="//flow/block[2]/block/block/lineArea/text/@font-size"/>
+    <eval expected="20736" xpath="//flow/block[2]/block/block/block/lineArea/text/@font-size"/>
+    <eval expected="24883" xpath="//flow/block[2]/block/block/block/block/lineArea/text/@font-size"/>
+    <eval expected="29859" xpath="//flow/block[2]/block/block/block/block/block/lineArea/text/@font-size"/>
+    <eval expected="12000" xpath="//flow/block[3]/lineArea/text/@font-size"/>
+    <eval expected="9999" xpath="//flow/block[3]/block/lineArea/text/@font-size"/>
+    <eval expected="8332" xpath="//flow/block[3]/block/block/lineArea/text/@font-size"/>
+    <eval expected="6943" xpath="//flow/block[3]/block/block/block/lineArea/text/@font-size"/>
+    <eval expected="5785" xpath="//flow/block[3]/block/block/block/block/lineArea/text/@font-size"/>
+    <eval expected="4820" xpath="//flow/block[3]/block/block/block/block/block/lineArea/text/@font-size"/>
+    <eval expected="12000" xpath="//flow/block[4]/lineArea/text/@font-size"/>
+    <eval expected="14400" xpath="//flow/block[4]/block/lineArea/text/@font-size"/>
+    <eval expected="17280" xpath="//flow/block[4]/block/block/lineArea/text/@font-size"/>
+    <eval expected="20736" xpath="//flow/block[4]/block/block/block/lineArea/text/@font-size"/>
+    <eval expected="24883" xpath="//flow/block[4]/block/block/block/block/lineArea/text/@font-size"/>
+    <eval expected="29859" xpath="//flow/block[4]/block/block/block/block/block/lineArea/text/@font-size"/>
+    <eval expected="12000" xpath="//flow/block[5]/lineArea/text/@font-size"/>
+    <eval expected="9999" xpath="//flow/block[5]/block/lineArea/text/@font-size"/>
+    <eval expected="8332" xpath="//flow/block[5]/block/block/lineArea/text/@font-size"/>
+    <eval expected="6943" xpath="//flow/block[5]/block/block/block/lineArea/text/@font-size"/>
+    <eval expected="5785" xpath="//flow/block[5]/block/block/block/block/lineArea/text/@font-size"/>
+    <eval expected="4820" xpath="//flow/block[5]/block/block/block/block/block/lineArea/text/@font-size"/>
+    <eval expected="12000" xpath="//flow/block[6]/lineArea/text/@font-size"/>
+    <eval expected="14400" xpath="//flow/block[6]/block/lineArea/text/@font-size"/>
+    <eval expected="17280" xpath="//flow/block[6]/block/block/lineArea/text/@font-size"/>
+    <eval expected="20736" xpath="//flow/block[6]/block/block/block/lineArea/text/@font-size"/>
+    <eval expected="24883" xpath="//flow/block[6]/block/block/block/block/lineArea/text/@font-size"/>
+    <eval expected="29859" xpath="//flow/block[6]/block/block/block/block/block/lineArea/text/@font-size"/>
   </checks>
 </testcase>