[boost-doc-zh] r355 committed - 升级至1.41.0,第七批,doc/目录下第二部分。...

  • From: boost-doc-zh@xxxxxxxxxxxxxx
  • To: boost-doc-zh-notify@xxxxxxxxxxxxx
  • Date: Tue, 22 Dec 2009 06:11:24 +0000

Revision: 355
Author: alai04
Date: Mon Dec 21 22:10:07 2009
Log: 升级至1.41.0,第七批,doc/目录下第二部分。
升级完成
http://code.google.com/p/boost-doc-zh/source/detail?r=355

Modified:
 /trunk/doc/html/boost/proto/expr.html
 /trunk/doc/html/boost/proto/extends/result.html
 /trunk/doc/html/boost/proto/extends.html
 /trunk/doc/html/boost/unordered_map.html
 /trunk/doc/html/boost/unordered_multimap.html
 /trunk/doc/html/boost/unordered_multiset.html
 /trunk/doc/html/boost/unordered_set.html
 /trunk/doc/html/proto/reference.html
 /trunk/doc/html/proto/users_guide.html
 /trunk/doc/html/proto.html
 /trunk/doc/html/quickbook/change_log.html
 /trunk/doc/html/quickbook/syntax.html
 /trunk/doc/html/xpressive/user_s_guide.html
 /trunk/doc/html/xpressive.html

=======================================
--- /trunk/doc/html/boost/proto/expr.html       Sun Feb  8 02:16:55 2009
+++ /trunk/doc/html/boost/proto/expr.html       Mon Dec 21 22:10:07 2009
@@ -28,12 +28,7 @@
<p>boost::proto::expr -- Representation of a node in an expression tree.<br>boost::proto::expr -- 表达式树中一个节点的表示法。</p>
 </div>
<h2 xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision"; class="refsynopsisdiv-title">Synopsis</h2> -<div xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision"; class="refsynopsisdiv"><pre class="synopsis"><span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> Tag, <span class="bold"><strong>typename</strong></span> Args, <span class="bold"><strong>long</strong></span> Arity = Args::arity&gt; <br><span class="bold"><strong>struct</strong></span> <a class="link" href="expr.html" title="Struct template expr">expr</a> {<br> <span class="emphasis"><em>// types</em></span> - <span class="bold"><strong>typedef</strong></span> Tag <a name="boost.proto.expr.proto_tag"></a>proto_tag; <br> <span class="bold"><strong>typedef</strong></span> Args <a name="boost.proto.expr.proto_args"></a>proto_args; <br> <span class="bold"><strong>typedef</strong></span> mpl::long_&lt; Arity &gt; <a name="boost.proto.expr.proto_arity"></a>proto_arity; <br> <span class="bold"><strong>typedef</strong></span> <a class="link" href="default_domain.html" title="Struct default_domain">default_domain</a> <a name="boost.proto.expr.proto_domain"></a>proto_domain; <br> <span class="bold"><strong>typedef</strong></span> expr <a name="boost.proto.expr.proto_base_expr"></a>proto_base_expr; <br> <span class="bold"><strong>typedef</strong></span> expr <a name="boost.proto.expr.proto_derived_expr"></a>proto_derived_expr;<br> <span class="bold"><strong>typedef</strong></span> <span class="bold"><strong>typename</strong></span> Args::child<em class="replaceable"><code>N</code></em> <a name="boost.proto.expr.proto_childN"></a>proto_childN; <span class="emphasis"><em>// For each <em class="replaceable"><code>N</code></em> in <em class="replaceable"><code>[0,max(Arity,1))</code></em>.</em></span> - <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> Signature&gt; <br> <span class="bold"><strong>struct</strong></span> <a class="link" href="expr/result.html" title="Struct template result">result</a> {<br> <span class="emphasis"><em>// types</em></span> - <span class="bold"><strong>typedef</strong></span> <em class="replaceable"><code>unspecified</code></em> <a class="link" href="expr/result.html#boost.proto.expr.result.type">type</a>;<br> };<br><br> <span class="emphasis"><em>// <a class="link" href="expr.html#id3236763-bb">public static functions</a></em></span> - <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span>... A&gt; <span class="type"><span class="bold"><strong>static</strong></span> expr <span class="bold"><strong>const</strong></span></span> <a class="link" href="expr.html#id3236771-bb">make</a>(A <span class="bold"><strong>const</strong></span> &amp;...);<br><br> <span class="emphasis"><em>// <a class="link" href="expr.html#id3236831-bb">public member functions</a></em></span> - <span class="type">expr &amp;</span> <a class="link" href="expr.html#id3236836-bb">proto_base</a>();<br> <span class="type">expr <span class="bold"><strong>const</strong></span> &amp;</span> <a class="link" href="expr.html#id3236852-bb">proto_base</a>() <span class="bold"><strong>const</strong></span>;<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="expr.html#id3236878-bb"><span class="bold"><strong>operator</strong></span>=</a>(A &amp;);<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="expr.html#id3236924-bb"><span class="bold"><strong>operator</strong></span>=</a>(A <span class="bold"><strong>const</strong></span> &amp;);<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="expr.html#id3236965-bb"><span class="bold"><strong>operator</strong></span>=</a>(A &amp;) <span class="bold"><strong>const</strong></span>;<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="expr.html#id3237008-bb"><span class="bold"><strong>operator</strong></span>=</a>(A <span class="bold"><strong>const</strong></span> &amp;) <span class="bold"><strong>const</strong></span>;<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="expr.html#id3237054-bb"><span class="bold"><strong>operator</strong></span>[]</a>(A &amp;);<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="expr.html#id3237101-bb"><span class="bold"><strong>operator</strong></span>[]</a>(A <span class="bold"><strong>const</strong></span> &amp;);<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="expr.html#id3237142-bb"><span class="bold"><strong>operator</strong></span>[]</a>(A &amp;) <span class="bold"><strong>const</strong></span>;<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="expr.html#id3237185-bb"><span class="bold"><strong>operator</strong></span>[]</a>(A <span class="bold"><strong>const</strong></span> &amp;) <span class="bold"><strong>const</strong></span>;<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span>... A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="expr.html#id3237231-bb"><span class="bold"><strong>operator</strong></span>()</a>(A <span class="bold"><strong>const</strong></span> &amp;...);<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span>... A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="expr.html#id3237282-bb"><span class="bold"><strong>operator</strong></span>()</a>(A <span class="bold"><strong>const</strong></span> &amp;...) <span class="bold"><strong>const</strong></span>;<br> <span class="type">proto_child<em class="replaceable"><code>N</code></em></span> childN;<br>};</pre></div> +<div xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision"; class="refsynopsisdiv"><pre class="synopsis"><span class="emphasis"><em>// In header: &lt;<a class="link" title="Header &lt;boost/proto/expr.hpp&gt;" href="../../proto/reference.html#header.boost.proto.expr_hpp">boost/proto/expr.hpp</a>&gt;<br><br></em></span><span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> Tag, <span class="bold"><strong>typename</strong></span> Args, <span class="bold"><strong>long</strong></span> Arity = Args::arity&gt; <br><span class="bold"><strong>struct</strong></span> <a class="link" title="Struct template expr" href="expr.html">expr</a> {<br> <span class="emphasis"><em>// types</em></span><br> <span class="bold"><strong>typedef</strong></span> Tag <a name="boost.proto.expr.proto_tag"></a>proto_tag; <br> <span class="bold"><strong>typedef</strong></span> Args <a name="boost.proto.expr.proto_args"></a>proto_args; <br> <span class="bold"><strong>typedef</strong></span> mpl::long_&lt; Arity &gt; <a name="boost.proto.expr.proto_arity"></a>proto_arity; <br> <span class="bold"><strong>typedef</strong></span> <a class="link" title="Struct default_domain" href="default_domain.html">proto::default_domain</a> <a name="boost.proto.expr.proto_domain"></a>proto_domain; <br> <span class="bold"><strong>typedef</strong></span> expr <a name="boost.proto.expr.proto_base_expr"></a>proto_base_expr; <br> <span class="bold"><strong>typedef</strong></span> expr <a name="boost.proto.expr.proto_derived_expr"></a>proto_derived_expr;<br> <span class="bold"><strong>typedef</strong></span> <span class="bold"><strong>typename</strong></span> Args::child<em class="replaceable"><code>N</code></em> <a name="boost.proto.expr.proto_childN"></a>proto_childN; <span class="emphasis"><em>// For each <em class="replaceable"><code>N</code></em> in <em class="replaceable"><code>[0,max(Arity,1))</code></em>.</em></span><br><br> <span class="emphasis"><em>// member classes/structs/unions</em></span><br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> Signature&gt; <br> <span class="bold"><strong>struct</strong></span> <a class="link" title="Struct template result" href="expr/result.html">result</a> {<br> <span class="emphasis"><em>// types</em></span><br> <span class="bold"><strong>typedef</strong></span> <em class="replaceable"><code>unspecified</code></em> <a class="link" href="expr/result.html#boost.proto.expr.result.type">type</a>;<br> };<br><br> <span class="emphasis"><em>// <a class="link" href="expr.html#id1232623-bb">public static functions</a></em></span><br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span>... A&gt; <span class="bold"><strong>static</strong></span> <span class="type">expr <span class="bold"><strong>const</strong></span></span> <a class="link" href="expr.html#id1232630-bb">make</a>(A <span class="bold"><strong>const</strong></span> &amp;...);<br><br> <span class="emphasis"><em>// <a class="link" href="expr.html#id1232690-bb">public member functions</a></em></span><br> <span class="type">expr &amp;</span> <a class="link" href="expr.html#id1232695-bb">proto_base</a>();<br> <span class="type">expr <span class="bold"><strong>const</strong></span> &amp;</span> <a class="link" href="expr.html#id1232710-bb">proto_base</a>() <span class="bold"><strong>const</strong></span>;<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="expr.html#id1232735-bb"><span class="bold"><strong>operator</strong></span>=</a>(A &amp;);<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="expr.html#id1232779-bb"><span class="bold"><strong>operator</strong></span>=</a>(A <span class="bold"><strong>const</strong></span> &amp;);<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="expr.html#id1232818-bb"><span class="bold"><strong>operator</strong></span>=</a>(A &amp;) <span class="bold"><strong>const</strong></span>;<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="expr.html#id1232859-bb"><span class="bold"><strong>operator</strong></span>=</a>(A <span class="bold"><strong>const</strong></span> &amp;) <span class="bold"><strong>const</strong></span>;<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="expr.html#id1232903-bb"><span class="bold"><strong>operator</strong></span>[]</a>(A &amp;);<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="expr.html#id1232948-bb"><span class="bold"><strong>operator</strong></span>[]</a>(A <span class="bold"><strong>const</strong></span> &amp;);<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="expr.html#id1232986-bb"><span class="bold"><strong>operator</strong></span>[]</a>(A &amp;) <span class="bold"><strong>const</strong></span>;<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="expr.html#id1233028-bb"><span class="bold"><strong>operator</strong></span>[]</a>(A <span class="bold"><strong>const</strong></span> &amp;) <span class="bold"><strong>const</strong></span>;<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span>... A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="expr.html#id1233071-bb"><span class="bold"><strong>operator</strong></span>()</a>(A <span class="bold"><strong>const</strong></span> &amp;...);<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span>... A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="expr.html#id1233120-bb"><span class="bold"><strong>operator</strong></span>()</a>(A <span class="bold"><strong>const</strong></span> &amp;...) <span class="bold"><strong>const</strong></span>;<br> <span class="type">proto_child<em class="replaceable"><code>N</code></em></span> childN; <span class="emphasis"><em>// For each <em class="replaceable"><code>N</code></em> in <em class="replaceable"><code>[0,max(Arity,1))</code></em>.</em></span><br> <span class="bold"><strong>static</strong></span> <span class="type"><span class="bold"><strong>const</strong></span> <span class="bold"><strong>long</strong></span></span> proto_arity_c; <span class="emphasis"><em>// <code class="computeroutput">= Arity;</code></em></span><br>};</pre></div>
 <div class="refsect1" lang="en">
 <a name="id3588221"></a><h2>Description</h2>
 <p>
=======================================
--- /trunk/doc/html/boost/proto/extends/result.html     Sun Feb  8 02:16:55 2009
+++ /trunk/doc/html/boost/proto/extends/result.html     Mon Dec 21 22:10:07 2009
@@ -28,8 +28,11 @@
 <p>boost::proto::extends::result</p>
 </div>
<h2 xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision"; class="refsynopsisdiv-title">Synopsis</h2> -<div xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision"; class="refsynopsisdiv"><pre class="synopsis"><span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> Signature&gt; <br><span class="bold"><strong>struct</strong></span> <a class="link" href="result.html" title="Struct template result">result</a> {<br> <span class="emphasis"><em>// types</em></span> - <span class="bold"><strong>typedef</strong></span> <em class="replaceable"><code>unspecified</code></em> <a name="boost.proto.extends.result.type"></a>type;<br>};</pre></div> +<div xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision"; class="refsynopsisdiv"><div class="refsynopsisdiv" xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision";><pre class="synopsis"><span class="emphasis"><em>// In header: &lt;<a class="link" title="Header &lt;boost/proto/extends.hpp&gt;" href="../../../proto/reference.html#header.boost.proto.extends_hpp">boost/proto/extends.hpp</a>&gt;<br><br></em></span><br><span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> Signature&gt; <br><span class="bold"><strong>struct</strong></span> <a class="link" title="Struct template result" href="result.html">result</a> {<br> <span class="emphasis"><em>// types</em></span><br> <span class="bold"><strong>typedef</strong></span> <em class="replaceable"><code>unspecified</code></em> <a name="boost.proto.extends.result.type"></a>type;<br>};</pre></div>
+<div class="refsect1" title="Description"><a name="id1570767"></a>
+<h2>Description</h2>
+<p>So that <code class="computeroutput">boost::result_of&lt;&gt;</code> can
+compute the return type of <code class="computeroutput">proto::extends::operator()</code>.<br>这样,<code class="computeroutput">boost::result_of&lt;&gt;</code> 可以计算 <code class="computeroutput">proto::extends::operator()</code> 的返回类型。 </p></div></div>
 </div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision"; width="100%"><tbody><tr>
 <td align="left"></td>
=======================================
--- /trunk/doc/html/boost/proto/extends.html    Sun Feb  8 02:16:55 2009
+++ /trunk/doc/html/boost/proto/extends.html    Mon Dec 21 22:10:07 2009
@@ -28,17 +28,28 @@
<p>boost::proto::extends -- For adding behaviors to a Proto expression template.<br>boost::proto::extends -- 为了把一些行为增加至Proto表达式模板。 </p>
 </div>
<h2 xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision"; class="refsynopsisdiv-title">Synopsis</h2> -<div xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision"; class="refsynopsisdiv"><pre class="synopsis"><span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> Expr, <span class="bold"><strong>typename</strong></span> Derived, <br> <span class="bold"><strong>typename</strong></span> Domain = <a class="link" href="default_domain.html" title="Struct default_domain">proto::default_domain</a>&gt; <br><span class="bold"><strong>struct</strong></span> <a class="link" href="extends.html" title="Struct template extends">extends</a> {<br> <span class="emphasis"><em>// types</em></span> - <span class="bold"><strong>typedef</strong></span> <span class="bold"><strong>typename</strong></span> Expr::proto_base_expr <a name="boost.proto.extends.proto_base_expr"></a>proto_base_expr; <br> <span class="bold"><strong>typedef</strong></span> Domain <a name="boost.proto.extends.proto_domain"></a>proto_domain; <br> <span class="bold"><strong>typedef</strong></span> Derived <a name="boost.proto.extends.proto_derived_expr"></a>proto_derived_expr;<br> <span class="bold"><strong>typedef</strong></span> <span class="bold"><strong>typename</strong></span> proto_base_expr::proto_tag <a name="boost.proto.extends.proto_tag"></a>proto_tag; <br> <span class="bold"><strong>typedef</strong></span> <span class="bold"><strong>typename</strong></span> proto_base_expr::proto_args <a name="boost.proto.extends.proto_args"></a>proto_args; <br> <span class="bold"><strong>typedef</strong></span> <span class="bold"><strong>typename</strong></span> proto_base_expr::proto_arity <a name="boost.proto.extends.proto_arity"></a>proto_arity; <br> <span class="bold"><strong>typedef</strong></span> <span class="bold"><strong>typename</strong></span> proto_base_expr::proto_child<em class="replaceable"><code>N</code></em> <a name="boost.proto.extends.proto_childN"></a>proto_childN; <span class="emphasis"><em>// For each <em class="replaceable"><code>N</code></em> in <em class="replaceable"><code>[0,max(1,proto_arity::value))</code></em></em></span> - <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> Signature&gt; <br> <span class="bold"><strong>struct</strong></span> <a class="link" href="extends/result.html" title="Struct template result">result</a> {<br> <span class="emphasis"><em>// types</em></span> - <span class="bold"><strong>typedef</strong></span> <em class="replaceable"><code>unspecified</code></em> <a class="link" href="extends/result.html#boost.proto.extends.result.type">type</a>;<br> };<br><br> <span class="emphasis"><em>// <a class="link" href="extends.html#boost.proto.extendsconstruct-copy-destruct">construct/copy/destruct</a></em></span> - <a class="link" href="extends.html#id3237647-bb">extends</a>();<br> <a class="link" href="extends.html#id3237650-bb">extends</a>(<a class="link" href="extends.html" title="Struct template extends">extends</a> <span class="bold"><strong>const</strong></span> &amp;);<br> <a class="link" href="extends.html#id3237666-bb">extends</a>(Expr <span class="bold"><strong>const</strong></span> &amp;);<br><br> <span class="emphasis"><em>// <a class="link" href="extends.html#id3237680-bb">public static functions</a></em></span> - <span class="type"><span class="bold"><strong>static</strong></span> Derived <span class="bold"><strong>const</strong></span></span> <a class="link" href="extends.html#id3237684-bb">make</a>(Expr <span class="bold"><strong>const</strong></span> &amp;);<br><br> <span class="emphasis"><em>// <a class="link" href="extends.html#id3237706-bb">public member functions</a></em></span> - <span class="type">proto_base_expr &amp;</span> <a class="link" href="extends.html#id3237714-bb">proto_base</a>();<br> <span class="type">proto_base_expr <span class="bold"><strong>const</strong></span> &amp;</span> <a class="link" href="extends.html#id3237734-bb">proto_base</a>() <span class="bold"><strong>const</strong></span>;<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="extends.html#id3237760-bb"><span class="bold"><strong>operator</strong></span>=</a>(A &amp;);<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="extends.html#id3237807-bb"><span class="bold"><strong>operator</strong></span>=</a>(A <span class="bold"><strong>const</strong></span> &amp;);<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="extends.html#id3237848-bb"><span class="bold"><strong>operator</strong></span>=</a>(A &amp;) <span class="bold"><strong>const</strong></span>;<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="extends.html#id3237891-bb"><span class="bold"><strong>operator</strong></span>=</a>(A <span class="bold"><strong>const</strong></span> &amp;) <span class="bold"><strong>const</strong></span>;<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="extends.html#id3237936-bb"><span class="bold"><strong>operator</strong></span>[]</a>(A &amp;);<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="extends.html#id3237983-bb"><span class="bold"><strong>operator</strong></span>[]</a>(A <span class="bold"><strong>const</strong></span> &amp;);<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="extends.html#id3238024-bb"><span class="bold"><strong>operator</strong></span>[]</a>(A &amp;) <span class="bold"><strong>const</strong></span>;<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="extends.html#id3238067-bb"><span class="bold"><strong>operator</strong></span>[]</a>(A <span class="bold"><strong>const</strong></span> &amp;) <span class="bold"><strong>const</strong></span>;<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span>... A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="extends.html#id3238113-bb"><span class="bold"><strong>operator</strong></span>()</a>(A <span class="bold"><strong>const</strong></span> &amp;...);<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span>... A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="extends.html#id3238164-bb"><span class="bold"><strong>operator</strong></span>()</a>(A <span class="bold"><strong>const</strong></span> &amp;...) <span class="bold"><strong>const</strong></span>;<br> <span class="type">Expr</span> proto_expr_;<br>};</pre></div> +<div xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision"; class="refsynopsisdiv"><pre class="synopsis"><span class="emphasis"><em>// In header: &lt;<a class="link" title="Header &lt;boost/proto/extends.hpp&gt;" href="../../proto/reference.html#header.boost.proto.extends_hpp">boost/proto/extends.hpp</a>&gt;<br><br></em></span><span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> Expr, <span class="bold"><strong>typename</strong></span> Derived, <br> <span class="bold"><strong>typename</strong></span> Domain = <a class="link" title="Struct default_domain" href="default_domain.html">proto::default_domain</a>&gt; <br><span class="bold"><strong>struct</strong></span> <a class="link" title="Struct template extends" href="extends.html">extends</a> {<br> <span class="emphasis"><em>// types</em></span><br> <span class="bold"><strong>typedef</strong></span> <span class="bold"><strong>typename</strong></span> Expr::proto_base_expr <a name="boost.proto.extends.proto_base_expr"></a>proto_base_expr; <br> <span class="bold"><strong>typedef</strong></span> Domain <a name="boost.proto.extends.proto_domain"></a>proto_domain; <br> <span class="bold"><strong>typedef</strong></span> Derived <a name="boost.proto.extends.proto_derived_expr"></a>proto_derived_expr;<br> <span class="bold"><strong>typedef</strong></span> <span class="bold"><strong>typename</strong></span> proto_base_expr::proto_tag <a name="boost.proto.extends.proto_tag"></a>proto_tag; <br> <span class="bold"><strong>typedef</strong></span> <span class="bold"><strong>typename</strong></span> proto_base_expr::proto_args <a name="boost.proto.extends.proto_args"></a>proto_args; <br> <span class="bold"><strong>typedef</strong></span> <span class="bold"><strong>typename</strong></span> proto_base_expr::proto_arity <a name="boost.proto.extends.proto_arity"></a>proto_arity; <br> <span class="bold"><strong>typedef</strong></span> <span class="bold"><strong>typename</strong></span> proto_base_expr::proto_child<em class="replaceable"><code>N</code></em> <a name="boost.proto.extends.proto_childN"></a>proto_childN; <span class="emphasis"><em>// For each <em class="replaceable"><code>N</code></em> in <em class="replaceable"><code>[0,max(1,proto_arity_c))</code></em></em></span><br><br> <span class="emphasis"><em>// member classes/structs/unions</em></span><br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> Signature&gt; <br> <span class="bold"><strong>struct</strong></span> <a class="link" title="Struct template result" href="extends/result.html">result</a> {<br> <span class="emphasis"><em>// types</em></span><br> <span class="bold"><strong>typedef</strong></span> <em class="replaceable"><code>unspecified</code></em> <a class="link" href="extends/result.html#boost.proto.extends.result.type">type</a>;<br> };<br><br> <span class="emphasis"><em>// <a class="link" href="extends.html#boost.proto.extendsconstruct-copy-destruct">construct/copy/destruct</a></em></span><br> <a class="link" href="extends.html#id1233627-bb">extends</a>();<br> <a class="link" href="extends.html#id1233629-bb">extends</a>(<a class="link" title="Struct template extends" href="extends.html">extends</a> <span class="bold"><strong>const</strong></span> &amp;);<br> <a class="link" href="extends.html#id1233645-bb">extends</a>(Expr <span class="bold"><strong>const</strong></span> &amp;);<br><br> <span class="emphasis"><em>// <a class="link" href="extends.html#id1233658-bb">public static functions</a></em></span><br> <span class="bold"><strong>static</strong></span> <span class="type">Derived <span class="bold"><strong>const</strong></span></span> <a class="link" href="extends.html#id1233663-bb">make</a>(Expr <span class="bold"><strong>const</strong></span> &amp;);<br><br> <span class="emphasis"><em>// <a class="link" href="extends.html#id1233698-bb">public member functions</a></em></span><br> <span class="type">proto_base_expr &amp;</span> <a class="link" href="extends.html#id1233705-bb">proto_base</a>();<br> <span class="type">proto_base_expr <span class="bold"><strong>const</strong></span> &amp;</span> <a class="link" href="extends.html#id1233725-bb">proto_base</a>() <span class="bold"><strong>const</strong></span>;<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="extends.html#id1233749-bb"><span class="bold"><strong>operator</strong></span>=</a>(A &amp;);<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="extends.html#id1233794-bb"><span class="bold"><strong>operator</strong></span>=</a>(A <span class="bold"><strong>const</strong></span> &amp;);<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="extends.html#id1233833-bb"><span class="bold"><strong>operator</strong></span>=</a>(A &amp;) <span class="bold"><strong>const</strong></span>;<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="extends.html#id1233874-bb"><span class="bold"><strong>operator</strong></span>=</a>(A <span class="bold"><strong>const</strong></span> &amp;) <span class="bold"><strong>const</strong></span>;<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="extends.html#id1233918-bb"><span class="bold"><strong>operator</strong></span>[]</a>(A &amp;);<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="extends.html#id1233962-bb"><span class="bold"><strong>operator</strong></span>[]</a>(A <span class="bold"><strong>const</strong></span> &amp;);<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="extends.html#id1234001-bb"><span class="bold"><strong>operator</strong></span>[]</a>(A &amp;) <span class="bold"><strong>const</strong></span>;<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="extends.html#id1234042-bb"><span class="bold"><strong>operator</strong></span>[]</a>(A <span class="bold"><strong>const</strong></span> &amp;) <span class="bold"><strong>const</strong></span>;<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span>... A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="extends.html#id1234086-bb"><span class="bold"><strong>operator</strong></span>()</a>(A <span class="bold"><strong>const</strong></span> &amp;...);<br> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span>... A&gt; <span class="type"><em class="replaceable"><code>unspecified</code></em></span> <a class="link" href="extends.html#id1234135-bb"><span class="bold"><strong>operator</strong></span>()</a>(A <span class="bold"><strong>const</strong></span> &amp;...) <span class="bold"><strong>const</strong></span>;<br> <span class="type">Expr</span> proto_expr_; <span class="emphasis"><em>// For exposition only.</em></span><br> <span class="bold"><strong>static</strong></span> <span class="type"><span class="bold"><strong>const</strong></span> <span class="bold"><strong>long</strong></span></span> proto_arity_c; <span class="emphasis"><em>// <code class="computeroutput">= proto_base_expr::proto_arity_c;</code></em></span><br>};<span class="bold"><strong></strong></span></pre></div>
 <div class="refsect1" lang="en">
 <a name="id3590256"></a><h2>Description</h2>
 <div class="refsect2" lang="en">
-<a name="id3590259"></a><h3>
+
+<p>Use <code class="computeroutput">proto::extends&lt;&gt;</code> to give
+expressions in your domain custom data members and member functions.<br>用 <code class="computeroutput">proto::extends&lt;&gt;</code> 在你的领域定制数 据成员和成员函数中给出表达式。 </p><p>Conceptually, using <code class="computeroutput">proto::extends&lt;&gt;</code> +is akin to inheriting from <code class="computeroutput"><a class="link" title="Struct template expr" href="expr.html">proto::expr</a>&lt;&gt;</code> and +adding your own members. Using <code class="computeroutput">proto::extends&lt;&gt;</code> is generally preferrable to +straight inheritance because the members that would be inherited from <code class="computeroutput"><a class="link" title="Struct template expr" href="expr.html">proto::expr</a>&lt;&gt;</code> would be wrong; they would +incorrectly slice off your additional members when building larger expressions +from smaller ones. <code class="computeroutput">proto::extends&lt;&gt;</code> +automatically gives your expression types the appropriate operator overloads +that preserve your domain-specific members when composing expression trees.<br>从概念上讲,使用 <code class="computeroutput">proto::extends&lt;&gt;</code> +就像从 <code class="computeroutput"><a class="link" title="Struct template expr" href="expr.html">proto::expr</a>&lt;&gt;</code> 继承并增加你自己的成 员。使用 <code class="computeroutput">proto::extends&lt;&gt;</code> 通常优于 直接继承,因为从 <code class="computeroutput"><a class="link" title="Struct template expr" href="expr.html">proto::expr</a>&lt;&gt;</code> 继承的成员是 错误的;当从较小的表达式构建较大的表达式时,它们会错误地切割掉你的其它成员。 <code class="computeroutput">proto::extends&lt;&gt;</code> +自动为你的表达式类型给出适当的操作符重载,在组建表达式树时保留你的领域专用 成员。 </p>
+
+<p>Expression extensions are typically defined as follows:<br>表达式扩展通 常定义如下:</p><pre class="programlisting">template&lt; typename Expr &gt;<br>struct my_expr<br> : proto::extends&lt;<br> Expr // The expression type we're extending 我们要扩展的表达式类型<br> , my_expr&lt; Expr &gt; // The type we're defining 我们要定义的类型 <br> , my_domain // The domain associated with this expression extension 该表达式扩展相关的领域<br> &gt;<br>{<br> typedef proto::extends&lt; Expr, my_expr&lt; Expr &gt;, my_domain &gt; base_type;<br> <br> // An expression extension is constructed from the expression<br> // it is extending. 表达式扩展是从所扩展的表达式构造而 来的<br> my_expr( Expr const &amp; e = Expr() )<br> : base_type( e )<br> {}<br> <br> // Unhide proto::extends::operator=<br> // (This is only necessary if a lazy assignment operator<br> // makes sense for your domain-specific language.)<br> // 暴露 proto::extends::operator= (仅当延迟赋值操作符对你的领域专用语言有意义时需要 )<br> using base_type::operator=;<br> <br> /*<br> ... domain-specific members go here ... 此处为领域专用成员<br> */<br>};</pre>
+<p></p>
+<p>See also:<br>参见: </p>
+<div class="itemizedlist">
+<ul class="itemizedlist" type="disc"><li class="listitem"><code class="computeroutput"><a class="link" title="Macro BOOST_PROTO_EXTENDS" href="../../BOOST_PROTO_EXTENDS.html">BOOST_PROTO_EXTENDS</a>()</code></li></ul></div><h3> <a name="boost.proto.extendsconstruct-copy-destruct"></a><code class="computeroutput">extends</code>
         public
        construct/copy/destruct</h3>
@@ -51,7 +62,8 @@
 <div class="refsect2" lang="en">
 <a name="id3590340"></a><h3>
<a name="id3237680-bb"></a><code class="computeroutput">extends</code> public static functions</h3> -<div class="orderedlist"><ol type="1"><li><pre class="literallayout"><span class="type"><span class="bold"><strong>static</strong></span> Derived <span class="bold"><strong>const</strong></span></span> <a name="id3237684-bb"></a>make(Expr <span class="bold"><strong>const</strong></span> &amp; expr);</pre></li></ol></div> +<div class="orderedlist"><ol type="1"><li><pre class="literallayout"><span class="type"><span class="bold"><strong>static</strong></span> Derived <span class="bold"><strong>const</strong></span></span> <a name="id3237684-bb"></a>make(Expr <span class="bold"><strong>const</strong></span> &amp; expr); +</pre><p>Construct an expression extension from the base expression.<br>从 基类表达式构造一个表达式扩展。</p></li></ol></div>
 </div>
 <div class="refsect2" lang="en">
 <a name="id3590392"></a><h3>
=======================================
--- /trunk/doc/html/boost/unordered_map.html    Wed Sep  2 20:31:58 2009
+++ /trunk/doc/html/boost/unordered_map.html    Mon Dec 21 22:10:07 2009
@@ -46,7 +46,8 @@
<span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> Key, <span class="bold"><strong>typename</strong></span> Mapped, <span class="bold"><strong>typename</strong></span> Hash, <span class="bold"><strong>typename</strong></span> Pred, <br> <span class="bold"><strong>typename</strong></span> Alloc&gt; <br> <span class="type"><span class="bold"><strong>void</strong></span></span> <a class="link" href="unordered_map.html#boost.swap_id3134322">swap</a>(unordered_map&lt;Key, Mapped, Hash, Pred, Alloc&gt;&amp;, <br> unordered_map&lt;Key, Mapped, Hash, Pred, Alloc&gt;&amp;);</pre></div>
 <div class="refsect1" lang="en">
 <a name="id3764769"></a><h2>Description 说明</h2>
-<p>For the normative reference see chapter 23 of <a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2691.pdf"; target="_top">the working draft of the C++ standard [n2691].</a><br>标准化参 考请见 <a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2691.pdf"; target="_top">C++标准工作草案[n2691]</a> 第23章。</p> +<p>Based on chapter 23 of <a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2009/n2960.pdf"; target="_top">the working draft of the C++ standard [n2960]</a>. But without the +updated rules for allocators.&nbsp;<br>基于 <a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2009/n2960.pdf"; target="_top">C++标准工作草案[n2690]</a> 第23章。但不包含对分配器的最新规 则。</p>
 <p><span class="bold"><strong>Template Parameters 模板参数</strong></span>
               </p>
 <div class="informaltable"><table class="table">
@@ -100,14 +101,14 @@
 <p>
<span class="bold"><strong>typedef</strong></span> <span class="emphasis"><em>implementation-defined</em></span> <a name="boost.unordered_map.iterator"></a>iterator;</p> <p>A iterator whose value type is <span class="type">value_type</span>.<br>一个常量迭代器,它的值类型为 value_type。 </p> -<p>Any iterator category except output iterator.<br>除输出迭代器以外的任意 迭代器类别。</p> +<p>The iterator category is at least a forward iterator.<br>迭代器类别至少 为前向迭代器。</p> <p>Convertible to <span class="type">const_iterator</span>.<br>可转换为 const_iterator。</p>
 </li>
 <li>
 <p>
<span class="bold"><strong>typedef</strong></span> <span class="emphasis"><em>implementation-defined</em></span> <a name="boost.unordered_map.const_iterator"></a>const_iterator;</p> <p>A constant iterator whose value type is <span class="type">value_type</span>.<br>一个常量迭代器,它的值类型为 value_type。 </p> -<p>Any iterator category except output iterator.<br>除输出迭代器以外的任意 迭代器类别。</p> +<p>The iterator category is at least a forward iterator.<br>迭代器类别至少 为前向迭代器。</p>
 </li>
 <li>
 <p>
@@ -147,27 +148,86 @@
 <p>Constructs an empty container with at least n buckets, using hf as
 the hash function, eq as the key equality predicate, a as the allocator
 and a maximum load factor of 1.0 and inserts the elements from [f, l)
-into it.<br>构造一个带至少 n 个桶的空容器,以 hf 作为散列函数,eq 作为键值 等同性谓词,a 作为分配器,最大负载因子为 1.0,并插入 [f,l) 的元素。</p>
-</li>
-<li>
-<pre class="literallayout"><a name="id3128851-bb"></a>unordered_map(unordered_map <span class="bold"><strong>const</strong></span>&amp;);</pre> -<p>The copy constructor. Copies the contained elements, hash function, predicate, maximum load factor and allocator.<br>复制构造函数。复制所含的元 素、散列函数、谓词、最大负载因子和分配器。</p>
-</li>
-<li>
-<pre class="literallayout"><span class="bold"><strong>explicit</strong></span> <a name="id3128872-bb"></a>unordered_map(Allocator <span class="bold"><strong>const</strong></span>&amp; a);</pre> +into it.<br>构造一个带至少 n 个桶的空容器,以 hf 作为散列函数,eq 作为键值 等同性谓词,a 作为分配器,最大负载因子为 1.0,并插入 [f,l) 的元素。 </p></li><li class="listitem"><pre class="literallayout"><a name="id1303794-bb"></a>unordered_map(unordered_map <span class="bold"><strong>const</strong></span>&amp;);</pre>
+<p>The copy constructor. Copies the contained elements, hash function,
+predicate, maximum load factor and allocator.<br>复制构造函数。复制所含的元 素、散列函数、谓词、最大负载因子和分配器。</p>
+<div class="variablelist">
+<table border="0">
+<colgroup><col align="left" valign="top"></colgroup><tbody>
+<tr>
+<td>
+<p><span class="term">Requires:</span></p><p><span class="term">要 求:</span></p></td>
+<td>
+<p><code class="computeroutput">value_type</code> is copy
+constructible</p><p><code class="computeroutput">value_type</code> 为可复制 构造的</p></td></tr></tbody></table></div> +</li><li class="listitem"><pre class="literallayout"><a name="id1303825-bb"></a>unordered_map(unordered_map &amp;&amp;);</pre>
+<p>The move constructor.<br>移动构造函数。</p>
+<div class="variablelist">
+<table border="0">
+<colgroup><col align="left" valign="top"></colgroup><tbody>
+<tr>
+<td>
+<p><span class="term">Notes:</span></p><p><span class="term">说 明:</span></p></td>
+<td>
+<p>This is emulated on compilers without rvalue references.</p><p>在不带右 值引用的编译器上的模拟。</p></td></tr>
+<tr>
+<td>
+<p><span class="term">Requires:</span></p><p><span class="term">要 求:</span></p></td>
+<td>
+<p><code class="computeroutput">value_type</code> is move constructible. (TODO: +This is not actually required in this implementation).</p><p><code class="computeroutput">value_type</code> 是可移动构造的。(待办:在本实现中并 不真正要求)。</p></td></tr></tbody></table></div></li><li><pre class="literallayout"><span class="bold"><strong>explicit</strong></span> <a name="id3128872-bb"></a>unordered_map(Allocator <span class="bold"><strong>const</strong></span>&amp; a);</pre> <p>Constructs an empty container, using allocator <code class="computeroutput">a</code>.<br>构造一个空容器,使用分配器 <code class="computeroutput">a</code>。</p>
 </li>
 <li>
<pre class="literallayout"><a name="id3128900-bb"></a>unordered_map(unordered_map <span class="bold"><strong>const</strong></span>&amp; x, Allocator <span class="bold"><strong>const</strong></span>&amp; a);</pre> <p>Constructs an container, copying <code class="computeroutput">x</code>'s contained elements, hash function, predicate, maximum load factor, but using allocator <code class="computeroutput">a</code>.<br>构造一个容器,复制 <code class="computeroutput">x</code> 所含的元素、散列函数、谓词、最大负载因子,但 使用分配器
-<code class="computeroutput">a</code>。</p>
-</li>
-<li><pre class="literallayout"><a name="id3128940-bb"></a>~unordered_map();</pre></li>
-</ol></div>
+<code class="computeroutput">a</code>。</p></li><li class="listitem"><pre class="literallayout"><a name="id1303934-bb"></a>~unordered_map();</pre>
+<div class="variablelist">
+<table border="0">
+<colgroup><col align="left" valign="top"></colgroup><tbody>
+<tr>
+<td>
+<p><span class="term">Notes:</span></p><p><span class="term">说 明:</span></p></td>
+<td>
+<p>The destructor is applied to every element, and all memory is
+deallocated</p><p>对每个元素调用构造函数,并释放所有内存。 </p></td></tr></tbody></table></div></li></ol></div>
 </div>
<pre class="literallayout"><span class="type">unordered_map&amp;</span> <a name="id3138087-bb"></a><span class="bold"><strong>operator</strong></span>=(unordered_map <span class="bold"><strong>const</strong></span>&amp;);</pre>
+
<p>The assignment operator. Copies the contained elements, hash function, predicate and maximum load factor but not the allocator.<br>赋值操作符。复制 所含的元素、散列函数、谓词、最大负载因子,但不复制分配器。</p> -<pre class="literallayout"><span class="type">allocator_type</span> <a name="id3138115-bb"></a>get_allocator() <span class="bold"><strong>const</strong></span>;</pre>
+<div class="variablelist">
+<table border="0">
+<colgroup><col align="left" valign="top"></colgroup><tbody>
+<tr>
+<td>
+<p><span class="term">Notes:</span></p><p><span class="term">说 明:</span></p></td>
+<td>
+<p>On compilers without rvalue references, there is a single assignment operator +with the signature <code class="computeroutput">operator=(unordered_map)</code> in +order to emulate move semantics.</p><p>在没有右值引用的编译器上,有一个署名 为 <code class="computeroutput">operator=(unordered_set)</code> 的赋值操作 符,用于模拟移动语义。</p></td></tr>
+<tr>
+<td>
+<p><span class="term">Requires:</span></p><p><span class="term">要 求:</span></p></td>
+<td>
+<p><code class="computeroutput">value_type</code> is copy
+constructible</p><p><code class="computeroutput">value_type</code> 为可复制 构造的</p></td></tr></tbody></table></div><span class="type">unordered_map&amp;</span> <a name="id1302602-bb"></a><span class="bold"><strong>operator</strong></span>=(unordered_map &amp;&amp;);
+<p>The move assignment operator.<br>移动赋值操作符。</p>
+<div class="variablelist">
+<table border="0">
+<colgroup><col align="left" valign="top"></colgroup><tbody>
+<tr>
+<td>
+<p><span class="term">Notes:</span></p><p><span class="term">说 明:</span></p></td>
+<td>
+<p>On compilers without rvalue references, there is a single assignment operator +with the signature <code class="computeroutput">operator=(unordered_map)</code> in +order to emulate move semantics.</p><p>在没有右值引用的编译器上,有一个署名 为 <code class="computeroutput">operator=(unordered_set)</code> 的赋值操作 符,用于模拟移动语义。</p></td></tr>
+<tr>
+<td>
+<p><span class="term">Requires:</span></p><p><span class="term">要 求:</span></p></td>
+<td>
+<p><code class="computeroutput">value_type</code> is move constructible. (TODO: +This is not actually required in this implementation).</p><p><code class="computeroutput">value_type</code> 是可移动构造的。(待办:在本实现中并 不真正要求)。</p></td></tr></tbody></table></div><pre class="literallayout"><span class="type">allocator_type</span> <a name="id3138115-bb"></a>get_allocator() <span class="bold"><strong>const</strong></span>;</pre>
 <div class="refsect2" lang="en">
 <a name="id3765436"></a><h3>
<a name="id3138127-bb"></a><code class="computeroutput">unordered_map</code> size and capacity 大小与容量 </h3>
=======================================
--- /trunk/doc/html/boost/unordered_multimap.html       Wed Sep  2 20:31:58 2009
+++ /trunk/doc/html/boost/unordered_multimap.html       Mon Dec 21 22:10:07 2009
@@ -48,7 +48,8 @@
<span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> Key, <span class="bold"><strong>typename</strong></span> Mapped, <span class="bold"><strong>typename</strong></span> Hash, <span class="bold"><strong>typename</strong></span> Pred, <br> <span class="bold"><strong>typename</strong></span> Alloc&gt; <br> <span class="type"><span class="bold"><strong>void</strong></span></span> <a class="link" href="unordered_multimap.html#boost.swap_id3131384">swap</a>(unordered_multimap&lt;Key, Mapped, Hash, Pred, Alloc&gt;&amp;, <br> unordered_multimap&lt;Key, Mapped, Hash, Pred, Alloc&gt;&amp;);</pre></div>
 <div class="refsect1" lang="en">
 <a name="id3769709"></a><h2>Description 说明</h2>
-<p>For the normative reference see chapter 23 of <a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2691.pdf"; target="_top">the working draft of the C++ standard [n2691].</a><br>标准化参 考请见 <a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2691.pdf"; target="_top">C++标准工作草案[n2691]</a> 第23章。</p> +<p>Based on chapter 23 of <a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2009/n2960.pdf"; target="_top">the working draft of the C++ standard [n2960]</a>. But without the +updated rules for allocators.&nbsp;<br>基于 <a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2009/n2960.pdf"; target="_top">C++标准工作草案[n2690]</a> 第23章。但不包含对分配器的最新规 则。</p>
 <p><span class="bold"><strong>Template Parameters 模板参数</strong></span>
               </p>
 <div class="informaltable"><table class="table">
@@ -105,14 +106,14 @@
 <p>
<span class="bold"><strong>typedef</strong></span> <span class="emphasis"><em>implementation-defined</em></span> <a name="boost.unordered_multimap.iterator"></a>iterator;</p> <p>A iterator whose value type is <span class="type">value_type</span>.<br>一个常量迭代器,它的值类型为 value_type。 </p> -<p>Any iterator category except output iterator.<br>除输出迭代器以外的任意 迭代器类别。</p> +<p>The iterator category is at least a forward iterator.<br>迭代器类别至少 为前向迭代器。</p> <p>Convertible to <span class="type">const_iterator</span>.<br>可转换为 const_iterator。</p>
 </li>
 <li>
 <p>
<span class="bold"><strong>typedef</strong></span> <span class="emphasis"><em>implementation-defined</em></span> <a name="boost.unordered_multimap.const_iterator"></a>const_iterator;</p> <p>A constant iterator whose value type is <span class="type">value_type</span>.<br>一个常量迭代器,它的值类型为 value_type。 </p> -<p>Any iterator category except output iterator.<br>除输出迭代器以外的任意 迭代器类别。</p> +<p>The iterator category is at least a forward iterator.<br>迭代器类别至少 为前向迭代器。</p>
 </li>
 <li>
 <p>
@@ -152,27 +153,86 @@
 <p>Constructs an empty container with at least n buckets, using hf as
 the hash function, eq as the key equality predicate, a as the allocator
 and a maximum load factor of 1.0 and inserts the elements from [f, l)
-into it.<br>构造一个带至少 n 个桶的空容器,以 hf 作为散列函数,eq 作为键值 等同性谓词,a 作为分配器,最大负载因子为 1.0,并插入 [f,l) 的元素。</p>
-</li>
-<li>
-<pre class="literallayout"><a name="id3144869-bb"></a>unordered_multimap(unordered_multimap <span class="bold"><strong>const</strong></span>&amp;);</pre> -<p>The copy constructor. Copies the contained elements, hash function, predicate, maximum load factor and allocator.<br>复制构造函数。复制所含的元 素、散列函数、谓词、最大负载因子和分配器。</p>
-</li>
-<li>
-<pre class="literallayout"><span class="bold"><strong>explicit</strong></span> <a name="id3144890-bb"></a>unordered_multimap(Allocator <span class="bold"><strong>const</strong></span>&amp; a);</pre> +into it.<br>构造一个带至少 n 个桶的空容器,以 hf 作为散列函数,eq 作为键值 等同性谓词,a 作为分配器,最大负载因子为 1.0,并插入 [f,l) 的元素。 </p></li><li class="listitem"><pre class="literallayout"><a name="id1300583-bb"></a>unordered_multimap(unordered_multimap <span class="bold"><strong>const</strong></span>&amp;);</pre>
+<p>The copy constructor. Copies the contained elements, hash function,
+predicate, maximum load factor and allocator.<br>复制构造函数。复制所含的元 素、散列函数、谓词、最大负载因子和分配器。</p>
+<div class="variablelist">
+<table border="0">
+<colgroup><col align="left" valign="top"></colgroup><tbody>
+<tr>
+<td>
+<p><span class="term">Requires:</span></p><p><span class="term">要 求:</span></p></td>
+<td>
+<p><code class="computeroutput">value_type</code> is copy
+constructible</p><p><code class="computeroutput">value_type</code> 为可复制 构造的</p></td></tr></tbody></table></div> +</li><li class="listitem"><pre class="literallayout"><a name="id1300614-bb"></a>unordered_multimap(unordered_multimap &amp;&amp;);</pre>
+<p>The move constructor.<br>移动构造函数。</p>
+<div class="variablelist">
+<table border="0">
+<colgroup><col align="left" valign="top"></colgroup><tbody>
+<tr>
+<td>
+<p><span class="term">Notes:</span></p><p><span class="term">说 明:</span></p></td>
+<td>
+<p>This is emulated on compilers without rvalue references.</p><p>在不带右 值引用的编译器上的模拟。</p></td></tr>
+<tr>
+<td>
+<p><span class="term">Requires:</span></p><p><span class="term">要 求:</span></p></td>
+<td>
+<p><code class="computeroutput">value_type</code> is move constructible. (TODO: +This is not actually required in this implementation).</p><p><code class="computeroutput">value_type</code> 是可移动构造的。(待办:在本实现中并 不真正要求)。</p></td></tr></tbody></table></div></li><li><pre class="literallayout"><span class="bold"><strong>explicit</strong></span> <a name="id3144890-bb"></a>unordered_multimap(Allocator <span class="bold"><strong>const</strong></span>&amp; a);</pre> <p>Constructs an empty container, using allocator <code class="computeroutput">a</code>.<br>构造一个空容器,使用分配器 <code class="computeroutput">a</code>。</p>
 </li>
 <li>
<pre class="literallayout"><a name="id3144918-bb"></a>unordered_multimap(unordered_multimap <span class="bold"><strong>const</strong></span>&amp; x, Allocator <span class="bold"><strong>const</strong></span>&amp; a);</pre> <p>Constructs an container, copying <code class="computeroutput">x</code>'s contained elements, hash function, predicate, maximum load factor, but using allocator <code class="computeroutput">a</code>.<br>构造一个容器,复制 <code class="computeroutput">x</code> 所含的元素、散列函数、谓词、最大负载因子,但 使用分配器
-<code class="computeroutput">a</code>。</p>
-</li>
-<li><pre class="literallayout"><a name="id3144958-bb"></a>~unordered_multimap();</pre></li>
-</ol></div>
+<code class="computeroutput">a</code>。</p></li><li class="listitem"><pre class="literallayout"><a name="id1300723-bb"></a>~unordered_multimap();</pre>
+<div class="variablelist">
+<table border="0">
+<colgroup><col align="left" valign="top"></colgroup><tbody>
+<tr>
+<td>
+<p><span class="term">Notes:</span></p><p><span class="term">说 明:</span></p></td>
+<td>
+<p>The destructor is applied to every element, and all memory is
+deallocated</p><p>对每个元素调用构造函数,并释放所有内存。 </p></td></tr></tbody></table></div></li></ol></div>
 </div>
<pre class="literallayout"><span class="type">unordered_multimap&amp;</span> <a name="id3144962-bb"></a><span class="bold"><strong>operator</strong></span>=(unordered_multimap <span class="bold"><strong>const</strong></span>&amp;);</pre>
+
<p>The assignment operator. Copies the contained elements, hash function, predicate and maximum load factor but not the allocator.<br>赋值操作符。复制 所含的元素、散列函数、谓词、最大负载因子,但不复制分配器。</p> -<pre class="literallayout"><span class="type">allocator_type</span> <a name="id3144990-bb"></a>get_allocator() <span class="bold"><strong>const</strong></span>;</pre>
+<div class="variablelist">
+<table border="0">
+<colgroup><col align="left" valign="top"></colgroup><tbody>
+<tr>
+<td>
+<p><span class="term">Notes:</span></p><p><span class="term">说 明:</span></p></td>
+<td>
+<p>On compilers without rvalue references, there is a single assignment operator +with the signature <code class="computeroutput">operator=(unordered_multimap)</code> in order to emulate +move semantics.</p><p>在没有右值引用的编译器上,有一个署名为 <code class="computeroutput">operator=(unordered_set)</code> 的赋值操作符,用于模 拟移动语义。</p></td></tr>
+<tr>
+<td>
+<p><span class="term">Requires:</span></p><p><span class="term">要 求:</span></p></td>
+<td>
+<p><code class="computeroutput">value_type</code> is copy
+constructible</p><p><code class="computeroutput">value_type</code> 为可复制 构造的</p></td></tr></tbody></table></div><span class="type">unordered_multimap&amp;</span> <a name="id1300787-bb"></a><span class="bold"><strong>operator</strong></span>=(unordered_multimap &amp;&amp;);
+<p>The move assignment operator.<br>移动赋值操作符。</p>
+<div class="variablelist">
+<table border="0">
+<colgroup><col align="left" valign="top"></colgroup><tbody>
+<tr>
+<td>
+<p><span class="term">Notes:</span></p><p><span class="term">说 明:</span></p></td>
+<td>
+<p>On compilers without rvalue references, there is a single assignment operator +with the signature <code class="computeroutput">operator=(unordered_multimap)</code> in order to emulate +move semantics.</p><p>在没有右值引用的编译器上,有一个署名为 <code class="computeroutput">operator=(unordered_set)</code> 的赋值操作符,用于模 拟移动语义。</p></td></tr>
+<tr>
+<td>
+<p><span class="term">Requires:</span></p><p><span class="term">要 求:</span></p></td>
+<td>
+<p><code class="computeroutput">value_type</code> is move constructible. (TODO: +This is not actually required in this implementation).</p><p><code class="computeroutput">value_type</code> 是可移动构造的。(待办:在本实现中并 不真正要求)。</p></td></tr></tbody></table></div><pre class="literallayout"><span class="type">allocator_type</span> <a name="id3144990-bb"></a>get_allocator() <span class="bold"><strong>const</strong></span>;</pre>
 <div class="refsect2" lang="en">
 <a name="id3770379"></a><h3>
<a name="id3145002-bb"></a><code class="computeroutput">unordered_multimap</code> size and capacity 大小与容 量</h3>
=======================================
--- /trunk/doc/html/boost/unordered_multiset.html       Wed Sep  2 20:31:58 2009
+++ /trunk/doc/html/boost/unordered_multiset.html       Mon Dec 21 22:10:07 2009
@@ -47,7 +47,8 @@
<span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> Value, <span class="bold"><strong>typename</strong></span> Hash, <span class="bold"><strong>typename</strong></span> Pred, <span class="bold"><strong>typename</strong></span> Alloc&gt; <br> <span class="type"><span class="bold"><strong>void</strong></span></span> <a class="link" href="unordered_multiset.html#boost.swap_id3144381">swap</a>(unordered_multiset&lt;Value, Hash, Pred, Alloc&gt;&amp;, <br> unordered_multiset&lt;Value, Hash, Pred, Alloc&gt;&amp;);</pre></div>
 <div class="refsect1" lang="en">
 <a name="id3759464"></a><h2>Description 说明</h2>
-<p>For the normative reference see chapter 23 of <a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2691.pdf"; target="_top">the working draft of the C++ standard [n2691].</a><br>标准化参 考请见 <a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2691.pdf"; target="_top">C++标准工作草案[n2691]</a> 第23章。</p> +<p>Based on chapter 23 of <a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2009/n2960.pdf"; target="_top">the working draft of the C++ standard [n2960]</a>. But without the +updated rules for allocators.&nbsp;<br>基于 <a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2009/n2960.pdf"; target="_top">C++标准工作草案[n2690]</a> 第23章。但不包含对分配器的最新规 则。</p>
 <p><span class="bold"><strong>Template Parameters 模板参数</strong></span>
               </p>
 <div class="informaltable"><table class="table">
@@ -99,14 +100,14 @@
 <p>
<span class="bold"><strong>typedef</strong></span> <span class="emphasis"><em>implementation-defined</em></span> <a name="boost.unordered_multiset.iterator"></a>iterator;</p> <p>A constant iterator whose value type is <span class="type">value_type</span>.<br>一个常量迭代器,它的值类型为 value_type。 </p> -<p>Any iterator category except output iterator.<br>除输出迭代器以外的任意 迭代器类别。</p> +<p>The iterator category is at least a forward iterator.<br>迭代器类别至少 为前向迭代器。</p> <p>Convertible to <span class="type">const_iterator</span>.<br>可转换为 const_iterator。</p>
 </li>
 <li>
 <p>
<span class="bold"><strong>typedef</strong></span> <span class="emphasis"><em>implementation-defined</em></span> <a name="boost.unordered_multiset.const_iterator"></a>const_iterator;</p> <p>A constant iterator whose value type is <span class="type">value_type</span>.<br>一个常量迭代器,它的值类型为 value_type。 </p> -<p>Any iterator category except output iterator.<br>除输出迭代器以外的任意 迭代器类别。</p> +<p>The iterator category is at least a forward iterator.<br>迭代器类别至少 为前向迭代器。</p>
 </li>
 <li>
 <p>
@@ -150,14 +151,34 @@
 <p>Constructs an empty container with at least n buckets, using hf as
 the hash function, eq as the key equality predicate, a as the allocator
 and a maximum load factor of 1.0 and inserts the elements from [f, l)
-into it.<br>构造一个带至少 n 个桶的空容器,以 hf 作为散列函数,eq 作为键值 等同性谓词,a 作为分配器,最大负载因子为 1.0,并插入 [f,l) 的元素。</p>
-</li>
-<li>
-<pre class="literallayout"><a name="id3129029-bb"></a>unordered_multiset(unordered_multiset <span class="bold"><strong>const</strong></span>&amp;);</pre> -<p>The copy constructor. Copies the contained elements, hash function, predicate, maximum load factor and allocator.<br>复制构造函数。复制所含的元 素、散列函数、谓词、最大负载因子和分配器。</p>
-</li>
-<li>
-<pre class="literallayout"><span class="bold"><strong>explicit</strong></span> <a name="id3129050-bb"></a>unordered_multiset(Allocator <span class="bold"><strong>const</strong></span>&amp; a);</pre> +into it.<br>构造一个带至少 n 个桶的空容器,以 hf 作为散列函数,eq 作为键值 等同性谓词,a 作为分配器,最大负载因子为 1.0,并插入 [f,l) 的元素。 </p></li><li class="listitem"><pre class="literallayout"><a name="id1307088-bb"></a>unordered_multiset(unordered_multiset <span class="bold"><strong>const</strong></span>&amp;);</pre>
+<p>The copy constructor. Copies the contained elements, hash function,
+predicate, maximum load factor and allocator.<br>复制构造函数。复制所含的元 素、散列函数、谓词、最大负载因子和分配器。</p>
+<div class="variablelist">
+<table border="0">
+<colgroup><col align="left" valign="top"></colgroup><tbody>
+<tr>
+<td>
+<p><span class="term">Requires:</span></p><p><span class="term">要 求:</span></p></td>
+<td>
+<p><code class="computeroutput">value_type</code> is copy
+constructible</p><p><code class="computeroutput">value_type</code> 为可复制 构造的</p></td></tr></tbody></table></div> +</li><li class="listitem"><pre class="literallayout"><a name="id1307037-bb"></a>unordered_multiset(unordered_multiset &amp;&amp;);</pre>
+<p>The move constructor.<br>移动构造函数。</p>
+<div class="variablelist">
+<table border="0">
+<colgroup><col align="left" valign="top"></colgroup><tbody>
+<tr>
+<td>
+<p><span class="term">Notes:</span></p><p><span class="term">说 明:</span></p></td>
+<td>
+<p>This is emulated on compilers without rvalue references.</p><p>在不带右 值引用的编译器上的模拟。</p></td></tr>
+<tr>
+<td>
+<p><span class="term">Requires:</span></p><p><span class="term">要 求:</span></p></td>
+<td>
+<p><code class="computeroutput">value_type</code> is move constructible. (TODO: +This is not actually required in this implementation).</p><p><code class="computeroutput">value_type</code> 是可移动构造的。(待办:在本实现中并 不真正要求)。</p></td></tr></tbody></table></div></li><li><pre class="literallayout"><span class="bold"><strong>explicit</strong></span> <a name="id3129050-bb"></a>unordered_multiset(Allocator <span class="bold"><strong>const</strong></span>&amp; a);</pre> <p>Constructs an empty container, using allocator <code class="computeroutput">a</code>.<br>构造一个空容器,使用分配器 <code class="computeroutput">a</code>。</p>
 </li>
 <li>
@@ -165,12 +186,53 @@
<p>Constructs an container, copying <code class="computeroutput">x</code>'s contained elements, hash function, predicate, maximum load factor, but using allocator <code class="computeroutput">a</code>.<br>构造一个容器,复制 <code class="computeroutput">x</code> 所含的元素、散列函数、谓词、最大负载因子,但 使用分配器
 <code class="computeroutput">a</code>。</p>
 </li>
-<li><pre class="literallayout"><a name="id3129119-bb"></a>~unordered_multiset();</pre></li>
-</ol></div>
+<li><pre class="literallayout"><a name="id1337745-bb"></a>~unordered_set();</pre>
+
+
+<table border="0"><colgroup><col align="left" valign="top"></colgroup><tbody>
+<tr>
+<td>
+<p><span class="term">Notes:</span></p><p><span class="term">说 明:</span></p></td>
+<td>
+<p>The destructor is applied to every element, and all memory is
+deallocated</p><p>对每个元素调用构造函数,并释放所有内存。 </p></td></tr></tbody></table></li></ol></div>
 </div>
<pre class="literallayout"><span class="type">unordered_multiset&amp;</span> <a name="id3129122-bb"></a><span class="bold"><strong>operator</strong></span>=(unordered_multiset <span class="bold"><strong>const</strong></span>&amp;);</pre>
+
<p>The assignment operator. Copies the contained elements, hash function, predicate and maximum load factor but not the allocator.<br>赋值操作符。复制 所含的元素、散列函数、谓词、最大负载因子,但不复制分配器。</p> -<pre class="literallayout"><span class="type">allocator_type</span> <a name="id3129150-bb"></a>get_allocator() <span class="bold"><strong>const</strong></span>;</pre>
+<div class="variablelist">
+<table border="0">
+<colgroup><col align="left" valign="top"></colgroup><tbody>
+<tr>
+<td>
+<p><span class="term">Notes:</span></p><p><span class="term">说 明:</span></p></td>
+<td>
+<p>On compilers without rvalue references, there is a single assignment operator +with the signature <code class="computeroutput">operator=(unordered_multiset)</code> in order to emulate +move semantics.</p><p>在没有右值引用的编译器上,有一个署名为 <code class="computeroutput">operator=(unordered_set)</code> 的赋值操作符,用于模 拟移动语义。</p></td></tr>
+<tr>
+<td>
+<p><span class="term">Requires:</span></p><p><span class="term">要 求:</span></p></td>
+<td>
+<p><code class="computeroutput">value_type</code> is copy
+constructible</p><p><code class="computeroutput">value_type</code> 为可复制 构造的</p></td></tr></tbody></table></div><span class="type">unordered_multiset&amp;</span> <a name="id1304986-bb"></a><span class="bold"><strong>operator</strong></span>=(unordered_multiset &amp;&amp;);
+<p>The move assignment operator.<br>移动赋值操作符。</p>
+<div class="variablelist">
+<table border="0">
+<colgroup><col align="left" valign="top"></colgroup><tbody>
+<tr>
+<td>
+<p><span class="term">Notes:</span></p><p><span class="term">说 明:</span></p></td>
+<td>
+<p>On compilers without rvalue references, there is a single assignment operator +with the signature <code class="computeroutput">operator=(unordered_multiset)</code> in order to emulate +move semantics.</p><p>在没有右值引用的编译器上,有一个署名为 <code class="computeroutput">operator=(unordered_set)</code> 的赋值操作符,用于模 拟移动语义。</p></td></tr>
+<tr>
+<td>
+<p><span class="term">Requires:</span></p><p><span class="term">要 求:</span></p></td>
+<td>
+<p><code class="computeroutput">value_type</code> is move constructible. (TODO: +This is not actually required in this implementation).</p><p><code class="computeroutput">value_type</code> 是可移动构造的。(待办:在本实现中并 不真正要求)。</p></td></tr></tbody></table></div><pre class="literallayout"><span class="type">allocator_type</span> <a name="id3129150-bb"></a>get_allocator() <span class="bold"><strong>const</strong></span>;</pre>
 <div class="refsect2" lang="en">
 <a name="id3760126"></a><h3>
<a name="id3129162-bb"></a><code class="computeroutput">unordered_multiset</code> size and capacity 大小与容 量</h3>
=======================================
--- /trunk/doc/html/boost/unordered_set.html    Wed Sep  2 20:31:58 2009
+++ /trunk/doc/html/boost/unordered_set.html    Mon Dec 21 22:10:07 2009
@@ -45,7 +45,8 @@
<span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> Value, <span class="bold"><strong>typename</strong></span> Hash, <span class="bold"><strong>typename</strong></span> Pred, <span class="bold"><strong>typename</strong></span> Alloc&gt; <br> <span class="type"><span class="bold"><strong>bool</strong></span></span> <a class="link" href="unordered_set.html#boost.operator==_id3129859"><span class="bold"><strong>operator</strong></span>==</a>(unordered_set&lt;Value, Hash, Pred, Alloc&gt; <span class="bold"><strong>const</strong></span>&amp;, <br> unordered_set&lt;Value, Hash, Pred, Alloc&gt; <span class="bold"><strong>const</strong></span>&amp;);<br><span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> Value, <span class="bold"><strong>typename</strong></span> Hash, <span class="bold"><strong>typename</strong></span> Pred, <span class="bold"><strong>typename</strong></span> Alloc&gt; <br> <span class="type"><span class="bold"><strong>bool</strong></span></span> <a class="link" href="unordered_set.html#boost.operator%21=_id3129927"><span class="bold"><strong>operator</strong></span>!=</a>(unordered_set&lt;Value, Hash, Pred, Alloc&gt; <span class="bold"><strong>const</strong></span>&amp;, <br> unordered_set&lt;Value, Hash, Pred, Alloc&gt; <span class="bold"><strong>const</strong></span>&amp;);<br><br><span class="emphasis"><em>// <a class="link" href="unordered_set.html#id3129997-bb">swap</a></em></span> <span class="bold"><strong>template</strong></span>&lt;<span class="bold"><strong>typename</strong></span> Value, <span class="bold"><strong>typename</strong></span> Hash, <span class="bold"><strong>typename</strong></span> Pred, <span class="bold"><strong>typename</strong></span> Alloc&gt; <br> <span class="type"><span class="bold"><strong>void</strong></span></span> <a class="link" href="unordered_set.html#boost.swap_id3130002">swap</a>(unordered_set&lt;Value, Hash, Pred, Alloc&gt;&amp;, <br> unordered_set&lt;Value, Hash, Pred, Alloc&gt;&amp;);</pre></div>
 <div class="refsect1" lang="en">
-<a name="id3754819"></a><h2>Description 说明</h2><p>For the normative reference see chapter 23 of <a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2691.pdf"; target="_top">the working draft of the C++ standard [n2691].</a><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2461.pdf"; target="_top"></a><br>标准化参考请见 <a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2691.pdf"; target="_top">C++标准工作草案[n2691]</a> 第23章。</p> +<a name="id3754819"></a><h2>Description 说明</h2><p>Based on chapter 23 of <a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2009/n2960.pdf"; target="_top">the working draft of the C++ standard [n2960]</a>. But without the +updated rules for allocators.&nbsp;<br>基于 <a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2009/n2960.pdf"; target="_top">C++标准工作草案[n2690]</a> 第23章。但不包含对分配器的最新规 则。</p>
 <p><span class="bold"><strong>Template Parameters 模板参数</strong></span>
               </p>
 <div class="informaltable"><table class="table">
@@ -95,14 +96,14 @@
 <p>
<span class="bold"><strong>typedef</strong></span> <span class="emphasis"><em>implementation-defined</em></span> <a name="boost.unordered_set.iterator"></a>iterator;</p> <p>A constant iterator whose value type is <span class="type">value_type</span>.<br>一个常量迭代器,它的值类型为 value_type。 </p> -<p>Any iterator category except output iterator.<br>除输出迭代器以外的任意 迭代器类别。</p> +<p>The iterator category is at least a forward iterator.<br>迭代器类别至少 为前向迭代器。</p> <p>Convertible to <span class="type">const_iterator</span>.<br>可转换为 const_iterator。</p>
 </li>
 <li>
 <p>
<span class="bold"><strong>typedef</strong></span> <span class="emphasis"><em>implementation-defined</em></span> <a name="boost.unordered_set.const_iterator"></a>const_iterator;</p> <p>A constant iterator whose value type is <span class="type">value_type</span>.<br>一个常量迭代器,它的值类型为 value_type。 </p> -<p>Any iterator category except output iterator.<br>除输出迭代器以外的任意 迭代器类别。</p> +<p>The iterator category is at least a forward iterator.<br>迭代器类别至少 为前向迭代器。</p>
 </li>
 <li>
 <p>
@@ -142,26 +143,86 @@
 <p>Constructs an empty container with at least n buckets, using hf as
 the hash function, eq as the key equality predicate, a as the allocator
 and a maximum load factor of 1.0 and inserts the elements from [f, l)
-into it.<br>构造一个带至少 n 个桶的空容器,以 hf 作为散列函数,eq 作为键值 等同性谓词,a 作为分配器,最大负载因子为 1.0,并插入 [f,l) 的元素。</p>
-</li>
-<li>
-<pre class="literallayout"><a name="id2918698-bb"></a>unordered_set(unordered_set <span class="bold"><strong>const</strong></span>&amp;);</pre> -<p>The copy constructor. Copies the contained elements, hash function, predicate, maximum load factor and allocator.<br>复制构造函数。复制所含的元 素、散列函数、谓词、最大负载因子和分配器。</p>
-</li>
-<li>
-<pre class="literallayout"><span class="bold"><strong>explicit</strong></span> <a name="id2918718-bb"></a>unordered_set(Allocator <span class="bold"><strong>const</strong></span>&amp; a);</pre> +into it.<br>构造一个带至少 n 个桶的空容器,以 hf 作为散列函数,eq 作为键值 等同性谓词,a 作为分配器,最大负载因子为 1.0,并插入 [f,l) 的元素。 </p></li><li class="listitem"><pre class="literallayout"><a name="id1337605-bb"></a>unordered_set(unordered_set <span class="bold"><strong>const</strong></span>&amp;);</pre>
+<p>The copy constructor. Copies the contained elements, hash function,
+predicate, maximum load factor and allocator.<br>复制构造函数。复制所含的元 素、散列函数、谓词、最大负载因子和分配器。</p>
+<div class="variablelist">
+<table border="0">
+<colgroup><col align="left" valign="top"></colgroup><tbody>
+<tr>
+<td>
+<p><span class="term">Requires:</span></p><p><span class="term">要 求:</span></p></td>
+<td>
+<p><code class="computeroutput">value_type</code> is copy
+constructible</p><p><code class="computeroutput">value_type</code> 为可复制 构造的</p></td></tr></tbody></table></div> +</li><li class="listitem"><pre class="literallayout"><a name="id1337636-bb"></a>unordered_set(unordered_set &amp;&amp;);</pre>
+<p>The move constructor.<br>移动构造函数。</p>
+<div class="variablelist">
+<table border="0">
+<colgroup><col align="left" valign="top"></colgroup><tbody>
+<tr>
+<td>
+<p><span class="term">Notes:</span></p><p><span class="term">说 明:</span></p></td>
+<td>
+<p>This is emulated on compilers without rvalue references.</p><p>在不带右 值引用的编译器上的模拟。</p></td></tr>
+<tr>
+<td>
+<p><span class="term">Requires:</span></p><p><span class="term">要 求:</span></p></td>
+<td>
+<p><code class="computeroutput">value_type</code> is move constructible. (TODO: +This is not actually required in this implementation).</p><p><code class="computeroutput">value_type</code> 是可移动构造的。(待办:在本实现中并 不真正要求)。 +</p></td></tr></tbody></table></div></li><li><pre class="literallayout"><span class="bold"><strong>explicit</strong></span> <a name="id2918718-bb"></a>unordered_set(Allocator <span class="bold"><strong>const</strong></span>&amp; a);</pre> <p>Constructs an empty container, using allocator <code class="computeroutput">a</code>.<br>构造一个空容器,使用分配器 <code class="computeroutput">a</code>。</p>
 </li>
 <li>
<pre class="literallayout"><a name="id2918747-bb"></a>unordered_set(unordered_set <span class="bold"><strong>const</strong></span>&amp; x, Allocator <span class="bold"><strong>const</strong></span>&amp; a);</pre> -<p>Constructs an container, copying <code class="computeroutput">x</code>'s contained elements, hash function, predicate, maximum load factor, but using allocator <code class="computeroutput">a</code>.<br>构造一个容器,复制 <code class="computeroutput">x</code> 所含的元素、散列函数、谓词、最大负载因子,但 使用分配器 <code class="computeroutput">a</code>。</p>
-</li>
-<li><pre class="literallayout"><a name="id2962349-bb"></a>~unordered_set();</pre></li>
-</ol></div>
+<p>Constructs an container, copying <code class="computeroutput">x</code>'s contained elements, hash function, predicate, maximum load factor, but using allocator <code class="computeroutput">a</code>.<br>构造一个容器,复制 <code class="computeroutput">x</code> 所含的元素、散列函数、谓词、最大负载因子,但 使用分配器 <code class="computeroutput">a</code>。</p></li><li class="listitem"><pre class="literallayout"><a name="id1337745-bb"></a>~unordered_set();</pre>
+<div class="variablelist">
+<table border="0">
+<colgroup><col align="left" valign="top"></colgroup><tbody>
+<tr>
+<td>
+<p><span class="term">Notes:</span></p><p><span class="term">说 明:</span></p></td>
+<td>
+<p>The destructor is applied to every element, and all memory is
+deallocated</p><p>对每个元素调用构造函数,并释放所有内存。 </p></td></tr></tbody></table><br></div></li></ol></div>
 </div>
<pre class="literallayout"><span class="type">unordered_set&amp;</span> <a name="id2962353-bb"></a><span class="bold"><strong>operator</strong></span>=(unordered_set <span class="bold"><strong>const</strong></span>&amp;);</pre>
+
<p>The assignment operator. Copies the contained elements, hash function, predicate and maximum load factor but not the allocator.<br>赋值操作符。复制 所含的元素、散列函数、谓词、最大负载因子,但不复制分配器。</p> -<pre class="literallayout"><span class="type">allocator_type</span> <a name="id2962380-bb"></a>get_allocator() <span class="bold"><strong>const</strong></span>;</pre>
+<div class="variablelist">
+<table border="0">
+<colgroup><col align="left" valign="top"></colgroup><tbody>
+<tr>
+<td>
+<p><span class="term">Notes:</span></p><p><span class="term">说 明:</span></p></td>
+<td>
+<p>On compilers without rvalue references, there is a single assignment operator +with the signature <code class="computeroutput">operator=(unordered_set)</code> in +order to emulate move semantics.</p><p>在没有右值引用的编译器上,有一个署名 为 <code class="computeroutput">operator=(unordered_set)</code> 的赋值操作 符,用于模拟移动语义。 </p></td></tr>
+<tr>
+<td>
+<p><span class="term">Requires:</span></p><p><span class="term">要 求:</span></p></td>
+<td>
+<p><code class="computeroutput">value_type</code> is copy
+constructible</p><p><code class="computeroutput">value_type</code> 为可复制 构造的</p></td></tr></tbody></table></div><span class="type">unordered_set&amp;</span> <a name="id1337809-bb"></a><span class="bold"><strong>operator</strong></span>=(unordered_set &amp;&amp;);
+<p>The move assignment operator.<br>移动赋值操作符。</p>
+<div class="variablelist">
+<table border="0">
+<colgroup><col align="left" valign="top"></colgroup><tbody>
+<tr>
+<td>
+<p><span class="term">Notes:</span></p><p><span class="term">说 明:</span></p></td>
+<td>
+<p>On compilers without rvalue references, there is a single assignment operator +with the signature <code class="computeroutput">operator=(unordered_set)</code> in +order to emulate move semantics.</p><p>在没有右值引用的编译器上,有一个署名 为 <code class="computeroutput">operator=(unordered_set)</code> 的赋值操作 符,用于模拟移动语义。</p></td></tr>
+<tr>
+<td>
+<p><span class="term">Requires:</span></p><p><span class="term">要 求:</span></p></td>
+<td>
+<p><code class="computeroutput">value_type</code> is move constructible. (TODO: +This is not actually required in this implementation).</p><p><code class="computeroutput">value_type</code> 是可移动构造的。(待办:在本实现中并 不真正要求)。</p></td></tr></tbody></table></div><pre class="literallayout"><span class="type">allocator_type</span> <a name="id2962380-bb"></a>get_allocator() <span class="bold"><strong>const</strong></span>;</pre>
 <div class="refsect2" lang="en">
 <a name="id3755477"></a><h3>
<a name="id2980347-bb"></a><code class="computeroutput">unordered_set</code> size and capacity 大小与容量 </h3>
=======================================
--- /trunk/doc/html/proto/reference.html        Wed Sep  2 00:28:21 2009
+++ /trunk/doc/html/proto/reference.html        Mon Dec 21 22:10:07 2009
@@ -270,6 +270,7 @@
</li><li><code class="computeroutput"><code class="computeroutput"><a class="link" title="Struct template negate" href="../boost/proto/negate.html">proto::negate</a></code> </code> </li><li><code class="computeroutput"><code class="computeroutput"><a class="link" title="Struct template noinvoke" href="../boost/proto/noinvoke.html">proto::noinvoke</a></code></code><code class="computeroutput"><code class="computeroutput"></code></code></li><li><code class="computeroutput"><code class="computeroutput"><a class="link" title="Struct template not_" href="../boost/proto/not_.html">proto::not_</a></code> </code> </li><li><code class="computeroutput"><code class="computeroutput"><a class="link" title="Struct template not_equal_to" href="../boost/proto/not_equal_to.html">proto::not_equal_to</a></code> </code> +</li><li><code class="computeroutput"><code class="computeroutput"><a class="link" title="Struct template nullary_expr" href="../boost/proto/nullary_expr.html">proto::nullary_expr</a></code> </code> </li><li><code class="computeroutput"><code class="computeroutput"><a class="link" title="Struct template or_" href="../boost/proto/or_.html">proto::or_</a></code>
 </code>
</li><li><code class="computeroutput"><code class="computeroutput"><a class="link" title="Struct template otherwise" href="../boost/proto/otherwise.html">proto::otherwise</a></code> </code>
@@ -367,10 +368,7 @@
</li><li><code class="computeroutput"><code class="computeroutput"><a class="link" title="Struct multiplies_assign" href="../boost/proto/tag/multiplies_assign.html">proto::tag::multiplies_assign</a></code>
 </code>
</li><li><code class="computeroutput"><code class="computeroutput"><a class="link" title="Struct negate" href="../boost/proto/tag/negate.html">proto::tag::negate</a></code> </code> -</li><li><code class="computeroutput"><code class="computeroutput"><a class="link" title="Struct not_equal_to" href="../boost/proto/tag/not_equal_to.html">proto::tag::not_equal_to</a></code>
-</code>
-</li><li><code class="computeroutput"><code class="computeroutput"><a class="link" title="Struct template nullary_expr" href="../boost/proto/nullary_expr.html">proto::nullary_expr</a></code> </code> -</li><li><code class="computeroutput"><code class="computeroutput"><a class="link" title="Struct plus" href="../boost/proto/tag/plus.html">proto::tag::plus</a></code> </code> +</li><li><code class="computeroutput"><code class="computeroutput"><a class="link" title="Struct not_equal_to" href="../boost/proto/tag/not_equal_to.html">proto::tag::not_equal_to</a></code></code></li><li><code class="computeroutput"><code class="computeroutput"><a class="link" title="Struct plus" href="../boost/proto/tag/plus.html">proto::tag::plus</a></code> </code> </li><li><code class="computeroutput"><code class="computeroutput"><a class="link" title="Struct plus_assign" href="../boost/proto/tag/plus_assign.html">proto::tag::plus_assign</a></code>
 </code>
</li><li><code class="computeroutput"><code class="computeroutput"><a class="link" title="Struct post_dec" href="../boost/proto/tag/post_dec.html">proto::tag::post_dec</a></code> </code>
=======================================
--- /trunk/doc/html/proto/users_guide.html      Sun May 31 23:21:30 2009
+++ /trunk/doc/html/proto/users_guide.html      Mon Dec 21 22:10:07 2009
File is too large to display a diff.
=======================================
--- /trunk/doc/html/proto.html  Sun Dec 20 18:38:58 2009
+++ /trunk/doc/html/proto.html  Mon Dec 21 22:10:07 2009
@@ -264,7 +264,7 @@
 </div>
 </div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision"; width="100%"><tbody><tr> -<td align="left"><p><small>Last revised: August 24, 2009 at 23:12:59 GMT</small></p></td> +<td align="left"><p><small>Last revised: November 14, 2009 at 10:40:13 GMT</small></p></td>
 <td align="right"><div class="copyright-footer"></div></td>
 </tr></tbody></table>
 <hr>
=======================================
--- /trunk/doc/html/quickbook/change_log.html   Mon Nov 17 23:25:25 2008
+++ /trunk/doc/html/quickbook/change_log.html   Mon Dec 21 22:10:07 2009
@@ -1,171 +1,229 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
-<title>Change Log</title><link rel="stylesheet" href="../boostbook.css" type="text/css"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Change Log</title>
+
+<link rel="stylesheet" href="../boostbook.css" type="text/css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
<link rel="start" href="../index.html" title="The Boost C++ Libraries BoostBook Documentation Subset"> <link rel="up" href="../quickbook.html" title="Chapter&nbsp;28.&nbsp;Quickbook 1.4"> <link rel="prev" href="../quickbook.html" title="Chapter&nbsp;28.&nbsp;Quickbook 1.4">
-<link rel="next" href="syntax.html" title="Syntax Summary"></head>
-<body alink="#0000ff" bgcolor="white" link="#0000ff" text="black" vlink="#840084">
-<table cellpadding="2" width="100%"><tbody><tr>
+<link rel="next" href="syntax.html" title="Syntax Summary">
+</head>
+<body style="color: black; background-color: white;" alink="#0000ff" link="#0000ff" vlink="#840084">
+<table cellpadding="2" width="100%">
+<tbody>
+<tr>
<td valign="top"><img alt="Boost C++ Libraries" src="../../../boost.png" height="86" width="277"></td>
 <td align="center"><a href="../../../index.html">Home</a></td>
 <td align="center"><a href="../../../libs/libraries.htm">Libraries</a></td>
<td align="center"><a href="http://www.boost.org/users/people.html";>People</a></td> <td align="center"><a href="http://www.boost.org/users/faq.html";>FAQ</a></td>
 <td align="center"><a href="../../../more/index.htm">More</a></td>
-</tr></tbody></table>
+</tr>
+</tbody>
+</table>
 <hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../quickbook.html"><img src="../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../quickbook.html"><img src="../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="syntax.html"><img src="../../../doc/html/images/next.png" alt="Next"></a> +<div class="spirit-nav"><a accesskey="p" href="../quickbook.html"><img src="../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../quickbook.html"><img src="../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="syntax.html"><img src="../../../doc/html/images/next.png" alt="Next"></a>
 </div>
 <div class="section" lang="en">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both;">
-<a name="quickbook.change_log"></a><a class="link" href="change_log.html" title="Change Log"> Change Log 变更日志</a>
-</h2></div></div></div>
-<a name="quickbook.change_log.version_1_3"></a><h4>
-<a name="id4090692"></a>
- <a class="link" href="change_log.html#quickbook.change_log.version_1_3">Version 1.3</a>
-    </h4>
-<div class="itemizedlist"><ul type="disc">
-<li>
- Quickbook file inclusion [include].<br>Quickbook 文件包含 [include]。
-      </li>
-<li>
- Better xml output (pretty layout). Check out the generated XML.<br>更好的 xml 输出(更漂亮的布局)。检验生成的XML。
-      </li>
-<li>
- Regression testing facility: to make sure your document will always be compatible - (full backward compatibility) regardless of changes to QuickBook.<br>回归测试工具:确保你的文档无论 QuickBook 有什么变化,都总是兼 容的(完全的后向兼容性)。
-      </li>
-<li>
-        Code cleanup and refactoring.<br>代码清除和重构。
-      </li>
-<li>
- Allow phrase markup in the doc-info.<br>允许在 doc-info 中的短语标 记。
-      </li>
-<li>
- Preformatted code blocks via ``code`` (double ticks) allows code in tables - and lists, for example.<br>通过``code`` (双勾号)对代码块进行预格式 化,可以在表格和列表中使用示例代码。
-      </li>
-<li>
- Quickbook versioning; allows full backward compatibility. You have to add - [quickbook 1.3] to the doc-info header to enable the new features. Without - this, QuickBook will assume that the document is a pre-1.3 document.<br> - Quickbook 版本化;允许完全的后向兼容性。你必须在 doc-info 头文件中 增加 - [quickbook 1.3] 以激活这个新的特性。否则,QuickBook 将假定该文档是 1.3版本以前的文档。
-      </li>
-<li>
- Better (intuitive) paragraph termination. Some markups may terminate a paragraph. - Example:<br>更好的(直观的)段落终止。有些标记可以终止一个段落。例 如: -<pre class="programlisting"><span class="special">[</span><span class="identifier">section</span> <span class="identifier">x</span><span class="special">]</span>
-<span class="identifier">blah</span><span class="special">...</span>
-<span class="special">[</span><span class="identifier">endsect</span><span class="special">]</span></pre>
+<div class="titlepage">
+<div>
+<div>
+<h2 class="title" style="clear: both;"><a name="quickbook.change_log"></a><a class="link" href="change_log.html" title="Change Log"> Change Log
+变更日志</a>
+</h2>
+</div>
+</div>
+</div>
+<a name="quickbook.change_log.version_1_3"></a>
+<h4><a name="id4090692"></a> <a class="link" href="change_log.html#quickbook.change_log.version_1_3">Version
+1.3</a> </h4>
+<div class="itemizedlist">
+<ul type="disc">
+<li> Quickbook file inclusion [include].<br>
+Quickbook 文件包含 [include]。 </li>
+<li> Better xml output (pretty layout). Check out the generated
+XML.<br>
+更好的 xml 输出(更漂亮的布局)。检验生成的XML。 </li>
+<li> Regression testing facility: to make sure your document
+will always be compatible (full backward compatibility) regardless of
+changes to QuickBook.<br>
+回归测试工具:确保你的文档无论 QuickBook 有什么变化,都总是兼容的(完全的后 向兼容性)。 </li>
+<li> Code cleanup and refactoring.<br>
+代码清除和重构。 </li>
+<li> Allow phrase markup in the doc-info.<br>
+允许在 doc-info 中的短语标记。 </li>
+<li> Preformatted code blocks via ``code`` (double ticks)
+allows code in tables and lists, for example.<br>
+通过``code`` (双勾号)对代码块进行预格式化,可以在表格和列表中使用示例代 码。 </li>
+<li> Quickbook versioning; allows full backward compatibility.
+You have to add [quickbook 1.3] to the doc-info header to enable the
+new features. Without this, QuickBook will assume that the document is
+a pre-1.3 document.<br>
+Quickbook 版本化;允许完全的后向兼容性。你必须在 doc-info 头文件中增加 [quickbook 1.3]
+以激活这个新的特性。否则,QuickBook 将假定该文档是1.3版本以前的文档。 </li>
+<li> Better (intuitive) paragraph termination. Some markups may
+terminate a paragraph. Example:<br>
+更好的(直观的)段落终止。有些标记可以终止一个段落。例如:
+<pre class="programlisting"><span class="special">[</span><span class="identifier">section</span> <span class="identifier">x</span><span class="special">]</span><br><span class="identifier">blah</span><span class="special">...</span><br><span class="special">[</span><span class="identifier">endsect</span><span class="special">]</span></pre>
 </li>
-<li>
- Fully qualified section and headers. Subsection names are concatenated to - the ID to avoid clashing. Example: <br>完全限定的章节和头部。子章节 名被连接到ID中,以避免冲突。例如:<br><code class="computeroutput"><span class="identifier">doc_name</span><span class="special">.</span><span class="identifier">sect_name</span><span class="special">.</span><span class="identifier">sub_sect_name</span><span class="special">.</span><span class="identifier">sub_sub_sect_name</span></code>
+<li> Fully qualified section and headers. Subsection names are
+concatenated to the ID to avoid clashing. Example: <br>
+完全限定的章节和头部。子章节名被连接到ID中,以避免冲突。例如:<br>
+<code class="computeroutput"><span class="identifier">doc_name</span><span class="special">.</span><span class="identifier">sect_name</span><span class="special">.</span><span class="identifier">sub_sect_name</span><span class="special">.</span><span class="identifier">sub_sub_sect_name</span></code>
 </li>
+<li> Better &amp;nbsp; and whitespace handling in code
+snippets.<br>
+更好地对代码片断中的 &amp;nbsp; 和空白进行处理。 </li>
+<li> [xinclude] fixes up the relative path to the target XML
+file when input_directory is not the same as the output_directory.<br>
+当&nbsp;input_directory 与 output_directory 不相同时,[xinclude] 修正了到目
+XML 文件的相对路径。 </li>
+<li> Allow untitled tables.<br>
+允许无标题的表格。 </li>
+<li> Allow phrase markups in section titles.<br>
+允许在章节标题中的短语标记。 </li>
+<li> Allow escaping back to QuickBook from code, code blocks
+and inline code.<br>
+允许从代码、代码块和内联代码转义回 QuickBook。 </li>
+<li> Footnotes, with the [footnote This is the footnote] syntax.<br>
+脚注,使用 [footnote 这是一个脚注] 的语法。 </li>
+<li> Post-processor bug fix for escaped XML code that it does
+not recognize.<br>
+对于不被公认的转义XML的后处理中的缺陷修正。 </li>
+<li> Replaceable, with the [~replacement] syntax.<br>
+可替换性,使用 [~replacement] 的语法。 </li>
+</ul>
+</div>
+<a name="quickbook.change_log.version_1_4"></a>
+<h4><a name="id4090886"></a> <a class="link" href="change_log.html#quickbook.change_log.version_1_4">Version
+1.4</a> </h4>
+<div class="itemizedlist">
+<ul type="disc">
+<li> Generic Headers<br>
+通用头文件 </li>
+<li> Code changes to allow full recursion (i.e. Collectors and
+push/pop functions)<br>
+代码改为允许全递归(即 Collectors 和 push/pop 函数) </li>
+<li> Various code cleanup/maintenance<br>
+多处代码清理和维护 </li>
+<li> Templates!<br>
+模板! </li>
+<li> [conceptref] for referencing BoostBook
+&lt;concept&gt; entities.<br>
+[conceptref] 用于引用 BoostBook &lt;concept&gt; 实体。 </li>
+<li> Allow escape of spaces. The escaped space is removed from
+the output. Syntax: <code class="computeroutput"><span class="special">\</span> </code>.<br> +允许空格的转义。转义的空格将从输出中删除。语法:<code class="computeroutput"><span class="special">\</span>&nbsp;</code>。 </li>
+<li> Nested comments are now allowed.<br>
+允许嵌套的注释。 </li>
+<li> Quickbook blocks can nest inside comments.<br>
+可以在注释内部嵌入 Quickbook 块。 </li>
 <li>
- Better &amp;nbsp; and whitespace handling in code snippets.<br>更好 地对代码片断中的 &amp;nbsp; 和空白进行处理。
-      </li>
+<a class="link" href="syntax.html#quickbook.syntax.block.import" title="Import">Import</a>
+facility.<br>
+<a class="link" href="syntax.html#quickbook.syntax.block.import" title="Import">Import</a>
+工具。 </li>
+<li> Callouts on imported code<br>
+在导入代码上的插图编号。 </li>
+<li> Simple markups can now span a whole block.<br>
+简单标记现在可以跨越整个块。 </li>
 <li>
- [xinclude] fixes up the relative path to the target XML file when input_directory
-        is not the same as the output_directory.<br>当&nbsp;input_directory
- 与 output_directory 不相同时,[xinclude] 修正了到目标 XML 文件的相 对路径。
-      </li>
+<a class="link" href="syntax.html#quickbook.syntax.block.blurbs" title="Blurbs">Blurbs</a>, +<a class="link" href="syntax.html#quickbook.syntax.block.admonitions" title="Admonitions">Admonitions</a> and table cells +(see <a class="link" href="syntax.html#quickbook.syntax.block.tables" title="Tables">Tables</a>)
+may now contain paragraphs.<br>
+<a class="link" href="syntax.html#quickbook.syntax.block.blurbs" title="Blurbs">短 +评</a>、<a class="link" href="syntax.html#quickbook.syntax.block.admonitions" title="Admonitions">警 告</a> 和表格单元(见 <a class="link" href="syntax.html#quickbook.syntax.block.tables" title="Tables">表
+格</a>)现在可以包含段落。 </li>
 <li>
-        Allow untitled tables.<br>允许无标题的表格。
-      </li>
-<li>
- Allow phrase markups in section titles.<br>允许在章节标题中的短语标 记。
-      </li>
-<li>
- Allow escaping back to QuickBook from code, code blocks and inline code.<br>允许从代码、代码块和内联代码转义回 QuickBook。
-      </li>
-<li>
- Footnotes, with the [footnote This is the footnote] syntax.<br>脚 注,使用 [footnote 这是一个脚注] 的语法。
-      </li>
-<li>
- Post-processor bug fix for escaped XML code that it does not recognize.<br>对于不被公认的转义XML的后处理中的缺陷修正。
-      </li>
-<li>
- Replaceable, with the [~replacement] syntax.<br>可替换性,使用 [~replacement] 的语法。
-      </li>
-</ul></div>
-<a name="quickbook.change_log.version_1_4"></a><h4>
-<a name="id4090886"></a>
- <a class="link" href="change_log.html#quickbook.change_log.version_1_4">Version 1.4</a>
-    </h4>
-<div class="itemizedlist"><ul type="disc">
-<li>
-        Generic Headers<br>通用头文件
-      </li>
-<li>
- Code changes to allow full recursion (i.e. Collectors and push/pop functions)<br>代码改为允许全递归(即 Collectors 和 push/pop 函数)
-      </li>
-<li>
-        Various code cleanup/maintenance<br>多处代码清理和维护
-      </li>
-<li>
-        Templates!<br>模板!
-      </li>
-<li>
- [conceptref] for referencing BoostBook &lt;concept&gt; entities.<br>
-        [conceptref] 用于引用 BoostBook &lt;concept&gt; 实体。
-      </li>
-<li>
- Allow escape of spaces. The escaped space is removed from the output. Syntax: - <code class="computeroutput"><span class="special">\</span> </code>.<br>允许空格的转义。转义的空格将从输出中删除。语法:<code class="computeroutput"><span class="special">\</span>&nbsp;</code>。
-      </li>
-<li>
-        Nested comments are now allowed.<br>允许嵌套的注释。
-      </li>
-<li>
- Quickbook blocks can nest inside comments.<br>可以在注释内部嵌入 Quickbook 块。
-      </li>
-<li>
-<a class="link" href="syntax.html#quickbook.syntax.block.import" title="Import">Import</a> facility.<br><a class="link" href="syntax.html#quickbook.syntax.block.import" title="Import">Import</a> 工具。
-      </li>
-<li>
-        Callouts on imported code<br>在导入代码上的插图编号。
-      </li>
-<li>
- Simple markups can now span a whole block.<br>简单标记现在可以跨越 整个块。
-      </li>
-<li>
-<a class="link" href="syntax.html#quickbook.syntax.block.blurbs" title="Blurbs">Blurbs</a>, <a class="link" href="syntax.html#quickbook.syntax.block.admonitions" title="Admonitions">Admonitions</a> - and table cells (see <a class="link" href="syntax.html#quickbook.syntax.block.tables" title="Tables">Tables</a>) - may now contain paragraphs.<br><a class="link" href="syntax.html#quickbook.syntax.block.blurbs" title="Blurbs">短评</a>、 <a class="link" href="syntax.html#quickbook.syntax.block.admonitions" title="Admonitions">警告</a> 和表格单元(见 <a class="link" href="syntax.html#quickbook.syntax.block.tables" title="Tables">表格</a>)现 在可以包含段落。
-      </li>
-<li>
-<code class="computeroutput"><span class="special">\</span><span class="identifier">n</span></code> - and <code class="computeroutput"><span class="special">[</span><span class="identifier">br</span><span class="special">]</span></code> are now deprecated.<br><code class="computeroutput"><span class="special">\</span><span class="identifier">n</span></code> 和 <code class="computeroutput"><span class="special">[</span><span class="identifier">br</span><span class="special">]</span></code> 不再使用。
-      </li>
+<code class="computeroutput"><span class="special">\</span><span class="identifier">n</span></code> and <code class="computeroutput"><span class="special">[</span><span class="identifier">br</span><span class="special">]</span></code>
+are now deprecated.<br>
+<code class="computeroutput"><span class="special">\</span><span class="identifier">n</span></code> 和 <code class="computeroutput"><span class="special">[</span><span class="identifier">br</span><span class="special">]</span></code>
+不再使用。 </li>
 <li>
<a class="link" href="syntax.html#quickbook.syntax.phrase.cond" title="Conditional Generation">Conditional Generation</a>. - Ala C++ #ifdef.<br><a class="link" href="syntax.html#quickbook.syntax.phrase.cond" title="Conditional Generation">按条件生成</a>。类似于 C++ #ifdef.
-      </li>
-<li>
- Searching of included and imported files in an extensible search path with - <code class="computeroutput"><span class="special">--</span><span class="identifier">include</span><span class="special">-</span><span class="identifier">path</span></code> (<code class="computeroutput"><span class="special">-</span><span class="identifier">I</span></code>) option.<br>在可扩展的搜索路径中查找包含文件和导入文件 - <code class="computeroutput"><span class="special">--</span><span class="identifier">include</span><span class="special">-</span><span class="identifier">path</span></code> (<code class="computeroutput"><span class="special">-</span><span class="identifier">I</span></code>) 选项。
-      </li>
+Ala C++ #ifdef.<br>
+<a class="link" href="syntax.html#quickbook.syntax.phrase.cond" title="Conditional Generation">按条件生成</a>。类似于 C++
+#ifdef. </li>
+<li> Searching of included and imported files in an extensible
+search path with <code class="computeroutput"><span class="special">--</span><span class="identifier">include</span><span class="special">-</span><span class="identifier">path</span></code> +(<code class="computeroutput"><span class="special">-</span><span class="identifier">I</span></code>) option.<br> +在可扩展的搜索路径中查找包含文件和导入文件 <code class="computeroutput"><span class="special">--</span><span class="identifier">include</span><span class="special">-</span><span class="identifier">path</span></code> +(<code class="computeroutput"><span class="special">-</span><span class="identifier">I</span></code>) 选项。 </li>
+</ul>
+</div>
+<a name="quickbook.change_log.version_1_5"></a><h4>
+<a name="id2141300"></a>
+<a class="link" href="change_log.html#quickbook.change_log.version_1_5">Version 1.5</a>
+</h4>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+Support multiple copyright entrys in document info.<br>支持在文档信息中有多 个版权说明项。
+</li>
+<li class="listitem">
+Improved SVG support.<br>
+改进了SVG支持。
+</li>
+<li class="listitem">
+[globalref] for referencing BoostBook &lt;global&gt; entities.<br>
+
+[globalref] 用于引用 BoostBook &lt;global&gt; 实体。
+</li>
+<li class="listitem">
+Fail on error.<br>出错时失败。
+
+</li>
+<li class="listitem">
+Fix crash for templates with too many arguments or trailing space.<br>
+修正参数或后随空格过多的模板所引起的崩溃。
+</li>
+<li class="listitem">
+Improved handling of unexpected characters in code blocks.<br>
+改进了对代码块中非正常字符的处理。
+</li>
+<li class="listitem">
+Improved handling of unmatched escape in code blocks.<br>
+改进了对代码块中不匹配转义的处理。
+</li>
+<li class="listitem">
+Support for python snippets.<br>
+支持 python 片段。
+</li>
+<li class="listitem">
+<code class="computeroutput"><span class="identifier">teletype</span></code> source mode.<br> +<code class="computeroutput"><span class="identifier">teletype</span></code> 源码模式。
+</li>
+<li class="listitem">
+Use static scoping in templates, should be a lot more intuitive.<br>
+在模板中使用静态作用域,更为直观。
+</li>
+<li class="listitem">
+Accept a space between <code class="computeroutput"><span class="identifier">section</span><span class="special">:</span></code> and the section id.<br> +在 <code class="computeroutput"><span class="identifier">section</span><span class="special">:</span></code> 和章 节id间接受一个空格。
+</li>
+<li class="listitem">
+Support table ids.<br>
+支持表id。
+</li>
 </ul></div>
 </div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision"; width="100%"><tbody><tr> +<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision"; width="100%">
+<tbody>
+<tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright (c) 2002, 2004, 2006 Joel de Guzman,
-      Eric Niebler<p>
- Distributed under the Boost Software License, Version 1.0. (See accompanying - file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt"; target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></tbody></table>
+<td align="right">
+<div class="copyright-footer">Copyright (c) 2002,
+2004, 2006 Joel de Guzman, Eric Niebler
+<p> Distributed under the Boost Software License, Version
+1.0. (See accompanying file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt"; target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+</p>
+</div>
+</td>
+</tr>
+</tbody>
+</table>
 <hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../quickbook.html"><img src="../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../quickbook.html"><img src="../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="syntax.html"><img src="../../../doc/html/images/next.png" alt="Next"></a> +<div class="spirit-nav"><a accesskey="p" href="../quickbook.html"><img src="../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../quickbook.html"><img src="../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="syntax.html"><img src="../../../doc/html/images/next.png" alt="Next"></a>
 </div>
 </body></html>
=======================================
--- /trunk/doc/html/quickbook/syntax.html       Wed Sep  2 21:13:20 2009
+++ /trunk/doc/html/quickbook/syntax.html       Mon Dec 21 22:10:07 2009
@@ -206,7 +206,7 @@
           </li>
 </ul></div>
 <div class="table">
-<a name="id4091519"></a><p class="title"><b>Table&nbsp;29.1.&nbsp;More Formatting Samples<br>表&nbsp;29.1. 更多的格式化示例</b></p> +<a name="id4091519"></a><p class="title"><b>Table 30.1.&nbsp;More Formatting Samples<br>表 30.1. 更多的格式化示例</b></p> <div class="table-contents"><table class="table" summary="More Formatting Samples">
 <colgroup><col><col></colgroup>
 <thead><tr>
@@ -505,7 +505,7 @@
whereas a Python comment <code class="computeroutput"><span class="comment">#looks like this</span></code>.
         </p>
 <div class="table">
-<a name="id4092400"></a><p class="title"><b>Table&nbsp;29.2.&nbsp;Supported Source Modes<br>表 &nbsp;29.2. 支持的源模式</b></p> +<a name="id4092400"></a><p class="title"><b>Table 30.2.&nbsp;Supported Source Modes<br>表 30.2. 支持的源模式</b></p> <div class="table-contents"><table class="table" summary="Supported Source Modes">
 <colgroup><col><col></colgroup>
 <thead><tr>
@@ -745,11 +745,11 @@
 <div class="titlepage"><div><div><h4 class="title">
<a name="quickbook.syntax.phrase.images"></a><a class="link" href="syntax.html#quickbook.syntax.phrase.images" title="Images">Images 图像 </a>
 </h4></div></div></div>
-<pre class="programlisting">[$image.jpg]<br></pre>
+<pre class="programlisting">[$image.jpg]</pre>
 </div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.footnotes"></a><a class="link" href="syntax.html#quickbook.syntax.phrase.footnotes" title="Footnotes">Footnotes 脚注</a> +<div class="section" lang="en"><div class="titlepage"><div><div><p>From version 1.5, you can also use <a href="http://www.docbook.org/tdg/en/html/imagedata.html"; target="_top">DocBook +imagedata attributes</a>:<br>从版本1.5起,你还可以使用 <a href="http://www.docbook.org/tdg/en/html/imagedata.html"; target="_top">DocBook +imagedata 属性</a>: </p><pre class="programlisting">[$image.jpg [width 200in] [height 200in]]<br></pre><h4 class="title"><a name="quickbook.syntax.phrase.footnotes"></a><a class="link" href="syntax.html#quickbook.syntax.phrase.footnotes" title="Footnotes">Footnotes 脚注</a>
 </h4></div></div></div>
 <div class="toc"><dl>
<dt><span class="section"><a href="syntax.html#quickbook.syntax.phrase.footnotes.macro_expansion">Macro
@@ -857,7 +857,7 @@
Every document must begin with a Document Info section, which should look
           like this:<br>每个文档都必须以一个"文档信息"节开始,如下:
         </p>
-<pre class="programlisting">[document-type The Document Title<br> [quickbook 1.3]<br> [version 1.0]<br> [id the_document_name]<br> [dirname the_document_dir]<br> [copyright 2000 2002 2003 Joe Blow, Jane Doe]<br> [purpose The document's reason for being]<br> [category The document's category]<br> [authors [Blow, Joe], [Doe, Jane]]<br> [license The document's license]<br> [source-mode source-type]<br>]<br></pre> +<pre class="programlisting">[document-type The Document Title<br> [quickbook 1.5]<br> [version 1.0]<br> [id the_document_name]<br> [dirname the_document_dir]<br> [copyright 2000 2002 2003 Joe Blow, Jane Doe]<br> [purpose The document's reason for being]<br> [category The document's category]<br> [authors [Blow, Joe], [Doe, Jane]]<br> [license The document's license]<br> [source-mode source-type]<br>]<br></pre>
 <p>
           Where document-type is one of:<br>其中 document-type 为以下之一:
         </p>
@@ -897,8 +897,8 @@
           </li>
 </ul></div>
 <p>
- quickbook 1.3 declares the version of quickbook the document is written - for. In its absence, version 1.1 is assumed.<br>从 quickbook 1.3 起,要声明缩写本文档的 quickbook 版本。如果没有明确声明,则假定为版本 1.1。 + quickbook 1.5 declares the version of quickbook the document is written + for. In its absence, version 1.1 is assumed.<br>从 quickbook 1.5 起,要声明缩写本文档的 quickbook 版本。如果没有明确声明,则假定为版本 1.1。
         </p>
 <p>
<code class="literal">version</code>, <code class="literal">id</code>, <code class="literal">dirname</code>,
@@ -1507,7 +1507,7 @@
Quickbook has some predefined macros that you can already use.<br>Quickbook 有一些预定义的宏,你可以直接使用。
         </p>
 <div class="table">
-<a name="id4095212"></a><p class="title"><b>Table&nbsp;29.3.&nbsp;Predefined Macros<br>表&nbsp;29.3. 预 定义宏</b></p> +<a name="id4095212"></a><p class="title"><b>Table 30.3.&nbsp;Predefined Macros<br>表 30.3. 预定义宏</b></p> <div class="table-contents"><table class="table" summary="Predefined Macros">
 <colgroup><col><col><col></colgroup>
 <thead><tr>
@@ -1540,7 +1540,7 @@
               </p>
               </td>
 <td>
-              <p>2009-May-01</p>
+              <p>2009-Nov-14</p>
               </td>
 </tr>
 <tr>
@@ -1555,7 +1555,7 @@
               </p>
               </td>
 <td>
-              <p>08:25:15 PM</p>
+              <p>10:40:51 AM</p>
               </td>
 </tr>
 <tr>
@@ -1783,10 +1783,9 @@
<a class="link" href="syntax.html#quickbook.syntax.block.templates.simple_arguments">Simple
           Arguments 简单参数</a>
         </h6>
-<p>
- As mentioned, arguments are separated by the double dot <code class="literal">".."</code>. - If there are less arguments passed than expected, QuickBook attempts to - break the last argument into two or more arguments following this logic:<br>如前所述,参数是用双点号 <code class="literal">".."</code> 来 分隔的。如果传入的实参少于所期望的数量,QuickBook 将尝试按以下逻辑将最后一个 实参分为两个或以上的参数: +<p>As mentioned, arguments are separated by the double dot <code class="literal">".."</code>. Alternatively, if the double dot isn't used and more
+than one argument is expected, QuickBook uses whitespace to separate the
+arguments, following this logic:<br>如前所述,参数是用双点号 <code class="literal">".."</code> 来分隔的。或者,如果没有用双点号而期望一个以上的 参数,QuickBook 将使用空白来分隔各参数,遵循以下逻辑:
         </p>
 <div class="itemizedlist"><ul type="disc">
 <li>
@@ -1828,27 +1827,23 @@
 <p>
           wxyz trail
         </p>
+
 <p>
           The arguments being: "w", "x", "y" and "z
           trail".<br>参数为:"w", "x", "y" 和 "z
-          trail".
-        </p>
-<p>
- It should be obvious now that for simple arguments with no spaces, we can - get by without separating the arguments with <code class="literal">".."</code> - separators. It is possible to combine <code class="literal">".."</code> - separators with the argument passing simplification presented above. Example:<br>现在很显然,对于不带空格的简单参数,我们可以无需使用 <code class="literal">".."</code>
-          分隔符带分隔参数。也可以结合 <code class="literal">".."</code>
-          分隔符来传递参数,以简化前面的例子。例如:
-        </p>
-<pre class="programlisting">[simple what do you think ..m a n?]<br></pre>
-<p>
-          will produce:<br>将产生:
-        </p>
-<p>
-          what do you think man?
-        </p>
-<a name="quickbook.syntax.block.templates.punctuation_templates"></a><h6>
+          trail".</p>
+<div class="caution" title="Caution">
+<table summary="Caution" border="0">
+<tbody>
+<tr>
+<td rowspan="2" align="middle" valign="top" width="25"><img alt="[Caution]" src="../../../doc/html/images/caution.png"></td>
+<th align="left">Caution 警告</th></tr>
+<tr>
+<td align="left" valign="top">
+<p>The behavior described here is for QuickBook 1.5. In older versions you could +use both the double dot and whitespace as separators in the same template call. +If your document is marked up as an older version, it will use the old behavior, +which is described in the <a href="http://www.boost.org/doc/libs/1_40_0/doc/html/quickbook/syntax.html#quickbook.syntax.block.templates.simple_arguments"; target="_top">QuickBook 1.4 documentation</a>.<br>这里所描述的行为是 QuickBook 1.5 的。在较老的版本中,你可以在同一个模板调用中同时使用双点号和空 白分隔符。如果你的文档被标记为较老的版本,它就会使用旧的行为,见 <a href="http://www.boost.org/doc/libs/1_40_0/doc/html/quickbook/syntax.html#quickbook.syntax.block.templates.simple_arguments"; target="_top">QuickBook 1.4 文档</a>。 </p></td></tr></tbody></table></div><a name="quickbook.syntax.block.templates.punctuation_templates"></a><h6>
 <a name="id4096022"></a>
<a class="link" href="syntax.html#quickbook.syntax.block.templates.punctuation_templates">Punctuation
           Templates 标点模板</a>
@@ -1909,12 +1904,12 @@
 <div class="titlepage"><div><div><h4 class="title">
<a name="quickbook.syntax.block.tables"></a><a class="link" href="syntax.html#quickbook.syntax.block.tables" title="Tables">Tables 表格 </a>
 </h4></div></div></div>
-<pre class="programlisting">[table A Simple Table<br> [[Heading 1] [Heading 2] [Heading 3]]<br> [[R0-C0] [R0-C1] [R0-C2]]<br> [[R1-C0] [R1-C1] [R1-C2]]<br> [[R2-C0] [R2-C1] [R2-C2]]<br>]<br></pre> +<pre class="programlisting">[table:id A Simple Table<br> [[Heading 1] [Heading 2] [Heading 3]]<br> [[R0-C0] [R0-C1] [R0-C2]]<br> [[R1-C0] [R1-C1] [R1-C2]]<br> [[R2-C0] [R2-C1] [R2-C2]]<br>]<br></pre>
 <p>
           will generate:<br>将生成:
         </p>
 <div class="table">
-<a name="id4096200"></a><p class="title"><b>Table&nbsp;29.4.&nbsp;A Simple Table</b></p> +<a name="id4096200"></a><p class="title"><b>Table 30.4.&nbsp;A Simple Table</b></p>
 <div class="table-contents"><table class="table" summary="A Simple Table">
 <colgroup><col><col><col></colgroup>
 <thead><tr>
@@ -1993,16 +1988,20 @@
The table title is optional. The first row of the table is automatically treated as the table header; that is, it is wrapped in <code class="literal">&lt;thead&gt;...&lt;/thead&gt;</code> XML tags. Note that unlike the original QuickDoc, the columns are nested - in [ cells... ]. The syntax is free-format and allows big cells to be formatted - nicely. Example:<br>表格的标题是可选的。表格的第一行被自动视为表 头;即它将被包在 <code class="literal">&lt;thead&gt;...&lt;/thead&gt;</code> - XML 标签中。注意,与原始的 QuickDoc 不同,列是嵌在 [ cells... ] 中的。语法是自由格式的,这样较大的单元可以被格式化得更漂亮。例如: + in [ cells... ].&nbsp;<br>表格的标题是可选的。表格的第一行被自动 视为表头;即它将被包在 <code class="literal">&lt;thead&gt;...&lt;/thead&gt;</code> + XML 标签中。注意,与原始的 QuickDoc 不同,列是嵌在 [ cells... ] 中的。</p><p>Giving tables an id is a new feature for quickbook 1.5 onwards. As with +sections, the id is optional. If the table has a title but no id, an id will be +generated from the title. The table above can be linked to using:<br>为表格 给定一个id是 quickbook 1.5 才有的一个新特性。和章节一样,这个id是可选的。如 果表格有标题而没有id,则会从标题生成一个id。以上表格可以用以下方式被链接: </p><pre class="programlisting">[link quickbook.syntax.block.tables.id link to table]<br></pre>
+<p>which will generate:<br>将生成: </p>
+<p><a class="link" title="Table&nbsp;30.4.&nbsp;A Simple Table" href="syntax.html#quickbook.syntax.block.tables.id">link to table</a> </p><p>The syntax is free-format and allows big cells to be formatted + nicely. Example:<br>语法是自由格式的,这样较大的单元可以被格式化 得更漂亮。例如:
         </p>
<pre class="programlisting">[table Table with fat cells<br> [[Heading 1] [Heading 2]]<br> [<br> [Row 0, Col 0: a small cell]<br> [<br> Row 0, Col 1: a big fat cell with paragraphs<br><br> Boost provides free peer-reviewed portable C++ source libraries.<br><br> We emphasize libraries that work well with the C++ Standard Library.<br> Boost libraries are intended to be widely useful, and usable across<br> a broad spectrum of applications. The Boost license encourages both<br> commercial and non-commercial use.<br> ]<br> ]<br> [<br> [Row 1, Col 0: a small cell]<br> [Row 1, Col 1: a small cell]<br> ]<br>]<br></pre>
 <p>
           and thus:<br>可得到:
         </p>
 <div class="table">
-<a name="id4096347"></a><p class="title"><b>Table&nbsp;29.5.&nbsp;Table with fat cells</b></p> +<a name="id4096347"></a><p class="title"><b>Table 30.5.&nbsp;Table with fat cells</b></p> <div class="table-contents"><table class="table" summary="Table with fat cells">
 <colgroup><col><col></colgroup>
 <thead><tr>
@@ -2059,7 +2058,7 @@
         </p>
<pre class="programlisting">[table Table with code<br> [[Comment] [Code]]<br> [<br> [My first program]<br> [``<br> #include &lt;iostream&gt;<br><br> int main()<br> {<br> std::cout &lt;&lt; "Hello, World!" &lt;&lt; std::endl;<br> return 0;<br> }<br> ``]<br> ]<br>]<br></pre>
 <div class="table">
-<a name="id4096452"></a><p class="title"><b>Table&nbsp;29.6.&nbsp;Table with code</b></p> +<a name="id4096452"></a><p class="title"><b>Table 30.6.&nbsp;Table with code</b></p>
 <div class="table-contents"><table class="table" summary="Table with code">
 <colgroup><col><col></colgroup>
 <thead><tr>
=======================================
--- /trunk/doc/html/xpressive/user_s_guide.html Wed Sep  2 20:31:58 2009
+++ /trunk/doc/html/xpressive/user_s_guide.html Mon Dec 21 22:10:07 2009
@@ -52,7 +52,8 @@
 Substitutions 字符串替代</a></span></dt>
<dt><span class="section"><a href="user_s_guide.html#boost_xpressive.user_s_guide.string_splitting_and_tokenization">String
 Splitting and Tokenization 字符串分拆和记号化</a></span></dt>
-<dt><span class="section"><a href="user_s_guide.html#boost_xpressive.user_s_guide.grammars_and_nested_matches">Grammars +<dt><span class="section"><a href="user_s_guide.html#boost_xpressive.user_s_guide.named_captures">Named +Captures 命名捕获</a> </span><span class="section"></span></dt><dt><span class="section"><a href="user_s_guide.html#boost_xpressive.user_s_guide.grammars_and_nested_matches">Grammars
 and Nested Matches 语法和嵌套匹配</a></span></dt>
<dt><span class="section"><a href="user_s_guide.html#boost_xpressive.user_s_guide.semantic_actions_and_user_defined_assertions">Semantic Actions and User-Defined Assertions 语义动作和用户自定义断言 </a></span></dt>
@@ -352,9 +353,9 @@
要开始使用xpressive,你并不需要知道得太多。让我们来从xpressive所提供的类型 和算法开始来一次简易的浏览。 </p>
 <div class="table">
 <a name="id4017921"></a>
-<p class="title"><b>Table&nbsp;27.1.&nbsp;xpressive's
+<p class="title"><b>Table&nbsp;28.1.&nbsp;xpressive's
 Tool-Box<br>
-表&nbsp;27.1.&nbsp;xpressive的工具箱</b></p>
+表&nbsp;28.1.&nbsp;xpressive的工具箱</b></p>
 <div class="table-contents">
 <table class="table" summary="xpressive's Tool-Box">
 <colgroup><col><col></colgroup>
@@ -550,9 +551,9 @@
 型。你可以用下表基于你的迭代器类型来找到正确的类型。 </p>
 <div class="table">
 <a name="id4018708"></a>
-<p class="title"><b>Table&nbsp;27.2.&nbsp;xpressive
+<p class="title"><b>Table&nbsp;28.2.&nbsp;xpressive
 Typedefs vs. Iterator Types<br>
-表&nbsp;27.2.&nbsp;xpressive Typedefs 与迭代器类型</b></p>
+表&nbsp;28.2.&nbsp;xpressive Typedefs 与迭代器类型</b></p>
 <div class="table-contents">
 <table class="table" summary="xpressive Typedefs vs. Iterator Types">
 <colgroup><col><col><col><col><col></colgroup>
@@ -699,9 +700,9 @@
你是不是只想找到一个模式一次?还是多次?是查找还是替换?xpressive 具有所有 这些工具,而且更多。以下是一个快速参考: </p>
 <div class="table">
 <a name="id4019225"></a>
-<p class="title"><b>Table&nbsp;27.3.&nbsp;Tasks
+<p class="title"><b>Table&nbsp;28.3.&nbsp;Tasks
 and Tools<br>
-表&nbsp;27.3. 任务和工具</b></p>
+表&nbsp;28.3. 任务和工具</b></p>
 <div class="table-contents">
 <table class="table" summary="Tasks and Tools">
 <colgroup><col><col></colgroup>
@@ -1051,9 +1052,9 @@
 下表列出了常见的regex结构以及在静态xpressive中的等价物。 </p>
 <div class="table">
 <a name="id4038482"></a>
-<p class="title"><b>Table&nbsp;27.4.&nbsp;Perl
+<p class="title"><b>Table&nbsp;28.4.&nbsp;Perl
 syntax vs. Static xpressive syntax<br>
-表&nbsp;27.4.&nbsp;Perl语法 vs. 静态xpressive语法</b></p>
+表&nbsp;28.4.&nbsp;Perl语法 vs. 静态xpressive语法</b></p>
 <div class="table-contents">
 <table class="table" summary="Perl syntax vs. Static xpressive syntax">
 <colgroup><col><col><col></colgroup>
@@ -1792,7 +1793,16 @@
 之后时匹配。(<span class="emphasis"><em>stuff</em></span>
 必须是常数宽度) </p>
 </td>
-</tr>
+</tr><tr><td>
+<p><code class="literal">(?P&lt;<span class="emphasis"><em>name</em></span>&gt;<span class="emphasis"><em>stuff</em></span>)</code> </p></td><td> +<p><code class="computeroutput"><code class="literal"><a class="link" title="Struct mark_tag" href="../boost/xpressive/mark_tag.html">mark_tag</a></code> </code><code class="literal"><span class="emphasis"><em>name</em></span></code><code class="computeroutput"><span class="special">(</span></code><span class="emphasis"><em>n</em></span><code class="computeroutput"><span class="special">);</span></code><br>...<br><code class="computeroutput"><span class="special">(</span></code><code class="literal"><span class="emphasis"><em>name</em></span></code><code class="computeroutput"><span class="special">=</span> </code><code class="literal"><span class="emphasis"><em>stuff</em></span></code><code class="computeroutput"><span class="special">)</span></code> </p></td><td>
+<p>Create a named capture.</p><p>创建一个命名捕获。 </p></td></tr><tr><td>
+<p><code class="literal">(?P=<span class="emphasis"><em>name</em></span>)</code>
+</p></td>
+<td>
+<p><code class="computeroutput"><code class="literal"><a class="link" title="Struct mark_tag" href="../boost/xpressive/mark_tag.html">mark_tag</a></code> </code><code class="literal"><span class="emphasis"><em>name</em></span></code><code class="computeroutput"><span class="special">(</span></code><span class="emphasis"><em>n</em></span><code class="computeroutput"><span class="special">);</span></code><br>...<br><code class="literal"><span class="emphasis"><em>name</em></span></code> </p></td>
+<td>
+<p>Refer back to a previously created named capture.</p><p>后向引用至之前创 建的某个命名捕获。 </p></td></tr>
 </tbody>
 </table>
 </div>
@@ -3306,7 +3316,78 @@
 <div class="titlepage">
 <div>
 <div>
-<h3 class="title"><a name="boost_xpressive.user_s_guide.grammars_and_nested_matches"></a><a class="link" href="user_s_guide.html#boost_xpressive.user_s_guide.grammars_and_nested_matches" title="Grammars and Nested Matches">Grammars and Nested
+<div class="section" title="Named Captures">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title"><a name="boost_xpressive.user_s_guide.named_captures"></a><a class="link" title="Named Captures" href="user_s_guide.html#boost_xpressive.user_s_guide.named_captures">Named +Captures 命名捕获</a> </h3></div></div></div><a name="boost_xpressive.user_s_guide.named_captures.overview"></a> +<h3><a name="id2053249"></a><a class="link" href="user_s_guide.html#boost_xpressive.user_s_guide.named_captures.overview">Overview 概述</a>
+</h3>
+<p>For complicated regular expressions, dealing with numbered captures can be a +pain. Counting left parentheses to figure out which capture to reference is no +fun. Less fun is the fact that merely editing a regular expression could cause a +capture to be assigned a new number, invaliding code that refers back to it by +the old number.<br>对于复杂的正则表达式,处理编号的捕获会是一种痛苦。计算左 括号的数量来确定引用的是哪个捕获,这并不好玩。更不好玩的是,稍微修改一下正则 表达式,就可能会导致某个捕获被赋予新的编号,而令以旧编号来引用它的代码失 效。 </p> +<p>Other regular expression engines solve this problem with a feature called +<span class="emphasis"><em>named captures</em></span>. This feature allows you to +assign a name to a capture, and to refer back to the capture by name rather by +number. Xpressive also supports named captures, both in dynamic and in static
+regexes.<br>其它正则表达式引擎是以一种名为
+<span class="emphasis"><em>命名捕获</em></span> 的特性来解决这个问题的。这 种特性允许你对一个捕获赋予某个名字,而后以名字而非号码来引用该捕获。 Xpressive 也支持命名捕获,在动态和静态正则表达式中均支持。 </p><a name="boost_xpressive.user_s_guide.named_captures.dynamic_named_captures"></a> +<h3><a name="id2053295"></a><a class="link" href="user_s_guide.html#boost_xpressive.user_s_guide.named_captures.dynamic_named_captures">Dynamic
+Named Captures 动态的命名捕获</a> </h3>
+<p>For dynamic regular expressions, xpressive follows the lead of other popular +regex engines with the syntax of named captures. You can create a named capture +with <code class="computeroutput"><span class="string">"(?P&lt;xxx&gt;...)"</span></code> and refer back to that capture +with <code class="computeroutput"><span class="string">"(?P=xxx)"</span></code>. +Here, for instance, is a regular expression that creates a named capture and +refers back to it:<br>对于动态的正则表达式,xpressive 参照了其它具有命名捕 获语法的正则表达式引擎。你可以用 <code class="computeroutput"><span class="string">"(?P&lt;xxx&gt;...)"</span></code> 创建一个命名捕获,而后用 <code class="computeroutput"><span class="string">"(?P=xxx)"</span></code> 引用该捕获。例如,以下是一个创建了命名捕获并后向引用它的正则表达式: </p><pre class="programlisting"><span class="comment">// Create a named capture called "char" that matches a single<br></span><span class="comment">// character and refer back to that capture by name.<br>// 创建一个名为"char"的命名捕获,匹配单个字符,并通过名字引用该捕获 <br></span><span class="identifier">sregex</span> <span class="identifier">rx</span> <span class="special">=</span> <span class="identifier">sregex</span><span class="special">::</span><span class="identifier">compile</span><span class="special">(</span><span class="string">"(?P&lt;char&gt;.)(?P=char)"</span><span class="special">);</span>
+</pre>
+<p>The effect of the above regular expression is to find the first doubled
+character.<br>以上正则表达式的作用是找出第一个连续重复的字符。 </p>
+<p>Once you have executed a match or search operation using a regex with named +captures, you can access the named capture through the <code class="literal"><code class="computeroutput"><a class="link" title="Struct template match_results" href="../boost/xpressive/match_results.html">match_results&lt;&gt;</a></code></code> +object using the capture's name.<br>一旦你用一个带有命名捕获的regex执行一次 匹配或搜索操作,你就可以通过 <code class="literal"><code class="computeroutput"><a class="link" title="Struct template match_results" href="../boost/xpressive/match_results.html">match_results&lt;&gt;</a></code></code> +对象用捕获名来访问这个命名捕获。 </p><pre class="programlisting"><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">str</span><span class="special">(</span><span class="string">"tweet"</span><span class="special">);</span><br><span class="identifier">sregex</span> <span class="identifier">rx</span> <span class="special">=</span> <span class="identifier">sregex</span><span class="special">::</span><span class="identifier">compile</span><span class="special">(</span><span class="string">"(?P&lt;char&gt;.)(?P=char)"</span><span class="special">);</span><br><span class="identifier">smatch</span> <span class="identifier">what</span><span class="special">;</span><br><span class="keyword">if</span><span class="special">(</span><span class="identifier">regex_search</span><span class="special">(</span><span class="identifier">str</span><span class="special">,</span> <span class="identifier">what</span><span class="special">,</span> <span class="identifier">rx</span><span class="special">))</span><br><span class="special">{</span><br> <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="string">"char = "</span> <span class="special">&lt;&lt;</span> <span class="identifier">what</span><span class="special">[</span><span class="string">"char"</span><span class="special">]</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span><br><span class="special">}</span>
+</pre>
+<p>The above code displays:<br>以上代码输出: </p><pre class="programlisting">char = e<br></pre> +<p>You can also refer back to a named capture from within a substitution string. +The syntax for that is <code class="computeroutput"><span class="string">"\\g&lt;xxx&gt;"</span></code>. Below is some code that +demonstrates how to use named captures when doing string substitution.<br>你也可以从一个替换子串内部引用命名捕获。语法是 <code class="computeroutput"><span class="string">"\\g&lt;xxx&gt;"</span></code>。 以下是一段代码,示范了如何在进行字符串替换时使用命名捕获。 </p><pre class="programlisting"><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">str</span><span class="special">(</span><span class="string">"tweet"</span><span class="special">);</span><br><span class="identifier">sregex</span> <span class="identifier">rx</span> <span class="special">=</span> <span class="identifier">sregex</span><span class="special">::</span><span class="identifier">compile</span><span class="special">(</span><span class="string">"(?P&lt;char&gt;.)(?P=char)"</span><span class="special">);</span><br><span class="identifier">str</span> <span class="special">=</span> <span class="identifier">regex_replace</span><span class="special">(</span><span class="identifier">str</span><span class="special">,</span> <span class="identifier">rx</span><span class="special">,</span> <span class="string">"**\\g&lt;char&gt;**"</span><span class="special">,</span> <span class="identifier">regex_constants</span><span class="special">::</span><span class="identifier">format_perl</span><span class="special">);</span><br><span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="identifier">str</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+</pre>
+<p>Notice that you have to specify <code class="computeroutput"><span class="identifier">format_perl</span></code> when using named captures. Only the +perl syntax recognizes the <code class="computeroutput"><span class="string">"\\g&lt;xxx&gt;"</span></code> syntax. The above code displays:<br>注意,在使用命名捕获时,你必须指定 <code class="computeroutput"><span class="identifier">format_perl</span></code>。 只有perl语法能识别 <code class="computeroutput"><span class="string">"\\g&lt;xxx&gt;"</span></code> 语法。以上代码输出: +</p><pre class="programlisting">tw**e**t<br></pre><a name="boost_xpressive.user_s_guide.named_captures.static_named_captures"></a> +<h3><a name="id2053910"></a><a class="link" href="user_s_guide.html#boost_xpressive.user_s_guide.named_captures.static_named_captures">Static
+Named Captures 静态命名捕获</a> </h3>
+<p>If you're using static regular expressions, creating and using named captures +is even easier. You can use the <code class="literal"><code class="computeroutput"><a class="link" title="Struct mark_tag" href="../boost/xpressive/mark_tag.html">mark_tag</a></code></code> type to +create a variable that you can use like <code class="computeroutput">s1</code>, +<code class="computeroutput">s2</code> and friends, but with a name that is more +meaningful. Below is how the above example would look using static regexes:<br>如果你使用的是静态正则表达式,那么创建和使用命名捕获就更容易了。 你可以用 <code class="literal"><code class="computeroutput"><a class="link" title="Struct mark_tag" href="../boost/xpressive/mark_tag.html">mark_tag</a></code></code> 类型来创 建一个可以象 <code class="computeroutput">s1</code>, +<code class="computeroutput">s2</code> 等那样使用的变量,但变量的名字更有意 义。以下是上一个例子的静态regex版本: </p><pre class="programlisting"><span class="identifier">mark_tag</span> <span class="identifier">char_</span><span class="special">(</span><span class="number">1</span><span class="special">);</span> <span class="comment">// char_ is now a synonym for s1 char_是s1的别名 <br></span><span class="identifier">sregex</span> <span class="identifier">rx</span> <span class="special">=</span> <span class="special">(</span><span class="identifier">char_</span><span class="special">=</span> <span class="identifier">_</span><span class="special">)</span> <span class="special">&gt;&gt;</span> <span class="identifier">char_</span><span class="special">;</span>
+</pre>
+<p>After a match operation, you can use the <code class="computeroutput"><span class="identifier">mark_tag</span></code> to index into the <code class="literal"><code class="computeroutput"><a class="link" title="Struct template match_results" href="../boost/xpressive/match_results.html">match_results&lt;&gt;</a></code></code> +to access the named capture:<br>在匹配操作之后,你可以用 <code class="computeroutput"><span class="identifier">mark_tag</span></code> 来作 为 <code class="literal"><code class="computeroutput"><a class="link" title="Struct template match_results" href="../boost/xpressive/match_results.html">match_results&lt;&gt;</a></code></code> +的索引,以访问命名捕获: </p><pre class="programlisting"><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">str</span><span class="special">(</span><span class="string">"tweet"</span><span class="special">);</span><br><span class="identifier">mark_tag</span> <span class="identifier">char_</span><span class="special">(</span><span class="number">1</span><span class="special">);</span><br><span class="identifier">sregex</span> <span class="identifier">rx</span> <span class="special">=</span> <span class="special">(</span><span class="identifier">char_</span><span class="special">=</span> <span class="identifier">_</span><span class="special">)</span> <span class="special">&gt;&gt;</span> <span class="identifier">char_</span><span class="special">;</span><br><span class="identifier">smatch</span> <span class="identifier">what</span><span class="special">;</span><br><span class="keyword">if</span><span class="special">(</span><span class="identifier">regex_search</span><span class="special">(</span><span class="identifier">str</span><span class="special">,</span> <span class="identifier">what</span><span class="special">,</span> <span class="identifier">rx</span><span class="special">))</span><br><span class="special">{</span><br> <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="identifier">what</span><span class="special">[</span><span class="identifier">char_</span><span class="special">]</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span><br><span class="special">}</span>
+</pre>
+<p>The above code displays:<br>以上代码输出: </p><pre class="programlisting">char = e<br></pre> +<p>When doing string substitutions with <code class="literal"><code class="computeroutput"><a class="link" title="Function regex_replace" href="../boost/xpressive/regex_replace.html">regex_replace()</a></code></code>,
+you can use named captures to create <span class="emphasis"><em>format
+expressions</em></span> as below:<br>在用 <code class="literal"><code class="computeroutput"><a class="link" title="Function regex_replace" href="../boost/xpressive/regex_replace.html">regex_replace()</a></code></code> 进行字符串替换时,你可以用命名捕获来创建如下 <span class="emphasis"><em>格式 表达式</em></span>: </p><pre class="programlisting"><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">str</span><span class="special">(</span><span class="string">"tweet"</span><span class="special">);</span><br><span class="identifier">mark_tag</span> <span class="identifier">char_</span><span class="special">(</span><span class="number">1</span><span class="special">);</span><br><span class="identifier">sregex</span> <span class="identifier">rx</span> <span class="special">=</span> <span class="special">(</span><span class="identifier">char_</span><span class="special">=</span> <span class="identifier">_</span><span class="special">)</span> <span class="special">&gt;&gt;</span> <span class="identifier">char_</span><span class="special">;</span><br><span class="identifier">str</span> <span class="special">=</span> <span class="identifier">regex_replace</span><span class="special">(</span><span class="identifier">str</span><span class="special">,</span> <span class="identifier">rx</span><span class="special">,</span> <span class="string">"**"</span> <span class="special">+</span> <span class="identifier">char_</span> <span class="special">+</span> <span class="string">"**"</span><span class="special">);</span><br><span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="identifier">str</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+</pre>
+<p>The above code displays:<br>以上代码输出: </p><pre class="programlisting">tw**e**t<br></pre>
+<div class="note" title="Note">
+<table summary="Note" border="0">
+<tbody>
+<tr>
+<td rowspan="2" align="middle" valign="top" width="25"><img alt="[Note]" src="../../../doc/html/images/note.png"></td>
+<th align="left">Note 备注</th></tr>
+<tr>
+<td align="left" valign="top">
+<p>You need to include <code class="literal">&lt;boost/xpressive/regex_actions.hpp&gt;</code> to use format +expressions.<br>要使用格式表达式,你需要包含 <code class="literal">&lt;boost/xpressive/regex_actions.hpp&gt;</code> 。 </p></td></tr></tbody></table></div></div><h3 class="title"><a name="boost_xpressive.user_s_guide.grammars_and_nested_matches"></a><a class="link" href="user_s_guide.html#boost_xpressive.user_s_guide.grammars_and_nested_matches" title="Grammars and Nested Matches">Grammars and Nested
 Matches 语法和嵌套匹配</a>
 </h3>
 </div>
=======================================
--- /trunk/doc/html/xpressive.html      Sun Dec 20 18:38:58 2009
+++ /trunk/doc/html/xpressive.html      Mon Dec 21 22:10:07 2009
@@ -56,7 +56,8 @@
       Substitutions 字符串替代</a></span></dt>
<dt><span class="section"><a href="xpressive/user_s_guide.html#boost_xpressive.user_s_guide.string_splitting_and_tokenization">String
       Splitting and Tokenization 字符串分拆和记号化</a></span></dt>
-<dt><span class="section"><a href="xpressive/user_s_guide.html#boost_xpressive.user_s_guide.grammars_and_nested_matches">Grammars +<dt><span class="section"><a href="xpressive/user_s_guide.html#boost_xpressive.user_s_guide.named_captures">Named +Captures 命名捕获</a></span><span class="section"></span></dt><dt><span class="section"><a href="xpressive/user_s_guide.html#boost_xpressive.user_s_guide.grammars_and_nested_matches">Grammars
       and Nested Matches 语法与嵌套匹配</a></span></dt>
<dt><span class="section"><a href="xpressive/user_s_guide.html#boost_xpressive.user_s_guide.semantic_actions_and_user_defined_assertions">Semantic Actions and User-Defined Assertions 语义动作和用户自定义断言 </a></span></dt>
@@ -204,7 +205,7 @@
 </div>
 </div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision"; width="100%"><tbody><tr> -<td align="left"><p><small>Last revised: August 24, 2009 at 23:14:10 GMT</small></p></td> +<td align="left"><p><small>Last revised: November 14, 2009 at 10:40:46 GMT</small></p></td>
 <td align="right"><div class="copyright-footer"></div></td>
 </tr></tbody></table>
 <hr>

Other related posts:

  • » [boost-doc-zh] r355 committed - 升级至1.41.0,第七批,doc/目录下第二部分。... - boost-doc-zh