[docbook-checkins] CVS: xsl/fo xref.xsl,1.64,1.65

[Robert S. <bob...@us...>]

Update of /cvsroot/docbook/xsl/fo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18050

Modified Files:
	xref.xsl 
Log Message:
Implemented patch #1075144 to make the url text in a ulink in FO
output an active link as well.


Index: xref.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/fo/xref.xsl,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -U2 -r1.64 -r1.65
--- xref.xsl	22 Apr 2006 09:37:00 -0000	1.64
+++ xref.xsl	8 May 2006 02:10:38 -0000	1.65
@@ -802,11 +802,12 @@
 
 <xsl:template match="ulink" name="ulink">
-  <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:variable name ="ulink.url">
+    <xsl:call-template name="fo-external-image">
+      <xsl:with-param name="filename" select="@url"/>
+    </xsl:call-template>
+  </xsl:variable>
 
+  <fo:basic-link xsl:use-attribute-sets="xref.properties"
+                 external-destination="{$ulink.url}">
     <xsl:choose>
       <xsl:when test="count(child::node())=0">
@@ -833,7 +834,7 @@
               <xsl:call-template name="ulink.footnote.number"/>
               <xsl:text> </xsl:text>
-              <fo:inline>
+              <fo:basic-link external-destination="{$ulink.url}">
                 <xsl:value-of select="@url"/>
-              </fo:inline>
+              </fo:basic-link>
             </fo:block>
           </fo:footnote-body>
@@ -843,7 +844,9 @@
         <fo:inline hyphenate="false">
           <xsl:text> [</xsl:text>
-          <xsl:call-template name="hyphenate-url">
-            <xsl:with-param name="url" select="@url"/>
-          </xsl:call-template>
+          <fo:basic-link external-destination="{$ulink.url}">
+            <xsl:call-template name="hyphenate-url">
+              <xsl:with-param name="url" select="@url"/>
+            </xsl:call-template>
+          </fo:basic-link>
           <xsl:text>]</xsl:text>
         </fo:inline>
@@ -851,4 +854,5 @@
     </xsl:choose>
   </xsl:if>
+
 </xsl:template>