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

diff --git a/xsl/fo/xref.xsl b/xsl/fo/xref.xsl
index c4bdaeef4faf025500f9818a074a6f45bfb39743..c5274b9638d735521cf0812ad96d08f512717e58 100644 (file)
--- 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 868631b22bf7947ee3bc556bf7f91c25e7d15773..7848bb05f77abedf563d23e58338c79e2a2807cf 100644 (file)
--- 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>