[Boost-commit] svn:boost r45130 - branches/doc/tools/boostbook/xsl

From: daniel_james_at_[hidden]
Date: 2008-05-05 07:37:05

Author: danieljames
Date: 2008-05-05 07:37:04 EDT (Mon, 05 May 2008)
New Revision: 45130
URL: http://svn.boost.org/trac/boost/changeset/45130

Log:
Combine the two alternative versions of the function generate.id

Text files modified: 
   branches/doc/tools/boostbook/xsl/annotation.xsl |     6 +++++-                                  
   branches/doc/tools/boostbook/xsl/type.xsl       |     9 ---------                               
   2 files changed, 5 insertions(+), 10 deletions(-)

Modified: branches/doc/tools/boostbook/xsl/annotation.xsl
==============================================================================
--- branches/doc/tools/boostbook/xsl/annotation.xsl	(original)
+++ branches/doc/tools/boostbook/xsl/annotation.xsl	2008-05-05 07:37:04 EDT (Mon, 05 May 2008)
@@ -34,8 +34,12 @@
         </xsl:call-template>
       </xsl:when>
       <xsl:otherwise>
+        <xsl:call-template name="fully-qualified-name">
+          <xsl:with-param name="node" select="."/>
+          <xsl:with-param name="separator" select="'.'"/>
+        </xsl:call-template>
+        <xsl:text>_</xsl:text>
         <xsl:value-of select="generate-id(.)"/>
-        <xsl:text>-bb</xsl:text>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>

Modified: branches/doc/tools/boostbook/xsl/type.xsl
==============================================================================
--- branches/doc/tools/boostbook/xsl/type.xsl	(original)
+++ branches/doc/tools/boostbook/xsl/type.xsl	2008-05-05 07:37:04 EDT (Mon, 05 May 2008)
@@ -63,15 +63,6 @@
     <xsl:value-of select="@name"/>
   </xsl:template>
 
-  <xsl:template match="function | overloaded-function" mode="generate.id">
-    <xsl:call-template name="fully-qualified-name">
-      <xsl:with-param name="node" select="."/>
-      <xsl:with-param name="separator" select="'.'"/>
-    </xsl:call-template>
-    <xsl:text>_</xsl:text>
-    <xsl:value-of select="generate-id(.)"/>
-  </xsl:template>
-
   <!-- Display the full name of the current node, e.g., "Class
        template function". -->
   <xsl:template name="type.display.name">