From: Bob Stayton <bobs@sagehill.net>
Date: Fri, 17 Nov 2006 08:21:22 +0000 (+0000)
Subject: Improved simple.xlink to support link and xref.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3dbd576100b6528cdf5e44b4900a3172a19ae5b8;p=docbook-dsssl

Improved simple.xlink to support link and xref.
---

diff --git a/xsl/html/inline.xsl b/xsl/html/inline.xsl
index b1b03411e..c2d0ec319 100644
--- a/xsl/html/inline.xsl
+++ b/xsl/html/inline.xsl
@@ -32,8 +32,9 @@
   <xsl:param name="content">
     <xsl:apply-templates/>
   </xsl:param>
-
-  <xsl:variable name="xhref" select="$node/@xlink:href"/>
+  <xsl:param name="a.target"/>
+  <xsl:param name="linkend" select="$node/@linkend"/>
+  <xsl:param name="xhref" select="$node/@xlink:href"/>
 
   <xsl:variable name="link">
     <xsl:choose>
@@ -95,10 +96,18 @@
                     </xsl:when>
                     <xsl:otherwise>
                       <xsl:apply-templates select="$target"
-                                           mode="link.title.attribute"/>
+                                           mode="html.title.attribute"/>
                     </xsl:otherwise>
                   </xsl:choose>
+
+                  <xsl:if test="$a.target">
+                    <xsl:attribute name="target">
+                      <xsl:value-of select="$a.target"/>
+                    </xsl:attribute>
+                  </xsl:if>
+
                   <xsl:copy-of select="$content"/>
+
                 </a>
               </xsl:otherwise>
             </xsl:choose>
@@ -121,8 +130,7 @@
         </xsl:choose>
       </xsl:when>
 
-      <xsl:when test="$node/@linkend">
-        <xsl:variable name="linkend" select="$node/@linkend"/>
+      <xsl:when test="$linkend">
         <xsl:variable name="targets" select="key('id',$linkend)"/>
         <xsl:variable name="target" select="$targets[1]"/>
 
@@ -137,7 +145,7 @@
             </xsl:call-template>
           </xsl:attribute>
 
-          <xsl:apply-templates select="$target" mode="link.title.attribute"/>
+          <xsl:apply-templates select="$target" mode="html.title.attribute"/>
 
           <xsl:copy-of select="$content"/>