cvs: phpdoc /xsl/docbook RELEASE-NOTES.txt VERSION /xsl/docbook/common ChangeLog common.xsl l10n.xsl labels.xsl /xsl/docbook/fo ChangeLog
autotoc.xsl component.xsl lists.xsl param.ent param.xml param.xsl param.xweb pi.xsl sections.xsl table.xsl titlepage.xsl /xsl/docbook/html ChangeLog
autoidx.xsl autotoc.xsl docbook.xsl manifest.xsl param.ent param.xml param.xsl param.xweb profile-docbook.xsl refentry.xsl sections.xsl
/xsl/docbook/htmlhelp ChangeLog htmlhelp-common.xsl profile-htmlhelp-common.xsl
| From: | anatoly techtonik | Date: | Fri, 15 Jul 2005 09:18:41 +0000 |
| Subject: | cvs: phpdoc /xsl/docbook RELEASE-NOTES.txt VERSION /xsl/docbook/common ChangeLog common.xsl l10n.xsl labels.xsl /xsl/docbook/fo ChangeLog autotoc.xsl component.xsl lists.xsl param.ent param.xml param.xsl param.xweb pi.xsl sections.xsl table.xsl titlepage.xsl /xsl/docbook/html ChangeLog autoidx.xsl autotoc.xsl docbook.xsl manifest.xsl param.ent param.xml param.xsl param.xweb profile-docbook.xsl refentry.xsl sections.xsl /xsl/docbook/htmlhelp ChangeLog htmlhelp-common.xsl profile-htmlhelp-common.xsl |
||
| Groups: | php.doc | ||
| Request: | Send a blank email to phpdoc+get-969369153@lists.php.net to get a copy of this message | ||
techtonik Fri Jul 15 05:18:41 2005 EDT
Modified files:
/phpdoc/xsl/docbook/html autoidx.xsl autotoc.xsl ChangeLog
docbook.xsl manifest.xsl param.ent
param.xml param.xsl param.xweb
profile-docbook.xsl refentry.xsl
sections.xsl
/phpdoc/xsl/docbook/fo autotoc.xsl ChangeLog component.xsl
lists.xsl param.ent param.xml param.xsl
param.xweb pi.xsl sections.xsl table.xsl
titlepage.xsl
/phpdoc/xsl/docbook/common ChangeLog common.xsl l10n.xsl labels.xsl
/phpdoc/xsl/docbook/htmlhelp ChangeLog htmlhelp-common.xsl
profile-htmlhelp-common.xsl
/phpdoc/xsl/docbook RELEASE-NOTES.txt VERSION
Log:
update to docbook-xsl 1.67.2
http://cvs.php.net/diff.php/phpdoc/xsl/docbook/html/autoidx.xsl?r1=1.3&r2=1.4&ty=u Index: phpdoc/xsl/docbook/html/autoidx.xsl diff -u phpdoc/xsl/docbook/html/autoidx.xsl:1.3 phpdoc/xsl/docbook/html/autoidx.xsl:1.4 --- phpdoc/xsl/docbook/html/autoidx.xsl:1.3 Fri Oct 1 12:32:08 2004 +++ phpdoc/xsl/docbook/html/autoidx.xsl Fri Jul 15 05:18:33 2005 @@ -43,7 +43,7 @@ version="1.0"> <!-- ******************************************************************** - $Id: autoidx.xsl,v 1.3 2004/10/01 16:32:08 techtonik Exp $ + $Id: autoidx.xsl,v 1.4 2005/07/15 09:18:33 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -369,7 +369,14 @@ <xsl:otherwise> <a> <xsl:variable name="title"> + <xsl:choose> + <xsl:when test="§ion;/titleabbrev and $index.prefer.titleabbrev != 0"> + <xsl:apply-templates select="§ion;" mode="titleabbrev.markup"/> + </xsl:when> + <xsl:otherwise> <xsl:apply-templates select="§ion;" mode="title.markup"/> + </xsl:otherwise> + </xsl:choose> </xsl:variable> <xsl:attribute name="href"> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/html/autotoc.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/html/autotoc.xsl diff -u phpdoc/xsl/docbook/html/autotoc.xsl:1.4 phpdoc/xsl/docbook/html/autotoc.xsl:1.5 --- phpdoc/xsl/docbook/html/autotoc.xsl:1.4 Fri Jul 15 04:27:50 2005 +++ phpdoc/xsl/docbook/html/autotoc.xsl Fri Jul 15 05:18:33 2005 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: autotoc.xsl,v 1.4 2005/07/15 08:27:50 techtonik Exp $ + $Id: autotoc.xsl,v 1.5 2005/07/15 09:18:33 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -154,7 +154,9 @@ <xsl:call-template name="make.toc"> <xsl:with-param name="toc-context" select="$toc-context"/> <xsl:with-param name="toc.title.p" select="$toc.title.p"/> - <xsl:with-param name="nodes" select="section|sect1|refentry + <xsl:with-param name="nodes" select="section|sect1 + |simplesect[$simplesect.in.toc != 0] + |refentry |article|bibliography|glossary |appendix|index |bridgehead[not(@renderas) @@ -336,7 +338,9 @@ <xsl:call-template name="subtoc"> <xsl:with-param name="toc-context" select="$toc-context"/> - <xsl:with-param name="nodes" select="section|sect1|simplesect|refentry + <xsl:with-param name="nodes" select="section|sect1 + |simplesect[$simplesect.in.toc != 0] + |refentry |glossary|bibliography|index |bridgehead[$bridgehead.in.toc != 0]"/> </xsl:call-template> @@ -389,6 +393,14 @@ </xsl:call-template> </xsl:template> +<xsl:template match="simplesect" mode="toc"> + <xsl:param name="toc-context" select="."/> + + <xsl:call-template name="subtoc"> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:call-template> +</xsl:template> + <xsl:template match="section" mode="toc"> <xsl:param name="toc-context" select="."/> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/html/ChangeLog?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/html/ChangeLog diff -u phpdoc/xsl/docbook/html/ChangeLog:1.4 phpdoc/xsl/docbook/html/ChangeLog:1.5 --- phpdoc/xsl/docbook/html/ChangeLog:1.4 Fri Jul 15 04:27:50 2005 +++ phpdoc/xsl/docbook/html/ChangeLog Fri Jul 15 05:18:33 2005 @@ -1,3 +1,69 @@ +2004-11-23 Michael Smith <xmldoc@users.sourceforge.net> + + * autotoc.xsl, param.ent, param.xweb: RFE #1069397 Add new parameter simplesect.in.toc + + - default value of 0 causes simplesect to be omitted from TOCs + - to cause simplesect to be included in TOCs, you must set the + value of simplesect.in.toc to 1 + + note from Norm: + + Simplesect elements aren't supposed to appear in the ToC at + all. Ugh. The Definitive Guide doesn't really explain that + very well. + + The use case for simplesect is when, for example, every + chapter in a book ends with "Exercises" or "For More + Information" sections and you don't want those to appear in + the ToC. + + * refentry.xsl: Patch #1057029 - Fix titleabbrev warnings in reference (patch from + anatoly techtonik) + + * sections.xsl: Bug #1068455 (Invalid h7, h8, etc. generated for deeply nested sections) + + ::CAUSE + Stylesheet HTML heading-generation didn't anticipate that some + jokers like to nest sections really, really deep. Not naming any + names... + + ::FIX + Refined logic to safely handle documents produced by the "I can + nest sections deeper than you can" crowd + +2004-11-19 Michael Smith <xmldoc@users.sourceforge.net> + + * sections.xsl: Bug #1066753 -- subtitle is severely broken (reported by Sam Steingold) + + ::PROBLEM + In (X)HTML output, subtitle for the simplesect element generates an + h2 head, no matter at what level in the sectioning hiearchy the + simplesect occurs; end up with cases where a simplesect is + output with (for example), an h4 title but a h2 subtitle + + ::CAUSE and FIX + No template for simplesect/subtitle in the set of templates that + call the section.subtitle named template, so stylesheets fell + back to using the titlepage.mode template for subtitle + + ::FIX + Added simplesect/subtitle to the set of templates that + call the section.subtitle named template. + + ::AFFECTS + Only affects (X)HTML output of simplesect/subtitle; nothing else + +2004-11-17 Jirka Kosek <kosek@users.sourceforge.net> + + * Makefile.param, autoidx.xsl, docbook.xsl, param.ent, param.xweb: + Added new parameter index.prefer.titleabbrev. When set to 1, index references will use titleabbrev instead of title when available. + + * manifest.xsl: Removed reference to index HTML pages from manifest if the output format is HTML Help + +2004-11-13 Robert Stayton <bobstayton@users.sourceforge.net> + + * autotoc.xsl: Fixed bugs in simplesect handling. + 2004-11-09 Michael Smith <xmldoc@users.sourceforge.net> * synop.xsl: Revert change for tracker #1008804 (command in cmdsynopsis is not indented) @@ -369,7 +435,7 @@ 2003-11-30 Robert Stayton <bobstayton@users.sourceforge.net> * 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: - Added CVS $Id: ChangeLog,v 1.4 2005/07/15 08:27:50 techtonik Exp $ comments. + Added CVS $Id: ChangeLog,v 1.5 2005/07/15 09:18:33 techtonik Exp $ comments. 2003-11-29 Jirka Kosek <kosek@users.sourceforge.net> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/html/docbook.xsl?r1=1.3&r2=1.4&ty=u Index: phpdoc/xsl/docbook/html/docbook.xsl diff -u phpdoc/xsl/docbook/html/docbook.xsl:1.3 phpdoc/xsl/docbook/html/docbook.xsl:1.4 --- phpdoc/xsl/docbook/html/docbook.xsl:1.3 Fri Oct 1 12:32:08 2004 +++ phpdoc/xsl/docbook/html/docbook.xsl Fri Jul 15 05:18:33 2005 @@ -9,7 +9,7 @@ indent="no"/> <!-- ******************************************************************** - $Id: docbook.xsl,v 1.3 2004/10/01 16:32:08 techtonik Exp $ + $Id: docbook.xsl,v 1.4 2005/07/15 09:18:33 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -70,6 +70,7 @@ <xsl:include href="docbookng.xsl"/> <xsl:param name="stylesheet.result.type" select="'html'"/> +<xsl:param name="htmlhelp.output" select="0"/> <!-- ==================================================================== --> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/html/manifest.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/html/manifest.xsl diff -u phpdoc/xsl/docbook/html/manifest.xsl:1.4 phpdoc/xsl/docbook/html/manifest.xsl:1.5 --- phpdoc/xsl/docbook/html/manifest.xsl:1.4 Fri Jul 15 04:27:50 2005 +++ phpdoc/xsl/docbook/html/manifest.xsl Fri Jul 15 05:18:33 2005 @@ -4,7 +4,7 @@ exclude-result-prefixes="doc"> <!-- ******************************************************************** - $Id: manifest.xsl,v 1.4 2005/07/15 08:27:50 techtonik Exp $ + $Id: manifest.xsl,v 1.5 2005/07/15 09:18:33 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -42,7 +42,6 @@ |section |book/glossary|article/glossary|part/glossary |book/bibliography|article/bibliography|part/bibliography - |book/index|article/index|part/index |colophon" mode="enumerate-files"> <xsl:variable name="ischunk"><xsl:call-template name="chunk"/></xsl:variable> @@ -62,6 +61,27 @@ <xsl:apply-templates select="*" mode="enumerate-files"/> </xsl:template> +<xsl:template match="book/index|article/index|part/index" + mode="enumerate-files"> + <xsl:if test="$htmlhelp.output != 1"> + <xsl:variable name="ischunk"><xsl:call-template name="chunk"/></xsl:variable> + <xsl:if test="$ischunk='1'"> + <xsl:call-template name="make-relative-filename"> + <xsl:with-param name="base.dir"> + <xsl:if test="$manifest.in.base.dir = 0"> + <xsl:value-of select="$base.dir"/> + </xsl:if> + </xsl:with-param> + <xsl:with-param name="base.name"> + <xsl:apply-templates mode="chunk-filename" select="."/> + </xsl:with-param> + </xsl:call-template> + <xsl:text> </xsl:text> + </xsl:if> + <xsl:apply-templates select="*" mode="enumerate-files"/> + </xsl:if> +</xsl:template> + <xsl:template match="legalnotice" mode="enumerate-files"> <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable> <xsl:if test="$generate.legalnotice.link != 0"> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/html/param.ent?r1=1.3&r2=1.4&ty=u Index: phpdoc/xsl/docbook/html/param.ent diff -u phpdoc/xsl/docbook/html/param.ent:1.3 phpdoc/xsl/docbook/html/param.ent:1.4 --- phpdoc/xsl/docbook/html/param.ent:1.3 Fri Oct 1 12:32:08 2004 +++ phpdoc/xsl/docbook/html/param.ent Fri Jul 15 05:18:33 2005 @@ -123,6 +123,7 @@ <!ENTITY htmlhelp.window.geometry SYSTEM "../params/htmlhelp.window.geometry.xml"> <!ENTITY img.src.path SYSTEM "../params/img.src.path.xml"> <!ENTITY index.on.role SYSTEM "../params/index.on.role.xml"> +<!ENTITY index.prefer.titleabbrev SYSTEM "../params/index.prefer.titleabbrev.xml"> <!ENTITY index.on.type SYSTEM "../params/index.on.type.xml"> <!ENTITY inherit.keywords SYSTEM "../params/inherit.keywords.xml"> <!ENTITY label.from.part SYSTEM "../params/label.from.part.xml"> @@ -265,3 +266,4 @@ <!ENTITY eclipse.plugin.provider SYSTEM "../params/eclipse.plugin.provider.xml"> <!ENTITY insert.xref.page.number SYSTEM "../params/insert.xref.page.number.xml"> <!ENTITY component.label.includes.part.label SYSTEM "../params/component.label.includes.part.label.xml"> +<!ENTITY simplesect.in.toc SYSTEM "../params/simplesect.in.toc.xml"> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/html/param.xml?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/html/param.xml diff -u phpdoc/xsl/docbook/html/param.xml:1.4 phpdoc/xsl/docbook/html/param.xml:1.5 --- phpdoc/xsl/docbook/html/param.xml:1.4 Fri Jul 15 04:27:50 2005 +++ phpdoc/xsl/docbook/html/param.xml Fri Jul 15 05:18:33 2005 @@ -5,7 +5,7 @@ <bookinfo> <title>HTML Parameter Reference</title> <releaseinfo role="meta"> -$Id: param.xml,v 1.4 2005/07/15 08:27:50 techtonik Exp $ +$Id: param.xml,v 1.5 2005/07/15 09:18:33 techtonik Exp $ </releaseinfo> <author> <surname>Walsh</surname> @@ -601,7 +601,7 @@ </refmeta> <refnamediv> <refname>process.source.toc</refname> -<refpurpose>FIXME:</refpurpose> +<refpurpose>Process a non-empty <sgmltag>toc</sgmltag> element if it occurs in a source document?</refpurpose> </refnamediv> <refsynopsisdiv> @@ -610,7 +610,20 @@ <refsect1><title>Description</title> -<para>FIXME: +<para>Specifies that the contents of a non-empty "hard-coded" +<sgmltag>toc</sgmltag> element in a source document are processed to +generate a TOC in output. +<note> + <para>This parameter has no effect on automated generation of + TOCs. An automated TOC may still be generated along with the + "hard-coded" TOC. To suppress automated TOC generation, adjust the + value of the <parameter moreinfo="none">generate.toc</parameter> paramameter.</para> + + <para>The <sgmltag>process.source.toc</sgmltag> parameter also has + no effect if the <sgmltag>toc</sgmltag> element is empty; handling + for empty <sgmltag>toc</sgmltag> is controlled by the + <parameter moreinfo="none">process.empty.source.toc</parameter> parameter.</para> +</note> </para> </refsect1> @@ -623,7 +636,7 @@ </refmeta> <refnamediv> <refname>process.empty.source.toc</refname> -<refpurpose>FIXME:</refpurpose> +<refpurpose>Generate automated TOC if <sgmltag>toc</sgmltag> element occurs in a source document?</refpurpose> </refnamediv> <refsynopsisdiv> @@ -632,7 +645,19 @@ <refsect1><title>Description</title> -<para>FIXME: +<para>Specifies that if an empty <sgmltag>toc</sgmltag> element is +found in a source document, an automated TOC is generated. +<note> + <para>Depending on what the value of the + <parameter moreinfo="none">generate.toc</parameter> parameter is, setting this + parameter to <literal moreinfo="none">1</literal> could result in generation of + duplicate automated TOCs. So the + <parameter moreinfo="none">process.empty.source.toc</parameter> is primarily useful + as an "override": by placing an empty <sgmltag>toc</sgmltag> in your + document and setting this parameter to <literal moreinfo="none">1</literal>, you can + force a TOC to be generated even if <sgmltag>generate.toc</sgmltag> + says not to.</para> +</note> </para> </refsect1> @@ -662,6 +687,28 @@ </refsect1> </refentry> +<refentry id="simplesect.in.toc"> +<refmeta> +<refentrytitle>simplesect.in.toc</refentrytitle> +<refmiscinfo role="type">boolean</refmiscinfo> +</refmeta> +<refnamediv> +<refname>simplesect.in.toc</refname> +<refpurpose>Should <sgmltag>simplesect</sgmltag> elements appear in the TOC?</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<programlisting id="simplesect.in.toc.frag"><xsl:param name="simplesect.in.toc" select="0"></xsl:param></programlisting> +</refsynopsisdiv> + +<refsect1><title>Description</title> + +<para>If non-zero, <sgmltag>simplesect</sgmltag>s appear in the TOC. +</para> + +</refsect1> +</refentry> + <refentry id="manual.toc"> <refmeta> <refentrytitle>manual.toc</refentrytitle> @@ -990,6 +1037,30 @@ </refsect1> </refentry> +<refentry id="index.prefer.titleabbrev"> +<refmeta> +<refentrytitle>index.prefer.titleabbrev</refentrytitle> +<refmiscinfo role="type">boolean</refmiscinfo> +</refmeta> +<refnamediv> +<refname>index.prefer.titleabbrev</refname> +<refpurpose>Should be abbreviated titles used as back references</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<programlisting id="index.prefer.titleabbrev.frag"> +<xsl:param name="index.prefer.titleabbrev" select="0"></xsl:param> +</programlisting> +</refsynopsisdiv> + +<refsect1><title>Description</title> + +<para>FIXME: +</para> + +</refsect1> +</refentry> + </reference> <reference><title>Extensions</title> @@ -4076,7 +4147,7 @@ </refmeta> <refnamediv> <refname>formal.title.placement</refname> -<refpurpose/> +<refpurpose>Specifies where formal object titles should occur</refpurpose> </refnamediv> <refsynopsisdiv> @@ -4622,7 +4693,9 @@ </refmeta> <refnamediv> <refname>menuchoice.separator</refname> -<refpurpose/> +<refpurpose>Separator between items of a <sgmltag>menuchoice</sgmltag> +other than <sgmltag>guimenuitem</sgmltag> and +<sgmltag>guisubmenu</sgmltag></refpurpose> </refnamediv> <refsynopsisdiv> @@ -4648,7 +4721,9 @@ </refmeta> <refnamediv> <refname>menuchoice.menu.separator</refname> -<refpurpose/> +<refpurpose>Separator between items of a <sgmltag>menuchoice</sgmltag> +with <sgmltag>guimenuitem</sgmltag> or +<sgmltag>guisubmenu</sgmltag></refpurpose> </refnamediv> <refsynopsisdiv> @@ -4745,7 +4820,7 @@ </refmeta> <refnamediv> <refname>footnote.number.symbols</refname> -<refpurpose/> +<refpurpose>Special characters to use as footnote markers</refpurpose> </refnamediv> <refsynopsisdiv> @@ -4780,7 +4855,7 @@ </refmeta> <refnamediv> <refname>table.footnote.number.symbols</refname> -<refpurpose/> +<refpurpose>Special characters to use a footnote markers in tables</refpurpose> </refnamediv> <refsynopsisdiv> @@ -6962,7 +7037,7 @@ </refmeta> <refnamediv> <refname>htmlhelp.hhc.folders.instead.books</refname> -<refpurpose/> +<refpurpose>Use folder icons in ToC (instead of book icons)?</refpurpose> </refnamediv> <refsynopsisdiv> @@ -6988,7 +7063,7 @@ </refmeta> <refnamediv> <refname>htmlhelp.hhc.binary</refname> -<refpurpose/> +<refpurpose>Generate binary ToC?</refpurpose> </refnamediv> <refsynopsisdiv> @@ -7921,7 +7996,7 @@ <xsl:stylesheet exclude-result-prefixes="src" version="1.0"> <!-- ******************************************************************** - $Id: param.xml,v 1.4 2005/07/15 08:27:50 techtonik Exp $ + $Id: param.xml,v 1.5 2005/07/15 09:18:33 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -8066,6 +8141,7 @@ <src:fragref linkend="img.src.path.frag"></src:fragref> <src:fragref linkend="index.on.role.frag"></src:fragref> <src:fragref linkend="index.on.type.frag"></src:fragref> +<src:fragref linkend="index.prefer.titleabbrev.frag"></src:fragref> <src:fragref linkend="ignore.image.scaling.frag"></src:fragref> <src:fragref linkend="inherit.keywords.frag"></src:fragref> <src:fragref linkend="l10n.gentext.default.language.frag"></src:fragref> @@ -8149,6 +8225,7 @@ <src:fragref linkend="shade.verbatim.style.frag"></src:fragref> <src:fragref linkend="show.comments.frag"></src:fragref> <src:fragref linkend="show.revisionflag.frag"></src:fragref> +<src:fragref linkend="simplesect.in.toc.frag"></src:fragref> <src:fragref linkend="spacing.paras.frag"></src:fragref> <src:fragref linkend="suppress.footer.navigation.frag"></src:fragref> <src:fragref linkend="suppress.header.navigation.frag"></src:fragref> @@ -8193,4 +8270,4 @@ </appendix> -</book> +</book> \ No newline at end of file http://cvs.php.net/diff.php/phpdoc/xsl/docbook/html/param.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/html/param.xsl diff -u phpdoc/xsl/docbook/html/param.xsl:1.4 phpdoc/xsl/docbook/html/param.xsl:1.5 --- phpdoc/xsl/docbook/html/param.xsl:1.4 Fri Jul 15 04:27:51 2005 +++ phpdoc/xsl/docbook/html/param.xsl Fri Jul 15 05:18:34 2005 @@ -4,7 +4,7 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" exclude-result-prefixes="src" version="1.0"> <!-- ******************************************************************** - $Id: param.xsl,v 1.4 2005/07/15 08:27:51 techtonik Exp $ + $Id: param.xsl,v 1.5 2005/07/15 09:18:34 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -181,6 +181,7 @@ <xsl:param name="img.src.path"/> <xsl:param name="index.on.role" select="0"/> <xsl:param name="index.on.type" select="0"/> +<xsl:param name="index.prefer.titleabbrev" select="0"/> <xsl:param name="ignore.image.scaling" select="0"/> <xsl:param name="inherit.keywords" select="'1'"/> <xsl:param name="l10n.gentext.default.language" select="'en'"/> @@ -269,6 +270,7 @@ <xsl:param name="show.comments">1</xsl:param> <xsl:param name="show.revisionflag">0</xsl:param> +<xsl:param name="simplesect.in.toc" select="0"/> <xsl:param name="spacing.paras" select="'0'"/> <xsl:param name="suppress.footer.navigation">0</xsl:param> <xsl:param name="suppress.header.navigation">0</xsl:param> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/html/param.xweb?r1=1.3&r2=1.4&ty=u Index: phpdoc/xsl/docbook/html/param.xweb diff -u phpdoc/xsl/docbook/html/param.xweb:1.3 phpdoc/xsl/docbook/html/param.xweb:1.4 --- phpdoc/xsl/docbook/html/param.xweb:1.3 Fri Oct 1 12:32:08 2004 +++ phpdoc/xsl/docbook/html/param.xweb Fri Jul 15 05:18:34 2005 @@ -7,7 +7,7 @@ <bookinfo> <title>HTML Parameter Reference</title> <releaseinfo role="meta"> -$Id: param.xweb,v 1.3 2004/10/01 16:32:08 techtonik Exp $ +$Id: param.xweb,v 1.4 2005/07/15 09:18:34 techtonik Exp $ </releaseinfo> <author> <surname>Walsh</surname> @@ -94,6 +94,7 @@ &process.source.toc; &process.empty.source.toc; &bridgehead.in.toc; +&simplesect.in.toc; &manual.toc; &toc.list.type; &toc.section.depth; @@ -103,6 +104,7 @@ &generate.index; &index.on.type; &index.on.role; +&index.prefer.titleabbrev; </reference> <reference><title>Extensions</title> @@ -418,7 +420,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: param.xweb,v 1.3 2004/10/01 16:32:08 techtonik Exp $ + $Id: param.xweb,v 1.4 2005/07/15 09:18:34 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -563,6 +565,7 @@ <src:fragref linkend="img.src.path.frag"/> <src:fragref linkend="index.on.role.frag"/> <src:fragref linkend="index.on.type.frag"/> +<src:fragref linkend="index.prefer.titleabbrev.frag"/> <src:fragref linkend="ignore.image.scaling.frag"/> <src:fragref linkend="inherit.keywords.frag"/> <src:fragref linkend="l10n.gentext.default.language.frag"/> @@ -646,6 +649,7 @@ <src:fragref linkend="shade.verbatim.style.frag"/> <src:fragref linkend="show.comments.frag"/> <src:fragref linkend="show.revisionflag.frag"/> +<src:fragref linkend="simplesect.in.toc.frag"/> <src:fragref linkend="spacing.paras.frag"/> <src:fragref linkend="suppress.footer.navigation.frag"/> <src:fragref linkend="suppress.header.navigation.frag"/> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/html/profile-docbook.xsl?r1=1.3&r2=1.4&ty=u Index: phpdoc/xsl/docbook/html/profile-docbook.xsl diff -u phpdoc/xsl/docbook/html/profile-docbook.xsl:1.3 phpdoc/xsl/docbook/html/profile-docbook.xsl:1.4 --- phpdoc/xsl/docbook/html/profile-docbook.xsl:1.3 Fri Oct 1 12:32:08 2004 +++ phpdoc/xsl/docbook/html/profile-docbook.xsl Fri Jul 15 05:18:34 2005 @@ -6,7 +6,7 @@ <xsl:output method="html" encoding="ISO-8859-1" indent="no"/> <!-- ******************************************************************** - $Id: profile-docbook.xsl,v 1.3 2004/10/01 16:32:08 techtonik Exp $ + $Id: profile-docbook.xsl,v 1.4 2005/07/15 09:18:34 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -67,6 +67,7 @@ <xsl:include href="docbookng.xsl"/> <xsl:param name="stylesheet.result.type" select="'html'"/> +<xsl:param name="htmlhelp.output" select="0"/> <!-- ==================================================================== --> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/html/refentry.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/html/refentry.xsl diff -u phpdoc/xsl/docbook/html/refentry.xsl:1.4 phpdoc/xsl/docbook/html/refentry.xsl:1.5 --- phpdoc/xsl/docbook/html/refentry.xsl:1.4 Mon Jul 4 13:04:31 2005 +++ phpdoc/xsl/docbook/html/refentry.xsl Fri Jul 15 05:18:34 2005 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: refentry.xsl,v 1.4 2005/07/04 17:04:31 techtonik Exp $ + $Id: refentry.xsl,v 1.5 2005/07/15 09:18:34 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -46,6 +46,7 @@ <xsl:template match="reference/referenceinfo"></xsl:template> <xsl:template match="reference/title"></xsl:template> <xsl:template match="reference/subtitle"></xsl:template> +<xsl:template match="reference/titleabbrev"></xsl:template> <!-- ==================================================================== --> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/html/sections.xsl?r1=1.3&r2=1.4&ty=u Index: phpdoc/xsl/docbook/html/sections.xsl diff -u phpdoc/xsl/docbook/html/sections.xsl:1.3 phpdoc/xsl/docbook/html/sections.xsl:1.4 --- phpdoc/xsl/docbook/html/sections.xsl:1.3 Fri Oct 1 12:32:08 2004 +++ phpdoc/xsl/docbook/html/sections.xsl Fri Jul 15 05:18:34 2005 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: sections.xsl,v 1.3 2004/10/01 16:32:08 techtonik Exp $ + $Id: sections.xsl,v 1.4 2005/07/15 09:18:34 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -380,7 +380,16 @@ </xsl:variable> <!-- HTML H level is one higher than section level --> - <xsl:variable name="hlevel" select="$level + 1"/> + <xsl:variable name="hlevel"> + <xsl:choose> + <!-- highest valid HTML H level is H6; so anything nested deeper + than 5 levels down just becomes H6 --> + <xsl:when test="$level > 5">6</xsl:when> + <xsl:otherwise> + <xsl:value-of select="$level + 1"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> <xsl:element name="h{$hlevel}"> <xsl:attribute name="class"><xsl:value-of select="$class"/></xsl:attribute> <xsl:if test="$css.decoration != '0'"> @@ -484,6 +493,10 @@ <xsl:call-template name="section.subtitle"/> </xsl:template> +<xsl:template match="simplesect/subtitle" mode="titlepage.mode" priority="2"> + <xsl:call-template name="section.subtitle"/> +</xsl:template> + <xsl:template match="sect1/subtitle" mode="titlepage.mode" priority="2"> <xsl:call-template name="section.subtitle"/> </xsl:template> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/autotoc.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/fo/autotoc.xsl diff -u phpdoc/xsl/docbook/fo/autotoc.xsl:1.4 phpdoc/xsl/docbook/fo/autotoc.xsl:1.5 --- phpdoc/xsl/docbook/fo/autotoc.xsl:1.4 Fri Jul 15 04:27:48 2005 +++ phpdoc/xsl/docbook/fo/autotoc.xsl Fri Jul 15 05:18:37 2005 @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: autotoc.xsl,v 1.4 2005/07/15 08:27:48 techtonik Exp $ + $Id: autotoc.xsl,v 1.5 2005/07/15 09:18:37 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -314,7 +314,9 @@ <xsl:call-template name="toc.line"/> - <xsl:variable name="nodes" select="section|sect1|simplesect|refentry"/> + <xsl:variable name="nodes" select="section|sect1 + |simplesect[$simplesect.in.toc != 0] + |refentry"/> <xsl:if test="$toc.section.depth > 0 and $nodes"> <fo:block id="toc.{$cid}.{$id}" http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/ChangeLog?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/fo/ChangeLog diff -u phpdoc/xsl/docbook/fo/ChangeLog:1.4 phpdoc/xsl/docbook/fo/ChangeLog:1.5 --- phpdoc/xsl/docbook/fo/ChangeLog:1.4 Fri Jul 15 04:27:48 2005 +++ phpdoc/xsl/docbook/fo/ChangeLog Fri Jul 15 05:18:37 2005 @@ -1,3 +1,100 @@ +2004-12-02 Robert Stayton <bobstayton@users.sourceforge.net> + + * table.xsl: Added missing col parameter to table.cell.properties template. + +2004-11-27 Robert Stayton <bobstayton@users.sourceforge.net> + + * table.xsl: Inherited cell properties now passed to table.cell.properties template + so they can be overridden by a customization. + +2004-11-26 Robert Stayton <bobstayton@users.sourceforge.net> + + * table.xsl: Added support for bgcolor PI on table row element. + +2004-11-24 Robert Stayton <bobstayton@users.sourceforge.net> + + * titlepage.xsl: Fixed handling of abstract title. + +2004-11-23 Michael Smith <xmldoc@users.sourceforge.net> + + * autotoc.xsl: RFE #1069397 Add new parameter simplesect.in.toc + + - default value of 0 causes simplesect to be omitted from TOCs + - to cause simplesect to be included in TOCs, you must set the + value of simplesect.in.toc to 1 + + note from Norm: + + Simplesect elements aren't supposed to appear in the ToC at + all. Ugh. The Definitive Guide doesn't really explain that + very well. + + The use case for simplesect is when, for example, every + chapter in a book ends with "Exercises" or "For More + Information" sections and you don't want those to appear in + the ToC. + + * param.ent, param.xweb: RFE #1069397 Add new parameter simplesect.in.toc + + - default value of 0 causes simplesect to be omitted from TOCs + - to cause simplesect to be included in TOCs, you must set the + value of simplesect.in.toc to 1 + + note from Norm: + + Simplesect elements aren't supposed to appear in the ToC at + all. Ugh. The Definitive Guide doesn't really explain that + very well. + + The use case for simplesect is when, for example, every + chapter in a book ends with "Exercises" or "For More + Information" sections and you don't want those to appear in + the ToC. + +2004-11-21 Jirka Kosek <kosek@users.sourceforge.net> + + * sections.xsl: It is not possible to use variable reference in template match. I change it back and preserved intended semantics. But there might be more elegant way to do it, I did't have time to investigate it, I just wanted to process my document :-( + +2004-11-20 Michael Smith <xmldoc@users.sourceforge.net> + + * lists.xsl: bug #1007414 & patch #971730 - passivetex outputs "* 0.60 + 1em" + garbage in lists (reported by Alex Roitman and James William Pye) + + ::PROBLEM + Literal stuff "* 0.60 + 1em" showing up in listitem PDF output + generated through passivetex + + ::CAUSE + Logic that outputs non-constant size expressions like "4em * + 0.60 + 1em" was added to stylesheets to improve look of list + formatting. But passivetex can only handle constant sizes; so, + instead of doing the math, it spits out the literal expressions + in output. + + ::FIX + Added workaround - some conditional logic to fall back to + constant values if passivetex.extensions param is non-zero. + + ::AFFECTED AREAS + Should only affect FO output when passivetex.extensions is non-zero + +2004-11-18 Robert Stayton <bobstayton@users.sourceforge.net> + + * component.xsl: Moved the literal attributes from component.title to the + component.title.properties attribute-set so they can be customized. + +2004-11-17 Robert Stayton <bobstayton@users.sourceforge.net> + + * pi.xsl: Fix bug in dbfo-need for XEP output. + +2004-11-16 Robert Stayton <bobstayton@users.sourceforge.net> + + * lists.xsl: Added glossdef's first para to special handling in fo:list-item-body. + +2004-11-11 Robert Stayton <bobstayton@users.sourceforge.net> + + * sections.xsl: Fixed /section template to work with rootid parameter. + 2004-11-04 Robert Stayton <bobstayton@users.sourceforge.net> * formal.xsl: Fixed dbfo keep-together PI for tables. http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/component.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/fo/component.xsl diff -u phpdoc/xsl/docbook/fo/component.xsl:1.4 phpdoc/xsl/docbook/fo/component.xsl:1.5 --- phpdoc/xsl/docbook/fo/component.xsl:1.4 Fri Jul 15 04:27:48 2005 +++ phpdoc/xsl/docbook/fo/component.xsl Fri Jul 15 05:18:37 2005 @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: component.xsl,v 1.4 2005/07/15 08:27:48 techtonik Exp $ + $Id: component.xsl,v 1.5 2005/07/15 09:18:37 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -58,12 +58,7 @@ </fotex:bookmark> </xsl:if> - <fo:block keep-with-next.within-column="always" - space-before.optimum="{$body.font.master}pt" - space-before.minimum="{$body.font.master * 0.8}pt" - space-before.maximum="{$body.font.master * 1.2}pt" - hyphenate="false" - xsl:use-attribute-sets="component.title.properties"> + <fo:block xsl:use-attribute-sets="component.title.properties"> <xsl:if test="$pagewide != 0"> <!-- Doesn't work to use 'all' here since not a child of fo:flow --> <xsl:attribute name="span">inherit</xsl:attribute> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/lists.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/fo/lists.xsl diff -u phpdoc/xsl/docbook/fo/lists.xsl:1.4 phpdoc/xsl/docbook/fo/lists.xsl:1.5 --- phpdoc/xsl/docbook/fo/lists.xsl:1.4 Fri Jul 15 04:27:48 2005 +++ phpdoc/xsl/docbook/fo/lists.xsl Fri Jul 15 05:18:37 2005 @@ -4,7 +4,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: lists.xsl,v 1.4 2005/07/15 08:27:48 techtonik Exp $ + $Id: lists.xsl,v 1.5 2005/07/15 09:18:37 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -292,6 +292,9 @@ <xsl:template match="listitem/*[1][local-name()='para' or local-name()='simpara' or local-name()='formalpara'] + |glossdef/*[1][local-name()='para' or + local-name()='simpara' or + local-name()='formalpara'] |step/*[1][local-name()='para' or local-name()='simpara' or local-name()='formalpara'] @@ -359,18 +362,34 @@ </xsl:when> <xsl:otherwise> <xsl:value-of select="@termlength"/> + <xsl:choose> + <!-- workaround for passivetex lack of support for non-constant expressions --> + <xsl:when test="$passivetex.extensions != 0"> + <xsl:text>em</xsl:text> + </xsl:when> + <xsl:otherwise> <xsl:text>em * 0.60</xsl:text> </xsl:otherwise> </xsl:choose> + </xsl:otherwise> + </xsl:choose> </xsl:when> <xsl:otherwise> <xsl:call-template name="longest.term"> <xsl:with-param name="terms" select="varlistentry/term"/> <xsl:with-param name="maxlength" select="$variablelist.max.termlength"/> </xsl:call-template> + <xsl:choose> + <!-- workaround for passivetex lack of support for non-constant expressions --> + <xsl:when test="$passivetex.extensions != 0"> + <xsl:text>em</xsl:text> + </xsl:when> + <xsl:otherwise> <xsl:text>em * 0.60</xsl:text> </xsl:otherwise> </xsl:choose> + </xsl:otherwise> + </xsl:choose> </xsl:variable> <!-- @@ -381,6 +400,19 @@ --> <xsl:variable name="label-separation">1em</xsl:variable> + <xsl:variable name="distance-between-starts"> + <xsl:choose> + <!-- workaround for passivetex lack of support for non-constant expressions --> + <xsl:when test="$passivetex.extensions != 0"> + <xsl:value-of select="$termlength"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$termlength"/> + <xsl:text>+</xsl:text> + <xsl:value-of select="$label-separation"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> <xsl:if test="title"> <xsl:apply-templates select="title" mode="list.title.mode"/> @@ -406,7 +438,7 @@ <xsl:when test="ancestor::listitem"> <fo:list-block id="{$id}" provisional-distance-between-starts= - "{$termlength}+{$label-separation}" + "{$distance-between-starts}" provisional-label-separation="{$label-separation}"> <xsl:copy-of select="$content"/> </fo:list-block> @@ -414,7 +446,7 @@ <xsl:otherwise> <fo:list-block id="{$id}" provisional-distance-between-starts= - "{$termlength}+{$label-separation}" + "{$distance-between-starts}" provisional-label-separation="{$label-separation}" xsl:use-attribute-sets="list.block.spacing"> <xsl:copy-of select="$content"/> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/param.ent?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/fo/param.ent diff -u phpdoc/xsl/docbook/fo/param.ent:1.4 phpdoc/xsl/docbook/fo/param.ent:1.5 --- phpdoc/xsl/docbook/fo/param.ent:1.4 Fri Jul 15 04:27:48 2005 +++ phpdoc/xsl/docbook/fo/param.ent Fri Jul 15 05:18:37 2005 @@ -199,6 +199,7 @@ <!ENTITY default.image.width SYSTEM "../params/default.image.width.xml"> <!ENTITY default.float.class SYSTEM "../params/default.float.class.xml"> <!ENTITY bridgehead.in.toc SYSTEM "../params/bridgehead.in.toc.xml"> +<!ENTITY simplesect.in.toc SYSTEM "../params/simplesect.in.toc.xml"> <!ENTITY generate.section.toc.level SYSTEM "../params/generate.section.toc.level.xml"> <!ENTITY table.cell.border.color SYSTEM "../params/table.cell.border.color.xml"> <!ENTITY table.cell.border.style SYSTEM "../params/table.cell.border.style.xml"> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/param.xml?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/fo/param.xml diff -u phpdoc/xsl/docbook/fo/param.xml:1.4 phpdoc/xsl/docbook/fo/param.xml:1.5 --- phpdoc/xsl/docbook/fo/param.xml:1.4 Fri Jul 15 04:27:48 2005 +++ phpdoc/xsl/docbook/fo/param.xml Fri Jul 15 05:18:37 2005 @@ -5,7 +5,7 @@ <bookinfo> <title>FO Parameter Reference</title> <releaseinfo role="meta"> -$Id: param.xml,v 1.4 2005/07/15 08:27:48 techtonik Exp $ +$Id: param.xml,v 1.5 2005/07/15 09:18:37 techtonik Exp $ </releaseinfo> <author> <surname>Walsh</surname> @@ -481,7 +481,7 @@ </refmeta> <refnamediv> <refname>process.empty.source.toc</refname> -<refpurpose>FIXME:</refpurpose> +<refpurpose>Generate automated TOC if <sgmltag>toc</sgmltag> element occurs in a source document?</refpurpose> </refnamediv> <refsynopsisdiv> @@ -490,7 +490,19 @@ <refsect1><title>Description</title> -<para>FIXME: +<para>Specifies that if an empty <sgmltag>toc</sgmltag> element is +found in a source document, an automated TOC is generated. +<note> + <para>Depending on what the value of the + <parameter moreinfo="none">generate.toc</parameter> parameter is, setting this + parameter to <literal moreinfo="none">1</literal> could result in generation of + duplicate automated TOCs. So the + <parameter moreinfo="none">process.empty.source.toc</parameter> is primarily useful + as an "override": by placing an empty <sgmltag>toc</sgmltag> in your + document and setting this parameter to <literal moreinfo="none">1</literal>, you can + force a TOC to be generated even if <sgmltag>generate.toc</sgmltag> + says not to.</para> +</note> </para> </refsect1> @@ -503,7 +515,7 @@ </refmeta> <refnamediv> <refname>process.source.toc</refname> -<refpurpose>FIXME:</refpurpose> +<refpurpose>Process a non-empty <sgmltag>toc</sgmltag> element if it occurs in a source document?</refpurpose> </refnamediv> <refsynopsisdiv> @@ -512,7 +524,20 @@ <refsect1><title>Description</title> -<para>FIXME: +<para>Specifies that the contents of a non-empty "hard-coded" +<sgmltag>toc</sgmltag> element in a source document are processed to +generate a TOC in output. +<note> + <para>This parameter has no effect on automated generation of + TOCs. An automated TOC may still be generated along with the + "hard-coded" TOC. To suppress automated TOC generation, adjust the + value of the <parameter moreinfo="none">generate.toc</parameter> paramameter.</para> + + <para>The <sgmltag>process.source.toc</sgmltag> parameter also has + no effect if the <sgmltag>toc</sgmltag> element is empty; handling + for empty <sgmltag>toc</sgmltag> is controlled by the + <parameter moreinfo="none">process.empty.source.toc</parameter> parameter.</para> +</note> </para> </refsect1> @@ -939,6 +964,28 @@ </refsect1> </refentry> +<refentry id="simplesect.in.toc"> +<refmeta> +<refentrytitle>simplesect.in.toc</refentrytitle> +<refmiscinfo role="type">boolean</refmiscinfo> +</refmeta> +<refnamediv> +<refname>simplesect.in.toc</refname> +<refpurpose>Should <sgmltag>simplesect</sgmltag> elements appear in the TOC?</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<programlisting id="simplesect.in.toc.frag"><xsl:param name="simplesect.in.toc" select="0"></xsl:param></programlisting> +</refsynopsisdiv> + +<refsect1><title>Description</title> + +<para>If non-zero, <sgmltag>simplesect</sgmltag>s appear in the TOC. +</para> + +</refsect1> +</refentry> + <refentry id="generate.section.toc.level"> <refmeta> <refentrytitle>generate.section.toc.level</refentrytitle> @@ -3517,7 +3564,7 @@ </refmeta> <refnamediv> <refname>formal.title.placement</refname> -<refpurpose/> +<refpurpose>Specifies where formal object titles should occur</refpurpose> </refnamediv> <refsynopsisdiv> @@ -4056,7 +4103,9 @@ </refmeta> <refnamediv> <refname>menuchoice.separator</refname> -<refpurpose/> +<refpurpose>Separator between items of a <sgmltag>menuchoice</sgmltag> +other than <sgmltag>guimenuitem</sgmltag> and +<sgmltag>guisubmenu</sgmltag></refpurpose> </refnamediv> <refsynopsisdiv> @@ -4082,7 +4131,9 @@ </refmeta> <refnamediv> <refname>menuchoice.menu.separator</refname> -<refpurpose/> +<refpurpose>Separator between items of a <sgmltag>menuchoice</sgmltag> +with <sgmltag>guimenuitem</sgmltag> or +<sgmltag>guisubmenu</sgmltag></refpurpose> </refnamediv> <refsynopsisdiv> @@ -4179,7 +4230,7 @@ </refmeta> <refnamediv> <refname>footnote.number.symbols</refname> -<refpurpose/> +<refpurpose>Special characters to use as footnote markers</refpurpose> </refnamediv> <refsynopsisdiv> @@ -4214,7 +4265,7 @@ </refmeta> <refnamediv> <refname>table.footnote.number.symbols</refname> -<refpurpose/> +<refpurpose>Special characters to use a footnote markers in tables</refpurpose> </refnamediv> <refsynopsisdiv> @@ -6621,7 +6672,13 @@ <refsynopsisdiv> <programlisting id="component.title.properties.frag"> -<xsl:attribute-set name="component.title.properties"></xsl:attribute-set> +<xsl:attribute-set name="component.title.properties"> + <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute> + <xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master, 'pt')"></xsl:value-of></xsl:attribute> + <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt * 0.8')"></xsl:value-of></xsl:attribute> + <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt * 1.2')"></xsl:value-of></xsl:attribute> + <xsl:attribute name="hyphenate">false</xsl:attribute> +</xsl:attribute-set> </programlisting> </refsynopsisdiv> @@ -8224,7 +8281,7 @@ <!-- This file is generated from param.xweb; do not edit this file! --> <!-- ******************************************************************** - $Id: param.xml,v 1.4 2005/07/15 08:27:48 techtonik Exp $ + $Id: param.xml,v 1.5 2005/07/15 09:18:37 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -8447,6 +8504,7 @@ <src:fragref linkend="shade.verbatim.style.frag"></src:fragref> <src:fragref linkend="show.comments.frag"></src:fragref> <src:fragref linkend="sidebar.properties.frag"></src:fragref> +<src:fragref linkend="simplesect.in.toc.frag"></src:fragref> <src:fragref linkend="subscript.properties.frag"></src:fragref> <src:fragref linkend="superscript.properties.frag"></src:fragref> <src:fragref linkend="symbol.font.family.frag"></src:fragref> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/param.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/fo/param.xsl diff -u phpdoc/xsl/docbook/fo/param.xsl:1.4 phpdoc/xsl/docbook/fo/param.xsl:1.5 --- phpdoc/xsl/docbook/fo/param.xsl:1.4 Fri Jul 15 04:27:49 2005 +++ phpdoc/xsl/docbook/fo/param.xsl Fri Jul 15 05:18:39 2005 @@ -3,7 +3,7 @@ <!-- This file is generated from param.xweb; do not edit this file! --> <!-- ******************************************************************** - $Id: param.xsl,v 1.4 2005/07/15 08:27:49 techtonik Exp $ + $Id: param.xsl,v 1.5 2005/07/15 09:18:39 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -82,7 +82,13 @@ <xsl:attribute name="space-before.maximum">0.2em</xsl:attribute> </xsl:attribute-set> <xsl:param name="component.label.includes.part.label" select="0"/> -<xsl:attribute-set name="component.title.properties"/> +<xsl:attribute-set name="component.title.properties"> + <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute> + <xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute> + <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt * 0.8')"/></xsl:attribute> + <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt * 1.2')"/></xsl:attribute> + <xsl:attribute name="hyphenate">false</xsl:attribute> +</xsl:attribute-set> <xsl:param name="current.docid" select="''"/> <xsl:param name="default.float.class" select="'before'"/> <xsl:param name="default.image.width" select="''"/> @@ -594,6 +600,7 @@ <xsl:attribute name="margin-bottom">6pt</xsl:attribute> --> </xsl:attribute-set> +<xsl:param name="simplesect.in.toc" select="0"/> <xsl:attribute-set name="subscript.properties"> <xsl:attribute name="font-size">75%</xsl:attribute> </xsl:attribute-set> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/param.xweb?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/fo/param.xweb diff -u phpdoc/xsl/docbook/fo/param.xweb:1.4 phpdoc/xsl/docbook/fo/param.xweb:1.5 --- phpdoc/xsl/docbook/fo/param.xweb:1.4 Fri Jul 15 04:27:49 2005 +++ phpdoc/xsl/docbook/fo/param.xweb Fri Jul 15 05:18:39 2005 @@ -7,7 +7,7 @@ <bookinfo> <title>FO Parameter Reference</title> <releaseinfo role="meta"> -$Id: param.xweb,v 1.4 2005/07/15 08:27:49 techtonik Exp $ +$Id: param.xweb,v 1.5 2005/07/15 09:18:39 techtonik Exp $ </releaseinfo> <author> <surname>Walsh</surname> @@ -97,6 +97,7 @@ &toc.indent.width; &toc.margin.properties; &bridgehead.in.toc; +&simplesect.in.toc; &generate.section.toc.level; <!-- @@ -492,7 +493,7 @@ <!-- This file is generated from param.xweb; do not edit this file! --> <!-- ******************************************************************** - $Id: param.xweb,v 1.4 2005/07/15 08:27:49 techtonik Exp $ + $Id: param.xweb,v 1.5 2005/07/15 09:18:39 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -715,6 +716,7 @@ <src:fragref linkend="shade.verbatim.style.frag"/> <src:fragref linkend="show.comments.frag"/> <src:fragref linkend="sidebar.properties.frag"/> +<src:fragref linkend="simplesect.in.toc.frag"/> <src:fragref linkend="subscript.properties.frag"/> <src:fragref linkend="superscript.properties.frag"/> <src:fragref linkend="symbol.font.family.frag"/> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/pi.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/fo/pi.xsl diff -u phpdoc/xsl/docbook/fo/pi.xsl:1.4 phpdoc/xsl/docbook/fo/pi.xsl:1.5 --- phpdoc/xsl/docbook/fo/pi.xsl:1.4 Fri Jul 15 04:27:49 2005 +++ phpdoc/xsl/docbook/fo/pi.xsl Fri Jul 15 05:18:39 2005 @@ -4,7 +4,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: pi.xsl,v 1.4 2005/07/15 08:27:49 techtonik Exp $ + $Id: pi.xsl,v 1.5 2005/07/15 09:18:39 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -193,7 +193,7 @@ <xsl:variable name="spacer"> <fo:block-container width="100%" height="{$height}"> - <fo:block/> + <fo:block><fo:leader leader-length="0pt"/></fo:block> </fo:block-container> </xsl:variable> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/sections.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/fo/sections.xsl diff -u phpdoc/xsl/docbook/fo/sections.xsl:1.4 phpdoc/xsl/docbook/fo/sections.xsl:1.5 --- phpdoc/xsl/docbook/fo/sections.xsl:1.4 Fri Jul 15 04:27:49 2005 +++ phpdoc/xsl/docbook/fo/sections.xsl Fri Jul 15 05:18:39 2005 @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: sections.xsl,v 1.4 2005/07/15 08:27:49 techtonik Exp $ + $Id: sections.xsl,v 1.5 2005/07/15 09:18:39 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -17,6 +17,11 @@ <!-- ==================================================================== --> <xsl:template match="section"> + <xsl:choose> + <xsl:when test="$rootid = @id"> + <xsl:call-template name="section.page.sequence"/> + </xsl:when> + <xsl:otherwise> <xsl:variable name="id"> <xsl:call-template name="object.id"/> </xsl:variable> @@ -82,6 +87,8 @@ </fo:block> </xsl:otherwise> </xsl:choose> + </xsl:otherwise> + </xsl:choose> </xsl:template> <xsl:template name="section.content"> @@ -104,7 +111,7 @@ <xsl:apply-templates/> </xsl:template> -<xsl:template match="/section"> +<xsl:template match="section[not(parent::*)]" name="section.page.sequence"> <xsl:variable name="id"> <xsl:call-template name="object.id"> <xsl:with-param name="object" select="ancestor::reference"/> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/table.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/fo/table.xsl diff -u phpdoc/xsl/docbook/fo/table.xsl:1.4 phpdoc/xsl/docbook/fo/table.xsl:1.5 --- phpdoc/xsl/docbook/fo/table.xsl:1.4 Fri Jul 15 04:27:49 2005 +++ phpdoc/xsl/docbook/fo/table.xsl Fri Jul 15 05:18:39 2005 @@ -12,7 +12,7 @@ <xsl:include href="../common/table.xsl"/> <!-- ******************************************************************** - $Id: table.xsl,v 1.4 2005/07/15 08:27:49 techtonik Exp $ + $Id: table.xsl,v 1.5 2005/07/15 09:18:39 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -24,7 +24,7 @@ <doc:reference xmlns=""> <referenceinfo> <releaseinfo role="meta"> -$Id: table.xsl,v 1.4 2005/07/15 08:27:49 techtonik Exp $ +$Id: table.xsl,v 1.5 2005/07/15 09:18:39 techtonik Exp $ </releaseinfo> <author><surname>Walsh</surname> <firstname>Norman</firstname></author> @@ -283,8 +283,20 @@ <xsl:template match="row"> <xsl:param name="spans"/> + <xsl:variable name="bgcolor"> + <xsl:call-template name="dbfo-attribute"> + <xsl:with-param name="pis" select="processing-instruction('dbfo')"/> + <xsl:with-param name="attribute" select="'bgcolor'"/> + </xsl:call-template> + </xsl:variable> + <fo:table-row> <xsl:call-template name="anchor"/> + <xsl:if test="$bgcolor != ''"> + <xsl:attribute name="background-color"> + <xsl:value-of select="$bgcolor"/> + </xsl:attribute> + </xsl:if> <xsl:apply-templates select="(entry|entrytbl)[1]"> <xsl:with-param name="spans" select="$spans"/> @@ -540,32 +552,18 @@ </xsl:variable> <fo:table-cell xsl:use-attribute-sets="table.cell.padding"> - <xsl:call-template name="table.cell.properties"/> - <xsl:if test="$xep.extensions != 0"> - <!-- Suggested by RenderX to workaround a bug in their implementation --> - <!-- <xsl:attribute name="keep-together.within-column">always</xsl:attribute> --> - </xsl:if> - - <xsl:if test="$bgcolor != ''"> - <xsl:attribute name="background-color"> - <xsl:value-of select="$bgcolor"/> - </xsl:attribute> - </xsl:if> + <xsl:call-template name="table.cell.properties"> + <xsl:with-param name="bgcolor.pi" select="$bgcolor"/> + <xsl:with-param name="rowsep.inherit" select="$rowsep"/> + <xsl:with-param name="colsep.inherit" select="$colsep"/> + <xsl:with-param name="col" select="$col"/> + <xsl:with-param name="valign.inherit" select="$valign"/> + <xsl:with-param name="align.inherit" select="$align"/> + <xsl:with-param name="char.inherit" select="$char"/> + </xsl:call-template> <xsl:call-template name="anchor"/> - <xsl:if test="$rowsep > 0"> - <xsl:call-template name="border"> - <xsl:with-param name="side" select="'bottom'"/> - </xsl:call-template> - </xsl:if> - - <xsl:if test="$colsep > 0 and $col < ancestor::tgroup/@cols"> - <xsl:call-template name="border"> - <xsl:with-param name="side" select="'right'"/> - </xsl:call-template> - </xsl:if> - <xsl:if test="@morerows"> <xsl:attribute name="number-rows-spanned"> <xsl:value-of select="@morerows+1"/> @@ -578,36 +576,6 @@ </xsl:attribute> </xsl:if> - <xsl:if test="$valign != ''"> - <xsl:attribute name="display-align"> - <xsl:choose> - <xsl:when test="$valign='top'">before</xsl:when> - <xsl:when test="$valign='middle'">center</xsl:when> - <xsl:when test="$valign='bottom'">after</xsl:when> - <xsl:otherwise> - <xsl:message> - <xsl:text>Unexpected valign value: </xsl:text> - <xsl:value-of select="$valign"/> - <xsl:text>, center used.</xsl:text> - </xsl:message> - <xsl:text>center</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:attribute> - </xsl:if> - - <xsl:if test="$align != ''"> - <xsl:attribute name="text-align"> - <xsl:value-of select="$align"/> - </xsl:attribute> - </xsl:if> - - <xsl:if test="$char != ''"> - <xsl:attribute name="text-align"> - <xsl:value-of select="$char"/> - </xsl:attribute> - </xsl:if> - <!-- <xsl:if test="@charoff"> <xsl:attribute name="charoff"> @@ -654,6 +622,63 @@ <!-- Expand this template to add properties to any fo:table-cell --> <xsl:template name="table.cell.properties"> + <xsl:param name="bgcolor.pi" select="''"/> + <xsl:param name="rowsep.inherit" select="1"/> + <xsl:param name="colsep.inherit" select="1"/> + <xsl:param name="col" select="1"/> + <xsl:param name="valign.inherit" select="''"/> + <xsl:param name="align.inherit" select="''"/> + <xsl:param name="char.inherit" select="''"/> + + <xsl:if test="$bgcolor.pi != ''"> + <xsl:attribute name="background-color"> + <xsl:value-of select="$bgcolor.pi"/> + </xsl:attribute> + </xsl:if> + + <xsl:if test="$rowsep.inherit > 0"> + <xsl:call-template name="border"> + <xsl:with-param name="side" select="'bottom'"/> + </xsl:call-template> + </xsl:if> + + <xsl:if test="$colsep.inherit > 0 and + $col < ancestor::tgroup/@cols"> + <xsl:call-template name="border"> + <xsl:with-param name="side" select="'right'"/> + </xsl:call-template> + </xsl:if> + + <xsl:if test="$valign.inherit != ''"> + <xsl:attribute name="display-align"> + <xsl:choose> + <xsl:when test="$valign.inherit='top'">before</xsl:when> + <xsl:when test="$valign.inherit='middle'">center</xsl:when> + <xsl:when test="$valign.inherit='bottom'">after</xsl:when> + <xsl:otherwise> + <xsl:message> + <xsl:text>Unexpected valign value: </xsl:text> + <xsl:value-of select="$valign.inherit"/> + <xsl:text>, center used.</xsl:text> + </xsl:message> + <xsl:text>center</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:attribute> + </xsl:if> + + <xsl:if test="$align.inherit != ''"> + <xsl:attribute name="text-align"> + <xsl:value-of select="$align.inherit"/> + </xsl:attribute> + </xsl:if> + + <xsl:if test="$char.inherit != ''"> + <xsl:attribute name="text-align"> + <xsl:value-of select="$char.inherit"/> + </xsl:attribute> + </xsl:if> + </xsl:template> <!-- Expand this template to add properties to any cell's block --> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/titlepage.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/fo/titlepage.xsl diff -u phpdoc/xsl/docbook/fo/titlepage.xsl:1.4 phpdoc/xsl/docbook/fo/titlepage.xsl:1.5 --- phpdoc/xsl/docbook/fo/titlepage.xsl:1.4 Fri Jul 15 04:27:49 2005 +++ phpdoc/xsl/docbook/fo/titlepage.xsl Fri Jul 15 05:18:39 2005 @@ -4,7 +4,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: titlepage.xsl,v 1.4 2005/07/15 08:27:49 techtonik Exp $ + $Id: titlepage.xsl,v 1.5 2005/07/15 09:18:39 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -180,9 +180,11 @@ <xsl:template match="abstract" mode="titlepage.mode"> <fo:block> - <xsl:if test="title"> <!-- FIXME: add param for using default title? --> - <xsl:call-template name="formal.object.heading"/> - </xsl:if> + <xsl:call-template name="formal.object.heading"> + <xsl:with-param name="title"> + <xsl:apply-templates select="." mode="title.markup"/> + </xsl:with-param> + </xsl:call-template> <xsl:apply-templates mode="titlepage.mode"/> </fo:block> </xsl:template> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/common/ChangeLog?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/common/ChangeLog diff -u phpdoc/xsl/docbook/common/ChangeLog:1.4 phpdoc/xsl/docbook/common/ChangeLog:1.5 --- phpdoc/xsl/docbook/common/ChangeLog:1.4 Fri Jul 15 04:27:51 2005 +++ phpdoc/xsl/docbook/common/ChangeLog Fri Jul 15 05:18:39 2005 @@ -1,3 +1,16 @@ +2004-11-18 Robert Stayton <bobstayton@users.sourceforge.net> + + * l10n.xsl: Fixed bug in lang selection from ancestor-or-self predicate. + +2004-11-17 Robert Stayton <bobstayton@users.sourceforge.net> + + * common.xsl: Fixed bug in strippath template that stripped leading double dots. + +2004-11-16 Michael Smith <xmldoc@users.sourceforge.net> + + * labels.xsl: issue #924251 Wrong numbering of Qandaset entries + applied patch from Harald Joerg. + 2004-10-28 Norman Walsh <nwalsh@users.sourceforge.net> * titles.xsl: Fix bug #663552: handle xref correctly when it appears in titles. @@ -179,7 +192,7 @@ 2003-11-30 Robert Stayton <bobstayton@users.sourceforge.net> * gentext.xsl, labels.xsl, subtitles.xsl, table.xsl, targets.xsl, titles.xsl: - Added CVS $Id: ChangeLog,v 1.4 2005/07/15 08:27:51 techtonik Exp $ comment. + Added CVS $Id: ChangeLog,v 1.5 2005/07/15 09:18:39 techtonik Exp $ comment. 2003-11-17 Robert Stayton <bobstayton@users.sourceforge.net> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/common/common.xsl?r1=1.3&r2=1.4&ty=u Index: phpdoc/xsl/docbook/common/common.xsl diff -u phpdoc/xsl/docbook/common/common.xsl:1.3 phpdoc/xsl/docbook/common/common.xsl:1.4 --- phpdoc/xsl/docbook/common/common.xsl:1.3 Fri Oct 1 12:32:08 2004 +++ phpdoc/xsl/docbook/common/common.xsl Fri Jul 15 05:18:39 2005 @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: common.xsl,v 1.3 2004/10/01 16:32:08 techtonik Exp $ + $Id: common.xsl,v 1.4 2005/07/15 09:18:39 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -19,7 +19,7 @@ <doc:reference xmlns=""> <referenceinfo> <releaseinfo role="meta"> -$Id: common.xsl,v 1.3 2004/10/01 16:32:08 techtonik Exp $ +$Id: common.xsl,v 1.4 2005/07/15 09:18:39 techtonik Exp $ </releaseinfo> <author><surname>Walsh</surname> <firstname>Norman</firstname></author> @@ -1724,6 +1724,13 @@ <xsl:template name="strippath"> <xsl:param name="filename" select="''"/> <xsl:choose> + <!-- Leading .. are not eliminated --> + <xsl:when test="starts-with($filename, '../')"> + <xsl:value-of select="'../'"/> + <xsl:call-template name="strippath"> + <xsl:with-param name="filename" select="substring-after($filename, '../')"/> + </xsl:call-template> + </xsl:when> <xsl:when test="contains($filename, '/../')"> <xsl:call-template name="strippath"> <xsl:with-param name="filename"> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/common/l10n.xsl?r1=1.3&r2=1.4&ty=u Index: phpdoc/xsl/docbook/common/l10n.xsl diff -u phpdoc/xsl/docbook/common/l10n.xsl:1.3 phpdoc/xsl/docbook/common/l10n.xsl:1.4 --- phpdoc/xsl/docbook/common/l10n.xsl:1.3 Fri Oct 1 12:32:09 2004 +++ phpdoc/xsl/docbook/common/l10n.xsl Fri Jul 15 05:18:39 2005 @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: l10n.xsl,v 1.3 2004/10/01 16:32:09 techtonik Exp $ + $Id: l10n.xsl,v 1.4 2005/07/15 09:18:39 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -32,7 +32,7 @@ <!-- can't do this one step: attributes are unordered! --> <xsl:variable name="lang-scope" select="$target/ancestor-or-self::* - [@lang or @xml:lang][last()]"/> + [@lang or @xml:lang][1]"/> <xsl:variable name="lang-attr" select="($lang-scope/@lang | $lang-scope/@xml:lang)[1]"/> <xsl:choose> @@ -49,7 +49,7 @@ <!-- can't do this one step: attributes are unordered! --> <xsl:variable name="lang-scope" select="$target/ancestor-or-self::* - [@lang or @xml:lang][last()]"/> + [@lang or @xml:lang][1]"/> <xsl:variable name="lang-attr" select="($lang-scope/@lang | $lang-scope/@xml:lang)[1]"/> @@ -119,7 +119,7 @@ <!-- can't do this one step: attributes are unordered! --> <xsl:variable name="lang-scope" select="$node/ancestor-or-self::* - [@lang or @xml:lang][last()]"/> + [@lang or @xml:lang][1]"/> <xsl:variable name="lang-attr" select="($lang-scope/@lang | $lang-scope/@xml:lang)[1]"/> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/common/labels.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/common/labels.xsl diff -u phpdoc/xsl/docbook/common/labels.xsl:1.4 phpdoc/xsl/docbook/common/labels.xsl:1.5 --- phpdoc/xsl/docbook/common/labels.xsl:1.4 Fri Jul 15 04:27:51 2005 +++ phpdoc/xsl/docbook/common/labels.xsl Fri Jul 15 05:18:39 2005 @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: labels.xsl,v 1.4 2005/07/15 08:27:51 techtonik Exp $ + $Id: labels.xsl,v 1.5 2005/07/15 09:18:39 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -485,15 +485,17 @@ <xsl:variable name="prefix"> <xsl:if test="$qanda.inherit.numeration != 0"> - <xsl:if test="$lparent.prefix != ''"> - <xsl:apply-templates select="$lparent" mode="label.markup"/> - <xsl:apply-templates select="$lparent" mode="intralabel.punctuation"/> - </xsl:if> - <xsl:if test="ancestor::qandadiv"> + <xsl:choose> + <xsl:when test="ancestor::qandadiv"> <xsl:apply-templates select="ancestor::qandadiv[1]" mode="label.markup"/> <xsl:apply-templates select="ancestor::qandadiv[1]" mode="intralabel.punctuation"/> - </xsl:if> + </xsl:when> + <xsl:when test="$lparent.prefix != ''"> + <xsl:apply-templates select="$lparent" mode="label.markup"/> + <xsl:apply-templates select="$lparent" mode="intralabel.punctuation"/> + </xsl:when> + </xsl:choose> </xsl:if> </xsl:variable> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/htmlhelp/ChangeLog?r1=1.1&r2=1.2&ty=u Index: phpdoc/xsl/docbook/htmlhelp/ChangeLog diff -u phpdoc/xsl/docbook/htmlhelp/ChangeLog:1.1 phpdoc/xsl/docbook/htmlhelp/ChangeLog:1.2 --- phpdoc/xsl/docbook/htmlhelp/ChangeLog:1.1 Fri Oct 1 12:32:09 2004 +++ phpdoc/xsl/docbook/htmlhelp/ChangeLog Fri Jul 15 05:18:39 2005 @@ -1,3 +1,7 @@ +2004-11-17 Jirka Kosek <kosek@users.sourceforge.net> + + * htmlhelp-common.xsl: Removed reference to index HTML pages from manifest if the output format is HTML Help + 2004-08-19 Jirka Kosek <kosek@users.sourceforge.net> * htmlhelp-common.xsl: Added several patches from W. Borgert http://cvs.php.net/diff.php/phpdoc/xsl/docbook/htmlhelp/htmlhelp-common.xsl?r1=1.2&r2=1.3&ty=u Index: phpdoc/xsl/docbook/htmlhelp/htmlhelp-common.xsl diff -u phpdoc/xsl/docbook/htmlhelp/htmlhelp-common.xsl:1.2 phpdoc/xsl/docbook/htmlhelp/htmlhelp-common.xsl:1.3 --- phpdoc/xsl/docbook/htmlhelp/htmlhelp-common.xsl:1.2 Mon Jul 4 12:53:26 2005 +++ phpdoc/xsl/docbook/htmlhelp/htmlhelp-common.xsl Fri Jul 15 05:18:39 2005 @@ -8,7 +8,7 @@ exclude-result-prefixes="doc exsl set h"> <!-- ******************************************************************** - $Id: htmlhelp-common.xsl,v 1.2 2005/07/04 16:53:26 techtonik Exp $ + $Id: htmlhelp-common.xsl,v 1.3 2005/07/15 09:18:39 techtonik Exp $ ******************************************************************** --> <!-- ==================================================================== --> @@ -20,6 +20,9 @@ <xsl:variable name="htmlhelp.generate.index" select="//indexterm[1]"/> +<!-- Set up HTML Help flag --> +<xsl:variable name="htmlhelp.output" select="1"/> + <xsl:variable name="raw.help.title"> <xsl:choose> <xsl:when test="$htmlhelp.title = ''"> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/htmlhelp/profile-htmlhelp-common.xsl?r1=1.2&r2=1.3&ty=u Index: phpdoc/xsl/docbook/htmlhelp/profile-htmlhelp-common.xsl diff -u phpdoc/xsl/docbook/htmlhelp/profile-htmlhelp-common.xsl:1.2 phpdoc/xsl/docbook/htmlhelp/profile-htmlhelp-common.xsl:1.3 --- phpdoc/xsl/docbook/htmlhelp/profile-htmlhelp-common.xsl:1.2 Mon Jul 4 12:54:22 2005 +++ phpdoc/xsl/docbook/htmlhelp/profile-htmlhelp-common.xsl Fri Jul 15 05:18:39 2005 @@ -4,7 +4,7 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns:exsl="http://exslt.org/common" xmlns:set="http://exslt.org/sets" xmlns:h="urn:x-hex" xmlns:exslt="http://exslt.org/common" exslt:dummy="dummy" extension-element-prefixes="exslt" version="1.0" exclude-result-prefixes="doc exsl set h exslt"> <!-- ******************************************************************** - $Id: profile-htmlhelp-common.xsl,v 1.2 2005/07/04 16:54:22 techtonik Exp $ + $Id: profile-htmlhelp-common.xsl,v 1.3 2005/07/15 09:18:39 techtonik Exp $ ******************************************************************** --> <!-- ==================================================================== --> @@ -16,6 +16,9 @@ <xsl:variable name="htmlhelp.generate.index" select="//indexterm[1]"/> +<!-- Set up HTML Help flag --> +<xsl:variable name="htmlhelp.output" select="1"/> + <xsl:variable name="raw.help.title"> <xsl:choose> <xsl:when test="$htmlhelp.title = ''"> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/RELEASE-NOTES.txt?r1=1.1&r2=1.2&ty=u Index: phpdoc/xsl/docbook/RELEASE-NOTES.txt diff -u phpdoc/xsl/docbook/RELEASE-NOTES.txt:1.1 phpdoc/xsl/docbook/RELEASE-NOTES.txt:1.2 --- phpdoc/xsl/docbook/RELEASE-NOTES.txt:1.1 Fri Jul 15 04:27:52 2005 +++ phpdoc/xsl/docbook/RELEASE-NOTES.txt Fri Jul 15 05:18:39 2005 @@ -2,18 +2,146 @@ DocBook Open Repository Team -$Id: RELEASE-NOTES.txt,v 1.1 2005/07/15 08:27:52 techtonik Exp $ +$Id: RELEASE-NOTES.txt,v 1.2 2005/07/15 09:18:39 techtonik Exp $ -10 November 2004 +01 December 2004 ------------------------------------------------------------------------------- +Table of Contents + +Release 1.67.2 +Release 1.67.1 +Release 1.67.0 +Release 1.66.1 +Release 1.65.0 +Release 1.64.1 +Release 1.61.0 +Release 1.60.1 +Release 1.59.2 +Release 1.59.1 +Release 1.58.0 +Release 1.57.0 +Release 1.56.0 +Older releases + These are the release notes for the DocBook XSL Stylesheets. This file documents (mostly) changes to the public APIs. What, exactly, counts as a public API is still somewhat in question, but it includes at least the global parameters. -You may also be interested in the more detailed WhatsNew. +You may also be interested in the more detailed WhatsNew file. + +Release 1.67.2 + +This release fixes a table bug introduced in the 1.67.1 release. + +Release 1.67.1 + +This release includes a number of bug fixes; for details, see the WhatsNew +file. + +The following lists provide details about API and feature changes. + +FO + + * Tables: Inherited cell properties are now passed to the + table.cell.properties template so they can be overridden by a + customization. + + * Tables: Added support for bgcolor PI on table row element. + + * TOCs: Added new parameter simplesect.in.toc; default value of 0 causes + simplesect to be omitted from TOCs; to cause simplesect to be included in + TOCs, you must set the value of simplesect.in.toc to 1.Comment from Norm: + + Simplesect elements aren't supposed to appear in the ToC at all... The + use case for simplesect is when, for example, every chapter in a book + ends with "Exercises" or "For More Information" sections and you don't + want those to appear in the ToC. + + * Sections: Reverted change that caused a variable reference to be used in a + template match and rewrote code to preserve intended semantics. + + * Lists: Added workaround to prevent "* 0.60 + 1em" garbage in list output + from PassiveTeX + + * Moved the literal attributes from component.title to the + component.title.properties attribute-set so they can be customized. + + * Lists: Added glossdef's first para to special handling in + fo:list-item-body. + +HTML + + * TOCs: Added new parameter simplesect.in.toc; for details, see the list of + FO changes for this release. + + * Indexing: Added new parameter index.prefer.titleabbrev; when set to 1, + index references will use titleabbrev instead of title when available. + +HTML Help + + * Added support for generating windows-1252-encoded output using Saxon; for + more details, see the list of XSL Java extensions changes for this release. + +man pages + + * Replaced named/numeric character-entity references for non-breaking space + with groff equivalent (backslash-tilde). + +XSL Java extensions + + * Saxon extensions: Added the Windows1252 class. It extends Saxon 6.5.x with + the windows-1252 character set, which is particularly useful when + generating HTML Help for Western European Languages (code from Pontus + Haglund and contributed to the DocBook community by Sectra AB, Sweden). + + To use: + + 1. Make sure that the Saxon 6.5.x jar file and the jar file for the + DocBook XSL Java extensions are in your CLASSPATH + + 2. Create a DocBook XSL customization layer -- a file named + mystylesheet.xsl or whatever -- that, at a minimum, contains the + following: + + <xsl:stylesheet + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + version='1.0'> + <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl"/> + <xsl:output method="html" encoding="WINDOWS-1252" indent="no"/> + <xsl:param name="htmlhelp.encoding" select="WINDOWS-1252"></xsl:param> + <xsl:param name="chunker.output.encoding" select="WINDOWS-1252"></xsl:param> + <xsl:param name="saxon.character.representation" select="native"></xsl:param> + </xsl:stylesheet> + + Invoke Saxon with the encoding.windows-1252 Java system property set to + com.nwalsh.saxon.Windows1252; for example + + java \ + -Dencoding.windows-1252=com.nwalsh.saxon.Windows1252 \ + com.icl.saxon.StyleSheet \ + mydoc.xml mystylesheet.xsl + + Or, for a more complete "real world" case showing other options you'll + typically want to use: + + java \ + -Dencoding.windows-1252=com.nwalsh.saxon.Windows1252 \ + -Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl \ + -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl \ + -Djavax.xml.transform.TransformerFactory=com.icl.saxon.TransformerFactoryImpl \ + com.icl.saxon.StyleSheet \ + -x org.apache.xml.resolver.tools.ResolvingXMLReader \ + -y org.apache.xml.resolver.tools.ResolvingXMLReader \ + -r org.apache.xml.resolver.tools.CatalogResolver \ + mydoc.xml mystylesheet.xsl + + In both cases, the "mystylesheet.xsl" file should be a DocBook + customization layer containing the parameters show in step 2. + + * Saxon extensions: Removed Saxon 8 extensions from release package Release 1.67.0 @@ -590,7 +718,9 @@ * Fixed bug in html2xhtml.xsl that was causing the XHTML chunker to output HTML instead of XHTML. -Note +Older releases -Consult CVS archive for release notes on earlier releases +To view the release notes for older releases, see http://cvs.sourceforge.net/ +viewcvs.py/docbook/xsl/RELEASE-NOTES.xml. Be aware that there were no release +notes for releases prior to the 1.50.0 release. http://cvs.php.net/diff.php/phpdoc/xsl/docbook/VERSION?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/VERSION diff -u phpdoc/xsl/docbook/VERSION:1.4 phpdoc/xsl/docbook/VERSION:1.5 --- phpdoc/xsl/docbook/VERSION:1.4 Fri Jul 15 04:27:52 2005 +++ phpdoc/xsl/docbook/VERSION Fri Jul 15 05:18:39 2005 @@ -12,7 +12,7 @@ <fm:project> <fm:Project>DocBook</fm:Project> <fm:Branch>XSL Stylesheets</fm:Branch> - <fm:Version>1.67.0</fm:Version> + <fm:Version>1.67.2</fm:Version> <!-- <fm:License>MIT/X Consortium License</fm:License> --> @@ -30,12 +30,11 @@ <fm:Home-Page-URL>http://sourceforge.net/projects/docbook/</fm:Home-Page-URL> <fm:Gzipped-Tar-URL>http://prdownloads.sourceforge.net/docbook/docbook-xsl-{VERSION}.tar.gz?download</fm:Gzipped-Tar-URL> <fm:Zipped-Tar-URL>http://prdownloads.sourceforge.net/docbook/docbook-xsl-{VERSION}.zip?download</fm:Zipped-Tar-URL> + <fm:Bzipped-Tar-URL>http://prdownloads.sourceforge.net/docbook/docbook-xsl-{VERSION}.bz2?download</fm:Bzipped-Tar-URL> <fm:Changelog-URL>http://sourceforge.net/project/shownotes.php?release_id={SFRELID}</fm:Changelog-URL> <fm:CVS-URL>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/docbook/xsl/</fm:CVS-URL> <fm:Mailing-List-URL>http://lists.oasis-open.org/archives/docbook-apps/</fm:Mailing-List-URL> - <fm:Changes>This release fixes a number of bugs and adds a few - new features. For details, see the RELEASE-NOTES and WhatsNew - files in the distribution. + <fm:Changes>This release fixes a table bug introduced by the 1.67.1 release. </fm:Changes> </fm:project> @@ -58,7 +57,7 @@ <xsl:template match="fm:Changes"/> -<xsl:template match="fm:Gzipped-Tar-URL|fm:Zipped-Tar-URL"> +<xsl:template match="fm:Gzipped-Tar-URL|fm:Zipped-Tar-URL|fm:Bzipped-Tar-URL"> <xsl:value-of select="local-name(.)"/> <xsl:text>: </xsl:text> <xsl:value-of select="substring-before(., '{VERSION}')"/>
http://cvs.php.net/diff.php/phpdoc/xsl/docbook/html/autoidx.xsl?r1=1.3&r2=1.4&ty=u Index: phpdoc/xsl/docbook/html/autoidx.xsl diff -u phpdoc/xsl/docbook/html/autoidx.xsl:1.3 phpdoc/xsl/docbook/html/autoidx.xsl:1.4 --- phpdoc/xsl/docbook/html/autoidx.xsl:1.3 Fri Oct 1 12:32:08 2004 +++ phpdoc/xsl/docbook/html/autoidx.xsl Fri Jul 15 05:18:33 2005 @@ -43,7 +43,7 @@ version="1.0"> <!-- ******************************************************************** - $Id: autoidx.xsl,v 1.3 2004/10/01 16:32:08 techtonik Exp $ + $Id: autoidx.xsl,v 1.4 2005/07/15 09:18:33 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -369,7 +369,14 @@ <xsl:otherwise> <a> <xsl:variable name="title"> + <xsl:choose> + <xsl:when test="§ion;/titleabbrev and $index.prefer.titleabbrev != 0"> + <xsl:apply-templates select="§ion;" mode="titleabbrev.markup"/> + </xsl:when> + <xsl:otherwise> <xsl:apply-templates select="§ion;" mode="title.markup"/> + </xsl:otherwise> + </xsl:choose> </xsl:variable> <xsl:attribute name="href"> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/html/autotoc.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/html/autotoc.xsl diff -u phpdoc/xsl/docbook/html/autotoc.xsl:1.4 phpdoc/xsl/docbook/html/autotoc.xsl:1.5 --- phpdoc/xsl/docbook/html/autotoc.xsl:1.4 Fri Jul 15 04:27:50 2005 +++ phpdoc/xsl/docbook/html/autotoc.xsl Fri Jul 15 05:18:33 2005 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: autotoc.xsl,v 1.4 2005/07/15 08:27:50 techtonik Exp $ + $Id: autotoc.xsl,v 1.5 2005/07/15 09:18:33 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -154,7 +154,9 @@ <xsl:call-template name="make.toc"> <xsl:with-param name="toc-context" select="$toc-context"/> <xsl:with-param name="toc.title.p" select="$toc.title.p"/> - <xsl:with-param name="nodes" select="section|sect1|refentry + <xsl:with-param name="nodes" select="section|sect1 + |simplesect[$simplesect.in.toc != 0] + |refentry |article|bibliography|glossary |appendix|index |bridgehead[not(@renderas) @@ -336,7 +338,9 @@ <xsl:call-template name="subtoc"> <xsl:with-param name="toc-context" select="$toc-context"/> - <xsl:with-param name="nodes" select="section|sect1|simplesect|refentry + <xsl:with-param name="nodes" select="section|sect1 + |simplesect[$simplesect.in.toc != 0] + |refentry |glossary|bibliography|index |bridgehead[$bridgehead.in.toc != 0]"/> </xsl:call-template> @@ -389,6 +393,14 @@ </xsl:call-template> </xsl:template> +<xsl:template match="simplesect" mode="toc"> + <xsl:param name="toc-context" select="."/> + + <xsl:call-template name="subtoc"> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:call-template> +</xsl:template> + <xsl:template match="section" mode="toc"> <xsl:param name="toc-context" select="."/> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/html/ChangeLog?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/html/ChangeLog diff -u phpdoc/xsl/docbook/html/ChangeLog:1.4 phpdoc/xsl/docbook/html/ChangeLog:1.5 --- phpdoc/xsl/docbook/html/ChangeLog:1.4 Fri Jul 15 04:27:50 2005 +++ phpdoc/xsl/docbook/html/ChangeLog Fri Jul 15 05:18:33 2005 @@ -1,3 +1,69 @@ +2004-11-23 Michael Smith <xmldoc@users.sourceforge.net> + + * autotoc.xsl, param.ent, param.xweb: RFE #1069397 Add new parameter simplesect.in.toc + + - default value of 0 causes simplesect to be omitted from TOCs + - to cause simplesect to be included in TOCs, you must set the + value of simplesect.in.toc to 1 + + note from Norm: + + Simplesect elements aren't supposed to appear in the ToC at + all. Ugh. The Definitive Guide doesn't really explain that + very well. + + The use case for simplesect is when, for example, every + chapter in a book ends with "Exercises" or "For More + Information" sections and you don't want those to appear in + the ToC. + + * refentry.xsl: Patch #1057029 - Fix titleabbrev warnings in reference (patch from + anatoly techtonik) + + * sections.xsl: Bug #1068455 (Invalid h7, h8, etc. generated for deeply nested sections) + + ::CAUSE + Stylesheet HTML heading-generation didn't anticipate that some + jokers like to nest sections really, really deep. Not naming any + names... + + ::FIX + Refined logic to safely handle documents produced by the "I can + nest sections deeper than you can" crowd + +2004-11-19 Michael Smith <xmldoc@users.sourceforge.net> + + * sections.xsl: Bug #1066753 -- subtitle is severely broken (reported by Sam Steingold) + + ::PROBLEM + In (X)HTML output, subtitle for the simplesect element generates an + h2 head, no matter at what level in the sectioning hiearchy the + simplesect occurs; end up with cases where a simplesect is + output with (for example), an h4 title but a h2 subtitle + + ::CAUSE and FIX + No template for simplesect/subtitle in the set of templates that + call the section.subtitle named template, so stylesheets fell + back to using the titlepage.mode template for subtitle + + ::FIX + Added simplesect/subtitle to the set of templates that + call the section.subtitle named template. + + ::AFFECTS + Only affects (X)HTML output of simplesect/subtitle; nothing else + +2004-11-17 Jirka Kosek <kosek@users.sourceforge.net> + + * Makefile.param, autoidx.xsl, docbook.xsl, param.ent, param.xweb: + Added new parameter index.prefer.titleabbrev. When set to 1, index references will use titleabbrev instead of title when available. + + * manifest.xsl: Removed reference to index HTML pages from manifest if the output format is HTML Help + +2004-11-13 Robert Stayton <bobstayton@users.sourceforge.net> + + * autotoc.xsl: Fixed bugs in simplesect handling. + 2004-11-09 Michael Smith <xmldoc@users.sourceforge.net> * synop.xsl: Revert change for tracker #1008804 (command in cmdsynopsis is not indented) @@ -369,7 +435,7 @@ 2003-11-30 Robert Stayton <bobstayton@users.sourceforge.net> * 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: - Added CVS $Id: ChangeLog,v 1.4 2005/07/15 08:27:50 techtonik Exp $ comments. + Added CVS $Id: ChangeLog,v 1.5 2005/07/15 09:18:33 techtonik Exp $ comments. 2003-11-29 Jirka Kosek <kosek@users.sourceforge.net> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/html/docbook.xsl?r1=1.3&r2=1.4&ty=u Index: phpdoc/xsl/docbook/html/docbook.xsl diff -u phpdoc/xsl/docbook/html/docbook.xsl:1.3 phpdoc/xsl/docbook/html/docbook.xsl:1.4 --- phpdoc/xsl/docbook/html/docbook.xsl:1.3 Fri Oct 1 12:32:08 2004 +++ phpdoc/xsl/docbook/html/docbook.xsl Fri Jul 15 05:18:33 2005 @@ -9,7 +9,7 @@ indent="no"/> <!-- ******************************************************************** - $Id: docbook.xsl,v 1.3 2004/10/01 16:32:08 techtonik Exp $ + $Id: docbook.xsl,v 1.4 2005/07/15 09:18:33 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -70,6 +70,7 @@ <xsl:include href="docbookng.xsl"/> <xsl:param name="stylesheet.result.type" select="'html'"/> +<xsl:param name="htmlhelp.output" select="0"/> <!-- ==================================================================== --> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/html/manifest.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/html/manifest.xsl diff -u phpdoc/xsl/docbook/html/manifest.xsl:1.4 phpdoc/xsl/docbook/html/manifest.xsl:1.5 --- phpdoc/xsl/docbook/html/manifest.xsl:1.4 Fri Jul 15 04:27:50 2005 +++ phpdoc/xsl/docbook/html/manifest.xsl Fri Jul 15 05:18:33 2005 @@ -4,7 +4,7 @@ exclude-result-prefixes="doc"> <!-- ******************************************************************** - $Id: manifest.xsl,v 1.4 2005/07/15 08:27:50 techtonik Exp $ + $Id: manifest.xsl,v 1.5 2005/07/15 09:18:33 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -42,7 +42,6 @@ |section |book/glossary|article/glossary|part/glossary |book/bibliography|article/bibliography|part/bibliography - |book/index|article/index|part/index |colophon" mode="enumerate-files"> <xsl:variable name="ischunk"><xsl:call-template name="chunk"/></xsl:variable> @@ -62,6 +61,27 @@ <xsl:apply-templates select="*" mode="enumerate-files"/> </xsl:template> +<xsl:template match="book/index|article/index|part/index" + mode="enumerate-files"> + <xsl:if test="$htmlhelp.output != 1"> + <xsl:variable name="ischunk"><xsl:call-template name="chunk"/></xsl:variable> + <xsl:if test="$ischunk='1'"> + <xsl:call-template name="make-relative-filename"> + <xsl:with-param name="base.dir"> + <xsl:if test="$manifest.in.base.dir = 0"> + <xsl:value-of select="$base.dir"/> + </xsl:if> + </xsl:with-param> + <xsl:with-param name="base.name"> + <xsl:apply-templates mode="chunk-filename" select="."/> + </xsl:with-param> + </xsl:call-template> + <xsl:text> </xsl:text> + </xsl:if> + <xsl:apply-templates select="*" mode="enumerate-files"/> + </xsl:if> +</xsl:template> + <xsl:template match="legalnotice" mode="enumerate-files"> <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable> <xsl:if test="$generate.legalnotice.link != 0"> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/html/param.ent?r1=1.3&r2=1.4&ty=u Index: phpdoc/xsl/docbook/html/param.ent diff -u phpdoc/xsl/docbook/html/param.ent:1.3 phpdoc/xsl/docbook/html/param.ent:1.4 --- phpdoc/xsl/docbook/html/param.ent:1.3 Fri Oct 1 12:32:08 2004 +++ phpdoc/xsl/docbook/html/param.ent Fri Jul 15 05:18:33 2005 @@ -123,6 +123,7 @@ <!ENTITY htmlhelp.window.geometry SYSTEM "../params/htmlhelp.window.geometry.xml"> <!ENTITY img.src.path SYSTEM "../params/img.src.path.xml"> <!ENTITY index.on.role SYSTEM "../params/index.on.role.xml"> +<!ENTITY index.prefer.titleabbrev SYSTEM "../params/index.prefer.titleabbrev.xml"> <!ENTITY index.on.type SYSTEM "../params/index.on.type.xml"> <!ENTITY inherit.keywords SYSTEM "../params/inherit.keywords.xml"> <!ENTITY label.from.part SYSTEM "../params/label.from.part.xml"> @@ -265,3 +266,4 @@ <!ENTITY eclipse.plugin.provider SYSTEM "../params/eclipse.plugin.provider.xml"> <!ENTITY insert.xref.page.number SYSTEM "../params/insert.xref.page.number.xml"> <!ENTITY component.label.includes.part.label SYSTEM "../params/component.label.includes.part.label.xml"> +<!ENTITY simplesect.in.toc SYSTEM "../params/simplesect.in.toc.xml"> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/html/param.xml?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/html/param.xml diff -u phpdoc/xsl/docbook/html/param.xml:1.4 phpdoc/xsl/docbook/html/param.xml:1.5 --- phpdoc/xsl/docbook/html/param.xml:1.4 Fri Jul 15 04:27:50 2005 +++ phpdoc/xsl/docbook/html/param.xml Fri Jul 15 05:18:33 2005 @@ -5,7 +5,7 @@ <bookinfo> <title>HTML Parameter Reference</title> <releaseinfo role="meta"> -$Id: param.xml,v 1.4 2005/07/15 08:27:50 techtonik Exp $ +$Id: param.xml,v 1.5 2005/07/15 09:18:33 techtonik Exp $ </releaseinfo> <author> <surname>Walsh</surname> @@ -601,7 +601,7 @@ </refmeta> <refnamediv> <refname>process.source.toc</refname> -<refpurpose>FIXME:</refpurpose> +<refpurpose>Process a non-empty <sgmltag>toc</sgmltag> element if it occurs in a source document?</refpurpose> </refnamediv> <refsynopsisdiv> @@ -610,7 +610,20 @@ <refsect1><title>Description</title> -<para>FIXME: +<para>Specifies that the contents of a non-empty "hard-coded" +<sgmltag>toc</sgmltag> element in a source document are processed to +generate a TOC in output. +<note> + <para>This parameter has no effect on automated generation of + TOCs. An automated TOC may still be generated along with the + "hard-coded" TOC. To suppress automated TOC generation, adjust the + value of the <parameter moreinfo="none">generate.toc</parameter> paramameter.</para> + + <para>The <sgmltag>process.source.toc</sgmltag> parameter also has + no effect if the <sgmltag>toc</sgmltag> element is empty; handling + for empty <sgmltag>toc</sgmltag> is controlled by the + <parameter moreinfo="none">process.empty.source.toc</parameter> parameter.</para> +</note> </para> </refsect1> @@ -623,7 +636,7 @@ </refmeta> <refnamediv> <refname>process.empty.source.toc</refname> -<refpurpose>FIXME:</refpurpose> +<refpurpose>Generate automated TOC if <sgmltag>toc</sgmltag> element occurs in a source document?</refpurpose> </refnamediv> <refsynopsisdiv> @@ -632,7 +645,19 @@ <refsect1><title>Description</title> -<para>FIXME: +<para>Specifies that if an empty <sgmltag>toc</sgmltag> element is +found in a source document, an automated TOC is generated. +<note> + <para>Depending on what the value of the + <parameter moreinfo="none">generate.toc</parameter> parameter is, setting this + parameter to <literal moreinfo="none">1</literal> could result in generation of + duplicate automated TOCs. So the + <parameter moreinfo="none">process.empty.source.toc</parameter> is primarily useful + as an "override": by placing an empty <sgmltag>toc</sgmltag> in your + document and setting this parameter to <literal moreinfo="none">1</literal>, you can + force a TOC to be generated even if <sgmltag>generate.toc</sgmltag> + says not to.</para> +</note> </para> </refsect1> @@ -662,6 +687,28 @@ </refsect1> </refentry> +<refentry id="simplesect.in.toc"> +<refmeta> +<refentrytitle>simplesect.in.toc</refentrytitle> +<refmiscinfo role="type">boolean</refmiscinfo> +</refmeta> +<refnamediv> +<refname>simplesect.in.toc</refname> +<refpurpose>Should <sgmltag>simplesect</sgmltag> elements appear in the TOC?</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<programlisting id="simplesect.in.toc.frag"><xsl:param name="simplesect.in.toc" select="0"></xsl:param></programlisting> +</refsynopsisdiv> + +<refsect1><title>Description</title> + +<para>If non-zero, <sgmltag>simplesect</sgmltag>s appear in the TOC. +</para> + +</refsect1> +</refentry> + <refentry id="manual.toc"> <refmeta> <refentrytitle>manual.toc</refentrytitle> @@ -990,6 +1037,30 @@ </refsect1> </refentry> +<refentry id="index.prefer.titleabbrev"> +<refmeta> +<refentrytitle>index.prefer.titleabbrev</refentrytitle> +<refmiscinfo role="type">boolean</refmiscinfo> +</refmeta> +<refnamediv> +<refname>index.prefer.titleabbrev</refname> +<refpurpose>Should be abbreviated titles used as back references</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<programlisting id="index.prefer.titleabbrev.frag"> +<xsl:param name="index.prefer.titleabbrev" select="0"></xsl:param> +</programlisting> +</refsynopsisdiv> + +<refsect1><title>Description</title> + +<para>FIXME: +</para> + +</refsect1> +</refentry> + </reference> <reference><title>Extensions</title> @@ -4076,7 +4147,7 @@ </refmeta> <refnamediv> <refname>formal.title.placement</refname> -<refpurpose/> +<refpurpose>Specifies where formal object titles should occur</refpurpose> </refnamediv> <refsynopsisdiv> @@ -4622,7 +4693,9 @@ </refmeta> <refnamediv> <refname>menuchoice.separator</refname> -<refpurpose/> +<refpurpose>Separator between items of a <sgmltag>menuchoice</sgmltag> +other than <sgmltag>guimenuitem</sgmltag> and +<sgmltag>guisubmenu</sgmltag></refpurpose> </refnamediv> <refsynopsisdiv> @@ -4648,7 +4721,9 @@ </refmeta> <refnamediv> <refname>menuchoice.menu.separator</refname> -<refpurpose/> +<refpurpose>Separator between items of a <sgmltag>menuchoice</sgmltag> +with <sgmltag>guimenuitem</sgmltag> or +<sgmltag>guisubmenu</sgmltag></refpurpose> </refnamediv> <refsynopsisdiv> @@ -4745,7 +4820,7 @@ </refmeta> <refnamediv> <refname>footnote.number.symbols</refname> -<refpurpose/> +<refpurpose>Special characters to use as footnote markers</refpurpose> </refnamediv> <refsynopsisdiv> @@ -4780,7 +4855,7 @@ </refmeta> <refnamediv> <refname>table.footnote.number.symbols</refname> -<refpurpose/> +<refpurpose>Special characters to use a footnote markers in tables</refpurpose> </refnamediv> <refsynopsisdiv> @@ -6962,7 +7037,7 @@ </refmeta> <refnamediv> <refname>htmlhelp.hhc.folders.instead.books</refname> -<refpurpose/> +<refpurpose>Use folder icons in ToC (instead of book icons)?</refpurpose> </refnamediv> <refsynopsisdiv> @@ -6988,7 +7063,7 @@ </refmeta> <refnamediv> <refname>htmlhelp.hhc.binary</refname> -<refpurpose/> +<refpurpose>Generate binary ToC?</refpurpose> </refnamediv> <refsynopsisdiv> @@ -7921,7 +7996,7 @@ <xsl:stylesheet exclude-result-prefixes="src" version="1.0"> <!-- ******************************************************************** - $Id: param.xml,v 1.4 2005/07/15 08:27:50 techtonik Exp $ + $Id: param.xml,v 1.5 2005/07/15 09:18:33 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -8066,6 +8141,7 @@ <src:fragref linkend="img.src.path.frag"></src:fragref> <src:fragref linkend="index.on.role.frag"></src:fragref> <src:fragref linkend="index.on.type.frag"></src:fragref> +<src:fragref linkend="index.prefer.titleabbrev.frag"></src:fragref> <src:fragref linkend="ignore.image.scaling.frag"></src:fragref> <src:fragref linkend="inherit.keywords.frag"></src:fragref> <src:fragref linkend="l10n.gentext.default.language.frag"></src:fragref> @@ -8149,6 +8225,7 @@ <src:fragref linkend="shade.verbatim.style.frag"></src:fragref> <src:fragref linkend="show.comments.frag"></src:fragref> <src:fragref linkend="show.revisionflag.frag"></src:fragref> +<src:fragref linkend="simplesect.in.toc.frag"></src:fragref> <src:fragref linkend="spacing.paras.frag"></src:fragref> <src:fragref linkend="suppress.footer.navigation.frag"></src:fragref> <src:fragref linkend="suppress.header.navigation.frag"></src:fragref> @@ -8193,4 +8270,4 @@ </appendix> -</book> +</book> \ No newline at end of file http://cvs.php.net/diff.php/phpdoc/xsl/docbook/html/param.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/html/param.xsl diff -u phpdoc/xsl/docbook/html/param.xsl:1.4 phpdoc/xsl/docbook/html/param.xsl:1.5 --- phpdoc/xsl/docbook/html/param.xsl:1.4 Fri Jul 15 04:27:51 2005 +++ phpdoc/xsl/docbook/html/param.xsl Fri Jul 15 05:18:34 2005 @@ -4,7 +4,7 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" exclude-result-prefixes="src" version="1.0"> <!-- ******************************************************************** - $Id: param.xsl,v 1.4 2005/07/15 08:27:51 techtonik Exp $ + $Id: param.xsl,v 1.5 2005/07/15 09:18:34 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -181,6 +181,7 @@ <xsl:param name="img.src.path"/> <xsl:param name="index.on.role" select="0"/> <xsl:param name="index.on.type" select="0"/> +<xsl:param name="index.prefer.titleabbrev" select="0"/> <xsl:param name="ignore.image.scaling" select="0"/> <xsl:param name="inherit.keywords" select="'1'"/> <xsl:param name="l10n.gentext.default.language" select="'en'"/> @@ -269,6 +270,7 @@ <xsl:param name="show.comments">1</xsl:param> <xsl:param name="show.revisionflag">0</xsl:param> +<xsl:param name="simplesect.in.toc" select="0"/> <xsl:param name="spacing.paras" select="'0'"/> <xsl:param name="suppress.footer.navigation">0</xsl:param> <xsl:param name="suppress.header.navigation">0</xsl:param> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/html/param.xweb?r1=1.3&r2=1.4&ty=u Index: phpdoc/xsl/docbook/html/param.xweb diff -u phpdoc/xsl/docbook/html/param.xweb:1.3 phpdoc/xsl/docbook/html/param.xweb:1.4 --- phpdoc/xsl/docbook/html/param.xweb:1.3 Fri Oct 1 12:32:08 2004 +++ phpdoc/xsl/docbook/html/param.xweb Fri Jul 15 05:18:34 2005 @@ -7,7 +7,7 @@ <bookinfo> <title>HTML Parameter Reference</title> <releaseinfo role="meta"> -$Id: param.xweb,v 1.3 2004/10/01 16:32:08 techtonik Exp $ +$Id: param.xweb,v 1.4 2005/07/15 09:18:34 techtonik Exp $ </releaseinfo> <author> <surname>Walsh</surname> @@ -94,6 +94,7 @@ &process.source.toc; &process.empty.source.toc; &bridgehead.in.toc; +&simplesect.in.toc; &manual.toc; &toc.list.type; &toc.section.depth; @@ -103,6 +104,7 @@ &generate.index; &index.on.type; &index.on.role; +&index.prefer.titleabbrev; </reference> <reference><title>Extensions</title> @@ -418,7 +420,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: param.xweb,v 1.3 2004/10/01 16:32:08 techtonik Exp $ + $Id: param.xweb,v 1.4 2005/07/15 09:18:34 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -563,6 +565,7 @@ <src:fragref linkend="img.src.path.frag"/> <src:fragref linkend="index.on.role.frag"/> <src:fragref linkend="index.on.type.frag"/> +<src:fragref linkend="index.prefer.titleabbrev.frag"/> <src:fragref linkend="ignore.image.scaling.frag"/> <src:fragref linkend="inherit.keywords.frag"/> <src:fragref linkend="l10n.gentext.default.language.frag"/> @@ -646,6 +649,7 @@ <src:fragref linkend="shade.verbatim.style.frag"/> <src:fragref linkend="show.comments.frag"/> <src:fragref linkend="show.revisionflag.frag"/> +<src:fragref linkend="simplesect.in.toc.frag"/> <src:fragref linkend="spacing.paras.frag"/> <src:fragref linkend="suppress.footer.navigation.frag"/> <src:fragref linkend="suppress.header.navigation.frag"/> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/html/profile-docbook.xsl?r1=1.3&r2=1.4&ty=u Index: phpdoc/xsl/docbook/html/profile-docbook.xsl diff -u phpdoc/xsl/docbook/html/profile-docbook.xsl:1.3 phpdoc/xsl/docbook/html/profile-docbook.xsl:1.4 --- phpdoc/xsl/docbook/html/profile-docbook.xsl:1.3 Fri Oct 1 12:32:08 2004 +++ phpdoc/xsl/docbook/html/profile-docbook.xsl Fri Jul 15 05:18:34 2005 @@ -6,7 +6,7 @@ <xsl:output method="html" encoding="ISO-8859-1" indent="no"/> <!-- ******************************************************************** - $Id: profile-docbook.xsl,v 1.3 2004/10/01 16:32:08 techtonik Exp $ + $Id: profile-docbook.xsl,v 1.4 2005/07/15 09:18:34 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -67,6 +67,7 @@ <xsl:include href="docbookng.xsl"/> <xsl:param name="stylesheet.result.type" select="'html'"/> +<xsl:param name="htmlhelp.output" select="0"/> <!-- ==================================================================== --> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/html/refentry.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/html/refentry.xsl diff -u phpdoc/xsl/docbook/html/refentry.xsl:1.4 phpdoc/xsl/docbook/html/refentry.xsl:1.5 --- phpdoc/xsl/docbook/html/refentry.xsl:1.4 Mon Jul 4 13:04:31 2005 +++ phpdoc/xsl/docbook/html/refentry.xsl Fri Jul 15 05:18:34 2005 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: refentry.xsl,v 1.4 2005/07/04 17:04:31 techtonik Exp $ + $Id: refentry.xsl,v 1.5 2005/07/15 09:18:34 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -46,6 +46,7 @@ <xsl:template match="reference/referenceinfo"></xsl:template> <xsl:template match="reference/title"></xsl:template> <xsl:template match="reference/subtitle"></xsl:template> +<xsl:template match="reference/titleabbrev"></xsl:template> <!-- ==================================================================== --> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/html/sections.xsl?r1=1.3&r2=1.4&ty=u Index: phpdoc/xsl/docbook/html/sections.xsl diff -u phpdoc/xsl/docbook/html/sections.xsl:1.3 phpdoc/xsl/docbook/html/sections.xsl:1.4 --- phpdoc/xsl/docbook/html/sections.xsl:1.3 Fri Oct 1 12:32:08 2004 +++ phpdoc/xsl/docbook/html/sections.xsl Fri Jul 15 05:18:34 2005 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: sections.xsl,v 1.3 2004/10/01 16:32:08 techtonik Exp $ + $Id: sections.xsl,v 1.4 2005/07/15 09:18:34 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -380,7 +380,16 @@ </xsl:variable> <!-- HTML H level is one higher than section level --> - <xsl:variable name="hlevel" select="$level + 1"/> + <xsl:variable name="hlevel"> + <xsl:choose> + <!-- highest valid HTML H level is H6; so anything nested deeper + than 5 levels down just becomes H6 --> + <xsl:when test="$level > 5">6</xsl:when> + <xsl:otherwise> + <xsl:value-of select="$level + 1"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> <xsl:element name="h{$hlevel}"> <xsl:attribute name="class"><xsl:value-of select="$class"/></xsl:attribute> <xsl:if test="$css.decoration != '0'"> @@ -484,6 +493,10 @@ <xsl:call-template name="section.subtitle"/> </xsl:template> +<xsl:template match="simplesect/subtitle" mode="titlepage.mode" priority="2"> + <xsl:call-template name="section.subtitle"/> +</xsl:template> + <xsl:template match="sect1/subtitle" mode="titlepage.mode" priority="2"> <xsl:call-template name="section.subtitle"/> </xsl:template> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/autotoc.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/fo/autotoc.xsl diff -u phpdoc/xsl/docbook/fo/autotoc.xsl:1.4 phpdoc/xsl/docbook/fo/autotoc.xsl:1.5 --- phpdoc/xsl/docbook/fo/autotoc.xsl:1.4 Fri Jul 15 04:27:48 2005 +++ phpdoc/xsl/docbook/fo/autotoc.xsl Fri Jul 15 05:18:37 2005 @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: autotoc.xsl,v 1.4 2005/07/15 08:27:48 techtonik Exp $ + $Id: autotoc.xsl,v 1.5 2005/07/15 09:18:37 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -314,7 +314,9 @@ <xsl:call-template name="toc.line"/> - <xsl:variable name="nodes" select="section|sect1|simplesect|refentry"/> + <xsl:variable name="nodes" select="section|sect1 + |simplesect[$simplesect.in.toc != 0] + |refentry"/> <xsl:if test="$toc.section.depth > 0 and $nodes"> <fo:block id="toc.{$cid}.{$id}" http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/ChangeLog?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/fo/ChangeLog diff -u phpdoc/xsl/docbook/fo/ChangeLog:1.4 phpdoc/xsl/docbook/fo/ChangeLog:1.5 --- phpdoc/xsl/docbook/fo/ChangeLog:1.4 Fri Jul 15 04:27:48 2005 +++ phpdoc/xsl/docbook/fo/ChangeLog Fri Jul 15 05:18:37 2005 @@ -1,3 +1,100 @@ +2004-12-02 Robert Stayton <bobstayton@users.sourceforge.net> + + * table.xsl: Added missing col parameter to table.cell.properties template. + +2004-11-27 Robert Stayton <bobstayton@users.sourceforge.net> + + * table.xsl: Inherited cell properties now passed to table.cell.properties template + so they can be overridden by a customization. + +2004-11-26 Robert Stayton <bobstayton@users.sourceforge.net> + + * table.xsl: Added support for bgcolor PI on table row element. + +2004-11-24 Robert Stayton <bobstayton@users.sourceforge.net> + + * titlepage.xsl: Fixed handling of abstract title. + +2004-11-23 Michael Smith <xmldoc@users.sourceforge.net> + + * autotoc.xsl: RFE #1069397 Add new parameter simplesect.in.toc + + - default value of 0 causes simplesect to be omitted from TOCs + - to cause simplesect to be included in TOCs, you must set the + value of simplesect.in.toc to 1 + + note from Norm: + + Simplesect elements aren't supposed to appear in the ToC at + all. Ugh. The Definitive Guide doesn't really explain that + very well. + + The use case for simplesect is when, for example, every + chapter in a book ends with "Exercises" or "For More + Information" sections and you don't want those to appear in + the ToC. + + * param.ent, param.xweb: RFE #1069397 Add new parameter simplesect.in.toc + + - default value of 0 causes simplesect to be omitted from TOCs + - to cause simplesect to be included in TOCs, you must set the + value of simplesect.in.toc to 1 + + note from Norm: + + Simplesect elements aren't supposed to appear in the ToC at + all. Ugh. The Definitive Guide doesn't really explain that + very well. + + The use case for simplesect is when, for example, every + chapter in a book ends with "Exercises" or "For More + Information" sections and you don't want those to appear in + the ToC. + +2004-11-21 Jirka Kosek <kosek@users.sourceforge.net> + + * sections.xsl: It is not possible to use variable reference in template match. I change it back and preserved intended semantics. But there might be more elegant way to do it, I did't have time to investigate it, I just wanted to process my document :-( + +2004-11-20 Michael Smith <xmldoc@users.sourceforge.net> + + * lists.xsl: bug #1007414 & patch #971730 - passivetex outputs "* 0.60 + 1em" + garbage in lists (reported by Alex Roitman and James William Pye) + + ::PROBLEM + Literal stuff "* 0.60 + 1em" showing up in listitem PDF output + generated through passivetex + + ::CAUSE + Logic that outputs non-constant size expressions like "4em * + 0.60 + 1em" was added to stylesheets to improve look of list + formatting. But passivetex can only handle constant sizes; so, + instead of doing the math, it spits out the literal expressions + in output. + + ::FIX + Added workaround - some conditional logic to fall back to + constant values if passivetex.extensions param is non-zero. + + ::AFFECTED AREAS + Should only affect FO output when passivetex.extensions is non-zero + +2004-11-18 Robert Stayton <bobstayton@users.sourceforge.net> + + * component.xsl: Moved the literal attributes from component.title to the + component.title.properties attribute-set so they can be customized. + +2004-11-17 Robert Stayton <bobstayton@users.sourceforge.net> + + * pi.xsl: Fix bug in dbfo-need for XEP output. + +2004-11-16 Robert Stayton <bobstayton@users.sourceforge.net> + + * lists.xsl: Added glossdef's first para to special handling in fo:list-item-body. + +2004-11-11 Robert Stayton <bobstayton@users.sourceforge.net> + + * sections.xsl: Fixed /section template to work with rootid parameter. + 2004-11-04 Robert Stayton <bobstayton@users.sourceforge.net> * formal.xsl: Fixed dbfo keep-together PI for tables. http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/component.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/fo/component.xsl diff -u phpdoc/xsl/docbook/fo/component.xsl:1.4 phpdoc/xsl/docbook/fo/component.xsl:1.5 --- phpdoc/xsl/docbook/fo/component.xsl:1.4 Fri Jul 15 04:27:48 2005 +++ phpdoc/xsl/docbook/fo/component.xsl Fri Jul 15 05:18:37 2005 @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: component.xsl,v 1.4 2005/07/15 08:27:48 techtonik Exp $ + $Id: component.xsl,v 1.5 2005/07/15 09:18:37 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -58,12 +58,7 @@ </fotex:bookmark> </xsl:if> - <fo:block keep-with-next.within-column="always" - space-before.optimum="{$body.font.master}pt" - space-before.minimum="{$body.font.master * 0.8}pt" - space-before.maximum="{$body.font.master * 1.2}pt" - hyphenate="false" - xsl:use-attribute-sets="component.title.properties"> + <fo:block xsl:use-attribute-sets="component.title.properties"> <xsl:if test="$pagewide != 0"> <!-- Doesn't work to use 'all' here since not a child of fo:flow --> <xsl:attribute name="span">inherit</xsl:attribute> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/lists.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/fo/lists.xsl diff -u phpdoc/xsl/docbook/fo/lists.xsl:1.4 phpdoc/xsl/docbook/fo/lists.xsl:1.5 --- phpdoc/xsl/docbook/fo/lists.xsl:1.4 Fri Jul 15 04:27:48 2005 +++ phpdoc/xsl/docbook/fo/lists.xsl Fri Jul 15 05:18:37 2005 @@ -4,7 +4,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: lists.xsl,v 1.4 2005/07/15 08:27:48 techtonik Exp $ + $Id: lists.xsl,v 1.5 2005/07/15 09:18:37 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -292,6 +292,9 @@ <xsl:template match="listitem/*[1][local-name()='para' or local-name()='simpara' or local-name()='formalpara'] + |glossdef/*[1][local-name()='para' or + local-name()='simpara' or + local-name()='formalpara'] |step/*[1][local-name()='para' or local-name()='simpara' or local-name()='formalpara'] @@ -359,18 +362,34 @@ </xsl:when> <xsl:otherwise> <xsl:value-of select="@termlength"/> + <xsl:choose> + <!-- workaround for passivetex lack of support for non-constant expressions --> + <xsl:when test="$passivetex.extensions != 0"> + <xsl:text>em</xsl:text> + </xsl:when> + <xsl:otherwise> <xsl:text>em * 0.60</xsl:text> </xsl:otherwise> </xsl:choose> + </xsl:otherwise> + </xsl:choose> </xsl:when> <xsl:otherwise> <xsl:call-template name="longest.term"> <xsl:with-param name="terms" select="varlistentry/term"/> <xsl:with-param name="maxlength" select="$variablelist.max.termlength"/> </xsl:call-template> + <xsl:choose> + <!-- workaround for passivetex lack of support for non-constant expressions --> + <xsl:when test="$passivetex.extensions != 0"> + <xsl:text>em</xsl:text> + </xsl:when> + <xsl:otherwise> <xsl:text>em * 0.60</xsl:text> </xsl:otherwise> </xsl:choose> + </xsl:otherwise> + </xsl:choose> </xsl:variable> <!-- @@ -381,6 +400,19 @@ --> <xsl:variable name="label-separation">1em</xsl:variable> + <xsl:variable name="distance-between-starts"> + <xsl:choose> + <!-- workaround for passivetex lack of support for non-constant expressions --> + <xsl:when test="$passivetex.extensions != 0"> + <xsl:value-of select="$termlength"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$termlength"/> + <xsl:text>+</xsl:text> + <xsl:value-of select="$label-separation"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> <xsl:if test="title"> <xsl:apply-templates select="title" mode="list.title.mode"/> @@ -406,7 +438,7 @@ <xsl:when test="ancestor::listitem"> <fo:list-block id="{$id}" provisional-distance-between-starts= - "{$termlength}+{$label-separation}" + "{$distance-between-starts}" provisional-label-separation="{$label-separation}"> <xsl:copy-of select="$content"/> </fo:list-block> @@ -414,7 +446,7 @@ <xsl:otherwise> <fo:list-block id="{$id}" provisional-distance-between-starts= - "{$termlength}+{$label-separation}" + "{$distance-between-starts}" provisional-label-separation="{$label-separation}" xsl:use-attribute-sets="list.block.spacing"> <xsl:copy-of select="$content"/> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/param.ent?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/fo/param.ent diff -u phpdoc/xsl/docbook/fo/param.ent:1.4 phpdoc/xsl/docbook/fo/param.ent:1.5 --- phpdoc/xsl/docbook/fo/param.ent:1.4 Fri Jul 15 04:27:48 2005 +++ phpdoc/xsl/docbook/fo/param.ent Fri Jul 15 05:18:37 2005 @@ -199,6 +199,7 @@ <!ENTITY default.image.width SYSTEM "../params/default.image.width.xml"> <!ENTITY default.float.class SYSTEM "../params/default.float.class.xml"> <!ENTITY bridgehead.in.toc SYSTEM "../params/bridgehead.in.toc.xml"> +<!ENTITY simplesect.in.toc SYSTEM "../params/simplesect.in.toc.xml"> <!ENTITY generate.section.toc.level SYSTEM "../params/generate.section.toc.level.xml"> <!ENTITY table.cell.border.color SYSTEM "../params/table.cell.border.color.xml"> <!ENTITY table.cell.border.style SYSTEM "../params/table.cell.border.style.xml"> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/param.xml?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/fo/param.xml diff -u phpdoc/xsl/docbook/fo/param.xml:1.4 phpdoc/xsl/docbook/fo/param.xml:1.5 --- phpdoc/xsl/docbook/fo/param.xml:1.4 Fri Jul 15 04:27:48 2005 +++ phpdoc/xsl/docbook/fo/param.xml Fri Jul 15 05:18:37 2005 @@ -5,7 +5,7 @@ <bookinfo> <title>FO Parameter Reference</title> <releaseinfo role="meta"> -$Id: param.xml,v 1.4 2005/07/15 08:27:48 techtonik Exp $ +$Id: param.xml,v 1.5 2005/07/15 09:18:37 techtonik Exp $ </releaseinfo> <author> <surname>Walsh</surname> @@ -481,7 +481,7 @@ </refmeta> <refnamediv> <refname>process.empty.source.toc</refname> -<refpurpose>FIXME:</refpurpose> +<refpurpose>Generate automated TOC if <sgmltag>toc</sgmltag> element occurs in a source document?</refpurpose> </refnamediv> <refsynopsisdiv> @@ -490,7 +490,19 @@ <refsect1><title>Description</title> -<para>FIXME: +<para>Specifies that if an empty <sgmltag>toc</sgmltag> element is +found in a source document, an automated TOC is generated. +<note> + <para>Depending on what the value of the + <parameter moreinfo="none">generate.toc</parameter> parameter is, setting this + parameter to <literal moreinfo="none">1</literal> could result in generation of + duplicate automated TOCs. So the + <parameter moreinfo="none">process.empty.source.toc</parameter> is primarily useful + as an "override": by placing an empty <sgmltag>toc</sgmltag> in your + document and setting this parameter to <literal moreinfo="none">1</literal>, you can + force a TOC to be generated even if <sgmltag>generate.toc</sgmltag> + says not to.</para> +</note> </para> </refsect1> @@ -503,7 +515,7 @@ </refmeta> <refnamediv> <refname>process.source.toc</refname> -<refpurpose>FIXME:</refpurpose> +<refpurpose>Process a non-empty <sgmltag>toc</sgmltag> element if it occurs in a source document?</refpurpose> </refnamediv> <refsynopsisdiv> @@ -512,7 +524,20 @@ <refsect1><title>Description</title> -<para>FIXME: +<para>Specifies that the contents of a non-empty "hard-coded" +<sgmltag>toc</sgmltag> element in a source document are processed to +generate a TOC in output. +<note> + <para>This parameter has no effect on automated generation of + TOCs. An automated TOC may still be generated along with the + "hard-coded" TOC. To suppress automated TOC generation, adjust the + value of the <parameter moreinfo="none">generate.toc</parameter> paramameter.</para> + + <para>The <sgmltag>process.source.toc</sgmltag> parameter also has + no effect if the <sgmltag>toc</sgmltag> element is empty; handling + for empty <sgmltag>toc</sgmltag> is controlled by the + <parameter moreinfo="none">process.empty.source.toc</parameter> parameter.</para> +</note> </para> </refsect1> @@ -939,6 +964,28 @@ </refsect1> </refentry> +<refentry id="simplesect.in.toc"> +<refmeta> +<refentrytitle>simplesect.in.toc</refentrytitle> +<refmiscinfo role="type">boolean</refmiscinfo> +</refmeta> +<refnamediv> +<refname>simplesect.in.toc</refname> +<refpurpose>Should <sgmltag>simplesect</sgmltag> elements appear in the TOC?</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<programlisting id="simplesect.in.toc.frag"><xsl:param name="simplesect.in.toc" select="0"></xsl:param></programlisting> +</refsynopsisdiv> + +<refsect1><title>Description</title> + +<para>If non-zero, <sgmltag>simplesect</sgmltag>s appear in the TOC. +</para> + +</refsect1> +</refentry> + <refentry id="generate.section.toc.level"> <refmeta> <refentrytitle>generate.section.toc.level</refentrytitle> @@ -3517,7 +3564,7 @@ </refmeta> <refnamediv> <refname>formal.title.placement</refname> -<refpurpose/> +<refpurpose>Specifies where formal object titles should occur</refpurpose> </refnamediv> <refsynopsisdiv> @@ -4056,7 +4103,9 @@ </refmeta> <refnamediv> <refname>menuchoice.separator</refname> -<refpurpose/> +<refpurpose>Separator between items of a <sgmltag>menuchoice</sgmltag> +other than <sgmltag>guimenuitem</sgmltag> and +<sgmltag>guisubmenu</sgmltag></refpurpose> </refnamediv> <refsynopsisdiv> @@ -4082,7 +4131,9 @@ </refmeta> <refnamediv> <refname>menuchoice.menu.separator</refname> -<refpurpose/> +<refpurpose>Separator between items of a <sgmltag>menuchoice</sgmltag> +with <sgmltag>guimenuitem</sgmltag> or +<sgmltag>guisubmenu</sgmltag></refpurpose> </refnamediv> <refsynopsisdiv> @@ -4179,7 +4230,7 @@ </refmeta> <refnamediv> <refname>footnote.number.symbols</refname> -<refpurpose/> +<refpurpose>Special characters to use as footnote markers</refpurpose> </refnamediv> <refsynopsisdiv> @@ -4214,7 +4265,7 @@ </refmeta> <refnamediv> <refname>table.footnote.number.symbols</refname> -<refpurpose/> +<refpurpose>Special characters to use a footnote markers in tables</refpurpose> </refnamediv> <refsynopsisdiv> @@ -6621,7 +6672,13 @@ <refsynopsisdiv> <programlisting id="component.title.properties.frag"> -<xsl:attribute-set name="component.title.properties"></xsl:attribute-set> +<xsl:attribute-set name="component.title.properties"> + <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute> + <xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master, 'pt')"></xsl:value-of></xsl:attribute> + <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt * 0.8')"></xsl:value-of></xsl:attribute> + <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt * 1.2')"></xsl:value-of></xsl:attribute> + <xsl:attribute name="hyphenate">false</xsl:attribute> +</xsl:attribute-set> </programlisting> </refsynopsisdiv> @@ -8224,7 +8281,7 @@ <!-- This file is generated from param.xweb; do not edit this file! --> <!-- ******************************************************************** - $Id: param.xml,v 1.4 2005/07/15 08:27:48 techtonik Exp $ + $Id: param.xml,v 1.5 2005/07/15 09:18:37 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -8447,6 +8504,7 @@ <src:fragref linkend="shade.verbatim.style.frag"></src:fragref> <src:fragref linkend="show.comments.frag"></src:fragref> <src:fragref linkend="sidebar.properties.frag"></src:fragref> +<src:fragref linkend="simplesect.in.toc.frag"></src:fragref> <src:fragref linkend="subscript.properties.frag"></src:fragref> <src:fragref linkend="superscript.properties.frag"></src:fragref> <src:fragref linkend="symbol.font.family.frag"></src:fragref> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/param.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/fo/param.xsl diff -u phpdoc/xsl/docbook/fo/param.xsl:1.4 phpdoc/xsl/docbook/fo/param.xsl:1.5 --- phpdoc/xsl/docbook/fo/param.xsl:1.4 Fri Jul 15 04:27:49 2005 +++ phpdoc/xsl/docbook/fo/param.xsl Fri Jul 15 05:18:39 2005 @@ -3,7 +3,7 @@ <!-- This file is generated from param.xweb; do not edit this file! --> <!-- ******************************************************************** - $Id: param.xsl,v 1.4 2005/07/15 08:27:49 techtonik Exp $ + $Id: param.xsl,v 1.5 2005/07/15 09:18:39 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -82,7 +82,13 @@ <xsl:attribute name="space-before.maximum">0.2em</xsl:attribute> </xsl:attribute-set> <xsl:param name="component.label.includes.part.label" select="0"/> -<xsl:attribute-set name="component.title.properties"/> +<xsl:attribute-set name="component.title.properties"> + <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute> + <xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute> + <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt * 0.8')"/></xsl:attribute> + <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt * 1.2')"/></xsl:attribute> + <xsl:attribute name="hyphenate">false</xsl:attribute> +</xsl:attribute-set> <xsl:param name="current.docid" select="''"/> <xsl:param name="default.float.class" select="'before'"/> <xsl:param name="default.image.width" select="''"/> @@ -594,6 +600,7 @@ <xsl:attribute name="margin-bottom">6pt</xsl:attribute> --> </xsl:attribute-set> +<xsl:param name="simplesect.in.toc" select="0"/> <xsl:attribute-set name="subscript.properties"> <xsl:attribute name="font-size">75%</xsl:attribute> </xsl:attribute-set> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/param.xweb?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/fo/param.xweb diff -u phpdoc/xsl/docbook/fo/param.xweb:1.4 phpdoc/xsl/docbook/fo/param.xweb:1.5 --- phpdoc/xsl/docbook/fo/param.xweb:1.4 Fri Jul 15 04:27:49 2005 +++ phpdoc/xsl/docbook/fo/param.xweb Fri Jul 15 05:18:39 2005 @@ -7,7 +7,7 @@ <bookinfo> <title>FO Parameter Reference</title> <releaseinfo role="meta"> -$Id: param.xweb,v 1.4 2005/07/15 08:27:49 techtonik Exp $ +$Id: param.xweb,v 1.5 2005/07/15 09:18:39 techtonik Exp $ </releaseinfo> <author> <surname>Walsh</surname> @@ -97,6 +97,7 @@ &toc.indent.width; &toc.margin.properties; &bridgehead.in.toc; +&simplesect.in.toc; &generate.section.toc.level; <!-- @@ -492,7 +493,7 @@ <!-- This file is generated from param.xweb; do not edit this file! --> <!-- ******************************************************************** - $Id: param.xweb,v 1.4 2005/07/15 08:27:49 techtonik Exp $ + $Id: param.xweb,v 1.5 2005/07/15 09:18:39 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -715,6 +716,7 @@ <src:fragref linkend="shade.verbatim.style.frag"/> <src:fragref linkend="show.comments.frag"/> <src:fragref linkend="sidebar.properties.frag"/> +<src:fragref linkend="simplesect.in.toc.frag"/> <src:fragref linkend="subscript.properties.frag"/> <src:fragref linkend="superscript.properties.frag"/> <src:fragref linkend="symbol.font.family.frag"/> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/pi.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/fo/pi.xsl diff -u phpdoc/xsl/docbook/fo/pi.xsl:1.4 phpdoc/xsl/docbook/fo/pi.xsl:1.5 --- phpdoc/xsl/docbook/fo/pi.xsl:1.4 Fri Jul 15 04:27:49 2005 +++ phpdoc/xsl/docbook/fo/pi.xsl Fri Jul 15 05:18:39 2005 @@ -4,7 +4,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: pi.xsl,v 1.4 2005/07/15 08:27:49 techtonik Exp $ + $Id: pi.xsl,v 1.5 2005/07/15 09:18:39 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -193,7 +193,7 @@ <xsl:variable name="spacer"> <fo:block-container width="100%" height="{$height}"> - <fo:block/> + <fo:block><fo:leader leader-length="0pt"/></fo:block> </fo:block-container> </xsl:variable> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/sections.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/fo/sections.xsl diff -u phpdoc/xsl/docbook/fo/sections.xsl:1.4 phpdoc/xsl/docbook/fo/sections.xsl:1.5 --- phpdoc/xsl/docbook/fo/sections.xsl:1.4 Fri Jul 15 04:27:49 2005 +++ phpdoc/xsl/docbook/fo/sections.xsl Fri Jul 15 05:18:39 2005 @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: sections.xsl,v 1.4 2005/07/15 08:27:49 techtonik Exp $ + $Id: sections.xsl,v 1.5 2005/07/15 09:18:39 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -17,6 +17,11 @@ <!-- ==================================================================== --> <xsl:template match="section"> + <xsl:choose> + <xsl:when test="$rootid = @id"> + <xsl:call-template name="section.page.sequence"/> + </xsl:when> + <xsl:otherwise> <xsl:variable name="id"> <xsl:call-template name="object.id"/> </xsl:variable> @@ -82,6 +87,8 @@ </fo:block> </xsl:otherwise> </xsl:choose> + </xsl:otherwise> + </xsl:choose> </xsl:template> <xsl:template name="section.content"> @@ -104,7 +111,7 @@ <xsl:apply-templates/> </xsl:template> -<xsl:template match="/section"> +<xsl:template match="section[not(parent::*)]" name="section.page.sequence"> <xsl:variable name="id"> <xsl:call-template name="object.id"> <xsl:with-param name="object" select="ancestor::reference"/> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/table.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/fo/table.xsl diff -u phpdoc/xsl/docbook/fo/table.xsl:1.4 phpdoc/xsl/docbook/fo/table.xsl:1.5 --- phpdoc/xsl/docbook/fo/table.xsl:1.4 Fri Jul 15 04:27:49 2005 +++ phpdoc/xsl/docbook/fo/table.xsl Fri Jul 15 05:18:39 2005 @@ -12,7 +12,7 @@ <xsl:include href="../common/table.xsl"/> <!-- ******************************************************************** - $Id: table.xsl,v 1.4 2005/07/15 08:27:49 techtonik Exp $ + $Id: table.xsl,v 1.5 2005/07/15 09:18:39 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -24,7 +24,7 @@ <doc:reference xmlns=""> <referenceinfo> <releaseinfo role="meta"> -$Id: table.xsl,v 1.4 2005/07/15 08:27:49 techtonik Exp $ +$Id: table.xsl,v 1.5 2005/07/15 09:18:39 techtonik Exp $ </releaseinfo> <author><surname>Walsh</surname> <firstname>Norman</firstname></author> @@ -283,8 +283,20 @@ <xsl:template match="row"> <xsl:param name="spans"/> + <xsl:variable name="bgcolor"> + <xsl:call-template name="dbfo-attribute"> + <xsl:with-param name="pis" select="processing-instruction('dbfo')"/> + <xsl:with-param name="attribute" select="'bgcolor'"/> + </xsl:call-template> + </xsl:variable> + <fo:table-row> <xsl:call-template name="anchor"/> + <xsl:if test="$bgcolor != ''"> + <xsl:attribute name="background-color"> + <xsl:value-of select="$bgcolor"/> + </xsl:attribute> + </xsl:if> <xsl:apply-templates select="(entry|entrytbl)[1]"> <xsl:with-param name="spans" select="$spans"/> @@ -540,32 +552,18 @@ </xsl:variable> <fo:table-cell xsl:use-attribute-sets="table.cell.padding"> - <xsl:call-template name="table.cell.properties"/> - <xsl:if test="$xep.extensions != 0"> - <!-- Suggested by RenderX to workaround a bug in their implementation --> - <!-- <xsl:attribute name="keep-together.within-column">always</xsl:attribute> --> - </xsl:if> - - <xsl:if test="$bgcolor != ''"> - <xsl:attribute name="background-color"> - <xsl:value-of select="$bgcolor"/> - </xsl:attribute> - </xsl:if> + <xsl:call-template name="table.cell.properties"> + <xsl:with-param name="bgcolor.pi" select="$bgcolor"/> + <xsl:with-param name="rowsep.inherit" select="$rowsep"/> + <xsl:with-param name="colsep.inherit" select="$colsep"/> + <xsl:with-param name="col" select="$col"/> + <xsl:with-param name="valign.inherit" select="$valign"/> + <xsl:with-param name="align.inherit" select="$align"/> + <xsl:with-param name="char.inherit" select="$char"/> + </xsl:call-template> <xsl:call-template name="anchor"/> - <xsl:if test="$rowsep > 0"> - <xsl:call-template name="border"> - <xsl:with-param name="side" select="'bottom'"/> - </xsl:call-template> - </xsl:if> - - <xsl:if test="$colsep > 0 and $col < ancestor::tgroup/@cols"> - <xsl:call-template name="border"> - <xsl:with-param name="side" select="'right'"/> - </xsl:call-template> - </xsl:if> - <xsl:if test="@morerows"> <xsl:attribute name="number-rows-spanned"> <xsl:value-of select="@morerows+1"/> @@ -578,36 +576,6 @@ </xsl:attribute> </xsl:if> - <xsl:if test="$valign != ''"> - <xsl:attribute name="display-align"> - <xsl:choose> - <xsl:when test="$valign='top'">before</xsl:when> - <xsl:when test="$valign='middle'">center</xsl:when> - <xsl:when test="$valign='bottom'">after</xsl:when> - <xsl:otherwise> - <xsl:message> - <xsl:text>Unexpected valign value: </xsl:text> - <xsl:value-of select="$valign"/> - <xsl:text>, center used.</xsl:text> - </xsl:message> - <xsl:text>center</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:attribute> - </xsl:if> - - <xsl:if test="$align != ''"> - <xsl:attribute name="text-align"> - <xsl:value-of select="$align"/> - </xsl:attribute> - </xsl:if> - - <xsl:if test="$char != ''"> - <xsl:attribute name="text-align"> - <xsl:value-of select="$char"/> - </xsl:attribute> - </xsl:if> - <!-- <xsl:if test="@charoff"> <xsl:attribute name="charoff"> @@ -654,6 +622,63 @@ <!-- Expand this template to add properties to any fo:table-cell --> <xsl:template name="table.cell.properties"> + <xsl:param name="bgcolor.pi" select="''"/> + <xsl:param name="rowsep.inherit" select="1"/> + <xsl:param name="colsep.inherit" select="1"/> + <xsl:param name="col" select="1"/> + <xsl:param name="valign.inherit" select="''"/> + <xsl:param name="align.inherit" select="''"/> + <xsl:param name="char.inherit" select="''"/> + + <xsl:if test="$bgcolor.pi != ''"> + <xsl:attribute name="background-color"> + <xsl:value-of select="$bgcolor.pi"/> + </xsl:attribute> + </xsl:if> + + <xsl:if test="$rowsep.inherit > 0"> + <xsl:call-template name="border"> + <xsl:with-param name="side" select="'bottom'"/> + </xsl:call-template> + </xsl:if> + + <xsl:if test="$colsep.inherit > 0 and + $col < ancestor::tgroup/@cols"> + <xsl:call-template name="border"> + <xsl:with-param name="side" select="'right'"/> + </xsl:call-template> + </xsl:if> + + <xsl:if test="$valign.inherit != ''"> + <xsl:attribute name="display-align"> + <xsl:choose> + <xsl:when test="$valign.inherit='top'">before</xsl:when> + <xsl:when test="$valign.inherit='middle'">center</xsl:when> + <xsl:when test="$valign.inherit='bottom'">after</xsl:when> + <xsl:otherwise> + <xsl:message> + <xsl:text>Unexpected valign value: </xsl:text> + <xsl:value-of select="$valign.inherit"/> + <xsl:text>, center used.</xsl:text> + </xsl:message> + <xsl:text>center</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:attribute> + </xsl:if> + + <xsl:if test="$align.inherit != ''"> + <xsl:attribute name="text-align"> + <xsl:value-of select="$align.inherit"/> + </xsl:attribute> + </xsl:if> + + <xsl:if test="$char.inherit != ''"> + <xsl:attribute name="text-align"> + <xsl:value-of select="$char.inherit"/> + </xsl:attribute> + </xsl:if> + </xsl:template> <!-- Expand this template to add properties to any cell's block --> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/titlepage.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/fo/titlepage.xsl diff -u phpdoc/xsl/docbook/fo/titlepage.xsl:1.4 phpdoc/xsl/docbook/fo/titlepage.xsl:1.5 --- phpdoc/xsl/docbook/fo/titlepage.xsl:1.4 Fri Jul 15 04:27:49 2005 +++ phpdoc/xsl/docbook/fo/titlepage.xsl Fri Jul 15 05:18:39 2005 @@ -4,7 +4,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: titlepage.xsl,v 1.4 2005/07/15 08:27:49 techtonik Exp $ + $Id: titlepage.xsl,v 1.5 2005/07/15 09:18:39 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -180,9 +180,11 @@ <xsl:template match="abstract" mode="titlepage.mode"> <fo:block> - <xsl:if test="title"> <!-- FIXME: add param for using default title? --> - <xsl:call-template name="formal.object.heading"/> - </xsl:if> + <xsl:call-template name="formal.object.heading"> + <xsl:with-param name="title"> + <xsl:apply-templates select="." mode="title.markup"/> + </xsl:with-param> + </xsl:call-template> <xsl:apply-templates mode="titlepage.mode"/> </fo:block> </xsl:template> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/common/ChangeLog?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/common/ChangeLog diff -u phpdoc/xsl/docbook/common/ChangeLog:1.4 phpdoc/xsl/docbook/common/ChangeLog:1.5 --- phpdoc/xsl/docbook/common/ChangeLog:1.4 Fri Jul 15 04:27:51 2005 +++ phpdoc/xsl/docbook/common/ChangeLog Fri Jul 15 05:18:39 2005 @@ -1,3 +1,16 @@ +2004-11-18 Robert Stayton <bobstayton@users.sourceforge.net> + + * l10n.xsl: Fixed bug in lang selection from ancestor-or-self predicate. + +2004-11-17 Robert Stayton <bobstayton@users.sourceforge.net> + + * common.xsl: Fixed bug in strippath template that stripped leading double dots. + +2004-11-16 Michael Smith <xmldoc@users.sourceforge.net> + + * labels.xsl: issue #924251 Wrong numbering of Qandaset entries + applied patch from Harald Joerg. + 2004-10-28 Norman Walsh <nwalsh@users.sourceforge.net> * titles.xsl: Fix bug #663552: handle xref correctly when it appears in titles. @@ -179,7 +192,7 @@ 2003-11-30 Robert Stayton <bobstayton@users.sourceforge.net> * gentext.xsl, labels.xsl, subtitles.xsl, table.xsl, targets.xsl, titles.xsl: - Added CVS $Id: ChangeLog,v 1.4 2005/07/15 08:27:51 techtonik Exp $ comment. + Added CVS $Id: ChangeLog,v 1.5 2005/07/15 09:18:39 techtonik Exp $ comment. 2003-11-17 Robert Stayton <bobstayton@users.sourceforge.net> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/common/common.xsl?r1=1.3&r2=1.4&ty=u Index: phpdoc/xsl/docbook/common/common.xsl diff -u phpdoc/xsl/docbook/common/common.xsl:1.3 phpdoc/xsl/docbook/common/common.xsl:1.4 --- phpdoc/xsl/docbook/common/common.xsl:1.3 Fri Oct 1 12:32:08 2004 +++ phpdoc/xsl/docbook/common/common.xsl Fri Jul 15 05:18:39 2005 @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: common.xsl,v 1.3 2004/10/01 16:32:08 techtonik Exp $ + $Id: common.xsl,v 1.4 2005/07/15 09:18:39 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -19,7 +19,7 @@ <doc:reference xmlns=""> <referenceinfo> <releaseinfo role="meta"> -$Id: common.xsl,v 1.3 2004/10/01 16:32:08 techtonik Exp $ +$Id: common.xsl,v 1.4 2005/07/15 09:18:39 techtonik Exp $ </releaseinfo> <author><surname>Walsh</surname> <firstname>Norman</firstname></author> @@ -1724,6 +1724,13 @@ <xsl:template name="strippath"> <xsl:param name="filename" select="''"/> <xsl:choose> + <!-- Leading .. are not eliminated --> + <xsl:when test="starts-with($filename, '../')"> + <xsl:value-of select="'../'"/> + <xsl:call-template name="strippath"> + <xsl:with-param name="filename" select="substring-after($filename, '../')"/> + </xsl:call-template> + </xsl:when> <xsl:when test="contains($filename, '/../')"> <xsl:call-template name="strippath"> <xsl:with-param name="filename"> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/common/l10n.xsl?r1=1.3&r2=1.4&ty=u Index: phpdoc/xsl/docbook/common/l10n.xsl diff -u phpdoc/xsl/docbook/common/l10n.xsl:1.3 phpdoc/xsl/docbook/common/l10n.xsl:1.4 --- phpdoc/xsl/docbook/common/l10n.xsl:1.3 Fri Oct 1 12:32:09 2004 +++ phpdoc/xsl/docbook/common/l10n.xsl Fri Jul 15 05:18:39 2005 @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: l10n.xsl,v 1.3 2004/10/01 16:32:09 techtonik Exp $ + $Id: l10n.xsl,v 1.4 2005/07/15 09:18:39 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -32,7 +32,7 @@ <!-- can't do this one step: attributes are unordered! --> <xsl:variable name="lang-scope" select="$target/ancestor-or-self::* - [@lang or @xml:lang][last()]"/> + [@lang or @xml:lang][1]"/> <xsl:variable name="lang-attr" select="($lang-scope/@lang | $lang-scope/@xml:lang)[1]"/> <xsl:choose> @@ -49,7 +49,7 @@ <!-- can't do this one step: attributes are unordered! --> <xsl:variable name="lang-scope" select="$target/ancestor-or-self::* - [@lang or @xml:lang][last()]"/> + [@lang or @xml:lang][1]"/> <xsl:variable name="lang-attr" select="($lang-scope/@lang | $lang-scope/@xml:lang)[1]"/> @@ -119,7 +119,7 @@ <!-- can't do this one step: attributes are unordered! --> <xsl:variable name="lang-scope" select="$node/ancestor-or-self::* - [@lang or @xml:lang][last()]"/> + [@lang or @xml:lang][1]"/> <xsl:variable name="lang-attr" select="($lang-scope/@lang | $lang-scope/@xml:lang)[1]"/> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/common/labels.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/common/labels.xsl diff -u phpdoc/xsl/docbook/common/labels.xsl:1.4 phpdoc/xsl/docbook/common/labels.xsl:1.5 --- phpdoc/xsl/docbook/common/labels.xsl:1.4 Fri Jul 15 04:27:51 2005 +++ phpdoc/xsl/docbook/common/labels.xsl Fri Jul 15 05:18:39 2005 @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: labels.xsl,v 1.4 2005/07/15 08:27:51 techtonik Exp $ + $Id: labels.xsl,v 1.5 2005/07/15 09:18:39 techtonik Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -485,15 +485,17 @@ <xsl:variable name="prefix"> <xsl:if test="$qanda.inherit.numeration != 0"> - <xsl:if test="$lparent.prefix != ''"> - <xsl:apply-templates select="$lparent" mode="label.markup"/> - <xsl:apply-templates select="$lparent" mode="intralabel.punctuation"/> - </xsl:if> - <xsl:if test="ancestor::qandadiv"> + <xsl:choose> + <xsl:when test="ancestor::qandadiv"> <xsl:apply-templates select="ancestor::qandadiv[1]" mode="label.markup"/> <xsl:apply-templates select="ancestor::qandadiv[1]" mode="intralabel.punctuation"/> - </xsl:if> + </xsl:when> + <xsl:when test="$lparent.prefix != ''"> + <xsl:apply-templates select="$lparent" mode="label.markup"/> + <xsl:apply-templates select="$lparent" mode="intralabel.punctuation"/> + </xsl:when> + </xsl:choose> </xsl:if> </xsl:variable> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/htmlhelp/ChangeLog?r1=1.1&r2=1.2&ty=u Index: phpdoc/xsl/docbook/htmlhelp/ChangeLog diff -u phpdoc/xsl/docbook/htmlhelp/ChangeLog:1.1 phpdoc/xsl/docbook/htmlhelp/ChangeLog:1.2 --- phpdoc/xsl/docbook/htmlhelp/ChangeLog:1.1 Fri Oct 1 12:32:09 2004 +++ phpdoc/xsl/docbook/htmlhelp/ChangeLog Fri Jul 15 05:18:39 2005 @@ -1,3 +1,7 @@ +2004-11-17 Jirka Kosek <kosek@users.sourceforge.net> + + * htmlhelp-common.xsl: Removed reference to index HTML pages from manifest if the output format is HTML Help + 2004-08-19 Jirka Kosek <kosek@users.sourceforge.net> * htmlhelp-common.xsl: Added several patches from W. Borgert http://cvs.php.net/diff.php/phpdoc/xsl/docbook/htmlhelp/htmlhelp-common.xsl?r1=1.2&r2=1.3&ty=u Index: phpdoc/xsl/docbook/htmlhelp/htmlhelp-common.xsl diff -u phpdoc/xsl/docbook/htmlhelp/htmlhelp-common.xsl:1.2 phpdoc/xsl/docbook/htmlhelp/htmlhelp-common.xsl:1.3 --- phpdoc/xsl/docbook/htmlhelp/htmlhelp-common.xsl:1.2 Mon Jul 4 12:53:26 2005 +++ phpdoc/xsl/docbook/htmlhelp/htmlhelp-common.xsl Fri Jul 15 05:18:39 2005 @@ -8,7 +8,7 @@ exclude-result-prefixes="doc exsl set h"> <!-- ******************************************************************** - $Id: htmlhelp-common.xsl,v 1.2 2005/07/04 16:53:26 techtonik Exp $ + $Id: htmlhelp-common.xsl,v 1.3 2005/07/15 09:18:39 techtonik Exp $ ******************************************************************** --> <!-- ==================================================================== --> @@ -20,6 +20,9 @@ <xsl:variable name="htmlhelp.generate.index" select="//indexterm[1]"/> +<!-- Set up HTML Help flag --> +<xsl:variable name="htmlhelp.output" select="1"/> + <xsl:variable name="raw.help.title"> <xsl:choose> <xsl:when test="$htmlhelp.title = ''"> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/htmlhelp/profile-htmlhelp-common.xsl?r1=1.2&r2=1.3&ty=u Index: phpdoc/xsl/docbook/htmlhelp/profile-htmlhelp-common.xsl diff -u phpdoc/xsl/docbook/htmlhelp/profile-htmlhelp-common.xsl:1.2 phpdoc/xsl/docbook/htmlhelp/profile-htmlhelp-common.xsl:1.3 --- phpdoc/xsl/docbook/htmlhelp/profile-htmlhelp-common.xsl:1.2 Mon Jul 4 12:54:22 2005 +++ phpdoc/xsl/docbook/htmlhelp/profile-htmlhelp-common.xsl Fri Jul 15 05:18:39 2005 @@ -4,7 +4,7 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns:exsl="http://exslt.org/common" xmlns:set="http://exslt.org/sets" xmlns:h="urn:x-hex" xmlns:exslt="http://exslt.org/common" exslt:dummy="dummy" extension-element-prefixes="exslt" version="1.0" exclude-result-prefixes="doc exsl set h exslt"> <!-- ******************************************************************** - $Id: profile-htmlhelp-common.xsl,v 1.2 2005/07/04 16:54:22 techtonik Exp $ + $Id: profile-htmlhelp-common.xsl,v 1.3 2005/07/15 09:18:39 techtonik Exp $ ******************************************************************** --> <!-- ==================================================================== --> @@ -16,6 +16,9 @@ <xsl:variable name="htmlhelp.generate.index" select="//indexterm[1]"/> +<!-- Set up HTML Help flag --> +<xsl:variable name="htmlhelp.output" select="1"/> + <xsl:variable name="raw.help.title"> <xsl:choose> <xsl:when test="$htmlhelp.title = ''"> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/RELEASE-NOTES.txt?r1=1.1&r2=1.2&ty=u Index: phpdoc/xsl/docbook/RELEASE-NOTES.txt diff -u phpdoc/xsl/docbook/RELEASE-NOTES.txt:1.1 phpdoc/xsl/docbook/RELEASE-NOTES.txt:1.2 --- phpdoc/xsl/docbook/RELEASE-NOTES.txt:1.1 Fri Jul 15 04:27:52 2005 +++ phpdoc/xsl/docbook/RELEASE-NOTES.txt Fri Jul 15 05:18:39 2005 @@ -2,18 +2,146 @@ DocBook Open Repository Team -$Id: RELEASE-NOTES.txt,v 1.1 2005/07/15 08:27:52 techtonik Exp $ +$Id: RELEASE-NOTES.txt,v 1.2 2005/07/15 09:18:39 techtonik Exp $ -10 November 2004 +01 December 2004 ------------------------------------------------------------------------------- +Table of Contents + +Release 1.67.2 +Release 1.67.1 +Release 1.67.0 +Release 1.66.1 +Release 1.65.0 +Release 1.64.1 +Release 1.61.0 +Release 1.60.1 +Release 1.59.2 +Release 1.59.1 +Release 1.58.0 +Release 1.57.0 +Release 1.56.0 +Older releases + These are the release notes for the DocBook XSL Stylesheets. This file documents (mostly) changes to the public APIs. What, exactly, counts as a public API is still somewhat in question, but it includes at least the global parameters. -You may also be interested in the more detailed WhatsNew. +You may also be interested in the more detailed WhatsNew file. + +Release 1.67.2 + +This release fixes a table bug introduced in the 1.67.1 release. + +Release 1.67.1 + +This release includes a number of bug fixes; for details, see the WhatsNew +file. + +The following lists provide details about API and feature changes. + +FO + + * Tables: Inherited cell properties are now passed to the + table.cell.properties template so they can be overridden by a + customization. + + * Tables: Added support for bgcolor PI on table row element. + + * TOCs: Added new parameter simplesect.in.toc; default value of 0 causes + simplesect to be omitted from TOCs; to cause simplesect to be included in + TOCs, you must set the value of simplesect.in.toc to 1.Comment from Norm: + + Simplesect elements aren't supposed to appear in the ToC at all... The + use case for simplesect is when, for example, every chapter in a book + ends with "Exercises" or "For More Information" sections and you don't + want those to appear in the ToC. + + * Sections: Reverted change that caused a variable reference to be used in a + template match and rewrote code to preserve intended semantics. + + * Lists: Added workaround to prevent "* 0.60 + 1em" garbage in list output + from PassiveTeX + + * Moved the literal attributes from component.title to the + component.title.properties attribute-set so they can be customized. + + * Lists: Added glossdef's first para to special handling in + fo:list-item-body. + +HTML + + * TOCs: Added new parameter simplesect.in.toc; for details, see the list of + FO changes for this release. + + * Indexing: Added new parameter index.prefer.titleabbrev; when set to 1, + index references will use titleabbrev instead of title when available. + +HTML Help + + * Added support for generating windows-1252-encoded output using Saxon; for + more details, see the list of XSL Java extensions changes for this release. + +man pages + + * Replaced named/numeric character-entity references for non-breaking space + with groff equivalent (backslash-tilde). + +XSL Java extensions + + * Saxon extensions: Added the Windows1252 class. It extends Saxon 6.5.x with + the windows-1252 character set, which is particularly useful when + generating HTML Help for Western European Languages (code from Pontus + Haglund and contributed to the DocBook community by Sectra AB, Sweden). + + To use: + + 1. Make sure that the Saxon 6.5.x jar file and the jar file for the + DocBook XSL Java extensions are in your CLASSPATH + + 2. Create a DocBook XSL customization layer -- a file named + mystylesheet.xsl or whatever -- that, at a minimum, contains the + following: + + <xsl:stylesheet + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + version='1.0'> + <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl"/> + <xsl:output method="html" encoding="WINDOWS-1252" indent="no"/> + <xsl:param name="htmlhelp.encoding" select="WINDOWS-1252"></xsl:param> + <xsl:param name="chunker.output.encoding" select="WINDOWS-1252"></xsl:param> + <xsl:param name="saxon.character.representation" select="native"></xsl:param> + </xsl:stylesheet> + + Invoke Saxon with the encoding.windows-1252 Java system property set to + com.nwalsh.saxon.Windows1252; for example + + java \ + -Dencoding.windows-1252=com.nwalsh.saxon.Windows1252 \ + com.icl.saxon.StyleSheet \ + mydoc.xml mystylesheet.xsl + + Or, for a more complete "real world" case showing other options you'll + typically want to use: + + java \ + -Dencoding.windows-1252=com.nwalsh.saxon.Windows1252 \ + -Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl \ + -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl \ + -Djavax.xml.transform.TransformerFactory=com.icl.saxon.TransformerFactoryImpl \ + com.icl.saxon.StyleSheet \ + -x org.apache.xml.resolver.tools.ResolvingXMLReader \ + -y org.apache.xml.resolver.tools.ResolvingXMLReader \ + -r org.apache.xml.resolver.tools.CatalogResolver \ + mydoc.xml mystylesheet.xsl + + In both cases, the "mystylesheet.xsl" file should be a DocBook + customization layer containing the parameters show in step 2. + + * Saxon extensions: Removed Saxon 8 extensions from release package Release 1.67.0 @@ -590,7 +718,9 @@ * Fixed bug in html2xhtml.xsl that was causing the XHTML chunker to output HTML instead of XHTML. -Note +Older releases -Consult CVS archive for release notes on earlier releases +To view the release notes for older releases, see http://cvs.sourceforge.net/ +viewcvs.py/docbook/xsl/RELEASE-NOTES.xml. Be aware that there were no release +notes for releases prior to the 1.50.0 release. http://cvs.php.net/diff.php/phpdoc/xsl/docbook/VERSION?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/VERSION diff -u phpdoc/xsl/docbook/VERSION:1.4 phpdoc/xsl/docbook/VERSION:1.5 --- phpdoc/xsl/docbook/VERSION:1.4 Fri Jul 15 04:27:52 2005 +++ phpdoc/xsl/docbook/VERSION Fri Jul 15 05:18:39 2005 @@ -12,7 +12,7 @@ <fm:project> <fm:Project>DocBook</fm:Project> <fm:Branch>XSL Stylesheets</fm:Branch> - <fm:Version>1.67.0</fm:Version> + <fm:Version>1.67.2</fm:Version> <!-- <fm:License>MIT/X Consortium License</fm:License> --> @@ -30,12 +30,11 @@ <fm:Home-Page-URL>http://sourceforge.net/projects/docbook/</fm:Home-Page-URL> <fm:Gzipped-Tar-URL>http://prdownloads.sourceforge.net/docbook/docbook-xsl-{VERSION}.tar.gz?download</fm:Gzipped-Tar-URL> <fm:Zipped-Tar-URL>http://prdownloads.sourceforge.net/docbook/docbook-xsl-{VERSION}.zip?download</fm:Zipped-Tar-URL> + <fm:Bzipped-Tar-URL>http://prdownloads.sourceforge.net/docbook/docbook-xsl-{VERSION}.bz2?download</fm:Bzipped-Tar-URL> <fm:Changelog-URL>http://sourceforge.net/project/shownotes.php?release_id={SFRELID}</fm:Changelog-URL> <fm:CVS-URL>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/docbook/xsl/</fm:CVS-URL> <fm:Mailing-List-URL>http://lists.oasis-open.org/archives/docbook-apps/</fm:Mailing-List-URL> - <fm:Changes>This release fixes a number of bugs and adds a few - new features. For details, see the RELEASE-NOTES and WhatsNew - files in the distribution. + <fm:Changes>This release fixes a table bug introduced by the 1.67.1 release. </fm:Changes> </fm:project> @@ -58,7 +57,7 @@ <xsl:template match="fm:Changes"/> -<xsl:template match="fm:Gzipped-Tar-URL|fm:Zipped-Tar-URL"> +<xsl:template match="fm:Gzipped-Tar-URL|fm:Zipped-Tar-URL|fm:Bzipped-Tar-URL"> <xsl:value-of select="local-name(.)"/> <xsl:text>: </xsl:text> <xsl:value-of select="substring-before(., '{VERSION}')"/>