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

From: daniel_james_at_[hidden]
Date: 2008-05-05 16:28:45

Author: danieljames
Date: 2008-05-05 16:28:44 EDT (Mon, 05 May 2008)
New Revision: 45152
URL: http://svn.boost.org/trac/boost/changeset/45152

Log:
Only add the id to fully qualified ids inside specializations - so that we're not adding generated ids on to the end of generated ids.

Text files modified: 
   branches/doc/tools/boostbook/xsl/lookup.xsl |    12 ++++++------                            
   1 files changed, 6 insertions(+), 6 deletions(-)

Modified: branches/doc/tools/boostbook/xsl/lookup.xsl
==============================================================================
--- branches/doc/tools/boostbook/xsl/lookup.xsl	(original)
+++ branches/doc/tools/boostbook/xsl/lookup.xsl	2008-05-05 16:28:44 EDT (Mon, 05 May 2008)
@@ -15,12 +15,6 @@
   <xsl:template name="generate.id">
     <xsl:param name="node" select="."/>
     <xsl:apply-templates select="$node" mode="generate.id"/>
-    <xsl:if test="$node/ancestor-or-self::class-specialization|
-      $node/ancestor-or-self::struct-specialization|
-      $node/ancestor-or-self::union-specialization">
-      <xsl:text>_</xsl:text>
-      <xsl:value-of select="generate-id($node)"/>
-    </xsl:if>
   </xsl:template>
 
   <xsl:template match="*" mode="generate.id">
@@ -135,6 +129,12 @@
       <xsl:apply-templates select="$node" mode="fully-qualified-name">
         <xsl:with-param name="separator" select="'@'"/>
       </xsl:apply-templates>
+      <xsl:if test="$node/ancestor-or-self::class-specialization|
+        $node/ancestor-or-self::struct-specialization|
+        $node/ancestor-or-self::union-specialization">
+        <xsl:text>_</xsl:text>
+        <xsl:value-of select="generate-id($node)"/>
+      </xsl:if>
     </xsl:variable>
     <xsl:value-of select="translate($name, '.@', '_.')"/>
   </xsl:template>