[gnome-doc-utils] [mal2html] Handle link roles on inline links

[Shaun McCance <shaunm src gnome org>]

commit a9ba4b0a2028d6c8b6ef8fc4417c530919b2a92a
Author: Shaun McCance <shaunm gnome org>
Date:   Fri Aug 28 12:14:05 2009 -0500

    [mal2html] Handle link roles on inline links
    
    Also had to fix a hard-coded "guide" link role in mal-link.xsl, left
    over from a debugging session when trying to get link roles to work
    for automatic links.

 xslt/mallard/common/mal-link.xsl      |    2 +-
 xslt/mallard/html/mal2html-inline.xsl |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/xslt/mallard/common/mal-link.xsl b/xslt/mallard/common/mal-link.xsl
index 50f7e8c..1a77439 100644
--- a/xslt/mallard/common/mal-link.xsl
+++ b/xslt/mallard/common/mal-link.xsl
@@ -83,7 +83,7 @@ $role: A link role, used to select the appropriate title
         <xsl:variable name="titles" select="key('mal.cache.key', $fullid)
                                            /mal:info/mal:title[ type = 'link']"/>
         <xsl:choose>
-          <xsl:when test="$role != '' and $titles[ role = 'guide']">
+          <xsl:when test="$role != '' and $titles[ role = $role]">
             <xsl:apply-templates mode="mal.link.content.mode"
                                  select="$titles[ role = $role][1]/node()"/>
           </xsl:when>
diff --git a/xslt/mallard/html/mal2html-inline.xsl b/xslt/mallard/html/mal2html-inline.xsl
index b29166e..547402f 100644
--- a/xslt/mallard/html/mal2html-inline.xsl
+++ b/xslt/mallard/html/mal2html-inline.xsl
@@ -207,7 +207,9 @@ REMARK: Document this template
       <xsl:apply-templates mode="mal2html.inline.mode"/>
     </xsl:when>
     <xsl:otherwise>
-      <xsl:call-template name="mal.link.content"/>
+      <xsl:call-template name="mal.link.content">
+        <xsl:with-param name="role" select="@role"/>
+      </xsl:call-template>
     </xsl:otherwise>
   </xsl:choose>
 </xsl:template>