Changed @fileref processing to support xml:base.

diff --git a/xsl/common/common.xsl b/xsl/common/common.xsl
index b2d55dc247eabd5681ce4249543ca90ce0232f48..308ebe1a515702395f92a3a8df7ec4a54dc3b32b 100644 (file)
--- a/xsl/common/common.xsl
+++ b/xsl/common/common.xsl
@@ -1110,7 +1110,7 @@ object is recognized as a graphic.</para>
   <xsl:variable name="filename">
     <xsl:choose>
       <xsl:when test="$data[@fileref]">
-        <xsl:value-of select="$data/@fileref"/>
+        <xsl:apply-templates select="$data/@fileref"/>
       </xsl:when>
       <xsl:when test="$data[@entityref]">
         <xsl:value-of select="unparsed-entity-uri($data/@entityref)"/>

diff --git a/xsl/fo/graphics.xsl b/xsl/fo/graphics.xsl
index 4f5c86b8ac78d38363286982531b7dc5e61165e7..7d8f370a1f0e27bab4306337a9152fdf3b2e356b 100644 (file)
--- a/xsl/fo/graphics.xsl
+++ b/xsl/fo/graphics.xsl
@@ -286,7 +286,7 @@
         <xsl:value-of select="unparsed-entity-uri(@entityref)"/>
       </xsl:when>
       <xsl:otherwise>
-        <xsl:value-of select="@fileref"/>
+        <xsl:apply-templates select="@fileref"/>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:variable>
@@ -470,7 +470,7 @@
         <xsl:value-of select="unparsed-entity-uri(@entityref)"/>
       </xsl:when>
       <xsl:otherwise>
-        <xsl:value-of select="@fileref"/>
+        <xsl:apply-templates select="@fileref"/>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:variable>

diff --git a/xsl/html/graphics.xsl b/xsl/html/graphics.xsl
index 324daedcb0268e6c01ce03fbd59afc4767ca59c6..cc2589707853d8c58580c8655ba48ac683fcf5ce 100644 (file)
--- a/xsl/html/graphics.xsl
+++ b/xsl/html/graphics.xsl
@@ -771,7 +771,7 @@ valign: <xsl:value-of select="@valign"/></xsl:message>
         <xsl:value-of select="unparsed-entity-uri(@entityref)"/>
       </xsl:when>
       <xsl:otherwise>
-        <xsl:value-of select="@fileref"/>
+        <xsl:apply-templates select="@fileref"/>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:variable>
@@ -1096,7 +1096,7 @@ valign: <xsl:value-of select="@valign"/></xsl:message>
         <xsl:value-of select="unparsed-entity-uri(@entityref)"/>
       </xsl:when>
       <xsl:otherwise>
-        <xsl:value-of select="@fileref"/>
+        <xsl:apply-templates select="@fileref"/>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:variable>