From c2985d918f30b5ffd6882f25345b9540ba8c8297 Mon Sep 17 00:00:00 2001
From: Michael Smith <xmldoc@users.sourceforge.net>
Date: Thu, 27 Apr 2006 09:40:33 +0000
Subject: [PATCH] Added the autotoc.label.in.hyperlink param.

If the value of autotoc.label.in.hyperlink is non-zero, labels are
included in hyperlinked titles in the TOC. If it is instead zero,
labels are still displayed prior to the hyperlinked titles, but
are not hyperlinked along with the titles.

Closes patch #1065868. Thanks to anatoly techtonik for the patch.
---
 xsl/html/autotoc.xsl                      | 17 ++++++++++++++++
 xsl/html/param.ent                        |  1 +
 xsl/html/param.xweb                       |  2 ++
 xsl/params/autotoc.label.in.hyperlink.xml | 24 +++++++++++++++++++++++
 4 files changed, 44 insertions(+)
 create mode 100644 xsl/params/autotoc.label.in.hyperlink.xml

diff --git a/xsl/html/autotoc.xsl b/xsl/html/autotoc.xsl
index e9016d37f..d381694a0 100644
--- a/xsl/html/autotoc.xsl
+++ b/xsl/html/autotoc.xsl
@@ -276,6 +276,19 @@
 
  <span>
   <xsl:attribute name="class"><xsl:value-of select="local-name(.)"/></xsl:attribute>
+
+  <!-- * if $autotoc.label.in.hyperlink is zero, then output the label -->
+  <!-- * before the hyperlinked title (as the DSSSL stylesheet does) -->
+  <xsl:if test="$autotoc.label.in.hyperlink = 0">
+    <xsl:variable name="label">
+      <xsl:apply-templates select="." mode="label.markup"/>
+    </xsl:variable>
+    <xsl:copy-of select="$label"/>
+    <xsl:if test="$label != ''">
+      <xsl:value-of select="$autotoc.label.separator"/>
+    </xsl:if>
+  </xsl:if>
+
   <a>
     <xsl:attribute name="href">
       <xsl:call-template name="href.target">
@@ -283,6 +296,9 @@
       </xsl:call-template>
     </xsl:attribute>
     
+  <!-- * if $autotoc.label.in.hyperlink is non-zero, then output the label -->
+  <!-- * as part of the hyperlinked title -->
+  <xsl:if test="not($autotoc.label.in.hyperlink = 0)">
     <xsl:variable name="label">
       <xsl:apply-templates select="." mode="label.markup"/>
     </xsl:variable>
@@ -290,6 +306,7 @@
     <xsl:if test="$label != ''">
       <xsl:value-of select="$autotoc.label.separator"/>
     </xsl:if>
+  </xsl:if>
 
     <xsl:apply-templates select="." mode="titleabbrev.markup"/>
   </a>
diff --git a/xsl/html/param.ent b/xsl/html/param.ent
index d9211a293..790aedb87 100644
--- a/xsl/html/param.ent
+++ b/xsl/html/param.ent
@@ -7,6 +7,7 @@
 <!ENTITY appendix.autolabel SYSTEM "../params/appendix.autolabel.xml">
 <!ENTITY author.othername.in.middle SYSTEM "../params/author.othername.in.middle.xml">
 <!ENTITY autotoc.label.separator SYSTEM "../params/autotoc.label.separator.xml">
+<!ENTITY autotoc.label.in.hyperlink SYSTEM "../params/autotoc.label.in.hyperlink.xml">
 <!ENTITY base.dir SYSTEM "../params/base.dir.xml">
 <!ENTITY biblioentry.item.separator SYSTEM "../params/biblioentry.item.separator.xml">
 <!ENTITY bibliography.collection SYSTEM "../params/bibliography.collection.xml">
diff --git a/xsl/html/param.xweb b/xsl/html/param.xweb
index 020a22794..5bf21b276 100644
--- a/xsl/html/param.xweb
+++ b/xsl/html/param.xweb
@@ -83,6 +83,7 @@ stylesheet like this:</para>
 <reference id="toc_index"><title>ToC/LoT/Index Generation</title>
 &annotate.toc;
 &autotoc.label.separator;
+&autotoc.label.in.hyperlink;
 &process.source.toc;
 &process.empty.source.toc;
 &bridgehead.in.toc;
@@ -463,6 +464,7 @@ around all these parameters.</para>
 <src:fragref linkend="appendix.autolabel.frag"/>
 <src:fragref linkend="author.othername.in.middle.frag"/>
 <src:fragref linkend="autotoc.label.separator.frag"/>
+<src:fragref linkend="autotoc.label.in.hyperlink.frag"/>
 <src:fragref linkend="base.dir.frag"/>
 <src:fragref linkend="biblioentry.item.separator.frag"/>
 <src:fragref linkend="bibliography.collection.frag"/>
diff --git a/xsl/params/autotoc.label.in.hyperlink.xml b/xsl/params/autotoc.label.in.hyperlink.xml
new file mode 100644
index 000000000..15f93d086
--- /dev/null
+++ b/xsl/params/autotoc.label.in.hyperlink.xml
@@ -0,0 +1,24 @@
+<refentry id="autotoc.label.in.hyperlink">
+<refmeta>
+<refentrytitle>autotoc.label.in.hyperlink</refentrytitle>
+<refmiscinfo role="type">boolean</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>autotoc.label.in.hyperlink</refname>
+<refpurpose>Include lable in hyperlinked titles in TOC?</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='autotoc.label.in.hyperlink.frag'><xsl:param name="autotoc.label.in.hyperlink" select="1"/></src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>If the value of
+<parameter>autotoc.label.in.hyperlink</parameter> is non-zero, labels
+are included in hyperlinked titles in the TOC. If it is instead zero,
+labels are still displayed prior to the hyperlinked titles, but
+are not hyperlinked along with the titles.</para>
+
+</refsect1>
+</refentry>
-- 
2.40.0