cvs: phpdoc /docbook/docbook-xsl/html admon.xsl annotations.xsl autoidx-kimber.xsl autoidx-kosek.xsl autoidx-ng.xsl autoidx.xsl autotoc.xsl biblio.xsl
block.xsl callout.xsl changebars.xsl chunk-code.xsl chunk-common.xsl chunk.xsl chunker.xsl chunkfast.xsl chunktoc.xsl component.xsl db5strip.xsl
division.xsl docbook.xsl ebnf.xsl footnote.xsl formal.xsl glossary.xsl graphics.xsl highlight.xsl html-rtf.xsl html.xsl htmltbl.xsl index.xsl info.xsl
inline.xsl keywords.xsl lists.xsl maketoc.xsl manifest.xsl math.xsl oldchunker.xsl onechunk.xsl param.xsl pi.xsl profile-chunk-code.xsl
profile-chunk.xsl profile-docbook.xsl profile-onechunk.xsl qandaset.xsl refentry.xsl sections.xsl synop.xsl table.xsl task.xsl titlepage.templates.xml
titlepage.xsl toc.xsl verbatim.xsl xref.xsl
| From: | Hannes Magnusson | Date: | Tue, 30 Jan 2007 18:16:39 +0000 |
| Subject: | cvs: phpdoc /docbook/docbook-xsl/html admon.xsl annotations.xsl autoidx-kimber.xsl autoidx-kosek.xsl autoidx-ng.xsl autoidx.xsl autotoc.xsl biblio.xsl block.xsl callout.xsl changebars.xsl chunk-code.xsl chunk-common.xsl chunk.xsl chunker.xsl chunkfast.xsl chunktoc.xsl component.xsl db5strip.xsl division.xsl docbook.xsl ebnf.xsl footnote.xsl formal.xsl glossary.xsl graphics.xsl highlight.xsl html-rtf.xsl html.xsl htmltbl.xsl index.xsl info.xsl inline.xsl keywords.xsl lists.xsl maketoc.xsl manifest.xsl math.xsl oldchunker.xsl onechunk.xsl param.xsl pi.xsl profile-chunk-code.xsl profile-chunk.xsl profile-docbook.xsl profile-onechunk.xsl qandaset.xsl refentry.xsl sections.xsl synop.xsl table.xsl task.xsl titlepage.templates.xml titlepage.xsl toc.xsl verbatim.xsl xref.xsl |
||
| Groups: | php.doc | ||
| Request: | Send a blank email to phpdoc+get-969375107@lists.php.net to get a copy of this message | ||
bjori Tue Jan 30 18:16:39 2007 UTC
Added files:
/phpdoc/docbook/docbook-xsl/html titlepage.templates.xml
Modified files:
/phpdoc/docbook/docbook-xsl/html admon.xsl annotations.xsl
autoidx-kimber.xsl
autoidx-kosek.xsl autoidx-ng.xsl
autoidx.xsl autotoc.xsl biblio.xsl
block.xsl callout.xsl
changebars.xsl chunk-code.xsl
chunk-common.xsl chunk.xsl
chunker.xsl chunkfast.xsl
chunktoc.xsl component.xsl
db5strip.xsl division.xsl
docbook.xsl ebnf.xsl footnote.xsl
formal.xsl glossary.xsl
graphics.xsl highlight.xsl
html-rtf.xsl html.xsl htmltbl.xsl
index.xsl info.xsl inline.xsl
keywords.xsl lists.xsl maketoc.xsl
manifest.xsl math.xsl
oldchunker.xsl onechunk.xsl
param.xsl pi.xsl
profile-chunk-code.xsl
profile-chunk.xsl
profile-docbook.xsl
profile-onechunk.xsl qandaset.xsl
refentry.xsl sections.xsl
synop.xsl table.xsl task.xsl
titlepage.xsl toc.xsl verbatim.xsl
xref.xsl
Log:
Upgrade to docbook-xsl 1.72.0
http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/admon.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/admon.xsl diff -u phpdoc/docbook/docbook-xsl/html/admon.xsl:1.1 phpdoc/docbook/docbook-xsl/html/admon.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/admon.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/admon.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: admon.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: admon.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -60,7 +60,8 @@ </xsl:call-template> </xsl:variable> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="$admon.style != ''"> <xsl:attribute name="style"> <xsl:value-of select="$admon.style"/> @@ -70,9 +71,9 @@ <table border="0"> <xsl:attribute name="summary"> <xsl:value-of select="$admon.type"/> - <xsl:if test="title"> + <xsl:if test="title|info/title"> <xsl:text>: </xsl:text> - <xsl:value-of select="title"/> + <xsl:value-of select="(title|info/title)[1]"/> </xsl:if> </xsl:attribute> <tr> @@ -88,7 +89,7 @@ </td> <th align="left"> <xsl:call-template name="anchor"/> - <xsl:if test="$admon.textlabel != 0 or title"> + <xsl:if test="$admon.textlabel != 0 or title or info/title"> <xsl:apply-templates select="." mode="object.title.markup"/> </xsl:if> </th> @@ -103,7 +104,8 @@ </xsl:template> <xsl:template name="nongraphical.admonition"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="$admon.style"> <xsl:attribute name="style"> <xsl:value-of select="$admon.style"/> @@ -112,7 +114,7 @@ <h3 class="title"> <xsl:call-template name="anchor"/> - <xsl:if test="$admon.textlabel != 0 or title"> + <xsl:if test="$admon.textlabel != 0 or title or info/title"> <xsl:apply-templates select="." mode="object.title.markup"/> </xsl:if> </h3> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/annotations.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/annotations.xsl diff -u phpdoc/docbook/docbook-xsl/html/annotations.xsl:1.1 phpdoc/docbook/docbook-xsl/html/annotations.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/annotations.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/annotations.xsl Tue Jan 30 18:16:38 2007 @@ -8,7 +8,7 @@ <xsl:when test="contains($scripts, ' ')"> <script type="text/javascript" src="{substring-before($scripts, ' ')}"/> <xsl:call-template name="add.annotation.links"> - <xsl:with-param name="scripts" select="substring-after($scripts, ' ')"/> + <xsl:with-param name="scripts" select="substring-after($scripts, ' ')"/> </xsl:call-template> </xsl:when> <xsl:otherwise> @@ -27,18 +27,18 @@ <xsl:variable name="aids"> <xsl:for-each select="//annotation"> <xsl:if test="@annotates=$id - or starts-with(@annotates, concat($id, ' ')) - or contains(@annotates, concat(' ', $id, ' ')) - or substring(@annotates, string-length(@annotates)-3) - = concat(' ', $id)"> - <xsl:value-of select="generate-id()"/> - <xsl:text> </xsl:text> + or starts-with(@annotates, concat($id, ' ')) + or contains(@annotates, concat(' ', $id, ' ')) + or substring(@annotates, string-length(@annotates)-3) + = concat(' ', $id)"> + <xsl:value-of select="generate-id()"/> + <xsl:text> </xsl:text> </xsl:if> </xsl:for-each> <xsl:if test="normalize-space(@annotations) != ''"> <xsl:call-template name="annotations-pointed-to"> - <xsl:with-param name="annotations" - select="normalize-space(@annotations)"/> + <xsl:with-param name="annotations" + select="normalize-space(@annotations)"/> </xsl:call-template> </xsl:if> </xsl:variable> @@ -56,22 +56,22 @@ <xsl:choose> <xsl:when test="contains($annotations, ' ')"> <xsl:variable name='a' - select="key('id', substring-before($annotations, ' '))"/> + select="key('id', substring-before($annotations, ' '))"/> <xsl:if test="$a"> - <xsl:value-of select="generate-id($a)"/> - <xsl:text> </xsl:text> + <xsl:value-of select="generate-id($a)"/> + <xsl:text> </xsl:text> </xsl:if> <xsl:call-template name="annotations-pointed-to"> - <xsl:with-param name="annotations" - select="substring-after($annotations, ' ')"/> + <xsl:with-param name="annotations" + select="substring-after($annotations, ' ')"/> </xsl:call-template> </xsl:when> <xsl:otherwise> <xsl:variable name='a' - select="key('id', $annotations)"/> + select="key('id', $annotations)"/> <xsl:if test="$a"> - <xsl:value-of select="generate-id($a)"/> - <xsl:text> </xsl:text> + <xsl:value-of select="generate-id($a)"/> + <xsl:text> </xsl:text> </xsl:if> </xsl:otherwise> </xsl:choose> @@ -84,15 +84,15 @@ <xsl:when test="contains($gids, ' ')"> <xsl:variable name="gid" select="substring-before($gids, ' ')"/> <xsl:apply-templates select="key('gid', $gid)" - mode="annotation-inline"/> + mode="annotation-inline"/> <xsl:call-template name="apply-annotations-by-gid"> - <xsl:with-param name="gids" - select="substring-after($gids, ' ')"/> + <xsl:with-param name="gids" + select="substring-after($gids, ' ')"/> </xsl:call-template> </xsl:when> <xsl:otherwise> <xsl:apply-templates select="key('gid', $gids)" - mode="annotation-inline"/> + mode="annotation-inline"/> </xsl:otherwise> </xsl:choose> </xsl:template> @@ -101,12 +101,12 @@ <xsl:variable name="title"> <xsl:choose> <xsl:when test="title"> - <xsl:value-of select="title"/> + <xsl:value-of select="title"/> </xsl:when> <xsl:otherwise> - <xsl:text>[Annotation #</xsl:text> - <xsl:number count="annotation" level="any" format="1"/> - <xsl:text>]</xsl:text> + <xsl:text>[Annotation #</xsl:text> + <xsl:number count="annotation" level="any" format="1"/> + <xsl:text>]</xsl:text> </xsl:otherwise> </xsl:choose> </xsl:variable> @@ -145,7 +145,7 @@ </div> <div class="annotation-close"> <a href="#" onclick="popup_{generate-id(.)}.hidePopup();return false;"> - <img src="{$annotation.graphic.close}" alt="X" border="0"/> + <img src="{$annotation.graphic.close}" alt="X" border="0"/> </a> </div> </div> @@ -155,10 +155,10 @@ <div class="annotation-title"> <xsl:choose> <xsl:when test="title"> - <xsl:apply-templates select="title/node()"/> + <xsl:apply-templates select="title/node()"/> </xsl:when> <xsl:otherwise> - <xsl:text>Annotation</xsl:text> + <xsl:text>Annotation</xsl:text> </xsl:otherwise> </xsl:choose> </div> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/autoidx-kimber.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/autoidx-kimber.xsl diff -u phpdoc/docbook/docbook-xsl/html/autoidx-kimber.xsl:1.1 phpdoc/docbook/docbook-xsl/html/autoidx-kimber.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/autoidx-kimber.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/autoidx-kimber.xsl Tue Jan 30 18:16:38 2007 @@ -19,7 +19,7 @@ version="1.0"> <!-- ******************************************************************** - $Id: autoidx-kimber.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: autoidx-kimber.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/autoidx-kosek.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/autoidx-kosek.xsl diff -u phpdoc/docbook/docbook-xsl/html/autoidx-kosek.xsl:1.1 phpdoc/docbook/docbook-xsl/html/autoidx-kosek.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/autoidx-kosek.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/autoidx-kosek.xsl Tue Jan 30 18:16:38 2007 @@ -20,7 +20,7 @@ version="1.0"> <!-- ******************************************************************** - $Id: autoidx-kosek.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: autoidx-kosek.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/autoidx-ng.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/autoidx-ng.xsl diff -u phpdoc/docbook/docbook-xsl/html/autoidx-ng.xsl:1.1 phpdoc/docbook/docbook-xsl/html/autoidx-ng.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/autoidx-ng.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/autoidx-ng.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version="1.0"> <!-- ******************************************************************** - $Id: autoidx-ng.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: autoidx-ng.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the DocBook XSL Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/autoidx.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/autoidx.xsl diff -u phpdoc/docbook/docbook-xsl/html/autoidx.xsl:1.1 phpdoc/docbook/docbook-xsl/html/autoidx.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/autoidx.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/autoidx.xsl Tue Jan 30 18:16:38 2007 @@ -1,45 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE xsl:stylesheet [ - -<!ENTITY lowercase "'AaÀàÁáÂâÃãÄäÅåĀāĂ㥹ǍǎǞǟǠǡǺǻȀȁȂȃȦȧḀḁẚẠạẢảẤấẦầẨẩẪẫẬậẮắẰằẲẳẴẵẶặBbƀƁɓƂƃḂḃḄḅḆḇCcÇçĆćĈĉĊċČčƇƈɕḈḉDdĎďĐđƊɗƋƌDžDzȡɖḊḋḌḍḎḏḐḑḒḓEeÈèÉéÊêËëĒēĔĕĖėĘęĚěȄȅȆȇȨȩḔḕḖḗḘḙḚḛḜḝẸẹẺẻẼẽẾế! ỀềỂểỄễỆệFfƑƒḞḟGgĜĝĞğĠġĢģƓɠǤǥǦǧǴǵḠḡHhĤĥĦħȞȟɦḢḣḤḥḦḧḨḩḪḫẖIiÌìÍíÎîÏïĨĩĪīĬĭĮįİƗɨǏǐȈȉȊȋḬḭḮḯỈỉỊịJjĴĵǰʝKkĶķƘƙǨǩḰḱḲḳḴḵLlĹĺĻļĽľĿŀŁłƚLjȴɫɬɭḶḷḸḹḺḻḼḽMmɱḾḿṀṁṂṃNnÑñŃńŅņŇňƝɲƞȠNjǸǹȵɳṄṅṆṇṈṉṊ! ṋOoÒòÓóÔôÕõÖö& #216;øŌōŎŏŐőƟƠơǑǒǪǫǬǭǾǿȌȍȎȏȪȫȬȭȮȯȰȱṌṍṎṏṐṑṒṓỌọỎỏỐốỒồỔổỖỗỘộỚớỜờỞởỠỡỢợPpƤƥṔṕṖṗQqʠRrŔŕŖŗŘřȐȑȒȓɼɽɾṘṙṚṛṜṝṞṟSsŚśŜŝŞşŠšȘșʂṠṡṢṣṤṥṦṧṨṩTtŢţŤťŦŧƫƬƭƮʈȚțȶṪṫṬṭṮṯṰṱẗUuÙùÚúÛûÜüŨũŪūŬŭŮůŰ! 69;ŲųƯưǓǔǕǖǗǘǙǚǛǜȔȕȖȗṲṳṴṵṶṷṸṹṺṻỤụỦủỨứỪừỬửỮữỰự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))'> +<!ENTITY % common.entities SYSTEM "../common/entities.ent"> +%common.entities; ]> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exslt="http://exslt.org/common" @@ -48,7 +10,7 @@ version="1.0"> <!-- ******************************************************************** - $Id: autoidx.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: autoidx.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -105,7 +67,7 @@ match="indexterm[see]" use="concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, see)"/> -<xsl:key name="sections" match="*[@id]" use="@id"/> +<xsl:key name="sections" match="*[@id or @xml:id]" use="@id|@xml:id"/> <xsl:template name="generate-index"> @@ -520,8 +482,9 @@ <xsl:value-of select="$title"/> <!-- text only --> </a> - <xsl:if test="key('endofrange', @id)[&scope;]"> - <xsl:apply-templates select="key('endofrange', @id)[&scope;][last()]" + <xsl:variable name="id" select="(@id|@xml:id)[1]"/> + <xsl:if test="key('endofrange', $id)[&scope;]"> + <xsl:apply-templates select="key('endofrange', $id)[&scope;][last()]" mode="reference"> <xsl:with-param name="position" select="position()"/> <xsl:with-param name="scope" select="$scope"/> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/autotoc.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/autotoc.xsl diff -u phpdoc/docbook/docbook-xsl/html/autotoc.xsl:1.1 phpdoc/docbook/docbook-xsl/html/autotoc.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/autotoc.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/autotoc.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: autotoc.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: autotoc.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -32,6 +32,8 @@ <xsl:param name="toc.title.p" select="true()"/> <xsl:param name="nodes" select="/NOT-AN-ELEMENT"/> + <xsl:variable name="nodes.plus" select="$nodes | qandaset"/> + <xsl:variable name="toc.title"> <xsl:if test="$toc.title.p"> <p> @@ -63,16 +65,33 @@ </xsl:if> </xsl:when> <xsl:otherwise> - <xsl:if test="$nodes"> - <div class="toc"> - <xsl:copy-of select="$toc.title"/> - <xsl:element name="{$toc.list.type}"> - <xsl:apply-templates select="$nodes" mode="toc"> - <xsl:with-param name="toc-context" select="$toc-context"/> - </xsl:apply-templates> - </xsl:element> - </div> - </xsl:if> + <xsl:choose> + <xsl:when test="$qanda.in.toc != 0"> + <xsl:if test="$nodes.plus"> + <div class="toc"> + <xsl:copy-of select="$toc.title"/> + <xsl:element name="{$toc.list.type}"> + <xsl:apply-templates select="$nodes.plus" mode="toc"> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:apply-templates> + </xsl:element> + </div> + </xsl:if> + </xsl:when> + <xsl:otherwise> + <xsl:if test="$nodes"> + <div class="toc"> + <xsl:copy-of select="$toc.title"/> + <xsl:element name="{$toc.list.type}"> + <xsl:apply-templates select="$nodes" mode="toc"> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:apply-templates> + </xsl:element> + </div> + </xsl:if> + </xsl:otherwise> + </xsl:choose> + </xsl:otherwise> </xsl:choose> </xsl:template> @@ -109,7 +128,7 @@ <xsl:if test="contains($toc.params, 'equation')"> <xsl:call-template name="list.of.titles"> <xsl:with-param name="titles" select="'equation'"/> - <xsl:with-param name="nodes" select=".//equation[title]"/> + <xsl:with-param name="nodes" select=".//equation[title or info/title]"/> </xsl:call-template> </xsl:if> @@ -199,11 +218,22 @@ <xsl:param name="toc-context" select="."/> <xsl:param name="nodes" select="NOT-AN-ELEMENT"/> + <xsl:variable name="nodes.plus" select="$nodes | qandaset"/> + <xsl:variable name="subtoc"> <xsl:element name="{$toc.list.type}"> - <xsl:apply-templates mode="toc" select="$nodes"> - <xsl:with-param name="toc-context" select="$toc-context"/> - </xsl:apply-templates> + <xsl:choose> + <xsl:when test="$qanda.in.toc != 0"> + <xsl:apply-templates mode="toc" select="$nodes.plus"> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates mode="toc" select="$nodes"> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:apply-templates> + </xsl:otherwise> + </xsl:choose> </xsl:element> </xsl:variable> @@ -261,13 +291,17 @@ <xsl:with-param name="toc-context" select="$toc-context"/> </xsl:call-template> <xsl:if test="$toc.listitem.type = 'li' - and $toc.section.depth > $depth and count($nodes)>0 + and $toc.section.depth > $depth and + ( ($qanda.in.toc = 0 and count($nodes)>0) or + ($qanda.in.toc != 0 and count($nodes.plus)>0) ) and $toc.max.depth > $depth.from.context"> <xsl:copy-of select="$subtoc.list"/> </xsl:if> </xsl:element> <xsl:if test="$toc.listitem.type != 'li' - and $toc.section.depth > $depth and count($nodes)>0 + and $toc.section.depth > $depth and + ( ($qanda.in.toc = 0 and count($nodes)>0) or + ($qanda.in.toc != 0 and count($nodes.plus)>0) ) and $toc.max.depth > $depth.from.context"> <xsl:copy-of select="$subtoc.list"/> </xsl:if> @@ -617,5 +651,18 @@ </xsl:element> </xsl:template> +<!-- Used only if qanda.in.toc parameter is non-zero --> +<xsl:template match="qandaset" mode="toc"> + <xsl:param name="toc-context" select="."/> + <xsl:call-template name="subtoc"> + <xsl:with-param name="toc-context" select="$toc-context"/> + <xsl:with-param name="nodes" select="qandadiv | qandaentry"/> + </xsl:call-template> +</xsl:template> + +<xsl:template match="qandadiv|qandaentry" mode="toc"> + <xsl:apply-templates select="." mode="qandatoc.mode"/> +</xsl:template> + </xsl:stylesheet> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/biblio.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/biblio.xsl diff -u phpdoc/docbook/docbook-xsl/html/biblio.xsl:1.1 phpdoc/docbook/docbook-xsl/html/biblio.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/biblio.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/biblio.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: biblio.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: biblio.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -17,7 +17,8 @@ <xsl:template match="bibliography"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -35,6 +36,7 @@ </xsl:template> <xsl:template match="bibliography/bibliographyinfo"></xsl:template> +<xsl:template match="bibliography/info"></xsl:template> <xsl:template match="bibliography/title"></xsl:template> <xsl:template match="bibliography/subtitle"></xsl:template> <xsl:template match="bibliography/titleabbrev"></xsl:template> @@ -44,13 +46,15 @@ <xsl:template match="bibliodiv"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </div> </xsl:template> <xsl:template match="bibliodiv/title"> - <h3 class="{name(.)}"> + <h3> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"> <xsl:with-param name="node" select=".."/> </xsl:call-template> @@ -61,16 +65,18 @@ <!-- ==================================================================== --> <xsl:template match="bibliolist"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> - <xsl:if test="blockinfo/title|title"> + <xsl:if test="blockinfo/title|info/title|title"> <xsl:call-template name="formal.object.heading"/> </xsl:if> <xsl:apply-templates select="*[not(self::blockinfo) - and not(self::title) - and not(self::titleabbrev) - and not(self::biblioentry) - and not(self::bibliomixed)]"/> + and not(self::info) + and not(self::title) + and not(self::titleabbrev) + and not(self::biblioentry) + and not(self::bibliomixed)]"/> <xsl:apply-templates select="biblioentry|bibliomixed"/> </div> </xsl:template> @@ -89,19 +95,20 @@ <xsl:choose> <xsl:when test="string(.) = ''"> <xsl:variable name="bib" select="document($bibliography.collection,.)"/> - <xsl:variable name="entry" select="$bib/bibliography/*[@id=$id][1]"/> + <xsl:variable name="entry" select="$bib/bibliography/ + *[@id=$id or @xml:id=$id][1]"/> <xsl:choose> <xsl:when test="$entry"> - <xsl:choose> - <xsl:when test="$bibliography.numbered != 0"> - <xsl:apply-templates select="$entry"> - <xsl:with-param name="label" select="$label"/> - </xsl:apply-templates> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="$entry"/> - </xsl:otherwise> - </xsl:choose> + <xsl:choose> + <xsl:when test="$bibliography.numbered != 0"> + <xsl:apply-templates select="$entry"> + <xsl:with-param name="label" select="$label"/> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="$entry"/> + </xsl:otherwise> + </xsl:choose> </xsl:when> <xsl:otherwise> <xsl:message> @@ -110,10 +117,11 @@ <xsl:text> found in </xsl:text> <xsl:value-of select="$bibliography.collection"/> </xsl:message> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <p> - <xsl:copy-of select="$label"/> + <xsl:copy-of select="$label"/> <xsl:text>Error: no bibliography entry: </xsl:text> <xsl:value-of select="$id"/> <xsl:text> found in </xsl:text> @@ -124,12 +132,13 @@ </xsl:choose> </xsl:when> <xsl:otherwise> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"> - <xsl:with-param name="conditional" select="0"/> - </xsl:call-template> + <xsl:with-param name="conditional" select="0"/> + </xsl:call-template> <p> - <xsl:copy-of select="$label"/> + <xsl:copy-of select="$label"/> <xsl:apply-templates mode="bibliography.mode"/> </p> </div> @@ -149,19 +158,20 @@ <xsl:choose> <xsl:when test="string(.) = ''"> <xsl:variable name="bib" select="document($bibliography.collection,.)"/> - <xsl:variable name="entry" select="$bib/bibliography/*[@id=$id][1]"/> + <xsl:variable name="entry" select="$bib/bibliography/ + *[@id=$id or @xml:id=$id][1]"/> <xsl:choose> <xsl:when test="$entry"> - <xsl:choose> - <xsl:when test="$bibliography.numbered != 0"> - <xsl:apply-templates select="$entry"> - <xsl:with-param name="label" select="$label"/> - </xsl:apply-templates> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="$entry"/> - </xsl:otherwise> - </xsl:choose> + <xsl:choose> + <xsl:when test="$bibliography.numbered != 0"> + <xsl:apply-templates select="$entry"> + <xsl:with-param name="label" select="$label"/> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="$entry"/> + </xsl:otherwise> + </xsl:choose> </xsl:when> <xsl:otherwise> <xsl:message> @@ -170,10 +180,11 @@ <xsl:text> found in </xsl:text> <xsl:value-of select="$bibliography.collection"/> </xsl:message> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <p> - <xsl:copy-of select="$label"/> + <xsl:copy-of select="$label"/> <xsl:text>Error: no bibliography entry: </xsl:text> <xsl:value-of select="$id"/> <xsl:text> found in </xsl:text> @@ -184,12 +195,14 @@ </xsl:choose> </xsl:when> <xsl:otherwise> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"> - <xsl:with-param name="conditional" select="0"/> - </xsl:call-template> - <p class="{name(.)}"> - <xsl:copy-of select="$label"/> + <xsl:with-param name="conditional" select="0"/> + </xsl:call-template> + <p> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:copy-of select="$label"/> <xsl:apply-templates mode="bibliomixed.mode"/> </p> </div> @@ -222,6 +235,11 @@ <xsl:value-of select="$node/@id"/> <xsl:text>] </xsl:text> </xsl:when> + <xsl:when test="$node/@xml:id"> + <xsl:text>[</xsl:text> + <xsl:value-of select="$node/@xml:id"/> + <xsl:text>] </xsl:text> + </xsl:when> <xsl:otherwise><!-- nop --></xsl:otherwise> </xsl:choose> </xsl:template> @@ -243,49 +261,56 @@ </xsl:template> <xsl:template match="address" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="affiliation" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="shortaffil" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="jobtitle" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="artheader|articleinfo|info" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="artpagenums" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="author" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="person.name"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -296,28 +321,32 @@ </xsl:template> <xsl:template match="authorgroup" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="person.name.list"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="authorinitials" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="bibliomisc" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="bibliomset" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -326,7 +355,8 @@ <!-- ================================================== --> <xsl:template match="biblioset" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> </span> </xsl:template> @@ -350,14 +380,16 @@ <!-- ================================================== --> <xsl:template match="bookbiblio" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="citetitle" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:choose> <xsl:when test="@pubwork = 'article'"> <xsl:call-template name="gentext.startquote"/> @@ -373,70 +405,80 @@ </xsl:template> <xsl:template match="collab" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="collabname" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="confgroup" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="confdates" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="conftitle" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="confnum" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="confsponsor" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="contractnum" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="contractsponsor" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="contrib" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -445,7 +487,8 @@ <!-- ================================================== --> <xsl:template match="copyright" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="gentext"> <xsl:with-param name="key" select="'Copyright'"/> </xsl:call-template> @@ -478,133 +521,152 @@ <!-- ================================================== --> <xsl:template match="corpauthor" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="corpcredit" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="corpname" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="date" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="edition" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="editor" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="person.name"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="firstname" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="honorific" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="indexterm" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="invpartnumber" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="isbn" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="issn" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="issuenum" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="lineage" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="orgname" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="orgdiv" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="othercredit" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="othername" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="pagenums" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -615,48 +677,55 @@ </xsl:template> <xsl:template match="productname" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="productnumber" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="pubdate" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="publisher" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> </span> </xsl:template> <xsl:template match="publishername" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="pubsnumber" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="releaseinfo" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -667,48 +736,55 @@ </xsl:template> <xsl:template match="seriesinfo" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> </span> </xsl:template> <xsl:template match="seriesvolnums" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="subtitle" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="surname" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="title" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <i><xsl:apply-templates mode="bibliography.mode"/></i> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="titleabbrev" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="volumenum" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -716,7 +792,8 @@ <xsl:template match="bibliocoverage|biblioid|bibliorelation|bibliosource" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -735,67 +812,78 @@ </xsl:template> <xsl:template match="abstract" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="address" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="affiliation" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="shortaffil" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="jobtitle" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="artpagenums" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="author" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="authorblurb|personblurb" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="authorgroup" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="authorinitials" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="bibliomisc" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> @@ -803,7 +891,8 @@ <!-- ================================================== --> <xsl:template match="bibliomset" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> @@ -826,13 +915,15 @@ <!-- ================================================== --> <xsl:template match="biblioset" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="citetitle" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:choose> <xsl:when test="@pubwork = 'article'"> <xsl:call-template name="gentext.startquote"/> @@ -848,193 +939,225 @@ <xsl:template match="collab" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="confgroup" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="contractnum" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="contractsponsor" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="contrib" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="copyright" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="corpauthor" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="corpcredit" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="corpname" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="date" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="edition" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="editor" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="firstname" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="honorific" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="indexterm" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="invpartnumber" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="isbn" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="issn" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="issuenum" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="lineage" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="orgname" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="othercredit" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="othername" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="pagenums" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="printhistory" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="productname" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="productnumber" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="pubdate" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="publisher" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="publishername" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="pubsnumber" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="releaseinfo" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> @@ -1044,44 +1167,51 @@ </xsl:template> <xsl:template match="seriesvolnums" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="subtitle" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="surname" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="title" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="titleabbrev" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="volumenum" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="bibliocoverage|biblioid|bibliorelation|bibliosource" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/block.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/block.xsl diff -u phpdoc/docbook/docbook-xsl/html/block.xsl:1.1 phpdoc/docbook/docbook-xsl/html/block.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/block.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/block.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: block.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: block.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -15,14 +15,15 @@ <!-- ==================================================================== --> <!-- What should we do about styling blockinfo? --> -<xsl:template match="blockinfo"> +<xsl:template match="blockinfo|info"> <!-- suppress --> </xsl:template> <!-- ==================================================================== --> <xsl:template name="block.object"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <xsl:apply-templates/> </div> @@ -58,9 +59,9 @@ <p> <xsl:call-template name="dir"/> <xsl:if test="$class != ''"> - <xsl:attribute name="class"> - <xsl:value-of select="$class"/> - </xsl:attribute> + <xsl:apply-templates select="." mode="class.attribute"> + <xsl:with-param name="class" select="$class"/> + </xsl:apply-templates> </xsl:if> <xsl:copy-of select="$content"/> </p> @@ -82,9 +83,9 @@ <!-- see also listitem/simpara in lists.xsl --> <p> <xsl:if test="@role and $para.propagates.style != 0"> - <xsl:attribute name="class"> - <xsl:value-of select="@role"/> - </xsl:attribute> + <xsl:apply-templates select="." mode="class.attribute"> + <xsl:with-param name="class" select="@role"/> + </xsl:apply-templates> </xsl:if> <xsl:call-template name="anchor"/> @@ -106,7 +107,12 @@ </xsl:call-template> </xsl:template> -<xsl:template match="formalpara/title"> +<!-- Only use title from info --> +<xsl:template match="formalpara/info"> + <xsl:apply-templates select="title"/> +</xsl:template> + +<xsl:template match="formalpara/title|formalpara/info/title"> <xsl:variable name="titleStr"> <xsl:apply-templates/> </xsl:variable> @@ -133,7 +139,8 @@ <!-- ==================================================================== --> <xsl:template match="blockquote"> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="@lang or @xml:lang"> <xsl:call-template name="language.attribute"/> </xsl:if> @@ -161,7 +168,8 @@ </table> </xsl:when> <xsl:otherwise> - <blockquote class="{local-name(.)}"> + <blockquote> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </blockquote> </xsl:otherwise> @@ -169,7 +177,7 @@ </div> </xsl:template> -<xsl:template match="blockquote/title"> +<xsl:template match="blockquote/title|blockquote/info/title"> <div class="blockquote-title"> <p> <b> @@ -180,7 +188,8 @@ </xsl:template> <xsl:template match="epigraph"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates select="para|simpara|formalpara|literallayout"/> <xsl:if test="attribution"> <div class="attribution"> @@ -191,13 +200,17 @@ </xsl:template> <xsl:template match="attribution"> - <span class="{name(.)}"><xsl:apply-templates/></span> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:apply-templates/> + </span> </xsl:template> <!-- ==================================================================== --> <xsl:template match="abstract|sidebar"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <xsl:call-template name="formal.object.heading"> <xsl:with-param name="title"> @@ -213,7 +226,7 @@ <xsl:template match="abstract/title|sidebar/title"> </xsl:template> -<xsl:template match="sidebar/sidebarinfo"/> +<xsl:template match="sidebar/sidebarinfo|sidebar/info"/> <!-- ==================================================================== --> @@ -312,7 +325,8 @@ <!-- ==================================================================== --> <xsl:template match="revhistory"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <table border="0" width="100%" summary="Revision history"> <tr> <th align="left" valign="top" colspan="3"> @@ -359,9 +373,9 @@ <xsl:for-each select="$revauthor"> <xsl:apply-templates select="."/> <xsl:if test="position() != last()"> - <xsl:text>, </xsl:text> - </xsl:if> - </xsl:for-each> + <xsl:text>, </xsl:text> + </xsl:if> + </xsl:for-each> </td> </xsl:otherwise> </xsl:choose> @@ -403,7 +417,8 @@ <!-- ==================================================================== --> <xsl:template match="ackno"> - <p class="{name(.)}"> + <p> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </p> </xsl:template> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/callout.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/callout.xsl diff -u phpdoc/docbook/docbook-xsl/html/callout.xsl:1.1 phpdoc/docbook/docbook-xsl/html/callout.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/callout.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/callout.xsl Tue Jan 30 18:16:38 2007 @@ -7,7 +7,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: callout.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: callout.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -50,7 +50,8 @@ <xsl:choose> <xsl:when test="$verbatim/@linenumbering = 'numbered' and $linenumbering.extension != '0'"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="number.rtf.lines"> <xsl:with-param name="rtf" select="$rtf-with-callouts"/> <xsl:with-param name="pi.context" @@ -60,7 +61,8 @@ </div> </xsl:when> <xsl:otherwise> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:copy-of select="$rtf-with-callouts"/> <xsl:apply-templates select="calloutlist"/> </div> @@ -68,7 +70,8 @@ </xsl:choose> </xsl:when> <xsl:otherwise> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </div> </xsl:otherwise> @@ -93,9 +96,9 @@ <xsl:choose> <xsl:when test="$target"> <a> - <xsl:if test="@id"> + <xsl:if test="@id or @xml:id"> <xsl:attribute name="name"> - <xsl:value-of select="@id"/> + <xsl:value-of select="(@id|@xml:id)[1]"/> </xsl:attribute> </xsl:if> <xsl:attribute name="href"> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/changebars.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/changebars.xsl diff -u phpdoc/docbook/docbook-xsl/html/changebars.xsl:1.1 phpdoc/docbook/docbook-xsl/html/changebars.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/changebars.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/changebars.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version="1.0"> <!-- ******************************************************************** - $Id: changebars.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: changebars.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/chunk-code.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/chunk-code.xsl diff -u phpdoc/docbook/docbook-xsl/html/chunk-code.xsl:1.1 phpdoc/docbook/docbook-xsl/html/chunk-code.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/chunk-code.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/chunk-code.xsl Tue Jan 30 18:16:38 2007 @@ -7,7 +7,7 @@ exclude-result-prefixes="exsl cf ng db"> <!-- ******************************************************************** - $Id: chunk-code.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: chunk-code.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -50,7 +50,8 @@ <xsl:choose> <xsl:when test="$chunk != 0"> - <cf:div class="{local-name(.)}" id="{generate-id()}"> + <cf:div id="{generate-id()}"> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates select="*" mode="find.chunks"/> </cf:div> </xsl:when> @@ -72,15 +73,15 @@ <xsl:variable name="chunks" select="exsl:node-set($chunk.hierarchy)//cf:div"/> <xsl:variable name="genid" select="generate-id()"/> - <xsl:variable name="div" select="$chunks[@id=$genid]"/> + <xsl:variable name="div" select="$chunks[@id=$genid or @xml:id=$genid]"/> <xsl:variable name="prevdiv" select="($div/preceding-sibling::cf:div|$div/preceding::cf:div|$div/parent::cf:div)[last()]"/> - <xsl:variable name="prev" select="key('genid', $prevdiv/@id)"/> + <xsl:variable name="prev" select="key('genid', ($prevdiv/@id|$prevdiv/@xml:id)[1])"/> <xsl:variable name="nextdiv" select="($div/following-sibling::cf:div|$div/following::cf:div|$div/cf:div)[1]"/> - <xsl:variable name="next" select="key('genid', $nextdiv/@id)"/> + <xsl:variable name="next" select="key('genid', ($nextdiv/@id|$nextdiv/@xml:id)[1])"/> <xsl:choose> <xsl:when test="$onechunk != 0 and parent::*"> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/chunk-common.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/chunk-common.xsl diff -u phpdoc/docbook/docbook-xsl/html/chunk-common.xsl:1.1 phpdoc/docbook/docbook-xsl/html/chunk-common.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/chunk-common.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/chunk-common.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version="1.0"> <!-- ******************************************************************** - $Id: chunk-common.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: chunk-common.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -213,8 +213,8 @@ </xsl:when> <!-- if there's no dbhtml filename, and if we're to use IDs as --> <!-- filenames, then use the ID to generate the filename. --> - <xsl:when test="@id and $use.id.as.filename != 0"> - <xsl:value-of select="@id"/> + <xsl:when test="(@id or @xml:id) and $use.id.as.filename != 0"> + <xsl:value-of select="(@id|@xml:id)[1]"/> <xsl:value-of select="$html.ext"/> </xsl:when> <xsl:otherwise></xsl:otherwise> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/chunk.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/chunk.xsl diff -u phpdoc/docbook/docbook-xsl/html/chunk.xsl:1.1 phpdoc/docbook/docbook-xsl/html/chunk.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/chunk.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/chunk.xsl Tue Jan 30 18:16:38 2007 @@ -4,7 +4,7 @@ exclude-result-prefixes="exsl"> <!-- ******************************************************************** - $Id: chunk.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: chunk.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/chunker.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/chunker.xsl diff -u phpdoc/docbook/docbook-xsl/html/chunker.xsl:1.1 phpdoc/docbook/docbook-xsl/html/chunker.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/chunker.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/chunker.xsl Tue Jan 30 18:16:38 2007 @@ -9,7 +9,7 @@ extension-element-prefixes="saxon redirect lxslt exsl"> <!-- ******************************************************************** - $Id: chunker.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: chunker.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -104,9 +104,9 @@ <xsl:if test="name(.) != '' and $suppress-context-node-name = 0"> <xsl:text> for </xsl:text> <xsl:value-of select="name(.)"/> - <xsl:if test="@id"> + <xsl:if test="@id or @xml:id"> <xsl:text>(</xsl:text> - <xsl:value-of select="@id"/> + <xsl:value-of select="(@id|@xml:id)[1]"/> <xsl:text>)</xsl:text> </xsl:if> </xsl:if> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/chunkfast.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/chunkfast.xsl diff -u phpdoc/docbook/docbook-xsl/html/chunkfast.xsl:1.1 phpdoc/docbook/docbook-xsl/html/chunkfast.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/chunkfast.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/chunkfast.xsl Tue Jan 30 18:16:38 2007 @@ -5,7 +5,7 @@ exclude-result-prefixes="cf exsl"> <!-- ******************************************************************** - $Id: chunkfast.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: chunkfast.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -28,15 +28,15 @@ <xsl:when test="$chunk.fast != 0 and function-available('exsl:node-set')"> <xsl:variable name="genid" select="generate-id()"/> - <xsl:variable name="div" select="$chunks[@id=$genid]"/> + <xsl:variable name="div" select="$chunks[@id=$genid or @xml:id=$genid]"/> <xsl:variable name="prevdiv" select="($div/preceding-sibling::cf:div|$div/preceding::cf:div|$div/parent::cf:div)[last()]"/> - <xsl:variable name="prev" select="key('genid', $prevdiv/@id)"/> + <xsl:variable name="prev" select="key('genid', ($prevdiv/@id|$prevdiv/@xml:id)[1])"/> <xsl:variable name="nextdiv" select="($div/following-sibling::cf:div|$div/following::cf:div|$div/cf:div)[1]"/> - <xsl:variable name="next" select="key('genid', $nextdiv/@id)"/> + <xsl:variable name="next" select="key('genid', ($nextdiv/@id|$nextdiv/@xml:id)[1])"/> <xsl:choose> <xsl:when test="$onechunk != 0 and parent::*"> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/chunktoc.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/chunktoc.xsl diff -u phpdoc/docbook/docbook-xsl/html/chunktoc.xsl:1.1 phpdoc/docbook/docbook-xsl/html/chunktoc.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/chunktoc.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/chunktoc.xsl Tue Jan 30 18:16:38 2007 @@ -4,7 +4,7 @@ exclude-result-prefixes="doc"> <!-- ******************************************************************** - $Id: chunktoc.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: chunktoc.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/component.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/component.xsl diff -u phpdoc/docbook/docbook-xsl/html/component.xsl:1.1 phpdoc/docbook/docbook-xsl/html/component.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/component.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/component.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: component.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: component.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -20,7 +20,7 @@ <xsl:variable name="level"> <xsl:choose> <xsl:when test="ancestor::section"> - <xsl:value-of select="count(ancestor::section)+1"/> + <xsl:value-of select="count(ancestor::section)+1"/> </xsl:when> <xsl:when test="ancestor::sect5">6</xsl:when> <xsl:when test="ancestor::sect4">5</xsl:when> @@ -75,7 +75,8 @@ <xsl:template match="dedication" mode="dedication"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -86,13 +87,15 @@ </div> </xsl:template> -<xsl:template match="dedication/title" mode="titlepage.mode" priority="2"> +<xsl:template match="dedication/title|dedication/info/title" + mode="titlepage.mode" priority="2"> <xsl:call-template name="component.title"> <xsl:with-param name="node" select="ancestor::dedication[1]"/> </xsl:call-template> </xsl:template> -<xsl:template match="dedication/subtitle" mode="titlepage.mode" priority="2"> +<xsl:template match="dedication/subtitle|dedication/info/subtitle" + mode="titlepage.mode" priority="2"> <xsl:call-template name="component.subtitle"> <xsl:with-param name="node" select="ancestor::dedication[1]"/> </xsl:call-template> @@ -108,7 +111,8 @@ <xsl:template match="colophon"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -137,7 +141,8 @@ <xsl:template match="preface"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -185,6 +190,7 @@ </xsl:template> <xsl:template match="preface/docinfo|prefaceinfo"></xsl:template> +<xsl:template match="preface/info"></xsl:template> <xsl:template match="preface/title"></xsl:template> <xsl:template match="preface/titleabbrev"></xsl:template> <xsl:template match="preface/subtitle"></xsl:template> @@ -194,7 +200,8 @@ <xsl:template match="chapter"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -241,6 +248,7 @@ </xsl:template> <xsl:template match="chapter/docinfo|chapterinfo"></xsl:template> +<xsl:template match="chapter/info"></xsl:template> <xsl:template match="chapter/title"></xsl:template> <xsl:template match="chapter/titleabbrev"></xsl:template> <xsl:template match="chapter/subtitle"></xsl:template> @@ -254,7 +262,8 @@ <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -318,6 +327,7 @@ </xsl:template> <xsl:template match="appendix/docinfo|appendixinfo"></xsl:template> +<xsl:template match="appendix/info"></xsl:template> <xsl:template match="appendix/title"></xsl:template> <xsl:template match="appendix/titleabbrev"></xsl:template> <xsl:template match="appendix/subtitle"></xsl:template> @@ -327,7 +337,8 @@ <xsl:template match="article"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -377,6 +388,7 @@ </xsl:template> <xsl:template match="article/artheader|article/articleinfo"></xsl:template> +<xsl:template match="article/info"></xsl:template> <xsl:template match="article/title"></xsl:template> <xsl:template match="article/titleabbrev"></xsl:template> <xsl:template match="article/subtitle"></xsl:template> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/db5strip.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/db5strip.xsl diff -u phpdoc/docbook/docbook-xsl/html/db5strip.xsl:1.1 phpdoc/docbook/docbook-xsl/html/db5strip.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/db5strip.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/db5strip.xsl Tue Jan 30 18:16:38 2007 @@ -12,14 +12,17 @@ <xsl:template match="/"> <xsl:choose> - <xsl:when test="function-available('exsl:node-set') - and (*/self::ng:* or */self::db:*)"> + <!-- include extra test for Xalan quirk --> + <xsl:when test="(function-available('exsl:node-set') or + contains(system-property('xsl:vendor'), + 'Apache Software Foundation')) + and (*/self::ng:* or */self::db:*)"> <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document, toss the namespace and continue. Someday we'll reverse this logic and add the namespace to documents that don't have one. But not before the whole stylesheet has been converted to use namespaces. i.e., don't hold your breath --> - <xsl:message>Stripping NS from DocBook 5/NG document.</xsl:message> + <xsl:message>Stripping namespace from DocBook 5 document.</xsl:message> <xsl:apply-templates mode="stripNS"/> </xsl:when> <xsl:otherwise> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/division.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/division.xsl diff -u phpdoc/docbook/docbook-xsl/html/division.xsl:1.1 phpdoc/docbook/docbook-xsl/html/division.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/division.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/division.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: division.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: division.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -17,7 +17,8 @@ <xsl:template match="set"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -32,7 +33,7 @@ <xsl:variable name="toc.params"> <xsl:call-template name="find.path.params"> - <xsl:with-param name="table" select="normalize-space($generate.toc)"/> + <xsl:with-param name="table" select="normalize-space($generate.toc)"/> </xsl:call-template> </xsl:variable> @@ -40,8 +41,8 @@ <xsl:with-param name="toc.params" select="$toc.params"/> <xsl:with-param name="toc"> <xsl:call-template name="set.toc"> - <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/> - </xsl:call-template> + <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/> + </xsl:call-template> </xsl:with-param> </xsl:call-template> @@ -59,7 +60,8 @@ <xsl:template match="book"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -76,7 +78,7 @@ <xsl:variable name="toc.params"> <xsl:call-template name="find.path.params"> - <xsl:with-param name="table" select="normalize-space($generate.toc)"/> + <xsl:with-param name="table" select="normalize-space($generate.toc)"/> </xsl:call-template> </xsl:variable> @@ -84,8 +86,8 @@ <xsl:with-param name="toc.params" select="$toc.params"/> <xsl:with-param name="toc"> <xsl:call-template name="division.toc"> - <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/> - </xsl:call-template> + <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/> + </xsl:call-template> </xsl:with-param> </xsl:call-template> @@ -94,6 +96,7 @@ </xsl:template> <xsl:template match="book/bookinfo"></xsl:template> +<xsl:template match="book/info"></xsl:template> <xsl:template match="book/title"></xsl:template> <xsl:template match="book/titleabbrev"></xsl:template> <xsl:template match="book/subtitle"></xsl:template> @@ -103,7 +106,8 @@ <xsl:template match="part"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -138,6 +142,7 @@ <xsl:template match="part/docinfo"></xsl:template> <xsl:template match="part/partinfo"></xsl:template> +<xsl:template match="part/info"></xsl:template> <xsl:template match="part/title"></xsl:template> <xsl:template match="part/titleabbrev"></xsl:template> <xsl:template match="part/subtitle"></xsl:template> @@ -145,7 +150,8 @@ <xsl:template match="partintro"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/docbook.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/docbook.xsl diff -u phpdoc/docbook/docbook-xsl/html/docbook.xsl:1.1 phpdoc/docbook/docbook-xsl/html/docbook.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/docbook.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/docbook.xsl Tue Jan 30 18:16:38 2007 @@ -11,7 +11,7 @@ indent="no"/> <!-- ******************************************************************** - $Id: docbook.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: docbook.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -69,7 +69,6 @@ <xsl:include href="ebnf.xsl"/> <xsl:include href="chunker.xsl"/> <xsl:include href="html-rtf.xsl"/> -<xsl:include href="docbookng.xsl"/> <xsl:include href="annotations.xsl"/> <xsl:include href="../common/stripns.xsl"/> @@ -145,7 +144,7 @@ <base href="{$html.base}"/> </xsl:if> - <meta name="generator" content="DocBook XSL Stylesheets V{$VERSION}"/> + <meta name="generator" content="DocBook {$DistroTitle} V{$VERSION}"/> <xsl:if test="$generate.meta.abstract != 0"> <xsl:variable name="info" select="(articleinfo http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/ebnf.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/ebnf.xsl diff -u phpdoc/docbook/docbook-xsl/html/ebnf.xsl:1.1 phpdoc/docbook/docbook-xsl/html/ebnf.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/ebnf.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/ebnf.xsl Tue Jan 30 18:16:38 2007 @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: ebnf.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: ebnf.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -17,7 +17,7 @@ <doc:reference xmlns=""> <referenceinfo> <releaseinfo role="meta"> -$Id: ebnf.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ +$Id: ebnf.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ </releaseinfo> <author><surname>Walsh</surname> <firstname>Norman</firstname></author> @@ -54,44 +54,45 @@ <table width="100%" cellpadding="5"> <xsl:if test="$ebnf.table.bgcolor != ''"> <xsl:attribute name="bgcolor"> - <xsl:value-of select="$ebnf.table.bgcolor"/> + <xsl:value-of select="$ebnf.table.bgcolor"/> </xsl:attribute> </xsl:if> <xsl:if test="$ebnf.table.border != 0"> <xsl:attribute name="border">1</xsl:attribute> </xsl:if> <xsl:attribute name="class"> - <xsl:value-of select="name(.)"/> + <xsl:value-of select="local-name(.)"/> </xsl:attribute> <xsl:attribute name="summary"> <xsl:text>EBNF</xsl:text> <xsl:if test="title"> - <xsl:text> for </xsl:text> - <xsl:value-of select="title"/> + <xsl:text> for </xsl:text> + <xsl:value-of select="title"/> </xsl:if> </xsl:attribute> <xsl:if test="title"> <tr> - <th align="left" valign="top" class="{name(.)}"> - <xsl:apply-templates select="title"/> - </th> + <th align="left" valign="top"> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:apply-templates select="title"/> + </th> </tr> </xsl:if> <tr> <td> - <table border="0" width="99%" cellpadding="0"> - <xsl:if test="$ebnf.table.bgcolor != ''"> - <xsl:attribute name="bgcolor"> - <xsl:value-of select="$ebnf.table.bgcolor"/> - </xsl:attribute> - </xsl:if> - <xsl:attribute name="class"> - <xsl:value-of select="name(.)"/> - </xsl:attribute> - <xsl:attribute name="summary">EBNF productions</xsl:attribute> - <xsl:apply-templates select="production|productionrecap"/> - </table> + <table border="0" width="99%" cellpadding="0"> + <xsl:if test="$ebnf.table.bgcolor != ''"> + <xsl:attribute name="bgcolor"> + <xsl:value-of select="$ebnf.table.bgcolor"/> + </xsl:attribute> + </xsl:if> + <xsl:attribute name="class"> + <xsl:value-of select="local-name(.)"/> + </xsl:attribute> + <xsl:attribute name="summary">EBNF productions</xsl:attribute> + <xsl:apply-templates select="production|productionrecap"/> + </table> </td> </tr> </table> @@ -111,20 +112,20 @@ </td> <td align="right" valign="top" width="10%"> <xsl:choose> - <xsl:when test="$recap"> - <a> - <xsl:attribute name="href"> - <xsl:call-template name="href.target"> - <xsl:with-param name="object" select="."/> - </xsl:call-template> - </xsl:attribute> - <xsl:apply-templates select="lhs"/> - </a> - </xsl:when> - <xsl:otherwise> + <xsl:when test="$recap"> + <a> + <xsl:attribute name="href"> + <xsl:call-template name="href.target"> + <xsl:with-param name="object" select="."/> + </xsl:call-template> + </xsl:attribute> + <xsl:apply-templates select="lhs"/> + </a> + </xsl:when> + <xsl:otherwise> <xsl:call-template name="anchor"/> - <xsl:apply-templates select="lhs"/> - </xsl:otherwise> + <xsl:apply-templates select="lhs"/> + </xsl:otherwise> </xsl:choose> </td> <td valign="top" width="5%" align="center"> @@ -136,13 +137,13 @@ </td> <td align="left" valign="top" width="30%"> <xsl:choose> - <xsl:when test="rhs/lineannotation|constraint"> + <xsl:when test="rhs/lineannotation|constraint"> <xsl:apply-templates select="rhs/lineannotation" mode="rhslo"/> <xsl:apply-templates select="constraint"/> - </xsl:when> - <xsl:otherwise> - <xsl:text> </xsl:text> - </xsl:otherwise> + </xsl:when> + <xsl:otherwise> + <xsl:text> </xsl:text> + </xsl:otherwise> </xsl:choose> </td> </tr> @@ -206,14 +207,14 @@ <xsl:when test="*|text()"><!--nop--></xsl:when> <xsl:otherwise> <xsl:if test="$linkend = ''"> - <xsl:message> - <xsl:text>Non-terminals with no content must point to </xsl:text> - <xsl:text>production elements in the current document.</xsl:text> - </xsl:message> - <xsl:message> - <xsl:text>Invalid xpointer for empty nt: </xsl:text> - <xsl:value-of select="@def"/> - </xsl:message> + <xsl:message> + <xsl:text>Non-terminals with no content must point to </xsl:text> + <xsl:text>production elements in the current document.</xsl:text> + </xsl:message> + <xsl:message> + <xsl:text>Invalid xpointer for empty nt: </xsl:text> + <xsl:value-of select="@def"/> + </xsl:message> </xsl:if> </xsl:otherwise> </xsl:choose> @@ -221,14 +222,14 @@ <xsl:variable name="href"> <xsl:choose> <xsl:when test="$linkend != ''"> - <xsl:variable name="targets" select="key('id',$linkend)"/> - <xsl:variable name="target" select="$targets[1]"/> - <xsl:call-template name="href.target"> - <xsl:with-param name="object" select="$target"/> - </xsl:call-template> + <xsl:variable name="targets" select="key('id',$linkend)"/> + <xsl:variable name="target" select="$targets[1]"/> + <xsl:call-template name="href.target"> + <xsl:with-param name="object" select="$target"/> + </xsl:call-template> </xsl:when> <xsl:otherwise> - <xsl:value-of select="@def"/> + <xsl:value-of select="@def"/> </xsl:otherwise> </xsl:choose> </xsl:variable> @@ -236,19 +237,19 @@ <a href="{$href}"> <xsl:choose> <xsl:when test="*|text()"> - <xsl:apply-templates/> + <xsl:apply-templates/> </xsl:when> <xsl:otherwise> - <xsl:choose> - <xsl:when test="$linkend != ''"> - <xsl:variable name="targets" select="key('id',$linkend)"/> - <xsl:variable name="target" select="$targets[1]"/> - <xsl:apply-templates select="$target/lhs"/> - </xsl:when> - <xsl:otherwise> - <xsl:text>???</xsl:text> - </xsl:otherwise> - </xsl:choose> + <xsl:choose> + <xsl:when test="$linkend != ''"> + <xsl:variable name="targets" select="key('id',$linkend)"/> + <xsl:variable name="target" select="$targets[1]"/> + <xsl:apply-templates select="$target/lhs"/> + </xsl:when> + <xsl:otherwise> + <xsl:text>???</xsl:text> + </xsl:otherwise> + </xsl:choose> </xsl:otherwise> </xsl:choose> </a> @@ -294,8 +295,8 @@ <xsl:variable name="targets" select="key('id',@linkend)"/> <xsl:variable name="target" select="$targets[1]"/> <xsl:if test="$target/@role"> - <xsl:value-of select="$target/@role"/> - <xsl:text>: </xsl:text> + <xsl:value-of select="$target/@role"/> + <xsl:text>: </xsl:text> </xsl:if> </xsl:otherwise> </xsl:choose> @@ -312,7 +313,8 @@ </xsl:template> <xsl:template match="constraintdef"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <xsl:apply-templates/> </div> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/footnote.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/footnote.xsl diff -u phpdoc/docbook/docbook-xsl/html/footnote.xsl:1.1 phpdoc/docbook/docbook-xsl/html/footnote.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/footnote.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/footnote.xsl Tue Jan 30 18:16:38 2007 @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: footnote.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: footnote.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -119,9 +119,9 @@ </xsl:variable> <p> <xsl:if test="@role and $para.propagates.style != 0"> - <xsl:attribute name="class"> - <xsl:value-of select="@role"/> - </xsl:attribute> + <xsl:apply-templates select="." mode="class.attribute"> + <xsl:with-param name="class" select="@role"/> + </xsl:apply-templates> </xsl:if> <sup> <xsl:text>[</xsl:text> @@ -194,8 +194,8 @@ <xsl:param name="from" select=".."/> <xsl:param name="to" select="."/> <xsl:param name="count" select="0"/> - <xsl:param name="list" select="$from/following::*[name(.)=name($to)] - |$from/descendant-or-self::*[name(.)=name($to)]"/> + <xsl:param name="list" select="$from/following::*[local-name(.)=local-name($to)] + |$from/descendant-or-self::*[local-name(.)=local-name($to)]"/> <xsl:choose> <xsl:when test="not($list)"> @@ -247,13 +247,15 @@ <xsl:template match="footnote" name="process.footnote" mode="process.footnote.mode"> <xsl:choose> <xsl:when test="local-name(*[1]) = 'para' or local-name(*[1]) = 'simpara'"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </div> </xsl:when> <xsl:when test="$html.cleanup != 0 and function-available('exsl:node-set')"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates select="*[1]" mode="footnote.body.number"/> <xsl:apply-templates select="*[position() > 1]"/> </div> @@ -266,7 +268,8 @@ <xsl:value-of select="local-name(*[1])"/> <xsl:text> unexpected as first child of footnote.</xsl:text> </xsl:message> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </div> </xsl:otherwise> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/formal.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/formal.xsl diff -u phpdoc/docbook/docbook-xsl/html/formal.xsl:1.1 phpdoc/docbook/docbook-xsl/html/formal.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/formal.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/formal.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: formal.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: formal.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -184,12 +184,10 @@ </xsl:when> <xsl:otherwise> <xsl:copy> - <xsl:copy-of select="@*"/> - <xsl:if test="not(@id)"> - <xsl:attribute name="id"> - <xsl:call-template name="object.id"/> - </xsl:attribute> - </xsl:if> + <xsl:copy-of select="@*[not(local-name()='id')]"/> + <xsl:attribute name="id"> + <xsl:call-template name="object.id"/> + </xsl:attribute> <xsl:call-template name="htmlTable"/> </xsl:copy> </xsl:otherwise> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/glossary.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/glossary.xsl diff -u phpdoc/docbook/docbook-xsl/html/glossary.xsl:1.1 phpdoc/docbook/docbook-xsl/html/glossary.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/glossary.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/glossary.xsl Tue Jan 30 18:16:38 2007 @@ -1,9 +1,13 @@ <?xml version='1.0'?> +<!DOCTYPE xsl:stylesheet [ +<!ENTITY % common.entities SYSTEM "../common/entities.ent"> +%common.entities; +]> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'> <!-- ******************************************************************** - $Id: glossary.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: glossary.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -16,8 +20,13 @@ <xsl:template match="glossary"> <xsl:call-template name="id.warning"/> + + <xsl:variable name="language"> + <xsl:call-template name="l10n.language"/> + </xsl:variable> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -41,7 +50,18 @@ </xsl:when> <xsl:otherwise> <dl> - <xsl:apply-templates select="glossentry"/> + <xsl:choose> + <xsl:when test="$glossary.sort != 0"> + <xsl:apply-templates select="glossentry"> + <xsl:sort lang="$language" + select="translate(glossterm, &lowercase;, + &uppercase;)"/> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="glossentry"/> + </xsl:otherwise> + </xsl:choose> </dl> </xsl:otherwise> </xsl:choose> @@ -53,6 +73,7 @@ </xsl:template> <xsl:template match="glossary/glossaryinfo"></xsl:template> +<xsl:template match="glossary/info"></xsl:template> <xsl:template match="glossary/title"></xsl:template> <xsl:template match="glossary/subtitle"></xsl:template> <xsl:template match="glossary/titleabbrev"></xsl:template> @@ -60,13 +81,25 @@ <!-- ==================================================================== --> <xsl:template match="glosslist"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> - <xsl:if test="blockinfo/title|title"> + <xsl:if test="blockinfo/title|info/title|title"> <xsl:call-template name="formal.object.heading"/> </xsl:if> <dl> - <xsl:apply-templates select="glossentry"/> + <xsl:choose> + <xsl:when test="$glossary.sort != 0"> + <xsl:apply-templates select="glossentry"> + <xsl:sort lang="$language" + select="translate(glossterm, &lowercase;, + &uppercase;)"/> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="glossentry"/> + </xsl:otherwise> + </xsl:choose> </dl> </div> </xsl:template> @@ -76,17 +109,30 @@ <xsl:template match="glossdiv"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates select="(glossentry[1]/preceding-sibling::*)"/> <dl> - <xsl:apply-templates select="glossentry"/> + <xsl:choose> + <xsl:when test="$glossary.sort != 0"> + <xsl:apply-templates select="glossentry"> + <xsl:sort lang="$language" + select="translate(glossterm, &lowercase;, + &uppercase;)"/> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="glossentry"/> + </xsl:otherwise> + </xsl:choose> </dl> </div> </xsl:template> <xsl:template match="glossdiv/title"> - <h3 class="{name(.)}"> + <h3> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </h3> </xsl:template> @@ -298,7 +344,8 @@ <!-- Glossary collection --> <xsl:template match="glossary[@role='auto']" priority="2"> - <xsl:variable name="terms" select="//glossterm[not(parent::glossdef)]|//firstterm"/> + <xsl:variable name="terms" + select="//glossterm[not(parent::glossdef)]|//firstterm"/> <xsl:variable name="collection" select="document($glossary.collection, .)"/> <xsl:call-template name="id.warning"/> @@ -319,7 +366,8 @@ </xsl:message> </xsl:if> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -350,12 +398,27 @@ </xsl:when> <xsl:otherwise> <dl> - <xsl:for-each select="$collection//glossentry"> - <xsl:variable name="cterm" select="glossterm"/> - <xsl:if test="$terms[@baseform = $cterm or . = $cterm]"> - <xsl:apply-templates select="." mode="auto-glossary"/> - </xsl:if> - </xsl:for-each> + <xsl:choose> + <xsl:when test="$glossary.sort != 0"> + <xsl:for-each select="$collection//glossentry"> + <xsl:sort lang="$language" + select="translate(glossterm, &lowercase;, + &uppercase;)"/> + <xsl:variable name="cterm" select="glossterm"/> + <xsl:if test="$terms[@baseform = $cterm or . = $cterm]"> + <xsl:apply-templates select="." mode="auto-glossary"/> + </xsl:if> + </xsl:for-each> + </xsl:when> + <xsl:otherwise> + <xsl:for-each select="$collection//glossentry"> + <xsl:variable name="cterm" select="glossterm"/> + <xsl:if test="$terms[@baseform = $cterm or . = $cterm]"> + <xsl:apply-templates select="." mode="auto-glossary"/> + </xsl:if> + </xsl:for-each> + </xsl:otherwise> + </xsl:choose> </dl> </xsl:otherwise> </xsl:choose> @@ -374,16 +437,32 @@ <xsl:template match="glossdiv" mode="auto-glossary"> <xsl:param name="terms" select="."/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates select="(glossentry[1]/preceding-sibling::*)"/> <dl> - <xsl:for-each select="glossentry"> - <xsl:variable name="cterm" select="glossterm"/> - <xsl:if test="$terms[@baseform = $cterm or . = $cterm]"> - <xsl:apply-templates select="." mode="auto-glossary"/> - </xsl:if> - </xsl:for-each> + <xsl:choose> + <xsl:when test="$glossary.sort != 0"> + <xsl:for-each select="glossentry"> + <xsl:sort lang="$language" + select="translate(glossterm, &lowercase;, + &uppercase;)"/> + <xsl:variable name="cterm" select="glossterm"/> + <xsl:if test="$terms[@baseform = $cterm or . = $cterm]"> + <xsl:apply-templates select="." mode="auto-glossary"/> + </xsl:if> + </xsl:for-each> + </xsl:when> + <xsl:otherwise> + <xsl:for-each select="glossentry"> + <xsl:variable name="cterm" select="glossterm"/> + <xsl:if test="$terms[@baseform = $cterm or . = $cterm]"> + <xsl:apply-templates select="." mode="auto-glossary"/> + </xsl:if> + </xsl:for-each> + </xsl:otherwise> + </xsl:choose> </dl> </div> </xsl:template> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/graphics.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/graphics.xsl diff -u phpdoc/docbook/docbook-xsl/html/graphics.xsl:1.1 phpdoc/docbook/docbook-xsl/html/graphics.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/graphics.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/graphics.xsl Tue Jan 30 18:16:38 2007 @@ -11,7 +11,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: graphics.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: graphics.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -62,7 +62,8 @@ <!-- ==================================================================== --> <xsl:template match="screenshot"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </div> </xsl:template> @@ -234,14 +235,14 @@ <xsl:variable name="output_filename"> <xsl:choose> <xsl:when test="@entityref"> - <xsl:value-of select="$filename"/> + <xsl:value-of select="$filename"/> </xsl:when> <!-- Moved test for $keep.relative.image.uris to template below: <xsl:template match="@fileref"> --> <xsl:otherwise> - <xsl:value-of select="$filename"/> + <xsl:value-of select="$filename"/> </xsl:otherwise> </xsl:choose> </xsl:variable> @@ -568,6 +569,11 @@ <xsl:otherwise> <xsl:element name="{$tag}"> <xsl:if test="$tag = 'img' and ../../self::imageobjectco"> + <xsl:variable name="mapname"> + <xsl:call-template name="object.id"> + <xsl:with-param name="object" select="../../areaspec"/> + </xsl:call-template> + </xsl:variable> <xsl:choose> <xsl:when test="$scaled"> <!-- It might be possible to handle some scaling; needs --> @@ -580,7 +586,7 @@ <xsl:otherwise> <xsl:attribute name="border">0</xsl:attribute> <xsl:attribute name="usemap"> - <xsl:value-of select="generate-id(../..)"/> + <xsl:value-of select="concat('#', $mapname)"/> </xsl:attribute> </xsl:otherwise> </xsl:choose> @@ -713,151 +719,185 @@ </xsl:choose> <xsl:if test="$tag = 'img' and ../../self::imageobjectco and not($scaled)"> - <map name="{generate-id(../..)}"> + <xsl:variable name="mapname"> + <xsl:call-template name="object.id"> + <xsl:with-param name="object" select="../../areaspec"/> + </xsl:call-template> + </xsl:variable> + + <map name="{$mapname}"> <xsl:for-each select="../../areaspec//area"> - <xsl:variable name="units"> - <xsl:choose> - <xsl:when test="@units"> - <xsl:value-of select="@units"/> - </xsl:when> - <xsl:when test="../@units"> - <xsl:value-of select="../@units"/> - </xsl:when> - <xsl:otherwise>calspair</xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:choose> - <xsl:when test="$units = 'calspair'"> - <xsl:variable name="coords" select="normalize-space(@coords)"/> - <xsl:variable name="p1" - select="substring-before($coords, ' ')"/> - <xsl:variable name="p2" - select="substring-after($coords, ' ')"/> - - <xsl:variable name="x1" select="substring-before($p1,',')"/> - <xsl:variable name="y1" select="substring-after($p1,',')"/> - <xsl:variable name="x2" select="substring-before($p2,',')"/> - <xsl:variable name="y2" select="substring-after($p2,',')"/> - - <xsl:variable name="x1p" select="$x1 div 100.0"/> - <xsl:variable name="y1p" select="$y1 div 100.0"/> - <xsl:variable name="x2p" select="$x2 div 100.0"/> - <xsl:variable name="y2p" select="$y2 div 100.0"/> + <xsl:variable name="units"> + <xsl:choose> + <xsl:when test="@units = 'other' and @otherunits"> + <xsl:value-of select="@otherunits"/> + </xsl:when> + <xsl:when test="@units"> + <xsl:value-of select="@units"/> + </xsl:when> + <!-- areaspec|areaset/area --> + <xsl:when test="../@units = 'other' and ../@otherunits"> + <xsl:value-of select="../@otherunits"/> + </xsl:when> + <xsl:when test="../@units"> + <xsl:value-of select="../@units"/> + </xsl:when> + <!-- areaspec/areaset/area --> + <xsl:when test="../../@units = 'other' and ../../@otherunits"> + <xsl:value-of select="../@otherunits"/> + </xsl:when> + <xsl:when test="../../@units"> + <xsl:value-of select="../../@units"/> + </xsl:when> + <xsl:otherwise>calspair</xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:choose> + <xsl:when test="$units = 'calspair' or + $units = 'imagemap'"> + <xsl:variable name="coords" select="normalize-space(@coords)"/> -<!-- - <xsl:message> - <xsl:text>units: </xsl:text> - <xsl:value-of select="$units"/> - <xsl:text> </xsl:text> - <xsl:value-of select="$x1p"/><xsl:text>, </xsl:text> - <xsl:value-of select="$y1p"/><xsl:text>, </xsl:text> - <xsl:value-of select="$x2p"/><xsl:text>, </xsl:text> - <xsl:value-of select="$y2p"/><xsl:text>, </xsl:text> - </xsl:message> - - <xsl:message> - <xsl:text> </xsl:text> - <xsl:value-of select="$intrinsicwidth"/> - <xsl:text>, </xsl:text> - <xsl:value-of select="$intrinsicdepth"/> - </xsl:message> - - <xsl:message> - <xsl:text> </xsl:text> - <xsl:value-of select="$units"/> - <xsl:text> </xsl:text> - <xsl:value-of select="round($x1p * $intrinsicwidth div 100.0)"/> - <xsl:text>,</xsl:text> - <xsl:value-of select="round($intrinsicdepth - - ($y1p * $intrinsicdepth div 100.0))"/> - <xsl:text>,</xsl:text> - <xsl:value-of select="round($x2p * $intrinsicwidth div 100.0)"/> - <xsl:text>,</xsl:text> - <xsl:value-of select="round($intrinsicdepth - - ($y2p * $intrinsicdepth div 100.0))"/> - </xsl:message> ---> + <area shape="rect"> + <xsl:variable name="linkends"> + <xsl:choose> + <xsl:when test="@linkends"> + <xsl:value-of select="normalize-space(@linkends)"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="normalize-space(../@linkends)"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:variable name="href"> + <xsl:choose> + <xsl:when test="@xlink:href"> + <xsl:value-of select="@xlink:href"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="../@xlink:href"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:choose> + <xsl:when test="$linkends != ''"> + <xsl:variable name="linkend"> + <xsl:choose> + <xsl:when test="contains($linkends, ' ')"> + <xsl:value-of select="substring-before($linkends, ' ')"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$linkends"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:variable name="target" select="key('id', $linkend)[1]"/> + + <xsl:if test="$target"> + <xsl:attribute name="href"> + <xsl:call-template name="href.target"> + <xsl:with-param name="object" select="$target"/> + </xsl:call-template> + </xsl:attribute> + </xsl:if> + </xsl:when> + <xsl:when test="$href != ''"> + <xsl:attribute name="href"> + <xsl:value-of select="$href"/> + </xsl:attribute> + </xsl:when> + </xsl:choose> + + <xsl:if test="alt"> + <xsl:attribute name="alt"> + <xsl:value-of select="alt[1]"/> + </xsl:attribute> + </xsl:if> + + <xsl:attribute name="coords"> + <xsl:choose> + <xsl:when test="$units = 'calspair'"> - <area shape="rect"> - <xsl:variable name="linkends"> - <xsl:choose> - <xsl:when test="@linkends"> - <xsl:value-of select="normalize-space(@linkends)"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="normalize-space(../@linkends)"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:variable name="href"> - <xsl:choose> - <xsl:when test="@xlink:href"> - <xsl:value-of select="@xlink:href"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="../@xlink:href"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:choose> - <xsl:when test="$linkends != ''"> - <xsl:variable name="linkend"> - <xsl:choose> - <xsl:when test="contains($linkends, ' ')"> - <xsl:value-of select="substring-before($linkends, ' ')"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$linkends"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:variable name="target" select="key('id', $linkend)[1]"/> - - <xsl:if test="$target"> - <xsl:attribute name="href"> - <xsl:call-template name="href.target"> - <xsl:with-param name="object" select="$target"/> - </xsl:call-template> - </xsl:attribute> - </xsl:if> - </xsl:when> - <xsl:when test="$href != ''"> - <xsl:attribute name="href"> - <xsl:value-of select="$href"/> - </xsl:attribute> - </xsl:when> - </xsl:choose> - - <xsl:if test="alt"> - <xsl:attribute name="alt"> - <xsl:value-of select="alt[1]"/> - </xsl:attribute> - </xsl:if> - - <xsl:attribute name="coords"> - <xsl:value-of select="round($x1p * $intrinsicwidth div 100.0)"/> - <xsl:text>,</xsl:text> - <xsl:value-of select="round($intrinsicdepth - - ($y1p * $intrinsicdepth div 100.0))"/> - <xsl:text>,</xsl:text> - <xsl:value-of select="round($x2p * $intrinsicwidth div 100.0)"/> - <xsl:text>,</xsl:text> - <xsl:value-of select="round($intrinsicdepth - - ($y2p * $intrinsicdepth div 100.0))"/> - </xsl:attribute> - </area> - </xsl:when> - <xsl:otherwise> - <xsl:message> - <xsl:text>Warning: only calspair supported </xsl:text> - <xsl:text>in imageobjectco</xsl:text> - </xsl:message> - </xsl:otherwise> - </xsl:choose> + <xsl:variable name="p1" + select="substring-before($coords, ' ')"/> + <xsl:variable name="p2" + select="substring-after($coords, ' ')"/> + + <xsl:variable name="x1" select="substring-before($p1,',')"/> + <xsl:variable name="y1" select="substring-after($p1,',')"/> + <xsl:variable name="x2" select="substring-before($p2,',')"/> + <xsl:variable name="y2" select="substring-after($p2,',')"/> + + <xsl:variable name="x1p" select="$x1 div 100.0"/> + <xsl:variable name="y1p" select="$y1 div 100.0"/> + <xsl:variable name="x2p" select="$x2 div 100.0"/> + <xsl:variable name="y2p" select="$y2 div 100.0"/> + + <!-- + <xsl:message> + <xsl:text>units: </xsl:text> + <xsl:value-of select="$units"/> + <xsl:text> </xsl:text> + <xsl:value-of select="$x1p"/><xsl:text>, </xsl:text> + <xsl:value-of select="$y1p"/><xsl:text>, </xsl:text> + <xsl:value-of select="$x2p"/><xsl:text>, </xsl:text> + <xsl:value-of select="$y2p"/><xsl:text>, </xsl:text> + </xsl:message> + + <xsl:message> + <xsl:text> </xsl:text> + <xsl:value-of select="$intrinsicwidth"/> + <xsl:text>, </xsl:text> + <xsl:value-of select="$intrinsicdepth"/> + </xsl:message> + + <xsl:message> + <xsl:text> </xsl:text> + <xsl:value-of select="$units"/> + <xsl:text> </xsl:text> + <xsl:value-of + select="round($x1p * $intrinsicwidth div 100.0)"/> + <xsl:text>,</xsl:text> + <xsl:value-of select="round($intrinsicdepth + - ($y2p * $intrinsicdepth div 100.0))"/> + <xsl:text>,</xsl:text> + <xsl:value-of select="round($x2p * + $intrinsicwidth div 100.0)"/> + <xsl:text>,</xsl:text> + <xsl:value-of select="round($intrinsicdepth + - ($y1p * $intrinsicdepth div 100.0))"/> + </xsl:message> + --> + <xsl:value-of + select="round($x1p * $intrinsicwidth div 100.0)"/> + <xsl:text>,</xsl:text> + <xsl:value-of select="round($intrinsicdepth + - ($y2p * $intrinsicdepth div 100.0))"/> + <xsl:text>,</xsl:text> + <xsl:value-of + select="round($x2p * $intrinsicwidth div 100.0)"/> + <xsl:text>,</xsl:text> + <xsl:value-of select="round($intrinsicdepth + - ($y1p * $intrinsicdepth div 100.0))"/> + </xsl:when> + <xsl:otherwise> + <xsl:copy-of select="$coords"/> + </xsl:otherwise> + </xsl:choose> + </xsl:attribute> + </area> + </xsl:when> + <xsl:otherwise> + <xsl:message> + <xsl:text>Warning: only calspair or </xsl:text> + <xsl:text>otherunits='imagemap' supported </xsl:text> + <xsl:text>in imageobjectco</xsl:text> + </xsl:message> + </xsl:otherwise> + </xsl:choose> </xsl:for-each> </map> </xsl:if> @@ -1011,9 +1051,7 @@ </xsl:choose> </xsl:variable> - <xsl:if test="@id"> - <a name="{@id}"/> - </xsl:if> + <xsl:call-template name="anchor"/> <xsl:choose> <xsl:when test="@format='linespecific'"> @@ -1067,15 +1105,14 @@ <xsl:value-of select="$object/descendant::imagedata[@align][1]/@align"/> </xsl:variable> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="$align != '' "> <xsl:attribute name="align"> <xsl:value-of select="$align"/> </xsl:attribute> </xsl:if> - <xsl:if test="@id"> - <a name="{@id}"/> - </xsl:if> + <xsl:call-template name="anchor"/> <xsl:apply-templates select="$object"/> <xsl:apply-templates select="caption"/> @@ -1083,10 +1120,9 @@ </xsl:template> <xsl:template match="inlinemediaobject"> - <span class="{name(.)}"> - <xsl:if test="@id"> - <a name="{@id}"/> - </xsl:if> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="anchor"/> <xsl:call-template name="select.mediaobject"/> </span> </xsl:template> @@ -1100,9 +1136,7 @@ <!-- ==================================================================== --> <xsl:template match="imageobjectco"> - <xsl:if test="@id"> - <a name="{@id}"/> - </xsl:if> + <xsl:call-template name="anchor"/> <xsl:apply-templates select="imageobject"/> <xsl:apply-templates select="calloutlist"/> </xsl:template> @@ -1376,7 +1410,8 @@ <!-- ==================================================================== --> <xsl:template match="caption"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="@align = 'right' or @align = 'left' or @align='center'"> <xsl:attribute name="align"><xsl:value-of select="@align"/></xsl:attribute> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/highlight.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/highlight.xsl diff -u phpdoc/docbook/docbook-xsl/html/highlight.xsl:1.1 phpdoc/docbook/docbook-xsl/html/highlight.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/highlight.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/highlight.xsl Tue Jan 30 18:16:38 2007 @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: highlight.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: highlight.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/html-rtf.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/html-rtf.xsl diff -u phpdoc/docbook/docbook-xsl/html/html-rtf.xsl:1.1 phpdoc/docbook/docbook-xsl/html/html-rtf.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/html-rtf.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/html-rtf.xsl Tue Jan 30 18:16:38 2007 @@ -6,7 +6,7 @@ version="1.0"> <!-- ******************************************************************** - $Id: html-rtf.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: html-rtf.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -175,7 +175,8 @@ <xsl:variable name="leading" select="set:leading($nodes,$block)"/> <xsl:variable name="trailing" select="set:trailing($nodes,$block)"/> - <xsl:if test="($wrap/@id and $first = 1) or $leading"> + <xsl:if test="(($wrap/@id or $wrap/@xml:id) + and $first = 1) or $leading"> <xsl:element name="{local-name($wrap)}" namespace="{namespace-uri($wrap)}"> <xsl:for-each select="$wrap/@*"> <xsl:if test="$first != 0 or local-name(.) != 'id'"> @@ -198,7 +199,7 @@ </xsl:when> <xsl:otherwise> - <xsl:if test="($wrap/@id and $first = 1) or $nodes"> + <xsl:if test="(($wrap/@id or $wrap/@xml:id) and $first = 1) or $nodes"> <xsl:element name="{local-name($wrap)}" namespace="{namespace-uri($wrap)}"> <xsl:for-each select="$wrap/@*"> <xsl:if test="$first != 0 or local-name(.) != 'id'"> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/html.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/html.xsl diff -u phpdoc/docbook/docbook-xsl/html/html.xsl:1.1 phpdoc/docbook/docbook-xsl/html/html.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/html.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/html.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: html.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: html.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -19,12 +19,67 @@ <!-- inline.boldseq), which in turn are called by other (element) --> <!-- templates, so it results, currently, in supporting generation of the --> <!-- HTML "title" attribute for a total of about 92 elements. --> +<!-- You can use mode="html.title.attribute" to get a title for --> +<!-- an element specified by a param, including targets of cross references. --> <xsl:template name="generate.html.title"> - <xsl:if test="alt"> - <xsl:attribute name="title"> - <xsl:value-of select="normalize-space(alt)"/> - </xsl:attribute> - </xsl:if> + <xsl:apply-templates select="." mode="html.title.attribute"/> +</xsl:template> + +<!-- Generate a title attribute for the context node --> +<xsl:template match="*" mode="html.title.attribute"> + <xsl:variable name="is.title"> + <xsl:call-template name="gentext.template.exists"> + <xsl:with-param name="context" select="'title'"/> + <xsl:with-param name="name" select="local-name(.)"/> + <xsl:with-param name="lang"> + <xsl:call-template name="l10n.language"/> + </xsl:with-param> + </xsl:call-template> + </xsl:variable> + + <xsl:variable name="is.title-numbered"> + <xsl:call-template name="gentext.template.exists"> + <xsl:with-param name="context" select="'title-numbered'"/> + <xsl:with-param name="name" select="local-name(.)"/> + <xsl:with-param name="lang"> + <xsl:call-template name="l10n.language"/> + </xsl:with-param> + </xsl:call-template> + </xsl:variable> + + <xsl:variable name="is.title-unnumbered"> + <xsl:call-template name="gentext.template.exists"> + <xsl:with-param name="context" select="'title-unnumbered'"/> + <xsl:with-param name="name" select="local-name(.)"/> + <xsl:with-param name="lang"> + <xsl:call-template name="l10n.language"/> + </xsl:with-param> + </xsl:call-template> + </xsl:variable> + + <xsl:variable name="gentext.title"> + <xsl:if test="$is.title != 0 or + $is.title-numbered != 0 or + $is.title-unnumbered != 0"> + <xsl:apply-templates select="." + mode="object.title.markup.textonly"/> + </xsl:if> + </xsl:variable> + + <xsl:choose> + <xsl:when test="string-length($gentext.title) != 0"> + <xsl:attribute name="title"> + <xsl:value-of select="$gentext.title"/> + </xsl:attribute> + </xsl:when> + <!-- Fall back to alt if available --> + <xsl:when test="alt"> + <xsl:attribute name="title"> + <xsl:value-of select="normalize-space(alt)"/> + </xsl:attribute> + </xsl:when> + </xsl:choose> + </xsl:template> <xsl:template name="dir"> @@ -33,10 +88,10 @@ <xsl:variable name="dir"> <xsl:choose> <xsl:when test="@dir"> - <xsl:value-of select="@dir"/> + <xsl:value-of select="@dir"/> </xsl:when> <xsl:when test="$inherit != 0"> - <xsl:value-of select="ancestor::*/@dir[1]"/> + <xsl:value-of select="ancestor::*/@dir[1]"/> </xsl:when> </xsl:choose> </xsl:variable> @@ -128,20 +183,20 @@ <xsl:if test="$id.warnings != 0 and not(@id) and not(@xml:id) and parent::*"> <xsl:variable name="title"> <xsl:choose> - <xsl:when test="title"> - <xsl:value-of select="title[1]"/> - </xsl:when> - <xsl:when test="substring(local-name(*[1]), - string-length(local-name(*[1])-3) = 'info') - and *[1]/title"> - <xsl:value-of select="*[1]/title[1]"/> - </xsl:when> - <xsl:when test="refmeta/refentrytitle"> - <xsl:value-of select="refmeta/refentrytitle"/> - </xsl:when> - <xsl:when test="refnamediv/refname"> - <xsl:value-of select="refnamediv/refname[1]"/> - </xsl:when> + <xsl:when test="title"> + <xsl:value-of select="title[1]"/> + </xsl:when> + <xsl:when test="substring(local-name(*[1]), + string-length(local-name(*[1])-3) = 'info') + and *[1]/title"> + <xsl:value-of select="*[1]/title[1]"/> + </xsl:when> + <xsl:when test="refmeta/refentrytitle"> + <xsl:value-of select="refmeta/refentrytitle"/> + </xsl:when> + <xsl:when test="refnamediv/refname"> + <xsl:value-of select="refnamediv/refname[1]"/> + </xsl:when> </xsl:choose> </xsl:variable> @@ -149,20 +204,29 @@ <xsl:text>ID recommended on </xsl:text> <xsl:value-of select="local-name(.)"/> <xsl:if test="$title != ''"> - <xsl:text>: </xsl:text> - <xsl:choose> - <xsl:when test="string-length($title) > 40"> - <xsl:value-of select="substring($title,1,40)"/> - <xsl:text>...</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$title"/> - </xsl:otherwise> - </xsl:choose> + <xsl:text>: </xsl:text> + <xsl:choose> + <xsl:when test="string-length($title) > 40"> + <xsl:value-of select="substring($title,1,40)"/> + <xsl:text>...</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$title"/> + </xsl:otherwise> + </xsl:choose> </xsl:if> </xsl:message> </xsl:if> </xsl:template> +<xsl:template match="*" mode="class.attribute"> + <xsl:param name="class" select="local-name(.)"/> + <!-- permit customization of class attributes --> + <!-- Use element name by default --> + <xsl:attribute name="class"> + <xsl:value-of select="$class"/> + </xsl:attribute> +</xsl:template> + </xsl:stylesheet> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/htmltbl.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/htmltbl.xsl diff -u phpdoc/docbook/docbook-xsl/html/htmltbl.xsl:1.1 phpdoc/docbook/docbook-xsl/html/htmltbl.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/htmltbl.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/htmltbl.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version="1.0"> <!-- ******************************************************************** - $Id: htmltbl.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: htmltbl.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/index.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/index.xsl diff -u phpdoc/docbook/docbook-xsl/html/index.xsl:1.1 phpdoc/docbook/docbook-xsl/html/index.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/index.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/index.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: index.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: index.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -24,7 +24,8 @@ <xsl:call-template name="id.warning"/> <xsl:if test="count(*)>0 or $generate.index != '0'"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -78,7 +79,8 @@ <xsl:call-template name="id.warning"/> <xsl:if test="count(*)>0 or $generate.index != '0'"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -101,6 +103,8 @@ </xsl:if> </xsl:template> +<xsl:template match="index/indexinfo"></xsl:template> +<xsl:template match="index/info"></xsl:template> <xsl:template match="index/title"></xsl:template> <xsl:template match="index/subtitle"></xsl:template> <xsl:template match="index/titleabbrev"></xsl:template> @@ -110,7 +114,8 @@ <xsl:template match="indexdiv"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -126,7 +131,8 @@ </xsl:template> <xsl:template match="indexdiv/title"> - <h3 class="{name(.)}"> + <h3> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </h3> </xsl:template> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/info.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/info.xsl diff -u phpdoc/docbook/docbook-xsl/html/info.xsl:1.1 phpdoc/docbook/docbook-xsl/html/info.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/info.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/info.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: info.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: info.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -23,7 +23,8 @@ <!-- called from named templates in a given mode --> <xsl:template match="corpauthor"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </span> </xsl:template> @@ -31,7 +32,8 @@ <!-- ==================================================================== --> <xsl:template match="jobtitle"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </span> </xsl:template> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/inline.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/inline.xsl diff -u phpdoc/docbook/docbook-xsl/html/inline.xsl:1.1 phpdoc/docbook/docbook-xsl/html/inline.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/inline.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/inline.xsl Tue Jan 30 18:16:38 2007 @@ -19,7 +19,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: inline.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: inline.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -32,61 +32,123 @@ <xsl:param name="content"> <xsl:apply-templates/> </xsl:param> + <xsl:param name="a.target"/> + <xsl:param name="linkend" select="$node/@linkend"/> + <xsl:param name="xhref" select="$node/@xlink:href"/> <xsl:variable name="link"> <xsl:choose> - <xsl:when test="$node/@xlink:href - and (not($node/@xlink:type) or $node/@xlink:type='simple')"> - <a> - <xsl:if test="@xlink.title"> - <xsl:attribute name="title"> - <xsl:value-of select="@xlink:title"/> - </xsl:attribute> - </xsl:if> + <xsl:when test="$xhref and + (not($node/@xlink:type) or + $node/@xlink:type='simple')"> + + <!-- Is it a local idref or a uri? --> + <xsl:variable name="is.idref"> + <xsl:choose> + <!-- if the href starts with # and does not contain an "(" --> + <!-- or if the href starts with #xpointer(id(, it's just an ID --> + <xsl:when test="starts-with($xhref,'#') + and (not(contains($xhref,'(')) + or starts-with($xhref, + '#xpointer(id('))">1</xsl:when> + <xsl:otherwise>0</xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:choose> + <xsl:when test="$is.idref = 1"> + + <xsl:variable name="idref"> + <xsl:call-template name="xpointer.idref"> + <xsl:with-param name="xpointer" select="$xhref"/> + </xsl:call-template> + </xsl:variable> + + <xsl:variable name="targets" select="key('id',$idref)"/> + <xsl:variable name="target" select="$targets[1]"/> + + <xsl:call-template name="check.id.unique"> + <xsl:with-param name="linkend" select="$idref"/> + </xsl:call-template> - <xsl:attribute name="href"> <xsl:choose> - <!-- if the href starts with # and does not contain an "(" --> - <!-- or if the href starts with #xpointer(id(, it's just an ID --> - <xsl:when test="starts-with(@xlink:href,'#') - and (not(contains(@xlink:href,'(')) - or starts-with(@xlink:href,'#xpointer(id('))"> - <xsl:variable name="idref"> - <xsl:call-template name="xpointer.idref"> - <xsl:with-param name="xpointer" select="@xlink:href"/> - </xsl:call-template> - </xsl:variable> - - <xsl:variable name="targets" select="key('id',$idref)"/> - <xsl:variable name="target" select="$targets[1]"/> - - <xsl:call-template name="check.id.unique"> - <xsl:with-param name="linkend" select="@linkend"/> - </xsl:call-template> - - <xsl:choose> - <xsl:when test="count($target) = 0"> - <xsl:message> - <xsl:text>XLink to nonexistent id: </xsl:text> - <xsl:value-of select="$idref"/> - </xsl:message> - <xsl:text>???</xsl:text> - </xsl:when> - <xsl:otherwise> + <xsl:when test="count($target) = 0"> + <xsl:message> + <xsl:text>XLink to nonexistent id: </xsl:text> + <xsl:value-of select="$idref"/> + </xsl:message> + <xsl:copy-of select="$content"/> + </xsl:when> + + <xsl:otherwise> + <a> + <xsl:attribute name="href"> <xsl:call-template name="href.target"> <xsl:with-param name="object" select="$target"/> </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - </xsl:when> + </xsl:attribute> - <!-- otherwise it's a URI --> - <xsl:otherwise> - <xsl:value-of select="@xlink:href"/> + <xsl:choose> + <xsl:when test="$node/@xlink.title"> + <xsl:attribute name="title"> + <xsl:value-of select="$node/@xlink:title"/> + </xsl:attribute> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="$target" + mode="html.title.attribute"/> + </xsl:otherwise> + </xsl:choose> + + <xsl:if test="$a.target"> + <xsl:attribute name="target"> + <xsl:value-of select="$a.target"/> + </xsl:attribute> + </xsl:if> + + <xsl:copy-of select="$content"/> + + </a> </xsl:otherwise> </xsl:choose> + </xsl:when> + + <!-- otherwise it's a URI --> + <xsl:otherwise> + <a> + <xsl:attribute name="href"> + <xsl:value-of select="$xhref"/> + </xsl:attribute> + <xsl:if test="$node/@xlink.title"> + <xsl:attribute name="title"> + <xsl:value-of select="$node/@xlink:title"/> + </xsl:attribute> + </xsl:if> + <xsl:copy-of select="$content"/> + </a> + </xsl:otherwise> + </xsl:choose> + </xsl:when> + + <xsl:when test="$linkend"> + <xsl:variable name="targets" select="key('id',$linkend)"/> + <xsl:variable name="target" select="$targets[1]"/> + + <xsl:call-template name="check.id.unique"> + <xsl:with-param name="linkend" select="$linkend"/> + </xsl:call-template> + + <a> + <xsl:attribute name="href"> + <xsl:call-template name="href.target"> + <xsl:with-param name="object" select="$target"/> + </xsl:call-template> </xsl:attribute> + + <xsl:apply-templates select="$target" mode="html.title.attribute"/> + <xsl:copy-of select="$content"/> + </a> </xsl:when> <xsl:otherwise> @@ -138,7 +200,8 @@ </xsl:with-param> </xsl:call-template> </xsl:param> - <code class="{local-name(.)}"> + <code> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"/> <xsl:call-template name="generate.html.title"/> <xsl:copy-of select="$content"/> @@ -169,7 +232,8 @@ <xsl:copy-of select="$content"/> </xsl:when> <xsl:otherwise> - <strong class="{local-name(.)}"> + <strong> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:copy-of select="$content"/> </strong> </xsl:otherwise> @@ -187,7 +251,8 @@ </xsl:with-param> </xsl:call-template> </xsl:param> - <em class="{local-name(.)}"> + <em> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="generate.html.title"/> <xsl:call-template name="dir"/> <xsl:copy-of select="$content"/> @@ -212,21 +277,23 @@ or local-name(../..) = 'example' or local-name(../..) = 'table' or local-name(../..) = 'formalpara')"> - <code class="{local-name(.)}"> + <code> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="generate.html.title"/> - <xsl:call-template name="dir"/> + <xsl:call-template name="dir"/> <xsl:copy-of select="$content"/> - <xsl:call-template name="apply-annotations"/> + <xsl:call-template name="apply-annotations"/> </code> </xsl:when> <xsl:otherwise> - <strong class="{local-name(.)}"> + <strong> + <xsl:apply-templates select="." mode="class.attribute"/> <code> <xsl:call-template name="generate.html.title"/> - <xsl:call-template name="dir"/> + <xsl:call-template name="dir"/> <xsl:copy-of select="$content"/> </code> - <xsl:call-template name="apply-annotations"/> + <xsl:call-template name="apply-annotations"/> </strong> </xsl:otherwise> </xsl:choose> @@ -241,7 +308,8 @@ </xsl:with-param> </xsl:call-template> </xsl:param> - <em class="{local-name(.)}"> + <em> + <xsl:apply-templates select="." mode="class.attribute"/> <code> <xsl:call-template name="generate.html.title"/> <xsl:call-template name="dir"/> @@ -289,26 +357,53 @@ <!-- some special cases --> <xsl:template match="author"> - <span class="{name(.)}"> + <xsl:param name="content"> <xsl:call-template name="anchor"/> - <xsl:call-template name="person.name"/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:call-template name="person.name"/> + </xsl:with-param> + </xsl:call-template> <xsl:call-template name="apply-annotations"/> + </xsl:param> + + <span> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:copy-of select="$content"/> </span> </xsl:template> <xsl:template match="editor"> - <span class="{name(.)}"> + <xsl:param name="content"> <xsl:call-template name="anchor"/> - <xsl:call-template name="person.name"/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:call-template name="person.name"/> + </xsl:with-param> + </xsl:call-template> <xsl:call-template name="apply-annotations"/> + </xsl:param> + + <span> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:copy-of select="$content"/> </span> </xsl:template> <xsl:template match="othercredit"> - <span class="{name(.)}"> + <xsl:param name="content"> <xsl:call-template name="anchor"/> - <xsl:call-template name="person.name"/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:call-template name="person.name"/> + </xsl:with-param> + </xsl:call-template> <xsl:call-template name="apply-annotations"/> + </xsl:param> + + <span> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:copy-of select="$content"/> </span> </xsl:template> @@ -610,9 +705,9 @@ <span> <xsl:choose> <xsl:when test="@role and $emphasis.propagates.style != 0"> - <xsl:attribute name="class"> - <xsl:value-of select="@role"/> - </xsl:attribute> + <xsl:apply-templates select="." mode="class.attribute"> + <xsl:with-param name="class" select="@role"/> + </xsl:apply-templates> </xsl:when> <xsl:otherwise> <xsl:attribute name="class"> @@ -653,7 +748,8 @@ </xsl:template> <xsl:template match="foreignphrase"> - <span class="foreignphrase"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="@lang or @xml:lang"> <xsl:call-template name="language.attribute"/> </xsl:if> @@ -672,9 +768,9 @@ <xsl:call-template name="language.attribute"/> </xsl:if> <xsl:if test="@role and $phrase.propagates.style != 0"> - <xsl:attribute name="class"> - <xsl:value-of select="@role"/> - </xsl:attribute> + <xsl:apply-templates select="." mode="class.attribute"> + <xsl:with-param name="class" select="@role"/> + </xsl:apply-templates> </xsl:if> <xsl:call-template name="dir"/> <xsl:call-template name="anchor"/> @@ -691,7 +787,7 @@ <xsl:variable name="depth"> <xsl:call-template name="dot.count"> <xsl:with-param name="string"> - <xsl:number level="multiple"/> + <xsl:number level="multiple"/> </xsl:with-param> </xsl:call-template> </xsl:variable> @@ -718,7 +814,8 @@ </xsl:template> <xsl:template match="lineannotation"> - <em class="{local-name(.)}"> + <em> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="inline.charseq"/> </em> </xsl:template> @@ -777,9 +874,9 @@ <xsl:choose> <xsl:when test="$target"> <a> - <xsl:if test="@id"> + <xsl:if test="@id or @xml:id"> <xsl:attribute name="name"> - <xsl:value-of select="@id"/> + <xsl:value-of select="(@id|@xml:id)[1]"/> </xsl:attribute> </xsl:if> @@ -858,14 +955,9 @@ </xsl:when> <xsl:otherwise> <xsl:variable name="id"> - <xsl:choose> - <xsl:when test="$cterm/@id"> - <xsl:value-of select="$cterm/@id"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="generate-id($cterm)"/> - </xsl:otherwise> - </xsl:choose> + <xsl:call-template name="object.id"> + <xsl:with-param name="object" select="$cterm"/> + </xsl:call-template> </xsl:variable> <a href="{$chunkbase}#{$id}"> <xsl:call-template name="inline.italicseq"> @@ -905,9 +997,9 @@ </xsl:when> <xsl:otherwise> <a> - <xsl:if test="@id"> + <xsl:if test="@id or @xml:id"> <xsl:attribute name="name"> - <xsl:value-of select="@id"/> + <xsl:value-of select="(@id|@xml:id)[1]"/> </xsl:attribute> </xsl:if> @@ -932,7 +1024,8 @@ </xsl:template> <xsl:template match="termdef"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="generate.html.title"/> <xsl:call-template name="gentext.template"> <xsl:with-param name="context" select="'termdef'"/> @@ -960,8 +1053,7 @@ </xsl:choose> </xsl:param> - <code class="sgmltag-{$class}"> - <xsl:call-template name="generate.html.title"/> + <xsl:variable name="content"> <xsl:choose> <xsl:when test="$class='attribute'"> <xsl:apply-templates/> @@ -1021,6 +1113,16 @@ <xsl:apply-templates/> </xsl:otherwise> </xsl:choose> + </xsl:variable> + + <code> + <xsl:apply-templates select="." mode="class.attribute"> + <xsl:with-param name="class" select="concat('sgmltag-', $class)"/> + </xsl:apply-templates> + <xsl:call-template name="generate.html.title"/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content" select="$content"/> + </xsl:call-template> </code> </xsl:template> @@ -1031,8 +1133,11 @@ <xsl:text><</xsl:text> </xsl:if> <a> - <xsl:attribute name="href">mailto:<xsl:value-of select="."/></xsl:attribute> - <xsl:apply-templates/> + <xsl:attribute name="href"> + <xsl:text>mailto:</xsl:text> + <xsl:value-of select="."/> + </xsl:attribute> + <xsl:apply-templates/> </a> <xsl:if test="not($email.delimiters.enabled = 0)"> <xsl:text>></xsl:text> @@ -1092,8 +1197,8 @@ <xsl:otherwise> <xsl:variable name="node" select="$nodelist[$count=position()]"/> <xsl:choose> - <xsl:when test="name($node)='guimenuitem' - or name($node)='guisubmenu'"> + <xsl:when test="local-name($node)='guimenuitem' + or local-name($node)='guisubmenu'"> <xsl:value-of select="$menuchoice.menu.separator"/> </xsl:when> <xsl:otherwise> @@ -1120,12 +1225,23 @@ <xsl:template match="citation"> <!-- todo: integrate with bibliography collection --> <xsl:variable name="targets" select="(//biblioentry | //bibliomixed)[abbrev = string(current())]"/> + <xsl:variable name="target" select="$targets[1]"/> <xsl:choose> - <xsl:when test="$targets"> - <xsl:call-template name="xref"> - <xsl:with-param name="targets" select="$targets"/> - </xsl:call-template> + <!-- try automatic linking based on match to abbrev --> + <xsl:when test="$target and not(xref) and not(link)"> + + <xsl:text>[</xsl:text> + <a> + <xsl:attribute name="href"> + <xsl:call-template name="href.target"> + <xsl:with-param name="object" select="$target"/> + </xsl:call-template> + </xsl:attribute> + + <xsl:call-template name="inline.charseq"/> + </a> + <xsl:text>]</xsl:text> </xsl:when> <xsl:otherwise> <xsl:text>[</xsl:text> @@ -1182,43 +1298,106 @@ <!-- ==================================================================== --> <xsl:template match="person"> - <span class="{name(.)}"> + <xsl:param name="content"> <xsl:call-template name="anchor"/> - <xsl:apply-templates select="personname"/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:apply-templates select="personname"/> + </xsl:with-param> + </xsl:call-template> + <xsl:call-template name="apply-annotations"/> + </xsl:param> + + <span> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:copy-of select="$content"/> </span> </xsl:template> <xsl:template match="personname"> - <span class="{name(.)}"> + <xsl:param name="content"> <xsl:call-template name="anchor"/> - <xsl:call-template name="person.name"/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:call-template name="person.name"/> + </xsl:with-param> + </xsl:call-template> + <xsl:call-template name="apply-annotations"/> + </xsl:param> + + <span> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:copy-of select="$content"/> </span> </xsl:template> <!-- ==================================================================== --> <xsl:template match="org"> - <span class="{name(.)}"> + <xsl:param name="content"> <xsl:call-template name="anchor"/> - <xsl:apply-templates/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:apply-templates/> + </xsl:with-param> + </xsl:call-template> + <xsl:call-template name="apply-annotations"/> + </xsl:param> + + <span> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:copy-of select="$content"/> </span> </xsl:template> <xsl:template match="orgname"> - <span class="{name(.)}"> - <xsl:apply-templates/> + <xsl:param name="content"> + <xsl:call-template name="anchor"/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:apply-templates/> + </xsl:with-param> + </xsl:call-template> + <xsl:call-template name="apply-annotations"/> + </xsl:param> + + <span> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:copy-of select="$content"/> </span> </xsl:template> <xsl:template match="orgdiv"> - <span class="{name(.)}"> - <xsl:apply-templates/> + <xsl:param name="content"> + <xsl:call-template name="anchor"/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:apply-templates/> + </xsl:with-param> + </xsl:call-template> + <xsl:call-template name="apply-annotations"/> + </xsl:param> + + <span> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:copy-of select="$content"/> </span> </xsl:template> <xsl:template match="affiliation"> - <span class="{name(.)}"> - <xsl:apply-templates/> + <xsl:param name="content"> + <xsl:call-template name="anchor"/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:call-template name="person.name"/> + </xsl:with-param> + </xsl:call-template> + <xsl:call-template name="apply-annotations"/> + </xsl:param> + + <span> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:copy-of select="$content"/> </span> </xsl:template> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/keywords.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/keywords.xsl diff -u phpdoc/docbook/docbook-xsl/html/keywords.xsl:1.1 phpdoc/docbook/docbook-xsl/html/keywords.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/keywords.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/keywords.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: keywords.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: keywords.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/lists.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/lists.xsl diff -u phpdoc/docbook/docbook-xsl/html/lists.xsl:1.1 phpdoc/docbook/docbook-xsl/html/lists.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/lists.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/lists.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: lists.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: lists.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -15,7 +15,8 @@ <!-- ==================================================================== --> <xsl:template match="itemizedlist"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <xsl:if test="title"> <xsl:call-template name="formal.object.heading"/> @@ -135,7 +136,8 @@ </xsl:choose> </xsl:variable> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <xsl:if test="title"> @@ -254,7 +256,8 @@ </xsl:call-template> </xsl:variable> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <xsl:if test="title"> <xsl:call-template name="formal.object.heading"/> @@ -343,9 +346,9 @@ <xsl:otherwise> <p> <xsl:if test="@role and $para.propagates.style != 0"> - <xsl:attribute name="class"> - <xsl:value-of select="@role"/> - </xsl:attribute> + <xsl:apply-templates select="." mode="class.attribute"> + <xsl:with-param name="class" select="@role"/> + </xsl:apply-templates> </xsl:if> <xsl:call-template name="anchor"/> @@ -426,7 +429,11 @@ <xsl:template match="varlistentry/term"> <span class="term"> <xsl:call-template name="anchor"/> - <xsl:apply-templates/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:apply-templates/> + </xsl:with-param> + </xsl:call-template> <xsl:choose> <xsl:when test="position() = last()"/> <!-- do nothing --> <xsl:otherwise> @@ -475,7 +482,8 @@ </xsl:template> <xsl:template match="simplelist[@type='inline']"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <!-- if dbchoice PI exists, use that to determine the choice separator --> <!-- (that is, equivalent of "and" or "or" in current locale), or literal --> <!-- value of "choice" otherwise --> @@ -491,7 +499,11 @@ </xsl:variable> <xsl:for-each select="member"> - <xsl:apply-templates/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:apply-templates/> + </xsl:with-param> + </xsl:call-template> <xsl:choose> <xsl:when test="position() = last()"/> <!-- do nothing --> <xsl:otherwise> @@ -652,7 +664,11 @@ <xsl:template match="member"> <xsl:call-template name="anchor"/> - <xsl:apply-templates/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:apply-templates/> + </xsl:with-param> + </xsl:call-template> </xsl:template> <!-- ==================================================================== --> @@ -682,7 +698,8 @@ |comment()[not(preceding-sibling::step)] |processing-instruction()[not(preceding-sibling::step)]"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"> <xsl:with-param name="conditional"> <xsl:choose> @@ -775,7 +792,8 @@ </xsl:call-template> </xsl:variable> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <xsl:choose> @@ -916,9 +934,10 @@ <!-- ==================================================================== --> <xsl:template match="calloutlist"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> - <xsl:if test="title"> + <xsl:if test="title|info/title"> <xsl:call-template name="formal.object.heading"/> </xsl:if> @@ -996,9 +1015,9 @@ <xsl:otherwise> <p> <xsl:if test="@role and $para.propagates.style != 0"> - <xsl:attribute name="class"> - <xsl:value-of select="@role"/> - </xsl:attribute> + <xsl:apply-templates select="." mode="class.attribute"> + <xsl:with-param name="class" select="@role"/> + </xsl:apply-templates> </xsl:if> <xsl:call-template name="anchor"/> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/maketoc.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/maketoc.xsl diff -u phpdoc/docbook/docbook-xsl/html/maketoc.xsl:1.1 phpdoc/docbook/docbook-xsl/html/maketoc.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/maketoc.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/maketoc.xsl Tue Jan 30 18:16:38 2007 @@ -4,7 +4,7 @@ exclude-result-prefixes="doc"> <!-- ******************************************************************** - $Id: maketoc.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: maketoc.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -45,7 +45,10 @@ <xsl:if test="$chunk != 0"> <xsl:call-template name="indent-spaces"/> - <tocentry linkend="{@id}"> + <xsl:variable name="id"> + <xsl:call-template name="object.id"/> + </xsl:variable> + <tocentry linkend="{$id}"> <xsl:processing-instruction name="dbhtml"> <xsl:text>filename="</xsl:text> <xsl:value-of select="$filename"/> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/manifest.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/manifest.xsl diff -u phpdoc/docbook/docbook-xsl/html/manifest.xsl:1.1 phpdoc/docbook/docbook-xsl/html/manifest.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/manifest.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/manifest.xsl Tue Jan 30 18:16:38 2007 @@ -4,7 +4,7 @@ exclude-result-prefixes="doc"> <!-- ******************************************************************** - $Id: manifest.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: manifest.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/math.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/math.xsl diff -u phpdoc/docbook/docbook-xsl/html/math.xsl:1.1 phpdoc/docbook/docbook-xsl/html/math.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/math.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/math.xsl Tue Jan 30 18:16:38 2007 @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: math.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: math.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -22,7 +22,8 @@ </xsl:template> <xsl:template match="mathphrase"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </span> </xsl:template> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/oldchunker.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/oldchunker.xsl diff -u phpdoc/docbook/docbook-xsl/html/oldchunker.xsl:1.1 phpdoc/docbook/docbook-xsl/html/oldchunker.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/oldchunker.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/oldchunker.xsl Tue Jan 30 18:16:38 2007 @@ -8,7 +8,7 @@ extension-element-prefixes="saxon redirect lxslt"> <!-- ******************************************************************** - $Id: oldchunker.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: oldchunker.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/onechunk.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/onechunk.xsl diff -u phpdoc/docbook/docbook-xsl/html/onechunk.xsl:1.1 phpdoc/docbook/docbook-xsl/html/onechunk.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/onechunk.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/onechunk.xsl Tue Jan 30 18:16:38 2007 @@ -5,7 +5,7 @@ exclude-result-prefixes="doc"> <!-- ******************************************************************** - $Id: onechunk.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: onechunk.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/param.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/param.xsl diff -u phpdoc/docbook/docbook-xsl/html/param.xsl:1.1 phpdoc/docbook/docbook-xsl/html/param.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/param.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/param.xsl Tue Jan 30 18:16:38 2007 @@ -4,7 +4,7 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" exclude-result-prefixes="src" version="1.0"> <!-- ******************************************************************** - $Id: param.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: param.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -175,6 +175,7 @@ </xsl:param> <xsl:param name="glossary.collection" select="''"/> +<xsl:param name="glossary.sort" select="0"/> <xsl:param name="glossentry.show.acronym" select="'no'"/> <xsl:param name="glossterm.auto.link" select="0"/> <xsl:param name="graphic.default.extension"/> @@ -288,6 +289,7 @@ <xsl:param name="olink.base.uri" select="''"/> <xsl:param name="olink.debug" select="0"/> <xsl:attribute-set name="olink.properties"> + <xsl:attribute name="show-destination">replace</xsl:attribute> </xsl:attribute-set> <xsl:param name="insert.olink.page.number">no</xsl:param> <xsl:param name="insert.olink.pdf.frag" select="0"/> @@ -327,6 +329,7 @@ <xsl:param name="punct.honorific" select="'.'"/> <xsl:param name="qanda.defaultlabel">number</xsl:param> <xsl:param name="qanda.inherit.numeration" select="1"/> +<xsl:param name="qanda.in.toc" select="0"/> <xsl:param name="qanda.nested.in.toc" select="0"/> <xsl:param name="qandadiv.autolabel" select="1"/> <xsl:param name="refentry.generate.name" select="1"/> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/pi.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/pi.xsl diff -u phpdoc/docbook/docbook-xsl/html/pi.xsl:1.1 phpdoc/docbook/docbook-xsl/html/pi.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/pi.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/pi.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: pi.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: pi.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/profile-chunk-code.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/profile-chunk-code.xsl diff -u phpdoc/docbook/docbook-xsl/html/profile-chunk-code.xsl:1.1 phpdoc/docbook/docbook-xsl/html/profile-chunk-code.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/profile-chunk-code.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/profile-chunk-code.xsl Tue Jan 30 18:16:38 2007 @@ -4,7 +4,7 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns:cf="http://docbook.sourceforge.net/xmlns/chunkfast/1.0" xmlns:ng="http://docbook.org/docbook-ng" xmlns:db="http://docbook.org/ns/docbook" xmlns:exslt="http://exslt.org/common" exslt:dummy="dummy" ng:dummy="dummy" db:dummy="dummy" extension-element-prefixes="exslt" version="1.0" exclude-result-prefixes="exsl cf ng db exslt"> <!-- ******************************************************************** - $Id: profile-chunk-code.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: profile-chunk-code.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -47,7 +47,8 @@ <xsl:choose> <xsl:when test="$chunk != 0"> - <cf:div class="{local-name(.)}" id="{generate-id()}"> + <cf:div id="{generate-id()}"> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates select="*" mode="find.chunks"/> </cf:div> </xsl:when> @@ -69,13 +70,13 @@ <xsl:variable name="chunks" select="exsl:node-set($chunk.hierarchy)//cf:div"/> <xsl:variable name="genid" select="generate-id()"/> - <xsl:variable name="div" select="$chunks[@id=$genid]"/> + <xsl:variable name="div" select="$chunks[@id=$genid or @xml:id=$genid]"/> <xsl:variable name="prevdiv" select="($div/preceding-sibling::cf:div|$div/preceding::cf:div|$div/parent::cf:div)[last()]"/> - <xsl:variable name="prev" select="key('genid', $prevdiv/@id)"/> + <xsl:variable name="prev" select="key('genid', ($prevdiv/@id|$prevdiv/@xml:id)[1])"/> <xsl:variable name="nextdiv" select="($div/following-sibling::cf:div|$div/following::cf:div|$div/cf:div)[1]"/> - <xsl:variable name="next" select="key('genid', $nextdiv/@id)"/> + <xsl:variable name="next" select="key('genid', ($nextdiv/@id|$nextdiv/@xml:id)[1])"/> <xsl:choose> <xsl:when test="$onechunk != 0 and parent::*"> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/profile-chunk.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/profile-chunk.xsl diff -u phpdoc/docbook/docbook-xsl/html/profile-chunk.xsl:1.1 phpdoc/docbook/docbook-xsl/html/profile-chunk.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/profile-chunk.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/profile-chunk.xsl Tue Jan 30 18:16:38 2007 @@ -4,7 +4,7 @@ exclude-result-prefixes="exsl"> <!-- ******************************************************************** - $Id: profile-chunk.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: profile-chunk.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/profile-docbook.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/profile-docbook.xsl diff -u phpdoc/docbook/docbook-xsl/html/profile-docbook.xsl:1.1 phpdoc/docbook/docbook-xsl/html/profile-docbook.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/profile-docbook.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/profile-docbook.xsl Tue Jan 30 18:16:38 2007 @@ -6,7 +6,7 @@ <xsl:output method="html" encoding="ISO-8859-1" indent="no"/> <!-- ******************************************************************** - $Id: profile-docbook.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: profile-docbook.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -64,7 +64,6 @@ <xsl:include href="ebnf.xsl"/> <xsl:include href="chunker.xsl"/> <xsl:include href="html-rtf.xsl"/> -<xsl:include href="docbookng.xsl"/> <xsl:include href="annotations.xsl"/> <xsl:include href="../common/stripns.xsl"/> @@ -139,7 +138,7 @@ <base href="{$html.base}"/> </xsl:if> - <meta name="generator" content="DocBook XSL Stylesheets V{$VERSION}"/> + <meta name="generator" content="DocBook {$DistroTitle} V{$VERSION}"/> <xsl:if test="$generate.meta.abstract != 0"> <xsl:variable name="info" select="(articleinfo |bookinfo |prefaceinfo |chapterinfo |appendixinfo |sectioninfo |sect1info |sect2info |sect3info |sect4info |sect5info |referenceinfo |refentryinfo |partinfo |info |docinfo)[1]"/> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/profile-onechunk.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/profile-onechunk.xsl diff -u phpdoc/docbook/docbook-xsl/html/profile-onechunk.xsl:1.1 phpdoc/docbook/docbook-xsl/html/profile-onechunk.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/profile-onechunk.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/profile-onechunk.xsl Tue Jan 30 18:16:38 2007 @@ -5,7 +5,7 @@ exclude-result-prefixes="doc"> <!-- ******************************************************************** - $Id: profile-onechunk.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: profile-onechunk.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/qandaset.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/qandaset.xsl diff -u phpdoc/docbook/docbook-xsl/html/qandaset.xsl:1.1 phpdoc/docbook/docbook-xsl/html/qandaset.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/qandaset.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/qandaset.xsl Tue Jan 30 18:16:38 2007 @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: qandaset.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: qandaset.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -17,11 +17,11 @@ <!-- ==================================================================== --> <xsl:template match="qandaset"> - <xsl:variable name="title" select="(blockinfo/title|title)[1]"/> - <xsl:variable name="preamble" select="*[name(.) != 'title' - and name(.) != 'titleabbrev' - and name(.) != 'qandadiv' - and name(.) != 'qandaentry']"/> + <xsl:variable name="title" select="(blockinfo/title|info/title|title)[1]"/> + <xsl:variable name="preamble" select="*[local-name(.) != 'title' + and local-name(.) != 'titleabbrev' + and local-name(.) != 'qandadiv' + and local-name(.) != 'qandaentry']"/> <xsl:variable name="toc"> <xsl:call-template name="dbhtml-attribute"> <xsl:with-param name="pis" @@ -36,7 +36,8 @@ </xsl:call-template> </xsl:variable> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates select="$title"/> <xsl:if test="((contains($toc.params, 'toc') and $toc != '0') or $toc = '1') and not(ancestor::answer and not($qanda.nested.in.toc=0))"> @@ -47,33 +48,39 @@ </div> </xsl:template> -<xsl:template match="qandaset/blockinfo/title|qandaset/title"> +<xsl:template match="qandaset/blockinfo/title| + qandaset/info/title| + qandaset/title"> <xsl:variable name="qalevel"> <xsl:call-template name="qanda.section.level"/> </xsl:variable> <xsl:element name="h{string(number($qalevel)+1)}"> <xsl:attribute name="class"> - <xsl:value-of select="name(.)"/> + <xsl:value-of select="local-name(.)"/> </xsl:attribute> + <xsl:call-template name="anchor"> + <xsl:with-param name="node" select=".."/> + <xsl:with-param name="conditional" select="0"/> + </xsl:call-template> <xsl:apply-templates/> </xsl:element> </xsl:template> -<xsl:template match="qandaset/blockinfo"> +<xsl:template match="qandaset/blockinfo|qandaset/info"> <!-- what should this template really do? --> <xsl:apply-templates select="legalnotice" mode="titlepage.mode"/> </xsl:template> <xsl:template match="qandadiv"> - <xsl:variable name="preamble" select="*[name(.) != 'title' - and name(.) != 'titleabbrev' - and name(.) != 'qandadiv' - and name(.) != 'qandaentry']"/> + <xsl:variable name="preamble" select="*[local-name(.) != 'title' + and local-name(.) != 'titleabbrev' + and local-name(.) != 'qandadiv' + and local-name(.) != 'qandaentry']"/> - <xsl:if test="blockinfo/title|title"> + <xsl:if test="blockinfo/title|info/title|title"> <tr class="qandadiv"> <td align="left" valign="top" colspan="2"> - <xsl:apply-templates select="(blockinfo/title|title)[1]"/> + <xsl:apply-templates select="(blockinfo/title|info/title|title)[1]"/> </td> </tr> </xsl:if> @@ -109,14 +116,16 @@ <xsl:apply-templates select="qandadiv|qandaentry"/> </xsl:template> -<xsl:template match="qandadiv/blockinfo/title|qandadiv/title"> +<xsl:template match="qandadiv/blockinfo/title| + qandadiv/info/title| + qandadiv/title"> <xsl:variable name="qalevel"> <xsl:call-template name="qandadiv.section.level"/> </xsl:variable> <xsl:element name="h{string(number($qalevel)+1)}"> <xsl:attribute name="class"> - <xsl:value-of select="name(.)"/> + <xsl:value-of select="local-name(.)"/> </xsl:attribute> <xsl:call-template name="anchor"> <xsl:with-param name="node" select=".."/> @@ -148,7 +157,8 @@ </xsl:choose> </xsl:variable> - <tr class="{name(.)}"> + <tr> + <xsl:apply-templates select="." mode="class.attribute"/> <td align="left" valign="top"> <xsl:call-template name="anchor"> <xsl:with-param name="node" select=".."/> @@ -174,10 +184,10 @@ <td align="left" valign="top"> <xsl:choose> <xsl:when test="$deflabel = 'none' and not(label)"> - <b><xsl:apply-templates select="*[name(.) != 'label']"/></b> + <b><xsl:apply-templates select="*[local-name(.) != 'label']"/></b> </xsl:when> <xsl:otherwise> - <xsl:apply-templates select="*[name(.) != 'label']"/> + <xsl:apply-templates select="*[local-name(.) != 'label']"/> </xsl:otherwise> </xsl:choose> </td> @@ -197,7 +207,7 @@ </xsl:choose> </xsl:variable> - <tr class="{name(.)}"> + <tr class="{local-name(.)}"> <td align="left" valign="top"> <xsl:call-template name="anchor"/> <xsl:variable name="answer.label"> @@ -210,8 +220,8 @@ </xsl:if> </td> <td align="left" valign="top"> - <xsl:apply-templates select="*[name(.) != 'label' - and name(.) != 'qandaentry']"/> + <xsl:apply-templates select="*[local-name(.) != 'label' + and local-name(.) != 'qandaentry']"/> <!-- * handle nested answer/qandaentry instances --> <!-- * (bug 1509043 from Daniel Leidert) --> <xsl:if test="descendant::question"> @@ -241,7 +251,9 @@ <dd><xsl:call-template name="process.qanda.toc"/></dd> </xsl:template> -<xsl:template match="qandadiv/blockinfo/title|qandadiv/title" mode="qandatoc.mode"> +<xsl:template match="qandadiv/blockinfo/title| + qandadiv/info/title| + qandadiv/title" mode="qandatoc.mode"> <xsl:variable name="qalevel"> <xsl:call-template name="qandadiv.section.level"/> </xsl:variable> @@ -276,7 +288,7 @@ <xsl:template match="question" mode="qandatoc.mode"> <xsl:variable name="firstch"> - <xsl:apply-templates select="(*[name(.)!='label'])[1]"/> + <xsl:apply-templates select="(*[local-name(.)!='label'])[1]"/> </xsl:variable> <xsl:variable name="deflabel"> <xsl:choose> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/refentry.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/refentry.xsl diff -u phpdoc/docbook/docbook-xsl/html/refentry.xsl:1.1 phpdoc/docbook/docbook-xsl/html/refentry.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/refentry.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/refentry.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: refentry.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: refentry.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -17,7 +17,8 @@ <xsl:template match="reference"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -85,7 +86,8 @@ <xsl:template match="refentry"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -105,6 +107,7 @@ </xsl:template> <xsl:template match="refentry/docinfo|refentry/refentryinfo"></xsl:template> +<xsl:template match="refentry/info"></xsl:template> <xsl:template match="refentrytitle|refname|refdescriptor" mode="title"> <xsl:apply-templates/> @@ -129,7 +132,8 @@ </xsl:template> <xsl:template match="refnamediv"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -205,7 +209,8 @@ </xsl:template> <xsl:template match="refsynopsisdiv"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -237,7 +242,8 @@ </xsl:template> <xsl:template match="refsection|refsect1|refsect2|refsect3"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -290,9 +296,11 @@ </h4> </xsl:template> -<xsl:template match="refsect1info"></xsl:template> -<xsl:template match="refsect2info"></xsl:template> -<xsl:template match="refsect3info"></xsl:template> +<xsl:template match="refsectioninfo|refsection/info"></xsl:template> +<xsl:template match="refsect1info|refsect1/info"></xsl:template> +<xsl:template match="refsect2info|refsect2/info"></xsl:template> +<xsl:template match="refsect3info|refsect3/info"></xsl:template> + <!-- ==================================================================== --> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/sections.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/sections.xsl diff -u phpdoc/docbook/docbook-xsl/html/sections.xsl:1.1 phpdoc/docbook/docbook-xsl/html/sections.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/sections.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/sections.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: sections.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: sections.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -19,7 +19,8 @@ <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -99,7 +100,8 @@ <xsl:template match="sect1"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -151,7 +153,8 @@ <xsl:template match="sect2"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -203,7 +206,8 @@ <xsl:template match="sect3"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -255,7 +259,8 @@ <xsl:template match="sect4"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -307,7 +312,8 @@ <xsl:template match="sect5"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -359,7 +365,8 @@ <xsl:template match="simplesect"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -378,35 +385,42 @@ <xsl:template match="section/titleabbrev"></xsl:template> <xsl:template match="section/subtitle"></xsl:template> <xsl:template match="sectioninfo"></xsl:template> +<xsl:template match="section/info"></xsl:template> <xsl:template match="sect1/title"></xsl:template> <xsl:template match="sect1/titleabbrev"></xsl:template> <xsl:template match="sect1/subtitle"></xsl:template> <xsl:template match="sect1info"></xsl:template> +<xsl:template match="sect1/info"></xsl:template> <xsl:template match="sect2/title"></xsl:template> <xsl:template match="sect2/subtitle"></xsl:template> <xsl:template match="sect2/titleabbrev"></xsl:template> <xsl:template match="sect2info"></xsl:template> +<xsl:template match="sect2/info"></xsl:template> <xsl:template match="sect3/title"></xsl:template> <xsl:template match="sect3/subtitle"></xsl:template> <xsl:template match="sect3/titleabbrev"></xsl:template> <xsl:template match="sect3info"></xsl:template> +<xsl:template match="sect3/info"></xsl:template> <xsl:template match="sect4/title"></xsl:template> <xsl:template match="sect4/subtitle"></xsl:template> <xsl:template match="sect4/titleabbrev"></xsl:template> <xsl:template match="sect4info"></xsl:template> +<xsl:template match="sect4/info"></xsl:template> <xsl:template match="sect5/title"></xsl:template> <xsl:template match="sect5/subtitle"></xsl:template> <xsl:template match="sect5/titleabbrev"></xsl:template> <xsl:template match="sect5info"></xsl:template> +<xsl:template match="sect5/info"></xsl:template> <xsl:template match="simplesect/title"></xsl:template> <xsl:template match="simplesect/subtitle"></xsl:template> <xsl:template match="simplesect/titleabbrev"></xsl:template> +<xsl:template match="simplesect/info"></xsl:template> <!-- ==================================================================== --> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/synop.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/synop.xsl diff -u phpdoc/docbook/docbook-xsl/html/synop.xsl:1.1 phpdoc/docbook/docbook-xsl/html/synop.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/synop.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/synop.xsl Tue Jan 30 18:16:38 2007 @@ -6,7 +6,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: synop.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: synop.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -22,7 +22,8 @@ <!-- ==================================================================== --> <xsl:template match="cmdsynopsis"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <p> <xsl:call-template name="anchor"/> <xsl:apply-templates/> @@ -140,7 +141,10 @@ <xsl:apply-templates select="." mode="synopfragment.number"/> </xsl:variable> <p> - <a name="{@id}"> + <xsl:variable name="id"> + <xsl:call-template name="object.id"/> + </xsl:variable> + <a name="{$id}"> <xsl:text>(</xsl:text> <xsl:value-of select="$snum"/> <xsl:text>)</xsl:text> @@ -155,7 +159,10 @@ </xsl:template> <xsl:template match="funcsynopsisinfo"> - <pre class="{name(.)}"><xsl:apply-templates/></pre> + <pre> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:apply-templates/> + </pre> </xsl:template> <!-- ====================================================================== --> @@ -228,7 +235,8 @@ </xsl:template> <xsl:template match="funcdef" mode="kr-nontabular"> - <code class="{name(.)}"> + <code> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="kr-nontabular"/> <xsl:text>(</xsl:text> </code> @@ -344,7 +352,8 @@ </xsl:template> <xsl:template match="funcdef" mode="kr-tabular"> - <code class="{name(.)}"> + <code> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="kr-tabular"/> <xsl:text>(</xsl:text> </code> @@ -509,7 +518,8 @@ </xsl:template> <xsl:template match="funcdef" mode="ansi-nontabular"> - <code class="{name(.)}"> + <code> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="ansi-nontabular"/> <xsl:text>(</xsl:text> </code> @@ -595,7 +605,8 @@ </xsl:template> <xsl:template match="funcdef" mode="ansi-tabular"> - <code class="{name(.)}"> + <code> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="ansi-tabular"/> <xsl:text>(</xsl:text> </code> @@ -752,7 +763,7 @@ <xsl:otherwise> <xsl:message> <xsl:text>Unrecognized language on </xsl:text> - <xsl:value-of select="name(.)"/> + <xsl:value-of select="local-name(.)"/> <xsl:text>: </xsl:text> <xsl:value-of select="$language"/> </xsl:message> @@ -778,7 +789,8 @@ <!-- ===== Java ======================================================== --> <xsl:template match="classsynopsis" mode="java"> - <pre class="{name(.)}"> + <pre> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates select="ooclass[1]" mode="java"/> <xsl:if test="ooclass[preceding-sibling::*]"> <xsl:text> extends</xsl:text> @@ -824,13 +836,15 @@ <xsl:text> </xsl:text> </xsl:otherwise> </xsl:choose> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="java"/> </span> </xsl:template> -<xsl:template match="modifier" mode="java"> - <span class="{name(.)}"> +<xsl:template match="modifier|package" mode="java"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="java"/> <xsl:if test="following-sibling::*"> <xsl:text> </xsl:text> @@ -839,34 +853,38 @@ </xsl:template> <xsl:template match="classname" mode="java"> - <xsl:if test="name(preceding-sibling::*[1]) = 'classname'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'classname'"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="java"/> </span> </xsl:template> <xsl:template match="interfacename" mode="java"> - <xsl:if test="name(preceding-sibling::*[1]) = 'interfacename'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'interfacename'"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="java"/> </span> </xsl:template> <xsl:template match="exceptionname" mode="java"> - <xsl:if test="name(preceding-sibling::*[1]) = 'exceptionname'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'exceptionname'"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="java"/> </span> </xsl:template> <xsl:template match="fieldsynopsis" mode="java"> - <code class="{name(.)}"> + <code> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="parent::classsynopsis"> <xsl:text> </xsl:text> </xsl:if> @@ -877,34 +895,39 @@ </xsl:template> <xsl:template match="type" mode="java"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="java"/> <xsl:text> </xsl:text> </span> </xsl:template> <xsl:template match="varname" mode="java"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="java"/> <xsl:text> </xsl:text> </span> </xsl:template> <xsl:template match="initializer" mode="java"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:text>= </xsl:text> <xsl:apply-templates mode="java"/> </span> </xsl:template> <xsl:template match="void" mode="java"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:text>void </xsl:text> </span> </xsl:template> <xsl:template match="methodname" mode="java"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="java"/> </span> </xsl:template> @@ -921,22 +944,24 @@ </xsl:call-template> </xsl:if> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="java"/> </span> </xsl:template> <xsl:template match="parameter" mode="java"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="java"/> </span> </xsl:template> <xsl:template mode="java" match="constructorsynopsis|destructorsynopsis|methodsynopsis"> - <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[name(.) != 'modifier']]"/> - <xsl:variable name="notmod" select="*[name(.) != 'modifier']"/> - <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[name(.) != 'modifier']]"/> + <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[local-name(.) != 'modifier']]"/> + <xsl:variable name="notmod" select="*[local-name(.) != 'modifier']"/> + <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"/> <xsl:variable name="decl"> <xsl:if test="parent::classsynopsis"> <xsl:text> </xsl:text> @@ -944,14 +969,15 @@ <xsl:apply-templates select="$start-modifiers" mode="java"/> <!-- type --> - <xsl:if test="name($notmod[1]) != 'methodname'"> + <xsl:if test="local-name($notmod[1]) != 'methodname'"> <xsl:apply-templates select="$notmod[1]" mode="java"/> </xsl:if> <xsl:apply-templates select="methodname" mode="java"/> </xsl:variable> - <code class="{name(.)}"> + <code> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:copy-of select="$decl"/> <xsl:text>(</xsl:text> <xsl:apply-templates select="methodparam" mode="java"> @@ -963,7 +989,7 @@ <xsl:text> throws </xsl:text> <xsl:apply-templates select="exceptionname" mode="java"/> </xsl:if> - <xsl:if test="modifier[preceding-sibling::*[name(.) != 'modifier']]"> + <xsl:if test="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"> <xsl:text> </xsl:text> <xsl:apply-templates select="$end-modifiers" mode="java"/> </xsl:if> @@ -975,7 +1001,8 @@ <!-- ===== C++ ========================================================= --> <xsl:template match="classsynopsis" mode="cpp"> - <pre class="{name(.)}"> + <pre> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates select="ooclass[1]" mode="cpp"/> <xsl:if test="ooclass[preceding-sibling::*]"> <xsl:text>: </xsl:text> @@ -1016,13 +1043,15 @@ <xsl:if test="preceding-sibling::*"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="cpp"/> </span> </xsl:template> -<xsl:template match="modifier" mode="cpp"> - <span class="{name(.)}"> +<xsl:template match="modifier|package" mode="cpp"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="cpp"/> <xsl:if test="following-sibling::*"> <xsl:text> </xsl:text> @@ -1031,34 +1060,38 @@ </xsl:template> <xsl:template match="classname" mode="cpp"> - <xsl:if test="name(preceding-sibling::*[1]) = 'classname'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'classname'"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="cpp"/> </span> </xsl:template> <xsl:template match="interfacename" mode="cpp"> - <xsl:if test="name(preceding-sibling::*[1]) = 'interfacename'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'interfacename'"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="cpp"/> </span> </xsl:template> <xsl:template match="exceptionname" mode="cpp"> - <xsl:if test="name(preceding-sibling::*[1]) = 'exceptionname'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'exceptionname'"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="cpp"/> </span> </xsl:template> <xsl:template match="fieldsynopsis" mode="cpp"> - <code class="{name(.)}"> + <code> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="parent::classsynopsis"> <xsl:text> </xsl:text> </xsl:if> @@ -1069,34 +1102,39 @@ </xsl:template> <xsl:template match="type" mode="cpp"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="cpp"/> <xsl:text> </xsl:text> </span> </xsl:template> <xsl:template match="varname" mode="cpp"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="cpp"/> <xsl:text> </xsl:text> </span> </xsl:template> <xsl:template match="initializer" mode="cpp"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:text>= </xsl:text> <xsl:apply-templates mode="cpp"/> </span> </xsl:template> <xsl:template match="void" mode="cpp"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:text>void </xsl:text> </span> </xsl:template> <xsl:template match="methodname" mode="cpp"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="cpp"/> </span> </xsl:template> @@ -1105,31 +1143,34 @@ <xsl:if test="preceding-sibling::methodparam"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="cpp"/> </span> </xsl:template> <xsl:template match="parameter" mode="cpp"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="cpp"/> </span> </xsl:template> <xsl:template mode="cpp" match="constructorsynopsis|destructorsynopsis|methodsynopsis"> - <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[name(.) != 'modifier']]"/> - <xsl:variable name="notmod" select="*[name(.) != 'modifier']"/> - <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[name(.) != 'modifier']]"/> + <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[local-name(.) != 'modifier']]"/> + <xsl:variable name="notmod" select="*[local-name(.) != 'modifier']"/> + <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"/> - <code class="{name(.)}"> + <code> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="parent::classsynopsis"> <xsl:text> </xsl:text> </xsl:if> <xsl:apply-templates select="$start-modifiers" mode="cpp"/> <!-- type --> - <xsl:if test="name($notmod[1]) != 'methodname'"> + <xsl:if test="local-name($notmod[1]) != 'methodname'"> <xsl:apply-templates select="$notmod[1]" mode="cpp"/> </xsl:if> @@ -1142,7 +1183,7 @@ <xsl:text> throws </xsl:text> <xsl:apply-templates select="exceptionname" mode="cpp"/> </xsl:if> - <xsl:if test="modifier[preceding-sibling::*[name(.) != 'modifier']]"> + <xsl:if test="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"> <xsl:text> </xsl:text> <xsl:apply-templates select="$end-modifiers" mode="cpp"/> </xsl:if> @@ -1154,7 +1195,8 @@ <!-- ===== IDL ========================================================= --> <xsl:template match="classsynopsis" mode="idl"> - <pre class="{name(.)}"> + <pre> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:text>interface </xsl:text> <xsl:apply-templates select="ooclass[1]" mode="idl"/> <xsl:if test="ooclass[preceding-sibling::*]"> @@ -1196,13 +1238,15 @@ <xsl:if test="preceding-sibling::*"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="idl"/> </span> </xsl:template> -<xsl:template match="modifier" mode="idl"> - <span class="{name(.)}"> +<xsl:template match="modifier|package" mode="idl"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="idl"/> <xsl:if test="following-sibling::*"> <xsl:text> </xsl:text> @@ -1211,34 +1255,38 @@ </xsl:template> <xsl:template match="classname" mode="idl"> - <xsl:if test="name(preceding-sibling::*[1]) = 'classname'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'classname'"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="idl"/> </span> </xsl:template> <xsl:template match="interfacename" mode="idl"> - <xsl:if test="name(preceding-sibling::*[1]) = 'interfacename'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'interfacename'"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="idl"/> </span> </xsl:template> <xsl:template match="exceptionname" mode="idl"> - <xsl:if test="name(preceding-sibling::*[1]) = 'exceptionname'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'exceptionname'"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="idl"/> </span> </xsl:template> <xsl:template match="fieldsynopsis" mode="idl"> - <code class="{name(.)}"> + <code> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="parent::classsynopsis"> <xsl:text> </xsl:text> </xsl:if> @@ -1249,34 +1297,39 @@ </xsl:template> <xsl:template match="type" mode="idl"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="idl"/> <xsl:text> </xsl:text> </span> </xsl:template> <xsl:template match="varname" mode="idl"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="idl"/> <xsl:text> </xsl:text> </span> </xsl:template> <xsl:template match="initializer" mode="idl"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:text>= </xsl:text> <xsl:apply-templates mode="idl"/> </span> </xsl:template> <xsl:template match="void" mode="idl"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:text>void </xsl:text> </span> </xsl:template> <xsl:template match="methodname" mode="idl"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="idl"/> </span> </xsl:template> @@ -1285,30 +1338,33 @@ <xsl:if test="preceding-sibling::methodparam"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="idl"/> </span> </xsl:template> <xsl:template match="parameter" mode="idl"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="idl"/> </span> </xsl:template> <xsl:template mode="idl" match="constructorsynopsis|destructorsynopsis|methodsynopsis"> - <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[name(.) != 'modifier']]"/> - <xsl:variable name="notmod" select="*[name(.) != 'modifier']"/> - <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[name(.) != 'modifier']]"/> - <code class="{name(.)}"> + <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[local-name(.) != 'modifier']]"/> + <xsl:variable name="notmod" select="*[local-name(.) != 'modifier']"/> + <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"/> + <code> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="parent::classsynopsis"> <xsl:text> </xsl:text> </xsl:if> <xsl:apply-templates select="$start-modifiers" mode="idl"/> <!-- type --> - <xsl:if test="name($notmod[1]) != 'methodname'"> + <xsl:if test="local-name($notmod[1]) != 'methodname'"> <xsl:apply-templates select="$notmod[1]" mode="idl"/> </xsl:if> @@ -1322,7 +1378,7 @@ <xsl:apply-templates select="exceptionname" mode="idl"/> <xsl:text>)</xsl:text> </xsl:if> - <xsl:if test="modifier[preceding-sibling::*[name(.) != 'modifier']]"> + <xsl:if test="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"> <xsl:text> </xsl:text> <xsl:apply-templates select="$end-modifiers" mode="idl"/> </xsl:if> @@ -1334,7 +1390,8 @@ <!-- ===== Perl ======================================================== --> <xsl:template match="classsynopsis" mode="perl"> - <pre class="{name(.)}"> + <pre> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:text>package </xsl:text> <xsl:apply-templates select="ooclass[1]" mode="perl"/> <xsl:text>;</xsl:text> @@ -1363,13 +1420,15 @@ <xsl:if test="preceding-sibling::*"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="perl"/> </span> </xsl:template> -<xsl:template match="modifier" mode="perl"> - <span class="{name(.)}"> +<xsl:template match="modifier|package" mode="perl"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="perl"/> <xsl:if test="following-sibling::*"> <xsl:text> </xsl:text> @@ -1378,34 +1437,38 @@ </xsl:template> <xsl:template match="classname" mode="perl"> - <xsl:if test="name(preceding-sibling::*[1]) = 'classname'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'classname'"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="perl"/> </span> </xsl:template> <xsl:template match="interfacename" mode="perl"> - <xsl:if test="name(preceding-sibling::*[1]) = 'interfacename'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'interfacename'"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="perl"/> </span> </xsl:template> <xsl:template match="exceptionname" mode="perl"> - <xsl:if test="name(preceding-sibling::*[1]) = 'exceptionname'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'exceptionname'"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="perl"/> </span> </xsl:template> <xsl:template match="fieldsynopsis" mode="perl"> - <code class="{name(.)}"> + <code> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="parent::classsynopsis"> <xsl:text> </xsl:text> </xsl:if> @@ -1416,34 +1479,39 @@ </xsl:template> <xsl:template match="type" mode="perl"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="perl"/> <xsl:text> </xsl:text> </span> </xsl:template> <xsl:template match="varname" mode="perl"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="perl"/> <xsl:text> </xsl:text> </span> </xsl:template> <xsl:template match="initializer" mode="perl"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:text>= </xsl:text> <xsl:apply-templates mode="perl"/> </span> </xsl:template> <xsl:template match="void" mode="perl"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:text>void </xsl:text> </span> </xsl:template> <xsl:template match="methodname" mode="perl"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="perl"/> </span> </xsl:template> @@ -1452,24 +1520,27 @@ <xsl:if test="preceding-sibling::methodparam"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="perl"/> </span> </xsl:template> <xsl:template match="parameter" mode="perl"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="perl"/> </span> </xsl:template> <xsl:template mode="perl" match="constructorsynopsis|destructorsynopsis|methodsynopsis"> - <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[name(.) != 'modifier']]"/> - <xsl:variable name="notmod" select="*[name(.) != 'modifier']"/> - <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[name(.) != 'modifier']]"/> + <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[local-name(.) != 'modifier']]"/> + <xsl:variable name="notmod" select="*[local-name(.) != 'modifier']"/> + <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"/> - <code class="{name(.)}"> + <code> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:text>sub </xsl:text> <xsl:apply-templates select="methodname" mode="perl"/> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/table.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/table.xsl diff -u phpdoc/docbook/docbook-xsl/html/table.xsl:1.1 phpdoc/docbook/docbook-xsl/html/table.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/table.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/table.xsl Tue Jan 30 18:16:38 2007 @@ -11,7 +11,7 @@ <xsl:include href="../common/table.xsl"/> <!-- ******************************************************************** - $Id: table.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: table.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -48,7 +48,7 @@ <xsl:variable name="colsep"> <xsl:choose> <!-- If this is the last column, colsep never applies. --> - <xsl:when test="$colnum >= ancestor::tgroup/@cols">0</xsl:when> + <xsl:when test="number($colnum) >= ancestor::tgroup/@cols">0</xsl:when> <xsl:otherwise> <xsl:call-template name="inherited.table.attribute"> <xsl:with-param name="entry" select="NOT-AN-ELEMENT-NAME"/> @@ -455,7 +455,7 @@ <xsl:template match="spanspec"></xsl:template> <xsl:template match="thead|tfoot"> - <xsl:element name="{name(.)}"> + <xsl:element name="{local-name(.)}"> <xsl:if test="@align"> <xsl:attribute name="align"> <xsl:value-of select="@align"/> @@ -789,7 +789,7 @@ </xsl:call-template> </xsl:when> - <xsl:when test="$entry.colnum > $col"> + <xsl:when test="number($entry.colnum) > $col"> <xsl:call-template name="empty.table.cell"/> <xsl:call-template name="entry"> <xsl:with-param name="col" select="$col+1"/> @@ -815,9 +815,9 @@ </xsl:if> <xsl:if test="$entry.propagates.style != 0 and @role"> - <xsl:attribute name="class"> - <xsl:value-of select="@role"/> - </xsl:attribute> + <xsl:apply-templates select="." mode="class.attribute"> + <xsl:with-param name="class" select="@role"/> + </xsl:apply-templates> </xsl:if> <xsl:if test="$show.revisionflag and @revisionflag"> @@ -877,7 +877,8 @@ </xsl:attribute> </xsl:if> - <xsl:if test="not(preceding-sibling::*) and ancestor::row/@id"> + <xsl:if test="not(preceding-sibling::*) and + (ancestor::row[1]/@id or ancestor::row[1]/@xml:id)"> <xsl:call-template name="anchor"> <xsl:with-param name="node" select="ancestor::row[1]"/> </xsl:call-template> @@ -951,7 +952,7 @@ </xsl:call-template> </xsl:when> - <xsl:when test="$entry.colnum > $col"> + <xsl:when test="number($entry.colnum) > $col"> <xsl:text>0:</xsl:text> <xsl:call-template name="sentry"> <xsl:with-param name="col" select="$col+$entry.colspan"/> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/task.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/task.xsl diff -u phpdoc/docbook/docbook-xsl/html/task.xsl:1.1 phpdoc/docbook/docbook-xsl/html/task.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/task.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/task.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version="1.0"> <!-- ******************************************************************** - $Id: task.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: task.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -35,7 +35,8 @@ select="*[not(self::title or self::titleabbrev)]"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <xsl:if test="title and $placement = 'before'"> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/titlepage.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/titlepage.xsl diff -u phpdoc/docbook/docbook-xsl/html/titlepage.xsl:1.1 phpdoc/docbook/docbook-xsl/html/titlepage.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/titlepage.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/titlepage.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: titlepage.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: titlepage.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -118,14 +118,16 @@ </xsl:template> <xsl:template match="abbrev" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="abstract" mode="titlepage.mode"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <xsl:call-template name="formal.object.heading"> <xsl:with-param name="title"> @@ -151,7 +153,8 @@ and @linenumbering = 'numbered' and $use.extensions != '0' and $linenumbering.extension != '0'"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="paragraph"> <xsl:with-param name="content"> <xsl:call-template name="number.rtf.lines"> @@ -163,7 +166,8 @@ </xsl:when> <xsl:otherwise> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="paragraph"> <xsl:with-param name="content"> <xsl:call-template name="make-verbatim"> @@ -177,13 +181,15 @@ </xsl:template> <xsl:template match="affiliation" mode="titlepage.mode"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> </div> </xsl:template> <xsl:template match="artpagenums" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> @@ -194,11 +200,15 @@ </xsl:template> <xsl:template name="credits.div"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="self::editor[position()=1] and not($editedby.enabled = 0)"> <h4 class="editedby"><xsl:call-template name="gentext.edited.by"/></h4> </xsl:if> - <h3 class="{name(.)}"><xsl:call-template name="person.name"/></h3> + <h3> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="person.name"/> + </h3> <xsl:if test="not($contrib.inline.enabled = 0)"> <xsl:apply-templates mode="titlepage.mode" select="./contrib"/> </xsl:if> @@ -220,20 +230,23 @@ </xsl:template> <xsl:template match="authorblurb|personblurb" mode="titlepage.mode"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> </div> </xsl:template> <xsl:template match="authorgroup" mode="titlepage.mode"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <xsl:apply-templates mode="titlepage.mode"/> </div> </xsl:template> <xsl:template match="authorinitials" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> @@ -248,40 +261,46 @@ </xsl:template> <xsl:template match="collab" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="collabname" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> </span> </xsl:template> <xsl:template match="confgroup" mode="titlepage.mode"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> </div> </xsl:template> <xsl:template match="confdates" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="confsponsor" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="conftitle" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> @@ -292,14 +311,16 @@ </xsl:template> <xsl:template match="contractnum" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="contractsponsor" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> @@ -308,12 +329,14 @@ <xsl:template match="contrib" mode="titlepage.mode"> <xsl:choose> <xsl:when test="not($contrib.inline.enabled = 0)"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> </span> </xsl:when> <xsl:otherwise> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <p><xsl:apply-templates mode="titlepage.mode"/></p> </div> </xsl:otherwise> @@ -321,7 +344,8 @@ </xsl:template> <xsl:template match="copyright" mode="titlepage.mode"> - <p class="{name(.)}"> + <p> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="gentext"> <xsl:with-param name="key" select="'Copyright'"/> </xsl:call-template> @@ -371,34 +395,39 @@ </xsl:template> <xsl:template match="corpauthor" mode="titlepage.mode"> - <h3 class="{name(.)}"> + <h3> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> </h3> </xsl:template> <xsl:template match="corpcredit" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="corpname" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="date" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="edition" mode="titlepage.mode"> - <p class="{name(.)}"> + <p> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <xsl:call-template name="gentext.space"/> <xsl:call-template name="gentext"> @@ -413,7 +442,8 @@ </xsl:template> <xsl:template match="firstname" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> @@ -425,28 +455,32 @@ </xsl:template> <xsl:template match="honorific" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="isbn" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="issn" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="biblioid" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> @@ -456,21 +490,24 @@ </xsl:template> <xsl:template match="invpartnumber" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="issuenum" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="jobtitle" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> @@ -517,7 +554,8 @@ </head> <body> <xsl:call-template name="body.attributes"/> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> </div> </body> @@ -527,7 +565,8 @@ </xsl:call-template> </xsl:when> <xsl:otherwise> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <a name="{$id}"/> <xsl:apply-templates mode="titlepage.mode"/> </div> @@ -540,7 +579,8 @@ </xsl:template> <xsl:template match="lineage" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> @@ -553,14 +593,16 @@ <xsl:if test="preceding-sibling::*[1][self::orgname]"> <xsl:text> </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="orgname" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> @@ -574,7 +616,7 @@ <xsl:when test="contrib"> <xsl:if test="not(preceding-sibling::othercredit[string(contrib)=$contrib])"> <xsl:call-template name="paragraph"> - <xsl:with-param name="class" select="name(.)"/> + <xsl:with-param name="class" select="local-name(.)"/> <xsl:with-param name="content"> <xsl:apply-templates mode="titlepage.mode" select="contrib"/> <xsl:text>: </xsl:text> @@ -587,7 +629,7 @@ </xsl:when> <xsl:otherwise> <xsl:call-template name="paragraph"> - <xsl:with-param name="class" select="name(.)"/> + <xsl:with-param name="class" select="local-name(.)"/> <xsl:with-param name="content"> <xsl:call-template name="person.name"/> </xsl:with-param> @@ -608,34 +650,39 @@ </xsl:template> <xsl:template match="othername" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="pagenums" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="printhistory" mode="titlepage.mode"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> </div> </xsl:template> <xsl:template match="productname" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="productnumber" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> @@ -643,7 +690,7 @@ <xsl:template match="pubdate" mode="titlepage.mode"> <xsl:call-template name="paragraph"> - <xsl:with-param name="class" select="name(.)"/> + <xsl:with-param name="class" select="local-name(.)"/> <xsl:with-param name="content"> <xsl:apply-templates mode="titlepage.mode"/> </xsl:with-param> @@ -652,7 +699,7 @@ <xsl:template match="publisher" mode="titlepage.mode"> <xsl:call-template name="paragraph"> - <xsl:with-param name="class" select="name(.)"/> + <xsl:with-param name="class" select="local-name(.)"/> <xsl:with-param name="content"> <xsl:apply-templates mode="titlepage.mode"/> </xsl:with-param> @@ -660,14 +707,16 @@ </xsl:template> <xsl:template match="publishername" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="pubsnumber" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> @@ -675,7 +724,7 @@ <xsl:template match="releaseinfo" mode="titlepage.mode"> <xsl:call-template name="paragraph"> - <xsl:with-param name="class" select="name(.)"/> + <xsl:with-param name="class" select="local-name(.)"/> <xsl:with-param name="content"> <xsl:apply-templates mode="titlepage.mode"/> </xsl:with-param> @@ -699,7 +748,8 @@ </xsl:variable> <xsl:variable name="contents"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <table border="1" width="100%" summary="Revision history"> <tr> <th align="left" valign="top" colspan="{$numcols}"> @@ -833,14 +883,16 @@ </xsl:template> <xsl:template match="seriesvolnums" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="shortaffil" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> @@ -850,13 +902,15 @@ </xsl:template> <xsl:template match="subtitle" mode="titlepage.mode"> - <h2 class="{name(.)}"> + <h2> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> </h2> </xsl:template> <xsl:template match="surname" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> @@ -879,7 +933,8 @@ </xsl:choose> </xsl:variable> - <h1 class="{name(.)}"> + <h1> + <xsl:apply-templates select="." mode="class.attribute"/> <a name="{$id}"/> <xsl:choose> <xsl:when test="$show.revisionflag != 0 and @revisionflag"> @@ -899,7 +954,8 @@ </xsl:template> <xsl:template match="volumenum" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/toc.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/toc.xsl diff -u phpdoc/docbook/docbook-xsl/html/toc.xsl:1.1 phpdoc/docbook/docbook-xsl/html/toc.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/toc.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/toc.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: toc.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: toc.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/verbatim.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/verbatim.xsl diff -u phpdoc/docbook/docbook-xsl/html/verbatim.xsl:1.1 phpdoc/docbook/docbook-xsl/html/verbatim.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/verbatim.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/verbatim.xsl Tue Jan 30 18:16:38 2007 @@ -8,7 +8,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: verbatim.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: verbatim.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -51,14 +51,16 @@ <xsl:variable name="rtf"> <xsl:call-template name="apply-highlighting"/> </xsl:variable> - <pre class="{name(.)}"> + <pre> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="number.rtf.lines"> <xsl:with-param name="rtf" select="$rtf"/> </xsl:call-template> </pre> </xsl:when> <xsl:otherwise> - <pre class="{name(.)}"> + <pre> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="apply-highlighting"/> </pre> </xsl:otherwise> @@ -91,14 +93,16 @@ and $linenumbering.extension != '0'"> <xsl:choose> <xsl:when test="@class='monospaced'"> - <pre class="{name(.)}"> + <pre> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="number.rtf.lines"> <xsl:with-param name="rtf" select="$rtf"/> </xsl:call-template> </pre> </xsl:when> <xsl:otherwise> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <p> <xsl:call-template name="number.rtf.lines"> <xsl:with-param name="rtf" select="$rtf"/> @@ -111,12 +115,14 @@ <xsl:otherwise> <xsl:choose> <xsl:when test="@class='monospaced'"> - <pre class="{name(.)}"> + <pre> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:copy-of select="$rtf"/> </pre> </xsl:when> <xsl:otherwise> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <p> <xsl:call-template name="make-verbatim"> <xsl:with-param name="rtf" select="$rtf"/> @@ -141,7 +147,8 @@ and @linenumbering = 'numbered' and $use.extensions != '0' and $linenumbering.extension != '0'"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <p> <xsl:call-template name="number.rtf.lines"> <xsl:with-param name="rtf" select="$rtf"/> @@ -151,7 +158,8 @@ </xsl:when> <xsl:otherwise> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <p> <xsl:call-template name="make-verbatim"> <xsl:with-param name="rtf" select="$rtf"/> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/xref.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/xref.xsl diff -u phpdoc/docbook/docbook-xsl/html/xref.xsl:1.1 phpdoc/docbook/docbook-xsl/html/xref.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/xref.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/xref.xsl Tue Jan 30 18:16:38 2007 @@ -2,11 +2,12 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:suwl="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.UnwrapLinks" xmlns:exsl="http://exslt.org/common" + xmlns:xlink='http://www.w3.org/1999/xlink' exclude-result-prefixes="suwl exsl" version='1.0'> <!-- ******************************************************************** - $Id: xref.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: xref.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -24,103 +25,92 @@ <!-- ==================================================================== --> <xsl:template match="xref" name="xref"> - <xsl:param name="targets" select="key('id',@linkend)"/> - <xsl:param name="target" select="$targets[1]"/> - <xsl:param name="refelem" select="local-name($target)"/> + <xsl:param name="xhref" select="@xlink:href"/> + <!-- is the @xlink:href a local idref link? --> + <xsl:param name="xlink.idref"> + <xsl:if test="starts-with($xhref,'#') + and (not(contains($xhref,'(')) + or starts-with($xhref, '#xpointer(id('))"> + <xsl:call-template name="xpointer.idref"> + <xsl:with-param name="xpointer" select="$xhref"/> + </xsl:call-template> + </xsl:if> + </xsl:param> + <xsl:param name="xlink.targets" select="key('id',$xlink.idref)"/> + <xsl:param name="linkend.targets" select="key('id',@linkend)"/> + <xsl:param name="target" select="($xlink.targets | $linkend.targets)[1]"/> - <xsl:call-template name="check.id.unique"> - <xsl:with-param name="linkend" select="@linkend"/> - </xsl:call-template> + <xsl:variable name="xrefstyle"> + <xsl:choose> + <xsl:when test="@role and not(@xrefstyle) + 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:variable> <xsl:call-template name="anchor"/> - <xsl:choose> - <xsl:when test="count($target) = 0"> - <xsl:message> - <xsl:text>XRef to nonexistent id: </xsl:text> - <xsl:value-of select="@linkend"/> - </xsl:message> - <xsl:text>???</xsl:text> - </xsl:when> - - <xsl:when test="@endterm"> - <xsl:variable name="href"> - <xsl:call-template name="href.target"> - <xsl:with-param name="object" select="$target"/> - </xsl:call-template> - </xsl:variable> - - <xsl:variable name="etargets" select="key('id',@endterm)"/> - <xsl:variable name="etarget" select="$etargets[1]"/> - <xsl:choose> - <xsl:when test="count($etarget) = 0"> - <xsl:message> - <xsl:value-of select="count($etargets)"/> - <xsl:text>Endterm points to nonexistent ID: </xsl:text> - <xsl:value-of select="@endterm"/> - </xsl:message> - <a href="{$href}"> + <xsl:variable name="content"> + <xsl:choose> + + <xsl:when test="@endterm"> + <xsl:variable name="etargets" select="key('id',@endterm)"/> + <xsl:variable name="etarget" select="$etargets[1]"/> + <xsl:choose> + <xsl:when test="count($etarget) = 0"> + <xsl:message> + <xsl:value-of select="count($etargets)"/> + <xsl:text>Endterm points to nonexistent ID: </xsl:text> + <xsl:value-of select="@endterm"/> + </xsl:message> <xsl:text>???</xsl:text> - </a> - </xsl:when> - <xsl:otherwise> - <a href="{$href}"> + </xsl:when> + <xsl:otherwise> <xsl:apply-templates select="$etarget" mode="endterm"/> - </a> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - - <xsl:when test="$target/@xreflabel"> - <a> - <xsl:attribute name="href"> - <xsl:call-template name="href.target"> - <xsl:with-param name="object" select="$target"/> - </xsl:call-template> - </xsl:attribute> + </xsl:otherwise> + </xsl:choose> + </xsl:when> + + <xsl:when test="$target/@xreflabel"> <xsl:call-template name="xref.xreflabel"> <xsl:with-param name="target" select="$target"/> </xsl:call-template> - </a> - </xsl:when> - - <xsl:otherwise> - <xsl:variable name="href"> - <xsl:call-template name="href.target"> - <xsl:with-param name="object" select="$target"/> - </xsl:call-template> - </xsl:variable> - - <xsl:if test="not(parent::citation)"> - <xsl:apply-templates select="$target" mode="xref-to-prefix"/> - </xsl:if> - - <a href="{$href}"> - <xsl:if test="$target/title or $target/*/title"> - <xsl:attribute name="title"> - <xsl:apply-templates select="$target" mode="xref-title"/> - </xsl:attribute> + </xsl:when> + + <xsl:when test="$target"> + <xsl:if test="not(parent::citation)"> + <xsl:apply-templates select="$target" mode="xref-to-prefix"/> </xsl:if> + <xsl:apply-templates select="$target" mode="xref-to"> <xsl:with-param name="referrer" select="."/> - <xsl:with-param name="xrefstyle"> - <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="xrefstyle" select="$xrefstyle"/> </xsl:apply-templates> - </a> + + <xsl:if test="not(parent::citation)"> + <xsl:apply-templates select="$target" mode="xref-to-suffix"/> + </xsl:if> + </xsl:when> + + <xsl:otherwise> + <xsl:message> + <xsl:text>ERROR: xref linking to </xsl:text> + <xsl:value-of select="@linkend|@xlink:href"/> + <xsl:text> has no generated link text.</xsl:text> + </xsl:message> + <xsl:text>???</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content" select="$content"/> + </xsl:call-template> - <xsl:if test="not(parent::citation)"> - <xsl:apply-templates select="$target" mode="xref-to-suffix"/> - </xsl:if> - </xsl:otherwise> - </xsl:choose> </xsl:template> <!-- ==================================================================== --> @@ -254,6 +244,8 @@ <xsl:choose> <xsl:when test="(@name and count(@*) = 1) or (@id and count(@*) = 1) + or (@xml:id and count(@*) = 1) + or (@xml:id and @name and count(@*) = 2) or (@id and @name and count(@*) = 2)"> <xsl:message>suppress anchor</xsl:message> <!-- suppress the whole thing --> @@ -262,11 +254,12 @@ <xsl:copy> <xsl:for-each select="@*"> <xsl:choose> - <xsl:when test="name(.) != 'name' and name(.) != 'id'"> + <xsl:when test="local-name(.) != 'name' and local-name(.) != 'id'"> <xsl:copy/> </xsl:when> <xsl:otherwise> - <xsl:message>removing <xsl:value-of select="name(.)"/></xsl:message> + <xsl:message>removing <xsl:value-of + select="local-name(.)"/></xsl:message> </xsl:otherwise> </xsl:choose> </xsl:for-each> @@ -279,11 +272,12 @@ <xsl:copy> <xsl:for-each select="@*"> <xsl:choose> - <xsl:when test="name(.) != 'id'"> + <xsl:when test="local-name(.) != 'id'"> <xsl:copy/> </xsl:when> <xsl:otherwise> - <xsl:message>removing <xsl:value-of select="name(.)"/></xsl:message> + <xsl:message>removing <xsl:value-of + select="local-name(.)"/></xsl:message> </xsl:otherwise> </xsl:choose> </xsl:for-each> @@ -308,7 +302,7 @@ <xsl:text>Don't know what gentext to create for xref to: "</xsl:text> <xsl:value-of select="name(.)"/> <xsl:text>", ("</xsl:text> - <xsl:value-of select="@id"/> + <xsl:value-of select="(@id|@xml:id)[1]"/> <xsl:text>")</xsl:text> </xsl:message> </xsl:if> @@ -465,8 +459,9 @@ <xsl:choose> <xsl:when test="string(.) = ''"> <xsl:variable name="bib" select="document($bibliography.collection,.)"/> - <xsl:variable name="id" select="@id"/> - <xsl:variable name="entry" select="$bib/bibliography/*[@id=$id][1]"/> + <xsl:variable name="id" select="(@id|@xml:id)[1]"/> + <xsl:variable name="entry" select="$bib/bibliography/ + *[@id=$id or @xml:id=$id][1]"/> <xsl:choose> <xsl:when test="$entry"> <xsl:choose> @@ -478,7 +473,7 @@ <xsl:apply-templates select="$entry/*[1]"/> </xsl:when> <xsl:otherwise> - <xsl:value-of select="@id"/> + <xsl:value-of select="(@id|@xml:id)[1]"/> </xsl:otherwise> </xsl:choose> </xsl:when> @@ -489,7 +484,7 @@ <xsl:text> found in </xsl:text> <xsl:value-of select="$bibliography.collection"/> </xsl:message> - <xsl:value-of select="@id"/> + <xsl:value-of select="(@id|@xml:id)[1]"/> </xsl:otherwise> </xsl:choose> </xsl:when> @@ -503,7 +498,7 @@ <xsl:apply-templates select="*[1]"/> </xsl:when> <xsl:otherwise> - <xsl:value-of select="@id"/> + <xsl:value-of select="(@id|@xml:id)[1]"/> </xsl:otherwise> </xsl:choose> </xsl:otherwise> @@ -864,7 +859,7 @@ <xsl:apply-templates select="*[1]"/> </xsl:when> <xsl:otherwise> - <xsl:value-of select="@id"/> + <xsl:value-of select="(@id|@xml:id)[1]"/> </xsl:otherwise> </xsl:choose> <xsl:text>]</xsl:text> @@ -895,53 +890,8 @@ <xsl:param name="linkend" select="@linkend"/> <xsl:param name="a.target"/> - <xsl:variable name="targets" select="key('id',$linkend)"/> - <xsl:variable name="target" select="$targets[1]"/> - - <xsl:call-template name="check.id.unique"> - <xsl:with-param name="linkend" select="$linkend"/> - </xsl:call-template> - - <a> - <xsl:if test="@id"> - <xsl:attribute name="name"><xsl:value-of select="@id"/></xsl:attribute> - </xsl:if> - - <xsl:if test="$a.target"> - <xsl:attribute name="target"><xsl:value-of select="$a.target"/></xsl:attribute> - </xsl:if> - - <xsl:attribute name="href"> - <xsl:call-template name="href.target"> - <xsl:with-param name="object" select="$target"/> - </xsl:call-template> - </xsl:attribute> - - <!-- FIXME: is there a better way to tell what elements have a title? --> - <xsl:if test="local-name($target) = 'book' - or local-name($target) = 'set' - or local-name($target) = 'chapter' - or local-name($target) = 'preface' - or local-name($target) = 'appendix' - or local-name($target) = 'bibliography' - or local-name($target) = 'glossary' - or local-name($target) = 'index' - or local-name($target) = 'part' - or local-name($target) = 'refentry' - or local-name($target) = 'reference' - or local-name($target) = 'example' - or local-name($target) = 'equation' - or local-name($target) = 'table' - or local-name($target) = 'figure' - or local-name($target) = 'simplesect' - or starts-with(local-name($target),'sect') - or starts-with(local-name($target),'refsect')"> - <xsl:attribute name="title"> - <xsl:apply-templates select="$target" - mode="object.title.markup.textonly"/> - </xsl:attribute> - </xsl:if> - + <xsl:variable name="content"> + <xsl:call-template name="anchor"/> <xsl:choose> <xsl:when test="count(child::node()) > 0"> <!-- If it has content, use it --> @@ -972,23 +922,31 @@ <xsl:message> <xsl:text>Link element has no content and no Endterm. </xsl:text> <xsl:text>Nothing to show in the link to </xsl:text> - <xsl:value-of select="$target"/> + <xsl:value-of select="(@xlink:href|@linkend)[1]"/> </xsl:message> <xsl:text>???</xsl:text> </xsl:otherwise> </xsl:choose> </xsl:otherwise> </xsl:choose> - </a> + </xsl:variable> + + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="node" select="."/> + <xsl:with-param name="linkend" select="$linkend"/> + <xsl:with-param name="content" select="$content"/> + <xsl:with-param name="a.target" select="$a.target"/> + </xsl:call-template> + </xsl:template> <xsl:template match="ulink" name="ulink"> <xsl:param name="url" select="@url"/> <xsl:variable name="link"> <a> - <xsl:if test="@id"> + <xsl:if test="@id or @xml:id"> <xsl:attribute name="name"> - <xsl:value-of select="@id"/> + <xsl:value-of select="(@id|@xml:id)[1]"/> </xsl:attribute> </xsl:if> <xsl:attribute name="href"><xsl:value-of select="$url"/></xsl:attribute> @@ -1198,7 +1156,8 @@ <xsl:variable name="node-href"> <xsl:choose> <xsl:when test="$localinfo != ''"> - <xsl:variable name="node" select="$outline//*[@id=$localinfo]"/> + <xsl:variable name="node" select="$outline// + *[@id=$localinfo or @xml:id=$localinfo]"/> <xsl:value-of select="$node/@href"/> </xsl:when> <xsl:otherwise> @@ -1210,7 +1169,8 @@ <xsl:variable name="node-xref"> <xsl:choose> <xsl:when test="$localinfo != ''"> - <xsl:variable name="node" select="$outline//*[@id=$localinfo]"/> + <xsl:variable name="node" select="$outline// + *[@id=$localinfo or @xml:id=$localinfo]"/> <xsl:copy-of select="$node/xref"/> </xsl:when> <xsl:otherwise> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/titlepage.templates.xml?view=markup&rev=1.1 Index: phpdoc/docbook/docbook-xsl/html/titlepage.templates.xml +++ phpdoc/docbook/docbook-xsl/html/titlepage.templates.xml <t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0" xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <!-- ==================================================================== --> <t:titlepage t:element="article" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title/> <subtitle/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> <hr/> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <!-- ==================================================================== --> <t:titlepage t:element="set" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title/> <subtitle/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> <hr/> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <!-- ==================================================================== --> <t:titlepage t:element="book" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title/> <subtitle/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> <hr/> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <!-- ==================================================================== --> <t:titlepage t:element="part" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title t:force="1" t:named-template="division.title" param:node="ancestor-or-self::part[1]"/> <subtitle/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <t:titlepage t:element="partintro" t:wrapper="div"> <t:titlepage-content t:side="recto"> <title/> <subtitle/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <!-- ==================================================================== --> <t:titlepage t:element="reference" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title/> <subtitle/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> <hr/> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <!-- ==================================================================== --> <t:titlepage t:element="refentry" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <!-- uncomment this if you want refentry titlepages <title t:force="1" t:named-template="refentry.title" param:node="ancestor-or-self::refentry[1]"/> --> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator/> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <!-- ==================================================================== --> <t:titlepage t:element="dedication" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title t:force="1" t:named-template="component.title" param:node="ancestor-or-self::dedication[1]"/> <subtitle/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <!-- ==================================================================== --> <t:titlepage t:element="preface" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title/> <subtitle/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <!-- ==================================================================== --> <t:titlepage t:element="chapter" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title/> <subtitle/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <!-- ==================================================================== --> <t:titlepage t:element="appendix" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title/> <subtitle/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <!-- ==================================================================== --> <t:titlepage t:element="section" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title/> <subtitle/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> <xsl:if test="count(parent::*)='0'"><hr/></xsl:if> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <t:titlepage t:element="sect1" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title/> <subtitle/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> <xsl:if test="count(parent::*)='0'"><hr/></xsl:if> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <t:titlepage t:element="sect2" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title/> <subtitle/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> <xsl:if test="count(parent::*)='0'"><hr/></xsl:if> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <t:titlepage t:element="sect3" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title/> <subtitle/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> <xsl:if test="count(parent::*)='0'"><hr/></xsl:if> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <t:titlepage t:element="sect4" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title/> <subtitle/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> <xsl:if test="count(parent::*)='0'"><hr/></xsl:if> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <t:titlepage t:element="sect5" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title/> <subtitle/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> <xsl:if test="count(parent::*)='0'"><hr/></xsl:if> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <t:titlepage t:element="simplesect" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title/> <subtitle/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> <xsl:if test="count(parent::*)='0'"><hr/></xsl:if> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <!-- ==================================================================== --> <t:titlepage t:element="bibliography" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title t:force="1" t:named-template="component.title" param:node="ancestor-or-self::bibliography[1]"/> <subtitle/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <!-- ==================================================================== --> <t:titlepage t:element="glossary" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title t:force="1" t:named-template="component.title" param:node="ancestor-or-self::glossary[1]"/> <subtitle/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <!-- ==================================================================== --> <t:titlepage t:element="index" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title t:force="1" t:named-template="component.title" param:node="ancestor-or-self::index[1]"/> <subtitle/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <!-- ==================================================================== --> <t:titlepage t:element="setindex" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title t:force="1" t:named-template="component.title" param:node="ancestor-or-self::setindex[1]"/> <subtitle/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <!-- ==================================================================== --> </t:templates>
http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/admon.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/admon.xsl diff -u phpdoc/docbook/docbook-xsl/html/admon.xsl:1.1 phpdoc/docbook/docbook-xsl/html/admon.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/admon.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/admon.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: admon.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: admon.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -60,7 +60,8 @@ </xsl:call-template> </xsl:variable> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="$admon.style != ''"> <xsl:attribute name="style"> <xsl:value-of select="$admon.style"/> @@ -70,9 +71,9 @@ <table border="0"> <xsl:attribute name="summary"> <xsl:value-of select="$admon.type"/> - <xsl:if test="title"> + <xsl:if test="title|info/title"> <xsl:text>: </xsl:text> - <xsl:value-of select="title"/> + <xsl:value-of select="(title|info/title)[1]"/> </xsl:if> </xsl:attribute> <tr> @@ -88,7 +89,7 @@ </td> <th align="left"> <xsl:call-template name="anchor"/> - <xsl:if test="$admon.textlabel != 0 or title"> + <xsl:if test="$admon.textlabel != 0 or title or info/title"> <xsl:apply-templates select="." mode="object.title.markup"/> </xsl:if> </th> @@ -103,7 +104,8 @@ </xsl:template> <xsl:template name="nongraphical.admonition"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="$admon.style"> <xsl:attribute name="style"> <xsl:value-of select="$admon.style"/> @@ -112,7 +114,7 @@ <h3 class="title"> <xsl:call-template name="anchor"/> - <xsl:if test="$admon.textlabel != 0 or title"> + <xsl:if test="$admon.textlabel != 0 or title or info/title"> <xsl:apply-templates select="." mode="object.title.markup"/> </xsl:if> </h3> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/annotations.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/annotations.xsl diff -u phpdoc/docbook/docbook-xsl/html/annotations.xsl:1.1 phpdoc/docbook/docbook-xsl/html/annotations.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/annotations.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/annotations.xsl Tue Jan 30 18:16:38 2007 @@ -8,7 +8,7 @@ <xsl:when test="contains($scripts, ' ')"> <script type="text/javascript" src="{substring-before($scripts, ' ')}"/> <xsl:call-template name="add.annotation.links"> - <xsl:with-param name="scripts" select="substring-after($scripts, ' ')"/> + <xsl:with-param name="scripts" select="substring-after($scripts, ' ')"/> </xsl:call-template> </xsl:when> <xsl:otherwise> @@ -27,18 +27,18 @@ <xsl:variable name="aids"> <xsl:for-each select="//annotation"> <xsl:if test="@annotates=$id - or starts-with(@annotates, concat($id, ' ')) - or contains(@annotates, concat(' ', $id, ' ')) - or substring(@annotates, string-length(@annotates)-3) - = concat(' ', $id)"> - <xsl:value-of select="generate-id()"/> - <xsl:text> </xsl:text> + or starts-with(@annotates, concat($id, ' ')) + or contains(@annotates, concat(' ', $id, ' ')) + or substring(@annotates, string-length(@annotates)-3) + = concat(' ', $id)"> + <xsl:value-of select="generate-id()"/> + <xsl:text> </xsl:text> </xsl:if> </xsl:for-each> <xsl:if test="normalize-space(@annotations) != ''"> <xsl:call-template name="annotations-pointed-to"> - <xsl:with-param name="annotations" - select="normalize-space(@annotations)"/> + <xsl:with-param name="annotations" + select="normalize-space(@annotations)"/> </xsl:call-template> </xsl:if> </xsl:variable> @@ -56,22 +56,22 @@ <xsl:choose> <xsl:when test="contains($annotations, ' ')"> <xsl:variable name='a' - select="key('id', substring-before($annotations, ' '))"/> + select="key('id', substring-before($annotations, ' '))"/> <xsl:if test="$a"> - <xsl:value-of select="generate-id($a)"/> - <xsl:text> </xsl:text> + <xsl:value-of select="generate-id($a)"/> + <xsl:text> </xsl:text> </xsl:if> <xsl:call-template name="annotations-pointed-to"> - <xsl:with-param name="annotations" - select="substring-after($annotations, ' ')"/> + <xsl:with-param name="annotations" + select="substring-after($annotations, ' ')"/> </xsl:call-template> </xsl:when> <xsl:otherwise> <xsl:variable name='a' - select="key('id', $annotations)"/> + select="key('id', $annotations)"/> <xsl:if test="$a"> - <xsl:value-of select="generate-id($a)"/> - <xsl:text> </xsl:text> + <xsl:value-of select="generate-id($a)"/> + <xsl:text> </xsl:text> </xsl:if> </xsl:otherwise> </xsl:choose> @@ -84,15 +84,15 @@ <xsl:when test="contains($gids, ' ')"> <xsl:variable name="gid" select="substring-before($gids, ' ')"/> <xsl:apply-templates select="key('gid', $gid)" - mode="annotation-inline"/> + mode="annotation-inline"/> <xsl:call-template name="apply-annotations-by-gid"> - <xsl:with-param name="gids" - select="substring-after($gids, ' ')"/> + <xsl:with-param name="gids" + select="substring-after($gids, ' ')"/> </xsl:call-template> </xsl:when> <xsl:otherwise> <xsl:apply-templates select="key('gid', $gids)" - mode="annotation-inline"/> + mode="annotation-inline"/> </xsl:otherwise> </xsl:choose> </xsl:template> @@ -101,12 +101,12 @@ <xsl:variable name="title"> <xsl:choose> <xsl:when test="title"> - <xsl:value-of select="title"/> + <xsl:value-of select="title"/> </xsl:when> <xsl:otherwise> - <xsl:text>[Annotation #</xsl:text> - <xsl:number count="annotation" level="any" format="1"/> - <xsl:text>]</xsl:text> + <xsl:text>[Annotation #</xsl:text> + <xsl:number count="annotation" level="any" format="1"/> + <xsl:text>]</xsl:text> </xsl:otherwise> </xsl:choose> </xsl:variable> @@ -145,7 +145,7 @@ </div> <div class="annotation-close"> <a href="#" onclick="popup_{generate-id(.)}.hidePopup();return false;"> - <img src="{$annotation.graphic.close}" alt="X" border="0"/> + <img src="{$annotation.graphic.close}" alt="X" border="0"/> </a> </div> </div> @@ -155,10 +155,10 @@ <div class="annotation-title"> <xsl:choose> <xsl:when test="title"> - <xsl:apply-templates select="title/node()"/> + <xsl:apply-templates select="title/node()"/> </xsl:when> <xsl:otherwise> - <xsl:text>Annotation</xsl:text> + <xsl:text>Annotation</xsl:text> </xsl:otherwise> </xsl:choose> </div> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/autoidx-kimber.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/autoidx-kimber.xsl diff -u phpdoc/docbook/docbook-xsl/html/autoidx-kimber.xsl:1.1 phpdoc/docbook/docbook-xsl/html/autoidx-kimber.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/autoidx-kimber.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/autoidx-kimber.xsl Tue Jan 30 18:16:38 2007 @@ -19,7 +19,7 @@ version="1.0"> <!-- ******************************************************************** - $Id: autoidx-kimber.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: autoidx-kimber.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/autoidx-kosek.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/autoidx-kosek.xsl diff -u phpdoc/docbook/docbook-xsl/html/autoidx-kosek.xsl:1.1 phpdoc/docbook/docbook-xsl/html/autoidx-kosek.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/autoidx-kosek.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/autoidx-kosek.xsl Tue Jan 30 18:16:38 2007 @@ -20,7 +20,7 @@ version="1.0"> <!-- ******************************************************************** - $Id: autoidx-kosek.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: autoidx-kosek.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/autoidx-ng.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/autoidx-ng.xsl diff -u phpdoc/docbook/docbook-xsl/html/autoidx-ng.xsl:1.1 phpdoc/docbook/docbook-xsl/html/autoidx-ng.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/autoidx-ng.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/autoidx-ng.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version="1.0"> <!-- ******************************************************************** - $Id: autoidx-ng.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: autoidx-ng.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the DocBook XSL Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/autoidx.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/autoidx.xsl diff -u phpdoc/docbook/docbook-xsl/html/autoidx.xsl:1.1 phpdoc/docbook/docbook-xsl/html/autoidx.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/autoidx.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/autoidx.xsl Tue Jan 30 18:16:38 2007 @@ -1,45 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE xsl:stylesheet [ - -<!ENTITY lowercase "'AaÀàÁáÂâÃãÄäÅåĀāĂ㥹ǍǎǞǟǠǡǺǻȀȁȂȃȦȧḀḁẚẠạẢảẤấẦầẨẩẪẫẬậẮắẰằẲẳẴẵẶặBbƀƁɓƂƃḂḃḄḅḆḇCcÇçĆćĈĉĊċČčƇƈɕḈḉDdĎďĐđƊɗƋƌDžDzȡɖḊḋḌḍḎḏḐḑḒḓEeÈèÉéÊêËëĒēĔĕĖėĘęĚěȄȅȆȇȨȩḔḕḖḗḘḙḚḛḜḝẸẹẺẻẼẽẾế! ỀềỂểỄễỆệFfƑƒḞḟGgĜĝĞğĠġĢģƓɠǤǥǦǧǴǵḠḡHhĤĥĦħȞȟɦḢḣḤḥḦḧḨḩḪḫẖIiÌìÍíÎîÏïĨĩĪīĬĭĮįİƗɨǏǐȈȉȊȋḬḭḮḯỈỉỊịJjĴĵǰʝKkĶķƘƙǨǩḰḱḲḳḴḵLlĹĺĻļĽľĿŀŁłƚLjȴɫɬɭḶḷḸḹḺḻḼḽMmɱḾḿṀṁṂṃNnÑñŃńŅņŇňƝɲƞȠNjǸǹȵɳṄṅṆṇṈṉṊ! ṋOoÒòÓóÔôÕõÖö& #216;øŌōŎŏŐőƟƠơǑǒǪǫǬǭǾǿȌȍȎȏȪȫȬȭȮȯȰȱṌṍṎṏṐṑṒṓỌọỎỏỐốỒồỔổỖỗỘộỚớỜờỞởỠỡỢợPpƤƥṔṕṖṗQqʠRrŔŕŖŗŘřȐȑȒȓɼɽɾṘṙṚṛṜṝṞṟSsŚśŜŝŞşŠšȘșʂṠṡṢṣṤṥṦṧṨṩTtŢţŤťŦŧƫƬƭƮʈȚțȶṪṫṬṭṮṯṰṱẗUuÙùÚúÛûÜüŨũŪūŬŭŮůŰ! 69;ŲųƯưǓǔǕǖǗǘǙǚǛǜȔȕȖȗṲṳṴṵṶṷṸṹṺṻỤụỦủỨứỪừỬửỮữỰự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))'> +<!ENTITY % common.entities SYSTEM "../common/entities.ent"> +%common.entities; ]> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exslt="http://exslt.org/common" @@ -48,7 +10,7 @@ version="1.0"> <!-- ******************************************************************** - $Id: autoidx.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: autoidx.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -105,7 +67,7 @@ match="indexterm[see]" use="concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, see)"/> -<xsl:key name="sections" match="*[@id]" use="@id"/> +<xsl:key name="sections" match="*[@id or @xml:id]" use="@id|@xml:id"/> <xsl:template name="generate-index"> @@ -520,8 +482,9 @@ <xsl:value-of select="$title"/> <!-- text only --> </a> - <xsl:if test="key('endofrange', @id)[&scope;]"> - <xsl:apply-templates select="key('endofrange', @id)[&scope;][last()]" + <xsl:variable name="id" select="(@id|@xml:id)[1]"/> + <xsl:if test="key('endofrange', $id)[&scope;]"> + <xsl:apply-templates select="key('endofrange', $id)[&scope;][last()]" mode="reference"> <xsl:with-param name="position" select="position()"/> <xsl:with-param name="scope" select="$scope"/> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/autotoc.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/autotoc.xsl diff -u phpdoc/docbook/docbook-xsl/html/autotoc.xsl:1.1 phpdoc/docbook/docbook-xsl/html/autotoc.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/autotoc.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/autotoc.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: autotoc.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: autotoc.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -32,6 +32,8 @@ <xsl:param name="toc.title.p" select="true()"/> <xsl:param name="nodes" select="/NOT-AN-ELEMENT"/> + <xsl:variable name="nodes.plus" select="$nodes | qandaset"/> + <xsl:variable name="toc.title"> <xsl:if test="$toc.title.p"> <p> @@ -63,16 +65,33 @@ </xsl:if> </xsl:when> <xsl:otherwise> - <xsl:if test="$nodes"> - <div class="toc"> - <xsl:copy-of select="$toc.title"/> - <xsl:element name="{$toc.list.type}"> - <xsl:apply-templates select="$nodes" mode="toc"> - <xsl:with-param name="toc-context" select="$toc-context"/> - </xsl:apply-templates> - </xsl:element> - </div> - </xsl:if> + <xsl:choose> + <xsl:when test="$qanda.in.toc != 0"> + <xsl:if test="$nodes.plus"> + <div class="toc"> + <xsl:copy-of select="$toc.title"/> + <xsl:element name="{$toc.list.type}"> + <xsl:apply-templates select="$nodes.plus" mode="toc"> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:apply-templates> + </xsl:element> + </div> + </xsl:if> + </xsl:when> + <xsl:otherwise> + <xsl:if test="$nodes"> + <div class="toc"> + <xsl:copy-of select="$toc.title"/> + <xsl:element name="{$toc.list.type}"> + <xsl:apply-templates select="$nodes" mode="toc"> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:apply-templates> + </xsl:element> + </div> + </xsl:if> + </xsl:otherwise> + </xsl:choose> + </xsl:otherwise> </xsl:choose> </xsl:template> @@ -109,7 +128,7 @@ <xsl:if test="contains($toc.params, 'equation')"> <xsl:call-template name="list.of.titles"> <xsl:with-param name="titles" select="'equation'"/> - <xsl:with-param name="nodes" select=".//equation[title]"/> + <xsl:with-param name="nodes" select=".//equation[title or info/title]"/> </xsl:call-template> </xsl:if> @@ -199,11 +218,22 @@ <xsl:param name="toc-context" select="."/> <xsl:param name="nodes" select="NOT-AN-ELEMENT"/> + <xsl:variable name="nodes.plus" select="$nodes | qandaset"/> + <xsl:variable name="subtoc"> <xsl:element name="{$toc.list.type}"> - <xsl:apply-templates mode="toc" select="$nodes"> - <xsl:with-param name="toc-context" select="$toc-context"/> - </xsl:apply-templates> + <xsl:choose> + <xsl:when test="$qanda.in.toc != 0"> + <xsl:apply-templates mode="toc" select="$nodes.plus"> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates mode="toc" select="$nodes"> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:apply-templates> + </xsl:otherwise> + </xsl:choose> </xsl:element> </xsl:variable> @@ -261,13 +291,17 @@ <xsl:with-param name="toc-context" select="$toc-context"/> </xsl:call-template> <xsl:if test="$toc.listitem.type = 'li' - and $toc.section.depth > $depth and count($nodes)>0 + and $toc.section.depth > $depth and + ( ($qanda.in.toc = 0 and count($nodes)>0) or + ($qanda.in.toc != 0 and count($nodes.plus)>0) ) and $toc.max.depth > $depth.from.context"> <xsl:copy-of select="$subtoc.list"/> </xsl:if> </xsl:element> <xsl:if test="$toc.listitem.type != 'li' - and $toc.section.depth > $depth and count($nodes)>0 + and $toc.section.depth > $depth and + ( ($qanda.in.toc = 0 and count($nodes)>0) or + ($qanda.in.toc != 0 and count($nodes.plus)>0) ) and $toc.max.depth > $depth.from.context"> <xsl:copy-of select="$subtoc.list"/> </xsl:if> @@ -617,5 +651,18 @@ </xsl:element> </xsl:template> +<!-- Used only if qanda.in.toc parameter is non-zero --> +<xsl:template match="qandaset" mode="toc"> + <xsl:param name="toc-context" select="."/> + <xsl:call-template name="subtoc"> + <xsl:with-param name="toc-context" select="$toc-context"/> + <xsl:with-param name="nodes" select="qandadiv | qandaentry"/> + </xsl:call-template> +</xsl:template> + +<xsl:template match="qandadiv|qandaentry" mode="toc"> + <xsl:apply-templates select="." mode="qandatoc.mode"/> +</xsl:template> + </xsl:stylesheet> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/biblio.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/biblio.xsl diff -u phpdoc/docbook/docbook-xsl/html/biblio.xsl:1.1 phpdoc/docbook/docbook-xsl/html/biblio.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/biblio.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/biblio.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: biblio.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: biblio.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -17,7 +17,8 @@ <xsl:template match="bibliography"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -35,6 +36,7 @@ </xsl:template> <xsl:template match="bibliography/bibliographyinfo"></xsl:template> +<xsl:template match="bibliography/info"></xsl:template> <xsl:template match="bibliography/title"></xsl:template> <xsl:template match="bibliography/subtitle"></xsl:template> <xsl:template match="bibliography/titleabbrev"></xsl:template> @@ -44,13 +46,15 @@ <xsl:template match="bibliodiv"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </div> </xsl:template> <xsl:template match="bibliodiv/title"> - <h3 class="{name(.)}"> + <h3> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"> <xsl:with-param name="node" select=".."/> </xsl:call-template> @@ -61,16 +65,18 @@ <!-- ==================================================================== --> <xsl:template match="bibliolist"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> - <xsl:if test="blockinfo/title|title"> + <xsl:if test="blockinfo/title|info/title|title"> <xsl:call-template name="formal.object.heading"/> </xsl:if> <xsl:apply-templates select="*[not(self::blockinfo) - and not(self::title) - and not(self::titleabbrev) - and not(self::biblioentry) - and not(self::bibliomixed)]"/> + and not(self::info) + and not(self::title) + and not(self::titleabbrev) + and not(self::biblioentry) + and not(self::bibliomixed)]"/> <xsl:apply-templates select="biblioentry|bibliomixed"/> </div> </xsl:template> @@ -89,19 +95,20 @@ <xsl:choose> <xsl:when test="string(.) = ''"> <xsl:variable name="bib" select="document($bibliography.collection,.)"/> - <xsl:variable name="entry" select="$bib/bibliography/*[@id=$id][1]"/> + <xsl:variable name="entry" select="$bib/bibliography/ + *[@id=$id or @xml:id=$id][1]"/> <xsl:choose> <xsl:when test="$entry"> - <xsl:choose> - <xsl:when test="$bibliography.numbered != 0"> - <xsl:apply-templates select="$entry"> - <xsl:with-param name="label" select="$label"/> - </xsl:apply-templates> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="$entry"/> - </xsl:otherwise> - </xsl:choose> + <xsl:choose> + <xsl:when test="$bibliography.numbered != 0"> + <xsl:apply-templates select="$entry"> + <xsl:with-param name="label" select="$label"/> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="$entry"/> + </xsl:otherwise> + </xsl:choose> </xsl:when> <xsl:otherwise> <xsl:message> @@ -110,10 +117,11 @@ <xsl:text> found in </xsl:text> <xsl:value-of select="$bibliography.collection"/> </xsl:message> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <p> - <xsl:copy-of select="$label"/> + <xsl:copy-of select="$label"/> <xsl:text>Error: no bibliography entry: </xsl:text> <xsl:value-of select="$id"/> <xsl:text> found in </xsl:text> @@ -124,12 +132,13 @@ </xsl:choose> </xsl:when> <xsl:otherwise> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"> - <xsl:with-param name="conditional" select="0"/> - </xsl:call-template> + <xsl:with-param name="conditional" select="0"/> + </xsl:call-template> <p> - <xsl:copy-of select="$label"/> + <xsl:copy-of select="$label"/> <xsl:apply-templates mode="bibliography.mode"/> </p> </div> @@ -149,19 +158,20 @@ <xsl:choose> <xsl:when test="string(.) = ''"> <xsl:variable name="bib" select="document($bibliography.collection,.)"/> - <xsl:variable name="entry" select="$bib/bibliography/*[@id=$id][1]"/> + <xsl:variable name="entry" select="$bib/bibliography/ + *[@id=$id or @xml:id=$id][1]"/> <xsl:choose> <xsl:when test="$entry"> - <xsl:choose> - <xsl:when test="$bibliography.numbered != 0"> - <xsl:apply-templates select="$entry"> - <xsl:with-param name="label" select="$label"/> - </xsl:apply-templates> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="$entry"/> - </xsl:otherwise> - </xsl:choose> + <xsl:choose> + <xsl:when test="$bibliography.numbered != 0"> + <xsl:apply-templates select="$entry"> + <xsl:with-param name="label" select="$label"/> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="$entry"/> + </xsl:otherwise> + </xsl:choose> </xsl:when> <xsl:otherwise> <xsl:message> @@ -170,10 +180,11 @@ <xsl:text> found in </xsl:text> <xsl:value-of select="$bibliography.collection"/> </xsl:message> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <p> - <xsl:copy-of select="$label"/> + <xsl:copy-of select="$label"/> <xsl:text>Error: no bibliography entry: </xsl:text> <xsl:value-of select="$id"/> <xsl:text> found in </xsl:text> @@ -184,12 +195,14 @@ </xsl:choose> </xsl:when> <xsl:otherwise> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"> - <xsl:with-param name="conditional" select="0"/> - </xsl:call-template> - <p class="{name(.)}"> - <xsl:copy-of select="$label"/> + <xsl:with-param name="conditional" select="0"/> + </xsl:call-template> + <p> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:copy-of select="$label"/> <xsl:apply-templates mode="bibliomixed.mode"/> </p> </div> @@ -222,6 +235,11 @@ <xsl:value-of select="$node/@id"/> <xsl:text>] </xsl:text> </xsl:when> + <xsl:when test="$node/@xml:id"> + <xsl:text>[</xsl:text> + <xsl:value-of select="$node/@xml:id"/> + <xsl:text>] </xsl:text> + </xsl:when> <xsl:otherwise><!-- nop --></xsl:otherwise> </xsl:choose> </xsl:template> @@ -243,49 +261,56 @@ </xsl:template> <xsl:template match="address" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="affiliation" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="shortaffil" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="jobtitle" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="artheader|articleinfo|info" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="artpagenums" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="author" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="person.name"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -296,28 +321,32 @@ </xsl:template> <xsl:template match="authorgroup" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="person.name.list"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="authorinitials" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="bibliomisc" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="bibliomset" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -326,7 +355,8 @@ <!-- ================================================== --> <xsl:template match="biblioset" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> </span> </xsl:template> @@ -350,14 +380,16 @@ <!-- ================================================== --> <xsl:template match="bookbiblio" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="citetitle" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:choose> <xsl:when test="@pubwork = 'article'"> <xsl:call-template name="gentext.startquote"/> @@ -373,70 +405,80 @@ </xsl:template> <xsl:template match="collab" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="collabname" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="confgroup" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="confdates" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="conftitle" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="confnum" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="confsponsor" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="contractnum" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="contractsponsor" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="contrib" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -445,7 +487,8 @@ <!-- ================================================== --> <xsl:template match="copyright" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="gentext"> <xsl:with-param name="key" select="'Copyright'"/> </xsl:call-template> @@ -478,133 +521,152 @@ <!-- ================================================== --> <xsl:template match="corpauthor" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="corpcredit" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="corpname" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="date" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="edition" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="editor" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="person.name"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="firstname" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="honorific" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="indexterm" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="invpartnumber" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="isbn" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="issn" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="issuenum" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="lineage" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="orgname" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="orgdiv" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="othercredit" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="othername" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="pagenums" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -615,48 +677,55 @@ </xsl:template> <xsl:template match="productname" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="productnumber" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="pubdate" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="publisher" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> </span> </xsl:template> <xsl:template match="publishername" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="pubsnumber" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="releaseinfo" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -667,48 +736,55 @@ </xsl:template> <xsl:template match="seriesinfo" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> </span> </xsl:template> <xsl:template match="seriesvolnums" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="subtitle" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="surname" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="title" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <i><xsl:apply-templates mode="bibliography.mode"/></i> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="titleabbrev" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="volumenum" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -716,7 +792,8 @@ <xsl:template match="bibliocoverage|biblioid|bibliorelation|bibliosource" mode="bibliography.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -735,67 +812,78 @@ </xsl:template> <xsl:template match="abstract" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="address" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="affiliation" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="shortaffil" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="jobtitle" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="artpagenums" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="author" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="authorblurb|personblurb" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="authorgroup" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="authorinitials" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="bibliomisc" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> @@ -803,7 +891,8 @@ <!-- ================================================== --> <xsl:template match="bibliomset" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> @@ -826,13 +915,15 @@ <!-- ================================================== --> <xsl:template match="biblioset" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="citetitle" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:choose> <xsl:when test="@pubwork = 'article'"> <xsl:call-template name="gentext.startquote"/> @@ -848,193 +939,225 @@ <xsl:template match="collab" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="confgroup" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="contractnum" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="contractsponsor" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="contrib" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="copyright" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="corpauthor" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="corpcredit" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="corpname" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="date" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="edition" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="editor" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="firstname" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="honorific" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="indexterm" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="invpartnumber" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="isbn" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="issn" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="issuenum" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="lineage" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="orgname" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="othercredit" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="othername" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="pagenums" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="printhistory" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="productname" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="productnumber" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="pubdate" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="publisher" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="publishername" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="pubsnumber" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="releaseinfo" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> @@ -1044,44 +1167,51 @@ </xsl:template> <xsl:template match="seriesvolnums" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="subtitle" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="surname" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="title" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="titleabbrev" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="volumenum" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="bibliocoverage|biblioid|bibliorelation|bibliosource" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/block.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/block.xsl diff -u phpdoc/docbook/docbook-xsl/html/block.xsl:1.1 phpdoc/docbook/docbook-xsl/html/block.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/block.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/block.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: block.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: block.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -15,14 +15,15 @@ <!-- ==================================================================== --> <!-- What should we do about styling blockinfo? --> -<xsl:template match="blockinfo"> +<xsl:template match="blockinfo|info"> <!-- suppress --> </xsl:template> <!-- ==================================================================== --> <xsl:template name="block.object"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <xsl:apply-templates/> </div> @@ -58,9 +59,9 @@ <p> <xsl:call-template name="dir"/> <xsl:if test="$class != ''"> - <xsl:attribute name="class"> - <xsl:value-of select="$class"/> - </xsl:attribute> + <xsl:apply-templates select="." mode="class.attribute"> + <xsl:with-param name="class" select="$class"/> + </xsl:apply-templates> </xsl:if> <xsl:copy-of select="$content"/> </p> @@ -82,9 +83,9 @@ <!-- see also listitem/simpara in lists.xsl --> <p> <xsl:if test="@role and $para.propagates.style != 0"> - <xsl:attribute name="class"> - <xsl:value-of select="@role"/> - </xsl:attribute> + <xsl:apply-templates select="." mode="class.attribute"> + <xsl:with-param name="class" select="@role"/> + </xsl:apply-templates> </xsl:if> <xsl:call-template name="anchor"/> @@ -106,7 +107,12 @@ </xsl:call-template> </xsl:template> -<xsl:template match="formalpara/title"> +<!-- Only use title from info --> +<xsl:template match="formalpara/info"> + <xsl:apply-templates select="title"/> +</xsl:template> + +<xsl:template match="formalpara/title|formalpara/info/title"> <xsl:variable name="titleStr"> <xsl:apply-templates/> </xsl:variable> @@ -133,7 +139,8 @@ <!-- ==================================================================== --> <xsl:template match="blockquote"> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="@lang or @xml:lang"> <xsl:call-template name="language.attribute"/> </xsl:if> @@ -161,7 +168,8 @@ </table> </xsl:when> <xsl:otherwise> - <blockquote class="{local-name(.)}"> + <blockquote> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </blockquote> </xsl:otherwise> @@ -169,7 +177,7 @@ </div> </xsl:template> -<xsl:template match="blockquote/title"> +<xsl:template match="blockquote/title|blockquote/info/title"> <div class="blockquote-title"> <p> <b> @@ -180,7 +188,8 @@ </xsl:template> <xsl:template match="epigraph"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates select="para|simpara|formalpara|literallayout"/> <xsl:if test="attribution"> <div class="attribution"> @@ -191,13 +200,17 @@ </xsl:template> <xsl:template match="attribution"> - <span class="{name(.)}"><xsl:apply-templates/></span> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:apply-templates/> + </span> </xsl:template> <!-- ==================================================================== --> <xsl:template match="abstract|sidebar"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <xsl:call-template name="formal.object.heading"> <xsl:with-param name="title"> @@ -213,7 +226,7 @@ <xsl:template match="abstract/title|sidebar/title"> </xsl:template> -<xsl:template match="sidebar/sidebarinfo"/> +<xsl:template match="sidebar/sidebarinfo|sidebar/info"/> <!-- ==================================================================== --> @@ -312,7 +325,8 @@ <!-- ==================================================================== --> <xsl:template match="revhistory"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <table border="0" width="100%" summary="Revision history"> <tr> <th align="left" valign="top" colspan="3"> @@ -359,9 +373,9 @@ <xsl:for-each select="$revauthor"> <xsl:apply-templates select="."/> <xsl:if test="position() != last()"> - <xsl:text>, </xsl:text> - </xsl:if> - </xsl:for-each> + <xsl:text>, </xsl:text> + </xsl:if> + </xsl:for-each> </td> </xsl:otherwise> </xsl:choose> @@ -403,7 +417,8 @@ <!-- ==================================================================== --> <xsl:template match="ackno"> - <p class="{name(.)}"> + <p> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </p> </xsl:template> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/callout.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/callout.xsl diff -u phpdoc/docbook/docbook-xsl/html/callout.xsl:1.1 phpdoc/docbook/docbook-xsl/html/callout.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/callout.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/callout.xsl Tue Jan 30 18:16:38 2007 @@ -7,7 +7,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: callout.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: callout.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -50,7 +50,8 @@ <xsl:choose> <xsl:when test="$verbatim/@linenumbering = 'numbered' and $linenumbering.extension != '0'"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="number.rtf.lines"> <xsl:with-param name="rtf" select="$rtf-with-callouts"/> <xsl:with-param name="pi.context" @@ -60,7 +61,8 @@ </div> </xsl:when> <xsl:otherwise> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:copy-of select="$rtf-with-callouts"/> <xsl:apply-templates select="calloutlist"/> </div> @@ -68,7 +70,8 @@ </xsl:choose> </xsl:when> <xsl:otherwise> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </div> </xsl:otherwise> @@ -93,9 +96,9 @@ <xsl:choose> <xsl:when test="$target"> <a> - <xsl:if test="@id"> + <xsl:if test="@id or @xml:id"> <xsl:attribute name="name"> - <xsl:value-of select="@id"/> + <xsl:value-of select="(@id|@xml:id)[1]"/> </xsl:attribute> </xsl:if> <xsl:attribute name="href"> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/changebars.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/changebars.xsl diff -u phpdoc/docbook/docbook-xsl/html/changebars.xsl:1.1 phpdoc/docbook/docbook-xsl/html/changebars.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/changebars.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/changebars.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version="1.0"> <!-- ******************************************************************** - $Id: changebars.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: changebars.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/chunk-code.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/chunk-code.xsl diff -u phpdoc/docbook/docbook-xsl/html/chunk-code.xsl:1.1 phpdoc/docbook/docbook-xsl/html/chunk-code.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/chunk-code.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/chunk-code.xsl Tue Jan 30 18:16:38 2007 @@ -7,7 +7,7 @@ exclude-result-prefixes="exsl cf ng db"> <!-- ******************************************************************** - $Id: chunk-code.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: chunk-code.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -50,7 +50,8 @@ <xsl:choose> <xsl:when test="$chunk != 0"> - <cf:div class="{local-name(.)}" id="{generate-id()}"> + <cf:div id="{generate-id()}"> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates select="*" mode="find.chunks"/> </cf:div> </xsl:when> @@ -72,15 +73,15 @@ <xsl:variable name="chunks" select="exsl:node-set($chunk.hierarchy)//cf:div"/> <xsl:variable name="genid" select="generate-id()"/> - <xsl:variable name="div" select="$chunks[@id=$genid]"/> + <xsl:variable name="div" select="$chunks[@id=$genid or @xml:id=$genid]"/> <xsl:variable name="prevdiv" select="($div/preceding-sibling::cf:div|$div/preceding::cf:div|$div/parent::cf:div)[last()]"/> - <xsl:variable name="prev" select="key('genid', $prevdiv/@id)"/> + <xsl:variable name="prev" select="key('genid', ($prevdiv/@id|$prevdiv/@xml:id)[1])"/> <xsl:variable name="nextdiv" select="($div/following-sibling::cf:div|$div/following::cf:div|$div/cf:div)[1]"/> - <xsl:variable name="next" select="key('genid', $nextdiv/@id)"/> + <xsl:variable name="next" select="key('genid', ($nextdiv/@id|$nextdiv/@xml:id)[1])"/> <xsl:choose> <xsl:when test="$onechunk != 0 and parent::*"> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/chunk-common.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/chunk-common.xsl diff -u phpdoc/docbook/docbook-xsl/html/chunk-common.xsl:1.1 phpdoc/docbook/docbook-xsl/html/chunk-common.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/chunk-common.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/chunk-common.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version="1.0"> <!-- ******************************************************************** - $Id: chunk-common.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: chunk-common.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -213,8 +213,8 @@ </xsl:when> <!-- if there's no dbhtml filename, and if we're to use IDs as --> <!-- filenames, then use the ID to generate the filename. --> - <xsl:when test="@id and $use.id.as.filename != 0"> - <xsl:value-of select="@id"/> + <xsl:when test="(@id or @xml:id) and $use.id.as.filename != 0"> + <xsl:value-of select="(@id|@xml:id)[1]"/> <xsl:value-of select="$html.ext"/> </xsl:when> <xsl:otherwise></xsl:otherwise> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/chunk.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/chunk.xsl diff -u phpdoc/docbook/docbook-xsl/html/chunk.xsl:1.1 phpdoc/docbook/docbook-xsl/html/chunk.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/chunk.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/chunk.xsl Tue Jan 30 18:16:38 2007 @@ -4,7 +4,7 @@ exclude-result-prefixes="exsl"> <!-- ******************************************************************** - $Id: chunk.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: chunk.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/chunker.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/chunker.xsl diff -u phpdoc/docbook/docbook-xsl/html/chunker.xsl:1.1 phpdoc/docbook/docbook-xsl/html/chunker.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/chunker.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/chunker.xsl Tue Jan 30 18:16:38 2007 @@ -9,7 +9,7 @@ extension-element-prefixes="saxon redirect lxslt exsl"> <!-- ******************************************************************** - $Id: chunker.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: chunker.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -104,9 +104,9 @@ <xsl:if test="name(.) != '' and $suppress-context-node-name = 0"> <xsl:text> for </xsl:text> <xsl:value-of select="name(.)"/> - <xsl:if test="@id"> + <xsl:if test="@id or @xml:id"> <xsl:text>(</xsl:text> - <xsl:value-of select="@id"/> + <xsl:value-of select="(@id|@xml:id)[1]"/> <xsl:text>)</xsl:text> </xsl:if> </xsl:if> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/chunkfast.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/chunkfast.xsl diff -u phpdoc/docbook/docbook-xsl/html/chunkfast.xsl:1.1 phpdoc/docbook/docbook-xsl/html/chunkfast.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/chunkfast.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/chunkfast.xsl Tue Jan 30 18:16:38 2007 @@ -5,7 +5,7 @@ exclude-result-prefixes="cf exsl"> <!-- ******************************************************************** - $Id: chunkfast.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: chunkfast.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -28,15 +28,15 @@ <xsl:when test="$chunk.fast != 0 and function-available('exsl:node-set')"> <xsl:variable name="genid" select="generate-id()"/> - <xsl:variable name="div" select="$chunks[@id=$genid]"/> + <xsl:variable name="div" select="$chunks[@id=$genid or @xml:id=$genid]"/> <xsl:variable name="prevdiv" select="($div/preceding-sibling::cf:div|$div/preceding::cf:div|$div/parent::cf:div)[last()]"/> - <xsl:variable name="prev" select="key('genid', $prevdiv/@id)"/> + <xsl:variable name="prev" select="key('genid', ($prevdiv/@id|$prevdiv/@xml:id)[1])"/> <xsl:variable name="nextdiv" select="($div/following-sibling::cf:div|$div/following::cf:div|$div/cf:div)[1]"/> - <xsl:variable name="next" select="key('genid', $nextdiv/@id)"/> + <xsl:variable name="next" select="key('genid', ($nextdiv/@id|$nextdiv/@xml:id)[1])"/> <xsl:choose> <xsl:when test="$onechunk != 0 and parent::*"> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/chunktoc.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/chunktoc.xsl diff -u phpdoc/docbook/docbook-xsl/html/chunktoc.xsl:1.1 phpdoc/docbook/docbook-xsl/html/chunktoc.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/chunktoc.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/chunktoc.xsl Tue Jan 30 18:16:38 2007 @@ -4,7 +4,7 @@ exclude-result-prefixes="doc"> <!-- ******************************************************************** - $Id: chunktoc.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: chunktoc.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/component.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/component.xsl diff -u phpdoc/docbook/docbook-xsl/html/component.xsl:1.1 phpdoc/docbook/docbook-xsl/html/component.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/component.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/component.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: component.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: component.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -20,7 +20,7 @@ <xsl:variable name="level"> <xsl:choose> <xsl:when test="ancestor::section"> - <xsl:value-of select="count(ancestor::section)+1"/> + <xsl:value-of select="count(ancestor::section)+1"/> </xsl:when> <xsl:when test="ancestor::sect5">6</xsl:when> <xsl:when test="ancestor::sect4">5</xsl:when> @@ -75,7 +75,8 @@ <xsl:template match="dedication" mode="dedication"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -86,13 +87,15 @@ </div> </xsl:template> -<xsl:template match="dedication/title" mode="titlepage.mode" priority="2"> +<xsl:template match="dedication/title|dedication/info/title" + mode="titlepage.mode" priority="2"> <xsl:call-template name="component.title"> <xsl:with-param name="node" select="ancestor::dedication[1]"/> </xsl:call-template> </xsl:template> -<xsl:template match="dedication/subtitle" mode="titlepage.mode" priority="2"> +<xsl:template match="dedication/subtitle|dedication/info/subtitle" + mode="titlepage.mode" priority="2"> <xsl:call-template name="component.subtitle"> <xsl:with-param name="node" select="ancestor::dedication[1]"/> </xsl:call-template> @@ -108,7 +111,8 @@ <xsl:template match="colophon"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -137,7 +141,8 @@ <xsl:template match="preface"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -185,6 +190,7 @@ </xsl:template> <xsl:template match="preface/docinfo|prefaceinfo"></xsl:template> +<xsl:template match="preface/info"></xsl:template> <xsl:template match="preface/title"></xsl:template> <xsl:template match="preface/titleabbrev"></xsl:template> <xsl:template match="preface/subtitle"></xsl:template> @@ -194,7 +200,8 @@ <xsl:template match="chapter"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -241,6 +248,7 @@ </xsl:template> <xsl:template match="chapter/docinfo|chapterinfo"></xsl:template> +<xsl:template match="chapter/info"></xsl:template> <xsl:template match="chapter/title"></xsl:template> <xsl:template match="chapter/titleabbrev"></xsl:template> <xsl:template match="chapter/subtitle"></xsl:template> @@ -254,7 +262,8 @@ <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -318,6 +327,7 @@ </xsl:template> <xsl:template match="appendix/docinfo|appendixinfo"></xsl:template> +<xsl:template match="appendix/info"></xsl:template> <xsl:template match="appendix/title"></xsl:template> <xsl:template match="appendix/titleabbrev"></xsl:template> <xsl:template match="appendix/subtitle"></xsl:template> @@ -327,7 +337,8 @@ <xsl:template match="article"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -377,6 +388,7 @@ </xsl:template> <xsl:template match="article/artheader|article/articleinfo"></xsl:template> +<xsl:template match="article/info"></xsl:template> <xsl:template match="article/title"></xsl:template> <xsl:template match="article/titleabbrev"></xsl:template> <xsl:template match="article/subtitle"></xsl:template> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/db5strip.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/db5strip.xsl diff -u phpdoc/docbook/docbook-xsl/html/db5strip.xsl:1.1 phpdoc/docbook/docbook-xsl/html/db5strip.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/db5strip.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/db5strip.xsl Tue Jan 30 18:16:38 2007 @@ -12,14 +12,17 @@ <xsl:template match="/"> <xsl:choose> - <xsl:when test="function-available('exsl:node-set') - and (*/self::ng:* or */self::db:*)"> + <!-- include extra test for Xalan quirk --> + <xsl:when test="(function-available('exsl:node-set') or + contains(system-property('xsl:vendor'), + 'Apache Software Foundation')) + and (*/self::ng:* or */self::db:*)"> <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document, toss the namespace and continue. Someday we'll reverse this logic and add the namespace to documents that don't have one. But not before the whole stylesheet has been converted to use namespaces. i.e., don't hold your breath --> - <xsl:message>Stripping NS from DocBook 5/NG document.</xsl:message> + <xsl:message>Stripping namespace from DocBook 5 document.</xsl:message> <xsl:apply-templates mode="stripNS"/> </xsl:when> <xsl:otherwise> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/division.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/division.xsl diff -u phpdoc/docbook/docbook-xsl/html/division.xsl:1.1 phpdoc/docbook/docbook-xsl/html/division.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/division.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/division.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: division.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: division.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -17,7 +17,8 @@ <xsl:template match="set"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -32,7 +33,7 @@ <xsl:variable name="toc.params"> <xsl:call-template name="find.path.params"> - <xsl:with-param name="table" select="normalize-space($generate.toc)"/> + <xsl:with-param name="table" select="normalize-space($generate.toc)"/> </xsl:call-template> </xsl:variable> @@ -40,8 +41,8 @@ <xsl:with-param name="toc.params" select="$toc.params"/> <xsl:with-param name="toc"> <xsl:call-template name="set.toc"> - <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/> - </xsl:call-template> + <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/> + </xsl:call-template> </xsl:with-param> </xsl:call-template> @@ -59,7 +60,8 @@ <xsl:template match="book"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -76,7 +78,7 @@ <xsl:variable name="toc.params"> <xsl:call-template name="find.path.params"> - <xsl:with-param name="table" select="normalize-space($generate.toc)"/> + <xsl:with-param name="table" select="normalize-space($generate.toc)"/> </xsl:call-template> </xsl:variable> @@ -84,8 +86,8 @@ <xsl:with-param name="toc.params" select="$toc.params"/> <xsl:with-param name="toc"> <xsl:call-template name="division.toc"> - <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/> - </xsl:call-template> + <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/> + </xsl:call-template> </xsl:with-param> </xsl:call-template> @@ -94,6 +96,7 @@ </xsl:template> <xsl:template match="book/bookinfo"></xsl:template> +<xsl:template match="book/info"></xsl:template> <xsl:template match="book/title"></xsl:template> <xsl:template match="book/titleabbrev"></xsl:template> <xsl:template match="book/subtitle"></xsl:template> @@ -103,7 +106,8 @@ <xsl:template match="part"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -138,6 +142,7 @@ <xsl:template match="part/docinfo"></xsl:template> <xsl:template match="part/partinfo"></xsl:template> +<xsl:template match="part/info"></xsl:template> <xsl:template match="part/title"></xsl:template> <xsl:template match="part/titleabbrev"></xsl:template> <xsl:template match="part/subtitle"></xsl:template> @@ -145,7 +150,8 @@ <xsl:template match="partintro"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/docbook.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/docbook.xsl diff -u phpdoc/docbook/docbook-xsl/html/docbook.xsl:1.1 phpdoc/docbook/docbook-xsl/html/docbook.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/docbook.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/docbook.xsl Tue Jan 30 18:16:38 2007 @@ -11,7 +11,7 @@ indent="no"/> <!-- ******************************************************************** - $Id: docbook.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: docbook.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -69,7 +69,6 @@ <xsl:include href="ebnf.xsl"/> <xsl:include href="chunker.xsl"/> <xsl:include href="html-rtf.xsl"/> -<xsl:include href="docbookng.xsl"/> <xsl:include href="annotations.xsl"/> <xsl:include href="../common/stripns.xsl"/> @@ -145,7 +144,7 @@ <base href="{$html.base}"/> </xsl:if> - <meta name="generator" content="DocBook XSL Stylesheets V{$VERSION}"/> + <meta name="generator" content="DocBook {$DistroTitle} V{$VERSION}"/> <xsl:if test="$generate.meta.abstract != 0"> <xsl:variable name="info" select="(articleinfo http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/ebnf.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/ebnf.xsl diff -u phpdoc/docbook/docbook-xsl/html/ebnf.xsl:1.1 phpdoc/docbook/docbook-xsl/html/ebnf.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/ebnf.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/ebnf.xsl Tue Jan 30 18:16:38 2007 @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: ebnf.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: ebnf.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -17,7 +17,7 @@ <doc:reference xmlns=""> <referenceinfo> <releaseinfo role="meta"> -$Id: ebnf.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ +$Id: ebnf.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ </releaseinfo> <author><surname>Walsh</surname> <firstname>Norman</firstname></author> @@ -54,44 +54,45 @@ <table width="100%" cellpadding="5"> <xsl:if test="$ebnf.table.bgcolor != ''"> <xsl:attribute name="bgcolor"> - <xsl:value-of select="$ebnf.table.bgcolor"/> + <xsl:value-of select="$ebnf.table.bgcolor"/> </xsl:attribute> </xsl:if> <xsl:if test="$ebnf.table.border != 0"> <xsl:attribute name="border">1</xsl:attribute> </xsl:if> <xsl:attribute name="class"> - <xsl:value-of select="name(.)"/> + <xsl:value-of select="local-name(.)"/> </xsl:attribute> <xsl:attribute name="summary"> <xsl:text>EBNF</xsl:text> <xsl:if test="title"> - <xsl:text> for </xsl:text> - <xsl:value-of select="title"/> + <xsl:text> for </xsl:text> + <xsl:value-of select="title"/> </xsl:if> </xsl:attribute> <xsl:if test="title"> <tr> - <th align="left" valign="top" class="{name(.)}"> - <xsl:apply-templates select="title"/> - </th> + <th align="left" valign="top"> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:apply-templates select="title"/> + </th> </tr> </xsl:if> <tr> <td> - <table border="0" width="99%" cellpadding="0"> - <xsl:if test="$ebnf.table.bgcolor != ''"> - <xsl:attribute name="bgcolor"> - <xsl:value-of select="$ebnf.table.bgcolor"/> - </xsl:attribute> - </xsl:if> - <xsl:attribute name="class"> - <xsl:value-of select="name(.)"/> - </xsl:attribute> - <xsl:attribute name="summary">EBNF productions</xsl:attribute> - <xsl:apply-templates select="production|productionrecap"/> - </table> + <table border="0" width="99%" cellpadding="0"> + <xsl:if test="$ebnf.table.bgcolor != ''"> + <xsl:attribute name="bgcolor"> + <xsl:value-of select="$ebnf.table.bgcolor"/> + </xsl:attribute> + </xsl:if> + <xsl:attribute name="class"> + <xsl:value-of select="local-name(.)"/> + </xsl:attribute> + <xsl:attribute name="summary">EBNF productions</xsl:attribute> + <xsl:apply-templates select="production|productionrecap"/> + </table> </td> </tr> </table> @@ -111,20 +112,20 @@ </td> <td align="right" valign="top" width="10%"> <xsl:choose> - <xsl:when test="$recap"> - <a> - <xsl:attribute name="href"> - <xsl:call-template name="href.target"> - <xsl:with-param name="object" select="."/> - </xsl:call-template> - </xsl:attribute> - <xsl:apply-templates select="lhs"/> - </a> - </xsl:when> - <xsl:otherwise> + <xsl:when test="$recap"> + <a> + <xsl:attribute name="href"> + <xsl:call-template name="href.target"> + <xsl:with-param name="object" select="."/> + </xsl:call-template> + </xsl:attribute> + <xsl:apply-templates select="lhs"/> + </a> + </xsl:when> + <xsl:otherwise> <xsl:call-template name="anchor"/> - <xsl:apply-templates select="lhs"/> - </xsl:otherwise> + <xsl:apply-templates select="lhs"/> + </xsl:otherwise> </xsl:choose> </td> <td valign="top" width="5%" align="center"> @@ -136,13 +137,13 @@ </td> <td align="left" valign="top" width="30%"> <xsl:choose> - <xsl:when test="rhs/lineannotation|constraint"> + <xsl:when test="rhs/lineannotation|constraint"> <xsl:apply-templates select="rhs/lineannotation" mode="rhslo"/> <xsl:apply-templates select="constraint"/> - </xsl:when> - <xsl:otherwise> - <xsl:text> </xsl:text> - </xsl:otherwise> + </xsl:when> + <xsl:otherwise> + <xsl:text> </xsl:text> + </xsl:otherwise> </xsl:choose> </td> </tr> @@ -206,14 +207,14 @@ <xsl:when test="*|text()"><!--nop--></xsl:when> <xsl:otherwise> <xsl:if test="$linkend = ''"> - <xsl:message> - <xsl:text>Non-terminals with no content must point to </xsl:text> - <xsl:text>production elements in the current document.</xsl:text> - </xsl:message> - <xsl:message> - <xsl:text>Invalid xpointer for empty nt: </xsl:text> - <xsl:value-of select="@def"/> - </xsl:message> + <xsl:message> + <xsl:text>Non-terminals with no content must point to </xsl:text> + <xsl:text>production elements in the current document.</xsl:text> + </xsl:message> + <xsl:message> + <xsl:text>Invalid xpointer for empty nt: </xsl:text> + <xsl:value-of select="@def"/> + </xsl:message> </xsl:if> </xsl:otherwise> </xsl:choose> @@ -221,14 +222,14 @@ <xsl:variable name="href"> <xsl:choose> <xsl:when test="$linkend != ''"> - <xsl:variable name="targets" select="key('id',$linkend)"/> - <xsl:variable name="target" select="$targets[1]"/> - <xsl:call-template name="href.target"> - <xsl:with-param name="object" select="$target"/> - </xsl:call-template> + <xsl:variable name="targets" select="key('id',$linkend)"/> + <xsl:variable name="target" select="$targets[1]"/> + <xsl:call-template name="href.target"> + <xsl:with-param name="object" select="$target"/> + </xsl:call-template> </xsl:when> <xsl:otherwise> - <xsl:value-of select="@def"/> + <xsl:value-of select="@def"/> </xsl:otherwise> </xsl:choose> </xsl:variable> @@ -236,19 +237,19 @@ <a href="{$href}"> <xsl:choose> <xsl:when test="*|text()"> - <xsl:apply-templates/> + <xsl:apply-templates/> </xsl:when> <xsl:otherwise> - <xsl:choose> - <xsl:when test="$linkend != ''"> - <xsl:variable name="targets" select="key('id',$linkend)"/> - <xsl:variable name="target" select="$targets[1]"/> - <xsl:apply-templates select="$target/lhs"/> - </xsl:when> - <xsl:otherwise> - <xsl:text>???</xsl:text> - </xsl:otherwise> - </xsl:choose> + <xsl:choose> + <xsl:when test="$linkend != ''"> + <xsl:variable name="targets" select="key('id',$linkend)"/> + <xsl:variable name="target" select="$targets[1]"/> + <xsl:apply-templates select="$target/lhs"/> + </xsl:when> + <xsl:otherwise> + <xsl:text>???</xsl:text> + </xsl:otherwise> + </xsl:choose> </xsl:otherwise> </xsl:choose> </a> @@ -294,8 +295,8 @@ <xsl:variable name="targets" select="key('id',@linkend)"/> <xsl:variable name="target" select="$targets[1]"/> <xsl:if test="$target/@role"> - <xsl:value-of select="$target/@role"/> - <xsl:text>: </xsl:text> + <xsl:value-of select="$target/@role"/> + <xsl:text>: </xsl:text> </xsl:if> </xsl:otherwise> </xsl:choose> @@ -312,7 +313,8 @@ </xsl:template> <xsl:template match="constraintdef"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <xsl:apply-templates/> </div> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/footnote.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/footnote.xsl diff -u phpdoc/docbook/docbook-xsl/html/footnote.xsl:1.1 phpdoc/docbook/docbook-xsl/html/footnote.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/footnote.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/footnote.xsl Tue Jan 30 18:16:38 2007 @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: footnote.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: footnote.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -119,9 +119,9 @@ </xsl:variable> <p> <xsl:if test="@role and $para.propagates.style != 0"> - <xsl:attribute name="class"> - <xsl:value-of select="@role"/> - </xsl:attribute> + <xsl:apply-templates select="." mode="class.attribute"> + <xsl:with-param name="class" select="@role"/> + </xsl:apply-templates> </xsl:if> <sup> <xsl:text>[</xsl:text> @@ -194,8 +194,8 @@ <xsl:param name="from" select=".."/> <xsl:param name="to" select="."/> <xsl:param name="count" select="0"/> - <xsl:param name="list" select="$from/following::*[name(.)=name($to)] - |$from/descendant-or-self::*[name(.)=name($to)]"/> + <xsl:param name="list" select="$from/following::*[local-name(.)=local-name($to)] + |$from/descendant-or-self::*[local-name(.)=local-name($to)]"/> <xsl:choose> <xsl:when test="not($list)"> @@ -247,13 +247,15 @@ <xsl:template match="footnote" name="process.footnote" mode="process.footnote.mode"> <xsl:choose> <xsl:when test="local-name(*[1]) = 'para' or local-name(*[1]) = 'simpara'"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </div> </xsl:when> <xsl:when test="$html.cleanup != 0 and function-available('exsl:node-set')"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates select="*[1]" mode="footnote.body.number"/> <xsl:apply-templates select="*[position() > 1]"/> </div> @@ -266,7 +268,8 @@ <xsl:value-of select="local-name(*[1])"/> <xsl:text> unexpected as first child of footnote.</xsl:text> </xsl:message> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </div> </xsl:otherwise> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/formal.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/formal.xsl diff -u phpdoc/docbook/docbook-xsl/html/formal.xsl:1.1 phpdoc/docbook/docbook-xsl/html/formal.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/formal.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/formal.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: formal.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: formal.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -184,12 +184,10 @@ </xsl:when> <xsl:otherwise> <xsl:copy> - <xsl:copy-of select="@*"/> - <xsl:if test="not(@id)"> - <xsl:attribute name="id"> - <xsl:call-template name="object.id"/> - </xsl:attribute> - </xsl:if> + <xsl:copy-of select="@*[not(local-name()='id')]"/> + <xsl:attribute name="id"> + <xsl:call-template name="object.id"/> + </xsl:attribute> <xsl:call-template name="htmlTable"/> </xsl:copy> </xsl:otherwise> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/glossary.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/glossary.xsl diff -u phpdoc/docbook/docbook-xsl/html/glossary.xsl:1.1 phpdoc/docbook/docbook-xsl/html/glossary.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/glossary.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/glossary.xsl Tue Jan 30 18:16:38 2007 @@ -1,9 +1,13 @@ <?xml version='1.0'?> +<!DOCTYPE xsl:stylesheet [ +<!ENTITY % common.entities SYSTEM "../common/entities.ent"> +%common.entities; +]> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'> <!-- ******************************************************************** - $Id: glossary.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: glossary.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -16,8 +20,13 @@ <xsl:template match="glossary"> <xsl:call-template name="id.warning"/> + + <xsl:variable name="language"> + <xsl:call-template name="l10n.language"/> + </xsl:variable> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -41,7 +50,18 @@ </xsl:when> <xsl:otherwise> <dl> - <xsl:apply-templates select="glossentry"/> + <xsl:choose> + <xsl:when test="$glossary.sort != 0"> + <xsl:apply-templates select="glossentry"> + <xsl:sort lang="$language" + select="translate(glossterm, &lowercase;, + &uppercase;)"/> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="glossentry"/> + </xsl:otherwise> + </xsl:choose> </dl> </xsl:otherwise> </xsl:choose> @@ -53,6 +73,7 @@ </xsl:template> <xsl:template match="glossary/glossaryinfo"></xsl:template> +<xsl:template match="glossary/info"></xsl:template> <xsl:template match="glossary/title"></xsl:template> <xsl:template match="glossary/subtitle"></xsl:template> <xsl:template match="glossary/titleabbrev"></xsl:template> @@ -60,13 +81,25 @@ <!-- ==================================================================== --> <xsl:template match="glosslist"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> - <xsl:if test="blockinfo/title|title"> + <xsl:if test="blockinfo/title|info/title|title"> <xsl:call-template name="formal.object.heading"/> </xsl:if> <dl> - <xsl:apply-templates select="glossentry"/> + <xsl:choose> + <xsl:when test="$glossary.sort != 0"> + <xsl:apply-templates select="glossentry"> + <xsl:sort lang="$language" + select="translate(glossterm, &lowercase;, + &uppercase;)"/> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="glossentry"/> + </xsl:otherwise> + </xsl:choose> </dl> </div> </xsl:template> @@ -76,17 +109,30 @@ <xsl:template match="glossdiv"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates select="(glossentry[1]/preceding-sibling::*)"/> <dl> - <xsl:apply-templates select="glossentry"/> + <xsl:choose> + <xsl:when test="$glossary.sort != 0"> + <xsl:apply-templates select="glossentry"> + <xsl:sort lang="$language" + select="translate(glossterm, &lowercase;, + &uppercase;)"/> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="glossentry"/> + </xsl:otherwise> + </xsl:choose> </dl> </div> </xsl:template> <xsl:template match="glossdiv/title"> - <h3 class="{name(.)}"> + <h3> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </h3> </xsl:template> @@ -298,7 +344,8 @@ <!-- Glossary collection --> <xsl:template match="glossary[@role='auto']" priority="2"> - <xsl:variable name="terms" select="//glossterm[not(parent::glossdef)]|//firstterm"/> + <xsl:variable name="terms" + select="//glossterm[not(parent::glossdef)]|//firstterm"/> <xsl:variable name="collection" select="document($glossary.collection, .)"/> <xsl:call-template name="id.warning"/> @@ -319,7 +366,8 @@ </xsl:message> </xsl:if> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -350,12 +398,27 @@ </xsl:when> <xsl:otherwise> <dl> - <xsl:for-each select="$collection//glossentry"> - <xsl:variable name="cterm" select="glossterm"/> - <xsl:if test="$terms[@baseform = $cterm or . = $cterm]"> - <xsl:apply-templates select="." mode="auto-glossary"/> - </xsl:if> - </xsl:for-each> + <xsl:choose> + <xsl:when test="$glossary.sort != 0"> + <xsl:for-each select="$collection//glossentry"> + <xsl:sort lang="$language" + select="translate(glossterm, &lowercase;, + &uppercase;)"/> + <xsl:variable name="cterm" select="glossterm"/> + <xsl:if test="$terms[@baseform = $cterm or . = $cterm]"> + <xsl:apply-templates select="." mode="auto-glossary"/> + </xsl:if> + </xsl:for-each> + </xsl:when> + <xsl:otherwise> + <xsl:for-each select="$collection//glossentry"> + <xsl:variable name="cterm" select="glossterm"/> + <xsl:if test="$terms[@baseform = $cterm or . = $cterm]"> + <xsl:apply-templates select="." mode="auto-glossary"/> + </xsl:if> + </xsl:for-each> + </xsl:otherwise> + </xsl:choose> </dl> </xsl:otherwise> </xsl:choose> @@ -374,16 +437,32 @@ <xsl:template match="glossdiv" mode="auto-glossary"> <xsl:param name="terms" select="."/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates select="(glossentry[1]/preceding-sibling::*)"/> <dl> - <xsl:for-each select="glossentry"> - <xsl:variable name="cterm" select="glossterm"/> - <xsl:if test="$terms[@baseform = $cterm or . = $cterm]"> - <xsl:apply-templates select="." mode="auto-glossary"/> - </xsl:if> - </xsl:for-each> + <xsl:choose> + <xsl:when test="$glossary.sort != 0"> + <xsl:for-each select="glossentry"> + <xsl:sort lang="$language" + select="translate(glossterm, &lowercase;, + &uppercase;)"/> + <xsl:variable name="cterm" select="glossterm"/> + <xsl:if test="$terms[@baseform = $cterm or . = $cterm]"> + <xsl:apply-templates select="." mode="auto-glossary"/> + </xsl:if> + </xsl:for-each> + </xsl:when> + <xsl:otherwise> + <xsl:for-each select="glossentry"> + <xsl:variable name="cterm" select="glossterm"/> + <xsl:if test="$terms[@baseform = $cterm or . = $cterm]"> + <xsl:apply-templates select="." mode="auto-glossary"/> + </xsl:if> + </xsl:for-each> + </xsl:otherwise> + </xsl:choose> </dl> </div> </xsl:template> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/graphics.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/graphics.xsl diff -u phpdoc/docbook/docbook-xsl/html/graphics.xsl:1.1 phpdoc/docbook/docbook-xsl/html/graphics.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/graphics.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/graphics.xsl Tue Jan 30 18:16:38 2007 @@ -11,7 +11,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: graphics.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: graphics.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -62,7 +62,8 @@ <!-- ==================================================================== --> <xsl:template match="screenshot"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </div> </xsl:template> @@ -234,14 +235,14 @@ <xsl:variable name="output_filename"> <xsl:choose> <xsl:when test="@entityref"> - <xsl:value-of select="$filename"/> + <xsl:value-of select="$filename"/> </xsl:when> <!-- Moved test for $keep.relative.image.uris to template below: <xsl:template match="@fileref"> --> <xsl:otherwise> - <xsl:value-of select="$filename"/> + <xsl:value-of select="$filename"/> </xsl:otherwise> </xsl:choose> </xsl:variable> @@ -568,6 +569,11 @@ <xsl:otherwise> <xsl:element name="{$tag}"> <xsl:if test="$tag = 'img' and ../../self::imageobjectco"> + <xsl:variable name="mapname"> + <xsl:call-template name="object.id"> + <xsl:with-param name="object" select="../../areaspec"/> + </xsl:call-template> + </xsl:variable> <xsl:choose> <xsl:when test="$scaled"> <!-- It might be possible to handle some scaling; needs --> @@ -580,7 +586,7 @@ <xsl:otherwise> <xsl:attribute name="border">0</xsl:attribute> <xsl:attribute name="usemap"> - <xsl:value-of select="generate-id(../..)"/> + <xsl:value-of select="concat('#', $mapname)"/> </xsl:attribute> </xsl:otherwise> </xsl:choose> @@ -713,151 +719,185 @@ </xsl:choose> <xsl:if test="$tag = 'img' and ../../self::imageobjectco and not($scaled)"> - <map name="{generate-id(../..)}"> + <xsl:variable name="mapname"> + <xsl:call-template name="object.id"> + <xsl:with-param name="object" select="../../areaspec"/> + </xsl:call-template> + </xsl:variable> + + <map name="{$mapname}"> <xsl:for-each select="../../areaspec//area"> - <xsl:variable name="units"> - <xsl:choose> - <xsl:when test="@units"> - <xsl:value-of select="@units"/> - </xsl:when> - <xsl:when test="../@units"> - <xsl:value-of select="../@units"/> - </xsl:when> - <xsl:otherwise>calspair</xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:choose> - <xsl:when test="$units = 'calspair'"> - <xsl:variable name="coords" select="normalize-space(@coords)"/> - <xsl:variable name="p1" - select="substring-before($coords, ' ')"/> - <xsl:variable name="p2" - select="substring-after($coords, ' ')"/> - - <xsl:variable name="x1" select="substring-before($p1,',')"/> - <xsl:variable name="y1" select="substring-after($p1,',')"/> - <xsl:variable name="x2" select="substring-before($p2,',')"/> - <xsl:variable name="y2" select="substring-after($p2,',')"/> - - <xsl:variable name="x1p" select="$x1 div 100.0"/> - <xsl:variable name="y1p" select="$y1 div 100.0"/> - <xsl:variable name="x2p" select="$x2 div 100.0"/> - <xsl:variable name="y2p" select="$y2 div 100.0"/> + <xsl:variable name="units"> + <xsl:choose> + <xsl:when test="@units = 'other' and @otherunits"> + <xsl:value-of select="@otherunits"/> + </xsl:when> + <xsl:when test="@units"> + <xsl:value-of select="@units"/> + </xsl:when> + <!-- areaspec|areaset/area --> + <xsl:when test="../@units = 'other' and ../@otherunits"> + <xsl:value-of select="../@otherunits"/> + </xsl:when> + <xsl:when test="../@units"> + <xsl:value-of select="../@units"/> + </xsl:when> + <!-- areaspec/areaset/area --> + <xsl:when test="../../@units = 'other' and ../../@otherunits"> + <xsl:value-of select="../@otherunits"/> + </xsl:when> + <xsl:when test="../../@units"> + <xsl:value-of select="../../@units"/> + </xsl:when> + <xsl:otherwise>calspair</xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:choose> + <xsl:when test="$units = 'calspair' or + $units = 'imagemap'"> + <xsl:variable name="coords" select="normalize-space(@coords)"/> -<!-- - <xsl:message> - <xsl:text>units: </xsl:text> - <xsl:value-of select="$units"/> - <xsl:text> </xsl:text> - <xsl:value-of select="$x1p"/><xsl:text>, </xsl:text> - <xsl:value-of select="$y1p"/><xsl:text>, </xsl:text> - <xsl:value-of select="$x2p"/><xsl:text>, </xsl:text> - <xsl:value-of select="$y2p"/><xsl:text>, </xsl:text> - </xsl:message> - - <xsl:message> - <xsl:text> </xsl:text> - <xsl:value-of select="$intrinsicwidth"/> - <xsl:text>, </xsl:text> - <xsl:value-of select="$intrinsicdepth"/> - </xsl:message> - - <xsl:message> - <xsl:text> </xsl:text> - <xsl:value-of select="$units"/> - <xsl:text> </xsl:text> - <xsl:value-of select="round($x1p * $intrinsicwidth div 100.0)"/> - <xsl:text>,</xsl:text> - <xsl:value-of select="round($intrinsicdepth - - ($y1p * $intrinsicdepth div 100.0))"/> - <xsl:text>,</xsl:text> - <xsl:value-of select="round($x2p * $intrinsicwidth div 100.0)"/> - <xsl:text>,</xsl:text> - <xsl:value-of select="round($intrinsicdepth - - ($y2p * $intrinsicdepth div 100.0))"/> - </xsl:message> ---> + <area shape="rect"> + <xsl:variable name="linkends"> + <xsl:choose> + <xsl:when test="@linkends"> + <xsl:value-of select="normalize-space(@linkends)"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="normalize-space(../@linkends)"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:variable name="href"> + <xsl:choose> + <xsl:when test="@xlink:href"> + <xsl:value-of select="@xlink:href"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="../@xlink:href"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:choose> + <xsl:when test="$linkends != ''"> + <xsl:variable name="linkend"> + <xsl:choose> + <xsl:when test="contains($linkends, ' ')"> + <xsl:value-of select="substring-before($linkends, ' ')"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$linkends"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:variable name="target" select="key('id', $linkend)[1]"/> + + <xsl:if test="$target"> + <xsl:attribute name="href"> + <xsl:call-template name="href.target"> + <xsl:with-param name="object" select="$target"/> + </xsl:call-template> + </xsl:attribute> + </xsl:if> + </xsl:when> + <xsl:when test="$href != ''"> + <xsl:attribute name="href"> + <xsl:value-of select="$href"/> + </xsl:attribute> + </xsl:when> + </xsl:choose> + + <xsl:if test="alt"> + <xsl:attribute name="alt"> + <xsl:value-of select="alt[1]"/> + </xsl:attribute> + </xsl:if> + + <xsl:attribute name="coords"> + <xsl:choose> + <xsl:when test="$units = 'calspair'"> - <area shape="rect"> - <xsl:variable name="linkends"> - <xsl:choose> - <xsl:when test="@linkends"> - <xsl:value-of select="normalize-space(@linkends)"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="normalize-space(../@linkends)"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:variable name="href"> - <xsl:choose> - <xsl:when test="@xlink:href"> - <xsl:value-of select="@xlink:href"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="../@xlink:href"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:choose> - <xsl:when test="$linkends != ''"> - <xsl:variable name="linkend"> - <xsl:choose> - <xsl:when test="contains($linkends, ' ')"> - <xsl:value-of select="substring-before($linkends, ' ')"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$linkends"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:variable name="target" select="key('id', $linkend)[1]"/> - - <xsl:if test="$target"> - <xsl:attribute name="href"> - <xsl:call-template name="href.target"> - <xsl:with-param name="object" select="$target"/> - </xsl:call-template> - </xsl:attribute> - </xsl:if> - </xsl:when> - <xsl:when test="$href != ''"> - <xsl:attribute name="href"> - <xsl:value-of select="$href"/> - </xsl:attribute> - </xsl:when> - </xsl:choose> - - <xsl:if test="alt"> - <xsl:attribute name="alt"> - <xsl:value-of select="alt[1]"/> - </xsl:attribute> - </xsl:if> - - <xsl:attribute name="coords"> - <xsl:value-of select="round($x1p * $intrinsicwidth div 100.0)"/> - <xsl:text>,</xsl:text> - <xsl:value-of select="round($intrinsicdepth - - ($y1p * $intrinsicdepth div 100.0))"/> - <xsl:text>,</xsl:text> - <xsl:value-of select="round($x2p * $intrinsicwidth div 100.0)"/> - <xsl:text>,</xsl:text> - <xsl:value-of select="round($intrinsicdepth - - ($y2p * $intrinsicdepth div 100.0))"/> - </xsl:attribute> - </area> - </xsl:when> - <xsl:otherwise> - <xsl:message> - <xsl:text>Warning: only calspair supported </xsl:text> - <xsl:text>in imageobjectco</xsl:text> - </xsl:message> - </xsl:otherwise> - </xsl:choose> + <xsl:variable name="p1" + select="substring-before($coords, ' ')"/> + <xsl:variable name="p2" + select="substring-after($coords, ' ')"/> + + <xsl:variable name="x1" select="substring-before($p1,',')"/> + <xsl:variable name="y1" select="substring-after($p1,',')"/> + <xsl:variable name="x2" select="substring-before($p2,',')"/> + <xsl:variable name="y2" select="substring-after($p2,',')"/> + + <xsl:variable name="x1p" select="$x1 div 100.0"/> + <xsl:variable name="y1p" select="$y1 div 100.0"/> + <xsl:variable name="x2p" select="$x2 div 100.0"/> + <xsl:variable name="y2p" select="$y2 div 100.0"/> + + <!-- + <xsl:message> + <xsl:text>units: </xsl:text> + <xsl:value-of select="$units"/> + <xsl:text> </xsl:text> + <xsl:value-of select="$x1p"/><xsl:text>, </xsl:text> + <xsl:value-of select="$y1p"/><xsl:text>, </xsl:text> + <xsl:value-of select="$x2p"/><xsl:text>, </xsl:text> + <xsl:value-of select="$y2p"/><xsl:text>, </xsl:text> + </xsl:message> + + <xsl:message> + <xsl:text> </xsl:text> + <xsl:value-of select="$intrinsicwidth"/> + <xsl:text>, </xsl:text> + <xsl:value-of select="$intrinsicdepth"/> + </xsl:message> + + <xsl:message> + <xsl:text> </xsl:text> + <xsl:value-of select="$units"/> + <xsl:text> </xsl:text> + <xsl:value-of + select="round($x1p * $intrinsicwidth div 100.0)"/> + <xsl:text>,</xsl:text> + <xsl:value-of select="round($intrinsicdepth + - ($y2p * $intrinsicdepth div 100.0))"/> + <xsl:text>,</xsl:text> + <xsl:value-of select="round($x2p * + $intrinsicwidth div 100.0)"/> + <xsl:text>,</xsl:text> + <xsl:value-of select="round($intrinsicdepth + - ($y1p * $intrinsicdepth div 100.0))"/> + </xsl:message> + --> + <xsl:value-of + select="round($x1p * $intrinsicwidth div 100.0)"/> + <xsl:text>,</xsl:text> + <xsl:value-of select="round($intrinsicdepth + - ($y2p * $intrinsicdepth div 100.0))"/> + <xsl:text>,</xsl:text> + <xsl:value-of + select="round($x2p * $intrinsicwidth div 100.0)"/> + <xsl:text>,</xsl:text> + <xsl:value-of select="round($intrinsicdepth + - ($y1p * $intrinsicdepth div 100.0))"/> + </xsl:when> + <xsl:otherwise> + <xsl:copy-of select="$coords"/> + </xsl:otherwise> + </xsl:choose> + </xsl:attribute> + </area> + </xsl:when> + <xsl:otherwise> + <xsl:message> + <xsl:text>Warning: only calspair or </xsl:text> + <xsl:text>otherunits='imagemap' supported </xsl:text> + <xsl:text>in imageobjectco</xsl:text> + </xsl:message> + </xsl:otherwise> + </xsl:choose> </xsl:for-each> </map> </xsl:if> @@ -1011,9 +1051,7 @@ </xsl:choose> </xsl:variable> - <xsl:if test="@id"> - <a name="{@id}"/> - </xsl:if> + <xsl:call-template name="anchor"/> <xsl:choose> <xsl:when test="@format='linespecific'"> @@ -1067,15 +1105,14 @@ <xsl:value-of select="$object/descendant::imagedata[@align][1]/@align"/> </xsl:variable> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="$align != '' "> <xsl:attribute name="align"> <xsl:value-of select="$align"/> </xsl:attribute> </xsl:if> - <xsl:if test="@id"> - <a name="{@id}"/> - </xsl:if> + <xsl:call-template name="anchor"/> <xsl:apply-templates select="$object"/> <xsl:apply-templates select="caption"/> @@ -1083,10 +1120,9 @@ </xsl:template> <xsl:template match="inlinemediaobject"> - <span class="{name(.)}"> - <xsl:if test="@id"> - <a name="{@id}"/> - </xsl:if> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="anchor"/> <xsl:call-template name="select.mediaobject"/> </span> </xsl:template> @@ -1100,9 +1136,7 @@ <!-- ==================================================================== --> <xsl:template match="imageobjectco"> - <xsl:if test="@id"> - <a name="{@id}"/> - </xsl:if> + <xsl:call-template name="anchor"/> <xsl:apply-templates select="imageobject"/> <xsl:apply-templates select="calloutlist"/> </xsl:template> @@ -1376,7 +1410,8 @@ <!-- ==================================================================== --> <xsl:template match="caption"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="@align = 'right' or @align = 'left' or @align='center'"> <xsl:attribute name="align"><xsl:value-of select="@align"/></xsl:attribute> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/highlight.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/highlight.xsl diff -u phpdoc/docbook/docbook-xsl/html/highlight.xsl:1.1 phpdoc/docbook/docbook-xsl/html/highlight.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/highlight.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/highlight.xsl Tue Jan 30 18:16:38 2007 @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: highlight.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: highlight.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/html-rtf.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/html-rtf.xsl diff -u phpdoc/docbook/docbook-xsl/html/html-rtf.xsl:1.1 phpdoc/docbook/docbook-xsl/html/html-rtf.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/html-rtf.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/html-rtf.xsl Tue Jan 30 18:16:38 2007 @@ -6,7 +6,7 @@ version="1.0"> <!-- ******************************************************************** - $Id: html-rtf.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: html-rtf.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -175,7 +175,8 @@ <xsl:variable name="leading" select="set:leading($nodes,$block)"/> <xsl:variable name="trailing" select="set:trailing($nodes,$block)"/> - <xsl:if test="($wrap/@id and $first = 1) or $leading"> + <xsl:if test="(($wrap/@id or $wrap/@xml:id) + and $first = 1) or $leading"> <xsl:element name="{local-name($wrap)}" namespace="{namespace-uri($wrap)}"> <xsl:for-each select="$wrap/@*"> <xsl:if test="$first != 0 or local-name(.) != 'id'"> @@ -198,7 +199,7 @@ </xsl:when> <xsl:otherwise> - <xsl:if test="($wrap/@id and $first = 1) or $nodes"> + <xsl:if test="(($wrap/@id or $wrap/@xml:id) and $first = 1) or $nodes"> <xsl:element name="{local-name($wrap)}" namespace="{namespace-uri($wrap)}"> <xsl:for-each select="$wrap/@*"> <xsl:if test="$first != 0 or local-name(.) != 'id'"> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/html.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/html.xsl diff -u phpdoc/docbook/docbook-xsl/html/html.xsl:1.1 phpdoc/docbook/docbook-xsl/html/html.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/html.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/html.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: html.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: html.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -19,12 +19,67 @@ <!-- inline.boldseq), which in turn are called by other (element) --> <!-- templates, so it results, currently, in supporting generation of the --> <!-- HTML "title" attribute for a total of about 92 elements. --> +<!-- You can use mode="html.title.attribute" to get a title for --> +<!-- an element specified by a param, including targets of cross references. --> <xsl:template name="generate.html.title"> - <xsl:if test="alt"> - <xsl:attribute name="title"> - <xsl:value-of select="normalize-space(alt)"/> - </xsl:attribute> - </xsl:if> + <xsl:apply-templates select="." mode="html.title.attribute"/> +</xsl:template> + +<!-- Generate a title attribute for the context node --> +<xsl:template match="*" mode="html.title.attribute"> + <xsl:variable name="is.title"> + <xsl:call-template name="gentext.template.exists"> + <xsl:with-param name="context" select="'title'"/> + <xsl:with-param name="name" select="local-name(.)"/> + <xsl:with-param name="lang"> + <xsl:call-template name="l10n.language"/> + </xsl:with-param> + </xsl:call-template> + </xsl:variable> + + <xsl:variable name="is.title-numbered"> + <xsl:call-template name="gentext.template.exists"> + <xsl:with-param name="context" select="'title-numbered'"/> + <xsl:with-param name="name" select="local-name(.)"/> + <xsl:with-param name="lang"> + <xsl:call-template name="l10n.language"/> + </xsl:with-param> + </xsl:call-template> + </xsl:variable> + + <xsl:variable name="is.title-unnumbered"> + <xsl:call-template name="gentext.template.exists"> + <xsl:with-param name="context" select="'title-unnumbered'"/> + <xsl:with-param name="name" select="local-name(.)"/> + <xsl:with-param name="lang"> + <xsl:call-template name="l10n.language"/> + </xsl:with-param> + </xsl:call-template> + </xsl:variable> + + <xsl:variable name="gentext.title"> + <xsl:if test="$is.title != 0 or + $is.title-numbered != 0 or + $is.title-unnumbered != 0"> + <xsl:apply-templates select="." + mode="object.title.markup.textonly"/> + </xsl:if> + </xsl:variable> + + <xsl:choose> + <xsl:when test="string-length($gentext.title) != 0"> + <xsl:attribute name="title"> + <xsl:value-of select="$gentext.title"/> + </xsl:attribute> + </xsl:when> + <!-- Fall back to alt if available --> + <xsl:when test="alt"> + <xsl:attribute name="title"> + <xsl:value-of select="normalize-space(alt)"/> + </xsl:attribute> + </xsl:when> + </xsl:choose> + </xsl:template> <xsl:template name="dir"> @@ -33,10 +88,10 @@ <xsl:variable name="dir"> <xsl:choose> <xsl:when test="@dir"> - <xsl:value-of select="@dir"/> + <xsl:value-of select="@dir"/> </xsl:when> <xsl:when test="$inherit != 0"> - <xsl:value-of select="ancestor::*/@dir[1]"/> + <xsl:value-of select="ancestor::*/@dir[1]"/> </xsl:when> </xsl:choose> </xsl:variable> @@ -128,20 +183,20 @@ <xsl:if test="$id.warnings != 0 and not(@id) and not(@xml:id) and parent::*"> <xsl:variable name="title"> <xsl:choose> - <xsl:when test="title"> - <xsl:value-of select="title[1]"/> - </xsl:when> - <xsl:when test="substring(local-name(*[1]), - string-length(local-name(*[1])-3) = 'info') - and *[1]/title"> - <xsl:value-of select="*[1]/title[1]"/> - </xsl:when> - <xsl:when test="refmeta/refentrytitle"> - <xsl:value-of select="refmeta/refentrytitle"/> - </xsl:when> - <xsl:when test="refnamediv/refname"> - <xsl:value-of select="refnamediv/refname[1]"/> - </xsl:when> + <xsl:when test="title"> + <xsl:value-of select="title[1]"/> + </xsl:when> + <xsl:when test="substring(local-name(*[1]), + string-length(local-name(*[1])-3) = 'info') + and *[1]/title"> + <xsl:value-of select="*[1]/title[1]"/> + </xsl:when> + <xsl:when test="refmeta/refentrytitle"> + <xsl:value-of select="refmeta/refentrytitle"/> + </xsl:when> + <xsl:when test="refnamediv/refname"> + <xsl:value-of select="refnamediv/refname[1]"/> + </xsl:when> </xsl:choose> </xsl:variable> @@ -149,20 +204,29 @@ <xsl:text>ID recommended on </xsl:text> <xsl:value-of select="local-name(.)"/> <xsl:if test="$title != ''"> - <xsl:text>: </xsl:text> - <xsl:choose> - <xsl:when test="string-length($title) > 40"> - <xsl:value-of select="substring($title,1,40)"/> - <xsl:text>...</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$title"/> - </xsl:otherwise> - </xsl:choose> + <xsl:text>: </xsl:text> + <xsl:choose> + <xsl:when test="string-length($title) > 40"> + <xsl:value-of select="substring($title,1,40)"/> + <xsl:text>...</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$title"/> + </xsl:otherwise> + </xsl:choose> </xsl:if> </xsl:message> </xsl:if> </xsl:template> +<xsl:template match="*" mode="class.attribute"> + <xsl:param name="class" select="local-name(.)"/> + <!-- permit customization of class attributes --> + <!-- Use element name by default --> + <xsl:attribute name="class"> + <xsl:value-of select="$class"/> + </xsl:attribute> +</xsl:template> + </xsl:stylesheet> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/htmltbl.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/htmltbl.xsl diff -u phpdoc/docbook/docbook-xsl/html/htmltbl.xsl:1.1 phpdoc/docbook/docbook-xsl/html/htmltbl.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/htmltbl.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/htmltbl.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version="1.0"> <!-- ******************************************************************** - $Id: htmltbl.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: htmltbl.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/index.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/index.xsl diff -u phpdoc/docbook/docbook-xsl/html/index.xsl:1.1 phpdoc/docbook/docbook-xsl/html/index.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/index.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/index.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: index.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: index.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -24,7 +24,8 @@ <xsl:call-template name="id.warning"/> <xsl:if test="count(*)>0 or $generate.index != '0'"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -78,7 +79,8 @@ <xsl:call-template name="id.warning"/> <xsl:if test="count(*)>0 or $generate.index != '0'"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -101,6 +103,8 @@ </xsl:if> </xsl:template> +<xsl:template match="index/indexinfo"></xsl:template> +<xsl:template match="index/info"></xsl:template> <xsl:template match="index/title"></xsl:template> <xsl:template match="index/subtitle"></xsl:template> <xsl:template match="index/titleabbrev"></xsl:template> @@ -110,7 +114,8 @@ <xsl:template match="indexdiv"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -126,7 +131,8 @@ </xsl:template> <xsl:template match="indexdiv/title"> - <h3 class="{name(.)}"> + <h3> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </h3> </xsl:template> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/info.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/info.xsl diff -u phpdoc/docbook/docbook-xsl/html/info.xsl:1.1 phpdoc/docbook/docbook-xsl/html/info.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/info.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/info.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: info.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: info.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -23,7 +23,8 @@ <!-- called from named templates in a given mode --> <xsl:template match="corpauthor"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </span> </xsl:template> @@ -31,7 +32,8 @@ <!-- ==================================================================== --> <xsl:template match="jobtitle"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </span> </xsl:template> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/inline.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/inline.xsl diff -u phpdoc/docbook/docbook-xsl/html/inline.xsl:1.1 phpdoc/docbook/docbook-xsl/html/inline.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/inline.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/inline.xsl Tue Jan 30 18:16:38 2007 @@ -19,7 +19,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: inline.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: inline.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -32,61 +32,123 @@ <xsl:param name="content"> <xsl:apply-templates/> </xsl:param> + <xsl:param name="a.target"/> + <xsl:param name="linkend" select="$node/@linkend"/> + <xsl:param name="xhref" select="$node/@xlink:href"/> <xsl:variable name="link"> <xsl:choose> - <xsl:when test="$node/@xlink:href - and (not($node/@xlink:type) or $node/@xlink:type='simple')"> - <a> - <xsl:if test="@xlink.title"> - <xsl:attribute name="title"> - <xsl:value-of select="@xlink:title"/> - </xsl:attribute> - </xsl:if> + <xsl:when test="$xhref and + (not($node/@xlink:type) or + $node/@xlink:type='simple')"> + + <!-- Is it a local idref or a uri? --> + <xsl:variable name="is.idref"> + <xsl:choose> + <!-- if the href starts with # and does not contain an "(" --> + <!-- or if the href starts with #xpointer(id(, it's just an ID --> + <xsl:when test="starts-with($xhref,'#') + and (not(contains($xhref,'(')) + or starts-with($xhref, + '#xpointer(id('))">1</xsl:when> + <xsl:otherwise>0</xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:choose> + <xsl:when test="$is.idref = 1"> + + <xsl:variable name="idref"> + <xsl:call-template name="xpointer.idref"> + <xsl:with-param name="xpointer" select="$xhref"/> + </xsl:call-template> + </xsl:variable> + + <xsl:variable name="targets" select="key('id',$idref)"/> + <xsl:variable name="target" select="$targets[1]"/> + + <xsl:call-template name="check.id.unique"> + <xsl:with-param name="linkend" select="$idref"/> + </xsl:call-template> - <xsl:attribute name="href"> <xsl:choose> - <!-- if the href starts with # and does not contain an "(" --> - <!-- or if the href starts with #xpointer(id(, it's just an ID --> - <xsl:when test="starts-with(@xlink:href,'#') - and (not(contains(@xlink:href,'(')) - or starts-with(@xlink:href,'#xpointer(id('))"> - <xsl:variable name="idref"> - <xsl:call-template name="xpointer.idref"> - <xsl:with-param name="xpointer" select="@xlink:href"/> - </xsl:call-template> - </xsl:variable> - - <xsl:variable name="targets" select="key('id',$idref)"/> - <xsl:variable name="target" select="$targets[1]"/> - - <xsl:call-template name="check.id.unique"> - <xsl:with-param name="linkend" select="@linkend"/> - </xsl:call-template> - - <xsl:choose> - <xsl:when test="count($target) = 0"> - <xsl:message> - <xsl:text>XLink to nonexistent id: </xsl:text> - <xsl:value-of select="$idref"/> - </xsl:message> - <xsl:text>???</xsl:text> - </xsl:when> - <xsl:otherwise> + <xsl:when test="count($target) = 0"> + <xsl:message> + <xsl:text>XLink to nonexistent id: </xsl:text> + <xsl:value-of select="$idref"/> + </xsl:message> + <xsl:copy-of select="$content"/> + </xsl:when> + + <xsl:otherwise> + <a> + <xsl:attribute name="href"> <xsl:call-template name="href.target"> <xsl:with-param name="object" select="$target"/> </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - </xsl:when> + </xsl:attribute> - <!-- otherwise it's a URI --> - <xsl:otherwise> - <xsl:value-of select="@xlink:href"/> + <xsl:choose> + <xsl:when test="$node/@xlink.title"> + <xsl:attribute name="title"> + <xsl:value-of select="$node/@xlink:title"/> + </xsl:attribute> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="$target" + mode="html.title.attribute"/> + </xsl:otherwise> + </xsl:choose> + + <xsl:if test="$a.target"> + <xsl:attribute name="target"> + <xsl:value-of select="$a.target"/> + </xsl:attribute> + </xsl:if> + + <xsl:copy-of select="$content"/> + + </a> </xsl:otherwise> </xsl:choose> + </xsl:when> + + <!-- otherwise it's a URI --> + <xsl:otherwise> + <a> + <xsl:attribute name="href"> + <xsl:value-of select="$xhref"/> + </xsl:attribute> + <xsl:if test="$node/@xlink.title"> + <xsl:attribute name="title"> + <xsl:value-of select="$node/@xlink:title"/> + </xsl:attribute> + </xsl:if> + <xsl:copy-of select="$content"/> + </a> + </xsl:otherwise> + </xsl:choose> + </xsl:when> + + <xsl:when test="$linkend"> + <xsl:variable name="targets" select="key('id',$linkend)"/> + <xsl:variable name="target" select="$targets[1]"/> + + <xsl:call-template name="check.id.unique"> + <xsl:with-param name="linkend" select="$linkend"/> + </xsl:call-template> + + <a> + <xsl:attribute name="href"> + <xsl:call-template name="href.target"> + <xsl:with-param name="object" select="$target"/> + </xsl:call-template> </xsl:attribute> + + <xsl:apply-templates select="$target" mode="html.title.attribute"/> + <xsl:copy-of select="$content"/> + </a> </xsl:when> <xsl:otherwise> @@ -138,7 +200,8 @@ </xsl:with-param> </xsl:call-template> </xsl:param> - <code class="{local-name(.)}"> + <code> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"/> <xsl:call-template name="generate.html.title"/> <xsl:copy-of select="$content"/> @@ -169,7 +232,8 @@ <xsl:copy-of select="$content"/> </xsl:when> <xsl:otherwise> - <strong class="{local-name(.)}"> + <strong> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:copy-of select="$content"/> </strong> </xsl:otherwise> @@ -187,7 +251,8 @@ </xsl:with-param> </xsl:call-template> </xsl:param> - <em class="{local-name(.)}"> + <em> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="generate.html.title"/> <xsl:call-template name="dir"/> <xsl:copy-of select="$content"/> @@ -212,21 +277,23 @@ or local-name(../..) = 'example' or local-name(../..) = 'table' or local-name(../..) = 'formalpara')"> - <code class="{local-name(.)}"> + <code> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="generate.html.title"/> - <xsl:call-template name="dir"/> + <xsl:call-template name="dir"/> <xsl:copy-of select="$content"/> - <xsl:call-template name="apply-annotations"/> + <xsl:call-template name="apply-annotations"/> </code> </xsl:when> <xsl:otherwise> - <strong class="{local-name(.)}"> + <strong> + <xsl:apply-templates select="." mode="class.attribute"/> <code> <xsl:call-template name="generate.html.title"/> - <xsl:call-template name="dir"/> + <xsl:call-template name="dir"/> <xsl:copy-of select="$content"/> </code> - <xsl:call-template name="apply-annotations"/> + <xsl:call-template name="apply-annotations"/> </strong> </xsl:otherwise> </xsl:choose> @@ -241,7 +308,8 @@ </xsl:with-param> </xsl:call-template> </xsl:param> - <em class="{local-name(.)}"> + <em> + <xsl:apply-templates select="." mode="class.attribute"/> <code> <xsl:call-template name="generate.html.title"/> <xsl:call-template name="dir"/> @@ -289,26 +357,53 @@ <!-- some special cases --> <xsl:template match="author"> - <span class="{name(.)}"> + <xsl:param name="content"> <xsl:call-template name="anchor"/> - <xsl:call-template name="person.name"/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:call-template name="person.name"/> + </xsl:with-param> + </xsl:call-template> <xsl:call-template name="apply-annotations"/> + </xsl:param> + + <span> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:copy-of select="$content"/> </span> </xsl:template> <xsl:template match="editor"> - <span class="{name(.)}"> + <xsl:param name="content"> <xsl:call-template name="anchor"/> - <xsl:call-template name="person.name"/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:call-template name="person.name"/> + </xsl:with-param> + </xsl:call-template> <xsl:call-template name="apply-annotations"/> + </xsl:param> + + <span> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:copy-of select="$content"/> </span> </xsl:template> <xsl:template match="othercredit"> - <span class="{name(.)}"> + <xsl:param name="content"> <xsl:call-template name="anchor"/> - <xsl:call-template name="person.name"/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:call-template name="person.name"/> + </xsl:with-param> + </xsl:call-template> <xsl:call-template name="apply-annotations"/> + </xsl:param> + + <span> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:copy-of select="$content"/> </span> </xsl:template> @@ -610,9 +705,9 @@ <span> <xsl:choose> <xsl:when test="@role and $emphasis.propagates.style != 0"> - <xsl:attribute name="class"> - <xsl:value-of select="@role"/> - </xsl:attribute> + <xsl:apply-templates select="." mode="class.attribute"> + <xsl:with-param name="class" select="@role"/> + </xsl:apply-templates> </xsl:when> <xsl:otherwise> <xsl:attribute name="class"> @@ -653,7 +748,8 @@ </xsl:template> <xsl:template match="foreignphrase"> - <span class="foreignphrase"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="@lang or @xml:lang"> <xsl:call-template name="language.attribute"/> </xsl:if> @@ -672,9 +768,9 @@ <xsl:call-template name="language.attribute"/> </xsl:if> <xsl:if test="@role and $phrase.propagates.style != 0"> - <xsl:attribute name="class"> - <xsl:value-of select="@role"/> - </xsl:attribute> + <xsl:apply-templates select="." mode="class.attribute"> + <xsl:with-param name="class" select="@role"/> + </xsl:apply-templates> </xsl:if> <xsl:call-template name="dir"/> <xsl:call-template name="anchor"/> @@ -691,7 +787,7 @@ <xsl:variable name="depth"> <xsl:call-template name="dot.count"> <xsl:with-param name="string"> - <xsl:number level="multiple"/> + <xsl:number level="multiple"/> </xsl:with-param> </xsl:call-template> </xsl:variable> @@ -718,7 +814,8 @@ </xsl:template> <xsl:template match="lineannotation"> - <em class="{local-name(.)}"> + <em> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="inline.charseq"/> </em> </xsl:template> @@ -777,9 +874,9 @@ <xsl:choose> <xsl:when test="$target"> <a> - <xsl:if test="@id"> + <xsl:if test="@id or @xml:id"> <xsl:attribute name="name"> - <xsl:value-of select="@id"/> + <xsl:value-of select="(@id|@xml:id)[1]"/> </xsl:attribute> </xsl:if> @@ -858,14 +955,9 @@ </xsl:when> <xsl:otherwise> <xsl:variable name="id"> - <xsl:choose> - <xsl:when test="$cterm/@id"> - <xsl:value-of select="$cterm/@id"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="generate-id($cterm)"/> - </xsl:otherwise> - </xsl:choose> + <xsl:call-template name="object.id"> + <xsl:with-param name="object" select="$cterm"/> + </xsl:call-template> </xsl:variable> <a href="{$chunkbase}#{$id}"> <xsl:call-template name="inline.italicseq"> @@ -905,9 +997,9 @@ </xsl:when> <xsl:otherwise> <a> - <xsl:if test="@id"> + <xsl:if test="@id or @xml:id"> <xsl:attribute name="name"> - <xsl:value-of select="@id"/> + <xsl:value-of select="(@id|@xml:id)[1]"/> </xsl:attribute> </xsl:if> @@ -932,7 +1024,8 @@ </xsl:template> <xsl:template match="termdef"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="generate.html.title"/> <xsl:call-template name="gentext.template"> <xsl:with-param name="context" select="'termdef'"/> @@ -960,8 +1053,7 @@ </xsl:choose> </xsl:param> - <code class="sgmltag-{$class}"> - <xsl:call-template name="generate.html.title"/> + <xsl:variable name="content"> <xsl:choose> <xsl:when test="$class='attribute'"> <xsl:apply-templates/> @@ -1021,6 +1113,16 @@ <xsl:apply-templates/> </xsl:otherwise> </xsl:choose> + </xsl:variable> + + <code> + <xsl:apply-templates select="." mode="class.attribute"> + <xsl:with-param name="class" select="concat('sgmltag-', $class)"/> + </xsl:apply-templates> + <xsl:call-template name="generate.html.title"/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content" select="$content"/> + </xsl:call-template> </code> </xsl:template> @@ -1031,8 +1133,11 @@ <xsl:text><</xsl:text> </xsl:if> <a> - <xsl:attribute name="href">mailto:<xsl:value-of select="."/></xsl:attribute> - <xsl:apply-templates/> + <xsl:attribute name="href"> + <xsl:text>mailto:</xsl:text> + <xsl:value-of select="."/> + </xsl:attribute> + <xsl:apply-templates/> </a> <xsl:if test="not($email.delimiters.enabled = 0)"> <xsl:text>></xsl:text> @@ -1092,8 +1197,8 @@ <xsl:otherwise> <xsl:variable name="node" select="$nodelist[$count=position()]"/> <xsl:choose> - <xsl:when test="name($node)='guimenuitem' - or name($node)='guisubmenu'"> + <xsl:when test="local-name($node)='guimenuitem' + or local-name($node)='guisubmenu'"> <xsl:value-of select="$menuchoice.menu.separator"/> </xsl:when> <xsl:otherwise> @@ -1120,12 +1225,23 @@ <xsl:template match="citation"> <!-- todo: integrate with bibliography collection --> <xsl:variable name="targets" select="(//biblioentry | //bibliomixed)[abbrev = string(current())]"/> + <xsl:variable name="target" select="$targets[1]"/> <xsl:choose> - <xsl:when test="$targets"> - <xsl:call-template name="xref"> - <xsl:with-param name="targets" select="$targets"/> - </xsl:call-template> + <!-- try automatic linking based on match to abbrev --> + <xsl:when test="$target and not(xref) and not(link)"> + + <xsl:text>[</xsl:text> + <a> + <xsl:attribute name="href"> + <xsl:call-template name="href.target"> + <xsl:with-param name="object" select="$target"/> + </xsl:call-template> + </xsl:attribute> + + <xsl:call-template name="inline.charseq"/> + </a> + <xsl:text>]</xsl:text> </xsl:when> <xsl:otherwise> <xsl:text>[</xsl:text> @@ -1182,43 +1298,106 @@ <!-- ==================================================================== --> <xsl:template match="person"> - <span class="{name(.)}"> + <xsl:param name="content"> <xsl:call-template name="anchor"/> - <xsl:apply-templates select="personname"/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:apply-templates select="personname"/> + </xsl:with-param> + </xsl:call-template> + <xsl:call-template name="apply-annotations"/> + </xsl:param> + + <span> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:copy-of select="$content"/> </span> </xsl:template> <xsl:template match="personname"> - <span class="{name(.)}"> + <xsl:param name="content"> <xsl:call-template name="anchor"/> - <xsl:call-template name="person.name"/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:call-template name="person.name"/> + </xsl:with-param> + </xsl:call-template> + <xsl:call-template name="apply-annotations"/> + </xsl:param> + + <span> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:copy-of select="$content"/> </span> </xsl:template> <!-- ==================================================================== --> <xsl:template match="org"> - <span class="{name(.)}"> + <xsl:param name="content"> <xsl:call-template name="anchor"/> - <xsl:apply-templates/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:apply-templates/> + </xsl:with-param> + </xsl:call-template> + <xsl:call-template name="apply-annotations"/> + </xsl:param> + + <span> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:copy-of select="$content"/> </span> </xsl:template> <xsl:template match="orgname"> - <span class="{name(.)}"> - <xsl:apply-templates/> + <xsl:param name="content"> + <xsl:call-template name="anchor"/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:apply-templates/> + </xsl:with-param> + </xsl:call-template> + <xsl:call-template name="apply-annotations"/> + </xsl:param> + + <span> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:copy-of select="$content"/> </span> </xsl:template> <xsl:template match="orgdiv"> - <span class="{name(.)}"> - <xsl:apply-templates/> + <xsl:param name="content"> + <xsl:call-template name="anchor"/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:apply-templates/> + </xsl:with-param> + </xsl:call-template> + <xsl:call-template name="apply-annotations"/> + </xsl:param> + + <span> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:copy-of select="$content"/> </span> </xsl:template> <xsl:template match="affiliation"> - <span class="{name(.)}"> - <xsl:apply-templates/> + <xsl:param name="content"> + <xsl:call-template name="anchor"/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:call-template name="person.name"/> + </xsl:with-param> + </xsl:call-template> + <xsl:call-template name="apply-annotations"/> + </xsl:param> + + <span> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:copy-of select="$content"/> </span> </xsl:template> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/keywords.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/keywords.xsl diff -u phpdoc/docbook/docbook-xsl/html/keywords.xsl:1.1 phpdoc/docbook/docbook-xsl/html/keywords.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/keywords.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/keywords.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: keywords.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: keywords.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/lists.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/lists.xsl diff -u phpdoc/docbook/docbook-xsl/html/lists.xsl:1.1 phpdoc/docbook/docbook-xsl/html/lists.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/lists.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/lists.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: lists.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: lists.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -15,7 +15,8 @@ <!-- ==================================================================== --> <xsl:template match="itemizedlist"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <xsl:if test="title"> <xsl:call-template name="formal.object.heading"/> @@ -135,7 +136,8 @@ </xsl:choose> </xsl:variable> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <xsl:if test="title"> @@ -254,7 +256,8 @@ </xsl:call-template> </xsl:variable> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <xsl:if test="title"> <xsl:call-template name="formal.object.heading"/> @@ -343,9 +346,9 @@ <xsl:otherwise> <p> <xsl:if test="@role and $para.propagates.style != 0"> - <xsl:attribute name="class"> - <xsl:value-of select="@role"/> - </xsl:attribute> + <xsl:apply-templates select="." mode="class.attribute"> + <xsl:with-param name="class" select="@role"/> + </xsl:apply-templates> </xsl:if> <xsl:call-template name="anchor"/> @@ -426,7 +429,11 @@ <xsl:template match="varlistentry/term"> <span class="term"> <xsl:call-template name="anchor"/> - <xsl:apply-templates/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:apply-templates/> + </xsl:with-param> + </xsl:call-template> <xsl:choose> <xsl:when test="position() = last()"/> <!-- do nothing --> <xsl:otherwise> @@ -475,7 +482,8 @@ </xsl:template> <xsl:template match="simplelist[@type='inline']"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <!-- if dbchoice PI exists, use that to determine the choice separator --> <!-- (that is, equivalent of "and" or "or" in current locale), or literal --> <!-- value of "choice" otherwise --> @@ -491,7 +499,11 @@ </xsl:variable> <xsl:for-each select="member"> - <xsl:apply-templates/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:apply-templates/> + </xsl:with-param> + </xsl:call-template> <xsl:choose> <xsl:when test="position() = last()"/> <!-- do nothing --> <xsl:otherwise> @@ -652,7 +664,11 @@ <xsl:template match="member"> <xsl:call-template name="anchor"/> - <xsl:apply-templates/> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:apply-templates/> + </xsl:with-param> + </xsl:call-template> </xsl:template> <!-- ==================================================================== --> @@ -682,7 +698,8 @@ |comment()[not(preceding-sibling::step)] |processing-instruction()[not(preceding-sibling::step)]"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"> <xsl:with-param name="conditional"> <xsl:choose> @@ -775,7 +792,8 @@ </xsl:call-template> </xsl:variable> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <xsl:choose> @@ -916,9 +934,10 @@ <!-- ==================================================================== --> <xsl:template match="calloutlist"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> - <xsl:if test="title"> + <xsl:if test="title|info/title"> <xsl:call-template name="formal.object.heading"/> </xsl:if> @@ -996,9 +1015,9 @@ <xsl:otherwise> <p> <xsl:if test="@role and $para.propagates.style != 0"> - <xsl:attribute name="class"> - <xsl:value-of select="@role"/> - </xsl:attribute> + <xsl:apply-templates select="." mode="class.attribute"> + <xsl:with-param name="class" select="@role"/> + </xsl:apply-templates> </xsl:if> <xsl:call-template name="anchor"/> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/maketoc.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/maketoc.xsl diff -u phpdoc/docbook/docbook-xsl/html/maketoc.xsl:1.1 phpdoc/docbook/docbook-xsl/html/maketoc.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/maketoc.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/maketoc.xsl Tue Jan 30 18:16:38 2007 @@ -4,7 +4,7 @@ exclude-result-prefixes="doc"> <!-- ******************************************************************** - $Id: maketoc.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: maketoc.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -45,7 +45,10 @@ <xsl:if test="$chunk != 0"> <xsl:call-template name="indent-spaces"/> - <tocentry linkend="{@id}"> + <xsl:variable name="id"> + <xsl:call-template name="object.id"/> + </xsl:variable> + <tocentry linkend="{$id}"> <xsl:processing-instruction name="dbhtml"> <xsl:text>filename="</xsl:text> <xsl:value-of select="$filename"/> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/manifest.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/manifest.xsl diff -u phpdoc/docbook/docbook-xsl/html/manifest.xsl:1.1 phpdoc/docbook/docbook-xsl/html/manifest.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/manifest.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/manifest.xsl Tue Jan 30 18:16:38 2007 @@ -4,7 +4,7 @@ exclude-result-prefixes="doc"> <!-- ******************************************************************** - $Id: manifest.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: manifest.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/math.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/math.xsl diff -u phpdoc/docbook/docbook-xsl/html/math.xsl:1.1 phpdoc/docbook/docbook-xsl/html/math.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/math.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/math.xsl Tue Jan 30 18:16:38 2007 @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: math.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: math.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -22,7 +22,8 @@ </xsl:template> <xsl:template match="mathphrase"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </span> </xsl:template> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/oldchunker.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/oldchunker.xsl diff -u phpdoc/docbook/docbook-xsl/html/oldchunker.xsl:1.1 phpdoc/docbook/docbook-xsl/html/oldchunker.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/oldchunker.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/oldchunker.xsl Tue Jan 30 18:16:38 2007 @@ -8,7 +8,7 @@ extension-element-prefixes="saxon redirect lxslt"> <!-- ******************************************************************** - $Id: oldchunker.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: oldchunker.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/onechunk.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/onechunk.xsl diff -u phpdoc/docbook/docbook-xsl/html/onechunk.xsl:1.1 phpdoc/docbook/docbook-xsl/html/onechunk.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/onechunk.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/onechunk.xsl Tue Jan 30 18:16:38 2007 @@ -5,7 +5,7 @@ exclude-result-prefixes="doc"> <!-- ******************************************************************** - $Id: onechunk.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: onechunk.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/param.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/param.xsl diff -u phpdoc/docbook/docbook-xsl/html/param.xsl:1.1 phpdoc/docbook/docbook-xsl/html/param.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/param.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/param.xsl Tue Jan 30 18:16:38 2007 @@ -4,7 +4,7 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" exclude-result-prefixes="src" version="1.0"> <!-- ******************************************************************** - $Id: param.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: param.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -175,6 +175,7 @@ </xsl:param> <xsl:param name="glossary.collection" select="''"/> +<xsl:param name="glossary.sort" select="0"/> <xsl:param name="glossentry.show.acronym" select="'no'"/> <xsl:param name="glossterm.auto.link" select="0"/> <xsl:param name="graphic.default.extension"/> @@ -288,6 +289,7 @@ <xsl:param name="olink.base.uri" select="''"/> <xsl:param name="olink.debug" select="0"/> <xsl:attribute-set name="olink.properties"> + <xsl:attribute name="show-destination">replace</xsl:attribute> </xsl:attribute-set> <xsl:param name="insert.olink.page.number">no</xsl:param> <xsl:param name="insert.olink.pdf.frag" select="0"/> @@ -327,6 +329,7 @@ <xsl:param name="punct.honorific" select="'.'"/> <xsl:param name="qanda.defaultlabel">number</xsl:param> <xsl:param name="qanda.inherit.numeration" select="1"/> +<xsl:param name="qanda.in.toc" select="0"/> <xsl:param name="qanda.nested.in.toc" select="0"/> <xsl:param name="qandadiv.autolabel" select="1"/> <xsl:param name="refentry.generate.name" select="1"/> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/pi.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/pi.xsl diff -u phpdoc/docbook/docbook-xsl/html/pi.xsl:1.1 phpdoc/docbook/docbook-xsl/html/pi.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/pi.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/pi.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: pi.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: pi.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/profile-chunk-code.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/profile-chunk-code.xsl diff -u phpdoc/docbook/docbook-xsl/html/profile-chunk-code.xsl:1.1 phpdoc/docbook/docbook-xsl/html/profile-chunk-code.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/profile-chunk-code.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/profile-chunk-code.xsl Tue Jan 30 18:16:38 2007 @@ -4,7 +4,7 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns:cf="http://docbook.sourceforge.net/xmlns/chunkfast/1.0" xmlns:ng="http://docbook.org/docbook-ng" xmlns:db="http://docbook.org/ns/docbook" xmlns:exslt="http://exslt.org/common" exslt:dummy="dummy" ng:dummy="dummy" db:dummy="dummy" extension-element-prefixes="exslt" version="1.0" exclude-result-prefixes="exsl cf ng db exslt"> <!-- ******************************************************************** - $Id: profile-chunk-code.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: profile-chunk-code.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -47,7 +47,8 @@ <xsl:choose> <xsl:when test="$chunk != 0"> - <cf:div class="{local-name(.)}" id="{generate-id()}"> + <cf:div id="{generate-id()}"> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates select="*" mode="find.chunks"/> </cf:div> </xsl:when> @@ -69,13 +70,13 @@ <xsl:variable name="chunks" select="exsl:node-set($chunk.hierarchy)//cf:div"/> <xsl:variable name="genid" select="generate-id()"/> - <xsl:variable name="div" select="$chunks[@id=$genid]"/> + <xsl:variable name="div" select="$chunks[@id=$genid or @xml:id=$genid]"/> <xsl:variable name="prevdiv" select="($div/preceding-sibling::cf:div|$div/preceding::cf:div|$div/parent::cf:div)[last()]"/> - <xsl:variable name="prev" select="key('genid', $prevdiv/@id)"/> + <xsl:variable name="prev" select="key('genid', ($prevdiv/@id|$prevdiv/@xml:id)[1])"/> <xsl:variable name="nextdiv" select="($div/following-sibling::cf:div|$div/following::cf:div|$div/cf:div)[1]"/> - <xsl:variable name="next" select="key('genid', $nextdiv/@id)"/> + <xsl:variable name="next" select="key('genid', ($nextdiv/@id|$nextdiv/@xml:id)[1])"/> <xsl:choose> <xsl:when test="$onechunk != 0 and parent::*"> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/profile-chunk.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/profile-chunk.xsl diff -u phpdoc/docbook/docbook-xsl/html/profile-chunk.xsl:1.1 phpdoc/docbook/docbook-xsl/html/profile-chunk.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/profile-chunk.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/profile-chunk.xsl Tue Jan 30 18:16:38 2007 @@ -4,7 +4,7 @@ exclude-result-prefixes="exsl"> <!-- ******************************************************************** - $Id: profile-chunk.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: profile-chunk.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/profile-docbook.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/profile-docbook.xsl diff -u phpdoc/docbook/docbook-xsl/html/profile-docbook.xsl:1.1 phpdoc/docbook/docbook-xsl/html/profile-docbook.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/profile-docbook.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/profile-docbook.xsl Tue Jan 30 18:16:38 2007 @@ -6,7 +6,7 @@ <xsl:output method="html" encoding="ISO-8859-1" indent="no"/> <!-- ******************************************************************** - $Id: profile-docbook.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: profile-docbook.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -64,7 +64,6 @@ <xsl:include href="ebnf.xsl"/> <xsl:include href="chunker.xsl"/> <xsl:include href="html-rtf.xsl"/> -<xsl:include href="docbookng.xsl"/> <xsl:include href="annotations.xsl"/> <xsl:include href="../common/stripns.xsl"/> @@ -139,7 +138,7 @@ <base href="{$html.base}"/> </xsl:if> - <meta name="generator" content="DocBook XSL Stylesheets V{$VERSION}"/> + <meta name="generator" content="DocBook {$DistroTitle} V{$VERSION}"/> <xsl:if test="$generate.meta.abstract != 0"> <xsl:variable name="info" select="(articleinfo |bookinfo |prefaceinfo |chapterinfo |appendixinfo |sectioninfo |sect1info |sect2info |sect3info |sect4info |sect5info |referenceinfo |refentryinfo |partinfo |info |docinfo)[1]"/> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/profile-onechunk.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/profile-onechunk.xsl diff -u phpdoc/docbook/docbook-xsl/html/profile-onechunk.xsl:1.1 phpdoc/docbook/docbook-xsl/html/profile-onechunk.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/profile-onechunk.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/profile-onechunk.xsl Tue Jan 30 18:16:38 2007 @@ -5,7 +5,7 @@ exclude-result-prefixes="doc"> <!-- ******************************************************************** - $Id: profile-onechunk.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: profile-onechunk.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/qandaset.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/qandaset.xsl diff -u phpdoc/docbook/docbook-xsl/html/qandaset.xsl:1.1 phpdoc/docbook/docbook-xsl/html/qandaset.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/qandaset.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/qandaset.xsl Tue Jan 30 18:16:38 2007 @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: qandaset.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: qandaset.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -17,11 +17,11 @@ <!-- ==================================================================== --> <xsl:template match="qandaset"> - <xsl:variable name="title" select="(blockinfo/title|title)[1]"/> - <xsl:variable name="preamble" select="*[name(.) != 'title' - and name(.) != 'titleabbrev' - and name(.) != 'qandadiv' - and name(.) != 'qandaentry']"/> + <xsl:variable name="title" select="(blockinfo/title|info/title|title)[1]"/> + <xsl:variable name="preamble" select="*[local-name(.) != 'title' + and local-name(.) != 'titleabbrev' + and local-name(.) != 'qandadiv' + and local-name(.) != 'qandaentry']"/> <xsl:variable name="toc"> <xsl:call-template name="dbhtml-attribute"> <xsl:with-param name="pis" @@ -36,7 +36,8 @@ </xsl:call-template> </xsl:variable> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates select="$title"/> <xsl:if test="((contains($toc.params, 'toc') and $toc != '0') or $toc = '1') and not(ancestor::answer and not($qanda.nested.in.toc=0))"> @@ -47,33 +48,39 @@ </div> </xsl:template> -<xsl:template match="qandaset/blockinfo/title|qandaset/title"> +<xsl:template match="qandaset/blockinfo/title| + qandaset/info/title| + qandaset/title"> <xsl:variable name="qalevel"> <xsl:call-template name="qanda.section.level"/> </xsl:variable> <xsl:element name="h{string(number($qalevel)+1)}"> <xsl:attribute name="class"> - <xsl:value-of select="name(.)"/> + <xsl:value-of select="local-name(.)"/> </xsl:attribute> + <xsl:call-template name="anchor"> + <xsl:with-param name="node" select=".."/> + <xsl:with-param name="conditional" select="0"/> + </xsl:call-template> <xsl:apply-templates/> </xsl:element> </xsl:template> -<xsl:template match="qandaset/blockinfo"> +<xsl:template match="qandaset/blockinfo|qandaset/info"> <!-- what should this template really do? --> <xsl:apply-templates select="legalnotice" mode="titlepage.mode"/> </xsl:template> <xsl:template match="qandadiv"> - <xsl:variable name="preamble" select="*[name(.) != 'title' - and name(.) != 'titleabbrev' - and name(.) != 'qandadiv' - and name(.) != 'qandaentry']"/> + <xsl:variable name="preamble" select="*[local-name(.) != 'title' + and local-name(.) != 'titleabbrev' + and local-name(.) != 'qandadiv' + and local-name(.) != 'qandaentry']"/> - <xsl:if test="blockinfo/title|title"> + <xsl:if test="blockinfo/title|info/title|title"> <tr class="qandadiv"> <td align="left" valign="top" colspan="2"> - <xsl:apply-templates select="(blockinfo/title|title)[1]"/> + <xsl:apply-templates select="(blockinfo/title|info/title|title)[1]"/> </td> </tr> </xsl:if> @@ -109,14 +116,16 @@ <xsl:apply-templates select="qandadiv|qandaentry"/> </xsl:template> -<xsl:template match="qandadiv/blockinfo/title|qandadiv/title"> +<xsl:template match="qandadiv/blockinfo/title| + qandadiv/info/title| + qandadiv/title"> <xsl:variable name="qalevel"> <xsl:call-template name="qandadiv.section.level"/> </xsl:variable> <xsl:element name="h{string(number($qalevel)+1)}"> <xsl:attribute name="class"> - <xsl:value-of select="name(.)"/> + <xsl:value-of select="local-name(.)"/> </xsl:attribute> <xsl:call-template name="anchor"> <xsl:with-param name="node" select=".."/> @@ -148,7 +157,8 @@ </xsl:choose> </xsl:variable> - <tr class="{name(.)}"> + <tr> + <xsl:apply-templates select="." mode="class.attribute"/> <td align="left" valign="top"> <xsl:call-template name="anchor"> <xsl:with-param name="node" select=".."/> @@ -174,10 +184,10 @@ <td align="left" valign="top"> <xsl:choose> <xsl:when test="$deflabel = 'none' and not(label)"> - <b><xsl:apply-templates select="*[name(.) != 'label']"/></b> + <b><xsl:apply-templates select="*[local-name(.) != 'label']"/></b> </xsl:when> <xsl:otherwise> - <xsl:apply-templates select="*[name(.) != 'label']"/> + <xsl:apply-templates select="*[local-name(.) != 'label']"/> </xsl:otherwise> </xsl:choose> </td> @@ -197,7 +207,7 @@ </xsl:choose> </xsl:variable> - <tr class="{name(.)}"> + <tr class="{local-name(.)}"> <td align="left" valign="top"> <xsl:call-template name="anchor"/> <xsl:variable name="answer.label"> @@ -210,8 +220,8 @@ </xsl:if> </td> <td align="left" valign="top"> - <xsl:apply-templates select="*[name(.) != 'label' - and name(.) != 'qandaentry']"/> + <xsl:apply-templates select="*[local-name(.) != 'label' + and local-name(.) != 'qandaentry']"/> <!-- * handle nested answer/qandaentry instances --> <!-- * (bug 1509043 from Daniel Leidert) --> <xsl:if test="descendant::question"> @@ -241,7 +251,9 @@ <dd><xsl:call-template name="process.qanda.toc"/></dd> </xsl:template> -<xsl:template match="qandadiv/blockinfo/title|qandadiv/title" mode="qandatoc.mode"> +<xsl:template match="qandadiv/blockinfo/title| + qandadiv/info/title| + qandadiv/title" mode="qandatoc.mode"> <xsl:variable name="qalevel"> <xsl:call-template name="qandadiv.section.level"/> </xsl:variable> @@ -276,7 +288,7 @@ <xsl:template match="question" mode="qandatoc.mode"> <xsl:variable name="firstch"> - <xsl:apply-templates select="(*[name(.)!='label'])[1]"/> + <xsl:apply-templates select="(*[local-name(.)!='label'])[1]"/> </xsl:variable> <xsl:variable name="deflabel"> <xsl:choose> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/refentry.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/refentry.xsl diff -u phpdoc/docbook/docbook-xsl/html/refentry.xsl:1.1 phpdoc/docbook/docbook-xsl/html/refentry.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/refentry.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/refentry.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: refentry.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: refentry.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -17,7 +17,8 @@ <xsl:template match="reference"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -85,7 +86,8 @@ <xsl:template match="refentry"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -105,6 +107,7 @@ </xsl:template> <xsl:template match="refentry/docinfo|refentry/refentryinfo"></xsl:template> +<xsl:template match="refentry/info"></xsl:template> <xsl:template match="refentrytitle|refname|refdescriptor" mode="title"> <xsl:apply-templates/> @@ -129,7 +132,8 @@ </xsl:template> <xsl:template match="refnamediv"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -205,7 +209,8 @@ </xsl:template> <xsl:template match="refsynopsisdiv"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -237,7 +242,8 @@ </xsl:template> <xsl:template match="refsection|refsect1|refsect2|refsect3"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -290,9 +296,11 @@ </h4> </xsl:template> -<xsl:template match="refsect1info"></xsl:template> -<xsl:template match="refsect2info"></xsl:template> -<xsl:template match="refsect3info"></xsl:template> +<xsl:template match="refsectioninfo|refsection/info"></xsl:template> +<xsl:template match="refsect1info|refsect1/info"></xsl:template> +<xsl:template match="refsect2info|refsect2/info"></xsl:template> +<xsl:template match="refsect3info|refsect3/info"></xsl:template> + <!-- ==================================================================== --> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/sections.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/sections.xsl diff -u phpdoc/docbook/docbook-xsl/html/sections.xsl:1.1 phpdoc/docbook/docbook-xsl/html/sections.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/sections.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/sections.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: sections.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: sections.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -19,7 +19,8 @@ <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -99,7 +100,8 @@ <xsl:template match="sect1"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -151,7 +153,8 @@ <xsl:template match="sect2"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -203,7 +206,8 @@ <xsl:template match="sect3"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -255,7 +259,8 @@ <xsl:template match="sect4"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -307,7 +312,8 @@ <xsl:template match="sect5"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -359,7 +365,8 @@ <xsl:template match="simplesect"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -378,35 +385,42 @@ <xsl:template match="section/titleabbrev"></xsl:template> <xsl:template match="section/subtitle"></xsl:template> <xsl:template match="sectioninfo"></xsl:template> +<xsl:template match="section/info"></xsl:template> <xsl:template match="sect1/title"></xsl:template> <xsl:template match="sect1/titleabbrev"></xsl:template> <xsl:template match="sect1/subtitle"></xsl:template> <xsl:template match="sect1info"></xsl:template> +<xsl:template match="sect1/info"></xsl:template> <xsl:template match="sect2/title"></xsl:template> <xsl:template match="sect2/subtitle"></xsl:template> <xsl:template match="sect2/titleabbrev"></xsl:template> <xsl:template match="sect2info"></xsl:template> +<xsl:template match="sect2/info"></xsl:template> <xsl:template match="sect3/title"></xsl:template> <xsl:template match="sect3/subtitle"></xsl:template> <xsl:template match="sect3/titleabbrev"></xsl:template> <xsl:template match="sect3info"></xsl:template> +<xsl:template match="sect3/info"></xsl:template> <xsl:template match="sect4/title"></xsl:template> <xsl:template match="sect4/subtitle"></xsl:template> <xsl:template match="sect4/titleabbrev"></xsl:template> <xsl:template match="sect4info"></xsl:template> +<xsl:template match="sect4/info"></xsl:template> <xsl:template match="sect5/title"></xsl:template> <xsl:template match="sect5/subtitle"></xsl:template> <xsl:template match="sect5/titleabbrev"></xsl:template> <xsl:template match="sect5info"></xsl:template> +<xsl:template match="sect5/info"></xsl:template> <xsl:template match="simplesect/title"></xsl:template> <xsl:template match="simplesect/subtitle"></xsl:template> <xsl:template match="simplesect/titleabbrev"></xsl:template> +<xsl:template match="simplesect/info"></xsl:template> <!-- ==================================================================== --> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/synop.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/synop.xsl diff -u phpdoc/docbook/docbook-xsl/html/synop.xsl:1.1 phpdoc/docbook/docbook-xsl/html/synop.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/synop.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/synop.xsl Tue Jan 30 18:16:38 2007 @@ -6,7 +6,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: synop.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: synop.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -22,7 +22,8 @@ <!-- ==================================================================== --> <xsl:template match="cmdsynopsis"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <p> <xsl:call-template name="anchor"/> <xsl:apply-templates/> @@ -140,7 +141,10 @@ <xsl:apply-templates select="." mode="synopfragment.number"/> </xsl:variable> <p> - <a name="{@id}"> + <xsl:variable name="id"> + <xsl:call-template name="object.id"/> + </xsl:variable> + <a name="{$id}"> <xsl:text>(</xsl:text> <xsl:value-of select="$snum"/> <xsl:text>)</xsl:text> @@ -155,7 +159,10 @@ </xsl:template> <xsl:template match="funcsynopsisinfo"> - <pre class="{name(.)}"><xsl:apply-templates/></pre> + <pre> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:apply-templates/> + </pre> </xsl:template> <!-- ====================================================================== --> @@ -228,7 +235,8 @@ </xsl:template> <xsl:template match="funcdef" mode="kr-nontabular"> - <code class="{name(.)}"> + <code> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="kr-nontabular"/> <xsl:text>(</xsl:text> </code> @@ -344,7 +352,8 @@ </xsl:template> <xsl:template match="funcdef" mode="kr-tabular"> - <code class="{name(.)}"> + <code> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="kr-tabular"/> <xsl:text>(</xsl:text> </code> @@ -509,7 +518,8 @@ </xsl:template> <xsl:template match="funcdef" mode="ansi-nontabular"> - <code class="{name(.)}"> + <code> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="ansi-nontabular"/> <xsl:text>(</xsl:text> </code> @@ -595,7 +605,8 @@ </xsl:template> <xsl:template match="funcdef" mode="ansi-tabular"> - <code class="{name(.)}"> + <code> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="ansi-tabular"/> <xsl:text>(</xsl:text> </code> @@ -752,7 +763,7 @@ <xsl:otherwise> <xsl:message> <xsl:text>Unrecognized language on </xsl:text> - <xsl:value-of select="name(.)"/> + <xsl:value-of select="local-name(.)"/> <xsl:text>: </xsl:text> <xsl:value-of select="$language"/> </xsl:message> @@ -778,7 +789,8 @@ <!-- ===== Java ======================================================== --> <xsl:template match="classsynopsis" mode="java"> - <pre class="{name(.)}"> + <pre> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates select="ooclass[1]" mode="java"/> <xsl:if test="ooclass[preceding-sibling::*]"> <xsl:text> extends</xsl:text> @@ -824,13 +836,15 @@ <xsl:text> </xsl:text> </xsl:otherwise> </xsl:choose> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="java"/> </span> </xsl:template> -<xsl:template match="modifier" mode="java"> - <span class="{name(.)}"> +<xsl:template match="modifier|package" mode="java"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="java"/> <xsl:if test="following-sibling::*"> <xsl:text> </xsl:text> @@ -839,34 +853,38 @@ </xsl:template> <xsl:template match="classname" mode="java"> - <xsl:if test="name(preceding-sibling::*[1]) = 'classname'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'classname'"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="java"/> </span> </xsl:template> <xsl:template match="interfacename" mode="java"> - <xsl:if test="name(preceding-sibling::*[1]) = 'interfacename'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'interfacename'"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="java"/> </span> </xsl:template> <xsl:template match="exceptionname" mode="java"> - <xsl:if test="name(preceding-sibling::*[1]) = 'exceptionname'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'exceptionname'"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="java"/> </span> </xsl:template> <xsl:template match="fieldsynopsis" mode="java"> - <code class="{name(.)}"> + <code> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="parent::classsynopsis"> <xsl:text> </xsl:text> </xsl:if> @@ -877,34 +895,39 @@ </xsl:template> <xsl:template match="type" mode="java"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="java"/> <xsl:text> </xsl:text> </span> </xsl:template> <xsl:template match="varname" mode="java"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="java"/> <xsl:text> </xsl:text> </span> </xsl:template> <xsl:template match="initializer" mode="java"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:text>= </xsl:text> <xsl:apply-templates mode="java"/> </span> </xsl:template> <xsl:template match="void" mode="java"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:text>void </xsl:text> </span> </xsl:template> <xsl:template match="methodname" mode="java"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="java"/> </span> </xsl:template> @@ -921,22 +944,24 @@ </xsl:call-template> </xsl:if> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="java"/> </span> </xsl:template> <xsl:template match="parameter" mode="java"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="java"/> </span> </xsl:template> <xsl:template mode="java" match="constructorsynopsis|destructorsynopsis|methodsynopsis"> - <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[name(.) != 'modifier']]"/> - <xsl:variable name="notmod" select="*[name(.) != 'modifier']"/> - <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[name(.) != 'modifier']]"/> + <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[local-name(.) != 'modifier']]"/> + <xsl:variable name="notmod" select="*[local-name(.) != 'modifier']"/> + <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"/> <xsl:variable name="decl"> <xsl:if test="parent::classsynopsis"> <xsl:text> </xsl:text> @@ -944,14 +969,15 @@ <xsl:apply-templates select="$start-modifiers" mode="java"/> <!-- type --> - <xsl:if test="name($notmod[1]) != 'methodname'"> + <xsl:if test="local-name($notmod[1]) != 'methodname'"> <xsl:apply-templates select="$notmod[1]" mode="java"/> </xsl:if> <xsl:apply-templates select="methodname" mode="java"/> </xsl:variable> - <code class="{name(.)}"> + <code> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:copy-of select="$decl"/> <xsl:text>(</xsl:text> <xsl:apply-templates select="methodparam" mode="java"> @@ -963,7 +989,7 @@ <xsl:text> throws </xsl:text> <xsl:apply-templates select="exceptionname" mode="java"/> </xsl:if> - <xsl:if test="modifier[preceding-sibling::*[name(.) != 'modifier']]"> + <xsl:if test="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"> <xsl:text> </xsl:text> <xsl:apply-templates select="$end-modifiers" mode="java"/> </xsl:if> @@ -975,7 +1001,8 @@ <!-- ===== C++ ========================================================= --> <xsl:template match="classsynopsis" mode="cpp"> - <pre class="{name(.)}"> + <pre> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates select="ooclass[1]" mode="cpp"/> <xsl:if test="ooclass[preceding-sibling::*]"> <xsl:text>: </xsl:text> @@ -1016,13 +1043,15 @@ <xsl:if test="preceding-sibling::*"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="cpp"/> </span> </xsl:template> -<xsl:template match="modifier" mode="cpp"> - <span class="{name(.)}"> +<xsl:template match="modifier|package" mode="cpp"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="cpp"/> <xsl:if test="following-sibling::*"> <xsl:text> </xsl:text> @@ -1031,34 +1060,38 @@ </xsl:template> <xsl:template match="classname" mode="cpp"> - <xsl:if test="name(preceding-sibling::*[1]) = 'classname'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'classname'"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="cpp"/> </span> </xsl:template> <xsl:template match="interfacename" mode="cpp"> - <xsl:if test="name(preceding-sibling::*[1]) = 'interfacename'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'interfacename'"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="cpp"/> </span> </xsl:template> <xsl:template match="exceptionname" mode="cpp"> - <xsl:if test="name(preceding-sibling::*[1]) = 'exceptionname'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'exceptionname'"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="cpp"/> </span> </xsl:template> <xsl:template match="fieldsynopsis" mode="cpp"> - <code class="{name(.)}"> + <code> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="parent::classsynopsis"> <xsl:text> </xsl:text> </xsl:if> @@ -1069,34 +1102,39 @@ </xsl:template> <xsl:template match="type" mode="cpp"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="cpp"/> <xsl:text> </xsl:text> </span> </xsl:template> <xsl:template match="varname" mode="cpp"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="cpp"/> <xsl:text> </xsl:text> </span> </xsl:template> <xsl:template match="initializer" mode="cpp"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:text>= </xsl:text> <xsl:apply-templates mode="cpp"/> </span> </xsl:template> <xsl:template match="void" mode="cpp"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:text>void </xsl:text> </span> </xsl:template> <xsl:template match="methodname" mode="cpp"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="cpp"/> </span> </xsl:template> @@ -1105,31 +1143,34 @@ <xsl:if test="preceding-sibling::methodparam"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="cpp"/> </span> </xsl:template> <xsl:template match="parameter" mode="cpp"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="cpp"/> </span> </xsl:template> <xsl:template mode="cpp" match="constructorsynopsis|destructorsynopsis|methodsynopsis"> - <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[name(.) != 'modifier']]"/> - <xsl:variable name="notmod" select="*[name(.) != 'modifier']"/> - <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[name(.) != 'modifier']]"/> + <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[local-name(.) != 'modifier']]"/> + <xsl:variable name="notmod" select="*[local-name(.) != 'modifier']"/> + <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"/> - <code class="{name(.)}"> + <code> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="parent::classsynopsis"> <xsl:text> </xsl:text> </xsl:if> <xsl:apply-templates select="$start-modifiers" mode="cpp"/> <!-- type --> - <xsl:if test="name($notmod[1]) != 'methodname'"> + <xsl:if test="local-name($notmod[1]) != 'methodname'"> <xsl:apply-templates select="$notmod[1]" mode="cpp"/> </xsl:if> @@ -1142,7 +1183,7 @@ <xsl:text> throws </xsl:text> <xsl:apply-templates select="exceptionname" mode="cpp"/> </xsl:if> - <xsl:if test="modifier[preceding-sibling::*[name(.) != 'modifier']]"> + <xsl:if test="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"> <xsl:text> </xsl:text> <xsl:apply-templates select="$end-modifiers" mode="cpp"/> </xsl:if> @@ -1154,7 +1195,8 @@ <!-- ===== IDL ========================================================= --> <xsl:template match="classsynopsis" mode="idl"> - <pre class="{name(.)}"> + <pre> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:text>interface </xsl:text> <xsl:apply-templates select="ooclass[1]" mode="idl"/> <xsl:if test="ooclass[preceding-sibling::*]"> @@ -1196,13 +1238,15 @@ <xsl:if test="preceding-sibling::*"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="idl"/> </span> </xsl:template> -<xsl:template match="modifier" mode="idl"> - <span class="{name(.)}"> +<xsl:template match="modifier|package" mode="idl"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="idl"/> <xsl:if test="following-sibling::*"> <xsl:text> </xsl:text> @@ -1211,34 +1255,38 @@ </xsl:template> <xsl:template match="classname" mode="idl"> - <xsl:if test="name(preceding-sibling::*[1]) = 'classname'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'classname'"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="idl"/> </span> </xsl:template> <xsl:template match="interfacename" mode="idl"> - <xsl:if test="name(preceding-sibling::*[1]) = 'interfacename'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'interfacename'"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="idl"/> </span> </xsl:template> <xsl:template match="exceptionname" mode="idl"> - <xsl:if test="name(preceding-sibling::*[1]) = 'exceptionname'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'exceptionname'"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="idl"/> </span> </xsl:template> <xsl:template match="fieldsynopsis" mode="idl"> - <code class="{name(.)}"> + <code> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="parent::classsynopsis"> <xsl:text> </xsl:text> </xsl:if> @@ -1249,34 +1297,39 @@ </xsl:template> <xsl:template match="type" mode="idl"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="idl"/> <xsl:text> </xsl:text> </span> </xsl:template> <xsl:template match="varname" mode="idl"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="idl"/> <xsl:text> </xsl:text> </span> </xsl:template> <xsl:template match="initializer" mode="idl"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:text>= </xsl:text> <xsl:apply-templates mode="idl"/> </span> </xsl:template> <xsl:template match="void" mode="idl"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:text>void </xsl:text> </span> </xsl:template> <xsl:template match="methodname" mode="idl"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="idl"/> </span> </xsl:template> @@ -1285,30 +1338,33 @@ <xsl:if test="preceding-sibling::methodparam"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="idl"/> </span> </xsl:template> <xsl:template match="parameter" mode="idl"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="idl"/> </span> </xsl:template> <xsl:template mode="idl" match="constructorsynopsis|destructorsynopsis|methodsynopsis"> - <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[name(.) != 'modifier']]"/> - <xsl:variable name="notmod" select="*[name(.) != 'modifier']"/> - <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[name(.) != 'modifier']]"/> - <code class="{name(.)}"> + <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[local-name(.) != 'modifier']]"/> + <xsl:variable name="notmod" select="*[local-name(.) != 'modifier']"/> + <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"/> + <code> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="parent::classsynopsis"> <xsl:text> </xsl:text> </xsl:if> <xsl:apply-templates select="$start-modifiers" mode="idl"/> <!-- type --> - <xsl:if test="name($notmod[1]) != 'methodname'"> + <xsl:if test="local-name($notmod[1]) != 'methodname'"> <xsl:apply-templates select="$notmod[1]" mode="idl"/> </xsl:if> @@ -1322,7 +1378,7 @@ <xsl:apply-templates select="exceptionname" mode="idl"/> <xsl:text>)</xsl:text> </xsl:if> - <xsl:if test="modifier[preceding-sibling::*[name(.) != 'modifier']]"> + <xsl:if test="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"> <xsl:text> </xsl:text> <xsl:apply-templates select="$end-modifiers" mode="idl"/> </xsl:if> @@ -1334,7 +1390,8 @@ <!-- ===== Perl ======================================================== --> <xsl:template match="classsynopsis" mode="perl"> - <pre class="{name(.)}"> + <pre> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:text>package </xsl:text> <xsl:apply-templates select="ooclass[1]" mode="perl"/> <xsl:text>;</xsl:text> @@ -1363,13 +1420,15 @@ <xsl:if test="preceding-sibling::*"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="perl"/> </span> </xsl:template> -<xsl:template match="modifier" mode="perl"> - <span class="{name(.)}"> +<xsl:template match="modifier|package" mode="perl"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="perl"/> <xsl:if test="following-sibling::*"> <xsl:text> </xsl:text> @@ -1378,34 +1437,38 @@ </xsl:template> <xsl:template match="classname" mode="perl"> - <xsl:if test="name(preceding-sibling::*[1]) = 'classname'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'classname'"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="perl"/> </span> </xsl:template> <xsl:template match="interfacename" mode="perl"> - <xsl:if test="name(preceding-sibling::*[1]) = 'interfacename'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'interfacename'"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="perl"/> </span> </xsl:template> <xsl:template match="exceptionname" mode="perl"> - <xsl:if test="name(preceding-sibling::*[1]) = 'exceptionname'"> + <xsl:if test="local-name(preceding-sibling::*[1]) = 'exceptionname'"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="perl"/> </span> </xsl:template> <xsl:template match="fieldsynopsis" mode="perl"> - <code class="{name(.)}"> + <code> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="parent::classsynopsis"> <xsl:text> </xsl:text> </xsl:if> @@ -1416,34 +1479,39 @@ </xsl:template> <xsl:template match="type" mode="perl"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="perl"/> <xsl:text> </xsl:text> </span> </xsl:template> <xsl:template match="varname" mode="perl"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="perl"/> <xsl:text> </xsl:text> </span> </xsl:template> <xsl:template match="initializer" mode="perl"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:text>= </xsl:text> <xsl:apply-templates mode="perl"/> </span> </xsl:template> <xsl:template match="void" mode="perl"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:text>void </xsl:text> </span> </xsl:template> <xsl:template match="methodname" mode="perl"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="perl"/> </span> </xsl:template> @@ -1452,24 +1520,27 @@ <xsl:if test="preceding-sibling::methodparam"> <xsl:text>, </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="perl"/> </span> </xsl:template> <xsl:template match="parameter" mode="perl"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="perl"/> </span> </xsl:template> <xsl:template mode="perl" match="constructorsynopsis|destructorsynopsis|methodsynopsis"> - <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[name(.) != 'modifier']]"/> - <xsl:variable name="notmod" select="*[name(.) != 'modifier']"/> - <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[name(.) != 'modifier']]"/> + <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[local-name(.) != 'modifier']]"/> + <xsl:variable name="notmod" select="*[local-name(.) != 'modifier']"/> + <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"/> - <code class="{name(.)}"> + <code> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:text>sub </xsl:text> <xsl:apply-templates select="methodname" mode="perl"/> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/table.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/table.xsl diff -u phpdoc/docbook/docbook-xsl/html/table.xsl:1.1 phpdoc/docbook/docbook-xsl/html/table.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/table.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/table.xsl Tue Jan 30 18:16:38 2007 @@ -11,7 +11,7 @@ <xsl:include href="../common/table.xsl"/> <!-- ******************************************************************** - $Id: table.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: table.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -48,7 +48,7 @@ <xsl:variable name="colsep"> <xsl:choose> <!-- If this is the last column, colsep never applies. --> - <xsl:when test="$colnum >= ancestor::tgroup/@cols">0</xsl:when> + <xsl:when test="number($colnum) >= ancestor::tgroup/@cols">0</xsl:when> <xsl:otherwise> <xsl:call-template name="inherited.table.attribute"> <xsl:with-param name="entry" select="NOT-AN-ELEMENT-NAME"/> @@ -455,7 +455,7 @@ <xsl:template match="spanspec"></xsl:template> <xsl:template match="thead|tfoot"> - <xsl:element name="{name(.)}"> + <xsl:element name="{local-name(.)}"> <xsl:if test="@align"> <xsl:attribute name="align"> <xsl:value-of select="@align"/> @@ -789,7 +789,7 @@ </xsl:call-template> </xsl:when> - <xsl:when test="$entry.colnum > $col"> + <xsl:when test="number($entry.colnum) > $col"> <xsl:call-template name="empty.table.cell"/> <xsl:call-template name="entry"> <xsl:with-param name="col" select="$col+1"/> @@ -815,9 +815,9 @@ </xsl:if> <xsl:if test="$entry.propagates.style != 0 and @role"> - <xsl:attribute name="class"> - <xsl:value-of select="@role"/> - </xsl:attribute> + <xsl:apply-templates select="." mode="class.attribute"> + <xsl:with-param name="class" select="@role"/> + </xsl:apply-templates> </xsl:if> <xsl:if test="$show.revisionflag and @revisionflag"> @@ -877,7 +877,8 @@ </xsl:attribute> </xsl:if> - <xsl:if test="not(preceding-sibling::*) and ancestor::row/@id"> + <xsl:if test="not(preceding-sibling::*) and + (ancestor::row[1]/@id or ancestor::row[1]/@xml:id)"> <xsl:call-template name="anchor"> <xsl:with-param name="node" select="ancestor::row[1]"/> </xsl:call-template> @@ -951,7 +952,7 @@ </xsl:call-template> </xsl:when> - <xsl:when test="$entry.colnum > $col"> + <xsl:when test="number($entry.colnum) > $col"> <xsl:text>0:</xsl:text> <xsl:call-template name="sentry"> <xsl:with-param name="col" select="$col+$entry.colspan"/> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/task.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/task.xsl diff -u phpdoc/docbook/docbook-xsl/html/task.xsl:1.1 phpdoc/docbook/docbook-xsl/html/task.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/task.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/task.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version="1.0"> <!-- ******************************************************************** - $Id: task.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: task.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -35,7 +35,8 @@ select="*[not(self::title or self::titleabbrev)]"/> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <xsl:if test="title and $placement = 'before'"> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/titlepage.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/titlepage.xsl diff -u phpdoc/docbook/docbook-xsl/html/titlepage.xsl:1.1 phpdoc/docbook/docbook-xsl/html/titlepage.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/titlepage.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/titlepage.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: titlepage.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: titlepage.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -118,14 +118,16 @@ </xsl:template> <xsl:template match="abbrev" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="abstract" mode="titlepage.mode"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <xsl:call-template name="formal.object.heading"> <xsl:with-param name="title"> @@ -151,7 +153,8 @@ and @linenumbering = 'numbered' and $use.extensions != '0' and $linenumbering.extension != '0'"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="paragraph"> <xsl:with-param name="content"> <xsl:call-template name="number.rtf.lines"> @@ -163,7 +166,8 @@ </xsl:when> <xsl:otherwise> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="paragraph"> <xsl:with-param name="content"> <xsl:call-template name="make-verbatim"> @@ -177,13 +181,15 @@ </xsl:template> <xsl:template match="affiliation" mode="titlepage.mode"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> </div> </xsl:template> <xsl:template match="artpagenums" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> @@ -194,11 +200,15 @@ </xsl:template> <xsl:template name="credits.div"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="self::editor[position()=1] and not($editedby.enabled = 0)"> <h4 class="editedby"><xsl:call-template name="gentext.edited.by"/></h4> </xsl:if> - <h3 class="{name(.)}"><xsl:call-template name="person.name"/></h3> + <h3> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="person.name"/> + </h3> <xsl:if test="not($contrib.inline.enabled = 0)"> <xsl:apply-templates mode="titlepage.mode" select="./contrib"/> </xsl:if> @@ -220,20 +230,23 @@ </xsl:template> <xsl:template match="authorblurb|personblurb" mode="titlepage.mode"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> </div> </xsl:template> <xsl:template match="authorgroup" mode="titlepage.mode"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <xsl:apply-templates mode="titlepage.mode"/> </div> </xsl:template> <xsl:template match="authorinitials" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> @@ -248,40 +261,46 @@ </xsl:template> <xsl:template match="collab" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="collabname" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> </span> </xsl:template> <xsl:template match="confgroup" mode="titlepage.mode"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> </div> </xsl:template> <xsl:template match="confdates" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="confsponsor" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="conftitle" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> @@ -292,14 +311,16 @@ </xsl:template> <xsl:template match="contractnum" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="contractsponsor" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> @@ -308,12 +329,14 @@ <xsl:template match="contrib" mode="titlepage.mode"> <xsl:choose> <xsl:when test="not($contrib.inline.enabled = 0)"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> </span> </xsl:when> <xsl:otherwise> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <p><xsl:apply-templates mode="titlepage.mode"/></p> </div> </xsl:otherwise> @@ -321,7 +344,8 @@ </xsl:template> <xsl:template match="copyright" mode="titlepage.mode"> - <p class="{name(.)}"> + <p> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="gentext"> <xsl:with-param name="key" select="'Copyright'"/> </xsl:call-template> @@ -371,34 +395,39 @@ </xsl:template> <xsl:template match="corpauthor" mode="titlepage.mode"> - <h3 class="{name(.)}"> + <h3> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> </h3> </xsl:template> <xsl:template match="corpcredit" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="corpname" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="date" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="edition" mode="titlepage.mode"> - <p class="{name(.)}"> + <p> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <xsl:call-template name="gentext.space"/> <xsl:call-template name="gentext"> @@ -413,7 +442,8 @@ </xsl:template> <xsl:template match="firstname" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> @@ -425,28 +455,32 @@ </xsl:template> <xsl:template match="honorific" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="isbn" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="issn" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="biblioid" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> @@ -456,21 +490,24 @@ </xsl:template> <xsl:template match="invpartnumber" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="issuenum" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="jobtitle" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> @@ -517,7 +554,8 @@ </head> <body> <xsl:call-template name="body.attributes"/> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> </div> </body> @@ -527,7 +565,8 @@ </xsl:call-template> </xsl:when> <xsl:otherwise> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <a name="{$id}"/> <xsl:apply-templates mode="titlepage.mode"/> </div> @@ -540,7 +579,8 @@ </xsl:template> <xsl:template match="lineage" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> @@ -553,14 +593,16 @@ <xsl:if test="preceding-sibling::*[1][self::orgname]"> <xsl:text> </xsl:text> </xsl:if> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="orgname" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> @@ -574,7 +616,7 @@ <xsl:when test="contrib"> <xsl:if test="not(preceding-sibling::othercredit[string(contrib)=$contrib])"> <xsl:call-template name="paragraph"> - <xsl:with-param name="class" select="name(.)"/> + <xsl:with-param name="class" select="local-name(.)"/> <xsl:with-param name="content"> <xsl:apply-templates mode="titlepage.mode" select="contrib"/> <xsl:text>: </xsl:text> @@ -587,7 +629,7 @@ </xsl:when> <xsl:otherwise> <xsl:call-template name="paragraph"> - <xsl:with-param name="class" select="name(.)"/> + <xsl:with-param name="class" select="local-name(.)"/> <xsl:with-param name="content"> <xsl:call-template name="person.name"/> </xsl:with-param> @@ -608,34 +650,39 @@ </xsl:template> <xsl:template match="othername" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="pagenums" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="printhistory" mode="titlepage.mode"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> </div> </xsl:template> <xsl:template match="productname" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="productnumber" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> @@ -643,7 +690,7 @@ <xsl:template match="pubdate" mode="titlepage.mode"> <xsl:call-template name="paragraph"> - <xsl:with-param name="class" select="name(.)"/> + <xsl:with-param name="class" select="local-name(.)"/> <xsl:with-param name="content"> <xsl:apply-templates mode="titlepage.mode"/> </xsl:with-param> @@ -652,7 +699,7 @@ <xsl:template match="publisher" mode="titlepage.mode"> <xsl:call-template name="paragraph"> - <xsl:with-param name="class" select="name(.)"/> + <xsl:with-param name="class" select="local-name(.)"/> <xsl:with-param name="content"> <xsl:apply-templates mode="titlepage.mode"/> </xsl:with-param> @@ -660,14 +707,16 @@ </xsl:template> <xsl:template match="publishername" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="pubsnumber" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> @@ -675,7 +724,7 @@ <xsl:template match="releaseinfo" mode="titlepage.mode"> <xsl:call-template name="paragraph"> - <xsl:with-param name="class" select="name(.)"/> + <xsl:with-param name="class" select="local-name(.)"/> <xsl:with-param name="content"> <xsl:apply-templates mode="titlepage.mode"/> </xsl:with-param> @@ -699,7 +748,8 @@ </xsl:variable> <xsl:variable name="contents"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <table border="1" width="100%" summary="Revision history"> <tr> <th align="left" valign="top" colspan="{$numcols}"> @@ -833,14 +883,16 @@ </xsl:template> <xsl:template match="seriesvolnums" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> </xsl:template> <xsl:template match="shortaffil" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> @@ -850,13 +902,15 @@ </xsl:template> <xsl:template match="subtitle" mode="titlepage.mode"> - <h2 class="{name(.)}"> + <h2> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> </h2> </xsl:template> <xsl:template match="surname" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> @@ -879,7 +933,8 @@ </xsl:choose> </xsl:variable> - <h1 class="{name(.)}"> + <h1> + <xsl:apply-templates select="." mode="class.attribute"/> <a name="{$id}"/> <xsl:choose> <xsl:when test="$show.revisionflag != 0 and @revisionflag"> @@ -899,7 +954,8 @@ </xsl:template> <xsl:template match="volumenum" mode="titlepage.mode"> - <span class="{name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> <br/> </span> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/toc.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/toc.xsl diff -u phpdoc/docbook/docbook-xsl/html/toc.xsl:1.1 phpdoc/docbook/docbook-xsl/html/toc.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/toc.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/toc.xsl Tue Jan 30 18:16:38 2007 @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: toc.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: toc.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/verbatim.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/verbatim.xsl diff -u phpdoc/docbook/docbook-xsl/html/verbatim.xsl:1.1 phpdoc/docbook/docbook-xsl/html/verbatim.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/verbatim.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/verbatim.xsl Tue Jan 30 18:16:38 2007 @@ -8,7 +8,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: verbatim.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: verbatim.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -51,14 +51,16 @@ <xsl:variable name="rtf"> <xsl:call-template name="apply-highlighting"/> </xsl:variable> - <pre class="{name(.)}"> + <pre> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="number.rtf.lines"> <xsl:with-param name="rtf" select="$rtf"/> </xsl:call-template> </pre> </xsl:when> <xsl:otherwise> - <pre class="{name(.)}"> + <pre> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="apply-highlighting"/> </pre> </xsl:otherwise> @@ -91,14 +93,16 @@ and $linenumbering.extension != '0'"> <xsl:choose> <xsl:when test="@class='monospaced'"> - <pre class="{name(.)}"> + <pre> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="number.rtf.lines"> <xsl:with-param name="rtf" select="$rtf"/> </xsl:call-template> </pre> </xsl:when> <xsl:otherwise> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <p> <xsl:call-template name="number.rtf.lines"> <xsl:with-param name="rtf" select="$rtf"/> @@ -111,12 +115,14 @@ <xsl:otherwise> <xsl:choose> <xsl:when test="@class='monospaced'"> - <pre class="{name(.)}"> + <pre> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:copy-of select="$rtf"/> </pre> </xsl:when> <xsl:otherwise> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <p> <xsl:call-template name="make-verbatim"> <xsl:with-param name="rtf" select="$rtf"/> @@ -141,7 +147,8 @@ and @linenumbering = 'numbered' and $use.extensions != '0' and $linenumbering.extension != '0'"> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <p> <xsl:call-template name="number.rtf.lines"> <xsl:with-param name="rtf" select="$rtf"/> @@ -151,7 +158,8 @@ </xsl:when> <xsl:otherwise> - <div class="{name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <p> <xsl:call-template name="make-verbatim"> <xsl:with-param name="rtf" select="$rtf"/> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/xref.xsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/docbook/docbook-xsl/html/xref.xsl diff -u phpdoc/docbook/docbook-xsl/html/xref.xsl:1.1 phpdoc/docbook/docbook-xsl/html/xref.xsl:1.2 --- phpdoc/docbook/docbook-xsl/html/xref.xsl:1.1 Mon Jan 22 15:54:42 2007 +++ phpdoc/docbook/docbook-xsl/html/xref.xsl Tue Jan 30 18:16:38 2007 @@ -2,11 +2,12 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:suwl="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.UnwrapLinks" xmlns:exsl="http://exslt.org/common" + xmlns:xlink='http://www.w3.org/1999/xlink' exclude-result-prefixes="suwl exsl" version='1.0'> <!-- ******************************************************************** - $Id: xref.xsl,v 1.1 2007/01/22 15:54:42 bjori Exp $ + $Id: xref.xsl,v 1.2 2007/01/30 18:16:38 bjori Exp $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -24,103 +25,92 @@ <!-- ==================================================================== --> <xsl:template match="xref" name="xref"> - <xsl:param name="targets" select="key('id',@linkend)"/> - <xsl:param name="target" select="$targets[1]"/> - <xsl:param name="refelem" select="local-name($target)"/> + <xsl:param name="xhref" select="@xlink:href"/> + <!-- is the @xlink:href a local idref link? --> + <xsl:param name="xlink.idref"> + <xsl:if test="starts-with($xhref,'#') + and (not(contains($xhref,'(')) + or starts-with($xhref, '#xpointer(id('))"> + <xsl:call-template name="xpointer.idref"> + <xsl:with-param name="xpointer" select="$xhref"/> + </xsl:call-template> + </xsl:if> + </xsl:param> + <xsl:param name="xlink.targets" select="key('id',$xlink.idref)"/> + <xsl:param name="linkend.targets" select="key('id',@linkend)"/> + <xsl:param name="target" select="($xlink.targets | $linkend.targets)[1]"/> - <xsl:call-template name="check.id.unique"> - <xsl:with-param name="linkend" select="@linkend"/> - </xsl:call-template> + <xsl:variable name="xrefstyle"> + <xsl:choose> + <xsl:when test="@role and not(@xrefstyle) + 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:variable> <xsl:call-template name="anchor"/> - <xsl:choose> - <xsl:when test="count($target) = 0"> - <xsl:message> - <xsl:text>XRef to nonexistent id: </xsl:text> - <xsl:value-of select="@linkend"/> - </xsl:message> - <xsl:text>???</xsl:text> - </xsl:when> - - <xsl:when test="@endterm"> - <xsl:variable name="href"> - <xsl:call-template name="href.target"> - <xsl:with-param name="object" select="$target"/> - </xsl:call-template> - </xsl:variable> - - <xsl:variable name="etargets" select="key('id',@endterm)"/> - <xsl:variable name="etarget" select="$etargets[1]"/> - <xsl:choose> - <xsl:when test="count($etarget) = 0"> - <xsl:message> - <xsl:value-of select="count($etargets)"/> - <xsl:text>Endterm points to nonexistent ID: </xsl:text> - <xsl:value-of select="@endterm"/> - </xsl:message> - <a href="{$href}"> + <xsl:variable name="content"> + <xsl:choose> + + <xsl:when test="@endterm"> + <xsl:variable name="etargets" select="key('id',@endterm)"/> + <xsl:variable name="etarget" select="$etargets[1]"/> + <xsl:choose> + <xsl:when test="count($etarget) = 0"> + <xsl:message> + <xsl:value-of select="count($etargets)"/> + <xsl:text>Endterm points to nonexistent ID: </xsl:text> + <xsl:value-of select="@endterm"/> + </xsl:message> <xsl:text>???</xsl:text> - </a> - </xsl:when> - <xsl:otherwise> - <a href="{$href}"> + </xsl:when> + <xsl:otherwise> <xsl:apply-templates select="$etarget" mode="endterm"/> - </a> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - - <xsl:when test="$target/@xreflabel"> - <a> - <xsl:attribute name="href"> - <xsl:call-template name="href.target"> - <xsl:with-param name="object" select="$target"/> - </xsl:call-template> - </xsl:attribute> + </xsl:otherwise> + </xsl:choose> + </xsl:when> + + <xsl:when test="$target/@xreflabel"> <xsl:call-template name="xref.xreflabel"> <xsl:with-param name="target" select="$target"/> </xsl:call-template> - </a> - </xsl:when> - - <xsl:otherwise> - <xsl:variable name="href"> - <xsl:call-template name="href.target"> - <xsl:with-param name="object" select="$target"/> - </xsl:call-template> - </xsl:variable> - - <xsl:if test="not(parent::citation)"> - <xsl:apply-templates select="$target" mode="xref-to-prefix"/> - </xsl:if> - - <a href="{$href}"> - <xsl:if test="$target/title or $target/*/title"> - <xsl:attribute name="title"> - <xsl:apply-templates select="$target" mode="xref-title"/> - </xsl:attribute> + </xsl:when> + + <xsl:when test="$target"> + <xsl:if test="not(parent::citation)"> + <xsl:apply-templates select="$target" mode="xref-to-prefix"/> </xsl:if> + <xsl:apply-templates select="$target" mode="xref-to"> <xsl:with-param name="referrer" select="."/> - <xsl:with-param name="xrefstyle"> - <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="xrefstyle" select="$xrefstyle"/> </xsl:apply-templates> - </a> + + <xsl:if test="not(parent::citation)"> + <xsl:apply-templates select="$target" mode="xref-to-suffix"/> + </xsl:if> + </xsl:when> + + <xsl:otherwise> + <xsl:message> + <xsl:text>ERROR: xref linking to </xsl:text> + <xsl:value-of select="@linkend|@xlink:href"/> + <xsl:text> has no generated link text.</xsl:text> + </xsl:message> + <xsl:text>???</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content" select="$content"/> + </xsl:call-template> - <xsl:if test="not(parent::citation)"> - <xsl:apply-templates select="$target" mode="xref-to-suffix"/> - </xsl:if> - </xsl:otherwise> - </xsl:choose> </xsl:template> <!-- ==================================================================== --> @@ -254,6 +244,8 @@ <xsl:choose> <xsl:when test="(@name and count(@*) = 1) or (@id and count(@*) = 1) + or (@xml:id and count(@*) = 1) + or (@xml:id and @name and count(@*) = 2) or (@id and @name and count(@*) = 2)"> <xsl:message>suppress anchor</xsl:message> <!-- suppress the whole thing --> @@ -262,11 +254,12 @@ <xsl:copy> <xsl:for-each select="@*"> <xsl:choose> - <xsl:when test="name(.) != 'name' and name(.) != 'id'"> + <xsl:when test="local-name(.) != 'name' and local-name(.) != 'id'"> <xsl:copy/> </xsl:when> <xsl:otherwise> - <xsl:message>removing <xsl:value-of select="name(.)"/></xsl:message> + <xsl:message>removing <xsl:value-of + select="local-name(.)"/></xsl:message> </xsl:otherwise> </xsl:choose> </xsl:for-each> @@ -279,11 +272,12 @@ <xsl:copy> <xsl:for-each select="@*"> <xsl:choose> - <xsl:when test="name(.) != 'id'"> + <xsl:when test="local-name(.) != 'id'"> <xsl:copy/> </xsl:when> <xsl:otherwise> - <xsl:message>removing <xsl:value-of select="name(.)"/></xsl:message> + <xsl:message>removing <xsl:value-of + select="local-name(.)"/></xsl:message> </xsl:otherwise> </xsl:choose> </xsl:for-each> @@ -308,7 +302,7 @@ <xsl:text>Don't know what gentext to create for xref to: "</xsl:text> <xsl:value-of select="name(.)"/> <xsl:text>", ("</xsl:text> - <xsl:value-of select="@id"/> + <xsl:value-of select="(@id|@xml:id)[1]"/> <xsl:text>")</xsl:text> </xsl:message> </xsl:if> @@ -465,8 +459,9 @@ <xsl:choose> <xsl:when test="string(.) = ''"> <xsl:variable name="bib" select="document($bibliography.collection,.)"/> - <xsl:variable name="id" select="@id"/> - <xsl:variable name="entry" select="$bib/bibliography/*[@id=$id][1]"/> + <xsl:variable name="id" select="(@id|@xml:id)[1]"/> + <xsl:variable name="entry" select="$bib/bibliography/ + *[@id=$id or @xml:id=$id][1]"/> <xsl:choose> <xsl:when test="$entry"> <xsl:choose> @@ -478,7 +473,7 @@ <xsl:apply-templates select="$entry/*[1]"/> </xsl:when> <xsl:otherwise> - <xsl:value-of select="@id"/> + <xsl:value-of select="(@id|@xml:id)[1]"/> </xsl:otherwise> </xsl:choose> </xsl:when> @@ -489,7 +484,7 @@ <xsl:text> found in </xsl:text> <xsl:value-of select="$bibliography.collection"/> </xsl:message> - <xsl:value-of select="@id"/> + <xsl:value-of select="(@id|@xml:id)[1]"/> </xsl:otherwise> </xsl:choose> </xsl:when> @@ -503,7 +498,7 @@ <xsl:apply-templates select="*[1]"/> </xsl:when> <xsl:otherwise> - <xsl:value-of select="@id"/> + <xsl:value-of select="(@id|@xml:id)[1]"/> </xsl:otherwise> </xsl:choose> </xsl:otherwise> @@ -864,7 +859,7 @@ <xsl:apply-templates select="*[1]"/> </xsl:when> <xsl:otherwise> - <xsl:value-of select="@id"/> + <xsl:value-of select="(@id|@xml:id)[1]"/> </xsl:otherwise> </xsl:choose> <xsl:text>]</xsl:text> @@ -895,53 +890,8 @@ <xsl:param name="linkend" select="@linkend"/> <xsl:param name="a.target"/> - <xsl:variable name="targets" select="key('id',$linkend)"/> - <xsl:variable name="target" select="$targets[1]"/> - - <xsl:call-template name="check.id.unique"> - <xsl:with-param name="linkend" select="$linkend"/> - </xsl:call-template> - - <a> - <xsl:if test="@id"> - <xsl:attribute name="name"><xsl:value-of select="@id"/></xsl:attribute> - </xsl:if> - - <xsl:if test="$a.target"> - <xsl:attribute name="target"><xsl:value-of select="$a.target"/></xsl:attribute> - </xsl:if> - - <xsl:attribute name="href"> - <xsl:call-template name="href.target"> - <xsl:with-param name="object" select="$target"/> - </xsl:call-template> - </xsl:attribute> - - <!-- FIXME: is there a better way to tell what elements have a title? --> - <xsl:if test="local-name($target) = 'book' - or local-name($target) = 'set' - or local-name($target) = 'chapter' - or local-name($target) = 'preface' - or local-name($target) = 'appendix' - or local-name($target) = 'bibliography' - or local-name($target) = 'glossary' - or local-name($target) = 'index' - or local-name($target) = 'part' - or local-name($target) = 'refentry' - or local-name($target) = 'reference' - or local-name($target) = 'example' - or local-name($target) = 'equation' - or local-name($target) = 'table' - or local-name($target) = 'figure' - or local-name($target) = 'simplesect' - or starts-with(local-name($target),'sect') - or starts-with(local-name($target),'refsect')"> - <xsl:attribute name="title"> - <xsl:apply-templates select="$target" - mode="object.title.markup.textonly"/> - </xsl:attribute> - </xsl:if> - + <xsl:variable name="content"> + <xsl:call-template name="anchor"/> <xsl:choose> <xsl:when test="count(child::node()) > 0"> <!-- If it has content, use it --> @@ -972,23 +922,31 @@ <xsl:message> <xsl:text>Link element has no content and no Endterm. </xsl:text> <xsl:text>Nothing to show in the link to </xsl:text> - <xsl:value-of select="$target"/> + <xsl:value-of select="(@xlink:href|@linkend)[1]"/> </xsl:message> <xsl:text>???</xsl:text> </xsl:otherwise> </xsl:choose> </xsl:otherwise> </xsl:choose> - </a> + </xsl:variable> + + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="node" select="."/> + <xsl:with-param name="linkend" select="$linkend"/> + <xsl:with-param name="content" select="$content"/> + <xsl:with-param name="a.target" select="$a.target"/> + </xsl:call-template> + </xsl:template> <xsl:template match="ulink" name="ulink"> <xsl:param name="url" select="@url"/> <xsl:variable name="link"> <a> - <xsl:if test="@id"> + <xsl:if test="@id or @xml:id"> <xsl:attribute name="name"> - <xsl:value-of select="@id"/> + <xsl:value-of select="(@id|@xml:id)[1]"/> </xsl:attribute> </xsl:if> <xsl:attribute name="href"><xsl:value-of select="$url"/></xsl:attribute> @@ -1198,7 +1156,8 @@ <xsl:variable name="node-href"> <xsl:choose> <xsl:when test="$localinfo != ''"> - <xsl:variable name="node" select="$outline//*[@id=$localinfo]"/> + <xsl:variable name="node" select="$outline// + *[@id=$localinfo or @xml:id=$localinfo]"/> <xsl:value-of select="$node/@href"/> </xsl:when> <xsl:otherwise> @@ -1210,7 +1169,8 @@ <xsl:variable name="node-xref"> <xsl:choose> <xsl:when test="$localinfo != ''"> - <xsl:variable name="node" select="$outline//*[@id=$localinfo]"/> + <xsl:variable name="node" select="$outline// + *[@id=$localinfo or @xml:id=$localinfo]"/> <xsl:copy-of select="$node/xref"/> </xsl:when> <xsl:otherwise> http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/html/titlepage.templates.xml?view=markup&rev=1.1 Index: phpdoc/docbook/docbook-xsl/html/titlepage.templates.xml +++ phpdoc/docbook/docbook-xsl/html/titlepage.templates.xml <t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0" xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <!-- ==================================================================== --> <t:titlepage t:element="article" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title/> <subtitle/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> <hr/> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <!-- ==================================================================== --> <t:titlepage t:element="set" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title/> <subtitle/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> <hr/> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <!-- ==================================================================== --> <t:titlepage t:element="book" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title/> <subtitle/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> <hr/> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <!-- ==================================================================== --> <t:titlepage t:element="part" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title t:force="1" t:named-template="division.title" param:node="ancestor-or-self::part[1]"/> <subtitle/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <t:titlepage t:element="partintro" t:wrapper="div"> <t:titlepage-content t:side="recto"> <title/> <subtitle/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <!-- ==================================================================== --> <t:titlepage t:element="reference" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title/> <subtitle/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> <hr/> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <!-- ==================================================================== --> <t:titlepage t:element="refentry" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <!-- uncomment this if you want refentry titlepages <title t:force="1" t:named-template="refentry.title" param:node="ancestor-or-self::refentry[1]"/> --> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator/> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <!-- ==================================================================== --> <t:titlepage t:element="dedication" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title t:force="1" t:named-template="component.title" param:node="ancestor-or-self::dedication[1]"/> <subtitle/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <!-- ==================================================================== --> <t:titlepage t:element="preface" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title/> <subtitle/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <!-- ==================================================================== --> <t:titlepage t:element="chapter" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title/> <subtitle/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <!-- ==================================================================== --> <t:titlepage t:element="appendix" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title/> <subtitle/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <!-- ==================================================================== --> <t:titlepage t:element="section" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title/> <subtitle/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> <xsl:if test="count(parent::*)='0'"><hr/></xsl:if> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <t:titlepage t:element="sect1" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title/> <subtitle/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> <xsl:if test="count(parent::*)='0'"><hr/></xsl:if> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <t:titlepage t:element="sect2" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title/> <subtitle/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> <xsl:if test="count(parent::*)='0'"><hr/></xsl:if> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <t:titlepage t:element="sect3" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title/> <subtitle/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> <xsl:if test="count(parent::*)='0'"><hr/></xsl:if> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <t:titlepage t:element="sect4" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title/> <subtitle/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> <xsl:if test="count(parent::*)='0'"><hr/></xsl:if> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <t:titlepage t:element="sect5" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title/> <subtitle/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> <xsl:if test="count(parent::*)='0'"><hr/></xsl:if> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <t:titlepage t:element="simplesect" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title/> <subtitle/> <corpauthor/> <authorgroup/> <author/> <othercredit/> <releaseinfo/> <copyright/> <legalnotice/> <pubdate/> <revision/> <revhistory/> <abstract/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> <xsl:if test="count(parent::*)='0'"><hr/></xsl:if> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <!-- ==================================================================== --> <t:titlepage t:element="bibliography" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title t:force="1" t:named-template="component.title" param:node="ancestor-or-self::bibliography[1]"/> <subtitle/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <!-- ==================================================================== --> <t:titlepage t:element="glossary" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title t:force="1" t:named-template="component.title" param:node="ancestor-or-self::glossary[1]"/> <subtitle/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <!-- ==================================================================== --> <t:titlepage t:element="index" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title t:force="1" t:named-template="component.title" param:node="ancestor-or-self::index[1]"/> <subtitle/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <!-- ==================================================================== --> <t:titlepage t:element="setindex" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title t:force="1" t:named-template="component.title" param:node="ancestor-or-self::setindex[1]"/> <subtitle/> </t:titlepage-content> <t:titlepage-content t:side="verso"> </t:titlepage-content> <t:titlepage-separator> </t:titlepage-separator> <t:titlepage-before t:side="recto"> </t:titlepage-before> <t:titlepage-before t:side="verso"> </t:titlepage-before> </t:titlepage> <!-- ==================================================================== --> </t:templates>