Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r54700 - in trunk/libs/spirit: doc doc/html doc/html/spirit doc/html/spirit/abstracts doc/html/spirit/karma/quick_reference doc/html/spirit/karma/tutorials doc/html/spirit/lex doc/html/spirit/lex/abstracts doc/html/spirit/lex/abstracts/lexer_primitives doc/html/spirit/lex/reference doc/html/spirit/lex/reference/concepts doc/html/spirit/lex/tutorials doc/html/spirit/qi/quick_reference doc/html/spirit/qi/reference doc/html/spirit/qi/reference/concepts doc/html/spirit/qi/reference/string doc/html/spirit/qi/tutorials doc/karma doc/lex repository/doc
From: hartmut.kaiser_at_[hidden]
Date: 2009-07-05 22:23:29


Author: hkaiser
Date: 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
New Revision: 54700
URL: http://svn.boost.org/trac/boost/changeset/54700

Log:
Spirit: more doc updates
Text files modified:
   trunk/libs/spirit/doc/faq.qbk | 4 +-
   trunk/libs/spirit/doc/html/index.html | 4 +-
   trunk/libs/spirit/doc/html/spirit/abstracts/parsing_expression_grammar.html | 8 ++--
   trunk/libs/spirit/doc/html/spirit/abstracts/syntax_diagram.html | 10 +++---
   trunk/libs/spirit/doc/html/spirit/acknowledgments.html | 2
   trunk/libs/spirit/doc/html/spirit/faq.html | 4 +-
   trunk/libs/spirit/doc/html/spirit/introduction.html | 12 +++---
   trunk/libs/spirit/doc/html/spirit/karma/quick_reference/common_notation.html | 31 ++++++++----------
   trunk/libs/spirit/doc/html/spirit/karma/quick_reference/compound_attribute_rules.html | 12 +++---
   trunk/libs/spirit/doc/html/spirit/karma/quick_reference/lazy_arguments.html | 10 +++---
   trunk/libs/spirit/doc/html/spirit/karma/quick_reference/non_terminals.html | 12 +++---
   trunk/libs/spirit/doc/html/spirit/karma/quick_reference/phoenix.html | 18 +++++-----
   trunk/libs/spirit/doc/html/spirit/karma/quick_reference/predefined_primitive_generators.html | 2
   trunk/libs/spirit/doc/html/spirit/karma/quick_reference/semantic_actions.html | 14 ++++----
   trunk/libs/spirit/doc/html/spirit/karma/tutorials/quick_start.html | 2
   trunk/libs/spirit/doc/html/spirit/karma/tutorials/semantic_actions.html | 2
   trunk/libs/spirit/doc/html/spirit/karma/tutorials/warming_up.html | 10 +++---
   trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_primitives/lexer_token_values.html | 6 +-
   trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_semantic_actions.html | 10 +++---
   trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_states.html | 6 +-
   trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_static_model.html | 4 +-
   trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_tokenizing.html | 4 +-
   trunk/libs/spirit/doc/html/spirit/lex/lexer_introduction.html | 6 +-
   trunk/libs/spirit/doc/html/spirit/lex/reference/concepts/lexer.html | 6 +-
   trunk/libs/spirit/doc/html/spirit/lex/reference/lexer_class.html | 8 ++--
   trunk/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart1.html | 10 +++---
   trunk/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart2.html | 8 ++--
   trunk/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart3.html | 8 ++--
   trunk/libs/spirit/doc/html/spirit/preface.html | 18 +++++-----
   trunk/libs/spirit/doc/html/spirit/qi/quick_reference/compound_attribute_rules.html | 2
   trunk/libs/spirit/doc/html/spirit/qi/quick_reference/phoenix.html | 6 +-
   trunk/libs/spirit/doc/html/spirit/qi/reference/basics.html | 4 +-
   trunk/libs/spirit/doc/html/spirit/qi/reference/concepts/binaryparser.html | 12 +++---
   trunk/libs/spirit/doc/html/spirit/qi/reference/concepts/naryparser.html | 12 +++---
   trunk/libs/spirit/doc/html/spirit/qi/reference/concepts/parser.html | 10 +++---
   trunk/libs/spirit/doc/html/spirit/qi/reference/concepts/primitiveparser.html | 10 +++---
   trunk/libs/spirit/doc/html/spirit/qi/reference/concepts/unaryparser.html | 12 +++---
   trunk/libs/spirit/doc/html/spirit/qi/reference/string/lit_string.html | 16 +++++-----
   trunk/libs/spirit/doc/html/spirit/qi/reference/string/symbols.html | 18 +++++-----
   trunk/libs/spirit/doc/html/spirit/qi/tutorials/employee___parsing_into_structs.html | 14 ++++----
   trunk/libs/spirit/doc/html/spirit/qi/tutorials/mini_xml___asts_.html | 22 ++++++------
   trunk/libs/spirit/doc/html/spirit/qi/tutorials/mini_xml___error_handling.html | 6 +-
   trunk/libs/spirit/doc/html/spirit/qi/tutorials/quick_start.html | 2
   trunk/libs/spirit/doc/html/spirit/qi/tutorials/roman_numerals.html | 8 ++--
   trunk/libs/spirit/doc/html/spirit/qi/tutorials/semantic_actions.html | 2
   trunk/libs/spirit/doc/html/spirit/qi/tutorials/warming_up.html | 10 +++---
   trunk/libs/spirit/doc/html/spirit/what_s_new.html | 8 ++--
   trunk/libs/spirit/doc/karma/quick_reference.qbk | 63 +++++++++++++++++++--------------------
   trunk/libs/spirit/doc/lex/lexer_quickstart2.qbk | 8 ++--
   trunk/libs/spirit/doc/lex/lexer_quickstart3.qbk | 8 ++--
   trunk/libs/spirit/doc/lex/lexer_semantic_actions.qbk | 4 +-
   trunk/libs/spirit/doc/preface.qbk | 2
   trunk/libs/spirit/doc/spirit2.qbk | 2
   trunk/libs/spirit/repository/doc/spirit2_repository.qbk | 2
   54 files changed, 255 insertions(+), 259 deletions(-)

Modified: trunk/libs/spirit/doc/faq.qbk
==============================================================================
--- trunk/libs/spirit/doc/faq.qbk (original)
+++ trunk/libs/spirit/doc/faq.qbk 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -112,9 +112,9 @@
 directory directly, always include files from the boost/spirit/include
 directory.
 
-The last bit missing is __phoenix2__ (which currently still lives under the
+The last bit missing is __boost_phoenix__ (which currently still lives under the
 Spirit umbrella, but already has been accepted as a Boost library, so it will
-move away). __phoenix2__ is a library allowing to write functional style C++,
+move away). __boost_phoenix__ is a library allowing to write functional style C++,
 which is interesting on itself, but as it initially has been developed for
 Spirit, it is nicely integrated and very useful when it comes to writing
 semantic actions. I think using the boost/spirit/include/phoenix_... headers

Modified: trunk/libs/spirit/doc/html/index.html
==============================================================================
--- trunk/libs/spirit/doc/html/index.html (original)
+++ trunk/libs/spirit/doc/html/index.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -34,7 +34,7 @@
 <div><p class="copyright">Copyright © 2001-2009 Joel
       de Guzman, Hartmut Kaiser</p></div>
 <div><div class="legalnotice" title="Legal Notice">
-<a name="id1019553"></a><p>
+<a name="id1124411"></a><p>
         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)
       </p>
@@ -173,7 +173,7 @@
   </p>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: July 06, 2009 at 02:10:11 GMT</small></p></td>
+<td align="left"><p><small>Last revised: July 06, 2009 at 02:22:16 GMT</small></p></td>
 <td align="right"><div class="copyright-footer"></div></td>
 </tr></table>
 <hr>

Modified: trunk/libs/spirit/doc/html/spirit/abstracts/parsing_expression_grammar.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/abstracts/parsing_expression_grammar.html (original)
+++ trunk/libs/spirit/doc/html/spirit/abstracts/parsing_expression_grammar.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -40,7 +40,7 @@
         [Abstract Syntax Tree) for each PEG grammar.
       </p>
 <a name="spirit.abstracts.parsing_expression_grammar.sequences"></a><h5>
-<a name="id1028441"></a>
+<a name="id1133299"></a>
         <a class="link" href="parsing_expression_grammar.html#spirit.abstracts.parsing_expression_grammar.sequences">Sequences</a>
       </h5>
 <p>
@@ -81,7 +81,7 @@
         </p></td></tr>
 </table></div>
 <a name="spirit.abstracts.parsing_expression_grammar.alternatives"></a><h5>
-<a name="id1028559"></a>
+<a name="id1133417"></a>
         <a class="link" href="parsing_expression_grammar.html#spirit.abstracts.parsing_expression_grammar.alternatives">Alternatives</a>
       </h5>
 <p>
@@ -124,7 +124,7 @@
         about this $$$).
       </p>
 <a name="spirit.abstracts.parsing_expression_grammar.loops"></a><h5>
-<a name="id1028698"></a>
+<a name="id1133556"></a>
         <a class="link" href="parsing_expression_grammar.html#spirit.abstracts.parsing_expression_grammar.loops">Loops</a>
       </h5>
 <p>
@@ -187,7 +187,7 @@
         We will see more of these other mechanisms shortly.
       </p>
 <a name="spirit.abstracts.parsing_expression_grammar.difference"></a><h5>
-<a name="id1028839"></a>
+<a name="id1133696"></a>
         <a class="link" href="parsing_expression_grammar.html#spirit.abstracts.parsing_expression_grammar.difference">Difference</a>
       </h5>
 <p>

Modified: trunk/libs/spirit/doc/html/spirit/abstracts/syntax_diagram.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/abstracts/syntax_diagram.html (original)
+++ trunk/libs/spirit/doc/html/spirit/abstracts/syntax_diagram.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -31,14 +31,14 @@
         a variant of Extended Backus-Naur Form (EBNF) with a different interpretation.
         It is easier to understand PEG using Syntax Diagrams. Syntax diagrams represent
         a grammar graphically. It was used extensibly by Niklaus Wirth
- <sup>[<a name="id1028030" href="#ftn.id1028030" class="footnote">2</a>]</sup>
+ <sup>[<a name="id1132887" href="#ftn.id1132887" class="footnote">2</a>]</sup>
         in the "Pascal User Manual". Syntax Diagrams are easily understandable
         with programmers due to its similarity to flow charts. The isomorphism of
         the diagrams and functions make it ideal for representing [Recursive Descent
         parsers which are essentially mutually recursive functions.
       </p>
 <a name="spirit.abstracts.syntax_diagram.elements"></a><h5>
-<a name="id1028042"></a>
+<a name="id1132899"></a>
         <a class="link" href="syntax_diagram.html#spirit.abstracts.syntax_diagram.elements">Elements</a>
       </h5>
 <p>
@@ -82,7 +82,7 @@
         </p>
 </blockquote></div>
 <a name="spirit.abstracts.syntax_diagram.constructs"></a><h5>
-<a name="id1028141"></a>
+<a name="id1132999"></a>
         <a class="link" href="syntax_diagram.html#spirit.abstracts.syntax_diagram.constructs">Constructs</a>
       </h5>
 <p>
@@ -153,7 +153,7 @@
         This behavior is quite obvious with syntax diagrams as they resemble flow-charts.
       </p>
 <a name="spirit.abstracts.syntax_diagram.predicates"></a><h5>
-<a name="id1028302"></a>
+<a name="id1133160"></a>
         <a class="link" href="syntax_diagram.html#spirit.abstracts.syntax_diagram.predicates">Predicates</a>
       </h5>
 <p>
@@ -208,7 +208,7 @@
       </p>
 <div class="footnotes">
 <br><hr width="100" align="left">
-<div class="footnote"><p><sup>[<a name="ftn.id1028030" href="#id1028030" class="para">2</a>] </sup>
+<div class="footnote"><p><sup>[<a name="ftn.id1132887" href="#id1132887" class="para">2</a>] </sup>
             Niklaus Wirth: The Programming Language Pascal. (July 1973)
           </p></div>
 </div>

Modified: trunk/libs/spirit/doc/html/spirit/acknowledgments.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/acknowledgments.html (original)
+++ trunk/libs/spirit/doc/html/spirit/acknowledgments.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -47,7 +47,7 @@
       <span class="bold"><strong>FIXME</strong></span>: Add more people
     </p>
 <a name="spirit.acknowledgments.acknowledgements_from_the_spirit_v1__emphasis_classic__emphasis__documentation"></a><h4>
-<a name="id1115055"></a>
+<a name="id1219844"></a>
       <a class="link" href="acknowledgments.html#spirit.acknowledgments.acknowledgements_from_the_spirit_v1__emphasis_classic__emphasis__documentation">Acknowledgements
       from the Spirit V1 <span class="emphasis"><em>classic</em></span> Documentation</a>
     </h4>

Modified: trunk/libs/spirit/doc/html/spirit/faq.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/faq.html (original)
+++ trunk/libs/spirit/doc/html/spirit/faq.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -27,7 +27,7 @@
 <a name="spirit.faq"></a><a class="link" href="faq.html" title="Spirit FAQ"> Spirit FAQ</a>
 </h2></div></div></div>
 <a name="spirit.faq.i_m_getting_multiple_symbol_definition_errors_while_using_visual_c____anything_i_could_do_about_that_"></a><h4>
-<a name="id1113785"></a>
+<a name="id1218575"></a>
       <a class="link" href="faq.html#spirit.faq.i_m_getting_multiple_symbol_definition_errors_while_using_visual_c____anything_i_could_do_about_that_">I'm
       getting multiple symbol definition errors while using Visual C++. Anything
       I could do about that?</a>
@@ -64,7 +64,7 @@
       static_assert.
     </p>
 <a name="spirit.faq.i_m_very_confused_about_the_header_hell_in_my_boost_spirit_directory__what_s_all_this_about_"></a><h4>
-<a name="id1113955"></a>
+<a name="id1218745"></a>
       <a class="link" href="faq.html#spirit.faq.i_m_very_confused_about_the_header_hell_in_my_boost_spirit_directory__what_s_all_this_about_">I'm
       very confused about the header hell in my boost/spirit directory. What's all
       this about?</a>

Modified: trunk/libs/spirit/doc/html/spirit/introduction.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/introduction.html (original)
+++ trunk/libs/spirit/doc/html/spirit/introduction.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -30,7 +30,7 @@
       Boost Spirit is an object-oriented, recursive-descent parser and output generation
       library for C++. It allows you to write grammars and format descriptions using
       a format similar to Extended Backus Naur Form (EBNF)
- <sup>[<a name="id1025054" href="#ftn.id1025054" class="footnote">1</a>]</sup>
+ <sup>[<a name="id1129911" href="#ftn.id1129911" class="footnote">1</a>]</sup>
       directly in C++. These inline grammar specifications can mix freely with other
       C++ code and, thanks to the generative power of C++ templates, are immediately
       executable. In retrospect, conventional compiler-compilers or parser-generators
@@ -131,7 +131,7 @@
 <p><br class="figure-break">
     </p>
 <a name="spirit.introduction.a_quick_overview_of_parsing_with__emphasis_spirit_qi__emphasis_"></a><h4>
-<a name="id1025267"></a>
+<a name="id1130125"></a>
       <a class="link" href="introduction.html#spirit.introduction.a_quick_overview_of_parsing_with__emphasis_spirit_qi__emphasis_">A
       Quick Overview of Parsing with <span class="emphasis"><em>Spirit.Qi</em></span></a>
     </h4>
@@ -221,7 +221,7 @@
       <code class="computeroutput"><span class="special">;</span></code>.
     </p>
 <a name="spirit.introduction.a_quick_overview_of_output_generation_with__emphasis_spirit_karma__emphasis_"></a><h4>
-<a name="id1026220"></a>
+<a name="id1131078"></a>
       <a class="link" href="introduction.html#spirit.introduction.a_quick_overview_of_output_generation_with__emphasis_spirit_karma__emphasis_">A
       Quick Overview of Output Generation with <span class="emphasis"><em>Spirit.Karma</em></span></a>
     </h4>
@@ -254,7 +254,7 @@
       of the same <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;</span></code>:
     </p>
 <div class="table">
-<a name="id1026561"></a><p class="title"><b>Table 2. Different output formats for `std::vector&lt;int&gt;`</b></p>
+<a name="id1131419"></a><p class="title"><b>Table 2. Different output formats for `std::vector&lt;int&gt;`</b></p>
 <div class="table-contents"><table class="table" summary="Different output formats for `std::vector&lt;int&gt;`">
 <colgroup>
 <col>
@@ -369,7 +369,7 @@
       next table gives some related examples.
     </p>
 <div class="table">
-<a name="id1027208"></a><p class="title"><b>Table 3. Different data types usable with the output format
+<a name="id1132065"></a><p class="title"><b>Table 3. Different data types usable with the output format
     `*(int_ &lt;&lt; eol)`</b></p>
 <div class="table-contents"><table class="table" summary="Different data types usable with the output format
     `*(int_ &lt;&lt; eol)`">
@@ -439,7 +439,7 @@
 </div>
 <br class="table-break"><div class="footnotes">
 <br><hr width="100" align="left">
-<div class="footnote"><p><sup>[<a name="ftn.id1025054" href="#id1025054" class="para">1</a>] </sup>
+<div class="footnote"><p><sup>[<a name="ftn.id1129911" href="#id1129911" class="para">1</a>] </sup>
           <a href="http://www.cl.cam.ac.uk/%7Emgk25/iso-14977.pdf" target="_top">ISO-EBNF</a>
         </p></div>
 </div>

Modified: trunk/libs/spirit/doc/html/spirit/karma/quick_reference/common_notation.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/karma/quick_reference/common_notation.html (original)
+++ trunk/libs/spirit/doc/html/spirit/karma/quick_reference/common_notation.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -30,24 +30,24 @@
 <div class="variablelist" title="Notation">
 <p class="title"><b>Notation</b></p>
 <dl>
-<dt><span class="term"><code class="computeroutput"><span class="identifier">P</span></code></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">G</span></code></span></dt>
 <dd><p>
- Parser type
+ Generator type
             </p></dd>
-<dt><span class="term"><code class="computeroutput"><span class="identifier">p</span><span class="special">,</span> <span class="identifier">a</span><span class="special">,</span>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">g</span><span class="special">,</span> <span class="identifier">a</span><span class="special">,</span>
           <span class="identifier">b</span><span class="special">,</span>
           <span class="identifier">c</span></code></span></dt>
 <dd><p>
- Parser objects
+ Generator objects
             </p></dd>
 <dt><span class="term"><code class="computeroutput"><span class="identifier">A</span><span class="special">,</span> <span class="identifier">B</span><span class="special">,</span>
           <span class="identifier">C</span></code></span></dt>
 <dd><p>
- Attribute types of parsers A, B and C
+ Attribute types of generators A, B and C
             </p></dd>
 <dt><span class="term"><code class="computeroutput"><span class="identifier">I</span></code></span></dt>
 <dd><p>
- The iterator type used for parsing
+ The iterator type used for generation
             </p></dd>
 <dt><span class="term"><code class="computeroutput"><span class="identifier">Unused</span></code></span></dt>
 <dd><p>
@@ -66,23 +66,20 @@
 <dd><p>
               A boolean expression
             </p></dd>
-<dt><span class="term"><code class="computeroutput"><span class="identifier">fp</span></code></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">fg</span></code></span></dt>
 <dd><p>
- A (lazy parser) function with signature <code class="computeroutput"><span class="identifier">P</span><span class="special">(</span><span class="identifier">Unused</span><span class="special">,</span> <span class="identifier">Context</span><span class="special">)</span></code>
+ A (lazy generator) function with signature <code class="computeroutput"><span class="identifier">G</span><span class="special">(</span><span class="identifier">Unused</span><span class="special">,</span> <span class="identifier">Context</span><span class="special">)</span></code>
             </p></dd>
 <dt><span class="term"><code class="computeroutput"><span class="identifier">fa</span></code></span></dt>
 <dd><p>
- A (semantic action) function with signature <code class="computeroutput"><span class="keyword">void</span><span class="special">(</span><span class="identifier">Attr</span><span class="special">,</span> <span class="identifier">Context</span><span class="special">,</span> <span class="keyword">bool</span><span class="special">&amp;)</span></code>. The third parameter is a boolean
- flag that can be set to false to force the parse to fail. Both <code class="computeroutput"><span class="identifier">Context</span></code> and the boolean flag are
- optional.
+ A (semantic action) function with signature <code class="computeroutput"><span class="keyword">void</span><span class="special">(</span><span class="identifier">Attr</span><span class="special">&amp;,</span> <span class="identifier">Context</span><span class="special">,</span> <span class="keyword">bool</span><span class="special">&amp;)</span></code>. The third parameter is a boolean
+ flag that can be set to false to force the generator to fail. Both
+ <code class="computeroutput"><span class="identifier">Context</span></code> and the boolean
+ flag are optional.
             </p></dd>
-<dt><span class="term"><code class="computeroutput"><span class="identifier">first</span></code></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">outiter</span></code></span></dt>
 <dd><p>
- An iterator pointing to the start of input
- </p></dd>
-<dt><span class="term"><code class="computeroutput"><span class="identifier">last</span></code></span></dt>
-<dd><p>
- An iterator pointing to the end of input
+ An output iterator to receive the generated output
             </p></dd>
 <dt><span class="term"><code class="computeroutput"><span class="identifier">Ch</span></code></span></dt>
 <dd><p>

Modified: trunk/libs/spirit/doc/html/spirit/karma/quick_reference/compound_attribute_rules.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/karma/quick_reference/compound_attribute_rules.html (original)
+++ trunk/libs/spirit/doc/html/spirit/karma/quick_reference/compound_attribute_rules.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -30,18 +30,18 @@
 <p>
           The notation will be for instance:
         </p>
-<pre class="programlisting"><span class="identifier">a</span><span class="special">:</span> <span class="identifier">A</span><span class="special">,</span> <span class="identifier">b</span><span class="special">:</span> <span class="identifier">B</span> <span class="special">--&gt;</span> <span class="special">(</span><span class="identifier">a</span> <span class="special">&gt;&gt;</span> <span class="identifier">b</span><span class="special">):</span> <span class="identifier">tuple</span><span class="special">&lt;</span><span class="identifier">A</span><span class="special">,</span> <span class="identifier">B</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="identifier">a</span><span class="special">:</span> <span class="identifier">A</span><span class="special">,</span> <span class="identifier">b</span><span class="special">:</span> <span class="identifier">B</span> <span class="special">--&gt;</span> <span class="special">(</span><span class="identifier">a</span> <span class="special">&lt;&lt;</span> <span class="identifier">b</span><span class="special">):</span> <span class="identifier">tuple</span><span class="special">&lt;</span><span class="identifier">A</span><span class="special">,</span> <span class="identifier">B</span><span class="special">&gt;</span>
 </pre>
 <p>
           which reads as: given, <code class="computeroutput"><span class="identifier">a</span></code>
- and <code class="computeroutput"><span class="identifier">b</span></code> are parsers/generators,
- and <code class="computeroutput"><span class="identifier">A</span></code> is the type of the
- attribute of <code class="computeroutput"><span class="identifier">a</span></code>, and <code class="computeroutput"><span class="identifier">B</span></code> is the type of the attribute of <code class="computeroutput"><span class="identifier">b</span></code>, then the type of the attribute of
- <code class="computeroutput"><span class="identifier">a</span> <span class="special">&gt;&gt;</span>
+ and <code class="computeroutput"><span class="identifier">b</span></code> are generators, and
+ <code class="computeroutput"><span class="identifier">A</span></code> is the type of the attribute
+ of <code class="computeroutput"><span class="identifier">a</span></code>, and <code class="computeroutput"><span class="identifier">B</span></code> is the type of the attribute of <code class="computeroutput"><span class="identifier">b</span></code>, then the type of the attribute of
+ <code class="computeroutput"><span class="identifier">a</span> <span class="special">&lt;&lt;</span>
           <span class="identifier">b</span></code> will be <code class="computeroutput"><span class="identifier">tuple</span><span class="special">&lt;</span><span class="identifier">A</span><span class="special">,</span> <span class="identifier">B</span><span class="special">&gt;</span></code>.
         </p>
 <div class="table">
-<a name="id1082415"></a><p class="title"><b>Table 5. Spirit.Karma compound generator attribute types</b></p>
+<a name="id1187186"></a><p class="title"><b>Table 5. Spirit.Karma compound generator attribute types</b></p>
 <div class="table-contents"><table class="table" summary="Spirit.Karma compound generator attribute types">
 <colgroup>
 <col>

Modified: trunk/libs/spirit/doc/html/spirit/karma/quick_reference/lazy_arguments.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/karma/quick_reference/lazy_arguments.html (original)
+++ trunk/libs/spirit/doc/html/spirit/karma/quick_reference/lazy_arguments.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -29,12 +29,12 @@
 <p>
           For all expressions of the form:
         </p>
-<pre class="programlisting"><span class="identifier">p</span><span class="special">(</span><span class="identifier">a1</span><span class="special">,</span> <span class="identifier">a2</span><span class="special">,...</span> <span class="identifier">aN</span><span class="special">)</span>
+<pre class="programlisting"><span class="identifier">g</span><span class="special">(</span><span class="identifier">a1</span><span class="special">,</span> <span class="identifier">a2</span><span class="special">,...</span> <span class="identifier">aN</span><span class="special">)</span>
 </pre>
 <p>
- where <code class="computeroutput"><span class="identifier">p</span></code> is a parser, each
- of the arguments (a1...aN) can either be an immediate value, or a lazy
- function with signature:
+ where <code class="computeroutput"><span class="identifier">g</span></code> is a generator,
+ each of the arguments (a1...aN) can either be an immediate value, or a
+ lazy function with signature:
         </p>
 <pre class="programlisting"><span class="identifier">T</span><span class="special">(</span><span class="identifier">Unused</span><span class="special">,</span> <span class="identifier">Context</span><span class="special">)</span>
 </pre>
@@ -50,7 +50,7 @@
         </p>
 <pre class="programlisting"><span class="keyword">bool</span> <span class="identifier">flag</span> <span class="special">=</span> <span class="keyword">true</span><span class="special">;</span>
 <span class="identifier">eps</span><span class="special">(</span><span class="identifier">phoenix</span><span class="special">::</span><span class="identifier">var</span><span class="special">(</span><span class="identifier">flag</span><span class="special">))</span> <span class="comment">// success or fail depending on the value
-</span> <span class="comment">// of flag at parse time
+</span> <span class="comment">// of flag at generation time
 </span></pre>
 <p>
           since <code class="computeroutput"><span class="identifier">phoenix</span><span class="special">::</span><span class="identifier">ref</span><span class="special">(</span><span class="identifier">f</span><span class="special">)</span></code> is

Modified: trunk/libs/spirit/doc/html/spirit/karma/quick_reference/non_terminals.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/karma/quick_reference/non_terminals.html (original)
+++ trunk/libs/spirit/doc/html/spirit/karma/quick_reference/non_terminals.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -76,9 +76,9 @@
               <span class="identifier">LN</span><span class="special">&gt;</span></code>.
               The local variables.
             </p></dd>
-<dt><span class="term">Skipper</span></dt>
+<dt><span class="term">Delimiter</span></dt>
 <dd><p>
- The skip-parser type
+ The delimit-generator type
             </p></dd>
 </dl>
 </div>
@@ -233,7 +233,7 @@
 <td>
                 <p>
                   <code class="computeroutput"><span class="identifier">r</span> <span class="special">=</span>
- <span class="identifier">p</span><span class="special">;</span></code>
+ <span class="identifier">g</span><span class="special">;</span></code>
                 </p>
                 </td>
 <td>
@@ -246,13 +246,13 @@
 <td>
                 <p>
                   <code class="computeroutput"><span class="identifier">r</span> <span class="special">%=</span>
- <span class="identifier">p</span><span class="special">;</span></code>
+ <span class="identifier">g</span><span class="special">;</span></code>
                 </p>
                 </td>
 <td>
                 <p>
- Auto-rule definition. The attribute of <code class="computeroutput"><span class="identifier">p</span></code>
- should be compatible with the synthesized attribute of <code class="computeroutput"><span class="identifier">r</span></code>. When <code class="computeroutput"><span class="identifier">p</span></code>
+ Auto-rule definition. The attribute of <code class="computeroutput"><span class="identifier">g</span></code>
+ should be compatible with the synthesized attribute of <code class="computeroutput"><span class="identifier">r</span></code>. When <code class="computeroutput"><span class="identifier">g</span></code>
                   is successful, its attribute is automatically propagated to <code class="computeroutput"><span class="identifier">r</span></code>'s synthesized attribute.
                 </p>
                 </td>

Modified: trunk/libs/spirit/doc/html/spirit/karma/quick_reference/phoenix.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/karma/quick_reference/phoenix.html (original)
+++ trunk/libs/spirit/doc/html/spirit/karma/quick_reference/phoenix.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -27,23 +27,23 @@
 <a name="spirit.karma.quick_reference.phoenix"></a><a class="link" href="phoenix.html" title="Phoenix">Phoenix</a>
 </h4></div></div></div>
 <p>
- __boost<span class="underline">phoenix</span>_ makes it easier to
- attach semantic actions. You just inline your lambda expressions:
+ Phoenix2 makes it
+ easier to attach semantic actions. You just inline your lambda expressions:
         </p>
-<pre class="programlisting"><span class="identifier">p</span><span class="special">[</span><span class="identifier">phoenix</span><span class="special">-</span><span class="identifier">lambda</span><span class="special">-</span><span class="identifier">expression</span><span class="special">]</span>
+<pre class="programlisting"><span class="identifier">g</span><span class="special">[</span><span class="identifier">phoenix</span><span class="special">-</span><span class="identifier">lambda</span><span class="special">-</span><span class="identifier">expression</span><span class="special">]</span>
 </pre>
 <p>
- Spirit.Qi provides some __boost<span class="underline">phoenix</span>_
- placeholders to important information from the <code class="computeroutput"><span class="identifier">Attr</span></code>
+ <span class="emphasis"><em>Spirit.Karma</em></span> provides some Phoenix2
+ placeholders to access important information from the <code class="computeroutput"><span class="identifier">Attr</span></code>
           and <code class="computeroutput"><span class="identifier">Context</span></code> that are otherwise
           fiddly to extract.
         </p>
-<div class="variablelist" title="Spirit.Qi specific Phoenix placeholders">
-<p class="title"><b>Spirit.Qi specific Phoenix placeholders</b></p>
+<div class="variablelist" title="Spirit.Karma specific Phoenix placeholders">
+<p class="title"><b>Spirit.Karma specific Phoenix placeholders</b></p>
 <dl>
 <dt><span class="term"><code class="computeroutput"><span class="identifier">_1</span><span class="special">,</span> <span class="identifier">_2</span><span class="special">...</span> <span class="special">,</span> <span class="identifier">_N</span></code></span></dt>
 <dd><p>
- Nth attribute of <code class="computeroutput"><span class="identifier">p</span></code>
+ Nth attribute of <code class="computeroutput"><span class="identifier">g</span></code>
             </p></dd>
 <dt><span class="term"><code class="computeroutput"><span class="identifier">_val</span></code></span></dt>
 <dd><p>
@@ -64,7 +64,7 @@
             </p></dd>
 <dt><span class="term"><code class="computeroutput"><span class="identifier">_pass</span></code></span></dt>
 <dd><p>
- Assign <code class="computeroutput"><span class="keyword">false</span></code> to <code class="computeroutput"><span class="identifier">_pass</span></code> to force a parser failure.
+ Assign <code class="computeroutput"><span class="keyword">false</span></code> to <code class="computeroutput"><span class="identifier">_pass</span></code> to force a generator failure.
             </p></dd>
 </dl>
 </div>

Modified: trunk/libs/spirit/doc/html/spirit/karma/quick_reference/predefined_primitive_generators.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/karma/quick_reference/predefined_primitive_generators.html (original)
+++ trunk/libs/spirit/doc/html/spirit/karma/quick_reference/predefined_primitive_generators.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -138,7 +138,7 @@
                 </td>
 <td>
                 <p>
- Equivalent to <code class="computeroutput"><span class="identifier">lazy</span><span class="special">[</span><span class="identifier">fp</span><span class="special">]</span></code>
+ Equivalent to <code class="computeroutput"><span class="identifier">lazy</span><span class="special">[</span><span class="identifier">fg</span><span class="special">]</span></code>
                 </p>
                 </td>
 </tr>

Modified: trunk/libs/spirit/doc/html/spirit/karma/quick_reference/semantic_actions.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/karma/quick_reference/semantic_actions.html (original)
+++ trunk/libs/spirit/doc/html/spirit/karma/quick_reference/semantic_actions.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -30,24 +30,24 @@
 <p>
           Has the form:
         </p>
-<pre class="programlisting"><span class="identifier">p</span><span class="special">[</span><span class="identifier">f</span><span class="special">]</span>
+<pre class="programlisting"><span class="identifier">g</span><span class="special">[</span><span class="identifier">f</span><span class="special">]</span>
 </pre>
 <p>
           where <code class="computeroutput"><span class="identifier">f</span></code> is a function with
           the signatures:
         </p>
-<pre class="programlisting"><span class="keyword">void</span> <span class="identifier">f</span><span class="special">(</span><span class="identifier">Attr</span> <span class="keyword">const</span><span class="special">&amp;);</span>
-<span class="keyword">void</span> <span class="identifier">f</span><span class="special">(</span><span class="identifier">Attr</span> <span class="keyword">const</span><span class="special">&amp;,</span> <span class="identifier">Context</span><span class="special">&amp;);</span>
-<span class="keyword">void</span> <span class="identifier">f</span><span class="special">(</span><span class="identifier">Attr</span> <span class="keyword">const</span><span class="special">&amp;,</span> <span class="identifier">Context</span><span class="special">&amp;,</span> <span class="keyword">bool</span><span class="special">&amp;);</span>
+<pre class="programlisting"><span class="keyword">void</span> <span class="identifier">f</span><span class="special">(</span><span class="identifier">Attr</span><span class="special">&amp;);</span>
+<span class="keyword">void</span> <span class="identifier">f</span><span class="special">(</span><span class="identifier">Attr</span><span class="special">&amp;,</span> <span class="identifier">Context</span><span class="special">&amp;);</span>
+<span class="keyword">void</span> <span class="identifier">f</span><span class="special">(</span><span class="identifier">Attr</span><span class="special">&amp;,</span> <span class="identifier">Context</span><span class="special">&amp;,</span> <span class="keyword">bool</span><span class="special">&amp;);</span>
 </pre>
 <p>
           You can use <code class="computeroutput">Boost.Bind</code>
           to bind member functions. For function objects, the allowed signatures
           are:
         </p>
-<pre class="programlisting"><span class="keyword">void</span> <span class="keyword">operator</span><span class="special">()(</span><span class="identifier">Attr</span> <span class="keyword">const</span><span class="special">&amp;,</span> <span class="identifier">unused_type</span><span class="special">,</span> <span class="identifier">unused_type</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
-<span class="keyword">void</span> <span class="keyword">operator</span><span class="special">()(</span><span class="identifier">Attr</span> <span class="keyword">const</span><span class="special">&amp;,</span> <span class="identifier">Context</span><span class="special">&amp;,</span> <span class="identifier">unused_type</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
-<span class="keyword">void</span> <span class="keyword">operator</span><span class="special">()(</span><span class="identifier">Attr</span> <span class="keyword">const</span><span class="special">&amp;,</span> <span class="identifier">Context</span><span class="special">&amp;,</span> <span class="keyword">bool</span><span class="special">&amp;)</span> <span class="keyword">const</span><span class="special">;</span>
+<pre class="programlisting"><span class="keyword">void</span> <span class="keyword">operator</span><span class="special">()(</span><span class="identifier">Attr</span><span class="special">&amp;,</span> <span class="identifier">unused_type</span><span class="special">,</span> <span class="identifier">unused_type</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
+<span class="keyword">void</span> <span class="keyword">operator</span><span class="special">()(</span><span class="identifier">Attr</span><span class="special">&amp;,</span> <span class="identifier">Context</span><span class="special">&amp;,</span> <span class="identifier">unused_type</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
+<span class="keyword">void</span> <span class="keyword">operator</span><span class="special">()(</span><span class="identifier">Attr</span><span class="special">&amp;,</span> <span class="identifier">Context</span><span class="special">&amp;,</span> <span class="keyword">bool</span><span class="special">&amp;)</span> <span class="keyword">const</span><span class="special">;</span>
 </pre>
 <p>
           The <code class="computeroutput"><span class="identifier">unused_type</span></code> is used

Modified: trunk/libs/spirit/doc/html/spirit/karma/tutorials/quick_start.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/karma/tutorials/quick_start.html (original)
+++ trunk/libs/spirit/doc/html/spirit/karma/tutorials/quick_start.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -27,7 +27,7 @@
 <a name="spirit.karma.tutorials.quick_start"></a><a class="link" href="quick_start.html" title="Quick Start">Quick Start</a>
 </h4></div></div></div>
 <a name="spirit.karma.tutorials.quick_start.spirit_karma___what_s_that_"></a><h6>
-<a name="id1072626"></a>
+<a name="id1177484"></a>
           <a class="link" href="quick_start.html#spirit.karma.tutorials.quick_start.spirit_karma___what_s_that_">Spirit.Karma
           - what's that?</a>
         </h6>

Modified: trunk/libs/spirit/doc/html/spirit/karma/tutorials/semantic_actions.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/karma/tutorials/semantic_actions.html (original)
+++ trunk/libs/spirit/doc/html/spirit/karma/tutorials/semantic_actions.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -247,7 +247,7 @@
           The examples above can be found here: actions.cpp
         </p>
 <a name="spirit.karma.tutorials.semantic_actions.phoenix"></a><h6>
-<a name="id1074998"></a>
+<a name="id1179856"></a>
           <a class="link" href="semantic_actions.html#spirit.karma.tutorials.semantic_actions.phoenix">Phoenix</a>
         </h6>
 <p>

Modified: trunk/libs/spirit/doc/html/spirit/karma/tutorials/warming_up.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/karma/tutorials/warming_up.html (original)
+++ trunk/libs/spirit/doc/html/spirit/karma/tutorials/warming_up.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -31,7 +31,7 @@
           We will start from trivial examples, ramping up as we go.
         </p>
 <a name="spirit.karma.tutorials.warming_up.trivial_example__1_generating_a_number"></a><h6>
-<a name="id1072741"></a>
+<a name="id1177599"></a>
           <a class="link" href="warming_up.html#spirit.karma.tutorials.warming_up.trivial_example__1_generating_a_number">Trivial
           Example #1 Generating a number</a>
         </h6>
@@ -51,7 +51,7 @@
           to a floating point generator or parser: <code class="computeroutput"><span class="identifier">double_</span></code>.
         </p>
 <a name="spirit.karma.tutorials.warming_up.trivial_example__2_generating_two_numbers"></a><h6>
-<a name="id1072784"></a>
+<a name="id1177642"></a>
           <a class="link" href="warming_up.html#spirit.karma.tutorials.warming_up.trivial_example__2_generating_two_numbers">Trivial
           Example #2 Generating two numbers</a>
         </h6>
@@ -89,7 +89,7 @@
           </p></td></tr>
 </table></div>
 <a name="spirit.karma.tutorials.warming_up.trivial_example__3_generating_one_or_more_numbers"></a><h6>
-<a name="id1072870"></a>
+<a name="id1177727"></a>
           <a class="link" href="warming_up.html#spirit.karma.tutorials.warming_up.trivial_example__3_generating_one_or_more_numbers">Trivial
           Example #3 Generating one or more numbers</a>
         </h6>
@@ -114,7 +114,7 @@
           numbers, if needed.
         </p>
 <a name="spirit.karma.tutorials.warming_up.trivial_example__4_generating_a_comma_delimited_list_of_numbers"></a><h6>
-<a name="id1072918"></a>
+<a name="id1177775"></a>
           <a class="link" href="warming_up.html#spirit.karma.tutorials.warming_up.trivial_example__4_generating_a_comma_delimited_list_of_numbers">Trivial
           Example #4 Generating a comma-delimited list of numbers</a>
         </h6>
@@ -137,7 +137,7 @@
           in the generated output zero or more times.
         </p>
 <a name="spirit.karma.tutorials.warming_up.let_s_generate_"></a><h6>
-<a name="id1073052"></a>
+<a name="id1177910"></a>
           <a class="link" href="warming_up.html#spirit.karma.tutorials.warming_up.let_s_generate_">Let's
           Generate!</a>
         </h6>

Modified: trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_primitives/lexer_token_values.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_primitives/lexer_token_values.html (original)
+++ trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_primitives/lexer_token_values.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -51,7 +51,7 @@
             of the <span class="emphasis"><em>Spirit.Lex</em></span> library.
           </p>
 <a name="spirit.lex.abstracts.lexer_primitives.lexer_token_values.the_anatomy_of_a_token"></a><h6>
-<a name="id1099977"></a>
+<a name="id1204767"></a>
             <a class="link" href="lexer_token_values.html#spirit.lex.abstracts.lexer_primitives.lexer_token_values.the_anatomy_of_a_token">The
             Anatomy of a Token</a>
           </h6>
@@ -187,7 +187,7 @@
             when it is requested for the first time.
           </p>
 <a name="spirit.lex.abstracts.lexer_primitives.lexer_token_values.the_physiognomy_of_a_token_definition"></a><h6>
-<a name="id1100502"></a>
+<a name="id1205292"></a>
             <a class="link" href="lexer_token_values.html#spirit.lex.abstracts.lexer_primitives.lexer_token_values.the_physiognomy_of_a_token_definition">The
             Physiognomy of a Token Definition</a>
           </h6>
@@ -260,7 +260,7 @@
 </td></tr>
 </table></div>
 <a name="spirit.lex.abstracts.lexer_primitives.lexer_token_values.examples_of_using__link_linkend__spirit_lex_reference_token_class___code__phrase_role__identifier__lexertl_token__phrase__phrase_role__special___lt__gt___phrase___code___link_"></a><h6>
-<a name="id1100758"></a>
+<a name="id1205548"></a>
             <a class="link" href="lexer_token_values.html#spirit.lex.abstracts.lexer_primitives.lexer_token_values.examples_of_using__link_linkend__spirit_lex_reference_token_class___code__phrase_role__identifier__lexertl_token__phrase__phrase_role__special___lt__gt___phrase___code___link_">Examples
             of using <a class="link" href="../../reference/token_class.html" title="Token Class"><code class="computeroutput"><span class="identifier">lexertl_token</span><span class="special">&lt;&gt;</span></code></a></a>
           </h6>

Modified: trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_semantic_actions.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_semantic_actions.html (original)
+++ trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_semantic_actions.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -105,7 +105,7 @@
 <span class="keyword">void</span> <span class="identifier">f</span> <span class="special">();</span>
 </pre>
 <a name="spirit.lex.abstracts.lexer_semantic_actions.the_context_of_a_lexer_semantic_action"></a><h6>
-<a name="id1106407"></a>
+<a name="id1211197"></a>
           <a class="link" href="lexer_semantic_actions.html#spirit.lex.abstracts.lexer_semantic_actions.the_context_of_a_lexer_semantic_action">The
           context of a lexer semantic action</a>
         </h6>
@@ -120,7 +120,7 @@
           of the available functionality.
         </p>
 <div class="table">
-<a name="id1106427"></a><p class="title"><b>Table 6. Functions exposed by any context passed to a lexer
+<a name="id1211217"></a><p class="title"><b>Table 6. Functions exposed by any context passed to a lexer
         semantic action</b></p>
 <div class="table-contents"><table class="table" summary="Functions exposed by any context passed to a lexer
         semantic action">
@@ -241,7 +241,7 @@
 </table></div>
 </div>
 <br class="table-break"><a name="spirit.lex.abstracts.lexer_semantic_actions.lexer_semantic_actions_using_phoenix"></a><h6>
-<a name="id1106946"></a>
+<a name="id1211736"></a>
           <a class="link" href="lexer_semantic_actions.html#spirit.lex.abstracts.lexer_semantic_actions.lexer_semantic_actions_using_phoenix">Lexer
           Semantic Actions Using Phoenix</a>
         </h6>
@@ -253,7 +253,7 @@
           predefined Spirit placeholders:
         </p>
 <div class="table">
-<a name="id1106969"></a><p class="title"><b>Table 7. Predefined Phoenix placeholders for lexer semantic
+<a name="id1211758"></a><p class="title"><b>Table 7. Predefined Phoenix placeholders for lexer semantic
         actions</b></p>
 <div class="table-contents"><table class="table" summary="Predefined Phoenix placeholders for lexer semantic
         actions">
@@ -384,7 +384,7 @@
           table lists the available support functions and describes their functionality:
         </p>
 <div class="table">
-<a name="id1107247"></a><p class="title"><b>Table 8. Support functions usable from Phoenix expressions
+<a name="id1212037"></a><p class="title"><b>Table 8. Support functions usable from Phoenix expressions
         inside lexer semantic actions</b></p>
 <div class="table-contents"><table class="table" summary="Support functions usable from Phoenix expressions
         inside lexer semantic actions">

Modified: trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_states.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_states.html (original)
+++ trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_states.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -27,17 +27,17 @@
 <a name="spirit.lex.abstracts.lexer_states"></a><a class="link" href="lexer_states.html" title="Lexer States"> Lexer States</a>
 </h4></div></div></div>
 <a name="spirit.lex.abstracts.lexer_states.controlling_the_lexer_state_from_lexer_semantic_actions"></a><h6>
-<a name="id1111703"></a>
+<a name="id1216499"></a>
           <a class="link" href="lexer_states.html#spirit.lex.abstracts.lexer_states.controlling_the_lexer_state_from_lexer_semantic_actions">Controlling
           the Lexer State from Lexer Semantic Actions</a>
         </h6>
 <a name="spirit.lex.abstracts.lexer_states.controlling_the_lexer_state_from_parser_semantic_actions"></a><h6>
-<a name="id1111716"></a>
+<a name="id1216512"></a>
           <a class="link" href="lexer_states.html#spirit.lex.abstracts.lexer_states.controlling_the_lexer_state_from_parser_semantic_actions">Controlling
           the Lexer State from Parser Semantic Actions</a>
         </h6>
 <a name="spirit.lex.abstracts.lexer_states.using_a_lexer_state_for_the_skip_parser"></a><h6>
-<a name="id1111729"></a>
+<a name="id1216525"></a>
           <a class="link" href="lexer_states.html#spirit.lex.abstracts.lexer_states.using_a_lexer_state_for_the_skip_parser">Using
           a Lexer State for the Skip Parser</a>
         </h6>

Modified: trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_static_model.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_static_model.html (original)
+++ trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_static_model.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -176,7 +176,7 @@
 <p>
         </p>
 <a name="spirit.lex.abstracts.lexer_static_model.generating_the_static_analyzer"></a><h6>
-<a name="id1110376"></a>
+<a name="id1215172"></a>
           <a class="link" href="lexer_static_model.html#spirit.lex.abstracts.lexer_static_model.generating_the_static_analyzer">Generating
           the Static Analyzer</a>
         </h6>
@@ -225,7 +225,7 @@
           the next topic (the full generated code can be viewed here).
         </p>
 <a name="spirit.lex.abstracts.lexer_static_model.modifying_the_dynamic_analyzer"></a><h6>
-<a name="id1110703"></a>
+<a name="id1215499"></a>
           <a class="link" href="lexer_static_model.html#spirit.lex.abstracts.lexer_static_model.modifying_the_dynamic_analyzer">Modifying
           the Dynamic Analyzer</a>
         </h6>

Modified: trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_tokenizing.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_tokenizing.html (original)
+++ trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_tokenizing.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -28,7 +28,7 @@
         Input Data</a>
 </h4></div></div></div>
 <a name="spirit.lex.abstracts.lexer_tokenizing.the_tokenize_function"></a><h6>
-<a name="id1101285"></a>
+<a name="id1206075"></a>
           <a class="link" href="lexer_tokenizing.html#spirit.lex.abstracts.lexer_tokenizing.the_tokenize_function">The
           tokenize function</a>
         </h6>
@@ -228,7 +228,7 @@
 </dl>
 </div>
 <a name="spirit.lex.abstracts.lexer_tokenizing.the_generate_static_function"></a><h6>
-<a name="id1105755"></a>
+<a name="id1210544"></a>
           <a class="link" href="lexer_tokenizing.html#spirit.lex.abstracts.lexer_tokenizing.the_generate_static_function">The
           generate_static function</a>
         </h6>

Modified: trunk/libs/spirit/doc/html/spirit/lex/lexer_introduction.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/lex/lexer_introduction.html (original)
+++ trunk/libs/spirit/doc/html/spirit/lex/lexer_introduction.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -56,7 +56,7 @@
         </li>
 </ul></div>
 <a name="spirit.lex.lexer_introduction.why_use_a_separate_lexer_"></a><h5>
-<a name="id1087716"></a>
+<a name="id1192529"></a>
         <a class="link" href="lexer_introduction.html#spirit.lex.lexer_introduction.why_use_a_separate_lexer_">Why
         Use a Separate Lexer?</a>
       </h5>
@@ -155,7 +155,7 @@
         grammar recognizers.
       </p>
 <a name="spirit.lex.lexer_introduction.advantages_of_using__emphasis_spirit_lex__emphasis_"></a><h5>
-<a name="id1087925"></a>
+<a name="id1192738"></a>
         <a class="link" href="lexer_introduction.html#spirit.lex.lexer_introduction.advantages_of_using__emphasis_spirit_lex__emphasis_">Advantages
         of using <span class="emphasis"><em>Spirit.Lex</em></span></a>
       </h5>
@@ -203,7 +203,7 @@
         application.
       </p>
 <a name="spirit.lex.lexer_introduction.the_library_structure_of__emphasis_spirit_lex__emphasis_"></a><h5>
-<a name="id1088028"></a>
+<a name="id1192841"></a>
         <a class="link" href="lexer_introduction.html#spirit.lex.lexer_introduction.the_library_structure_of__emphasis_spirit_lex__emphasis_">The
         Library Structure of <span class="emphasis"><em>Spirit.Lex</em></span></a>
       </h5>

Modified: trunk/libs/spirit/doc/html/spirit/lex/reference/concepts/lexer.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/lex/reference/concepts/lexer.html (original)
+++ trunk/libs/spirit/doc/html/spirit/lex/reference/concepts/lexer.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -27,7 +27,7 @@
 <a name="spirit.lex.reference.concepts.lexer"></a><a class="link" href="lexer.html" title="Lexer">Lexer</a>
 </h5></div></div></div>
 <div class="table">
-<a name="id1111781"></a><p class="title"><b>Table 9. Regular expressions support</b></p>
+<a name="id1216577"></a><p class="title"><b>Table 9. Regular expressions support</b></p>
 <div class="table-contents"><table class="table" summary="Regular expressions support">
 <colgroup>
 <col>
@@ -502,7 +502,7 @@
             </p></td></tr>
 </table></div>
 <a name="spirit.lex.reference.concepts.lexer.regular_expression_precedence"></a><h6>
-<a name="id1113461"></a>
+<a name="id1218251"></a>
             <a class="link" href="lexer.html#spirit.lex.reference.concepts.lexer.regular_expression_precedence">Regular
             Expression Precedence</a>
           </h6>
@@ -521,7 +521,7 @@
             </li>
 </ul></div>
 <a name="spirit.lex.reference.concepts.lexer.macros"></a><h6>
-<a name="id1113564"></a>
+<a name="id1218354"></a>
             <a class="link" href="lexer.html#spirit.lex.reference.concepts.lexer.macros">Macros</a>
           </h6>
 <p>

Modified: trunk/libs/spirit/doc/html/spirit/lex/reference/lexer_class.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/lex/reference/lexer_class.html (original)
+++ trunk/libs/spirit/doc/html/spirit/lex/reference/lexer_class.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -27,22 +27,22 @@
 <a name="spirit.lex.reference.lexer_class"></a><a class="link" href="lexer_class.html" title="Lexer Class">Lexer Class</a>
 </h4></div></div></div>
 <a name="spirit.lex.reference.lexer_class.the_lexertl_lexer_class_implementing_the_dynamic_model"></a><h6>
-<a name="id1113686"></a>
+<a name="id1218476"></a>
           <a class="link" href="lexer_class.html#spirit.lex.reference.lexer_class.the_lexertl_lexer_class_implementing_the_dynamic_model">The
           lexertl_lexer Class Implementing the Dynamic Model</a>
         </h6>
 <a name="spirit.lex.reference.lexer_class.the_lexertl_actor_lexer_class_implementing_the_dynamic_model"></a><h6>
-<a name="id1113700"></a>
+<a name="id1218489"></a>
           <a class="link" href="lexer_class.html#spirit.lex.reference.lexer_class.the_lexertl_actor_lexer_class_implementing_the_dynamic_model">The
           lexertl_actor_lexer Class Implementing the Dynamic Model</a>
         </h6>
 <a name="spirit.lex.reference.lexer_class.the_lexertl_static_lexer_class_implementing_the_static_model"></a><h6>
-<a name="id1113713"></a>
+<a name="id1218503"></a>
           <a class="link" href="lexer_class.html#spirit.lex.reference.lexer_class.the_lexertl_static_lexer_class_implementing_the_static_model">The
           lexertl_static_lexer Class Implementing the Static Model</a>
         </h6>
 <a name="spirit.lex.reference.lexer_class.the_lexertl_static_actor_lexer_class_implementing_the_static_model"></a><h6>
-<a name="id1113726"></a>
+<a name="id1218516"></a>
           <a class="link" href="lexer_class.html#spirit.lex.reference.lexer_class.the_lexertl_static_actor_lexer_class_implementing_the_static_model">The
           lexertl_static_actor_lexer Class Implementing the Static Model</a>
         </h6>

Modified: trunk/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart1.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart1.html (original)
+++ trunk/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart1.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -39,7 +39,7 @@
           (for the full example code see here: word_count_functor.cpp).
         </p>
 <a name="spirit.lex.tutorials.lexer_quickstart1.prerequisites"></a><h6>
-<a name="id1088297"></a>
+<a name="id1193110"></a>
           <a class="link" href="lexer_quickstart1.html#spirit.lex.tutorials.lexer_quickstart1.prerequisites">Prerequisites</a>
         </h6>
 <p>
@@ -78,7 +78,7 @@
 <p>
         </p>
 <a name="spirit.lex.tutorials.lexer_quickstart1.defining_tokens"></a><h6>
-<a name="id1088541"></a>
+<a name="id1193355"></a>
           <a class="link" href="lexer_quickstart1.html#spirit.lex.tutorials.lexer_quickstart1.defining_tokens">Defining
           Tokens</a>
         </h6>
@@ -133,7 +133,7 @@
 <p>
         </p>
 <a name="spirit.lex.tutorials.lexer_quickstart1.doing_the_useful_work"></a><h6>
-<a name="id1088850"></a>
+<a name="id1193663"></a>
           <a class="link" href="lexer_quickstart1.html#spirit.lex.tutorials.lexer_quickstart1.doing_the_useful_work">Doing
           the Useful Work</a>
         </h6>
@@ -198,7 +198,7 @@
           as well.
         </p>
 <a name="spirit.lex.tutorials.lexer_quickstart1.pulling_everything_together"></a><h6>
-<a name="id1090941"></a>
+<a name="id1195737"></a>
           <a class="link" href="lexer_quickstart1.html#spirit.lex.tutorials.lexer_quickstart1.pulling_everything_together">Pulling
           Everything Together</a>
         </h6>
@@ -251,7 +251,7 @@
 <p>
         </p>
 <a name="spirit.lex.tutorials.lexer_quickstart1.comparing__emphasis_spirit_lex__emphasis__with__ulink_url__http___flex_sourceforge_net___flex__ulink_"></a><h6>
-<a name="id1091768"></a>
+<a name="id1196564"></a>
           <a class="link" href="lexer_quickstart1.html#spirit.lex.tutorials.lexer_quickstart1.comparing__emphasis_spirit_lex__emphasis__with__ulink_url__http___flex_sourceforge_net___flex__ulink_">Comparing
           <span class="emphasis"><em>Spirit.Lex</em></span> with Flex</a>
         </h6>

Modified: trunk/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart2.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart2.html (original)
+++ trunk/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart2.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -40,7 +40,7 @@
           options along the lines (for the full example code see here: word_count_lexer.cpp).
         </p>
 <a name="spirit.lex.tutorials.lexer_quickstart2.prerequisites"></a><h6>
-<a name="id1092543"></a>
+<a name="id1197339"></a>
           <a class="link" href="lexer_quickstart2.html#spirit.lex.tutorials.lexer_quickstart2.prerequisites">Prerequisites</a>
         </h6>
 <p>
@@ -114,7 +114,7 @@
 <p>
         </p>
 <a name="spirit.lex.tutorials.lexer_quickstart2.semantic_actions_in__emphasis_spirit_lex__emphasis_"></a><h6>
-<a name="id1094294"></a>
+<a name="id1199091"></a>
           <a class="link" href="lexer_quickstart2.html#spirit.lex.tutorials.lexer_quickstart2.semantic_actions_in__emphasis_spirit_lex__emphasis_">Semantic
           Actions in <span class="emphasis"><em>Spirit.Lex</em></span></a>
         </h6>
@@ -173,7 +173,7 @@
           Semantic Actions</a>.
         </p>
 <a name="spirit.lex.tutorials.lexer_quickstart2.associating_token_definitions_with_the_lexer"></a><h6>
-<a name="id1094912"></a>
+<a name="id1199709"></a>
           <a class="link" href="lexer_quickstart2.html#spirit.lex.tutorials.lexer_quickstart2.associating_token_definitions_with_the_lexer">Associating
           Token Definitions with the Lexer</a>
         </h6>
@@ -209,7 +209,7 @@
           with the constant defined by <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">spirit</span><span class="special">::</span><span class="identifier">lex</span><span class="special">::</span><span class="identifier">min_token_id</span></code>.
         </p>
 <a name="spirit.lex.tutorials.lexer_quickstart2.pulling_everything_together"></a><h6>
-<a name="id1095200"></a>
+<a name="id1199997"></a>
           <a class="link" href="lexer_quickstart2.html#spirit.lex.tutorials.lexer_quickstart2.pulling_everything_together">Pulling
           everything together</a>
         </h6>

Modified: trunk/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart3.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart3.html (original)
+++ trunk/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart3.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -65,7 +65,7 @@
           code see here: word_count.cpp).
         </p>
 <a name="spirit.lex.tutorials.lexer_quickstart3.prerequisites"></a><h6>
-<a name="id1097014"></a>
+<a name="id1201810"></a>
           <a class="link" href="lexer_quickstart3.html#spirit.lex.tutorials.lexer_quickstart3.prerequisites">Prerequisites</a>
         </h6>
 <p>
@@ -115,7 +115,7 @@
 <p>
         </p>
 <a name="spirit.lex.tutorials.lexer_quickstart3.defining_tokens"></a><h6>
-<a name="id1097444"></a>
+<a name="id1202241"></a>
           <a class="link" href="lexer_quickstart3.html#spirit.lex.tutorials.lexer_quickstart3.defining_tokens">Defining
           Tokens</a>
         </h6>
@@ -168,7 +168,7 @@
 <p>
         </p>
 <a name="spirit.lex.tutorials.lexer_quickstart3.using_token_definition_instances_as_parsers"></a><h6>
-<a name="id1097782"></a>
+<a name="id1202578"></a>
           <a class="link" href="lexer_quickstart3.html#spirit.lex.tutorials.lexer_quickstart3.using_token_definition_instances_as_parsers">Using
           Token Definition Instances as Parsers</a>
         </h6>
@@ -339,7 +339,7 @@
           </p></td></tr>
 </table></div>
 <a name="spirit.lex.tutorials.lexer_quickstart3.pulling_everything_together"></a><h6>
-<a name="id1098727"></a>
+<a name="id1203524"></a>
           <a class="link" href="lexer_quickstart3.html#spirit.lex.tutorials.lexer_quickstart3.pulling_everything_together">Pulling
           Everything Together</a>
         </h6>

Modified: trunk/libs/spirit/doc/html/spirit/preface.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/preface.html (original)
+++ trunk/libs/spirit/doc/html/spirit/preface.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -41,11 +41,11 @@
       </p>
 </blockquote></div>
 <a name="spirit.preface.history"></a><h4>
-<a name="id1019607"></a>
+<a name="id1124465"></a>
       <a class="link" href="preface.html#spirit.preface.history">History</a>
     </h4>
 <a name="spirit.preface._emphasis_80s__emphasis_"></a><h4>
-<a name="id1019620"></a>
+<a name="id1124478"></a>
       <a class="link" href="preface.html#spirit.preface._emphasis_80s__emphasis_"><span class="emphasis"><em>80s</em></span></a>
     </h4>
 <p>
@@ -59,7 +59,7 @@
       parser. This worked very well.
     </p>
 <a name="spirit.preface._emphasis_90s__emphasis_"></a><h4>
-<a name="id1019638"></a>
+<a name="id1124496"></a>
       <a class="link" href="preface.html#spirit.preface._emphasis_90s__emphasis_"><span class="emphasis"><em>90s</em></span></a>
     </h4>
 <p>
@@ -97,7 +97,7 @@
       here: pre-Spirit.
     </p>
 <a name="spirit.preface._emphasis_2001_to_2006__emphasis_"></a><h4>
-<a name="id1019680"></a>
+<a name="id1124538"></a>
       <a class="link" href="preface.html#spirit.preface._emphasis_2001_to_2006__emphasis_"><span class="emphasis"><em>2001
       to 2006</em></span></a>
     </h4>
@@ -127,7 +127,7 @@
       for design and implementation quality, robustness, and reusability.
     </p>
 <a name="spirit.preface._emphasis_2007__emphasis_"></a><h4>
-<a name="id1019715"></a>
+<a name="id1124573"></a>
       <a class="link" href="preface.html#spirit.preface._emphasis_2007__emphasis_"><span class="emphasis"><em>2007</em></span></a>
     </h4>
 <p>
@@ -164,7 +164,7 @@
       gives you the right ingredients to create a sledgehammer easily.
     </p>
 <a name="spirit.preface.new_ideas__spirit_v2"></a><h4>
-<a name="id1019791"></a>
+<a name="id1124648"></a>
       <a class="link" href="preface.html#spirit.preface.new_ideas__spirit_v2">New Ideas: Spirit V2</a>
     </h4>
 <p>
@@ -202,7 +202,7 @@
       same underlying component library as for the parser and generator libraries.
     </p>
 <a name="spirit.preface.how_to_use_this_manual"></a><h4>
-<a name="id1019841"></a>
+<a name="id1124699"></a>
       <a class="link" href="preface.html#spirit.preface.how_to_use_this_manual">How to use this manual</a>
     </h4>
 <p>
@@ -233,7 +233,7 @@
       icons precede some text to indicate:
     </p>
 <div class="table">
-<a name="id1019894"></a><p class="title"><b>Table 1. Icons</b></p>
+<a name="id1124752"></a><p class="title"><b>Table 1. Icons</b></p>
 <div class="table-contents"><table class="table" summary="Icons">
 <colgroup>
 <col>
@@ -354,7 +354,7 @@
       Tools</a>.
     </p>
 <a name="spirit.preface.support"></a><h4>
-<a name="id1020135"></a>
+<a name="id1124993"></a>
       <a class="link" href="preface.html#spirit.preface.support">Support</a>
     </h4>
 <p>

Modified: trunk/libs/spirit/doc/html/spirit/qi/quick_reference/compound_attribute_rules.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi/quick_reference/compound_attribute_rules.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi/quick_reference/compound_attribute_rules.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -41,7 +41,7 @@
           <span class="identifier">b</span></code> will be <code class="computeroutput"><span class="identifier">tuple</span><span class="special">&lt;</span><span class="identifier">A</span><span class="special">,</span> <span class="identifier">B</span><span class="special">&gt;</span></code>.
         </p>
 <div class="table">
-<a name="id1057738"></a><p class="title"><b>Table 4. compound parser attribute types</b></p>
+<a name="id1162596"></a><p class="title"><b>Table 4. compound parser attribute types</b></p>
 <div class="table-contents"><table class="table" summary="compound parser attribute types">
 <colgroup>
 <col>

Modified: trunk/libs/spirit/doc/html/spirit/qi/quick_reference/phoenix.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi/quick_reference/phoenix.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi/quick_reference/phoenix.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -27,13 +27,13 @@
 <a name="spirit.qi.quick_reference.phoenix"></a><a class="link" href="phoenix.html" title="Phoenix">Phoenix</a>
 </h4></div></div></div>
 <p>
- __boost<span class="underline">phoenix</span>_ makes it easier to
- attach semantic actions. You just inline your lambda expressions:
+ Phoenix2 makes it
+ easier to attach semantic actions. You just inline your lambda expressions:
         </p>
 <pre class="programlisting"><span class="identifier">p</span><span class="special">[</span><span class="identifier">phoenix</span><span class="special">-</span><span class="identifier">lambda</span><span class="special">-</span><span class="identifier">expression</span><span class="special">]</span>
 </pre>
 <p>
- Spirit.Qi provides some __boost<span class="underline">phoenix</span>_
+ Spirit.Qi provides some Phoenix2
           placeholders to important information from the <code class="computeroutput"><span class="identifier">Attr</span></code>
           and <code class="computeroutput"><span class="identifier">Context</span></code> that are otherwise
           fiddly to extract.

Modified: trunk/libs/spirit/doc/html/spirit/qi/reference/basics.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi/reference/basics.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi/reference/basics.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -27,7 +27,7 @@
 <a name="spirit.qi.reference.basics"></a><a class="link" href="basics.html" title="Basics">Basics</a>
 </h4></div></div></div>
 <a name="spirit.qi.reference.basics.lazy_argument"></a><h6>
-<a name="id1068118"></a>
+<a name="id1172976"></a>
           <a class="link" href="basics.html#spirit.qi.reference.basics.lazy_argument">Lazy Argument</a>
         </h6>
 <p>
@@ -51,7 +51,7 @@
           second argument. This is done for uniformity with Semantic Actions).
         </p>
 <a name="spirit.qi.reference.basics.character_encoding_namespace"></a><h6>
-<a name="id1068255"></a>
+<a name="id1173113"></a>
           <a class="link" href="basics.html#spirit.qi.reference.basics.character_encoding_namespace">Character
           Encoding Namespace</a>
         </h6>

Modified: trunk/libs/spirit/doc/html/spirit/qi/reference/concepts/binaryparser.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi/reference/concepts/binaryparser.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi/reference/concepts/binaryparser.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -27,7 +27,7 @@
 <a name="spirit.qi.reference.concepts.binaryparser"></a><a class="link" href="binaryparser.html" title="BinaryParser">BinaryParser</a>
 </h5></div></div></div>
 <a name="spirit.qi.reference.concepts.binaryparser.description"></a><h6>
-<a name="id1065758"></a>
+<a name="id1170616"></a>
             <a class="link" href="binaryparser.html#spirit.qi.reference.concepts.binaryparser.description">Description</a>
           </h6>
 <p>
@@ -39,7 +39,7 @@
             Design Pattern.
           </p>
 <a name="spirit.qi.reference.concepts.binaryparser.refinement_of"></a><h6>
-<a name="id1065809"></a>
+<a name="id1170666"></a>
             <a class="link" href="binaryparser.html#spirit.qi.reference.concepts.binaryparser.refinement_of">Refinement
             of</a>
           </h6>
@@ -66,7 +66,7 @@
 </dl>
 </div>
 <a name="spirit.qi.reference.concepts.binaryparser.valid_expressions"></a><h6>
-<a name="id1065888"></a>
+<a name="id1170746"></a>
             <a class="link" href="binaryparser.html#spirit.qi.reference.concepts.binaryparser.valid_expressions">Valid
             Expressions</a>
           </h6>
@@ -135,7 +135,7 @@
 </tbody>
 </table></div>
 <a name="spirit.qi.reference.concepts.binaryparser.type_expressions"></a><h6>
-<a name="id1066054"></a>
+<a name="id1170911"></a>
             <a class="link" href="binaryparser.html#spirit.qi.reference.concepts.binaryparser.type_expressions">Type
             Expressions</a>
           </h6>
@@ -200,7 +200,7 @@
 </tbody>
 </table></div>
 <a name="spirit.qi.reference.concepts.binaryparser.invariants"></a><h6>
-<a name="id1066254"></a>
+<a name="id1171112"></a>
             <a class="link" href="binaryparser.html#spirit.qi.reference.concepts.binaryparser.invariants">Invariants</a>
           </h6>
 <p>
@@ -216,7 +216,7 @@
 </li>
 </ul></div>
 <a name="spirit.qi.reference.concepts.binaryparser.models"></a><h6>
-<a name="id1066391"></a>
+<a name="id1171248"></a>
             <a class="link" href="binaryparser.html#spirit.qi.reference.concepts.binaryparser.models">Models</a>
           </h6>
 <p>

Modified: trunk/libs/spirit/doc/html/spirit/qi/reference/concepts/naryparser.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi/reference/concepts/naryparser.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi/reference/concepts/naryparser.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -27,7 +27,7 @@
 <a name="spirit.qi.reference.concepts.naryparser"></a><a class="link" href="naryparser.html" title="NaryParser">NaryParser</a>
 </h5></div></div></div>
 <a name="spirit.qi.reference.concepts.naryparser.description"></a><h6>
-<a name="id1066420"></a>
+<a name="id1171277"></a>
             <a class="link" href="naryparser.html#spirit.qi.reference.concepts.naryparser.description">Description</a>
           </h6>
 <p>
@@ -37,7 +37,7 @@
             Design Pattern.
           </p>
 <a name="spirit.qi.reference.concepts.naryparser.refinement_of"></a><h6>
-<a name="id1066454"></a>
+<a name="id1171312"></a>
             <a class="link" href="naryparser.html#spirit.qi.reference.concepts.naryparser.refinement_of">Refinement
             of</a>
           </h6>
@@ -64,7 +64,7 @@
 </dl>
 </div>
 <a name="spirit.qi.reference.concepts.naryparser.valid_expressions"></a><h6>
-<a name="id1066534"></a>
+<a name="id1171391"></a>
             <a class="link" href="naryparser.html#spirit.qi.reference.concepts.naryparser.valid_expressions">Valid
             Expressions</a>
           </h6>
@@ -115,7 +115,7 @@
 </tr></tbody>
 </table></div>
 <a name="spirit.qi.reference.concepts.naryparser.type_expressions"></a><h6>
-<a name="id1066658"></a>
+<a name="id1171516"></a>
             <a class="link" href="naryparser.html#spirit.qi.reference.concepts.naryparser.type_expressions">Type
             Expressions</a>
           </h6>
@@ -168,7 +168,7 @@
 </tbody>
 </table></div>
 <a name="spirit.qi.reference.concepts.naryparser.invariants"></a><h6>
-<a name="id1066826"></a>
+<a name="id1171684"></a>
             <a class="link" href="naryparser.html#spirit.qi.reference.concepts.naryparser.invariants">Invariants</a>
           </h6>
 <p>
@@ -182,7 +182,7 @@
 <pre class="programlisting"><span class="identifier">traits</span><span class="special">::</span><span class="identifier">is_parser</span><span class="special">&lt;</span><span class="identifier">E</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">evaluates</span> <span class="identifier">to</span> <span class="error">`</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></pre>
 </li></ul></div>
 <a name="spirit.qi.reference.concepts.naryparser.models"></a><h6>
-<a name="id1068088"></a>
+<a name="id1172946"></a>
             <a class="link" href="naryparser.html#spirit.qi.reference.concepts.naryparser.models">Models</a>
           </h6>
 <p>

Modified: trunk/libs/spirit/doc/html/spirit/qi/reference/concepts/parser.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi/reference/concepts/parser.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi/reference/concepts/parser.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -27,7 +27,7 @@
 <a name="spirit.qi.reference.concepts.parser"></a><a class="link" href="parser.html" title="Parser">Parser</a>
 </h5></div></div></div>
 <a name="spirit.qi.reference.concepts.parser.description"></a><h6>
-<a name="id1063516"></a>
+<a name="id1168374"></a>
             <a class="link" href="parser.html#spirit.qi.reference.concepts.parser.description">Description</a>
           </h6>
 <p>
@@ -82,7 +82,7 @@
 </dl>
 </div>
 <a name="spirit.qi.reference.concepts.parser.valid_expressions"></a><h6>
-<a name="id1063777"></a>
+<a name="id1168634"></a>
             <a class="link" href="parser.html#spirit.qi.reference.concepts.parser.valid_expressions">Valid
             Expressions</a>
           </h6>
@@ -162,7 +162,7 @@
 </tbody>
 </table></div>
 <a name="spirit.qi.reference.concepts.parser.type_expressions"></a><h6>
-<a name="id1064040"></a>
+<a name="id1168897"></a>
             <a class="link" href="parser.html#spirit.qi.reference.concepts.parser.type_expressions">Type
             Expressions</a>
           </h6>
@@ -215,7 +215,7 @@
 </tbody>
 </table></div>
 <a name="spirit.qi.reference.concepts.parser.postcondition"></a><h6>
-<a name="id1064783"></a>
+<a name="id1169640"></a>
             <a class="link" href="parser.html#spirit.qi.reference.concepts.parser.postcondition">Postcondition</a>
           </h6>
 <p>
@@ -249,7 +249,7 @@
             </li>
 </ul></div>
 <a name="spirit.qi.reference.concepts.parser.models"></a><h6>
-<a name="id1064908"></a>
+<a name="id1169765"></a>
             <a class="link" href="parser.html#spirit.qi.reference.concepts.parser.models">Models</a>
           </h6>
 <p>

Modified: trunk/libs/spirit/doc/html/spirit/qi/reference/concepts/primitiveparser.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi/reference/concepts/primitiveparser.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi/reference/concepts/primitiveparser.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -27,7 +27,7 @@
 <a name="spirit.qi.reference.concepts.primitiveparser"></a><a class="link" href="primitiveparser.html" title="PrimitiveParser">PrimitiveParser</a>
 </h5></div></div></div>
 <a name="spirit.qi.reference.concepts.primitiveparser.description"></a><h6>
-<a name="id1064942"></a>
+<a name="id1169800"></a>
             <a class="link" href="primitiveparser.html#spirit.qi.reference.concepts.primitiveparser.description">Description</a>
           </h6>
 <p>
@@ -35,7 +35,7 @@
             that the client uses to build more complex parsers.
           </p>
 <a name="spirit.qi.reference.concepts.primitiveparser.refinement_of"></a><h6>
-<a name="id1064968"></a>
+<a name="id1169825"></a>
             <a class="link" href="primitiveparser.html#spirit.qi.reference.concepts.primitiveparser.refinement_of">Refinement
             of</a>
           </h6>
@@ -49,7 +49,7 @@
             </p>
 </blockquote></div>
 <a name="spirit.qi.reference.concepts.primitiveparser.pre_skip"></a><h6>
-<a name="id1065004"></a>
+<a name="id1169861"></a>
             <a class="link" href="primitiveparser.html#spirit.qi.reference.concepts.primitiveparser.pre_skip">Pre-skip</a>
           </h6>
 <p>
@@ -63,7 +63,7 @@
 <pre class="programlisting"><span class="identifier">qi</span><span class="special">::</span><span class="identifier">skip_over</span><span class="special">(</span><span class="identifier">f</span><span class="special">,</span> <span class="identifier">l</span><span class="special">,</span> <span class="identifier">skip</span><span class="special">);</span>
 </pre>
 <a name="spirit.qi.reference.concepts.primitiveparser.type_expressions"></a><h6>
-<a name="id1065095"></a>
+<a name="id1169952"></a>
             <a class="link" href="primitiveparser.html#spirit.qi.reference.concepts.primitiveparser.type_expressions">Type
             Expressions</a>
           </h6>
@@ -102,7 +102,7 @@
 </tr></tbody>
 </table></div>
 <a name="spirit.qi.reference.concepts.primitiveparser.models"></a><h6>
-<a name="id1065230"></a>
+<a name="id1170088"></a>
             <a class="link" href="primitiveparser.html#spirit.qi.reference.concepts.primitiveparser.models">Models</a>
           </h6>
 <p>

Modified: trunk/libs/spirit/doc/html/spirit/qi/reference/concepts/unaryparser.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi/reference/concepts/unaryparser.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi/reference/concepts/unaryparser.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -27,7 +27,7 @@
 <a name="spirit.qi.reference.concepts.unaryparser"></a><a class="link" href="unaryparser.html" title="UnaryParser">UnaryParser</a>
 </h5></div></div></div>
 <a name="spirit.qi.reference.concepts.unaryparser.description"></a><h6>
-<a name="id1065262"></a>
+<a name="id1170119"></a>
             <a class="link" href="unaryparser.html#spirit.qi.reference.concepts.unaryparser.description">Description</a>
           </h6>
 <p>
@@ -36,7 +36,7 @@
             the Delegate Design Pattern.
           </p>
 <a name="spirit.qi.reference.concepts.unaryparser.refinement_of"></a><h6>
-<a name="id1065282"></a>
+<a name="id1170140"></a>
             <a class="link" href="unaryparser.html#spirit.qi.reference.concepts.unaryparser.refinement_of">Refinement
             of</a>
           </h6>
@@ -63,7 +63,7 @@
 </dl>
 </div>
 <a name="spirit.qi.reference.concepts.unaryparser.valid_expressions"></a><h6>
-<a name="id1065361"></a>
+<a name="id1170219"></a>
             <a class="link" href="unaryparser.html#spirit.qi.reference.concepts.unaryparser.valid_expressions">Valid
             Expressions</a>
           </h6>
@@ -113,7 +113,7 @@
 </tr></tbody>
 </table></div>
 <a name="spirit.qi.reference.concepts.unaryparser.type_expressions"></a><h6>
-<a name="id1065480"></a>
+<a name="id1170338"></a>
             <a class="link" href="unaryparser.html#spirit.qi.reference.concepts.unaryparser.type_expressions">Type
             Expressions</a>
           </h6>
@@ -166,7 +166,7 @@
 </tbody>
 </table></div>
 <a name="spirit.qi.reference.concepts.unaryparser.invariants"></a><h6>
-<a name="id1065647"></a>
+<a name="id1170504"></a>
             <a class="link" href="unaryparser.html#spirit.qi.reference.concepts.unaryparser.invariants">Invariants</a>
           </h6>
 <p>
@@ -177,7 +177,7 @@
 <code class="computeroutput"><span class="identifier">traits</span><span class="special">::</span><span class="identifier">is_parser</span><span class="special">&lt;</span><span class="identifier">P</span><span class="special">::</span><span class="identifier">subject_type</span><span class="special">&gt;::</span><span class="identifier">type</span></code> evaluates to <code class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></code>
 </li></ul></div>
 <a name="spirit.qi.reference.concepts.unaryparser.models"></a><h6>
-<a name="id1065730"></a>
+<a name="id1170587"></a>
             <a class="link" href="unaryparser.html#spirit.qi.reference.concepts.unaryparser.models">Models</a>
           </h6>
 <p>

Modified: trunk/libs/spirit/doc/html/spirit/qi/reference/string/lit_string.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi/reference/string/lit_string.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi/reference/string/lit_string.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -27,7 +27,7 @@
 <a name="spirit.qi.reference.string.lit_string"></a><a class="link" href="lit_string.html" title="lit/string">lit/string</a>
 </h5></div></div></div>
 <a name="spirit.qi.reference.string.lit_string.description"></a><h6>
-<a name="id1068415"></a>
+<a name="id1173272"></a>
             <a class="link" href="lit_string.html#spirit.qi.reference.string.lit_string.description">Description</a>
           </h6>
 <p>
@@ -36,14 +36,14 @@
             parser is not applied in between characters of the string.
           </p>
 <a name="spirit.qi.reference.string.lit_string.header"></a><h6>
-<a name="id1068439"></a>
+<a name="id1173296"></a>
             <a class="link" href="lit_string.html#spirit.qi.reference.string.lit_string.header">Header</a>
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">spirit</span><span class="special">/</span><span class="identifier">home</span><span class="special">/</span><span class="identifier">qi</span><span class="special">/</span><span class="identifier">string</span><span class="special">/</span><span class="identifier">lit</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span> <span class="comment">// main include
 </span><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">spirit</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">qi_lit</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span> <span class="comment">// or, forwarding header
 </span></pre>
 <a name="spirit.qi.reference.string.lit_string.module_headers"></a><h6>
-<a name="id1068568"></a>
+<a name="id1173426"></a>
             <a class="link" href="lit_string.html#spirit.qi.reference.string.lit_string.module_headers">Module
             Headers</a>
           </h6>
@@ -56,7 +56,7 @@
             Also, see <a class="link" href="../../../structure/include.html" title="Include">Include Structure</a>.
           </p>
 <a name="spirit.qi.reference.string.lit_string.model_of"></a><h6>
-<a name="id1068798"></a>
+<a name="id1173655"></a>
             <a class="link" href="lit_string.html#spirit.qi.reference.string.lit_string.model_of">Model
             of</a>
           </h6>
@@ -91,7 +91,7 @@
 </dl>
 </div>
 <a name="spirit.qi.reference.string.lit_string.expression_semantics"></a><h6>
-<a name="id1068933"></a>
+<a name="id1173791"></a>
             <a class="link" href="lit_string.html#spirit.qi.reference.string.lit_string.expression_semantics">Expression
             Semantics</a>
           </h6>
@@ -201,7 +201,7 @@
 </tbody>
 </table></div>
 <a name="spirit.qi.reference.string.lit_string.attributes"></a><h6>
-<a name="id1069284"></a>
+<a name="id1174141"></a>
             <a class="link" href="lit_string.html#spirit.qi.reference.string.lit_string.attributes">Attributes</a>
           </h6>
 <div class="informaltable"><table class="table">
@@ -305,7 +305,7 @@
 </tbody>
 </table></div>
 <a name="spirit.qi.reference.string.lit_string.complexity"></a><h6>
-<a name="id1069710"></a>
+<a name="id1174567"></a>
             <a class="link" href="lit_string.html#spirit.qi.reference.string.lit_string.complexity">Complexity</a>
           </h6>
 <div class="blockquote"><blockquote class="blockquote">
@@ -322,7 +322,7 @@
             of characters in the string to be parsed.
           </p>
 <a name="spirit.qi.reference.string.lit_string.example"></a><h6>
-<a name="id1069744"></a>
+<a name="id1174602"></a>
             <a class="link" href="lit_string.html#spirit.qi.reference.string.lit_string.example">Example</a>
           </h6>
 <p>

Modified: trunk/libs/spirit/doc/html/spirit/qi/reference/string/symbols.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi/reference/string/symbols.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi/reference/string/symbols.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -27,7 +27,7 @@
 <a name="spirit.qi.reference.string.symbols"></a><a class="link" href="symbols.html" title="symbols">symbols</a>
 </h5></div></div></div>
 <a name="spirit.qi.reference.string.symbols.description"></a><h6>
-<a name="id1071456"></a>
+<a name="id1176314"></a>
             <a class="link" href="symbols.html#spirit.qi.reference.string.symbols.description">Description</a>
           </h6>
 <p>
@@ -47,14 +47,14 @@
             its behavior.
           </p>
 <a name="spirit.qi.reference.string.symbols.header"></a><h6>
-<a name="id1071491"></a>
+<a name="id1176348"></a>
             <a class="link" href="symbols.html#spirit.qi.reference.string.symbols.header">Header</a>
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">spirit</span><span class="special">/</span><span class="identifier">home</span><span class="special">/</span><span class="identifier">qi</span><span class="special">/</span><span class="identifier">string</span><span class="special">/</span><span class="identifier">symbols</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span> <span class="comment">// main include
 </span><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">spirit</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">qi_symbols</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span> <span class="comment">// or, forwarding header
 </span></pre>
 <a name="spirit.qi.reference.string.symbols.module_headers"></a><h6>
-<a name="id1071620"></a>
+<a name="id1176478"></a>
             <a class="link" href="symbols.html#spirit.qi.reference.string.symbols.module_headers">Module
             Headers</a>
           </h6>
@@ -67,14 +67,14 @@
             Also, see <a class="link" href="../../../structure/include.html" title="Include">Include Structure</a>.
           </p>
 <a name="spirit.qi.reference.string.symbols.synopsis"></a><h6>
-<a name="id1071850"></a>
+<a name="id1176707"></a>
             <a class="link" href="symbols.html#spirit.qi.reference.string.symbols.synopsis">Synopsis</a>
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Char</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">symbols</span><span class="special">;</span>
 </pre>
 <a name="spirit.qi.reference.string.symbols.template_parameters"></a><h6>
-<a name="id1071914"></a>
+<a name="id1176772"></a>
             <a class="link" href="symbols.html#spirit.qi.reference.string.symbols.template_parameters">Template
             parameters</a>
           </h6>
@@ -139,7 +139,7 @@
 </tbody>
 </table></div>
 <a name="spirit.qi.reference.string.symbols.model_of"></a><h6>
-<a name="id1072042"></a>
+<a name="id1176899"></a>
             <a class="link" href="symbols.html#spirit.qi.reference.string.symbols.model_of">Model of</a>
           </h6>
 <div class="blockquote"><blockquote class="blockquote">
@@ -187,7 +187,7 @@
 </dl>
 </div>
 <a name="spirit.qi.reference.string.symbols.expression_semantics"></a><h6>
-<a name="id1072254"></a>
+<a name="id1177112"></a>
             <a class="link" href="symbols.html#spirit.qi.reference.string.symbols.expression_semantics">Expression
             Semantics</a>
           </h6>
@@ -279,14 +279,14 @@
 </tbody>
 </table></div>
 <a name="spirit.qi.reference.string.symbols.attributes"></a><h6>
-<a name="id1072523"></a>
+<a name="id1177380"></a>
             <a class="link" href="symbols.html#spirit.qi.reference.string.symbols.attributes">Attributes</a>
           </h6>
 <p>
             The attribute of <code class="computeroutput"><span class="identifier">stymbol</span><span class="special">&lt;</span><span class="identifier">Char</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;</span></code> is always <code class="computeroutput"><span class="identifier">T</span></code>.
           </p>
 <a name="spirit.qi.reference.string.symbols.example"></a><h6>
-<a name="id1072573"></a>
+<a name="id1177431"></a>
             <a class="link" href="symbols.html#spirit.qi.reference.string.symbols.example">Example</a>
           </h6>
 <p>

Modified: trunk/libs/spirit/doc/html/spirit/qi/tutorials/employee___parsing_into_structs.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi/tutorials/employee___parsing_into_structs.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi/tutorials/employee___parsing_into_structs.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -179,7 +179,7 @@
           has a <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span></code> attribute.
         </p>
 <a name="spirit.qi.tutorials.employee___parsing_into_structs.lexeme"></a><h6>
-<a name="id1042563"></a>
+<a name="id1147421"></a>
           <a class="link" href="employee___parsing_into_structs.html#spirit.qi.tutorials.employee___parsing_into_structs.lexeme">Lexeme</a>
         </h6>
 <pre class="programlisting"><span class="identifier">lexeme</span><span class="special">[</span><span class="char">'"'</span> <span class="special">&gt;&gt;</span> <span class="special">+(</span><span class="identifier">char_</span> <span class="special">-</span> <span class="char">'"'</span><span class="special">)</span> <span class="special">&gt;&gt;</span> <span class="char">'"'</span><span class="special">];</span>
@@ -196,7 +196,7 @@
           a double quote.
         </p>
 <a name="spirit.qi.tutorials.employee___parsing_into_structs.difference"></a><h6>
-<a name="id1042676"></a>
+<a name="id1147534"></a>
           <a class="link" href="employee___parsing_into_structs.html#spirit.qi.tutorials.employee___parsing_into_structs.difference">Difference</a>
         </h6>
 <p>
@@ -215,7 +215,7 @@
           is just <code class="computeroutput"><span class="keyword">char</span></code>.
         </p>
 <a name="spirit.qi.tutorials.employee___parsing_into_structs.plus"></a><h6>
-<a name="id1042784"></a>
+<a name="id1147642"></a>
           <a class="link" href="employee___parsing_into_structs.html#spirit.qi.tutorials.employee___parsing_into_structs.plus">Plus</a>
         </h6>
 <pre class="programlisting"><span class="special">+</span><span class="identifier">a</span>
@@ -234,7 +234,7 @@
 <pre class="programlisting"><span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special">&lt;</span><span class="keyword">char</span><span class="special">&gt;</span>
 </pre>
 <a name="spirit.qi.tutorials.employee___parsing_into_structs.sequence_attribute"></a><h6>
-<a name="id1042910"></a>
+<a name="id1147768"></a>
           <a class="link" href="employee___parsing_into_structs.html#spirit.qi.tutorials.employee___parsing_into_structs.sequence_attribute">Sequence
           Attribute</a>
         </h6>
@@ -275,7 +275,7 @@
           </p></td></tr>
 </table></div>
 <a name="spirit.qi.tutorials.employee___parsing_into_structs.attribute_collapsing"></a><h6>
-<a name="id1043132"></a>
+<a name="id1147990"></a>
           <a class="link" href="employee___parsing_into_structs.html#spirit.qi.tutorials.employee___parsing_into_structs.attribute_collapsing">Attribute
           Collapsing</a>
         </h6>
@@ -307,7 +307,7 @@
 <pre class="programlisting"><span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special">&lt;</span><span class="keyword">char</span><span class="special">&gt;</span>
 </pre>
 <a name="spirit.qi.tutorials.employee___parsing_into_structs.auto_rules"></a><h6>
-<a name="id1043371"></a>
+<a name="id1148228"></a>
           <a class="link" href="employee___parsing_into_structs.html#spirit.qi.tutorials.employee___parsing_into_structs.auto_rules">Auto
           Rules</a>
         </h6>
@@ -345,7 +345,7 @@
           directly into the rule's attribute, in-situ.
         </p>
 <a name="spirit.qi.tutorials.employee___parsing_into_structs.finally"></a><h6>
-<a name="id1043690"></a>
+<a name="id1148548"></a>
           <a class="link" href="employee___parsing_into_structs.html#spirit.qi.tutorials.employee___parsing_into_structs.finally">Finally</a>
         </h6>
 <p>

Modified: trunk/libs/spirit/doc/html/spirit/qi/tutorials/mini_xml___asts_.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi/tutorials/mini_xml___asts_.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi/tutorials/mini_xml___asts_.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -69,7 +69,7 @@
           for testing purposes. "4.toyxml" has an error in it.
         </p>
 <a name="spirit.qi.tutorials.mini_xml___asts_.first_cut"></a><h6>
-<a name="id1045772"></a>
+<a name="id1150630"></a>
           <a class="link" href="mini_xml___asts_.html#spirit.qi.tutorials.mini_xml___asts_.first_cut">First Cut</a>
         </h6>
 <p>
@@ -145,7 +145,7 @@
           by the placeholder <code class="computeroutput"><span class="identifier">_val</span></code>).
         </p>
 <a name="spirit.qi.tutorials.mini_xml___asts_.alternates"></a><h6>
-<a name="id1046953"></a>
+<a name="id1151811"></a>
           <a class="link" href="mini_xml___asts_.html#spirit.qi.tutorials.mini_xml___asts_.alternates">Alternates</a>
         </h6>
 <pre class="programlisting"><span class="identifier">rule</span><span class="special">&lt;</span><span class="identifier">Iterator</span><span class="special">,</span> <span class="identifier">mini_xml_node</span><span class="special">(),</span> <span class="identifier">space_type</span><span class="special">&gt;</span> <span class="identifier">node</span><span class="special">;</span>
@@ -175,7 +175,7 @@
 <span class="special">;</span>
 </pre>
 <a name="spirit.qi.tutorials.mini_xml___asts_.not_predicate"></a><h6>
-<a name="id1047281"></a>
+<a name="id1152138"></a>
           <a class="link" href="mini_xml___asts_.html#spirit.qi.tutorials.mini_xml___asts_.not_predicate">Not
           Predicate</a>
         </h6>
@@ -202,7 +202,7 @@
           at this point.
         </p>
 <a name="spirit.qi.tutorials.mini_xml___asts_.inherited_attribute"></a><h6>
-<a name="id1047435"></a>
+<a name="id1152293"></a>
           <a class="link" href="mini_xml___asts_.html#spirit.qi.tutorials.mini_xml___asts_.inherited_attribute">Inherited
           Attribute</a>
         </h6>
@@ -228,7 +228,7 @@
           <code class="computeroutput"><span class="identifier">_r3</span></code>, etc. if you have more).
         </p>
 <a name="spirit.qi.tutorials.mini_xml___asts_.a_lazy_lit"></a><h6>
-<a name="id1047630"></a>
+<a name="id1152487"></a>
           <a class="link" href="mini_xml___asts_.html#spirit.qi.tutorials.mini_xml___asts_.a_lazy_lit">A Lazy
           Lit</a>
         </h6>
@@ -262,7 +262,7 @@
           accessors, provided by Phoenix.
         </p>
 <a name="spirit.qi.tutorials.mini_xml___asts_.how_it_all_works"></a><h6>
-<a name="id1047966"></a>
+<a name="id1152823"></a>
           <a class="link" href="mini_xml___asts_.html#spirit.qi.tutorials.mini_xml___asts_.how_it_all_works">How
           it all works</a>
         </h6>
@@ -309,7 +309,7 @@
           as <code class="computeroutput"><span class="identifier">_r1</span></code>.
         </p>
 <a name="spirit.qi.tutorials.mini_xml___asts_.the_structures"></a><h6>
-<a name="id1048262"></a>
+<a name="id1153120"></a>
           <a class="link" href="mini_xml___asts_.html#spirit.qi.tutorials.mini_xml___asts_.the_structures">The
           Structures</a>
         </h6>
@@ -342,7 +342,7 @@
 <p>
         </p>
 <a name="spirit.qi.tutorials.mini_xml___asts_.of_alternates_and_variants"></a><h6>
-<a name="id1048458"></a>
+<a name="id1153315"></a>
           <a class="link" href="mini_xml___asts_.html#spirit.qi.tutorials.mini_xml___asts_.of_alternates_and_variants">Of
           Alternates and Variants</a>
         </h6>
@@ -369,7 +369,7 @@
           of <code class="computeroutput"><span class="identifier">a</span></code> and <code class="computeroutput"><span class="identifier">B</span></code> is the attribute of <code class="computeroutput"><span class="identifier">b</span></code>.
         </p>
 <a name="spirit.qi.tutorials.mini_xml___asts_.adapting_structs_again"></a><h6>
-<a name="id1048638"></a>
+<a name="id1153495"></a>
           <a class="link" href="mini_xml___asts_.html#spirit.qi.tutorials.mini_xml___asts_.adapting_structs_again">Adapting
           structs again</a>
         </h6>
@@ -395,7 +395,7 @@
 <p>
         </p>
 <a name="spirit.qi.tutorials.mini_xml___asts_.one_more_take"></a><h6>
-<a name="id1048778"></a>
+<a name="id1153636"></a>
           <a class="link" href="mini_xml___asts_.html#spirit.qi.tutorials.mini_xml___asts_.one_more_take">One
           More Take</a>
         </h6>
@@ -464,7 +464,7 @@
           in the <code class="computeroutput"><span class="identifier">xml</span></code> rule:
         </p>
 <a name="spirit.qi.tutorials.mini_xml___asts_.local_variables"></a><h6>
-<a name="id1049694"></a>
+<a name="id1154551"></a>
           <a class="link" href="mini_xml___asts_.html#spirit.qi.tutorials.mini_xml___asts_.local_variables">Local
           Variables</a>
         </h6>

Modified: trunk/libs/spirit/doc/html/spirit/qi/tutorials/mini_xml___error_handling.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi/tutorials/mini_xml___error_handling.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi/tutorials/mini_xml___error_handling.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -44,7 +44,7 @@
           What's new?
         </p>
 <a name="spirit.qi.tutorials.mini_xml___error_handling.readable_names"></a><h6>
-<a name="id1051098"></a>
+<a name="id1155955"></a>
           <a class="link" href="mini_xml___error_handling.html#spirit.qi.tutorials.mini_xml___error_handling.readable_names">Readable
           Names</a>
         </h6>
@@ -63,7 +63,7 @@
 <span class="identifier">end_tag</span><span class="special">.</span><span class="identifier">name</span><span class="special">(</span><span class="string">"end_tag"</span><span class="special">);</span>
 </pre>
 <a name="spirit.qi.tutorials.mini_xml___error_handling.on_error"></a><h6>
-<a name="id1051278"></a>
+<a name="id1156135"></a>
           <a class="link" href="mini_xml___error_handling.html#spirit.qi.tutorials.mini_xml___error_handling.on_error">On
           Error</a>
         </h6>
@@ -241,7 +241,7 @@
 </tbody>
 </table></div>
 <a name="spirit.qi.tutorials.mini_xml___error_handling.expectation_points"></a><h6>
-<a name="id1051786"></a>
+<a name="id1156644"></a>
           <a class="link" href="mini_xml___error_handling.html#spirit.qi.tutorials.mini_xml___error_handling.expectation_points">Expectation
           Points</a>
         </h6>

Modified: trunk/libs/spirit/doc/html/spirit/qi/tutorials/quick_start.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi/tutorials/quick_start.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi/tutorials/quick_start.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -27,7 +27,7 @@
 <a name="spirit.qi.tutorials.quick_start"></a><a class="link" href="quick_start.html" title="Quick Start">Quick Start</a>
 </h4></div></div></div>
 <a name="spirit.qi.tutorials.quick_start.why_would_you_want_to_use_spirit_qi_"></a><h6>
-<a name="id1028923"></a>
+<a name="id1133780"></a>
           <a class="link" href="quick_start.html#spirit.qi.tutorials.quick_start.why_would_you_want_to_use_spirit_qi_">Why
           would you want to use Spirit.Qi?</a>
         </h6>

Modified: trunk/libs/spirit/doc/html/spirit/qi/tutorials/roman_numerals.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi/tutorials/roman_numerals.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi/tutorials/roman_numerals.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -41,7 +41,7 @@
           </li>
 </ul></div>
 <a name="spirit.qi.tutorials.roman_numerals.symbol_table"></a><h6>
-<a name="id1036700"></a>
+<a name="id1141557"></a>
           <a class="link" href="roman_numerals.html#spirit.qi.tutorials.roman_numerals.symbol_table">Symbol
           Table</a>
         </h6>
@@ -173,7 +173,7 @@
           They are all parsers.
         </p>
 <a name="spirit.qi.tutorials.roman_numerals.rules"></a><h6>
-<a name="id1039705"></a>
+<a name="id1144563"></a>
           <a class="link" href="roman_numerals.html#spirit.qi.tutorials.roman_numerals.rules">Rules</a>
         </h6>
 <p>
@@ -253,7 +253,7 @@
 <pre class="programlisting"><span class="identifier">r</span> <span class="special">=</span> <span class="identifier">double_</span> <span class="special">&gt;&gt;</span> <span class="special">*(</span><span class="char">','</span> <span class="special">&gt;&gt;</span> <span class="identifier">double_</span><span class="special">);</span>
 </pre>
 <a name="spirit.qi.tutorials.roman_numerals.grammars"></a><h6>
-<a name="id1040098"></a>
+<a name="id1144955"></a>
           <a class="link" href="roman_numerals.html#spirit.qi.tutorials.roman_numerals.grammars">Grammars</a>
         </h6>
 <p>
@@ -358,7 +358,7 @@
           </li>
 </ul></div>
 <a name="spirit.qi.tutorials.roman_numerals.let_s_parse_"></a><h6>
-<a name="id1040825"></a>
+<a name="id1145682"></a>
           <a class="link" href="roman_numerals.html#spirit.qi.tutorials.roman_numerals.let_s_parse_">Let's Parse!</a>
         </h6>
 <p>

Modified: trunk/libs/spirit/doc/html/spirit/qi/tutorials/semantic_actions.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi/tutorials/semantic_actions.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi/tutorials/semantic_actions.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -233,7 +233,7 @@
           The examples above can be found here: ../../example/qi/actions.cpp
         </p>
 <a name="spirit.qi.tutorials.semantic_actions.phoenix"></a><h6>
-<a name="id1031302"></a>
+<a name="id1136160"></a>
           <a class="link" href="semantic_actions.html#spirit.qi.tutorials.semantic_actions.phoenix">Phoenix</a>
         </h6>
 <p>

Modified: trunk/libs/spirit/doc/html/spirit/qi/tutorials/warming_up.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi/tutorials/warming_up.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi/tutorials/warming_up.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -31,7 +31,7 @@
           on how to build parsers from the simplest parser, building up as we go.
         </p>
 <a name="spirit.qi.tutorials.warming_up.trivial_example__1_parsing_a_number"></a><h6>
-<a name="id1028968"></a>
+<a name="id1133826"></a>
           <a class="link" href="warming_up.html#spirit.qi.tutorials.warming_up.trivial_example__1_parsing_a_number">Trivial
           Example #1 Parsing a number</a>
         </h6>
@@ -46,7 +46,7 @@
           parsers and consistent naming conventions help you keep from going insane!
         </p>
 <a name="spirit.qi.tutorials.warming_up.trivial_example__2_parsing_two_numbers"></a><h6>
-<a name="id1028997"></a>
+<a name="id1133855"></a>
           <a class="link" href="warming_up.html#spirit.qi.tutorials.warming_up.trivial_example__2_parsing_two_numbers">Trivial
           Example #2 Parsing two numbers</a>
         </h6>
@@ -79,7 +79,7 @@
           </p></td></tr>
 </table></div>
 <a name="spirit.qi.tutorials.warming_up.trivial_example__3_parsing_one_or_more_numbers"></a><h6>
-<a name="id1029058"></a>
+<a name="id1133916"></a>
           <a class="link" href="warming_up.html#spirit.qi.tutorials.warming_up.trivial_example__3_parsing_one_or_more_numbers">Trivial
           Example #3 Parsing one or more numbers</a>
         </h6>
@@ -103,7 +103,7 @@
           in most places.
         </p>
 <a name="spirit.qi.tutorials.warming_up.trivial_example__4_parsing_a_comma_delimited_list_of_numbers"></a><h6>
-<a name="id1029103"></a>
+<a name="id1133960"></a>
           <a class="link" href="warming_up.html#spirit.qi.tutorials.warming_up.trivial_example__4_parsing_a_comma_delimited_list_of_numbers">Trivial
           Example #4 Parsing a comma-delimited list of numbers</a>
         </h6>
@@ -126,7 +126,7 @@
           star encloses the complete expression above.
         </p>
 <a name="spirit.qi.tutorials.warming_up.let_s_parse_"></a><h6>
-<a name="id1029423"></a>
+<a name="id1134280"></a>
           <a class="link" href="warming_up.html#spirit.qi.tutorials.warming_up.let_s_parse_">Let's Parse!</a>
         </h6>
 <p>

Modified: trunk/libs/spirit/doc/html/spirit/what_s_new.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/what_s_new.html (original)
+++ trunk/libs/spirit/doc/html/spirit/what_s_new.html 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -27,7 +27,7 @@
 <a name="spirit.what_s_new"></a><a class="link" href="what_s_new.html" title="What's New">What's New</a>
 </h2></div></div></div>
 <a name="spirit.what_s_new.spirit_classic"></a><h4>
-<a name="id1020188"></a>
+<a name="id1125046"></a>
       <a class="link" href="what_s_new.html#spirit.what_s_new.spirit_classic">Spirit Classic</a>
     </h4>
 <p>
@@ -66,11 +66,11 @@
       for existing applications.
     </p>
 <a name="spirit.what_s_new.spirit_v2_1"></a><h4>
-<a name="id1020379"></a>
+<a name="id1125236"></a>
       <a class="link" href="what_s_new.html#spirit.what_s_new.spirit_v2_1">Spirit V2.1</a>
     </h4>
 <a name="spirit.what_s_new.what_s_changed_in__emphasis_spirit_qi__emphasis__and__emphasis_spirit_karma__emphasis__from_v2_0_to_2_x"></a><h4>
-<a name="id1020392"></a>
+<a name="id1125250"></a>
       <a class="link" href="what_s_new.html#spirit.what_s_new.what_s_changed_in__emphasis_spirit_qi__emphasis__and__emphasis_spirit_karma__emphasis__from_v2_0_to_2_x">What's
       changed in <span class="emphasis"><em>Spirit.Qi</em></span> and <span class="emphasis"><em>Spirit.Karma</em></span>
       from V2.0 to 2.x</a>
@@ -159,7 +159,7 @@
       </li>
 </ul></div>
 <a name="spirit.what_s_new.what_s_changed_in__emphasis_spirit_lex__emphasis__from_v2_0_to_2_x"></a><h4>
-<a name="id1020944"></a>
+<a name="id1125802"></a>
       <a class="link" href="what_s_new.html#spirit.what_s_new.what_s_changed_in__emphasis_spirit_lex__emphasis__from_v2_0_to_2_x">What's
       changed in <span class="emphasis"><em>Spirit.Lex</em></span> from V2.0 to 2.x</a>
     </h4>

Modified: trunk/libs/spirit/doc/karma/quick_reference.qbk
==============================================================================
--- trunk/libs/spirit/doc/karma/quick_reference.qbk (original)
+++ trunk/libs/spirit/doc/karma/quick_reference.qbk 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -15,21 +15,20 @@
 [section Common Notation]
 
 [variablelist Notation
- [[`P`] [Parser type]]
- [[`p, a, b, c`] [Parser objects]]
- [[`A, B, C`] [Attribute types of parsers A, B and C]]
- [[`I`] [The iterator type used for parsing]]
+ [[`G`] [Generator type]]
+ [[`g, a, b, c`] [Generator objects]]
+ [[`A, B, C`] [Attribute types of generators A, B and C]]
+ [[`I`] [The iterator type used for generation]]
     [[`Unused`] [An `unused_type`]]
     [[`Context`] [The enclosing rule's `Context` type]]
     [[`Attr`] [An attribute type]]
     [[`b`] [A boolean expression]]
- [[`fp`] [A (lazy parser) function with signature `P(Unused, Context)`]]
- [[`fa`] [A (semantic action) function with signature `void(Attr, Context, bool&)`.
+ [[`fg`] [A (lazy generator) function with signature `G(Unused, Context)`]]
+ [[`fa`] [A (semantic action) function with signature `void(Attr&, Context, bool&)`.
                         The third parameter is a boolean flag that can be set to false to
- force the parse to fail. Both `Context` and the boolean flag are
+ force the generator to fail. Both `Context` and the boolean flag are
                         optional.]]
- [[`first`] [An iterator pointing to the start of input]]
- [[`last`] [An iterator pointing to the end of input]]
+ [[`outiter`] [An output iterator to receive the generated output]]
     [[`Ch`] [Character-class specific character type (See __char_class_types__)]]
     [[`ch`] [Character-class specific character (See __char_class_types__)]]
     [[`ch2`] [Character-class specific character (See __char_class_types__)]]
@@ -53,7 +52,7 @@
     [[`lazy(fg)`] [Attribute of `G` where `G`
                             is the return type of `fg`] [Invoke `fg` at generation time, returning a generator
                                                         `g` which is then called to generate.]]
- [[`fg`] [see `lazy(fg)` above] [Equivalent to `lazy[fp]`]]
+ [[`fg`] [see `lazy(fg)` above] [Equivalent to `lazy[fg]`]]
     [[`g[fa]`] [Attribute of `g`] [Call semantic action `fa` (before executing `g`).]]
 
     [[`byte_`] [8 bits native endian] [Generates an 8 bit binary]]
@@ -144,11 +143,11 @@
 
 The notation will be for instance:
 
- a: A, b: B --> (a >> b): tuple<A, B>
+ a: A, b: B --> (a << b): tuple<A, B>
 
-which reads as: given, `a` and `b` are parsers/generators, and `A` is the type
+which reads as: given, `a` and `b` are generators, and `A` is the type
 of the attribute of `a`, and `B` is the type of the attribute of `b`, then the
-type of the attribute of `a >> b` will be `tuple<A, B>`.
+type of the attribute of `a << b` will be `tuple<A, B>`.
 
 [table Spirit.Karma compound generator attribute types
     [[Expression] [Attribute]]
@@ -197,9 +196,9 @@
 
 For all expressions of the form:
 
- p(a1, a2,... aN)
+ g(a1, a2,... aN)
 
-where `p` is a parser, each of the arguments (a1...aN) can either be an
+where `g` is a generator, each of the arguments (a1...aN) can either be an
 immediate value, or a lazy function with signature:
 
     T(Unused, Context)
@@ -213,7 +212,7 @@
 
     bool flag = true;
     eps(phoenix::var(flag)) // success or fail depending on the value
- // of flag at parse time
+ // of flag at generation time
 
 since `phoenix::ref(f)` is a function that returns a `bool`.
 
@@ -235,7 +234,7 @@
                                 the synthesized (return value) and inherited (arguments)
                                 attributes.]]
     [[Locals] [`locals<L1, L2 ..., LN>`. The local variables.]]
- [[Skipper] [The skip-parser type]]
+ [[Delimiter] [The delimit-generator type]]
 ]
 
 [variablelist Template Arguments
@@ -257,9 +256,9 @@
     [[`r.name(name)`] [Naming a rule]]
     [[`r.name()`] [Getting the name of a rule]]
     [[debug(r)] [Debug rule `r`]]
- [[`r = p;`] [Rule definition]]
- [[`r %= p;`] [Auto-rule definition. The attribute of `p` should be
- compatible with the synthesized attribute of `r`. When `p`
+ [[`r = g;`] [Rule definition]]
+ [[`r %= g;`] [Auto-rule definition. The attribute of `g` should be
+ compatible with the synthesized attribute of `r`. When `g`
                                                 is successful, its attribute is automatically propagated
                                                 to `r`'s synthesized attribute.]]
 
@@ -290,20 +289,20 @@
 
 Has the form:
 
- p[f]
+ g[f]
 
 where `f` is a function with the signatures:
 
- void f(Attr const&);
- void f(Attr const&, Context&);
- void f(Attr const&, Context&, bool&);
+ void f(Attr&);
+ void f(Attr&, Context&);
+ void f(Attr&, Context&, bool&);
 
 You can use `__boost_bind__` to bind member functions. For function
 objects, the allowed signatures are:
 
- void operator()(Attr const&, unused_type, unused_type) const;
- void operator()(Attr const&, Context&, unused_type) const;
- void operator()(Attr const&, Context&, bool&) const;
+ void operator()(Attr&, unused_type, unused_type) const;
+ void operator()(Attr&, Context&, unused_type) const;
+ void operator()(Attr&, Context&, bool&) const;
 
 The `unused_type` is used in the signatures above to signify 'don't
 care'.
@@ -314,18 +313,18 @@
 __boost_phoenix__ makes it easier to attach semantic actions. You just
 inline your lambda expressions:
 
- p[phoenix-lambda-expression]
+ g[phoenix-lambda-expression]
 
-Spirit.Qi provides some __boost_phoenix__ placeholders to important
+__karma__ provides some __boost_phoenix__ placeholders to access important
 information from the `Attr` and `Context` that are otherwise fiddly to extract.
 
-[variablelist Spirit.Qi specific Phoenix placeholders
- [[`_1, _2... , _N`] [Nth attribute of `p`]]
+[variablelist Spirit.Karma specific Phoenix placeholders
+ [[`_1, _2... , _N`] [Nth attribute of `g`]]
     [[`_val`] [The enclosing rule's synthesized attribute.]]
     [[`_r1, _r2... , _rN`] [The enclosing rule's Nth inherited attribute.]]
     [[`_a, _b... , _j`] [The enclosing rule's local variables (`_a` refers to the first).]]
     [[`_val`] [The enclosing rule's synthesized attribute.]]
- [[`_pass`] [Assign `false` to `_pass` to force a parser failure.]]
+ [[`_pass`] [Assign `false` to `_pass` to force a generator failure.]]
 ]
 
 [endsect]

Modified: trunk/libs/spirit/doc/lex/lexer_quickstart2.qbk
==============================================================================
--- trunk/libs/spirit/doc/lex/lexer_quickstart2.qbk (original)
+++ trunk/libs/spirit/doc/lex/lexer_quickstart2.qbk 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -24,11 +24,11 @@
 [heading Prerequisites]
 
 In addition to the only required `#include` specific to /Spirit.Lex/ this
-example needs to include a couple of header files from the __phoenix2__
+example needs to include a couple of header files from the __boost_phoenix__
 library. This example shows how to attach functors to token definitions, which
 could be done using any type of C++ technique resulting in a callable object.
-Using __phoenix2__ for this task simplifies things and avoids adding
-dependencies to other libraries (__phoenix2__ is already in use for
+Using __boost_phoenix__ for this task simplifies things and avoids adding
+dependencies to other libraries (__boost_phoenix__ is already in use for
 __spirit__ anyway).
 
 [wcl_includes]
@@ -59,7 +59,7 @@
 the lexical analyzer. This is very similar to __flex__, where the action code
 associated with a token definition gets executed after the recognition of a
 matching input sequence. The code above uses function objects constructed using
-__phoenix2__, but it is possible to insert any C++ function or function object
+__boost_phoenix__, but it is possible to insert any C++ function or function object
 as long as it exposes the proper interface. For more details on please refer
 to the section __sec_lex_semactions__.
 

Modified: trunk/libs/spirit/doc/lex/lexer_quickstart3.qbk
==============================================================================
--- trunk/libs/spirit/doc/lex/lexer_quickstart3.qbk (original)
+++ trunk/libs/spirit/doc/lex/lexer_quickstart3.qbk 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -41,11 +41,11 @@
 
 This example uses two of the __spirit__ library components: __lex__ and __qi__,
 consequently we have to `#include` the corresponding header files. Again, we
-need to include a couple of header files from the __phoenix2__ library. This
+need to include a couple of header files from the __boost_phoenix__ library. This
 example shows how to attach functors to parser components, which
 could be done using any type of C++ technique resulting in a callable object.
-Using __phoenix2__ for this task simplifies things and avoids adding
-dependencies to other libraries (__phoenix2__ is already in use for
+Using __boost_phoenix__ for this task simplifies things and avoids adding
+dependencies to other libraries (__boost_phoenix__ is already in use for
 __spirit__ anyway).
 
 [wcp_includes]
@@ -127,7 +127,7 @@
 characters: `ref(c) += size(_1)`.
 
 [important All placeholders (`_1`, `_2`, etc.) used in /parser/ semantic
- actions in conjunction with functors created based on __phoenix2__
+ actions in conjunction with functors created based on __boost_phoenix__
             need to be imported from the `namespace boost::spirit::arg_names`
             (and *not* `namespace boost::phoenix::arg_names`, which is
             different from using placeholders in __lex__).

Modified: trunk/libs/spirit/doc/lex/lexer_semantic_actions.qbk
==============================================================================
--- trunk/libs/spirit/doc/lex/lexer_semantic_actions.qbk (original)
+++ trunk/libs/spirit/doc/lex/lexer_semantic_actions.qbk 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -112,7 +112,7 @@
 
 Even if it is possible to write your own function object implementations (i.e.
 using Boost.Lambda or Boost.Bind), the preferred way of defining lexer semantic
-actions is to use __phoenix2__. In this case you can access the parameters
+actions is to use __boost_phoenix__. In this case you can access the parameters
 described above by using the predefined __spirit__ placeholders:
 
 [table Predefined Phoenix placeholders for lexer semantic actions
@@ -149,7 +149,7 @@
 ]
 
 The context object passed as the last parameter to any lexer semantic action is
-not directly accessible while using __phoenix2__ expressions. We rather provide
+not directly accessible while using __boost_phoenix__ expressions. We rather provide
 predefine Phoenix functions allowing to invoke the different support functions
 as mentioned above. The following table lists the available support functions
 and describes their functionality:

Modified: trunk/libs/spirit/doc/preface.qbk
==============================================================================
--- trunk/libs/spirit/doc/preface.qbk (original)
+++ trunk/libs/spirit/doc/preface.qbk 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -115,7 +115,7 @@
 runtime -- mapping types to values. Fusion is a direct descendant of
 both MPL and __boost_tuples__. Fusion is now a full-fledged __boost__
 library. __phoenix__ also had to be beefed up to support Spirit
-V2. The result is __phoenix2__. Last but not least, Spirit V2 uses an
+V2. The result is __boost_phoenix__. Last but not least, Spirit V2 uses an
 __todd__exprtemplates__ library called __boost_proto__.
 
 Even though it has evolved and matured to become a multi-module

Modified: trunk/libs/spirit/doc/spirit2.qbk
==============================================================================
--- trunk/libs/spirit/doc/spirit2.qbk (original)
+++ trunk/libs/spirit/doc/spirit2.qbk 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -26,7 +26,7 @@
 [def __spirit__ [@http://spirit.sourceforge.net Spirit]]
 [def __spirit_list__ [@http://www.nabble.com/The-Spirit-Parser-Library-f3430.html Spirit General List]]
 [def __phoenix__ [@../../phoenix/doc/html/index.html Phoenix]]
-[def __phoenix2__ [@../../phoenix/doc/html/index.html Phoenix2]]
+[def __boost_phoenix__ [@../../phoenix/doc/html/index.html Phoenix2]]
 [def __fusion__ [@http://spirit.sourceforge.net/dl_more/fusion_v2/libs/fusion/doc/html/index.html Fusion]]
 [def __mpl__ [@http://www.boost.org/libs/mpl/index.html Boost.Mpl]]
 [def __boost__ [@http://www.boost.org/ Boost]]

Modified: trunk/libs/spirit/repository/doc/spirit2_repository.qbk
==============================================================================
--- trunk/libs/spirit/repository/doc/spirit2_repository.qbk (original)
+++ trunk/libs/spirit/repository/doc/spirit2_repository.qbk 2009-07-05 22:23:24 EDT (Sun, 05 Jul 2009)
@@ -24,7 +24,7 @@
 [def __spirit__ [@http://spirit.sourceforge.net Spirit]]
 [def __spirit_list__ [@http://www.nabble.com/The-Spirit-Parser-Library-f3430.html Spirit General List]]
 [def __phoenix__ [@../../phoenix/doc/html/index.html Phoenix]]
-[def __phoenix2__ [@../../phoenix/doc/html/index.html Phoenix2]]
+[def __boost_phoenix__ [@../../phoenix/doc/html/index.html Phoenix2]]
 [def __fusion__ [@http://spirit.sourceforge.net/dl_more/fusion_v2/libs/fusion/doc/html/index.html Fusion]]
 [def __mpl__ [@http://www.boost.org/libs/mpl/index.html MPL]]
 [def __boost__ [@http://www.boost.org/ Boost]]


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk