From ee59c2da6659e06538ae7b03717e66d836a17901 Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Fri, 3 Jun 2005 17:22:31 +0000
Subject: [PATCH] Fixed bug [ 1212159 ] Missing navigational links with XHTML
 chunking which was caused by the following:

1.  When chunk.hierarchy is created, it is a collection of
div elements in a variable, and then that is converted to a
node-set by exlt.

2.  In HTML, there is no namespace, so the div elements are in
no namespace and they work.

3.  In XHTML, the div elements are in the xhtml namespace because
it is the default namespace.  So they cannot be addressed as
just "div", they must have a namespace prefix.

4.  I added an explicit chunkfast namespace to avoid conflict
with the default namespace.
---
 xsl/html/chunk-code.xsl | 11 ++++++-----
 xsl/html/chunkfast.xsl  |  7 ++++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/xsl/html/chunk-code.xsl b/xsl/html/chunk-code.xsl
index 280b00cd7..bce27d155 100644
--- a/xsl/html/chunk-code.xsl
+++ b/xsl/html/chunk-code.xsl
@@ -1,5 +1,6 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:exsl="http://exslt.org/common"
+                xmlns:cf="http://docbook.sourceforge.net/xmlns/chunkfast/1.0"
                 version="1.0"
                 exclude-result-prefixes="exsl">
 
@@ -47,9 +48,9 @@
 
   <xsl:choose>
     <xsl:when test="$chunk != 0">
-      <div class="{local-name(.)}" id="{generate-id()}">
+      <cf:div class="{local-name(.)}" id="{generate-id()}">
         <xsl:apply-templates select="*" mode="find.chunks"/>
-      </div>
+      </cf:div>
     </xsl:when>
     <xsl:otherwise>
       <xsl:apply-templates select="*" mode="find.chunks"/>
@@ -66,17 +67,17 @@
 
   <xsl:choose>
     <xsl:when test="$chunk.fast != 0 and function-available('exsl:node-set')">
-      <xsl:variable name="chunks" select="exsl:node-set($chunk.hierarchy)//div"/>
+      <xsl:variable name="chunks" select="exsl:node-set($chunk.hierarchy)//cf:div"/>
       <xsl:variable name="genid" select="generate-id()"/>
 
       <xsl:variable name="div" select="$chunks[@id=$genid]"/>
 
       <xsl:variable name="prevdiv"
-                    select="($div/preceding-sibling::div|$div/preceding::div|$div/parent::div)[last()]"/>
+                    select="($div/preceding-sibling::cf:div|$div/preceding::cf:div|$div/parent::cf:div)[last()]"/>
       <xsl:variable name="prev" select="key('genid', $prevdiv/@id)"/>
 
       <xsl:variable name="nextdiv"
-                    select="($div/following-sibling::div|$div/following::div|$div/div)[1]"/>
+                    select="($div/following-sibling::cf:div|$div/following::cf:div|$div/cf:div)[1]"/>
       <xsl:variable name="next" select="key('genid', $nextdiv/@id)"/>
 
       <xsl:choose>
diff --git a/xsl/html/chunkfast.xsl b/xsl/html/chunkfast.xsl
index bd49ac843..48258b302 100644
--- a/xsl/html/chunkfast.xsl
+++ b/xsl/html/chunkfast.xsl
@@ -1,5 +1,6 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:exsl="http://exslt.org/common"
+                xmlns:cf="http://docbook.sourceforge.net/xmlns/chunkfast/1.0"
 		version="1.0"
                 exclude-result-prefixes="exsl">
 
@@ -18,7 +19,7 @@
 <xsl:import href="chunk.xsl"/>
 <xsl:param name="chunk.fast" select="1"/>
 
-<xsl:variable name="chunks" select="exsl:node-set($chunk.hierarchy)//div"/>
+<xsl:variable name="chunks" select="exsl:node-set($chunk.hierarchy)//cf:div"/>
 
 <!-- ==================================================================== -->
 
@@ -30,11 +31,11 @@
       <xsl:variable name="div" select="$chunks[@id=$genid]"/>
 
       <xsl:variable name="prevdiv"
-                    select="($div/preceding-sibling::div|$div/preceding::div|$div/parent::div)[last()]"/>
+                    select="($div/preceding-sibling::cf:div|$div/preceding::cf:div|$div/parent::cf:div)[last()]"/>
       <xsl:variable name="prev" select="key('genid', $prevdiv/@id)"/>
 
       <xsl:variable name="nextdiv"
-                    select="($div/following-sibling::div|$div/following::div|$div/div)[1]"/>
+                    select="($div/following-sibling::cf:div|$div/following::cf:div|$div/cf:div)[1]"/>
       <xsl:variable name="next" select="key('genid', $nextdiv/@id)"/>
 
       <xsl:choose>
-- 
2.40.0