Quickbook: Merge from trunk to quickbook-dev.

[SVN r76255]
2026-01-19 16:32:13 +00:00 · 2012-01-01 13:35:27 +00:00 · 2011-12-07 09:40:30 +00:00 · 2011-11-30 01:35:25 +00:00 · 2011-03-27 10:17:05 +00:00 · 2011-03-24 21:12:54 +00:00
98 changed files with 2311 additions and 1066 deletions
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
--- a/doc/README.txt
+++ b/doc/README.txt
@@ -0,0 +1,17 @@
+.. -*-rst-*-
+
+.. Copyright David Abrahams 2009. Distributed under 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)
+
+To build the html::
+
+  bjam html
+
+To test the code in this documentation:
+
+.. parsed-literal::
+
+  python ../../../tools/litre/tool.py `pwd`/index.rst --dump_dir=../test/literate
+  cd ../test/literate
+  bjam
--- a/doc/html/index.html
+++ b/doc/html/index.html
--- a/doc/html/python.html
+++ b/doc/html/python.html
@@ -3,12 +3,12 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.5: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.7: http://docutils.sourceforge.net/" />
 <title>The Boost Parameter Library Python Binding Documentation</title>
-<meta name="authors" content="Daniel Wallin" />
-<meta name="organization" content="Boost Consulting" />
-<meta name="date" content="2006-12-14" />
-<meta name="copyright" content="Copyright David Abrahams, Daniel Wallin 2005. Distributed under 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)" />
+<meta name="authors" content="David Abrahams  Daniel Wallin" />
+<meta name="organization" content="BoostPro Computing" />
+<meta name="date" content="2009-01-29" />
+<meta name="copyright" content="Copyright David Abrahams, Daniel Wallin 2005-2009. Distributed under 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)" />
 <link rel="stylesheet" href="rst.css" type="text/css" />
 </head>
 <body>
@@ -19,18 +19,19 @@
 <col class="docinfo-content" />
 <tbody valign="top">
 <tr><th class="docinfo-name">Authors:</th>
-<td>Daniel Wallin</td></tr>
+<td>David Abrahams
+<br />Daniel Wallin</td></tr>
 <tr><th class="docinfo-name">Contact:</th>
-<td><a class="first last reference" href="mailto:dalwan01&#64;student.umu.se">dalwan01&#64;student.umu.se</a></td></tr>
+<td><a class="first reference external" href="mailto:dave&#64;boost-consulting.com">dave&#64;boost-consulting.com</a>, <a class="last reference external" href="mailto:daniel&#64;boostpro.com">daniel&#64;boostpro.com</a></td></tr>
 <tr><th class="docinfo-name">Organization:</th>
-<td><a class="first last reference" href="http://www.boost-consulting.com">Boost Consulting</a></td></tr>
+<td><a class="first last reference external" href="http://www.boostpro.com">BoostPro Computing</a></td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2006-12-14</td></tr>
+<td>2009-01-29</td></tr>
 <tr><th class="docinfo-name">Copyright:</th>
 <td>Copyright David Abrahams, Daniel Wallin
-2005. Distributed under the Boost Software License,
+2005-2009. Distributed under the Boost Software License,
 Version 1.0. (See accompanying file LICENSE_1_0.txt
-or copy at <a class="reference" href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</a>)</td></tr>
+or copy at <a class="reference external" href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</a>)</td></tr>
 </tbody>
 </table>
 <div class="abstract topic">
@@ -38,26 +39,26 @@ or copy at <a class="reference" href="http://www.boost.org/LICENSE_1_0.txt">http
 <p>Makes it possible to bind Boost.Parameter-enabled
 functions, operators and constructors to Python.</p>
 </div>
-<p><a class="reference" href="../../../../index.htm"><img alt="Boost" src="../../../../boost.png" /></a></p>
-<div class="contents topic">
-<p class="topic-title first"><a id="contents" name="contents">Contents</a></p>
+<p><a class="reference external" href="../../../../index.htm"><img alt="Boost" src="../../../../boost.png" /></a></p>
+<div class="contents topic" id="contents">
+<p class="topic-title first">Contents</p>
 <ul class="simple">
-<li><a class="reference" href="#introduction" id="id7" name="id7">Introduction</a></li>
-<li><a class="reference" href="#tutorial" id="id8" name="id8">Tutorial</a></li>
-<li><a class="reference" href="#concept-parameterspec" id="id9" name="id9">concept <span class="concept">ParameterSpec</span></a></li>
-<li><a class="reference" href="#special-keywords" id="id10" name="id10"><em>special</em> keywords</a></li>
-<li><a class="reference" href="#class-template-init" id="id11" name="id11">class template <tt class="docutils literal"><span class="pre">init</span></tt></a></li>
-<li><a class="reference" href="#class-template-call" id="id12" name="id12">class template <tt class="docutils literal"><span class="pre">call</span></tt></a></li>
-<li><a class="reference" href="#class-template-function" id="id13" name="id13">class template <tt class="docutils literal"><span class="pre">function</span></tt></a></li>
-<li><a class="reference" href="#function-template-def" id="id14" name="id14">function template <tt class="docutils literal"><span class="pre">def</span></tt></a></li>
-<li><a class="reference" href="#portability" id="id15" name="id15">Portability</a></li>
+<li><a class="reference internal" href="#introduction" id="id7">Introduction</a></li>
+<li><a class="reference internal" href="#tutorial" id="id8">Tutorial</a></li>
+<li><a class="reference internal" href="#concept-parameterspec" id="id9">concept <span class="concept">ParameterSpec</span></a></li>
+<li><a class="reference internal" href="#special-keywords" id="id10"><em>special</em> keywords</a></li>
+<li><a class="reference internal" href="#class-template-init" id="id11">class template <tt class="docutils literal">init</tt></a></li>
+<li><a class="reference internal" href="#class-template-call" id="id12">class template <tt class="docutils literal">call</tt></a></li>
+<li><a class="reference internal" href="#class-template-function" id="id13">class template <tt class="docutils literal">function</tt></a></li>
+<li><a class="reference internal" href="#function-template-def" id="id14">function template <tt class="docutils literal">def</tt></a></li>
+<li><a class="reference internal" href="#portability" id="id15">Portability</a></li>
 </ul>
 </div>
-<div class="section">
-<h1><a class="toc-backref" href="#id7" id="introduction" name="introduction">Introduction</a></h1>
-<p><tt class="docutils literal"><span class="pre">boost/parameter/python.hpp</span></tt> introduces a group of <a class="reference" href="../../../python/doc/v2/def_visitor.html"><tt class="docutils literal"><span class="pre">def_visitors</span></tt></a> that can
+<div class="section" id="introduction">
+<h1><a class="toc-backref" href="#id7">Introduction</a></h1>
+<p><tt class="docutils literal">boost/parameter/python.hpp</tt> introduces a group of <a class="reference external" href="../../../python/doc/v2/def_visitor.html"><tt class="docutils literal">def_visitors</tt></a> that can
 be used to easily expose Boost.Parameter-enabled member functions to Python with
-Boost.Python. It also provides a function template <tt class="docutils literal"><span class="pre">def()</span></tt> that can be used
+Boost.Python. It also provides a function template <tt class="docutils literal">def()</tt> that can be used
 to expose Boost.Parameter-enabled free functions.</p>
 <p>When binding a Boost.Parameter enabled function, the keyword tags
 must be specified.  Additionally, because Boost.Parameter enabled
@@ -70,8 +71,8 @@ types. Additionally, ``boost::parameter::python::function`` and
 ``boost::parameter::python::def`` requires a class with forwarding
 overloads. We will take a closer look at how this is done in the
 tutorial section below. -->
-<p>The keyword tags and associated argument types are specified as an <a class="reference" href="../../../mpl/doc/refmanual/sequences.html">MPL
-Sequence</a>, using the function type syntax described in <a class="reference" href="#concept-parameterspec"><span class="concept">ParameterSpec</span></a>
+<p>The keyword tags and associated argument types are specified as an <a class="reference external" href="../../../mpl/doc/refmanual/sequences.html">MPL
+Sequence</a>, using the function type syntax described in <a class="reference internal" href="#concept-parameterspec"><span class="concept">ParameterSpec</span></a>
 below. Additionally, <tt class="docutils literal"><span class="pre">boost::parameter::python::function</span></tt> and
 <tt class="docutils literal"><span class="pre">boost::parameter::python::def</span></tt> requires a class with forwarding overloads.
 We will take a closer look at how this is done in the tutorial section below.</p>
@@ -80,11 +81,11 @@ We will take a closer look at how this is done in the tutorial section below.</p
 <!-- else are we going to do other than pass these sequences to -->
 <!-- function? -->
 </div>
-<div class="section">
-<h1><a class="toc-backref" href="#id8" id="tutorial" name="tutorial">Tutorial</a></h1>
+<div class="section" id="tutorial">
+<h1><a class="toc-backref" href="#id8">Tutorial</a></h1>
 <p>In this section we will outline the steps needed to bind a simple
 Boost.Parameter-enabled member function to Python. Knowledge of the
-Boost.Parameter <a class="reference" href="index.html">macros</a> are required to understand this section.</p>
+Boost.Parameter <a class="reference external" href="index.html">macros</a> are required to understand this section.</p>
 <p>The class and member function we are interested in binding looks
 like this:</p>
 <pre class="literal-block">
@@ -118,10 +119,10 @@ assert(title == "foo");
 assert(height == 20);
 assert(width == 400);
 ''') -->
-<p>It defines a set of overloaded member functions called <tt class="docutils literal"><span class="pre">open</span></tt> with one
+<p>It defines a set of overloaded member functions called <tt class="docutils literal">open</tt> with one
 required parameter and two optional ones. To bind this member function to
 Python we use the binding utility <tt class="docutils literal"><span class="pre">boost::parameter::python::function</span></tt>.
-<tt class="docutils literal"><span class="pre">boost::parameter::python::function</span></tt> is a <a class="reference" href="../../../python/doc/v2/def_visitor.html"><tt class="docutils literal"><span class="pre">def_visitor</span></tt></a> that we'll instantiate
+<tt class="docutils literal"><span class="pre">boost::parameter::python::function</span></tt> is a <a class="reference external" href="../../../python/doc/v2/def_visitor.html"><tt class="docutils literal">def_visitor</tt></a> that we'll instantiate
 and pass to <tt class="docutils literal"><span class="pre">boost::python::class_::def()</span></tt>.</p>
 <p>To use <tt class="docutils literal"><span class="pre">boost::parameter::python::function</span></tt> we first need to define
 a class with forwarding overloads. This is needed because <tt class="docutils literal"><span class="pre">window::open()</span></tt>
@@ -151,7 +152,7 @@ needs to take three parameters as well.</p>
 <p class="last">We only need one overload in the forwarding class, despite the
 fact that there are two optional parameters. There are special
 circumstances when several overload are needed; see
-<a class="reference" href="#special-keywords">special keywords</a>.</p>
+<a class="reference internal" href="#special-keywords">special keywords</a>.</p>
 </div>
 <p>Next we'll define the module and export the class:</p>
 <pre class="literal-block">
@@ -185,12 +186,12 @@ BOOST_PYTHON_MODULE(my_module)
 ) -->
 <!-- @del jam_prefix[:] -->
 <p><tt class="docutils literal"><span class="pre">py::function</span></tt> is passed two parameters. The first one is the class with
-forwarding overloads that we defined earlier. The second one is an <a class="reference" href="../../../mpl/doc/refmanual/sequences.html">MPL
+forwarding overloads that we defined earlier. The second one is an <a class="reference external" href="../../../mpl/doc/refmanual/sequences.html">MPL
 Sequence</a> with the keyword tag types and argument types for the function
 specified as function types. The pointer syntax used in <tt class="docutils literal"><span class="pre">tag::width*</span></tt> and
 <tt class="docutils literal"><span class="pre">tag::height*</span></tt> means that the parameter is optional. The first element of
-the <a class="reference" href="../../../mpl/doc/refmanual/sequences.html">MPL Sequence</a> is the return type of the function, in this case <tt class="docutils literal"><span class="pre">void</span></tt>,
-which is passed as the first argument to <tt class="docutils literal"><span class="pre">operator()</span></tt> in the forwarding
+the <a class="reference external" href="../../../mpl/doc/refmanual/sequences.html">MPL Sequence</a> is the return type of the function, in this case <tt class="docutils literal">void</tt>,
+which is passed as the first argument to <tt class="docutils literal">operator()</tt> in the forwarding
 class.</p>
 <!-- The
 pointer syntax means that the parameter is optional, so in this case
@@ -242,29 +243,29 @@ users of broken compilers will have to give us function pointer
 types instead). -->
 </div>
 <hr class="docutils" />
-<div class="section">
-<h1><a class="toc-backref" href="#id9" id="concept-parameterspec" name="concept-parameterspec">concept <span class="concept">ParameterSpec</span></a></h1>
-<p>A <span class="concept">ParameterSpec</span> is a function type <tt class="docutils literal"><span class="pre">K(T)</span></tt> that describes both the keyword tag,
-<tt class="docutils literal"><span class="pre">K</span></tt>, and the argument type, <tt class="docutils literal"><span class="pre">T</span></tt>, for a parameter.</p>
-<p><tt class="docutils literal"><span class="pre">K</span></tt> is either:</p>
+<div class="section" id="concept-parameterspec">
+<h1><a class="toc-backref" href="#id9">concept <span class="concept">ParameterSpec</span></a></h1>
+<p>A <span class="concept">ParameterSpec</span> is a function type <tt class="docutils literal">K(T)</tt> that describes both the keyword tag,
+<tt class="docutils literal">K</tt>, and the argument type, <tt class="docutils literal">T</tt>, for a parameter.</p>
+<p><tt class="docutils literal">K</tt> is either:</p>
 <ul class="simple">
-<li>A <em>required</em> keyword of the form <tt class="docutils literal"><span class="pre">Tag</span></tt></li>
-<li><strong>or</strong>, an <em>optional</em> keyword of the form <tt class="docutils literal"><span class="pre">Tag*</span></tt></li>
-<li><strong>or</strong>, a <em>special</em> keyword of the form <tt class="docutils literal"><span class="pre">Tag**</span></tt></li>
+<li>A <em>required</em> keyword of the form <tt class="docutils literal">Tag</tt></li>
+<li><strong>or</strong>, an <em>optional</em> keyword of the form <tt class="docutils literal">Tag*</tt></li>
+<li><strong>or</strong>, a <em>special</em> keyword of the form <tt class="docutils literal">Tag**</tt></li>
 </ul>
-<p>where <tt class="docutils literal"><span class="pre">Tag</span></tt> is a keyword tag type, as used in a specialization
-of <a class="reference" href="../../../parameter/doc/html/reference.html#keyword"><tt class="docutils literal"><span class="pre">boost::parameter::keyword</span></tt></a>.</p>
-<p>The <strong>arity range</strong> for an <a class="reference" href="../../../mpl/doc/refmanual/sequences.html">MPL Sequence</a> of <span class="concept">ParameterSpec</span>'s is
+<p>where <tt class="docutils literal">Tag</tt> is a keyword tag type, as used in a specialization
+of <a class="reference external" href="../../../parameter/doc/html/reference.html#keyword"><tt class="docutils literal"><span class="pre">boost::parameter::keyword</span></tt></a>.</p>
+<p>The <strong>arity range</strong> for an <a class="reference external" href="../../../mpl/doc/refmanual/sequences.html">MPL Sequence</a> of <span class="concept">ParameterSpec</span>'s is
 defined as the closed range:</p>
 <pre class="literal-block">
-[ mpl::size&lt;S&gt; - number of <em>special</em> keyword tags in <tt class="docutils literal"><span class="pre">S</span></tt>, mpl::size&lt;S&gt; ]
+[ mpl::size&lt;S&gt; - number of <em>special</em> keyword tags in <tt class="docutils literal">S</tt>, mpl::size&lt;S&gt; ]
 </pre>
-<p>For example, the <strong>arity range</strong> of <tt class="docutils literal"><span class="pre">mpl::vector2&lt;x(int),y(int)&gt;</span></tt> is <tt class="docutils literal"><span class="pre">[2,2]</span></tt>,
-the <strong>arity range</strong> of <tt class="docutils literal"><span class="pre">mpl::vector2&lt;x(int),y*(int)&gt;</span></tt> is <tt class="docutils literal"><span class="pre">[2,2]</span></tt> and the
-<strong>arity range</strong> of <tt class="docutils literal"><span class="pre">mpl::vector2&lt;x(int),y**(int)&gt;</span></tt> is <tt class="docutils literal"><span class="pre">[1,2]</span></tt>.</p>
+<p>For example, the <strong>arity range</strong> of <tt class="docutils literal"><span class="pre">mpl::vector2&lt;x(int),y(int)&gt;</span></tt> is <tt class="docutils literal">[2,2]</tt>,
+the <strong>arity range</strong> of <tt class="docutils literal"><span class="pre">mpl::vector2&lt;x(int),y*(int)&gt;</span></tt> is <tt class="docutils literal">[2,2]</tt> and the
+<strong>arity range</strong> of <tt class="docutils literal"><span class="pre">mpl::vector2&lt;x(int),y**(int)&gt;</span></tt> is <tt class="docutils literal">[1,2]</tt>.</p>
 </div>
-<div class="section">
-<h1><a class="toc-backref" href="#id10" id="special-keywords" name="special-keywords"><em>special</em> keywords</a></h1>
+<div class="section" id="special-keywords">
+<h1><a class="toc-backref" href="#id10"><em>special</em> keywords</a></h1>
 <p>Sometimes it is desirable to have a default value for a parameter that differ
 in type from the parameter. This technique is useful for doing simple tag-dispatching
 based on the presence of a parameter. For example:</p>
@@ -318,20 +319,20 @@ int main()
 }''') -->
 <!-- @build() -->
 <!-- .. _example: index.html#dispatching-based-on-the-presence-of-a-default -->
-<p>In the above example the type of the default for <tt class="docutils literal"><span class="pre">color</span></tt> is <tt class="docutils literal"><span class="pre">mpl::false_</span></tt>, a
+<p>In the above example the type of the default for <tt class="docutils literal">color</tt> is <tt class="docutils literal"><span class="pre">mpl::false_</span></tt>, a
 type that is distinct from any color map that the user might supply.</p>
-<p>When binding the case outlined above, the default type for <tt class="docutils literal"><span class="pre">color</span></tt> will not
-be convertible to the parameter type. Therefore we need to tag the <tt class="docutils literal"><span class="pre">color</span></tt>
+<p>When binding the case outlined above, the default type for <tt class="docutils literal">color</tt> will not
+be convertible to the parameter type. Therefore we need to tag the <tt class="docutils literal">color</tt>
 keyword as a <em>special</em> keyword. This is done by specifying the tag as
-<tt class="docutils literal"><span class="pre">tag::color**</span></tt> when binding the function (see <a class="reference" href="#concept-parameterspec">concept ParameterSpec</a> for
+<tt class="docutils literal"><span class="pre">tag::color**</span></tt> when binding the function (see <a class="reference internal" href="#concept-parameterspec">concept ParameterSpec</a> for
 more details on the tagging). By doing this we tell the binding functions that
-it needs to generate two overloads, one with the <tt class="docutils literal"><span class="pre">color</span></tt> parameter present
+it needs to generate two overloads, one with the <tt class="docutils literal">color</tt> parameter present
 and one without. Had there been two <em>special</em> keywords, four overloads would
-need to be generated. The number of generated overloads is equal to 2<sup>N</sup>, where <tt class="docutils literal"><span class="pre">N</span></tt> is the number of <em>special</em> keywords.</p>
+need to be generated. The number of generated overloads is equal to 2<sup>N</sup>, where <tt class="docutils literal">N</tt> is the number of <em>special</em> keywords.</p>
 </div>
 <hr class="docutils" />
-<div class="section">
-<h1><a class="toc-backref" href="#id11" id="class-template-init" name="class-template-init">class template <tt class="docutils literal"><span class="pre">init</span></tt></a></h1>
+<div class="section" id="class-template-init">
+<h1><a class="toc-backref" href="#id11">class template <tt class="docutils literal">init</tt></a></h1>
 <p>Defines a named parameter enabled constructor.</p>
 <pre class="literal-block">
 template &lt;class ParameterSpecs&gt;
@@ -345,14 +346,14 @@ struct init : python::def_visitor&lt;init&lt;ParameterSpecs&gt; &gt;
 };
 </pre>
 <!-- @ignore() -->
-<div class="section">
-<h2><a id="init-requirements" name="init-requirements"><tt class="docutils literal"><span class="pre">init</span></tt> requirements</a></h2>
+<div class="section" id="init-requirements">
+<h2><tt class="docutils literal">init</tt> requirements</h2>
 <ul>
-<li><p class="first"><tt class="docutils literal"><span class="pre">ParameterSpecs</span></tt> is an <a class="reference" href="../../../mpl/doc/refmanual/sequences.html">MPL sequence</a> where each element is a
+<li><p class="first"><tt class="docutils literal">ParameterSpecs</tt> is an <a class="reference external" href="../../../mpl/doc/refmanual/sequences.html">MPL sequence</a> where each element is a
 model of <span class="concept">ParameterSpec</span>.</p>
 </li>
-<li><p class="first">For every <tt class="docutils literal"><span class="pre">N</span></tt> in <tt class="docutils literal"><span class="pre">[U,V]</span></tt>, where <tt class="docutils literal"><span class="pre">[U,V]</span></tt> is the <strong>arity
-range</strong> of <tt class="docutils literal"><span class="pre">ParameterSpecs</span></tt>, <tt class="docutils literal"><span class="pre">Class</span></tt> must support these
+<li><p class="first">For every <tt class="docutils literal">N</tt> in <tt class="docutils literal">[U,V]</tt>, where <tt class="docutils literal">[U,V]</tt> is the <strong>arity
+range</strong> of <tt class="docutils literal">ParameterSpecs</tt>, <tt class="docutils literal">Class</tt> must support these
 expressions:</p>
 <table border="1" class="docutils">
 <colgroup>
@@ -370,11 +371,11 @@ expressions:</p>
 </tr>
 </thead>
 <tbody valign="top">
-<tr><td><p class="first last"><tt class="docutils literal"><span class="pre">Class(a0,</span> <span class="pre">…,</span> <span class="pre">aN)</span></tt></p>
+<tr><td><p class="first last"><tt class="docutils literal">Class(a0, …, aN)</tt></p>
 </td>
 <td><p class="first last">-</p>
 </td>
-<td><p class="first last"><tt class="docutils literal"><span class="pre">a0</span></tt>…<tt class="docutils literal"><span class="pre">aN</span></tt> are tagged arguments.</p>
+<td><p class="first last"><tt class="docutils literal">a0</tt>…<tt class="docutils literal">aN</tt> are tagged arguments.</p>
 </td>
 </tr>
 </tbody>
@@ -382,13 +383,13 @@ expressions:</p>
 </li>
 </ul>
 </div>
-<div class="section">
-<h2><a id="template-class-callpolicies-operator-callpolicies-const" name="template-class-callpolicies-operator-callpolicies-const"><tt class="docutils literal"><span class="pre">template</span> <span class="pre">&lt;class</span> <span class="pre">CallPolicies&gt;</span> <span class="pre">operator[](CallPolicies</span> <span class="pre">const&amp;)</span></tt></a></h2>
-<p>Returns a <tt class="docutils literal"><span class="pre">def_visitor</span></tt> equivalent to <tt class="docutils literal"><span class="pre">*this</span></tt>, except that it
+<div class="section" id="template-class-callpolicies-operator-callpolicies-const">
+<h2><tt class="docutils literal">template &lt;class CallPolicies&gt; <span class="pre">operator[](CallPolicies</span> const&amp;)</tt></h2>
+<p>Returns a <tt class="docutils literal">def_visitor</tt> equivalent to <tt class="docutils literal">*this</tt>, except that it
 uses CallPolicies when creating the binding.</p>
 </div>
-<div class="section">
-<h2><a id="example" name="example">Example</a></h2>
+<div class="section" id="example">
+<h2>Example</h2>
 <pre class="literal-block">
 #include &lt;boost/parameter/keyword.hpp&gt;
 #include &lt;boost/parameter/preprocessor.hpp&gt;
@@ -446,9 +447,9 @@ assert(args[y | 1] == 1);
 </div>
 </div>
 <hr class="docutils" />
-<div class="section">
-<h1><a class="toc-backref" href="#id12" id="class-template-call" name="class-template-call">class template <tt class="docutils literal"><span class="pre">call</span></tt></a></h1>
-<p>Defines a <tt class="docutils literal"><span class="pre">__call__</span></tt> operator, mapped to <tt class="docutils literal"><span class="pre">operator()</span></tt> in C++.</p>
+<div class="section" id="class-template-call">
+<h1><a class="toc-backref" href="#id12">class template <tt class="docutils literal">call</tt></a></h1>
+<p>Defines a <tt class="docutils literal">__call__</tt> operator, mapped to <tt class="docutils literal">operator()</tt> in C++.</p>
 <pre class="literal-block">
 template &lt;class ParameterSpecs&gt;
 struct call : python::def_visitor&lt;call&lt;ParameterSpecs&gt; &gt;
@@ -461,15 +462,15 @@ struct call : python::def_visitor&lt;call&lt;ParameterSpecs&gt; &gt;
 };
 </pre>
 <!-- @ignore() -->
-<div class="section">
-<h2><a id="call-requirements" name="call-requirements"><tt class="docutils literal"><span class="pre">call</span></tt> requirements</a></h2>
+<div class="section" id="call-requirements">
+<h2><tt class="docutils literal">call</tt> requirements</h2>
 <ul>
-<li><p class="first"><tt class="docutils literal"><span class="pre">ParameterSpecs</span></tt> is an <a class="reference" href="../../../mpl/doc/refmanual/sequences.html">MPL sequence</a> where each element
+<li><p class="first"><tt class="docutils literal">ParameterSpecs</tt> is an <a class="reference external" href="../../../mpl/doc/refmanual/sequences.html">MPL sequence</a> where each element
 except the first models <span class="concept">ParameterSpec</span>. The first element
 is the result type of <tt class="docutils literal"><span class="pre">c(…)</span></tt>.</p>
 </li>
-<li><p class="first"><tt class="docutils literal"><span class="pre">Class</span></tt> must support these expressions, where <tt class="docutils literal"><span class="pre">c</span></tt> is an
-instance of <tt class="docutils literal"><span class="pre">Class</span></tt>:</p>
+<li><p class="first"><tt class="docutils literal">Class</tt> must support these expressions, where <tt class="docutils literal">c</tt> is an
+instance of <tt class="docutils literal">Class</tt>:</p>
 <table border="1" class="docutils">
 <colgroup>
 <col width="24%" />
@@ -486,26 +487,26 @@ instance of <tt class="docutils literal"><span class="pre">Class</span></tt>:</p
 </tr>
 </thead>
 <tbody valign="top">
-<tr><td><p class="first last"><tt class="docutils literal"><span class="pre">c(a0,</span> <span class="pre">…,</span> <span class="pre">aN)</span></tt></p>
+<tr><td><p class="first last"><tt class="docutils literal">c(a0, …, aN)</tt></p>
 </td>
-<td><p class="first last">Convertible to <tt class="docutils literal"><span class="pre">R</span></tt></p>
+<td><p class="first last">Convertible to <tt class="docutils literal">R</tt></p>
 </td>
-<td><p class="first last"><tt class="docutils literal"><span class="pre">a0</span></tt>…<tt class="docutils literal"><span class="pre">aN</span></tt> are tagged arguments.</p>
+<td><p class="first last"><tt class="docutils literal">a0</tt>…<tt class="docutils literal">aN</tt> are tagged arguments.</p>
 </td>
 </tr>
 </tbody>
 </table>
-<p>For every <tt class="docutils literal"><span class="pre">N</span></tt> in <tt class="docutils literal"><span class="pre">[U,V]</span></tt>, where <tt class="docutils literal"><span class="pre">[U,V]</span></tt> is the <strong>arity range</strong> of <tt class="docutils literal"><span class="pre">ParameterSpecs</span></tt>.</p>
+<p>For every <tt class="docutils literal">N</tt> in <tt class="docutils literal">[U,V]</tt>, where <tt class="docutils literal">[U,V]</tt> is the <strong>arity range</strong> of <tt class="docutils literal">ParameterSpecs</tt>.</p>
 </li>
 </ul>
 </div>
-<div class="section">
-<h2><a id="id3" name="id3"><tt class="docutils literal"><span class="pre">template</span> <span class="pre">&lt;class</span> <span class="pre">CallPolicies&gt;</span> <span class="pre">operator[](CallPolicies</span> <span class="pre">const&amp;)</span></tt></a></h2>
-<p>Returns a <tt class="docutils literal"><span class="pre">def_visitor</span></tt> equivalent to <tt class="docutils literal"><span class="pre">*this</span></tt>, except that it
+<div class="section" id="id3">
+<h2><tt class="docutils literal">template &lt;class CallPolicies&gt; <span class="pre">operator[](CallPolicies</span> const&amp;)</tt></h2>
+<p>Returns a <tt class="docutils literal">def_visitor</tt> equivalent to <tt class="docutils literal">*this</tt>, except that it
 uses CallPolicies when creating the binding.</p>
 </div>
-<div class="section">
-<h2><a id="id4" name="id4">Example</a></h2>
+<div class="section" id="id4">
+<h2>Example</h2>
 <pre class="literal-block">
 #include &lt;boost/parameter/keyword.hpp&gt;
 #include &lt;boost/parameter/preprocessor.hpp&gt;
@@ -573,8 +574,8 @@ return 0;
 </div>
 </div>
 <hr class="docutils" />
-<div class="section">
-<h1><a class="toc-backref" href="#id13" id="class-template-function" name="class-template-function">class template <tt class="docutils literal"><span class="pre">function</span></tt></a></h1>
+<div class="section" id="class-template-function">
+<h1><a class="toc-backref" href="#id13">class template <tt class="docutils literal">function</tt></a></h1>
 <p>Defines a named parameter enabled member function.</p>
 <pre class="literal-block">
 template &lt;class Fwd, class ParameterSpecs&gt;
@@ -585,15 +586,15 @@ struct function : python::def_visitor&lt;function&lt;Fwd, ParameterSpecs&gt; &gt
 };
 </pre>
 <!-- @ignore() -->
-<div class="section">
-<h2><a id="function-requirements" name="function-requirements"><tt class="docutils literal"><span class="pre">function</span></tt> requirements</a></h2>
+<div class="section" id="function-requirements">
+<h2><tt class="docutils literal">function</tt> requirements</h2>
 <ul>
-<li><p class="first"><tt class="docutils literal"><span class="pre">ParameterSpecs</span></tt> is an <a class="reference" href="../../../mpl/doc/refmanual/sequences.html">MPL sequence</a> where each element
+<li><p class="first"><tt class="docutils literal">ParameterSpecs</tt> is an <a class="reference external" href="../../../mpl/doc/refmanual/sequences.html">MPL sequence</a> where each element
 except the first models <span class="concept">ParameterSpec</span>. The first element
-is the result type of <tt class="docutils literal"><span class="pre">c.f(…)</span></tt>, where <tt class="docutils literal"><span class="pre">f</span></tt> is the member
+is the result type of <tt class="docutils literal"><span class="pre">c.f(…)</span></tt>, where <tt class="docutils literal">f</tt> is the member
 function.</p>
 </li>
-<li><p class="first">An instance of <tt class="docutils literal"><span class="pre">Fwd</span></tt> must support this expression:</p>
+<li><p class="first">An instance of <tt class="docutils literal">Fwd</tt> must support this expression:</p>
 <table border="1" class="docutils">
 <colgroup>
 <col width="39%" />
@@ -610,24 +611,24 @@ function.</p>
 </tr>
 </thead>
 <tbody valign="top">
-<tr><td><p class="first last"><tt class="docutils literal"><span class="pre">fwd(boost::type&lt;R&gt;(),</span> <span class="pre">self,</span> <span class="pre">a0,</span> <span class="pre">…,</span> <span class="pre">aN)</span></tt></p>
+<tr><td><p class="first last"><tt class="docutils literal"><span class="pre">fwd(boost::type&lt;R&gt;(),</span> self, a0, …, aN)</tt></p>
 </td>
-<td><p class="first last">Convertible to <tt class="docutils literal"><span class="pre">R</span></tt></p>
+<td><p class="first last">Convertible to <tt class="docutils literal">R</tt></p>
 </td>
-<td><p class="first last"><tt class="docutils literal"><span class="pre">self</span></tt> is a reference to the object on which
-the function should be invoked. <tt class="docutils literal"><span class="pre">a0</span></tt>…<tt class="docutils literal"><span class="pre">aN</span></tt>
+<td><p class="first last"><tt class="docutils literal">self</tt> is a reference to the object on which
+the function should be invoked. <tt class="docutils literal">a0</tt>…<tt class="docutils literal">aN</tt>
 are tagged arguments.</p>
 </td>
 </tr>
 </tbody>
 </table>
-<p>For every <tt class="docutils literal"><span class="pre">N</span></tt> in <tt class="docutils literal"><span class="pre">[U,V]</span></tt>, where <tt class="docutils literal"><span class="pre">[U,V]</span></tt> is the <strong>arity range</strong> of <tt class="docutils literal"><span class="pre">ParameterSpecs</span></tt>.</p>
+<p>For every <tt class="docutils literal">N</tt> in <tt class="docutils literal">[U,V]</tt>, where <tt class="docutils literal">[U,V]</tt> is the <strong>arity range</strong> of <tt class="docutils literal">ParameterSpecs</tt>.</p>
 </li>
 </ul>
 </div>
-<div class="section">
-<h2><a id="id5" name="id5">Example</a></h2>
-<p>This example exports a member function <tt class="docutils literal"><span class="pre">f(int</span> <span class="pre">x,</span> <span class="pre">int</span> <span class="pre">y</span> <span class="pre">=</span> <span class="pre">…)</span></tt> to Python. The
+<div class="section" id="id5">
+<h2>Example</h2>
+<p>This example exports a member function <tt class="docutils literal">f(int x, int y = …)</tt> to Python. The
 sequence of <span class="concept">ParameterSpec</span>'s <tt class="docutils literal"><span class="pre">mpl::vector2&lt;tag::x(int),</span> <span class="pre">tag::y*(int)&gt;</span></tt> has
 an <strong>arity range</strong> of [2,2], so we only need one forwarding overload.</p>
 <pre class="literal-block">
@@ -689,22 +690,22 @@ assert(y == 1);
 </div>
 </div>
 <hr class="docutils" />
-<div class="section">
-<h1><a class="toc-backref" href="#id14" id="function-template-def" name="function-template-def">function template <tt class="docutils literal"><span class="pre">def</span></tt></a></h1>
+<div class="section" id="function-template-def">
+<h1><a class="toc-backref" href="#id14">function template <tt class="docutils literal">def</tt></a></h1>
 <p>Defines a named parameter enabled free function in the current Python scope.</p>
 <pre class="literal-block">
 template &lt;class Fwd, class ParameterSpecs&gt;
 void def(char const* name);
 </pre>
 <!-- @ignore() -->
-<div class="section">
-<h2><a id="def-requirements" name="def-requirements"><tt class="docutils literal"><span class="pre">def</span></tt> requirements</a></h2>
+<div class="section" id="def-requirements">
+<h2><tt class="docutils literal">def</tt> requirements</h2>
 <ul>
-<li><p class="first"><tt class="docutils literal"><span class="pre">ParameterSpecs</span></tt> is an <a class="reference" href="../../../mpl/doc/refmanual/sequences.html">MPL sequence</a> where each element
+<li><p class="first"><tt class="docutils literal">ParameterSpecs</tt> is an <a class="reference external" href="../../../mpl/doc/refmanual/sequences.html">MPL sequence</a> where each element
 except the first models <span class="concept">ParameterSpec</span>. The first element
-is the result type of <tt class="docutils literal"><span class="pre">f(…)</span></tt>, where <tt class="docutils literal"><span class="pre">f</span></tt> is the function.</p>
+is the result type of <tt class="docutils literal"><span class="pre">f(…)</span></tt>, where <tt class="docutils literal">f</tt> is the function.</p>
 </li>
-<li><p class="first">An instance of <tt class="docutils literal"><span class="pre">Fwd</span></tt> must support this expression:</p>
+<li><p class="first">An instance of <tt class="docutils literal">Fwd</tt> must support this expression:</p>
 <table border="1" class="docutils">
 <colgroup>
 <col width="39%" />
@@ -721,22 +722,22 @@ is the result type of <tt class="docutils literal"><span class="pre">f(…)</spa
 </tr>
 </thead>
 <tbody valign="top">
-<tr><td><p class="first last"><tt class="docutils literal"><span class="pre">fwd(boost::type&lt;R&gt;(),</span> <span class="pre">a0,</span> <span class="pre">…,</span> <span class="pre">aN)</span></tt></p>
+<tr><td><p class="first last"><tt class="docutils literal"><span class="pre">fwd(boost::type&lt;R&gt;(),</span> a0, …, aN)</tt></p>
 </td>
-<td><p class="first last">Convertible to <tt class="docutils literal"><span class="pre">R</span></tt></p>
+<td><p class="first last">Convertible to <tt class="docutils literal">R</tt></p>
 </td>
-<td><p class="first last"><tt class="docutils literal"><span class="pre">a0</span></tt>…<tt class="docutils literal"><span class="pre">aN</span></tt> are tagged arguments.</p>
+<td><p class="first last"><tt class="docutils literal">a0</tt>…<tt class="docutils literal">aN</tt> are tagged arguments.</p>
 </td>
 </tr>
 </tbody>
 </table>
-<p>For every <tt class="docutils literal"><span class="pre">N</span></tt> in <tt class="docutils literal"><span class="pre">[U,V]</span></tt>, where <tt class="docutils literal"><span class="pre">[U,V]</span></tt> is the <strong>arity range</strong> of <tt class="docutils literal"><span class="pre">ParameterSpecs</span></tt>.</p>
+<p>For every <tt class="docutils literal">N</tt> in <tt class="docutils literal">[U,V]</tt>, where <tt class="docutils literal">[U,V]</tt> is the <strong>arity range</strong> of <tt class="docutils literal">ParameterSpecs</tt>.</p>
 </li>
 </ul>
 </div>
-<div class="section">
-<h2><a id="id6" name="id6">Example</a></h2>
-<p>This example exports a function <tt class="docutils literal"><span class="pre">f(int</span> <span class="pre">x,</span> <span class="pre">int</span> <span class="pre">y</span> <span class="pre">=</span> <span class="pre">…)</span></tt> to Python. The
+<div class="section" id="id6">
+<h2>Example</h2>
+<p>This example exports a function <tt class="docutils literal">f(int x, int y = …)</tt> to Python. The
 sequence of <span class="concept">ParameterSpec</span>'s <tt class="docutils literal"><span class="pre">mpl::vector2&lt;tag::x(int),</span> <span class="pre">tag::y*(int)&gt;</span></tt> has
 an <strong>arity range</strong> of [2,2], so we only need one forwarding overload.</p>
 <pre class="literal-block">
@@ -771,16 +772,16 @@ BOOST_PYTHON_MODULE(…)
 <!-- again, the undefined ``fwd`` identifier. -->
 </div>
 </div>
-<div class="section">
-<h1><a class="toc-backref" href="#id15" id="portability" name="portability">Portability</a></h1>
+<div class="section" id="portability">
+<h1><a class="toc-backref" href="#id15">Portability</a></h1>
 <p>The Boost.Parameter Python binding library requires <em>partial template
 specialization</em>.</p>
 </div>
 </div>
 <div class="footer">
 <hr class="footer" />
-Generated on: 2007-01-03 16:40 UTC.
-Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
+Generated on: 2011-11-08 21:40 UTC.
+Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.

 </div>
 </body>
--- a/doc/html/reference.html
+++ b/doc/html/reference.html
--- a/doc/html/rst.css
+++ b/doc/html/rst.css
--- a/doc/html/vellipsis.gif
+++ b/doc/html/vellipsis.gif
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -71,22 +71,27 @@ __ ../../../../index.htm
 -------------------------------------

 :Authors:       David Abrahams, Daniel Wallin
-:Contact:       dave@boost-consulting.com, dalwan01@student.umu.se
-:Organization:  `Boost Consulting`_
-:Date:          $Date: 2005/07/18 20:34:31 $
+:Contact:       dave@boost-consulting.com, daniel@boostpro.com
+:organization:  `BoostPro Computing`_
+:date:          $Date: 2005/07/17 19:53:01 $

-:Copyright:     Copyright David Abrahams, Daniel Wallin 2005. 
-                Distributed under the Boost Software License,
+:copyright:     Copyright David Abrahams, Daniel Wallin
+                2005-2009. Distributed under 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)

-.. _`Boost Consulting`: http://www.boost-consulting.com
+.. _`BoostPro Computing`: http://www.boostpro.com

-.. _concepts: ../../../more/generic_programming.html#concept
+.. _concepts: http://www.boost.org/more/generic_programming.html#concept

 -------------------------------------

+[Note: this tutorial does not cover all details of the library.  Please see also the `reference documentation`__\ ]
+
+__ reference.html
+
 .. contents:: **Table of Contents**
+   :depth: 2

 .. role:: concept
   :class: concept
@@ -351,8 +356,8 @@ shown in the table below.
 .. _`IncidenceGraph`: ../../../graph/doc/IncidenceGraph.html
 .. _`VertexListGraph`: ../../../graph/doc/VertexListGraph.html
 .. _`DFSVisitor`: ../../../graph/doc/DFSVisitor.html
-.. _`ReadWritePropertyMap`: ../../../property_map/ReadWritePropertyMap.html
-.. _`ReadablePropertyMap`: ../../../property_map/ReadablePropertyMap.html
+.. _`ReadWritePropertyMap`: ../../../property_map/doc/ReadWritePropertyMap.html
+.. _`ReadablePropertyMap`: ../../../property_map/doc/ReadablePropertyMap.html

 Don't be intimidated by the information in the second and third
 columns above.  For the purposes of this exercise, you don't need
@@ -851,6 +856,44 @@ in parentheses *and preceded by an asterix*, as follows:

 .. parsed-literal::

+    // We first need to define a few metafunction that we use in the
+    // predicates below.
+
+    template <class G>
+    struct traversal_category
+    {
+        typedef typename boost::graph_traits<G>::traversal_category type;
+    };
+
+    template <class G>
+    struct vertex_descriptor
+    {
+        typedef typename boost::graph_traits<G>::vertex_descriptor type;
+    };
+
+    template <class G>
+    struct value_type
+    {
+        typedef typename boost::property_traits<G>::value_type type;
+    };
+
+    template <class G>
+    struct key_type
+    {
+        typedef typename boost::property_traits<G>::key_type type;
+    };
+
+    template<class Size, class IndexMap>
+    boost::iterator_property_map<
+        boost::default_color_type\*, IndexMap
+      , boost::default_color_type, boost::default_color_type&
+    >
+    default_color_map(Size num_vertices, IndexMap const& index_map)
+    {
+       std::vector<boost::default_color_type> colors(num_vertices);
+       return &colors[0];
+    }
+
    BOOST_PARAMETER_FUNCTION(
        (void), depth_first_search, graphs

@@ -858,12 +901,10 @@ in parentheses *and preceded by an asterix*, as follows:
          (graph 
           , **\ \*(boost::mpl::and_<
                   boost::is_convertible<
-                       boost::graph_traits<_>::traversal_category
-                     , boost::incidence_graph_tag
+                       traversal_category<_>, boost::incidence_graph_tag
                   >
                 , boost::is_convertible<
-                       boost::graph_traits<_>::traversal_category
-                     , boost::vertex_list_graph_tag
+                       traversal_category<_>, boost::vertex_list_graph_tag
                   >
               >)** ))

@@ -871,25 +912,21 @@ in parentheses *and preceded by an asterix*, as follows:
          (visitor, \*, boost::dfs_visitor<>()) // not checkable

          (root_vertex
-            , (typename boost::graph_traits<graphs::graph::_>::vertex_descriptor)
+            , (vertex_descriptor<graphs::graph::_>)
            , \*vertices(graph).first)
 
          (index_map
            , **\ \*(boost::mpl::and_<
-                  boost::is_integral<
-                      boost::property_traits<_>::value_type
-                  >
+                  boost::is_integral<value_type<_> >
                , boost::is_same<
-                      typename boost::graph_traits<graphs::graph::_>::vertex_descriptor
-                    , boost::property_traits<_>::key_type
+                      vertex_descriptor<graphs::graph::_>, key_type<_>
                  >
              >)**
            , get(boost::vertex_index,graph))
 
          (in_out(color_map)
            , **\ \*(boost::is_same<
-                  typename boost::graph_traits<graphs::graph::_>::vertex_descriptor
-                , boost::property_traits<_>::key_type
+                  vertex_descriptor<graphs::graph::_>, key_type<_>
              >)**
           , default_color_map(num_vertices(graph), index_map) ) 
        )
@@ -897,6 +934,8 @@ in parentheses *and preceded by an asterix*, as follows:

 .. @example.prepend('''
   #include <boost/parameter.hpp>
+   #include <boost/graph/adjacency_list.hpp>
+   #include <boost/graph/depth_first_search.hpp>

   BOOST_PARAMETER_NAME((_graph, graphs) graph) 
   BOOST_PARAMETER_NAME((_visitor, graphs) visitor) 
@@ -905,38 +944,37 @@ in parentheses *and preceded by an asterix*, as follows:
   BOOST_PARAMETER_NAME((_color_map, graphs) color_map)

   using boost::mpl::_;
-
-   namespace boost
-   {
-     struct incidence_graph_tag {};
-     struct vertex_list_graph_tag {};
-
-     int vertex_index = 0;
-
-     template <class T>
-     struct graph_traits
-     {
-         typedef int traversal_category;
-         typedef int vertex_descriptor;
-     };
-
-     template <class T>
-     struct property_traits
-     {
-         typedef int value_type;
-         typedef int key_type;
-     };
-
-     template <class T = int>
-     struct dfs_visitor 
-     {};
-   }''')
+   ''')

 .. @example.append('''
-   {}''')
+   {}
+
+   int main()
+   {
+       typedef boost::adjacency_list<boost::vecS, boost::vecS, boost::directedS> G;
+
+       enum {u, v, w, x, y, z, N};
+       typedef std::pair<int, int> E;
+       E edges[] = {E(u, v), E(u, x), E(x, v), E(y, x), E(v, y), E(w, y),
+                    E(w,z), E(z, z)};
+       G g(edges, edges + sizeof(edges) / sizeof(E), N);
+
+       depth_first_search(g);
+       depth_first_search(g, _root_vertex = (int)x);
+   }
+   ''')

 .. @test('compile')

+Note the use of the nested `tag::_`. This is a shortcut for::
+
+  value_type<boost::mpl::_2, tag>
+
+.. @ignore()
+
+Intended to be used to access preceding arguments types in the
+predicates.
+
 __ ../../../mpl/doc/refmanual/metafunction.html

 We acknowledge that this signature is pretty hairy looking.
@@ -1107,7 +1145,7 @@ be used within the body of a class::
  struct callable2
  {
      BOOST_PARAMETER_CONST_MEMBER_FUNCTION(
-          (void), operator(), tag, (required (arg1,(int))(arg2,(int))))
+          (void), call, tag, (required (arg1,(int))(arg2,(int))))
      {
          std::cout << arg1 << ", " << arg2 << std::endl;
      }
@@ -1115,7 +1153,9 @@ be used within the body of a class::

 .. @example.prepend('''
   #include <boost/parameter.hpp>
-   #include <iostream>''')
+   #include <iostream>
+   using namespace boost::parameter;
+   ''')

 .. @test('compile')

@@ -1126,7 +1166,7 @@ arguments on to a separate implementation function::
  struct callable2
  {
      BOOST_PARAMETER_CONST_MEMBER_FUNCTION(
-          (void), operator(), tag, (required (arg1,(int))(arg2,(int))))
+          (void), call, tag, (required (arg1,(int))(arg2,(int))))
      {
          call_impl(arg1,arg2);
      }
@@ -1138,10 +1178,40 @@ arguments on to a separate implementation function::
   #include <boost/parameter.hpp>

   BOOST_PARAMETER_NAME(arg1)
-   BOOST_PARAMETER_NAME(arg2)''')
+   BOOST_PARAMETER_NAME(arg2)
+   using namespace boost::parameter;
+   ''')

 .. @test('compile')

+Static Member Functions
+=======================
+
+To expose a static member function, simply insert the keyword
+“``static``” before the function name:
+
+.. parsed-literal::
+
+  BOOST_PARAMETER_NAME(arg1)
+
+  struct somebody
+  {
+      BOOST_PARAMETER_MEMBER_FUNCTION(
+          (void), **static** f, tag, (optional (arg1,(int),0)))
+      {
+          std::cout << arg1 << std::endl;
+      }
+  };
+
+.. @example.prepend('''
+   #include <boost/parameter.hpp>
+   #include <iostream>
+   using namespace boost::parameter;
+   ''')
+
+.. @test('compile')
+
+
 ------------------------------
 Parameter-Enabled Constructors
 ------------------------------
@@ -1334,10 +1404,10 @@ separately)::
  using boost::mpl::_;

  typedef parameter::parameters<
-      required<tag::class_type, is_class<_> >
-    , optional<tag::base_list, mpl::is_sequence<_> >
-    , optional<tag::held_type>
-    , optional<tag::copyable>
+      required<tag::class_type, boost::is_class<_> >
+    , parameter::optional<tag::base_list, mpl::is_sequence<_> >
+    , parameter::optional<tag::held_type>
+    , parameter::optional<tag::copyable>
  > class_signature;

  }}
@@ -1346,6 +1416,7 @@ separately)::
   #include <boost/parameter.hpp>
   #include <boost/mpl/is_sequence.hpp>
   #include <boost/noncopyable.hpp>
+   #include <boost/type_traits/is_class.hpp>
   #include <memory>

   using namespace boost::parameter;
@@ -1372,12 +1443,13 @@ separately)::
 Argument Packs and Parameter Extraction
 ---------------------------------------

-Next, within the body of ``class_`` , we use the |ParameterSpec|\
-'s nested ``::bind< … >`` template to bundle the actual arguments
-into an |ArgumentPack|_ type, and then use the library's ``binding<
-… >`` metafunction to extract “logical parameters”.  Note that
-defaults are specified by supplying an optional third argument to
-``binding< … >``::
+Next, within the body of ``class_`` , we use the |ParameterSpec|\ 's
+nested ``::bind< … >`` template to bundle the actual arguments into an
+|ArgumentPack|_ type, and then use the library's ``value_type< … >``
+metafunction to extract “logical parameters”.  ``value_type< … >`` is
+a lot like ``binding< … >``, but no reference is added to the actual
+argument type.  Note that defaults are specified by passing it an
+optional third argument::

  namespace boost { namespace python {

@@ -1395,16 +1467,16 @@ defaults are specified by supplying an optional third argument to
      args;

      // Extract first logical parameter.
-      typedef typename parameter::binding<
+      typedef typename parameter::value_type<
        args, tag::class_type>::type class_type;
      
-      typedef typename parameter::binding<
+      typedef typename parameter::value_type<
        args, tag::base_list, bases<> >::type base_list;
      
-      typedef typename parameter::binding<
+      typedef typename parameter::value_type<
        args, tag::held_type, class_type>::type held_type;
      
-      typedef typename parameter::binding<
+      typedef typename parameter::value_type<
        args, tag::copyable, void>::type copyable;
  };

@@ -1506,12 +1578,12 @@ parameters deducible::
  typedef parameter::parameters<
      required<tag::class_type, is_class<_> >

-    , optional<
+    , parameter::optional<
          deduced<tag::base_list>
        , is_base_and_derived<detail::bases_base,_>
      >

-    , optional<
+    , parameter::optional<
          deduced<tag::held_type>
        , mpl::not_<
              mpl::or_<
@@ -1521,11 +1593,12 @@ parameters deducible::
          >
      >

-    , optional<deduced<tag::copyable>, is_same<noncopyable,_> >
+    , parameter::optional<deduced<tag::copyable>, is_same<noncopyable,_> >

  > class_signature;

 .. @example.prepend('''
+   #include <boost/type_traits/is_class.hpp>
   namespace boost { namespace python {''')

 .. @example.append('''
@@ -1543,16 +1616,16 @@ parameters deducible::
       args;
 
       // Extract first logical parameter.
-       typedef typename parameter::binding<
+       typedef typename parameter::value_type<
         args, tag::class_type>::type class_type;
      
-       typedef typename parameter::binding<
+       typedef typename parameter::value_type<
         args, tag::base_list, bases<> >::type base_list;
      
-       typedef typename parameter::binding<
+       typedef typename parameter::value_type<
         args, tag::held_type, class_type>::type held_type;
      
-       typedef typename parameter::binding<
+       typedef typename parameter::value_type<
         args, tag::copyable, void>::type copyable;
   };

@@ -1773,15 +1846,13 @@ function template and allow *it* to do type deduction::
 Occasionally one needs to deduce argument types without an extra
 layer of function call.  For example, suppose we wanted to return
 twice the value of the ``index`` parameter?  In that
-case we can use the ``binding< … >`` metafunction introduced
+case we can use the ``value_type< … >`` metafunction introduced
 `earlier`__::

   BOOST_PARAMETER_NAME(index)

   template <class ArgumentPack>
-   typename remove_reference<
-       typename parameter::binding<ArgumentPack, tag::index, int>::type
-   >::type
+   typename parameter::value_type<ArgumentPack, tag::index, int>::type
   twice_index(ArgumentPack const& args)
   {
       return 2 * args[_index|42];
@@ -1795,39 +1866,20 @@ case we can use the ``binding< … >`` metafunction introduced
   #include <cassert>

   namespace parameter = boost::parameter;
-   using boost::remove_reference;''')
-
-Note that the ``remove_reference< … >`` dance is necessary because
-``binding< … >`` will return a reference type when the argument
-is bound in the argument pack. If we don't strip the reference we
-end up returning a reference to the temporary created in the ``2 * …``
-expression. A convenient shortcut would be to use the ``value_type< … >``
-metafunction:
-
-.. parsed-literal::
-
-   template <class ArgumentPack>
-   typename **parameter::value_type<ArgumentPack, tag::index, int>**::type
-   twice_index(ArgumentPack const& args)
-   {
-       return 2 * args[_index|42];
-   }
-
-.. @example.wrap('namespace with_value_type {', '''
-   int six = twice_index(_index = 3);
-   }''')
-
-.. TODO: binding<> returns a reference. We should use value_type<> here.
+   ''')

 .. @example.append('''
   int main()
   {
       assert(six == 6);
-       assert(with_value_type::six == 6);
   }''')

 .. @test('run', howmany='all')

+Note that if we had used ``binding< … >`` rather than ``value_type< …
+>``, we would end up returning a reference to the temporary created in
+the ``2 * …`` expression.
+
 __ binding_intro_

 Lazy Default Computation
@@ -1883,12 +1935,10 @@ object.

 .. parsed-literal::

-   using boost::bind;
-   using boost::ref;
-
   typename parameter::binding<
       ArgumentPack, tag::s3, std::string
-   >::type s3 = args[_s3 **|| bind(std::plus<std::string>(), ref(s1), ref(s2))** ];
+   >::type s3 = args[_s3
+       **|| boost::bind(std::plus<std::string>(), boost::ref(s1), boost::ref(s2))** ];

 .. @example.prepend('''
   #include <boost/bind.hpp>
--- a/doc/python.rst
+++ b/doc/python.rst
@@ -2,13 +2,13 @@
 The Boost Parameter Library Python Binding Documentation 
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

-:Authors:       Daniel Wallin
-:Contact:       dalwan01@student.umu.se
-:organization:  `Boost Consulting`_
+:Authors:       David Abrahams, Daniel Wallin
+:Contact:       dave@boost-consulting.com, daniel@boostpro.com
+:organization:  `BoostPro Computing`_
 :date:          $Date$

 :copyright:     Copyright David Abrahams, Daniel Wallin
-                2005. Distributed under the Boost Software License,
+                2005-2009. Distributed under 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)

@@ -22,7 +22,7 @@

 __ ../../../../index.htm

-.. _`Boost Consulting`: http://www.boost-consulting.com
+.. _`BoostPro Computing`: http://www.boostpro.com


 .. role:: class
--- a/doc/reference.rst
+++ b/doc/reference.rst
@@ -3,12 +3,12 @@
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

 :Authors:       David Abrahams, Daniel Wallin
-:Contact:       dave@boost-consulting.com, dalwan01@student.umu.se
-:organization:  `Boost Consulting`_
+:Contact:       dave@boost-consulting.com, daniel@boostpro.com
+:organization:  `BoostPro Computing`_
 :date:          $Date: 2005/07/17 19:53:01 $

 :copyright:     Copyright David Abrahams, Daniel Wallin
-                2005. Distributed under the Boost Software License,
+                2005-2009. Distributed under 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)

@@ -19,7 +19,7 @@

 __ ../../../../index.htm

-.. _`Boost Consulting`: http://www.boost-consulting.com
+.. _`BoostPro Computing`: http://www.boostpro.com


 //////////////////////////////////////////////////////////////////////////////
@@ -174,7 +174,7 @@ Concepts

 This section describes the generic type concepts_ used by the Parameter library. 

-.. _concepts: ../../../../more/generic_programming.html#concept
+.. _concepts: http://www.boost.org/more/generic_programming.html#concept

 |ArgumentPack|
 --------------
@@ -803,8 +803,8 @@ Expands to:
            return ##\ *tag-name*;
        }

-        typedef *implementation defined* _;
-        typedef *implementation defined* _1;
+        typedef *unspecified* _;
+        typedef *unspecified* _1;
    };
  }

@@ -824,8 +824,8 @@ Expands to:
            return ##\ *name*;
        }

-        typedef *implementation defined* _;
-        typedef *implementation defined* _1;
+        typedef *unspecified* _;
+        typedef *unspecified* _1;
    };
  }

@@ -970,7 +970,7 @@ already ``#defined``.

 __ ../../../../boost/parameter/config.hpp

-:Default Value: ``5``
+:Default Value: ``8``

 Tutorial
 ========
--- a/include/boost/parameter.hpp
+++ b/include/boost/parameter.hpp
@@ -3,6 +3,8 @@
 // (See accompanying file LICENSE_1_0.txt or copy at 
 // http://www.boost.org/LICENSE_1_0.txt)

+//  See www.boost.org/libs/parameter for documentation.
+
 #ifndef BOOST_PARAMETER_050401_HPP
 #define BOOST_PARAMETER_050401_HPP

--- a/include/boost/parameter/aux_/arg_list.hpp
+++ b/include/boost/parameter/aux_/arg_list.hpp
@@ -11,6 +11,7 @@
 #include <boost/parameter/aux_/default.hpp>
 #include <boost/parameter/aux_/parameter_requirements.hpp>
 #include <boost/parameter/aux_/yesno.hpp>
+#include <boost/parameter/aux_/is_maybe.hpp>
 #include <boost/parameter/config.hpp>

 #include <boost/mpl/apply.hpp>
@@ -21,11 +22,11 @@

 #include <boost/type_traits/add_reference.hpp>
 #include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/is_base_and_derived.hpp>
 #include <boost/preprocessor/repetition/enum_params.hpp>
+#include <boost/preprocessor/repetition/enum_binary_params.hpp>
 #include <boost/preprocessor/facilities/intercept.hpp>

-namespace boost { namespace parameter { 
+namespace boost { namespace parameter {

 // Forward declaration for aux::arg_list, below.
 template<class T> struct keyword;
@@ -45,7 +46,7 @@ struct lambda_tag;
 // declarations to build member function overload sets that can
 // match against keywords.
 //
-  
+
 // MPL sequence support
 struct arg_list_tag;

@@ -82,14 +83,14 @@ struct empty_arg_list
    template <class KW>
    static no_tag has_key(KW*);
 #endif
-    
+
 #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) \
    || (BOOST_WORKAROUND(__GNUC__, < 3)) \
    || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
-    
+
    // The overload set technique doesn't work with these older
    // compilers, so they need some explicit handholding.
-      
+
    // A metafunction class that, given a keyword, returns the type
    // of the base sublist whose get() function can produce the
    // value for that key
@@ -158,15 +159,6 @@ no_tag operator*(empty_arg_list, KW*);
 template <class KW, class T>
 struct tagged_argument;

-// Forward declaration for arg_list::operator[], with
-// IS_XXX helper
-struct maybe_base;
-
-template <class T>
-struct is_maybe
-  : is_base_and_derived<maybe_base, T>
-{};
-
 template <class T>
 struct get_reference
 {
@@ -214,9 +206,9 @@ struct arg_list : Next
    // Create a new list by prepending arg to a copy of tail.  Used
    // when incrementally building this structure with the comma
    // operator.
-    arg_list(TaggedArg arg, Next const& tail)
+    arg_list(TaggedArg head, Next const& tail)
      : Next(tail)
-      , arg(arg)
+      , arg(head)
    {}

    // A metafunction class that, given a keyword and a default
@@ -244,8 +236,8 @@ struct arg_list : Next
    // same keyword is used again
    static yes_tag has_key(key_type*);
    using Next::has_key;
-    
-#  define BOOST_PARAMETER_CALL_HAS_KEY(next, key) next::has_key((key*)0)  
+
+#  define BOOST_PARAMETER_CALL_HAS_KEY(next, key) next::has_key((key*)0)
 # endif

    BOOST_MPL_ASSERT_MSG(
@@ -260,7 +252,7 @@ struct arg_list : Next
    // specific arguments by name
    //

-    // Helpers that handle the case when TaggedArg is 
+    // Helpers that handle the case when TaggedArg is
    // empty<T>.
    template <class D>
    reference get_default(D const&, mpl::false_) const
@@ -340,7 +332,7 @@ struct arg_list : Next
    template <class Default>
    reference get(default_<key_type,Default> const& d) const
    {
-        return get_default(d, holds_maybe());        
+        return get_default(d, holds_maybe());
    }

    template <class Default>
@@ -348,7 +340,7 @@ struct arg_list : Next
    {
        return arg.value;
    }
-    
+
 #else

    reference operator[](keyword<key_type> const&) const
@@ -403,7 +395,7 @@ struct arg_list : Next
    // Comma operator to compose argument list without using parameters<>.
    // Useful for argument lists with undetermined length.
    template <class KW, class T2>
-    arg_list<tagged_argument<KW, T2>, self> 
+    arg_list<tagged_argument<KW, T2>, self>
    operator,(tagged_argument<KW,T2> x) const
    {
        return arg_list<tagged_argument<KW,T2>, self>(x, *this);
@@ -417,7 +409,7 @@ struct arg_list : Next

 #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)  // ETI workaround
 template <> struct arg_list<int,int> {};
-#endif 
+#endif

 // MPL sequence support
 template <class ArgumentPack>
@@ -427,7 +419,7 @@ struct arg_list_iterator

    // The incremented iterator
    typedef arg_list_iterator<typename ArgumentPack::tail_type> next;
-    
+
    // dereferencing yields the key type
    typedef typename ArgumentPack::key_type type;
 };
--- a/include/boost/parameter/aux_/cast.hpp
+++ b/include/boost/parameter/aux_/cast.hpp
@@ -5,6 +5,8 @@
 #ifndef BOOST_PARAMETER_CAST_060902_HPP
 # define BOOST_PARAMETER_CAST_060902_HPP

+# include <boost/detail/workaround.hpp>
+
 # if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \
  && !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
 #  include <boost/type_traits/add_reference.hpp>
@@ -38,11 +40,11 @@ struct use_default_tag {};
 //   X(something, *(predicate))
 //   X(something, (int))

-template <class T>
+template <class T, class Args>
 struct cast;

-template <>
-struct cast<void*>
+template <class Args>
+struct cast<void*, Args>
 {
    static use_default_tag execute(use_default_tag)
    {
@@ -71,27 +73,39 @@ struct cast<void*>

 typedef void* voidstar;

-template <class T>
-struct cast<voidstar(T)>
-  : cast<void*>
+template <class T, class Args>
+struct cast<voidstar(T), Args>
+  : cast<void*, Args>
 {
 };

 #else

-template <class T>
-struct cast<void*(T)>
-  : cast<void*>
+template <class T, class Args>
+struct cast<void*(T), Args>
+  : cast<void*, Args>
 {
 };

 #endif

-template <class T>
-struct cast<void(T)>
+// This is a hack used in cast<> to turn the user supplied type,
+// which may or may not be a placeholder expression into one, so
+// that it will be properly evaluated by mpl::apply.
+template <class T, class Dummy = mpl::_1>
+struct as_placeholder_expr
 {
+    typedef T type;
+};
+
+template <class T, class Args>
+struct cast<void(T), Args>
+{
+    typedef typename mpl::apply2<
+        as_placeholder_expr<T>, Args, Args>::type type0;
+
    typedef typename boost::add_reference<
-        typename boost::remove_const<T>::type 
+        typename boost::remove_const<type0>::type 
    >::type reference;

    static use_default_tag execute(use_default_tag)
@@ -104,7 +118,7 @@ struct cast<void(T)>
        return use_default_tag();
    }

-    static T execute(T value)
+    static type0 execute(type0 value)
    {
        return value;
    }
@@ -116,9 +130,9 @@ struct cast<void(T)>
    }
 };

-#  define BOOST_PARAMETER_FUNCTION_CAST(value, predicate) \
-    boost::parameter::aux::cast<void predicate>::remove_const( \
-        boost::parameter::aux::cast<void predicate>::execute(value) \
+#  define BOOST_PARAMETER_FUNCTION_CAST(value, predicate, args) \
+    boost::parameter::aux::cast<void predicate, args>::remove_const( \
+        boost::parameter::aux::cast<void predicate, args>::execute(value) \
    )

 # endif
--- a/include/boost/parameter/aux_/default.hpp
+++ b/include/boost/parameter/aux_/default.hpp
@@ -4,7 +4,9 @@
 // http://www.boost.org/LICENSE_1_0.txt)

 #ifndef DEFAULT_050329_HPP
-#define DEFAULT_050329_HPP
+# define DEFAULT_050329_HPP
+
+# include <boost/detail/workaround.hpp>

 namespace boost { namespace parameter { namespace aux {

@@ -27,7 +29,7 @@ struct default_
 //    the user when resolving the value of the parameter with the
 //    given keyword
 //
-#if BOOST_WORKAROUND(__EDG_VERSION__, <= 300)
+# if BOOST_WORKAROUND(__EDG_VERSION__, <= 300)
 // These compilers need a little extra help with overload
 // resolution; we have empty_arg_list's operator[] accept a base
 // class to make that overload less preferable.
@@ -48,8 +50,8 @@ struct lazy_default
        : lazy_default_base<KW,DefaultComputer>(x)
      {}
  };
-# define BOOST_PARAMETER_lazy_default_fallback lazy_default_base
-#else 
+#  define BOOST_PARAMETER_lazy_default_fallback lazy_default_base
+# else 
 template <class KW, class DefaultComputer>
 struct lazy_default
 {
@@ -58,8 +60,8 @@ struct lazy_default
    {}
    DefaultComputer const& compute_default;
 };
-# define BOOST_PARAMETER_lazy_default_fallback lazy_default
-#endif 
+#  define BOOST_PARAMETER_lazy_default_fallback lazy_default
+# endif 

 }}} // namespace boost::parameter::aux

--- a/include/boost/parameter/aux_/is_maybe.hpp
+++ b/include/boost/parameter/aux_/is_maybe.hpp
@@ -0,0 +1,26 @@
+// Copyright Daniel Wallin, David Abrahams 2010. 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)
+
+#ifndef BOOST_PARAMETER_IS_MAYBE_050329_HPP
+#define BOOST_PARAMETER_IS_MAYBE_050329_HPP
+
+#include <boost/type_traits/is_base_and_derived.hpp>
+
+namespace boost {
+namespace parameter {
+namespace aux {
+
+struct maybe_base {};
+
+template <class T>
+struct is_maybe
+  : is_base_and_derived<maybe_base, T>
+{};
+
+} // namespace aux
+} // namespace parameter
+} // namespace boost
+
+#endif // BOOST_PARAMETER_IS_MAYBE_050329_HPP
--- a/include/boost/parameter/aux_/maybe.hpp
+++ b/include/boost/parameter/aux_/maybe.hpp
@@ -2,21 +2,41 @@
 // 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)

-#ifndef BOOST_PARAMETER_MAYBE_060211_HPP
-# define BOOST_PARAMETER_MAYBE_060211_HPP
+//
+// 2009.10.21 TDS remove depenency on boost::python::detail::referent_storage
+//
+#ifndef BOOST_PARAMETER_MAYBE_091021_HPP
+# define BOOST_PARAMETER_MAYBE_091021_HPP

 # include <boost/mpl/if.hpp>
 # include <boost/mpl/identity.hpp>
 # include <boost/type_traits/is_reference.hpp>
 # include <boost/type_traits/add_reference.hpp>
 # include <boost/optional.hpp>
-# include <boost/python/detail/referent_storage.hpp>
+# include <boost/aligned_storage.hpp>
 # include <boost/type_traits/remove_cv.hpp>
 # include <boost/type_traits/add_const.hpp>
+# include <boost/parameter/aux_/is_maybe.hpp>

 namespace boost { namespace parameter { namespace aux {

-struct maybe_base {};
+template <class T> struct referent_size;
+
+template <class T>
+struct referent_size<T&>
+{
+  BOOST_STATIC_CONSTANT(std::size_t, value = sizeof(T));
+};
+
+// A metafunction returning a POD type which can store U, where T ==
+// U&. If T is not a reference type, returns a POD which can store T.
+template <class T>
+struct referent_storage
+{
+  typedef typename boost::aligned_storage<
+    referent_size<T>::value
+    >::type type;
+};

 template <class T>
 struct maybe : maybe_base
@@ -24,17 +44,17 @@ struct maybe : maybe_base
    typedef typename add_reference<
 # if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
        T const
-# else 
+# else
        typename add_const<T>::type
-# endif 
+# endif
    >::type reference;
-    
+
    typedef typename remove_cv<
        BOOST_DEDUCED_TYPENAME remove_reference<reference>::type
    >::type non_cv_value;
-        
-    explicit maybe(T value)
-      : value(value)
+
+    explicit maybe(T value_)
+      : value(value_)
      , constructed(false)
    {}

@@ -48,28 +68,28 @@ struct maybe : maybe_base
            this->destroy();
    }

-    reference construct(reference value) const
+    reference construct(reference value_) const
    {
-        return value;
+        return value_;
    }

    template <class U>
-    reference construct2(U const& value) const
+    reference construct2(U const& value_) const
    {
-        new (m_storage.bytes) non_cv_value(value);
+        new (m_storage.address()) non_cv_value(value_);
        constructed = true;
-        return *(non_cv_value*)m_storage.bytes;
+        return *(non_cv_value*)m_storage.address();
    }

    template <class U>
-    reference construct(U const& value) const
+    reference construct(U const& value_) const
    {
-        return this->construct2(value);
+        return this->construct2(value_);
    }

    void destroy()
    {
-        ((non_cv_value*)m_storage.bytes)->~non_cv_value();
+        ((non_cv_value*)m_storage.address())->~non_cv_value();
    }

    typedef reference(maybe<T>::*safe_bool)() const;
@@ -87,7 +107,9 @@ struct maybe : maybe_base
 private:
    boost::optional<T> value;
    mutable bool constructed;
-    mutable typename boost::python::detail::referent_storage<
+
+
+    mutable typename referent_storage<
        reference
    >::type m_storage;
 };
--- a/include/boost/parameter/aux_/overloads.hpp
+++ b/include/boost/parameter/aux_/overloads.hpp
--- a/include/boost/parameter/aux_/parameter_requirements.hpp
+++ b/include/boost/parameter/aux_/parameter_requirements.hpp
--- a/include/boost/parameter/aux_/parenthesized_type.hpp
+++ b/include/boost/parameter/aux_/parenthesized_type.hpp
--- a/include/boost/parameter/aux_/preprocessor/flatten.hpp
+++ b/include/boost/parameter/aux_/preprocessor/flatten.hpp
--- a/include/boost/parameter/aux_/preprocessor/for_each.hpp
+++ b/include/boost/parameter/aux_/preprocessor/for_each.hpp
--- a/include/boost/parameter/aux_/python/invoker.hpp
+++ b/include/boost/parameter/aux_/python/invoker.hpp
@@ -8,6 +8,7 @@
 # include <boost/mpl/begin.hpp>
 # include <boost/mpl/next.hpp>
 # include <boost/mpl/deref.hpp>
+# include <boost/mpl/size.hpp>
 # include <boost/parameter/keyword.hpp>
 # include <boost/preprocessor/iteration/iterate.hpp>

--- a/include/boost/parameter/aux_/python/invoker_iterate.hpp
+++ b/include/boost/parameter/aux_/python/invoker_iterate.hpp
--- a/include/boost/parameter/aux_/result_of0.hpp
+++ b/include/boost/parameter/aux_/result_of0.hpp
--- a/include/boost/parameter/aux_/set.hpp
+++ b/include/boost/parameter/aux_/set.hpp
@@ -5,6 +5,8 @@
 #ifndef BOOST_PARAMETER_SET_060912_HPP
 # define BOOST_PARAMETER_SET_060912_HPP

+# include <boost/detail/workaround.hpp>
+
 # if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) \
  && !BOOST_WORKAROUND(__GNUC__, < 3)
 #  include <boost/mpl/insert.hpp>
--- a/include/boost/parameter/aux_/tag.hpp
+++ b/include/boost/parameter/aux_/tag.hpp
--- a/include/boost/parameter/aux_/tagged_argument.hpp
+++ b/include/boost/parameter/aux_/tagged_argument.hpp
@@ -14,6 +14,7 @@
 # include <boost/mpl/and.hpp>
 # include <boost/mpl/not.hpp>
 # include <boost/type_traits/is_same.hpp>
+# include <boost/type_traits/is_convertible.hpp>
 # include <boost/type_traits/is_reference.hpp>

 namespace boost { namespace parameter { namespace aux {
--- a/include/boost/parameter/aux_/template_keyword.hpp
+++ b/include/boost/parameter/aux_/template_keyword.hpp
--- a/include/boost/parameter/aux_/unwrap_cv_reference.hpp
+++ b/include/boost/parameter/aux_/unwrap_cv_reference.hpp
--- a/include/boost/parameter/aux_/void.hpp
+++ b/include/boost/parameter/aux_/void.hpp
--- a/include/boost/parameter/aux_/yesno.hpp
+++ b/include/boost/parameter/aux_/yesno.hpp
--- a/include/boost/parameter/binding.hpp
+++ b/include/boost/parameter/binding.hpp
--- a/include/boost/parameter/config.hpp
+++ b/include/boost/parameter/config.hpp
@@ -7,7 +7,7 @@
 #define BOOST_PARAMETER_CONFIG_050403_HPP

 #ifndef BOOST_PARAMETER_MAX_ARITY
-# define BOOST_PARAMETER_MAX_ARITY 5
+# define BOOST_PARAMETER_MAX_ARITY 8
 #endif

 #endif // BOOST_PARAMETER_CONFIG_050403_HPP
--- a/include/boost/parameter/keyword.hpp
+++ b/include/boost/parameter/keyword.hpp
--- a/include/boost/parameter/macros.hpp
+++ b/include/boost/parameter/macros.hpp
@@ -15,13 +15,14 @@
 #include <boost/preprocessor/repetition/enum_params.hpp>
 #include <boost/preprocessor/repetition/enum_binary_params.hpp>
 #include <boost/preprocessor/cat.hpp>
+#include <boost/detail/workaround.hpp>

 #define BOOST_PARAMETER_FUN_TEMPLATE_HEAD1(n) \
    template<BOOST_PP_ENUM_PARAMS(n, class T)>

 #define BOOST_PARAMETER_FUN_TEMPLATE_HEAD0(n)

-#ifndef BOOST_NO_SFINAE
+#if ! defined(BOOST_NO_SFINAE) && ! BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x592)) 

 # define BOOST_PARAMETER_MATCH_TYPE(n, param)           \
            BOOST_PP_EXPR_IF(n, typename) param::match  \
--- a/include/boost/parameter/match.hpp
+++ b/include/boost/parameter/match.hpp
--- a/include/boost/parameter/name.hpp
+++ b/include/boost/parameter/name.hpp
@@ -16,7 +16,8 @@
 # include <boost/mpl/placeholders.hpp>

 # if !defined(BOOST_NO_SFINAE) \
-  && !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
+  && !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \
+  && !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x592))

 #  include <boost/utility/enable_if.hpp>
 #  include <boost/mpl/lambda.hpp>
@@ -26,7 +27,7 @@ namespace boost { namespace parameter { namespace aux {
 // Tag type passed to MPL lambda.
 struct lambda_tag;

-struct name_tag_base 
+struct name_tag_base
 {};

 template <class Tag>
@@ -45,7 +46,7 @@ namespace boost { namespace mpl {
 template <class T>
 struct lambda<
    T
-  , typename enable_if<
+  , typename boost::enable_if<
        parameter::aux::is_name_tag<T>, parameter::aux::lambda_tag
    >::type
 >
--- a/include/boost/parameter/parameters.hpp
+++ b/include/boost/parameter/parameters.hpp
@@ -725,7 +725,7 @@ struct parameters
    // ::type).


-#ifndef BOOST_NO_SFINAE
+#if ! defined(BOOST_NO_SFINAE) && ! BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x592))
    // If NamedList satisfies the PS0, PS1, ..., this is a
    // metafunction returning parameters.  Otherwise it 
    // has no nested ::type.
@@ -775,7 +775,7 @@ struct parameters
 #endif
    >
    struct match
-# ifndef BOOST_NO_SFINAE
+# if ! defined(BOOST_NO_SFINAE) && ! BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x592))
      : match_base<
            typename aux::make_arg_list<
                typename BOOST_PARAMETER_build_arg_list(
--- a/include/boost/parameter/preprocessor.hpp
+++ b/include/boost/parameter/preprocessor.hpp
@@ -14,7 +14,9 @@
 # include <boost/parameter/aux_/preprocessor/flatten.hpp>

 # include <boost/preprocessor/repetition/repeat_from_to.hpp>
+# include <boost/preprocessor/comparison/equal.hpp>
 # include <boost/preprocessor/control/if.hpp>
+# include <boost/preprocessor/control/iif.hpp>
 # include <boost/preprocessor/control/expr_if.hpp>
 # include <boost/preprocessor/repetition/enum_params.hpp>
 # include <boost/preprocessor/repetition/enum_binary_params.hpp>
@@ -23,9 +25,12 @@
 # include <boost/preprocessor/seq/for_each_product.hpp>
 # include <boost/preprocessor/seq/for_each_i.hpp> 
 # include <boost/preprocessor/tuple/elem.hpp> 
+# include <boost/preprocessor/tuple/eat.hpp>
 # include <boost/preprocessor/seq/fold_left.hpp>
+# include <boost/preprocessor/seq/push_back.hpp>
 # include <boost/preprocessor/seq/size.hpp>
 # include <boost/preprocessor/seq/enum.hpp>
+# include <boost/preprocessor/seq/push_back.hpp>

 # include <boost/preprocessor/detail/is_nullary.hpp>

@@ -38,7 +43,7 @@

 namespace boost { namespace parameter { namespace aux {

-#  ifndef BOOST_NO_SFINAE
+#  if ! defined(BOOST_NO_SFINAE) && ! BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x592))

 // Given Match, which is "void x" where x is an argument matching
 // criterion, extract a corresponding MPL predicate.
@@ -149,7 +154,8 @@ struct argument_pack
      , typename Parameters::deduced_list
      , tag_keyword_arg
      , mpl::false_
-    >::type type;
+    >::type result;
+    typedef typename mpl::first<result>::type type;
 };

 # if 1 //BOOST_WORKAROUND(BOOST_MSVC, < 1300)
@@ -353,11 +359,11 @@ struct funptr_predicate<void**>
    template<BOOST_PP_ENUM_PARAMS_Z(z, n, class ParameterArgumentType)>
 /**/

-# ifndef BOOST_NO_SFINAE
+# if ! defined(BOOST_NO_SFINAE) && ! BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x592))
 #  define BOOST_PARAMETER_FUNCTION_FWD_MATCH_Z(z, name, parameters, n) \
    , typename boost::parameter::aux::match< \
          parameters, BOOST_PP_ENUM_PARAMS(n, ParameterArgumentType) \
-      >::type boost_parameter_enabler_argument = parameters()
+      >::type = parameters()
 # else
 #  define BOOST_PARAMETER_FUNCTION_FWD_MATCH_Z(z, name, parameters, n)
 # endif
@@ -695,6 +701,7 @@ struct funptr_predicate<void**>
            ) \
        ] \
      , BOOST_PARAMETER_FN_ARG_PRED(arg) \
+      , Args \
    )

 # define BOOST_PARAMETER_FUNCTION_DEFAULT_FUNCTION_BODY(name, n, split_args, tag_namespace) \
@@ -722,6 +729,7 @@ struct funptr_predicate<void**>
    BOOST_PARAMETER_FUNCTION_CAST( \
        boost::parameter::aux::as_lvalue(BOOST_PARAMETER_FN_ARG_DEFAULT(arg), 0L) \
      , BOOST_PARAMETER_FN_ARG_PRED(arg) \
+      , Args \
    )

 # define BOOST_PARAMETER_FUNCTION_DEFAULT_EVAL_DEFAULT_BODY(name, n, split_args, tag_ns, const_) \
@@ -837,6 +845,7 @@ struct funptr_predicate<void**>
              boost::parameter::keyword<tag_ns::BOOST_PARAMETER_FN_ARG_KEYWORD(arg)>::instance \
          ] \
        , BOOST_PARAMETER_FN_ARG_PRED(arg) \
+        , Args \
      )

 // Generates the function template that recives a ArgumentPack, and then
--- a/include/boost/parameter/python.hpp
+++ b/include/boost/parameter/python.hpp
--- a/include/boost/parameter/value_type.hpp
+++ b/include/boost/parameter/value_type.hpp
--- a/index.html
+++ b/index.html
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -9,6 +9,8 @@ import python ;
 project boost/parameter
  : default-build <warnings>off
  ;
+
+build-project literate ;
  
 test-suite "parameter"
  :  [ run basics.cpp ]
--- a/test/basics.cpp
+++ b/test/basics.cpp
--- a/test/basics.hpp
+++ b/test/basics.hpp
--- a/test/deduced.cpp
+++ b/test/deduced.cpp
--- a/test/deduced.hpp
+++ b/test/deduced.hpp
--- a/test/deduced_dependent_predicate.cpp
+++ b/test/deduced_dependent_predicate.cpp
--- a/test/deduced_unmatched_arg.cpp
+++ b/test/deduced_unmatched_arg.cpp
--- a/test/duplicates.cpp
+++ b/test/duplicates.cpp
--- a/test/earwicker.cpp
+++ b/test/earwicker.cpp
--- a/test/efficiency.cpp
+++ b/test/efficiency.cpp
--- a/test/literate/Jamfile.v2
+++ b/test/literate/Jamfile.v2
@@ -0,0 +1,33 @@
+
+import testing ;
+
+run extracting-parameter-types0.cpp ;
+run extracting-parameter-types1.cpp ;
+compile template-keywords0.cpp ;
+compile template-keywords1.cpp ;
+compile top-level0.cpp ;
+compile headers-and-namespaces0.cpp ;
+compile predicate-requirements0.cpp ;
+compile handling-out-parameters0.cpp ;
+compile writing-the-function0.cpp ;
+run building-argumentpacks0.cpp ;
+compile defining-the-keywords0.cpp ;
+compile defining-the-keywords1.cpp ;
+compile exercising-the-code-so-far0.cpp ;
+run lazy-default-computation0.cpp ;
+run lazy-default-computation1.cpp ;
+run namespaces0.cpp ;
+run namespaces1.cpp ;
+run namespaces2.cpp ;
+run namespaces3.cpp ;
+compile optional-parameters0.cpp ;
+compile static-member-functions0.cpp ;
+run parameter-enabled-constructors0.cpp ;
+compile required-parameters0.cpp ;
+compile class-template-skeleton0.cpp ;
+compile deduced-template-parameters0.cpp ;
+compile deduced-parameters0.cpp ;
+compile default-expression-evaluation0.cpp ;
+compile parameter-enabled-member-functions0.cpp ;
+compile parameter-enabled-member-functions1.cpp ;
+run fine-grained-name-control0.cpp ;
--- a/test/literate/README
+++ b/test/literate/README
@@ -0,0 +1,6 @@
+These tests were extracted from the Boost.Parameter documentation
+with:
+
+python ../../../../tools/litre/tool.py \
+       ../../../../libs/parameter/doc/index.rst \
+       --dump_dir=.
--- a/test/literate/building-argumentpacks0.cpp
+++ b/test/literate/building-argumentpacks0.cpp
@@ -0,0 +1,53 @@
+
+#line 1744 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#include <boost/parameter.hpp>
+#include <iostream>
+#line 1733 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+BOOST_PARAMETER_NAME(index)
+
+template <class ArgumentPack>
+int print_index(ArgumentPack const& args)
+{
+    std::cout << "index = " << args[_index] << std::endl;
+    return 0;
+}
+
+int x = print_index(_index = 3);  // prints "index = 3"
+
+#line 1752 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+BOOST_PARAMETER_NAME(name)
+
+template <class ArgumentPack>
+int print_name_and_index(ArgumentPack const& args)
+{
+    std::cout << "name = " << args[_name] << "; ";
+    return print_index(args);
+}
+
+int y = print_name_and_index((_index = 3, _name = "jones"));
+
+
+#line 1787 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+namespace parameter = boost::parameter;
+using parameter::required;
+using parameter::optional;
+using boost::is_convertible;
+using boost::mpl::_;
+#line 1773 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+parameter::parameters<
+    required<tag::name, is_convertible<_,char const*> >
+  , optional<tag::index, is_convertible<_,int> >
+> spec;
+
+char const sam[] = "sam";
+int twelve = 12;
+
+int z0 = print_name_and_index( spec(sam, twelve) );
+
+int z1 = print_name_and_index(
+   spec(_index=12, _name="sam")
+);
+#line 1794 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+int main()
+{}
+
--- a/test/literate/class-template-skeleton0.cpp
+++ b/test/literate/class-template-skeleton0.cpp
@@ -0,0 +1,18 @@
+
+#line 1387 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#include <boost/parameter.hpp>
+#line 1373 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+namespace boost { namespace python {
+
+template <
+    class A0
+  , class A1 = parameter::void_
+  , class A2 = parameter::void_
+  , class A3 = parameter::void_
+>
+struct class_
+{
+    
+};
+
+}}
--- a/test/literate/deduced-parameters0.cpp
+++ b/test/literate/deduced-parameters0.cpp
@@ -0,0 +1,80 @@
+
+#line 1062 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#include <boost/parameter.hpp>
+
+BOOST_PARAMETER_NAME(name)
+BOOST_PARAMETER_NAME(func)
+BOOST_PARAMETER_NAME(docstring)
+BOOST_PARAMETER_NAME(keywords)
+BOOST_PARAMETER_NAME(policies)
+
+struct default_call_policies
+{};
+
+struct no_keywords
+{};
+
+struct keywords
+{};
+
+template <class T>
+struct is_keyword_expression
+  : boost::mpl::false_
+{};
+
+template <>
+struct is_keyword_expression<keywords>
+  : boost::mpl::true_
+{};
+
+default_call_policies some_policies;
+
+void f()
+{}
+#line 1029 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+namespace mpl = boost::mpl;
+
+BOOST_PARAMETER_FUNCTION(
+    (void), def, tag,
+
+    (required (name,(char const*)) (func,*) )   // nondeduced
+
+    (deduced
+      (optional
+        (docstring, (char const*), "")
+
+        (keywords
+           , *(is_keyword_expression<mpl::_>) // see 5
+           , no_keywords())
+
+        (policies
+           , *(mpl::not_<
+                 mpl::or_<
+                     boost::is_convertible<mpl::_, char const*>
+                   , is_keyword_expression<mpl::_> // see 5
+                 >
+             >)
+           , default_call_policies()
+         )
+       )
+     )
+ )
+ {
+    
+ }
+
+
+#line 1111 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+int main()
+{
+#line 1108 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+def("f", &f, some_policies, "Documentation for f");
+def("f", &f, "Documentation for f", some_policies);
+
+#line 1121 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+def(
+    "f", &f
+   , _policies = some_policies, "Documentation for f");
+#line 1124 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+}
+
--- a/test/literate/deduced-template-parameters0.cpp
+++ b/test/literate/deduced-template-parameters0.cpp
@@ -0,0 +1,111 @@
+
+#line 1557 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#include <boost/parameter.hpp>
+#include <boost/mpl/is_sequence.hpp>
+#include <boost/noncopyable.hpp>
+#include <memory>
+
+using namespace boost::parameter;
+using boost::mpl::_;
+
+namespace boost { namespace python {
+
+BOOST_PARAMETER_TEMPLATE_KEYWORD(class_type)
+BOOST_PARAMETER_TEMPLATE_KEYWORD(base_list)
+BOOST_PARAMETER_TEMPLATE_KEYWORD(held_type)
+BOOST_PARAMETER_TEMPLATE_KEYWORD(copyable)
+
+}}
+#line 1546 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+namespace boost { namespace python {
+
+namespace detail { struct bases_base {}; }
+
+template <class A0 = void, class A1 = void, class A2 = void  >
+struct bases : detail::bases_base
+{};
+
+}}
+
+
+#line 1600 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#include <boost/type_traits/is_class.hpp>
+namespace boost { namespace python {
+#line 1578 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+typedef parameter::parameters<
+    required<tag::class_type, is_class<_> >
+
+  , parameter::optional<
+        deduced<tag::base_list>
+      , is_base_and_derived<detail::bases_base,_>
+    >
+
+  , parameter::optional<
+        deduced<tag::held_type>
+      , mpl::not_<
+            mpl::or_<
+                is_base_and_derived<detail::bases_base,_>
+              , is_same<noncopyable,_>
+            >
+        >
+    >
+
+  , parameter::optional<deduced<tag::copyable>, is_same<noncopyable,_> >
+
+> class_signature;
+#line 1604 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+template <
+    class A0
+  , class A1 = parameter::void_
+  , class A2 = parameter::void_
+  , class A3 = parameter::void_
+>
+struct class_
+{
+    // Create ArgumentPack
+    typedef typename
+      class_signature::bind<A0,A1,A2,A3>::type
+    args;
+
+    // Extract first logical parameter.
+    typedef typename parameter::value_type<
+      args, tag::class_type>::type class_type;
+
+    typedef typename parameter::value_type<
+      args, tag::base_list, bases<> >::type base_list;
+
+    typedef typename parameter::value_type<
+      args, tag::held_type, class_type>::type held_type;
+
+    typedef typename parameter::value_type<
+      args, tag::copyable, void>::type copyable;
+};
+
+}}
+
+
+
+#line 1644 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+struct B {};
+struct D {};
+
+using boost::python::bases;
+#line 1640 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+typedef boost::python::class_<B, boost::noncopyable> c1;
+
+typedef boost::python::class_<D, std::auto_ptr<D>, bases<B> > c2;
+#line 1650 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+BOOST_MPL_ASSERT((boost::is_same<c1::class_type, B>));
+BOOST_MPL_ASSERT((boost::is_same<c1::base_list, bases<> >));
+BOOST_MPL_ASSERT((boost::is_same<c1::held_type, B>));
+BOOST_MPL_ASSERT((
+     boost::is_same<c1::copyable, boost::noncopyable>
+));
+
+BOOST_MPL_ASSERT((boost::is_same<c2::class_type, D>));
+BOOST_MPL_ASSERT((boost::is_same<c2::base_list, bases<B> >));
+BOOST_MPL_ASSERT((
+    boost::is_same<c2::held_type, std::auto_ptr<D> >
+));
+BOOST_MPL_ASSERT((boost::is_same<c2::copyable, void>));
+
--- a/test/literate/default-expression-evaluation0.cpp
+++ b/test/literate/default-expression-evaluation0.cpp
@@ -0,0 +1,41 @@
+
+#line 730 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#include <boost/parameter.hpp>
+#include <iostream>
+
+BOOST_PARAMETER_NAME(graph)
+BOOST_PARAMETER_NAME(visitor)
+BOOST_PARAMETER_NAME(root_vertex)
+BOOST_PARAMETER_NAME(index_map)
+BOOST_PARAMETER_NAME(color_map)
+#line 702 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#include <boost/graph/depth_first_search.hpp> // for dfs_visitor
+
+BOOST_PARAMETER_FUNCTION(
+    (void), depth_first_search, tag
+    
+, (required
+    (graph, *)
+    (visitor, *)
+    (root_vertex, *)
+    (index_map, *)
+    (color_map, *)
+  )
+
+)
+{
+   std::cout << "graph=" << graph << std::endl;
+   std::cout << "visitor=" << visitor << std::endl;
+   std::cout << "root_vertex=" << root_vertex << std::endl;
+   std::cout << "index_map=" << index_map << std::endl;
+   std::cout << "color_map=" << color_map << std::endl;
+}
+
+int main()
+{
+    depth_first_search(1, 2, 3, 4, 5);
+
+    depth_first_search(
+        "1", '2', _color_map = '5',
+        _index_map = "4", _root_vertex = "3");
+}
--- a/test/literate/defining-the-keywords0.cpp
+++ b/test/literate/defining-the-keywords0.cpp
@@ -0,0 +1,11 @@
+#line 397 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#include <boost/parameter/name.hpp>
+
+namespace graphs
+{
+  BOOST_PARAMETER_NAME(graph)    // Note: no semicolon
+  BOOST_PARAMETER_NAME(visitor)
+  BOOST_PARAMETER_NAME(root_vertex)
+  BOOST_PARAMETER_NAME(index_map)
+  BOOST_PARAMETER_NAME(color_map)
+}
--- a/test/literate/defining-the-keywords1.cpp
+++ b/test/literate/defining-the-keywords1.cpp
@@ -0,0 +1,15 @@
+
+#line 424 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#include <boost/parameter/keyword.hpp>
+#line 413 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+namespace graphs
+{
+  namespace tag { struct graph; } // keyword tag type
+
+  namespace // unnamed
+  {
+    // A reference to the keyword object
+    boost::parameter::keyword<tag::graph>& _graph
+    = boost::parameter::keyword<tag::graph>::get();
+  }
+}
--- a/test/literate/exercising-the-code-so-far0.cpp
+++ b/test/literate/exercising-the-code-so-far0.cpp
@@ -0,0 +1,101 @@
+
+#line 1415 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#include <boost/parameter.hpp>
+#include <boost/mpl/is_sequence.hpp>
+#include <boost/noncopyable.hpp>
+#include <boost/type_traits/is_class.hpp>
+#include <memory>
+
+using namespace boost::parameter;
+
+namespace boost { namespace python {
+
+BOOST_PARAMETER_TEMPLATE_KEYWORD(class_type)
+BOOST_PARAMETER_TEMPLATE_KEYWORD(base_list)
+BOOST_PARAMETER_TEMPLATE_KEYWORD(held_type)
+BOOST_PARAMETER_TEMPLATE_KEYWORD(copyable)
+
+template <class B = int>
+struct bases
+{};
+
+}}
+#line 1402 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+namespace boost { namespace python {
+
+using boost::mpl::_;
+
+typedef parameter::parameters<
+    required<tag::class_type, boost::is_class<_> >
+  , parameter::optional<tag::base_list, mpl::is_sequence<_> >
+  , parameter::optional<tag::held_type>
+  , parameter::optional<tag::copyable>
+> class_signature;
+
+}}
+
+#line 1454 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+namespace boost { namespace python {
+
+template <
+    class A0
+  , class A1 = parameter::void_
+  , class A2 = parameter::void_
+  , class A3 = parameter::void_
+>
+struct class_
+{
+    // Create ArgumentPack
+    typedef typename
+      class_signature::bind<A0,A1,A2,A3>::type
+    args;
+
+    // Extract first logical parameter.
+    typedef typename parameter::value_type<
+      args, tag::class_type>::type class_type;
+
+    typedef typename parameter::value_type<
+      args, tag::base_list, bases<> >::type base_list;
+
+    typedef typename parameter::value_type<
+      args, tag::held_type, class_type>::type held_type;
+
+    typedef typename parameter::value_type<
+      args, tag::copyable, void>::type copyable;
+};
+
+}}
+
+
+#line 1 "None"
+using boost::python::class_type;
+using boost::python::copyable;
+using boost::python::held_type;
+using boost::python::base_list;
+using boost::python::bases;
+
+struct B {};
+struct D {};
+#line 1495 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+typedef boost::python::class_<
+    class_type<B>, copyable<boost::noncopyable>
+> c1;
+
+typedef boost::python::class_<
+    D, held_type<std::auto_ptr<D> >, base_list<bases<B> >
+> c2;
+
+#line 1515 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+BOOST_MPL_ASSERT((boost::is_same<c1::class_type, B>));
+BOOST_MPL_ASSERT((boost::is_same<c1::base_list, bases<> >));
+BOOST_MPL_ASSERT((boost::is_same<c1::held_type, B>));
+BOOST_MPL_ASSERT((
+     boost::is_same<c1::copyable, boost::noncopyable>
+));
+
+BOOST_MPL_ASSERT((boost::is_same<c2::class_type, D>));
+BOOST_MPL_ASSERT((boost::is_same<c2::base_list, bases<B> >));
+BOOST_MPL_ASSERT((
+    boost::is_same<c2::held_type, std::auto_ptr<D> >
+));
+BOOST_MPL_ASSERT((boost::is_same<c2::copyable, void>));
--- a/test/literate/extracting-parameter-types0.cpp
+++ b/test/literate/extracting-parameter-types0.cpp
@@ -0,0 +1,31 @@
+
+#line 1830 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#include <boost/parameter.hpp>
+#include <cassert>
+#line 1813 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+BOOST_PARAMETER_NAME(name)
+BOOST_PARAMETER_NAME(index)
+
+template <class Name, class Index>
+int deduce_arg_types_impl(Name& name, Index& index)
+{
+    Name& n2 = name;  // we know the types
+    Index& i2 = index;
+    return index;
+}
+
+template <class ArgumentPack>
+int deduce_arg_types(ArgumentPack const& args)
+{
+    return deduce_arg_types_impl(args[_name], args[_index|42]);
+}
+#line 1834 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+int a1 = deduce_arg_types((_name = "foo"));
+int a2 = deduce_arg_types((_name = "foo", _index = 3));
+
+int main()
+{
+    assert(a1 == 42);
+    assert(a2 == 3);
+}
+
--- a/test/literate/extracting-parameter-types1.cpp
+++ b/test/literate/extracting-parameter-types1.cpp
@@ -0,0 +1,24 @@
+
+#line 1863 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#include <boost/parameter.hpp>
+#include <boost/type_traits/remove_reference.hpp>
+#include <cassert>
+
+namespace parameter = boost::parameter;
+#line 1852 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+BOOST_PARAMETER_NAME(index)
+
+template <class ArgumentPack>
+typename parameter::value_type<ArgumentPack, tag::index, int>::type
+twice_index(ArgumentPack const& args)
+{
+    return 2 * args[_index|42];
+}
+
+int six = twice_index(_index = 3);
+#line 1871 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+int main()
+{
+    assert(six == 6);
+}
+
--- a/test/literate/fine-grained-name-control0.cpp
+++ b/test/literate/fine-grained-name-control0.cpp
@@ -0,0 +1,18 @@
+
+#line 1703 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#include <boost/parameter.hpp>
+#line 1693 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+BOOST_PARAMETER_NAME((pass_foo, keywords) foo)
+
+BOOST_PARAMETER_FUNCTION(
+  (int), f,
+  keywords, (required (foo, *)))
+{
+    return foo + 1;
+}
+
+int x = f(pass_foo = 41);
+#line 1704 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+int main()
+{}
+
--- a/test/literate/handling-out-parameters0.cpp
+++ b/test/literate/handling-out-parameters0.cpp
@@ -0,0 +1,33 @@
+
+#line 620 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#include <boost/parameter.hpp>
+
+namespace boost
+{
+  int vertex_index = 0;
+
+  template <class T = int>
+  struct dfs_visitor
+  {};
+}
+
+BOOST_PARAMETER_NAME(graph)
+
+BOOST_PARAMETER_NAME(visitor)
+BOOST_PARAMETER_NAME(root_vertex)
+BOOST_PARAMETER_NAME(index_map)
+BOOST_PARAMETER_NAME(color_map)
+
+BOOST_PARAMETER_FUNCTION((void), f, tag,
+  (required (graph, *))
+#line 612 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+(optional
+    (visitor,            *, boost::dfs_visitor<>())
+    (root_vertex,        *, *vertices(graph).first)
+    (index_map,          *, get(boost::vertex_index,graph))
+    (in_out(color_map), *,
+      default_color_map(num_vertices(graph), index_map) )
+)
+#line 642 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+) {}
+
--- a/test/literate/headers-and-namespaces0.cpp
+++ b/test/literate/headers-and-namespaces0.cpp
@@ -0,0 +1,5 @@
+#line 274 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#include <boost/parameter/keyword.hpp>
+#line 283 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+using boost::parameter::keyword;
+
--- a/test/literate/lazy-default-computation0.cpp
+++ b/test/literate/lazy-default-computation0.cpp
@@ -0,0 +1,27 @@
+
+#line 1911 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#include <boost/parameter.hpp>
+#include <string>
+
+namespace parameter = boost::parameter;
+#line 1894 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+BOOST_PARAMETER_NAME(s1)
+BOOST_PARAMETER_NAME(s2)
+BOOST_PARAMETER_NAME(s3)
+
+template <class ArgumentPack>
+std::string f(ArgumentPack const& args)
+{
+    std::string const& s1 = args[_s1];
+    std::string const& s2 = args[_s2];
+    typename parameter::binding<
+        ArgumentPack,tag::s3,std::string
+    >::type s3 = args[_s3|(s1+s2)]; // always constructs s1+s2
+    return s3;
+}
+
+std::string x = f((_s1="hello,", _s2=" world", _s3="hi world"));
+#line 1917 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+int main()
+{}
+
--- a/test/literate/lazy-default-computation1.cpp
+++ b/test/literate/lazy-default-computation1.cpp
@@ -0,0 +1,33 @@
+
+#line 1943 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#include <boost/bind.hpp>
+#include <boost/ref.hpp>
+#include <boost/parameter.hpp>
+#include <string>
+#include <functional>
+
+namespace parameter = boost::parameter;
+
+BOOST_PARAMETER_NAME(s1)
+BOOST_PARAMETER_NAME(s2)
+BOOST_PARAMETER_NAME(s3)
+
+template <class ArgumentPack>
+std::string f(ArgumentPack const& args)
+{
+    std::string const& s1 = args[_s1];
+    std::string const& s2 = args[_s2];
+#line 1938 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+typename parameter::binding<
+    ArgumentPack, tag::s3, std::string
+>::type s3 = args[_s3
+    || boost::bind(std::plus<std::string>(), boost::ref(s1), boost::ref(s2)) ];
+#line 1962 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+    return s3;
+}
+
+std::string x = f((_s1="hello,", _s2=" world", _s3="hi world"));
+
+int main()
+{}
+
--- a/test/literate/namespaces0.cpp
+++ b/test/literate/namespaces0.cpp
@@ -0,0 +1,25 @@
+
+#line 2082 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#line 2085 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#include <boost/parameter.hpp>
+#include <iostream>
+#line 2071 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+namespace lib
+{
+  BOOST_PARAMETER_NAME(name)
+  BOOST_PARAMETER_NAME(index)
+
+  BOOST_PARAMETER_FUNCTION(
+    (int), f, tag,
+    (optional (name,*,"bob")(index,(int),1))
+  )
+  {
+      std::cout << name << ":" << index << std::endl;
+      return index;
+  }
+}
+#line 2098 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+int x = lib::f(lib::_name = "jill", lib::_index = 1);
+#line 2102 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+int main() {}
+
--- a/test/literate/namespaces1.cpp
+++ b/test/literate/namespaces1.cpp
@@ -0,0 +1,28 @@
+
+#line 2100 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#line 2085 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#include <boost/parameter.hpp>
+#include <iostream>
+#line 2071 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+namespace lib
+{
+  BOOST_PARAMETER_NAME(name)
+  BOOST_PARAMETER_NAME(index)
+
+  BOOST_PARAMETER_FUNCTION(
+    (int), f, tag,
+    (optional (name,*,"bob")(index,(int),1))
+  )
+  {
+      std::cout << name << ":" << index << std::endl;
+      return index;
+  }
+}
+#line 2111 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+using lib::_name;
+using lib::_index;
+
+int x = lib::f(_name = "jill", _index = 1);
+#line 2120 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+int main() {}
+
--- a/test/literate/namespaces2.cpp
+++ b/test/literate/namespaces2.cpp
@@ -0,0 +1,26 @@
+
+#line 2114 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#line 2085 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#include <boost/parameter.hpp>
+#include <iostream>
+#line 2071 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+namespace lib
+{
+  BOOST_PARAMETER_NAME(name)
+  BOOST_PARAMETER_NAME(index)
+
+  BOOST_PARAMETER_FUNCTION(
+    (int), f, tag,
+    (optional (name,*,"bob")(index,(int),1))
+  )
+  {
+      std::cout << name << ":" << index << std::endl;
+      return index;
+  }
+}
+#line 2128 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+using namespace lib;
+int x = f(_name = "jill", _index = 3);
+#line 2134 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+int main() {}
+
--- a/test/literate/namespaces3.cpp
+++ b/test/literate/namespaces3.cpp
@@ -0,0 +1,29 @@
+
+#line 2161 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#include <boost/parameter.hpp>
+#include <iostream>
+#line 2143 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+namespace lib
+{
+  namespace keywords
+  {
+     BOOST_PARAMETER_NAME(name)
+     BOOST_PARAMETER_NAME(index)
+  }
+
+  BOOST_PARAMETER_FUNCTION(
+    (int), f, keywords::tag,
+    (optional (name,*,"bob")(index,(int),1))
+  )
+  {
+      std::cout << name << ":" << index << std::endl;
+      return index;
+  }
+}
+
+#line 2170 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+using namespace lib::keywords;
+int y = lib::f(_name = "bob", _index = 2);
+#line 2172 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+int main() {}
+
--- a/test/literate/optional-parameters0.cpp
+++ b/test/literate/optional-parameters0.cpp
@@ -0,0 +1,31 @@
+
+#line 571 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#include <boost/parameter.hpp>
+
+namespace boost
+{
+  int vertex_index = 0;
+
+  template <class T = int>
+  struct dfs_visitor
+  {};
+}
+
+BOOST_PARAMETER_NAME(graph)
+BOOST_PARAMETER_NAME(visitor)
+BOOST_PARAMETER_NAME(root_vertex)
+BOOST_PARAMETER_NAME(index_map)
+BOOST_PARAMETER_NAME(color_map)
+
+BOOST_PARAMETER_FUNCTION((void), f, tag,
+  (required (graph, *))
+#line 563 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+(optional     (visitor,           *, boost::dfs_visitor<>())
+    (root_vertex,       *, *vertices(graph).first)
+    (index_map,         *, get(boost::vertex_index,graph))
+    (in_out(color_map), *,
+      default_color_map(num_vertices(graph), index_map) )
+)
+#line 592 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+) {}
+
--- a/test/literate/parameter-enabled-constructors0.cpp
+++ b/test/literate/parameter-enabled-constructors0.cpp
@@ -0,0 +1,37 @@
+
+#line 1248 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#include <boost/parameter.hpp>
+#include <iostream>
+#line 1234 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+BOOST_PARAMETER_NAME(name)
+BOOST_PARAMETER_NAME(index)
+
+struct myclass_impl
+{
+    template <class ArgumentPack>
+    myclass_impl(ArgumentPack const& args)
+    {
+        std::cout << "name = " << args[_name]
+                  << "; index = " << args[_index | 42]
+                  << std::endl;
+    }
+};
+
+#line 1261 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+struct myclass : myclass_impl
+{
+    BOOST_PARAMETER_CONSTRUCTOR(
+        myclass, (myclass_impl), tag
+      , (required (name,*)) (optional (index,*))) // no semicolon
+};
+
+
+#line 1275 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+int main() {
+#line 1272 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+myclass x("bob", 3);                     // positional
+myclass y(_index = 12, _name = "sally"); // named
+myclass z("june");                       // positional/defaulted
+#line 1275 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+}
+
--- a/test/literate/parameter-enabled-member-functions0.cpp
+++ b/test/literate/parameter-enabled-member-functions0.cpp
@@ -0,0 +1,17 @@
+
+#line 1154 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#include <boost/parameter.hpp>
+#include <iostream>
+using namespace boost::parameter;
+#line 1142 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+BOOST_PARAMETER_NAME(arg1)
+BOOST_PARAMETER_NAME(arg2)
+
+struct callable2
+{
+    BOOST_PARAMETER_CONST_MEMBER_FUNCTION(
+        (void), call, tag, (required (arg1,(int))(arg2,(int))))
+    {
+        std::cout << arg1 << ", " << arg2 << std::endl;
+    }
+};
--- a/test/literate/parameter-enabled-member-functions1.cpp
+++ b/test/literate/parameter-enabled-member-functions1.cpp
@@ -0,0 +1,18 @@
+
+#line 1177 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#include <boost/parameter.hpp>
+
+BOOST_PARAMETER_NAME(arg1)
+BOOST_PARAMETER_NAME(arg2)
+using namespace boost::parameter;
+#line 1166 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+struct callable2
+{
+    BOOST_PARAMETER_CONST_MEMBER_FUNCTION(
+        (void), call, tag, (required (arg1,(int))(arg2,(int))))
+    {
+        call_impl(arg1,arg2);
+    }
+ private:
+    void call_impl(int, int); // implemented elsewhere.
+};
--- a/test/literate/predicate-requirements0.cpp
+++ b/test/literate/predicate-requirements0.cpp
@@ -0,0 +1,106 @@
+
+#line 935 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#include <boost/parameter.hpp>
+#include <boost/graph/adjacency_list.hpp>
+#include <boost/graph/depth_first_search.hpp>
+
+BOOST_PARAMETER_NAME((_graph, graphs) graph)
+BOOST_PARAMETER_NAME((_visitor, graphs) visitor)
+BOOST_PARAMETER_NAME((_root_vertex, graphs) root_vertex)
+BOOST_PARAMETER_NAME((_index_map, graphs) index_map)
+BOOST_PARAMETER_NAME((_color_map, graphs) color_map)
+
+using boost::mpl::_;
+#line 859 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+// We first need to define a few metafunction that we use in the
+// predicates below.
+
+template <class G>
+struct traversal_category
+{
+    typedef typename boost::graph_traits<G>::traversal_category type;
+};
+
+template <class G>
+struct vertex_descriptor
+{
+    typedef typename boost::graph_traits<G>::vertex_descriptor type;
+};
+
+template <class G>
+struct value_type
+{
+    typedef typename boost::property_traits<G>::value_type type;
+};
+
+template <class G>
+struct key_type
+{
+    typedef typename boost::property_traits<G>::key_type type;
+};
+
+template<class Size, class IndexMap>
+boost::iterator_property_map<
+    boost::default_color_type*, IndexMap
+  , boost::default_color_type, boost::default_color_type&
+>
+default_color_map(Size num_vertices, IndexMap const& index_map)
+{
+   std::vector<boost::default_color_type> colors(num_vertices);
+   return &colors[0];
+}
+
+BOOST_PARAMETER_FUNCTION(
+    (void), depth_first_search, graphs
+
+  , (required
+      (graph
+       , *(boost::mpl::and_<
+               boost::is_convertible<
+                   traversal_category<_>, boost::incidence_graph_tag
+               >
+             , boost::is_convertible<
+                   traversal_category<_>, boost::vertex_list_graph_tag
+               >
+           >) ))
+
+    (optional
+      (visitor, *, boost::dfs_visitor<>()) // not checkable
+
+      (root_vertex
+        , (vertex_descriptor<graphs::graph::_>)
+        , *vertices(graph).first)
+
+      (index_map
+        , *(boost::mpl::and_<
+              boost::is_integral<value_type<_> >
+            , boost::is_same<
+                  vertex_descriptor<graphs::graph::_>, key_type<_>
+              >
+          >)
+        , get(boost::vertex_index,graph))
+
+      (in_out(color_map)
+        , *(boost::is_same<
+              vertex_descriptor<graphs::graph::_>, key_type<_>
+          >)
+       , default_color_map(num_vertices(graph), index_map) )
+    )
+)
+#line 949 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+{}
+
+int main()
+{
+    typedef boost::adjacency_list<boost::vecS, boost::vecS, boost::directedS> G;
+
+    enum {u, v, w, x, y, z, N};
+    typedef std::pair<int, int> E;
+    E edges[] = {E(u, v), E(u, x), E(x, v), E(y, x), E(v, y), E(w, y),
+                 E(w,z), E(z, z)};
+    G g(edges, edges + sizeof(edges) / sizeof(E), N);
+
+    depth_first_search(g);
+    depth_first_search(g, _root_vertex = (int)x);
+}
+
--- a/test/literate/required-parameters0.cpp
+++ b/test/literate/required-parameters0.cpp
@@ -0,0 +1,12 @@
+
+#line 540 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#include <boost/parameter.hpp>
+
+BOOST_PARAMETER_NAME(graph)
+
+BOOST_PARAMETER_FUNCTION((void), f, tag,
+#line 531 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+(required (graph, *) )
+#line 547 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+) {}
+
--- a/test/literate/static-member-functions0.cpp
+++ b/test/literate/static-member-functions0.cpp
@@ -0,0 +1,16 @@
+
+#line 1206 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#include <boost/parameter.hpp>
+#include <iostream>
+using namespace boost::parameter;
+#line 1195 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+BOOST_PARAMETER_NAME(arg1)
+
+struct somebody
+{
+    BOOST_PARAMETER_MEMBER_FUNCTION(
+        (void), static f, tag, (optional (arg1,(int),0)))
+    {
+        std::cout << arg1 << std::endl;
+    }
+};
--- a/test/literate/template-keywords0.cpp
+++ b/test/literate/template-keywords0.cpp
@@ -0,0 +1,12 @@
+
+#line 1337 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#include <boost/parameter.hpp>
+#line 1329 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+namespace boost { namespace python {
+
+BOOST_PARAMETER_TEMPLATE_KEYWORD(class_type)
+BOOST_PARAMETER_TEMPLATE_KEYWORD(base_list)
+BOOST_PARAMETER_TEMPLATE_KEYWORD(held_type)
+BOOST_PARAMETER_TEMPLATE_KEYWORD(copyable)
+
+}}
--- a/test/literate/template-keywords1.cpp
+++ b/test/literate/template-keywords1.cpp
@@ -0,0 +1,13 @@
+
+#line 1353 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#include <boost/parameter.hpp>
+#line 1344 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+namespace boost { namespace python {
+
+namespace tag { struct class_type; } // keyword tag type
+template <class T>
+struct class_type
+  : parameter::template_keyword<tag::class_type,T>
+{};
+
+}}
--- a/test/literate/top-level0.cpp
+++ b/test/literate/top-level0.cpp
@@ -0,0 +1,40 @@
+
+#line 35 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#include <boost/parameter.hpp>
+
+namespace test
+{
+  BOOST_PARAMETER_NAME(title)
+  BOOST_PARAMETER_NAME(width)
+  BOOST_PARAMETER_NAME(titlebar)
+
+  BOOST_PARAMETER_FUNCTION(
+     (int), new_window, tag, (required (title,*)(width,*)(titlebar,*)))
+  {
+     return 0;
+  }
+
+  BOOST_PARAMETER_TEMPLATE_KEYWORD(deleter)
+  BOOST_PARAMETER_TEMPLATE_KEYWORD(copy_policy)
+
+  template <class T> struct Deallocate {};
+  struct DeepCopy {};
+
+  namespace parameter = boost::parameter;
+
+  struct Foo {};
+  template <class T, class A0, class A1>
+  struct smart_ptr
+  {
+      smart_ptr(Foo*);
+  };
+}
+using namespace test;
+int x = 
+#line 19
+new_window("alert", _width=10, _titlebar=false);
+
+smart_ptr<
+   Foo
+ , deleter<Deallocate<Foo> >
+ , copy_policy<DeepCopy> > p(new Foo);
--- a/test/literate/writing-the-function0.cpp
+++ b/test/literate/writing-the-function0.cpp
@@ -0,0 +1,45 @@
+
+#line 472 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#include <boost/parameter/name.hpp>
+
+BOOST_PARAMETER_NAME(graph)
+BOOST_PARAMETER_NAME(visitor)
+BOOST_PARAMETER_NAME(root_vertex)
+BOOST_PARAMETER_NAME(index_map)
+BOOST_PARAMETER_NAME(color_map)
+
+namespace boost {
+
+template <class T = int>
+struct dfs_visitor
+{};
+
+int vertex_index = 0;
+
+}
+#line 446 "/home/daniel/dev/boost/trunk/libs/parameter/doc/index.rst"
+#include <boost/parameter/preprocessor.hpp>
+
+namespace graphs
+{
+  BOOST_PARAMETER_FUNCTION(
+      (void),                // 1. parenthesized return type
+      depth_first_search,    // 2. name of the function template
+
+      tag,                   // 3. namespace of tag types
+
+      (required (graph, *) ) // 4. one required parameter, and
+
+      (optional              //    four optional parameters, with defaults
+        (visitor,           *, boost::dfs_visitor<>())
+        (root_vertex,       *, *vertices(graph).first)
+        (index_map,         *, get(boost::vertex_index,graph))
+        (in_out(color_map), *,
+          default_color_map(num_vertices(graph), index_map) )
+      )
+  )
+  {
+      // ... body of function goes here...
+      // use graph, visitor, index_map, and color_map
+  }
+}
--- a/test/macros.cpp
+++ b/test/macros.cpp
--- a/test/maybe.cpp
+++ b/test/maybe.cpp
--- a/test/mpl.cpp
+++ b/test/mpl.cpp
--- a/test/normalized_argument_types.cpp
+++ b/test/normalized_argument_types.cpp
--- a/test/ntp.cpp
+++ b/test/ntp.cpp
--- a/test/optional_deduced_sfinae.cpp
+++ b/test/optional_deduced_sfinae.cpp
--- a/test/preprocessor.cpp
+++ b/test/preprocessor.cpp
@@ -453,7 +453,7 @@ int main()
      , name = S("foo")
    );

-#ifndef BOOST_NO_SFINAE
+#if ! defined(BOOST_NO_SFINAE) && ! BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x592))
    assert(sfinae("foo") == 1);
    assert(sfinae(1) == 0);

--- a/test/preprocessor_deduced.cpp
+++ b/test/preprocessor_deduced.cpp
--- a/test/python_test.cpp
+++ b/test/python_test.cpp
--- a/test/sfinae.cpp
+++ b/test/sfinae.cpp
@@ -9,7 +9,7 @@
 #include <string>
 #include <boost/type_traits/is_convertible.hpp>

-#ifndef BOOST_NO_SFINAE
+#if ! defined(BOOST_NO_SFINAE) && ! BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x592))
 # include <boost/utility/enable_if.hpp>
 # include <boost/type_traits/is_same.hpp>
 #endif 
@@ -70,7 +70,7 @@ namespace test
      f_impl(args(a0, a1));
  }

-#ifndef BOOST_NO_SFINAE
+#if ! defined(BOOST_NO_SFINAE) && ! BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x592))
  // On compilers that actually support SFINAE, add another overload
  // that is an equally good match and can only be in the overload set
  // when the others are not.  This tests that the SFINAE is actually
@@ -96,7 +96,7 @@ int main()
    f("foo", 3.f);
    f(value = 3.f, name = "foo");

-#ifndef BOOST_NO_SFINAE
+#if ! defined(BOOST_NO_SFINAE) && ! BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x592))
    BOOST_TEST(f(3, 4) == 0);
 #endif
    return boost::report_errors();
--- a/test/singular.cpp
+++ b/test/singular.cpp
--- a/test/timings.txt
+++ b/test/timings.txt
--- a/test/tutorial.cpp
+++ b/test/tutorial.cpp
--- a/test/unwrap_cv_reference.cpp
+++ b/test/unwrap_cv_reference.cpp
Author	SHA1	Message	Date
Daniel James	a3c2f26522	Quickbook: Merge from trunk to quickbook-dev. [SVN r76255]	2012-01-01 13:35:27 +00:00
Daniel James	ca9906cd83	Quickbook: Merge from trunk to quickbook-dev. [SVN r75846]	2011-12-07 09:40:30 +00:00
Daniel James	a151206a9d	Quickbook: Merge from trunk to quickbook-dev [SVN r75739]	2011-11-30 01:35:25 +00:00
Daniel James	f252fa2b38	Quickbook: New branch for development. From now on this will be my development branch. [SVN r70613]	2011-03-27 10:17:05 +00:00
Daniel James	0b0ce28a8a	Parameter: Merge [62231] from release - missing includes. [SVN r70523]	2011-03-24 21:12:54 +00:00
Marshall Clow	15d8701d77	Fix typo in parameter doc, refs #4983 [SVN r68291]	2011-01-19 15:32:54 +00:00
Andrey Semashev	ee32bc6f67	Fixed test compilation with C++0x aware compilers. The bind and ref calls should be explicitly qualified with the boost namespace. [SVN r62241]	2010-05-26 16:30:14 +00:00
Andrey Semashev	c2177b122c	Decoupled arg_list and maybe. This removes a few dependencies on other headers and speeds up compilation. [SVN r62202]	2010-05-25 15:53:47 +00:00
Troy D. Straszheim	359b3a5c3a	Fix for #3490 , parameter depends on python. Use toplevel aligned_storage and copy in referent_storage metafunction from python's detail namespace. Passes all tests on gcc 4.3.3. [SVN r57057]	2009-10-22 03:55:24 +00:00
Troy D. Straszheim	522c1e33b0	rm cmake from trunk. I'm not entirely sure this is necessary to satisfy the inspect script, but I'm not taking any chances, and it is easy to put back [SVN r56942]	2009-10-17 02:07:38 +00:00
Troy D. Straszheim	298108e7ed	Copyrights on CMakeLists.txt to keep them from clogging up the inspect reports. This is essentially the same commit as r55095 on the release branch. [SVN r55159]	2009-07-26 00:49:56 +00:00
Jeremiah Willcock	ae3bfbad46	Fixed more links to property_map [SVN r53476]	2009-05-31 01:40:59 +00:00
Daniel Wallin	d8a61e4df7	Silence annoying GCC -Wshadow warnings. Fixes #3034. [SVN r53414]	2009-05-29 21:52:29 +00:00
Daniel Wallin	82b5cc0208	Silence "unused parameter" warning in BOOST_PARAMETER_FUNCTION(). Fixes #2808. [SVN r53402]	2009-05-29 18:06:46 +00:00
Daniel Wallin	91623e6241	parameter-doc: Regenerated HTML from ReST source. [SVN r50918]	2009-01-30 21:28:11 +00:00
Daniel Wallin	4af5c63d46	parameter-doc: Added missing default value on optional parameter specification. [SVN r50915]	2009-01-30 21:08:22 +00:00
David Deakins	1c2f56c672	Restored static-member-functions0 test [SVN r50890]	2009-01-30 05:55:10 +00:00
Dave Abrahams	08b0a74035	Check in missing file (thanks for pointing that out, David Deakins!) [SVN r50889]	2009-01-30 00:52:33 +00:00
David Deakins	4c8725641d	Commented out missing test file [SVN r50888]	2009-01-30 00:09:10 +00:00
Dave Abrahams	b91cd816c8	bug fix for value_type and numerous doc fixes, along with literate programming tests [SVN r50863]	2009-01-28 23:33:37 +00:00
Michael A. Jackson	f9a2fba9ab	Updating CMake files to latest trunk. Added dependency information for regression tests and a few new macros for internal use. [SVN r49627]	2008-11-07 17:02:56 +00:00
Michael A. Jackson	55792af45f	Continuing merge of CMake build system files into trunk with the encouragement of Doug Gregor [SVN r49510]	2008-11-01 13:15:41 +00:00
Dave Abrahams	e054a75533	Minor doc cleanups [SVN r46954]	2008-07-01 15:59:23 +00:00
Daniel Wallin	834f245953	Fixed #1044 . ArgumentPack is now available in the return type calculation [SVN r45226]	2008-05-08 20:04:24 +00:00
Eric Niebler	ef9dfeb2d1	add missing #include [SVN r44857]	2008-04-28 16:46:33 +00:00
Daniel James	98bcbbad78	Point links to the pages that used to be in 'more' to the site. [SVN r43210]	2008-02-10 15:02:17 +00:00
Daniel Wallin	d9f0e42397	Applied part of patch from Jens Seidel in: http://svn.boost.org/trac/boost/ticket/1541 . Fixed missing includes. [SVN r42415]	2008-01-02 17:20:44 +00:00
Markus Schöpflin	0a26a05500	Applied patch by Richard Webb from ticket #1541 . This fixes the latest parameter test failures. [SVN r42413]	2008-01-02 11:41:33 +00:00
Beman Dawes	2e725894c6	// Add or correct comment identifying Boost library this header is associated with. [SVN r41173]	2007-11-17 20:13:16 +00:00
Nicola Musatti	a4b2742095	Updated to support C++Builder 2007 Update 3 (bcc32 5.9.2) [SVN r39945]	2007-10-11 21:09:07 +00:00
Nicola Musatti	2af6d0439e	Updated to support C++Builder 2007 Update 3 (bcc32 5.9.2) [SVN r39944]	2007-10-11 21:07:17 +00:00
Douglas Gregor	276d786ed9	We can no longer use is_base_and_derived with incomplete types, not that it worked well before [SVN r39247]	2007-09-13 19:58:30 +00:00