cvs: phpdoc /docbook/docbook-xsl/common autoidx-kimber.xsl autoidx-kosek.xsl common.xsl entities.ent gentext.xsl insertfile.xsl l10n.xsl labels.xsl
olink.xsl refentry.xsl stripns.xsl subtitles.xsl table.xsl targets.xsl titles.xsl
| From: | Hannes Magnusson | Date: | Tue, 30 Jan 2007 18:12:38 +0000 |
| Subject: | cvs: phpdoc /docbook/docbook-xsl/common autoidx-kimber.xsl autoidx-kosek.xsl common.xsl entities.ent gentext.xsl insertfile.xsl l10n.xsl labels.xsl olink.xsl refentry.xsl stripns.xsl subtitles.xsl table.xsl targets.xsl titles.xsl |
||
| Groups: | php.doc | ||
| Request: | Send a blank email to phpdoc+get-969375102@lists.php.net to get a copy of this message | ||
bjori Tue Jan 30 18:12:38 2007 UTC
Added files:
/phpdoc/docbook/docbook-xsl/common entities.ent
Modified files:
/phpdoc/docbook/docbook-xsl/common autoidx-kimber.xsl
autoidx-kosek.xsl common.xsl
gentext.xsl insertfile.xsl
labels.xsl l10n.xsl olink.xsl
refentry.xsl stripns.xsl
subtitles.xsl table.xsl
targets.xsl titles.xsl
Log:
Upgrade to docbook-xsl 1.72.0
http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/common/autoidx-kimber.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/common/autoidx-kimber.xsl diff -u phpdoc/docbook/docbook-xsl/common/autoidx-kimber.xsl:1.1 phpdoc/docbook/docbook-xsl/common/autoidx-kimber.xsl:1.2 --- phpdoc/docbook/docbook-xsl/common/autoidx-kimber.xsl:1.1 Mon Jan 22 22:11:00 2007 +++ phpdoc/docbook/docbook-xsl/common/autoidx-kimber.xsl Tue Jan 30 18:12:37 2007 @@ -12,7 +12,7 @@ exclude-result-prefixes="k"> <!-- ******************************************************************** - $Id: autoidx-kimber.xsl,v 1.1 2007/01/22 22:11:00 bjori Exp $ + $Id: autoidx-kimber.xsl,v 1.2 2007/01/30 18:12:37 bjori Exp $ ******************************************************************** This file is part of the DocBook XSL Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/common/autoidx-kosek.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/common/autoidx-kosek.xsl diff -u phpdoc/docbook/docbook-xsl/common/autoidx-kosek.xsl:1.1 phpdoc/docbook/docbook-xsl/common/autoidx-kosek.xsl:1.2 --- phpdoc/docbook/docbook-xsl/common/autoidx-kosek.xsl:1.1 Mon Jan 22 22:11:00 2007 +++ phpdoc/docbook/docbook-xsl/common/autoidx-kosek.xsl Tue Jan 30 18:12:37 2007 @@ -14,7 +14,7 @@ xmlns:i="urn:cz-kosek:functions:index"> <!-- ******************************************************************** - $Id: autoidx-kosek.xsl,v 1.1 2007/01/22 22:11:00 bjori Exp $ + $Id: autoidx-kosek.xsl,v 1.2 2007/01/30 18:12:37 bjori Exp $ ******************************************************************** This file is part of the DocBook XSL Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/common/common.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/common/common.xsl diff -u phpdoc/docbook/docbook-xsl/common/common.xsl:1.1 phpdoc/docbook/docbook-xsl/common/common.xsl:1.2 --- phpdoc/docbook/docbook-xsl/common/common.xsl:1.1 Mon Jan 22 22:11:00 2007 +++ phpdoc/docbook/docbook-xsl/common/common.xsl Tue Jan 30 18:12:37 2007 @@ -7,7 +7,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: common.xsl,v 1.1 2007/01/22 22:11:00 bjori Exp $ + $Id: common.xsl,v 1.2 2007/01/30 18:12:37 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -21,7 +21,7 @@ <doc:reference xmlns=""> <referenceinfo> <releaseinfo role="meta"> -$Id: common.xsl,v 1.1 2007/01/22 22:11:00 bjori Exp $ +$Id: common.xsl,v 1.2 2007/01/30 18:12:37 bjori Exp $ </releaseinfo> <author><surname>Walsh</surname> <firstname>Norman</firstname></author> @@ -64,7 +64,7 @@ example figure footnote footnoteref formalpara funcprototype funcsynopsis glossary glossdef glossdiv glossentry glosslist graphicco group highlights imagedata imageobject imageobjectco important index -indexdiv indexentry indexterm informalequation informalexample +indexdiv indexentry indexterm info informalequation informalexample informalfigure informaltable inlineequation inlinemediaobject itemizedlist itermset keycombo keywordset legalnotice listitem lot mediaobject mediaobjectco menuchoice msg msgentry msgexplan msginfo @@ -210,12 +210,12 @@ <xsl:template name="section.level"> <xsl:param name="node" select="."/> <xsl:choose> - <xsl:when test="name($node)='sect1'">1</xsl:when> - <xsl:when test="name($node)='sect2'">2</xsl:when> - <xsl:when test="name($node)='sect3'">3</xsl:when> - <xsl:when test="name($node)='sect4'">4</xsl:when> - <xsl:when test="name($node)='sect5'">5</xsl:when> - <xsl:when test="name($node)='section'"> + <xsl:when test="local-name($node)='sect1'">1</xsl:when> + <xsl:when test="local-name($node)='sect2'">2</xsl:when> + <xsl:when test="local-name($node)='sect3'">3</xsl:when> + <xsl:when test="local-name($node)='sect4'">4</xsl:when> + <xsl:when test="local-name($node)='sect5'">5</xsl:when> + <xsl:when test="local-name($node)='section'"> <xsl:choose> <xsl:when test="$node/../../../../../../section">6</xsl:when> <xsl:when test="$node/../../../../../section">5</xsl:when> @@ -225,16 +225,16 @@ <xsl:otherwise>1</xsl:otherwise> </xsl:choose> </xsl:when> - <xsl:when test="name($node)='refsect1' or - name($node)='refsect2' or - name($node)='refsect3' or - name($node)='refsection' or - name($node)='refsynopsisdiv'"> + <xsl:when test="local-name($node)='refsect1' or + local-name($node)='refsect2' or + local-name($node)='refsect3' or + local-name($node)='refsection' or + local-name($node)='refsynopsisdiv'"> <xsl:call-template name="refentry.section.level"> <xsl:with-param name="node" select="$node"/> </xsl:call-template> </xsl:when> - <xsl:when test="name($node)='simplesect'"> + <xsl:when test="local-name($node)='simplesect'"> <xsl:choose> <xsl:when test="$node/../../sect1">2</xsl:when> <xsl:when test="$node/../../sect2">3</xsl:when> @@ -308,11 +308,11 @@ <xsl:variable name="levelinRE"> <xsl:choose> - <xsl:when test="name($node)='refsynopsisdiv'">1</xsl:when> - <xsl:when test="name($node)='refsect1'">1</xsl:when> - <xsl:when test="name($node)='refsect2'">2</xsl:when> - <xsl:when test="name($node)='refsect3'">3</xsl:when> - <xsl:when test="name($node)='refsection'"> + <xsl:when test="local-name($node)='refsynopsisdiv'">1</xsl:when> + <xsl:when test="local-name($node)='refsect1'">1</xsl:when> + <xsl:when test="local-name($node)='refsect2'">2</xsl:when> + <xsl:when test="local-name($node)='refsect3'">3</xsl:when> + <xsl:when test="local-name($node)='refsection'"> <xsl:choose> <xsl:when test="$node/../../../../../refsection">5</xsl:when> <xsl:when test="$node/../../../../refsection">4</xsl:when> @@ -378,30 +378,30 @@ <!-- (hnr (hierarchical-number-recursive (normalize "qandadiv") node)) - (parsect (ancestor-member node (section-element-list))) + (parsect (ancestor-member node (section-element-list))) - (defnum (if (and %qanda-inherit-numeration% - %section-autolabel%) - (if (node-list-empty? parsect) - (section-autolabel-prefix node) - (section-autolabel parsect)) - "")) - - (hnumber (let loop ((numlist hnr) (number defnum) - (sep (if (equal? defnum "") "" "."))) - (if (null? numlist) - number - (loop (cdr numlist) - (string-append number - sep - (number->string (car numlist))) - ".")))) - (cnumber (child-number (parent node))) - (number (string-append hnumber - (if (equal? hnumber "") - "" - ".") - (number->string cnumber)))) + (defnum (if (and %qanda-inherit-numeration% + %section-autolabel%) + (if (node-list-empty? parsect) + (section-autolabel-prefix node) + (section-autolabel parsect)) + "")) + + (hnumber (let loop ((numlist hnr) (number defnum) + (sep (if (equal? defnum "") "" "."))) + (if (null? numlist) + number + (loop (cdr numlist) + (string-append number + sep + (number->string (car numlist))) + ".")))) + (cnumber (child-number (parent node))) + (number (string-append hnumber + (if (equal? hnumber "") + "" + ".") + (number->string cnumber)))) --> <xsl:choose> @@ -506,16 +506,16 @@ </xsl:when> <!-- handle corpauthor as a special case...--> - <xsl:when test="name($node)='corpauthor'"> + <xsl:when test="local-name($node)='corpauthor'"> <xsl:apply-templates select="$node"/> </xsl:when> <xsl:otherwise> <xsl:choose> - <!-- Handle case when personname contains only general markup (DocBook 5.0) --> - <xsl:when test="$node/self::personname and not($node/firstname or $node/honorific or $node/lineage or $node/othername or $node/surname)"> - <xsl:apply-templates select="$node/node()"/> - </xsl:when> + <!-- Handle case when personname contains only general markup (DocBook 5.0) --> + <xsl:when test="$node/self::personname and not($node/firstname or $node/honorific or $node/lineage or $node/othername or $node/surname)"> + <xsl:apply-templates select="$node/node()"/> + </xsl:when> <xsl:when test="$style = 'family-given'"> <xsl:call-template name="person.name.family-given"> <xsl:with-param name="node" select="$node"/> @@ -684,7 +684,7 @@ <xsl:when test="contains($string, $subst)"> <xsl:value-of select="substring-before($string, $subst)"/> <xsl:call-template name="gentext.element.name"> - <xsl:with-param name="element.name" select="name($target)"/> + <xsl:with-param name="element.name" select="local-name($target)"/> </xsl:call-template> <xsl:call-template name="xref.g.subst"> <xsl:with-param name="string" @@ -975,23 +975,23 @@ <xsl:variable name="useobject"> <xsl:choose> <!-- The phrase is used only when contains TeX Math and output is FO --> - <xsl:when test="name($object)='textobject' and $object/phrase + <xsl:when test="local-name($object)='textobject' and $object/phrase and $object/@role='tex' and $stylesheet.result.type = 'fo' and $tex.math.in.alt != ''"> <xsl:text>1</xsl:text> </xsl:when> <!-- The phrase is never used --> - <xsl:when test="name($object)='textobject' and $object/phrase"> + <xsl:when test="local-name($object)='textobject' and $object/phrase"> <xsl:text>0</xsl:text> </xsl:when> - <xsl:when test="name($object)='textobject' + <xsl:when test="local-name($object)='textobject' and $object/ancestor::equation "> <!-- The first textobject is not a reasonable fallback for equation image --> <xsl:text>0</xsl:text> </xsl:when> <!-- The first textobject is a reasonable fallback --> - <xsl:when test="name($object)='textobject' + <xsl:when test="local-name($object)='textobject' and $object[not(@role) or @role!='tex']"> <xsl:text>1</xsl:text> </xsl:when> @@ -1247,12 +1247,12 @@ <xsl:variable name="target" select="$targets[1]"/> <xsl:if test="count($target) > 0"> - <xsl:if test="not(contains(concat(' ', $element-list, ' '), name($target)))"> + <xsl:if test="not(contains(concat(' ', $element-list, ' '), local-name($target)))"> <xsl:message> <xsl:text>Error: linkend (</xsl:text> <xsl:value-of select="$linkend"/> <xsl:text>) points to "</xsl:text> - <xsl:value-of select="name($target)"/> + <xsl:value-of select="local-name($target)"/> <xsl:text>" not (one of): </xsl:text> <xsl:value-of select="$element-list"/> </xsl:message> @@ -1346,16 +1346,16 @@ <xsl:choose> <xsl:when test="not($list/@continuation = 'continues')"> <xsl:choose> - <xsl:when test="@startingnumber"> - <xsl:value-of select="@startingnumber"/> - </xsl:when> - <xsl:when test="$pi-html-start != ''"> - <xsl:value-of select="$pi-html-start"/> - </xsl:when> - <xsl:when test="$pi-fo-start != ''"> - <xsl:value-of select="$pi-fo-start"/> - </xsl:when> - <xsl:otherwise>1</xsl:otherwise> + <xsl:when test="@startingnumber"> + <xsl:value-of select="@startingnumber"/> + </xsl:when> + <xsl:when test="$pi-html-start != ''"> + <xsl:value-of select="$pi-html-start"/> + </xsl:when> + <xsl:when test="$pi-fo-start != ''"> + <xsl:value-of select="$pi-fo-start"/> + </xsl:when> + <xsl:otherwise>1</xsl:otherwise> </xsl:choose> </xsl:when> <xsl:otherwise> @@ -1909,13 +1909,13 @@ <itemizedlist> <listitem> - <simpara>if the value of the <sgmltag>choice</sgmltag> - pseudo-attribute is "and" or "or", returns a localized "and" - or "or"</simpara> + <simpara>if the value of the <sgmltag>choice</sgmltag> + pseudo-attribute is "and" or "or", returns a localized "and" + or "or"</simpara> </listitem> <listitem> - <simpara>otherwise returns the literal value of the - <sgmltag>choice</sgmltag> pseudo-attribute</simpara> + <simpara>otherwise returns the literal value of the + <sgmltag>choice</sgmltag> pseudo-attribute</simpara> </listitem> </itemizedlist> @@ -1951,7 +1951,7 @@ <!-- current locale --> <xsl:when test="$choice = 'and' or $choice = 'or'"> <xsl:call-template name="gentext"> - <xsl:with-param name="key" select="$choice"/> + <xsl:with-param name="key" select="$choice"/> </xsl:call-template> </xsl:when> <!-- otherwise, just output value of $choice, whatever it is --> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/common/gentext.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/common/gentext.xsl diff -u phpdoc/docbook/docbook-xsl/common/gentext.xsl:1.1 phpdoc/docbook/docbook-xsl/common/gentext.xsl:1.2 --- phpdoc/docbook/docbook-xsl/common/gentext.xsl:1.1 Mon Jan 22 22:11:00 2007 +++ phpdoc/docbook/docbook-xsl/common/gentext.xsl Tue Jan 30 18:12:37 2007 @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: gentext.xsl,v 1.1 2007/01/22 22:11:00 bjori Exp $ + $Id: gentext.xsl,v 1.2 2007/01/30 18:12:37 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -360,7 +360,7 @@ <xsl:message> <xsl:text>object.xref.markup: empty xref template</xsl:text> <xsl:text> for linkend="</xsl:text> - <xsl:value-of select="@id"/> + <xsl:value-of select="@id|@xml:id"/> <xsl:text>" and @xrefstyle="</xsl:text> <xsl:value-of select="$xrefstyle"/> <xsl:text>"</xsl:text> @@ -392,7 +392,7 @@ <xsl:message> <xsl:text>Xref is only supported to listitems in an</xsl:text> <xsl:text> orderedlist: </xsl:text> - <xsl:value-of select="@id"/> + <xsl:value-of select="@id|@xml:id"/> </xsl:message> <xsl:text>???</xsl:text> </xsl:when> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/common/insertfile.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/common/insertfile.xsl diff -u phpdoc/docbook/docbook-xsl/common/insertfile.xsl:1.1 phpdoc/docbook/docbook-xsl/common/insertfile.xsl:1.2 --- phpdoc/docbook/docbook-xsl/common/insertfile.xsl:1.1 Mon Jan 22 22:11:00 2007 +++ phpdoc/docbook/docbook-xsl/common/insertfile.xsl Tue Jan 30 18:12:37 2007 @@ -4,7 +4,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: insertfile.xsl,v 1.1 2007/01/22 22:11:00 bjori Exp $ + $Id: insertfile.xsl,v 1.2 2007/01/30 18:12:37 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/common/labels.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/common/labels.xsl diff -u phpdoc/docbook/docbook-xsl/common/labels.xsl:1.1 phpdoc/docbook/docbook-xsl/common/labels.xsl:1.2 --- phpdoc/docbook/docbook-xsl/common/labels.xsl:1.1 Mon Jan 22 22:11:00 2007 +++ phpdoc/docbook/docbook-xsl/common/labels.xsl Tue Jan 30 18:12:37 2007 @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: labels.xsl,v 1.1 2007/01/22 22:11:00 bjori Exp $ + $Id: labels.xsl,v 1.2 2007/01/30 18:12:37 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -38,7 +38,7 @@ <xsl:if test="$verbose"> <xsl:message> <xsl:text>Request for label of unexpected element: </xsl:text> - <xsl:value-of select="name(.)"/> + <xsl:value-of select="local-name(.)"/> </xsl:message> </xsl:if> </xsl:template> @@ -702,10 +702,12 @@ <xsl:apply-templates select="$pchap" mode="label.markup"/> <xsl:apply-templates select="$pchap" mode="intralabel.punctuation"/> </xsl:if> - <xsl:number format="1" count="equation[title]" from="chapter|appendix" level="any"/> + <xsl:number format="1" count="equation[title or info/title]" + from="chapter|appendix" level="any"/> </xsl:when> <xsl:otherwise> - <xsl:number format="1" count="equation[title]" from="book|article" level="any"/> + <xsl:number format="1" count="equation[title or info/title]" + from="book|article" level="any"/> </xsl:otherwise> </xsl:choose> </xsl:otherwise> @@ -748,6 +750,10 @@ <!-- nop --> </xsl:template> +<xsl:template match="sidebar" mode="label.markup"> + <!-- nop --> +</xsl:template> + <!-- ============================================================ --> <xsl:template name="label.this.section"> @@ -800,7 +806,7 @@ <xsl:choose> <xsl:when test="string($format) != 0"> <xsl:choose> - <xsl:when test="$format='arabic' or $format='1'">1</xsl:when> + <xsl:when test="string($format)='arabic' or $format='1'">1</xsl:when> <xsl:when test="$format='loweralpha' or $format='a'"> <xsl:value-of select="'a'"/> </xsl:when> @@ -813,6 +819,9 @@ <xsl:when test="$format='upperroman' or $format='I'"> <xsl:value-of select="'I'"/> </xsl:when> + <xsl:when test="$format='arabicindic' or $format='١'"> + <xsl:value-of select="'١'"/> + </xsl:when> <xsl:otherwise> <xsl:message> <xsl:text>Unexpected </xsl:text><xsl:value-of select="local-name(.)"/><xsl:text>.autolabel value: </xsl:text> @@ -830,7 +839,8 @@ <refdescription> <para>Returns format passed as parameter if non zero. Supported format are 'arabic' or '1', 'loweralpha' or 'a', 'lowerroman' or 'i', - 'uppoerlapha' or 'A', 'upperroman' or 'I'. If its not one of these then + 'upperlapha' or 'A', 'upperroman' or 'I', 'arabicindic' or '١'. + If its not one of these then returns the default format.</para> </refdescription> </doc:template> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/common/l10n.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/common/l10n.xsl diff -u phpdoc/docbook/docbook-xsl/common/l10n.xsl:1.1 phpdoc/docbook/docbook-xsl/common/l10n.xsl:1.2 --- phpdoc/docbook/docbook-xsl/common/l10n.xsl:1.1 Mon Jan 22 22:11:00 2007 +++ phpdoc/docbook/docbook-xsl/common/l10n.xsl Tue Jan 30 18:12:37 2007 @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: l10n.xsl,v 1.1 2007/01/22 22:11:00 bjori Exp $ + $Id: l10n.xsl,v 1.2 2007/01/30 18:12:37 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -194,7 +194,7 @@ </xsl:template> <xsl:template name="gentext.element.name"> - <xsl:param name="element.name" select="name(.)"/> + <xsl:param name="element.name" select="local-name(.)"/> <xsl:param name="lang"> <xsl:call-template name="l10n.language"/> </xsl:param> @@ -314,6 +314,7 @@ <xsl:param name="lang"> <xsl:call-template name="l10n.language"/> </xsl:param> + <xsl:param name="verbose" select="1"/> <xsl:variable name="local.localization.node" select="($local.l10n.xml//l:i18n/l:l10n[@language=$lang])[1]"/> @@ -322,7 +323,8 @@ select="($l10n.xml/l:i18n/l:l10n[@language=$lang])[1]"/> <xsl:if test="count($localization.node) = 0 - and count($local.localization.node) = 0"> + and count($local.localization.node) = 0 + and $verbose != 0"> <xsl:message> <xsl:text>No "</xsl:text> <xsl:value-of select="$lang"/> @@ -337,7 +339,8 @@ select="$localization.node/l:context[@name=$context]"/> <xsl:if test="count($context.node) = 0 - and count($local.context.node) = 0"> + and count($local.context.node) = 0 + and $verbose != 0"> <xsl:message> <xsl:text>No context named "</xsl:text> <xsl:value-of select="$context"/> @@ -379,8 +382,12 @@ <xsl:with-param name="xrefstyle" select="$xrefstyle"/> <xsl:with-param name="referrer" select="$referrer"/> <xsl:with-param name="lang" select="$lang"/> + <xsl:with-param name="verbose" select="$verbose"/> </xsl:call-template> </xsl:when> + <xsl:when test="$verbose = 0"> + <!-- silence --> + </xsl:when> <xsl:otherwise> <xsl:message> <xsl:text>No template for "</xsl:text> @@ -398,6 +405,8 @@ </xsl:choose> </xsl:template> +<!-- silently test if a gentext template exists --> + <xsl:template name="gentext.template.exists"> <xsl:param name="context" select="'default'"/> <xsl:param name="name" select="'default'"/> @@ -409,51 +418,22 @@ <xsl:call-template name="l10n.language"/> </xsl:param> - <xsl:variable name="local.localization.node" - select="($local.l10n.xml//l:i18n/l:l10n[@language=$lang])[1]"/> - - <xsl:variable name="localization.node" - select="($l10n.xml/l:i18n/l:l10n[@language=$lang])[1]"/> - - <xsl:variable name="local.context.node" - select="$local.localization.node/l:context[@name=$context]"/> - - <xsl:variable name="context.node" - select="$localization.node/l:context[@name=$context]"/> - - <xsl:variable name="local.template.node" - select="($local.context.node/l:template[@name=$name - and @style - and @style=$xrefstyle] - |$local.context.node/l:template[@name=$name - and not(@style)])[1]"/> - - <xsl:variable name="template.node" - select="($context.node/l:template[@name=$name - and @style - and @style=$xrefstyle] - |$context.node/l:template[@name=$name - and not(@style)])[1]"/> - + <xsl:variable name="template"> + <xsl:call-template name="gentext.template"> + <xsl:with-param name="context" select="$context"/> + <xsl:with-param name="name" select="$name"/> + <xsl:with-param name="origname" select="$origname"/> + <xsl:with-param name="purpose" select="$purpose"/> + <xsl:with-param name="xrefstyle" select="$xrefstyle"/> + <xsl:with-param name="referrer" select="$referrer"/> + <xsl:with-param name="lang" select="$lang"/> + <xsl:with-param name="verbose" select="0"/> + </xsl:call-template> + </xsl:variable> + <xsl:choose> - <xsl:when test="$local.template.node/@text">1</xsl:when> - <xsl:when test="$template.node/@text">1</xsl:when> - <xsl:otherwise> - <xsl:choose> - <xsl:when test="contains($name, '/')"> - <xsl:call-template name="gentext.template.exists"> - <xsl:with-param name="context" select="$context"/> - <xsl:with-param name="name" select="substring-after($name, '/')"/> - <xsl:with-param name="origname" select="$origname"/> - <xsl:with-param name="purpose" select="$purpose"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="lang" select="$lang"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise>0</xsl:otherwise> - </xsl:choose> - </xsl:otherwise> + <xsl:when test="string-length($template) != 0">1</xsl:when> + <xsl:otherwise>0</xsl:otherwise> </xsl:choose> </xsl:template> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/common/olink.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/common/olink.xsl diff -u phpdoc/docbook/docbook-xsl/common/olink.xsl:1.1 phpdoc/docbook/docbook-xsl/common/olink.xsl:1.2 --- phpdoc/docbook/docbook-xsl/common/olink.xsl:1.1 Mon Jan 22 22:11:00 2007 +++ phpdoc/docbook/docbook-xsl/common/olink.xsl Tue Jan 30 18:12:37 2007 @@ -626,7 +626,8 @@ <!-- Get the xref text for this record --> <xsl:variable name="xref.text" > <xsl:for-each select="$target.database" > - <xsl:value-of select="key('targetptr-key', $olink.key)/xreftext" /> + <xsl:copy-of + select="key('targetptr-key', $olink.key)/xreftext/node()" /> </xsl:for-each> </xsl:variable> @@ -670,7 +671,7 @@ contains($xrefstyle, 'nopage')) and not(contains($xrefstyle, 'title')) and not(contains($xrefstyle, 'label'))"> - <xsl:value-of select="$xref.text"/> + <xsl:copy-of select="$xref.text"/> </xsl:when> <xsl:when test="$xrefstyle != ''"> <xsl:if test="$olink.debug != 0"> @@ -902,7 +903,7 @@ </xsl:call-template> </xsl:when> <xsl:when test="$xref.text !=''"> - <xsl:value-of select="$xref.text"/> + <xsl:copy-of select="$xref.text"/> </xsl:when> <xsl:otherwise> <xsl:message> @@ -957,7 +958,7 @@ <!-- We are done --> </xsl:when> <!-- Have we reached the top without a match? --> - <xsl:when test="name($dirnode) != 'dir'" > + <xsl:when test="local-name($dirnode) != 'dir'" > <xsl:message>Olink error: cannot locate targetdoc <xsl:value-of select="$targetdoc"/> in sitemap</xsl:message> </xsl:when> <!-- Is the target in a descendant? --> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/common/refentry.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/common/refentry.xsl diff -u phpdoc/docbook/docbook-xsl/common/refentry.xsl:1.1 phpdoc/docbook/docbook-xsl/common/refentry.xsl:1.2 --- phpdoc/docbook/docbook-xsl/common/refentry.xsl:1.1 Mon Jan 22 22:11:00 2007 +++ phpdoc/docbook/docbook-xsl/common/refentry.xsl Tue Jan 30 18:12:37 2007 @@ -6,7 +6,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: refentry.xsl,v 1.1 2007/01/22 22:11:00 bjori Exp $ + $Id: refentry.xsl,v 1.2 2007/01/30 18:12:37 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -20,7 +20,7 @@ <doc:reference xmlns=""> <referenceinfo> <releaseinfo role="meta"> - $Id: refentry.xsl,v 1.1 2007/01/22 22:11:00 bjori Exp $ + $Id: refentry.xsl,v 1.2 2007/01/30 18:12:37 bjori Exp $ </releaseinfo> <corpauthor>The DocBook Project</corpauthor> <copyright><year>2005</year> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/common/stripns.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/common/stripns.xsl diff -u phpdoc/docbook/docbook-xsl/common/stripns.xsl:1.1 phpdoc/docbook/docbook-xsl/common/stripns.xsl:1.2 --- phpdoc/docbook/docbook-xsl/common/stripns.xsl:1.1 Mon Jan 22 22:11:00 2007 +++ phpdoc/docbook/docbook-xsl/common/stripns.xsl Tue Jan 30 18:12:37 2007 @@ -1,15 +1,15 @@ <?xml version='1.0'?> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:ng="http://docbook.org/docbook-ng" - xmlns:db="http://docbook.org/ns/docbook" + xmlns:ng="http://docbook.org/docbook-ng" + xmlns:db="http://docbook.org/ns/docbook" xmlns:saxon="http://icl.com/saxon" xmlns:NodeInfo="http://org.apache.xalan.lib.NodeInfo" xmlns:exsl="http://exslt.org/common" - exclude-result-prefixes="db ng exsl saxon" + exclude-result-prefixes="db ng exsl saxon NodeInfo" version='1.0'> <!-- ******************************************************************** - $Id: stripns.xsl,v 1.1 2007/01/22 22:11:00 bjori Exp $ + $Id: stripns.xsl,v 1.2 2007/01/30 18:12:37 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -26,14 +26,14 @@ <xsl:when test="self::ng:* or self::db:*"> <xsl:element name="{local-name(.)}"> <xsl:copy-of select="@*[not(name(.) = 'xml:id') - and not(name(.) = 'version')]"/> - <xsl:if test="@xml:id"> - <xsl:attribute name="id"> - <xsl:value-of select="@xml:id"/> - </xsl:attribute> - </xsl:if> + and not(name(.) = 'version')]"/> + <xsl:if test="@xml:id"> + <xsl:attribute name="id"> + <xsl:value-of select="@xml:id"/> + </xsl:attribute> + </xsl:if> - <xsl:call-template name="add-xml-base"/> + <xsl:call-template name="add-xml-base"/> <xsl:apply-templates mode="stripNS"/> </xsl:element> @@ -41,14 +41,14 @@ <xsl:otherwise> <xsl:copy> <xsl:copy-of select="@*[not(name(.) = 'xml:id') - and not(name(.) = 'version')]"/> - <xsl:if test="@xml:id"> - <xsl:attribute name="id"> - <xsl:value-of select="@xml:id"/> - </xsl:attribute> - </xsl:if> + and not(name(.) = 'version')]"/> + <xsl:if test="@xml:id"> + <xsl:attribute name="id"> + <xsl:value-of select="@xml:id"/> + </xsl:attribute> + </xsl:if> - <xsl:call-template name="add-xml-base"/> + <xsl:call-template name="add-xml-base"/> <xsl:apply-templates mode="stripNS"/> </xsl:copy> @@ -61,24 +61,24 @@ <xsl:when test="self::ng:* or self::db:*"> <xsl:element name="{local-name(.)}"> <xsl:copy-of select="@*[not(name(.) = 'xml:id') - and not(name(.) = 'version')]"/> - <xsl:if test="@xml:id"> - <xsl:attribute name="id"> - <xsl:value-of select="@xml:id"/> - </xsl:attribute> - </xsl:if> + and not(name(.) = 'version')]"/> + <xsl:if test="@xml:id"> + <xsl:attribute name="id"> + <xsl:value-of select="@xml:id"/> + </xsl:attribute> + </xsl:if> <xsl:apply-templates mode="stripNS"/> </xsl:element> </xsl:when> <xsl:otherwise> <xsl:copy> <xsl:copy-of select="@*[not(name(.) = 'xml:id') - and not(name(.) = 'version')]"/> - <xsl:if test="@xml:id"> - <xsl:attribute name="id"> - <xsl:value-of select="@xml:id"/> - </xsl:attribute> - </xsl:if> + and not(name(.) = 'version')]"/> + <xsl:if test="@xml:id"> + <xsl:attribute name="id"> + <xsl:value-of select="@xml:id"/> + </xsl:attribute> + </xsl:if> <xsl:apply-templates mode="stripNS"/> </xsl:copy> </xsl:otherwise> @@ -89,42 +89,42 @@ <xsl:variable name="info"> <xsl:choose> <xsl:when test="parent::db:article - |parent::db:appendix - |parent::db:bibliography - |parent::db:book - |parent::db:chapter - |parent::db:glossary - |parent::db:index - |parent::db:part - |parent::db:preface - |parent::db:refentry - |parent::db:reference - |parent::db:refsect1 - |parent::db:refsect2 - |parent::db:refsect3 - |parent::db:refsection - |parent::db:refsynopsisdiv - |parent::db:sect1 - |parent::db:sect2 - |parent::db:sect3 - |parent::db:sect4 - |parent::db:sect5 - |parent::db:section - |parent::db:setindex - |parent::db:set - |parent::db:slides - |parent::db:sidebar"> - <xsl:value-of select="local-name(parent::*)"/> - <xsl:text>info</xsl:text> + |parent::db:appendix + |parent::db:bibliography + |parent::db:book + |parent::db:chapter + |parent::db:glossary + |parent::db:index + |parent::db:part + |parent::db:preface + |parent::db:refentry + |parent::db:reference + |parent::db:refsect1 + |parent::db:refsect2 + |parent::db:refsect3 + |parent::db:refsection + |parent::db:refsynopsisdiv + |parent::db:sect1 + |parent::db:sect2 + |parent::db:sect3 + |parent::db:sect4 + |parent::db:sect5 + |parent::db:section + |parent::db:setindex + |parent::db:set + |parent::db:slides + |parent::db:sidebar"> + <xsl:value-of select="local-name(parent::*)"/> + <xsl:text>info</xsl:text> </xsl:when> <xsl:when test="parent::db:audioobject - |parent::db:imageobject - |parent::db:inlinemediaobject - |parent::db:mediaobject - |parent::db:mediaobjectco - |parent::db:textobject - |parent::db:videoobject"> - <xsl:text>objectinfo</xsl:text> + |parent::db:imageobject + |parent::db:inlinemediaobject + |parent::db:mediaobject + |parent::db:mediaobjectco + |parent::db:textobject + |parent::db:videoobject"> + <xsl:text>objectinfo</xsl:text> </xsl:when> <xsl:otherwise>blockinfo</xsl:otherwise> </xsl:choose> @@ -132,30 +132,30 @@ <xsl:element name="{$info}"> <xsl:copy-of select="@*[not(name(.) = 'xml:id') - and not(name(.) = 'version')]"/> + and not(name(.) = 'version')]"/> <xsl:if test="@xml:id"> <xsl:attribute name="id"> - <xsl:value-of select="@xml:id"/> + <xsl:value-of select="@xml:id"/> </xsl:attribute> </xsl:if> <xsl:apply-templates mode="stripNS"/> </xsl:element> <xsl:if test="(not(../db:title) and not(../ng:title)) - and ($info = 'prefaceinfo' - or $info = 'chapterinfo' - or $info = 'sectioninfo' - or $info = 'sect1info' - or $info = 'sect2info' - or $info = 'sect3info' - or $info = 'sect4info' - or $info = 'sect5info' - or $info = 'refsectioninfo' - or $info = 'refsect1info' - or $info = 'refsect2info' - or $info = 'refsect3info' - or $info = 'blockinfo' - or $info = 'appendixinfo')"> + and ($info = 'prefaceinfo' + or $info = 'chapterinfo' + or $info = 'sectioninfo' + or $info = 'sect1info' + or $info = 'sect2info' + or $info = 'sect3info' + or $info = 'sect4info' + or $info = 'sect5info' + or $info = 'refsectioninfo' + or $info = 'refsect1info' + or $info = 'refsect2info' + or $info = 'refsect3info' + or $info = 'blockinfo' + or $info = 'appendixinfo')"> <xsl:apply-templates select="db:title|ng:title" mode="stripNS"/> </xsl:if> @@ -163,52 +163,52 @@ <xsl:template match="ng:link|db:link" mode="stripNS"> <xsl:variable xmlns:xlink="http://www.w3.org/1999/xlink" - name="href" select="@xlink:href|@href"/> + 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' - and name(.) != 'version' - and name(.) != 'xml:id'"> - <xsl:copy/> - </xsl:if> - </xsl:for-each> - <xsl:if test="@xml:id"> - <xsl:attribute name="id"> - <xsl:value-of select="@xml:id"/> - </xsl:attribute> - </xsl:if> - <xsl:apply-templates mode="stripNS"/> + <xsl:for-each select="@*"> + <xsl:if test="local-name(.) != 'href' + and name(.) != 'version' + and name(.) != 'xml:id'"> + <xsl:copy/> + </xsl:if> + </xsl:for-each> + <xsl:if test="@xml:id"> + <xsl:attribute name="id"> + <xsl:value-of select="@xml:id"/> + </xsl:attribute> + </xsl:if> + <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' - and name(.) != 'version' - and name(.) != 'xml:id'"> - <xsl:copy/> - </xsl:if> - </xsl:for-each> - <xsl:if test="@xml:id"> - <xsl:attribute name="id"> - <xsl:value-of select="@xml:id"/> - </xsl:attribute> - </xsl:if> - <xsl:apply-templates mode="stripNS"/> + <xsl:for-each select="@*"> + <xsl:if test="local-name(.) != 'href' + and name(.) != 'version' + and name(.) != 'xml:id'"> + <xsl:copy/> + </xsl:if> + </xsl:for-each> + <xsl:if test="@xml:id"> + <xsl:attribute name="id"> + <xsl:value-of select="@xml:id"/> + </xsl:attribute> + </xsl:if> + <xsl:apply-templates mode="stripNS"/> </link> </xsl:when> <xsl:otherwise> <link> - <xsl:copy-of select="@*[not(name(.) = 'xml:id') - and not(name(.) = 'version')]"/> - <xsl:if test="@xml:id"> - <xsl:attribute name="id"> - <xsl:value-of select="@xml:id"/> - </xsl:attribute> - </xsl:if> - <xsl:apply-templates mode="stripNS"/> + <xsl:copy-of select="@*[not(name(.) = 'xml:id') + and not(name(.) = 'version')]"/> + <xsl:if test="@xml:id"> + <xsl:attribute name="id"> + <xsl:value-of select="@xml:id"/> + </xsl:attribute> + </xsl:if> + <xsl:apply-templates mode="stripNS"/> </link> </xsl:otherwise> </xsl:choose> @@ -217,30 +217,30 @@ <xsl:template match="ng:tag|db:tag" mode="stripNS"> <sgmltag> <xsl:copy-of select="@*[not(name(.) = 'xml:id') - and not(name(.) = 'version')]"/> + and not(name(.) = 'version')]"/> <xsl:apply-templates mode="stripNS"/> </sgmltag> </xsl:template> <xsl:template match="ng:textdata|db:textdata - |ng:imagedata|db:imagedata - |ng:videodata|db:videodata - |ng:audiodata|db:audiodata" mode="stripNS"> + |ng:imagedata|db:imagedata + |ng:videodata|db:videodata + |ng:audiodata|db:audiodata" mode="stripNS"> <xsl:element name="{local-name(.)}"> <xsl:copy-of select="@*[not(name(.) = 'xml:id') - and not(name(.) = 'version') - and not(name(.) = 'entityref')]"/> + and not(name(.) = 'version') + and not(name(.) = 'entityref')]"/> <xsl:if test="@xml:id"> <xsl:attribute name="id"> - <xsl:value-of select="@xml:id"/> + <xsl:value-of select="@xml:id"/> </xsl:attribute> </xsl:if> <xsl:choose> <xsl:when test="@entityref"> - <xsl:attribute name="fileref"> - <xsl:value-of select="unparsed-entity-uri(@entityref)"/> - </xsl:attribute> + <xsl:attribute name="fileref"> + <xsl:value-of select="unparsed-entity-uri(@entityref)"/> + </xsl:attribute> </xsl:when> </xsl:choose> @@ -273,28 +273,33 @@ <xsl:if test="$base != ''"> <xsl:attribute name="xml:base"> <xsl:call-template name="systemIdToBaseURI"> - <xsl:with-param name="systemId"> - <!-- file: seems to confuse some processors. --> - <xsl:choose> - <xsl:when test="starts-with($base, 'file:///')"> - <xsl:value-of select="substring-after($base,'file://')"/> - </xsl:when> - <xsl:when test="starts-with($base, 'file://')"> - <xsl:value-of select="substring-after($base,'file:/')"/> - </xsl:when> - <xsl:when test="starts-with($base, 'file:/') - and substring($base, 8, 1) = ':'"> - <!-- Stupid windows file:/c:/path... --> - <xsl:value-of select="concat('file:///', substring-after($base,'file:/'))"/> - </xsl:when> - <xsl:when test="starts-with($base, 'file:/')"> - <xsl:value-of select="substring-after($base,'file:')"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$base"/> - </xsl:otherwise> - </xsl:choose> - </xsl:with-param> + <xsl:with-param name="systemId"> + <!-- file: seems to confuse some processors. --> + <xsl:choose> + <!-- however, windows paths must use file:///c:/path --> + <xsl:when test="starts-with($base, 'file:///') and + substring($base, 10, 1) = ':'"> + <xsl:value-of select="$base"/> + </xsl:when> + <xsl:when test="starts-with($base, 'file:/') + and substring($base, 8, 1) = ':'"> + <xsl:value-of select="concat('file:///', + substring-after($base,'file:/'))"/> + </xsl:when> + <xsl:when test="starts-with($base, 'file:///')"> + <xsl:value-of select="substring-after($base,'file://')"/> + </xsl:when> + <xsl:when test="starts-with($base, 'file://')"> + <xsl:value-of select="substring-after($base,'file:/')"/> + </xsl:when> + <xsl:when test="starts-with($base, 'file:/')"> + <xsl:value-of select="substring-after($base,'file:')"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$base"/> + </xsl:otherwise> + </xsl:choose> + </xsl:with-param> </xsl:call-template> </xsl:attribute> </xsl:if> @@ -308,7 +313,7 @@ <xsl:text>/</xsl:text> <xsl:call-template name="systemIdToBaseURI"> <xsl:with-param name="systemId" - select="substring-after($systemId,'/')"/> + select="substring-after($systemId,'/')"/> </xsl:call-template> </xsl:if> </xsl:template> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/common/subtitles.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/common/subtitles.xsl diff -u phpdoc/docbook/docbook-xsl/common/subtitles.xsl:1.1 phpdoc/docbook/docbook-xsl/common/subtitles.xsl:1.2 --- phpdoc/docbook/docbook-xsl/common/subtitles.xsl:1.1 Mon Jan 22 22:11:00 2007 +++ phpdoc/docbook/docbook-xsl/common/subtitles.xsl Tue Jan 30 18:12:37 2007 @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: subtitles.xsl,v 1.1 2007/01/22 22:11:00 bjori Exp $ + $Id: subtitles.xsl,v 1.2 2007/01/30 18:12:37 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -31,7 +31,7 @@ <xsl:template match="*" mode="subtitle.markup"> <xsl:message> <xsl:text>Request for subtitle of unexpected element: </xsl:text> - <xsl:value-of select="name(.)"/> + <xsl:value-of select="local-name(.)"/> </xsl:message> <xsl:text>???SUBTITLE???</xsl:text> </xsl:template> @@ -94,7 +94,7 @@ <xsl:template match="dedication|colophon" mode="subtitle.markup"> <xsl:param name="allow-anchors" select="'0'"/> - <xsl:apply-templates select="subtitle" + <xsl:apply-templates select="(subtitle|info/subtitle)[1]" mode="subtitle.markup"> <xsl:with-param name="allow-anchors" select="$allow-anchors"/> </xsl:apply-templates> @@ -113,7 +113,7 @@ <xsl:template match="qandaset" mode="subtitle.markup"> <xsl:param name="allow-anchors" select="'0'"/> - <xsl:apply-templates select="blockinfo/subtitle[1]" + <xsl:apply-templates select="(blockinfo/subtitle|info/subtitle)[1]" mode="subtitle.markup"> <xsl:with-param name="allow-anchors" select="$allow-anchors"/> </xsl:apply-templates> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/common/table.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/common/table.xsl diff -u phpdoc/docbook/docbook-xsl/common/table.xsl:1.1 phpdoc/docbook/docbook-xsl/common/table.xsl:1.2 --- phpdoc/docbook/docbook-xsl/common/table.xsl:1.1 Mon Jan 22 22:11:00 2007 +++ phpdoc/docbook/docbook-xsl/common/table.xsl Tue Jan 30 18:12:37 2007 @@ -5,7 +5,7 @@ version="1.0"> <!-- ******************************************************************** - $Id: table.xsl,v 1.1 2007/01/22 22:11:00 bjori Exp $ + $Id: table.xsl,v 1.2 2007/01/30 18:12:37 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -213,11 +213,11 @@ <xsl:choose> <xsl:when test="$namest != '' and $nameend != ''"> <xsl:choose> - <xsl:when test="$ecol >= $scol"> - <xsl:value-of select="$ecol - $scol + 1"/> + <xsl:when test="number($ecol) >= number($scol)"> + <xsl:value-of select="number($ecol) - number($scol) + 1"/> </xsl:when> <xsl:otherwise> - <xsl:value-of select="$scol - $ecol + 1"/> + <xsl:value-of select="number($scol) - number($ecol) + 1"/> </xsl:otherwise> </xsl:choose> </xsl:when> @@ -473,4 +473,31 @@ </xsl:if> </xsl:template> +<!-- Returns the table style for the context element --> +<xsl:template name="tabstyle"> + <xsl:param name="node" select="."/> + + <xsl:variable name="tgroup" select="$node/tgroup[1] | + $node/ancestor-or-self::tgroup[1]"/> + + <xsl:variable name="table" + select="($node/ancestor-or-self::table | + $node/ancestor-or-self::informaltable)[1]"/> + + <xsl:variable name="tabstyle"> + <xsl:choose> + <xsl:when test="$table/@tabstyle != ''"> + <xsl:value-of select="normalize-space($table/@tabstyle)"/> + </xsl:when> + <xsl:when test="$tgroup/@tgroupstyle != ''"> + <xsl:value-of select="normalize-space($tgroup/@tgroupstyle)"/> + </xsl:when> + <xsl:otherwise> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:value-of select="$tabstyle"/> +</xsl:template> + </xsl:stylesheet> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/common/targets.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/common/targets.xsl diff -u phpdoc/docbook/docbook-xsl/common/targets.xsl:1.1 phpdoc/docbook/docbook-xsl/common/targets.xsl:1.2 --- phpdoc/docbook/docbook-xsl/common/targets.xsl:1.1 Mon Jan 22 22:11:00 2007 +++ phpdoc/docbook/docbook-xsl/common/targets.xsl Tue Jan 30 18:12:37 2007 @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: targets.xsl,v 1.1 2007/01/22 22:11:00 bjori Exp $ + $Id: targets.xsl,v 1.2 2007/01/30 18:12:37 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -64,7 +64,7 @@ <xsl:with-param name="omit-xml-declaration" select="'yes'"/> <xsl:with-param name="doctype-public" select="''"/> <xsl:with-param name="doctype-system" select="''"/> - <xsl:with-param name="indent" select="'yes'"/> + <xsl:with-param name="indent" select="'no'"/> <xsl:with-param name="quiet" select="0"/> <xsl:with-param name="content"> <xsl:apply-templates select="." mode="olink.mode"/> @@ -254,7 +254,7 @@ <xsl:apply-templates mode="olink.mode"/> </xsl:template> -<xsl:template match="equation[title]" mode="olink.mode"> +<xsl:template match="equation[title or info/title]" mode="olink.mode"> <xsl:call-template name="obj"/> </xsl:template> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/common/titles.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/common/titles.xsl diff -u phpdoc/docbook/docbook-xsl/common/titles.xsl:1.1 phpdoc/docbook/docbook-xsl/common/titles.xsl:1.2 --- phpdoc/docbook/docbook-xsl/common/titles.xsl:1.1 Mon Jan 22 22:11:00 2007 +++ phpdoc/docbook/docbook-xsl/common/titles.xsl Tue Jan 30 18:12:37 2007 @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: titles.xsl,v 1.1 2007/01/22 22:11:00 bjori Exp $ + $Id: titles.xsl,v 1.2 2007/01/30 18:12:37 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -47,12 +47,19 @@ <xsl:if test="$verbose != 0"> <xsl:message> <xsl:text>Request for title of element with no title: </xsl:text> - <xsl:value-of select="name(.)"/> - <xsl:if test="@id"> - <xsl:text> (id="</xsl:text> - <xsl:value-of select="@id"/> - <xsl:text>")</xsl:text> - </xsl:if> + <xsl:value-of select="local-name(.)"/> + <xsl:choose> + <xsl:when test="@id"> + <xsl:text> (id="</xsl:text> + <xsl:value-of select="@id"/> + <xsl:text>")</xsl:text> + </xsl:when> + <xsl:when test="@xml:id"> + <xsl:text> (xml:id="</xsl:text> + <xsl:value-of select="@xml:id"/> + <xsl:text>")</xsl:text> + </xsl:when> + </xsl:choose> </xsl:message> </xsl:if> <xsl:text>???TITLE???</xsl:text> @@ -116,7 +123,7 @@ <!-- <xsl:message> - <xsl:value-of select="name(.)"/> + <xsl:value-of select="local-name(.)"/> <xsl:text> </xsl:text> <xsl:value-of select="$allow-anchors"/> </xsl:message> @@ -137,7 +144,7 @@ <xsl:param name="allow-anchors" select="0"/> <xsl:choose> <xsl:when test="title"> - <xsl:apply-templates select="title" mode="title.markup"> + <xsl:apply-templates select="(title|info/title)[1]" mode="title.markup"> <xsl:with-param name="allow-anchors" select="$allow-anchors"/> </xsl:apply-templates> </xsl:when> @@ -153,7 +160,7 @@ <xsl:param name="allow-anchors" select="0"/> <xsl:choose> <xsl:when test="title"> - <xsl:apply-templates select="title" mode="title.markup"> + <xsl:apply-templates select="(title|info/title)[1]" mode="title.markup"> <xsl:with-param name="allow-anchors" select="$allow-anchors"/> </xsl:apply-templates> </xsl:when> @@ -230,7 +237,7 @@ mode="title.markup"> <xsl:param name="allow-anchors" select="0"/> <xsl:variable name="title" select="(info/title - |sectioninfo/title + |sectioninfo/title |sect1info/title |sect2info/title |sect3info/title @@ -294,12 +301,27 @@ </xsl:when> <xsl:otherwise> <xsl:call-template name="gentext.element.name"> - <xsl:with-param name="element.name" select="name(.)"/> + <xsl:with-param name="element.name" select="local-name(.)"/> </xsl:call-template> </xsl:otherwise> </xsl:choose> </xsl:template> +<xsl:template match="glossdiv" mode="title.markup"> + <xsl:param name="allow-anchors" select="0"/> + <xsl:variable name="title" select="(info/title|title)[1]"/> + <xsl:choose> + <xsl:when test="$title"> + <xsl:apply-templates select="$title" mode="title.markup"> + <xsl:with-param name="allow-anchors" select="$allow-anchors"/> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + <xsl:message>ERROR: glossdiv missing its required title</xsl:message> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + <xsl:template match="glossentry" mode="title.markup"> <xsl:param name="allow-anchors" select="0"/> <xsl:apply-templates select="glossterm" mode="title.markup"> @@ -393,8 +415,8 @@ <xsl:template match="abstract" mode="title.markup"> <xsl:param name="allow-anchors" select="0"/> <xsl:choose> - <xsl:when test="title"> - <xsl:apply-templates select="title" mode="title.markup"> + <xsl:when test="title|info/title"> + <xsl:apply-templates select="(title|info/title)[1]" mode="title.markup"> <xsl:with-param name="allow-anchors" select="$allow-anchors"/> </xsl:apply-templates> </xsl:when> @@ -408,7 +430,7 @@ <xsl:template match="caution|tip|warning|important|note" mode="title.markup"> <xsl:param name="allow-anchors" select="0"/> - <xsl:variable name="title" select="title[1]"/> + <xsl:variable name="title" select="(title|info/title)[1]"/> <xsl:choose> <xsl:when test="$title"> <xsl:apply-templates select="$title" mode="title.markup"> @@ -450,7 +472,7 @@ <xsl:param name="allow-anchors" select="0"/> <xsl:variable name="title" select="(info/title| blockinfo/title| - title)[1]"/> + title)[1]"/> <xsl:choose> <xsl:when test="$title"> <xsl:apply-templates select="$title" mode="title.markup"> @@ -562,16 +584,16 @@ <xsl:param name="verbose" select="1"/> <xsl:variable name="titleabbrev" select="(info/titleabbrev - |sectioninfo/titleabbrev - |sect1info/titleabbrev - |sect2info/titleabbrev - |sect3info/titleabbrev - |sect4info/titleabbrev - |sect5info/titleabbrev - |refsect1info/titleabbrev - |refsect2info/titleabbrev - |refsect3info/titleabbrev - |titleabbrev)[1]"/> + |sectioninfo/titleabbrev + |sect1info/titleabbrev + |sect2info/titleabbrev + |sect3info/titleabbrev + |sect4info/titleabbrev + |sect5info/titleabbrev + |refsect1info/titleabbrev + |refsect2info/titleabbrev + |refsect3info/titleabbrev + |titleabbrev)[1]"/> <xsl:choose> <xsl:when test="$titleabbrev"> @@ -668,23 +690,23 @@ <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: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: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:with-param name="target" select="$target"/> </xsl:call-template> </xsl:when> @@ -692,17 +714,17 @@ <xsl:apply-templates select="$target" mode="xref-to-prefix"/> <xsl:apply-templates select="$target" mode="xref-to"> - <xsl:with-param name="referrer" select="."/> - <xsl:with-param name="xrefstyle"> - <xsl:choose> - <xsl:when test="@role and not(@xrefstyle) and $use.role.as.xrefstyle != 0"> - <xsl:value-of select="@role"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="@xrefstyle"/> - </xsl:otherwise> - </xsl:choose> - </xsl:with-param> + <xsl:with-param name="referrer" select="."/> + <xsl:with-param name="xrefstyle"> + <xsl:choose> + <xsl:when test="@role and not(@xrefstyle) and $use.role.as.xrefstyle != 0"> + <xsl:value-of select="@role"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="@xrefstyle"/> + </xsl:otherwise> + </xsl:choose> + </xsl:with-param> </xsl:apply-templates> <xsl:apply-templates select="$target" mode="xref-to-suffix"/> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/common/entities.ent?view=markup&rev=1.1 Index: phpdoc/docbook/docbook-xsl/common/entities.ent +++ phpdoc/docbook/docbook-xsl/common/entities.ent <!-- ******************************************************************** $Id: entities.ent,v 1.1 2007/01/30 18:12:37 bjori Exp $ ******************************************************************** This file contains common entity declarations used for sorting by various templates. This file is part of the XSL DocBook Stylesheet distribution. See ../README or http://nwalsh.com/docbook/xsl/ for copyright and other information. ******************************************************************** --> <!-- ==================================================================== --> <!ENTITY lowercase "'AaÀàÁáÂâÃãÄäÅåĀāĂ㥹ǍǎǞǟǠǡǺǻȀȁȂȃȦȧḀḁẚẠạẢảẤấẦầẨẩẪẫẬậẮắẰằẲẳẴẵẶặBbƀƁɓƂƃḂḃḄḅḆḇCcÇçĆćĈĉĊċČčƇƈɕḈḉDdĎďĐđƊɗƋƌDžDzȡɖḊḋḌḍḎḏḐḑḒḓEeÈèÉéÊêËëĒēĔĕĖėĘęĚěȄȅȆȇȨȩḔḕḖḗḘḙḚḛḜḝẸẹẺẻẼẽẾế&! #7872;ềỂểỄễỆệFfƑƒḞḟGgĜĝĞğĠġĢģƓɠǤǥǦǧǴǵḠḡHhĤĥĦħȞȟɦḢḣḤḥḦḧḨḩḪḫẖIiÌìÍíÎîÏïĨĩĪīĬĭĮįİƗɨǏǐȈȉȊȋḬḭḮḯỈỉỊịJjĴĵǰʝKkĶķƘƙǨǩḰḱḲḳḴḵLlĹĺĻļĽľĿŀŁłƚLjȴɫɬɭḶḷḸḹḺḻḼḽMmɱḾḿṀṁṂṃNnÑñŃńŅņŇňƝɲƞȠNjǸǹȵɳṄṅṆṇṈṉṊ&! #7755;OoÒòÓóÔôÕõÖö&# 216;øŌōŎŏŐőƟƠơǑǒǪǫǬǭǾǿȌȍȎȏȪȫȬȭȮȯȰȱṌṍṎṏṐṑṒṓỌọỎỏỐốỒồỔổỖỗỘộỚớỜờỞởỠỡỢợPpƤƥṔṕṖṗQqʠRrŔŕŖŗŘřȐȑȒȓɼɽɾṘṙṚṛṜṝṞṟSsŚśŜŝŞşŠšȘșʂṠṡṢṣṤṥṦṧṨṩTtŢţŤťŦŧƫƬƭƮʈȚțȶṪṫṬṭṮṯṰṱẗUuÙùÚúÛûÜüŨũŪūŬŭŮůŰ$! 9;ŲųƯưǓǔǕǖǗǘǙǚǛǜȔȕȖȗṲṳṴṵṶṷṸṹṺṻỤụỦủỨứỪừỬửỮữỰựVvƲʋṼṽṾṿWwŴŵẀẁẂẃẄẅẆẇẈẉẘXxẊẋẌẍYyÝýÿŸŶŷƳƴȲȳẎẏẙỲỳỴỵỶỷỸỹZzŹźŻżŽžƵƶȤȥʐʑẐẑẒẓẔẕẕ'"> <!ENTITY uppercase "'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ'"> <!ENTITY primary 'normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))'> <!ENTITY secondary 'normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = ""]))'> <!ENTITY tertiary 'normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = ""]))'> <!ENTITY section '(ancestor-or-self::set |ancestor-or-self::book |ancestor-or-self::part |ancestor-or-self::reference |ancestor-or-self::partintro |ancestor-or-self::chapter |ancestor-or-self::appendix |ancestor-or-self::preface |ancestor-or-self::article |ancestor-or-self::section |ancestor-or-self::sect1 |ancestor-or-self::sect2 |ancestor-or-self::sect3 |ancestor-or-self::sect4 |ancestor-or-self::sect5 |ancestor-or-self::refentry |ancestor-or-self::refsect1 |ancestor-or-self::refsect2 |ancestor-or-self::refsect3 |ancestor-or-self::simplesect |ancestor-or-self::bibliography |ancestor-or-self::glossary |ancestor-or-self::index |ancestor-or-self::webpage)[last()]'> <!ENTITY section.id 'generate-id(§ion;)'> <!ENTITY sep '" "'> <!ENTITY scope 'count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))'>
http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/common/autoidx-kimber.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/common/autoidx-kimber.xsl diff -u phpdoc/docbook/docbook-xsl/common/autoidx-kimber.xsl:1.1 phpdoc/docbook/docbook-xsl/common/autoidx-kimber.xsl:1.2 --- phpdoc/docbook/docbook-xsl/common/autoidx-kimber.xsl:1.1 Mon Jan 22 22:11:00 2007 +++ phpdoc/docbook/docbook-xsl/common/autoidx-kimber.xsl Tue Jan 30 18:12:37 2007 @@ -12,7 +12,7 @@ exclude-result-prefixes="k"> <!-- ******************************************************************** - $Id: autoidx-kimber.xsl,v 1.1 2007/01/22 22:11:00 bjori Exp $ + $Id: autoidx-kimber.xsl,v 1.2 2007/01/30 18:12:37 bjori Exp $ ******************************************************************** This file is part of the DocBook XSL Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/common/autoidx-kosek.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/common/autoidx-kosek.xsl diff -u phpdoc/docbook/docbook-xsl/common/autoidx-kosek.xsl:1.1 phpdoc/docbook/docbook-xsl/common/autoidx-kosek.xsl:1.2 --- phpdoc/docbook/docbook-xsl/common/autoidx-kosek.xsl:1.1 Mon Jan 22 22:11:00 2007 +++ phpdoc/docbook/docbook-xsl/common/autoidx-kosek.xsl Tue Jan 30 18:12:37 2007 @@ -14,7 +14,7 @@ xmlns:i="urn:cz-kosek:functions:index"> <!-- ******************************************************************** - $Id: autoidx-kosek.xsl,v 1.1 2007/01/22 22:11:00 bjori Exp $ + $Id: autoidx-kosek.xsl,v 1.2 2007/01/30 18:12:37 bjori Exp $ ******************************************************************** This file is part of the DocBook XSL Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/common/common.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/common/common.xsl diff -u phpdoc/docbook/docbook-xsl/common/common.xsl:1.1 phpdoc/docbook/docbook-xsl/common/common.xsl:1.2 --- phpdoc/docbook/docbook-xsl/common/common.xsl:1.1 Mon Jan 22 22:11:00 2007 +++ phpdoc/docbook/docbook-xsl/common/common.xsl Tue Jan 30 18:12:37 2007 @@ -7,7 +7,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: common.xsl,v 1.1 2007/01/22 22:11:00 bjori Exp $ + $Id: common.xsl,v 1.2 2007/01/30 18:12:37 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -21,7 +21,7 @@ <doc:reference xmlns=""> <referenceinfo> <releaseinfo role="meta"> -$Id: common.xsl,v 1.1 2007/01/22 22:11:00 bjori Exp $ +$Id: common.xsl,v 1.2 2007/01/30 18:12:37 bjori Exp $ </releaseinfo> <author><surname>Walsh</surname> <firstname>Norman</firstname></author> @@ -64,7 +64,7 @@ example figure footnote footnoteref formalpara funcprototype funcsynopsis glossary glossdef glossdiv glossentry glosslist graphicco group highlights imagedata imageobject imageobjectco important index -indexdiv indexentry indexterm informalequation informalexample +indexdiv indexentry indexterm info informalequation informalexample informalfigure informaltable inlineequation inlinemediaobject itemizedlist itermset keycombo keywordset legalnotice listitem lot mediaobject mediaobjectco menuchoice msg msgentry msgexplan msginfo @@ -210,12 +210,12 @@ <xsl:template name="section.level"> <xsl:param name="node" select="."/> <xsl:choose> - <xsl:when test="name($node)='sect1'">1</xsl:when> - <xsl:when test="name($node)='sect2'">2</xsl:when> - <xsl:when test="name($node)='sect3'">3</xsl:when> - <xsl:when test="name($node)='sect4'">4</xsl:when> - <xsl:when test="name($node)='sect5'">5</xsl:when> - <xsl:when test="name($node)='section'"> + <xsl:when test="local-name($node)='sect1'">1</xsl:when> + <xsl:when test="local-name($node)='sect2'">2</xsl:when> + <xsl:when test="local-name($node)='sect3'">3</xsl:when> + <xsl:when test="local-name($node)='sect4'">4</xsl:when> + <xsl:when test="local-name($node)='sect5'">5</xsl:when> + <xsl:when test="local-name($node)='section'"> <xsl:choose> <xsl:when test="$node/../../../../../../section">6</xsl:when> <xsl:when test="$node/../../../../../section">5</xsl:when> @@ -225,16 +225,16 @@ <xsl:otherwise>1</xsl:otherwise> </xsl:choose> </xsl:when> - <xsl:when test="name($node)='refsect1' or - name($node)='refsect2' or - name($node)='refsect3' or - name($node)='refsection' or - name($node)='refsynopsisdiv'"> + <xsl:when test="local-name($node)='refsect1' or + local-name($node)='refsect2' or + local-name($node)='refsect3' or + local-name($node)='refsection' or + local-name($node)='refsynopsisdiv'"> <xsl:call-template name="refentry.section.level"> <xsl:with-param name="node" select="$node"/> </xsl:call-template> </xsl:when> - <xsl:when test="name($node)='simplesect'"> + <xsl:when test="local-name($node)='simplesect'"> <xsl:choose> <xsl:when test="$node/../../sect1">2</xsl:when> <xsl:when test="$node/../../sect2">3</xsl:when> @@ -308,11 +308,11 @@ <xsl:variable name="levelinRE"> <xsl:choose> - <xsl:when test="name($node)='refsynopsisdiv'">1</xsl:when> - <xsl:when test="name($node)='refsect1'">1</xsl:when> - <xsl:when test="name($node)='refsect2'">2</xsl:when> - <xsl:when test="name($node)='refsect3'">3</xsl:when> - <xsl:when test="name($node)='refsection'"> + <xsl:when test="local-name($node)='refsynopsisdiv'">1</xsl:when> + <xsl:when test="local-name($node)='refsect1'">1</xsl:when> + <xsl:when test="local-name($node)='refsect2'">2</xsl:when> + <xsl:when test="local-name($node)='refsect3'">3</xsl:when> + <xsl:when test="local-name($node)='refsection'"> <xsl:choose> <xsl:when test="$node/../../../../../refsection">5</xsl:when> <xsl:when test="$node/../../../../refsection">4</xsl:when> @@ -378,30 +378,30 @@ <!-- (hnr (hierarchical-number-recursive (normalize "qandadiv") node)) - (parsect (ancestor-member node (section-element-list))) + (parsect (ancestor-member node (section-element-list))) - (defnum (if (and %qanda-inherit-numeration% - %section-autolabel%) - (if (node-list-empty? parsect) - (section-autolabel-prefix node) - (section-autolabel parsect)) - "")) - - (hnumber (let loop ((numlist hnr) (number defnum) - (sep (if (equal? defnum "") "" "."))) - (if (null? numlist) - number - (loop (cdr numlist) - (string-append number - sep - (number->string (car numlist))) - ".")))) - (cnumber (child-number (parent node))) - (number (string-append hnumber - (if (equal? hnumber "") - "" - ".") - (number->string cnumber)))) + (defnum (if (and %qanda-inherit-numeration% + %section-autolabel%) + (if (node-list-empty? parsect) + (section-autolabel-prefix node) + (section-autolabel parsect)) + "")) + + (hnumber (let loop ((numlist hnr) (number defnum) + (sep (if (equal? defnum "") "" "."))) + (if (null? numlist) + number + (loop (cdr numlist) + (string-append number + sep + (number->string (car numlist))) + ".")))) + (cnumber (child-number (parent node))) + (number (string-append hnumber + (if (equal? hnumber "") + "" + ".") + (number->string cnumber)))) --> <xsl:choose> @@ -506,16 +506,16 @@ </xsl:when> <!-- handle corpauthor as a special case...--> - <xsl:when test="name($node)='corpauthor'"> + <xsl:when test="local-name($node)='corpauthor'"> <xsl:apply-templates select="$node"/> </xsl:when> <xsl:otherwise> <xsl:choose> - <!-- Handle case when personname contains only general markup (DocBook 5.0) --> - <xsl:when test="$node/self::personname and not($node/firstname or $node/honorific or $node/lineage or $node/othername or $node/surname)"> - <xsl:apply-templates select="$node/node()"/> - </xsl:when> + <!-- Handle case when personname contains only general markup (DocBook 5.0) --> + <xsl:when test="$node/self::personname and not($node/firstname or $node/honorific or $node/lineage or $node/othername or $node/surname)"> + <xsl:apply-templates select="$node/node()"/> + </xsl:when> <xsl:when test="$style = 'family-given'"> <xsl:call-template name="person.name.family-given"> <xsl:with-param name="node" select="$node"/> @@ -684,7 +684,7 @@ <xsl:when test="contains($string, $subst)"> <xsl:value-of select="substring-before($string, $subst)"/> <xsl:call-template name="gentext.element.name"> - <xsl:with-param name="element.name" select="name($target)"/> + <xsl:with-param name="element.name" select="local-name($target)"/> </xsl:call-template> <xsl:call-template name="xref.g.subst"> <xsl:with-param name="string" @@ -975,23 +975,23 @@ <xsl:variable name="useobject"> <xsl:choose> <!-- The phrase is used only when contains TeX Math and output is FO --> - <xsl:when test="name($object)='textobject' and $object/phrase + <xsl:when test="local-name($object)='textobject' and $object/phrase and $object/@role='tex' and $stylesheet.result.type = 'fo' and $tex.math.in.alt != ''"> <xsl:text>1</xsl:text> </xsl:when> <!-- The phrase is never used --> - <xsl:when test="name($object)='textobject' and $object/phrase"> + <xsl:when test="local-name($object)='textobject' and $object/phrase"> <xsl:text>0</xsl:text> </xsl:when> - <xsl:when test="name($object)='textobject' + <xsl:when test="local-name($object)='textobject' and $object/ancestor::equation "> <!-- The first textobject is not a reasonable fallback for equation image --> <xsl:text>0</xsl:text> </xsl:when> <!-- The first textobject is a reasonable fallback --> - <xsl:when test="name($object)='textobject' + <xsl:when test="local-name($object)='textobject' and $object[not(@role) or @role!='tex']"> <xsl:text>1</xsl:text> </xsl:when> @@ -1247,12 +1247,12 @@ <xsl:variable name="target" select="$targets[1]"/> <xsl:if test="count($target) > 0"> - <xsl:if test="not(contains(concat(' ', $element-list, ' '), name($target)))"> + <xsl:if test="not(contains(concat(' ', $element-list, ' '), local-name($target)))"> <xsl:message> <xsl:text>Error: linkend (</xsl:text> <xsl:value-of select="$linkend"/> <xsl:text>) points to "</xsl:text> - <xsl:value-of select="name($target)"/> + <xsl:value-of select="local-name($target)"/> <xsl:text>" not (one of): </xsl:text> <xsl:value-of select="$element-list"/> </xsl:message> @@ -1346,16 +1346,16 @@ <xsl:choose> <xsl:when test="not($list/@continuation = 'continues')"> <xsl:choose> - <xsl:when test="@startingnumber"> - <xsl:value-of select="@startingnumber"/> - </xsl:when> - <xsl:when test="$pi-html-start != ''"> - <xsl:value-of select="$pi-html-start"/> - </xsl:when> - <xsl:when test="$pi-fo-start != ''"> - <xsl:value-of select="$pi-fo-start"/> - </xsl:when> - <xsl:otherwise>1</xsl:otherwise> + <xsl:when test="@startingnumber"> + <xsl:value-of select="@startingnumber"/> + </xsl:when> + <xsl:when test="$pi-html-start != ''"> + <xsl:value-of select="$pi-html-start"/> + </xsl:when> + <xsl:when test="$pi-fo-start != ''"> + <xsl:value-of select="$pi-fo-start"/> + </xsl:when> + <xsl:otherwise>1</xsl:otherwise> </xsl:choose> </xsl:when> <xsl:otherwise> @@ -1909,13 +1909,13 @@ <itemizedlist> <listitem> - <simpara>if the value of the <sgmltag>choice</sgmltag> - pseudo-attribute is "and" or "or", returns a localized "and" - or "or"</simpara> + <simpara>if the value of the <sgmltag>choice</sgmltag> + pseudo-attribute is "and" or "or", returns a localized "and" + or "or"</simpara> </listitem> <listitem> - <simpara>otherwise returns the literal value of the - <sgmltag>choice</sgmltag> pseudo-attribute</simpara> + <simpara>otherwise returns the literal value of the + <sgmltag>choice</sgmltag> pseudo-attribute</simpara> </listitem> </itemizedlist> @@ -1951,7 +1951,7 @@ <!-- current locale --> <xsl:when test="$choice = 'and' or $choice = 'or'"> <xsl:call-template name="gentext"> - <xsl:with-param name="key" select="$choice"/> + <xsl:with-param name="key" select="$choice"/> </xsl:call-template> </xsl:when> <!-- otherwise, just output value of $choice, whatever it is --> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/common/gentext.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/common/gentext.xsl diff -u phpdoc/docbook/docbook-xsl/common/gentext.xsl:1.1 phpdoc/docbook/docbook-xsl/common/gentext.xsl:1.2 --- phpdoc/docbook/docbook-xsl/common/gentext.xsl:1.1 Mon Jan 22 22:11:00 2007 +++ phpdoc/docbook/docbook-xsl/common/gentext.xsl Tue Jan 30 18:12:37 2007 @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: gentext.xsl,v 1.1 2007/01/22 22:11:00 bjori Exp $ + $Id: gentext.xsl,v 1.2 2007/01/30 18:12:37 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -360,7 +360,7 @@ <xsl:message> <xsl:text>object.xref.markup: empty xref template</xsl:text> <xsl:text> for linkend="</xsl:text> - <xsl:value-of select="@id"/> + <xsl:value-of select="@id|@xml:id"/> <xsl:text>" and @xrefstyle="</xsl:text> <xsl:value-of select="$xrefstyle"/> <xsl:text>"</xsl:text> @@ -392,7 +392,7 @@ <xsl:message> <xsl:text>Xref is only supported to listitems in an</xsl:text> <xsl:text> orderedlist: </xsl:text> - <xsl:value-of select="@id"/> + <xsl:value-of select="@id|@xml:id"/> </xsl:message> <xsl:text>???</xsl:text> </xsl:when> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/common/insertfile.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/common/insertfile.xsl diff -u phpdoc/docbook/docbook-xsl/common/insertfile.xsl:1.1 phpdoc/docbook/docbook-xsl/common/insertfile.xsl:1.2 --- phpdoc/docbook/docbook-xsl/common/insertfile.xsl:1.1 Mon Jan 22 22:11:00 2007 +++ phpdoc/docbook/docbook-xsl/common/insertfile.xsl Tue Jan 30 18:12:37 2007 @@ -4,7 +4,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: insertfile.xsl,v 1.1 2007/01/22 22:11:00 bjori Exp $ + $Id: insertfile.xsl,v 1.2 2007/01/30 18:12:37 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/common/labels.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/common/labels.xsl diff -u phpdoc/docbook/docbook-xsl/common/labels.xsl:1.1 phpdoc/docbook/docbook-xsl/common/labels.xsl:1.2 --- phpdoc/docbook/docbook-xsl/common/labels.xsl:1.1 Mon Jan 22 22:11:00 2007 +++ phpdoc/docbook/docbook-xsl/common/labels.xsl Tue Jan 30 18:12:37 2007 @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: labels.xsl,v 1.1 2007/01/22 22:11:00 bjori Exp $ + $Id: labels.xsl,v 1.2 2007/01/30 18:12:37 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -38,7 +38,7 @@ <xsl:if test="$verbose"> <xsl:message> <xsl:text>Request for label of unexpected element: </xsl:text> - <xsl:value-of select="name(.)"/> + <xsl:value-of select="local-name(.)"/> </xsl:message> </xsl:if> </xsl:template> @@ -702,10 +702,12 @@ <xsl:apply-templates select="$pchap" mode="label.markup"/> <xsl:apply-templates select="$pchap" mode="intralabel.punctuation"/> </xsl:if> - <xsl:number format="1" count="equation[title]" from="chapter|appendix" level="any"/> + <xsl:number format="1" count="equation[title or info/title]" + from="chapter|appendix" level="any"/> </xsl:when> <xsl:otherwise> - <xsl:number format="1" count="equation[title]" from="book|article" level="any"/> + <xsl:number format="1" count="equation[title or info/title]" + from="book|article" level="any"/> </xsl:otherwise> </xsl:choose> </xsl:otherwise> @@ -748,6 +750,10 @@ <!-- nop --> </xsl:template> +<xsl:template match="sidebar" mode="label.markup"> + <!-- nop --> +</xsl:template> + <!-- ============================================================ --> <xsl:template name="label.this.section"> @@ -800,7 +806,7 @@ <xsl:choose> <xsl:when test="string($format) != 0"> <xsl:choose> - <xsl:when test="$format='arabic' or $format='1'">1</xsl:when> + <xsl:when test="string($format)='arabic' or $format='1'">1</xsl:when> <xsl:when test="$format='loweralpha' or $format='a'"> <xsl:value-of select="'a'"/> </xsl:when> @@ -813,6 +819,9 @@ <xsl:when test="$format='upperroman' or $format='I'"> <xsl:value-of select="'I'"/> </xsl:when> + <xsl:when test="$format='arabicindic' or $format='١'"> + <xsl:value-of select="'١'"/> + </xsl:when> <xsl:otherwise> <xsl:message> <xsl:text>Unexpected </xsl:text><xsl:value-of select="local-name(.)"/><xsl:text>.autolabel value: </xsl:text> @@ -830,7 +839,8 @@ <refdescription> <para>Returns format passed as parameter if non zero. Supported format are 'arabic' or '1', 'loweralpha' or 'a', 'lowerroman' or 'i', - 'uppoerlapha' or 'A', 'upperroman' or 'I'. If its not one of these then + 'upperlapha' or 'A', 'upperroman' or 'I', 'arabicindic' or '١'. + If its not one of these then returns the default format.</para> </refdescription> </doc:template> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/common/l10n.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/common/l10n.xsl diff -u phpdoc/docbook/docbook-xsl/common/l10n.xsl:1.1 phpdoc/docbook/docbook-xsl/common/l10n.xsl:1.2 --- phpdoc/docbook/docbook-xsl/common/l10n.xsl:1.1 Mon Jan 22 22:11:00 2007 +++ phpdoc/docbook/docbook-xsl/common/l10n.xsl Tue Jan 30 18:12:37 2007 @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: l10n.xsl,v 1.1 2007/01/22 22:11:00 bjori Exp $ + $Id: l10n.xsl,v 1.2 2007/01/30 18:12:37 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -194,7 +194,7 @@ </xsl:template> <xsl:template name="gentext.element.name"> - <xsl:param name="element.name" select="name(.)"/> + <xsl:param name="element.name" select="local-name(.)"/> <xsl:param name="lang"> <xsl:call-template name="l10n.language"/> </xsl:param> @@ -314,6 +314,7 @@ <xsl:param name="lang"> <xsl:call-template name="l10n.language"/> </xsl:param> + <xsl:param name="verbose" select="1"/> <xsl:variable name="local.localization.node" select="($local.l10n.xml//l:i18n/l:l10n[@language=$lang])[1]"/> @@ -322,7 +323,8 @@ select="($l10n.xml/l:i18n/l:l10n[@language=$lang])[1]"/> <xsl:if test="count($localization.node) = 0 - and count($local.localization.node) = 0"> + and count($local.localization.node) = 0 + and $verbose != 0"> <xsl:message> <xsl:text>No "</xsl:text> <xsl:value-of select="$lang"/> @@ -337,7 +339,8 @@ select="$localization.node/l:context[@name=$context]"/> <xsl:if test="count($context.node) = 0 - and count($local.context.node) = 0"> + and count($local.context.node) = 0 + and $verbose != 0"> <xsl:message> <xsl:text>No context named "</xsl:text> <xsl:value-of select="$context"/> @@ -379,8 +382,12 @@ <xsl:with-param name="xrefstyle" select="$xrefstyle"/> <xsl:with-param name="referrer" select="$referrer"/> <xsl:with-param name="lang" select="$lang"/> + <xsl:with-param name="verbose" select="$verbose"/> </xsl:call-template> </xsl:when> + <xsl:when test="$verbose = 0"> + <!-- silence --> + </xsl:when> <xsl:otherwise> <xsl:message> <xsl:text>No template for "</xsl:text> @@ -398,6 +405,8 @@ </xsl:choose> </xsl:template> +<!-- silently test if a gentext template exists --> + <xsl:template name="gentext.template.exists"> <xsl:param name="context" select="'default'"/> <xsl:param name="name" select="'default'"/> @@ -409,51 +418,22 @@ <xsl:call-template name="l10n.language"/> </xsl:param> - <xsl:variable name="local.localization.node" - select="($local.l10n.xml//l:i18n/l:l10n[@language=$lang])[1]"/> - - <xsl:variable name="localization.node" - select="($l10n.xml/l:i18n/l:l10n[@language=$lang])[1]"/> - - <xsl:variable name="local.context.node" - select="$local.localization.node/l:context[@name=$context]"/> - - <xsl:variable name="context.node" - select="$localization.node/l:context[@name=$context]"/> - - <xsl:variable name="local.template.node" - select="($local.context.node/l:template[@name=$name - and @style - and @style=$xrefstyle] - |$local.context.node/l:template[@name=$name - and not(@style)])[1]"/> - - <xsl:variable name="template.node" - select="($context.node/l:template[@name=$name - and @style - and @style=$xrefstyle] - |$context.node/l:template[@name=$name - and not(@style)])[1]"/> - + <xsl:variable name="template"> + <xsl:call-template name="gentext.template"> + <xsl:with-param name="context" select="$context"/> + <xsl:with-param name="name" select="$name"/> + <xsl:with-param name="origname" select="$origname"/> + <xsl:with-param name="purpose" select="$purpose"/> + <xsl:with-param name="xrefstyle" select="$xrefstyle"/> + <xsl:with-param name="referrer" select="$referrer"/> + <xsl:with-param name="lang" select="$lang"/> + <xsl:with-param name="verbose" select="0"/> + </xsl:call-template> + </xsl:variable> + <xsl:choose> - <xsl:when test="$local.template.node/@text">1</xsl:when> - <xsl:when test="$template.node/@text">1</xsl:when> - <xsl:otherwise> - <xsl:choose> - <xsl:when test="contains($name, '/')"> - <xsl:call-template name="gentext.template.exists"> - <xsl:with-param name="context" select="$context"/> - <xsl:with-param name="name" select="substring-after($name, '/')"/> - <xsl:with-param name="origname" select="$origname"/> - <xsl:with-param name="purpose" select="$purpose"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="lang" select="$lang"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise>0</xsl:otherwise> - </xsl:choose> - </xsl:otherwise> + <xsl:when test="string-length($template) != 0">1</xsl:when> + <xsl:otherwise>0</xsl:otherwise> </xsl:choose> </xsl:template> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/common/olink.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/common/olink.xsl diff -u phpdoc/docbook/docbook-xsl/common/olink.xsl:1.1 phpdoc/docbook/docbook-xsl/common/olink.xsl:1.2 --- phpdoc/docbook/docbook-xsl/common/olink.xsl:1.1 Mon Jan 22 22:11:00 2007 +++ phpdoc/docbook/docbook-xsl/common/olink.xsl Tue Jan 30 18:12:37 2007 @@ -626,7 +626,8 @@ <!-- Get the xref text for this record --> <xsl:variable name="xref.text" > <xsl:for-each select="$target.database" > - <xsl:value-of select="key('targetptr-key', $olink.key)/xreftext" /> + <xsl:copy-of + select="key('targetptr-key', $olink.key)/xreftext/node()" /> </xsl:for-each> </xsl:variable> @@ -670,7 +671,7 @@ contains($xrefstyle, 'nopage')) and not(contains($xrefstyle, 'title')) and not(contains($xrefstyle, 'label'))"> - <xsl:value-of select="$xref.text"/> + <xsl:copy-of select="$xref.text"/> </xsl:when> <xsl:when test="$xrefstyle != ''"> <xsl:if test="$olink.debug != 0"> @@ -902,7 +903,7 @@ </xsl:call-template> </xsl:when> <xsl:when test="$xref.text !=''"> - <xsl:value-of select="$xref.text"/> + <xsl:copy-of select="$xref.text"/> </xsl:when> <xsl:otherwise> <xsl:message> @@ -957,7 +958,7 @@ <!-- We are done --> </xsl:when> <!-- Have we reached the top without a match? --> - <xsl:when test="name($dirnode) != 'dir'" > + <xsl:when test="local-name($dirnode) != 'dir'" > <xsl:message>Olink error: cannot locate targetdoc <xsl:value-of select="$targetdoc"/> in sitemap</xsl:message> </xsl:when> <!-- Is the target in a descendant? --> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/common/refentry.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/common/refentry.xsl diff -u phpdoc/docbook/docbook-xsl/common/refentry.xsl:1.1 phpdoc/docbook/docbook-xsl/common/refentry.xsl:1.2 --- phpdoc/docbook/docbook-xsl/common/refentry.xsl:1.1 Mon Jan 22 22:11:00 2007 +++ phpdoc/docbook/docbook-xsl/common/refentry.xsl Tue Jan 30 18:12:37 2007 @@ -6,7 +6,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: refentry.xsl,v 1.1 2007/01/22 22:11:00 bjori Exp $ + $Id: refentry.xsl,v 1.2 2007/01/30 18:12:37 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -20,7 +20,7 @@ <doc:reference xmlns=""> <referenceinfo> <releaseinfo role="meta"> - $Id: refentry.xsl,v 1.1 2007/01/22 22:11:00 bjori Exp $ + $Id: refentry.xsl,v 1.2 2007/01/30 18:12:37 bjori Exp $ </releaseinfo> <corpauthor>The DocBook Project</corpauthor> <copyright><year>2005</year> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/common/stripns.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/common/stripns.xsl diff -u phpdoc/docbook/docbook-xsl/common/stripns.xsl:1.1 phpdoc/docbook/docbook-xsl/common/stripns.xsl:1.2 --- phpdoc/docbook/docbook-xsl/common/stripns.xsl:1.1 Mon Jan 22 22:11:00 2007 +++ phpdoc/docbook/docbook-xsl/common/stripns.xsl Tue Jan 30 18:12:37 2007 @@ -1,15 +1,15 @@ <?xml version='1.0'?> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:ng="http://docbook.org/docbook-ng" - xmlns:db="http://docbook.org/ns/docbook" + xmlns:ng="http://docbook.org/docbook-ng" + xmlns:db="http://docbook.org/ns/docbook" xmlns:saxon="http://icl.com/saxon" xmlns:NodeInfo="http://org.apache.xalan.lib.NodeInfo" xmlns:exsl="http://exslt.org/common" - exclude-result-prefixes="db ng exsl saxon" + exclude-result-prefixes="db ng exsl saxon NodeInfo" version='1.0'> <!-- ******************************************************************** - $Id: stripns.xsl,v 1.1 2007/01/22 22:11:00 bjori Exp $ + $Id: stripns.xsl,v 1.2 2007/01/30 18:12:37 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -26,14 +26,14 @@ <xsl:when test="self::ng:* or self::db:*"> <xsl:element name="{local-name(.)}"> <xsl:copy-of select="@*[not(name(.) = 'xml:id') - and not(name(.) = 'version')]"/> - <xsl:if test="@xml:id"> - <xsl:attribute name="id"> - <xsl:value-of select="@xml:id"/> - </xsl:attribute> - </xsl:if> + and not(name(.) = 'version')]"/> + <xsl:if test="@xml:id"> + <xsl:attribute name="id"> + <xsl:value-of select="@xml:id"/> + </xsl:attribute> + </xsl:if> - <xsl:call-template name="add-xml-base"/> + <xsl:call-template name="add-xml-base"/> <xsl:apply-templates mode="stripNS"/> </xsl:element> @@ -41,14 +41,14 @@ <xsl:otherwise> <xsl:copy> <xsl:copy-of select="@*[not(name(.) = 'xml:id') - and not(name(.) = 'version')]"/> - <xsl:if test="@xml:id"> - <xsl:attribute name="id"> - <xsl:value-of select="@xml:id"/> - </xsl:attribute> - </xsl:if> + and not(name(.) = 'version')]"/> + <xsl:if test="@xml:id"> + <xsl:attribute name="id"> + <xsl:value-of select="@xml:id"/> + </xsl:attribute> + </xsl:if> - <xsl:call-template name="add-xml-base"/> + <xsl:call-template name="add-xml-base"/> <xsl:apply-templates mode="stripNS"/> </xsl:copy> @@ -61,24 +61,24 @@ <xsl:when test="self::ng:* or self::db:*"> <xsl:element name="{local-name(.)}"> <xsl:copy-of select="@*[not(name(.) = 'xml:id') - and not(name(.) = 'version')]"/> - <xsl:if test="@xml:id"> - <xsl:attribute name="id"> - <xsl:value-of select="@xml:id"/> - </xsl:attribute> - </xsl:if> + and not(name(.) = 'version')]"/> + <xsl:if test="@xml:id"> + <xsl:attribute name="id"> + <xsl:value-of select="@xml:id"/> + </xsl:attribute> + </xsl:if> <xsl:apply-templates mode="stripNS"/> </xsl:element> </xsl:when> <xsl:otherwise> <xsl:copy> <xsl:copy-of select="@*[not(name(.) = 'xml:id') - and not(name(.) = 'version')]"/> - <xsl:if test="@xml:id"> - <xsl:attribute name="id"> - <xsl:value-of select="@xml:id"/> - </xsl:attribute> - </xsl:if> + and not(name(.) = 'version')]"/> + <xsl:if test="@xml:id"> + <xsl:attribute name="id"> + <xsl:value-of select="@xml:id"/> + </xsl:attribute> + </xsl:if> <xsl:apply-templates mode="stripNS"/> </xsl:copy> </xsl:otherwise> @@ -89,42 +89,42 @@ <xsl:variable name="info"> <xsl:choose> <xsl:when test="parent::db:article - |parent::db:appendix - |parent::db:bibliography - |parent::db:book - |parent::db:chapter - |parent::db:glossary - |parent::db:index - |parent::db:part - |parent::db:preface - |parent::db:refentry - |parent::db:reference - |parent::db:refsect1 - |parent::db:refsect2 - |parent::db:refsect3 - |parent::db:refsection - |parent::db:refsynopsisdiv - |parent::db:sect1 - |parent::db:sect2 - |parent::db:sect3 - |parent::db:sect4 - |parent::db:sect5 - |parent::db:section - |parent::db:setindex - |parent::db:set - |parent::db:slides - |parent::db:sidebar"> - <xsl:value-of select="local-name(parent::*)"/> - <xsl:text>info</xsl:text> + |parent::db:appendix + |parent::db:bibliography + |parent::db:book + |parent::db:chapter + |parent::db:glossary + |parent::db:index + |parent::db:part + |parent::db:preface + |parent::db:refentry + |parent::db:reference + |parent::db:refsect1 + |parent::db:refsect2 + |parent::db:refsect3 + |parent::db:refsection + |parent::db:refsynopsisdiv + |parent::db:sect1 + |parent::db:sect2 + |parent::db:sect3 + |parent::db:sect4 + |parent::db:sect5 + |parent::db:section + |parent::db:setindex + |parent::db:set + |parent::db:slides + |parent::db:sidebar"> + <xsl:value-of select="local-name(parent::*)"/> + <xsl:text>info</xsl:text> </xsl:when> <xsl:when test="parent::db:audioobject - |parent::db:imageobject - |parent::db:inlinemediaobject - |parent::db:mediaobject - |parent::db:mediaobjectco - |parent::db:textobject - |parent::db:videoobject"> - <xsl:text>objectinfo</xsl:text> + |parent::db:imageobject + |parent::db:inlinemediaobject + |parent::db:mediaobject + |parent::db:mediaobjectco + |parent::db:textobject + |parent::db:videoobject"> + <xsl:text>objectinfo</xsl:text> </xsl:when> <xsl:otherwise>blockinfo</xsl:otherwise> </xsl:choose> @@ -132,30 +132,30 @@ <xsl:element name="{$info}"> <xsl:copy-of select="@*[not(name(.) = 'xml:id') - and not(name(.) = 'version')]"/> + and not(name(.) = 'version')]"/> <xsl:if test="@xml:id"> <xsl:attribute name="id"> - <xsl:value-of select="@xml:id"/> + <xsl:value-of select="@xml:id"/> </xsl:attribute> </xsl:if> <xsl:apply-templates mode="stripNS"/> </xsl:element> <xsl:if test="(not(../db:title) and not(../ng:title)) - and ($info = 'prefaceinfo' - or $info = 'chapterinfo' - or $info = 'sectioninfo' - or $info = 'sect1info' - or $info = 'sect2info' - or $info = 'sect3info' - or $info = 'sect4info' - or $info = 'sect5info' - or $info = 'refsectioninfo' - or $info = 'refsect1info' - or $info = 'refsect2info' - or $info = 'refsect3info' - or $info = 'blockinfo' - or $info = 'appendixinfo')"> + and ($info = 'prefaceinfo' + or $info = 'chapterinfo' + or $info = 'sectioninfo' + or $info = 'sect1info' + or $info = 'sect2info' + or $info = 'sect3info' + or $info = 'sect4info' + or $info = 'sect5info' + or $info = 'refsectioninfo' + or $info = 'refsect1info' + or $info = 'refsect2info' + or $info = 'refsect3info' + or $info = 'blockinfo' + or $info = 'appendixinfo')"> <xsl:apply-templates select="db:title|ng:title" mode="stripNS"/> </xsl:if> @@ -163,52 +163,52 @@ <xsl:template match="ng:link|db:link" mode="stripNS"> <xsl:variable xmlns:xlink="http://www.w3.org/1999/xlink" - name="href" select="@xlink:href|@href"/> + 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' - and name(.) != 'version' - and name(.) != 'xml:id'"> - <xsl:copy/> - </xsl:if> - </xsl:for-each> - <xsl:if test="@xml:id"> - <xsl:attribute name="id"> - <xsl:value-of select="@xml:id"/> - </xsl:attribute> - </xsl:if> - <xsl:apply-templates mode="stripNS"/> + <xsl:for-each select="@*"> + <xsl:if test="local-name(.) != 'href' + and name(.) != 'version' + and name(.) != 'xml:id'"> + <xsl:copy/> + </xsl:if> + </xsl:for-each> + <xsl:if test="@xml:id"> + <xsl:attribute name="id"> + <xsl:value-of select="@xml:id"/> + </xsl:attribute> + </xsl:if> + <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' - and name(.) != 'version' - and name(.) != 'xml:id'"> - <xsl:copy/> - </xsl:if> - </xsl:for-each> - <xsl:if test="@xml:id"> - <xsl:attribute name="id"> - <xsl:value-of select="@xml:id"/> - </xsl:attribute> - </xsl:if> - <xsl:apply-templates mode="stripNS"/> + <xsl:for-each select="@*"> + <xsl:if test="local-name(.) != 'href' + and name(.) != 'version' + and name(.) != 'xml:id'"> + <xsl:copy/> + </xsl:if> + </xsl:for-each> + <xsl:if test="@xml:id"> + <xsl:attribute name="id"> + <xsl:value-of select="@xml:id"/> + </xsl:attribute> + </xsl:if> + <xsl:apply-templates mode="stripNS"/> </link> </xsl:when> <xsl:otherwise> <link> - <xsl:copy-of select="@*[not(name(.) = 'xml:id') - and not(name(.) = 'version')]"/> - <xsl:if test="@xml:id"> - <xsl:attribute name="id"> - <xsl:value-of select="@xml:id"/> - </xsl:attribute> - </xsl:if> - <xsl:apply-templates mode="stripNS"/> + <xsl:copy-of select="@*[not(name(.) = 'xml:id') + and not(name(.) = 'version')]"/> + <xsl:if test="@xml:id"> + <xsl:attribute name="id"> + <xsl:value-of select="@xml:id"/> + </xsl:attribute> + </xsl:if> + <xsl:apply-templates mode="stripNS"/> </link> </xsl:otherwise> </xsl:choose> @@ -217,30 +217,30 @@ <xsl:template match="ng:tag|db:tag" mode="stripNS"> <sgmltag> <xsl:copy-of select="@*[not(name(.) = 'xml:id') - and not(name(.) = 'version')]"/> + and not(name(.) = 'version')]"/> <xsl:apply-templates mode="stripNS"/> </sgmltag> </xsl:template> <xsl:template match="ng:textdata|db:textdata - |ng:imagedata|db:imagedata - |ng:videodata|db:videodata - |ng:audiodata|db:audiodata" mode="stripNS"> + |ng:imagedata|db:imagedata + |ng:videodata|db:videodata + |ng:audiodata|db:audiodata" mode="stripNS"> <xsl:element name="{local-name(.)}"> <xsl:copy-of select="@*[not(name(.) = 'xml:id') - and not(name(.) = 'version') - and not(name(.) = 'entityref')]"/> + and not(name(.) = 'version') + and not(name(.) = 'entityref')]"/> <xsl:if test="@xml:id"> <xsl:attribute name="id"> - <xsl:value-of select="@xml:id"/> + <xsl:value-of select="@xml:id"/> </xsl:attribute> </xsl:if> <xsl:choose> <xsl:when test="@entityref"> - <xsl:attribute name="fileref"> - <xsl:value-of select="unparsed-entity-uri(@entityref)"/> - </xsl:attribute> + <xsl:attribute name="fileref"> + <xsl:value-of select="unparsed-entity-uri(@entityref)"/> + </xsl:attribute> </xsl:when> </xsl:choose> @@ -273,28 +273,33 @@ <xsl:if test="$base != ''"> <xsl:attribute name="xml:base"> <xsl:call-template name="systemIdToBaseURI"> - <xsl:with-param name="systemId"> - <!-- file: seems to confuse some processors. --> - <xsl:choose> - <xsl:when test="starts-with($base, 'file:///')"> - <xsl:value-of select="substring-after($base,'file://')"/> - </xsl:when> - <xsl:when test="starts-with($base, 'file://')"> - <xsl:value-of select="substring-after($base,'file:/')"/> - </xsl:when> - <xsl:when test="starts-with($base, 'file:/') - and substring($base, 8, 1) = ':'"> - <!-- Stupid windows file:/c:/path... --> - <xsl:value-of select="concat('file:///', substring-after($base,'file:/'))"/> - </xsl:when> - <xsl:when test="starts-with($base, 'file:/')"> - <xsl:value-of select="substring-after($base,'file:')"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$base"/> - </xsl:otherwise> - </xsl:choose> - </xsl:with-param> + <xsl:with-param name="systemId"> + <!-- file: seems to confuse some processors. --> + <xsl:choose> + <!-- however, windows paths must use file:///c:/path --> + <xsl:when test="starts-with($base, 'file:///') and + substring($base, 10, 1) = ':'"> + <xsl:value-of select="$base"/> + </xsl:when> + <xsl:when test="starts-with($base, 'file:/') + and substring($base, 8, 1) = ':'"> + <xsl:value-of select="concat('file:///', + substring-after($base,'file:/'))"/> + </xsl:when> + <xsl:when test="starts-with($base, 'file:///')"> + <xsl:value-of select="substring-after($base,'file://')"/> + </xsl:when> + <xsl:when test="starts-with($base, 'file://')"> + <xsl:value-of select="substring-after($base,'file:/')"/> + </xsl:when> + <xsl:when test="starts-with($base, 'file:/')"> + <xsl:value-of select="substring-after($base,'file:')"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$base"/> + </xsl:otherwise> + </xsl:choose> + </xsl:with-param> </xsl:call-template> </xsl:attribute> </xsl:if> @@ -308,7 +313,7 @@ <xsl:text>/</xsl:text> <xsl:call-template name="systemIdToBaseURI"> <xsl:with-param name="systemId" - select="substring-after($systemId,'/')"/> + select="substring-after($systemId,'/')"/> </xsl:call-template> </xsl:if> </xsl:template> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/common/subtitles.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/common/subtitles.xsl diff -u phpdoc/docbook/docbook-xsl/common/subtitles.xsl:1.1 phpdoc/docbook/docbook-xsl/common/subtitles.xsl:1.2 --- phpdoc/docbook/docbook-xsl/common/subtitles.xsl:1.1 Mon Jan 22 22:11:00 2007 +++ phpdoc/docbook/docbook-xsl/common/subtitles.xsl Tue Jan 30 18:12:37 2007 @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: subtitles.xsl,v 1.1 2007/01/22 22:11:00 bjori Exp $ + $Id: subtitles.xsl,v 1.2 2007/01/30 18:12:37 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -31,7 +31,7 @@ <xsl:template match="*" mode="subtitle.markup"> <xsl:message> <xsl:text>Request for subtitle of unexpected element: </xsl:text> - <xsl:value-of select="name(.)"/> + <xsl:value-of select="local-name(.)"/> </xsl:message> <xsl:text>???SUBTITLE???</xsl:text> </xsl:template> @@ -94,7 +94,7 @@ <xsl:template match="dedication|colophon" mode="subtitle.markup"> <xsl:param name="allow-anchors" select="'0'"/> - <xsl:apply-templates select="subtitle" + <xsl:apply-templates select="(subtitle|info/subtitle)[1]" mode="subtitle.markup"> <xsl:with-param name="allow-anchors" select="$allow-anchors"/> </xsl:apply-templates> @@ -113,7 +113,7 @@ <xsl:template match="qandaset" mode="subtitle.markup"> <xsl:param name="allow-anchors" select="'0'"/> - <xsl:apply-templates select="blockinfo/subtitle[1]" + <xsl:apply-templates select="(blockinfo/subtitle|info/subtitle)[1]" mode="subtitle.markup"> <xsl:with-param name="allow-anchors" select="$allow-anchors"/> </xsl:apply-templates> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/common/table.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/common/table.xsl diff -u phpdoc/docbook/docbook-xsl/common/table.xsl:1.1 phpdoc/docbook/docbook-xsl/common/table.xsl:1.2 --- phpdoc/docbook/docbook-xsl/common/table.xsl:1.1 Mon Jan 22 22:11:00 2007 +++ phpdoc/docbook/docbook-xsl/common/table.xsl Tue Jan 30 18:12:37 2007 @@ -5,7 +5,7 @@ version="1.0"> <!-- ******************************************************************** - $Id: table.xsl,v 1.1 2007/01/22 22:11:00 bjori Exp $ + $Id: table.xsl,v 1.2 2007/01/30 18:12:37 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -213,11 +213,11 @@ <xsl:choose> <xsl:when test="$namest != '' and $nameend != ''"> <xsl:choose> - <xsl:when test="$ecol >= $scol"> - <xsl:value-of select="$ecol - $scol + 1"/> + <xsl:when test="number($ecol) >= number($scol)"> + <xsl:value-of select="number($ecol) - number($scol) + 1"/> </xsl:when> <xsl:otherwise> - <xsl:value-of select="$scol - $ecol + 1"/> + <xsl:value-of select="number($scol) - number($ecol) + 1"/> </xsl:otherwise> </xsl:choose> </xsl:when> @@ -473,4 +473,31 @@ </xsl:if> </xsl:template> +<!-- Returns the table style for the context element --> +<xsl:template name="tabstyle"> + <xsl:param name="node" select="."/> + + <xsl:variable name="tgroup" select="$node/tgroup[1] | + $node/ancestor-or-self::tgroup[1]"/> + + <xsl:variable name="table" + select="($node/ancestor-or-self::table | + $node/ancestor-or-self::informaltable)[1]"/> + + <xsl:variable name="tabstyle"> + <xsl:choose> + <xsl:when test="$table/@tabstyle != ''"> + <xsl:value-of select="normalize-space($table/@tabstyle)"/> + </xsl:when> + <xsl:when test="$tgroup/@tgroupstyle != ''"> + <xsl:value-of select="normalize-space($tgroup/@tgroupstyle)"/> + </xsl:when> + <xsl:otherwise> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:value-of select="$tabstyle"/> +</xsl:template> + </xsl:stylesheet> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/common/targets.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/common/targets.xsl diff -u phpdoc/docbook/docbook-xsl/common/targets.xsl:1.1 phpdoc/docbook/docbook-xsl/common/targets.xsl:1.2 --- phpdoc/docbook/docbook-xsl/common/targets.xsl:1.1 Mon Jan 22 22:11:00 2007 +++ phpdoc/docbook/docbook-xsl/common/targets.xsl Tue Jan 30 18:12:37 2007 @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: targets.xsl,v 1.1 2007/01/22 22:11:00 bjori Exp $ + $Id: targets.xsl,v 1.2 2007/01/30 18:12:37 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -64,7 +64,7 @@ <xsl:with-param name="omit-xml-declaration" select="'yes'"/> <xsl:with-param name="doctype-public" select="''"/> <xsl:with-param name="doctype-system" select="''"/> - <xsl:with-param name="indent" select="'yes'"/> + <xsl:with-param name="indent" select="'no'"/> <xsl:with-param name="quiet" select="0"/> <xsl:with-param name="content"> <xsl:apply-templates select="." mode="olink.mode"/> @@ -254,7 +254,7 @@ <xsl:apply-templates mode="olink.mode"/> </xsl:template> -<xsl:template match="equation[title]" mode="olink.mode"> +<xsl:template match="equation[title or info/title]" mode="olink.mode"> <xsl:call-template name="obj"/> </xsl:template> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/common/titles.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/common/titles.xsl diff -u phpdoc/docbook/docbook-xsl/common/titles.xsl:1.1 phpdoc/docbook/docbook-xsl/common/titles.xsl:1.2 --- phpdoc/docbook/docbook-xsl/common/titles.xsl:1.1 Mon Jan 22 22:11:00 2007 +++ phpdoc/docbook/docbook-xsl/common/titles.xsl Tue Jan 30 18:12:37 2007 @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: titles.xsl,v 1.1 2007/01/22 22:11:00 bjori Exp $ + $Id: titles.xsl,v 1.2 2007/01/30 18:12:37 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -47,12 +47,19 @@ <xsl:if test="$verbose != 0"> <xsl:message> <xsl:text>Request for title of element with no title: </xsl:text> - <xsl:value-of select="name(.)"/> - <xsl:if test="@id"> - <xsl:text> (id="</xsl:text> - <xsl:value-of select="@id"/> - <xsl:text>")</xsl:text> - </xsl:if> + <xsl:value-of select="local-name(.)"/> + <xsl:choose> + <xsl:when test="@id"> + <xsl:text> (id="</xsl:text> + <xsl:value-of select="@id"/> + <xsl:text>")</xsl:text> + </xsl:when> + <xsl:when test="@xml:id"> + <xsl:text> (xml:id="</xsl:text> + <xsl:value-of select="@xml:id"/> + <xsl:text>")</xsl:text> + </xsl:when> + </xsl:choose> </xsl:message> </xsl:if> <xsl:text>???TITLE???</xsl:text> @@ -116,7 +123,7 @@ <!-- <xsl:message> - <xsl:value-of select="name(.)"/> + <xsl:value-of select="local-name(.)"/> <xsl:text> </xsl:text> <xsl:value-of select="$allow-anchors"/> </xsl:message> @@ -137,7 +144,7 @@ <xsl:param name="allow-anchors" select="0"/> <xsl:choose> <xsl:when test="title"> - <xsl:apply-templates select="title" mode="title.markup"> + <xsl:apply-templates select="(title|info/title)[1]" mode="title.markup"> <xsl:with-param name="allow-anchors" select="$allow-anchors"/> </xsl:apply-templates> </xsl:when> @@ -153,7 +160,7 @@ <xsl:param name="allow-anchors" select="0"/> <xsl:choose> <xsl:when test="title"> - <xsl:apply-templates select="title" mode="title.markup"> + <xsl:apply-templates select="(title|info/title)[1]" mode="title.markup"> <xsl:with-param name="allow-anchors" select="$allow-anchors"/> </xsl:apply-templates> </xsl:when> @@ -230,7 +237,7 @@ mode="title.markup"> <xsl:param name="allow-anchors" select="0"/> <xsl:variable name="title" select="(info/title - |sectioninfo/title + |sectioninfo/title |sect1info/title |sect2info/title |sect3info/title @@ -294,12 +301,27 @@ </xsl:when> <xsl:otherwise> <xsl:call-template name="gentext.element.name"> - <xsl:with-param name="element.name" select="name(.)"/> + <xsl:with-param name="element.name" select="local-name(.)"/> </xsl:call-template> </xsl:otherwise> </xsl:choose> </xsl:template> +<xsl:template match="glossdiv" mode="title.markup"> + <xsl:param name="allow-anchors" select="0"/> + <xsl:variable name="title" select="(info/title|title)[1]"/> + <xsl:choose> + <xsl:when test="$title"> + <xsl:apply-templates select="$title" mode="title.markup"> + <xsl:with-param name="allow-anchors" select="$allow-anchors"/> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + <xsl:message>ERROR: glossdiv missing its required title</xsl:message> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + <xsl:template match="glossentry" mode="title.markup"> <xsl:param name="allow-anchors" select="0"/> <xsl:apply-templates select="glossterm" mode="title.markup"> @@ -393,8 +415,8 @@ <xsl:template match="abstract" mode="title.markup"> <xsl:param name="allow-anchors" select="0"/> <xsl:choose> - <xsl:when test="title"> - <xsl:apply-templates select="title" mode="title.markup"> + <xsl:when test="title|info/title"> + <xsl:apply-templates select="(title|info/title)[1]" mode="title.markup"> <xsl:with-param name="allow-anchors" select="$allow-anchors"/> </xsl:apply-templates> </xsl:when> @@ -408,7 +430,7 @@ <xsl:template match="caution|tip|warning|important|note" mode="title.markup"> <xsl:param name="allow-anchors" select="0"/> - <xsl:variable name="title" select="title[1]"/> + <xsl:variable name="title" select="(title|info/title)[1]"/> <xsl:choose> <xsl:when test="$title"> <xsl:apply-templates select="$title" mode="title.markup"> @@ -450,7 +472,7 @@ <xsl:param name="allow-anchors" select="0"/> <xsl:variable name="title" select="(info/title| blockinfo/title| - title)[1]"/> + title)[1]"/> <xsl:choose> <xsl:when test="$title"> <xsl:apply-templates select="$title" mode="title.markup"> @@ -562,16 +584,16 @@ <xsl:param name="verbose" select="1"/> <xsl:variable name="titleabbrev" select="(info/titleabbrev - |sectioninfo/titleabbrev - |sect1info/titleabbrev - |sect2info/titleabbrev - |sect3info/titleabbrev - |sect4info/titleabbrev - |sect5info/titleabbrev - |refsect1info/titleabbrev - |refsect2info/titleabbrev - |refsect3info/titleabbrev - |titleabbrev)[1]"/> + |sectioninfo/titleabbrev + |sect1info/titleabbrev + |sect2info/titleabbrev + |sect3info/titleabbrev + |sect4info/titleabbrev + |sect5info/titleabbrev + |refsect1info/titleabbrev + |refsect2info/titleabbrev + |refsect3info/titleabbrev + |titleabbrev)[1]"/> <xsl:choose> <xsl:when test="$titleabbrev"> @@ -668,23 +690,23 @@ <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: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: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:with-param name="target" select="$target"/> </xsl:call-template> </xsl:when> @@ -692,17 +714,17 @@ <xsl:apply-templates select="$target" mode="xref-to-prefix"/> <xsl:apply-templates select="$target" mode="xref-to"> - <xsl:with-param name="referrer" select="."/> - <xsl:with-param name="xrefstyle"> - <xsl:choose> - <xsl:when test="@role and not(@xrefstyle) and $use.role.as.xrefstyle != 0"> - <xsl:value-of select="@role"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="@xrefstyle"/> - </xsl:otherwise> - </xsl:choose> - </xsl:with-param> + <xsl:with-param name="referrer" select="."/> + <xsl:with-param name="xrefstyle"> + <xsl:choose> + <xsl:when test="@role and not(@xrefstyle) and $use.role.as.xrefstyle != 0"> + <xsl:value-of select="@role"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="@xrefstyle"/> + </xsl:otherwise> + </xsl:choose> + </xsl:with-param> </xsl:apply-templates> <xsl:apply-templates select="$target" mode="xref-to-suffix"/> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/common/entities.ent?view=markup&rev=1.1 Index: phpdoc/docbook/docbook-xsl/common/entities.ent +++ phpdoc/docbook/docbook-xsl/common/entities.ent <!-- ******************************************************************** $Id: entities.ent,v 1.1 2007/01/30 18:12:37 bjori Exp $ ******************************************************************** This file contains common entity declarations used for sorting by various templates. This file is part of the XSL DocBook Stylesheet distribution. See ../README or http://nwalsh.com/docbook/xsl/ for copyright and other information. ******************************************************************** --> <!-- ==================================================================== --> <!ENTITY lowercase "'AaÀàÁáÂâÃãÄäÅåĀāĂ㥹ǍǎǞǟǠǡǺǻȀȁȂȃȦȧḀḁẚẠạẢảẤấẦầẨẩẪẫẬậẮắẰằẲẳẴẵẶặBbƀƁɓƂƃḂḃḄḅḆḇCcÇçĆćĈĉĊċČčƇƈɕḈḉDdĎďĐđƊɗƋƌDžDzȡɖḊḋḌḍḎḏḐḑḒḓEeÈèÉéÊêËëĒēĔĕĖėĘęĚěȄȅȆȇȨȩḔḕḖḗḘḙḚḛḜḝẸẹẺẻẼẽẾế&! #7872;ềỂểỄễỆệFfƑƒḞḟGgĜĝĞğĠġĢģƓɠǤǥǦǧǴǵḠḡHhĤĥĦħȞȟɦḢḣḤḥḦḧḨḩḪḫẖIiÌìÍíÎîÏïĨĩĪīĬĭĮįİƗɨǏǐȈȉȊȋḬḭḮḯỈỉỊịJjĴĵǰʝKkĶķƘƙǨǩḰḱḲḳḴḵLlĹĺĻļĽľĿŀŁłƚLjȴɫɬɭḶḷḸḹḺḻḼḽMmɱḾḿṀṁṂṃNnÑñŃńŅņŇňƝɲƞȠNjǸǹȵɳṄṅṆṇṈṉṊ&! #7755;OoÒòÓóÔôÕõÖö&# 216;øŌōŎŏŐőƟƠơǑǒǪǫǬǭǾǿȌȍȎȏȪȫȬȭȮȯȰȱṌṍṎṏṐṑṒṓỌọỎỏỐốỒồỔổỖỗỘộỚớỜờỞởỠỡỢợPpƤƥṔṕṖṗQqʠRrŔŕŖŗŘřȐȑȒȓɼɽɾṘṙṚṛṜṝṞṟSsŚśŜŝŞşŠšȘșʂṠṡṢṣṤṥṦṧṨṩTtŢţŤťŦŧƫƬƭƮʈȚțȶṪṫṬṭṮṯṰṱẗUuÙùÚúÛûÜüŨũŪūŬŭŮůŰ$! 9;ŲųƯưǓǔǕǖǗǘǙǚǛǜȔȕȖȗṲṳṴṵṶṷṸṹṺṻỤụỦủỨứỪừỬửỮữỰựVvƲʋṼṽṾṿWwŴŵẀẁẂẃẄẅẆẇẈẉẘXxẊẋẌẍYyÝýÿŸŶŷƳƴȲȳẎẏẙỲỳỴỵỶỷỸỹZzŹźŻżŽžƵƶȤȥʐʑẐẑẒẓẔẕẕ'"> <!ENTITY uppercase "'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ'"> <!ENTITY primary 'normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))'> <!ENTITY secondary 'normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = ""]))'> <!ENTITY tertiary 'normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = ""]))'> <!ENTITY section '(ancestor-or-self::set |ancestor-or-self::book |ancestor-or-self::part |ancestor-or-self::reference |ancestor-or-self::partintro |ancestor-or-self::chapter |ancestor-or-self::appendix |ancestor-or-self::preface |ancestor-or-self::article |ancestor-or-self::section |ancestor-or-self::sect1 |ancestor-or-self::sect2 |ancestor-or-self::sect3 |ancestor-or-self::sect4 |ancestor-or-self::sect5 |ancestor-or-self::refentry |ancestor-or-self::refsect1 |ancestor-or-self::refsect2 |ancestor-or-self::refsect3 |ancestor-or-self::simplesect |ancestor-or-self::bibliography |ancestor-or-self::glossary |ancestor-or-self::index |ancestor-or-self::webpage)[last()]'> <!ENTITY section.id 'generate-id(§ion;)'> <!ENTITY sep '" "'> <!ENTITY scope 'count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))'>