Fix url() in admonition graphics

diff --git a/xsl/fo/admon.xsl b/xsl/fo/admon.xsl
index 064051d260295ce9f42ee9398ad0d54784da4666..63f4199971af6dcb83b32131c2539ef5e77853a5 100644 (file)
--- a/xsl/fo/admon.xsl
+++ b/xsl/fo/admon.xsl
@@ -31,16 +31,32 @@
 
 <xsl:template name="admon.graphic">
   <xsl:param name="node" select="."/>
-  <xsl:value-of select="$admon.graphics.path"/>
+
+  <xsl:variable name="filename">
+    <xsl:value-of select="$admon.graphics.path"/>
+    <xsl:choose>
+      <xsl:when test="name($node)='note'">note</xsl:when>
+      <xsl:when test="name($node)='warning'">warning</xsl:when>
+      <xsl:when test="name($node)='caution'">caution</xsl:when>
+      <xsl:when test="name($node)='tip'">tip</xsl:when>
+      <xsl:when test="name($node)='important'">important</xsl:when>
+      <xsl:otherwise>note</xsl:otherwise>
+    </xsl:choose>
+    <xsl:value-of select="$admon.graphics.extension"/>
+  </xsl:variable>
+
   <xsl:choose>
-    <xsl:when test="name($node)='note'">note</xsl:when>
-    <xsl:when test="name($node)='warning'">warning</xsl:when>
-    <xsl:when test="name($node)='caution'">caution</xsl:when>
-    <xsl:when test="name($node)='tip'">tip</xsl:when>
-    <xsl:when test="name($node)='important'">important</xsl:when>
-    <xsl:otherwise>note</xsl:otherwise>
+    <xsl:when test="$passivetex.extensions != 0
+                    or $fop.extensions != 0
+                    or $arbortext.extensions != 0">
+      <xsl:value-of select="$filename"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:text>url(</xsl:text>
+      <xsl:value-of select="$filename"/>
+      <xsl:text>)</xsl:text>
+    </xsl:otherwise>
   </xsl:choose>
-  <xsl:value-of select="$admon.graphics.extension"/>
 </xsl:template>
 
 <xsl:template name="graphical.admonition">