Support ignore.image.scaling parameter

diff --git a/xsl/fo/graphics.xsl b/xsl/fo/graphics.xsl
index c6738143384fea73d1a35b1f86022b2db1cba38c..5e6c001360579dc75efcdff4387840a940f6e728 100644 (file)
--- a/xsl/fo/graphics.xsl
+++ b/xsl/fo/graphics.xsl
@@ -101,6 +101,7 @@
 
   <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="@scale">0</xsl:when>
       <xsl:when test="@scalefit"><xsl:value-of select="@scalefit"/></xsl:when>
@@ -111,6 +112,7 @@
 
   <xsl:variable name="scale">
     <xsl:choose>
+      <xsl:when test="$ignore.image.scaling != 0">0</xsl:when>
       <xsl:when test="@contentwidth or @contentdepth">1.0</xsl:when>
       <xsl:when test="@scale">
         <xsl:value-of select="@scale div 100.0"/>
@@ -154,6 +156,7 @@
 
     <xsl:attribute name="width">
       <xsl:choose>
+        <xsl:when test="$ignore.image.scaling != 0">auto</xsl:when>
         <xsl:when test="contains(@width,'%')">
           <xsl:value-of select="@width"/>
         </xsl:when>
@@ -169,6 +172,7 @@
 
     <xsl:attribute name="height">
       <xsl:choose>
+        <xsl:when test="$ignore.image.scaling != 0">auto</xsl:when>
         <xsl:when test="contains(@depth,'%')">
           <xsl:value-of select="@depth"/>
         </xsl:when>
@@ -184,6 +188,7 @@
 
     <xsl:attribute name="content-width">
       <xsl:choose>
+        <xsl:when test="$ignore.image.scaling != 0">auto</xsl:when>
         <xsl:when test="contains(@contentwidth,'%')">
           <xsl:value-of select="@contentwidth"/>
         </xsl:when>
@@ -203,6 +208,7 @@
 
     <xsl:attribute name="content-height">
       <xsl:choose>
+        <xsl:when test="$ignore.image.scaling != 0">auto</xsl:when>
         <xsl:when test="contains(@contentdepth,'%')">
           <xsl:value-of select="@contentdepth"/>
         </xsl:when>