From 4f37e925d847b4fd9ea2e90dde6344447999e2fb Mon Sep 17 00:00:00 2001
From: dhilvert <dhilvert@auricle.dyndns.org>
Date: Fri, 6 Oct 2006 05:31:00 +0000
Subject: [PATCH] doc: Make table of contents output more flexible.  This
 re-introduces the indentation bug.

darcs-hash:20061006053134-789c2-6fca78378e71943c30fe461d3b33ec2bb87aa9d0.gz
---
 doc/Makefile               |  9 ++++++---
 doc/ale-doc.xsl            | 14 ++++++++++----
 doc/package/todo/index.xml | 10 ++++++++++
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index 8bac5fe..5734e46 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -271,7 +271,7 @@ FO_CUSTOM := <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" \
   <xsl:param name="commented.page.margin.outer">3in</xsl:param> \
   <xsl:param name="chapter.autolabel">1</xsl:param> \
   <xsl:param name="section.autolabel">1</xsl:param> \
-  <xsl:param name="toc.section.depth">1</xsl:param> \
+  <xsl:param name="toc.section.depth">2</xsl:param> \
   <xsl:param name="commented.toc.max.depth">2</xsl:param> \
   <xsl:param name="double.sided">1</xsl:param> \
   <xsl:param name="draft.watermark.image"></xsl:param> \
@@ -289,6 +289,7 @@ FO_CUSTOM := <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" \
   <xsl:attribute-set name="xref.properties"> \
     <xsl:attribute name="color">blue</xsl:attribute> \
   </xsl:attribute-set> \
+  <xsl:template match="section[@tocexclude = 1]"  mode="toc" /> \
   <xsl:template name="page.number.format"> \
   <xsl:param name="element" select="local-name(.)"/> \
   <xsl:choose> \
@@ -365,8 +366,9 @@ HTML_CUSTOM := <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   <xsl:param name="index.on.type">1</xsl:param> \
   <xsl:param name="chapter.autolabel">1</xsl:param> \
   <xsl:param name="section.autolabel">1</xsl:param> \
-  <xsl:param name="toc.section.depth">1</xsl:param> \
+  <xsl:param name="toc.section.depth">2</xsl:param> \
   <xsl:param name="commented.toc.max.depth">2</xsl:param> \
+  <xsl:template match="section[@tocexclude = 1]"  mode="toc" /> \
   <xsl:param name="generate.toc"> \
 appendix  toc,title \
 article/appendix  nop \
@@ -406,8 +408,9 @@ CHNK_CUSTOM := <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   <xsl:param name="index.on.type">1</xsl:param> \
   <xsl:param name="chapter.autolabel">1</xsl:param> \
   <xsl:param name="section.autolabel">1</xsl:param> \
-  <xsl:param name="toc.section.depth">1</xsl:param> \
+  <xsl:param name="toc.section.depth">2</xsl:param> \
   <xsl:param name="commented.toc.max.depth">2</xsl:param> \
+  <xsl:template match="section[@tocexclude = 1]"  mode="toc" /> \
   <xsl:param name="generate.toc"> \
 appendix  toc,title \
 article/appendix  nop \
diff --git a/doc/ale-doc.xsl b/doc/ale-doc.xsl
index 2e19efa..2b58788 100644
--- a/doc/ale-doc.xsl
+++ b/doc/ale-doc.xsl
@@ -526,7 +526,7 @@
 	      <xsl:for-each select="$taxonomy">
 	        <xsl:variable name="category" select="."/>
 		<xsl:if test="contains($map, concat(generate-id($category), ' '))">
-	          <section>
+	          <section tocexclude="1">
 		    <xsl:call-template name="write_title">
 		      <xsl:with-param name="title">
 		        <xsl:choose>
@@ -557,8 +557,10 @@
 	  - Release
 	  -->
 
-	<xsl:template match="release">
-	    <section>
+	<xsl:template match="release" name="release">
+	    <xsl:param name="label" select="1"/>
+	    <section label="{$label}">
+	    <!-- <section label="{@version}"> -->
 	    	<xsl:choose>
 	    	  <xsl:when test="@date">
 		    <title>
@@ -594,7 +596,11 @@
 	</xsl:template>
 
 	<xsl:template match="changelog">
-	  <xsl:apply-templates select="release"/>
+	  <xsl:for-each select="release">
+	    <xsl:call-template name="release">
+	      <xsl:with-param name="label" select="count(../release) - position()"/>
+	    </xsl:call-template>
+	  </xsl:for-each>
 	</xsl:template>
 
 	<!-- 
diff --git a/doc/package/todo/index.xml b/doc/package/todo/index.xml
index 432589c..adaee19 100644
--- a/doc/package/todo/index.xml
+++ b/doc/package/todo/index.xml
@@ -14,6 +14,7 @@
 <section><title>0.8.5 (pre-Beta)</title>
 
 <edit by="David Hilvert" in-month="2006-Sep"/>
+<edit by="David Hilvert" in-month="2006-Oct"/>
 
 <note>This release may be combined with the 0.9.0 Beta release.</note>
 <section>
@@ -226,6 +227,15 @@
 	Unsorted
 </title>
 <edit by="David Hilvert" in-month="2006-Sep"/>
+<edit by="David Hilvert" in-month="2006-Oct"/>
+<section>
+<title>
+	Documentation
+</title>
+<ul><li> Generate correctly indented book-level tables of contents when rendering
+the complete set of manuals.
+</li></ul>
+</section>
 <section>
 <title>
 	Integer-value routines
-- 
2.11.4.GIT