Update of /cvsroot/boost/boost/tools/boostbook/xsl
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5911/tools/boostbook/xsl
Modified Files:
Tag: RC_1_34_0
annotation.xsl docbook.xsl fo.xsl function.xsl lookup.xsl
Log Message:
Cross merge HEAD and RC_1_34_0.
Index: annotation.xsl
===================================================================
RCS file: /cvsroot/boost/boost/tools/boostbook/xsl/annotation.xsl,v
retrieving revision 1.16.2.2
retrieving revision 1.16.2.3
diff -u -d -r1.16.2.2 -r1.16.2.3
--- annotation.xsl 3 Nov 2006 19:39:44 -0000 1.16.2.2
+++ annotation.xsl 13 Nov 2006 16:24:38 -0000 1.16.2.3
@@ -12,10 +12,11 @@
<xsl:key name="methods" match="method|overloaded-method" use="@name"/>
<xsl:key name="functions" match="function|overloaded-function" use="@name"/>
<xsl:key name="enums" match="enum" use="@name"/>
+ <xsl:key name="concepts" match="concept" use="@name"/>
<xsl:key name="libraries" match="library" use="@name"/>
<xsl:key name="macros" match="macro" use="@name"/>
<xsl:key name="headers" match="header" use="@name"/>
- <xsl:key name="named-entities"
match="class|struct|union|function|overloaded-function|macro|library|namespace/data-member|header/data-member|*[attribute::id]"
use="@name|@id"/>
+ <xsl:key name="named-entities"
match="class|struct|union|concept|function|overloaded-function|macro|library|namespace/data-member|header/data-member|*[attribute::id]"
use="@name|@id"/>
<xsl:template match="function|overloaded-function" mode="generate.id">
<xsl:variable name="name" select="normalize-space(@name)"/>
Index: docbook.xsl
===================================================================
RCS file: /cvsroot/boost/boost/tools/boostbook/xsl/docbook.xsl,v
retrieving revision 1.19.2.2
retrieving revision 1.19.2.3
diff -u -d -r1.19.2.2 -r1.19.2.3
--- docbook.xsl 3 Nov 2006 19:39:44 -0000 1.19.2.2
+++ docbook.xsl 13 Nov 2006 16:24:38 -0000 1.19.2.3
@@ -57,15 +57,23 @@
<xsl:if test="concept">
<section>
- <title>Concepts</title>
-
- <xsl:if test="ancestor::library/attribute::id">
- <xsl:attribute name="id">
- <xsl:value-of select="ancestor::library/attribute::id"/>
- <xsl:text>.concepts</xsl:text>
- </xsl:attribute>
- </xsl:if>
+ <xsl:choose>
+ <xsl:when test="@id">
+ <xsl:attribute name="id">
+ <xsl:value-of select="@id"/>
+ <xsl:text>.concepts</xsl:text>
+ </xsl:attribute>
+ </xsl:when>
+ <xsl:when test="ancestor::library/attribute::id">
+ <xsl:attribute name="id">
+ <xsl:value-of select="ancestor::library/attribute::id"/>
+ <xsl:text>.concepts</xsl:text>
+ </xsl:attribute>
+ </xsl:when>
+ </xsl:choose>
+ <title>Concepts</title>
+
<itemizedlist>
<xsl:for-each select="concept">
<listitem>
Index: fo.xsl
===================================================================
RCS file: /cvsroot/boost/boost/tools/boostbook/xsl/fo.xsl,v
retrieving revision 1.2.12.1
retrieving revision 1.2.12.2
diff -u -d -r1.2.12.1 -r1.2.12.2
--- fo.xsl 3 Nov 2006 19:39:44 -0000 1.2.12.1
+++ fo.xsl 13 Nov 2006 16:24:38 -0000 1.2.12.2
@@ -1,12 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (c) 2002 Douglas Gregor <doug.gregor -at- gmail.com>
-
- Distributed under the Boost Software License, Version 1.0.
- (See accompanying file LICENSE_1_0.txt or copy at
- http://www.boost.org/LICENSE_1_0.txt)
- -->
-
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:fo="http://www.w3.org/1999/XSL/Format";
version="1.0">
Index: function.xsl
===================================================================
RCS file: /cvsroot/boost/boost/tools/boostbook/xsl/function.xsl,v
retrieving revision 1.22.2.3
retrieving revision 1.22.2.4
diff -u -d -r1.22.2.3 -r1.22.2.4
--- function.xsl 3 Nov 2006 19:39:44 -0000 1.22.2.3
+++ function.xsl 13 Nov 2006 16:24:38 -0000 1.22.2.4
@@ -364,7 +364,7 @@
<!-- Information for this parameter -->
<xsl:variable name="parameter" select="$parameters[position()=1]"/>
<xsl:variable name="name">
- <xsl:if test="$include-names">
+ <xsl:if test="$include-names and $parameter/@name != ''">
<xsl:text> </xsl:text><xsl:value-of select="$parameter/@name"/>
</xsl:if>
</xsl:variable>
Index: lookup.xsl
===================================================================
RCS file: /cvsroot/boost/boost/tools/boostbook/xsl/lookup.xsl,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -d -r1.7.2.1 -r1.7.2.2
--- lookup.xsl 3 Nov 2006 19:39:44 -0000 1.7.2.1
+++ lookup.xsl 13 Nov 2006 16:24:38 -0000 1.7.2.2
@@ -67,7 +67,7 @@
<!-- Determine the set of ancestor namespaces -->
<xsl:variable name="ancestors"
- select="ancestor::namespace|ancestor::class"/>
+
select="ancestor::namespace|ancestor::class|ancestor::struct|ancestor::union"/>
<xsl:choose>
<xsl:when test="$depth > count($ancestors)">
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
