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

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

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

Log:
Deal with generated ids that contain dots which aren't separators.

Text files modified: 
   branches/doc/tools/boostbook/xsl/annotation.xsl |     6 ++----                                  
   branches/doc/tools/boostbook/xsl/global.xsl     |     3 +--                                     
   branches/doc/tools/boostbook/xsl/lookup.xsl     |    11 +++++++++++                             
   branches/doc/tools/boostbook/xsl/type.xsl       |    15 +++++----------                         
   4 files changed, 19 insertions(+), 16 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:18 EDT (Mon, 05 May 2008)
@@ -28,15 +28,13 @@
     <xsl:choose>
       <xsl:when test="count(key('named-entities', $name))=1
                       and ($translated-name=$name)">
-        <xsl:call-template name="fully-qualified-name">
+        <xsl:call-template name="fully-qualified-id">
           <xsl:with-param name="node" select="."/>
-          <xsl:with-param name="separator" select="'.'"/>
         </xsl:call-template>
       </xsl:when>
       <xsl:otherwise>
-        <xsl:call-template name="fully-qualified-name">
+        <xsl:call-template name="fully-qualified-id">
           <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(.)"/>

Modified: branches/doc/tools/boostbook/xsl/global.xsl
==============================================================================
--- branches/doc/tools/boostbook/xsl/global.xsl	(original)
+++ branches/doc/tools/boostbook/xsl/global.xsl	2008-05-05 07:37:18 EDT (Mon, 05 May 2008)
@@ -68,9 +68,8 @@
     <xsl:text>;</xsl:text>
   </xsl:template>
   <xsl:template match="data-member" mode="generate.id">
-    <xsl:call-template name="fully-qualified-name">
+    <xsl:call-template name="fully-qualified-id">
       <xsl:with-param name="node" select="."/>
-      <xsl:with-param name="separator" select="'.'"/>
     </xsl:call-template>
   </xsl:template>
 </xsl:stylesheet>

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 07:37:18 EDT (Mon, 05 May 2008)
@@ -128,6 +128,17 @@
     </xsl:choose>
   </xsl:template>
 
+  <!-- Build the fully-qualified id of the given node -->
+  <xsl:template name="fully-qualified-id">
+    <xsl:param name="node"/>
+    <xsl:variable name="name">
+      <xsl:apply-templates select="$node" mode="fully-qualified-name">
+        <xsl:with-param name="separator" select="'@'"/>
+      </xsl:apply-templates>
+    </xsl:variable>
+    <xsl:value-of select="translate($name, '.@', '_.')"/>
+  </xsl:template>
+
   <!-- Build the fully-qualified name of the given node -->
   <xsl:template name="fully-qualified-name">
     <xsl:param name="node"/>

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:18 EDT (Mon, 05 May 2008)
@@ -27,37 +27,32 @@
   <xsl:param name="boost.compact.typedef">1</xsl:param>
 
   <xsl:template match="class|struct|union" mode="generate.id">
-    <xsl:call-template name="fully-qualified-name">
+    <xsl:call-template name="fully-qualified-id">
       <xsl:with-param name="node" select="."/>
-      <xsl:with-param name="separator" select="'.'"/>
     </xsl:call-template>
   </xsl:template>
 
   <xsl:template match="class-specialization|struct-specialization|union-specialization" mode="generate.id">
-    <xsl:call-template name="fully-qualified-name">
+    <xsl:call-template name="fully-qualified-id">
       <xsl:with-param name="node" select="."/>
-      <xsl:with-param name="separator" select="'.'"/>
     </xsl:call-template>
   </xsl:template>
 
   <xsl:template match="typedef" mode="generate.id">
-    <xsl:call-template name="fully-qualified-name">
+    <xsl:call-template name="fully-qualified-id">
       <xsl:with-param name="node" select="."/>
-      <xsl:with-param name="separator" select="'.'"/>
     </xsl:call-template>
   </xsl:template>
 
   <xsl:template match="enum" mode="generate.id">
-    <xsl:call-template name="fully-qualified-name">
+    <xsl:call-template name="fully-qualified-id">
       <xsl:with-param name="node" select="."/>
-      <xsl:with-param name="separator" select="'.'"/>
     </xsl:call-template>
   </xsl:template>
 
   <xsl:template match="enumvalue" mode="generate.id">
-    <xsl:call-template name="fully-qualified-name">
+    <xsl:call-template name="fully-qualified-id">
       <xsl:with-param name="node" select="parent::enum"/>
-      <xsl:with-param name="separator" select="'.'"/>
     </xsl:call-template>
     <xsl:text>.</xsl:text>
     <xsl:value-of select="@name"/>