Use fo-external-image (badly named) to wrap url() around external-destinations

diff --git a/xsl/fo/xref.xsl b/xsl/fo/xref.xsl
index d2444182238190911f1ed408707c6a1353aeacb8..8941e3ed8c1138f9380a7ab17ef300c8d76e8d87 100644 (file)
--- a/xsl/fo/xref.xsl
+++ b/xsl/fo/xref.xsl
@@ -565,8 +565,13 @@
 </xsl:template>
 
 <xsl:template match="ulink" name="ulink">
-  <fo:basic-link external-destination="{@url}"
-                 xsl:use-attribute-sets="xref.properties">
+  <fo:basic-link xsl:use-attribute-sets="xref.properties">
+    <xsl:attribute name="external-destination">
+      <xsl:call-template name="fo-external-image">
+        <xsl:with-param name="filename" select="@url"/>
+      </xsl:call-template>
+    </xsl:attribute>
+
     <xsl:choose>
       <xsl:when test="count(child::node())=0">
         <xsl:call-template name="hyphenate-url">