Merge branch 'develop'

This commit is contained in:
Daniel James 2017-09-08 19:16:16 +01:00
commit abaafffe48
2 changed files with 24 additions and 5 deletions

View File

@ -512,9 +512,9 @@ General default options go here:
<xsl:param name="admon.graphics">1</xsl:param>
<xsl:param name="admon.graphics.extension">.svg</xsl:param>
<xsl:param name="draft.mode">no</xsl:param>
<xsl:param name="admon.graphics.path">http://svn.boost.org/svn/boost/trunk/doc/src/images/</xsl:param>
<xsl:param name="callout.graphics.path">http://svn.boost.org/svn/boost/trunk/doc/src/images/callouts/</xsl:param>
<xsl:param name="img.src.path">http://svn.boost.org/svn/boost/trunk/doc/html/</xsl:param>
<xsl:param name="admon.graphics.path">http://www.boost.org/doc/libs/develop/doc/src/images/</xsl:param>
<xsl:param name="callout.graphics.path">http://www.boost.org/doc/libs/develop/doc/src/images/callouts/</xsl:param>
<xsl:param name="img.src.path">http://www.boost.org/doc/libs/devlop/doc/html/</xsl:param>
</xsl:stylesheet>

View File

@ -251,8 +251,27 @@
</xsl:template>
<xsl:template match="function|overloaded-function" mode="unique.name">
<xsl:value-of select="number(count(key('named-entities',
translate(@name, $uppercase-letters, $lowercase-letters))) = 1)"/>
<xsl:variable name="func-name">
<xsl:call-template name="fully-qualified-name">
<xsl:with-param name="node" select="."/>
</xsl:call-template>
</xsl:variable>
<!-- Count the number of elements with the same qualified name -->
<xsl:variable name="count-elements">
<xsl:for-each select="key('named-entities', translate(@name, $uppercase-letters, $lowercase-letters))">
<xsl:variable name="other-name">
<xsl:call-template name="fully-qualified-name">
<xsl:with-param name="node" select="."/>
</xsl:call-template>
</xsl:variable>
<xsl:if test="$func-name = $other-name">
<xsl:text> </xsl:text>
</xsl:if>
</xsl:for-each>
</xsl:variable>
<xsl:value-of select="number(string-length($count-elements) = 1)"/>
</xsl:template>
<!-- Print the name of the current node -->