|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r68304 - in trunk: boost/geometry/algorithms boost/geometry/core boost/geometry/geometries boost/geometry/geometries/register libs/geometry/doc/doxy libs/geometry/doc/ref/algorithms libs/geometry/doc/reference libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk
From: barend.gehrels_at_[hidden]
Date: 2011-01-19 13:17:54
Author: barendgehrels
Date: 2011-01-19 13:17:51 EST (Wed, 19 Jan 2011)
New Revision: 68304
URL: http://svn.boost.org/trac/boost/changeset/68304
Log:
Small doc-gen update, move from qbk{include,...} to qbk{[include ...]} to have greater flexibility (any qbk code can now be inlined)
Removed:
trunk/libs/geometry/doc/ref/algorithms/area_example.qbk
trunk/libs/geometry/doc/ref/algorithms/area_example_with_strategy.qbk
trunk/libs/geometry/doc/ref/algorithms/length_example.qbk
trunk/libs/geometry/doc/ref/algorithms/length_example_with_strategy.qbk
Text files modified:
trunk/boost/geometry/algorithms/area.hpp | 8 +++---
trunk/boost/geometry/algorithms/buffer.hpp | 2
trunk/boost/geometry/algorithms/centroid.hpp | 8 +++---
trunk/boost/geometry/algorithms/intersection.hpp | 2
trunk/boost/geometry/algorithms/intersection_inserter.hpp | 4 +-
trunk/boost/geometry/algorithms/intersects.hpp | 4 +-
trunk/boost/geometry/algorithms/length.hpp | 8 +++---
trunk/boost/geometry/algorithms/num_points.hpp | 2
trunk/boost/geometry/algorithms/perimeter.hpp | 4 +-
trunk/boost/geometry/algorithms/simplify.hpp | 6 ++--
trunk/boost/geometry/core/interior_rings.hpp | 2
trunk/boost/geometry/core/num_geometries.hpp | 2
trunk/boost/geometry/geometries/point.hpp | 2
trunk/boost/geometry/geometries/register/point.hpp | 2
trunk/libs/geometry/doc/doxy/Doxyfile | 1
trunk/libs/geometry/doc/ref/algorithms/area.qbk | 1
trunk/libs/geometry/doc/ref/algorithms/length.qbk | 1
trunk/libs/geometry/doc/reference/area.qbk | 4 +-
trunk/libs/geometry/doc/reference/length.qbk | 4 +-
trunk/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_xml2qbk.cpp | 41 ++++++++++++++++++++++++++++++++-------
20 files changed, 68 insertions(+), 40 deletions(-)
Modified: trunk/boost/geometry/algorithms/area.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/area.hpp (original)
+++ trunk/boost/geometry/algorithms/area.hpp 2011-01-19 13:17:51 EST (Wed, 19 Jan 2011)
@@ -213,8 +213,8 @@
\param geometry \param_geometry
\return \return_calc{area}
-\qbk{include,ref/algorithms/area.qbk}
-\qbk{include,ref/algorithms/area_example.qbk}
+\qbk{[include ref/algorithms/area.qbk]}
+\qbk{[area] [area_output]}
*/
template <typename Geometry>
inline typename area_result<Geometry>::type area(Geometry const& geometry)
@@ -247,8 +247,8 @@
\return \return_calc{area}
\qbk{distinguish,with strategy}
-\qbk{include,ref/algorithms/area.qbk}
-\qbk{include,ref/algorithms/area_example_with_strategy.qbk}
+\qbk{[include ref/algorithms/area.qbk]}
+\qbk{[area_with_strategy] [area_with_strategy_output]}
*/
template <typename Geometry, typename Strategy>
inline typename Strategy::return_type area(
Modified: trunk/boost/geometry/algorithms/buffer.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/buffer.hpp (original)
+++ trunk/boost/geometry/algorithms/buffer.hpp 2011-01-19 13:17:51 EST (Wed, 19 Jan 2011)
@@ -106,7 +106,7 @@
\param chord_length (optional) The length of the chord's in the generated arcs around points or bends
\note Currently only implemented for box, the trivial case, but still useful
-\qbk{include,ref/algorithms/buffer.qbk}
+\qbk{[include ref/algorithms/buffer.qbk]}
*/
template <typename Input, typename Output, typename Distance>
inline void buffer(Input const& geometry_in, Output& geometry_out,
Modified: trunk/boost/geometry/algorithms/centroid.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/centroid.hpp (original)
+++ trunk/boost/geometry/algorithms/centroid.hpp 2011-01-19 13:17:51 EST (Wed, 19 Jan 2011)
@@ -358,7 +358,7 @@
\param strategy \param_strategy{centroid}
\qbk{distinguish,with strategy}
-\qbk{include,ref/algorithms/centroid.qbk}
+\qbk{[include ref/algorithms/centroid.qbk]}
*/
template<typename Geometry, typename Point, typename Strategy>
inline void centroid(Geometry const& geometry, Point& c,
@@ -391,7 +391,7 @@
\param geometry \param_geometry
\param c the calculated centroid will be assigned to this point reference
-\qbk{include,ref/algorithms/centroid.qbk}
+\qbk{[include ref/algorithms/centroid.qbk]}
*/
template<typename Geometry, typename Point>
inline void centroid(Geometry const& geometry, Point& c)
@@ -419,7 +419,7 @@
\tparam Geometry \tparam_geometry
\param geometry \param_geometry
\return \return_calc{centroid}
-\qbk{include,ref/algorithms/centroid.qbk}
+\qbk{[include ref/algorithms/centroid.qbk]}
*/
template<typename Point, typename Geometry>
inline Point make_centroid(Geometry const& geometry)
@@ -443,7 +443,7 @@
\return \return_calc{centroid}
\qbk{distinguish,with strategy}
-\qbk{include,ref/algorithms/centroid.qbk}
+\qbk{[include ref/algorithms/centroid.qbk]}
*/
template<typename Point, typename Geometry, typename Strategy>
inline Point make_centroid(Geometry const& geometry, Strategy const& strategy)
Modified: trunk/boost/geometry/algorithms/intersection.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/intersection.hpp (original)
+++ trunk/boost/geometry/algorithms/intersection.hpp 2011-01-19 13:17:51 EST (Wed, 19 Jan 2011)
@@ -186,7 +186,7 @@
\param geometry_out The output geometry, either a multi_point, multi_polygon,
multi_linestring, or a box (for intersection of two boxes)
-\qbk{include,ref/algorithms/intersection.qbk}
+\qbk{[include ref/algorithms/intersection.qbk]}
*/
template
<
Modified: trunk/boost/geometry/algorithms/intersection_inserter.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/intersection_inserter.hpp (original)
+++ trunk/boost/geometry/algorithms/intersection_inserter.hpp 2011-01-19 13:17:51 EST (Wed, 19 Jan 2011)
@@ -408,7 +408,7 @@
\return \return_out
\qbk{distinguish,with strategy}
-\qbk{include,ref/algorithms/intersection.qbk}
+\qbk{[include ref/algorithms/intersection.qbk]}
*/
template
<
@@ -444,7 +444,7 @@
\param out \param_out{intersection}
\return \return_out
-\qbk{include,ref/algorithms/intersection.qbk}
+\qbk{[include ref/algorithms/intersection.qbk]}
*/
template
<
Modified: trunk/boost/geometry/algorithms/intersects.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/intersects.hpp (original)
+++ trunk/boost/geometry/algorithms/intersects.hpp 2011-01-19 13:17:51 EST (Wed, 19 Jan 2011)
@@ -30,7 +30,7 @@
\return \return_check{is self-intersecting}
\qbk{distinguish,one geometry}
-\qbk{include,ref/algorithms/intersects.qbk}
+\qbk{[include ref/algorithms/intersects.qbk]}
*/
template <typename Geometry>
inline bool intersects(Geometry const& geometry)
@@ -82,7 +82,7 @@
\return \return_check2{intersect each other}
\qbk{distinguish,two geometries}
-\qbk{include,ref/algorithms/intersects.qbk}
+\qbk{[include ref/algorithms/intersects.qbk]}
*/
template <typename Geometry1, typename Geometry2>
inline bool intersects(Geometry1 const& geometry1, Geometry2 const& geometry2)
Modified: trunk/boost/geometry/algorithms/length.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/length.hpp (original)
+++ trunk/boost/geometry/algorithms/length.hpp 2011-01-19 13:17:51 EST (Wed, 19 Jan 2011)
@@ -137,8 +137,8 @@
\param geometry \param_geometry
\return \return_calc{length}
-\qbk{include,ref/algorithms/length.qbk}
-\qbk{include,ref/algorithms/length_example.qbk}
+\qbk{[include ref/algorithms/length.qbk]}
+\qbk{[length] [length_output]}
*/
template<typename Geometry>
inline typename length_result<Geometry>::type length(
@@ -171,8 +171,8 @@
\return \return_calc{length}
\qbk{distinguish,with strategy}
-\qbk{include,ref/algorithms/length.qbk}
-\qbk{include,ref/algorithms/length_example_with_strategy.qbk}
+\qbk{[include ref/algorithms/length.qbk]}
+\qbk{[length_with_strategy] [length_with_strategy_output]}
*/
template<typename Geometry, typename Strategy>
inline typename length_result<Geometry>::type length(
Modified: trunk/boost/geometry/algorithms/num_points.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/num_points.hpp (original)
+++ trunk/boost/geometry/algorithms/num_points.hpp 2011-01-19 13:17:51 EST (Wed, 19 Jan 2011)
@@ -147,7 +147,7 @@
\param add_for_open add one for open geometries (i.e. polygon types which are not closed)
\return \return_calc{number of points}
-\qbk{include,ref/algorithms/num_points.qbk}
+\qbk{[include ref/algorithms/num_points.qbk]}
*/
template <typename Geometry>
inline std::size_t num_points(Geometry const& geometry, bool add_for_open = false)
Modified: trunk/boost/geometry/algorithms/perimeter.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/perimeter.hpp (original)
+++ trunk/boost/geometry/algorithms/perimeter.hpp 2011-01-19 13:17:51 EST (Wed, 19 Jan 2011)
@@ -78,7 +78,7 @@
\param geometry \param_geometry
\return \return_calc{perimeter}
-\qbk{include,ref/algorithms/perimeter.qbk}
+\qbk{[include ref/algorithms/perimeter.qbk]}
*/
template<typename Geometry>
inline typename length_result<Geometry>::type perimeter(
@@ -112,7 +112,7 @@
\return \return_calc{perimeter}
\qbk{distinguish,with strategy}
-\qbk{include,ref/algorithms/perimeter.qbk}
+\qbk{[include ref/algorithms/perimeter.qbk]}
*/
template<typename Geometry, typename Strategy>
inline typename length_result<Geometry>::type perimeter(
Modified: trunk/boost/geometry/algorithms/simplify.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/simplify.hpp (original)
+++ trunk/boost/geometry/algorithms/simplify.hpp 2011-01-19 13:17:51 EST (Wed, 19 Jan 2011)
@@ -286,7 +286,7 @@
\param max_distance distance (in units of input coordinates) of a vertex
to other segments to be removed
-\qbk{include,ref/algorithms/simplify.qbk}
+\qbk{[include ref/algorithms/simplify.qbk]}
*/
template<typename Geometry, typename Distance>
inline void simplify(Geometry const& geometry, Geometry& out,
@@ -322,7 +322,7 @@
might include point-distance strategy
\qbk{distinguish,with strategy}
-\qbk{include,ref/algorithms/simplify.qbk}
+\qbk{[include ref/algorithms/simplify.qbk]}
*/
template<typename Geometry, typename OutputIterator, typename Distance, typename Strategy>
inline void simplify_inserter(Geometry const& geometry, OutputIterator out,
@@ -348,7 +348,7 @@
\param max_distance distance (in units of input coordinates) of a vertex
to other segments to be removed
-\qbk{include,ref/algorithms/simplify_inserter.qbk}
+\qbk{[include ref/algorithms/simplify_inserter.qbk]}
*/
template<typename Geometry, typename OutputIterator, typename Distance>
inline void simplify_inserter(Geometry const& geometry, OutputIterator out,
Modified: trunk/boost/geometry/core/interior_rings.hpp
==============================================================================
--- trunk/boost/geometry/core/interior_rings.hpp (original)
+++ trunk/boost/geometry/core/interior_rings.hpp 2011-01-19 13:17:51 EST (Wed, 19 Jan 2011)
@@ -166,7 +166,7 @@
\param geometry \param_geometry
\return \return_calc{number of interior rings}
-\qbk{include,ref/algorithms/num_interior_rings.qbk}
+\qbk{[include ref/algorithms/num_interior_rings.qbk]}
\note Defined by OGC as "numInteriorRing". To be consistent with "numPoints"
letter "s" is appended
Modified: trunk/boost/geometry/core/num_geometries.hpp
==============================================================================
--- trunk/boost/geometry/core/num_geometries.hpp (original)
+++ trunk/boost/geometry/core/num_geometries.hpp 2011-01-19 13:17:51 EST (Wed, 19 Jan 2011)
@@ -50,7 +50,7 @@
\param geometry \param_geometry
\return \return_calc{number of geometries}
-\qbk{include,ref/algorithms/num_geometries.qbk}
+\qbk{[include ref/algorithms/num_geometries.qbk]}
*/
template <typename Geometry>
inline std::size_t num_geometries(Geometry const& geometry)
Modified: trunk/boost/geometry/geometries/point.hpp
==============================================================================
--- trunk/boost/geometry/geometries/point.hpp (original)
+++ trunk/boost/geometry/geometries/point.hpp 2011-01-19 13:17:51 EST (Wed, 19 Jan 2011)
@@ -34,7 +34,7 @@
\tparam DimensionCount number of coordinates, usually 2 or 3
\tparam CoordinateSystem coordinate system, for example cs::cartesian
-\qbk{include,ref/geometries/point.qbk}
+\qbk{[include ref/geometries/point.qbk]}
\details Defines a neutral point class, fulfilling the Point Concept.
Modified: trunk/boost/geometry/geometries/register/point.hpp
==============================================================================
--- trunk/boost/geometry/geometries/register/point.hpp (original)
+++ trunk/boost/geometry/geometries/register/point.hpp 2011-01-19 13:17:51 EST (Wed, 19 Jan 2011)
@@ -60,7 +60,7 @@
\param Field0 \param_macro_member{\macro_x}
\param Field1 \param_macro_member{\macro_y}
-\qbk{include,ref/geometries/register/point.qbk}
+\qbk{[include ref/geometries/register/point.qbk]}
*/
#define BOOST_GEOMETRY_REGISTER_POINT_2D(Point, CoordinateType, CoordinateSystem, Field0, Field1) \
namespace boost { namespace geometry { namespace traits { \
Modified: trunk/libs/geometry/doc/doxy/Doxyfile
==============================================================================
--- trunk/libs/geometry/doc/doxy/Doxyfile (original)
+++ trunk/libs/geometry/doc/doxy/Doxyfile 2011-01-19 13:17:51 EST (Wed, 19 Jan 2011)
@@ -38,6 +38,7 @@
# \param* for various parameters
# \return* for various return cases
ALIASES = qbk{2}="\xmlonly <qbk.\1>\2</qbk.\1> \endxmlonly" \
+ qbk{1}="\xmlonly <qbk>\1</qbk> \endxmlonly" \
brief_calc{1}="Calculates the \1 of a geometry" \
brief_calc2{1}="Calculate the \1 of two geometries" \
brief_calc2{2}="Calculate the \1 \2 two geometries" \
Modified: trunk/libs/geometry/doc/ref/algorithms/area.qbk
==============================================================================
--- trunk/libs/geometry/doc/ref/algorithms/area.qbk (original)
+++ trunk/libs/geometry/doc/ref/algorithms/area.qbk 2011-01-19 13:17:51 EST (Wed, 19 Jan 2011)
@@ -24,3 +24,4 @@
[heading Complexity]
Linear
+[heading Examples] [/ filled by doxml2qbk]
Deleted: trunk/libs/geometry/doc/ref/algorithms/area_example.qbk
==============================================================================
--- trunk/libs/geometry/doc/ref/algorithms/area_example.qbk 2011-01-19 13:17:51 EST (Wed, 19 Jan 2011)
+++ (empty file)
@@ -1,16 +0,0 @@
-[/============================================================================
- Boost.Geometry (aka GGL, Generic Geometry Library)
-
- Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
- Copyright (c) 2009-2011 Mateusz Loskot (mateusz_at_[hidden])
- Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
-
- Use, modification and distribution is subject to the Boost Software License,
- Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
- http://www.boost.org/LICENSE_1_0.txt)
-=============================================================================/]
-
-[heading Examples]
-[area]
-[area_output]
-
Deleted: trunk/libs/geometry/doc/ref/algorithms/area_example_with_strategy.qbk
==============================================================================
--- trunk/libs/geometry/doc/ref/algorithms/area_example_with_strategy.qbk 2011-01-19 13:17:51 EST (Wed, 19 Jan 2011)
+++ (empty file)
@@ -1,16 +0,0 @@
-[/============================================================================
- Boost.Geometry (aka GGL, Generic Geometry Library)
-
- Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
- Copyright (c) 2009-2011 Mateusz Loskot (mateusz_at_[hidden])
- Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
-
- Use, modification and distribution is subject to the Boost Software License,
- Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
- http://www.boost.org/LICENSE_1_0.txt)
-=============================================================================/]
-
-[heading Examples]
-[area_with_strategy]
-[area_with_strategy_output]
-
Modified: trunk/libs/geometry/doc/ref/algorithms/length.qbk
==============================================================================
--- trunk/libs/geometry/doc/ref/algorithms/length.qbk (original)
+++ trunk/libs/geometry/doc/ref/algorithms/length.qbk 2011-01-19 13:17:51 EST (Wed, 19 Jan 2011)
@@ -22,3 +22,4 @@
[heading Complexity]
Linear
+[heading Examples] [/ filled by doxml2qbk]
Deleted: trunk/libs/geometry/doc/ref/algorithms/length_example.qbk
==============================================================================
--- trunk/libs/geometry/doc/ref/algorithms/length_example.qbk 2011-01-19 13:17:51 EST (Wed, 19 Jan 2011)
+++ (empty file)
@@ -1,15 +0,0 @@
-[/============================================================================
- Boost.Geometry (aka GGL, Generic Geometry Library)
-
- Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
- Copyright (c) 2009-2011 Mateusz Loskot (mateusz_at_[hidden])
- Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
-
- Use, modification and distribution is subject to the Boost Software License,
- Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
- http://www.boost.org/LICENSE_1_0.txt)
-=============================================================================/]
-
-[heading Examples]
-[length_with_strategy]
-[length_with_strategy_output]
Deleted: trunk/libs/geometry/doc/ref/algorithms/length_example_with_strategy.qbk
==============================================================================
--- trunk/libs/geometry/doc/ref/algorithms/length_example_with_strategy.qbk 2011-01-19 13:17:51 EST (Wed, 19 Jan 2011)
+++ (empty file)
@@ -1,15 +0,0 @@
-[/============================================================================
- Boost.Geometry (aka GGL, Generic Geometry Library)
-
- Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
- Copyright (c) 2009-2011 Mateusz Loskot (mateusz_at_[hidden])
- Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
-
- Use, modification and distribution is subject to the Boost Software License,
- Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
- http://www.boost.org/LICENSE_1_0.txt)
-=============================================================================/]
-
-[heading Examples]
-[length_with_strategy]
-[length_with_strategy_output]
Modified: trunk/libs/geometry/doc/reference/area.qbk
==============================================================================
--- trunk/libs/geometry/doc/reference/area.qbk (original)
+++ trunk/libs/geometry/doc/reference/area.qbk 2011-01-19 13:17:51 EST (Wed, 19 Jan 2011)
@@ -46,7 +46,7 @@
`#include <boost/geometry/algorithms/area.hpp>`
[include ref/algorithms/area.qbk]
-[include ref/algorithms/area_example_with_strategy.qbk]
+[area_with_strategy] [area_with_strategy_output]
[endsect]
@@ -86,7 +86,7 @@
`#include <boost/geometry/algorithms/area.hpp>`
[include ref/algorithms/area.qbk]
-[include ref/algorithms/area_example.qbk]
+[area] [area_output]
[endsect]
Modified: trunk/libs/geometry/doc/reference/length.qbk
==============================================================================
--- trunk/libs/geometry/doc/reference/length.qbk (original)
+++ trunk/libs/geometry/doc/reference/length.qbk 2011-01-19 13:17:51 EST (Wed, 19 Jan 2011)
@@ -46,7 +46,7 @@
`#include <boost/geometry/algorithms/length.hpp>`
[include ref/algorithms/length.qbk]
-[include ref/algorithms/length_example_with_strategy.qbk]
+[length_with_strategy] [length_with_strategy_output]
[endsect]
@@ -82,7 +82,7 @@
`#include <boost/geometry/algorithms/length.hpp>`
[include ref/algorithms/length.qbk]
-[include ref/algorithms/length_example.qbk]
+[length] [length_output]
[endsect]
Modified: trunk/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_xml2qbk.cpp
==============================================================================
--- trunk/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_xml2qbk.cpp (original)
+++ trunk/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_xml2qbk.cpp 2011-01-19 13:17:51 EST (Wed, 19 Jan 2011)
@@ -35,6 +35,7 @@
#include <file_to_string.hpp>
+
// -------------------------------------------------------------
// rapid xml convenience code
// -------------------------------------------------------------
@@ -107,6 +108,17 @@
std::string fulltype; // post-processed
};
+struct markup
+{
+ int code;
+ std::string value;
+
+ markup(int c = 0, std::string const& v = "")
+ : code(c), value(v)
+ {}
+
+};
+
// Basic element, base of a class/struct, function, define
struct element
{
@@ -116,8 +128,8 @@
int line; // To sort - Doxygen changes order - we change it back
// QBK-includes
- // Filled with e.g.: \qbk(include, reference/myqbk.qbk}
- std::vector<std::string> includes;
+ // Filled with e.g.: \qbk([include reference/myqbk.qbk]}
+ std::vector<markup> qbk_markup;
// To distinguish overloads: unary, binary etc,
// Filled with: \qbk{distinguish,<A discerning description>}
@@ -352,9 +364,13 @@
el.location = loc;
el.line = atol(get_attribute(node, "line").c_str());
}
+ else if (full == ".detaileddescription.para.qbk")
+ {
+ el.qbk_markup.push_back(markup(0, boost::trim_copy(std::string(node->value()))));
+ }
else if (full == ".detaileddescription.para.qbk.include")
{
- el.includes.push_back(boost::trim_copy(std::string(node->value())));
+ el.qbk_markup.push_back(markup(1, boost::trim_copy(std::string(node->value()))));
}
else if (full == ".detaileddescription.para.qbk.distinguish")
{
@@ -643,11 +659,20 @@
}
-void quickbook_includes(std::vector<std::string> const& includes, std::ostream& out)
+void quickbook_markup(std::vector<markup> const& qbk_markup, std::ostream& out)
{
- BOOST_FOREACH(std::string const& inc, includes)
+ BOOST_FOREACH(markup const& inc, qbk_markup)
{
- out << "[include " << inc << "]" << std::endl;
+ switch(inc.code)
+ {
+ case 0 :
+ // Verbatim
+ out << inc.value << std::endl;
+ break;
+ case 1 :
+ out << "[include " << inc.value << "]" << std::endl;
+ break;
+ }
}
}
@@ -756,7 +781,7 @@
quickbook_header(f.location, config, out);
- quickbook_includes(f.includes, out);
+ quickbook_markup(f.qbk_markup, out);
out << std::endl;
out << "[endsect]" << std::endl;
@@ -869,7 +894,7 @@
quickbook_header(cos.location, config, out);
//quickbook_examples(cos.examples, out);
- quickbook_includes(cos.includes, out);
+ quickbook_markup(cos.qbk_markup, out);
out << "[endsect]" << std::endl
<< std::endl;
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk