Subject: [Boost-commit] svn:boost r84168 - trunk/tools/boostbook/xsl/doxygen
From: dnljms_at_[hidden]
Date: 2013-05-06 07:27:43
Author: danieljames
Date: 2013-05-06 07:27:43 EDT (Mon, 06 May 2013)
New Revision: 84168
URL: http://svn.boost.org/trac/boost/changeset/84168
Log:
Fix doxygen parameter 'formuladir' so that it doesn't need a trailing slash.
Would be nice to fix all uses of directories in a similar manner, but XSL is a
pain.
Text files modified:
trunk/tools/boostbook/xsl/doxygen/doxygen2boostbook.xsl | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
Modified: trunk/tools/boostbook/xsl/doxygen/doxygen2boostbook.xsl
==============================================================================
--- trunk/tools/boostbook/xsl/doxygen/doxygen2boostbook.xsl (original)
+++ trunk/tools/boostbook/xsl/doxygen/doxygen2boostbook.xsl 2013-05-06 07:27:43 EDT (Mon, 06 May 2013)
@@ -51,6 +51,19 @@
<xsl:key name="compounds-by-id" match="compounddef" use="@id"/>
<xsl:key name="members-by-id" match="memberdef" use="@id" />
+ <!-- Add trailing slash to formuladir if missing -->
+
+ <xsl:variable name="boost.doxygen.formuladir.fixed">
+ <xsl:choose>
+ <xsl:when test="substring(boost.doxygen.formuladir, string-length(boost.doxygen.formuladir) - 1) = '/'">
+ <xsl:value-of select="$boost.doxygen.formuladir" />
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="concat($boost.doxygen.formuladir, '/')" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
<xsl:strip-space elements="briefdescription detaileddescription inbodydescription"/>
<xsl:template name="kind-error-message">
@@ -1657,7 +1670,7 @@
<imageobject role="html">
<imagedata format="PNG" align="center">
<xsl:attribute name="fileref">
- <xsl:value-of select="concat(concat(concat($boost.doxygen.formuladir, 'form_'), @id), '.png')"/>
+ <xsl:value-of select="concat(concat(concat($boost.doxygen.formuladir.fixed, 'form_'), @id), '.png')"/>
</xsl:attribute>
</imagedata>
</imageobject>
@@ -1678,7 +1691,7 @@
<imageobject role="html">
<imagedata format="PNG">
<xsl:attribute name="fileref">
- <xsl:value-of select="concat(concat(concat($boost.doxygen.formuladir, 'form_'), @id), '.png')"/>
+ <xsl:value-of select="concat(concat(concat($boost.doxygen.formuladir.fixed, 'form_'), @id), '.png')"/>
</xsl:attribute>
</imagedata>
</imageobject>