DocBook

Update of /cvsroot/docbook/xsl/common
In directory sc8-pr-cvs1:/tmp/cvs-serv16927

Modified Files:
	gentext.xsl labels.xsl subtitles.xsl table.xsl targets.xsl 
	titles.xsl 
Log Message:
Added CVS $Id$ comment.


Index: gentext.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/common/gentext.xsl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -U2 -r1.25 -r1.26
--- gentext.xsl	12 Oct 2003 19:33:08 -0000	1.25
+++ gentext.xsl	30 Nov 2003 19:45:09 -0000	1.26
@@ -5,5 +5,16 @@
                 version='1.0'>
 
-<!-- ============================================================ -->
+<!-- ********************************************************************
+     $Id$
+     ********************************************************************
+
+     This file is part of the XSL DocBook Stylesheet distribution.
+     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
+     and other information.
+
+     ******************************************************************** -->
+
+<!-- ==================================================================== -->
+
 
 <xsl:template match="*" mode="object.title.template">

Index: labels.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/common/labels.xsl,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -U2 -r1.24 -r1.25
--- labels.xsl	17 Nov 2003 17:12:20 -0000	1.24
+++ labels.xsl	30 Nov 2003 19:45:09 -0000	1.25
@@ -5,5 +5,16 @@
                 version='1.0'>
 
-<!-- ============================================================ -->
+<!-- ********************************************************************
+     $Id$
+     ********************************************************************
+
+     This file is part of the XSL DocBook Stylesheet distribution.
+     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
+     and other information.
+
+     ******************************************************************** -->
+
+<!-- ==================================================================== -->
+
 <!-- label markup -->
 

Index: subtitles.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/common/subtitles.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -U2 -r1.4 -r1.5
--- subtitles.xsl	14 Mar 2002 18:43:34 -0000	1.4
+++ subtitles.xsl	30 Nov 2003 19:45:09 -0000	1.5
@@ -5,5 +5,16 @@
                 version='1.0'>
 
-<!-- ============================================================ -->
+<!-- ********************************************************************
+     $Id$
+     ********************************************************************
+
+     This file is part of the XSL DocBook Stylesheet distribution.
+     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
+     and other information.
+
+     ******************************************************************** -->
+
+<!-- ==================================================================== -->
+
 <!-- subtitle markup -->
 

Index: table.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/common/table.xsl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -U2 -r1.13 -r1.14
--- table.xsl	13 Apr 2003 17:59:31 -0000	1.13
+++ table.xsl	30 Nov 2003 19:45:09 -0000	1.14
@@ -5,4 +5,16 @@
                 version="1.0">
 
+<!-- ********************************************************************
+     $Id$
+     ********************************************************************
+
+     This file is part of the XSL DocBook Stylesheet distribution.
+     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
+     and other information.
+
+     ******************************************************************** -->
+
+<!-- ==================================================================== -->
+
 <xsl:template name="blank.spans">
   <xsl:param name="cols" select="1"/>

Index: targets.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/common/targets.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -U2 -r1.3 -r1.4
--- targets.xsl	13 Jul 2002 08:24:33 -0000	1.3
+++ targets.xsl	30 Nov 2003 19:45:09 -0000	1.4
@@ -5,5 +5,16 @@
                 version='1.0'>
 
-<!-- ============================================================ -->
+<!-- ********************************************************************
+     $Id$
+     ********************************************************************
+
+     This file is part of the XSL DocBook Stylesheet distribution.
+     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
+     and other information.
+
+     ******************************************************************** -->
+
+<!-- ==================================================================== -->
+
 <!-- cross reference target collection  -->
 

Index: titles.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/common/titles.xsl,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -U2 -r1.24 -r1.25
--- titles.xsl	27 Aug 2003 14:37:16 -0000	1.24
+++ titles.xsl	30 Nov 2003 19:45:09 -0000	1.25
@@ -5,5 +5,16 @@
                 version='1.0'>
 
-<!-- ============================================================ -->
+<!-- ********************************************************************
+     $Id$
+     ********************************************************************
+
+     This file is part of the XSL DocBook Stylesheet distribution.
+     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
+     and other information.
+
+     ******************************************************************** -->
+
+<!-- ==================================================================== -->
+
 <!-- title markup -->

Update of /cvsroot/docbook/xsl/html
In directory sc8-pr-cvs1:/tmp/cvs-serv16089

Modified Files:
	autoidx.xsl changebars.xsl chunk-code.xsl chunk-common.xsl 
	chunk.xsl chunker.xsl chunkfast.xsl chunktoc.xsl html-rtf.xsl 
	htmltbl.xsl maketoc.xsl manifest.xsl oldchunker.xsl 
	onechunk.xsl profile-chunk.xsl profile-onechunk.xsl task.xsl 
Log Message:
Added CVS $Id$ comments.


Index: autoidx.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/html/autoidx.xsl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -U2 -r1.18 -r1.19
--- autoidx.xsl	20 Jan 2003 17:17:12 -0000	1.18
+++ autoidx.xsl	30 Nov 2003 19:42:23 -0000	1.19
@@ -41,4 +41,14 @@
                 version="1.0">
 
+<!-- ********************************************************************
+     $Id$
+     ********************************************************************
+
+     This file is part of the XSL DocBook Stylesheet distribution.
+     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
+     and other information.
+
+     ******************************************************************** -->
+
 <!-- ==================================================================== -->
 <!-- Jeni Tennison gets all the credit for what follows.

Index: changebars.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/html/changebars.xsl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -U2 -r1.10 -r1.11
--- changebars.xsl	20 Sep 2002 11:13:16 -0000	1.10
+++ changebars.xsl	30 Nov 2003 19:42:23 -0000	1.11
@@ -3,4 +3,15 @@
                 version="1.0">
 
+<!-- ********************************************************************
+     $Id$
+     ********************************************************************
+
+     This file is part of the XSL DocBook Stylesheet distribution.
+     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
+     and other information.
+
+     ******************************************************************** -->
+
+<!-- ==================================================================== -->
 <xsl:import href="docbook.xsl"/>
 

Index: chunk-code.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/html/chunk-code.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -U2 -r1.3 -r1.4
--- chunk-code.xsl	23 Oct 2003 18:33:02 -0000	1.3
+++ chunk-code.xsl	30 Nov 2003 19:42:23 -0000	1.4
@@ -4,4 +4,16 @@
                 exclude-result-prefixes="exsl">
 
+<!-- ********************************************************************
+     $Id$
+     ********************************************************************
+
+     This file is part of the XSL DocBook Stylesheet distribution.
+     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
+     and other information.
+
+     ******************************************************************** -->
+
+<!-- ==================================================================== -->
+
 <xsl:param name="onechunk" select="0"/>
 <xsl:param name="refentry.separator" select="0"/>
@@ -234,5 +246,5 @@
              |preceding::glossary[1]
              |preceding::index[$generate.index != 0][1]
-             |preceding::setindex[1]
+             |preceding::setindex[$generate.index != 0][1]
              |ancestor::set
              |ancestor::book[1]
@@ -319,5 +331,5 @@
              |following::index[$generate.index != 0][1]
              |following::article[1]
-             |following::setindex[1]
+             |following::setindex[$generate.index != 0][1]
              |descendant::book[1]
              |descendant::preface[1]
@@ -329,5 +341,5 @@
              |descendant::index[$generate.index != 0][1]
              |descendant::colophon[1]
-             |descendant::setindex[1]
+             |descendant::setindex[$generate.index != 0][1]
              |descendant::part[1]
              |descendant::reference[1]
@@ -377,5 +389,5 @@
              |preceding::glossary[1]
              |preceding::index[$generate.index != 0][1]
-             |preceding::setindex[1]
+             |preceding::setindex[$generate.index != 0][1]
              |ancestor::set
              |ancestor::book[1]
@@ -419,5 +431,5 @@
              |following::index[$generate.index != 0][1]
              |following::article[1]
-             |following::setindex[1]
+             |following::setindex[$generate.index != 0][1]
              |descendant::book[1]
              |descendant::preface[1]
@@ -429,5 +441,5 @@
              |descendant::index[$generate.index != 0][1]
              |descendant::colophon[1]
-             |descendant::setindex[1]
+             |descendant::setindex[$generate.index != 0][1]
              |descendant::part[1]
              |descendant::reference[1]

Index: chunk-common.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/html/chunk-common.xsl,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -U2 -r1.34 -r1.35
--- chunk-common.xsl	25 Nov 2003 22:43:44 -0000	1.34
+++ chunk-common.xsl	30 Nov 2003 19:42:23 -0000	1.35
@@ -3,4 +3,16 @@
                 version="1.0">
 
+<!-- ********************************************************************
+     $Id$
+     ********************************************************************
+
+     This file is part of the XSL DocBook Stylesheet distribution.
+     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
+     and other information.
+
+     ******************************************************************** -->
+
+<!-- ==================================================================== -->
+
 <xsl:template name="chunk">
   <xsl:param name="node" select="."/>

Index: chunk.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/html/chunk.xsl,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -U2 -r1.29 -r1.30
--- chunk.xsl	8 May 2003 13:23:00 -0000	1.29
+++ chunk.xsl	30 Nov 2003 19:42:23 -0000	1.30
@@ -4,4 +4,16 @@
                 exclude-result-prefixes="exsl">
 
+<!-- ********************************************************************
+     $Id$
+     ********************************************************************
+
+     This file is part of the XSL DocBook Stylesheet distribution.
+     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
+     and other information.
+
+     ******************************************************************** -->
+
+<!-- ==================================================================== -->
+
 <xsl:import href="docbook.xsl"/>
 <xsl:import href="chunk-common.xsl"/>

Index: chunker.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/html/chunker.xsl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -U2 -r1.23 -r1.24
--- chunker.xsl	29 Aug 2003 18:17:24 -0000	1.23
+++ chunker.xsl	30 Nov 2003 19:42:23 -0000	1.24
@@ -9,4 +9,16 @@
                 extension-element-prefixes="saxon xalanredirect lxslt exsl">
 
+<!-- ********************************************************************
+     $Id$
+     ********************************************************************
+
+     This file is part of the XSL DocBook Stylesheet distribution.
+     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
+     and other information.
+
+     ******************************************************************** -->
+
+<!-- ==================================================================== -->
+
 <!-- This stylesheet works with XSLT implementations that support -->
 <!-- exsl:document, saxon:output, or xalanredirect:write -->

Index: chunkfast.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/html/chunkfast.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -U2 -r1.1 -r1.2
--- chunkfast.xsl	16 Sep 2002 11:54:19 -0000	1.1
+++ chunkfast.xsl	30 Nov 2003 19:42:23 -0000	1.2
@@ -4,4 +4,16 @@
                 exclude-result-prefixes="exsl">
 
+<!-- ********************************************************************
+     $Id$
+     ********************************************************************
+
+     This file is part of the XSL DocBook Stylesheet distribution.
+     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
+     and other information.
+
+     ******************************************************************** -->
+
+<!-- ==================================================================== -->
+
 <xsl:import href="chunk.xsl"/>
 <xsl:param name="chunk.fast" select="1"/>

Index: chunktoc.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/html/chunktoc.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -U2 -r1.4 -r1.5
--- chunktoc.xsl	14 Mar 2002 18:43:35 -0000	1.4
+++ chunktoc.xsl	30 Nov 2003 19:42:23 -0000	1.5
@@ -4,4 +4,16 @@
                 exclude-result-prefixes="doc">
 
+<!-- ********************************************************************
+     $Id$
+     ********************************************************************
+
+     This file is part of the XSL DocBook Stylesheet distribution.
+     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
+     and other information.
+
+     ******************************************************************** -->
+
+<!-- ==================================================================== -->
+
 <xsl:import href="docbook.xsl"/>
 <xsl:import href="chunk-common.xsl"/>

Index: html-rtf.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/html/html-rtf.xsl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -U2 -r1.10 -r1.11
--- html-rtf.xsl	21 Jun 2003 14:31:41 -0000	1.10
+++ html-rtf.xsl	30 Nov 2003 19:42:23 -0000	1.11
@@ -6,4 +6,16 @@
                 version="1.0">
 
+<!-- ********************************************************************
+     $Id$
+     ********************************************************************
+
+     This file is part of the XSL DocBook Stylesheet distribution.
+     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
+     and other information.
+
+     ******************************************************************** -->
+
+<!-- ==================================================================== -->
+
 <!-- This module contains templates that match against HTML nodes. It is used
      to post-process result tree fragments for some sorts of cleanup.

Index: htmltbl.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/html/htmltbl.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -U2 -r1.1 -r1.2
--- htmltbl.xsl	27 Aug 2003 23:58:14 -0000	1.1
+++ htmltbl.xsl	30 Nov 2003 19:42:23 -0000	1.2
@@ -3,4 +3,16 @@
                 version="1.0">
 
+<!-- ********************************************************************
+     $Id$
+     ********************************************************************
+
+     This file is part of the XSL DocBook Stylesheet distribution.
+     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
+     and other information.
+
+     ******************************************************************** -->
+
+<!-- ==================================================================== -->
+
 <xsl:template match="colgroup" mode="htmlTable">
   <xsl:copy>

Index: maketoc.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/html/maketoc.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -U2 -r1.4 -r1.5
--- maketoc.xsl	8 Jul 2003 06:50:11 -0000	1.4
+++ maketoc.xsl	30 Nov 2003 19:42:23 -0000	1.5
@@ -4,4 +4,16 @@
                 exclude-result-prefixes="doc">
 
+<!-- ********************************************************************
+     $Id$
+     ********************************************************************
+
+     This file is part of the XSL DocBook Stylesheet distribution.
+     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
+     and other information.
+
+     ******************************************************************** -->
+
+<!-- ==================================================================== -->
+
 <xsl:import href="docbook.xsl"/>
 <xsl:import href="chunk.xsl"/>

Index: manifest.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/html/manifest.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -U2 -r1.3 -r1.4
--- manifest.xsl	23 Sep 2003 08:55:42 -0000	1.3
+++ manifest.xsl	30 Nov 2003 19:42:23 -0000	1.4
@@ -4,4 +4,16 @@
                 exclude-result-prefixes="doc">
 
+<!-- ********************************************************************
+     $Id$
+     ********************************************************************
+
+     This file is part of the XSL DocBook Stylesheet distribution.
+     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
+     and other information.
+
+     ******************************************************************** -->
+
+<!-- ==================================================================== -->
+
 <xsl:variable name="manifest.base.dir">
 </xsl:variable>

Index: oldchunker.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/html/oldchunker.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -U2 -r1.4 -r1.5
--- oldchunker.xsl	14 Mar 2002 18:43:38 -0000	1.4
+++ oldchunker.xsl	30 Nov 2003 19:42:23 -0000	1.5
@@ -8,4 +8,16 @@
                 extension-element-prefixes="saxon xalanredirect lxslt">
 
+<!-- ********************************************************************
+     $Id$
+     ********************************************************************
+
+     This file is part of the XSL DocBook Stylesheet distribution.
+     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
+     and other information.
+
+     ******************************************************************** -->
+
+<!-- ==================================================================== -->
+
 <!-- This stylesheet works with Saxon and Xalan; for XT use xtchunker.xsl -->
 

Index: onechunk.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/html/onechunk.xsl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -U2 -r1.8 -r1.9
--- onechunk.xsl	19 Jun 2003 07:13:51 -0000	1.8
+++ onechunk.xsl	30 Nov 2003 19:42:23 -0000	1.9
@@ -5,4 +5,16 @@
                 exclude-result-prefixes="doc">
 
+<!-- ********************************************************************
+     $Id$
+     ********************************************************************
+
+     This file is part of the XSL DocBook Stylesheet distribution.
+     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
+     and other information.
+
+     ******************************************************************** -->
+
+<!-- ==================================================================== -->
+
 <xsl:import href="chunk.xsl"/>
 

Index: profile-chunk.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/html/profile-chunk.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -U2 -r1.1 -r1.2
--- profile-chunk.xsl	12 May 2003 16:08:55 -0000	1.1
+++ profile-chunk.xsl	30 Nov 2003 19:42:23 -0000	1.2
@@ -4,4 +4,16 @@
                 exclude-result-prefixes="exsl">
 
+<!-- ********************************************************************
+     $Id$
+     ********************************************************************
+
+     This file is part of the XSL DocBook Stylesheet distribution.
+     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
+     and other information.
+
+     ******************************************************************** -->
+
+<!-- ==================================================================== -->
+
 <xsl:import href="docbook.xsl"/>
 <xsl:import href="chunk-common.xsl"/>

Index: profile-onechunk.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/html/profile-onechunk.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -U2 -r1.2 -r1.3
--- profile-onechunk.xsl	19 Jun 2003 07:13:51 -0000	1.2
+++ profile-onechunk.xsl	30 Nov 2003 19:42:23 -0000	1.3
@@ -5,4 +5,16 @@
                 exclude-result-prefixes="doc">
 
+<!-- ********************************************************************
+     $Id$
+     ********************************************************************
+
+     This file is part of the XSL DocBook Stylesheet distribution.
+     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
+     and other information.
+
+     ******************************************************************** -->
+
+<!-- ==================================================================== -->
+
 <xsl:import href="profile-chunk.xsl"/>
 

Index: task.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/html/task.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -U2 -r1.1 -r1.2
--- task.xsl	27 Aug 2003 14:27:00 -0000	1.1
+++ task.xsl	30 Nov 2003 19:42:23 -0000	1.2
@@ -3,4 +3,16 @@
                 version="1.0">
 
+<!-- ********************************************************************
+     $Id$
+     ********************************************************************
+
+     This file is part of the XSL DocBook Stylesheet distribution.
+     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
+     and other information.
+
+     ******************************************************************** -->
+
+<!-- ==================================================================== -->
+
 <xsl:template match="task">
   <xsl:variable name="param.placement"

Update of /cvsroot/docbook/xsl/fo
In directory sc8-pr-cvs1:/tmp/cvs-serv15010

Modified Files:
	htmltbl.xsl 
Log Message:
Added CVS $Id.


Index: htmltbl.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/fo/htmltbl.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -U2 -r1.1 -r1.2
--- htmltbl.xsl	27 Aug 2003 23:57:58 -0000	1.1
+++ htmltbl.xsl	30 Nov 2003 19:35:34 -0000	1.2
@@ -4,4 +4,16 @@
                 version="1.0">
 
+<!-- ********************************************************************
+     $Id$
+     ********************************************************************
+
+     This file is part of the XSL DocBook Stylesheet distribution.
+     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
+     and other information.
+
+     ******************************************************************** -->
+
+<!-- ==================================================================== -->
+
   <xsl:attribute-set name="th.style">
     <xsl:attribute name="font-weight">bold</xsl:attribute>

Update of /cvsroot/docbook/xsl/fo
In directory sc8-pr-cvs1:/tmp/cvs-serv14899

Modified Files:
	task.xsl 
Log Message:
Added CVS $Id.


Index: task.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/fo/task.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -U2 -r1.1 -r1.2
--- task.xsl	27 Aug 2003 14:29:19 -0000	1.1
+++ task.xsl	30 Nov 2003 19:35:03 -0000	1.2
@@ -4,4 +4,16 @@
                 version="1.0">
 
+<!-- ********************************************************************
+     $Id$
+     ********************************************************************
+
+     This file is part of the XSL DocBook Stylesheet distribution.
+     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
+     and other information.
+
+     ******************************************************************** -->
+
+<!-- ==================================================================== -->
+
 <xsl:template match="task">
   <xsl:variable name="id">

Update of /cvsroot/docbook/xsl/html
In directory sc8-pr-cvs1:/tmp/cvs-serv5611/html

Modified Files:
	Makefile.param param.ent param.xweb 
Log Message:
Added new HTML Help parameters from patches by W. Borgert


Index: Makefile.param
===================================================================
RCS file: /cvsroot/docbook/xsl/html/Attic/Makefile.param,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -U2 -r1.20 -r1.21
--- Makefile.param	23 Sep 2003 08:55:42 -0000	1.20
+++ Makefile.param	29 Nov 2003 21:45:22 -0000	1.21
@@ -95,5 +95,7 @@
        ../params/htmlhelp.chm.xml \
        ../params/htmlhelp.default.topic.xml \
+       ../params/htmlhelp.display.progress.xml \
        ../params/htmlhelp.encoding.xml \
+       ../params/htmlhelp.enhanced.decompilation.xml \
        ../params/htmlhelp.enumerate.images.xml \
        ../params/htmlhelp.force.map.and.alias.xml \
@@ -103,4 +105,6 @@
        ../params/htmlhelp.hhc.section.depth.xml \
        ../params/htmlhelp.hhc.show.root.xml \
+       ../params/htmlhelp.hhc.width.xml \
+       ../params/htmlhelp.hhp.windows.xml \
        ../params/htmlhelp.hhk.xml \
        ../params/htmlhelp.hhp.xml \
@@ -109,9 +113,12 @@
        ../params/htmlhelp.map.file.xml \
        ../params/htmlhelp.only.xml \
+       ../params/htmlhelp.remember.window.position.xml \
        ../params/htmlhelp.show.advanced.search.xml \
        ../params/htmlhelp.show.favorities.xml \
        ../params/htmlhelp.show.menu.xml \
+       ../params/htmlhelp.show.toolbar.text.xml \
        ../params/htmlhelp.title.xml \
        ../params/htmlhelp.use.hhk.xml \
+       ../params/htmlhelp.window.geometry.xml \
        ../params/inherit.keywords.xml \
        ../params/label.from.part.xml \

Index: param.ent
===================================================================
RCS file: /cvsroot/docbook/xsl/html/param.ent,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -U2 -r1.68 -r1.69
--- param.ent	23 Sep 2003 08:55:42 -0000	1.68
+++ param.ent	29 Nov 2003 21:45:22 -0000	1.69
@@ -95,5 +95,7 @@
 <!ENTITY htmlhelp.chm SYSTEM "../params/htmlhelp.chm.xml">
 <!ENTITY htmlhelp.default.topic SYSTEM "../params/htmlhelp.default.topic.xml">
+<!ENTITY htmlhelp.display.progress SYSTEM "../params/htmlhelp.display.progress.xml">
 <!ENTITY htmlhelp.encoding SYSTEM "../params/htmlhelp.encoding.xml">
+<!ENTITY htmlhelp.enhanced.decompilation SYSTEM "../params/htmlhelp.enhanced.decompilation.xml">
 <!ENTITY htmlhelp.enumerate.images SYSTEM "../params/htmlhelp.enumerate.images.xml">
 <!ENTITY htmlhelp.force.map.and.alias SYSTEM "../params/htmlhelp.force.map.and.alias.xml">
@@ -103,4 +105,6 @@
 <!ENTITY htmlhelp.hhc.section.depth SYSTEM "../params/htmlhelp.hhc.section.depth.xml">
 <!ENTITY htmlhelp.hhc.show.root SYSTEM "../params/htmlhelp.hhc.show.root.xml">
+<!ENTITY htmlhelp.hhc.width SYSTEM "../params/htmlhelp.hhc.width.xml">
+<!ENTITY htmlhelp.hhp.windows SYSTEM "../params/htmlhelp.hhp.windows.xml">
 <!ENTITY htmlhelp.hhk SYSTEM "../params/htmlhelp.hhk.xml">
 <!ENTITY htmlhelp.hhp SYSTEM "../params/htmlhelp.hhp.xml">
@@ -109,9 +113,12 @@
 <!ENTITY htmlhelp.map.file SYSTEM "../params/htmlhelp.map.file.xml">
 <!ENTITY htmlhelp.only SYSTEM "../params/htmlhelp.only.xml">
+<!ENTITY htmlhelp.remember.window.position SYSTEM "../params/htmlhelp.remember.window.position.xml">
 <!ENTITY htmlhelp.show.advanced.search SYSTEM "../params/htmlhelp.show.advanced.search.xml">
 <!ENTITY htmlhelp.show.favorities SYSTEM "../params/htmlhelp.show.favorities.xml">
 <!ENTITY htmlhelp.show.menu SYSTEM "../params/htmlhelp.show.menu.xml">
+<!ENTITY htmlhelp.show.toolbar.text SYSTEM "../params/htmlhelp.show.toolbar.text.xml">
 <!ENTITY htmlhelp.title SYSTEM "../params/htmlhelp.title.xml">
 <!ENTITY htmlhelp.use.hhk SYSTEM "../params/htmlhelp.use.hhk.xml">
+<!ENTITY htmlhelp.window.geometry SYSTEM "../params/htmlhelp.window.geometry.xml">
 <!ENTITY inherit.keywords SYSTEM "../params/inherit.keywords.xml">
 <!ENTITY label.from.part SYSTEM "../params/label.from.part.xml">

Index: param.xweb
===================================================================
RCS file: /cvsroot/docbook/xsl/html/param.xweb,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -U2 -r1.74 -r1.75
--- param.xweb	23 Sep 2003 08:55:42 -0000	1.74
+++ param.xweb	29 Nov 2003 21:45:22 -0000	1.75
@@ -332,4 +332,5 @@
 &htmlhelp.chm;
 &htmlhelp.default.topic;
+&htmlhelp.display.progress;
 &htmlhelp.hhp;
 &htmlhelp.hhc;
@@ -337,4 +338,6 @@
 &htmlhelp.hhp.tail;
 &htmlhelp.hhp.window;
+&htmlhelp.hhp.windows;
+&htmlhelp.enhanced.decompilation;
 &htmlhelp.enumerate.images;
 &htmlhelp.force.map.and.alias;
@@ -345,6 +348,8 @@
 &htmlhelp.hhc.folders.instead.books;
 &htmlhelp.hhc.binary;
+&htmlhelp.hhc.width;
 &htmlhelp.title;
 &htmlhelp.show.menu;
+&htmlhelp.show.toolbar.text;
 &htmlhelp.show.advanced.search;
 &htmlhelp.show.favorities;
@@ -368,4 +373,6 @@
 &htmlhelp.button.prev;
 &htmlhelp.button.zoom;
+&htmlhelp.remember.window.position;
+&htmlhelp.window.geometry;
 &htmlhelp.use.hhk;
 &htmlhelp.only;
@@ -513,5 +520,7 @@
 <src:fragref linkend="htmlhelp.chm.frag"/>
 <src:fragref linkend="htmlhelp.default.topic.frag"/>
+<src:fragref linkend="htmlhelp.display.progress.frag"/>
 <src:fragref linkend="htmlhelp.encoding.frag"/>
+<src:fragref linkend="htmlhelp.enhanced.decompilation.frag"/>
 <src:fragref linkend="htmlhelp.enumerate.images.frag"/>
 <src:fragref linkend="htmlhelp.force.map.and.alias.frag"/>
@@ -521,15 +530,20 @@
 <src:fragref linkend="htmlhelp.hhc.section.depth.frag"/>
 <src:fragref linkend="htmlhelp.hhc.show.root.frag"/>
+<src:fragref linkend="htmlhelp.hhc.width.frag"/>
 <src:fragref linkend="htmlhelp.hhk.frag"/>
 <src:fragref linkend="htmlhelp.hhp.frag"/>
 <src:fragref linkend="htmlhelp.hhp.tail.frag"/>
 <src:fragref linkend="htmlhelp.hhp.window.frag"/>
+<src:fragref linkend="htmlhelp.hhp.windows.frag"/>
 <src:fragref linkend="htmlhelp.map.file.frag"/>
 <src:fragref linkend="htmlhelp.only.frag"/>
+<src:fragref linkend="htmlhelp.remember.window.position.frag"/>
 <src:fragref linkend="htmlhelp.show.advanced.search.frag"/>
 <src:fragref linkend="htmlhelp.show.favorities.frag"/>
 <src:fragref linkend="htmlhelp.show.menu.frag"/>
+<src:fragref linkend="htmlhelp.show.toolbar.text.frag"/>
 <src:fragref linkend="htmlhelp.title.frag"/>
 <src:fragref linkend="htmlhelp.use.hhk.frag"/>
+<src:fragref linkend="htmlhelp.window.geometry.frag"/>
 <src:fragref linkend="ignore.image.scaling.frag"/>
 <src:fragref linkend="inherit.keywords.frag"/>

Update of /cvsroot/docbook/xsl/params
In directory sc8-pr-cvs1:/tmp/cvs-serv5611/params

Added Files:
	htmlhelp.display.progress.xml 
	htmlhelp.enhanced.decompilation.xml htmlhelp.hhc.width.xml 
	htmlhelp.hhp.windows.xml htmlhelp.remember.window.position.xml 
	htmlhelp.show.toolbar.text.xml htmlhelp.window.geometry.xml 
Log Message:
Added new HTML Help parameters from patches by W. Borgert


--- NEW FILE ---
<refentry id="htmlhelp.display.progress">
<refmeta>
<refentrytitle>htmlhelp.display.progress</refentrytitle>
<refmiscinfo role="type">boolean</refmiscinfo>
</refmeta>
<refnamediv>
<refname>htmlhelp.display.progress</refname>
<refpurpose>Display compile progress?</refpurpose>
</refnamediv>

<refsynopsisdiv>
<src:fragment id='htmlhelp.display.progress.frag'>
<xsl:param name="htmlhelp.display.progress" select="1"/>
</src:fragment>
</refsynopsisdiv>

<refsect1><title>Description</title>

<para>You can swith off display of compile progress by setting this
parameter to 0.</para>

</refsect1>
</refentry>

--- NEW FILE ---
<refentry id="htmlhelp.enhanced.decompilation">
<refmeta>
<refentrytitle>htmlhelp.enhanced.decompilation</refentrytitle>
<refmiscinfo role="type">boolean</refmiscinfo>
</refmeta>
<refnamediv>
<refname>htmlhelp.enhanced.decompilation</refname>
<refpurpose>Allow enhanced decompilation of CHM?</refpurpose>
</refnamediv>

<refsynopsisdiv>
<src:fragment id='htmlhelp.enhanced.decompilation.frag'>
<xsl:param name="htmlhelp.enhanced.decompilation" select="0"/>
</src:fragment>
</refsynopsisdiv>

<refsect1><title>Description</title>

<para>When set to 1 this parameter enables enhanced decompilation of CHM.</para>

</refsect1>
</refentry>

--- NEW FILE ---
<refentry id="htmlhelp.hhc.width">
<refmeta>
<refentrytitle>htmlhelp.hhc.width</refentrytitle>
<refmiscinfo role="type">integer</refmiscinfo>
</refmeta>
<refnamediv>
<refname>htmlhelp.hhc.width</refname>
<refpurpose>Width of navigation (ToC) pane</refpurpose>
</refnamediv>

<refsynopsisdiv>
<src:fragment id='htmlhelp.hhc.width.frag'>
<xsl:param name="htmlhelp.hhc.width"/>
</src:fragment>
</refsynopsisdiv>

<refsect1><title>Description</title>

<para>This parameter specifies width of ToC pane in pixels.</para>

</refsect1>
</refentry>

--- NEW FILE ---
<refentry id="htmlhelp.hhp.windows'">
<refmeta>
<refentrytitle>htmlhelp.hhp.windows</refentrytitle>
<refmiscinfo role="type">string</refmiscinfo>
</refmeta>
<refnamediv>
<refname>htmlhelp.hhp.windows</refname>
<refpurpose>Definition of additional windows</refpurpose>
</refnamediv>

<refsynopsisdiv>
<src:fragment id='htmlhelp.hhp.windows.frag'>
<xsl:param name="htmlhelp.hhp.windows"/>
</src:fragment>
</refsynopsisdiv>

<refsect1><title>Description</title>

<para>Content of this parameter is placed at the end of [WINDOWS]
section of project file. You can use it for defining your own
addtional windows.</para>

</refsect1>
</refentry>

--- NEW FILE ---
<refentry id="htmlhelp.remember.window.position">
<refmeta>
<refentrytitle>htmlhelp.remember.window.position</refentrytitle>
<refmiscinfo role="type">boolean</refmiscinfo>
</refmeta>
<refnamediv>
<refname>htmlhelp.remember.window.position</refname>
<refpurpose>Remember help window position?</refpurpose>
</refnamediv>

<refsynopsisdiv>
<src:fragment id='htmlhelp.remember.window.position.frag'>
<xsl:param name="htmlhelp.remember.window.position" select="0"/>
</src:fragment>
</refsynopsisdiv>

<refsect1><title>Description</title>

<para>To remember help window position between starts set this
parameter to 1.</para>

</refsect1>
</refentry>

--- NEW FILE ---
<refentry id="htmlhelp.show.toolbar.text'">
<refmeta>
<refentrytitle>htmlhelp.show.toolbar.text</refentrytitle>
<refmiscinfo role="type">boolean</refmiscinfo>
</refmeta>
<refnamediv>
<refname>htmlhelp.show.toolbar.text</refname>
<refpurpose>Show text under toolbar buttons?</refpurpose>
</refnamediv>

<refsynopsisdiv>
<src:fragment id='htmlhelp.show.toolbar.text.frag'>
<xsl:param name="htmlhelp.show.toolbar.text" select="1"/>
</src:fragment>
</refsynopsisdiv>

<refsect1><title>Description</title>

<para>You can switch off display of texts under toolbar buttons by
setting this parameter to 0.</para>

</refsect1>
</refentry>

--- NEW FILE ---
<refentry id="htmlhelp.window.geometry">
<refmeta>
<refentrytitle>htmlhelp.window.geometry</refentrytitle>
<refmiscinfo role="type">string</refmiscinfo>
</refmeta>
<refnamediv>
<refname>htmlhelp.window.geometry</refname>
<refpurpose>Set initial geometry of help window</refpurpose>
</refnamediv>

<refsynopsisdiv>
<src:fragment id='htmlhelp.window.geometry.frag'>
<xsl:param name="htmlhelp.window.geometry"/>
</src:fragment>
</refsynopsisdiv>

<refsect1><title>Description</title>

<para>This parameter specifies initial position of help
window. E.g.</para>

<programlisting><![CDATA[<xsl:param name="htmlhelp.window.geometry">[160,64,992,704]</xsl:param>]]></programlisting>

</refsect1>
</refentry>

Update of /cvsroot/docbook/xsl/htmlhelp
In directory sc8-pr-cvs1:/tmp/cvs-serv5611/htmlhelp

Modified Files:
	htmlhelp-common.xsl 
Log Message:
Added new HTML Help parameters from patches by W. Borgert


Index: htmlhelp-common.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/htmlhelp/htmlhelp-common.xsl,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -U2 -r1.24 -r1.25
--- htmlhelp-common.xsl	27 Oct 2003 20:05:16 -0000	1.24
+++ htmlhelp-common.xsl	29 Nov 2003 21:45:22 -0000	1.25
@@ -110,5 +110,7 @@
     <xsl:with-param name="n" select="9504 + $htmlhelp.show.menu * 65536
                                           + $htmlhelp.show.advanced.search * 131072
-                                          + $htmlhelp.show.favorities * 4096"/>
+                                          + $htmlhelp.show.favorities * 4096
+                                          + (1 - $htmlhelp.show.toolbar.text) * 64
+                                          + $htmlhelp.remember.window.position * 262144"/>
   </xsl:call-template>
 </xsl:variable>
@@ -149,5 +151,14 @@
 <xsl:text>Default topic=</xsl:text><xsl:value-of select="$default.topic"/>
 <xsl:text>
-Display compile progress=Yes
+Display compile progress=</xsl:text>
+  <xsl:choose>
+    <xsl:when test="$htmlhelp.display.progress != 1">
+      <xsl:text>No</xsl:text>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:text>Yes</xsl:text>
+    </xsl:otherwise>
+  </xsl:choose>
+<xsl:text>
 Full-text search=Yes
 </xsl:text>
@@ -179,4 +190,14 @@
     </xsl:otherwise>
   </xsl:choose>
+<xsl:text>
+Enhanced decompilation=</xsl:text>
+  <xsl:choose>
+    <xsl:when test="$htmlhelp.enhanced.decompilation != 0">
+      <xsl:text>Yes</xsl:text>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:text>No</xsl:text>
+    </xsl:otherwise>
+  </xsl:choose>
 
 <xsl:if test="$htmlhelp.hhp.window != ''">
@@ -232,10 +253,13 @@
 <xsl:text>,</xsl:text>
 <xsl:value-of select="$xnavigation"/>
-<xsl:text>,,</xsl:text>
+<xsl:text>,</xsl:text><xsl:value-of select="$htmlhelp.hhc.width"/><xsl:text>,</xsl:text>
 <xsl:value-of select="$xbuttons"/>
-<xsl:text>,,,,,,,,0
+<xsl:text>,</xsl:text><xsl:value-of select="$htmlhelp.window.geometry"/><xsl:text>,,,,,,,0
 </xsl:text>
 </xsl:if>
 
+<xsl:if test="$htmlhelp.hhp.windows">
+  <xsl:value-of select="$htmlhelp.hhp.windows"/>
+</xsl:if>
 <xsl:text>

Update of /cvsroot/docbook/website/xsl
In directory sc8-pr-cvs1:/tmp/cvs-serv27728

Modified Files:
	website-common.xsl 
Log Message:
baseuri attribute in website.database.xml now adds
the $filename-prefix value.


Index: website-common.xsl
===================================================================
RCS file: /cvsroot/docbook/website/xsl/website-common.xsl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -U2 -r1.14 -r1.15
--- website-common.xsl	25 Nov 2003 23:42:12 -0000	1.14
+++ website-common.xsl	25 Nov 2003 23:45:03 -0000	1.15
@@ -713,10 +713,12 @@
         <xsl:choose>
           <xsl:when test="@filename">
+            <xsl:value-of select="$filename-prefix"/>
             <xsl:value-of select="@filename"/>
           </xsl:when>
           <xsl:when test="/layout/config[@param='default-filename']">
+            <xsl:value-of select="$filename-prefix"/>
             <xsl:value-of select="(/layout/config[@param='default-filename'])[1]/@value"/>
           </xsl:when>
-          <xsl:otherwise>index.html</xsl:otherwise>
+          <xsl:otherwise><xsl:value-of select="$filename-prefix"/>index.html</xsl:otherwise>
         </xsl:choose>
       </xsl:variable>

Update of /cvsroot/docbook/website/xsl
In directory sc8-pr-cvs1:/tmp/cvs-serv27290

Modified Files:
	website-common.xsl 
Log Message:
Use normalize-space() on summary since used as an attribute value.


Index: website-common.xsl
===================================================================
RCS file: /cvsroot/docbook/website/xsl/website-common.xsl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -U2 -r1.13 -r1.14
--- website-common.xsl	20 Feb 2003 08:47:59 -0000	1.13
+++ website-common.xsl	25 Nov 2003 23:42:12 -0000	1.14
@@ -571,5 +571,5 @@
     <xsl:if test="summary">
       <xsl:attribute name="title">
-        <xsl:value-of select="summary"/>
+        <xsl:value-of select="normalize-space(summary)"/>
       </xsl:attribute>
     </xsl:if>

Update of /cvsroot/docbook/xsl/html
In directory sc8-pr-cvs1:/tmp/cvs-serv13546

Modified Files:
	chunk-common.xsl 
Log Message:
Experimental fix for some xref linking issues in cases where dbhtml 'dir' is used.

Index: chunk-common.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/html/chunk-common.xsl,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -U2 -r1.33 -r1.34
--- chunk-common.xsl	24 Nov 2003 16:39:24 -0000	1.33
+++ chunk-common.xsl	25 Nov 2003 22:43:44 -0000	1.34
@@ -134,5 +134,25 @@
   </xsl:variable>
 
-  <xsl:if test="$ischunk != 0 and $fn != ''">
+  <!--
+  <xsl:message>
+    <xsl:value-of select="$ischunk"/>
+    <xsl:text> (</xsl:text>
+    <xsl:value-of select="local-name(.)"/>
+    <xsl:text>) </xsl:text>
+    <xsl:value-of select="$fn"/>
+    <xsl:text>, </xsl:text>
+    <xsl:call-template name="dbhtml-dir"/>
+  </xsl:message>
+  -->
+
+  <!-- 2003-11-25 by ndw:
+       The following test used to read test="$ischunk != 0 and $fn != ''"
+       I've removed the ischunk part of the test so that href.to.uri and
+       href.from.uri will be fully qualified even if the source or target
+       isn't a chunk. I *think* that if $fn != '' then it's appropriate
+       to put the directory on the front, even if the element isn't a
+       chunk. I could be wrong. -->
+
+  <xsl:if test="$fn != ''">
     <xsl:call-template name="dbhtml-dir"/>
   </xsl:if>
@@ -471,4 +491,9 @@
     </xsl:call-template>
   </xsl:variable>
+  
+  <!--
+  <xsl:message>href.to.uri: <xsl:value-of select="$href.to.uri"/></xsl:message>
+  <xsl:message>href.from.uri: <xsl:value-of select="$href.from.uri"/></xsl:message>
+  -->
 
   <xsl:variable name="href.to">
@@ -502,5 +527,5 @@
   </xsl:variable>
 
-<!--
+  <!--
   <xsl:message>
     <xsl:text>In </xsl:text>
@@ -515,5 +540,5 @@
     <xsl:value-of select="$href"/>
   </xsl:message>
--->
+  -->
 
   <xsl:value-of select="$href"/>

Update of /cvsroot/docbook/xsl/fo
In directory sc8-pr-cvs1:/tmp/cvs-serv19452

Modified Files:
	pagesetup.xsl 
Log Message:
Remove $title.margin.left from the margin-left calculation
when $passivetex.extensions != 0 since it can't do the math.


Index: pagesetup.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/fo/pagesetup.xsl,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -U2 -r1.42 -r1.43
--- pagesetup.xsl	15 Oct 2003 20:33:46 -0000	1.42
+++ pagesetup.xsl	25 Nov 2003 18:13:49 -0000	1.43
@@ -30,4 +30,34 @@
 </xsl:param>
 
+<!-- PassiveTeX can't handle the math expression for
+     title.margin.left being negative, so ignore it.
+     margin-left="{$page.margin.outer} - {$title.margin.left}"
+-->
+<xsl:param name="margin.left.outer">
+  <xsl:choose>
+    <xsl:when test="$passivetex.extensions != 0">
+      <xsl:value-of select="$page.margin.outer"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:value-of select="$page.margin.outer"/>
+      <xsl:text> - </xsl:text>
+      <xsl:value-of select="$title.margin.left"/>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:param>
+
+<xsl:param name="margin.left.inner">
+  <xsl:choose>
+    <xsl:when test="$passivetex.extensions != 0">
+      <xsl:value-of select="$page.margin.inner"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:value-of select="$page.margin.inner"/>
+      <xsl:text> - </xsl:text>
+      <xsl:value-of select="$title.margin.left"/>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:param>
+
 <xsl:template name="setup.pagemasters">
   <fo:layout-master-set>
@@ -38,5 +68,5 @@
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$page.margin.outer} - {$title.margin.left}"
+                           margin-left="{$margin.left.outer}"
                            margin-right="{$page.margin.inner}">
       <fo:region-body display-align="center"
@@ -61,5 +91,5 @@
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$page.margin.inner} - {$title.margin.left}"
+                           margin-left="{$margin.left.inner}"
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
@@ -81,5 +111,5 @@
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$page.margin.inner} - {$title.margin.left}"
+                           margin-left="{$margin.left.inner}"
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
@@ -101,6 +131,6 @@
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
-                           margin-right="{$page.margin.inner}"
-                           margin-left="{$page.margin.outer} - {$title.margin.left}">
+                           margin-left="{$margin.left.outer}"
+                           margin-right="{$page.margin.inner}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
@@ -122,5 +152,5 @@
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$page.margin.inner} - {$title.margin.left}"
+                           margin-left="{$margin.left.inner}"
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
@@ -142,5 +172,5 @@
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$page.margin.inner} - {$title.margin.left}"
+                           margin-left="{$margin.left.inner}"
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
@@ -162,6 +192,6 @@
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
-                           margin-right="{$page.margin.inner}"
-                           margin-left="{$page.margin.outer} - {$title.margin.left}">
+                           margin-left="{$margin.left.outer}"
+                           margin-right="{$page.margin.inner}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
@@ -183,5 +213,5 @@
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$page.margin.inner} - {$title.margin.left}"
+                           margin-left="{$margin.left.inner}"
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
@@ -203,5 +233,5 @@
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$page.margin.inner} - {$title.margin.left}"
+                           margin-left="{$margin.left.inner}"
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
@@ -223,6 +253,6 @@
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
-                           margin-right="{$page.margin.inner}"
-                           margin-left="{$page.margin.outer} - {$title.margin.left}">
+                           margin-left="{$margin.left.outer}"
+                           margin-right="{$page.margin.inner}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
@@ -244,5 +274,5 @@
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$page.margin.inner} - {$title.margin.left}"
+                           margin-left="{$margin.left.inner}"
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
@@ -264,5 +294,5 @@
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$page.margin.inner} - {$title.margin.left}"
+                           margin-left="{$margin.left.inner}"
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
@@ -284,6 +314,6 @@
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
-                           margin-right="{$page.margin.inner}"
-                           margin-left="{$page.margin.outer} - {$title.margin.left}">
+                           margin-left="{$margin.left.outer}"
+                           margin-right="{$page.margin.inner}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
@@ -305,5 +335,5 @@
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$page.margin.inner} - {$title.margin.left}"
+                           margin-left="{$margin.left.inner}"
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
@@ -325,5 +355,5 @@
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$page.margin.inner} - {$title.margin.left}"
+                           margin-left="{$margin.left.inner}"
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
@@ -345,6 +375,6 @@
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
-                           margin-right="{$page.margin.inner}"
-                           margin-left="{$page.margin.outer} - {$title.margin.left}">
+                           margin-left="{$margin.left.outer}"
+                           margin-right="{$page.margin.inner}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
@@ -366,5 +396,5 @@
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$page.margin.inner}"
+                           margin-left="{$margin.left.inner}"
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
@@ -406,6 +436,6 @@
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
-                           margin-right="{$page.margin.inner}"
-                           margin-left="{$page.margin.outer}">
+                           margin-left="{$page.margin.outer}"
+                           margin-right="{$page.margin.inner}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
@@ -428,5 +458,5 @@
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$page.margin.outer} - {$title.margin.left}"
+                             margin-left="{$margin.left.outer}"
                              margin-right="{$page.margin.inner}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
@@ -458,5 +488,5 @@
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$page.margin.inner} - {$title.margin.left}"
+                             margin-left="{$margin.left.inner}"
                              margin-right="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
@@ -489,5 +519,5 @@
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$page.margin.inner} - {$title.margin.left}"
+                             margin-left="{$margin.left.inner}"
                              margin-right="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
@@ -520,6 +550,6 @@
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
-                             margin-right="{$page.margin.inner}"
-                             margin-left="{$page.margin.outer} - {$title.margin.left}">
+                             margin-left="{$margin.left.outer}"
+                             margin-right="{$page.margin.inner}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
@@ -552,5 +582,5 @@
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$page.margin.inner} - {$title.margin.left}"
+                             margin-left="{$margin.left.inner}"
                              margin-right="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
@@ -583,5 +613,5 @@
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$page.margin.inner} - {$title.margin.left}"
+                             margin-left="{$margin.left.inner}"
                              margin-right="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
@@ -614,6 +644,6 @@
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
-                             margin-right="{$page.margin.inner}"
-                             margin-left="{$page.margin.outer} - {$title.margin.left}">
+                             margin-left="{$margin.left.outer}"
+                             margin-right="{$page.margin.inner}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
@@ -646,5 +676,5 @@
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$page.margin.inner} - {$title.margin.left}"
+                             margin-left="{$margin.left.inner}"
                              margin-right="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
@@ -677,5 +707,5 @@
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$page.margin.inner} - {$title.margin.left}"
+                             margin-left="{$margin.left.inner}"
                              margin-right="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
@@ -708,6 +738,6 @@
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
-                             margin-right="{$page.margin.inner}"
-                             margin-left="{$page.margin.outer} - {$title.margin.left}">
+                             margin-left="{$margin.left.outer}"
+                             margin-right="{$page.margin.inner}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
@@ -740,5 +770,5 @@
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$page.margin.inner} - {$title.margin.left}"
+                             margin-left="{$margin.left.inner}"
                              margin-right="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
@@ -771,5 +801,5 @@
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$page.margin.inner} - {$title.margin.left}"
+                             margin-left="{$margin.left.inner}"
                              margin-right="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
@@ -802,6 +832,6 @@
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
-                             margin-right="{$page.margin.inner}"
-                             margin-left="{$page.margin.outer} - {$title.margin.left}">
+                             margin-left="{$margin.left.outer}"
+                             margin-right="{$page.margin.inner}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
@@ -834,5 +864,5 @@
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$page.margin.inner} - {$title.margin.left}"
+                             margin-left="{$margin.left.inner}"
                              margin-right="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
@@ -865,5 +895,5 @@
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$page.margin.inner} - {$title.margin.left}"
+                             margin-left="{$margin.left.inner}"
                              margin-right="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
@@ -896,6 +926,6 @@
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
-                             margin-right="{$page.margin.inner}"
-                             margin-left="{$page.margin.outer} - {$title.margin.left}">
+                             margin-left="{$margin.left.outer}"
+                             margin-right="{$page.margin.inner}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
@@ -991,5 +1021,5 @@
                              margin-bottom="{$page.margin.bottom}"
                              margin-right="{$page.margin.inner}"
-			     margin-left="{$page.margin.outer}">
+                             margin-left="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"

Update of /cvsroot/docbook/xsl/params
In directory sc8-pr-cvs1:/tmp/cvs-serv19358

Modified Files:
	title.margin.left.xml 
Log Message:
Set to zero if passivetex.extensions != 0 since PassiveTeX
cannot handle the math expression with negative values.


Index: title.margin.left.xml
===================================================================
RCS file: /cvsroot/docbook/xsl/params/title.margin.left.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -U2 -r1.3 -r1.4
--- title.margin.left.xml	2 Sep 2003 17:48:55 -0000	1.3
+++ title.margin.left.xml	25 Nov 2003 18:12:43 -0000	1.4
@@ -11,5 +11,10 @@
 <refsynopsisdiv>
 <src:fragment id='title.margin.left.frag'>
-<xsl:param name="title.margin.left" select="'-4pc'"/>
+<xsl:param name="title.margin.left">
+  <xsl:choose>
+    <xsl:when test="$passivetex.extensions != 0">0pt</xsl:when>
+    <xsl:otherwise>-4pc</xsl:otherwise>
+  </xsl:choose>
+</xsl:param>
 </src:fragment>
 </refsynopsisdiv>
@@ -17,8 +22,22 @@
 <refsect1><title>Description</title>
 
-<para>This parameter adjusts the left margin for titles.
+<para>This parameter adjusts the left margin for titles,
+effectively leaving the titles at the left
+margin and indenting the body text.
+The default value is -4pc, which means the
+body text is indented 4 picas relative to
+the titles.
+</para>
+<para>
 If you set the value to zero, be sure to still include
 a unit indicator such as <literal>0pt</literal>, or
 the FO processor will report errors.
+</para>
+<para>
+This parameter is set to 0pt if the
+<parameter>passivetex.extensions</paramater>
+parameter is nonzero because PassiveTeX cannot handle
+the math expression with negative values 
+used to calculate the indents.
 </para>

Update of /cvsroot/docbook/gentext/locale
In directory sc8-pr-cvs1:/tmp/cvs-serv12889

Modified Files:
	sv.xml 
Log Message:
added patches from Daniel Larsson <Daniel.Larsson@...>.


Index: sv.xml
===================================================================
RCS file: /cvsroot/docbook/gentext/locale/sv.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -U2 -r1.13 -r1.14
--- sv.xml	25 Jul 2003 05:03:54 -0000	1.13
+++ sv.xml	25 Nov 2003 02:21:06 -0000	1.14
@@ -92,6 +92,6 @@
 <gentext key="RefSynopsisDiv" text="Synopsis"/>
 <gentext key="refsynopsisdiv" text="Synopsis"/> <!-- en -->
-<gentext key="RevHistory" text="Revisions Historik;"/>
-<gentext key="revhistory" text="Revisions Historik;"/>
+<gentext key="RevHistory" text="Revisionshistorik"/>
+<gentext key="revhistory" text="Revisionshistorik"/>
 <gentext key="Revision" text="Revision"/>
 <gentext key="revision" text="Revision"/>
@@ -104,7 +104,7 @@
 <gentext key="section" text="avsnitt"/>
 <gentext key="See" text="Se"/>
-<gentext key="see" text="Se"/>
+<gentext key="see" text="se"/>
 <gentext key="SeeAlso" text="Se &#196;ven"/>
-<gentext key="seealso" text="Se &#196;ven"/>
+<gentext key="seealso" text="se &#228;ven"/>
 <gentext key="Seealso" text="Se &#228;ven"/>
 <gentext key="Set" text="Set"/>
@@ -128,6 +128,6 @@
 <gentext key="by" text="av"/>
 <gentext key="called" text="kallas"/>
-<gentext key="edited" text="Redigerad"/>
 <gentext key="Edited" text="Redigerad"/>
+<gentext key="edited" text="Redigerad"/>
 <gentext key="Editedby" text="Redigerad av"/>
 <gentext key="editedby" text="Redigerad av"/>
@@ -135,5 +135,5 @@
 <gentext key="lastlistcomma" text=","/>
 <gentext key="listcomma" text=","/>
-<gentext key="nonexistantelement" text="non-existant element"/>
+<gentext key="nonexistantelement" text="icke-existerande element"/>
 <gentext key="Notes" text="Noter"/>
 <gentext key="notes" text="Noter"/>
@@ -147,16 +147,16 @@
 <gentext key="tableofcontents" text="Inneh&#229;llsf&#246;rteckning"/>
 <gentext key="the" text=""/>
-<gentext key="unexpectedelementname" text="Unexpected element name"/>
+<gentext key="unexpectedelementname" text="Ov&#228;ntat elementnamn"/>
 <gentext key="unsupported" text="unsupported"/>
-<gentext key="xrefto" text="xref till"/>
+<gentext key="xrefto" text="korsreferens till"/>
 
-<gentext key="listofequations" text="Ekvationsf&#246;rteckning"/>
 <gentext key="ListofEquations" text="Ekvationsf&#246;rteckning"/>
+<gentext key="listofequations" text="Ekvationsf&#246;rteckning"/>
 <gentext key="ListofExamples" text="Exempelf&#246;rteckning"/>
 <gentext key="listofexamples" text="Exempelf&#246;rteckning"/>
 <gentext key="ListofFigures" text="Figurf&#246;rteckning"/>
 <gentext key="listoffigures" text="Figurf&#246;rteckning"/>
-<gentext key="listoftables" text="Tabellf&#246;rteckning"/>
 <gentext key="ListofTables" text="Tabellf&#246;rteckning"/>
+<gentext key="listoftables" text="Tabellf&#246;rteckning"/>
 <gentext key="ListofUnknown" text="F&#246;rteckning av ok&#228;nda"/>
 <gentext key="listofunknown" text="F&#246;rteckning av ok&#228;nda"/>
@@ -164,7 +164,7 @@
 <gentext key="nav-home" text="Hem"/>
 <gentext key="nav-next" text="N&#228;sta"/>
-<gentext key="nav-next-sibling" text="Snabbt bak&#229;t"/>
+<gentext key="nav-next-sibling" text="Snabbt fram&#229;t"/>
 <gentext key="nav-prev" text="F&#246;reg&#229;ende"/>
-<gentext key="nav-prev-sibling" text="Snabbt fram&#229;t"/>
+<gentext key="nav-prev-sibling" text="Snabbt bak&#229;t"/>
 <gentext key="nav-up" text="Upp"/>
 
@@ -477,4 +477,52 @@
 <template name="MsgLevel"><MsgLevel/>: </template>
 <template name="MsgOrig"><MsgOrig/>: </template>
+</context>
+
+<context name="datetime">
+<template name="format">d-m-Y</template>
+</context>
+
+<context name="datetime-full">
+<template name="January">Januari</template>
+<template name="February">Februari</template>
+<template name="March">Mars</template>
+<template name="April">April</template>
+<template name="May">Maj</template>
+<template name="June">Juni</template>
+<template name="July">Juli</template>
+<template name="August">Augusti</template>
+<template name="September">September</template>
+<template name="October">Oktober</template>
+<template name="November">November</template>
+<template name="December">December</template>
+<template name="Monday">M&#229;ndag</template>
+<template name="Tuesday">Tisdag</template>
+<template name="Wednesday">Onsdag</template>
+<template name="Thursday">Torsdag</template>
+<template name="Friday">Fredag</template>
+<template name="Saturday">L&#246;rdag</template>
+<template name="Sunday">S&#246;ndag</template>
+</context>
+
+<context name="datetime-abbrev">
+<template name="Jan">Jan</template>
+<template name="Feb">Feb</template>
+<template name="Mar">Mar</template>
+<template name="Apr">Apr</template>
+<template name="May">Maj</template>
+<template name="Jun">Jun</template>
+<template name="Jul">Jul</template>
+<template name="Aug">Aug</template>
+<template name="Sep">Sep</template>
+<template name="Oct">Okt</template>
+<template name="Nov">Nov</template>
+<template name="Dec">Dec</template>
+<template name="Mon">Mon</template>
+<template name="Tue">Tis</template>
+<template name="Wed">Ons</template>
+<template name="Thu">Tor</template>
+<template name="Fri">Fre</template>
+<template name="Sat">L&#246;r</template>
+<template name="Sun">S&#246;n</template>
 </context>

Update of /cvsroot/docbook/xsl/html
In directory sc8-pr-cvs1:/tmp/cvs-serv25923

Modified Files:
	chunk-common.xsl 
Log Message:
Fix ugly performance problem with chunking (thanks Guillaume du Bourguet)

Index: chunk-common.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/html/chunk-common.xsl,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -U2 -r1.32 -r1.33
--- chunk-common.xsl	2 Nov 2003 22:49:51 -0000	1.32
+++ chunk-common.xsl	24 Nov 2003 16:39:24 -0000	1.33
@@ -666,5 +666,5 @@
   <xsl:variable name="row2" select="count($prev) &gt; 0
                                     or (count($up) &gt; 0 
-                                        and $up != $home
+					and generate-id($up) != generate-id($home)
                                         and $navig.showtitles != 0)
                                     or count($next) &gt; 0"/>
@@ -702,5 +702,5 @@
                 <xsl:choose>
                   <xsl:when test="count($up) > 0
-                                  and $up != $home
+				  and generate-id($up) != generate-id($home)
                                   and $navig.showtitles != 0">
                     <xsl:apply-templates select="$up" mode="object.title.markup"/>

Update of /cvsroot/docbook/xsl/html
In directory sc8-pr-cvs1:/tmp/cvs-serv25123

Modified Files:
	glossary.xsl 
Log Message:
Fix bugs in formatting of glosslist

Index: glossary.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/html/glossary.xsl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -U2 -r1.15 -r1.16
--- glossary.xsl	28 Feb 2003 16:44:35 -0000	1.15
+++ glossary.xsl	24 Nov 2003 16:35:16 -0000	1.16
@@ -73,6 +73,9 @@
   <div class="{name(.)}">
     <xsl:call-template name="anchor"/>
+    <xsl:if test="blockinfo/title|title">
+      <xsl:call-template name="formal.object.heading"/>
+    </xsl:if>
     <dl>
-      <xsl:apply-templates/>
+      <xsl:apply-templates select="glossentry"/>
     </dl>
   </div>

Update of /cvsroot/docbook/xsl/fo
In directory sc8-pr-cvs1:/tmp/cvs-serv24465

Modified Files:
	lists.xsl 
Log Message:
Make sure that fo:list-item-body always contains an fo:block

Index: lists.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/fo/lists.xsl,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -U2 -r1.44 -r1.45
--- lists.xsl	3 Oct 2003 16:48:31 -0000	1.44
+++ lists.xsl	24 Nov 2003 16:32:30 -0000	1.45
@@ -106,5 +106,7 @@
     </fo:list-item-label>
     <fo:list-item-body start-indent="body-start()">
-      <xsl:apply-templates/>
+      <fo:block>
+	<xsl:apply-templates/>
+      </fo:block>
     </fo:list-item-body>
   </xsl:variable>
@@ -207,5 +209,7 @@
     </fo:list-item-label>
     <fo:list-item-body start-indent="body-start()">
-      <xsl:apply-templates/>
+      <fo:block>
+	<xsl:apply-templates/>
+      </fo:block>
     </fo:list-item-body>
   </xsl:variable>
@@ -374,5 +378,7 @@
     </fo:list-item-label>
     <fo:list-item-body start-indent="body-start()">
-      <xsl:apply-templates select="listitem"/>
+      <fo:block>
+	<xsl:apply-templates select="listitem"/>
+      </fo:block>
     </fo:list-item-body>
   </fo:list-item>
@@ -727,5 +733,7 @@
     </fo:list-item-label>
     <fo:list-item-body start-indent="body-start()">
-      <xsl:apply-templates/>
+      <fo:block>
+	<xsl:apply-templates/>
+      </fo:block>
     </fo:list-item-body>
   </fo:list-item>
@@ -751,5 +759,7 @@
     </fo:list-item-label>
     <fo:list-item-body start-indent="body-start()">
-      <xsl:apply-templates/>
+      <fo:block>
+	<xsl:apply-templates/>
+      </fo:block>
     </fo:list-item-body>
   </fo:list-item>
@@ -899,5 +909,7 @@
     </fo:list-item-label>
     <fo:list-item-body start-indent="body-start()">
-      <xsl:apply-templates/>
+      <fo:block>
+	<xsl:apply-templates/>
+      </fo:block>
     </fo:list-item-body>
   </fo:list-item>

Update of /cvsroot/docbook/xsl/html
In directory sc8-pr-cvs1:/tmp/cvs-serv28881

Modified Files:
	inline.xsl 
Log Message:
Support code inline

Index: inline.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/html/inline.xsl,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -U2 -r1.33 -r1.34
--- inline.xsl	29 Aug 2003 14:58:29 -0000	1.33
+++ inline.xsl	23 Nov 2003 21:56:31 -0000	1.34
@@ -473,4 +473,8 @@
 </xsl:template>
 
+<xsl:template match="code">
+  <xsl:call-template name="inline.monoseq"/>
+</xsl:template>
+
 <xsl:template match="medialabel">
   <xsl:call-template name="inline.italicseq"/>

Update of /cvsroot/docbook/xsl/fo
In directory sc8-pr-cvs1:/tmp/cvs-serv28847

Modified Files:
	inline.xsl 
Log Message:
Support code inline

Index: inline.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/fo/inline.xsl,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -U2 -r1.30 -r1.31
--- inline.xsl	29 Aug 2003 14:58:39 -0000	1.30
+++ inline.xsl	23 Nov 2003 21:56:15 -0000	1.31
@@ -415,4 +415,8 @@
 </xsl:template>
 
+<xsl:template match="code">
+  <xsl:call-template name="inline.monoseq"/>
+</xsl:template>
+
 <xsl:template match="medialabel">
   <xsl:call-template name="inline.italicseq"/>

Update of /cvsroot/docbook/contrib/tools/emacs/docbook-menu
In directory sc8-pr-cvs1:/tmp/cvs-serv6342

Modified Files:
	NEWS VERSION 
Log Message:
bump up version, update NEWS file


Index: NEWS
===================================================================
RCS file: /cvsroot/docbook/contrib/tools/emacs/docbook-menu/NEWS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -U2 -r1.2 -r1.3
--- NEWS	12 Nov 2003 11:08:31 -0000	1.2
+++ NEWS	20 Nov 2003 06:03:48 -0000	1.3
@@ -1,2 +1,5 @@
+0.92

+  Minor doc additions.

+

 0.91

   Minor doc fixes.


Index: VERSION
===================================================================
RCS file: /cvsroot/docbook/contrib/tools/emacs/docbook-menu/VERSION,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -U2 -r1.2 -r1.3
--- VERSION	10 Nov 2003 23:50:24 -0000	1.2
+++ VERSION	20 Nov 2003 06:03:48 -0000	1.3
@@ -1 +1 @@
-0.91

+0.92

Update of /cvsroot/docbook/contrib/tools/emacs/docbook-menu
In directory sc8-pr-cvs1:/tmp/cvs-serv5740

Modified Files:
	docbk-menu.el 
Log Message:
minor doc additions


Index: docbk-menu.el
===================================================================
RCS file: /cvsroot/docbook/contrib/tools/emacs/docbook-menu/docbk-menu.el,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -U2 -r1.3 -r1.4
--- docbk-menu.el	10 Nov 2003 23:47:19 -0000	1.3
+++ docbk-menu.el	20 Nov 2003 06:00:16 -0000	1.4
@@ -7,8 +7,9 @@
 ;; Maintainer: Michael Smith <smith@...>
 ;; Created: 2003-11-04
-;; Version: 0.90
+;; Version: 0.92
 ;; Revision: $Revision$
 ;; Date: $Date$
 ;; RCS Id: $Id$
+;; X-URL: http://docbook.sf.net/projects/docbook-menu
 ;; Keywords: xml docbook
 
@@ -348,5 +349,10 @@
 
 (defgroup docbook-menu nil
-  "Customization group for `docbook-menu-mode' minor mode.")
+  "Easy access to DocBook documentation and XSL stylesheet distro."
+  :group 'help
+  :link '(emacs-commentary-link "docbk-menu.el")
+  :link '(url-link "http://docbook.sf.net/projects/docbook-menu/")
+  :prefix "docbook-menu-"
+  )
 
 ;; *******************************************************************

Update of /cvsroot/docbook/xsl/common
In directory sc8-pr-cvs1:/tmp/cvs-serv18771

Modified Files:
	labels.xsl 
Log Message:
Fixed bug where sect1 generated infinite loop when root element
and $section.label.includes.component.label is non zero.


Index: labels.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/common/labels.xsl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -U2 -r1.23 -r1.24
--- labels.xsl	31 Jul 2003 02:07:29 -0000	1.23
+++ labels.xsl	17 Nov 2003 17:12:20 -0000	1.24
@@ -200,5 +200,5 @@
 
   <xsl:if test="$section.label.includes.component.label != 0
-                and $parent.is.component">
+                and $parent.is.component != 0">
     <xsl:variable name="parent.label">
       <xsl:apply-templates select=".." mode="label.markup"/>

Update of /cvsroot/docbook/gentext/locale
In directory sc8-pr-cvs1:/tmp/cvs-serv12025

Modified Files:
	de.xml 
Log Message:
Applied updates from Oliver Fischer.


Index: de.xml
===================================================================
RCS file: /cvsroot/docbook/gentext/locale/de.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -U2 -r1.25 -r1.26
--- de.xml	25 Jul 2003 05:03:53 -0000	1.25
+++ de.xml	15 Nov 2003 18:32:23 -0000	1.26
@@ -73,5 +73,4 @@
 <gentext key="Index" text="Stichwortverzeichnis"/>
 <gentext key="index" text="Stichwortverzeichnis"/>
-<gentext key="index symbols" text="Symbole"/>
 <gentext key="ISBN" text="ISBN"/>
 <gentext key="isbn" text="ISBN"/>
@@ -98,4 +97,6 @@
 <gentext key="Published" text="Ver&ouml;ffentlicht"/>
 <gentext key="published" text="Ver&ouml;ffentlicht"/>
+<gentext key="Qandadiv" text="F &amp; A"/>
+<gentext key="qandadiv" text="F &amp; A"/>
 <gentext key="Question" text="F:"/>
 <gentext key="question" text="F:"/>
@@ -185,4 +186,5 @@
 <gentext key="nav-prev-sibling" text="Schnell zur&uuml;ck"/>
 <gentext key="nav-up" text="Nach oben"/>
+<gentext key="nav-toc" text="InhV"/>
   
 <gentext key="sectioncalled" text="der Abschnitt namens"/> 
@@ -190,5 +192,6 @@
 <gentext key="above"         text="oben"/> 
 <gentext key="below"         text="unten"/> 
-<gentext key="index symbols"   text="Symbole"/>
+<gentext key="index symbols" text="Symbole"/>
+
 
 <gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyz&#x00E4;&#x00F6;&#x00FC;&#x00DF;"/> 
@@ -203,4 +206,17 @@
 <dingbat key="bullet" text="&#x2022;"/>
 
+<!-- Hier mu"s"te man mal nachforschen, wie die Silbentrennung
+     im Typografiebereich gehandhabt wird.
+     Oliver Fischer
+     -->
+<gentext key="hyphenation-character" text="-"/>
+<gentext key="hyphenation-push-character-count" text="2"/>
+<gentext key="hyphenation-remain-character-count" text="3"/>
+<!-- Für den Wert von 3 entschied ich mich, nachdem
+     ich verschiedene Bu"cher durchgebla"ttert habe.
+     Oliver Fischer
+     -->
+ 
+  
 <context name="styles">
 
@@ -235,4 +251,5 @@
 <template name="glossary">%t</template>
 <template name="glossdiv">%t</template>
+<template name="glossentry">%t</template>    
 <template name="important">%t</template>
 <template name="index">%t</template>
@@ -275,4 +292,5 @@
 <template name="step">%t</template>
 <template name="table"><Table/> %n. %t</template>
+<template name="task">%t</template>
 <template name="tip">%t</template>
 <template name="toc">%t</template>
@@ -284,4 +302,5 @@
 
 <template name="appendix">%t</template>
+<template name="article/appendix">%t</template>
 <template name="bridgehead">%t</template>
 <template name="chapter">%t</template>
@@ -299,4 +318,5 @@
 
 <template name="appendix"><Appendix/> %n. %t</template>
+<template name="article/appendix">%n.&#160;%t</template>    
 <template name="bridgehead">%n.&#160;%t</template>
 <template name="chapter"><Chapter/> %n. %t</template>
@@ -415,4 +435,8 @@
 <template name="warning">%t</template>
 <template name="page.citation"> [%p]</template>
+<template name="page">(Seite %p)</template>    
+<template name="pageabbrev">(S. %p)</template>
+<template name="Page">Seite %p</template>
+
 
 <template name="bridgehead"><startquote/>%t<endquote/></template>

Update of /cvsroot/docbook/contrib/tools/emacs/docbook-menu
In directory sc8-pr-cvs1:/tmp/cvs-serv13293

Modified Files:
	NEWS 
Log Message:
updated


Index: NEWS
===================================================================
RCS file: /cvsroot/docbook/contrib/tools/emacs/docbook-menu/NEWS,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -U2 -r1.1.1.1 -r1.2
--- NEWS	4 Nov 2003 03:55:10 -0000	1.1.1.1
+++ NEWS	12 Nov 2003 11:08:31 -0000	1.2
@@ -1,2 +1,7 @@
+0.91

+  Minor doc fixes.

+

+0.90

+  Initial release

 

 # $Revision$ $Date$ $Author$

Update of /cvsroot/docbook/contrib/tools/emacs/docbook-menu
In directory sc8-pr-cvs1:/tmp/cvs-serv19431

Modified Files:
	VERSION 
Log Message:
bump up version


Index: VERSION
===================================================================
RCS file: /cvsroot/docbook/contrib/tools/emacs/docbook-menu/VERSION,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -U2 -r1.1.1.1 -r1.2
--- VERSION	4 Nov 2003 03:55:10 -0000	1.1.1.1
+++ VERSION	10 Nov 2003 23:50:24 -0000	1.2
@@ -1 +1 @@
-0.90

+0.91

Update of /cvsroot/docbook/contrib/tools/emacs/docbook-menu
In directory sc8-pr-cvs1:/tmp/cvs-serv18633

Modified Files:
	README docbk-menu.el 
Log Message:
doc fixes (download URL and require statement)


Index: README
===================================================================
RCS file: /cvsroot/docbook/contrib/tools/emacs/docbook-menu/README,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -U2 -r1.1.1.1 -r1.2
--- README	4 Nov 2003 03:55:10 -0000	1.1.1.1
+++ README	10 Nov 2003 23:47:18 -0000	1.2
@@ -33,7 +33,7 @@
 To install and use this package:

 

-1. Go to the docbook-menu download site:

+1. Go to the DocBook project download site:

 

-     http://www.logopoeia.com/docbook/downloadwww.logopoeia.com/docbook/download

+     https://sourceforge.net/project/showfiles.php?group_id=21935 

 

    And download the latest docbook-menu-N.NN.zip file

@@ -54,5 +54,5 @@
 4. Add the following to your .emacs file exactly as shown:

 

-     (require 'dbk-menu)

+     (require 'docbk-menu)

 

 ==================================================================


Index: docbk-menu.el
===================================================================
RCS file: /cvsroot/docbook/contrib/tools/emacs/docbook-menu/docbk-menu.el,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -U2 -r1.2 -r1.3
--- docbk-menu.el	4 Nov 2003 06:17:49 -0000	1.2
+++ docbk-menu.el	10 Nov 2003 23:47:19 -0000	1.3
@@ -66,7 +66,7 @@
 ;; To install and use this package:
 ;;
-;; 1. Go to the docbook-menu download site:
+;; 1. Go to the DocBook project download site:
 ;;
-;;      http://www.logopoeia.com/docbook/download
+;;      https://sourceforge.net/project/showfiles.php?group_id=21935 
 ;;
 ;;    And download the latest docbook-menu-N.NN.zip file
@@ -87,5 +87,5 @@
 ;; 4. Add the following to your .emacs file exactly as shown:
 ;;
-;;      (require 'dbk-menu)
+;;      (require 'docbk-menu)
 ;;
 ;; ==================================================================