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

From: daniel_james_at_[hidden]
Date: 2008-05-14 16:39:14

Author: danieljames
Date: 2008-05-14 16:39:14 EDT (Wed, 14 May 2008)
New Revision: 45366
URL: http://svn.boost.org/trac/boost/changeset/45366

Log:
Avoid removing underscores that are part of a class or function name.

Text files modified: 
   branches/doc/tools/boostbook/xsl/chunk-common.xsl |     2 +-                                      
   branches/doc/tools/boostbook/xsl/lookup.xsl       |    14 +++++++-------                          
   2 files changed, 8 insertions(+), 8 deletions(-)

Modified: branches/doc/tools/boostbook/xsl/chunk-common.xsl
==============================================================================
--- branches/doc/tools/boostbook/xsl/chunk-common.xsl	(original)
+++ branches/doc/tools/boostbook/xsl/chunk-common.xsl	2008-05-14 16:39:14 EDT (Wed, 14 May 2008)
@@ -28,7 +28,7 @@
     <xsl:choose>
         <xsl:when test="not($recursive)">
             <!-- translate dots into directory separators, and replace illegal file path characters with underscores -->
-            <xsl:value-of select="translate(normalize-space(translate($basename, '._&lt;&gt;\:*?&quot;|', '/         ' )), ' ', '_')"/>
+            <xsl:value-of select="translate(normalize-space(translate($basename, '.&lt;&gt;\:*?&quot;|', '/        ' )), ' ', '_')"/>
             <xsl:value-of select="$html.ext"/>
         </xsl:when>
         <xsl:otherwise>

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-14 16:39:14 EDT (Wed, 14 May 2008)
@@ -129,14 +129,14 @@
       <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:value-of select="translate(normalize-space(translate($name, '.', ' ')), ' @', '_.')"/>
+    <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>
 
   <!-- Build the fully-qualified name of the given node -->