From 2d2b604eb8e709c1ac70be83aa72e7a92a7efcdf Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Fri, 13 Sep 2013 18:04:54 +0000
Subject: [PATCH] Add mode="xrefstyle" to replace many instances of redundant
 code determining the xrefstyle with xsl:apply-templates select="."
 mode="xrefstyle".  Also allows stylesheet customization to specify an
 xrefstyle per element type.

---
 xsl/common/common.xsl | 12 +++++++++
 xsl/common/olink.xsl  | 40 +++--------------------------
 xsl/common/titles.xsl | 25 +++++++++---------
 xsl/fo/xref.xsl       | 59 +++++++++++++++++--------------------------
 xsl/html/xref.xsl     | 38 +++++++++++-----------------
 5 files changed, 66 insertions(+), 108 deletions(-)

diff --git a/xsl/common/common.xsl b/xsl/common/common.xsl
index d62bcc986..5e84e8d4c 100644
--- a/xsl/common/common.xsl
+++ b/xsl/common/common.xsl
@@ -2107,4 +2107,16 @@ engine does not support it.
   </xsl:choose>
 </xsl:template>
 
+<xsl:template match="*" mode="xrefstyle">
+  <xsl:choose>
+    <xsl:when test="@role and not(@xrefstyle) 
+                    and $use.role.as.xrefstyle != 0">
+      <xsl:value-of select="@role"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:value-of select="@xrefstyle"/>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
 </xsl:stylesheet>
diff --git a/xsl/common/olink.xsl b/xsl/common/olink.xsl
index fb382f5c6..eedb3c701 100644
--- a/xsl/common/olink.xsl
+++ b/xsl/common/olink.xsl
@@ -640,15 +640,7 @@
   <xsl:param name="olink.key" select="''"/>
   <xsl:param name="referrer" select="."/>
   <xsl:param name="xrefstyle">
-    <xsl:choose>
-      <xsl:when test="@role and not(@xrefstyle) 
-                      and $use.role.as.xrefstyle != 0">
-        <xsl:value-of select="@role"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="@xrefstyle"/>
-      </xsl:otherwise>
-    </xsl:choose>
+    <xsl:apply-templates select="." mode="xrefstyle"/>
   </xsl:param>
 
   <xsl:choose>
@@ -1082,15 +1074,7 @@
   <xsl:param name="target.database"/>
   <xsl:param name="linkend" select="''"/>
   <xsl:param name="xrefstyle">
-    <xsl:choose>
-      <xsl:when test="@role and not(@xrefstyle) 
-                      and $use.role.as.xrefstyle != 0">
-        <xsl:value-of select="@role"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="@xrefstyle"/>
-      </xsl:otherwise>
-    </xsl:choose>
+    <xsl:apply-templates select="." mode="xrefstyle"/>
   </xsl:param>
 
   <xsl:variable name="targetdoc">
@@ -1142,15 +1126,7 @@
   <xsl:param name="olink.lang" select="'en'"/>
   <xsl:param name="target.database"/>
   <xsl:param name="xrefstyle">
-    <xsl:choose>
-      <xsl:when test="@role and not(@xrefstyle) 
-                      and $use.role.as.xrefstyle != 0">
-        <xsl:value-of select="@role"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="@xrefstyle"/>
-      </xsl:otherwise>
-    </xsl:choose>
+    <xsl:apply-templates select="." mode="xrefstyle"/>
   </xsl:param>
 
   <xsl:variable name="page">
@@ -1213,15 +1189,7 @@
   <xsl:param name="linkend" select="@linkend"/>
   <xsl:param name="target" select="key('id', $linkend)"/>
   <xsl:param name="xrefstyle">
-    <xsl:choose>
-      <xsl:when test="@role and not(@xrefstyle) 
-                      and $use.role.as.xrefstyle != 0">
-        <xsl:value-of select="@role"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="@xrefstyle"/>
-      </xsl:otherwise>
-    </xsl:choose>
+    <xsl:apply-templates select="." mode="xrefstyle"/>
   </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 ecaff36b1..6eba61092 100644
--- a/xsl/common/titles.xsl
+++ b/xsl/common/titles.xsl
@@ -739,6 +739,9 @@ title of the element. This does not include the label.
   <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:variable>
   
   <xsl:call-template name="check.id.unique">
     <xsl:with-param name="linkend" select="@linkend"/>
@@ -785,24 +788,20 @@ title of the element. This does not include the label.
 	     a title. See bugs #1811721 and #1838136. -->
 	<xsl:when test="not(ancestor::*[@id = $target/@id] or ancestor::*[@xml:id = $target/@xml:id])">
 
-	  <xsl:apply-templates select="$target" mode="xref-to-prefix"/>
+	  <xsl:apply-templates select="$target" mode="xref-to-prefix">
+	    <xsl:with-param name="referrer" select="."/>
+	    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+	  </xsl:apply-templates>
 	  
 	  <xsl:apply-templates select="$target" mode="xref-to">
-	    
 	    <xsl:with-param name="referrer" select="."/>
-	    <xsl:with-param name="xrefstyle">
-	      <xsl:choose>
-		<xsl:when test="@role and not(@xrefstyle) and $use.role.as.xrefstyle != 0">
-		  <xsl:value-of select="@role"/>
-		</xsl:when>
-		<xsl:otherwise>
-		  <xsl:value-of select="@xrefstyle"/>
-		</xsl:otherwise>
-	      </xsl:choose>
-	    </xsl:with-param>
+	    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
 	  </xsl:apply-templates>
 	  
-	  <xsl:apply-templates select="$target" mode="xref-to-suffix"/>
+	  <xsl:apply-templates select="$target" mode="xref-to-suffix">
+	    <xsl:with-param name="referrer" select="."/>
+	    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+	  </xsl:apply-templates>
 	</xsl:when>
 	
 	<xsl:otherwise>
diff --git a/xsl/fo/xref.xsl b/xsl/fo/xref.xsl
index bff98df2e..77a1ab26f 100644
--- a/xsl/fo/xref.xsl
+++ b/xsl/fo/xref.xsl
@@ -56,18 +56,9 @@
   <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:variable name="xrefstyle">
-    <xsl:choose>
-      <xsl:when test="@role and not(@xrefstyle) 
-                      and $use.role.as.xrefstyle != 0">
-        <xsl:value-of select="@role"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="@xrefstyle"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
+  <xsl:param name="xrefstyle">
+    <xsl:apply-templates select="." mode="xrefstyle"/>
+  </xsl:param>
 
   <xsl:variable name="content">
     <fo:inline xsl:use-attribute-sets="xref.properties">
@@ -166,6 +157,10 @@
   <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:variable>
+
   <xsl:call-template name="check.id.unique">
     <xsl:with-param name="linkend" select="@linkend"/>
   </xsl:call-template>
@@ -211,28 +206,25 @@
 
     <xsl:otherwise>
       <xsl:if test="not(parent::citation)">
-        <xsl:apply-templates select="$target" mode="xref-to-prefix"/>
+        <xsl:apply-templates select="$target" mode="xref-to-prefix">
+          <xsl:with-param name="referrer" select="."/>
+          <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+        </xsl:apply-templates>
       </xsl:if>
 
       <fo:basic-link internal-destination="{@linkend}"
                      xsl:use-attribute-sets="xref.properties">
         <xsl:apply-templates select="$target" mode="xref-to">
           <xsl:with-param name="referrer" select="."/>
-          <xsl:with-param name="xrefstyle">
-            <xsl:choose>
-              <xsl:when test="@role and not(@xrefstyle) and $use.role.as.xrefstyle != 0">
-                <xsl:value-of select="@role"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="@xrefstyle"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:with-param>
+          <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
         </xsl:apply-templates>
       </fo:basic-link>
 
       <xsl:if test="not(parent::citation)">
-        <xsl:apply-templates select="$target" mode="xref-to-suffix"/>
+        <xsl:apply-templates select="$target" mode="xref-to-suffix">
+          <xsl:with-param name="referrer" select="."/>
+          <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+        </xsl:apply-templates>
       </xsl:if>
     </xsl:otherwise>
   </xsl:choose>
@@ -445,10 +437,14 @@
 </xsl:template>
 
 <xsl:template match="biblioentry|bibliomixed" mode="xref-to-prefix">
+  <xsl:param name="referrer"/>
+  <xsl:param name="xrefstyle"/>
   <xsl:text>[</xsl:text>
 </xsl:template>
 
 <xsl:template match="biblioentry|bibliomixed" mode="xref-to-suffix">
+  <xsl:param name="referrer"/>
+  <xsl:param name="xrefstyle"/>
   <xsl:text>]</xsl:text>
 </xsl:template>
 
@@ -859,18 +855,9 @@
   <xsl:param name="linkend" select="@linkend"/>
   <xsl:param name="targets" select="key('id',$linkend)"/>
   <xsl:param name="target" select="$targets[1]"/>
-
-  <xsl:variable name="xrefstyle">
-    <xsl:choose>
-      <xsl:when test="@role and not(@xrefstyle) 
-                      and $use.role.as.xrefstyle != 0">
-        <xsl:value-of select="@role"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="@xrefstyle"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
+  <xsl:param name="xrefstyle">
+    <xsl:apply-templates select="." mode="xrefstyle"/>
+  </xsl:param>
 
   <xsl:variable name="content">
     <fo:inline xsl:use-attribute-sets="xref.properties">
diff --git a/xsl/html/xref.xsl b/xsl/html/xref.xsl
index 07581846c..5e5660cca 100644
--- a/xsl/html/xref.xsl
+++ b/xsl/html/xref.xsl
@@ -53,17 +53,9 @@
   <xsl:param name="linkend.targets" select="key('id',@linkend)"/>
   <xsl:param name="target" select="($xlink.targets | $linkend.targets)[1]"/>
 
-  <xsl:variable name="xrefstyle">
-    <xsl:choose>
-      <xsl:when test="@role and not(@xrefstyle) 
-                      and $use.role.as.xrefstyle != 0">
-        <xsl:value-of select="@role"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="@xrefstyle"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
+  <xsl:param name="xrefstyle">
+    <xsl:apply-templates select="." mode="xrefstyle"/>
+  </xsl:param>
 
   <xsl:call-template name="anchor"/>
 
@@ -140,6 +132,9 @@
   <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="xrefstyle">
+    <xsl:apply-templates select="." mode="xrefstyle"/>
+  </xsl:variable>
 
   <xsl:call-template name="check.id.unique">
     <xsl:with-param name="linkend" select="@linkend"/>
@@ -210,7 +205,10 @@
       </xsl:variable>
 
       <xsl:if test="not(parent::citation)">
-        <xsl:apply-templates select="$target" mode="xref-to-prefix"/>
+        <xsl:apply-templates select="$target" mode="xref-to-prefix">
+          <xsl:with-param name="referrer" select="."/>
+          <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+        </xsl:apply-templates>
       </xsl:if>
 
       <a href="{$href}">
@@ -222,21 +220,15 @@
         </xsl:if>
         <xsl:apply-templates select="$target" mode="xref-to">
           <xsl:with-param name="referrer" select="."/>
-          <xsl:with-param name="xrefstyle">
-            <xsl:choose>
-              <xsl:when test="@role and not(@xrefstyle) and $use.role.as.xrefstyle != 0">
-                <xsl:value-of select="@role"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="@xrefstyle"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:with-param>
+          <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
         </xsl:apply-templates>
       </a>
 
       <xsl:if test="not(parent::citation)">
-        <xsl:apply-templates select="$target" mode="xref-to-suffix"/>
+        <xsl:apply-templates select="$target" mode="xref-to-suffix">
+          <xsl:with-param name="referrer" select="."/>
+          <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+        </xsl:apply-templates>
       </xsl:if>
     </xsl:otherwise>
   </xsl:choose>
-- 
2.40.0