[Boost-commit] svn:boost r58879 - in branches/release/tools/boostbook: . test/doxygen test/doxygen/boost xsl xsl/doxygen

Subject: [Boost-commit] svn:boost r58879 - in branches/release/tools/boostbook: . test/doxygen test/doxygen/boost xsl xsl/doxygen
From: daniel_james_at_[hidden]
Date: 2010-01-10 14:47:32

Author: danieljames
Date: 2010-01-10 14:47:31 EST (Sun, 10 Jan 2010)
New Revision: 58879
URL: http://svn.boost.org/trac/boost/changeset/58879

Log:
Merge boostbook changes.
Properties modified: 
   branches/release/tools/boostbook/   (props changed)
Text files modified: 
   branches/release/tools/boostbook/test/doxygen/boost/example.hpp    |     2 +-                                      
   branches/release/tools/boostbook/test/doxygen/example.xml          |     2 +-                                      
   branches/release/tools/boostbook/xsl/doxygen/doxygen2boostbook.xsl |    23 +++++++++++++++++++++++                 
   branches/release/tools/boostbook/xsl/html.xsl                      |     1 +                                       
   4 files changed, 26 insertions(+), 2 deletions(-)

Modified: branches/release/tools/boostbook/test/doxygen/boost/example.hpp
==============================================================================
--- branches/release/tools/boostbook/test/doxygen/boost/example.hpp	(original)
+++ branches/release/tools/boostbook/test/doxygen/boost/example.hpp	2010-01-10 14:47:31 EST (Sun, 10 Jan 2010)
@@ -41,7 +41,7 @@
         class inner_class {
         public:
             int x;
-        }
+        };
 
         enum class_enum { enumerator };
         

Modified: branches/release/tools/boostbook/test/doxygen/example.xml
==============================================================================
--- branches/release/tools/boostbook/test/doxygen/example.xml	(original)
+++ branches/release/tools/boostbook/test/doxygen/example.xml	2010-01-10 14:47:31 EST (Sun, 10 Jan 2010)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 
 <!--
 Copyright Daniel James 2009
@@ -5,7 +6,6 @@
 file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <library id="example" name="Example" dirname="example" xmlns:xi="http://www.w3.org/2001/XInclude">
 <title>Example</title>

Modified: branches/release/tools/boostbook/xsl/doxygen/doxygen2boostbook.xsl
==============================================================================
--- branches/release/tools/boostbook/xsl/doxygen/doxygen2boostbook.xsl	(original)
+++ branches/release/tools/boostbook/xsl/doxygen/doxygen2boostbook.xsl	2010-01-10 14:47:31 EST (Sun, 10 Jan 2010)
@@ -723,12 +723,27 @@
         </xsl:if>
         <xsl:apply-templates/>
       </xsl:when>
+      <xsl:when test="@kind='friend'">
+        <xsl:if test="./memberdef/detaileddescription/para or ./memberdef/briefdescription/para">
+          <method-group name="friend functions">
+            <xsl:apply-templates>
+              <xsl:with-param name="in-section" select="true()"/>
+            </xsl:apply-templates>
+          </method-group>
+        </xsl:if>
+      </xsl:when>
       <xsl:when test="@kind='public-static-attrib' or @kind='public-attrib'">
         <xsl:apply-templates/>
       </xsl:when>
       <xsl:when test="@kind='public-type'">
         <xsl:apply-templates/>
       </xsl:when>
+      <xsl:when test="@kind='private-type'">
+        <!--skip private members-->
+      </xsl:when>
+      <xsl:when test="@kind='private-static-attrib' or @kind='private-attrib'">
+        <!--skip private members-->
+      </xsl:when>
       <xsl:when test="@kind='func'">
         <xsl:apply-templates>
           <xsl:with-param name="in-file" select="$in-file"/>
@@ -833,6 +848,11 @@
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
+      <xsl:when test="@kind='friend'">
+        <xsl:if test="./detaileddescription/para or ./briefdescription/para">
+          <xsl:call-template name="method"/>
+        </xsl:if>
+      </xsl:when>
       <xsl:when test="@kind='enum'">
         <xsl:call-template name="enum">
           <xsl:with-param name="in-file" select="$in-file"/>
@@ -1205,6 +1225,9 @@
       <xsl:apply-templates mode="passthrough"/>
     </para>
   </xsl:template>
+  <xsl:template match="copydoc" mode="passthrough">
+    <xsl:apply-templates mode="passthrough"/>
+  </xsl:template>
 
   <xsl:template match="para/simplesect" mode="passthrough">
     <xsl:if test="not (@kind='pre') and

Modified: branches/release/tools/boostbook/xsl/html.xsl
==============================================================================
--- branches/release/tools/boostbook/xsl/html.xsl	(original)
+++ branches/release/tools/boostbook/xsl/html.xsl	2010-01-10 14:47:31 EST (Sun, 10 Jan 2010)
@@ -39,6 +39,7 @@
   <xsl:param name="generate.section.toc.level" select="3"/>
   <xsl:param name="doc.standalone">false</xsl:param>
   <xsl:param name="chunker.output.indent">yes</xsl:param>
+  <xsl:param name="chunker.output.encoding">US-ASCII</xsl:param>
   <xsl:param name="chunk.quietly" select="not(number($boostbook.verbose))"/>
   <xsl:param name="toc.max.depth">2</xsl:param>
   <xsl:param name="callout.graphics.number.limit">15</xsl:param>