From 314c2851b436b3fbe895a9ef221fbfddd6a13240 Mon Sep 17 00:00:00 2001 From: Bob Stayton Date: Fri, 13 Aug 2004 08:25:25 +0000 Subject: [PATCH] Fixed bug #967909 incorrect 'next' link for index in chapter. --- xsl/html/chunk-code.xsl | 42 +++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/xsl/html/chunk-code.xsl b/xsl/html/chunk-code.xsl index e1a43fde8..6513c1c7a 100644 --- a/xsl/html/chunk-code.xsl +++ b/xsl/html/chunk-code.xsl @@ -242,9 +242,10 @@ |preceding::refentry[1] |preceding::colophon[1] |preceding::article[1] - |preceding::bibliography[1] - |preceding::glossary[1] - |preceding::index[$generate.index != 0][1] + |preceding::bibliography[parent::article or parent::book][1] + |preceding::glossary[parent::article or parent::book][1] + |preceding::index[$generate.index != 0] + [parent::article or parent::book][1] |preceding::setindex[$generate.index != 0][1] |ancestor::set |ancestor::book[1] @@ -326,9 +327,10 @@ |following::reference[1] |following::refentry[1] |following::colophon[1] - |following::bibliography[1] - |following::glossary[1] - |following::index[$generate.index != 0][1] + |following::bibliography[parent::article or parent::book][1] + |following::glossary[parent::article or parent::book][1] + |following::index[$generate.index != 0] + [parent::article or parent::book][1] |following::article[1] |following::setindex[$generate.index != 0][1] |descendant::book[1] @@ -336,9 +338,10 @@ |descendant::chapter[1] |descendant::appendix[1] |descendant::article[1] - |descendant::bibliography[1] - |descendant::glossary[1] - |descendant::index[$generate.index != 0][1] + |descendant::bibliography[parent::article or parent::book][1] + |descendant::glossary[parent::article or parent::book][1] + |descendant::index[$generate.index != 0] + [parent::article or parent::book][1] |descendant::colophon[1] |descendant::setindex[$generate.index != 0][1] |descendant::part[1] @@ -385,9 +388,10 @@ |preceding::refentry[1] |preceding::colophon[1] |preceding::article[1] - |preceding::bibliography[1] - |preceding::glossary[1] - |preceding::index[$generate.index != 0][1] + |preceding::bibliography[parent::article or parent::book][1] + |preceding::glossary[parent::article or parent::book][1] + |preceding::index[$generate.index != 0] + [parent::article or parent::book][1] |preceding::setindex[$generate.index != 0][1] |ancestor::set |ancestor::book[1] @@ -426,9 +430,10 @@ |following::reference[1] |following::refentry[1] |following::colophon[1] - |following::bibliography[1] - |following::glossary[1] - |following::index[$generate.index != 0][1] + |following::bibliography[parent::article or parent::book][1] + |following::glossary[parent::article or parent::book][1] + |following::index[$generate.index != 0] + [parent::article or parent::book][1] |following::article[1] |following::setindex[$generate.index != 0][1] |descendant::book[1] @@ -436,9 +441,10 @@ |descendant::chapter[1] |descendant::appendix[1] |descendant::article[1] - |descendant::bibliography[1] - |descendant::glossary[1] - |descendant::index[$generate.index != 0][1] + |descendant::bibliography[parent::article or parent::book][1] + |descendant::glossary[parent::article or parent::book][1] + |descendant::index[$generate.index != 0] + [parent::article or parent::book][1] |descendant::colophon[1] |descendant::setindex[$generate.index != 0][1] |descendant::part[1] -- 2.40.0