From: Norman Walsh <ndw@nwalsh.com>
Date: Sat, 28 Dec 2002 21:16:20 +0000 (+0000)
Subject: Now that xrefstyle is official; make it take priority even when use.role.as.xrefstyle... 
X-Git-Tag: release/1.79.1~6^2~5032
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0189ee7b0ea9fa0f277c41b87b5f9a87f13f6d75;p=docbook-dsssl

Now that xrefstyle is official; make it take priority even when use.role.as.xrefstyle is non-zero.
---

diff --git a/xsl/fo/xref.xsl b/xsl/fo/xref.xsl
index c4bdaeef4..c5274b963 100644
--- a/xsl/fo/xref.xsl
+++ b/xsl/fo/xref.xsl
@@ -81,7 +81,7 @@
           <xsl:with-param name="referrer" select="."/>
           <xsl:with-param name="xrefstyle">
             <xsl:choose>
-              <xsl:when test="$use.role.as.xrefstyle != 0">
+              <xsl:when test="@role and not(@xrefstyle) and $use.role.as.xrefstyle != 0">
                 <xsl:value-of select="@role"/>
               </xsl:when>
               <xsl:otherwise>
diff --git a/xsl/html/xref.xsl b/xsl/html/xref.xsl
index 868631b22..7848bb05f 100644
--- a/xsl/html/xref.xsl
+++ b/xsl/html/xref.xsl
@@ -107,7 +107,7 @@
           <xsl:with-param name="referrer" select="."/>
           <xsl:with-param name="xrefstyle">
             <xsl:choose>
-              <xsl:when test="$use.role.as.xrefstyle != 0">
+              <xsl:when test="@role and not(@xrefstyle) and $use.role.as.xrefstyle != 0">
                 <xsl:value-of select="@role"/>
               </xsl:when>
               <xsl:otherwise>