From d59a9b8578adcf491a532fb65a3a041ef67e94cf Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven@providere-consulting.com>
Date: Wed, 12 May 2010 22:30:59 +0000
Subject: [PATCH] Tweaks to optimize the docbook to html conversion.

[SVN r61937]
---
 xsl/admon.xsl        |  4 +++-
 xsl/callout.xsl      |  4 +++-
 xsl/chunk-common.xsl |  8 ++++++--
 xsl/html.xsl         | 27 +++++++++++++++++++--------
 xsl/navbar.xsl       |  7 ++++---
 xsl/xhtml.xsl        | 14 +++++++-------
 6 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/xsl/admon.xsl b/xsl/admon.xsl
index 75c6185..d29053a 100644
--- a/xsl/admon.xsl
+++ b/xsl/admon.xsl
@@ -10,7 +10,9 @@
                 version="1.0">
 
 <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/admon.xsl"/>
-<xsl:import href="relative-href.xsl"/>
+
+<!-- Already included in the main style sheet -->
+<!-- <xsl:import href="relative-href.xsl"/> -->
 
 <xsl:template name="admon.graphic">
     <xsl:param name="node" select="."/>
diff --git a/xsl/callout.xsl b/xsl/callout.xsl
index 4c1950e..8faa534 100644
--- a/xsl/callout.xsl
+++ b/xsl/callout.xsl
@@ -10,7 +10,9 @@
                 version="1.0">
 
 <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/callout.xsl"/>
-<xsl:import href="relative-href.xsl"/>
+
+<!-- Already included in the main style sheet -->
+<!-- <xsl:import href="relative-href.xsl"/> -->
 
 <xsl:template name="callout-bug">
   <xsl:param name="conum" select='1'/>
diff --git a/xsl/chunk-common.xsl b/xsl/chunk-common.xsl
index 2747b8b..339ff1c 100644
--- a/xsl/chunk-common.xsl
+++ b/xsl/chunk-common.xsl
@@ -10,10 +10,14 @@
                 version="1.0">
 
 <!-- Import the HTML chunking stylesheet -->
+  
+<!-- Watch out that we don't override chunk.xsl -->
+<!--
 <xsl:import
-    href="http://docbook.sourceforge.net/release/xsl/current/html/chunk-common.xsl"/>
+    href="http://docbook.sourceforge.net/release/xsl/current/html/chunk-common.xsl"/> -->
 
-<xsl:import href="relative-href.xsl"/>
+<!-- Already included in the main stylesheet -->
+<!-- <xsl:import href="relative-href.xsl"/> -->
 
 <!-- ==================================================================== -->
 
diff --git a/xsl/html.xsl b/xsl/html.xsl
index 30399c5..e3ebeb3 100644
--- a/xsl/html.xsl
+++ b/xsl/html.xsl
@@ -16,14 +16,23 @@
   <xsl:import
     href="http://docbook.sourceforge.net/release/xsl/current/html/math.xsl"/>
 
-  <xsl:import href="chunk-common.xsl"/>
-  <xsl:import href="docbook-layout.xsl"/>
-  <xsl:import href="navbar.xsl"/>
-  <xsl:import href="admon.xsl"/>
-  <xsl:import href="xref.xsl"/>
-  <xsl:import href="relative-href.xsl"/>
-  <xsl:import href="callout.xsl"/>
-
+  <!-- Bring in the fast chunking overrides.  There's nothing
+       that we need to override, so include instead of importing it. -->
+  <xsl:include
+    href="http://docbook.sourceforge.net/release/xsl/current/html/chunkfast.xsl"/>
+  
+  <!-- We have to make sure that our templates override all
+       docbook templates.  Therefore, we include our own templates
+       instead of importing them.  In order for this to work,
+       the stylesheets included here cannot also include each other -->
+  <xsl:include href="chunk-common.xsl"/>
+  <xsl:include href="docbook-layout.xsl"/>
+  <xsl:include href="navbar.xsl"/>
+  <xsl:include href="admon.xsl"/>
+  <xsl:include href="xref.xsl"/>
+  <xsl:include href="relative-href.xsl"/>
+  <xsl:include href="callout.xsl"/>
+  
   <xsl:param name="html.stylesheet">
     <xsl:choose>
       <xsl:when test = "$boost.defaults = 'Boost'">
@@ -280,6 +289,8 @@ set       toc,title
      </div>
   </xsl:template>
 
+  <xsl:template name="generate.html.title"/>
+  
 <!-- ============================================================ -->
 
 <xsl:template name="output.html.stylesheets">
diff --git a/xsl/navbar.xsl b/xsl/navbar.xsl
index ae39444..300ecef 100644
--- a/xsl/navbar.xsl
+++ b/xsl/navbar.xsl
@@ -9,8 +9,9 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version="1.0">
 
-<xsl:import href="relative-href.xsl"/>
-
+<!-- Already included in the main style sheet -->
+<!-- <xsl:import href="relative-href.xsl"/> -->
+ 
    <!--
       boost.defaults:
         *custom  - only use explicitly set parameters
@@ -369,7 +370,7 @@
             </xsl:call-template>
          </a></xsl:if>
          <!-- home -->
-         <xsl:if test = "$home != . or $nav.context = 'toc'">
+         <xsl:if test = "generate-id($home) != generate-id(.) or $nav.context = 'toc'">
             <a accesskey = "h">
                <xsl:attribute name = "href"><xsl:call-template name = "href.target">
                   <xsl:with-param name = "object" select = "$home"/>
diff --git a/xsl/xhtml.xsl b/xsl/xhtml.xsl
index bf8344e..cc8e210 100644
--- a/xsl/xhtml.xsl
+++ b/xsl/xhtml.xsl
@@ -16,13 +16,13 @@
   <xsl:import
     href="http://docbook.sourceforge.net/release/xsl/current/xhtml/math.xsl"/>
 
-  <xsl:import href="chunk-common.xsl"/>
-  <xsl:import href="docbook-layout.xsl"/>
-  <xsl:import href="navbar.xsl"/>
-  <xsl:import href="admon.xsl"/>
-  <xsl:import href="xref.xsl"/>
-  <xsl:import href="relative-href.xsl"/>
-  <xsl:import href="callout.xsl"/>
+  <xsl:include href="chunk-common.xsl"/>
+  <xsl:include href="docbook-layout.xsl"/>
+  <xsl:include href="navbar.xsl"/>
+  <xsl:include href="admon.xsl"/>
+  <xsl:include href="xref.xsl"/>
+  <xsl:include href="relative-href.xsl"/>
+  <xsl:include href="callout.xsl"/>
 
   <xsl:param name="html.stylesheet">
     <xsl:choose>