cvs: phpdoc /xsl/docbook RELEASE-NOTES.txt VERSION /xsl/docbook/common ChangeLog common.xsl l10n.xml labels.xsl titles.xsl tr.xml uk.xml
/xsl/docbook/fo ChangeLog admon.xsl autoidx.xsl autotoc.xsl biblio.xsl block.xsl component.xsl division.xsl docbook.xsl footnote.xsl formal.xsl
glossary.xsl htmltbl.xsl index.xsl lists.xsl pagesetup.xsl param.ent param.xml param.xsl param.xweb profile-docbook.xsl refentry.xsl sections.xsl
table.xsl toc.xsl verbatim.xsl xep.xsl xref.xsl /xsl/docbook/html ChangeLog admon.xsl autoidx.xsl autotoc.xsl changebars.xsl docbook.xsl param.xml
profile-docbook.xsl refentry.xsl xref.xsl /xsl/docbook/htmlhelp ChangeLog /xsl/docbook/lib ChangeLog

From:	anatoly techtonik	Date:	Sat, 16 Jul 2005 23:38:38 +0000
Subject:	cvs: phpdoc /xsl/docbook RELEASE-NOTES.txt VERSION /xsl/docbook/common ChangeLog common.xsl l10n.xml labels.xsl titles.xsl tr.xml uk.xml /xsl/docbook/fo ChangeLog admon.xsl autoidx.xsl autotoc.xsl biblio.xsl block.xsl component.xsl division.xsl docbook.xsl footnote.xsl formal.xsl glossary.xsl htmltbl.xsl index.xsl lists.xsl pagesetup.xsl param.ent param.xml param.xsl param.xweb profile-docbook.xsl refentry.xsl sections.xsl table.xsl toc.xsl verbatim.xsl xep.xsl xref.xsl /xsl/docbook/html ChangeLog admon.xsl autoidx.xsl autotoc.xsl changebars.xsl docbook.xsl param.xml profile-docbook.xsl refentry.xsl xref.xsl /xsl/docbook/htmlhelp ChangeLog /xsl/docbook/lib ChangeLog
Groups:	php.doc
Request:	Send a blank email to phpdoc+get-969369174@lists.php.net to get a copy of this message

techtonik Sat Jul 16 19:38:38 2005 EDT Modified files: /phpdoc/xsl/docbook/fo admon.xsl autoidx.xsl autotoc.xsl biblio.xsl block.xsl ChangeLog component.xsl division.xsl docbook.xsl footnote.xsl formal.xsl glossary.xsl htmltbl.xsl index.xsl lists.xsl pagesetup.xsl param.ent param.xml param.xsl param.xweb profile-docbook.xsl refentry.xsl sections.xsl table.xsl toc.xsl verbatim.xsl xep.xsl xref.xsl /phpdoc/xsl/docbook/html admon.xsl autoidx.xsl autotoc.xsl changebars.xsl ChangeLog docbook.xsl param.xml profile-docbook.xsl refentry.xsl xref.xsl /phpdoc/xsl/docbook/common ChangeLog common.xsl l10n.xml labels.xsl titles.xsl tr.xml uk.xml /phpdoc/xsl/docbook/htmlhelp ChangeLog /phpdoc/xsl/docbook/lib ChangeLog /phpdoc/xsl/docbook RELEASE-NOTES.txt VERSION Log: update to docbook-xsl 1.68.1

http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/admon.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/fo/admon.xsl diff -u phpdoc/xsl/docbook/fo/admon.xsl:1.4 phpdoc/xsl/docbook/fo/admon.xsl:1.5 --- phpdoc/xsl/docbook/fo/admon.xsl:1.4 Fri Jul 15 04:27:48 2005 +++ phpdoc/xsl/docbook/fo/admon.xsl Sat Jul 16 19:38:31 2005 @@ -4,7 +4,7 @@ version='1.0'>  -<xsl:template match="sidebar"> +<xsl:template name="floater"> + <xsl:param name="position" select="'none'"/> + <xsl:param name="clear" select="'both'"/> + <xsl:param name="width"/> + <xsl:param name="content"/> + <xsl:param name="start.indent">0pt</xsl:param> + <xsl:param name="end.indent">0pt</xsl:param> + + <xsl:choose> + <xsl:when test="$fop.extensions"> +  + <xsl:copy-of select="$content"/> + </xsl:when> + <xsl:when test="$position = 'none'"> + <xsl:copy-of select="$content"/> + </xsl:when> + <xsl:when test="$position = 'before'"> + <fo:float float="before"> + <xsl:copy-of select="$content"/> + </fo:float> + </xsl:when> + <xsl:when test="$position = 'left' or + $position = 'start' or + $position = 'right' or + $position = 'end' or + $position = 'inside' or + $position = 'outside'"> + <xsl:variable name="float"> + <fo:float float="{$position}" + clear="{$clear}"> + <fo:block-container + start-indent="{$start.indent}" + end-indent="{$end.indent}"> + <xsl:if test="$width != ''"> + <xsl:attribute name="inline-progression-dimension"> + <xsl:value-of select="$width"/> + </xsl:attribute> + </xsl:if> + <fo:block> + <xsl:copy-of select="$content"/> + </fo:block> + </fo:block-container> + </fo:float> + </xsl:variable> + <xsl:choose> + <xsl:when test="$axf.extensions != 0 and self::sidebar"> + <fo:block xsl:use-attribute-sets="normal.para.spacing" + space-after="0pt" + space-after.precedence="force" + start-indent="0pt" end-indent="0pt"> + <xsl:copy-of select="$float"/> + </fo:block> + </xsl:when> + <xsl:when test="$axf.extensions != 0 and + ($position = 'left' or $position = 'start')"> + <fo:float float="{$position}" + clear="{$clear}"> + <fo:block-container + inline-progression-dimension=".001mm" + end-indent="{$start.indent} + {$width} + {$end.indent}"> + <xsl:attribute name="start-indent"> + <xsl:choose> + <xsl:when test="ancestor::para"> +  + <xsl:value-of select="concat('-', $body.start.indent)"/> + </xsl:when> + <xsl:otherwise>0pt</xsl:otherwise> + </xsl:choose> + </xsl:attribute> + <fo:block start-indent="{$start.indent}" + end-indent="-{$start.indent} - {$width}"> + <xsl:copy-of select="$content"/> + </fo:block> + </fo:block-container> + </fo:float> + + </xsl:when> + <xsl:when test="$axf.extensions != 0 and + ($position = 'right' or $position = 'end')"> +  + <fo:float float="{$position}" + clear="{$clear}"> + <fo:block-container + inline-progression-dimension=".001mm" + end-indent="-{$body.end.indent}" + start-indent="{$start.indent} + {$width} + {$end.indent}"> + <fo:block end-indent="{$end.indent}" + start-indent="-{$end.indent} - {$width}"> + <xsl:copy-of select="$content"/> + </fo:block> + </fo:block-container> + </fo:float> + + </xsl:when> + <xsl:when test="$xep.extensions != 0 and self::sidebar"> +  + <fo:block xsl:use-attribute-sets="normal.para.spacing"> + <xsl:copy-of select="$float"/> + </fo:block> + </xsl:when> + <xsl:when test="$xep.extensions != 0"> + <xsl:copy-of select="$float"/> + </xsl:when> + <xsl:otherwise> + <xsl:copy-of select="$float"/> + </xsl:otherwise> + </xsl:choose> + </xsl:when> + <xsl:otherwise> + <xsl:copy-of select="$content"/> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + +<xsl:template match="sidebar" name="sidebar"> +  + <xsl:variable name="pi-type"> + <xsl:call-template name="dbfo-attribute"> + <xsl:with-param name="pis" + select="processing-instruction('dbfo')"/> + <xsl:with-param name="attribute" select="'float-type'"/> + </xsl:call-template> + </xsl:variable> + + <xsl:choose> + <xsl:when test="$pi-type = 'margin.note'"> + <xsl:call-template name="margin.note"/> + </xsl:when> + <xsl:otherwise> + <xsl:variable name="content"> <fo:block xsl:use-attribute-sets="sidebar.properties"> <xsl:if test="./title"> - <fo:block font-weight="bold" - keep-with-next.within-column="always" - hyphenate="false"> + <fo:block xsl:use-attribute-sets="sidebar.title.properties"> <xsl:apply-templates select="./title" mode="sidebar.title.mode"/> </fo:block> </xsl:if> - <xsl:apply-templates/> </fo:block> + </xsl:variable> + + <xsl:variable name="pi-width"> + <xsl:call-template name="dbfo-attribute"> + <xsl:with-param name="pis" + select="processing-instruction('dbfo')"/> + <xsl:with-param name="attribute" select="'sidebar-width'"/> + </xsl:call-template> + </xsl:variable> + + <xsl:variable name="position"> + <xsl:choose> + <xsl:when test="$pi-type != ''"> + <xsl:value-of select="$pi-type"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$sidebar.float.type"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:call-template name="floater"> + <xsl:with-param name="content" select="$content"/> + <xsl:with-param name="position" select="$position"/> + <xsl:with-param name="width"> + <xsl:choose> + <xsl:when test="$pi-width != ''"> + <xsl:value-of select="$pi-width"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$sidebar.float.width"/> + </xsl:otherwise> + </xsl:choose> + </xsl:with-param> + <xsl:with-param name="start.indent"> + <xsl:choose> + <xsl:when test="$position = 'start' or + $position = 'left'">0pt</xsl:when> + <xsl:when test="$position = 'end' or + $position = 'right'">0.5em</xsl:when> + </xsl:choose> + </xsl:with-param> + <xsl:with-param name="end.indent"> + <xsl:choose> + <xsl:when test="$position = 'start' or + $position = 'left'">0.5em</xsl:when> + <xsl:when test="$position = 'end' or + $position = 'right'">0pt</xsl:when> + </xsl:choose> + </xsl:with-param> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> + </xsl:template> <xsl:template match="sidebar/title"> @@ -139,6 +320,64 @@ <xsl:apply-templates/> </xsl:template> +<xsl:template name="margin.note"> + <xsl:param name="content"> + <fo:block xsl:use-attribute-sets="margin.note.properties"> + <xsl:if test="./title"> + <fo:block xsl:use-attribute-sets="margin.note.title.properties"> + <xsl:apply-templates select="./title" mode="margin.note.title.mode"/> + </fo:block> + </xsl:if> + <xsl:apply-templates/> + </fo:block> + </xsl:param> + + <xsl:variable name="pi-width"> + <xsl:call-template name="dbfo-attribute"> + <xsl:with-param name="pis" + select="processing-instruction('dbfo')"/> + <xsl:with-param name="attribute" select="'sidebar-width'"/> + </xsl:call-template> + </xsl:variable> + + <xsl:variable name="position" select="$margin.note.float.type"/> + + <xsl:call-template name="floater"> + <xsl:with-param name="content" select="$content"/> + <xsl:with-param name="position" select="$position"/> + <xsl:with-param name="width" > + <xsl:choose> + <xsl:when test="$pi-width != ''"> + <xsl:value-of select="$pi-width"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$margin.note.width"/> + </xsl:otherwise> + </xsl:choose> + </xsl:with-param> + <xsl:with-param name="start.indent"> + <xsl:choose> + <xsl:when test="$position = 'start' or + $position = 'left'">0pt</xsl:when> + <xsl:when test="$position = 'end' or + $position = 'right'">0.5em</xsl:when> + </xsl:choose> + </xsl:with-param> + <xsl:with-param name="end.indent"> + <xsl:choose> + <xsl:when test="$position = 'start' or + $position = 'left'">0.5em</xsl:when> + <xsl:when test="$position = 'end' or + $position = 'right'">0pt</xsl:when> + </xsl:choose> + </xsl:with-param> + </xsl:call-template> +</xsl:template> + +<xsl:template match="sidebar/title" mode="margin.note.title.mode"> + <xsl:apply-templates/> +</xsl:template> +  <xsl:template match="abstract"> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/ChangeLog?r1=1.5&r2=1.6&ty=u Index: phpdoc/xsl/docbook/fo/ChangeLog diff -u phpdoc/xsl/docbook/fo/ChangeLog:1.5 phpdoc/xsl/docbook/fo/ChangeLog:1.6 --- phpdoc/xsl/docbook/fo/ChangeLog:1.5 Fri Jul 15 05:18:37 2005 +++ phpdoc/xsl/docbook/fo/ChangeLog Sat Jul 16 19:38:32 2005 @@ -1,3 +1,151 @@ +2005-02-03 Robert Stayton <bobstayton@users.sourceforge.net> + + * footnote.xsl, param.ent, param.xweb, xref.xsl: Moved footnote properties to attribute-sets. + +2005-01-25 Robert Stayton <bobstayton@users.sourceforge.net> + + * footnote.xsl, xref.xsl: Reset start-indent to zero for footnote text so it doesn't inherit + the indent of its container. + +2005-01-23 Robert Stayton <bobstayton@users.sourceforge.net> + + * block.xsl: fixed bug in floats in XSL Formatter. + +2005-01-22 Robert Stayton <bobstayton@users.sourceforge.net> + + * block.xsl: Added support for side floats, margin notes, and custom floats. + + * pagesetup.xsl: Add new parameters body.start.indent and body.end.indent to + the set.flow.properties template. + + * param.ent, param.xweb: Added new parameters to support side floats and margin notes. + +2005-01-19 Norman Walsh <nwalsh@users.sourceforge.net> + + * docbook.xsl: Support xml:id + + * refentry.xsl: Support refdescriptor + + * refentry.xsl: Support multiple refnamedivs + +2005-01-18 Robert Stayton <bobstayton@users.sourceforge.net> + + * autoidx.xsl: Add index.entry.properties attribute-set to support customization + of index entries. + + * biblio.xsl, component.xsl, division.xsl, glossary.xsl, index.xsl, pagesetup.xsl, refentry.xsl, sections.xsl, toc.xsl: + Added set.flow.properties template call to each fo:flow to + support customizations entry point. + + * formal.xsl: Add support for @floatstyle in figure + + * index.xsl: Moved hardcoded properties for index division titles to + the index.div.title.properties attribute-set. + + * lists.xsl: xep supports table-layout="auto" now. + + * param.ent, param.xweb: Added index.entry.properties attribute-set. + + * param.ent, param.xweb: Added index.div.title.properties attribute-set. + + * xref.xsl: Pass $verbose parameter to most elements. + +2005-01-15 Robert Stayton <bobstayton@users.sourceforge.net> + + * autotoc.xsl: Added refentry to part toc, as it is permitted by the DTD. + +2005-01-14 Jirka Kosek <kosek@users.sourceforge.net> + + * htmltbl.xsl: Fixed typos + +2005-01-13 Robert Stayton <bobstayton@users.sourceforge.net> + + * autotoc.xsl: Added backmatter elements and article to part toc, since + they are permitted by the DTD. + + * autotoc.xsl: Added mode="toc" for simplesect, since it is now permitted + in the toc is simplesect.in.toc is set. + +2005-01-10 Robert Stayton <bobstayton@users.sourceforge.net> + + * admon.xsl: Moved hard coded properties to nongraphical.admonintion.properties + and graphical.admonition.properties attribute sets. + + * param.ent, param.xweb: Moved hard coded properties to two new admon attribute-sets. + + * table.xsl: Set start-indent=0 on table-body, table-header, table-footer so table cells + do not inherit start-indent. + +2005-01-08 Robert Stayton <bobstayton@users.sourceforge.net> + + * block.xsl: Added support for sidebar-width and float-type processing instructions + in sidebar. + + * param.ent, param.xweb: Added side.float.properties attribute set and sidebar.float.type + parameter to support side floats. + +2005-01-04 Robert Stayton <bobstayton@users.sourceforge.net> + + * glossary.xsl: Fixed bug 1084223 where glosssee links in FO output were not hotlinks. + +2005-01-02 Robert Stayton <bobstayton@users.sourceforge.net> + + * htmltbl.xsl: For tables with HTML markup elements, added support for dbfo bgcolor PI, + the attribute-sets named table.properties, informaltable.properties, + table.table.properties, and table.cell.padding. Also added support + for the templates named table.cell.properties and table.cell.block.properties + so that tabstyles can be implemented. Also added support for tables + containing only <tr> instead of <tbody> with <tr>. + +2004-12-29 Jirka Kosek <kosek@users.sourceforge.net> + + * autotoc.xsl: Fixed formatting of multi-line ToC entries + + * xep.xsl: Fixed handling of multiple authors in PDF metadata. Removed obsolete comment. + +2004-12-18 Robert Stayton <bobstayton@users.sourceforge.net> + + * xref.xsl: Fix bug in olink not using olink.properties attribute-set. + +2004-12-14 Jirka Kosek <kosek@users.sourceforge.net> + + * param.ent, param.xweb: Removed unused parameter ulink.footnote.number.format + +2004-12-12 Robert Stayton <bobstayton@users.sourceforge.net> + + * formal.xsl: Support table-format="auto" for some FO processors. + +2004-12-12 Jirka Kosek <kosek@users.sourceforge.net> + + * param.ent, param.xweb: Added new paramater hyphenate.verbatim.characters which can specify characters after which line break can occur in verbatim environments. This parameter can be used to extend initial set of characters which contain only space and non-breakable space. + +2004-12-12 Robert Stayton <bobstayton@users.sourceforge.net> + + * table.xsl: Support table-format="auto" for some FO processors. + +2004-12-12 Jirka Kosek <kosek@users.sourceforge.net> + + * verbatim.xsl: Added new paramater hyphenate.verbatim.characters which can specify characters after which line break can occur in verbatim environments. This parameter can be used to extend initial set of characters which contain only space and non-breakable space. + +2004-12-11 Robert Stayton <bobstayton@users.sourceforge.net> + + * lists.xsl: Added two more potential bullet symbols, also commented out by default. + + * lists.xsl: Added itemizedlist.label.markup to enable selection of different bullet symbol. + Also added several potential bullet characters, commented out by default. + +2004-12-06 Jirka Kosek <kosek@users.sourceforge.net> + + * xref.xsl: Fixed numbering of ulink footnotes in article bibliography + +2004-12-05 Robert Stayton <bobstayton@users.sourceforge.net> + + * docbook.xsl: Enable all id's in XEP output for external olinking. + +2004-12-02 Michael Smith <xmldoc@users.sourceforge.net> + + * Makefile: New file. + 2004-12-02 Robert Stayton <bobstayton@users.sourceforge.net> * table.xsl: Added missing col parameter to table.cell.properties template. @@ -871,7 +1019,8 @@ 2003-03-26 Michael Smith <xmldoc@users.sourceforge.net> - * Makefile: wdocbook.xsl obsoleted by w2docbook.xsl, updated globally + * Makefile: branches: 1.12.2; + wdocbook.xsl obsoleted by w2docbook.xsl, updated globally 2003-03-25 Michael Smith <xmldoc@users.sourceforge.net> @@ -2154,7 +2303,7 @@ 2001-04-02 Norman Walsh <nwalsh@users.sourceforge.net> * .cvsignore, Makefile, admon.xsl, autoidx.xsl, autotoc.xsl, biblio.xsl, block.xsl, callout.xsl, component.xsl, division.xsl, docbook.xsl, fo.xsl, footnote.xsl, fop.xsl, formal.xsl, glossary.xsl, graphics.xsl, index.xsl, info.xsl, inline.xsl, keywords.xsl, lists.xsl, math.xsl, pagesetup.xsl, param.xsl, pi.xsl, qandaset.xsl, refentry.xsl, sections.xsl, synop.xsl, table.xsl, titlepage.templates.xml, titlepage.xsl, toc.xsl, verbatim.xsl, xref.xsl: - New file. + Initial checkin * Makefile: Use the cvstools version of saxon http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/component.xsl?r1=1.5&r2=1.6&ty=u Index: phpdoc/xsl/docbook/fo/component.xsl diff -u phpdoc/xsl/docbook/fo/component.xsl:1.5 phpdoc/xsl/docbook/fo/component.xsl:1.6 --- phpdoc/xsl/docbook/fo/component.xsl:1.5 Fri Jul 15 05:18:37 2005 +++ phpdoc/xsl/docbook/fo/component.xsl Sat Jul 16 19:38:32 2005 @@ -5,7 +5,7 @@ version='1.0'>  -<xsl:key name="id" match="*" use="@id"/> +<xsl:key name="id" match="*" use="@id|@xml:id"/>  @@ -202,6 +202,12 @@ </xsl:choose> </xsl:variable> +  + <xsl:if test="$xep.extensions != 0"> + <xsl:processing-instruction + name="xep-pdf-drop-unused-destinations">false</xsl:processing-instruction> + </xsl:if> + <fo:root xsl:use-attribute-sets="root.properties"> <xsl:attribute name="language"> <xsl:call-template name="l10n.language"> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/footnote.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/fo/footnote.xsl diff -u phpdoc/xsl/docbook/fo/footnote.xsl:1.4 phpdoc/xsl/docbook/fo/footnote.xsl:1.5 --- phpdoc/xsl/docbook/fo/footnote.xsl:1.4 Fri Jul 15 04:27:48 2005 +++ phpdoc/xsl/docbook/fo/footnote.xsl Sat Jul 16 19:38:32 2005 @@ -6,7 +6,7 @@ version='1.0'>  - <xsl:attribute-set name="th.style"> +<xsl:attribute-set name="th.style"> <xsl:attribute name="font-weight">bold</xsl:attribute> - </xsl:attribute-set> +</xsl:attribute-set> - <xsl:template match="table|informaltable" mode="htmlTable"> +<xsl:template match="table|informaltable" mode="htmlTable"> <xsl:if test="tgroup/tbody/row |tgroup/thead/row |tgroup/tfoot/row"> @@ -38,9 +38,16 @@ <xsl:choose> <xsl:when test="caption"> - <fo:table-and-caption id="{$id}"> + <fo:table-and-caption id="{$id}" + xsl:use-attribute-sets="table.properties"> <xsl:apply-templates select="caption" mode="htmlTable"/> - <fo:table table-layout="fixed"> + <fo:table xsl:use-attribute-sets="table.table.properties"> + <xsl:choose> + <xsl:when test="$fop.extensions != 0 or + $passivetex.extensions != 0"> + <xsl:attribute name="table-layout">fixed</xsl:attribute> + </xsl:when> + </xsl:choose> <xsl:attribute name="width"> <xsl:choose> <xsl:when test="@width"> @@ -52,12 +59,26 @@ <xsl:call-template name="make-html-table-columns"> <xsl:with-param name="count" select="$numcols"/> </xsl:call-template> - <xsl:apply-templates select="tbody|thead|tfoot" mode="htmlTable"/> + <xsl:apply-templates select="thead" mode="htmlTable"/> + <xsl:apply-templates select="tfoot" mode="htmlTable"/> + <xsl:choose> + <xsl:when test="tbody"> + <xsl:apply-templates select="tbody" mode="htmlTable"/> + </xsl:when> + <xsl:otherwise> + <fo:table-body> + <xsl:apply-templates select="tr" mode="htmlTable"/> + </fo:table-body> + </xsl:otherwise> + </xsl:choose> </fo:table> </fo:table-and-caption> </xsl:when> <xsl:otherwise> - <fo:table table-layout="fixed" id="{$id}"> + <fo:block id="{$id}" + xsl:use-attribute-sets="informaltable.properties"> + <fo:table table-layout="fixed" + xsl:use-attribute-sets="table.table.properties"> <xsl:attribute name="width"> <xsl:choose> <xsl:when test="@width"> @@ -71,11 +92,12 @@ </xsl:call-template> <xsl:apply-templates mode="htmlTable"/> </fo:table> + </fo:block> </xsl:otherwise> </xsl:choose> - </xsl:template> +</xsl:template> - <xsl:template match="caption" mode="htmlTable"> +<xsl:template match="caption" mode="htmlTable"> <fo:table-caption> <fo:block> <xsl:apply-templates select=".." mode="object.title.markup"> @@ -83,9 +105,9 @@ </xsl:apply-templates> </fo:block> </fo:table-caption> - </xsl:template> +</xsl:template> - <xsl:template name="widest-html-row"> +<xsl:template name="widest-html-row"> <xsl:param name="rows" select="''"/> <xsl:param name="count" select="0"/> <xsl:choose> @@ -109,9 +131,9 @@ </xsl:choose> </xsl:otherwise> </xsl:choose> - </xsl:template> +</xsl:template> - <xsl:template name="make-html-table-columns"> +<xsl:template name="make-html-table-columns"> <xsl:param name="count" select="0"/> <xsl:param name="number" select="1"/> @@ -141,51 +163,84 @@ </xsl:if> </xsl:when> </xsl:choose> - </xsl:template> +</xsl:template> - <xsl:template match="tbody" mode="htmlTable"> +<xsl:template match="tbody" mode="htmlTable"> <fo:table-body border-bottom-width="0.25pt" border-bottom-style="solid" border-bottom-color="black"> <xsl:apply-templates mode="htmlTable"/> </fo:table-body> - </xsl:template> +</xsl:template> - <xsl:template match="td" mode="htmlTable"> - <fo:table-cell> +<xsl:template match="td" mode="htmlTable"> + <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-cell xsl:use-attribute-sets="table.cell.padding"> + <xsl:call-template name="table.cell.properties"> + <xsl:with-param name="bgcolor.pi" select="$bgcolor"/> + </xsl:call-template> <fo:block> + <xsl:call-template name="table.cell.block.properties"/> <xsl:apply-templates/> </fo:block> </fo:table-cell> - </xsl:template> +</xsl:template> - <xsl:template match="tfoot" mode="htmlTable"> +<xsl:template match="tfoot" mode="htmlTable"> <fo:table-footer> <xsl:apply-templates mode="htmlTable"/> </fo:table-footer> - </xsl:template> +</xsl:template> - <xsl:template match="th" mode="htmlTable"> - <fo:table-cell xsl:use-attribute-sets="th.style"> +<xsl:template match="th" mode="htmlTable"> + <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-cell xsl:use-attribute-sets="th.style table.cell.padding"> + <xsl:call-template name="table.cell.properties"> + <xsl:with-param name="bgcolor.pi" select="$bgcolor"/> + </xsl:call-template> <fo:block> + <xsl:call-template name="table.cell.block.properties"/> <xsl:apply-templates/> </fo:block> </fo:table-cell> - </xsl:template> +</xsl:template> - <xsl:template match="thead" mode="htmlTable"> +<xsl:template match="thead" mode="htmlTable"> <fo:table-header border-bottom-width="0.25pt" border-bottom-style="solid" border-bottom-color="black" font-weight="bold"> <xsl:apply-templates mode="htmlTable"/> </fo:table-header> - </xsl:template> +</xsl:template> + +<xsl:template match="tr" mode="htmlTable"> + <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> - <xsl:template match="tr" mode="htmlTable"> <fo:table-row> + <xsl:if test="$bgcolor != ''"> + <xsl:attribute name="background-color"> + <xsl:value-of select="$bgcolor"/> + </xsl:attribute> + </xsl:if> <xsl:apply-templates mode="htmlTable"/> </fo:table-row> - </xsl:template> +</xsl:template> </xsl:stylesheet> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/index.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/fo/index.xsl diff -u phpdoc/xsl/docbook/fo/index.xsl:1.4 phpdoc/xsl/docbook/fo/index.xsl:1.5 --- phpdoc/xsl/docbook/fo/index.xsl:1.4 Fri Jul 15 04:27:48 2005 +++ phpdoc/xsl/docbook/fo/index.xsl Sat Jul 16 19:38:32 2005 @@ -10,7 +10,7 @@ version='1.0'>  -  - <xsl:otherwise>•</xsl:otherwise> - </xsl:choose> + <xsl:call-template name="itemizedlist.label.markup"> + <xsl:with-param name="itemsymbol"> + <xsl:call-template name="list.itemsymbol"> + <xsl:with-param name="node" select="parent::itemizedlist"/> + </xsl:call-template> + </xsl:with-param> + </xsl:call-template> </fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> @@ -156,6 +145,35 @@ </xsl:choose> </xsl:template> +<xsl:template name="itemizedlist.label.markup"> + <xsl:param name="itemsymbol" select="'disc'"/> + + <xsl:choose> + <xsl:when test="$itemsymbol='disc'">•</xsl:when> + <xsl:when test="$itemsymbol='bullet'">•</xsl:when> + <xsl:when test="$itemsymbol='endash'">–</xsl:when> + <xsl:when test="$itemsymbol='emdash'">—</xsl:when> +  +  + <xsl:otherwise>•</xsl:otherwise> + </xsl:choose> +</xsl:template> + <xsl:template match="orderedlist"> <xsl:variable name="id"> <xsl:call-template name="object.id"/> @@ -636,7 +654,7 @@ <fo:table xsl:use-attribute-sets="normal.para.spacing"> <xsl:choose> - <xsl:when test="$axf.extensions != 0"> + <xsl:when test="$axf.extensions != 0 or $xep.extensions != 0"> <xsl:attribute name="table-layout">auto</xsl:attribute> <xsl:if test="$explicit.table.width != ''"> <xsl:attribute name="width"><xsl:value-of http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/pagesetup.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/fo/pagesetup.xsl diff -u phpdoc/xsl/docbook/fo/pagesetup.xsl:1.4 phpdoc/xsl/docbook/fo/pagesetup.xsl:1.5 --- phpdoc/xsl/docbook/fo/pagesetup.xsl:1.4 Fri Jul 15 04:27:48 2005 +++ phpdoc/xsl/docbook/fo/pagesetup.xsl Sat Jul 16 19:38:32 2005 @@ -4,7 +4,7 @@ version="1.0">  +  + + <xsl:choose> + <xsl:when test="$master-reference = 'body' or + $element = 'preface' or + ($master-reference = 'back' and + $element = 'appendix')"> + <xsl:attribute name="start-indent"> + <xsl:value-of select="$body.start.indent"/> + </xsl:attribute> + <xsl:attribute name="end-indent"> + <xsl:value-of select="$body.end.indent"/> + </xsl:attribute> + </xsl:when> + </xsl:choose> + +</xsl:template>  </xsl:stylesheet> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/param.ent?r1=1.5&r2=1.6&ty=u Index: phpdoc/xsl/docbook/fo/param.ent diff -u phpdoc/xsl/docbook/fo/param.ent:1.5 phpdoc/xsl/docbook/fo/param.ent:1.6 --- phpdoc/xsl/docbook/fo/param.ent:1.5 Fri Jul 15 05:18:37 2005 +++ phpdoc/xsl/docbook/fo/param.ent Sat Jul 16 19:38:32 2005 @@ -51,6 +51,8 @@ <!ENTITY footer.column.widths SYSTEM "../params/footer.column.widths.xml"> <!ENTITY footers.on.blank.pages SYSTEM "../params/footers.on.blank.pages.xml"> <!ENTITY footnote.font.size SYSTEM "../params/footnote.font.size.xml"> +<!ENTITY footnote.properties SYSTEM "../params/footnote.properties.xml"> +<!ENTITY footnote.mark.properties SYSTEM "../params/footnote.mark.properties.xml"> <!ENTITY footnote.sep.leader.properties SYSTEM "../params/footnote.sep.leader.properties.xml"> <!ENTITY fop.extensions SYSTEM "../params/fop.extensions.xml"> <!ENTITY formal.object.properties SYSTEM "../params/formal.object.properties.xml"> @@ -74,6 +76,9 @@ <!ENTITY headers.on.blank.pages SYSTEM "../params/headers.on.blank.pages.xml"> <!ENTITY hyphenate SYSTEM "../params/hyphenate.xml"> <!ENTITY hyphenate.verbatim SYSTEM "../params/hyphenate.verbatim.xml"> +<!ENTITY hyphenate.verbatim.characters SYSTEM "../params/hyphenate.verbatim.characters.xml"> +<!ENTITY index.entry.properties SYSTEM "../params/index.entry.properties.xml"> +<!ENTITY index.div.title.properties SYSTEM "../params/index.div.title.properties.xml"> <!ENTITY index.on.role SYSTEM "../params/index.on.role.xml"> <!ENTITY index.on.type SYSTEM "../params/index.on.type.xml"> <!ENTITY informal.object.properties SYSTEM "../params/informal.object.properties.xml"> @@ -181,7 +186,6 @@ <!ENTITY xep.extensions SYSTEM "../params/xep.extensions.xml"> <!ENTITY xep.index.item.properties SYSTEM "../params/xep.index.item.properties.xml"> <!ENTITY xref.properties SYSTEM "../params/xref.properties.xml"> -<!ENTITY sidebar.properties SYSTEM "../params/sidebar.properties.xml"> <!ENTITY menuchoice.separator SYSTEM "../params/menuchoice.separator.xml"> <!ENTITY menuchoice.menu.separator SYSTEM "../params/menuchoice.menu.separator.xml"> <!ENTITY bibliography.numbered SYSTEM "../params/bibliography.numbered.xml"> @@ -225,7 +229,6 @@ <!ENTITY footnote.number.symbols SYSTEM "../params/footnote.number.symbols.xml"> <!ENTITY table.footnote.number.symbols SYSTEM "../params/table.footnote.number.symbols.xml"> <!ENTITY glossentry.show.acronym SYSTEM "../params/glossentry.show.acronym.xml"> -<!ENTITY ulink.footnote.number.format SYSTEM "../params/ulink.footnote.number.format.xml"> <!ENTITY xref.with.number.and.title SYSTEM "../params/xref.with.number.and.title.xml"> <!ENTITY ebnf.assignment SYSTEM "../params/ebnf.assignment.xml"> <!ENTITY ebnf.statement.terminator SYSTEM "../params/ebnf.statement.terminator.xml"> @@ -258,3 +261,15 @@ <!ENTITY subscript.properties SYSTEM "../params/subscript.properties.xml"> <!ENTITY superscript.properties SYSTEM "../params/superscript.properties.xml"> <!ENTITY table.table.properties SYSTEM "../params/table.table.properties.xml"> +<!ENTITY graphical.admonition.properties SYSTEM "../params/graphical.admonition.properties.xml"> +<!ENTITY nongraphical.admonition.properties SYSTEM "../params/nongraphical.admonition.properties.xml"> +<!ENTITY body.start.indent SYSTEM "../params/body.start.indent.xml"> +<!ENTITY body.end.indent SYSTEM "../params/body.end.indent.xml"> +<!ENTITY sidebar.properties SYSTEM "../params/sidebar.properties.xml"> +<!ENTITY sidebar.title.properties SYSTEM "../params/sidebar.title.properties.xml"> +<!ENTITY sidebar.float.type SYSTEM "../params/sidebar.float.type.xml"> +<!ENTITY sidebar.float.width SYSTEM "../params/sidebar.float.width.xml"> +<!ENTITY margin.note.properties SYSTEM "../params/margin.note.properties.xml"> +<!ENTITY margin.note.title.properties SYSTEM "../params/margin.note.title.properties.xml"> +<!ENTITY margin.note.float.type SYSTEM "../params/margin.note.float.type.xml"> +<!ENTITY margin.note.width SYSTEM "../params/margin.note.width.xml"> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/param.xml?r1=1.5&r2=1.6&ty=u Index: phpdoc/xsl/docbook/fo/param.xml diff -u phpdoc/xsl/docbook/fo/param.xml:1.5 phpdoc/xsl/docbook/fo/param.xml:1.6 --- phpdoc/xsl/docbook/fo/param.xml:1.5 Fri Jul 15 05:18:37 2005 +++ phpdoc/xsl/docbook/fo/param.xml Sat Jul 16 19:38:32 2005 @@ -5,7 +5,7 @@ <bookinfo> <title>FO Parameter Reference</title> <releaseinfo role="meta"> -$Id: param.xml,v 1.5 2005/07/15 09:18:37 techtonik Exp $ +$Id: param.xml,v 1.6 2005/07/16 23:38:32 techtonik Exp $ </releaseinfo> <author> <surname>Walsh</surname> @@ -197,6 +197,67 @@ </refsect1> </refentry> +<refentry id="graphical.admonition.properties"> +<refnamediv> +<refname>graphical.admonition.properties</refname> +<refpurpose>To add properties to the outer block of a graphical admonition.</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<programlisting id="graphical.admonition.properties.frag"><xsl:attribute-set name="graphical.admonition.properties"> +</xsl:attribute-set> +</programlisting> +</refsynopsisdiv> +<refsect1><title>Description</title> +<para>These properties are added to the outer block containing the +entire graphical admonition, including its title. +It is used when the parameter +<parameter moreinfo="none">admon.graphics</parameter> is set to nonzero. +Use this attribute-set to set the space above and below, +and any indent for the whole admonition.</para> + +<para>In addition to these properties, a graphical admonition +also applies the <parameter moreinfo="none">admonition.title.properties</parameter> +attribute-set to the title, and applies the +<parameter moreinfo="none">admonition.properties</parameter> attribute-set +to the rest of the content.</para> + +</refsect1> +</refentry> + +<refentry id="nongraphical.admonition.properties"> +<refnamediv> +<refname>nongraphical.admonition.properties</refname> +<refpurpose>To add properties to the outer block of a nongraphical admonition.</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<programlisting id="nongraphical.admonition.properties.frag"><xsl:attribute-set name="nongraphical.admonition.properties"> + <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute> + <xsl:attribute name="space-before.optimum">1em</xsl:attribute> + <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute> + <xsl:attribute name="margin-left">0.25in</xsl:attribute> + <xsl:attribute name="margin-right">0.25in</xsl:attribute> +</xsl:attribute-set> +</programlisting> +</refsynopsisdiv> +<refsect1><title>Description</title> +<para>These properties are added to the outer block containing the +entire nongraphical admonition, including its title. +It is used when the parameter +<parameter moreinfo="none">admon.graphics</parameter> is set to zero. +Use this attribute-set to set the space above and below, +and any indent for the whole admonition.</para> + +<para>In addition to these properties, a nongraphical admonition +also applies the <parameter moreinfo="none">admonition.title.properties</parameter> +attribute-set to the title, and the +<parameter moreinfo="none">admonition.properties</parameter> attribute-set +to the rest of the content.</para> + +</refsect1> +</refentry> + </reference> <reference><title>Callouts</title> @@ -838,6 +899,60 @@ </refentry> +<refentry id="index.entry.properties"> +<refnamediv> +<refname>index.entry.properties</refname> +<refpurpose>Properties applied to the formatted entries +in an index</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<programlisting id="index.entry.properties.frag"> +<xsl:attribute-set name="index.entry.properties"> +</xsl:attribute-set> +</programlisting> +</refsynopsisdiv> + +<refsect1><title>Description</title> + +<para>This attribute set is applied to the block containing +the entries in a letter division in an index. It can be used to set the +font-size, font-family, and other inheritable properties that will be +applied to all index entries.</para> + +</refsect1> +</refentry> + +<refentry id="index.div.title.properties"> +<refnamediv> +<refname>index.div.title.properties</refname> +<refpurpose>Properties associated with the letter headings in an +index</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<programlisting id="index.div.title.properties.frag"> +<xsl:attribute-set name="index.div.title.properties"> + <xsl:attribute name="margin-left">0pt</xsl:attribute> + <xsl:attribute name="font-size">14.4pt</xsl:attribute> + <xsl:attribute name="font-family"><xsl:value-of select="$title.fontset"></xsl:value-of></xsl:attribute> + <xsl:attribute name="font-weight">bold</xsl:attribute> + <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.optimum"><xsl:value-of select="concat($body.font.master,'pt * 1.2')"></xsl:value-of></xsl:attribute> +</xsl:attribute-set> +</programlisting> +</refsynopsisdiv> + +<refsect1><title>Description</title> + +<para>This attribute set is used on the letter headings that separate +the divisions in an index.</para> + +</refsect1> +</refentry> + <refentry id="xep.index.item.properties"> <refnamediv> <refname>xep.index.item.properties</refname> @@ -1634,7 +1749,7 @@ </refmeta> <refnamediv> <refname>component.label.includes.part.label</refname> -<refpurpose>Do section labels include the component label?</refpurpose> +<refpurpose>Do component labels include the part label?</refpurpose> </refnamediv> <refsynopsisdiv> @@ -1643,9 +1758,10 @@ <refsect1><title>Description</title> -<para>If true (non-zero), labels for chapters, appendices, and other component +<para>If true (non-zero), number labels for chapters, appendices, and other component elements are prefixed with the label of the part element that contains them. +So you might see Chapter II.3 instead of Chapter 3. Also, the labels for formal elements such as table and figure will include the part label. If there is no part element container, then no prefix is generated. @@ -3739,10 +3855,21 @@ <para>You can override this setting with a processing instruction as the child of <sgmltag>variablelist</sgmltag>: <sgmltag class="pi">dbfo list-presentation="blocks"</sgmltag> or <sgmltag class="pi">dbfo -list-presentation="list"</sgmltag></para> +list-presentation="list"</sgmltag>.</para> + +<para>When using <literal moreinfo="none">list-presentation="list"</literal>, +you can also control the amount of space used for the <sgmltag>term</sgmltag>s with +the <sgmltag class="pi">dbfo term-width=".25in"</sgmltag> processing instruction, +the <sgmltag class="attribute">termlength</sgmltag> attribute on <sgmltag>variablelist</sgmltag>, +or allow the stylesheets to attempt to calculate the amount of space to leave based on the +number of letters in the longest term. +</para> <programlisting format="linespecific"> <variablelist> <?dbfo list-presentation="list"?> + <?dbfo term-width="1.5in"?> + <?dbhtml list-presentation="table"?> + <?dbhtml term-width="1.5in"?> <varlistentry> <term>list</term> <listitem> @@ -3752,6 +3879,8 @@ </listitem> </varlistentry> </variablelist></programlisting> + + </refsect1> </refentry> @@ -3832,30 +3961,6 @@ </refsect1> </refentry> -<refentry id="ulink.footnote.number.format"> -<refmeta> -<refentrytitle>ulink.footnote.number.format</refentrytitle> -<refmiscinfo role="type">string</refmiscinfo> -</refmeta> -<refnamediv> -<refname>ulink.footnote.number.format</refname> -<refpurpose>Identifies the format used for <sgmltag>ulink</sgmltag> footnote numbers</refpurpose> -</refnamediv> - -<refsynopsisdiv> -<programlisting id="ulink.footnote.number.format.frag"> -<xsl:param name="ulink.footnote.number.format" select="'1'"></xsl:param> -</programlisting> -</refsynopsisdiv> - -<refsect1><title>Description</title> - -<para>The <parameter moreinfo="none">ulink.footnote.number.format</parameter> specifies the format -to use for footnote numeration (1, i, I, a, or A).</para> - -</refsect1> -</refentry> - <refentry id="ulink.hyphenate"> <refmeta> <refentrytitle>ulink.hyphenate</refentrytitle> @@ -3978,6 +4083,30 @@ </refsect1> </refentry> +<refentry id="hyphenate.verbatim.characters"> +<refmeta> +<refentrytitle>hyphenate.verbatim.characters</refentrytitle> +<refmiscinfo role="type">string</refmiscinfo> +</refmeta> +<refnamediv> +<refname>hyphenate.verbatim.characters</refname> +<refpurpose>List of characters after which line break can occur in listings</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<programlisting id="hyphenate.verbatim.characters.frag"><xsl:param name="hyphenate.verbatim.characters" select="''"></xsl:param></programlisting> +</refsynopsisdiv> + +<refsect1><title>Description</title> + +<para>If you enable <parameter moreinfo="none">hyphenate.verbatim</parameter> line +breaks are allowed only on space characters. If this is not enough for +your document, you can specify list of additional characters after +which line break is allowed in this parameter.</para> + +</refsect1> +</refentry> + <refentry id="use.svg"> <refmeta> <refentrytitle>use.svg</refentrytitle> @@ -4293,6 +4422,69 @@ </refsect1> </refentry> +<refentry id="footnote.properties"> +<refnamediv> +<refname>footnote.properties</refname> +<refpurpose>Properties applied to each footnote body +</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<programlisting id="footnote.properties.frag"> +<xsl:attribute-set name="footnote.properties"> + <xsl:attribute name="font-family"><xsl:value-of select="$body.fontset"></xsl:value-of></xsl:attribute> + <xsl:attribute name="font-size"><xsl:value-of select="$footnote.font.size"></xsl:value-of></xsl:attribute> + <xsl:attribute name="font-weight">normal</xsl:attribute> + <xsl:attribute name="font-style">normal</xsl:attribute> + <xsl:attribute name="text-align"><xsl:value-of select="$alignment"></xsl:value-of></xsl:attribute> + <xsl:attribute name="start-indent">0pt</xsl:attribute> +</xsl:attribute-set> +</programlisting> +</refsynopsisdiv> + +<refsect1><title>Description</title> + +<para>This attribute set is applied to the footnote-block +for each footnote. +It can be used to set the +font-size, font-family, and other inheritable properties that will be +applied to all footnotes.</para> + +</refsect1> +</refentry> + +<refentry id="footnote.mark.properties"> +<refnamediv> +<refname>footnote.mark.properties</refname> +<refpurpose>Properties applied to each footnote mark +</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<programlisting id="footnote.mark.properties.frag"> +<xsl:attribute-set name="footnote.mark.properties"> + <xsl:attribute name="font-size">75%</xsl:attribute> + <xsl:attribute name="font-weight">normal</xsl:attribute> + <xsl:attribute name="font-style">normal</xsl:attribute> +</xsl:attribute-set> +</programlisting> +</refsynopsisdiv> + +<refsect1><title>Description</title> + +<para>This attribute set is applied to the footnote mark used +for each footnote. +It should contain only inline properties. +</para> + +<para>The property to make the mark a superscript is contained in the +footnote template itself, because the current version of FOP reports +an error if baseline-shift is used. +</para> + +</refsect1> +</refentry> + <refentry id="footnote.sep.leader.properties"> <refnamediv> <refname>footnote.sep.leader.properties</refname> @@ -5062,6 +5254,72 @@ </refsect1> </refentry> +<refentry id="body.start.indent"> +<refmeta> +<refentrytitle>body.start.indent</refentrytitle> + +</refmeta> +<refnamediv> +<refname>body.start.indent</refname> +<refpurpose>The start-indent for the body text</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<programlisting id="body.start.indent.frag"> +<xsl:param name="body.start.indent" select="'4pc'"></xsl:param> +</programlisting> +</refsynopsisdiv> + +<refsect1><title>Description</title> + +<para>This start-indent property is added to the fo:flow +for certain page sequences. Which page-sequences it is +applied to is determined by the template named +<literal moreinfo="none">set.flow.properties</literal>. +By default, that template adds it to the flow +for page-sequences using the <quote>body</quote> +master-reference, as well as appendixes and prefaces. +</para> + +<para>See also <parameter moreinfo="none">body.end.indent</parameter>. +</para> + +</refsect1> +</refentry> + +<refentry id="body.end.indent"> +<refmeta> +<refentrytitle>body.end.indent</refentrytitle> + +</refmeta> +<refnamediv> +<refname>body.end.indent</refname> +<refpurpose>The end-indent for the body text</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<programlisting id="body.end.indent.frag"> +<xsl:param name="body.end.indent" select="'0pt'"></xsl:param> +</programlisting> +</refsynopsisdiv> + +<refsect1><title>Description</title> + +<para>This end-indent property is added to the fo:flow +for certain page sequences. Which page-sequences it is +applied to is determined by the template named +<literal moreinfo="none">set.flow.properties</literal>. +By default, that template adds it to the flow +for page-sequences using the <quote>body</quote> +master-reference, as well as appendixes and prefaces. +</para> + +<para>See also <parameter moreinfo="none">body.start.indent</parameter>. +</para> + +</refsect1> +</refentry> + <refentry id="alignment"> <refmeta> <refentrytitle>alignment</refentrytitle> @@ -5603,7 +5861,7 @@ <xsl:param name="title.margin.left"> <xsl:choose> <xsl:when test="$passivetex.extensions != 0">0pt</xsl:when> - <xsl:otherwise>-4pc</xsl:otherwise> + <xsl:otherwise>0pt</xsl:otherwise> </xsl:choose> </xsl:param> </programlisting> @@ -6643,9 +6901,9 @@ <xsl:attribute name="padding-right">12pt</xsl:attribute> <xsl:attribute name="padding-top">6pt</xsl:attribute> <xsl:attribute name="padding-bottom">6pt</xsl:attribute> + <xsl:attribute name="margin-left">0pt</xsl:attribute> + <xsl:attribute name="margin-right">0pt</xsl:attribute>  @@ -6660,6 +6918,298 @@ </refsect1> </refentry> +<refentry id="sidebar.title.Properties"> +<refmeta> +<refentrytitle>sidebar.title.properties</refentrytitle> +<refmiscinfo role="type">attribute set</refmiscinfo> +</refmeta> +<refnamediv> +<refname>sidebar.title.properties</refname> +<refpurpose>Attribute set for sidebar titles</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<programlisting id="sidebar.title.properties.frag"> +<xsl:attribute-set name="sidebar.title.properties"> + <xsl:attribute name="font-weight">bold</xsl:attribute> + <xsl:attribute name="hyphenate">false</xsl:attribute> + <xsl:attribute name="text-align">start</xsl:attribute> + <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute> +</xsl:attribute-set> +</programlisting> +</refsynopsisdiv> + +<refsect1><title>Description</title> + +<para>The styling for sidebars titles.</para> + +</refsect1> +</refentry> + +<refentry id="sidebar.float.type"> +<refmeta> +<refentrytitle>sidebar.float.type</refentrytitle> +<refmiscinfo role="type">list</refmiscinfo> +</refmeta> +<refnamediv> +<refname>sidebar.float.type</refname> +<refpurpose>Select type of float for sidebar elements</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<programlisting id="sidebar.float.type.frag"> +<xsl:param name="sidebar.float.type" select="'none'"></xsl:param> +</programlisting> +</refsynopsisdiv> + +<refsect1><title>Description</title> + +<para>Selects the type of float for sidebar elements. +</para> +<itemizedlist> +<listitem> +<para>If <parameter moreinfo="none">sidebar.float.type</parameter> is +<quote><literal moreinfo="none">none</literal></quote>, then +no float is used. +</para> +</listitem> +<listitem> +<para>If <parameter moreinfo="none">sidebar.float.type</parameter> is +<quote><literal moreinfo="none">before</literal></quote>, then +the float appears at the top of the page. On some processors, +that may be the next page rather than the current page. +</para> +</listitem> +<listitem> +<para>If <parameter moreinfo="none">sidebar.float.type</parameter> is +<quote><literal moreinfo="none">left</literal></quote> or +<quote><literal moreinfo="none">start</literal></quote>, then +a left side float is used. +</para> +</listitem> +<listitem> +<para>If <parameter moreinfo="none">sidebar.float.type</parameter> is +<quote><literal moreinfo="none">right</literal></quote> or +<quote><literal moreinfo="none">end</literal></quote>, then +a right side float is used. +</para> +</listitem> +<listitem> +<para>If your XSL-FO processor supports floats positioned on the +<quote><literal moreinfo="none">inside</literal></quote> or +<quote><literal moreinfo="none">outside</literal></quote> +of double-sided pages, then you have those two +options for side floats as well. +</para> +</listitem> +</itemizedlist> + +</refsect1> +</refentry> + +<refentry id="sidebar.float.width"> +<refmeta> +<refentrytitle>sidebar.float.width</refentrytitle> +</refmeta> +<refnamediv> +<refname>sidebar.float.width</refname> +<refpurpose>Set the default width for sidebars</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<programlisting id="sidebar.float.width.frag"> +<xsl:param name="sidebar.float.width" select="'1in'"></xsl:param> +</programlisting> +</refsynopsisdiv> + +<refsect1><title>Description</title> + +<para>Sets the default width for sidebars when used as a side float. +The width determines the degree to which the sidebar block intrudes into +the text area. +</para> +<para>If <parameter moreinfo="none">sidebar.float.type</parameter> is +<quote><literal moreinfo="none">before</literal></quote> or +<quote><literal moreinfo="none">none</literal></quote>, then +this parameter is ignored. +</para> + +</refsect1> +</refentry> + +<refentry id="margin.note.properties"> +<refmeta> +<refentrytitle>margin.note.properties</refentrytitle> +<refmiscinfo role="type">attribute set</refmiscinfo> +</refmeta> +<refnamediv> +<refname>margin.note.properties</refname> +<refpurpose>Attribute set for margin.note properties</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<programlisting id="margin.note.properties.frag"> +<xsl:attribute-set name="margin.note.properties"> + <xsl:attribute name="font-size">90%</xsl:attribute> + <xsl:attribute name="text-align">start</xsl:attribute> +</xsl:attribute-set> +</programlisting> +</refsynopsisdiv> + +<refsect1><title>Description</title> + +<para>The styling for margin notes. +By default, margin notes are not implemented for any +element. A stylesheet customization is needed to make +use of this attribute-set.</para> + +<para>You can use a template named <quote>floater</quote> +to create the customization. +That template can create side floats by specifying the +content and characteristics as template parameters. +</para> + +<para>For example:</para> +<programlisting format="linespecific"><xsl:template match="para[@role='marginnote']"> + <xsl:call-template name="floater"> + <xsl:with-param name="position"> + <xsl:value-of select="$margin.note.float.type"/> + </xsl:with-param> + <xsl:with-param name="width"> + <xsl:value-of select="$margin.note.width"/> + </xsl:with-param> + <xsl:with-param name="content"> + <xsl:apply-imports/> + </xsl:with-param> + </xsl:call-template> +</xsl:template></programlisting> + +</refsect1> +</refentry> + +<refentry id="margin.note.title.Properties"> +<refmeta> +<refentrytitle>margin.note.title.properties</refentrytitle> +<refmiscinfo role="type">attribute set</refmiscinfo> +</refmeta> +<refnamediv> +<refname>margin.note.title.properties</refname> +<refpurpose>Attribute set for margin note titles</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<programlisting id="margin.note.title.properties.frag"> +<xsl:attribute-set name="margin.note.title.properties"> + <xsl:attribute name="font-weight">bold</xsl:attribute> + <xsl:attribute name="hyphenate">false</xsl:attribute> + <xsl:attribute name="text-align">start</xsl:attribute> + <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute> +</xsl:attribute-set> +</programlisting> +</refsynopsisdiv> + +<refsect1><title>Description</title> + +<para>The styling for margin note titles.</para> + +</refsect1> +</refentry> + +<refentry id="margin.note.float.type"> +<refmeta> +<refentrytitle>margin.note.float.type</refentrytitle> +<refmiscinfo role="type">list</refmiscinfo> +</refmeta> +<refnamediv> +<refname>margin.note.float.type</refname> +<refpurpose>Select type of float for margin note customizations</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<programlisting id="margin.note.float.type.frag"> +<xsl:param name="margin.note.float.type" select="'none'"></xsl:param> +</programlisting> +</refsynopsisdiv> + +<refsect1><title>Description</title> + +<para>Selects the type of float for margin notes. +DocBook does not define a margin note element, so this +feature must be implemented as a customization of the stylesheet. +See <parameter moreinfo="none">margin.note.properties</parameter> for +an example. +</para> +<itemizedlist> +<listitem> +<para>If <parameter moreinfo="none">margin.note.float.type</parameter> is +<quote><literal moreinfo="none">none</literal></quote>, then +no float is used. +</para> +</listitem> +<listitem> +<para>If <parameter moreinfo="none">margin.note.float.type</parameter> is +<quote><literal moreinfo="none">before</literal></quote>, then +the float appears at the top of the page. On some processors, +that may be the next page rather than the current page. +</para> +</listitem> +<listitem> +<para>If <parameter moreinfo="none">margin.note.float.type</parameter> is +<quote><literal moreinfo="none">left</literal></quote> or +<quote><literal moreinfo="none">start</literal></quote>, then +a left side float is used. +</para> +</listitem> +<listitem> +<para>If <parameter moreinfo="none">margin.note.float.type</parameter> is +<quote><literal moreinfo="none">right</literal></quote> or +<quote><literal moreinfo="none">end</literal></quote>, then +a right side float is used. +</para> +</listitem> +<listitem> +<para>If your XSL-FO processor supports floats positioned on the +<quote><literal moreinfo="none">inside</literal></quote> or +<quote><literal moreinfo="none">outside</literal></quote> +of double-sided pages, then you have those two +options for side floats as well. +</para> +</listitem> +</itemizedlist> + +</refsect1> +</refentry> + +<refentry id="margin.note.width"> +<refmeta> +<refentrytitle>margin.note.width</refentrytitle> +</refmeta> +<refnamediv> +<refname>margin.note.width</refname> +<refpurpose>Set the default width for margin notes</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<programlisting id="margin.note.width.frag"> +<xsl:param name="margin.note.width" select="'1in'"></xsl:param> +</programlisting> +</refsynopsisdiv> + +<refsect1><title>Description</title> + +<para>Sets the default width for margin notes when used as a side float. +The width determines the degree to which the margin note block intrudes into +the text area. +</para> +<para>If <parameter moreinfo="none">margin.note.float.type</parameter> is +<quote><literal moreinfo="none">before</literal></quote> or +<quote><literal moreinfo="none">none</literal></quote>, then +this parameter is ignored. +</para> + +</refsect1> +</refentry> + <refentry id="component.title.properties"> <refmeta> <refentrytitle>component.title.properties</refentrytitle> @@ -6678,6 +7228,7 @@ <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 name="start-indent">0pt</xsl:attribute> </xsl:attribute-set> </programlisting> </refsynopsisdiv> @@ -6711,6 +7262,7 @@ <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute> <xsl:attribute name="space-before.optimum">1.0em</xsl:attribute> <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute> + <xsl:attribute name="start-indent">0pt</xsl:attribute> </xsl:attribute-set> </programlisting> </refsynopsisdiv> @@ -8281,7 +8833,7 @@    </xsl:attribute-set> +<xsl:attribute-set name="sidebar.title.properties"> + <xsl:attribute name="font-weight">bold</xsl:attribute> + <xsl:attribute name="hyphenate">false</xsl:attribute> + <xsl:attribute name="text-align">start</xsl:attribute> + <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute> +</xsl:attribute-set> +<xsl:param name="sidebar.float.type" select="'none'"/> +<xsl:param name="sidebar.float.width" select="'1in'"/> <xsl:param name="simplesect.in.toc" select="0"/> <xsl:attribute-set name="subscript.properties"> <xsl:attribute name="font-size">75%</xsl:attribute> @@ -640,7 +698,7 @@ <xsl:param name="title.margin.left"> <xsl:choose> <xsl:when test="$passivetex.extensions != 0">0pt</xsl:when> - <xsl:otherwise>-4pc</xsl:otherwise> + <xsl:otherwise>0pt</xsl:otherwise> </xsl:choose> </xsl:param> <xsl:param name="toc.indent.width" select="24"/> @@ -653,7 +711,6 @@ <xsl:attribute name="space-after.maximum">2em</xsl:attribute> </xsl:attribute-set> <xsl:param name="toc.section.depth">2</xsl:param> -<xsl:param name="ulink.footnote.number.format" select="'1'"/> <xsl:param name="ulink.footnotes" select="0"/> <xsl:param name="ulink.hyphenate" select="''"/> <xsl:param name="ulink.show" select="1"/> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/param.xweb?r1=1.5&r2=1.6&ty=u Index: phpdoc/xsl/docbook/fo/param.xweb diff -u phpdoc/xsl/docbook/fo/param.xweb:1.5 phpdoc/xsl/docbook/fo/param.xweb:1.6 --- phpdoc/xsl/docbook/fo/param.xweb:1.5 Fri Jul 15 05:18:39 2005 +++ phpdoc/xsl/docbook/fo/param.xweb Sat Jul 16 19:38:32 2005 @@ -7,7 +7,7 @@ <bookinfo> <title>FO Parameter Reference</title> <releaseinfo role="meta"> -$Id: param.xweb,v 1.5 2005/07/15 09:18:39 techtonik Exp $ +$Id: param.xweb,v 1.6 2005/07/16 23:38:32 techtonik Exp $ </releaseinfo> <author> <surname>Walsh</surname> @@ -67,6 +67,8 @@ &admon.textlabel; &admonition.title.properties; &admonition.properties; +&graphical.admonition.properties; +&nongraphical.admonition.properties; </reference> <reference><title>Callouts</title> @@ -92,6 +94,8 @@ &index.on.type; &index.on.role; &index.preferred.page.properties; +&index.entry.properties; +&index.div.title.properties; &xep.index.item.properties; &toc.section.depth; &toc.indent.width; @@ -227,11 +231,11 @@ &blockquote.properties; &ulink.show; &ulink.footnotes; -&ulink.footnote.number.format; &ulink.hyphenate; &shade.verbatim; &shade.verbatim.style; &hyphenate.verbatim; +&hyphenate.verbatim.characters; &use.svg; &use.role.as.xrefstyle; &menuchoice.separator; @@ -241,6 +245,8 @@ &table.footnote.number.format; &footnote.number.symbols; &table.footnote.number.symbols; +&footnote.properties; +&footnote.mark.properties; &footnote.sep.leader.properties; &xref.with.number.and.title; &superscript.properties; @@ -338,6 +344,8 @@ &double.sided; &body.margin.bottom; &body.margin.top; +&body.start.indent; +&body.end.indent; &alignment; &hyphenate; &line-height; @@ -406,6 +414,13 @@ &verbatim.properties; &monospace.verbatim.properties; &sidebar.properties; +&sidebar.title.properties; +&sidebar.float.type; +&sidebar.float.width; +&margin.note.properties; +&margin.note.title.properties; +&margin.note.float.type; +&margin.note.width; &component.title.properties; &section.title.properties; &section.title.level1.properties; @@ -493,7 +508,7 @@   -<xsl:key name="id" match="*" use="@id"/> +<xsl:key name="id" match="*" use="@id|@xml:id"/>  @@ -192,6 +192,11 @@ </xsl:choose> </xsl:variable> +  + <xsl:if test="$xep.extensions != 0"> + <xsl:processing-instruction name="xep-pdf-drop-unused-destinations">false</xsl:processing-instruction> + </xsl:if> + <fo:root xsl:use-attribute-sets="root.properties"> <xsl:attribute name="language"> <xsl:call-template name="l10n.language"> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/refentry.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/fo/refentry.xsl diff -u phpdoc/xsl/docbook/fo/refentry.xsl:1.4 phpdoc/xsl/docbook/fo/refentry.xsl:1.5 --- phpdoc/xsl/docbook/fo/refentry.xsl:1.4 Fri Jul 15 04:27:49 2005 +++ phpdoc/xsl/docbook/fo/refentry.xsl Sat Jul 16 19:38:32 2005 @@ -5,7 +5,7 @@ version='1.0'>  <fo:block> <xsl:choose> + <xsl:when test="preceding-sibling::refnamediv"> +  + </xsl:when> <xsl:when test="$section.level = 1"> <fo:block xsl:use-attribute-sets="refentry.title.properties"> <fo:block xsl:use-attribute-sets="section.title.level1.properties"> @@ -333,11 +351,17 @@ </xsl:otherwise> </xsl:choose> - <fo:block space-after="1em"> + <fo:block> + <xsl:if test="not(following-sibling::refnamediv)"> + <xsl:attribute name="space-after">1em</xsl:attribute> + </xsl:if> <xsl:choose> <xsl:when test="../refmeta/refentrytitle"> <xsl:apply-templates select="../refmeta/refentrytitle"/> </xsl:when> + <xsl:when test="refdescriptor"> + <xsl:apply-templates select="refdescriptor[1]"/> + </xsl:when> <xsl:otherwise> <xsl:apply-templates select="refname[1]"/> </xsl:otherwise> @@ -345,18 +369,26 @@ <xsl:apply-templates select="refpurpose"/> </fo:block> +  </fo:block> </xsl:template> - <xsl:template match="refname"> <xsl:apply-templates/> </xsl:template> @@ -371,7 +403,7 @@ </xsl:template> <xsl:template match="refdescriptor"> -  + <xsl:apply-templates/> </xsl:template> <xsl:template match="refclass"> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/sections.xsl?r1=1.5&r2=1.6&ty=u Index: phpdoc/xsl/docbook/fo/sections.xsl diff -u phpdoc/xsl/docbook/fo/sections.xsl:1.5 phpdoc/xsl/docbook/fo/sections.xsl:1.6 --- phpdoc/xsl/docbook/fo/sections.xsl:1.5 Fri Jul 15 05:18:39 2005 +++ phpdoc/xsl/docbook/fo/sections.xsl Sat Jul 16 19:38:32 2005 @@ -5,7 +5,7 @@ version='1.0'>  + <xsl:when test="$fop.extensions != 0 or + $passivetex.extensions != 0"> + <xsl:text>100%</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:text>auto</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$default.table.width"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:value-of select="$table.width"/> + +</xsl:template> + <xsl:template match="spanspec"></xsl:template> <xsl:template match="thead"> <xsl:variable name="tgroup" select="parent::*"/> - <fo:table-header> + <fo:table-header start-indent="0pt"> <xsl:apply-templates select="row[1]"> <xsl:with-param name="spans"> <xsl:call-template name="blank.spans"> @@ -254,7 +278,7 @@ <xsl:template match="tfoot"> <xsl:variable name="tgroup" select="parent::*"/> - <fo:table-footer> + <fo:table-footer start-indent="0pt"> <xsl:apply-templates select="row[1]"> <xsl:with-param name="spans"> <xsl:call-template name="blank.spans"> @@ -269,7 +293,7 @@ <xsl:template match="tbody"> <xsl:variable name="tgroup" select="parent::*"/> - <fo:table-body> + <fo:table-body start-indent="0pt"> <xsl:apply-templates select="row[1]"> <xsl:with-param name="spans"> <xsl:call-template name="blank.spans"> @@ -585,7 +609,8 @@ --> <xsl:choose> - <xsl:when test="$xep.extensions != 0 and $orientation != ''"> + <xsl:when test="$fop.extensions = 0 and $passivetex.extensions = 0 + and $orientation != ''"> <fo:block-container reference-orientation="{$orientation}"> <xsl:if test="$rotated-width != ''"> <xsl:attribute name="width"> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/toc.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/fo/toc.xsl diff -u phpdoc/xsl/docbook/fo/toc.xsl:1.4 phpdoc/xsl/docbook/fo/toc.xsl:1.5 --- phpdoc/xsl/docbook/fo/toc.xsl:1.4 Fri Jul 15 04:27:49 2005 +++ phpdoc/xsl/docbook/fo/toc.xsl Sat Jul 16 19:38:32 2005 @@ -4,7 +4,7 @@ version='1.0'>  - -  <xsl:template name="xep-document-information"> <rx:meta-info> - <xsl:if test="(//author)[1]"> + <xsl:variable name="authors" select="(//author|//editor|//authorgroup)[1]"/> + <xsl:if test="$authors"> <xsl:element name="rx:meta-field"> <xsl:attribute name="name">author</xsl:attribute> <xsl:attribute name="value"> + <xsl:choose> + <xsl:when test="$authors[self::authorgroup]"> + <xsl:call-template name="person.name.list"> + <xsl:with-param name="person.list" select="$authors/*[self::author|self::corpauthor|self::othercredit|self::editor]"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> <xsl:call-template name="person.name"> - <xsl:with-param name="node" select="(//author)[1]"/> + <xsl:with-param name="node" select="$authors"/> </xsl:call-template> + </xsl:otherwise> + </xsl:choose> </xsl:attribute> </xsl:element> </xsl:if> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/fo/xref.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/fo/xref.xsl diff -u phpdoc/xsl/docbook/fo/xref.xsl:1.4 phpdoc/xsl/docbook/fo/xref.xsl:1.5 --- phpdoc/xsl/docbook/fo/xref.xsl:1.4 Fri Jul 15 04:27:49 2005 +++ phpdoc/xsl/docbook/fo/xref.xsl Sat Jul 16 19:38:33 2005 @@ -6,7 +6,7 @@ version='1.0'>  <xsl:choose> @@ -170,12 +171,14 @@ <xsl:apply-templates select="parent::*[2]" mode="xref-to"> <xsl:with-param name="referrer" select="$referrer"/> <xsl:with-param name="xrefstyle" select="$xrefstyle"/> + <xsl:with-param name="verbose" select="$verbose"/> </xsl:apply-templates> </xsl:when> <xsl:otherwise> <xsl:apply-templates select="parent::*" mode="xref-to"> <xsl:with-param name="referrer" select="$referrer"/> <xsl:with-param name="xrefstyle" select="$xrefstyle"/> + <xsl:with-param name="verbose" select="$verbose"/> </xsl:apply-templates> </xsl:otherwise> </xsl:choose> @@ -205,6 +208,7 @@ <xsl:template match="author|editor|othercredit|personname" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:call-template name="person.name"/> </xsl:template> @@ -212,6 +216,7 @@ <xsl:template match="authorgroup" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:call-template name="person.name.list"/> </xsl:template> @@ -219,11 +224,13 @@ <xsl:template match="figure|example|table|equation" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:apply-templates select="." mode="object.xref.markup"> <xsl:with-param name="purpose" select="'xref'"/> <xsl:with-param name="xrefstyle" select="$xrefstyle"/> <xsl:with-param name="referrer" select="$referrer"/> + <xsl:with-param name="verbose" select="$verbose"/> </xsl:apply-templates> </xsl:template> @@ -243,6 +250,7 @@ <xsl:template match="cmdsynopsis" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:apply-templates select="(.//command)[1]" mode="xref"/> </xsl:template> @@ -250,6 +258,7 @@ <xsl:template match="funcsynopsis" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:apply-templates select="(.//function)[1]" mode="xref"/> </xsl:template> @@ -257,28 +266,33 @@ <xsl:template match="dedication|preface|chapter|appendix" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:apply-templates select="." mode="object.xref.markup"> <xsl:with-param name="purpose" select="'xref'"/> <xsl:with-param name="xrefstyle" select="$xrefstyle"/> <xsl:with-param name="referrer" select="$referrer"/> + <xsl:with-param name="verbose" select="$verbose"/> </xsl:apply-templates> </xsl:template> <xsl:template match="bibliography" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:apply-templates select="." mode="object.xref.markup"> <xsl:with-param name="purpose" select="'xref'"/> <xsl:with-param name="xrefstyle" select="$xrefstyle"/> <xsl:with-param name="referrer" select="$referrer"/> + <xsl:with-param name="verbose" select="$verbose"/> </xsl:apply-templates> </xsl:template> <xsl:template match="biblioentry|bibliomixed" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/>  <xsl:text>[</xsl:text> @@ -334,11 +348,13 @@ <xsl:template match="glossary" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:apply-templates select="." mode="object.xref.markup"> <xsl:with-param name="purpose" select="'xref'"/> <xsl:with-param name="xrefstyle" select="$xrefstyle"/> <xsl:with-param name="referrer" select="$referrer"/> + <xsl:with-param name="verbose" select="$verbose"/> </xsl:apply-templates> </xsl:template> @@ -367,11 +383,13 @@ <xsl:template match="index" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:apply-templates select="." mode="object.xref.markup"> <xsl:with-param name="purpose" select="'xref'"/> <xsl:with-param name="xrefstyle" select="$xrefstyle"/> <xsl:with-param name="referrer" select="$referrer"/> + <xsl:with-param name="verbose" select="$verbose"/> </xsl:apply-templates> </xsl:template> @@ -393,11 +411,13 @@ |refsect1|refsect2|refsect3|refsection" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:apply-templates select="." mode="object.xref.markup"> <xsl:with-param name="purpose" select="'xref'"/> <xsl:with-param name="xrefstyle" select="$xrefstyle"/> <xsl:with-param name="referrer" select="$referrer"/> + <xsl:with-param name="verbose" select="$verbose"/> </xsl:apply-templates>  </xsl:template> @@ -405,11 +425,13 @@ <xsl:template match="bridgehead" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:apply-templates select="." mode="object.xref.markup"> <xsl:with-param name="purpose" select="'xref'"/> <xsl:with-param name="xrefstyle" select="$xrefstyle"/> <xsl:with-param name="referrer" select="$referrer"/> + <xsl:with-param name="verbose" select="$verbose"/> </xsl:apply-templates>  </xsl:template> @@ -443,39 +465,46 @@ <xsl:template match="qandaentry" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:apply-templates select="question[1]" mode="object.xref.markup"> <xsl:with-param name="purpose" select="'xref'"/> <xsl:with-param name="xrefstyle" select="$xrefstyle"/> <xsl:with-param name="referrer" select="$referrer"/> + <xsl:with-param name="verbose" select="$verbose"/> </xsl:apply-templates> </xsl:template> <xsl:template match="question|answer" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:apply-templates select="." mode="object.xref.markup"> <xsl:with-param name="purpose" select="'xref'"/> <xsl:with-param name="xrefstyle" select="$xrefstyle"/> <xsl:with-param name="referrer" select="$referrer"/> + <xsl:with-param name="verbose" select="$verbose"/> </xsl:apply-templates> </xsl:template> <xsl:template match="part|reference" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:apply-templates select="." mode="object.xref.markup"> <xsl:with-param name="purpose" select="'xref'"/> <xsl:with-param name="xrefstyle" select="$xrefstyle"/> <xsl:with-param name="referrer" select="$referrer"/> + <xsl:with-param name="verbose" select="$verbose"/> </xsl:apply-templates> </xsl:template> <xsl:template match="refentry" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:choose> <xsl:when test="refmeta/refentrytitle"> @@ -491,26 +520,31 @@ <xsl:template match="refnamediv" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:apply-templates select="refname[1]" mode="xref-to"> <xsl:with-param name="xrefstyle" select="$xrefstyle"/> <xsl:with-param name="referrer" select="$referrer"/> + <xsl:with-param name="verbose" select="$verbose"/> </xsl:apply-templates> </xsl:template> <xsl:template match="refname" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:apply-templates mode="xref-to"> <xsl:with-param name="xrefstyle" select="$xrefstyle"/> <xsl:with-param name="referrer" select="$referrer"/> + <xsl:with-param name="verbose" select="$verbose"/> </xsl:apply-templates> </xsl:template> <xsl:template match="step" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:call-template name="gentext"> <xsl:with-param name="key" select="'Step'"/> @@ -522,14 +556,17 @@ <xsl:template match="varlistentry" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:apply-templates select="term[1]" mode="xref-to"> <xsl:with-param name="xrefstyle" select="$xrefstyle"/> <xsl:with-param name="referrer" select="$referrer"/> + <xsl:with-param name="verbose" select="$verbose"/> </xsl:apply-templates> </xsl:template> <xsl:template match="varlistentry/term" mode="xref-to"> + <xsl:param name="verbose" select="1"/>  <xsl:apply-templates/> </xsl:template> @@ -537,6 +574,7 @@ <xsl:template match="co" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:apply-templates select="." mode="callout-bug"/> </xsl:template> @@ -544,11 +582,13 @@ <xsl:template match="book" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:apply-templates select="." mode="object.xref.markup"> <xsl:with-param name="purpose" select="'xref'"/> <xsl:with-param name="xrefstyle" select="$xrefstyle"/> <xsl:with-param name="referrer" select="$referrer"/> + <xsl:with-param name="verbose" select="$verbose"/> </xsl:apply-templates> </xsl:template> @@ -582,15 +622,10 @@ |ancestor::varlistentry)[last()]"/> <xsl:apply-templates select="$context" mode="xref-to"> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> - </xsl:template>  @@ -673,10 +708,7 @@ <xsl:when test="$ulink.footnotes != 0 and not(ancestor::footnote)"> <fo:footnote> <xsl:call-template name="ulink.footnote.number"/> - <fo:footnote-body font-family="{$body.fontset}" - font-size="{$footnote.font.size}" - font-weight="normal" - font-style="normal"> + <fo:footnote-body xsl:use-attribute-sets="footnote.properties"> <fo:block> <xsl:call-template name="ulink.footnote.number"/> <xsl:text> </xsl:text> @@ -701,7 +733,7 @@ </xsl:template> <xsl:template name="ulink.footnote.number"> - <fo:inline xsl:use-attribute-sets="superscript.properties"> + <fo:inline xsl:use-attribute-sets="footnote.mark.properties"> <xsl:choose> <xsl:when test="$fop.extensions != 0"> <xsl:attribute name="vertical-align">super</xsl:attribute> @@ -713,7 +745,7 @@ <xsl:variable name="fnum">  <xsl:number level="any" - from="chapter|appendix|preface|article|refentry|bibliography" + from="chapter|appendix|preface|article|refentry|bibliography[not(parent::article)]" count="footnote[not(@label)][not(ancestor::tgroup)]|ulink[node()][@url != .][not(ancestor::footnote)]" format="1"/> </xsl:variable> @@ -865,7 +897,7 @@ </xsl:when> <xsl:when test="$axf.extensions != 0"> <fo:basic-link external-destination="{$href}" - xsl:use-attribute-sets="xref.properties" + xsl:use-attribute-sets="olink.properties" show-destination="replace"> <xsl:copy-of select="$hottext"/> </fo:basic-link> @@ -874,7 +906,7 @@ </xsl:when> <xsl:otherwise> <fo:basic-link external-destination="{$href}" - xsl:use-attribute-sets="xref.properties" + xsl:use-attribute-sets="olink.properties" show-destination="replace"> <xsl:copy-of select="$hottext"/> </fo:basic-link> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/html/admon.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/html/admon.xsl diff -u phpdoc/xsl/docbook/html/admon.xsl:1.4 phpdoc/xsl/docbook/html/admon.xsl:1.5 --- phpdoc/xsl/docbook/html/admon.xsl:1.4 Fri Jul 15 04:27:50 2005 +++ phpdoc/xsl/docbook/html/admon.xsl Sat Jul 16 19:38:34 2005 @@ -3,7 +3,7 @@ version='1.0'>  -<xsl:key name="id" match="*" use="@id"/> +<xsl:key name="id" match="*" use="@id|@xml:id"/>  @@ -296,9 +297,11 @@    + <xsl:message>Stripping NS from DocBook-NG document.</xsl:message> <xsl:variable name="nons"> <xsl:apply-templates mode="stripNS"/> </xsl:variable> + <xsl:message>Processing stripped document.</xsl:message> <xsl:apply-templates select="exsl:node-set($nons)"/> </xsl:when> <xsl:otherwise> @@ -410,6 +413,39 @@ </xsl:choose> </xsl:template> +<xsl:template match="db:link" mode="stripNS"> + <xsl:variable xmlns:xlink="http://www.w3.org/1999/xlink" + name="href" select="@xlink:href|@href"/> + <xsl:choose> + <xsl:when test="$href != '' and not(starts-with($href,'#'))"> + <ulink url="{$href}"> + <xsl:for-each select="@*"> + <xsl:if test="local-name(.) != 'href'"> + <xsl:copy/> + </xsl:if> + </xsl:for-each> + <xsl:apply-templates mode="stripNS"/> + </ulink> + </xsl:when> + <xsl:when test="$href != '' and starts-with($href,'#')"> + <link linkend="{substring-after($href,'#')}"> + <xsl:for-each select="@*"> + <xsl:if test="local-name(.) != 'href'"> + <xsl:copy/> + </xsl:if> + </xsl:for-each> + <xsl:apply-templates mode="stripNS"/> + </link> + </xsl:when> + <xsl:otherwise> + <link> + <xsl:copy-of select="@*"/> + <xsl:apply-templates mode="stripNS"/> + </link> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + <xsl:template match="comment()|processing-instruction()|text()" mode="stripNS"> <xsl:copy/> </xsl:template> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/html/param.xml?r1=1.5&r2=1.6&ty=u Index: phpdoc/xsl/docbook/html/param.xml diff -u phpdoc/xsl/docbook/html/param.xml:1.5 phpdoc/xsl/docbook/html/param.xml:1.6 --- phpdoc/xsl/docbook/html/param.xml:1.5 Fri Jul 15 05:18:33 2005 +++ phpdoc/xsl/docbook/html/param.xml Sat Jul 16 19:38:34 2005 @@ -5,7 +5,7 @@ <bookinfo> <title>HTML Parameter Reference</title> <releaseinfo role="meta"> -$Id: param.xml,v 1.5 2005/07/15 09:18:33 techtonik Exp $ +$Id: param.xml,v 1.6 2005/07/16 23:38:34 techtonik Exp $ </releaseinfo> <author> <surname>Walsh</surname> @@ -1503,7 +1503,7 @@ </refmeta> <refnamediv> <refname>component.label.includes.part.label</refname> -<refpurpose>Do section labels include the component label?</refpurpose> +<refpurpose>Do component labels include the part label?</refpurpose> </refnamediv> <refsynopsisdiv> @@ -1512,9 +1512,10 @@ <refsect1><title>Description</title> -<para>If true (non-zero), labels for chapters, appendices, and other component +<para>If true (non-zero), number labels for chapters, appendices, and other component elements are prefixed with the label of the part element that contains them. +So you might see Chapter II.3 instead of Chapter 3. Also, the labels for formal elements such as table and figure will include the part label. If there is no part element container, then no prefix is generated. @@ -4402,12 +4403,34 @@ <refsect1><title>Description</title> <para>If non-zero, <sgmltag>variablelist</sgmltag>s will be formatted as -tables.</para> +tables. A processing instruction exists to specify a particualar width for the +column containing the <sgmltag>term</sgmltag>s: +<sgmltab class="pi">dbhtml term-width=".25in"</sgmltab></para> + +<para>You can override this setting with a processing instruction as the +child of <sgmltag>variablelist</sgmltag>: <sgmltag class="pi">dbhtml +list-presentation="table"</sgmltag> or <sgmltag class="pi">dbhtml +list-presentation="list"</sgmltag>.</para> <para>This parameter only applys to the HTML transformations. In the FO case, proper list markup is robust enough to handle the formatting. But see also <parameter moreinfo="none">variablelist.as.blocks</parameter>.</para> +<programlisting format="linespecific"> <variablelist> + <?dbhtml list-presentation="table"?> + <?dbhtml term-width="1.5in"?> + <?dbfo list-presentation="list"?> + <?dbfo term-width="1in"?> + <varlistentry> + <term>list</term> + <listitem> + <para> + Formatted as a table even if variablelist.as.table is set to 0. + </para> + </listitem> + </varlistentry> + </variablelist></programlisting> + </refsect1> </refentry> @@ -7996,7 +8019,7 @@ <xsl:stylesheet exclude-result-prefixes="src" version="1.0">   -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns:exslt="http://exslt.org/common" exslt:dummy="dummy" extension-element-prefixes="exslt" exclude-result-prefixes="exsl exslt" version="1.0"> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:db="http://docbook.org/docbook-ng" xmlns:exsl="http://exslt.org/common" xmlns:exslt="http://exslt.org/common" exslt:dummy="dummy" extension-element-prefixes="exslt" exclude-result-prefixes="db exsl exslt" version="1.0"> <xsl:output method="html" encoding="ISO-8859-1" indent="no"/>  -<xsl:key name="id" match="*" use="@id"/> +<xsl:key name="id" match="*" use="@id|@xml:id"/>  @@ -272,9 +272,11 @@    + <xsl:message>Stripping NS from DocBook-NG document.</xsl:message> <xsl:variable name="nons"> <xsl:apply-templates mode="stripNS"/> </xsl:variable> + <xsl:message>Processing stripped document.</xsl:message> <xsl:apply-templates select="exsl:node-set($nons)"/> </xsl:when> <xsl:otherwise> @@ -381,6 +383,38 @@ </xsl:choose> </xsl:template> +<xsl:template match="db:link" mode="stripNS"> + <xsl:variable xmlns:xlink="http://www.w3.org/1999/xlink" name="href" select="@xlink:href|@href"/> + <xsl:choose> + <xsl:when test="$href != '' and not(starts-with($href,'#'))"> + <ulink url="{$href}"> + <xsl:for-each select="@*"> + <xsl:if test="local-name(.) != 'href'"> + <xsl:copy/> + </xsl:if> + </xsl:for-each> + <xsl:apply-templates mode="stripNS"/> + </ulink> + </xsl:when> + <xsl:when test="$href != '' and starts-with($href,'#')"> + <link linkend="{substring-after($href,'#')}"> + <xsl:for-each select="@*"> + <xsl:if test="local-name(.) != 'href'"> + <xsl:copy/> + </xsl:if> + </xsl:for-each> + <xsl:apply-templates mode="stripNS"/> + </link> + </xsl:when> + <xsl:otherwise> + <link> + <xsl:copy-of select="@*"/> + <xsl:apply-templates mode="stripNS"/> + </link> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + <xsl:template match="comment()|processing-instruction()|text()" mode="stripNS"> <xsl:copy/> </xsl:template> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/html/refentry.xsl?r1=1.5&r2=1.6&ty=u Index: phpdoc/xsl/docbook/html/refentry.xsl diff -u phpdoc/xsl/docbook/html/refentry.xsl:1.5 phpdoc/xsl/docbook/html/refentry.xsl:1.6 --- phpdoc/xsl/docbook/html/refentry.xsl:1.5 Fri Jul 15 05:18:34 2005 +++ phpdoc/xsl/docbook/html/refentry.xsl Sat Jul 16 19:38:35 2005 @@ -3,7 +3,7 @@ version='1.0'>  + </xsl:when> <xsl:when test="$refentry.generate.name != 0"> <h2> <xsl:call-template name="gentext"> @@ -138,6 +146,7 @@ </h2> </xsl:when> </xsl:choose> + <p> <xsl:apply-templates/> </p> @@ -145,10 +154,12 @@ </xsl:template> <xsl:template match="refname"> + <xsl:if test="not(preceding-sibling::refdescriptor)"> <xsl:apply-templates/> <xsl:if test="following-sibling::refname"> <xsl:text>, </xsl:text> </xsl:if> + </xsl:if> </xsl:template> <xsl:template match="refpurpose"> @@ -161,7 +172,7 @@ </xsl:template> <xsl:template match="refdescriptor"> -  + <xsl:apply-templates/> </xsl:template> <xsl:template match="refclass"> @@ -218,11 +229,15 @@ <xsl:template match="refsection/title">  <xsl:variable name="level" select="count(ancestor-or-self::refsection)"/> + <xsl:variable name="refsynopsisdiv"> + <xsl:text>0</xsl:text> + <xsl:if test="ancestor::refsynopsisdiv">1</xsl:if> + </xsl:variable> <xsl:variable name="hlevel"> <xsl:choose> - <xsl:when test="$level > 5">6</xsl:when> + <xsl:when test="$level+$refsynopsisdiv > 5">6</xsl:when> <xsl:otherwise> - <xsl:value-of select="$level+1"/> + <xsl:value-of select="$level+1+$refsynopsisdiv"/> </xsl:otherwise> </xsl:choose> </xsl:variable> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/html/xref.xsl?r1=1.3&r2=1.4&ty=u Index: phpdoc/xsl/docbook/html/xref.xsl diff -u phpdoc/xsl/docbook/html/xref.xsl:1.3 phpdoc/xsl/docbook/html/xref.xsl:1.4 --- phpdoc/xsl/docbook/html/xref.xsl:1.3 Fri Oct 1 12:32:08 2004 +++ phpdoc/xsl/docbook/html/xref.xsl Sat Jul 16 19:38:35 2005 @@ -6,7 +6,7 @@ version='1.0'>  <xsl:choose> @@ -218,12 +219,14 @@ <xsl:apply-templates select="parent::*[2]" mode="xref-to"> <xsl:with-param name="referrer" select="$referrer"/> <xsl:with-param name="xrefstyle" select="$xrefstyle"/> + <xsl:with-param name="verbose" select="$verbose"/> </xsl:apply-templates> </xsl:when> <xsl:otherwise> <xsl:apply-templates select="parent::*" mode="xref-to"> <xsl:with-param name="referrer" select="$referrer"/> <xsl:with-param name="xrefstyle" select="$xrefstyle"/> + <xsl:with-param name="verbose" select="$verbose"/> </xsl:apply-templates> </xsl:otherwise> </xsl:choose> @@ -267,11 +270,13 @@ <xsl:template match="figure|example|table|equation" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:apply-templates select="." mode="object.xref.markup"> <xsl:with-param name="purpose" select="'xref'"/> <xsl:with-param name="xrefstyle" select="$xrefstyle"/> <xsl:with-param name="referrer" select="$referrer"/> + <xsl:with-param name="verbose" select="$verbose"/> </xsl:apply-templates> </xsl:template> @@ -299,22 +304,26 @@ <xsl:template match="dedication|preface|chapter|appendix|article" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:apply-templates select="." mode="object.xref.markup"> <xsl:with-param name="purpose" select="'xref'"/> <xsl:with-param name="xrefstyle" select="$xrefstyle"/> <xsl:with-param name="referrer" select="$referrer"/> + <xsl:with-param name="verbose" select="$verbose"/> </xsl:apply-templates> </xsl:template> <xsl:template match="bibliography" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:apply-templates select="." mode="object.xref.markup"> <xsl:with-param name="purpose" select="'xref'"/> <xsl:with-param name="xrefstyle" select="$xrefstyle"/> <xsl:with-param name="referrer" select="$referrer"/> + <xsl:with-param name="verbose" select="$verbose"/> </xsl:apply-templates> </xsl:template> @@ -329,6 +338,7 @@ <xsl:template match="biblioentry|bibliomixed" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/>  <xsl:choose> @@ -382,15 +392,20 @@ <xsl:template match="glossary" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:apply-templates select="." mode="object.xref.markup"> <xsl:with-param name="purpose" select="'xref'"/> <xsl:with-param name="xrefstyle" select="$xrefstyle"/> <xsl:with-param name="referrer" select="$referrer"/> + <xsl:with-param name="verbose" select="$verbose"/> </xsl:apply-templates> </xsl:template> <xsl:template match="glossentry" mode="xref-to"> + <xsl:param name="referrer"/> + <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:choose> <xsl:when test="$glossentry.show.acronym = 'primary'"> <xsl:choose> @@ -398,12 +413,20 @@ <xsl:apply-templates select="(acronym|abbrev)[1]"/> </xsl:when> <xsl:otherwise> - <xsl:apply-templates select="glossterm[1]" mode="xref-to"/> + <xsl:apply-templates select="glossterm[1]" mode="xref-to"> + <xsl:with-param name="xrefstyle" select="$xrefstyle"/> + <xsl:with-param name="referrer" select="$referrer"/> + <xsl:with-param name="verbose" select="$verbose"/> + </xsl:apply-templates> </xsl:otherwise> </xsl:choose> </xsl:when> <xsl:otherwise> - <xsl:apply-templates select="glossterm[1]" mode="xref-to"/> + <xsl:apply-templates select="glossterm[1]" mode="xref-to"> + <xsl:with-param name="xrefstyle" select="$xrefstyle"/> + <xsl:with-param name="referrer" select="$referrer"/> + <xsl:with-param name="verbose" select="$verbose"/> + </xsl:apply-templates> </xsl:otherwise> </xsl:choose> </xsl:template> @@ -415,11 +438,13 @@ <xsl:template match="index" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:apply-templates select="." mode="object.xref.markup"> <xsl:with-param name="purpose" select="'xref'"/> <xsl:with-param name="xrefstyle" select="$xrefstyle"/> <xsl:with-param name="referrer" select="$referrer"/> + <xsl:with-param name="verbose" select="$verbose"/> </xsl:apply-templates> </xsl:template> @@ -441,11 +466,13 @@ |refsect1|refsect2|refsect3|refsection" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:apply-templates select="." mode="object.xref.markup"> <xsl:with-param name="purpose" select="'xref'"/> <xsl:with-param name="xrefstyle" select="$xrefstyle"/> <xsl:with-param name="referrer" select="$referrer"/> + <xsl:with-param name="verbose" select="$verbose"/> </xsl:apply-templates>  </xsl:template> @@ -453,11 +480,13 @@ <xsl:template match="bridgehead" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:apply-templates select="." mode="object.xref.markup"> <xsl:with-param name="purpose" select="'xref'"/> <xsl:with-param name="xrefstyle" select="$xrefstyle"/> <xsl:with-param name="referrer" select="$referrer"/> + <xsl:with-param name="verbose" select="$verbose"/> </xsl:apply-templates>  </xsl:template> @@ -491,33 +520,39 @@ <xsl:template match="qandaentry" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:apply-templates select="question[1]" mode="object.xref.markup"> <xsl:with-param name="purpose" select="'xref'"/> <xsl:with-param name="xrefstyle" select="$xrefstyle"/> <xsl:with-param name="referrer" select="$referrer"/> + <xsl:with-param name="verbose" select="$verbose"/> </xsl:apply-templates> </xsl:template> <xsl:template match="question|answer" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:apply-templates select="." mode="object.xref.markup"> <xsl:with-param name="purpose" select="'xref'"/> <xsl:with-param name="xrefstyle" select="$xrefstyle"/> <xsl:with-param name="referrer" select="$referrer"/> + <xsl:with-param name="verbose" select="$verbose"/> </xsl:apply-templates> </xsl:template> <xsl:template match="part|reference" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:apply-templates select="." mode="object.xref.markup"> <xsl:with-param name="purpose" select="'xref'"/> <xsl:with-param name="xrefstyle" select="$xrefstyle"/> <xsl:with-param name="referrer" select="$referrer"/> + <xsl:with-param name="verbose" select="$verbose"/> </xsl:apply-templates> </xsl:template> @@ -539,16 +574,19 @@ <xsl:template match="refnamediv" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:apply-templates select="refname[1]" mode="xref-to"> <xsl:with-param name="xrefstyle" select="$xrefstyle"/> <xsl:with-param name="referrer" select="$referrer"/> + <xsl:with-param name="verbose" select="$verbose"/> </xsl:apply-templates> </xsl:template> <xsl:template match="refname" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:apply-templates mode="xref-to"/> </xsl:template> @@ -567,10 +605,12 @@ <xsl:template match="varlistentry" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:apply-templates select="term[1]" mode="xref-to"> <xsl:with-param name="xrefstyle" select="$xrefstyle"/> <xsl:with-param name="referrer" select="$referrer"/> + <xsl:with-param name="verbose" select="$verbose"/> </xsl:apply-templates> </xsl:template> @@ -592,17 +632,20 @@ <xsl:template match="book" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:apply-templates select="." mode="object.xref.markup"> <xsl:with-param name="purpose" select="'xref'"/> <xsl:with-param name="xrefstyle" select="$xrefstyle"/> <xsl:with-param name="referrer" select="$referrer"/> + <xsl:with-param name="verbose" select="$verbose"/> </xsl:apply-templates> </xsl:template> <xsl:template match="para" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> + <xsl:param name="verbose" select="1"/> <xsl:variable name="context" select="(ancestor::simplesect |ancestor::section @@ -628,14 +671,12 @@ |ancestor::listitem |ancestor::varlistentry)[last()]"/> - <xsl:apply-templates select="$context" mode="xref-to"/> - </xsl:template>  http://cvs.php.net/diff.php/phpdoc/xsl/docbook/common/ChangeLog?r1=1.5&r2=1.6&ty=u Index: phpdoc/xsl/docbook/common/ChangeLog diff -u phpdoc/xsl/docbook/common/ChangeLog:1.5 phpdoc/xsl/docbook/common/ChangeLog:1.6 --- phpdoc/xsl/docbook/common/ChangeLog:1.5 Fri Jul 15 05:18:39 2005 +++ phpdoc/xsl/docbook/common/ChangeLog Sat Jul 16 19:38:35 2005 @@ -1,3 +1,38 @@ +2005-02-12 Michael Smith <xmldoc@users.sourceforge.net> + + * .cvsignore: fa.xml, ignore + +2005-02-11 Michael Smith <xmldoc@users.sourceforge.net> + + * Makefile: fa.xml added; ported from trunk + +2005-02-11 Robert Stayton <bobstayton@users.sourceforge.net> + + * Makefile, l10n.xml: Added new fa.xml for Farsi language. + +2005-01-25 Robert Stayton <bobstayton@users.sourceforge.net> + + * labels.xsl: Fixed bug in sect1 label.markup mode that could output the + component label without the section label. + +2005-01-19 Norman Walsh <nwalsh@users.sourceforge.net> + + * titles.xsl: Support refdescriptor + + * titles.xsl: Support title in info for figure, example, and equation. This only occurs in DocBook V5 which is still pretty sporadically supported, but... + +2004-12-11 Robert Stayton <bobstayton@users.sourceforge.net> + + * common.xsl: Minor fixes for itemizedlist symbols. + +2004-12-07 Robert Stayton <bobstayton@users.sourceforge.net> + + * titles.xsl: Fixed bug #1079453, title attribute being added to non-existant element. + +2004-12-02 Michael Smith <xmldoc@users.sourceforge.net> + + * Makefile: New file. + 2004-11-18 Robert Stayton <bobstayton@users.sourceforge.net> * l10n.xsl: Fixed bug in lang selection from ancestor-or-self predicate. @@ -36,9 +71,12 @@ * targetdatabase.dtd: Changed the page element to an attribute. -2004-09-17 <petere78@users.sourceforge.net> +2004-09-17 Peter Eisentraut <petere78@users.sourceforge.net> + + * Makefile: branches: 1.22.2; + Bosnian translation by Kemal Skripic - * Makefile, l10n.xml: Bosnian translation by Kemal Skripic + * l10n.xml: Bosnian translation by Kemal Skripic 2004-09-17 Robert Stayton <bobstayton@users.sourceforge.net> @@ -192,7 +230,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.5 2005/07/15 09:18:39 techtonik Exp $ comment. + Added CVS $Id: ChangeLog,v 1.6 2005/07/16 23:38:35 techtonik Exp $ comment. 2003-11-17 Robert Stayton <bobstayton@users.sourceforge.net> @@ -770,7 +808,7 @@ 2001-04-02 Norman Walsh <nwalsh@users.sourceforge.net> - * .cvsignore, Makefile: New file. + * .cvsignore, Makefile: Make common files * common.xsl, gentext.xsl, l10n.xml, l10n.xsl, labels.xsl, subtitles.xsl, titles.xsl: New file. http://cvs.php.net/diff.php/phpdoc/xsl/docbook/common/common.xsl?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/common/common.xsl diff -u phpdoc/xsl/docbook/common/common.xsl:1.4 phpdoc/xsl/docbook/common/common.xsl:1.5 --- phpdoc/xsl/docbook/common/common.xsl:1.4 Fri Jul 15 05:18:39 2005 +++ phpdoc/xsl/docbook/common/common.xsl Sat Jul 16 19:38:35 2005 @@ -5,7 +5,7 @@ version='1.0'>  <xsl:when test="$itemsymbol = 'disc'">circle</xsl:when> - <xsl:when test="$itemsymbol = 'round'">square</xsl:when> + <xsl:when test="$itemsymbol = 'circle'">square</xsl:when> <xsl:otherwise>disc</xsl:otherwise> </xsl:choose> </xsl:template> @@ -1412,6 +1412,9 @@ <xsl:param name="node" select="."/> <xsl:choose> + <xsl:when test="@override"> + <xsl:value-of select="@override"/> + </xsl:when> <xsl:when test="$node/@mark"> <xsl:value-of select="$node/@mark"/> </xsl:when> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/common/l10n.xml?r1=1.3&r2=1.4&ty=u Index: phpdoc/xsl/docbook/common/l10n.xml diff -u phpdoc/xsl/docbook/common/l10n.xml:1.3 phpdoc/xsl/docbook/common/l10n.xml:1.4 --- phpdoc/xsl/docbook/common/l10n.xml:1.3 Fri Oct 1 12:32:09 2004 +++ phpdoc/xsl/docbook/common/l10n.xml Sat Jul 16 19:38:35 2005 @@ -14,6 +14,7 @@ <!ENTITY es SYSTEM "es.xml"> <!ENTITY et SYSTEM "et.xml"> <!ENTITY eu SYSTEM "eu.xml"> +<!ENTITY fa SYSTEM "fa.xml"> <!ENTITY fi SYSTEM "fi.xml"> <!ENTITY fr SYSTEM "fr.xml"> <!ENTITY he SYSTEM "he.xml"> @@ -61,6 +62,7 @@ &es; &et; &eu; +&fa; &fi; &fr; &he; http://cvs.php.net/diff.php/phpdoc/xsl/docbook/common/labels.xsl?r1=1.5&r2=1.6&ty=u Index: phpdoc/xsl/docbook/common/labels.xsl diff -u phpdoc/xsl/docbook/common/labels.xsl:1.5 phpdoc/xsl/docbook/common/labels.xsl:1.6 --- phpdoc/xsl/docbook/common/labels.xsl:1.5 Fri Jul 15 05:18:39 2005 +++ phpdoc/xsl/docbook/common/labels.xsl Sat Jul 16 19:38:35 2005 @@ -5,7 +5,7 @@ version='1.0'>   http://cvs.php.net/diff.php/phpdoc/xsl/docbook/htmlhelp/ChangeLog?r1=1.2&r2=1.3&ty=u Index: phpdoc/xsl/docbook/htmlhelp/ChangeLog diff -u phpdoc/xsl/docbook/htmlhelp/ChangeLog:1.2 phpdoc/xsl/docbook/htmlhelp/ChangeLog:1.3 --- phpdoc/xsl/docbook/htmlhelp/ChangeLog:1.2 Fri Jul 15 05:18:39 2005 +++ phpdoc/xsl/docbook/htmlhelp/ChangeLog Sat Jul 16 19:38:36 2005 @@ -1,3 +1,7 @@ +2004-12-02 Michael Smith <xmldoc@users.sourceforge.net> + + * Makefile: New file. + 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 @@ -67,7 +71,10 @@ 2002-06-12 Jirka Kosek <kosek@users.sourceforge.net> - * Makefile, htmlhelp-common.xsl, htmlhelp.xsl, profile-htmlhelp.xsl: + * Makefile: branches: 1.3.2; + Rearranged code so HTML Help can be easily combined with custom chunking schemes. This is needed for TDG processing. + + * htmlhelp-common.xsl, htmlhelp.xsl, profile-htmlhelp.xsl: Rearranged code so HTML Help can be easily combined with custom chunking schemes. This is needed for TDG processing. 2002-06-09 Jirka Kosek <kosek@users.sourceforge.net> @@ -96,7 +103,7 @@ 2002-03-01 Jirka Kosek <kosek@users.sourceforge.net> - * Makefile: New file. + * Makefile: First portion of new profiling code. New stylesheet parameters will come later. 2002-02-16 Jirka Kosek <kosek@users.sourceforge.net> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/lib/ChangeLog?r1=1.4&r2=1.5&ty=u Index: phpdoc/xsl/docbook/lib/ChangeLog diff -u phpdoc/xsl/docbook/lib/ChangeLog:1.4 phpdoc/xsl/docbook/lib/ChangeLog:1.5 --- phpdoc/xsl/docbook/lib/ChangeLog:1.4 Fri Jul 15 04:27:52 2005 +++ phpdoc/xsl/docbook/lib/ChangeLog Sat Jul 16 19:38:36 2005 @@ -1,3 +1,7 @@ +2004-12-02 Michael Smith <xmldoc@users.sourceforge.net> + + * Makefile: New file. + 2004-09-24 Robert Stayton <bobstayton@users.sourceforge.net> * lib.xweb: Fixed param prototype to remove Saxon8 warning. @@ -12,7 +16,8 @@ 2003-03-26 Michael Smith <xmldoc@users.sourceforge.net> - * Makefile: wdocbook.xsl obsoleted by w2docbook.xsl, updated globally + * Makefile: branches: 1.5.2; + wdocbook.xsl obsoleted by w2docbook.xsl, updated globally 2003-03-25 Michael Smith <xmldoc@users.sourceforge.net> http://cvs.php.net/diff.php/phpdoc/xsl/docbook/RELEASE-NOTES.txt?r1=1.2&r2=1.3&ty=u Index: phpdoc/xsl/docbook/RELEASE-NOTES.txt diff -u phpdoc/xsl/docbook/RELEASE-NOTES.txt:1.2 phpdoc/xsl/docbook/RELEASE-NOTES.txt:1.3 --- phpdoc/xsl/docbook/RELEASE-NOTES.txt:1.2 Fri Jul 15 05:18:39 2005 +++ phpdoc/xsl/docbook/RELEASE-NOTES.txt Sat Jul 16 19:38:36 2005 @@ -2,7 +2,7 @@ DocBook Open Repository Team -$Id: RELEASE-NOTES.txt,v 1.2 2005/07/15 09:18:39 techtonik Exp $ +$Id: RELEASE-NOTES.txt,v 1.3 2005/07/16 23:38:36 techtonik Exp $ 01 December 2004 @@ -10,6 +10,8 @@ Table of Contents +Release 1.68.1 +Release 1.68.0 Release 1.67.2 Release 1.67.1 Release 1.67.0 @@ -25,12 +27,110 @@ 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. +These are the release notes for the DocBook XSL Stylesheets. At a minimum, this +file attempts to document 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. This file also provides a high-level overview of the features added +in each release. + +Bug fixes are (mostly) not documented here. For a complete list of changes, +including descriptions of bug fixes, see the WhatsNew file, which is +auto-generated from the checkin descriptions for changes in the project CVS +repository. + +Release 1.68.1 + +The release adds localization support for Farsi (thanks to Sina Heshmati) and +improved support for the XLink-based DocBook NG db:link element. Other than +that, it is a minor bug-fix update to the 1.68.0 release. The main thing it +fixes is a build error that caused the XSLT Java extensions to be jarred up +with the wrong package structure. Thanks to Jens Stavnstrup for quickly +reporting the problem, and to Mauritz Jeanson for investigating and finding the +cause. -You may also be interested in the more detailed WhatsNew file. +Release 1.68.0 + +This release includes some features changes, particularly for FO/PDF output, +and a number of bug fixes. + +FO + + * Moved footnote properties to attribute-sets. + + * Added support for side floats, margin notes, and custom floats. + + * Added new parameters body.start.indent and body.end.indent to the + set.flow.properties template. + + * Added support for xml:id + + * Added support for refdescriptor. + + * Added support for multiple refnamedivs. + + * Added index.entry.properties attribute-set to support customization of + index entries. + + * Added set.flow.properties template call to each fo:flow to support + customizations entry point. + + * Add support for @floatstyle in figure + + * Moved hardcoded properties for index division titles to the + index.div.title.properties attribute-set. + + * Added support for table-layout="auto" for XEP. + + * Added index.div.title.properties attribute-set. + + * $verbose parameter is now passed to most elements. + + * Added refentry to toc in part, as it is permitted by the DocBook schema/ + DTD. + + * Added backmatter elements and article to toc in part, since they are + permitted by the DocBook schema/DTD. + + * Added mode="toc" for simplesect, since it is now permitted in the toc if + simplesect.in.toc is set. + + * Moved hard-coded properties to nongraphical.admonintion.properties and + graphical.admonition.properties attribute sets. + + * Added support for sidebar-width and float-type processing instructions in + sidebar. + + * For tables with HTML markup elements, added support for dbfo bgcolor PI, + the attribute-sets named table.properties, informaltable.properties, + table.table.properties, and table.cell.padding. Also added support for the + templates named table.cell.properties and table.cell.block.properties so + that tabstyles can be implemented. Also added support for tables containing + only tr instead of tbody with tr. + + * Added new paramater hyphenate.verbatim.characters which can specify + characters after which a line break can occur in verbatim environments. + This parameter can be used to extend the initial set of characters which + contain only space and non-breakable space. + + * Added itemizedlist.label.markup to enable selection of different bullet + symbol. Also added several potential bullet characters, commented out by + default. + + * Enabled all id's in XEP output for external olinking. + +HTML + + * Added support for refdescriptor. + + * Added support for multiple refnamedivs. + + * Added support for xml:id + + * refsynopsisdiv as a section for counting section levels + +Images + + * Added new SVG admonition graphics and navigation images. Release 1.67.2 @@ -111,9 +211,9 @@ 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: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 http://cvs.php.net/diff.php/phpdoc/xsl/docbook/VERSION?r1=1.5&r2=1.6&ty=u Index: phpdoc/xsl/docbook/VERSION diff -u phpdoc/xsl/docbook/VERSION:1.5 phpdoc/xsl/docbook/VERSION:1.6 --- phpdoc/xsl/docbook/VERSION:1.5 Fri Jul 15 05:18:39 2005 +++ phpdoc/xsl/docbook/VERSION Sat Jul 16 19:38:36 2005 @@ -12,7 +12,7 @@ <fm:project> <fm:Project>DocBook</fm:Project> <fm:Branch>XSL Stylesheets</fm:Branch> - <fm:Version>1.67.2</fm:Version> + <fm:Version>1.68.1</fm:Version>  @@ -34,7 +34,7 @@ <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 table bug introduced by the 1.67.1 release. + <fm:Changes>This is a minor bug-fix update to the 1.68.0 release. </fm:Changes> </fm:project>