Work-around bug in xsltproc: explicitly cast scale to a number() before comparing...

diff --git a/xsl/fo/graphics.xsl b/xsl/fo/graphics.xsl
index 333daaad6437ea02b3cada85e79abc4bb683be88..c9abb9b383affa68ce00fe39fd66525f099eb480 100644 (file)
--- a/xsl/fo/graphics.xsl
+++ b/xsl/fo/graphics.xsl
@@ -297,7 +297,7 @@ FIXME: make is.graphic.* work correctly depending on the backend!
             <xsl:with-param name="default.units" select="'px'"/>
           </xsl:call-template>
         </xsl:when>
-        <xsl:when test="$scale != 1.0">
+        <xsl:when test="number($scale) != 1.0">
           <xsl:value-of select="$scale * 100"/>
           <xsl:text>%</xsl:text>
         </xsl:when>
@@ -316,7 +316,7 @@ FIXME: make is.graphic.* work correctly depending on the backend!
             <xsl:with-param name="default.units" select="'px'"/>
           </xsl:call-template>
         </xsl:when>
-        <xsl:when test="$scale != 1.0">
+        <xsl:when test="number($scale) != 1.0">
           <xsl:value-of select="$scale * 100"/>
           <xsl:text>%</xsl:text>
         </xsl:when>

diff --git a/xsl/html/graphics.xsl b/xsl/html/graphics.xsl
index 01a22dccfcf6d3f8b87bf3165f237ec5129d233e..fb77a6c29672549f6319f33366870b8f9de4542c 100644 (file)
--- a/xsl/html/graphics.xsl
+++ b/xsl/html/graphics.xsl
@@ -191,10 +191,10 @@
 
   <xsl:variable name="intrinsicwidth">
     <xsl:choose>
-      <xsl:when test="function-available('simg:getWidth')">
+      <xsl:when test="$use.extensions != 0 and function-available('simg:getWidth')">
         <xsl:value-of select="simg:getWidth(simg:new($filename), $nominal.image.width)"/>
       </xsl:when>
-      <xsl:when test="function-available('ximg:getWidth')">
+      <xsl:when test="$use.extensions != 0 and function-available('ximg:getWidth')">
         <xsl:value-of select="ximg:getWidth(ximg:new($filename), $nominal.image.width)"/>
       </xsl:when>
       <xsl:otherwise>
@@ -205,10 +205,10 @@
 
   <xsl:variable name="intrinsicdepth">
     <xsl:choose>
-      <xsl:when test="function-available('simg:getDepth')">
+      <xsl:when test="$use.extensions != 0 and function-available('simg:getDepth')">
         <xsl:value-of select="simg:getDepth(simg:new($filename), $nominal.image.depth)"/>
       </xsl:when>
-      <xsl:when test="function-available('ximg:getDepth')">
+      <xsl:when test="$use.extensions != 0 and function-available('ximg:getDepth')">
         <xsl:value-of select="ximg:getDepth(ximg:new($filename), $nominal.image.width)"/>
       </xsl:when>
       <xsl:otherwise>
@@ -573,7 +573,7 @@ valign: <xsl:value-of select="@valign"/></xsl:message>
       </xsl:if>
     </xsl:when>
 
-    <xsl:when test="$scale != 1.0">
+    <xsl:when test="number($scale) != 1.0">
       <!-- scaling is always uniform, so we only have to specify one dimension -->
       <!-- ignore @scalefit if specified -->
       <xsl:attribute name="width">