Fixed scalefit to work when contentdepth="100%".

diff --git a/xsl/fo/graphics.xsl b/xsl/fo/graphics.xsl
index 979156da5e6931b4d39f36e2016d839e0d209815..25509ecd0075d8884bed06175ebaf8325d8de1cb 100644 (file)
--- a/xsl/fo/graphics.xsl
+++ b/xsl/fo/graphics.xsl
@@ -107,7 +107,9 @@
   <xsl:variable name="scalefit">
     <xsl:choose>
       <xsl:when test="$ignore.image.scaling != 0">0</xsl:when>
-      <xsl:when test="@contentwidth or @contentdepth">0</xsl:when>
+      <xsl:when test="@contentwidth">0</xsl:when>
+      <xsl:when test="@contentdepth and 
+                      @contentdepth != '100%'">0</xsl:when>
       <xsl:when test="@scale">0</xsl:when>
       <xsl:when test="@scalefit"><xsl:value-of select="@scalefit"/></xsl:when>
       <xsl:when test="@width or @depth">1</xsl:when>