remove duplicate make.gentext.template and substitute.markup templates.

diff --git a/xsl/common/olink.xsl b/xsl/common/olink.xsl
index 49f268c8925d71e05f733ea23a2a1f1555e2a317..66301f69e91df71b044e293ea9637056efd92664 100644 (file)
--- a/xsl/common/olink.xsl
+++ b/xsl/common/olink.xsl
@@ -862,392 +862,6 @@
   </xsl:choose>
 </xsl:template>
 
-<xsl:template name="make.gentext.template">
-  <xsl:param name="xrefstyle" select="''"/>
-  <xsl:param name="purpose"/>
-  <xsl:param name="referrer"/>
-  <xsl:param name="lang">
-    <xsl:call-template name="l10n.language"/>
-  </xsl:param>
-  <xsl:param name="target.elem" select="local-name(.)"/>
-
-  <!-- parse xrefstyle to get parts -->
-  <xsl:variable name="parts"
-      select="substring-after(normalize-space($xrefstyle), 'select:')"/>
-
-  <xsl:variable name="labeltype">
-    <xsl:choose>
-      <xsl:when test="contains($parts, 'labelnumber')">
-         <xsl:text>labelnumber</xsl:text>
-      </xsl:when>
-      <xsl:when test="contains($parts, 'labelname')">
-         <xsl:text>labelname</xsl:text>
-      </xsl:when>
-      <xsl:when test="contains($parts, 'label')">
-         <xsl:text>label</xsl:text>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="titletype">
-    <xsl:choose>
-      <xsl:when test="contains($parts, 'quotedtitle')">
-         <xsl:text>quotedtitle</xsl:text>
-      </xsl:when>
-      <xsl:when test="contains($parts, 'title')">
-         <xsl:text>title</xsl:text>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="pagetype">
-    <xsl:choose>
-      <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')">
-         <xsl:text>nopage</xsl:text>
-      </xsl:when>
-      <xsl:when test="contains($parts, 'pagenumber')">
-         <xsl:text>pagenumber</xsl:text>
-      </xsl:when>
-      <xsl:when test="contains($parts, 'pageabbrev')">
-         <xsl:text>pageabbrev</xsl:text>
-      </xsl:when>
-      <xsl:when test="contains($parts, 'Page')">
-         <xsl:text>Page</xsl:text>
-      </xsl:when>
-      <xsl:when test="contains($parts, 'page')">
-         <xsl:text>page</xsl:text>
-      </xsl:when>
-    </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'">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key">
-            <xsl:choose>
-              <xsl:when test="local-name($referrer) = 'olink'">
-                <xsl:value-of select="$target.elem"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="local-name(.)"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="$labeltype = 'labelnumber'">
-        <xsl:text>%n</xsl:text>
-      </xsl:when>
-      <xsl:when test="$labeltype = 'label'">
-        <xsl:call-template name="gentext.template">
-          <xsl:with-param name="context" select="'xref-number'"/>
-          <xsl:with-param name="name">
-            <xsl:choose>
-              <xsl:when test="local-name($referrer) = 'olink'">
-                <xsl:value-of select="$target.elem"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:call-template name="xpath.location"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:with-param>
-          <xsl:with-param name="purpose" select="$purpose"/>
-          <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-          <xsl:with-param name="referrer" select="$referrer"/>
-        </xsl:call-template>
-      </xsl:when>
-    </xsl:choose>
-
-    <xsl:choose>
-      <xsl:when test="$titletype != ''">
-        <xsl:value-of select="$xref.label-title.separator"/>
-      </xsl:when>
-      <xsl:when test="$pagetype != ''">
-        <xsl:value-of select="$xref.label-page.separator"/>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:if>
-
-  <xsl:if test="$titletype != ''">
-    <xsl:choose>
-      <xsl:when test="$titletype = 'title'">
-        <xsl:text>%t</xsl:text>
-      </xsl:when>
-      <xsl:when test="$titletype = 'quotedtitle'">
-        <xsl:call-template name="gentext.dingbat">
-          <xsl:with-param name="dingbat" select="'startquote'"/>
-        </xsl:call-template>
-        <xsl:text>%t</xsl:text>
-        <xsl:call-template name="gentext.dingbat">
-          <xsl:with-param name="dingbat" select="'endquote'"/>
-        </xsl:call-template>
-      </xsl:when>
-    </xsl:choose>
-
-    <xsl:choose>
-      <xsl:when test="$pagetype != '' and $pagetype != 'nopage'">
-        <xsl:value-of select="$xref.title-page.separator"/>
-      </xsl:when>
-    </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>
-      <xsl:when test="$pagetype = 'page'">
-        <xsl:call-template name="gentext.template">
-          <xsl:with-param name="context" select="'xref'"/>
-          <xsl:with-param name="name" select="'page'"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="$pagetype = 'Page'">
-        <xsl:call-template name="gentext.template">
-          <xsl:with-param name="context" select="'xref'"/>
-          <xsl:with-param name="name" select="'Page'"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="$pagetype = 'pageabbrev'">
-        <xsl:call-template name="gentext.template">
-          <xsl:with-param name="context" select="'xref'"/>
-          <xsl:with-param name="name" select="'pageabbrev'"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="$pagetype = 'pagenumber'">
-        <xsl:text>%p</xsl:text>
-      </xsl:when>
-    </xsl:choose>
-
-  </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:template name="substitute-markup">
-  <xsl:param name="template" select="''"/>
-  <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"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="referrer"/>
-  <xsl:param name="verbose"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($template, '%')">
-      <xsl:value-of select="substring-before($template, '%')"/>
-      <xsl:variable name="candidate"
-             select="substring(substring-after($template, '%'), 1, 1)"/>
-      <xsl:choose>
-        <xsl:when test="$candidate = 't'">
-          <xsl:apply-templates select="." mode="insert.title.markup">
-            <xsl:with-param name="purpose" select="$purpose"/>
-            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-            <xsl:with-param name="title">
-              <xsl:choose>
-                <xsl:when test="$title != ''">
-                  <xsl:copy-of select="$title"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:apply-templates select="." mode="title.markup">
-                    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-                    <xsl:with-param name="verbose" select="$verbose"/>
-                  </xsl:apply-templates>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:with-param>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:when test="$candidate = 's'">
-          <xsl:apply-templates select="." mode="insert.subtitle.markup">
-            <xsl:with-param name="purpose" select="$purpose"/>
-            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-            <xsl:with-param name="subtitle">
-              <xsl:choose>
-                <xsl:when test="$subtitle != ''">
-                  <xsl:copy-of select="$subtitle"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:apply-templates select="." mode="subtitle.markup">
-                    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-                  </xsl:apply-templates>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:with-param>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:when test="$candidate = 'n'">
-          <xsl:apply-templates select="." mode="insert.label.markup">
-            <xsl:with-param name="purpose" select="$purpose"/>
-            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-            <xsl:with-param name="label">
-              <xsl:choose>
-                <xsl:when test="$label != ''">
-                  <xsl:copy-of select="$label"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:apply-templates select="." mode="label.markup"/>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:with-param>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:when test="$candidate = 'p'">
-          <xsl:apply-templates select="." mode="insert.pagenumber.markup">
-            <xsl:with-param name="purpose" select="$purpose"/>
-            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-            <xsl:with-param name="pagenumber">
-              <xsl:choose>
-                <xsl:when test="$pagenumber != ''">
-                  <xsl:copy-of select="$pagenumber"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:apply-templates select="." mode="pagenumber.markup"/>
-                </xsl:otherwise>
-              </xsl:choose>
-            </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"/>
-            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-            <xsl:with-param name="direction">
-              <xsl:choose>
-                <xsl:when test="$referrer">
-                  <xsl:variable name="referent-is-below">
-                    <xsl:for-each select="preceding::xref">
-                      <xsl:if test="generate-id(.) = generate-id($referrer)">1</xsl:if>
-                    </xsl:for-each>
-                  </xsl:variable>
-                  <xsl:choose>
-                    <xsl:when test="$referent-is-below = ''">
-                      <xsl:call-template name="gentext">
-                        <xsl:with-param name="key" select="'above'"/>
-                      </xsl:call-template>
-                    </xsl:when>
-                    <xsl:otherwise>
-                      <xsl:call-template name="gentext">
-                        <xsl:with-param name="key" select="'below'"/>
-                      </xsl:call-template>
-                    </xsl:otherwise>
-                  </xsl:choose>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:message>Attempt to use %d in gentext with no referrer!</xsl:message>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:with-param>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:when test="$candidate = '%' ">
-          <xsl:text>%</xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text>%</xsl:text><xsl:value-of select="$candidate"/>
-        </xsl:otherwise>
-      </xsl:choose>
-      <!-- recurse with the rest of the template string -->
-      <xsl:variable name="rest"
-            select="substring($template,
-            string-length(substring-before($template, '%'))+3)"/>
-      <xsl:call-template name="substitute-markup">
-        <xsl:with-param name="template" select="$rest"/>
-        <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"/>
-        <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-        <xsl:with-param name="referrer" select="$referrer"/>
-        <xsl:with-param name="verbose" select="$verbose"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$template"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
 <xsl:template match="*" mode="olink.docname.markup">
   <!-- No-op for now -->
 </xsl:template>