Pass referrer and target params to mode="xrefstyle" to allow customizations

to be more specific.

diff --git a/xsl/common/common.xsl b/xsl/common/common.xsl
index 5e84e8d4cb3c6ec539fc989c2225d06d9cd85ab8..147384697d9af876eb55365569a2ed350ea6d981 100644 (file)
--- a/xsl/common/common.xsl
+++ b/xsl/common/common.xsl
@@ -2108,6 +2108,12 @@ engine does not support it.
 </xsl:template>
 
 <xsl:template match="*" mode="xrefstyle">
+  <xsl:param name="referrer" select="."/>
+  <xsl:param name="target"/>
+  <xsl:param name="olink.key"/>
+
+  <!-- normally uses the @xrefstyle attribute in xref, but could
+       be customized based on the target element type -->
   <xsl:choose>
     <xsl:when test="@role and not(@xrefstyle) 
                     and $use.role.as.xrefstyle != 0">

diff --git a/xsl/common/olink.xsl b/xsl/common/olink.xsl
index eedb3c70171d09a46bfdac73f48241ff3a78e8f8..22fdf3644d863b867bbcb2931f876b7e7e662327 100644 (file)
--- a/xsl/common/olink.xsl
+++ b/xsl/common/olink.xsl
@@ -640,7 +640,10 @@
   <xsl:param name="olink.key" select="''"/>
   <xsl:param name="referrer" select="."/>
   <xsl:param name="xrefstyle">
-    <xsl:apply-templates select="." mode="xrefstyle"/>
+    <xsl:apply-templates select="." mode="xrefstyle">
+      <xsl:with-param name="olink.key" select="$olink.key"/>
+      <xsl:with-param name="referrer" select="$referrer"/>
+    </xsl:apply-templates>
   </xsl:param>
 
   <xsl:choose>
@@ -1071,10 +1074,14 @@
 <xsl:template name="olink.page.citation">
   <xsl:param name="olink.key" select="''"/>
   <xsl:param name="olink.lang" select="'en'"/>
+  <xsl:param name="referrer" select="."/>
   <xsl:param name="target.database"/>
   <xsl:param name="linkend" select="''"/>
   <xsl:param name="xrefstyle">
-    <xsl:apply-templates select="." mode="xrefstyle"/>
+    <xsl:apply-templates select="." mode="xrefstyle">
+      <xsl:with-param name="olink.key" select="$olink.key"/>
+      <xsl:with-param name="referrer" select="$referrer"/>
+    </xsl:apply-templates>
   </xsl:param>
 
   <xsl:variable name="targetdoc">
@@ -1122,11 +1129,15 @@
 </xsl:template>
 
 <xsl:template name="olink.document.citation">
+  <xsl:param name="referrer" select="."/>
   <xsl:param name="olink.key" select="''"/>
   <xsl:param name="olink.lang" select="'en'"/>
   <xsl:param name="target.database"/>
   <xsl:param name="xrefstyle">
-    <xsl:apply-templates select="." mode="xrefstyle"/>
+    <xsl:apply-templates select="." mode="xrefstyle">
+      <xsl:with-param name="olink.key" select="$olink.key"/>
+      <xsl:with-param name="referrer" select="$referrer"/>
+    </xsl:apply-templates>
   </xsl:param>
 
   <xsl:variable name="page">
@@ -1186,10 +1197,14 @@
 <xsl:template name="xref.page.citation">
   <!-- Determine if this xref should have a page citation.
        Context node is the xref or local olink element -->
+  <xsl:param name="referrer" select="."/>
   <xsl:param name="linkend" select="@linkend"/>
   <xsl:param name="target" select="key('id', $linkend)"/>
   <xsl:param name="xrefstyle">
-    <xsl:apply-templates select="." mode="xrefstyle"/>
+    <xsl:apply-templates select="." mode="xrefstyle">
+      <xsl:with-param name="target" select="$target"/>
+      <xsl:with-param name="referrer" select="$referrer"/>
+    </xsl:apply-templates>
   </xsl:param>
 
   <xsl:if test="not(starts-with(normalize-space($xrefstyle),'select:')

diff --git a/xsl/common/titles.xsl b/xsl/common/titles.xsl
index 6eba610920382bf0d722e284ea3ea47810915dcb..952cab5f7538d2c6eb4f0c1c9f29ddbd936c6492 100644 (file)
--- a/xsl/common/titles.xsl
+++ b/xsl/common/titles.xsl
@@ -736,11 +736,15 @@ title of the element. This does not include the label.
 </xsl:template>
 
 <xsl:template match="xref" mode="no.anchor.mode">
+  <xsl:variable name="referrer" select="."/>
   <xsl:variable name="targets" select="key('id',@linkend)|key('id',substring-after(@xlink:href,'#'))"/>
   <xsl:variable name="target" select="$targets[1]"/>
   <xsl:variable name="refelem" select="local-name($target)"/>
   <xsl:variable name="xrefstyle">
-    <xsl:apply-templates select="." mode="xrefstyle"/>
+    <xsl:apply-templates select="." mode="xrefstyle">
+      <xsl:with-param name="target" select="$target"/>
+      <xsl:with-param name="referrer" select="$referrer"/>
+    </xsl:apply-templates>
   </xsl:variable>
   
   <xsl:call-template name="check.id.unique">

diff --git a/xsl/fo/xref.xsl b/xsl/fo/xref.xsl
index 77a1ab26f9357c337e207c4c3192b09435a2d5bb..8685264592051b356c6a6a873dbf8756f9000e9f 100644 (file)
--- a/xsl/fo/xref.xsl
+++ b/xsl/fo/xref.xsl
@@ -56,8 +56,12 @@
   <xsl:param name="linkend.targets" select="key('id',@linkend)"/>
   <xsl:param name="target" select="($xlink.targets | $linkend.targets)[1]"/>
   <xsl:param name="refelem" select="local-name($target)"/>
+  <xsl:param name="referrer" select="."/>
   <xsl:param name="xrefstyle">
-    <xsl:apply-templates select="." mode="xrefstyle"/>
+    <xsl:apply-templates select="." mode="xrefstyle">
+      <xsl:with-param name="target" select="$target"/>
+      <xsl:with-param name="referrer" select="$referrer"/>
+    </xsl:apply-templates>
   </xsl:param>
 
   <xsl:variable name="content">
@@ -155,10 +159,14 @@
 <xsl:template match="biblioref" name="biblioref">
   <xsl:variable name="targets" select="key('id',@linkend)"/>
   <xsl:variable name="target" select="$targets[1]"/>
+  <xsl:variable name="referrer" select="."/>
   <xsl:variable name="refelem" select="local-name($target)"/>
 
   <xsl:variable name="xrefstyle">
-    <xsl:apply-templates select="." mode="xrefstyle"/>
+    <xsl:apply-templates select="." mode="xrefstyle">
+      <xsl:with-param name="target" select="$target"/>
+      <xsl:with-param name="referrer" select="$referrer"/>
+    </xsl:apply-templates>
   </xsl:variable>
 
   <xsl:call-template name="check.id.unique">
@@ -852,11 +860,15 @@
 <!-- ==================================================================== -->
 
 <xsl:template match="link" name="link">
+  <xsl:param name="referrer" select="."/>
   <xsl:param name="linkend" select="@linkend"/>
   <xsl:param name="targets" select="key('id',$linkend)"/>
   <xsl:param name="target" select="$targets[1]"/>
   <xsl:param name="xrefstyle">
-    <xsl:apply-templates select="." mode="xrefstyle"/>
+    <xsl:apply-templates select="." mode="xrefstyle">
+      <xsl:with-param name="target" select="$target"/>
+      <xsl:with-param name="referrer" select="$referrer"/>
+    </xsl:apply-templates>
   </xsl:param>
 
   <xsl:variable name="content">

diff --git a/xsl/html/xref.xsl b/xsl/html/xref.xsl
index 5e5660cca6f6fbb930e048dbb0d6958cb8e72f58..ffb34c48c6812e10f76ca75d4ab67fe575f91cc5 100644 (file)
--- a/xsl/html/xref.xsl
+++ b/xsl/html/xref.xsl
@@ -52,9 +52,13 @@
   <xsl:param name="xlink.targets" select="key('id',$xlink.idref)"/>
   <xsl:param name="linkend.targets" select="key('id',@linkend)"/>
   <xsl:param name="target" select="($xlink.targets | $linkend.targets)[1]"/>
+  <xsl:param name="referrer" select="."/>
 
   <xsl:param name="xrefstyle">
-    <xsl:apply-templates select="." mode="xrefstyle"/>
+    <xsl:apply-templates select="." mode="xrefstyle">
+      <xsl:with-param name="target" select="$target"/>
+      <xsl:with-param name="referrer" select="$referrer"/>
+    </xsl:apply-templates>
   </xsl:param>
 
   <xsl:call-template name="anchor"/>
@@ -132,8 +136,12 @@
   <xsl:variable name="targets" select="key('id',@linkend)"/>
   <xsl:variable name="target" select="$targets[1]"/>
   <xsl:variable name="refelem" select="local-name($target)"/>
+  <xsl:variable name="referrer" select="."/>
   <xsl:variable name="xrefstyle">
-    <xsl:apply-templates select="." mode="xrefstyle"/>
+    <xsl:apply-templates select="." mode="xrefstyle">
+      <xsl:with-param name="target" select="$target"/>
+      <xsl:with-param name="referrer" select="$referrer"/>
+    </xsl:apply-templates>
   </xsl:variable>
 
   <xsl:call-template name="check.id.unique">