cvs: phpdoc /docbook/docbook-xsl/fo admon.xsl annotations.xsl autoidx-kimber.xsl autoidx-kosek.xsl autoidx-ng.xsl autoidx.xsl autotoc.xsl axf.xsl
biblio.xsl block.xsl callout.xsl component.xsl division.xsl docbook.xsl ebnf.xsl fo-patch-for-fop.xsl fo-rtf.xsl fo.xsl footnote.xsl fop.xsl
formal.xsl glossary.xsl graphics.xsl highlight.xsl htmltbl.xsl index.xsl info.xsl inline.xsl keywords.xsl lists.xsl math.xsl pagesetup.xsl param.xsl
passivetex.xsl pi.xsl profile-docbook.xsl qandaset.xsl refentry.xsl sections.xsl spaces.xsl synop.xsl table.xsl task.xsl titlepage.templates.xml
titlepage.xsl toc.xsl verbatim.xsl xep.xsl xref.xsl

From:	Hannes Magnusson	Date:	Tue, 30 Jan 2007 18:11:32 +0000
Subject:	cvs: phpdoc /docbook/docbook-xsl/fo admon.xsl annotations.xsl autoidx-kimber.xsl autoidx-kosek.xsl autoidx-ng.xsl autoidx.xsl autotoc.xsl axf.xsl biblio.xsl block.xsl callout.xsl component.xsl division.xsl docbook.xsl ebnf.xsl fo-patch-for-fop.xsl fo-rtf.xsl fo.xsl footnote.xsl fop.xsl formal.xsl glossary.xsl graphics.xsl highlight.xsl htmltbl.xsl index.xsl info.xsl inline.xsl keywords.xsl lists.xsl math.xsl pagesetup.xsl param.xsl passivetex.xsl pi.xsl profile-docbook.xsl qandaset.xsl refentry.xsl sections.xsl spaces.xsl synop.xsl table.xsl task.xsl titlepage.templates.xml titlepage.xsl toc.xsl verbatim.xsl xep.xsl xref.xsl
Groups:	php.doc
Request:	Send a blank email to phpdoc+get-969375101@lists.php.net to get a copy of this message

bjori Tue Jan 30 18:11:32 2007 UTC Added files: /phpdoc/docbook/docbook-xsl/fo annotations.xsl titlepage.templates.xml Modified files: /phpdoc/docbook/docbook-xsl/fo admon.xsl autoidx-kimber.xsl autoidx-kosek.xsl autoidx-ng.xsl autoidx.xsl autotoc.xsl axf.xsl biblio.xsl block.xsl callout.xsl component.xsl division.xsl docbook.xsl ebnf.xsl fo-patch-for-fop.xsl fo-rtf.xsl fo.xsl footnote.xsl fop.xsl formal.xsl glossary.xsl graphics.xsl highlight.xsl htmltbl.xsl index.xsl info.xsl inline.xsl keywords.xsl lists.xsl math.xsl pagesetup.xsl param.xsl passivetex.xsl pi.xsl profile-docbook.xsl qandaset.xsl refentry.xsl sections.xsl spaces.xsl synop.xsl table.xsl task.xsl titlepage.xsl toc.xsl verbatim.xsl xep.xsl xref.xsl Log: Upgrade to docbook-xsl 1.72.0

http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/fo/admon.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/fo/admon.xsl diff -u phpdoc/docbook/docbook-xsl/fo/admon.xsl:1.1 phpdoc/docbook/docbook-xsl/fo/admon.xsl:1.2 --- phpdoc/docbook/docbook-xsl/fo/admon.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/fo/admon.xsl Tue Jan 30 18:11:31 2007 @@ -4,7 +4,7 @@ version='1.0'>  <xsl:template name="toc.line"> + <xsl:param name="toc-context" select="NOTANODE"/> + <xsl:variable name="id"> <xsl:call-template name="object.id"/> </xsl:variable> @@ -264,7 +266,9 @@ </xsl:call-template> </xsl:variable> - <xsl:call-template name="toc.line"/> + <xsl:call-template name="toc.line"> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:call-template> <xsl:variable name="nodes" select="qandadiv|qandaentry"/> @@ -287,7 +291,7 @@ <xsl:template match="question" mode="toc"> <xsl:variable name="firstchunk"> - <xsl:apply-templates select="(*[name(.)!='label'])[1]/node()"/> + <xsl:apply-templates select="(*[local-name(.)!='label'])[1]/node()"/> </xsl:variable> <xsl:variable name="deflabel"> @@ -357,7 +361,9 @@ </xsl:call-template> </xsl:variable> - <xsl:call-template name="toc.line"/> + <xsl:call-template name="toc.line"> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:call-template> <xsl:variable name="nodes" select="glossary|bibliography|preface|chapter |reference|part|article|appendix|index"/> @@ -392,7 +398,9 @@ </xsl:call-template> </xsl:variable> - <xsl:call-template name="toc.line"/> + <xsl:call-template name="toc.line"> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:call-template> <xsl:variable name="nodes" select="chapter|appendix|preface|reference| refentry|article|index|glossary| @@ -430,7 +438,9 @@ <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/> - <xsl:call-template name="toc.line"/> + <xsl:call-template name="toc.line"> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:call-template> <xsl:if test="$toc.section.depth > 0 and $toc.max.depth > $depth.from.context @@ -450,7 +460,9 @@ <xsl:template match="refentry" mode="toc"> <xsl:param name="toc-context" select="."/> - <xsl:call-template name="toc.line"/> + <xsl:call-template name="toc.line"> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:call-template> </xsl:template> <xsl:template match="preface|chapter|appendix|article" @@ -467,7 +479,9 @@ </xsl:call-template> </xsl:variable> - <xsl:call-template name="toc.line"/> + <xsl:call-template name="toc.line"> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:call-template> <xsl:variable name="nodes" select="section|sect1 |simplesect[$simplesect.in.toc != 0] @@ -503,7 +517,9 @@ </xsl:call-template> </xsl:variable> - <xsl:call-template name="toc.line"/> + <xsl:call-template name="toc.line"> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:call-template> <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/> @@ -535,7 +551,9 @@ </xsl:call-template> </xsl:variable> - <xsl:call-template name="toc.line"/> + <xsl:call-template name="toc.line"> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:call-template> <xsl:variable name="reldepth" select="count(ancestor::*)-count($toc-context/ancestor::*)"/> @@ -572,7 +590,9 @@ </xsl:call-template> </xsl:variable> - <xsl:call-template name="toc.line"/> + <xsl:call-template name="toc.line"> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:call-template> <xsl:variable name="reldepth" select="count(ancestor::*)-count($toc-context/ancestor::*)"/> @@ -609,7 +629,9 @@ </xsl:call-template> </xsl:variable> - <xsl:call-template name="toc.line"/> + <xsl:call-template name="toc.line"> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:call-template> <xsl:variable name="reldepth" select="count(ancestor::*)-count($toc-context/ancestor::*)"/> @@ -636,7 +658,9 @@ <xsl:template match="sect5|simplesect" mode="toc"> <xsl:param name="toc-context" select="."/> - <xsl:call-template name="toc.line"/> + <xsl:call-template name="toc.line"> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:call-template> </xsl:template> <xsl:template name="set.toc.indent"> @@ -684,7 +708,9 @@ <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/> <xsl:if test="$toc.section.depth >= $depth"> - <xsl:call-template name="toc.line"/> + <xsl:call-template name="toc.line"> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:call-template> <xsl:if test="$toc.section.depth > $depth and $toc.max.depth > $depth.from.context @@ -708,14 +734,18 @@ mode="toc"> <xsl:param name="toc-context" select="."/> - <xsl:call-template name="toc.line"/> + <xsl:call-template name="toc.line"> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:call-template> </xsl:template> <xsl:template match="index" mode="toc"> <xsl:param name="toc-context" select="."/> <xsl:if test="* or $generate.index != 0"> - <xsl:call-template name="toc.line"/> + <xsl:call-template name="toc.line"> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:call-template> </xsl:if> </xsl:template> @@ -764,7 +794,10 @@ </xsl:template> <xsl:template match="figure|table|example|equation|procedure" mode="toc"> - <xsl:call-template name="toc.line"/> + <xsl:param name="toc-context" select="."/> + <xsl:call-template name="toc.line"> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:call-template> </xsl:template>  http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/fo/axf.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/fo/axf.xsl diff -u phpdoc/docbook/docbook-xsl/fo/axf.xsl:1.1 phpdoc/docbook/docbook-xsl/fo/axf.xsl:1.2 --- phpdoc/docbook/docbook-xsl/fo/axf.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/fo/axf.xsl Tue Jan 30 18:11:31 2007 @@ -5,7 +5,7 @@ version='1.0'>  <xsl:template name="axf-document-information"> @@ -83,4 +83,28 @@ </xsl:template> + +<xsl:template name="axf-page-master-properties"> + <xsl:param name="page.master" select="''"/> + + <xsl:if test="$crop.marks != 0"> + <xsl:attribute name="axf:printer-marks">crop</xsl:attribute> + <xsl:attribute name="axf:bleed"><xsl:value-of + select="$crop.mark.bleed"/></xsl:attribute> + <xsl:attribute name="axf:printer-marks-line-width"><xsl:value-of + select="$crop.mark.width"/></xsl:attribute> + <xsl:attribute name="axf:crop-offset"><xsl:value-of + select="$crop.mark.offset"/></xsl:attribute> + </xsl:if> + + <xsl:call-template name="user-axf-page-master-properties"> + <xsl:with-param name="page.master" select="$page.master"/> + </xsl:call-template> + +</xsl:template> + +<xsl:template name="user-axf-page-master-properties"> + <xsl:param name="page.master" select="''"/> +</xsl:template> + </xsl:stylesheet> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/fo/biblio.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/fo/biblio.xsl diff -u phpdoc/docbook/docbook-xsl/fo/biblio.xsl:1.1 phpdoc/docbook/docbook-xsl/fo/biblio.xsl:1.2 --- phpdoc/docbook/docbook-xsl/fo/biblio.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/fo/biblio.xsl Tue Jan 30 18:11:31 2007 @@ -4,7 +4,7 @@ version='1.0'> </xsl:otherwise> @@ -316,7 +320,8 @@ </fo:inline> </xsl:template> -<xsl:template match="artheader|articleinfo" mode="bibliography.mode"> +<xsl:template match="artheader|articleinfo|article/info" + mode="bibliography.mode"> <fo:inline> <xsl:apply-templates mode="bibliography.mode"/> <xsl:value-of select="$biblioentry.item.separator"/> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/fo/block.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/fo/block.xsl diff -u phpdoc/docbook/docbook-xsl/fo/block.xsl:1.1 phpdoc/docbook/docbook-xsl/fo/block.xsl:1.2 --- phpdoc/docbook/docbook-xsl/fo/block.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/fo/block.xsl Tue Jan 30 18:11:31 2007 @@ -4,7 +4,7 @@ version='1.0'>   -<xsl:template match="blockinfo"> +<xsl:template match="blockinfo|info">  </xsl:template> @@ -24,9 +24,7 @@ <xsl:template name="block.object"> <fo:block> - <xsl:if test="@id"> - <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute> - </xsl:if> + <xsl:call-template name="anchor"/> <xsl:apply-templates/> </fo:block> </xsl:template> @@ -42,23 +40,24 @@ <xsl:template match="simpara"> <fo:block xsl:use-attribute-sets="normal.para.spacing"> - <xsl:if test="@id"> - <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute> - </xsl:if> + <xsl:call-template name="anchor"/> <xsl:apply-templates/> </fo:block> </xsl:template> <xsl:template match="formalpara"> <fo:block xsl:use-attribute-sets="normal.para.spacing"> - <xsl:if test="@id"> - <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute> - </xsl:if> + <xsl:call-template name="anchor"/> <xsl:apply-templates/> </fo:block> </xsl:template> -<xsl:template match="formalpara/title"> + +<xsl:template match="formalpara/info"> + <xsl:apply-templates select="title"/> +</xsl:template> + +<xsl:template match="formalpara/title|formalpara/info/title"> <xsl:variable name="titleStr"> <xsl:apply-templates/> </xsl:variable> @@ -90,7 +89,7 @@ <fo:block xsl:use-attribute-sets="blockquote.properties"> <xsl:call-template name="anchor"/> <fo:block> - <xsl:if test="title"> + <xsl:if test="title|info/title"> <fo:block xsl:use-attribute-sets="formal.title.properties"> <xsl:apply-templates select="." mode="object.title.markup"/> </fo:block> @@ -263,10 +262,11 @@ <xsl:otherwise> <xsl:variable name="content"> <fo:block xsl:use-attribute-sets="sidebar.properties" - id="{$id}"> - <xsl:call-template name="sidebar.titlepage"/> + id="{$id}"> + <xsl:call-template name="sidebar.titlepage"/> <xsl:apply-templates select="node()[not(self::title) and - not(self::sidebarinfo)]"/> + not(self::info) and + not(self::sidebarinfo)]"/> </fo:block> </xsl:variable> @@ -326,9 +326,9 @@ </xsl:template> -<xsl:template match="sidebar/title|sidebarinfo"/> +<xsl:template match="sidebar/title|sidebarinfo|sidebar/info"/> -<xsl:template match="sidebar/title|sidebarinfo/title" +<xsl:template match="sidebar/title|sidebarinfo/title|sidebar/info/title" mode="titlepage.mode" priority="1"> <fo:block xsl:use-attribute-sets="sidebar.title.properties"> <xsl:apply-templates/> @@ -399,14 +399,12 @@ <xsl:template match="abstract"> <fo:block xsl:use-attribute-sets="abstract.properties"> - <xsl:if test="@id"> - <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute> - </xsl:if> + <xsl:call-template name="anchor"/> <xsl:apply-templates/> </fo:block> </xsl:template> -<xsl:template match="abstract/title"> +<xsl:template match="abstract/title|abstract/info/title"> <fo:block xsl:use-attribute-sets="abstract.title.properties"> <xsl:apply-templates/> </fo:block> @@ -506,9 +504,7 @@ <xsl:template match="revhistory"> <fo:table table-layout="fixed" xsl:use-attribute-sets="revhistory.table.properties"> - <xsl:if test="@id"> - <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute> - </xsl:if> + <xsl:call-template name="anchor"/> <fo:table-column column-number="1" column-width="proportional-column-width(1)"/> <fo:table-column column-number="2" column-width="proportional-column-width(1)"/> <fo:table-column column-number="3" column-width="proportional-column-width(1)"/> @@ -535,9 +531,7 @@ <fo:table-row> <fo:table-cell xsl:use-attribute-sets="revhistory.table.cell.properties"> <fo:block> - <xsl:if test="@id"> - <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute> - </xsl:if> + <xsl:call-template name="anchor"/> <xsl:if test="$revnumber"> <xsl:call-template name="gentext"> <xsl:with-param name="key" select="'Revision'"/> @@ -602,9 +596,7 @@ <xsl:template match="ackno"> <fo:block xsl:use-attribute-sets="normal.para.spacing"> - <xsl:if test="@id"> - <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute> - </xsl:if> + <xsl:call-template name="anchor"/> <xsl:apply-templates/> </fo:block> </xsl:template> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/fo/callout.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/fo/callout.xsl diff -u phpdoc/docbook/docbook-xsl/fo/callout.xsl:1.1 phpdoc/docbook/docbook-xsl/fo/callout.xsl:1.2 --- phpdoc/docbook/docbook-xsl/fo/callout.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/fo/callout.xsl Tue Jan 30 18:11:31 2007 @@ -8,7 +8,7 @@ version='1.0'>  <xsl:variable name="co" select="key('id', @linkend)"/> - <xsl:variable name="id" select="@id"/> <xsl:choose> <xsl:when test="not($co)"> <xsl:message> @@ -110,11 +110,7 @@ </xsl:when> <xsl:otherwise> <fo:inline> - <xsl:if test="$id != ''"> - <xsl:attribute name="id"> - <xsl:value-of select="$id"/> - </xsl:attribute> - </xsl:if> + <xsl:call-template name="anchor"/> <xsl:apply-templates select="$co" mode="callout-bug"/> </fo:inline> </xsl:otherwise> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/fo/component.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/fo/component.xsl diff -u phpdoc/docbook/docbook-xsl/fo/component.xsl:1.1 phpdoc/docbook/docbook-xsl/fo/component.xsl:1.2 --- phpdoc/docbook/docbook-xsl/fo/component.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/fo/component.xsl Tue Jan 30 18:11:31 2007 @@ -5,7 +5,7 @@ version='1.0'>  + <xsl:variable name="is.idref"> + <xsl:choose> +  +  + <xsl:when test="starts-with($xhref,'#') + and (not(contains($xhref,'(')) + or starts-with($xhref, + '#xpointer(id('))">1</xsl:when> + <xsl:otherwise>0</xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:choose> + <xsl:when test="$is.idref = 1"> + + <xsl:variable name="idref"> + <xsl:call-template name="xpointer.idref"> + <xsl:with-param name="xpointer" select="$xhref"/> + </xsl:call-template> + </xsl:variable> + + <xsl:variable name="targets" select="key('id',$idref)"/> + <xsl:variable name="target" select="$targets[1]"/> + + <xsl:call-template name="check.id.unique"> + <xsl:with-param name="linkend" select="$idref"/> + </xsl:call-template> + <xsl:choose> -  -  - <xsl:when test="starts-with(@xlink:href,'#') - and (not(contains(@xlink:href,'(')) - or starts-with(@xlink:href,'#xpointer(id('))"> - <xsl:variable name="idref"> - <xsl:call-template name="xpointer.idref"> - <xsl:with-param name="xpointer" select="@xlink:href"/> - </xsl:call-template> - </xsl:variable> - - <xsl:variable name="targets" select="key('id',$idref)"/> - <xsl:variable name="target" select="$targets[1]"/> - - <xsl:call-template name="check.id.unique"> - <xsl:with-param name="linkend" select="@linkend"/> - </xsl:call-template> - - <xsl:choose> - <xsl:when test="count($target) = 0"> - <xsl:message> - <xsl:text>XLink to nonexistent id: </xsl:text> - <xsl:value-of select="$idref"/> - </xsl:message> - <xsl:text>???</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:attribute name="internal-destination"> - <xsl:value-of select="$target/@id"/> - </xsl:attribute> - </xsl:otherwise> - </xsl:choose> + <xsl:when test="count($target) = 0"> + <xsl:message> + <xsl:text>XLink to nonexistent id: </xsl:text> + <xsl:value-of select="$idref"/> + </xsl:message> + <xsl:copy-of select="$content"/> </xsl:when> -  <xsl:otherwise> - <xsl:attribute name="internal-destination"> - <xsl:value-of select="@xlink:href"/> - </xsl:attribute> + <fo:basic-link internal-destination="{$idref}"> + <xsl:copy-of select="$content"/> + </fo:basic-link> </xsl:otherwise> </xsl:choose> - </xsl:attribute> - <xsl:copy-of select="$content"/> - </fo:basic-link> + </xsl:when> + +  + <xsl:otherwise> + <fo:basic-link external-destination="url({$xhref})"> + <xsl:copy-of select="$content"/> + </fo:basic-link> + </xsl:otherwise> + </xsl:choose> + </xsl:when> + + <xsl:when test="$linkend"> + <xsl:variable name="targets" select="key('id',$linkend)"/> + <xsl:variable name="target" select="$targets[1]"/> + + <xsl:call-template name="check.id.unique"> + <xsl:with-param name="linkend" select="$linkend"/> + </xsl:call-template> + + <xsl:choose> + <xsl:when test="count($target) = 0"> + <xsl:message> + <xsl:text>XLink to nonexistent id: </xsl:text> + <xsl:value-of select="$linkend"/> + </xsl:message> + <xsl:copy-of select="$content"/> + </xsl:when> + + <xsl:otherwise> + <fo:basic-link internal-destination="{$linkend}"> + <xsl:copy-of select="$content"/> + </fo:basic-link> + </xsl:otherwise> + </xsl:choose> </xsl:when> + <xsl:otherwise> <xsl:copy-of select="$content"/> </xsl:otherwise> </xsl:choose> + </xsl:template> <xsl:template name="inline.charseq"> <xsl:param name="content"> - <xsl:apply-templates/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:apply-templates/> + </xsl:with-param> + </xsl:call-template> </xsl:param> <xsl:choose> @@ -115,8 +157,13 @@ <xsl:template name="inline.monoseq"> <xsl:param name="content"> - <xsl:apply-templates/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:apply-templates/> + </xsl:with-param> + </xsl:call-template> </xsl:param> + <fo:inline xsl:use-attribute-sets="monospace.properties"> <xsl:if test="@dir"> <xsl:attribute name="direction"> @@ -132,8 +179,13 @@ <xsl:template name="inline.boldseq"> <xsl:param name="content"> - <xsl:apply-templates/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:apply-templates/> + </xsl:with-param> + </xsl:call-template> </xsl:param> + <fo:inline font-weight="bold"> <xsl:if test="@dir"> <xsl:attribute name="direction"> @@ -149,14 +201,15 @@ <xsl:template name="inline.italicseq"> <xsl:param name="content"> - <xsl:apply-templates/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:apply-templates/> + </xsl:with-param> + </xsl:call-template> </xsl:param> + <fo:inline font-style="italic"> - <xsl:if test="@id"> - <xsl:attribute name="id"> - <xsl:value-of select="@id"/> - </xsl:attribute> - </xsl:if> + <xsl:call-template name="anchor"/> <xsl:if test="@dir"> <xsl:attribute name="direction"> <xsl:choose> @@ -171,14 +224,15 @@ <xsl:template name="inline.boldmonoseq"> <xsl:param name="content"> - <xsl:apply-templates/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:apply-templates/> + </xsl:with-param> + </xsl:call-template> </xsl:param> + <fo:inline font-weight="bold" xsl:use-attribute-sets="monospace.properties"> - <xsl:if test="@id"> - <xsl:attribute name="id"> - <xsl:value-of select="@id"/> - </xsl:attribute> - </xsl:if> + <xsl:call-template name="anchor"/> <xsl:if test="@dir"> <xsl:attribute name="direction"> <xsl:choose> @@ -193,14 +247,15 @@ <xsl:template name="inline.italicmonoseq"> <xsl:param name="content"> - <xsl:apply-templates/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:apply-templates/> + </xsl:with-param> + </xsl:call-template> </xsl:param> + <fo:inline font-style="italic" xsl:use-attribute-sets="monospace.properties"> - <xsl:if test="@id"> - <xsl:attribute name="id"> - <xsl:value-of select="@id"/> - </xsl:attribute> - </xsl:if> + <xsl:call-template name="anchor"/> <xsl:if test="@dir"> <xsl:attribute name="direction"> <xsl:choose> @@ -215,15 +270,15 @@ <xsl:template name="inline.superscriptseq"> <xsl:param name="content"> - <xsl:apply-templates/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:apply-templates/> + </xsl:with-param> + </xsl:call-template> </xsl:param> <fo:inline xsl:use-attribute-sets="superscript.properties"> - <xsl:if test="@id"> - <xsl:attribute name="id"> - <xsl:value-of select="@id"/> - </xsl:attribute> - </xsl:if> + <xsl:call-template name="anchor"/> <xsl:if test="@dir"> <xsl:attribute name="direction"> <xsl:choose> @@ -246,15 +301,15 @@ <xsl:template name="inline.subscriptseq"> <xsl:param name="content"> - <xsl:apply-templates/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:apply-templates/> + </xsl:with-param> + </xsl:call-template> </xsl:param> <fo:inline xsl:use-attribute-sets="subscript.properties"> - <xsl:if test="@id"> - <xsl:attribute name="id"> - <xsl:value-of select="@id"/> - </xsl:attribute> - </xsl:if> + <xsl:call-template name="anchor"/> <xsl:if test="@dir"> <xsl:attribute name="direction"> <xsl:choose> @@ -279,15 +334,27 @@  <xsl:template match="author"> - <xsl:call-template name="person.name"/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:call-template name="person.name"/> + </xsl:with-param> + </xsl:call-template> </xsl:template> <xsl:template match="editor"> - <xsl:call-template name="person.name"/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:call-template name="person.name"/> + </xsl:with-param> + </xsl:call-template> </xsl:template> <xsl:template match="othercredit"> - <xsl:call-template name="person.name"/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:call-template name="person.name"/> + </xsl:with-param> + </xsl:call-template> </xsl:template> <xsl:template match="authorinitials"> @@ -560,7 +627,7 @@ <xsl:variable name="depth"> <xsl:call-template name="dot.count"> <xsl:with-param name="string"> - <xsl:number level="multiple"/> + <xsl:number level="multiple"/> </xsl:with-param> </xsl:call-template> </xsl:variable> @@ -722,14 +789,9 @@ </xsl:when> <xsl:otherwise> <xsl:variable name="id"> - <xsl:choose> - <xsl:when test="$cterm/@id"> - <xsl:value-of select="$cterm/@id"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="generate-id($cterm)"/> - </xsl:otherwise> - </xsl:choose> + <xsl:call-template name="object.id"> + <xsl:with-param name="object" select="$cterm"/> + </xsl:call-template> </xsl:variable> <fo:basic-link internal-destination="{$id}" xsl:use-attribute-sets="xref.properties"> @@ -943,10 +1005,6 @@ </xsl:for-each> </xsl:template> -<xsl:template match="orgname"> - <xsl:call-template name="inline.charseq"/> -</xsl:template> - <xsl:template match="uri"> <xsl:call-template name="inline.monoseq"/> </xsl:template> @@ -993,8 +1051,8 @@ <xsl:otherwise> <xsl:variable name="node" select="$nodelist[$count=position()]"/> <xsl:choose> - <xsl:when test="name($node)='guimenuitem' - or name($node)='guisubmenu'"> + <xsl:when test="local-name($node)='guimenuitem' + or local-name($node)='guisubmenu'"> <xsl:copy-of select="$mm.separator"/> </xsl:when> <xsl:otherwise> @@ -1021,13 +1079,25 @@ <xsl:template match="citation">  <xsl:variable name="targets" select="(//biblioentry | //bibliomixed)[abbrev = string(current())]"/> + <xsl:variable name="target" select="$targets[1]"/> <xsl:choose> - <xsl:when test="$targets"> - <xsl:call-template name="xref"> - <xsl:with-param name="targets" select="$targets"/> - </xsl:call-template> +  + <xsl:when test="$target and not(xref) and not(link)"> + + <xsl:text>[</xsl:text> + <fo:basic-link> + <xsl:attribute name="internal-destination"> + <xsl:call-template name="object.id"> + <xsl:with-param name="object" select="$target"/> + </xsl:call-template> + </xsl:attribute> + + <xsl:call-template name="inline.charseq"/> + </fo:basic-link> + <xsl:text>]</xsl:text> </xsl:when> + <xsl:otherwise> <xsl:text>[</xsl:text> <xsl:call-template name="inline.charseq"/> @@ -1087,29 +1157,37 @@  <xsl:template match="personname"> - <xsl:call-template name="person.name"/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:call-template name="person.name"/> + </xsl:with-param> + </xsl:call-template> </xsl:template> <xsl:template match="jobtitle"> - <xsl:apply-templates/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:apply-templates/> + </xsl:with-param> + </xsl:call-template> </xsl:template>  <xsl:template match="org"> - <xsl:apply-templates/> + <xsl:call-template name="inline.charseq"/> </xsl:template> <xsl:template match="orgname"> - <xsl:apply-templates/> + <xsl:call-template name="inline.charseq"/> </xsl:template> <xsl:template match="orgdiv"> - <xsl:apply-templates/> + <xsl:call-template name="inline.charseq"/> </xsl:template> <xsl:template match="affiliation"> - <xsl:apply-templates/> + <xsl:call-template name="inline.charseq"/> </xsl:template>  http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/fo/keywords.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/fo/keywords.xsl diff -u phpdoc/docbook/docbook-xsl/fo/keywords.xsl:1.1 phpdoc/docbook/docbook-xsl/fo/keywords.xsl:1.2 --- phpdoc/docbook/docbook-xsl/fo/keywords.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/fo/keywords.xsl Tue Jan 30 18:11:31 2007 @@ -4,7 +4,7 @@ version='1.0'>  <xsl:otherwise> @@ -875,7 +881,11 @@ </xsl:template> <xsl:template match="member"> - <xsl:apply-templates/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:apply-templates/> + </xsl:with-param> + </xsl:call-template> </xsl:template>  @@ -1142,8 +1152,9 @@ <fo:block id="{$id}" text-align="{$alignment}">  - <xsl:if test="title"> - <xsl:apply-templates select="title" mode="list.title.mode"/> + <xsl:if test="title|info/title"> + <xsl:apply-templates select="(title|info/title)[1]" + mode="list.title.mode"/> </xsl:if>  http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/fo/math.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/fo/math.xsl diff -u phpdoc/docbook/docbook-xsl/fo/math.xsl:1.1 phpdoc/docbook/docbook-xsl/fo/math.xsl:1.2 --- phpdoc/docbook/docbook-xsl/fo/math.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/fo/math.xsl Tue Jan 30 18:11:31 2007 @@ -6,7 +6,7 @@ version='1.0'>  <xsl:variable name="pageclass"> @@ -1739,7 +1929,7 @@ <xsl:template match="*" mode="running.foot.mode"> <xsl:param name="master-reference" select="'unknown'"/> - <xsl:param name="gentext-key" select="name(.)"/> + <xsl:param name="gentext-key" select="local-name(.)"/>  <xsl:variable name="pageclass"> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/fo/param.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/fo/param.xsl diff -u phpdoc/docbook/docbook-xsl/fo/param.xsl:1.1 phpdoc/docbook/docbook-xsl/fo/param.xsl:1.2 --- phpdoc/docbook/docbook-xsl/fo/param.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/fo/param.xsl Tue Jan 30 18:11:31 2007 @@ -3,7 +3,7 @@   <xsl:apply-templates select="legalnotice" mode="titlepage.mode"/> </xsl:template> @@ -181,10 +181,10 @@ <fo:block id="{$id}"> <xsl:apply-templates select="(blockinfo/title|info/title|title)[1]"/> - <xsl:apply-templates select="*[name(.) != 'title' - and name(.) != 'titleabbrev' - and name(.) != 'qandadiv' - and name(.) != 'qandaentry']"/> + <xsl:apply-templates select="*[local-name(.) != 'title' + and local-name(.) != 'titleabbrev' + and local-name(.) != 'qandadiv' + and local-name(.) != 'qandaentry']"/> <fo:block> <xsl:apply-templates select="qandadiv"/> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/fo/refentry.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/fo/refentry.xsl diff -u phpdoc/docbook/docbook-xsl/fo/refentry.xsl:1.1 phpdoc/docbook/docbook-xsl/fo/refentry.xsl:1.2 --- phpdoc/docbook/docbook-xsl/fo/refentry.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/fo/refentry.xsl Tue Jan 30 18:11:31 2007 @@ -5,7 +5,7 @@ version='1.0'>  </xsl:stylesheet> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/fo/sections.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/fo/sections.xsl diff -u phpdoc/docbook/docbook-xsl/fo/sections.xsl:1.1 phpdoc/docbook/docbook-xsl/fo/sections.xsl:1.2 --- phpdoc/docbook/docbook-xsl/fo/sections.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/fo/sections.xsl Tue Jan 30 18:11:31 2007 @@ -5,7 +5,7 @@ version='1.0'>  <xsl:choose> @@ -302,7 +302,7 @@ <xsl:otherwise> <xsl:message> <xsl:text>Unrecognized language on </xsl:text> - <xsl:value-of select="name(.)"/> + <xsl:value-of select="local-name(.)"/> <xsl:text>: </xsl:text> <xsl:value-of select="$language"/> </xsl:message> @@ -376,29 +376,29 @@ <xsl:apply-templates mode="java"/> </xsl:template> -<xsl:template match="modifier" mode="java"> +<xsl:template match="modifier|package" mode="java"> <xsl:apply-templates mode="java"/> - <xsl:if test="following-sibling::*"> - <xsl:text> </xsl:text> - </xsl:if> + <xsl:if test="following-sibling::*"> + <xsl:text> </xsl:text> + </xsl:if> </xsl:template> <xsl:template match="classname" mode="java"> - <xsl:if test="name(preceding-sibling::*[1]) = 'classname'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'classname'"> <xsl:text>, </xsl:text> </xsl:if> <xsl:apply-templates mode="java"/> </xsl:template> <xsl:template match="interfacename" mode="java"> - <xsl:if test="name(preceding-sibling::*[1]) = 'interfacename'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'interfacename'"> <xsl:text>, </xsl:text> </xsl:if> <xsl:apply-templates mode="java"/> </xsl:template> <xsl:template match="exceptionname" mode="java"> - <xsl:if test="name(preceding-sibling::*[1]) = 'exceptionname'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'exceptionname'"> <xsl:text>, </xsl:text> </xsl:if> <xsl:apply-templates mode="java"/> @@ -459,15 +459,15 @@ <xsl:template mode="java" match="constructorsynopsis|destructorsynopsis|methodsynopsis"> - <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[name(.) != 'modifier']]"/> - <xsl:variable name="notmod" select="*[name(.) != 'modifier']"/> - <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[name(.) != 'modifier']]"/> + <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[local-name(.) != 'modifier']]"/> + <xsl:variable name="notmod" select="*[local-name(.) != 'modifier']"/> + <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"/> <xsl:variable name="decl"> <xsl:text> </xsl:text> <xsl:apply-templates select="$start-modifiers" mode="java"/>  - <xsl:if test="name($notmod[1]) != 'methodname'"> + <xsl:if test="local-name($notmod[1]) != 'methodname'"> <xsl:apply-templates select="$notmod[1]" mode="java"/> </xsl:if> @@ -488,7 +488,7 @@ <xsl:text>&RE;    throws </xsl:text> <xsl:apply-templates select="exceptionname" mode="java"/> </xsl:if> - <xsl:if test="modifier[preceding-sibling::*[name(.) != 'modifier']]"> + <xsl:if test="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"> <xsl:text> </xsl:text> <xsl:apply-templates select="$end-modifiers" mode="java"/> </xsl:if> @@ -544,7 +544,7 @@ <xsl:apply-templates mode="cpp"/> </xsl:template> -<xsl:template match="modifier" mode="cpp"> +<xsl:template match="modifier|package" mode="cpp"> <xsl:apply-templates mode="cpp"/> <xsl:if test="following-sibling::*"> <xsl:text> </xsl:text> @@ -552,21 +552,21 @@ </xsl:template> <xsl:template match="classname" mode="cpp"> - <xsl:if test="name(preceding-sibling::*[1]) = 'classname'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'classname'"> <xsl:text>, </xsl:text> </xsl:if> <xsl:apply-templates mode="cpp"/> </xsl:template> <xsl:template match="interfacename" mode="cpp"> - <xsl:if test="name(preceding-sibling::*[1]) = 'interfacename'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'interfacename'"> <xsl:text>, </xsl:text> </xsl:if> <xsl:apply-templates mode="cpp"/> </xsl:template> <xsl:template match="exceptionname" mode="cpp"> - <xsl:if test="name(preceding-sibling::*[1]) = 'exceptionname'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'exceptionname'"> <xsl:text>, </xsl:text> </xsl:if> <xsl:apply-templates mode="cpp"/> @@ -620,9 +620,9 @@ <xsl:template mode="cpp" match="constructorsynopsis|destructorsynopsis|methodsynopsis"> - <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[name(.) != 'modifier']]"/> - <xsl:variable name="notmod" select="*[name(.) != 'modifier']"/> - <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[name(.) != 'modifier']]"/> + <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[local-name(.) != 'modifier']]"/> + <xsl:variable name="notmod" select="*[local-name(.) != 'modifier']"/> + <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"/> <fo:block wrap-option='no-wrap' white-space-collapse='false' @@ -632,7 +632,7 @@ <xsl:apply-templates select="$start-modifiers" mode="cpp"/>  - <xsl:if test="name($notmod[1]) != 'methodname'"> + <xsl:if test="local-name($notmod[1]) != 'methodname'"> <xsl:apply-templates select="$notmod[1]" mode="cpp"/> </xsl:if> @@ -644,7 +644,7 @@ <xsl:text>&RE;    throws </xsl:text> <xsl:apply-templates select="exceptionname" mode="cpp"/> </xsl:if> - <xsl:if test="modifier[preceding-sibling::*[name(.) != 'modifier']]"> + <xsl:if test="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"> <xsl:text> </xsl:text> <xsl:apply-templates select="$end-modifiers" mode="cpp"/> </xsl:if> @@ -701,7 +701,7 @@ <xsl:apply-templates mode="idl"/> </xsl:template> -<xsl:template match="modifier" mode="idl"> +<xsl:template match="modifier|package" mode="idl"> <xsl:apply-templates mode="idl"/> <xsl:if test="following-sibling::*"> <xsl:text> </xsl:text> @@ -709,21 +709,21 @@ </xsl:template> <xsl:template match="classname" mode="idl"> - <xsl:if test="name(preceding-sibling::*[1]) = 'classname'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'classname'"> <xsl:text>, </xsl:text> </xsl:if> <xsl:apply-templates mode="idl"/> </xsl:template> <xsl:template match="interfacename" mode="idl"> - <xsl:if test="name(preceding-sibling::*[1]) = 'interfacename'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'interfacename'"> <xsl:text>, </xsl:text> </xsl:if> <xsl:apply-templates mode="idl"/> </xsl:template> <xsl:template match="exceptionname" mode="idl"> - <xsl:if test="name(preceding-sibling::*[1]) = 'exceptionname'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'exceptionname'"> <xsl:text>, </xsl:text> </xsl:if> <xsl:apply-templates mode="idl"/> @@ -777,9 +777,9 @@ <xsl:template mode="idl" match="constructorsynopsis|destructorsynopsis|methodsynopsis"> - <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[name(.) != 'modifier']]"/> - <xsl:variable name="notmod" select="*[name(.) != 'modifier']"/> - <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[name(.) != 'modifier']]"/> + <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[local-name(.) != 'modifier']]"/> + <xsl:variable name="notmod" select="*[local-name(.) != 'modifier']"/> + <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"/> <fo:block wrap-option='no-wrap' white-space-collapse='false' @@ -789,7 +789,7 @@ <xsl:apply-templates select="$start-modifiers" mode="idl"/>  - <xsl:if test="name($notmod[1]) != 'methodname'"> + <xsl:if test="local-name($notmod[1]) != 'methodname'"> <xsl:apply-templates select="$notmod[1]" mode="idl"/> </xsl:if> @@ -802,7 +802,7 @@ <xsl:apply-templates select="exceptionname" mode="idl"/> <xsl:text>)</xsl:text> </xsl:if> - <xsl:if test="modifier[preceding-sibling::*[name(.) != 'modifier']]"> + <xsl:if test="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"> <xsl:text> </xsl:text> <xsl:apply-templates select="$end-modifiers" mode="idl"/> </xsl:if> @@ -847,7 +847,7 @@ <xsl:apply-templates mode="perl"/> </xsl:template> -<xsl:template match="modifier" mode="perl"> +<xsl:template match="modifier|package" mode="perl"> <xsl:apply-templates mode="perl"/> <xsl:if test="following-sibling::*"> <xsl:text> </xsl:text> @@ -855,21 +855,21 @@ </xsl:template> <xsl:template match="classname" mode="perl"> - <xsl:if test="name(preceding-sibling::*[1]) = 'classname'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'classname'"> <xsl:text>, </xsl:text> </xsl:if> <xsl:apply-templates mode="perl"/> </xsl:template> <xsl:template match="interfacename" mode="perl"> - <xsl:if test="name(preceding-sibling::*[1]) = 'interfacename'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'interfacename'"> <xsl:text>, </xsl:text> </xsl:if> <xsl:apply-templates mode="perl"/> </xsl:template> <xsl:template match="exceptionname" mode="perl"> - <xsl:if test="name(preceding-sibling::*[1]) = 'exceptionname'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'exceptionname'"> <xsl:text>, </xsl:text> </xsl:if> <xsl:apply-templates mode="perl"/> @@ -923,9 +923,9 @@ <xsl:template mode="perl" match="constructorsynopsis|destructorsynopsis|methodsynopsis"> - <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[name(.) != 'modifier']]"/> - <xsl:variable name="notmod" select="*[name(.) != 'modifier']"/> - <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[name(.) != 'modifier']]"/> + <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[local-name(.) != 'modifier']]"/> + <xsl:variable name="notmod" select="*[local-name(.) != 'modifier']"/> + <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"/> <fo:block wrap-option='no-wrap' white-space-collapse='false' http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/fo/table.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/fo/table.xsl diff -u phpdoc/docbook/docbook-xsl/fo/table.xsl:1.1 phpdoc/docbook/docbook-xsl/fo/table.xsl:1.2 --- phpdoc/docbook/docbook-xsl/fo/table.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/fo/table.xsl Tue Jan 30 18:11:31 2007 @@ -13,7 +13,7 @@ <xsl:include href="../common/table.xsl"/>  - <xsl:when test="$colnum >= ancestor::tgroup/@cols">0</xsl:when> + <xsl:when test="number($colnum) >= ancestor::tgroup/@cols">0</xsl:when> <xsl:otherwise> <xsl:call-template name="inherited.table.attribute"> <xsl:with-param name="entry" select="NOT-AN-ELEMENT-NAME"/> @@ -272,7 +272,7 @@ </xsl:call-template> </xsl:if> - <xsl:if test="$colsep > 0 and $colnum < ancestor::tgroup/@cols"> + <xsl:if test="$colsep > 0 and number($colnum) < ancestor::tgroup/@cols"> <xsl:call-template name="border"> <xsl:with-param name="side" select="'right'"/> </xsl:call-template> @@ -686,36 +686,36 @@ <xsl:choose> <xsl:when test="contains($spans, '0')"> <xsl:call-template name="normal-row"> - <xsl:with-param name="spans" select="$spans"/> + <xsl:with-param name="spans" select="$spans"/> </xsl:call-template> </xsl:when> <xsl:otherwise>  <xsl:if test="normalize-space(.//text()) != ''"> - <xsl:message>Warning: overlapped row contains content!</xsl:message> + <xsl:message>Warning: overlapped row contains content!</xsl:message> </xsl:if> <fo:table-row> - <xsl:comment> This row intentionally left blank </xsl:comment> - <fo:table-cell><fo:block/></fo:table-cell> + <xsl:comment> This row intentionally left blank </xsl:comment> + <fo:table-cell><fo:block/></fo:table-cell> </fo:table-row> <xsl:apply-templates select="following-sibling::row[1]"> - <xsl:with-param name="spans"> - <xsl:call-template name="consume-row"> - <xsl:with-param name="spans" select="$spans"/> - </xsl:call-template> - </xsl:with-param> + <xsl:with-param name="spans"> + <xsl:call-template name="consume-row"> + <xsl:with-param name="spans" select="$spans"/> + </xsl:call-template> + </xsl:with-param> </xsl:apply-templates> </xsl:otherwise> </xsl:choose> @@ -724,20 +724,9 @@ <xsl:template name="normal-row"> <xsl:param name="spans"/> - <xsl:variable name="bgcolor"> - <xsl:call-template name="dbfo-attribute"> - <xsl:with-param name="pis" select="processing-instruction('dbfo')"/> - <xsl:with-param name="attribute" select="'bgcolor'"/> - </xsl:call-template> - </xsl:variable> - <fo:table-row> + <xsl:call-template name="table.row.properties"/> <xsl:call-template name="anchor"/> - <xsl:if test="$bgcolor != ''"> - <xsl:attribute name="background-color"> - <xsl:value-of select="$bgcolor"/> - </xsl:attribute> - </xsl:if> <xsl:apply-templates select="(entry|entrytbl)[1]"> <xsl:with-param name="spans" select="$spans"/> @@ -757,6 +746,22 @@ </xsl:if> </xsl:template> + +<xsl:template name="table.row.properties"> + <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:if test="$bgcolor != ''"> + <xsl:attribute name="background-color"> + <xsl:value-of select="$bgcolor"/> + </xsl:attribute> + </xsl:if> + +</xsl:template> + <xsl:template match="entry|entrytbl" name="entry"> <xsl:param name="col" select="1"/> <xsl:param name="spans"/> @@ -874,7 +879,7 @@ </xsl:call-template> </xsl:when> - <xsl:when test="$entry.colnum > $col"> + <xsl:when test="number($entry.colnum) > $col"> <xsl:call-template name="empty.table.cell"> <xsl:with-param name="colnum" select="$col"/> </xsl:call-template> @@ -1186,7 +1191,7 @@ </xsl:call-template> </xsl:when> - <xsl:when test="$entry.colnum > $col"> + <xsl:when test="number($entry.colnum) > $col"> <xsl:text>0:</xsl:text> <xsl:call-template name="sentry"> <xsl:with-param name="col" select="$col+$entry.colspan"/> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/fo/task.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/fo/task.xsl diff -u phpdoc/docbook/docbook-xsl/fo/task.xsl:1.1 phpdoc/docbook/docbook-xsl/fo/task.xsl:1.2 --- phpdoc/docbook/docbook-xsl/fo/task.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/fo/task.xsl Tue Jan 30 18:11:31 2007 @@ -4,7 +4,7 @@ version="1.0">  <xsl:template match="anchor"> - <fo:inline id="{@id}"/> + <xsl:variable name="id"> + <xsl:call-template name="object.id"/> + </xsl:variable> + <fo:inline id="{$id}"/> </xsl:template>  <xsl:template match="xref" name="xref"> - <xsl:param name="targets" select="key('id',@linkend)"/> - <xsl:param name="target" select="$targets[1]"/> + <xsl:param name="xhref" select="@xlink:href"/> +  + <xsl:param name="xlink.idref"> + <xsl:if test="starts-with($xhref,'#') + and (not(contains($xhref,'(')) + or starts-with($xhref, '#xpointer(id('))"> + <xsl:call-template name="xpointer.idref"> + <xsl:with-param name="xpointer" select="$xhref"/> + </xsl:call-template> + </xsl:if> + </xsl:param> + <xsl:param name="xlink.targets" select="key('id',$xlink.idref)"/> + <xsl:param name="linkend.targets" select="key('id',@linkend)"/> + <xsl:param name="target" select="($xlink.targets | $linkend.targets)[1]"/> <xsl:param name="refelem" select="local-name($target)"/> - <xsl:call-template name="check.id.unique"> - <xsl:with-param name="linkend" select="@linkend"/> - </xsl:call-template> - <xsl:variable name="xrefstyle"> <xsl:choose> <xsl:when test="@role and not(@xrefstyle) @@ -44,70 +56,72 @@ </xsl:choose> </xsl:variable> - <xsl:choose> - <xsl:when test="$refelem=''"> - <xsl:message> - <xsl:text>XRef to nonexistent id: </xsl:text> - <xsl:value-of select="@linkend"/> - </xsl:message> - <xsl:text>???</xsl:text> - </xsl:when> - - <xsl:when test="@endterm"> - <fo:basic-link internal-destination="{@linkend}" - xsl:use-attribute-sets="xref.properties"> - <xsl:variable name="etargets" select="key('id',@endterm)"/> - <xsl:variable name="etarget" select="$etargets[1]"/> - <xsl:choose> - <xsl:when test="count($etarget) = 0"> - <xsl:message> - <xsl:value-of select="count($etargets)"/> - <xsl:text>Endterm points to nonexistent ID: </xsl:text> - <xsl:value-of select="@endterm"/> - </xsl:message> - <xsl:text>???</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="$etarget" mode="endterm"/> - </xsl:otherwise> - </xsl:choose> - </fo:basic-link> - </xsl:when> - - <xsl:when test="$target/@xreflabel"> - <fo:basic-link internal-destination="{@linkend}" - xsl:use-attribute-sets="xref.properties"> - <xsl:call-template name="xref.xreflabel"> - <xsl:with-param name="target" select="$target"/> - </xsl:call-template> - </fo:basic-link> - </xsl:when> - - <xsl:otherwise> - <xsl:if test="not(parent::citation)"> - <xsl:apply-templates select="$target" mode="xref-to-prefix"/> - </xsl:if> - - <fo:basic-link internal-destination="{@linkend}" - xsl:use-attribute-sets="xref.properties"> - <xsl:apply-templates select="$target" mode="xref-to"> - <xsl:with-param name="referrer" select="."/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - </xsl:apply-templates> - </fo:basic-link> - - <xsl:if test="not(parent::citation)"> - <xsl:apply-templates select="$target" mode="xref-to-suffix"/> - </xsl:if> + <xsl:variable name="content"> + <fo:inline xsl:use-attribute-sets="xref.properties"> + <xsl:choose> + <xsl:when test="@endterm"> + <xsl:variable name="etargets" select="key('id',@endterm)"/> + <xsl:variable name="etarget" select="$etargets[1]"/> + <xsl:choose> + <xsl:when test="count($etarget) = 0"> + <xsl:message> + <xsl:value-of select="count($etargets)"/> + <xsl:text>Endterm points to nonexistent ID: </xsl:text> + <xsl:value-of select="@endterm"/> + </xsl:message> + <xsl:text>???</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="$etarget" mode="endterm"/> + </xsl:otherwise> + </xsl:choose> + </xsl:when> + + <xsl:when test="$target/@xreflabel"> + <xsl:call-template name="xref.xreflabel"> + <xsl:with-param name="target" select="$target"/> + </xsl:call-template> + </xsl:when> + + <xsl:when test="$target"> + <xsl:if test="not(parent::citation)"> + <xsl:apply-templates select="$target" mode="xref-to-prefix"/> + </xsl:if> + + <xsl:apply-templates select="$target" mode="xref-to"> + <xsl:with-param name="referrer" select="."/> + <xsl:with-param name="xrefstyle" select="$xrefstyle"/> + </xsl:apply-templates> + + <xsl:if test="not(parent::citation)"> + <xsl:apply-templates select="$target" mode="xref-to-suffix"/> + </xsl:if> + </xsl:when> + <xsl:otherwise> + <xsl:message> + <xsl:text>ERROR: xref linking to </xsl:text> + <xsl:value-of select="@linkend|@xlink:href"/> + <xsl:text> has no generated link text.</xsl:text> + </xsl:message> + <xsl:text>???</xsl:text> + </xsl:otherwise> + </xsl:choose> + </fo:inline> + </xsl:variable> - </xsl:otherwise> - </xsl:choose> +  + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content" select="$content"/> + </xsl:call-template>  <xsl:choose> -  + <xsl:when test="not($target)"> +  + </xsl:when> <xsl:when test="starts-with(normalize-space($xrefstyle), 'select:') and contains($xrefstyle, 'nopage')"> +  </xsl:when>  <xsl:when test="not(starts-with(normalize-space($xrefstyle), 'select:') @@ -117,7 +131,7 @@ or $insert.xref.page.number = '1') or local-name($target) = 'para'"> <xsl:apply-templates select="$target" mode="page.citation"> - <xsl:with-param name="id" select="@linkend"/> + <xsl:with-param name="id" select="$target/@id|$target/@xml:id"/> </xsl:apply-templates> </xsl:when> </xsl:choose> @@ -420,8 +434,9 @@ <xsl:choose> <xsl:when test="string(.) = ''"> <xsl:variable name="bib" select="document($bibliography.collection,.)"/> - <xsl:variable name="id" select="@id"/> - <xsl:variable name="entry" select="$bib/bibliography/*[@id=$id][1]"/> + <xsl:variable name="id" select="(@id|@xml:id)[1]"/> + <xsl:variable name="entry" select="$bib/bibliography/ + *[@id=$id or @xml:id=$id][1]"/> <xsl:choose> <xsl:when test="$entry"> <xsl:choose> @@ -433,7 +448,7 @@ <xsl:apply-templates select="$entry/*[1]"/> </xsl:when> <xsl:otherwise> - <xsl:value-of select="@id"/> + <xsl:value-of select="(@id|@xml:id)[1]"/> </xsl:otherwise> </xsl:choose> </xsl:when> @@ -444,7 +459,7 @@ <xsl:text> found in </xsl:text> <xsl:value-of select="$bibliography.collection"/> </xsl:message> - <xsl:value-of select="@id"/> + <xsl:value-of select="(@id|@xml:id)[1]"/> </xsl:otherwise> </xsl:choose> </xsl:when> @@ -458,7 +473,7 @@ <xsl:apply-templates select="*[1]"/> </xsl:when> <xsl:otherwise> - <xsl:value-of select="@id"/> + <xsl:value-of select="(@id|@xml:id)[1]"/> </xsl:otherwise> </xsl:choose> </xsl:otherwise> @@ -755,10 +770,6 @@ <xsl:param name="targets" select="key('id',$linkend)"/> <xsl:param name="target" select="$targets[1]"/> - <xsl:call-template name="check.id.unique"> - <xsl:with-param name="linkend" select="$linkend"/> - </xsl:call-template> - <xsl:variable name="xrefstyle"> <xsl:choose> <xsl:when test="@role and not(@xrefstyle) @@ -771,49 +782,60 @@ </xsl:choose> </xsl:variable> - <fo:basic-link internal-destination="{$linkend}" - xsl:use-attribute-sets="xref.properties"> - <xsl:choose> - <xsl:when test="count(child::node()) > 0"> -  - <xsl:apply-templates/> - </xsl:when> - <xsl:otherwise> -  - <xsl:choose> - <xsl:when test="@endterm"> - <xsl:variable name="etargets" select="key('id',@endterm)"/> - <xsl:variable name="etarget" select="$etargets[1]"/> - <xsl:choose> - <xsl:when test="count($etarget) = 0"> - <xsl:message> - <xsl:value-of select="count($etargets)"/> - <xsl:text>Endterm points to nonexistent ID: </xsl:text> - <xsl:value-of select="@endterm"/> - </xsl:message> - <xsl:text>???</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="$etarget" mode="endterm"/> - </xsl:otherwise> - </xsl:choose> - </xsl:when> + <xsl:variable name="content"> + <fo:inline xsl:use-attribute-sets="xref.properties"> + <xsl:choose> + <xsl:when test="count(child::node()) > 0"> +  + <xsl:apply-templates/> + </xsl:when> + <xsl:otherwise> +  + <xsl:choose> + <xsl:when test="@endterm"> + <xsl:variable name="etargets" select="key('id',@endterm)"/> + <xsl:variable name="etarget" select="$etargets[1]"/> + <xsl:choose> + <xsl:when test="count($etarget) = 0"> + <xsl:message> + <xsl:value-of select="count($etargets)"/> + <xsl:text>Endterm points to nonexistent ID: </xsl:text> + <xsl:value-of select="@endterm"/> + </xsl:message> + <xsl:text>???</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="$etarget" mode="endterm"/> + </xsl:otherwise> + </xsl:choose> + </xsl:when> + + <xsl:otherwise> + <xsl:message> + <xsl:text>Link element has no content and no Endterm. </xsl:text> + <xsl:text>Nothing to show in the link to </xsl:text> + <xsl:value-of select="$target"/> + </xsl:message> + <xsl:text>???</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:otherwise> + </xsl:choose> + </fo:inline> + </xsl:variable> - <xsl:otherwise> - <xsl:message> - <xsl:text>Link element has no content and no Endterm. </xsl:text> - <xsl:text>Nothing to show in the link to </xsl:text> - <xsl:value-of select="$target"/> - </xsl:message> - <xsl:text>???</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:otherwise> - </xsl:choose> - </fo:basic-link> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="node" select="."/> + <xsl:with-param name="linkend" select="$linkend"/> + <xsl:with-param name="content" select="$content"/> + </xsl:call-template>  <xsl:choose> +  +  + <xsl:when test="not($linkend)"> + </xsl:when>  <xsl:when test="starts-with(normalize-space($xrefstyle), 'select:') and contains($xrefstyle, 'nopage')"> @@ -1061,8 +1083,7 @@ </xsl:when> <xsl:when test="$axf.extensions != 0"> <fo:basic-link external-destination="{$href}" - xsl:use-attribute-sets="olink.properties" - show-destination="replace"> + xsl:use-attribute-sets="olink.properties"> <xsl:copy-of select="$hottext"/> </fo:basic-link> <xsl:copy-of select="$olink.page.citation"/> @@ -1070,8 +1091,7 @@ </xsl:when> <xsl:otherwise> <fo:basic-link external-destination="{$href}" - xsl:use-attribute-sets="olink.properties" - show-destination="replace"> + xsl:use-attribute-sets="olink.properties"> <xsl:copy-of select="$hottext"/> </fo:basic-link> <xsl:copy-of select="$olink.page.citation"/> @@ -1234,7 +1254,10 @@ </xsl:template> <xsl:template match="*" mode="pagenumber.markup"> - <fo:page-number-citation ref-id="{@id}"/> + <xsl:variable name="id"> + <xsl:call-template name="object.id"/> + </xsl:variable> + <fo:page-number-citation ref-id="{$id}"/> </xsl:template>  http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/fo/annotations.xsl?view=markup&rev=1.1 Index: phpdoc/docbook/docbook-xsl/fo/annotations.xsl +++ phpdoc/docbook/docbook-xsl/fo/annotations.xsl <?xml version='1.0'?> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" version='1.0'>  <xsl:template match="annotation"/> </xsl:stylesheet> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/fo/titlepage.templates.xml?view=markup&rev=1.1 Index: phpdoc/docbook/docbook-xsl/fo/titlepage.templates.xml +++ phpdoc/docbook/docbook-xsl/fo/titlepage.templates.xml <!DOCTYPE t:templates [ <!ENTITY hsize0 "10pt"> <!ENTITY hsize1 "12pt"> <!ENTITY hsize2 "14.4pt"> <!ENTITY hsize3 "17.28pt"> <!ENTITY hsize4 "20.736pt"> <!ENTITY hsize5 "24.8832pt"> <!ENTITY hsize0space "7.5pt">  <!ENTITY hsize1space "9pt">  <!ENTITY hsize2space "10.8pt">  <!ENTITY hsize3space "12.96pt">  <!ENTITY hsize4space "15.552pt">  <!ENTITY hsize5space "18.6624pt">  ]> <t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0" xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">   <t:titlepage t:element="article" t:wrapper="fo:block" font-family="{$title.fontset}"> <t:titlepage-content t:side="recto" start-indent="0pt" text-align="center"> <title t:named-template="component.title" param:node="ancestor-or-self::article[1]" keep-with-next.within-column="always" font-size="&hsize5;" font-weight="bold"/> <subtitle/> <corpauthor space-before="0.5em" font-size="&hsize2;"/> <authorgroup space-before="0.5em" font-size="&hsize2;"/> <author space-before="0.5em" font-size="&hsize2;"/> <othercredit space-before="0.5em"/> <releaseinfo space-before="0.5em"/> <copyright space-before="0.5em"/> <legalnotice text-align="start" margin-left="0.5in" margin-right="0.5in" font-family="{$body.fontset}"/> <pubdate space-before="0.5em"/> <revision space-before="0.5em"/> <revhistory space-before="0.5em"/> <abstract space-before="0.5em" text-align="start" margin-left="0.5in" margin-right="0.5in" font-family="{$body.fontset}"/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage>  <t:titlepage t:element="set" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title t:named-template="division.title" param:node="ancestor-or-self::set[1]" text-align="center" font-size="&hsize5;" space-before="&hsize5space;" font-weight="bold" font-family="{$title.fontset}"/> <subtitle font-family="{$title.fontset}" text-align="center"/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage>  <t:titlepage t:element="book" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title t:named-template="division.title" param:node="ancestor-or-self::book[1]" text-align="center" font-size="&hsize5;" space-before="&hsize5space;" font-weight="bold" font-family="{$title.fontset}"/> <subtitle text-align="center" font-size="&hsize4;" space-before="&hsize4space;" font-family="{$title.fontset}"/> <corpauthor font-size="&hsize3;" keep-with-next.within-column="always" space-before="2in"/> <authorgroup space-before="2in"/> <author font-size="&hsize3;" space-before="&hsize2space;" keep-with-next.within-column="always"/> </t:titlepage-content> <t:titlepage-content t:side="verso"> <title t:named-template="book.verso.title" font-size="&hsize2;" font-weight="bold" font-family="{$title.fontset}"/> <corpauthor/> <authorgroup t:named-template="verso.authorgroup"/> <author/> <othercredit/> <releaseinfo space-before="0.5em"/> <pubdate space-before="1em"/> <copyright/> <abstract/> <legalnotice font-size="8pt"/> </t:titlepage-content> <t:titlepage-separator> <fo:block break-after="page"/> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> <fo:block break-after="page"/> </t:titlepage-before> </t:titlepage>  <t:titlepage t:element="part" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title t:named-template="division.title" param:node="ancestor-or-self::part[1]" text-align="center" font-size="&hsize5;" space-before="&hsize5space;" font-weight="bold" font-family="{$title.fontset}"/> <subtitle text-align="center" font-size="&hsize4;" space-before="&hsize4space;" font-weight='bold' font-style='italic' font-family="{$title.fontset}"/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <t:titlepage t:element="partintro" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title text-align="center" font-size="&hsize5;" font-weight="bold" space-before="1em" font-family="{$title.fontset}"/> <subtitle text-align="center" font-size="&hsize2;" font-weight="bold" font-style="italic" font-family="{$title.fontset}"/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage>  <t:titlepage t:element="reference" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title t:named-template="division.title" param:node="ancestor-or-self::reference[1]" text-align="center" font-size="&hsize5;" space-before="&hsize5space;" font-weight="bold" font-family="{$title.fontset}"/> <subtitle font-family="{$title.fontset}" text-align="center"/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage>  <t:titlepage t:element="refsynopsisdiv" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title font-family="{$title.fontset}"/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage>  <t:titlepage t:element="refsection" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title font-family="{$title.fontset}"/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage>  <t:titlepage t:element="refsect1" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title font-family="{$title.fontset}"/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage>  <t:titlepage t:element="refsect2" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title font-family="{$title.fontset}"/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage>  <t:titlepage t:element="refsect3" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title font-family="{$title.fontset}"/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage>  <t:titlepage t:element="dedication" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title t:force="1" t:named-template="component.title" param:node="ancestor-or-self::dedication[1]" margin-left="{$title.margin.left}" font-size="&hsize5;" font-family="{$title.fontset}" font-weight="bold"/> <subtitle font-family="{$title.fontset}"/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage>  <t:titlepage t:element="preface" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title t:force="1" t:named-template="component.title" param:node="ancestor-or-self::preface[1]" margin-left="{$title.margin.left}" font-size="&hsize5;" font-family="{$title.fontset}" font-weight="bold"/> <subtitle font-family="{$title.fontset}"/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage>  <t:titlepage t:element="chapter" t:wrapper="fo:block" font-family="{$title.fontset}"> <t:titlepage-content t:side="recto" margin-left="{$title.margin.left}"> <title t:named-template="component.title" param:node="ancestor-or-self::chapter[1]" font-size="&hsize5;" font-weight="bold"/> <subtitle space-before="0.5em" font-style="italic" font-size="&hsize2;" font-weight="bold"/> <corpauthor space-before="0.5em" space-after="0.5em" font-size="&hsize2;"/> <authorgroup space-before="0.5em" space-after="0.5em" font-size="&hsize2;"/> <author space-before="0.5em" space-after="0.5em" font-size="&hsize2;"/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage>  <t:titlepage t:element="appendix" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title t:named-template="component.title" param:node="ancestor-or-self::appendix[1]" margin-left="{$title.margin.left}" font-size="&hsize5;" font-weight="bold" font-family="{$title.fontset}"/> <subtitle font-family="{$title.fontset}"/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage>  <t:titlepage t:element="section" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title margin-left="{$title.margin.left}" font-family="{$title.fontset}"/> <subtitle font-family="{$title.fontset}"/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <t:titlepage t:element="sect1" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title margin-left="{$title.margin.left}" font-family="{$title.fontset}"/> <subtitle font-family="{$title.fontset}"/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <t:titlepage t:element="sect2" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title margin-left="{$title.margin.left}" font-family="{$title.fontset}"/> <subtitle font-family="{$title.fontset}"/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <t:titlepage t:element="sect3" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title margin-left="{$title.margin.left}" font-family="{$title.fontset}"/> <subtitle font-family="{$title.fontset}"/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <t:titlepage t:element="sect4" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title margin-left="{$title.margin.left}" font-family="{$title.fontset}"/> <subtitle font-family="{$title.fontset}"/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <t:titlepage t:element="sect5" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title margin-left="{$title.margin.left}" font-family="{$title.fontset}"/> <subtitle font-family="{$title.fontset}"/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <t:titlepage t:element="simplesect" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title margin-left="{$title.margin.left}" font-family="{$title.fontset}"/> <subtitle font-family="{$title.fontset}"/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage>  <t:titlepage t:element="bibliography" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title t:force="1" t:named-template="component.title" param:node="ancestor-or-self::bibliography[1]" margin-left="{$title.margin.left}" font-size="&hsize5;" font-family="{$title.fontset}" font-weight="bold"/> <subtitle font-family="{$title.fontset}"/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage>  <t:titlepage t:element="bibliodiv" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title t:named-template="component.title" param:node="ancestor-or-self::bibliodiv[1]" margin-left="{$title.margin.left}" font-size="&hsize4;" font-family="{$title.fontset}" font-weight="bold"/> <subtitle font-family="{$title.fontset}"/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage>  <t:titlepage t:element="glossary" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title t:force="1" t:named-template="component.title" param:node="ancestor-or-self::glossary[1]" margin-left="{$title.margin.left}" font-size="&hsize5;" font-family="{$title.fontset}" font-weight="bold"/> <subtitle font-family="{$title.fontset}"/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage>  <t:titlepage t:element="glossdiv" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title t:named-template="component.title" param:node="ancestor-or-self::glossdiv[1]" margin-left="{$title.margin.left}" font-size="&hsize4;" font-family="{$title.fontset}" font-weight="bold"/> <subtitle font-family="{$title.fontset}"/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage>  <t:titlepage t:element="index" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title t:force="1" t:named-template="component.title" param:node="ancestor-or-self::index[1]" param:pagewide="1" margin-left="0pt" font-size="&hsize5;" font-family="{$title.fontset}" font-weight="bold"/> <subtitle font-family="{$title.fontset}"/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage>     <t:titlepage t:element="indexdiv" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title t:force="1" t:named-template="indexdiv.title" param:title="title"/> <subtitle font-family="{$title.fontset}"/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage>  <t:titlepage t:element="setindex" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title t:force="1" t:named-template="component.title" param:node="ancestor-or-self::setindex[1]" param:pagewide="1" margin-left="0pt" font-size="&hsize5;" font-family="{$title.fontset}" font-weight="bold"/> <subtitle font-family="{$title.fontset}"/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage>  <t:titlepage t:element="colophon" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title t:force="1" t:named-template="component.title" param:node="ancestor-or-self::colophon[1]" margin-left="{$title.margin.left}" font-size="&hsize5;" font-family="{$title.fontset}" font-weight="bold"/> <subtitle font-family="{$title.fontset}"/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage>  <t:titlepage t:element="sidebar" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title font-family="{$title.fontset}" font-weight="bold"/> <subtitle font-family="{$title.fontset}"/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage>  <t:titlepage t:element="qandaset" t:wrapper="fo:block" font-family="{$title.fontset}"> <t:titlepage-content t:side="recto" start-indent="0pt" text-align="center"> <title t:named-template="component.title" param:node="ancestor-or-self::qandaset[1]" keep-with-next.within-column="always" font-size="&hsize5;" font-weight="bold"/> <subtitle/> <corpauthor space-before="0.5em" font-size="&hsize2;"/> <authorgroup space-before="0.5em" font-size="&hsize2;"/> <author space-before="0.5em" font-size="&hsize2;"/> <othercredit space-before="0.5em"/> <releaseinfo space-before="0.5em"/> <copyright space-before="0.5em"/> <legalnotice text-align="start" margin-left="0.5in" margin-right="0.5in" font-family="{$body.fontset}"/> <pubdate space-before="0.5em"/> <revision space-before="0.5em"/> <revhistory space-before="0.5em"/> <abstract space-before="0.5em" text-align="start" margin-left="0.5in" margin-right="0.5in" font-family="{$body.fontset}"/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage>  <t:titlepage t:element="table.of.contents" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title t:force="1" t:named-template="gentext" param:key="'TableofContents'" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="&hsize3;" font-weight="bold" font-family="{$title.fontset}"/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <t:titlepage t:element="list.of.tables" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title t:force="1" t:named-template="gentext" param:key="'ListofTables'" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="&hsize3;" font-weight="bold" font-family="{$title.fontset}"/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <t:titlepage t:element="list.of.figures" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title t:force="1" t:named-template="gentext" param:key="'ListofFigures'" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="&hsize3;" font-weight="bold" font-family="{$title.fontset}"/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <t:titlepage t:element="list.of.examples" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title t:force="1" t:named-template="gentext" param:key="'ListofExamples'" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="&hsize3;" font-weight="bold" font-family="{$title.fontset}"/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <t:titlepage t:element="list.of.equations" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title t:force="1" t:named-template="gentext" param:key="'ListofEquations'" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="&hsize3;" font-weight="bold" font-family="{$title.fontset}"/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <t:titlepage t:element="list.of.procedures" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title t:force="1" t:named-template="gentext" param:key="'ListofProcedures'" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="&hsize3;" font-weight="bold" font-family="{$title.fontset}"/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <t:titlepage t:element="list.of.unknowns" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title t:force="1" t:named-template="gentext" param:key="'ListofUnknown'" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="&hsize3;" font-weight="bold" font-family="{$title.fontset}"/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage>  </t:templates>