Update of /cvsroot/boost/boost/tools/boostbook/xsl/doxygen
In directory
sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5911/tools/boostbook/xsl/doxygen
Modified Files:
Tag: RC_1_34_0
doxygen2boostbook.xsl
Log Message:
Cross merge HEAD and RC_1_34_0.
Index: doxygen2boostbook.xsl
===================================================================
RCS file:
/cvsroot/boost/boost/tools/boostbook/xsl/doxygen/doxygen2boostbook.xsl,v
retrieving revision 1.34.2.2
retrieving revision 1.34.2.3
diff -u -d -r1.34.2.2 -r1.34.2.3
--- doxygen2boostbook.xsl 3 Nov 2006 19:39:45 -0000 1.34.2.2
+++ doxygen2boostbook.xsl 13 Nov 2006 16:24:38 -0000 1.34.2.3
@@ -455,11 +455,20 @@
<xsl:param name="with-namespace-refs"/>
<xsl:param name="in-file"/>
- <xsl:apply-templates select="key('compounds-by-id', @refid)">
- <xsl:with-param name="with-namespace-refs"
- select="$with-namespace-refs"/>
- <xsl:with-param name="in-file" select="$in-file"/>
- </xsl:apply-templates>
+ <xsl:variable name="name">
+ <xsl:call-template name="strip-qualifiers">
+ <xsl:with-param name="name" select="."/>
+ </xsl:call-template>
+ </xsl:variable>
+
+ <!-- Only process this if it is indeed global -->
+ <xsl:if test=".=$name">
+ <xsl:apply-templates select="key('compounds-by-id', @refid)">
+ <xsl:with-param name="with-namespace-refs"
+ select="$with-namespace-refs"/>
+ <xsl:with-param name="in-file" select="$in-file"/>
+ </xsl:apply-templates>
+ </xsl:if>
</xsl:template>
<xsl:template match="innerclass">
@@ -802,7 +811,7 @@
<xsl:value-of select="normalize-space(declname/text())"/>
</xsl:variable>
- <xsl:apply-templates
select="../detaileddescription/para/parameterlist[attribute::kind='param']/parameterdescription"
+ <xsl:apply-templates
select="../detaileddescription//parameterlist[attribute::kind='param']/*"
mode="parameter.description">
<xsl:with-param name="name">
<xsl:value-of select="$name"/>
@@ -811,10 +820,22 @@
</parameter>
</xsl:template>
- <xsl:template match="parameterdescription" mode="parameter.description">
+ <xsl:template match="parameteritem" mode="parameter.description">
<!-- The parameter name we are looking for -->
<xsl:param name="name"/>
+
+ <xsl:if test="string(parameternamelist/parametername) = $name">
+ <description>
+ <xsl:apply-templates select="parameterdescription/para"
mode="passthrough"/>
+ </description>
+ </xsl:if>
+ </xsl:template>
+ <!-- For older versions of Doxygen, which didn't use parameteritem -->
+ <xsl:template match="parameterdescription" mode="parameter.description">
+ <!-- The parameter name we are looking for -->
+ <xsl:param name="name"/>
+
<!-- The parametername node associated with this description -->
<xsl:variable name="name-node" select="preceding-sibling::*[1]"/>
@@ -1155,12 +1176,12 @@
<xsl:if test="@kind='exception'">
<simpara>
<xsl:choose>
- <xsl:when test="normalize-space(parametername/text())='nothrow'">
+ <xsl:when test="normalize-space(.//parametername/text())='nothrow'">
<xsl:text>Will not throw.</xsl:text>
</xsl:when>
<xsl:otherwise>
<classname>
- <xsl:value-of select="parametername/text()"/>
+ <xsl:value-of select=".//parametername/text()"/>
</classname>
<xsl:text> </xsl:text>
<xsl:apply-templates
-------------------------------------------------------------------------
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
