From 0448e4a334d461741b91a478eb109b687329e8ce Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Mon, 9 Aug 2004 00:25:02 +0000
Subject: [PATCH] Added olink docname placeholder to substitute.markup and
 make.gentext.template.

---
 xsl/common/gentext.xsl | 87 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 76 insertions(+), 11 deletions(-)

diff --git a/xsl/common/gentext.xsl b/xsl/common/gentext.xsl
index 61d0871ec..0562f388e 100644
--- a/xsl/common/gentext.xsl
+++ b/xsl/common/gentext.xsl
@@ -424,6 +424,7 @@
   <xsl:param name="allow-anchors" select="'0'"/>
   <xsl:param name="title" select="''"/>
   <xsl:param name="subtitle" select="''"/>
+  <xsl:param name="docname" select="''"/>
   <xsl:param name="label" select="''"/>
   <xsl:param name="pagenumber" select="''"/>
   <xsl:param name="purpose"/>
@@ -506,6 +507,23 @@
             </xsl:with-param>
           </xsl:apply-templates>
         </xsl:when>
+        <xsl:when test="$candidate = 'o'">
+          <!-- olink target document title -->
+          <xsl:apply-templates select="." mode="insert.olink.docname.markup">
+            <xsl:with-param name="purpose" select="$purpose"/>
+            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+            <xsl:with-param name="docname">
+              <xsl:choose>
+                <xsl:when test="$docname != ''">
+                  <xsl:copy-of select="$docname"/>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:apply-templates select="." mode="olink.docname.markup"/>
+                </xsl:otherwise>
+              </xsl:choose>
+            </xsl:with-param>
+          </xsl:apply-templates>
+        </xsl:when>
         <xsl:when test="$candidate = 'd'">
           <xsl:apply-templates select="." mode="insert.direction.markup">
             <xsl:with-param name="purpose" select="$purpose"/>
@@ -554,6 +572,7 @@
         <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
         <xsl:with-param name="title" select="$title"/>
         <xsl:with-param name="subtitle" select="$subtitle"/>
+        <xsl:with-param name="docname" select="$docname"/>
         <xsl:with-param name="label" select="$label"/>
         <xsl:with-param name="pagenumber" select="$pagenumber"/>
         <xsl:with-param name="purpose" select="$purpose"/>
@@ -610,7 +629,12 @@
 
   <xsl:variable name="pagetype">
     <xsl:choose>
-      <xsl:when test="$insert.xref.page.number = 'no'">
+      <xsl:when test="$insert.olink.page.number = 'no' and
+                      local-name($referrer) = 'olink'">
+        <!-- suppress page numbers -->
+      </xsl:when>
+      <xsl:when test="$insert.xref.page.number = 'no' and
+                      local-name($referrer) != 'olink'">
         <!-- suppress page numbers -->
       </xsl:when>
       <xsl:when test="contains($parts, 'nopage')">
@@ -631,6 +655,25 @@
     </xsl:choose>
   </xsl:variable>
 
+  <xsl:variable name="docnametype">
+    <xsl:choose>
+      <xsl:when test="($olink.doctitle = 0 or
+                       $olink.doctitle = 'no') and
+                      local-name($referrer) = 'olink'">
+        <!-- suppress docname -->
+      </xsl:when>
+      <xsl:when test="contains($parts, 'nodocname')">
+         <xsl:text>nodocname</xsl:text>
+      </xsl:when>
+      <xsl:when test="contains($parts, 'docnamelong')">
+         <xsl:text>docnamelong</xsl:text>
+      </xsl:when>
+      <xsl:when test="contains($parts, 'docname')">
+         <xsl:text>docname</xsl:text>
+      </xsl:when>
+    </xsl:choose>
+  </xsl:variable>
+
   <xsl:if test="$labeltype != ''">
     <xsl:choose>
       <xsl:when test="$labeltype = 'labelname'">
@@ -703,18 +746,20 @@
     </xsl:choose>
   </xsl:if>
   
+  <!-- special case: use regular xref template if just turning off page -->
+  <xsl:if test="($pagetype = 'nopage' or $docnametype = 'nodocname')
+                  and local-name($referrer) != 'olink'
+                  and $labeltype = '' 
+                  and $titletype = ''">
+    <xsl:apply-templates select="." mode="object.xref.template">
+      <xsl:with-param name="purpose" select="$purpose"/>
+      <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+      <xsl:with-param name="referrer" select="$referrer"/>
+    </xsl:apply-templates>
+  </xsl:if>
+
   <xsl:if test="$pagetype != ''">
     <xsl:choose>
-      <!-- special case: use regular xref template -->
-      <xsl:when test="$pagetype = 'nopage' 
-                      and $labeltype = '' 
-                      and $titletype = ''">
-        <xsl:apply-templates select="." mode="object.xref.template">
-          <xsl:with-param name="purpose" select="$purpose"/>
-          <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-          <xsl:with-param name="referrer" select="$referrer"/>
-        </xsl:apply-templates>
-      </xsl:when>
       <xsl:when test="$pagetype = 'page'">
         <xsl:call-template name="gentext.template">
           <xsl:with-param name="context" select="'xref'"/>
@@ -740,6 +785,26 @@
 
   </xsl:if>
 
+  <!-- Add reference to other document title -->
+  <xsl:if test="$docnametype != '' and local-name($referrer) = 'olink'">
+    <!-- Any separator should be in the gentext template -->
+    <xsl:choose>
+      <xsl:when test="$docnametype = 'docnamelong'">
+        <xsl:call-template name="gentext.template">
+          <xsl:with-param name="context" select="'xref'"/>
+          <xsl:with-param name="name" select="'docnamelong'"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:when test="$docnametype = 'docname'">
+        <xsl:call-template name="gentext.template">
+          <xsl:with-param name="context" select="'xref'"/>
+          <xsl:with-param name="name" select="'docname'"/>
+        </xsl:call-template>
+      </xsl:when>
+    </xsl:choose>
+
+  </xsl:if>
+  
 </xsl:template>
 
 </xsl:stylesheet>
-- 
2.40.0