Subject: [Boost-commit] svn:boost r82405 - in sandbox-branches/geometry/index: boost/geometry/extensions/index/rtree doc doc/html doc/html/geometry_index/r_tree doc/src/tools/doxygen_xml2qbk
From: adam.wulkiewicz_at_[hidden]
Date: 2013-01-08 10:54:32
Author: awulkiew
Date: 2013-01-08 10:54:30 EST (Tue, 08 Jan 2013)
New Revision: 82405
URL: http://svn.boost.org/trac/boost/changeset/82405
Log:
Added cos_output_style to doxygen_xml2_qbk tool.
Detail member description output slightly changed.
Text files modified:
sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/rtree.hpp | 12 +-
sandbox-branches/geometry/index/doc/html/geometry_index/r_tree/index.html | 195 +++++++++++++++++++--------------------
sandbox-branches/geometry/index/doc/html/index.html | 2
sandbox-branches/geometry/index/doc/make_qbk.py | 1
sandbox-branches/geometry/index/doc/src/tools/doxygen_xml2qbk/configuration.hpp | 1
sandbox-branches/geometry/index/doc/src/tools/doxygen_xml2qbk/doxygen_xml2qbk.cpp | 9 +
sandbox-branches/geometry/index/doc/src/tools/doxygen_xml2qbk/quickbook_output.hpp | 11 +-
7 files changed, 117 insertions(+), 114 deletions(-)
Modified: sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/rtree.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/rtree.hpp (original)
+++ sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/rtree.hpp 2013-01-08 10:54:30 EST (Tue, 08 Jan 2013)
@@ -241,7 +241,7 @@
/*!
\brief The copy constructor.
- The copy constructor. It uses parameters, translator and allocator from the source tree.
+ It uses parameters, translator and allocator from the source tree.
\param src The rtree which content will be copied.
@@ -268,7 +268,7 @@
/*!
\brief The copy constructor.
- The copy constructor. It uses Parameters and translator from the source tree.
+ It uses Parameters and translator from the source tree.
\param src The rtree which content will be copied.
\param allocator The allocator which will be used.
@@ -294,7 +294,7 @@
/*!
\brief The moving constructor.
- The moving constructor. It uses parameters, translator and allocator from the source tree.
+ It uses parameters, translator and allocator from the source tree.
\param src The rtree which content will be moved.
@@ -322,7 +322,7 @@
/*!
\brief The assignment operator.
- The assignment operator. It uses parameters and translator from the source tree.
+ It uses parameters and translator from the source tree.
\param src The rtree which content will be copied.
@@ -349,7 +349,7 @@
/*!
\brief The moving assignment.
- The moving assignment. It uses parameters and translator from the source tree.
+ It uses parameters and translator from the source tree.
\param src The rtree which content will be moved.
@@ -394,7 +394,7 @@
/*!
\brief Swaps contents of two rtrees.
- Swaps contents of two rtrees. Parameters, translator and allocators are swapped as well.
+ Parameters, translator and allocators are swapped as well.
\param other The rtree which content will be swapped with this rtree content.
Modified: sandbox-branches/geometry/index/doc/html/geometry_index/r_tree/index.html
==============================================================================
--- sandbox-branches/geometry/index/doc/html/geometry_index/r_tree/index.html (original)
+++ sandbox-branches/geometry/index/doc/html/geometry_index/r_tree/index.html 2013-01-08 10:54:30 EST (Tue, 08 Jan 2013)
@@ -700,15 +700,11 @@
<div class="titlepage"><div><div><h5 class="title">
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member0"></a><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member0" title="rtree()">rtree()</a>
</h5></div></div></div>
-<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member0.h0"></a>
- <span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member0.description"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member0.description">Description</a>
- </h6>
<p>
The constructor.
</p>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member0.h1"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member0.h0"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member0.synopsis"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member0.synopsis">Synopsis</a>
</h6>
<p>
@@ -719,7 +715,7 @@
<p>
</p>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member0.h2"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member0.h1"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member0.parameters"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member0.parameters">Parameters</a>
</h6>
<div class="informaltable"><table class="table">
@@ -800,7 +796,7 @@
</tbody>
</table></div>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member0.h3"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member0.h2"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member0.exception_safety"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member0.exception_safety">Exception-safety</a>
</h6>
<p>
@@ -815,15 +811,11 @@
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member1"></a><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member1" title="rtree(Iterator, Iterator)">rtree(Iterator,
Iterator)</a>
</h5></div></div></div>
-<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member1.h0"></a>
- <span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member1.description"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member1.description">Description</a>
- </h6>
<p>
The constructor.
</p>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member1.h1"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member1.h0"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member1.synopsis"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member1.synopsis">Synopsis</a>
</h6>
<p>
@@ -837,7 +829,7 @@
<p>
</p>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member1.h2"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member1.h1"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member1.parameters"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member1.parameters">Parameters</a>
</h6>
<div class="informaltable"><table class="table">
@@ -952,7 +944,7 @@
</tbody>
</table></div>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member1.h3"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member1.h2"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member1.exception_safety"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member1.exception_safety">Exception-safety</a>
</h6>
<p>
@@ -967,15 +959,11 @@
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member2"></a><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member2" title="rtree(Range const &)">rtree(Range
const &)</a>
</h5></div></div></div>
-<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member2.h0"></a>
- <span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member2.description"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member2.description">Description</a>
- </h6>
<p>
The constructor.
</p>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member2.h1"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member2.h0"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member2.synopsis"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member2.synopsis">Synopsis</a>
</h6>
<p>
@@ -988,7 +976,7 @@
<p>
</p>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member2.h2"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member2.h1"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member2.parameters"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member2.parameters">Parameters</a>
</h6>
<div class="informaltable"><table class="table">
@@ -1087,7 +1075,7 @@
</tbody>
</table></div>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member2.h3"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member2.h2"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member2.exception_safety"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member2.exception_safety">Exception-safety</a>
</h6>
<p>
@@ -1101,15 +1089,11 @@
<div class="titlepage"><div><div><h5 class="title">
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member3"></a><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member3" title="~rtree()">~rtree()</a>
</h5></div></div></div>
-<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member3.h0"></a>
- <span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member3.description"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member3.description">Description</a>
- </h6>
<p>
The destructor.
</p>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member3.h1"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member3.h0"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member3.synopsis"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member3.synopsis">Synopsis</a>
</h6>
<p>
@@ -1118,7 +1102,7 @@
<p>
</p>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member3.h2"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member3.h1"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member3.exception_safety"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member3.exception_safety">Exception-safety</a>
</h6>
<p>
@@ -1133,13 +1117,15 @@
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member4"></a><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member4" title="rtree(rtree const &)">rtree(rtree
const &)</a>
</h5></div></div></div>
+<p>
+ The copy constructor.
+ </p>
<h6>
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member4.h0"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member4.description"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member4.description">Description</a>
</h6>
<p>
- The copy constructor. It uses parameters, translator and allocator from
- the source tree.
+ It uses parameters, translator and allocator from the source tree.
</p>
<h6>
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member4.h1"></a>
@@ -1212,13 +1198,15 @@
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member5"></a><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member5" title="rtree(rtree const &, allocator_type const &)">rtree(rtree
const &, allocator_type const &)</a>
</h5></div></div></div>
+<p>
+ The copy constructor.
+ </p>
<h6>
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member5.h0"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member5.description"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member5.description">Description</a>
</h6>
<p>
- The copy constructor. It uses Parameters and translator from the source
- tree.
+ It uses Parameters and translator from the source tree.
</p>
<h6>
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member5.h1"></a>
@@ -1310,13 +1298,15 @@
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member6"></a><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member6" title="rtree(rtree &&)">rtree(rtree
&&)</a>
</h5></div></div></div>
+<p>
+ The moving constructor.
+ </p>
<h6>
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member6.h0"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member6.description"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member6.description">Description</a>
</h6>
<p>
- The moving constructor. It uses parameters, translator and allocator
- from the source tree.
+ It uses parameters, translator and allocator from the source tree.
</p>
<h6>
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member6.h1"></a>
@@ -1388,13 +1378,15 @@
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member7"></a><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member7" title="operator=(const rtree &)">operator=(const
rtree &)</a>
</h5></div></div></div>
+<p>
+ The assignment operator.
+ </p>
<h6>
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member7.h0"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member7.description"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member7.description">Description</a>
</h6>
<p>
- The assignment operator. It uses parameters and translator from the source
- tree.
+ It uses parameters and translator from the source tree.
</p>
<h6>
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member7.h1"></a>
@@ -1467,13 +1459,15 @@
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member8"></a><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member8" title="operator=(rtree &&)">operator=(rtree
&&)</a>
</h5></div></div></div>
+<p>
+ The moving assignment.
+ </p>
<h6>
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member8.h0"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member8.description"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member8.description">Description</a>
</h6>
<p>
- The moving assignment. It uses parameters and translator from the source
- tree.
+ It uses parameters and translator from the source tree.
</p>
<h6>
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member8.h1"></a>
@@ -1545,13 +1539,15 @@
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member9"></a><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member9" title="swap(rtree &)">swap(rtree
&)</a>
</h5></div></div></div>
+<p>
+ Swaps contents of two rtrees.
+ </p>
<h6>
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member9.h0"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member9.description"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member9.description">Description</a>
</h6>
<p>
- Swaps contents of two rtrees. Parameters, translator and allocators are
- swapped as well.
+ Parameters, translator and allocators are swapped as well.
</p>
<h6>
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member9.h1"></a>
@@ -1623,15 +1619,11 @@
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member10"></a><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member10" title="insert(value_type const &)">insert(value_type
const &)</a>
</h5></div></div></div>
-<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member10.h0"></a>
- <span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member10.description"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member10.description">Description</a>
- </h6>
<p>
Insert a value to the index.
</p>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member10.h1"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member10.h0"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member10.synopsis"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member10.synopsis">Synopsis</a>
</h6>
<p>
@@ -1640,7 +1632,7 @@
<p>
</p>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member10.h2"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member10.h1"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member10.parameters"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member10.parameters">Parameters</a>
</h6>
<div class="informaltable"><table class="table">
@@ -1685,7 +1677,7 @@
</tr></tbody>
</table></div>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member10.h3"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member10.h2"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member10.exception_safety"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member10.exception_safety">Exception-safety</a>
</h6>
<p>
@@ -1702,15 +1694,11 @@
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member11"></a><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member11" title="insert(Iterator, Iterator)">insert(Iterator,
Iterator)</a>
</h5></div></div></div>
-<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member11.h0"></a>
- <span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member11.description"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member11.description">Description</a>
- </h6>
<p>
Insert a range of values to the index.
</p>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member11.h1"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member11.h0"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member11.synopsis"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member11.synopsis">Synopsis</a>
</h6>
<p>
@@ -1720,7 +1708,7 @@
<p>
</p>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member11.h2"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member11.h1"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member11.parameters"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member11.parameters">Parameters</a>
</h6>
<div class="informaltable"><table class="table">
@@ -1784,7 +1772,7 @@
</tbody>
</table></div>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member11.h3"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member11.h2"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member11.exception_safety"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member11.exception_safety">Exception-safety</a>
</h6>
<p>
@@ -1801,15 +1789,11 @@
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member12"></a><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member12" title="insert(Range const &)">insert(Range
const &)</a>
</h5></div></div></div>
-<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member12.h0"></a>
- <span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member12.description"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member12.description">Description</a>
- </h6>
<p>
Insert a range of values to the index.
</p>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member12.h1"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member12.h0"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member12.synopsis"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member12.synopsis">Synopsis</a>
</h6>
<p>
@@ -1819,7 +1803,7 @@
<p>
</p>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member12.h2"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member12.h1"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member12.parameters"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member12.parameters">Parameters</a>
</h6>
<div class="informaltable"><table class="table">
@@ -1865,7 +1849,7 @@
</tr></tbody>
</table></div>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member12.h3"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member12.h2"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member12.exception_safety"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member12.exception_safety">Exception-safety</a>
</h6>
<p>
@@ -1882,6 +1866,9 @@
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member13"></a><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member13" title="remove(value_type const &)">remove(value_type
const &)</a>
</h5></div></div></div>
+<p>
+ Remove a value from the container.
+ </p>
<h6>
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member13.h0"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member13.description"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member13.description">Description</a>
@@ -1969,6 +1956,9 @@
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member14"></a><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member14" title="remove(Iterator, Iterator)">remove(Iterator,
Iterator)</a>
</h5></div></div></div>
+<p>
+ Remove a range of values from the container.
+ </p>
<h6>
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member14.h0"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member14.description"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member14.description">Description</a>
@@ -2078,6 +2068,9 @@
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member15"></a><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member15" title="remove(Range const &)">remove(Range
const &)</a>
</h5></div></div></div>
+<p>
+ Remove a range of values from the container.
+ </p>
<h6>
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member15.h0"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member15.description"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member15.description">Description</a>
@@ -2168,6 +2161,9 @@
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member16"></a><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member16" title="spatial_query(Predicates const &, OutIter)">spatial_query(Predicates
const &, OutIter)</a>
</h5></div></div></div>
+<p>
+ Finds values meeting spatial predicates, e.g. intersecting some Box.
+ </p>
<h6>
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member16.h0"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member16.description"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member16.description">Description</a>
@@ -2278,6 +2274,9 @@
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member17"></a><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member17" title="nearest_query(DistancesPredicates const &, value_type &)">nearest_query(DistancesPredicates
const &, value_type &)</a>
</h5></div></div></div>
+<p>
+ Finds one value meeting distances predicates, e.g. nearest to some Point.
+ </p>
<h6>
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member17.h0"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member17.description"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member17.description">Description</a>
@@ -2393,6 +2392,10 @@
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member18"></a><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member18" title="nearest_query(DistancesPredicates const &, Predicates const &, value_type &)">nearest_query(DistancesPredicates
const &, Predicates const &, value_type &)</a>
</h5></div></div></div>
+<p>
+ Finds one value meeting distances predicates and spatial predicates,
+ e.g. nearest to some Point and intersecting some Box.
+ </p>
<h6>
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member18.h0"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member18.description"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member18.description">Description</a>
@@ -2535,6 +2538,10 @@
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member19"></a><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member19" title="nearest_query(DistancesPredicates const &, size_t, OutIter)">nearest_query(DistancesPredicates
const &, size_t, OutIter)</a>
</h5></div></div></div>
+<p>
+ Finds k values meeting distances predicates, e.g. k nearest values to
+ some Point.
+ </p>
<h6>
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member19.h0"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member19.description"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member19.description">Description</a>
@@ -2669,6 +2676,10 @@
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member20"></a><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member20" title="nearest_query(DistancesPredicates const &, size_t, Predicates const &, OutIter)">nearest_query(DistancesPredicates
const &, size_t, Predicates const &, OutIter)</a>
</h5></div></div></div>
+<p>
+ Finds k values meeting distances predicates and spatial predicates, e.g.
+ k nearest values to some Point and intersecting some Box.
+ </p>
<h6>
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member20.h0"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member20.description"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member20.description">Description</a>
@@ -2830,15 +2841,11 @@
<div class="titlepage"><div><div><h5 class="title">
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member21"></a><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member21" title="size()">size()</a>
</h5></div></div></div>
-<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member21.h0"></a>
- <span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member21.description"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member21.description">Description</a>
- </h6>
<p>
Returns the number of stored values.
</p>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member21.h1"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member21.h0"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member21.synopsis"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member21.synopsis">Synopsis</a>
</h6>
<p>
@@ -2847,14 +2854,14 @@
<p>
</p>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member21.h2"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member21.h1"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member21.returns"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member21.returns">Returns</a>
</h6>
<p>
The number of stored values.
</p>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member21.h3"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member21.h2"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member21.exception_safety"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member21.exception_safety">Exception-safety</a>
</h6>
<p>
@@ -2868,15 +2875,11 @@
<div class="titlepage"><div><div><h5 class="title">
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member22"></a><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member22" title="empty()">empty()</a>
</h5></div></div></div>
-<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member22.h0"></a>
- <span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member22.description"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member22.description">Description</a>
- </h6>
<p>
Query if the container is empty.
</p>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member22.h1"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member22.h0"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member22.synopsis"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member22.synopsis">Synopsis</a>
</h6>
<p>
@@ -2885,14 +2888,14 @@
<p>
</p>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member22.h2"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member22.h1"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member22.returns"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member22.returns">Returns</a>
</h6>
<p>
true if the container is empty.
</p>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member22.h3"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member22.h2"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member22.exception_safety"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member22.exception_safety">Exception-safety</a>
</h6>
<p>
@@ -2906,15 +2909,11 @@
<div class="titlepage"><div><div><h5 class="title">
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member23"></a><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member23" title="clear()">clear()</a>
</h5></div></div></div>
-<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member23.h0"></a>
- <span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member23.description"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member23.description">Description</a>
- </h6>
<p>
Removes all values stored in the container.
</p>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member23.h1"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member23.h0"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member23.synopsis"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member23.synopsis">Synopsis</a>
</h6>
<p>
@@ -2923,7 +2922,7 @@
<p>
</p>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member23.h2"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member23.h1"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member23.exception_safety"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member23.exception_safety">Exception-safety</a>
</h6>
<p>
@@ -2937,6 +2936,9 @@
<div class="titlepage"><div><div><h5 class="title">
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member24"></a><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member24" title="box()">box()</a>
</h5></div></div></div>
+<p>
+ Returns the box containing all values stored in the container.
+ </p>
<h6>
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member24.h0"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member24.description"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member24.description">Description</a>
@@ -2979,6 +2981,9 @@
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member25"></a><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member25" title="count(ValueOrIndexable const &)">count(ValueOrIndexable
const &)</a>
</h5></div></div></div>
+<p>
+ Count Values or Indexables stored in the container.
+ </p>
<h6>
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member25.h0"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member25.description"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member25.description">Description</a>
@@ -3066,15 +3071,11 @@
<div class="titlepage"><div><div><h5 class="title">
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member26"></a><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member26" title="parameters()">parameters()</a>
</h5></div></div></div>
-<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member26.h0"></a>
- <span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member26.description"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member26.description">Description</a>
- </h6>
<p>
Returns parameters.
</p>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member26.h1"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member26.h0"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member26.synopsis"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member26.synopsis">Synopsis</a>
</h6>
<p>
@@ -3083,14 +3084,14 @@
<p>
</p>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member26.h2"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member26.h1"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member26.returns"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member26.returns">Returns</a>
</h6>
<p>
The parameters object.
</p>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member26.h3"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member26.h2"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member26.exception_safety"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member26.exception_safety">Exception-safety</a>
</h6>
<p>
@@ -3104,15 +3105,11 @@
<div class="titlepage"><div><div><h5 class="title">
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member27"></a><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member27" title="translator()">translator()</a>
</h5></div></div></div>
-<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member27.h0"></a>
- <span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member27.description"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member27.description">Description</a>
- </h6>
<p>
Returns the translator object.
</p>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member27.h1"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member27.h0"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member27.synopsis"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member27.synopsis">Synopsis</a>
</h6>
<p>
@@ -3121,14 +3118,14 @@
<p>
</p>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member27.h2"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member27.h1"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member27.returns"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member27.returns">Returns</a>
</h6>
<p>
The translator object.
</p>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member27.h3"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member27.h2"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member27.exception_safety"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member27.exception_safety">Exception-safety</a>
</h6>
<p>
@@ -3142,15 +3139,11 @@
<div class="titlepage"><div><div><h5 class="title">
<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member28"></a><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member28" title="get_allocator()">get_allocator()</a>
</h5></div></div></div>
-<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member28.h0"></a>
- <span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member28.description"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member28.description">Description</a>
- </h6>
<p>
Returns allocator used by the rtree.
</p>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member28.h1"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member28.h0"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member28.synopsis"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member28.synopsis">Synopsis</a>
</h6>
<p>
@@ -3159,14 +3152,14 @@
<p>
</p>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member28.h2"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member28.h1"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member28.returns"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member28.returns">Returns</a>
</h6>
<p>
The allocator.
</p>
<h6>
-<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member28.h3"></a>
+<a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member28.h2"></a>
<span class="phrase"><a name="geometry_index.r_tree.index.boost_geometry_index_rtree.member28.exception_safety"></a></span><a class="link" href="index.html#geometry_index.r_tree.index.boost_geometry_index_rtree.member28.exception_safety">Exception-safety</a>
</h6>
<p>
Modified: sandbox-branches/geometry/index/doc/html/index.html
==============================================================================
--- sandbox-branches/geometry/index/doc/html/index.html (original)
+++ sandbox-branches/geometry/index/doc/html/index.html 2013-01-08 10:54:30 EST (Tue, 08 Jan 2013)
@@ -57,7 +57,7 @@
</div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: January 08, 2013 at 15:23:33 GMT</small></p></td>
+<td align="left"><p><small>Last revised: January 08, 2013 at 15:52:09 GMT</small></p></td>
<td align="right"><div class="copyright-footer"></div></td>
</tr></table>
<hr>
Modified: sandbox-branches/geometry/index/doc/make_qbk.py
==============================================================================
--- sandbox-branches/geometry/index/doc/make_qbk.py (original)
+++ sandbox-branches/geometry/index/doc/make_qbk.py 2013-01-08 10:54:30 EST (Tue, 08 Jan 2013)
@@ -14,6 +14,7 @@
cmd = cmd + " --xml xml/%s.xml"
cmd = cmd + " --start_include ."
cmd = cmd + " --index_id_path %s"
+cmd = cmd + " --cos_output_style alt"
cmd = cmd + " > generated/%s.qbk"
os.system("doxygen Doxyfile")
Modified: sandbox-branches/geometry/index/doc/src/tools/doxygen_xml2qbk/configuration.hpp
==============================================================================
--- sandbox-branches/geometry/index/doc/src/tools/doxygen_xml2qbk/configuration.hpp (original)
+++ sandbox-branches/geometry/index/doc/src/tools/doxygen_xml2qbk/configuration.hpp 2013-01-08 10:54:30 EST (Tue, 08 Jan 2013)
@@ -28,6 +28,7 @@
std::string skip_namespace;
+ std::string cos_output_style;
std::string index_id_path;
};
Modified: sandbox-branches/geometry/index/doc/src/tools/doxygen_xml2qbk/doxygen_xml2qbk.cpp
==============================================================================
--- sandbox-branches/geometry/index/doc/src/tools/doxygen_xml2qbk/doxygen_xml2qbk.cpp (original)
+++ sandbox-branches/geometry/index/doc/src/tools/doxygen_xml2qbk/doxygen_xml2qbk.cpp 2013-01-08 10:54:30 EST (Tue, 08 Jan 2013)
@@ -75,6 +75,9 @@
"Namespace to skip (e.g. boost::mylib::")
("copyright", po::value<std::string>(©right_filename),
"Name of QBK file including (commented) copyright and license")
+
+ ("cos_output_style", po::value<std::string>(&config.cos_output_style),
+ "Class or struct docbook output style. Value:'alt'")
("index_id_path", po::value<std::string>(&config.index_id_path),
"The QBK index ID path")
;
@@ -168,7 +171,11 @@
if (! doc.cos.name.empty())
{
std::sort(doc.cos.functions.begin(), doc.cos.functions.end(), sort_on_line<function>());
- quickbook_output(doc.cos, config, std::cout, quickbook_output_cos_alt());
+
+ if ( config.cos_output_style == "alt" )
+ quickbook_output(doc.cos, config, std::cout, quickbook_output_cos_alt());
+ else
+ quickbook_output(doc.cos, config, std::cout, 0);
}
}
Modified: sandbox-branches/geometry/index/doc/src/tools/doxygen_xml2qbk/quickbook_output.hpp
==============================================================================
--- sandbox-branches/geometry/index/doc/src/tools/doxygen_xml2qbk/quickbook_output.hpp (original)
+++ sandbox-branches/geometry/index/doc/src/tools/doxygen_xml2qbk/quickbook_output.hpp 2013-01-08 10:54:30 EST (Tue, 08 Jan 2013)
@@ -730,17 +730,18 @@
out << "[section:member" << i << " " << ss.str() << "]" << std::endl;
- if ( !f.detailed_description.empty() || !f.brief_description.empty() )
+ out << f.brief_description;
+
+ if ( !f.detailed_description.empty() )
{
out << "[heading Description]" << std::endl;
- if ( !f.detailed_description.empty() )
- out << f.detailed_description;
- else
- out << f.brief_description;
+ out << f.detailed_description;
}
+ quickbook_markup(f.qbk_markup, markup_before, markup_synopsis, out);
out << "[heading Synopsis]" << std::endl;
quickbook_synopsis(f, out, true, true);
+ quickbook_markup(f.qbk_markup, markup_after, markup_synopsis, out);
if ( !f.parameters.empty() )
{