[Boost-commit] svn:boost r86270 - in trunk/tools/boostbook: test/doxygen test/doxygen/boost xsl/doxygen

Subject: [Boost-commit] svn:boost r86270 - in trunk/tools/boostbook: test/doxygen test/doxygen/boost xsl/doxygen
From: dnljms_at_[hidden]
Date: 2013-10-12 16:08:37

Author: danieljames
Date: 2013-10-12 16:08:37 EDT (Sat, 12 Oct 2013)
New Revision: 86270
URL: http://svn.boost.org/trac/boost/changeset/86270

Log:
Fix virtual methods in doxygen2boostbook.

Text files modified: 
   trunk/tools/boostbook/test/doxygen/autodoc.gold         |     2 +-                                      
   trunk/tools/boostbook/test/doxygen/boost/example.hpp    |     1 +                                       
   trunk/tools/boostbook/xsl/doxygen/doxygen2boostbook.xsl |     7 ++++++-                                 
   3 files changed, 8 insertions(+), 2 deletions(-)

Modified: trunk/tools/boostbook/test/doxygen/autodoc.gold
==============================================================================
--- trunk/tools/boostbook/test/doxygen/autodoc.gold	Sat Oct 12 15:59:48 2013	(r86269)
+++ trunk/tools/boostbook/test/doxygen/autodoc.gold	2013-10-12 16:08:37 EDT (Sat, 12 Oct 2013)	(r86270)
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
-<library-reference id="example_reference"><title>Example Reference</title><header name="boost/example.hpp"><namespace name="example"><class name="example"><purpose>Documentation for class example. </purpose><class name="inner_class"><data-member name="x"><type>int</type></data-member></class><enum name="class_enum"><enumvalue name="enumerator"/></enum><typedef name="documented_type1"><description><para>This type has documentation. </para></description><type>int</type></typedef><typedef name="documented_type2"><purpose>This type has documentation. </purpose><type>long</type></typedef><typedef name="documented_type3"><description><para>This type has documentation. </para></description><type>long double</type></typedef><typedef name="undocumented_type1"><type>short</type></typedef><typedef name="undocumented_type2"><type>double</type></typedef><data-member name="integer"><type>int</type></data-member><data-member name="mutable_integer" specifiers="mutable"><type>int</type></data-member><data-member name="const
_integer"><type>const int</type></data-member><data-member name="static_integer" specifiers="static"><type>int</type></data-member><data-member name="static_const_integer" specifiers="static"><type>const int</type></data-member><method-group name="public member functions"><method name="conversion-operator" cv="" specifiers="explicit"><type>int</type></method></method-group><constructor cv="= default"><parameter name=""><paramtype><classname>example</classname> const &amp;</paramtype></parameter></constructor><copy-assignment cv="= delete"><type><classname>example</classname> &amp;</type><parameter name=""><paramtype><classname>example</classname> const &amp;</paramtype></parameter></copy-assignment></class><struct name="example_template"><template>
+<library-reference id="example_reference"><title>Example Reference</title><header name="boost/example.hpp"><namespace name="example"><class name="example"><purpose>Documentation for class example. </purpose><class name="inner_class"><data-member name="x"><type>int</type></data-member></class><enum name="class_enum"><enumvalue name="enumerator"/></enum><typedef name="documented_type1"><description><para>This type has documentation. </para></description><type>int</type></typedef><typedef name="documented_type2"><purpose>This type has documentation. </purpose><type>long</type></typedef><typedef name="documented_type3"><description><para>This type has documentation. </para></description><type>long double</type></typedef><typedef name="undocumented_type1"><type>short</type></typedef><typedef name="undocumented_type2"><type>double</type></typedef><data-member name="integer"><type>int</type></data-member><data-member name="mutable_integer" specifiers="mutable"><type>int</type></data-member><data-member name="const
_integer"><type>const int</type></data-member><data-member name="static_integer" specifiers="static"><type>int</type></data-member><data-member name="static_const_integer" specifiers="static"><type>const int</type></data-member><method-group name="public member functions"><method name="virtual_method" cv=""><type>virtual int</type></method><method name="conversion-operator" cv="" specifiers="explicit"><type>int</type></method></method-group><constructor cv="= default"><parameter name=""><paramtype><classname>example</classname> const &amp;</paramtype></parameter></constructor><copy-assignment cv="= delete"><type><classname>example</classname> &amp;</type><parameter name=""><paramtype><classname>example</classname> const &amp;</paramtype></parameter></copy-assignment></class><struct name="example_template"><template>
       <template-type-parameter name="TypeParameter"><purpose><para>A template parameter </para></purpose></template-type-parameter>
       <template-nontype-parameter name="NonTypeParameter"><type>int</type><purpose><para>This is a non-type template parameter </para></purpose></template-nontype-parameter>
       <template-type-parameter name="TypeParameterWithDefault"><default>int</default><purpose><para>This is a template parameter with a default argument </para></purpose></template-type-parameter>

Modified: trunk/tools/boostbook/test/doxygen/boost/example.hpp
==============================================================================
--- trunk/tools/boostbook/test/doxygen/boost/example.hpp	Sat Oct 12 15:59:48 2013	(r86269)
+++ trunk/tools/boostbook/test/doxygen/boost/example.hpp	2013-10-12 16:08:37 EDT (Sat, 12 Oct 2013)	(r86270)
@@ -34,6 +34,7 @@
     public:
         example(example const&) = default;
         example& operator=(example const&) = delete;
+        virtual int virtual_method();
 
         int integer;
         static int static_integer;

Modified: trunk/tools/boostbook/xsl/doxygen/doxygen2boostbook.xsl
==============================================================================
--- trunk/tools/boostbook/xsl/doxygen/doxygen2boostbook.xsl	Sat Oct 12 15:59:48 2013	(r86269)
+++ trunk/tools/boostbook/xsl/doxygen/doxygen2boostbook.xsl	2013-10-12 16:08:37 EDT (Sat, 12 Oct 2013)	(r86270)
@@ -1220,6 +1220,11 @@
 
       <!-- Return type -->
       <xsl:element name="type">
+        <!-- Cheat on virtual and static by dropping them into the type -->
+        <xsl:if test="@virtual='yes' or @virt='virtual'">
+          <xsl:text>virtual </xsl:text>
+        </xsl:if>
+
         <xsl:apply-templates select="type"/>
       </xsl:element>
 
@@ -1305,7 +1310,7 @@
           <xsl:text>static </xsl:text>
         </xsl:if>
 
-        <xsl:if test="@virtual='yes'">
+        <xsl:if test="@virtual='yes' or @virt='virtual'">
           <xsl:text>virtual </xsl:text>
         </xsl:if>